From 35189535a7ba0f4bdacd0c3e7b2dc26fa55eb918 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Tue, 18 Nov 2014 16:41:24 +0100
Subject: [PATCH 001/496] Convert LinphoneContent from a simple struct to a
 belle-sip object to ease generation of wrappers.

---
 build/android/Android.mk          |  61 ++++-----
 build/wp8/LibLinphone.vcxproj     |   2 +
 coreapi/CMakeLists.txt            |   2 +
 coreapi/Makefile.am               |  76 ++++++-----
 coreapi/callbacks.c               |   3 +-
 coreapi/chat.c                    |  47 ++++---
 coreapi/content.c                 | 205 ++++++++++++++++++++++++++++
 coreapi/content.h                 | 213 ++++++++++++++++++++++++++++++
 coreapi/help/filetransfer.c       |  21 +--
 coreapi/help/notify.c             |   4 +-
 coreapi/info.c                    |  91 ++-----------
 coreapi/linphonecore.c            |  22 +--
 coreapi/linphonecore.h            |  30 +----
 coreapi/message_storage.c         |  27 ++--
 coreapi/private.h                 |  21 ++-
 coreapi/quality_reporting.c       |  18 +--
 tester/eventapi_tester.c          | 112 ++++++++--------
 tester/flexisip_tester.c          |  16 ++-
 tester/message_tester.c           |  91 +++++++------
 tester/quality_reporting_tester.c |   8 +-
 20 files changed, 723 insertions(+), 347 deletions(-)
 create mode 100644 coreapi/content.c
 create mode 100644 coreapi/content.h

diff --git a/build/android/Android.mk b/build/android/Android.mk
index cb4b703f4..adc78454c 100755
--- a/build/android/Android.mk
+++ b/build/android/Android.mk
@@ -26,50 +26,51 @@ include $(CLEAR_VARS)
 LOCAL_CPP_EXTENSION := .cc
 
 LOCAL_SRC_FILES := \
-	linphonecore.c \
-	misc.c  \
-	enum.c \
-	presence.c \
-	proxy.c \
-	friend.c \
-	authentication.c \
-	lpconfig.c \
-	chat.c \
-	sipsetup.c \
-	siplogin.c \
 	address.c \
-	linphonecore_jni.cc \
+	authentication.c \
 	bellesip_sal/sal_address_impl.c \
 	bellesip_sal/sal_impl.c \
 	bellesip_sal/sal_op_call.c \
 	bellesip_sal/sal_op_call_transfer.c \
+	bellesip_sal/sal_op_events.c \
 	bellesip_sal/sal_op_impl.c \
+	bellesip_sal/sal_op_info.c \
 	bellesip_sal/sal_op_message.c \
 	bellesip_sal/sal_op_presence.c \
-	bellesip_sal/sal_op_registration.c \
 	bellesip_sal/sal_op_publish.c \
-	bellesip_sal/sal_op_info.c \
-	bellesip_sal/sal_op_events.c \
+	bellesip_sal/sal_op_registration.c \
 	bellesip_sal/sal_sdp.c \
-	sal.c \
-	offeranswer.c \
 	callbacks.c \
-	linphonecall.c \
-	conference.c \
-	ec-calibrator.c \
-	linphone_tunnel_config.c \
-	message_storage.c \
-	info.c \
-	event.c \
-	xml.c \
-	xml2lpc.c \
-	lpc2xml.c \
-	remote_provisioning.c \
-	quality_reporting.c \
 	call_log.c \
 	call_params.c \
+	chat.c \
+	conference.c \
+	content.c \
+	ec-calibrator.c \
+	enum.c \
+	event.c \
+	friend.c \
+	info.c \
+	linphonecall.c \
+	linphonecore.c \
+	linphonecore_jni.cc \
+	linphone_tunnel_config.c \
+	localplayer.c \
+	lpc2xml.c \
+	lpconfig.c \
+	message_storage.c \
+	misc.c  \
+	offeranswer.c \
 	player.c \
-	localplayer.c
+	presence.c \
+	proxy.c \
+	quality_reporting.c \
+	remote_provisioning.c \
+	sal.c \
+	siplogin.c \
+	sipsetup.c \
+	xml2lpc.c \
+	xml.c
 
 ifndef LIBLINPHONE_VERSION
 LIBLINPHONE_VERSION = "Devel"
diff --git a/build/wp8/LibLinphone.vcxproj b/build/wp8/LibLinphone.vcxproj
index cca41bb87..6a3d8e034 100644
--- a/build/wp8/LibLinphone.vcxproj
+++ b/build/wp8/LibLinphone.vcxproj
@@ -115,6 +115,7 @@
     <ClCompile Include="..\..\coreapi\callbacks.c" />
     <ClCompile Include="..\..\coreapi\chat.c" />
     <ClCompile Include="..\..\coreapi\conference.c" />
+    <ClCompile Include="..\..\coreapi\content.c" />
     <ClCompile Include="..\..\coreapi\ec-calibrator.c" />
     <ClCompile Include="..\..\coreapi\enum.c" />
     <ClCompile Include="..\..\coreapi\event.c" />
@@ -144,6 +145,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\coreapi\bellesip_sal\sal_impl.h" />
+    <ClInclude Include="..\..\coreapi\content.h" />
     <ClInclude Include="..\..\coreapi\enum.h" />
     <ClInclude Include="..\..\coreapi\event.h" />
     <ClInclude Include="..\..\coreapi\linphonecore.h" />
diff --git a/coreapi/CMakeLists.txt b/coreapi/CMakeLists.txt
index 8ed8185ab..2369501c7 100644
--- a/coreapi/CMakeLists.txt
+++ b/coreapi/CMakeLists.txt
@@ -46,6 +46,7 @@ set(SOURCE_FILES
 	call_params.c
 	chat.c
 	conference.c
+	content.c
 	ec-calibrator.c
 	enum.c
 	event.c
@@ -152,6 +153,7 @@ install(TARGETS linphone
 set(HEADER_FILES
 	call_log.h
 	call_params.h
+	content.h
 	event.h
 	linphonecore.h
 	linphonecore_utils.h
diff --git a/coreapi/Makefile.am b/coreapi/Makefile.am
index 2bb8498d9..f7d163749 100644
--- a/coreapi/Makefile.am
+++ b/coreapi/Makefile.am
@@ -24,45 +24,61 @@ CLEANFILES=$(GITVERSION_FILE)
 ## Process this file with automake to produce Makefile.in
 linphone_includedir=$(includedir)/linphone
 
-linphone_include_HEADERS=linphonecore.h linphonefriend.h linphonepresence.h linphonecore_utils.h lpconfig.h sipsetup.h event.h xml2lpc.h lpc2xml.h linphone_tunnel.h call_log.h call_params.h
+linphone_include_HEADERS=\
+	call_log.h \
+	call_params.h \
+	content.h \
+	event.h \
+	linphonecore.h \
+	linphonecore_utils.h \
+	linphonefriend.h \
+	linphonepresence.h \
+	linphone_tunnel.h \
+	lpc2xml.h \
+	lpconfig.h \
+	sipsetup.h \
+	xml2lpc.h
 
 lib_LTLIBRARIES=liblinphone.la
 
 liblinphone_la_SOURCES=\
-	linphonecore.c linphonecore.h private.h\
-	offeranswer.c offeranswer.h\
-	sal.c \
-	callbacks.c \
-	misc.c  \
 	address.c \
-	enum.c enum.h \
-	presence.c \
-	proxy.c \
-	friend.c \
 	authentication.c \
-	lpconfig.c lpconfig.h \
-	chat.c \
-	linphonecall.c \
-	sipsetup.c sipsetup.h \
-	siplogin.c \
-	lsd.c linphonecore_utils.h \
-	ec-calibrator.c \
-	conference.c \
-	message_storage.c \
-	info.c \
-	event.c event.h \
-	contactprovider.c contactprovider.h contact_providers_priv.h \
-	ldap/ldapprovider.c ldap/ldapprovider.h \
-	dict.c \
-	xml.c \
-	xml2lpc.c \
-	lpc2xml.c \
-	remote_provisioning.c \
-	quality_reporting.c quality_reporting.h\
+	callbacks.c \
 	call_log.c \
 	call_params.c \
-	player.c \
+	chat.c \
+	conference.c \
+	contactprovider.c contactprovider.h contact_providers_priv.h \
+	content.c \
+	dict.c \
+	ec-calibrator.c \
+	enum.c enum.h \
+	event.c event.h \
+	friend.c \
+	info.c \
+	ldap/ldapprovider.c ldap/ldapprovider.h \
+	linphonecall.c \
+	linphonecore.c linphonecore.h \
+	linphonecore_utils.h \
 	localplayer.c \
+	lpc2xml.c \
+	lpconfig.c lpconfig.h \
+	lsd.c \
+	message_storage.c \
+	misc.c  \
+	offeranswer.c offeranswer.h\
+	player.c \
+	presence.c \
+	private.h \
+	proxy.c \
+	quality_reporting.c quality_reporting.h\
+	remote_provisioning.c \
+	sal.c \
+	siplogin.c \
+	sipsetup.c sipsetup.h \
+	xml2lpc.c \
+	xml.c \
 	$(GITVERSION_FILE)
 
 if BUILD_UPNP
diff --git a/coreapi/callbacks.c b/coreapi/callbacks.c
index bc58f3c7d..59ce4a9a6 100644
--- a/coreapi/callbacks.c
+++ b/coreapi/callbacks.c
@@ -1208,14 +1208,13 @@ static void subscribe_response(SalOp *op, SalSubscribeStatus status){
 static void notify(SalOp *op, SalSubscribeStatus st, const char *eventname, const SalBody *body){
 	LinphoneEvent *lev=(LinphoneEvent*)sal_op_get_user_pointer(op);
 	LinphoneCore *lc=(LinphoneCore *)sal_get_user_pointer(sal_op_get_sal(op));
-	LinphoneContent content={0};
 
 	if (lev==NULL) {
 		/*out of subscribe notify */
 		lev=linphone_event_new_with_out_of_dialog_op(lc,op,LinphoneSubscriptionOutgoing,eventname);
 	}
 	{
-		const LinphoneContent *ct=linphone_content_from_sal_body(&content,body);
+		LinphoneContent *ct=linphone_content_from_sal_body(body);
 		if (ct) linphone_core_notify_notify_received(lc,lev,eventname,ct);
 	}
 	if (st!=SalSubscribeNone){
diff --git a/coreapi/chat.c b/coreapi/chat.c
index a6f2a952d..989350544 100644
--- a/coreapi/chat.c
+++ b/coreapi/chat.c
@@ -96,7 +96,7 @@ static int linphone_chat_message_file_transfer_on_send_body(belle_sip_user_body_
 	char *buf = (char *)buffer;
 
 	/* if we've not reach the end of file yet, ask for more data*/
-	if (offset<chatMsg->file_transfer_information->size){
+	if (offset<linphone_content_get_size(chatMsg->file_transfer_information)){
 		/* get data from call back */
 		linphone_core_notify_file_transfer_send(lc, chatMsg, chatMsg->file_transfer_information, buf, size);
 	}
@@ -130,17 +130,17 @@ static void linphone_chat_message_process_response_from_post_file(void *data, co
 			belle_sip_body_handler_t *first_part_bh;
 
 			/* temporary storage for the Content-disposition header value */
-			first_part_header = belle_sip_strdup_printf("form-data; name=\"File\"; filename=\"%s\"", msg->file_transfer_information->name);
+			first_part_header = belle_sip_strdup_printf("form-data; name=\"File\"; filename=\"%s\"", linphone_content_get_name(msg->file_transfer_information));
 
 			/* create a user body handler to take care of the file and add the content disposition and content-type headers */
 			if (msg->file_transfer_filepath != NULL) {
 				first_part_bh=(belle_sip_body_handler_t *)belle_sip_file_body_handler_new(msg->file_transfer_filepath,NULL,msg);
 			} else {
-				first_part_bh=(belle_sip_body_handler_t *)belle_sip_user_body_handler_new(msg->file_transfer_information->size,NULL,NULL,linphone_chat_message_file_transfer_on_send_body,msg);
+				first_part_bh=(belle_sip_body_handler_t *)belle_sip_user_body_handler_new(linphone_content_get_size(msg->file_transfer_information),NULL,NULL,linphone_chat_message_file_transfer_on_send_body,msg);
 			}
 			belle_sip_body_handler_add_header(first_part_bh, belle_sip_header_create("Content-disposition", first_part_header));
 			belle_sip_free(first_part_header);
-			belle_sip_body_handler_add_header(first_part_bh, (belle_sip_header_t *)belle_sip_header_content_type_create(msg->file_transfer_information->type, msg->file_transfer_information->subtype));
+			belle_sip_body_handler_add_header(first_part_bh, (belle_sip_header_t *)belle_sip_header_content_type_create(linphone_content_get_type(msg->file_transfer_information), linphone_content_get_subtype(msg->file_transfer_information)));
 
 			/* insert it in a multipart body handler which will manage the boundaries of multipart message */
 			bh=belle_sip_multipart_body_handler_new(linphone_chat_message_file_transfer_on_progress, msg, first_part_bh);
@@ -531,7 +531,7 @@ void linphone_core_message_received(LinphoneCore *lc, SalOp *op, const SalMessag
 
 		msg = linphone_chat_room_create_message(cr, NULL); /* create a message with empty body */
 		msg->content_type = ms_strdup(sal_msg->content_type); /* add the content_type "application/vnd.gsma.rcs-ft-http+xml" */
-		msg->file_transfer_information = ms_new0(LinphoneContent,1);
+		msg->file_transfer_information = linphone_content_new();
 
 		/* parse the message body to get all informations from it */
 		xmlMessageBody = xmlParseDoc((const xmlChar *)sal_msg->text);
@@ -547,21 +547,27 @@ void linphone_core_message_received(LinphoneCore *lc, SalOp *op, const SalMessag
 						while (cur!=NULL) {
 							if (!xmlStrcmp(cur->name, (const xmlChar *)"file-size")) {
 								xmlChar *fileSizeString = xmlNodeListGetString(xmlMessageBody, cur->xmlChildrenNode, 1);
-								msg->file_transfer_information->size = strtol((const char*)fileSizeString, NULL, 10);
+								linphone_content_set_size(msg->file_transfer_information, strtol((const char*)fileSizeString, NULL, 10));
 								xmlFree(fileSizeString);
 							}
 
 							if (!xmlStrcmp(cur->name, (const xmlChar *)"file-name")) {
-								msg->file_transfer_information->name = (char *)xmlNodeListGetString(xmlMessageBody, cur->xmlChildrenNode, 1);
+								linphone_content_set_name(msg->file_transfer_information, (const char *)xmlNodeListGetString(xmlMessageBody, cur->xmlChildrenNode, 1));
 							}
 							if (!xmlStrcmp(cur->name, (const xmlChar *)"content-type")) {
 								xmlChar *contentType = xmlNodeListGetString(xmlMessageBody, cur->xmlChildrenNode, 1);
 								int contentTypeIndex = 0;
+								char *type;
+								char *subtype;
 								while (contentType[contentTypeIndex]!='/' && contentType[contentTypeIndex]!='\0') {
 									contentTypeIndex++;
 								}
-								msg->file_transfer_information->type = ms_strndup((char *)contentType, contentTypeIndex);
-								msg->file_transfer_information->subtype = ms_strdup(((char *)contentType+contentTypeIndex+1));
+								type = ms_strndup((char *)contentType, contentTypeIndex);
+								subtype = ms_strdup(((char *)contentType+contentTypeIndex+1));
+								linphone_content_set_type(msg->file_transfer_information, type);
+								linphone_content_set_subtype(msg->file_transfer_information, subtype);
+								ms_free(subtype);
+								ms_free(type);
 								xmlFree(contentType);
 							}
 							if (!xmlStrcmp(cur->name, (const xmlChar *)"data")) {
@@ -1024,28 +1030,27 @@ static void on_recv_body(belle_sip_user_body_handler_t *bh, belle_sip_message_t
 
 
 static LinphoneContent* linphone_chat_create_file_transfer_information_from_headers(const belle_sip_message_t* message ){
-	LinphoneContent *content = ms_new0(LinphoneContent,1);
+	LinphoneContent *content = linphone_content_new();
 
 	belle_sip_header_content_length_t* content_length_hdr = BELLE_SIP_HEADER_CONTENT_LENGTH(belle_sip_message_get_header(message, "Content-Length"));
 	belle_sip_header_content_type_t* content_type_hdr = BELLE_SIP_HEADER_CONTENT_TYPE(belle_sip_message_get_header(message, "Content-Type"));
 	const char* type = NULL,*subtype = NULL;
 
-	content->name = ms_strdup("");
+	linphone_content_set_name(content, "");
 
 	if( content_type_hdr ){
 		type = belle_sip_header_content_type_get_type(content_type_hdr);
 		subtype = belle_sip_header_content_type_get_subtype(content_type_hdr);
 		ms_message("Extracted content type %s / %s from header", type?type:"", subtype?subtype:"");
-		if( type ) content->type = ms_strdup(type);
-		if( subtype ) content->type = ms_strdup(subtype);
+		if( type ) linphone_content_set_type(content, type);
+		if( subtype ) linphone_content_set_subtype(content, subtype);
 	}
 
 	if( content_length_hdr ){
-		content->size = belle_sip_header_content_length_get_content_length(content_length_hdr);
-		ms_message("Extracted content length %i from header", (int)content->size);
+		linphone_content_set_size(content, belle_sip_header_content_length_get_content_length(content_length_hdr));
+		ms_message("Extracted content length %i from header", (int)linphone_content_get_size(content));
 	}
 
-
 	return content;
 }
 
@@ -1063,7 +1068,7 @@ static void linphone_chat_process_response_headers_from_get_file(void *data, con
 		}
 
 		if( message->file_transfer_information ){
-			body_size = message->file_transfer_information->size;
+			body_size = linphone_content_get_size(message->file_transfer_information);
 		}
 
 		if (message->file_transfer_filepath == NULL) {
@@ -1318,8 +1323,7 @@ static void _linphone_chat_message_destroy(LinphoneChatMessage* msg) {
 	if (msg->custom_headers) sal_custom_header_free(msg->custom_headers);
 	if (msg->content_type) ms_free(msg->content_type);
 	if (msg->file_transfer_information) {
-		linphone_content_uninit(msg->file_transfer_information);
-		ms_free(msg->file_transfer_information);
+		linphone_content_unref(msg->file_transfer_information);
 	}
 	if (msg->file_transfer_filepath != NULL) {
 		ms_free(msg->file_transfer_filepath);
@@ -1385,7 +1389,7 @@ const char * linphone_chat_message_get_file_transfer_filepath(LinphoneChatMessag
 /**
  * Create a message attached to a dedicated chat room with a particular content. Use #linphone_chat_room_send_message2 to initiate the transfer
  * @param cr the chat room.
- * @param a #LinphoneContent initial content. #LinphoneCoreVTable.file_transfer_send is invoked later to notify file transfer progress and collect next chunk of the message if #LinphoneContent.data is NULL.
+ * @param initial_content #LinphoneContent initial content. #LinphoneCoreVTable.file_transfer_send is invoked later to notify file transfer progress and collect next chunk of the message if #LinphoneContent.data is NULL.
  * @return a new #LinphoneChatMessage
  */
 
@@ -1393,8 +1397,7 @@ LinphoneChatMessage* linphone_chat_room_create_file_transfer_message(LinphoneCha
 	LinphoneChatMessage* msg = belle_sip_object_new(LinphoneChatMessage);
 	msg->chat_room=(LinphoneChatRoom*)cr;
 	msg->message = NULL;
-	msg->file_transfer_information = ms_new0(LinphoneContent,1);
-	linphone_content_copy(msg->file_transfer_information, initial_content);
+	msg->file_transfer_information = linphone_content_copy(initial_content);
 	msg->dir=LinphoneChatMessageOutgoing;
 	linphone_chat_message_set_to(msg, linphone_chat_room_get_peer_address(cr));
 	linphone_chat_message_set_from(msg, linphone_address_new(linphone_core_get_identity(cr->lc)));
diff --git a/coreapi/content.c b/coreapi/content.c
new file mode 100644
index 000000000..944ebb2e0
--- /dev/null
+++ b/coreapi/content.c
@@ -0,0 +1,205 @@
+/*
+linphone
+Copyright (C) 2010-2014 Belledonne Communications SARL
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+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.
+*/
+
+#include "linphonecore.h"
+#include "private.h"
+
+
+
+static void linphone_content_destroy(LinphoneContent *content) {
+	if (content->lcp.type) belle_sip_free(content->lcp.type);
+	if (content->lcp.subtype) belle_sip_free(content->lcp.subtype);
+	if (content->lcp.data) belle_sip_free(content->lcp.data);
+	if (content->lcp.encoding) belle_sip_free(content->lcp.encoding);
+	if (content->lcp.name) belle_sip_free(content->lcp.name);
+}
+
+static void linphone_content_clone(LinphoneContent *obj, const LinphoneContent *ref) {
+	void *data;
+	linphone_content_set_type(obj, linphone_content_get_type(ref));
+	linphone_content_set_subtype(obj, linphone_content_get_subtype(ref));
+	linphone_content_set_encoding(obj, linphone_content_get_encoding(ref));
+	linphone_content_set_name(obj, linphone_content_get_name(ref));
+	linphone_content_set_size(obj, linphone_content_get_size(ref));
+	data = linphone_content_get_data(ref);
+	if (data != NULL) {
+		size_t size = linphone_content_get_size(ref);
+		void *objdata = belle_sip_malloc(size + 1);
+		memcpy(objdata, data, size);
+		((char *)objdata)[size] = '\0';
+		linphone_content_set_data(obj, objdata);
+	}
+}
+
+
+BELLE_SIP_DECLARE_NO_IMPLEMENTED_INTERFACES(LinphoneContent);
+
+BELLE_SIP_INSTANCIATE_VPTR(LinphoneContent, belle_sip_object_t,
+	(belle_sip_object_destroy_t)linphone_content_destroy,
+	(belle_sip_object_clone_t)linphone_content_clone,
+	NULL, // marshal
+	TRUE
+);
+
+
+LinphoneContent * linphone_core_create_content(LinphoneCore *lc) {
+	return linphone_content_new();
+}
+
+LinphoneContent * linphone_content_ref(LinphoneContent *content) {
+	belle_sip_object_ref(content);
+	return content;
+}
+
+void linphone_content_unref(LinphoneContent *content) {
+	belle_sip_object_unref(content);
+}
+
+void *linphone_content_get_user_data(const LinphoneContent *content) {
+	return content->user_data;
+}
+
+void linphone_content_set_user_data(LinphoneContent *content, void *ud) {
+	content->user_data = ud;
+}
+
+const char * linphone_content_get_type(const LinphoneContent *content) {
+	return content->lcp.type;
+}
+
+void linphone_content_set_type(LinphoneContent *content, const char *type) {
+	if (content->lcp.type != NULL) {
+		belle_sip_free(content->lcp.type);
+		content->lcp.type = NULL;
+	}
+	if (type != NULL) {
+		content->lcp.type = belle_sip_strdup(type);
+	}
+}
+
+const char * linphone_content_get_subtype(const LinphoneContent *content) {
+	return content->lcp.subtype;
+}
+
+void linphone_content_set_subtype(LinphoneContent *content, const char *subtype) {
+	if (content->lcp.subtype != NULL) {
+		belle_sip_free(content->lcp.subtype);
+		content->lcp.subtype = NULL;
+	}
+	if (subtype != NULL) {
+		content->lcp.subtype = belle_sip_strdup(subtype);
+	}
+}
+
+void * linphone_content_get_data(const LinphoneContent *content) {
+	return content->lcp.data;
+}
+
+void linphone_content_set_data(LinphoneContent *content, void *data) {
+	content->lcp.data = data;
+}
+
+size_t linphone_content_get_size(const LinphoneContent *content) {
+	return content->lcp.size;
+}
+
+void linphone_content_set_size(LinphoneContent *content, size_t size) {
+	content->lcp.size = size;
+}
+
+const char * linphone_content_get_encoding(const LinphoneContent *content) {
+	return content->lcp.encoding;
+}
+
+void linphone_content_set_encoding(LinphoneContent *content, const char *encoding) {
+	if (content->lcp.encoding != NULL) {
+		belle_sip_free(content->lcp.encoding);
+		content->lcp.encoding = NULL;
+	}
+	if (encoding != NULL) {
+		content->lcp.encoding = belle_sip_strdup(encoding);
+	}
+}
+
+const char * linphone_content_get_name(const LinphoneContent *content) {
+	return content->lcp.name;
+}
+
+void linphone_content_set_name(LinphoneContent *content, const char *name) {
+	if (content->lcp.name != NULL) {
+		belle_sip_free(content->lcp.name);
+		content->lcp.name = NULL;
+	}
+	if (name != NULL) {
+		content->lcp.name = belle_sip_strdup(name);
+	}
+}
+
+
+
+LinphoneContent * linphone_content_new(void) {
+	LinphoneContent *content = belle_sip_object_new(LinphoneContent);
+	belle_sip_object_ref(content);
+	return content;
+}
+
+LinphoneContent * linphone_content_copy(const LinphoneContent *ref) {
+	return (LinphoneContent *)belle_sip_object_ref(belle_sip_object_clone(BELLE_SIP_OBJECT(ref)));
+}
+
+LinphoneContent * linphone_content_from_sal_body(const SalBody *ref) {
+	if (ref && ref->type) {
+		void *objdata;
+		LinphoneContent *content = linphone_content_new();
+		linphone_content_set_type(content, ref->type);
+		linphone_content_set_subtype(content, ref->subtype);
+		linphone_content_set_encoding(content, ref->encoding);
+		linphone_content_set_size(content, ref->size);
+		objdata = belle_sip_malloc(ref->size + 1);
+		memcpy(objdata, ref->data, ref->size);
+		((char *)objdata)[ref->size] = '\0';
+		linphone_content_set_data(content, objdata);
+		return content;
+	}
+	return NULL;
+}
+
+SalBody *sal_body_from_content(SalBody *body, const LinphoneContent *content) {
+	if (content && linphone_content_get_type(content)) {
+		body->type = linphone_content_get_type(content);
+		body->subtype = linphone_content_get_subtype(content);
+		body->data = linphone_content_get_data(content);
+		body->size = linphone_content_get_size(content);
+		body->encoding = linphone_content_get_encoding(content);
+		return body;
+	}
+	return NULL;
+}
+
+
+
+LinphoneContent * linphone_content_private_to_linphone_content(const LinphoneContentPrivate *lcp) {
+	LinphoneContent *content = belle_sip_object_new(LinphoneContent);
+	memcpy(&content->lcp, lcp, sizeof(LinphoneContentPrivate));
+	return content;
+}
+
+LinphoneContentPrivate * linphone_content_to_linphone_content_private(const LinphoneContent *content) {
+	return (LinphoneContentPrivate *)&content->lcp;
+}
diff --git a/coreapi/content.h b/coreapi/content.h
new file mode 100644
index 000000000..24f137857
--- /dev/null
+++ b/coreapi/content.h
@@ -0,0 +1,213 @@
+/*
+content.h
+Copyright (C) 2010-2014 Belledonne Communications SARL
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+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.
+*/
+
+#ifndef LINPHONE_CONTENT_H_
+#define LINPHONE_CONTENT_H_
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/**
+ * @addtogroup misc
+ * @{
+ */
+
+/**
+ * The LinphoneContent object holds data that can be embedded in a signaling message.
+**/
+struct _LinphoneContent;
+/**
+ * The LinphoneContent object holds data that can be embedded in a signaling message.
+**/
+typedef struct _LinphoneContent LinphoneContent;
+
+/**
+ * @deprecated Use LinphoneContent objects instead of this structure.
+ */
+struct _LinphoneContentPrivate{
+	char *type; /**<mime type for the data, for example "application"*/
+	char *subtype; /**<mime subtype for the data, for example "html"*/
+	void *data; /**<the actual data buffer, usually a string. Null when provided by callbacks #LinphoneCoreFileTransferSendCb or #LinphoneCoreFileTransferRecvCb*/
+	size_t size; /**<the size of the data buffer, excluding null character despite null character is always set for convenience.
+				When provided by callback #LinphoneCoreFileTransferSendCb or #LinphoneCoreFileTransferRecvCb, it states the total number of bytes of the transfered file*/
+	char *encoding; /**<The encoding of the data buffer, for example "gzip"*/
+	char *name; /**< used by RCS File transfer messages to store the original filename of the file to be downloaded from server */
+};
+
+/**
+ * Alias to the LinphoneContentPrivate struct.
+ * @deprecated
+**/
+typedef struct _LinphoneContentPrivate LinphoneContentPrivate;
+
+/**
+ * Convert a LinphoneContentPrivate structure to a LinphoneContent object.
+ * @deprecated Utility macro to ease porting existing code from LinphoneContentPrivate structure (old LinphoneContent structure) to new LinphoneContent object.
+ */
+#define LINPHONE_CONTENT(lcp) linphone_content_private_to_linphone_content(lcp)
+
+/**
+ * Convert a LinphoneContentPrivate structure to a LinphoneContent object.
+ * @deprecated Utility function to ease porting existing code from LinphoneContentPrivate structure (old LinphoneContent structure) to new LinphoneContent object.
+ */
+LINPHONE_PUBLIC LinphoneContent * linphone_content_private_to_linphone_content(const LinphoneContentPrivate *lcp);
+
+/**
+ * Convert a LinphoneContent object to a LinphoneContentPrivate structure.
+ * @deprecated Utility macro to ease porting existing code from LinphoneContentPrivate structure (old LinphoneContent structure) to new LinphoneContent object.
+ */
+#define LINPHONE_CONTENT_PRIVATE(lc) linphone_content_to_linphone_content_private(lc)
+
+/**
+ * Convert a LinphoneContent object to a LinphoneContentPrivate structure.
+ * @deprecated Utility function to ease porting existing code from LinphoneContentPrivate structure (old LinphoneContent structure) to new LinphoneContent object.
+ */
+LINPHONE_PUBLIC LinphoneContentPrivate * linphone_content_to_linphone_content_private(const LinphoneContent *content);
+
+/**
+ * Create a content with default values from Linphone core.
+ * @param[in] lc LinphoneCore object
+ * @return LinphoneContent object with default values set
+ */
+LINPHONE_PUBLIC LinphoneContent * linphone_core_create_content(LinphoneCore *lc);
+
+/**
+ * Acquire a reference to the content.
+ * @param[in] content LinphoneContent object.
+ * @return The same LinphoneContent object.
+**/
+LINPHONE_PUBLIC LinphoneContent * linphone_content_ref(LinphoneContent *content);
+
+/**
+ * Release reference to the content.
+ * @param[in] content LinphoneContent object.
+**/
+LINPHONE_PUBLIC void linphone_content_unref(LinphoneContent *content);
+
+/**
+ * Retrieve the user pointer associated with the content.
+ * @param[in] content LinphoneContent object.
+ * @return The user pointer associated with the content.
+**/
+LINPHONE_PUBLIC void *linphone_content_get_user_data(const LinphoneContent *content);
+
+/**
+ * Assign a user pointer to the content.
+ * @param[in] content LinphoneContent object.
+ * @param[in] ud The user pointer to associate with the content.
+**/
+LINPHONE_PUBLIC void linphone_content_set_user_data(LinphoneContent *content, void *ud);
+
+/**
+ * Get the mime type of the content data.
+ * @param[in] content LinphoneContent object.
+ * @return The mime type of the content data, for example "application".
+ */
+LINPHONE_PUBLIC const char * linphone_content_get_type(const LinphoneContent *content);
+
+/**
+ * Set the mime type of the content data.
+ * @param[in] content LinphoneContent object.
+ * @param[in] type The mime type of the content data, for example "application".
+ */
+LINPHONE_PUBLIC void linphone_content_set_type(LinphoneContent *content, const char *type);
+
+/**
+ * Get the mime subtype of the content data.
+ * @param[in] content LinphoneContent object.
+ * @return The mime subtype of the content data, for example "html".
+ */
+LINPHONE_PUBLIC const char * linphone_content_get_subtype(const LinphoneContent *content);
+
+/**
+ * Set the mime subtype of the content data.
+ * @param[in] content LinphoneContent object.
+ * @param[in] subtype The mime subtype of the content data, for example "html".
+ */
+LINPHONE_PUBLIC void linphone_content_set_subtype(LinphoneContent *content, const char *subtype);
+
+/**
+ * Get the content data buffer, usually a string.
+ * @param[in] content LinphoneContent object.
+ * @return The content data buffer.
+ */
+LINPHONE_PUBLIC void * linphone_content_get_data(const LinphoneContent *content);
+
+/**
+ * Set the content data buffer, usually a string.
+ * @param[in] content LinphoneContent object.
+ * @param[in] data The content data buffer.
+ */
+LINPHONE_PUBLIC void linphone_content_set_data(LinphoneContent *content, void *data);
+
+/**
+ * Get the content data size, excluding null character despite null character is always set for convenience.
+ * @param[in] content LinphoneContent object.
+ * @return The content data size.
+ */
+LINPHONE_PUBLIC size_t linphone_content_get_size(const LinphoneContent *content);
+
+/**
+ * Set the content data size, excluding null character despite null character is always set for convenience.
+ * @param[in] content LinphoneContent object
+ * @param[in] size The content data size.
+ */
+LINPHONE_PUBLIC void linphone_content_set_size(LinphoneContent *content, size_t size);
+
+/**
+ * Get the encoding of the data buffer, for example "gzip".
+ * @param[in] content LinphoneContent object.
+ * @return The encoding of the data buffer.
+ */
+LINPHONE_PUBLIC const char * linphone_content_get_encoding(const LinphoneContent *content);
+
+/**
+ * Set the encoding of the data buffer, for example "gzip".
+ * @param[in] content LinphoneContent object.
+ * @param[in] encoding The encoding of the data buffer.
+ */
+LINPHONE_PUBLIC void linphone_content_set_encoding(LinphoneContent *content, const char *encoding);
+
+/**
+ * Get the name associated with a RCS file transfer message. It is used to store the original filename of the file to be downloaded from server.
+ * @param[in] content LinphoneContent object.
+ * @return The name of the content.
+ */
+LINPHONE_PUBLIC const char * linphone_content_get_name(const LinphoneContent *content);
+
+/**
+ * Set the name associated with a RCS file transfer message. It is used to store the original filename of the file to be downloaded from server.
+ * @param[in] content LinphoneContent object.
+ * @param[in] name The name of the content.
+ */
+LINPHONE_PUBLIC void linphone_content_set_name(LinphoneContent *content, const char *name);
+
+/**
+ * @}
+ */
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LINPHONE_CONTENT_H_ */
diff --git a/coreapi/help/filetransfer.c b/coreapi/help/filetransfer.c
index 035a05597..205a51d31 100644
--- a/coreapi/help/filetransfer.c
+++ b/coreapi/help/filetransfer.c
@@ -54,8 +54,8 @@ static void file_transfer_progress_indication(LinphoneCore *lc, LinphoneChatMess
 	char *address = linphone_chat_message_is_outgoing(message)?linphone_address_as_string(to_address):linphone_address_as_string(from_address);
 	printf(" File transfer  [%d%%] %s of type [%s/%s] %s [%s] \n", (int)((offset *100)/total)
 																	,(linphone_chat_message_is_outgoing(message)?"sent":"received")
-																	, content->type
-																	, content->subtype
+																	, linphone_content_get_type(content)
+																	, linphone_content_get_subtype(content)
 																	,(linphone_chat_message_is_outgoing(message)?"to":"from")
 																	, address);
 	free(address);
@@ -131,7 +131,7 @@ static void linphone_file_transfer_state_changed(LinphoneChatMessage* msg,Linpho
  */
 static void message_received(LinphoneCore *lc, LinphoneChatRoom *cr, LinphoneChatMessage *msg) {
 	const LinphoneContent *file_transfer_info = linphone_chat_message_get_file_transfer_information(msg);
-	printf ("Do you really want to download %s (size %ld)?[Y/n]\nOk, let's go\n", file_transfer_info->name, (long int)file_transfer_info->size);
+	printf ("Do you really want to download %s (size %ld)?[Y/n]\nOk, let's go\n", linphone_content_get_name(file_transfer_info), (long int)linphone_content_get_size(file_transfer_info));
 
 	linphone_chat_message_start_file_download(msg, linphone_file_transfer_state_changed, NULL);
 
@@ -145,7 +145,7 @@ int main(int argc, char *argv[]){
 	int i;
 	const char* big_file_content="big file";
 	LinphoneChatRoom* chat_room;
-	LinphoneContent content;
+	LinphoneContent* content;
 	LinphoneChatMessage* chat_message;
 
 	/*seting dummy file content to something*/
@@ -189,14 +189,14 @@ int main(int argc, char *argv[]){
 	/*Next step is to create a chat room*/
 	chat_room = linphone_core_create_chat_room(lc,dest_friend);
 
-	memset(&content,0,sizeof(content));
-	content.type="text";
-	content.subtype="plain";
-	content.size=sizeof(big_file); /*total size to be transfered*/
-	content.name = "bigfile.txt";
+	content = linphone_core_create_content(lc);
+	linphone_content_set_type(content,"text");
+	linphone_content_set_subtype(content,"plain");
+	linphone_content_set_size(content,sizeof(big_file)); /*total size to be transfered*/
+	linphone_content_set_name(content,"bigfile.txt");
 
 	/*now create a chat message with custom content*/
-	chat_message = linphone_chat_room_create_file_transfer_message(chat_room,&content);
+	chat_message = linphone_chat_room_create_file_transfer_message(chat_room,content);
 	if (chat_message == NULL) {
 		printf("returned message is null\n");
 	}
@@ -212,6 +212,7 @@ int main(int argc, char *argv[]){
 
 
 	printf("Shutting down...\n");
+	linphone_content_unref(content);
 	linphone_chat_room_destroy(chat_room);
 	linphone_core_destroy(lc);
 	printf("Exited\n");
diff --git a/coreapi/help/notify.c b/coreapi/help/notify.c
index 27077d92f..bdfae0835 100644
--- a/coreapi/help/notify.c
+++ b/coreapi/help/notify.c
@@ -152,12 +152,12 @@ int main(int argc, char *argv[]){
 		ms_usleep(50000);
 		++i;
 		if (data->ev && i%100==0){
-			LinphoneContent content;
+			LinphoneContentPrivate content;
 			content.type="application";
 			content.subtype="goodxml";
 			content.data="really cool";
 			content.size=strlen((const char*)content.data);
-			linphone_event_notify(data->ev,&content);
+			linphone_event_notify(data->ev,LINPHONE_CONTENT(&content));
 		}
 	}
 
diff --git a/coreapi/info.c b/coreapi/info.c
index ad8cd1f8e..6b2eb33fa 100644
--- a/coreapi/info.c
+++ b/coreapi/info.c
@@ -29,98 +29,23 @@
 
 
 struct _LinphoneInfoMessage{
-	LinphoneContent content;
+	LinphoneContent *content;
 	SalCustomHeader *headers;
 };
 
-#define SET_STRING(ptr,field,val) \
-	if (ptr->field) { \
-		ms_free(ptr->field); \
-		ptr->field=NULL; \
-	} \
-	if (val){ \
-		ptr->field=ms_strdup(val); \
-	}
-
-void linphone_content_copy(LinphoneContent *obj, const LinphoneContent *ref){
-	SET_STRING(obj,type,ref->type);
-	SET_STRING(obj,subtype,ref->subtype);
-	SET_STRING(obj,encoding,ref->encoding);
-	SET_STRING(obj,name,ref->name);
-	if (obj->data) {
-		ms_free(obj->data);
-		obj->data=NULL;
-	}
-	if (ref->data){
-		obj->data=ms_malloc(ref->size+1);
-		memcpy(obj->data, ref->data, ref->size);
-		((char*)obj->data)[ref->size]='\0';
-	}
-	obj->size=ref->size;
-}
-
-void linphone_content_uninit(LinphoneContent * obj){
-	if (obj->type) ms_free(obj->type);
-	if (obj->subtype) ms_free(obj->subtype);
-	if (obj->data) ms_free(obj->data);
-	if (obj->encoding) ms_free(obj->encoding);
-	if (obj->name) ms_free(obj->name);
-}
-
-LinphoneContent *linphone_content_copy_from_sal_body(LinphoneContent *obj, const SalBody *ref){
-	SET_STRING(obj,type,ref->type);
-	SET_STRING(obj,subtype,ref->subtype);
-	SET_STRING(obj,encoding,ref->encoding);
-	if (obj->data) {
-		ms_free(obj->data);
-		obj->data=NULL;
-	}
-	if (ref->data){
-		obj->data=ms_malloc(ref->size+1);
-		memcpy(obj->data, ref->data, ref->size);
-		((char*)obj->data)[ref->size]='\0';
-	}
-	obj->size=ref->size;
-	return obj;
-}
-
-const LinphoneContent *linphone_content_from_sal_body(LinphoneContent *obj, const SalBody *ref){
-	if (ref && ref->type){
-		obj->type=(char*)ref->type;
-		obj->subtype=(char*)ref->subtype;
-		obj->data=(void*)ref->data;
-		obj->encoding=(char*)ref->encoding;
-		obj->size=ref->size;
-		return obj;
-	}
-	return NULL;
-}
-
-SalBody *sal_body_from_content(SalBody *body, const LinphoneContent *lc){
-	if (lc && lc->type){
-		body->type=lc->type;
-		body->subtype=lc->subtype;
-		body->data=lc->data;
-		body->size=lc->size;
-		body->encoding=lc->encoding;
-		return body;
-	}
-	return NULL;
-}
-
 /**
  * Destroy a LinphoneInfoMessage
 **/
 void linphone_info_message_destroy(LinphoneInfoMessage *im){
-	linphone_content_uninit(&im->content);
-	sal_custom_header_free(im->headers);
+	if (im->content) linphone_content_unref(im->content);
+	if (im->headers) sal_custom_header_free(im->headers);
 	ms_free(im);
 }
 
 
 LinphoneInfoMessage *linphone_info_message_copy(const LinphoneInfoMessage *orig){
 	LinphoneInfoMessage *im=ms_new0(LinphoneInfoMessage,1);
-	linphone_content_copy(&im->content,&orig->content);
+	if (orig->content) im->content=linphone_content_copy(orig->content);
 	if (orig->headers) im->headers=sal_custom_header_clone(orig->headers);
 	return im;
 }
@@ -146,7 +71,7 @@ LinphoneInfoMessage *linphone_core_create_info_message(LinphoneCore *lc){
 int linphone_call_send_info_message(LinphoneCall *call, const LinphoneInfoMessage *info){
 	SalBody body;
 	sal_op_set_sent_custom_header(call->op,info->headers);
-	return sal_send_info(call->op,NULL, NULL, sal_body_from_content(&body,&info->content));
+	return sal_send_info(call->op,NULL, NULL, sal_body_from_content(&body,info->content));
 }
 
 /**
@@ -176,14 +101,14 @@ const char *linphone_info_message_get_header(const LinphoneInfoMessage *im, cons
  * All fields of the LinphoneContent are copied, thus the application can destroy/modify/recycloe the content object freely ater the function returns.
 **/
 void linphone_info_message_set_content(LinphoneInfoMessage *im,  const LinphoneContent *content){
-	linphone_content_copy(&im->content,content);
+	im->content=linphone_content_copy(content);
 }
 
 /**
  * Returns the info message's content as a #LinphoneContent structure.
 **/
 const LinphoneContent * linphone_info_message_get_content(const LinphoneInfoMessage *im){
-	return im->content.type ? &im->content : NULL;
+	return (im->content && linphone_content_get_type(im->content)) ? im->content : NULL;
 }
 
 void linphone_core_notify_info_message(LinphoneCore* lc,SalOp *op, const SalBody *body){
@@ -191,7 +116,7 @@ void linphone_core_notify_info_message(LinphoneCore* lc,SalOp *op, const SalBody
 	if (call){
 		LinphoneInfoMessage *info=ms_new0(LinphoneInfoMessage,1);
 		info->headers=sal_custom_header_clone(sal_op_get_recv_custom_header(op));
-		if (body) linphone_content_copy_from_sal_body(&info->content,body);
+		if (body) info->content=linphone_content_from_sal_body(body);
 		linphone_core_notify_info_received(lc,call,info);
 		linphone_info_message_destroy(info);
 	}
diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index c36c5894d..3ead49966 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -354,7 +354,7 @@ static int log_collection_upload_on_send_body(belle_sip_user_body_handler_t *bh,
 	LinphoneCore *core = (LinphoneCore *)data;
 
 	/* If we've not reach the end of file yet, fill the buffer with more data */
-	if (offset < core->log_collection_upload_information->size) {
+	if (offset < linphone_content_get_size(core->log_collection_upload_information)) {
 		char *log_filename = ms_strdup_printf("%s/%s_log.%s",
 			liblinphone_log_collection_path ? liblinphone_log_collection_path : LOG_COLLECTION_DEFAULT_PATH,
 			liblinphone_log_collection_prefix ? liblinphone_log_collection_prefix : LOG_COLLECTION_DEFAULT_PREFIX,
@@ -410,13 +410,14 @@ static void process_response_from_post_file_log_collection(void *data, const bel
 			linphone_core_notify_log_collection_upload_state_changed(core, LinphoneCoreLogCollectionUploadStateInProgress, NULL);
 
 			/* Temporary storage for the Content-disposition header value */
-			first_part_header = belle_sip_strdup_printf("form-data; name=\"File\"; filename=\"%s\"", core->log_collection_upload_information->name);
+			first_part_header = belle_sip_strdup_printf("form-data; name=\"File\"; filename=\"%s\"", linphone_content_get_name(core->log_collection_upload_information));
 
 			/* Create a user body handler to take care of the file and add the content disposition and content-type headers */
-			first_part_bh = belle_sip_user_body_handler_new(core->log_collection_upload_information->size, NULL, NULL, log_collection_upload_on_send_body, core);
+			first_part_bh = belle_sip_user_body_handler_new(linphone_content_get_size(core->log_collection_upload_information), NULL, NULL, log_collection_upload_on_send_body, core);
 			belle_sip_body_handler_add_header((belle_sip_body_handler_t *)first_part_bh, belle_sip_header_create("Content-disposition", first_part_header));
 			belle_sip_free(first_part_header);
-			belle_sip_body_handler_add_header((belle_sip_body_handler_t *)first_part_bh, (belle_sip_header_t *)belle_sip_header_content_type_create(core->log_collection_upload_information->type, core->log_collection_upload_information->subtype));
+			belle_sip_body_handler_add_header((belle_sip_body_handler_t *)first_part_bh,
+				(belle_sip_header_t *)belle_sip_header_content_type_create(linphone_content_get_type(core->log_collection_upload_information), linphone_content_get_subtype(core->log_collection_upload_information)));
 
 			/* Insert it in a multipart body handler which will manage the boundaries of multipart message */
 			bh = belle_sip_multipart_body_handler_new(log_collection_upload_on_progress, core, (belle_sip_body_handler_t *)first_part_bh);
@@ -553,6 +554,7 @@ void linphone_core_upload_log_collection(LinphoneCore *core) {
 		belle_http_request_listener_t *l;
 		belle_generic_uri_t *uri;
 		belle_http_request_t *req;
+		char *name;
 
 		core->log_collection_upload_information = (LinphoneContent *)malloc(sizeof(LinphoneContent));
 		memset(core->log_collection_upload_information, 0, sizeof(LinphoneContent));
@@ -560,14 +562,15 @@ void linphone_core_upload_log_collection(LinphoneCore *core) {
 		core->log_collection_upload_information->type = "application";
 		core->log_collection_upload_information->subtype = "gzip";
 #else
-		core->log_collection_upload_information->type = "text";
-		core->log_collection_upload_information->subtype = "plain";
+		linphone_content_set_type(core->log_collection_upload_information, "text");
+		linphone_content_set_subtype(core->log_collection_upload_information,"plain");
 #endif
-		core->log_collection_upload_information->name = ms_strdup_printf("%s_log.%s",
+		name = ms_strdup_printf("%s_log.%s",
 			liblinphone_log_collection_prefix ? liblinphone_log_collection_prefix : LOG_COLLECTION_DEFAULT_PREFIX,
 			COMPRESSED_LOG_COLLECTION_EXTENSION);
-		if (prepare_log_collection_file_to_upload(core->log_collection_upload_information->name) < 0) return;
-		core->log_collection_upload_information->size = get_size_of_file_to_upload(core->log_collection_upload_information->name);
+		linphone_content_set_name(core->log_collection_upload_information, name);
+		if (prepare_log_collection_file_to_upload(name) < 0) return;
+		linphone_content_set_size(core->log_collection_upload_information, get_size_of_file_to_upload(name));
 		uri = belle_generic_uri_parse(linphone_core_get_log_collection_upload_server_url(core));
 		req = belle_http_request_create("POST", uri, NULL, NULL, NULL);
 		cbs.process_response = process_response_from_post_file_log_collection;
@@ -575,6 +578,7 @@ void linphone_core_upload_log_collection(LinphoneCore *core) {
 		cbs.process_auth_requested = process_auth_requested_upload_log_collection;
 		l = belle_http_request_listener_create_from_callbacks(&cbs, core);
 		belle_http_provider_send_request(core->http_provider, req, l);
+		ms_free(name);
 	}
 }
 
diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h
index 33dd95df2..add43e4a0 100644
--- a/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@ -126,26 +126,6 @@ typedef struct SalAddress LinphoneAddress;
 
 typedef struct belle_sip_dict LinphoneDictionary;
 
-/**
- * The LinphoneContent struct holds data that can be embedded in a signaling message.
- * @ingroup misc
-**/
-struct _LinphoneContent{
-	char *type; /**<mime type for the data, for example "application"*/
-	char *subtype; /**<mime subtype for the data, for example "html"*/
-	void *data; /**<the actual data buffer, usually a string. Null when provided by callbacks #LinphoneCoreFileTransferSendCb or #LinphoneCoreFileTransferRecvCb*/
-	size_t size; /**<the size of the data buffer, excluding null character despite null character is always set for convenience.
-				When provided by callback #LinphoneCoreFileTransferSendCb or #LinphoneCoreFileTransferRecvCb, it states the total number of bytes of the transfered file*/
-	char *encoding; /**<The encoding of the data buffer, for example "gzip"*/
-	char *name; /**< used by RCS File transfer messages to store the original filename of the file to be downloaded from server */
-};
-
-/**
- * Alias to the LinphoneContent struct.
- * @ingroup misc
-**/
-typedef struct _LinphoneContent LinphoneContent;
-
 /**
  * The LinphoneCall object represents a call issued or received by the LinphoneCore
  * @ingroup call_control
@@ -386,15 +366,17 @@ LINPHONE_PUBLIC const char* linphone_privacy_to_string(LinphonePrivacy privacy);
 
 
 #ifdef IN_LINPHONE
-#include "linphonefriend.h"
-#include "event.h"
 #include "call_log.h"
 #include "call_params.h"
+#include "content.h"
+#include "event.h"
+#include "linphonefriend.h"
 #else
-#include "linphone/linphonefriend.h"
-#include "linphone/event.h"
 #include "linphone/call_log.h"
 #include "linphone/call_params.h"
+#include "linphone/content.h"
+#include "linphone/event.h"
+#include "linphone/linphonefriend.h"
 #endif
 
 LINPHONE_PUBLIC	LinphoneAddress * linphone_address_new(const char *addr);
diff --git a/coreapi/message_storage.c b/coreapi/message_storage.c
index feb243ba7..7e614ea95 100644
--- a/coreapi/message_storage.c
+++ b/coreapi/message_storage.c
@@ -54,18 +54,15 @@ static int callback_content(void *data, int argc, char **argv, char **colName) {
 	LinphoneChatMessage *message = (LinphoneChatMessage *)data;
 
 	if (message->file_transfer_information) {
-		linphone_content_uninit(message->file_transfer_information);
-		ms_free(message->file_transfer_information);
+		linphone_content_unref(message->file_transfer_information);
 		message->file_transfer_information = NULL;
 	}
-	message->file_transfer_information = (LinphoneContent *)malloc(sizeof(LinphoneContent));
-	memset(message->file_transfer_information, 0, sizeof(*(message->file_transfer_information)));
-
-	message->file_transfer_information->type = argv[1] ? ms_strdup(argv[1]) : NULL;
-	message->file_transfer_information->subtype = argv[2] ? ms_strdup(argv[2]) : NULL;
-	message->file_transfer_information->name = argv[3] ? ms_strdup(argv[3]) : NULL;
-	message->file_transfer_information->encoding = argv[4] ? ms_strdup(argv[4]) : NULL;
-	message->file_transfer_information->size = (size_t) atoi(argv[5]);
+	message->file_transfer_information = linphone_content_new();
+	if (argv[1]) linphone_content_set_type(message->file_transfer_information, argv[1]);
+	if (argv[2]) linphone_content_set_subtype(message->file_transfer_information, argv[2]);
+	if (argv[3]) linphone_content_set_name(message->file_transfer_information, argv[3]);
+	if (argv[4]) linphone_content_set_encoding(message->file_transfer_information, argv[4]);
+	linphone_content_set_size(message->file_transfer_information, (size_t)atoi(argv[5]));
 
 	return 0;
 }
@@ -199,11 +196,11 @@ static int linphone_chat_message_store_content(LinphoneChatMessage *msg) {
 	if (lc->db) {
 		LinphoneContent *content = msg->file_transfer_information;
 		char *buf = sqlite3_mprintf("INSERT INTO content VALUES(NULL,%Q,%Q,%Q,%Q,%i,%Q);",
-						content->type,
-						content->subtype,
-						content->name,
-						content->encoding,
-						content->size,
+						linphone_content_get_type(content),
+						linphone_content_get_subtype(content),
+						linphone_content_get_name(content),
+						linphone_content_get_encoding(content),
+						linphone_content_get_size(content),
 						NULL
  					);
 		linphone_sql_request(lc->db, buf);
diff --git a/coreapi/private.h b/coreapi/private.h
index 0a6270a24..8e1bfaf8a 100644
--- a/coreapi/private.h
+++ b/coreapi/private.h
@@ -887,10 +887,9 @@ void linphone_configure_op(LinphoneCore *lc, SalOp *op, const LinphoneAddress *d
 void linphone_call_create_op(LinphoneCall *call);
 int linphone_call_prepare_ice(LinphoneCall *call, bool_t incoming_offer);
 void linphone_core_notify_info_message(LinphoneCore* lc,SalOp *op, const SalBody *body);
-void linphone_content_uninit(LinphoneContent * obj);
-void linphone_content_copy(LinphoneContent *obj, const LinphoneContent *ref);
-LinphoneContent *linphone_content_copy_from_sal_body(LinphoneContent *obj, const SalBody *ref);
-SalBody *sal_body_from_content(SalBody *body, const LinphoneContent *lc);
+LinphoneContent * linphone_content_new(void);
+LinphoneContent * linphone_content_copy(const LinphoneContent *ref);
+SalBody *sal_body_from_content(SalBody *body, const LinphoneContent *content);
 SalReason linphone_reason_to_sal(LinphoneReason reason);
 LinphoneReason linphone_reason_from_sal(SalReason reason);
 LinphoneEvent *linphone_event_new(LinphoneCore *lc, LinphoneSubscriptionDir dir, const char *name, int expires);
@@ -902,9 +901,20 @@ LinphoneEvent *linphone_event_new_with_out_of_dialog_op(LinphoneCore *lc, SalOp
 void linphone_event_set_state(LinphoneEvent *lev, LinphoneSubscriptionState state);
 void linphone_event_set_publish_state(LinphoneEvent *lev, LinphonePublishState state);
 LinphoneSubscriptionState linphone_subscription_state_from_sal(SalSubscribeStatus ss);
-const LinphoneContent *linphone_content_from_sal_body(LinphoneContent *obj, const SalBody *ref);
+LinphoneContent *linphone_content_from_sal_body(const SalBody *ref);
 void linphone_core_invalidate_friend_subscriptions(LinphoneCore *lc);
 
+
+struct _LinphoneContent {
+	belle_sip_object_t base;
+	void *user_data;
+	struct _LinphoneContentPrivate lcp;
+};
+
+BELLE_SIP_DECLARE_VPTR(LinphoneContent);
+
+
+
 /*****************************************************************************
  * REMOTE PROVISIONING FUNCTIONS                                                     *
  ****************************************************************************/
@@ -986,6 +996,7 @@ BELLE_SIP_TYPE_ID(LinphoneCallLog),
 BELLE_SIP_TYPE_ID(LinphoneCallParams),
 BELLE_SIP_TYPE_ID(LinphoneChatMessage),
 BELLE_SIP_TYPE_ID(LinphoneChatRoom),
+BELLE_SIP_TYPE_ID(LinphoneContent),
 BELLE_SIP_TYPE_ID(LinphoneLDAPContactProvider),
 BELLE_SIP_TYPE_ID(LinphoneLDAPContactSearch),
 BELLE_SIP_TYPE_ID(LinphoneProxyConfig)
diff --git a/coreapi/quality_reporting.c b/coreapi/quality_reporting.c
index 52d88a7a2..1beea886a 100644
--- a/coreapi/quality_reporting.c
+++ b/coreapi/quality_reporting.c
@@ -257,7 +257,7 @@ static void append_metrics_to_buffer(char ** buffer, size_t * size, size_t * off
 }
 
 static int send_report(LinphoneCall* call, reporting_session_report_t * report, const char * report_event) {
-	LinphoneContent content = {0};
+	LinphoneContent *content = linphone_content_new();
 	LinphoneAddress *addr;
 	int expires = -1;
 	size_t offset = 0;
@@ -294,9 +294,9 @@ static int send_report(LinphoneCall* call, reporting_session_report_t * report,
 		goto end;
 	}
 
-	buffer = (char *) ms_malloc(size);
-	content.type = ms_strdup("application");
-	content.subtype = ms_strdup("vq-rtcpxr");
+	buffer = (char *) belle_sip_malloc(size);
+	linphone_content_set_type(content, "application");
+	linphone_content_set_subtype(content, "vq-rtcpxr");
 
 	append_to_buffer(&buffer, &size, &offset, "%s\r\n", report_event);
 	append_to_buffer(&buffer, &size, &offset, "CallID: %s\r\n", report->info.call_id);
@@ -331,17 +331,17 @@ static int send_report(LinphoneCall* call, reporting_session_report_t * report,
 		append_to_buffer(&buffer, &size, &offset, "\r\n");
 	}
 
-	content.data = buffer;
-	content.size = strlen(buffer);
+	linphone_content_set_data(content, buffer);
+	linphone_content_set_size(content, strlen(buffer));
 
 	if (call->log->reporting.on_report_sent != NULL){
 		call->log->reporting.on_report_sent(
 			call,
 			(report==call->log->reporting.reports[0])?LINPHONE_CALL_STATS_AUDIO:LINPHONE_CALL_STATS_VIDEO,
-			&content);
+			content);
 	}
 
-	if (! linphone_core_publish(call->core, addr, "vq-rtcpxr", expires, &content)){
+	if (! linphone_core_publish(call->core, addr, "vq-rtcpxr", expires, content)){
 		ret=4;
 	} else {
 		reset_avg_metrics(report);
@@ -354,7 +354,7 @@ static int send_report(LinphoneCall* call, reporting_session_report_t * report,
 
 	linphone_address_destroy(addr);
 
-	linphone_content_uninit(&content);
+	linphone_content_unref(content);
 
 	end:
 	ms_message("QualityReporting[%p]: Send '%s' with status %d",
diff --git a/tester/eventapi_tester.c b/tester/eventapi_tester.c
index 1d4b07e59..835130f54 100644
--- a/tester/eventapi_tester.c
+++ b/tester/eventapi_tester.c
@@ -40,7 +40,7 @@ const char *liblinphone_tester_get_notify_content(void){
 void linphone_notify_received(LinphoneCore *lc, LinphoneEvent *lev, const char *eventname, const LinphoneContent *content){
 	LinphoneCoreManager *mgr;
 	CU_ASSERT_PTR_NOT_NULL_FATAL(content);
-	CU_ASSERT_TRUE(strcmp(notify_content,(const char*)content->data)==0);
+	CU_ASSERT_TRUE(strcmp(notify_content,(const char*)linphone_content_get_data(content))==0);
 	mgr=get_manager(lc);
 	mgr->stat.number_of_NotifyReceived++;
 }
@@ -48,13 +48,14 @@ void linphone_notify_received(LinphoneCore *lc, LinphoneEvent *lev, const char *
 void linphone_subscription_state_change(LinphoneCore *lc, LinphoneEvent *lev, LinphoneSubscriptionState state) {
 	stats* counters = get_stats(lc);
 	LinphoneCoreManager *mgr=get_manager(lc);
-	LinphoneContent content={0};
+	LinphoneContent* content;
 	const LinphoneAddress* from_addr = linphone_event_get_from(lev);
 	char* from = linphone_address_as_string(from_addr);
-	content.type="application";
-	content.subtype="somexml2";
-	content.data=(void*)notify_content;
-	content.size=strlen(notify_content);
+	content = linphone_core_create_content(lc);
+	linphone_content_set_type(content,"application");
+	linphone_content_set_subtype(content,"somexml2");
+	linphone_content_set_data(content,belle_sip_strdup(notify_content));
+	linphone_content_set_size(content,strlen(notify_content));
 	
 	ms_message("Subscription state [%s] from [%s]",linphone_subscription_state_to_string(state),from);
 	ms_free(from);
@@ -80,7 +81,7 @@ void linphone_subscription_state_change(LinphoneCore *lc, LinphoneEvent *lev, Li
 			counters->number_of_LinphoneSubscriptionActive++;
 			if (linphone_event_get_subscription_dir(lev)==LinphoneSubscriptionIncoming){
 				mgr->lev=lev;
-				linphone_event_notify(lev,&content);
+				linphone_event_notify(lev,content);
 			}
 		break;
 		case LinphoneSubscriptionTerminated:
@@ -96,6 +97,7 @@ void linphone_subscription_state_change(LinphoneCore *lc, LinphoneEvent *lev, Li
 			mgr->lev=NULL;
 		break;
 	}
+	linphone_content_unref(content);
 }
 
 void linphone_publish_state_changed(LinphoneCore *lc, LinphoneEvent *ev, LinphonePublishState state){
@@ -123,23 +125,23 @@ void linphone_publish_state_changed(LinphoneCore *lc, LinphoneEvent *ev, Linphon
 static void subscribe_test_declined(void) {
 	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
-	LinphoneContent content={0};
+	LinphoneContent* content;
 	LinphoneEvent *lev;
 	const LinphoneErrorInfo *ei;
 	MSList* lcs=ms_list_append(NULL,marie->lc);
 	lcs=ms_list_append(lcs,pauline->lc);
 
+	content = linphone_core_create_content(marie->lc);
+	linphone_content_set_type(content,"application");
+	linphone_content_set_subtype(content,"somexml");
+	linphone_content_set_data(content,belle_sip_strdup(subscribe_content));
+	linphone_content_set_size(content,strlen(subscribe_content));
 
-	content.type="application";
-	content.subtype="somexml";
-	content.data=(char*)subscribe_content;
-	content.size=strlen(subscribe_content);
-	
 	pauline->decline_subscribe=TRUE;
-	
-	lev=linphone_core_subscribe(marie->lc,pauline->identity,"dodo",600,&content);
+
+	lev=linphone_core_subscribe(marie->lc,pauline->identity,"dodo",600,content);
 	linphone_event_ref(lev);
-	
+
 	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneSubscriptionOutgoingInit,1,1000));
 	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneSubscriptionIncomingReceived,1,3000));
 	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneSubscriptionError,1,21000));/*yes flexisip may wait 20 secs in case of forking*/
@@ -150,7 +152,8 @@ static void subscribe_test_declined(void) {
 		CU_ASSERT_PTR_NOT_NULL(linphone_error_info_get_phrase(ei));
 	}
 	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneSubscriptionTerminated,1,1000));
-	
+
+	linphone_content_unref(content);
 	linphone_event_unref(lev);
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
@@ -165,23 +168,24 @@ typedef enum RefreshTestType{
 static void subscribe_test_with_args(bool_t terminated_by_subscriber, RefreshTestType refresh_type) {
 	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
-	LinphoneContent content={0};
+	LinphoneContent* content;
 	LinphoneEvent *lev;
 	int expires= refresh_type!=NoRefresh ? 4 : 600;
 	MSList* lcs=ms_list_append(NULL,marie->lc);
-	
+
 	lcs=ms_list_append(lcs,pauline->lc);
 
 	if (refresh_type==ManualRefresh){
 		lp_config_set_int(marie->lc->config,"sip","refresh_generic_subscribe",0);
 	}
 
-	content.type="application";
-	content.subtype="somexml";
-	content.data=(char*)subscribe_content;
-	content.size=strlen(subscribe_content);
-	
-	lev=linphone_core_subscribe(marie->lc,pauline->identity,"dodo",expires,&content);
+	content = linphone_core_create_content(marie->lc);
+	linphone_content_set_type(content,"application");
+	linphone_content_set_subtype(content,"somexml");
+	linphone_content_set_data(content,belle_sip_strdup(subscribe_content));
+	linphone_content_set_size(content,strlen(subscribe_content));
+
+	lev=linphone_core_subscribe(marie->lc,pauline->identity,"dodo",expires,content);
 	
 	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneSubscriptionOutgoingInit,1,1000));
 	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneSubscriptionIncomingReceived,1,3000));
@@ -190,7 +194,7 @@ static void subscribe_test_with_args(bool_t terminated_by_subscriber, RefreshTes
 
 	/*make sure marie receives first notification before terminating*/
 	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_NotifyReceived,1,1000));
-	
+
 	if (refresh_type==AutoRefresh){
 		wait_for_list(lcs,NULL,0,6000);
 		CU_ASSERT_TRUE(linphone_event_get_subscription_state(pauline->lev)==LinphoneSubscriptionActive);
@@ -206,10 +210,11 @@ static void subscribe_test_with_args(bool_t terminated_by_subscriber, RefreshTes
 		CU_ASSERT_PTR_NOT_NULL_FATAL(pauline->lev);
 		linphone_event_terminate(pauline->lev);
 	}
-	
+
 	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneSubscriptionTerminated,1,1000));
 	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneSubscriptionTerminated,1,1000));
-	
+
+	linphone_content_unref(content);
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
 }
@@ -217,7 +222,7 @@ static void subscribe_test_with_args(bool_t terminated_by_subscriber, RefreshTes
 static void subscribe_test_with_args2(bool_t terminated_by_subscriber, RefreshTestType refresh_type) {
 	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
-	LinphoneContent content={0};
+	LinphoneContent* content;
 	LinphoneEvent *lev;
 	int expires= refresh_type!=NoRefresh ? 4 : 600;
 	MSList* lcs=ms_list_append(NULL,marie->lc);
@@ -228,19 +233,20 @@ static void subscribe_test_with_args2(bool_t terminated_by_subscriber, RefreshTe
 		lp_config_set_int(marie->lc->config,"sip","refresh_generic_subscribe",0);
 	}
 
-	content.type="application";
-	content.subtype="somexml";
-	content.data=(char*)subscribe_content;
-	content.size=strlen(subscribe_content);
-	
+	content = linphone_core_create_content(marie->lc);
+	linphone_content_set_type(content,"application");
+	linphone_content_set_subtype(content,"somexml");
+	linphone_content_set_data(content,belle_sip_strdup(subscribe_content));
+	linphone_content_set_size(content,strlen(subscribe_content));
+
 	lev=linphone_core_create_subscribe(marie->lc,pauline->identity,"dodo",expires);
 	linphone_event_add_custom_header(lev,"My-Header","pouet");
 	linphone_event_add_custom_header(lev,"My-Header2","pimpon");
-	linphone_event_send_subscribe(lev,&content);
-	
+	linphone_event_send_subscribe(lev,content);
+
 	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneSubscriptionOutgoingInit,1,1000));
 	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneSubscriptionIncomingReceived,1,3000));
-	
+
 	/*check good receipt of custom headers*/
 	CU_ASSERT_STRING_EQUAL(linphone_event_get_custom_header(pauline->lev,"My-Header"),"pouet");
 	CU_ASSERT_STRING_EQUAL(linphone_event_get_custom_header(pauline->lev,"My-Header2"),"pimpon");
@@ -266,10 +272,11 @@ static void subscribe_test_with_args2(bool_t terminated_by_subscriber, RefreshTe
 		CU_ASSERT_PTR_NOT_NULL_FATAL(pauline->lev);
 		linphone_event_terminate(pauline->lev);
 	}
-	
+
 	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneSubscriptionTerminated,1,1000));
 	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneSubscriptionTerminated,1,1000));
-	
+
+	linphone_content_unref(content);
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
 }
@@ -300,30 +307,30 @@ static void subscribe_test_manually_refreshed(void){
 static void publish_test_with_args(bool_t refresh, int expires){
 	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
-	LinphoneContent content={0};
+	LinphoneContent* content;
 	LinphoneEvent *lev;
 	MSList* lcs=ms_list_append(NULL,marie->lc);
 	lcs=ms_list_append(lcs,pauline->lc);
 
+	content = linphone_core_create_content(marie->lc);
+	linphone_content_set_type(content,"application");
+	linphone_content_set_subtype(content,"somexml");
+	linphone_content_set_data(content,belle_sip_strdup(subscribe_content));
+	linphone_content_set_size(content,strlen(subscribe_content));
 
-	content.type="application";
-	content.subtype="somexml";
-	content.data=(char*)subscribe_content;
-	content.size=strlen(subscribe_content);
-	
 	lp_config_set_int(marie->lc->config,"sip","refresh_generic_publish",refresh);
 
 	lev=linphone_core_create_publish(marie->lc,pauline->identity,"dodo",expires);
 	linphone_event_add_custom_header(lev,"CustomHeader","someValue");
-	linphone_event_send_publish(lev,&content);
+	linphone_event_send_publish(lev,content);
 	linphone_event_ref(lev);
-	
+
 	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphonePublishProgress,1,1000));
 	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphonePublishOk,1,3000));
-	
+
 	if (!refresh){
 		CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphonePublishExpiring,1,5000));
-		linphone_event_update_publish(lev,&content);
+		linphone_event_update_publish(lev,content);
 		CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphonePublishProgress,1,1000));
 		CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphonePublishOk,1,3000));
 	}else{
@@ -331,11 +338,12 @@ static void publish_test_with_args(bool_t refresh, int expires){
 	}
 
 	linphone_event_terminate(lev);
-	
+
 	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphonePublishCleared,1,3000));
-	
+
 	linphone_event_unref(lev);
-	
+
+	linphone_content_unref(content);
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
 }
diff --git a/tester/flexisip_tester.c b/tester/flexisip_tester.c
index a91811538..f2ec9192e 100644
--- a/tester/flexisip_tester.c
+++ b/tester/flexisip_tester.c
@@ -27,7 +27,7 @@ static void subscribe_forking(void) {
 	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
 	LinphoneCoreManager* pauline2 = linphone_core_manager_new( "pauline_tcp_rc");
-	LinphoneContent content={0};
+	LinphoneContent* content;
 	LinphoneEvent *lev;
 	int expires=  600;
 	MSList* lcs=ms_list_append(NULL,marie->lc);
@@ -35,12 +35,13 @@ static void subscribe_forking(void) {
 	lcs=ms_list_append(lcs,pauline->lc);
 	lcs=ms_list_append(lcs,pauline2->lc);
 
-	content.type="application";
-	content.subtype="somexml";
-	content.data=(char*)liblinphone_tester_get_subscribe_content();
-	content.size=strlen(liblinphone_tester_get_subscribe_content());
+	content = linphone_core_create_content(marie->lc);
+	linphone_content_set_type(content,"application");
+	linphone_content_set_subtype(content,"somexml");
+	linphone_content_set_data(content, belle_sip_strdup(liblinphone_tester_get_subscribe_content()));
+	linphone_content_set_size(content, strlen(liblinphone_tester_get_subscribe_content()));
 	
-	lev=linphone_core_subscribe(marie->lc,pauline->identity,"dodo",expires,&content);
+	lev=linphone_core_subscribe(marie->lc,pauline->identity,"dodo",expires,content);
 	
 	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneSubscriptionOutgoingInit,1,1000));
 	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneSubscriptionIncomingReceived,1,3000));
@@ -51,7 +52,8 @@ static void subscribe_forking(void) {
 	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_NotifyReceived,1,1000));
 
 	linphone_event_terminate(lev);
-	
+
+	linphone_content_unref(content);
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
 	linphone_core_manager_destroy(pauline2);
diff --git a/tester/message_tester.c b/tester/message_tester.c
index d5f084f44..65ad16d9d 100644
--- a/tester/message_tester.c
+++ b/tester/message_tester.c
@@ -124,8 +124,8 @@ void file_transfer_progress_indication(LinphoneCore *lc, LinphoneChatMessage *me
 	int progress = (int)((offset * 100)/total);
 	ms_message(" File transfer  [%d%%] %s of type [%s/%s] %s [%s] \n", progress
 																	,(linphone_chat_message_is_outgoing(message)?"sent":"received")
-																	, content->type
-																	, content->subtype
+																	, linphone_content_get_type(content)
+																	, linphone_content_get_subtype(content)
 																	,(linphone_chat_message_is_outgoing(message)?"to":"from")
 																	, address);
 	counters->progress_of_LinphoneFileTransfer = progress;
@@ -396,7 +396,7 @@ static void file_transfer_message(void) {
 	char* to;
 	LinphoneChatRoom* chat_room;
 	LinphoneChatMessage* message;
-	LinphoneContent content;
+	LinphoneContent* content;
 	const char* big_file_content="big file"; /* setting dummy file content to something */
 	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
@@ -417,12 +417,12 @@ static void file_transfer_message(void) {
 	chat_room = linphone_core_create_chat_room(pauline->lc,to);
 	ms_free(to);
 	/* create a file transfer message */
-	memset(&content,0,sizeof(content));
-	content.type="text";
-	content.subtype="plain";
-	content.size=sizeof(big_file); /*total size to be transfered*/
-	content.name = "bigfile.txt";
-	message = linphone_chat_room_create_file_transfer_message(chat_room, &content);
+	content = linphone_core_create_content(pauline->lc);
+	linphone_content_set_type(content,"text");
+	linphone_content_set_subtype(content,"plain");
+	linphone_content_set_size(content,sizeof(big_file)); /*total size to be transfered*/
+	linphone_content_set_name(content,"bigfile.txt");
+	message = linphone_chat_room_create_file_transfer_message(chat_room, content);
 	{
 		int dummy=0;
 		wait_for_until(marie->lc,pauline->lc,&dummy,1,100); /*just to have time to purge message stored in the server*/
@@ -440,6 +440,7 @@ static void file_transfer_message(void) {
 	CU_ASSERT_EQUAL(pauline->stat.number_of_LinphoneMessageDelivered,1);
 	CU_ASSERT_EQUAL(marie->stat.number_of_LinphoneMessageExtBodyReceived,1);
 
+	linphone_content_unref(content);
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
 }
@@ -451,7 +452,7 @@ static void small_file_transfer_message(void) {
 	char* to;
 	LinphoneChatRoom* chat_room;
 	LinphoneChatMessage* message;
-	LinphoneContent content;
+	LinphoneContent* content;
 	const char* big_file_content="big file"; /* setting dummy file content to something */
 	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
@@ -472,12 +473,12 @@ static void small_file_transfer_message(void) {
 	chat_room = linphone_core_create_chat_room(pauline->lc,to);
 	ms_free(to);
 	/* create a file transfer message */
-	memset(&content,0,sizeof(content));
-	content.type="text";
-	content.subtype="plain";
-	content.size=SMALL_FILE_SIZE; /*total size to be transfered*/
-	content.name = "bigfile.txt";
-	message = linphone_chat_room_create_file_transfer_message(chat_room, &content);
+	content = linphone_core_create_content(pauline->lc);
+	linphone_content_set_type(content,"text");
+	linphone_content_set_subtype(content,"plain");
+	linphone_content_set_size(content,SMALL_FILE_SIZE); /*total size to be transfered*/
+	linphone_content_set_name(content,"bigfile.txt");
+	message = linphone_chat_room_create_file_transfer_message(chat_room, content);
 	{
 		int dummy=0;
 		wait_for_until(marie->lc,pauline->lc,&dummy,1,100); /*just to have time to purge message stored in the server*/
@@ -495,6 +496,7 @@ static void small_file_transfer_message(void) {
 	CU_ASSERT_EQUAL(pauline->stat.number_of_LinphoneMessageDelivered,1);
 	CU_ASSERT_EQUAL(marie->stat.number_of_LinphoneMessageExtBodyReceived,1);
 
+	linphone_content_unref(content);
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
 }
@@ -504,7 +506,7 @@ static void file_transfer_message_io_error_upload(void) {
 	char* to;
 	LinphoneChatRoom* chat_room;
 	LinphoneChatMessage* message;
-	LinphoneContent content;
+	LinphoneContent* content;
 	const char* big_file_content="big file"; /* setting dummy file content to something */
 	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
@@ -526,12 +528,12 @@ static void file_transfer_message_io_error_upload(void) {
 	chat_room = linphone_core_create_chat_room(pauline->lc,to);
 
 	/* create a file transfer message */
-	memset(&content,0,sizeof(content));
-	content.type="text";
-	content.subtype="plain";
-	content.size=sizeof(big_file); /*total size to be transfered*/
-	content.name = "bigfile.txt";
-	message = linphone_chat_room_create_file_transfer_message(chat_room, &content);
+	content = linphone_core_create_content(pauline->lc);
+	linphone_content_set_type(content,"text");
+	linphone_content_set_subtype(content,"plain");
+	linphone_content_set_size(content,sizeof(big_file)); /*total size to be transfered*/
+	linphone_content_set_name(content,"bigfile.txt");
+	message = linphone_chat_room_create_file_transfer_message(chat_room, content);
 	{
 		int dummy=0;
 		wait_for_until(marie->lc,pauline->lc,&dummy,1,100); /*just to have time to purge message stored in the server*/
@@ -554,6 +556,7 @@ static void file_transfer_message_io_error_upload(void) {
 	linphone_core_refresh_registers(pauline->lc); /*to make sure registration is back in registered and so it can be later unregistered*/
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneRegistrationOk,pauline->stat.number_of_LinphoneRegistrationOk+1));
 
+	linphone_content_unref(content);
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
 }
@@ -629,7 +632,7 @@ static void file_transfer_message_upload_cancelled(void) {
 	char* to;
 	LinphoneChatRoom* chat_room;
 	LinphoneChatMessage* message;
-	LinphoneContent content;
+	LinphoneContent* content;
 	const char* big_file_content="big file"; /* setting dummy file content to something */
 	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
@@ -651,12 +654,12 @@ static void file_transfer_message_upload_cancelled(void) {
 	chat_room = linphone_core_create_chat_room(pauline->lc,to);
 
 	/* create a file transfer message */
-	memset(&content,0,sizeof(content));
-	content.type="text";
-	content.subtype="plain";
-	content.size=sizeof(big_file); /*total size to be transfered*/
-	content.name = "bigfile.txt";
-	message = linphone_chat_room_create_file_transfer_message(chat_room, &content);
+	content = linphone_core_create_content(pauline->lc);
+	linphone_content_set_type(content,"text");
+	linphone_content_set_subtype(content,"plain");
+	linphone_content_set_size(content,sizeof(big_file)); /*total size to be transfered*/
+	linphone_content_set_name(content,"bigfile.txt");
+	message = linphone_chat_room_create_file_transfer_message(chat_room, content);
 	{
 		int dummy=0;
 		wait_for_until(marie->lc,pauline->lc,&dummy,1,100); /*just to have time to purge message stored in the server*/
@@ -674,6 +677,7 @@ static void file_transfer_message_upload_cancelled(void) {
 	CU_ASSERT_EQUAL(pauline->stat.number_of_LinphoneMessageNotDelivered,1);
 	CU_ASSERT_EQUAL(marie->stat.number_of_LinphoneMessageExtBodyReceived,0);
 
+	linphone_content_unref(content);
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
 }
@@ -829,12 +833,13 @@ static void info_message_with_args(bool_t with_content) {
 	info=linphone_core_create_info_message(marie->lc);
 	linphone_info_message_add_header(info,"Weather","still bad");
 	if (with_content) {
-		LinphoneContent ct={0};
-		ct.type="application";
-		ct.subtype="somexml";
-		ct.data=(void*)info_content;
-		ct.size=strlen(info_content);
-		linphone_info_message_set_content(info,&ct);
+		LinphoneContent* ct=linphone_core_create_content(marie->lc);
+		linphone_content_set_type(ct,"application");
+		linphone_content_set_subtype(ct,"somexml");
+		linphone_content_set_data(ct,belle_sip_strdup(info_content));
+		linphone_content_set_size(ct,strlen(info_content));
+		linphone_info_message_set_content(info,ct);
+		linphone_content_unref(ct);
 	}
 	{
 		int dummy=0;
@@ -858,13 +863,13 @@ static void info_message_with_args(bool_t with_content) {
 	if (with_content){
 		CU_ASSERT_PTR_NOT_NULL(content);
 		if (content) {
-			CU_ASSERT_PTR_NOT_NULL(content->data);
-			CU_ASSERT_PTR_NOT_NULL(content->type);
-			CU_ASSERT_PTR_NOT_NULL(content->subtype);
-			if (content->type) CU_ASSERT_TRUE(strcmp(content->type,"application")==0);
-			if (content->subtype) CU_ASSERT_TRUE(strcmp(content->subtype,"somexml")==0);
-			if (content->data)CU_ASSERT_TRUE(strcmp((const char*)content->data,info_content)==0);
-			CU_ASSERT_EQUAL(content->size,strlen(info_content));
+			CU_ASSERT_PTR_NOT_NULL(linphone_content_get_data(content));
+			CU_ASSERT_PTR_NOT_NULL(linphone_content_get_type(content));
+			CU_ASSERT_PTR_NOT_NULL(linphone_content_get_subtype(content));
+			if (linphone_content_get_type(content)) CU_ASSERT_TRUE(strcmp(linphone_content_get_type(content),"application")==0);
+			if (linphone_content_get_subtype(content)) CU_ASSERT_TRUE(strcmp(linphone_content_get_subtype(content),"somexml")==0);
+			if (linphone_content_get_data(content))CU_ASSERT_TRUE(strcmp((const char*)linphone_content_get_data(content),info_content)==0);
+			CU_ASSERT_EQUAL(linphone_content_get_size(content),strlen(info_content));
 		}
 	}
 	linphone_core_manager_destroy(marie);
diff --git a/tester/quality_reporting_tester.c b/tester/quality_reporting_tester.c
index 1190f188f..81bae75cf 100644
--- a/tester/quality_reporting_tester.c
+++ b/tester/quality_reporting_tester.c
@@ -25,7 +25,7 @@
 #define __strstr(x, y) ((x==NULL)?NULL:strstr(x,y))
 
 void on_report_send_mandatory(const LinphoneCall *call, int stream_type, const LinphoneContent *content){
-	char * body = (char *)content->data;
+	char * body = (char *)linphone_content_get_data(content);
 	char * remote_metrics_start = __strstr(body, "RemoteMetrics:");
 	reporting_session_report_t * report = call->log->reporting.reports[stream_type];
 	MediaStream * ms;
@@ -91,7 +91,7 @@ char * on_report_send_verify_metrics(const reporting_content_metrics_t *metrics,
 }
 
 void on_report_send_with_rtcp_xr_local(const LinphoneCall *call, int stream_type, const LinphoneContent *content){
-	char * body = (char*)content->data;
+	char * body = (char*)linphone_content_get_data(content);
 	char * remote_metrics_start = __strstr(body, "RemoteMetrics:");
 	reporting_session_report_t * report = call->log->reporting.reports[stream_type];
 	on_report_send_mandatory(call,stream_type,content);
@@ -99,7 +99,7 @@ void on_report_send_with_rtcp_xr_local(const LinphoneCall *call, int stream_type
 	CU_ASSERT_TRUE(!remote_metrics_start || on_report_send_verify_metrics(&report->local_metrics,body) < remote_metrics_start);
 }
 void on_report_send_with_rtcp_xr_remote(const LinphoneCall *call, int stream_type, const LinphoneContent *content){
-	char * body = (char*)content->data;
+	char * body = (char*)linphone_content_get_data(content);
 	reporting_session_report_t * report = call->log->reporting.reports[stream_type];
 
 	on_report_send_mandatory(call,stream_type,content);
@@ -214,7 +214,7 @@ static void quality_reporting_not_sent_if_low_bandwidth() {
 }
 
 void on_report_send_remove_fields(const LinphoneCall *call, int stream_type, const LinphoneContent *content){
-	char *body = (char*)content->data;
+	char *body = (char*)linphone_content_get_data(content);
 	/*corrupt start of the report*/
 	strncpy(body, "corrupted report is corrupted", strlen("corrupted report is corrupted"));
 }

From 0cae72bf528d5fd9c615efc87ff0f24950dc96e3 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Tue, 18 Nov 2014 17:09:33 +0100
Subject: [PATCH 002/496] Update oRTP and ms2 submodules.

---
 mediastreamer2 | 2 +-
 oRTP           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 71115380b..792e12012 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 71115380b55d0a3f5a40405baaed2535b1913dda
+Subproject commit 792e12012905ba90d9a3c30dc90f560fc0d38785
diff --git a/oRTP b/oRTP
index 15f1e5f89..5333d998c 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 15f1e5f89c7381f580190432f33a7f9e86c32e7f
+Subproject commit 5333d998c8eaf3c43e66c4a5335c0606c8dea3df

From 9e87f9d21735264129cbde58fd346617880480ba Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Tue, 18 Nov 2014 18:13:16 +0100
Subject: [PATCH 003/496] Avoid crash when using linphone/gtk with libnotify <
 0.7.0

---
 configure.ac |  1 -
 gtk/main.c   | 11 ++++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index e7caf35b9..067a13b62 100644
--- a/configure.ac
+++ b/configure.ac
@@ -330,7 +330,6 @@ if test "$gtk_ui" = "true" ; then
 				AC_DEFINE([HAVE_NOTIFY1],[1],[NOTIFY1 support])
 		esac
 	else
-		NotifyNotification *n;
 		echo "Libnotify support is disabled."
 	fi
 fi
diff --git a/gtk/main.c b/gtk/main.c
index 5dd2b046f..ea3078c9a 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -1228,14 +1228,19 @@ static bool_t notify_actions_supported() {
 }
 
 static NotifyNotification* build_notification(const char *title, const char *body) {
-	const char *icon_path = linphone_gtk_get_ui_config("icon", LINPHONE_ICON);
-	GdkPixbuf *pbuf = create_pixbuf(icon_path);
 	NotifyNotification *n = notify_notification_new(title, body, NULL
 #ifdef HAVE_NOTIFY1
 		,NULL
 #endif
 	);
-	notify_notification_set_icon_from_pixbuf(n, pbuf);
+#ifndef HAVE_NOTIFY1
+	{
+		const char *icon_path = linphone_gtk_get_ui_config("icon", LINPHONE_ICON);
+		GdkPixbuf *pbuf = create_pixbuf(icon_path);
+		/*with notify1, this function makes the notification crash the app with obscure dbus glib critical errors*/
+		notify_notification_set_icon_from_pixbuf(n, pbuf);
+	}
+#endif
 	return n;
 }
 

From 1c0a203e847d1c3ddf59559af943354c9a362544 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Tue, 18 Nov 2014 18:15:11 +0100
Subject: [PATCH 004/496] update ms2 to repair ios build

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 792e12012..63f72f08a 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 792e12012905ba90d9a3c30dc90f560fc0d38785
+Subproject commit 63f72f08ad91e765aa3d8d299c0c95f699e22f2e

From 3a9b9dd29c08147b5c2292c0e988f45840588070 Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Wed, 19 Nov 2014 10:53:47 +0100
Subject: [PATCH 005/496] Update ms2

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 63f72f08a..9738d6a3f 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 63f72f08ad91e765aa3d8d299c0c95f699e22f2e
+Subproject commit 9738d6a3fbbac929b629b92d039e3c2dabc1e7b1

From 7e32b85fa2a1ffc80433974c4ea66910a53c246e Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Wed, 19 Nov 2014 11:59:07 +0100
Subject: [PATCH 006/496] Update ms2

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 9738d6a3f..90bad6f9e 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 9738d6a3fbbac929b629b92d039e3c2dabc1e7b1
+Subproject commit 90bad6f9e48f7d18cba2d1a50c4e55fbc6b3c686

From 7fcf25f4fc9630ea75a87744103ce7608b5924cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
 <francois.grisez@belledonne-communications.com>
Date: Wed, 19 Nov 2014 13:24:57 +0100
Subject: [PATCH 007/496] Update mediastreamer2

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 90bad6f9e..a8bf9aeeb 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 90bad6f9e48f7d18cba2d1a50c4e55fbc6b3c686
+Subproject commit a8bf9aeeb50992e5559f28f86397535b59ac8dfd

From 9905f675c7c32548c7d0a94548ed9252ed3ab22e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
 <francois.grisez@belledonne-communications.com>
Date: Wed, 19 Nov 2014 13:44:39 +0100
Subject: [PATCH 008/496] Update mediastreamer2

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index a8bf9aeeb..b727b3031 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit a8bf9aeeb50992e5559f28f86397535b59ac8dfd
+Subproject commit b727b303113f9ea752b2e9328a4d1a4f65d72b6c

From 227002d1adddb15f027c53d0f8bda44cb9052ae2 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Wed, 19 Nov 2014 10:45:09 +0100
Subject: [PATCH 009/496] Add transifex configuration for localization

---
 .tx/config      |   10 +
 po/cs.po        | 1366 +++++---------------------------
 po/de.po        | 1518 +++++-------------------------------
 po/es.po        | 1455 ++++++++--------------------------
 po/fr.po        |  495 ++++--------
 po/he.po        |  754 +++++-------------
 po/hu.po        | 1036 +++++-------------------
 po/it.po        | 1025 ++++++------------------
 po/ja.po        | 1041 +++++++------------------
 po/linphone.pot | 1987 +++++++++++++++++++++++++++++++++++++++++++++++
 po/nb_NO.po     | 1053 ++++++-------------------
 po/nl.po        | 1328 +++++++------------------------
 po/pl.po        | 1026 +++++++-----------------
 po/pt_BR.po     | 1080 ++++++++------------------
 po/ru.po        |  576 ++++----------
 po/sr.po        |  701 ++++++-----------
 po/sv.po        | 1023 ++++++------------------
 po/zh_CN.po     |  955 ++++++-----------------
 po/zh_TW.po     |  902 +++++----------------
 19 files changed, 5965 insertions(+), 13366 deletions(-)
 create mode 100644 .tx/config
 create mode 100644 po/linphone.pot

diff --git a/.tx/config b/.tx/config
new file mode 100644
index 000000000..4c2a2acd7
--- /dev/null
+++ b/.tx/config
@@ -0,0 +1,10 @@
+[main]
+host = https://www.transifex.com
+minimum_perc = 1
+type = PO
+
+[linphone-gtk.linphonepot]
+file_filter = po/<lang>.po
+source_file = po/linphone.pot
+source_lang = en
+
diff --git a/po/cs.po b/po/cs.po
index 78c993c32..f6056909d 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,31 +1,22 @@
-# translation of linphone.po to cs_CZ
-# This file is distributed under the same license as the linphone package.
-# Copyright (C) 2009 Simon Morlat (msgids)
-# Klara Cihlarova <koty@seznam.cz>, 2005.
-# Petr Pisar <petr.pisar@atlas.cz>, 2006, 2007, 2008, 2009, 2010, 2011, 2013.
-#
-# XXX: Don't translate gtk-* messages. They will be replaced from GTK+
-# catalogue.
-#
-# On hold → odložen
-# chat → diskuze
-# Pause call → odložit hovor
-# Resume call → obnovit hovor
-# token → klíč
-# Transfer → přepojit
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Klara Cihlarova <koty@seznam.cz>, 2005
+# Petr Pisar <petr.pisar@atlas.cz>, 2006-2011,2013
 msgid ""
 msgstr ""
-"Project-Id-Version: linphone-3.5.99.0\n"
+"Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-15 09:24+0200\n"
-"PO-Revision-Date: 2013-05-01 09:55+0200\n"
-"Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
-"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
-"Language: cs\n"
+"POT-Creation-Date: 2014-11-19 10:39+0100\n"
+"PO-Revision-Date: 2014-11-19 10:17+0000\n"
+"Last-Translator: Cqnqrd <gautier.pelloux@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/linphone-gtk/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974
@@ -85,18 +76,14 @@ msgstr "<big><b>%s</b></big>\t%s"
 msgid ""
 "<small><i>%s</i>\t<i>Quality: %s</i></small>\n"
 "%s\t%s\t"
-msgstr ""
-"<small><i>%s</i>\t<i>Kvalita: %s</i></small>\n"
-"%s\t%s\t"
+msgstr "<small><i>%s</i>\t<i>Kvalita: %s</i></small>\n%s\t%s\t"
 
 #: ../gtk/calllogs.c:343
 #, c-format
 msgid ""
 "<small><i>%s</i></small>\t\n"
 "%s"
-msgstr ""
-"<small><i>%s</i></small>\t\n"
-"%s"
+msgstr "<small><i>%s</i></small>\t\n%s"
 
 #: ../gtk/conference.c:38 ../gtk/main.ui.h:13
 msgid "Conference"
@@ -141,110 +128,92 @@ msgstr "je-li nastaveno, automaticky zvedne příchozí hovor"
 
 #: ../gtk/main.c:149
 msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: c:"
-"\\Program Files\\Linphone)"
-msgstr ""
-"Zadejte pracovní adresář (měl by být základní instalační adresář, například "
+"Specifiy a working directory (should be the base of the installation, eg: "
 "c:\\Program Files\\Linphone)"
+msgstr "Zadejte pracovní adresář (měl by být základní instalační adresář, například c:\\Program Files\\Linphone)"
 
 #: ../gtk/main.c:156
-#, fuzzy
 msgid "Configuration file"
-msgstr "Potvrzení"
+msgstr ""
 
 #: ../gtk/main.c:163
-#, fuzzy
 msgid "Run the audio assistant"
-msgstr "Průvodce nastavením účtu"
+msgstr ""
 
-#: ../gtk/main.c:590
-#, c-format
-msgid "Call with %s"
-msgstr "Hovor s %s"
-
-#: ../gtk/main.c:1183
+#: ../gtk/main.c:1085
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
-"Would you allow him to see your presence status or add him to your contact "
-"list ?\n"
+"Would you allow him to see your presence status or add him to your contact list ?\n"
 "If you answer no, this person will be temporarily blacklisted."
-msgstr ""
-"%s si vás chce přidat do svého adresáře.\n"
-"Dovolíte mu, aby viděl váš stav přítomnosti, nebo si ho také chcete přidat "
-"do svého adresáře?\n"
-"Odpovíte-li ne, tato osobo bude dočasně blokována."
+msgstr "%s si vás chce přidat do svého adresáře.\nDovolíte mu, aby viděl váš stav přítomnosti, nebo si ho také chcete přidat do svého adresáře?\nOdpovíte-li ne, tato osobo bude dočasně blokována."
 
-#: ../gtk/main.c:1260
-#, fuzzy, c-format
+#: ../gtk/main.c:1162
+#, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
 msgstr ""
-"Prosím, zadejte heslo pro uživatele <i>%s</i>\n"
-"v doméně <i>%s</i>:"
 
-#: ../gtk/main.c:1376
+#: ../gtk/main.c:1283
 msgid "Call error"
 msgstr "Chyba hovoru"
 
-#: ../gtk/main.c:1379 ../coreapi/linphonecore.c:3240
+#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3744
 msgid "Call ended"
 msgstr "Hovor ukončen"
 
-#: ../gtk/main.c:1382
+#: ../gtk/main.c:1289
 msgid "Incoming call"
 msgstr "Příchozí hovor"
 
-#: ../gtk/main.c:1384 ../gtk/incall_view.c:522 ../gtk/main.ui.h:5
+#: ../gtk/main.c:1291 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
 msgid "Answer"
 msgstr "Odpovědět"
 
-#: ../gtk/main.c:1386 ../gtk/main.ui.h:6
+#: ../gtk/main.c:1293 ../gtk/main.ui.h:6
 msgid "Decline"
 msgstr "Odmítnout"
 
-#: ../gtk/main.c:1392
+#: ../gtk/main.c:1299
 msgid "Call paused"
 msgstr "Hovor odložen"
 
-#: ../gtk/main.c:1392
+#: ../gtk/main.c:1299
 #, c-format
 msgid "<b>by %s</b>"
 msgstr "<b>kým: %s</b>"
 
-#: ../gtk/main.c:1459
+#: ../gtk/main.c:1366
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr "%s navrhuje začít videohovor. Přijímáte?"
 
-#: ../gtk/main.c:1621
+#: ../gtk/main.c:1528
 msgid "Website link"
 msgstr "Odkaz na webovou stránku"
 
-#: ../gtk/main.c:1670
+#: ../gtk/main.c:1577
 msgid "Linphone - a video internet phone"
 msgstr "Lipnhone – internetový videofon"
 
-#: ../gtk/main.c:1762
+#: ../gtk/main.c:1669
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (Výchozí)"
 
-#: ../gtk/main.c:2099 ../coreapi/callbacks.c:949
+#: ../gtk/main.c:2006 ../coreapi/callbacks.c:983
 #, c-format
 msgid "We are transferred to %s"
 msgstr "Byly jsme přepojeni na %s"
 
-#: ../gtk/main.c:2109
+#: ../gtk/main.c:2016
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
-msgstr ""
-"Na tomto počítači nebyla objevena žádná zvuková karta.\n"
-"Nebudete moci vytáčet a přijímat a zvukové hovory."
+msgstr "Na tomto počítači nebyla objevena žádná zvuková karta.\nNebudete moci vytáčet a přijímat a zvukové hovory."
 
-#: ../gtk/main.c:2250
+#: ../gtk/main.c:2157
 msgid "A free SIP video-phone"
 msgstr "Volný SIP videofon"
 
@@ -302,9 +271,8 @@ msgid "Status"
 msgstr "Stav"
 
 #: ../gtk/propertybox.c:570
-#, fuzzy
 msgid "IP Bitrate (kbit/s)"
-msgstr "Min. rychlost (kb/s)"
+msgstr ""
 
 #: ../gtk/propertybox.c:577
 msgid "Parameters"
@@ -322,93 +290,92 @@ msgstr "Zakázáno"
 msgid "Account"
 msgstr "Účet"
 
-#: ../gtk/propertybox.c:1063
+#: ../gtk/propertybox.c:1072
 msgid "English"
 msgstr "angličtina"
 
-#: ../gtk/propertybox.c:1064
+#: ../gtk/propertybox.c:1073
 msgid "French"
 msgstr "francouzština"
 
-#: ../gtk/propertybox.c:1065
+#: ../gtk/propertybox.c:1074
 msgid "Swedish"
 msgstr "švédština"
 
-#: ../gtk/propertybox.c:1066
+#: ../gtk/propertybox.c:1075
 msgid "Italian"
 msgstr "italština"
 
-#: ../gtk/propertybox.c:1067
+#: ../gtk/propertybox.c:1076
 msgid "Spanish"
 msgstr "španělština"
 
-#: ../gtk/propertybox.c:1068
+#: ../gtk/propertybox.c:1077
 msgid "Brazilian Portugese"
 msgstr "brazilská portugalština"
 
-#: ../gtk/propertybox.c:1069
+#: ../gtk/propertybox.c:1078
 msgid "Polish"
 msgstr "polština"
 
-#: ../gtk/propertybox.c:1070
+#: ../gtk/propertybox.c:1079
 msgid "German"
 msgstr "němčina"
 
-#: ../gtk/propertybox.c:1071
+#: ../gtk/propertybox.c:1080
 msgid "Russian"
 msgstr "ruština"
 
-#: ../gtk/propertybox.c:1072
+#: ../gtk/propertybox.c:1081
 msgid "Japanese"
 msgstr "japonština"
 
-#: ../gtk/propertybox.c:1073
+#: ../gtk/propertybox.c:1082
 msgid "Dutch"
 msgstr "dánština"
 
-#: ../gtk/propertybox.c:1074
+#: ../gtk/propertybox.c:1083
 msgid "Hungarian"
 msgstr "maďarština"
 
-#: ../gtk/propertybox.c:1075
+#: ../gtk/propertybox.c:1084
 msgid "Czech"
 msgstr "čeština"
 
-#: ../gtk/propertybox.c:1076
+#: ../gtk/propertybox.c:1085
 msgid "Chinese"
 msgstr "čínština"
 
-#: ../gtk/propertybox.c:1077
+#: ../gtk/propertybox.c:1086
 msgid "Traditional Chinese"
 msgstr "tradiční čínština"
 
-#: ../gtk/propertybox.c:1078
+#: ../gtk/propertybox.c:1087
 msgid "Norwegian"
 msgstr "norština"
 
-#: ../gtk/propertybox.c:1079
+#: ../gtk/propertybox.c:1088
 msgid "Hebrew"
 msgstr "hebrejština"
 
-#: ../gtk/propertybox.c:1080
+#: ../gtk/propertybox.c:1089
 msgid "Serbian"
 msgstr "srbština"
 
-#: ../gtk/propertybox.c:1147
+#: ../gtk/propertybox.c:1156
 msgid ""
 "You need to restart linphone for the new language selection to take effect."
 msgstr "Aby se projevil výběr nového jazyka, je nutné znovu spustit linphone."
 
-# Media encryption type:
-#: ../gtk/propertybox.c:1225
+#: ../gtk/propertybox.c:1234
 msgid "None"
 msgstr "Žádné"
 
-#: ../gtk/propertybox.c:1229
+#: ../gtk/propertybox.c:1238
 msgid "SRTP"
 msgstr "SRTP"
 
-#: ../gtk/propertybox.c:1235
+#: ../gtk/propertybox.c:1244
 msgid "ZRTP"
 msgstr "ZRTP"
 
@@ -417,9 +384,7 @@ msgstr "ZRTP"
 msgid ""
 "A more recent version is availalble from %s.\n"
 "Would you like to open a browser to download it ?"
-msgstr ""
-"Na %s je dostupná novější verze.\n"
-"Přejete si otevřít prohlížeč, abyste si ji mohli stáhnout?"
+msgstr "Na %s je dostupná novější verze.\nPřejete si otevřít prohlížeč, abyste si ji mohli stáhnout?"
 
 #: ../gtk/update.c:91
 msgid "You are running the lastest version."
@@ -457,9 +422,7 @@ msgstr[2] "Nalezeno %i kontaktů"
 msgid ""
 "Welcome !\n"
 "This assistant will help you to use a SIP account for your calls."
-msgstr ""
-"Vítejte!\n"
-"Tento průvodce vám pomůže používat sipový účet při vašich hovorech."
+msgstr "Vítejte!\nTento průvodce vám pomůže používat sipový účet při vašich hovorech."
 
 #: ../gtk/setupwizard.c:43
 msgid "Create an account on linphone.org"
@@ -537,10 +500,7 @@ msgstr ""
 msgid ""
 "Error, account not validated, username already used or server unreachable.\n"
 "Please go back and try again."
-msgstr ""
-"Došlo k chybě (účet nebyl ověřen, uživatelské jméno již existuje nebo server "
-"není dostupný).\n"
-"Prosím, vraťte se a zkoste to znovu."
+msgstr "Došlo k chybě (účet nebyl ověřen, uživatelské jméno již existuje nebo server není dostupný).\nProsím, vraťte se a zkoste to znovu."
 
 #: ../gtk/setupwizard.c:405
 msgid "Thank you. Your account is now configured and ready for use."
@@ -548,18 +508,13 @@ msgstr "Děkujeme vám. Váš účet je nyní nastaven a připraven k použití
 
 #: ../gtk/setupwizard.c:413
 msgid ""
-"Please validate your account by clicking on the link we just sent you by "
-"email.\n"
+"Please validate your account by clicking on the link we just sent you by email.\n"
 "Then come back here and press Next button."
-msgstr ""
-"Prosím, ověřte svůj účet tak, že kliknete na odkaz, který jsme vám právě "
-"zaslali e-mailem.\n"
-"Pak se sem vraťte a stiskněte tlačítko Další."
+msgstr "Prosím, ověřte svůj účet tak, že kliknete na odkaz, který jsme vám právě zaslali e-mailem.\nPak se sem vraťte a stiskněte tlačítko Další."
 
 #: ../gtk/setupwizard.c:600
-#, fuzzy
 msgid "SIP account configuration assistant"
-msgstr "Průvodce nastavením účtu"
+msgstr ""
 
 #: ../gtk/setupwizard.c:618
 msgid "Welcome to the account setup assistant"
@@ -660,9 +615,7 @@ msgstr "Přímé nebo skrze server"
 msgid ""
 "download: %f\n"
 "upload: %f (kbit/s)"
-msgstr ""
-"příchozí: %f\n"
-"odchozí: %f (kb/s)"
+msgstr "příchozí: %f\nodchozí: %f (kb/s)"
 
 #: ../gtk/incall_view.c:272 ../gtk/incall_view.c:274
 #, c-format
@@ -678,110 +631,108 @@ msgstr "%.3f sekund"
 msgid "Hang up"
 msgstr "Zavěsit"
 
-#: ../gtk/incall_view.c:501
+#: ../gtk/incall_view.c:511
 msgid "<b>Calling...</b>"
 msgstr "<b>Volá se…</b>"
 
-#: ../gtk/incall_view.c:504 ../gtk/incall_view.c:707
+#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:727
 msgid "00::00::00"
 msgstr "00:00:00"
 
-#: ../gtk/incall_view.c:515
+#: ../gtk/incall_view.c:525
 msgid "<b>Incoming call</b>"
 msgstr "<b>Příchozí hovor</b>"
 
-#: ../gtk/incall_view.c:552
+#: ../gtk/incall_view.c:562
 msgid "good"
 msgstr "dobrá"
 
-#: ../gtk/incall_view.c:554
+#: ../gtk/incall_view.c:564
 msgid "average"
 msgstr "průměrná"
 
-#: ../gtk/incall_view.c:556
+#: ../gtk/incall_view.c:566
 msgid "poor"
 msgstr "slabá"
 
-#: ../gtk/incall_view.c:558
+#: ../gtk/incall_view.c:568
 msgid "very poor"
 msgstr "velmi slabá"
 
-#: ../gtk/incall_view.c:560
+#: ../gtk/incall_view.c:570
 msgid "too bad"
 msgstr "příliš špatná"
 
-#: ../gtk/incall_view.c:561 ../gtk/incall_view.c:577
+#: ../gtk/incall_view.c:571 ../gtk/incall_view.c:587
 msgid "unavailable"
 msgstr "nedostupná"
 
-#: ../gtk/incall_view.c:669
+#: ../gtk/incall_view.c:679
 msgid "Secured by SRTP"
 msgstr "Zabezpečeno pomocí SRTP"
 
-#: ../gtk/incall_view.c:675
+#: ../gtk/incall_view.c:685
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
 msgstr "Zabezpečeno pomocí ZRTP – [ověřovací klíč: %s]"
 
-#: ../gtk/incall_view.c:681
+#: ../gtk/incall_view.c:691
 msgid "Set unverified"
 msgstr "Nastavit na neověřeno"
 
-#: ../gtk/incall_view.c:681 ../gtk/main.ui.h:4
+#: ../gtk/incall_view.c:691 ../gtk/main.ui.h:4
 msgid "Set verified"
 msgstr "Nastavit na ověřeno"
 
-#: ../gtk/incall_view.c:702
+#: ../gtk/incall_view.c:722
 msgid "In conference"
 msgstr "Probíhá konference"
 
-#: ../gtk/incall_view.c:702
+#: ../gtk/incall_view.c:722
 msgid "<b>In call</b>"
 msgstr "<b>Probíhá hovor</b>"
 
-#: ../gtk/incall_view.c:738
+#: ../gtk/incall_view.c:758
 msgid "<b>Paused call</b>"
 msgstr "<b>Odložený hovor</b>"
 
-#: ../gtk/incall_view.c:751
+#: ../gtk/incall_view.c:771
 #, c-format
 msgid "%02i::%02i::%02i"
 msgstr "%02i:%02i:%02i"
 
-#: ../gtk/incall_view.c:772
+#: ../gtk/incall_view.c:794
 msgid "<b>Call ended.</b>"
 msgstr "<b>Hovor skončil.</b>"
 
-#: ../gtk/incall_view.c:803
+#: ../gtk/incall_view.c:825
 msgid "Transfer in progress"
 msgstr "Probíhá přepojení"
 
-#: ../gtk/incall_view.c:806
+#: ../gtk/incall_view.c:828
 msgid "Transfer done."
 msgstr "Přepojení dokončeno."
 
-#: ../gtk/incall_view.c:809
+#: ../gtk/incall_view.c:831
 msgid "Transfer failed."
 msgstr "Přepojení selhalo."
 
-#: ../gtk/incall_view.c:853
+#: ../gtk/incall_view.c:875
 msgid "Resume"
 msgstr "Obnovit"
 
-#: ../gtk/incall_view.c:860 ../gtk/main.ui.h:9
+#: ../gtk/incall_view.c:882 ../gtk/main.ui.h:9
 msgid "Pause"
 msgstr "Odložit"
 
-#: ../gtk/incall_view.c:926
+#: ../gtk/incall_view.c:948
 #, c-format
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
-msgstr ""
-"<small><i>Nahrává se do\n"
-"%s %s</i></small>"
+msgstr "<small><i>Nahrává se do\n%s %s</i></small>"
 
-#: ../gtk/incall_view.c:926
+#: ../gtk/incall_view.c:948
 msgid "(Paused)"
 msgstr "(Odloženo)"
 
@@ -791,9 +742,9 @@ msgid "Please enter login information for %s"
 msgstr "Prosím, zadejte své přihlašovací jméno pro %s:"
 
 #: ../gtk/config-fetching.c:57
-#, fuzzy, c-format
+#, c-format
 msgid "fetching from %s"
-msgstr "Příchozí hovor od %s"
+msgstr ""
 
 #: ../gtk/config-fetching.c:73
 #, c-format
@@ -817,32 +768,26 @@ msgid "Too loud"
 msgstr ""
 
 #: ../gtk/audio_assistant.c:318
-#, fuzzy
 msgid ""
 "Welcome !\n"
 "This assistant will help you to configure audio settings for Linphone"
 msgstr ""
-"Vítejte!\n"
-"Tento průvodce vám pomůže používat sipový účet při vašich hovorech."
 
 #: ../gtk/audio_assistant.c:328
-#, fuzzy
 msgid "Capture device"
-msgstr "Zařízení pro nahrávání:"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:329
-#, fuzzy
 msgid "Recorded volume"
-msgstr "Zdroj nahrávání:"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:333
 msgid "No voice"
 msgstr ""
 
 #: ../gtk/audio_assistant.c:369
-#, fuzzy
 msgid "Playback device"
-msgstr "Zařízení pro přehrávání:"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:370
 msgid "Play three beeps"
@@ -861,14 +806,12 @@ msgid "Let's start Linphone now"
 msgstr ""
 
 #: ../gtk/audio_assistant.c:496
-#, fuzzy
 msgid "Audio Assistant"
-msgstr "Průvodce"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:506 ../gtk/main.ui.h:31
-#, fuzzy
 msgid "Audio assistant"
-msgstr "Průvodce účtem"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:511
 msgid "Mic Gain calibration"
@@ -947,9 +890,8 @@ msgid "_Options"
 msgstr "V_olby"
 
 #: ../gtk/main.ui.h:23
-#, fuzzy
 msgid "Set configuration URI"
-msgstr "Konfigurace proxy a registrace"
+msgstr ""
 
 #: ../gtk/main.ui.h:24
 msgid "Always start video"
@@ -1056,7 +998,6 @@ msgid "An internet video phone using the standard SIP (rfc3261) protocol."
 msgstr "Internetový videofon používající standardní protokol SIP (RFC 3261)."
 
 #: ../gtk/about.ui.h:5
-#, fuzzy
 msgid ""
 "fr: Simon Morlat\n"
 "en: Simon Morlat and Delphine Perreau\n"
@@ -1071,17 +1012,6 @@ msgid ""
 "hu: anonymous\n"
 "he: Eli Zaretskii <eliz@gnu.org>\n"
 msgstr ""
-"fr: Simon Morlat\n"
-"en: Simon Morlat a Delphine Perreau\n"
-"it: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\n"
-"de: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\n"
-"sv: Daniel Nylander <po@danielnylander.se>\n"
-"es: Jesus Benitez <gnelson at inMail dot sk>\n"
-"ja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\n"
-"pt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\n"
-"pl: Robert Nasiadek <darkone@darkone.pl>\n"
-"cs: Petr Písař <petr.pisar@atlas.cz>\n"
-"hu: anonym\n"
 
 #: ../gtk/contact.ui.h:2
 msgid "SIP Address"
@@ -1156,9 +1086,8 @@ msgid "Registration duration (sec):"
 msgstr "Registrační období (s):"
 
 #: ../gtk/sip_account.ui.h:8
-#, fuzzy
 msgid "Contact params (optional):"
-msgstr "Směrování (volitelné):"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:9
 msgid "AVPF regular RTCP interval (sec):"
@@ -1169,9 +1098,8 @@ msgid "Route (optional):"
 msgstr "Směrování (volitelné):"
 
 #: ../gtk/sip_account.ui.h:11
-#, fuzzy
 msgid "Transport"
-msgstr "<b>Přenos</b>"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:12
 msgid "Register"
@@ -1182,9 +1110,8 @@ msgid "Publish presence information"
 msgstr "Zveřejnit stav přítomnosti"
 
 #: ../gtk/sip_account.ui.h:14
-#, fuzzy
 msgid "Enable AVPF"
-msgstr "Povolit"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:15
 msgid "Configure a SIP account"
@@ -1274,7 +1201,6 @@ msgstr "Obrazový RTP/UDP:"
 msgid "Audio RTP/UDP:"
 msgstr "Zvukový RTP/UDP:"
 
-# Port number
 #: ../gtk/parameters.ui.h:22
 msgid "Fixed"
 msgstr "Stálý"
@@ -1292,14 +1218,12 @@ msgid "DSCP fields"
 msgstr "Položky DSCP"
 
 #: ../gtk/parameters.ui.h:26
-#, fuzzy
 msgid "SIP/TCP port"
-msgstr "SIP port"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:27
-#, fuzzy
 msgid "SIP/UDP port"
-msgstr "SIP port"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:28
 msgid "<b>Network protocol and ports</b>"
@@ -1310,9 +1234,8 @@ msgid "Direct connection to the Internet"
 msgstr "Přímé připojení do Internetu"
 
 #: ../gtk/parameters.ui.h:30
-#, fuzzy
 msgid "Behind NAT / Firewall (specify gateway IP )"
-msgstr "Za NAT/firewallem (adresu brány zadejte níže)"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:31
 msgid "Behind NAT / Firewall (use STUN to resolve)"
@@ -1379,9 +1302,8 @@ msgid "Prefered video resolution:"
 msgstr "Upřednostňované rozlišení obrazu:"
 
 #: ../gtk/parameters.ui.h:47
-#, fuzzy
 msgid "Video output method:"
-msgstr "Vstupní zařízení obrazu:"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:48
 msgid "<b>Video</b>"
@@ -1475,9 +1397,7 @@ msgstr "Zapnout přizpůsobující se řízení rychlosti"
 msgid ""
 "<i>Adaptive rate control is a technique to dynamically guess the available "
 "bandwidth during a call.</i>"
-msgstr ""
-"<i>Přizpůsobující se řízení rychlosti je technika dynamického odhadu "
-"dostupného pásma během hovoru.</i>"
+msgstr "<i>Přizpůsobující se řízení rychlosti je technika dynamického odhadu dostupného pásma během hovoru.</i>"
 
 #: ../gtk/parameters.ui.h:71
 msgid "<b>Bandwidth control</b>"
@@ -1504,23 +1424,20 @@ msgid "User interface"
 msgstr "Uživatelské rozhraní"
 
 #: ../gtk/parameters.ui.h:77 ../gtk/ldap.ui.h:2
-#, fuzzy
 msgid "Server address:"
-msgstr "Adresa serveru:"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:78 ../gtk/ldap.ui.h:3
-#, fuzzy
 msgid "Authentication method:"
-msgstr "Selhání ověření totožnosti"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:80
 msgid "label"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:81
-#, fuzzy
 msgid "<b>LDAP Account setup</b>"
-msgstr "<b>Proxy účty</b>"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:82
 msgid "LDAP"
@@ -1551,9 +1468,8 @@ msgid "Please wait"
 msgstr "Prosím, čekejte"
 
 #: ../gtk/dscp_settings.ui.h:1
-#, fuzzy
 msgid "DSCP settings"
-msgstr "Nastavení DSCP"
+msgstr ""
 
 #: ../gtk/dscp_settings.ui.h:2
 msgid "SIP"
@@ -1608,14 +1524,12 @@ msgid "Video resolution received"
 msgstr ""
 
 #: ../gtk/call_statistics.ui.h:10
-#, fuzzy
 msgid "Video resolution sent"
-msgstr "Upřednostňované rozlišení obrazu:"
+msgstr ""
 
 #: ../gtk/call_statistics.ui.h:11
-#, fuzzy
 msgid "RTP profile"
-msgstr "RTP vlastnosti"
+msgstr ""
 
 #: ../gtk/call_statistics.ui.h:12
 msgid "<b>Call statistics and information</b>"
@@ -1702,23 +1616,20 @@ msgid "1"
 msgstr "1"
 
 #: ../gtk/ldap.ui.h:1
-#, fuzzy
 msgid "LDAP Settings"
-msgstr "Nastavení"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:6
 msgid "Use TLS Connection"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:7
-#, fuzzy
 msgid "Not yet available"
-msgstr "UPnP není nedostupné"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:8
-#, fuzzy
 msgid "<b>Connection</b>"
-msgstr "<b>Kodeky</b>"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:9
 msgid "Bind DN"
@@ -1729,14 +1640,12 @@ msgid "Authname"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:11
-#, fuzzy
 msgid "Realm"
-msgstr "doména:"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:12
-#, fuzzy
 msgid "<b>SASL</b>"
-msgstr "<b>Zvuk</b>"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:13
 msgid "Base object:"
@@ -1752,18 +1661,16 @@ msgid "Name Attribute:"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:17
-#, fuzzy
 msgid "SIP address attribute:"
-msgstr "SIP adresa"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:18
 msgid "Attributes to query:"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:19
-#, fuzzy
 msgid "<b>Search</b>"
-msgstr "<b>Hledat někoho</b>"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:20
 msgid "Timeout for search:"
@@ -1778,9 +1685,8 @@ msgid "Follow Aliases"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:23
-#, fuzzy
 msgid "<b>Miscellaneous</b>"
-msgstr "<b>Různé</b>"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:24
 msgid "ANONYMOUS"
@@ -1804,11 +1710,8 @@ msgstr ""
 
 #: ../gtk/config-uri.ui.h:2
 msgid ""
-"This dialog allows to set an http or https address when configuration is to "
-"be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, "
-"Linphone will restart automatically in order to fetch and take into account "
-"the new configuration. "
+"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
 msgstr ""
 
 #: ../gtk/config-uri.ui.h:4
@@ -1816,81 +1719,79 @@ msgid "https://"
 msgstr ""
 
 #: ../gtk/provisioning-fetch.ui.h:1
-#, fuzzy
 msgid "Configuring..."
-msgstr "Připojuje se…"
+msgstr ""
 
 #: ../gtk/provisioning-fetch.ui.h:2
 msgid "Please wait while fetching configuration from server..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1034
+#: ../coreapi/linphonecore.c:1511
 msgid "Ready"
 msgstr "Připraven."
 
-#: ../coreapi/linphonecore.c:1967
-#, fuzzy
+#: ../coreapi/linphonecore.c:2470
 msgid "Configuring"
-msgstr "Potvrzení"
+msgstr ""
 
-#: ../coreapi/linphonecore.c:2133
+#: ../coreapi/linphonecore.c:2635
 msgid "Looking for telephone number destination..."
 msgstr "Vyhledává se umístění čísla…"
 
-#: ../coreapi/linphonecore.c:2136
+#: ../coreapi/linphonecore.c:2637
 msgid "Could not resolve this number."
 msgstr "Toto číslo nelze vyhledat."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2418
+#: ../coreapi/linphonecore.c:2919
 msgid "Contacting"
 msgstr "Navazuje se spojení"
 
-#: ../coreapi/linphonecore.c:2425
+#: ../coreapi/linphonecore.c:2924
 msgid "Could not call"
 msgstr "Nelze volat"
 
-#: ../coreapi/linphonecore.c:2576
+#: ../coreapi/linphonecore.c:3074
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "Je nám líto, ale byl dosažen maximální počet současných hovorů."
 
-#: ../coreapi/linphonecore.c:2745
+#: ../coreapi/linphonecore.c:3233
 msgid "is contacting you"
 msgstr "vás volá"
 
-#: ../coreapi/linphonecore.c:2746
+#: ../coreapi/linphonecore.c:3234
 msgid " and asked autoanswer."
 msgstr " a požaduje automatickou zvednutí."
 
-#: ../coreapi/linphonecore.c:2746
+#: ../coreapi/linphonecore.c:3234
 msgid "."
 msgstr "."
 
-#: ../coreapi/linphonecore.c:2865
+#: ../coreapi/linphonecore.c:3352
 msgid "Modifying call parameters..."
 msgstr "Upravují se parametry hovoru…"
 
-#: ../coreapi/linphonecore.c:3194
+#: ../coreapi/linphonecore.c:3700
 msgid "Connected."
 msgstr "Připojeno."
 
-#: ../coreapi/linphonecore.c:3220
+#: ../coreapi/linphonecore.c:3725
 msgid "Call aborted"
 msgstr "Hovor přerušen"
 
-#: ../coreapi/linphonecore.c:3412
+#: ../coreapi/linphonecore.c:3915
 msgid "Could not pause the call"
 msgstr "Hovor nebylo možné odložit"
 
-#: ../coreapi/linphonecore.c:3417
+#: ../coreapi/linphonecore.c:3919
 msgid "Pausing the current call..."
 msgstr "Současný hovor se odkládá…"
 
-#: ../coreapi/misc.c:425
+#: ../coreapi/misc.c:438
 msgid "Stun lookup in progress..."
 msgstr "Hledá se adresa pomocí STUN…"
 
-#: ../coreapi/misc.c:607
+#: ../coreapi/misc.c:619
 msgid "ICE local candidates gathering in progress..."
 msgstr "Shromažďují se místní kandidáti ICE…"
 
@@ -1939,1047 +1840,148 @@ msgid "Pending"
 msgstr "Čekám"
 
 #: ../coreapi/friend.c:66
-#, fuzzy
 msgid "Vacation"
-msgstr "Délka"
+msgstr ""
 
 #: ../coreapi/friend.c:68
 msgid "Unknown-bug"
 msgstr "Neznámá chyba"
 
-#: ../coreapi/proxy.c:314
+#: ../coreapi/proxy.c:319
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
-msgstr ""
-"Adresa SIP proxy, kterou jste zadali, není platná. Musí začínat na „sip:“ a "
-"pak musí následovat jméno stroje."
+msgstr "Adresa SIP proxy, kterou jste zadali, není platná. Musí začínat na „sip:“ a pak musí následovat jméno stroje."
 
-#: ../coreapi/proxy.c:320
+#: ../coreapi/proxy.c:325
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
-msgstr ""
-"SIP identita, kterou jste zadali, není platná.\n"
-"Měla by mít tvar sip:uživatel@proxydoména, například sip:alice@example.net"
+msgstr "SIP identita, kterou jste zadali, není platná.\nMěla by mít tvar sip:uživatel@proxydoména, například sip:alice@example.net"
 
-#: ../coreapi/proxy.c:1369
+#: ../coreapi/proxy.c:1377
 #, c-format
 msgid "Could not login as %s"
 msgstr "Nelze se přihlásit jako %s"
 
-#: ../coreapi/callbacks.c:355
+#: ../coreapi/callbacks.c:383
 msgid "Remote ringing."
 msgstr "Vyzvání na druhé straně."
 
-#: ../coreapi/callbacks.c:373
+#: ../coreapi/callbacks.c:404
 msgid "Remote ringing..."
 msgstr "Vyzvání na druhé straně…"
 
-#: ../coreapi/callbacks.c:384
+#: ../coreapi/callbacks.c:414
 msgid "Early media."
 msgstr "Časná média."
 
-#: ../coreapi/callbacks.c:435
+#: ../coreapi/callbacks.c:475
 #, c-format
 msgid "Call with %s is paused."
 msgstr "Hovor s %s je odložen."
 
-#: ../coreapi/callbacks.c:448
+#: ../coreapi/callbacks.c:488
 #, c-format
 msgid "Call answered by %s - on hold."
 msgstr "Hovor přijat kým: %s – odložen."
 
-#: ../coreapi/callbacks.c:459
+#: ../coreapi/callbacks.c:498
 msgid "Call resumed."
 msgstr "Hovor obnoven."
 
-#: ../coreapi/callbacks.c:464
+#: ../coreapi/callbacks.c:502
 #, c-format
 msgid "Call answered by %s."
 msgstr "Hovor přijat kým: %s."
 
-#: ../coreapi/callbacks.c:483
+#: ../coreapi/callbacks.c:525
 msgid "Incompatible, check codecs or security settings..."
 msgstr "Není slučitelné. Zkontrolujte nastavení kodeků a zabezpečení…"
 
-#: ../coreapi/callbacks.c:512
+#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:826
+msgid "Incompatible media parameters."
+msgstr "Neslučitelné parametry médií."
+
+#: ../coreapi/callbacks.c:560
 msgid "We have been resumed."
 msgstr "Byli jsme obnoveni."
 
-#: ../coreapi/callbacks.c:521
+#. we are being paused
+#: ../coreapi/callbacks.c:568
 msgid "We are paused by other party."
 msgstr "Byli jsme odloženi protistranou."
 
-#: ../coreapi/callbacks.c:556
+#. reINVITE and in-dialogs UPDATE go here
+#: ../coreapi/callbacks.c:602
 msgid "Call is updated by remote."
 msgstr "Hovor byl aktualizován protistranou."
 
-#: ../coreapi/callbacks.c:658
+#: ../coreapi/callbacks.c:705
 msgid "Call terminated."
 msgstr "Hovor ukončen."
 
-#: ../coreapi/callbacks.c:687
+#: ../coreapi/callbacks.c:733
 msgid "User is busy."
 msgstr "Uživatel je zaneprázdněn."
 
-#: ../coreapi/callbacks.c:688
+#: ../coreapi/callbacks.c:734
 msgid "User is temporarily unavailable."
 msgstr "Uživatel je dočasně nedostupný."
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:690
+#: ../coreapi/callbacks.c:736
 msgid "User does not want to be disturbed."
 msgstr "Uživatel si nepřeje být rušen."
 
-#: ../coreapi/callbacks.c:691
+#: ../coreapi/callbacks.c:737
 msgid "Call declined."
 msgstr "Volání odmítnuto."
 
-#: ../coreapi/callbacks.c:706
+#: ../coreapi/callbacks.c:752
 msgid "Request timeout."
 msgstr ""
 
-#: ../coreapi/callbacks.c:737
+#: ../coreapi/callbacks.c:780
 msgid "Redirected"
 msgstr "Přesměrováno"
 
-#: ../coreapi/callbacks.c:787
-msgid "Incompatible media parameters."
-msgstr "Neslučitelné parametry médií."
-
-#: ../coreapi/callbacks.c:798
+#: ../coreapi/callbacks.c:835
 msgid "Call failed."
 msgstr "Volání se nezdařilo."
 
-#: ../coreapi/callbacks.c:878
+#: ../coreapi/callbacks.c:913
 #, c-format
 msgid "Registration on %s successful."
 msgstr "Registrace na %s byla úspěšná."
 
-#: ../coreapi/callbacks.c:879
+#: ../coreapi/callbacks.c:914
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "Odregistrování z %s hotovo."
 
-#: ../coreapi/callbacks.c:897
+#: ../coreapi/callbacks.c:932
 msgid "no response timeout"
 msgstr "odpověď nedorazila včas"
 
-#: ../coreapi/callbacks.c:900
+#: ../coreapi/callbacks.c:935
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "Registrace na %s selhala: %s"
 
-#: ../coreapi/callbacks.c:907
+#: ../coreapi/callbacks.c:942
 msgid "Service unavailable, retrying"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:177
+#: ../coreapi/linphonecall.c:174
 #, c-format
 msgid "Authentication token is %s"
 msgstr "Klíč k ověření totožnosti je %s"
 
-#: ../coreapi/linphonecall.c:2932
+#: ../coreapi/linphonecall.c:3020
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
 msgstr[0] "Máte %i zmeškaný hovor."
 msgstr[1] "Máte %i zmeškané hovory."
 msgstr[2] "Máte %i zmeškaných hovorů."
-
-#~ msgid "aborted"
-#~ msgstr "přerušen"
-
-#~ msgid "completed"
-#~ msgstr "dokončen"
-
-#~ msgid "missed"
-#~ msgstr "promeškán"
-
-#~ msgid ""
-#~ "%s at %s\n"
-#~ "From: %s\n"
-#~ "To: %s\n"
-#~ "Status: %s\n"
-#~ "Duration: %i mn %i sec\n"
-#~ msgstr ""
-#~ "%s v %s\n"
-#~ "Od: %s\n"
-#~ "Pro: %s\n"
-#~ "Stav: %s\n"
-#~ "Délka: %i min %i s\n"
-
-#~ msgid "Outgoing call"
-#~ msgstr "Odchozí hovor"
-
-#~ msgid "No response."
-#~ msgstr "Žádná odpověď."
-
-#~ msgid "Protocol error."
-#~ msgstr "Chyba protokolu."
-
-#~ msgid ""
-#~ "Could not parse given sip address. A sip url usually looks like sip:"
-#~ "user@domain"
-#~ msgstr ""
-#~ "Špatně zadaná SIP adresa. Adresa má mít tento formát <sip:uživatel@doména>"
-
-#~ msgid ""
-#~ "Your computer appears to be using ALSA sound drivers.\n"
-#~ "This is the best choice. However the pcm oss emulation module\n"
-#~ "is missing and linphone needs it. Please execute\n"
-#~ "'modprobe snd-pcm-oss' as root to load it."
-#~ msgstr ""
-#~ "Váš počítač používá zvukový ovladač ALSA. Jde o nejlepší\n"
-#~ "volbu. Linphone však potřebuje ke své práci modul emulace\n"
-#~ "oss, který chybí. Prosím zadejte jako uživatel root příkaz\n"
-#~ "'modprobe snd-pcm-oss', kterým modul zavede."
-
-#~ msgid ""
-#~ "Your computer appears to be using ALSA sound drivers.\n"
-#~ "This is the best choice. However the mixer oss emulation module\n"
-#~ "is missing and linphone needs it. Please execute\n"
-#~ " 'modprobe snd-mixer-oss' as root to load it."
-#~ msgstr ""
-#~ "Váš počítač používá zvukový ovladač ALSA. Jde o nejlepší\n"
-#~ "volbu. Linphone však potřebuje ke své práci modul mixer emulace\n"
-#~ "oss, který chybí. Prosím zadejte jako uživatel root příkaz\n"
-#~ "'modprobe snd-mixer-oss', kterým modul zavede."
-
-#~ msgid "<span size=\"large\">by %s</span>"
-#~ msgstr "<span size=\"large\">kým: %s</span>"
-
-#~ msgid "Keypad"
-#~ msgstr "Klávesnice"
-
-#~ msgid "Chat with %s"
-#~ msgstr "Diskuze s %s"
-
-#~ msgid "Please choose a username:"
-#~ msgstr "Prosím, vyberte si uživatelské jméno:"
-
-#~ msgid "Checking if '%s' is available..."
-#~ msgstr "Zjišťuji, zda-li je „%s“ přípustné…"
-
-#~ msgid "Please wait..."
-#~ msgstr "Prosím, čekejte…"
-
-#~ msgid "Sorry this username already exists. Please try a new one."
-#~ msgstr "Je nám líto, ale toto jméno již existuje. Prosím, zvolte jiné."
-
-#~ msgid "Ok !"
-#~ msgstr "V pořádku!"
-
-#~ msgid "Communication problem, please try again later."
-#~ msgstr "Chyba při komunikaci. Prosím, zkuste to později."
-
-#~ msgid "Choosing a username"
-#~ msgstr "Výběr uživatelského jména"
-
-#~ msgid "Verifying"
-#~ msgstr "Ověřování"
-
-#~ msgid "Creating your account"
-#~ msgstr "Vytváření účtu"
-
-#~ msgid "Now ready !"
-#~ msgstr "Připraveno!"
-
-#~ msgid "Enable video"
-#~ msgstr "Zapnout video"
-
-#~ msgid "Enter username, phone number, or full sip address"
-#~ msgstr ""
-#~ "Zadejte uživatelské jméno, telefonní číslo nebo plnou sipovou adresu"
-
-#~ msgid "Lookup:"
-#~ msgstr "Hledat:"
-
-#~ msgid "in"
-#~ msgstr "ve"
-
-#~ msgid ""
-#~ "Register to FONICS\n"
-#~ "virtual network !"
-#~ msgstr ""
-#~ "Zaregistrovat se do\n"
-#~ "virtuální sítě FONICS!"
-
-#~ msgid "We are being paused..."
-#~ msgstr "Jsme odkládáni…"
-
-#~ msgid "No common codecs"
-#~ msgstr "Žádný společný formát"
-
-#~ msgid "Register at startup"
-#~ msgstr "Zaregistrovat při spuštění"
-
-#~ msgid "Windows"
-#~ msgstr "Okna"
-
-#~ msgid ""
-#~ "Pause all calls\n"
-#~ "and answer"
-#~ msgstr ""
-#~ "Odložit všechny hovory\n"
-#~ "a odpovědět"
-
-#~ msgid "Unmute"
-#~ msgstr "Nahlas"
-
-#~ msgid "<b>Contact list</b>"
-#~ msgstr "<b>Seznam kontaktů</b>"
-
-#~ msgid "Audio & video"
-#~ msgstr "Zvuk a obraz"
-
-#~ msgid "Audio only"
-#~ msgstr "Pouze zvuk"
-
-#~ msgid "Duration:"
-#~ msgstr "Délka:"
-
-#~ msgid "_Call history"
-#~ msgstr "_Historie volání"
-
-#~ msgid "_Linphone"
-#~ msgstr "_Linphone"
-
-#~ msgid "Sorry, you have to pause or stop the current call first !"
-#~ msgstr "Je nám líto, ale nejprve musíte hovor odložit nebo ukončit!"
-
-#~ msgid "There is already a call in process, pause or stop it first."
-#~ msgstr "Již probíhá hovor, nejprve jej odložte nebo ukončete."
-
-#~ msgid "ITU-G.711 alaw encoder"
-#~ msgstr "Kodér a-law ITU-G.711"
-
-#~ msgid "ITU-G.711 alaw decoder"
-#~ msgstr "Dekodér a-law ITU-G.711"
-
-#~ msgid "Alsa sound source"
-#~ msgstr "Zdroj zvuku ALSA"
-
-#~ msgid "Alsa sound output"
-#~ msgstr "Zvukový výstup ALSA"
-
-#~ msgid "Sound capture filter for MacOS X Audio Queue Service"
-#~ msgstr "Filtr zachytávání zvuku přes MacOS X službu zvukové fronty"
-
-#~ msgid "Sound playback filter for MacOS X Audio Queue Service"
-#~ msgstr "Filtr přehrávání zvuku přes MacOS X službu zvukové fronty"
-
-#~ msgid "DTMF generator"
-#~ msgstr "Generátor DTMF"
-
-#~ msgid "The GSM full-rate codec"
-#~ msgstr "Kodek plnopásmového GSM"
-
-#~ msgid "The GSM codec"
-#~ msgstr "GSM kodek"
-
-#~ msgid "Sound capture filter for MacOS X Audio Unit"
-#~ msgstr "Filtr zachytávání zvuku přes MacOS X ovladač Audio Unit"
-
-#~ msgid "Sound playback filter for MacOS X Audio Unit"
-#~ msgstr "Filtr přehrávání zvuku přes MacOS X ovladač Core Audio"
-
-#~ msgid "A filter to make conferencing"
-#~ msgstr "Filtr pro vytváření konferencí"
-
-#~ msgid "Raw files and wav reader"
-#~ msgstr "Čtení syrových souborů a souborů WAV"
-
-#~ msgid "Wav file recorder"
-#~ msgstr "Nahrávání do souborů WAV"
-
-#~ msgid "A filter that send several inputs to one output."
-#~ msgstr "Filtr, který směšuje několik vstupů do jednoho výstupu."
-
-#~ msgid "RTP output filter"
-#~ msgstr "Filtr RTP výstupu"
-
-#~ msgid "RTP input filter"
-#~ msgstr "Filtr RTP vstupu"
-
-#~ msgid "The free and wonderful speex codec"
-#~ msgstr "Svobodný a úžasný kodek speex"
-
-#~ msgid "A filter that controls and measure sound volume"
-#~ msgstr "Filtr, který měří a řídí hlasitost zvuku"
-
-#~ msgid "A video4linux compatible source filter to stream pictures."
-#~ msgstr "Zdrojový filtr kompatibilní s Video4Linux proudující obrázky."
-
-#~ msgid "A filter to grab pictures from Video4Linux2-powered cameras"
-#~ msgstr "Filtr zachytávající obrázky z Video4Linux2 kamer"
-
-#~ msgid "A filter that outputs a static image."
-#~ msgstr "Filtr, který vydává nehybný obrázek."
-
-#~ msgid "A pixel format converter"
-#~ msgstr "Převodník formátu pixelů"
-
-#~ msgid "A video size converter"
-#~ msgstr "Převaděč velikosti videa"
-
-#~ msgid "a small video size converter"
-#~ msgstr "Převaděč velikosti malých videí"
-
-#~ msgid "Echo canceller using speex library"
-#~ msgstr "Potlačení ozvěny prostřednictvím knihovny speex"
-
-#~ msgid "A filter that reads from input and copy to its multiple outputs."
-#~ msgstr "Filtr, který čte vstup a kopíruje ho více výstupů."
-
-#~ msgid "The theora video encoder from xiph.org"
-#~ msgstr "Kodér videa do theory od xiph.org"
-
-#~ msgid "The open-source and royalty-free 'theora' video codec from xiph.org"
-#~ msgstr ""
-#~ "Kodek pro video „theora“ od xiph.org, který má otevřený zdrojový kód a je "
-#~ "prostý licenčních poplatků"
-
-#~ msgid "The theora video decoder from xiph.org"
-#~ msgstr "Dekodér theora videa od xiph.org"
-
-#~ msgid "ITU-G.711 ulaw encoder"
-#~ msgstr "Kodér µ-law ITU-G.711"
-
-#~ msgid "ITU-G.711 ulaw decoder"
-#~ msgstr "Dekodér µ-law ITU-G.711"
-
-#~ msgid "A H.263 decoder using ffmpeg library"
-#~ msgstr "Dekodér H.263 používající knihovnu ffmpeg"
-
-#~ msgid "A MPEG4 decoder using ffmpeg library"
-#~ msgstr "Dekodér MPEG4 používající knihovnu ffmpeg"
-
-#~ msgid "A RTP/JPEG decoder using ffmpeg library"
-#~ msgstr "Dekodér RTP/JPEG používající knihovnu ffmpeg"
-
-#~ msgid "A MJPEG decoder using ffmpeg library"
-#~ msgstr "Dekodér MPEG používající knihovnu ffmpeg"
-
-#~ msgid "A snow decoder using ffmpeg library"
-#~ msgstr "Dekodér snow používající knihovnu ffmpeg"
-
-#~ msgid "A video H.263 encoder using ffmpeg library."
-#~ msgstr "Kodér H.263 používající knihovnu ffmpeg."
-
-#~ msgid ""
-#~ "A video H.263 encoder using ffmpeg library. It is compliant with old "
-#~ "RFC2190 spec."
-#~ msgstr ""
-#~ "Kodér H.263 videa používající knihovnu ffmpeg. Vyhovuje staré specifikaci "
-#~ "RFC 2190."
-
-#~ msgid "A video MPEG4 encoder using ffmpeg library."
-#~ msgstr "Kodér MPEG4 videa používající knihovnu ffmpeg."
-
-#~ msgid "A video snow encoder using ffmpeg library."
-#~ msgstr "Kodér snow videa používající knihovnu ffmpeg."
-
-#~ msgid "A RTP/MJPEG encoder using ffmpeg library."
-#~ msgstr "Kodér RTP/MJPEG používající knihovnu ffmpeg."
-
-#~ msgid ""
-#~ "A video H.263 encoder using ffmpeg library, compliant with old RFC2190 "
-#~ "spec."
-#~ msgstr ""
-#~ "Kodér H.263 videa používající knihovnu ffmpeg, vyhovuje staré specifikaci "
-#~ "RFC 2190."
-
-#~ msgid ""
-#~ "The snow codec is royalty-free and is open-source. \n"
-#~ "It uses innovative techniques that makes it one of most promising video "
-#~ "codec. It is implemented within the ffmpeg project.\n"
-#~ "However it is under development, quite unstable and compatibility with "
-#~ "other versions cannot be guaranteed."
-#~ msgstr ""
-#~ "Kodek snow není zatížen poplatky a má otevřený zdrojový kód.\n"
-#~ "Využívá průkopnické techniky, které jej činí jedním z nejslibnějších "
-#~ "video kodeků. Je implementován v projektu ffmpeg.\n"
-#~ "Avšak stále se vyvíjí, je trochu nestabilní a kompatibilita s ostatními "
-#~ "verzemi není zaručena."
-
-#~ msgid "A MJPEG encoder using ffmpeg library."
-#~ msgstr "Kodér MJPEG používající knihovnu ffmpeg."
-
-#~ msgid "A SDL-based video display"
-#~ msgstr "Zobrazování videa přes SDL"
-
-#~ msgid "A video4windows compatible source filter to stream pictures."
-#~ msgstr "Zdrojový filtr kompatibilní s video4windows proudující obrázky."
-
-#~ msgid "A video for windows (vfw.h) based source filter to grab pictures."
-#~ msgstr ""
-#~ "Zdrojový filtr založený na videu pro windows (vwf.h) pro zachytávání "
-#~ "obrázků."
-
-#~ msgid ""
-#~ "A filter that trashes its input (useful for terminating some graphs)."
-#~ msgstr ""
-#~ "Filtr, který zahazuje svůj vstup (užitečné na zakončení některých grafů)."
-
-#~ msgid "Parametric sound equalizer."
-#~ msgstr "Parametrický ekvalizér zvuku."
-
-#~ msgid "A webcam grabber based on directshow."
-#~ msgstr "Snímač kamer postavený na directshow."
-
-#~ msgid "A video display based on windows DrawDib api"
-#~ msgstr "Zobrazovaní videa přes API Windows DrawDib"
-
-#~ msgid "A filter that mixes down 16 bit sample audio streams"
-#~ msgstr "Filtr, který smísí 16b vzorkované zvukové proudy"
-
-#~ msgid "A filter that converts from mono to stereo and vice versa."
-#~ msgstr "Filtr, který převádí mono na stereo a obráceně."
-
-#~ msgid "Inter ticker communication filter."
-#~ msgstr "Komunikační filtr mezitiku."
-
-#~ msgid "A display filter sending the buffers to draw to the upper layer"
-#~ msgstr "Zobrazovací filtr odesílající buffery na vykreslení do vyšší vrstvy"
-
-#~ msgid "Sound capture filter for MacOS X Audio Unit Service"
-#~ msgstr "Filtr zachytávání zvuku přes MacOS X službu Audio Unit"
-
-#~ msgid "Sound playback filter for MacOS X Audio Unit Service"
-#~ msgstr "Filtr přehrávání zvuku přes MacOS X službu Audio Unit"
-
-#~ msgid "A video display using X11+Xv"
-#~ msgstr "Zobrazovaní videa pomocí X11+Xv"
-
-#~ msgid "Sound capture filter for Android"
-#~ msgstr "Zvukový zachytávací filtr pro Android"
-
-#~ msgid "Sound playback filter for Android"
-#~ msgstr "Zvukový přehrávací filtr pro Android"
-
-#~ msgid "A filter that captures Android video."
-#~ msgstr "Filtr, který zachytává obraz za Androidu."
-
-#~ msgid ""
-#~ "Your machine appears to be connected to an IPv6 network. By default "
-#~ "linphone always uses IPv4. Please update your configuration if you want "
-#~ "to use IPv6"
-#~ msgstr ""
-#~ "Zdá se, že váš počítač je připojen do IPv6 sítě. Standardně linphone "
-#~ "používá pouze IPv4. Prosím, změňte nastavení programu, pokud chcete "
-#~ "používat IPv6."
-
-#~ msgid "Call answered - connected."
-#~ msgstr "Hovoř přijat – spojen."
-
-#~ msgid "Show debug messages"
-#~ msgstr "Zobrazit ladicí zprávy"
-
-#~ msgid "Start call"
-#~ msgstr "Zahájit hovor"
-
-#~ msgid "_Modes"
-#~ msgstr "Reži_my"
-
-#~ msgid "Created by Simon Morlat\n"
-#~ msgstr "Vytvořil Simon Morlat\n"
-
-#~ msgid "Accept"
-#~ msgstr "Přijmout"
-
-#~ msgid "Incoming call from"
-#~ msgstr "Příchozí hovor od"
-
-#~ msgid "Linphone - Incoming call"
-#~ msgstr "Linphone – Příchozí hovor"
-
-#~ msgid ""
-#~ "Audio codecs\n"
-#~ "Video codecs"
-#~ msgstr ""
-#~ "Kodeky zvuku\n"
-#~ "Kodeky obrazu"
-
-#~ msgid "default soundcard\n"
-#~ msgstr "implicitní zvuková karta\n"
-
-#~ msgid ""
-#~ "Remote end seems to have disconnected, the call is going to be closed."
-#~ msgstr "Vzdálený konec se asi odpojil, hovor bude ukončen."
-
-#~ msgid "Sorry, having multiple simultaneous calls is not supported yet !"
-#~ msgstr "Promiňte, vedení více současných hovorů není podporováno!"
-
-#~ msgid "Digits"
-#~ msgstr "Číslice"
-
-#~ msgid "Main view"
-#~ msgstr "Hlavní zobrazení"
-
-#~ msgid "No nat/firewall address supplied !"
-#~ msgstr "Žádná adresa NATu/firewallu nebyla zadána!"
-
-#~ msgid "Invalid nat address '%s' : %s"
-#~ msgstr "Neplatná adresa NATu '%s': '%s"
-
-#~ msgid "Could not reach destination."
-#~ msgstr "Cíl je nedostupný."
-
-#~ msgid "Request Cancelled."
-#~ msgstr "Dotaz přerušen."
-
-#~ msgid "Bad request"
-#~ msgstr "Chybný dotaz"
-
-#~ msgid "User cannot be found at given address."
-#~ msgstr "Uživatele nelze na dané adrese zastihnout."
-
-#~ msgid "Remote user cannot support any of proposed codecs."
-#~ msgstr "Vzdálený uživatel nemá podporu pro žádný z navržených kodeků."
-
-#~ msgid "Timeout."
-#~ msgstr "Vypršení časového limitu."
-
-#~ msgid "Remote host was found but refused connection."
-#~ msgstr "Vzdálený počítač byl nalezen, ale odmítl připojení."
-
-#~ msgid ""
-#~ "User is not reachable at the moment but he invites you\n"
-#~ "to contact him using the following alternate resource:"
-#~ msgstr ""
-#~ "Uživatel je nedostupný, ale navrhuje tyto alternativní\n"
-#~ "setkání:"
-
-#~ msgid "Gone"
-#~ msgstr "Pryč"
-
-#~ msgid "Waiting for Approval"
-#~ msgstr "Čekám na schválení"
-
-#~ msgid "Be Right Back"
-#~ msgstr "Na chvíli pryč"
-
-#~ msgid "On The Phone"
-#~ msgstr "Na příjmu"
-
-#~ msgid "Out To Lunch"
-#~ msgstr "Na obědě"
-
-#~ msgid "Closed"
-#~ msgstr "Zavřeno"
-
-#~ msgid "Unknown"
-#~ msgstr "Stav není znám"
-
-#~ msgid "Bresilian"
-#~ msgstr "brazilská portugalština"
-
-#~ msgid "_View"
-#~ msgstr "_Zobrazit"
-
-#~ msgid "A video for macosx compatible source filter to stream pictures."
-#~ msgstr "Zdrojový filtr kompatibilní s MacOS X videem proudující obrázky."
-
-#~ msgid ""
-#~ "Show All\n"
-#~ "Show Online"
-#~ msgstr ""
-#~ "Zobrazovat vše\n"
-#~ "Zobrazovat připojené"
-
-#~ msgid "Display filters"
-#~ msgstr "Filtry pro zobrazení"
-
-#~ msgid "I'm not behing a firewall"
-#~ msgstr "Nejsem za firewallem"
-
-#~ msgid "I'm behind a firewall, use supplied public IP address"
-#~ msgstr "Jsem za firewallem, použij zadanou veřejnou IP adresu"
-
-#~ msgid "Use the supplied stun server above and do as best as possible"
-#~ msgstr "Použij výše zadaný STUN server a snaž se, jak nejlépe umíš"
-
-#~ msgid "Go"
-#~ msgstr "Soubor"
-
-#~ msgid "Shows calls"
-#~ msgstr "Zobrazit volání"
-
-#~ msgid "Exit"
-#~ msgstr "Ukončit"
-
-#~ msgid "..."
-#~ msgstr "…"
-
-#~ msgid "Proxy to use:"
-#~ msgstr "Proxy:"
-
-#~ msgid ""
-#~ "Call or\n"
-#~ "answer"
-#~ msgstr ""
-#~ "Volat nebo\n"
-#~ "přijmout"
-
-#~ msgid ""
-#~ "Hangup\n"
-#~ "or refuse"
-#~ msgstr ""
-#~ "Zavěsit nebo\n"
-#~ "odmítnout"
-
-#~ msgid "Or chat !"
-#~ msgstr "Nebo poslat zprávu!"
-
-#~ msgid "Show more..."
-#~ msgstr "Zobrazit více…"
-
-#~ msgid "Playback level:"
-#~ msgstr "Úroveň přehrávání:"
-
-#~ msgid "Recording level:"
-#~ msgstr "Úroveň nahrávání:"
-
-#~ msgid "Ring level:"
-#~ msgstr "Úroveň vyzvánění:"
-
-#~ msgid "Controls"
-#~ msgstr "Ovládání"
-
-#~ msgid "Reachable"
-#~ msgstr "Dosažitelný"
-
-#~ msgid "Busy, I'll be back in "
-#~ msgstr "Mám práci, jsem zpět za "
-
-#~ msgid "The other party will be informed that you'll be back in X minutes"
-#~ msgstr "Druhá strana bude informována, že se vrátíte za X minut"
-
-#~ msgid "mn"
-#~ msgstr "min"
-
-#~ msgid "Moved temporarily"
-#~ msgstr "Dočasně mimo"
-
-#~ msgid "Alternative service"
-#~ msgstr "Alternativní služba"
-
-#~ msgid "URL:"
-#~ msgstr "URL:"
-
-#~ msgid "Presence"
-#~ msgstr "Přítomnost"
-
-#~ msgid "Press digits to send DTMFs."
-#~ msgstr "Zadejte čísla pro zaslání DTMF."
-
-#~ msgid ""
-#~ "  3\n"
-#~ "def"
-#~ msgstr ""
-#~ "  3\n"
-#~ "def"
-
-#~ msgid ""
-#~ "  2\n"
-#~ "abc"
-#~ msgstr ""
-#~ "  2\n"
-#~ "abc"
-
-#~ msgid ""
-#~ "  4\n"
-#~ "ghi"
-#~ msgstr ""
-#~ "  4\n"
-#~ "ghi"
-
-#~ msgid ""
-#~ " 5\n"
-#~ "jkl"
-#~ msgstr ""
-#~ " 5\n"
-#~ "jkl"
-
-#~ msgid ""
-#~ "  6\n"
-#~ "mno"
-#~ msgstr ""
-#~ "  6\n"
-#~ "mno"
-
-#~ msgid ""
-#~ "   7\n"
-#~ "pqrs"
-#~ msgstr ""
-#~ "   7\n"
-#~ "pqrs"
-
-#~ msgid ""
-#~ "  8\n"
-#~ "tuv"
-#~ msgstr ""
-#~ "  8\n"
-#~ "tuv"
-
-#~ msgid ""
-#~ "   9\n"
-#~ "wxyz"
-#~ msgstr ""
-#~ "   9\n"
-#~ "wxyz"
-
-#~ msgid "DTMF"
-#~ msgstr "DTMF"
-
-#~ msgid "My online friends"
-#~ msgstr "Přátelé online"
-
-#~ msgid ""
-#~ "C: 2001\n"
-#~ "Made in Old Europe"
-#~ msgstr ""
-#~ "© 2001\n"
-#~ "Vyrobeno ve Staré Dobré Evropě"
-
-#~ msgid ""
-#~ "Linphone is a web-phone.\n"
-#~ "It is compatible with SIP and RTP protocols."
-#~ msgstr ""
-#~ "Linphone je program pro IP telefonii.\n"
-#~ "Je kompatibilní s protokoly SIP a RTP."
-
-#~ msgid "http://www.linphone.org"
-#~ msgstr "http://www.linphone.org/"
-
-#~ msgid "Use IPv6 network (if available)"
-#~ msgstr "Použít IPv6 síť (je-li dostupná)"
-
-#~ msgid ""
-#~ "Toggle this if you are on an ipv6 network and you wish linphone to use it."
-#~ msgstr ""
-#~ "Jestliže jste v síti podporující IPv6 protokol a chcete-li, aby jej "
-#~ "linphone používal, zapněte tuto volbu."
-
-#~ msgid "Global"
-#~ msgstr "Obecné"
-
-#~ msgid ""
-#~ "These options is only for users in a private network, behind a gateway. "
-#~ "If you are not in this situation, then leave this empty."
-#~ msgstr ""
-#~ "Tato volba je určena pouze pro uživatele v intranetu za firewallem. Pokud "
-#~ "to není váš případ, nevyplňujte."
-
-#~ msgid "No firewall"
-#~ msgstr "Bez firewallu"
-
-#~ msgid "Use this STUN server to guess firewall address :"
-#~ msgstr "Pro odhad veřejné adresy použít tento STUN server:"
-
-#~ msgid "Specify firewall address manually:"
-#~ msgstr "Veřejná adresa firewallu:"
-
-#~ msgid "NAT traversal options (experimental)"
-#~ msgstr "Volby průchodu NATem (experimentální)"
-
-#~ msgid "Number of buffered miliseconds (jitter compensation):"
-#~ msgstr "Velikosti vyrovnávací fronty v milisekundách (potlačení rozptylu):"
-
-#~ msgid "RTP port used for audio:"
-#~ msgstr "RTP port pro zvuk:"
-
-#~ msgid "Use SIP INFO message instead of RTP rfc2833 for DTMF transmitting"
-#~ msgstr "Místo RTP rfc2833 použít pro DTMF přenos SIP INFO zprávu"
-
-#~ msgid "RTP-RFC2833 is the recommended way."
-#~ msgstr "Doporučeno je RTP-RFC2833."
-
-#~ msgid "Other"
-#~ msgstr "Ostatní"
-
-#~ msgid "micro"
-#~ msgstr "mikrofon"
-
-#~ msgid "Enable echo-canceler (cancels the echo heard by the remote party)"
-#~ msgstr "Potlačit ozvěnu (projeví se na druhém konci)"
-
-#~ msgid "Choose file"
-#~ msgstr "Vyberte soubor"
-
-#~ msgid "Listen"
-#~ msgstr "Test"
-
-#~ msgid "Run sip user agent on port:"
-#~ msgstr "Spustit uživatelského agenta SIP na portu:"
-
-#~ msgid "It is strongly recommended to use port 5060."
-#~ msgstr "Je doporučeno používat port 5060."
-
-#~ msgid "@"
-#~ msgstr "@"
-
-#~ msgid "Identity"
-#~ msgstr "Identita"
-
-#~ msgid "Add proxy/registrar"
-#~ msgstr "Přidat proxy/registraci"
-
-#~ msgid "Clear all stored authentication information (username,password...)"
-#~ msgstr "Vyprázdnit všechny ověřovací informace (uživatelské jméno, heslo…)"
-
-#~ msgid "List of audio codecs, in order of preference:"
-#~ msgstr "Seznam audio kodeků podle preference:"
-
-#~ msgid ""
-#~ "Note: Codecs in red are not usable regarding to your connection type to "
-#~ "the internet."
-#~ msgstr ""
-#~ "Poznámka: Kodeky označené červeně nelze u vašeho typu připojení použít."
-
-#~ msgid "No information availlable"
-#~ msgstr "Nejsou dostupné žádné informace"
-
-#~ msgid "Codec information"
-#~ msgstr "Informace o kodeku"
-
-#~ msgid "Address Book"
-#~ msgstr "Adresář"
-
-#~ msgid "Select"
-#~ msgstr "Vybrat"
-
-#~ msgid ""
-#~ "User is not reachable at the moment but he invites you to contact him "
-#~ "using the following alternate ressource:"
-#~ msgstr ""
-#~ "Uživatel je momentálně nedostupný, ale navrhuje tyto alternativní formy "
-#~ "kontaktu:"
-
-#~ msgid "None."
-#~ msgstr "Žádné."
-
-#~ msgid "Send registration:"
-#~ msgstr "Odeslat registraci:"
-
-#~ msgid "Name:"
-#~ msgstr "Jméno:"
-
-#~ msgid "Subscribe policy:"
-#~ msgstr "Pravidlo přihlášení:"
-
-#~ msgid "Send subscription (see person's online status)"
-#~ msgstr "Odeslat přihlášení (podle online stavu osoby)"
-
-#~ msgid "New incoming subscription"
-#~ msgstr "Nové příchozí přihlášení"
-
-#~ msgid "You have received a new subscription..."
-#~ msgstr "Obdrželi jste nové přihlášení…"
-
-#~ msgid "Refuse"
-#~ msgstr "Odmítnout"
-
-#~ msgid "Authentication required for realm"
-#~ msgstr "pro doménu je vyžadováno ověření"
-
-#~ msgid "userid:"
-#~ msgstr "ID uživatele:"
-
-#~ msgid "Text:"
-#~ msgstr "Text:"
-
-#~ msgid "The caller asks for resource reservation. Do you agree ?"
-#~ msgstr "Volající žádá o rezervaci zdrojů. Souhlasíte?"
-
-#~ msgid ""
-#~ "The caller doesn't use resource reservation. \t\t\t\t\tDo you wish to "
-#~ "continue anyway ?"
-#~ msgstr ""
-#~ "Volající nepoužívá rezervaci zdrojů. \t\t\t\t\tChcete přesto pokračovat?"
-
-#~ msgid "linphone - receiving call from %s"
-#~ msgstr "linphone – příchozí hovor z %s"
-
-#~ msgid ""
-#~ "You have received a subscription from %s.This means that this person "
-#~ "wishes to be notified of your presence information (online, busy, "
-#~ "away...).\n"
-#~ "Do you agree ?"
-#~ msgstr ""
-#~ "Obdrželi jste přihlášení od %s. Znamená to, že si tato osoba přeje být "
-#~ "informována o vašem stavu přítomnosti (online, zaneprázdněn, pryč…).\n"
-#~ "Souhlasíte?"
-
-#~ msgid "Authentication required for realm %s"
-#~ msgstr "Pro doménu %s je vyžadováno ověření"
-
-#~ msgid "Wait"
-#~ msgstr "Zdržet"
-
-#~ msgid "Deny"
-#~ msgstr "Odmítnout"
-
-#~ msgid "Bad sip address: a sip address looks like sip:user@domain"
-#~ msgstr "Špatně zadaná SIP adresa: SIP adresa má tvar sip:uživatel@doména"
-
-#~ msgid "Stun lookup done..."
-#~ msgstr "STUN vyhledávání dokončeno…"
-
-#~ msgid "enter sip uri here"
-#~ msgstr "Sem zadejte SIP URI"
-
-#~ msgid "User manual"
-#~ msgstr "Uživatelská příručka"
-
-#~ msgid "Ring sound selection"
-#~ msgstr "Výběr zvonění"
-
-#~ msgid "Communication ended."
-#~ msgstr "Komunikace ukončena."
-
-#~ msgid "Firewall 's external ip address (in dot notations):"
-#~ msgstr "Vnější IP adresa firewallu (v tečkové notaci):"
-
-#~ msgid "Index"
-#~ msgstr "Rejstřík"
-
-#~ msgid "28k modem"
-#~ msgstr "28k modem"
-
-#~ msgid "56k modem"
-#~ msgstr "56k modem"
-
-#~ msgid "64k modem (numeris)"
-#~ msgstr "64k modem"
-
-#~ msgid "ADSL or Cable modem"
-#~ msgstr "ADSL nebo kabelový modem"
-
-#~ msgid "Ethernet or equivalent"
-#~ msgstr "Ethernet nebo podobný"
-
-#~ msgid "Connection type:"
-#~ msgstr "Typ připojení:"
-
-#~ msgid ""
-#~ "Linphone could not open audio device %s. Check if your sound card is "
-#~ "fully configured and working."
-#~ msgstr ""
-#~ "Linphone nemůže otevřít zvukové zařízení %s. Překontrolujte nastavení a "
-#~ "funkčnost zvukové karty."
-
-#~ msgid "Type here the sip address of the person you want to call."
-#~ msgstr "Zde zadejte SIP adresu osoby, které si přejete volat."
-
-#~ msgid ""
-#~ "Release or\n"
-#~ "Refuse"
-#~ msgstr ""
-#~ "Přijmout nebo\n"
-#~ "odmítnout"
-
-#~ msgid "%s. Retry after %i minute(s)."
-#~ msgstr "%s. Zkusit znovu po %i min."
diff --git a/po/de.po b/po/de.po
index 81e18df10..d447b9325 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,21 +1,23 @@
-# SIP Telephony Application.
-# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
-# Simon Morlat <linphone@free.fr>, 2001.
-# Gerhard Stengel <gstengel@gmx.net>, 2011, 2012.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Gerhard Stengel <gstengel@gmx.net>, 2011-2012
+# Simon Morlat <linphone@free.fr>, 2001
 msgid ""
 msgstr ""
-"Project-Id-Version: linphone 0.7.1\n"
+"Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-15 09:24+0200\n"
-"PO-Revision-Date: 2012-11-07 19:27+0100\n"
-"Last-Translator: Gerhard Stengel <gstengel@gmx.net>\n"
-"Language-Team: German <kde-i18n-de@kde.org>\n"
-"Language: de\n"
+"POT-Creation-Date: 2014-11-19 10:39+0100\n"
+"PO-Revision-Date: 2014-11-19 10:14+0000\n"
+"Last-Translator: Cqnqrd <gautier.pelloux@gmail.com>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/linphone-gtk/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
-"X-Generator: Lokalize 1.5\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974
 #, c-format
@@ -28,9 +30,9 @@ msgid "Send text to %s"
 msgstr "Text zu „%s“ schicken"
 
 #: ../gtk/calllogs.c:232
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Recent calls (%i)</b>"
-msgstr "<b>Im Gespräch</b>"
+msgstr ""
 
 #: ../gtk/calllogs.c:314
 msgid "n/a"
@@ -68,13 +70,11 @@ msgid "<big><b>%s</b></big>\t%s"
 msgstr ""
 
 #: ../gtk/calllogs.c:337
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<small><i>%s</i>\t<i>Quality: %s</i></small>\n"
 "%s\t%s\t"
 msgstr ""
-"<big><b>%s</b></big>\t<small><i>%s</i>\t<i>Qualität: %s</i></small>\n"
-"%s\t%s %s\t"
 
 #: ../gtk/calllogs.c:343
 #, c-format
@@ -114,9 +114,7 @@ msgstr "Linphone mit ausgeschaltetem Video starten."
 
 #: ../gtk/main.c:128
 msgid "Start only in the system tray, do not show the main interface."
-msgstr ""
-"Nur im Systemabschnitt der Kontrollleiste starten, aber das Hauptfenster "
-"nicht zeigen."
+msgstr "Nur im Systemabschnitt der Kontrollleiste starten, aber das Hauptfenster nicht zeigen."
 
 #: ../gtk/main.c:135
 msgid "address to call right now"
@@ -128,110 +126,92 @@ msgstr "Falls aktiviert, werden eingehende Anrufe automatisch beantwortet"
 
 #: ../gtk/main.c:149
 msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: c:"
-"\\Program Files\\Linphone)"
-msgstr ""
-"Geben Sie einen Arbeitsordner an (sollte der Installationsordner sein, z. B. "
-"C:\\Programme\\Linphone)"
+"Specifiy a working directory (should be the base of the installation, eg: "
+"c:\\Program Files\\Linphone)"
+msgstr "Geben Sie einen Arbeitsordner an (sollte der Installationsordner sein, z. B. C:\\Programme\\Linphone)"
 
 #: ../gtk/main.c:156
-#, fuzzy
 msgid "Configuration file"
-msgstr "Bestätigung"
+msgstr ""
 
 #: ../gtk/main.c:163
-#, fuzzy
 msgid "Run the audio assistant"
-msgstr "Konto-Einrichtungsassistent"
+msgstr ""
 
-#: ../gtk/main.c:590
-#, c-format
-msgid "Call with %s"
-msgstr "Im Gespräch mit %s"
-
-#: ../gtk/main.c:1183
+#: ../gtk/main.c:1085
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
-"Would you allow him to see your presence status or add him to your contact "
-"list ?\n"
+"Would you allow him to see your presence status or add him to your contact list ?\n"
 "If you answer no, this person will be temporarily blacklisted."
-msgstr ""
-"%s möchte Sie zu seiner Kontaktliste hinzufügen.\n"
-"Möchten Sie ihm erlauben, Ihren Anwesenheitsstatus zu sehen, oder ihn zu "
-"Ihrer Kontaktliste hinzufügen?\n"
-"Wenn Sie mit Nein antworten, wird diese Person vorläufig blockiert."
+msgstr "%s möchte Sie zu seiner Kontaktliste hinzufügen.\nMöchten Sie ihm erlauben, Ihren Anwesenheitsstatus zu sehen, oder ihn zu Ihrer Kontaktliste hinzufügen?\nWenn Sie mit Nein antworten, wird diese Person vorläufig blockiert."
 
-#: ../gtk/main.c:1260
-#, fuzzy, c-format
+#: ../gtk/main.c:1162
+#, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
 msgstr ""
-"Geben Sie bitte Ihr Passwort für den Benutzernamen <i>%s</i>\n"
-" auf der Domäne <i>%s</i> ein:"
 
-#: ../gtk/main.c:1376
+#: ../gtk/main.c:1283
 msgid "Call error"
 msgstr "Anruf fehlgeschlagen"
 
-#: ../gtk/main.c:1379 ../coreapi/linphonecore.c:3240
+#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3744
 msgid "Call ended"
 msgstr "Anruf beendet"
 
-#: ../gtk/main.c:1382
+#: ../gtk/main.c:1289
 msgid "Incoming call"
 msgstr "Eingehender Anruf"
 
-#: ../gtk/main.c:1384 ../gtk/incall_view.c:522 ../gtk/main.ui.h:5
+#: ../gtk/main.c:1291 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
 msgid "Answer"
 msgstr "Annehmen"
 
-#: ../gtk/main.c:1386 ../gtk/main.ui.h:6
+#: ../gtk/main.c:1293 ../gtk/main.ui.h:6
 msgid "Decline"
 msgstr "Abweisen"
 
-#: ../gtk/main.c:1392
+#: ../gtk/main.c:1299
 msgid "Call paused"
 msgstr "Anruf wird gehalten"
 
-#: ../gtk/main.c:1392
+#: ../gtk/main.c:1299
 #, c-format
 msgid "<b>by %s</b>"
 msgstr "<b>von %s</b>"
 
-#: ../gtk/main.c:1459
+#: ../gtk/main.c:1366
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr "%s schlägt vor, eine Videoübertragung zu starten. Nehmen Sie an?"
 
-#: ../gtk/main.c:1621
+#: ../gtk/main.c:1528
 msgid "Website link"
 msgstr "Website-Verknüpfung"
 
-#: ../gtk/main.c:1670
+#: ../gtk/main.c:1577
 msgid "Linphone - a video internet phone"
 msgstr "Linphone - ein Internet-Video-Telefon"
 
-#: ../gtk/main.c:1762
+#: ../gtk/main.c:1669
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (Vorgabe)"
 
-#: ../gtk/main.c:2099 ../coreapi/callbacks.c:949
+#: ../gtk/main.c:2006 ../coreapi/callbacks.c:983
 #, c-format
 msgid "We are transferred to %s"
 msgstr "Vermittlung nach %s"
 
-#: ../gtk/main.c:2109
+#: ../gtk/main.c:2016
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
-msgstr ""
-"Auf diesem Rechner können keine Soundkarten gefunden werden.\n"
-"Sie können keine Audio-Anrufe tätigen oder entgegennehmen."
+msgstr "Auf diesem Rechner können keine Soundkarten gefunden werden.\nSie können keine Audio-Anrufe tätigen oder entgegennehmen."
 
-#: ../gtk/main.c:2250
+#: ../gtk/main.c:2157
 msgid "A free SIP video-phone"
 msgstr "Ein freies SIP-Video-Telefon"
 
@@ -252,9 +232,8 @@ msgid "Call"
 msgstr "Anrufen"
 
 #: ../gtk/friendlist.c:726
-#, fuzzy
 msgid "Chat"
-msgstr "Chat Raum"
+msgstr ""
 
 #: ../gtk/friendlist.c:756
 #, c-format
@@ -272,9 +251,9 @@ msgid "Delete contact '%s'"
 msgstr "Kontakt „%s“ löschen"
 
 #: ../gtk/friendlist.c:978
-#, fuzzy, c-format
+#, c-format
 msgid "Delete chat history of '%s'"
-msgstr "Kontakt „%s“ löschen"
+msgstr ""
 
 #: ../gtk/friendlist.c:1029
 #, c-format
@@ -290,9 +269,8 @@ msgid "Status"
 msgstr "Status"
 
 #: ../gtk/propertybox.c:570
-#, fuzzy
 msgid "IP Bitrate (kbit/s)"
-msgstr "Min. Bitrate (kbit/s)"
+msgstr ""
 
 #: ../gtk/propertybox.c:577
 msgid "Parameters"
@@ -310,94 +288,92 @@ msgstr "Gesperrt"
 msgid "Account"
 msgstr "Konto"
 
-#: ../gtk/propertybox.c:1063
+#: ../gtk/propertybox.c:1072
 msgid "English"
 msgstr "Englisch"
 
-#: ../gtk/propertybox.c:1064
+#: ../gtk/propertybox.c:1073
 msgid "French"
 msgstr "Französisch"
 
-#: ../gtk/propertybox.c:1065
+#: ../gtk/propertybox.c:1074
 msgid "Swedish"
 msgstr "Schwedisch"
 
-#: ../gtk/propertybox.c:1066
+#: ../gtk/propertybox.c:1075
 msgid "Italian"
 msgstr "Italienisch"
 
-#: ../gtk/propertybox.c:1067
+#: ../gtk/propertybox.c:1076
 msgid "Spanish"
 msgstr "Spanisch"
 
-#: ../gtk/propertybox.c:1068
+#: ../gtk/propertybox.c:1077
 msgid "Brazilian Portugese"
 msgstr "Brasilianisches Portugiesisch"
 
-#: ../gtk/propertybox.c:1069
+#: ../gtk/propertybox.c:1078
 msgid "Polish"
 msgstr "Polnisch"
 
-#: ../gtk/propertybox.c:1070
+#: ../gtk/propertybox.c:1079
 msgid "German"
 msgstr "Deutsch"
 
-#: ../gtk/propertybox.c:1071
+#: ../gtk/propertybox.c:1080
 msgid "Russian"
 msgstr "Russisch"
 
-#: ../gtk/propertybox.c:1072
+#: ../gtk/propertybox.c:1081
 msgid "Japanese"
 msgstr "Japanisch"
 
-#: ../gtk/propertybox.c:1073
+#: ../gtk/propertybox.c:1082
 msgid "Dutch"
 msgstr "Niederländisch"
 
-#: ../gtk/propertybox.c:1074
+#: ../gtk/propertybox.c:1083
 msgid "Hungarian"
 msgstr "Ungarisch"
 
-#: ../gtk/propertybox.c:1075
+#: ../gtk/propertybox.c:1084
 msgid "Czech"
 msgstr "Tschechisch"
 
-#: ../gtk/propertybox.c:1076
+#: ../gtk/propertybox.c:1085
 msgid "Chinese"
 msgstr "Chinesisch"
 
-#: ../gtk/propertybox.c:1077
+#: ../gtk/propertybox.c:1086
 msgid "Traditional Chinese"
 msgstr "Traditionelles Chinesisch"
 
-#: ../gtk/propertybox.c:1078
+#: ../gtk/propertybox.c:1087
 msgid "Norwegian"
 msgstr "Norwegisch"
 
-#: ../gtk/propertybox.c:1079
+#: ../gtk/propertybox.c:1088
 msgid "Hebrew"
 msgstr ""
 
-#: ../gtk/propertybox.c:1080
+#: ../gtk/propertybox.c:1089
 msgid "Serbian"
 msgstr ""
 
-#: ../gtk/propertybox.c:1147
+#: ../gtk/propertybox.c:1156
 msgid ""
 "You need to restart linphone for the new language selection to take effect."
-msgstr ""
-"Linphone muss neu gestartet werden, damit die neue Spracheinstellung wirksam "
-"wird."
+msgstr "Linphone muss neu gestartet werden, damit die neue Spracheinstellung wirksam wird."
 
-#: ../gtk/propertybox.c:1225
+#: ../gtk/propertybox.c:1234
 msgid "None"
 msgstr "Keinen"
 
-#: ../gtk/propertybox.c:1229
+#: ../gtk/propertybox.c:1238
 msgid "SRTP"
 msgstr ""
 
-#: ../gtk/propertybox.c:1235
+#: ../gtk/propertybox.c:1244
 msgid "ZRTP"
 msgstr ""
 
@@ -406,9 +382,7 @@ msgstr ""
 msgid ""
 "A more recent version is availalble from %s.\n"
 "Would you like to open a browser to download it ?"
-msgstr ""
-"Eine neuere Version ist von %s verfügbar.\n"
-"Möchten Sie einen Browser zum Herunterladen öffnen?"
+msgstr "Eine neuere Version ist von %s verfügbar.\nMöchten Sie einen Browser zum Herunterladen öffnen?"
 
 #: ../gtk/update.c:91
 msgid "You are running the lastest version."
@@ -445,10 +419,7 @@ msgstr[1] "%i Kontakte gefunden"
 msgid ""
 "Welcome !\n"
 "This assistant will help you to use a SIP account for your calls."
-msgstr ""
-"Willkommen!\n"
-"Dieser Assistent wird Ihnen dabei helfen, ein SIP-Konto für Ihre Anrufe zu "
-"verwenden."
+msgstr "Willkommen!\nDieser Assistent wird Ihnen dabei helfen, ein SIP-Konto für Ihre Anrufe zu verwenden."
 
 #: ../gtk/setupwizard.c:43
 msgid "Create an account on linphone.org"
@@ -456,8 +427,7 @@ msgstr "Ein Konto bei linphone.org erstellen."
 
 #: ../gtk/setupwizard.c:44
 msgid "I have already a linphone.org account and I just want to use it"
-msgstr ""
-"Ich habe bereits ein Konto bei linphone.org und möchte es jetzt benutzen."
+msgstr "Ich habe bereits ein Konto bei linphone.org und möchte es jetzt benutzen."
 
 #: ../gtk/setupwizard.c:45
 msgid "I have already a sip account and I just want to use it"
@@ -527,30 +497,21 @@ msgstr ""
 msgid ""
 "Error, account not validated, username already used or server unreachable.\n"
 "Please go back and try again."
-msgstr ""
-"Fehler, Konto kann nicht bestätigt werden. Der Benutzername wird bereits\n"
-"verwendet oder der Server ist unerreichbar.\n"
-"Bitte gehen Sie zurück und versuchen Sie es noch einmal."
+msgstr "Fehler, Konto kann nicht bestätigt werden. Der Benutzername wird bereits\nverwendet oder der Server ist unerreichbar.\nBitte gehen Sie zurück und versuchen Sie es noch einmal."
 
 #: ../gtk/setupwizard.c:405
 msgid "Thank you. Your account is now configured and ready for use."
-msgstr ""
-"Danke. Ihr Konto ist nun fertig eingerichtet und kann verwendet werden."
+msgstr "Danke. Ihr Konto ist nun fertig eingerichtet und kann verwendet werden."
 
 #: ../gtk/setupwizard.c:413
 msgid ""
-"Please validate your account by clicking on the link we just sent you by "
-"email.\n"
+"Please validate your account by clicking on the link we just sent you by email.\n"
 "Then come back here and press Next button."
-msgstr ""
-"Bitte bestätigen Sie Ihr Konto, indem Sie auf die Verknüpfung klicken, die "
-"wir Ihnen soeben per E-Mail geschickt haben.\n"
-"Danach gehen Sie hierher zurück und drücken auf „Vor“."
+msgstr "Bitte bestätigen Sie Ihr Konto, indem Sie auf die Verknüpfung klicken, die wir Ihnen soeben per E-Mail geschickt haben.\nDanach gehen Sie hierher zurück und drücken auf „Vor“."
 
 #: ../gtk/setupwizard.c:600
-#, fuzzy
 msgid "SIP account configuration assistant"
-msgstr "Konto-Einrichtungsassistent"
+msgstr ""
 
 #: ../gtk/setupwizard.c:618
 msgid "Welcome to the account setup assistant"
@@ -623,28 +584,24 @@ msgid "Through a relay server"
 msgstr "Über einen Relay-Server"
 
 #: ../gtk/incall_view.c:239
-#, fuzzy
 msgid "uPnP not activated"
-msgstr "ICE nicht aktiviert"
+msgstr ""
 
 #: ../gtk/incall_view.c:241
-#, fuzzy
 msgid "uPnP in progress"
-msgstr "ICE läuft"
+msgstr ""
 
 #: ../gtk/incall_view.c:243
-#, fuzzy
 msgid "uPnp not available"
-msgstr "nicht verfügbar"
+msgstr ""
 
 #: ../gtk/incall_view.c:245
 msgid "uPnP is running"
 msgstr ""
 
 #: ../gtk/incall_view.c:247
-#, fuzzy
 msgid "uPnP failed"
-msgstr "ICE fehlgeschlagen"
+msgstr ""
 
 #: ../gtk/incall_view.c:257 ../gtk/incall_view.c:258
 msgid "Direct or through server"
@@ -655,9 +612,7 @@ msgstr ""
 msgid ""
 "download: %f\n"
 "upload: %f (kbit/s)"
-msgstr ""
-"Herunterladen: %f\n"
-"Hochladen: %f (kbit/s)"
+msgstr "Herunterladen: %f\nHochladen: %f (kbit/s)"
 
 #: ../gtk/incall_view.c:272 ../gtk/incall_view.c:274
 #, c-format
@@ -665,119 +620,118 @@ msgid "%ix%i @ %f fps"
 msgstr ""
 
 #: ../gtk/incall_view.c:304
-#, fuzzy, c-format
+#, c-format
 msgid "%.3f seconds"
-msgstr "%i Sekunde"
+msgstr ""
 
 #: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12
 msgid "Hang up"
 msgstr ""
 
-#: ../gtk/incall_view.c:501
+#: ../gtk/incall_view.c:511
 msgid "<b>Calling...</b>"
 msgstr "<b>Verbindungsaufbau...</b>"
 
-#: ../gtk/incall_view.c:504 ../gtk/incall_view.c:707
+#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:727
 msgid "00::00::00"
 msgstr ""
 
-#: ../gtk/incall_view.c:515
+#: ../gtk/incall_view.c:525
 msgid "<b>Incoming call</b>"
 msgstr "<b>Eingehender Anruf</b>"
 
-#: ../gtk/incall_view.c:552
+#: ../gtk/incall_view.c:562
 msgid "good"
 msgstr "gut"
 
-#: ../gtk/incall_view.c:554
+#: ../gtk/incall_view.c:564
 msgid "average"
 msgstr "durchschnittlich"
 
-#: ../gtk/incall_view.c:556
+#: ../gtk/incall_view.c:566
 msgid "poor"
 msgstr "schlecht"
 
-#: ../gtk/incall_view.c:558
+#: ../gtk/incall_view.c:568
 msgid "very poor"
 msgstr "sehr schlecht"
 
-#: ../gtk/incall_view.c:560
+#: ../gtk/incall_view.c:570
 msgid "too bad"
 msgstr "zu schlecht"
 
-#: ../gtk/incall_view.c:561 ../gtk/incall_view.c:577
+#: ../gtk/incall_view.c:571 ../gtk/incall_view.c:587
 msgid "unavailable"
 msgstr "nicht verfügbar"
 
-#: ../gtk/incall_view.c:669
+#: ../gtk/incall_view.c:679
 msgid "Secured by SRTP"
 msgstr "Gesichert durch SRTP"
 
-#: ../gtk/incall_view.c:675
+#: ../gtk/incall_view.c:685
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
 msgstr "Gesichert durch ZRTP - [Auth.-Token: %s]"
 
-#: ../gtk/incall_view.c:681
+#: ../gtk/incall_view.c:691
 msgid "Set unverified"
 msgstr "Auf „Ungeprüft“ setzen"
 
-#: ../gtk/incall_view.c:681 ../gtk/main.ui.h:4
+#: ../gtk/incall_view.c:691 ../gtk/main.ui.h:4
 msgid "Set verified"
 msgstr "Auf „Geprüft“ setzen"
 
-#: ../gtk/incall_view.c:702
+#: ../gtk/incall_view.c:722
 msgid "In conference"
 msgstr "In Konferenz"
 
-#: ../gtk/incall_view.c:702
+#: ../gtk/incall_view.c:722
 msgid "<b>In call</b>"
 msgstr "<b>Im Gespräch</b>"
 
-#: ../gtk/incall_view.c:738
+#: ../gtk/incall_view.c:758
 msgid "<b>Paused call</b>"
 msgstr "<b>Gehaltener Anruf</b>"
 
-#: ../gtk/incall_view.c:751
+#: ../gtk/incall_view.c:771
 #, c-format
 msgid "%02i::%02i::%02i"
 msgstr ""
 
-#: ../gtk/incall_view.c:772
+#: ../gtk/incall_view.c:794
 msgid "<b>Call ended.</b>"
 msgstr "<b>Anruf beendet.</b>"
 
-#: ../gtk/incall_view.c:803
+#: ../gtk/incall_view.c:825
 msgid "Transfer in progress"
 msgstr "Vermittlung läuft"
 
-#: ../gtk/incall_view.c:806
+#: ../gtk/incall_view.c:828
 msgid "Transfer done."
 msgstr "Vermittlung abgeschlossen."
 
-#: ../gtk/incall_view.c:809
+#: ../gtk/incall_view.c:831
 msgid "Transfer failed."
 msgstr "Vermittlung fehlgeschlagen."
 
-#: ../gtk/incall_view.c:853
+#: ../gtk/incall_view.c:875
 msgid "Resume"
 msgstr "Fortsetzen"
 
-#: ../gtk/incall_view.c:860 ../gtk/main.ui.h:9
+#: ../gtk/incall_view.c:882 ../gtk/main.ui.h:9
 msgid "Pause"
 msgstr "Halten"
 
-#: ../gtk/incall_view.c:926
+#: ../gtk/incall_view.c:948
 #, c-format
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
 msgstr ""
 
-#: ../gtk/incall_view.c:926
-#, fuzzy
+#: ../gtk/incall_view.c:948
 msgid "(Paused)"
-msgstr "Halten"
+msgstr ""
 
 #: ../gtk/loginframe.c:88
 #, c-format
@@ -785,9 +739,9 @@ msgid "Please enter login information for %s"
 msgstr "Bitte geben Sie die Anmeldeinformationen für %s ein."
 
 #: ../gtk/config-fetching.c:57
-#, fuzzy, c-format
+#, c-format
 msgid "fetching from %s"
-msgstr "Eingehendes Gespr�h"
+msgstr ""
 
 #: ../gtk/config-fetching.c:73
 #, c-format
@@ -811,33 +765,26 @@ msgid "Too loud"
 msgstr ""
 
 #: ../gtk/audio_assistant.c:318
-#, fuzzy
 msgid ""
 "Welcome !\n"
 "This assistant will help you to configure audio settings for Linphone"
 msgstr ""
-"Willkommen!\n"
-"Dieser Assistent wird Ihnen dabei helfen, ein SIP-Konto für Ihre Anrufe zu "
-"verwenden."
 
 #: ../gtk/audio_assistant.c:328
-#, fuzzy
 msgid "Capture device"
-msgstr "Aufnahmegerät:"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:329
-#, fuzzy
 msgid "Recorded volume"
-msgstr "Aufnahmequelle:"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:333
 msgid "No voice"
 msgstr ""
 
 #: ../gtk/audio_assistant.c:369
-#, fuzzy
 msgid "Playback device"
-msgstr "Wiedergabegerät:"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:370
 msgid "Play three beeps"
@@ -856,14 +803,12 @@ msgid "Let's start Linphone now"
 msgstr ""
 
 #: ../gtk/audio_assistant.c:496
-#, fuzzy
 msgid "Audio Assistant"
-msgstr "Konto-Einrichtungsassistent"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:506 ../gtk/main.ui.h:31
-#, fuzzy
 msgid "Audio assistant"
-msgstr "Konto-Einrichtungsassistent"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:511
 msgid "Mic Gain calibration"
@@ -886,9 +831,8 @@ msgid "Send"
 msgstr "Senden"
 
 #: ../gtk/main.ui.h:3
-#, fuzzy
 msgid "End conference"
-msgstr "In Konferenz"
+msgstr ""
 
 #: ../gtk/main.ui.h:7
 msgid "Record this call to an audio file"
@@ -943,9 +887,8 @@ msgid "_Options"
 msgstr "_Optionen"
 
 #: ../gtk/main.ui.h:23
-#, fuzzy
 msgid "Set configuration URI"
-msgstr "Proxy/Registrator Konfigurationsbox"
+msgstr ""
 
 #: ../gtk/main.ui.h:24
 msgid "Always start video"
@@ -1049,12 +992,9 @@ msgstr ""
 
 #: ../gtk/about.ui.h:4
 msgid "An internet video phone using the standard SIP (rfc3261) protocol."
-msgstr ""
-"Ein Internet-Video-Telefon, das das Standard-SIP-Protokoll (RFC3261) "
-"verwendet."
+msgstr "Ein Internet-Video-Telefon, das das Standard-SIP-Protokoll (RFC3261) verwendet."
 
 #: ../gtk/about.ui.h:5
-#, fuzzy
 msgid ""
 "fr: Simon Morlat\n"
 "en: Simon Morlat and Delphine Perreau\n"
@@ -1069,18 +1009,6 @@ msgid ""
 "hu: anonymous\n"
 "he: Eli Zaretskii <eliz@gnu.org>\n"
 msgstr ""
-"fr: Simon Morlat\n"
-"en: Simon Morlat and Delphine Perreau\n"
-"it: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\n"
-"de: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\n"
-"\t Gerhard Stengel <gstengel@gmx.net>\n"
-"sv: Daniel Nylander <po@danielnylander.se>\n"
-"es: Jesus Benitez <gnelson at inMail dot sk>\n"
-"ja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\n"
-"pt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\n"
-"pl: Robert Nasiadek <darkone@darkone.pl>\n"
-"cs: Petr Pisar <petr.pisar@atlas.cz>\n"
-"hu: anonymous\n"
 
 #: ../gtk/contact.ui.h:2
 msgid "SIP Address"
@@ -1155,9 +1083,8 @@ msgid "Registration duration (sec):"
 msgstr "Registrierungsdauer (sec):"
 
 #: ../gtk/sip_account.ui.h:8
-#, fuzzy
 msgid "Contact params (optional):"
-msgstr "Route (optional):"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:9
 msgid "AVPF regular RTCP interval (sec):"
@@ -1168,9 +1095,8 @@ msgid "Route (optional):"
 msgstr "Route (optional):"
 
 #: ../gtk/sip_account.ui.h:11
-#, fuzzy
 msgid "Transport"
-msgstr "<b>Übertragung</b>"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:12
 msgid "Register"
@@ -1181,9 +1107,8 @@ msgid "Publish presence information"
 msgstr "Anwesenheitsstatus veröffentlichen"
 
 #: ../gtk/sip_account.ui.h:14
-#, fuzzy
 msgid "Enable AVPF"
-msgstr "Freigeben"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:15
 msgid "Configure a SIP account"
@@ -1278,9 +1203,8 @@ msgid "Fixed"
 msgstr "Fest"
 
 #: ../gtk/parameters.ui.h:23
-#, fuzzy
 msgid "Media encryption is mandatory"
-msgstr "Verschlüsselungstyp der Medien"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:24
 msgid "Tunnel"
@@ -1291,14 +1215,12 @@ msgid "DSCP fields"
 msgstr "DSCP-Felder"
 
 #: ../gtk/parameters.ui.h:26
-#, fuzzy
 msgid "SIP/TCP port"
-msgstr "SIP-Port"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:27
-#, fuzzy
 msgid "SIP/UDP port"
-msgstr "SIP-Port"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:28
 msgid "<b>Network protocol and ports</b>"
@@ -1309,9 +1231,8 @@ msgid "Direct connection to the Internet"
 msgstr "Direkte Verbindung ins Internet"
 
 #: ../gtk/parameters.ui.h:30
-#, fuzzy
 msgid "Behind NAT / Firewall (specify gateway IP )"
-msgstr "Hinter NAT / Firewall (IP-Gateway darunter angeben)"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:31
 msgid "Behind NAT / Firewall (use STUN to resolve)"
@@ -1322,9 +1243,8 @@ msgid "Behind NAT / Firewall (use ICE)"
 msgstr "Hinter NAT / Firewall (ICE verwenden)"
 
 #: ../gtk/parameters.ui.h:33
-#, fuzzy
 msgid "Behind NAT / Firewall (use uPnP)"
-msgstr "Hinter NAT / Firewall (ICE verwenden)"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:34
 msgid "Public IP address:"
@@ -1379,9 +1299,8 @@ msgid "Prefered video resolution:"
 msgstr "Bevorzugte Video-Auflösung:"
 
 #: ../gtk/parameters.ui.h:47
-#, fuzzy
 msgid "Video output method:"
-msgstr "Video-Aufnahmegerät:"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:48
 msgid "<b>Video</b>"
@@ -1393,9 +1312,7 @@ msgstr "Multimedia-Einstellungen"
 
 #: ../gtk/parameters.ui.h:50
 msgid "This section defines your SIP address when not using a SIP account"
-msgstr ""
-"In diesem Bereich legen Sie Ihre SIP-Adresse fest, wenn Sie kein SIP-Konto "
-"verwenden."
+msgstr "In diesem Bereich legen Sie Ihre SIP-Adresse fest, wenn Sie kein SIP-Konto verwenden."
 
 #: ../gtk/parameters.ui.h:51
 msgid "Your display name (eg: John Doe):"
@@ -1477,9 +1394,7 @@ msgstr "Adaptive Ratenregelung ein"
 msgid ""
 "<i>Adaptive rate control is a technique to dynamically guess the available "
 "bandwidth during a call.</i>"
-msgstr ""
-"<i>Adaptive Ratenregelung ist eine Technik zur dynamischen Abschätzung der "
-"zur Verfügung stehenden Bandbreite während eines Anrufs.</i>"
+msgstr "<i>Adaptive Ratenregelung ist eine Technik zur dynamischen Abschätzung der zur Verfügung stehenden Bandbreite während eines Anrufs.</i>"
 
 #: ../gtk/parameters.ui.h:71
 msgid "<b>Bandwidth control</b>"
@@ -1506,23 +1421,20 @@ msgid "User interface"
 msgstr "Benutzeroberfläche"
 
 #: ../gtk/parameters.ui.h:77 ../gtk/ldap.ui.h:2
-#, fuzzy
 msgid "Server address:"
-msgstr "Server-Adresse:"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:78 ../gtk/ldap.ui.h:3
-#, fuzzy
 msgid "Authentication method:"
-msgstr "Authentifikation fehlgeschlagen"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:80
 msgid "label"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:81
-#, fuzzy
 msgid "<b>LDAP Account setup</b>"
-msgstr "<b>Proxy-Konten</b>"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:82
 msgid "LDAP"
@@ -1553,9 +1465,8 @@ msgid "Please wait"
 msgstr "Bitte warten"
 
 #: ../gtk/dscp_settings.ui.h:1
-#, fuzzy
 msgid "DSCP settings"
-msgstr "DSCP-Einstellungen"
+msgstr ""
 
 #: ../gtk/dscp_settings.ui.h:2
 msgid "SIP"
@@ -1590,37 +1501,32 @@ msgid "Audio IP bandwidth usage"
 msgstr "Genutzte IP-Bandbreite Audio"
 
 #: ../gtk/call_statistics.ui.h:5
-#, fuzzy
 msgid "Audio Media connectivity"
-msgstr "Medienanbindung"
+msgstr ""
 
 #: ../gtk/call_statistics.ui.h:6
 msgid "Video IP bandwidth usage"
 msgstr "Genutzte IP-Bandbreite Video"
 
 #: ../gtk/call_statistics.ui.h:7
-#, fuzzy
 msgid "Video Media connectivity"
-msgstr "Medienanbindung"
+msgstr ""
 
 #: ../gtk/call_statistics.ui.h:8
-#, fuzzy
 msgid "Round trip time"
-msgstr "Audio Eigenschaften"
+msgstr ""
 
 #: ../gtk/call_statistics.ui.h:9
 msgid "Video resolution received"
 msgstr ""
 
 #: ../gtk/call_statistics.ui.h:10
-#, fuzzy
 msgid "Video resolution sent"
-msgstr "Bevorzugte Video-Auflösung:"
+msgstr ""
 
 #: ../gtk/call_statistics.ui.h:11
-#, fuzzy
 msgid "RTP profile"
-msgstr "RTP-Eingabefilter"
+msgstr ""
 
 #: ../gtk/call_statistics.ui.h:12
 msgid "<b>Call statistics and information</b>"
@@ -1707,23 +1613,20 @@ msgid "1"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:1
-#, fuzzy
 msgid "LDAP Settings"
-msgstr "Einstellungen"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:6
 msgid "Use TLS Connection"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:7
-#, fuzzy
 msgid "Not yet available"
-msgstr "nicht verfügbar"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:8
-#, fuzzy
 msgid "<b>Connection</b>"
-msgstr "<b>Codecs</b>"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:9
 msgid "Bind DN"
@@ -1734,14 +1637,12 @@ msgid "Authname"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:11
-#, fuzzy
 msgid "Realm"
-msgstr "Bereich:"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:12
-#, fuzzy
 msgid "<b>SASL</b>"
-msgstr "<b>Audio</b>"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:13
 msgid "Base object:"
@@ -1757,18 +1658,16 @@ msgid "Name Attribute:"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:17
-#, fuzzy
 msgid "SIP address attribute:"
-msgstr "Adresse"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:18
 msgid "Attributes to query:"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:19
-#, fuzzy
 msgid "<b>Search</b>"
-msgstr "<b>Kontaktsuche</b>"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:20
 msgid "Timeout for search:"
@@ -1783,9 +1682,8 @@ msgid "Follow Aliases"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:23
-#, fuzzy
 msgid "<b>Miscellaneous</b>"
-msgstr "<b>Video</b>"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:24
 msgid "ANONYMOUS"
@@ -1809,11 +1707,8 @@ msgstr ""
 
 #: ../gtk/config-uri.ui.h:2
 msgid ""
-"This dialog allows to set an http or https address when configuration is to "
-"be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, "
-"Linphone will restart automatically in order to fetch and take into account "
-"the new configuration. "
+"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
 msgstr ""
 
 #: ../gtk/config-uri.ui.h:4
@@ -1821,81 +1716,79 @@ msgid "https://"
 msgstr ""
 
 #: ../gtk/provisioning-fetch.ui.h:1
-#, fuzzy
 msgid "Configuring..."
-msgstr "Verbinden..."
+msgstr ""
 
 #: ../gtk/provisioning-fetch.ui.h:2
 msgid "Please wait while fetching configuration from server..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1034
+#: ../coreapi/linphonecore.c:1511
 msgid "Ready"
 msgstr "Bereit"
 
-#: ../coreapi/linphonecore.c:1967
-#, fuzzy
+#: ../coreapi/linphonecore.c:2470
 msgid "Configuring"
-msgstr "Bestätigung"
+msgstr ""
 
-#: ../coreapi/linphonecore.c:2133
+#: ../coreapi/linphonecore.c:2635
 msgid "Looking for telephone number destination..."
 msgstr "Telefonnummernziel wird gesucht..."
 
-#: ../coreapi/linphonecore.c:2136
+#: ../coreapi/linphonecore.c:2637
 msgid "Could not resolve this number."
 msgstr "Diese Nummer kann nicht aufgelöst werden."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2418
+#: ../coreapi/linphonecore.c:2919
 msgid "Contacting"
 msgstr "Verbindungsaufbau"
 
-#: ../coreapi/linphonecore.c:2425
+#: ../coreapi/linphonecore.c:2924
 msgid "Could not call"
 msgstr "Anruf kann nicht getätigt werden."
 
-#: ../coreapi/linphonecore.c:2576
+#: ../coreapi/linphonecore.c:3074
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "Die maximale Anzahl der gleichzeitigen Anrufe ist erreicht."
 
-#: ../coreapi/linphonecore.c:2745
+#: ../coreapi/linphonecore.c:3233
 msgid "is contacting you"
 msgstr "ruft Sie an"
 
-#: ../coreapi/linphonecore.c:2746
+#: ../coreapi/linphonecore.c:3234
 msgid " and asked autoanswer."
 msgstr " und fragt nach automatischer Antwort."
 
-#: ../coreapi/linphonecore.c:2746
+#: ../coreapi/linphonecore.c:3234
 msgid "."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2865
+#: ../coreapi/linphonecore.c:3352
 msgid "Modifying call parameters..."
 msgstr "Die Anrufparameter werden verändert..."
 
-#: ../coreapi/linphonecore.c:3194
+#: ../coreapi/linphonecore.c:3700
 msgid "Connected."
 msgstr "Verbunden."
 
-#: ../coreapi/linphonecore.c:3220
+#: ../coreapi/linphonecore.c:3725
 msgid "Call aborted"
 msgstr "Anruf abgebrochen"
 
-#: ../coreapi/linphonecore.c:3412
+#: ../coreapi/linphonecore.c:3915
 msgid "Could not pause the call"
 msgstr "Anruf kann nicht gehalten werden"
 
-#: ../coreapi/linphonecore.c:3417
+#: ../coreapi/linphonecore.c:3919
 msgid "Pausing the current call..."
 msgstr "Aktueller Anruf wird gehalten..."
 
-#: ../coreapi/misc.c:425
+#: ../coreapi/misc.c:438
 msgid "Stun lookup in progress..."
 msgstr "STUN-Ermittlung läuft..."
 
-#: ../coreapi/misc.c:607
+#: ../coreapi/misc.c:619
 msgid "ICE local candidates gathering in progress..."
 msgstr "Lokale Kandidaten für ICE werden zusammengestellt..."
 
@@ -1944,1138 +1837,147 @@ msgid "Pending"
 msgstr "Ausstehend"
 
 #: ../coreapi/friend.c:66
-#, fuzzy
 msgid "Vacation"
-msgstr "Dauer"
+msgstr ""
 
 #: ../coreapi/friend.c:68
 msgid "Unknown-bug"
 msgstr "Unbekannter Fehler"
 
-#: ../coreapi/proxy.c:314
+#: ../coreapi/proxy.c:319
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
-msgstr ""
-"Die von Ihnen eingegebene SIP-Proxy-Adresse ist ungültig, sie muss mit "
-"„sip:“ gefolgt vom Hostnamen beginnen."
+msgstr "Die von Ihnen eingegebene SIP-Proxy-Adresse ist ungültig, sie muss mit „sip:“ gefolgt vom Hostnamen beginnen."
 
-#: ../coreapi/proxy.c:320
+#: ../coreapi/proxy.c:325
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
-msgstr ""
-"Die von Ihnen eingegebene SIP-Identität ist ungültig.\n"
-"Sie sollte wie sip:benutzername@proxydomain aussehen, also z.B. sip:"
-"alice@beispiel.net"
+msgstr "Die von Ihnen eingegebene SIP-Identität ist ungültig.\nSie sollte wie sip:benutzername@proxydomain aussehen, also z.B. sip:alice@beispiel.net"
 
-#: ../coreapi/proxy.c:1369
+#: ../coreapi/proxy.c:1377
 #, c-format
 msgid "Could not login as %s"
 msgstr "Anmeldung als %s fehlgeschlagen"
 
-#: ../coreapi/callbacks.c:355
+#: ../coreapi/callbacks.c:383
 msgid "Remote ringing."
 msgstr "Klingeln bei der Gegenseite."
 
-#: ../coreapi/callbacks.c:373
+#: ../coreapi/callbacks.c:404
 msgid "Remote ringing..."
 msgstr "Klingeln bei der Gegenseite..."
 
-#: ../coreapi/callbacks.c:384
+#: ../coreapi/callbacks.c:414
 msgid "Early media."
 msgstr ""
 
-#: ../coreapi/callbacks.c:435
+#: ../coreapi/callbacks.c:475
 #, c-format
 msgid "Call with %s is paused."
 msgstr "Anruf mit %s wird gehalten."
 
-#: ../coreapi/callbacks.c:448
+#: ../coreapi/callbacks.c:488
 #, c-format
 msgid "Call answered by %s - on hold."
 msgstr "Der von %s entgegengenommene Anruf wird gehalten."
 
-#: ../coreapi/callbacks.c:459
+#: ../coreapi/callbacks.c:498
 msgid "Call resumed."
 msgstr "Anruf fortgesetzt."
 
-#: ../coreapi/callbacks.c:464
+#: ../coreapi/callbacks.c:502
 #, c-format
 msgid "Call answered by %s."
 msgstr "Anruf wird von %s entgegengenommen."
 
-#: ../coreapi/callbacks.c:483
-#, fuzzy
+#: ../coreapi/callbacks.c:525
 msgid "Incompatible, check codecs or security settings..."
-msgstr "Inkompatibel, überprüfen Sie die Codecs..."
+msgstr ""
 
-#: ../coreapi/callbacks.c:512
+#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:826
+msgid "Incompatible media parameters."
+msgstr "Inkompatible Medienparameter."
+
+#: ../coreapi/callbacks.c:560
 msgid "We have been resumed."
 msgstr "Anruf wird fortgesetzt."
 
-#: ../coreapi/callbacks.c:521
+#. we are being paused
+#: ../coreapi/callbacks.c:568
 msgid "We are paused by other party."
 msgstr "Anruf wird von der Gegenseite gehalten."
 
-#: ../coreapi/callbacks.c:556
+#. reINVITE and in-dialogs UPDATE go here
+#: ../coreapi/callbacks.c:602
 msgid "Call is updated by remote."
 msgstr "Anruf ist von der Gegenseite aktualisiert worden."
 
-#: ../coreapi/callbacks.c:658
+#: ../coreapi/callbacks.c:705
 msgid "Call terminated."
 msgstr "Anruf beendet."
 
-#: ../coreapi/callbacks.c:687
+#: ../coreapi/callbacks.c:733
 msgid "User is busy."
 msgstr "Teilnehmer ist besetzt."
 
-#: ../coreapi/callbacks.c:688
+#: ../coreapi/callbacks.c:734
 msgid "User is temporarily unavailable."
 msgstr "Teilnehmer zur Zeit nicht verfügbar."
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:690
+#: ../coreapi/callbacks.c:736
 msgid "User does not want to be disturbed."
 msgstr "Teilnehmer möchte nicht gestört werden."
 
-#: ../coreapi/callbacks.c:691
+#: ../coreapi/callbacks.c:737
 msgid "Call declined."
 msgstr "Anruf abgewiesen"
 
-#: ../coreapi/callbacks.c:706
+#: ../coreapi/callbacks.c:752
 msgid "Request timeout."
 msgstr ""
 
-#: ../coreapi/callbacks.c:737
+#: ../coreapi/callbacks.c:780
 msgid "Redirected"
 msgstr "Umgeleitet"
 
-#: ../coreapi/callbacks.c:787
-msgid "Incompatible media parameters."
-msgstr "Inkompatible Medienparameter."
-
-#: ../coreapi/callbacks.c:798
+#: ../coreapi/callbacks.c:835
 msgid "Call failed."
 msgstr "Anruf fehlgeschlagen."
 
-#: ../coreapi/callbacks.c:878
+#: ../coreapi/callbacks.c:913
 #, c-format
 msgid "Registration on %s successful."
 msgstr "Registrierung auf %s erfolgreich."
 
-#: ../coreapi/callbacks.c:879
+#: ../coreapi/callbacks.c:914
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "Abmeldung von %s ist erfolgt."
 
-#: ../coreapi/callbacks.c:897
+#: ../coreapi/callbacks.c:932
 msgid "no response timeout"
 msgstr "Zeitüberschreitung bei der Antwort"
 
-#: ../coreapi/callbacks.c:900
+#: ../coreapi/callbacks.c:935
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "Registrierung auf %s fehlgeschlagen: %s"
 
-#: ../coreapi/callbacks.c:907
+#: ../coreapi/callbacks.c:942
 msgid "Service unavailable, retrying"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:177
+#: ../coreapi/linphonecall.c:174
 #, c-format
 msgid "Authentication token is %s"
 msgstr "Authentifizierungs-Token ist %s"
 
-#: ../coreapi/linphonecall.c:2932
+#: ../coreapi/linphonecall.c:3020
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
 msgstr[0] "Sie haben %i Anruf in Abwesenheit."
 msgstr[1] "Sie haben %i Anrufe in Abwesenheit."
-
-#~ msgid "aborted"
-#~ msgstr "abgebrochen"
-
-#~ msgid "completed"
-#~ msgstr "beendet"
-
-#~ msgid "missed"
-#~ msgstr "entgangen"
-
-#~ msgid ""
-#~ "%s at %s\n"
-#~ "From: %s\n"
-#~ "To: %s\n"
-#~ "Status: %s\n"
-#~ "Duration: %i mn %i sec\n"
-#~ msgstr ""
-#~ "%s am %s\n"
-#~ "Von: %s\n"
-#~ "An: %s\n"
-#~ "Status: %s\n"
-#~ "Dauer: %i min %i sec\n"
-
-#~ msgid "Outgoing call"
-#~ msgstr "Abgehender Anruf"
-
-#~ msgid "No response."
-#~ msgstr "Keine Antwort."
-
-#~ msgid "Protocol error."
-#~ msgstr "Protokollfehler"
-
-#~ msgid ""
-#~ "Could not parse given sip address. A sip url usually looks like sip:"
-#~ "user@domain"
-#~ msgstr ""
-#~ "SIP-Adresse kann nicht eingelesen werden. Eine SIP-Adresse hat folgenden "
-#~ "Aufbau <sip:benutzername@domainname>"
-
-#~ msgid ""
-#~ "Your computer appears to be using ALSA sound drivers.\n"
-#~ "This is the best choice. However the pcm oss emulation module\n"
-#~ "is missing and linphone needs it. Please execute\n"
-#~ "'modprobe snd-pcm-oss' as root to load it."
-#~ msgstr ""
-#~ "Ihre Rechner verwendet anscheinend einen ALSA-Soundtreiber.\n"
-#~ "Dies ist die beste Lösung; allerdings ist das von Linphone benötigte "
-#~ "Modul\n"
-#~ "zur PCM-OSS-Emulation nicht vorhanden. Bitte führen Sie als\n"
-#~ "Systemverwalter den Befehl „modprobe snd-pcm-oss“ aus, um es zu laden."
-
-#~ msgid ""
-#~ "Your computer appears to be using ALSA sound drivers.\n"
-#~ "This is the best choice. However the mixer oss emulation module\n"
-#~ "is missing and linphone needs it. Please execute\n"
-#~ " 'modprobe snd-mixer-oss' as root to load it."
-#~ msgstr ""
-#~ "Ihre Rechner verwendet anscheinend einen ALSA-Soundtreiber.\n"
-#~ "Dies ist die beste Lösung; allerdings ist das von Linphone benötigte "
-#~ "Modul\n"
-#~ "zur Mixer-OSS-Emulation nicht vorhanden. Bitte führen Sie als\n"
-#~ "Systemverwalter den Befehl „modprobe snd-mixer-oss“ aus, um es zu laden."
-
-#~ msgid "Keypad"
-#~ msgstr "Wähltastatur"
-
-#~ msgid "Chat with %s"
-#~ msgstr "Chat mit %s"
-
-#~ msgid "Enter username, phone number, or full sip address"
-#~ msgstr "Teilnehmer, Telefonnummer oder vollständige SIP-Adresse eingeben"
-
-#~ msgid "Lookup:"
-#~ msgstr "Suchen:"
-
-#~ msgid "in"
-#~ msgstr "in"
-
-#~ msgid ""
-#~ "Register to FONICS\n"
-#~ "virtual network !"
-#~ msgstr ""
-#~ "Am virtuellen FONICS\n"
-#~ "Netzwerk anmelden!"
-
-#~ msgid "Enable video"
-#~ msgstr "Video ein"
-
-#~ msgid "edit"
-#~ msgstr "Bearbeiten"
-
-#~ msgid "No common codecs"
-#~ msgstr "Keine gemeinsamen Codecs"
-
-#~ msgid "We are being paused..."
-#~ msgstr "Anruf wird gehalten..."
-
-#~ msgid "Please choose a username:"
-#~ msgstr "Bitte einen Benutzernamen auswählen:"
-
-#~ msgid "Checking if '%s' is available..."
-#~ msgstr "Die Verfügbarkeit von „%s“ wird überprüft..."
-
-#~ msgid "Please wait..."
-#~ msgstr "Bitte warten..."
-
-#~ msgid "Sorry this username already exists. Please try a new one."
-#~ msgstr ""
-#~ "Leider existiert dieser Benutzername bereits. Bitte versuchen sie es mit "
-#~ "einem anderen."
-
-#~ msgid "Ok !"
-#~ msgstr "OK!"
-
-#~ msgid "Communication problem, please try again later."
-#~ msgstr "Kommunikationsproblem, bitte versuchen Sie es später noch einmal."
-
-#~ msgid "Choosing a username"
-#~ msgstr "Benutzername wird ausgewählt"
-
-#~ msgid "Verifying"
-#~ msgstr "Überprüfen"
-
-#~ msgid "Creating your account"
-#~ msgstr "Erstellen Ihres Kontos"
-
-#~ msgid "Now ready !"
-#~ msgstr "Fertig!"
-
-#~ msgid "Register at startup"
-#~ msgstr "Beim Starten registrieren"
-
-#~ msgid ""
-#~ "Pause all calls\n"
-#~ "and answer"
-#~ msgstr ""
-#~ "Alle Anrufe halten\n"
-#~ "und annehmen"
-
-#~ msgid "Unmute"
-#~ msgstr "Stumm aus"
-
-#~ msgid "<b>Contact list</b>"
-#~ msgstr "<b>Kontaktliste</b>"
-
-#~ msgid "Audio & video"
-#~ msgstr "Audio & Video"
-
-#~ msgid "Audio only"
-#~ msgstr "Nur Audio"
-
-#~ msgid "Duration:"
-#~ msgstr "Dauer:"
-
-#~ msgid "_Call history"
-#~ msgstr "Anrufchronik"
-
-#~ msgid "<b>Ports</b>"
-#~ msgstr "<b>Ports</b>"
-
-#~ msgid "Sorry, you have to pause or stop the current call first !"
-#~ msgstr "Sie müssen zuerst den aktuellen Anruf halten oder beenden!"
-
-#~ msgid "There is already a call in process, pause or stop it first."
-#~ msgstr ""
-#~ "Es wird bereits ein Anruf verarbeitet. Halten oder beenden Sie ihn zuerst."
-
-#~ msgid "ITU-G.711 alaw encoder"
-#~ msgstr "ITU-G.711 alaw Encoder"
-
-#~ msgid "ITU-G.711 alaw decoder"
-#~ msgstr "ITU-G.711 alaw Dekoder"
-
-#~ msgid "Alsa sound source"
-#~ msgstr "ALSA-Sound-Quelle"
-
-#~ msgid "Alsa sound output"
-#~ msgstr "ALSA-Sound-Ausgabe"
-
-#~ msgid "Sound capture filter for MacOS X Audio Queue Service"
-#~ msgstr "Sound-Aufnahmefilter für den Audio-Warteschlangendienst auf MacOS X"
-
-#~ msgid "Sound playback filter for MacOS X Audio Queue Service"
-#~ msgstr ""
-#~ "Sound-Wiedergabefilter für den Audio-Warteschlangendienst auf MacOS X"
-
-#~ msgid "DTMF generator"
-#~ msgstr "DTMF-Generator"
-
-#~ msgid "The GSM full-rate codec"
-#~ msgstr "Der Full-Rate-GSM-Codec"
-
-#~ msgid "The GSM codec"
-#~ msgstr "Der GSM-Codec"
-
-#~ msgid "Sound capture filter for MacOS X Audio Unit"
-#~ msgstr "Sound-Aufnahmefilter für den Audio-Warteschlangendienst auf MacOS X"
-
-#~ msgid "Sound playback filter for MacOS X Audio Unit"
-#~ msgstr ""
-#~ "Sound-Wiedergabefilter für den Audio-Warteschlangendienst auf MacOS X"
-
-#~ msgid "A filter to make conferencing"
-#~ msgstr "Ein Filter zur Durchführung von Konferenzen"
-
-#~ msgid "Raw files and wav reader"
-#~ msgstr "Lesen von Roh- und WAV-Dateien"
-
-#~ msgid "Wav file recorder"
-#~ msgstr "Aufnahme von WAV-Dateien"
-
-#~ msgid "A filter that send several inputs to one output."
-#~ msgstr "Ein Filter, der mehrere Eingaben an eine Ausgabe sendet."
-
-#~ msgid "RTP output filter"
-#~ msgstr "RTP-Ausgabefilter"
-
-#~ msgid "The free and wonderful speex codec"
-#~ msgstr "Der freie und herrliche Speex-Codec"
-
-#~ msgid "A filter that controls and measure sound volume"
-#~ msgstr "Ein Filter zur Steuerung und Messung der Lautstärke"
-
-#~ msgid "A video4linux compatible source filter to stream pictures."
-#~ msgstr "Ein mit Video4Linux kompatibler Quellfilter, um Bilder zu streamen."
-
-#~ msgid "A filter to grab pictures from Video4Linux2-powered cameras"
-#~ msgstr ""
-#~ "Ein Filter zur Aufzeichnung von durch Video4Linux2 unterstützten Kameras."
-
-#~ msgid "A filter that outputs a static image."
-#~ msgstr "Ein Filter zur Ausgabe eines Standbilds"
-
-#~ msgid "A pixel format converter"
-#~ msgstr "Ein Konverter für Pixelformate"
-
-#~ msgid "A video size converter"
-#~ msgstr "Ein Konverter für die Größe von Videos"
-
-#~ msgid "a small video size converter"
-#~ msgstr "Ein Konverter für die Größe von kleinen Videos"
-
-#~ msgid "Echo canceller using speex library"
-#~ msgstr "Echo-Unterdrückung unter Verwendung der Speex-Bibliothek"
-
-#~ msgid "A filter that reads from input and copy to its multiple outputs."
-#~ msgstr ""
-#~ "Ein Filter, der aus einer Eingabe liest und auf viele Ausgaben kopiert."
-
-#~ msgid "The theora video encoder from xiph.org"
-#~ msgstr "Der Theora-Video-Encoder von xiph.org"
-
-#~ msgid "The open-source and royalty-free 'theora' video codec from xiph.org"
-#~ msgstr ""
-#~ "Der quelloffene und lizenzkostenfreie „Theora“-Video-Codec von xiph.org"
-
-#~ msgid "The theora video decoder from xiph.org"
-#~ msgstr "Der Theora-Video-Dekoder von xiph.org"
-
-#~ msgid "ITU-G.711 ulaw encoder"
-#~ msgstr "ITU-G.711 ulaw Encoder"
-
-#~ msgid "ITU-G.711 ulaw decoder"
-#~ msgstr "ITU-G.711 ulaw Dekoder"
-
-#~ msgid "A H.263 decoder using ffmpeg library"
-#~ msgstr "Ein H263-Dekoder, der die ffmpeg-Bibliothek verwendet"
-
-#~ msgid "A MPEG4 decoder using ffmpeg library"
-#~ msgstr "Ein MPEG4-Dekoder, der die ffmpeg-Bibliothek verwendet"
-
-#~ msgid "A RTP/JPEG decoder using ffmpeg library"
-#~ msgstr "Ein RTP/JPEG-Dekoder, der die ffmpeg-Bibliothek verwendet"
-
-#~ msgid "A MJPEG decoder using ffmpeg library"
-#~ msgstr "Ein MJPEG-Dekoder, der die ffmpeg-Bibliothek verwendet"
-
-#~ msgid "A snow decoder using ffmpeg library"
-#~ msgstr "Ein Snow-Dekoder, der die ffmpeg-Bibliothek verwendet"
-
-#~ msgid "A video H.263 encoder using ffmpeg library."
-#~ msgstr "Ein H263-Video-Dekoder, der die ffmpeg-Bibliothek verwendet"
-
-#~ msgid ""
-#~ "A video H.263 encoder using ffmpeg library. It is compliant with old "
-#~ "RFC2190 spec."
-#~ msgstr ""
-#~ "Ein H263-Video-Dekoder, der die ffmpeg-Bibliothek verwendet. Er erfüllt "
-#~ "die alte RFC2190-Spezifikation."
-
-#~ msgid "A video MPEG4 encoder using ffmpeg library."
-#~ msgstr "Ein MPEG4-Video-Encoder, der die ffmpeg-Bibliothek verwendet"
-
-#~ msgid "A video snow encoder using ffmpeg library."
-#~ msgstr "Ein Snow-Video-Encoder, der die ffmpeg-Bibliothek verwendet"
-
-#~ msgid "A RTP/MJPEG encoder using ffmpeg library."
-#~ msgstr "Ein RTP/MJPEG-Encoder, der die ffmpeg-Bibliothek verwendet"
-
-#~ msgid ""
-#~ "A video H.263 encoder using ffmpeg library, compliant with old RFC2190 "
-#~ "spec."
-#~ msgstr ""
-#~ "Ein H263-Video-Encoder, der die ffmpeg-Bibliothek verwendet, der die "
-#~ "alter RFC2190-Spezifikation erfüllt."
-
-#~ msgid ""
-#~ "The snow codec is royalty-free and is open-source. \n"
-#~ "It uses innovative techniques that makes it one of most promising video "
-#~ "codec. It is implemented within the ffmpeg project.\n"
-#~ "However it is under development, quite unstable and compatibility with "
-#~ "other versions cannot be guaranteed."
-#~ msgstr ""
-#~ "Der Snow-Codec ist lizenzkostenfrei und quelloffen.\n"
-#~ "Er nutzt innovative Techniken, die ihn zu einem der vielversprechendsten "
-#~ "Video-Codecs machen. Er ist im Rahmen des ffmpeg-Projekts implementiert.\n"
-#~ "Jedoch ist er noch in der Entwicklung, ziemlich instabil und die "
-#~ "Kompatibilität mit anderen Versionen ist nicht gewährleistet."
-
-#~ msgid "A MJPEG encoder using ffmpeg library."
-#~ msgstr "Ein MJPEG-Encoder, der die ffmpeg-Bibliothek verwendet"
-
-#~ msgid "A SDL-based video display"
-#~ msgstr "Eine SDL-basierte Video-Anzeige"
-
-#~ msgid "A video4windows compatible source filter to stream pictures."
-#~ msgstr ""
-#~ "Ein zu video4windows kompatibler Quellfilter, um Bilder zu streamen."
-
-#~ msgid "A video for windows (vfw.h) based source filter to grab pictures."
-#~ msgstr ""
-#~ "Ein auf Video für Windows (vfw.h) basierender Quellfilter, um Bilder "
-#~ "aufzuzeichnen."
-
-#~ msgid ""
-#~ "A filter that trashes its input (useful for terminating some graphs)."
-#~ msgstr "Ein Filter, der seine Eingabe vernichtet"
-
-#~ msgid "Parametric sound equalizer."
-#~ msgstr "Parametrischer Sound-Equalizer"
-
-#~ msgid "A webcam grabber based on directshow."
-#~ msgstr "Ein auf Directshow basierender Webcam-Grabber"
-
-#~ msgid "A video display based on windows DrawDib api"
-#~ msgstr "Eine Video-Anzeige basierend auf der Windows DrawDib-API"
-
-#~ msgid "A filter that mixes down 16 bit sample audio streams"
-#~ msgstr "Ein Filter, der 16-Bit-Sample Audio-Streams abmischt."
-
-#~ msgid "A filter that converts from mono to stereo and vice versa."
-#~ msgstr "Ein Filter, der von Mono nach Stereo und umgekehrt konvertiert."
-
-#~ msgid "Inter ticker communication filter."
-#~ msgstr "Filter für die Inter-Ticker-Kommunikation"
-
-#~ msgid "A display filter sending the buffers to draw to the upper layer"
-#~ msgstr ""
-#~ "Ein Anzeigefilter, der die Puffer sendet, um die oberste Schicht zu "
-#~ "zeichnen"
-
-#~ msgid "Sound capture filter for MacOS X Audio Unit Service"
-#~ msgstr "Sound-Aufnahmefilter für den Audio-Unit-Dienst auf MacOS X"
-
-#~ msgid "Sound playback filter for MacOS X Audio Unit Service"
-#~ msgstr "Sound-Wiedergabefilter für den Audio-Unit-Dienst auf MacOS X"
-
-#~ msgid "A video display using X11+Xv"
-#~ msgstr "Eine Video-Anzeige, die X11 und Xv verwendet"
-
-#~ msgid "Sound capture filter for Android"
-#~ msgstr "Sound-Aufnahmefilter für Android"
-
-#~ msgid "Sound playback filter for Android"
-#~ msgstr "Sound-Wiedergabefilter für Android"
-
-#~ msgid "A filter that captures Android video."
-#~ msgstr "Ein Filter, der Android-Video aufzeichnet."
-
-#~ msgid ""
-#~ "Your machine appears to be connected to an IPv6 network. By default "
-#~ "linphone always uses IPv4. Please update your configuration if you want "
-#~ "to use IPv6"
-#~ msgstr ""
-#~ "Ihr Rechner scheint an einen IPv6 Netz angeschlossen zu sein. "
-#~ "Linphoneverwendet normalerweise IPv4. Bitte Konfiguration anpassen wenn "
-#~ "sie IPv6 verwenden wollen"
-
-#, fuzzy
-#~ msgid "_Modes"
-#~ msgstr "Codecs"
-
-#~ msgid "Accept"
-#~ msgstr "Annehmen"
-
-#, fuzzy
-#~ msgid "Incoming call from"
-#~ msgstr "Eingehendes Gespr�h"
-
-#, fuzzy
-#~ msgid "Linphone - Incoming call"
-#~ msgstr "Eingehendes Gespr�h"
-
-#, fuzzy
-#~ msgid ""
-#~ "Audio codecs\n"
-#~ "Video codecs"
-#~ msgstr "Audio und Video Codecs"
-
-#~ msgid "Sorry, having multiple simultaneous calls is not supported yet !"
-#~ msgstr "Mehrfachen gleichzeitigen Anrufen nicht unterstützt !"
-
-#~ msgid "Could not reach destination."
-#~ msgstr "Konnte Ziel nicht erreichen"
-
-#~ msgid "Request Cancelled."
-#~ msgstr "Anruf annulliert."
-
-#~ msgid "Bad request"
-#~ msgstr "Fehlerhafte Anfrage"
-
-#~ msgid "User cannot be found at given address."
-#~ msgstr "Teilnehmer ist unter der angegebene Adresse nicht erreichbar."
-
-#~ msgid "Remote user cannot support any of proposed codecs."
-#~ msgstr "Die Gegenstelle untersttzt die angebotenen Codecs nicht."
-
-#~ msgid "Timeout."
-#~ msgstr "Zeitberschreitung."
-
-#~ msgid "Remote host was found but refused connection."
-#~ msgstr "Die Gegenstelle hat die Verbindung abgewiesen."
-
-#~ msgid ""
-#~ "User is not reachable at the moment but he invites you\n"
-#~ "to contact him using the following alternate resource:"
-#~ msgstr ""
-#~ "Teilnehmer nicht erreichbar. Bitte versuchen Sie es unter nachstehender "
-#~ "Ressource:"
-
-#~ msgid "No nat/firewall address supplied !"
-#~ msgstr "Keine Nat/Firewall Adresse vorgegeben !"
-
-#~ msgid "Invalid nat address '%s' : %s"
-#~ msgstr "Ungültige NAT Adresse '%s' : '%s'"
-
-#~ msgid "Gone"
-#~ msgstr "Gegangen"
-
-#~ msgid "Waiting for Approval"
-#~ msgstr "Warte aud Bestätigung"
-
-#~ msgid "Be Right Back"
-#~ msgstr "Bald wieder da"
-
-#~ msgid "On The Phone"
-#~ msgstr "Am Höhrer"
-
-#~ msgid "Out To Lunch"
-#~ msgstr "Beim Essen"
-
-#, fuzzy
-#~ msgid "_View"
-#~ msgstr "Video"
-
-#, fuzzy
-#~ msgid "Display filters"
-#~ msgstr "Angezeigter Name:"
-
-#, fuzzy
-#~ msgid "_Properties"
-#~ msgstr "RTP-Eigenschaften"
-
-#, fuzzy
-#~ msgid "Show logs"
-#~ msgstr "Zeigt Gespräche"
-
-#, fuzzy
-#~ msgid "_About"
-#~ msgstr "Konto"
-
-#, fuzzy
-#~ msgid "Proxy in use"
-#~ msgstr "Benutze Proxy-Server:"
-
-#~ msgid "Sound"
-#~ msgstr "Ton"
-
-#, fuzzy
-#~ msgid "Proxy accounts"
-#~ msgstr "Benutze Proxy-Server:"
-
-#~ msgid "Go"
-#~ msgstr "Start"
-
-#~ msgid "Address book"
-#~ msgstr "Adressbuch"
-
-#~ msgid "Exit"
-#~ msgstr "Beenden"
-
-#~ msgid "Shows the address book"
-#~ msgstr "Adressbuch"
-
-#~ msgid "..."
-#~ msgstr "..."
-
-#~ msgid ""
-#~ "Hangup\n"
-#~ "or refuse"
-#~ msgstr ""
-#~ "Auflegen\n"
-#~ "oder Abweisen"
-
-#~ msgid "Or chat !"
-#~ msgstr "Oder Chat"
-
-#~ msgid "Show more..."
-#~ msgstr "Mehr anzeigen"
-
-#~ msgid "Playback level:"
-#~ msgstr "Abhörpegel"
-
-#~ msgid "Recording level:"
-#~ msgstr "Aufnamepegel"
-
-#~ msgid "Ring level:"
-#~ msgstr "Klingelpegel"
-
-#~ msgid "Controls"
-#~ msgstr "Kontrolle"
-
-#~ msgid "Reachable"
-#~ msgstr "Erreichbar"
-
-#~ msgid "Busy, I'll be back in "
-#~ msgstr "Beschäftigt, wieder erreichbar in "
-
-#~ msgid "The other party will be informed that you'll be back in X minutes"
-#~ msgstr ""
-#~ "Der Teilnehmer wird informiert, dass Sie in X Minuten wieder anwesend "
-#~ "sind."
-
-#~ msgid "mn"
-#~ msgstr "mn"
-
-#~ msgid "Moved temporarily"
-#~ msgstr "Unterwegs"
-
-#~ msgid "Alternative service"
-#~ msgstr "Andere Dienste"
-
-#~ msgid "URL:"
-#~ msgstr "URL:"
-
-#~ msgid "Presence"
-#~ msgstr "Anwesenheit"
-
-#~ msgid "Press digits to send DTMFs."
-#~ msgstr "Zifferntasten drücken, um DTMF zu senden"
-
-#~ msgid "DTMF"
-#~ msgstr "DTMF"
-
-#~ msgid "My online friends"
-#~ msgstr "Meine online Freunde"
-
-#~ msgid ""
-#~ "C: 2001\n"
-#~ "Made in Old Europe"
-#~ msgstr ""
-#~ "C: 2001\n"
-#~ "In Alt Europa erzeugt"
-
-#~ msgid ""
-#~ "Linphone is a web-phone.\n"
-#~ "It is compatible with SIP and RTP protocols."
-#~ msgstr ""
-#~ "Linphone ist ein web-phone.\n"
-#~ "Es ist mit den SIP- und RTP-Protokollen kompatibel."
-
-#~ msgid "Use IPv6 network (if available)"
-#~ msgstr "IPv6 Netzwerk (falls vorhanden) verwenden"
-
-# msgstr "Teilnehmer zur Zeit nicht ansprechbar."
-#~ msgid ""
-#~ "Toggle this if you are on an ipv6 network and you wish linphone to use it."
-#~ msgstr ""
-#~ "Ankreuzen wenn Sie ein ipv6 Netz haben und wenn Sie es wünschen dass "
-#~ "linphone es verwendet"
-
-#~ msgid ""
-#~ "These options is only for users in a private network, behind a gateway. "
-#~ "If you are not in this situation, then leave this empty."
-#~ msgstr ""
-#~ "Diese Option gilt nur für Anwender in einem privaten Netzwerk oder wenn "
-#~ "der Rechner durch einen Firewall geschützt ist. Andernfalls wird das Feld "
-#~ "nicht ausgefüllt"
-
-#~ msgid "No firewall"
-#~ msgstr "Kein Firewall"
-
-#~ msgid "Use this STUN server to guess firewall address :"
-#~ msgstr "Dieses STUN Server verwenden um die Firewalladresse zu Ermitteln"
-
-#~ msgid "Specify firewall address manually:"
-#~ msgstr "Firewall Adresse von Hand angeben"
-
-#~ msgid "NAT traversal options (experimental)"
-#~ msgstr "NAT-Transversaloptionen (experimentell)"
-
-#~ msgid "Number of buffered miliseconds (jitter compensation):"
-#~ msgstr "Anzahl der gepufferten Pakete (Jitterausgleich):"
-
-#~ msgid "RTP port used for audio:"
-#~ msgstr "Sound RTP Port:"
-
-#~ msgid "Use SIP INFO message instead of RTP rfc2833 for DTMF transmitting"
-#~ msgstr "Benutze SIP INFO Nachricht statt RTP rfc2833 für DTMF Übertragung"
-
-#~ msgid "RTP-RFC2833 is the recommended way."
-#~ msgstr "RTP-RFC2833 wird empfohlen"
-
-#~ msgid "Other"
-#~ msgstr "Andere"
-
-#~ msgid "micro"
-#~ msgstr "Mikrofon"
-
-#~ msgid "Enable echo-canceler (cancels the echo heard by the remote party)"
-#~ msgstr ""
-#~ "Echounterdrückung einschalten (eliminiert das von Gesprächspartnet "
-#~ "gehörter Echo)"
-
-#~ msgid "Listen"
-#~ msgstr "Anhören"
-
-#~ msgid "Run sip user agent on port:"
-#~ msgstr "Sip \"user agent\" an Port:"
-
-#~ msgid "It is strongly recommended to use port 5060."
-#~ msgstr "Wir empfehlen, Port 5060 zu verwenden"
-
-#~ msgid "@"
-#~ msgstr "@"
-
-#~ msgid "Identity"
-#~ msgstr "Identität"
-
-#~ msgid "Add proxy/registrar"
-#~ msgstr "Proxy/Registrator hinzufügen"
-
-#~ msgid "Remote services"
-#~ msgstr "Dienste auf entferntem Server"
-
-#~ msgid "Clear all stored authentication information (username,password...)"
-#~ msgstr ""
-#~ "Alle gespeicherten Authentifikationsinformationen löschen (Benutzername, "
-#~ "Passwort,...)"
-
-#~ msgid "List of audio codecs, in order of preference:"
-#~ msgstr "Liste von Audio-CoDecs in der Reihenfolge ihrer Präferenz"
-
-#~ msgid ""
-#~ "Note: Codecs in red are not usable regarding to your connection type to "
-#~ "the internet."
-#~ msgstr ""
-#~ "Notiz: Rot markierten Codecs können bei Ihrer Internetverbindungsart "
-#~ "nicht verwendet werden."
-
-#~ msgid "No information availlable"
-#~ msgstr "Informationen nicht verfügbar"
-
-#~ msgid "Codec information"
-#~ msgstr "Codec Information"
-
-#~ msgid "Address Book"
-#~ msgstr "Adressbuch"
-
-#~ msgid "Select"
-#~ msgstr "Auswählen"
-
-#~ msgid ""
-#~ "User is not reachable at the moment but he invites you to contact him "
-#~ "using the following alternate ressource:"
-#~ msgstr ""
-#~ "Teilnehmer nicht erreichbar. Bitte stattdessen nachstehende Ressource "
-#~ "verwenden:"
-
-#~ msgid "None."
-#~ msgstr "Nichts."
-
-#~ msgid "Send registration:"
-#~ msgstr "Sende Registrierung:"
-
-#~ msgid "Name:"
-#~ msgstr "Name:"
-
-#~ msgid "Subscribe policy:"
-#~ msgstr "Subskription Police"
-
-#~ msgid "Send subscription (see person's online status)"
-#~ msgstr "Sende Subskription (zeige Onlinestatus der Person an)"
-
-#~ msgid "New incoming subscription"
-#~ msgstr "Neu ankommende Subskription"
-
-#~ msgid "You have received a new subscription..."
-#~ msgstr "Sie haben eine neue Subskription empfangen"
-
-#~ msgid "Refuse"
-#~ msgstr "Ablehnen"
-
-#~ msgid "Authentication required for realm"
-#~ msgstr "Authentifikation erforderlich für Bereich"
-
-#~ msgid "userid:"
-#~ msgstr "Benutzer ID:"
-
-#~ msgid "Text:"
-#~ msgstr "Text"
-
-#~ msgid "The caller asks for resource reservation. Do you agree ?"
-#~ msgstr "Der Anrufer erbittet Resourcenreservierung. Sind Sie einverstanden?"
-
-#~ msgid ""
-#~ "The caller doesn't use resource reservation. \t\t\t\t\tDo you wish to "
-#~ "continue anyway ?"
-#~ msgstr ""
-#~ "Der Anrufer benutzt keine Resourcenreservierung. \t\t\t\t\tWollen Sie "
-#~ "dennoch fortfahren?"
-
-#~ msgid "linphone - receiving call from %s"
-#~ msgstr "Linphone- empfängt ein Anruf von %s"
-
-#~ msgid ""
-#~ "You have received a subscription from %s.This means that this person "
-#~ "wishes to be notified of your presence information (online, busy, "
-#~ "away...).\n"
-#~ "Do you agree ?"
-#~ msgstr ""
-#~ "Sie haben eine Subskription von %s empfangen. Das heißt, dass diese "
-#~ "Person ber Ihre Anwesenheitsinformation benachrichtigt werden will "
-#~ "(erreichbar, beschäftig, abwesend...).\n"
-#~ "Sind Sie einverstanden ?"
-
-#~ msgid "Authentication required for realm %s"
-#~ msgstr "Authentifikation erforderlich für Bereich %s"
-
-#~ msgid "Wait"
-#~ msgstr "Warten"
-
-#~ msgid "Deny"
-#~ msgstr "Abweisen"
-
-#~ msgid "Bad sip address: a sip address looks like sip:user@domain"
-#~ msgstr ""
-#~ "Fehlerhafte Sip-Adresse. Eine Sip-Adresse hat folgenden Aufbau <sip:"
-#~ "anwendername@domainname>"
-
-#~ msgid "Stun lookup done..."
-#~ msgstr "Stun Ermittlung beendet..."
-
-#~ msgid "enter sip uri here"
-#~ msgstr "Sip URI eingeben"
-
-#~ msgid "User manual"
-#~ msgstr "Anwender-Handbuch"
-
-#~ msgid "Ring sound selection"
-#~ msgstr "Klingelton ausw�len"
-
-#~ msgid "Communication ended."
-#~ msgstr "Kommunikation beendet."
-
-#, fuzzy
-#~ msgid "Firewall 's external ip address (in dot notations):"
-#~ msgstr "IP-Adresse des Firewall (in Punktnotation)"
-
-#~ msgid "28k modem"
-#~ msgstr "28K Modem"
-
-#~ msgid "56k modem"
-#~ msgstr "56K Modem"
-
-#~ msgid "64k modem (numeris)"
-#~ msgstr "64K Modem (ISDN)"
-
-#~ msgid "ADSL or Cable modem"
-#~ msgstr "ADSL oder Kabel-Modem"
-
-#~ msgid "Ethernet or equivalent"
-#~ msgstr "Ethernet oder äquivalent"
-
-#~ msgid "Connection type:"
-#~ msgstr "Verbindungstyp:"
-
-#, fuzzy
-#~ msgid ""
-#~ "Linphone could not open audio device %s. Check if your sound card is "
-#~ "fully configured and working."
-#~ msgstr ""
-#~ "Linphone kann das Soundgerät nicht öffnen. Prfen Sie nach, ob die "
-#~ "Soundkarte vollst�dig konfiguriert und funktionsfähig ist."
-
-#~ msgid "Type here the sip address of the person you want to call."
-#~ msgstr ""
-#~ "Geben Sie die Sip-Adresse des Anwenders, den Sie anrufen möchten, hier "
-#~ "ein."
-
-#~ msgid ""
-#~ "Release or\n"
-#~ "Refuse"
-#~ msgstr ""
-#~ "Auflegen oder\n"
-#~ "Abweisen"
-
-#~ msgid "%s. Retry after %i minute(s)."
-#~ msgstr "%s. In %i Minuten wieder versuchen."
-
-#~ msgid "Timeout..."
-#~ msgstr "Zeitüberschreitung..."
-
-#~ msgid "Toggle this if you want to be registered on a remote server."
-#~ msgstr ""
-#~ "Bitte ankreuzen, wenn Sie auf einem Sip-Server registriert werden wollen."
-
-#~ msgid "Address of record:"
-#~ msgstr "Adresse des Eintrags:"
-
-#~ msgid ""
-#~ "The password used for registration. On some servers it is not necessary"
-#~ msgstr ""
-#~ "Passwort für die Registrierung.  Bei manchen Servern nicht erforderlich."
-
-#~ msgid "Use this registrar server as outbound proxy."
-#~ msgstr "Verwenden Sie diesen Registrarserver als externen proxy."
-
-#~ msgid "sip address:"
-#~ msgstr "SIP-Adresse:"
-
-#~ msgid "Modify"
-#~ msgstr "Ändern"
-
-#~ msgid ""
-#~ "You are currently using the i810_audio driver.\n"
-#~ "This driver is buggy and so does not work with Linphone.\n"
-#~ "We suggest that you replace it by its equivalent ALSA driver,\n"
-#~ "either with packages from your distribution, or by downloading\n"
-#~ "ALSA drivers at http://www.alsa-project.org."
-#~ msgstr ""
-#~ "Sie verwenden zur Zeit den i810_audio Treiber.\n"
-#~ "Diese Treiber ist fehlerhaft und funktioniert nicht mit Linphone\n"
-#~ "Wir empfehlen, den Treiber entweder durch das ALSA-Treiber-Paket von "
-#~ "ihrer Distribution\n"
-#~ "zu ersetzen oder die gewnschten ALSA-Treiber von http://www.alsa-project."
-#~ "org\n"
-#~ "zu beziehen und zu installieren"
-
-#~ msgid "Unregistration successfull."
-#~ msgstr "Abmeldung erfolgreich."
-
-#~ msgid "Select network interface to use:"
-#~ msgstr "Netzwerkschnittstelle wählen:"
-
-#~ msgid "Network interface properties"
-#~ msgstr "Eigenschaften der Netzwerkschnittstelle"
-
-#~ msgid "RTP"
-#~ msgstr "RTP"
-
-#~ msgid "C: 2001"
-#~ msgstr "April 2001"
-
-#~ msgid "Threads not supported by glib. Upgrade your glib.\n"
-#~ msgstr ""
-#~ "Threads werden von glib nicht unterstützt.  Bitte aktualisieren Sie Ihre "
-#~ "glib.\n"
-
-#~ msgid "Run linphone as a gnome-applet."
-#~ msgstr "Linphone als gnome-Applet ausfhren."
-
-#~ msgid "Run linphone as a daemon (for use without gnome)."
-#~ msgstr "Linphone als daemon ausführen (Verwendung ohne Gnome)."
-
-#~ msgid ""
-#~ "Cannot find network previously used interface %s.\n"
-#~ "If your computer is temporary connected to the internet, please connect "
-#~ "and then run linphone.\n"
-#~ "If you want to change your default network interface, go to the "
-#~ "parameters 'box."
-#~ msgstr ""
-#~ "Linphone konnte die zuvor verwendete Netzwerkschnittstelle %s nicht "
-#~ "finden.\n"
-#~ "Wenn linphone nur temporär am Internet angeschlossen ist, stellen Sie "
-#~ "eine Verbindung her und rufen Sie linphone erneut auf.\n"
-#~ "Wenn Sie die vorgegebene Netzwerkschnittstelle ändern wollen, wählen Sie "
-#~ "bitte \"Einstellungen\"."
-
-#~ msgid ""
-#~ "Linphone cannot open the audio device.\n"
-#~ "It may be caused by other programs using it.\n"
-#~ "Do you want linphone to kill these programs (esd or artsd) ?"
-#~ msgstr ""
-#~ "Linphone kann die Soundschnittstelle nicht öffnen.\n"
-#~ "Dies kann durch andere Applikationen verursacht sein.\n"
-#~ "Möchten sie diese Programme (esd oder artsd) beenden?"
-
-#~ msgid "Use it as a:"
-#~ msgstr "Verwenden als:"
-
-#~ msgid "Outbound proxy"
-#~ msgstr "Ausgehender Proxy-Server"
-
-#~ msgid ""
-#~ "Toggle this button if the registrar must be used to proxy calls through a "
-#~ "firewall."
-#~ msgstr ""
-#~ "Verwenden Sie diesen Knopf, falls der Registrar zum Tunneln durch einen "
-#~ "Firewall verwendet werden muß"
-
-#~ msgid "kbit/s"
-#~ msgstr "Kbits/s"
-
-#~ msgid "OSS"
-#~ msgstr "OSS"
-
-#~ msgid "ALSA"
-#~ msgstr "ALSA"
-
-#~ msgid "Automatically kill applications using soundcard when needed"
-#~ msgstr "Applikationen die die Soundkarte verwenden, automatisch beenden."
-
-#~ msgid ""
-#~ "Your computer is connected to several networks. Check in the global "
-#~ "parameters if Linphone uses the one that you want."
-#~ msgstr ""
-#~ "Ihr Rechner ist an mehere Netze angeschlossen. Stellen Sie sicher, daß in "
-#~ "den Globalen Parametern die richtige Schnittstelle selektiert ist."
-
-#~ msgid ""
-#~ "Linphone failed to open the sound device. See the README file included in "
-#~ "the distribution for details."
-#~ msgstr ""
-#~ "Linphone konnte die Soundschnittstelle nicht öffnen. Weitere "
-#~ "Informationen finden Sie in der README-Datei (enthalten in der "
-#~ "Distribution)."
-
-#~ msgid "Interface not found."
-#~ msgstr "Schnittstelle nicht gefunden."
-
-#~ msgid "Warning"
-#~ msgstr "Warnung"
-
-#~ msgid ""
-#~ "Linphone cannot open the sound device. It may be caused by other programs "
-#~ "using it. Do you want linphone to kill these programs (esd or artsd) ?"
-#~ msgstr ""
-#~ "Linphone kann die Soundschnittstelle nicht öffnen. Dies kann durch andere "
-#~ "Applikationen verursacht sein. Möchten sie diese Programme (esd oder "
-#~ "artsd) beenden?"
-
-#~ msgid "Linphone shutdowns..."
-#~ msgstr "Linphone Ende..."
-
-#~ msgid ""
-#~ "Please, wait a few seconds untils linphone unregisters your sip addess "
-#~ "from registrar server..."
-#~ msgstr "Bitte einige Sekunden warten, bis Sip-Adresse ausgetragen ist."
-
-#~ msgid "Bad formuled sip address."
-#~ msgstr "SIP-Adresse fehlerhaft."
-
-#~ msgid "Couldn't create pixmap from file: %s"
-#~ msgstr "Konnte Pixmap nicht aus Datei %s erzeugen."
-
-#~ msgid ""
-#~ "Linphone did not detect any valid network interface. If you use a "
-#~ "temporary internet connection, please connect and then run linphone again."
-#~ msgstr ""
-#~ "Linphone konnte keine Netzwerkschnittstelle finden. Wenn Sie nur eine "
-#~ "temporäre Internetverbindung haben, bitte erneut eine Internetverbindung "
-#~ "herstellen und linphone nochmals starten."
-
-#~ msgid "List of network interfaces on your system."
-#~ msgstr "Vorhandene Netzwerkschnittstellen ihres Systems"
diff --git a/po/es.po b/po/es.po
index f58dac100..366c345de 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,19 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: Linphone 0.9.1\n"
+"Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-15 09:24+0200\n"
-"PO-Revision-Date: 2012-12-06 15:54+0100\n"
-"Last-Translator: BERAUDO Guillaume <guillaume.beraudo@linphone.org>\n"
-"Language-Team: es <es@li.org>\n"
-"Language: \n"
+"POT-Creation-Date: 2014-11-19 10:39+0100\n"
+"PO-Revision-Date: 2014-11-19 10:17+0000\n"
+"Last-Translator: Cqnqrd <gautier.pelloux@gmail.com>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/linphone-gtk/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974
 #, c-format
@@ -26,28 +28,25 @@ msgid "Send text to %s"
 msgstr "Enviar mensaje a %s"
 
 #: ../gtk/calllogs.c:232
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Recent calls (%i)</b>"
-msgstr "<b>En llamada </b>"
+msgstr ""
 
 #: ../gtk/calllogs.c:314
 msgid "n/a"
 msgstr "n/a"
 
 #: ../gtk/calllogs.c:317
-#, fuzzy
 msgid "Aborted"
-msgstr "abortada"
+msgstr ""
 
 #: ../gtk/calllogs.c:320
-#, fuzzy
 msgid "Missed"
-msgstr "perdida"
+msgstr ""
 
 #: ../gtk/calllogs.c:323
-#, fuzzy
 msgid "Declined"
-msgstr "Rechazar"
+msgstr ""
 
 #: ../gtk/calllogs.c:329
 #, c-format
@@ -64,29 +63,23 @@ msgstr[0] "%i segundo"
 msgstr[1] "%i segundos"
 
 #: ../gtk/calllogs.c:335 ../gtk/calllogs.c:341
-#, fuzzy, c-format
+#, c-format
 msgid "<big><b>%s</b></big>\t%s"
 msgstr ""
-"<big><b>%s</b></big>\t<small><i>%s</i>\t<i>Calidad: %s</i></small>\n"
-"%s\t%s %s\t"
 
 #: ../gtk/calllogs.c:337
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<small><i>%s</i>\t<i>Quality: %s</i></small>\n"
 "%s\t%s\t"
 msgstr ""
-"<big><b>%s</b></big>\t<small><i>%s</i>\t<i>Calidad: %s</i></small>\n"
-"%s\t%s %s\t"
 
 #: ../gtk/calllogs.c:343
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<small><i>%s</i></small>\t\n"
 "%s"
 msgstr ""
-"<big><b>%s</b></big>\t<small><i>%s</i>\t<i>Calidad: %s</i></small>\n"
-"%s\t%s %s\t"
 
 #: ../gtk/conference.c:38 ../gtk/main.ui.h:13
 msgid "Conference"
@@ -107,8 +100,7 @@ msgstr "¡Contacto SIP no válido!"
 
 #: ../gtk/main.c:107
 msgid "log to stdout some debug information while running."
-msgstr ""
-"registra a stdout cierta información de depuración durante la ejecución."
+msgstr "registra a stdout cierta información de depuración durante la ejecución."
 
 #: ../gtk/main.c:114
 msgid "path to a file to write logs into."
@@ -132,135 +124,110 @@ msgstr "si está activo, responder a llamadas entrantes automáticamente"
 
 #: ../gtk/main.c:149
 msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: c:"
-"\\Program Files\\Linphone)"
-msgstr ""
-"Especifique un directorio de trabajo (debería ser la raíz de la instalación, "
-"ej: c:\\Archivos de Programa\\Linphone)"
+"Specifiy a working directory (should be the base of the installation, eg: "
+"c:\\Program Files\\Linphone)"
+msgstr "Especifique un directorio de trabajo (debería ser la raíz de la instalación, ej: c:\\Archivos de Programa\\Linphone)"
 
 #: ../gtk/main.c:156
-#, fuzzy
 msgid "Configuration file"
-msgstr "Confirmación"
+msgstr ""
 
 #: ../gtk/main.c:163
-#, fuzzy
 msgid "Run the audio assistant"
-msgstr "Asistente de configuración de cuenta"
+msgstr ""
 
-#: ../gtk/main.c:590
-#, c-format
-msgid "Call with %s"
-msgstr "Llamar con %s"
-
-#: ../gtk/main.c:1183
+#: ../gtk/main.c:1085
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
-"Would you allow him to see your presence status or add him to your contact "
-"list ?\n"
+"Would you allow him to see your presence status or add him to your contact list ?\n"
 "If you answer no, this person will be temporarily blacklisted."
-msgstr ""
-"%s desea añadirle a su lista de contactos.\n"
-"¿Desea permitirle ver su estado de presencia o añadirle a su lista de "
-"contactos?\n"
-"Si responde no, esta persona será bloqueada temporalmente."
+msgstr "%s desea añadirle a su lista de contactos.\n¿Desea permitirle ver su estado de presencia o añadirle a su lista de contactos?\nSi responde no, esta persona será bloqueada temporalmente."
 
-#: ../gtk/main.c:1260
-#, fuzzy, c-format
+#: ../gtk/main.c:1162
+#, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
 msgstr ""
-"Por favor, introduzca la contraseña para el usuario <i>%s</i>\n"
-" en el dominio <i>%s</i>:"
 
-#: ../gtk/main.c:1376
-#, fuzzy
+#: ../gtk/main.c:1283
 msgid "Call error"
-msgstr "Error en la llamada."
+msgstr ""
 
-#: ../gtk/main.c:1379 ../coreapi/linphonecore.c:3240
-#, fuzzy
+#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3744
 msgid "Call ended"
-msgstr "Llamada terminada"
+msgstr ""
 
-#: ../gtk/main.c:1382
+#: ../gtk/main.c:1289
 msgid "Incoming call"
 msgstr "Llamada entrante"
 
-#: ../gtk/main.c:1384 ../gtk/incall_view.c:522 ../gtk/main.ui.h:5
+#: ../gtk/main.c:1291 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
 msgid "Answer"
 msgstr "Contestar"
 
-#: ../gtk/main.c:1386 ../gtk/main.ui.h:6
-#, fuzzy
+#: ../gtk/main.c:1293 ../gtk/main.ui.h:6
 msgid "Decline"
-msgstr "Rechazar"
+msgstr ""
 
-#: ../gtk/main.c:1392
-#, fuzzy
+#: ../gtk/main.c:1299
 msgid "Call paused"
-msgstr "Llamada en pausa"
+msgstr ""
 
-#: ../gtk/main.c:1392
-#, fuzzy, c-format
+#: ../gtk/main.c:1299
+#, c-format
 msgid "<b>by %s</b>"
-msgstr "<b>Puertos</b>"
+msgstr ""
 
-#: ../gtk/main.c:1459
+#: ../gtk/main.c:1366
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr ""
 
-#: ../gtk/main.c:1621
+#: ../gtk/main.c:1528
 msgid "Website link"
 msgstr "Enlace a la Web"
 
-#: ../gtk/main.c:1670
+#: ../gtk/main.c:1577
 msgid "Linphone - a video internet phone"
 msgstr "Linphone - un video-teléfono a través de Internet"
 
-#: ../gtk/main.c:1762
+#: ../gtk/main.c:1669
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (Opción predeterminada)"
 
-#: ../gtk/main.c:2099 ../coreapi/callbacks.c:949
+#: ../gtk/main.c:2006 ../coreapi/callbacks.c:983
 #, c-format
 msgid "We are transferred to %s"
 msgstr "Somos transferidos a %s"
 
-#: ../gtk/main.c:2109
+#: ../gtk/main.c:2016
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
-msgstr ""
-"No se ha encontrado una tarjeta de sonido en este equipo.\n"
-"No será posible realizar o recibir llamadas de audio."
+msgstr "No se ha encontrado una tarjeta de sonido en este equipo.\nNo será posible realizar o recibir llamadas de audio."
 
-#: ../gtk/main.c:2250
+#: ../gtk/main.c:2157
 msgid "A free SIP video-phone"
 msgstr "Un video-teléfono SIP gratuito"
 
 #: ../gtk/friendlist.c:505
-#, fuzzy
 msgid "Add to addressbook"
-msgstr "Añadir a la agenda"
+msgstr ""
 
 #: ../gtk/friendlist.c:691
-#, fuzzy
 msgid "Presence status"
-msgstr "Estado de Presencia"
+msgstr ""
 
 #: ../gtk/friendlist.c:709 ../gtk/propertybox.c:552 ../gtk/contact.ui.h:1
 msgid "Name"
 msgstr "Nombre"
 
 #: ../gtk/friendlist.c:721
-#, fuzzy
 msgid "Call"
-msgstr "Llamada"
+msgstr ""
 
 #: ../gtk/friendlist.c:726
 msgid "Chat"
@@ -272,9 +239,9 @@ msgid "Search in %s directory"
 msgstr "Buscar en el directorio %s"
 
 #: ../gtk/friendlist.c:976
-#, fuzzy, c-format
+#, c-format
 msgid "Edit contact '%s'"
-msgstr "Editar contacto '%s'"
+msgstr ""
 
 #: ../gtk/friendlist.c:977
 #, c-format
@@ -282,9 +249,9 @@ msgid "Delete contact '%s'"
 msgstr "Eliminar contacto '%s'"
 
 #: ../gtk/friendlist.c:978
-#, fuzzy, c-format
+#, c-format
 msgid "Delete chat history of '%s'"
-msgstr "Eliminar contacto '%s'"
+msgstr ""
 
 #: ../gtk/friendlist.c:1029
 #, c-format
@@ -300,9 +267,8 @@ msgid "Status"
 msgstr "Estado"
 
 #: ../gtk/propertybox.c:570
-#, fuzzy
 msgid "IP Bitrate (kbit/s)"
-msgstr "Bitrate mínimo (kbit/s)"
+msgstr ""
 
 #: ../gtk/propertybox.c:577
 msgid "Parameters"
@@ -320,109 +286,105 @@ msgstr "Desactivado"
 msgid "Account"
 msgstr "Cuenta"
 
-#: ../gtk/propertybox.c:1063
+#: ../gtk/propertybox.c:1072
 msgid "English"
 msgstr "Inglés"
 
-#: ../gtk/propertybox.c:1064
+#: ../gtk/propertybox.c:1073
 msgid "French"
 msgstr "Francés"
 
-#: ../gtk/propertybox.c:1065
+#: ../gtk/propertybox.c:1074
 msgid "Swedish"
 msgstr "Sueco"
 
-#: ../gtk/propertybox.c:1066
+#: ../gtk/propertybox.c:1075
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../gtk/propertybox.c:1067
+#: ../gtk/propertybox.c:1076
 msgid "Spanish"
 msgstr "Español"
 
-#: ../gtk/propertybox.c:1068
+#: ../gtk/propertybox.c:1077
 msgid "Brazilian Portugese"
 msgstr "Portugués de Brasil"
 
-#: ../gtk/propertybox.c:1069
+#: ../gtk/propertybox.c:1078
 msgid "Polish"
 msgstr "Polaco"
 
-#: ../gtk/propertybox.c:1070
+#: ../gtk/propertybox.c:1079
 msgid "German"
 msgstr "Alemán"
 
-#: ../gtk/propertybox.c:1071
+#: ../gtk/propertybox.c:1080
 msgid "Russian"
 msgstr "Ruso"
 
-#: ../gtk/propertybox.c:1072
+#: ../gtk/propertybox.c:1081
 msgid "Japanese"
 msgstr "Japonés"
 
-#: ../gtk/propertybox.c:1073
+#: ../gtk/propertybox.c:1082
 msgid "Dutch"
 msgstr "Holandés"
 
-#: ../gtk/propertybox.c:1074
+#: ../gtk/propertybox.c:1083
 msgid "Hungarian"
 msgstr "Húngaro"
 
-#: ../gtk/propertybox.c:1075
+#: ../gtk/propertybox.c:1084
 msgid "Czech"
 msgstr "Checo"
 
-#: ../gtk/propertybox.c:1076
+#: ../gtk/propertybox.c:1085
 msgid "Chinese"
 msgstr "Chino"
 
-#: ../gtk/propertybox.c:1077
+#: ../gtk/propertybox.c:1086
 msgid "Traditional Chinese"
 msgstr "Chino Tradicional"
 
-#: ../gtk/propertybox.c:1078
+#: ../gtk/propertybox.c:1087
 msgid "Norwegian"
 msgstr "Noruego"
 
-#: ../gtk/propertybox.c:1079
+#: ../gtk/propertybox.c:1088
 msgid "Hebrew"
 msgstr ""
 
-#: ../gtk/propertybox.c:1080
+#: ../gtk/propertybox.c:1089
 msgid "Serbian"
 msgstr ""
 
-#: ../gtk/propertybox.c:1147
+#: ../gtk/propertybox.c:1156
 msgid ""
 "You need to restart linphone for the new language selection to take effect."
 msgstr "Deberá reiniciar linphone para aplicar la nueva selección de lenguaje"
 
-#: ../gtk/propertybox.c:1225
-#, fuzzy
+#: ../gtk/propertybox.c:1234
 msgid "None"
-msgstr "Ninguno."
+msgstr ""
 
-#: ../gtk/propertybox.c:1229
+#: ../gtk/propertybox.c:1238
 msgid "SRTP"
 msgstr "SRTP"
 
-#: ../gtk/propertybox.c:1235
+#: ../gtk/propertybox.c:1244
 msgid "ZRTP"
 msgstr "ZRTP"
 
 #: ../gtk/update.c:80
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "A more recent version is availalble from %s.\n"
 "Would you like to open a browser to download it ?"
 msgstr ""
-"Una nueva versión está disponible en %s.\n"
-"¿Desea abrir el navegador para descargarla?"
 
 #: ../gtk/update.c:91
-#, fuzzy
 msgid "You are running the lastest version."
-msgstr "La versión instalada es la última."
+msgstr ""
 
 #: ../gtk/buddylookup.c:85
 msgid "Firstname, Lastname"
@@ -433,14 +395,12 @@ msgid "Error communicating with server."
 msgstr "Error al comunicar con el servidor."
 
 #: ../gtk/buddylookup.c:164
-#, fuzzy
 msgid "Connecting..."
-msgstr "Conectando..."
+msgstr ""
 
 #: ../gtk/buddylookup.c:168
-#, fuzzy
 msgid "Connected"
-msgstr "Conectado"
+msgstr ""
 
 #: ../gtk/buddylookup.c:172
 msgid "Receiving data..."
@@ -457,24 +417,19 @@ msgstr[1] "Se encontraron %i contactos"
 msgid ""
 "Welcome !\n"
 "This assistant will help you to use a SIP account for your calls."
-msgstr ""
-"¡Bienvenido/a !\n"
-"Este asistente le ayudará a utilizar una cuenta SIP para sus llamadas."
+msgstr "¡Bienvenido/a !\nEste asistente le ayudará a utilizar una cuenta SIP para sus llamadas."
 
 #: ../gtk/setupwizard.c:43
-#, fuzzy
 msgid "Create an account on linphone.org"
-msgstr "Crear una cuenta eligiendo un nombre de usuario"
+msgstr ""
 
 #: ../gtk/setupwizard.c:44
-#, fuzzy
 msgid "I have already a linphone.org account and I just want to use it"
-msgstr "Ya tengo una cuenta y quiero utilizarla"
+msgstr ""
 
 #: ../gtk/setupwizard.c:45
-#, fuzzy
 msgid "I have already a sip account and I just want to use it"
-msgstr "Ya tengo una cuenta y quiero utilizarla"
+msgstr ""
 
 #: ../gtk/setupwizard.c:46
 msgid "I want to specify a remote configuration URI"
@@ -485,28 +440,24 @@ msgid "Enter your linphone.org username"
 msgstr ""
 
 #: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:79 ../gtk/ldap.ui.h:4
-#, fuzzy
 msgid "Username:"
-msgstr "Nombre de usuario:"
+msgstr ""
 
 #: ../gtk/setupwizard.c:104 ../gtk/password.ui.h:4 ../gtk/ldap.ui.h:5
-#, fuzzy
 msgid "Password:"
-msgstr "Contraseña:"
+msgstr ""
 
 #: ../gtk/setupwizard.c:124
 msgid "Enter your account informations"
 msgstr ""
 
 #: ../gtk/setupwizard.c:140
-#, fuzzy
 msgid "Username*"
-msgstr "Nombre de usuario"
+msgstr ""
 
 #: ../gtk/setupwizard.c:141
-#, fuzzy
 msgid "Password*"
-msgstr "Contraseña:"
+msgstr ""
 
 #: ../gtk/setupwizard.c:144
 msgid "Domain*"
@@ -521,14 +472,12 @@ msgid "(*) Required fields"
 msgstr ""
 
 #: ../gtk/setupwizard.c:318
-#, fuzzy
 msgid "Username: (*)"
-msgstr "Nombre de usuario:"
+msgstr ""
 
 #: ../gtk/setupwizard.c:320
-#, fuzzy
 msgid "Password: (*)"
-msgstr "Contraseña:"
+msgstr ""
 
 #: ../gtk/setupwizard.c:322
 msgid "Email: (*)"
@@ -554,15 +503,13 @@ msgstr "Gracias. Su cuenta está configurada y lista para su utilización."
 
 #: ../gtk/setupwizard.c:413
 msgid ""
-"Please validate your account by clicking on the link we just sent you by "
-"email.\n"
+"Please validate your account by clicking on the link we just sent you by email.\n"
 "Then come back here and press Next button."
 msgstr ""
 
 #: ../gtk/setupwizard.c:600
-#, fuzzy
 msgid "SIP account configuration assistant"
-msgstr "Asistente de configuración de cuenta"
+msgstr ""
 
 #: ../gtk/setupwizard.c:618
 msgid "Welcome to the account setup assistant"
@@ -573,9 +520,8 @@ msgid "Account setup assistant"
 msgstr "Asistente de configuración de cuenta"
 
 #: ../gtk/setupwizard.c:629
-#, fuzzy
 msgid "Configure your account (step 1/1)"
-msgstr "Configurar una cuenta SIP"
+msgstr ""
 
 #: ../gtk/setupwizard.c:634
 msgid "Enter your sip username (step 1/1)"
@@ -598,9 +544,9 @@ msgid "Terminating"
 msgstr ""
 
 #: ../gtk/incall_view.c:70 ../gtk/incall_view.c:94
-#, fuzzy, c-format
+#, c-format
 msgid "Call #%i"
-msgstr "Llamar a #%i"
+msgstr ""
 
 #: ../gtk/incall_view.c:155
 #, c-format
@@ -608,18 +554,16 @@ msgid "Transfer to call #%i with %s"
 msgstr "Transferir a llamada #%i con %s"
 
 #: ../gtk/incall_view.c:211 ../gtk/incall_view.c:214
-#, fuzzy
 msgid "Not used"
-msgstr "No encontrado"
+msgstr ""
 
 #: ../gtk/incall_view.c:221
 msgid "ICE not activated"
 msgstr ""
 
 #: ../gtk/incall_view.c:223
-#, fuzzy
 msgid "ICE failed"
-msgstr "La llamada ha fallado."
+msgstr ""
 
 #: ../gtk/incall_view.c:225
 msgid "ICE in progress"
@@ -630,9 +574,8 @@ msgid "Going through one or more NATs"
 msgstr ""
 
 #: ../gtk/incall_view.c:229
-#, fuzzy
 msgid "Direct"
-msgstr "Redigirida"
+msgstr ""
 
 #: ../gtk/incall_view.c:231
 msgid "Through a relay server"
@@ -643,23 +586,20 @@ msgid "uPnP not activated"
 msgstr ""
 
 #: ../gtk/incall_view.c:241
-#, fuzzy
 msgid "uPnP in progress"
-msgstr "Búsqueda STUN en proceso…"
+msgstr ""
 
 #: ../gtk/incall_view.c:243
-#, fuzzy
 msgid "uPnp not available"
-msgstr "no disponible"
+msgstr ""
 
 #: ../gtk/incall_view.c:245
 msgid "uPnP is running"
 msgstr ""
 
 #: ../gtk/incall_view.c:247
-#, fuzzy
 msgid "uPnP failed"
-msgstr "La llamada ha fallado."
+msgstr ""
 
 #: ../gtk/incall_view.c:257 ../gtk/incall_view.c:258
 msgid "Direct or through server"
@@ -678,126 +618,118 @@ msgid "%ix%i @ %f fps"
 msgstr ""
 
 #: ../gtk/incall_view.c:304
-#, fuzzy, c-format
+#, c-format
 msgid "%.3f seconds"
-msgstr "%i segundo"
+msgstr ""
 
 #: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12
 msgid "Hang up"
 msgstr ""
 
-#: ../gtk/incall_view.c:501
-#, fuzzy
+#: ../gtk/incall_view.c:511
 msgid "<b>Calling...</b>"
-msgstr " <b>Llamando...</b>"
+msgstr ""
 
-#: ../gtk/incall_view.c:504 ../gtk/incall_view.c:707
+#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:727
 msgid "00::00::00"
 msgstr "00::00::00"
 
-#: ../gtk/incall_view.c:515
-#, fuzzy
+#: ../gtk/incall_view.c:525
 msgid "<b>Incoming call</b>"
-msgstr "<b>Llamada entrante</b>"
+msgstr ""
 
-#: ../gtk/incall_view.c:552
+#: ../gtk/incall_view.c:562
 msgid "good"
 msgstr "buena"
 
-#: ../gtk/incall_view.c:554
+#: ../gtk/incall_view.c:564
 msgid "average"
 msgstr "media"
 
-#: ../gtk/incall_view.c:556
+#: ../gtk/incall_view.c:566
 msgid "poor"
 msgstr "mala"
 
-#: ../gtk/incall_view.c:558
+#: ../gtk/incall_view.c:568
 msgid "very poor"
 msgstr "muy mala"
 
-#: ../gtk/incall_view.c:560
+#: ../gtk/incall_view.c:570
 msgid "too bad"
 msgstr "demasiado mala"
 
-#: ../gtk/incall_view.c:561 ../gtk/incall_view.c:577
+#: ../gtk/incall_view.c:571 ../gtk/incall_view.c:587
 msgid "unavailable"
 msgstr "no disponible"
 
-#: ../gtk/incall_view.c:669
+#: ../gtk/incall_view.c:679
 msgid "Secured by SRTP"
 msgstr "Cifrada con SRTP"
 
-#: ../gtk/incall_view.c:675
+#: ../gtk/incall_view.c:685
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
 msgstr "Cifrada con ZRTP - [token de autenticación: %s]"
 
-#: ../gtk/incall_view.c:681
+#: ../gtk/incall_view.c:691
 msgid "Set unverified"
 msgstr "Set sin verificar"
 
-#: ../gtk/incall_view.c:681 ../gtk/main.ui.h:4
+#: ../gtk/incall_view.c:691 ../gtk/main.ui.h:4
 msgid "Set verified"
 msgstr "Set verificado"
 
-#: ../gtk/incall_view.c:702
+#: ../gtk/incall_view.c:722
 msgid "In conference"
 msgstr "En conferencia"
 
-#: ../gtk/incall_view.c:702
-#, fuzzy
+#: ../gtk/incall_view.c:722
 msgid "<b>In call</b>"
-msgstr "<b>En llamada </b>"
+msgstr ""
 
-#: ../gtk/incall_view.c:738
-#, fuzzy
+#: ../gtk/incall_view.c:758
 msgid "<b>Paused call</b>"
-msgstr "<b>Llamada en pausa</b>"
+msgstr ""
 
-#: ../gtk/incall_view.c:751
+#: ../gtk/incall_view.c:771
 #, c-format
 msgid "%02i::%02i::%02i"
 msgstr "%02i::%02i::%02i"
 
-#: ../gtk/incall_view.c:772
-#, fuzzy
+#: ../gtk/incall_view.c:794
 msgid "<b>Call ended.</b>"
-msgstr "<b>Llamada finalizada.</b>"
+msgstr ""
 
-#: ../gtk/incall_view.c:803
+#: ../gtk/incall_view.c:825
 msgid "Transfer in progress"
 msgstr ""
 
-#: ../gtk/incall_view.c:806
-#, fuzzy
+#: ../gtk/incall_view.c:828
 msgid "Transfer done."
-msgstr "Transferir"
+msgstr ""
 
-#: ../gtk/incall_view.c:809
-#, fuzzy
+#: ../gtk/incall_view.c:831
 msgid "Transfer failed."
-msgstr "Transferir"
+msgstr ""
 
-#: ../gtk/incall_view.c:853
+#: ../gtk/incall_view.c:875
 msgid "Resume"
 msgstr "Reanudar"
 
-#: ../gtk/incall_view.c:860 ../gtk/main.ui.h:9
+#: ../gtk/incall_view.c:882 ../gtk/main.ui.h:9
 msgid "Pause"
 msgstr "Pausar"
 
-#: ../gtk/incall_view.c:926
+#: ../gtk/incall_view.c:948
 #, c-format
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
 msgstr ""
 
-#: ../gtk/incall_view.c:926
-#, fuzzy
+#: ../gtk/incall_view.c:948
 msgid "(Paused)"
-msgstr "Pausar"
+msgstr ""
 
 #: ../gtk/loginframe.c:88
 #, c-format
@@ -831,32 +763,26 @@ msgid "Too loud"
 msgstr ""
 
 #: ../gtk/audio_assistant.c:318
-#, fuzzy
 msgid ""
 "Welcome !\n"
 "This assistant will help you to configure audio settings for Linphone"
 msgstr ""
-"¡Bienvenido/a !\n"
-"Este asistente le ayudará a utilizar una cuenta SIP para sus llamadas."
 
 #: ../gtk/audio_assistant.c:328
-#, fuzzy
 msgid "Capture device"
-msgstr "Dispositivo de captura:"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:329
-#, fuzzy
 msgid "Recorded volume"
-msgstr "Fuente de grabación:"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:333
 msgid "No voice"
 msgstr ""
 
 #: ../gtk/audio_assistant.c:369
-#, fuzzy
 msgid "Playback device"
-msgstr "Dispositivo de reproducción:"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:370
 msgid "Play three beeps"
@@ -875,14 +801,12 @@ msgid "Let's start Linphone now"
 msgstr ""
 
 #: ../gtk/audio_assistant.c:496
-#, fuzzy
 msgid "Audio Assistant"
-msgstr "Asistente de configuración de cuenta"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:506 ../gtk/main.ui.h:31
-#, fuzzy
 msgid "Audio assistant"
-msgstr "Asistente de configuración de cuenta"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:511
 msgid "Mic Gain calibration"
@@ -897,19 +821,16 @@ msgid "Record and Play"
 msgstr ""
 
 #: ../gtk/main.ui.h:1
-#, fuzzy
 msgid "<b>Callee name</b>"
-msgstr "<b>Nombre del destinatario</b>"
+msgstr ""
 
 #: ../gtk/main.ui.h:2
-#, fuzzy
 msgid "Send"
-msgstr "Enviar"
+msgstr ""
 
 #: ../gtk/main.ui.h:3
-#, fuzzy
 msgid "End conference"
-msgstr "En conferencia"
+msgstr ""
 
 #: ../gtk/main.ui.h:7
 msgid "Record this call to an audio file"
@@ -928,14 +849,12 @@ msgid "Transfer"
 msgstr "Transferir"
 
 #: ../gtk/main.ui.h:14
-#, fuzzy
 msgid "In call"
-msgstr "En llamada "
+msgstr ""
 
 #: ../gtk/main.ui.h:15
-#, fuzzy
 msgid "Duration"
-msgstr "Duración"
+msgstr ""
 
 #: ../gtk/main.ui.h:16
 msgid "Call quality rating"
@@ -946,9 +865,8 @@ msgid "All users"
 msgstr "Todos los usuarios"
 
 #: ../gtk/main.ui.h:18
-#, fuzzy
 msgid "Online users"
-msgstr "Usuarios conectados"
+msgstr ""
 
 #: ../gtk/main.ui.h:19
 msgid "ADSL"
@@ -959,36 +877,32 @@ msgid "Fiber Channel"
 msgstr "Canal de Fibra"
 
 #: ../gtk/main.ui.h:21
-#, fuzzy
 msgid "Default"
-msgstr "Predeterminado"
+msgstr ""
 
 #: ../gtk/main.ui.h:22
 msgid "_Options"
 msgstr "_Opciones"
 
 #: ../gtk/main.ui.h:23
-#, fuzzy
 msgid "Set configuration URI"
-msgstr "Confirmación"
+msgstr ""
 
 #: ../gtk/main.ui.h:24
 msgid "Always start video"
 msgstr ""
 
 #: ../gtk/main.ui.h:25
-#, fuzzy
 msgid "Enable self-view"
-msgstr "Activar vista propia"
+msgstr ""
 
 #: ../gtk/main.ui.h:26
 msgid "_Help"
 msgstr "_Ayuda"
 
 #: ../gtk/main.ui.h:27
-#, fuzzy
 msgid "Show debug window"
-msgstr "Mostrar ventana de depuración"
+msgstr ""
 
 #: ../gtk/main.ui.h:28
 msgid "_Homepage"
@@ -999,57 +913,48 @@ msgid "Check _Updates"
 msgstr "Buscar_Actualizaciones"
 
 #: ../gtk/main.ui.h:30
-#, fuzzy
 msgid "Account assistant"
-msgstr "Asistente de configuración de cuenta"
+msgstr ""
 
 #: ../gtk/main.ui.h:32
-#, fuzzy
 msgid "SIP address or phone number:"
-msgstr "Dirección SIP o número de teléfono"
+msgstr ""
 
 #: ../gtk/main.ui.h:33
 msgid "Initiate a new call"
 msgstr "Iniciar nueva llamada"
 
 #: ../gtk/main.ui.h:34
-#, fuzzy
 msgid "Contacts"
-msgstr "Contactos"
+msgstr ""
 
 #: ../gtk/main.ui.h:35
 msgid "Search"
 msgstr "Buscar"
 
 #: ../gtk/main.ui.h:36
-#, fuzzy
 msgid "<b>Add contacts from directory</b>"
-msgstr "<b>Añadir contactos desde un directorio</b>"
+msgstr ""
 
 #: ../gtk/main.ui.h:37
-#, fuzzy
 msgid "Add contact"
-msgstr "Añadir contacto"
+msgstr ""
 
 #: ../gtk/main.ui.h:38
-#, fuzzy
 msgid "Recent calls"
-msgstr "Llamadas recientes "
+msgstr ""
 
 #: ../gtk/main.ui.h:39
-#, fuzzy
 msgid "My current identity:"
-msgstr "Mi identidad actual:"
+msgstr ""
 
 #: ../gtk/main.ui.h:40 ../gtk/tunnel_config.ui.h:7
-#, fuzzy
 msgid "Username"
-msgstr "Nombre de usuario"
+msgstr ""
 
 #: ../gtk/main.ui.h:41 ../gtk/tunnel_config.ui.h:8
-#, fuzzy
 msgid "Password"
-msgstr "Contraseña:"
+msgstr ""
 
 #: ../gtk/main.ui.h:42
 msgid "Internet connection:"
@@ -1064,37 +969,30 @@ msgid "UserID"
 msgstr "UserID"
 
 #: ../gtk/main.ui.h:45
-#, fuzzy
 msgid "Login information"
-msgstr "Datos de inicio de sesión"
+msgstr ""
 
 #: ../gtk/main.ui.h:46
-#, fuzzy
 msgid "<b>Welcome !</b>"
-msgstr "<b>¡Bienvenido/a!</b>"
+msgstr ""
 
 #: ../gtk/main.ui.h:47
 msgid "Delete"
 msgstr ""
 
 #: ../gtk/about.ui.h:1
-#, fuzzy
 msgid "About linphone"
-msgstr "Acerca de linphone"
+msgstr ""
 
 #: ../gtk/about.ui.h:2
-#, fuzzy
 msgid "(C) Belledonne Communications,2010\n"
-msgstr "(C) Belledonne Communications, 2010\n"
+msgstr ""
 
 #: ../gtk/about.ui.h:4
 msgid "An internet video phone using the standard SIP (rfc3261) protocol."
-msgstr ""
-"Un vídeo-teléfono a través de Internet que usa el protocolo estándar SIP "
-"(rfc3261)"
+msgstr "Un vídeo-teléfono a través de Internet que usa el protocolo estándar SIP (rfc3261)"
 
 #: ../gtk/about.ui.h:5
-#, fuzzy
 msgid ""
 "fr: Simon Morlat\n"
 "en: Simon Morlat and Delphine Perreau\n"
@@ -1109,22 +1007,10 @@ msgid ""
 "hu: anonymous\n"
 "he: Eli Zaretskii <eliz@gnu.org>\n"
 msgstr ""
-"fr: Simon Morlat\n"
-"en: Simon Morlat and Delphine Perreau\n"
-"it: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\n"
-"de: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\n"
-"sv: Daniel Nylander <po@danielnylander.se>\n"
-"es: Jesus Benitez <gnelson at inMail dot sk>\n"
-"ja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\n"
-"pt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\n"
-"pl: Robert Nasiadek <darkone@darkone.pl>\n"
-"cs: Petr Pisar <petr.pisar@atlas.cz>\n"
-"hu: anonymous\n"
 
 #: ../gtk/contact.ui.h:2
-#, fuzzy
 msgid "SIP Address"
-msgstr "Dirección SIP"
+msgstr ""
 
 #: ../gtk/contact.ui.h:3
 msgid "Show this contact presence status"
@@ -1135,23 +1021,20 @@ msgid "Allow this contact to see my presence status"
 msgstr "Permitir que este contacto vea mi estado de presencia"
 
 #: ../gtk/contact.ui.h:5
-#, fuzzy
 msgid "<b>Contact information</b>"
-msgstr "<b>Información de contacto</b>"
+msgstr ""
 
 #: ../gtk/log.ui.h:1
-#, fuzzy
 msgid "Linphone debug window"
-msgstr "Ventana de depuración de linphone"
+msgstr ""
 
 #: ../gtk/log.ui.h:2
 msgid "Scroll to end"
 msgstr ""
 
 #: ../gtk/password.ui.h:1
-#, fuzzy
 msgid "Linphone - Authentication required"
-msgstr "Linphone - Autenticación necesaria"
+msgstr ""
 
 #: ../gtk/password.ui.h:2
 msgid "Please enter the domain password"
@@ -1174,9 +1057,8 @@ msgid "Linphone - Configure a SIP account"
 msgstr "Linphone - Configurar una cuenta SIP"
 
 #: ../gtk/sip_account.ui.h:2
-#, fuzzy
 msgid "Your SIP identity:"
-msgstr "Su identidad SIP"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:3
 msgid "Looks like sip:<username>@<domain>"
@@ -1187,23 +1069,20 @@ msgid "sip:"
 msgstr "sip:"
 
 #: ../gtk/sip_account.ui.h:5
-#, fuzzy
 msgid "SIP Proxy address:"
-msgstr "Dirección del SIP Proxy"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:6
 msgid "Looks like sip:<proxy hostname>"
 msgstr "Del tipo sip:<proxy hostname>"
 
 #: ../gtk/sip_account.ui.h:7
-#, fuzzy
 msgid "Registration duration (sec):"
-msgstr "Duración del registro (seg):"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:8
-#, fuzzy
 msgid "Contact params (optional):"
-msgstr "Ruta (opcional):"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:9
 msgid "AVPF regular RTCP interval (sec):"
@@ -1214,23 +1093,20 @@ msgid "Route (optional):"
 msgstr "Ruta (opcional):"
 
 #: ../gtk/sip_account.ui.h:11
-#, fuzzy
 msgid "Transport"
-msgstr "<b>Transporte</b> "
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:12
 msgid "Register"
 msgstr "Registrarse"
 
 #: ../gtk/sip_account.ui.h:13
-#, fuzzy
 msgid "Publish presence information"
-msgstr "Publicar información de presencia"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:14
-#, fuzzy
 msgid "Enable AVPF"
-msgstr "Activar"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:15
 msgid "Configure a SIP account"
@@ -1265,14 +1141,12 @@ msgid "CIF"
 msgstr "CIF"
 
 #: ../gtk/parameters.ui.h:8
-#, fuzzy
 msgid "Audio codecs"
-msgstr "Códecs de Audio"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:9
-#, fuzzy
 msgid "Video codecs"
-msgstr "Códecs de Vídeo"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:10 ../gtk/keypad.ui.h:5
 msgid "C"
@@ -1307,9 +1181,8 @@ msgid "Use IPv6 instead of IPv4"
 msgstr "Utilizar IPv6 en lugar de IPv4"
 
 #: ../gtk/parameters.ui.h:18
-#, fuzzy
 msgid "<b>Transport</b>"
-msgstr "<b>Transporte</b> "
+msgstr ""
 
 #: ../gtk/parameters.ui.h:19
 msgid "Media encryption type"
@@ -1328,9 +1201,8 @@ msgid "Fixed"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:23
-#, fuzzy
 msgid "Media encryption is mandatory"
-msgstr "Tipo de cifrado de medios"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:24
 msgid "Tunnel"
@@ -1341,14 +1213,12 @@ msgid "DSCP fields"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:26
-#, fuzzy
 msgid "SIP/TCP port"
-msgstr "Puerto SIP"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:27
-#, fuzzy
 msgid "SIP/UDP port"
-msgstr "Puerto SIP"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:28
 msgid "<b>Network protocol and ports</b>"
@@ -1359,95 +1229,80 @@ msgid "Direct connection to the Internet"
 msgstr "Conexión directa a Internet"
 
 #: ../gtk/parameters.ui.h:30
-#, fuzzy
 msgid "Behind NAT / Firewall (specify gateway IP )"
-msgstr "Tras un NAT/Firewall (especificar la IP de la puerta de enlace debajo)"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:31
 msgid "Behind NAT / Firewall (use STUN to resolve)"
 msgstr "Tras un NAT/Firewall (utilizar STUN para resolver)"
 
 #: ../gtk/parameters.ui.h:32
-#, fuzzy
 msgid "Behind NAT / Firewall (use ICE)"
-msgstr "Tras un NAT/Firewall (utilizar STUN para resolver)"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:33
-#, fuzzy
 msgid "Behind NAT / Firewall (use uPnP)"
-msgstr "Tras un NAT/Firewall (utilizar STUN para resolver)"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:34
-#, fuzzy
 msgid "Public IP address:"
-msgstr "Dirección IP pública:"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:35
-#, fuzzy
 msgid "Stun server:"
-msgstr "Servidor STUN"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:36
-#, fuzzy
 msgid "<b>NAT and Firewall</b>"
-msgstr "<b>NAT y Firewall</b>"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:37
-#, fuzzy
 msgid "Network settings"
-msgstr "Configuración de red"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:38
-#, fuzzy
 msgid "Ring sound:"
-msgstr "Tono de llamada:"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:39
 msgid "ALSA special device (optional):"
 msgstr "Dispositivo especial ALSA (opcional):"
 
 #: ../gtk/parameters.ui.h:40
-#, fuzzy
 msgid "Capture device:"
-msgstr "Dispositivo de captura:"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:41
-#, fuzzy
 msgid "Ring device:"
-msgstr "Dispositivo de sonido:"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:42
-#, fuzzy
 msgid "Playback device:"
-msgstr "Dispositivo de reproducción:"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:43
 msgid "Enable echo cancellation"
 msgstr "Activar cancelación de eco"
 
 #: ../gtk/parameters.ui.h:44
-#, fuzzy
 msgid "<b>Audio</b>"
-msgstr "<b>Audio</b>"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:45
-#, fuzzy
 msgid "Video input device:"
-msgstr "Dispositivo de entrada de vídeo:"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:46
 msgid "Prefered video resolution:"
 msgstr "Resolución de vídeo preferida:"
 
 #: ../gtk/parameters.ui.h:47
-#, fuzzy
 msgid "Video output method:"
-msgstr "Dispositivo de entrada de vídeo:"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:48
-#, fuzzy
 msgid "<b>Video</b>"
-msgstr "<b>Vídeo</b> "
+msgstr ""
 
 #: ../gtk/parameters.ui.h:49
 msgid "Multimedia settings"
@@ -1462,19 +1317,16 @@ msgid "Your display name (eg: John Doe):"
 msgstr "Su nombre a mostrar (x ej: Pepito Pérez):"
 
 #: ../gtk/parameters.ui.h:52
-#, fuzzy
 msgid "Your username:"
-msgstr "Su nombre de usuario:"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:53
-#, fuzzy
 msgid "Your resulting SIP address:"
-msgstr "Su dirección SIP resultante:"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:54
-#, fuzzy
 msgid "<b>Default identity</b>"
-msgstr "<b>Identidad predeterminada</b>"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:55
 msgid "Wizard"
@@ -1493,18 +1345,16 @@ msgid "Remove"
 msgstr "Eliminar"
 
 #: ../gtk/parameters.ui.h:59
-#, fuzzy
 msgid "<b>Proxy accounts</b>"
-msgstr "<b>Cuentas Proxy</b>"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:60
 msgid "Erase all passwords"
 msgstr "Borrar todas las contraseñas"
 
 #: ../gtk/parameters.ui.h:61
-#, fuzzy
 msgid "<b>Privacy</b>"
-msgstr "<b>Privacidad</b>"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:62
 msgid "Manage SIP Accounts"
@@ -1519,9 +1369,8 @@ msgid "Disable"
 msgstr "Desactivar"
 
 #: ../gtk/parameters.ui.h:65
-#, fuzzy
 msgid "<b>Codecs</b>"
-msgstr "<b>Códecs</b>"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:66
 msgid "0 stands for \"unlimited\""
@@ -1543,107 +1392,91 @@ msgstr "Activar control de frecuencia adaptativo"
 msgid ""
 "<i>Adaptive rate control is a technique to dynamically guess the available "
 "bandwidth during a call.</i>"
-msgstr ""
-"<i>Control de frecuencia adaptativo es una técnica que estima dinámicamente "
-"el ancho de banda disponible durante la llamada.</i>"
+msgstr "<i>Control de frecuencia adaptativo es una técnica que estima dinámicamente el ancho de banda disponible durante la llamada.</i>"
 
 #: ../gtk/parameters.ui.h:71
 msgid "<b>Bandwidth control</b>"
 msgstr "<b>Control de ancho de banda</b>"
 
 #: ../gtk/parameters.ui.h:72
-#, fuzzy
 msgid "Codecs"
-msgstr "Códecs"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:73
-#, fuzzy
 msgid "<b>Language</b>"
-msgstr "<b>Idioma</b>"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:74
 msgid "Show advanced settings"
 msgstr "Mostrar opciones avanzadas"
 
 #: ../gtk/parameters.ui.h:75
-#, fuzzy
 msgid "<b>Level</b>"
-msgstr "<b>Nivel</b>"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:76
-#, fuzzy
 msgid "User interface"
-msgstr "Interfaz de Usuario"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:77 ../gtk/ldap.ui.h:2
-#, fuzzy
 msgid "Server address:"
-msgstr "Dirección del Servidor:"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:78 ../gtk/ldap.ui.h:3
-#, fuzzy
 msgid "Authentication method:"
-msgstr "Error de autenticación"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:80
 msgid "label"
 msgstr "etiqueta"
 
 #: ../gtk/parameters.ui.h:81
-#, fuzzy
 msgid "<b>LDAP Account setup</b>"
-msgstr "<b>Cuentas Proxy</b>"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:82
 msgid "LDAP"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:83
-#, fuzzy
 msgid "Done"
-msgstr "Hecho"
+msgstr ""
 
 #: ../gtk/buddylookup.ui.h:1
-#, fuzzy
 msgid "Search contacts in directory"
-msgstr "Buscar contactos en directorio"
+msgstr ""
 
 #: ../gtk/buddylookup.ui.h:2
 msgid "Add to my list"
 msgstr "Añadir a mi lista"
 
 #: ../gtk/buddylookup.ui.h:3
-#, fuzzy
 msgid "<b>Search somebody</b>"
-msgstr "<b>Buscar a alguien</b>"
+msgstr ""
 
 #: ../gtk/waiting.ui.h:1
-#, fuzzy
 msgid "Linphone"
-msgstr "Linphone"
+msgstr ""
 
 #: ../gtk/waiting.ui.h:2
 msgid "Please wait"
 msgstr "Espere por favor"
 
 #: ../gtk/dscp_settings.ui.h:1
-#, fuzzy
 msgid "DSCP settings"
-msgstr "Configuración"
+msgstr ""
 
 #: ../gtk/dscp_settings.ui.h:2
 msgid "SIP"
 msgstr "SIP"
 
 #: ../gtk/dscp_settings.ui.h:3
-#, fuzzy
 msgid "Audio RTP stream"
-msgstr "Audio RTP/UDP:"
+msgstr ""
 
 #: ../gtk/dscp_settings.ui.h:4
-#, fuzzy
 msgid "Video RTP stream"
-msgstr "Vídeo RTP/UDP"
+msgstr ""
 
 #: ../gtk/dscp_settings.ui.h:5
 msgid "<b>Set DSCP values (in hexadecimal)</b>"
@@ -1654,14 +1487,12 @@ msgid "Call statistics"
 msgstr ""
 
 #: ../gtk/call_statistics.ui.h:2
-#, fuzzy
 msgid "Audio codec"
-msgstr "Códecs de Audio"
+msgstr ""
 
 #: ../gtk/call_statistics.ui.h:3
-#, fuzzy
 msgid "Video codec"
-msgstr "Códecs de Vídeo"
+msgstr ""
 
 #: ../gtk/call_statistics.ui.h:4
 msgid "Audio IP bandwidth usage"
@@ -1680,32 +1511,28 @@ msgid "Video Media connectivity"
 msgstr ""
 
 #: ../gtk/call_statistics.ui.h:8
-#, fuzzy
 msgid "Round trip time"
-msgstr "Propiedades de sonido"
+msgstr ""
 
 #: ../gtk/call_statistics.ui.h:9
 msgid "Video resolution received"
 msgstr ""
 
 #: ../gtk/call_statistics.ui.h:10
-#, fuzzy
 msgid "Video resolution sent"
-msgstr "Resolución de vídeo preferida:"
+msgstr ""
 
 #: ../gtk/call_statistics.ui.h:11
 msgid "RTP profile"
 msgstr ""
 
 #: ../gtk/call_statistics.ui.h:12
-#, fuzzy
 msgid "<b>Call statistics and information</b>"
-msgstr "<b>Información de contacto</b>"
+msgstr ""
 
 #: ../gtk/tunnel_config.ui.h:1
-#, fuzzy
 msgid "Configure VoIP tunnel"
-msgstr "Configurar una cuenta SIP"
+msgstr ""
 
 #: ../gtk/tunnel_config.ui.h:2
 msgid "Host"
@@ -1784,23 +1611,20 @@ msgid "1"
 msgstr "1"
 
 #: ../gtk/ldap.ui.h:1
-#, fuzzy
 msgid "LDAP Settings"
-msgstr "Configuración"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:6
 msgid "Use TLS Connection"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:7
-#, fuzzy
 msgid "Not yet available"
-msgstr "no disponible"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:8
-#, fuzzy
 msgid "<b>Connection</b>"
-msgstr "<b>Códecs</b>"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:9
 msgid "Bind DN"
@@ -1815,9 +1639,8 @@ msgid "Realm"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:12
-#, fuzzy
 msgid "<b>SASL</b>"
-msgstr "<b>Audio</b>"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:13
 msgid "Base object:"
@@ -1833,18 +1656,16 @@ msgid "Name Attribute:"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:17
-#, fuzzy
 msgid "SIP address attribute:"
-msgstr "Dirección SIP"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:18
 msgid "Attributes to query:"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:19
-#, fuzzy
 msgid "<b>Search</b>"
-msgstr "<b>Buscar a alguien</b>"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:20
 msgid "Timeout for search:"
@@ -1859,9 +1680,8 @@ msgid "Follow Aliases"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:23
-#, fuzzy
 msgid "<b>Miscellaneous</b>"
-msgstr "<b>Vídeo</b> "
+msgstr ""
 
 #: ../gtk/ldap.ui.h:24
 msgid "ANONYMOUS"
@@ -1885,11 +1705,8 @@ msgstr ""
 
 #: ../gtk/config-uri.ui.h:2
 msgid ""
-"This dialog allows to set an http or https address when configuration is to "
-"be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, "
-"Linphone will restart automatically in order to fetch and take into account "
-"the new configuration. "
+"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
 msgstr ""
 
 #: ../gtk/config-uri.ui.h:4
@@ -1897,93 +1714,85 @@ msgid "https://"
 msgstr ""
 
 #: ../gtk/provisioning-fetch.ui.h:1
-#, fuzzy
 msgid "Configuring..."
-msgstr "Conectando..."
+msgstr ""
 
 #: ../gtk/provisioning-fetch.ui.h:2
 msgid "Please wait while fetching configuration from server..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1034
-#, fuzzy
+#: ../coreapi/linphonecore.c:1511
 msgid "Ready"
-msgstr "Preparado"
+msgstr ""
 
-#: ../coreapi/linphonecore.c:1967
-#, fuzzy
+#: ../coreapi/linphonecore.c:2470
 msgid "Configuring"
-msgstr "Confirmación"
+msgstr ""
 
-#: ../coreapi/linphonecore.c:2133
+#: ../coreapi/linphonecore.c:2635
 msgid "Looking for telephone number destination..."
 msgstr "Buscando el número de teléfono del destinatario…"
 
-#: ../coreapi/linphonecore.c:2136
+#: ../coreapi/linphonecore.c:2637
 msgid "Could not resolve this number."
 msgstr "No se ha podido resolver este número."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2418
-#, fuzzy
+#: ../coreapi/linphonecore.c:2919
 msgid "Contacting"
-msgstr "Contactando"
+msgstr ""
 
-#: ../coreapi/linphonecore.c:2425
-#, fuzzy
+#: ../coreapi/linphonecore.c:2924
 msgid "Could not call"
-msgstr "No se pudo llamar"
+msgstr ""
 
-#: ../coreapi/linphonecore.c:2576
+#: ../coreapi/linphonecore.c:3074
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "Disculpe, se ha alcanzado el máximo número de llamadas simultáneas"
 
-#: ../coreapi/linphonecore.c:2745
-#, fuzzy
+#: ../coreapi/linphonecore.c:3233
 msgid "is contacting you"
-msgstr "le está llamando"
+msgstr ""
 
-#: ../coreapi/linphonecore.c:2746
+#: ../coreapi/linphonecore.c:3234
 msgid " and asked autoanswer."
 msgstr "y ha solicitado auto respuesta."
 
-#: ../coreapi/linphonecore.c:2746
+#: ../coreapi/linphonecore.c:3234
 msgid "."
 msgstr "."
 
-#: ../coreapi/linphonecore.c:2865
+#: ../coreapi/linphonecore.c:3352
 msgid "Modifying call parameters..."
 msgstr "Modificando parámetros de llamada…"
 
-#: ../coreapi/linphonecore.c:3194
+#: ../coreapi/linphonecore.c:3700
 msgid "Connected."
 msgstr "Conectado."
 
-#: ../coreapi/linphonecore.c:3220
-#, fuzzy
+#: ../coreapi/linphonecore.c:3725
 msgid "Call aborted"
-msgstr "Llamada abortada"
+msgstr ""
 
-#: ../coreapi/linphonecore.c:3412
+#: ../coreapi/linphonecore.c:3915
 msgid "Could not pause the call"
 msgstr "No se pudo pausar la llamada"
 
-#: ../coreapi/linphonecore.c:3417
+#: ../coreapi/linphonecore.c:3919
 msgid "Pausing the current call..."
 msgstr "Pausando la llamada actual..."
 
-#: ../coreapi/misc.c:425
+#: ../coreapi/misc.c:438
 msgid "Stun lookup in progress..."
 msgstr "Búsqueda STUN en proceso…"
 
-#: ../coreapi/misc.c:607
+#: ../coreapi/misc.c:619
 msgid "ICE local candidates gathering in progress..."
 msgstr ""
 
 #: ../coreapi/friend.c:33
-#, fuzzy
 msgid "Online"
-msgstr "Conectado"
+msgstr ""
 
 #: ../coreapi/friend.c:36
 msgid "Busy"
@@ -1998,9 +1807,8 @@ msgid "Away"
 msgstr "Ausente"
 
 #: ../coreapi/friend.c:45
-#, fuzzy
 msgid "On the phone"
-msgstr "Al teléfono"
+msgstr ""
 
 #: ../coreapi/friend.c:48
 msgid "Out to lunch"
@@ -2011,776 +1819,163 @@ msgid "Do not disturb"
 msgstr "No molestar"
 
 #: ../coreapi/friend.c:54
-#, fuzzy
 msgid "Moved"
-msgstr "Fuera"
+msgstr ""
 
 #: ../coreapi/friend.c:57
 msgid "Using another messaging service"
 msgstr "Utilizando otro servicio de mensajería"
 
 #: ../coreapi/friend.c:60
-#, fuzzy
 msgid "Offline"
-msgstr "Desconectado"
+msgstr ""
 
 #: ../coreapi/friend.c:63
 msgid "Pending"
 msgstr "Pendiente"
 
 #: ../coreapi/friend.c:66
-#, fuzzy
 msgid "Vacation"
-msgstr "Duración"
+msgstr ""
 
 #: ../coreapi/friend.c:68
 msgid "Unknown-bug"
 msgstr "Bug-desconocido"
 
-#: ../coreapi/proxy.c:314
+#: ../coreapi/proxy.c:319
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
-msgstr ""
-"La dirección del Proxy SIP que ha introducido no es válida, debe empezar con "
-"\"sip:\" seguido del hostname."
+msgstr "La dirección del Proxy SIP que ha introducido no es válida, debe empezar con \"sip:\" seguido del hostname."
 
-#: ../coreapi/proxy.c:320
+#: ../coreapi/proxy.c:325
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
-msgstr ""
-"La identidad SIP que ha introducido no es válida.\n"
-"Debe ser del tipo sip:username@proxydomain, como por ejemplo sip:"
-"alice@example.net"
+msgstr "La identidad SIP que ha introducido no es válida.\nDebe ser del tipo sip:username@proxydomain, como por ejemplo sip:alice@example.net"
 
-#: ../coreapi/proxy.c:1369
-#, fuzzy, c-format
+#: ../coreapi/proxy.c:1377
+#, c-format
 msgid "Could not login as %s"
-msgstr "No se pudo iniciar sesión como %s"
+msgstr ""
 
-#: ../coreapi/callbacks.c:355
-#, fuzzy
+#: ../coreapi/callbacks.c:383
 msgid "Remote ringing."
-msgstr "El destinatario está sonando..."
+msgstr ""
 
-#: ../coreapi/callbacks.c:373
-#, fuzzy
+#: ../coreapi/callbacks.c:404
 msgid "Remote ringing..."
-msgstr "El destinatario está sonando..."
+msgstr ""
 
-#: ../coreapi/callbacks.c:384
+#: ../coreapi/callbacks.c:414
 msgid "Early media."
 msgstr "Medios iniciales."
 
-#: ../coreapi/callbacks.c:435
+#: ../coreapi/callbacks.c:475
 #, c-format
 msgid "Call with %s is paused."
 msgstr "La llamada con %s está puesta en pausa."
 
-#: ../coreapi/callbacks.c:448
+#: ../coreapi/callbacks.c:488
 #, c-format
 msgid "Call answered by %s - on hold."
 msgstr "Llamada respondida por %s - en espera."
 
-#: ../coreapi/callbacks.c:459
-#, fuzzy
+#: ../coreapi/callbacks.c:498
 msgid "Call resumed."
-msgstr "Llamada reanudada."
+msgstr ""
 
-#: ../coreapi/callbacks.c:464
-#, fuzzy, c-format
+#: ../coreapi/callbacks.c:502
+#, c-format
 msgid "Call answered by %s."
-msgstr "Llamada respondida por %s."
+msgstr ""
 
-#: ../coreapi/callbacks.c:483
+#: ../coreapi/callbacks.c:525
 msgid "Incompatible, check codecs or security settings..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:512
-#, fuzzy
-msgid "We have been resumed."
-msgstr "Nos han reanudado..."
+#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:826
+msgid "Incompatible media parameters."
+msgstr ""
 
-#: ../coreapi/callbacks.c:521
+#: ../coreapi/callbacks.c:560
+msgid "We have been resumed."
+msgstr ""
+
+#. we are being paused
+#: ../coreapi/callbacks.c:568
 msgid "We are paused by other party."
 msgstr ""
 
-#: ../coreapi/callbacks.c:556
-#, fuzzy
+#. reINVITE and in-dialogs UPDATE go here
+#: ../coreapi/callbacks.c:602
 msgid "Call is updated by remote."
-msgstr "La llamada ha sido actualizada por el destinatario..."
+msgstr ""
 
-#: ../coreapi/callbacks.c:658
-#, fuzzy
+#: ../coreapi/callbacks.c:705
 msgid "Call terminated."
-msgstr "Llamada finalizada."
+msgstr ""
 
-#: ../coreapi/callbacks.c:687
+#: ../coreapi/callbacks.c:733
 msgid "User is busy."
 msgstr "El usuario está ocupado."
 
-#: ../coreapi/callbacks.c:688
+#: ../coreapi/callbacks.c:734
 msgid "User is temporarily unavailable."
 msgstr "El usuario no está disponible temporalmente."
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:690
+#: ../coreapi/callbacks.c:736
 msgid "User does not want to be disturbed."
 msgstr "El usuario no quiere que le molesten."
 
-#: ../coreapi/callbacks.c:691
+#: ../coreapi/callbacks.c:737
 msgid "Call declined."
 msgstr "Llamada rechazada."
 
-#: ../coreapi/callbacks.c:706
+#: ../coreapi/callbacks.c:752
 msgid "Request timeout."
 msgstr ""
 
-#: ../coreapi/callbacks.c:737
+#: ../coreapi/callbacks.c:780
 msgid "Redirected"
 msgstr "Redigirida"
 
-#: ../coreapi/callbacks.c:787
-msgid "Incompatible media parameters."
+#: ../coreapi/callbacks.c:835
+msgid "Call failed."
 msgstr ""
 
-#: ../coreapi/callbacks.c:798
-#, fuzzy
-msgid "Call failed."
-msgstr "La llamada ha fallado."
-
-#: ../coreapi/callbacks.c:878
-#, fuzzy, c-format
+#: ../coreapi/callbacks.c:913
+#, c-format
 msgid "Registration on %s successful."
-msgstr "Se ha registrado con éxito en %s."
+msgstr ""
 
-#: ../coreapi/callbacks.c:879
-#, fuzzy, c-format
+#: ../coreapi/callbacks.c:914
+#, c-format
 msgid "Unregistration on %s done."
-msgstr "Cancelación de registro en %s completada."
+msgstr ""
 
-#: ../coreapi/callbacks.c:897
+#: ../coreapi/callbacks.c:932
 msgid "no response timeout"
 msgstr "timeout sin respuesta"
 
-#: ../coreapi/callbacks.c:900
-#, fuzzy, c-format
+#: ../coreapi/callbacks.c:935
+#, c-format
 msgid "Registration on %s failed: %s"
-msgstr "El registro en %s ha fallado."
+msgstr ""
 
-#: ../coreapi/callbacks.c:907
+#: ../coreapi/callbacks.c:942
 msgid "Service unavailable, retrying"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:177
-#, fuzzy, c-format
+#: ../coreapi/linphonecall.c:174
+#, c-format
 msgid "Authentication token is %s"
-msgstr "El tóken de autenticación es%s"
+msgstr ""
 
-#: ../coreapi/linphonecall.c:2932
+#: ../coreapi/linphonecall.c:3020
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
 msgstr[0] "Tiene %i llamada perdida."
 msgstr[1] "Tiene %i llamadas perdidas."
-
-#~ msgid "aborted"
-#~ msgstr "abortada"
-
-#~ msgid "completed"
-#~ msgstr "completada"
-
-#~ msgid "missed"
-#~ msgstr "perdida"
-
-#~ msgid ""
-#~ "%s at %s\n"
-#~ "From: %s\n"
-#~ "To: %s\n"
-#~ "Status: %s\n"
-#~ "Duration: %i mn %i sec\n"
-#~ msgstr ""
-#~ "%s en %s\n"
-#~ "De: %s\n"
-#~ "Para: %s\n"
-#~ "Estado: %s\n"
-#~ "Duración: %i min %i seg\n"
-
-#~ msgid "Outgoing call"
-#~ msgstr "Llamada saliente"
-
-#~ msgid "No response."
-#~ msgstr "No hay respuesta."
-
-#~ msgid "Protocol error."
-#~ msgstr "Error de protocolo."
-
-#, fuzzy
-#~ msgid ""
-#~ "Could not parse given sip address. A sip url usually looks like sip:"
-#~ "user@domain"
-#~ msgstr ""
-#~ "Dirección SIP mal escrita. Una dirección SIP es del tipo <sip:"
-#~ "username@domainname>"
-
-#~ msgid ""
-#~ "Your computer appears to be using ALSA sound drivers.\n"
-#~ "This is the best choice. However the pcm oss emulation module\n"
-#~ "is missing and linphone needs it. Please execute\n"
-#~ "'modprobe snd-pcm-oss' as root to load it."
-#~ msgstr ""
-#~ "Tu ordenador parece estar usando los controladores de sonido de ALSA.\n"
-#~ "Ésta es la mejor elección. Sin embargo, el módulo de emulación pcm de "
-#~ "OSS\n"
-#~ "no se encuentra y linphone lo necesita. Por favor ejecute\n"
-#~ "'modprobe snd-pcm-oss' como root para cargarlo."
-
-#~ msgid ""
-#~ "Your computer appears to be using ALSA sound drivers.\n"
-#~ "This is the best choice. However the mixer oss emulation module\n"
-#~ "is missing and linphone needs it. Please execute\n"
-#~ " 'modprobe snd-mixer-oss' as root to load it."
-#~ msgstr ""
-#~ "Tu ordenador parece estar usando los controladores de sonido de ALSA.\n"
-#~ "Ésta es la mejor elección. Sin embargo, el módulo de emulación mixer de "
-#~ "OSS\n"
-#~ "no se encuentra y linphone lo necesita. Por favor ejecute\n"
-#~ " 'modprobe snd-mixer-oss' como root para cargarlo."
-
-#~ msgid "Chat with %s"
-#~ msgstr "Conversación con %s"
-
-#~ msgid "<span size=\"large\">by %s</span>"
-#~ msgstr "<span size=\"large\">por %s</span>"
-
-#~ msgid "Please choose a username:"
-#~ msgstr "Por favor, elija un nombre de usuario"
-
-#~ msgid "Checking if '%s' is available..."
-#~ msgstr "Comprobando si '%s' está disponible..."
-
-#~ msgid "Please wait..."
-#~ msgstr "Espere por favor..."
-
-#~ msgid "Sorry this username already exists. Please try a new one."
-#~ msgstr ""
-#~ "El nombre de usuario elegido ya existe. Por favor, intente con uno nuevo."
-
-#~ msgid "Ok !"
-#~ msgstr "¡Ok!"
-
-#~ msgid "Communication problem, please try again later."
-#~ msgstr ""
-#~ "Error en la comunicación, por favor inténtelo de nuevo más adelante."
-
-#~ msgid "Choosing a username"
-#~ msgstr "Eligiendo un nombre de usuario"
-
-#~ msgid "Verifying"
-#~ msgstr "Verificando"
-
-#~ msgid "Creating your account"
-#~ msgstr "Creando su cuenta"
-
-#~ msgid "Now ready !"
-#~ msgstr "¡Ya está listo!"
-
-#, fuzzy
-#~ msgid "Enable video"
-#~ msgstr "Activar vídeo"
-
-#~ msgid "Enter username, phone number, or full sip address"
-#~ msgstr "Introducir nombre de usuario, teléfono o dirección SIP"
-
-#~ msgid "Keypad"
-#~ msgstr "Teclado Numérico"
-
-#~ msgid "Lookup:"
-#~ msgstr "Búsqueda:"
-
-#~ msgid "in"
-#~ msgstr "en"
-
-#~ msgid ""
-#~ "Register to FONICS\n"
-#~ "virtual network !"
-#~ msgstr ""
-#~ "¡Registrar en la red\n"
-#~ "virtual FONICS!"
-
-#~ msgid "We are being paused..."
-#~ msgstr "Nos están poniendo en pausa..."
-
-#~ msgid "No common codecs"
-#~ msgstr "No hay códecs comunes"
-
-#, fuzzy
-#~ msgid "<b>Contact list</b>"
-#~ msgstr "<b>Lista de contactos</b> "
-
-#, fuzzy
-#~ msgid "Audio & video"
-#~ msgstr "Audio & Vídeo"
-
-#, fuzzy
-#~ msgid "Audio only"
-#~ msgstr "Sólo audio"
-
-#, fuzzy
-#~ msgid "Duration:"
-#~ msgstr "Duración:"
-
-#, fuzzy
-#~ msgid "_Linphone"
-#~ msgstr "_Linphone"
-
-#, fuzzy
-#~ msgid "gtk-cancel"
-#~ msgstr "gtk-cancelar"
-
-#, fuzzy
-#~ msgid "gtk-ok"
-#~ msgstr "gtk-ok"
-
-#, fuzzy
-#~ msgid "gtk-close"
-#~ msgstr "gtk-cerrar."
-
-#, fuzzy
-#~ msgid "_Modes"
-#~ msgstr "_Modos"
-
-#, fuzzy
-#~ msgid ""
-#~ "Audio codecs\n"
-#~ "Video codecs"
-#~ msgstr ""
-#~ "Códecs de audio\n"
-#~ "Códecs de vídeo"
-
-#, fuzzy
-#~ msgid "Request Cancelled."
-#~ msgstr "Petición cancelada."
-
-#~ msgid "User cannot be found at given address."
-#~ msgstr "No se encontró ningún usuario en la dirección indicada."
-
-#~ msgid "Remote user cannot support any of proposed codecs."
-#~ msgstr "El usuario remoto no soporta ninguno de los códecs propuestos."
-
-#~ msgid "Timeout."
-#~ msgstr "Tiempo agotado."
-
-#~ msgid "Remote host was found but refused connection."
-#~ msgstr "Se encontró  el host remoto pero rechazó la conexión."
-
-#~ msgid ""
-#~ "User is not reachable at the moment but he invites you\n"
-#~ "to contact him using the following alternate resource:"
-#~ msgstr ""
-#~ "El usuario no está disponible en este momento pero le invita\n"
-#~ "a contactarle usando el siguiente recurso alternativo:"
-
-#, fuzzy
-#~ msgid "Gone"
-#~ msgstr "Ausente"
-
-#, fuzzy
-#~ msgid "Display filters"
-#~ msgstr "Filtros a mostrar"
-
-#, fuzzy
-#~ msgid "_Properties"
-#~ msgstr "_Propiedades"
-
-#, fuzzy
-#~ msgid "Proxy in use"
-#~ msgstr "Proxy en uso"
-
-#~ msgid "Sound"
-#~ msgstr "Sonido"
-
-#, fuzzy
-#~ msgid "Proxy accounts"
-#~ msgstr "Cuentas Proxy"
-
-#~ msgid "Address book"
-#~ msgstr "Agenda"
-
-#, fuzzy
-#~ msgid "Shows the address book"
-#~ msgstr "Muestra la agenda"
-
-#~ msgid "Show more..."
-#~ msgstr "Mostrar más..."
-
-#~ msgid "Playback level:"
-#~ msgstr "Nivel de reproducción:"
-
-#~ msgid "Recording level:"
-#~ msgstr "Nivel de Grabación:"
-
-#, fuzzy
-#~ msgid "Ring level:"
-#~ msgstr "Nivel de tono de llamada:"
-
-#~ msgid "Reachable"
-#~ msgstr "Disponible"
-
-#~ msgid "Busy, I'll be back in "
-#~ msgstr "Ocupado, estaré de vuelta en "
-
-#~ msgid "The other party will be informed that you'll be back in X minutes"
-#~ msgstr ""
-#~ "Se le comunicará a la otra persona que estará de vuelta en X minutos"
-
-#~ msgid "mn"
-#~ msgstr "min"
-
-#~ msgid "Moved temporarily"
-#~ msgstr "Vengo enseguida"
-
-#~ msgid "Alternative service"
-#~ msgstr "Servicio alternativo"
-
-#~ msgid "URL:"
-#~ msgstr "URL:"
-
-#~ msgid "Presence"
-#~ msgstr "Presencia"
-
-#~ msgid "Press digits to send DTMFs."
-#~ msgstr "Pulsa los dígitos para mandar DTMFs."
-
-#~ msgid "DTMF"
-#~ msgstr "DTMF"
-
-#~ msgid ""
-#~ "Linphone is a web-phone.\n"
-#~ "It is compatible with SIP and RTP protocols."
-#~ msgstr ""
-#~ "Linphone es un teléfono web.\n"
-#~ "Es compatible con los protocolos SIP y RTP."
-
-#, fuzzy
-#~ msgid "Use IPv6 network (if available)"
-#~ msgstr "Utilizar red IPv6 (si está disponible)"
-
-#, fuzzy
-#~ msgid ""
-#~ "These options is only for users in a private network, behind a gateway. "
-#~ "If you are not in this situation, then leave this empty."
-#~ msgstr ""
-#~ "Esta opción es sólo para usuarios de una red privada, tras una puerta de "
-#~ "enlace.Si no es su caso, deje esto vacío."
-
-#, fuzzy
-#~ msgid "NAT traversal options (experimental)"
-#~ msgstr "Opciones para NAT transversal (experimental)"
-
-#, fuzzy
-#~ msgid "Number of buffered miliseconds (jitter compensation):"
-#~ msgstr "Número de milisegundos en el buffer (compensación jitter):"
-
-#~ msgid "RTP port used for audio:"
-#~ msgstr "Puerto RTP usado para audio:"
-
-#~ msgid "micro"
-#~ msgstr "micrófono"
-
-#~ msgid "Run sip user agent on port:"
-#~ msgstr "Ejecutar el agente de usuario SIP en el puerto:"
-
-#~ msgid "It is strongly recommended to use port 5060."
-#~ msgstr "Se recomienda encarecidamente usar el puerto 5060."
-
-#~ msgid "@"
-#~ msgstr "@"
-
-#~ msgid "Identity"
-#~ msgstr "Identidad"
-
-#, fuzzy
-#~ msgid "Add proxy/registrar"
-#~ msgstr "Añadir proxy/registrador"
-
-#~ msgid "Remote services"
-#~ msgstr "Servicios remotos"
-
-#~ msgid "List of audio codecs, in order of preference:"
-#~ msgstr "Lista de códecs de audio, en orden de preferencia:"
-
-#~ msgid ""
-#~ "Note: Codecs in red are not usable according to your connection type to "
-#~ "the internet."
-#~ msgstr ""
-#~ "Nota: Los códecs en ROJO no son adecuados para su conexión a Internet."
-
-#, fuzzy
-#~ msgid "No information available"
-#~ msgstr "Información no disponible"
-
-#, fuzzy
-#~ msgid "Codec information"
-#~ msgstr "Información de códec"
-
-#~ msgid "Address Book"
-#~ msgstr "Agenda"
-
-#~ msgid "Select"
-#~ msgstr "Seleccionar"
-
-#~ msgid ""
-#~ "User is not reachable at the moment but he invites you to contact him "
-#~ "using the following alternate resource:"
-#~ msgstr ""
-#~ "El usuario no está disponible en este momento pero le invita a "
-#~ "contactarle usando el siguiente recurso alternativo:"
-
-#~ msgid "None."
-#~ msgstr "Ninguno."
-
-#, fuzzy
-#~ msgid "Name:"
-#~ msgstr "Nombre:"
-
-#, fuzzy
-#~ msgid "Bad sip address: a sip address looks like sip:user@domain"
-#~ msgstr ""
-#~ "Dirección SIP mal escrita. Una dirección SIP es del tipo <sip:"
-#~ "username@domainname>"
-
-#~ msgid "Communication ended."
-#~ msgstr "Comunicación finalizada."
-
-#, fuzzy
-#~ msgid "Firewall 's external ip address (in dot notations):"
-#~ msgstr "Dirección IP del cortafuegos (en notación con puntos):"
-
-#~ msgid "Index"
-#~ msgstr "Índice"
-
-#~ msgid "28k modem"
-#~ msgstr "módem 28k"
-
-#~ msgid "56k modem"
-#~ msgstr "módem 56k"
-
-#~ msgid "64k modem (numeris)"
-#~ msgstr "módem 64k (numeris)"
-
-#~ msgid "ADSL or Cable modem"
-#~ msgstr "ADSL o Cable"
-
-#~ msgid "Ethernet or equivalent"
-#~ msgstr "Ethernet o equivalente"
-
-#~ msgid "Connection type:"
-#~ msgstr "Tipo de conexión:"
-
-#, fuzzy
-#~ msgid ""
-#~ "Linphone could not open audio device %s. Check if your sound card is "
-#~ "fully configured and working."
-#~ msgstr ""
-#~ "Linphone no pudo abrir el dispositivo de audio %s. Compruebe que su "
-#~ "tarjeta de sonido está completamente configurada y operativa."
-
-#~ msgid "Type here the sip address of the person you want to call."
-#~ msgstr "Escriba aquí la dirección SIP del destinatario."
-
-#~ msgid ""
-#~ "Release or\n"
-#~ "Refuse"
-#~ msgstr ""
-#~ "Descolgar o\n"
-#~ "Rechazar"
-
-#~ msgid "%s. Retry after %i minute(s)."
-#~ msgstr "%s. Reintentar tras %i minutos."
-
-#, fuzzy
-#~ msgid "Timeout..."
-#~ msgstr "Tiempo agotado..."
-
-#~ msgid "Toggle this if you want to be registered on a remote server."
-#~ msgstr "Marque esta opción si desea registrarse en un servidor remoto."
-
-#~ msgid "Address of record:"
-#~ msgstr "Dirección de registro:"
-
-#~ msgid ""
-#~ "The password used for registration. On some servers it is not necessary"
-#~ msgstr ""
-#~ "La contraseña usada para registrarse. En algunos servidores no es "
-#~ "necesaria"
-
-#~ msgid "Use this registrar server as outbound proxy."
-#~ msgstr "Usar este servidor de registro como proxy de salida."
-
-#~ msgid "sip address:"
-#~ msgstr "Dirección SIP:"
-
-#~ msgid "Modify"
-#~ msgstr "Modificar"
-
-#~ msgid ""
-#~ "You are currently using the i810_audio driver.\n"
-#~ "This driver is buggy and so does not work with Linphone.\n"
-#~ "We suggest that you replace it by its equivalent ALSA driver,\n"
-#~ "either with packages from your distribution, or by downloading\n"
-#~ "ALSA drivers at http://www.alsa-project.org."
-#~ msgstr ""
-#~ "Está usando actualmente el controlador i810_audio.\n"
-#~ "Este controlador tiene errores y por tanto no funciona con Linphone.\n"
-#~ "Le recomendamos que lo sustituya por el controlador equivalente de ALSA,\n"
-#~ "ya sea mediante paquetes de su distribución, o descargando\n"
-#~ "controladores ALSA de http://www.alsa-project.org."
-
-#~ msgid "Unregistration successful."
-#~ msgstr "Cancelación del registro completada."
-
-#~ msgid "C: 2001"
-#~ msgstr "Abril 2001"
-
-#~ msgid "Select network interface to use:"
-#~ msgstr "Seleccione la interfaz de red para usar:"
-
-#~ msgid "Network interface properties"
-#~ msgstr "Propiedades de Interfaz de Red:"
-
-#~ msgid "RTP"
-#~ msgstr "RTP"
-
-#~ msgid "Threads not supported by glib. Upgrade your glib.\n"
-#~ msgstr "Threads no soportados por glib. Actualize su glib.\n"
-
-#~ msgid "Run linphone as a gnome-applet."
-#~ msgstr "Ejecutar linphone como un gnome-applet."
-
-#~ msgid "Run linphone as a daemon (for use without gnome)."
-#~ msgstr "Ejecutar linphone como demonio (para uso sin gnome)."
-
-#~ msgid ""
-#~ "Cannot find network previously used interface %s.\n"
-#~ "If your computer is temporary connected to the internet, please connect "
-#~ "and then run linphone.\n"
-#~ "If you want to change your default network interface, go to the "
-#~ "parameters 'box."
-#~ msgstr ""
-#~ "No se puede encontrar la interfaz de red usada previamente %s.\n"
-#~ "Si su ordenador está conectado temporalmente a Internet, por favor "
-#~ "conéctese y entonces ejecute linphone.\n"
-#~ "Si quiere cambiar su interfaz de red predeterminada, vaya a la casilla "
-#~ "Parámetros."
-
-#, fuzzy
-#~ msgid ""
-#~ "Linphone cannot open the audio device.\n"
-#~ "It may be caused by other programs using it.\n"
-#~ "Do you want linphone to kill these programs (esd or artsd) ?"
-#~ msgstr ""
-#~ "Linphone no puede abrir el dispositivo de audio.\n"
-#~ "Puede deberse a que otros programas lo estén usando.\n"
-#~ "¿Quiere que Linphone cierre esos programas (esd o artsd)?"
-
-#~ msgid "Use it as a:"
-#~ msgstr "Usarlo como un:"
-
-#~ msgid "Outbound proxy"
-#~ msgstr "Proxy de salida"
-
-#~ msgid ""
-#~ "Togle this button if the registrar must be used to proxy calls through a "
-#~ "firewall."
-#~ msgstr ""
-#~ "Marcar esta opción si el servidor de registro debe usarse en llamadas a "
-#~ "proxy a través de un firewall."
-
-#~ msgid "OSS"
-#~ msgstr "OSS"
-
-#~ msgid "ALSA"
-#~ msgstr "ALSA"
-
-#~ msgid "Automatically kill applications using soundcard when needed"
-#~ msgstr ""
-#~ "Cerrar automáticamente aplicaciones que usen la tarjeta de sonido cuando "
-#~ "se necesite."
-
-#~ msgid ""
-#~ "Your computer is connected to several networks. Check in the global "
-#~ "parameters if Linphone uses the one that you want."
-#~ msgstr ""
-#~ "Su equipo está conectado a varias redes. Revise en los parámetros "
-#~ "globales si Linphone usa la que necesita."
-
-#~ msgid ""
-#~ "Linphone failed to open the sound device. See the README file included in "
-#~ "the distribution for details."
-#~ msgstr ""
-#~ "Linphone no pudo abrir el dispositivo de sonido. Vea el archivo README "
-#~ "incluido en la distribución para más detalles."
-
-#~ msgid "Interface not found."
-#~ msgstr "Interfaz no encontrada."
-
-#~ msgid "Warning"
-#~ msgstr "Advertencia"
-
-#~ msgid ""
-#~ "Linphone cannot open the sound device. It may be caused by other programs "
-#~ "using it. Do you want linphone to kill these programs (esd or artsd) ?"
-#~ msgstr ""
-#~ "Linphone no puede abrir el dispositivo de sonido. Puede deberse a que "
-#~ "otros programas lo estén usando. ¿Quiere que Linphone cierre esos "
-#~ "programas (esd o artsd)?"
-
-#~ msgid "Linphone shutdowns..."
-#~ msgstr "Linphone se está cerrando…"
-
-#~ msgid ""
-#~ "Please, wait a few seconds until linphone unregisters your sip addess "
-#~ "from registrar server..."
-#~ msgstr ""
-#~ "Por favor, espere unos segundos hasta que Linphone cancele el registro de "
-#~ "su dirección SIP en el servidor de registros..."
-
-#~ msgid "Bad formulated sip address."
-#~ msgstr "Dirección SIP mal escrita."
-
-#~ msgid "Couldn't create pixmap from file: %s"
-#~ msgstr "No se pudo crear pixmap desde el archivo: %s"
-
-#~ msgid ""
-#~ "Linphone did not detect any valid network interface. If you use a "
-#~ "temporary internet connection, please connect and then run linphone again."
-#~ msgstr ""
-#~ "Linphone no detectó ninguna interfaz de red válida. Si usa una conexión "
-#~ "temporal a Internet, por favor conéctese y vuelva a ejecutar Linphone."
-
-#~ msgid "List of network interfaces on your system."
-#~ msgstr "Lista de interfaces de red en su sistema."
-
-#~ msgid ""
-#~ "RTP est le mode de transport de la voix. Modifier ces paramËtres pour "
-#~ "tenter d'amÈliorer la qualitÈ de la communication si celle-ci est "
-#~ "dÈgradÈe."
-#~ msgstr ""
-#~ "RTP es el modelo de transporte de la voz. Modifique estos parámetros para "
-#~ "intentar mejorar la calidad de la comunicación en caso de que sea mala."
-
-#~ msgid "Use rtp port:"
-#~ msgstr "Usar puerto RTP:"
-
-#~ msgid ""
-#~ "Les codecs ou vocodeurs sont les algorithmes utilisÈs pour compresser la "
-#~ "voix."
-#~ msgstr ""
-#~ "Los códecs o codificadores/decodificadores son los algoritmos usados para "
-#~ "comprimir la voz."
-
-#~ msgid ""
-#~ "Vous pouvez ajuster avec cet onglet des paramËtre liÈs ‡ votre carte son."
-#~ msgstr "Puede modificar estos parámetros a su gusto."
diff --git a/po/fr.po b/po/fr.po
index a7aac8717..173b4b260 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,19 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) 2001 Free Software Foundation, Inc.
-# Simon Morlat <simon.morlat@linphone.org>, 2001.
-#
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Cqnqrd <gautier.pelloux@gmail.com>, 2014
+# Simon Morlat <simon.morlat@linphone.org>, 2001
 msgid ""
 msgstr ""
-"Project-Id-Version: Linphone 0.9.1\n"
+"Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-15 09:24+0200\n"
-"PO-Revision-Date: 2013-04-09 13:57+0100\n"
-"Last-Translator: Simon Morlat <simon.morlat@linphone.org> \n"
-"Language-Team: french <fr@li.org>\n"
-"Language: \n"
+"POT-Creation-Date: 2014-11-19 10:39+0100\n"
+"PO-Revision-Date: 2014-11-19 18:33+0000\n"
+"Last-Translator: Cqnqrd <gautier.pelloux@gmail.com>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/linphone-gtk/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974
 #, c-format
@@ -70,9 +74,7 @@ msgstr ""
 msgid ""
 "<small><i>%s</i>\t<i>Quality: %s</i></small>\n"
 "%s\t%s\t"
-msgstr ""
-"<small><i>%s</i>\t<i>Qualité: %s</i></small>\n"
-"%s\t%s\t"
+msgstr "<small><i>%s</i>\t<i>Qualité: %s</i></small>\n%s\t%s\t"
 
 #: ../gtk/calllogs.c:343
 #, c-format
@@ -124,11 +126,9 @@ msgstr "si positionné, répond automatiquement aux appels entrants"
 
 #: ../gtk/main.c:149
 msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: c:"
-"\\Program Files\\Linphone)"
-msgstr ""
-"Spécifie un répertoire de travail (qui devrait être le répertoire "
-"d'installation, par exemple c:\\Program Files\\Linphone)"
+"Specifiy a working directory (should be the base of the installation, eg: "
+"c:\\Program Files\\Linphone)"
+msgstr "Spécifie un répertoire de travail (qui devrait être le répertoire d'installation, par exemple c:\\Program Files\\Linphone)"
 
 #: ../gtk/main.c:156
 msgid "Configuration file"
@@ -138,95 +138,80 @@ msgstr "Ficher de configuration"
 msgid "Run the audio assistant"
 msgstr "Démarre l'assistant audio"
 
-#: ../gtk/main.c:590
-#, c-format
-msgid "Call with %s"
-msgstr "Appel avec %s"
-
-#: ../gtk/main.c:1183
+#: ../gtk/main.c:1085
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
-"Would you allow him to see your presence status or add him to your contact "
-"list ?\n"
+"Would you allow him to see your presence status or add him to your contact list ?\n"
 "If you answer no, this person will be temporarily blacklisted."
-msgstr ""
-"%s souhaite vous ajouter à sa liste de contact.\n"
-"Souhaitez vous l'autoriser à voir votre information de présence et l'ajouter "
-"à votre liste également ?\n"
-"Si vous répondez non, cette personne sera mise temporairement sur liste "
-"noire."
+msgstr "%s souhaite vous ajouter à sa liste de contact.\nSouhaitez vous l'autoriser à voir votre information de présence et l'ajouter à votre liste également ?\nSi vous répondez non, cette personne sera mise temporairement sur liste noire."
 
-#: ../gtk/main.c:1260
+#: ../gtk/main.c:1162
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
-msgstr ""
-"Entrez le mot de passe pour <i>%s</i>\n"
-" sur le domaine <i>%s</i>:"
+msgstr "Entrez le mot de passe pour <i>%s</i>\n sur le domaine <i>%s</i>:"
 
-#: ../gtk/main.c:1376
+#: ../gtk/main.c:1283
 msgid "Call error"
 msgstr "Erreur lors de l'appel"
 
-#: ../gtk/main.c:1379 ../coreapi/linphonecore.c:3240
+#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3744
 msgid "Call ended"
 msgstr "Appel terminé."
 
-#: ../gtk/main.c:1382
+#: ../gtk/main.c:1289
 msgid "Incoming call"
 msgstr "Appel entrant"
 
-#: ../gtk/main.c:1384 ../gtk/incall_view.c:522 ../gtk/main.ui.h:5
+#: ../gtk/main.c:1291 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
 msgid "Answer"
 msgstr "Répondre"
 
-#: ../gtk/main.c:1386 ../gtk/main.ui.h:6
+#: ../gtk/main.c:1293 ../gtk/main.ui.h:6
 msgid "Decline"
 msgstr "Refuser"
 
-#: ../gtk/main.c:1392
+#: ../gtk/main.c:1299
 msgid "Call paused"
 msgstr "Appel en pause"
 
-#: ../gtk/main.c:1392
+#: ../gtk/main.c:1299
 #, c-format
 msgid "<b>by %s</b>"
 msgstr "b>par %s</b>"
 
-#: ../gtk/main.c:1459
+#: ../gtk/main.c:1366
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr "%s propose de démarrer la vidéo. Acceptez-vous ?"
 
-#: ../gtk/main.c:1621
+#: ../gtk/main.c:1528
 msgid "Website link"
 msgstr "Lien site web"
 
-#: ../gtk/main.c:1670
+#: ../gtk/main.c:1577
 msgid "Linphone - a video internet phone"
 msgstr "Linphone - un téléphone video pour l'internet"
 
-#: ../gtk/main.c:1762
+#: ../gtk/main.c:1669
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (par défaut)"
 
-#: ../gtk/main.c:2099 ../coreapi/callbacks.c:949
+#: ../gtk/main.c:2006 ../coreapi/callbacks.c:983
 #, c-format
 msgid "We are transferred to %s"
 msgstr "Transfert vers %s"
 
-#: ../gtk/main.c:2109
+#: ../gtk/main.c:2016
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
-msgstr ""
-"Aucune carte son n'a été détectée sur cet ordinateur.\n"
-"Vous ne pourrez pas effectuer d'appels audio."
+msgstr "Aucune carte son n'a été détectée sur cet ordinateur.\nVous ne pourrez pas effectuer d'appels audio."
 
-#: ../gtk/main.c:2250
+#: ../gtk/main.c:2157
 msgid "A free SIP video-phone"
 msgstr "Un visiophone libre"
 
@@ -303,106 +288,101 @@ msgstr "Désactivé"
 msgid "Account"
 msgstr "Compte"
 
-#: ../gtk/propertybox.c:1063
+#: ../gtk/propertybox.c:1072
 msgid "English"
 msgstr "Anglais"
 
-#: ../gtk/propertybox.c:1064
+#: ../gtk/propertybox.c:1073
 msgid "French"
 msgstr "Français"
 
-#: ../gtk/propertybox.c:1065
+#: ../gtk/propertybox.c:1074
 msgid "Swedish"
 msgstr "Suédois"
 
-#: ../gtk/propertybox.c:1066
+#: ../gtk/propertybox.c:1075
 msgid "Italian"
 msgstr "Italien"
 
-#: ../gtk/propertybox.c:1067
+#: ../gtk/propertybox.c:1076
 msgid "Spanish"
 msgstr "Espagnol"
 
-#: ../gtk/propertybox.c:1068
+#: ../gtk/propertybox.c:1077
 msgid "Brazilian Portugese"
 msgstr "Portugais brésilien"
 
-#: ../gtk/propertybox.c:1069
+#: ../gtk/propertybox.c:1078
 msgid "Polish"
 msgstr "Polonais"
 
-#: ../gtk/propertybox.c:1070
+#: ../gtk/propertybox.c:1079
 msgid "German"
 msgstr "Allemand"
 
-#: ../gtk/propertybox.c:1071
+#: ../gtk/propertybox.c:1080
 msgid "Russian"
 msgstr "Russe"
 
-#: ../gtk/propertybox.c:1072
+#: ../gtk/propertybox.c:1081
 msgid "Japanese"
 msgstr "日本語"
 
-#: ../gtk/propertybox.c:1073
+#: ../gtk/propertybox.c:1082
 msgid "Dutch"
 msgstr "Néérlandais"
 
-#: ../gtk/propertybox.c:1074
+#: ../gtk/propertybox.c:1083
 msgid "Hungarian"
 msgstr "Hongrois"
 
-#: ../gtk/propertybox.c:1075
+#: ../gtk/propertybox.c:1084
 msgid "Czech"
 msgstr "Tchèque"
 
-#: ../gtk/propertybox.c:1076
+#: ../gtk/propertybox.c:1085
 msgid "Chinese"
 msgstr "简体中文"
 
-#: ../gtk/propertybox.c:1077
+#: ../gtk/propertybox.c:1086
 msgid "Traditional Chinese"
 msgstr "Chinois traditionnel"
 
-#: ../gtk/propertybox.c:1078
+#: ../gtk/propertybox.c:1087
 msgid "Norwegian"
 msgstr "Norvégien"
 
-#: ../gtk/propertybox.c:1079
+#: ../gtk/propertybox.c:1088
 msgid "Hebrew"
 msgstr "Hébreu"
 
-#: ../gtk/propertybox.c:1080
+#: ../gtk/propertybox.c:1089
 msgid "Serbian"
 msgstr "Serbe"
 
-#: ../gtk/propertybox.c:1147
+#: ../gtk/propertybox.c:1156
 msgid ""
 "You need to restart linphone for the new language selection to take effect."
-msgstr ""
-"La nouvelle selection de langue prendra effet au prochain démarrage de "
-"linphone."
+msgstr "La nouvelle selection de langue prendra effet au prochain démarrage de linphone."
 
-#: ../gtk/propertybox.c:1225
+#: ../gtk/propertybox.c:1234
 msgid "None"
 msgstr "Aucun"
 
-#: ../gtk/propertybox.c:1229
+#: ../gtk/propertybox.c:1238
 msgid "SRTP"
-msgstr ""
+msgstr "SRTP"
 
-#: ../gtk/propertybox.c:1235
+#: ../gtk/propertybox.c:1244
 msgid "ZRTP"
-msgstr ""
+msgstr "ZRTP"
 
 #: ../gtk/update.c:80
 #, c-format
 msgid ""
 "A more recent version is availalble from %s.\n"
 "Would you like to open a browser to download it ?"
-msgstr ""
-"Une version plus récente est disponible sur %s.\n"
-"Voulez vous ouvrir le navigateur afin de pouvoir télécharger la dernière "
-"version ?"
+msgstr "Une version plus récente est disponible sur %s.\nVoulez vous ouvrir le navigateur afin de pouvoir télécharger la dernière version ?"
 
 #: ../gtk/update.c:91
 msgid "You are running the lastest version."
@@ -439,9 +419,7 @@ msgstr[1] "%i contacts trouvés."
 msgid ""
 "Welcome !\n"
 "This assistant will help you to use a SIP account for your calls."
-msgstr ""
-"Bienvenue!\n"
-"Cet assistant va vous aider à utiliser un compte SIP pour vos appels."
+msgstr "Bienvenue!\nCet assistant va vous aider à utiliser un compte SIP pour vos appels."
 
 #: ../gtk/setupwizard.c:43
 msgid "Create an account on linphone.org"
@@ -489,7 +467,7 @@ msgstr "Domaine*"
 
 #: ../gtk/setupwizard.c:145
 msgid "Proxy"
-msgstr ""
+msgstr "Proxy"
 
 #: ../gtk/setupwizard.c:317
 msgid "(*) Required fields"
@@ -519,10 +497,7 @@ msgstr ""
 msgid ""
 "Error, account not validated, username already used or server unreachable.\n"
 "Please go back and try again."
-msgstr ""
-"Erreur, le compte n'est pas validé, l'identifiant est déjà utilisé ou le "
-"serveur n'est pas accessible.\n"
-"Merci d'essayer à nouveau."
+msgstr "Erreur, le compte n'est pas validé, l'identifiant est déjà utilisé ou le serveur n'est pas accessible.\nMerci d'essayer à nouveau."
 
 #: ../gtk/setupwizard.c:405
 msgid "Thank you. Your account is now configured and ready for use."
@@ -530,13 +505,9 @@ msgstr "Merci. Votre compte est maintenant configuré et prêt à être utilisé
 
 #: ../gtk/setupwizard.c:413
 msgid ""
-"Please validate your account by clicking on the link we just sent you by "
-"email.\n"
+"Please validate your account by clicking on the link we just sent you by email.\n"
 "Then come back here and press Next button."
-msgstr ""
-"Merci de valider votre compte en cliquant sur le lien que nous avons envoyé "
-"par email.\n"
-"Puis appuyez sur suivant."
+msgstr "Merci de valider votre compte en cliquant sur le lien que nous avons envoyé par email.\nPuis appuyez sur suivant."
 
 #: ../gtk/setupwizard.c:600
 msgid "SIP account configuration assistant"
@@ -657,108 +628,108 @@ msgstr ""
 msgid "Hang up"
 msgstr "Raccrocher"
 
-#: ../gtk/incall_view.c:501
+#: ../gtk/incall_view.c:511
 msgid "<b>Calling...</b>"
 msgstr "<b>Tentative d'appel...</b>"
 
-#: ../gtk/incall_view.c:504 ../gtk/incall_view.c:707
+#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:727
 msgid "00::00::00"
-msgstr ""
+msgstr "00::00::00"
 
-#: ../gtk/incall_view.c:515
+#: ../gtk/incall_view.c:525
 msgid "<b>Incoming call</b>"
 msgstr "<b>Appel entrant</b>"
 
-#: ../gtk/incall_view.c:552
+#: ../gtk/incall_view.c:562
 msgid "good"
 msgstr "bon"
 
-#: ../gtk/incall_view.c:554
+#: ../gtk/incall_view.c:564
 msgid "average"
 msgstr "moyen"
 
-#: ../gtk/incall_view.c:556
+#: ../gtk/incall_view.c:566
 msgid "poor"
 msgstr "faible"
 
-#: ../gtk/incall_view.c:558
+#: ../gtk/incall_view.c:568
 msgid "very poor"
 msgstr "très faible"
 
-#: ../gtk/incall_view.c:560
+#: ../gtk/incall_view.c:570
 msgid "too bad"
 msgstr "nulle"
 
-#: ../gtk/incall_view.c:561 ../gtk/incall_view.c:577
+#: ../gtk/incall_view.c:571 ../gtk/incall_view.c:587
 msgid "unavailable"
 msgstr "indisponible"
 
-#: ../gtk/incall_view.c:669
+#: ../gtk/incall_view.c:679
 msgid "Secured by SRTP"
 msgstr "Sécurisé par SRTP"
 
-#: ../gtk/incall_view.c:675
+#: ../gtk/incall_view.c:685
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
 msgstr "Sécurisé par ZRTP- [jeton: %s]"
 
-#: ../gtk/incall_view.c:681
+#: ../gtk/incall_view.c:691
 msgid "Set unverified"
 msgstr "Marquer comme non vérifié"
 
-#: ../gtk/incall_view.c:681 ../gtk/main.ui.h:4
+#: ../gtk/incall_view.c:691 ../gtk/main.ui.h:4
 msgid "Set verified"
 msgstr "Marquer comme vérifié"
 
-#: ../gtk/incall_view.c:702
+#: ../gtk/incall_view.c:722
 msgid "In conference"
 msgstr "En conférence"
 
-#: ../gtk/incall_view.c:702
+#: ../gtk/incall_view.c:722
 msgid "<b>In call</b>"
 msgstr "<b>Appel en cours</b>"
 
-#: ../gtk/incall_view.c:738
+#: ../gtk/incall_view.c:758
 msgid "<b>Paused call</b>"
 msgstr "<b>Appel en attente</b>"
 
-#: ../gtk/incall_view.c:751
+#: ../gtk/incall_view.c:771
 #, c-format
 msgid "%02i::%02i::%02i"
-msgstr ""
+msgstr "%02i::%02i::%02i"
 
-#: ../gtk/incall_view.c:772
+#: ../gtk/incall_view.c:794
 msgid "<b>Call ended.</b>"
 msgstr "<b>Appel terminé.</b>"
 
-#: ../gtk/incall_view.c:803
+#: ../gtk/incall_view.c:825
 msgid "Transfer in progress"
 msgstr "Transfert en cours"
 
-#: ../gtk/incall_view.c:806
+#: ../gtk/incall_view.c:828
 msgid "Transfer done."
 msgstr "Transfert terminé"
 
-#: ../gtk/incall_view.c:809
+#: ../gtk/incall_view.c:831
 msgid "Transfer failed."
 msgstr "Transfert échoué"
 
-#: ../gtk/incall_view.c:853
+#: ../gtk/incall_view.c:875
 msgid "Resume"
 msgstr "Reprendre"
 
-#: ../gtk/incall_view.c:860 ../gtk/main.ui.h:9
+#: ../gtk/incall_view.c:882 ../gtk/main.ui.h:9
 msgid "Pause"
 msgstr "Pause"
 
-#: ../gtk/incall_view.c:926
+#: ../gtk/incall_view.c:948
 #, c-format
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
 msgstr ""
 
-#: ../gtk/incall_view.c:926
+#: ../gtk/incall_view.c:948
 msgid "(Paused)"
 msgstr "(en attente)"
 
@@ -797,10 +768,7 @@ msgstr ""
 msgid ""
 "Welcome !\n"
 "This assistant will help you to configure audio settings for Linphone"
-msgstr ""
-"Bienvenue!\n"
-"Cet assistant va vous aider à régler les paramètres audio de votre "
-"ordinateur pour une utilisation optimale avec Linphone."
+msgstr "Bienvenue!\nCet assistant va vous aider à régler les paramètres audio de votre ordinateur pour une utilisation optimale avec Linphone."
 
 #: ../gtk/audio_assistant.c:328
 msgid "Capture device"
@@ -1235,9 +1203,8 @@ msgid "Fixed"
 msgstr "Fixe"
 
 #: ../gtk/parameters.ui.h:23
-#, fuzzy
 msgid "Media encryption is mandatory"
-msgstr "Type d'encryption media"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:24
 msgid "Tunnel"
@@ -1345,9 +1312,7 @@ msgstr "Paramètres multimedia"
 
 #: ../gtk/parameters.ui.h:50
 msgid "This section defines your SIP address when not using a SIP account"
-msgstr ""
-"Cette rubrique permet de définir son adresse SIP lorsqu'on ne possède pas de "
-"compte SIP"
+msgstr "Cette rubrique permet de définir son adresse SIP lorsqu'on ne possède pas de compte SIP"
 
 #: ../gtk/parameters.ui.h:51
 msgid "Your display name (eg: John Doe):"
@@ -1429,10 +1394,7 @@ msgstr "Activer le control de débit adaptatif."
 msgid ""
 "<i>Adaptive rate control is a technique to dynamically guess the available "
 "bandwidth during a call.</i>"
-msgstr ""
-"<i>Le control de débit adaptatif est une technique pour adapter la qualité "
-"de l'audio et de la video en fonction de la bande passante disponible, "
-"durant l'appel.</i>"
+msgstr "<i>Le control de débit adaptatif est une technique pour adapter la qualité de l'audio et de la video en fonction de la bande passante disponible, durant l'appel.</i>"
 
 #: ../gtk/parameters.ui.h:71
 msgid "<b>Bandwidth control</b>"
@@ -1745,17 +1707,9 @@ msgstr "Spécifier une URI de configuration"
 
 #: ../gtk/config-uri.ui.h:2
 msgid ""
-"This dialog allows to set an http or https address when configuration is to "
-"be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, "
-"Linphone will restart automatically in order to fetch and take into account "
-"the new configuration. "
-msgstr ""
-"Cette boite de dialogue vous permet de spécifier une addresse http ou https "
-"où la configuration doit être téléchargée au démarrage.\n"
-"Veuillez entrer l'URI http(s) ci dessous. Après avoir validé, Linphone va "
-"redémarrer automatiquement pour charger et prendre en compte la nouvelle "
-"configuration."
+"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
+msgstr "Cette boite de dialogue vous permet de spécifier une addresse http ou https où la configuration doit être téléchargée au démarrage.\nVeuillez entrer l'URI http(s) ci dessous. Après avoir validé, Linphone va redémarrer automatiquement pour charger et prendre en compte la nouvelle configuration."
 
 #: ../gtk/config-uri.ui.h:4
 msgid "https://"
@@ -1767,76 +1721,74 @@ msgstr "Configuration en cours"
 
 #: ../gtk/provisioning-fetch.ui.h:2
 msgid "Please wait while fetching configuration from server..."
-msgstr ""
-"Veuillez patenter un instant pendant le chargement de la configuration "
-"distante..."
+msgstr "Veuillez patenter un instant pendant le chargement de la configuration distante..."
 
-#: ../coreapi/linphonecore.c:1034
+#: ../coreapi/linphonecore.c:1511
 msgid "Ready"
 msgstr "Prêt."
 
-#: ../coreapi/linphonecore.c:1967
+#: ../coreapi/linphonecore.c:2470
 msgid "Configuring"
 msgstr "Configuration en cours"
 
-#: ../coreapi/linphonecore.c:2133
+#: ../coreapi/linphonecore.c:2635
 msgid "Looking for telephone number destination..."
 msgstr "Recherche de la destination du numéro de téléphone..."
 
-#: ../coreapi/linphonecore.c:2136
+#: ../coreapi/linphonecore.c:2637
 msgid "Could not resolve this number."
 msgstr "La destination n'a pu être trouvée."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2418
+#: ../coreapi/linphonecore.c:2919
 msgid "Contacting"
 msgstr "Appel de"
 
-#: ../coreapi/linphonecore.c:2425
+#: ../coreapi/linphonecore.c:2924
 msgid "Could not call"
 msgstr "Echec de l'appel"
 
-#: ../coreapi/linphonecore.c:2576
+#: ../coreapi/linphonecore.c:3074
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "Désolé, le nombre maximum d'appels simultanés est atteint."
 
-#: ../coreapi/linphonecore.c:2745
+#: ../coreapi/linphonecore.c:3233
 msgid "is contacting you"
 msgstr "vous appelle"
 
-#: ../coreapi/linphonecore.c:2746
+#: ../coreapi/linphonecore.c:3234
 msgid " and asked autoanswer."
 msgstr "et sollicite un décrochage automatique."
 
-#: ../coreapi/linphonecore.c:2746
+#: ../coreapi/linphonecore.c:3234
 msgid "."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2865
+#: ../coreapi/linphonecore.c:3352
 msgid "Modifying call parameters..."
 msgstr "Modifications des paramètres d'appels..."
 
-#: ../coreapi/linphonecore.c:3194
+#: ../coreapi/linphonecore.c:3700
 msgid "Connected."
 msgstr "En ligne."
 
-#: ../coreapi/linphonecore.c:3220
+#: ../coreapi/linphonecore.c:3725
 msgid "Call aborted"
 msgstr "Appel abandonné"
 
-#: ../coreapi/linphonecore.c:3412
+#: ../coreapi/linphonecore.c:3915
 msgid "Could not pause the call"
 msgstr "La mise en attente a échoué"
 
-#: ../coreapi/linphonecore.c:3417
+#: ../coreapi/linphonecore.c:3919
 msgid "Pausing the current call..."
 msgstr "Mise en attente de l'appel..."
 
-#: ../coreapi/misc.c:425
+#: ../coreapi/misc.c:438
 msgid "Stun lookup in progress..."
 msgstr "Découverte STUN en cours"
 
-#: ../coreapi/misc.c:607
+#: ../coreapi/misc.c:619
 msgid "ICE local candidates gathering in progress..."
 msgstr ""
 
@@ -1892,271 +1844,140 @@ msgstr "En congé"
 msgid "Unknown-bug"
 msgstr "Bug inconnu"
 
-#: ../coreapi/proxy.c:314
+#: ../coreapi/proxy.c:319
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
-msgstr ""
-"L'adresse SIP du proxy est invalide. Elle doit commencer par \"sip:\" suivie "
-"par un nom de domaine."
+msgstr "L'adresse SIP du proxy est invalide. Elle doit commencer par \"sip:\" suivie par un nom de domaine."
 
-#: ../coreapi/proxy.c:320
+#: ../coreapi/proxy.c:325
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
-msgstr ""
-"L'identité SIP que vous avez fourni est invalide.\n"
-"Elle doit être de la forme sip:username@domain, comme par example sip:"
-"alice@example.net"
+msgstr "L'identité SIP que vous avez fourni est invalide.\nElle doit être de la forme sip:username@domain, comme par example sip:alice@example.net"
 
-#: ../coreapi/proxy.c:1369
+#: ../coreapi/proxy.c:1377
 #, c-format
 msgid "Could not login as %s"
 msgstr "Echec de la connexion en tant que %s"
 
-#: ../coreapi/callbacks.c:355
+#: ../coreapi/callbacks.c:383
 msgid "Remote ringing."
 msgstr "Sonnerie distante."
 
-#: ../coreapi/callbacks.c:373
+#: ../coreapi/callbacks.c:404
 msgid "Remote ringing..."
 msgstr "Sonnerie distante..."
 
-#: ../coreapi/callbacks.c:384
+#: ../coreapi/callbacks.c:414
 msgid "Early media."
 msgstr "Prise d'appel anticipée."
 
-#: ../coreapi/callbacks.c:435
+#: ../coreapi/callbacks.c:475
 #, c-format
 msgid "Call with %s is paused."
 msgstr "%s est maintenant en attente."
 
-#: ../coreapi/callbacks.c:448
+#: ../coreapi/callbacks.c:488
 #, c-format
 msgid "Call answered by %s - on hold."
 msgstr "Appel répondu par %s - en attente"
 
-#: ../coreapi/callbacks.c:459
+#: ../coreapi/callbacks.c:498
 msgid "Call resumed."
 msgstr "Appel repris."
 
-#: ../coreapi/callbacks.c:464
+#: ../coreapi/callbacks.c:502
 #, c-format
 msgid "Call answered by %s."
 msgstr "Appel répondu par %s."
 
-#: ../coreapi/callbacks.c:483
+#: ../coreapi/callbacks.c:525
 msgid "Incompatible, check codecs or security settings..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:512
+#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:826
+msgid "Incompatible media parameters."
+msgstr "Paramètres media incompatibles."
+
+#: ../coreapi/callbacks.c:560
 msgid "We have been resumed."
 msgstr "Appel repris."
 
-#: ../coreapi/callbacks.c:521
+#. we are being paused
+#: ../coreapi/callbacks.c:568
 msgid "We are paused by other party."
 msgstr "L'appel a été mis en attente."
 
-#: ../coreapi/callbacks.c:556
-#, fuzzy
+#. reINVITE and in-dialogs UPDATE go here
+#: ../coreapi/callbacks.c:602
 msgid "Call is updated by remote."
-msgstr "Mise à jour de l'appel par le correspondant."
+msgstr ""
 
-#: ../coreapi/callbacks.c:658
+#: ../coreapi/callbacks.c:705
 msgid "Call terminated."
 msgstr "Appel terminé."
 
-#: ../coreapi/callbacks.c:687
+#: ../coreapi/callbacks.c:733
 msgid "User is busy."
 msgstr "Occupé..."
 
-#: ../coreapi/callbacks.c:688
+#: ../coreapi/callbacks.c:734
 msgid "User is temporarily unavailable."
 msgstr "L'usager est temporairement indisponible."
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:690
+#: ../coreapi/callbacks.c:736
 msgid "User does not want to be disturbed."
 msgstr "L'usager ne souhaite pas être dérangé"
 
-#: ../coreapi/callbacks.c:691
+#: ../coreapi/callbacks.c:737
 msgid "Call declined."
 msgstr "Appel décliné."
 
-#: ../coreapi/callbacks.c:706
+#: ../coreapi/callbacks.c:752
 msgid "Request timeout."
 msgstr ""
 
-#: ../coreapi/callbacks.c:737
+#: ../coreapi/callbacks.c:780
 msgid "Redirected"
 msgstr "Redirection"
 
-#: ../coreapi/callbacks.c:787
-msgid "Incompatible media parameters."
-msgstr "Paramètres media incompatibles."
-
-#: ../coreapi/callbacks.c:798
+#: ../coreapi/callbacks.c:835
 msgid "Call failed."
 msgstr "L'appel a échoué."
 
-#: ../coreapi/callbacks.c:878
+#: ../coreapi/callbacks.c:913
 #, c-format
 msgid "Registration on %s successful."
 msgstr "Enregistrement sur %s effectué."
 
-#: ../coreapi/callbacks.c:879
+#: ../coreapi/callbacks.c:914
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "Désenregistrement sur %s effectué."
 
-#: ../coreapi/callbacks.c:897
+#: ../coreapi/callbacks.c:932
 msgid "no response timeout"
 msgstr "Pas de réponse"
 
-#: ../coreapi/callbacks.c:900
+#: ../coreapi/callbacks.c:935
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "Echec de l'enregistrement sur %s: %s"
 
-#: ../coreapi/callbacks.c:907
+#: ../coreapi/callbacks.c:942
 msgid "Service unavailable, retrying"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:177
+#: ../coreapi/linphonecall.c:174
 #, c-format
 msgid "Authentication token is %s"
 msgstr "Le jeton d'authentification est %s"
 
-#: ../coreapi/linphonecall.c:2932
+#: ../coreapi/linphonecall.c:3020
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
 msgstr[0] "Vous avez manqué %i appel"
 msgstr[1] "Vous avez manqué %i appels"
-
-#~ msgid "aborted"
-#~ msgstr "abandonné"
-
-#~ msgid "completed"
-#~ msgstr "terminé"
-
-#~ msgid "missed"
-#~ msgstr "manqué"
-
-#~ msgid ""
-#~ "%s at %s\n"
-#~ "From: %s\n"
-#~ "To: %s\n"
-#~ "Status: %s\n"
-#~ "Duration: %i mn %i sec\n"
-#~ msgstr ""
-#~ "%s le %s\n"
-#~ "De: %s\n"
-#~ "A destination de: %s\n"
-#~ "Etat: %s\n"
-#~ "Durée: %i mn %i sec\n"
-
-#~ msgid "Outgoing call"
-#~ msgstr "Appel sortant"
-
-#~ msgid "No response."
-#~ msgstr "Pas de réponse."
-
-#~ msgid "Protocol error."
-#~ msgstr "Erreur de protocole"
-
-#~ msgid ""
-#~ "Could not parse given sip address. A sip url usually looks like sip:"
-#~ "user@domain"
-#~ msgstr ""
-#~ "Adresse SIP mal formulée. Une address sip ressemble à <sip:nom@domaine>"
-
-#~ msgid ""
-#~ "Your computer appears to be using ALSA sound drivers.\n"
-#~ "This is the best choice. However the pcm oss emulation module\n"
-#~ "is missing and linphone needs it. Please execute\n"
-#~ "'modprobe snd-pcm-oss' as root to load it."
-#~ msgstr ""
-#~ "Votre ordinateur semble utiliser les pilotes sons ALSA.\n"
-#~ "C'est en g��al le meilleur choix, cependant un module\n"
-#~ "d'emulation oss est manquant et linphone en a besoin.\n"
-#~ "Veuillez s'il vous plait executer la commande\n"
-#~ "'modprobe snd-pcm-oss' en tant que root afin de le charger."
-
-#~ msgid ""
-#~ "Your computer appears to be using ALSA sound drivers.\n"
-#~ "This is the best choice. However the mixer oss emulation module\n"
-#~ "is missing and linphone needs it. Please execute\n"
-#~ " 'modprobe snd-mixer-oss' as root to load it."
-#~ msgstr ""
-#~ "Votre ordinateur semble utiliser les pilotes sons ALSA. C'est en g��al "
-#~ "le\n"
-#~ "meilleur choix, cependant un module d'emulation est manquant et linphone "
-#~ "en\n"
-#~ "a besoin. Veuillez s'il vous plait executer la commande\n"
-#~ "'modprobe snd-mixer-oss' en tant que root afin de le charger."
-
-#~ msgid "Keypad"
-#~ msgstr "Clavier"
-
-#~ msgid "Chat with %s"
-#~ msgstr "Chat avec %s"
-
-#~ msgid "Choosing a username"
-#~ msgstr "Choix du nom d'utilisateur"
-
-#~ msgid "Enable video"
-#~ msgstr "Activer la video"
-
-#~ msgid "Enter username, phone number, or full sip address"
-#~ msgstr ""
-#~ "Entrez un nom d'utilisateur, un numéro de téléphone, ou une adresse SIP"
-
-#~ msgid "Lookup:"
-#~ msgstr "Rechercher:"
-
-#~ msgid "in"
-#~ msgstr "dans"
-
-#~ msgid "We are being paused..."
-#~ msgstr "Mise en attente..."
-
-#~ msgid "No common codecs"
-#~ msgstr "Pas de codecs commun"
-
-#~ msgid ""
-#~ "Pause all calls\n"
-#~ "and answer"
-#~ msgstr ""
-#~ "Pauser les appels en cours\n"
-#~ "et répondre"
-
-#~ msgid "<b>Contact list</b>"
-#~ msgstr "<b>Liste de contacts</b>"
-
-#~ msgid "Audio & video"
-#~ msgstr "Audio et video"
-
-#~ msgid "Audio only"
-#~ msgstr "Audio seul"
-
-#~ msgid "Duration:"
-#~ msgstr "Durée:"
-
-#, fuzzy
-#~ msgid "_Call history"
-#~ msgstr "Historique des appels"
-
-#~ msgid "_Linphone"
-#~ msgstr "_Linphone"
-
-#~ msgid "Register at startup"
-#~ msgstr "S'enregistrer au démarrage"
-
-#~ msgid "Sorry, you have to pause or stop the current call first !"
-#~ msgstr "Désolé, vous devez d'abord mettre en attente l'appel en cours."
-
-#~ msgid "There is already a call in process, pause or stop it first."
-#~ msgstr ""
-#~ "Il y a déjà un appel en cours, veuillez d'abord le mettre en attente ou "
-#~ "le raccrocher."
diff --git a/po/he.po b/po/he.po
index f6dd58f14..a574873b0 100644
--- a/po/he.po
+++ b/po/he.po
@@ -1,25 +1,24 @@
-# Hebrew translations for linphone
-# Copyright (C) Belledonne Communications,2010
-# This file is distributed under the same license as the linphone package.
-# Eli Zaretskii <eliz@gnu.org>, 2012.
-# Isratine Citizen <genghiskhan@gmx.ca>, 2012, 2013.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Eli Zaretskii <eliz@gnu.org>, 2012
+# GenghisKhan <genghiskhan@gmx.ca>, 2012-2013
 msgid ""
 msgstr ""
-"Project-Id-Version: Linphone 3.5.99.0\n"
+"Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-15 09:24+0200\n"
-"PO-Revision-Date: 2013-04-24 21:31+0200\n"
-"Last-Translator: Isratine Citizen <genghiskhan@gmx.ca>\n"
-"Language-Team: Rahut Project <http://sourceforge.net/projects/rahut/>\n"
-"Language: he\n"
+"POT-Creation-Date: 2014-11-19 10:39+0100\n"
+"PO-Revision-Date: 2014-11-19 10:08+0000\n"
+"Last-Translator: Cqnqrd <gautier.pelloux@gmail.com>\n"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/linphone-gtk/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
 
-# צור קשר עם
 #: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974
 #, c-format
 msgid "Call %s"
@@ -75,9 +74,7 @@ msgstr ""
 msgid ""
 "<small><i>%s</i>\t<i>Quality: %s</i></small>\n"
 "%s\t%s\t"
-msgstr ""
-"<small><i>%s</i>\t<i>איכות: %s</i></small>\n"
-"%s\t%s\t"
+msgstr "<small><i>%s</i>\t<i>איכות: %s</i></small>\n%s\t%s\t"
 
 #: ../gtk/calllogs.c:343
 #, c-format
@@ -99,165 +96,122 @@ msgstr "אני"
 msgid "Couldn't find pixmap file: %s"
 msgstr "לא ניתן למצוא קובץ ‫pixmap: ‫%s"
 
-# איש־קשר
 #: ../gtk/chat.c:364 ../gtk/friendlist.c:924
 msgid "Invalid sip contact !"
 msgstr "כתובת sip לא תקפה !"
 
-# cli
 #: ../gtk/main.c:107
-#, fuzzy
 msgid "log to stdout some debug information while running."
-msgstr "רשום אל stdout מידע ניפוי שגיאות מסוים בזמן ביצוע."
-
-# cli
-#: ../gtk/main.c:114
-#, fuzzy
-msgid "path to a file to write logs into."
-msgstr "נתיב אל קובץ שברצונך לרשום אליו את הרשומות."
-
-# cli
-#: ../gtk/main.c:121
-#, fuzzy
-msgid "Start linphone with video disabled."
-msgstr "התחל את לינפון עם וידאו מנוטרל."
-
-# cli
-#: ../gtk/main.c:128
-#, fuzzy
-msgid "Start only in the system tray, do not show the main interface."
-msgstr "התחל במגש המערכת בלבד, אל תציג את הממשק הראשי."
-
-# cli
-#: ../gtk/main.c:135
-#, fuzzy
-msgid "address to call right now"
-msgstr "כתובת להתקשרות ברגע זה"
-
-# cli
-#: ../gtk/main.c:142
-#, fuzzy
-msgid "if set automatically answer incoming calls"
-msgstr "באם אפשרות זו נקבעת ענה אוטומטית לקריאות נכנסות"
-
-# cli
-#: ../gtk/main.c:149
-#, fuzzy
-msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: c:"
-"\\Program Files\\Linphone)"
 msgstr ""
-"ציין מדור העבודה (אמור להיות מבוסס על ההתקנה, למשל: c:\\Program Files"
-"\\Linphone)"
 
-# וידוא
+#: ../gtk/main.c:114
+msgid "path to a file to write logs into."
+msgstr ""
+
+#: ../gtk/main.c:121
+msgid "Start linphone with video disabled."
+msgstr ""
+
+#: ../gtk/main.c:128
+msgid "Start only in the system tray, do not show the main interface."
+msgstr ""
+
+#: ../gtk/main.c:135
+msgid "address to call right now"
+msgstr ""
+
+#: ../gtk/main.c:142
+msgid "if set automatically answer incoming calls"
+msgstr ""
+
+#: ../gtk/main.c:149
+msgid ""
+"Specifiy a working directory (should be the base of the installation, eg: "
+"c:\\Program Files\\Linphone)"
+msgstr ""
+
 #: ../gtk/main.c:156
-#, fuzzy
 msgid "Configuration file"
-msgstr "אימות"
+msgstr ""
 
 #: ../gtk/main.c:163
-#, fuzzy
 msgid "Run the audio assistant"
-msgstr "אשף הגדרת חשבון"
+msgstr ""
 
-#: ../gtk/main.c:590
-#, c-format
-msgid "Call with %s"
-msgstr "התקשרות באמצעות %s"
-
-# הקשר שלהם
-# אם התשובה
-#: ../gtk/main.c:1183
+#: ../gtk/main.c:1085
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
-"Would you allow him to see your presence status or add him to your contact "
-"list ?\n"
+"Would you allow him to see your presence status or add him to your contact list ?\n"
 "If you answer no, this person will be temporarily blacklisted."
-msgstr ""
-"‫%s מעוניין להוסיפך אל רשימת אנשי הקשר שלו.\n"
-"האם ברצונך להרשות להם לראות את מצב נוכחותך או להוסיפם אל רשימת אנשי הקשר "
-"שלך ?\n"
-"היה ותשובתך תהיה לא, אדם זה יהיה מסומן באופן זמני ברשימה השחורה."
+msgstr "‫%s מעוניין להוסיפך אל רשימת אנשי הקשר שלו.\nהאם ברצונך להרשות להם לראות את מצב נוכחותך או להוסיפם אל רשימת אנשי הקשר שלך ?\nהיה ותשובתך תהיה לא, אדם זה יהיה מסומן באופן זמני ברשימה השחורה."
 
-#: ../gtk/main.c:1260
-#, fuzzy, c-format
+#: ../gtk/main.c:1162
+#, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
 msgstr ""
-"נא להזין את סיסמתך עבור שם משתמש <i>%s</i>\n"
-" בתחום <i>%s</i>:"
 
-# שיחה
-#: ../gtk/main.c:1376
+#: ../gtk/main.c:1283
 msgid "Call error"
 msgstr "שגיאת קריאה"
 
-# Conversation ended
-#: ../gtk/main.c:1379 ../coreapi/linphonecore.c:3240
+#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3744
 msgid "Call ended"
 msgstr "שיחה הסתיימה"
 
-#: ../gtk/main.c:1382
+#: ../gtk/main.c:1289
 msgid "Incoming call"
 msgstr "קריאה נכנסת"
 
-#: ../gtk/main.c:1384 ../gtk/incall_view.c:522 ../gtk/main.ui.h:5
+#: ../gtk/main.c:1291 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
 msgid "Answer"
 msgstr "לענות"
 
-# דחיה
-#: ../gtk/main.c:1386 ../gtk/main.ui.h:6
+#: ../gtk/main.c:1293 ../gtk/main.ui.h:6
 msgid "Decline"
 msgstr "לדחות"
 
-# Conversation paused
-#: ../gtk/main.c:1392
+#: ../gtk/main.c:1299
 msgid "Call paused"
 msgstr "שיחה הושהתה"
 
-#: ../gtk/main.c:1392
+#: ../gtk/main.c:1299
 #, c-format
 msgid "<b>by %s</b>"
 msgstr "<b>על ידי %s</b>"
 
-#: ../gtk/main.c:1459
+#: ../gtk/main.c:1366
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr "‏%s רוצה להתחיל וידאו. האם אתה מסכים ?"
 
-#: ../gtk/main.c:1621
+#: ../gtk/main.c:1528
 msgid "Website link"
 msgstr "קישור אתר רשת"
 
-# ‫Linphone - וידאופון במרשתת
-#: ../gtk/main.c:1670
+#: ../gtk/main.c:1577
 msgid "Linphone - a video internet phone"
 msgstr "‫Linphone - וידאופון אינטרנטי"
 
-# משתמטת
-#: ../gtk/main.c:1762
+#: ../gtk/main.c:1669
 #, c-format
 msgid "%s (Default)"
 msgstr "‫%s (ברירת מחדל)"
 
-#: ../gtk/main.c:2099 ../coreapi/callbacks.c:949
+#: ../gtk/main.c:2006 ../coreapi/callbacks.c:983
 #, c-format
 msgid "We are transferred to %s"
 msgstr "אנחנו מועברים אל %s"
 
-# קריאות שמע
-#: ../gtk/main.c:2109
+#: ../gtk/main.c:2016
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
-msgstr ""
-"לא אותרו כרטיסי קול במחשב זה.\n"
-"לא תהיה ביכולתך לשלוח או לקבל שיחות אודיו."
+msgstr "לא אותרו כרטיסי קול במחשב זה.\nלא תהיה ביכולתך לשלוח או לקבל שיחות אודיו."
 
-#: ../gtk/main.c:2250
+#: ../gtk/main.c:2157
 msgid "A free SIP video-phone"
 msgstr "וידאופון SIP חופשי"
 
@@ -281,7 +235,6 @@ msgstr "קריאה"
 msgid "Chat"
 msgstr "שיחה"
 
-# a name or a number
 #: ../gtk/friendlist.c:756
 #, c-format
 msgid "Search in %s directory"
@@ -307,7 +260,6 @@ msgstr "מחק היסטוריית שיחה של '%s'"
 msgid "Add new contact from %s directory"
 msgstr "הוסף איש קשר חדש מן מדור %s"
 
-# קצב תדר תדירות מהירות
 #: ../gtk/propertybox.c:558
 msgid "Rate (Hz)"
 msgstr "שיעור (הרץ)"
@@ -316,22 +268,18 @@ msgstr "שיעור (הרץ)"
 msgid "Status"
 msgstr "מצב"
 
-# שיעור סיביות מינימלי
 #: ../gtk/propertybox.c:570
-#, fuzzy
 msgid "IP Bitrate (kbit/s)"
-msgstr "קצב נתונים מינימלי (קי״ב/שנ׳)"
+msgstr ""
 
 #: ../gtk/propertybox.c:577
 msgid "Parameters"
 msgstr "פרמטרים"
 
-# מאופשר
 #: ../gtk/propertybox.c:620 ../gtk/propertybox.c:763
 msgid "Enabled"
 msgstr "מופעל"
 
-# מנוטרל
 #: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763
 msgid "Disabled"
 msgstr "לא מופעל"
@@ -340,95 +288,92 @@ msgstr "לא מופעל"
 msgid "Account"
 msgstr "חשבון"
 
-#: ../gtk/propertybox.c:1063
+#: ../gtk/propertybox.c:1072
 msgid "English"
 msgstr "English"
 
-#: ../gtk/propertybox.c:1064
+#: ../gtk/propertybox.c:1073
 msgid "French"
 msgstr "Français"
 
-#: ../gtk/propertybox.c:1065
+#: ../gtk/propertybox.c:1074
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ../gtk/propertybox.c:1066
+#: ../gtk/propertybox.c:1075
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../gtk/propertybox.c:1067
+#: ../gtk/propertybox.c:1076
 msgid "Spanish"
 msgstr "Español"
 
-# português do Brasil
-#: ../gtk/propertybox.c:1068
+#: ../gtk/propertybox.c:1077
 msgid "Brazilian Portugese"
 msgstr "português brasileiro"
 
-#: ../gtk/propertybox.c:1069
+#: ../gtk/propertybox.c:1078
 msgid "Polish"
 msgstr "Polski"
 
-#: ../gtk/propertybox.c:1070
+#: ../gtk/propertybox.c:1079
 msgid "German"
 msgstr "Deutsch"
 
-#: ../gtk/propertybox.c:1071
+#: ../gtk/propertybox.c:1080
 msgid "Russian"
 msgstr "Русский"
 
-#: ../gtk/propertybox.c:1072
+#: ../gtk/propertybox.c:1081
 msgid "Japanese"
 msgstr "日本語"
 
-#: ../gtk/propertybox.c:1073
+#: ../gtk/propertybox.c:1082
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ../gtk/propertybox.c:1074
+#: ../gtk/propertybox.c:1083
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ../gtk/propertybox.c:1075
+#: ../gtk/propertybox.c:1084
 msgid "Czech"
 msgstr "Česky"
 
-#: ../gtk/propertybox.c:1076
+#: ../gtk/propertybox.c:1085
 msgid "Chinese"
 msgstr "中文"
 
-# 繁体字
-#: ../gtk/propertybox.c:1077
+#: ../gtk/propertybox.c:1086
 msgid "Traditional Chinese"
 msgstr "繁體字"
 
-#: ../gtk/propertybox.c:1078
+#: ../gtk/propertybox.c:1087
 msgid "Norwegian"
 msgstr "norsk"
 
-#: ../gtk/propertybox.c:1079
+#: ../gtk/propertybox.c:1088
 msgid "Hebrew"
 msgstr "עברית"
 
-#: ../gtk/propertybox.c:1080
+#: ../gtk/propertybox.c:1089
 msgid "Serbian"
 msgstr "српски srpski"
 
-# selected הנבחרת
-#: ../gtk/propertybox.c:1147
+#: ../gtk/propertybox.c:1156
 msgid ""
 "You need to restart linphone for the new language selection to take effect."
 msgstr "עליך לאתחל את לינפון כדי שהשפה החדשה תיכנס לתוקף."
 
-#: ../gtk/propertybox.c:1225
+#: ../gtk/propertybox.c:1234
 msgid "None"
 msgstr "ללא"
 
-#: ../gtk/propertybox.c:1229
+#: ../gtk/propertybox.c:1238
 msgid "SRTP"
 msgstr ""
 
-#: ../gtk/propertybox.c:1235
+#: ../gtk/propertybox.c:1244
 msgid "ZRTP"
 msgstr ""
 
@@ -437,11 +382,8 @@ msgstr ""
 msgid ""
 "A more recent version is availalble from %s.\n"
 "Would you like to open a browser to download it ?"
-msgstr ""
-"גרסא מאוחרת יותר זמינה מן %s.\n"
-"האם ברצונך לפתוח דפדפן בכדי להורידה ?"
+msgstr "גרסא מאוחרת יותר זמינה מן %s.\nהאם ברצונך לפתוח דפדפן בכדי להורידה ?"
 
-# בידך
 #: ../gtk/update.c:91
 msgid "You are running the lastest version."
 msgstr "ברשותך הגרסא האחרונה של לינפון."
@@ -477,9 +419,7 @@ msgstr[1] "נמצאו %i אנשי קשר"
 msgid ""
 "Welcome !\n"
 "This assistant will help you to use a SIP account for your calls."
-msgstr ""
-"ברוך בואך !\n"
-"אשף זה יסייע לך לעשות שימוש בחשבון SIP עבור שיחותייך."
+msgstr "ברוך בואך !\nאשף זה יסייע לך לעשות שימוש בחשבון SIP עבור שיחותייך."
 
 #: ../gtk/setupwizard.c:43
 msgid "Create an account on linphone.org"
@@ -489,7 +429,6 @@ msgstr "צור חשבון אצל linphone.org"
 msgid "I have already a linphone.org account and I just want to use it"
 msgstr "כבר קיים חשבון linphone.org ברשותי וברצוני לעשות בו שימוש"
 
-# כבר קיים ברשותי חשבון sip
 #: ../gtk/setupwizard.c:45
 msgid "I have already a sip account and I just want to use it"
 msgstr "כבר קיים חשבון sip ברשותי וברצוני לעשות בו שימוש"
@@ -530,7 +469,6 @@ msgstr "מתחם*"
 msgid "Proxy"
 msgstr "פרוקסי"
 
-# נדרשים
 #: ../gtk/setupwizard.c:317
 msgid "(*) Required fields"
 msgstr "(*) שדות חובה"
@@ -555,37 +493,26 @@ msgstr "אימות סיסמתך: (*)"
 msgid "Keep me informed with linphone updates"
 msgstr ""
 
-# אינו בר־השגה
-# לשוב אחורה
 #: ../gtk/setupwizard.c:394
 msgid ""
 "Error, account not validated, username already used or server unreachable.\n"
 "Please go back and try again."
-msgstr ""
-"שגיאה, חשבון לא אומת, שם משתמש כבר בשימוש או שרת לא ניתן להשגה.\n"
-"נא לחזור ולנסות שוב."
+msgstr "שגיאה, חשבון לא אומת, שם משתמש כבר בשימוש או שרת לא ניתן להשגה.\nנא לחזור ולנסות שוב."
 
 #: ../gtk/setupwizard.c:405
 msgid "Thank you. Your account is now configured and ready for use."
 msgstr "תודה לך. חשבונך מוגדר ומוכן לשימוש כעת."
 
-# לאחר מכן
 #: ../gtk/setupwizard.c:413
 msgid ""
-"Please validate your account by clicking on the link we just sent you by "
-"email.\n"
+"Please validate your account by clicking on the link we just sent you by email.\n"
 "Then come back here and press Next button."
-msgstr ""
-"נא לאמת את חשבונך באמצעות הקלקה על הקישור ששלחנו לך עתה באמצעות דוא״ל.\n"
-"אחרי כן נא לחזור לכאן וללחוץ על הלחצן 'קדימה'."
+msgstr "נא לאמת את חשבונך באמצעות הקלקה על הקישור ששלחנו לך עתה באמצעות דוא״ל.\nאחרי כן נא לחזור לכאן וללחוץ על הלחצן 'קדימה'."
 
 #: ../gtk/setupwizard.c:600
-#, fuzzy
 msgid "SIP account configuration assistant"
-msgstr "אשף הגדרת חשבון"
+msgstr ""
 
-# Wizard אשף
-# סייע
 #: ../gtk/setupwizard.c:618
 msgid "Welcome to the account setup assistant"
 msgstr "ברוך בואך אל אשף הגדרת החשבון"
@@ -594,7 +521,6 @@ msgstr "ברוך בואך אל אשף הגדרת החשבון"
 msgid "Account setup assistant"
 msgstr "אשף הגדרת חשבון"
 
-# שלב
 #: ../gtk/setupwizard.c:629
 msgid "Configure your account (step 1/1)"
 msgstr "הגדרת חשבונך (צעד 1/1)"
@@ -607,7 +533,6 @@ msgstr "הזנת שם משתמש sip (צעד 1/1)"
 msgid "Enter account information (step 1/2)"
 msgstr "הזנת מידע חשבון (צעד 1/2)"
 
-# תקפות
 #: ../gtk/setupwizard.c:647
 msgid "Validation (step 2/2)"
 msgstr "אימות (צעד 2/2)"
@@ -687,9 +612,7 @@ msgstr "ישיר או דרך שרת"
 msgid ""
 "download: %f\n"
 "upload: %f (kbit/s)"
-msgstr ""
-"הורדה: %f\n"
-"העלאה: %f (קי״ב/שנ׳)"
+msgstr "הורדה: %f\nהעלאה: %f (קי״ב/שנ׳)"
 
 #: ../gtk/incall_view.c:272 ../gtk/incall_view.c:274
 #, c-format
@@ -705,117 +628,108 @@ msgstr "%.3f שניות"
 msgid "Hang up"
 msgstr "נתק"
 
-#: ../gtk/incall_view.c:501
+#: ../gtk/incall_view.c:511
 msgid "<b>Calling...</b>"
 msgstr "<b>מתקשר כעת...</b>"
 
-#: ../gtk/incall_view.c:504 ../gtk/incall_view.c:707
+#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:727
 msgid "00::00::00"
 msgstr "‭00::00::00"
 
-#: ../gtk/incall_view.c:515
+#: ../gtk/incall_view.c:525
 msgid "<b>Incoming call</b>"
 msgstr "<b>קריאה נכנסת</b>"
 
-#: ../gtk/incall_view.c:552
+#: ../gtk/incall_view.c:562
 msgid "good"
 msgstr "טובה"
 
-# רגילה
-#: ../gtk/incall_view.c:554
+#: ../gtk/incall_view.c:564
 msgid "average"
 msgstr "ממוצעת"
 
-# weak חלשה חלושה רפויה רופפת
-#: ../gtk/incall_view.c:556
+#: ../gtk/incall_view.c:566
 msgid "poor"
 msgstr "דלה"
 
-#: ../gtk/incall_view.c:558
+#: ../gtk/incall_view.c:568
 msgid "very poor"
 msgstr "דלה מאוד"
 
-# רעה
-#: ../gtk/incall_view.c:560
+#: ../gtk/incall_view.c:570
 msgid "too bad"
 msgstr "גרועה מדי"
 
-#: ../gtk/incall_view.c:561 ../gtk/incall_view.c:577
+#: ../gtk/incall_view.c:571 ../gtk/incall_view.c:587
 msgid "unavailable"
 msgstr "לא זמינה"
 
-# באמצעות
-#: ../gtk/incall_view.c:669
+#: ../gtk/incall_view.c:679
 msgid "Secured by SRTP"
 msgstr "מאובטחת על ידי SRTP"
 
-#: ../gtk/incall_view.c:675
+#: ../gtk/incall_view.c:685
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
 msgstr "מאובטחת על ידי ZRTP - [אות אימות: %s]"
 
-# set or unset verification state of ZRTP SAS.
-#: ../gtk/incall_view.c:681
+#: ../gtk/incall_view.c:691
 msgid "Set unverified"
 msgstr "הגדר כלא מאומתת"
 
-#: ../gtk/incall_view.c:681 ../gtk/main.ui.h:4
+#: ../gtk/incall_view.c:691 ../gtk/main.ui.h:4
 msgid "Set verified"
 msgstr "הגדר כמאומתת"
 
-#: ../gtk/incall_view.c:702
+#: ../gtk/incall_view.c:722
 msgid "In conference"
 msgstr "בשיחת ועידה"
 
-#: ../gtk/incall_view.c:702
+#: ../gtk/incall_view.c:722
 msgid "<b>In call</b>"
 msgstr "<b>בשיחה כעת</b>"
 
-#: ../gtk/incall_view.c:738
+#: ../gtk/incall_view.c:758
 msgid "<b>Paused call</b>"
 msgstr "<b>שיחה מושהית</b>"
 
-# שעות %02i דקות %02i שניות %02i
-# Force LTR time format (hours::minutes::seconds) with LRO chatacter (U+202D)
-#: ../gtk/incall_view.c:751
+#: ../gtk/incall_view.c:771
 #, c-format
 msgid "%02i::%02i::%02i"
 msgstr "‭%02i::%02i::%02i"
 
-#: ../gtk/incall_view.c:772
+#: ../gtk/incall_view.c:794
 msgid "<b>Call ended.</b>"
 msgstr "<b>שיחה הסתיימה.</b>"
 
-#: ../gtk/incall_view.c:803
+#: ../gtk/incall_view.c:825
 msgid "Transfer in progress"
 msgstr "העברה מצויה כעת בעיצומה"
 
-#: ../gtk/incall_view.c:806
+#: ../gtk/incall_view.c:828
 msgid "Transfer done."
 msgstr "העברה הסתיימה."
 
-#: ../gtk/incall_view.c:809
+#: ../gtk/incall_view.c:831
 msgid "Transfer failed."
 msgstr "העברה נכשלה."
 
-#: ../gtk/incall_view.c:853
+#: ../gtk/incall_view.c:875
 msgid "Resume"
 msgstr "חזור"
 
-#: ../gtk/incall_view.c:860 ../gtk/main.ui.h:9
+#: ../gtk/incall_view.c:882 ../gtk/main.ui.h:9
 msgid "Pause"
 msgstr "השהה"
 
-#: ../gtk/incall_view.c:926
+#: ../gtk/incall_view.c:948
 #, c-format
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
-msgstr ""
-"<small><i>מקליט אל תוך\n"
-"%s %s</i></small>"
+msgstr "<small><i>מקליט אל תוך\n%s %s</i></small>"
 
-#: ../gtk/incall_view.c:926
+#: ../gtk/incall_view.c:948
 msgid "(Paused)"
 msgstr "(מושהה)"
 
@@ -851,18 +765,14 @@ msgid "Too loud"
 msgstr ""
 
 #: ../gtk/audio_assistant.c:318
-#, fuzzy
 msgid ""
 "Welcome !\n"
 "This assistant will help you to configure audio settings for Linphone"
 msgstr ""
-"ברוך בואך !\n"
-"אשף זה יסייע לך לעשות שימוש בחשבון SIP עבור שיחותייך."
 
 #: ../gtk/audio_assistant.c:328
-#, fuzzy
 msgid "Capture device"
-msgstr "התקן לכידה:"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:329
 msgid "Recorded volume"
@@ -873,9 +783,8 @@ msgid "No voice"
 msgstr ""
 
 #: ../gtk/audio_assistant.c:369
-#, fuzzy
 msgid "Playback device"
-msgstr "התקן פס קול:"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:370
 msgid "Play three beeps"
@@ -894,14 +803,12 @@ msgid "Let's start Linphone now"
 msgstr ""
 
 #: ../gtk/audio_assistant.c:496
-#, fuzzy
 msgid "Audio Assistant"
-msgstr "אשף חשבון"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:506 ../gtk/main.ui.h:31
-#, fuzzy
 msgid "Audio assistant"
-msgstr "אשף חשבון"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:511
 msgid "Mic Gain calibration"
@@ -915,13 +822,10 @@ msgstr ""
 msgid "Record and Play"
 msgstr ""
 
-# מתקשר Caller
-# זה ש: נתקשר או מתוקשר או הותקשר?
 #: ../gtk/main.ui.h:1
 msgid "<b>Callee name</b>"
 msgstr "<b>שם מקבל</b>"
 
-# שגר
 #: ../gtk/main.ui.h:2
 msgid "Send"
 msgstr "שלח"
@@ -974,7 +878,6 @@ msgstr "‫ADSL"
 msgid "Fiber Channel"
 msgstr "ערוץ סיב"
 
-# משתמט
 #: ../gtk/main.ui.h:21
 msgid "Default"
 msgstr "ברירת מחדל"
@@ -983,11 +886,9 @@ msgstr "ברירת מחדל"
 msgid "_Options"
 msgstr "_אפשרויות"
 
-# וידוא
 #: ../gtk/main.ui.h:23
-#, fuzzy
 msgid "Set configuration URI"
-msgstr "אימות"
+msgstr ""
 
 #: ../gtk/main.ui.h:24
 msgid "Always start video"
@@ -1041,12 +942,10 @@ msgstr "<b>הוסף אנשי קשר מן מדור</b>"
 msgid "Add contact"
 msgstr "הוסף איש קשר"
 
-# קריאות אחרונות
 #: ../gtk/main.ui.h:38
 msgid "Recent calls"
 msgstr "שיחות אחרונות"
 
-# הזהות הנוכחית שלי
 #: ../gtk/main.ui.h:39
 msgid "My current identity:"
 msgstr "זהותי הנוכחית:"
@@ -1059,7 +958,6 @@ msgstr "שם משתמש"
 msgid "Password"
 msgstr "סיסמה"
 
-# מרשתת
 #: ../gtk/main.ui.h:42
 msgid "Internet connection:"
 msgstr "חיבור אינטרנט:"
@@ -1088,8 +986,6 @@ msgstr "מחק"
 msgid "About linphone"
 msgstr "אודות לינפון"
 
-# Should be updated to 2012 2013
-# כל הזכויות שמורות (C) ‫Belledonne Communications, ‫2010\n
 #: ../gtk/about.ui.h:2
 msgid "(C) Belledonne Communications,2010\n"
 msgstr "‫(C) ‫Belledonne Communications,‫2010\n"
@@ -1142,12 +1038,10 @@ msgstr "גלול אוטומטית לסוף"
 msgid "Linphone - Authentication required"
 msgstr "‫Linphone - נדרש אימות"
 
-# תחום
 #: ../gtk/password.ui.h:2
 msgid "Please enter the domain password"
 msgstr "נא להזין את סיסמת המתחם"
 
-# קריאות
 #: ../gtk/call_logs.ui.h:1
 msgid "Call history"
 msgstr "היסטוריית שיחות"
@@ -1156,7 +1050,6 @@ msgstr "היסטוריית שיחות"
 msgid "Clear all"
 msgstr "טיהור מוחלט"
 
-# קריאה חוזרת
 #: ../gtk/call_logs.ui.h:3
 msgid "Call back"
 msgstr "חיוג חוזר"
@@ -1190,9 +1083,8 @@ msgid "Registration duration (sec):"
 msgstr "משך רישום (בשניות):"
 
 #: ../gtk/sip_account.ui.h:8
-#, fuzzy
 msgid "Contact params (optional):"
-msgstr "ניתוב (רשות):"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:9
 msgid "AVPF regular RTCP interval (sec):"
@@ -1202,11 +1094,9 @@ msgstr ""
 msgid "Route (optional):"
 msgstr "ניתוב (רשות):"
 
-# מוביל
 #: ../gtk/sip_account.ui.h:11
-#, fuzzy
 msgid "Transport"
-msgstr "<b>טרנספורט</b>"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:12
 msgid "Register"
@@ -1217,9 +1107,8 @@ msgid "Publish presence information"
 msgstr "פרסם מידע נוכחות"
 
 #: ../gtk/sip_account.ui.h:14
-#, fuzzy
 msgid "Enable AVPF"
-msgstr "אפשר"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:15
 msgid "Configure a SIP account"
@@ -1281,7 +1170,6 @@ msgstr "‏SIP ‏(TLS)"
 msgid "Settings"
 msgstr "הגדרות"
 
-# שידור
 #: ../gtk/parameters.ui.h:15
 msgid "Set Maximum Transmission Unit:"
 msgstr "הגדר יחידת תמסורת מרבית:"
@@ -1294,7 +1182,6 @@ msgstr "שלח טזמ״תים (DTMFs) כמידע SIP"
 msgid "Use IPv6 instead of IPv4"
 msgstr "השתמש בפרוטוקול IPv6 במקום בפרוטוקול IPv4"
 
-# מוביל
 #: ../gtk/parameters.ui.h:18
 msgid "<b>Transport</b>"
 msgstr "<b>טרנספורט</b>"
@@ -1344,25 +1231,17 @@ msgid "Direct connection to the Internet"
 msgstr "חיבור ישיר אל האינטרנט"
 
 #: ../gtk/parameters.ui.h:30
-#, fuzzy
 msgid "Behind NAT / Firewall (specify gateway IP )"
-msgstr "מאחורי NAT / חומת אש (ציון כתובת שער (Gateway IP) למטה)"
+msgstr ""
 
-# ניצול STUN
-# שימוש ב־STUN
-# utilize
 #: ../gtk/parameters.ui.h:31
 msgid "Behind NAT / Firewall (use STUN to resolve)"
 msgstr "מאחורי NAT  /  חומת אש (בעזרת STUN לפתירה)"
 
-# שימוש ב־STUN
-# utilize
 #: ../gtk/parameters.ui.h:32
 msgid "Behind NAT / Firewall (use ICE)"
 msgstr "מאחורי NAT  /  חומת אש (בעזרת ICE)"
 
-# שימוש ב־STUN
-# utilize
 #: ../gtk/parameters.ui.h:33
 msgid "Behind NAT / Firewall (use uPnP)"
 msgstr "מאחורי NAT  /  חומת אש (בעזרת uPnP)"
@@ -1415,15 +1294,13 @@ msgstr "<b>אודיו</b>"
 msgid "Video input device:"
 msgstr "התקן קלט וידאו:"
 
-# רצויה
 #: ../gtk/parameters.ui.h:46
 msgid "Prefered video resolution:"
 msgstr "רזולוציית וידאו מועדפת:"
 
 #: ../gtk/parameters.ui.h:47
-#, fuzzy
 msgid "Video output method:"
-msgstr "התקן קלט וידאו:"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:48
 msgid "<b>Video</b>"
@@ -1469,7 +1346,6 @@ msgstr "ערוך"
 msgid "Remove"
 msgstr "הסר"
 
-# חשבונות מתווכים
 #: ../gtk/parameters.ui.h:59
 msgid "<b>Proxy accounts</b>"
 msgstr "<b>חשבונות Proxy</b>"
@@ -1498,18 +1374,14 @@ msgstr "נטרל"
 msgid "<b>Codecs</b>"
 msgstr "<b>קודקים</b>"
 
-# ללא הגבלה
 #: ../gtk/parameters.ui.h:66
 msgid "0 stands for \"unlimited\""
 msgstr "0 מסמל \"בלי הגבלה\""
 
-# does KiB mean kibibyte?
 #: ../gtk/parameters.ui.h:67
 msgid "Upload speed limit in Kbit/sec:"
 msgstr "מגבלת מהירות העלאה בקי״ב/שנ׳:"
 
-# האם KiB זה kibibyte?
-# קי״ב (1024) אל מול ק״ב (1000)
 #: ../gtk/parameters.ui.h:68
 msgid "Download speed limit in Kbit/sec:"
 msgstr "מגבלת מהירות הורדה בקי״ב/שנ׳:"
@@ -1518,17 +1390,12 @@ msgstr "מגבלת מהירות הורדה בקי״ב/שנ׳:"
 msgid "Enable adaptive rate control"
 msgstr "אפשר בקרת קצב מסתגלת"
 
-# שיטה ניחוש
 #: ../gtk/parameters.ui.h:70
 msgid ""
 "<i>Adaptive rate control is a technique to dynamically guess the available "
 "bandwidth during a call.</i>"
-msgstr ""
-"<i>בקרת קצב מסתגלת הינה טכניקה להשערה דינמית של רוחב הפס הזמין במהלך שיחה.</"
-"i>"
+msgstr "<i>בקרת קצב מסתגלת הינה טכניקה להשערה דינמית של רוחב הפס הזמין במהלך שיחה.</i>"
 
-# פס רוחב
-# טווח תדרים
 #: ../gtk/parameters.ui.h:71
 msgid "<b>Bandwidth control</b>"
 msgstr "<b>בקרת רוחב פס</b>"
@@ -1554,24 +1421,20 @@ msgid "User interface"
 msgstr "ממשק משתמש"
 
 #: ../gtk/parameters.ui.h:77 ../gtk/ldap.ui.h:2
-#, fuzzy
 msgid "Server address:"
-msgstr "כתובת SIP Proxy:"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:78 ../gtk/ldap.ui.h:3
-#, fuzzy
 msgid "Authentication method:"
-msgstr "כשל באימות"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:80
 msgid "label"
 msgstr "תוויות"
 
-# חשבונות מתווכים
 #: ../gtk/parameters.ui.h:81
-#, fuzzy
 msgid "<b>LDAP Account setup</b>"
-msgstr "<b>חשבונות Proxy</b>"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:82
 msgid "LDAP"
@@ -1589,7 +1452,6 @@ msgstr "חיפוש אנשי קשר בתוך מדור"
 msgid "Add to my list"
 msgstr "הוסף אל הרשימה שלי"
 
-# חיפוש מאן דהו
 #: ../gtk/buddylookup.ui.h:3
 msgid "<b>Search somebody</b>"
 msgstr "<b>חיפוש אחר מישהו</b>"
@@ -1603,9 +1465,8 @@ msgid "Please wait"
 msgstr "נא להמתין"
 
 #: ../gtk/dscp_settings.ui.h:1
-#, fuzzy
 msgid "DSCP settings"
-msgstr "הגדרות Dscp"
+msgstr ""
 
 #: ../gtk/dscp_settings.ui.h:2
 msgid "SIP"
@@ -1659,11 +1520,9 @@ msgstr "זמן הלוך ושוב"
 msgid "Video resolution received"
 msgstr ""
 
-# רצויה
 #: ../gtk/call_statistics.ui.h:10
-#, fuzzy
 msgid "Video resolution sent"
-msgstr "רזולוציית וידאו מועדפת:"
+msgstr ""
 
 #: ../gtk/call_statistics.ui.h:11
 msgid "RTP profile"
@@ -1754,23 +1613,20 @@ msgid "1"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:1
-#, fuzzy
 msgid "LDAP Settings"
-msgstr "הגדרות"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:6
 msgid "Use TLS Connection"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:7
-#, fuzzy
 msgid "Not yet available"
-msgstr "‏uPnp לא זמינה"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:8
-#, fuzzy
 msgid "<b>Connection</b>"
-msgstr "<b>קודקים</b>"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:9
 msgid "Bind DN"
@@ -1785,9 +1641,8 @@ msgid "Realm"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:12
-#, fuzzy
 msgid "<b>SASL</b>"
-msgstr "<b>אודיו</b>"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:13
 msgid "Base object:"
@@ -1803,19 +1658,16 @@ msgid "Name Attribute:"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:17
-#, fuzzy
 msgid "SIP address attribute:"
-msgstr "כתובת SIP או מספר טלפון"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:18
 msgid "Attributes to query:"
 msgstr ""
 
-# חיפוש מאן דהו
 #: ../gtk/ldap.ui.h:19
-#, fuzzy
 msgid "<b>Search</b>"
-msgstr "<b>חיפוש אחר מישהו</b>"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:20
 msgid "Timeout for search:"
@@ -1830,9 +1682,8 @@ msgid "Follow Aliases"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:23
-#, fuzzy
 msgid "<b>Miscellaneous</b>"
-msgstr "<b>וידאו</b>"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:24
 msgid "ANONYMOUS"
@@ -1856,11 +1707,8 @@ msgstr ""
 
 #: ../gtk/config-uri.ui.h:2
 msgid ""
-"This dialog allows to set an http or https address when configuration is to "
-"be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, "
-"Linphone will restart automatically in order to fetch and take into account "
-"the new configuration. "
+"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
 msgstr ""
 
 #: ../gtk/config-uri.ui.h:4
@@ -1868,85 +1716,79 @@ msgid "https://"
 msgstr ""
 
 #: ../gtk/provisioning-fetch.ui.h:1
-#, fuzzy
 msgid "Configuring..."
-msgstr "מתחבר כעת..."
+msgstr ""
 
 #: ../gtk/provisioning-fetch.ui.h:2
 msgid "Please wait while fetching configuration from server..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1034
+#: ../coreapi/linphonecore.c:1511
 msgid "Ready"
 msgstr "מוכן"
 
-# וידוא
-#: ../coreapi/linphonecore.c:1967
-#, fuzzy
+#: ../coreapi/linphonecore.c:2470
 msgid "Configuring"
-msgstr "אימות"
+msgstr ""
 
-#: ../coreapi/linphonecore.c:2133
+#: ../coreapi/linphonecore.c:2635
 msgid "Looking for telephone number destination..."
 msgstr "מחפש כעת עבור יעד מספר טלפון..."
 
-#: ../coreapi/linphonecore.c:2136
+#: ../coreapi/linphonecore.c:2637
 msgid "Could not resolve this number."
 msgstr "לא ניתן לפתור את מספר זה."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2418
+#: ../coreapi/linphonecore.c:2919
 msgid "Contacting"
 msgstr "מתקשר כעת"
 
-#: ../coreapi/linphonecore.c:2425
+#: ../coreapi/linphonecore.c:2924
 msgid "Could not call"
 msgstr "לא ניתן להתקשר"
 
-# מספר השיחות המקבילות המרבי
-#: ../coreapi/linphonecore.c:2576
+#: ../coreapi/linphonecore.c:3074
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "הגענו אל המספר המרבי של שיחות מקבילות, עמך הסליחה"
 
-#: ../coreapi/linphonecore.c:2745
+#: ../coreapi/linphonecore.c:3233
 msgid "is contacting you"
 msgstr "מתקשר/ת אליך"
 
-#: ../coreapi/linphonecore.c:2746
+#: ../coreapi/linphonecore.c:3234
 msgid " and asked autoanswer."
 msgstr " ומבקש/ת מענה אוטומטי."
 
-#: ../coreapi/linphonecore.c:2746
+#: ../coreapi/linphonecore.c:3234
 msgid "."
 msgstr ""
 
-# פרמטרי קריאה
-#: ../coreapi/linphonecore.c:2865
+#: ../coreapi/linphonecore.c:3352
 msgid "Modifying call parameters..."
 msgstr "מתאים כעת פרמטרים של שיחה..."
 
-#: ../coreapi/linphonecore.c:3194
+#: ../coreapi/linphonecore.c:3700
 msgid "Connected."
 msgstr "מקושר."
 
-#: ../coreapi/linphonecore.c:3220
+#: ../coreapi/linphonecore.c:3725
 msgid "Call aborted"
 msgstr "קריאה בוטלה"
 
-#: ../coreapi/linphonecore.c:3412
+#: ../coreapi/linphonecore.c:3915
 msgid "Could not pause the call"
 msgstr "לא ניתן להשהות את השיחה"
 
-#: ../coreapi/linphonecore.c:3417
+#: ../coreapi/linphonecore.c:3919
 msgid "Pausing the current call..."
 msgstr "משהה כעת שיחה נוכחית..."
 
-# במהלך (או) באמצע חיפוש...
-#: ../coreapi/misc.c:425
+#: ../coreapi/misc.c:438
 msgid "Stun lookup in progress..."
 msgstr "בדיקת STUN מצויה כעת בעיצומה..."
 
-#: ../coreapi/misc.c:607
+#: ../coreapi/misc.c:619
 msgid "ICE local candidates gathering in progress..."
 msgstr "צבירת מועמדים מקומיים של ICE מצויה כעת בעיצומה..."
 
@@ -1958,7 +1800,6 @@ msgstr "מקוון"
 msgid "Busy"
 msgstr "עסוק"
 
-# מיד אשוב
 #: ../coreapi/friend.c:39
 msgid "Be right back"
 msgstr "כבר אשוב"
@@ -1979,14 +1820,10 @@ msgstr "בארוחת צהריים"
 msgid "Do not disturb"
 msgstr "נא לא להפריע"
 
-# Is it: change residence?
-# What is the difference with Away?
-# fr Parti
 #: ../coreapi/friend.c:54
 msgid "Moved"
 msgstr "עברתי דירה"
 
-# additional נוסף
 #: ../coreapi/friend.c:57
 msgid "Using another messaging service"
 msgstr "אני עושה כעת שימוש בשירות מסרים אחר"
@@ -2000,338 +1837,147 @@ msgid "Pending"
 msgstr "בהמתנה"
 
 #: ../coreapi/friend.c:66
-#, fuzzy
 msgid "Vacation"
-msgstr "משך זמן"
+msgstr ""
 
 #: ../coreapi/friend.c:68
 msgid "Unknown-bug"
 msgstr "תקלה לא מוכרת"
 
-#: ../coreapi/proxy.c:314
+#: ../coreapi/proxy.c:319
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
-msgstr ""
-"כתובת sip proxy שהזנת הינה שגויה, זו צריכה להתחיל עם‭\"sip:\" ‬ לאחר שם מארח."
+msgstr "כתובת sip proxy שהזנת הינה שגויה, זו צריכה להתחיל עם‭\"sip:\" ‬ לאחר שם מארח."
 
-# כמו למשל
-#: ../coreapi/proxy.c:320
+#: ../coreapi/proxy.c:325
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
-msgstr ""
-"זהות sip שהוזנה הינה שגויה.\n"
-"זו צריכה להיראות כמו sip:username@proxydomain, למשל sip:alice@example.net"
+msgstr "זהות sip שהוזנה הינה שגויה.\nזו צריכה להיראות כמו sip:username@proxydomain, למשל sip:alice@example.net"
 
-# בשם כ־
-#: ../coreapi/proxy.c:1369
+#: ../coreapi/proxy.c:1377
 #, c-format
 msgid "Could not login as %s"
 msgstr "לא ניתן להתחבר בזהות %s"
 
-#: ../coreapi/callbacks.c:355
+#: ../coreapi/callbacks.c:383
 msgid "Remote ringing."
 msgstr "צלצול מרוחק."
 
-#: ../coreapi/callbacks.c:373
+#: ../coreapi/callbacks.c:404
 msgid "Remote ringing..."
 msgstr "צלצול מרוחק..."
 
-# A SIP state
-#: ../coreapi/callbacks.c:384
+#: ../coreapi/callbacks.c:414
 msgid "Early media."
 msgstr "מדיה מוקדמת."
 
-#: ../coreapi/callbacks.c:435
+#: ../coreapi/callbacks.c:475
 #, c-format
 msgid "Call with %s is paused."
 msgstr "שיחה עם %s מושהית."
 
-#: ../coreapi/callbacks.c:448
+#: ../coreapi/callbacks.c:488
 #, c-format
 msgid "Call answered by %s - on hold."
 msgstr "קריאה נענתה על ידי %s - בהמתנה."
 
-# renewed
-#: ../coreapi/callbacks.c:459
+#: ../coreapi/callbacks.c:498
 msgid "Call resumed."
 msgstr "קריאה חודשה."
 
-#: ../coreapi/callbacks.c:464
+#: ../coreapi/callbacks.c:502
 #, c-format
 msgid "Call answered by %s."
 msgstr "קריאה נענתה על ידי %s."
 
-# לא תואם
-# אי תאימות
-# אי התאמה
-#: ../coreapi/callbacks.c:483
+#: ../coreapi/callbacks.c:525
 msgid "Incompatible, check codecs or security settings..."
 msgstr "חוסר תאימות, בדוק קודקים או הגדרות אבטחה..."
 
-#: ../coreapi/callbacks.c:512
+#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:826
+msgid "Incompatible media parameters."
+msgstr "פרמטריי מדיה חסרי תואמים."
+
+#: ../coreapi/callbacks.c:560
 msgid "We have been resumed."
 msgstr "חזרנו."
 
-#: ../coreapi/callbacks.c:521
+#. we are being paused
+#: ../coreapi/callbacks.c:568
 msgid "We are paused by other party."
 msgstr "אנו מושהים על ידי צד אחר."
 
-# באופן מרוחק
-#: ../coreapi/callbacks.c:556
+#. reINVITE and in-dialogs UPDATE go here
+#: ../coreapi/callbacks.c:602
 msgid "Call is updated by remote."
 msgstr "שיחה עודכנה מרחוק."
 
-#: ../coreapi/callbacks.c:658
+#: ../coreapi/callbacks.c:705
 msgid "Call terminated."
 msgstr "קריאה הסתיימה."
 
-#: ../coreapi/callbacks.c:687
+#: ../coreapi/callbacks.c:733
 msgid "User is busy."
 msgstr "משתמש עסוק כעת."
 
-#: ../coreapi/callbacks.c:688
+#: ../coreapi/callbacks.c:734
 msgid "User is temporarily unavailable."
 msgstr "משתמש לא זמין זמנית."
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:690
+#: ../coreapi/callbacks.c:736
 msgid "User does not want to be disturbed."
 msgstr "משתמש לא מעוניין שיפריעו לו."
 
-#: ../coreapi/callbacks.c:691
+#: ../coreapi/callbacks.c:737
 msgid "Call declined."
 msgstr "קריאה סורבה."
 
-#: ../coreapi/callbacks.c:706
+#: ../coreapi/callbacks.c:752
 msgid "Request timeout."
 msgstr ""
 
-#: ../coreapi/callbacks.c:737
+#: ../coreapi/callbacks.c:780
 msgid "Redirected"
 msgstr "מכוון מחדש"
 
-# לא תואם
-# אי תאימות
-# אי התאמה
-#: ../coreapi/callbacks.c:787
-msgid "Incompatible media parameters."
-msgstr "פרמטריי מדיה חסרי תואמים."
-
-#: ../coreapi/callbacks.c:798
+#: ../coreapi/callbacks.c:835
 msgid "Call failed."
 msgstr "קריאה נכשלה."
 
-# הרשמה אצל %s הושלמה בהצלחה.
-#: ../coreapi/callbacks.c:878
+#: ../coreapi/callbacks.c:913
 #, c-format
 msgid "Registration on %s successful."
 msgstr "רישום אצל %s הושלם בהצלחה."
 
-#: ../coreapi/callbacks.c:879
+#: ../coreapi/callbacks.c:914
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "אי רישום אצל %s סוים."
 
-# Pas de réponse
-# no response in defined time
-#: ../coreapi/callbacks.c:897
+#: ../coreapi/callbacks.c:932
 msgid "no response timeout"
 msgstr "אין היענות תוך זמן מוגדר"
 
-#: ../coreapi/callbacks.c:900
+#: ../coreapi/callbacks.c:935
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "רישום אצל %s נכשל: %s"
 
-#: ../coreapi/callbacks.c:907
+#: ../coreapi/callbacks.c:942
 msgid "Service unavailable, retrying"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:177
+#: ../coreapi/linphonecall.c:174
 #, c-format
 msgid "Authentication token is %s"
 msgstr "אות האימות הינה %s"
 
-# האם כדאי לחקות את הטלפונים הניידים? שיחות של נענו
-#: ../coreapi/linphonecall.c:2932
+#: ../coreapi/linphonecall.c:3020
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
 msgstr[0] "החמצת שיחה %i."
 msgstr[1] "החמצת %i שיחות."
-
-#~ msgid "aborted"
-#~ msgstr "ננטשה"
-
-#~ msgid "completed"
-#~ msgstr "הסתיימה"
-
-#~ msgid "missed"
-#~ msgstr "הוחמצה"
-
-# needs to be tested
-#~ msgid ""
-#~ "%s at %s\n"
-#~ "From: %s\n"
-#~ "To: %s\n"
-#~ "Status: %s\n"
-#~ "Duration: %i mn %i sec\n"
-#~ msgstr ""
-#~ "%s אצל %s\n"
-#~ "מאת: %s\n"
-#~ "אל: %s\n"
-#~ "מצב: %s\n"
-#~ "משך: %i mn %i sec\n"
-
-#~ msgid "Outgoing call"
-#~ msgstr "קריאה יוצאת"
-
-#~ msgid "No response."
-#~ msgstr "אין תגובה."
-
-#~ msgid "Protocol error."
-#~ msgstr "שגיאת פרוטוקול."
-
-# לרוב
-#~ msgid ""
-#~ "Could not parse given sip address. A sip url usually looks like sip:"
-#~ "user@domain"
-#~ msgstr ""
-#~ "לא ניתן היה לפענח את הכתובת שניתנה. כתובת sip בדרך כלל נראית כך: sip:"
-#~ "user@domain"
-
-#~ msgid ""
-#~ "Your computer appears to be using ALSA sound drivers.\n"
-#~ "This is the best choice. However the pcm oss emulation module\n"
-#~ "is missing and linphone needs it. Please execute\n"
-#~ "'modprobe snd-pcm-oss' as root to load it."
-#~ msgstr ""
-#~ "נראה שמחשבך עושה שימוש במנהל התקן הקול ALSA.\n"
-#~ "זוהי הבחירה הטובה ביותר. אולם מודול ההדמיה (emulation module) של pcm oss\n"
-#~ "נעדר ולינפון זקוק לו. נא להריץ את הפקודה\n"
-#~ "‫'modprobe snd-pcm-oss' כמשתמש שורש (משתמש על) כדי להטעינו."
-
-#~ msgid ""
-#~ "Your computer appears to be using ALSA sound drivers.\n"
-#~ "This is the best choice. However the mixer oss emulation module\n"
-#~ "is missing and linphone needs it. Please execute\n"
-#~ " 'modprobe snd-mixer-oss' as root to load it."
-#~ msgstr ""
-#~ "נראה שמחשבך עושה שימוש במנהל התקן הקול ALSA.\n"
-#~ "זוהי הבחירה הטובה ביותר. אולם מודול ההדמיה (emulation module) של mixer "
-#~ "oss\n"
-#~ "נעדר ולינפון זקוק לו. נא להריץ את הפקודה\n"
-#~ "‫'modprobe snd-mixer-oss' כמשתמש שורש (משתמש על) כדי להטעינו."
-
-#~ msgid "<span size=\"large\">by %s</span>"
-#~ msgstr "<span size=\"large\">מאת %s</span>"
-
-#~ msgid "Keypad"
-#~ msgstr "לוח מקשים"
-
-# שוחחו
-#~ msgid "Chat with %s"
-#~ msgstr "שיחה עם %s"
-
-#~ msgid "Enable video"
-#~ msgstr "הפעל וידאו"
-
-# הזנת
-#~ msgid "Enter username, phone number, or full sip address"
-#~ msgstr "נא להזין שם משתמש, מספר טלפון, או כתובת sip מלאה"
-
-# עיון
-#~ msgid "Lookup:"
-#~ msgstr "חיפוש:"
-
-# במסגרת
-#~ msgid "in"
-#~ msgstr "בקרב"
-
-#~ msgid ""
-#~ "Register to FONICS\n"
-#~ "virtual network !"
-#~ msgstr ""
-#~ "רישום אל FONICS\n"
-#~ "רשת עבודה וירטואלית !"
-
-#~ msgid "edit"
-#~ msgstr "עריכה"
-
-#~ msgid "We are being paused..."
-#~ msgstr "אנחנו כעת מושהים..."
-
-#~ msgid "No common codecs"
-#~ msgstr "אין קודקים משותפים"
-
-#~ msgid "Please choose a username:"
-#~ msgstr "נא לבחור שם משתמש:"
-
-#~ msgid "Checking if '%s' is available..."
-#~ msgstr "בודק כעת אם '%s' זמין..."
-
-#~ msgid "Please wait..."
-#~ msgstr "נא להמתין..."
-
-#~ msgid "Sorry this username already exists. Please try a new one."
-#~ msgstr "צר לי, שם משתמש זה כבר קיים. נא לנסות אחד חדש."
-
-#, fuzzy
-#~ msgid "Ok !"
-#~ msgstr "חיובי !"
-
-#~ msgid "Communication problem, please try again later."
-#~ msgstr "בעיית תקשורת, נא לנסות שוב מאוחר יותר."
-
-#~ msgid "Choosing a username"
-#~ msgstr "בחירת שם משתמש"
-
-# וידוא
-#, fuzzy
-#~ msgid "Verifying"
-#~ msgstr "מאמת כעת"
-
-#~ msgid "Creating your account"
-#~ msgstr "חשבונך נוצר כעת"
-
-#~ msgid "Now ready !"
-#~ msgstr "מוכן כעת !"
-
-#~ msgid ""
-#~ "Pause all calls\n"
-#~ "and answer"
-#~ msgstr ""
-#~ "Pauser les appels en cours\n"
-#~ "et répondre"
-
-#~ msgid "<b>Contact list</b>"
-#~ msgstr "<b>Liste de contacts</b>"
-
-#~ msgid "Audio & video"
-#~ msgstr "Audio et video"
-
-#~ msgid "Audio only"
-#~ msgstr "Audio seul"
-
-#~ msgid "Duration:"
-#~ msgstr "Durée:"
-
-#, fuzzy
-#~ msgid "_Call history"
-#~ msgstr "Historique des appels"
-
-#~ msgid "_Linphone"
-#~ msgstr "_Linphone"
-
-#~ msgid "Register at startup"
-#~ msgstr "S'enregistrer au démarrage"
-
-#~ msgid "Sorry, you have to pause or stop the current call first !"
-#~ msgstr "Désolé, vous devez d'abord mettre en attente l'appel en cours."
-
-#~ msgid "There is already a call in process, pause or stop it first."
-#~ msgstr ""
-#~ "Il y a déjà un appel en cours, veuillez d'abord le mettre en attente ou "
-#~ "le raccrocher."
diff --git a/po/hu.po b/po/hu.po
index 86c3032b5..792868436 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,21 +1,21 @@
-# Hungarian translation for Linphone.
-# Copyright 2013.
-# This file is distributed under the same license as the linphone package.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: Linphone\n"
+"Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-15 09:24+0200\n"
-"PO-Revision-Date: 2013-03-26 19:00+0100\n"
-"Last-Translator: Viktor <viktorbarczi@lavabit.com>\n"
-"Language-Team:  <LL@li.org>\n"
-"Language: Hungarian\n"
+"POT-Creation-Date: 2014-11-19 10:39+0100\n"
+"PO-Revision-Date: 2014-11-19 10:16+0000\n"
+"Last-Translator: Cqnqrd <gautier.pelloux@gmail.com>\n"
+"Language-Team: Hungarian (http://www.transifex.com/projects/p/linphone-gtk/language/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.4\n"
-"Plural-Forms: nplurals=1; plural=1 == 1 ? 0 : 1;\n"
+"Language: hu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974
 #, c-format
@@ -28,9 +28,9 @@ msgid "Send text to %s"
 msgstr "Szöveg küldése a következőnek: %s"
 
 #: ../gtk/calllogs.c:232
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Recent calls (%i)</b>"
-msgstr "<b>vonalban</b>"
+msgstr ""
 
 #: ../gtk/calllogs.c:314
 msgid "n/a"
@@ -52,38 +52,34 @@ msgstr "Elutasítva"
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
-msgstr[0] "%i perc"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../gtk/calllogs.c:332
 #, c-format
 msgid "%i second"
 msgid_plural "%i seconds"
-msgstr[0] "%i másodperc"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../gtk/calllogs.c:335 ../gtk/calllogs.c:341
-#, fuzzy, c-format
+#, c-format
 msgid "<big><b>%s</b></big>\t%s"
 msgstr ""
-"<nagy><b>%s</b></nagy>\t<kis><i>%s</i></kis>\t\n"
-"%s\t%s"
 
 #: ../gtk/calllogs.c:337
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<small><i>%s</i>\t<i>Quality: %s</i></small>\n"
 "%s\t%s\t"
 msgstr ""
-"<nagy><b>%s</b></nagy>\t<kis><i>%s</i>\t<i>Minőség: %s</i></kis>\n"
-"%s\t%s %s\t"
 
 #: ../gtk/calllogs.c:343
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<small><i>%s</i></small>\t\n"
 "%s"
 msgstr ""
-"<nagy><b>%s</b></nagy>\t<kis><i>%s</i></kis>\t\n"
-"%s\t%s"
 
 #: ../gtk/conference.c:38 ../gtk/main.ui.h:13
 msgid "Conference"
@@ -128,110 +124,92 @@ msgstr "Bekapcsolva automatikusan válaszol a bejövő hívásokra"
 
 #: ../gtk/main.c:149
 msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: c:"
-"\\Program Files\\Linphone)"
-msgstr ""
-"Adjon meg egy munkakönyvtárat (ennek az installációs könyvtárnak kéne "
-"lennie, pl. C:\\Program Files\\Linphone)"
+"Specifiy a working directory (should be the base of the installation, eg: "
+"c:\\Program Files\\Linphone)"
+msgstr "Adjon meg egy munkakönyvtárat (ennek az installációs könyvtárnak kéne lennie, pl. C:\\Program Files\\Linphone)"
 
 #: ../gtk/main.c:156
-#, fuzzy
 msgid "Configuration file"
-msgstr "Információk"
+msgstr ""
 
 #: ../gtk/main.c:163
-#, fuzzy
 msgid "Run the audio assistant"
-msgstr "Fiók beállítása varázsló"
+msgstr ""
 
-#: ../gtk/main.c:590
-#, c-format
-msgid "Call with %s"
-msgstr "Hívás %s -el"
-
-#: ../gtk/main.c:1183
+#: ../gtk/main.c:1085
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
-"Would you allow him to see your presence status or add him to your contact "
-"list ?\n"
+"Would you allow him to see your presence status or add him to your contact list ?\n"
 "If you answer no, this person will be temporarily blacklisted."
-msgstr ""
-"%s szeretné Önt hozzáadni partnerlistájához.\n"
-"Szeretné megengedni neki, hogy lássa az Ön jelenlétét, illetve hozzá "
-"szeretné adni a partnerlistához?\n"
-"Ha nemmel válaszol, ez a személy átmenetileg tiltólistára kerül."
+msgstr "%s szeretné Önt hozzáadni partnerlistájához.\nSzeretné megengedni neki, hogy lássa az Ön jelenlétét, illetve hozzá szeretné adni a partnerlistához?\nHa nemmel válaszol, ez a személy átmenetileg tiltólistára kerül."
 
-#: ../gtk/main.c:1260
-#, fuzzy, c-format
+#: ../gtk/main.c:1162
+#, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
 msgstr ""
-"Kérem, adja meg jelszavát a következő felhasználónévhez: <i>%s</i>\n"
-"tartomány <i>%s</i>:"
 
-#: ../gtk/main.c:1376
+#: ../gtk/main.c:1283
 msgid "Call error"
 msgstr "Hiba a hívás közben"
 
-#: ../gtk/main.c:1379 ../coreapi/linphonecore.c:3240
+#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3744
 msgid "Call ended"
 msgstr "Hívás vége"
 
-#: ../gtk/main.c:1382
+#: ../gtk/main.c:1289
 msgid "Incoming call"
 msgstr "Beérkező hívás"
 
-#: ../gtk/main.c:1384 ../gtk/incall_view.c:522 ../gtk/main.ui.h:5
+#: ../gtk/main.c:1291 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
 msgid "Answer"
 msgstr "Hívás fogadása"
 
-#: ../gtk/main.c:1386 ../gtk/main.ui.h:6
+#: ../gtk/main.c:1293 ../gtk/main.ui.h:6
 msgid "Decline"
 msgstr "Elutasítás"
 
-#: ../gtk/main.c:1392
+#: ../gtk/main.c:1299
 msgid "Call paused"
 msgstr "Hívás várakoztatva"
 
-#: ../gtk/main.c:1392
+#: ../gtk/main.c:1299
 #, c-format
 msgid "<b>by %s</b>"
 msgstr "<b>a következő által: %s</b>"
 
-#: ../gtk/main.c:1459
+#: ../gtk/main.c:1366
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr "%s szerené elidítani a videót. Elfogadja?"
 
-#: ../gtk/main.c:1621
+#: ../gtk/main.c:1528
 msgid "Website link"
 msgstr "Internetes oldal"
 
-#: ../gtk/main.c:1670
+#: ../gtk/main.c:1577
 msgid "Linphone - a video internet phone"
 msgstr "Linphone - internetes videó telefon"
 
-#: ../gtk/main.c:1762
+#: ../gtk/main.c:1669
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (Alapértelmezett)"
 
-#: ../gtk/main.c:2099 ../coreapi/callbacks.c:949
+#: ../gtk/main.c:2006 ../coreapi/callbacks.c:983
 #, c-format
 msgid "We are transferred to %s"
 msgstr "Át vagyunk irányítva ide: %s"
 
-#: ../gtk/main.c:2109
+#: ../gtk/main.c:2016
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
-msgstr ""
-"Hangkártya nincs érzékelve ezen a számítógépen.\n"
-"Nem fog tudni hang hívásokat küldeni vagy fogadni."
+msgstr "Hangkártya nincs érzékelve ezen a számítógépen.\nNem fog tudni hang hívásokat küldeni vagy fogadni."
 
-#: ../gtk/main.c:2250
+#: ../gtk/main.c:2157
 msgid "A free SIP video-phone"
 msgstr "Egy ingyenes SIP video-telefon"
 
@@ -271,9 +249,9 @@ msgid "Delete contact '%s'"
 msgstr "'%s' partner törlése"
 
 #: ../gtk/friendlist.c:978
-#, fuzzy, c-format
+#, c-format
 msgid "Delete chat history of '%s'"
-msgstr "'%s' partner törlése"
+msgstr ""
 
 #: ../gtk/friendlist.c:1029
 #, c-format
@@ -289,9 +267,8 @@ msgid "Status"
 msgstr "Állapot"
 
 #: ../gtk/propertybox.c:570
-#, fuzzy
 msgid "IP Bitrate (kbit/s)"
-msgstr "Min bitrate (kbit/s)"
+msgstr ""
 
 #: ../gtk/propertybox.c:577
 msgid "Parameters"
@@ -309,94 +286,92 @@ msgstr "Tiltva"
 msgid "Account"
 msgstr "Hozzáférés"
 
-#: ../gtk/propertybox.c:1063
+#: ../gtk/propertybox.c:1072
 msgid "English"
 msgstr "angol"
 
-#: ../gtk/propertybox.c:1064
+#: ../gtk/propertybox.c:1073
 msgid "French"
 msgstr "francia"
 
-#: ../gtk/propertybox.c:1065
+#: ../gtk/propertybox.c:1074
 msgid "Swedish"
 msgstr "svéd"
 
-#: ../gtk/propertybox.c:1066
+#: ../gtk/propertybox.c:1075
 msgid "Italian"
 msgstr "olasz"
 
-#: ../gtk/propertybox.c:1067
+#: ../gtk/propertybox.c:1076
 msgid "Spanish"
 msgstr "spanyol"
 
-#: ../gtk/propertybox.c:1068
+#: ../gtk/propertybox.c:1077
 msgid "Brazilian Portugese"
 msgstr "brazil-portugál"
 
-#: ../gtk/propertybox.c:1069
+#: ../gtk/propertybox.c:1078
 msgid "Polish"
 msgstr "lengyel"
 
-#: ../gtk/propertybox.c:1070
+#: ../gtk/propertybox.c:1079
 msgid "German"
 msgstr "német"
 
-#: ../gtk/propertybox.c:1071
+#: ../gtk/propertybox.c:1080
 msgid "Russian"
 msgstr "orosz"
 
-#: ../gtk/propertybox.c:1072
+#: ../gtk/propertybox.c:1081
 msgid "Japanese"
 msgstr "japán"
 
-#: ../gtk/propertybox.c:1073
+#: ../gtk/propertybox.c:1082
 msgid "Dutch"
 msgstr "holland"
 
-#: ../gtk/propertybox.c:1074
+#: ../gtk/propertybox.c:1083
 msgid "Hungarian"
 msgstr "magyar"
 
-#: ../gtk/propertybox.c:1075
+#: ../gtk/propertybox.c:1084
 msgid "Czech"
 msgstr "cseh"
 
-#: ../gtk/propertybox.c:1076
+#: ../gtk/propertybox.c:1085
 msgid "Chinese"
 msgstr "egyszerúsített kínai"
 
-#: ../gtk/propertybox.c:1077
+#: ../gtk/propertybox.c:1086
 msgid "Traditional Chinese"
 msgstr "tradícionális kínai"
 
-#: ../gtk/propertybox.c:1078
+#: ../gtk/propertybox.c:1087
 msgid "Norwegian"
 msgstr "norvég"
 
-#: ../gtk/propertybox.c:1079
+#: ../gtk/propertybox.c:1088
 msgid "Hebrew"
 msgstr "héber"
 
-#: ../gtk/propertybox.c:1080
+#: ../gtk/propertybox.c:1089
 msgid "Serbian"
 msgstr ""
 
-#: ../gtk/propertybox.c:1147
+#: ../gtk/propertybox.c:1156
 msgid ""
 "You need to restart linphone for the new language selection to take effect."
-msgstr ""
-"Újra kell indítania a linphone-t, hogy az új nyelv kiválasztása érvényre "
-"jusson. "
+msgstr "Újra kell indítania a linphone-t, hogy az új nyelv kiválasztása érvényre jusson. "
 
-#: ../gtk/propertybox.c:1225
+#: ../gtk/propertybox.c:1234
 msgid "None"
 msgstr "Nincs"
 
-#: ../gtk/propertybox.c:1229
+#: ../gtk/propertybox.c:1238
 msgid "SRTP"
 msgstr "SRTP"
 
-#: ../gtk/propertybox.c:1235
+#: ../gtk/propertybox.c:1244
 msgid "ZRTP"
 msgstr "ZRTP"
 
@@ -405,9 +380,7 @@ msgstr "ZRTP"
 msgid ""
 "A more recent version is availalble from %s.\n"
 "Would you like to open a browser to download it ?"
-msgstr ""
-"Elérhető egy újabb verzió a következőn: %s.\n"
-"Szeretné, hogy a letöltéshez egy új böngésző ablak nyíljon?"
+msgstr "Elérhető egy újabb verzió a következőn: %s.\nSzeretné, hogy a letöltéshez egy új böngésző ablak nyíljon?"
 
 #: ../gtk/update.c:91
 msgid "You are running the lastest version."
@@ -437,15 +410,14 @@ msgstr "Adatok fogadása..."
 #, c-format
 msgid "Found %i contact"
 msgid_plural "Found %i contacts"
-msgstr[0] "Találat: %i partner"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../gtk/setupwizard.c:34
 msgid ""
 "Welcome !\n"
 "This assistant will help you to use a SIP account for your calls."
-msgstr ""
-"Üdvözöljük !\n"
-"Ez a varázsló segít Önnek, hogy sip fiókot használjon hívásaihoz."
+msgstr "Üdvözöljük !\nEz a varázsló segít Önnek, hogy sip fiókot használjon hívásaihoz."
 
 #: ../gtk/setupwizard.c:43
 msgid "Create an account on linphone.org"
@@ -523,10 +495,7 @@ msgstr ""
 msgid ""
 "Error, account not validated, username already used or server unreachable.\n"
 "Please go back and try again."
-msgstr ""
-"Hiba, a fiók nincs érvényesítve. Valaki már használja ezt a felhasználónevet "
-"vagy a kiszolgáló nem elérhető.\n"
-"Kérjük, lépjen vissza és próbálja újra."
+msgstr "Hiba, a fiók nincs érvényesítve. Valaki már használja ezt a felhasználónevet vagy a kiszolgáló nem elérhető.\nKérjük, lépjen vissza és próbálja újra."
 
 #: ../gtk/setupwizard.c:405
 msgid "Thank you. Your account is now configured and ready for use."
@@ -534,18 +503,13 @@ msgstr "Köszönjük! Az Ön fiókját beállítottuk és használatra kész."
 
 #: ../gtk/setupwizard.c:413
 msgid ""
-"Please validate your account by clicking on the link we just sent you by "
-"email.\n"
+"Please validate your account by clicking on the link we just sent you by email.\n"
 "Then come back here and press Next button."
-msgstr ""
-"Kérjük, érvényesítse fiókját az általunk elektronikus levélben küldött "
-"hivatkozásra kattintva.\n"
-"Azután térjen vissza ide és kattintson a Következő gombra."
+msgstr "Kérjük, érvényesítse fiókját az általunk elektronikus levélben küldött hivatkozásra kattintva.\nAzután térjen vissza ide és kattintson a Következő gombra."
 
 #: ../gtk/setupwizard.c:600
-#, fuzzy
 msgid "SIP account configuration assistant"
-msgstr "Fiók beállítása varázsló"
+msgstr ""
 
 #: ../gtk/setupwizard.c:618
 msgid "Welcome to the account setup assistant"
@@ -646,9 +610,7 @@ msgstr "közvetlen vagy kiszolgálón keresztül"
 msgid ""
 "download: %f\n"
 "upload: %f (kbit/s)"
-msgstr ""
-"letöltés: %f\n"
-"feltöltés: %f (kbit/mp)"
+msgstr "letöltés: %f\nfeltöltés: %f (kbit/mp)"
 
 #: ../gtk/incall_view.c:272 ../gtk/incall_view.c:274
 #, c-format
@@ -664,110 +626,108 @@ msgstr "%.3f másodperc"
 msgid "Hang up"
 msgstr "Befejezés"
 
-#: ../gtk/incall_view.c:501
+#: ../gtk/incall_view.c:511
 msgid "<b>Calling...</b>"
 msgstr "<b>Hívás folyamatban...</b>"
 
-#: ../gtk/incall_view.c:504 ../gtk/incall_view.c:707
+#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:727
 msgid "00::00::00"
 msgstr "00::00::00"
 
-#: ../gtk/incall_view.c:515
+#: ../gtk/incall_view.c:525
 msgid "<b>Incoming call</b>"
 msgstr "<b>Beérkező hívás</b>"
 
-#: ../gtk/incall_view.c:552
+#: ../gtk/incall_view.c:562
 msgid "good"
 msgstr "jó"
 
-#: ../gtk/incall_view.c:554
+#: ../gtk/incall_view.c:564
 msgid "average"
 msgstr "közepes"
 
-#: ../gtk/incall_view.c:556
+#: ../gtk/incall_view.c:566
 msgid "poor"
 msgstr "gyenge"
 
-#: ../gtk/incall_view.c:558
+#: ../gtk/incall_view.c:568
 msgid "very poor"
 msgstr "nagyon gyenge"
 
-#: ../gtk/incall_view.c:560
+#: ../gtk/incall_view.c:570
 msgid "too bad"
 msgstr "rossz"
 
-#: ../gtk/incall_view.c:561 ../gtk/incall_view.c:577
+#: ../gtk/incall_view.c:571 ../gtk/incall_view.c:587
 msgid "unavailable"
 msgstr "nem elérhető"
 
-#: ../gtk/incall_view.c:669
+#: ../gtk/incall_view.c:679
 msgid "Secured by SRTP"
 msgstr "SRTP-vel titkosítva"
 
-#: ../gtk/incall_view.c:675
+#: ../gtk/incall_view.c:685
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
 msgstr "ZRTP-vel titkosítva - [hitelesítési jel: %s]"
 
-#: ../gtk/incall_view.c:681
+#: ../gtk/incall_view.c:691
 msgid "Set unverified"
 msgstr "Beállítás ellenőrizetlenként"
 
-#: ../gtk/incall_view.c:681 ../gtk/main.ui.h:4
+#: ../gtk/incall_view.c:691 ../gtk/main.ui.h:4
 msgid "Set verified"
 msgstr "Beállítás ellenőrzöttként"
 
-#: ../gtk/incall_view.c:702
+#: ../gtk/incall_view.c:722
 msgid "In conference"
 msgstr "Konferencián"
 
-#: ../gtk/incall_view.c:702
+#: ../gtk/incall_view.c:722
 msgid "<b>In call</b>"
 msgstr "<b>vonalban</b>"
 
-#: ../gtk/incall_view.c:738
+#: ../gtk/incall_view.c:758
 msgid "<b>Paused call</b>"
 msgstr "<b>Várakoztatott hívás</b>"
 
-#: ../gtk/incall_view.c:751
+#: ../gtk/incall_view.c:771
 #, c-format
 msgid "%02i::%02i::%02i"
 msgstr "%02i::%02i::%02i"
 
-#: ../gtk/incall_view.c:772
+#: ../gtk/incall_view.c:794
 msgid "<b>Call ended.</b>"
 msgstr "<b>Hívás vége.</b>"
 
-#: ../gtk/incall_view.c:803
+#: ../gtk/incall_view.c:825
 msgid "Transfer in progress"
 msgstr "Átvitel folyamatban"
 
-#: ../gtk/incall_view.c:806
+#: ../gtk/incall_view.c:828
 msgid "Transfer done."
 msgstr "Átvitel befejezve."
 
-#: ../gtk/incall_view.c:809
+#: ../gtk/incall_view.c:831
 msgid "Transfer failed."
 msgstr "Az átvitel sikertelen."
 
-#: ../gtk/incall_view.c:853
+#: ../gtk/incall_view.c:875
 msgid "Resume"
 msgstr "Visszatérés"
 
-#: ../gtk/incall_view.c:860 ../gtk/main.ui.h:9
+#: ../gtk/incall_view.c:882 ../gtk/main.ui.h:9
 msgid "Pause"
 msgstr "Várakoztatás"
 
-#: ../gtk/incall_view.c:926
+#: ../gtk/incall_view.c:948
 #, c-format
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
-msgstr ""
-"<small><i>Felvétel a következőbe\n"
-"%s %s</i></small>"
+msgstr "<small><i>Felvétel a következőbe\n%s %s</i></small>"
 
-#: ../gtk/incall_view.c:926
+#: ../gtk/incall_view.c:948
 msgid "(Paused)"
 msgstr "(Várakoztatva)"
 
@@ -777,9 +737,9 @@ msgid "Please enter login information for %s"
 msgstr "Kérem, adja meg a bejelentkezési információt %s -hoz"
 
 #: ../gtk/config-fetching.c:57
-#, fuzzy, c-format
+#, c-format
 msgid "fetching from %s"
-msgstr "Beérkező hívás"
+msgstr ""
 
 #: ../gtk/config-fetching.c:73
 #, c-format
@@ -803,32 +763,26 @@ msgid "Too loud"
 msgstr ""
 
 #: ../gtk/audio_assistant.c:318
-#, fuzzy
 msgid ""
 "Welcome !\n"
 "This assistant will help you to configure audio settings for Linphone"
 msgstr ""
-"Üdvözöljük !\n"
-"Ez a varázsló segít Önnek, hogy sip fiókot használjon hívásaihoz."
 
 #: ../gtk/audio_assistant.c:328
-#, fuzzy
 msgid "Capture device"
-msgstr "Felvevő hang eszköz:"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:329
-#, fuzzy
 msgid "Recorded volume"
-msgstr "Felvételi forrás:"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:333
 msgid "No voice"
 msgstr ""
 
 #: ../gtk/audio_assistant.c:369
-#, fuzzy
 msgid "Playback device"
-msgstr "Lejátszó hang eszköz:"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:370
 msgid "Play three beeps"
@@ -847,14 +801,12 @@ msgid "Let's start Linphone now"
 msgstr ""
 
 #: ../gtk/audio_assistant.c:496
-#, fuzzy
 msgid "Audio Assistant"
-msgstr "Fiók varázsló"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:506 ../gtk/main.ui.h:31
-#, fuzzy
 msgid "Audio assistant"
-msgstr "Fiók varázsló"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:511
 msgid "Mic Gain calibration"
@@ -933,9 +885,8 @@ msgid "_Options"
 msgstr "_Beállítások"
 
 #: ../gtk/main.ui.h:23
-#, fuzzy
 msgid "Set configuration URI"
-msgstr "Proxy/Regisztráció konfigurációs doboz"
+msgstr ""
 
 #: ../gtk/main.ui.h:24
 msgid "Always start video"
@@ -1039,12 +990,9 @@ msgstr "(C) Belledonne Communications,2010\n"
 
 #: ../gtk/about.ui.h:4
 msgid "An internet video phone using the standard SIP (rfc3261) protocol."
-msgstr ""
-"Internetes videó telefon, mely a szabványos SIP (rfc3261) protokolt "
-"használja."
+msgstr "Internetes videó telefon, mely a szabványos SIP (rfc3261) protokolt használja."
 
 #: ../gtk/about.ui.h:5
-#, fuzzy
 msgid ""
 "fr: Simon Morlat\n"
 "en: Simon Morlat and Delphine Perreau\n"
@@ -1059,17 +1007,6 @@ msgid ""
 "hu: anonymous\n"
 "he: Eli Zaretskii <eliz@gnu.org>\n"
 msgstr ""
-"francia: Simon Morlat\n"
-"angol: Simon Morlat és Delphine Perreau\n"
-"olasz: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\n"
-"német: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\n"
-"svéd: Daniel Nylander <po@danielnylander.se>\n"
-"spanyol: Jesus Benitez <gnelson at inMail dot sk>\n"
-"japán: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\n"
-"brazil-portugál: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\n"
-"lengyel: Robert Nasiadek <darkone@darkone.pl>\n"
-"cseh: Petr Pisar <petr.pisar@atlas.cz>\n"
-"magyar: anonymous és Barczi Viktor <viktorbarczi@lavabit.com>\n"
 
 #: ../gtk/contact.ui.h:2
 msgid "SIP Address"
@@ -1144,9 +1081,8 @@ msgid "Registration duration (sec):"
 msgstr "Regisztrálási Időköz (mp):"
 
 #: ../gtk/sip_account.ui.h:8
-#, fuzzy
 msgid "Contact params (optional):"
-msgstr "Út (nem kötelező):"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:9
 msgid "AVPF regular RTCP interval (sec):"
@@ -1157,9 +1093,8 @@ msgid "Route (optional):"
 msgstr "Út (nem kötelező):"
 
 #: ../gtk/sip_account.ui.h:11
-#, fuzzy
 msgid "Transport"
-msgstr "<b>Átvitel</b>"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:12
 msgid "Register"
@@ -1170,9 +1105,8 @@ msgid "Publish presence information"
 msgstr "Jelenléti információ közlése"
 
 #: ../gtk/sip_account.ui.h:14
-#, fuzzy
 msgid "Enable AVPF"
-msgstr "Engedélyezés"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:15
 msgid "Configure a SIP account"
@@ -1279,14 +1213,12 @@ msgid "DSCP fields"
 msgstr "DSCP mezők"
 
 #: ../gtk/parameters.ui.h:26
-#, fuzzy
 msgid "SIP/TCP port"
-msgstr "SIP port"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:27
-#, fuzzy
 msgid "SIP/UDP port"
-msgstr "SIP port"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:28
 msgid "<b>Network protocol and ports</b>"
@@ -1297,9 +1229,8 @@ msgid "Direct connection to the Internet"
 msgstr "Közvetlen Internet kapcsolat"
 
 #: ../gtk/parameters.ui.h:30
-#, fuzzy
 msgid "Behind NAT / Firewall (specify gateway IP )"
-msgstr "NAT / tűzfal mögött (adja meg az átjáró IP címét)"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:31
 msgid "Behind NAT / Firewall (use STUN to resolve)"
@@ -1366,9 +1297,8 @@ msgid "Prefered video resolution:"
 msgstr "Kívánt videó felbontás:"
 
 #: ../gtk/parameters.ui.h:47
-#, fuzzy
 msgid "Video output method:"
-msgstr "Videó bemeneti eszköz:"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:48
 msgid "<b>Video</b>"
@@ -1462,9 +1392,7 @@ msgstr "Alkalmazkodó mérték-szabályozás engedélyezése"
 msgid ""
 "<i>Adaptive rate control is a technique to dynamically guess the available "
 "bandwidth during a call.</i>"
-msgstr ""
-"<i>Az alkalmazkodó mérték-szabályozás egy módszer, mely erőteljesen próbálja "
-"megállapítani a rendelkezésre álló sávszélességet hívás alatt.</i>"
+msgstr "<i>Az alkalmazkodó mérték-szabályozás egy módszer, mely erőteljesen próbálja megállapítani a rendelkezésre álló sávszélességet hívás alatt.</i>"
 
 #: ../gtk/parameters.ui.h:71
 msgid "<b>Bandwidth control</b>"
@@ -1491,23 +1419,20 @@ msgid "User interface"
 msgstr "Felhasználói környezet"
 
 #: ../gtk/parameters.ui.h:77 ../gtk/ldap.ui.h:2
-#, fuzzy
 msgid "Server address:"
-msgstr "Sip cím:"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:78 ../gtk/ldap.ui.h:3
-#, fuzzy
 msgid "Authentication method:"
-msgstr "Hitelesítési információ"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:80
 msgid "label"
 msgstr "címke"
 
 #: ../gtk/parameters.ui.h:81
-#, fuzzy
 msgid "<b>LDAP Account setup</b>"
-msgstr "<b>Proxy fiókok</b>"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:82
 msgid "LDAP"
@@ -1538,9 +1463,8 @@ msgid "Please wait"
 msgstr "Kérem várjon"
 
 #: ../gtk/dscp_settings.ui.h:1
-#, fuzzy
 msgid "DSCP settings"
-msgstr "DSCP beállítások"
+msgstr ""
 
 #: ../gtk/dscp_settings.ui.h:2
 msgid "SIP"
@@ -1595,9 +1519,8 @@ msgid "Video resolution received"
 msgstr ""
 
 #: ../gtk/call_statistics.ui.h:10
-#, fuzzy
 msgid "Video resolution sent"
-msgstr "Kívánt videó felbontás:"
+msgstr ""
 
 #: ../gtk/call_statistics.ui.h:11
 msgid "RTP profile"
@@ -1688,23 +1611,20 @@ msgid "1"
 msgstr "1"
 
 #: ../gtk/ldap.ui.h:1
-#, fuzzy
 msgid "LDAP Settings"
-msgstr "Beállítások"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:6
 msgid "Use TLS Connection"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:7
-#, fuzzy
 msgid "Not yet available"
-msgstr "uPnP nem elérhető"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:8
-#, fuzzy
 msgid "<b>Connection</b>"
-msgstr "<b>Kódekek</b>"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:9
 msgid "Bind DN"
@@ -1715,14 +1635,12 @@ msgid "Authname"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:11
-#, fuzzy
 msgid "Realm"
-msgstr "tartomány:"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:12
-#, fuzzy
 msgid "<b>SASL</b>"
-msgstr "<b>Audió</b>"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:13
 msgid "Base object:"
@@ -1738,18 +1656,16 @@ msgid "Name Attribute:"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:17
-#, fuzzy
 msgid "SIP address attribute:"
-msgstr "Sip cím:"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:18
 msgid "Attributes to query:"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:19
-#, fuzzy
 msgid "<b>Search</b>"
-msgstr "<b>Keres valakit</b>"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:20
 msgid "Timeout for search:"
@@ -1764,9 +1680,8 @@ msgid "Follow Aliases"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:23
-#, fuzzy
 msgid "<b>Miscellaneous</b>"
-msgstr "<b>Videó</b>"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:24
 msgid "ANONYMOUS"
@@ -1790,11 +1705,8 @@ msgstr ""
 
 #: ../gtk/config-uri.ui.h:2
 msgid ""
-"This dialog allows to set an http or https address when configuration is to "
-"be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, "
-"Linphone will restart automatically in order to fetch and take into account "
-"the new configuration. "
+"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
 msgstr ""
 
 #: ../gtk/config-uri.ui.h:4
@@ -1802,81 +1714,79 @@ msgid "https://"
 msgstr ""
 
 #: ../gtk/provisioning-fetch.ui.h:1
-#, fuzzy
 msgid "Configuring..."
-msgstr "Kapcsolódás..."
+msgstr ""
 
 #: ../gtk/provisioning-fetch.ui.h:2
 msgid "Please wait while fetching configuration from server..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1034
+#: ../coreapi/linphonecore.c:1511
 msgid "Ready"
 msgstr "Kész"
 
-#: ../coreapi/linphonecore.c:1967
-#, fuzzy
+#: ../coreapi/linphonecore.c:2470
 msgid "Configuring"
-msgstr "Információk"
+msgstr ""
 
-#: ../coreapi/linphonecore.c:2133
+#: ../coreapi/linphonecore.c:2635
 msgid "Looking for telephone number destination..."
 msgstr "Telefonszám-cél keresése..."
 
-#: ../coreapi/linphonecore.c:2136
+#: ../coreapi/linphonecore.c:2637
 msgid "Could not resolve this number."
 msgstr "Nem sikkerült értelmezni a számot."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2418
+#: ../coreapi/linphonecore.c:2919
 msgid "Contacting"
 msgstr "Kapcsolódás"
 
-#: ../coreapi/linphonecore.c:2425
+#: ../coreapi/linphonecore.c:2924
 msgid "Could not call"
 msgstr "Nem sikerült hívni"
 
-#: ../coreapi/linphonecore.c:2576
+#: ../coreapi/linphonecore.c:3074
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "Elnézést, elértük a egyidejű hívások maximális számát"
 
-#: ../coreapi/linphonecore.c:2745
+#: ../coreapi/linphonecore.c:3233
 msgid "is contacting you"
 msgstr "kapcsolatba lépett veled."
 
-#: ../coreapi/linphonecore.c:2746
+#: ../coreapi/linphonecore.c:3234
 msgid " and asked autoanswer."
 msgstr "és automatikus választ kért."
 
-#: ../coreapi/linphonecore.c:2746
+#: ../coreapi/linphonecore.c:3234
 msgid "."
 msgstr "."
 
-#: ../coreapi/linphonecore.c:2865
+#: ../coreapi/linphonecore.c:3352
 msgid "Modifying call parameters..."
 msgstr "A hívási jellemzők módosítása..."
 
-#: ../coreapi/linphonecore.c:3194
+#: ../coreapi/linphonecore.c:3700
 msgid "Connected."
 msgstr "Kapcsolódva."
 
-#: ../coreapi/linphonecore.c:3220
+#: ../coreapi/linphonecore.c:3725
 msgid "Call aborted"
 msgstr "Hívás megszakítva"
 
-#: ../coreapi/linphonecore.c:3412
+#: ../coreapi/linphonecore.c:3915
 msgid "Could not pause the call"
 msgstr "Nem sikerült várakoztatni a hívást"
 
-#: ../coreapi/linphonecore.c:3417
+#: ../coreapi/linphonecore.c:3919
 msgid "Pausing the current call..."
 msgstr "Jelenlegi hívás várakoztatásának aktiválása..."
 
-#: ../coreapi/misc.c:425
+#: ../coreapi/misc.c:438
 msgid "Stun lookup in progress..."
 msgstr "Stun keresés folyamatban..."
 
-#: ../coreapi/misc.c:607
+#: ../coreapi/misc.c:619
 msgid "ICE local candidates gathering in progress..."
 msgstr "ICE helyi jelentkezők begyűjtése folyamatban..."
 
@@ -1925,695 +1835,147 @@ msgid "Pending"
 msgstr "Függőben"
 
 #: ../coreapi/friend.c:66
-#, fuzzy
 msgid "Vacation"
-msgstr "Időtartam"
+msgstr ""
 
 #: ../coreapi/friend.c:68
 msgid "Unknown-bug"
 msgstr "Ismeretlen programhiba"
 
-#: ../coreapi/proxy.c:314
+#: ../coreapi/proxy.c:319
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
-msgstr ""
-"Az Ön által megadott SIP proxy cím érvénytelen. \"sip:\"-tal kell kezdődnie, "
-"ezt egy hosztnév követi."
+msgstr "Az Ön által megadott SIP proxy cím érvénytelen. \"sip:\"-tal kell kezdődnie, ezt egy hosztnév követi."
 
-#: ../coreapi/proxy.c:320
+#: ../coreapi/proxy.c:325
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
-msgstr ""
-"Az Ön által megadott SIP identitás érvénytelen.\n"
-"Így kéne kinéznie: sip:felhasznalonev@proxytartomany, például sip:"
-"aladar@pelda.hu"
+msgstr "Az Ön által megadott SIP identitás érvénytelen.\nÍgy kéne kinéznie: sip:felhasznalonev@proxytartomany, például sip:aladar@pelda.hu"
 
-#: ../coreapi/proxy.c:1369
+#: ../coreapi/proxy.c:1377
 #, c-format
 msgid "Could not login as %s"
 msgstr "Nem sikerült belépni ezzel: %s"
 
-#: ../coreapi/callbacks.c:355
+#: ../coreapi/callbacks.c:383
 msgid "Remote ringing."
 msgstr "Távoli csengés."
 
-#: ../coreapi/callbacks.c:373
+#: ../coreapi/callbacks.c:404
 msgid "Remote ringing..."
 msgstr "Távoli csengés..."
 
-#: ../coreapi/callbacks.c:384
+#: ../coreapi/callbacks.c:414
 msgid "Early media."
 msgstr "Korai médiák."
 
-#: ../coreapi/callbacks.c:435
+#: ../coreapi/callbacks.c:475
 #, c-format
 msgid "Call with %s is paused."
 msgstr "A hívás a következővel: %s várakoztatva"
 
-#: ../coreapi/callbacks.c:448
+#: ../coreapi/callbacks.c:488
 #, c-format
 msgid "Call answered by %s - on hold."
 msgstr "%s fogadta a hívást - várakoztatva."
 
-#: ../coreapi/callbacks.c:459
+#: ../coreapi/callbacks.c:498
 msgid "Call resumed."
 msgstr "Hívás visszatért"
 
-#: ../coreapi/callbacks.c:464
+#: ../coreapi/callbacks.c:502
 #, c-format
 msgid "Call answered by %s."
 msgstr "%s válaszolt a hívásra."
 
-#: ../coreapi/callbacks.c:483
+#: ../coreapi/callbacks.c:525
 msgid "Incompatible, check codecs or security settings..."
-msgstr ""
-"Nem kompatibilis, ellenőrizze a kódek- vagy a biztonsági beállításokat..."
+msgstr "Nem kompatibilis, ellenőrizze a kódek- vagy a biztonsági beállításokat..."
 
-#: ../coreapi/callbacks.c:512
+#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:826
+msgid "Incompatible media parameters."
+msgstr "Nem kompatibilis médiajellemzők."
+
+#: ../coreapi/callbacks.c:560
 msgid "We have been resumed."
 msgstr "Visszatértünk."
 
-#: ../coreapi/callbacks.c:521
+#. we are being paused
+#: ../coreapi/callbacks.c:568
 msgid "We are paused by other party."
 msgstr "Megállítva a másik fél által."
 
-#: ../coreapi/callbacks.c:556
+#. reINVITE and in-dialogs UPDATE go here
+#: ../coreapi/callbacks.c:602
 msgid "Call is updated by remote."
 msgstr "A hívás távolról frissítve."
 
-#: ../coreapi/callbacks.c:658
+#: ../coreapi/callbacks.c:705
 msgid "Call terminated."
 msgstr "A hívás befejezve."
 
-#: ../coreapi/callbacks.c:687
+#: ../coreapi/callbacks.c:733
 msgid "User is busy."
 msgstr "A felhasználó foglalt."
 
-#: ../coreapi/callbacks.c:688
+#: ../coreapi/callbacks.c:734
 msgid "User is temporarily unavailable."
 msgstr "A felhasználó ideiglenesen nem elérhető"
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:690
+#: ../coreapi/callbacks.c:736
 msgid "User does not want to be disturbed."
 msgstr "A felhasználó nem akarja, hogy zavarják."
 
-#: ../coreapi/callbacks.c:691
+#: ../coreapi/callbacks.c:737
 msgid "Call declined."
 msgstr "Hívás elutasítva"
 
-#: ../coreapi/callbacks.c:706
+#: ../coreapi/callbacks.c:752
 msgid "Request timeout."
 msgstr ""
 
-#: ../coreapi/callbacks.c:737
+#: ../coreapi/callbacks.c:780
 msgid "Redirected"
 msgstr "Átirányítva"
 
-#: ../coreapi/callbacks.c:787
-msgid "Incompatible media parameters."
-msgstr "Nem kompatibilis médiajellemzők."
-
-#: ../coreapi/callbacks.c:798
+#: ../coreapi/callbacks.c:835
 msgid "Call failed."
 msgstr "Nem sikerült a hívás."
 
-#: ../coreapi/callbacks.c:878
+#: ../coreapi/callbacks.c:913
 #, c-format
 msgid "Registration on %s successful."
 msgstr "A regisztáció a %s -n sikerült."
 
-#: ../coreapi/callbacks.c:879
+#: ../coreapi/callbacks.c:914
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "A kiregisztrálás kész a következőn: %s ."
 
-#: ../coreapi/callbacks.c:897
+#: ../coreapi/callbacks.c:932
 msgid "no response timeout"
 msgstr "időtúllépés után nincs válasz"
 
-#: ../coreapi/callbacks.c:900
+#: ../coreapi/callbacks.c:935
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "A regisztáció a %s -n nem sikerült: %s"
 
-#: ../coreapi/callbacks.c:907
+#: ../coreapi/callbacks.c:942
 msgid "Service unavailable, retrying"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:177
+#: ../coreapi/linphonecall.c:174
 #, c-format
 msgid "Authentication token is %s"
 msgstr "Hitelesítési jel: %s"
 
-#: ../coreapi/linphonecall.c:2932
+#: ../coreapi/linphonecall.c:3020
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
-msgstr[0] "Van %i nem fogadott hivás."
-
-#~ msgid "aborted"
-#~ msgstr "megszakítva"
-
-#~ msgid "completed"
-#~ msgstr "befejezve"
-
-#~ msgid "missed"
-#~ msgstr "elhibázva"
-
-#~ msgid ""
-#~ "%s at %s\n"
-#~ "From: %s\n"
-#~ "To: %s\n"
-#~ "Status: %s\n"
-#~ "Duration: %i mn %i sec\n"
-#~ msgstr ""
-#~ "%s nél %s\n"
-#~ "Tól: %s\n"
-#~ "Ig: %s\n"
-#~ "Állapot: %s\n"
-#~ "Időtartam: %i perc %i másodperc\n"
-
-#~ msgid "Outgoing call"
-#~ msgstr "Kimenő hívás"
-
-#~ msgid "No response."
-#~ msgstr "Nincs válasz."
-
-#~ msgid "Protocol error."
-#~ msgstr "Protokol hiba."
-
-#~ msgid ""
-#~ "Could not parse given sip address. A sip url usually looks like sip:"
-#~ "user@domain"
-#~ msgstr ""
-#~ "Az adott szám nem értelmezhető. Egy sip cím általában így néz ki: "
-#~ "user@domain"
-
-#~ msgid ""
-#~ "Your computer appears to be using ALSA sound drivers.\n"
-#~ "This is the best choice. However the pcm oss emulation module\n"
-#~ "is missing and linphone needs it. Please execute\n"
-#~ "'modprobe snd-pcm-oss' as root to load it."
-#~ msgstr ""
-#~ "A számítógéped úgy tűnik, hogy ALSA hangot használ.\n"
-#~ "Ez a legjobb választás. Mindazonáltal a pcm* OSS emuláció modulra\n"
-#~ " a linphone-nak szüksége van és ez hiányzik. Kérem futassa le a\n"
-#~ "'modprobe snd-pcm-oss' parancsot rendszergazdaként."
-
-#~ msgid ""
-#~ "Your computer appears to be using ALSA sound drivers.\n"
-#~ "This is the best choice. However the mixer oss emulation module\n"
-#~ "is missing and linphone needs it. Please execute\n"
-#~ " 'modprobe snd-mixer-oss' as root to load it."
-#~ msgstr ""
-#~ "A számítógéped úgy tűnik, hogy ALSA hangot használ.\n"
-#~ "Ez a legjobb választás. Mindazonáltal a mixer OSS emuláció modulra\n"
-#~ " a linphone-nak szüksége van és ez hiányzik. Kérem futassa le a\n"
-#~ "'modprobe snd-pcm-oss' parancsot rendszergazdaként."
-
-#~ msgid "Chat with %s"
-#~ msgstr "Chat-elés %s -el"
-
-#, fuzzy
-#~ msgid "Choosing a username"
-#~ msgstr "felhasználónév:"
-
-#, fuzzy
-#~ msgid "Enable video"
-#~ msgstr "Engedélyezve"
-
-#, fuzzy
-#~ msgid "Unmute"
-#~ msgstr "Korlátlan"
-
-#, fuzzy
-#~ msgid "<b>Contact list</b>"
-#~ msgstr "Kapcsolatilista"
-
-#, fuzzy
-#~ msgid "Audio & video"
-#~ msgstr "Audio kodekek"
-
-#, fuzzy
-#~ msgid "Audio only"
-#~ msgstr "Audio kodekek"
-
-#, fuzzy
-#~ msgid "Duration:"
-#~ msgstr "Információk"
-
-#, fuzzy
-#~ msgid "_Call history"
-#~ msgstr "Linphone - Híváselőzmények"
-
-#, fuzzy
-#~ msgid "_Linphone"
-#~ msgstr "Linphone"
-
-#, fuzzy
-#~ msgid "gtk-cancel"
-#~ msgstr "Kapcsolódva."
-
-#, fuzzy
-#~ msgid "gtk-ok"
-#~ msgstr "Eltávolítás"
-
-#, fuzzy
-#~ msgid "gtk-close"
-#~ msgstr "Kapcsolódva."
-
-#~ msgid ""
-#~ "Your machine appears to be connected to an IPv6 network. By default "
-#~ "linphone always uses IPv4. Please update your configuration if you want "
-#~ "to use IPv6"
-#~ msgstr ""
-#~ "A géped úgy tűnik, hogy csatlakozik egy IPv6 hálózathoz. Alapból a "
-#~ "linphone mindig az IPv4-et használja. Frissítsd a konfigurációdat, ha "
-#~ "használni akarod az IPv6-ot"
-
-#, fuzzy
-#~ msgid "_Modes"
-#~ msgstr "Kodekek"
-
-#~ msgid "Accept"
-#~ msgstr "Elfogad"
-
-#, fuzzy
-#~ msgid "Incoming call from"
-#~ msgstr "Beérkező hívás"
-
-#, fuzzy
-#~ msgid "Linphone - Incoming call"
-#~ msgstr "Beérkező hívás"
-
-#, fuzzy
-#~ msgid ""
-#~ "Audio codecs\n"
-#~ "Video codecs"
-#~ msgstr "Audio és video kodekek"
-
-#~ msgid "Sorry, having multiple simultaneous calls is not supported yet !"
-#~ msgstr "Bocsánat, a többszörös egyidejű hívások még nem támogatottak!"
-
-#~ msgid "Could not reach destination."
-#~ msgstr "A cél elérhetetlen."
-
-#~ msgid "Request Cancelled."
-#~ msgstr "Kérelem elutasítva."
-
-#~ msgid "Bad request"
-#~ msgstr "Rossz kérés"
-
-#~ msgid "User cannot be found at given address."
-#~ msgstr "Nem telálható felhasználó at adott címen."
-
-#~ msgid "Remote user cannot support any of proposed codecs."
-#~ msgstr ""
-#~ "A távoli felhasználó nem rendelkezik a javasolt kódoló-dekódolókkal "
-#~ "(codecs)"
-
-#~ msgid "Timeout."
-#~ msgstr "Időtúllépés."
-
-#~ msgid "Remote host was found but refused connection."
-#~ msgstr "A távoli gép elérhető, de a kapcsolatot visszautasította."
-
-#~ msgid ""
-#~ "User is not reachable at the moment but he invites you\n"
-#~ "to contact him using the following alternate resource:"
-#~ msgstr ""
-#~ "A felhasználó nem elérhető pillanatnyilag de meghívja Önt\n"
-#~ "thogy lépjen kapcsolatba vele miközben használja a következő alternatív "
-#~ "erőforrást:"
-
-#~ msgid "No nat/firewall address supplied !"
-#~ msgstr "Nincs nat/tűzfal cím megadva!"
-
-#~ msgid "Invalid nat address '%s' : %s"
-#~ msgstr "Hibás nat cím '%s' : %s"
-
-#~ msgid "Gone"
-#~ msgstr "Elveszítve"
-
-#~ msgid "Waiting for Approval"
-#~ msgstr "Jóváhagyásra vár"
-
-#~ msgid "Be Right Back"
-#~ msgstr "Legyen igazad"
-
-#~ msgid "On The Phone"
-#~ msgstr "Telefonál"
-
-#~ msgid "Out To Lunch"
-#~ msgstr "Ebédelni ment"
-
-#~ msgid "Closed"
-#~ msgstr "Lezárva"
-
-#, fuzzy
-#~ msgid "_View"
-#~ msgstr "Video"
-
-#, fuzzy
-#~ msgid "_Properties"
-#~ msgstr "RTP beállítások"
-
-#, fuzzy
-#~ msgid "Show logs"
-#~ msgstr "Mutasd a hívásokat"
-
-#, fuzzy
-#~ msgid "_About"
-#~ msgstr "Hozzáférés"
-
-#, fuzzy
-#~ msgid "Proxy in use"
-#~ msgstr "Használt SIP Proxy:"
-
-#~ msgid "Sound"
-#~ msgstr "Hang"
-
-#, fuzzy
-#~ msgid "Proxy accounts"
-#~ msgstr "Használt SIP Proxy:"
-
-#~ msgid "Go"
-#~ msgstr "Ugrás"
-
-#~ msgid "Exit"
-#~ msgstr "Kilépés"
-
-#~ msgid "Shows the address book"
-#~ msgstr "Mutasd a címjegyzéket"
-
-#~ msgid "..."
-#~ msgstr "..."
-
-#~ msgid ""
-#~ "Hangup\n"
-#~ "or refuse"
-#~ msgstr ""
-#~ "Lerak vagy\n"
-#~ "Nem válaszol"
-
-#~ msgid "Or chat !"
-#~ msgstr "Vagy chat-elj!"
-
-#~ msgid "Show more..."
-#~ msgstr "További beállítások..."
-
-#~ msgid "Playback level:"
-#~ msgstr "Lejátszási hangerő:"
-
-#~ msgid "Recording level:"
-#~ msgstr "Felvételi hangerő:"
-
-#~ msgid "Ring level:"
-#~ msgstr "Csengetési hangerő:"
-
-#~ msgid "Controls"
-#~ msgstr "Vezérlés"
-
-#~ msgid "Reachable"
-#~ msgstr "Elérhető"
-
-#~ msgid "Busy, I'll be back in "
-#~ msgstr "Foglalt vagyok, jövök vissza"
-
-#~ msgid "The other party will be informed that you'll be back in X minutes"
-#~ msgstr "A másik fél tájékoztatva lesz, hogy X perc alatt vissza fogsz jönni"
-
-#~ msgid "mn"
-#~ msgstr "perc"
-
-#~ msgid "Moved temporarily"
-#~ msgstr "Ideiglenesen nem elérhető"
-
-#~ msgid "Alternative service"
-#~ msgstr "Átirányítás"
-
-#~ msgid "URL:"
-#~ msgstr "URL:"
-
-#~ msgid "Presence"
-#~ msgstr "Elérhető"
-
-#~ msgid "Press digits to send DTMFs."
-#~ msgstr "Nyomja le a számokat a DTMF küldéshez"
-
-#~ msgid ""
-#~ "  3\n"
-#~ "def"
-#~ msgstr ""
-#~ "  3\n"
-#~ "def"
-
-#~ msgid ""
-#~ "  2\n"
-#~ "abc"
-#~ msgstr ""
-#~ "  2\n"
-#~ "abc"
-
-#~ msgid ""
-#~ "  4\n"
-#~ "ghi"
-#~ msgstr ""
-#~ "  4\n"
-#~ "ghi"
-
-#~ msgid ""
-#~ " 5\n"
-#~ "jkl"
-#~ msgstr ""
-#~ " 5\n"
-#~ "jkl"
-
-#~ msgid ""
-#~ "  6\n"
-#~ "mno"
-#~ msgstr ""
-#~ "  6\n"
-#~ "mno"
-
-#~ msgid ""
-#~ "   7\n"
-#~ "pqrs"
-#~ msgstr ""
-#~ "   7\n"
-#~ "pqrs"
-
-#~ msgid ""
-#~ "  8\n"
-#~ "tuv"
-#~ msgstr ""
-#~ "  8\n"
-#~ "tuv"
-
-#~ msgid ""
-#~ "   9\n"
-#~ "wxyz"
-#~ msgstr ""
-#~ "   9\n"
-#~ "wxyz"
-
-#~ msgid "DTMF"
-#~ msgstr "DTMF"
-
-#~ msgid "My online friends"
-#~ msgstr "Elérhető partnerek"
-
-#~ msgid ""
-#~ "C: 2001\n"
-#~ "Made in Old Europe"
-#~ msgstr ""
-#~ "C: 2001\n"
-#~ "Made in Old Europe"
-
-#~ msgid ""
-#~ "Linphone is a web-phone.\n"
-#~ "It is compatible with SIP and RTP protocols."
-#~ msgstr ""
-#~ "A Linphone egy web-telefon.\n"
-#~ "SIP és RTP kompatíbilis."
-
-#~ msgid "http://www.linphone.org"
-#~ msgstr "http://www.linphone.org"
-
-#~ msgid "Use IPv6 network (if available)"
-#~ msgstr "IPv6 hálózat használata (ha elérhető)"
-
-#~ msgid ""
-#~ "Toggle this if you are on an ipv6 network and you wish linphone to use it."
-#~ msgstr "Ha egy IPv6 hálózat elérhető, akkor a linphone használja azt."
-
-#~ msgid "Global"
-#~ msgstr "Általános"
-
-#~ msgid ""
-#~ "These options is only for users in a private network, behind a gateway. "
-#~ "If you are not in this situation, then leave this empty."
-#~ msgstr ""
-#~ "Ez az opció azoknak a felhasználóknak kell, akik egy privát hálózaton "
-#~ "tűzfal mögül interneteznek. Egyébként üresen kell hagyni."
-
-#~ msgid "No firewall"
-#~ msgstr "Nincs tűzfal"
-
-#~ msgid "Use this STUN server to guess firewall address :"
-#~ msgstr "STUN szerver használata a tűzfal címének meghatározásához."
-
-#~ msgid "Specify firewall address manually:"
-#~ msgstr "Tűzfal külső címe:"
-
-#~ msgid "NAT traversal options (experimental)"
-#~ msgstr "NAT beállítások áttekintése (kísérleti)"
-
-#~ msgid "Number of buffered miliseconds (jitter compensation):"
-#~ msgstr "A pufferelt milisecondok száma (jitter compensation):"
-
-#~ msgid "RTP port used for audio:"
-#~ msgstr "RTP port, audió használatra:"
-
-#~ msgid "Use SIP INFO message instead of RTP rfc2833 for DTMF transmitting"
-#~ msgstr "Használj SIP INFO üzenetet RTP rfc2833 helyett a DTMF átvitelnél"
-
-#~ msgid "RTP-RFC2833 is the recommended way."
-#~ msgstr "RTP-RFC2833 az ajánlott."
-
-#~ msgid "Other"
-#~ msgstr "Egyéb"
-
-#~ msgid "micro"
-#~ msgstr "mikrofon"
-
-#~ msgid "Enable echo-canceler (cancels the echo heard by the remote party)"
-#~ msgstr ""
-#~ "Visszhang törlés engedélyezése (törli a visszhangot, amit hall a távoli "
-#~ "partner"
-
-#~ msgid "Choose file"
-#~ msgstr "Fájl kiválasztás"
-
-#~ msgid "Listen"
-#~ msgstr "Hallgatás"
-
-#~ msgid "Run sip user agent on port:"
-#~ msgstr "SIP felhasználó ügynök által használt port:"
-
-#~ msgid "It is strongly recommended to use port 5060."
-#~ msgstr "Erősen ajánlott az 5060-as port használata."
-
-#~ msgid "@"
-#~ msgstr "@"
-
-#~ msgid "Identity"
-#~ msgstr "Azonosító"
-
-#~ msgid "Add proxy/registrar"
-#~ msgstr "Proxy vagy regisztráció hozzáadás"
-
-#~ msgid "Clear all stored authentication information (username,password...)"
-#~ msgstr ""
-#~ "Az összes tárolt hitelesítési információ törlése (felhasználónév, "
-#~ "jelszó...)"
-
-#~ msgid "List of audio codecs, in order of preference:"
-#~ msgstr "Az audió kódoló-dekódolók listája, a preferencia rendjében:"
-
-#~ msgid ""
-#~ "Note: Codecs in red are not usable regarding to your connection type to "
-#~ "the internet."
-#~ msgstr ""
-#~ "Figyelem: A pirosban lévő kodekek nem használhatók a jelenlegi "
-#~ "internetkapcsolattal."
-
-#~ msgid "Codec information"
-#~ msgstr "Kodekinformáció"
-
-#~ msgid "Address Book"
-#~ msgstr "Címjegyzék"
-
-#~ msgid "Select"
-#~ msgstr "Kiválasztás"
-
-#~ msgid ""
-#~ "User is not reachable at the moment but he invites you to contact him "
-#~ "using the following alternate ressource:"
-#~ msgstr ""
-#~ "A felhasználó jelenleg nem elérhető, de kéri, hogy lépj vele kapcsolatba "
-#~ "itt:"
-
-#~ msgid "None."
-#~ msgstr "Nincs."
-
-#~ msgid "Send registration:"
-#~ msgstr "Regisztárció küldés:"
-
-#~ msgid "Name:"
-#~ msgstr "Név:"
-
-#~ msgid "Subscribe policy:"
-#~ msgstr "Láthatósági szabály:"
-
-#~ msgid "Send subscription (see person's online status)"
-#~ msgstr "Láthatóság küldése (látszik a személy elérhetőségi státusza)"
-
-#~ msgid "New incoming subscription"
-#~ msgstr "Új beérkező előfizetés"
-
-#~ msgid "You have received a new subscription..."
-#~ msgstr "Megkaptál egy új előfizetést."
-
-#~ msgid "Refuse"
-#~ msgstr "Hulladék"
-
-#~ msgid "Authentication required for realm"
-#~ msgstr "Hitelesítési kérelem a tartománynak"
-
-#~ msgid "userid:"
-#~ msgstr "felhasználói azonosító:"
-
-#~ msgid "Text:"
-#~ msgstr "Szöveg:"
-
-#~ msgid "The caller asks for resource reservation. Do you agree ?"
-#~ msgstr "A hívó forrásfoglalást kér. Egyetértesz?"
-
-#~ msgid ""
-#~ "The caller doesn't use resource reservation. \t\t\t\t\tDo you wish to "
-#~ "continue anyway ?"
-#~ msgstr ""
-#~ "A hívó nem használ forrásfoglalást. \t\t\t\t\tÍgy is szeretnéd folytatni?"
-
-#~ msgid "linphone - receiving call from %s"
-#~ msgstr "linphone - hívást fogad innen %s"
-
-#~ msgid ""
-#~ "You have received a subscription from %s.This means that this person "
-#~ "wishes to be notified of your presence information (online, busy, "
-#~ "away...).\n"
-#~ "Do you agree ?"
-#~ msgstr ""
-#~ "Kaptál egy előfizetést tőle %s. Ez azt jelenti, hogy ez a személy "
-#~ "szeretné, hogy értesítsék a jelenlétinformációd (online, elfoglalt, "
-#~ "away...).\n"
-#~ "Egyetértesz?"
-
-#~ msgid "Authentication required for realm %s"
-#~ msgstr "Hitelesítési kérelem ebből a tartományból %s"
-
-#~ msgid "Wait"
-#~ msgstr "Várakozás"
-
-#~ msgid "Deny"
-#~ msgstr "Tiltás"
-
-#~ msgid "Bad sip address: a sip address looks like sip:user@domain"
-#~ msgstr "Rossz sip cím: egy sip cím általában így néz ki: user@domain"
-
-#~ msgid "Stun lookup done..."
-#~ msgstr "Stun keresés kész..."
+msgstr[0] ""
+msgstr[1] ""
diff --git a/po/it.po b/po/it.po
index 980db056b..d9d6c0e41 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,19 +1,21 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: Linphone 3.2.0\n"
+"Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-15 09:24+0200\n"
-"PO-Revision-Date: 2002-10-15 HO:MI+ZONE\n"
-"Last-Translator: Matteo Piazza <matteo.piazza@trentinonetwork.it>\n"
-"Language-Team: it <it@li.org>\n"
-"Language: \n"
+"POT-Creation-Date: 2014-11-19 10:39+0100\n"
+"PO-Revision-Date: 2014-11-19 10:16+0000\n"
+"Last-Translator: Cqnqrd <gautier.pelloux@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/linphone-gtk/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974
 #, c-format
@@ -26,28 +28,25 @@ msgid "Send text to %s"
 msgstr "Invia testo a %s"
 
 #: ../gtk/calllogs.c:232
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Recent calls (%i)</b>"
-msgstr "<b>In chiamata con</b>"
+msgstr ""
 
 #: ../gtk/calllogs.c:314
 msgid "n/a"
 msgstr ""
 
 #: ../gtk/calllogs.c:317
-#, fuzzy
 msgid "Aborted"
-msgstr "annullato"
+msgstr ""
 
 #: ../gtk/calllogs.c:320
-#, fuzzy
 msgid "Missed"
-msgstr "mancante"
+msgstr ""
 
 #: ../gtk/calllogs.c:323
-#, fuzzy
 msgid "Declined"
-msgstr "Rifiuta"
+msgstr ""
 
 #: ../gtk/calllogs.c:329
 #, c-format
@@ -87,11 +86,8 @@ msgid "Conference"
 msgstr ""
 
 #: ../gtk/conference.c:46
-#, fuzzy
 msgid "Me"
 msgstr ""
-"Chiudi\n"
-"microfono"
 
 #: ../gtk/support.c:49 ../gtk/support.c:73 ../gtk/support.c:102
 #, c-format
@@ -128,105 +124,92 @@ msgstr ""
 
 #: ../gtk/main.c:149
 msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: c:"
-"\\Program Files\\Linphone)"
+"Specifiy a working directory (should be the base of the installation, eg: "
+"c:\\Program Files\\Linphone)"
 msgstr ""
 
 #: ../gtk/main.c:156
-#, fuzzy
 msgid "Configuration file"
-msgstr "Informazioni"
+msgstr ""
 
 #: ../gtk/main.c:163
-#, fuzzy
 msgid "Run the audio assistant"
-msgstr "Configuratore di account"
+msgstr ""
 
-#: ../gtk/main.c:590
-#, fuzzy, c-format
-msgid "Call with %s"
-msgstr "Chat con %s"
-
-#: ../gtk/main.c:1183
+#: ../gtk/main.c:1085
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
-"Would you allow him to see your presence status or add him to your contact "
-"list ?\n"
+"Would you allow him to see your presence status or add him to your contact list ?\n"
 "If you answer no, this person will be temporarily blacklisted."
-msgstr ""
-"%s voui aggiungere il tuo contatto alla sua listaVoui permettere che lui "
-"veda il tuo stato o aggiungerlo alla tua lista dei contatti Se rispondi no "
-"questo utente sarà momentaneamente bloccato."
+msgstr "%s voui aggiungere il tuo contatto alla sua listaVoui permettere che lui veda il tuo stato o aggiungerlo alla tua lista dei contatti Se rispondi no questo utente sarà momentaneamente bloccato."
 
-#: ../gtk/main.c:1260
-#, fuzzy, c-format
+#: ../gtk/main.c:1162
+#, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
-msgstr "Prego inserire la password per username <i>%s</i> e dominio <i>%s<i>"
+msgstr ""
 
-#: ../gtk/main.c:1376
-#, fuzzy
+#: ../gtk/main.c:1283
 msgid "Call error"
-msgstr "Cronologia"
+msgstr ""
 
-#: ../gtk/main.c:1379 ../coreapi/linphonecore.c:3240
+#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3744
 msgid "Call ended"
 msgstr "Chiamata terminata"
 
-#: ../gtk/main.c:1382
+#: ../gtk/main.c:1289
 msgid "Incoming call"
 msgstr "Chimata in entrata"
 
-#: ../gtk/main.c:1384 ../gtk/incall_view.c:522 ../gtk/main.ui.h:5
+#: ../gtk/main.c:1291 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
 msgid "Answer"
 msgstr ""
 
-#: ../gtk/main.c:1386 ../gtk/main.ui.h:6
+#: ../gtk/main.c:1293 ../gtk/main.ui.h:6
 msgid "Decline"
 msgstr "Rifiuta"
 
-#: ../gtk/main.c:1392
-#, fuzzy
+#: ../gtk/main.c:1299
 msgid "Call paused"
-msgstr "annullato"
+msgstr ""
 
-#: ../gtk/main.c:1392
-#, fuzzy, c-format
+#: ../gtk/main.c:1299
+#, c-format
 msgid "<b>by %s</b>"
-msgstr "<b>Porte</b>"
+msgstr ""
 
-#: ../gtk/main.c:1459
+#: ../gtk/main.c:1366
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr ""
 
-#: ../gtk/main.c:1621
+#: ../gtk/main.c:1528
 msgid "Website link"
 msgstr ""
 
-#: ../gtk/main.c:1670
+#: ../gtk/main.c:1577
 msgid "Linphone - a video internet phone"
 msgstr ""
 
-#: ../gtk/main.c:1762
+#: ../gtk/main.c:1669
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (Default)"
 
-#: ../gtk/main.c:2099 ../coreapi/callbacks.c:949
+#: ../gtk/main.c:2006 ../coreapi/callbacks.c:983
 #, c-format
 msgid "We are transferred to %s"
 msgstr ""
 
-#: ../gtk/main.c:2109
+#: ../gtk/main.c:2016
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
 msgstr ""
 
-#: ../gtk/main.c:2250
+#: ../gtk/main.c:2157
 msgid "A free SIP video-phone"
 msgstr ""
 
@@ -243,9 +226,8 @@ msgid "Name"
 msgstr "Nome"
 
 #: ../gtk/friendlist.c:721
-#, fuzzy
 msgid "Call"
-msgstr "Chiamata %s"
+msgstr ""
 
 #: ../gtk/friendlist.c:726
 msgid "Chat"
@@ -267,9 +249,9 @@ msgid "Delete contact '%s'"
 msgstr "Elimina contatto %s"
 
 #: ../gtk/friendlist.c:978
-#, fuzzy, c-format
+#, c-format
 msgid "Delete chat history of '%s'"
-msgstr "Elimina contatto %s"
+msgstr ""
 
 #: ../gtk/friendlist.c:1029
 #, c-format
@@ -285,9 +267,8 @@ msgid "Status"
 msgstr "Stato"
 
 #: ../gtk/propertybox.c:570
-#, fuzzy
 msgid "IP Bitrate (kbit/s)"
-msgstr "Bitrate Min (kbit/s)"
+msgstr ""
 
 #: ../gtk/propertybox.c:577
 msgid "Parameters"
@@ -305,92 +286,92 @@ msgstr "Disattivato"
 msgid "Account"
 msgstr "Account"
 
-#: ../gtk/propertybox.c:1063
+#: ../gtk/propertybox.c:1072
 msgid "English"
 msgstr "Inglese"
 
-#: ../gtk/propertybox.c:1064
+#: ../gtk/propertybox.c:1073
 msgid "French"
 msgstr "Francese"
 
-#: ../gtk/propertybox.c:1065
+#: ../gtk/propertybox.c:1074
 msgid "Swedish"
 msgstr "Svedese"
 
-#: ../gtk/propertybox.c:1066
+#: ../gtk/propertybox.c:1075
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../gtk/propertybox.c:1067
+#: ../gtk/propertybox.c:1076
 msgid "Spanish"
 msgstr "Spagnolo"
 
-#: ../gtk/propertybox.c:1068
+#: ../gtk/propertybox.c:1077
 msgid "Brazilian Portugese"
 msgstr ""
 
-#: ../gtk/propertybox.c:1069
+#: ../gtk/propertybox.c:1078
 msgid "Polish"
 msgstr "Polacco"
 
-#: ../gtk/propertybox.c:1070
+#: ../gtk/propertybox.c:1079
 msgid "German"
 msgstr "Tedesco"
 
-#: ../gtk/propertybox.c:1071
+#: ../gtk/propertybox.c:1080
 msgid "Russian"
 msgstr "Russo"
 
-#: ../gtk/propertybox.c:1072
+#: ../gtk/propertybox.c:1081
 msgid "Japanese"
 msgstr "Giapponese"
 
-#: ../gtk/propertybox.c:1073
+#: ../gtk/propertybox.c:1082
 msgid "Dutch"
 msgstr "Olandese"
 
-#: ../gtk/propertybox.c:1074
+#: ../gtk/propertybox.c:1083
 msgid "Hungarian"
 msgstr "Ungherese"
 
-#: ../gtk/propertybox.c:1075
+#: ../gtk/propertybox.c:1084
 msgid "Czech"
 msgstr "Ceco"
 
-#: ../gtk/propertybox.c:1076
+#: ../gtk/propertybox.c:1085
 msgid "Chinese"
 msgstr ""
 
-#: ../gtk/propertybox.c:1077
+#: ../gtk/propertybox.c:1086
 msgid "Traditional Chinese"
 msgstr ""
 
-#: ../gtk/propertybox.c:1078
+#: ../gtk/propertybox.c:1087
 msgid "Norwegian"
 msgstr ""
 
-#: ../gtk/propertybox.c:1079
+#: ../gtk/propertybox.c:1088
 msgid "Hebrew"
 msgstr ""
 
-#: ../gtk/propertybox.c:1080
+#: ../gtk/propertybox.c:1089
 msgid "Serbian"
 msgstr ""
 
-#: ../gtk/propertybox.c:1147
+#: ../gtk/propertybox.c:1156
 msgid ""
 "You need to restart linphone for the new language selection to take effect."
 msgstr "Riavviare il software per utilizzare la nuova lingua selezionata"
 
-#: ../gtk/propertybox.c:1225
+#: ../gtk/propertybox.c:1234
 msgid "None"
 msgstr ""
 
-#: ../gtk/propertybox.c:1229
+#: ../gtk/propertybox.c:1238
 msgid "SRTP"
 msgstr ""
 
-#: ../gtk/propertybox.c:1235
+#: ../gtk/propertybox.c:1244
 msgid "ZRTP"
 msgstr ""
 
@@ -399,9 +380,7 @@ msgstr ""
 msgid ""
 "A more recent version is availalble from %s.\n"
 "Would you like to open a browser to download it ?"
-msgstr ""
-"Una versione più recente è disponibile da %s.\n"
-"Vuoi aprire un browser per eseguire il download ?"
+msgstr "Una versione più recente è disponibile da %s.\nVuoi aprire un browser per eseguire il download ?"
 
 #: ../gtk/update.c:91
 msgid "You are running the lastest version."
@@ -438,24 +417,19 @@ msgstr[1] "Trovato %i contatti"
 msgid ""
 "Welcome !\n"
 "This assistant will help you to use a SIP account for your calls."
-msgstr ""
-"Benvenuti !\n"
-"La procedura vi aiutera a configurare un account SIP."
+msgstr "Benvenuti !\nLa procedura vi aiutera a configurare un account SIP."
 
 #: ../gtk/setupwizard.c:43
-#, fuzzy
 msgid "Create an account on linphone.org"
-msgstr "Creare un account scegliendo l'username"
+msgstr ""
 
 #: ../gtk/setupwizard.c:44
-#, fuzzy
 msgid "I have already a linphone.org account and I just want to use it"
-msgstr "Ho gia un account e voglio usarlo"
+msgstr ""
 
 #: ../gtk/setupwizard.c:45
-#, fuzzy
 msgid "I have already a sip account and I just want to use it"
-msgstr "Ho gia un account e voglio usarlo"
+msgstr ""
 
 #: ../gtk/setupwizard.c:46
 msgid "I want to specify a remote configuration URI"
@@ -478,14 +452,12 @@ msgid "Enter your account informations"
 msgstr ""
 
 #: ../gtk/setupwizard.c:140
-#, fuzzy
 msgid "Username*"
-msgstr "Username"
+msgstr ""
 
 #: ../gtk/setupwizard.c:141
-#, fuzzy
 msgid "Password*"
-msgstr "Password"
+msgstr ""
 
 #: ../gtk/setupwizard.c:144
 msgid "Domain*"
@@ -500,14 +472,12 @@ msgid "(*) Required fields"
 msgstr ""
 
 #: ../gtk/setupwizard.c:318
-#, fuzzy
 msgid "Username: (*)"
-msgstr "Manuale utente"
+msgstr ""
 
 #: ../gtk/setupwizard.c:320
-#, fuzzy
 msgid "Password: (*)"
-msgstr "Password:"
+msgstr ""
 
 #: ../gtk/setupwizard.c:322
 msgid "Email: (*)"
@@ -533,15 +503,13 @@ msgstr "Grazie. Il tuo account è configurato e pronto all'uso"
 
 #: ../gtk/setupwizard.c:413
 msgid ""
-"Please validate your account by clicking on the link we just sent you by "
-"email.\n"
+"Please validate your account by clicking on the link we just sent you by email.\n"
 "Then come back here and press Next button."
 msgstr ""
 
 #: ../gtk/setupwizard.c:600
-#, fuzzy
 msgid "SIP account configuration assistant"
-msgstr "Configuratore di account"
+msgstr ""
 
 #: ../gtk/setupwizard.c:618
 msgid "Welcome to the account setup assistant"
@@ -552,9 +520,8 @@ msgid "Account setup assistant"
 msgstr "Configuratore di account"
 
 #: ../gtk/setupwizard.c:629
-#, fuzzy
 msgid "Configure your account (step 1/1)"
-msgstr "Configurazione SIP account"
+msgstr ""
 
 #: ../gtk/setupwizard.c:634
 msgid "Enter your sip username (step 1/1)"
@@ -573,14 +540,13 @@ msgid "Error"
 msgstr ""
 
 #: ../gtk/setupwizard.c:656 ../gtk/audio_assistant.c:527
-#, fuzzy
 msgid "Terminating"
-msgstr "Termina chiamata"
+msgstr ""
 
 #: ../gtk/incall_view.c:70 ../gtk/incall_view.c:94
-#, fuzzy, c-format
+#, c-format
 msgid "Call #%i"
-msgstr "Chiamata %s"
+msgstr ""
 
 #: ../gtk/incall_view.c:155
 #, c-format
@@ -596,9 +562,8 @@ msgid "ICE not activated"
 msgstr ""
 
 #: ../gtk/incall_view.c:223
-#, fuzzy
 msgid "ICE failed"
-msgstr "Filtro ICE"
+msgstr ""
 
 #: ../gtk/incall_view.c:225
 msgid "ICE in progress"
@@ -609,9 +574,8 @@ msgid "Going through one or more NATs"
 msgstr ""
 
 #: ../gtk/incall_view.c:229
-#, fuzzy
 msgid "Direct"
-msgstr "Rediretto verso %s..."
+msgstr ""
 
 #: ../gtk/incall_view.c:231
 msgid "Through a relay server"
@@ -622,9 +586,8 @@ msgid "uPnP not activated"
 msgstr ""
 
 #: ../gtk/incall_view.c:241
-#, fuzzy
 msgid "uPnP in progress"
-msgstr "Ricerca Stun in progresso ..."
+msgstr ""
 
 #: ../gtk/incall_view.c:243
 msgid "uPnp not available"
@@ -635,9 +598,8 @@ msgid "uPnP is running"
 msgstr ""
 
 #: ../gtk/incall_view.c:247
-#, fuzzy
 msgid "uPnP failed"
-msgstr "Filtro ICE"
+msgstr ""
 
 #: ../gtk/incall_view.c:257 ../gtk/incall_view.c:258
 msgid "Direct or through server"
@@ -664,113 +626,108 @@ msgstr ""
 msgid "Hang up"
 msgstr ""
 
-#: ../gtk/incall_view.c:501
-#, fuzzy
+#: ../gtk/incall_view.c:511
 msgid "<b>Calling...</b>"
-msgstr "<b>Linguaggio</b>"
+msgstr ""
 
-#: ../gtk/incall_view.c:504 ../gtk/incall_view.c:707
+#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:727
 msgid "00::00::00"
 msgstr ""
 
-#: ../gtk/incall_view.c:515
-#, fuzzy
+#: ../gtk/incall_view.c:525
 msgid "<b>Incoming call</b>"
-msgstr "Chimata in entrata"
+msgstr ""
 
-#: ../gtk/incall_view.c:552
+#: ../gtk/incall_view.c:562
 msgid "good"
 msgstr ""
 
-#: ../gtk/incall_view.c:554
+#: ../gtk/incall_view.c:564
 msgid "average"
 msgstr ""
 
-#: ../gtk/incall_view.c:556
+#: ../gtk/incall_view.c:566
 msgid "poor"
 msgstr ""
 
-#: ../gtk/incall_view.c:558
+#: ../gtk/incall_view.c:568
 msgid "very poor"
 msgstr ""
 
-#: ../gtk/incall_view.c:560
+#: ../gtk/incall_view.c:570
 msgid "too bad"
 msgstr ""
 
-#: ../gtk/incall_view.c:561 ../gtk/incall_view.c:577
+#: ../gtk/incall_view.c:571 ../gtk/incall_view.c:587
 msgid "unavailable"
 msgstr ""
 
-#: ../gtk/incall_view.c:669
+#: ../gtk/incall_view.c:679
 msgid "Secured by SRTP"
 msgstr ""
 
-#: ../gtk/incall_view.c:675
+#: ../gtk/incall_view.c:685
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
 msgstr ""
 
-#: ../gtk/incall_view.c:681
+#: ../gtk/incall_view.c:691
 msgid "Set unverified"
 msgstr ""
 
-#: ../gtk/incall_view.c:681 ../gtk/main.ui.h:4
+#: ../gtk/incall_view.c:691 ../gtk/main.ui.h:4
 msgid "Set verified"
 msgstr ""
 
-#: ../gtk/incall_view.c:702
+#: ../gtk/incall_view.c:722
 msgid "In conference"
 msgstr ""
 
-#: ../gtk/incall_view.c:702
-#, fuzzy
+#: ../gtk/incall_view.c:722
 msgid "<b>In call</b>"
-msgstr "<b>In chiamata con</b>"
+msgstr ""
 
-#: ../gtk/incall_view.c:738
-#, fuzzy
+#: ../gtk/incall_view.c:758
 msgid "<b>Paused call</b>"
-msgstr "<b>Termina chiamata</b>"
+msgstr ""
 
-#: ../gtk/incall_view.c:751
+#: ../gtk/incall_view.c:771
 #, c-format
 msgid "%02i::%02i::%02i"
 msgstr ""
 
-#: ../gtk/incall_view.c:772
+#: ../gtk/incall_view.c:794
 msgid "<b>Call ended.</b>"
 msgstr "<b>Chiamata terminata.</b>"
 
-#: ../gtk/incall_view.c:803
+#: ../gtk/incall_view.c:825
 msgid "Transfer in progress"
 msgstr ""
 
-#: ../gtk/incall_view.c:806
+#: ../gtk/incall_view.c:828
 msgid "Transfer done."
 msgstr ""
 
-#: ../gtk/incall_view.c:809
-#, fuzzy
+#: ../gtk/incall_view.c:831
 msgid "Transfer failed."
-msgstr "Chiamata rifiutata"
+msgstr ""
 
-#: ../gtk/incall_view.c:853
+#: ../gtk/incall_view.c:875
 msgid "Resume"
 msgstr ""
 
-#: ../gtk/incall_view.c:860 ../gtk/main.ui.h:9
+#: ../gtk/incall_view.c:882 ../gtk/main.ui.h:9
 msgid "Pause"
 msgstr ""
 
-#: ../gtk/incall_view.c:926
+#: ../gtk/incall_view.c:948
 #, c-format
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
 msgstr ""
 
-#: ../gtk/incall_view.c:926
+#: ../gtk/incall_view.c:948
 msgid "(Paused)"
 msgstr ""
 
@@ -780,9 +737,9 @@ msgid "Please enter login information for %s"
 msgstr "Prego inserire le proprie credenziali di accesso per %s"
 
 #: ../gtk/config-fetching.c:57
-#, fuzzy, c-format
+#, c-format
 msgid "fetching from %s"
-msgstr "Chiamata proveniente da %s"
+msgstr ""
 
 #: ../gtk/config-fetching.c:73
 #, c-format
@@ -806,18 +763,14 @@ msgid "Too loud"
 msgstr ""
 
 #: ../gtk/audio_assistant.c:318
-#, fuzzy
 msgid ""
 "Welcome !\n"
 "This assistant will help you to configure audio settings for Linphone"
 msgstr ""
-"Benvenuti !\n"
-"La procedura vi aiutera a configurare un account SIP."
 
 #: ../gtk/audio_assistant.c:328
-#, fuzzy
 msgid "Capture device"
-msgstr "Dispositivo microfono:"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:329
 msgid "Recorded volume"
@@ -828,9 +781,8 @@ msgid "No voice"
 msgstr ""
 
 #: ../gtk/audio_assistant.c:369
-#, fuzzy
 msgid "Playback device"
-msgstr "Dispositivo uscita audio:"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:370
 msgid "Play three beeps"
@@ -849,14 +801,12 @@ msgid "Let's start Linphone now"
 msgstr ""
 
 #: ../gtk/audio_assistant.c:496
-#, fuzzy
 msgid "Audio Assistant"
-msgstr "Configuratore"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:506 ../gtk/main.ui.h:31
-#, fuzzy
 msgid "Audio assistant"
-msgstr "Configuratore di account"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:511
 msgid "Mic Gain calibration"
@@ -871,9 +821,8 @@ msgid "Record and Play"
 msgstr ""
 
 #: ../gtk/main.ui.h:1
-#, fuzzy
 msgid "<b>Callee name</b>"
-msgstr "<b>Chiamata terminata.</b>"
+msgstr ""
 
 #: ../gtk/main.ui.h:2
 msgid "Send"
@@ -916,22 +865,16 @@ msgid "All users"
 msgstr ""
 
 #: ../gtk/main.ui.h:18
-#, fuzzy
 msgid "Online users"
 msgstr ""
-"Tutti gli utenti\n"
-"Utenti Online"
 
 #: ../gtk/main.ui.h:19
 msgid "ADSL"
 msgstr ""
 
 #: ../gtk/main.ui.h:20
-#, fuzzy
 msgid "Fiber Channel"
 msgstr ""
-"ADSL\n"
-"Fibra Ottica"
 
 #: ../gtk/main.ui.h:21
 msgid "Default"
@@ -942,9 +885,8 @@ msgid "_Options"
 msgstr ""
 
 #: ../gtk/main.ui.h:23
-#, fuzzy
 msgid "Set configuration URI"
-msgstr "Informazioni"
+msgstr ""
 
 #: ../gtk/main.ui.h:24
 msgid "Always start video"
@@ -959,9 +901,8 @@ msgid "_Help"
 msgstr ""
 
 #: ../gtk/main.ui.h:27
-#, fuzzy
 msgid "Show debug window"
-msgstr "Linphone debug window"
+msgstr ""
 
 #: ../gtk/main.ui.h:28
 msgid "_Homepage"
@@ -972,9 +913,8 @@ msgid "Check _Updates"
 msgstr ""
 
 #: ../gtk/main.ui.h:30
-#, fuzzy
 msgid "Account assistant"
-msgstr "Configuratore di account"
+msgstr ""
 
 #: ../gtk/main.ui.h:32
 msgid "SIP address or phone number:"
@@ -985,28 +925,24 @@ msgid "Initiate a new call"
 msgstr ""
 
 #: ../gtk/main.ui.h:34
-#, fuzzy
 msgid "Contacts"
-msgstr "In connessione"
+msgstr ""
 
 #: ../gtk/main.ui.h:35
 msgid "Search"
 msgstr ""
 
 #: ../gtk/main.ui.h:36
-#, fuzzy
 msgid "<b>Add contacts from directory</b>"
-msgstr "Aggiungi nuovo contatto dalla directory %s"
+msgstr ""
 
 #: ../gtk/main.ui.h:37
-#, fuzzy
 msgid "Add contact"
-msgstr "Trovato %i contatto"
+msgstr ""
 
 #: ../gtk/main.ui.h:38
-#, fuzzy
 msgid "Recent calls"
-msgstr "In chiamata"
+msgstr ""
 
 #: ../gtk/main.ui.h:39
 msgid "My current identity:"
@@ -1053,9 +989,8 @@ msgid "(C) Belledonne Communications,2010\n"
 msgstr ""
 
 #: ../gtk/about.ui.h:4
-#, fuzzy
 msgid "An internet video phone using the standard SIP (rfc3261) protocol."
-msgstr "Un internet video telefono basato sullo standard SIP (rfc3261)"
+msgstr ""
 
 #: ../gtk/about.ui.h:5
 msgid ""
@@ -1098,9 +1033,8 @@ msgid "Scroll to end"
 msgstr ""
 
 #: ../gtk/password.ui.h:1
-#, fuzzy
 msgid "Linphone - Authentication required"
-msgstr "Linphone - Autenticazione richiesta"
+msgstr ""
 
 #: ../gtk/password.ui.h:2
 msgid "Please enter the domain password"
@@ -1115,9 +1049,8 @@ msgid "Clear all"
 msgstr ""
 
 #: ../gtk/call_logs.ui.h:3
-#, fuzzy
 msgid "Call back"
-msgstr "Chiamata %s"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:1
 msgid "Linphone - Configure a SIP account"
@@ -1148,9 +1081,8 @@ msgid "Registration duration (sec):"
 msgstr "Durata registrazione (sec)"
 
 #: ../gtk/sip_account.ui.h:8
-#, fuzzy
 msgid "Contact params (optional):"
-msgstr "Rotta (opzionale)"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:9
 msgid "AVPF regular RTCP interval (sec):"
@@ -1161,9 +1093,8 @@ msgid "Route (optional):"
 msgstr "Rotta (opzionale)"
 
 #: ../gtk/sip_account.ui.h:11
-#, fuzzy
 msgid "Transport"
-msgstr "<b>Transporto</b>"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:12
 msgid "Register"
@@ -1174,9 +1105,8 @@ msgid "Publish presence information"
 msgstr "Pubblica stato della presenza"
 
 #: ../gtk/sip_account.ui.h:14
-#, fuzzy
 msgid "Enable AVPF"
-msgstr "Attivato"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:15
 msgid "Configure a SIP account"
@@ -1199,9 +1129,8 @@ msgid "default soundcard"
 msgstr "default scheda audio"
 
 #: ../gtk/parameters.ui.h:5
-#, fuzzy
 msgid "a sound card"
-msgstr "una scheda audio\n"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:6
 msgid "default camera"
@@ -1212,37 +1141,28 @@ msgid "CIF"
 msgstr "CIF"
 
 #: ../gtk/parameters.ui.h:8
-#, fuzzy
 msgid "Audio codecs"
 msgstr ""
-"Audio codecs\n"
-"Video codecs"
 
 #: ../gtk/parameters.ui.h:9
-#, fuzzy
 msgid "Video codecs"
 msgstr ""
-"Audio codecs\n"
-"Video codecs"
 
 #: ../gtk/parameters.ui.h:10 ../gtk/keypad.ui.h:5
 msgid "C"
 msgstr "C"
 
 #: ../gtk/parameters.ui.h:11
-#, fuzzy
 msgid "SIP (UDP)"
-msgstr "SIP (UDP)"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:12
-#, fuzzy
 msgid "SIP (TCP)"
-msgstr "SIP (UDP)"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:13
-#, fuzzy
 msgid "SIP (TLS)"
-msgstr "SIP (UDP)"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:14
 msgid "Settings"
@@ -1309,23 +1229,20 @@ msgid "Direct connection to the Internet"
 msgstr "Connessione diretta a internet"
 
 #: ../gtk/parameters.ui.h:30
-#, fuzzy
 msgid "Behind NAT / Firewall (specify gateway IP )"
-msgstr "Dietro NAT / Firewall (IP del gateway)"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:31
 msgid "Behind NAT / Firewall (use STUN to resolve)"
 msgstr "Dietro NAT / Firewall (utilizza STUN)"
 
 #: ../gtk/parameters.ui.h:32
-#, fuzzy
 msgid "Behind NAT / Firewall (use ICE)"
-msgstr "Dietro NAT / Firewall (utilizza STUN)"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:33
-#, fuzzy
 msgid "Behind NAT / Firewall (use uPnP)"
-msgstr "Dietro NAT / Firewall (utilizza STUN)"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:34
 msgid "Public IP address:"
@@ -1380,9 +1297,8 @@ msgid "Prefered video resolution:"
 msgstr "Risoluzione video preferita"
 
 #: ../gtk/parameters.ui.h:47
-#, fuzzy
 msgid "Video output method:"
-msgstr "Dispositivo Video:"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:48
 msgid "<b>Video</b>"
@@ -1394,8 +1310,7 @@ msgstr "Impostazioni multimediali"
 
 #: ../gtk/parameters.ui.h:50
 msgid "This section defines your SIP address when not using a SIP account"
-msgstr ""
-"questa sezione definisce il tuo indirizzo SIP se non hai account attivi"
+msgstr "questa sezione definisce il tuo indirizzo SIP se non hai account attivi"
 
 #: ../gtk/parameters.ui.h:51
 msgid "Your display name (eg: John Doe):"
@@ -1496,32 +1411,28 @@ msgid "Show advanced settings"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:75
-#, fuzzy
 msgid "<b>Level</b>"
-msgstr "<b>Linguaggio</b>"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:76
 msgid "User interface"
 msgstr "Interfaccia utente"
 
 #: ../gtk/parameters.ui.h:77 ../gtk/ldap.ui.h:2
-#, fuzzy
 msgid "Server address:"
-msgstr "Indirizzi SIP"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:78 ../gtk/ldap.ui.h:3
-#, fuzzy
 msgid "Authentication method:"
-msgstr "Linphone - Autenticazione richiesta"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:80
 msgid "label"
 msgstr "etichetta"
 
 #: ../gtk/parameters.ui.h:81
-#, fuzzy
 msgid "<b>LDAP Account setup</b>"
-msgstr "<b>Account proxy</b>"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:82
 msgid "LDAP"
@@ -1552,46 +1463,36 @@ msgid "Please wait"
 msgstr "Prego attendere"
 
 #: ../gtk/dscp_settings.ui.h:1
-#, fuzzy
 msgid "DSCP settings"
-msgstr "Preferenze"
+msgstr ""
 
 #: ../gtk/dscp_settings.ui.h:2
 msgid "SIP"
 msgstr ""
 
 #: ../gtk/dscp_settings.ui.h:3
-#, fuzzy
 msgid "Audio RTP stream"
-msgstr "campionatore di frequenza"
+msgstr ""
 
 #: ../gtk/dscp_settings.ui.h:4
-#, fuzzy
 msgid "Video RTP stream"
-msgstr "Video RTP/UDP"
+msgstr ""
 
 #: ../gtk/dscp_settings.ui.h:5
 msgid "<b>Set DSCP values (in hexadecimal)</b>"
 msgstr ""
 
 #: ../gtk/call_statistics.ui.h:1
-#, fuzzy
 msgid "Call statistics"
-msgstr "Chiamata %s"
+msgstr ""
 
 #: ../gtk/call_statistics.ui.h:2
-#, fuzzy
 msgid "Audio codec"
 msgstr ""
-"Audio codecs\n"
-"Video codecs"
 
 #: ../gtk/call_statistics.ui.h:3
-#, fuzzy
 msgid "Video codec"
 msgstr ""
-"Audio codecs\n"
-"Video codecs"
 
 #: ../gtk/call_statistics.ui.h:4
 msgid "Audio IP bandwidth usage"
@@ -1618,24 +1519,20 @@ msgid "Video resolution received"
 msgstr ""
 
 #: ../gtk/call_statistics.ui.h:10
-#, fuzzy
 msgid "Video resolution sent"
-msgstr "Risoluzione video preferita"
+msgstr ""
 
 #: ../gtk/call_statistics.ui.h:11
-#, fuzzy
 msgid "RTP profile"
-msgstr "RTP imput filter"
+msgstr ""
 
 #: ../gtk/call_statistics.ui.h:12
-#, fuzzy
 msgid "<b>Call statistics and information</b>"
-msgstr "<b>Contact informazioni</b>"
+msgstr ""
 
 #: ../gtk/tunnel_config.ui.h:1
-#, fuzzy
 msgid "Configure VoIP tunnel"
-msgstr "Configurazione SIP account"
+msgstr ""
 
 #: ../gtk/tunnel_config.ui.h:2
 msgid "Host"
@@ -1714,9 +1611,8 @@ msgid "1"
 msgstr "1"
 
 #: ../gtk/ldap.ui.h:1
-#, fuzzy
 msgid "LDAP Settings"
-msgstr "Preferenze"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:6
 msgid "Use TLS Connection"
@@ -1727,9 +1623,8 @@ msgid "Not yet available"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:8
-#, fuzzy
 msgid "<b>Connection</b>"
-msgstr "<b>Codecs</b>"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:9
 msgid "Bind DN"
@@ -1744,9 +1639,8 @@ msgid "Realm"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:12
-#, fuzzy
 msgid "<b>SASL</b>"
-msgstr "<b>Audio</b>"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:13
 msgid "Base object:"
@@ -1762,18 +1656,16 @@ msgid "Name Attribute:"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:17
-#, fuzzy
 msgid "SIP address attribute:"
-msgstr "Indirizzi SIP"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:18
 msgid "Attributes to query:"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:19
-#, fuzzy
 msgid "<b>Search</b>"
-msgstr "<b>Cerca</b>"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:20
 msgid "Timeout for search:"
@@ -1788,9 +1680,8 @@ msgid "Follow Aliases"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:23
-#, fuzzy
 msgid "<b>Miscellaneous</b>"
-msgstr "<b>Video</b>"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:24
 msgid "ANONYMOUS"
@@ -1814,11 +1705,8 @@ msgstr ""
 
 #: ../gtk/config-uri.ui.h:2
 msgid ""
-"This dialog allows to set an http or https address when configuration is to "
-"be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, "
-"Linphone will restart automatically in order to fetch and take into account "
-"the new configuration. "
+"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
 msgstr ""
 
 #: ../gtk/config-uri.ui.h:4
@@ -1826,86 +1714,79 @@ msgid "https://"
 msgstr ""
 
 #: ../gtk/provisioning-fetch.ui.h:1
-#, fuzzy
 msgid "Configuring..."
-msgstr "In connessione..."
+msgstr ""
 
 #: ../gtk/provisioning-fetch.ui.h:2
 msgid "Please wait while fetching configuration from server..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1034
+#: ../coreapi/linphonecore.c:1511
 msgid "Ready"
 msgstr "Pronto"
 
-#: ../coreapi/linphonecore.c:1967
-#, fuzzy
+#: ../coreapi/linphonecore.c:2470
 msgid "Configuring"
-msgstr "Informazioni"
+msgstr ""
 
-#: ../coreapi/linphonecore.c:2133
+#: ../coreapi/linphonecore.c:2635
 msgid "Looking for telephone number destination..."
 msgstr "Ricerca numero destinazione..."
 
-#: ../coreapi/linphonecore.c:2136
+#: ../coreapi/linphonecore.c:2637
 msgid "Could not resolve this number."
 msgstr "Impossibile risolvere il numero."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2418
+#: ../coreapi/linphonecore.c:2919
 msgid "Contacting"
 msgstr "In connessione"
 
-#: ../coreapi/linphonecore.c:2425
-#, fuzzy
+#: ../coreapi/linphonecore.c:2924
 msgid "Could not call"
-msgstr "chiamata fallita"
+msgstr ""
 
-#: ../coreapi/linphonecore.c:2576
+#: ../coreapi/linphonecore.c:3074
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2745
-#, fuzzy
+#: ../coreapi/linphonecore.c:3233
 msgid "is contacting you"
-msgstr "ti sta conttatando."
+msgstr ""
 
-#: ../coreapi/linphonecore.c:2746
+#: ../coreapi/linphonecore.c:3234
 msgid " and asked autoanswer."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2746
+#: ../coreapi/linphonecore.c:3234
 msgid "."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2865
+#: ../coreapi/linphonecore.c:3352
 msgid "Modifying call parameters..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3194
+#: ../coreapi/linphonecore.c:3700
 msgid "Connected."
 msgstr "Connessione"
 
-#: ../coreapi/linphonecore.c:3220
-#, fuzzy
+#: ../coreapi/linphonecore.c:3725
 msgid "Call aborted"
-msgstr "annullato"
+msgstr ""
 
-#: ../coreapi/linphonecore.c:3412
-#, fuzzy
+#: ../coreapi/linphonecore.c:3915
 msgid "Could not pause the call"
-msgstr "chiamata fallita"
+msgstr ""
 
-#: ../coreapi/linphonecore.c:3417
-#, fuzzy
+#: ../coreapi/linphonecore.c:3919
 msgid "Pausing the current call..."
-msgstr "Mostra chiamata corrente"
+msgstr ""
 
-#: ../coreapi/misc.c:425
+#: ../coreapi/misc.c:438
 msgid "Stun lookup in progress..."
 msgstr "Ricerca Stun in progresso ..."
 
-#: ../coreapi/misc.c:607
+#: ../coreapi/misc.c:619
 msgid "ICE local candidates gathering in progress..."
 msgstr ""
 
@@ -1954,579 +1835,147 @@ msgid "Pending"
 msgstr "Pendente"
 
 #: ../coreapi/friend.c:66
-#, fuzzy
 msgid "Vacation"
-msgstr "Durata"
+msgstr ""
 
 #: ../coreapi/friend.c:68
 msgid "Unknown-bug"
 msgstr "Bug-sconosciuto"
 
-#: ../coreapi/proxy.c:314
+#: ../coreapi/proxy.c:319
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
-msgstr ""
-"L'indirizzo sip proxy utilizzato è invalido, deve iniziare con  \"sip:\" "
-"seguito dall' hostaname."
+msgstr "L'indirizzo sip proxy utilizzato è invalido, deve iniziare con  \"sip:\" seguito dall' hostaname."
 
-#: ../coreapi/proxy.c:320
+#: ../coreapi/proxy.c:325
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
-msgstr ""
-"L'identità sip utilizza è invalida.\n"
-"Dovrebbre essere sip:username@proxydomain, esempio: sip:alice@example.net"
+msgstr "L'identità sip utilizza è invalida.\nDovrebbre essere sip:username@proxydomain, esempio: sip:alice@example.net"
 
-#: ../coreapi/proxy.c:1369
+#: ../coreapi/proxy.c:1377
 #, c-format
 msgid "Could not login as %s"
 msgstr "impossibile login come %s"
 
-#: ../coreapi/callbacks.c:355
+#: ../coreapi/callbacks.c:383
 msgid "Remote ringing."
 msgstr ""
 
-#: ../coreapi/callbacks.c:373
+#: ../coreapi/callbacks.c:404
 msgid "Remote ringing..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:384
+#: ../coreapi/callbacks.c:414
 msgid "Early media."
 msgstr ""
 
-#: ../coreapi/callbacks.c:435
-#, fuzzy, c-format
+#: ../coreapi/callbacks.c:475
+#, c-format
 msgid "Call with %s is paused."
-msgstr "Chat con %s"
+msgstr ""
 
-#: ../coreapi/callbacks.c:448
+#: ../coreapi/callbacks.c:488
 #, c-format
 msgid "Call answered by %s - on hold."
 msgstr ""
 
-#: ../coreapi/callbacks.c:459
-#, fuzzy
+#: ../coreapi/callbacks.c:498
 msgid "Call resumed."
-msgstr "Chiamata terminata"
+msgstr ""
 
-#: ../coreapi/callbacks.c:464
+#: ../coreapi/callbacks.c:502
 #, c-format
 msgid "Call answered by %s."
 msgstr ""
 
-#: ../coreapi/callbacks.c:483
+#: ../coreapi/callbacks.c:525
 msgid "Incompatible, check codecs or security settings..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:512
+#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:826
+msgid "Incompatible media parameters."
+msgstr ""
+
+#: ../coreapi/callbacks.c:560
 msgid "We have been resumed."
 msgstr ""
 
-#: ../coreapi/callbacks.c:521
+#. we are being paused
+#: ../coreapi/callbacks.c:568
 msgid "We are paused by other party."
 msgstr ""
 
-#: ../coreapi/callbacks.c:556
+#. reINVITE and in-dialogs UPDATE go here
+#: ../coreapi/callbacks.c:602
 msgid "Call is updated by remote."
 msgstr ""
 
-#: ../coreapi/callbacks.c:658
+#: ../coreapi/callbacks.c:705
 msgid "Call terminated."
 msgstr "Chiamata terminata."
 
-#: ../coreapi/callbacks.c:687
+#: ../coreapi/callbacks.c:733
 msgid "User is busy."
 msgstr "Utente occupato"
 
-#: ../coreapi/callbacks.c:688
+#: ../coreapi/callbacks.c:734
 msgid "User is temporarily unavailable."
 msgstr "Utente non disponibile"
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:690
+#: ../coreapi/callbacks.c:736
 msgid "User does not want to be disturbed."
 msgstr "L'utente non vuole essere disturbato"
 
-#: ../coreapi/callbacks.c:691
+#: ../coreapi/callbacks.c:737
 msgid "Call declined."
 msgstr "Chiamata rifiutata"
 
-#: ../coreapi/callbacks.c:706
+#: ../coreapi/callbacks.c:752
 msgid "Request timeout."
 msgstr ""
 
-#: ../coreapi/callbacks.c:737
-#, fuzzy
+#: ../coreapi/callbacks.c:780
 msgid "Redirected"
-msgstr "Rediretto verso %s..."
-
-#: ../coreapi/callbacks.c:787
-msgid "Incompatible media parameters."
 msgstr ""
 
-#: ../coreapi/callbacks.c:798
-#, fuzzy
+#: ../coreapi/callbacks.c:835
 msgid "Call failed."
-msgstr "Chiamata rifiutata"
+msgstr ""
 
-#: ../coreapi/callbacks.c:878
+#: ../coreapi/callbacks.c:913
 #, c-format
 msgid "Registration on %s successful."
 msgstr "Registrazione su %s attiva"
 
-#: ../coreapi/callbacks.c:879
+#: ../coreapi/callbacks.c:914
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "Unregistrazione su %s"
 
-#: ../coreapi/callbacks.c:897
+#: ../coreapi/callbacks.c:932
 msgid "no response timeout"
 msgstr "timeout no risposta"
 
-#: ../coreapi/callbacks.c:900
+#: ../coreapi/callbacks.c:935
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "Registrazione su %s fallita: %s"
 
-#: ../coreapi/callbacks.c:907
+#: ../coreapi/callbacks.c:942
 msgid "Service unavailable, retrying"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:177
-#, fuzzy, c-format
+#: ../coreapi/linphonecall.c:174
+#, c-format
 msgid "Authentication token is %s"
-msgstr "Linphone - Autenticazione richiesta"
+msgstr ""
 
-#: ../coreapi/linphonecall.c:2932
+#: ../coreapi/linphonecall.c:3020
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
 msgstr[0] ""
 msgstr[1] ""
-
-#~ msgid "aborted"
-#~ msgstr "annullato"
-
-#~ msgid "completed"
-#~ msgstr "comletato"
-
-#~ msgid "missed"
-#~ msgstr "mancante"
-
-#~ msgid ""
-#~ "%s at %s\n"
-#~ "From: %s\n"
-#~ "To: %s\n"
-#~ "Status: %s\n"
-#~ "Duration: %i mn %i sec\n"
-#~ msgstr ""
-#~ "%s at %s\n"
-#~ "Da: %s\n"
-#~ "Verso: %s\n"
-#~ "Stato: %s\n"
-#~ "Durata: %i mn %i sec\n"
-
-#~ msgid "Outgoing call"
-#~ msgstr "Chiamata in uscita"
-
-#, fuzzy
-#~ msgid "No response."
-#~ msgstr "timeout no risposta"
-
-#~ msgid ""
-#~ "Could not parse given sip address. A sip url usually looks like sip:"
-#~ "user@domain"
-#~ msgstr ""
-#~ "Errore nel formato del contatto sip. Usualmente un indirizzo appare sip:"
-#~ "user@domain"
-
-#~ msgid ""
-#~ "Your computer appears to be using ALSA sound drivers.\n"
-#~ "This is the best choice. However the pcm oss emulation module\n"
-#~ "is missing and linphone needs it. Please execute\n"
-#~ "'modprobe snd-pcm-oss' as root to load it."
-#~ msgstr ""
-#~ "Il tuo computer appare utlizzare il driver ALSA.\n"
-#~ "Questa è la scelta migliore. Tuttavia il modulo di emulazione pcm oss\n"
-#~ "è assente e linphone lo richede. Prego eseguire\n"
-#~ "'modprobe snd-pcm-oss' da utente root per caricarlo."
-
-#~ msgid ""
-#~ "Your computer appears to be using ALSA sound drivers.\n"
-#~ "This is the best choice. However the mixer oss emulation module\n"
-#~ "is missing and linphone needs it. Please execute\n"
-#~ " 'modprobe snd-mixer-oss' as root to load it."
-#~ msgstr ""
-#~ "Il tuo computer appare utlizzare il driver ALSA.\n"
-#~ "Questa è la scelta migliore. Tuttavia il modulo di emulazione mixer oss\n"
-#~ "è assente e linphone lo richede. Prego eseguire\n"
-#~ "'modprobe snd-mixer-oss' da utente root per caricarlo."
-
-#~ msgid "Chat with %s"
-#~ msgstr "Chat con %s"
-
-#~ msgid "Please choose a username:"
-#~ msgstr "Prego scegliere un username"
-
-#~ msgid "Checking if '%s' is available..."
-#~ msgstr "Controllo se '%s' è disponibile..."
-
-#~ msgid "Please wait..."
-#~ msgstr "Prego attendere ..."
-
-#~ msgid "Sorry this username already exists. Please try a new one."
-#~ msgstr "Spiacenti, questo usernsame è gia utilizzato. Prego riprovare"
-
-#~ msgid "Ok !"
-#~ msgstr "Ok !"
-
-#~ msgid "Communication problem, please try again later."
-#~ msgstr "Errore di comunicazione, prego riprovare."
-
-#~ msgid "Choosing a username"
-#~ msgstr "Scegli un username"
-
-#~ msgid "Verifying"
-#~ msgstr "Verifica"
-
-#~ msgid "Creating your account"
-#~ msgstr "Creazione account"
-
-#~ msgid "Now ready !"
-#~ msgstr "Pronto !"
-
-#, fuzzy
-#~ msgid "Enable video"
-#~ msgstr "Attivato"
-
-#~ msgid "Enter username, phone number, or full sip address"
-#~ msgstr "Inserisci username, numero o indirizzo sip"
-
-#~ msgid "in"
-#~ msgstr "in"
-
-#~ msgid ""
-#~ "Register to FONICS\n"
-#~ "virtual network !"
-#~ msgstr ""
-#~ "Registrati a  FONICS\n"
-#~ "virtual network !"
-
-#~ msgid "Unmute"
-#~ msgstr ""
-#~ "Attiva\n"
-#~ "microfono"
-
-#~ msgid "<b>Contact list</b>"
-#~ msgstr "<b>Lista contatti</b>"
-
-#, fuzzy
-#~ msgid "Audio & video"
-#~ msgstr "Audio & Video"
-
-#~ msgid "Audio only"
-#~ msgstr "Solo Audio"
-
-#~ msgid "Duration:"
-#~ msgstr "Durata:"
-
-#, fuzzy
-#~ msgid "_Call history"
-#~ msgstr "Cronologia"
-
-#~ msgid "_Linphone"
-#~ msgstr "_Linphone"
-
-#~ msgid "Register at startup"
-#~ msgstr "Registra all'avvio"
-
-#~ msgid "ITU-G.711 alaw encoder"
-#~ msgstr "ITU-G.711 alaw encoder"
-
-#~ msgid "ITU-G.711 alaw decoder"
-#~ msgstr "ITU-G.711 alaw decoder"
-
-#~ msgid "Alsa sound source"
-#~ msgstr "Alsa sound sorgente"
-
-#~ msgid "Alsa sound output"
-#~ msgstr "Alsa sound riproduzione"
-
-#~ msgid "Sound capture filter for MacOS X Audio Queue Service"
-#~ msgstr "Sound capture filter for MacOS X Audio Queue Service"
-
-#~ msgid "Sound playback filter for MacOS X Audio Queue Service"
-#~ msgstr "Sound playback filter for MacOS X Audio Queue Service"
-
-#~ msgid "DTMF generator"
-#~ msgstr "Generatore DTMF"
-
-#~ msgid "The GSM full-rate codec"
-#~ msgstr "GSM full-rate codec"
-
-#~ msgid "The GSM codec"
-#~ msgstr "GSM codec"
-
-#, fuzzy
-#~ msgid "Sound capture filter for MacOS X Audio Unit"
-#~ msgstr "Sound capture filter for MacOS X Audio Queue Service"
-
-#, fuzzy
-#~ msgid "Sound playback filter for MacOS X Audio Unit"
-#~ msgstr "Sound playback filter for MacOS X Audio Queue Service"
-
-#~ msgid "A filter to make conferencing"
-#~ msgstr "Un filtro per fare conferenze"
-
-#~ msgid "Raw files and wav reader"
-#~ msgstr "Raw files and wav reader"
-
-#~ msgid "Wav file recorder"
-#~ msgstr "Registratore Wav file"
-
-#~ msgid "A filter that send several inputs to one output."
-#~ msgstr "Un filtro che invia alcuni inputs in un unico output"
-
-#~ msgid "RTP output filter"
-#~ msgstr "RTP output filter"
-
-#~ msgid "The free and wonderful speex codec"
-#~ msgstr "The free and wonderful speex codec"
-
-#~ msgid "A filter that controls and measure sound volume"
-#~ msgstr "Un filtro che controlla e misura il volume"
-
-#~ msgid "A video4linux compatible source filter to stream pictures."
-#~ msgstr "Un video4linux filtro per inviare immagini"
-
-#~ msgid "A filter to grab pictures from Video4Linux2-powered cameras"
-#~ msgstr "un filtro per catturare immagini da video4linux2 videocamere"
-
-#~ msgid "A filter that outputs a static image."
-#~ msgstr "Un filtro che invia una immagine statica"
-
-#~ msgid "A pixel format converter"
-#~ msgstr "Un convertitore di formati pixel"
-
-#~ msgid "A video size converter"
-#~ msgstr "Un convertitore dimesione video "
-
-#~ msgid "a small video size converter"
-#~ msgstr "un piccolo convertitore dimesione video"
-
-#, fuzzy
-#~ msgid "Echo canceller using speex library"
-#~ msgstr "Cancellazione eco utilizzando la libreria speex"
-
-#~ msgid "A filter that reads from input and copy to its multiple outputs."
-#~ msgstr "Un filtro che legge gli inout e copia su multipli output."
-
-#~ msgid "The theora video encoder from xiph.org"
-#~ msgstr "Theora video encoder da xiph.org"
-
-#~ msgid "The open-source and royalty-free 'theora' video codec from xiph.org"
-#~ msgstr "Open-source and royalty-free 'theora' video codec da xiph.org"
-
-#~ msgid "The theora video decoder from xiph.org"
-#~ msgstr "Theora video decoder from xiph.org"
-
-#~ msgid "ITU-G.711 ulaw encoder"
-#~ msgstr "ITU-G.711 ulaw encoder"
-
-#~ msgid "ITU-G.711 ulaw decoder"
-#~ msgstr "ITU-G.711 ulaw decoder"
-
-#~ msgid "A H.263 decoder using ffmpeg library"
-#~ msgstr "Un H.263 decoder che utilizza le librerie ffmpeg"
-
-#~ msgid "A MPEG4 decoder using ffmpeg library"
-#~ msgstr "Un MPEG4 decoder che utilizza le librerie ffmpeg"
-
-#~ msgid "A RTP/JPEG decoder using ffmpeg library"
-#~ msgstr "Un RTP/JPEG decoder che utilizza le librerie ffmpeg"
-
-#~ msgid "A MJPEG decoder using ffmpeg library"
-#~ msgstr "Un MJPEG decoder che utilizza le librerie ffmpeg"
-
-#~ msgid "A snow decoder using ffmpeg library"
-#~ msgstr "Un snow decoder che utilizza le librerie ffmpeg"
-
-#~ msgid "A video H.263 encoder using ffmpeg library."
-#~ msgstr "Un H.263 encoder che utilizza le librerie ffmpeg"
-
-#~ msgid ""
-#~ "A video H.263 encoder using ffmpeg library. It is compliant with old "
-#~ "RFC2190 spec."
-#~ msgstr ""
-#~ "Un H.263 encoder che utilizza le librerie ffmpeg. Compliante con RFC2190 "
-#~ "spec."
-
-#~ msgid "A video MPEG4 encoder using ffmpeg library."
-#~ msgstr "Un MPEG4 encoder che utilizza le librerie ffmpeg"
-
-#~ msgid "A video snow encoder using ffmpeg library."
-#~ msgstr "Un snow encoder che utilizza le librerie ffmpeg"
-
-#~ msgid "A RTP/MJPEG encoder using ffmpeg library."
-#~ msgstr "Un RTP/JPEG decoder che utilizza le librerie ffmpeg"
-
-#~ msgid ""
-#~ "A video H.263 encoder using ffmpeg library, compliant with old RFC2190 "
-#~ "spec."
-#~ msgstr ""
-#~ "Un H.263 encoder che utilizza le librerie ffmpeg. Compliante con RFC2190 "
-#~ "spec."
-
-#~ msgid "A MJPEG encoder using ffmpeg library."
-#~ msgstr "Un MJPEG encoder che utilizza le librerie ffmpeg"
-
-#, fuzzy
-#~ msgid "A SDL-based video display"
-#~ msgstr "Un generico video display"
-
-#~ msgid "A video4windows compatible source filter to stream pictures."
-#~ msgstr "Un filtro video4windows per lo streaming delle immagini."
-
-#~ msgid "A video for windows (vfw.h) based source filter to grab pictures."
-#~ msgstr "Un filtro (vfw.h) per catturare immagini."
-
-#~ msgid "Parametric sound equalizer."
-#~ msgstr "Equalizzatore di suono."
-
-#~ msgid "A webcam grabber based on directshow."
-#~ msgstr "Un webcam grabber basato su directshow."
-
-#, fuzzy
-#~ msgid "A filter that converts from mono to stereo and vice versa."
-#~ msgstr "Un filtro che controlla e misura il volume"
-
-#, fuzzy
-#~ msgid "Inter ticker communication filter."
-#~ msgstr "Errore di comunicazione"
-
-#, fuzzy
-#~ msgid "Sound capture filter for MacOS X Audio Unit Service"
-#~ msgstr "Sound capture filter for MacOS X Audio Queue Service"
-
-#, fuzzy
-#~ msgid "Sound playback filter for MacOS X Audio Unit Service"
-#~ msgstr "Sound playback filter for MacOS X Audio Queue Service"
-
-#, fuzzy
-#~ msgid "Sound capture filter for Android"
-#~ msgstr "Filtro per la cattura audio per i driver OSS"
-
-#, fuzzy
-#~ msgid "Sound playback filter for Android"
-#~ msgstr "Filtro per la riproduzione audio per i driver OSS"
-
-#, fuzzy
-#~ msgid "A filter that captures Android video."
-#~ msgstr "Un filtro che controlla e misura il volume"
-
-#~ msgid ""
-#~ "Your machine appears to be connected to an IPv6 network. By default "
-#~ "linphone always uses IPv4. Please update your configuration if you want "
-#~ "to use IPv6"
-#~ msgstr ""
-#~ "La tua macchina sembra connessa ad una rete IPv6. Di default linphone "
-#~ "utilizza IPv4. Prego aggiorna la tua configurazione se vuoi usare IPv6"
-
-#~ msgid "Sound capture filter for MacOS X Core Audio drivers"
-#~ msgstr "Sound capture filter for MacOS X Core Audio drivers"
-
-#~ msgid "Sound playback filter for MacOS X Core Audio drivers"
-#~ msgstr "Sound playback filter for MacOS X Core Audio drivers"
-
-#~ msgid "Start call"
-#~ msgstr "Inizia chiamata"
-
-#~ msgid "_Modes"
-#~ msgstr "_Modi"
-
-#~ msgid "Created by Simon Morlat\n"
-#~ msgstr "Creato da Simon Morlat\n"
-
-#~ msgid "Accept"
-#~ msgstr "Accetta"
-
-#~ msgid "Incoming call from"
-#~ msgstr "Chiama in entrata da"
-
-#~ msgid "Linphone - Incoming call"
-#~ msgstr "Linphone - Chiamata in entrata"
-
-#~ msgid "default soundcard\n"
-#~ msgstr "default scheda audio\n"
-
-#~ msgid ""
-#~ "Remote end seems to have disconnected, the call is going to be closed."
-#~ msgstr "L'utente remoto sembra disconesso, la chiamata verrà terminata"
-
-#~ msgid "Sorry, having multiple simultaneous calls is not supported yet !"
-#~ msgstr "Spiacenti, le chiamate multiple non sono supportate"
-
-#~ msgid "Could not reach destination."
-#~ msgstr "Non posso raggiungere la destinazione"
-
-#~ msgid "Request Cancelled."
-#~ msgstr "Richiesta cancellata"
-
-#~ msgid "Bad request"
-#~ msgstr "Richiesta errata"
-
-#~ msgid "User cannot be found at given address."
-#~ msgstr "L'utente non trovato."
-
-#~ msgid "Remote user cannot support any of proposed codecs."
-#~ msgstr "L'utente remoto non supporta alcun code proposto."
-
-#~ msgid "Timeout."
-#~ msgstr "Timeout."
-
-#~ msgid "Remote host was found but refused connection."
-#~ msgstr "Utente remoto trovato ma ha rifiutato la connessione."
-
-#~ msgid ""
-#~ "User is not reachable at the moment but he invites you\n"
-#~ "to contact him using the following alternate resource:"
-#~ msgstr ""
-#~ "L'utente non è raggiungibile ma ti ha invitato\n"
-#~ "per contattarlo usare l'indirizzo alternativo:"
-
-#~ msgid "Digits"
-#~ msgstr "Caratteri"
-
-#~ msgid "Main view"
-#~ msgstr "Vista principale"
-
-#~ msgid "No nat/firewall address supplied !"
-#~ msgstr "Non è stato fornito un indirizzo nat/firewall!"
-
-#~ msgid "Invalid nat address '%s' : %s"
-#~ msgstr "Indirizzo NAT invalido '%s' : %s"
-
-#~ msgid "Gone"
-#~ msgstr "Uscita"
-
-#~ msgid "Waiting for Approval"
-#~ msgstr "In attesa di approvazione"
-
-#~ msgid "Be Right Back"
-#~ msgstr "Torno subito"
-
-#~ msgid "On The Phone"
-#~ msgstr "Al telefono"
-
-#~ msgid "Out To Lunch"
-#~ msgstr "Fuori per pranzo"
-
-#~ msgid "Closed"
-#~ msgstr "Chiuso"
-
-#~ msgid "Unknown"
-#~ msgstr "Sconosciuto"
-
-#~ msgid "Bresilian"
-#~ msgstr "Brasiliano"
diff --git a/po/ja.po b/po/ja.po
index 6a5e37625..87ead9898 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,21 +1,21 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 山口善也 <yushiya@anet.ne.jp>, 2002.
-# 
-#, fuzzy
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: linphone 0.10\n"
+"Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-15 09:24+0200\n"
-"PO-Revision-Date: 2003-01-21 00:05+9000\n"
-"Last-Translator: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\n"
-"Language-Team: <ja@li.org>\n"
-"Language: \n"
+"POT-Creation-Date: 2014-11-19 10:39+0100\n"
+"PO-Revision-Date: 2014-11-19 10:08+0000\n"
+"Last-Translator: Cqnqrd <gautier.pelloux@gmail.com>\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/linphone-gtk/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974
 #, c-format
@@ -28,41 +28,37 @@ msgid "Send text to %s"
 msgstr ""
 
 #: ../gtk/calllogs.c:232
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Recent calls (%i)</b>"
-msgstr "接続中"
+msgstr ""
 
 #: ../gtk/calllogs.c:314
 msgid "n/a"
 msgstr ""
 
 #: ../gtk/calllogs.c:317
-#, fuzzy
 msgid "Aborted"
-msgstr "通話はキャンセルされました。"
+msgstr ""
 
 #: ../gtk/calllogs.c:320
 msgid "Missed"
 msgstr ""
 
 #: ../gtk/calllogs.c:323
-#, fuzzy
 msgid "Declined"
-msgstr "ライン入力"
+msgstr ""
 
 #: ../gtk/calllogs.c:329
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] ""
-msgstr[1] ""
 
 #: ../gtk/calllogs.c:332
 #, c-format
 msgid "%i second"
 msgid_plural "%i seconds"
 msgstr[0] ""
-msgstr[1] ""
 
 #: ../gtk/calllogs.c:335 ../gtk/calllogs.c:341
 #, c-format
@@ -126,124 +122,110 @@ msgstr ""
 
 #: ../gtk/main.c:149
 msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: c:"
-"\\Program Files\\Linphone)"
+"Specifiy a working directory (should be the base of the installation, eg: "
+"c:\\Program Files\\Linphone)"
 msgstr ""
 
 #: ../gtk/main.c:156
-#, fuzzy
 msgid "Configuration file"
-msgstr "情報"
+msgstr ""
 
 #: ../gtk/main.c:163
 msgid "Run the audio assistant"
 msgstr ""
 
-#: ../gtk/main.c:590
-#, c-format
-msgid "Call with %s"
-msgstr ""
-
-#: ../gtk/main.c:1183
+#: ../gtk/main.c:1085
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
-"Would you allow him to see your presence status or add him to your contact "
-"list ?\n"
+"Would you allow him to see your presence status or add him to your contact list ?\n"
 "If you answer no, this person will be temporarily blacklisted."
 msgstr ""
 
-#: ../gtk/main.c:1260
+#: ../gtk/main.c:1162
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
 msgstr ""
 
-#: ../gtk/main.c:1376
-#, fuzzy
+#: ../gtk/main.c:1283
 msgid "Call error"
-msgstr "通話はキャンセルされました。"
+msgstr ""
 
-#: ../gtk/main.c:1379 ../coreapi/linphonecore.c:3240
-#, fuzzy
+#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3744
 msgid "Call ended"
-msgstr "通話は拒否されました。"
+msgstr ""
 
-#: ../gtk/main.c:1382
+#: ../gtk/main.c:1289
 msgid "Incoming call"
 msgstr ""
 
-#: ../gtk/main.c:1384 ../gtk/incall_view.c:522 ../gtk/main.ui.h:5
+#: ../gtk/main.c:1291 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
 msgid "Answer"
 msgstr ""
 
-#: ../gtk/main.c:1386 ../gtk/main.ui.h:6
-#, fuzzy
+#: ../gtk/main.c:1293 ../gtk/main.ui.h:6
 msgid "Decline"
-msgstr "ライン入力"
+msgstr ""
 
-#: ../gtk/main.c:1392
-#, fuzzy
+#: ../gtk/main.c:1299
 msgid "Call paused"
-msgstr "通話はキャンセルされました。"
+msgstr ""
 
-#: ../gtk/main.c:1392
-#, fuzzy, c-format
+#: ../gtk/main.c:1299
+#, c-format
 msgid "<b>by %s</b>"
-msgstr "接続中"
+msgstr ""
 
-#: ../gtk/main.c:1459
+#: ../gtk/main.c:1366
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr ""
 
-#: ../gtk/main.c:1621
+#: ../gtk/main.c:1528
 msgid "Website link"
 msgstr ""
 
-#: ../gtk/main.c:1670
+#: ../gtk/main.c:1577
 msgid "Linphone - a video internet phone"
 msgstr ""
 
-#: ../gtk/main.c:1762
+#: ../gtk/main.c:1669
 #, c-format
 msgid "%s (Default)"
 msgstr ""
 
-#: ../gtk/main.c:2099 ../coreapi/callbacks.c:949
+#: ../gtk/main.c:2006 ../coreapi/callbacks.c:983
 #, c-format
 msgid "We are transferred to %s"
 msgstr ""
 
-#: ../gtk/main.c:2109
+#: ../gtk/main.c:2016
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
 msgstr ""
 
-#: ../gtk/main.c:2250
+#: ../gtk/main.c:2157
 msgid "A free SIP video-phone"
 msgstr ""
 
 #: ../gtk/friendlist.c:505
-#, fuzzy
 msgid "Add to addressbook"
-msgstr "電話帳"
+msgstr ""
 
 #: ../gtk/friendlist.c:691
-#, fuzzy
 msgid "Presence status"
-msgstr "状態"
+msgstr ""
 
 #: ../gtk/friendlist.c:709 ../gtk/propertybox.c:552 ../gtk/contact.ui.h:1
 msgid "Name"
 msgstr "名前"
 
 #: ../gtk/friendlist.c:721
-#, fuzzy
 msgid "Call"
-msgstr "通話はキャンセルされました。"
+msgstr ""
 
 #: ../gtk/friendlist.c:726
 msgid "Chat"
@@ -255,9 +237,9 @@ msgid "Search in %s directory"
 msgstr ""
 
 #: ../gtk/friendlist.c:976
-#, fuzzy, c-format
+#, c-format
 msgid "Edit contact '%s'"
-msgstr "(接続するための情報がありません!)"
+msgstr ""
 
 #: ../gtk/friendlist.c:977
 #, c-format
@@ -283,9 +265,8 @@ msgid "Status"
 msgstr "状態"
 
 #: ../gtk/propertybox.c:570
-#, fuzzy
 msgid "IP Bitrate (kbit/s)"
-msgstr "最低限のビットレート (kbit/s)"
+msgstr ""
 
 #: ../gtk/propertybox.c:577
 msgid "Parameters"
@@ -303,93 +284,92 @@ msgstr "使用しない"
 msgid "Account"
 msgstr ""
 
-#: ../gtk/propertybox.c:1063
+#: ../gtk/propertybox.c:1072
 msgid "English"
 msgstr ""
 
-#: ../gtk/propertybox.c:1064
+#: ../gtk/propertybox.c:1073
 msgid "French"
 msgstr "Français"
 
-#: ../gtk/propertybox.c:1065
+#: ../gtk/propertybox.c:1074
 msgid "Swedish"
 msgstr ""
 
-#: ../gtk/propertybox.c:1066
+#: ../gtk/propertybox.c:1075
 msgid "Italian"
 msgstr ""
 
-#: ../gtk/propertybox.c:1067
+#: ../gtk/propertybox.c:1076
 msgid "Spanish"
 msgstr ""
 
-#: ../gtk/propertybox.c:1068
+#: ../gtk/propertybox.c:1077
 msgid "Brazilian Portugese"
 msgstr ""
 
-#: ../gtk/propertybox.c:1069
+#: ../gtk/propertybox.c:1078
 msgid "Polish"
 msgstr ""
 
-#: ../gtk/propertybox.c:1070
+#: ../gtk/propertybox.c:1079
 msgid "German"
 msgstr ""
 
-#: ../gtk/propertybox.c:1071
+#: ../gtk/propertybox.c:1080
 msgid "Russian"
 msgstr ""
 
-#: ../gtk/propertybox.c:1072
+#: ../gtk/propertybox.c:1081
 msgid "Japanese"
 msgstr "日本語"
 
-#: ../gtk/propertybox.c:1073
+#: ../gtk/propertybox.c:1082
 msgid "Dutch"
 msgstr ""
 
-#: ../gtk/propertybox.c:1074
+#: ../gtk/propertybox.c:1083
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ../gtk/propertybox.c:1075
+#: ../gtk/propertybox.c:1084
 msgid "Czech"
 msgstr "čeština"
 
-#: ../gtk/propertybox.c:1076
+#: ../gtk/propertybox.c:1085
 msgid "Chinese"
 msgstr "简体中文"
 
-#: ../gtk/propertybox.c:1077
+#: ../gtk/propertybox.c:1086
 msgid "Traditional Chinese"
 msgstr ""
 
-#: ../gtk/propertybox.c:1078
+#: ../gtk/propertybox.c:1087
 msgid "Norwegian"
 msgstr ""
 
-#: ../gtk/propertybox.c:1079
+#: ../gtk/propertybox.c:1088
 msgid "Hebrew"
 msgstr ""
 
-#: ../gtk/propertybox.c:1080
+#: ../gtk/propertybox.c:1089
 msgid "Serbian"
 msgstr ""
 
-#: ../gtk/propertybox.c:1147
+#: ../gtk/propertybox.c:1156
 msgid ""
 "You need to restart linphone for the new language selection to take effect."
 msgstr ""
 
-#: ../gtk/propertybox.c:1225
-#, fuzzy
+#: ../gtk/propertybox.c:1234
 msgid "None"
-msgstr "ありません。"
+msgstr ""
 
-#: ../gtk/propertybox.c:1229
+#: ../gtk/propertybox.c:1238
 msgid "SRTP"
 msgstr ""
 
-#: ../gtk/propertybox.c:1235
+#: ../gtk/propertybox.c:1244
 msgid "ZRTP"
 msgstr ""
 
@@ -413,14 +393,12 @@ msgid "Error communicating with server."
 msgstr ""
 
 #: ../gtk/buddylookup.c:164
-#, fuzzy
 msgid "Connecting..."
-msgstr "コネクション"
+msgstr ""
 
 #: ../gtk/buddylookup.c:168
-#, fuzzy
 msgid "Connected"
-msgstr "接続しました。"
+msgstr ""
 
 #: ../gtk/buddylookup.c:172
 msgid "Receiving data..."
@@ -431,7 +409,6 @@ msgstr ""
 msgid "Found %i contact"
 msgid_plural "Found %i contacts"
 msgstr[0] ""
-msgstr[1] ""
 
 #: ../gtk/setupwizard.c:34
 msgid ""
@@ -460,28 +437,24 @@ msgid "Enter your linphone.org username"
 msgstr ""
 
 #: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:79 ../gtk/ldap.ui.h:4
-#, fuzzy
 msgid "Username:"
-msgstr "ユーザーマニュアル"
+msgstr ""
 
 #: ../gtk/setupwizard.c:104 ../gtk/password.ui.h:4 ../gtk/ldap.ui.h:5
-#, fuzzy
 msgid "Password:"
-msgstr "パスワード"
+msgstr ""
 
 #: ../gtk/setupwizard.c:124
 msgid "Enter your account informations"
 msgstr ""
 
 #: ../gtk/setupwizard.c:140
-#, fuzzy
 msgid "Username*"
-msgstr "ユーザーマニュアル"
+msgstr ""
 
 #: ../gtk/setupwizard.c:141
-#, fuzzy
 msgid "Password*"
-msgstr "パスワード"
+msgstr ""
 
 #: ../gtk/setupwizard.c:144
 msgid "Domain*"
@@ -496,14 +469,12 @@ msgid "(*) Required fields"
 msgstr ""
 
 #: ../gtk/setupwizard.c:318
-#, fuzzy
 msgid "Username: (*)"
-msgstr "ユーザーマニュアル"
+msgstr ""
 
 #: ../gtk/setupwizard.c:320
-#, fuzzy
 msgid "Password: (*)"
-msgstr "パスワード"
+msgstr ""
 
 #: ../gtk/setupwizard.c:322
 msgid "Email: (*)"
@@ -529,8 +500,7 @@ msgstr ""
 
 #: ../gtk/setupwizard.c:413
 msgid ""
-"Please validate your account by clicking on the link we just sent you by "
-"email.\n"
+"Please validate your account by clicking on the link we just sent you by email.\n"
 "Then come back here and press Next button."
 msgstr ""
 
@@ -571,9 +541,9 @@ msgid "Terminating"
 msgstr ""
 
 #: ../gtk/incall_view.c:70 ../gtk/incall_view.c:94
-#, fuzzy, c-format
+#, c-format
 msgid "Call #%i"
-msgstr "通話はキャンセルされました。"
+msgstr ""
 
 #: ../gtk/incall_view.c:155
 #, c-format
@@ -589,9 +559,8 @@ msgid "ICE not activated"
 msgstr ""
 
 #: ../gtk/incall_view.c:223
-#, fuzzy
 msgid "ICE failed"
-msgstr "通話はキャンセルされました。"
+msgstr ""
 
 #: ../gtk/incall_view.c:225
 msgid "ICE in progress"
@@ -618,18 +587,16 @@ msgid "uPnP in progress"
 msgstr ""
 
 #: ../gtk/incall_view.c:243
-#, fuzzy
 msgid "uPnp not available"
-msgstr "特に情報はありません"
+msgstr ""
 
 #: ../gtk/incall_view.c:245
 msgid "uPnP is running"
 msgstr ""
 
 #: ../gtk/incall_view.c:247
-#, fuzzy
 msgid "uPnP failed"
-msgstr "通話はキャンセルされました。"
+msgstr ""
 
 #: ../gtk/incall_view.c:257 ../gtk/incall_view.c:258
 msgid "Direct or through server"
@@ -656,114 +623,108 @@ msgstr ""
 msgid "Hang up"
 msgstr ""
 
-#: ../gtk/incall_view.c:501
-#, fuzzy
+#: ../gtk/incall_view.c:511
 msgid "<b>Calling...</b>"
-msgstr "接続中"
+msgstr ""
 
-#: ../gtk/incall_view.c:504 ../gtk/incall_view.c:707
+#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:727
 msgid "00::00::00"
 msgstr ""
 
-#: ../gtk/incall_view.c:515
-#, fuzzy
+#: ../gtk/incall_view.c:525
 msgid "<b>Incoming call</b>"
-msgstr "接続中"
+msgstr ""
 
-#: ../gtk/incall_view.c:552
+#: ../gtk/incall_view.c:562
 msgid "good"
 msgstr ""
 
-#: ../gtk/incall_view.c:554
+#: ../gtk/incall_view.c:564
 msgid "average"
 msgstr ""
 
-#: ../gtk/incall_view.c:556
+#: ../gtk/incall_view.c:566
 msgid "poor"
 msgstr ""
 
-#: ../gtk/incall_view.c:558
+#: ../gtk/incall_view.c:568
 msgid "very poor"
 msgstr ""
 
-#: ../gtk/incall_view.c:560
+#: ../gtk/incall_view.c:570
 msgid "too bad"
 msgstr ""
 
-#: ../gtk/incall_view.c:561 ../gtk/incall_view.c:577
+#: ../gtk/incall_view.c:571 ../gtk/incall_view.c:587
 msgid "unavailable"
 msgstr ""
 
-#: ../gtk/incall_view.c:669
+#: ../gtk/incall_view.c:679
 msgid "Secured by SRTP"
 msgstr ""
 
-#: ../gtk/incall_view.c:675
+#: ../gtk/incall_view.c:685
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
 msgstr ""
 
-#: ../gtk/incall_view.c:681
+#: ../gtk/incall_view.c:691
 msgid "Set unverified"
 msgstr ""
 
-#: ../gtk/incall_view.c:681 ../gtk/main.ui.h:4
+#: ../gtk/incall_view.c:691 ../gtk/main.ui.h:4
 msgid "Set verified"
 msgstr ""
 
-#: ../gtk/incall_view.c:702
+#: ../gtk/incall_view.c:722
 msgid "In conference"
 msgstr ""
 
-#: ../gtk/incall_view.c:702
-#, fuzzy
+#: ../gtk/incall_view.c:722
 msgid "<b>In call</b>"
-msgstr "接続中"
+msgstr ""
 
-#: ../gtk/incall_view.c:738
-#, fuzzy
+#: ../gtk/incall_view.c:758
 msgid "<b>Paused call</b>"
-msgstr "接続中"
+msgstr ""
 
-#: ../gtk/incall_view.c:751
+#: ../gtk/incall_view.c:771
 #, c-format
 msgid "%02i::%02i::%02i"
 msgstr ""
 
-#: ../gtk/incall_view.c:772
-#, fuzzy
+#: ../gtk/incall_view.c:794
 msgid "<b>Call ended.</b>"
-msgstr "通話は拒否されました。"
+msgstr ""
 
-#: ../gtk/incall_view.c:803
+#: ../gtk/incall_view.c:825
 msgid "Transfer in progress"
 msgstr ""
 
-#: ../gtk/incall_view.c:806
+#: ../gtk/incall_view.c:828
 msgid "Transfer done."
 msgstr ""
 
-#: ../gtk/incall_view.c:809
-#, fuzzy
+#: ../gtk/incall_view.c:831
 msgid "Transfer failed."
-msgstr "通話はキャンセルされました。"
+msgstr ""
 
-#: ../gtk/incall_view.c:853
+#: ../gtk/incall_view.c:875
 msgid "Resume"
 msgstr ""
 
-#: ../gtk/incall_view.c:860 ../gtk/main.ui.h:9
+#: ../gtk/incall_view.c:882 ../gtk/main.ui.h:9
 msgid "Pause"
 msgstr ""
 
-#: ../gtk/incall_view.c:926
+#: ../gtk/incall_view.c:948
 #, c-format
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
 msgstr ""
 
-#: ../gtk/incall_view.c:926
+#: ../gtk/incall_view.c:948
 msgid "(Paused)"
 msgstr ""
 
@@ -805,23 +766,20 @@ msgid ""
 msgstr ""
 
 #: ../gtk/audio_assistant.c:328
-#, fuzzy
 msgid "Capture device"
-msgstr "使用するサウンドデバイス"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:329
-#, fuzzy
 msgid "Recorded volume"
-msgstr "録音する音源"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:333
 msgid "No voice"
 msgstr ""
 
 #: ../gtk/audio_assistant.c:369
-#, fuzzy
 msgid "Playback device"
-msgstr "使用するサウンドデバイス"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:370
 msgid "Play three beeps"
@@ -860,14 +818,12 @@ msgid "Record and Play"
 msgstr ""
 
 #: ../gtk/main.ui.h:1
-#, fuzzy
 msgid "<b>Callee name</b>"
-msgstr "通話は拒否されました。"
+msgstr ""
 
 #: ../gtk/main.ui.h:2
-#, fuzzy
 msgid "Send"
-msgstr "サウンド"
+msgstr ""
 
 #: ../gtk/main.ui.h:3
 msgid "End conference"
@@ -890,14 +846,12 @@ msgid "Transfer"
 msgstr ""
 
 #: ../gtk/main.ui.h:14
-#, fuzzy
 msgid "In call"
-msgstr "接続中"
+msgstr ""
 
 #: ../gtk/main.ui.h:15
-#, fuzzy
 msgid "Duration"
-msgstr "情報"
+msgstr ""
 
 #: ../gtk/main.ui.h:16
 msgid "Call quality rating"
@@ -908,9 +862,8 @@ msgid "All users"
 msgstr ""
 
 #: ../gtk/main.ui.h:18
-#, fuzzy
 msgid "Online users"
-msgstr "ライン入力"
+msgstr ""
 
 #: ../gtk/main.ui.h:19
 msgid "ADSL"
@@ -921,27 +874,24 @@ msgid "Fiber Channel"
 msgstr ""
 
 #: ../gtk/main.ui.h:21
-#, fuzzy
 msgid "Default"
-msgstr "個人情報"
+msgstr ""
 
 #: ../gtk/main.ui.h:22
 msgid "_Options"
 msgstr ""
 
 #: ../gtk/main.ui.h:23
-#, fuzzy
 msgid "Set configuration URI"
-msgstr "情報"
+msgstr ""
 
 #: ../gtk/main.ui.h:24
 msgid "Always start video"
 msgstr ""
 
 #: ../gtk/main.ui.h:25
-#, fuzzy
 msgid "Enable self-view"
-msgstr "使用する"
+msgstr ""
 
 #: ../gtk/main.ui.h:26
 msgid "_Help"
@@ -964,52 +914,44 @@ msgid "Account assistant"
 msgstr ""
 
 #: ../gtk/main.ui.h:32
-#, fuzzy
 msgid "SIP address or phone number:"
-msgstr "レジストラサーバーのSIPアドレス"
+msgstr ""
 
 #: ../gtk/main.ui.h:33
 msgid "Initiate a new call"
 msgstr ""
 
 #: ../gtk/main.ui.h:34
-#, fuzzy
 msgid "Contacts"
-msgstr "接続中"
+msgstr ""
 
 #: ../gtk/main.ui.h:35
 msgid "Search"
 msgstr ""
 
 #: ../gtk/main.ui.h:36
-#, fuzzy
 msgid "<b>Add contacts from directory</b>"
-msgstr "コーデックの情報"
+msgstr ""
 
 #: ../gtk/main.ui.h:37
-#, fuzzy
 msgid "Add contact"
-msgstr "(接続するための情報がありません!)"
+msgstr ""
 
 #: ../gtk/main.ui.h:38
-#, fuzzy
 msgid "Recent calls"
-msgstr "接続中"
+msgstr ""
 
 #: ../gtk/main.ui.h:39
-#, fuzzy
 msgid "My current identity:"
-msgstr "個人情報"
+msgstr ""
 
 #: ../gtk/main.ui.h:40 ../gtk/tunnel_config.ui.h:7
-#, fuzzy
 msgid "Username"
-msgstr "ユーザーマニュアル"
+msgstr ""
 
 #: ../gtk/main.ui.h:41 ../gtk/tunnel_config.ui.h:8
-#, fuzzy
 msgid "Password"
-msgstr "パスワード"
+msgstr ""
 
 #: ../gtk/main.ui.h:42
 msgid "Internet connection:"
@@ -1024,23 +966,20 @@ msgid "UserID"
 msgstr ""
 
 #: ../gtk/main.ui.h:45
-#, fuzzy
 msgid "Login information"
-msgstr "コーデックの情報"
+msgstr ""
 
 #: ../gtk/main.ui.h:46
-#, fuzzy
 msgid "<b>Welcome !</b>"
-msgstr "接続中"
+msgstr ""
 
 #: ../gtk/main.ui.h:47
 msgid "Delete"
 msgstr ""
 
 #: ../gtk/about.ui.h:1
-#, fuzzy
 msgid "About linphone"
-msgstr "Linphone"
+msgstr ""
 
 #: ../gtk/about.ui.h:2
 msgid "(C) Belledonne Communications,2010\n"
@@ -1067,9 +1006,8 @@ msgid ""
 msgstr ""
 
 #: ../gtk/contact.ui.h:2
-#, fuzzy
 msgid "SIP Address"
-msgstr "アドレス"
+msgstr ""
 
 #: ../gtk/contact.ui.h:3
 msgid "Show this contact presence status"
@@ -1080,9 +1018,8 @@ msgid "Allow this contact to see my presence status"
 msgstr ""
 
 #: ../gtk/contact.ui.h:5
-#, fuzzy
 msgid "<b>Contact information</b>"
-msgstr "コーデックの情報"
+msgstr ""
 
 #: ../gtk/log.ui.h:1
 msgid "Linphone debug window"
@@ -1093,9 +1030,8 @@ msgid "Scroll to end"
 msgstr ""
 
 #: ../gtk/password.ui.h:1
-#, fuzzy
 msgid "Linphone - Authentication required"
-msgstr "コーデックの情報"
+msgstr ""
 
 #: ../gtk/password.ui.h:2
 msgid "Please enter the domain password"
@@ -1118,9 +1054,8 @@ msgid "Linphone - Configure a SIP account"
 msgstr ""
 
 #: ../gtk/sip_account.ui.h:2
-#, fuzzy
 msgid "Your SIP identity:"
-msgstr "個人情報"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:3
 msgid "Looks like sip:<username>@<domain>"
@@ -1131,18 +1066,16 @@ msgid "sip:"
 msgstr "sip:"
 
 #: ../gtk/sip_account.ui.h:5
-#, fuzzy
 msgid "SIP Proxy address:"
-msgstr "Sipアドレス:"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:6
 msgid "Looks like sip:<proxy hostname>"
 msgstr ""
 
 #: ../gtk/sip_account.ui.h:7
-#, fuzzy
 msgid "Registration duration (sec):"
-msgstr "登録しました。"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:8
 msgid "Contact params (optional):"
@@ -1157,23 +1090,20 @@ msgid "Route (optional):"
 msgstr ""
 
 #: ../gtk/sip_account.ui.h:11
-#, fuzzy
 msgid "Transport"
-msgstr "接続中"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:12
 msgid "Register"
 msgstr ""
 
 #: ../gtk/sip_account.ui.h:13
-#, fuzzy
 msgid "Publish presence information"
-msgstr "コーデックの情報"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:14
-#, fuzzy
 msgid "Enable AVPF"
-msgstr "使用する"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:15
 msgid "Configure a SIP account"
@@ -1208,14 +1138,12 @@ msgid "CIF"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:8
-#, fuzzy
 msgid "Audio codecs"
-msgstr "オーディオコーデックのプロパティー"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:9
-#, fuzzy
 msgid "Video codecs"
-msgstr "オーディオコーデックのプロパティー"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:10 ../gtk/keypad.ui.h:5
 msgid "C"
@@ -1250,9 +1178,8 @@ msgid "Use IPv6 instead of IPv4"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:18
-#, fuzzy
 msgid "<b>Transport</b>"
-msgstr "接続中"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:19
 msgid "Media encryption type"
@@ -1283,14 +1210,12 @@ msgid "DSCP fields"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:26
-#, fuzzy
 msgid "SIP/TCP port"
-msgstr "SIPのポート"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:27
-#, fuzzy
 msgid "SIP/UDP port"
-msgstr "SIPのポート"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:28
 msgid "<b>Network protocol and ports</b>"
@@ -1317,76 +1242,64 @@ msgid "Behind NAT / Firewall (use uPnP)"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:34
-#, fuzzy
 msgid "Public IP address:"
-msgstr "Sipアドレス:"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:35
-#, fuzzy
 msgid "Stun server:"
-msgstr "使用するサウンドデバイス"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:36
-#, fuzzy
 msgid "<b>NAT and Firewall</b>"
-msgstr "接続中"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:37
-#, fuzzy
 msgid "Network settings"
-msgstr "ネットワーク"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:38
-#, fuzzy
 msgid "Ring sound:"
-msgstr "録音する音源"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:39
 msgid "ALSA special device (optional):"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:40
-#, fuzzy
 msgid "Capture device:"
-msgstr "使用するサウンドデバイス"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:41
-#, fuzzy
 msgid "Ring device:"
-msgstr "使用するサウンドデバイス"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:42
-#, fuzzy
 msgid "Playback device:"
-msgstr "使用するサウンドデバイス"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:43
 msgid "Enable echo cancellation"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:44
-#, fuzzy
 msgid "<b>Audio</b>"
-msgstr "接続中"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:45
-#, fuzzy
 msgid "Video input device:"
-msgstr "使用するサウンドデバイス"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:46
 msgid "Prefered video resolution:"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:47
-#, fuzzy
 msgid "Video output method:"
-msgstr "使用するサウンドデバイス"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:48
-#, fuzzy
 msgid "<b>Video</b>"
-msgstr "接続中"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:49
 msgid "Multimedia settings"
@@ -1401,19 +1314,16 @@ msgid "Your display name (eg: John Doe):"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:52
-#, fuzzy
 msgid "Your username:"
-msgstr "ユーザーマニュアル"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:53
-#, fuzzy
 msgid "Your resulting SIP address:"
-msgstr "あなたのSIPアドレス"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:54
-#, fuzzy
 msgid "<b>Default identity</b>"
-msgstr "個人情報"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:55
 msgid "Wizard"
@@ -1432,18 +1342,16 @@ msgid "Remove"
 msgstr "削除する"
 
 #: ../gtk/parameters.ui.h:59
-#, fuzzy
 msgid "<b>Proxy accounts</b>"
-msgstr "接続中"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:60
 msgid "Erase all passwords"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:61
-#, fuzzy
 msgid "<b>Privacy</b>"
-msgstr "接続中"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:62
 msgid "Manage SIP Accounts"
@@ -1458,9 +1366,8 @@ msgid "Disable"
 msgstr "使用しない"
 
 #: ../gtk/parameters.ui.h:65
-#, fuzzy
 msgid "<b>Codecs</b>"
-msgstr "接続中"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:66
 msgid "0 stands for \"unlimited\""
@@ -1489,84 +1396,72 @@ msgid "<b>Bandwidth control</b>"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:72
-#, fuzzy
 msgid "Codecs"
-msgstr "コーデック"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:73
-#, fuzzy
 msgid "<b>Language</b>"
-msgstr "接続中"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:74
 msgid "Show advanced settings"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:75
-#, fuzzy
 msgid "<b>Level</b>"
-msgstr "接続中"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:76
-#, fuzzy
 msgid "User interface"
-msgstr "ユーザーマニュアル"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:77 ../gtk/ldap.ui.h:2
-#, fuzzy
 msgid "Server address:"
-msgstr "サーバーのアドレス"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:78 ../gtk/ldap.ui.h:3
-#, fuzzy
 msgid "Authentication method:"
-msgstr "コーデックの情報"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:80
 msgid "label"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:81
-#, fuzzy
 msgid "<b>LDAP Account setup</b>"
-msgstr "接続中"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:82
 msgid "LDAP"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:83
-#, fuzzy
 msgid "Done"
-msgstr "ありません。"
+msgstr ""
 
 #: ../gtk/buddylookup.ui.h:1
-#, fuzzy
 msgid "Search contacts in directory"
-msgstr "コーデックの情報"
+msgstr ""
 
 #: ../gtk/buddylookup.ui.h:2
 msgid "Add to my list"
 msgstr ""
 
 #: ../gtk/buddylookup.ui.h:3
-#, fuzzy
 msgid "<b>Search somebody</b>"
-msgstr "接続中"
+msgstr ""
 
 #: ../gtk/waiting.ui.h:1
-#, fuzzy
 msgid "Linphone"
-msgstr "Linphone"
+msgstr ""
 
 #: ../gtk/waiting.ui.h:2
 msgid "Please wait"
 msgstr ""
 
 #: ../gtk/dscp_settings.ui.h:1
-#, fuzzy
 msgid "DSCP settings"
-msgstr "ネットワーク"
+msgstr ""
 
 #: ../gtk/dscp_settings.ui.h:2
 msgid "SIP"
@@ -1589,14 +1484,12 @@ msgid "Call statistics"
 msgstr ""
 
 #: ../gtk/call_statistics.ui.h:2
-#, fuzzy
 msgid "Audio codec"
-msgstr "オーディオコーデックのプロパティー"
+msgstr ""
 
 #: ../gtk/call_statistics.ui.h:3
-#, fuzzy
 msgid "Video codec"
-msgstr "オーディオコーデックのプロパティー"
+msgstr ""
 
 #: ../gtk/call_statistics.ui.h:4
 msgid "Audio IP bandwidth usage"
@@ -1615,9 +1508,8 @@ msgid "Video Media connectivity"
 msgstr ""
 
 #: ../gtk/call_statistics.ui.h:8
-#, fuzzy
 msgid "Round trip time"
-msgstr "サウンドのプロパティー"
+msgstr ""
 
 #: ../gtk/call_statistics.ui.h:9
 msgid "Video resolution received"
@@ -1632,9 +1524,8 @@ msgid "RTP profile"
 msgstr ""
 
 #: ../gtk/call_statistics.ui.h:12
-#, fuzzy
 msgid "<b>Call statistics and information</b>"
-msgstr "コーデックの情報"
+msgstr ""
 
 #: ../gtk/tunnel_config.ui.h:1
 msgid "Configure VoIP tunnel"
@@ -1717,23 +1608,20 @@ msgid "1"
 msgstr "1"
 
 #: ../gtk/ldap.ui.h:1
-#, fuzzy
 msgid "LDAP Settings"
-msgstr "ネットワーク"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:6
 msgid "Use TLS Connection"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:7
-#, fuzzy
 msgid "Not yet available"
-msgstr "特に情報はありません"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:8
-#, fuzzy
 msgid "<b>Connection</b>"
-msgstr "接続中"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:9
 msgid "Bind DN"
@@ -1748,9 +1636,8 @@ msgid "Realm"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:12
-#, fuzzy
 msgid "<b>SASL</b>"
-msgstr "接続中"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:13
 msgid "Base object:"
@@ -1766,18 +1653,16 @@ msgid "Name Attribute:"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:17
-#, fuzzy
 msgid "SIP address attribute:"
-msgstr "アドレス"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:18
 msgid "Attributes to query:"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:19
-#, fuzzy
 msgid "<b>Search</b>"
-msgstr "接続中"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:20
 msgid "Timeout for search:"
@@ -1792,9 +1677,8 @@ msgid "Follow Aliases"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:23
-#, fuzzy
 msgid "<b>Miscellaneous</b>"
-msgstr "接続中"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:24
 msgid "ANONYMOUS"
@@ -1818,11 +1702,8 @@ msgstr ""
 
 #: ../gtk/config-uri.ui.h:2
 msgid ""
-"This dialog allows to set an http or https address when configuration is to "
-"be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, "
-"Linphone will restart automatically in order to fetch and take into account "
-"the new configuration. "
+"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
 msgstr ""
 
 #: ../gtk/config-uri.ui.h:4
@@ -1830,93 +1711,85 @@ msgid "https://"
 msgstr ""
 
 #: ../gtk/provisioning-fetch.ui.h:1
-#, fuzzy
 msgid "Configuring..."
-msgstr "コネクション"
+msgstr ""
 
 #: ../gtk/provisioning-fetch.ui.h:2
 msgid "Please wait while fetching configuration from server..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1034
-#, fuzzy
+#: ../coreapi/linphonecore.c:1511
 msgid "Ready"
-msgstr "準備完了。"
+msgstr ""
 
-#: ../coreapi/linphonecore.c:1967
-#, fuzzy
+#: ../coreapi/linphonecore.c:2470
 msgid "Configuring"
-msgstr "情報"
+msgstr ""
 
-#: ../coreapi/linphonecore.c:2133
+#: ../coreapi/linphonecore.c:2635
 msgid "Looking for telephone number destination..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2136
+#: ../coreapi/linphonecore.c:2637
 msgid "Could not resolve this number."
 msgstr ""
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2418
-#, fuzzy
+#: ../coreapi/linphonecore.c:2919
 msgid "Contacting"
-msgstr "接続中"
+msgstr ""
 
-#: ../coreapi/linphonecore.c:2425
-#, fuzzy
+#: ../coreapi/linphonecore.c:2924
 msgid "Could not call"
-msgstr "pixmapファイルが見つかりません %s"
+msgstr ""
 
-#: ../coreapi/linphonecore.c:2576
+#: ../coreapi/linphonecore.c:3074
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2745
-#, fuzzy
+#: ../coreapi/linphonecore.c:3233
 msgid "is contacting you"
-msgstr "から電話です。"
+msgstr ""
 
-#: ../coreapi/linphonecore.c:2746
+#: ../coreapi/linphonecore.c:3234
 msgid " and asked autoanswer."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2746
+#: ../coreapi/linphonecore.c:3234
 msgid "."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2865
+#: ../coreapi/linphonecore.c:3352
 msgid "Modifying call parameters..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3194
+#: ../coreapi/linphonecore.c:3700
 msgid "Connected."
 msgstr "接続しました。"
 
-#: ../coreapi/linphonecore.c:3220
-#, fuzzy
+#: ../coreapi/linphonecore.c:3725
 msgid "Call aborted"
-msgstr "通話はキャンセルされました。"
+msgstr ""
 
-#: ../coreapi/linphonecore.c:3412
+#: ../coreapi/linphonecore.c:3915
 msgid "Could not pause the call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3417
+#: ../coreapi/linphonecore.c:3919
 msgid "Pausing the current call..."
 msgstr ""
 
-#: ../coreapi/misc.c:425
+#: ../coreapi/misc.c:438
 msgid "Stun lookup in progress..."
 msgstr ""
 
-#: ../coreapi/misc.c:607
+#: ../coreapi/misc.c:619
 msgid "ICE local candidates gathering in progress..."
 msgstr ""
 
 #: ../coreapi/friend.c:33
-#, fuzzy
 msgid "Online"
-msgstr "ライン入力"
+msgstr ""
 
 #: ../coreapi/friend.c:36
 msgid "Busy"
@@ -1931,9 +1804,8 @@ msgid "Away"
 msgstr "退席中"
 
 #: ../coreapi/friend.c:45
-#, fuzzy
 msgid "On the phone"
-msgstr "Linphone"
+msgstr ""
 
 #: ../coreapi/friend.c:48
 msgid "Out to lunch"
@@ -1944,525 +1816,162 @@ msgid "Do not disturb"
 msgstr "手が離せません"
 
 #: ../coreapi/friend.c:54
-#, fuzzy
 msgid "Moved"
-msgstr "コーデック"
+msgstr ""
 
 #: ../coreapi/friend.c:57
 msgid "Using another messaging service"
 msgstr ""
 
 #: ../coreapi/friend.c:60
-#, fuzzy
 msgid "Offline"
-msgstr "ライン入力"
+msgstr ""
 
 #: ../coreapi/friend.c:63
 msgid "Pending"
 msgstr ""
 
 #: ../coreapi/friend.c:66
-#, fuzzy
 msgid "Vacation"
-msgstr "情報"
+msgstr ""
 
 #: ../coreapi/friend.c:68
 msgid "Unknown-bug"
 msgstr ""
 
-#: ../coreapi/proxy.c:314
+#: ../coreapi/proxy.c:319
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
 msgstr ""
 
-#: ../coreapi/proxy.c:320
+#: ../coreapi/proxy.c:325
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
 msgstr ""
 
-#: ../coreapi/proxy.c:1369
-#, fuzzy, c-format
+#: ../coreapi/proxy.c:1377
+#, c-format
 msgid "Could not login as %s"
-msgstr "pixmapファイルが見つかりません %s"
+msgstr ""
 
-#: ../coreapi/callbacks.c:355
-#, fuzzy
+#: ../coreapi/callbacks.c:383
 msgid "Remote ringing."
-msgstr "登録中……"
+msgstr ""
 
-#: ../coreapi/callbacks.c:373
-#, fuzzy
+#: ../coreapi/callbacks.c:404
 msgid "Remote ringing..."
-msgstr "登録中……"
+msgstr ""
 
-#: ../coreapi/callbacks.c:384
+#: ../coreapi/callbacks.c:414
 msgid "Early media."
 msgstr ""
 
-#: ../coreapi/callbacks.c:435
+#: ../coreapi/callbacks.c:475
 #, c-format
 msgid "Call with %s is paused."
 msgstr ""
 
-#: ../coreapi/callbacks.c:448
+#: ../coreapi/callbacks.c:488
 #, c-format
 msgid "Call answered by %s - on hold."
 msgstr ""
 
-#: ../coreapi/callbacks.c:459
-#, fuzzy
+#: ../coreapi/callbacks.c:498
 msgid "Call resumed."
-msgstr "通話は拒否されました。"
+msgstr ""
 
-#: ../coreapi/callbacks.c:464
-#, fuzzy, c-format
+#: ../coreapi/callbacks.c:502
+#, c-format
 msgid "Call answered by %s."
 msgstr ""
-"電話をかける\n"
-"電話に出る"
 
-#: ../coreapi/callbacks.c:483
+#: ../coreapi/callbacks.c:525
 msgid "Incompatible, check codecs or security settings..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:512
+#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:826
+msgid "Incompatible media parameters."
+msgstr ""
+
+#: ../coreapi/callbacks.c:560
 msgid "We have been resumed."
 msgstr ""
 
-#: ../coreapi/callbacks.c:521
+#. we are being paused
+#: ../coreapi/callbacks.c:568
 msgid "We are paused by other party."
 msgstr ""
 
-#: ../coreapi/callbacks.c:556
+#. reINVITE and in-dialogs UPDATE go here
+#: ../coreapi/callbacks.c:602
 msgid "Call is updated by remote."
 msgstr ""
 
-#: ../coreapi/callbacks.c:658
-#, fuzzy
+#: ../coreapi/callbacks.c:705
 msgid "Call terminated."
-msgstr "通話は拒否されました。"
+msgstr ""
 
-#: ../coreapi/callbacks.c:687
+#: ../coreapi/callbacks.c:733
 msgid "User is busy."
 msgstr "ユーザーはビジーです"
 
-#: ../coreapi/callbacks.c:688
+#: ../coreapi/callbacks.c:734
 msgid "User is temporarily unavailable."
 msgstr "ユーザーは、今出られません。"
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:690
+#: ../coreapi/callbacks.c:736
 msgid "User does not want to be disturbed."
 msgstr "ユーザーは手が離せないようです。"
 
-#: ../coreapi/callbacks.c:691
+#: ../coreapi/callbacks.c:737
 msgid "Call declined."
 msgstr "通話は拒否されました。"
 
-#: ../coreapi/callbacks.c:706
+#: ../coreapi/callbacks.c:752
 msgid "Request timeout."
 msgstr ""
 
-#: ../coreapi/callbacks.c:737
+#: ../coreapi/callbacks.c:780
 msgid "Redirected"
 msgstr ""
 
-#: ../coreapi/callbacks.c:787
-msgid "Incompatible media parameters."
+#: ../coreapi/callbacks.c:835
+msgid "Call failed."
 msgstr ""
 
-#: ../coreapi/callbacks.c:798
-#, fuzzy
-msgid "Call failed."
-msgstr "通話はキャンセルされました。"
-
-#: ../coreapi/callbacks.c:878
-#, fuzzy, c-format
+#: ../coreapi/callbacks.c:913
+#, c-format
 msgid "Registration on %s successful."
-msgstr "登録しました。"
+msgstr ""
 
-#: ../coreapi/callbacks.c:879
-#, fuzzy, c-format
+#: ../coreapi/callbacks.c:914
+#, c-format
 msgid "Unregistration on %s done."
-msgstr "登録しました。"
+msgstr ""
 
-#: ../coreapi/callbacks.c:897
+#: ../coreapi/callbacks.c:932
 msgid "no response timeout"
 msgstr ""
 
-#: ../coreapi/callbacks.c:900
-#, fuzzy, c-format
+#: ../coreapi/callbacks.c:935
+#, c-format
 msgid "Registration on %s failed: %s"
-msgstr "登録しました。"
+msgstr ""
 
-#: ../coreapi/callbacks.c:907
+#: ../coreapi/callbacks.c:942
 msgid "Service unavailable, retrying"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:177
-#, fuzzy, c-format
+#: ../coreapi/linphonecall.c:174
+#, c-format
 msgid "Authentication token is %s"
-msgstr "コーデックの情報"
+msgstr ""
 
-#: ../coreapi/linphonecall.c:2932
+#: ../coreapi/linphonecall.c:3020
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
 msgstr[0] ""
-msgstr[1] ""
-
-#, fuzzy
-#~ msgid ""
-#~ "Could not parse given sip address. A sip url usually looks like sip:"
-#~ "user@domain"
-#~ msgstr ""
-#~ "SIPアドレスの形式エラーです。SIPアドレスは、<sip:username@domainname>のよ"
-#~ "うな形式です。"
-
-#~ msgid ""
-#~ "Your computer appears to be using ALSA sound drivers.\n"
-#~ "This is the best choice. However the pcm oss emulation module\n"
-#~ "is missing and linphone needs it. Please execute\n"
-#~ "'modprobe snd-pcm-oss' as root to load it."
-#~ msgstr ""
-#~ "このコンピューターはALSAサウンドドライバーを使用しているようです。\n"
-#~ "それは最良の選択です。しかし、Linphoneが必要とする\n"
-#~ "pcm ossエミュレーションモジュールが見つかりません。\n"
-#~ "ロードするために、ルート権限で'modprobe snd-pcm-oss'を実行してください。"
-
-#~ msgid ""
-#~ "Your computer appears to be using ALSA sound drivers.\n"
-#~ "This is the best choice. However the mixer oss emulation module\n"
-#~ "is missing and linphone needs it. Please execute\n"
-#~ " 'modprobe snd-mixer-oss' as root to load it."
-#~ msgstr ""
-#~ "このコンピューターはALSAサウンドドライバーを使用しているようです。\n"
-#~ "それは最良の選択です。しかし、Linphoneが必要とする\n"
-#~ "mixer ossエミュレーションモジュールが見つかりません。\n"
-#~ "ロードするために、ルート権限で'modprobe snd-mixer-oss'を実行してください。"
-
-#, fuzzy
-#~ msgid "Enable video"
-#~ msgstr "使用する"
-
-#, fuzzy
-#~ msgid "<b>Contact list</b>"
-#~ msgstr "接続中"
-
-#, fuzzy
-#~ msgid "Audio & video"
-#~ msgstr "オーディオコーデックのプロパティー"
-
-#, fuzzy
-#~ msgid "Audio only"
-#~ msgstr "オーディオ"
-
-#, fuzzy
-#~ msgid "Duration:"
-#~ msgstr "情報"
-
-#, fuzzy
-#~ msgid "_Linphone"
-#~ msgstr "Linphone"
-
-#, fuzzy
-#~ msgid "gtk-cancel"
-#~ msgstr "接続しました。"
-
-#, fuzzy
-#~ msgid "gtk-ok"
-#~ msgstr "削除する"
-
-#, fuzzy
-#~ msgid "gtk-close"
-#~ msgstr "接続しました。"
-
-#, fuzzy
-#~ msgid "_Modes"
-#~ msgstr "コーデック"
-
-#, fuzzy
-#~ msgid ""
-#~ "Audio codecs\n"
-#~ "Video codecs"
-#~ msgstr "オーディオコーデックのプロパティー"
-
-#, fuzzy
-#~ msgid "Request Cancelled."
-#~ msgstr "通話はキャンセルされました。"
-
-#~ msgid "User cannot be found at given address."
-#~ msgstr "ユーザーが見つかりません。"
-
-#~ msgid "Remote user cannot support any of proposed codecs."
-#~ msgstr "相手側では、提案したコーデックを一つもサポートしていません。"
-
-#~ msgid "Timeout."
-#~ msgstr "時間切れです。"
-
-#~ msgid "Remote host was found but refused connection."
-#~ msgstr "リモートホストが見つかりましたが、接続を拒否されました。"
-
-#~ msgid ""
-#~ "User is not reachable at the moment but he invites you\n"
-#~ "to contact him using the following alternate resource:"
-#~ msgstr ""
-#~ "ユーザーに接続することができませんが、ユーザーは代わりの手段に招待していま"
-#~ "す。\n"
-#~ "他の手段で連絡をとってください。"
-
-#, fuzzy
-#~ msgid "Gone"
-#~ msgstr "ありません。"
-
-#, fuzzy
-#~ msgid "Display filters"
-#~ msgstr "表示される名前"
-
-#, fuzzy
-#~ msgid "_Properties"
-#~ msgstr "RTPのプロパティー"
-
-#~ msgid "Sound"
-#~ msgstr "サウンド"
-
-#~ msgid "Address book"
-#~ msgstr "電話帳"
-
-#, fuzzy
-#~ msgid "Shows the address book"
-#~ msgstr "電話帳"
-
-#~ msgid "Show more..."
-#~ msgstr "詳細"
-
-#~ msgid "Playback level:"
-#~ msgstr "受話音量"
-
-#~ msgid "Recording level:"
-#~ msgstr "送話音量"
-
-#, fuzzy
-#~ msgid "Ring level:"
-#~ msgstr "送話音量"
-
-#~ msgid "Reachable"
-#~ msgstr "在席中"
-
-#~ msgid "Busy, I'll be back in "
-#~ msgstr "今席をはずしています。"
-
-#~ msgid "The other party will be informed that you'll be back in X minutes"
-#~ msgstr "発信者は、あなたがX分後に戻ってくることが分かります。"
-
-#~ msgid "mn"
-#~ msgstr "分"
-
-#~ msgid "Moved temporarily"
-#~ msgstr "すぐ戻ります"
-
-#~ msgid "Alternative service"
-#~ msgstr "他の連絡手段を使って下さい"
-
-#~ msgid "URL:"
-#~ msgstr "URL:"
-
-#~ msgid "Presence"
-#~ msgstr "状態"
-
-#~ msgid "Press digits to send DTMFs."
-#~ msgstr "DTMFを送信するための数字を押して下さい。"
-
-#~ msgid "DTMF"
-#~ msgstr "DTMF"
-
-#~ msgid ""
-#~ "Linphone is a web-phone.\n"
-#~ "It is compatible with SIP and RTP protocols."
-#~ msgstr ""
-#~ "Linphoneはインターネット電話です。\n"
-#~ "SIP・RTPプロトコルと互換性があります。"
-
-#, fuzzy
-#~ msgid "Use IPv6 network (if available)"
-#~ msgstr "ユーザーは、今出られません。"
-
-#, fuzzy
-#~ msgid "Number of buffered miliseconds (jitter compensation):"
-#~ msgstr ""
-#~ "バッファするミリ秒\n"
-#~ "(音声が途切れるときは大きくします)"
-
-#~ msgid "RTP port used for audio:"
-#~ msgstr "オーディオに使用するRTPポート番号"
-
-#~ msgid "micro"
-#~ msgstr "マイク入力"
-
-#~ msgid "Run sip user agent on port:"
-#~ msgstr "SIPユーザーエージェントが起動するポート"
-
-#~ msgid "It is strongly recommended to use port 5060."
-#~ msgstr "5060番ポートを使うことを強く推奨します。"
-
-#~ msgid "@"
-#~ msgstr "@"
-
-#~ msgid "Identity"
-#~ msgstr "個人情報"
-
-#, fuzzy
-#~ msgid "Add proxy/registrar"
-#~ msgstr "SIPレジストラを使う"
-
-#~ msgid "Remote services"
-#~ msgstr "リモートのサービス"
-
-#~ msgid "List of audio codecs, in order of preference:"
-#~ msgstr "コーデックのリストです。使いたい順に並べてください。"
-
-#~ msgid ""
-#~ "Note: Codecs in red are not usable regarding to your connection type to "
-#~ "the internet."
-#~ msgstr ""
-#~ "注意:赤い色のコーデックは、現在のネットワーク接続方法では使えません。"
-
-#~ msgid "Codec information"
-#~ msgstr "コーデックの情報"
-
-#~ msgid "Address Book"
-#~ msgstr "電話帳"
-
-#~ msgid "Select"
-#~ msgstr "選択する"
-
-#~ msgid ""
-#~ "User is not reachable at the moment but he invites you to contact him "
-#~ "using the following alternate ressource:"
-#~ msgstr ""
-#~ "ユーザーに接続することができませんが、ユーザーは代わりの手段に招待していま"
-#~ "す。他の手段で連絡をとってください。"
-
-#~ msgid "None."
-#~ msgstr "ありません。"
-
-#, fuzzy
-#~ msgid "Name:"
-#~ msgstr "名前"
-
-#, fuzzy
-#~ msgid "Bad sip address: a sip address looks like sip:user@domain"
-#~ msgstr ""
-#~ "SIPアドレスの形式エラーです。SIPアドレスは、<sip:username@domainname>のよ"
-#~ "うな形式です。"
-
-#~ msgid "Communication ended."
-#~ msgstr "会話は終了しました。"
-
-#~ msgid "28k modem"
-#~ msgstr "28kのモデム"
-
-#~ msgid "56k modem"
-#~ msgstr "56kのモデム"
-
-#~ msgid "64k modem (numeris)"
-#~ msgstr "64Kのモデム(ISDN)"
-
-#~ msgid "ADSL or Cable modem"
-#~ msgstr "ADSL・CATVモデム"
-
-#~ msgid "Ethernet or equivalent"
-#~ msgstr "イーサネットなど"
-
-#~ msgid "Connection type:"
-#~ msgstr "接続のタイプ"
-
-#, fuzzy
-#~ msgid ""
-#~ "Linphone could not open audio device %s. Check if your sound card is "
-#~ "fully configured and working."
-#~ msgstr ""
-#~ "Linphoneはオーディオデバイスをオープンできませんでした。サウンドカードの設"
-#~ "定が完全で、正しく動いているかどうか確認して下さい。"
-
-#~ msgid "Type here the sip address of the person you want to call."
-#~ msgstr "電話をかけたい相手のSIPアドレスを入力して下さい。"
-
-#~ msgid ""
-#~ "Release or\n"
-#~ "Refuse"
-#~ msgstr ""
-#~ "電話を切る\n"
-#~ "会話を拒否"
-
-#~ msgid "%s. Retry after %i minute(s)."
-#~ msgstr "%s。%i 分後にかけ直して下さい。"
-
-#, fuzzy
-#~ msgid "Timeout..."
-#~ msgstr "時間切れです。"
-
-#~ msgid "Toggle this if you want to be registered on a remote server."
-#~ msgstr "リモートサーバーに登録するときは、チェックして下さい。"
-
-#~ msgid "Address of record:"
-#~ msgstr "登録するアドレス"
-
-#~ msgid ""
-#~ "The password used for registration. On some servers it is not necessary"
-#~ msgstr "登録にパスワードを用います。必須でないサーバーもあります。"
-
-#~ msgid "Use this registrar server as outbound proxy."
-#~ msgstr "レジストラサーバーをアウトバウンドプロクシとして使用します。"
-
-#~ msgid "sip address:"
-#~ msgstr "SIPアドレス"
-
-#~ msgid "Modify"
-#~ msgstr "修正"
-
-#, fuzzy
-#~ msgid ""
-#~ "You are currently using the i810_audio driver.\n"
-#~ "This driver is buggy and so does not work with Linphone.\n"
-#~ "We suggest that you replace it by its equivalent ALSA driver,\n"
-#~ "either with packages from your distribution, or by downloading\n"
-#~ "ALSA drivers at http://www.alsa-project.org."
-#~ msgstr ""
-#~ "現在、i810オーディオドライバーを使っています。\n"
-#~ "このドライバーにはバグがあり、Linphoneではうまく動作しません。\n"
-#~ "ALSAドライバーに相当する\n"
-#~ "あなたのディストリビュージョンのパッケージか、\n"
-#~ "ALSAドライバー(http://www.alsa-project.org)への交換を推奨します。"
-
-#~ msgid "Unregistration successfull."
-#~ msgstr "登録を解除しました。"
-
-#~ msgid "Select network interface to use:"
-#~ msgstr "使用するネットワークインターフェースを選んで下さい"
-
-#~ msgid "Network interface properties"
-#~ msgstr "ネットワークインターフェースのプロパティー"
-
-#~ msgid "RTP"
-#~ msgstr "RTP"
-
-#~ msgid "C: 2001"
-#~ msgstr "C: 2001"
-
-#~ msgid "/dev/dsp"
-#~ msgstr "/dev/dsp"
-
-#~ msgid "/dev/dsp1"
-#~ msgstr "/dev/dsp1"
-
-#~ msgid "/dev/dsp2"
-#~ msgstr "/dev/dsp2"
-
-#~ msgid "/dev/dsp3"
-#~ msgstr "/dev/dsp3"
-
-#~ msgid "Set the selected address in linphone'main window."
-#~ msgstr "選択したアドレスがLinphoneのメインウインドウに現れます。"
diff --git a/po/linphone.pot b/po/linphone.pot
new file mode 100644
index 000000000..e4e16d2c5
--- /dev/null
+++ b/po/linphone.pot
@@ -0,0 +1,1987 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-19 10:39+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974
+#, c-format
+msgid "Call %s"
+msgstr ""
+
+#: ../gtk/calllogs.c:149 ../gtk/friendlist.c:975
+#, c-format
+msgid "Send text to %s"
+msgstr ""
+
+#: ../gtk/calllogs.c:232
+#, c-format
+msgid "<b>Recent calls (%i)</b>"
+msgstr ""
+
+#: ../gtk/calllogs.c:314
+msgid "n/a"
+msgstr ""
+
+#: ../gtk/calllogs.c:317
+msgid "Aborted"
+msgstr ""
+
+#: ../gtk/calllogs.c:320
+msgid "Missed"
+msgstr ""
+
+#: ../gtk/calllogs.c:323
+msgid "Declined"
+msgstr ""
+
+#: ../gtk/calllogs.c:329
+#, c-format
+msgid "%i minute"
+msgid_plural "%i minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../gtk/calllogs.c:332
+#, c-format
+msgid "%i second"
+msgid_plural "%i seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../gtk/calllogs.c:335 ../gtk/calllogs.c:341
+#, c-format
+msgid "<big><b>%s</b></big>\t%s"
+msgstr ""
+
+#: ../gtk/calllogs.c:337
+#, c-format
+msgid ""
+"<small><i>%s</i>\t<i>Quality: %s</i></small>\n"
+"%s\t%s\t"
+msgstr ""
+
+#: ../gtk/calllogs.c:343
+#, c-format
+msgid ""
+"<small><i>%s</i></small>\t\n"
+"%s"
+msgstr ""
+
+#: ../gtk/conference.c:38 ../gtk/main.ui.h:13
+msgid "Conference"
+msgstr ""
+
+#: ../gtk/conference.c:46
+msgid "Me"
+msgstr ""
+
+#: ../gtk/support.c:49 ../gtk/support.c:73 ../gtk/support.c:102
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr ""
+
+#: ../gtk/chat.c:364 ../gtk/friendlist.c:924
+msgid "Invalid sip contact !"
+msgstr ""
+
+#: ../gtk/main.c:107
+msgid "log to stdout some debug information while running."
+msgstr ""
+
+#: ../gtk/main.c:114
+msgid "path to a file to write logs into."
+msgstr ""
+
+#: ../gtk/main.c:121
+msgid "Start linphone with video disabled."
+msgstr ""
+
+#: ../gtk/main.c:128
+msgid "Start only in the system tray, do not show the main interface."
+msgstr ""
+
+#: ../gtk/main.c:135
+msgid "address to call right now"
+msgstr ""
+
+#: ../gtk/main.c:142
+msgid "if set automatically answer incoming calls"
+msgstr ""
+
+#: ../gtk/main.c:149
+msgid ""
+"Specifiy a working directory (should be the base of the installation, eg: c:"
+"\\Program Files\\Linphone)"
+msgstr ""
+
+#: ../gtk/main.c:156
+msgid "Configuration file"
+msgstr ""
+
+#: ../gtk/main.c:163
+msgid "Run the audio assistant"
+msgstr ""
+
+#: ../gtk/main.c:1085
+#, c-format
+msgid ""
+"%s would like to add you to his contact list.\n"
+"Would you allow him to see your presence status or add him to your contact "
+"list ?\n"
+"If you answer no, this person will be temporarily blacklisted."
+msgstr ""
+
+#: ../gtk/main.c:1162
+#, c-format
+msgid ""
+"Please enter your password for username <i>%s</i>\n"
+" at realm <i>%s</i>:"
+msgstr ""
+
+#: ../gtk/main.c:1283
+msgid "Call error"
+msgstr ""
+
+#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3744
+msgid "Call ended"
+msgstr ""
+
+#: ../gtk/main.c:1289
+msgid "Incoming call"
+msgstr ""
+
+#: ../gtk/main.c:1291 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
+msgid "Answer"
+msgstr ""
+
+#: ../gtk/main.c:1293 ../gtk/main.ui.h:6
+msgid "Decline"
+msgstr ""
+
+#: ../gtk/main.c:1299
+msgid "Call paused"
+msgstr ""
+
+#: ../gtk/main.c:1299
+#, c-format
+msgid "<b>by %s</b>"
+msgstr ""
+
+#: ../gtk/main.c:1366
+#, c-format
+msgid "%s proposed to start video. Do you accept ?"
+msgstr ""
+
+#: ../gtk/main.c:1528
+msgid "Website link"
+msgstr ""
+
+#: ../gtk/main.c:1577
+msgid "Linphone - a video internet phone"
+msgstr ""
+
+#: ../gtk/main.c:1669
+#, c-format
+msgid "%s (Default)"
+msgstr ""
+
+#: ../gtk/main.c:2006 ../coreapi/callbacks.c:983
+#, c-format
+msgid "We are transferred to %s"
+msgstr ""
+
+#: ../gtk/main.c:2016
+msgid ""
+"No sound cards have been detected on this computer.\n"
+"You won't be able to send or receive audio calls."
+msgstr ""
+
+#: ../gtk/main.c:2157
+msgid "A free SIP video-phone"
+msgstr ""
+
+#: ../gtk/friendlist.c:505
+msgid "Add to addressbook"
+msgstr ""
+
+#: ../gtk/friendlist.c:691
+msgid "Presence status"
+msgstr ""
+
+#: ../gtk/friendlist.c:709 ../gtk/propertybox.c:552 ../gtk/contact.ui.h:1
+msgid "Name"
+msgstr ""
+
+#: ../gtk/friendlist.c:721
+msgid "Call"
+msgstr ""
+
+#: ../gtk/friendlist.c:726
+msgid "Chat"
+msgstr ""
+
+#: ../gtk/friendlist.c:756
+#, c-format
+msgid "Search in %s directory"
+msgstr ""
+
+#: ../gtk/friendlist.c:976
+#, c-format
+msgid "Edit contact '%s'"
+msgstr ""
+
+#: ../gtk/friendlist.c:977
+#, c-format
+msgid "Delete contact '%s'"
+msgstr ""
+
+#: ../gtk/friendlist.c:978
+#, c-format
+msgid "Delete chat history of '%s'"
+msgstr ""
+
+#: ../gtk/friendlist.c:1029
+#, c-format
+msgid "Add new contact from %s directory"
+msgstr ""
+
+#: ../gtk/propertybox.c:558
+msgid "Rate (Hz)"
+msgstr ""
+
+#: ../gtk/propertybox.c:564
+msgid "Status"
+msgstr ""
+
+#: ../gtk/propertybox.c:570
+msgid "IP Bitrate (kbit/s)"
+msgstr ""
+
+#: ../gtk/propertybox.c:577
+msgid "Parameters"
+msgstr ""
+
+#: ../gtk/propertybox.c:620 ../gtk/propertybox.c:763
+msgid "Enabled"
+msgstr ""
+
+#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763
+msgid "Disabled"
+msgstr ""
+
+#: ../gtk/propertybox.c:809
+msgid "Account"
+msgstr ""
+
+#: ../gtk/propertybox.c:1072
+msgid "English"
+msgstr ""
+
+#: ../gtk/propertybox.c:1073
+msgid "French"
+msgstr ""
+
+#: ../gtk/propertybox.c:1074
+msgid "Swedish"
+msgstr ""
+
+#: ../gtk/propertybox.c:1075
+msgid "Italian"
+msgstr ""
+
+#: ../gtk/propertybox.c:1076
+msgid "Spanish"
+msgstr ""
+
+#: ../gtk/propertybox.c:1077
+msgid "Brazilian Portugese"
+msgstr ""
+
+#: ../gtk/propertybox.c:1078
+msgid "Polish"
+msgstr ""
+
+#: ../gtk/propertybox.c:1079
+msgid "German"
+msgstr ""
+
+#: ../gtk/propertybox.c:1080
+msgid "Russian"
+msgstr ""
+
+#: ../gtk/propertybox.c:1081
+msgid "Japanese"
+msgstr ""
+
+#: ../gtk/propertybox.c:1082
+msgid "Dutch"
+msgstr ""
+
+#: ../gtk/propertybox.c:1083
+msgid "Hungarian"
+msgstr ""
+
+#: ../gtk/propertybox.c:1084
+msgid "Czech"
+msgstr ""
+
+#: ../gtk/propertybox.c:1085
+msgid "Chinese"
+msgstr ""
+
+#: ../gtk/propertybox.c:1086
+msgid "Traditional Chinese"
+msgstr ""
+
+#: ../gtk/propertybox.c:1087
+msgid "Norwegian"
+msgstr ""
+
+#: ../gtk/propertybox.c:1088
+msgid "Hebrew"
+msgstr ""
+
+#: ../gtk/propertybox.c:1089
+msgid "Serbian"
+msgstr ""
+
+#: ../gtk/propertybox.c:1156
+msgid ""
+"You need to restart linphone for the new language selection to take effect."
+msgstr ""
+
+#: ../gtk/propertybox.c:1234
+msgid "None"
+msgstr ""
+
+#: ../gtk/propertybox.c:1238
+msgid "SRTP"
+msgstr ""
+
+#: ../gtk/propertybox.c:1244
+msgid "ZRTP"
+msgstr ""
+
+#: ../gtk/update.c:80
+#, c-format
+msgid ""
+"A more recent version is availalble from %s.\n"
+"Would you like to open a browser to download it ?"
+msgstr ""
+
+#: ../gtk/update.c:91
+msgid "You are running the lastest version."
+msgstr ""
+
+#: ../gtk/buddylookup.c:85
+msgid "Firstname, Lastname"
+msgstr ""
+
+#: ../gtk/buddylookup.c:160
+msgid "Error communicating with server."
+msgstr ""
+
+#: ../gtk/buddylookup.c:164
+msgid "Connecting..."
+msgstr ""
+
+#: ../gtk/buddylookup.c:168
+msgid "Connected"
+msgstr ""
+
+#: ../gtk/buddylookup.c:172
+msgid "Receiving data..."
+msgstr ""
+
+#: ../gtk/buddylookup.c:180
+#, c-format
+msgid "Found %i contact"
+msgid_plural "Found %i contacts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../gtk/setupwizard.c:34
+msgid ""
+"Welcome !\n"
+"This assistant will help you to use a SIP account for your calls."
+msgstr ""
+
+#: ../gtk/setupwizard.c:43
+msgid "Create an account on linphone.org"
+msgstr ""
+
+#: ../gtk/setupwizard.c:44
+msgid "I have already a linphone.org account and I just want to use it"
+msgstr ""
+
+#: ../gtk/setupwizard.c:45
+msgid "I have already a sip account and I just want to use it"
+msgstr ""
+
+#: ../gtk/setupwizard.c:46
+msgid "I want to specify a remote configuration URI"
+msgstr ""
+
+#: ../gtk/setupwizard.c:89
+msgid "Enter your linphone.org username"
+msgstr ""
+
+#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:79 ../gtk/ldap.ui.h:4
+msgid "Username:"
+msgstr ""
+
+#: ../gtk/setupwizard.c:104 ../gtk/password.ui.h:4 ../gtk/ldap.ui.h:5
+msgid "Password:"
+msgstr ""
+
+#: ../gtk/setupwizard.c:124
+msgid "Enter your account informations"
+msgstr ""
+
+#: ../gtk/setupwizard.c:140
+msgid "Username*"
+msgstr ""
+
+#: ../gtk/setupwizard.c:141
+msgid "Password*"
+msgstr ""
+
+#: ../gtk/setupwizard.c:144
+msgid "Domain*"
+msgstr ""
+
+#: ../gtk/setupwizard.c:145
+msgid "Proxy"
+msgstr ""
+
+#: ../gtk/setupwizard.c:317
+msgid "(*) Required fields"
+msgstr ""
+
+#: ../gtk/setupwizard.c:318
+msgid "Username: (*)"
+msgstr ""
+
+#: ../gtk/setupwizard.c:320
+msgid "Password: (*)"
+msgstr ""
+
+#: ../gtk/setupwizard.c:322
+msgid "Email: (*)"
+msgstr ""
+
+#: ../gtk/setupwizard.c:324
+msgid "Confirm your password: (*)"
+msgstr ""
+
+#: ../gtk/setupwizard.c:338
+msgid "Keep me informed with linphone updates"
+msgstr ""
+
+#: ../gtk/setupwizard.c:394
+msgid ""
+"Error, account not validated, username already used or server unreachable.\n"
+"Please go back and try again."
+msgstr ""
+
+#: ../gtk/setupwizard.c:405
+msgid "Thank you. Your account is now configured and ready for use."
+msgstr ""
+
+#: ../gtk/setupwizard.c:413
+msgid ""
+"Please validate your account by clicking on the link we just sent you by "
+"email.\n"
+"Then come back here and press Next button."
+msgstr ""
+
+#: ../gtk/setupwizard.c:600
+msgid "SIP account configuration assistant"
+msgstr ""
+
+#: ../gtk/setupwizard.c:618
+msgid "Welcome to the account setup assistant"
+msgstr ""
+
+#: ../gtk/setupwizard.c:623
+msgid "Account setup assistant"
+msgstr ""
+
+#: ../gtk/setupwizard.c:629
+msgid "Configure your account (step 1/1)"
+msgstr ""
+
+#: ../gtk/setupwizard.c:634
+msgid "Enter your sip username (step 1/1)"
+msgstr ""
+
+#: ../gtk/setupwizard.c:638
+msgid "Enter account information (step 1/2)"
+msgstr ""
+
+#: ../gtk/setupwizard.c:647
+msgid "Validation (step 2/2)"
+msgstr ""
+
+#: ../gtk/setupwizard.c:652
+msgid "Error"
+msgstr ""
+
+#: ../gtk/setupwizard.c:656 ../gtk/audio_assistant.c:527
+msgid "Terminating"
+msgstr ""
+
+#: ../gtk/incall_view.c:70 ../gtk/incall_view.c:94
+#, c-format
+msgid "Call #%i"
+msgstr ""
+
+#: ../gtk/incall_view.c:155
+#, c-format
+msgid "Transfer to call #%i with %s"
+msgstr ""
+
+#: ../gtk/incall_view.c:211 ../gtk/incall_view.c:214
+msgid "Not used"
+msgstr ""
+
+#: ../gtk/incall_view.c:221
+msgid "ICE not activated"
+msgstr ""
+
+#: ../gtk/incall_view.c:223
+msgid "ICE failed"
+msgstr ""
+
+#: ../gtk/incall_view.c:225
+msgid "ICE in progress"
+msgstr ""
+
+#: ../gtk/incall_view.c:227
+msgid "Going through one or more NATs"
+msgstr ""
+
+#: ../gtk/incall_view.c:229
+msgid "Direct"
+msgstr ""
+
+#: ../gtk/incall_view.c:231
+msgid "Through a relay server"
+msgstr ""
+
+#: ../gtk/incall_view.c:239
+msgid "uPnP not activated"
+msgstr ""
+
+#: ../gtk/incall_view.c:241
+msgid "uPnP in progress"
+msgstr ""
+
+#: ../gtk/incall_view.c:243
+msgid "uPnp not available"
+msgstr ""
+
+#: ../gtk/incall_view.c:245
+msgid "uPnP is running"
+msgstr ""
+
+#: ../gtk/incall_view.c:247
+msgid "uPnP failed"
+msgstr ""
+
+#: ../gtk/incall_view.c:257 ../gtk/incall_view.c:258
+msgid "Direct or through server"
+msgstr ""
+
+#: ../gtk/incall_view.c:267 ../gtk/incall_view.c:279
+#, c-format
+msgid ""
+"download: %f\n"
+"upload: %f (kbit/s)"
+msgstr ""
+
+#: ../gtk/incall_view.c:272 ../gtk/incall_view.c:274
+#, c-format
+msgid "%ix%i @ %f fps"
+msgstr ""
+
+#: ../gtk/incall_view.c:304
+#, c-format
+msgid "%.3f seconds"
+msgstr ""
+
+#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12
+msgid "Hang up"
+msgstr ""
+
+#: ../gtk/incall_view.c:511
+msgid "<b>Calling...</b>"
+msgstr ""
+
+#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:727
+msgid "00::00::00"
+msgstr ""
+
+#: ../gtk/incall_view.c:525
+msgid "<b>Incoming call</b>"
+msgstr ""
+
+#: ../gtk/incall_view.c:562
+msgid "good"
+msgstr ""
+
+#: ../gtk/incall_view.c:564
+msgid "average"
+msgstr ""
+
+#: ../gtk/incall_view.c:566
+msgid "poor"
+msgstr ""
+
+#: ../gtk/incall_view.c:568
+msgid "very poor"
+msgstr ""
+
+#: ../gtk/incall_view.c:570
+msgid "too bad"
+msgstr ""
+
+#: ../gtk/incall_view.c:571 ../gtk/incall_view.c:587
+msgid "unavailable"
+msgstr ""
+
+#: ../gtk/incall_view.c:679
+msgid "Secured by SRTP"
+msgstr ""
+
+#: ../gtk/incall_view.c:685
+#, c-format
+msgid "Secured by ZRTP - [auth token: %s]"
+msgstr ""
+
+#: ../gtk/incall_view.c:691
+msgid "Set unverified"
+msgstr ""
+
+#: ../gtk/incall_view.c:691 ../gtk/main.ui.h:4
+msgid "Set verified"
+msgstr ""
+
+#: ../gtk/incall_view.c:722
+msgid "In conference"
+msgstr ""
+
+#: ../gtk/incall_view.c:722
+msgid "<b>In call</b>"
+msgstr ""
+
+#: ../gtk/incall_view.c:758
+msgid "<b>Paused call</b>"
+msgstr ""
+
+#: ../gtk/incall_view.c:771
+#, c-format
+msgid "%02i::%02i::%02i"
+msgstr ""
+
+#: ../gtk/incall_view.c:794
+msgid "<b>Call ended.</b>"
+msgstr ""
+
+#: ../gtk/incall_view.c:825
+msgid "Transfer in progress"
+msgstr ""
+
+#: ../gtk/incall_view.c:828
+msgid "Transfer done."
+msgstr ""
+
+#: ../gtk/incall_view.c:831
+msgid "Transfer failed."
+msgstr ""
+
+#: ../gtk/incall_view.c:875
+msgid "Resume"
+msgstr ""
+
+#: ../gtk/incall_view.c:882 ../gtk/main.ui.h:9
+msgid "Pause"
+msgstr ""
+
+#: ../gtk/incall_view.c:948
+#, c-format
+msgid ""
+"<small><i>Recording into\n"
+"%s %s</i></small>"
+msgstr ""
+
+#: ../gtk/incall_view.c:948
+msgid "(Paused)"
+msgstr ""
+
+#: ../gtk/loginframe.c:88
+#, c-format
+msgid "Please enter login information for %s"
+msgstr ""
+
+#: ../gtk/config-fetching.c:57
+#, c-format
+msgid "fetching from %s"
+msgstr ""
+
+#: ../gtk/config-fetching.c:73
+#, c-format
+msgid "Downloading of remote configuration from %s failed."
+msgstr ""
+
+#: ../gtk/audio_assistant.c:98
+msgid "No voice detected"
+msgstr ""
+
+#: ../gtk/audio_assistant.c:99
+msgid "Too low"
+msgstr ""
+
+#: ../gtk/audio_assistant.c:100
+msgid "Good"
+msgstr ""
+
+#: ../gtk/audio_assistant.c:101
+msgid "Too loud"
+msgstr ""
+
+#: ../gtk/audio_assistant.c:318
+msgid ""
+"Welcome !\n"
+"This assistant will help you to configure audio settings for Linphone"
+msgstr ""
+
+#: ../gtk/audio_assistant.c:328
+msgid "Capture device"
+msgstr ""
+
+#: ../gtk/audio_assistant.c:329
+msgid "Recorded volume"
+msgstr ""
+
+#: ../gtk/audio_assistant.c:333
+msgid "No voice"
+msgstr ""
+
+#: ../gtk/audio_assistant.c:369
+msgid "Playback device"
+msgstr ""
+
+#: ../gtk/audio_assistant.c:370
+msgid "Play three beeps"
+msgstr ""
+
+#: ../gtk/audio_assistant.c:403
+msgid "Press the record button and say some words"
+msgstr ""
+
+#: ../gtk/audio_assistant.c:404
+msgid "Listen to your record voice"
+msgstr ""
+
+#: ../gtk/audio_assistant.c:433
+msgid "Let's start Linphone now"
+msgstr ""
+
+#: ../gtk/audio_assistant.c:496
+msgid "Audio Assistant"
+msgstr ""
+
+#: ../gtk/audio_assistant.c:506 ../gtk/main.ui.h:31
+msgid "Audio assistant"
+msgstr ""
+
+#: ../gtk/audio_assistant.c:511
+msgid "Mic Gain calibration"
+msgstr ""
+
+#: ../gtk/audio_assistant.c:517
+msgid "Speaker volume calibration"
+msgstr ""
+
+#: ../gtk/audio_assistant.c:522
+msgid "Record and Play"
+msgstr ""
+
+#: ../gtk/main.ui.h:1
+msgid "<b>Callee name</b>"
+msgstr ""
+
+#: ../gtk/main.ui.h:2
+msgid "Send"
+msgstr ""
+
+#: ../gtk/main.ui.h:3
+msgid "End conference"
+msgstr ""
+
+#: ../gtk/main.ui.h:7
+msgid "Record this call to an audio file"
+msgstr ""
+
+#: ../gtk/main.ui.h:8
+msgid "Video"
+msgstr ""
+
+#: ../gtk/main.ui.h:10
+msgid "Mute"
+msgstr ""
+
+#: ../gtk/main.ui.h:11
+msgid "Transfer"
+msgstr ""
+
+#: ../gtk/main.ui.h:14
+msgid "In call"
+msgstr ""
+
+#: ../gtk/main.ui.h:15
+msgid "Duration"
+msgstr ""
+
+#: ../gtk/main.ui.h:16
+msgid "Call quality rating"
+msgstr ""
+
+#: ../gtk/main.ui.h:17
+msgid "All users"
+msgstr ""
+
+#: ../gtk/main.ui.h:18
+msgid "Online users"
+msgstr ""
+
+#: ../gtk/main.ui.h:19
+msgid "ADSL"
+msgstr ""
+
+#: ../gtk/main.ui.h:20
+msgid "Fiber Channel"
+msgstr ""
+
+#: ../gtk/main.ui.h:21
+msgid "Default"
+msgstr ""
+
+#: ../gtk/main.ui.h:22
+msgid "_Options"
+msgstr ""
+
+#: ../gtk/main.ui.h:23
+msgid "Set configuration URI"
+msgstr ""
+
+#: ../gtk/main.ui.h:24
+msgid "Always start video"
+msgstr ""
+
+#: ../gtk/main.ui.h:25
+msgid "Enable self-view"
+msgstr ""
+
+#: ../gtk/main.ui.h:26
+msgid "_Help"
+msgstr ""
+
+#: ../gtk/main.ui.h:27
+msgid "Show debug window"
+msgstr ""
+
+#: ../gtk/main.ui.h:28
+msgid "_Homepage"
+msgstr ""
+
+#: ../gtk/main.ui.h:29
+msgid "Check _Updates"
+msgstr ""
+
+#: ../gtk/main.ui.h:30
+msgid "Account assistant"
+msgstr ""
+
+#: ../gtk/main.ui.h:32
+msgid "SIP address or phone number:"
+msgstr ""
+
+#: ../gtk/main.ui.h:33
+msgid "Initiate a new call"
+msgstr ""
+
+#: ../gtk/main.ui.h:34
+msgid "Contacts"
+msgstr ""
+
+#: ../gtk/main.ui.h:35
+msgid "Search"
+msgstr ""
+
+#: ../gtk/main.ui.h:36
+msgid "<b>Add contacts from directory</b>"
+msgstr ""
+
+#: ../gtk/main.ui.h:37
+msgid "Add contact"
+msgstr ""
+
+#: ../gtk/main.ui.h:38
+msgid "Recent calls"
+msgstr ""
+
+#: ../gtk/main.ui.h:39
+msgid "My current identity:"
+msgstr ""
+
+#: ../gtk/main.ui.h:40 ../gtk/tunnel_config.ui.h:7
+msgid "Username"
+msgstr ""
+
+#: ../gtk/main.ui.h:41 ../gtk/tunnel_config.ui.h:8
+msgid "Password"
+msgstr ""
+
+#: ../gtk/main.ui.h:42
+msgid "Internet connection:"
+msgstr ""
+
+#: ../gtk/main.ui.h:43
+msgid "Automatically log me in"
+msgstr ""
+
+#: ../gtk/main.ui.h:44 ../gtk/password.ui.h:3
+msgid "UserID"
+msgstr ""
+
+#: ../gtk/main.ui.h:45
+msgid "Login information"
+msgstr ""
+
+#: ../gtk/main.ui.h:46
+msgid "<b>Welcome !</b>"
+msgstr ""
+
+#: ../gtk/main.ui.h:47
+msgid "Delete"
+msgstr ""
+
+#: ../gtk/about.ui.h:1
+msgid "About linphone"
+msgstr ""
+
+#: ../gtk/about.ui.h:2
+msgid "(C) Belledonne Communications,2010\n"
+msgstr ""
+
+#: ../gtk/about.ui.h:4
+msgid "An internet video phone using the standard SIP (rfc3261) protocol."
+msgstr ""
+
+#: ../gtk/about.ui.h:5
+msgid ""
+"fr: Simon Morlat\n"
+"en: Simon Morlat and Delphine Perreau\n"
+"it: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\n"
+"de: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\n"
+"sv: Daniel Nylander <po@danielnylander.se>\n"
+"es: Jesus Benitez <gnelson at inMail dot sk>\n"
+"ja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\n"
+"pt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\n"
+"pl: Robert Nasiadek <darkone@darkone.pl>\n"
+"cs: Petr Pisar <petr.pisar@atlas.cz>\n"
+"hu: anonymous\n"
+"he: Eli Zaretskii <eliz@gnu.org>\n"
+msgstr ""
+
+#: ../gtk/contact.ui.h:2
+msgid "SIP Address"
+msgstr ""
+
+#: ../gtk/contact.ui.h:3
+msgid "Show this contact presence status"
+msgstr ""
+
+#: ../gtk/contact.ui.h:4
+msgid "Allow this contact to see my presence status"
+msgstr ""
+
+#: ../gtk/contact.ui.h:5
+msgid "<b>Contact information</b>"
+msgstr ""
+
+#: ../gtk/log.ui.h:1
+msgid "Linphone debug window"
+msgstr ""
+
+#: ../gtk/log.ui.h:2
+msgid "Scroll to end"
+msgstr ""
+
+#: ../gtk/password.ui.h:1
+msgid "Linphone - Authentication required"
+msgstr ""
+
+#: ../gtk/password.ui.h:2
+msgid "Please enter the domain password"
+msgstr ""
+
+#: ../gtk/call_logs.ui.h:1
+msgid "Call history"
+msgstr ""
+
+#: ../gtk/call_logs.ui.h:2
+msgid "Clear all"
+msgstr ""
+
+#: ../gtk/call_logs.ui.h:3
+msgid "Call back"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:1
+msgid "Linphone - Configure a SIP account"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:2
+msgid "Your SIP identity:"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:3
+msgid "Looks like sip:<username>@<domain>"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:4
+msgid "sip:"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:5
+msgid "SIP Proxy address:"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:6
+msgid "Looks like sip:<proxy hostname>"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:7
+msgid "Registration duration (sec):"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:8
+msgid "Contact params (optional):"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:9
+msgid "AVPF regular RTCP interval (sec):"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:10
+msgid "Route (optional):"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:11
+msgid "Transport"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:12
+msgid "Register"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:13
+msgid "Publish presence information"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:14
+msgid "Enable AVPF"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:15
+msgid "Configure a SIP account"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:1
+msgid "anonymous"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:2
+msgid "GSSAPI"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:3
+msgid "SASL"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:4
+msgid "default soundcard"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:5
+msgid "a sound card"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:6
+msgid "default camera"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:7
+msgid "CIF"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:8
+msgid "Audio codecs"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:9
+msgid "Video codecs"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:10 ../gtk/keypad.ui.h:5
+msgid "C"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:11
+msgid "SIP (UDP)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:12
+msgid "SIP (TCP)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:13
+msgid "SIP (TLS)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:14
+msgid "Settings"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:15
+msgid "Set Maximum Transmission Unit:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:16
+msgid "Send DTMFs as SIP info"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:17
+msgid "Use IPv6 instead of IPv4"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:18
+msgid "<b>Transport</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:19
+msgid "Media encryption type"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:20
+msgid "Video RTP/UDP:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:21
+msgid "Audio RTP/UDP:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:22
+msgid "Fixed"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:23
+msgid "Media encryption is mandatory"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:24
+msgid "Tunnel"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:25
+msgid "DSCP fields"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:26
+msgid "SIP/TCP port"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:27
+msgid "SIP/UDP port"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:28
+msgid "<b>Network protocol and ports</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:29
+msgid "Direct connection to the Internet"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:30
+msgid "Behind NAT / Firewall (specify gateway IP )"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:31
+msgid "Behind NAT / Firewall (use STUN to resolve)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:32
+msgid "Behind NAT / Firewall (use ICE)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:33
+msgid "Behind NAT / Firewall (use uPnP)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:34
+msgid "Public IP address:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:35
+msgid "Stun server:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:36
+msgid "<b>NAT and Firewall</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:37
+msgid "Network settings"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:38
+msgid "Ring sound:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:39
+msgid "ALSA special device (optional):"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:40
+msgid "Capture device:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:41
+msgid "Ring device:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:42
+msgid "Playback device:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:43
+msgid "Enable echo cancellation"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:44
+msgid "<b>Audio</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:45
+msgid "Video input device:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:46
+msgid "Prefered video resolution:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:47
+msgid "Video output method:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:48
+msgid "<b>Video</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:49
+msgid "Multimedia settings"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:50
+msgid "This section defines your SIP address when not using a SIP account"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:51
+msgid "Your display name (eg: John Doe):"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:52
+msgid "Your username:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:53
+msgid "Your resulting SIP address:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:54
+msgid "<b>Default identity</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:55
+msgid "Wizard"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:56
+msgid "Add"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:57
+msgid "Edit"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:58
+msgid "Remove"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:59
+msgid "<b>Proxy accounts</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:60
+msgid "Erase all passwords"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:61
+msgid "<b>Privacy</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:62
+msgid "Manage SIP Accounts"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:63 ../gtk/tunnel_config.ui.h:4
+msgid "Enable"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:64 ../gtk/tunnel_config.ui.h:5
+msgid "Disable"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:65
+msgid "<b>Codecs</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:66
+msgid "0 stands for \"unlimited\""
+msgstr ""
+
+#: ../gtk/parameters.ui.h:67
+msgid "Upload speed limit in Kbit/sec:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:68
+msgid "Download speed limit in Kbit/sec:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:69
+msgid "Enable adaptive rate control"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:70
+msgid ""
+"<i>Adaptive rate control is a technique to dynamically guess the available "
+"bandwidth during a call.</i>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:71
+msgid "<b>Bandwidth control</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:72
+msgid "Codecs"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:73
+msgid "<b>Language</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:74
+msgid "Show advanced settings"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:75
+msgid "<b>Level</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:76
+msgid "User interface"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:77 ../gtk/ldap.ui.h:2
+msgid "Server address:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:78 ../gtk/ldap.ui.h:3
+msgid "Authentication method:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:80
+msgid "label"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:81
+msgid "<b>LDAP Account setup</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:82
+msgid "LDAP"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:83
+msgid "Done"
+msgstr ""
+
+#: ../gtk/buddylookup.ui.h:1
+msgid "Search contacts in directory"
+msgstr ""
+
+#: ../gtk/buddylookup.ui.h:2
+msgid "Add to my list"
+msgstr ""
+
+#: ../gtk/buddylookup.ui.h:3
+msgid "<b>Search somebody</b>"
+msgstr ""
+
+#: ../gtk/waiting.ui.h:1
+msgid "Linphone"
+msgstr ""
+
+#: ../gtk/waiting.ui.h:2
+msgid "Please wait"
+msgstr ""
+
+#: ../gtk/dscp_settings.ui.h:1
+msgid "DSCP settings"
+msgstr ""
+
+#: ../gtk/dscp_settings.ui.h:2
+msgid "SIP"
+msgstr ""
+
+#: ../gtk/dscp_settings.ui.h:3
+msgid "Audio RTP stream"
+msgstr ""
+
+#: ../gtk/dscp_settings.ui.h:4
+msgid "Video RTP stream"
+msgstr ""
+
+#: ../gtk/dscp_settings.ui.h:5
+msgid "<b>Set DSCP values (in hexadecimal)</b>"
+msgstr ""
+
+#: ../gtk/call_statistics.ui.h:1
+msgid "Call statistics"
+msgstr ""
+
+#: ../gtk/call_statistics.ui.h:2
+msgid "Audio codec"
+msgstr ""
+
+#: ../gtk/call_statistics.ui.h:3
+msgid "Video codec"
+msgstr ""
+
+#: ../gtk/call_statistics.ui.h:4
+msgid "Audio IP bandwidth usage"
+msgstr ""
+
+#: ../gtk/call_statistics.ui.h:5
+msgid "Audio Media connectivity"
+msgstr ""
+
+#: ../gtk/call_statistics.ui.h:6
+msgid "Video IP bandwidth usage"
+msgstr ""
+
+#: ../gtk/call_statistics.ui.h:7
+msgid "Video Media connectivity"
+msgstr ""
+
+#: ../gtk/call_statistics.ui.h:8
+msgid "Round trip time"
+msgstr ""
+
+#: ../gtk/call_statistics.ui.h:9
+msgid "Video resolution received"
+msgstr ""
+
+#: ../gtk/call_statistics.ui.h:10
+msgid "Video resolution sent"
+msgstr ""
+
+#: ../gtk/call_statistics.ui.h:11
+msgid "RTP profile"
+msgstr ""
+
+#: ../gtk/call_statistics.ui.h:12
+msgid "<b>Call statistics and information</b>"
+msgstr ""
+
+#: ../gtk/tunnel_config.ui.h:1
+msgid "Configure VoIP tunnel"
+msgstr ""
+
+#: ../gtk/tunnel_config.ui.h:2
+msgid "Host"
+msgstr ""
+
+#: ../gtk/tunnel_config.ui.h:3
+msgid "Port"
+msgstr ""
+
+#: ../gtk/tunnel_config.ui.h:6
+msgid "<b>Configure tunnel</b>"
+msgstr ""
+
+#: ../gtk/tunnel_config.ui.h:9
+msgid "<b>Configure http proxy (optional)</b>"
+msgstr ""
+
+#: ../gtk/keypad.ui.h:1
+msgid "D"
+msgstr ""
+
+#: ../gtk/keypad.ui.h:2
+msgid "#"
+msgstr ""
+
+#: ../gtk/keypad.ui.h:3
+msgid "0"
+msgstr ""
+
+#: ../gtk/keypad.ui.h:4
+msgid "*"
+msgstr ""
+
+#: ../gtk/keypad.ui.h:6
+msgid "9"
+msgstr ""
+
+#: ../gtk/keypad.ui.h:7
+msgid "8"
+msgstr ""
+
+#: ../gtk/keypad.ui.h:8
+msgid "7"
+msgstr ""
+
+#: ../gtk/keypad.ui.h:9
+msgid "B"
+msgstr ""
+
+#: ../gtk/keypad.ui.h:10
+msgid "6"
+msgstr ""
+
+#: ../gtk/keypad.ui.h:11
+msgid "5"
+msgstr ""
+
+#: ../gtk/keypad.ui.h:12
+msgid "4"
+msgstr ""
+
+#: ../gtk/keypad.ui.h:13
+msgid "A"
+msgstr ""
+
+#: ../gtk/keypad.ui.h:14
+msgid "3"
+msgstr ""
+
+#: ../gtk/keypad.ui.h:15
+msgid "2"
+msgstr ""
+
+#: ../gtk/keypad.ui.h:16
+msgid "1"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:1
+msgid "LDAP Settings"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:6
+msgid "Use TLS Connection"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:7
+msgid "Not yet available"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:8
+msgid "<b>Connection</b>"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:9
+msgid "Bind DN"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:10
+msgid "Authname"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:11
+msgid "Realm"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:12
+msgid "<b>SASL</b>"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:13
+msgid "Base object:"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:15
+#, no-c-format
+msgid "Filter (%s for name):"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:16
+msgid "Name Attribute:"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:17
+msgid "SIP address attribute:"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:18
+msgid "Attributes to query:"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:19
+msgid "<b>Search</b>"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:20
+msgid "Timeout for search:"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:21
+msgid "Max results:"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:22
+msgid "Follow Aliases"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:23
+msgid "<b>Miscellaneous</b>"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:24
+msgid "ANONYMOUS"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:25
+msgid "SIMPLE"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:26
+msgid "DIGEST-MD5"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:27
+msgid "NTLM"
+msgstr ""
+
+#: ../gtk/config-uri.ui.h:1
+msgid "Specifying a remote configuration URI"
+msgstr ""
+
+#: ../gtk/config-uri.ui.h:2
+msgid ""
+"This dialog allows to set an http or https address when configuration is to "
+"be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, "
+"Linphone will restart automatically in order to fetch and take into account "
+"the new configuration. "
+msgstr ""
+
+#: ../gtk/config-uri.ui.h:4
+msgid "https://"
+msgstr ""
+
+#: ../gtk/provisioning-fetch.ui.h:1
+msgid "Configuring..."
+msgstr ""
+
+#: ../gtk/provisioning-fetch.ui.h:2
+msgid "Please wait while fetching configuration from server..."
+msgstr ""
+
+#: ../coreapi/linphonecore.c:1511
+msgid "Ready"
+msgstr ""
+
+#: ../coreapi/linphonecore.c:2470
+msgid "Configuring"
+msgstr ""
+
+#: ../coreapi/linphonecore.c:2635
+msgid "Looking for telephone number destination..."
+msgstr ""
+
+#: ../coreapi/linphonecore.c:2637
+msgid "Could not resolve this number."
+msgstr ""
+
+#. must be known at that time
+#: ../coreapi/linphonecore.c:2919
+msgid "Contacting"
+msgstr ""
+
+#: ../coreapi/linphonecore.c:2924
+msgid "Could not call"
+msgstr ""
+
+#: ../coreapi/linphonecore.c:3074
+msgid "Sorry, we have reached the maximum number of simultaneous calls"
+msgstr ""
+
+#: ../coreapi/linphonecore.c:3233
+msgid "is contacting you"
+msgstr ""
+
+#: ../coreapi/linphonecore.c:3234
+msgid " and asked autoanswer."
+msgstr ""
+
+#: ../coreapi/linphonecore.c:3234
+msgid "."
+msgstr ""
+
+#: ../coreapi/linphonecore.c:3352
+msgid "Modifying call parameters..."
+msgstr ""
+
+#: ../coreapi/linphonecore.c:3700
+msgid "Connected."
+msgstr ""
+
+#: ../coreapi/linphonecore.c:3725
+msgid "Call aborted"
+msgstr ""
+
+#: ../coreapi/linphonecore.c:3915
+msgid "Could not pause the call"
+msgstr ""
+
+#: ../coreapi/linphonecore.c:3919
+msgid "Pausing the current call..."
+msgstr ""
+
+#: ../coreapi/misc.c:438
+msgid "Stun lookup in progress..."
+msgstr ""
+
+#: ../coreapi/misc.c:619
+msgid "ICE local candidates gathering in progress..."
+msgstr ""
+
+#: ../coreapi/friend.c:33
+msgid "Online"
+msgstr ""
+
+#: ../coreapi/friend.c:36
+msgid "Busy"
+msgstr ""
+
+#: ../coreapi/friend.c:39
+msgid "Be right back"
+msgstr ""
+
+#: ../coreapi/friend.c:42
+msgid "Away"
+msgstr ""
+
+#: ../coreapi/friend.c:45
+msgid "On the phone"
+msgstr ""
+
+#: ../coreapi/friend.c:48
+msgid "Out to lunch"
+msgstr ""
+
+#: ../coreapi/friend.c:51
+msgid "Do not disturb"
+msgstr ""
+
+#: ../coreapi/friend.c:54
+msgid "Moved"
+msgstr ""
+
+#: ../coreapi/friend.c:57
+msgid "Using another messaging service"
+msgstr ""
+
+#: ../coreapi/friend.c:60
+msgid "Offline"
+msgstr ""
+
+#: ../coreapi/friend.c:63
+msgid "Pending"
+msgstr ""
+
+#: ../coreapi/friend.c:66
+msgid "Vacation"
+msgstr ""
+
+#: ../coreapi/friend.c:68
+msgid "Unknown-bug"
+msgstr ""
+
+#: ../coreapi/proxy.c:319
+msgid ""
+"The sip proxy address you entered is invalid, it must start with \"sip:\" "
+"followed by a hostname."
+msgstr ""
+
+#: ../coreapi/proxy.c:325
+msgid ""
+"The sip identity you entered is invalid.\n"
+"It should look like sip:username@proxydomain, such as sip:alice@example.net"
+msgstr ""
+
+#: ../coreapi/proxy.c:1377
+#, c-format
+msgid "Could not login as %s"
+msgstr ""
+
+#: ../coreapi/callbacks.c:383
+msgid "Remote ringing."
+msgstr ""
+
+#: ../coreapi/callbacks.c:404
+msgid "Remote ringing..."
+msgstr ""
+
+#: ../coreapi/callbacks.c:414
+msgid "Early media."
+msgstr ""
+
+#: ../coreapi/callbacks.c:475
+#, c-format
+msgid "Call with %s is paused."
+msgstr ""
+
+#: ../coreapi/callbacks.c:488
+#, c-format
+msgid "Call answered by %s - on hold."
+msgstr ""
+
+#: ../coreapi/callbacks.c:498
+msgid "Call resumed."
+msgstr ""
+
+#: ../coreapi/callbacks.c:502
+#, c-format
+msgid "Call answered by %s."
+msgstr ""
+
+#: ../coreapi/callbacks.c:525
+msgid "Incompatible, check codecs or security settings..."
+msgstr ""
+
+#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:826
+msgid "Incompatible media parameters."
+msgstr ""
+
+#: ../coreapi/callbacks.c:560
+msgid "We have been resumed."
+msgstr ""
+
+#. we are being paused
+#: ../coreapi/callbacks.c:568
+msgid "We are paused by other party."
+msgstr ""
+
+#. reINVITE and in-dialogs UPDATE go here
+#: ../coreapi/callbacks.c:602
+msgid "Call is updated by remote."
+msgstr ""
+
+#: ../coreapi/callbacks.c:705
+msgid "Call terminated."
+msgstr ""
+
+#: ../coreapi/callbacks.c:733
+msgid "User is busy."
+msgstr ""
+
+#: ../coreapi/callbacks.c:734
+msgid "User is temporarily unavailable."
+msgstr ""
+
+#. char *retrymsg=_("%s. Retry after %i minute(s).");
+#: ../coreapi/callbacks.c:736
+msgid "User does not want to be disturbed."
+msgstr ""
+
+#: ../coreapi/callbacks.c:737
+msgid "Call declined."
+msgstr ""
+
+#: ../coreapi/callbacks.c:752
+msgid "Request timeout."
+msgstr ""
+
+#: ../coreapi/callbacks.c:780
+msgid "Redirected"
+msgstr ""
+
+#: ../coreapi/callbacks.c:835
+msgid "Call failed."
+msgstr ""
+
+#: ../coreapi/callbacks.c:913
+#, c-format
+msgid "Registration on %s successful."
+msgstr ""
+
+#: ../coreapi/callbacks.c:914
+#, c-format
+msgid "Unregistration on %s done."
+msgstr ""
+
+#: ../coreapi/callbacks.c:932
+msgid "no response timeout"
+msgstr ""
+
+#: ../coreapi/callbacks.c:935
+#, c-format
+msgid "Registration on %s failed: %s"
+msgstr ""
+
+#: ../coreapi/callbacks.c:942
+msgid "Service unavailable, retrying"
+msgstr ""
+
+#: ../coreapi/linphonecall.c:174
+#, c-format
+msgid "Authentication token is %s"
+msgstr ""
+
+#: ../coreapi/linphonecall.c:3020
+#, c-format
+msgid "You have missed %i call."
+msgid_plural "You have missed %i calls."
+msgstr[0] ""
+msgstr[1] ""
diff --git a/po/nb_NO.po b/po/nb_NO.po
index 6170997da..ed39ef92c 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -1,21 +1,22 @@
-# Copyright (C) 2011 Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Øyvind Sæther <oyvinds@everdot.org>, 2011.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Øyvind Sæther <oyvinds@everdot.org>, 2011
 msgid ""
 msgstr ""
-"Project-Id-Version: \n"
+"Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-15 09:24+0200\n"
-"PO-Revision-Date: 2011-04-05 01:56+0200\n"
-"Last-Translator: Øyvind Sæther <oyvinds@everdot.org>\n"
-"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
-"Language: \n"
+"POT-Creation-Date: 2014-11-19 10:39+0100\n"
+"PO-Revision-Date: 2014-11-19 10:17+0000\n"
+"Last-Translator: Cqnqrd <gautier.pelloux@gmail.com>\n"
+"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/linphone-gtk/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.2\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Language: nb_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974
 #, c-format
@@ -28,28 +29,25 @@ msgid "Send text to %s"
 msgstr "Send tekst til %s"
 
 #: ../gtk/calllogs.c:232
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Recent calls (%i)</b>"
-msgstr "<b>I samtale med</b>"
+msgstr ""
 
 #: ../gtk/calllogs.c:314
 msgid "n/a"
 msgstr ""
 
 #: ../gtk/calllogs.c:317
-#, fuzzy
 msgid "Aborted"
-msgstr "avbrutt"
+msgstr ""
 
 #: ../gtk/calllogs.c:320
-#, fuzzy
 msgid "Missed"
-msgstr "ubesvart"
+msgstr ""
 
 #: ../gtk/calllogs.c:323
-#, fuzzy
 msgid "Declined"
-msgstr "Avvis"
+msgstr ""
 
 #: ../gtk/calllogs.c:329
 #, c-format
@@ -89,9 +87,8 @@ msgid "Conference"
 msgstr ""
 
 #: ../gtk/conference.c:46
-#, fuzzy
 msgid "Me"
-msgstr "Skru mikrofonen av"
+msgstr ""
 
 #: ../gtk/support.c:49 ../gtk/support.c:73 ../gtk/support.c:102
 #, c-format
@@ -128,112 +125,92 @@ msgstr "besvarer innkommende samtaler automatisk om valgt"
 
 #: ../gtk/main.c:149
 msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: c:"
-"\\Program Files\\Linphone)"
-msgstr ""
-"Spesifiser arbeidsmappe (bør være base for installasjonen, f.eks: c:"
-"\\Programfiler\\Linphone)"
+"Specifiy a working directory (should be the base of the installation, eg: "
+"c:\\Program Files\\Linphone)"
+msgstr "Spesifiser arbeidsmappe (bør være base for installasjonen, f.eks: c:\\Programfiler\\Linphone)"
 
 #: ../gtk/main.c:156
-#, fuzzy
 msgid "Configuration file"
-msgstr "Bekreftelse"
+msgstr ""
 
 #: ../gtk/main.c:163
-#, fuzzy
 msgid "Run the audio assistant"
-msgstr "Brukerkontoveiviser"
+msgstr ""
 
-#: ../gtk/main.c:590
-#, c-format
-msgid "Call with %s"
-msgstr "Ring med %s"
-
-#: ../gtk/main.c:1183
+#: ../gtk/main.c:1085
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
-"Would you allow him to see your presence status or add him to your contact "
-"list ?\n"
+"Would you allow him to see your presence status or add him to your contact list ?\n"
 "If you answer no, this person will be temporarily blacklisted."
-msgstr ""
-"&s vil legge deg til i hans/hennes kontaktliste.\n"
-"Vil du tillate vedkommende å se din tilstedestatus eller legge vedkommende i "
-"din kontaktliste?\n"
-"Hvis du svarer nei vil personen bli svartelyst midlertidig."
+msgstr "%s vil legge deg til i hans/hennes kontaktliste.\nVil du tillate vedkommende å se din tilstedestatus eller legge vedkommende i din kontaktliste?\nHvis du svarer nei vil personen bli svartelyst midlertidig."
 
-#: ../gtk/main.c:1260
-#, fuzzy, c-format
+#: ../gtk/main.c:1162
+#, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
 msgstr ""
-"Skriv inn ditt passord for brukernavn <i>%s</i>\n"
-" på domene <i>%s</i>:i>:"
 
-#: ../gtk/main.c:1376
-#, fuzzy
+#: ../gtk/main.c:1283
 msgid "Call error"
-msgstr "Samtalehistorikk"
+msgstr ""
 
-#: ../gtk/main.c:1379 ../coreapi/linphonecore.c:3240
+#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3744
 msgid "Call ended"
 msgstr "Samtale avsluttet"
 
-#: ../gtk/main.c:1382
+#: ../gtk/main.c:1289
 msgid "Incoming call"
 msgstr "Innkommende samtale"
 
-#: ../gtk/main.c:1384 ../gtk/incall_view.c:522 ../gtk/main.ui.h:5
+#: ../gtk/main.c:1291 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
 msgid "Answer"
 msgstr "Svarer"
 
-#: ../gtk/main.c:1386 ../gtk/main.ui.h:6
+#: ../gtk/main.c:1293 ../gtk/main.ui.h:6
 msgid "Decline"
 msgstr "Avvis"
 
-#: ../gtk/main.c:1392
-#, fuzzy
+#: ../gtk/main.c:1299
 msgid "Call paused"
-msgstr "Samtale avbrutt"
+msgstr ""
 
-#: ../gtk/main.c:1392
-#, fuzzy, c-format
+#: ../gtk/main.c:1299
+#, c-format
 msgid "<b>by %s</b>"
-msgstr "<b>Porter</b>"
+msgstr ""
 
-#: ../gtk/main.c:1459
+#: ../gtk/main.c:1366
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr ""
 
-#: ../gtk/main.c:1621
+#: ../gtk/main.c:1528
 msgid "Website link"
 msgstr "Peker til nettsted"
 
-#: ../gtk/main.c:1670
+#: ../gtk/main.c:1577
 msgid "Linphone - a video internet phone"
 msgstr "Linphone - en video Internet telefon"
 
-#: ../gtk/main.c:1762
+#: ../gtk/main.c:1669
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (Standard)"
 
-#: ../gtk/main.c:2099 ../coreapi/callbacks.c:949
+#: ../gtk/main.c:2006 ../coreapi/callbacks.c:983
 #, c-format
 msgid "We are transferred to %s"
 msgstr "Vi er overført til %s"
 
-#: ../gtk/main.c:2109
+#: ../gtk/main.c:2016
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
-msgstr ""
-"Klarte ikke å finne noe lydkort på denne datamaskinen.\n"
-"Du vil ikke kunne sende eller motta lydsamtaler."
+msgstr "Klarte ikke å finne noe lydkort på denne datamaskinen.\nDu vil ikke kunne sende eller motta lydsamtaler."
 
-#: ../gtk/main.c:2250
+#: ../gtk/main.c:2157
 msgid "A free SIP video-phone"
 msgstr "En gratis SIP video-telefon"
 
@@ -250,9 +227,8 @@ msgid "Name"
 msgstr "Navn"
 
 #: ../gtk/friendlist.c:721
-#, fuzzy
 msgid "Call"
-msgstr "Ring %s"
+msgstr ""
 
 #: ../gtk/friendlist.c:726
 msgid "Chat"
@@ -274,9 +250,9 @@ msgid "Delete contact '%s'"
 msgstr "Slett kontakt '%s'"
 
 #: ../gtk/friendlist.c:978
-#, fuzzy, c-format
+#, c-format
 msgid "Delete chat history of '%s'"
-msgstr "Slett kontakt '%s'"
+msgstr ""
 
 #: ../gtk/friendlist.c:1029
 #, c-format
@@ -292,9 +268,8 @@ msgid "Status"
 msgstr "Status"
 
 #: ../gtk/propertybox.c:570
-#, fuzzy
 msgid "IP Bitrate (kbit/s)"
-msgstr "Min. datahastighet (kbit/s)"
+msgstr ""
 
 #: ../gtk/propertybox.c:577
 msgid "Parameters"
@@ -312,92 +287,92 @@ msgstr "Av"
 msgid "Account"
 msgstr "Konto"
 
-#: ../gtk/propertybox.c:1063
+#: ../gtk/propertybox.c:1072
 msgid "English"
 msgstr "Engelsk"
 
-#: ../gtk/propertybox.c:1064
+#: ../gtk/propertybox.c:1073
 msgid "French"
 msgstr "Fransk"
 
-#: ../gtk/propertybox.c:1065
+#: ../gtk/propertybox.c:1074
 msgid "Swedish"
 msgstr "Svensk"
 
-#: ../gtk/propertybox.c:1066
+#: ../gtk/propertybox.c:1075
 msgid "Italian"
 msgstr "Italisensk"
 
-#: ../gtk/propertybox.c:1067
+#: ../gtk/propertybox.c:1076
 msgid "Spanish"
 msgstr "Spansk"
 
-#: ../gtk/propertybox.c:1068
+#: ../gtk/propertybox.c:1077
 msgid "Brazilian Portugese"
 msgstr "Portugisisk"
 
-#: ../gtk/propertybox.c:1069
+#: ../gtk/propertybox.c:1078
 msgid "Polish"
 msgstr "Polsk"
 
-#: ../gtk/propertybox.c:1070
+#: ../gtk/propertybox.c:1079
 msgid "German"
 msgstr "Tysk"
 
-#: ../gtk/propertybox.c:1071
+#: ../gtk/propertybox.c:1080
 msgid "Russian"
 msgstr "Russisk"
 
-#: ../gtk/propertybox.c:1072
+#: ../gtk/propertybox.c:1081
 msgid "Japanese"
 msgstr "Japansk"
 
-#: ../gtk/propertybox.c:1073
+#: ../gtk/propertybox.c:1082
 msgid "Dutch"
 msgstr "Nederlandsk"
 
-#: ../gtk/propertybox.c:1074
+#: ../gtk/propertybox.c:1083
 msgid "Hungarian"
 msgstr "Ungarsk"
 
-#: ../gtk/propertybox.c:1075
+#: ../gtk/propertybox.c:1084
 msgid "Czech"
 msgstr "Tjekkisk"
 
-#: ../gtk/propertybox.c:1076
+#: ../gtk/propertybox.c:1085
 msgid "Chinese"
 msgstr "Kinesisk"
 
-#: ../gtk/propertybox.c:1077
+#: ../gtk/propertybox.c:1086
 msgid "Traditional Chinese"
 msgstr ""
 
-#: ../gtk/propertybox.c:1078
+#: ../gtk/propertybox.c:1087
 msgid "Norwegian"
 msgstr ""
 
-#: ../gtk/propertybox.c:1079
+#: ../gtk/propertybox.c:1088
 msgid "Hebrew"
 msgstr ""
 
-#: ../gtk/propertybox.c:1080
+#: ../gtk/propertybox.c:1089
 msgid "Serbian"
 msgstr ""
 
-#: ../gtk/propertybox.c:1147
+#: ../gtk/propertybox.c:1156
 msgid ""
 "You need to restart linphone for the new language selection to take effect."
 msgstr "Du må restarte linphone for at det nye språkvalget skal iverksettes."
 
-#: ../gtk/propertybox.c:1225
+#: ../gtk/propertybox.c:1234
 msgid "None"
 msgstr ""
 
-#: ../gtk/propertybox.c:1229
+#: ../gtk/propertybox.c:1238
 msgid "SRTP"
 msgstr ""
 
-#: ../gtk/propertybox.c:1235
+#: ../gtk/propertybox.c:1244
 msgid "ZRTP"
 msgstr ""
 
@@ -406,9 +381,7 @@ msgstr ""
 msgid ""
 "A more recent version is availalble from %s.\n"
 "Would you like to open a browser to download it ?"
-msgstr ""
-"En nyere utgave er tilgjengelig fra %s.\n"
-"Vil du åpne en nettleser og laste den ned ?"
+msgstr "En nyere utgave er tilgjengelig fra %s.\nVil du åpne en nettleser og laste den ned ?"
 
 #: ../gtk/update.c:91
 msgid "You are running the lastest version."
@@ -445,24 +418,19 @@ msgstr[1] "Hittat kontakt %i"
 msgid ""
 "Welcome !\n"
 "This assistant will help you to use a SIP account for your calls."
-msgstr ""
-"Velkommen\n"
-"Denne veiviseren vil hjelpe deg sette opp en SIP-konto for dine samtaler."
+msgstr "Velkommen\nDenne veiviseren vil hjelpe deg sette opp en SIP-konto for dine samtaler."
 
 #: ../gtk/setupwizard.c:43
-#, fuzzy
 msgid "Create an account on linphone.org"
-msgstr "Lag en konto ved å velge ett brukernavn"
+msgstr ""
 
 #: ../gtk/setupwizard.c:44
-#, fuzzy
 msgid "I have already a linphone.org account and I just want to use it"
-msgstr "Jeg har allerede en brukerkonto og vil bruke den."
+msgstr ""
 
 #: ../gtk/setupwizard.c:45
-#, fuzzy
 msgid "I have already a sip account and I just want to use it"
-msgstr "Jeg har allerede en brukerkonto og vil bruke den."
+msgstr ""
 
 #: ../gtk/setupwizard.c:46
 msgid "I want to specify a remote configuration URI"
@@ -485,14 +453,12 @@ msgid "Enter your account informations"
 msgstr ""
 
 #: ../gtk/setupwizard.c:140
-#, fuzzy
 msgid "Username*"
-msgstr "Brukernavn"
+msgstr ""
 
 #: ../gtk/setupwizard.c:141
-#, fuzzy
 msgid "Password*"
-msgstr "Passord"
+msgstr ""
 
 #: ../gtk/setupwizard.c:144
 msgid "Domain*"
@@ -507,14 +473,12 @@ msgid "(*) Required fields"
 msgstr ""
 
 #: ../gtk/setupwizard.c:318
-#, fuzzy
 msgid "Username: (*)"
-msgstr "Brukernavn:"
+msgstr ""
 
 #: ../gtk/setupwizard.c:320
-#, fuzzy
 msgid "Password: (*)"
-msgstr "Passord:"
+msgstr ""
 
 #: ../gtk/setupwizard.c:322
 msgid "Email: (*)"
@@ -540,15 +504,13 @@ msgstr "Takk. Ditt konto er nå satt opp og klart til bruk."
 
 #: ../gtk/setupwizard.c:413
 msgid ""
-"Please validate your account by clicking on the link we just sent you by "
-"email.\n"
+"Please validate your account by clicking on the link we just sent you by email.\n"
 "Then come back here and press Next button."
 msgstr ""
 
 #: ../gtk/setupwizard.c:600
-#, fuzzy
 msgid "SIP account configuration assistant"
-msgstr "Brukerkontoveiviser"
+msgstr ""
 
 #: ../gtk/setupwizard.c:618
 msgid "Welcome to the account setup assistant"
@@ -559,9 +521,8 @@ msgid "Account setup assistant"
 msgstr "Brukerkontoveiviser"
 
 #: ../gtk/setupwizard.c:629
-#, fuzzy
 msgid "Configure your account (step 1/1)"
-msgstr "Konfigurer en SIP konto"
+msgstr ""
 
 #: ../gtk/setupwizard.c:634
 msgid "Enter your sip username (step 1/1)"
@@ -580,14 +541,13 @@ msgid "Error"
 msgstr ""
 
 #: ../gtk/setupwizard.c:656 ../gtk/audio_assistant.c:527
-#, fuzzy
 msgid "Terminating"
-msgstr "Lägg på"
+msgstr ""
 
 #: ../gtk/incall_view.c:70 ../gtk/incall_view.c:94
-#, fuzzy, c-format
+#, c-format
 msgid "Call #%i"
-msgstr "Ring %s"
+msgstr ""
 
 #: ../gtk/incall_view.c:155
 #, c-format
@@ -595,18 +555,16 @@ msgid "Transfer to call #%i with %s"
 msgstr ""
 
 #: ../gtk/incall_view.c:211 ../gtk/incall_view.c:214
-#, fuzzy
 msgid "Not used"
-msgstr "Ikke funnet"
+msgstr ""
 
 #: ../gtk/incall_view.c:221
 msgid "ICE not activated"
 msgstr ""
 
 #: ../gtk/incall_view.c:223
-#, fuzzy
 msgid "ICE failed"
-msgstr "ICE filter"
+msgstr ""
 
 #: ../gtk/incall_view.c:225
 msgid "ICE in progress"
@@ -617,9 +575,8 @@ msgid "Going through one or more NATs"
 msgstr ""
 
 #: ../gtk/incall_view.c:229
-#, fuzzy
 msgid "Direct"
-msgstr "Omdirigert"
+msgstr ""
 
 #: ../gtk/incall_view.c:231
 msgid "Through a relay server"
@@ -630,9 +587,8 @@ msgid "uPnP not activated"
 msgstr ""
 
 #: ../gtk/incall_view.c:241
-#, fuzzy
 msgid "uPnP in progress"
-msgstr "STUN oppslag pågår..."
+msgstr ""
 
 #: ../gtk/incall_view.c:243
 msgid "uPnp not available"
@@ -643,9 +599,8 @@ msgid "uPnP is running"
 msgstr ""
 
 #: ../gtk/incall_view.c:247
-#, fuzzy
 msgid "uPnP failed"
-msgstr "ICE filter"
+msgstr ""
 
 #: ../gtk/incall_view.c:257 ../gtk/incall_view.c:258
 msgid "Direct or through server"
@@ -672,113 +627,110 @@ msgstr ""
 msgid "Hang up"
 msgstr ""
 
-#: ../gtk/incall_view.c:501
+#: ../gtk/incall_view.c:511
 msgid "<b>Calling...</b>"
 msgstr "<b>Ringer...</b>"
 
-#: ../gtk/incall_view.c:504 ../gtk/incall_view.c:707
+#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:727
 msgid "00::00::00"
 msgstr "00:00:00"
 
-#: ../gtk/incall_view.c:515
+#: ../gtk/incall_view.c:525
 msgid "<b>Incoming call</b>"
 msgstr "Innkommende samtale"
 
-#: ../gtk/incall_view.c:552
+#: ../gtk/incall_view.c:562
 msgid "good"
 msgstr ""
 
-#: ../gtk/incall_view.c:554
+#: ../gtk/incall_view.c:564
 msgid "average"
 msgstr ""
 
-#: ../gtk/incall_view.c:556
+#: ../gtk/incall_view.c:566
 msgid "poor"
 msgstr ""
 
-#: ../gtk/incall_view.c:558
+#: ../gtk/incall_view.c:568
 msgid "very poor"
 msgstr ""
 
-#: ../gtk/incall_view.c:560
+#: ../gtk/incall_view.c:570
 msgid "too bad"
 msgstr ""
 
-#: ../gtk/incall_view.c:561 ../gtk/incall_view.c:577
+#: ../gtk/incall_view.c:571 ../gtk/incall_view.c:587
 msgid "unavailable"
 msgstr ""
 
-#: ../gtk/incall_view.c:669
+#: ../gtk/incall_view.c:679
 msgid "Secured by SRTP"
 msgstr ""
 
-#: ../gtk/incall_view.c:675
+#: ../gtk/incall_view.c:685
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
 msgstr ""
 
-#: ../gtk/incall_view.c:681
+#: ../gtk/incall_view.c:691
 msgid "Set unverified"
 msgstr ""
 
-#: ../gtk/incall_view.c:681 ../gtk/main.ui.h:4
+#: ../gtk/incall_view.c:691 ../gtk/main.ui.h:4
 msgid "Set verified"
 msgstr ""
 
-#: ../gtk/incall_view.c:702
+#: ../gtk/incall_view.c:722
 msgid "In conference"
 msgstr ""
 
-#: ../gtk/incall_view.c:702
+#: ../gtk/incall_view.c:722
 msgid "<b>In call</b>"
 msgstr "<b>I samtale med</b>"
 
-#: ../gtk/incall_view.c:738
+#: ../gtk/incall_view.c:758
 msgid "<b>Paused call</b>"
 msgstr "<b>Pauset samtale</b>"
 
-#: ../gtk/incall_view.c:751
+#: ../gtk/incall_view.c:771
 #, c-format
 msgid "%02i::%02i::%02i"
 msgstr "%02i:%02i:%02i"
 
-#: ../gtk/incall_view.c:772
+#: ../gtk/incall_view.c:794
 msgid "<b>Call ended.</b>"
 msgstr "<b>Samtale avsluttet.</b>"
 
-#: ../gtk/incall_view.c:803
+#: ../gtk/incall_view.c:825
 msgid "Transfer in progress"
 msgstr ""
 
-#: ../gtk/incall_view.c:806
-#, fuzzy
+#: ../gtk/incall_view.c:828
 msgid "Transfer done."
-msgstr "Overfører"
+msgstr ""
 
-#: ../gtk/incall_view.c:809
-#, fuzzy
+#: ../gtk/incall_view.c:831
 msgid "Transfer failed."
-msgstr "Overfører"
+msgstr ""
 
-#: ../gtk/incall_view.c:853
+#: ../gtk/incall_view.c:875
 msgid "Resume"
 msgstr "Fortsett"
 
-#: ../gtk/incall_view.c:860 ../gtk/main.ui.h:9
+#: ../gtk/incall_view.c:882 ../gtk/main.ui.h:9
 msgid "Pause"
 msgstr "Pause"
 
-#: ../gtk/incall_view.c:926
+#: ../gtk/incall_view.c:948
 #, c-format
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
 msgstr ""
 
-#: ../gtk/incall_view.c:926
-#, fuzzy
+#: ../gtk/incall_view.c:948
 msgid "(Paused)"
-msgstr "Pause"
+msgstr ""
 
 #: ../gtk/loginframe.c:88
 #, c-format
@@ -786,9 +738,9 @@ msgid "Please enter login information for %s"
 msgstr "Skriv inn påloggingsinformasjon for %s:"
 
 #: ../gtk/config-fetching.c:57
-#, fuzzy, c-format
+#, c-format
 msgid "fetching from %s"
-msgstr "Inkommande samtal från %s"
+msgstr ""
 
 #: ../gtk/config-fetching.c:73
 #, c-format
@@ -812,18 +764,14 @@ msgid "Too loud"
 msgstr ""
 
 #: ../gtk/audio_assistant.c:318
-#, fuzzy
 msgid ""
 "Welcome !\n"
 "This assistant will help you to configure audio settings for Linphone"
 msgstr ""
-"Velkommen\n"
-"Denne veiviseren vil hjelpe deg sette opp en SIP-konto for dine samtaler."
 
 #: ../gtk/audio_assistant.c:328
-#, fuzzy
 msgid "Capture device"
-msgstr "Mikrofonenhet:"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:329
 msgid "Recorded volume"
@@ -834,9 +782,8 @@ msgid "No voice"
 msgstr ""
 
 #: ../gtk/audio_assistant.c:369
-#, fuzzy
 msgid "Playback device"
-msgstr "Avspillingsenhet:"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:370
 msgid "Play three beeps"
@@ -855,14 +802,12 @@ msgid "Let's start Linphone now"
 msgstr ""
 
 #: ../gtk/audio_assistant.c:496
-#, fuzzy
 msgid "Audio Assistant"
-msgstr "Assistent"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:506 ../gtk/main.ui.h:31
-#, fuzzy
 msgid "Audio assistant"
-msgstr "Brukerkontoveiviser"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:511
 msgid "Mic Gain calibration"
@@ -877,9 +822,8 @@ msgid "Record and Play"
 msgstr ""
 
 #: ../gtk/main.ui.h:1
-#, fuzzy
 msgid "<b>Callee name</b>"
-msgstr "<b>Samtale avsluttet.</b>"
+msgstr ""
 
 #: ../gtk/main.ui.h:2
 msgid "Send"
@@ -942,9 +886,8 @@ msgid "_Options"
 msgstr "_Alternativer"
 
 #: ../gtk/main.ui.h:23
-#, fuzzy
 msgid "Set configuration URI"
-msgstr "Bekreftelse"
+msgstr ""
 
 #: ../gtk/main.ui.h:24
 msgid "Always start video"
@@ -971,9 +914,8 @@ msgid "Check _Updates"
 msgstr "Sjekk _Oppdateringer"
 
 #: ../gtk/main.ui.h:30
-#, fuzzy
 msgid "Account assistant"
-msgstr "Brukerkontoveiviser"
+msgstr ""
 
 #: ../gtk/main.ui.h:32
 msgid "SIP address or phone number:"
@@ -1000,9 +942,8 @@ msgid "Add contact"
 msgstr "Legg til kontakt"
 
 #: ../gtk/main.ui.h:38
-#, fuzzy
 msgid "Recent calls"
-msgstr "I samtale"
+msgstr ""
 
 #: ../gtk/main.ui.h:39
 msgid "My current identity:"
@@ -1050,12 +991,9 @@ msgstr "(C) Belledonne Communications,2011\n"
 
 #: ../gtk/about.ui.h:4
 msgid "An internet video phone using the standard SIP (rfc3261) protocol."
-msgstr ""
-"En Internet Videotelefon som bruker den standardiserte SIP-protokollen "
-"(rfc3261)."
+msgstr "En Internet Videotelefon som bruker den standardiserte SIP-protokollen (rfc3261)."
 
 #: ../gtk/about.ui.h:5
-#, fuzzy
 msgid ""
 "fr: Simon Morlat\n"
 "en: Simon Morlat and Delphine Perreau\n"
@@ -1070,17 +1008,6 @@ msgid ""
 "hu: anonymous\n"
 "he: Eli Zaretskii <eliz@gnu.org>\n"
 msgstr ""
-"fr: Simon Morlat\n"
-"en: Simon Morlat og Delphine Perreau\n"
-"it: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\n"
-"de: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\n"
-"sv: Daniel Nylander <po@danielnylander.se>\n"
-"es: Jesus Benitez <gnelson at inMail dot sk>\n"
-"ja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\n"
-"pt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\n"
-"pl: Robert Nasiadek <darkone@darkone.pl>\n"
-"cs: Petr Pisar <petr.pisar@atlas.cz>\n"
-"hu: anonym\n"
 
 #: ../gtk/contact.ui.h:2
 msgid "SIP Address"
@@ -1155,9 +1082,8 @@ msgid "Registration duration (sec):"
 msgstr "Registreringsfrekvens (sek.):"
 
 #: ../gtk/sip_account.ui.h:8
-#, fuzzy
 msgid "Contact params (optional):"
-msgstr "Route (valgfritt):"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:9
 msgid "AVPF regular RTCP interval (sec):"
@@ -1168,9 +1094,8 @@ msgid "Route (optional):"
 msgstr "Route (valgfritt):"
 
 #: ../gtk/sip_account.ui.h:11
-#, fuzzy
 msgid "Transport"
-msgstr "<b>Transport</b>"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:12
 msgid "Register"
@@ -1181,9 +1106,8 @@ msgid "Publish presence information"
 msgstr "Publiser tilstedestatus"
 
 #: ../gtk/sip_account.ui.h:14
-#, fuzzy
 msgid "Enable AVPF"
-msgstr "Aktiver"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:15
 msgid "Configure a SIP account"
@@ -1230,19 +1154,16 @@ msgid "C"
 msgstr "C"
 
 #: ../gtk/parameters.ui.h:11
-#, fuzzy
 msgid "SIP (UDP)"
-msgstr "SIP (UDP):"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:12
-#, fuzzy
 msgid "SIP (TCP)"
-msgstr "SIP (TCP):"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:13
-#, fuzzy
 msgid "SIP (TLS)"
-msgstr "SIP (TCP):"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:14
 msgid "Settings"
@@ -1309,23 +1230,20 @@ msgid "Direct connection to the Internet"
 msgstr "Tilkoblet Internett direkte"
 
 #: ../gtk/parameters.ui.h:30
-#, fuzzy
 msgid "Behind NAT / Firewall (specify gateway IP )"
-msgstr "Bak NAT / Brannmur (spesifiser gateway IP under)"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:31
 msgid "Behind NAT / Firewall (use STUN to resolve)"
 msgstr "Bak NAT / Brannmur (bruk STUN for å avgjøre)"
 
 #: ../gtk/parameters.ui.h:32
-#, fuzzy
 msgid "Behind NAT / Firewall (use ICE)"
-msgstr "Bak NAT / Brannmur (bruk STUN for å avgjøre)"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:33
-#, fuzzy
 msgid "Behind NAT / Firewall (use uPnP)"
-msgstr "Bak NAT / Brannmur (bruk STUN for å avgjøre)"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:34
 msgid "Public IP address:"
@@ -1380,9 +1298,8 @@ msgid "Prefered video resolution:"
 msgstr "Foretrukke video-oppløsning:"
 
 #: ../gtk/parameters.ui.h:47
-#, fuzzy
 msgid "Video output method:"
-msgstr "Videoenhet:"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:48
 msgid "<b>Video</b>"
@@ -1503,23 +1420,20 @@ msgid "User interface"
 msgstr "Brukergrensesnitt"
 
 #: ../gtk/parameters.ui.h:77 ../gtk/ldap.ui.h:2
-#, fuzzy
 msgid "Server address:"
-msgstr "SIP Adress"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:78 ../gtk/ldap.ui.h:3
-#, fuzzy
 msgid "Authentication method:"
-msgstr "Autorisering kreves"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:80
 msgid "label"
 msgstr "etikett"
 
 #: ../gtk/parameters.ui.h:81
-#, fuzzy
 msgid "<b>LDAP Account setup</b>"
-msgstr "<b>Proxy kontoer</b>"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:82
 msgid "LDAP"
@@ -1550,42 +1464,36 @@ msgid "Please wait"
 msgstr "Vennligst vent"
 
 #: ../gtk/dscp_settings.ui.h:1
-#, fuzzy
 msgid "DSCP settings"
-msgstr "Innstillinger"
+msgstr ""
 
 #: ../gtk/dscp_settings.ui.h:2
 msgid "SIP"
 msgstr ""
 
 #: ../gtk/dscp_settings.ui.h:3
-#, fuzzy
 msgid "Audio RTP stream"
-msgstr "Lydomformer"
+msgstr ""
 
 #: ../gtk/dscp_settings.ui.h:4
-#, fuzzy
 msgid "Video RTP stream"
-msgstr "Video RTP/UDP:"
+msgstr ""
 
 #: ../gtk/dscp_settings.ui.h:5
 msgid "<b>Set DSCP values (in hexadecimal)</b>"
 msgstr ""
 
 #: ../gtk/call_statistics.ui.h:1
-#, fuzzy
 msgid "Call statistics"
-msgstr "Ringer %s"
+msgstr ""
 
 #: ../gtk/call_statistics.ui.h:2
-#, fuzzy
 msgid "Audio codec"
-msgstr "Lyd kodek"
+msgstr ""
 
 #: ../gtk/call_statistics.ui.h:3
-#, fuzzy
 msgid "Video codec"
-msgstr "Video kodek"
+msgstr ""
 
 #: ../gtk/call_statistics.ui.h:4
 msgid "Audio IP bandwidth usage"
@@ -1612,24 +1520,20 @@ msgid "Video resolution received"
 msgstr ""
 
 #: ../gtk/call_statistics.ui.h:10
-#, fuzzy
 msgid "Video resolution sent"
-msgstr "Foretrukke video-oppløsning:"
+msgstr ""
 
 #: ../gtk/call_statistics.ui.h:11
-#, fuzzy
 msgid "RTP profile"
-msgstr "RTP inn-filter"
+msgstr ""
 
 #: ../gtk/call_statistics.ui.h:12
-#, fuzzy
 msgid "<b>Call statistics and information</b>"
-msgstr "<b>Kontaktinformasjon</b>"
+msgstr ""
 
 #: ../gtk/tunnel_config.ui.h:1
-#, fuzzy
 msgid "Configure VoIP tunnel"
-msgstr "Konfigurer en SIP konto"
+msgstr ""
 
 #: ../gtk/tunnel_config.ui.h:2
 msgid "Host"
@@ -1708,9 +1612,8 @@ msgid "1"
 msgstr "1"
 
 #: ../gtk/ldap.ui.h:1
-#, fuzzy
 msgid "LDAP Settings"
-msgstr "Innstillinger"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:6
 msgid "Use TLS Connection"
@@ -1721,9 +1624,8 @@ msgid "Not yet available"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:8
-#, fuzzy
 msgid "<b>Connection</b>"
-msgstr "<b>Kodeker</b>"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:9
 msgid "Bind DN"
@@ -1738,9 +1640,8 @@ msgid "Realm"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:12
-#, fuzzy
 msgid "<b>SASL</b>"
-msgstr "<b>Lyd</b>"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:13
 msgid "Base object:"
@@ -1756,18 +1657,16 @@ msgid "Name Attribute:"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:17
-#, fuzzy
 msgid "SIP address attribute:"
-msgstr "SIP Adress"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:18
 msgid "Attributes to query:"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:19
-#, fuzzy
 msgid "<b>Search</b>"
-msgstr "<b>Søk noen</b>"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:20
 msgid "Timeout for search:"
@@ -1782,9 +1681,8 @@ msgid "Follow Aliases"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:23
-#, fuzzy
 msgid "<b>Miscellaneous</b>"
-msgstr "<b>Video</b>"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:24
 msgid "ANONYMOUS"
@@ -1808,11 +1706,8 @@ msgstr ""
 
 #: ../gtk/config-uri.ui.h:2
 msgid ""
-"This dialog allows to set an http or https address when configuration is to "
-"be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, "
-"Linphone will restart automatically in order to fetch and take into account "
-"the new configuration. "
+"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
 msgstr ""
 
 #: ../gtk/config-uri.ui.h:4
@@ -1820,81 +1715,79 @@ msgid "https://"
 msgstr ""
 
 #: ../gtk/provisioning-fetch.ui.h:1
-#, fuzzy
 msgid "Configuring..."
-msgstr "Tilknytter..."
+msgstr ""
 
 #: ../gtk/provisioning-fetch.ui.h:2
 msgid "Please wait while fetching configuration from server..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1034
+#: ../coreapi/linphonecore.c:1511
 msgid "Ready"
 msgstr "Klar"
 
-#: ../coreapi/linphonecore.c:1967
-#, fuzzy
+#: ../coreapi/linphonecore.c:2470
 msgid "Configuring"
-msgstr "Bekreftelse"
+msgstr ""
 
-#: ../coreapi/linphonecore.c:2133
+#: ../coreapi/linphonecore.c:2635
 msgid "Looking for telephone number destination..."
 msgstr "Ser etter telefonnummer for destinasjonen..."
 
-#: ../coreapi/linphonecore.c:2136
+#: ../coreapi/linphonecore.c:2637
 msgid "Could not resolve this number."
 msgstr "Kan ikke tilkoble dette nummeret."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2418
+#: ../coreapi/linphonecore.c:2919
 msgid "Contacting"
 msgstr "Tilknytter"
 
-#: ../coreapi/linphonecore.c:2425
+#: ../coreapi/linphonecore.c:2924
 msgid "Could not call"
 msgstr "Kunne ikke ringe"
 
-#: ../coreapi/linphonecore.c:2576
+#: ../coreapi/linphonecore.c:3074
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "Beklager, du har nådd maksimalt antall samtidige samtaler"
 
-#: ../coreapi/linphonecore.c:2745
+#: ../coreapi/linphonecore.c:3233
 msgid "is contacting you"
 msgstr "Kontakter deg."
 
-#: ../coreapi/linphonecore.c:2746
+#: ../coreapi/linphonecore.c:3234
 msgid " and asked autoanswer."
 msgstr " og ba om autosvar."
 
-#: ../coreapi/linphonecore.c:2746
+#: ../coreapi/linphonecore.c:3234
 msgid "."
 msgstr "."
 
-#: ../coreapi/linphonecore.c:2865
+#: ../coreapi/linphonecore.c:3352
 msgid "Modifying call parameters..."
 msgstr "Endrer ringeparametre..."
 
-#: ../coreapi/linphonecore.c:3194
+#: ../coreapi/linphonecore.c:3700
 msgid "Connected."
 msgstr "Tilkoblet"
 
-#: ../coreapi/linphonecore.c:3220
+#: ../coreapi/linphonecore.c:3725
 msgid "Call aborted"
 msgstr "Samtale avbrutt"
 
-#: ../coreapi/linphonecore.c:3412
+#: ../coreapi/linphonecore.c:3915
 msgid "Could not pause the call"
 msgstr "Kunne ikke pause samtalen"
 
-#: ../coreapi/linphonecore.c:3417
+#: ../coreapi/linphonecore.c:3919
 msgid "Pausing the current call..."
 msgstr "Pauser nåværende samtale"
 
-#: ../coreapi/misc.c:425
+#: ../coreapi/misc.c:438
 msgid "Stun lookup in progress..."
 msgstr "STUN oppslag pågår..."
 
-#: ../coreapi/misc.c:607
+#: ../coreapi/misc.c:619
 msgid "ICE local candidates gathering in progress..."
 msgstr ""
 
@@ -1943,641 +1836,147 @@ msgid "Pending"
 msgstr "Pågående"
 
 #: ../coreapi/friend.c:66
-#, fuzzy
 msgid "Vacation"
-msgstr "Varighet"
+msgstr ""
 
 #: ../coreapi/friend.c:68
 msgid "Unknown-bug"
 msgstr "Ukjent feil"
 
-#: ../coreapi/proxy.c:314
+#: ../coreapi/proxy.c:319
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
-msgstr ""
-"SIP proxy adressen du har angitt er ugyldig, den må begynne med \"sip:\" "
-"etterfult av vertsnavn."
+msgstr "SIP proxy adressen du har angitt er ugyldig, den må begynne med \"sip:\" etterfult av vertsnavn."
 
-#: ../coreapi/proxy.c:320
+#: ../coreapi/proxy.c:325
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
-msgstr ""
-"SIP adressen du har angitt er feil. Adressen bør se ut som sip: "
-"brukernavn@domenenavn, f.eks sip:ola@eksempel.no"
+msgstr "SIP adressen du har angitt er feil. Adressen bør se ut som sip: brukernavn@domenenavn, f.eks sip:ola@eksempel.no"
 
-#: ../coreapi/proxy.c:1369
+#: ../coreapi/proxy.c:1377
 #, c-format
 msgid "Could not login as %s"
 msgstr "Ikke ikke logge inn som %s"
 
-#: ../coreapi/callbacks.c:355
+#: ../coreapi/callbacks.c:383
 msgid "Remote ringing."
 msgstr "Ringer hos motparten."
 
-#: ../coreapi/callbacks.c:373
-#, fuzzy
+#: ../coreapi/callbacks.c:404
 msgid "Remote ringing..."
-msgstr "Ringer hos motparten."
+msgstr ""
 
-#: ../coreapi/callbacks.c:384
+#: ../coreapi/callbacks.c:414
 msgid "Early media."
 msgstr "Tidlig media"
 
-#: ../coreapi/callbacks.c:435
+#: ../coreapi/callbacks.c:475
 #, c-format
 msgid "Call with %s is paused."
 msgstr "Samtalen med %s er pauset."
 
-#: ../coreapi/callbacks.c:448
+#: ../coreapi/callbacks.c:488
 #, c-format
 msgid "Call answered by %s - on hold."
 msgstr "Samtale besvart av %s - på vent."
 
-#: ../coreapi/callbacks.c:459
+#: ../coreapi/callbacks.c:498
 msgid "Call resumed."
 msgstr "Samtale gjenopptatt."
 
-#: ../coreapi/callbacks.c:464
+#: ../coreapi/callbacks.c:502
 #, c-format
 msgid "Call answered by %s."
 msgstr "Samtale besvart av %s."
 
-#: ../coreapi/callbacks.c:483
+#: ../coreapi/callbacks.c:525
 msgid "Incompatible, check codecs or security settings..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:512
-#, fuzzy
-msgid "We have been resumed."
-msgstr "Vi har blitt gjenopptatt..."
+#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:826
+msgid "Incompatible media parameters."
+msgstr ""
 
-#: ../coreapi/callbacks.c:521
+#: ../coreapi/callbacks.c:560
+msgid "We have been resumed."
+msgstr ""
+
+#. we are being paused
+#: ../coreapi/callbacks.c:568
 msgid "We are paused by other party."
 msgstr ""
 
-#: ../coreapi/callbacks.c:556
+#. reINVITE and in-dialogs UPDATE go here
+#: ../coreapi/callbacks.c:602
 msgid "Call is updated by remote."
 msgstr ""
 
-#: ../coreapi/callbacks.c:658
+#: ../coreapi/callbacks.c:705
 msgid "Call terminated."
 msgstr "Samtale avsluttet."
 
-#: ../coreapi/callbacks.c:687
+#: ../coreapi/callbacks.c:733
 msgid "User is busy."
 msgstr "Brukeren er opptatt."
 
-#: ../coreapi/callbacks.c:688
+#: ../coreapi/callbacks.c:734
 msgid "User is temporarily unavailable."
 msgstr "Brukeren er midlertidig ikke tilgjengelig."
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:690
+#: ../coreapi/callbacks.c:736
 msgid "User does not want to be disturbed."
 msgstr "Brukeren vil ikke bli forstyrret."
 
-#: ../coreapi/callbacks.c:691
+#: ../coreapi/callbacks.c:737
 msgid "Call declined."
 msgstr "Samtale avvist."
 
-#: ../coreapi/callbacks.c:706
+#: ../coreapi/callbacks.c:752
 msgid "Request timeout."
 msgstr ""
 
-#: ../coreapi/callbacks.c:737
+#: ../coreapi/callbacks.c:780
 msgid "Redirected"
 msgstr "Omdirigert"
 
-#: ../coreapi/callbacks.c:787
-msgid "Incompatible media parameters."
-msgstr ""
-
-#: ../coreapi/callbacks.c:798
+#: ../coreapi/callbacks.c:835
 msgid "Call failed."
 msgstr "Samtale feilet."
 
-#: ../coreapi/callbacks.c:878
+#: ../coreapi/callbacks.c:913
 #, c-format
 msgid "Registration on %s successful."
 msgstr "Registrering hos %s lykkes."
 
-#: ../coreapi/callbacks.c:879
+#: ../coreapi/callbacks.c:914
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "Avregistrering hos %s lykkes."
 
-#: ../coreapi/callbacks.c:897
+#: ../coreapi/callbacks.c:932
 msgid "no response timeout"
 msgstr "ingen svar innen angitt tid"
 
-#: ../coreapi/callbacks.c:900
+#: ../coreapi/callbacks.c:935
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "Registrering hos %s mislykkes: %s"
 
-#: ../coreapi/callbacks.c:907
+#: ../coreapi/callbacks.c:942
 msgid "Service unavailable, retrying"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:177
-#, fuzzy, c-format
+#: ../coreapi/linphonecall.c:174
+#, c-format
 msgid "Authentication token is %s"
-msgstr "Autorisering kreves"
+msgstr ""
 
-#: ../coreapi/linphonecall.c:2932
+#: ../coreapi/linphonecall.c:3020
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
 msgstr[0] "Du har %i ubesvarte anrop."
 msgstr[1] "Du har %i missade samtal"
-
-#~ msgid "aborted"
-#~ msgstr "avbrutt"
-
-#~ msgid "completed"
-#~ msgstr "Fullført"
-
-#~ msgid "missed"
-#~ msgstr "ubesvart"
-
-#~ msgid ""
-#~ "%s at %s\n"
-#~ "From: %s\n"
-#~ "To: %s\n"
-#~ "Status: %s\n"
-#~ "Duration: %i mn %i sec\n"
-#~ msgstr ""
-#~ "%s på %s\n"
-#~ "Fra: %s\n"
-#~ "Til: %s\n"
-#~ "Status: %s\n"
-#~ "Lengde: %i min %i sek\n"
-
-#~ msgid "Outgoing call"
-#~ msgstr "Utgående samtale"
-
-#~ msgid "No response."
-#~ msgstr "Ikke noe svar."
-
-#~ msgid "Protocol error."
-#~ msgstr "Protokollfeil."
-
-#~ msgid ""
-#~ "Could not parse given sip address. A sip url usually looks like sip:"
-#~ "user@domain"
-#~ msgstr ""
-#~ "Klarer ikke å tolke angitt SIP-adresse. En SIP-adresse er vanligvis ut "
-#~ "som sip: brukernavn@domenenavn"
-
-#~ msgid ""
-#~ "Your computer appears to be using ALSA sound drivers.\n"
-#~ "This is the best choice. However the pcm oss emulation module\n"
-#~ "is missing and linphone needs it. Please execute\n"
-#~ "'modprobe snd-pcm-oss' as root to load it."
-#~ msgstr ""
-#~ "Din datamaskin ser ut til å bruke ALSA drivere for lyd.\n"
-#~ "Dette er det beste alternativet. Det ser ut til at pcm oss "
-#~ "emulasjonsmodulen\n"
-#~ "mangler og linphone trenger den. Vennligst kjør\n"
-#~ "'modprobe snd-pcm-oss' som root for å laste den."
-
-#~ msgid ""
-#~ "Your computer appears to be using ALSA sound drivers.\n"
-#~ "This is the best choice. However the mixer oss emulation module\n"
-#~ "is missing and linphone needs it. Please execute\n"
-#~ " 'modprobe snd-mixer-oss' as root to load it."
-#~ msgstr ""
-#~ "Din datamaskin ser ut til å bruke ALSA drivere for lyd.\n"
-#~ "Dette er det beste alternativet. Det ser ut til at mixermodulen for oss "
-#~ "emulering\n"
-#~ "mangler og linphone trenger den. Vennligst kjør\n"
-#~ "'modprobe snd-mixer-oss' som root for å laste den."
-
-#~ msgid "Keypad"
-#~ msgstr "Tastatur"
-
-#~ msgid "Chat with %s"
-#~ msgstr "Chat med %s"
-
-#~ msgid "Please choose a username:"
-#~ msgstr "Velg ett brukernavn:"
-
-#~ msgid "Checking if '%s' is available..."
-#~ msgstr "Sjekker om %s' er tilgjengelig..."
-
-#~ msgid "Please wait..."
-#~ msgstr "Vennligst vent..."
-
-#~ msgid "Sorry this username already exists. Please try a new one."
-#~ msgstr "Beklager, brukernavnet er allerede tatt. Forsøk ett annet."
-
-#~ msgid "Ok !"
-#~ msgstr "Ok !"
-
-#~ msgid "Communication problem, please try again later."
-#~ msgstr "Kommunikasjonsproblem, forsøk igjen senere."
-
-#~ msgid "Choosing a username"
-#~ msgstr "Velg ett brukernavn"
-
-#~ msgid "Verifying"
-#~ msgstr "Verifiserer"
-
-#~ msgid "Creating your account"
-#~ msgstr "Lager brukerkontoen din"
-
-#~ msgid "Now ready !"
-#~ msgstr "Klar nå!"
-
-#, fuzzy
-#~ msgid "Enable video"
-#~ msgstr "På"
-
-#~ msgid "Enter username, phone number, or full sip address"
-#~ msgstr "Skriv inn brukernavn, telefonnummer eller full SIP-addresse"
-
-#~ msgid "Lookup:"
-#~ msgstr "Slå opp:"
-
-#~ msgid "in"
-#~ msgstr "i"
-
-#~ msgid ""
-#~ "Register to FONICS\n"
-#~ "virtual network !"
-#~ msgstr ""
-#~ "Registrer hos FONICS\n"
-#~ "virtuelle nettverk !"
-
-#~ msgid "We are being paused..."
-#~ msgstr "Vi er satt på vent..."
-
-#~ msgid "No common codecs"
-#~ msgstr "Ingen felles kodek"
-
-#~ msgid "Windows"
-#~ msgstr "Vinduer"
-
-#~ msgid ""
-#~ "Pause all calls\n"
-#~ "and answer"
-#~ msgstr ""
-#~ "Pauser alle samtaler\n"
-#~ "og svarer"
-
-#~ msgid "Unmute"
-#~ msgstr "Skru mikrofonen på"
-
-#~ msgid "<b>Contact list</b>"
-#~ msgstr "<b>Kontaktliste</b>"
-
-#~ msgid "Audio & video"
-#~ msgstr "Lyd og Video"
-
-#~ msgid "Audio only"
-#~ msgstr "Kun lyd"
-
-#~ msgid "Duration:"
-#~ msgstr "Varighet:"
-
-#, fuzzy
-#~ msgid "_Call history"
-#~ msgstr "Samtalehistorikk"
-
-#~ msgid "_Linphone"
-#~ msgstr "_Linphone"
-
-#~ msgid "gtk-cancel"
-#~ msgstr "gtk-avbryt"
-
-#~ msgid "gtk-ok"
-#~ msgstr "gtk-ok"
-
-#~ msgid "Register at startup"
-#~ msgstr "Registrer ved oppstart"
-
-#~ msgid "gtk-close"
-#~ msgstr "gtk-lukk"
-
-#~ msgid "Sorry, you have to pause or stop the current call first !"
-#~ msgstr "Beklager, du må pause eller avslutte den nåværende samtalen først !"
-
-#~ msgid "There is already a call in process, pause or stop it first."
-#~ msgstr "Det er allerede en samtale igang, pause eller avslutt den først."
-
-#~ msgid "ITU-G.711 alaw encoder"
-#~ msgstr "ITU-G.711 alaw enkoder"
-
-#~ msgid "ITU-G.711 alaw decoder"
-#~ msgstr "ITU-G.711 alaw dekoder"
-
-#~ msgid "Alsa sound source"
-#~ msgstr "Alasa lydkilde"
-
-#~ msgid "Alsa sound output"
-#~ msgstr "alsa lydutgang"
-
-#~ msgid "Sound capture filter for MacOS X Audio Queue Service"
-#~ msgstr "Lydfangefilter for MacOS X Audio Queue Service"
-
-#~ msgid "Sound playback filter for MacOS X Audio Queue Service"
-#~ msgstr "Lydavspillingsfilter for MacOS X Audio Queue Service"
-
-#~ msgid "DTMF generator"
-#~ msgstr "DTMF generator"
-
-#~ msgid "The GSM full-rate codec"
-#~ msgstr "Høyhastighets GSM kodek"
-
-#~ msgid "The GSM codec"
-#~ msgstr "GSM kodek"
-
-#, fuzzy
-#~ msgid "Sound capture filter for MacOS X Audio Unit"
-#~ msgstr "Lydfangefilter for MacOS X Core Audio drivere"
-
-#, fuzzy
-#~ msgid "Sound playback filter for MacOS X Audio Unit"
-#~ msgstr "Lydavspillingsfilter for MacOS X Core Audio drivere"
-
-#~ msgid "A filter to make conferencing"
-#~ msgstr "Ett filter for telekonferanser"
-
-#~ msgid "Raw files and wav reader"
-#~ msgstr "Få filer og wav leser"
-
-#~ msgid "Wav file recorder"
-#~ msgstr "WAV filopptaker"
-
-#~ msgid "A filter that send several inputs to one output."
-#~ msgstr "Ett filer for å sende flere inn-kilder til en utgang"
-
-#~ msgid "RTP output filter"
-#~ msgstr "RTP ut-filter"
-
-#~ msgid "The free and wonderful speex codec"
-#~ msgstr "En fri og fantatisk speex kodek"
-
-#~ msgid "A filter that controls and measure sound volume"
-#~ msgstr "Ett filer som kontrollerer og måler lydvolumet"
-
-#~ msgid "A video4linux compatible source filter to stream pictures."
-#~ msgstr "Ett video4linux kompatiblet kildefilter for bildestrømmer."
-
-#~ msgid "A filter to grab pictures from Video4Linux2-powered cameras"
-#~ msgstr "Ett filter for å fange bilder fra Video4Linux2-støttede kameraer"
-
-#~ msgid "A filter that outputs a static image."
-#~ msgstr "En filter som sender ett statisk bilde."
-
-#~ msgid "A pixel format converter"
-#~ msgstr "En pixel format omformer"
-
-#~ msgid "A video size converter"
-#~ msgstr "En videostørrelsesomformer"
-
-#~ msgid "a small video size converter"
-#~ msgstr "En liten video størrelsesomformer"
-
-#~ msgid "Echo canceller using speex library"
-#~ msgstr "Ekko fjerning ved hjelp av speex"
-
-#~ msgid "A filter that reads from input and copy to its multiple outputs."
-#~ msgstr "Ett filter som leser innkoder og kopierer det til flere utganger"
-
-#~ msgid "The theora video encoder from xiph.org"
-#~ msgstr "En Theora videokoder fra xpih.org"
-
-#~ msgid "The open-source and royalty-free 'theora' video codec from xiph.org"
-#~ msgstr ""
-#~ "Et åpen kildekode og betalingsfritt 'theora' video kodek fra xpih.org"
-
-#~ msgid "The theora video decoder from xiph.org"
-#~ msgstr "Theora video dekoder fra xiph.org"
-
-#~ msgid "ITU-G.711 ulaw encoder"
-#~ msgstr "ITU-G.711 ulaw enkoder"
-
-#~ msgid "ITU-G.711 ulaw decoder"
-#~ msgstr "ITU-G.711 ulaw dekoder"
-
-#~ msgid "A H.263 decoder using ffmpeg library"
-#~ msgstr "En H.263 dekoder som bruker ffmpeg biblioteket"
-
-#~ msgid "A MPEG4 decoder using ffmpeg library"
-#~ msgstr "En MPEG4 dekoder som bruker ffmpeg biblioteket"
-
-#~ msgid "A RTP/JPEG decoder using ffmpeg library"
-#~ msgstr "En RTP/JPEG dekoder som bruker ffmpeg biblioteket"
-
-#~ msgid "A MJPEG decoder using ffmpeg library"
-#~ msgstr "En MJPEG dekoder som bruker ffmpeg biblioteket"
-
-#~ msgid "A snow decoder using ffmpeg library"
-#~ msgstr "En snow dekoder som bruker ffmpeg biblioteket"
-
-#~ msgid "A video H.263 encoder using ffmpeg library."
-#~ msgstr "En H.263 videodekoder som bruker ffmpeg biblioteket"
-
-#~ msgid ""
-#~ "A video H.263 encoder using ffmpeg library. It is compliant with old "
-#~ "RFC2190 spec."
-#~ msgstr ""
-#~ "En H.263 enkoder som bruker ffmpeg biblioteket. Den følger den eldre "
-#~ "RFC2190 spesifikasjonen."
-
-#~ msgid "A video MPEG4 encoder using ffmpeg library."
-#~ msgstr "En video MPEG4 enkoder som bruker ffmpeg biblioteket."
-
-#~ msgid "A video snow encoder using ffmpeg library."
-#~ msgstr "En show video enkoder som bruker ffmpeg biblioteket."
-
-#~ msgid "A RTP/MJPEG encoder using ffmpeg library."
-#~ msgstr "En RTP/MJPEG enkoder som bruker ffmpeg biblioteket"
-
-#~ msgid ""
-#~ "A video H.263 encoder using ffmpeg library, compliant with old RFC2190 "
-#~ "spec."
-#~ msgstr ""
-#~ "En h.264 video enkoder som bruker ffmpeg biblioteket, kompatibelt med den "
-#~ "eldre RFC2190 spesifikasjonen."
-
-#~ msgid ""
-#~ "The snow codec is royalty-free and is open-source. \n"
-#~ "It uses innovative techniques that makes it one of most promising video "
-#~ "codec. It is implemented within the ffmpeg project.\n"
-#~ "However it is under development, quite unstable and compatibility with "
-#~ "other versions cannot be guaranteed."
-#~ msgstr ""
-#~ "Snow video-kodeksen har åpen kildekode og er vedelagsfri.\n"
-#~ "Den bruker moderne teknikker som gjør den til en god video kodek. Den er "
-#~ "implementert innen ffmpeg prosjektet.\n"
-#~ "Den er under stadig utvikling, er ganske ustabil og kompatiblitet med "
-#~ "andre utgaver kan ikke garanteres."
-
-#~ msgid "A MJPEG encoder using ffmpeg library."
-#~ msgstr "En MJPEG enkoder som bruker ffmpeg biblioteket."
-
-#~ msgid "A SDL-based video display"
-#~ msgstr "Ett SDL-basert video-bibliotek"
-
-#~ msgid "A video4windows compatible source filter to stream pictures."
-#~ msgstr "Ett video4windows-kompatibelt kildefiler for bildestrømmer."
-
-#~ msgid "A video for windows (vfw.h) based source filter to grab pictures."
-#~ msgstr ""
-#~ "Ett video for vinduer (vfw.h) baserte kildefilter for å fange bilder"
-
-#~ msgid ""
-#~ "A filter that trashes its input (useful for terminating some graphs)."
-#~ msgstr ""
-#~ "Ett filter som ødelegger input (nyttig for å terminere noen grafer)."
-
-#~ msgid "Parametric sound equalizer."
-#~ msgstr "Parameterisk lyd-mixer"
-
-#~ msgid "A webcam grabber based on directshow."
-#~ msgstr "En webcam-fanger basert på directshow."
-
-#~ msgid "A video display based on windows DrawDib api"
-#~ msgstr "Videovisning basert på windows DrawDib api"
-
-#~ msgid "A filter that mixes down 16 bit sample audio streams"
-#~ msgstr "Ett filter som mixer ned til 16 bits lydstrømmer"
-
-#~ msgid "A filter that converts from mono to stereo and vice versa."
-#~ msgstr "Ett filter som konverterer fra mono til stereo og motsatt."
-
-#~ msgid "Inter ticker communication filter."
-#~ msgstr "Inter ticker kommunikasjonsfilter."
-
-#~ msgid "A display filter sending the buffers to draw to the upper layer"
-#~ msgstr ""
-#~ "Et visningsfilter for å sende buffere for å tegne det oppdaterte nivået"
-
-#~ msgid "Sound capture filter for MacOS X Audio Unit Service"
-#~ msgstr "Lydfangefilter for MacOS X Audio Unit Service"
-
-#~ msgid "Sound playback filter for MacOS X Audio Unit Service"
-#~ msgstr "Lydavspillingsfilter for MacOS X Audio Unit Service"
-
-#~ msgid "A video display using X11+Xv"
-#~ msgstr "En videovisning som bruker X11-Xv"
-
-#~ msgid "Sound capture filter for Android"
-#~ msgstr "Lydfangefilter for Android"
-
-#~ msgid "Sound playback filter for Android"
-#~ msgstr "Lydavspillingsfilter for Android"
-
-#~ msgid "A filter that captures Android video."
-#~ msgstr "Ett filter som fanger Android video."
-
-#~ msgid ""
-#~ "Your machine appears to be connected to an IPv6 network. By default "
-#~ "linphone always uses IPv4. Please update your configuration if you want "
-#~ "to use IPv6"
-#~ msgstr ""
-#~ "Din dator er tilkoblet ett IPv6 nettverk. Linphone bruker IPv6 som "
-#~ "standard. Oppdater oppsettet om du vil bruke IPv6. "
-
-#~ msgid "Show debug messages"
-#~ msgstr "Visa debugfönstret"
-
-#~ msgid "Start call"
-#~ msgstr "Ring"
-
-#~ msgid "_Modes"
-#~ msgstr "_Media"
-
-#~ msgid "Created by Simon Morlat\n"
-#~ msgstr "Skapad av Simon Morlat\n"
-
-#~ msgid "Accept"
-#~ msgstr "Godkänn"
-
-#~ msgid "Incoming call from"
-#~ msgstr "Inkommande samtal från"
-
-#~ msgid "Linphone - Incoming call"
-#~ msgstr "Linphone - Inkommande samtal"
-
-#~ msgid "default soundcard\n"
-#~ msgstr "default ljudkort\n"
-
-#~ msgid ""
-#~ "Remote end seems to have disconnected, the call is going to be closed."
-#~ msgstr ""
-#~ "Motparten verkar ha avbrutit samtalet, samtalet kommer att avslutas."
-
-#~ msgid "Sorry, having multiple simultaneous calls is not supported yet !"
-#~ msgstr "Förlåt, men linphone stödjer inte flera samtliga samtal än!"
-
-#~ msgid "Could not reach destination."
-#~ msgstr "Kunde inte nå motparten."
-
-#~ msgid "Request Cancelled."
-#~ msgstr "Förfrågan avbruten."
-
-#~ msgid "Bad request"
-#~ msgstr "Fel förfråga."
-
-#~ msgid "User cannot be found at given address."
-#~ msgstr "Användaren kan inte hittas vid den angivna adressen."
-
-#~ msgid "Remote user cannot support any of proposed codecs."
-#~ msgstr "Motparten stödjer ingen av de föreslagna codecs."
-
-#~ msgid "Timeout."
-#~ msgstr "time out."
-
-#~ msgid "Remote host was found but refused connection."
-#~ msgstr "Motparten hittades men ville inte ta emot samtalet."
-
-#~ msgid ""
-#~ "User is not reachable at the moment but he invites you\n"
-#~ "to contact him using the following alternate resource:"
-#~ msgstr ""
-#~ "Användaren kan inte nås för tillfället men han/hon ber digatt kontakta "
-#~ "honom/henna vid följande resurs:"
-
-#~ msgid "Digits"
-#~ msgstr "Tangenter"
-
-#~ msgid "Main view"
-#~ msgstr "Huvud vy"
-
-#~ msgid "No nat/firewall address supplied !"
-#~ msgstr "Ingen NAT / brandväggs adress angiven!"
-
-#~ msgid "Invalid nat address '%s' : %s"
-#~ msgstr "Fel NAT adress '%s': %s"
-
-#~ msgid "Gone"
-#~ msgstr "Har gått"
-
-#~ msgid "Waiting for Approval"
-#~ msgstr "Väntar för godkännandet"
-
-#~ msgid "Be Right Back"
-#~ msgstr "Kommer strax tillbaka"
-
-#~ msgid "On The Phone"
-#~ msgstr "På telefon"
-
-#~ msgid "Out To Lunch"
-#~ msgstr "Lunchar"
-
-#~ msgid "Closed"
-#~ msgstr "Stängt"
-
-#~ msgid "Unknown"
-#~ msgstr "Okänd"
-
-#~ msgid "Bresilian"
-#~ msgstr "Brasiliansk"
-
-#~ msgid "_View"
-#~ msgstr "_Vy"
diff --git a/po/nl.po b/po/nl.po
index b650efb95..b64a2cc2d 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,28 +1,26 @@
-# translation of nl.po to Nederlands
-# Dutch translation of linphone.
-# Copyright (C) 2005 THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the linphone package.
-# Taco Witte <tcwitte@cs.uu.nl>, 2005.
-# Hendrik-Jan Heins <hjh@passys.nl>, 2005.
-# Hendrik-Jan Heins <hjh@passys.nl>, 2007.
-# 
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: nl\n"
+"Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-15 09:24+0200\n"
-"PO-Revision-Date: 2007-09-05 10:40+0200\n"
-"Last-Translator: Hendrik-Jan Heins <hjheins@gmail.com>\n"
-"Language-Team: Nederlands <vertaling@nl.linux.org>\n"
-"Language: \n"
+"POT-Creation-Date: 2014-11-19 10:39+0100\n"
+"PO-Revision-Date: 2014-11-19 10:08+0000\n"
+"Last-Translator: Cqnqrd <gautier.pelloux@gmail.com>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/linphone-gtk/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974
-#, fuzzy, c-format
+#, c-format
 msgid "Call %s"
-msgstr "Oproepgeschiedenis"
+msgstr ""
 
 #: ../gtk/calllogs.c:149 ../gtk/friendlist.c:975
 #, c-format
@@ -30,28 +28,25 @@ msgid "Send text to %s"
 msgstr ""
 
 #: ../gtk/calllogs.c:232
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Recent calls (%i)</b>"
-msgstr "Contactlijst"
+msgstr ""
 
 #: ../gtk/calllogs.c:314
 msgid "n/a"
 msgstr ""
 
 #: ../gtk/calllogs.c:317
-#, fuzzy
 msgid "Aborted"
-msgstr "afgebroken"
+msgstr ""
 
 #: ../gtk/calllogs.c:320
-#, fuzzy
 msgid "Missed"
-msgstr "gemist"
+msgstr ""
 
 #: ../gtk/calllogs.c:323
-#, fuzzy
 msgid "Declined"
-msgstr "lijn"
+msgstr ""
 
 #: ../gtk/calllogs.c:329
 #, c-format
@@ -129,109 +124,98 @@ msgstr ""
 
 #: ../gtk/main.c:149
 msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: c:"
-"\\Program Files\\Linphone)"
+"Specifiy a working directory (should be the base of the installation, eg: "
+"c:\\Program Files\\Linphone)"
 msgstr ""
 
 #: ../gtk/main.c:156
-#, fuzzy
 msgid "Configuration file"
-msgstr "Informatie"
+msgstr ""
 
 #: ../gtk/main.c:163
 msgid "Run the audio assistant"
 msgstr ""
 
-#: ../gtk/main.c:590
-#, fuzzy, c-format
-msgid "Call with %s"
-msgstr "Chat met %s"
-
-#: ../gtk/main.c:1183
+#: ../gtk/main.c:1085
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
-"Would you allow him to see your presence status or add him to your contact "
-"list ?\n"
+"Would you allow him to see your presence status or add him to your contact list ?\n"
 "If you answer no, this person will be temporarily blacklisted."
 msgstr ""
 
-#: ../gtk/main.c:1260
+#: ../gtk/main.c:1162
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
 msgstr ""
 
-#: ../gtk/main.c:1376
-#, fuzzy
+#: ../gtk/main.c:1283
 msgid "Call error"
-msgstr "Linphone - Oproepgeschiedenis"
+msgstr ""
 
-#: ../gtk/main.c:1379 ../coreapi/linphonecore.c:3240
+#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3744
 msgid "Call ended"
 msgstr "Oproep beeindigd"
 
-#: ../gtk/main.c:1382
+#: ../gtk/main.c:1289
 msgid "Incoming call"
 msgstr "Inkomende oproep"
 
-#: ../gtk/main.c:1384 ../gtk/incall_view.c:522 ../gtk/main.ui.h:5
+#: ../gtk/main.c:1291 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
 msgid "Answer"
 msgstr ""
 
-#: ../gtk/main.c:1386 ../gtk/main.ui.h:6
-#, fuzzy
+#: ../gtk/main.c:1293 ../gtk/main.ui.h:6
 msgid "Decline"
-msgstr "lijn"
+msgstr ""
 
-#: ../gtk/main.c:1392
-#, fuzzy
+#: ../gtk/main.c:1299
 msgid "Call paused"
-msgstr "afgebroken"
+msgstr ""
 
-#: ../gtk/main.c:1392
-#, fuzzy, c-format
+#: ../gtk/main.c:1299
+#, c-format
 msgid "<b>by %s</b>"
-msgstr "Contactlijst"
+msgstr ""
 
-#: ../gtk/main.c:1459
+#: ../gtk/main.c:1366
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr ""
 
-#: ../gtk/main.c:1621
+#: ../gtk/main.c:1528
 msgid "Website link"
 msgstr ""
 
-#: ../gtk/main.c:1670
+#: ../gtk/main.c:1577
 msgid "Linphone - a video internet phone"
 msgstr ""
 
-#: ../gtk/main.c:1762
+#: ../gtk/main.c:1669
 #, c-format
 msgid "%s (Default)"
 msgstr ""
 
-#: ../gtk/main.c:2099 ../coreapi/callbacks.c:949
+#: ../gtk/main.c:2006 ../coreapi/callbacks.c:983
 #, c-format
 msgid "We are transferred to %s"
 msgstr ""
 
-#: ../gtk/main.c:2109
+#: ../gtk/main.c:2016
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
 msgstr ""
 
-#: ../gtk/main.c:2250
+#: ../gtk/main.c:2157
 msgid "A free SIP video-phone"
 msgstr "Een Vrije SIP video-telefoon"
 
 #: ../gtk/friendlist.c:505
-#, fuzzy
 msgid "Add to addressbook"
-msgstr "Adresboek"
+msgstr ""
 
 #: ../gtk/friendlist.c:691
 msgid "Presence status"
@@ -242,14 +226,12 @@ msgid "Name"
 msgstr "Naam"
 
 #: ../gtk/friendlist.c:721
-#, fuzzy
 msgid "Call"
-msgstr "Oproepgeschiedenis"
+msgstr ""
 
 #: ../gtk/friendlist.c:726
-#, fuzzy
 msgid "Chat"
-msgstr "Chat box"
+msgstr ""
 
 #: ../gtk/friendlist.c:756
 #, c-format
@@ -257,9 +239,9 @@ msgid "Search in %s directory"
 msgstr ""
 
 #: ../gtk/friendlist.c:976
-#, fuzzy, c-format
+#, c-format
 msgid "Edit contact '%s'"
-msgstr "Bewerk contactgegevens"
+msgstr ""
 
 #: ../gtk/friendlist.c:977
 #, c-format
@@ -285,9 +267,8 @@ msgid "Status"
 msgstr "Status"
 
 #: ../gtk/propertybox.c:570
-#, fuzzy
 msgid "IP Bitrate (kbit/s)"
-msgstr "Minimale bitrate (kbit/s)"
+msgstr ""
 
 #: ../gtk/propertybox.c:577
 msgid "Parameters"
@@ -305,92 +286,92 @@ msgstr "Uit"
 msgid "Account"
 msgstr "Account"
 
-#: ../gtk/propertybox.c:1063
+#: ../gtk/propertybox.c:1072
 msgid "English"
 msgstr ""
 
-#: ../gtk/propertybox.c:1064
+#: ../gtk/propertybox.c:1073
 msgid "French"
 msgstr ""
 
-#: ../gtk/propertybox.c:1065
+#: ../gtk/propertybox.c:1074
 msgid "Swedish"
 msgstr ""
 
-#: ../gtk/propertybox.c:1066
+#: ../gtk/propertybox.c:1075
 msgid "Italian"
 msgstr ""
 
-#: ../gtk/propertybox.c:1067
+#: ../gtk/propertybox.c:1076
 msgid "Spanish"
 msgstr ""
 
-#: ../gtk/propertybox.c:1068
+#: ../gtk/propertybox.c:1077
 msgid "Brazilian Portugese"
 msgstr ""
 
-#: ../gtk/propertybox.c:1069
+#: ../gtk/propertybox.c:1078
 msgid "Polish"
 msgstr ""
 
-#: ../gtk/propertybox.c:1070
+#: ../gtk/propertybox.c:1079
 msgid "German"
 msgstr ""
 
-#: ../gtk/propertybox.c:1071
+#: ../gtk/propertybox.c:1080
 msgid "Russian"
 msgstr ""
 
-#: ../gtk/propertybox.c:1072
+#: ../gtk/propertybox.c:1081
 msgid "Japanese"
 msgstr ""
 
-#: ../gtk/propertybox.c:1073
+#: ../gtk/propertybox.c:1082
 msgid "Dutch"
 msgstr ""
 
-#: ../gtk/propertybox.c:1074
+#: ../gtk/propertybox.c:1083
 msgid "Hungarian"
 msgstr ""
 
-#: ../gtk/propertybox.c:1075
+#: ../gtk/propertybox.c:1084
 msgid "Czech"
 msgstr ""
 
-#: ../gtk/propertybox.c:1076
+#: ../gtk/propertybox.c:1085
 msgid "Chinese"
 msgstr ""
 
-#: ../gtk/propertybox.c:1077
+#: ../gtk/propertybox.c:1086
 msgid "Traditional Chinese"
 msgstr ""
 
-#: ../gtk/propertybox.c:1078
+#: ../gtk/propertybox.c:1087
 msgid "Norwegian"
 msgstr ""
 
-#: ../gtk/propertybox.c:1079
+#: ../gtk/propertybox.c:1088
 msgid "Hebrew"
 msgstr ""
 
-#: ../gtk/propertybox.c:1080
+#: ../gtk/propertybox.c:1089
 msgid "Serbian"
 msgstr ""
 
-#: ../gtk/propertybox.c:1147
+#: ../gtk/propertybox.c:1156
 msgid ""
 "You need to restart linphone for the new language selection to take effect."
 msgstr ""
 
-#: ../gtk/propertybox.c:1225
+#: ../gtk/propertybox.c:1234
 msgid "None"
 msgstr "Geen"
 
-#: ../gtk/propertybox.c:1229
+#: ../gtk/propertybox.c:1238
 msgid "SRTP"
 msgstr ""
 
-#: ../gtk/propertybox.c:1235
+#: ../gtk/propertybox.c:1244
 msgid "ZRTP"
 msgstr ""
 
@@ -414,14 +395,12 @@ msgid "Error communicating with server."
 msgstr ""
 
 #: ../gtk/buddylookup.c:164
-#, fuzzy
 msgid "Connecting..."
-msgstr "Verbinden"
+msgstr ""
 
 #: ../gtk/buddylookup.c:168
-#, fuzzy
 msgid "Connected"
-msgstr "Verbonden."
+msgstr ""
 
 #: ../gtk/buddylookup.c:172
 msgid "Receiving data..."
@@ -461,28 +440,24 @@ msgid "Enter your linphone.org username"
 msgstr ""
 
 #: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:79 ../gtk/ldap.ui.h:4
-#, fuzzy
 msgid "Username:"
-msgstr "gebruikersnaam:"
+msgstr ""
 
 #: ../gtk/setupwizard.c:104 ../gtk/password.ui.h:4 ../gtk/ldap.ui.h:5
-#, fuzzy
 msgid "Password:"
-msgstr "wachtwoord:"
+msgstr ""
 
 #: ../gtk/setupwizard.c:124
 msgid "Enter your account informations"
 msgstr ""
 
 #: ../gtk/setupwizard.c:140
-#, fuzzy
 msgid "Username*"
-msgstr "gebruikersnaam:"
+msgstr ""
 
 #: ../gtk/setupwizard.c:141
-#, fuzzy
 msgid "Password*"
-msgstr "wachtwoord:"
+msgstr ""
 
 #: ../gtk/setupwizard.c:144
 msgid "Domain*"
@@ -497,14 +472,12 @@ msgid "(*) Required fields"
 msgstr ""
 
 #: ../gtk/setupwizard.c:318
-#, fuzzy
 msgid "Username: (*)"
-msgstr "gebruikersnaam:"
+msgstr ""
 
 #: ../gtk/setupwizard.c:320
-#, fuzzy
 msgid "Password: (*)"
-msgstr "wachtwoord:"
+msgstr ""
 
 #: ../gtk/setupwizard.c:322
 msgid "Email: (*)"
@@ -530,8 +503,7 @@ msgstr ""
 
 #: ../gtk/setupwizard.c:413
 msgid ""
-"Please validate your account by clicking on the link we just sent you by "
-"email.\n"
+"Please validate your account by clicking on the link we just sent you by email.\n"
 "Then come back here and press Next button."
 msgstr ""
 
@@ -572,9 +544,9 @@ msgid "Terminating"
 msgstr ""
 
 #: ../gtk/incall_view.c:70 ../gtk/incall_view.c:94
-#, fuzzy, c-format
+#, c-format
 msgid "Call #%i"
-msgstr "Oproepgeschiedenis"
+msgstr ""
 
 #: ../gtk/incall_view.c:155
 #, c-format
@@ -590,9 +562,8 @@ msgid "ICE not activated"
 msgstr ""
 
 #: ../gtk/incall_view.c:223
-#, fuzzy
 msgid "ICE failed"
-msgstr "Oproep geannuleerd."
+msgstr ""
 
 #: ../gtk/incall_view.c:225
 msgid "ICE in progress"
@@ -603,9 +574,8 @@ msgid "Going through one or more NATs"
 msgstr ""
 
 #: ../gtk/incall_view.c:229
-#, fuzzy
 msgid "Direct"
-msgstr "Doorgeschakeld naar %s..."
+msgstr ""
 
 #: ../gtk/incall_view.c:231
 msgid "Through a relay server"
@@ -616,23 +586,20 @@ msgid "uPnP not activated"
 msgstr ""
 
 #: ../gtk/incall_view.c:241
-#, fuzzy
 msgid "uPnP in progress"
-msgstr "STUN adres wordt opgezocht..."
+msgstr ""
 
 #: ../gtk/incall_view.c:243
-#, fuzzy
 msgid "uPnp not available"
-msgstr "Geen informatie beschikbaar"
+msgstr ""
 
 #: ../gtk/incall_view.c:245
 msgid "uPnP is running"
 msgstr ""
 
 #: ../gtk/incall_view.c:247
-#, fuzzy
 msgid "uPnP failed"
-msgstr "Oproep geannuleerd."
+msgstr ""
 
 #: ../gtk/incall_view.c:257 ../gtk/incall_view.c:258
 msgid "Direct or through server"
@@ -659,114 +626,108 @@ msgstr ""
 msgid "Hang up"
 msgstr ""
 
-#: ../gtk/incall_view.c:501
-#, fuzzy
+#: ../gtk/incall_view.c:511
 msgid "<b>Calling...</b>"
-msgstr "Contactlijst"
+msgstr ""
 
-#: ../gtk/incall_view.c:504 ../gtk/incall_view.c:707
+#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:727
 msgid "00::00::00"
 msgstr ""
 
-#: ../gtk/incall_view.c:515
-#, fuzzy
+#: ../gtk/incall_view.c:525
 msgid "<b>Incoming call</b>"
-msgstr "Inkomende oproep"
+msgstr ""
 
-#: ../gtk/incall_view.c:552
+#: ../gtk/incall_view.c:562
 msgid "good"
 msgstr ""
 
-#: ../gtk/incall_view.c:554
+#: ../gtk/incall_view.c:564
 msgid "average"
 msgstr ""
 
-#: ../gtk/incall_view.c:556
+#: ../gtk/incall_view.c:566
 msgid "poor"
 msgstr ""
 
-#: ../gtk/incall_view.c:558
+#: ../gtk/incall_view.c:568
 msgid "very poor"
 msgstr ""
 
-#: ../gtk/incall_view.c:560
+#: ../gtk/incall_view.c:570
 msgid "too bad"
 msgstr ""
 
-#: ../gtk/incall_view.c:561 ../gtk/incall_view.c:577
+#: ../gtk/incall_view.c:571 ../gtk/incall_view.c:587
 msgid "unavailable"
 msgstr ""
 
-#: ../gtk/incall_view.c:669
+#: ../gtk/incall_view.c:679
 msgid "Secured by SRTP"
 msgstr ""
 
-#: ../gtk/incall_view.c:675
+#: ../gtk/incall_view.c:685
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
 msgstr ""
 
-#: ../gtk/incall_view.c:681
+#: ../gtk/incall_view.c:691
 msgid "Set unverified"
 msgstr ""
 
-#: ../gtk/incall_view.c:681 ../gtk/main.ui.h:4
+#: ../gtk/incall_view.c:691 ../gtk/main.ui.h:4
 msgid "Set verified"
 msgstr ""
 
-#: ../gtk/incall_view.c:702
+#: ../gtk/incall_view.c:722
 msgid "In conference"
 msgstr ""
 
-#: ../gtk/incall_view.c:702
-#, fuzzy
+#: ../gtk/incall_view.c:722
 msgid "<b>In call</b>"
-msgstr "Contactlijst"
+msgstr ""
 
-#: ../gtk/incall_view.c:738
-#, fuzzy
+#: ../gtk/incall_view.c:758
 msgid "<b>Paused call</b>"
-msgstr "Contactlijst"
+msgstr ""
 
-#: ../gtk/incall_view.c:751
+#: ../gtk/incall_view.c:771
 #, c-format
 msgid "%02i::%02i::%02i"
 msgstr ""
 
-#: ../gtk/incall_view.c:772
-#, fuzzy
+#: ../gtk/incall_view.c:794
 msgid "<b>Call ended.</b>"
-msgstr "Oproep beeindigd"
+msgstr ""
 
-#: ../gtk/incall_view.c:803
+#: ../gtk/incall_view.c:825
 msgid "Transfer in progress"
 msgstr ""
 
-#: ../gtk/incall_view.c:806
+#: ../gtk/incall_view.c:828
 msgid "Transfer done."
 msgstr ""
 
-#: ../gtk/incall_view.c:809
-#, fuzzy
+#: ../gtk/incall_view.c:831
 msgid "Transfer failed."
-msgstr "Oproep geannuleerd."
+msgstr ""
 
-#: ../gtk/incall_view.c:853
+#: ../gtk/incall_view.c:875
 msgid "Resume"
 msgstr ""
 
-#: ../gtk/incall_view.c:860 ../gtk/main.ui.h:9
+#: ../gtk/incall_view.c:882 ../gtk/main.ui.h:9
 msgid "Pause"
 msgstr ""
 
-#: ../gtk/incall_view.c:926
+#: ../gtk/incall_view.c:948
 #, c-format
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
 msgstr ""
 
-#: ../gtk/incall_view.c:926
+#: ../gtk/incall_view.c:948
 msgid "(Paused)"
 msgstr ""
 
@@ -776,9 +737,9 @@ msgid "Please enter login information for %s"
 msgstr ""
 
 #: ../gtk/config-fetching.c:57
-#, fuzzy, c-format
+#, c-format
 msgid "fetching from %s"
-msgstr "Inkomende oproep"
+msgstr ""
 
 #: ../gtk/config-fetching.c:73
 #, c-format
@@ -808,23 +769,20 @@ msgid ""
 msgstr ""
 
 #: ../gtk/audio_assistant.c:328
-#, fuzzy
 msgid "Capture device"
-msgstr "Geluidsapparaat gebruiken:"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:329
-#, fuzzy
 msgid "Recorded volume"
-msgstr "Bron voor opname:"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:333
 msgid "No voice"
 msgstr ""
 
 #: ../gtk/audio_assistant.c:369
-#, fuzzy
 msgid "Playback device"
-msgstr "Geluidsapparaat gebruiken:"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:370
 msgid "Play three beeps"
@@ -863,14 +821,12 @@ msgid "Record and Play"
 msgstr ""
 
 #: ../gtk/main.ui.h:1
-#, fuzzy
 msgid "<b>Callee name</b>"
-msgstr "Oproep beeindigd"
+msgstr ""
 
 #: ../gtk/main.ui.h:2
-#, fuzzy
 msgid "Send"
-msgstr "Geluid"
+msgstr ""
 
 #: ../gtk/main.ui.h:3
 msgid "End conference"
@@ -893,14 +849,12 @@ msgid "Transfer"
 msgstr ""
 
 #: ../gtk/main.ui.h:14
-#, fuzzy
 msgid "In call"
-msgstr "Inkomende oproep"
+msgstr ""
 
 #: ../gtk/main.ui.h:15
-#, fuzzy
 msgid "Duration"
-msgstr "Informatie"
+msgstr ""
 
 #: ../gtk/main.ui.h:16
 msgid "Call quality rating"
@@ -911,9 +865,8 @@ msgid "All users"
 msgstr ""
 
 #: ../gtk/main.ui.h:18
-#, fuzzy
 msgid "Online users"
-msgstr "Aanwezig"
+msgstr ""
 
 #: ../gtk/main.ui.h:19
 msgid "ADSL"
@@ -924,32 +877,28 @@ msgid "Fiber Channel"
 msgstr ""
 
 #: ../gtk/main.ui.h:21
-#, fuzzy
 msgid "Default"
-msgstr "SIP-identiteit:"
+msgstr ""
 
 #: ../gtk/main.ui.h:22
 msgid "_Options"
 msgstr ""
 
 #: ../gtk/main.ui.h:23
-#, fuzzy
 msgid "Set configuration URI"
-msgstr "Proxy/registratieserver registratieveld"
+msgstr ""
 
 #: ../gtk/main.ui.h:24
 msgid "Always start video"
 msgstr ""
 
 #: ../gtk/main.ui.h:25
-#, fuzzy
 msgid "Enable self-view"
-msgstr "Video aan"
+msgstr ""
 
 #: ../gtk/main.ui.h:26
-#, fuzzy
 msgid "_Help"
-msgstr "Help"
+msgstr ""
 
 #: ../gtk/main.ui.h:27
 msgid "Show debug window"
@@ -968,84 +917,72 @@ msgid "Account assistant"
 msgstr ""
 
 #: ../gtk/main.ui.h:32
-#, fuzzy
 msgid "SIP address or phone number:"
-msgstr "Geef het SIP adres of telefoonnummer in"
+msgstr ""
 
 #: ../gtk/main.ui.h:33
 msgid "Initiate a new call"
 msgstr ""
 
 #: ../gtk/main.ui.h:34
-#, fuzzy
 msgid "Contacts"
-msgstr "Verbinden"
+msgstr ""
 
 #: ../gtk/main.ui.h:35
 msgid "Search"
 msgstr ""
 
 #: ../gtk/main.ui.h:36
-#, fuzzy
 msgid "<b>Add contacts from directory</b>"
-msgstr "Contact informatie"
+msgstr ""
 
 #: ../gtk/main.ui.h:37
-#, fuzzy
 msgid "Add contact"
-msgstr "Bewerk contactgegevens"
+msgstr ""
 
 #: ../gtk/main.ui.h:38
-#, fuzzy
 msgid "Recent calls"
-msgstr "Inkomende oproep"
+msgstr ""
 
 #: ../gtk/main.ui.h:39
-#, fuzzy
 msgid "My current identity:"
-msgstr "SIP-identiteit:"
+msgstr ""
 
 #: ../gtk/main.ui.h:40 ../gtk/tunnel_config.ui.h:7
-#, fuzzy
 msgid "Username"
-msgstr "gebruikersnaam:"
+msgstr ""
 
 #: ../gtk/main.ui.h:41 ../gtk/tunnel_config.ui.h:8
-#, fuzzy
 msgid "Password"
-msgstr "wachtwoord:"
+msgstr ""
 
 #: ../gtk/main.ui.h:42
 msgid "Internet connection:"
 msgstr ""
 
 #: ../gtk/main.ui.h:43
-#, fuzzy
 msgid "Automatically log me in"
-msgstr "Automatisch een geldige hostnaam raden"
+msgstr ""
 
 #: ../gtk/main.ui.h:44 ../gtk/password.ui.h:3
 msgid "UserID"
 msgstr ""
 
 #: ../gtk/main.ui.h:45
-#, fuzzy
 msgid "Login information"
-msgstr "Contact informatie"
+msgstr ""
 
 #: ../gtk/main.ui.h:46
-#, fuzzy
 msgid "<b>Welcome !</b>"
-msgstr "Contactlijst"
+msgstr ""
 
 #: ../gtk/main.ui.h:47
 msgid "Delete"
 msgstr ""
 
 #: ../gtk/about.ui.h:1
-#, fuzzy
 msgid "About linphone"
-msgstr "linphone"
+msgstr ""
 
 #: ../gtk/about.ui.h:2
 msgid "(C) Belledonne Communications,2010\n"
@@ -1072,9 +1009,8 @@ msgid ""
 msgstr ""
 
 #: ../gtk/contact.ui.h:2
-#, fuzzy
 msgid "SIP Address"
-msgstr "Adres"
+msgstr ""
 
 #: ../gtk/contact.ui.h:3
 msgid "Show this contact presence status"
@@ -1085,9 +1021,8 @@ msgid "Allow this contact to see my presence status"
 msgstr ""
 
 #: ../gtk/contact.ui.h:5
-#, fuzzy
 msgid "<b>Contact information</b>"
-msgstr "Contact informatie"
+msgstr ""
 
 #: ../gtk/log.ui.h:1
 msgid "Linphone debug window"
@@ -1098,36 +1033,32 @@ msgid "Scroll to end"
 msgstr ""
 
 #: ../gtk/password.ui.h:1
-#, fuzzy
 msgid "Linphone - Authentication required"
-msgstr "Authorisatie gevraagd"
+msgstr ""
 
 #: ../gtk/password.ui.h:2
 msgid "Please enter the domain password"
 msgstr ""
 
 #: ../gtk/call_logs.ui.h:1
-#, fuzzy
 msgid "Call history"
-msgstr "Linphone - Oproepgeschiedenis"
+msgstr ""
 
 #: ../gtk/call_logs.ui.h:2
 msgid "Clear all"
 msgstr ""
 
 #: ../gtk/call_logs.ui.h:3
-#, fuzzy
 msgid "Call back"
-msgstr "Oproepgeschiedenis"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:1
 msgid "Linphone - Configure a SIP account"
 msgstr ""
 
 #: ../gtk/sip_account.ui.h:2
-#, fuzzy
 msgid "Your SIP identity:"
-msgstr "SIP-identiteit:"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:3
 msgid "Looks like sip:<username>@<domain>"
@@ -1138,23 +1069,20 @@ msgid "sip:"
 msgstr "sip:"
 
 #: ../gtk/sip_account.ui.h:5
-#, fuzzy
 msgid "SIP Proxy address:"
-msgstr "SIP-proxy:"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:6
 msgid "Looks like sip:<proxy hostname>"
 msgstr ""
 
 #: ../gtk/sip_account.ui.h:7
-#, fuzzy
 msgid "Registration duration (sec):"
-msgstr "Registratieperiode:"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:8
-#, fuzzy
 msgid "Contact params (optional):"
-msgstr "Route (optioneel):"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:9
 msgid "AVPF regular RTCP interval (sec):"
@@ -1165,23 +1093,20 @@ msgid "Route (optional):"
 msgstr "Route (optioneel):"
 
 #: ../gtk/sip_account.ui.h:11
-#, fuzzy
 msgid "Transport"
-msgstr "Contactlijst"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:12
 msgid "Register"
 msgstr ""
 
 #: ../gtk/sip_account.ui.h:13
-#, fuzzy
 msgid "Publish presence information"
-msgstr "Toon informatie over aanwezigheid:"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:14
-#, fuzzy
 msgid "Enable AVPF"
-msgstr "Aan"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:15
 msgid "Configure a SIP account"
@@ -1216,14 +1141,12 @@ msgid "CIF"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:8
-#, fuzzy
 msgid "Audio codecs"
-msgstr "Video codecs"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:9
-#, fuzzy
 msgid "Video codecs"
-msgstr "Video codecs"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:10 ../gtk/keypad.ui.h:5
 msgid "C"
@@ -1258,9 +1181,8 @@ msgid "Use IPv6 instead of IPv4"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:18
-#, fuzzy
 msgid "<b>Transport</b>"
-msgstr "Contactlijst"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:19
 msgid "Media encryption type"
@@ -1291,14 +1213,12 @@ msgid "DSCP fields"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:26
-#, fuzzy
 msgid "SIP/TCP port"
-msgstr "SIP-poort"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:27
-#, fuzzy
 msgid "SIP/UDP port"
-msgstr "SIP-poort"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:28
 msgid "<b>Network protocol and ports</b>"
@@ -1325,76 +1245,64 @@ msgid "Behind NAT / Firewall (use uPnP)"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:34
-#, fuzzy
 msgid "Public IP address:"
-msgstr "SIP-adres:"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:35
-#, fuzzy
 msgid "Stun server:"
-msgstr "Geluidsapparaat"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:36
-#, fuzzy
 msgid "<b>NAT and Firewall</b>"
-msgstr "Contactlijst"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:37
-#, fuzzy
 msgid "Network settings"
-msgstr "Netwerk"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:38
-#, fuzzy
 msgid "Ring sound:"
-msgstr "Belgeluid:"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:39
 msgid "ALSA special device (optional):"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:40
-#, fuzzy
 msgid "Capture device:"
-msgstr "Geluidsapparaat gebruiken:"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:41
-#, fuzzy
 msgid "Ring device:"
-msgstr "Geluidsapparaat gebruiken:"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:42
-#, fuzzy
 msgid "Playback device:"
-msgstr "Geluidsapparaat gebruiken:"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:43
 msgid "Enable echo cancellation"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:44
-#, fuzzy
 msgid "<b>Audio</b>"
-msgstr "Contactlijst"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:45
-#, fuzzy
 msgid "Video input device:"
-msgstr "Geluidsapparaat"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:46
 msgid "Prefered video resolution:"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:47
-#, fuzzy
 msgid "Video output method:"
-msgstr "Geluidsapparaat"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:48
-#, fuzzy
 msgid "<b>Video</b>"
-msgstr "Contactlijst"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:49
 msgid "Multimedia settings"
@@ -1409,28 +1317,24 @@ msgid "Your display name (eg: John Doe):"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:52
-#, fuzzy
 msgid "Your username:"
-msgstr "gebruikersnaam:"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:53
-#, fuzzy
 msgid "Your resulting SIP address:"
-msgstr "Uw SIP-adres:"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:54
-#, fuzzy
 msgid "<b>Default identity</b>"
-msgstr "SIP-identiteit:"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:55
 msgid "Wizard"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:56
-#, fuzzy
 msgid "Add"
-msgstr "Adres"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:57
 msgid "Edit"
@@ -1441,18 +1345,16 @@ msgid "Remove"
 msgstr "Verwijderen"
 
 #: ../gtk/parameters.ui.h:59
-#, fuzzy
 msgid "<b>Proxy accounts</b>"
-msgstr "Contactlijst"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:60
 msgid "Erase all passwords"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:61
-#, fuzzy
 msgid "<b>Privacy</b>"
-msgstr "Contactlijst"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:62
 msgid "Manage SIP Accounts"
@@ -1467,23 +1369,20 @@ msgid "Disable"
 msgstr "Uit"
 
 #: ../gtk/parameters.ui.h:65
-#, fuzzy
 msgid "<b>Codecs</b>"
-msgstr "Contactlijst"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:66
 msgid "0 stands for \"unlimited\""
 msgstr ""
 
 #: ../gtk/parameters.ui.h:67
-#, fuzzy
 msgid "Upload speed limit in Kbit/sec:"
-msgstr "Upload bandbreedte (kbit/sec):"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:68
-#, fuzzy
 msgid "Download speed limit in Kbit/sec:"
-msgstr "Download bandbreedte (kbit/sec):"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:69
 msgid "Enable adaptive rate control"
@@ -1500,84 +1399,72 @@ msgid "<b>Bandwidth control</b>"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:72
-#, fuzzy
 msgid "Codecs"
-msgstr "Codecs"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:73
-#, fuzzy
 msgid "<b>Language</b>"
-msgstr "Contactlijst"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:74
 msgid "Show advanced settings"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:75
-#, fuzzy
 msgid "<b>Level</b>"
-msgstr "Contactlijst"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:76
-#, fuzzy
 msgid "User interface"
-msgstr "gebruikersnaam:"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:77 ../gtk/ldap.ui.h:2
-#, fuzzy
 msgid "Server address:"
-msgstr "Serveradres"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:78 ../gtk/ldap.ui.h:3
-#, fuzzy
 msgid "Authentication method:"
-msgstr "Authorisatie gegevens"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:80
 msgid "label"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:81
-#, fuzzy
 msgid "<b>LDAP Account setup</b>"
-msgstr "Contactlijst"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:82
 msgid "LDAP"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:83
-#, fuzzy
 msgid "Done"
-msgstr "Weg"
+msgstr ""
 
 #: ../gtk/buddylookup.ui.h:1
-#, fuzzy
 msgid "Search contacts in directory"
-msgstr "Contact informatie"
+msgstr ""
 
 #: ../gtk/buddylookup.ui.h:2
 msgid "Add to my list"
 msgstr ""
 
 #: ../gtk/buddylookup.ui.h:3
-#, fuzzy
 msgid "<b>Search somebody</b>"
-msgstr "Contactlijst"
+msgstr ""
 
 #: ../gtk/waiting.ui.h:1
-#, fuzzy
 msgid "Linphone"
-msgstr "linphone"
+msgstr ""
 
 #: ../gtk/waiting.ui.h:2
 msgid "Please wait"
 msgstr ""
 
 #: ../gtk/dscp_settings.ui.h:1
-#, fuzzy
 msgid "DSCP settings"
-msgstr "Netwerk"
+msgstr ""
 
 #: ../gtk/dscp_settings.ui.h:2
 msgid "SIP"
@@ -1596,19 +1483,16 @@ msgid "<b>Set DSCP values (in hexadecimal)</b>"
 msgstr ""
 
 #: ../gtk/call_statistics.ui.h:1
-#, fuzzy
 msgid "Call statistics"
-msgstr "Oproepgeschiedenis"
+msgstr ""
 
 #: ../gtk/call_statistics.ui.h:2
-#, fuzzy
 msgid "Audio codec"
-msgstr "Video codecs"
+msgstr ""
 
 #: ../gtk/call_statistics.ui.h:3
-#, fuzzy
 msgid "Video codec"
-msgstr "Video codecs"
+msgstr ""
 
 #: ../gtk/call_statistics.ui.h:4
 msgid "Audio IP bandwidth usage"
@@ -1627,9 +1511,8 @@ msgid "Video Media connectivity"
 msgstr ""
 
 #: ../gtk/call_statistics.ui.h:8
-#, fuzzy
 msgid "Round trip time"
-msgstr "Geluidseigenschappen"
+msgstr ""
 
 #: ../gtk/call_statistics.ui.h:9
 msgid "Video resolution received"
@@ -1644,9 +1527,8 @@ msgid "RTP profile"
 msgstr ""
 
 #: ../gtk/call_statistics.ui.h:12
-#, fuzzy
 msgid "<b>Call statistics and information</b>"
-msgstr "Contact informatie"
+msgstr ""
 
 #: ../gtk/tunnel_config.ui.h:1
 msgid "Configure VoIP tunnel"
@@ -1729,23 +1611,20 @@ msgid "1"
 msgstr "1"
 
 #: ../gtk/ldap.ui.h:1
-#, fuzzy
 msgid "LDAP Settings"
-msgstr "Netwerk"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:6
 msgid "Use TLS Connection"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:7
-#, fuzzy
 msgid "Not yet available"
-msgstr "Geen informatie beschikbaar"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:8
-#, fuzzy
 msgid "<b>Connection</b>"
-msgstr "Contactlijst"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:9
 msgid "Bind DN"
@@ -1756,14 +1635,12 @@ msgid "Authname"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:11
-#, fuzzy
 msgid "Realm"
-msgstr "gebied:"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:12
-#, fuzzy
 msgid "<b>SASL</b>"
-msgstr "Contactlijst"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:13
 msgid "Base object:"
@@ -1779,18 +1656,16 @@ msgid "Name Attribute:"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:17
-#, fuzzy
 msgid "SIP address attribute:"
-msgstr "Adres"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:18
 msgid "Attributes to query:"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:19
-#, fuzzy
 msgid "<b>Search</b>"
-msgstr "Contactlijst"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:20
 msgid "Timeout for search:"
@@ -1805,9 +1680,8 @@ msgid "Follow Aliases"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:23
-#, fuzzy
 msgid "<b>Miscellaneous</b>"
-msgstr "Contactlijst"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:24
 msgid "ANONYMOUS"
@@ -1831,11 +1705,8 @@ msgstr ""
 
 #: ../gtk/config-uri.ui.h:2
 msgid ""
-"This dialog allows to set an http or https address when configuration is to "
-"be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, "
-"Linphone will restart automatically in order to fetch and take into account "
-"the new configuration. "
+"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
 msgstr ""
 
 #: ../gtk/config-uri.ui.h:4
@@ -1843,86 +1714,79 @@ msgid "https://"
 msgstr ""
 
 #: ../gtk/provisioning-fetch.ui.h:1
-#, fuzzy
 msgid "Configuring..."
-msgstr "Verbinden"
+msgstr ""
 
 #: ../gtk/provisioning-fetch.ui.h:2
 msgid "Please wait while fetching configuration from server..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1034
+#: ../coreapi/linphonecore.c:1511
 msgid "Ready"
 msgstr "Gereed."
 
-#: ../coreapi/linphonecore.c:1967
-#, fuzzy
+#: ../coreapi/linphonecore.c:2470
 msgid "Configuring"
-msgstr "Informatie"
+msgstr ""
 
-#: ../coreapi/linphonecore.c:2133
+#: ../coreapi/linphonecore.c:2635
 msgid "Looking for telephone number destination..."
 msgstr "Zoekt de lokatie van het telefoonnummer..."
 
-#: ../coreapi/linphonecore.c:2136
+#: ../coreapi/linphonecore.c:2637
 msgid "Could not resolve this number."
 msgstr "Kon dit nummer niet vinden."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2418
+#: ../coreapi/linphonecore.c:2919
 msgid "Contacting"
 msgstr "Verbinden"
 
-#: ../coreapi/linphonecore.c:2425
-#, fuzzy
+#: ../coreapi/linphonecore.c:2924
 msgid "Could not call"
-msgstr "Kon niet oproepen"
+msgstr ""
 
-#: ../coreapi/linphonecore.c:2576
+#: ../coreapi/linphonecore.c:3074
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2745
-#, fuzzy
+#: ../coreapi/linphonecore.c:3233
 msgid "is contacting you"
-msgstr "belt u."
+msgstr ""
 
-#: ../coreapi/linphonecore.c:2746
+#: ../coreapi/linphonecore.c:3234
 msgid " and asked autoanswer."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2746
+#: ../coreapi/linphonecore.c:3234
 msgid "."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2865
+#: ../coreapi/linphonecore.c:3352
 msgid "Modifying call parameters..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3194
+#: ../coreapi/linphonecore.c:3700
 msgid "Connected."
 msgstr "Verbonden."
 
-#: ../coreapi/linphonecore.c:3220
-#, fuzzy
+#: ../coreapi/linphonecore.c:3725
 msgid "Call aborted"
-msgstr "afgebroken"
+msgstr ""
 
-#: ../coreapi/linphonecore.c:3412
-#, fuzzy
+#: ../coreapi/linphonecore.c:3915
 msgid "Could not pause the call"
-msgstr "Kon niet oproepen"
+msgstr ""
 
-#: ../coreapi/linphonecore.c:3417
-#, fuzzy
+#: ../coreapi/linphonecore.c:3919
 msgid "Pausing the current call..."
-msgstr "Kon niet oproepen"
+msgstr ""
 
-#: ../coreapi/misc.c:425
+#: ../coreapi/misc.c:438
 msgid "Stun lookup in progress..."
 msgstr "STUN adres wordt opgezocht..."
 
-#: ../coreapi/misc.c:607
+#: ../coreapi/misc.c:619
 msgid "ICE local candidates gathering in progress..."
 msgstr ""
 
@@ -1935,789 +1799,183 @@ msgid "Busy"
 msgstr "Bezet"
 
 #: ../coreapi/friend.c:39
-#, fuzzy
 msgid "Be right back"
-msgstr "Kom zo terug"
+msgstr ""
 
 #: ../coreapi/friend.c:42
 msgid "Away"
 msgstr "Afwezig"
 
 #: ../coreapi/friend.c:45
-#, fuzzy
 msgid "On the phone"
-msgstr "Aan de telefoon"
+msgstr ""
 
 #: ../coreapi/friend.c:48
-#, fuzzy
 msgid "Out to lunch"
-msgstr "Aan het lunchen"
+msgstr ""
 
 #: ../coreapi/friend.c:51
 msgid "Do not disturb"
 msgstr "Niet storen"
 
 #: ../coreapi/friend.c:54
-#, fuzzy
 msgid "Moved"
-msgstr "Codecs"
+msgstr ""
 
 #: ../coreapi/friend.c:57
 msgid "Using another messaging service"
 msgstr ""
 
 #: ../coreapi/friend.c:60
-#, fuzzy
 msgid "Offline"
-msgstr "Aanwezig"
+msgstr ""
 
 #: ../coreapi/friend.c:63
 msgid "Pending"
 msgstr ""
 
 #: ../coreapi/friend.c:66
-#, fuzzy
 msgid "Vacation"
-msgstr "Informatie"
+msgstr ""
 
 #: ../coreapi/friend.c:68
 msgid "Unknown-bug"
 msgstr ""
 
-#: ../coreapi/proxy.c:314
+#: ../coreapi/proxy.c:319
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
 msgstr ""
 
-#: ../coreapi/proxy.c:320
+#: ../coreapi/proxy.c:325
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
 msgstr ""
 
-#: ../coreapi/proxy.c:1369
-#, fuzzy, c-format
+#: ../coreapi/proxy.c:1377
+#, c-format
 msgid "Could not login as %s"
-msgstr "Kon pixmap bestand %s niet vinden"
+msgstr ""
 
-#: ../coreapi/callbacks.c:355
-#, fuzzy
+#: ../coreapi/callbacks.c:383
 msgid "Remote ringing."
-msgstr "Externe diensten"
+msgstr ""
 
-#: ../coreapi/callbacks.c:373
-#, fuzzy
+#: ../coreapi/callbacks.c:404
 msgid "Remote ringing..."
-msgstr "Externe diensten"
+msgstr ""
 
-#: ../coreapi/callbacks.c:384
+#: ../coreapi/callbacks.c:414
 msgid "Early media."
 msgstr ""
 
-#: ../coreapi/callbacks.c:435
-#, fuzzy, c-format
+#: ../coreapi/callbacks.c:475
+#, c-format
 msgid "Call with %s is paused."
-msgstr "Chat met %s"
+msgstr ""
 
-#: ../coreapi/callbacks.c:448
+#: ../coreapi/callbacks.c:488
 #, c-format
 msgid "Call answered by %s - on hold."
 msgstr ""
 
-#: ../coreapi/callbacks.c:459
-#, fuzzy
+#: ../coreapi/callbacks.c:498
 msgid "Call resumed."
-msgstr "Oproep beeindigd"
+msgstr ""
 
-#: ../coreapi/callbacks.c:464
-#, fuzzy, c-format
+#: ../coreapi/callbacks.c:502
+#, c-format
 msgid "Call answered by %s."
 msgstr ""
-"Oproepen of\n"
-"beantwoorden"
 
-#: ../coreapi/callbacks.c:483
+#: ../coreapi/callbacks.c:525
 msgid "Incompatible, check codecs or security settings..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:512
+#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:826
+msgid "Incompatible media parameters."
+msgstr ""
+
+#: ../coreapi/callbacks.c:560
 msgid "We have been resumed."
 msgstr ""
 
-#: ../coreapi/callbacks.c:521
+#. we are being paused
+#: ../coreapi/callbacks.c:568
 msgid "We are paused by other party."
 msgstr ""
 
-#: ../coreapi/callbacks.c:556
+#. reINVITE and in-dialogs UPDATE go here
+#: ../coreapi/callbacks.c:602
 msgid "Call is updated by remote."
 msgstr ""
 
-#: ../coreapi/callbacks.c:658
+#: ../coreapi/callbacks.c:705
 msgid "Call terminated."
 msgstr "Oproep beeindigd."
 
-#: ../coreapi/callbacks.c:687
+#: ../coreapi/callbacks.c:733
 msgid "User is busy."
 msgstr "Gebruiker is bezet."
 
-#: ../coreapi/callbacks.c:688
+#: ../coreapi/callbacks.c:734
 msgid "User is temporarily unavailable."
 msgstr "Gebruiker is tijdelijk niet beschikbaar."
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:690
+#: ../coreapi/callbacks.c:736
 msgid "User does not want to be disturbed."
 msgstr "De gebruiker wenst niet gestoord te worden."
 
-#: ../coreapi/callbacks.c:691
+#: ../coreapi/callbacks.c:737
 msgid "Call declined."
 msgstr "Oproep geweigerd."
 
-#: ../coreapi/callbacks.c:706
+#: ../coreapi/callbacks.c:752
 msgid "Request timeout."
 msgstr ""
 
-#: ../coreapi/callbacks.c:737
-#, fuzzy
+#: ../coreapi/callbacks.c:780
 msgid "Redirected"
-msgstr "Doorgeschakeld naar %s..."
-
-#: ../coreapi/callbacks.c:787
-msgid "Incompatible media parameters."
 msgstr ""
 
-#: ../coreapi/callbacks.c:798
-#, fuzzy
+#: ../coreapi/callbacks.c:835
 msgid "Call failed."
-msgstr "Oproep geannuleerd."
+msgstr ""
 
-#: ../coreapi/callbacks.c:878
+#: ../coreapi/callbacks.c:913
 #, c-format
 msgid "Registration on %s successful."
 msgstr "Registratie op %s gelukt."
 
-#: ../coreapi/callbacks.c:879
-#, fuzzy, c-format
+#: ../coreapi/callbacks.c:914
+#, c-format
 msgid "Unregistration on %s done."
-msgstr "Registratie op %s gelukt."
+msgstr ""
 
-#: ../coreapi/callbacks.c:897
+#: ../coreapi/callbacks.c:932
 msgid "no response timeout"
 msgstr ""
 
-#: ../coreapi/callbacks.c:900
-#, fuzzy, c-format
+#: ../coreapi/callbacks.c:935
+#, c-format
 msgid "Registration on %s failed: %s"
-msgstr "Registratie op %s mislukt (time-out)."
+msgstr ""
 
-#: ../coreapi/callbacks.c:907
+#: ../coreapi/callbacks.c:942
 msgid "Service unavailable, retrying"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:177
-#, fuzzy, c-format
+#: ../coreapi/linphonecall.c:174
+#, c-format
 msgid "Authentication token is %s"
-msgstr "Authorisatie gegevens"
+msgstr ""
 
-#: ../coreapi/linphonecall.c:2932
-#, fuzzy, c-format
+#: ../coreapi/linphonecall.c:3020
+#, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
-msgstr[0] "U heeft %i oproep(en) gemist."
-msgstr[1] "U heeft %i oproep(en) gemist."
-
-#~ msgid "aborted"
-#~ msgstr "afgebroken"
-
-#~ msgid "completed"
-#~ msgstr "voltooid"
-
-#~ msgid "missed"
-#~ msgstr "gemist"
-
-#~ msgid ""
-#~ "%s at %s\n"
-#~ "From: %s\n"
-#~ "To: %s\n"
-#~ "Status: %s\n"
-#~ "Duration: %i mn %i sec\n"
-#~ msgstr ""
-#~ "%s op %s\n"
-#~ "Van: %s\n"
-#~ "Aan: %s\n"
-#~ "Status: %s\n"
-#~ "Tijdsduur: %i mins %i secs\n"
-
-#~ msgid "Outgoing call"
-#~ msgstr "Uitgaande oproep"
-
-#~ msgid ""
-#~ "Could not parse given sip address. A sip url usually looks like sip:"
-#~ "user@domain"
-#~ msgstr ""
-#~ "Slecht geformuleerd SIP-adres. Een SIP-adres ziet er uit als sip:"
-#~ "gebruikersnaam@domeinnaam"
-
-#~ msgid ""
-#~ "Your computer appears to be using ALSA sound drivers.\n"
-#~ "This is the best choice. However the pcm oss emulation module\n"
-#~ "is missing and linphone needs it. Please execute\n"
-#~ "'modprobe snd-pcm-oss' as root to load it."
-#~ msgstr ""
-#~ "Uw computer maakt schijnbaar gebruik van ALSA geluidsdrivers.\n"
-#~ "Dit is de beste keuze. Maar de pcm oss emulatie module mist\n"
-#~ "en linphone heeft deze nodig. Geeft u alstublieft het commando\n"
-#~ "'modprobe snd-pcm-oss' als root om de module te laden."
-
-#~ msgid ""
-#~ "Your computer appears to be using ALSA sound drivers.\n"
-#~ "This is the best choice. However the mixer oss emulation module\n"
-#~ "is missing and linphone needs it. Please execute\n"
-#~ " 'modprobe snd-mixer-oss' as root to load it."
-#~ msgstr ""
-#~ "Uw computer maakt schijnbaar gebruik van ALSA geluidsdrivers.\n"
-#~ "Dit is de beste keuze. Maar de mixer oss emulatie module mist\n"
-#~ "en linphone heeft deze nodig. Geeft u alstublieft het commando\n"
-#~ "'modprobe snd-mixer-oss' als root om de module te laden."
-
-#~ msgid "Chat with %s"
-#~ msgstr "Chat met %s"
-
-#, fuzzy
-#~ msgid "Choosing a username"
-#~ msgstr "gebruikersnaam:"
-
-#, fuzzy
-#~ msgid "Enable video"
-#~ msgstr "Aan"
-
-#, fuzzy
-#~ msgid "Unmute"
-#~ msgstr "Ongelimiteerd"
-
-#, fuzzy
-#~ msgid "<b>Contact list</b>"
-#~ msgstr "Contactlijst"
-
-#, fuzzy
-#~ msgid "Audio & video"
-#~ msgstr "Audio codecs"
-
-#, fuzzy
-#~ msgid "Audio only"
-#~ msgstr "Audio codecs"
-
-#, fuzzy
-#~ msgid "Duration:"
-#~ msgstr "Informatie"
-
-#, fuzzy
-#~ msgid "_Call history"
-#~ msgstr "Linphone - Oproepgeschiedenis"
-
-#, fuzzy
-#~ msgid "_Linphone"
-#~ msgstr "linphone"
-
-#, fuzzy
-#~ msgid "gtk-cancel"
-#~ msgstr "Verbonden."
-
-#, fuzzy
-#~ msgid "gtk-ok"
-#~ msgstr "Verwijderen"
-
-#, fuzzy
-#~ msgid "gtk-close"
-#~ msgstr "Verbonden."
-
-#~ msgid ""
-#~ "Your machine appears to be connected to an IPv6 network. By default "
-#~ "linphone always uses IPv4. Please update your configuration if you want "
-#~ "to use IPv6"
-#~ msgstr ""
-#~ "Uw machine lijkt verbonden te zijn met een IPv6 netwerk. Standaard "
-#~ "gebruikt linphone altijd IPv4. Wijzig uw configuratie wanneer u IPv6 wilt "
-#~ "gebruiken."
-
-#, fuzzy
-#~ msgid "_Modes"
-#~ msgstr "Codecs"
-
-#~ msgid "Accept"
-#~ msgstr "Accepteren"
-
-#, fuzzy
-#~ msgid "Incoming call from"
-#~ msgstr "Inkomende oproep"
-
-#, fuzzy
-#~ msgid "Linphone - Incoming call"
-#~ msgstr "Inkomende oproep"
-
-#, fuzzy
-#~ msgid ""
-#~ "Audio codecs\n"
-#~ "Video codecs"
-#~ msgstr "Audio en video codecs"
-
-#~ msgid "Sorry, having multiple simultaneous calls is not supported yet !"
-#~ msgstr ""
-#~ "Helaas, meerdere gelijktijdige gesprekken wordt nog niet ondersteund!"
-
-#~ msgid "Could not reach destination."
-#~ msgstr "Kon bestemming niet bereiken."
-
-#~ msgid "Request Cancelled."
-#~ msgstr "Verzoek geannuleerd."
-
-#~ msgid "Bad request"
-#~ msgstr "Slecht geformuleerd verzoek"
-
-#~ msgid "User cannot be found at given address."
-#~ msgstr "Gebruiker kan niet worden gevonden bij opgegeven adres."
-
-#~ msgid "Remote user cannot support any of proposed codecs."
-#~ msgstr "De externe gebruiker ondersteunt geen van de voorgestelde codecs."
-
-#~ msgid "Timeout."
-#~ msgstr "Time-out."
-
-#~ msgid "Remote host was found but refused connection."
-#~ msgstr "Externe machine is gevonden, maar verbinding is geweigerd."
-
-#~ msgid ""
-#~ "User is not reachable at the moment but he invites you\n"
-#~ "to contact him using the following alternate resource:"
-#~ msgstr ""
-#~ "De gebruiker is op dit moment niet bereikbaar, maar hij nodigt u uit om\n"
-#~ "op de volgende, alternatieve, manier contact met hem op te nemen:"
-
-#~ msgid "No nat/firewall address supplied !"
-#~ msgstr "Geen NAT/firewall adres opgegeven"
-
-#~ msgid "Invalid nat address '%s' : %s"
-#~ msgstr "Ongeldig NAT adres '%s' : %s"
-
-#~ msgid "Gone"
-#~ msgstr "Weg"
-
-#~ msgid "Waiting for Approval"
-#~ msgstr "Wachten op accoord"
-
-#~ msgid "Be Right Back"
-#~ msgstr "Kom zo terug"
-
-#~ msgid "On The Phone"
-#~ msgstr "Aan de telefoon"
-
-#~ msgid "Out To Lunch"
-#~ msgstr "Aan het lunchen"
-
-#~ msgid "Closed"
-#~ msgstr "Gesloten"
-
-#, fuzzy
-#~ msgid "_View"
-#~ msgstr "Video"
-
-#, fuzzy
-#~ msgid "_Properties"
-#~ msgstr "RTP-eigenschappen"
-
-#, fuzzy
-#~ msgid "Show logs"
-#~ msgstr "Oproepen weergeven"
-
-#, fuzzy
-#~ msgid "_About"
-#~ msgstr "Account"
-
-#, fuzzy
-#~ msgid "Proxy in use"
-#~ msgstr "Te gebruiken proxy:"
-
-#~ msgid "Sound"
-#~ msgstr "Geluid"
-
-#, fuzzy
-#~ msgid "Proxy accounts"
-#~ msgstr "Te gebruiken proxy:"
-
-#~ msgid "Go"
-#~ msgstr "Ga"
-
-#~ msgid "Exit"
-#~ msgstr "Einde"
-
-#~ msgid "Shows the address book"
-#~ msgstr "Het adresboek weergeven"
-
-#~ msgid "..."
-#~ msgstr "..."
-
-#~ msgid ""
-#~ "Hangup\n"
-#~ "or refuse"
-#~ msgstr ""
-#~ "Ophangen\n"
-#~ "of weigeren"
-
-#~ msgid "Or chat !"
-#~ msgstr "Of chat!"
-
-#~ msgid "Show more..."
-#~ msgstr "Meer weergeven..."
-
-#~ msgid "Playback level:"
-#~ msgstr "Geluidssterkte afspelen:"
-
-#~ msgid "Recording level:"
-#~ msgstr "Geluidssterkte opname:"
-
-#, fuzzy
-#~ msgid "Ring level:"
-#~ msgstr "Geluidssterkte opname:"
-
-#~ msgid "Controls"
-#~ msgstr "Functies"
-
-#~ msgid "Reachable"
-#~ msgstr "Bereikbaar"
-
-#~ msgid "Busy, I'll be back in "
-#~ msgstr "Bezig; ik ben terug over "
-
-#~ msgid "The other party will be informed that you'll be back in X minutes"
-#~ msgstr ""
-#~ "De andere partij zal worden geïnformeerd dat u over X minuten terug bent"
-
-#~ msgid "mn"
-#~ msgstr "min"
-
-#~ msgid "Moved temporarily"
-#~ msgstr "Tijdelijk verplaatst"
-
-#~ msgid "Alternative service"
-#~ msgstr "Alternatieve dienst"
-
-#~ msgid "URL:"
-#~ msgstr "URL:"
-
-#~ msgid "Presence"
-#~ msgstr "Aanwezigheid"
-
-#~ msgid "Press digits to send DTMFs."
-#~ msgstr "Druk op de cijfers om DTMF's te sturen"
-
-#~ msgid ""
-#~ "  3\n"
-#~ "def"
-#~ msgstr ""
-#~ "  3\n"
-#~ "def"
-
-#~ msgid ""
-#~ "  2\n"
-#~ "abc"
-#~ msgstr ""
-#~ "  2\n"
-#~ "abc"
-
-#~ msgid ""
-#~ "  4\n"
-#~ "ghi"
-#~ msgstr ""
-#~ "  4\n"
-#~ "ghi"
-
-#~ msgid ""
-#~ " 5\n"
-#~ "jkl"
-#~ msgstr ""
-#~ " 5\n"
-#~ "jkl"
-
-#~ msgid ""
-#~ "  6\n"
-#~ "mno"
-#~ msgstr ""
-#~ "  6\n"
-#~ "mno"
-
-#~ msgid ""
-#~ "   7\n"
-#~ "pqrs"
-#~ msgstr ""
-#~ "   7\n"
-#~ "pqrs"
-
-#~ msgid ""
-#~ "  8\n"
-#~ "tuv"
-#~ msgstr ""
-#~ "  8\n"
-#~ "tuv"
-
-#~ msgid ""
-#~ "   9\n"
-#~ "wxyz"
-#~ msgstr ""
-#~ "   9\n"
-#~ "wxyz"
-
-#~ msgid "DTMF"
-#~ msgstr "DTMF"
-
-#~ msgid "My online friends"
-#~ msgstr "Mijn online vrienden"
-
-#~ msgid ""
-#~ "C: 2001\n"
-#~ "Made in Old Europe"
-#~ msgstr ""
-#~ "C: 2001\n"
-#~ "Gemaakt in antiek Europa"
-
-#~ msgid ""
-#~ "Linphone is a web-phone.\n"
-#~ "It is compatible with SIP and RTP protocols."
-#~ msgstr ""
-#~ "Linphone is een webtelefoon.\n"
-#~ "Het werkt met de SIP- en RTP-protocollen."
-
-#~ msgid "http://www.linphone.org"
-#~ msgstr "http://www.linphone.org"
-
-#~ msgid "Use IPv6 network (if available)"
-#~ msgstr "Gebruik IPv6 netwerk (wanneer het beschikbaar is)"
-
-#~ msgid ""
-#~ "Toggle this if you are on an ipv6 network and you wish linphone to use it."
-#~ msgstr ""
-#~ "Wijzig dit wanneer u op een IPv6 netwerk zit en linphone daarop wilt "
-#~ "gebruiken."
-
-#~ msgid "Global"
-#~ msgstr "Globaal"
-
-#~ msgid ""
-#~ "These options is only for users in a private network, behind a gateway. "
-#~ "If you are not in this situation, then leave this empty."
-#~ msgstr ""
-#~ "Deze optie is alleen voor gebruikers in een lokaal netwerk, achter een "
-#~ "gateway: Wanneer u niet in deze situatie zit, laat dit dan leeg."
-
-#~ msgid "No firewall"
-#~ msgstr "Geen firewall"
-
-#~ msgid "Use this STUN server to guess firewall address :"
-#~ msgstr "Gebruik deze STUN server om het firewall adres te achterhalen"
-
-#~ msgid "Specify firewall address manually:"
-#~ msgstr "Geef het firewall adres handmatig op"
-
-#~ msgid "NAT traversal options (experimental)"
-#~ msgstr "NAT-doorstuur opties (experimenteel)"
-
-#~ msgid "Number of buffered miliseconds (jitter compensation):"
-#~ msgstr "Aantal gebufferde miliseconden (jitter compensatie):"
-
-#~ msgid "RTP port used for audio:"
-#~ msgstr "RTP-poort voor geluid:"
-
-#~ msgid "Use SIP INFO message instead of RTP rfc2833 for DTMF transmitting"
-#~ msgstr ""
-#~ "Gebruik SIP INFO bericht in plaats van RTP rfc2833 voor DTMF berichten"
-
-#~ msgid "RTP-RFC2833 is the recommended way."
-#~ msgstr "RTP-RFC2833 is de aanbevolen manier."
-
-#~ msgid "Other"
-#~ msgstr "Overige"
-
-#~ msgid "micro"
-#~ msgstr "microfoon"
-
-#~ msgid "Enable echo-canceler (cancels the echo heard by the remote party)"
-#~ msgstr ""
-#~ "Activeer de echo-onderdrukking (onderdrukt de echo die de andere partij "
-#~ "hoort)"
-
-#~ msgid "Choose file"
-#~ msgstr "Kies bestand"
-
-#~ msgid "Listen"
-#~ msgstr "Luisteren"
-
-#~ msgid "Run sip user agent on port:"
-#~ msgstr "Start SIP gebruikerssysteem op poort:"
-
-#~ msgid "It is strongly recommended to use port 5060."
-#~ msgstr "Het wordt sterk aangeraden om poort 5060 te gebruiken."
-
-#~ msgid "@"
-#~ msgstr "@"
-
-#~ msgid "Identity"
-#~ msgstr "Identiteit"
-
-#~ msgid "Add proxy/registrar"
-#~ msgstr "Voeg proxy/registratieserver toe"
-
-#~ msgid "Clear all stored authentication information (username,password...)"
-#~ msgstr ""
-#~ "Schoon alle opgeslagen authorisatie gegevens op (gebruikersnaam, "
-#~ "wachtwoord...)"
-
-#~ msgid "List of audio codecs, in order of preference:"
-#~ msgstr "Lijst met audio codecs, in volgorde van voorkeur:"
-
-#~ msgid ""
-#~ "Note: Codecs in red are not usable regarding to your connection type to "
-#~ "the internet."
-#~ msgstr ""
-#~ "Opmerking: Met rood weergegeven codecs zijn niet bruikbaar vanwege het "
-#~ "soort internetverbinding dat u heeft"
-
-#~ msgid "Codec information"
-#~ msgstr "Codec informatie"
-
-#~ msgid "Address Book"
-#~ msgstr "Adresboek"
-
-#~ msgid "Select"
-#~ msgstr "Kiezen"
-
-#~ msgid ""
-#~ "User is not reachable at the moment but he invites you to contact him "
-#~ "using the following alternate ressource:"
-#~ msgstr ""
-#~ "De gebruiker is op dit moment niet bereikbaar, maar hij nodigt u uit op "
-#~ "de volgende, alternatieve, manier contact met hem op te nemen:"
-
-#~ msgid "None."
-#~ msgstr "Geen."
-
-#~ msgid "Send registration:"
-#~ msgstr "Verstruur registratie:"
-
-#~ msgid "Name:"
-#~ msgstr "Naam:"
-
-#~ msgid "Subscribe policy:"
-#~ msgstr "Aanmeldbeleid:"
-
-#~ msgid "Send subscription (see person's online status)"
-#~ msgstr "Verstruur aanmelding (bekijk de online status van een persoon)"
-
-#~ msgid "New incoming subscription"
-#~ msgstr "Nieuwe inkomende aanmelding"
-
-#~ msgid "You have received a new subscription..."
-#~ msgstr "U heeft een nieuwe aanmelding ontvangen..."
-
-#~ msgid "Refuse"
-#~ msgstr "Weigeren"
-
-#~ msgid "Authentication required for realm"
-#~ msgstr "Authorisatie benodigd voor gebied"
-
-#~ msgid "userid:"
-#~ msgstr "gebruikersID:"
-
-#~ msgid "Text:"
-#~ msgstr "Tekst:"
-
-#~ msgid "The caller asks for resource reservation. Do you agree ?"
-#~ msgstr "De beller vraagt om reservering van bronnen. Gaat u accoord?"
-
-#~ msgid ""
-#~ "The caller doesn't use resource reservation. \t\t\t\t\tDo you wish to "
-#~ "continue anyway ?"
-#~ msgstr ""
-#~ "De beller gebruikt geen bron reservatie. \t\t\t\t\tWilt u toch doorgaan?"
-
-#~ msgid "linphone - receiving call from %s"
-#~ msgstr "Linphone - binnenkomend gesprek van %s"
-
-#~ msgid ""
-#~ "You have received a subscription from %s.This means that this person "
-#~ "wishes to be notified of your presence information (online, busy, "
-#~ "away...).\n"
-#~ "Do you agree ?"
-#~ msgstr ""
-#~ "U heeft een aanmelding ontvangen van %s. Dit betekent dat deze persoon "
-#~ "een melding wil ontvangen wat betreft uw status (online, bezig, weg...).\n"
-#~ "Gaat u accoord?"
-
-#~ msgid "Authentication required for realm %s"
-#~ msgstr "Authorisatie benodigd voor gebied %s"
-
-#~ msgid "Wait"
-#~ msgstr "Wachten"
-
-#~ msgid "Deny"
-#~ msgstr "Weigeren"
-
-#~ msgid "Bad sip address: a sip address looks like sip:user@domain"
-#~ msgstr ""
-#~ "Slecht geformuleerd SIP-adres. Een SIP-adres ziet er uit als sip:"
-#~ "gebruikersnaam@domeinnaam"
-
-#~ msgid "Stun lookup done..."
-#~ msgstr "STUN adres gevonden..."
-
-#~ msgid "User manual"
-#~ msgstr "Handleiding"
-
-#~ msgid "Ring sound selection"
-#~ msgstr "Belgeluid keuze"
-
-#~ msgid "Communication ended."
-#~ msgstr "Communicatie beëindigd."
-
-#~ msgid "Firewall 's external ip address (in dot notations):"
-#~ msgstr "Extern IP adres van de firewall (in  x.x.x.x notatie):"
-
-#~ msgid "Index"
-#~ msgstr "Index"
-
-#~ msgid "28k modem"
-#~ msgstr "28k modem"
-
-#~ msgid "56k modem"
-#~ msgstr "56k modem"
-
-#~ msgid "64k modem (numeris)"
-#~ msgstr "64k modem (ISDN)"
-
-#~ msgid "ADSL or Cable modem"
-#~ msgstr "ADSL- of kabelmodem"
-
-#~ msgid "Ethernet or equivalent"
-#~ msgstr "Ethernet of vergelijkbaar"
-
-#~ msgid "Connection type:"
-#~ msgstr "Soort verbinding:"
-
-#~ msgid ""
-#~ "Linphone could not open audio device %s. Check if your sound card is "
-#~ "fully configured and working."
-#~ msgstr ""
-#~ "Linphone kon het geluidsapparaat %s niet openen. Controleer of uw "
-#~ "geluidskaart goed is ingesteld en werkt."
-
-#~ msgid "Type here the sip address of the person you want to call."
-#~ msgstr "Geef hier het SIP-adres op van de persoon die u wilt bellen."
-
-#~ msgid ""
-#~ "Release or\n"
-#~ "Refuse"
-#~ msgstr ""
-#~ "Ophangen\n"
-#~ "of weigeren"
-
-#~ msgid "%s. Retry after %i minute(s)."
-#~ msgstr "%s. Opnieuw proberen na %i minu(u)t(en)."
+msgstr[0] ""
+msgstr[1] ""
diff --git a/po/pl.po b/po/pl.po
index 62e06d793..794b0c996 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,19 +1,21 @@
-# SIP Telephony Application.
-# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
-# Simon Morlat <linphone@free.fr>, 2001.
-# 
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: linphone 0.7.1\n"
+"Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-15 09:24+0200\n"
-"PO-Revision-Date: 2003-08-22 12:50+0200\n"
-"Last-Translator: Robert Nasiadek <darkone@darkone.pl>\n"
-"Language-Team: Polski <pl@li.org>\n"
-"Language: \n"
+"POT-Creation-Date: 2014-11-19 10:39+0100\n"
+"PO-Revision-Date: 2014-11-19 10:08+0000\n"
+"Last-Translator: Cqnqrd <gautier.pelloux@gmail.com>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/linphone-gtk/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974
 #, c-format
@@ -26,27 +28,25 @@ msgid "Send text to %s"
 msgstr ""
 
 #: ../gtk/calllogs.c:232
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Recent calls (%i)</b>"
-msgstr "Dzwonie do "
+msgstr ""
 
 #: ../gtk/calllogs.c:314
 msgid "n/a"
 msgstr ""
 
 #: ../gtk/calllogs.c:317
-#, fuzzy
 msgid "Aborted"
-msgstr "Połączenie odwołane."
+msgstr ""
 
 #: ../gtk/calllogs.c:320
 msgid "Missed"
 msgstr ""
 
 #: ../gtk/calllogs.c:323
-#, fuzzy
 msgid "Declined"
-msgstr "linia"
+msgstr ""
 
 #: ../gtk/calllogs.c:329
 #, c-format
@@ -54,6 +54,7 @@ msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] ""
 msgstr[1] ""
+msgstr[2] ""
 
 #: ../gtk/calllogs.c:332
 #, c-format
@@ -61,6 +62,7 @@ msgid "%i second"
 msgid_plural "%i seconds"
 msgstr[0] ""
 msgstr[1] ""
+msgstr[2] ""
 
 #: ../gtk/calllogs.c:335 ../gtk/calllogs.c:341
 #, c-format
@@ -124,124 +126,110 @@ msgstr ""
 
 #: ../gtk/main.c:149
 msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: c:"
-"\\Program Files\\Linphone)"
+"Specifiy a working directory (should be the base of the installation, eg: "
+"c:\\Program Files\\Linphone)"
 msgstr ""
 
 #: ../gtk/main.c:156
-#, fuzzy
 msgid "Configuration file"
-msgstr "Informacja"
+msgstr ""
 
 #: ../gtk/main.c:163
 msgid "Run the audio assistant"
 msgstr ""
 
-#: ../gtk/main.c:590
-#, c-format
-msgid "Call with %s"
-msgstr ""
-
-#: ../gtk/main.c:1183
+#: ../gtk/main.c:1085
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
-"Would you allow him to see your presence status or add him to your contact "
-"list ?\n"
+"Would you allow him to see your presence status or add him to your contact list ?\n"
 "If you answer no, this person will be temporarily blacklisted."
 msgstr ""
 
-#: ../gtk/main.c:1260
+#: ../gtk/main.c:1162
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
 msgstr ""
 
-#: ../gtk/main.c:1376
-#, fuzzy
+#: ../gtk/main.c:1283
 msgid "Call error"
-msgstr "Połączenie odwołane."
+msgstr ""
 
-#: ../gtk/main.c:1379 ../coreapi/linphonecore.c:3240
-#, fuzzy
+#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3744
 msgid "Call ended"
-msgstr "Rozmowa odrzucona."
+msgstr ""
 
-#: ../gtk/main.c:1382
+#: ../gtk/main.c:1289
 msgid "Incoming call"
 msgstr ""
 
-#: ../gtk/main.c:1384 ../gtk/incall_view.c:522 ../gtk/main.ui.h:5
+#: ../gtk/main.c:1291 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
 msgid "Answer"
 msgstr ""
 
-#: ../gtk/main.c:1386 ../gtk/main.ui.h:6
-#, fuzzy
+#: ../gtk/main.c:1293 ../gtk/main.ui.h:6
 msgid "Decline"
-msgstr "linia"
+msgstr ""
 
-#: ../gtk/main.c:1392
-#, fuzzy
+#: ../gtk/main.c:1299
 msgid "Call paused"
-msgstr "Połączenie odwołane."
+msgstr ""
 
-#: ../gtk/main.c:1392
-#, fuzzy, c-format
+#: ../gtk/main.c:1299
+#, c-format
 msgid "<b>by %s</b>"
-msgstr "Dzwonie do "
+msgstr ""
 
-#: ../gtk/main.c:1459
+#: ../gtk/main.c:1366
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr ""
 
-#: ../gtk/main.c:1621
+#: ../gtk/main.c:1528
 msgid "Website link"
 msgstr ""
 
-#: ../gtk/main.c:1670
+#: ../gtk/main.c:1577
 msgid "Linphone - a video internet phone"
 msgstr ""
 
-#: ../gtk/main.c:1762
+#: ../gtk/main.c:1669
 #, c-format
 msgid "%s (Default)"
 msgstr ""
 
-#: ../gtk/main.c:2099 ../coreapi/callbacks.c:949
+#: ../gtk/main.c:2006 ../coreapi/callbacks.c:983
 #, c-format
 msgid "We are transferred to %s"
 msgstr ""
 
-#: ../gtk/main.c:2109
+#: ../gtk/main.c:2016
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
 msgstr ""
 
-#: ../gtk/main.c:2250
+#: ../gtk/main.c:2157
 msgid "A free SIP video-phone"
 msgstr ""
 
 #: ../gtk/friendlist.c:505
-#, fuzzy
 msgid "Add to addressbook"
-msgstr "Książka adresowa"
+msgstr ""
 
 #: ../gtk/friendlist.c:691
-#, fuzzy
 msgid "Presence status"
-msgstr "Obecność"
+msgstr ""
 
 #: ../gtk/friendlist.c:709 ../gtk/propertybox.c:552 ../gtk/contact.ui.h:1
 msgid "Name"
 msgstr "Nazwa"
 
 #: ../gtk/friendlist.c:721
-#, fuzzy
 msgid "Call"
-msgstr "Połączenie odwołane."
+msgstr ""
 
 #: ../gtk/friendlist.c:726
 msgid "Chat"
@@ -253,9 +241,9 @@ msgid "Search in %s directory"
 msgstr ""
 
 #: ../gtk/friendlist.c:976
-#, fuzzy, c-format
+#, c-format
 msgid "Edit contact '%s'"
-msgstr "(Brak informacji kontaktowych !)"
+msgstr ""
 
 #: ../gtk/friendlist.c:977
 #, c-format
@@ -281,9 +269,8 @@ msgid "Status"
 msgstr "Status"
 
 #: ../gtk/propertybox.c:570
-#, fuzzy
 msgid "IP Bitrate (kbit/s)"
-msgstr "Min przepustowość (kbit/s)"
+msgstr ""
 
 #: ../gtk/propertybox.c:577
 msgid "Parameters"
@@ -301,93 +288,92 @@ msgstr "Wyłączone"
 msgid "Account"
 msgstr ""
 
-#: ../gtk/propertybox.c:1063
+#: ../gtk/propertybox.c:1072
 msgid "English"
 msgstr ""
 
-#: ../gtk/propertybox.c:1064
+#: ../gtk/propertybox.c:1073
 msgid "French"
 msgstr ""
 
-#: ../gtk/propertybox.c:1065
+#: ../gtk/propertybox.c:1074
 msgid "Swedish"
 msgstr ""
 
-#: ../gtk/propertybox.c:1066
+#: ../gtk/propertybox.c:1075
 msgid "Italian"
 msgstr ""
 
-#: ../gtk/propertybox.c:1067
+#: ../gtk/propertybox.c:1076
 msgid "Spanish"
 msgstr ""
 
-#: ../gtk/propertybox.c:1068
+#: ../gtk/propertybox.c:1077
 msgid "Brazilian Portugese"
 msgstr ""
 
-#: ../gtk/propertybox.c:1069
+#: ../gtk/propertybox.c:1078
 msgid "Polish"
 msgstr ""
 
-#: ../gtk/propertybox.c:1070
+#: ../gtk/propertybox.c:1079
 msgid "German"
 msgstr ""
 
-#: ../gtk/propertybox.c:1071
+#: ../gtk/propertybox.c:1080
 msgid "Russian"
 msgstr ""
 
-#: ../gtk/propertybox.c:1072
+#: ../gtk/propertybox.c:1081
 msgid "Japanese"
 msgstr ""
 
-#: ../gtk/propertybox.c:1073
+#: ../gtk/propertybox.c:1082
 msgid "Dutch"
 msgstr ""
 
-#: ../gtk/propertybox.c:1074
+#: ../gtk/propertybox.c:1083
 msgid "Hungarian"
 msgstr ""
 
-#: ../gtk/propertybox.c:1075
+#: ../gtk/propertybox.c:1084
 msgid "Czech"
 msgstr ""
 
-#: ../gtk/propertybox.c:1076
+#: ../gtk/propertybox.c:1085
 msgid "Chinese"
 msgstr ""
 
-#: ../gtk/propertybox.c:1077
+#: ../gtk/propertybox.c:1086
 msgid "Traditional Chinese"
 msgstr ""
 
-#: ../gtk/propertybox.c:1078
+#: ../gtk/propertybox.c:1087
 msgid "Norwegian"
 msgstr ""
 
-#: ../gtk/propertybox.c:1079
+#: ../gtk/propertybox.c:1088
 msgid "Hebrew"
 msgstr ""
 
-#: ../gtk/propertybox.c:1080
+#: ../gtk/propertybox.c:1089
 msgid "Serbian"
 msgstr ""
 
-#: ../gtk/propertybox.c:1147
+#: ../gtk/propertybox.c:1156
 msgid ""
 "You need to restart linphone for the new language selection to take effect."
 msgstr ""
 
-#: ../gtk/propertybox.c:1225
-#, fuzzy
+#: ../gtk/propertybox.c:1234
 msgid "None"
-msgstr "Brak."
+msgstr ""
 
-#: ../gtk/propertybox.c:1229
+#: ../gtk/propertybox.c:1238
 msgid "SRTP"
 msgstr ""
 
-#: ../gtk/propertybox.c:1235
+#: ../gtk/propertybox.c:1244
 msgid "ZRTP"
 msgstr ""
 
@@ -411,14 +397,12 @@ msgid "Error communicating with server."
 msgstr ""
 
 #: ../gtk/buddylookup.c:164
-#, fuzzy
 msgid "Connecting..."
-msgstr "Lącze"
+msgstr ""
 
 #: ../gtk/buddylookup.c:168
-#, fuzzy
 msgid "Connected"
-msgstr "Połączony"
+msgstr ""
 
 #: ../gtk/buddylookup.c:172
 msgid "Receiving data..."
@@ -430,6 +414,7 @@ msgid "Found %i contact"
 msgid_plural "Found %i contacts"
 msgstr[0] ""
 msgstr[1] ""
+msgstr[2] ""
 
 #: ../gtk/setupwizard.c:34
 msgid ""
@@ -458,28 +443,24 @@ msgid "Enter your linphone.org username"
 msgstr ""
 
 #: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:79 ../gtk/ldap.ui.h:4
-#, fuzzy
 msgid "Username:"
-msgstr "Podręcznik"
+msgstr ""
 
 #: ../gtk/setupwizard.c:104 ../gtk/password.ui.h:4 ../gtk/ldap.ui.h:5
-#, fuzzy
 msgid "Password:"
-msgstr "Twoje hasło:"
+msgstr ""
 
 #: ../gtk/setupwizard.c:124
 msgid "Enter your account informations"
 msgstr ""
 
 #: ../gtk/setupwizard.c:140
-#, fuzzy
 msgid "Username*"
-msgstr "Podręcznik"
+msgstr ""
 
 #: ../gtk/setupwizard.c:141
-#, fuzzy
 msgid "Password*"
-msgstr "Twoje hasło:"
+msgstr ""
 
 #: ../gtk/setupwizard.c:144
 msgid "Domain*"
@@ -494,14 +475,12 @@ msgid "(*) Required fields"
 msgstr ""
 
 #: ../gtk/setupwizard.c:318
-#, fuzzy
 msgid "Username: (*)"
-msgstr "Podręcznik"
+msgstr ""
 
 #: ../gtk/setupwizard.c:320
-#, fuzzy
 msgid "Password: (*)"
-msgstr "Twoje hasło:"
+msgstr ""
 
 #: ../gtk/setupwizard.c:322
 msgid "Email: (*)"
@@ -527,8 +506,7 @@ msgstr ""
 
 #: ../gtk/setupwizard.c:413
 msgid ""
-"Please validate your account by clicking on the link we just sent you by "
-"email.\n"
+"Please validate your account by clicking on the link we just sent you by email.\n"
 "Then come back here and press Next button."
 msgstr ""
 
@@ -569,9 +547,9 @@ msgid "Terminating"
 msgstr ""
 
 #: ../gtk/incall_view.c:70 ../gtk/incall_view.c:94
-#, fuzzy, c-format
+#, c-format
 msgid "Call #%i"
-msgstr "Połączenie odwołane."
+msgstr ""
 
 #: ../gtk/incall_view.c:155
 #, c-format
@@ -587,9 +565,8 @@ msgid "ICE not activated"
 msgstr ""
 
 #: ../gtk/incall_view.c:223
-#, fuzzy
 msgid "ICE failed"
-msgstr "Połączenie odwołane."
+msgstr ""
 
 #: ../gtk/incall_view.c:225
 msgid "ICE in progress"
@@ -616,18 +593,16 @@ msgid "uPnP in progress"
 msgstr ""
 
 #: ../gtk/incall_view.c:243
-#, fuzzy
 msgid "uPnp not available"
-msgstr "Brak informacji"
+msgstr ""
 
 #: ../gtk/incall_view.c:245
 msgid "uPnP is running"
 msgstr ""
 
 #: ../gtk/incall_view.c:247
-#, fuzzy
 msgid "uPnP failed"
-msgstr "Połączenie odwołane."
+msgstr ""
 
 #: ../gtk/incall_view.c:257 ../gtk/incall_view.c:258
 msgid "Direct or through server"
@@ -654,114 +629,108 @@ msgstr ""
 msgid "Hang up"
 msgstr ""
 
-#: ../gtk/incall_view.c:501
-#, fuzzy
+#: ../gtk/incall_view.c:511
 msgid "<b>Calling...</b>"
-msgstr "Dzwonie do "
+msgstr ""
 
-#: ../gtk/incall_view.c:504 ../gtk/incall_view.c:707
+#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:727
 msgid "00::00::00"
 msgstr ""
 
-#: ../gtk/incall_view.c:515
-#, fuzzy
+#: ../gtk/incall_view.c:525
 msgid "<b>Incoming call</b>"
-msgstr "Dzwonie do "
+msgstr ""
 
-#: ../gtk/incall_view.c:552
+#: ../gtk/incall_view.c:562
 msgid "good"
 msgstr ""
 
-#: ../gtk/incall_view.c:554
+#: ../gtk/incall_view.c:564
 msgid "average"
 msgstr ""
 
-#: ../gtk/incall_view.c:556
+#: ../gtk/incall_view.c:566
 msgid "poor"
 msgstr ""
 
-#: ../gtk/incall_view.c:558
+#: ../gtk/incall_view.c:568
 msgid "very poor"
 msgstr ""
 
-#: ../gtk/incall_view.c:560
+#: ../gtk/incall_view.c:570
 msgid "too bad"
 msgstr ""
 
-#: ../gtk/incall_view.c:561 ../gtk/incall_view.c:577
+#: ../gtk/incall_view.c:571 ../gtk/incall_view.c:587
 msgid "unavailable"
 msgstr ""
 
-#: ../gtk/incall_view.c:669
+#: ../gtk/incall_view.c:679
 msgid "Secured by SRTP"
 msgstr ""
 
-#: ../gtk/incall_view.c:675
+#: ../gtk/incall_view.c:685
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
 msgstr ""
 
-#: ../gtk/incall_view.c:681
+#: ../gtk/incall_view.c:691
 msgid "Set unverified"
 msgstr ""
 
-#: ../gtk/incall_view.c:681 ../gtk/main.ui.h:4
+#: ../gtk/incall_view.c:691 ../gtk/main.ui.h:4
 msgid "Set verified"
 msgstr ""
 
-#: ../gtk/incall_view.c:702
+#: ../gtk/incall_view.c:722
 msgid "In conference"
 msgstr ""
 
-#: ../gtk/incall_view.c:702
-#, fuzzy
+#: ../gtk/incall_view.c:722
 msgid "<b>In call</b>"
-msgstr "Dzwonie do "
+msgstr ""
 
-#: ../gtk/incall_view.c:738
-#, fuzzy
+#: ../gtk/incall_view.c:758
 msgid "<b>Paused call</b>"
-msgstr "Dzwonie do "
+msgstr ""
 
-#: ../gtk/incall_view.c:751
+#: ../gtk/incall_view.c:771
 #, c-format
 msgid "%02i::%02i::%02i"
 msgstr ""
 
-#: ../gtk/incall_view.c:772
-#, fuzzy
+#: ../gtk/incall_view.c:794
 msgid "<b>Call ended.</b>"
-msgstr "Rozmowa odrzucona."
+msgstr ""
 
-#: ../gtk/incall_view.c:803
+#: ../gtk/incall_view.c:825
 msgid "Transfer in progress"
 msgstr ""
 
-#: ../gtk/incall_view.c:806
+#: ../gtk/incall_view.c:828
 msgid "Transfer done."
 msgstr ""
 
-#: ../gtk/incall_view.c:809
-#, fuzzy
+#: ../gtk/incall_view.c:831
 msgid "Transfer failed."
-msgstr "Połączenie odwołane."
+msgstr ""
 
-#: ../gtk/incall_view.c:853
+#: ../gtk/incall_view.c:875
 msgid "Resume"
 msgstr ""
 
-#: ../gtk/incall_view.c:860 ../gtk/main.ui.h:9
+#: ../gtk/incall_view.c:882 ../gtk/main.ui.h:9
 msgid "Pause"
 msgstr ""
 
-#: ../gtk/incall_view.c:926
+#: ../gtk/incall_view.c:948
 #, c-format
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
 msgstr ""
 
-#: ../gtk/incall_view.c:926
+#: ../gtk/incall_view.c:948
 msgid "(Paused)"
 msgstr ""
 
@@ -803,23 +772,20 @@ msgid ""
 msgstr ""
 
 #: ../gtk/audio_assistant.c:328
-#, fuzzy
 msgid "Capture device"
-msgstr "Użyj tego urządzenia dźwięku:"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:329
-#, fuzzy
 msgid "Recorded volume"
-msgstr "Źródło nagrywania:"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:333
 msgid "No voice"
 msgstr ""
 
 #: ../gtk/audio_assistant.c:369
-#, fuzzy
 msgid "Playback device"
-msgstr "Użyj tego urządzenia dźwięku:"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:370
 msgid "Play three beeps"
@@ -858,14 +824,12 @@ msgid "Record and Play"
 msgstr ""
 
 #: ../gtk/main.ui.h:1
-#, fuzzy
 msgid "<b>Callee name</b>"
-msgstr "Rozmowa odrzucona."
+msgstr ""
 
 #: ../gtk/main.ui.h:2
-#, fuzzy
 msgid "Send"
-msgstr "Dźwięk"
+msgstr ""
 
 #: ../gtk/main.ui.h:3
 msgid "End conference"
@@ -888,14 +852,12 @@ msgid "Transfer"
 msgstr ""
 
 #: ../gtk/main.ui.h:14
-#, fuzzy
 msgid "In call"
-msgstr "Dzwonie do "
+msgstr ""
 
 #: ../gtk/main.ui.h:15
-#, fuzzy
 msgid "Duration"
-msgstr "Informacja"
+msgstr ""
 
 #: ../gtk/main.ui.h:16
 msgid "Call quality rating"
@@ -906,9 +868,8 @@ msgid "All users"
 msgstr ""
 
 #: ../gtk/main.ui.h:18
-#, fuzzy
 msgid "Online users"
-msgstr "linia"
+msgstr ""
 
 #: ../gtk/main.ui.h:19
 msgid "ADSL"
@@ -919,27 +880,24 @@ msgid "Fiber Channel"
 msgstr ""
 
 #: ../gtk/main.ui.h:21
-#, fuzzy
 msgid "Default"
-msgstr "Tożsamość"
+msgstr ""
 
 #: ../gtk/main.ui.h:22
 msgid "_Options"
 msgstr ""
 
 #: ../gtk/main.ui.h:23
-#, fuzzy
 msgid "Set configuration URI"
-msgstr "Informacja"
+msgstr ""
 
 #: ../gtk/main.ui.h:24
 msgid "Always start video"
 msgstr ""
 
 #: ../gtk/main.ui.h:25
-#, fuzzy
 msgid "Enable self-view"
-msgstr "Włączone"
+msgstr ""
 
 #: ../gtk/main.ui.h:26
 msgid "_Help"
@@ -962,52 +920,44 @@ msgid "Account assistant"
 msgstr ""
 
 #: ../gtk/main.ui.h:32
-#, fuzzy
 msgid "SIP address or phone number:"
-msgstr "Adres serwera rejestracji sip"
+msgstr ""
 
 #: ../gtk/main.ui.h:33
 msgid "Initiate a new call"
 msgstr ""
 
 #: ../gtk/main.ui.h:34
-#, fuzzy
 msgid "Contacts"
-msgstr "Dzwonie do "
+msgstr ""
 
 #: ../gtk/main.ui.h:35
 msgid "Search"
 msgstr ""
 
 #: ../gtk/main.ui.h:36
-#, fuzzy
 msgid "<b>Add contacts from directory</b>"
-msgstr "Informacje o kodeku"
+msgstr ""
 
 #: ../gtk/main.ui.h:37
-#, fuzzy
 msgid "Add contact"
-msgstr "(Brak informacji kontaktowych !)"
+msgstr ""
 
 #: ../gtk/main.ui.h:38
-#, fuzzy
 msgid "Recent calls"
-msgstr "Dzwonie do "
+msgstr ""
 
 #: ../gtk/main.ui.h:39
-#, fuzzy
 msgid "My current identity:"
-msgstr "Tożsamość"
+msgstr ""
 
 #: ../gtk/main.ui.h:40 ../gtk/tunnel_config.ui.h:7
-#, fuzzy
 msgid "Username"
-msgstr "Podręcznik"
+msgstr ""
 
 #: ../gtk/main.ui.h:41 ../gtk/tunnel_config.ui.h:8
-#, fuzzy
 msgid "Password"
-msgstr "Twoje hasło:"
+msgstr ""
 
 #: ../gtk/main.ui.h:42
 msgid "Internet connection:"
@@ -1022,23 +972,20 @@ msgid "UserID"
 msgstr ""
 
 #: ../gtk/main.ui.h:45
-#, fuzzy
 msgid "Login information"
-msgstr "Informacje o kodeku"
+msgstr ""
 
 #: ../gtk/main.ui.h:46
-#, fuzzy
 msgid "<b>Welcome !</b>"
-msgstr "Dzwonie do "
+msgstr ""
 
 #: ../gtk/main.ui.h:47
 msgid "Delete"
 msgstr ""
 
 #: ../gtk/about.ui.h:1
-#, fuzzy
 msgid "About linphone"
-msgstr "linphone"
+msgstr ""
 
 #: ../gtk/about.ui.h:2
 msgid "(C) Belledonne Communications,2010\n"
@@ -1065,9 +1012,8 @@ msgid ""
 msgstr ""
 
 #: ../gtk/contact.ui.h:2
-#, fuzzy
 msgid "SIP Address"
-msgstr "Adres"
+msgstr ""
 
 #: ../gtk/contact.ui.h:3
 msgid "Show this contact presence status"
@@ -1078,9 +1024,8 @@ msgid "Allow this contact to see my presence status"
 msgstr ""
 
 #: ../gtk/contact.ui.h:5
-#, fuzzy
 msgid "<b>Contact information</b>"
-msgstr "Informacje o kodeku"
+msgstr ""
 
 #: ../gtk/log.ui.h:1
 msgid "Linphone debug window"
@@ -1091,9 +1036,8 @@ msgid "Scroll to end"
 msgstr ""
 
 #: ../gtk/password.ui.h:1
-#, fuzzy
 msgid "Linphone - Authentication required"
-msgstr "Informacje o kodeku"
+msgstr ""
 
 #: ../gtk/password.ui.h:2
 msgid "Please enter the domain password"
@@ -1116,9 +1060,8 @@ msgid "Linphone - Configure a SIP account"
 msgstr ""
 
 #: ../gtk/sip_account.ui.h:2
-#, fuzzy
 msgid "Your SIP identity:"
-msgstr "Tożsamość"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:3
 msgid "Looks like sip:<username>@<domain>"
@@ -1129,18 +1072,16 @@ msgid "sip:"
 msgstr "sip:"
 
 #: ../gtk/sip_account.ui.h:5
-#, fuzzy
 msgid "SIP Proxy address:"
-msgstr "Adres sip:"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:6
 msgid "Looks like sip:<proxy hostname>"
 msgstr ""
 
 #: ../gtk/sip_account.ui.h:7
-#, fuzzy
 msgid "Registration duration (sec):"
-msgstr "Rejestracja powiodła się."
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:8
 msgid "Contact params (optional):"
@@ -1155,23 +1096,20 @@ msgid "Route (optional):"
 msgstr ""
 
 #: ../gtk/sip_account.ui.h:11
-#, fuzzy
 msgid "Transport"
-msgstr "Dzwonie do "
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:12
 msgid "Register"
 msgstr ""
 
 #: ../gtk/sip_account.ui.h:13
-#, fuzzy
 msgid "Publish presence information"
-msgstr "Informacje o kodeku"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:14
-#, fuzzy
 msgid "Enable AVPF"
-msgstr "Włączony"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:15
 msgid "Configure a SIP account"
@@ -1206,14 +1144,12 @@ msgid "CIF"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:8
-#, fuzzy
 msgid "Audio codecs"
-msgstr "Kodeki audio"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:9
-#, fuzzy
 msgid "Video codecs"
-msgstr "Kodeki audio"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:10 ../gtk/keypad.ui.h:5
 msgid "C"
@@ -1248,9 +1184,8 @@ msgid "Use IPv6 instead of IPv4"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:18
-#, fuzzy
 msgid "<b>Transport</b>"
-msgstr "Dzwonie do "
+msgstr ""
 
 #: ../gtk/parameters.ui.h:19
 msgid "Media encryption type"
@@ -1281,14 +1216,12 @@ msgid "DSCP fields"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:26
-#, fuzzy
 msgid "SIP/TCP port"
-msgstr "Port SIP"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:27
-#, fuzzy
 msgid "SIP/UDP port"
-msgstr "Port SIP"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:28
 msgid "<b>Network protocol and ports</b>"
@@ -1315,76 +1248,64 @@ msgid "Behind NAT / Firewall (use uPnP)"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:34
-#, fuzzy
 msgid "Public IP address:"
-msgstr "Adres sip:"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:35
-#, fuzzy
 msgid "Stun server:"
-msgstr "Dźwięk"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:36
-#, fuzzy
 msgid "<b>NAT and Firewall</b>"
-msgstr "Dzwonie do "
+msgstr ""
 
 #: ../gtk/parameters.ui.h:37
-#, fuzzy
 msgid "Network settings"
-msgstr "Sieć"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:38
-#, fuzzy
 msgid "Ring sound:"
-msgstr "Źródło nagrywania:"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:39
 msgid "ALSA special device (optional):"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:40
-#, fuzzy
 msgid "Capture device:"
-msgstr "Użyj tego urządzenia dźwięku:"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:41
-#, fuzzy
 msgid "Ring device:"
-msgstr "Użyj tego urządzenia dźwięku:"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:42
-#, fuzzy
 msgid "Playback device:"
-msgstr "Użyj tego urządzenia dźwięku:"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:43
 msgid "Enable echo cancellation"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:44
-#, fuzzy
 msgid "<b>Audio</b>"
-msgstr "Dzwonie do "
+msgstr ""
 
 #: ../gtk/parameters.ui.h:45
-#, fuzzy
 msgid "Video input device:"
-msgstr "Dźwięk"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:46
 msgid "Prefered video resolution:"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:47
-#, fuzzy
 msgid "Video output method:"
-msgstr "Dźwięk"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:48
-#, fuzzy
 msgid "<b>Video</b>"
-msgstr "Dzwonie do "
+msgstr ""
 
 #: ../gtk/parameters.ui.h:49
 msgid "Multimedia settings"
@@ -1399,28 +1320,24 @@ msgid "Your display name (eg: John Doe):"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:52
-#, fuzzy
 msgid "Your username:"
-msgstr "Podręcznik"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:53
-#, fuzzy
 msgid "Your resulting SIP address:"
-msgstr "Twój adres sip:"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:54
-#, fuzzy
 msgid "<b>Default identity</b>"
-msgstr "Tożsamość"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:55
 msgid "Wizard"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:56
-#, fuzzy
 msgid "Add"
-msgstr "Adres"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:57
 msgid "Edit"
@@ -1431,18 +1348,16 @@ msgid "Remove"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:59
-#, fuzzy
 msgid "<b>Proxy accounts</b>"
-msgstr "Dzwonie do "
+msgstr ""
 
 #: ../gtk/parameters.ui.h:60
 msgid "Erase all passwords"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:61
-#, fuzzy
 msgid "<b>Privacy</b>"
-msgstr "Dzwonie do "
+msgstr ""
 
 #: ../gtk/parameters.ui.h:62
 msgid "Manage SIP Accounts"
@@ -1457,9 +1372,8 @@ msgid "Disable"
 msgstr "Wyłącz"
 
 #: ../gtk/parameters.ui.h:65
-#, fuzzy
 msgid "<b>Codecs</b>"
-msgstr "Dzwonie do "
+msgstr ""
 
 #: ../gtk/parameters.ui.h:66
 msgid "0 stands for \"unlimited\""
@@ -1488,84 +1402,72 @@ msgid "<b>Bandwidth control</b>"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:72
-#, fuzzy
 msgid "Codecs"
-msgstr "Kodeki"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:73
-#, fuzzy
 msgid "<b>Language</b>"
-msgstr "Dzwonie do "
+msgstr ""
 
 #: ../gtk/parameters.ui.h:74
 msgid "Show advanced settings"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:75
-#, fuzzy
 msgid "<b>Level</b>"
-msgstr "Dzwonie do "
+msgstr ""
 
 #: ../gtk/parameters.ui.h:76
-#, fuzzy
 msgid "User interface"
-msgstr "Podręcznik"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:77 ../gtk/ldap.ui.h:2
-#, fuzzy
 msgid "Server address:"
-msgstr "Adres serwera:"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:78 ../gtk/ldap.ui.h:3
-#, fuzzy
 msgid "Authentication method:"
-msgstr "Informacje o kodeku"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:80
 msgid "label"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:81
-#, fuzzy
 msgid "<b>LDAP Account setup</b>"
-msgstr "Dzwonie do "
+msgstr ""
 
 #: ../gtk/parameters.ui.h:82
 msgid "LDAP"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:83
-#, fuzzy
 msgid "Done"
-msgstr "Brak."
+msgstr ""
 
 #: ../gtk/buddylookup.ui.h:1
-#, fuzzy
 msgid "Search contacts in directory"
-msgstr "Informacje o kodeku"
+msgstr ""
 
 #: ../gtk/buddylookup.ui.h:2
 msgid "Add to my list"
 msgstr ""
 
 #: ../gtk/buddylookup.ui.h:3
-#, fuzzy
 msgid "<b>Search somebody</b>"
-msgstr "Dzwonie do "
+msgstr ""
 
 #: ../gtk/waiting.ui.h:1
-#, fuzzy
 msgid "Linphone"
-msgstr "linphone"
+msgstr ""
 
 #: ../gtk/waiting.ui.h:2
 msgid "Please wait"
 msgstr ""
 
 #: ../gtk/dscp_settings.ui.h:1
-#, fuzzy
 msgid "DSCP settings"
-msgstr "Sieć"
+msgstr ""
 
 #: ../gtk/dscp_settings.ui.h:2
 msgid "SIP"
@@ -1588,14 +1490,12 @@ msgid "Call statistics"
 msgstr ""
 
 #: ../gtk/call_statistics.ui.h:2
-#, fuzzy
 msgid "Audio codec"
-msgstr "Kodeki audio"
+msgstr ""
 
 #: ../gtk/call_statistics.ui.h:3
-#, fuzzy
 msgid "Video codec"
-msgstr "Kodeki audio"
+msgstr ""
 
 #: ../gtk/call_statistics.ui.h:4
 msgid "Audio IP bandwidth usage"
@@ -1614,9 +1514,8 @@ msgid "Video Media connectivity"
 msgstr ""
 
 #: ../gtk/call_statistics.ui.h:8
-#, fuzzy
 msgid "Round trip time"
-msgstr "Właściwości dźwięku"
+msgstr ""
 
 #: ../gtk/call_statistics.ui.h:9
 msgid "Video resolution received"
@@ -1631,9 +1530,8 @@ msgid "RTP profile"
 msgstr ""
 
 #: ../gtk/call_statistics.ui.h:12
-#, fuzzy
 msgid "<b>Call statistics and information</b>"
-msgstr "Informacje o kodeku"
+msgstr ""
 
 #: ../gtk/tunnel_config.ui.h:1
 msgid "Configure VoIP tunnel"
@@ -1716,23 +1614,20 @@ msgid "1"
 msgstr "1"
 
 #: ../gtk/ldap.ui.h:1
-#, fuzzy
 msgid "LDAP Settings"
-msgstr "Sieć"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:6
 msgid "Use TLS Connection"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:7
-#, fuzzy
 msgid "Not yet available"
-msgstr "Brak informacji"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:8
-#, fuzzy
 msgid "<b>Connection</b>"
-msgstr "Dzwonie do "
+msgstr ""
 
 #: ../gtk/ldap.ui.h:9
 msgid "Bind DN"
@@ -1747,9 +1642,8 @@ msgid "Realm"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:12
-#, fuzzy
 msgid "<b>SASL</b>"
-msgstr "Dzwonie do "
+msgstr ""
 
 #: ../gtk/ldap.ui.h:13
 msgid "Base object:"
@@ -1765,18 +1659,16 @@ msgid "Name Attribute:"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:17
-#, fuzzy
 msgid "SIP address attribute:"
-msgstr "Adres"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:18
 msgid "Attributes to query:"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:19
-#, fuzzy
 msgid "<b>Search</b>"
-msgstr "Dzwonie do "
+msgstr ""
 
 #: ../gtk/ldap.ui.h:20
 msgid "Timeout for search:"
@@ -1791,9 +1683,8 @@ msgid "Follow Aliases"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:23
-#, fuzzy
 msgid "<b>Miscellaneous</b>"
-msgstr "Dzwonie do "
+msgstr ""
 
 #: ../gtk/ldap.ui.h:24
 msgid "ANONYMOUS"
@@ -1817,11 +1708,8 @@ msgstr ""
 
 #: ../gtk/config-uri.ui.h:2
 msgid ""
-"This dialog allows to set an http or https address when configuration is to "
-"be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, "
-"Linphone will restart automatically in order to fetch and take into account "
-"the new configuration. "
+"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
 msgstr ""
 
 #: ../gtk/config-uri.ui.h:4
@@ -1829,93 +1717,85 @@ msgid "https://"
 msgstr ""
 
 #: ../gtk/provisioning-fetch.ui.h:1
-#, fuzzy
 msgid "Configuring..."
-msgstr "Lącze"
+msgstr ""
 
 #: ../gtk/provisioning-fetch.ui.h:2
 msgid "Please wait while fetching configuration from server..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1034
-#, fuzzy
+#: ../coreapi/linphonecore.c:1511
 msgid "Ready"
-msgstr "Gotowy."
+msgstr ""
 
-#: ../coreapi/linphonecore.c:1967
-#, fuzzy
+#: ../coreapi/linphonecore.c:2470
 msgid "Configuring"
-msgstr "Informacja"
+msgstr ""
 
-#: ../coreapi/linphonecore.c:2133
+#: ../coreapi/linphonecore.c:2635
 msgid "Looking for telephone number destination..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2136
+#: ../coreapi/linphonecore.c:2637
 msgid "Could not resolve this number."
 msgstr ""
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2418
-#, fuzzy
+#: ../coreapi/linphonecore.c:2919
 msgid "Contacting"
-msgstr "Dzwonie do "
+msgstr ""
 
-#: ../coreapi/linphonecore.c:2425
-#, fuzzy
+#: ../coreapi/linphonecore.c:2924
 msgid "Could not call"
-msgstr "Nie można znaleźć pixmapy: %s"
+msgstr ""
 
-#: ../coreapi/linphonecore.c:2576
+#: ../coreapi/linphonecore.c:3074
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2745
-#, fuzzy
+#: ../coreapi/linphonecore.c:3233
 msgid "is contacting you"
-msgstr "dzwoni do Ciebie."
+msgstr ""
 
-#: ../coreapi/linphonecore.c:2746
+#: ../coreapi/linphonecore.c:3234
 msgid " and asked autoanswer."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2746
+#: ../coreapi/linphonecore.c:3234
 msgid "."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2865
+#: ../coreapi/linphonecore.c:3352
 msgid "Modifying call parameters..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3194
+#: ../coreapi/linphonecore.c:3700
 msgid "Connected."
 msgstr "Połączony"
 
-#: ../coreapi/linphonecore.c:3220
-#, fuzzy
+#: ../coreapi/linphonecore.c:3725
 msgid "Call aborted"
-msgstr "Połączenie odwołane."
+msgstr ""
 
-#: ../coreapi/linphonecore.c:3412
+#: ../coreapi/linphonecore.c:3915
 msgid "Could not pause the call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3417
+#: ../coreapi/linphonecore.c:3919
 msgid "Pausing the current call..."
 msgstr ""
 
-#: ../coreapi/misc.c:425
+#: ../coreapi/misc.c:438
 msgid "Stun lookup in progress..."
 msgstr ""
 
-#: ../coreapi/misc.c:607
+#: ../coreapi/misc.c:619
 msgid "ICE local candidates gathering in progress..."
 msgstr ""
 
 #: ../coreapi/friend.c:33
-#, fuzzy
 msgid "Online"
-msgstr "linia"
+msgstr ""
 
 #: ../coreapi/friend.c:36
 msgid "Busy"
@@ -1930,9 +1810,8 @@ msgid "Away"
 msgstr "Zajęty"
 
 #: ../coreapi/friend.c:45
-#, fuzzy
 msgid "On the phone"
-msgstr "linphone"
+msgstr ""
 
 #: ../coreapi/friend.c:48
 msgid "Out to lunch"
@@ -1943,507 +1822,164 @@ msgid "Do not disturb"
 msgstr "Nie przeszkadzać"
 
 #: ../coreapi/friend.c:54
-#, fuzzy
 msgid "Moved"
-msgstr "Kodeki"
+msgstr ""
 
 #: ../coreapi/friend.c:57
 msgid "Using another messaging service"
 msgstr ""
 
 #: ../coreapi/friend.c:60
-#, fuzzy
 msgid "Offline"
-msgstr "linia"
+msgstr ""
 
 #: ../coreapi/friend.c:63
 msgid "Pending"
 msgstr ""
 
 #: ../coreapi/friend.c:66
-#, fuzzy
 msgid "Vacation"
-msgstr "Informacja"
+msgstr ""
 
 #: ../coreapi/friend.c:68
 msgid "Unknown-bug"
 msgstr ""
 
-#: ../coreapi/proxy.c:314
+#: ../coreapi/proxy.c:319
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
 msgstr ""
 
-#: ../coreapi/proxy.c:320
+#: ../coreapi/proxy.c:325
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
 msgstr ""
 
-#: ../coreapi/proxy.c:1369
-#, fuzzy, c-format
+#: ../coreapi/proxy.c:1377
+#, c-format
 msgid "Could not login as %s"
-msgstr "Nie można znaleźć pixmapy: %s"
+msgstr ""
 
-#: ../coreapi/callbacks.c:355
-#, fuzzy
+#: ../coreapi/callbacks.c:383
 msgid "Remote ringing."
-msgstr "Rejestruje..."
+msgstr ""
 
-#: ../coreapi/callbacks.c:373
-#, fuzzy
+#: ../coreapi/callbacks.c:404
 msgid "Remote ringing..."
-msgstr "Rejestruje..."
+msgstr ""
 
-#: ../coreapi/callbacks.c:384
+#: ../coreapi/callbacks.c:414
 msgid "Early media."
 msgstr ""
 
-#: ../coreapi/callbacks.c:435
+#: ../coreapi/callbacks.c:475
 #, c-format
 msgid "Call with %s is paused."
 msgstr ""
 
-#: ../coreapi/callbacks.c:448
+#: ../coreapi/callbacks.c:488
 #, c-format
 msgid "Call answered by %s - on hold."
 msgstr ""
 
-#: ../coreapi/callbacks.c:459
-#, fuzzy
+#: ../coreapi/callbacks.c:498
 msgid "Call resumed."
-msgstr "Rozmowa odrzucona."
+msgstr ""
 
-#: ../coreapi/callbacks.c:464
-#, fuzzy, c-format
+#: ../coreapi/callbacks.c:502
+#, c-format
 msgid "Call answered by %s."
 msgstr ""
-"Zadzwoń lub\n"
-"Odpowiedz"
 
-#: ../coreapi/callbacks.c:483
+#: ../coreapi/callbacks.c:525
 msgid "Incompatible, check codecs or security settings..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:512
+#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:826
+msgid "Incompatible media parameters."
+msgstr ""
+
+#: ../coreapi/callbacks.c:560
 msgid "We have been resumed."
 msgstr ""
 
-#: ../coreapi/callbacks.c:521
+#. we are being paused
+#: ../coreapi/callbacks.c:568
 msgid "We are paused by other party."
 msgstr ""
 
-#: ../coreapi/callbacks.c:556
+#. reINVITE and in-dialogs UPDATE go here
+#: ../coreapi/callbacks.c:602
 msgid "Call is updated by remote."
 msgstr ""
 
-#: ../coreapi/callbacks.c:658
-#, fuzzy
+#: ../coreapi/callbacks.c:705
 msgid "Call terminated."
-msgstr "Rozmowa odrzucona."
+msgstr ""
 
-#: ../coreapi/callbacks.c:687
+#: ../coreapi/callbacks.c:733
 msgid "User is busy."
 msgstr "Osoba jest zajęta."
 
-#: ../coreapi/callbacks.c:688
+#: ../coreapi/callbacks.c:734
 msgid "User is temporarily unavailable."
 msgstr "Osoba jest tymczasowo niedostępna."
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:690
+#: ../coreapi/callbacks.c:736
 msgid "User does not want to be disturbed."
 msgstr "Osoba nie chce, aby jej przeszkadzać."
 
-#: ../coreapi/callbacks.c:691
+#: ../coreapi/callbacks.c:737
 msgid "Call declined."
 msgstr "Rozmowa odrzucona."
 
-#: ../coreapi/callbacks.c:706
+#: ../coreapi/callbacks.c:752
 msgid "Request timeout."
 msgstr ""
 
-#: ../coreapi/callbacks.c:737
+#: ../coreapi/callbacks.c:780
 msgid "Redirected"
 msgstr ""
 
-#: ../coreapi/callbacks.c:787
-msgid "Incompatible media parameters."
+#: ../coreapi/callbacks.c:835
+msgid "Call failed."
 msgstr ""
 
-#: ../coreapi/callbacks.c:798
-#, fuzzy
-msgid "Call failed."
-msgstr "Połączenie odwołane."
-
-#: ../coreapi/callbacks.c:878
-#, fuzzy, c-format
+#: ../coreapi/callbacks.c:913
+#, c-format
 msgid "Registration on %s successful."
-msgstr "Rejestracja powiodła się."
+msgstr ""
 
-#: ../coreapi/callbacks.c:879
-#, fuzzy, c-format
+#: ../coreapi/callbacks.c:914
+#, c-format
 msgid "Unregistration on %s done."
-msgstr "Rejestracja powiodła się."
+msgstr ""
 
-#: ../coreapi/callbacks.c:897
+#: ../coreapi/callbacks.c:932
 msgid "no response timeout"
 msgstr ""
 
-#: ../coreapi/callbacks.c:900
-#, fuzzy, c-format
+#: ../coreapi/callbacks.c:935
+#, c-format
 msgid "Registration on %s failed: %s"
-msgstr "Rejestracja powiodła się."
+msgstr ""
 
-#: ../coreapi/callbacks.c:907
+#: ../coreapi/callbacks.c:942
 msgid "Service unavailable, retrying"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:177
-#, fuzzy, c-format
+#: ../coreapi/linphonecall.c:174
+#, c-format
 msgid "Authentication token is %s"
-msgstr "Informacje o kodeku"
+msgstr ""
 
-#: ../coreapi/linphonecall.c:2932
+#: ../coreapi/linphonecall.c:3020
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
 msgstr[0] ""
 msgstr[1] ""
-
-#, fuzzy
-#~ msgid ""
-#~ "Could not parse given sip address. A sip url usually looks like sip:"
-#~ "user@domain"
-#~ msgstr "Nie poprawny adres sip. Adres sip wygląda tak <sip:osoba@serwer>"
-
-#~ msgid ""
-#~ "Your computer appears to be using ALSA sound drivers.\n"
-#~ "This is the best choice. However the pcm oss emulation module\n"
-#~ "is missing and linphone needs it. Please execute\n"
-#~ "'modprobe snd-pcm-oss' as root to load it."
-#~ msgstr ""
-#~ "Używasz sterowników ALSA do dźwięku.\n"
-#~ "To jest najlepszy wybór. Jednak brakuje modułu emulacji pcm oss,\n"
-#~ "a Linphone go wymaga. Uruchom 'modprobe snd-pcm-oss' jako root,\n"
-#~ "aby go załadować"
-
-#~ msgid ""
-#~ "Your computer appears to be using ALSA sound drivers.\n"
-#~ "This is the best choice. However the mixer oss emulation module\n"
-#~ "is missing and linphone needs it. Please execute\n"
-#~ " 'modprobe snd-mixer-oss' as root to load it."
-#~ msgstr ""
-#~ "Używasz sterowników ALSA do dźwięku.\n"
-#~ "To jest najlepszy wybór. Jednak brakuje modułu emulacji mixera oss,\n"
-#~ "a Linphone go wymaga. Uruchom 'modprobe snd-mixer-oss' jako root,\n"
-#~ "aby go załadować"
-
-#, fuzzy
-#~ msgid "Enable video"
-#~ msgstr "Włączone"
-
-#, fuzzy
-#~ msgid "<b>Contact list</b>"
-#~ msgstr "Dzwonie do "
-
-#, fuzzy
-#~ msgid "Audio & video"
-#~ msgstr "Kodeki audio"
-
-#, fuzzy
-#~ msgid "Audio only"
-#~ msgstr "Kodeki audio"
-
-#, fuzzy
-#~ msgid "Duration:"
-#~ msgstr "Informacja"
-
-#, fuzzy
-#~ msgid "_Linphone"
-#~ msgstr "linphone"
-
-#, fuzzy
-#~ msgid "gtk-cancel"
-#~ msgstr "Połączony"
-
-#, fuzzy
-#~ msgid "gtk-close"
-#~ msgstr "Połączony"
-
-#, fuzzy
-#~ msgid "_Modes"
-#~ msgstr "Kodeki"
-
-#, fuzzy
-#~ msgid ""
-#~ "Audio codecs\n"
-#~ "Video codecs"
-#~ msgstr "Kodeki audio"
-
-#, fuzzy
-#~ msgid "Request Cancelled."
-#~ msgstr "Połączenie odwołane."
-
-#~ msgid "User cannot be found at given address."
-#~ msgstr "Osoba nie istnieje pod tym adresem."
-
-#~ msgid "Remote user cannot support any of proposed codecs."
-#~ msgstr "Osoba nie posiada żadnych zaproponowanych kodeków."
-
-#~ msgid "Timeout."
-#~ msgstr "Upłynął limit czasu."
-
-#~ msgid "Remote host was found but refused connection."
-#~ msgstr "Serwer istnieje, ale odrzucił połączenie."
-
-#~ msgid ""
-#~ "User is not reachable at the moment but he invites you\n"
-#~ "to contact him using the following alternate resource:"
-#~ msgstr ""
-#~ "Użytkownik nie jest dostępny, ale proponuje kontakt poprzez alternatywny "
-#~ "adres:"
-
-#, fuzzy
-#~ msgid "Gone"
-#~ msgstr "Brak."
-
-#, fuzzy
-#~ msgid "Display filters"
-#~ msgstr "Wyświetlana nazwa:"
-
-#, fuzzy
-#~ msgid "_Properties"
-#~ msgstr "Właściwości RTP"
-
-#~ msgid "Sound"
-#~ msgstr "Dźwięk"
-
-#~ msgid "Address book"
-#~ msgstr "Książka adresowa"
-
-#~ msgid "Shows the address book"
-#~ msgstr "Pokazuje książkę adresową"
-
-#~ msgid "..."
-#~ msgstr "..."
-
-#~ msgid "Show more..."
-#~ msgstr "Pokaż więcej"
-
-#~ msgid "Playback level:"
-#~ msgstr "Poziom odtwarzania:"
-
-#~ msgid "Recording level:"
-#~ msgstr "Poziom nagrywania:"
-
-#, fuzzy
-#~ msgid "Ring level:"
-#~ msgstr "Poziom nagrywania:"
-
-#~ msgid "Reachable"
-#~ msgstr "Dostępny"
-
-#~ msgid "Busy, I'll be back in "
-#~ msgstr "Zajęty, wrócę za "
-
-#~ msgid "The other party will be informed that you'll be back in X minutes"
-#~ msgstr "Osoba zostanie powiadomiona, że wrócisz za X minut."
-
-#~ msgid "mn"
-#~ msgstr "mn"
-
-#~ msgid "Moved temporarily"
-#~ msgstr "Tymczasowo niedostępny"
-
-#~ msgid "Alternative service"
-#~ msgstr "Alternatywny adres"
-
-#~ msgid "URL:"
-#~ msgstr "URL:"
-
-#~ msgid "Presence"
-#~ msgstr "Obecność"
-
-#~ msgid "Press digits to send DTMFs."
-#~ msgstr "Nacisnij cyfry, aby wysłać DTMFy."
-
-#~ msgid "DTMF"
-#~ msgstr "DTMF"
-
-#~ msgid ""
-#~ "Linphone is a web-phone.\n"
-#~ "It is compatible with SIP and RTP protocols."
-#~ msgstr ""
-#~ "Linphone jest telefonem internetowym.\n"
-#~ "Jest kompatybilny z protokolami SIP i RTP."
-
-#, fuzzy
-#~ msgid "Use IPv6 network (if available)"
-#~ msgstr "Osoba jest tymczasowo niedostępna."
-
-#, fuzzy
-#~ msgid ""
-#~ "These options is only for users in a private network, behind a gateway. "
-#~ "If you are not in this situation, then leave this empty."
-#~ msgstr ""
-#~ "Ta opcja jest tylko dla osób w sieci prywatnej, znajdujących się za "
-#~ "firewallem. Jeżeli nie jesteś w takiej sytuacji, nie zmieniaj tej opcji."
-
-#~ msgid "NAT traversal options (experimental)"
-#~ msgstr "Opcje NAT traversal (eksperymentalne)"
-
-#, fuzzy
-#~ msgid "Number of buffered miliseconds (jitter compensation):"
-#~ msgstr "Czas bufora w milisekundach (kompensacja jitter):"
-
-#~ msgid "RTP port used for audio:"
-#~ msgstr "Port RTP dla dźwięku:"
-
-#~ msgid "micro"
-#~ msgstr "mikrofon"
-
-#~ msgid "Run sip user agent on port:"
-#~ msgstr "Uruchom agenta sip na porcie:"
-
-#~ msgid "It is strongly recommended to use port 5060."
-#~ msgstr "Rekomendowane jest użycie portu 5060."
-
-#~ msgid "@"
-#~ msgstr "@"
-
-#~ msgid "Identity"
-#~ msgstr "Tożsamość"
-
-#, fuzzy
-#~ msgid "Add proxy/registrar"
-#~ msgstr "Użyj rejestracji sip"
-
-#~ msgid "Remote services"
-#~ msgstr "Zdalne usługi"
-
-#~ msgid "List of audio codecs, in order of preference:"
-#~ msgstr "Lista kodeków audio, w kolejności preferencji:"
-
-#~ msgid ""
-#~ "Note: Codecs in red are not usable regarding to your connection type to "
-#~ "the internet."
-#~ msgstr ""
-#~ "Uwaga: Czerwone kodeki nie mogą być użyte, ze względu na typTwojego "
-#~ "połącznia z internetem."
-
-#~ msgid "Codec information"
-#~ msgstr "Informacje o kodeku"
-
-#~ msgid "Address Book"
-#~ msgstr "Książka adresowa"
-
-#~ msgid "Select"
-#~ msgstr "Wybierz"
-
-#~ msgid ""
-#~ "User is not reachable at the moment but he invites you to contact him "
-#~ "using the following alternate ressource:"
-#~ msgstr ""
-#~ "Użytkownik nie jest dostępny, ale proponuje kontakt poprzez alternatywny "
-#~ "adres:"
-
-#~ msgid "None."
-#~ msgstr "Brak."
-
-#, fuzzy
-#~ msgid "Name:"
-#~ msgstr "Nazwa"
-
-#, fuzzy
-#~ msgid "Bad sip address: a sip address looks like sip:user@domain"
-#~ msgstr "Nie poprawny adres sip. Adres sip wygląda tak <sip:osoba@serwer>"
-
-#~ msgid "Communication ended."
-#~ msgstr "Komunikacja zakończona."
-
-#, fuzzy
-#~ msgid "Firewall 's external ip address (in dot notations):"
-#~ msgstr "Adres IP firewall'u (w notacji kropkowej):"
-
-#~ msgid "Index"
-#~ msgstr "Indeks"
-
-#~ msgid "28k modem"
-#~ msgstr "Modem 28K"
-
-#~ msgid "56k modem"
-#~ msgstr "Modem 56K"
-
-#~ msgid "64k modem (numeris)"
-#~ msgstr "Modem ISDN 64K"
-
-#~ msgid "ADSL or Cable modem"
-#~ msgstr "ADSL lub połączenie kablowe"
-
-#~ msgid "Ethernet or equivalent"
-#~ msgstr "LAN lub podobne"
-
-#~ msgid "Connection type:"
-#~ msgstr "Typ połączenia:"
-
-#, fuzzy
-#~ msgid ""
-#~ "Linphone could not open audio device %s. Check if your sound card is "
-#~ "fully configured and working."
-#~ msgstr ""
-#~ "Linphone nie mógł otworzyć urządzenia dźwięku. Sprawdź czy Twoja karta "
-#~ "jest dobrze skonfigurowana."
-
-#~ msgid "Type here the sip address of the person you want to call."
-#~ msgstr "Tutaj wpisz adres sip osoby, do której chcesz zadzwonić"
-
-#~ msgid ""
-#~ "Release or\n"
-#~ "Refuse"
-#~ msgstr ""
-#~ "Rozłącz lub\n"
-#~ "Odmów"
-
-#~ msgid "%s. Retry after %i minute(s)."
-#~ msgstr "%s. Spróbuj za %i minut."
-
-#, fuzzy
-#~ msgid "Timeout..."
-#~ msgstr "Upłynął limit czasu."
-
-#~ msgid "Toggle this if you want to be registered on a remote server."
-#~ msgstr "Włącz to, jeżeli chcesz się zarejestrować na zdalnym serwerze."
-
-#~ msgid "Address of record:"
-#~ msgstr "Adres do rejestracji:"
-
-#~ msgid ""
-#~ "The password used for registration. On some servers it is not necessary"
-#~ msgstr "Hasło do rejestracji. Na niektórych serwerach nie jest wymagane"
-
-#~ msgid "Use this registrar server as outbound proxy."
-#~ msgstr "Użyj tego serwera rejestracji jako zewnętrznego proxy"
-
-#~ msgid "sip address:"
-#~ msgstr "Adres SIP:"
-
-#~ msgid "Modify"
-#~ msgstr "Zmień"
-
-#~ msgid ""
-#~ "You are currently using the i810_audio driver.\n"
-#~ "This driver is buggy and so does not work with Linphone.\n"
-#~ "We suggest that you replace it by its equivalent ALSA driver,\n"
-#~ "either with packages from your distribution, or by downloading\n"
-#~ "ALSA drivers at http://www.alsa-project.org."
-#~ msgstr ""
-#~ "Używasz sterownika i810_audio.\n"
-#~ "Ten sterownik ma błędy i nie działa z Linphone\n"
-#~ "Sugerujemy zmiane sterowników na ich odpowiedniki ALSA z pakietów Twojej "
-#~ "dystrybucji,\n"
-#~ "lub ze strony http://www.alsa-project.org/."
-
-#~ msgid "Unregistration successfull."
-#~ msgstr "Derejestracja powiodła się."
+msgstr[2] ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index c30d3787a..4cc377ec9 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,26 +1,26 @@
-# Portuguese translations for gnomebaker package.
-# Copyright (C) 2005 THE linphone COPYRIGHT HOLDER
-# This file is distributed under the same license as the linphone package.
-# Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>, 2005.
-# 
-#, fuzzy
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: linphone-1.1.0\n"
+"Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-15 09:24+0200\n"
-"PO-Revision-Date: 2006-07-11 23:30+0200\n"
-"Last-Translator: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\n"
-"Language-Team: pt_BR <pt_BR@li.org>\n"
-"Language: \n"
+"POT-Creation-Date: 2014-11-19 10:39+0100\n"
+"PO-Revision-Date: 2014-11-19 10:08+0000\n"
+"Last-Translator: Cqnqrd <gautier.pelloux@gmail.com>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/linphone-gtk/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974
-#, fuzzy, c-format
+#, c-format
 msgid "Call %s"
-msgstr "Histórico de chamadas"
+msgstr ""
 
 #: ../gtk/calllogs.c:149 ../gtk/friendlist.c:975
 #, c-format
@@ -28,28 +28,25 @@ msgid "Send text to %s"
 msgstr ""
 
 #: ../gtk/calllogs.c:232
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Recent calls (%i)</b>"
-msgstr "Contatando "
+msgstr ""
 
 #: ../gtk/calllogs.c:314
 msgid "n/a"
 msgstr ""
 
 #: ../gtk/calllogs.c:317
-#, fuzzy
 msgid "Aborted"
-msgstr "Abortado"
+msgstr ""
 
 #: ../gtk/calllogs.c:320
-#, fuzzy
 msgid "Missed"
-msgstr "Perdido"
+msgstr ""
 
 #: ../gtk/calllogs.c:323
-#, fuzzy
 msgid "Declined"
-msgstr "linha"
+msgstr ""
 
 #: ../gtk/calllogs.c:329
 #, c-format
@@ -127,110 +124,98 @@ msgstr ""
 
 #: ../gtk/main.c:149
 msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: c:"
-"\\Program Files\\Linphone)"
+"Specifiy a working directory (should be the base of the installation, eg: "
+"c:\\Program Files\\Linphone)"
 msgstr ""
 
 #: ../gtk/main.c:156
-#, fuzzy
 msgid "Configuration file"
-msgstr "Informações"
+msgstr ""
 
 #: ../gtk/main.c:163
 msgid "Run the audio assistant"
 msgstr ""
 
-#: ../gtk/main.c:590
-#, fuzzy, c-format
-msgid "Call with %s"
-msgstr "Bate-papo com %s"
-
-#: ../gtk/main.c:1183
+#: ../gtk/main.c:1085
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
-"Would you allow him to see your presence status or add him to your contact "
-"list ?\n"
+"Would you allow him to see your presence status or add him to your contact list ?\n"
 "If you answer no, this person will be temporarily blacklisted."
 msgstr ""
 
-#: ../gtk/main.c:1260
+#: ../gtk/main.c:1162
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
 msgstr ""
 
-#: ../gtk/main.c:1376
-#, fuzzy
+#: ../gtk/main.c:1283
 msgid "Call error"
-msgstr "Linphone - Histórico de chamadas"
+msgstr ""
 
-#: ../gtk/main.c:1379 ../coreapi/linphonecore.c:3240
-#, fuzzy
+#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3744
 msgid "Call ended"
-msgstr "Chamada cancelada."
+msgstr ""
 
-#: ../gtk/main.c:1382
+#: ../gtk/main.c:1289
 msgid "Incoming call"
 msgstr "Camadas recebidas"
 
-#: ../gtk/main.c:1384 ../gtk/incall_view.c:522 ../gtk/main.ui.h:5
+#: ../gtk/main.c:1291 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
 msgid "Answer"
 msgstr ""
 
-#: ../gtk/main.c:1386 ../gtk/main.ui.h:6
-#, fuzzy
+#: ../gtk/main.c:1293 ../gtk/main.ui.h:6
 msgid "Decline"
-msgstr "linha"
+msgstr ""
 
-#: ../gtk/main.c:1392
-#, fuzzy
+#: ../gtk/main.c:1299
 msgid "Call paused"
-msgstr "Abortado"
+msgstr ""
 
-#: ../gtk/main.c:1392
-#, fuzzy, c-format
+#: ../gtk/main.c:1299
+#, c-format
 msgid "<b>by %s</b>"
-msgstr "Contatando "
+msgstr ""
 
-#: ../gtk/main.c:1459
+#: ../gtk/main.c:1366
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr ""
 
-#: ../gtk/main.c:1621
+#: ../gtk/main.c:1528
 msgid "Website link"
 msgstr ""
 
-#: ../gtk/main.c:1670
+#: ../gtk/main.c:1577
 msgid "Linphone - a video internet phone"
 msgstr ""
 
-#: ../gtk/main.c:1762
+#: ../gtk/main.c:1669
 #, c-format
 msgid "%s (Default)"
 msgstr ""
 
-#: ../gtk/main.c:2099 ../coreapi/callbacks.c:949
+#: ../gtk/main.c:2006 ../coreapi/callbacks.c:983
 #, c-format
 msgid "We are transferred to %s"
 msgstr ""
 
-#: ../gtk/main.c:2109
+#: ../gtk/main.c:2016
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
 msgstr ""
 
-#: ../gtk/main.c:2250
+#: ../gtk/main.c:2157
 msgid "A free SIP video-phone"
 msgstr ""
 
 #: ../gtk/friendlist.c:505
-#, fuzzy
 msgid "Add to addressbook"
-msgstr "Catálogo de endereços"
+msgstr ""
 
 #: ../gtk/friendlist.c:691
 msgid "Presence status"
@@ -241,14 +226,12 @@ msgid "Name"
 msgstr "Nome"
 
 #: ../gtk/friendlist.c:721
-#, fuzzy
 msgid "Call"
-msgstr "Histórico de chamadas"
+msgstr ""
 
 #: ../gtk/friendlist.c:726
-#, fuzzy
 msgid "Chat"
-msgstr "Sala de bate-papo"
+msgstr ""
 
 #: ../gtk/friendlist.c:756
 #, c-format
@@ -256,9 +239,9 @@ msgid "Search in %s directory"
 msgstr ""
 
 #: ../gtk/friendlist.c:976
-#, fuzzy, c-format
+#, c-format
 msgid "Edit contact '%s'"
-msgstr "Edicar informação de contato"
+msgstr ""
 
 #: ../gtk/friendlist.c:977
 #, c-format
@@ -284,9 +267,8 @@ msgid "Status"
 msgstr ""
 
 #: ../gtk/propertybox.c:570
-#, fuzzy
 msgid "IP Bitrate (kbit/s)"
-msgstr "Bitrate mínimo (kbits/s)"
+msgstr ""
 
 #: ../gtk/propertybox.c:577
 msgid "Parameters"
@@ -301,96 +283,95 @@ msgid "Disabled"
 msgstr "Desativado"
 
 #: ../gtk/propertybox.c:809
-#, fuzzy
 msgid "Account"
-msgstr "Aceitar"
-
-#: ../gtk/propertybox.c:1063
-msgid "English"
-msgstr ""
-
-#: ../gtk/propertybox.c:1064
-msgid "French"
-msgstr ""
-
-#: ../gtk/propertybox.c:1065
-msgid "Swedish"
-msgstr ""
-
-#: ../gtk/propertybox.c:1066
-msgid "Italian"
-msgstr ""
-
-#: ../gtk/propertybox.c:1067
-msgid "Spanish"
-msgstr ""
-
-#: ../gtk/propertybox.c:1068
-msgid "Brazilian Portugese"
-msgstr ""
-
-#: ../gtk/propertybox.c:1069
-msgid "Polish"
-msgstr ""
-
-#: ../gtk/propertybox.c:1070
-msgid "German"
-msgstr ""
-
-#: ../gtk/propertybox.c:1071
-msgid "Russian"
 msgstr ""
 
 #: ../gtk/propertybox.c:1072
-msgid "Japanese"
+msgid "English"
 msgstr ""
 
 #: ../gtk/propertybox.c:1073
-msgid "Dutch"
+msgid "French"
 msgstr ""
 
 #: ../gtk/propertybox.c:1074
-msgid "Hungarian"
+msgid "Swedish"
 msgstr ""
 
 #: ../gtk/propertybox.c:1075
-msgid "Czech"
+msgid "Italian"
 msgstr ""
 
 #: ../gtk/propertybox.c:1076
-msgid "Chinese"
+msgid "Spanish"
 msgstr ""
 
 #: ../gtk/propertybox.c:1077
-msgid "Traditional Chinese"
+msgid "Brazilian Portugese"
 msgstr ""
 
 #: ../gtk/propertybox.c:1078
-msgid "Norwegian"
+msgid "Polish"
 msgstr ""
 
 #: ../gtk/propertybox.c:1079
-msgid "Hebrew"
+msgid "German"
 msgstr ""
 
 #: ../gtk/propertybox.c:1080
+msgid "Russian"
+msgstr ""
+
+#: ../gtk/propertybox.c:1081
+msgid "Japanese"
+msgstr ""
+
+#: ../gtk/propertybox.c:1082
+msgid "Dutch"
+msgstr ""
+
+#: ../gtk/propertybox.c:1083
+msgid "Hungarian"
+msgstr ""
+
+#: ../gtk/propertybox.c:1084
+msgid "Czech"
+msgstr ""
+
+#: ../gtk/propertybox.c:1085
+msgid "Chinese"
+msgstr ""
+
+#: ../gtk/propertybox.c:1086
+msgid "Traditional Chinese"
+msgstr ""
+
+#: ../gtk/propertybox.c:1087
+msgid "Norwegian"
+msgstr ""
+
+#: ../gtk/propertybox.c:1088
+msgid "Hebrew"
+msgstr ""
+
+#: ../gtk/propertybox.c:1089
 msgid "Serbian"
 msgstr ""
 
-#: ../gtk/propertybox.c:1147
+#: ../gtk/propertybox.c:1156
 msgid ""
 "You need to restart linphone for the new language selection to take effect."
 msgstr ""
 
-#: ../gtk/propertybox.c:1225
+#: ../gtk/propertybox.c:1234
 msgid "None"
 msgstr "Nenhum"
 
-#: ../gtk/propertybox.c:1229
+#: ../gtk/propertybox.c:1238
 msgid "SRTP"
 msgstr ""
 
-#: ../gtk/propertybox.c:1235
+#: ../gtk/propertybox.c:1244
 msgid "ZRTP"
 msgstr ""
 
@@ -414,14 +395,12 @@ msgid "Error communicating with server."
 msgstr ""
 
 #: ../gtk/buddylookup.c:164
-#, fuzzy
 msgid "Connecting..."
-msgstr "Contatando "
+msgstr ""
 
 #: ../gtk/buddylookup.c:168
-#, fuzzy
 msgid "Connected"
-msgstr "Conectado."
+msgstr ""
 
 #: ../gtk/buddylookup.c:172
 msgid "Receiving data..."
@@ -461,28 +440,24 @@ msgid "Enter your linphone.org username"
 msgstr ""
 
 #: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:79 ../gtk/ldap.ui.h:4
-#, fuzzy
 msgid "Username:"
-msgstr "Usuário"
+msgstr ""
 
 #: ../gtk/setupwizard.c:104 ../gtk/password.ui.h:4 ../gtk/ldap.ui.h:5
-#, fuzzy
 msgid "Password:"
-msgstr "Senha:"
+msgstr ""
 
 #: ../gtk/setupwizard.c:124
 msgid "Enter your account informations"
 msgstr ""
 
 #: ../gtk/setupwizard.c:140
-#, fuzzy
 msgid "Username*"
-msgstr "Usuário"
+msgstr ""
 
 #: ../gtk/setupwizard.c:141
-#, fuzzy
 msgid "Password*"
-msgstr "Senha:"
+msgstr ""
 
 #: ../gtk/setupwizard.c:144
 msgid "Domain*"
@@ -497,14 +472,12 @@ msgid "(*) Required fields"
 msgstr ""
 
 #: ../gtk/setupwizard.c:318
-#, fuzzy
 msgid "Username: (*)"
-msgstr "Usuário"
+msgstr ""
 
 #: ../gtk/setupwizard.c:320
-#, fuzzy
 msgid "Password: (*)"
-msgstr "Senha:"
+msgstr ""
 
 #: ../gtk/setupwizard.c:322
 msgid "Email: (*)"
@@ -530,8 +503,7 @@ msgstr ""
 
 #: ../gtk/setupwizard.c:413
 msgid ""
-"Please validate your account by clicking on the link we just sent you by "
-"email.\n"
+"Please validate your account by clicking on the link we just sent you by email.\n"
 "Then come back here and press Next button."
 msgstr ""
 
@@ -572,9 +544,9 @@ msgid "Terminating"
 msgstr ""
 
 #: ../gtk/incall_view.c:70 ../gtk/incall_view.c:94
-#, fuzzy, c-format
+#, c-format
 msgid "Call #%i"
-msgstr "Histórico de chamadas"
+msgstr ""
 
 #: ../gtk/incall_view.c:155
 #, c-format
@@ -590,9 +562,8 @@ msgid "ICE not activated"
 msgstr ""
 
 #: ../gtk/incall_view.c:223
-#, fuzzy
 msgid "ICE failed"
-msgstr "Histórico de chamadas"
+msgstr ""
 
 #: ../gtk/incall_view.c:225
 msgid "ICE in progress"
@@ -603,9 +574,8 @@ msgid "Going through one or more NATs"
 msgstr ""
 
 #: ../gtk/incall_view.c:229
-#, fuzzy
 msgid "Direct"
-msgstr "Redirecionado para %s..."
+msgstr ""
 
 #: ../gtk/incall_view.c:231
 msgid "Through a relay server"
@@ -620,18 +590,16 @@ msgid "uPnP in progress"
 msgstr ""
 
 #: ../gtk/incall_view.c:243
-#, fuzzy
 msgid "uPnp not available"
-msgstr "Informações não disponíveis"
+msgstr ""
 
 #: ../gtk/incall_view.c:245
 msgid "uPnP is running"
 msgstr ""
 
 #: ../gtk/incall_view.c:247
-#, fuzzy
 msgid "uPnP failed"
-msgstr "Histórico de chamadas"
+msgstr ""
 
 #: ../gtk/incall_view.c:257 ../gtk/incall_view.c:258
 msgid "Direct or through server"
@@ -658,114 +626,108 @@ msgstr ""
 msgid "Hang up"
 msgstr ""
 
-#: ../gtk/incall_view.c:501
-#, fuzzy
+#: ../gtk/incall_view.c:511
 msgid "<b>Calling...</b>"
-msgstr "Contatando "
+msgstr ""
 
-#: ../gtk/incall_view.c:504 ../gtk/incall_view.c:707
+#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:727
 msgid "00::00::00"
 msgstr ""
 
-#: ../gtk/incall_view.c:515
-#, fuzzy
+#: ../gtk/incall_view.c:525
 msgid "<b>Incoming call</b>"
-msgstr "Camadas recebidas"
+msgstr ""
 
-#: ../gtk/incall_view.c:552
+#: ../gtk/incall_view.c:562
 msgid "good"
 msgstr ""
 
-#: ../gtk/incall_view.c:554
+#: ../gtk/incall_view.c:564
 msgid "average"
 msgstr ""
 
-#: ../gtk/incall_view.c:556
+#: ../gtk/incall_view.c:566
 msgid "poor"
 msgstr ""
 
-#: ../gtk/incall_view.c:558
+#: ../gtk/incall_view.c:568
 msgid "very poor"
 msgstr ""
 
-#: ../gtk/incall_view.c:560
+#: ../gtk/incall_view.c:570
 msgid "too bad"
 msgstr ""
 
-#: ../gtk/incall_view.c:561 ../gtk/incall_view.c:577
+#: ../gtk/incall_view.c:571 ../gtk/incall_view.c:587
 msgid "unavailable"
 msgstr ""
 
-#: ../gtk/incall_view.c:669
+#: ../gtk/incall_view.c:679
 msgid "Secured by SRTP"
 msgstr ""
 
-#: ../gtk/incall_view.c:675
+#: ../gtk/incall_view.c:685
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
 msgstr ""
 
-#: ../gtk/incall_view.c:681
+#: ../gtk/incall_view.c:691
 msgid "Set unverified"
 msgstr ""
 
-#: ../gtk/incall_view.c:681 ../gtk/main.ui.h:4
+#: ../gtk/incall_view.c:691 ../gtk/main.ui.h:4
 msgid "Set verified"
 msgstr ""
 
-#: ../gtk/incall_view.c:702
+#: ../gtk/incall_view.c:722
 msgid "In conference"
 msgstr ""
 
-#: ../gtk/incall_view.c:702
-#, fuzzy
+#: ../gtk/incall_view.c:722
 msgid "<b>In call</b>"
-msgstr "Contatando "
+msgstr ""
 
-#: ../gtk/incall_view.c:738
-#, fuzzy
+#: ../gtk/incall_view.c:758
 msgid "<b>Paused call</b>"
-msgstr "Contatando "
+msgstr ""
 
-#: ../gtk/incall_view.c:751
+#: ../gtk/incall_view.c:771
 #, c-format
 msgid "%02i::%02i::%02i"
 msgstr ""
 
-#: ../gtk/incall_view.c:772
-#, fuzzy
+#: ../gtk/incall_view.c:794
 msgid "<b>Call ended.</b>"
-msgstr "Chamada cancelada."
+msgstr ""
 
-#: ../gtk/incall_view.c:803
+#: ../gtk/incall_view.c:825
 msgid "Transfer in progress"
 msgstr ""
 
-#: ../gtk/incall_view.c:806
+#: ../gtk/incall_view.c:828
 msgid "Transfer done."
 msgstr ""
 
-#: ../gtk/incall_view.c:809
-#, fuzzy
+#: ../gtk/incall_view.c:831
 msgid "Transfer failed."
-msgstr "Histórico de chamadas"
+msgstr ""
 
-#: ../gtk/incall_view.c:853
+#: ../gtk/incall_view.c:875
 msgid "Resume"
 msgstr ""
 
-#: ../gtk/incall_view.c:860 ../gtk/main.ui.h:9
+#: ../gtk/incall_view.c:882 ../gtk/main.ui.h:9
 msgid "Pause"
 msgstr ""
 
-#: ../gtk/incall_view.c:926
+#: ../gtk/incall_view.c:948
 #, c-format
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
 msgstr ""
 
-#: ../gtk/incall_view.c:926
+#: ../gtk/incall_view.c:948
 msgid "(Paused)"
 msgstr ""
 
@@ -775,9 +737,9 @@ msgid "Please enter login information for %s"
 msgstr ""
 
 #: ../gtk/config-fetching.c:57
-#, fuzzy, c-format
+#, c-format
 msgid "fetching from %s"
-msgstr "Camadas recebidas"
+msgstr ""
 
 #: ../gtk/config-fetching.c:73
 #, c-format
@@ -807,23 +769,20 @@ msgid ""
 msgstr ""
 
 #: ../gtk/audio_assistant.c:328
-#, fuzzy
 msgid "Capture device"
-msgstr "Dispositivo de captura de som:"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:329
-#, fuzzy
 msgid "Recorded volume"
-msgstr "Origem de gravação:"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:333
 msgid "No voice"
 msgstr ""
 
 #: ../gtk/audio_assistant.c:369
-#, fuzzy
 msgid "Playback device"
-msgstr "Dispositivo de som:"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:370
 msgid "Play three beeps"
@@ -862,14 +821,12 @@ msgid "Record and Play"
 msgstr ""
 
 #: ../gtk/main.ui.h:1
-#, fuzzy
 msgid "<b>Callee name</b>"
-msgstr "Chamada cancelada."
+msgstr ""
 
 #: ../gtk/main.ui.h:2
-#, fuzzy
 msgid "Send"
-msgstr "Som"
+msgstr ""
 
 #: ../gtk/main.ui.h:3
 msgid "End conference"
@@ -892,14 +849,12 @@ msgid "Transfer"
 msgstr ""
 
 #: ../gtk/main.ui.h:14
-#, fuzzy
 msgid "In call"
-msgstr "Camadas recebidas"
+msgstr ""
 
 #: ../gtk/main.ui.h:15
-#, fuzzy
 msgid "Duration"
-msgstr "Informações"
+msgstr ""
 
 #: ../gtk/main.ui.h:16
 msgid "Call quality rating"
@@ -910,9 +865,8 @@ msgid "All users"
 msgstr ""
 
 #: ../gtk/main.ui.h:18
-#, fuzzy
 msgid "Online users"
-msgstr "linha"
+msgstr ""
 
 #: ../gtk/main.ui.h:19
 msgid "ADSL"
@@ -923,27 +877,24 @@ msgid "Fiber Channel"
 msgstr ""
 
 #: ../gtk/main.ui.h:21
-#, fuzzy
 msgid "Default"
-msgstr "Identificação SIP:"
+msgstr ""
 
 #: ../gtk/main.ui.h:22
 msgid "_Options"
 msgstr ""
 
 #: ../gtk/main.ui.h:23
-#, fuzzy
 msgid "Set configuration URI"
-msgstr "Configuração de proxy/registrador"
+msgstr ""
 
 #: ../gtk/main.ui.h:24
 msgid "Always start video"
 msgstr ""
 
 #: ../gtk/main.ui.h:25
-#, fuzzy
 msgid "Enable self-view"
-msgstr "Ativado"
+msgstr ""
 
 #: ../gtk/main.ui.h:26
 msgid "_Help"
@@ -974,66 +925,56 @@ msgid "Initiate a new call"
 msgstr ""
 
 #: ../gtk/main.ui.h:34
-#, fuzzy
 msgid "Contacts"
-msgstr "Contatando "
+msgstr ""
 
 #: ../gtk/main.ui.h:35
 msgid "Search"
 msgstr ""
 
 #: ../gtk/main.ui.h:36
-#, fuzzy
 msgid "<b>Add contacts from directory</b>"
-msgstr "Informação de contato"
+msgstr ""
 
 #: ../gtk/main.ui.h:37
-#, fuzzy
 msgid "Add contact"
-msgstr "Edicar informação de contato"
+msgstr ""
 
 #: ../gtk/main.ui.h:38
-#, fuzzy
 msgid "Recent calls"
-msgstr "Camadas recebidas"
+msgstr ""
 
 #: ../gtk/main.ui.h:39
-#, fuzzy
 msgid "My current identity:"
-msgstr "Identificação SIP:"
+msgstr ""
 
 #: ../gtk/main.ui.h:40 ../gtk/tunnel_config.ui.h:7
-#, fuzzy
 msgid "Username"
-msgstr "Usuário"
+msgstr ""
 
 #: ../gtk/main.ui.h:41 ../gtk/tunnel_config.ui.h:8
-#, fuzzy
 msgid "Password"
-msgstr "Senha:"
+msgstr ""
 
 #: ../gtk/main.ui.h:42
 msgid "Internet connection:"
 msgstr ""
 
 #: ../gtk/main.ui.h:43
-#, fuzzy
 msgid "Automatically log me in"
-msgstr "Adquirir automaticamente um nome de servidor válido."
+msgstr ""
 
 #: ../gtk/main.ui.h:44 ../gtk/password.ui.h:3
 msgid "UserID"
 msgstr ""
 
 #: ../gtk/main.ui.h:45
-#, fuzzy
 msgid "Login information"
-msgstr "Informação de contato"
+msgstr ""
 
 #: ../gtk/main.ui.h:46
-#, fuzzy
 msgid "<b>Welcome !</b>"
-msgstr "Contatando "
+msgstr ""
 
 #: ../gtk/main.ui.h:47
 msgid "Delete"
@@ -1068,9 +1009,8 @@ msgid ""
 msgstr ""
 
 #: ../gtk/contact.ui.h:2
-#, fuzzy
 msgid "SIP Address"
-msgstr "Endereço"
+msgstr ""
 
 #: ../gtk/contact.ui.h:3
 msgid "Show this contact presence status"
@@ -1081,9 +1021,8 @@ msgid "Allow this contact to see my presence status"
 msgstr ""
 
 #: ../gtk/contact.ui.h:5
-#, fuzzy
 msgid "<b>Contact information</b>"
-msgstr "Informação de contato"
+msgstr ""
 
 #: ../gtk/log.ui.h:1
 msgid "Linphone debug window"
@@ -1094,36 +1033,32 @@ msgid "Scroll to end"
 msgstr ""
 
 #: ../gtk/password.ui.h:1
-#, fuzzy
 msgid "Linphone - Authentication required"
-msgstr "Autenticação requerida"
+msgstr ""
 
 #: ../gtk/password.ui.h:2
 msgid "Please enter the domain password"
 msgstr ""
 
 #: ../gtk/call_logs.ui.h:1
-#, fuzzy
 msgid "Call history"
-msgstr "Linphone - Histórico de chamadas"
+msgstr ""
 
 #: ../gtk/call_logs.ui.h:2
 msgid "Clear all"
 msgstr ""
 
 #: ../gtk/call_logs.ui.h:3
-#, fuzzy
 msgid "Call back"
-msgstr "Histórico de chamadas"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:1
 msgid "Linphone - Configure a SIP account"
 msgstr ""
 
 #: ../gtk/sip_account.ui.h:2
-#, fuzzy
 msgid "Your SIP identity:"
-msgstr "Identificação SIP:"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:3
 msgid "Looks like sip:<username>@<domain>"
@@ -1134,23 +1069,20 @@ msgid "sip:"
 msgstr ""
 
 #: ../gtk/sip_account.ui.h:5
-#, fuzzy
 msgid "SIP Proxy address:"
-msgstr "Proxy SIP:"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:6
 msgid "Looks like sip:<proxy hostname>"
 msgstr ""
 
 #: ../gtk/sip_account.ui.h:7
-#, fuzzy
 msgid "Registration duration (sec):"
-msgstr "Período do registo:"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:8
-#, fuzzy
 msgid "Contact params (optional):"
-msgstr "Rota (opcional):"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:9
 msgid "AVPF regular RTCP interval (sec):"
@@ -1161,23 +1093,20 @@ msgid "Route (optional):"
 msgstr "Rota (opcional):"
 
 #: ../gtk/sip_account.ui.h:11
-#, fuzzy
 msgid "Transport"
-msgstr "Contatando "
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:12
 msgid "Register"
 msgstr ""
 
 #: ../gtk/sip_account.ui.h:13
-#, fuzzy
 msgid "Publish presence information"
-msgstr "Informar informação de presença"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:14
-#, fuzzy
 msgid "Enable AVPF"
-msgstr "Ativado"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:15
 msgid "Configure a SIP account"
@@ -1212,14 +1141,12 @@ msgid "CIF"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:8
-#, fuzzy
 msgid "Audio codecs"
-msgstr "Codec's de áudio"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:9
-#, fuzzy
 msgid "Video codecs"
-msgstr "Codec's de áudio"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:10 ../gtk/keypad.ui.h:5
 msgid "C"
@@ -1254,9 +1181,8 @@ msgid "Use IPv6 instead of IPv4"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:18
-#, fuzzy
 msgid "<b>Transport</b>"
-msgstr "Contatando "
+msgstr ""
 
 #: ../gtk/parameters.ui.h:19
 msgid "Media encryption type"
@@ -1287,14 +1213,12 @@ msgid "DSCP fields"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:26
-#, fuzzy
 msgid "SIP/TCP port"
-msgstr "Porta SIP"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:27
-#, fuzzy
 msgid "SIP/UDP port"
-msgstr "Porta SIP"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:28
 msgid "<b>Network protocol and ports</b>"
@@ -1321,76 +1245,64 @@ msgid "Behind NAT / Firewall (use uPnP)"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:34
-#, fuzzy
 msgid "Public IP address:"
-msgstr "Endereço sip:"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:35
-#, fuzzy
 msgid "Stun server:"
-msgstr "Dispositivo de som"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:36
-#, fuzzy
 msgid "<b>NAT and Firewall</b>"
-msgstr "Contatando "
+msgstr ""
 
 #: ../gtk/parameters.ui.h:37
-#, fuzzy
 msgid "Network settings"
-msgstr "Rede"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:38
-#, fuzzy
 msgid "Ring sound:"
-msgstr "Som do toque:"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:39
 msgid "ALSA special device (optional):"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:40
-#, fuzzy
 msgid "Capture device:"
-msgstr "Dispositivo de captura de som:"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:41
-#, fuzzy
 msgid "Ring device:"
-msgstr "Dispositivo de som"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:42
-#, fuzzy
 msgid "Playback device:"
-msgstr "Dispositivo de som:"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:43
 msgid "Enable echo cancellation"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:44
-#, fuzzy
 msgid "<b>Audio</b>"
-msgstr "Contatando "
+msgstr ""
 
 #: ../gtk/parameters.ui.h:45
-#, fuzzy
 msgid "Video input device:"
-msgstr "Dispositivo de som"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:46
 msgid "Prefered video resolution:"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:47
-#, fuzzy
 msgid "Video output method:"
-msgstr "Dispositivo de som"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:48
-#, fuzzy
 msgid "<b>Video</b>"
-msgstr "Contatando "
+msgstr ""
 
 #: ../gtk/parameters.ui.h:49
 msgid "Multimedia settings"
@@ -1405,28 +1317,24 @@ msgid "Your display name (eg: John Doe):"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:52
-#, fuzzy
 msgid "Your username:"
-msgstr "Usuário"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:53
-#, fuzzy
 msgid "Your resulting SIP address:"
-msgstr "Seu endereço SIP:"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:54
-#, fuzzy
 msgid "<b>Default identity</b>"
-msgstr "Identificação SIP:"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:55
 msgid "Wizard"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:56
-#, fuzzy
 msgid "Add"
-msgstr "Endereço"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:57
 msgid "Edit"
@@ -1437,18 +1345,16 @@ msgid "Remove"
 msgstr "Remover"
 
 #: ../gtk/parameters.ui.h:59
-#, fuzzy
 msgid "<b>Proxy accounts</b>"
-msgstr "Contatando "
+msgstr ""
 
 #: ../gtk/parameters.ui.h:60
 msgid "Erase all passwords"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:61
-#, fuzzy
 msgid "<b>Privacy</b>"
-msgstr "Contatando "
+msgstr ""
 
 #: ../gtk/parameters.ui.h:62
 msgid "Manage SIP Accounts"
@@ -1463,9 +1369,8 @@ msgid "Disable"
 msgstr "Desativar"
 
 #: ../gtk/parameters.ui.h:65
-#, fuzzy
 msgid "<b>Codecs</b>"
-msgstr "Contatando "
+msgstr ""
 
 #: ../gtk/parameters.ui.h:66
 msgid "0 stands for \"unlimited\""
@@ -1494,70 +1399,60 @@ msgid "<b>Bandwidth control</b>"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:72
-#, fuzzy
 msgid "Codecs"
-msgstr "Codec's de áudio"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:73
-#, fuzzy
 msgid "<b>Language</b>"
-msgstr "Contatando "
+msgstr ""
 
 #: ../gtk/parameters.ui.h:74
 msgid "Show advanced settings"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:75
-#, fuzzy
 msgid "<b>Level</b>"
-msgstr "Contatando "
+msgstr ""
 
 #: ../gtk/parameters.ui.h:76
-#, fuzzy
 msgid "User interface"
-msgstr "Usuário"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:77 ../gtk/ldap.ui.h:2
-#, fuzzy
 msgid "Server address:"
-msgstr "Endereço do servidor"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:78 ../gtk/ldap.ui.h:3
-#, fuzzy
 msgid "Authentication method:"
-msgstr "Informações de autenticação"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:80
 msgid "label"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:81
-#, fuzzy
 msgid "<b>LDAP Account setup</b>"
-msgstr "Contatando "
+msgstr ""
 
 #: ../gtk/parameters.ui.h:82
 msgid "LDAP"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:83
-#, fuzzy
 msgid "Done"
-msgstr "Nenhum"
+msgstr ""
 
 #: ../gtk/buddylookup.ui.h:1
-#, fuzzy
 msgid "Search contacts in directory"
-msgstr "Informação de contato"
+msgstr ""
 
 #: ../gtk/buddylookup.ui.h:2
 msgid "Add to my list"
 msgstr ""
 
 #: ../gtk/buddylookup.ui.h:3
-#, fuzzy
 msgid "<b>Search somebody</b>"
-msgstr "Contatando "
+msgstr ""
 
 #: ../gtk/waiting.ui.h:1
 msgid "Linphone"
@@ -1568,9 +1463,8 @@ msgid "Please wait"
 msgstr ""
 
 #: ../gtk/dscp_settings.ui.h:1
-#, fuzzy
 msgid "DSCP settings"
-msgstr "Rede"
+msgstr ""
 
 #: ../gtk/dscp_settings.ui.h:2
 msgid "SIP"
@@ -1589,19 +1483,16 @@ msgid "<b>Set DSCP values (in hexadecimal)</b>"
 msgstr ""
 
 #: ../gtk/call_statistics.ui.h:1
-#, fuzzy
 msgid "Call statistics"
-msgstr "Histórico de chamadas"
+msgstr ""
 
 #: ../gtk/call_statistics.ui.h:2
-#, fuzzy
 msgid "Audio codec"
-msgstr "Codec's de áudio"
+msgstr ""
 
 #: ../gtk/call_statistics.ui.h:3
-#, fuzzy
 msgid "Video codec"
-msgstr "Codec's de áudio"
+msgstr ""
 
 #: ../gtk/call_statistics.ui.h:4
 msgid "Audio IP bandwidth usage"
@@ -1620,9 +1511,8 @@ msgid "Video Media connectivity"
 msgstr ""
 
 #: ../gtk/call_statistics.ui.h:8
-#, fuzzy
 msgid "Round trip time"
-msgstr "Propriedades de som"
+msgstr ""
 
 #: ../gtk/call_statistics.ui.h:9
 msgid "Video resolution received"
@@ -1637,9 +1527,8 @@ msgid "RTP profile"
 msgstr ""
 
 #: ../gtk/call_statistics.ui.h:12
-#, fuzzy
 msgid "<b>Call statistics and information</b>"
-msgstr "Informação de contato"
+msgstr ""
 
 #: ../gtk/tunnel_config.ui.h:1
 msgid "Configure VoIP tunnel"
@@ -1722,23 +1611,20 @@ msgid "1"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:1
-#, fuzzy
 msgid "LDAP Settings"
-msgstr "Rede"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:6
 msgid "Use TLS Connection"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:7
-#, fuzzy
 msgid "Not yet available"
-msgstr "Informações não disponíveis"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:8
-#, fuzzy
 msgid "<b>Connection</b>"
-msgstr "Contatando "
+msgstr ""
 
 #: ../gtk/ldap.ui.h:9
 msgid "Bind DN"
@@ -1753,9 +1639,8 @@ msgid "Realm"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:12
-#, fuzzy
 msgid "<b>SASL</b>"
-msgstr "Contatando "
+msgstr ""
 
 #: ../gtk/ldap.ui.h:13
 msgid "Base object:"
@@ -1771,18 +1656,16 @@ msgid "Name Attribute:"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:17
-#, fuzzy
 msgid "SIP address attribute:"
-msgstr "Endereço"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:18
 msgid "Attributes to query:"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:19
-#, fuzzy
 msgid "<b>Search</b>"
-msgstr "Contatando "
+msgstr ""
 
 #: ../gtk/ldap.ui.h:20
 msgid "Timeout for search:"
@@ -1797,9 +1680,8 @@ msgid "Follow Aliases"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:23
-#, fuzzy
 msgid "<b>Miscellaneous</b>"
-msgstr "Contatando "
+msgstr ""
 
 #: ../gtk/ldap.ui.h:24
 msgid "ANONYMOUS"
@@ -1823,11 +1705,8 @@ msgstr ""
 
 #: ../gtk/config-uri.ui.h:2
 msgid ""
-"This dialog allows to set an http or https address when configuration is to "
-"be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, "
-"Linphone will restart automatically in order to fetch and take into account "
-"the new configuration. "
+"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
 msgstr ""
 
 #: ../gtk/config-uri.ui.h:4
@@ -1835,93 +1714,85 @@ msgid "https://"
 msgstr ""
 
 #: ../gtk/provisioning-fetch.ui.h:1
-#, fuzzy
 msgid "Configuring..."
-msgstr "Contatando "
+msgstr ""
 
 #: ../gtk/provisioning-fetch.ui.h:2
 msgid "Please wait while fetching configuration from server..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1034
-#, fuzzy
+#: ../coreapi/linphonecore.c:1511
 msgid "Ready"
-msgstr "Pronto."
+msgstr ""
 
-#: ../coreapi/linphonecore.c:1967
-#, fuzzy
+#: ../coreapi/linphonecore.c:2470
 msgid "Configuring"
-msgstr "Informações"
+msgstr ""
 
-#: ../coreapi/linphonecore.c:2133
+#: ../coreapi/linphonecore.c:2635
 msgid "Looking for telephone number destination..."
 msgstr "Procurando por telefone de destino..."
 
-#: ../coreapi/linphonecore.c:2136
+#: ../coreapi/linphonecore.c:2637
 msgid "Could not resolve this number."
 msgstr "Não foi possível encontrar este número."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2418
-#, fuzzy
+#: ../coreapi/linphonecore.c:2919
 msgid "Contacting"
-msgstr "Contatando "
+msgstr ""
 
-#: ../coreapi/linphonecore.c:2425
-#, fuzzy
+#: ../coreapi/linphonecore.c:2924
 msgid "Could not call"
-msgstr "Não é possível achar arquivo pixmap: %s"
+msgstr ""
 
-#: ../coreapi/linphonecore.c:2576
+#: ../coreapi/linphonecore.c:3074
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2745
-#, fuzzy
+#: ../coreapi/linphonecore.c:3233
 msgid "is contacting you"
-msgstr "está chamado você."
+msgstr ""
 
-#: ../coreapi/linphonecore.c:2746
+#: ../coreapi/linphonecore.c:3234
 msgid " and asked autoanswer."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2746
+#: ../coreapi/linphonecore.c:3234
 msgid "."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2865
+#: ../coreapi/linphonecore.c:3352
 msgid "Modifying call parameters..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3194
+#: ../coreapi/linphonecore.c:3700
 msgid "Connected."
 msgstr "Conectado."
 
-#: ../coreapi/linphonecore.c:3220
-#, fuzzy
+#: ../coreapi/linphonecore.c:3725
 msgid "Call aborted"
-msgstr "Abortado"
+msgstr ""
 
-#: ../coreapi/linphonecore.c:3412
+#: ../coreapi/linphonecore.c:3915
 msgid "Could not pause the call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3417
+#: ../coreapi/linphonecore.c:3919
 msgid "Pausing the current call..."
 msgstr ""
 
-#: ../coreapi/misc.c:425
+#: ../coreapi/misc.c:438
 msgid "Stun lookup in progress..."
 msgstr ""
 
-#: ../coreapi/misc.c:607
+#: ../coreapi/misc.c:619
 msgid "ICE local candidates gathering in progress..."
 msgstr ""
 
 #: ../coreapi/friend.c:33
-#, fuzzy
 msgid "Online"
-msgstr "linha"
+msgstr ""
 
 #: ../coreapi/friend.c:36
 msgid "Busy"
@@ -1956,484 +1827,155 @@ msgid "Using another messaging service"
 msgstr ""
 
 #: ../coreapi/friend.c:60
-#, fuzzy
 msgid "Offline"
-msgstr "linha"
+msgstr ""
 
 #: ../coreapi/friend.c:63
 msgid "Pending"
 msgstr ""
 
 #: ../coreapi/friend.c:66
-#, fuzzy
 msgid "Vacation"
-msgstr "Informações"
+msgstr ""
 
 #: ../coreapi/friend.c:68
 msgid "Unknown-bug"
 msgstr ""
 
-#: ../coreapi/proxy.c:314
+#: ../coreapi/proxy.c:319
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
 msgstr ""
 
-#: ../coreapi/proxy.c:320
+#: ../coreapi/proxy.c:325
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
 msgstr ""
 
-#: ../coreapi/proxy.c:1369
-#, fuzzy, c-format
+#: ../coreapi/proxy.c:1377
+#, c-format
 msgid "Could not login as %s"
-msgstr "Não é possível achar arquivo pixmap: %s"
+msgstr ""
 
-#: ../coreapi/callbacks.c:355
-#, fuzzy
+#: ../coreapi/callbacks.c:383
 msgid "Remote ringing."
-msgstr "Serviços remotos"
+msgstr ""
 
-#: ../coreapi/callbacks.c:373
-#, fuzzy
+#: ../coreapi/callbacks.c:404
 msgid "Remote ringing..."
-msgstr "Serviços remotos"
+msgstr ""
 
-#: ../coreapi/callbacks.c:384
+#: ../coreapi/callbacks.c:414
 msgid "Early media."
 msgstr ""
 
-#: ../coreapi/callbacks.c:435
-#, fuzzy, c-format
+#: ../coreapi/callbacks.c:475
+#, c-format
 msgid "Call with %s is paused."
-msgstr "Bate-papo com %s"
+msgstr ""
 
-#: ../coreapi/callbacks.c:448
+#: ../coreapi/callbacks.c:488
 #, c-format
 msgid "Call answered by %s - on hold."
 msgstr ""
 
-#: ../coreapi/callbacks.c:459
-#, fuzzy
+#: ../coreapi/callbacks.c:498
 msgid "Call resumed."
-msgstr "Chamada cancelada."
+msgstr ""
 
-#: ../coreapi/callbacks.c:464
-#, fuzzy, c-format
+#: ../coreapi/callbacks.c:502
+#, c-format
 msgid "Call answered by %s."
 msgstr ""
-"Ligar ou\n"
-"atender"
 
-#: ../coreapi/callbacks.c:483
+#: ../coreapi/callbacks.c:525
 msgid "Incompatible, check codecs or security settings..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:512
+#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:826
+msgid "Incompatible media parameters."
+msgstr ""
+
+#: ../coreapi/callbacks.c:560
 msgid "We have been resumed."
 msgstr ""
 
-#: ../coreapi/callbacks.c:521
+#. we are being paused
+#: ../coreapi/callbacks.c:568
 msgid "We are paused by other party."
 msgstr ""
 
-#: ../coreapi/callbacks.c:556
+#. reINVITE and in-dialogs UPDATE go here
+#: ../coreapi/callbacks.c:602
 msgid "Call is updated by remote."
 msgstr ""
 
-#: ../coreapi/callbacks.c:658
+#: ../coreapi/callbacks.c:705
 msgid "Call terminated."
 msgstr ""
 
-#: ../coreapi/callbacks.c:687
+#: ../coreapi/callbacks.c:733
 msgid "User is busy."
 msgstr "Usuário está ocupado."
 
-#: ../coreapi/callbacks.c:688
+#: ../coreapi/callbacks.c:734
 msgid "User is temporarily unavailable."
 msgstr "Usuário está temporáriamente indisponível."
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:690
+#: ../coreapi/callbacks.c:736
 msgid "User does not want to be disturbed."
 msgstr ""
 
-#: ../coreapi/callbacks.c:691
+#: ../coreapi/callbacks.c:737
 msgid "Call declined."
 msgstr ""
 
-#: ../coreapi/callbacks.c:706
+#: ../coreapi/callbacks.c:752
 msgid "Request timeout."
 msgstr ""
 
-#: ../coreapi/callbacks.c:737
-#, fuzzy
+#: ../coreapi/callbacks.c:780
 msgid "Redirected"
-msgstr "Redirecionado para %s..."
-
-#: ../coreapi/callbacks.c:787
-msgid "Incompatible media parameters."
 msgstr ""
 
-#: ../coreapi/callbacks.c:798
-#, fuzzy
+#: ../coreapi/callbacks.c:835
 msgid "Call failed."
-msgstr "Histórico de chamadas"
+msgstr ""
 
-#: ../coreapi/callbacks.c:878
-#, fuzzy, c-format
+#: ../coreapi/callbacks.c:913
+#, c-format
 msgid "Registration on %s successful."
-msgstr "Registro em %s efetuado."
+msgstr ""
 
-#: ../coreapi/callbacks.c:879
-#, fuzzy, c-format
+#: ../coreapi/callbacks.c:914
+#, c-format
 msgid "Unregistration on %s done."
-msgstr "Registro em %s efetuado."
+msgstr ""
 
-#: ../coreapi/callbacks.c:897
+#: ../coreapi/callbacks.c:932
 msgid "no response timeout"
 msgstr ""
 
-#: ../coreapi/callbacks.c:900
-#, fuzzy, c-format
+#: ../coreapi/callbacks.c:935
+#, c-format
 msgid "Registration on %s failed: %s"
-msgstr "Registro falhou (tempo esgotado)."
+msgstr ""
 
-#: ../coreapi/callbacks.c:907
+#: ../coreapi/callbacks.c:942
 msgid "Service unavailable, retrying"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:177
-#, fuzzy, c-format
+#: ../coreapi/linphonecall.c:174
+#, c-format
 msgid "Authentication token is %s"
-msgstr "Informações de autenticação"
+msgstr ""
 
-#: ../coreapi/linphonecall.c:2932
-#, fuzzy, c-format
+#: ../coreapi/linphonecall.c:3020
+#, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
-msgstr[0] "Você perdeu %i ligação(ões)."
-msgstr[1] "Você perdeu %i ligação(ões)."
-
-#~ msgid "aborted"
-#~ msgstr "Abortado"
-
-#~ msgid "completed"
-#~ msgstr "Competado"
-
-#~ msgid "missed"
-#~ msgstr "Perdido"
-
-#, fuzzy
-#~ msgid ""
-#~ "%s at %s\n"
-#~ "From: %s\n"
-#~ "To: %s\n"
-#~ "Status: %s\n"
-#~ "Duration: %i mn %i sec\n"
-#~ msgstr ""
-#~ "%s em %sDe: %s\n"
-#~ "Para: %s\n"
-#~ "Status: %s\n"
-#~ "Duração: %i min %i seg\n"
-
-#~ msgid "Outgoing call"
-#~ msgstr "Chamadas efetuadas"
-
-#~ msgid "Chat with %s"
-#~ msgstr "Bate-papo com %s"
-
-#, fuzzy
-#~ msgid "Choosing a username"
-#~ msgstr "Usuário"
-
-#, fuzzy
-#~ msgid "Enable video"
-#~ msgstr "Ativado"
-
-#, fuzzy
-#~ msgid "<b>Contact list</b>"
-#~ msgstr "Contatando "
-
-#, fuzzy
-#~ msgid "Audio & video"
-#~ msgstr "Codec's de áudio"
-
-#, fuzzy
-#~ msgid "Audio only"
-#~ msgstr "Codec's de áudio"
-
-#, fuzzy
-#~ msgid "Duration:"
-#~ msgstr "Informações"
-
-#, fuzzy
-#~ msgid "_Call history"
-#~ msgstr "Linphone - Histórico de chamadas"
-
-#, fuzzy
-#~ msgid "gtk-cancel"
-#~ msgstr "Conectado."
-
-#, fuzzy
-#~ msgid "gtk-ok"
-#~ msgstr "Remover"
-
-#, fuzzy
-#~ msgid "gtk-close"
-#~ msgstr "Conectado."
-
-#~ msgid ""
-#~ "Your machine appears to be connected to an IPv6 network. By default "
-#~ "linphone always uses IPv4. Please update your configuration if you want "
-#~ "to use IPv6"
-#~ msgstr ""
-#~ "Sua máquina aparentemente está conectada em uma rede IPv6. Por padrão o "
-#~ "linphone sempre usa IPv4. Por favor atualize sua configuração se deseja "
-#~ "usar IPv6"
-
-#~ msgid "Accept"
-#~ msgstr "Aceitar"
-
-#, fuzzy
-#~ msgid "Incoming call from"
-#~ msgstr "Camadas recebidas"
-
-#, fuzzy
-#~ msgid "Linphone - Incoming call"
-#~ msgstr "Camadas recebidas"
-
-#~ msgid "Could not reach destination."
-#~ msgstr "Não foi possível alcançar o detino."
-
-#~ msgid "Request Cancelled."
-#~ msgstr "Pedido cancelado."
-
-#~ msgid "User cannot be found at given address."
-#~ msgstr "Usuário não pode ser encontrado no endereço especificado."
-
-#~ msgid "Timeout."
-#~ msgstr "Tempo esgotado."
-
-#~ msgid "Remote host was found but refused connection."
-#~ msgstr "Servidor de destino encontrado, porém recusou a conexão."
-
-#, fuzzy
-#~ msgid "Gone"
-#~ msgstr "Nenhum"
-
-#, fuzzy
-#~ msgid "_Properties"
-#~ msgstr "Propriedades RTP:"
-
-#, fuzzy
-#~ msgid "Show logs"
-#~ msgstr "Exibir chamadas"
-
-#, fuzzy
-#~ msgid "_About"
-#~ msgstr "Aceitar"
-
-#, fuzzy
-#~ msgid "Proxy in use"
-#~ msgstr "Proxy à usar:"
-
-#~ msgid "Sound"
-#~ msgstr "Som"
-
-#, fuzzy
-#~ msgid "Proxy accounts"
-#~ msgstr "Proxy à usar:"
-
-#~ msgid "Go"
-#~ msgstr "Ir"
-
-#, fuzzy
-#~ msgid "Exit"
-#~ msgstr "Editar"
-
-#~ msgid "Shows the address book"
-#~ msgstr "Exibe o catálogo de endereços"
-
-#~ msgid ""
-#~ "Hangup\n"
-#~ "or refuse"
-#~ msgstr ""
-#~ "Desligar\n"
-#~ "ou recusar"
-
-#~ msgid "Or chat !"
-#~ msgstr "Ou bate-papo!"
-
-#~ msgid "Show more..."
-#~ msgstr "Exibir mais..."
-
-#~ msgid "Playback level:"
-#~ msgstr "Volume do auto-falante:"
-
-#~ msgid "Recording level:"
-#~ msgstr "Volume do microfone:"
-
-#, fuzzy
-#~ msgid "Ring level:"
-#~ msgstr "Volume do microfone:"
-
-#~ msgid "Busy, I'll be back in "
-#~ msgstr "Ocupado, volto em "
-
-#~ msgid "mn"
-#~ msgstr "min"
-
-#~ msgid "Moved temporarily"
-#~ msgstr "Movido temporáriamente"
-
-#~ msgid "Alternative service"
-#~ msgstr "Serviço alternativo"
-
-#~ msgid "Presence"
-#~ msgstr "Presença"
-
-#~ msgid "My online friends"
-#~ msgstr "Meus amigos online"
-
-#~ msgid ""
-#~ "Linphone is a web-phone.\n"
-#~ "It is compatible with SIP and RTP protocols."
-#~ msgstr ""
-#~ "Linphone é um web-fone.\n"
-#~ "Ele é compatível com os protocolos SIP e RTP."
-
-#~ msgid "Use IPv6 network (if available)"
-#~ msgstr "Usar rede IPv6 (se disponível)"
-
-#~ msgid ""
-#~ "Toggle this if you are on an ipv6 network and you wish linphone to use it."
-#~ msgstr ""
-#~ "Marque isto se você estiver em uma rede IPv6, e deseja que o linphone "
-#~ "este protocolo."
-
-#, fuzzy
-#~ msgid ""
-#~ "These options is only for users in a private network, behind a gateway. "
-#~ "If you are not in this situation, then leave this empty."
-#~ msgstr ""
-#~ "Esta opção é somente para usuários de uma rede privada, atrás de um "
-#~ "gateway. Se você não está nesta situação, deixe isto em braco."
-
-#~ msgid "NAT traversal options (experimental)"
-#~ msgstr "Opções de NAT(Experimental)"
-
-#~ msgid "Number of buffered miliseconds (jitter compensation):"
-#~ msgstr "Número de segundos em bueffer:"
-
-#~ msgid "RTP port used for audio:"
-#~ msgstr "Porta RTP usada para audio:"
-
-#~ msgid "Use SIP INFO message instead of RTP rfc2833 for DTMF transmitting"
-#~ msgstr ""
-#~ "Usar mensagem SIP INFO em vez de RTP rfc2833 para transmissão de DTMF"
-
-#~ msgid "RTP-RFC2833 is the recommended way."
-#~ msgstr "RTP-RFC2833 é a maneira recomendada."
-
-#~ msgid "Other"
-#~ msgstr "Outro"
-
-#~ msgid "micro"
-#~ msgstr "microfone"
-
-#~ msgid "Listen"
-#~ msgstr "Escutar"
-
-#~ msgid "Run sip user agent on port:"
-#~ msgstr "Executar agente sip na porta:"
-
-#~ msgid "It is strongly recommended to use port 5060."
-#~ msgstr "É altamente recomendavel usar a porta 5060."
-
-#~ msgid "Identity"
-#~ msgstr "Identificação"
-
-#~ msgid "Add proxy/registrar"
-#~ msgstr "Adicionar proxy/registrador"
-
-#~ msgid "Clear all stored authentication information (username,password...)"
-#~ msgstr ""
-#~ "Limpar todas as informações de autenticação (nomes de usuário, senha...)"
-
-#~ msgid "List of audio codecs, in order of preference:"
-#~ msgstr "Lista de codecs de audio, em ordem de preferência:"
-
-#~ msgid "Codec information"
-#~ msgstr "Informações sobre o codec"
-
-#~ msgid "Address Book"
-#~ msgstr "Catálogo de endereços"
-
-#~ msgid "Select"
-#~ msgstr "Selecionar"
-
-#~ msgid "None."
-#~ msgstr "Nenhum"
-
-#~ msgid "Send registration:"
-#~ msgstr "Enviar registro:"
-
-#~ msgid "Name:"
-#~ msgstr "Nome:"
-
-#~ msgid "Refuse"
-#~ msgstr "Recusar"
-
-#~ msgid "userid:"
-#~ msgstr "Identificação:"
-
-#~ msgid "Text:"
-#~ msgstr "Texto:"
-
-#~ msgid "linphone - receiving call from %s"
-#~ msgstr "Linphone - Recebendo chamada de %s"
-
-#~ msgid "User manual"
-#~ msgstr "Manual do usuário"
-
-#~ msgid "Ring sound selection"
-#~ msgstr "Seleção de toque"
-
-#~ msgid "Communication ended."
-#~ msgstr "Comunicação encerrada."
-
-#~ msgid "Firewall 's external ip address (in dot notations):"
-#~ msgstr "Endereço externo do firewall:"
-
-#~ msgid "Index"
-#~ msgstr "Índice"
-
-#~ msgid "28k modem"
-#~ msgstr "Modem 28k"
-
-#~ msgid "56k modem"
-#~ msgstr "Modem 56l"
-
-#~ msgid "64k modem (numeris)"
-#~ msgstr "Modem 64k"
-
-#~ msgid "ADSL or Cable modem"
-#~ msgstr "ADSL ou Cable modem"
-
-#~ msgid "Ethernet or equivalent"
-#~ msgstr "Ethernet ou equivalente"
-
-#~ msgid "Connection type:"
-#~ msgstr "Tipo de conexão:"
-
-#~ msgid ""
-#~ "Linphone could not open audio device %s. Check if your sound card is "
-#~ "fully configured and working."
-#~ msgstr ""
-#~ "Linphone não pode abrir dispositivo de áudio %s. Verifique se sua placa "
-#~ "de som está configurada e funcionando."
-
-#~ msgid "Type here the sip address of the person you want to call."
-#~ msgstr "Escreva aqui o endereço sip da pessoa que você quer ligar."
+msgstr[0] ""
+msgstr[1] ""
diff --git a/po/ru.po b/po/ru.po
index 6e916a63c..50023c1f8 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,23 +1,24 @@
-# SIP Telephony Application.
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
-# Simon Morlat <linphone@free.fr>, 2001.
-# Maxim Prokopyev <jazzelastic@gmail.com>, 2010.
-# Alexey Loginov <loginov.alex.valer@gmail.com>, 2014.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# a <loginov.alex.valer@gmail.com>, 2014
+# Maxim Prokopyev <jazzelastic@gmail.com>, 2010
+# Simon Morlat <linphone@free.fr>, 2001
 msgid ""
 msgstr ""
-"Project-Id-Version: \n"
+"Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-15 09:24+0200\n"
-"PO-Revision-Date: 2014-09-10 01:32+0300\n"
-"Last-Translator: AlexL <loginov.alex.valer@gmail.com>\n"
-"Language-Team: Russian <loginov.alex.valer@gmail.com>\n"
-"Language: ru\n"
+"POT-Creation-Date: 2014-11-19 10:39+0100\n"
+"PO-Revision-Date: 2014-11-19 10:13+0000\n"
+"Last-Translator: Cqnqrd <gautier.pelloux@gmail.com>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/linphone-gtk/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974
 #, c-format
@@ -76,18 +77,14 @@ msgstr "<big><b>%s</b></big>\t%s"
 msgid ""
 "<small><i>%s</i>\t<i>Quality: %s</i></small>\n"
 "%s\t%s\t"
-msgstr ""
-"<small><i>%s</i>\t<i>Качество: %s</i></small>\n"
-"%s\t%s\t"
+msgstr "<small><i>%s</i>\t<i>Качество: %s</i></small>\n%s\t%s\t"
 
 #: ../gtk/calllogs.c:343
 #, c-format
 msgid ""
 "<small><i>%s</i></small>\t\n"
 "%s"
-msgstr ""
-"<small><i>%s</i></small>\t\n"
-"%s"
+msgstr "<small><i>%s</i></small>\t\n%s"
 
 #: ../gtk/conference.c:38 ../gtk/main.ui.h:13
 msgid "Conference"
@@ -108,9 +105,7 @@ msgstr "Неверный sip контакт!"
 
 #: ../gtk/main.c:107
 msgid "log to stdout some debug information while running."
-msgstr ""
-"Вывод некоторой отладочной информации на устройство стандартного вывода во "
-"время работы."
+msgstr "Вывод некоторой отладочной информации на устройство стандартного вывода во время работы."
 
 #: ../gtk/main.c:114
 msgid "path to a file to write logs into."
@@ -134,11 +129,9 @@ msgstr "Если установлено, то автоматический пр
 
 #: ../gtk/main.c:149
 msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: c:"
-"\\Program Files\\Linphone)"
-msgstr ""
-"Определить рабочий каталог (относительно каталога установки, например: c:"
-"\\Program Files\\Linphone)"
+"Specifiy a working directory (should be the base of the installation, eg: "
+"c:\\Program Files\\Linphone)"
+msgstr "Определить рабочий каталог (относительно каталога установки, например: c:\\Program Files\\Linphone)"
 
 #: ../gtk/main.c:156
 msgid "Configuration file"
@@ -148,94 +141,80 @@ msgstr "Файл конфигурации"
 msgid "Run the audio assistant"
 msgstr "Запустить помощника аудио"
 
-#: ../gtk/main.c:590
-#, c-format
-msgid "Call with %s"
-msgstr "Звонок с %s"
-
-#: ../gtk/main.c:1183
+#: ../gtk/main.c:1085
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
-"Would you allow him to see your presence status or add him to your contact "
-"list ?\n"
+"Would you allow him to see your presence status or add him to your contact list ?\n"
 "If you answer no, this person will be temporarily blacklisted."
-msgstr ""
-"%s вы бы хотели быть добавленным в этот контактный лист.\n"
-"Вы разрешаете ему(ей) видеть ваш статус присутствия или добавить в "
-"контактный лист?\n"
-"Если вы ответите Нет, эта персона будет временно в чёрном списке."
+msgstr "%s вы бы хотели быть добавленным в этот контактный лист.\nВы разрешаете ему(ей) видеть ваш статус присутствия или добавить в контактный лист?\nЕсли вы ответите Нет, эта персона будет временно в чёрном списке."
 
-#: ../gtk/main.c:1260
+#: ../gtk/main.c:1162
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
-msgstr ""
-"Пожалуйста, введите пароль для пользователя <i>%s</i>\n"
-" для реалм (рилм) <i>%s</i>:"
+msgstr "Пожалуйста, введите пароль для пользователя <i>%s</i>\n для реалм (рилм) <i>%s</i>:"
 
-#: ../gtk/main.c:1376
+#: ../gtk/main.c:1283
 msgid "Call error"
 msgstr "Ошибка звонка"
 
-#: ../gtk/main.c:1379 ../coreapi/linphonecore.c:3240
+#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3744
 msgid "Call ended"
 msgstr "Звонок окончен"
 
-#: ../gtk/main.c:1382
+#: ../gtk/main.c:1289
 msgid "Incoming call"
 msgstr "Входящий звонок"
 
-#: ../gtk/main.c:1384 ../gtk/incall_view.c:522 ../gtk/main.ui.h:5
+#: ../gtk/main.c:1291 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
 msgid "Answer"
 msgstr "Ответ"
 
-#: ../gtk/main.c:1386 ../gtk/main.ui.h:6
+#: ../gtk/main.c:1293 ../gtk/main.ui.h:6
 msgid "Decline"
 msgstr "Отклонить"
 
-#: ../gtk/main.c:1392
+#: ../gtk/main.c:1299
 msgid "Call paused"
 msgstr "Звонок приостановлен"
 
-#: ../gtk/main.c:1392
+#: ../gtk/main.c:1299
 #, c-format
 msgid "<b>by %s</b>"
 msgstr "<b>%s</b>"
 
-#: ../gtk/main.c:1459
+#: ../gtk/main.c:1366
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr "%s предложил запустить видео. Вы принимаете?"
 
-#: ../gtk/main.c:1621
+#: ../gtk/main.c:1528
 msgid "Website link"
 msgstr "Домашняя страница"
 
-#: ../gtk/main.c:1670
+#: ../gtk/main.c:1577
 msgid "Linphone - a video internet phone"
 msgstr "Linphone - интернет видео телефон"
 
-#: ../gtk/main.c:1762
+#: ../gtk/main.c:1669
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (по умолчанию)"
 
-#: ../gtk/main.c:2099 ../coreapi/callbacks.c:949
+#: ../gtk/main.c:2006 ../coreapi/callbacks.c:983
 #, c-format
 msgid "We are transferred to %s"
 msgstr "Мы передали в %s"
 
-#: ../gtk/main.c:2109
+#: ../gtk/main.c:2016
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
-msgstr ""
-"Звуковые карты не были обнаружены на этом компьютере.\n"
-"Вы не сможете отправлять или получать аудио звонки."
+msgstr "Звуковые карты не были обнаружены на этом компьютере.\nВы не сможете отправлять или получать аудио звонки."
 
-#: ../gtk/main.c:2250
+#: ../gtk/main.c:2157
 msgid "A free SIP video-phone"
 msgstr "Свободный SIP видео-телефон"
 
@@ -312,94 +291,92 @@ msgstr "Не разрешён"
 msgid "Account"
 msgstr "Учётная запись"
 
-#: ../gtk/propertybox.c:1063
+#: ../gtk/propertybox.c:1072
 msgid "English"
 msgstr "Английский"
 
-#: ../gtk/propertybox.c:1064
+#: ../gtk/propertybox.c:1073
 msgid "French"
 msgstr "Французский"
 
-#: ../gtk/propertybox.c:1065
+#: ../gtk/propertybox.c:1074
 msgid "Swedish"
 msgstr "Шведский"
 
-#: ../gtk/propertybox.c:1066
+#: ../gtk/propertybox.c:1075
 msgid "Italian"
 msgstr "Итальянский"
 
-#: ../gtk/propertybox.c:1067
+#: ../gtk/propertybox.c:1076
 msgid "Spanish"
 msgstr "Испанский"
 
-#: ../gtk/propertybox.c:1068
+#: ../gtk/propertybox.c:1077
 msgid "Brazilian Portugese"
 msgstr "Бразильский португальский"
 
-#: ../gtk/propertybox.c:1069
+#: ../gtk/propertybox.c:1078
 msgid "Polish"
 msgstr "Польский"
 
-#: ../gtk/propertybox.c:1070
+#: ../gtk/propertybox.c:1079
 msgid "German"
 msgstr "Немецкий"
 
-#: ../gtk/propertybox.c:1071
+#: ../gtk/propertybox.c:1080
 msgid "Russian"
 msgstr "Русский"
 
-#: ../gtk/propertybox.c:1072
+#: ../gtk/propertybox.c:1081
 msgid "Japanese"
 msgstr "Японский"
 
-#: ../gtk/propertybox.c:1073
+#: ../gtk/propertybox.c:1082
 msgid "Dutch"
 msgstr "Датский"
 
-#: ../gtk/propertybox.c:1074
+#: ../gtk/propertybox.c:1083
 msgid "Hungarian"
 msgstr "Венгерский"
 
-#: ../gtk/propertybox.c:1075
+#: ../gtk/propertybox.c:1084
 msgid "Czech"
 msgstr "Чешский"
 
-#: ../gtk/propertybox.c:1076
+#: ../gtk/propertybox.c:1085
 msgid "Chinese"
 msgstr "Китайский"
 
-#: ../gtk/propertybox.c:1077
+#: ../gtk/propertybox.c:1086
 msgid "Traditional Chinese"
 msgstr "Традиционный китайский"
 
-#: ../gtk/propertybox.c:1078
+#: ../gtk/propertybox.c:1087
 msgid "Norwegian"
 msgstr "Норвежский"
 
-#: ../gtk/propertybox.c:1079
+#: ../gtk/propertybox.c:1088
 msgid "Hebrew"
 msgstr "Иврит"
 
-#: ../gtk/propertybox.c:1080
+#: ../gtk/propertybox.c:1089
 msgid "Serbian"
 msgstr "Сербский"
 
-#: ../gtk/propertybox.c:1147
+#: ../gtk/propertybox.c:1156
 msgid ""
 "You need to restart linphone for the new language selection to take effect."
-msgstr ""
-"Вы должны перезагрузить linphone для того, чтобы языковые настройки вступили "
-"в силу."
+msgstr "Вы должны перезагрузить linphone для того, чтобы языковые настройки вступили в силу."
 
-#: ../gtk/propertybox.c:1225
+#: ../gtk/propertybox.c:1234
 msgid "None"
 msgstr "Нет"
 
-#: ../gtk/propertybox.c:1229
+#: ../gtk/propertybox.c:1238
 msgid "SRTP"
 msgstr "SRTP"
 
-#: ../gtk/propertybox.c:1235
+#: ../gtk/propertybox.c:1244
 msgid "ZRTP"
 msgstr "ZRTP"
 
@@ -408,9 +385,7 @@ msgstr "ZRTP"
 msgid ""
 "A more recent version is availalble from %s.\n"
 "Would you like to open a browser to download it ?"
-msgstr ""
-"Доступна новая версия с %s.\n"
-"Открыть браузер для загрузки?"
+msgstr "Доступна новая версия с %s.\nОткрыть браузер для загрузки?"
 
 #: ../gtk/update.c:91
 msgid "You are running the lastest version."
@@ -448,9 +423,7 @@ msgstr[2] "Найдено %i контактов"
 msgid ""
 "Welcome !\n"
 "This assistant will help you to use a SIP account for your calls."
-msgstr ""
-"Добро пожаловать!\n"
-"Этот помощник поможет вам использовать учётную запись SIP для ваших звонков."
+msgstr "Добро пожаловать!\nЭтот помощник поможет вам использовать учётную запись SIP для ваших звонков."
 
 #: ../gtk/setupwizard.c:43
 msgid "Create an account on linphone.org"
@@ -458,8 +431,7 @@ msgstr "Создать учётную запись на linphone.org"
 
 #: ../gtk/setupwizard.c:44
 msgid "I have already a linphone.org account and I just want to use it"
-msgstr ""
-"Я уже имею учётную запись на linphone.org и только хочу использовать её"
+msgstr "Я уже имею учётную запись на linphone.org и только хочу использовать её"
 
 #: ../gtk/setupwizard.c:45
 msgid "I have already a sip account and I just want to use it"
@@ -529,10 +501,7 @@ msgstr "Информировать об обновлениях linphone"
 msgid ""
 "Error, account not validated, username already used or server unreachable.\n"
 "Please go back and try again."
-msgstr ""
-"Ошибка, учётная запись не подтверждена, имя пользователя уже используется "
-"или\n"
-"сервер недоступен. Пожалуйста, зайдите снова и попробуйте ещё раз."
+msgstr "Ошибка, учётная запись не подтверждена, имя пользователя уже используется или\nсервер недоступен. Пожалуйста, зайдите снова и попробуйте ещё раз."
 
 #: ../gtk/setupwizard.c:405
 msgid "Thank you. Your account is now configured and ready for use."
@@ -540,14 +509,9 @@ msgstr "Спасибо! Учётная запись успешно настро
 
 #: ../gtk/setupwizard.c:413
 msgid ""
-"Please validate your account by clicking on the link we just sent you by "
-"email.\n"
+"Please validate your account by clicking on the link we just sent you by email.\n"
 "Then come back here and press Next button."
-msgstr ""
-"Пожалуйста, подтвердите вашу учётную запись, щёлкнув на ссылку, которую вы "
-"только\n"
-"что получили по электронной почте. Затем вернитесь сюда и нажмите кнопку "
-"Далее."
+msgstr "Пожалуйста, подтвердите вашу учётную запись, щёлкнув на ссылку, которую вы только\nчто получили по электронной почте. Затем вернитесь сюда и нажмите кнопку Далее."
 
 #: ../gtk/setupwizard.c:600
 msgid "SIP account configuration assistant"
@@ -652,9 +616,7 @@ msgstr "Напрямую или через сервер"
 msgid ""
 "download: %f\n"
 "upload: %f (kbit/s)"
-msgstr ""
-"загрузка: %f\n"
-"отдача: %f (КБит/сек)"
+msgstr "загрузка: %f\nотдача: %f (КБит/сек)"
 
 #: ../gtk/incall_view.c:272 ../gtk/incall_view.c:274
 #, c-format
@@ -670,110 +632,108 @@ msgstr "%.3f секунд"
 msgid "Hang up"
 msgstr "Повесить трубку"
 
-#: ../gtk/incall_view.c:501
+#: ../gtk/incall_view.c:511
 msgid "<b>Calling...</b>"
 msgstr "<b>Звоним...</b>"
 
-#: ../gtk/incall_view.c:504 ../gtk/incall_view.c:707
+#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:727
 msgid "00::00::00"
 msgstr "00::00::00"
 
-#: ../gtk/incall_view.c:515
+#: ../gtk/incall_view.c:525
 msgid "<b>Incoming call</b>"
 msgstr "<b>Входящий звонок</b>"
 
-#: ../gtk/incall_view.c:552
+#: ../gtk/incall_view.c:562
 msgid "good"
 msgstr "хороший"
 
-#: ../gtk/incall_view.c:554
+#: ../gtk/incall_view.c:564
 msgid "average"
 msgstr "средний"
 
-#: ../gtk/incall_view.c:556
+#: ../gtk/incall_view.c:566
 msgid "poor"
 msgstr "плохой"
 
-#: ../gtk/incall_view.c:558
+#: ../gtk/incall_view.c:568
 msgid "very poor"
 msgstr "очень плохой"
 
-#: ../gtk/incall_view.c:560
+#: ../gtk/incall_view.c:570
 msgid "too bad"
 msgstr "совсем плохой"
 
-#: ../gtk/incall_view.c:561 ../gtk/incall_view.c:577
+#: ../gtk/incall_view.c:571 ../gtk/incall_view.c:587
 msgid "unavailable"
 msgstr "недоступен"
 
-#: ../gtk/incall_view.c:669
+#: ../gtk/incall_view.c:679
 msgid "Secured by SRTP"
 msgstr "Защищённые с помощью SRTP"
 
-#: ../gtk/incall_view.c:675
+#: ../gtk/incall_view.c:685
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
 msgstr "Защищённые с помощью ZRTP - [знак аутентификации: %s]"
 
-#: ../gtk/incall_view.c:681
+#: ../gtk/incall_view.c:691
 msgid "Set unverified"
 msgstr "Установить непроверенный"
 
-#: ../gtk/incall_view.c:681 ../gtk/main.ui.h:4
+#: ../gtk/incall_view.c:691 ../gtk/main.ui.h:4
 msgid "Set verified"
 msgstr "Установить проверенный"
 
-#: ../gtk/incall_view.c:702
+#: ../gtk/incall_view.c:722
 msgid "In conference"
 msgstr "В конференции"
 
-#: ../gtk/incall_view.c:702
+#: ../gtk/incall_view.c:722
 msgid "<b>In call</b>"
 msgstr "<b>Звоним</b>"
 
-#: ../gtk/incall_view.c:738
+#: ../gtk/incall_view.c:758
 msgid "<b>Paused call</b>"
 msgstr "<b>Звонок приостановлен</b>"
 
-#: ../gtk/incall_view.c:751
+#: ../gtk/incall_view.c:771
 #, c-format
 msgid "%02i::%02i::%02i"
 msgstr "%02i::%02i::%02i"
 
-#: ../gtk/incall_view.c:772
+#: ../gtk/incall_view.c:794
 msgid "<b>Call ended.</b>"
 msgstr "<b>Звонок закончен.</b>"
 
-#: ../gtk/incall_view.c:803
+#: ../gtk/incall_view.c:825
 msgid "Transfer in progress"
 msgstr "Передача в прогрессе"
 
-#: ../gtk/incall_view.c:806
+#: ../gtk/incall_view.c:828
 msgid "Transfer done."
 msgstr "Передача завершена."
 
-#: ../gtk/incall_view.c:809
+#: ../gtk/incall_view.c:831
 msgid "Transfer failed."
 msgstr "Передача неудачна."
 
-#: ../gtk/incall_view.c:853
+#: ../gtk/incall_view.c:875
 msgid "Resume"
 msgstr "Продолжить"
 
-#: ../gtk/incall_view.c:860 ../gtk/main.ui.h:9
+#: ../gtk/incall_view.c:882 ../gtk/main.ui.h:9
 msgid "Pause"
 msgstr "Пауза"
 
-#: ../gtk/incall_view.c:926
+#: ../gtk/incall_view.c:948
 #, c-format
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
-msgstr ""
-"<small><i>Записывается в\n"
-"%s %s</i></small>"
+msgstr "<small><i>Записывается в\n%s %s</i></small>"
 
-#: ../gtk/incall_view.c:926
+#: ../gtk/incall_view.c:948
 msgid "(Paused)"
 msgstr "(Пауза)"
 
@@ -812,9 +772,7 @@ msgstr "Слишком громко"
 msgid ""
 "Welcome !\n"
 "This assistant will help you to configure audio settings for Linphone"
-msgstr ""
-"Добро пожаловать!\n"
-"Этот помощник поможет вам сконфигурировать настройки аудио для linphone"
+msgstr "Добро пожаловать!\nЭтот помощник поможет вам сконфигурировать настройки аудио для linphone"
 
 #: ../gtk/audio_assistant.c:328
 msgid "Capture device"
@@ -1054,19 +1012,7 @@ msgid ""
 "cs: Petr Pisar <petr.pisar@atlas.cz>\n"
 "hu: anonymous\n"
 "he: Eli Zaretskii <eliz@gnu.org>\n"
-msgstr ""
-"fr: Simon Morlat\n"
-"en: Simon Morlat and Delphine Perreau\n"
-"it: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\n"
-"de: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\n"
-"sv: Daniel Nylander <po@danielnylander.se>\n"
-"es: Jesus Benitez <gnelson at inMail dot sk>\n"
-"ja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\n"
-"pt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\n"
-"pl: Robert Nasiadek <darkone@darkone.pl>\n"
-"cs: Petr Pisar <petr.pisar@atlas.cz>\n"
-"hu: anonymous\n"
-"he: Eli Zaretskii <eliz@gnu.org>\n"
+msgstr "fr: Simon Morlat\nen: Simon Morlat and Delphine Perreau\nit: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\nde: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\nsv: Daniel Nylander <po@danielnylander.se>\nes: Jesus Benitez <gnelson at inMail dot sk>\nja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\npt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\npl: Robert Nasiadek <darkone@darkone.pl>\ncs: Petr Pisar <petr.pisar@atlas.cz>\nhu: anonymous\nhe: Eli Zaretskii <eliz@gnu.org>\n"
 
 #: ../gtk/contact.ui.h:2
 msgid "SIP Address"
@@ -1370,9 +1316,7 @@ msgstr "Настройки мультимедиа"
 
 #: ../gtk/parameters.ui.h:50
 msgid "This section defines your SIP address when not using a SIP account"
-msgstr ""
-"Эта секция определяет ваш SIP адрес, когда вы не используете учётную запись "
-"SIP"
+msgstr "Эта секция определяет ваш SIP адрес, когда вы не используете учётную запись SIP"
 
 #: ../gtk/parameters.ui.h:51
 msgid "Your display name (eg: John Doe):"
@@ -1454,9 +1398,7 @@ msgstr "Разрешить адаптивное управление скоро
 msgid ""
 "<i>Adaptive rate control is a technique to dynamically guess the available "
 "bandwidth during a call.</i>"
-msgstr ""
-"<i>Адаптивное управление скоростью - это технология динамического угадывания "
-"доступной пропускной способности во время звонка.</i>"
+msgstr "<i>Адаптивное управление скоростью - это технология динамического угадывания доступной пропускной способности во время звонка.</i>"
 
 #: ../gtk/parameters.ui.h:71
 msgid "<b>Bandwidth control</b>"
@@ -1769,17 +1711,9 @@ msgstr "Указание удалённой конфигурации URI"
 
 #: ../gtk/config-uri.ui.h:2
 msgid ""
-"This dialog allows to set an http or https address when configuration is to "
-"be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, "
-"Linphone will restart automatically in order to fetch and take into account "
-"the new configuration. "
-msgstr ""
-"Этот диалог позволяет установить HTTP или HTTPS адрес, когда конфигурация "
-"будет получена при запуске.\n"
-"Пожалуйста, введите или измените настройки URI ниже. После нажатия OK "
-"linphone автоматически перезагрузится чтобы получить и учесть новую "
-"конфигурацию в учётной записи."
+"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
+msgstr "Этот диалог позволяет установить HTTP или HTTPS адрес, когда конфигурация будет получена при запуске.\nПожалуйста, введите или измените настройки URI ниже. После нажатия OK linphone автоматически перезагрузится чтобы получить и учесть новую конфигурацию в учётной записи."
 
 #: ../gtk/config-uri.ui.h:4
 msgid "https://"
@@ -1793,73 +1727,72 @@ msgstr "Конфигурирование..."
 msgid "Please wait while fetching configuration from server..."
 msgstr "Пожалуйста, подождите пока получается конфигурация с сервера..."
 
-#: ../coreapi/linphonecore.c:1034
+#: ../coreapi/linphonecore.c:1511
 msgid "Ready"
 msgstr "Готов"
 
-#: ../coreapi/linphonecore.c:1967
+#: ../coreapi/linphonecore.c:2470
 msgid "Configuring"
 msgstr "Конфигурирование"
 
-#: ../coreapi/linphonecore.c:2133
+#: ../coreapi/linphonecore.c:2635
 msgid "Looking for telephone number destination..."
 msgstr "Поиск назначения для телефонного номера.."
 
-#: ../coreapi/linphonecore.c:2136
+#: ../coreapi/linphonecore.c:2637
 msgid "Could not resolve this number."
 msgstr "Не получилось принять решение по этому номеру."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2418
+#: ../coreapi/linphonecore.c:2919
 msgid "Contacting"
 msgstr "Соединение"
 
-#: ../coreapi/linphonecore.c:2425
+#: ../coreapi/linphonecore.c:2924
 msgid "Could not call"
 msgstr "Невозможно позвонить"
 
-#: ../coreapi/linphonecore.c:2576
+#: ../coreapi/linphonecore.c:3074
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
-msgstr ""
-"К сожалению, мы достигли максимального количества одновременных звонков"
+msgstr "К сожалению, мы достигли максимального количества одновременных звонков"
 
-#: ../coreapi/linphonecore.c:2745
+#: ../coreapi/linphonecore.c:3233
 msgid "is contacting you"
 msgstr "контактирует с вами"
 
-#: ../coreapi/linphonecore.c:2746
+#: ../coreapi/linphonecore.c:3234
 msgid " and asked autoanswer."
 msgstr "и спросил автоматический ответ."
 
-#: ../coreapi/linphonecore.c:2746
+#: ../coreapi/linphonecore.c:3234
 msgid "."
 msgstr "."
 
-#: ../coreapi/linphonecore.c:2865
+#: ../coreapi/linphonecore.c:3352
 msgid "Modifying call parameters..."
 msgstr "Изменение параметров звонка..."
 
-#: ../coreapi/linphonecore.c:3194
+#: ../coreapi/linphonecore.c:3700
 msgid "Connected."
 msgstr "Соединён."
 
-#: ../coreapi/linphonecore.c:3220
+#: ../coreapi/linphonecore.c:3725
 msgid "Call aborted"
 msgstr "Звонок отменён"
 
-#: ../coreapi/linphonecore.c:3412
+#: ../coreapi/linphonecore.c:3915
 msgid "Could not pause the call"
 msgstr "Невозможно приостановить звонок"
 
-#: ../coreapi/linphonecore.c:3417
+#: ../coreapi/linphonecore.c:3919
 msgid "Pausing the current call..."
 msgstr "Приостановка текущего звонка..."
 
-#: ../coreapi/misc.c:425
+#: ../coreapi/misc.c:438
 msgid "Stun lookup in progress..."
 msgstr "Идет поиск STUN..."
 
-#: ../coreapi/misc.c:607
+#: ../coreapi/misc.c:619
 msgid "ICE local candidates gathering in progress..."
 msgstr "Сбор локальных кандидатов ICE в прогрессе..."
 
@@ -1915,332 +1848,141 @@ msgstr "Отдых"
 msgid "Unknown-bug"
 msgstr "Неизвестная ошибка"
 
-#: ../coreapi/proxy.c:314
+#: ../coreapi/proxy.c:319
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
-msgstr ""
-"Введённый SIP-адрес прокси является недействительным, он должен начинаться с "
-"\"sip:имя_хоста\""
+msgstr "Введённый SIP-адрес прокси является недействительным, он должен начинаться с \"sip:имя_хоста\""
 
-#: ../coreapi/proxy.c:320
+#: ../coreapi/proxy.c:325
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
-msgstr ""
-"Неверные параметры для sip идентификации\n"
-"Должно выглядеть как sip:имя_пользователя@домен_прокси, как например, sip:"
-"alice@example.net"
+msgstr "Неверные параметры для sip идентификации\nДолжно выглядеть как sip:имя_пользователя@домен_прокси, как например, sip:alice@example.net"
 
-#: ../coreapi/proxy.c:1369
+#: ../coreapi/proxy.c:1377
 #, c-format
 msgid "Could not login as %s"
 msgstr "Невозможно зайти как: %s"
 
-#: ../coreapi/callbacks.c:355
+#: ../coreapi/callbacks.c:383
 msgid "Remote ringing."
 msgstr "Дистанционный звонок."
 
-#: ../coreapi/callbacks.c:373
+#: ../coreapi/callbacks.c:404
 msgid "Remote ringing..."
 msgstr "Дистанционный звонок..."
 
-#: ../coreapi/callbacks.c:384
+#: ../coreapi/callbacks.c:414
 msgid "Early media."
 msgstr "Предответное проключение."
 
-#: ../coreapi/callbacks.c:435
+#: ../coreapi/callbacks.c:475
 #, c-format
 msgid "Call with %s is paused."
 msgstr "Звонок с %s приостановлен."
 
-#: ../coreapi/callbacks.c:448
+#: ../coreapi/callbacks.c:488
 #, c-format
 msgid "Call answered by %s - on hold."
 msgstr "На звонок ответил %s - на удержании."
 
-#: ../coreapi/callbacks.c:459
+#: ../coreapi/callbacks.c:498
 msgid "Call resumed."
 msgstr "Звонок возобновлён."
 
-#: ../coreapi/callbacks.c:464
+#: ../coreapi/callbacks.c:502
 #, c-format
 msgid "Call answered by %s."
 msgstr "На звонок ответил %s."
 
-#: ../coreapi/callbacks.c:483
+#: ../coreapi/callbacks.c:525
 msgid "Incompatible, check codecs or security settings..."
 msgstr "Несовместимость, проверьте кодеки или параметры безопасности..."
 
-#: ../coreapi/callbacks.c:512
+#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:826
+msgid "Incompatible media parameters."
+msgstr "Несовместимость медиа-параметров."
+
+#: ../coreapi/callbacks.c:560
 msgid "We have been resumed."
 msgstr "Мы возобновили."
 
-#: ../coreapi/callbacks.c:521
+#. we are being paused
+#: ../coreapi/callbacks.c:568
 msgid "We are paused by other party."
 msgstr "Мы приостановлены другой стороной."
 
-#: ../coreapi/callbacks.c:556
+#. reINVITE and in-dialogs UPDATE go here
+#: ../coreapi/callbacks.c:602
 msgid "Call is updated by remote."
 msgstr "Звонок был дистанционно обновлён."
 
-#: ../coreapi/callbacks.c:658
+#: ../coreapi/callbacks.c:705
 msgid "Call terminated."
 msgstr "Звонок прерван."
 
-#: ../coreapi/callbacks.c:687
+#: ../coreapi/callbacks.c:733
 msgid "User is busy."
 msgstr "Пользователь занят."
 
-#: ../coreapi/callbacks.c:688
+#: ../coreapi/callbacks.c:734
 msgid "User is temporarily unavailable."
 msgstr "Пользователь временно недоступен."
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:690
+#: ../coreapi/callbacks.c:736
 msgid "User does not want to be disturbed."
 msgstr "Пользователь не хочет чтобы его беспокоили."
 
-#: ../coreapi/callbacks.c:691
+#: ../coreapi/callbacks.c:737
 msgid "Call declined."
 msgstr "Звонок отклонён."
 
-#: ../coreapi/callbacks.c:706
+#: ../coreapi/callbacks.c:752
 msgid "Request timeout."
 msgstr "Таймаут запроса."
 
-#: ../coreapi/callbacks.c:737
+#: ../coreapi/callbacks.c:780
 msgid "Redirected"
 msgstr "Переадресован"
 
-#: ../coreapi/callbacks.c:787
-msgid "Incompatible media parameters."
-msgstr "Несовместимость медиа-параметров."
-
-#: ../coreapi/callbacks.c:798
+#: ../coreapi/callbacks.c:835
 msgid "Call failed."
 msgstr "Звонок не удался."
 
-#: ../coreapi/callbacks.c:878
+#: ../coreapi/callbacks.c:913
 #, c-format
 msgid "Registration on %s successful."
 msgstr "Регистрация на %s прошла успешно."
 
-#: ../coreapi/callbacks.c:879
+#: ../coreapi/callbacks.c:914
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "Отмена регистрации на %s завершена."
 
-#: ../coreapi/callbacks.c:897
+#: ../coreapi/callbacks.c:932
 msgid "no response timeout"
 msgstr "время ожидания истекло"
 
-#: ../coreapi/callbacks.c:900
+#: ../coreapi/callbacks.c:935
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "Регистрация на %s не удалась: %s"
 
-#: ../coreapi/callbacks.c:907
+#: ../coreapi/callbacks.c:942
 msgid "Service unavailable, retrying"
 msgstr "Сервис недоступен, повтор"
 
-#: ../coreapi/linphonecall.c:177
+#: ../coreapi/linphonecall.c:174
 #, c-format
 msgid "Authentication token is %s"
 msgstr "Маркер проверки подлинности: %s"
 
-#: ../coreapi/linphonecall.c:2932
+#: ../coreapi/linphonecall.c:3020
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
 msgstr[0] "У вас %i пропущенный вызов."
 msgstr[1] "У вас %i пропущенных вызова."
 msgstr[2] "У вас %i пропущенных вызов."
-
-#~ msgid ""
-#~ "<big><b>%s</b></big>\t<small><i>%s</i>\t<i>Quality: %s</i></small>\n"
-#~ "%s\t%s %s\t"
-#~ msgstr ""
-#~ "<big><b>%s</b></big>\t<small><i>%s</i>\t<i>Качество: %s</i></small>\n"
-#~ "%s\t%s %s\t"
-
-#~ msgid "Chat with %s"
-#~ msgstr "Чат с %s"
-
-#~ msgid ""
-#~ "Please enter your password for username <i>%s</i>\n"
-#~ " at domain <i>%s</i>:"
-#~ msgstr ""
-#~ "Пожалуйста, введите пароль для пользователя <i>%s</i>\n"
-#~ " для домена <i>%s</i>:"
-
-#~ msgid "<span size=\"large\">by %s</span>"
-#~ msgstr "<span size=\"large\">by %s</span>"
-
-#~ msgid "Min bitrate (kbit/s)"
-#~ msgstr "Минимальный битрейт (КБит/сек)"
-
-#~ msgid "Enable video"
-#~ msgstr "Разрешить видео"
-
-#~ msgid "Enter username, phone number, or full sip address"
-#~ msgstr "Введите имя пользователя, номер телефона или полный sip адрес"
-
-#~ msgid "Lookup:"
-#~ msgstr "Поиск:"
-
-#~ msgid "in"
-#~ msgstr "в"
-
-#~ msgid "Keypad"
-#~ msgstr "Клавиатура"
-
-#~ msgid ""
-#~ "fr: Simon Morlat\n"
-#~ "en: Simon Morlat and Delphine Perreau\n"
-#~ "it: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\n"
-#~ "de: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\n"
-#~ "sv: Daniel Nylander <po@danielnylander.se>\n"
-#~ "es: Jesus Benitez <gnelson at inMail dot sk>\n"
-#~ "ja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\n"
-#~ "pt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\n"
-#~ "pl: Robert Nasiadek <darkone@darkone.pl>\n"
-#~ "cs: Petr Pisar <petr.pisar@atlas.cz>\n"
-#~ "hu: anonymous\n"
-#~ msgstr ""
-#~ "fr: Simon Morlat\n"
-#~ "en: Simon Morlat and Delphine Perreau\n"
-#~ "it: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\n"
-#~ "de: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\n"
-#~ "sv: Daniel Nylander <po@danielnylander.se>\n"
-#~ "es: Jesus Benitez <gnelson at inMail dot sk>\n"
-#~ "ja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\n"
-#~ "pt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\n"
-#~ "pl: Robert Nasiadek <darkone@darkone.pl>\n"
-#~ "cs: Petr Pisar <petr.pisar@atlas.cz>\n"
-#~ "hu: anonymous\n"
-
-#~ msgid "edit"
-#~ msgstr "править"
-
-#~ msgid "Behind NAT / Firewall (specify gateway IP below)"
-#~ msgstr "За NAT / брандмауэром (указать IP шлюза ниже)"
-
-#~ msgid ""
-#~ "Register to FONICS\n"
-#~ "virtual network !"
-#~ msgstr ""
-#~ "Регистрация в \n"
-#~ "виртуальной сети FONICS!"
-
-#~ msgid "aborted"
-#~ msgstr "прервано"
-
-#~ msgid "completed"
-#~ msgstr "завершён"
-
-#~ msgid "missed"
-#~ msgstr "пропущено"
-
-#~ msgid ""
-#~ "%s at %s\n"
-#~ "From: %s\n"
-#~ "To: %s\n"
-#~ "Status: %s\n"
-#~ "Duration: %i mn %i sec\n"
-#~ msgstr ""
-#~ "%s в %s\n"
-#~ "От: %s\n"
-#~ "Кому: %s\n"
-#~ "Статус: %s\n"
-#~ "Длительность: %i мин. %i сек.\n"
-
-#~ msgid "Outgoing call"
-#~ msgstr "Исходящий звонок"
-
-#~ msgid ""
-#~ "Could not parse given sip address. A sip url usually looks like sip:"
-#~ "user@domain"
-#~ msgstr ""
-#~ "Не могу опознать sip адрес. Url для sip обычно выглядит как sip:"
-#~ "пользователь@домен"
-
-#~ msgid ""
-#~ "Your computer appears to be using ALSA sound drivers.\n"
-#~ "This is the best choice. However the pcm oss emulation module\n"
-#~ "is missing and linphone needs it. Please execute\n"
-#~ "'modprobe snd-pcm-oss' as root to load it."
-#~ msgstr ""
-#~ "Ваш компьютер использует ALSA звуковые драйвера.\n"
-#~ "Это лучший выбор. Однако, pcm oss модуль эмуляции\n"
-#~ "не найден, а он нужен для linphone.\n"
-#~ "Пожалуйста, выполните от пользователя root команду 'modprobe snd-pcm-oss' "
-#~ "чтобы загрузить его."
-
-#~ msgid ""
-#~ "Your computer appears to be using ALSA sound drivers.\n"
-#~ "This is the best choice. However the mixer oss emulation module\n"
-#~ "is missing and linphone needs it. Please execute\n"
-#~ " 'modprobe snd-mixer-oss' as root to load it."
-#~ msgstr ""
-#~ "Ваш компьютер использует ALSA звуковые драйвера.\n"
-#~ "Это лучший выбор. Однако, mixer oss модуль эмуляции\n"
-#~ "не найден, а он нужен для linphone.\n"
-#~ "Пожалуйста, выполните от пользователя root команду 'modprobe snd-pcm-oss' "
-#~ "чтобы загрузить его."
-
-#~ msgid "Incompatible, check codecs..."
-#~ msgstr "Несовместимость, проверьте кодеки..."
-
-#~ msgid "We are being paused..."
-#~ msgstr "Мы приостанавливаемся..."
-
-#~ msgid "We have been resumed..."
-#~ msgstr "Мы возобновили..."
-
-#~ msgid "Call has been updated by remote..."
-#~ msgstr "Звонок был дистанционно обновлён..."
-
-#~ msgid "No response."
-#~ msgstr "Нет ответа."
-
-#~ msgid "Protocol error."
-#~ msgstr "Ошибка протокола."
-
-#~ msgid "No common codecs"
-#~ msgstr "Нет общих кодеков"
-
-#~ msgid "Authentication failure"
-#~ msgstr "Неудача аутентификации"
-
-#~ msgid "Please choose a username:"
-#~ msgstr "Пожалуйста, выберите имя пользователя:"
-
-#~ msgid "Checking if '%s' is available..."
-#~ msgstr "Проверка доступности для '%s'"
-
-#~ msgid "Please wait..."
-#~ msgstr "Пожалуйста, подождите..."
-
-#~ msgid "Sorry this username already exists. Please try a new one."
-#~ msgstr ""
-#~ "Такое имя пользователя уже существует. Пожалуйста, попробуйте с другим "
-#~ "именем."
-
-#~ msgid "Ok !"
-#~ msgstr "ОК!"
-
-#~ msgid "Communication problem, please try again later."
-#~ msgstr "Проблемы со связью, пожалуйста, повторите попытку позже."
-
-#~ msgid "Choosing a username"
-#~ msgstr "Выбор имени пользователя"
-
-#~ msgid "Verifying"
-#~ msgstr "Проверка"
-
-#~ msgid "Creating your account"
-#~ msgstr "Создание вашей учётной записи"
-
-#~ msgid "Now ready !"
-#~ msgstr "Готово!"
diff --git a/po/sr.po b/po/sr.po
index 2ec83343c..89a40b99c 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,20 +1,21 @@
-# SIP Telephony Application.
-# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2013.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: linphone 0.7.1\n"
+"Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-15 09:24+0200\n"
-"PO-Revision-Date: 2013-02-11 19:03+0200\n"
-"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
-"Language-Team: Serbian <gnom@prevod.org>\n"
-"Language: sr\n"
+"POT-Creation-Date: 2014-11-19 10:39+0100\n"
+"PO-Revision-Date: 2014-11-19 10:15+0000\n"
+"Last-Translator: Cqnqrd <gautier.pelloux@gmail.com>\n"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/linphone-gtk/language/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n"
-"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Language: sr\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974
 #, c-format
@@ -27,71 +28,60 @@ msgid "Send text to %s"
 msgstr "Пошаљи текст за %s"
 
 #: ../gtk/calllogs.c:232
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Recent calls (%i)</b>"
-msgstr "<b>У позиву</b>"
+msgstr ""
 
 #: ../gtk/calllogs.c:314
 msgid "n/a"
 msgstr "н/д"
 
 #: ../gtk/calllogs.c:317
-#, fuzzy
 msgid "Aborted"
-msgstr "прекинути"
+msgstr ""
 
 #: ../gtk/calllogs.c:320
-#, fuzzy
 msgid "Missed"
-msgstr "пропуштени"
+msgstr ""
 
 #: ../gtk/calllogs.c:323
-#, fuzzy
 msgid "Declined"
-msgstr "Одбиј"
+msgstr ""
 
 #: ../gtk/calllogs.c:329
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
-msgstr[0] "%i минут"
-msgstr[1] "%i минута"
-msgstr[2] "%i минута"
-msgstr[3] "Један минут"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #: ../gtk/calllogs.c:332
 #, c-format
 msgid "%i second"
 msgid_plural "%i seconds"
-msgstr[0] "%i секунда"
-msgstr[1] "%i секунде"
-msgstr[2] "%i секунде"
-msgstr[3] "Једна секунда"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #: ../gtk/calllogs.c:335 ../gtk/calllogs.c:341
-#, fuzzy, c-format
+#, c-format
 msgid "<big><b>%s</b></big>\t%s"
 msgstr ""
-"<big><b>%s</b></big>\t<small><i>%s</i>\t<i>Квалитет: %s</i></small>\n"
-"%s\t%s %s\t"
 
 #: ../gtk/calllogs.c:337
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<small><i>%s</i>\t<i>Quality: %s</i></small>\n"
 "%s\t%s\t"
 msgstr ""
-"<big><b>%s</b></big>\t<small><i>%s</i>\t<i>Квалитет: %s</i></small>\n"
-"%s\t%s %s\t"
 
 #: ../gtk/calllogs.c:343
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<small><i>%s</i></small>\t\n"
 "%s"
 msgstr ""
-"<big><b>%s</b></big>\t<small><i>%s</i>\t<i>Квалитет: %s</i></small>\n"
-"%s\t%s %s\t"
 
 #: ../gtk/conference.c:38 ../gtk/main.ui.h:13
 msgid "Conference"
@@ -136,110 +126,92 @@ msgstr "ако је подешено сам ће се јављати на дол
 
 #: ../gtk/main.c:149
 msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: c:"
-"\\Program Files\\Linphone)"
-msgstr ""
-"Наводи радни директоријум (треба да буде основа инсталације, нпр: c:"
-"\\Program Files\\Linphone)"
+"Specifiy a working directory (should be the base of the installation, eg: "
+"c:\\Program Files\\Linphone)"
+msgstr "Наводи радни директоријум (треба да буде основа инсталације, нпр: c:\\Program Files\\Linphone)"
 
 #: ../gtk/main.c:156
-#, fuzzy
 msgid "Configuration file"
-msgstr "Потврђујем"
+msgstr ""
 
 #: ../gtk/main.c:163
-#, fuzzy
 msgid "Run the audio assistant"
-msgstr "Помоћник подешавања налога"
+msgstr ""
 
-#: ../gtk/main.c:590
-#, c-format
-msgid "Call with %s"
-msgstr "Позив са корисником %s"
-
-#: ../gtk/main.c:1183
+#: ../gtk/main.c:1085
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
-"Would you allow him to see your presence status or add him to your contact "
-"list ?\n"
+"Would you allow him to see your presence status or add him to your contact list ?\n"
 "If you answer no, this person will be temporarily blacklisted."
-msgstr ""
-"%s жели да вас дода на списак пријатеља.\n"
-"Да ли желите да му допустите да види ваше стање присуства или да га додате "
-"на ваш списак пријатеља ?\n"
-"Ако одговорите са не, ова особа ће привремено бити стављена на црни списак."
+msgstr "%s жели да вас дода на списак пријатеља.\nДа ли желите да му допустите да види ваше стање присуства или да га додате на ваш списак пријатеља ?\nАко одговорите са не, ова особа ће привремено бити стављена на црни списак."
 
-#: ../gtk/main.c:1260
-#, fuzzy, c-format
+#: ../gtk/main.c:1162
+#, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
 msgstr ""
-"Унесите вашу лозинку за корисничко име <i>%s</i>\n"
-" на домену <i>%s</i>:"
 
-#: ../gtk/main.c:1376
+#: ../gtk/main.c:1283
 msgid "Call error"
 msgstr "Грешка позива"
 
-#: ../gtk/main.c:1379 ../coreapi/linphonecore.c:3240
+#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3744
 msgid "Call ended"
 msgstr "Позив је завршен"
 
-#: ../gtk/main.c:1382
+#: ../gtk/main.c:1289
 msgid "Incoming call"
 msgstr "Долазни позив"
 
-#: ../gtk/main.c:1384 ../gtk/incall_view.c:522 ../gtk/main.ui.h:5
+#: ../gtk/main.c:1291 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
 msgid "Answer"
 msgstr "Јави се"
 
-#: ../gtk/main.c:1386 ../gtk/main.ui.h:6
+#: ../gtk/main.c:1293 ../gtk/main.ui.h:6
 msgid "Decline"
 msgstr "Одбиј"
 
-#: ../gtk/main.c:1392
+#: ../gtk/main.c:1299
 msgid "Call paused"
 msgstr "Позив је заустављен"
 
-#: ../gtk/main.c:1392
-#, fuzzy, c-format
+#: ../gtk/main.c:1299
+#, c-format
 msgid "<b>by %s</b>"
-msgstr "<b>Кодеци</b>"
+msgstr ""
 
-#: ../gtk/main.c:1459
+#: ../gtk/main.c:1366
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr ""
 
-#: ../gtk/main.c:1621
+#: ../gtk/main.c:1528
 msgid "Website link"
 msgstr "Веза веб сајта"
 
-#: ../gtk/main.c:1670
+#: ../gtk/main.c:1577
 msgid "Linphone - a video internet phone"
 msgstr "Линфон — интернет телефон са снимком"
 
-#: ../gtk/main.c:1762
+#: ../gtk/main.c:1669
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (основно)"
 
-#: ../gtk/main.c:2099 ../coreapi/callbacks.c:949
+#: ../gtk/main.c:2006 ../coreapi/callbacks.c:983
 #, c-format
 msgid "We are transferred to %s"
 msgstr "Преселили смо се на %s"
 
-#: ../gtk/main.c:2109
+#: ../gtk/main.c:2016
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
-msgstr ""
-"Ниједна звучна картица није откривен ана овом рачунару.\n"
-"Нећете бити у могућности да шаљете или да примате звучне позиве."
+msgstr "Ниједна звучна картица није откривен ана овом рачунару.\nНећете бити у могућности да шаљете или да примате звучне позиве."
 
-#: ../gtk/main.c:2250
+#: ../gtk/main.c:2157
 msgid "A free SIP video-phone"
 msgstr "Слободан СИП телефон са снимком"
 
@@ -279,9 +251,9 @@ msgid "Delete contact '%s'"
 msgstr "Обришите контакт „%s“"
 
 #: ../gtk/friendlist.c:978
-#, fuzzy, c-format
+#, c-format
 msgid "Delete chat history of '%s'"
-msgstr "Обришите контакт „%s“"
+msgstr ""
 
 #: ../gtk/friendlist.c:1029
 #, c-format
@@ -297,9 +269,8 @@ msgid "Status"
 msgstr "Стање"
 
 #: ../gtk/propertybox.c:570
-#, fuzzy
 msgid "IP Bitrate (kbit/s)"
-msgstr "Најмањи проток бита (kbit/s)"
+msgstr ""
 
 #: ../gtk/propertybox.c:577
 msgid "Parameters"
@@ -317,93 +288,92 @@ msgstr "Искључено"
 msgid "Account"
 msgstr "Налог"
 
-#: ../gtk/propertybox.c:1063
+#: ../gtk/propertybox.c:1072
 msgid "English"
 msgstr "Енглески"
 
-#: ../gtk/propertybox.c:1064
+#: ../gtk/propertybox.c:1073
 msgid "French"
 msgstr "Француски"
 
-#: ../gtk/propertybox.c:1065
+#: ../gtk/propertybox.c:1074
 msgid "Swedish"
 msgstr "Шведски"
 
-#: ../gtk/propertybox.c:1066
+#: ../gtk/propertybox.c:1075
 msgid "Italian"
 msgstr "Италијански"
 
-#: ../gtk/propertybox.c:1067
+#: ../gtk/propertybox.c:1076
 msgid "Spanish"
 msgstr "Шпански"
 
-#: ../gtk/propertybox.c:1068
+#: ../gtk/propertybox.c:1077
 msgid "Brazilian Portugese"
 msgstr "Бразилски португалски"
 
-#: ../gtk/propertybox.c:1069
+#: ../gtk/propertybox.c:1078
 msgid "Polish"
 msgstr "Пољски"
 
-#: ../gtk/propertybox.c:1070
+#: ../gtk/propertybox.c:1079
 msgid "German"
 msgstr "Немачки"
 
-#: ../gtk/propertybox.c:1071
+#: ../gtk/propertybox.c:1080
 msgid "Russian"
 msgstr "Руски"
 
-#: ../gtk/propertybox.c:1072
+#: ../gtk/propertybox.c:1081
 msgid "Japanese"
 msgstr "Јапански"
 
-#: ../gtk/propertybox.c:1073
+#: ../gtk/propertybox.c:1082
 msgid "Dutch"
 msgstr "Холандски"
 
-#: ../gtk/propertybox.c:1074
+#: ../gtk/propertybox.c:1083
 msgid "Hungarian"
 msgstr "Мађарски"
 
-#: ../gtk/propertybox.c:1075
+#: ../gtk/propertybox.c:1084
 msgid "Czech"
 msgstr "Чешки"
 
-#: ../gtk/propertybox.c:1076
+#: ../gtk/propertybox.c:1085
 msgid "Chinese"
 msgstr "Кинески"
 
-#: ../gtk/propertybox.c:1077
+#: ../gtk/propertybox.c:1086
 msgid "Traditional Chinese"
 msgstr "Традиционални кинески"
 
-#: ../gtk/propertybox.c:1078
+#: ../gtk/propertybox.c:1087
 msgid "Norwegian"
 msgstr "Норвешки"
 
-#: ../gtk/propertybox.c:1079
+#: ../gtk/propertybox.c:1088
 msgid "Hebrew"
 msgstr ""
 
-#: ../gtk/propertybox.c:1080
+#: ../gtk/propertybox.c:1089
 msgid "Serbian"
 msgstr ""
 
-#: ../gtk/propertybox.c:1147
+#: ../gtk/propertybox.c:1156
 msgid ""
 "You need to restart linphone for the new language selection to take effect."
-msgstr ""
-"Трба поново да покренете линфон да би нови изабрани језик ступио на снагу."
+msgstr "Трба поново да покренете линфон да би нови изабрани језик ступио на снагу."
 
-#: ../gtk/propertybox.c:1225
+#: ../gtk/propertybox.c:1234
 msgid "None"
 msgstr "Ништа"
 
-#: ../gtk/propertybox.c:1229
+#: ../gtk/propertybox.c:1238
 msgid "SRTP"
 msgstr "СРТП"
 
-#: ../gtk/propertybox.c:1235
+#: ../gtk/propertybox.c:1244
 msgid "ZRTP"
 msgstr "ЗРТП"
 
@@ -412,9 +382,7 @@ msgstr "ЗРТП"
 msgid ""
 "A more recent version is availalble from %s.\n"
 "Would you like to open a browser to download it ?"
-msgstr ""
-"Новије издање је доступно са „%s“.\n"
-"Да ли желите да отворите прегледник да га преузмете ?"
+msgstr "Новије издање је доступно са „%s“.\nДа ли желите да отворите прегледник да га преузмете ?"
 
 #: ../gtk/update.c:91
 msgid "You are running the lastest version."
@@ -444,33 +412,27 @@ msgstr "Примам податке..."
 #, c-format
 msgid "Found %i contact"
 msgid_plural "Found %i contacts"
-msgstr[0] "Нашао сам %i пријатеља"
-msgstr[1] "Нашао сам %i пријатеља"
-msgstr[2] "Нашао сам %i пријатеља"
-msgstr[3] "Нашао сам једног пријатеља"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #: ../gtk/setupwizard.c:34
 msgid ""
 "Welcome !\n"
 "This assistant will help you to use a SIP account for your calls."
-msgstr ""
-"Добродошли !\n"
-"Овај помоћник ће вам помоћи да користите СИП налог за ваше позиве."
+msgstr "Добродошли !\nОвај помоћник ће вам помоћи да користите СИП налог за ваше позиве."
 
 #: ../gtk/setupwizard.c:43
-#, fuzzy
 msgid "Create an account on linphone.org"
-msgstr "Направите налог тако што ћете изабрати корисничко име"
+msgstr ""
 
 #: ../gtk/setupwizard.c:44
-#, fuzzy
 msgid "I have already a linphone.org account and I just want to use it"
-msgstr "Већ имам један налог и желим да га користим"
+msgstr ""
 
 #: ../gtk/setupwizard.c:45
-#, fuzzy
 msgid "I have already a sip account and I just want to use it"
-msgstr "Већ имам један налог и желим да га користим"
+msgstr ""
 
 #: ../gtk/setupwizard.c:46
 msgid "I want to specify a remote configuration URI"
@@ -493,14 +455,12 @@ msgid "Enter your account informations"
 msgstr ""
 
 #: ../gtk/setupwizard.c:140
-#, fuzzy
 msgid "Username*"
-msgstr "Корисничко име"
+msgstr ""
 
 #: ../gtk/setupwizard.c:141
-#, fuzzy
 msgid "Password*"
-msgstr "Лозинка"
+msgstr ""
 
 #: ../gtk/setupwizard.c:144
 msgid "Domain*"
@@ -515,14 +475,12 @@ msgid "(*) Required fields"
 msgstr ""
 
 #: ../gtk/setupwizard.c:318
-#, fuzzy
 msgid "Username: (*)"
-msgstr "Корисничко име:"
+msgstr ""
 
 #: ../gtk/setupwizard.c:320
-#, fuzzy
 msgid "Password: (*)"
-msgstr "Лозинка:"
+msgstr ""
 
 #: ../gtk/setupwizard.c:322
 msgid "Email: (*)"
@@ -548,15 +506,13 @@ msgstr "Хвала вам. Ваш налог је сада подешен и с
 
 #: ../gtk/setupwizard.c:413
 msgid ""
-"Please validate your account by clicking on the link we just sent you by "
-"email.\n"
+"Please validate your account by clicking on the link we just sent you by email.\n"
 "Then come back here and press Next button."
 msgstr ""
 
 #: ../gtk/setupwizard.c:600
-#, fuzzy
 msgid "SIP account configuration assistant"
-msgstr "Помоћник подешавања налога"
+msgstr ""
 
 #: ../gtk/setupwizard.c:618
 msgid "Welcome to the account setup assistant"
@@ -567,9 +523,8 @@ msgid "Account setup assistant"
 msgstr "Помоћник подешавања налога"
 
 #: ../gtk/setupwizard.c:629
-#, fuzzy
 msgid "Configure your account (step 1/1)"
-msgstr "Подесите СИП налог"
+msgstr ""
 
 #: ../gtk/setupwizard.c:634
 msgid "Enter your sip username (step 1/1)"
@@ -602,18 +557,16 @@ msgid "Transfer to call #%i with %s"
 msgstr "Пребаци позив #%i са %s"
 
 #: ../gtk/incall_view.c:211 ../gtk/incall_view.c:214
-#, fuzzy
 msgid "Not used"
-msgstr "Нисам нашао"
+msgstr ""
 
 #: ../gtk/incall_view.c:221
 msgid "ICE not activated"
 msgstr ""
 
 #: ../gtk/incall_view.c:223
-#, fuzzy
 msgid "ICE failed"
-msgstr "Позив није успео."
+msgstr ""
 
 #: ../gtk/incall_view.c:225
 msgid "ICE in progress"
@@ -624,9 +577,8 @@ msgid "Going through one or more NATs"
 msgstr ""
 
 #: ../gtk/incall_view.c:229
-#, fuzzy
 msgid "Direct"
-msgstr "Преусмерен"
+msgstr ""
 
 #: ../gtk/incall_view.c:231
 msgid "Through a relay server"
@@ -637,23 +589,20 @@ msgid "uPnP not activated"
 msgstr ""
 
 #: ../gtk/incall_view.c:241
-#, fuzzy
 msgid "uPnP in progress"
-msgstr "У току је тражење стуна..."
+msgstr ""
 
 #: ../gtk/incall_view.c:243
-#, fuzzy
 msgid "uPnp not available"
-msgstr "недоступно"
+msgstr ""
 
 #: ../gtk/incall_view.c:245
 msgid "uPnP is running"
 msgstr ""
 
 #: ../gtk/incall_view.c:247
-#, fuzzy
 msgid "uPnP failed"
-msgstr "Позив није успео."
+msgstr ""
 
 #: ../gtk/incall_view.c:257 ../gtk/incall_view.c:258
 msgid "Direct or through server"
@@ -672,121 +621,118 @@ msgid "%ix%i @ %f fps"
 msgstr ""
 
 #: ../gtk/incall_view.c:304
-#, fuzzy, c-format
+#, c-format
 msgid "%.3f seconds"
-msgstr "%i секунда"
+msgstr ""
 
 #: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12
 msgid "Hang up"
 msgstr ""
 
-#: ../gtk/incall_view.c:501
+#: ../gtk/incall_view.c:511
 msgid "<b>Calling...</b>"
 msgstr "<b>Позивам...</b>"
 
-#: ../gtk/incall_view.c:504 ../gtk/incall_view.c:707
+#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:727
 msgid "00::00::00"
 msgstr "00::00::00"
 
-#: ../gtk/incall_view.c:515
+#: ../gtk/incall_view.c:525
 msgid "<b>Incoming call</b>"
 msgstr "<b>Долазни позив</b>"
 
-#: ../gtk/incall_view.c:552
+#: ../gtk/incall_view.c:562
 msgid "good"
 msgstr "добро"
 
-#: ../gtk/incall_view.c:554
+#: ../gtk/incall_view.c:564
 msgid "average"
 msgstr "просечно"
 
-#: ../gtk/incall_view.c:556
+#: ../gtk/incall_view.c:566
 msgid "poor"
 msgstr "оскудно"
 
-#: ../gtk/incall_view.c:558
+#: ../gtk/incall_view.c:568
 msgid "very poor"
 msgstr "јадно"
 
-#: ../gtk/incall_view.c:560
+#: ../gtk/incall_view.c:570
 msgid "too bad"
 msgstr "много лоше"
 
-#: ../gtk/incall_view.c:561 ../gtk/incall_view.c:577
+#: ../gtk/incall_view.c:571 ../gtk/incall_view.c:587
 msgid "unavailable"
 msgstr "недоступно"
 
-#: ../gtk/incall_view.c:669
+#: ../gtk/incall_view.c:679
 msgid "Secured by SRTP"
 msgstr "Осигурано СРТП-ом"
 
-#: ../gtk/incall_view.c:675
+#: ../gtk/incall_view.c:685
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
 msgstr "Осигурано ЗРТП-ом [потврђивање идентитета: %s]"
 
-#: ../gtk/incall_view.c:681
+#: ../gtk/incall_view.c:691
 msgid "Set unverified"
 msgstr "Непроверено подешавање"
 
-#: ../gtk/incall_view.c:681 ../gtk/main.ui.h:4
+#: ../gtk/incall_view.c:691 ../gtk/main.ui.h:4
 msgid "Set verified"
 msgstr "Проверено подешавање"
 
-#: ../gtk/incall_view.c:702
+#: ../gtk/incall_view.c:722
 msgid "In conference"
 msgstr "На конференцији"
 
-#: ../gtk/incall_view.c:702
+#: ../gtk/incall_view.c:722
 msgid "<b>In call</b>"
 msgstr "<b>У позиву</b>"
 
-#: ../gtk/incall_view.c:738
+#: ../gtk/incall_view.c:758
 msgid "<b>Paused call</b>"
 msgstr "<b>Заустављен позив</b>"
 
-#: ../gtk/incall_view.c:751
+#: ../gtk/incall_view.c:771
 #, c-format
 msgid "%02i::%02i::%02i"
 msgstr "%02i::%02i::%02i"
 
-#: ../gtk/incall_view.c:772
+#: ../gtk/incall_view.c:794
 msgid "<b>Call ended.</b>"
 msgstr "<b>Позив је завршен.</b>"
 
-#: ../gtk/incall_view.c:803
+#: ../gtk/incall_view.c:825
 msgid "Transfer in progress"
 msgstr ""
 
-#: ../gtk/incall_view.c:806
-#, fuzzy
+#: ../gtk/incall_view.c:828
 msgid "Transfer done."
-msgstr "Пребаци"
+msgstr ""
 
-#: ../gtk/incall_view.c:809
-#, fuzzy
+#: ../gtk/incall_view.c:831
 msgid "Transfer failed."
-msgstr "Пребаци"
+msgstr ""
 
-#: ../gtk/incall_view.c:853
+#: ../gtk/incall_view.c:875
 msgid "Resume"
 msgstr "Настави"
 
-#: ../gtk/incall_view.c:860 ../gtk/main.ui.h:9
+#: ../gtk/incall_view.c:882 ../gtk/main.ui.h:9
 msgid "Pause"
 msgstr "Застани"
 
-#: ../gtk/incall_view.c:926
+#: ../gtk/incall_view.c:948
 #, c-format
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
 msgstr ""
 
-#: ../gtk/incall_view.c:926
-#, fuzzy
+#: ../gtk/incall_view.c:948
 msgid "(Paused)"
-msgstr "Застани"
+msgstr ""
 
 #: ../gtk/loginframe.c:88
 #, c-format
@@ -820,18 +766,14 @@ msgid "Too loud"
 msgstr ""
 
 #: ../gtk/audio_assistant.c:318
-#, fuzzy
 msgid ""
 "Welcome !\n"
 "This assistant will help you to configure audio settings for Linphone"
 msgstr ""
-"Добродошли !\n"
-"Овај помоћник ће вам помоћи да користите СИП налог за ваше позиве."
 
 #: ../gtk/audio_assistant.c:328
-#, fuzzy
 msgid "Capture device"
-msgstr "Уређај за снимање:"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:329
 msgid "Recorded volume"
@@ -842,9 +784,8 @@ msgid "No voice"
 msgstr ""
 
 #: ../gtk/audio_assistant.c:369
-#, fuzzy
 msgid "Playback device"
-msgstr "Уређај за пуштање:"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:370
 msgid "Play three beeps"
@@ -863,14 +804,12 @@ msgid "Let's start Linphone now"
 msgstr ""
 
 #: ../gtk/audio_assistant.c:496
-#, fuzzy
 msgid "Audio Assistant"
-msgstr "Помоћник подешавања налога"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:506 ../gtk/main.ui.h:31
-#, fuzzy
 msgid "Audio assistant"
-msgstr "Помоћник подешавања налога"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:511
 msgid "Mic Gain calibration"
@@ -893,9 +832,8 @@ msgid "Send"
 msgstr "Пошаљи"
 
 #: ../gtk/main.ui.h:3
-#, fuzzy
 msgid "End conference"
-msgstr "На конференцији"
+msgstr ""
 
 #: ../gtk/main.ui.h:7
 msgid "Record this call to an audio file"
@@ -950,9 +888,8 @@ msgid "_Options"
 msgstr "_Могућности"
 
 #: ../gtk/main.ui.h:23
-#, fuzzy
 msgid "Set configuration URI"
-msgstr "Потврђујем"
+msgstr ""
 
 #: ../gtk/main.ui.h:24
 msgid "Always start video"
@@ -979,9 +916,8 @@ msgid "Check _Updates"
 msgstr "Провери _ажурирања"
 
 #: ../gtk/main.ui.h:30
-#, fuzzy
 msgid "Account assistant"
-msgstr "Помоћник подешавања налога"
+msgstr ""
 
 #: ../gtk/main.ui.h:32
 msgid "SIP address or phone number:"
@@ -1057,11 +993,9 @@ msgstr "(C) Беледон комуникације,2010\n"
 
 #: ../gtk/about.ui.h:4
 msgid "An internet video phone using the standard SIP (rfc3261) protocol."
-msgstr ""
-"Интернет телефон са снимком који користи уобичајени СИП (rfc3261) протокол."
+msgstr "Интернет телефон са снимком који користи уобичајени СИП (rfc3261) протокол."
 
 #: ../gtk/about.ui.h:5
-#, fuzzy
 msgid ""
 "fr: Simon Morlat\n"
 "en: Simon Morlat and Delphine Perreau\n"
@@ -1076,17 +1010,6 @@ msgid ""
 "hu: anonymous\n"
 "he: Eli Zaretskii <eliz@gnu.org>\n"
 msgstr ""
-"fr: Simon Morlat\n"
-"en: Simon Morlat and Delphine Perreau\n"
-"it: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\n"
-"de: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\n"
-"sv: Daniel Nylander <po@danielnylander.se>\n"
-"es: Jesus Benitez <gnelson at inMail dot sk>\n"
-"ja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\n"
-"pt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\n"
-"pl: Robert Nasiadek <darkone@darkone.pl>\n"
-"cs: Petr Pisar <petr.pisar@atlas.cz>\n"
-"hu: anonymous\n"
 
 #: ../gtk/contact.ui.h:2
 msgid "SIP Address"
@@ -1161,9 +1084,8 @@ msgid "Registration duration (sec):"
 msgstr "Трајање уписа (сек):"
 
 #: ../gtk/sip_account.ui.h:8
-#, fuzzy
 msgid "Contact params (optional):"
-msgstr "Рута (изборно):"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:9
 msgid "AVPF regular RTCP interval (sec):"
@@ -1174,9 +1096,8 @@ msgid "Route (optional):"
 msgstr "Рута (изборно):"
 
 #: ../gtk/sip_account.ui.h:11
-#, fuzzy
 msgid "Transport"
-msgstr "<b>Пренос</b>"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:12
 msgid "Register"
@@ -1187,9 +1108,8 @@ msgid "Publish presence information"
 msgstr "Објави податке о присуству"
 
 #: ../gtk/sip_account.ui.h:14
-#, fuzzy
 msgid "Enable AVPF"
-msgstr "Укључи"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:15
 msgid "Configure a SIP account"
@@ -1284,9 +1204,8 @@ msgid "Fixed"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:23
-#, fuzzy
 msgid "Media encryption is mandatory"
-msgstr "Врста шифровања медија"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:24
 msgid "Tunnel"
@@ -1313,23 +1232,20 @@ msgid "Direct connection to the Internet"
 msgstr "Непосредна веза на Интернет"
 
 #: ../gtk/parameters.ui.h:30
-#, fuzzy
 msgid "Behind NAT / Firewall (specify gateway IP )"
-msgstr "Иза НАТ-а / мрежне баријере (испод наведите ИП мрежног пролаза)"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:31
 msgid "Behind NAT / Firewall (use STUN to resolve)"
 msgstr "Иза НАТ-а / мрежне баријере (користите СТУН за решавање)"
 
 #: ../gtk/parameters.ui.h:32
-#, fuzzy
 msgid "Behind NAT / Firewall (use ICE)"
-msgstr "Иза НАТ-а / мрежне баријере (користите СТУН за решавање)"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:33
-#, fuzzy
 msgid "Behind NAT / Firewall (use uPnP)"
-msgstr "Иза НАТ-а / мрежне баријере (користите СТУН за решавање)"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:34
 msgid "Public IP address:"
@@ -1384,9 +1300,8 @@ msgid "Prefered video resolution:"
 msgstr "Жељена резолуција снимка:"
 
 #: ../gtk/parameters.ui.h:47
-#, fuzzy
 msgid "Video output method:"
-msgstr "Улазни уређај снимка:"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:48
 msgid "<b>Video</b>"
@@ -1480,9 +1395,7 @@ msgstr "Укључи прилагодљиво управљање протоко
 msgid ""
 "<i>Adaptive rate control is a technique to dynamically guess the available "
 "bandwidth during a call.</i>"
-msgstr ""
-"<i>Прилагодљиво управљање протоком је техника за променљиво погађање "
-"доступног пропусног опсега за време позива.</i>"
+msgstr "<i>Прилагодљиво управљање протоком је техника за променљиво погађање доступног пропусног опсега за време позива.</i>"
 
 #: ../gtk/parameters.ui.h:71
 msgid "<b>Bandwidth control</b>"
@@ -1509,23 +1422,20 @@ msgid "User interface"
 msgstr "Корисничко сучеље"
 
 #: ../gtk/parameters.ui.h:77 ../gtk/ldap.ui.h:2
-#, fuzzy
 msgid "Server address:"
-msgstr "Адреса СИП посредника:"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:78 ../gtk/ldap.ui.h:3
-#, fuzzy
 msgid "Authentication method:"
-msgstr "Потврђивање идентитета није успело"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:80
 msgid "label"
 msgstr "натпис"
 
 #: ../gtk/parameters.ui.h:81
-#, fuzzy
 msgid "<b>LDAP Account setup</b>"
-msgstr "<b>Посреднички налози</b>"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:82
 msgid "LDAP"
@@ -1556,23 +1466,20 @@ msgid "Please wait"
 msgstr "Молим сачекајте"
 
 #: ../gtk/dscp_settings.ui.h:1
-#, fuzzy
 msgid "DSCP settings"
-msgstr "Подешавања"
+msgstr ""
 
 #: ../gtk/dscp_settings.ui.h:2
 msgid "SIP"
 msgstr ""
 
 #: ../gtk/dscp_settings.ui.h:3
-#, fuzzy
 msgid "Audio RTP stream"
-msgstr "РТП/УДП звука:"
+msgstr ""
 
 #: ../gtk/dscp_settings.ui.h:4
-#, fuzzy
 msgid "Video RTP stream"
-msgstr "РТП/УДП снимка:"
+msgstr ""
 
 #: ../gtk/dscp_settings.ui.h:5
 msgid "<b>Set DSCP values (in hexadecimal)</b>"
@@ -1583,14 +1490,12 @@ msgid "Call statistics"
 msgstr ""
 
 #: ../gtk/call_statistics.ui.h:2
-#, fuzzy
 msgid "Audio codec"
-msgstr "Звучни кодеци"
+msgstr ""
 
 #: ../gtk/call_statistics.ui.h:3
-#, fuzzy
 msgid "Video codec"
-msgstr "Кодеци снимка"
+msgstr ""
 
 #: ../gtk/call_statistics.ui.h:4
 msgid "Audio IP bandwidth usage"
@@ -1617,23 +1522,20 @@ msgid "Video resolution received"
 msgstr ""
 
 #: ../gtk/call_statistics.ui.h:10
-#, fuzzy
 msgid "Video resolution sent"
-msgstr "Жељена резолуција снимка:"
+msgstr ""
 
 #: ../gtk/call_statistics.ui.h:11
 msgid "RTP profile"
 msgstr ""
 
 #: ../gtk/call_statistics.ui.h:12
-#, fuzzy
 msgid "<b>Call statistics and information</b>"
-msgstr "<b>Подаци о пријатељу</b>"
+msgstr ""
 
 #: ../gtk/tunnel_config.ui.h:1
-#, fuzzy
 msgid "Configure VoIP tunnel"
-msgstr "Подесите СИП налог"
+msgstr ""
 
 #: ../gtk/tunnel_config.ui.h:2
 msgid "Host"
@@ -1712,23 +1614,20 @@ msgid "1"
 msgstr "1"
 
 #: ../gtk/ldap.ui.h:1
-#, fuzzy
 msgid "LDAP Settings"
-msgstr "Подешавања"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:6
 msgid "Use TLS Connection"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:7
-#, fuzzy
 msgid "Not yet available"
-msgstr "недоступно"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:8
-#, fuzzy
 msgid "<b>Connection</b>"
-msgstr "<b>Кодеци</b>"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:9
 msgid "Bind DN"
@@ -1743,9 +1642,8 @@ msgid "Realm"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:12
-#, fuzzy
 msgid "<b>SASL</b>"
-msgstr "<b>Звук</b>"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:13
 msgid "Base object:"
@@ -1761,18 +1659,16 @@ msgid "Name Attribute:"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:17
-#, fuzzy
 msgid "SIP address attribute:"
-msgstr "СИП адреса или број телефона:"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:18
 msgid "Attributes to query:"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:19
-#, fuzzy
 msgid "<b>Search</b>"
-msgstr "<b>Потражите неког</b>"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:20
 msgid "Timeout for search:"
@@ -1787,9 +1683,8 @@ msgid "Follow Aliases"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:23
-#, fuzzy
 msgid "<b>Miscellaneous</b>"
-msgstr "<b>Снимак</b>"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:24
 msgid "ANONYMOUS"
@@ -1813,11 +1708,8 @@ msgstr ""
 
 #: ../gtk/config-uri.ui.h:2
 msgid ""
-"This dialog allows to set an http or https address when configuration is to "
-"be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, "
-"Linphone will restart automatically in order to fetch and take into account "
-"the new configuration. "
+"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
 msgstr ""
 
 #: ../gtk/config-uri.ui.h:4
@@ -1825,81 +1717,79 @@ msgid "https://"
 msgstr ""
 
 #: ../gtk/provisioning-fetch.ui.h:1
-#, fuzzy
 msgid "Configuring..."
-msgstr "Повезујем се..."
+msgstr ""
 
 #: ../gtk/provisioning-fetch.ui.h:2
 msgid "Please wait while fetching configuration from server..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1034
+#: ../coreapi/linphonecore.c:1511
 msgid "Ready"
 msgstr "Спреман"
 
-#: ../coreapi/linphonecore.c:1967
-#, fuzzy
+#: ../coreapi/linphonecore.c:2470
 msgid "Configuring"
-msgstr "Потврђујем"
+msgstr ""
 
-#: ../coreapi/linphonecore.c:2133
+#: ../coreapi/linphonecore.c:2635
 msgid "Looking for telephone number destination..."
 msgstr "Тражим одредиште телефонског броја..."
 
-#: ../coreapi/linphonecore.c:2136
+#: ../coreapi/linphonecore.c:2637
 msgid "Could not resolve this number."
 msgstr "Не могу да решим овај број."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2418
+#: ../coreapi/linphonecore.c:2919
 msgid "Contacting"
 msgstr "Ступам у везу"
 
-#: ../coreapi/linphonecore.c:2425
+#: ../coreapi/linphonecore.c:2924
 msgid "Could not call"
 msgstr "Не могу да позовем"
 
-#: ../coreapi/linphonecore.c:2576
+#: ../coreapi/linphonecore.c:3074
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "Извините, достигли смо највећи број истовремених позива"
 
-#: ../coreapi/linphonecore.c:2745
+#: ../coreapi/linphonecore.c:3233
 msgid "is contacting you"
 msgstr "вам се обраћа"
 
-#: ../coreapi/linphonecore.c:2746
+#: ../coreapi/linphonecore.c:3234
 msgid " and asked autoanswer."
 msgstr " и затражени само-одговор."
 
-#: ../coreapi/linphonecore.c:2746
+#: ../coreapi/linphonecore.c:3234
 msgid "."
 msgstr "."
 
-#: ../coreapi/linphonecore.c:2865
+#: ../coreapi/linphonecore.c:3352
 msgid "Modifying call parameters..."
 msgstr "Мењам параметре позива..."
 
-#: ../coreapi/linphonecore.c:3194
+#: ../coreapi/linphonecore.c:3700
 msgid "Connected."
 msgstr "Повезан сам."
 
-#: ../coreapi/linphonecore.c:3220
+#: ../coreapi/linphonecore.c:3725
 msgid "Call aborted"
 msgstr "Позив је прекинут"
 
-#: ../coreapi/linphonecore.c:3412
+#: ../coreapi/linphonecore.c:3915
 msgid "Could not pause the call"
 msgstr "Не могу да зауставим позив"
 
-#: ../coreapi/linphonecore.c:3417
+#: ../coreapi/linphonecore.c:3919
 msgid "Pausing the current call..."
 msgstr "Заустављам тренутни позив..."
 
-#: ../coreapi/misc.c:425
+#: ../coreapi/misc.c:438
 msgid "Stun lookup in progress..."
 msgstr "У току је тражење стуна..."
 
-#: ../coreapi/misc.c:607
+#: ../coreapi/misc.c:619
 msgid "ICE local candidates gathering in progress..."
 msgstr ""
 
@@ -1948,279 +1838,148 @@ msgid "Pending"
 msgstr "На чекању"
 
 #: ../coreapi/friend.c:66
-#, fuzzy
 msgid "Vacation"
-msgstr "Трајање"
+msgstr ""
 
 #: ../coreapi/friend.c:68
 msgid "Unknown-bug"
 msgstr "Непозната грешка"
 
-#: ../coreapi/proxy.c:314
+#: ../coreapi/proxy.c:319
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
-msgstr ""
-"Адреса сип посредника коју сте унели је неисправна, мора почети на „sip:“ за "
-"којим следи назив домаћина."
+msgstr "Адреса сип посредника коју сте унели је неисправна, мора почети на „sip:“ за којим следи назив домаћина."
 
-#: ../coreapi/proxy.c:320
+#: ../coreapi/proxy.c:325
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
-msgstr ""
-"Сип идентитет који сте унели није исправан.\n"
-"Треба да изгледа као „sip:корисник@домен-посредника, као што је „sip:"
-"alice@example.net“"
+msgstr "Сип идентитет који сте унели није исправан.\nТреба да изгледа као „sip:корисник@домен-посредника, као што је „sip:alice@example.net“"
 
-#: ../coreapi/proxy.c:1369
+#: ../coreapi/proxy.c:1377
 #, c-format
 msgid "Could not login as %s"
 msgstr "Не могу да се пријавим као %s"
 
-#: ../coreapi/callbacks.c:355
+#: ../coreapi/callbacks.c:383
 msgid "Remote ringing."
 msgstr "Удаљено звоњење."
 
-#: ../coreapi/callbacks.c:373
+#: ../coreapi/callbacks.c:404
 msgid "Remote ringing..."
 msgstr "Удаљено звоњење..."
 
-#: ../coreapi/callbacks.c:384
+#: ../coreapi/callbacks.c:414
 msgid "Early media."
 msgstr "Ранији медиј."
 
-#: ../coreapi/callbacks.c:435
+#: ../coreapi/callbacks.c:475
 #, c-format
 msgid "Call with %s is paused."
 msgstr "Позив са „%s“ је заустављен."
 
-#: ../coreapi/callbacks.c:448
+#: ../coreapi/callbacks.c:488
 #, c-format
 msgid "Call answered by %s - on hold."
 msgstr "Позив на који је одговорио „%s“ — на чекању."
 
-#: ../coreapi/callbacks.c:459
+#: ../coreapi/callbacks.c:498
 msgid "Call resumed."
 msgstr "Позив је настављен."
 
-#: ../coreapi/callbacks.c:464
+#: ../coreapi/callbacks.c:502
 #, c-format
 msgid "Call answered by %s."
 msgstr "На позив је одговорио „%s“."
 
-#: ../coreapi/callbacks.c:483
+#: ../coreapi/callbacks.c:525
 msgid "Incompatible, check codecs or security settings..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:512
-#, fuzzy
-msgid "We have been resumed."
-msgstr "Позив нам је настављен..."
+#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:826
+msgid "Incompatible media parameters."
+msgstr ""
 
-#: ../coreapi/callbacks.c:521
+#: ../coreapi/callbacks.c:560
+msgid "We have been resumed."
+msgstr ""
+
+#. we are being paused
+#: ../coreapi/callbacks.c:568
 msgid "We are paused by other party."
 msgstr ""
 
-#: ../coreapi/callbacks.c:556
-#, fuzzy
+#. reINVITE and in-dialogs UPDATE go here
+#: ../coreapi/callbacks.c:602
 msgid "Call is updated by remote."
-msgstr "Позив је ажуриран удаљеним..."
+msgstr ""
 
-#: ../coreapi/callbacks.c:658
+#: ../coreapi/callbacks.c:705
 msgid "Call terminated."
 msgstr "Позив је завршен."
 
-#: ../coreapi/callbacks.c:687
+#: ../coreapi/callbacks.c:733
 msgid "User is busy."
 msgstr "Корисник је заузет."
 
-#: ../coreapi/callbacks.c:688
+#: ../coreapi/callbacks.c:734
 msgid "User is temporarily unavailable."
 msgstr "Корисник је привремено недоступан."
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:690
+#: ../coreapi/callbacks.c:736
 msgid "User does not want to be disturbed."
 msgstr "Корисник не жели да буде узнемираван."
 
-#: ../coreapi/callbacks.c:691
+#: ../coreapi/callbacks.c:737
 msgid "Call declined."
 msgstr "Позив је одбијен."
 
-#: ../coreapi/callbacks.c:706
+#: ../coreapi/callbacks.c:752
 msgid "Request timeout."
 msgstr ""
 
-#: ../coreapi/callbacks.c:737
+#: ../coreapi/callbacks.c:780
 msgid "Redirected"
 msgstr "Преусмерен"
 
-#: ../coreapi/callbacks.c:787
-msgid "Incompatible media parameters."
-msgstr ""
-
-#: ../coreapi/callbacks.c:798
+#: ../coreapi/callbacks.c:835
 msgid "Call failed."
 msgstr "Позив није успео."
 
-#: ../coreapi/callbacks.c:878
+#: ../coreapi/callbacks.c:913
 #, c-format
 msgid "Registration on %s successful."
 msgstr "Уписивање на „%s“ је успело."
 
-#: ../coreapi/callbacks.c:879
+#: ../coreapi/callbacks.c:914
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "Исписивање са „%s“ је обављено."
 
-#: ../coreapi/callbacks.c:897
+#: ../coreapi/callbacks.c:932
 msgid "no response timeout"
 msgstr "нема ограничења одговора"
 
-#: ../coreapi/callbacks.c:900
+#: ../coreapi/callbacks.c:935
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "Уписивање на „%s“ није успело: %s"
 
-#: ../coreapi/callbacks.c:907
+#: ../coreapi/callbacks.c:942
 msgid "Service unavailable, retrying"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:177
+#: ../coreapi/linphonecall.c:174
 #, c-format
 msgid "Authentication token is %s"
 msgstr "Симбол потврђивања идентитета је „%s“"
 
-#: ../coreapi/linphonecall.c:2932
+#: ../coreapi/linphonecall.c:3020
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
-msgstr[0] "Пропустили сте %i позив."
-msgstr[1] "Пропустили сте %i позива."
-msgstr[2] "Пропустили сте %i позива."
-msgstr[3] "Пропустили сте један позив."
-
-#~ msgid "aborted"
-#~ msgstr "прекинути"
-
-#~ msgid "completed"
-#~ msgstr "завршени"
-
-#~ msgid "missed"
-#~ msgstr "пропуштени"
-
-#~ msgid ""
-#~ "%s at %s\n"
-#~ "From: %s\n"
-#~ "To: %s\n"
-#~ "Status: %s\n"
-#~ "Duration: %i mn %i sec\n"
-#~ msgstr ""
-#~ "%s у %s\n"
-#~ "Позива: %s\n"
-#~ "Прима: %s\n"
-#~ "Стање: %s\n"
-#~ "Трајање: %i мин %i сек\n"
-
-#~ msgid "Outgoing call"
-#~ msgstr "Одлазни позив"
-
-#~ msgid "No response."
-#~ msgstr "Нема одговора."
-
-#~ msgid "Protocol error."
-#~ msgstr "Грешка у протоколу."
-
-#~ msgid ""
-#~ "Could not parse given sip address. A sip url usually looks like sip:"
-#~ "user@domain"
-#~ msgstr ""
-#~ "Не могу да обрадим дату сип адресу. Сип адреса обично изгледа као „sip:"
-#~ "корисник@домен“"
-
-#~ msgid ""
-#~ "Your computer appears to be using ALSA sound drivers.\n"
-#~ "This is the best choice. However the pcm oss emulation module\n"
-#~ "is missing and linphone needs it. Please execute\n"
-#~ "'modprobe snd-pcm-oss' as root to load it."
-#~ msgstr ""
-#~ "Изгледа да ваш рачунар користи АЛСА управљачке програме за звук.\n"
-#~ "То је најбољи избор. Међутим недостаје пцм осс модул\n"
-#~ "за емулацију а потребан је линфону. Молим извршите\n"
-#~ "„modprobe snd-pcm-oss“ као администратор да га учитате."
-
-#~ msgid ""
-#~ "Your computer appears to be using ALSA sound drivers.\n"
-#~ "This is the best choice. However the mixer oss emulation module\n"
-#~ "is missing and linphone needs it. Please execute\n"
-#~ " 'modprobe snd-mixer-oss' as root to load it."
-#~ msgstr ""
-#~ "Изгледа да ваш рачунар користи АЛСА управљачке програме за звук.\n"
-#~ "То је најбољи избор. Међутим недостаје миксер осс модул\n"
-#~ "за емулацију а потребан је линфону. Молим извршите\n"
-#~ "„modprobe snd-mixer-oss“ као администратор да га учитате."
-
-#~ msgid "Chat with %s"
-#~ msgstr "Ћаскајте са „%s“"
-
-#~ msgid "<span size=\"large\">by %s</span>"
-#~ msgstr "<span size=\"large\">од %s</span>"
-
-#~ msgid "Please choose a username:"
-#~ msgstr "Изаберите корисничко име:"
-
-#~ msgid "Checking if '%s' is available..."
-#~ msgstr "Проверавам да ли је „%s“ доступно..."
-
-#~ msgid "Please wait..."
-#~ msgstr "Молим сачекајте..."
-
-#~ msgid "Sorry this username already exists. Please try a new one."
-#~ msgstr "Извините ово корисничко име већ постоји. Покушајте неко друго."
-
-#~ msgid "Ok !"
-#~ msgstr "У реду !"
-
-#~ msgid "Communication problem, please try again later."
-#~ msgstr "Проблем у комуникацији, касније покушајте опет."
-
-#~ msgid "Choosing a username"
-#~ msgstr "Бирам корисничко име"
-
-#~ msgid "Verifying"
-#~ msgstr "Проверавам"
-
-#~ msgid "Creating your account"
-#~ msgstr "Правим ваш налог"
-
-#~ msgid "Now ready !"
-#~ msgstr "Спремни смо сада !"
-
-#~ msgid "Enable video"
-#~ msgstr "Укључи снимак"
-
-#~ msgid "Enter username, phone number, or full sip address"
-#~ msgstr "Унесите корисничко име, број телефона, или пуну сип адресу"
-
-#~ msgid "Keypad"
-#~ msgstr "Тастатура"
-
-#~ msgid "Lookup:"
-#~ msgstr "Потражи:"
-
-#~ msgid "in"
-#~ msgstr "у"
-
-#~ msgid ""
-#~ "Register to FONICS\n"
-#~ "virtual network !"
-#~ msgstr ""
-#~ "Упишите се на виртуелну\n"
-#~ "мрежу ФОНИКС !"
-
-#~ msgid "We are being paused..."
-#~ msgstr "Заустављени смо..."
-
-#~ msgid "No common codecs"
-#~ msgstr "Нема познатих кодека"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
diff --git a/po/sv.po b/po/sv.po
index 59b307d05..de2c7ec48 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,20 +1,21 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-15 09:24+0200\n"
-"PO-Revision-Date: 2009-02-17 15:22+0100\n"
-"Last-Translator: Emmanuel Frécon <emmanuel.frecon@myjoice.com>\n"
-"Language-Team: SWEDISH <SE@li.org>\n"
-"Language: \n"
+"POT-Creation-Date: 2014-11-19 10:39+0100\n"
+"PO-Revision-Date: 2014-11-19 10:15+0000\n"
+"Last-Translator: Cqnqrd <gautier.pelloux@gmail.com>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/linphone-gtk/language/sv/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974
 #, c-format
@@ -27,28 +28,25 @@ msgid "Send text to %s"
 msgstr "Skicka text till %s"
 
 #: ../gtk/calllogs.c:232
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Recent calls (%i)</b>"
-msgstr "<b>I samtal med</b>"
+msgstr ""
 
 #: ../gtk/calllogs.c:314
 msgid "n/a"
 msgstr ""
 
 #: ../gtk/calllogs.c:317
-#, fuzzy
 msgid "Aborted"
-msgstr "avbrytade"
+msgstr ""
 
 #: ../gtk/calllogs.c:320
-#, fuzzy
 msgid "Missed"
-msgstr "missade"
+msgstr ""
 
 #: ../gtk/calllogs.c:323
-#, fuzzy
 msgid "Declined"
-msgstr "Avböj"
+msgstr ""
 
 #: ../gtk/calllogs.c:329
 #, c-format
@@ -88,9 +86,8 @@ msgid "Conference"
 msgstr ""
 
 #: ../gtk/conference.c:46
-#, fuzzy
 msgid "Me"
-msgstr "Mikrofon av"
+msgstr ""
 
 #: ../gtk/support.c:49 ../gtk/support.c:73 ../gtk/support.c:102
 #, c-format
@@ -127,110 +124,92 @@ msgstr "Om på, besvara automatisk alla inkommande samtal"
 
 #: ../gtk/main.c:149
 msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: c:"
-"\\Program Files\\Linphone)"
-msgstr ""
-"Välj en arbetskatalog som ska vara basen för installationen, såsom C:"
-"\\Program\\Linphone"
+"Specifiy a working directory (should be the base of the installation, eg: "
+"c:\\Program Files\\Linphone)"
+msgstr "Välj en arbetskatalog som ska vara basen för installationen, såsom C:\\Program\\Linphone"
 
 #: ../gtk/main.c:156
-#, fuzzy
 msgid "Configuration file"
-msgstr "Bekräftelse"
+msgstr ""
 
 #: ../gtk/main.c:163
-#, fuzzy
 msgid "Run the audio assistant"
-msgstr "Kontoinstallationsassistenten"
+msgstr ""
 
-#: ../gtk/main.c:590
-#, c-format
-msgid "Call with %s"
-msgstr "Samtal med %s"
-
-#: ../gtk/main.c:1183
+#: ../gtk/main.c:1085
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
-"Would you allow him to see your presence status or add him to your contact "
-"list ?\n"
+"Would you allow him to see your presence status or add him to your contact list ?\n"
 "If you answer no, this person will be temporarily blacklisted."
-msgstr ""
-"%s skulle vilja lägga till dig till hans/hennes kontaktlista.\n"
-"Vill du tillåta honom/henne att se din närvarostatus eller lägga till honom/"
-"henne till din kontaktlista?\n"
-"Om du svarar nej, personen kommer att vara bannlyst."
+msgstr "%s skulle vilja lägga till dig till hans/hennes kontaktlista.\nVill du tillåta honom/henne att se din närvarostatus eller lägga till honom/henne till din kontaktlista?\nOm du svarar nej, personen kommer att vara bannlyst."
 
-#: ../gtk/main.c:1260
-#, fuzzy, c-format
+#: ../gtk/main.c:1162
+#, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
 msgstr ""
-"Mata in ditt lösenord för användaren <i>%s</i>\n"
-"vid domänen <i>%s</i>:"
 
-#: ../gtk/main.c:1376
-#, fuzzy
+#: ../gtk/main.c:1283
 msgid "Call error"
-msgstr "Samtalshistorik"
+msgstr ""
 
-#: ../gtk/main.c:1379 ../coreapi/linphonecore.c:3240
+#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3744
 msgid "Call ended"
 msgstr "Samtalet slut"
 
-#: ../gtk/main.c:1382
+#: ../gtk/main.c:1289
 msgid "Incoming call"
 msgstr "Inkommande samtal"
 
-#: ../gtk/main.c:1384 ../gtk/incall_view.c:522 ../gtk/main.ui.h:5
+#: ../gtk/main.c:1291 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
 msgid "Answer"
 msgstr ""
 
-#: ../gtk/main.c:1386 ../gtk/main.ui.h:6
+#: ../gtk/main.c:1293 ../gtk/main.ui.h:6
 msgid "Decline"
 msgstr "Avböj"
 
-#: ../gtk/main.c:1392
-#, fuzzy
+#: ../gtk/main.c:1299
 msgid "Call paused"
-msgstr "avbrytade"
+msgstr ""
 
-#: ../gtk/main.c:1392
-#, fuzzy, c-format
+#: ../gtk/main.c:1299
+#, c-format
 msgid "<b>by %s</b>"
-msgstr "<b>Portar</b>"
+msgstr ""
 
-#: ../gtk/main.c:1459
+#: ../gtk/main.c:1366
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr ""
 
-#: ../gtk/main.c:1621
+#: ../gtk/main.c:1528
 msgid "Website link"
 msgstr "Webbsajt"
 
-#: ../gtk/main.c:1670
+#: ../gtk/main.c:1577
 msgid "Linphone - a video internet phone"
 msgstr "Linphone - en video Internet telefon"
 
-#: ../gtk/main.c:1762
+#: ../gtk/main.c:1669
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (Default)"
 
-#: ../gtk/main.c:2099 ../coreapi/callbacks.c:949
+#: ../gtk/main.c:2006 ../coreapi/callbacks.c:983
 #, c-format
 msgid "We are transferred to %s"
 msgstr ""
 
-#: ../gtk/main.c:2109
+#: ../gtk/main.c:2016
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
 msgstr ""
 
-#: ../gtk/main.c:2250
+#: ../gtk/main.c:2157
 msgid "A free SIP video-phone"
 msgstr "En gratis SIP video-telefon"
 
@@ -247,9 +226,8 @@ msgid "Name"
 msgstr "Namn"
 
 #: ../gtk/friendlist.c:721
-#, fuzzy
 msgid "Call"
-msgstr "Ringer %s"
+msgstr ""
 
 #: ../gtk/friendlist.c:726
 msgid "Chat"
@@ -271,9 +249,9 @@ msgid "Delete contact '%s'"
 msgstr "Ta bort kontakt '%s'"
 
 #: ../gtk/friendlist.c:978
-#, fuzzy, c-format
+#, c-format
 msgid "Delete chat history of '%s'"
-msgstr "Ta bort kontakt '%s'"
+msgstr ""
 
 #: ../gtk/friendlist.c:1029
 #, c-format
@@ -289,9 +267,8 @@ msgid "Status"
 msgstr "Status"
 
 #: ../gtk/propertybox.c:570
-#, fuzzy
 msgid "IP Bitrate (kbit/s)"
-msgstr "Min. datahastighet (kbit/s)"
+msgstr ""
 
 #: ../gtk/propertybox.c:577
 msgid "Parameters"
@@ -309,92 +286,92 @@ msgstr "Av"
 msgid "Account"
 msgstr "Konto"
 
-#: ../gtk/propertybox.c:1063
+#: ../gtk/propertybox.c:1072
 msgid "English"
 msgstr "Engelska"
 
-#: ../gtk/propertybox.c:1064
+#: ../gtk/propertybox.c:1073
 msgid "French"
 msgstr "Fransk"
 
-#: ../gtk/propertybox.c:1065
+#: ../gtk/propertybox.c:1074
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ../gtk/propertybox.c:1066
+#: ../gtk/propertybox.c:1075
 msgid "Italian"
 msgstr "Italiensk"
 
-#: ../gtk/propertybox.c:1067
+#: ../gtk/propertybox.c:1076
 msgid "Spanish"
 msgstr "Spanska"
 
-#: ../gtk/propertybox.c:1068
+#: ../gtk/propertybox.c:1077
 msgid "Brazilian Portugese"
 msgstr "Portugisiska"
 
-#: ../gtk/propertybox.c:1069
+#: ../gtk/propertybox.c:1078
 msgid "Polish"
 msgstr "Polska"
 
-#: ../gtk/propertybox.c:1070
+#: ../gtk/propertybox.c:1079
 msgid "German"
 msgstr "Tyska"
 
-#: ../gtk/propertybox.c:1071
+#: ../gtk/propertybox.c:1080
 msgid "Russian"
 msgstr "Ryska"
 
-#: ../gtk/propertybox.c:1072
+#: ../gtk/propertybox.c:1081
 msgid "Japanese"
 msgstr "Japanska"
 
-#: ../gtk/propertybox.c:1073
+#: ../gtk/propertybox.c:1082
 msgid "Dutch"
 msgstr "Nederländksa"
 
-#: ../gtk/propertybox.c:1074
+#: ../gtk/propertybox.c:1083
 msgid "Hungarian"
 msgstr "Hungerska"
 
-#: ../gtk/propertybox.c:1075
+#: ../gtk/propertybox.c:1084
 msgid "Czech"
 msgstr "Tjekiska"
 
-#: ../gtk/propertybox.c:1076
+#: ../gtk/propertybox.c:1085
 msgid "Chinese"
 msgstr "Kinesiska"
 
-#: ../gtk/propertybox.c:1077
+#: ../gtk/propertybox.c:1086
 msgid "Traditional Chinese"
 msgstr ""
 
-#: ../gtk/propertybox.c:1078
+#: ../gtk/propertybox.c:1087
 msgid "Norwegian"
 msgstr ""
 
-#: ../gtk/propertybox.c:1079
+#: ../gtk/propertybox.c:1088
 msgid "Hebrew"
 msgstr ""
 
-#: ../gtk/propertybox.c:1080
+#: ../gtk/propertybox.c:1089
 msgid "Serbian"
 msgstr ""
 
-#: ../gtk/propertybox.c:1147
+#: ../gtk/propertybox.c:1156
 msgid ""
 "You need to restart linphone for the new language selection to take effect."
 msgstr "Du behöver starta om programmet för att det nya språket ska synas."
 
-#: ../gtk/propertybox.c:1225
+#: ../gtk/propertybox.c:1234
 msgid "None"
 msgstr ""
 
-#: ../gtk/propertybox.c:1229
+#: ../gtk/propertybox.c:1238
 msgid "SRTP"
 msgstr ""
 
-#: ../gtk/propertybox.c:1235
+#: ../gtk/propertybox.c:1244
 msgid "ZRTP"
 msgstr ""
 
@@ -403,9 +380,7 @@ msgstr ""
 msgid ""
 "A more recent version is availalble from %s.\n"
 "Would you like to open a browser to download it ?"
-msgstr ""
-"En nyare version är tillgänglig på %s.\n"
-"Vill du öppna en browser för att ladda ner den?"
+msgstr "En nyare version är tillgänglig på %s.\nVill du öppna en browser för att ladda ner den?"
 
 #: ../gtk/update.c:91
 msgid "You are running the lastest version."
@@ -442,24 +417,19 @@ msgstr[1] "Hittat kontakt %i"
 msgid ""
 "Welcome !\n"
 "This assistant will help you to use a SIP account for your calls."
-msgstr ""
-"Välkommen!\n"
-"Assistenten kommer att hjälpa dig använda ett SIP konto för dina samtal:"
+msgstr "Välkommen!\nAssistenten kommer att hjälpa dig använda ett SIP konto för dina samtal:"
 
 #: ../gtk/setupwizard.c:43
-#, fuzzy
 msgid "Create an account on linphone.org"
-msgstr "Skapa ett konto genom att välja ett användarnamn"
+msgstr ""
 
 #: ../gtk/setupwizard.c:44
-#, fuzzy
 msgid "I have already a linphone.org account and I just want to use it"
-msgstr "Jag har redan ett konto och vill bara använda det."
+msgstr ""
 
 #: ../gtk/setupwizard.c:45
-#, fuzzy
 msgid "I have already a sip account and I just want to use it"
-msgstr "Jag har redan ett konto och vill bara använda det."
+msgstr ""
 
 #: ../gtk/setupwizard.c:46
 msgid "I want to specify a remote configuration URI"
@@ -482,14 +452,12 @@ msgid "Enter your account informations"
 msgstr ""
 
 #: ../gtk/setupwizard.c:140
-#, fuzzy
 msgid "Username*"
-msgstr "Användarnamn"
+msgstr ""
 
 #: ../gtk/setupwizard.c:141
-#, fuzzy
 msgid "Password*"
-msgstr "Lösenord"
+msgstr ""
 
 #: ../gtk/setupwizard.c:144
 msgid "Domain*"
@@ -504,14 +472,12 @@ msgid "(*) Required fields"
 msgstr ""
 
 #: ../gtk/setupwizard.c:318
-#, fuzzy
 msgid "Username: (*)"
-msgstr "Användarnamn:"
+msgstr ""
 
 #: ../gtk/setupwizard.c:320
-#, fuzzy
 msgid "Password: (*)"
-msgstr "Lösenord:"
+msgstr ""
 
 #: ../gtk/setupwizard.c:322
 msgid "Email: (*)"
@@ -537,15 +503,13 @@ msgstr "Tack. Ditt konto är nu konfigurerad och färdig att användas."
 
 #: ../gtk/setupwizard.c:413
 msgid ""
-"Please validate your account by clicking on the link we just sent you by "
-"email.\n"
+"Please validate your account by clicking on the link we just sent you by email.\n"
 "Then come back here and press Next button."
 msgstr ""
 
 #: ../gtk/setupwizard.c:600
-#, fuzzy
 msgid "SIP account configuration assistant"
-msgstr "Kontoinstallationsassistenten"
+msgstr ""
 
 #: ../gtk/setupwizard.c:618
 msgid "Welcome to the account setup assistant"
@@ -556,9 +520,8 @@ msgid "Account setup assistant"
 msgstr "Kontoinstallationsassistenten"
 
 #: ../gtk/setupwizard.c:629
-#, fuzzy
 msgid "Configure your account (step 1/1)"
-msgstr "Konfigurera ett SIP konto"
+msgstr ""
 
 #: ../gtk/setupwizard.c:634
 msgid "Enter your sip username (step 1/1)"
@@ -577,14 +540,13 @@ msgid "Error"
 msgstr ""
 
 #: ../gtk/setupwizard.c:656 ../gtk/audio_assistant.c:527
-#, fuzzy
 msgid "Terminating"
-msgstr "Lägg på"
+msgstr ""
 
 #: ../gtk/incall_view.c:70 ../gtk/incall_view.c:94
-#, fuzzy, c-format
+#, c-format
 msgid "Call #%i"
-msgstr "Ringer %s"
+msgstr ""
 
 #: ../gtk/incall_view.c:155
 #, c-format
@@ -600,9 +562,8 @@ msgid "ICE not activated"
 msgstr ""
 
 #: ../gtk/incall_view.c:223
-#, fuzzy
 msgid "ICE failed"
-msgstr "Samtalet avböjdes."
+msgstr ""
 
 #: ../gtk/incall_view.c:225
 msgid "ICE in progress"
@@ -613,9 +574,8 @@ msgid "Going through one or more NATs"
 msgstr ""
 
 #: ../gtk/incall_view.c:229
-#, fuzzy
 msgid "Direct"
-msgstr "Omdirigerat till %s..."
+msgstr ""
 
 #: ../gtk/incall_view.c:231
 msgid "Through a relay server"
@@ -626,9 +586,8 @@ msgid "uPnP not activated"
 msgstr ""
 
 #: ../gtk/incall_view.c:241
-#, fuzzy
 msgid "uPnP in progress"
-msgstr "STUN uppslagning pågår..."
+msgstr ""
 
 #: ../gtk/incall_view.c:243
 msgid "uPnp not available"
@@ -639,9 +598,8 @@ msgid "uPnP is running"
 msgstr ""
 
 #: ../gtk/incall_view.c:247
-#, fuzzy
 msgid "uPnP failed"
-msgstr "Samtalet avböjdes."
+msgstr ""
 
 #: ../gtk/incall_view.c:257 ../gtk/incall_view.c:258
 msgid "Direct or through server"
@@ -668,112 +626,108 @@ msgstr ""
 msgid "Hang up"
 msgstr ""
 
-#: ../gtk/incall_view.c:501
+#: ../gtk/incall_view.c:511
 msgid "<b>Calling...</b>"
 msgstr "<b>Ringer...</b>"
 
-#: ../gtk/incall_view.c:504 ../gtk/incall_view.c:707
+#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:727
 msgid "00::00::00"
 msgstr "00:00:00"
 
-#: ../gtk/incall_view.c:515
-#, fuzzy
+#: ../gtk/incall_view.c:525
 msgid "<b>Incoming call</b>"
-msgstr "Inkommande samtal"
+msgstr ""
 
-#: ../gtk/incall_view.c:552
+#: ../gtk/incall_view.c:562
 msgid "good"
 msgstr ""
 
-#: ../gtk/incall_view.c:554
+#: ../gtk/incall_view.c:564
 msgid "average"
 msgstr ""
 
-#: ../gtk/incall_view.c:556
+#: ../gtk/incall_view.c:566
 msgid "poor"
 msgstr ""
 
-#: ../gtk/incall_view.c:558
+#: ../gtk/incall_view.c:568
 msgid "very poor"
 msgstr ""
 
-#: ../gtk/incall_view.c:560
+#: ../gtk/incall_view.c:570
 msgid "too bad"
 msgstr ""
 
-#: ../gtk/incall_view.c:561 ../gtk/incall_view.c:577
+#: ../gtk/incall_view.c:571 ../gtk/incall_view.c:587
 msgid "unavailable"
 msgstr ""
 
-#: ../gtk/incall_view.c:669
+#: ../gtk/incall_view.c:679
 msgid "Secured by SRTP"
 msgstr ""
 
-#: ../gtk/incall_view.c:675
+#: ../gtk/incall_view.c:685
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
 msgstr ""
 
-#: ../gtk/incall_view.c:681
+#: ../gtk/incall_view.c:691
 msgid "Set unverified"
 msgstr ""
 
-#: ../gtk/incall_view.c:681 ../gtk/main.ui.h:4
+#: ../gtk/incall_view.c:691 ../gtk/main.ui.h:4
 msgid "Set verified"
 msgstr ""
 
-#: ../gtk/incall_view.c:702
+#: ../gtk/incall_view.c:722
 msgid "In conference"
 msgstr ""
 
-#: ../gtk/incall_view.c:702
-#, fuzzy
+#: ../gtk/incall_view.c:722
 msgid "<b>In call</b>"
-msgstr "<b>I samtal med</b>"
+msgstr ""
 
-#: ../gtk/incall_view.c:738
-#, fuzzy
+#: ../gtk/incall_view.c:758
 msgid "<b>Paused call</b>"
-msgstr "<b>Lägg på</b>"
+msgstr ""
 
-#: ../gtk/incall_view.c:751
+#: ../gtk/incall_view.c:771
 #, c-format
 msgid "%02i::%02i::%02i"
 msgstr "%02i:%02i:%02i"
 
-#: ../gtk/incall_view.c:772
+#: ../gtk/incall_view.c:794
 msgid "<b>Call ended.</b>"
 msgstr "<b>Samtalet slut.</b>"
 
-#: ../gtk/incall_view.c:803
+#: ../gtk/incall_view.c:825
 msgid "Transfer in progress"
 msgstr ""
 
-#: ../gtk/incall_view.c:806
+#: ../gtk/incall_view.c:828
 msgid "Transfer done."
 msgstr ""
 
-#: ../gtk/incall_view.c:809
-#, fuzzy
+#: ../gtk/incall_view.c:831
 msgid "Transfer failed."
-msgstr "Samtalet avböjdes."
+msgstr ""
 
-#: ../gtk/incall_view.c:853
+#: ../gtk/incall_view.c:875
 msgid "Resume"
 msgstr ""
 
-#: ../gtk/incall_view.c:860 ../gtk/main.ui.h:9
+#: ../gtk/incall_view.c:882 ../gtk/main.ui.h:9
 msgid "Pause"
 msgstr ""
 
-#: ../gtk/incall_view.c:926
+#: ../gtk/incall_view.c:948
 #, c-format
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
 msgstr ""
 
-#: ../gtk/incall_view.c:926
+#: ../gtk/incall_view.c:948
 msgid "(Paused)"
 msgstr ""
 
@@ -783,9 +737,9 @@ msgid "Please enter login information for %s"
 msgstr "Mata in ditt lösenord för domänen %s:"
 
 #: ../gtk/config-fetching.c:57
-#, fuzzy, c-format
+#, c-format
 msgid "fetching from %s"
-msgstr "Inkommande samtal från %s"
+msgstr ""
 
 #: ../gtk/config-fetching.c:73
 #, c-format
@@ -809,18 +763,14 @@ msgid "Too loud"
 msgstr ""
 
 #: ../gtk/audio_assistant.c:318
-#, fuzzy
 msgid ""
 "Welcome !\n"
 "This assistant will help you to configure audio settings for Linphone"
 msgstr ""
-"Välkommen!\n"
-"Assistenten kommer att hjälpa dig använda ett SIP konto för dina samtal:"
 
 #: ../gtk/audio_assistant.c:328
-#, fuzzy
 msgid "Capture device"
-msgstr "Mikrofon enhet:"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:329
 msgid "Recorded volume"
@@ -831,9 +781,8 @@ msgid "No voice"
 msgstr ""
 
 #: ../gtk/audio_assistant.c:369
-#, fuzzy
 msgid "Playback device"
-msgstr "Uppspelningsenhet:"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:370
 msgid "Play three beeps"
@@ -852,14 +801,12 @@ msgid "Let's start Linphone now"
 msgstr ""
 
 #: ../gtk/audio_assistant.c:496
-#, fuzzy
 msgid "Audio Assistant"
-msgstr "Assistent"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:506 ../gtk/main.ui.h:31
-#, fuzzy
 msgid "Audio assistant"
-msgstr "Kontoinstallationsassistenten"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:511
 msgid "Mic Gain calibration"
@@ -874,9 +821,8 @@ msgid "Record and Play"
 msgstr ""
 
 #: ../gtk/main.ui.h:1
-#, fuzzy
 msgid "<b>Callee name</b>"
-msgstr "<b>Samtalet slut.</b>"
+msgstr ""
 
 #: ../gtk/main.ui.h:2
 msgid "Send"
@@ -919,36 +865,28 @@ msgid "All users"
 msgstr ""
 
 #: ../gtk/main.ui.h:18
-#, fuzzy
 msgid "Online users"
 msgstr ""
-"Alla användare\n"
-"Online användare"
 
 #: ../gtk/main.ui.h:19
 msgid "ADSL"
 msgstr ""
 
 #: ../gtk/main.ui.h:20
-#, fuzzy
 msgid "Fiber Channel"
 msgstr ""
-"ADSL\n"
-"Fiber"
 
 #: ../gtk/main.ui.h:21
-#, fuzzy
 msgid "Default"
-msgstr "%s (Default)"
+msgstr ""
 
 #: ../gtk/main.ui.h:22
 msgid "_Options"
 msgstr ""
 
 #: ../gtk/main.ui.h:23
-#, fuzzy
 msgid "Set configuration URI"
-msgstr "Bekräftelse"
+msgstr ""
 
 #: ../gtk/main.ui.h:24
 msgid "Always start video"
@@ -963,24 +901,20 @@ msgid "_Help"
 msgstr ""
 
 #: ../gtk/main.ui.h:27
-#, fuzzy
 msgid "Show debug window"
-msgstr "Linphone debug fönster"
+msgstr ""
 
 #: ../gtk/main.ui.h:28
-#, fuzzy
 msgid "_Homepage"
-msgstr "Hemsidan"
+msgstr ""
 
 #: ../gtk/main.ui.h:29
-#, fuzzy
 msgid "Check _Updates"
-msgstr "Letar efter uppdateringar"
+msgstr ""
 
 #: ../gtk/main.ui.h:30
-#, fuzzy
 msgid "Account assistant"
-msgstr "Kontoinstallationsassistenten"
+msgstr ""
 
 #: ../gtk/main.ui.h:32
 msgid "SIP address or phone number:"
@@ -991,9 +925,8 @@ msgid "Initiate a new call"
 msgstr ""
 
 #: ../gtk/main.ui.h:34
-#, fuzzy
 msgid "Contacts"
-msgstr "Kontaktar"
+msgstr ""
 
 #: ../gtk/main.ui.h:35
 msgid "Search"
@@ -1004,14 +937,12 @@ msgid "<b>Add contacts from directory</b>"
 msgstr "<b>Lägg till kontakt ifrån katalogen</b>"
 
 #: ../gtk/main.ui.h:37
-#, fuzzy
 msgid "Add contact"
-msgstr "Hittat kontakt %i"
+msgstr ""
 
 #: ../gtk/main.ui.h:38
-#, fuzzy
 msgid "Recent calls"
-msgstr "I samtal"
+msgstr ""
 
 #: ../gtk/main.ui.h:39
 msgid "My current identity:"
@@ -1102,9 +1033,8 @@ msgid "Scroll to end"
 msgstr ""
 
 #: ../gtk/password.ui.h:1
-#, fuzzy
 msgid "Linphone - Authentication required"
-msgstr "Linphone - Autentisering krävs"
+msgstr ""
 
 #: ../gtk/password.ui.h:2
 msgid "Please enter the domain password"
@@ -1119,9 +1049,8 @@ msgid "Clear all"
 msgstr ""
 
 #: ../gtk/call_logs.ui.h:3
-#, fuzzy
 msgid "Call back"
-msgstr "Ringer %s"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:1
 msgid "Linphone - Configure a SIP account"
@@ -1152,9 +1081,8 @@ msgid "Registration duration (sec):"
 msgstr "Registreringsfrekvens (sek.):"
 
 #: ../gtk/sip_account.ui.h:8
-#, fuzzy
 msgid "Contact params (optional):"
-msgstr "Route (tillval):"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:9
 msgid "AVPF regular RTCP interval (sec):"
@@ -1165,9 +1093,8 @@ msgid "Route (optional):"
 msgstr "Route (tillval):"
 
 #: ../gtk/sip_account.ui.h:11
-#, fuzzy
 msgid "Transport"
-msgstr "<b>Transport</b>"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:12
 msgid "Register"
@@ -1178,9 +1105,8 @@ msgid "Publish presence information"
 msgstr "Publicera närvaro information"
 
 #: ../gtk/sip_account.ui.h:14
-#, fuzzy
 msgid "Enable AVPF"
-msgstr "Möjliggör"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:15
 msgid "Configure a SIP account"
@@ -1203,9 +1129,8 @@ msgid "default soundcard"
 msgstr "default ljudkort"
 
 #: ../gtk/parameters.ui.h:5
-#, fuzzy
 msgid "a sound card"
-msgstr "ett ljud kort\n"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:6
 msgid "default camera"
@@ -1216,18 +1141,12 @@ msgid "CIF"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:8
-#, fuzzy
 msgid "Audio codecs"
 msgstr ""
-"Audio codecs\n"
-"Video codecs"
 
 #: ../gtk/parameters.ui.h:9
-#, fuzzy
 msgid "Video codecs"
 msgstr ""
-"Audio codecs\n"
-"Video codecs"
 
 #: ../gtk/parameters.ui.h:10 ../gtk/keypad.ui.h:5
 msgid "C"
@@ -1310,23 +1229,20 @@ msgid "Direct connection to the Internet"
 msgstr "Direkt förbindelse till Internet"
 
 #: ../gtk/parameters.ui.h:30
-#, fuzzy
 msgid "Behind NAT / Firewall (specify gateway IP )"
-msgstr "Bakom en NAT / brandvägg (specificera gatewap IP adress nedan)"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:31
 msgid "Behind NAT / Firewall (use STUN to resolve)"
 msgstr "Bakom en NAT / brandvägg (använd STUN för att avgöra adressen)"
 
 #: ../gtk/parameters.ui.h:32
-#, fuzzy
 msgid "Behind NAT / Firewall (use ICE)"
-msgstr "Bakom en NAT / brandvägg (använd STUN för att avgöra adressen)"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:33
-#, fuzzy
 msgid "Behind NAT / Firewall (use uPnP)"
-msgstr "Bakom en NAT / brandvägg (använd STUN för att avgöra adressen)"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:34
 msgid "Public IP address:"
@@ -1381,9 +1297,8 @@ msgid "Prefered video resolution:"
 msgstr "Video upplösning:"
 
 #: ../gtk/parameters.ui.h:47
-#, fuzzy
 msgid "Video output method:"
-msgstr "Video ingångsenhet:"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:48
 msgid "<b>Video</b>"
@@ -1395,8 +1310,7 @@ msgstr "Multimedia inställningar"
 
 #: ../gtk/parameters.ui.h:50
 msgid "This section defines your SIP address when not using a SIP account"
-msgstr ""
-"Denna sektion specificerar din SIP adress när du inte använder ett SIP konto"
+msgstr "Denna sektion specificerar din SIP adress när du inte använder ett SIP konto"
 
 #: ../gtk/parameters.ui.h:51
 msgid "Your display name (eg: John Doe):"
@@ -1505,23 +1419,20 @@ msgid "User interface"
 msgstr "Användarinterface"
 
 #: ../gtk/parameters.ui.h:77 ../gtk/ldap.ui.h:2
-#, fuzzy
 msgid "Server address:"
-msgstr "SIP Adress"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:78 ../gtk/ldap.ui.h:3
-#, fuzzy
 msgid "Authentication method:"
-msgstr "Linphone - Autentisering krävs"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:80
 msgid "label"
 msgstr "etikett"
 
 #: ../gtk/parameters.ui.h:81
-#, fuzzy
 msgid "<b>LDAP Account setup</b>"
-msgstr "<b>Proxy konton</b>"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:82
 msgid "LDAP"
@@ -1552,9 +1463,8 @@ msgid "Please wait"
 msgstr "Vänta"
 
 #: ../gtk/dscp_settings.ui.h:1
-#, fuzzy
 msgid "DSCP settings"
-msgstr "Inställningar"
+msgstr ""
 
 #: ../gtk/dscp_settings.ui.h:2
 msgid "SIP"
@@ -1573,23 +1483,16 @@ msgid "<b>Set DSCP values (in hexadecimal)</b>"
 msgstr ""
 
 #: ../gtk/call_statistics.ui.h:1
-#, fuzzy
 msgid "Call statistics"
-msgstr "Ringer %s"
+msgstr ""
 
 #: ../gtk/call_statistics.ui.h:2
-#, fuzzy
 msgid "Audio codec"
 msgstr ""
-"Audio codecs\n"
-"Video codecs"
 
 #: ../gtk/call_statistics.ui.h:3
-#, fuzzy
 msgid "Video codec"
 msgstr ""
-"Audio codecs\n"
-"Video codecs"
 
 #: ../gtk/call_statistics.ui.h:4
 msgid "Audio IP bandwidth usage"
@@ -1616,23 +1519,20 @@ msgid "Video resolution received"
 msgstr ""
 
 #: ../gtk/call_statistics.ui.h:10
-#, fuzzy
 msgid "Video resolution sent"
-msgstr "Video upplösning:"
+msgstr ""
 
 #: ../gtk/call_statistics.ui.h:11
 msgid "RTP profile"
 msgstr ""
 
 #: ../gtk/call_statistics.ui.h:12
-#, fuzzy
 msgid "<b>Call statistics and information</b>"
-msgstr "<b>Kontakt information</b>"
+msgstr ""
 
 #: ../gtk/tunnel_config.ui.h:1
-#, fuzzy
 msgid "Configure VoIP tunnel"
-msgstr "Konfigurera ett SIP konto"
+msgstr ""
 
 #: ../gtk/tunnel_config.ui.h:2
 msgid "Host"
@@ -1711,9 +1611,8 @@ msgid "1"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:1
-#, fuzzy
 msgid "LDAP Settings"
-msgstr "Inställningar"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:6
 msgid "Use TLS Connection"
@@ -1724,9 +1623,8 @@ msgid "Not yet available"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:8
-#, fuzzy
 msgid "<b>Connection</b>"
-msgstr "<b>Codecs</b>"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:9
 msgid "Bind DN"
@@ -1741,9 +1639,8 @@ msgid "Realm"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:12
-#, fuzzy
 msgid "<b>SASL</b>"
-msgstr "<b>Audio</b>"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:13
 msgid "Base object:"
@@ -1759,18 +1656,16 @@ msgid "Name Attribute:"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:17
-#, fuzzy
 msgid "SIP address attribute:"
-msgstr "SIP Adress"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:18
 msgid "Attributes to query:"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:19
-#, fuzzy
 msgid "<b>Search</b>"
-msgstr "<b>Sök efter kontakter</b>"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:20
 msgid "Timeout for search:"
@@ -1785,9 +1680,8 @@ msgid "Follow Aliases"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:23
-#, fuzzy
 msgid "<b>Miscellaneous</b>"
-msgstr "<b>Video</b>"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:24
 msgid "ANONYMOUS"
@@ -1811,11 +1705,8 @@ msgstr ""
 
 #: ../gtk/config-uri.ui.h:2
 msgid ""
-"This dialog allows to set an http or https address when configuration is to "
-"be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, "
-"Linphone will restart automatically in order to fetch and take into account "
-"the new configuration. "
+"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
 msgstr ""
 
 #: ../gtk/config-uri.ui.h:4
@@ -1823,86 +1714,79 @@ msgid "https://"
 msgstr ""
 
 #: ../gtk/provisioning-fetch.ui.h:1
-#, fuzzy
 msgid "Configuring..."
-msgstr "Kontaktar"
+msgstr ""
 
 #: ../gtk/provisioning-fetch.ui.h:2
 msgid "Please wait while fetching configuration from server..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1034
+#: ../coreapi/linphonecore.c:1511
 msgid "Ready"
 msgstr "Redo"
 
-#: ../coreapi/linphonecore.c:1967
-#, fuzzy
+#: ../coreapi/linphonecore.c:2470
 msgid "Configuring"
-msgstr "Bekräftelse"
+msgstr ""
 
-#: ../coreapi/linphonecore.c:2133
+#: ../coreapi/linphonecore.c:2635
 msgid "Looking for telephone number destination..."
 msgstr "Leta efter telefonnummer för destinationen..."
 
-#: ../coreapi/linphonecore.c:2136
+#: ../coreapi/linphonecore.c:2637
 msgid "Could not resolve this number."
 msgstr "Kan inte nå dett nummer."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2418
+#: ../coreapi/linphonecore.c:2919
 msgid "Contacting"
 msgstr "Kontaktar"
 
-#: ../coreapi/linphonecore.c:2425
-#, fuzzy
+#: ../coreapi/linphonecore.c:2924
 msgid "Could not call"
-msgstr "Kunde inte ringa"
+msgstr ""
 
-#: ../coreapi/linphonecore.c:2576
+#: ../coreapi/linphonecore.c:3074
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2745
-#, fuzzy
+#: ../coreapi/linphonecore.c:3233
 msgid "is contacting you"
-msgstr "kontaktar dig."
+msgstr ""
 
-#: ../coreapi/linphonecore.c:2746
+#: ../coreapi/linphonecore.c:3234
 msgid " and asked autoanswer."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2746
+#: ../coreapi/linphonecore.c:3234
 msgid "."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2865
+#: ../coreapi/linphonecore.c:3352
 msgid "Modifying call parameters..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3194
+#: ../coreapi/linphonecore.c:3700
 msgid "Connected."
 msgstr "Kopplad"
 
-#: ../coreapi/linphonecore.c:3220
-#, fuzzy
+#: ../coreapi/linphonecore.c:3725
 msgid "Call aborted"
-msgstr "avbrytade"
+msgstr ""
 
-#: ../coreapi/linphonecore.c:3412
-#, fuzzy
+#: ../coreapi/linphonecore.c:3915
 msgid "Could not pause the call"
-msgstr "Kunde inte ringa"
+msgstr ""
 
-#: ../coreapi/linphonecore.c:3417
-#, fuzzy
+#: ../coreapi/linphonecore.c:3919
 msgid "Pausing the current call..."
-msgstr "Nuvarande samtal"
+msgstr ""
 
-#: ../coreapi/misc.c:425
+#: ../coreapi/misc.c:438
 msgid "Stun lookup in progress..."
 msgstr "STUN uppslagning pågår..."
 
-#: ../coreapi/misc.c:607
+#: ../coreapi/misc.c:619
 msgid "ICE local candidates gathering in progress..."
 msgstr ""
 
@@ -1951,588 +1835,147 @@ msgid "Pending"
 msgstr "Pågående"
 
 #: ../coreapi/friend.c:66
-#, fuzzy
 msgid "Vacation"
-msgstr "Förlopp"
+msgstr ""
 
 #: ../coreapi/friend.c:68
 msgid "Unknown-bug"
 msgstr "Okänd bug"
 
-#: ../coreapi/proxy.c:314
+#: ../coreapi/proxy.c:319
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
-msgstr ""
-"SIP proxy adressen som du matade in är inte rätt, adressen måste starta med "
-"\"sip:\", följd av ett hostnamn"
+msgstr "SIP proxy adressen som du matade in är inte rätt, adressen måste starta med \"sip:\", följd av ett hostnamn"
 
-#: ../coreapi/proxy.c:320
+#: ../coreapi/proxy.c:325
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
-msgstr ""
-"SIP adressen som du matade in är inte rätt. Adressen borde se ut som sip:"
-"namn@domän, såsom sip:peter@exempel.se"
+msgstr "SIP adressen som du matade in är inte rätt. Adressen borde se ut som sip:namn@domän, såsom sip:peter@exempel.se"
 
-#: ../coreapi/proxy.c:1369
+#: ../coreapi/proxy.c:1377
 #, c-format
 msgid "Could not login as %s"
 msgstr "Kunde inte logga in som %s"
 
-#: ../coreapi/callbacks.c:355
+#: ../coreapi/callbacks.c:383
 msgid "Remote ringing."
 msgstr "Ringer hos motparten."
 
-#: ../coreapi/callbacks.c:373
-#, fuzzy
+#: ../coreapi/callbacks.c:404
 msgid "Remote ringing..."
-msgstr "Ringer hos motparten."
+msgstr ""
 
-#: ../coreapi/callbacks.c:384
+#: ../coreapi/callbacks.c:414
 msgid "Early media."
 msgstr "Tidig media"
 
-#: ../coreapi/callbacks.c:435
-#, fuzzy, c-format
+#: ../coreapi/callbacks.c:475
+#, c-format
 msgid "Call with %s is paused."
-msgstr "Samtal med %s"
+msgstr ""
 
-#: ../coreapi/callbacks.c:448
+#: ../coreapi/callbacks.c:488
 #, c-format
 msgid "Call answered by %s - on hold."
 msgstr ""
 
-#: ../coreapi/callbacks.c:459
-#, fuzzy
+#: ../coreapi/callbacks.c:498
 msgid "Call resumed."
-msgstr "Samtalet slut"
+msgstr ""
 
-#: ../coreapi/callbacks.c:464
+#: ../coreapi/callbacks.c:502
 #, c-format
 msgid "Call answered by %s."
 msgstr ""
 
-#: ../coreapi/callbacks.c:483
+#: ../coreapi/callbacks.c:525
 msgid "Incompatible, check codecs or security settings..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:512
+#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:826
+msgid "Incompatible media parameters."
+msgstr ""
+
+#: ../coreapi/callbacks.c:560
 msgid "We have been resumed."
 msgstr ""
 
-#: ../coreapi/callbacks.c:521
+#. we are being paused
+#: ../coreapi/callbacks.c:568
 msgid "We are paused by other party."
 msgstr ""
 
-#: ../coreapi/callbacks.c:556
+#. reINVITE and in-dialogs UPDATE go here
+#: ../coreapi/callbacks.c:602
 msgid "Call is updated by remote."
 msgstr ""
 
-#: ../coreapi/callbacks.c:658
+#: ../coreapi/callbacks.c:705
 msgid "Call terminated."
 msgstr "Samtalet slut."
 
-#: ../coreapi/callbacks.c:687
+#: ../coreapi/callbacks.c:733
 msgid "User is busy."
 msgstr "Användare upptagen."
 
-#: ../coreapi/callbacks.c:688
+#: ../coreapi/callbacks.c:734
 msgid "User is temporarily unavailable."
 msgstr "Användaren temporärt inte tillgänglig."
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:690
+#: ../coreapi/callbacks.c:736
 msgid "User does not want to be disturbed."
 msgstr "Användaren vill inte bli störd."
 
-#: ../coreapi/callbacks.c:691
+#: ../coreapi/callbacks.c:737
 msgid "Call declined."
 msgstr "Samtalet avböjdes."
 
-#: ../coreapi/callbacks.c:706
+#: ../coreapi/callbacks.c:752
 msgid "Request timeout."
 msgstr ""
 
-#: ../coreapi/callbacks.c:737
-#, fuzzy
+#: ../coreapi/callbacks.c:780
 msgid "Redirected"
-msgstr "Omdirigerat till %s..."
-
-#: ../coreapi/callbacks.c:787
-msgid "Incompatible media parameters."
 msgstr ""
 
-#: ../coreapi/callbacks.c:798
-#, fuzzy
+#: ../coreapi/callbacks.c:835
 msgid "Call failed."
-msgstr "Samtalet avböjdes."
+msgstr ""
 
-#: ../coreapi/callbacks.c:878
+#: ../coreapi/callbacks.c:913
 #, c-format
 msgid "Registration on %s successful."
 msgstr "Registrering hos %s lyckades."
 
-#: ../coreapi/callbacks.c:879
+#: ../coreapi/callbacks.c:914
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "Avregistrering hos %s lyckades."
 
-#: ../coreapi/callbacks.c:897
+#: ../coreapi/callbacks.c:932
 msgid "no response timeout"
 msgstr "Inget svar inom angiven tid"
 
-#: ../coreapi/callbacks.c:900
+#: ../coreapi/callbacks.c:935
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "Registrering hos %s mislyckades: %s"
 
-#: ../coreapi/callbacks.c:907
+#: ../coreapi/callbacks.c:942
 msgid "Service unavailable, retrying"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:177
-#, fuzzy, c-format
+#: ../coreapi/linphonecall.c:174
+#, c-format
 msgid "Authentication token is %s"
-msgstr "Linphone - Autentisering krävs"
+msgstr ""
 
-#: ../coreapi/linphonecall.c:2932
+#: ../coreapi/linphonecall.c:3020
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
 msgstr[0] "Du har %i missat samtal"
 msgstr[1] "Du har %i missade samtal"
-
-#~ msgid "aborted"
-#~ msgstr "avbrytade"
-
-#~ msgid "completed"
-#~ msgstr "avslutade"
-
-#~ msgid "missed"
-#~ msgstr "missade"
-
-#~ msgid ""
-#~ "%s at %s\n"
-#~ "From: %s\n"
-#~ "To: %s\n"
-#~ "Status: %s\n"
-#~ "Duration: %i mn %i sec\n"
-#~ msgstr ""
-#~ "%s på %s\n"
-#~ "Från: %s\n"
-#~ "Till: %s\n"
-#~ "Status: %s\n"
-#~ "Längd: %i min %i sek\n"
-
-#~ msgid "Outgoing call"
-#~ msgstr "Utgående samtal"
-
-#, fuzzy
-#~ msgid "No response."
-#~ msgstr "Inget svar inom angiven tid"
-
-#~ msgid ""
-#~ "Could not parse given sip address. A sip url usually looks like sip:"
-#~ "user@domain"
-#~ msgstr ""
-#~ "Kan inte förstå angiven SIP adress. En SIP adress vanligen ser ut som sip:"
-#~ "användare@domänen"
-
-#~ msgid ""
-#~ "Your computer appears to be using ALSA sound drivers.\n"
-#~ "This is the best choice. However the pcm oss emulation module\n"
-#~ "is missing and linphone needs it. Please execute\n"
-#~ "'modprobe snd-pcm-oss' as root to load it."
-#~ msgstr ""
-#~ "Din dator verkar använda ALSA drivrutiner för ljud.\n"
-#~ "Detta är det bästa valet. Dock PCM OSS emuleringsmodulen\n"
-#~ "saknas och linphone behöver ha det. Var god exekvera\n"
-#~ "'modprobe snd-pcm-oss' som root för att ladda in den."
-
-#~ msgid ""
-#~ "Your computer appears to be using ALSA sound drivers.\n"
-#~ "This is the best choice. However the mixer oss emulation module\n"
-#~ "is missing and linphone needs it. Please execute\n"
-#~ " 'modprobe snd-mixer-oss' as root to load it."
-#~ msgstr ""
-#~ "Din dator verkar använda ALSA drivrutiner för ljud.\n"
-#~ "Detta är det bästa valet. Dock OSS mixer emuleringsmodulen\n"
-#~ "saknas och linphone behöver ha det. Var god exekvera\n"
-#~ "'modprobe snd-mixer-oss' som root för att ladda in den."
-
-#~ msgid "Chat with %s"
-#~ msgstr "Chatta med %s"
-
-#~ msgid "Please choose a username:"
-#~ msgstr "Välj ett användarnamn:"
-
-#~ msgid "Checking if '%s' is available..."
-#~ msgstr "Verifierar om '%s' är tillgänglig..."
-
-#~ msgid "Please wait..."
-#~ msgstr "Var god dröj..."
-
-#~ msgid "Sorry this username already exists. Please try a new one."
-#~ msgstr "Användarnamnet finns redan, försök med ett nytt namn."
-
-#~ msgid "Ok !"
-#~ msgstr "Ok !"
-
-#~ msgid "Communication problem, please try again later."
-#~ msgstr "Kommunikationsproblem, prova igen senare."
-
-#~ msgid "Choosing a username"
-#~ msgstr "Välj ditt användarnamn"
-
-#~ msgid "Verifying"
-#~ msgstr "Verifierar"
-
-#~ msgid "Creating your account"
-#~ msgstr "Skapar ditt konto"
-
-#~ msgid "Now ready !"
-#~ msgstr "Klar nu!"
-
-#, fuzzy
-#~ msgid "Enable video"
-#~ msgstr "På"
-
-#~ msgid "Enter username, phone number, or full sip address"
-#~ msgstr "Mata in användarnamn, telefonnummer eller SIP adress"
-
-#~ msgid "Lookup:"
-#~ msgstr "Sök:"
-
-#~ msgid "in"
-#~ msgstr "i"
-
-#~ msgid ""
-#~ "Register to FONICS\n"
-#~ "virtual network !"
-#~ msgstr ""
-#~ "Registrera hos FONICS\n"
-#~ "virtuella nätverk!"
-
-#~ msgid "Unmute"
-#~ msgstr "Mikrofon på"
-
-#~ msgid "<b>Contact list</b>"
-#~ msgstr "<b>Kontaktlista</b>"
-
-#, fuzzy
-#~ msgid "Audio & video"
-#~ msgstr "Audio & Video"
-
-#~ msgid "Audio only"
-#~ msgstr "Enbart audio"
-
-#~ msgid "Duration:"
-#~ msgstr "Förlopp:"
-
-#, fuzzy
-#~ msgid "_Call history"
-#~ msgstr "Samtalshistorik"
-
-#~ msgid "_Linphone"
-#~ msgstr "_inphone"
-
-#, fuzzy
-#~ msgid "gtk-cancel"
-#~ msgstr "Kopplad"
-
-#~ msgid "Register at startup"
-#~ msgstr "Registrera vid start"
-
-#, fuzzy
-#~ msgid "gtk-close"
-#~ msgstr "Kopplad"
-
-#~ msgid "Alsa sound source"
-#~ msgstr "Alsa ljud ingång"
-
-#~ msgid "Alsa sound output"
-#~ msgstr "Also ljud utgång"
-
-#~ msgid "DTMF generator"
-#~ msgstr "DTMF generare"
-
-#~ msgid "The GSM full-rate codec"
-#~ msgstr "Hög hastighet GSM codec"
-
-#~ msgid "The GSM codec"
-#~ msgstr "GSM codec"
-
-#, fuzzy
-#~ msgid "Sound capture filter for MacOS X Audio Unit"
-#~ msgstr "Fånga ljud med OSS drivrutiner"
-
-#, fuzzy
-#~ msgid "Sound playback filter for MacOS X Audio Unit"
-#~ msgstr "Ljud utgång med OSS drivrutiner"
-
-#~ msgid "A filter to make conferencing"
-#~ msgstr "Ett filter för konferens"
-
-#~ msgid "Raw files and wav reader"
-#~ msgstr "Raw filer och WAV läsare"
-
-#~ msgid "Wav file recorder"
-#~ msgstr "WAV fil inspelare"
-
-#~ msgid "A filter that send several inputs to one output."
-#~ msgstr "En filter som skickar flera ingångar till en utgång"
-
-#~ msgid "The free and wonderful speex codec"
-#~ msgstr "Den fria speex codec"
-
-#~ msgid "A filter that controls and measure sound volume"
-#~ msgstr "Ett filter som kontrollerar och mäter ljudvolym"
-
-#~ msgid "A video4linux compatible source filter to stream pictures."
-#~ msgstr "En video4linux kompatibel ingångsfilter för att strömma bilder"
-
-#~ msgid "A filter to grab pictures from Video4Linux2-powered cameras"
-#~ msgstr "En filter för att fånga bilder från Video4Linux-2 capabla kameror"
-
-#~ msgid "A filter that outputs a static image."
-#~ msgstr "En filter med statisk bild"
-
-#~ msgid "A pixel format converter"
-#~ msgstr "En pixel format konverterare"
-
-#~ msgid "A video size converter"
-#~ msgstr "En video storlek konverterare"
-
-#~ msgid "a small video size converter"
-#~ msgstr "En liten video storlek konverterare"
-
-#~ msgid "Echo canceller using speex library"
-#~ msgstr "Echo cancellering med hjälp av speex"
-
-#~ msgid "A filter that reads from input and copy to its multiple outputs."
-#~ msgstr ""
-#~ "En filter som läser från sin ingång och kopierar till multipla utgångar"
-
-#~ msgid "The theora video encoder from xiph.org"
-#~ msgstr "Theora video encoder från xiph.org"
-
-#~ msgid "The open-source and royalty-free 'theora' video codec from xiph.org"
-#~ msgstr "Theora video codec från xiph.org, öppen källkod och utan royalties"
-
-#~ msgid "The theora video decoder from xiph.org"
-#~ msgstr "Theora video decoder från xiph.org"
-
-#~ msgid "A H.263 decoder using ffmpeg library"
-#~ msgstr "En h.263 decoder via ffmpeg"
-
-#~ msgid "A MPEG4 decoder using ffmpeg library"
-#~ msgstr "En MPEG4 decoder via ffmpeg"
-
-#~ msgid "A RTP/JPEG decoder using ffmpeg library"
-#~ msgstr "En RTP/JPEG decoder via ffmpeg"
-
-#~ msgid "A MJPEG decoder using ffmpeg library"
-#~ msgstr "En MJPEG decode via ffmpeg"
-
-#~ msgid "A snow decoder using ffmpeg library"
-#~ msgstr "En snow decoder via ffmpeg"
-
-#~ msgid "A video H.263 encoder using ffmpeg library."
-#~ msgstr "En video h.263 encoder via ffmpeg"
-
-#~ msgid ""
-#~ "A video H.263 encoder using ffmpeg library. It is compliant with old "
-#~ "RFC2190 spec."
-#~ msgstr ""
-#~ "En video h.263 encoder via ffmpeg, kompatibel med den gamla RFC2190 "
-#~ "specificationen."
-
-#~ msgid "A video MPEG4 encoder using ffmpeg library."
-#~ msgstr "En video MPEG4 encoder via ffmpeg"
-
-#~ msgid "A video snow encoder using ffmpeg library."
-#~ msgstr "En video snow encoder via ffmpeg"
-
-#~ msgid "A RTP/MJPEG encoder using ffmpeg library."
-#~ msgstr "En RTP/MJPEG encoder via ffmpeg"
-
-#~ msgid ""
-#~ "A video H.263 encoder using ffmpeg library, compliant with old RFC2190 "
-#~ "spec."
-#~ msgstr ""
-#~ "En video h.263 encoder via ffmpeg, kompatible med den gamla RFC2190 "
-#~ "specifikationen."
-
-#~ msgid ""
-#~ "The snow codec is royalty-free and is open-source. \n"
-#~ "It uses innovative techniques that makes it one of most promising video "
-#~ "codec. It is implemented within the ffmpeg project.\n"
-#~ "However it is under development, quite unstable and compatibility with "
-#~ "other versions cannot be guaranteed."
-#~ msgstr ""
-#~ "Snow codec:en är öppen källkod och utan royalties.\n"
-#~ "Den använder sig av innovativa tekniker som gör den en av de bästa. Codec:"
-#~ "en implementeras inom ffmpeg projektet.\n"
-#~ "Dock, den är under utveckling och kompatibiliteten mellan versioner kan "
-#~ "inte garanteras."
-
-#~ msgid "A MJPEG encoder using ffmpeg library."
-#~ msgstr "En MJPEG encoder via ffmpeg"
-
-#, fuzzy
-#~ msgid "A SDL-based video display"
-#~ msgstr "En generisk video utgång"
-
-#~ msgid "A video4windows compatible source filter to stream pictures."
-#~ msgstr "En video4windows kompatibel ingångsfilter för att strömma bilder."
-
-#~ msgid "A video for windows (vfw.h) based source filter to grab pictures."
-#~ msgstr "En video för windows kompatibel ingångsfilter för att fånga bilder."
-
-#, fuzzy
-#~ msgid "A video display based on windows DrawDib api"
-#~ msgstr "En video utgångsfönster med SDL"
-
-#, fuzzy
-#~ msgid "A filter that mixes down 16 bit sample audio streams"
-#~ msgstr "En filter för att mäta nivåer på 16 bitars PCM audio strömmar"
-
-#, fuzzy
-#~ msgid "A filter that converts from mono to stereo and vice versa."
-#~ msgstr "Ett filter som kontrollerar och mäter ljudvolym"
-
-#, fuzzy
-#~ msgid "Inter ticker communication filter."
-#~ msgstr "Error med förbindelsen till servern."
-
-#, fuzzy
-#~ msgid "Sound capture filter for MacOS X Audio Unit Service"
-#~ msgstr "Fånga ljud med OSS drivrutiner"
-
-#, fuzzy
-#~ msgid "Sound playback filter for MacOS X Audio Unit Service"
-#~ msgstr "Ljud utgång med OSS drivrutiner"
-
-#, fuzzy
-#~ msgid "A video display using X11+Xv"
-#~ msgstr "En video utgångsfönster med SDL"
-
-#, fuzzy
-#~ msgid "Sound capture filter for Android"
-#~ msgstr "Fånga ljud med OSS drivrutiner"
-
-#, fuzzy
-#~ msgid "Sound playback filter for Android"
-#~ msgstr "Ljud utgång med OSS drivrutiner"
-
-#, fuzzy
-#~ msgid "A filter that captures Android video."
-#~ msgstr "Ett filter som kontrollerar och mäter ljudvolym"
-
-#~ msgid ""
-#~ "Your machine appears to be connected to an IPv6 network. By default "
-#~ "linphone always uses IPv4. Please update your configuration if you want "
-#~ "to use IPv6"
-#~ msgstr ""
-#~ "Din dator verkar vara kopplad till ett IPv6 nätverk. Default, använder "
-#~ "linphone IPv4. Uppdatera din konfiguration om du vill använda IPv6."
-
-#~ msgid "Show debug messages"
-#~ msgstr "Visa debugfönstret"
-
-#~ msgid "Start call"
-#~ msgstr "Ring"
-
-#~ msgid "_Modes"
-#~ msgstr "_Media"
-
-#~ msgid "Created by Simon Morlat\n"
-#~ msgstr "Skapad av Simon Morlat\n"
-
-#~ msgid "Accept"
-#~ msgstr "Godkänn"
-
-#~ msgid "Incoming call from"
-#~ msgstr "Inkommande samtal från"
-
-#~ msgid "Linphone - Incoming call"
-#~ msgstr "Linphone - Inkommande samtal"
-
-#~ msgid "default soundcard\n"
-#~ msgstr "default ljudkort\n"
-
-#~ msgid ""
-#~ "Remote end seems to have disconnected, the call is going to be closed."
-#~ msgstr ""
-#~ "Motparten verkar ha avbrutit samtalet, samtalet kommer att avslutas."
-
-#~ msgid "Sorry, having multiple simultaneous calls is not supported yet !"
-#~ msgstr "Förlåt, men linphone stödjer inte flera samtliga samtal än!"
-
-#~ msgid "Could not reach destination."
-#~ msgstr "Kunde inte nå motparten."
-
-#~ msgid "Request Cancelled."
-#~ msgstr "Förfrågan avbruten."
-
-#~ msgid "Bad request"
-#~ msgstr "Fel förfråga."
-
-#~ msgid "User cannot be found at given address."
-#~ msgstr "Användaren kan inte hittas vid den angivna adressen."
-
-#~ msgid "Remote user cannot support any of proposed codecs."
-#~ msgstr "Motparten stödjer ingen av de föreslagna codecs."
-
-#~ msgid "Timeout."
-#~ msgstr "time out."
-
-#~ msgid "Remote host was found but refused connection."
-#~ msgstr "Motparten hittades men ville inte ta emot samtalet."
-
-#~ msgid ""
-#~ "User is not reachable at the moment but he invites you\n"
-#~ "to contact him using the following alternate resource:"
-#~ msgstr ""
-#~ "Användaren kan inte nås för tillfället men han/hon ber digatt kontakta "
-#~ "honom/henna vid följande resurs:"
-
-#~ msgid "Digits"
-#~ msgstr "Tangenter"
-
-#~ msgid "Main view"
-#~ msgstr "Huvud vy"
-
-#~ msgid "No nat/firewall address supplied !"
-#~ msgstr "Ingen NAT / brandväggs adress angiven!"
-
-#~ msgid "Invalid nat address '%s' : %s"
-#~ msgstr "Fel NAT adress '%s': %s"
-
-#~ msgid "Gone"
-#~ msgstr "Har gått"
-
-#~ msgid "Waiting for Approval"
-#~ msgstr "Väntar för godkännandet"
-
-#~ msgid "Be Right Back"
-#~ msgstr "Kommer strax tillbaka"
-
-#~ msgid "On The Phone"
-#~ msgstr "På telefon"
-
-#~ msgid "Out To Lunch"
-#~ msgstr "Lunchar"
-
-#~ msgid "Closed"
-#~ msgstr "Stängt"
-
-#~ msgid "Unknown"
-#~ msgstr "Okänd"
-
-#~ msgid "Bresilian"
-#~ msgstr "Brasiliansk"
-
-#~ msgid "_View"
-#~ msgstr "_Vy"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index c0eab3db4..f0897d0da 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,21 +1,20 @@
-# SIP Telephony Application.
-# Copyright (C) 2001, 2002, 2011 Free Software Foundation, Inc.
-# Simon Morlat <linphone@free.fr>, 2001.
-# Jiang Honglei<jhonglei@gmail.com>, 2002.
-# Aron Xu <happyaron.xu@gmail.com>, 2011.
-# 
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: linphone 3.3.2\n"
+"Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-15 09:24+0200\n"
-"PO-Revision-Date: 2011-01-08 23:51+0800\n"
-"Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
-"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
-"Language: zh\n"
+"POT-Creation-Date: 2014-11-19 10:39+0100\n"
+"PO-Revision-Date: 2014-11-19 10:15+0000\n"
+"Last-Translator: Cqnqrd <gautier.pelloux@gmail.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/linphone-gtk/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974
@@ -29,28 +28,25 @@ msgid "Send text to %s"
 msgstr "发送消息给 %s"
 
 #: ../gtk/calllogs.c:232
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Recent calls (%i)</b>"
-msgstr "<b>正在呼叫</b>"
+msgstr ""
 
 #: ../gtk/calllogs.c:314
 msgid "n/a"
 msgstr ""
 
 #: ../gtk/calllogs.c:317
-#, fuzzy
 msgid "Aborted"
-msgstr "中断"
+msgstr ""
 
 #: ../gtk/calllogs.c:320
-#, fuzzy
 msgid "Missed"
-msgstr "丢失"
+msgstr ""
 
 #: ../gtk/calllogs.c:323
-#, fuzzy
 msgid "Declined"
-msgstr "拒绝"
+msgstr ""
 
 #: ../gtk/calllogs.c:329
 #, c-format
@@ -88,9 +84,8 @@ msgid "Conference"
 msgstr ""
 
 #: ../gtk/conference.c:46
-#, fuzzy
 msgid "Me"
-msgstr "静音"
+msgstr ""
 
 #: ../gtk/support.c:49 ../gtk/support.c:73 ../gtk/support.c:102
 #, c-format
@@ -127,107 +122,92 @@ msgstr "是否设置呼叫自动应答"
 
 #: ../gtk/main.c:149
 msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: c:"
-"\\Program Files\\Linphone)"
+"Specifiy a working directory (should be the base of the installation, eg: "
+"c:\\Program Files\\Linphone)"
 msgstr "指定工作目录(应为安装目录例如 C:\\Program Files\\Linphone)"
 
 #: ../gtk/main.c:156
-#, fuzzy
 msgid "Configuration file"
-msgstr "确认"
+msgstr ""
 
 #: ../gtk/main.c:163
-#, fuzzy
 msgid "Run the audio assistant"
-msgstr "帐户设置向导"
+msgstr ""
 
-#: ../gtk/main.c:590
-#, c-format
-msgid "Call with %s"
-msgstr "与 %s 通话"
-
-#: ../gtk/main.c:1183
+#: ../gtk/main.c:1085
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
-"Would you allow him to see your presence status or add him to your contact "
-"list ?\n"
+"Would you allow him to see your presence status or add him to your contact list ?\n"
 "If you answer no, this person will be temporarily blacklisted."
-msgstr ""
-"%s 想加您为联系人。\n"
-"您是否允许他看到您的在线状态或者将它加为您的联系人允许?\n"
-"如果您回答否，则会将该人临时性的放入黑名单"
+msgstr "%s 想加您为联系人。\n您是否允许他看到您的在线状态或者将它加为您的联系人允许?\n如果您回答否，则会将该人临时性的放入黑名单"
 
-#: ../gtk/main.c:1260
-#, fuzzy, c-format
+#: ../gtk/main.c:1162
+#, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
-msgstr "请输入 %s@%s 的密码："
+msgstr ""
 
-#: ../gtk/main.c:1376
-#, fuzzy
+#: ../gtk/main.c:1283
 msgid "Call error"
-msgstr "呼叫历史"
+msgstr ""
 
-#: ../gtk/main.c:1379 ../coreapi/linphonecore.c:3240
+#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3744
 msgid "Call ended"
 msgstr "呼叫结束"
 
-#: ../gtk/main.c:1382
+#: ../gtk/main.c:1289
 msgid "Incoming call"
 msgstr "呼入"
 
-#: ../gtk/main.c:1384 ../gtk/incall_view.c:522 ../gtk/main.ui.h:5
+#: ../gtk/main.c:1291 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
 msgid "Answer"
 msgstr ""
 
-#: ../gtk/main.c:1386 ../gtk/main.ui.h:6
+#: ../gtk/main.c:1293 ../gtk/main.ui.h:6
 msgid "Decline"
 msgstr "拒绝"
 
-#: ../gtk/main.c:1392
-#, fuzzy
+#: ../gtk/main.c:1299
 msgid "Call paused"
-msgstr "中断"
+msgstr ""
 
-#: ../gtk/main.c:1392
-#, fuzzy, c-format
+#: ../gtk/main.c:1299
+#, c-format
 msgid "<b>by %s</b>"
-msgstr "<b>端口</b>"
+msgstr ""
 
-#: ../gtk/main.c:1459
+#: ../gtk/main.c:1366
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr ""
 
-#: ../gtk/main.c:1621
+#: ../gtk/main.c:1528
 msgid "Website link"
 msgstr "网站"
 
-#: ../gtk/main.c:1670
+#: ../gtk/main.c:1577
 msgid "Linphone - a video internet phone"
 msgstr "Linphone - 互联网视频电话"
 
-#: ../gtk/main.c:1762
+#: ../gtk/main.c:1669
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (默认)"
 
-#: ../gtk/main.c:2099 ../coreapi/callbacks.c:949
+#: ../gtk/main.c:2006 ../coreapi/callbacks.c:983
 #, c-format
 msgid "We are transferred to %s"
 msgstr ""
 
-#: ../gtk/main.c:2109
+#: ../gtk/main.c:2016
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
-msgstr ""
-"未在此计算机上检测到声卡。\n"
-"您无法发送或接收音频呼叫。"
+msgstr "未在此计算机上检测到声卡。\n您无法发送或接收音频呼叫。"
 
-#: ../gtk/main.c:2250
+#: ../gtk/main.c:2157
 msgid "A free SIP video-phone"
 msgstr "免费的 SIP 视频电话"
 
@@ -244,9 +224,8 @@ msgid "Name"
 msgstr "名称"
 
 #: ../gtk/friendlist.c:721
-#, fuzzy
 msgid "Call"
-msgstr "呼叫 %s"
+msgstr ""
 
 #: ../gtk/friendlist.c:726
 msgid "Chat"
@@ -268,9 +247,9 @@ msgid "Delete contact '%s'"
 msgstr "删除联系人 %s"
 
 #: ../gtk/friendlist.c:978
-#, fuzzy, c-format
+#, c-format
 msgid "Delete chat history of '%s'"
-msgstr "删除联系人 %s"
+msgstr ""
 
 #: ../gtk/friendlist.c:1029
 #, c-format
@@ -286,9 +265,8 @@ msgid "Status"
 msgstr "状态"
 
 #: ../gtk/propertybox.c:570
-#, fuzzy
 msgid "IP Bitrate (kbit/s)"
-msgstr "最小比特率(kbit/s)"
+msgstr ""
 
 #: ../gtk/propertybox.c:577
 msgid "Parameters"
@@ -306,92 +284,92 @@ msgstr "禁用"
 msgid "Account"
 msgstr "帐户"
 
-#: ../gtk/propertybox.c:1063
+#: ../gtk/propertybox.c:1072
 msgid "English"
 msgstr "英语"
 
-#: ../gtk/propertybox.c:1064
+#: ../gtk/propertybox.c:1073
 msgid "French"
 msgstr "法语"
 
-#: ../gtk/propertybox.c:1065
+#: ../gtk/propertybox.c:1074
 msgid "Swedish"
 msgstr "瑞典语"
 
-#: ../gtk/propertybox.c:1066
+#: ../gtk/propertybox.c:1075
 msgid "Italian"
 msgstr "意大利语"
 
-#: ../gtk/propertybox.c:1067
+#: ../gtk/propertybox.c:1076
 msgid "Spanish"
 msgstr "西班牙语"
 
-#: ../gtk/propertybox.c:1068
+#: ../gtk/propertybox.c:1077
 msgid "Brazilian Portugese"
 msgstr "巴西葡萄牙语"
 
-#: ../gtk/propertybox.c:1069
+#: ../gtk/propertybox.c:1078
 msgid "Polish"
 msgstr "波兰语"
 
-#: ../gtk/propertybox.c:1070
+#: ../gtk/propertybox.c:1079
 msgid "German"
 msgstr "德语"
 
-#: ../gtk/propertybox.c:1071
+#: ../gtk/propertybox.c:1080
 msgid "Russian"
 msgstr "俄语"
 
-#: ../gtk/propertybox.c:1072
+#: ../gtk/propertybox.c:1081
 msgid "Japanese"
 msgstr "日语"
 
-#: ../gtk/propertybox.c:1073
+#: ../gtk/propertybox.c:1082
 msgid "Dutch"
 msgstr "荷兰语"
 
-#: ../gtk/propertybox.c:1074
+#: ../gtk/propertybox.c:1083
 msgid "Hungarian"
 msgstr "匈牙利语"
 
-#: ../gtk/propertybox.c:1075
+#: ../gtk/propertybox.c:1084
 msgid "Czech"
 msgstr "捷克语"
 
-#: ../gtk/propertybox.c:1076
+#: ../gtk/propertybox.c:1085
 msgid "Chinese"
 msgstr "中文"
 
-#: ../gtk/propertybox.c:1077
+#: ../gtk/propertybox.c:1086
 msgid "Traditional Chinese"
 msgstr ""
 
-#: ../gtk/propertybox.c:1078
+#: ../gtk/propertybox.c:1087
 msgid "Norwegian"
 msgstr ""
 
-#: ../gtk/propertybox.c:1079
+#: ../gtk/propertybox.c:1088
 msgid "Hebrew"
 msgstr ""
 
-#: ../gtk/propertybox.c:1080
+#: ../gtk/propertybox.c:1089
 msgid "Serbian"
 msgstr ""
 
-#: ../gtk/propertybox.c:1147
+#: ../gtk/propertybox.c:1156
 msgid ""
 "You need to restart linphone for the new language selection to take effect."
 msgstr "您需要重启 linphone 以使语言选择生效。"
 
-#: ../gtk/propertybox.c:1225
+#: ../gtk/propertybox.c:1234
 msgid "None"
 msgstr ""
 
-#: ../gtk/propertybox.c:1229
+#: ../gtk/propertybox.c:1238
 msgid "SRTP"
 msgstr ""
 
-#: ../gtk/propertybox.c:1235
+#: ../gtk/propertybox.c:1244
 msgid "ZRTP"
 msgstr ""
 
@@ -400,9 +378,7 @@ msgstr ""
 msgid ""
 "A more recent version is availalble from %s.\n"
 "Would you like to open a browser to download it ?"
-msgstr ""
-"%s 有新版本。\n"
-"您是否要打开浏览器下载它？"
+msgstr "%s 有新版本。\n您是否要打开浏览器下载它？"
 
 #: ../gtk/update.c:91
 msgid "You are running the lastest version."
@@ -438,24 +414,19 @@ msgstr[0] "找到 %i 联系方式"
 msgid ""
 "Welcome !\n"
 "This assistant will help you to use a SIP account for your calls."
-msgstr ""
-"欢迎使用 Linphone！\n"
-"设置向导将帮助您配置打网络电话的 SIP 帐户。"
+msgstr "欢迎使用 Linphone！\n设置向导将帮助您配置打网络电话的 SIP 帐户。"
 
 #: ../gtk/setupwizard.c:43
-#, fuzzy
 msgid "Create an account on linphone.org"
-msgstr "通过选择一个用户名创建一个新的帐户"
+msgstr ""
 
 #: ../gtk/setupwizard.c:44
-#, fuzzy
 msgid "I have already a linphone.org account and I just want to use it"
-msgstr "我已经有一个帐户，并想使用原来的帐户"
+msgstr ""
 
 #: ../gtk/setupwizard.c:45
-#, fuzzy
 msgid "I have already a sip account and I just want to use it"
-msgstr "我已经有一个帐户，并想使用原来的帐户"
+msgstr ""
 
 #: ../gtk/setupwizard.c:46
 msgid "I want to specify a remote configuration URI"
@@ -478,14 +449,12 @@ msgid "Enter your account informations"
 msgstr ""
 
 #: ../gtk/setupwizard.c:140
-#, fuzzy
 msgid "Username*"
-msgstr "用户名"
+msgstr ""
 
 #: ../gtk/setupwizard.c:141
-#, fuzzy
 msgid "Password*"
-msgstr "密码"
+msgstr ""
 
 #: ../gtk/setupwizard.c:144
 msgid "Domain*"
@@ -500,14 +469,12 @@ msgid "(*) Required fields"
 msgstr ""
 
 #: ../gtk/setupwizard.c:318
-#, fuzzy
 msgid "Username: (*)"
-msgstr "用户名:"
+msgstr ""
 
 #: ../gtk/setupwizard.c:320
-#, fuzzy
 msgid "Password: (*)"
-msgstr "密码："
+msgstr ""
 
 #: ../gtk/setupwizard.c:322
 msgid "Email: (*)"
@@ -533,15 +500,13 @@ msgstr "谢谢，您的帐户已经配置完毕，可以使用。"
 
 #: ../gtk/setupwizard.c:413
 msgid ""
-"Please validate your account by clicking on the link we just sent you by "
-"email.\n"
+"Please validate your account by clicking on the link we just sent you by email.\n"
 "Then come back here and press Next button."
 msgstr ""
 
 #: ../gtk/setupwizard.c:600
-#, fuzzy
 msgid "SIP account configuration assistant"
-msgstr "帐户设置向导"
+msgstr ""
 
 #: ../gtk/setupwizard.c:618
 msgid "Welcome to the account setup assistant"
@@ -552,9 +517,8 @@ msgid "Account setup assistant"
 msgstr "帐户设置向导"
 
 #: ../gtk/setupwizard.c:629
-#, fuzzy
 msgid "Configure your account (step 1/1)"
-msgstr "配置 SIP 帐户"
+msgstr ""
 
 #: ../gtk/setupwizard.c:634
 msgid "Enter your sip username (step 1/1)"
@@ -573,14 +537,13 @@ msgid "Error"
 msgstr ""
 
 #: ../gtk/setupwizard.c:656 ../gtk/audio_assistant.c:527
-#, fuzzy
 msgid "Terminating"
-msgstr "终止呼叫"
+msgstr ""
 
 #: ../gtk/incall_view.c:70 ../gtk/incall_view.c:94
-#, fuzzy, c-format
+#, c-format
 msgid "Call #%i"
-msgstr "呼叫 %s"
+msgstr ""
 
 #: ../gtk/incall_view.c:155
 #, c-format
@@ -588,18 +551,16 @@ msgid "Transfer to call #%i with %s"
 msgstr ""
 
 #: ../gtk/incall_view.c:211 ../gtk/incall_view.c:214
-#, fuzzy
 msgid "Not used"
-msgstr "未找到"
+msgstr ""
 
 #: ../gtk/incall_view.c:221
 msgid "ICE not activated"
 msgstr ""
 
 #: ../gtk/incall_view.c:223
-#, fuzzy
 msgid "ICE failed"
-msgstr "ICE 过滤器"
+msgstr ""
 
 #: ../gtk/incall_view.c:225
 msgid "ICE in progress"
@@ -610,9 +571,8 @@ msgid "Going through one or more NATs"
 msgstr ""
 
 #: ../gtk/incall_view.c:229
-#, fuzzy
 msgid "Direct"
-msgstr "已重定向"
+msgstr ""
 
 #: ../gtk/incall_view.c:231
 msgid "Through a relay server"
@@ -623,9 +583,8 @@ msgid "uPnP not activated"
 msgstr ""
 
 #: ../gtk/incall_view.c:241
-#, fuzzy
 msgid "uPnP in progress"
-msgstr "正在进行 Stun 查找..."
+msgstr ""
 
 #: ../gtk/incall_view.c:243
 msgid "uPnp not available"
@@ -636,9 +595,8 @@ msgid "uPnP is running"
 msgstr ""
 
 #: ../gtk/incall_view.c:247
-#, fuzzy
 msgid "uPnP failed"
-msgstr "ICE 过滤器"
+msgstr ""
 
 #: ../gtk/incall_view.c:257 ../gtk/incall_view.c:258
 msgid "Direct or through server"
@@ -665,112 +623,108 @@ msgstr ""
 msgid "Hang up"
 msgstr ""
 
-#: ../gtk/incall_view.c:501
+#: ../gtk/incall_view.c:511
 msgid "<b>Calling...</b>"
 msgstr "<b>正在呼叫...</b>"
 
-#: ../gtk/incall_view.c:504 ../gtk/incall_view.c:707
+#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:727
 msgid "00::00::00"
 msgstr "00::00::00"
 
-#: ../gtk/incall_view.c:515
-#, fuzzy
+#: ../gtk/incall_view.c:525
 msgid "<b>Incoming call</b>"
-msgstr "呼入"
+msgstr ""
 
-#: ../gtk/incall_view.c:552
+#: ../gtk/incall_view.c:562
 msgid "good"
 msgstr ""
 
-#: ../gtk/incall_view.c:554
+#: ../gtk/incall_view.c:564
 msgid "average"
 msgstr ""
 
-#: ../gtk/incall_view.c:556
+#: ../gtk/incall_view.c:566
 msgid "poor"
 msgstr ""
 
-#: ../gtk/incall_view.c:558
+#: ../gtk/incall_view.c:568
 msgid "very poor"
 msgstr ""
 
-#: ../gtk/incall_view.c:560
+#: ../gtk/incall_view.c:570
 msgid "too bad"
 msgstr ""
 
-#: ../gtk/incall_view.c:561 ../gtk/incall_view.c:577
+#: ../gtk/incall_view.c:571 ../gtk/incall_view.c:587
 msgid "unavailable"
 msgstr ""
 
-#: ../gtk/incall_view.c:669
+#: ../gtk/incall_view.c:679
 msgid "Secured by SRTP"
 msgstr ""
 
-#: ../gtk/incall_view.c:675
+#: ../gtk/incall_view.c:685
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
 msgstr ""
 
-#: ../gtk/incall_view.c:681
+#: ../gtk/incall_view.c:691
 msgid "Set unverified"
 msgstr ""
 
-#: ../gtk/incall_view.c:681 ../gtk/main.ui.h:4
+#: ../gtk/incall_view.c:691 ../gtk/main.ui.h:4
 msgid "Set verified"
 msgstr ""
 
-#: ../gtk/incall_view.c:702
+#: ../gtk/incall_view.c:722
 msgid "In conference"
 msgstr ""
 
-#: ../gtk/incall_view.c:702
-#, fuzzy
+#: ../gtk/incall_view.c:722
 msgid "<b>In call</b>"
-msgstr "<b>正在呼叫</b>"
+msgstr ""
 
-#: ../gtk/incall_view.c:738
-#, fuzzy
+#: ../gtk/incall_view.c:758
 msgid "<b>Paused call</b>"
-msgstr "<b>正在呼叫</b>"
+msgstr ""
 
-#: ../gtk/incall_view.c:751
+#: ../gtk/incall_view.c:771
 #, c-format
 msgid "%02i::%02i::%02i"
 msgstr "%02i::%02i::%02i"
 
-#: ../gtk/incall_view.c:772
+#: ../gtk/incall_view.c:794
 msgid "<b>Call ended.</b>"
 msgstr "<b>通话结束。</b>"
 
-#: ../gtk/incall_view.c:803
+#: ../gtk/incall_view.c:825
 msgid "Transfer in progress"
 msgstr ""
 
-#: ../gtk/incall_view.c:806
+#: ../gtk/incall_view.c:828
 msgid "Transfer done."
 msgstr ""
 
-#: ../gtk/incall_view.c:809
-#, fuzzy
+#: ../gtk/incall_view.c:831
 msgid "Transfer failed."
-msgstr "呼叫失败。"
+msgstr ""
 
-#: ../gtk/incall_view.c:853
+#: ../gtk/incall_view.c:875
 msgid "Resume"
 msgstr ""
 
-#: ../gtk/incall_view.c:860 ../gtk/main.ui.h:9
+#: ../gtk/incall_view.c:882 ../gtk/main.ui.h:9
 msgid "Pause"
 msgstr ""
 
-#: ../gtk/incall_view.c:926
+#: ../gtk/incall_view.c:948
 #, c-format
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
 msgstr ""
 
-#: ../gtk/incall_view.c:926
+#: ../gtk/incall_view.c:948
 msgid "(Paused)"
 msgstr ""
 
@@ -780,9 +734,9 @@ msgid "Please enter login information for %s"
 msgstr "请输入 %s 的登录信息"
 
 #: ../gtk/config-fetching.c:57
-#, fuzzy, c-format
+#, c-format
 msgid "fetching from %s"
-msgstr "来自 %s 的呼叫"
+msgstr ""
 
 #: ../gtk/config-fetching.c:73
 #, c-format
@@ -806,18 +760,14 @@ msgid "Too loud"
 msgstr ""
 
 #: ../gtk/audio_assistant.c:318
-#, fuzzy
 msgid ""
 "Welcome !\n"
 "This assistant will help you to configure audio settings for Linphone"
 msgstr ""
-"欢迎使用 Linphone！\n"
-"设置向导将帮助您配置打网络电话的 SIP 帐户。"
 
 #: ../gtk/audio_assistant.c:328
-#, fuzzy
 msgid "Capture device"
-msgstr "录音设备："
+msgstr ""
 
 #: ../gtk/audio_assistant.c:329
 msgid "Recorded volume"
@@ -828,9 +778,8 @@ msgid "No voice"
 msgstr ""
 
 #: ../gtk/audio_assistant.c:369
-#, fuzzy
 msgid "Playback device"
-msgstr "回放设备："
+msgstr ""
 
 #: ../gtk/audio_assistant.c:370
 msgid "Play three beeps"
@@ -849,14 +798,12 @@ msgid "Let's start Linphone now"
 msgstr ""
 
 #: ../gtk/audio_assistant.c:496
-#, fuzzy
 msgid "Audio Assistant"
-msgstr "配置向导"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:506 ../gtk/main.ui.h:31
-#, fuzzy
 msgid "Audio assistant"
-msgstr "帐户设置向导"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:511
 msgid "Mic Gain calibration"
@@ -871,9 +818,8 @@ msgid "Record and Play"
 msgstr ""
 
 #: ../gtk/main.ui.h:1
-#, fuzzy
 msgid "<b>Callee name</b>"
-msgstr "<b>通话结束。</b>"
+msgstr ""
 
 #: ../gtk/main.ui.h:2
 msgid "Send"
@@ -916,22 +862,16 @@ msgid "All users"
 msgstr ""
 
 #: ../gtk/main.ui.h:18
-#, fuzzy
 msgid "Online users"
 msgstr ""
-"全部用户\n"
-"在线用户"
 
 #: ../gtk/main.ui.h:19
 msgid "ADSL"
 msgstr ""
 
 #: ../gtk/main.ui.h:20
-#, fuzzy
 msgid "Fiber Channel"
 msgstr ""
-"ADSL\n"
-"光纤"
 
 #: ../gtk/main.ui.h:21
 msgid "Default"
@@ -942,9 +882,8 @@ msgid "_Options"
 msgstr ""
 
 #: ../gtk/main.ui.h:23
-#, fuzzy
 msgid "Set configuration URI"
-msgstr "确认"
+msgstr ""
 
 #: ../gtk/main.ui.h:24
 msgid "Always start video"
@@ -959,24 +898,20 @@ msgid "_Help"
 msgstr ""
 
 #: ../gtk/main.ui.h:27
-#, fuzzy
 msgid "Show debug window"
-msgstr "Linphone 调试窗口"
+msgstr ""
 
 #: ../gtk/main.ui.h:28
-#, fuzzy
 msgid "_Homepage"
-msgstr "主页"
+msgstr ""
 
 #: ../gtk/main.ui.h:29
-#, fuzzy
 msgid "Check _Updates"
-msgstr "检查更新"
+msgstr ""
 
 #: ../gtk/main.ui.h:30
-#, fuzzy
 msgid "Account assistant"
-msgstr "帐户设置向导"
+msgstr ""
 
 #: ../gtk/main.ui.h:32
 msgid "SIP address or phone number:"
@@ -999,14 +934,12 @@ msgid "<b>Add contacts from directory</b>"
 msgstr "<b>从目录增加联系人</b>"
 
 #: ../gtk/main.ui.h:37
-#, fuzzy
 msgid "Add contact"
-msgstr "找到 %i 联系方式"
+msgstr ""
 
 #: ../gtk/main.ui.h:38
-#, fuzzy
 msgid "Recent calls"
-msgstr "呼入"
+msgstr ""
 
 #: ../gtk/main.ui.h:39
 msgid "My current identity:"
@@ -1057,7 +990,6 @@ msgid "An internet video phone using the standard SIP (rfc3261) protocol."
 msgstr "一个采用标准 SIP (rfc3261) 协议的互联网视频电话"
 
 #: ../gtk/about.ui.h:5
-#, fuzzy
 msgid ""
 "fr: Simon Morlat\n"
 "en: Simon Morlat and Delphine Perreau\n"
@@ -1072,18 +1004,6 @@ msgid ""
 "hu: anonymous\n"
 "he: Eli Zaretskii <eliz@gnu.org>\n"
 msgstr ""
-"fr: Simon Morlat\n"
-"en: Simon Morlat and Delphine Perreau\n"
-"it: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\n"
-"de: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\n"
-"sv: Daniel Nylander <po@danielnylander.se>\n"
-"es: Jesus Benitez <gnelson at inMail dot sk>\n"
-"ja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\n"
-"pt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\n"
-"pl: Robert Nasiadek <darkone@darkone.pl>\n"
-"cs: Petr Pisar <petr.pisar@atlas.cz>\n"
-"hu: anonymous\n"
-"zh_CN: Jiang Honglei <hongleij@126.com> 和 Aron Xu <happyaron.xu@gmail.com>\n"
 
 #: ../gtk/contact.ui.h:2
 msgid "SIP Address"
@@ -1110,9 +1030,8 @@ msgid "Scroll to end"
 msgstr ""
 
 #: ../gtk/password.ui.h:1
-#, fuzzy
 msgid "Linphone - Authentication required"
-msgstr "Linphone - 需要认证"
+msgstr ""
 
 #: ../gtk/password.ui.h:2
 msgid "Please enter the domain password"
@@ -1127,9 +1046,8 @@ msgid "Clear all"
 msgstr ""
 
 #: ../gtk/call_logs.ui.h:3
-#, fuzzy
 msgid "Call back"
-msgstr "呼叫 %s"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:1
 msgid "Linphone - Configure a SIP account"
@@ -1160,9 +1078,8 @@ msgid "Registration duration (sec):"
 msgstr "注册间隔(秒)："
 
 #: ../gtk/sip_account.ui.h:8
-#, fuzzy
 msgid "Contact params (optional):"
-msgstr "路由(可选)："
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:9
 msgid "AVPF regular RTCP interval (sec):"
@@ -1173,9 +1090,8 @@ msgid "Route (optional):"
 msgstr "路由(可选)："
 
 #: ../gtk/sip_account.ui.h:11
-#, fuzzy
 msgid "Transport"
-msgstr "<b>传输协议</b>"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:12
 msgid "Register"
@@ -1186,9 +1102,8 @@ msgid "Publish presence information"
 msgstr "发布在线状态"
 
 #: ../gtk/sip_account.ui.h:14
-#, fuzzy
 msgid "Enable AVPF"
-msgstr "启用"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:15
 msgid "Configure a SIP account"
@@ -1211,9 +1126,8 @@ msgid "default soundcard"
 msgstr "默认声卡"
 
 #: ../gtk/parameters.ui.h:5
-#, fuzzy
 msgid "a sound card"
-msgstr "声卡\n"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:6
 msgid "default camera"
@@ -1224,37 +1138,28 @@ msgid "CIF"
 msgstr "CIF"
 
 #: ../gtk/parameters.ui.h:8
-#, fuzzy
 msgid "Audio codecs"
 msgstr ""
-"音频编解码器\n"
-"视频编解码器"
 
 #: ../gtk/parameters.ui.h:9
-#, fuzzy
 msgid "Video codecs"
 msgstr ""
-"音频编解码器\n"
-"视频编解码器"
 
 #: ../gtk/parameters.ui.h:10 ../gtk/keypad.ui.h:5
 msgid "C"
 msgstr "C"
 
 #: ../gtk/parameters.ui.h:11
-#, fuzzy
 msgid "SIP (UDP)"
-msgstr "SIP (UDP)："
+msgstr ""
 
 #: ../gtk/parameters.ui.h:12
-#, fuzzy
 msgid "SIP (TCP)"
-msgstr "SIP (UDP)："
+msgstr ""
 
 #: ../gtk/parameters.ui.h:13
-#, fuzzy
 msgid "SIP (TLS)"
-msgstr "SIP (UDP)："
+msgstr ""
 
 #: ../gtk/parameters.ui.h:14
 msgid "Settings"
@@ -1321,23 +1226,20 @@ msgid "Direct connection to the Internet"
 msgstr "直接连接到互联网"
 
 #: ../gtk/parameters.ui.h:30
-#, fuzzy
 msgid "Behind NAT / Firewall (specify gateway IP )"
-msgstr "在 NAT 或防火墙后(填写网关 IP)"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:31
 msgid "Behind NAT / Firewall (use STUN to resolve)"
 msgstr "在 NAT 或防火墙后(使用 STUN 解决)"
 
 #: ../gtk/parameters.ui.h:32
-#, fuzzy
 msgid "Behind NAT / Firewall (use ICE)"
-msgstr "在 NAT 或防火墙后(使用 STUN 解决)"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:33
-#, fuzzy
 msgid "Behind NAT / Firewall (use uPnP)"
-msgstr "在 NAT 或防火墙后(使用 STUN 解决)"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:34
 msgid "Public IP address:"
@@ -1392,9 +1294,8 @@ msgid "Prefered video resolution:"
 msgstr "视频分辨率："
 
 #: ../gtk/parameters.ui.h:47
-#, fuzzy
 msgid "Video output method:"
-msgstr "视频输入设备："
+msgstr ""
 
 #: ../gtk/parameters.ui.h:48
 msgid "<b>Video</b>"
@@ -1515,23 +1416,20 @@ msgid "User interface"
 msgstr "用户界面"
 
 #: ../gtk/parameters.ui.h:77 ../gtk/ldap.ui.h:2
-#, fuzzy
 msgid "Server address:"
-msgstr "SIP 代理地址："
+msgstr ""
 
 #: ../gtk/parameters.ui.h:78 ../gtk/ldap.ui.h:3
-#, fuzzy
 msgid "Authentication method:"
-msgstr "Linphone - 需要认证"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:80
 msgid "label"
 msgstr "标签"
 
 #: ../gtk/parameters.ui.h:81
-#, fuzzy
 msgid "<b>LDAP Account setup</b>"
-msgstr "<b>代理帐户</b>"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:82
 msgid "LDAP"
@@ -1562,46 +1460,36 @@ msgid "Please wait"
 msgstr "请稍候"
 
 #: ../gtk/dscp_settings.ui.h:1
-#, fuzzy
 msgid "DSCP settings"
-msgstr "设置"
+msgstr ""
 
 #: ../gtk/dscp_settings.ui.h:2
 msgid "SIP"
 msgstr ""
 
 #: ../gtk/dscp_settings.ui.h:3
-#, fuzzy
 msgid "Audio RTP stream"
-msgstr "音频重采样"
+msgstr ""
 
 #: ../gtk/dscp_settings.ui.h:4
-#, fuzzy
 msgid "Video RTP stream"
-msgstr "视频 RTP/UDP："
+msgstr ""
 
 #: ../gtk/dscp_settings.ui.h:5
 msgid "<b>Set DSCP values (in hexadecimal)</b>"
 msgstr ""
 
 #: ../gtk/call_statistics.ui.h:1
-#, fuzzy
 msgid "Call statistics"
-msgstr "呼叫详情"
+msgstr ""
 
 #: ../gtk/call_statistics.ui.h:2
-#, fuzzy
 msgid "Audio codec"
 msgstr ""
-"音频编解码器\n"
-"视频编解码器"
 
 #: ../gtk/call_statistics.ui.h:3
-#, fuzzy
 msgid "Video codec"
 msgstr ""
-"音频编解码器\n"
-"视频编解码器"
 
 #: ../gtk/call_statistics.ui.h:4
 msgid "Audio IP bandwidth usage"
@@ -1628,24 +1516,20 @@ msgid "Video resolution received"
 msgstr ""
 
 #: ../gtk/call_statistics.ui.h:10
-#, fuzzy
 msgid "Video resolution sent"
-msgstr "视频分辨率："
+msgstr ""
 
 #: ../gtk/call_statistics.ui.h:11
-#, fuzzy
 msgid "RTP profile"
-msgstr "RTP 输入过滤器"
+msgstr ""
 
 #: ../gtk/call_statistics.ui.h:12
-#, fuzzy
 msgid "<b>Call statistics and information</b>"
-msgstr "<b>联系人信息</b>"
+msgstr ""
 
 #: ../gtk/tunnel_config.ui.h:1
-#, fuzzy
 msgid "Configure VoIP tunnel"
-msgstr "配置 SIP 帐户"
+msgstr ""
 
 #: ../gtk/tunnel_config.ui.h:2
 msgid "Host"
@@ -1724,9 +1608,8 @@ msgid "1"
 msgstr "1"
 
 #: ../gtk/ldap.ui.h:1
-#, fuzzy
 msgid "LDAP Settings"
-msgstr "设置"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:6
 msgid "Use TLS Connection"
@@ -1737,9 +1620,8 @@ msgid "Not yet available"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:8
-#, fuzzy
 msgid "<b>Connection</b>"
-msgstr "<b>编解码器</b>"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:9
 msgid "Bind DN"
@@ -1754,9 +1636,8 @@ msgid "Realm"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:12
-#, fuzzy
 msgid "<b>SASL</b>"
-msgstr "<b>音频</b>"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:13
 msgid "Base object:"
@@ -1772,18 +1653,16 @@ msgid "Name Attribute:"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:17
-#, fuzzy
 msgid "SIP address attribute:"
-msgstr "SIP 地址或电话号码："
+msgstr ""
 
 #: ../gtk/ldap.ui.h:18
 msgid "Attributes to query:"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:19
-#, fuzzy
 msgid "<b>Search</b>"
-msgstr "<b>找人</b>"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:20
 msgid "Timeout for search:"
@@ -1798,9 +1677,8 @@ msgid "Follow Aliases"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:23
-#, fuzzy
 msgid "<b>Miscellaneous</b>"
-msgstr "<b>视频</b>"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:24
 msgid "ANONYMOUS"
@@ -1824,11 +1702,8 @@ msgstr ""
 
 #: ../gtk/config-uri.ui.h:2
 msgid ""
-"This dialog allows to set an http or https address when configuration is to "
-"be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, "
-"Linphone will restart automatically in order to fetch and take into account "
-"the new configuration. "
+"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
 msgstr ""
 
 #: ../gtk/config-uri.ui.h:4
@@ -1836,84 +1711,79 @@ msgid "https://"
 msgstr ""
 
 #: ../gtk/provisioning-fetch.ui.h:1
-#, fuzzy
 msgid "Configuring..."
-msgstr "正在连接..."
+msgstr ""
 
 #: ../gtk/provisioning-fetch.ui.h:2
 msgid "Please wait while fetching configuration from server..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1034
+#: ../coreapi/linphonecore.c:1511
 msgid "Ready"
 msgstr "就绪"
 
-#: ../coreapi/linphonecore.c:1967
-#, fuzzy
+#: ../coreapi/linphonecore.c:2470
 msgid "Configuring"
-msgstr "确认"
+msgstr ""
 
-#: ../coreapi/linphonecore.c:2133
+#: ../coreapi/linphonecore.c:2635
 msgid "Looking for telephone number destination..."
 msgstr "查询电话号码目的地..."
 
-#: ../coreapi/linphonecore.c:2136
+#: ../coreapi/linphonecore.c:2637
 msgid "Could not resolve this number."
 msgstr "该号码无法解析。"
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2418
+#: ../coreapi/linphonecore.c:2919
 msgid "Contacting"
 msgstr "联系中"
 
-#: ../coreapi/linphonecore.c:2425
-#, fuzzy
+#: ../coreapi/linphonecore.c:2924
 msgid "Could not call"
-msgstr "无法呼叫"
+msgstr ""
 
-#: ../coreapi/linphonecore.c:2576
+#: ../coreapi/linphonecore.c:3074
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2745
+#: ../coreapi/linphonecore.c:3233
 msgid "is contacting you"
 msgstr "正在联系您"
 
-#: ../coreapi/linphonecore.c:2746
+#: ../coreapi/linphonecore.c:3234
 msgid " and asked autoanswer."
 msgstr " 并询问了自动回答。"
 
-#: ../coreapi/linphonecore.c:2746
+#: ../coreapi/linphonecore.c:3234
 msgid "."
 msgstr "."
 
-#: ../coreapi/linphonecore.c:2865
+#: ../coreapi/linphonecore.c:3352
 msgid "Modifying call parameters..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3194
+#: ../coreapi/linphonecore.c:3700
 msgid "Connected."
 msgstr "已连接。"
 
-#: ../coreapi/linphonecore.c:3220
-#, fuzzy
+#: ../coreapi/linphonecore.c:3725
 msgid "Call aborted"
-msgstr "中断"
+msgstr ""
 
-#: ../coreapi/linphonecore.c:3412
-#, fuzzy
+#: ../coreapi/linphonecore.c:3915
 msgid "Could not pause the call"
-msgstr "无法呼叫"
+msgstr ""
 
-#: ../coreapi/linphonecore.c:3417
+#: ../coreapi/linphonecore.c:3919
 msgid "Pausing the current call..."
 msgstr ""
 
-#: ../coreapi/misc.c:425
+#: ../coreapi/misc.c:438
 msgid "Stun lookup in progress..."
 msgstr "正在进行 Stun 查找..."
 
-#: ../coreapi/misc.c:607
+#: ../coreapi/misc.c:619
 msgid "ICE local candidates gathering in progress..."
 msgstr ""
 
@@ -1962,507 +1832,146 @@ msgid "Pending"
 msgstr "挂起"
 
 #: ../coreapi/friend.c:66
-#, fuzzy
 msgid "Vacation"
-msgstr "通话时间"
+msgstr ""
 
 #: ../coreapi/friend.c:68
 msgid "Unknown-bug"
 msgstr "未知错误"
 
-#: ../coreapi/proxy.c:314
+#: ../coreapi/proxy.c:319
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
 msgstr "您输入的 SIP 代理地址无效，它必须是以“sip:”开头，并紧随一个主机名。"
 
-#: ../coreapi/proxy.c:320
+#: ../coreapi/proxy.c:325
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
-msgstr ""
-"您输入的地址无效。\n"
-"它应具有“sip:用户名@代理域”的形式，例如 sip:alice@example.net"
+msgstr "您输入的地址无效。\n它应具有“sip:用户名@代理域”的形式，例如 sip:alice@example.net"
 
-#: ../coreapi/proxy.c:1369
+#: ../coreapi/proxy.c:1377
 #, c-format
 msgid "Could not login as %s"
 msgstr "无法登录为 %s"
 
-#: ../coreapi/callbacks.c:355
+#: ../coreapi/callbacks.c:383
 msgid "Remote ringing."
 msgstr "响铃。"
 
-#: ../coreapi/callbacks.c:373
-#, fuzzy
+#: ../coreapi/callbacks.c:404
 msgid "Remote ringing..."
-msgstr "响铃。"
+msgstr ""
 
-#: ../coreapi/callbacks.c:384
+#: ../coreapi/callbacks.c:414
 msgid "Early media."
 msgstr ""
 
-#: ../coreapi/callbacks.c:435
-#, fuzzy, c-format
+#: ../coreapi/callbacks.c:475
+#, c-format
 msgid "Call with %s is paused."
-msgstr "与 %s 通话"
+msgstr ""
 
-#: ../coreapi/callbacks.c:448
+#: ../coreapi/callbacks.c:488
 #, c-format
 msgid "Call answered by %s - on hold."
 msgstr ""
 
-#: ../coreapi/callbacks.c:459
-#, fuzzy
+#: ../coreapi/callbacks.c:498
 msgid "Call resumed."
-msgstr "呼叫结束"
+msgstr ""
 
-#: ../coreapi/callbacks.c:464
+#: ../coreapi/callbacks.c:502
 #, c-format
 msgid "Call answered by %s."
 msgstr ""
 
-#: ../coreapi/callbacks.c:483
+#: ../coreapi/callbacks.c:525
 msgid "Incompatible, check codecs or security settings..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:512
+#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:826
+msgid "Incompatible media parameters."
+msgstr ""
+
+#: ../coreapi/callbacks.c:560
 msgid "We have been resumed."
 msgstr ""
 
-#: ../coreapi/callbacks.c:521
+#. we are being paused
+#: ../coreapi/callbacks.c:568
 msgid "We are paused by other party."
 msgstr ""
 
-#: ../coreapi/callbacks.c:556
+#. reINVITE and in-dialogs UPDATE go here
+#: ../coreapi/callbacks.c:602
 msgid "Call is updated by remote."
 msgstr ""
 
-#: ../coreapi/callbacks.c:658
+#: ../coreapi/callbacks.c:705
 msgid "Call terminated."
 msgstr "通话结束。"
 
-#: ../coreapi/callbacks.c:687
+#: ../coreapi/callbacks.c:733
 msgid "User is busy."
 msgstr "被叫正忙。"
 
-#: ../coreapi/callbacks.c:688
+#: ../coreapi/callbacks.c:734
 msgid "User is temporarily unavailable."
 msgstr "您呼叫的用户暂时无法接通。"
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:690
+#: ../coreapi/callbacks.c:736
 msgid "User does not want to be disturbed."
 msgstr "用户已开启免打扰功能。"
 
-#: ../coreapi/callbacks.c:691
+#: ../coreapi/callbacks.c:737
 msgid "Call declined."
 msgstr "呼叫被拒绝。"
 
-#: ../coreapi/callbacks.c:706
+#: ../coreapi/callbacks.c:752
 msgid "Request timeout."
 msgstr ""
 
-#: ../coreapi/callbacks.c:737
+#: ../coreapi/callbacks.c:780
 msgid "Redirected"
 msgstr "已重定向"
 
-#: ../coreapi/callbacks.c:787
-msgid "Incompatible media parameters."
-msgstr ""
-
-#: ../coreapi/callbacks.c:798
+#: ../coreapi/callbacks.c:835
 msgid "Call failed."
 msgstr "呼叫失败。"
 
-#: ../coreapi/callbacks.c:878
+#: ../coreapi/callbacks.c:913
 #, c-format
 msgid "Registration on %s successful."
 msgstr "成功注册到 %s"
 
-#: ../coreapi/callbacks.c:879
+#: ../coreapi/callbacks.c:914
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "已在 %s 解除注册。"
 
-#: ../coreapi/callbacks.c:897
+#: ../coreapi/callbacks.c:932
 msgid "no response timeout"
 msgstr "没有响应，超时"
 
-#: ../coreapi/callbacks.c:900
+#: ../coreapi/callbacks.c:935
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "注册到 %s 失败: %s"
 
-#: ../coreapi/callbacks.c:907
+#: ../coreapi/callbacks.c:942
 msgid "Service unavailable, retrying"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:177
-#, fuzzy, c-format
+#: ../coreapi/linphonecall.c:174
+#, c-format
 msgid "Authentication token is %s"
-msgstr "Linphone - 需要认证"
+msgstr ""
 
-#: ../coreapi/linphonecall.c:2932
+#: ../coreapi/linphonecall.c:3020
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
 msgstr[0] "您错过了 %i 个呼叫。"
-
-#~ msgid "aborted"
-#~ msgstr "中断"
-
-#~ msgid "completed"
-#~ msgstr "完成"
-
-#~ msgid "missed"
-#~ msgstr "丢失"
-
-#~ msgid ""
-#~ "%s at %s\n"
-#~ "From: %s\n"
-#~ "To: %s\n"
-#~ "Status: %s\n"
-#~ "Duration: %i mn %i sec\n"
-#~ msgstr ""
-#~ "%s @ %s\n"
-#~ "主叫：%s\n"
-#~ "被叫: %s\n"
-#~ "状态：%s\n"
-#~ "状态：%i 分 %i 秒\n"
-
-#~ msgid "Outgoing call"
-#~ msgstr "呼出"
-
-#~ msgid "No response."
-#~ msgstr "没有响应。"
-
-#~ msgid "Protocol error."
-#~ msgstr "协议错误。"
-
-#~ msgid ""
-#~ "Could not parse given sip address. A sip url usually looks like sip:"
-#~ "user@domain"
-#~ msgstr ""
-#~ "无法解析给定的 SIP 地址，SIP 地址应有如下格式：\n"
-#~ "sip:用户名@域名"
-
-#~ msgid ""
-#~ "Your computer appears to be using ALSA sound drivers.\n"
-#~ "This is the best choice. However the pcm oss emulation module\n"
-#~ "is missing and linphone needs it. Please execute\n"
-#~ "'modprobe snd-pcm-oss' as root to load it."
-#~ msgstr ""
-#~ "您的计算机正使用 ALSA 声音驱动。\n"
-#~ "ALSA 是最佳选择，然而 Linphone 必须的 PCM OSS 模拟模块缺失。\n"
-#~ "请以 root 用户运行 modprobe snd-pcm-oss 载入它。"
-
-#~ msgid ""
-#~ "Your computer appears to be using ALSA sound drivers.\n"
-#~ "This is the best choice. However the mixer oss emulation module\n"
-#~ "is missing and linphone needs it. Please execute\n"
-#~ " 'modprobe snd-mixer-oss' as root to load it."
-#~ msgstr ""
-#~ "您的计算机正使用 ALSA 声音驱动。\n"
-#~ "ALSA 是最佳选择，然而 Linphone 必须的 Mixer OSS 模拟模块缺失。\n"
-#~ "请以 root 用户运行 modprobe snd-mixer-oss 载入它。"
-
-#~ msgid "Keypad"
-#~ msgstr "数字键盘"
-
-#~ msgid "Chat with %s"
-#~ msgstr "与 %s 通话"
-
-#~ msgid "Please choose a username:"
-#~ msgstr "请选择用户名："
-
-#~ msgid "Checking if '%s' is available..."
-#~ msgstr "检查 %s 是否可用..."
-
-#~ msgid "Please wait..."
-#~ msgstr "请稍候..."
-
-#~ msgid "Sorry this username already exists. Please try a new one."
-#~ msgstr "对不起，该用户已经存在，请换一个尝试。"
-
-#~ msgid "Ok !"
-#~ msgstr "成功！"
-
-#~ msgid "Communication problem, please try again later."
-#~ msgstr "连接错误，请稍后重试。"
-
-#~ msgid "Choosing a username"
-#~ msgstr "选择用户名："
-
-#~ msgid "Verifying"
-#~ msgstr "验证中"
-
-#~ msgid "Creating your account"
-#~ msgstr "正在创建您的帐户"
-
-#~ msgid "Now ready !"
-#~ msgstr "就绪！"
-
-#, fuzzy
-#~ msgid "Enable video"
-#~ msgstr "启用"
-
-#~ msgid "Enter username, phone number, or full sip address"
-#~ msgstr "请输入用户名、电话号码或完整的 SIP 地址"
-
-#~ msgid "Lookup:"
-#~ msgstr "查找："
-
-#~ msgid "in"
-#~ msgstr "于"
-
-#~ msgid ""
-#~ "Register to FONICS\n"
-#~ "virtual network !"
-#~ msgstr ""
-#~ "注册到 FONICS\n"
-#~ "虚拟网络!"
-
-#~ msgid "No common codecs"
-#~ msgstr "未找到常用编解码器"
-
-#~ msgid "Unmute"
-#~ msgstr "取消静音"
-
-#~ msgid "<b>Contact list</b>"
-#~ msgstr "<b>联系人列表</b>"
-
-#, fuzzy
-#~ msgid "Audio & video"
-#~ msgstr "音频和视频"
-
-#~ msgid "Audio only"
-#~ msgstr "音频"
-
-#~ msgid "Duration:"
-#~ msgstr "通话计时："
-
-#, fuzzy
-#~ msgid "_Call history"
-#~ msgstr "呼叫历史"
-
-#~ msgid "_Linphone"
-#~ msgstr "_Linphone"
-
-#~ msgid "Register at startup"
-#~ msgstr "在启动时注册"
-
-#~ msgid "ITU-G.711 alaw encoder"
-#~ msgstr "ITU-G.711 alaw 编码器"
-
-#~ msgid "ITU-G.711 alaw decoder"
-#~ msgstr "ITU-G.711 alaw 解码器"
-
-#~ msgid "Alsa sound source"
-#~ msgstr "Alsa 音频源"
-
-#~ msgid "Alsa sound output"
-#~ msgstr "Alsa 音频输出"
-
-#~ msgid "Sound capture filter for MacOS X Audio Queue Service"
-#~ msgstr "MacOS X 音频队列服务音频输入过滤器"
-
-#~ msgid "Sound playback filter for MacOS X Audio Queue Service"
-#~ msgstr "MacOS X 音频队列服务音频回放过滤器"
-
-#~ msgid "DTMF generator"
-#~ msgstr "DTMF 生成器"
-
-#~ msgid "The GSM full-rate codec"
-#~ msgstr "GSM 全速编解码器"
-
-#~ msgid "The GSM codec"
-#~ msgstr "GSM 编解码器"
-
-#, fuzzy
-#~ msgid "Sound capture filter for MacOS X Audio Unit"
-#~ msgstr "MacOS X 音频队列服务音频输入过滤器"
-
-#, fuzzy
-#~ msgid "Sound playback filter for MacOS X Audio Unit"
-#~ msgstr "MacOS X 音频队列服务音频回放过滤器"
-
-#~ msgid "Raw files and wav reader"
-#~ msgstr "原始文件和 Wav 读取器"
-
-#~ msgid "Wav file recorder"
-#~ msgstr "Wav 文件记录器"
-
-#~ msgid "A filter that send several inputs to one output."
-#~ msgstr "将多个输入发送至单个输出。"
-
-#~ msgid "RTP output filter"
-#~ msgstr "RTP 输出过滤器"
-
-#~ msgid "The free and wonderful speex codec"
-#~ msgstr "优秀的自由软件编解码器 Speex"
-
-#~ msgid "A filter that controls and measure sound volume"
-#~ msgstr "控制和调节音量的过滤器"
-
-#~ msgid "A video4linux compatible source filter to stream pictures."
-#~ msgstr "用于图像流的 video4linux 兼容源过滤器"
-
-#~ msgid "A filter to grab pictures from Video4Linux2-powered cameras"
-#~ msgstr "用于从 Video4Linux2 驱动的摄像头获取图像的过滤器"
-
-#~ msgid "A filter that outputs a static image."
-#~ msgstr "输出静态图像的过滤器"
-
-#~ msgid "A pixel format converter"
-#~ msgstr "像素格式转换器"
-
-#~ msgid "A video size converter"
-#~ msgstr "视频尺寸转换器"
-
-#~ msgid "a small video size converter"
-#~ msgstr "小的视频尺寸转换器"
-
-#~ msgid "Echo canceller using speex library"
-#~ msgstr "使用 Speex 库的回声抑制器"
-
-#~ msgid "A filter that reads from input and copy to its multiple outputs."
-#~ msgstr "用于读取输入并复制到多个输出的过滤器"
-
-#~ msgid "The theora video encoder from xiph.org"
-#~ msgstr "来自 xiph.org 的 Theora 视频编码器"
-
-#~ msgid "The open-source and royalty-free 'theora' video codec from xiph.org"
-#~ msgstr "来自 xiph.org 的开源的自由软件编解码器 Theora"
-
-#~ msgid "The theora video decoder from xiph.org"
-#~ msgstr "来自 xiph.org 的 Theora 视频解码器"
-
-#~ msgid "ITU-G.711 ulaw encoder"
-#~ msgstr "ITU-G.711 ulaw 编码器"
-
-#~ msgid "ITU-G.711 ulaw decoder"
-#~ msgstr "ITU-G.711 ulaw 解码器"
-
-#~ msgid "A H.263 decoder using ffmpeg library"
-#~ msgstr "使用 ffmpeg 库的 H.263 解码器"
-
-#~ msgid "A MPEG4 decoder using ffmpeg library"
-#~ msgstr "使用 ffmpeg 库的 MPEG4 解码器"
-
-#~ msgid "A RTP/JPEG decoder using ffmpeg library"
-#~ msgstr "使用 ffmpeg 库的 RTP/JPEG 解码器"
-
-#~ msgid "A MJPEG decoder using ffmpeg library"
-#~ msgstr "使用 ffmpeg 库的 MJPEG 解码器"
-
-#~ msgid "A snow decoder using ffmpeg library"
-#~ msgstr "使用 ffmpeg 库的 snow 解码器"
-
-#~ msgid "A video H.263 encoder using ffmpeg library."
-#~ msgstr "使用 ffmpeg 库的 H.263 编码器"
-
-#~ msgid ""
-#~ "A video H.263 encoder using ffmpeg library. It is compliant with old "
-#~ "RFC2190 spec."
-#~ msgstr "使用 ffmpeg 库的 H.263 视频编码器，符合旧的 RFC2190"
-
-#~ msgid "A video MPEG4 encoder using ffmpeg library."
-#~ msgstr "使用 ffmpeg 库的 MPEG4 视频编码器"
-
-#~ msgid "A video snow encoder using ffmpeg library."
-#~ msgstr "使用 ffmpeg 库的 snow 编码器"
-
-#~ msgid "A RTP/MJPEG encoder using ffmpeg library."
-#~ msgstr "使用 ffmpeg 库的 RTP/MJPEG 编码器"
-
-#~ msgid ""
-#~ "A video H.263 encoder using ffmpeg library, compliant with old RFC2190 "
-#~ "spec."
-#~ msgstr "使用 ffmpeg 库的 H.263 编码器，符合旧的 RFC2190"
-
-#~ msgid ""
-#~ "The snow codec is royalty-free and is open-source. \n"
-#~ "It uses innovative techniques that makes it one of most promising video "
-#~ "codec. It is implemented within the ffmpeg project.\n"
-#~ "However it is under development, quite unstable and compatibility with "
-#~ "other versions cannot be guaranteed."
-#~ msgstr ""
-#~ "Snow 编解码器是开源的自由软件。\n"
-#~ "创新科技使 Snow 成为当今最有希望的视频编解码器。它在 ffmpeg 项目内实现。\n"
-#~ "然而它仍处于开发中，稳定性和与其他版本的兼容性尚无法保证。"
-
-#~ msgid "A MJPEG encoder using ffmpeg library."
-#~ msgstr "使用 ffmpeg 库的 MJPEG 编码器"
-
-#, fuzzy
-#~ msgid "A SDL-based video display"
-#~ msgstr "通用视频显示"
-
-#~ msgid "A webcam grabber based on directshow."
-#~ msgstr "使用 DirectShow 的摄像头抓取器"
-
-#, fuzzy
-#~ msgid "Sound capture filter for MacOS X Audio Unit Service"
-#~ msgstr "MacOS X 音频队列服务音频输入过滤器"
-
-#, fuzzy
-#~ msgid "Sound playback filter for MacOS X Audio Unit Service"
-#~ msgstr "MacOS X 音频队列服务音频回放过滤器"
-
-#, fuzzy
-#~ msgid "Sound capture filter for Android"
-#~ msgstr "OSS 驱动的音频输入过滤器"
-
-#, fuzzy
-#~ msgid "Sound playback filter for Android"
-#~ msgstr "OSS 驱动的音频回放过滤器"
-
-#, fuzzy
-#~ msgid "A filter that captures Android video."
-#~ msgstr "控制和调节音量的过滤器"
-
-#~ msgid ""
-#~ "Your machine appears to be connected to an IPv6 network. By default "
-#~ "linphone always uses IPv4. Please update your configuration if you want "
-#~ "to use IPv6"
-#~ msgstr ""
-#~ "您的机器有 IPv6 网络连接。Linphone 默认使用IPv4，如果您希望使用 IPv6 请更"
-#~ "该配置。"
-
-#~ msgid "Sound capture filter for MacOS X Core Audio drivers"
-#~ msgstr "MacOS X 核心声音驱动音频输入过滤器"
-
-#~ msgid "Sound playback filter for MacOS X Core Audio drivers"
-#~ msgstr "MacOS X 核心声音驱动音频回放过滤器"
-
-#~ msgid "Show debug messages"
-#~ msgstr "显示调试信息"
-
-#~ msgid "Start call"
-#~ msgstr "开始呼叫"
-
-#~ msgid "_Modes"
-#~ msgstr "模式(_M)"
-
-#~ msgid "Created by Simon Morlat\n"
-#~ msgstr "由 Simon Morlat 创建\n"
-
-#~ msgid "Accept"
-#~ msgstr "接受"
-
-#~ msgid "Incoming call from"
-#~ msgstr "来自"
-
-#~ msgid "Linphone - Incoming call"
-#~ msgstr "Linphone - 呼入"
-
-#~ msgid "default soundcard\n"
-#~ msgstr "默认声卡\n"
-
-#~ msgid ""
-#~ "Remote end seems to have disconnected, the call is going to be closed."
-#~ msgstr "对方断开连接，通话终止。"
-
-#~ msgid "Sorry, having multiple simultaneous calls is not supported yet !"
-#~ msgstr "抱歉, 还不支持并发多路呼叫!"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 789c278d5..22cfa3c0c 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,20 +1,20 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: linphone 3.4\n"
+"Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-15 09:24+0200\n"
-"PO-Revision-Date: 2011-04-06 21:24+0800\n"
-"Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
-"Language-Team: \n"
-"Language: \n"
+"POT-Creation-Date: 2014-11-19 10:39+0100\n"
+"PO-Revision-Date: 2014-11-19 10:15+0000\n"
+"Last-Translator: Cqnqrd <gautier.pelloux@gmail.com>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/linphone-gtk/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974
@@ -28,28 +28,25 @@ msgid "Send text to %s"
 msgstr "傳送文字給 %s"
 
 #: ../gtk/calllogs.c:232
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Recent calls (%i)</b>"
-msgstr "<b>通話中</b>"
+msgstr ""
 
 #: ../gtk/calllogs.c:314
 msgid "n/a"
 msgstr ""
 
 #: ../gtk/calllogs.c:317
-#, fuzzy
 msgid "Aborted"
-msgstr "已放棄"
+msgstr ""
 
 #: ../gtk/calllogs.c:320
-#, fuzzy
 msgid "Missed"
-msgstr "未接"
+msgstr ""
 
 #: ../gtk/calllogs.c:323
-#, fuzzy
 msgid "Declined"
-msgstr "拒接"
+msgstr ""
 
 #: ../gtk/calllogs.c:329
 #, c-format
@@ -87,9 +84,8 @@ msgid "Conference"
 msgstr ""
 
 #: ../gtk/conference.c:46
-#, fuzzy
 msgid "Me"
-msgstr "靜音"
+msgstr ""
 
 #: ../gtk/support.c:49 ../gtk/support.c:73 ../gtk/support.c:102
 #, c-format
@@ -126,110 +122,92 @@ msgstr "如啟用此項，將會自動接聽來電"
 
 #: ../gtk/main.c:149
 msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: c:"
-"\\Program Files\\Linphone)"
-msgstr ""
-"指定一個工作目錄（應該為安裝的根目錄，例如：c:\\Program Files\\Linphone）"
+"Specifiy a working directory (should be the base of the installation, eg: "
+"c:\\Program Files\\Linphone)"
+msgstr "指定一個工作目錄（應該為安裝的根目錄，例如：c:\\Program Files\\Linphone）"
 
 #: ../gtk/main.c:156
-#, fuzzy
 msgid "Configuration file"
-msgstr "確認"
+msgstr ""
 
 #: ../gtk/main.c:163
-#, fuzzy
 msgid "Run the audio assistant"
-msgstr "帳號設定助理"
+msgstr ""
 
-#: ../gtk/main.c:590
-#, c-format
-msgid "Call with %s"
-msgstr "和 %s 通話"
-
-#: ../gtk/main.c:1183
+#: ../gtk/main.c:1085
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
-"Would you allow him to see your presence status or add him to your contact "
-"list ?\n"
+"Would you allow him to see your presence status or add him to your contact list ?\n"
 "If you answer no, this person will be temporarily blacklisted."
-msgstr ""
-"%s 想要加您加入他的連絡人清單。\n"
-"您是否要允許他看見您的上線狀態或將他加入您的連絡人清單？\n"
-"如果您回答否，這個人會被暫時列入黑名單。"
+msgstr "%s 想要加您加入他的連絡人清單。\n您是否要允許他看見您的上線狀態或將他加入您的連絡人清單？\n如果您回答否，這個人會被暫時列入黑名單。"
 
-#: ../gtk/main.c:1260
-#, fuzzy, c-format
+#: ../gtk/main.c:1162
+#, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
 msgstr ""
-"請輸入您使用者名稱 <i>%s</i>\n"
-"於網域 <i>%s</i> 的密碼："
 
-#: ../gtk/main.c:1376
-#, fuzzy
+#: ../gtk/main.c:1283
 msgid "Call error"
-msgstr "通話紀錄"
+msgstr ""
 
-#: ../gtk/main.c:1379 ../coreapi/linphonecore.c:3240
+#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3744
 msgid "Call ended"
 msgstr "通話已結束"
 
-#: ../gtk/main.c:1382
+#: ../gtk/main.c:1289
 msgid "Incoming call"
 msgstr "來電"
 
-#: ../gtk/main.c:1384 ../gtk/incall_view.c:522 ../gtk/main.ui.h:5
+#: ../gtk/main.c:1291 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
 msgid "Answer"
 msgstr "接聽"
 
-#: ../gtk/main.c:1386 ../gtk/main.ui.h:6
+#: ../gtk/main.c:1293 ../gtk/main.ui.h:6
 msgid "Decline"
 msgstr "拒接"
 
-#: ../gtk/main.c:1392
-#, fuzzy
+#: ../gtk/main.c:1299
 msgid "Call paused"
-msgstr "通話已放棄"
+msgstr ""
 
-#: ../gtk/main.c:1392
-#, fuzzy, c-format
+#: ../gtk/main.c:1299
+#, c-format
 msgid "<b>by %s</b>"
-msgstr "<b>連接埠</b>"
+msgstr ""
 
-#: ../gtk/main.c:1459
+#: ../gtk/main.c:1366
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr ""
 
-#: ../gtk/main.c:1621
+#: ../gtk/main.c:1528
 msgid "Website link"
 msgstr "網站連結"
 
-#: ../gtk/main.c:1670
+#: ../gtk/main.c:1577
 msgid "Linphone - a video internet phone"
 msgstr "Linphone - 網路視訊電話"
 
-#: ../gtk/main.c:1762
+#: ../gtk/main.c:1669
 #, c-format
 msgid "%s (Default)"
 msgstr "%s （預設值）"
 
-#: ../gtk/main.c:2099 ../coreapi/callbacks.c:949
+#: ../gtk/main.c:2006 ../coreapi/callbacks.c:983
 #, c-format
 msgid "We are transferred to %s"
 msgstr "我們被轉接到 %s"
 
-#: ../gtk/main.c:2109
+#: ../gtk/main.c:2016
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
-msgstr ""
-"在這臺電腦中偵測不到音效卡。\n"
-"您將無法傳送或接收語音電話。"
+msgstr "在這臺電腦中偵測不到音效卡。\n您將無法傳送或接收語音電話。"
 
-#: ../gtk/main.c:2250
+#: ../gtk/main.c:2157
 msgid "A free SIP video-phone"
 msgstr "自由的 SIP 視訊電話"
 
@@ -246,9 +224,8 @@ msgid "Name"
 msgstr "名稱"
 
 #: ../gtk/friendlist.c:721
-#, fuzzy
 msgid "Call"
-msgstr "播打給 %s"
+msgstr ""
 
 #: ../gtk/friendlist.c:726
 msgid "Chat"
@@ -270,9 +247,9 @@ msgid "Delete contact '%s'"
 msgstr "刪除連絡人「%s」"
 
 #: ../gtk/friendlist.c:978
-#, fuzzy, c-format
+#, c-format
 msgid "Delete chat history of '%s'"
-msgstr "刪除連絡人「%s」"
+msgstr ""
 
 #: ../gtk/friendlist.c:1029
 #, c-format
@@ -288,9 +265,8 @@ msgid "Status"
 msgstr "狀態"
 
 #: ../gtk/propertybox.c:570
-#, fuzzy
 msgid "IP Bitrate (kbit/s)"
-msgstr "最小頻寬 (kbit/s)"
+msgstr ""
 
 #: ../gtk/propertybox.c:577
 msgid "Parameters"
@@ -308,92 +284,92 @@ msgstr "已停用"
 msgid "Account"
 msgstr "帳號"
 
-#: ../gtk/propertybox.c:1063
+#: ../gtk/propertybox.c:1072
 msgid "English"
 msgstr "英語"
 
-#: ../gtk/propertybox.c:1064
+#: ../gtk/propertybox.c:1073
 msgid "French"
 msgstr "法語"
 
-#: ../gtk/propertybox.c:1065
+#: ../gtk/propertybox.c:1074
 msgid "Swedish"
 msgstr "瑞典語"
 
-#: ../gtk/propertybox.c:1066
+#: ../gtk/propertybox.c:1075
 msgid "Italian"
 msgstr "義大利語"
 
-#: ../gtk/propertybox.c:1067
+#: ../gtk/propertybox.c:1076
 msgid "Spanish"
 msgstr "西班牙語"
 
-#: ../gtk/propertybox.c:1068
+#: ../gtk/propertybox.c:1077
 msgid "Brazilian Portugese"
 msgstr "巴西葡萄牙語"
 
-#: ../gtk/propertybox.c:1069
+#: ../gtk/propertybox.c:1078
 msgid "Polish"
 msgstr "波蘭語"
 
-#: ../gtk/propertybox.c:1070
+#: ../gtk/propertybox.c:1079
 msgid "German"
 msgstr "德語"
 
-#: ../gtk/propertybox.c:1071
+#: ../gtk/propertybox.c:1080
 msgid "Russian"
 msgstr "俄語"
 
-#: ../gtk/propertybox.c:1072
+#: ../gtk/propertybox.c:1081
 msgid "Japanese"
 msgstr "日語"
 
-#: ../gtk/propertybox.c:1073
+#: ../gtk/propertybox.c:1082
 msgid "Dutch"
 msgstr "荷蘭語"
 
-#: ../gtk/propertybox.c:1074
+#: ../gtk/propertybox.c:1083
 msgid "Hungarian"
 msgstr "匈牙利語"
 
-#: ../gtk/propertybox.c:1075
+#: ../gtk/propertybox.c:1084
 msgid "Czech"
 msgstr "捷克語"
 
-#: ../gtk/propertybox.c:1076
+#: ../gtk/propertybox.c:1085
 msgid "Chinese"
 msgstr "中文"
 
-#: ../gtk/propertybox.c:1077
+#: ../gtk/propertybox.c:1086
 msgid "Traditional Chinese"
 msgstr ""
 
-#: ../gtk/propertybox.c:1078
+#: ../gtk/propertybox.c:1087
 msgid "Norwegian"
 msgstr ""
 
-#: ../gtk/propertybox.c:1079
+#: ../gtk/propertybox.c:1088
 msgid "Hebrew"
 msgstr ""
 
-#: ../gtk/propertybox.c:1080
+#: ../gtk/propertybox.c:1089
 msgid "Serbian"
 msgstr ""
 
-#: ../gtk/propertybox.c:1147
+#: ../gtk/propertybox.c:1156
 msgid ""
 "You need to restart linphone for the new language selection to take effect."
 msgstr "您需要重新啟動 linphone 才能讓新選擇的語言生效。"
 
-#: ../gtk/propertybox.c:1225
+#: ../gtk/propertybox.c:1234
 msgid "None"
 msgstr ""
 
-#: ../gtk/propertybox.c:1229
+#: ../gtk/propertybox.c:1238
 msgid "SRTP"
 msgstr ""
 
-#: ../gtk/propertybox.c:1235
+#: ../gtk/propertybox.c:1244
 msgid "ZRTP"
 msgstr ""
 
@@ -402,9 +378,7 @@ msgstr ""
 msgid ""
 "A more recent version is availalble from %s.\n"
 "Would you like to open a browser to download it ?"
-msgstr ""
-"在 %s 有最新的版本。\n"
-"您想要開啟瀏覽器下載它嗎？"
+msgstr "在 %s 有最新的版本。\n您想要開啟瀏覽器下載它嗎？"
 
 #: ../gtk/update.c:91
 msgid "You are running the lastest version."
@@ -440,24 +414,19 @@ msgstr[0] "找不到 %i 個連絡人"
 msgid ""
 "Welcome !\n"
 "This assistant will help you to use a SIP account for your calls."
-msgstr ""
-"歡迎！\n"
-"這個助理會協助您使用電話的 SIP 帳號。"
+msgstr "歡迎！\n這個助理會協助您使用電話的 SIP 帳號。"
 
 #: ../gtk/setupwizard.c:43
-#, fuzzy
 msgid "Create an account on linphone.org"
-msgstr "以選擇的使用者名稱建立一個帳號"
+msgstr ""
 
 #: ../gtk/setupwizard.c:44
-#, fuzzy
 msgid "I have already a linphone.org account and I just want to use it"
-msgstr "我已經有帳號，並且要使用這個帳號"
+msgstr ""
 
 #: ../gtk/setupwizard.c:45
-#, fuzzy
 msgid "I have already a sip account and I just want to use it"
-msgstr "我已經有帳號，並且要使用這個帳號"
+msgstr ""
 
 #: ../gtk/setupwizard.c:46
 msgid "I want to specify a remote configuration URI"
@@ -480,14 +449,12 @@ msgid "Enter your account informations"
 msgstr ""
 
 #: ../gtk/setupwizard.c:140
-#, fuzzy
 msgid "Username*"
-msgstr "使用者名稱"
+msgstr ""
 
 #: ../gtk/setupwizard.c:141
-#, fuzzy
 msgid "Password*"
-msgstr "密碼"
+msgstr ""
 
 #: ../gtk/setupwizard.c:144
 msgid "Domain*"
@@ -502,14 +469,12 @@ msgid "(*) Required fields"
 msgstr ""
 
 #: ../gtk/setupwizard.c:318
-#, fuzzy
 msgid "Username: (*)"
-msgstr "使用者名稱："
+msgstr ""
 
 #: ../gtk/setupwizard.c:320
-#, fuzzy
 msgid "Password: (*)"
-msgstr "密碼： "
+msgstr ""
 
 #: ../gtk/setupwizard.c:322
 msgid "Email: (*)"
@@ -535,15 +500,13 @@ msgstr "謝謝您。您的帳號已設定完成並且可以使用。"
 
 #: ../gtk/setupwizard.c:413
 msgid ""
-"Please validate your account by clicking on the link we just sent you by "
-"email.\n"
+"Please validate your account by clicking on the link we just sent you by email.\n"
 "Then come back here and press Next button."
 msgstr ""
 
 #: ../gtk/setupwizard.c:600
-#, fuzzy
 msgid "SIP account configuration assistant"
-msgstr "帳號設定助理"
+msgstr ""
 
 #: ../gtk/setupwizard.c:618
 msgid "Welcome to the account setup assistant"
@@ -554,9 +517,8 @@ msgid "Account setup assistant"
 msgstr "帳號設定助理"
 
 #: ../gtk/setupwizard.c:629
-#, fuzzy
 msgid "Configure your account (step 1/1)"
-msgstr "設定 SIP 帳號"
+msgstr ""
 
 #: ../gtk/setupwizard.c:634
 msgid "Enter your sip username (step 1/1)"
@@ -579,9 +541,9 @@ msgid "Terminating"
 msgstr ""
 
 #: ../gtk/incall_view.c:70 ../gtk/incall_view.c:94
-#, fuzzy, c-format
+#, c-format
 msgid "Call #%i"
-msgstr "播打給 %s"
+msgstr ""
 
 #: ../gtk/incall_view.c:155
 #, c-format
@@ -589,18 +551,16 @@ msgid "Transfer to call #%i with %s"
 msgstr ""
 
 #: ../gtk/incall_view.c:211 ../gtk/incall_view.c:214
-#, fuzzy
 msgid "Not used"
-msgstr "找不到"
+msgstr ""
 
 #: ../gtk/incall_view.c:221
 msgid "ICE not activated"
 msgstr ""
 
 #: ../gtk/incall_view.c:223
-#, fuzzy
 msgid "ICE failed"
-msgstr "ICE 過濾器"
+msgstr ""
 
 #: ../gtk/incall_view.c:225
 msgid "ICE in progress"
@@ -611,9 +571,8 @@ msgid "Going through one or more NATs"
 msgstr ""
 
 #: ../gtk/incall_view.c:229
-#, fuzzy
 msgid "Direct"
-msgstr "已重新導向"
+msgstr ""
 
 #: ../gtk/incall_view.c:231
 msgid "Through a relay server"
@@ -624,9 +583,8 @@ msgid "uPnP not activated"
 msgstr ""
 
 #: ../gtk/incall_view.c:241
-#, fuzzy
 msgid "uPnP in progress"
-msgstr "正在進行 Stun 搜尋..."
+msgstr ""
 
 #: ../gtk/incall_view.c:243
 msgid "uPnp not available"
@@ -637,9 +595,8 @@ msgid "uPnP is running"
 msgstr ""
 
 #: ../gtk/incall_view.c:247
-#, fuzzy
 msgid "uPnP failed"
-msgstr "ICE 過濾器"
+msgstr ""
 
 #: ../gtk/incall_view.c:257 ../gtk/incall_view.c:258
 msgid "Direct or through server"
@@ -666,113 +623,110 @@ msgstr ""
 msgid "Hang up"
 msgstr ""
 
-#: ../gtk/incall_view.c:501
+#: ../gtk/incall_view.c:511
 msgid "<b>Calling...</b>"
 msgstr "<b>播打...</b>"
 
-#: ../gtk/incall_view.c:504 ../gtk/incall_view.c:707
+#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:727
 msgid "00::00::00"
 msgstr "00::00::00"
 
-#: ../gtk/incall_view.c:515
+#: ../gtk/incall_view.c:525
 msgid "<b>Incoming call</b>"
 msgstr "<b>來電</b>"
 
-#: ../gtk/incall_view.c:552
+#: ../gtk/incall_view.c:562
 msgid "good"
 msgstr ""
 
-#: ../gtk/incall_view.c:554
+#: ../gtk/incall_view.c:564
 msgid "average"
 msgstr ""
 
-#: ../gtk/incall_view.c:556
+#: ../gtk/incall_view.c:566
 msgid "poor"
 msgstr ""
 
-#: ../gtk/incall_view.c:558
+#: ../gtk/incall_view.c:568
 msgid "very poor"
 msgstr ""
 
-#: ../gtk/incall_view.c:560
+#: ../gtk/incall_view.c:570
 msgid "too bad"
 msgstr ""
 
-#: ../gtk/incall_view.c:561 ../gtk/incall_view.c:577
+#: ../gtk/incall_view.c:571 ../gtk/incall_view.c:587
 msgid "unavailable"
 msgstr ""
 
-#: ../gtk/incall_view.c:669
+#: ../gtk/incall_view.c:679
 msgid "Secured by SRTP"
 msgstr ""
 
-#: ../gtk/incall_view.c:675
+#: ../gtk/incall_view.c:685
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
 msgstr ""
 
-#: ../gtk/incall_view.c:681
+#: ../gtk/incall_view.c:691
 msgid "Set unverified"
 msgstr ""
 
-#: ../gtk/incall_view.c:681 ../gtk/main.ui.h:4
+#: ../gtk/incall_view.c:691 ../gtk/main.ui.h:4
 msgid "Set verified"
 msgstr ""
 
-#: ../gtk/incall_view.c:702
+#: ../gtk/incall_view.c:722
 msgid "In conference"
 msgstr ""
 
-#: ../gtk/incall_view.c:702
+#: ../gtk/incall_view.c:722
 msgid "<b>In call</b>"
 msgstr "<b>通話中</b>"
 
-#: ../gtk/incall_view.c:738
+#: ../gtk/incall_view.c:758
 msgid "<b>Paused call</b>"
 msgstr "<b>暫停通話</b>"
 
-#: ../gtk/incall_view.c:751
+#: ../gtk/incall_view.c:771
 #, c-format
 msgid "%02i::%02i::%02i"
 msgstr "%02i::%02i::%02i"
 
-#: ../gtk/incall_view.c:772
+#: ../gtk/incall_view.c:794
 msgid "<b>Call ended.</b>"
 msgstr "<b>通話結束。</b>"
 
-#: ../gtk/incall_view.c:803
+#: ../gtk/incall_view.c:825
 msgid "Transfer in progress"
 msgstr ""
 
-#: ../gtk/incall_view.c:806
-#, fuzzy
+#: ../gtk/incall_view.c:828
 msgid "Transfer done."
-msgstr "轉接"
+msgstr ""
 
-#: ../gtk/incall_view.c:809
-#, fuzzy
+#: ../gtk/incall_view.c:831
 msgid "Transfer failed."
-msgstr "轉接"
+msgstr ""
 
-#: ../gtk/incall_view.c:853
+#: ../gtk/incall_view.c:875
 msgid "Resume"
 msgstr "繼續"
 
-#: ../gtk/incall_view.c:860 ../gtk/main.ui.h:9
+#: ../gtk/incall_view.c:882 ../gtk/main.ui.h:9
 msgid "Pause"
 msgstr "暫停"
 
-#: ../gtk/incall_view.c:926
+#: ../gtk/incall_view.c:948
 #, c-format
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
 msgstr ""
 
-#: ../gtk/incall_view.c:926
-#, fuzzy
+#: ../gtk/incall_view.c:948
 msgid "(Paused)"
-msgstr "暫停"
+msgstr ""
 
 #: ../gtk/loginframe.c:88
 #, c-format
@@ -806,18 +760,14 @@ msgid "Too loud"
 msgstr ""
 
 #: ../gtk/audio_assistant.c:318
-#, fuzzy
 msgid ""
 "Welcome !\n"
 "This assistant will help you to configure audio settings for Linphone"
 msgstr ""
-"歡迎！\n"
-"這個助理會協助您使用電話的 SIP 帳號。"
 
 #: ../gtk/audio_assistant.c:328
-#, fuzzy
 msgid "Capture device"
-msgstr "捕捉裝置:"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:329
 msgid "Recorded volume"
@@ -828,9 +778,8 @@ msgid "No voice"
 msgstr ""
 
 #: ../gtk/audio_assistant.c:369
-#, fuzzy
 msgid "Playback device"
-msgstr "播放裝置"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:370
 msgid "Play three beeps"
@@ -849,14 +798,12 @@ msgid "Let's start Linphone now"
 msgstr ""
 
 #: ../gtk/audio_assistant.c:496
-#, fuzzy
 msgid "Audio Assistant"
-msgstr "帳號設定助理"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:506 ../gtk/main.ui.h:31
-#, fuzzy
 msgid "Audio assistant"
-msgstr "帳號設定助理"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:511
 msgid "Mic Gain calibration"
@@ -871,9 +818,8 @@ msgid "Record and Play"
 msgstr ""
 
 #: ../gtk/main.ui.h:1
-#, fuzzy
 msgid "<b>Callee name</b>"
-msgstr "<b>通話結束。</b>"
+msgstr ""
 
 #: ../gtk/main.ui.h:2
 msgid "Send"
@@ -936,9 +882,8 @@ msgid "_Options"
 msgstr "選項(_O)"
 
 #: ../gtk/main.ui.h:23
-#, fuzzy
 msgid "Set configuration URI"
-msgstr "確認"
+msgstr ""
 
 #: ../gtk/main.ui.h:24
 msgid "Always start video"
@@ -965,9 +910,8 @@ msgid "Check _Updates"
 msgstr "檢查更新(_U)"
 
 #: ../gtk/main.ui.h:30
-#, fuzzy
 msgid "Account assistant"
-msgstr "帳號設定助理"
+msgstr ""
 
 #: ../gtk/main.ui.h:32
 msgid "SIP address or phone number:"
@@ -994,9 +938,8 @@ msgid "Add contact"
 msgstr "加入聯絡人"
 
 #: ../gtk/main.ui.h:38
-#, fuzzy
 msgid "Recent calls"
-msgstr "通話中"
+msgstr ""
 
 #: ../gtk/main.ui.h:39
 msgid "My current identity:"
@@ -1047,7 +990,6 @@ msgid "An internet video phone using the standard SIP (rfc3261) protocol."
 msgstr "使用標準 SIP (rfc3261) 通訊協定的網路視訊電話。"
 
 #: ../gtk/about.ui.h:5
-#, fuzzy
 msgid ""
 "fr: Simon Morlat\n"
 "en: Simon Morlat and Delphine Perreau\n"
@@ -1062,17 +1004,6 @@ msgid ""
 "hu: anonymous\n"
 "he: Eli Zaretskii <eliz@gnu.org>\n"
 msgstr ""
-"fr: Simon Morlat\n"
-"en: Simon Morlat and Delphine Perreau\n"
-"it: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\n"
-"de: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\n"
-"sv: Daniel Nylander <po@danielnylander.se>\n"
-"es: Jesus Benitez <gnelson at inMail dot sk>\n"
-"ja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\n"
-"pt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\n"
-"pl: Robert Nasiadek <darkone@darkone.pl>\n"
-"cs: Petr Pisar <petr.pisar@atlas.cz>\n"
-"hu: anonymous\n"
 
 #: ../gtk/contact.ui.h:2
 msgid "SIP Address"
@@ -1147,9 +1078,8 @@ msgid "Registration duration (sec):"
 msgstr "註冊時間 (秒):"
 
 #: ../gtk/sip_account.ui.h:8
-#, fuzzy
 msgid "Contact params (optional):"
-msgstr "路由 (選擇性):"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:9
 msgid "AVPF regular RTCP interval (sec):"
@@ -1160,9 +1090,8 @@ msgid "Route (optional):"
 msgstr "路由 (選擇性):"
 
 #: ../gtk/sip_account.ui.h:11
-#, fuzzy
 msgid "Transport"
-msgstr "<b>傳輸</b>"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:12
 msgid "Register"
@@ -1173,9 +1102,8 @@ msgid "Publish presence information"
 msgstr "發布上線資訊"
 
 #: ../gtk/sip_account.ui.h:14
-#, fuzzy
 msgid "Enable AVPF"
-msgstr "啟用"
+msgstr ""
 
 #: ../gtk/sip_account.ui.h:15
 msgid "Configure a SIP account"
@@ -1222,19 +1150,16 @@ msgid "C"
 msgstr "C"
 
 #: ../gtk/parameters.ui.h:11
-#, fuzzy
 msgid "SIP (UDP)"
-msgstr "SIP (UDP):"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:12
-#, fuzzy
 msgid "SIP (TCP)"
-msgstr "SIP (TCP):"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:13
-#, fuzzy
 msgid "SIP (TLS)"
-msgstr "SIP (TCP):"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:14
 msgid "Settings"
@@ -1301,23 +1226,20 @@ msgid "Direct connection to the Internet"
 msgstr "直接連線到網際網路"
 
 #: ../gtk/parameters.ui.h:30
-#, fuzzy
 msgid "Behind NAT / Firewall (specify gateway IP )"
-msgstr "在 NAT / 防火牆之後 (在下面指定閘道器 IP)"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:31
 msgid "Behind NAT / Firewall (use STUN to resolve)"
 msgstr "在 NAT / 防火牆之後 (使用 STUN 解析)"
 
 #: ../gtk/parameters.ui.h:32
-#, fuzzy
 msgid "Behind NAT / Firewall (use ICE)"
-msgstr "在 NAT / 防火牆之後 (使用 STUN 解析)"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:33
-#, fuzzy
 msgid "Behind NAT / Firewall (use uPnP)"
-msgstr "在 NAT / 防火牆之後 (使用 STUN 解析)"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:34
 msgid "Public IP address:"
@@ -1372,9 +1294,8 @@ msgid "Prefered video resolution:"
 msgstr "偏好的視訊解析度:"
 
 #: ../gtk/parameters.ui.h:47
-#, fuzzy
 msgid "Video output method:"
-msgstr "視訊輸入裝置:"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:48
 msgid "<b>Video</b>"
@@ -1495,23 +1416,20 @@ msgid "User interface"
 msgstr "使用者介面"
 
 #: ../gtk/parameters.ui.h:77 ../gtk/ldap.ui.h:2
-#, fuzzy
 msgid "Server address:"
-msgstr "SIP 代理位址:"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:78 ../gtk/ldap.ui.h:3
-#, fuzzy
 msgid "Authentication method:"
-msgstr "驗證失敗"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:80
 msgid "label"
 msgstr "標籤"
 
 #: ../gtk/parameters.ui.h:81
-#, fuzzy
 msgid "<b>LDAP Account setup</b>"
-msgstr "<b>代理伺服器帳號</b>"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:82
 msgid "LDAP"
@@ -1542,23 +1460,20 @@ msgid "Please wait"
 msgstr "請稍候"
 
 #: ../gtk/dscp_settings.ui.h:1
-#, fuzzy
 msgid "DSCP settings"
-msgstr "設定值"
+msgstr ""
 
 #: ../gtk/dscp_settings.ui.h:2
 msgid "SIP"
 msgstr ""
 
 #: ../gtk/dscp_settings.ui.h:3
-#, fuzzy
 msgid "Audio RTP stream"
-msgstr "音效重取樣器"
+msgstr ""
 
 #: ../gtk/dscp_settings.ui.h:4
-#, fuzzy
 msgid "Video RTP stream"
-msgstr "視訊 RTP/UDP:"
+msgstr ""
 
 #: ../gtk/dscp_settings.ui.h:5
 msgid "<b>Set DSCP values (in hexadecimal)</b>"
@@ -1569,14 +1484,12 @@ msgid "Call statistics"
 msgstr ""
 
 #: ../gtk/call_statistics.ui.h:2
-#, fuzzy
 msgid "Audio codec"
-msgstr "音訊編碼解碼器"
+msgstr ""
 
 #: ../gtk/call_statistics.ui.h:3
-#, fuzzy
 msgid "Video codec"
-msgstr "視訊編碼解碼器"
+msgstr ""
 
 #: ../gtk/call_statistics.ui.h:4
 msgid "Audio IP bandwidth usage"
@@ -1603,24 +1516,20 @@ msgid "Video resolution received"
 msgstr ""
 
 #: ../gtk/call_statistics.ui.h:10
-#, fuzzy
 msgid "Video resolution sent"
-msgstr "偏好的視訊解析度:"
+msgstr ""
 
 #: ../gtk/call_statistics.ui.h:11
-#, fuzzy
 msgid "RTP profile"
-msgstr "RTP 輸入過濾隱器"
+msgstr ""
 
 #: ../gtk/call_statistics.ui.h:12
-#, fuzzy
 msgid "<b>Call statistics and information</b>"
-msgstr "<b>連絡人資訊</b>"
+msgstr ""
 
 #: ../gtk/tunnel_config.ui.h:1
-#, fuzzy
 msgid "Configure VoIP tunnel"
-msgstr "設定 SIP 帳號"
+msgstr ""
 
 #: ../gtk/tunnel_config.ui.h:2
 msgid "Host"
@@ -1699,9 +1608,8 @@ msgid "1"
 msgstr "1"
 
 #: ../gtk/ldap.ui.h:1
-#, fuzzy
 msgid "LDAP Settings"
-msgstr "設定值"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:6
 msgid "Use TLS Connection"
@@ -1712,9 +1620,8 @@ msgid "Not yet available"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:8
-#, fuzzy
 msgid "<b>Connection</b>"
-msgstr "<b>編碼解碼器</b>"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:9
 msgid "Bind DN"
@@ -1729,9 +1636,8 @@ msgid "Realm"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:12
-#, fuzzy
 msgid "<b>SASL</b>"
-msgstr "<b>音效</b>"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:13
 msgid "Base object:"
@@ -1747,18 +1653,16 @@ msgid "Name Attribute:"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:17
-#, fuzzy
 msgid "SIP address attribute:"
-msgstr "SIP 位址或電話號碼："
+msgstr ""
 
 #: ../gtk/ldap.ui.h:18
 msgid "Attributes to query:"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:19
-#, fuzzy
 msgid "<b>Search</b>"
-msgstr "<b>搜尋某人</b>"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:20
 msgid "Timeout for search:"
@@ -1773,9 +1677,8 @@ msgid "Follow Aliases"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:23
-#, fuzzy
 msgid "<b>Miscellaneous</b>"
-msgstr "<b>視訊</b>"
+msgstr ""
 
 #: ../gtk/ldap.ui.h:24
 msgid "ANONYMOUS"
@@ -1799,11 +1702,8 @@ msgstr ""
 
 #: ../gtk/config-uri.ui.h:2
 msgid ""
-"This dialog allows to set an http or https address when configuration is to "
-"be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, "
-"Linphone will restart automatically in order to fetch and take into account "
-"the new configuration. "
+"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
 msgstr ""
 
 #: ../gtk/config-uri.ui.h:4
@@ -1811,81 +1711,79 @@ msgid "https://"
 msgstr ""
 
 #: ../gtk/provisioning-fetch.ui.h:1
-#, fuzzy
 msgid "Configuring..."
-msgstr "連線中..."
+msgstr ""
 
 #: ../gtk/provisioning-fetch.ui.h:2
 msgid "Please wait while fetching configuration from server..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1034
+#: ../coreapi/linphonecore.c:1511
 msgid "Ready"
 msgstr "準備就緒"
 
-#: ../coreapi/linphonecore.c:1967
-#, fuzzy
+#: ../coreapi/linphonecore.c:2470
 msgid "Configuring"
-msgstr "確認"
+msgstr ""
 
-#: ../coreapi/linphonecore.c:2133
+#: ../coreapi/linphonecore.c:2635
 msgid "Looking for telephone number destination..."
 msgstr "尋找電話號碼目的端..."
 
-#: ../coreapi/linphonecore.c:2136
+#: ../coreapi/linphonecore.c:2637
 msgid "Could not resolve this number."
 msgstr "無法解析這個號碼。"
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2418
+#: ../coreapi/linphonecore.c:2919
 msgid "Contacting"
 msgstr "正在連絡"
 
-#: ../coreapi/linphonecore.c:2425
+#: ../coreapi/linphonecore.c:2924
 msgid "Could not call"
 msgstr "無法通話"
 
-#: ../coreapi/linphonecore.c:2576
+#: ../coreapi/linphonecore.c:3074
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "抱歉，我們已達瀏同步通話的最大數目"
 
-#: ../coreapi/linphonecore.c:2745
+#: ../coreapi/linphonecore.c:3233
 msgid "is contacting you"
 msgstr "正在連絡您"
 
-#: ../coreapi/linphonecore.c:2746
+#: ../coreapi/linphonecore.c:3234
 msgid " and asked autoanswer."
 msgstr "並要求自動接聽。"
 
-#: ../coreapi/linphonecore.c:2746
+#: ../coreapi/linphonecore.c:3234
 msgid "."
 msgstr "."
 
-#: ../coreapi/linphonecore.c:2865
+#: ../coreapi/linphonecore.c:3352
 msgid "Modifying call parameters..."
 msgstr "修改通話參數..."
 
-#: ../coreapi/linphonecore.c:3194
+#: ../coreapi/linphonecore.c:3700
 msgid "Connected."
 msgstr "已連線。"
 
-#: ../coreapi/linphonecore.c:3220
+#: ../coreapi/linphonecore.c:3725
 msgid "Call aborted"
 msgstr "通話已放棄"
 
-#: ../coreapi/linphonecore.c:3412
+#: ../coreapi/linphonecore.c:3915
 msgid "Could not pause the call"
 msgstr "無法暫停通話"
 
-#: ../coreapi/linphonecore.c:3417
+#: ../coreapi/linphonecore.c:3919
 msgid "Pausing the current call..."
 msgstr "暫停目前的通話..."
 
-#: ../coreapi/misc.c:425
+#: ../coreapi/misc.c:438
 msgid "Stun lookup in progress..."
 msgstr "正在進行 Stun 搜尋..."
 
-#: ../coreapi/misc.c:607
+#: ../coreapi/misc.c:619
 msgid "ICE local candidates gathering in progress..."
 msgstr ""
 
@@ -1934,516 +1832,146 @@ msgid "Pending"
 msgstr "等待中"
 
 #: ../coreapi/friend.c:66
-#, fuzzy
 msgid "Vacation"
-msgstr "時間長度"
+msgstr ""
 
 #: ../coreapi/friend.c:68
 msgid "Unknown-bug"
 msgstr "不明錯誤"
 
-#: ../coreapi/proxy.c:314
+#: ../coreapi/proxy.c:319
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
-msgstr ""
-"您輸入的 sip 代理位址是無效的，它必須要以「sip:」開頭，後面接主機名稱。"
+msgstr "您輸入的 sip 代理位址是無效的，它必須要以「sip:」開頭，後面接主機名稱。"
 
-#: ../coreapi/proxy.c:320
+#: ../coreapi/proxy.c:325
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
-msgstr ""
-"您輸入的 sip 身分是無效的。\n"
-"它應該看起來像 sip:使用者名稱@代理網域，像是 sip:alice@example.net"
+msgstr "您輸入的 sip 身分是無效的。\n它應該看起來像 sip:使用者名稱@代理網域，像是 sip:alice@example.net"
 
-#: ../coreapi/proxy.c:1369
+#: ../coreapi/proxy.c:1377
 #, c-format
 msgid "Could not login as %s"
 msgstr "無法以 %s 登入"
 
-#: ../coreapi/callbacks.c:355
+#: ../coreapi/callbacks.c:383
 msgid "Remote ringing."
 msgstr "遠端響鈴。"
 
-#: ../coreapi/callbacks.c:373
+#: ../coreapi/callbacks.c:404
 msgid "Remote ringing..."
 msgstr "遠端響鈴..."
 
-#: ../coreapi/callbacks.c:384
+#: ../coreapi/callbacks.c:414
 msgid "Early media."
 msgstr "早期媒體。"
 
-#: ../coreapi/callbacks.c:435
+#: ../coreapi/callbacks.c:475
 #, c-format
 msgid "Call with %s is paused."
 msgstr "和 %s 的通話已暫停。"
 
-#: ../coreapi/callbacks.c:448
+#: ../coreapi/callbacks.c:488
 #, c-format
 msgid "Call answered by %s - on hold."
 msgstr "通話由 %s 接聽 - 保留中。"
 
-#: ../coreapi/callbacks.c:459
+#: ../coreapi/callbacks.c:498
 msgid "Call resumed."
 msgstr "通話已繼續。"
 
-#: ../coreapi/callbacks.c:464
+#: ../coreapi/callbacks.c:502
 #, c-format
 msgid "Call answered by %s."
 msgstr "通話由 %s 接聽。"
 
-#: ../coreapi/callbacks.c:483
+#: ../coreapi/callbacks.c:525
 msgid "Incompatible, check codecs or security settings..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:512
-#, fuzzy
-msgid "We have been resumed."
-msgstr "我們要繼續了..."
+#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:826
+msgid "Incompatible media parameters."
+msgstr ""
 
-#: ../coreapi/callbacks.c:521
+#: ../coreapi/callbacks.c:560
+msgid "We have been resumed."
+msgstr ""
+
+#. we are being paused
+#: ../coreapi/callbacks.c:568
 msgid "We are paused by other party."
 msgstr ""
 
-#: ../coreapi/callbacks.c:556
+#. reINVITE and in-dialogs UPDATE go here
+#: ../coreapi/callbacks.c:602
 msgid "Call is updated by remote."
 msgstr ""
 
-#: ../coreapi/callbacks.c:658
+#: ../coreapi/callbacks.c:705
 msgid "Call terminated."
 msgstr "通話已終止。"
 
-#: ../coreapi/callbacks.c:687
+#: ../coreapi/callbacks.c:733
 msgid "User is busy."
 msgstr "使用者現正忙碌。"
 
-#: ../coreapi/callbacks.c:688
+#: ../coreapi/callbacks.c:734
 msgid "User is temporarily unavailable."
 msgstr "使用者暫時無法聯繫。"
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:690
+#: ../coreapi/callbacks.c:736
 msgid "User does not want to be disturbed."
 msgstr "使用者不想要被打擾。"
 
-#: ../coreapi/callbacks.c:691
+#: ../coreapi/callbacks.c:737
 msgid "Call declined."
 msgstr "通話被拒接。"
 
-#: ../coreapi/callbacks.c:706
+#: ../coreapi/callbacks.c:752
 msgid "Request timeout."
 msgstr ""
 
-#: ../coreapi/callbacks.c:737
+#: ../coreapi/callbacks.c:780
 msgid "Redirected"
 msgstr "已重新導向"
 
-#: ../coreapi/callbacks.c:787
-msgid "Incompatible media parameters."
-msgstr ""
-
-#: ../coreapi/callbacks.c:798
+#: ../coreapi/callbacks.c:835
 msgid "Call failed."
 msgstr "通話失敗。"
 
-#: ../coreapi/callbacks.c:878
+#: ../coreapi/callbacks.c:913
 #, c-format
 msgid "Registration on %s successful."
 msgstr "在 %s 註冊成功。"
 
-#: ../coreapi/callbacks.c:879
+#: ../coreapi/callbacks.c:914
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "在 %s 取消註冊完成。"
 
-#: ../coreapi/callbacks.c:897
+#: ../coreapi/callbacks.c:932
 msgid "no response timeout"
 msgstr "沒有回應逾時"
 
-#: ../coreapi/callbacks.c:900
+#: ../coreapi/callbacks.c:935
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "在 %s 註冊失敗：%s"
 
-#: ../coreapi/callbacks.c:907
+#: ../coreapi/callbacks.c:942
 msgid "Service unavailable, retrying"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:177
-#, fuzzy, c-format
+#: ../coreapi/linphonecall.c:174
+#, c-format
 msgid "Authentication token is %s"
-msgstr "驗證失敗"
+msgstr ""
 
-#: ../coreapi/linphonecall.c:2932
+#: ../coreapi/linphonecall.c:3020
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
 msgstr[0] "您有 %i 通未接來電。"
-
-#~ msgid "aborted"
-#~ msgstr "已放棄"
-
-#~ msgid "completed"
-#~ msgstr "已完成"
-
-#~ msgid "missed"
-#~ msgstr "未接"
-
-#~ msgid ""
-#~ "%s at %s\n"
-#~ "From: %s\n"
-#~ "To: %s\n"
-#~ "Status: %s\n"
-#~ "Duration: %i mn %i sec\n"
-#~ msgstr ""
-#~ "%s 於 %s\n"
-#~ "從：%s\n"
-#~ "到：%s\n"
-#~ "狀態：%s\n"
-#~ "持續時間：%i 分 %i 秒\n"
-
-#~ msgid "Outgoing call"
-#~ msgstr "去電"
-
-#~ msgid "No response."
-#~ msgstr "沒有回應。"
-
-#~ msgid "Protocol error."
-#~ msgstr "通訊協定錯誤。"
-
-#~ msgid ""
-#~ "Could not parse given sip address. A sip url usually looks like sip:"
-#~ "user@domain"
-#~ msgstr "無法解析指定的 sip 位址。sip 網址通常看起來像 sip:user@domain"
-
-#~ msgid ""
-#~ "Your computer appears to be using ALSA sound drivers.\n"
-#~ "This is the best choice. However the pcm oss emulation module\n"
-#~ "is missing and linphone needs it. Please execute\n"
-#~ "'modprobe snd-pcm-oss' as root to load it."
-#~ msgstr ""
-#~ "您的電腦似乎是使用 ALSA 音效驅動程式。\n"
-#~ "這是最好的選擇。然而缺少了 pcm oss 模擬模組\n"
-#~ "而 linphone 需要它。請以 root 執行\n"
-#~ "'modprobe snd-pcm-oss' 載入它。"
-
-#~ msgid ""
-#~ "Your computer appears to be using ALSA sound drivers.\n"
-#~ "This is the best choice. However the mixer oss emulation module\n"
-#~ "is missing and linphone needs it. Please execute\n"
-#~ " 'modprobe snd-mixer-oss' as root to load it."
-#~ msgstr ""
-#~ "您的電腦似乎是使用 ALSA 音效驅動程式。\n"
-#~ "這是最好的選擇。然而缺少了 mixer oss 模擬模組\n"
-#~ "而 linphone 需要它。請以 root 執行\n"
-#~ "'modprobe snd-mixer-oss' 載入它。"
-
-#~ msgid "Keypad"
-#~ msgstr "撥號盤"
-
-#~ msgid "Chat with %s"
-#~ msgstr "和 %s 聊天"
-
-#~ msgid "Please choose a username:"
-#~ msgstr "請選擇一個使用者名稱："
-
-#~ msgid "Checking if '%s' is available..."
-#~ msgstr "檢查「%s」是否可用…"
-
-#~ msgid "Please wait..."
-#~ msgstr "請稍候..."
-
-#~ msgid "Sorry this username already exists. Please try a new one."
-#~ msgstr "很抱歉這個使用者名稱已經存在。請嘗試新的名稱。"
-
-#~ msgid "Ok !"
-#~ msgstr "確定！"
-
-#~ msgid "Communication problem, please try again later."
-#~ msgstr "連線問題，請稍後再試一次。"
-
-#~ msgid "Choosing a username"
-#~ msgstr "選擇使用者名稱"
-
-#~ msgid "Verifying"
-#~ msgstr "檢驗中"
-
-#~ msgid "Creating your account"
-#~ msgstr "正在建立您的帳號"
-
-#~ msgid "Now ready !"
-#~ msgstr "現在已就緒！"
-
-#, fuzzy
-#~ msgid "Enable video"
-#~ msgstr "已啟用"
-
-#~ msgid "Enter username, phone number, or full sip address"
-#~ msgstr "輸入使用者名稱、電話號碼或完整的 sip 位址"
-
-#~ msgid "Lookup:"
-#~ msgstr "查詢："
-
-#~ msgid "in"
-#~ msgstr "於"
-
-#~ msgid ""
-#~ "Register to FONICS\n"
-#~ "virtual network !"
-#~ msgstr ""
-#~ "註冊到 FONICS\n"
-#~ "虛擬網路！"
-
-#~ msgid "We are being paused..."
-#~ msgstr "我們被暫停了..."
-
-#~ msgid "No common codecs"
-#~ msgstr "沒有通用的編碼解碼器"
-
-#~ msgid "Windows"
-#~ msgstr "視窗"
-
-#~ msgid ""
-#~ "Pause all calls\n"
-#~ "and answer"
-#~ msgstr ""
-#~ "暫停所有播打\n"
-#~ "與接聽"
-
-#~ msgid "Unmute"
-#~ msgstr "取消靜音"
-
-#~ msgid "<b>Contact list</b>"
-#~ msgstr "<b>連絡人清單</b> "
-
-#~ msgid "Audio & video"
-#~ msgstr "語音 & 視訊"
-
-#~ msgid "Audio only"
-#~ msgstr "只有語音"
-
-#~ msgid "Duration:"
-#~ msgstr "時間長度："
-
-#~ msgid "_Call history"
-#~ msgstr "通話紀錄(_C)"
-
-#~ msgid "_Linphone"
-#~ msgstr "_Linphone"
-
-#~ msgid "gtk-cancel"
-#~ msgstr "gtk-cancel"
-
-#~ msgid "gtk-ok"
-#~ msgstr "gtk-ok"
-
-#~ msgid "Register at startup"
-#~ msgstr "啟動時註冊"
-
-#~ msgid "gtk-close"
-#~ msgstr "gtk-close"
-
-#~ msgid "Sorry, you have to pause or stop the current call first !"
-#~ msgstr "抱歉，您必須先暫停或停止目前的通話！"
-
-#~ msgid "There is already a call in process, pause or stop it first."
-#~ msgstr "已經有通話在進行中，請先暫停或停止它。"
-
-#~ msgid ""
-#~ "Your machine appears to be connected to an IPv6 network. By default "
-#~ "linphone always uses IPv4. Please update your configuration if you want "
-#~ "to use IPv6"
-#~ msgstr ""
-#~ "您的電腦似乎連接到 IPv6 網路。linphone 預設會先使用 IPv4。如果您想要使用 "
-#~ "IPv6 請更新您的組態"
-
-#~ msgid "ITU-G.711 alaw encoder"
-#~ msgstr "ITU-G.711 alaw 編碼器"
-
-#~ msgid "ITU-G.711 alaw decoder"
-#~ msgstr "ITU-G.711 alaw 解碼器"
-
-#~ msgid "Alsa sound output"
-#~ msgstr "Alsa 音效輸出"
-
-#~ msgid "Sound capture filter for MacOS X Audio Queue Service"
-#~ msgstr "MacOS X 音效佇列服務的音效擷取過濾器"
-
-#~ msgid "Sound playback filter for MacOS X Audio Queue Service"
-#~ msgstr "MacOS X 音效佇列服務的音效播放過濾器"
-
-#~ msgid "DTMF generator"
-#~ msgstr "DTMF 產生器"
-
-#~ msgid "The GSM full-rate codec"
-#~ msgstr "GSM 全頻率編解碼器"
-
-#~ msgid "The GSM codec"
-#~ msgstr "GSM 編解碼器"
-
-#~ msgid "Sound capture filter for MacOS X Core Audio drivers"
-#~ msgstr "MacOS X 核心音效驅動程式的音效擷取過濾器"
-
-#~ msgid "Sound playback filter for MacOS X Core Audio drivers"
-#~ msgstr "MacOS X 核心音效驅動程式的音效播放過濾器"
-
-#~ msgid "A filter to make conferencing"
-#~ msgstr "進行會議的過濾器"
-
-#~ msgid "Raw files and wav reader"
-#~ msgstr "Raw 檔案與 wav 讀取器"
-
-#~ msgid "Wav file recorder"
-#~ msgstr "Wav 檔案錄製器"
-
-#~ msgid "A filter that send several inputs to one output."
-#~ msgstr "傳送多個輸入到一個輸出的過濾器。"
-
-#~ msgid "RTP output filter"
-#~ msgstr "RTP 輸出過濾隱器"
-
-#~ msgid "The free and wonderful speex codec"
-#~ msgstr "免費好用的 speex 編解碼器"
-
-#~ msgid "A filter that controls and measure sound volume"
-#~ msgstr "控制並測量音量的過濾器"
-
-#~ msgid "A video4linux compatible source filter to stream pictures."
-#~ msgstr "video4linux 相容來源過濾器至串流圖片。"
-
-#~ msgid "A filter to grab pictures from Video4Linux2-powered cameras"
-#~ msgstr "從 Video4Linux2 攝影機擷取圖片的過濾器"
-
-#~ msgid "A filter that outputs a static image."
-#~ msgstr "輸出靜態圖片的過濾器。"
-
-#~ msgid "A pixel format converter"
-#~ msgstr "像素格式轉換器"
-
-#~ msgid "A video size converter"
-#~ msgstr "視訊大小轉換器"
-
-#~ msgid "a small video size converter"
-#~ msgstr "一個小型的視訊大小轉換器"
-
-#~ msgid "Echo canceller using speex library"
-#~ msgstr "使用 speex 程式庫的回音消除器"
-
-#~ msgid "A filter that reads from input and copy to its multiple outputs."
-#~ msgstr "從輸入讀取並將它複製到多個輸出的過濾器。"
-
-#~ msgid "The theora video encoder from xiph.org"
-#~ msgstr "來自 xiph.org 的 theora 視訊編碼器"
-
-#~ msgid "The open-source and royalty-free 'theora' video codec from xiph.org"
-#~ msgstr "來自 xiph.org 的開放原始碼且沒有版稅的「theora」視訊編解碼器"
-
-#~ msgid "The theora video decoder from xiph.org"
-#~ msgstr "來自 xiph.org 的 theora 視訊解碼器"
-
-#~ msgid "ITU-G.711 ulaw encoder"
-#~ msgstr "ITU-G.711 ulaw 編碼器"
-
-#~ msgid "ITU-G.711 ulaw decoder"
-#~ msgstr "ITU-G.711 ulaw 解碼器"
-
-#~ msgid "A H.263 decoder using ffmpeg library"
-#~ msgstr "使用 ffmpeg 程式庫的 H.263 解碼器"
-
-#~ msgid "A MPEG4 decoder using ffmpeg library"
-#~ msgstr "使用 ffmpeg 程式庫的 MPEG4 解碼器"
-
-#~ msgid "A RTP/JPEG decoder using ffmpeg library"
-#~ msgstr "使用 ffmpeg 程式庫的 RTP/JPEG 解碼器"
-
-#~ msgid "A MJPEG decoder using ffmpeg library"
-#~ msgstr "使用 ffmpeg 程式庫的 MJPEG 解碼器"
-
-#~ msgid "A snow decoder using ffmpeg library"
-#~ msgstr "使用 ffmpeg 程式庫的 snow 解碼器"
-
-#~ msgid "A video H.263 encoder using ffmpeg library."
-#~ msgstr "使用 ffmpeg 程式庫的視訊 H.263 編碼器。"
-
-#~ msgid ""
-#~ "A video H.263 encoder using ffmpeg library. It is compliant with old "
-#~ "RFC2190 spec."
-#~ msgstr "使用 ffmpeg 程式庫的視訊 H.263 編碼器。它符合舊的 RFC2190 規格。"
-
-#~ msgid "A video MPEG4 encoder using ffmpeg library."
-#~ msgstr "使用 ffmpeg 程式庫的視訊 MPEG4 編碼器。"
-
-#~ msgid "A video snow encoder using ffmpeg library."
-#~ msgstr "使用 ffmpeg 程式庫的視訊 snow 編碼器。"
-
-#~ msgid "A RTP/MJPEG encoder using ffmpeg library."
-#~ msgstr "使用 ffmpeg 程式庫的 RTP/MJPEG 編碼器。"
-
-#~ msgid ""
-#~ "A video H.263 encoder using ffmpeg library, compliant with old RFC2190 "
-#~ "spec."
-#~ msgstr "使用 ffmpeg 程式庫的視訊 H.263 編碼器，它符合舊的 RFC2190 規格。"
-
-#~ msgid ""
-#~ "The snow codec is royalty-free and is open-source. \n"
-#~ "It uses innovative techniques that makes it one of most promising video "
-#~ "codec. It is implemented within the ffmpeg project.\n"
-#~ "However it is under development, quite unstable and compatibility with "
-#~ "other versions cannot be guaranteed."
-#~ msgstr ""
-#~ "snow 編解碼器是免版稅的，而且是開放源始碼。 \n"
-#~ "它採用創新技術，使一種最前瞻的視訊編解碼器。它在 ffmpeg 專案中實作。\n"
-#~ "然而，它正在開發中，相當不穩定且不能保證與其他版本的相容性。"
-
-#~ msgid "A MJPEG encoder using ffmpeg library."
-#~ msgstr "使用 ffmpeg 程式庫的 MJPEG 編碼器。"
-
-#~ msgid "A SDL-based video display"
-#~ msgstr "基於 SDL 的視訊顯示"
-
-#~ msgid "A video4windows compatible source filter to stream pictures."
-#~ msgstr "video4windows 相容來源過濾器至串流圖片。"
-
-#~ msgid "A video for windows (vfw.h) based source filter to grab pictures."
-#~ msgstr "windows (vfw.h) 視訊為基礎的來源過濾器以擷取圖片。"
-
-#~ msgid ""
-#~ "A filter that trashes its input (useful for terminating some graphs)."
-#~ msgstr "將輸入丟棄的過濾器（可用來中止某些圖形）。"
-
-#~ msgid "Parametric sound equalizer."
-#~ msgstr "參數化音效等化器。"
-
-#~ msgid "A webcam grabber based on directshow."
-#~ msgstr "基於 directshow 的網路攝影機擷取器。"
-
-#~ msgid "A video display based on windows DrawDib api"
-#~ msgstr "基於 windows DrawDib api 的視訊顯示"
-
-#~ msgid "A filter that mixes down 16 bit sample audio streams"
-#~ msgstr "混合 16 位元取樣音效串流的過濾器"
-
-#~ msgid "A filter that converts from mono to stereo and vice versa."
-#~ msgstr "將單聲道與雙聲道互相轉換的過濾器。"
-
-#~ msgid "A display filter sending the buffers to draw to the upper layer"
-#~ msgstr "傳送緩衝區以繪製到上層圖層的顯示過濾器"
-
-#~ msgid "Sound capture filter for MacOS X Audio Unit Service"
-#~ msgstr "MacOS X 音效單元服務的音效擷取過濾器"
-
-#~ msgid "Sound playback filter for MacOS X Audio Unit Service"
-#~ msgstr "MacOS X 音效單元服務的音效播放過濾器"
-
-#~ msgid "A video display using X11+Xv"
-#~ msgstr "使用 X11+Xv 的視訊顯示"
-
-#~ msgid "Sound capture filter for Android"
-#~ msgstr "Android 音效擷取過濾器"
-
-#~ msgid "Sound playback filter for Android"
-#~ msgstr "Android 音效播放過濾器"
-
-#~ msgid "A filter that captures Android video."
-#~ msgstr "擷取 Android 視訊的過濾器。"

From 36561bbc4446ba276692c8ea001a0416976adcf2 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Thu, 20 Nov 2014 11:25:04 +0100
Subject: [PATCH 010/496] Create the tunnel object before remote provisioning
 so that it can successfully be configured.

---
 coreapi/linphonecore.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 3ead49966..b434feebb 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -1502,7 +1502,6 @@ static void linphone_core_start(LinphoneCore * lc) {
 	misc_config_read(lc);
 	ui_config_read(lc);
 #ifdef TUNNEL_ENABLED
-	lc->tunnel=linphone_core_tunnel_new(lc);
 	if (lc->tunnel) {
 		linphone_tunnel_configure(lc->tunnel);
 	}
@@ -1630,6 +1629,10 @@ static void linphone_core_init(LinphoneCore * lc, const LinphoneCoreVTable *vtab
 	sal_set_user_pointer(lc->sal,lc);
 	sal_set_callbacks(lc->sal,&linphone_sal_callbacks);
 
+#ifdef TUNNEL_ENABLED
+	lc->tunnel=linphone_core_tunnel_new(lc);
+#endif
+
 	lc->network_last_check = 0;
 	lc->network_last_status = FALSE;
 

From 1a2e00160e586a2cbb682c33c30bd2118ed06d88 Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Thu, 20 Nov 2014 13:43:18 +0100
Subject: [PATCH 011/496] Update ms2

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index b727b3031..6371c2246 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit b727b303113f9ea752b2e9328a4d1a4f65d72b6c
+Subproject commit 6371c2246fa4e8bdfa2bdb512f0ebefdd2a8f2f3

From 7c0a5ee77082f517888768dd0936ea2257ae12d2 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Thu, 20 Nov 2014 16:24:43 +0100
Subject: [PATCH 012/496] fix compilation issuewq

---
 coreapi/TunnelManager.cc | 2 +-
 coreapi/linphonecore.c   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/coreapi/TunnelManager.cc b/coreapi/TunnelManager.cc
index 9b4cebda3..53d7f288f 100644
--- a/coreapi/TunnelManager.cc
+++ b/coreapi/TunnelManager.cc
@@ -388,7 +388,7 @@ bool TunnelManager::startAutoDetection() {
 bool TunnelManager::isActivated() const{
 	switch(getMode()){
 		case LinphoneTunnelModeAuto:
-			return !mState==disabled;
+			return !(mState==disabled);
 		case LinphoneTunnelModeDisable:
 			return false;
 		case LinphoneTunnelModeEnable:
diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index b434feebb..6a83183da 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -4940,11 +4940,11 @@ void linphone_core_set_firewall_policy(LinphoneCore *lc, LinphoneFirewallPolicy
 		lp_config_set_string(lc->config,"net","firewall_policy",policy);
 }
 
-ORTP_INLINE LinphoneFirewallPolicy linphone_core_get_firewall_policy(const LinphoneCore *lc) {
+LinphoneFirewallPolicy linphone_core_get_firewall_policy(const LinphoneCore *lc) {
 	return _linphone_core_get_firewall_policy_with_lie(lc, FALSE);
 }
 
-ORTP_INLINE LinphoneFirewallPolicy _linphone_core_get_firewall_policy(const LinphoneCore *lc) {
+LinphoneFirewallPolicy _linphone_core_get_firewall_policy(const LinphoneCore *lc) {
 	return _linphone_core_get_firewall_policy_with_lie(lc, TRUE);
 }
 

From 9cabfe37dd9a49bc3f2e7281b3aaf60589a88de8 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Thu, 20 Nov 2014 17:25:25 +0100
Subject: [PATCH 013/496] A LinphoneContent object now owns all its data fields
 including the buffer.

A normal LinphoneContent object will now copy the data from the given buffer when calling linphone_content_set_buffer().
However LinphoneContent objects converted from LinphoneContentPrivate structures do not own its data fields.
---
 coreapi/content.c                 | 49 ++++++++++++++++---------------
 coreapi/content.h                 | 10 +++----
 coreapi/private.h                 |  1 +
 coreapi/quality_reporting.c       |  3 +-
 tester/eventapi_tester.c          | 17 ++++-------
 tester/flexisip_tester.c          |  3 +-
 tester/message_tester.c           |  7 ++---
 tester/quality_reporting_tester.c |  8 ++---
 8 files changed, 46 insertions(+), 52 deletions(-)

diff --git a/coreapi/content.c b/coreapi/content.c
index 944ebb2e0..84e45c853 100644
--- a/coreapi/content.c
+++ b/coreapi/content.c
@@ -23,27 +23,24 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 
 static void linphone_content_destroy(LinphoneContent *content) {
-	if (content->lcp.type) belle_sip_free(content->lcp.type);
-	if (content->lcp.subtype) belle_sip_free(content->lcp.subtype);
-	if (content->lcp.data) belle_sip_free(content->lcp.data);
-	if (content->lcp.encoding) belle_sip_free(content->lcp.encoding);
-	if (content->lcp.name) belle_sip_free(content->lcp.name);
+	if (content->owned_fields == TRUE) {
+		if (content->lcp.type) belle_sip_free(content->lcp.type);
+		if (content->lcp.subtype) belle_sip_free(content->lcp.subtype);
+		if (content->lcp.data) belle_sip_free(content->lcp.data);
+		if (content->lcp.encoding) belle_sip_free(content->lcp.encoding);
+		if (content->lcp.name) belle_sip_free(content->lcp.name);
+	}
 }
 
 static void linphone_content_clone(LinphoneContent *obj, const LinphoneContent *ref) {
-	void *data;
 	linphone_content_set_type(obj, linphone_content_get_type(ref));
 	linphone_content_set_subtype(obj, linphone_content_get_subtype(ref));
 	linphone_content_set_encoding(obj, linphone_content_get_encoding(ref));
 	linphone_content_set_name(obj, linphone_content_get_name(ref));
-	linphone_content_set_size(obj, linphone_content_get_size(ref));
-	data = linphone_content_get_data(ref);
-	if (data != NULL) {
-		size_t size = linphone_content_get_size(ref);
-		void *objdata = belle_sip_malloc(size + 1);
-		memcpy(objdata, data, size);
-		((char *)objdata)[size] = '\0';
-		linphone_content_set_data(obj, objdata);
+	if (linphone_content_get_buffer(ref) != NULL) {
+		linphone_content_set_buffer(obj, linphone_content_get_buffer(ref), linphone_content_get_size(ref));
+	} else {
+		linphone_content_set_size(obj, linphone_content_get_size(ref));
 	}
 }
 
@@ -107,12 +104,15 @@ void linphone_content_set_subtype(LinphoneContent *content, const char *subtype)
 	}
 }
 
-void * linphone_content_get_data(const LinphoneContent *content) {
+void * linphone_content_get_buffer(const LinphoneContent *content) {
 	return content->lcp.data;
 }
 
-void linphone_content_set_data(LinphoneContent *content, void *data) {
-	content->lcp.data = data;
+void linphone_content_set_buffer(LinphoneContent *content, const void *buffer, size_t size) {
+	content->lcp.size = size;
+	content->lcp.data = belle_sip_malloc(size + 1);
+	memcpy(content->lcp.data, buffer, size);
+	((char *)content->lcp.data)[size] = '\0';
 }
 
 size_t linphone_content_get_size(const LinphoneContent *content) {
@@ -156,6 +156,7 @@ void linphone_content_set_name(LinphoneContent *content, const char *name) {
 LinphoneContent * linphone_content_new(void) {
 	LinphoneContent *content = belle_sip_object_new(LinphoneContent);
 	belle_sip_object_ref(content);
+	content->owned_fields = TRUE;
 	return content;
 }
 
@@ -165,16 +166,15 @@ LinphoneContent * linphone_content_copy(const LinphoneContent *ref) {
 
 LinphoneContent * linphone_content_from_sal_body(const SalBody *ref) {
 	if (ref && ref->type) {
-		void *objdata;
 		LinphoneContent *content = linphone_content_new();
 		linphone_content_set_type(content, ref->type);
 		linphone_content_set_subtype(content, ref->subtype);
 		linphone_content_set_encoding(content, ref->encoding);
-		linphone_content_set_size(content, ref->size);
-		objdata = belle_sip_malloc(ref->size + 1);
-		memcpy(objdata, ref->data, ref->size);
-		((char *)objdata)[ref->size] = '\0';
-		linphone_content_set_data(content, objdata);
+		if (ref->data != NULL) {
+			linphone_content_set_buffer(content, ref->data, ref->size);
+		} else {
+			linphone_content_set_size(content, ref->size);
+		}
 		return content;
 	}
 	return NULL;
@@ -184,7 +184,7 @@ SalBody *sal_body_from_content(SalBody *body, const LinphoneContent *content) {
 	if (content && linphone_content_get_type(content)) {
 		body->type = linphone_content_get_type(content);
 		body->subtype = linphone_content_get_subtype(content);
-		body->data = linphone_content_get_data(content);
+		body->data = linphone_content_get_buffer(content);
 		body->size = linphone_content_get_size(content);
 		body->encoding = linphone_content_get_encoding(content);
 		return body;
@@ -197,6 +197,7 @@ SalBody *sal_body_from_content(SalBody *body, const LinphoneContent *content) {
 LinphoneContent * linphone_content_private_to_linphone_content(const LinphoneContentPrivate *lcp) {
 	LinphoneContent *content = belle_sip_object_new(LinphoneContent);
 	memcpy(&content->lcp, lcp, sizeof(LinphoneContentPrivate));
+	content->owned_fields = FALSE;
 	return content;
 }
 
diff --git a/coreapi/content.h b/coreapi/content.h
index 24f137857..b2e04de27 100644
--- a/coreapi/content.h
+++ b/coreapi/content.h
@@ -150,26 +150,26 @@ LINPHONE_PUBLIC void linphone_content_set_subtype(LinphoneContent *content, cons
  * @param[in] content LinphoneContent object.
  * @return The content data buffer.
  */
-LINPHONE_PUBLIC void * linphone_content_get_data(const LinphoneContent *content);
+LINPHONE_PUBLIC void * linphone_content_get_buffer(const LinphoneContent *content);
 
 /**
  * Set the content data buffer, usually a string.
  * @param[in] content LinphoneContent object.
  * @param[in] data The content data buffer.
  */
-LINPHONE_PUBLIC void linphone_content_set_data(LinphoneContent *content, void *data);
+LINPHONE_PUBLIC void linphone_content_set_buffer(LinphoneContent *content, const void *buffer, size_t size);
 
 /**
- * Get the content data size, excluding null character despite null character is always set for convenience.
+ * Get the content data buffer size, excluding null character despite null character is always set for convenience.
  * @param[in] content LinphoneContent object.
- * @return The content data size.
+ * @return The content data buffer size.
  */
 LINPHONE_PUBLIC size_t linphone_content_get_size(const LinphoneContent *content);
 
 /**
  * Set the content data size, excluding null character despite null character is always set for convenience.
  * @param[in] content LinphoneContent object
- * @param[in] size The content data size.
+ * @param[in] size The content data buffer size.
  */
 LINPHONE_PUBLIC void linphone_content_set_size(LinphoneContent *content, size_t size);
 
diff --git a/coreapi/private.h b/coreapi/private.h
index 8e1bfaf8a..808e1f57e 100644
--- a/coreapi/private.h
+++ b/coreapi/private.h
@@ -909,6 +909,7 @@ struct _LinphoneContent {
 	belle_sip_object_t base;
 	void *user_data;
 	struct _LinphoneContentPrivate lcp;
+	bool_t owned_fields;
 };
 
 BELLE_SIP_DECLARE_VPTR(LinphoneContent);
diff --git a/coreapi/quality_reporting.c b/coreapi/quality_reporting.c
index 1beea886a..bb1d443bf 100644
--- a/coreapi/quality_reporting.c
+++ b/coreapi/quality_reporting.c
@@ -331,8 +331,7 @@ static int send_report(LinphoneCall* call, reporting_session_report_t * report,
 		append_to_buffer(&buffer, &size, &offset, "\r\n");
 	}
 
-	linphone_content_set_data(content, buffer);
-	linphone_content_set_size(content, strlen(buffer));
+	linphone_content_set_buffer(content, buffer, strlen(buffer));
 
 	if (call->log->reporting.on_report_sent != NULL){
 		call->log->reporting.on_report_sent(
diff --git a/tester/eventapi_tester.c b/tester/eventapi_tester.c
index 835130f54..abd8c0a30 100644
--- a/tester/eventapi_tester.c
+++ b/tester/eventapi_tester.c
@@ -40,7 +40,7 @@ const char *liblinphone_tester_get_notify_content(void){
 void linphone_notify_received(LinphoneCore *lc, LinphoneEvent *lev, const char *eventname, const LinphoneContent *content){
 	LinphoneCoreManager *mgr;
 	CU_ASSERT_PTR_NOT_NULL_FATAL(content);
-	CU_ASSERT_TRUE(strcmp(notify_content,(const char*)linphone_content_get_data(content))==0);
+	CU_ASSERT_TRUE(strcmp(notify_content,(const char*)linphone_content_get_buffer(content))==0);
 	mgr=get_manager(lc);
 	mgr->stat.number_of_NotifyReceived++;
 }
@@ -54,8 +54,7 @@ void linphone_subscription_state_change(LinphoneCore *lc, LinphoneEvent *lev, Li
 	content = linphone_core_create_content(lc);
 	linphone_content_set_type(content,"application");
 	linphone_content_set_subtype(content,"somexml2");
-	linphone_content_set_data(content,belle_sip_strdup(notify_content));
-	linphone_content_set_size(content,strlen(notify_content));
+	linphone_content_set_buffer(content,notify_content,strlen(notify_content));
 	
 	ms_message("Subscription state [%s] from [%s]",linphone_subscription_state_to_string(state),from);
 	ms_free(from);
@@ -134,8 +133,7 @@ static void subscribe_test_declined(void) {
 	content = linphone_core_create_content(marie->lc);
 	linphone_content_set_type(content,"application");
 	linphone_content_set_subtype(content,"somexml");
-	linphone_content_set_data(content,belle_sip_strdup(subscribe_content));
-	linphone_content_set_size(content,strlen(subscribe_content));
+	linphone_content_set_buffer(content,subscribe_content,strlen(subscribe_content));
 
 	pauline->decline_subscribe=TRUE;
 
@@ -182,8 +180,7 @@ static void subscribe_test_with_args(bool_t terminated_by_subscriber, RefreshTes
 	content = linphone_core_create_content(marie->lc);
 	linphone_content_set_type(content,"application");
 	linphone_content_set_subtype(content,"somexml");
-	linphone_content_set_data(content,belle_sip_strdup(subscribe_content));
-	linphone_content_set_size(content,strlen(subscribe_content));
+	linphone_content_set_buffer(content,subscribe_content,strlen(subscribe_content));
 
 	lev=linphone_core_subscribe(marie->lc,pauline->identity,"dodo",expires,content);
 	
@@ -236,8 +233,7 @@ static void subscribe_test_with_args2(bool_t terminated_by_subscriber, RefreshTe
 	content = linphone_core_create_content(marie->lc);
 	linphone_content_set_type(content,"application");
 	linphone_content_set_subtype(content,"somexml");
-	linphone_content_set_data(content,belle_sip_strdup(subscribe_content));
-	linphone_content_set_size(content,strlen(subscribe_content));
+	linphone_content_set_buffer(content,subscribe_content,strlen(subscribe_content));
 
 	lev=linphone_core_create_subscribe(marie->lc,pauline->identity,"dodo",expires);
 	linphone_event_add_custom_header(lev,"My-Header","pouet");
@@ -315,8 +311,7 @@ static void publish_test_with_args(bool_t refresh, int expires){
 	content = linphone_core_create_content(marie->lc);
 	linphone_content_set_type(content,"application");
 	linphone_content_set_subtype(content,"somexml");
-	linphone_content_set_data(content,belle_sip_strdup(subscribe_content));
-	linphone_content_set_size(content,strlen(subscribe_content));
+	linphone_content_set_buffer(content,subscribe_content,strlen(subscribe_content));
 
 	lp_config_set_int(marie->lc->config,"sip","refresh_generic_publish",refresh);
 
diff --git a/tester/flexisip_tester.c b/tester/flexisip_tester.c
index f2ec9192e..8abd9b903 100644
--- a/tester/flexisip_tester.c
+++ b/tester/flexisip_tester.c
@@ -38,8 +38,7 @@ static void subscribe_forking(void) {
 	content = linphone_core_create_content(marie->lc);
 	linphone_content_set_type(content,"application");
 	linphone_content_set_subtype(content,"somexml");
-	linphone_content_set_data(content, belle_sip_strdup(liblinphone_tester_get_subscribe_content()));
-	linphone_content_set_size(content, strlen(liblinphone_tester_get_subscribe_content()));
+	linphone_content_set_buffer(content, liblinphone_tester_get_subscribe_content(), strlen(liblinphone_tester_get_subscribe_content()));
 	
 	lev=linphone_core_subscribe(marie->lc,pauline->identity,"dodo",expires,content);
 	
diff --git a/tester/message_tester.c b/tester/message_tester.c
index 65ad16d9d..de6b90c0d 100644
--- a/tester/message_tester.c
+++ b/tester/message_tester.c
@@ -836,8 +836,7 @@ static void info_message_with_args(bool_t with_content) {
 		LinphoneContent* ct=linphone_core_create_content(marie->lc);
 		linphone_content_set_type(ct,"application");
 		linphone_content_set_subtype(ct,"somexml");
-		linphone_content_set_data(ct,belle_sip_strdup(info_content));
-		linphone_content_set_size(ct,strlen(info_content));
+		linphone_content_set_buffer(ct,info_content,strlen(info_content));
 		linphone_info_message_set_content(info,ct);
 		linphone_content_unref(ct);
 	}
@@ -863,12 +862,12 @@ static void info_message_with_args(bool_t with_content) {
 	if (with_content){
 		CU_ASSERT_PTR_NOT_NULL(content);
 		if (content) {
-			CU_ASSERT_PTR_NOT_NULL(linphone_content_get_data(content));
+			CU_ASSERT_PTR_NOT_NULL(linphone_content_get_buffer(content));
 			CU_ASSERT_PTR_NOT_NULL(linphone_content_get_type(content));
 			CU_ASSERT_PTR_NOT_NULL(linphone_content_get_subtype(content));
 			if (linphone_content_get_type(content)) CU_ASSERT_TRUE(strcmp(linphone_content_get_type(content),"application")==0);
 			if (linphone_content_get_subtype(content)) CU_ASSERT_TRUE(strcmp(linphone_content_get_subtype(content),"somexml")==0);
-			if (linphone_content_get_data(content))CU_ASSERT_TRUE(strcmp((const char*)linphone_content_get_data(content),info_content)==0);
+			if (linphone_content_get_buffer(content))CU_ASSERT_TRUE(strcmp((const char*)linphone_content_get_buffer(content),info_content)==0);
 			CU_ASSERT_EQUAL(linphone_content_get_size(content),strlen(info_content));
 		}
 	}
diff --git a/tester/quality_reporting_tester.c b/tester/quality_reporting_tester.c
index 81bae75cf..33df384be 100644
--- a/tester/quality_reporting_tester.c
+++ b/tester/quality_reporting_tester.c
@@ -25,7 +25,7 @@
 #define __strstr(x, y) ((x==NULL)?NULL:strstr(x,y))
 
 void on_report_send_mandatory(const LinphoneCall *call, int stream_type, const LinphoneContent *content){
-	char * body = (char *)linphone_content_get_data(content);
+	char * body = (char *)linphone_content_get_buffer(content);
 	char * remote_metrics_start = __strstr(body, "RemoteMetrics:");
 	reporting_session_report_t * report = call->log->reporting.reports[stream_type];
 	MediaStream * ms;
@@ -91,7 +91,7 @@ char * on_report_send_verify_metrics(const reporting_content_metrics_t *metrics,
 }
 
 void on_report_send_with_rtcp_xr_local(const LinphoneCall *call, int stream_type, const LinphoneContent *content){
-	char * body = (char*)linphone_content_get_data(content);
+	char * body = (char*)linphone_content_get_buffer(content);
 	char * remote_metrics_start = __strstr(body, "RemoteMetrics:");
 	reporting_session_report_t * report = call->log->reporting.reports[stream_type];
 	on_report_send_mandatory(call,stream_type,content);
@@ -99,7 +99,7 @@ void on_report_send_with_rtcp_xr_local(const LinphoneCall *call, int stream_type
 	CU_ASSERT_TRUE(!remote_metrics_start || on_report_send_verify_metrics(&report->local_metrics,body) < remote_metrics_start);
 }
 void on_report_send_with_rtcp_xr_remote(const LinphoneCall *call, int stream_type, const LinphoneContent *content){
-	char * body = (char*)linphone_content_get_data(content);
+	char * body = (char*)linphone_content_get_buffer(content);
 	reporting_session_report_t * report = call->log->reporting.reports[stream_type];
 
 	on_report_send_mandatory(call,stream_type,content);
@@ -214,7 +214,7 @@ static void quality_reporting_not_sent_if_low_bandwidth() {
 }
 
 void on_report_send_remove_fields(const LinphoneCall *call, int stream_type, const LinphoneContent *content){
-	char *body = (char*)linphone_content_get_data(content);
+	char *body = (char*)linphone_content_get_buffer(content);
 	/*corrupt start of the report*/
 	strncpy(body, "corrupted report is corrupted", strlen("corrupted report is corrupted"));
 }

From e697641e59feb20d70b3d390ea8b34da03d2c052 Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Fri, 21 Nov 2014 08:45:39 +0100
Subject: [PATCH 014/496] Update ms2

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 6371c2246..f17ad001c 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 6371c2246fa4e8bdfa2bdb512f0ebefdd2a8f2f3
+Subproject commit f17ad001c39b30c3989754d9b3ef3429a5ac2a3e

From b91b55af160e0d6b414465c5c8ed016b63867de7 Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Fri, 21 Nov 2014 10:46:56 +0100
Subject: [PATCH 015/496] Update ms2 for static webcam iOS fix

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index f17ad001c..fb73f80e6 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit f17ad001c39b30c3989754d9b3ef3429a5ac2a3e
+Subproject commit fb73f80e60573e581fbcb9fa8ace72d93e54aae6

From 1a2125b588ca36a7274061ddcd60afe81330eab4 Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Fri, 21 Nov 2014 11:01:03 +0100
Subject: [PATCH 016/496] Update ms2

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index fb73f80e6..478d7dab4 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit fb73f80e60573e581fbcb9fa8ace72d93e54aae6
+Subproject commit 478d7dab4c2b78a0e693142c1eee27ac5d95076a

From aff27f655485b21f1c4b738d5689df23b5a848e3 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Fri, 21 Nov 2014 11:44:00 +0100
Subject: [PATCH 017/496] Rework Python wrapper handwritten code handling.

---
 tools/python/apixml2python.py                 |  13 +-
 .../handwritten_declarations.mustache         |   3 +
 .../handwritten_definitions.mustache          |  55 ++++++++
 tools/python/apixml2python/linphone.py        | 120 ++++++++++++------
 4 files changed, 143 insertions(+), 48 deletions(-)

diff --git a/tools/python/apixml2python.py b/tools/python/apixml2python.py
index 1fb37b9bb..f6248ca69 100755
--- a/tools/python/apixml2python.py
+++ b/tools/python/apixml2python.py
@@ -23,7 +23,7 @@ import sys
 import xml.etree.ElementTree as ET
 
 sys.path.append(os.path.realpath(__file__))
-from apixml2python.linphone import LinphoneModule
+from apixml2python.linphone import LinphoneModule, HandWrittenClassMethod, HandWrittenInstanceMethod, HandWrittenProperty
 
 
 blacklisted_classes = [
@@ -84,11 +84,12 @@ blacklisted_functions = [
 	'lp_config_section_to_dict'	# missing LinphoneDictionary
 ]
 hand_written_functions = [
-	'linphone_chat_room_send_message2',
-	'linphone_core_get_sound_devices',
-	'linphone_core_get_video_devices',
-	'linphone_core_new',
-	'linphone_core_new_with_config'
+	HandWrittenInstanceMethod('ChatRoom', 'send_message2', 'linphone_chat_room_send_message2'),
+	HandWrittenProperty('Content', 'buffer', 'linphone_content_get_buffer', 'linphone_content_set_buffer'),
+	HandWrittenProperty('Core', 'sound_devices', 'linphone_core_get_sound_devices', None),
+	HandWrittenProperty('Core', 'video_devices', 'linphone_core_get_video_devices', None),
+	HandWrittenClassMethod('Core', 'new', 'linphone_core_new'),
+	HandWrittenClassMethod('Core', 'new_with_config', 'linphone_core_new_with_config')
 ]
 
 def generate(apixmlfile, outputfile):
diff --git a/tools/python/apixml2python/handwritten_declarations.mustache b/tools/python/apixml2python/handwritten_declarations.mustache
index d5be0a3c4..6f7ae5b92 100644
--- a/tools/python/apixml2python/handwritten_declarations.mustache
+++ b/tools/python/apixml2python/handwritten_declarations.mustache
@@ -13,3 +13,6 @@ MSVideoSize PyLinphoneVideoSize_AsMSVideoSize(PyObject *obj);
 PyObject * PyLinphoneVideoSize_FromMSVideoSize(MSVideoSize vs);
 time_t PyDateTime_As_time_t(PyObject *obj);
 PyObject * PyDateTime_From_time_t(time_t t);
+
+static PyObject * pylinphone_Content_get_buffer(PyObject *self, void *closure);
+static int pylinphone_Content_set_buffer(PyObject *self, PyObject *value, void *closure);
diff --git a/tools/python/apixml2python/handwritten_definitions.mustache b/tools/python/apixml2python/handwritten_definitions.mustache
index 4ae90a9ac..52dfc7016 100644
--- a/tools/python/apixml2python/handwritten_definitions.mustache
+++ b/tools/python/apixml2python/handwritten_definitions.mustache
@@ -526,3 +526,58 @@ static PyMethodDef pylinphone_PayloadTypeType_ModuleMethods[] = {
 	/* Sentinel */
 	{ NULL, NULL, 0, NULL }
 };
+
+
+static PyObject * pylinphone_Content_get_buffer(PyObject *self, void *closure) {
+	void * cbuffer;
+	size_t csize;
+	PyObject * pyresult;
+	PyObject * pyret;
+	const char *pyret_fmt;
+	const LinphoneContent *native_ptr;
+	native_ptr = pylinphone_Content_get_native_ptr(self);
+	if (native_ptr == NULL) {
+		PyErr_SetString(PyExc_TypeError, "Invalid linphone.Content instance");
+		return NULL;
+	}
+
+	pylinphone_trace(1, "[PYLINPHONE] >>> %s(%p [%p])", __FUNCTION__, self, native_ptr);
+	cbuffer = linphone_content_get_buffer(native_ptr);
+	csize = linphone_content_get_size(native_ptr);
+	pylinphone_dispatch_messages();
+
+	pyresult = PyByteArray_FromStringAndSize((const char *)cbuffer, csize);
+	pyret = Py_BuildValue("O", pyresult);
+	pylinphone_trace(-1, "[PYLINPHONE] <<< %s -> %p", __FUNCTION__, pyret);
+	return pyret;
+}
+
+static int pylinphone_Content_set_buffer(PyObject *self, PyObject *value, void *closure) {
+	LinphoneContent *native_ptr;
+	void * _buffer;
+	size_t _size;
+	LinphonePresenceModel * _presence_native_ptr = NULL;
+	native_ptr = pylinphone_Content_get_native_ptr(self);
+	if (native_ptr == NULL) {
+		PyErr_SetString(PyExc_TypeError, "Invalid linphone.Content instance");
+		return -1;
+	}
+
+	if (value == NULL) {
+		PyErr_SetString(PyExc_TypeError, "Cannot delete the 'buffer' attribute.");
+		return -1;
+	}
+	if ((value != Py_None) && !PyByteArray_Check(value)) {
+		PyErr_SetString(PyExc_TypeError, "The 'buffer' attribute value must be a ByteArray instance.");
+		return -1;
+	}
+
+	_buffer = PyByteArray_AsString(value);
+	_size = PyByteArray_Size(value);
+
+	pylinphone_trace(1, "[PYLINPHONE] >>> %s(%p [%p], %p [%p])", __FUNCTION__, self, native_ptr, value, _buffer);
+	linphone_content_set_buffer(native_ptr, _buffer, _size);
+	pylinphone_dispatch_messages();
+	pylinphone_trace(-1, "[PYLINPHONE] <<< %s -> 0", __FUNCTION__);
+	return 0;
+}
diff --git a/tools/python/apixml2python/linphone.py b/tools/python/apixml2python/linphone.py
index e90926f25..0d88af2ab 100644
--- a/tools/python/apixml2python/linphone.py
+++ b/tools/python/apixml2python/linphone.py
@@ -38,6 +38,32 @@ def compute_event_name(s):
 	return event_name
 
 
+class HandWrittenCode:
+	def __init__(self, _class, name, func_list):
+		self._class = _class
+		self.name = name
+		self.func_list = func_list
+
+class HandWrittenInstanceMethod(HandWrittenCode):
+	def __init__(self, _class, name, cfunction):
+		HandWrittenCode.__init__(self, _class, name, [cfunction])
+
+class HandWrittenClassMethod(HandWrittenCode):
+	def __init__(self, _class, name, cfunction):
+		HandWrittenCode.__init__(self, _class, name, [cfunction])
+
+class HandWrittenProperty(HandWrittenCode):
+	def __init__(self, _class, name, getter_cfunction = None, setter_cfunction = None):
+		func_list = []
+		if getter_cfunction is not None:
+			func_list.append(getter_cfunction)
+		if setter_cfunction is not None:
+			func_list.append(setter_cfunction)
+		HandWrittenCode.__init__(self, _class, name, func_list)
+		self.getter_cfunction = getter_cfunction
+		self.setter_cfunction = setter_cfunction
+
+
 class ArgumentType:
 	def __init__(self, basic_type, complete_type, contained_type, linphone_module):
 		self.basic_type = basic_type
@@ -308,7 +334,7 @@ class MethodDefinition:
 				arg_names.append(arg_name + "_native_obj")
 			else:
 				arg_names.append(arg_name)
-		if self.return_type != 'void':
+		if self.return_complete_type != 'void':
 			c_function_call_code += "cresult = "
 		c_function_call_code += self.method_node.get('name') + "("
 		if self.self_arg is not None:
@@ -806,12 +832,15 @@ class EventCallbackMethodDefinition(MethodDefinition):
 
 
 class LinphoneModule(object):
-	def __init__(self, tree, blacklisted_classes, blacklisted_events, blacklisted_functions, hand_written_functions):
+	def __init__(self, tree, blacklisted_classes, blacklisted_events, blacklisted_functions, hand_written_codes):
 		self.internal_instance_method_names = ['destroy', 'ref', 'unref']
 		self.internal_property_names = ['user_data']
 		self.mslist_types = Set([])
 		self.enums = []
 		self.enum_names = []
+		hand_written_functions = []
+		for hand_written_code in hand_written_codes:
+			hand_written_functions += hand_written_code.func_list
 		xml_enums = tree.findall("./enums/enum")
 		for xml_enum in xml_enums:
 			if xml_enum.get('deprecated') == 'true':
@@ -872,6 +901,31 @@ class LinphoneModule(object):
 					ev['event_name'] = compute_event_name(ev['event_cname'])
 					ev['event_doc'] = self.__format_doc(xml_event.find('briefdescription'), xml_event.find('detaileddescription'))
 					self.events.append(ev)
+			for hand_written_code in hand_written_codes:
+				if hand_written_code._class == c['class_name']:
+					if isinstance(hand_written_code, HandWrittenClassMethod):
+						print "HandWrittenClassMethod"
+						m = {}
+						m['method_name'] = hand_written_code.name
+						c['class_type_hand_written_methods'].append(m)
+					elif isinstance(hand_written_code, HandWrittenInstanceMethod):
+						print "HandWrittenInstanceMethod"
+						m = {}
+						m['method_name'] = hand_written_code.name
+						c['class_instance_hand_written_methods'].append(m)
+					elif isinstance(hand_written_code, HandWrittenProperty):
+						print "HandWrittenProperty"
+						p = {}
+						p['property_name'] = hand_written_code.name
+						if hand_written_code.getter_cfunction is None:
+							p['getter_reference'] = 'NULL'
+						else:
+							p['getter_reference'] = '(getter)pylinphone_' + c['class_name'] + '_get_' + p['property_name']
+						if hand_written_code.setter_cfunction is None:
+							p['setter_reference'] = 'NULL'
+						else:
+							p['setter_reference'] = '(setter)pylinphone_' + c['class_name'] + '_set_' + p['property_name']
+						c['class_hand_written_properties'].append(p)
 			xml_type_methods = xml_class.findall("./classmethods/classmethod")
 			for xml_type_method in xml_type_methods:
 				if xml_type_method.get('deprecated') == 'true':
@@ -881,9 +935,7 @@ class LinphoneModule(object):
 					continue
 				m = {}
 				m['method_name'] = method_name.replace(c['class_c_function_prefix'], '')
-				if method_name in hand_written_functions:
-					c['class_type_hand_written_methods'].append(m)
-				else:
+				if method_name not in hand_written_functions:
 					m['method_xml_node'] = xml_type_method
 					c['class_type_methods'].append(m)
 			c['class_instance_methods'] = []
@@ -898,9 +950,7 @@ class LinphoneModule(object):
 					continue
 				m = {}
 				m['method_name'] = method_name.replace(c['class_c_function_prefix'], '')
-				if method_name in hand_written_functions:
-					c['class_instance_hand_written_methods'].append(m)
-				else:
+				if method_name not in hand_written_functions:
 					m['method_xml_node'] = xml_instance_method
 					c['class_instance_methods'].append(m)
 			c['class_properties'] = []
@@ -915,45 +965,31 @@ class LinphoneModule(object):
 				p['property_name'] = property_name
 				xml_property_getter = xml_property.find("./getter")
 				xml_property_setter = xml_property.find("./setter")
-				handwritten_property = False
 				if xml_property_getter is not None:
-					if xml_property_getter.get('name') in blacklisted_functions or xml_property_getter.get('deprecated') == 'true':
+					if xml_property_getter.get('name') in blacklisted_functions or xml_property_getter.get('name') in hand_written_functions or xml_property_getter.get('deprecated') == 'true':
 						continue
-					elif xml_property_getter.get('name') in hand_written_functions:
-						handwritten_property = True
 				if xml_property_setter is not None:
-					if xml_property_setter.get('name') in blacklisted_functions or xml_property_setter.get('deprecated') == 'true':
+					if xml_property_setter.get('name') in blacklisted_functions or xml_property_setter.get('name') in hand_written_functions or xml_property_setter.get('deprecated') == 'true':
 						continue
-					elif xml_property_setter.get('name') in hand_written_functions:
-						handwritten_property = True
-				if handwritten_property:
-					p['getter_reference'] = 'NULL'
-					p['setter_reference'] = 'NULL'
-					if xml_property_getter is not None:
-						p['getter_reference'] = '(getter)pylinphone_' + c['class_name'] + '_get_' + p['property_name']
-					if xml_property_setter is not None:
-						p['setter_reference'] = '(setter)pylinphone_' + c['class_name'] + '_set_' + p['property_name']
-					c['class_hand_written_properties'].append(p)
+				if xml_property_getter is not None:
+					xml_property_getter.set('property_name', property_name)
+					p['getter_name'] = xml_property_getter.get('name').replace(c['class_c_function_prefix'], '')
+					p['getter_xml_node'] = xml_property_getter
+					p['getter_reference'] = "(getter)pylinphone_" + c['class_name'] + "_" + p['getter_name']
+					p['getter_definition_begin'] = "static PyObject * pylinphone_" + c['class_name'] + "_" + p['getter_name'] + "(PyObject *self, void *closure) {"
+					p['getter_definition_end'] = "}"
 				else:
-					if xml_property_getter is not None:
-						xml_property_getter.set('property_name', property_name)
-						p['getter_name'] = xml_property_getter.get('name').replace(c['class_c_function_prefix'], '')
-						p['getter_xml_node'] = xml_property_getter
-						p['getter_reference'] = "(getter)pylinphone_" + c['class_name'] + "_" + p['getter_name']
-						p['getter_definition_begin'] = "static PyObject * pylinphone_" + c['class_name'] + "_" + p['getter_name'] + "(PyObject *self, void *closure) {"
-						p['getter_definition_end'] = "}"
-					else:
-						p['getter_reference'] = "NULL"
-					if xml_property_setter is not None:
-						xml_property_setter.set('property_name', property_name)
-						p['setter_name'] = xml_property_setter.get('name').replace(c['class_c_function_prefix'], '')
-						p['setter_xml_node'] = xml_property_setter
-						p['setter_reference'] = "(setter)pylinphone_" + c['class_name'] + "_" + p['setter_name']
-						p['setter_definition_begin'] = "static int pylinphone_" + c['class_name'] + "_" + p['setter_name'] + "(PyObject *self, PyObject *value, void *closure) {"
-						p['setter_definition_end'] = "}"
-					else:
-						p['setter_reference'] = "NULL"
-					c['class_properties'].append(p)
+					p['getter_reference'] = "NULL"
+				if xml_property_setter is not None:
+					xml_property_setter.set('property_name', property_name)
+					p['setter_name'] = xml_property_setter.get('name').replace(c['class_c_function_prefix'], '')
+					p['setter_xml_node'] = xml_property_setter
+					p['setter_reference'] = "(setter)pylinphone_" + c['class_name'] + "_" + p['setter_name']
+					p['setter_definition_begin'] = "static int pylinphone_" + c['class_name'] + "_" + p['setter_name'] + "(PyObject *self, PyObject *value, void *closure) {"
+					p['setter_definition_end'] = "}"
+				else:
+					p['setter_reference'] = "NULL"
+				c['class_properties'].append(p)
 			self.classes.append(c)
 		# Format events definitions
 		for ev in self.events:

From a8e2461db5cc79eda8ef6737b4112a5b3b0f33d6 Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Fri, 21 Nov 2014 14:27:53 +0100
Subject: [PATCH 018/496] Update ms2

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 478d7dab4..ede23a105 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 478d7dab4c2b78a0e693142c1eee27ac5d95076a
+Subproject commit ede23a105ec048909509dec2a320bce694743d36

From 8846ca4780ace20a0452a18b5a0e7c2e24fc669d Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Fri, 21 Nov 2014 14:44:40 +0100
Subject: [PATCH 019/496] Fix DTMF tests suite: when using SIP INFO, we should
 keep initial packets order

---
 tester/dtmf_tester.c        | 8 ++++++--
 tester/liblinphone_tester.h | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/tester/dtmf_tester.c b/tester/dtmf_tester.c
index fa627cfd4..1c80c21c6 100644
--- a/tester/dtmf_tester.c
+++ b/tester/dtmf_tester.c
@@ -29,10 +29,12 @@ void dtmf_received(LinphoneCore *lc, LinphoneCall *call, int dtmf) {
 	*dst = *dst ?
 				ms_strcat_printf(*dst, "%c", dtmf)
 				: ms_strdup_printf("%c", dtmf);
+	counters->dtmf_count++;
 }
 
 void send_dtmf_base(bool_t use_rfc2833, bool_t use_sipinfo, char dtmf, char* dtmf_seq) {
 	char* expected = NULL;
+	int dtmf_count_prev;
 	marie = linphone_core_manager_new( "marie_rc");
 	pauline = linphone_core_manager_new( "pauline_rc");
 
@@ -46,19 +48,21 @@ void send_dtmf_base(bool_t use_rfc2833, bool_t use_sipinfo, char dtmf, char* dtm
 	marie_call = linphone_core_get_current_call(marie->lc);
 
 	if (dtmf != '\0') {
+		dtmf_count_prev = pauline->stat.dtmf_count;
 		linphone_call_send_dtmf(marie_call, dtmf);
 
 		/*wait for the DTMF to be received from pauline*/
-		wait_for_until(marie->lc, pauline->lc, NULL, 0, 1000);
+		CU_ASSERT_TRUE(wait_for_until(marie->lc, pauline->lc, &pauline->stat.dtmf_count, dtmf_count_prev+1, 10000));
 		expected = ms_strdup_printf("%c", dtmf);
 	}
 
 	if (dtmf_seq != NULL) {
 		int dtmf_delay_ms = lp_config_get_int(marie_call->core->config,"net","dtmf_delay_ms",200);
+		dtmf_count_prev = pauline->stat.dtmf_count;
 		linphone_call_send_dtmfs(marie_call, dtmf_seq);
 
 		/*wait for the DTMF sequence to be received from pauline*/
-		wait_for_until(marie->lc, pauline->lc, NULL, 0, 1000 + dtmf_delay_ms * strlen(dtmf_seq));
+		CU_ASSERT_TRUE(wait_for_until(marie->lc, pauline->lc, &pauline->stat.dtmf_count, dtmf_count_prev + strlen(dtmf_seq), 10000 + dtmf_delay_ms * strlen(dtmf_seq)));
 		expected = (dtmf!='\0')?ms_strdup_printf("%c%s",dtmf,dtmf_seq):ms_strdup(dtmf_seq);
 	}
 
diff --git a/tester/liblinphone_tester.h b/tester/liblinphone_tester.h
index 4bbe1fa3a..715d4c6f8 100644
--- a/tester/liblinphone_tester.h
+++ b/tester/liblinphone_tester.h
@@ -205,6 +205,7 @@ typedef struct _stats {
 	LinphoneChatMessage* last_received_chat_message;
 
 	char * dtmf_list_received;
+	int dtmf_count;
 }stats;
 
 typedef struct _LinphoneCoreManager {

From 7563118143f8309313247f2c8b1807f78d1deafe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
 <francois.grisez@belledonne-communications.com>
Date: Fri, 21 Nov 2014 15:09:17 +0100
Subject: [PATCH 020/496] Fix Player/Playing test for Android

---
 tester/player_tester.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tester/player_tester.c b/tester/player_tester.c
index be0b47284..457bd899c 100644
--- a/tester/player_tester.c
+++ b/tester/player_tester.c
@@ -84,7 +84,9 @@ static void play_file(const char *filename, bool_t unsupported_format) {
 }
 
 static void playing_test(void) {
-	play_file("/home/francois/Téléchargements/test_linphone.mkv", !linphone_local_player_matroska_supported());
+	const char *filename = ms_strdup_printf("%s/sounds/hello_opus_h264.mkv", liblinphone_tester_file_prefix);
+	play_file(filename, !linphone_local_player_matroska_supported());
+	ms_free(filename);
 }
 
 test_t player_tests[] = {

From 3149d5b69291c58811592ae8072446aa63fa588a Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Fri, 21 Nov 2014 16:00:17 +0100
Subject: [PATCH 021/496] Fix android compilation

---
 coreapi/linphonecore_jni.cc | 67 +++++++++++++++++++------------------
 mediastreamer2              |  2 +-
 2 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index 2a985519e..8f4b44154 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "linphonecore_jni.h"
 #endif
 #include "linphonecore_utils.h"
-#include <ortp/zrtp.h>
+#include <mediastreamer2/zrtp.h>
 
 
 extern "C" {
@@ -821,9 +821,9 @@ public:
 			return;
 		}
 		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_get_user_data(lc);
-		env->CallVoidMethod(lcData->listener, 
-				lcData->fileTransferProgressIndicationId, 
-				lcData->core, 
+		env->CallVoidMethod(lcData->listener,
+				lcData->fileTransferProgressIndicationId,
+				lcData->core,
 				(jmsg = lcData->getChatMessage(env, message)),
 				content ? create_java_linphone_content(env, content) : NULL,
 				progress);
@@ -839,9 +839,9 @@ public:
 			return;
 		}
 		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_get_user_data(lc);
-		*size = env->CallIntMethod(lcData->listener, 
-				lcData->fileTransferSendId, 
-				lcData->core, 
+		*size = env->CallIntMethod(lcData->listener,
+				lcData->fileTransferSendId,
+				lcData->core,
 				(jmsg = lcData->getChatMessage(env, message)),
 				content ? create_java_linphone_content(env, content) : NULL,
 				buff ? env->NewDirectByteBuffer(buff, asking) : NULL,
@@ -857,13 +857,13 @@ public:
 			return;
 		}
 		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_get_user_data(lc);
-		
+
 		jbyteArray jbytes = env->NewByteArray(size);
 		env->SetByteArrayRegion(jbytes, 0, size, (jbyte*)buff);
-		
-		env->CallVoidMethod(lcData->listener, 
-				lcData->fileTransferRecvId, 
-				lcData->core, 
+
+		env->CallVoidMethod(lcData->listener,
+				lcData->fileTransferRecvId,
+				lcData->core,
 				(jmsg = lcData->getChatMessage(env, message)),
 				content ? create_java_linphone_content(env, content) : NULL,
 				jbytes,
@@ -2670,14 +2670,14 @@ extern "C" void Java_org_linphone_core_LinphoneChatRoomImpl_destroy(JNIEnv*  env
 }
 
 extern "C" jlong Java_org_linphone_core_LinphoneChatRoomImpl_createFileTransferMessage(JNIEnv* env, jobject thiz, jlong ptr, jstring jname, jstring jtype, jstring jsubtype, jint data_size) {
-	LinphoneContent content = {0};
+	LinphoneContentPrivate content = {0};
 	LinphoneChatMessage *message = NULL;
 
 	content.type = (char*)env->GetStringUTFChars(jtype, NULL);
 	content.subtype = (char*)env->GetStringUTFChars(jsubtype, NULL);
 	content.name = (char*)env->GetStringUTFChars(jname, NULL);
 	content.size = data_size;
-	message = linphone_chat_room_create_file_transfer_message((LinphoneChatRoom *)ptr, &content);
+	message = linphone_chat_room_create_file_transfer_message((LinphoneChatRoom *)ptr, LINPHONE_CONTENT(&content));
 	env->ReleaseStringUTFChars(jtype, content.type);
 	env->ReleaseStringUTFChars(jsubtype, content.subtype);
 	env->ReleaseStringUTFChars(jname, content.name);
@@ -2702,14 +2702,14 @@ extern "C" jstring Java_org_linphone_core_LinphoneChatMessageImpl_getAppData(JNI
 }
 
 extern "C" void Java_org_linphone_core_LinphoneChatMessageImpl_setAppData(JNIEnv* env, jobject  thiz, jlong ptr, jstring appdata) {
-	const char * data = appdata ? env->GetStringUTFChars(appdata, NULL) : NULL;	
+	const char * data = appdata ? env->GetStringUTFChars(appdata, NULL) : NULL;
 	linphone_chat_message_set_appdata((LinphoneChatMessage *)ptr, data);
 	if (appdata)
 		env->ReleaseStringUTFChars(appdata, data);
 }
 
 extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setFileTransferServer(JNIEnv* env, jobject thiz, jlong ptr, jstring server_url) {
-	const char * url = server_url ? env->GetStringUTFChars(server_url, NULL) : NULL;	
+	const char * url = server_url ? env->GetStringUTFChars(server_url, NULL) : NULL;
 	linphone_core_set_file_transfer_server((LinphoneCore *)ptr, url);
 	if (server_url)
 		env->ReleaseStringUTFChars(server_url, url);
@@ -3786,7 +3786,7 @@ JNIEXPORT jobject JNICALL Java_org_linphone_core_LinphoneCoreImpl_subscribe(JNIE
 		jstring jevname, jint expires, jstring jtype, jstring jsubtype, jbyteArray jdata, jstring jencoding){
 	LinphoneCore *lc=(LinphoneCore*)coreptr;
 	LinphoneAddress *addr=(LinphoneAddress*)addrptr;
-	LinphoneContent content={0};
+	LinphoneContentPrivate content={0};
 	LinphoneEvent *ev;
 	jobject jev=NULL;
 	const char *evname=env->GetStringUTFChars(jevname,NULL);
@@ -3799,7 +3799,7 @@ JNIEXPORT jobject JNICALL Java_org_linphone_core_LinphoneCoreImpl_subscribe(JNIE
 		content.data=(void*)env->GetByteArrayElements(jdata,NULL);
 		content.size=env->GetArrayLength(jdata);
 	}
-	ev=linphone_core_subscribe(lc,addr,evname,expires,content.type ? &content : NULL);
+	ev=linphone_core_subscribe(lc,addr,evname,expires,content.type ? LINPHONE_CONTENT(&content) : NULL);
 	if (jtype){
 		env->ReleaseStringUTFChars(jtype,content.type);
 		env->ReleaseStringUTFChars(jsubtype,content.subtype);
@@ -3822,7 +3822,7 @@ JNIEXPORT jobject JNICALL Java_org_linphone_core_LinphoneCoreImpl_publish(JNIEnv
 																		  jstring jtype, jstring jsubtype, jbyteArray jdata, jstring jencoding){
 	LinphoneCore *lc=(LinphoneCore*)coreptr;
 	LinphoneAddress *addr=(LinphoneAddress*)addrptr;
-	LinphoneContent content={0};
+	LinphoneContentPrivate content={0};
 	LinphoneEvent *ev;
 	jobject jev=NULL;
 	const char *evname=env->GetStringUTFChars(jevname,NULL);
@@ -3835,7 +3835,7 @@ JNIEXPORT jobject JNICALL Java_org_linphone_core_LinphoneCoreImpl_publish(JNIEnv
 		content.data=(void*)env->GetByteArrayElements(jdata,NULL);
 		content.size=env->GetArrayLength(jdata);
 	}
-	ev=linphone_core_publish(lc,addr,evname,expires,content.type ? &content : NULL);
+	ev=linphone_core_publish(lc,addr,evname,expires,content.type ? LINPHONE_CONTENT(&content) : NULL);
 	if (jtype){
 		env->ReleaseStringUTFChars(jtype,content.type);
 		env->ReleaseStringUTFChars(jsubtype,content.subtype);
@@ -3977,12 +3977,13 @@ extern "C" jintArray Java_org_linphone_core_LpConfigImpl_getIntRange(JNIEnv *env
 		return returnValues;
 }
 
-static jobject create_java_linphone_content(JNIEnv *env, const LinphoneContent *content){
+static jobject create_java_linphone_content(JNIEnv *env, const LinphoneContent *icontent){
 	jclass contentClass;
 	jmethodID ctor;
 	jstring jtype, jsubtype, jencoding, jname;
 	jbyteArray jdata = NULL;
 	jint jsize = 0;
+	const LinphoneContentPrivate *content = LINPHONE_CONTENT_PRIVATE(icontent);
 
 	contentClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneContentImpl"));
 	ctor = env->GetMethodID(contentClass,"<init>", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;[BLjava/lang/String;I)V");
@@ -4022,13 +4023,13 @@ JNIEXPORT jobject JNICALL Java_org_linphone_core_LinphoneInfoMessageImpl_getCont
  * Signature: (JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
  */
 JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneInfoMessageImpl_setContent(JNIEnv *env, jobject jobj, jlong infoptr, jstring jtype, jstring jsubtype, jstring jdata){
-	LinphoneContent content={0};
+	LinphoneContentPrivate content={0};
 
 	content.type=(char*)env->GetStringUTFChars(jtype,NULL);
 	content.subtype=(char*)env->GetStringUTFChars(jsubtype,NULL);
 	content.data=(void*)env->GetStringUTFChars(jdata,NULL);
 	content.size=strlen((char*)content.data);
-	linphone_info_message_set_content((LinphoneInfoMessage*)infoptr,&content);
+	linphone_info_message_set_content((LinphoneInfoMessage*)infoptr,LINPHONE_CONTENT(&content));
 	env->ReleaseStringUTFChars(jtype,content.type);
 	env->ReleaseStringUTFChars(jsubtype,content.subtype);
 	env->ReleaseStringUTFChars(jdata,(char*)content.data);
@@ -4130,7 +4131,7 @@ JNIEXPORT jint JNICALL Java_org_linphone_core_LinphoneEventImpl_denySubscription
  * Signature: (JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;)I
  */
 JNIEXPORT jint JNICALL Java_org_linphone_core_LinphoneEventImpl_notify(JNIEnv *env, jobject jobj, jlong evptr, jstring jtype, jstring jsubtype, jbyteArray jdata, jstring jencoding){
-	LinphoneContent content={0};
+	LinphoneContentPrivate content={0};
 	LinphoneEvent *ev=(LinphoneEvent*)evptr;
 	jint err;
 
@@ -4142,7 +4143,7 @@ JNIEXPORT jint JNICALL Java_org_linphone_core_LinphoneEventImpl_notify(JNIEnv *e
 		content.size=env->GetArrayLength(jdata);
 	}
 
-	err=linphone_event_notify(ev,content.type ? &content : NULL);
+	err=linphone_event_notify(ev,content.type ? LINPHONE_CONTENT(&content) : NULL);
 
 	if (jtype){
 		env->ReleaseStringUTFChars(jtype,content.type);
@@ -4159,7 +4160,7 @@ JNIEXPORT jint JNICALL Java_org_linphone_core_LinphoneEventImpl_notify(JNIEnv *e
  * Signature: (JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;)I
  */
 JNIEXPORT jint JNICALL Java_org_linphone_core_LinphoneEventImpl_updateSubscribe(JNIEnv *env, jobject jobj, jlong evptr, jstring jtype, jstring jsubtype, jbyteArray jdata, jstring jencoding){
-	LinphoneContent content={0};
+	LinphoneContentPrivate content={0};
 	LinphoneEvent *ev=(LinphoneEvent*)evptr;
 	jint err;
 
@@ -4171,7 +4172,7 @@ JNIEXPORT jint JNICALL Java_org_linphone_core_LinphoneEventImpl_updateSubscribe(
 		content.size=env->GetArrayLength(jdata);
 	}
 
-	err=linphone_event_update_subscribe(ev,content.type ? &content : NULL);
+	err=linphone_event_update_subscribe(ev,content.type ? LINPHONE_CONTENT(&content) : NULL);
 
 	if (jtype){
 		env->ReleaseStringUTFChars(jtype,content.type);
@@ -4188,7 +4189,7 @@ JNIEXPORT jint JNICALL Java_org_linphone_core_LinphoneEventImpl_updateSubscribe(
  * Signature: (JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;)I
  */
 JNIEXPORT jint JNICALL Java_org_linphone_core_LinphoneEventImpl_updatePublish(JNIEnv *env, jobject jobj, jlong evptr, jstring jtype, jstring jsubtype, jbyteArray jdata, jstring jencoding){
-	LinphoneContent content={0};
+	LinphoneContentPrivate content={0};
 	LinphoneEvent *ev=(LinphoneEvent*)evptr;
 	jint err;
 
@@ -4200,7 +4201,7 @@ JNIEXPORT jint JNICALL Java_org_linphone_core_LinphoneEventImpl_updatePublish(JN
 		content.size=env->GetArrayLength(jdata);
 	}
 
-	err=linphone_event_update_publish(ev,content.type ? &content : NULL);
+	err=linphone_event_update_publish(ev,content.type ? LINPHONE_CONTENT(&content) : NULL);
 
 	if (jtype){
 		env->ReleaseStringUTFChars(jtype,content.type);
@@ -4274,7 +4275,7 @@ JNIEXPORT jobject JNICALL Java_org_linphone_core_LinphoneCoreImpl_createSubscrib
 }
 
 JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneEventImpl_sendSubscribe(JNIEnv *env, jobject thiz, jlong jevent, jstring jtype, jstring jsubtype, jbyteArray jdata, jstring jencoding) {
-	LinphoneContent content = {0};
+	LinphoneContentPrivate content = {0};
 	if (jtype) {
 		content.type = (char*) env->GetStringUTFChars(jtype, NULL);
 		content.subtype = (char*) env->GetStringUTFChars(jsubtype, NULL);
@@ -4282,7 +4283,7 @@ JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneEventImpl_sendSubscribe(JN
 		content.data = (void*) env->GetByteArrayElements(jdata, NULL);
 		content.size = env->GetArrayLength(jdata);
 	}
-	linphone_event_send_subscribe((LinphoneEvent*) jevent, content.type ? &content : NULL);
+	linphone_event_send_subscribe((LinphoneEvent*) jevent, content.type ? LINPHONE_CONTENT(&content) : NULL);
 	if (jtype) {
 		env->ReleaseStringUTFChars(jtype, content.type);
 		env->ReleaseStringUTFChars(jsubtype, content.subtype);
@@ -4308,7 +4309,7 @@ JNIEXPORT jobject JNICALL Java_org_linphone_core_LinphoneCoreImpl_createPublish(
 }
 
 JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneEventImpl_sendPublish(JNIEnv *env, jobject thiz, jlong jevent, jstring jtype, jstring jsubtype, jbyteArray jdata, jstring jencoding) {
-	LinphoneContent content = {0};
+	LinphoneContentPrivate content = {0};
 	if (jtype) {
 		content.type = (char*) env->GetStringUTFChars(jtype, NULL);
 		content.subtype = (char*) env->GetStringUTFChars(jsubtype, NULL);
@@ -4316,7 +4317,7 @@ JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneEventImpl_sendPublish(JNIE
 		content.data = (void*) env->GetByteArrayElements(jdata, NULL);
 		content.size = env->GetArrayLength(jdata);
 	}
-	linphone_event_send_publish((LinphoneEvent*) jevent, content.type ? &content : NULL);
+	linphone_event_send_publish((LinphoneEvent*) jevent, content.type ? LINPHONE_CONTENT(&content) : NULL);
 	if (jtype) {
 		env->ReleaseStringUTFChars(jtype, content.type);
 		env->ReleaseStringUTFChars(jsubtype, content.subtype);
diff --git a/mediastreamer2 b/mediastreamer2
index ede23a105..daad27559 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit ede23a105ec048909509dec2a320bce694743d36
+Subproject commit daad2755959725b3b8196b026afd446fe3e72605

From 47118a39bceb538f43ca4b8a5570574ca22ec50c Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Fri, 21 Nov 2014 16:29:30 +0100
Subject: [PATCH 022/496] Fix android compilation, bis repetita

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index daad27559..1fa78d2f8 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit daad2755959725b3b8196b026afd446fe3e72605
+Subproject commit 1fa78d2f8ab882f553081f02410041c8f3f2b065

From c1f324d0d6e5c2d73adb541405beba6358842ec4 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Fri, 21 Nov 2014 16:57:22 +0100
Subject: [PATCH 023/496] Rename Playing test and fix compilation

---
 tester/player_tester.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tester/player_tester.c b/tester/player_tester.c
index 457bd899c..f60e29a68 100644
--- a/tester/player_tester.c
+++ b/tester/player_tester.c
@@ -84,13 +84,13 @@ static void play_file(const char *filename, bool_t unsupported_format) {
 }
 
 static void playing_test(void) {
-	const char *filename = ms_strdup_printf("%s/sounds/hello_opus_h264.mkv", liblinphone_tester_file_prefix);
+	char *filename = ms_strdup_printf("%s/sounds/hello_opus_h264.mkv", liblinphone_tester_file_prefix);
 	play_file(filename, !linphone_local_player_matroska_supported());
 	ms_free(filename);
 }
 
 test_t player_tests[] = {
-	{	"Playing"	,	playing_test	}
+	{	"Local MKV file"	,	playing_test	}
 };
 
 test_suite_t player_test_suite = {

From c88838b0b54a849f07e35cc59f4220d25765b0f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
 <francois.grisez@belledonne-communications.com>
Date: Fri, 21 Nov 2014 17:07:09 +0100
Subject: [PATCH 024/496] Update mediastreamer2

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 1fa78d2f8..26ff7a209 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 1fa78d2f8ab882f553081f02410041c8f3f2b065
+Subproject commit 26ff7a2098d0140083e23682752e66cf53f8e203

From 1191a49efad193b72fa970a68d4af9402445c9d1 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Sat, 22 Nov 2014 11:31:06 +0100
Subject: [PATCH 025/496] use ms_new0

---
 coreapi/linphonecore.c | 6 +++---
 coreapi/upnp.c         | 2 +-
 mediastreamer2         | 2 +-
 oRTP                   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 6a83183da..07beaf135 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -1529,7 +1529,7 @@ static void linphone_core_init(LinphoneCore * lc, const LinphoneCoreVTable *vtab
 	const char *aac_fmtp162248, *aac_fmtp3244;
 	LinphoneCoreVTable* local_vtable= linphone_core_v_table_new();
 	ms_message("Initializing LinphoneCore %s", linphone_core_get_version());
-	memset (lc, 0, sizeof (LinphoneCore));
+
 	lc->config=lp_config_ref(config);
 	lc->data=userdata;
 	lc->ringstream_autorelease=TRUE;
@@ -1679,7 +1679,7 @@ LinphoneCore *linphone_core_new(const LinphoneCoreVTable *vtable,
 
 LinphoneCore *linphone_core_new_with_config(const LinphoneCoreVTable *vtable, struct _LpConfig *config, void *userdata)
 {
-	LinphoneCore *core = ms_new(LinphoneCore, 1);
+	LinphoneCore *core = ms_new0(LinphoneCore, 1);
 	linphone_core_init(core, vtable, config, userdata);
 	return core;
 }
@@ -6640,7 +6640,7 @@ typedef struct Hook{
 }Hook;
 
 static Hook *hook_new(LinphoneCoreIterateHook hook, void *hook_data){
-	Hook *h=ms_new(Hook,1);
+	Hook *h=ms_new0(Hook,1);
 	h->fun=hook;
 	h->data=hook_data;
 	return h;
diff --git a/coreapi/upnp.c b/coreapi/upnp.c
index 83ab387c4..68b82e2ed 100644
--- a/coreapi/upnp.c
+++ b/coreapi/upnp.c
@@ -145,7 +145,7 @@ char * linphone_upnp_format_device_id(const char *device_id) {
 	if(device_id == NULL) {
 		return ret;
 	}
-	ret = ms_new(char, UPNP_UUID_LEN + 1);
+	ret = ms_new0(char, UPNP_UUID_LEN + 1);
 	tmp = ret;
 	if(linphone_upnp_strncmpi(device_id, "uuid:", linphone_upnp_str_min(device_id, "uuid:")) == 0) {
 		device_id += strlen("uuid:");
diff --git a/mediastreamer2 b/mediastreamer2
index 26ff7a209..dfc2fbd36 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 26ff7a2098d0140083e23682752e66cf53f8e203
+Subproject commit dfc2fbd36db97f07f08112ee8217477ba4257744
diff --git a/oRTP b/oRTP
index 5333d998c..7508c59d7 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 5333d998c8eaf3c43e66c4a5335c0606c8dea3df
+Subproject commit 7508c59d703b769d510321ff357d10139d476bab

From 42a841a84b2b55adc2261a23dba7ea3afa06b581 Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Mon, 24 Nov 2014 10:06:42 +0100
Subject: [PATCH 026/496] Update readme for Brew

---
 README.macos.md | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/README.macos.md b/README.macos.md
index 6dd8b4625..6fcc8280f 100644
--- a/README.macos.md
+++ b/README.macos.md
@@ -42,18 +42,9 @@ In order to enable generation of bundle for multiple MacOS version and 32 bit pr
         # readline is required from linphonec.c otherwise compilation will fail
         brew link readline --force
 
-        # then you have to install antlr3 from a tap.
-        wget https://gist.githubusercontent.com/Gui13/f5cf103f50d34c28c7be/raw/f50242f5e0c3a6d25ed7fca1462bce3a7b738971/antlr3.rb
-        mv antlr3.rb /usr/local/Library/Formula/
-        brew install antlr3
-
-        brew tap marekjelen/gtk
-        brew install gtk+-quartz
-
-        # gtk-mac-integration is not available in main repository or Brew yet.
-        wget https://gist.github.com/Gui13/cdcad37faa6b8ffa0588/raw/bf2277d45e261ad48ae1344c4c97f2684974ed87/gtk-mac-integration.rb
-        mv gtk-mac-integration.rb /usr/local/Library/Formula/
-        brew install gtk-mac-integration
+        # then you have to install some dependencies from a tap.
+        brew tap Gui13/linphone
+        brew install gtk+-quartz gtk-mac-integration
 
 ### Building Linphone
 

From 3cb94ab1e512fb72f0126c275e529e5f260e54ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
 <francois.grisez@belledonne-communications.com>
Date: Mon, 24 Nov 2014 10:16:52 +0100
Subject: [PATCH 027/496] Fix 'Player/Local MKV file' test

---
 tester/player_tester.c | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/tester/player_tester.c b/tester/player_tester.c
index f60e29a68..2894b92e7 100644
--- a/tester/player_tester.c
+++ b/tester/player_tester.c
@@ -18,23 +18,23 @@
 
 #include "liblinphone_tester.h"
 
-//static const char *_get_default_video_renderer(void){
-//#ifdef WIN32
-//	return "MSDrawDibDisplay";
-//#elif defined(ANDROID)
-//	return "MSAndroidDisplay";
-//#elif __APPLE__ && !defined(__ios)
-//	return "MSOSXGLDisplay";
-//#elif defined (HAVE_XV)
-//	return "MSX11Video";
-//#elif defined(HAVE_GL)
-//	return "MSGLXVideo";
-//#elif defined(__ios)
-//	return "IOSDisplay";
-//#else
-//	return "MSVideoOut";
-//#endif
-//}
+static const char *_get_default_video_renderer(void){
+#ifdef WIN32
+	return "MSDrawDibDisplay";
+#elif defined(ANDROID)
+	return "MSAndroidDisplay";
+#elif __APPLE__ && !defined(__ios)
+	return "MSOSXGLDisplay";
+#elif defined (HAVE_XV)
+	return "MSX11Video";
+#elif defined(HAVE_GL)
+	return "MSGLXVideo";
+#elif defined(__ios)
+	return "IOSDisplay";
+#else
+	return "MSVideoOut";
+#endif
+}
 
 static bool_t wait_for_eof(bool_t *eof, int *time,int time_refresh, int timeout) {
 	while(*time < timeout && !*eof) {
@@ -59,7 +59,7 @@ static void play_file(const char *filename, bool_t unsupported_format) {
 	CU_ASSERT_PTR_NOT_NULL(lc_manager);
 	if(lc_manager == NULL) return;
 
-	player = linphone_core_create_local_player(lc_manager->lc, ms_snd_card_manager_get_default_card(ms_snd_card_manager_get()), "MSX11Video", 0);
+	player = linphone_core_create_local_player(lc_manager->lc, ms_snd_card_manager_get_default_card(ms_snd_card_manager_get()), _get_default_video_renderer(), 0);
 	CU_ASSERT_PTR_NOT_NULL(player);
 	if(player == NULL) goto fail;
 

From 17c5372cd9dd9efb93296e03377910e2ff40b61f Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Mon, 24 Nov 2014 11:06:33 +0100
Subject: [PATCH 028/496] Add API to set/get a LinphoneContent data with a
 string type.

---
 coreapi/content.c |  9 +++++++++
 coreapi/content.h | 17 ++++++++++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/coreapi/content.c b/coreapi/content.c
index 84e45c853..74d04ebb7 100644
--- a/coreapi/content.c
+++ b/coreapi/content.c
@@ -115,6 +115,15 @@ void linphone_content_set_buffer(LinphoneContent *content, const void *buffer, s
 	((char *)content->lcp.data)[size] = '\0';
 }
 
+char * linphone_content_get_string_buffer(const LinphoneContent *content) {
+	return (char *)content->lcp.data;
+}
+
+void linphone_content_set_string_buffer(LinphoneContent *content, const char *buffer) {
+	content->lcp.size = strlen(buffer);
+	content->lcp.data = belle_sip_strdup(buffer);
+}
+
 size_t linphone_content_get_size(const LinphoneContent *content) {
 	return content->lcp.size;
 }
diff --git a/coreapi/content.h b/coreapi/content.h
index b2e04de27..400f5f5fb 100644
--- a/coreapi/content.h
+++ b/coreapi/content.h
@@ -155,10 +155,25 @@ LINPHONE_PUBLIC void * linphone_content_get_buffer(const LinphoneContent *conten
 /**
  * Set the content data buffer, usually a string.
  * @param[in] content LinphoneContent object.
- * @param[in] data The content data buffer.
+ * @param[in] buffer The content data buffer.
+ * @param[in] size The size of the content data buffer.
  */
 LINPHONE_PUBLIC void linphone_content_set_buffer(LinphoneContent *content, const void *buffer, size_t size);
 
+/**
+ * Get the string content data buffer.
+ * @param[in] content LinphoneContent object
+ * @return The string content data buffer.
+ */
+LINPHONE_PUBLIC char * linphone_content_get_string_buffer(const LinphoneContent *content);
+
+/**
+ * Set the string content data buffer.
+ * @param[in] content LinphoneContent object.
+ * @param[in] buffer The string content data buffer.
+ */
+LINPHONE_PUBLIC void linphone_content_set_string_buffer(LinphoneContent *content, const char *buffer);
+
 /**
  * Get the content data buffer size, excluding null character despite null character is always set for convenience.
  * @param[in] content LinphoneContent object.

From 96a488a5cabc6259fb133efe0eb3859540a6f838 Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Mon, 24 Nov 2014 11:48:11 +0100
Subject: [PATCH 029/496] Update readme for brew (again)

---
 README.macos.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.macos.md b/README.macos.md
index 6fcc8280f..c4723f29d 100644
--- a/README.macos.md
+++ b/README.macos.md
@@ -44,7 +44,7 @@ In order to enable generation of bundle for multiple MacOS version and 32 bit pr
 
         # then you have to install some dependencies from a tap.
         brew tap Gui13/linphone
-        brew install gtk+-quartz gtk-mac-integration
+        brew install antlr3.2 libantlr3.4c mattintosh4/gtk-mac-integration/gtk-mac-integration
 
 ### Building Linphone
 

From 89340008674a8027b763e58d295c1248594885d4 Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Mon, 24 Nov 2014 11:49:44 +0100
Subject: [PATCH 030/496] Fix message tester when no storage is used

---
 coreapi/callbacks.c       |  9 +++++----
 coreapi/chat.c            | 13 ++++++++++++-
 coreapi/message_storage.c | 11 ++---------
 coreapi/private.h         |  1 +
 4 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/coreapi/callbacks.c b/coreapi/callbacks.c
index 59ce4a9a6..363272324 100644
--- a/coreapi/callbacks.c
+++ b/coreapi/callbacks.c
@@ -303,9 +303,9 @@ static void call_received(SalOp *h){
 		linphone_address_destroy(to_addr);
 		return;
 	}
-	
+
 	call=linphone_call_new_incoming(lc,from_addr,to_addr,h);
-	
+
 	linphone_call_make_local_media_description(lc,call);
 	sal_call_set_local_media_description(call->op,call->localdesc);
 	md=sal_call_get_final_media_description(call->op);
@@ -1170,14 +1170,15 @@ static void text_delivery_update(SalOp *op, SalTextDeliveryStatus status){
 	}
 
 	chat_msg->state=chatStatusSal2Linphone(status);
-	linphone_chat_message_store_state(chat_msg);
+	linphone_chat_message_update_state(chat_msg);
+
 	if (chat_msg && chat_msg->cb) {
 		ms_message("Notifying text delivery with status %i",chat_msg->state);
 		chat_msg->cb(chat_msg
 			,chat_msg->state
 			,chat_msg->cb_ud);
 	}
-	if (status != SalTextDeliveryInProgress) { /*don't release op if progress*/
+	if (status != SalTextDeliveryInProgress) { /*only release op if not in progress*/
 		linphone_chat_message_destroy(chat_msg);
 	}
 }
diff --git a/coreapi/chat.c b/coreapi/chat.c
index 989350544..dc7598f03 100644
--- a/coreapi/chat.c
+++ b/coreapi/chat.c
@@ -494,6 +494,17 @@ static void _linphone_chat_room_send_message(LinphoneChatRoom *cr, LinphoneChatM
 	linphone_chat_message_unref(msg);
 }
 
+void linphone_chat_message_update_state(LinphoneChatMessage* chat_msg ) {
+	linphone_chat_message_store_state(chat_msg);
+
+	if( chat_msg->state == LinphoneChatMessageStateDelivered
+			|| chat_msg->state == LinphoneChatMessageStateNotDelivered ){
+		// message is not transient anymore, we can remove it from our transient list and unref it :
+		chat_msg->chat_room->transient_messages = ms_list_remove(chat_msg->chat_room->transient_messages, chat_msg);
+		linphone_chat_message_unref(chat_msg);
+	}
+}
+
 /**
  * Send a message to peer member of this chat room.
  * @deprecated linphone_chat_room_send_message2() gives more control on the message expedition.
@@ -523,7 +534,7 @@ void linphone_core_message_received(LinphoneCore *lc, SalOp *op, const SalMessag
 	addr=linphone_address_new(sal_msg->from);
 	linphone_address_clean(addr);
 	cr=linphone_core_get_chat_room(lc,addr);
-	
+
 	if (sal_msg->content_type != NULL) { /* content_type field is, for now, used only for rcs file transfer but we shall strcmp it with "application/vnd.gsma.rcs-ft-http+xml" */
 		xmlChar *file_url = NULL;
 		xmlDocPtr xmlMessageBody;
diff --git a/coreapi/message_storage.c b/coreapi/message_storage.c
index 7e614ea95..55fc82685 100644
--- a/coreapi/message_storage.c
+++ b/coreapi/message_storage.c
@@ -202,7 +202,7 @@ static int linphone_chat_message_store_content(LinphoneChatMessage *msg) {
 						linphone_content_get_encoding(content),
 						linphone_content_get_size(content),
 						NULL
- 					);
+					);
 		linphone_sql_request(lc->db, buf);
 		sqlite3_free(buf);
 		id = (unsigned int) sqlite3_last_insert_rowid (lc->db);
@@ -237,7 +237,7 @@ unsigned int linphone_chat_message_store(LinphoneChatMessage *msg){
 						(int64_t)msg->time,
 						msg->appdata,
 						content_id
- 					);
+					);
 		linphone_sql_request(lc->db,buf);
 		sqlite3_free(buf);
 		ms_free(local_contact);
@@ -255,13 +255,6 @@ void linphone_chat_message_store_state(LinphoneChatMessage *msg){
 		linphone_sql_request(lc->db,buf);
 		sqlite3_free(buf);
 	}
-
-	if( msg->state == LinphoneChatMessageStateDelivered
-			|| msg->state == LinphoneChatMessageStateNotDelivered ){
-		// message is not transient anymore, we can remove it from our transient list:
-		msg->chat_room->transient_messages = ms_list_remove(msg->chat_room->transient_messages, msg);
-		linphone_chat_message_unref(msg);
-	}
 }
 
 void linphone_chat_message_store_appdata(LinphoneChatMessage* msg){
diff --git a/coreapi/private.h b/coreapi/private.h
index 808e1f57e..56f96fb2e 100644
--- a/coreapi/private.h
+++ b/coreapi/private.h
@@ -441,6 +441,7 @@ void _linphone_proxy_config_release_ops(LinphoneProxyConfig *obj);
 /*chat*/
 void linphone_chat_room_release(LinphoneChatRoom *cr);
 void linphone_chat_message_destroy(LinphoneChatMessage* msg);
+void linphone_chat_message_update_state(LinphoneChatMessage* chat_msg );
 /**/
 
 struct _LinphoneProxyConfig

From 4505528f3bad0e3fa242611782dcf3d0e66a3ead Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Mon, 24 Nov 2014 11:49:14 +0100
Subject: [PATCH 031/496] Update tester to preset the dynamic resource path
 before setting up the linphone core. This prevents error messages while
 testing on iOS

---
 tester/tester.c | 61 ++++++++++++++++++++++++++++++++++---------------
 1 file changed, 42 insertions(+), 19 deletions(-)

diff --git a/tester/tester.c b/tester/tester.c
index aa0bd3e8b..07ffa703a 100644
--- a/tester/tester.c
+++ b/tester/tester.c
@@ -109,36 +109,59 @@ void reset_counters( stats* counters) {
 
 static LinphoneCore* configure_lc_from(LinphoneCoreVTable* v_table, const char* path, const char* file, void* user_data) {
 	LinphoneCore* lc;
-	char filepath[256]={0};
-	char ringpath[256]={0};
-	char ringbackpath[256]={0};
-	char rootcapath[256]={0};
-	char dnsuserhostspath[256]={0};
-	char nowebcampath[256]={0};
+	LpConfig* config = NULL;
+	char *filepath         = NULL;
+	char *ringpath         = NULL;
+	char *ringbackpath     = NULL;
+	char *rootcapath       = NULL;
+	char *dnsuserhostspath = NULL;
+	char *nowebcampath     = NULL;
 
 	if (path==NULL) path=".";
 
 	if (file){
-		sprintf(filepath, "%s/%s", path, file);
+		filepath = ms_strdup_printf("%s/%s", path, file);
 		CU_ASSERT_TRUE_FATAL(ortp_file_exist(filepath)==0);
+		config = lp_config_new_with_factory(NULL,filepath);
 	}
 
-	lc =  linphone_core_new(v_table,NULL,*filepath!='\0' ? filepath : NULL, user_data);
+
+	// setup dynamic-path assets
+	ringpath         = ms_strdup_printf("%s/sounds/oldphone.wav",path);
+	ringbackpath     = ms_strdup_printf("%s/sounds/ringback.wav", path);
+	nowebcampath     = ms_strdup_printf("%s/images/nowebcamCIF.jpg", path);
+	rootcapath       = ms_strdup_printf("%s/certificates/cn/cafile.pem", path);
+	dnsuserhostspath = ms_strdup_printf( "%s/%s", path, userhostsfile);
+
+
+	if( config != NULL ) {
+		lp_config_set_string(config, "sound", "remote_ring", ringbackpath);
+		lp_config_set_string(config, "sound", "local_ring" , ringpath);
+		lp_config_set_string(config, "sip",   "root_ca"    , rootcapath);
+		lc = linphone_core_new_with_config(v_table, config, user_data);
+	} else {
+		lc = linphone_core_new(v_table,NULL,*filepath!='\0' ? filepath : NULL, user_data);
+
+		linphone_core_set_ring(lc, ringpath);
+		linphone_core_set_ringback(lc, ringbackpath);
+		linphone_core_set_root_ca(lc,rootcapath);
+	}
 
 	sal_enable_test_features(lc->sal,TRUE);
-	snprintf(rootcapath, sizeof(rootcapath), "%s/certificates/cn/cafile.pem", path);
-	linphone_core_set_root_ca(lc,rootcapath);
-
-	sprintf(dnsuserhostspath, "%s/%s", path, userhostsfile);
 	sal_set_dns_user_hosts_file(lc->sal, dnsuserhostspath);
-
-	snprintf(ringpath,sizeof(ringpath), "%s/sounds/oldphone.wav",path);
-	snprintf(ringbackpath,sizeof(ringbackpath), "%s/sounds/ringback.wav", path);
-	linphone_core_set_ring(lc, ringpath);
-	linphone_core_set_ringback(lc, ringbackpath);
-
-	snprintf(nowebcampath, sizeof(nowebcampath), "%s/images/nowebcamCIF.jpg", path);
 	linphone_core_set_static_picture(lc,nowebcampath);
+
+
+	ms_free(ringpath);
+	ms_free(ringbackpath);
+	ms_free(nowebcampath);
+	ms_free(rootcapath);
+	ms_free(dnsuserhostspath);
+
+	if( filepath ) ms_free(filepath);
+
+	if( config ) lp_config_unref(config);
+
 	return lc;
 }
 

From c377906553144f70b838dbcef82957e5126d889c Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Mon, 24 Nov 2014 12:29:25 +0100
Subject: [PATCH 032/496] Add autocompletion feature, simply source this file
 to enable it for bash and zsh shells

---
 tester/liblinphone_completion | 99 +++++++++++++++++++++++++++++++++++
 1 file changed, 99 insertions(+)
 create mode 100644 tester/liblinphone_completion

diff --git a/tester/liblinphone_completion b/tester/liblinphone_completion
new file mode 100644
index 000000000..6fae7fa27
--- /dev/null
+++ b/tester/liblinphone_completion
@@ -0,0 +1,99 @@
+# Copyright (C) 2012  Belledonne Comunications, Grenoble, France
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  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.
+
+# Created by Gautier Pelloux-Prayer on 2014/10/24.
+# This script adds auto-completion for liblinphone_tester binary for Bash and
+# zsh. To use it, just type: `source liblinphone_completion`, then use
+# `./liblinphone_tester [tab] to get auto-completions. To use it permanently,
+# source this file in your .rc file
+
+_liblinphone_complete() {
+	local completions command_require_argument latest_arg available_tasks has_not_set_suite suite_name
+	# these commands expect an argument
+	command_require_argument=(--list-tests --config --domain --auth-domain --dns-hosts --suite --test)
+
+
+	if [ -n "$BASH_VERSION" ]; then
+		set -- "${COMP_WORDS[@]}" #convert them to arguments (eg $1,$#,$@,etc.)
+	elif [ -n "$ZSH_VERSION" ]; then
+		local args
+		read -cA args #read list of arguments user entered
+		set -- "${args[@]}" #convert them to arguments (eg $1,$#,$@,etc.)
+	fi
+	#skip program name
+	shift
+
+
+	# if user required help, do not complete anything
+	if ! grep -q -- "--help" <<< "$@"; then
+
+		# retrieve the last argument
+		latest_arg=""
+		for arg in "$@"; do
+			if [ ! -z "$arg" ]; then
+				latest_arg="$arg"
+			fi
+		done
+
+		# get the tasks available, from --help
+		available_tasks="$(liblinphone_tester 2>&1 --help | sed -nE "s/.*--([^ ]*).*/--\\1/p")"
+		# remove all already provided tasks (it's useless to provide them twice)
+		if [[ ! -z "$@" ]]; then
+			current_tasks=$(echo $@ | grep -Eo -- "--([^ ])*" | tr '\n' '|' | sed 's/|/$|/g')--$
+			if [ ! -z "$current_tasks" ]; then
+				available_tasks=$(echo "$available_tasks" | grep -vE -- "(${current_tasks})")
+			fi
+		fi
+		# remove --test option if --suite is not provided yet!
+		has_not_set_suite=$(grep -q -- "--suite" <<< "$@"; echo $?)
+		if [ $has_not_set_suite = 1 ]; then
+			available_tasks=$(echo "$available_tasks" | grep -v -- --test)
+		fi
+
+		# if latest arg does not start with '--', it is a custom value; just output all available commands
+		if ! grep -q -- '^--' <<< "$latest_arg"; then
+			completions="$available_tasks"
+		elif [ "$latest_arg" = "--test" ]; then
+			if [ $has_not_set_suite = 0 ]; then
+				suite_name=$(echo $@ | sed -nE 's/.*--suite (.*) .*/\1/p')
+				completions="$(liblinphone_tester --list-tests "$suite_name")"
+			fi
+		elif [ "$latest_arg" = "--suite" ] || [ "$latest_arg" = "--list-tests" ]; then
+			completions="$(liblinphone_tester --list-suites)"
+		# we are waiting for a custom value, so do not hint anything
+		elif grep -q -- " $latest_arg " <<< "$command_require_argument"; then
+			completions=""
+		else
+			completions="$available_tasks"
+		fi
+	fi
+
+	if [ -n "$BASH_VERSION" ]; then
+		# COMPREPLY=( $(echo $completions | sed 's/ /\\ /g' )) #| sed -e 's/^/"/g' -e  's/$/"/g' | tr '\n' ' ') )
+		IFS=$'\n'
+		COMPREPLY=($(compgen -W "${completions}" -- ${COMP_WORDS[COMP_CWORD]}))
+	elif [ -n "$ZSH_VERSION" ]; then
+		reply=( "${(ps:\n:)completions}" )
+	fi
+}
+
+if [ -n "$BASH_VERSION" ]; then
+	complete -F _liblinphone_complete liblinphone_tester
+elif [ -n "$ZSH_VERSION" ]; then
+	compctl -K _liblinphone_complete liblinphone_tester
+else
+	echo "Your shell might be not supported! Only bash and zsh tested."
+fi

From e16e04567a15f54122cf70dfb6302935a30734e4 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Mon, 24 Nov 2014 14:09:39 +0100
Subject: [PATCH 033/496] better fix for  Call/Direct call over IPv6 on Android

---
 po/linphone.pot      | 1987 ------------------------------------------
 tester/call_tester.c |    4 +
 2 files changed, 4 insertions(+), 1987 deletions(-)
 delete mode 100644 po/linphone.pot

diff --git a/po/linphone.pot b/po/linphone.pot
deleted file mode 100644
index e4e16d2c5..000000000
--- a/po/linphone.pot
+++ /dev/null
@@ -1,1987 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-19 10:39+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-
-#: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974
-#, c-format
-msgid "Call %s"
-msgstr ""
-
-#: ../gtk/calllogs.c:149 ../gtk/friendlist.c:975
-#, c-format
-msgid "Send text to %s"
-msgstr ""
-
-#: ../gtk/calllogs.c:232
-#, c-format
-msgid "<b>Recent calls (%i)</b>"
-msgstr ""
-
-#: ../gtk/calllogs.c:314
-msgid "n/a"
-msgstr ""
-
-#: ../gtk/calllogs.c:317
-msgid "Aborted"
-msgstr ""
-
-#: ../gtk/calllogs.c:320
-msgid "Missed"
-msgstr ""
-
-#: ../gtk/calllogs.c:323
-msgid "Declined"
-msgstr ""
-
-#: ../gtk/calllogs.c:329
-#, c-format
-msgid "%i minute"
-msgid_plural "%i minutes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../gtk/calllogs.c:332
-#, c-format
-msgid "%i second"
-msgid_plural "%i seconds"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../gtk/calllogs.c:335 ../gtk/calllogs.c:341
-#, c-format
-msgid "<big><b>%s</b></big>\t%s"
-msgstr ""
-
-#: ../gtk/calllogs.c:337
-#, c-format
-msgid ""
-"<small><i>%s</i>\t<i>Quality: %s</i></small>\n"
-"%s\t%s\t"
-msgstr ""
-
-#: ../gtk/calllogs.c:343
-#, c-format
-msgid ""
-"<small><i>%s</i></small>\t\n"
-"%s"
-msgstr ""
-
-#: ../gtk/conference.c:38 ../gtk/main.ui.h:13
-msgid "Conference"
-msgstr ""
-
-#: ../gtk/conference.c:46
-msgid "Me"
-msgstr ""
-
-#: ../gtk/support.c:49 ../gtk/support.c:73 ../gtk/support.c:102
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr ""
-
-#: ../gtk/chat.c:364 ../gtk/friendlist.c:924
-msgid "Invalid sip contact !"
-msgstr ""
-
-#: ../gtk/main.c:107
-msgid "log to stdout some debug information while running."
-msgstr ""
-
-#: ../gtk/main.c:114
-msgid "path to a file to write logs into."
-msgstr ""
-
-#: ../gtk/main.c:121
-msgid "Start linphone with video disabled."
-msgstr ""
-
-#: ../gtk/main.c:128
-msgid "Start only in the system tray, do not show the main interface."
-msgstr ""
-
-#: ../gtk/main.c:135
-msgid "address to call right now"
-msgstr ""
-
-#: ../gtk/main.c:142
-msgid "if set automatically answer incoming calls"
-msgstr ""
-
-#: ../gtk/main.c:149
-msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: c:"
-"\\Program Files\\Linphone)"
-msgstr ""
-
-#: ../gtk/main.c:156
-msgid "Configuration file"
-msgstr ""
-
-#: ../gtk/main.c:163
-msgid "Run the audio assistant"
-msgstr ""
-
-#: ../gtk/main.c:1085
-#, c-format
-msgid ""
-"%s would like to add you to his contact list.\n"
-"Would you allow him to see your presence status or add him to your contact "
-"list ?\n"
-"If you answer no, this person will be temporarily blacklisted."
-msgstr ""
-
-#: ../gtk/main.c:1162
-#, c-format
-msgid ""
-"Please enter your password for username <i>%s</i>\n"
-" at realm <i>%s</i>:"
-msgstr ""
-
-#: ../gtk/main.c:1283
-msgid "Call error"
-msgstr ""
-
-#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3744
-msgid "Call ended"
-msgstr ""
-
-#: ../gtk/main.c:1289
-msgid "Incoming call"
-msgstr ""
-
-#: ../gtk/main.c:1291 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
-msgid "Answer"
-msgstr ""
-
-#: ../gtk/main.c:1293 ../gtk/main.ui.h:6
-msgid "Decline"
-msgstr ""
-
-#: ../gtk/main.c:1299
-msgid "Call paused"
-msgstr ""
-
-#: ../gtk/main.c:1299
-#, c-format
-msgid "<b>by %s</b>"
-msgstr ""
-
-#: ../gtk/main.c:1366
-#, c-format
-msgid "%s proposed to start video. Do you accept ?"
-msgstr ""
-
-#: ../gtk/main.c:1528
-msgid "Website link"
-msgstr ""
-
-#: ../gtk/main.c:1577
-msgid "Linphone - a video internet phone"
-msgstr ""
-
-#: ../gtk/main.c:1669
-#, c-format
-msgid "%s (Default)"
-msgstr ""
-
-#: ../gtk/main.c:2006 ../coreapi/callbacks.c:983
-#, c-format
-msgid "We are transferred to %s"
-msgstr ""
-
-#: ../gtk/main.c:2016
-msgid ""
-"No sound cards have been detected on this computer.\n"
-"You won't be able to send or receive audio calls."
-msgstr ""
-
-#: ../gtk/main.c:2157
-msgid "A free SIP video-phone"
-msgstr ""
-
-#: ../gtk/friendlist.c:505
-msgid "Add to addressbook"
-msgstr ""
-
-#: ../gtk/friendlist.c:691
-msgid "Presence status"
-msgstr ""
-
-#: ../gtk/friendlist.c:709 ../gtk/propertybox.c:552 ../gtk/contact.ui.h:1
-msgid "Name"
-msgstr ""
-
-#: ../gtk/friendlist.c:721
-msgid "Call"
-msgstr ""
-
-#: ../gtk/friendlist.c:726
-msgid "Chat"
-msgstr ""
-
-#: ../gtk/friendlist.c:756
-#, c-format
-msgid "Search in %s directory"
-msgstr ""
-
-#: ../gtk/friendlist.c:976
-#, c-format
-msgid "Edit contact '%s'"
-msgstr ""
-
-#: ../gtk/friendlist.c:977
-#, c-format
-msgid "Delete contact '%s'"
-msgstr ""
-
-#: ../gtk/friendlist.c:978
-#, c-format
-msgid "Delete chat history of '%s'"
-msgstr ""
-
-#: ../gtk/friendlist.c:1029
-#, c-format
-msgid "Add new contact from %s directory"
-msgstr ""
-
-#: ../gtk/propertybox.c:558
-msgid "Rate (Hz)"
-msgstr ""
-
-#: ../gtk/propertybox.c:564
-msgid "Status"
-msgstr ""
-
-#: ../gtk/propertybox.c:570
-msgid "IP Bitrate (kbit/s)"
-msgstr ""
-
-#: ../gtk/propertybox.c:577
-msgid "Parameters"
-msgstr ""
-
-#: ../gtk/propertybox.c:620 ../gtk/propertybox.c:763
-msgid "Enabled"
-msgstr ""
-
-#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763
-msgid "Disabled"
-msgstr ""
-
-#: ../gtk/propertybox.c:809
-msgid "Account"
-msgstr ""
-
-#: ../gtk/propertybox.c:1072
-msgid "English"
-msgstr ""
-
-#: ../gtk/propertybox.c:1073
-msgid "French"
-msgstr ""
-
-#: ../gtk/propertybox.c:1074
-msgid "Swedish"
-msgstr ""
-
-#: ../gtk/propertybox.c:1075
-msgid "Italian"
-msgstr ""
-
-#: ../gtk/propertybox.c:1076
-msgid "Spanish"
-msgstr ""
-
-#: ../gtk/propertybox.c:1077
-msgid "Brazilian Portugese"
-msgstr ""
-
-#: ../gtk/propertybox.c:1078
-msgid "Polish"
-msgstr ""
-
-#: ../gtk/propertybox.c:1079
-msgid "German"
-msgstr ""
-
-#: ../gtk/propertybox.c:1080
-msgid "Russian"
-msgstr ""
-
-#: ../gtk/propertybox.c:1081
-msgid "Japanese"
-msgstr ""
-
-#: ../gtk/propertybox.c:1082
-msgid "Dutch"
-msgstr ""
-
-#: ../gtk/propertybox.c:1083
-msgid "Hungarian"
-msgstr ""
-
-#: ../gtk/propertybox.c:1084
-msgid "Czech"
-msgstr ""
-
-#: ../gtk/propertybox.c:1085
-msgid "Chinese"
-msgstr ""
-
-#: ../gtk/propertybox.c:1086
-msgid "Traditional Chinese"
-msgstr ""
-
-#: ../gtk/propertybox.c:1087
-msgid "Norwegian"
-msgstr ""
-
-#: ../gtk/propertybox.c:1088
-msgid "Hebrew"
-msgstr ""
-
-#: ../gtk/propertybox.c:1089
-msgid "Serbian"
-msgstr ""
-
-#: ../gtk/propertybox.c:1156
-msgid ""
-"You need to restart linphone for the new language selection to take effect."
-msgstr ""
-
-#: ../gtk/propertybox.c:1234
-msgid "None"
-msgstr ""
-
-#: ../gtk/propertybox.c:1238
-msgid "SRTP"
-msgstr ""
-
-#: ../gtk/propertybox.c:1244
-msgid "ZRTP"
-msgstr ""
-
-#: ../gtk/update.c:80
-#, c-format
-msgid ""
-"A more recent version is availalble from %s.\n"
-"Would you like to open a browser to download it ?"
-msgstr ""
-
-#: ../gtk/update.c:91
-msgid "You are running the lastest version."
-msgstr ""
-
-#: ../gtk/buddylookup.c:85
-msgid "Firstname, Lastname"
-msgstr ""
-
-#: ../gtk/buddylookup.c:160
-msgid "Error communicating with server."
-msgstr ""
-
-#: ../gtk/buddylookup.c:164
-msgid "Connecting..."
-msgstr ""
-
-#: ../gtk/buddylookup.c:168
-msgid "Connected"
-msgstr ""
-
-#: ../gtk/buddylookup.c:172
-msgid "Receiving data..."
-msgstr ""
-
-#: ../gtk/buddylookup.c:180
-#, c-format
-msgid "Found %i contact"
-msgid_plural "Found %i contacts"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../gtk/setupwizard.c:34
-msgid ""
-"Welcome !\n"
-"This assistant will help you to use a SIP account for your calls."
-msgstr ""
-
-#: ../gtk/setupwizard.c:43
-msgid "Create an account on linphone.org"
-msgstr ""
-
-#: ../gtk/setupwizard.c:44
-msgid "I have already a linphone.org account and I just want to use it"
-msgstr ""
-
-#: ../gtk/setupwizard.c:45
-msgid "I have already a sip account and I just want to use it"
-msgstr ""
-
-#: ../gtk/setupwizard.c:46
-msgid "I want to specify a remote configuration URI"
-msgstr ""
-
-#: ../gtk/setupwizard.c:89
-msgid "Enter your linphone.org username"
-msgstr ""
-
-#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:79 ../gtk/ldap.ui.h:4
-msgid "Username:"
-msgstr ""
-
-#: ../gtk/setupwizard.c:104 ../gtk/password.ui.h:4 ../gtk/ldap.ui.h:5
-msgid "Password:"
-msgstr ""
-
-#: ../gtk/setupwizard.c:124
-msgid "Enter your account informations"
-msgstr ""
-
-#: ../gtk/setupwizard.c:140
-msgid "Username*"
-msgstr ""
-
-#: ../gtk/setupwizard.c:141
-msgid "Password*"
-msgstr ""
-
-#: ../gtk/setupwizard.c:144
-msgid "Domain*"
-msgstr ""
-
-#: ../gtk/setupwizard.c:145
-msgid "Proxy"
-msgstr ""
-
-#: ../gtk/setupwizard.c:317
-msgid "(*) Required fields"
-msgstr ""
-
-#: ../gtk/setupwizard.c:318
-msgid "Username: (*)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:320
-msgid "Password: (*)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:322
-msgid "Email: (*)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:324
-msgid "Confirm your password: (*)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:338
-msgid "Keep me informed with linphone updates"
-msgstr ""
-
-#: ../gtk/setupwizard.c:394
-msgid ""
-"Error, account not validated, username already used or server unreachable.\n"
-"Please go back and try again."
-msgstr ""
-
-#: ../gtk/setupwizard.c:405
-msgid "Thank you. Your account is now configured and ready for use."
-msgstr ""
-
-#: ../gtk/setupwizard.c:413
-msgid ""
-"Please validate your account by clicking on the link we just sent you by "
-"email.\n"
-"Then come back here and press Next button."
-msgstr ""
-
-#: ../gtk/setupwizard.c:600
-msgid "SIP account configuration assistant"
-msgstr ""
-
-#: ../gtk/setupwizard.c:618
-msgid "Welcome to the account setup assistant"
-msgstr ""
-
-#: ../gtk/setupwizard.c:623
-msgid "Account setup assistant"
-msgstr ""
-
-#: ../gtk/setupwizard.c:629
-msgid "Configure your account (step 1/1)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:634
-msgid "Enter your sip username (step 1/1)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:638
-msgid "Enter account information (step 1/2)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:647
-msgid "Validation (step 2/2)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:652
-msgid "Error"
-msgstr ""
-
-#: ../gtk/setupwizard.c:656 ../gtk/audio_assistant.c:527
-msgid "Terminating"
-msgstr ""
-
-#: ../gtk/incall_view.c:70 ../gtk/incall_view.c:94
-#, c-format
-msgid "Call #%i"
-msgstr ""
-
-#: ../gtk/incall_view.c:155
-#, c-format
-msgid "Transfer to call #%i with %s"
-msgstr ""
-
-#: ../gtk/incall_view.c:211 ../gtk/incall_view.c:214
-msgid "Not used"
-msgstr ""
-
-#: ../gtk/incall_view.c:221
-msgid "ICE not activated"
-msgstr ""
-
-#: ../gtk/incall_view.c:223
-msgid "ICE failed"
-msgstr ""
-
-#: ../gtk/incall_view.c:225
-msgid "ICE in progress"
-msgstr ""
-
-#: ../gtk/incall_view.c:227
-msgid "Going through one or more NATs"
-msgstr ""
-
-#: ../gtk/incall_view.c:229
-msgid "Direct"
-msgstr ""
-
-#: ../gtk/incall_view.c:231
-msgid "Through a relay server"
-msgstr ""
-
-#: ../gtk/incall_view.c:239
-msgid "uPnP not activated"
-msgstr ""
-
-#: ../gtk/incall_view.c:241
-msgid "uPnP in progress"
-msgstr ""
-
-#: ../gtk/incall_view.c:243
-msgid "uPnp not available"
-msgstr ""
-
-#: ../gtk/incall_view.c:245
-msgid "uPnP is running"
-msgstr ""
-
-#: ../gtk/incall_view.c:247
-msgid "uPnP failed"
-msgstr ""
-
-#: ../gtk/incall_view.c:257 ../gtk/incall_view.c:258
-msgid "Direct or through server"
-msgstr ""
-
-#: ../gtk/incall_view.c:267 ../gtk/incall_view.c:279
-#, c-format
-msgid ""
-"download: %f\n"
-"upload: %f (kbit/s)"
-msgstr ""
-
-#: ../gtk/incall_view.c:272 ../gtk/incall_view.c:274
-#, c-format
-msgid "%ix%i @ %f fps"
-msgstr ""
-
-#: ../gtk/incall_view.c:304
-#, c-format
-msgid "%.3f seconds"
-msgstr ""
-
-#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12
-msgid "Hang up"
-msgstr ""
-
-#: ../gtk/incall_view.c:511
-msgid "<b>Calling...</b>"
-msgstr ""
-
-#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:727
-msgid "00::00::00"
-msgstr ""
-
-#: ../gtk/incall_view.c:525
-msgid "<b>Incoming call</b>"
-msgstr ""
-
-#: ../gtk/incall_view.c:562
-msgid "good"
-msgstr ""
-
-#: ../gtk/incall_view.c:564
-msgid "average"
-msgstr ""
-
-#: ../gtk/incall_view.c:566
-msgid "poor"
-msgstr ""
-
-#: ../gtk/incall_view.c:568
-msgid "very poor"
-msgstr ""
-
-#: ../gtk/incall_view.c:570
-msgid "too bad"
-msgstr ""
-
-#: ../gtk/incall_view.c:571 ../gtk/incall_view.c:587
-msgid "unavailable"
-msgstr ""
-
-#: ../gtk/incall_view.c:679
-msgid "Secured by SRTP"
-msgstr ""
-
-#: ../gtk/incall_view.c:685
-#, c-format
-msgid "Secured by ZRTP - [auth token: %s]"
-msgstr ""
-
-#: ../gtk/incall_view.c:691
-msgid "Set unverified"
-msgstr ""
-
-#: ../gtk/incall_view.c:691 ../gtk/main.ui.h:4
-msgid "Set verified"
-msgstr ""
-
-#: ../gtk/incall_view.c:722
-msgid "In conference"
-msgstr ""
-
-#: ../gtk/incall_view.c:722
-msgid "<b>In call</b>"
-msgstr ""
-
-#: ../gtk/incall_view.c:758
-msgid "<b>Paused call</b>"
-msgstr ""
-
-#: ../gtk/incall_view.c:771
-#, c-format
-msgid "%02i::%02i::%02i"
-msgstr ""
-
-#: ../gtk/incall_view.c:794
-msgid "<b>Call ended.</b>"
-msgstr ""
-
-#: ../gtk/incall_view.c:825
-msgid "Transfer in progress"
-msgstr ""
-
-#: ../gtk/incall_view.c:828
-msgid "Transfer done."
-msgstr ""
-
-#: ../gtk/incall_view.c:831
-msgid "Transfer failed."
-msgstr ""
-
-#: ../gtk/incall_view.c:875
-msgid "Resume"
-msgstr ""
-
-#: ../gtk/incall_view.c:882 ../gtk/main.ui.h:9
-msgid "Pause"
-msgstr ""
-
-#: ../gtk/incall_view.c:948
-#, c-format
-msgid ""
-"<small><i>Recording into\n"
-"%s %s</i></small>"
-msgstr ""
-
-#: ../gtk/incall_view.c:948
-msgid "(Paused)"
-msgstr ""
-
-#: ../gtk/loginframe.c:88
-#, c-format
-msgid "Please enter login information for %s"
-msgstr ""
-
-#: ../gtk/config-fetching.c:57
-#, c-format
-msgid "fetching from %s"
-msgstr ""
-
-#: ../gtk/config-fetching.c:73
-#, c-format
-msgid "Downloading of remote configuration from %s failed."
-msgstr ""
-
-#: ../gtk/audio_assistant.c:98
-msgid "No voice detected"
-msgstr ""
-
-#: ../gtk/audio_assistant.c:99
-msgid "Too low"
-msgstr ""
-
-#: ../gtk/audio_assistant.c:100
-msgid "Good"
-msgstr ""
-
-#: ../gtk/audio_assistant.c:101
-msgid "Too loud"
-msgstr ""
-
-#: ../gtk/audio_assistant.c:318
-msgid ""
-"Welcome !\n"
-"This assistant will help you to configure audio settings for Linphone"
-msgstr ""
-
-#: ../gtk/audio_assistant.c:328
-msgid "Capture device"
-msgstr ""
-
-#: ../gtk/audio_assistant.c:329
-msgid "Recorded volume"
-msgstr ""
-
-#: ../gtk/audio_assistant.c:333
-msgid "No voice"
-msgstr ""
-
-#: ../gtk/audio_assistant.c:369
-msgid "Playback device"
-msgstr ""
-
-#: ../gtk/audio_assistant.c:370
-msgid "Play three beeps"
-msgstr ""
-
-#: ../gtk/audio_assistant.c:403
-msgid "Press the record button and say some words"
-msgstr ""
-
-#: ../gtk/audio_assistant.c:404
-msgid "Listen to your record voice"
-msgstr ""
-
-#: ../gtk/audio_assistant.c:433
-msgid "Let's start Linphone now"
-msgstr ""
-
-#: ../gtk/audio_assistant.c:496
-msgid "Audio Assistant"
-msgstr ""
-
-#: ../gtk/audio_assistant.c:506 ../gtk/main.ui.h:31
-msgid "Audio assistant"
-msgstr ""
-
-#: ../gtk/audio_assistant.c:511
-msgid "Mic Gain calibration"
-msgstr ""
-
-#: ../gtk/audio_assistant.c:517
-msgid "Speaker volume calibration"
-msgstr ""
-
-#: ../gtk/audio_assistant.c:522
-msgid "Record and Play"
-msgstr ""
-
-#: ../gtk/main.ui.h:1
-msgid "<b>Callee name</b>"
-msgstr ""
-
-#: ../gtk/main.ui.h:2
-msgid "Send"
-msgstr ""
-
-#: ../gtk/main.ui.h:3
-msgid "End conference"
-msgstr ""
-
-#: ../gtk/main.ui.h:7
-msgid "Record this call to an audio file"
-msgstr ""
-
-#: ../gtk/main.ui.h:8
-msgid "Video"
-msgstr ""
-
-#: ../gtk/main.ui.h:10
-msgid "Mute"
-msgstr ""
-
-#: ../gtk/main.ui.h:11
-msgid "Transfer"
-msgstr ""
-
-#: ../gtk/main.ui.h:14
-msgid "In call"
-msgstr ""
-
-#: ../gtk/main.ui.h:15
-msgid "Duration"
-msgstr ""
-
-#: ../gtk/main.ui.h:16
-msgid "Call quality rating"
-msgstr ""
-
-#: ../gtk/main.ui.h:17
-msgid "All users"
-msgstr ""
-
-#: ../gtk/main.ui.h:18
-msgid "Online users"
-msgstr ""
-
-#: ../gtk/main.ui.h:19
-msgid "ADSL"
-msgstr ""
-
-#: ../gtk/main.ui.h:20
-msgid "Fiber Channel"
-msgstr ""
-
-#: ../gtk/main.ui.h:21
-msgid "Default"
-msgstr ""
-
-#: ../gtk/main.ui.h:22
-msgid "_Options"
-msgstr ""
-
-#: ../gtk/main.ui.h:23
-msgid "Set configuration URI"
-msgstr ""
-
-#: ../gtk/main.ui.h:24
-msgid "Always start video"
-msgstr ""
-
-#: ../gtk/main.ui.h:25
-msgid "Enable self-view"
-msgstr ""
-
-#: ../gtk/main.ui.h:26
-msgid "_Help"
-msgstr ""
-
-#: ../gtk/main.ui.h:27
-msgid "Show debug window"
-msgstr ""
-
-#: ../gtk/main.ui.h:28
-msgid "_Homepage"
-msgstr ""
-
-#: ../gtk/main.ui.h:29
-msgid "Check _Updates"
-msgstr ""
-
-#: ../gtk/main.ui.h:30
-msgid "Account assistant"
-msgstr ""
-
-#: ../gtk/main.ui.h:32
-msgid "SIP address or phone number:"
-msgstr ""
-
-#: ../gtk/main.ui.h:33
-msgid "Initiate a new call"
-msgstr ""
-
-#: ../gtk/main.ui.h:34
-msgid "Contacts"
-msgstr ""
-
-#: ../gtk/main.ui.h:35
-msgid "Search"
-msgstr ""
-
-#: ../gtk/main.ui.h:36
-msgid "<b>Add contacts from directory</b>"
-msgstr ""
-
-#: ../gtk/main.ui.h:37
-msgid "Add contact"
-msgstr ""
-
-#: ../gtk/main.ui.h:38
-msgid "Recent calls"
-msgstr ""
-
-#: ../gtk/main.ui.h:39
-msgid "My current identity:"
-msgstr ""
-
-#: ../gtk/main.ui.h:40 ../gtk/tunnel_config.ui.h:7
-msgid "Username"
-msgstr ""
-
-#: ../gtk/main.ui.h:41 ../gtk/tunnel_config.ui.h:8
-msgid "Password"
-msgstr ""
-
-#: ../gtk/main.ui.h:42
-msgid "Internet connection:"
-msgstr ""
-
-#: ../gtk/main.ui.h:43
-msgid "Automatically log me in"
-msgstr ""
-
-#: ../gtk/main.ui.h:44 ../gtk/password.ui.h:3
-msgid "UserID"
-msgstr ""
-
-#: ../gtk/main.ui.h:45
-msgid "Login information"
-msgstr ""
-
-#: ../gtk/main.ui.h:46
-msgid "<b>Welcome !</b>"
-msgstr ""
-
-#: ../gtk/main.ui.h:47
-msgid "Delete"
-msgstr ""
-
-#: ../gtk/about.ui.h:1
-msgid "About linphone"
-msgstr ""
-
-#: ../gtk/about.ui.h:2
-msgid "(C) Belledonne Communications,2010\n"
-msgstr ""
-
-#: ../gtk/about.ui.h:4
-msgid "An internet video phone using the standard SIP (rfc3261) protocol."
-msgstr ""
-
-#: ../gtk/about.ui.h:5
-msgid ""
-"fr: Simon Morlat\n"
-"en: Simon Morlat and Delphine Perreau\n"
-"it: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\n"
-"de: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\n"
-"sv: Daniel Nylander <po@danielnylander.se>\n"
-"es: Jesus Benitez <gnelson at inMail dot sk>\n"
-"ja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\n"
-"pt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\n"
-"pl: Robert Nasiadek <darkone@darkone.pl>\n"
-"cs: Petr Pisar <petr.pisar@atlas.cz>\n"
-"hu: anonymous\n"
-"he: Eli Zaretskii <eliz@gnu.org>\n"
-msgstr ""
-
-#: ../gtk/contact.ui.h:2
-msgid "SIP Address"
-msgstr ""
-
-#: ../gtk/contact.ui.h:3
-msgid "Show this contact presence status"
-msgstr ""
-
-#: ../gtk/contact.ui.h:4
-msgid "Allow this contact to see my presence status"
-msgstr ""
-
-#: ../gtk/contact.ui.h:5
-msgid "<b>Contact information</b>"
-msgstr ""
-
-#: ../gtk/log.ui.h:1
-msgid "Linphone debug window"
-msgstr ""
-
-#: ../gtk/log.ui.h:2
-msgid "Scroll to end"
-msgstr ""
-
-#: ../gtk/password.ui.h:1
-msgid "Linphone - Authentication required"
-msgstr ""
-
-#: ../gtk/password.ui.h:2
-msgid "Please enter the domain password"
-msgstr ""
-
-#: ../gtk/call_logs.ui.h:1
-msgid "Call history"
-msgstr ""
-
-#: ../gtk/call_logs.ui.h:2
-msgid "Clear all"
-msgstr ""
-
-#: ../gtk/call_logs.ui.h:3
-msgid "Call back"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:1
-msgid "Linphone - Configure a SIP account"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:2
-msgid "Your SIP identity:"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:3
-msgid "Looks like sip:<username>@<domain>"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:4
-msgid "sip:"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:5
-msgid "SIP Proxy address:"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:6
-msgid "Looks like sip:<proxy hostname>"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:7
-msgid "Registration duration (sec):"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:8
-msgid "Contact params (optional):"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:9
-msgid "AVPF regular RTCP interval (sec):"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:10
-msgid "Route (optional):"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:11
-msgid "Transport"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:12
-msgid "Register"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:13
-msgid "Publish presence information"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:14
-msgid "Enable AVPF"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:15
-msgid "Configure a SIP account"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:1
-msgid "anonymous"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:2
-msgid "GSSAPI"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:3
-msgid "SASL"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:4
-msgid "default soundcard"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:5
-msgid "a sound card"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:6
-msgid "default camera"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:7
-msgid "CIF"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:8
-msgid "Audio codecs"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:9
-msgid "Video codecs"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:10 ../gtk/keypad.ui.h:5
-msgid "C"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:11
-msgid "SIP (UDP)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:12
-msgid "SIP (TCP)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:13
-msgid "SIP (TLS)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:14
-msgid "Settings"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:15
-msgid "Set Maximum Transmission Unit:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:16
-msgid "Send DTMFs as SIP info"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:17
-msgid "Use IPv6 instead of IPv4"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:18
-msgid "<b>Transport</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:19
-msgid "Media encryption type"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:20
-msgid "Video RTP/UDP:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:21
-msgid "Audio RTP/UDP:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:22
-msgid "Fixed"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:23
-msgid "Media encryption is mandatory"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:24
-msgid "Tunnel"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:25
-msgid "DSCP fields"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:26
-msgid "SIP/TCP port"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:27
-msgid "SIP/UDP port"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:28
-msgid "<b>Network protocol and ports</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:29
-msgid "Direct connection to the Internet"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:30
-msgid "Behind NAT / Firewall (specify gateway IP )"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:31
-msgid "Behind NAT / Firewall (use STUN to resolve)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:32
-msgid "Behind NAT / Firewall (use ICE)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:33
-msgid "Behind NAT / Firewall (use uPnP)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:34
-msgid "Public IP address:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:35
-msgid "Stun server:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:36
-msgid "<b>NAT and Firewall</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:37
-msgid "Network settings"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:38
-msgid "Ring sound:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:39
-msgid "ALSA special device (optional):"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:40
-msgid "Capture device:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:41
-msgid "Ring device:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:42
-msgid "Playback device:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:43
-msgid "Enable echo cancellation"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:44
-msgid "<b>Audio</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:45
-msgid "Video input device:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:46
-msgid "Prefered video resolution:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:47
-msgid "Video output method:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:48
-msgid "<b>Video</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:49
-msgid "Multimedia settings"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:50
-msgid "This section defines your SIP address when not using a SIP account"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:51
-msgid "Your display name (eg: John Doe):"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:52
-msgid "Your username:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:53
-msgid "Your resulting SIP address:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:54
-msgid "<b>Default identity</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:55
-msgid "Wizard"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:56
-msgid "Add"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:57
-msgid "Edit"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:58
-msgid "Remove"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:59
-msgid "<b>Proxy accounts</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:60
-msgid "Erase all passwords"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:61
-msgid "<b>Privacy</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:62
-msgid "Manage SIP Accounts"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:63 ../gtk/tunnel_config.ui.h:4
-msgid "Enable"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:64 ../gtk/tunnel_config.ui.h:5
-msgid "Disable"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:65
-msgid "<b>Codecs</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:66
-msgid "0 stands for \"unlimited\""
-msgstr ""
-
-#: ../gtk/parameters.ui.h:67
-msgid "Upload speed limit in Kbit/sec:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:68
-msgid "Download speed limit in Kbit/sec:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:69
-msgid "Enable adaptive rate control"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:70
-msgid ""
-"<i>Adaptive rate control is a technique to dynamically guess the available "
-"bandwidth during a call.</i>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:71
-msgid "<b>Bandwidth control</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:72
-msgid "Codecs"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:73
-msgid "<b>Language</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:74
-msgid "Show advanced settings"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:75
-msgid "<b>Level</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:76
-msgid "User interface"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:77 ../gtk/ldap.ui.h:2
-msgid "Server address:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:78 ../gtk/ldap.ui.h:3
-msgid "Authentication method:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:80
-msgid "label"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:81
-msgid "<b>LDAP Account setup</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:82
-msgid "LDAP"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:83
-msgid "Done"
-msgstr ""
-
-#: ../gtk/buddylookup.ui.h:1
-msgid "Search contacts in directory"
-msgstr ""
-
-#: ../gtk/buddylookup.ui.h:2
-msgid "Add to my list"
-msgstr ""
-
-#: ../gtk/buddylookup.ui.h:3
-msgid "<b>Search somebody</b>"
-msgstr ""
-
-#: ../gtk/waiting.ui.h:1
-msgid "Linphone"
-msgstr ""
-
-#: ../gtk/waiting.ui.h:2
-msgid "Please wait"
-msgstr ""
-
-#: ../gtk/dscp_settings.ui.h:1
-msgid "DSCP settings"
-msgstr ""
-
-#: ../gtk/dscp_settings.ui.h:2
-msgid "SIP"
-msgstr ""
-
-#: ../gtk/dscp_settings.ui.h:3
-msgid "Audio RTP stream"
-msgstr ""
-
-#: ../gtk/dscp_settings.ui.h:4
-msgid "Video RTP stream"
-msgstr ""
-
-#: ../gtk/dscp_settings.ui.h:5
-msgid "<b>Set DSCP values (in hexadecimal)</b>"
-msgstr ""
-
-#: ../gtk/call_statistics.ui.h:1
-msgid "Call statistics"
-msgstr ""
-
-#: ../gtk/call_statistics.ui.h:2
-msgid "Audio codec"
-msgstr ""
-
-#: ../gtk/call_statistics.ui.h:3
-msgid "Video codec"
-msgstr ""
-
-#: ../gtk/call_statistics.ui.h:4
-msgid "Audio IP bandwidth usage"
-msgstr ""
-
-#: ../gtk/call_statistics.ui.h:5
-msgid "Audio Media connectivity"
-msgstr ""
-
-#: ../gtk/call_statistics.ui.h:6
-msgid "Video IP bandwidth usage"
-msgstr ""
-
-#: ../gtk/call_statistics.ui.h:7
-msgid "Video Media connectivity"
-msgstr ""
-
-#: ../gtk/call_statistics.ui.h:8
-msgid "Round trip time"
-msgstr ""
-
-#: ../gtk/call_statistics.ui.h:9
-msgid "Video resolution received"
-msgstr ""
-
-#: ../gtk/call_statistics.ui.h:10
-msgid "Video resolution sent"
-msgstr ""
-
-#: ../gtk/call_statistics.ui.h:11
-msgid "RTP profile"
-msgstr ""
-
-#: ../gtk/call_statistics.ui.h:12
-msgid "<b>Call statistics and information</b>"
-msgstr ""
-
-#: ../gtk/tunnel_config.ui.h:1
-msgid "Configure VoIP tunnel"
-msgstr ""
-
-#: ../gtk/tunnel_config.ui.h:2
-msgid "Host"
-msgstr ""
-
-#: ../gtk/tunnel_config.ui.h:3
-msgid "Port"
-msgstr ""
-
-#: ../gtk/tunnel_config.ui.h:6
-msgid "<b>Configure tunnel</b>"
-msgstr ""
-
-#: ../gtk/tunnel_config.ui.h:9
-msgid "<b>Configure http proxy (optional)</b>"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:1
-msgid "D"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:2
-msgid "#"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:3
-msgid "0"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:4
-msgid "*"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:6
-msgid "9"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:7
-msgid "8"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:8
-msgid "7"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:9
-msgid "B"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:10
-msgid "6"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:11
-msgid "5"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:12
-msgid "4"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:13
-msgid "A"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:14
-msgid "3"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:15
-msgid "2"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:16
-msgid "1"
-msgstr ""
-
-#: ../gtk/ldap.ui.h:1
-msgid "LDAP Settings"
-msgstr ""
-
-#: ../gtk/ldap.ui.h:6
-msgid "Use TLS Connection"
-msgstr ""
-
-#: ../gtk/ldap.ui.h:7
-msgid "Not yet available"
-msgstr ""
-
-#: ../gtk/ldap.ui.h:8
-msgid "<b>Connection</b>"
-msgstr ""
-
-#: ../gtk/ldap.ui.h:9
-msgid "Bind DN"
-msgstr ""
-
-#: ../gtk/ldap.ui.h:10
-msgid "Authname"
-msgstr ""
-
-#: ../gtk/ldap.ui.h:11
-msgid "Realm"
-msgstr ""
-
-#: ../gtk/ldap.ui.h:12
-msgid "<b>SASL</b>"
-msgstr ""
-
-#: ../gtk/ldap.ui.h:13
-msgid "Base object:"
-msgstr ""
-
-#: ../gtk/ldap.ui.h:15
-#, no-c-format
-msgid "Filter (%s for name):"
-msgstr ""
-
-#: ../gtk/ldap.ui.h:16
-msgid "Name Attribute:"
-msgstr ""
-
-#: ../gtk/ldap.ui.h:17
-msgid "SIP address attribute:"
-msgstr ""
-
-#: ../gtk/ldap.ui.h:18
-msgid "Attributes to query:"
-msgstr ""
-
-#: ../gtk/ldap.ui.h:19
-msgid "<b>Search</b>"
-msgstr ""
-
-#: ../gtk/ldap.ui.h:20
-msgid "Timeout for search:"
-msgstr ""
-
-#: ../gtk/ldap.ui.h:21
-msgid "Max results:"
-msgstr ""
-
-#: ../gtk/ldap.ui.h:22
-msgid "Follow Aliases"
-msgstr ""
-
-#: ../gtk/ldap.ui.h:23
-msgid "<b>Miscellaneous</b>"
-msgstr ""
-
-#: ../gtk/ldap.ui.h:24
-msgid "ANONYMOUS"
-msgstr ""
-
-#: ../gtk/ldap.ui.h:25
-msgid "SIMPLE"
-msgstr ""
-
-#: ../gtk/ldap.ui.h:26
-msgid "DIGEST-MD5"
-msgstr ""
-
-#: ../gtk/ldap.ui.h:27
-msgid "NTLM"
-msgstr ""
-
-#: ../gtk/config-uri.ui.h:1
-msgid "Specifying a remote configuration URI"
-msgstr ""
-
-#: ../gtk/config-uri.ui.h:2
-msgid ""
-"This dialog allows to set an http or https address when configuration is to "
-"be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, "
-"Linphone will restart automatically in order to fetch and take into account "
-"the new configuration. "
-msgstr ""
-
-#: ../gtk/config-uri.ui.h:4
-msgid "https://"
-msgstr ""
-
-#: ../gtk/provisioning-fetch.ui.h:1
-msgid "Configuring..."
-msgstr ""
-
-#: ../gtk/provisioning-fetch.ui.h:2
-msgid "Please wait while fetching configuration from server..."
-msgstr ""
-
-#: ../coreapi/linphonecore.c:1511
-msgid "Ready"
-msgstr ""
-
-#: ../coreapi/linphonecore.c:2470
-msgid "Configuring"
-msgstr ""
-
-#: ../coreapi/linphonecore.c:2635
-msgid "Looking for telephone number destination..."
-msgstr ""
-
-#: ../coreapi/linphonecore.c:2637
-msgid "Could not resolve this number."
-msgstr ""
-
-#. must be known at that time
-#: ../coreapi/linphonecore.c:2919
-msgid "Contacting"
-msgstr ""
-
-#: ../coreapi/linphonecore.c:2924
-msgid "Could not call"
-msgstr ""
-
-#: ../coreapi/linphonecore.c:3074
-msgid "Sorry, we have reached the maximum number of simultaneous calls"
-msgstr ""
-
-#: ../coreapi/linphonecore.c:3233
-msgid "is contacting you"
-msgstr ""
-
-#: ../coreapi/linphonecore.c:3234
-msgid " and asked autoanswer."
-msgstr ""
-
-#: ../coreapi/linphonecore.c:3234
-msgid "."
-msgstr ""
-
-#: ../coreapi/linphonecore.c:3352
-msgid "Modifying call parameters..."
-msgstr ""
-
-#: ../coreapi/linphonecore.c:3700
-msgid "Connected."
-msgstr ""
-
-#: ../coreapi/linphonecore.c:3725
-msgid "Call aborted"
-msgstr ""
-
-#: ../coreapi/linphonecore.c:3915
-msgid "Could not pause the call"
-msgstr ""
-
-#: ../coreapi/linphonecore.c:3919
-msgid "Pausing the current call..."
-msgstr ""
-
-#: ../coreapi/misc.c:438
-msgid "Stun lookup in progress..."
-msgstr ""
-
-#: ../coreapi/misc.c:619
-msgid "ICE local candidates gathering in progress..."
-msgstr ""
-
-#: ../coreapi/friend.c:33
-msgid "Online"
-msgstr ""
-
-#: ../coreapi/friend.c:36
-msgid "Busy"
-msgstr ""
-
-#: ../coreapi/friend.c:39
-msgid "Be right back"
-msgstr ""
-
-#: ../coreapi/friend.c:42
-msgid "Away"
-msgstr ""
-
-#: ../coreapi/friend.c:45
-msgid "On the phone"
-msgstr ""
-
-#: ../coreapi/friend.c:48
-msgid "Out to lunch"
-msgstr ""
-
-#: ../coreapi/friend.c:51
-msgid "Do not disturb"
-msgstr ""
-
-#: ../coreapi/friend.c:54
-msgid "Moved"
-msgstr ""
-
-#: ../coreapi/friend.c:57
-msgid "Using another messaging service"
-msgstr ""
-
-#: ../coreapi/friend.c:60
-msgid "Offline"
-msgstr ""
-
-#: ../coreapi/friend.c:63
-msgid "Pending"
-msgstr ""
-
-#: ../coreapi/friend.c:66
-msgid "Vacation"
-msgstr ""
-
-#: ../coreapi/friend.c:68
-msgid "Unknown-bug"
-msgstr ""
-
-#: ../coreapi/proxy.c:319
-msgid ""
-"The sip proxy address you entered is invalid, it must start with \"sip:\" "
-"followed by a hostname."
-msgstr ""
-
-#: ../coreapi/proxy.c:325
-msgid ""
-"The sip identity you entered is invalid.\n"
-"It should look like sip:username@proxydomain, such as sip:alice@example.net"
-msgstr ""
-
-#: ../coreapi/proxy.c:1377
-#, c-format
-msgid "Could not login as %s"
-msgstr ""
-
-#: ../coreapi/callbacks.c:383
-msgid "Remote ringing."
-msgstr ""
-
-#: ../coreapi/callbacks.c:404
-msgid "Remote ringing..."
-msgstr ""
-
-#: ../coreapi/callbacks.c:414
-msgid "Early media."
-msgstr ""
-
-#: ../coreapi/callbacks.c:475
-#, c-format
-msgid "Call with %s is paused."
-msgstr ""
-
-#: ../coreapi/callbacks.c:488
-#, c-format
-msgid "Call answered by %s - on hold."
-msgstr ""
-
-#: ../coreapi/callbacks.c:498
-msgid "Call resumed."
-msgstr ""
-
-#: ../coreapi/callbacks.c:502
-#, c-format
-msgid "Call answered by %s."
-msgstr ""
-
-#: ../coreapi/callbacks.c:525
-msgid "Incompatible, check codecs or security settings..."
-msgstr ""
-
-#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:826
-msgid "Incompatible media parameters."
-msgstr ""
-
-#: ../coreapi/callbacks.c:560
-msgid "We have been resumed."
-msgstr ""
-
-#. we are being paused
-#: ../coreapi/callbacks.c:568
-msgid "We are paused by other party."
-msgstr ""
-
-#. reINVITE and in-dialogs UPDATE go here
-#: ../coreapi/callbacks.c:602
-msgid "Call is updated by remote."
-msgstr ""
-
-#: ../coreapi/callbacks.c:705
-msgid "Call terminated."
-msgstr ""
-
-#: ../coreapi/callbacks.c:733
-msgid "User is busy."
-msgstr ""
-
-#: ../coreapi/callbacks.c:734
-msgid "User is temporarily unavailable."
-msgstr ""
-
-#. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:736
-msgid "User does not want to be disturbed."
-msgstr ""
-
-#: ../coreapi/callbacks.c:737
-msgid "Call declined."
-msgstr ""
-
-#: ../coreapi/callbacks.c:752
-msgid "Request timeout."
-msgstr ""
-
-#: ../coreapi/callbacks.c:780
-msgid "Redirected"
-msgstr ""
-
-#: ../coreapi/callbacks.c:835
-msgid "Call failed."
-msgstr ""
-
-#: ../coreapi/callbacks.c:913
-#, c-format
-msgid "Registration on %s successful."
-msgstr ""
-
-#: ../coreapi/callbacks.c:914
-#, c-format
-msgid "Unregistration on %s done."
-msgstr ""
-
-#: ../coreapi/callbacks.c:932
-msgid "no response timeout"
-msgstr ""
-
-#: ../coreapi/callbacks.c:935
-#, c-format
-msgid "Registration on %s failed: %s"
-msgstr ""
-
-#: ../coreapi/callbacks.c:942
-msgid "Service unavailable, retrying"
-msgstr ""
-
-#: ../coreapi/linphonecall.c:174
-#, c-format
-msgid "Authentication token is %s"
-msgstr ""
-
-#: ../coreapi/linphonecall.c:3020
-#, c-format
-msgid "You have missed %i call."
-msgid_plural "You have missed %i calls."
-msgstr[0] ""
-msgstr[1] ""
diff --git a/tester/call_tester.c b/tester/call_tester.c
index fbc413905..ff385b7a5 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -361,9 +361,13 @@ static void direct_call_over_ipv6(){
 	if (liblinphone_tester_ipv6_available()){
 		LCSipTransports pauline_transports;
 		LinphoneAddress* pauline_dest = linphone_address_new("sip:[::1];transport=tcp");
+		char hellopath[256];
 		marie = linphone_core_manager_new( "marie_rc");
 		pauline = linphone_core_manager_new( "pauline_tcp_rc");
 
+		/*use playfile for callee to avoid locking on capture card*/
+		snprintf(hellopath,sizeof(hellopath), "%s/sounds/hello8000.wav", liblinphone_tester_file_prefix);
+		linphone_core_set_play_file(pauline->lc,hellopath);
 		linphone_core_use_files (pauline->lc,TRUE);
 
 		linphone_core_enable_ipv6(marie->lc,TRUE);

From 4ac1ccdf05d2877beca5289c5361a7e952dc5018 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Mon, 24 Nov 2014 14:45:10 +0100
Subject: [PATCH 034/496] Handle the callbacks associated with a chat message
 directly in the LinphoneChatMessage object instead of in the LinphoneCore
 object.

---
 coreapi/callbacks.c         |  11 +-
 coreapi/chat.c              | 234 +++++++++++++++++++++++++++++++++---
 coreapi/help/filetransfer.c |  28 +++--
 coreapi/linphonecore.h      |  70 ++++++++++-
 coreapi/private.h           |  13 ++
 gtk/chat.c                  |   7 +-
 tester/liblinphone_tester.h |   7 +-
 tester/message_tester.c     |  80 ++++++++----
 tester/tester.c             |   3 -
 9 files changed, 386 insertions(+), 67 deletions(-)

diff --git a/coreapi/callbacks.c b/coreapi/callbacks.c
index 363272324..0cc5bf6fa 100644
--- a/coreapi/callbacks.c
+++ b/coreapi/callbacks.c
@@ -1172,11 +1172,14 @@ static void text_delivery_update(SalOp *op, SalTextDeliveryStatus status){
 	chat_msg->state=chatStatusSal2Linphone(status);
 	linphone_chat_message_update_state(chat_msg);
 
-	if (chat_msg && chat_msg->cb) {
+	if (chat_msg && (chat_msg->cb || (chat_msg->callbacks && linphone_chat_message_cbs_get_msg_state_changed(chat_msg->callbacks)))) {
 		ms_message("Notifying text delivery with status %i",chat_msg->state);
-		chat_msg->cb(chat_msg
-			,chat_msg->state
-			,chat_msg->cb_ud);
+		if (chat_msg->callbacks && linphone_chat_message_cbs_get_msg_state_changed(chat_msg->callbacks)) {
+			linphone_chat_message_cbs_get_msg_state_changed(chat_msg->callbacks)(chat_msg, chat_msg->state);
+		} else {
+			/* Legacy */
+			chat_msg->cb(chat_msg,chat_msg->state,chat_msg->cb_ud);
+		}
 	}
 	if (status != SalTextDeliveryInProgress) { /*only release op if not in progress*/
 		linphone_chat_message_destroy(chat_msg);
diff --git a/coreapi/chat.c b/coreapi/chat.c
index dc7598f03..6302af243 100644
--- a/coreapi/chat.c
+++ b/coreapi/chat.c
@@ -35,6 +35,139 @@
 #define COMPOSING_DEFAULT_REMOTE_REFRESH_TIMEOUT 120
 
 
+static LinphoneChatMessageCbs * linphone_chat_message_cbs_new(void) {
+	return belle_sip_object_new(LinphoneChatMessageCbs);
+}
+
+BELLE_SIP_DECLARE_NO_IMPLEMENTED_INTERFACES(LinphoneChatMessageCbs);
+
+BELLE_SIP_INSTANCIATE_VPTR(LinphoneChatMessageCbs, belle_sip_object_t,
+	NULL, // destroy
+	NULL, // clone
+	NULL, // marshal
+	FALSE
+);
+
+
+/**
+ * @addtogroup chatroom
+ * @{
+ */
+
+/**
+ * Acquire a reference to the LinphoneChatMessageCbs object.
+ * @param[in] cbs LinphoneChatMessageCbs object.
+ * @return The same LinphoneChatMessageCbs object.
+ */
+LinphoneChatMessageCbs * linphone_chat_message_cbs_ref(LinphoneChatMessageCbs *cbs) {
+	belle_sip_object_ref(cbs);
+	return cbs;
+}
+
+/**
+ * Release reference to the LinphoneChatMessageCbs object.
+ * @param[in] cbs LinphoneChatMessageCbs object.
+ */
+void linphone_chat_message_cbs_unref(LinphoneChatMessageCbs *cbs) {
+	belle_sip_object_unref(cbs);
+}
+
+/**
+ * Retrieve the user pointer associated with the LinphoneChatMessageCbs object.
+ * @param[in] cbs LinphoneChatMessageCbs object.
+ * @return The user pointer associated with the LinphoneChatMessageCbs object.
+ */
+void *linphone_chat_message_cbs_get_user_data(const LinphoneChatMessageCbs *cbs) {
+	return cbs->user_data;
+}
+
+/**
+ * Assign a user pointer to the LinphoneChatMessageCbs object.
+ * @param[in] cbs LinphoneChatMessageCbs object.
+ * @param[in] ud The user pointer to associate with the LinphoneChatMessageCbs object.
+ */
+void linphone_chat_message_cbs_set_user_data(LinphoneChatMessageCbs *cbs, void *ud) {
+	cbs->user_data = ud;
+}
+
+/**
+ * Get the message state changed callback.
+ * @param[in] cbs LinphoneChatMessageCbs object.
+ * @return The current message state changed callback.
+ */
+LinphoneChatMessageMsgStateChangedCb linphone_chat_message_cbs_get_msg_state_changed(const LinphoneChatMessageCbs *cbs) {
+	return cbs->msg_state_changed;
+}
+
+/**
+ * Set the message state changed callback.
+ * @param[in] cbs LinphoneChatMessageCbs object.
+ * @param[in] cb The message state changed callback to be used.
+ */
+void linphone_chat_message_cbs_set_msg_state_changed(LinphoneChatMessageCbs *cbs, LinphoneChatMessageMsgStateChangedCb cb) {
+	cbs->msg_state_changed = cb;
+}
+
+/**
+ * Get the file transfer receive callback.
+ * @param[in] cbs LinphoneChatMessageCbs object.
+ * @return The current file transfer receive callback.
+ */
+LinphoneChatMessageFileTransferRecvCb linphone_chat_message_cbs_get_file_transfer_recv(const LinphoneChatMessageCbs *cbs) {
+	return cbs->file_transfer_recv;
+}
+
+/**
+ * Set the file transfer receive callback.
+ * @param[in] cbs LinphoneChatMessageCbs object.
+ * @param[in] cb The file transfer receive callback to be used.
+ */
+void linphone_chat_message_cbs_set_file_transfer_recv(LinphoneChatMessageCbs *cbs, LinphoneChatMessageFileTransferRecvCb cb) {
+	cbs->file_transfer_recv = cb;
+}
+
+/**
+ * Get the file transfer send callback.
+ * @param[in] cbs LinphoneChatMessageCbs object.
+ * @return The current file transfer send callback.
+ */
+LinphoneChatMessageFileTransferSendCb linphone_chat_message_cbs_get_file_transfer_send(const LinphoneChatMessageCbs *cbs) {
+	return cbs->file_transfer_send;
+}
+
+/**
+ * Set the file transfer send callback.
+ * @param[in] cbs LinphoneChatMessageCbs object.
+ * @param[in] cb The file transfer send callback to be used.
+ */
+void linphone_chat_message_cbs_set_file_transfer_send(LinphoneChatMessageCbs *cbs, LinphoneChatMessageFileTransferSendCb cb) {
+	cbs->file_transfer_send = cb;
+}
+
+/**
+ * Get the file transfer progress indication callback.
+ * @param[in] cbs LinphoneChatMessageCbs object.
+ * @return The current file transfer progress indication callback.
+ */
+LinphoneChatMessageFileTransferProgressIndicationCb linphone_chat_message_cbs_get_file_transfer_progress_indication(const LinphoneChatMessageCbs *cbs) {
+	return cbs->file_transfer_progress_indication;
+}
+
+/**
+ * Set the file transfer progress indication callback.
+ * @param[in] cbs LinphoneChatMessageCbs object.
+ * @param[in] cb The file transfer progress indication callback to be used.
+ */
+void linphone_chat_message_cbs_set_file_transfer_progress_indication(LinphoneChatMessageCbs *cbs, LinphoneChatMessageFileTransferProgressIndicationCb cb) {
+	cbs->file_transfer_progress_indication = cb;
+}
+
+/**
+ * @}
+ */
+
+
+
 static void _linphone_chat_room_send_message(LinphoneChatRoom *cr, LinphoneChatMessage* msg);
 
 static void process_io_error_upload(void *data, const belle_sip_io_error_event_t *event){
@@ -43,6 +176,9 @@ static void process_io_error_upload(void *data, const belle_sip_io_error_event_t
 	if (msg->cb) {
 		msg->cb(msg, LinphoneChatMessageStateNotDelivered, msg->cb_ud);
 	}
+	if (linphone_chat_message_cbs_get_msg_state_changed(msg->callbacks)) {
+		linphone_chat_message_cbs_get_msg_state_changed(msg->callbacks)(msg, LinphoneChatMessageStateNotDelivered);
+	}
 }
 static void process_auth_requested_upload(void *data, belle_sip_auth_event_t *event){
 	LinphoneChatMessage* msg=(LinphoneChatMessage *)data;
@@ -50,6 +186,9 @@ static void process_auth_requested_upload(void *data, belle_sip_auth_event_t *ev
 	if (msg->cb) {
 		msg->cb(msg, LinphoneChatMessageStateNotDelivered, msg->cb_ud);
 	}
+	if (linphone_chat_message_cbs_get_msg_state_changed(msg->callbacks)) {
+		linphone_chat_message_cbs_get_msg_state_changed(msg->callbacks)(msg, LinphoneChatMessageStateNotDelivered);
+	}
 }
 
 static void process_io_error_download(void *data, const belle_sip_io_error_event_t *event){
@@ -58,6 +197,9 @@ static void process_io_error_download(void *data, const belle_sip_io_error_event
 	if (msg->cb) {
 		msg->cb(msg, LinphoneChatMessageStateFileTransferError, msg->cb_ud);
 	}
+	if (linphone_chat_message_cbs_get_msg_state_changed(msg->callbacks)) {
+		linphone_chat_message_cbs_get_msg_state_changed(msg->callbacks)(msg, LinphoneChatMessageStateFileTransferError);
+	}
 }
 static void process_auth_requested_download(void *data, belle_sip_auth_event_t *event){
 	LinphoneChatMessage* msg=(LinphoneChatMessage *)data;
@@ -65,6 +207,9 @@ static void process_auth_requested_download(void *data, belle_sip_auth_event_t *
 	if (msg->cb) {
 		msg->cb(msg, LinphoneChatMessageStateFileTransferError, msg->cb_ud);
 	}
+	if (linphone_chat_message_cbs_get_msg_state_changed(msg->callbacks)) {
+		linphone_chat_message_cbs_get_msg_state_changed(msg->callbacks)(msg, LinphoneChatMessageStateFileTransferError);
+	}
 }
 
 /**
@@ -73,10 +218,12 @@ static void process_auth_requested_download(void *data, belle_sip_auth_event_t *
  */
 static void linphone_chat_message_file_transfer_on_progress(belle_sip_body_handler_t *bh, belle_sip_message_t *msg, void *data, size_t offset, size_t total){
 	LinphoneChatMessage* chatMsg=(LinphoneChatMessage *)data;
-	LinphoneCore *lc = chatMsg->chat_room->lc;
-	/* call back given by application level */
-	linphone_core_notify_file_transfer_progress_indication(lc, chatMsg, chatMsg->file_transfer_information, offset, total);
-	return;
+	if (linphone_chat_message_cbs_get_file_transfer_progress_indication(chatMsg->callbacks)) {
+		linphone_chat_message_cbs_get_file_transfer_progress_indication(chatMsg->callbacks)(chatMsg, chatMsg->file_transfer_information, offset, total);
+	} else {
+		/* Legacy: call back given by application level */
+		linphone_core_notify_file_transfer_progress_indication(chatMsg->chat_room->lc, chatMsg, chatMsg->file_transfer_information, offset, total);
+	}
 }
 
 /**
@@ -98,7 +245,12 @@ static int linphone_chat_message_file_transfer_on_send_body(belle_sip_user_body_
 	/* if we've not reach the end of file yet, ask for more data*/
 	if (offset<linphone_content_get_size(chatMsg->file_transfer_information)){
 		/* get data from call back */
-		linphone_core_notify_file_transfer_send(lc, chatMsg, chatMsg->file_transfer_information, buf, size);
+		if (linphone_chat_message_cbs_get_file_transfer_send(chatMsg->callbacks)) {
+			linphone_chat_message_cbs_get_file_transfer_send(chatMsg->callbacks)(chatMsg, chatMsg->file_transfer_information, buf, size);
+		} else {
+			/* Legacy */
+			linphone_core_notify_file_transfer_send(lc, chatMsg, chatMsg->file_transfer_information, buf, size);
+		}
 	}
 
 	return BELLE_SIP_CONTINUE;
@@ -173,6 +325,9 @@ static void linphone_chat_message_process_response_from_post_file(void *data, co
 			if (msg->cb) {
 				msg->cb(msg, LinphoneChatMessageStateFileTransferDone, msg->cb_ud);
 			}
+			if (linphone_chat_message_cbs_get_msg_state_changed(msg->callbacks)) {
+				linphone_chat_message_cbs_get_msg_state_changed(msg->callbacks)(msg, LinphoneChatMessageStateFileTransferDone);
+			}
 			_linphone_chat_room_send_message(msg->chat_room, msg);
 		}
 	}
@@ -736,6 +891,7 @@ const LinphoneAddress* linphone_chat_room_get_peer_address(LinphoneChatRoom *cr)
  */
 LinphoneChatMessage* linphone_chat_room_create_message(LinphoneChatRoom *cr, const char* message) {
 	LinphoneChatMessage* msg = belle_sip_object_new(LinphoneChatMessage);
+	msg->callbacks=linphone_chat_message_cbs_new();
 	msg->chat_room=(LinphoneChatRoom*)cr;
 	msg->message=message?ms_strdup(message):NULL;
 	msg->is_read=TRUE;
@@ -762,6 +918,7 @@ LinphoneChatMessage* linphone_chat_room_create_message_2(
 	LinphoneCore *lc=linphone_chat_room_get_lc(cr);
 
 	LinphoneChatMessage* msg = belle_sip_object_new(LinphoneChatMessage);
+	msg->callbacks=linphone_chat_message_cbs_new();
 	msg->chat_room=(LinphoneChatRoom*)cr;
 	msg->message=message?ms_strdup(message):NULL;
 	msg->external_body_url=external_body_url?ms_strdup(external_body_url):NULL;
@@ -788,6 +945,7 @@ LinphoneChatMessage* linphone_chat_room_create_message_2(
  * @param msg #LinphoneChatMessage message to be sent
  * @param status_cb LinphoneChatMessageStateChangeCb status callback invoked when message is delivered or could not be delivered. May be NULL
  * @param ud user data for the status cb.
+ * @deprecated Use linphone_chat_room_send_chat_message() instead.
  * @note The LinphoneChatMessage must not be destroyed until the the callback is called.
  */
 void linphone_chat_room_send_message2(LinphoneChatRoom *cr, LinphoneChatMessage* msg,LinphoneChatMessageStateChangedCb status_cb, void* ud) {
@@ -797,6 +955,18 @@ void linphone_chat_room_send_message2(LinphoneChatRoom *cr, LinphoneChatMessage*
 	_linphone_chat_room_send_message(cr, msg);
 }
 
+/**
+ * Send a message to peer member of this chat room.
+ * @param[in] cr LinphoneChatRoom object
+ * @param[in] msg LinphoneChatMessage object
+ * The state of the message sending will be notified via the callbacks defined in the LinphoneChatMessageCbs object that can be obtained
+ * by calling linphone_chat_message_get_callbacks().
+ */
+void linphone_chat_room_send_chat_message(LinphoneChatRoom *cr, LinphoneChatMessage *msg) {
+	msg->state = LinphoneChatMessageStateInProgress;
+	_linphone_chat_room_send_message(cr, msg);
+}
+
 static char * linphone_chat_room_create_is_composing_xml(LinphoneChatRoom *cr) {
 	xmlBufferPtr buf;
 	xmlTextWriterPtr writer;
@@ -1034,8 +1204,12 @@ static void on_recv_body(belle_sip_user_body_handler_t *bh, belle_sip_message_t
 	if (chatMsg->http_request == NULL) {
 		return;
 	}
-	/* call back given by application level */
-	linphone_core_notify_file_transfer_recv(lc, chatMsg, chatMsg->file_transfer_information, (char *)buffer, size);
+	if (linphone_chat_message_cbs_get_file_transfer_recv(chatMsg->callbacks)) {
+		linphone_chat_message_cbs_get_file_transfer_recv(chatMsg->callbacks)(chatMsg, chatMsg->file_transfer_information, (char *)buffer, size);
+	} else {
+		/* Legacy: call back given by application level */
+		linphone_core_notify_file_transfer_recv(lc, chatMsg, chatMsg->file_transfer_information, (char *)buffer, size);
+	}
 	return;
 }
 
@@ -1104,21 +1278,26 @@ static void linphone_chat_process_response_from_get_file(void *data, const belle
 			LinphoneChatMessage* chatMsg=(LinphoneChatMessage *)data;
 			LinphoneCore *lc = chatMsg->chat_room->lc;
 			/* file downloaded succesfully, call again the callback with size at zero */
-			linphone_core_notify_file_transfer_recv(lc, chatMsg, chatMsg->file_transfer_information, NULL, 0);
+			if (linphone_chat_message_cbs_get_file_transfer_recv(chatMsg->callbacks)) {
+				linphone_chat_message_cbs_get_file_transfer_recv(chatMsg->callbacks)(chatMsg, chatMsg->file_transfer_information, NULL, 0);
+			} else {
+				linphone_core_notify_file_transfer_recv(lc, chatMsg, chatMsg->file_transfer_information, NULL, 0);
+			}
 			if (chatMsg->cb) {
 				chatMsg->cb(chatMsg, LinphoneChatMessageStateFileTransferDone, chatMsg->cb_ud);
 			}
+			if (linphone_chat_message_cbs_get_msg_state_changed(chatMsg->callbacks)) {
+				linphone_chat_message_cbs_get_msg_state_changed(chatMsg->callbacks)(chatMsg, LinphoneChatMessageStateFileTransferDone);
+			}
 		}
 	}
 }
 
 /**
- * Start the download of the file from remote server
- *
- * @param message #LinphoneChatMessage
- * @param status_cb LinphoneChatMessageStateChangeCb status callback invoked when file is downloaded or could not be downloaded
+ * Start the download of the file referenced in a LinphoneChatMessage from remote server.
+ * @param[in] message LinphoneChatMessage object.
  */
-void linphone_chat_message_start_file_download(LinphoneChatMessage *message, LinphoneChatMessageStateChangedCb status_cb, void *ud) {
+void linphone_chat_message_download_file(LinphoneChatMessage *message) {
 	belle_http_request_listener_callbacks_t cbs={0};
 	belle_http_request_listener_t *l;
 	belle_generic_uri_t *uri;
@@ -1142,12 +1321,23 @@ void linphone_chat_message_start_file_download(LinphoneChatMessage *message, Lin
 	l=belle_http_request_listener_create_from_callbacks(&cbs, (void *)message);
 	belle_sip_object_data_set(BELLE_SIP_OBJECT(req),"message",(void *)message,NULL);
 	message->http_request = req; /* keep a reference on the request to be able to cancel the download */
-	message->cb = status_cb;
-	message->cb_ud = ud;
 	message->state = LinphoneChatMessageStateInProgress; /* start the download, status is In Progress */
 	belle_http_provider_send_request(message->chat_room->lc->http_provider,req,l);
 }
 
+/**
+ * Start the download of the file from remote server
+ *
+ * @param message #LinphoneChatMessage
+ * @param status_cb LinphoneChatMessageStateChangeCb status callback invoked when file is downloaded or could not be downloaded
+ * @deprecated Use linphone_chat_message_download_file() instead.
+ */
+void linphone_chat_message_start_file_download(LinphoneChatMessage *message, LinphoneChatMessageStateChangedCb status_cb, void *ud) {
+	message->cb = status_cb;
+	message->cb_ud = ud;
+	linphone_chat_message_download_file(message);
+}
+
 /**
  * Cancel an ongoing file transfer attached to this message.(upload or download)
  * @param msg	#LinphoneChatMessage
@@ -1160,6 +1350,9 @@ void linphone_chat_message_cancel_file_transfer(LinphoneChatMessage *msg) {
 	if (msg->cb) {
 		msg->cb(msg, LinphoneChatMessageStateNotDelivered, msg->cb_ud);
 	}
+	if (linphone_chat_message_cbs_get_msg_state_changed(msg->callbacks)) {
+		linphone_chat_message_cbs_get_msg_state_changed(msg->callbacks)(msg, LinphoneChatMessageStateNotDelivered);
+	}
 }
 
 
@@ -1339,6 +1532,7 @@ static void _linphone_chat_message_destroy(LinphoneChatMessage* msg) {
 	if (msg->file_transfer_filepath != NULL) {
 		ms_free(msg->file_transfer_filepath);
 	}
+	linphone_chat_message_cbs_unref(msg->callbacks);
 	ms_message("LinphoneChatMessage [%p] destroyed.",msg);
 }
 
@@ -1396,6 +1590,15 @@ const char * linphone_chat_message_get_file_transfer_filepath(LinphoneChatMessag
 	return msg->file_transfer_filepath;
 }
 
+/**
+ * Get the LinphoneChatMessageCbs object associated with the LinphoneChatMessage.
+ * @param[in] msg LinphoneChatMessage object
+ * @return The LinphoneChatMessageCbs object associated with the LinphoneChatMessage.
+ */
+LinphoneChatMessageCbs * linphone_chat_message_get_callbacks(const LinphoneChatMessage *msg) {
+	return msg->callbacks;
+}
+
 
 /**
  * Create a message attached to a dedicated chat room with a particular content. Use #linphone_chat_room_send_message2 to initiate the transfer
@@ -1406,6 +1609,7 @@ const char * linphone_chat_message_get_file_transfer_filepath(LinphoneChatMessag
 
 LinphoneChatMessage* linphone_chat_room_create_file_transfer_message(LinphoneChatRoom *cr, LinphoneContent* initial_content) {
 	LinphoneChatMessage* msg = belle_sip_object_new(LinphoneChatMessage);
+	msg->callbacks=linphone_chat_message_cbs_new();
 	msg->chat_room=(LinphoneChatRoom*)cr;
 	msg->message = NULL;
 	msg->file_transfer_information = linphone_content_copy(initial_content);
diff --git a/coreapi/help/filetransfer.c b/coreapi/help/filetransfer.c
index 205a51d31..c592c501b 100644
--- a/coreapi/help/filetransfer.c
+++ b/coreapi/help/filetransfer.c
@@ -48,7 +48,7 @@ static void stop(int signum){
 /**
  * function invoked to report file transfer progress.
  * */
-static void file_transfer_progress_indication(LinphoneCore *lc, LinphoneChatMessage *message, const LinphoneContent* content, size_t offset, size_t total) {
+static void file_transfer_progress_indication(LinphoneChatMessage *message, const LinphoneContent* content, size_t offset, size_t total) {
 	const LinphoneAddress* from_address = linphone_chat_message_get_from(message);
 	const LinphoneAddress* to_address = linphone_chat_message_get_to(message);
 	char *address = linphone_chat_message_is_outgoing(message)?linphone_address_as_string(to_address):linphone_address_as_string(from_address);
@@ -63,7 +63,7 @@ static void file_transfer_progress_indication(LinphoneCore *lc, LinphoneChatMess
 /**
  * function invoked when a file transfer is received.
  **/
-static void file_transfer_received(LinphoneCore *lc, LinphoneChatMessage *message, const LinphoneContent* content, const char* buff, size_t size){
+static void file_transfer_received(LinphoneChatMessage *message, const LinphoneContent* content, const char* buff, size_t size){
 	FILE* file=NULL;
 	if (!linphone_chat_message_get_user_data(message)) {
 		/*first chunk, creating file*/
@@ -92,7 +92,7 @@ char big_file [128000];
 /*
  * function called when the file transfer is initiated. file content should be feed into object LinphoneContent
  * */
-static void file_transfer_send(LinphoneCore *lc, LinphoneChatMessage *message,  const LinphoneContent* content, char* buff, size_t* size){
+static void file_transfer_send(LinphoneChatMessage *message,  const LinphoneContent* content, char* buff, size_t* size){
 	int offset=-1;
 
 	if (!linphone_chat_message_get_user_data(message)) {
@@ -147,6 +147,7 @@ int main(int argc, char *argv[]){
 	LinphoneChatRoom* chat_room;
 	LinphoneContent* content;
 	LinphoneChatMessage* chat_message;
+	LinphoneChatMessageCbs *cbs;
 
 	/*seting dummy file content to something*/
 	for (i=0;i<sizeof(big_file);i+=strlen(big_file_content))
@@ -160,15 +161,6 @@ int main(int argc, char *argv[]){
 #ifdef DEBUG
 	linphone_core_enable_logs(NULL); /*enable liblinphone logs.*/
 #endif
-	/*
-	 Fill the LinphoneCoreVTable with application callbacks.
-	 All are optional. Here we only use the file_transfer_received callback
-	 in order to get notifications about incoming file receive, file_transfer_send to feed file to be transfered
-	 and file_transfer_progress_indication to print progress.
-	 */
-	vtable.file_transfer_recv=file_transfer_received;
-	vtable.file_transfer_send=file_transfer_send;
-	vtable.file_transfer_progress_indication=file_transfer_progress_indication;
 	vtable.message_received=message_received;
 
 
@@ -201,8 +193,18 @@ int main(int argc, char *argv[]){
 		printf("returned message is null\n");
 	}
 
+	/**
+	 * Fill the application callbacks. The file_transfer_received callback is used in order to get notifications
+	 * about incoming file reception, file_transfer_send to feed file to be transfered and
+	 * file_transfer_progress_indication to print progress.
+	 */
+	cbs = linphone_chat_message_get_callbacks(chat_message);
+	linphone_chat_message_cbs_set_file_transfer_recv(cbs, file_transfer_received);
+	linphone_chat_message_cbs_set_file_transfer_send(cbs, file_transfer_send);
+	linphone_chat_message_cbs_set_file_transfer_progress_indication(cbs, file_transfer_progress_indication);
+
 	/*initiating file transfer*/
-	linphone_chat_room_send_message2(chat_room, chat_message, linphone_file_transfer_state_changed, NULL);
+	linphone_chat_room_send_chat_message(chat_room, chat_message);
 
 	/* main loop for receiving incoming messages and doing background linphone core work: */
 	while(running){
diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h
index add43e4a0..e3ad83ff7 100644
--- a/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@ -1296,7 +1296,12 @@ struct _LinphoneChatRoom;
  */
 
 /**
- * A chat room message to old content to be sent.
+ * An object to handle the callbacks for the handling a LinphoneChatMessage objects.
+ */
+typedef struct _LinphoneChatMessageCbs LinphoneChatMessageCbs;
+
+/**
+ * A chat room message to hold content to be sent.
  * <br> Can be created by linphone_chat_room_create_message().
  */
 typedef struct _LinphoneChatMessage LinphoneChatMessage;
@@ -1327,6 +1332,46 @@ typedef enum _LinphoneChatMessageState {
  */
 typedef void (*LinphoneChatMessageStateChangedCb)(LinphoneChatMessage* msg,LinphoneChatMessageState state,void* ud);
 
+/**
+ * Call back used to notify message delivery status
+ * @param msg #LinphoneChatMessage object
+ * @param status LinphoneChatMessageState
+ */
+typedef void (*LinphoneChatMessageMsgStateChangedCb)(LinphoneChatMessage* msg, LinphoneChatMessageState state);
+
+/**
+ * File transfer receive callback prototype. This function is called by the core upon an incoming File transfer is started. This function may be call several time for the same file in case of large file.
+ *
+ * @param message #LinphoneChatMessage message from which the body is received.
+ * @param content #LinphoneContent incoming content information
+ * @param buff pointer to the received data
+ * @param size number of bytes to be read from buff. 0 means end of file.
+ *
+ */
+typedef void (*LinphoneChatMessageFileTransferRecvCb)(LinphoneChatMessage *message, const LinphoneContent* content, const char* buff, size_t size);
+
+/**
+ * File transfer send callback prototype. This function is called by the core upon an outgoing File transfer is started. This function is called until size is set to 0.
+ * <br> a #LinphoneContent with a size equal zero
+ *
+ * @param message #LinphoneChatMessage message from which the body is received.
+ * @param content #LinphoneContent outgoing content
+ * @param buff pointer to the buffer where data chunk shall be written by the app
+ * @param size as input value, it represents the number of bytes expected by the framework. As output value, it means the number of bytes wrote by the application in the buffer. 0 means end of file.
+ *
+ */
+typedef void (*LinphoneChatMessageFileTransferSendCb)(LinphoneChatMessage *message,  const LinphoneContent* content, char* buff, size_t* size);
+
+/**
+ * File transfer progress indication callback prototype.
+ *
+ * @param message #LinphoneChatMessage message from which the body is received.
+ * @param content #LinphoneContent incoming content information
+ * @param offset The number of bytes sent/received since the beginning of the transfer.
+ * @param total The total number of bytes to be sent/received.
+ */
+typedef void (*LinphoneChatMessageFileTransferProgressIndicationCb)(LinphoneChatMessage *message, const LinphoneContent* content, size_t offset, size_t total);
+
 LINPHONE_PUBLIC void linphone_core_set_chat_database_path(LinphoneCore *lc, const char *path);
 LINPHONE_PUBLIC	LinphoneChatRoom * linphone_core_create_chat_room(LinphoneCore *lc, const char *to);
 LINPHONE_PUBLIC	LinphoneChatRoom * linphone_core_get_or_create_chat_room(LinphoneCore *lc, const char *to);
@@ -1377,6 +1422,7 @@ LINPHONE_PUBLIC	LinphoneChatMessage* linphone_chat_room_create_file_transfer_mes
 LINPHONE_PUBLIC	const LinphoneAddress* linphone_chat_room_get_peer_address(LinphoneChatRoom *cr);
 LINPHONE_PUBLIC	void linphone_chat_room_send_message(LinphoneChatRoom *cr, const char *msg);
 LINPHONE_PUBLIC	void linphone_chat_room_send_message2(LinphoneChatRoom *cr, LinphoneChatMessage* msg,LinphoneChatMessageStateChangedCb status_cb,void* ud);
+LINPHONE_PUBLIC void linphone_chat_room_send_chat_message(LinphoneChatRoom *cr, LinphoneChatMessage *msg);
 LINPHONE_PUBLIC void linphone_chat_room_update_url(LinphoneChatRoom *cr, LinphoneChatMessage *msg);
 LINPHONE_PUBLIC MSList *linphone_chat_room_get_history(LinphoneChatRoom *cr,int nb_message);
 LINPHONE_PUBLIC void linphone_chat_room_mark_as_read(LinphoneChatRoom *cr);
@@ -1438,6 +1484,7 @@ LINPHONE_PUBLIC	const char* linphone_chat_message_get_external_body_url(const Li
 LINPHONE_PUBLIC	void linphone_chat_message_set_external_body_url(LinphoneChatMessage* message,const char* url);
 LINPHONE_PUBLIC	const LinphoneContent* linphone_chat_message_get_file_transfer_information(const LinphoneChatMessage* message);
 LINPHONE_PUBLIC void linphone_chat_message_start_file_download(LinphoneChatMessage* message, LinphoneChatMessageStateChangedCb status_cb, void* ud);
+LINPHONE_PUBLIC void linphone_chat_message_download_file(LinphoneChatMessage *message);
 LINPHONE_PUBLIC void linphone_chat_message_cancel_file_transfer(LinphoneChatMessage* msg);
 LINPHONE_PUBLIC	const char* linphone_chat_message_get_appdata(const LinphoneChatMessage* message);
 LINPHONE_PUBLIC	void linphone_chat_message_set_appdata(LinphoneChatMessage* message, const char* data);
@@ -1457,6 +1504,21 @@ LINPHONE_PUBLIC LinphoneReason linphone_chat_message_get_reason(LinphoneChatMess
 LINPHONE_PUBLIC const LinphoneErrorInfo *linphone_chat_message_get_error_info(const LinphoneChatMessage *msg);
 LINPHONE_PUBLIC void linphone_chat_message_set_file_transfer_filepath(LinphoneChatMessage *msg, const char *filepath);
 LINPHONE_PUBLIC const char * linphone_chat_message_get_file_transfer_filepath(LinphoneChatMessage *msg);
+LINPHONE_PUBLIC LinphoneChatMessageCbs * linphone_chat_message_get_callbacks(const LinphoneChatMessage *msg);
+
+LINPHONE_PUBLIC LinphoneChatMessageCbs * linphone_chat_message_cbs_ref(LinphoneChatMessageCbs *cbs);
+LINPHONE_PUBLIC void linphone_chat_message_cbs_unref(LinphoneChatMessageCbs *cbs);
+LINPHONE_PUBLIC void *linphone_chat_message_cbs_get_user_data(const LinphoneChatMessageCbs *cbs);
+LINPHONE_PUBLIC void linphone_chat_message_cbs_set_user_data(LinphoneChatMessageCbs *cbs, void *ud);
+LINPHONE_PUBLIC LinphoneChatMessageMsgStateChangedCb linphone_chat_message_cbs_get_msg_state_changed(const LinphoneChatMessageCbs *cbs);
+LINPHONE_PUBLIC void linphone_chat_message_cbs_set_msg_state_changed(LinphoneChatMessageCbs *cbs, LinphoneChatMessageMsgStateChangedCb cb);
+LINPHONE_PUBLIC LinphoneChatMessageFileTransferRecvCb linphone_chat_message_cbs_get_file_transfer_recv(const LinphoneChatMessageCbs *cbs);
+LINPHONE_PUBLIC void linphone_chat_message_cbs_set_file_transfer_recv(LinphoneChatMessageCbs *cbs, LinphoneChatMessageFileTransferRecvCb cb);
+LINPHONE_PUBLIC LinphoneChatMessageFileTransferSendCb linphone_chat_message_cbs_get_file_transfer_send(const LinphoneChatMessageCbs *cbs);
+LINPHONE_PUBLIC void linphone_chat_message_cbs_set_file_transfer_send(LinphoneChatMessageCbs *cbs, LinphoneChatMessageFileTransferSendCb cb);
+LINPHONE_PUBLIC LinphoneChatMessageFileTransferProgressIndicationCb linphone_chat_message_cbs_get_file_transfer_progress_indication(const LinphoneChatMessageCbs *cbs);
+LINPHONE_PUBLIC void linphone_chat_message_cbs_set_file_transfer_progress_indication(LinphoneChatMessageCbs *cbs, LinphoneChatMessageFileTransferProgressIndicationCb cb);
+
 /**
  * @}
  */
@@ -1741,9 +1803,9 @@ typedef struct _LinphoneCoreVTable{
 	DisplayUrlCb display_url; /**< @deprecated */
 	ShowInterfaceCb show; /**< @deprecated Notifies the application that it should show up*/
 	LinphoneCoreTextMessageReceivedCb text_received; /**< @deprecated, use #message_received instead <br> A text message has been received */
-	LinphoneCoreFileTransferRecvCb file_transfer_recv; /**< Callback to store file received attached to a #LinphoneChatMessage */
-	LinphoneCoreFileTransferSendCb file_transfer_send; /**< Callback to collect file chunk to be sent for a #LinphoneChatMessage */
-	LinphoneCoreFileTransferProgressIndicationCb file_transfer_progress_indication; /**< Callback to indicate file transfer progress */
+	LinphoneCoreFileTransferRecvCb file_transfer_recv; /**< @deprecated Callback to store file received attached to a #LinphoneChatMessage */
+	LinphoneCoreFileTransferSendCb file_transfer_send; /**< @deprecated Callback to collect file chunk to be sent for a #LinphoneChatMessage */
+	LinphoneCoreFileTransferProgressIndicationCb file_transfer_progress_indication; /**< @deprecated Callback to indicate file transfer progress */
 	LinphoneCoreNetworkReachableCb network_reachable; /**< Callback to report IP network status (I.E up/down )*/
 	LinphoneCoreLogCollectionUploadStateChangedCb log_collection_upload_state_changed; /**< Callback to upload collected logs */
 	LinphoneCoreLogCollectionUploadProgressIndicationCb log_collection_upload_progress_indication; /**< Callback to indicate log collection upload progress */
diff --git a/coreapi/private.h b/coreapi/private.h
index 56f96fb2e..d9d1eeb07 100644
--- a/coreapi/private.h
+++ b/coreapi/private.h
@@ -146,6 +146,17 @@ typedef struct _CallCallbackObj
 	void * _user_data;
 }CallCallbackObj;
 
+struct _LinphoneChatMessageCbs {
+	belle_sip_object_t base;
+	void *user_data;
+	LinphoneChatMessageMsgStateChangedCb msg_state_changed;
+	LinphoneChatMessageFileTransferRecvCb file_transfer_recv; /**< Callback to store file received attached to a #LinphoneChatMessage */
+	LinphoneChatMessageFileTransferSendCb file_transfer_send; /**< Callback to collect file chunk to be sent for a #LinphoneChatMessage */
+	LinphoneChatMessageFileTransferProgressIndicationCb file_transfer_progress_indication; /**< Callback to indicate file transfer progress */
+};
+
+BELLE_SIP_DECLARE_VPTR(LinphoneChatMessageCbs);
+
 typedef enum _LinphoneChatMessageDir{
 	LinphoneChatMessageIncoming,
 	LinphoneChatMessageOutgoing
@@ -154,6 +165,7 @@ typedef enum _LinphoneChatMessageDir{
 struct _LinphoneChatMessage {
 	belle_sip_object_t base;
 	LinphoneChatRoom* chat_room;
+	LinphoneChatMessageCbs *callbacks;
 	LinphoneChatMessageDir dir;
 	char* message;
 	LinphoneChatMessageStateChangedCb cb;
@@ -997,6 +1009,7 @@ BELLE_SIP_TYPE_ID(LinphoneCall),
 BELLE_SIP_TYPE_ID(LinphoneCallLog),
 BELLE_SIP_TYPE_ID(LinphoneCallParams),
 BELLE_SIP_TYPE_ID(LinphoneChatMessage),
+BELLE_SIP_TYPE_ID(LinphoneChatMessageCbs),
 BELLE_SIP_TYPE_ID(LinphoneChatRoom),
 BELLE_SIP_TYPE_ID(LinphoneContent),
 BELLE_SIP_TYPE_ID(LinphoneLDAPContactProvider),
diff --git a/gtk/chat.c b/gtk/chat.c
index 940437950..c05f32e4a 100644
--- a/gtk/chat.c
+++ b/gtk/chat.c
@@ -276,7 +276,7 @@ void update_chat_state_message(LinphoneChatMessageState state,LinphoneChatMessag
 	}
 }
 
-static void on_chat_state_changed(LinphoneChatMessage *msg, LinphoneChatMessageState state, void *user_pointer){
+static void on_chat_state_changed(LinphoneChatMessage *msg, LinphoneChatMessageState state){
 	update_chat_state_message(state,msg);
 }
 
@@ -300,8 +300,11 @@ void linphone_gtk_send_text(){
 	entered=gtk_entry_get_text(GTK_ENTRY(entry));
 	if (strlen(entered)>0) {
 		LinphoneChatMessage *msg;
+		LinphoneChatMessageCbs *cbs;
 		msg=linphone_chat_room_create_message(cr,entered);
-		linphone_chat_room_send_message2(cr,msg,on_chat_state_changed,NULL);
+		cbs=linphone_chat_message_get_callbacks(msg);
+		linphone_chat_message_cbs_set_msg_state_changed(cbs,on_chat_state_changed);
+		linphone_chat_room_send_chat_message(cr,msg);
 		linphone_gtk_push_text(w,linphone_chat_message_get_from(msg),
 				TRUE,cr,msg,FALSE);
 
diff --git a/tester/liblinphone_tester.h b/tester/liblinphone_tester.h
index 715d4c6f8..d7f5c26ce 100644
--- a/tester/liblinphone_tester.h
+++ b/tester/liblinphone_tester.h
@@ -235,9 +235,9 @@ void linphone_transfer_state_changed(LinphoneCore *lc, LinphoneCall *transfered,
 void notify_presence_received(LinphoneCore *lc, LinphoneFriend * lf);
 void text_message_received(LinphoneCore *lc, LinphoneChatRoom *room, const LinphoneAddress *from_address, const char *message);
 void message_received(LinphoneCore *lc, LinphoneChatRoom *room, LinphoneChatMessage* message);
-void file_transfer_received(LinphoneCore *lc, LinphoneChatMessage *message, const LinphoneContent* content, const char* buff, size_t size);
-void file_transfer_send(LinphoneCore *lc, LinphoneChatMessage *message,  const LinphoneContent* content, char* buff, size_t* size);
-void file_transfer_progress_indication(LinphoneCore *lc, LinphoneChatMessage *message, const LinphoneContent* content, size_t offset, size_t total);
+void file_transfer_received(LinphoneChatMessage *message, const LinphoneContent* content, const char* buff, size_t size);
+void file_transfer_send(LinphoneChatMessage *message,  const LinphoneContent* content, char* buff, size_t* size);
+void file_transfer_progress_indication(LinphoneChatMessage *message, const LinphoneContent* content, size_t offset, size_t total);
 void is_composing_received(LinphoneCore *lc, LinphoneChatRoom *room);
 void info_message_received(LinphoneCore *lc, LinphoneCall *call, const LinphoneInfoMessage *msg);
 void new_subscription_requested(LinphoneCore *lc, LinphoneFriend *lf, const char *url);
@@ -269,6 +269,7 @@ LinphoneCoreManager *get_manager(LinphoneCore *lc);
 const char *liblinphone_tester_get_subscribe_content(void);
 const char *liblinphone_tester_get_notify_content(void);
 void liblinphone_tester_chat_message_state_change(LinphoneChatMessage* msg,LinphoneChatMessageState state,void* ud);
+void liblinphone_tester_chat_message_msg_state_changed(LinphoneChatMessage *msg, LinphoneChatMessageState state);
 void liblinphone_tester_check_rtcp(LinphoneCoreManager* caller, LinphoneCoreManager* callee);
 void liblinphone_tester_clock_start(MSTimeSpec *start);
 bool_t liblinphone_tester_clock_elapsed(const MSTimeSpec *start, int value_ms);
diff --git a/tester/message_tester.c b/tester/message_tester.c
index de6b90c0d..9d207d034 100644
--- a/tester/message_tester.c
+++ b/tester/message_tester.c
@@ -62,9 +62,11 @@ void message_received(LinphoneCore *lc, LinphoneChatRoom *room, LinphoneChatMess
 /**
  * function invoked when a file transfer is received.
  * */
-void file_transfer_received(LinphoneCore *lc, LinphoneChatMessage *message, const LinphoneContent* content, const char* buff, size_t size){
+void file_transfer_received(LinphoneChatMessage *message, const LinphoneContent* content, const char* buff, size_t size){
 	FILE* file=NULL;
 	char receive_file[256];
+	LinphoneChatRoom *cr = linphone_chat_message_get_chat_room(message);
+	LinphoneCore *lc = linphone_chat_room_get_core(cr);
 	snprintf(receive_file,sizeof(receive_file), "%s/receive_file.dump", liblinphone_tester_writable_dir_prefix);
 	if (!linphone_chat_message_get_user_data(message)) {
 		/*first chunk, creating file*/
@@ -91,7 +93,7 @@ static char big_file [128000]; /* a buffer to simulate a big file for the file t
 /*
  * function called when the file transfer is initiated. file content should be feed into object LinphoneContent
  * */
-void file_transfer_send(LinphoneCore *lc, LinphoneChatMessage *message,  const LinphoneContent* content, char* buff, size_t* size){
+void file_transfer_send(LinphoneChatMessage *message,  const LinphoneContent* content, char* buff, size_t* size){
 	int offset=-1;
 
 	if (!linphone_chat_message_get_user_data(message)) {
@@ -116,7 +118,9 @@ void file_transfer_send(LinphoneCore *lc, LinphoneChatMessage *message,  const L
 /**
  * function invoked to report file transfer progress.
  * */
-void file_transfer_progress_indication(LinphoneCore *lc, LinphoneChatMessage *message, const LinphoneContent* content, size_t offset, size_t total) {
+void file_transfer_progress_indication(LinphoneChatMessage *message, const LinphoneContent* content, size_t offset, size_t total) {
+	LinphoneChatRoom *cr = linphone_chat_message_get_chat_room(message);
+	LinphoneCore *lc = linphone_chat_room_get_core(cr);
 	const LinphoneAddress* from_address = linphone_chat_message_get_from(message);
 	const LinphoneAddress* to_address = linphone_chat_message_get_to(message);
 	char *address = linphone_chat_message_is_outgoing(message)?linphone_address_as_string(to_address):linphone_address_as_string(from_address);
@@ -142,9 +146,14 @@ void is_composing_received(LinphoneCore *lc, LinphoneChatRoom *room) {
 }
 
 void liblinphone_tester_chat_message_state_change(LinphoneChatMessage* msg,LinphoneChatMessageState state,void* ud) {
-	LinphoneCore* lc=(LinphoneCore*)ud;
+	liblinphone_tester_chat_message_msg_state_changed(msg, state);
+}
+
+void liblinphone_tester_chat_message_msg_state_changed(LinphoneChatMessage *msg, LinphoneChatMessageState state) {
+	LinphoneChatRoom *cr = linphone_chat_message_get_chat_room(msg);
+	LinphoneCore *lc = linphone_chat_room_get_core(cr);
 	stats* counters = get_stats(lc);
-	ms_message("Message [%s] [%s]",linphone_chat_message_get_text(msg),linphone_chat_message_state_to_string(state));
+	ms_message("Message [%s] [%s]",linphone_chat_message_get_text(msg), linphone_chat_message_state_to_string(state));
 	switch (state) {
 	case LinphoneChatMessageStateDelivered:
 		counters->number_of_LinphoneMessageDelivered++;
@@ -159,9 +168,8 @@ void liblinphone_tester_chat_message_state_change(LinphoneChatMessage* msg,Linph
 		counters->number_of_LinphoneMessageNotDelivered++;
 		break;
 	default:
-		ms_error("Unexpected state [%s] for message [%p]",linphone_chat_message_state_to_string(state),msg);
+		ms_error("Unexpected state [%s] for message [%p]",linphone_chat_message_state_to_string(state), msg);
 	}
-
 }
 
 static void text_message(void) {
@@ -340,13 +348,13 @@ static void text_message_with_ack(void) {
 		char* to = linphone_address_as_string(marie->identity);
 		LinphoneChatRoom* chat_room = linphone_core_create_chat_room(pauline->lc,to);
 		LinphoneChatMessage* message = linphone_chat_room_create_message(chat_room,"Bli bli bli \n blu");
-		{
-			int dummy=0;
-			wait_for_until(marie->lc,pauline->lc,&dummy,1,100); /*just to have time to purge message stored in the server*/
-			reset_counters(&marie->stat);
-			reset_counters(&pauline->stat);
-		}
-		linphone_chat_room_send_message2(chat_room,message,liblinphone_tester_chat_message_state_change,pauline->lc);
+		LinphoneChatMessageCbs *cbs = linphone_chat_message_get_callbacks(message);
+		int dummy=0;
+		wait_for_until(marie->lc,pauline->lc,&dummy,1,100); /*just to have time to purge message stored in the server*/
+		reset_counters(&marie->stat);
+		reset_counters(&pauline->stat);
+		linphone_chat_message_cbs_set_msg_state_changed(cbs, liblinphone_tester_chat_message_msg_state_changed);
+		linphone_chat_room_send_chat_message(chat_room,message);
 		CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneMessageReceived,1));
 		CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneMessageDelivered,1));
 		CU_ASSERT_EQUAL(pauline->stat.number_of_LinphoneMessageInProgress,1);
@@ -366,6 +374,7 @@ static void text_message_with_external_body(void) {
 	char* to = linphone_address_as_string(marie->identity);
 	LinphoneChatRoom* chat_room = linphone_core_create_chat_room(pauline->lc,to);
 	LinphoneChatMessage* message = linphone_chat_room_create_message(chat_room,"Bli bli bli \n blu");
+	LinphoneChatMessageCbs *cbs = linphone_chat_message_get_callbacks(message);
 	linphone_chat_message_set_external_body_url(message,message_external_body_url="http://www.linphone.org");
 	{
 		int dummy=0;
@@ -373,7 +382,8 @@ static void text_message_with_external_body(void) {
 		reset_counters(&marie->stat);
 		reset_counters(&pauline->stat);
 	}
-	linphone_chat_room_send_message2(chat_room,message,liblinphone_tester_chat_message_state_change,pauline->lc);
+	linphone_chat_message_cbs_set_msg_state_changed(cbs,liblinphone_tester_chat_message_msg_state_changed);
+	linphone_chat_room_send_chat_message(chat_room,message);
 
 	/* check transient message list: the message should be in it, and should be the only one */
 	CU_ASSERT_EQUAL(ms_list_size(chat_room->transient_messages), 1);
@@ -396,6 +406,7 @@ static void file_transfer_message(void) {
 	char* to;
 	LinphoneChatRoom* chat_room;
 	LinphoneChatMessage* message;
+	LinphoneChatMessageCbs *cbs;
 	LinphoneContent* content;
 	const char* big_file_content="big file"; /* setting dummy file content to something */
 	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
@@ -423,16 +434,21 @@ static void file_transfer_message(void) {
 	linphone_content_set_size(content,sizeof(big_file)); /*total size to be transfered*/
 	linphone_content_set_name(content,"bigfile.txt");
 	message = linphone_chat_room_create_file_transfer_message(chat_room, content);
+	cbs = linphone_chat_message_get_callbacks(message);
 	{
 		int dummy=0;
 		wait_for_until(marie->lc,pauline->lc,&dummy,1,100); /*just to have time to purge message stored in the server*/
 		reset_counters(&marie->stat);
 		reset_counters(&pauline->stat);
 	}
-	linphone_chat_room_send_message2(chat_room,message,liblinphone_tester_chat_message_state_change,pauline->lc);
+	linphone_chat_message_cbs_set_msg_state_changed(cbs,liblinphone_tester_chat_message_msg_state_changed);
+	linphone_chat_room_send_chat_message(chat_room,message);
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneMessageReceivedWithFile,1));
 	if (marie->stat.last_received_chat_message ) {
-		linphone_chat_message_start_file_download(marie->stat.last_received_chat_message, liblinphone_tester_chat_message_state_change, marie->lc);
+		cbs = linphone_chat_message_get_callbacks(marie->stat.last_received_chat_message);
+		linphone_chat_message_cbs_set_msg_state_changed(cbs, liblinphone_tester_chat_message_msg_state_changed);
+		linphone_chat_message_cbs_set_file_transfer_recv(cbs, file_transfer_received);
+		linphone_chat_message_download_file(marie->stat.last_received_chat_message);
 	}
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneMessageExtBodyReceived,1));
 
@@ -452,6 +468,7 @@ static void small_file_transfer_message(void) {
 	char* to;
 	LinphoneChatRoom* chat_room;
 	LinphoneChatMessage* message;
+	LinphoneChatMessageCbs *cbs;
 	LinphoneContent* content;
 	const char* big_file_content="big file"; /* setting dummy file content to something */
 	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
@@ -485,10 +502,15 @@ static void small_file_transfer_message(void) {
 		reset_counters(&marie->stat);
 		reset_counters(&pauline->stat);
 	}
-	linphone_chat_room_send_message2(chat_room,message,liblinphone_tester_chat_message_state_change,pauline->lc);
+	cbs = linphone_chat_message_get_callbacks(message);
+	linphone_chat_message_cbs_set_msg_state_changed(cbs, liblinphone_tester_chat_message_msg_state_changed);
+	linphone_chat_room_send_chat_message(chat_room,message);
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneMessageReceivedWithFile,1));
 	if (marie->stat.last_received_chat_message ) {
-		linphone_chat_message_start_file_download(marie->stat.last_received_chat_message, liblinphone_tester_chat_message_state_change, marie->lc);
+		cbs = linphone_chat_message_get_callbacks(marie->stat.last_received_chat_message);
+		linphone_chat_message_cbs_set_msg_state_changed(cbs, liblinphone_tester_chat_message_msg_state_changed);
+		linphone_chat_message_cbs_set_file_transfer_recv(cbs, file_transfer_received);
+		linphone_chat_message_download_file(marie->stat.last_received_chat_message);
 	}
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneMessageExtBodyReceived,1));
 
@@ -506,6 +528,7 @@ static void file_transfer_message_io_error_upload(void) {
 	char* to;
 	LinphoneChatRoom* chat_room;
 	LinphoneChatMessage* message;
+	LinphoneChatMessageCbs *cbs;
 	LinphoneContent* content;
 	const char* big_file_content="big file"; /* setting dummy file content to something */
 	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
@@ -540,7 +563,10 @@ static void file_transfer_message_io_error_upload(void) {
 		reset_counters(&marie->stat);
 		reset_counters(&pauline->stat);
 	}
-	linphone_chat_room_send_message2(chat_room,message,liblinphone_tester_chat_message_state_change,pauline->lc);
+	cbs = linphone_chat_message_get_callbacks(message);
+	linphone_chat_message_cbs_set_msg_state_changed(cbs, liblinphone_tester_chat_message_msg_state_changed);
+	linphone_chat_message_cbs_set_file_transfer_progress_indication(cbs, file_transfer_progress_indication);
+	linphone_chat_room_send_chat_message(chat_room,message);
 
 	/*wait for file to be 25% uploaded and simultate a network error*/
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.progress_of_LinphoneFileTransfer,25));
@@ -632,6 +658,7 @@ static void file_transfer_message_upload_cancelled(void) {
 	char* to;
 	LinphoneChatRoom* chat_room;
 	LinphoneChatMessage* message;
+	LinphoneChatMessageCbs *cbs;
 	LinphoneContent* content;
 	const char* big_file_content="big file"; /* setting dummy file content to something */
 	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
@@ -666,7 +693,10 @@ static void file_transfer_message_upload_cancelled(void) {
 		reset_counters(&marie->stat);
 		reset_counters(&pauline->stat);
 	}
-	linphone_chat_room_send_message2(chat_room,message,liblinphone_tester_chat_message_state_change,pauline->lc);
+	cbs = linphone_chat_message_get_callbacks(message);
+	linphone_chat_message_cbs_set_msg_state_changed(cbs, liblinphone_tester_chat_message_msg_state_changed);
+	linphone_chat_message_cbs_set_file_transfer_progress_indication(cbs, file_transfer_progress_indication);
+	linphone_chat_room_send_chat_message(chat_room,message);
 
 	/*wait for file to be 50% uploaded and cancel the transfer */
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.progress_of_LinphoneFileTransfer, 50));
@@ -753,6 +783,7 @@ static void text_message_with_send_error(void) {
 	char* to = linphone_address_as_string(pauline->identity);
 	LinphoneChatRoom* chat_room = linphone_core_create_chat_room(marie->lc,to);
 	LinphoneChatMessage* message = linphone_chat_room_create_message(chat_room,"Bli bli bli \n blu");
+	LinphoneChatMessageCbs *cbs = linphone_chat_message_get_callbacks(message);
 	reset_counters(&marie->stat);
 	reset_counters(&pauline->stat);
 
@@ -764,7 +795,8 @@ static void text_message_with_send_error(void) {
 		reset_counters(&marie->stat);
 		reset_counters(&pauline->stat);
 	}
-	linphone_chat_room_send_message2(chat_room,message,liblinphone_tester_chat_message_state_change,marie->lc);
+	linphone_chat_message_cbs_set_msg_state_changed(cbs,liblinphone_tester_chat_message_msg_state_changed);
+	linphone_chat_room_send_chat_message(chat_room,message);
 
 	/* check transient message list: the message should be in it, and should be the only one */
 	CU_ASSERT_EQUAL(ms_list_size(chat_room->transient_messages), 1);
@@ -789,6 +821,7 @@ static void text_message_denied(void) {
 	char* to = linphone_address_as_string(pauline->identity);
 	LinphoneChatRoom* chat_room = linphone_core_create_chat_room(marie->lc,to);
 	LinphoneChatMessage* message = linphone_chat_room_create_message(chat_room,"Bli bli bli \n blu");
+	LinphoneChatMessageCbs *cbs = linphone_chat_message_get_callbacks(message);
 
 	/*pauline doesn't want to be disturbed*/
 	linphone_core_disable_chat(pauline->lc,LinphoneReasonDoNotDisturb);
@@ -798,7 +831,8 @@ static void text_message_denied(void) {
 		reset_counters(&marie->stat);
 		reset_counters(&pauline->stat);
 	}
-	linphone_chat_room_send_message2(chat_room,message,liblinphone_tester_chat_message_state_change,marie->lc);
+	linphone_chat_message_cbs_set_msg_state_changed(cbs,liblinphone_tester_chat_message_msg_state_changed);
+	linphone_chat_room_send_chat_message(chat_room,message);
 
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneMessageNotDelivered,1));
 	CU_ASSERT_EQUAL(pauline->stat.number_of_LinphoneMessageReceived,0);
diff --git a/tester/tester.c b/tester/tester.c
index 07ffa703a..971bf5d63 100644
--- a/tester/tester.c
+++ b/tester/tester.c
@@ -234,9 +234,6 @@ LinphoneCoreManager* linphone_core_manager_new2(const char* rc_file, int check_f
 	mgr->v_table.call_state_changed=call_state_changed;
 	mgr->v_table.text_received=text_message_received;
 	mgr->v_table.message_received=message_received;
-	mgr->v_table.file_transfer_recv=file_transfer_received;
-	mgr->v_table.file_transfer_send=file_transfer_send;
-	mgr->v_table.file_transfer_progress_indication=file_transfer_progress_indication;
 	mgr->v_table.is_composing_received=is_composing_received;
 	mgr->v_table.new_subscription_requested=new_subscription_requested;
 	mgr->v_table.notify_presence_received=notify_presence_received;

From 0ea7c35b89f62b21a586d1a1d922a34477f00276 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Mon, 24 Nov 2014 16:55:48 +0100
Subject: [PATCH 035/496] Use correct exectuable name and fill test/suite name
 too

---
 tester/liblinphone_completion | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/tester/liblinphone_completion b/tester/liblinphone_completion
index 6fae7fa27..3ff1304ba 100644
--- a/tester/liblinphone_completion
+++ b/tester/liblinphone_completion
@@ -21,7 +21,7 @@
 # source this file in your .rc file
 
 _liblinphone_complete() {
-	local completions command_require_argument latest_arg available_tasks has_not_set_suite suite_name
+	local completions command_require_argument prev_arg latest_arg available_tasks has_not_set_suite suite_name
 	# these commands expect an argument
 	command_require_argument=(--list-tests --config --domain --auth-domain --dns-hosts --suite --test)
 
@@ -34,22 +34,27 @@ _liblinphone_complete() {
 		set -- "${args[@]}" #convert them to arguments (eg $1,$#,$@,etc.)
 	fi
 	#skip program name
+	program=$1
 	shift
 
 
 	# if user required help, do not complete anything
 	if ! grep -q -- "--help" <<< "$@"; then
-
 		# retrieve the last argument
 		latest_arg=""
+		prev_arg=""
+		latest_is_empty=0
 		for arg in "$@"; do
 			if [ ! -z "$arg" ]; then
+				prev_arg="$latest_arg"
 				latest_arg="$arg"
+			else
+				latest_is_empty=1
 			fi
 		done
 
 		# get the tasks available, from --help
-		available_tasks="$(liblinphone_tester 2>&1 --help | sed -nE "s/.*--([^ ]*).*/--\\1/p")"
+		available_tasks="$($program 2>&1 --help | sed -nE "s/.*--([^ ]*).*/--\\1/p")"
 		# remove all already provided tasks (it's useless to provide them twice)
 		if [[ ! -z "$@" ]]; then
 			current_tasks=$(echo $@ | grep -Eo -- "--([^ ])*" | tr '\n' '|' | sed 's/|/$|/g')--$
@@ -63,16 +68,22 @@ _liblinphone_complete() {
 			available_tasks=$(echo "$available_tasks" | grep -v -- --test)
 		fi
 
-		# if latest arg does not start with '--', it is a custom value; just output all available commands
-		if ! grep -q -- '^--' <<< "$latest_arg"; then
-			completions="$available_tasks"
+		# if latest arg does not start with '--', it is a custom value
+		if [ $latest_is_empty = 0 ] && ! grep -q -- '^--' <<< "$latest_arg"; then
+			# echo "yes!$prev_arg $has_not_set_suite"
+			if [ "$prev_arg" = "--test" ] && [ $has_not_set_suite = 0 ]; then
+				suite_name=$(echo $@ | sed -nE 's/.*--suite ([^ ]*) .*/\1/p')
+				completions="$($program --list-tests "$suite_name" | grep "^$latest_arg")"
+			elif [ "$prev_arg" = "--suite" ] || [ "$prev_arg" = "--list-tests" ]; then
+				completions="$($program --list-suites)"
+			fi
 		elif [ "$latest_arg" = "--test" ]; then
 			if [ $has_not_set_suite = 0 ]; then
 				suite_name=$(echo $@ | sed -nE 's/.*--suite (.*) .*/\1/p')
-				completions="$(liblinphone_tester --list-tests "$suite_name")"
+				completions="$($program --list-tests "$suite_name")"
 			fi
 		elif [ "$latest_arg" = "--suite" ] || [ "$latest_arg" = "--list-tests" ]; then
-			completions="$(liblinphone_tester --list-suites)"
+			completions="$($program --list-suites)"
 		# we are waiting for a custom value, so do not hint anything
 		elif grep -q -- " $latest_arg " <<< "$command_require_argument"; then
 			completions=""

From b393ffef15975a3a52df5edf1e453a1d3cb23ff6 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Tue, 25 Nov 2014 09:01:30 +0100
Subject: [PATCH 036/496] introduce a new option to put liblinphone tester
 traces into a file (I.E --log-file <filename>)

---
 tester/liblinphone_tester.c | 20 +++++++++-
 tester/tester.c             | 73 +++++++++++++++++++++++++++++++++----
 2 files changed, 83 insertions(+), 10 deletions(-)

diff --git a/tester/liblinphone_tester.c b/tester/liblinphone_tester.c
index 171f4eae9..addf99566 100644
--- a/tester/liblinphone_tester.c
+++ b/tester/liblinphone_tester.c
@@ -25,6 +25,8 @@
 #include "CUnit/CUCurses.h"
 #endif
 
+extern int liblinphone_tester_use_log_file;
+
 #ifdef ANDROID
 
 #include <android/log.h>
@@ -115,6 +117,8 @@ static void liblinphone_tester_qnx_log_handler(OrtpLogLevel lev, const char *fmt
 }
 #endif /* __QNX__ */
 
+
+
 void helper(const char *name) {
 	liblinphone_tester_fprintf(stderr,"%s --help\n"
 			"\t\t\t--verbose\n"
@@ -127,6 +131,7 @@ void helper(const char *name) {
 			"\t\t\t--suite <suite name>\n"
 			"\t\t\t--test <test name>\n"
 			"\t\t\t--dns-hosts </etc/hosts -like file to used to override DNS names (default: tester_hosts)>\n"
+			"\t\t\t--log-file <output log file path>\n"
 #if HAVE_CU_CURSES
 			"\t\t\t--curses\n"
 #endif
@@ -148,7 +153,7 @@ int main (int argc, char *argv[])
 	int ret;
 	const char *suite_name=NULL;
 	const char *test_name=NULL;
-
+	FILE* log_file=NULL;
 #if defined(ANDROID)
 	linphone_core_set_log_handler(linphone_android_ortp_log_handler);
 #elif defined(__QNX__)
@@ -193,7 +198,18 @@ int main (int argc, char *argv[])
 			suite_name = argv[i];
 			liblinphone_tester_list_suite_tests(suite_name);
 			return 0;
-		} else {
+		} else if (strcmp(argv[i],"--log-file")==0){
+			CHECK_ARG("--log-file", ++i, argc);
+			log_file=fopen(argv[i],"w");
+			if (!log_file) {
+				ms_fatal("Cannot open file [%s] for writting logs because [%s]",argv[i],strerror(errno));
+			} else {
+				liblinphone_tester_use_log_file=1;
+				liblinphone_tester_fprintf(stdout,"Redirecting traces to file [%s]",argv[i]);
+				linphone_core_set_log_file(log_file);
+			}
+
+		}else {
 			liblinphone_tester_fprintf(stderr, "Unknown option \"%s\"\n", argv[i]); \
 			helper(argv[0]);
 			return -1;
diff --git a/tester/tester.c b/tester/tester.c
index 971bf5d63..8b2066e53 100644
--- a/tester/tester.c
+++ b/tester/tester.c
@@ -17,7 +17,7 @@
  */
 
 #include <stdio.h>
-#include "CUnit/Basic.h"
+#include "CUnit/TestRun.h"
 #include "linphonecore.h"
 #include "private.h"
 #include "liblinphone_tester.h"
@@ -40,6 +40,7 @@ const char* auth_domain="sip.example.org";
 const char* test_username="liblinphone_tester";
 const char* test_password="secret";
 const char* test_route="sip2.linphone.org";
+int liblinphone_tester_use_log_file=0;
 
 #if WINAPI_FAMILY_PHONE_APP
 const char *liblinphone_tester_file_prefix="Assets";
@@ -140,7 +141,7 @@ static LinphoneCore* configure_lc_from(LinphoneCoreVTable* v_table, const char*
 		lp_config_set_string(config, "sip",   "root_ca"    , rootcapath);
 		lc = linphone_core_new_with_config(v_table, config, user_data);
 	} else {
-		lc = linphone_core_new(v_table,NULL,*filepath!='\0' ? filepath : NULL, user_data);
+		lc = linphone_core_new(v_table,NULL,(filepath!=NULL&&filepath[0]!='\0') ? filepath : NULL, user_data);
 
 		linphone_core_set_ring(lc, ringpath);
 		linphone_core_set_ringback(lc, ringbackpath);
@@ -422,6 +423,56 @@ void liblinphone_tester_uninit(void) {
 	}
 }
 
+/*derivated from cunit*/
+static void test_complete_message_handler(const CU_pTest pTest,
+                                                const CU_pSuite pSuite,
+                                                const CU_pFailureRecord pFailureList) {
+    int i;
+    CU_pFailureRecord pFailure = pFailureList;
+	if (pFailure) {
+		if (liblinphone_tester_use_log_file) ms_warning("Suite [%s], Test [%s] had failures:", pSuite->pName, pTest->pName);
+		liblinphone_tester_fprintf(stdout,"\nSuite [%s], Test [%s] had failures:", pSuite->pName, pTest->pName);
+	} else {
+		if (liblinphone_tester_use_log_file) ms_warning(" passed");
+		liblinphone_tester_fprintf(stdout," passed");
+	}
+      for (i = 1 ; (NULL != pFailure) ; pFailure = pFailure->pNext, i++) {
+    	  if (liblinphone_tester_use_log_file) ms_warning("\n    %d. %s:%u  - %s", i,
+            (NULL != pFailure->strFileName) ? pFailure->strFileName : "",
+            pFailure->uiLineNumber,
+            (NULL != pFailure->strCondition) ? pFailure->strCondition : "");
+    	  liblinphone_tester_fprintf(stdout,"\n    %d. %s:%u  - %s", i,
+            (NULL != pFailure->strFileName) ? pFailure->strFileName : "",
+            pFailure->uiLineNumber,
+            (NULL != pFailure->strCondition) ? pFailure->strCondition : "");
+      }
+ }
+
+
+static void test_all_tests_complete_message_handler(const CU_pFailureRecord pFailure) {
+  if (liblinphone_tester_use_log_file) ms_warning("\n\n %s",CU_get_run_results_string());
+  liblinphone_tester_fprintf(stdout,"\n\n %s",CU_get_run_results_string());
+}
+
+static void test_suite_init_failure_message_handler(const CU_pSuite pSuite) {
+	if (liblinphone_tester_use_log_file) ms_warning("Suite initialization failed for [%s].", pSuite->pName);
+    liblinphone_tester_fprintf(stdout,"Suite initialization failed for [%s].", pSuite->pName);
+}
+
+static void test_suite_cleanup_failure_message_handler(const CU_pSuite pSuite) {
+	if (liblinphone_tester_use_log_file) ms_warning("Suite cleanup failed for '%s'.", pSuite->pName);
+	liblinphone_tester_fprintf(stdout,"Suite cleanup failed for [%s].", pSuite->pName);
+}
+
+static void test_start_message_handler(const CU_pTest pTest, const CU_pSuite pSuite) {
+	if (liblinphone_tester_use_log_file) ms_warning("Suite [%s] Test [%s]", pSuite->pName,pTest->pName);
+	liblinphone_tester_fprintf(stdout,"\nSuite [%s] Test [%s]\n", pSuite->pName,pTest->pName);
+}
+static void test_suite_start_message_handler(const CU_pSuite pSuite) {
+	if (liblinphone_tester_use_log_file) ms_warning("Suite [%s]", pSuite->pName);
+	liblinphone_tester_fprintf(stdout,"\nSuite [%s]", pSuite->pName);
+}
+
 int liblinphone_tester_run_tests(const char *suite_name, const char *test_name) {
 	int i;
 	int ret;
@@ -433,6 +484,14 @@ int liblinphone_tester_run_tests(const char *suite_name, const char *test_name)
 		run_test_suite(test_suite[i]);
 	}
 
+	CU_set_test_start_handler(test_start_message_handler);
+	CU_set_test_complete_handler(test_complete_message_handler);
+	CU_set_all_test_complete_handler(test_all_tests_complete_message_handler);
+	CU_set_suite_init_failure_handler(test_suite_init_failure_message_handler);
+	CU_set_suite_cleanup_failure_handler(test_suite_cleanup_failure_message_handler);
+	CU_set_suite_start_handler(test_suite_start_message_handler);
+
+
 #if !HAVE_CU_GET_SUITE
 	if( suite_name ){
 		ms_warning("Tester compiled without CU_get_suite() function, running all tests instead of suite '%s'\n", suite_name);
@@ -440,7 +499,6 @@ int liblinphone_tester_run_tests(const char *suite_name, const char *test_name)
 #else
 	if (suite_name){
 		CU_pSuite suite;
-		CU_basic_set_mode(CU_BRM_VERBOSE);
 		suite=CU_get_suite(suite_name);
 		if (!suite) {
 			ms_error("Could not find suite '%s'. Available suites are:", suite_name);
@@ -454,11 +512,11 @@ int liblinphone_tester_run_tests(const char *suite_name, const char *test_name)
 				liblinphone_tester_list_suite_tests(suite->pName);
 				return -2;
 			} else {
-				CU_ErrorCode err= CU_basic_run_test(suite, test);
+				CU_ErrorCode err= CU_run_test(suite, test);
 				if (err != CUE_SUCCESS) ms_error("CU_basic_run_test error %d", err);
 			}
 		} else {
-			CU_basic_run_suite(suite);
+			CU_run_suite(suite);
 		}
 	}
 	else
@@ -473,8 +531,7 @@ int liblinphone_tester_run_tests(const char *suite_name, const char *test_name)
 #endif
 		{
 			/* Run all tests using the CUnit Basic interface */
-			CU_basic_set_mode(CU_BRM_VERBOSE);
-			CU_basic_run_tests();
+			CU_run_all_tests();
 		}
 	}
 
@@ -483,7 +540,7 @@ int liblinphone_tester_run_tests(const char *suite_name, const char *test_name)
 	/* Redisplay list of failed tests on end */
 	if (CU_get_number_of_failure_records()){
 		CU_basic_show_failures(CU_get_failure_list());
-		printf("\n");
+		liblinphone_tester_fprintf(stdout,"\n");
 	}
 
 	CU_cleanup_registry();

From 496f4a920ce4b6830a56446cf65e0c71709b5db4 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Tue, 25 Nov 2014 09:08:26 +0100
Subject: [PATCH 037/496] add $(TEST_OPTIONS) to liblinphone tester make file

---
 tester/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tester/Makefile.am b/tester/Makefile.am
index ec5366726..88f17ea28 100644
--- a/tester/Makefile.am
+++ b/tester/Makefile.am
@@ -44,7 +44,7 @@ endif
 
 
 test: liblinphone_tester
-	./liblinphone_tester  --config $(abs_srcdir)
+	./liblinphone_tester  --config $(abs_srcdir) $(TEST_OPTIONS)
 
 else !BUILD_CUNIT_TESTS
 

From 705ace0470a45a29959256fda366037e7318227f Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Tue, 25 Nov 2014 10:19:30 +0100
Subject: [PATCH 038/496] test to get stout working on buildbot

---
 tester/tester.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tester/tester.c b/tester/tester.c
index 8b2066e53..a7bcef044 100644
--- a/tester/tester.c
+++ b/tester/tester.c
@@ -552,7 +552,7 @@ int  liblinphone_tester_fprintf(FILE * stream, const char * format, ...) {
 	va_list args;
 	va_start(args, format);
 #ifndef ANDROID
-	result = vfprintf(stream,format,args);
+	result = vprintf(format,args);
 #else
 	/*used by liblinphone tester to retrieve suite list*/
 	result = 0;

From 991cf8551de52cfa0caa046bdd9269aea1d62044 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Tue, 25 Nov 2014 11:21:27 +0100
Subject: [PATCH 039/496] update ms2 and ortp

---
 mediastreamer2 | 2 +-
 oRTP           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mediastreamer2 b/mediastreamer2
index dfc2fbd36..656c9ed2e 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit dfc2fbd36db97f07f08112ee8217477ba4257744
+Subproject commit 656c9ed2e7bfc053b87ab0c1c945dd37d689f82c
diff --git a/oRTP b/oRTP
index 7508c59d7..e3c89164c 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 7508c59d703b769d510321ff357d10139d476bab
+Subproject commit e3c89164c93c52bad59bbfa523312ed1676b2d98

From 2d70a8120ca2e379f2e22f242387336f9f9872ed Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Tue, 25 Nov 2014 11:20:07 +0100
Subject: [PATCH 040/496] flush liblinphone tester traces

---
 tester/tester.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tester/tester.c b/tester/tester.c
index a7bcef044..a74b0a675 100644
--- a/tester/tester.c
+++ b/tester/tester.c
@@ -552,7 +552,8 @@ int  liblinphone_tester_fprintf(FILE * stream, const char * format, ...) {
 	va_list args;
 	va_start(args, format);
 #ifndef ANDROID
-	result = vprintf(format,args);
+	result = vfprintf(stream,format,args);
+	fflush(stream);
 #else
 	/*used by liblinphone tester to retrieve suite list*/
 	result = 0;

From 660d800839057178672e7d5c2b5c9a2a2a79d731 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
 <francois.grisez@belledonne-communications.com>
Date: Tue, 25 Nov 2014 14:02:57 +0100
Subject: [PATCH 041/496] Make the call recording testers to remove the record
 file after testing

---
 tester/call_tester.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tester/call_tester.c b/tester/call_tester.c
index ff385b7a5..ac0988376 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -3095,6 +3095,7 @@ static void record_call(const char *filename, bool_t enableVideo) {
 			end_call(marie, pauline);
 			CU_ASSERT_EQUAL(access(filepath, F_OK), 0);
 		}
+		remove(filepath);
 		ms_free(filepath);
 	}
 	linphone_core_manager_destroy(marie);

From 3b7091e39aa72456abac997a4e1e245bfa13a716 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Tue, 25 Nov 2014 15:28:20 +0100
Subject: [PATCH 042/496] Update oRTP, possibly fix call paused resumed test

---
 oRTP | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/oRTP b/oRTP
index e3c89164c..672d511d3 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit e3c89164c93c52bad59bbfa523312ed1676b2d98
+Subproject commit 672d511d3218c87adb6923c33f61b1ac4ed166cd

From c0e80d83d8f09b9bfd52c82e818e6a9d83b4abc0 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Tue, 25 Nov 2014 15:31:29 +0100
Subject: [PATCH 043/496] Clean paused resumed test to ease readibility

---
 tester/call_tester.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/tester/call_tester.c b/tester/call_tester.c
index ac0988376..fc2ef00ed 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -378,7 +378,7 @@ static void direct_call_over_ipv6(){
 		CU_ASSERT_TRUE(wait_for_until(pauline->lc, NULL, &pauline->stat.number_of_LinphoneRegistrationOk, 2, 2000));
 		CU_ASSERT_TRUE(wait_for_until(pauline->lc, NULL, &marie->stat.number_of_LinphoneRegistrationOk, 2, 2000));
 #endif
-	
+
 		linphone_core_get_sip_transports_used(pauline->lc,&pauline_transports);
 		linphone_address_set_port(pauline_dest,pauline_transports.tcp_port);
 		linphone_core_invite_address(marie->lc,pauline_dest);
@@ -709,10 +709,10 @@ static void disable_all_video_codecs_except_one(LinphoneCore *lc, const char *mi
 
 static void call_failed_because_of_codecs(void) {
 	int begin,leaked_objects;
-	
+
 	belle_sip_object_enable_leak_detector(TRUE);
 	begin=belle_sip_object_get_object_count();
-	
+
 	{
 		LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
 		LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
@@ -1145,13 +1145,12 @@ static void call_paused_resumed_with_loss(void) {
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
 	LinphoneCall* call_pauline;
 	const rtp_stats_t * stats;
-
+	float loss_percentage;
 
 	OrtpNetworkSimulatorParams params={0};
 	params.enabled=TRUE;
 	params.loss_rate=25;
 
-
 	CU_ASSERT_TRUE(call(pauline,marie));
 	call_pauline = linphone_core_get_current_call(pauline->lc);
 	rtp_session_enable_network_simulation(call_pauline->audiostream->ms.sessions.rtp_session,&params);
@@ -1159,25 +1158,28 @@ static void call_paused_resumed_with_loss(void) {
 
 	wait_for_until(pauline->lc, marie->lc, NULL, 5, 4000);
 
+	stats = rtp_session_get_stats(call_pauline->sessions->rtp_session);
 	linphone_core_pause_call(pauline->lc,call_pauline);
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallPausing,1));
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallPausedByRemote,1));
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallPaused,1));
 
 	/*stay in pause a little while in order to generate traffic*/
-	wait_for_until(pauline->lc, marie->lc, NULL, 5, 2000);
+	wait_for_until(pauline->lc, marie->lc, NULL, 5, 10000);
 
 	linphone_core_resume_call(pauline->lc,call_pauline);
 
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallStreamsRunning,2));
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallStreamsRunning,2));
 	/*same here: wait a while for a bit of a traffic, we need to receive a RTCP packet*/
-	wait_for_until(pauline->lc, marie->lc, NULL, 5, 5000);
+	wait_for_until(pauline->lc, marie->lc, NULL, 5, 6000);
 
 	/*since stats are NOT totally reset during pause, the stats->packet_recv is computed from
 	the start of call. This test ensures that the loss rate is consistent during the entire call.*/
 	stats = rtp_session_get_stats(call_pauline->sessions->rtp_session);
-	CU_ASSERT_TRUE(((stats->cum_packet_loss * 100.f / stats->packet_recv) / params.loss_rate) > .5f);
+	loss_percentage = stats->cum_packet_loss * 100.f / stats->packet_recv;
+	CU_ASSERT_TRUE(.75 * params.loss_rate < loss_percentage);
+	CU_ASSERT_TRUE(loss_percentage < 1.25 * params.loss_rate);
 
 	/*just to sleep*/
 	linphone_core_terminate_all_calls(pauline->lc);

From 1d75349823a58aaaf24840356b24e6b50d2d7a6b Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Tue, 25 Nov 2014 15:37:11 +0100
Subject: [PATCH 044/496] Update ms2 and remove debug test

---
 mediastreamer2       | 2 +-
 tester/call_tester.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 656c9ed2e..7e4bdef10 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 656c9ed2e7bfc053b87ab0c1c945dd37d689f82c
+Subproject commit 7e4bdef10dd32b6c9fbc7c84994dd23c5af87597
diff --git a/tester/call_tester.c b/tester/call_tester.c
index fc2ef00ed..91fe27286 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -1158,7 +1158,6 @@ static void call_paused_resumed_with_loss(void) {
 
 	wait_for_until(pauline->lc, marie->lc, NULL, 5, 4000);
 
-	stats = rtp_session_get_stats(call_pauline->sessions->rtp_session);
 	linphone_core_pause_call(pauline->lc,call_pauline);
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallPausing,1));
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallPausedByRemote,1));

From 5aeb75c91761e5905addacefb11be26866059a38 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Tue, 25 Nov 2014 16:21:23 +0100
Subject: [PATCH 045/496] Update completions script to handle properly commads
 with arg

---
 tester/liblinphone_completion | 41 +++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/tester/liblinphone_completion b/tester/liblinphone_completion
index 3ff1304ba..a16856333 100644
--- a/tester/liblinphone_completion
+++ b/tester/liblinphone_completion
@@ -21,10 +21,7 @@
 # source this file in your .rc file
 
 _liblinphone_complete() {
-	local completions command_require_argument prev_arg latest_arg available_tasks has_not_set_suite suite_name
-	# these commands expect an argument
-	command_require_argument=(--list-tests --config --domain --auth-domain --dns-hosts --suite --test)
-
+	local completions command_requiring_argument prev_arg latest_arg available_tasks has_not_set_suite suite_name
 
 	if [ -n "$BASH_VERSION" ]; then
 		set -- "${COMP_WORDS[@]}" #convert them to arguments (eg $1,$#,$@,etc.)
@@ -37,7 +34,6 @@ _liblinphone_complete() {
 	program=$1
 	shift
 
-
 	# if user required help, do not complete anything
 	if ! grep -q -- "--help" <<< "$@"; then
 		# retrieve the last argument
@@ -55,6 +51,10 @@ _liblinphone_complete() {
 
 		# get the tasks available, from --help
 		available_tasks="$($program 2>&1 --help | sed -nE "s/.*--([^ ]*).*/--\\1/p")"
+
+		# these commands expect an argument
+		command_requiring_argument="$($program 2>&1 --help | sed -nE "s/.*--(.*) <.*/--\\1/p")"
+
 		# remove all already provided tasks (it's useless to provide them twice)
 		if [[ ! -z "$@" ]]; then
 			current_tasks=$(echo $@ | grep -Eo -- "--([^ ])*" | tr '\n' '|' | sed 's/|/$|/g')--$
@@ -85,26 +85,29 @@ _liblinphone_complete() {
 		elif [ "$latest_arg" = "--suite" ] || [ "$latest_arg" = "--list-tests" ]; then
 			completions="$($program --list-suites)"
 		# we are waiting for a custom value, so do not hint anything
-		elif grep -q -- " $latest_arg " <<< "$command_require_argument"; then
+		elif grep -q -- "^$latest_arg$" <<< "$command_requiring_argument"; then
 			completions=""
 		else
 			completions="$available_tasks"
 		fi
 	fi
 
-	if [ -n "$BASH_VERSION" ]; then
-		# COMPREPLY=( $(echo $completions | sed 's/ /\\ /g' )) #| sed -e 's/^/"/g' -e  's/$/"/g' | tr '\n' ' ') )
-		IFS=$'\n'
-		COMPREPLY=($(compgen -W "${completions}" -- ${COMP_WORDS[COMP_CWORD]}))
-	elif [ -n "$ZSH_VERSION" ]; then
-		reply=( "${(ps:\n:)completions}" )
+	if [ ! -z "$completions"  ]; then
+		if [ -n "$BASH_VERSION" ]; then
+			IFS=$'\n'  #if that even necessary?
+			COMPREPLY=($(compgen -W "${completions}" -- ${COMP_WORDS[COMP_CWORD]}))
+		elif [ -n "$ZSH_VERSION" ]; then
+			reply=( "${(ps:\n:)completions}" )
+		fi
 	fi
 }
 
-if [ -n "$BASH_VERSION" ]; then
-	complete -F _liblinphone_complete liblinphone_tester
-elif [ -n "$ZSH_VERSION" ]; then
-	compctl -K _liblinphone_complete liblinphone_tester
-else
-	echo "Your shell might be not supported! Only bash and zsh tested."
-fi
+for tester in liblinphone_tester mediastreamer2_tester belle_sip_tester; do
+	if [ -n "$BASH_VERSION" ]; then
+		complete -F _liblinphone_complete $tester
+	elif [ -n "$ZSH_VERSION" ]; then
+		compctl -K _liblinphone_complete $tester
+	else
+		echo "Your shell might be not supported! Only bash and zsh tested."
+	fi
+done

From a197741416048719a39f0de49b2bc5daa9db8ed0 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Tue, 25 Nov 2014 16:59:08 +0100
Subject: [PATCH 046/496] Fix completions script when suites have spaces

---
 tester/liblinphone_completion | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tester/liblinphone_completion b/tester/liblinphone_completion
index a16856333..c58cc42c1 100644
--- a/tester/liblinphone_completion
+++ b/tester/liblinphone_completion
@@ -72,20 +72,20 @@ _liblinphone_complete() {
 		if [ $latest_is_empty = 0 ] && ! grep -q -- '^--' <<< "$latest_arg"; then
 			# echo "yes!$prev_arg $has_not_set_suite"
 			if [ "$prev_arg" = "--test" ] && [ $has_not_set_suite = 0 ]; then
-				suite_name=$(echo $@ | sed -nE 's/.*--suite ([^ ]*) .*/\1/p')
-				completions="$($program --list-tests "$suite_name" | grep "^$latest_arg")"
+				suite_name=$(echo $@ | sed -nE 's/.*--suite (.*) (--.*)$/\1/p' |sed "s@\\\\@@g")
+				completions="$($program --list-tests $suite_name | grep "^$latest_arg")"
 			elif [ "$prev_arg" = "--suite" ] || [ "$prev_arg" = "--list-tests" ]; then
 				completions="$($program --list-suites)"
 			fi
 		elif [ "$latest_arg" = "--test" ]; then
 			if [ $has_not_set_suite = 0 ]; then
-				suite_name=$(echo $@ | sed -nE 's/.*--suite (.*) .*/\1/p')
-				completions="$($program --list-tests "$suite_name")"
+				suite_name=$(echo $@ | sed -nE 's/.*--suite (.*) (--.*)$/\1/p' |sed "s@\\\\@@g")
+				completions="$($program --list-tests $suite_name)"
 			fi
 		elif [ "$latest_arg" = "--suite" ] || [ "$latest_arg" = "--list-tests" ]; then
 			completions="$($program --list-suites)"
 		# we are waiting for a custom value, so do not hint anything
-		elif grep -q -- "^$latest_arg$" <<< "$command_requiring_argument"; then
+		elif [[ ! -z "$latest_arg" ]] && grep -q -- "^$latest_arg$" <<< "$command_requiring_argument"; then
 			completions=""
 		else
 			completions="$available_tasks"

From 59e1152de207645aaccbb7481645efecd834a797 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Tue, 25 Nov 2014 17:47:36 +0100
Subject: [PATCH 047/496] update ms2 and ortp and fix potential crash in gtk UI

---
 gtk/chat.c     | 3 ++-
 mediastreamer2 | 2 +-
 oRTP           | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/gtk/chat.c b/gtk/chat.c
index c05f32e4a..daa5fd95a 100644
--- a/gtk/chat.c
+++ b/gtk/chat.c
@@ -474,8 +474,9 @@ void linphone_gtk_load_chatroom(LinphoneChatRoom *cr,const LinphoneAddress *uri,
 }
 
 void linphone_gtk_chat_destroyed(GtkWidget *w){
+	/*
 	LinphoneChatRoom *cr=(LinphoneChatRoom*)g_object_get_data(G_OBJECT(w),"cr");
-	linphone_chat_room_destroy(cr);
+	*/
 }
 
 
diff --git a/mediastreamer2 b/mediastreamer2
index 7e4bdef10..83e6c0dca 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 7e4bdef10dd32b6c9fbc7c84994dd23c5af87597
+Subproject commit 83e6c0dcaa3e88678423461848b6f3fb13bcc7dd
diff --git a/oRTP b/oRTP
index 672d511d3..277534655 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 672d511d3218c87adb6923c33f61b1ac4ed166cd
+Subproject commit 27753465516af7ace7769bf7e466043f97b8b787

From cdc14e2b737c91711aeb81f86cd7b04aab4a9f9e Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Tue, 25 Nov 2014 18:29:26 +0100
Subject: [PATCH 048/496] Handle GTK UI compilation when building with CMake.

---
 CMakeLists.txt         |  7 ++++
 config.h.cmake         |  5 +++
 coreapi/CMakeLists.txt | 28 ++++++++-------
 gtk/CMakeLists.txt     | 82 ++++++++++++++++++++++++++++++++++++++++++
 pixmaps/CMakeLists.txt | 64 +++++++++++++++++++++++++++++++++
 5 files changed, 173 insertions(+), 13 deletions(-)
 create mode 100644 gtk/CMakeLists.txt
 create mode 100644 pixmaps/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4311101fd..65446420a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,6 +30,8 @@ set(LINPHONE_MICRO_VERSION "0")
 set(LINPHONE_VERSION "${LINPHONE_MAJOR_VERSION}.${LINPHONE_MINOR_VERSION}.${LINPHONE_MICRO_VERSION}")
 set(LINPHONE_SO_VERSION "6")
 
+set(LINPHONE_ALL_LANGS "cs de es fr he hu it ja nb_NO nl pl pt_BR ru sr sv zh_CN zh_TW")
+
 
 include(CMakeDependentOption)
 
@@ -88,6 +90,7 @@ if(MSVC)
 endif()
 
 
+set(GETTEXT_PACKAGE "linphone")
 if(ENABLE_RELATIVE_PREFIX)
 	set(LINPHONE_DATA_DIR ".")
 else()
@@ -104,6 +107,10 @@ add_definitions(-DHAVE_CONFIG_H)
 
 add_subdirectory(coreapi)
 add_subdirectory(share)
+if(ENABLE_GTK_UI)
+	add_subdirectory(gtk)
+	add_subdirectory(pixmaps)
+endif()
 if(ENABLE_TOOLS)
 	add_subdirectory(tools)
 endif()
diff --git a/config.h.cmake b/config.h.cmake
index f348cf3f9..9756ebbd7 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -26,7 +26,12 @@
 #define LINPHONE_VERSION "${LINPHONE_VERSION}"
 #define LIBLINPHONE_VERSION "${LINPHONE_VERSION}"
 
+#define LINPHONE_ALL_LANGS "${LINPHONE_ALL_LANGS}"
+
 #define LINPHONE_PLUGINS_DIR "${LINPHONE_PLUGINS_DIR}"
+
+#define GETTEXT_PACKAGE "${GETTEXT_PACKAGE}"
+
 #define PACKAGE_LOCALE_DIR "${PACKAGE_LOCALE_DIR}"
 #define PACKAGE_DATA_DIR "${PACKAGE_DATA_DIR}"
 #define PACKAGE_SOUND_DIR "${PACKAGE_SOUND_DIR}"
diff --git a/coreapi/CMakeLists.txt b/coreapi/CMakeLists.txt
index 2369501c7..6efc80e60 100644
--- a/coreapi/CMakeLists.txt
+++ b/coreapi/CMakeLists.txt
@@ -31,6 +31,7 @@ set(SOURCE_FILES
 	authentication.c
 	bellesip_sal/sal_address_impl.c
 	bellesip_sal/sal_impl.c
+	bellesip_sal/sal_impl.h
 	bellesip_sal/sal_op_call.c
 	bellesip_sal/sal_op_call_transfer.c
 	bellesip_sal/sal_op_events.c
@@ -46,43 +47,44 @@ set(SOURCE_FILES
 	call_params.c
 	chat.c
 	conference.c
+	contactprovider.c
 	content.c
+	dict.c
 	ec-calibrator.c
 	enum.c
+	enum.h
 	event.c
+	event.h
 	friend.c
 	info.c
+	ldap/ldapprovider.c
 	linphonecall.c
 	linphonecore.c
+	linphonecore.h
+	linphonecore_utils.h
+	linphonefriend.h
 	linphone_tunnel_config.c
+	linphone_tunnel.h
 	lpconfig.c
+	lpconfig.h
 	lsd.c
 	message_storage.c
 	misc.c
 	offeranswer.c
+	offeranswer.h
 	player.c
 	presence.c
+	private.h
 	proxy.c
 	quality_reporting.c
 	remote_provisioning.c
 	sal.c
 	siplogin.c
 	sipsetup.c
-	xml.c
-	xml2lpc.c
-	bellesip_sal/sal_impl.h
-	enum.h
-	event.h
-	linphonecore.h
-	linphonecore_utils.h
-	linphonefriend.h
-	linphone_tunnel.h
-	lpconfig.h
-	offeranswer.h
-	private.h
 	sipsetup.h
+	xml2lpc.c
 	xml2lpc.h
-)
+	xml.c)
 if(ENABLE_TUNNEL)
 	list(APPEND SOURCE_FILES
 		linphone_tunnel.cc
diff --git a/gtk/CMakeLists.txt b/gtk/CMakeLists.txt
new file mode 100644
index 000000000..0092be84a
--- /dev/null
+++ b/gtk/CMakeLists.txt
@@ -0,0 +1,82 @@
+############################################################################
+# CMakeLists.txt
+# Copyright (C) 2014  Belledonne Communications, Grenoble France
+#
+############################################################################
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# 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.
+#
+############################################################################
+
+find_package(GTK2 2.10 REQUIRED gtk)
+
+set(UI_FILES
+	about.ui
+	audio_assistant.ui
+	buddylookup.ui
+	call_logs.ui
+	call_statistics.ui
+	config-uri.ui
+	contact.ui
+	dscp_settings.ui
+	keypad.ui
+	ldap.ui
+	log.ui
+	main.ui
+	parameters.ui
+	password.ui
+	provisioning-fetch.ui
+	sip_account.ui
+	tunnel_config.ui
+	waiting.ui
+)
+
+set(PIXMAPS stock_people.png)
+
+set(SOURCE_FILES
+	audio_assistant.c
+	buddylookup.c
+	calllogs.c
+	chat.c
+	conference.c
+	config-fetching.c
+	friendlist.c
+	incall_view.c
+	logging.c
+	loginframe.c
+	main.c
+	propertybox.c
+	singleinstance.c
+	support.c
+	update.c
+	utils.c
+	videowindow.c
+)
+
+add_executable(linphone-gtk ${SOURCE_FILES})
+target_include_directories(linphone-gtk PUBLIC ${GTK2_INCLUDE_DIRS})
+target_link_libraries(linphone-gtk linphone ${GTK2_LIBRARIES})
+
+install(TARGETS linphone-gtk
+	RUNTIME DESTINATION bin
+	LIBRARY DESTINATION lib
+	ARCHIVE DESTINATION lib
+	PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+)
+
+install(FILES ${UI_FILES} ${PIXMAPS}
+	DESTINATION ${PACKAGE_DATA_DIR}/linphone
+	PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+)
diff --git a/pixmaps/CMakeLists.txt b/pixmaps/CMakeLists.txt
new file mode 100644
index 000000000..61dacfe46
--- /dev/null
+++ b/pixmaps/CMakeLists.txt
@@ -0,0 +1,64 @@
+############################################################################
+# CMakeLists.txt
+# Copyright (C) 2014  Belledonne Communications, Grenoble France
+#
+############################################################################
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# 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.
+#
+############################################################################
+
+set(PIXMAPS
+	active_chat.png
+	addcall-green.png
+	call.png
+	call_status_incoming.png
+	call_status_outgoing.png
+	chat_message_delivered.png
+	chat_message_inprogress.png
+	chat_message_not_delivered.png
+	chat.png
+	composing_active_chat.png
+	composing_chat.png
+	contact-orange.png
+	contact_starred.png
+	contact_unstarred.png
+	dialer-orange.png
+	dialer.png
+	history-orange.png
+	hold_off.png
+	hold_on.png
+	linphone-banner.png
+	linphone.icns
+	linphone.png
+	mic_active.png
+	mic_muted.png
+	notok.png
+	ok.png
+	speaker.png
+	startcall-green.png
+	startcall-small.png
+	status-green.png
+	status-offline.png
+	status-orange.png
+	status-red.png
+	stopcall-red.png
+	stopcall-small.png
+)
+
+install(FILES ${PIXMAPS}
+	DESTINATION ${PACKAGE_DATA_DIR}/pixmaps/linphone
+	PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+)

From 9ccafea592133ac51a3c5fd8462d972e6929f515 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Wed, 26 Nov 2014 09:38:13 +0100
Subject: [PATCH 049/496] Use proper readline detection

---
 README.macos.md |  5 +----
 m4/readline.m4  | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/README.macos.md b/README.macos.md
index c4723f29d..cfe0a40a9 100644
--- a/README.macos.md
+++ b/README.macos.md
@@ -112,10 +112,7 @@ The libvpx build isn't able to produce dual architecture files. To workaround th
  If you got the source code from git, run `./autogen.sh` first.
  Then or otherwise, :
 
-        # HomeBrew
-        PKG_CONFIG_PATH=/usr/local/lib/pkgconfig ./configure --prefix=/opt/local --disable-x11 --with-srtp=/opt/local --with-gsm=/opt/local --enable-zrtp --disable-strict --with-readline=/usr/local && make
-        # MacPorts
-        PKG_CONFIG_PATH=/usr/local/lib/pkgconfig ./configure --prefix=/opt/local --disable-x11 --with-srtp=/opt/local --with-gsm=/opt/local --enable-zrtp --disable-strict --with-readline=/opt/local && make
+        PKG_CONFIG_PATH=/usr/local/lib/pkgconfig ./configure --prefix=/opt/local --disable-x11 --with-srtp=/opt/local --with-gsm=/opt/local --enable-zrtp --disable-strict && make
 
 * Install on the system
 
diff --git a/m4/readline.m4 b/m4/readline.m4
index ebb7656cd..16065e348 100644
--- a/m4/readline.m4
+++ b/m4/readline.m4
@@ -5,8 +5,12 @@
 AC_DEFUN([LP_CHECK_READLINE],[
 
 AC_ARG_WITH( readline,
-      [  --with-readline      Set prefix where gnu readline headers and libs can be found (ex:/usr, /usr/local, none) [default=/usr] ],
-      [ readline_prefix=${withval}],[ readline_prefix="/usr" ])
+	[ --with-readline	Set prefix where gnu readline headers and libs can be found (ex:/usr, /usr/local, none) [default=/usr] ],
+	[ readline_prefix=${withval} ],
+	[ readline_prefix="/usr/local" ],
+	[ readline_prefix="/opt/local" ],
+	[ readline_prefix="/usr" ]
+)
 
 if test "$readline_prefix" != "none"; then
 
@@ -14,14 +18,14 @@ if test "$readline_prefix" != "none"; then
 		READLINE_CFLAGS="-I$readline_prefix/include"
 		READLINE_LIBS="-L$readline_prefix/lib"
 	fi
-	
+
 	CPPFLAGS_save=$CPPFLAGS
 	LIBS_save=$LIBS
 	CPPFLAGS="$CPPFLAGS $READLINE_CFLAGS"
 	LIBS="$LIBS $READLINE_LIBS"
 	AC_CHECK_HEADERS(readline.h readline/readline.h, readline_h_found=yes)
 	AC_CHECK_HEADERS(history.h readline/history.h)
-	
+
 	for termcap_lib in "" -ltermcap -lcurses -lncurses; do
 		unset ac_cv_lib_readline_readline
 		AC_CHECK_LIB(readline, readline, [readline_libs_found=yes],[],[$termcap_lib])
@@ -33,14 +37,14 @@ if test "$readline_prefix" != "none"; then
 
 	LIBS=$LIBS_save
 	CPPFLAGS=$CPPFLAGS_save
-	
+
 	if test "$readline_libs_found$readline_h_found" != "yesyes" ; then
 		AC_MSG_WARN([Could not find libreadline headers or library, linphonec will have limited prompt features])
 	else
 		AC_DEFINE([HAVE_READLINE],1,[defined when compiling with readline support])
 	fi
-	
-	
+
+
 	AC_SUBST(READLINE_CFLAGS)
 	AC_SUBST(READLINE_LIBS)
 

From 39f1f11d74e222c17d70ce7fbf620ad2dc490e9d Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Wed, 26 Nov 2014 11:31:09 +0100
Subject: [PATCH 050/496] Remove useless grep in completion script

---
 tester/liblinphone_completion | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tester/liblinphone_completion b/tester/liblinphone_completion
index c58cc42c1..a0d05f3e0 100644
--- a/tester/liblinphone_completion
+++ b/tester/liblinphone_completion
@@ -73,7 +73,7 @@ _liblinphone_complete() {
 			# echo "yes!$prev_arg $has_not_set_suite"
 			if [ "$prev_arg" = "--test" ] && [ $has_not_set_suite = 0 ]; then
 				suite_name=$(echo $@ | sed -nE 's/.*--suite (.*) (--.*)$/\1/p' |sed "s@\\\\@@g")
-				completions="$($program --list-tests $suite_name | grep "^$latest_arg")"
+				completions="$($program --list-tests $suite_name)"
 			elif [ "$prev_arg" = "--suite" ] || [ "$prev_arg" = "--list-tests" ]; then
 				completions="$($program --list-suites)"
 			fi

From e4aa948bb9ef316c044dc525c9f543e971f35be9 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Wed, 26 Nov 2014 12:14:31 +0100
Subject: [PATCH 051/496] implement immediate destruction of iOS AudioUnit when
 no calls are active.

---
 coreapi/linphonecore.c | 1 +
 mediastreamer2         | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 07beaf135..b57c18d4f 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -6395,6 +6395,7 @@ bool_t linphone_core_can_we_add_call(LinphoneCore *lc)
 static void notify_soundcard_usage(LinphoneCore *lc, bool_t used){
 	MSSndCard *card=lc->sound_conf.capt_sndcard;
 	if (card && ms_snd_card_get_capabilities(card) & MS_SND_CARD_CAP_IS_SLOW){
+		ms_message("Notifying soundcard that we don't need it anymore for calls.");
 		ms_snd_card_set_usage_hint(card,used);
 	}
 }
diff --git a/mediastreamer2 b/mediastreamer2
index 83e6c0dca..fa739e091 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 83e6c0dcaa3e88678423461848b6f3fb13bcc7dd
+Subproject commit fa739e091ed5d483937771cc2ab310c442ba72d8

From 91c9bbaeb4b3c857a8155c3de1c954b306b1fb8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
 <francois.grisez@belledonne-communications.com>
Date: Wed, 26 Nov 2014 12:21:07 +0100
Subject: [PATCH 052/496] Update mediastreamer2

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index fa739e091..3333c0da8 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit fa739e091ed5d483937771cc2ab310c442ba72d8
+Subproject commit 3333c0da86e23ab498c74896c67d53121fb91002

From 96ca18f8dbdcfac0892d690f0508ce2eb8c748df Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Wed, 26 Nov 2014 12:54:01 +0100
Subject: [PATCH 053/496] Finally fix the call paused resumed with loss test

---
 oRTP                        |  2 +-
 tester/call_tester.c        | 45 ++++++++++++++++++++++++-------------
 tester/liblinphone_tester.h |  5 +++++
 tester/tester.c             |  1 +
 4 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/oRTP b/oRTP
index 277534655..a3debbd39 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 27753465516af7ace7769bf7e466043f97b8b787
+Subproject commit a3debbd394fb32ab54ed265d2190711971c890e7
diff --git a/tester/call_tester.c b/tester/call_tester.c
index 91fe27286..48bb67864 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -79,6 +79,16 @@ void call_state_changed(LinphoneCore *lc, LinphoneCall *call, LinphoneCallState
 		CU_FAIL("unexpected event");break;
 	}
 }
+
+void call_stats_updated(LinphoneCore *lc, LinphoneCall *call, const LinphoneCallStats *lstats) {
+	stats* counters = get_stats(lc);
+	if (lstats->updated == LINPHONE_CALL_STATS_RECEIVED_RTCP_UPDATE) {
+		counters->number_of_rtcp_received++;
+	} else if (lstats->updated == LINPHONE_CALL_STATS_SENT_RTCP_UPDATE) {
+		counters->number_of_rtcp_sent++;
+	}
+}
+
 void linphone_call_encryption_changed(LinphoneCore *lc, LinphoneCall *call, bool_t on, const char *authentication_token) {
 	char* to=linphone_address_as_string(linphone_call_get_call_log(call)->to);
 	char* from=linphone_address_as_string(linphone_call_get_call_log(call)->from);
@@ -1140,52 +1150,57 @@ static void call_paused_resumed(void) {
 	linphone_core_manager_destroy(pauline);
 }
 
+#define CHECK_CURRENT_LOSS_RATE() \
+	rtcp_count_current = pauline->stat.number_of_rtcp_sent; \
+	/*wait for an RTCP packet to have an accurate cumulative lost value*/ \
+	CU_ASSERT_TRUE(wait_for_until(pauline->lc, marie->lc, &pauline->stat.number_of_rtcp_sent, rtcp_count_current+1, 10000)); \
+	stats = rtp_session_get_stats(call_pauline->audiostream->ms.sessions.rtp_session); \
+	loss_percentage = stats->cum_packet_loss * 100.f / (stats->packet_recv + stats->cum_packet_loss); \
+	CU_ASSERT_TRUE(.75 * params.loss_rate < loss_percentage); \
+	CU_ASSERT_TRUE(loss_percentage < 1.25 * params.loss_rate)
+
 static void call_paused_resumed_with_loss(void) {
 	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
 	LinphoneCall* call_pauline;
 	const rtp_stats_t * stats;
 	float loss_percentage;
+	int rtcp_count_current;
 
 	OrtpNetworkSimulatorParams params={0};
 	params.enabled=TRUE;
-	params.loss_rate=25;
+	params.loss_rate=20;
 
 	CU_ASSERT_TRUE(call(pauline,marie));
 	call_pauline = linphone_core_get_current_call(pauline->lc);
 	rtp_session_enable_network_simulation(call_pauline->audiostream->ms.sessions.rtp_session,&params);
-	rtp_session_enable_network_simulation(call_pauline->videostream->ms.sessions.rtp_session,&params);
 
-	wait_for_until(pauline->lc, marie->lc, NULL, 5, 4000);
+	/*generate some traffic*/
+	wait_for_until(pauline->lc, marie->lc, NULL, 5, 6000);
+	CHECK_CURRENT_LOSS_RATE();
 
+	/*pause call*/
 	linphone_core_pause_call(pauline->lc,call_pauline);
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallPausing,1));
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallPausedByRemote,1));
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallPaused,1));
-
 	/*stay in pause a little while in order to generate traffic*/
-	wait_for_until(pauline->lc, marie->lc, NULL, 5, 10000);
+	wait_for_until(pauline->lc, marie->lc, NULL, 5, 5000);
+	CHECK_CURRENT_LOSS_RATE();
 
+	/*resume*/
 	linphone_core_resume_call(pauline->lc,call_pauline);
-
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallStreamsRunning,2));
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallStreamsRunning,2));
-	/*same here: wait a while for a bit of a traffic, we need to receive a RTCP packet*/
 	wait_for_until(pauline->lc, marie->lc, NULL, 5, 6000);
 
 	/*since stats are NOT totally reset during pause, the stats->packet_recv is computed from
 	the start of call. This test ensures that the loss rate is consistent during the entire call.*/
-	stats = rtp_session_get_stats(call_pauline->sessions->rtp_session);
-	loss_percentage = stats->cum_packet_loss * 100.f / stats->packet_recv;
-	CU_ASSERT_TRUE(.75 * params.loss_rate < loss_percentage);
-	CU_ASSERT_TRUE(loss_percentage < 1.25 * params.loss_rate);
-
-	/*just to sleep*/
-	linphone_core_terminate_all_calls(pauline->lc);
+	CHECK_CURRENT_LOSS_RATE();
+	linphone_core_terminate_all_calls(marie->lc);
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,1));
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1));
 
-
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
 }
diff --git a/tester/liblinphone_tester.h b/tester/liblinphone_tester.h
index d7f5c26ce..a7c82913a 100644
--- a/tester/liblinphone_tester.h
+++ b/tester/liblinphone_tester.h
@@ -206,6 +206,10 @@ typedef struct _stats {
 
 	char * dtmf_list_received;
 	int dtmf_count;
+
+	int number_of_rtcp_sent;
+	int number_of_rtcp_received;
+
 }stats;
 
 typedef struct _LinphoneCoreManager {
@@ -247,6 +251,7 @@ void linphone_notify_received(LinphoneCore *lc, LinphoneEvent *lev, const char *
 void linphone_configuration_status(LinphoneCore *lc, LinphoneConfiguringState status, const char *message);
 void linphone_call_encryption_changed(LinphoneCore *lc, LinphoneCall *call, bool_t on, const char *authentication_token);
 void dtmf_received(LinphoneCore *lc, LinphoneCall *call, int dtmf);
+void call_stats_updated(LinphoneCore *lc, LinphoneCall *call, const LinphoneCallStats *stats);
 
 LinphoneAddress * create_linphone_address(const char * domain);
 bool_t wait_for(LinphoneCore* lc_1, LinphoneCore* lc_2,int* counter,int value);
diff --git a/tester/tester.c b/tester/tester.c
index a74b0a675..d8639db47 100644
--- a/tester/tester.c
+++ b/tester/tester.c
@@ -247,6 +247,7 @@ LinphoneCoreManager* linphone_core_manager_new2(const char* rc_file, int check_f
 	mgr->v_table.call_encryption_changed=linphone_call_encryption_changed;
 	mgr->v_table.network_reachable=network_reachable;
 	mgr->v_table.dtmf_received=dtmf_received;
+	mgr->v_table.call_stats_updated=call_stats_updated;
 
 	reset_counters(&mgr->stat);
 	if (rc_file) rc_path = ms_strdup_printf("rcfiles/%s", rc_file);

From 06de47db2e497b60d420c2aa72107e3694f2ba8d Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Wed, 26 Nov 2014 13:40:53 +0100
Subject: [PATCH 054/496] Fix a special case in message history retrieval. This
 function is not yet completely tested,

---
 coreapi/message_storage.c | 2 +-
 tester/message_tester.c   | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/coreapi/message_storage.c b/coreapi/message_storage.c
index 55fc82685..2684ba0b5 100644
--- a/coreapi/message_storage.c
+++ b/coreapi/message_storage.c
@@ -371,7 +371,7 @@ MSList *linphone_chat_room_get_history_range(LinphoneChatRoom *cr, int startm, i
 
 	if (startm<0) startm=0;
 
-	if (endm>0&&endm>=startm){
+	if ((endm>0&&endm>=startm) || (startm == 0 && endm == 0) ){
 		buf2=ms_strdup_printf("%s LIMIT %i ",buf,endm+1-startm);
 		ms_free(buf);
 		buf = buf2;
diff --git a/tester/message_tester.c b/tester/message_tester.c
index 9d207d034..ab7a83077 100644
--- a/tester/message_tester.c
+++ b/tester/message_tester.c
@@ -1045,6 +1045,10 @@ static void history_messages_count() {
 		CU_ASSERT_EQUAL(ms_list_size(messages), 10);
 		ms_list_free_with_data(messages, (void (*)(void*))linphone_chat_message_unref);
 
+		messages=linphone_chat_room_get_history(chatroom,1);
+		CU_ASSERT_EQUAL(ms_list_size(messages), 1);
+		ms_list_free_with_data(messages, (void (*)(void*))linphone_chat_message_unref);
+
 		messages=linphone_chat_room_get_history(chatroom,0);
 		CU_ASSERT_EQUAL(linphone_chat_room_get_history_size(chatroom), 1270);
 		CU_ASSERT_EQUAL(ms_list_size(messages), 1270);

From e87403f3249c1dd38a09180f761c60c88c354500 Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Wed, 26 Nov 2014 13:52:36 +0100
Subject: [PATCH 055/496] Use a debug message instead of message for timing
 measurements

---
 coreapi/message_storage.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/coreapi/message_storage.c b/coreapi/message_storage.c
index 2684ba0b5..66d49a3db 100644
--- a/coreapi/message_storage.c
+++ b/coreapi/message_storage.c
@@ -391,7 +391,7 @@ MSList *linphone_chat_room_get_history_range(LinphoneChatRoom *cr, int startm, i
 	begin=ortp_get_cur_time_ms();
 	linphone_sql_request_message(lc->db,buf,cr);
 	end=ortp_get_cur_time_ms();
-	ms_message("%s(): completed in %i ms",__FUNCTION__, (int)(end-begin));
+	ms_debug("%s(): completed in %i ms",__FUNCTION__, (int)(end-begin));
 	ms_free(buf);
 	ret=cr->messages_hist;
 	cr->messages_hist=NULL;

From a3f728d84a7b79b68f771144de49500dde8565fa Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Wed, 26 Nov 2014 13:53:02 +0100
Subject: [PATCH 056/496] Test the history range function thoroughly

---
 tester/message_tester.c | 54 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/tester/message_tester.c b/tester/message_tester.c
index ab7a83077..a44973227 100644
--- a/tester/message_tester.c
+++ b/tester/message_tester.c
@@ -1024,6 +1024,59 @@ static void message_storage_migration() {
 	remove(tmp_db);
 }
 
+static void history_message_count_helper(LinphoneChatRoom* chatroom, int x, int y, int expected ){
+	MSList* messages = linphone_chat_room_get_history_range(chatroom, x, y);
+	int size = ms_list_size(messages);
+	if( expected != size ){
+		ms_warning("History retrieved from %d to %d returned %d records, but expected %d", x, y, size, expected);
+	}
+	CU_ASSERT_EQUAL(size, expected);
+
+	ms_list_free_with_data(messages, (void (*)(void *))linphone_chat_message_unref);
+
+}
+
+static void history_range_full_test(){
+	LinphoneCoreManager *marie = linphone_core_manager_new("marie_rc");
+	LinphoneAddress *jehan_addr = linphone_address_new("<sip:Jehan@sip.linphone.org>");
+	LinphoneChatRoom *chatroom;
+	char src_db[256];
+	char tmp_db[256];
+	snprintf(src_db,sizeof(src_db), "%s/messages.db", liblinphone_tester_file_prefix);
+	snprintf(tmp_db,sizeof(tmp_db), "%s/tmp.db", liblinphone_tester_writable_dir_prefix);
+
+	CU_ASSERT_EQUAL_FATAL(message_tester_copy_file(src_db, tmp_db), 0);
+
+	linphone_core_set_chat_database_path(marie->lc, tmp_db);
+
+	chatroom = linphone_core_get_chat_room(marie->lc, jehan_addr);
+	CU_ASSERT_PTR_NOT_NULL(chatroom);
+	if (chatroom){
+		// We have 20 tests to perform to fully qualify the function, here they are:
+		history_message_count_helper(chatroom, 0, 0, 1);
+		history_message_count_helper(chatroom, -1, 0, 1);
+		history_message_count_helper(chatroom, 0, -1, 1270);
+		history_message_count_helper(chatroom, 1, 3, 3);
+		history_message_count_helper(chatroom, 3, 1, 1270-3);
+		history_message_count_helper(chatroom, 10, 10, 1);
+		history_message_count_helper(chatroom, -1, -1, 1270);
+		history_message_count_helper(chatroom, -1, -2, 1270);
+		history_message_count_helper(chatroom, -2, -1, 1270);
+		history_message_count_helper(chatroom, 3, -1, 1270-3);
+		history_message_count_helper(chatroom, 1, -3, 1270-1);
+		history_message_count_helper(chatroom, 2, -2, 1270-2);
+		history_message_count_helper(chatroom, 2, 0, 1270-2);
+		history_message_count_helper(chatroom, 0, 2, 3);
+		history_message_count_helper(chatroom, -1, 3, 4);
+		history_message_count_helper(chatroom, -2, 2, 3);
+		history_message_count_helper(chatroom, -3, 1, 2);
+	}
+	linphone_core_manager_destroy(marie);
+	linphone_address_destroy(jehan_addr);
+	remove(tmp_db);
+}
+
+
 static void history_messages_count() {
 	LinphoneCoreManager *marie = linphone_core_manager_new("marie_rc");
 	LinphoneAddress *jehan_addr = linphone_address_new("<sip:Jehan@sip.linphone.org>");
@@ -1107,6 +1160,7 @@ test_t message_tests[] = {
 #ifdef MSG_STORAGE_ENABLED
 	,{ "Database migration", message_storage_migration }
 	,{ "History count", history_messages_count }
+	,{ "History range", history_range_full_test }
 #endif
 };
 

From 0ffba34fe54ec618d267c9270a7e43797ce080d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
 <francois.grisez@belledonne-communications.com>
Date: Wed, 26 Nov 2014 14:41:47 +0100
Subject: [PATCH 057/496] Fix crash of Player/Local MKV file tester

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 3333c0da8..eb5832d5d 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 3333c0da86e23ab498c74896c67d53121fb91002
+Subproject commit eb5832d5db58e59664e67ef21818cd00e7c2a548

From 8ace78e2f8ccb77670ba3066576948e9bff7bfd6 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Wed, 26 Nov 2014 16:38:39 +0100
Subject: [PATCH 058/496] Handle compilation of unit tests with CMake.

---
 CMakeLists.txt         | 14 +++++++++++++
 config.h.cmake         |  3 +++
 coreapi/CMakeLists.txt |  4 +++-
 gtk/CMakeLists.txt     |  2 +-
 tester/CMakeLists.txt  | 45 ++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 66 insertions(+), 2 deletions(-)
 create mode 100644 tester/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 65446420a..2570a4cad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,6 +55,7 @@ cmake_dependent_option(ENABLE_ASSISTANT "Turn on assistant compiling." YES "ENAB
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_PREFIX_PATH}/share/cmake/Modules)
 
 include(CheckIncludeFile)
+include(CheckLibraryExists)
 
 if(MSVC)
 	list(APPEND CMAKE_REQUIRED_INCLUDES ${CMAKE_PREFIX_PATH}/include/MSVC)
@@ -63,6 +64,16 @@ endif()
 find_package(BelleSIP REQUIRED)
 find_package(MS2 REQUIRED)
 find_package(XML2 REQUIRED)
+if(ENABLE_UNIT_TESTS)
+	find_package(CUnit)
+	if(CUNIT_FOUND)
+		check_library_exists("cunit" "CU_get_suite" "" HAVE_CU_GET_SUITE)
+		check_library_exists("cunit" "CU_curses_run_tests" "" HAVE_CU_CURSES)
+	else()
+		message(WARNING "Could not find the cunit library!")
+		set(ENABLE_UNIT_TESTS OFF CACHE BOOL "Enable compilation of unit tests." FORCE)
+	endif()
+endif()
 if(ENABLE_TUNNEL)
 	find_package(Tunnel)
 	if(NOT TUNNEL_FOUND)
@@ -114,6 +125,9 @@ endif()
 if(ENABLE_TOOLS)
 	add_subdirectory(tools)
 endif()
+if(ENABLE_UNIT_TESTS)
+	add_subdirectory(tester)
+endif()
 
 
 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/FindLinphone.cmake
diff --git a/config.h.cmake b/config.h.cmake
index 9756ebbd7..a7020d97a 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -35,3 +35,6 @@
 #define PACKAGE_LOCALE_DIR "${PACKAGE_LOCALE_DIR}"
 #define PACKAGE_DATA_DIR "${PACKAGE_DATA_DIR}"
 #define PACKAGE_SOUND_DIR "${PACKAGE_SOUND_DIR}"
+
+#cmakedefine HAVE_CU_GET_SUITE 1
+#cmakedefine HAVE_CU_CURSES 1
\ No newline at end of file
diff --git a/coreapi/CMakeLists.txt b/coreapi/CMakeLists.txt
index 6efc80e60..b2501e2fb 100644
--- a/coreapi/CMakeLists.txt
+++ b/coreapi/CMakeLists.txt
@@ -65,6 +65,7 @@ set(SOURCE_FILES
 	linphonefriend.h
 	linphone_tunnel_config.c
 	linphone_tunnel.h
+	localplayer.c
 	lpconfig.c
 	lpconfig.h
 	lsd.c
@@ -84,7 +85,8 @@ set(SOURCE_FILES
 	sipsetup.h
 	xml2lpc.c
 	xml2lpc.h
-	xml.c)
+	xml.c
+)
 if(ENABLE_TUNNEL)
 	list(APPEND SOURCE_FILES
 		linphone_tunnel.cc
diff --git a/gtk/CMakeLists.txt b/gtk/CMakeLists.txt
index 0092be84a..ae395500d 100644
--- a/gtk/CMakeLists.txt
+++ b/gtk/CMakeLists.txt
@@ -20,7 +20,7 @@
 #
 ############################################################################
 
-find_package(GTK2 2.10 REQUIRED gtk)
+find_package(GTK2 2.18 REQUIRED gtk)
 
 set(UI_FILES
 	about.ui
diff --git a/tester/CMakeLists.txt b/tester/CMakeLists.txt
new file mode 100644
index 000000000..3131a1054
--- /dev/null
+++ b/tester/CMakeLists.txt
@@ -0,0 +1,45 @@
+############################################################################
+# CMakeLists.txt
+# Copyright (C) 2014  Belledonne Communications, Grenoble France
+#
+############################################################################
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# 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.
+#
+############################################################################
+
+set(SOURCE_FILES
+	call_tester.c
+	dtmf_tester.c
+	eventapi_tester.c
+	flexisip_tester.c
+	liblinphone_tester.c
+	log_collection_tester.c
+	message_tester.c
+	player_tester.c
+	presence_tester.c
+	quality_reporting_tester.c
+	register_tester.c
+	remote_provisioning_tester.c
+	setup_tester.c
+	stun_tester.c
+	tester.c
+	transport_tester.c
+	upnp_tester.c
+)
+
+add_executable(liblinphone_tester ${SOURCE_FILES})
+target_include_directories(liblinphone_tester PUBLIC ${CUNIT_INCLUDE_DIRS})
+target_link_libraries(liblinphone_tester linphone ${CUNIT_LIBRARIES})

From 15dcfa4071cde576a4a97cec22c94bdc98a52a85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
 <francois.grisez@belledonne-communications.com>
Date: Wed, 26 Nov 2014 16:48:55 +0100
Subject: [PATCH 059/496] Fix "Call/Call with file player" tester

---
 tester/call_tester.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/tester/call_tester.c b/tester/call_tester.c
index 48bb67864..b0290113b 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -2028,12 +2028,12 @@ static void call_with_file_player(void) {
 	snprintf(hellopath,sizeof(hellopath), "%s/sounds/hello8000.wav", liblinphone_tester_file_prefix);
 
 	/*caller uses files instead of soundcard in order to avoid mixing soundcard input with file played using call's player*/
-	linphone_core_use_files(pauline->lc,TRUE);
-	linphone_core_set_play_file(pauline->lc,NULL);
+	linphone_core_use_files(marie->lc,TRUE);
+	linphone_core_set_play_file(marie->lc,NULL);
 
 	/*callee is recording and plays file*/
 	linphone_core_use_files(pauline->lc,TRUE);
-	linphone_core_set_play_file(pauline->lc,hellopath);
+	linphone_core_set_play_file(pauline->lc,NULL);
 	linphone_core_set_record_file(pauline->lc,recordpath);
 
 	CU_ASSERT_TRUE(call(marie,pauline));
@@ -2051,8 +2051,11 @@ static void call_with_file_player(void) {
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,1));
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1));
 	CU_ASSERT_TRUE(ms_audio_diff(hellopath,recordpath,&similar,NULL,NULL)==0);
-	CU_ASSERT_TRUE(similar>0.9);
+	CU_ASSERT_TRUE(similar>0.4);
 	CU_ASSERT_TRUE(similar<=1.0);
+	if(similar > 0.4 && similar <=1.0) {
+		remove(recordpath);
+	}
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
 	ms_free(recordpath);

From e76b7423b8d87b6d947de6cc0f0f3375d948750a Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Wed, 26 Nov 2014 17:30:38 +0100
Subject: [PATCH 060/496] Fix CUnit symbols checking in CMake.

---
 CMakeLists.txt | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2570a4cad..759a95f97 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,7 +55,7 @@ cmake_dependent_option(ENABLE_ASSISTANT "Turn on assistant compiling." YES "ENAB
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_PREFIX_PATH}/share/cmake/Modules)
 
 include(CheckIncludeFile)
-include(CheckLibraryExists)
+include(CheckSymbolExists)
 
 if(MSVC)
 	list(APPEND CMAKE_REQUIRED_INCLUDES ${CMAKE_PREFIX_PATH}/include/MSVC)
@@ -67,8 +67,12 @@ find_package(XML2 REQUIRED)
 if(ENABLE_UNIT_TESTS)
 	find_package(CUnit)
 	if(CUNIT_FOUND)
-		check_library_exists("cunit" "CU_get_suite" "" HAVE_CU_GET_SUITE)
-		check_library_exists("cunit" "CU_curses_run_tests" "" HAVE_CU_CURSES)
+		cmake_push_check_state(RESET)
+		list(APPEND CMAKE_REQUIRED_INCLUDES ${CUNIT_INCLUDE_DIRS})
+		list(APPEND CMAKE_REQUIRED_LIBRARIES ${CUNIT_LIBRARIES})
+		check_symbol_exists("CU_get_suite" "CUnit/CUnit.h" HAVE_CU_GET_SUITE)
+		check_symbol_exists("CU_curses_run_tests" "CUnit/CUnit.h" HAVE_CU_CURSES)
+		cmake_pop_check_state()
 	else()
 		message(WARNING "Could not find the cunit library!")
 		set(ENABLE_UNIT_TESTS OFF CACHE BOOL "Enable compilation of unit tests." FORCE)

From 31d6c87aeb0cecc87297ca6acb69490ee6087dc6 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Wed, 26 Nov 2014 22:21:29 +0100
Subject: [PATCH 061/496] update ms2 for vp8 fix

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index eb5832d5d..f0cfb2641 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit eb5832d5db58e59664e67ef21818cd00e7c2a548
+Subproject commit f0cfb2641de9554db29bc6266579d9d4661e339a

From 80def19f58d374842c9a5b174f1a1ed2361200aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
 <francois.grisez@belledonne-communications.com>
Date: Thu, 27 Nov 2014 10:03:34 +0100
Subject: [PATCH 062/496] Remove the recording file when similarity is higher
 than threshold

---
 tester/call_tester.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/tester/call_tester.c b/tester/call_tester.c
index b0290113b..ad5ee315d 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -2021,6 +2021,7 @@ static void call_with_file_player(void) {
 	char hellopath[256];
 	char *recordpath = create_filepath(liblinphone_tester_writable_dir_prefix, "record", "wav");
 	double similar;
+	const double threshold = 0.9;
 
 	/*make sure the record file doesn't already exists, otherwise this test will append new samples to it*/
 	unlink(recordpath);
@@ -2051,9 +2052,9 @@ static void call_with_file_player(void) {
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,1));
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1));
 	CU_ASSERT_TRUE(ms_audio_diff(hellopath,recordpath,&similar,NULL,NULL)==0);
-	CU_ASSERT_TRUE(similar>0.4);
+	CU_ASSERT_TRUE(similar>threshold);
 	CU_ASSERT_TRUE(similar<=1.0);
-	if(similar > 0.4 && similar <=1.0) {
+	if(similar > threshold && similar <=1.0) {
 		remove(recordpath);
 	}
 	linphone_core_manager_destroy(marie);
@@ -2077,6 +2078,7 @@ static void call_with_mkv_file_player(void) {
 	char hellowav[256];
 	char *recordpath;
 	double similar;
+	const double threshold = 0.9;
 
 	if (!is_format_supported(marie->lc,"mkv")){
 		ms_warning("Test skipped, no mkv support.");
@@ -2113,8 +2115,11 @@ static void call_with_mkv_file_player(void) {
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,1));
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1));
 	CU_ASSERT_TRUE(ms_audio_diff(hellowav,recordpath,&similar,NULL,NULL)==0);
-	CU_ASSERT_TRUE(similar>0.6);
+	CU_ASSERT_TRUE(similar>threshold);
 	CU_ASSERT_TRUE(similar<=1.0);
+	if(similar>threshold && similar<=1.0) {
+		remove(recordpath);
+	}
 	ms_free(recordpath);
 
 end:

From 13bacf87c9fbc177011c2326a59faf691da7da1e Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Thu, 27 Nov 2014 10:18:37 +0100
Subject: [PATCH 063/496] fix compilation warning update ms2

---
 coreapi/message_storage.c | 2 +-
 mediastreamer2            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/coreapi/message_storage.c b/coreapi/message_storage.c
index 66d49a3db..2684ba0b5 100644
--- a/coreapi/message_storage.c
+++ b/coreapi/message_storage.c
@@ -391,7 +391,7 @@ MSList *linphone_chat_room_get_history_range(LinphoneChatRoom *cr, int startm, i
 	begin=ortp_get_cur_time_ms();
 	linphone_sql_request_message(lc->db,buf,cr);
 	end=ortp_get_cur_time_ms();
-	ms_debug("%s(): completed in %i ms",__FUNCTION__, (int)(end-begin));
+	ms_message("%s(): completed in %i ms",__FUNCTION__, (int)(end-begin));
 	ms_free(buf);
 	ret=cr->messages_hist;
 	cr->messages_hist=NULL;
diff --git a/mediastreamer2 b/mediastreamer2
index f0cfb2641..042feb909 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit f0cfb2641de9554db29bc6266579d9d4661e339a
+Subproject commit 042feb9096af9fbe1a45e8c76b4121d738329e1e

From 110ed1c9d9dffe1583b8ea596b7204b93a7de385 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@linphone.org>
Date: Thu, 27 Nov 2014 10:29:39 +0100
Subject: [PATCH 064/496] Fix crash when receiving some UTF-8 chars

---
 coreapi/linphonecore_jni.cc                           | 10 +++++++---
 .../org/linphone/core/LinphoneChatMessageImpl.java    | 11 +++++++++--
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index 8f4b44154..be72e283f 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -2726,11 +2726,15 @@ extern "C" void Java_org_linphone_core_LinphoneChatMessageImpl_store(JNIEnv*  en
 	linphone_chat_message_store((LinphoneChatMessage*)ptr);
 }
 
-extern "C" jstring Java_org_linphone_core_LinphoneChatMessageImpl_getText(JNIEnv*  env
+extern "C" jbyteArray Java_org_linphone_core_LinphoneChatMessageImpl_getText(JNIEnv*  env
 																		,jobject  thiz
 																		,jlong ptr) {
-	jstring jvalue =env->NewStringUTF(linphone_chat_message_get_text((LinphoneChatMessage*)ptr));
-	return jvalue;
+	const char *message = linphone_chat_message_get_text((LinphoneChatMessage*)ptr);
+	size_t length = strlen(message);
+	jbyteArray array = env->NewByteArray(length);
+	env->SetByteArrayRegion(array, 0, length, (const jbyte*)message);
+
+	return array;
 }
 
 extern "C" jint Java_org_linphone_core_LinphoneChatMessageImpl_getReason(JNIEnv*  env
diff --git a/java/impl/org/linphone/core/LinphoneChatMessageImpl.java b/java/impl/org/linphone/core/LinphoneChatMessageImpl.java
index 7e6d474a2..6d6009c92 100644
--- a/java/impl/org/linphone/core/LinphoneChatMessageImpl.java
+++ b/java/impl/org/linphone/core/LinphoneChatMessageImpl.java
@@ -1,8 +1,10 @@
 package org.linphone.core;
 
+import java.io.UnsupportedEncodingException;
+
 public class LinphoneChatMessageImpl implements LinphoneChatMessage {
 	protected final long nativePtr;
-	private native String getText(long ptr);
+	private native byte[] getText(long ptr);
 	private native long getPeerAddress(long ptr);
 	private native String getExternalBodyUrl(long ptr);
 	private native void setExternalBodyUrl(long ptr, String url);
@@ -25,7 +27,12 @@ public class LinphoneChatMessageImpl implements LinphoneChatMessage {
 	
 	@Override
 	public String getText() {
-		return getText(nativePtr);
+		try {
+			return new String(getText(nativePtr), "UTF-8");
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		return null;
 	}
 	
 	@Override

From 8e9deac0b34c7c4aeb980faf1c93c9e7529e89e0 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@linphone.org>
Date: Thu, 27 Nov 2014 11:51:43 +0100
Subject: [PATCH 065/496] Fix issue 1778: First launch wizard doesn't enable
 ICE

---
 gtk/setupwizard.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gtk/setupwizard.c b/gtk/setupwizard.c
index 491014625..1cb86f3af 100644
--- a/gtk/setupwizard.c
+++ b/gtk/setupwizard.c
@@ -452,7 +452,7 @@ static void linphone_gtk_assistant_prepare(GtkWidget *assistant, GtkWidget *page
 		linphone_core_add_auth_info(linphone_gtk_get_core(),info);
 		linphone_address_destroy(identity);
 
-		if (strcmp(creator->domain, "sip:sip.linphone.org") == 0 ){
+		if (strcmp(creator->domain, "sip:sip.linphone.org") == 0) {
 			linphone_proxy_config_enable_avpf(cfg,TRUE);
 			// If account created on sip.linphone.org, we configure linphone to use TLS by default
 			if (linphone_core_sip_transport_supported(linphone_gtk_get_core(),LinphoneTransportTls)) {
@@ -465,6 +465,8 @@ static void linphone_gtk_assistant_prepare(GtkWidget *assistant, GtkWidget *page
 				ms_free(tmp);
 				linphone_address_destroy(addr);
 			}
+			linphone_core_set_stun_server(linphone_gtk_get_core(), "stun.linphone.org");
+			linphone_core_set_firewall_policy(linphone_gtk_get_core(), LinphonePolicyUseIce);
 		}
 
 		if (linphone_core_add_proxy_config(linphone_gtk_get_core(),cfg)==-1)

From fa483fe62989683d1ff0515b64e3349e7226003a Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Thu, 27 Nov 2014 14:11:33 +0100
Subject: [PATCH 066/496] Fix compilation with CMake.

---
 CMakeLists.txt         | 2 ++
 coreapi/CMakeLists.txt | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 759a95f97..0272d671c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -104,6 +104,8 @@ if(MSVC)
 	include_directories(${CMAKE_PREFIX_PATH}/include/MSVC)
 endif()
 
+add_definitions(-DIN_LINPHONE)
+
 
 set(GETTEXT_PACKAGE "linphone")
 if(ENABLE_RELATIVE_PREFIX)
diff --git a/coreapi/CMakeLists.txt b/coreapi/CMakeLists.txt
index b2501e2fb..e3bae9640 100644
--- a/coreapi/CMakeLists.txt
+++ b/coreapi/CMakeLists.txt
@@ -106,7 +106,6 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/liblinphone_gitversion.h
 	COMMAND ${CMAKE_COMMAND} -DGIT_EXECUTABLE=${GIT_EXECUTABLE} -DWORK_DIR=${CMAKE_CURRENT_SOURCE_DIR} -DOUTPUT_DIR=${CMAKE_CURRENT_BINARY_DIR} -P ${CMAKE_CURRENT_SOURCE_DIR}/gitversion.cmake)
 
 add_definitions(
-	-DIN_LINPHONE
 	-DUSE_BELLESIP
 	-DLIBLINPHONE_EXPORTS
 )

From e3f789cb8e4bd18d121a9b02c525ad96cdfafb21 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Thu, 27 Nov 2014 16:09:39 +0100
Subject: [PATCH 067/496] Update localizations

---
 po/de.po    |  289 ++++----
 po/de_DE.po | 1984 +++++++++++++++++++++++++++++++++++++++++++++++++++
 po/he.po    |   33 +-
 po/ja.po    |  461 ++++++------
 po/sr.po    |  433 +++++------
 5 files changed, 2594 insertions(+), 606 deletions(-)
 create mode 100644 po/de_DE.po

diff --git a/po/de.po b/po/de.po
index d447b9325..c65ead393 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# andreas, 2014
 # Gerhard Stengel <gstengel@gmx.net>, 2011-2012
 # Simon Morlat <linphone@free.fr>, 2001
 msgid ""
@@ -10,8 +11,8 @@ msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-19 10:39+0100\n"
-"PO-Revision-Date: 2014-11-19 10:14+0000\n"
-"Last-Translator: Cqnqrd <gautier.pelloux@gmail.com>\n"
+"PO-Revision-Date: 2014-11-25 16:45+0000\n"
+"Last-Translator: andreas\n"
 "Language-Team: German (http://www.transifex.com/projects/p/linphone-gtk/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -32,7 +33,7 @@ msgstr "Text zu „%s“ schicken"
 #: ../gtk/calllogs.c:232
 #, c-format
 msgid "<b>Recent calls (%i)</b>"
-msgstr ""
+msgstr "<b>letzte Anrufe (%i)</b>"
 
 #: ../gtk/calllogs.c:314
 msgid "n/a"
@@ -67,21 +68,21 @@ msgstr[1] "%i Sekunden"
 #: ../gtk/calllogs.c:335 ../gtk/calllogs.c:341
 #, c-format
 msgid "<big><b>%s</b></big>\t%s"
-msgstr ""
+msgstr "<big><b>%s</b></big>\t%s"
 
 #: ../gtk/calllogs.c:337
 #, c-format
 msgid ""
 "<small><i>%s</i>\t<i>Quality: %s</i></small>\n"
 "%s\t%s\t"
-msgstr ""
+msgstr "<small><i>%s</i>\t<i>Qualität: %s</i></small>\n%s\t%s\t"
 
 #: ../gtk/calllogs.c:343
 #, c-format
 msgid ""
 "<small><i>%s</i></small>\t\n"
 "%s"
-msgstr ""
+msgstr "<small><i>%s</i></small>\t\n%s"
 
 #: ../gtk/conference.c:38 ../gtk/main.ui.h:13
 msgid "Conference"
@@ -132,11 +133,11 @@ msgstr "Geben Sie einen Arbeitsordner an (sollte der Installationsordner sein, z
 
 #: ../gtk/main.c:156
 msgid "Configuration file"
-msgstr ""
+msgstr "Konfigurationsdatei"
 
 #: ../gtk/main.c:163
 msgid "Run the audio assistant"
-msgstr ""
+msgstr "Starte den Audio-Assistent"
 
 #: ../gtk/main.c:1085
 #, c-format
@@ -151,7 +152,7 @@ msgstr "%s möchte Sie zu seiner Kontaktliste hinzufügen.\nMöchten Sie ihm erl
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
-msgstr ""
+msgstr "Bitte geben Sie Ihr Passwort für den Benutzernamen <i>%s</i>\n für  Bereich <i>%s</i> ein:"
 
 #: ../gtk/main.c:1283
 msgid "Call error"
@@ -233,7 +234,7 @@ msgstr "Anrufen"
 
 #: ../gtk/friendlist.c:726
 msgid "Chat"
-msgstr ""
+msgstr "Chat"
 
 #: ../gtk/friendlist.c:756
 #, c-format
@@ -253,7 +254,7 @@ msgstr "Kontakt „%s“ löschen"
 #: ../gtk/friendlist.c:978
 #, c-format
 msgid "Delete chat history of '%s'"
-msgstr ""
+msgstr "Lösche Gesprächshistorie von '%s'"
 
 #: ../gtk/friendlist.c:1029
 #, c-format
@@ -270,7 +271,7 @@ msgstr "Status"
 
 #: ../gtk/propertybox.c:570
 msgid "IP Bitrate (kbit/s)"
-msgstr ""
+msgstr "IP Bit-Rate (kbit/s)"
 
 #: ../gtk/propertybox.c:577
 msgid "Parameters"
@@ -354,11 +355,11 @@ msgstr "Norwegisch"
 
 #: ../gtk/propertybox.c:1088
 msgid "Hebrew"
-msgstr ""
+msgstr "Hebräisch"
 
 #: ../gtk/propertybox.c:1089
 msgid "Serbian"
-msgstr ""
+msgstr "Serbisch"
 
 #: ../gtk/propertybox.c:1156
 msgid ""
@@ -371,11 +372,11 @@ msgstr "Keinen"
 
 #: ../gtk/propertybox.c:1238
 msgid "SRTP"
-msgstr ""
+msgstr "SRTP"
 
 #: ../gtk/propertybox.c:1244
 msgid "ZRTP"
-msgstr ""
+msgstr "ZRTP"
 
 #: ../gtk/update.c:80
 #, c-format
@@ -435,7 +436,7 @@ msgstr "Ich habe bereits ein SIP-Konto und möchte es jetzt benutzen."
 
 #: ../gtk/setupwizard.c:46
 msgid "I want to specify a remote configuration URI"
-msgstr ""
+msgstr "Ich möchte eine URI zur Fernkonfiguration angeben"
 
 #: ../gtk/setupwizard.c:89
 msgid "Enter your linphone.org username"
@@ -491,7 +492,7 @@ msgstr "Bestätigen Sie Ihr Passwort: (*)"
 
 #: ../gtk/setupwizard.c:338
 msgid "Keep me informed with linphone updates"
-msgstr ""
+msgstr "Halte mich über linphone Aktualisierungen auf dem laufenden"
 
 #: ../gtk/setupwizard.c:394
 msgid ""
@@ -511,7 +512,7 @@ msgstr "Bitte bestätigen Sie Ihr Konto, indem Sie auf die Verknüpfung klicken,
 
 #: ../gtk/setupwizard.c:600
 msgid "SIP account configuration assistant"
-msgstr ""
+msgstr "SIP-Konto-Einrichtungsassistent"
 
 #: ../gtk/setupwizard.c:618
 msgid "Welcome to the account setup assistant"
@@ -585,27 +586,27 @@ msgstr "Über einen Relay-Server"
 
 #: ../gtk/incall_view.c:239
 msgid "uPnP not activated"
-msgstr ""
+msgstr "uPnP nicht aktiviert"
 
 #: ../gtk/incall_view.c:241
 msgid "uPnP in progress"
-msgstr ""
+msgstr "uPnP läuft"
 
 #: ../gtk/incall_view.c:243
 msgid "uPnp not available"
-msgstr ""
+msgstr "uPnp nicht verfügbar"
 
 #: ../gtk/incall_view.c:245
 msgid "uPnP is running"
-msgstr ""
+msgstr "uPnP läuft"
 
 #: ../gtk/incall_view.c:247
 msgid "uPnP failed"
-msgstr ""
+msgstr "uPnP fehlgeschlagen"
 
 #: ../gtk/incall_view.c:257 ../gtk/incall_view.c:258
 msgid "Direct or through server"
-msgstr ""
+msgstr "Direkt oder über Server"
 
 #: ../gtk/incall_view.c:267 ../gtk/incall_view.c:279
 #, c-format
@@ -617,16 +618,16 @@ msgstr "Herunterladen: %f\nHochladen: %f (kbit/s)"
 #: ../gtk/incall_view.c:272 ../gtk/incall_view.c:274
 #, c-format
 msgid "%ix%i @ %f fps"
-msgstr ""
+msgstr "%ix%i @ %f bps"
 
 #: ../gtk/incall_view.c:304
 #, c-format
 msgid "%.3f seconds"
-msgstr ""
+msgstr "%.3f Sekunden"
 
 #: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12
 msgid "Hang up"
-msgstr ""
+msgstr "Auflegen"
 
 #: ../gtk/incall_view.c:511
 msgid "<b>Calling...</b>"
@@ -634,7 +635,7 @@ msgstr "<b>Verbindungsaufbau...</b>"
 
 #: ../gtk/incall_view.c:514 ../gtk/incall_view.c:727
 msgid "00::00::00"
-msgstr ""
+msgstr "00::00::00"
 
 #: ../gtk/incall_view.c:525
 msgid "<b>Incoming call</b>"
@@ -696,7 +697,7 @@ msgstr "<b>Gehaltener Anruf</b>"
 #: ../gtk/incall_view.c:771
 #, c-format
 msgid "%02i::%02i::%02i"
-msgstr ""
+msgstr "%02i::%02i::%02i"
 
 #: ../gtk/incall_view.c:794
 msgid "<b>Call ended.</b>"
@@ -727,11 +728,11 @@ msgstr "Halten"
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
-msgstr ""
+msgstr "<small><i>Recording into\n%s %s</i></small>"
 
 #: ../gtk/incall_view.c:948
 msgid "(Paused)"
-msgstr ""
+msgstr "(pausiert)"
 
 #: ../gtk/loginframe.c:88
 #, c-format
@@ -741,86 +742,86 @@ msgstr "Bitte geben Sie die Anmeldeinformationen für %s ein."
 #: ../gtk/config-fetching.c:57
 #, c-format
 msgid "fetching from %s"
-msgstr ""
+msgstr "abrufen von %s"
 
 #: ../gtk/config-fetching.c:73
 #, c-format
 msgid "Downloading of remote configuration from %s failed."
-msgstr ""
+msgstr "Herunterladen der Fernkonfiguration von %s fehlgeschlagen"
 
 #: ../gtk/audio_assistant.c:98
 msgid "No voice detected"
-msgstr ""
+msgstr "Keine Stimme ermittelt"
 
 #: ../gtk/audio_assistant.c:99
 msgid "Too low"
-msgstr ""
+msgstr "zu gering"
 
 #: ../gtk/audio_assistant.c:100
 msgid "Good"
-msgstr ""
+msgstr "gut"
 
 #: ../gtk/audio_assistant.c:101
 msgid "Too loud"
-msgstr ""
+msgstr "zu laut"
 
 #: ../gtk/audio_assistant.c:318
 msgid ""
 "Welcome !\n"
 "This assistant will help you to configure audio settings for Linphone"
-msgstr ""
+msgstr "Willkommen!\nDieser Assistent wird Ihnen dabei helfen, die Audio-Einstellungen für Linphone vorzunehmen."
 
 #: ../gtk/audio_assistant.c:328
 msgid "Capture device"
-msgstr ""
+msgstr "Aufnahmegerät"
 
 #: ../gtk/audio_assistant.c:329
 msgid "Recorded volume"
-msgstr ""
+msgstr "aufgenommene Lautstärke"
 
 #: ../gtk/audio_assistant.c:333
 msgid "No voice"
-msgstr ""
+msgstr "Keine Stimme"
 
 #: ../gtk/audio_assistant.c:369
 msgid "Playback device"
-msgstr ""
+msgstr "Wiedergabegerät"
 
 #: ../gtk/audio_assistant.c:370
 msgid "Play three beeps"
-msgstr ""
+msgstr "spiele drei Pieptöne ab"
 
 #: ../gtk/audio_assistant.c:403
 msgid "Press the record button and say some words"
-msgstr ""
+msgstr "Drücken Sie den Aufnahmeknopf und sagen Sie etwas"
 
 #: ../gtk/audio_assistant.c:404
 msgid "Listen to your record voice"
-msgstr ""
+msgstr "Hören Sie das Aufgenommene"
 
 #: ../gtk/audio_assistant.c:433
 msgid "Let's start Linphone now"
-msgstr ""
+msgstr "Linphone jetzt starten"
 
 #: ../gtk/audio_assistant.c:496
 msgid "Audio Assistant"
-msgstr ""
+msgstr "Audio-Assistant"
 
 #: ../gtk/audio_assistant.c:506 ../gtk/main.ui.h:31
 msgid "Audio assistant"
-msgstr ""
+msgstr "Audio-Assistant"
 
 #: ../gtk/audio_assistant.c:511
 msgid "Mic Gain calibration"
-msgstr ""
+msgstr "Einrichtung MIkrofonverstärker"
 
 #: ../gtk/audio_assistant.c:517
 msgid "Speaker volume calibration"
-msgstr ""
+msgstr "Einrichtung Lautstärke"
 
 #: ../gtk/audio_assistant.c:522
 msgid "Record and Play"
-msgstr ""
+msgstr "aufnehmen und abspielen"
 
 #: ../gtk/main.ui.h:1
 msgid "<b>Callee name</b>"
@@ -832,19 +833,19 @@ msgstr "Senden"
 
 #: ../gtk/main.ui.h:3
 msgid "End conference"
-msgstr ""
+msgstr "Konferenz beenden"
 
 #: ../gtk/main.ui.h:7
 msgid "Record this call to an audio file"
-msgstr ""
+msgstr "Speichere den Anruf in eine Audio-Datei"
 
 #: ../gtk/main.ui.h:8
 msgid "Video"
-msgstr ""
+msgstr "Video"
 
 #: ../gtk/main.ui.h:10
 msgid "Mute"
-msgstr ""
+msgstr "Stumm"
 
 #: ../gtk/main.ui.h:11
 msgid "Transfer"
@@ -872,7 +873,7 @@ msgstr "Angemeldete Teilnehmer"
 
 #: ../gtk/main.ui.h:19
 msgid "ADSL"
-msgstr ""
+msgstr "ADSL"
 
 #: ../gtk/main.ui.h:20
 msgid "Fiber Channel"
@@ -888,7 +889,7 @@ msgstr "_Optionen"
 
 #: ../gtk/main.ui.h:23
 msgid "Set configuration URI"
-msgstr ""
+msgstr "Konfigurations URI angeben"
 
 #: ../gtk/main.ui.h:24
 msgid "Always start video"
@@ -908,7 +909,7 @@ msgstr "Debug-Fenster anzeigen"
 
 #: ../gtk/main.ui.h:28
 msgid "_Homepage"
-msgstr ""
+msgstr "_Homepage"
 
 #: ../gtk/main.ui.h:29
 msgid "Check _Updates"
@@ -980,7 +981,7 @@ msgstr "<b>Willkommen !</b>"
 
 #: ../gtk/main.ui.h:47
 msgid "Delete"
-msgstr ""
+msgstr "Löschen"
 
 #: ../gtk/about.ui.h:1
 msgid "About linphone"
@@ -988,7 +989,7 @@ msgstr "Über Linphone"
 
 #: ../gtk/about.ui.h:2
 msgid "(C) Belledonne Communications,2010\n"
-msgstr ""
+msgstr "(C) Belledonne Communications,2010\n"
 
 #: ../gtk/about.ui.h:4
 msgid "An internet video phone using the standard SIP (rfc3261) protocol."
@@ -1008,7 +1009,7 @@ msgid ""
 "cs: Petr Pisar <petr.pisar@atlas.cz>\n"
 "hu: anonymous\n"
 "he: Eli Zaretskii <eliz@gnu.org>\n"
-msgstr ""
+msgstr "fr: Simon Morlat\nen: Simon Morlat and Delphine Perreau\nit: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\nde: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\nsv: Daniel Nylander <po@danielnylander.se>\nes: Jesus Benitez <gnelson at inMail dot sk>\nja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\npt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\npl: Robert Nasiadek <darkone@darkone.pl>\ncs: Petr Pisar <petr.pisar@atlas.cz>\nhu: anonymous\nhe: Eli Zaretskii <eliz@gnu.org>\n"
 
 #: ../gtk/contact.ui.h:2
 msgid "SIP Address"
@@ -1084,11 +1085,11 @@ msgstr "Registrierungsdauer (sec):"
 
 #: ../gtk/sip_account.ui.h:8
 msgid "Contact params (optional):"
-msgstr ""
+msgstr "Kontaktdetails (optional)"
 
 #: ../gtk/sip_account.ui.h:9
 msgid "AVPF regular RTCP interval (sec):"
-msgstr ""
+msgstr "AVPF Standard RTCP Interval (sek):"
 
 #: ../gtk/sip_account.ui.h:10
 msgid "Route (optional):"
@@ -1096,7 +1097,7 @@ msgstr "Route (optional):"
 
 #: ../gtk/sip_account.ui.h:11
 msgid "Transport"
-msgstr ""
+msgstr "Übertragung"
 
 #: ../gtk/sip_account.ui.h:12
 msgid "Register"
@@ -1108,7 +1109,7 @@ msgstr "Anwesenheitsstatus veröffentlichen"
 
 #: ../gtk/sip_account.ui.h:14
 msgid "Enable AVPF"
-msgstr ""
+msgstr "Aktiviere AVPF"
 
 #: ../gtk/sip_account.ui.h:15
 msgid "Configure a SIP account"
@@ -1116,15 +1117,15 @@ msgstr "SIP-Konto einrichten"
 
 #: ../gtk/parameters.ui.h:1
 msgid "anonymous"
-msgstr ""
+msgstr "Anonym"
 
 #: ../gtk/parameters.ui.h:2
 msgid "GSSAPI"
-msgstr ""
+msgstr "GSSAPI"
 
 #: ../gtk/parameters.ui.h:3
 msgid "SASL"
-msgstr ""
+msgstr "SASL"
 
 #: ../gtk/parameters.ui.h:4
 msgid "default soundcard"
@@ -1140,7 +1141,7 @@ msgstr "Standard-Kamera"
 
 #: ../gtk/parameters.ui.h:7
 msgid "CIF"
-msgstr ""
+msgstr "CIF"
 
 #: ../gtk/parameters.ui.h:8
 msgid "Audio codecs"
@@ -1152,19 +1153,19 @@ msgstr "Video-Codecs"
 
 #: ../gtk/parameters.ui.h:10 ../gtk/keypad.ui.h:5
 msgid "C"
-msgstr ""
+msgstr "C"
 
 #: ../gtk/parameters.ui.h:11
 msgid "SIP (UDP)"
-msgstr ""
+msgstr "SIP (UDP)"
 
 #: ../gtk/parameters.ui.h:12
 msgid "SIP (TCP)"
-msgstr ""
+msgstr "SIP (TCP)"
 
 #: ../gtk/parameters.ui.h:13
 msgid "SIP (TLS)"
-msgstr ""
+msgstr "SIP (TLS)"
 
 #: ../gtk/parameters.ui.h:14
 msgid "Settings"
@@ -1192,11 +1193,11 @@ msgstr "Verschlüsselungstyp der Medien"
 
 #: ../gtk/parameters.ui.h:20
 msgid "Video RTP/UDP:"
-msgstr ""
+msgstr "Video RTP/UDP:"
 
 #: ../gtk/parameters.ui.h:21
 msgid "Audio RTP/UDP:"
-msgstr ""
+msgstr "Audio RTP/UDP:"
 
 #: ../gtk/parameters.ui.h:22
 msgid "Fixed"
@@ -1204,7 +1205,7 @@ msgstr "Fest"
 
 #: ../gtk/parameters.ui.h:23
 msgid "Media encryption is mandatory"
-msgstr ""
+msgstr "Medienverschlüsselung erzwingen"
 
 #: ../gtk/parameters.ui.h:24
 msgid "Tunnel"
@@ -1216,11 +1217,11 @@ msgstr "DSCP-Felder"
 
 #: ../gtk/parameters.ui.h:26
 msgid "SIP/TCP port"
-msgstr ""
+msgstr "SIP/TCP Port"
 
 #: ../gtk/parameters.ui.h:27
 msgid "SIP/UDP port"
-msgstr ""
+msgstr "SIP/UDP Port"
 
 #: ../gtk/parameters.ui.h:28
 msgid "<b>Network protocol and ports</b>"
@@ -1232,7 +1233,7 @@ msgstr "Direkte Verbindung ins Internet"
 
 #: ../gtk/parameters.ui.h:30
 msgid "Behind NAT / Firewall (specify gateway IP )"
-msgstr ""
+msgstr "Hinter NAT / Firewall (Gateway IP angeben)"
 
 #: ../gtk/parameters.ui.h:31
 msgid "Behind NAT / Firewall (use STUN to resolve)"
@@ -1244,7 +1245,7 @@ msgstr "Hinter NAT / Firewall (ICE verwenden)"
 
 #: ../gtk/parameters.ui.h:33
 msgid "Behind NAT / Firewall (use uPnP)"
-msgstr ""
+msgstr "Hinter NAT / Firewall (uPnP verwenden)"
 
 #: ../gtk/parameters.ui.h:34
 msgid "Public IP address:"
@@ -1300,7 +1301,7 @@ msgstr "Bevorzugte Video-Auflösung:"
 
 #: ../gtk/parameters.ui.h:47
 msgid "Video output method:"
-msgstr ""
+msgstr "Methode zur Videoausgabe"
 
 #: ../gtk/parameters.ui.h:48
 msgid "<b>Video</b>"
@@ -1422,23 +1423,23 @@ msgstr "Benutzeroberfläche"
 
 #: ../gtk/parameters.ui.h:77 ../gtk/ldap.ui.h:2
 msgid "Server address:"
-msgstr ""
+msgstr "Server-Adresse"
 
 #: ../gtk/parameters.ui.h:78 ../gtk/ldap.ui.h:3
 msgid "Authentication method:"
-msgstr ""
+msgstr "Authentifizierungsmethode"
 
 #: ../gtk/parameters.ui.h:80
 msgid "label"
-msgstr ""
+msgstr "Hinweisschild"
 
 #: ../gtk/parameters.ui.h:81
 msgid "<b>LDAP Account setup</b>"
-msgstr ""
+msgstr "LDAP-Kontoeinrichtung"
 
 #: ../gtk/parameters.ui.h:82
 msgid "LDAP"
-msgstr ""
+msgstr "LDAP"
 
 #: ../gtk/parameters.ui.h:83
 msgid "Done"
@@ -1466,7 +1467,7 @@ msgstr "Bitte warten"
 
 #: ../gtk/dscp_settings.ui.h:1
 msgid "DSCP settings"
-msgstr ""
+msgstr "DSCP-Einstellungen"
 
 #: ../gtk/dscp_settings.ui.h:2
 msgid "SIP"
@@ -1502,7 +1503,7 @@ msgstr "Genutzte IP-Bandbreite Audio"
 
 #: ../gtk/call_statistics.ui.h:5
 msgid "Audio Media connectivity"
-msgstr ""
+msgstr "Audio-Konnektivität"
 
 #: ../gtk/call_statistics.ui.h:6
 msgid "Video IP bandwidth usage"
@@ -1510,23 +1511,23 @@ msgstr "Genutzte IP-Bandbreite Video"
 
 #: ../gtk/call_statistics.ui.h:7
 msgid "Video Media connectivity"
-msgstr ""
+msgstr "Video-Konnektivität"
 
 #: ../gtk/call_statistics.ui.h:8
 msgid "Round trip time"
-msgstr ""
+msgstr "Umlaufzeit"
 
 #: ../gtk/call_statistics.ui.h:9
 msgid "Video resolution received"
-msgstr ""
+msgstr "Videoauflösung empfangen"
 
 #: ../gtk/call_statistics.ui.h:10
 msgid "Video resolution sent"
-msgstr ""
+msgstr "Videoauflösung gesendet"
 
 #: ../gtk/call_statistics.ui.h:11
 msgid "RTP profile"
-msgstr ""
+msgstr "RTP-Profil"
 
 #: ../gtk/call_statistics.ui.h:12
 msgid "<b>Call statistics and information</b>"
@@ -1550,178 +1551,178 @@ msgstr "<b>Tunnel einrichten</b>"
 
 #: ../gtk/tunnel_config.ui.h:9
 msgid "<b>Configure http proxy (optional)</b>"
-msgstr "<b>HTTP-Proxy einrichten (optional)</b>"
+msgstr "<b>Configure http proxy (optional)</b>"
 
 #: ../gtk/keypad.ui.h:1
 msgid "D"
-msgstr ""
+msgstr "D"
 
 #: ../gtk/keypad.ui.h:2
 msgid "#"
-msgstr ""
+msgstr "#"
 
 #: ../gtk/keypad.ui.h:3
 msgid "0"
-msgstr ""
+msgstr "0"
 
 #: ../gtk/keypad.ui.h:4
 msgid "*"
-msgstr ""
+msgstr "*"
 
 #: ../gtk/keypad.ui.h:6
 msgid "9"
-msgstr ""
+msgstr "9"
 
 #: ../gtk/keypad.ui.h:7
 msgid "8"
-msgstr ""
+msgstr "8"
 
 #: ../gtk/keypad.ui.h:8
 msgid "7"
-msgstr ""
+msgstr "7"
 
 #: ../gtk/keypad.ui.h:9
 msgid "B"
-msgstr ""
+msgstr "B"
 
 #: ../gtk/keypad.ui.h:10
 msgid "6"
-msgstr ""
+msgstr "6"
 
 #: ../gtk/keypad.ui.h:11
 msgid "5"
-msgstr ""
+msgstr "5"
 
 #: ../gtk/keypad.ui.h:12
 msgid "4"
-msgstr ""
+msgstr "4"
 
 #: ../gtk/keypad.ui.h:13
 msgid "A"
-msgstr ""
+msgstr "A"
 
 #: ../gtk/keypad.ui.h:14
 msgid "3"
-msgstr ""
+msgstr "3"
 
 #: ../gtk/keypad.ui.h:15
 msgid "2"
-msgstr ""
+msgstr "2"
 
 #: ../gtk/keypad.ui.h:16
 msgid "1"
-msgstr ""
+msgstr "1"
 
 #: ../gtk/ldap.ui.h:1
 msgid "LDAP Settings"
-msgstr ""
+msgstr "LDAP-Einstellungen"
 
 #: ../gtk/ldap.ui.h:6
 msgid "Use TLS Connection"
-msgstr ""
+msgstr "TLS-Verbindung verwenden"
 
 #: ../gtk/ldap.ui.h:7
 msgid "Not yet available"
-msgstr ""
+msgstr "Aktuell nicht verfügbar"
 
 #: ../gtk/ldap.ui.h:8
 msgid "<b>Connection</b>"
-msgstr ""
+msgstr "<b>Verbindung</b>"
 
 #: ../gtk/ldap.ui.h:9
 msgid "Bind DN"
-msgstr ""
+msgstr "Bind-DN"
 
 #: ../gtk/ldap.ui.h:10
 msgid "Authname"
-msgstr ""
+msgstr "Authentifizierungsname"
 
 #: ../gtk/ldap.ui.h:11
 msgid "Realm"
-msgstr ""
+msgstr "Bereich"
 
 #: ../gtk/ldap.ui.h:12
 msgid "<b>SASL</b>"
-msgstr ""
+msgstr "<b>SASL</b>"
 
 #: ../gtk/ldap.ui.h:13
 msgid "Base object:"
-msgstr ""
+msgstr "Basis-Objekt:"
 
 #: ../gtk/ldap.ui.h:15
 #, no-c-format
 msgid "Filter (%s for name):"
-msgstr ""
+msgstr "Filter (%s nach Name):"
 
 #: ../gtk/ldap.ui.h:16
 msgid "Name Attribute:"
-msgstr ""
+msgstr "Name:"
 
 #: ../gtk/ldap.ui.h:17
 msgid "SIP address attribute:"
-msgstr ""
+msgstr "SIP-Adresse:"
 
 #: ../gtk/ldap.ui.h:18
 msgid "Attributes to query:"
-msgstr ""
+msgstr "Sucheigenschaft:"
 
 #: ../gtk/ldap.ui.h:19
 msgid "<b>Search</b>"
-msgstr ""
+msgstr "<b>Suche</b>"
 
 #: ../gtk/ldap.ui.h:20
 msgid "Timeout for search:"
-msgstr ""
+msgstr "Zeitüberschreitung bei der Suche:"
 
 #: ../gtk/ldap.ui.h:21
 msgid "Max results:"
-msgstr ""
+msgstr "Max Ergebnisse:"
 
 #: ../gtk/ldap.ui.h:22
 msgid "Follow Aliases"
-msgstr ""
+msgstr "folge Pseudonymen"
 
 #: ../gtk/ldap.ui.h:23
 msgid "<b>Miscellaneous</b>"
-msgstr ""
+msgstr "<b>Sonstiges</b>"
 
 #: ../gtk/ldap.ui.h:24
 msgid "ANONYMOUS"
-msgstr ""
+msgstr "ANONYMOUS"
 
 #: ../gtk/ldap.ui.h:25
 msgid "SIMPLE"
-msgstr ""
+msgstr "SIMPLE"
 
 #: ../gtk/ldap.ui.h:26
 msgid "DIGEST-MD5"
-msgstr ""
+msgstr "DIGEST-MD5"
 
 #: ../gtk/ldap.ui.h:27
 msgid "NTLM"
-msgstr ""
+msgstr "NTLM"
 
 #: ../gtk/config-uri.ui.h:1
 msgid "Specifying a remote configuration URI"
-msgstr ""
+msgstr "Eine URI zur FErnkonfiguration angeben"
 
 #: ../gtk/config-uri.ui.h:2
 msgid ""
 "This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
 "Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
-msgstr ""
+msgstr "Diese Maske erlaubt Ihnen für das Laden der Konfiguration beim Programmstart eine http- oder https-Adresse anzugeben.\nBitte geben Sie unten die Konfigurations-URI ein oder ändern diese. Nach dem Bestätigen mit OK wird Linphone automatisch neustarten, um die neuen Einstellungen zu übernehmen."
 
 #: ../gtk/config-uri.ui.h:4
 msgid "https://"
-msgstr ""
+msgstr "https://"
 
 #: ../gtk/provisioning-fetch.ui.h:1
 msgid "Configuring..."
-msgstr ""
+msgstr "Einstellen..."
 
 #: ../gtk/provisioning-fetch.ui.h:2
 msgid "Please wait while fetching configuration from server..."
-msgstr ""
+msgstr "Bitte warten Sie während die Einstellungen vom Server abgerufen werden..."
 
 #: ../coreapi/linphonecore.c:1511
 msgid "Ready"
@@ -1729,7 +1730,7 @@ msgstr "Bereit"
 
 #: ../coreapi/linphonecore.c:2470
 msgid "Configuring"
-msgstr ""
+msgstr "Einstellen"
 
 #: ../coreapi/linphonecore.c:2635
 msgid "Looking for telephone number destination..."
@@ -1762,7 +1763,7 @@ msgstr " und fragt nach automatischer Antwort."
 
 #: ../coreapi/linphonecore.c:3234
 msgid "."
-msgstr ""
+msgstr "."
 
 #: ../coreapi/linphonecore.c:3352
 msgid "Modifying call parameters..."
@@ -1838,7 +1839,7 @@ msgstr "Ausstehend"
 
 #: ../coreapi/friend.c:66
 msgid "Vacation"
-msgstr ""
+msgstr "Urlaub"
 
 #: ../coreapi/friend.c:68
 msgid "Unknown-bug"
@@ -1871,7 +1872,7 @@ msgstr "Klingeln bei der Gegenseite..."
 
 #: ../coreapi/callbacks.c:414
 msgid "Early media."
-msgstr ""
+msgstr "nicht kompatibel, prüfe Codecs oder Sicherheitseinstellungen..."
 
 #: ../coreapi/callbacks.c:475
 #, c-format
@@ -1894,7 +1895,7 @@ msgstr "Anruf wird von %s entgegengenommen."
 
 #: ../coreapi/callbacks.c:525
 msgid "Incompatible, check codecs or security settings..."
-msgstr ""
+msgstr "Inkompatibel, prüfe Codecs oder Sicherheitseinstellungen..."
 
 #: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:826
 msgid "Incompatible media parameters."
@@ -1937,7 +1938,7 @@ msgstr "Anruf abgewiesen"
 
 #: ../coreapi/callbacks.c:752
 msgid "Request timeout."
-msgstr ""
+msgstr "Zeitüberschreitung bei der Anfrage"
 
 #: ../coreapi/callbacks.c:780
 msgid "Redirected"
@@ -1968,7 +1969,7 @@ msgstr "Registrierung auf %s fehlgeschlagen: %s"
 
 #: ../coreapi/callbacks.c:942
 msgid "Service unavailable, retrying"
-msgstr ""
+msgstr "Service nicht verfügbar, versuche erneut"
 
 #: ../coreapi/linphonecall.c:174
 #, c-format
diff --git a/po/de_DE.po b/po/de_DE.po
new file mode 100644
index 000000000..c65ead393
--- /dev/null
+++ b/po/de_DE.po
@@ -0,0 +1,1984 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# andreas, 2014
+# Gerhard Stengel <gstengel@gmx.net>, 2011-2012
+# Simon Morlat <linphone@free.fr>, 2001
+msgid ""
+msgstr ""
+"Project-Id-Version: linphone-gtk\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-19 10:39+0100\n"
+"PO-Revision-Date: 2014-11-25 16:45+0000\n"
+"Last-Translator: andreas\n"
+"Language-Team: German (http://www.transifex.com/projects/p/linphone-gtk/language/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974
+#, c-format
+msgid "Call %s"
+msgstr "„%s“ anrufen"
+
+#: ../gtk/calllogs.c:149 ../gtk/friendlist.c:975
+#, c-format
+msgid "Send text to %s"
+msgstr "Text zu „%s“ schicken"
+
+#: ../gtk/calllogs.c:232
+#, c-format
+msgid "<b>Recent calls (%i)</b>"
+msgstr "<b>letzte Anrufe (%i)</b>"
+
+#: ../gtk/calllogs.c:314
+msgid "n/a"
+msgstr "nicht verfügbar"
+
+#: ../gtk/calllogs.c:317
+msgid "Aborted"
+msgstr "Abgebrochen"
+
+#: ../gtk/calllogs.c:320
+msgid "Missed"
+msgstr "Entgangen"
+
+#: ../gtk/calllogs.c:323
+msgid "Declined"
+msgstr "Abgewiesen"
+
+#: ../gtk/calllogs.c:329
+#, c-format
+msgid "%i minute"
+msgid_plural "%i minutes"
+msgstr[0] "%i Minute"
+msgstr[1] "%i Minuten"
+
+#: ../gtk/calllogs.c:332
+#, c-format
+msgid "%i second"
+msgid_plural "%i seconds"
+msgstr[0] "%i Sekunde"
+msgstr[1] "%i Sekunden"
+
+#: ../gtk/calllogs.c:335 ../gtk/calllogs.c:341
+#, c-format
+msgid "<big><b>%s</b></big>\t%s"
+msgstr "<big><b>%s</b></big>\t%s"
+
+#: ../gtk/calllogs.c:337
+#, c-format
+msgid ""
+"<small><i>%s</i>\t<i>Quality: %s</i></small>\n"
+"%s\t%s\t"
+msgstr "<small><i>%s</i>\t<i>Qualität: %s</i></small>\n%s\t%s\t"
+
+#: ../gtk/calllogs.c:343
+#, c-format
+msgid ""
+"<small><i>%s</i></small>\t\n"
+"%s"
+msgstr "<small><i>%s</i></small>\t\n%s"
+
+#: ../gtk/conference.c:38 ../gtk/main.ui.h:13
+msgid "Conference"
+msgstr "Konferenz"
+
+#: ../gtk/conference.c:46
+msgid "Me"
+msgstr "Eigenes Telefon"
+
+#: ../gtk/support.c:49 ../gtk/support.c:73 ../gtk/support.c:102
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Pixmapdatei %s kann nicht gefunden werden."
+
+#: ../gtk/chat.c:364 ../gtk/friendlist.c:924
+msgid "Invalid sip contact !"
+msgstr "Ungültiger SIP-Kontakt!"
+
+#: ../gtk/main.c:107
+msgid "log to stdout some debug information while running."
+msgstr "Ausgabe von Debug-Informationen auf stdout während der Laufzeit"
+
+#: ../gtk/main.c:114
+msgid "path to a file to write logs into."
+msgstr "Pfad zu einer Datei, in die Protokolle geschrieben werden."
+
+#: ../gtk/main.c:121
+msgid "Start linphone with video disabled."
+msgstr "Linphone mit ausgeschaltetem Video starten."
+
+#: ../gtk/main.c:128
+msgid "Start only in the system tray, do not show the main interface."
+msgstr "Nur im Systemabschnitt der Kontrollleiste starten, aber das Hauptfenster nicht zeigen."
+
+#: ../gtk/main.c:135
+msgid "address to call right now"
+msgstr "Im Moment anzurufende Adresse"
+
+#: ../gtk/main.c:142
+msgid "if set automatically answer incoming calls"
+msgstr "Falls aktiviert, werden eingehende Anrufe automatisch beantwortet"
+
+#: ../gtk/main.c:149
+msgid ""
+"Specifiy a working directory (should be the base of the installation, eg: "
+"c:\\Program Files\\Linphone)"
+msgstr "Geben Sie einen Arbeitsordner an (sollte der Installationsordner sein, z. B. C:\\Programme\\Linphone)"
+
+#: ../gtk/main.c:156
+msgid "Configuration file"
+msgstr "Konfigurationsdatei"
+
+#: ../gtk/main.c:163
+msgid "Run the audio assistant"
+msgstr "Starte den Audio-Assistent"
+
+#: ../gtk/main.c:1085
+#, c-format
+msgid ""
+"%s would like to add you to his contact list.\n"
+"Would you allow him to see your presence status or add him to your contact list ?\n"
+"If you answer no, this person will be temporarily blacklisted."
+msgstr "%s möchte Sie zu seiner Kontaktliste hinzufügen.\nMöchten Sie ihm erlauben, Ihren Anwesenheitsstatus zu sehen, oder ihn zu Ihrer Kontaktliste hinzufügen?\nWenn Sie mit Nein antworten, wird diese Person vorläufig blockiert."
+
+#: ../gtk/main.c:1162
+#, c-format
+msgid ""
+"Please enter your password for username <i>%s</i>\n"
+" at realm <i>%s</i>:"
+msgstr "Bitte geben Sie Ihr Passwort für den Benutzernamen <i>%s</i>\n für  Bereich <i>%s</i> ein:"
+
+#: ../gtk/main.c:1283
+msgid "Call error"
+msgstr "Anruf fehlgeschlagen"
+
+#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3744
+msgid "Call ended"
+msgstr "Anruf beendet"
+
+#: ../gtk/main.c:1289
+msgid "Incoming call"
+msgstr "Eingehender Anruf"
+
+#: ../gtk/main.c:1291 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
+msgid "Answer"
+msgstr "Annehmen"
+
+#: ../gtk/main.c:1293 ../gtk/main.ui.h:6
+msgid "Decline"
+msgstr "Abweisen"
+
+#: ../gtk/main.c:1299
+msgid "Call paused"
+msgstr "Anruf wird gehalten"
+
+#: ../gtk/main.c:1299
+#, c-format
+msgid "<b>by %s</b>"
+msgstr "<b>von %s</b>"
+
+#: ../gtk/main.c:1366
+#, c-format
+msgid "%s proposed to start video. Do you accept ?"
+msgstr "%s schlägt vor, eine Videoübertragung zu starten. Nehmen Sie an?"
+
+#: ../gtk/main.c:1528
+msgid "Website link"
+msgstr "Website-Verknüpfung"
+
+#: ../gtk/main.c:1577
+msgid "Linphone - a video internet phone"
+msgstr "Linphone - ein Internet-Video-Telefon"
+
+#: ../gtk/main.c:1669
+#, c-format
+msgid "%s (Default)"
+msgstr "%s (Vorgabe)"
+
+#: ../gtk/main.c:2006 ../coreapi/callbacks.c:983
+#, c-format
+msgid "We are transferred to %s"
+msgstr "Vermittlung nach %s"
+
+#: ../gtk/main.c:2016
+msgid ""
+"No sound cards have been detected on this computer.\n"
+"You won't be able to send or receive audio calls."
+msgstr "Auf diesem Rechner können keine Soundkarten gefunden werden.\nSie können keine Audio-Anrufe tätigen oder entgegennehmen."
+
+#: ../gtk/main.c:2157
+msgid "A free SIP video-phone"
+msgstr "Ein freies SIP-Video-Telefon"
+
+#: ../gtk/friendlist.c:505
+msgid "Add to addressbook"
+msgstr "Zum Adressbuch hinzufügen"
+
+#: ../gtk/friendlist.c:691
+msgid "Presence status"
+msgstr "Anwesenheitsstatus"
+
+#: ../gtk/friendlist.c:709 ../gtk/propertybox.c:552 ../gtk/contact.ui.h:1
+msgid "Name"
+msgstr "Name"
+
+#: ../gtk/friendlist.c:721
+msgid "Call"
+msgstr "Anrufen"
+
+#: ../gtk/friendlist.c:726
+msgid "Chat"
+msgstr "Chat"
+
+#: ../gtk/friendlist.c:756
+#, c-format
+msgid "Search in %s directory"
+msgstr "Im %s-Verzeichnis suchen"
+
+#: ../gtk/friendlist.c:976
+#, c-format
+msgid "Edit contact '%s'"
+msgstr "Kontakt „%s“ bearbeiten"
+
+#: ../gtk/friendlist.c:977
+#, c-format
+msgid "Delete contact '%s'"
+msgstr "Kontakt „%s“ löschen"
+
+#: ../gtk/friendlist.c:978
+#, c-format
+msgid "Delete chat history of '%s'"
+msgstr "Lösche Gesprächshistorie von '%s'"
+
+#: ../gtk/friendlist.c:1029
+#, c-format
+msgid "Add new contact from %s directory"
+msgstr "Einen neuen Kontakt aus dem %s-Verzeichnis hinzufügen"
+
+#: ../gtk/propertybox.c:558
+msgid "Rate (Hz)"
+msgstr "Rate (Hz)"
+
+#: ../gtk/propertybox.c:564
+msgid "Status"
+msgstr "Status"
+
+#: ../gtk/propertybox.c:570
+msgid "IP Bitrate (kbit/s)"
+msgstr "IP Bit-Rate (kbit/s)"
+
+#: ../gtk/propertybox.c:577
+msgid "Parameters"
+msgstr "Parameter"
+
+#: ../gtk/propertybox.c:620 ../gtk/propertybox.c:763
+msgid "Enabled"
+msgstr "Freigegeben"
+
+#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763
+msgid "Disabled"
+msgstr "Gesperrt"
+
+#: ../gtk/propertybox.c:809
+msgid "Account"
+msgstr "Konto"
+
+#: ../gtk/propertybox.c:1072
+msgid "English"
+msgstr "Englisch"
+
+#: ../gtk/propertybox.c:1073
+msgid "French"
+msgstr "Französisch"
+
+#: ../gtk/propertybox.c:1074
+msgid "Swedish"
+msgstr "Schwedisch"
+
+#: ../gtk/propertybox.c:1075
+msgid "Italian"
+msgstr "Italienisch"
+
+#: ../gtk/propertybox.c:1076
+msgid "Spanish"
+msgstr "Spanisch"
+
+#: ../gtk/propertybox.c:1077
+msgid "Brazilian Portugese"
+msgstr "Brasilianisches Portugiesisch"
+
+#: ../gtk/propertybox.c:1078
+msgid "Polish"
+msgstr "Polnisch"
+
+#: ../gtk/propertybox.c:1079
+msgid "German"
+msgstr "Deutsch"
+
+#: ../gtk/propertybox.c:1080
+msgid "Russian"
+msgstr "Russisch"
+
+#: ../gtk/propertybox.c:1081
+msgid "Japanese"
+msgstr "Japanisch"
+
+#: ../gtk/propertybox.c:1082
+msgid "Dutch"
+msgstr "Niederländisch"
+
+#: ../gtk/propertybox.c:1083
+msgid "Hungarian"
+msgstr "Ungarisch"
+
+#: ../gtk/propertybox.c:1084
+msgid "Czech"
+msgstr "Tschechisch"
+
+#: ../gtk/propertybox.c:1085
+msgid "Chinese"
+msgstr "Chinesisch"
+
+#: ../gtk/propertybox.c:1086
+msgid "Traditional Chinese"
+msgstr "Traditionelles Chinesisch"
+
+#: ../gtk/propertybox.c:1087
+msgid "Norwegian"
+msgstr "Norwegisch"
+
+#: ../gtk/propertybox.c:1088
+msgid "Hebrew"
+msgstr "Hebräisch"
+
+#: ../gtk/propertybox.c:1089
+msgid "Serbian"
+msgstr "Serbisch"
+
+#: ../gtk/propertybox.c:1156
+msgid ""
+"You need to restart linphone for the new language selection to take effect."
+msgstr "Linphone muss neu gestartet werden, damit die neue Spracheinstellung wirksam wird."
+
+#: ../gtk/propertybox.c:1234
+msgid "None"
+msgstr "Keinen"
+
+#: ../gtk/propertybox.c:1238
+msgid "SRTP"
+msgstr "SRTP"
+
+#: ../gtk/propertybox.c:1244
+msgid "ZRTP"
+msgstr "ZRTP"
+
+#: ../gtk/update.c:80
+#, c-format
+msgid ""
+"A more recent version is availalble from %s.\n"
+"Would you like to open a browser to download it ?"
+msgstr "Eine neuere Version ist von %s verfügbar.\nMöchten Sie einen Browser zum Herunterladen öffnen?"
+
+#: ../gtk/update.c:91
+msgid "You are running the lastest version."
+msgstr "Sie verwenden bereits die aktuellste Version."
+
+#: ../gtk/buddylookup.c:85
+msgid "Firstname, Lastname"
+msgstr "Vorname, Nachname"
+
+#: ../gtk/buddylookup.c:160
+msgid "Error communicating with server."
+msgstr "Fehler bei der Kommunikation mit dem Server."
+
+#: ../gtk/buddylookup.c:164
+msgid "Connecting..."
+msgstr "Verbinden..."
+
+#: ../gtk/buddylookup.c:168
+msgid "Connected"
+msgstr "Verbunden"
+
+#: ../gtk/buddylookup.c:172
+msgid "Receiving data..."
+msgstr "Daten werden empfangen..."
+
+#: ../gtk/buddylookup.c:180
+#, c-format
+msgid "Found %i contact"
+msgid_plural "Found %i contacts"
+msgstr[0] "%i Kontakt gefunden"
+msgstr[1] "%i Kontakte gefunden"
+
+#: ../gtk/setupwizard.c:34
+msgid ""
+"Welcome !\n"
+"This assistant will help you to use a SIP account for your calls."
+msgstr "Willkommen!\nDieser Assistent wird Ihnen dabei helfen, ein SIP-Konto für Ihre Anrufe zu verwenden."
+
+#: ../gtk/setupwizard.c:43
+msgid "Create an account on linphone.org"
+msgstr "Ein Konto bei linphone.org erstellen."
+
+#: ../gtk/setupwizard.c:44
+msgid "I have already a linphone.org account and I just want to use it"
+msgstr "Ich habe bereits ein Konto bei linphone.org und möchte es jetzt benutzen."
+
+#: ../gtk/setupwizard.c:45
+msgid "I have already a sip account and I just want to use it"
+msgstr "Ich habe bereits ein SIP-Konto und möchte es jetzt benutzen."
+
+#: ../gtk/setupwizard.c:46
+msgid "I want to specify a remote configuration URI"
+msgstr "Ich möchte eine URI zur Fernkonfiguration angeben"
+
+#: ../gtk/setupwizard.c:89
+msgid "Enter your linphone.org username"
+msgstr "Geben Sie Ihren Benutzernamen bei linphone.org ein."
+
+#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:79 ../gtk/ldap.ui.h:4
+msgid "Username:"
+msgstr "Benutzername:"
+
+#: ../gtk/setupwizard.c:104 ../gtk/password.ui.h:4 ../gtk/ldap.ui.h:5
+msgid "Password:"
+msgstr "Passwort:"
+
+#: ../gtk/setupwizard.c:124
+msgid "Enter your account informations"
+msgstr "Geben Sie Ihre Zugangsdaten ein."
+
+#: ../gtk/setupwizard.c:140
+msgid "Username*"
+msgstr "Benutzername*"
+
+#: ../gtk/setupwizard.c:141
+msgid "Password*"
+msgstr "Passwort*"
+
+#: ../gtk/setupwizard.c:144
+msgid "Domain*"
+msgstr "Domäne*"
+
+#: ../gtk/setupwizard.c:145
+msgid "Proxy"
+msgstr "Proxy"
+
+#: ../gtk/setupwizard.c:317
+msgid "(*) Required fields"
+msgstr "(*) erforderliche Felder"
+
+#: ../gtk/setupwizard.c:318
+msgid "Username: (*)"
+msgstr "Benutzername: (*)"
+
+#: ../gtk/setupwizard.c:320
+msgid "Password: (*)"
+msgstr "Passwort: (*)"
+
+#: ../gtk/setupwizard.c:322
+msgid "Email: (*)"
+msgstr "E-Mail: (*)"
+
+#: ../gtk/setupwizard.c:324
+msgid "Confirm your password: (*)"
+msgstr "Bestätigen Sie Ihr Passwort: (*)"
+
+#: ../gtk/setupwizard.c:338
+msgid "Keep me informed with linphone updates"
+msgstr "Halte mich über linphone Aktualisierungen auf dem laufenden"
+
+#: ../gtk/setupwizard.c:394
+msgid ""
+"Error, account not validated, username already used or server unreachable.\n"
+"Please go back and try again."
+msgstr "Fehler, Konto kann nicht bestätigt werden. Der Benutzername wird bereits\nverwendet oder der Server ist unerreichbar.\nBitte gehen Sie zurück und versuchen Sie es noch einmal."
+
+#: ../gtk/setupwizard.c:405
+msgid "Thank you. Your account is now configured and ready for use."
+msgstr "Danke. Ihr Konto ist nun fertig eingerichtet und kann verwendet werden."
+
+#: ../gtk/setupwizard.c:413
+msgid ""
+"Please validate your account by clicking on the link we just sent you by email.\n"
+"Then come back here and press Next button."
+msgstr "Bitte bestätigen Sie Ihr Konto, indem Sie auf die Verknüpfung klicken, die wir Ihnen soeben per E-Mail geschickt haben.\nDanach gehen Sie hierher zurück und drücken auf „Vor“."
+
+#: ../gtk/setupwizard.c:600
+msgid "SIP account configuration assistant"
+msgstr "SIP-Konto-Einrichtungsassistent"
+
+#: ../gtk/setupwizard.c:618
+msgid "Welcome to the account setup assistant"
+msgstr "Willkommen zum Konto-Einrichtungsassistenten"
+
+#: ../gtk/setupwizard.c:623
+msgid "Account setup assistant"
+msgstr "Konto-Einrichtungsassistent"
+
+#: ../gtk/setupwizard.c:629
+msgid "Configure your account (step 1/1)"
+msgstr "Konto einrichten (Schritt 1/1)"
+
+#: ../gtk/setupwizard.c:634
+msgid "Enter your sip username (step 1/1)"
+msgstr "Geben Sie Ihren SIP-Benutzernamen ein (Schritt 1/1)"
+
+#: ../gtk/setupwizard.c:638
+msgid "Enter account information (step 1/2)"
+msgstr "Geben Sie Ihre Zugangsdaten ein (Schritt 1/2)"
+
+#: ../gtk/setupwizard.c:647
+msgid "Validation (step 2/2)"
+msgstr "Bestätigung (Schritt 2/2)"
+
+#: ../gtk/setupwizard.c:652
+msgid "Error"
+msgstr "Fehler"
+
+#: ../gtk/setupwizard.c:656 ../gtk/audio_assistant.c:527
+msgid "Terminating"
+msgstr "Fertigstellen"
+
+#: ../gtk/incall_view.c:70 ../gtk/incall_view.c:94
+#, c-format
+msgid "Call #%i"
+msgstr "Anruf #%i"
+
+#: ../gtk/incall_view.c:155
+#, c-format
+msgid "Transfer to call #%i with %s"
+msgstr "Vermittlung zum Anruf #%i mit %s"
+
+#: ../gtk/incall_view.c:211 ../gtk/incall_view.c:214
+msgid "Not used"
+msgstr "Nicht verwendet"
+
+#: ../gtk/incall_view.c:221
+msgid "ICE not activated"
+msgstr "ICE nicht aktiviert"
+
+#: ../gtk/incall_view.c:223
+msgid "ICE failed"
+msgstr "ICE fehlgeschlagen"
+
+#: ../gtk/incall_view.c:225
+msgid "ICE in progress"
+msgstr "ICE läuft"
+
+#: ../gtk/incall_view.c:227
+msgid "Going through one or more NATs"
+msgstr "Ein oder mehrere NATs werden durchquert"
+
+#: ../gtk/incall_view.c:229
+msgid "Direct"
+msgstr "Direkt"
+
+#: ../gtk/incall_view.c:231
+msgid "Through a relay server"
+msgstr "Über einen Relay-Server"
+
+#: ../gtk/incall_view.c:239
+msgid "uPnP not activated"
+msgstr "uPnP nicht aktiviert"
+
+#: ../gtk/incall_view.c:241
+msgid "uPnP in progress"
+msgstr "uPnP läuft"
+
+#: ../gtk/incall_view.c:243
+msgid "uPnp not available"
+msgstr "uPnp nicht verfügbar"
+
+#: ../gtk/incall_view.c:245
+msgid "uPnP is running"
+msgstr "uPnP läuft"
+
+#: ../gtk/incall_view.c:247
+msgid "uPnP failed"
+msgstr "uPnP fehlgeschlagen"
+
+#: ../gtk/incall_view.c:257 ../gtk/incall_view.c:258
+msgid "Direct or through server"
+msgstr "Direkt oder über Server"
+
+#: ../gtk/incall_view.c:267 ../gtk/incall_view.c:279
+#, c-format
+msgid ""
+"download: %f\n"
+"upload: %f (kbit/s)"
+msgstr "Herunterladen: %f\nHochladen: %f (kbit/s)"
+
+#: ../gtk/incall_view.c:272 ../gtk/incall_view.c:274
+#, c-format
+msgid "%ix%i @ %f fps"
+msgstr "%ix%i @ %f bps"
+
+#: ../gtk/incall_view.c:304
+#, c-format
+msgid "%.3f seconds"
+msgstr "%.3f Sekunden"
+
+#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12
+msgid "Hang up"
+msgstr "Auflegen"
+
+#: ../gtk/incall_view.c:511
+msgid "<b>Calling...</b>"
+msgstr "<b>Verbindungsaufbau...</b>"
+
+#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:727
+msgid "00::00::00"
+msgstr "00::00::00"
+
+#: ../gtk/incall_view.c:525
+msgid "<b>Incoming call</b>"
+msgstr "<b>Eingehender Anruf</b>"
+
+#: ../gtk/incall_view.c:562
+msgid "good"
+msgstr "gut"
+
+#: ../gtk/incall_view.c:564
+msgid "average"
+msgstr "durchschnittlich"
+
+#: ../gtk/incall_view.c:566
+msgid "poor"
+msgstr "schlecht"
+
+#: ../gtk/incall_view.c:568
+msgid "very poor"
+msgstr "sehr schlecht"
+
+#: ../gtk/incall_view.c:570
+msgid "too bad"
+msgstr "zu schlecht"
+
+#: ../gtk/incall_view.c:571 ../gtk/incall_view.c:587
+msgid "unavailable"
+msgstr "nicht verfügbar"
+
+#: ../gtk/incall_view.c:679
+msgid "Secured by SRTP"
+msgstr "Gesichert durch SRTP"
+
+#: ../gtk/incall_view.c:685
+#, c-format
+msgid "Secured by ZRTP - [auth token: %s]"
+msgstr "Gesichert durch ZRTP - [Auth.-Token: %s]"
+
+#: ../gtk/incall_view.c:691
+msgid "Set unverified"
+msgstr "Auf „Ungeprüft“ setzen"
+
+#: ../gtk/incall_view.c:691 ../gtk/main.ui.h:4
+msgid "Set verified"
+msgstr "Auf „Geprüft“ setzen"
+
+#: ../gtk/incall_view.c:722
+msgid "In conference"
+msgstr "In Konferenz"
+
+#: ../gtk/incall_view.c:722
+msgid "<b>In call</b>"
+msgstr "<b>Im Gespräch</b>"
+
+#: ../gtk/incall_view.c:758
+msgid "<b>Paused call</b>"
+msgstr "<b>Gehaltener Anruf</b>"
+
+#: ../gtk/incall_view.c:771
+#, c-format
+msgid "%02i::%02i::%02i"
+msgstr "%02i::%02i::%02i"
+
+#: ../gtk/incall_view.c:794
+msgid "<b>Call ended.</b>"
+msgstr "<b>Anruf beendet.</b>"
+
+#: ../gtk/incall_view.c:825
+msgid "Transfer in progress"
+msgstr "Vermittlung läuft"
+
+#: ../gtk/incall_view.c:828
+msgid "Transfer done."
+msgstr "Vermittlung abgeschlossen."
+
+#: ../gtk/incall_view.c:831
+msgid "Transfer failed."
+msgstr "Vermittlung fehlgeschlagen."
+
+#: ../gtk/incall_view.c:875
+msgid "Resume"
+msgstr "Fortsetzen"
+
+#: ../gtk/incall_view.c:882 ../gtk/main.ui.h:9
+msgid "Pause"
+msgstr "Halten"
+
+#: ../gtk/incall_view.c:948
+#, c-format
+msgid ""
+"<small><i>Recording into\n"
+"%s %s</i></small>"
+msgstr "<small><i>Recording into\n%s %s</i></small>"
+
+#: ../gtk/incall_view.c:948
+msgid "(Paused)"
+msgstr "(pausiert)"
+
+#: ../gtk/loginframe.c:88
+#, c-format
+msgid "Please enter login information for %s"
+msgstr "Bitte geben Sie die Anmeldeinformationen für %s ein."
+
+#: ../gtk/config-fetching.c:57
+#, c-format
+msgid "fetching from %s"
+msgstr "abrufen von %s"
+
+#: ../gtk/config-fetching.c:73
+#, c-format
+msgid "Downloading of remote configuration from %s failed."
+msgstr "Herunterladen der Fernkonfiguration von %s fehlgeschlagen"
+
+#: ../gtk/audio_assistant.c:98
+msgid "No voice detected"
+msgstr "Keine Stimme ermittelt"
+
+#: ../gtk/audio_assistant.c:99
+msgid "Too low"
+msgstr "zu gering"
+
+#: ../gtk/audio_assistant.c:100
+msgid "Good"
+msgstr "gut"
+
+#: ../gtk/audio_assistant.c:101
+msgid "Too loud"
+msgstr "zu laut"
+
+#: ../gtk/audio_assistant.c:318
+msgid ""
+"Welcome !\n"
+"This assistant will help you to configure audio settings for Linphone"
+msgstr "Willkommen!\nDieser Assistent wird Ihnen dabei helfen, die Audio-Einstellungen für Linphone vorzunehmen."
+
+#: ../gtk/audio_assistant.c:328
+msgid "Capture device"
+msgstr "Aufnahmegerät"
+
+#: ../gtk/audio_assistant.c:329
+msgid "Recorded volume"
+msgstr "aufgenommene Lautstärke"
+
+#: ../gtk/audio_assistant.c:333
+msgid "No voice"
+msgstr "Keine Stimme"
+
+#: ../gtk/audio_assistant.c:369
+msgid "Playback device"
+msgstr "Wiedergabegerät"
+
+#: ../gtk/audio_assistant.c:370
+msgid "Play three beeps"
+msgstr "spiele drei Pieptöne ab"
+
+#: ../gtk/audio_assistant.c:403
+msgid "Press the record button and say some words"
+msgstr "Drücken Sie den Aufnahmeknopf und sagen Sie etwas"
+
+#: ../gtk/audio_assistant.c:404
+msgid "Listen to your record voice"
+msgstr "Hören Sie das Aufgenommene"
+
+#: ../gtk/audio_assistant.c:433
+msgid "Let's start Linphone now"
+msgstr "Linphone jetzt starten"
+
+#: ../gtk/audio_assistant.c:496
+msgid "Audio Assistant"
+msgstr "Audio-Assistant"
+
+#: ../gtk/audio_assistant.c:506 ../gtk/main.ui.h:31
+msgid "Audio assistant"
+msgstr "Audio-Assistant"
+
+#: ../gtk/audio_assistant.c:511
+msgid "Mic Gain calibration"
+msgstr "Einrichtung MIkrofonverstärker"
+
+#: ../gtk/audio_assistant.c:517
+msgid "Speaker volume calibration"
+msgstr "Einrichtung Lautstärke"
+
+#: ../gtk/audio_assistant.c:522
+msgid "Record and Play"
+msgstr "aufnehmen und abspielen"
+
+#: ../gtk/main.ui.h:1
+msgid "<b>Callee name</b>"
+msgstr "<b>Name des Angerufenen</b>"
+
+#: ../gtk/main.ui.h:2
+msgid "Send"
+msgstr "Senden"
+
+#: ../gtk/main.ui.h:3
+msgid "End conference"
+msgstr "Konferenz beenden"
+
+#: ../gtk/main.ui.h:7
+msgid "Record this call to an audio file"
+msgstr "Speichere den Anruf in eine Audio-Datei"
+
+#: ../gtk/main.ui.h:8
+msgid "Video"
+msgstr "Video"
+
+#: ../gtk/main.ui.h:10
+msgid "Mute"
+msgstr "Stumm"
+
+#: ../gtk/main.ui.h:11
+msgid "Transfer"
+msgstr "Vermittlung"
+
+#: ../gtk/main.ui.h:14
+msgid "In call"
+msgstr "Im Gespräch"
+
+#: ../gtk/main.ui.h:15
+msgid "Duration"
+msgstr "Dauer"
+
+#: ../gtk/main.ui.h:16
+msgid "Call quality rating"
+msgstr "Bewertung der Verbindungsqualität"
+
+#: ../gtk/main.ui.h:17
+msgid "All users"
+msgstr "Alle Teilnehmer"
+
+#: ../gtk/main.ui.h:18
+msgid "Online users"
+msgstr "Angemeldete Teilnehmer"
+
+#: ../gtk/main.ui.h:19
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../gtk/main.ui.h:20
+msgid "Fiber Channel"
+msgstr "Glasfaserkabel"
+
+#: ../gtk/main.ui.h:21
+msgid "Default"
+msgstr "Vorgabe"
+
+#: ../gtk/main.ui.h:22
+msgid "_Options"
+msgstr "_Optionen"
+
+#: ../gtk/main.ui.h:23
+msgid "Set configuration URI"
+msgstr "Konfigurations URI angeben"
+
+#: ../gtk/main.ui.h:24
+msgid "Always start video"
+msgstr "Video immer starten"
+
+#: ../gtk/main.ui.h:25
+msgid "Enable self-view"
+msgstr "Selbstansicht ein"
+
+#: ../gtk/main.ui.h:26
+msgid "_Help"
+msgstr "_Hilfe"
+
+#: ../gtk/main.ui.h:27
+msgid "Show debug window"
+msgstr "Debug-Fenster anzeigen"
+
+#: ../gtk/main.ui.h:28
+msgid "_Homepage"
+msgstr "_Homepage"
+
+#: ../gtk/main.ui.h:29
+msgid "Check _Updates"
+msgstr "Auf _Aktualisierungen überprüfen"
+
+#: ../gtk/main.ui.h:30
+msgid "Account assistant"
+msgstr "Konto-Einrichtungsassistent"
+
+#: ../gtk/main.ui.h:32
+msgid "SIP address or phone number:"
+msgstr "SIP-Adresse oder Telefonnummer:"
+
+#: ../gtk/main.ui.h:33
+msgid "Initiate a new call"
+msgstr "Einen neuen Anruf beginnen"
+
+#: ../gtk/main.ui.h:34
+msgid "Contacts"
+msgstr "Kontakte"
+
+#: ../gtk/main.ui.h:35
+msgid "Search"
+msgstr "Suchen"
+
+#: ../gtk/main.ui.h:36
+msgid "<b>Add contacts from directory</b>"
+msgstr "<b>Kontakte aus einem Verzeichnis hinzufügen</b>"
+
+#: ../gtk/main.ui.h:37
+msgid "Add contact"
+msgstr "Kontakt hinzufügen"
+
+#: ../gtk/main.ui.h:38
+msgid "Recent calls"
+msgstr "Letzte Gespräche"
+
+#: ../gtk/main.ui.h:39
+msgid "My current identity:"
+msgstr "Aktuelle Identität:"
+
+#: ../gtk/main.ui.h:40 ../gtk/tunnel_config.ui.h:7
+msgid "Username"
+msgstr "Benutzername"
+
+#: ../gtk/main.ui.h:41 ../gtk/tunnel_config.ui.h:8
+msgid "Password"
+msgstr "Passwort"
+
+#: ../gtk/main.ui.h:42
+msgid "Internet connection:"
+msgstr "Internetverbindung:"
+
+#: ../gtk/main.ui.h:43
+msgid "Automatically log me in"
+msgstr "Automatisch anmelden"
+
+#: ../gtk/main.ui.h:44 ../gtk/password.ui.h:3
+msgid "UserID"
+msgstr "Benutzer-ID"
+
+#: ../gtk/main.ui.h:45
+msgid "Login information"
+msgstr "Anmeldeinformationen"
+
+#: ../gtk/main.ui.h:46
+msgid "<b>Welcome !</b>"
+msgstr "<b>Willkommen !</b>"
+
+#: ../gtk/main.ui.h:47
+msgid "Delete"
+msgstr "Löschen"
+
+#: ../gtk/about.ui.h:1
+msgid "About linphone"
+msgstr "Über Linphone"
+
+#: ../gtk/about.ui.h:2
+msgid "(C) Belledonne Communications,2010\n"
+msgstr "(C) Belledonne Communications,2010\n"
+
+#: ../gtk/about.ui.h:4
+msgid "An internet video phone using the standard SIP (rfc3261) protocol."
+msgstr "Ein Internet-Video-Telefon, das das Standard-SIP-Protokoll (RFC3261) verwendet."
+
+#: ../gtk/about.ui.h:5
+msgid ""
+"fr: Simon Morlat\n"
+"en: Simon Morlat and Delphine Perreau\n"
+"it: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\n"
+"de: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\n"
+"sv: Daniel Nylander <po@danielnylander.se>\n"
+"es: Jesus Benitez <gnelson at inMail dot sk>\n"
+"ja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\n"
+"pt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\n"
+"pl: Robert Nasiadek <darkone@darkone.pl>\n"
+"cs: Petr Pisar <petr.pisar@atlas.cz>\n"
+"hu: anonymous\n"
+"he: Eli Zaretskii <eliz@gnu.org>\n"
+msgstr "fr: Simon Morlat\nen: Simon Morlat and Delphine Perreau\nit: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\nde: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\nsv: Daniel Nylander <po@danielnylander.se>\nes: Jesus Benitez <gnelson at inMail dot sk>\nja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\npt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\npl: Robert Nasiadek <darkone@darkone.pl>\ncs: Petr Pisar <petr.pisar@atlas.cz>\nhu: anonymous\nhe: Eli Zaretskii <eliz@gnu.org>\n"
+
+#: ../gtk/contact.ui.h:2
+msgid "SIP Address"
+msgstr "SIP-Adresse"
+
+#: ../gtk/contact.ui.h:3
+msgid "Show this contact presence status"
+msgstr "Anwesenheitsstatus dieses Kontakts zeigen"
+
+#: ../gtk/contact.ui.h:4
+msgid "Allow this contact to see my presence status"
+msgstr "Diesem Kontakt erlauben, meinen Anwesenheitsstatus zu sehen"
+
+#: ../gtk/contact.ui.h:5
+msgid "<b>Contact information</b>"
+msgstr "<b>Kontaktinformationen</b>"
+
+#: ../gtk/log.ui.h:1
+msgid "Linphone debug window"
+msgstr "Linphone Debug-Fenster"
+
+#: ../gtk/log.ui.h:2
+msgid "Scroll to end"
+msgstr "Ans Ende rollen"
+
+#: ../gtk/password.ui.h:1
+msgid "Linphone - Authentication required"
+msgstr "Linphone - Authentifikation erforderlich"
+
+#: ../gtk/password.ui.h:2
+msgid "Please enter the domain password"
+msgstr "Bitte das Passwort der Domäne eingeben"
+
+#: ../gtk/call_logs.ui.h:1
+msgid "Call history"
+msgstr "Anrufchronik"
+
+#: ../gtk/call_logs.ui.h:2
+msgid "Clear all"
+msgstr "Alle löschen"
+
+#: ../gtk/call_logs.ui.h:3
+msgid "Call back"
+msgstr "Anrufen"
+
+#: ../gtk/sip_account.ui.h:1
+msgid "Linphone - Configure a SIP account"
+msgstr "Linphone - SIP-Konto einrichten"
+
+#: ../gtk/sip_account.ui.h:2
+msgid "Your SIP identity:"
+msgstr "Ihre SIP-Identität:"
+
+#: ../gtk/sip_account.ui.h:3
+msgid "Looks like sip:<username>@<domain>"
+msgstr "Sieht aus wie sip:<benutzername>@<domain>"
+
+#: ../gtk/sip_account.ui.h:4
+msgid "sip:"
+msgstr "sip:"
+
+#: ../gtk/sip_account.ui.h:5
+msgid "SIP Proxy address:"
+msgstr "SIP-Proxy-Adresse:"
+
+#: ../gtk/sip_account.ui.h:6
+msgid "Looks like sip:<proxy hostname>"
+msgstr "Sieht aus wie sip:<proxy hostname>"
+
+#: ../gtk/sip_account.ui.h:7
+msgid "Registration duration (sec):"
+msgstr "Registrierungsdauer (sec):"
+
+#: ../gtk/sip_account.ui.h:8
+msgid "Contact params (optional):"
+msgstr "Kontaktdetails (optional)"
+
+#: ../gtk/sip_account.ui.h:9
+msgid "AVPF regular RTCP interval (sec):"
+msgstr "AVPF Standard RTCP Interval (sek):"
+
+#: ../gtk/sip_account.ui.h:10
+msgid "Route (optional):"
+msgstr "Route (optional):"
+
+#: ../gtk/sip_account.ui.h:11
+msgid "Transport"
+msgstr "Übertragung"
+
+#: ../gtk/sip_account.ui.h:12
+msgid "Register"
+msgstr "Registrieren"
+
+#: ../gtk/sip_account.ui.h:13
+msgid "Publish presence information"
+msgstr "Anwesenheitsstatus veröffentlichen"
+
+#: ../gtk/sip_account.ui.h:14
+msgid "Enable AVPF"
+msgstr "Aktiviere AVPF"
+
+#: ../gtk/sip_account.ui.h:15
+msgid "Configure a SIP account"
+msgstr "SIP-Konto einrichten"
+
+#: ../gtk/parameters.ui.h:1
+msgid "anonymous"
+msgstr "Anonym"
+
+#: ../gtk/parameters.ui.h:2
+msgid "GSSAPI"
+msgstr "GSSAPI"
+
+#: ../gtk/parameters.ui.h:3
+msgid "SASL"
+msgstr "SASL"
+
+#: ../gtk/parameters.ui.h:4
+msgid "default soundcard"
+msgstr "Standard-Soundkarte"
+
+#: ../gtk/parameters.ui.h:5
+msgid "a sound card"
+msgstr "eine Soundkarte"
+
+#: ../gtk/parameters.ui.h:6
+msgid "default camera"
+msgstr "Standard-Kamera"
+
+#: ../gtk/parameters.ui.h:7
+msgid "CIF"
+msgstr "CIF"
+
+#: ../gtk/parameters.ui.h:8
+msgid "Audio codecs"
+msgstr "Audio-Codecs"
+
+#: ../gtk/parameters.ui.h:9
+msgid "Video codecs"
+msgstr "Video-Codecs"
+
+#: ../gtk/parameters.ui.h:10 ../gtk/keypad.ui.h:5
+msgid "C"
+msgstr "C"
+
+#: ../gtk/parameters.ui.h:11
+msgid "SIP (UDP)"
+msgstr "SIP (UDP)"
+
+#: ../gtk/parameters.ui.h:12
+msgid "SIP (TCP)"
+msgstr "SIP (TCP)"
+
+#: ../gtk/parameters.ui.h:13
+msgid "SIP (TLS)"
+msgstr "SIP (TLS)"
+
+#: ../gtk/parameters.ui.h:14
+msgid "Settings"
+msgstr "Einstellungen"
+
+#: ../gtk/parameters.ui.h:15
+msgid "Set Maximum Transmission Unit:"
+msgstr "Maximum Transmission Unit setzen:"
+
+#: ../gtk/parameters.ui.h:16
+msgid "Send DTMFs as SIP info"
+msgstr "DTMFs als SIP-Info senden"
+
+#: ../gtk/parameters.ui.h:17
+msgid "Use IPv6 instead of IPv4"
+msgstr "IPv6 statt IPv4 verwenden"
+
+#: ../gtk/parameters.ui.h:18
+msgid "<b>Transport</b>"
+msgstr "<b>Übertragung</b>"
+
+#: ../gtk/parameters.ui.h:19
+msgid "Media encryption type"
+msgstr "Verschlüsselungstyp der Medien"
+
+#: ../gtk/parameters.ui.h:20
+msgid "Video RTP/UDP:"
+msgstr "Video RTP/UDP:"
+
+#: ../gtk/parameters.ui.h:21
+msgid "Audio RTP/UDP:"
+msgstr "Audio RTP/UDP:"
+
+#: ../gtk/parameters.ui.h:22
+msgid "Fixed"
+msgstr "Fest"
+
+#: ../gtk/parameters.ui.h:23
+msgid "Media encryption is mandatory"
+msgstr "Medienverschlüsselung erzwingen"
+
+#: ../gtk/parameters.ui.h:24
+msgid "Tunnel"
+msgstr "Tunnel"
+
+#: ../gtk/parameters.ui.h:25
+msgid "DSCP fields"
+msgstr "DSCP-Felder"
+
+#: ../gtk/parameters.ui.h:26
+msgid "SIP/TCP port"
+msgstr "SIP/TCP Port"
+
+#: ../gtk/parameters.ui.h:27
+msgid "SIP/UDP port"
+msgstr "SIP/UDP Port"
+
+#: ../gtk/parameters.ui.h:28
+msgid "<b>Network protocol and ports</b>"
+msgstr "<b>Netzwerkprotokoll und Ports</b>"
+
+#: ../gtk/parameters.ui.h:29
+msgid "Direct connection to the Internet"
+msgstr "Direkte Verbindung ins Internet"
+
+#: ../gtk/parameters.ui.h:30
+msgid "Behind NAT / Firewall (specify gateway IP )"
+msgstr "Hinter NAT / Firewall (Gateway IP angeben)"
+
+#: ../gtk/parameters.ui.h:31
+msgid "Behind NAT / Firewall (use STUN to resolve)"
+msgstr "Hinter NAT / Firewall (STUN verwenden)"
+
+#: ../gtk/parameters.ui.h:32
+msgid "Behind NAT / Firewall (use ICE)"
+msgstr "Hinter NAT / Firewall (ICE verwenden)"
+
+#: ../gtk/parameters.ui.h:33
+msgid "Behind NAT / Firewall (use uPnP)"
+msgstr "Hinter NAT / Firewall (uPnP verwenden)"
+
+#: ../gtk/parameters.ui.h:34
+msgid "Public IP address:"
+msgstr "Öffentliche IP-Adresse:"
+
+#: ../gtk/parameters.ui.h:35
+msgid "Stun server:"
+msgstr "STUN-Server:"
+
+#: ../gtk/parameters.ui.h:36
+msgid "<b>NAT and Firewall</b>"
+msgstr "<b>NAT und Firewall</b>"
+
+#: ../gtk/parameters.ui.h:37
+msgid "Network settings"
+msgstr "Netzwerkeinstellungen"
+
+#: ../gtk/parameters.ui.h:38
+msgid "Ring sound:"
+msgstr "Klingelton:"
+
+#: ../gtk/parameters.ui.h:39
+msgid "ALSA special device (optional):"
+msgstr "Spezielles ALSA-Gerät (optional):"
+
+#: ../gtk/parameters.ui.h:40
+msgid "Capture device:"
+msgstr "Aufnahmegerät:"
+
+#: ../gtk/parameters.ui.h:41
+msgid "Ring device:"
+msgstr "Gerät für Klingelton:"
+
+#: ../gtk/parameters.ui.h:42
+msgid "Playback device:"
+msgstr "Wiedergabegerät:"
+
+#: ../gtk/parameters.ui.h:43
+msgid "Enable echo cancellation"
+msgstr "Echounterdrückung ein"
+
+#: ../gtk/parameters.ui.h:44
+msgid "<b>Audio</b>"
+msgstr "<b>Audio</b>"
+
+#: ../gtk/parameters.ui.h:45
+msgid "Video input device:"
+msgstr "Video-Aufnahmegerät:"
+
+#: ../gtk/parameters.ui.h:46
+msgid "Prefered video resolution:"
+msgstr "Bevorzugte Video-Auflösung:"
+
+#: ../gtk/parameters.ui.h:47
+msgid "Video output method:"
+msgstr "Methode zur Videoausgabe"
+
+#: ../gtk/parameters.ui.h:48
+msgid "<b>Video</b>"
+msgstr "<b>Video</b>"
+
+#: ../gtk/parameters.ui.h:49
+msgid "Multimedia settings"
+msgstr "Multimedia-Einstellungen"
+
+#: ../gtk/parameters.ui.h:50
+msgid "This section defines your SIP address when not using a SIP account"
+msgstr "In diesem Bereich legen Sie Ihre SIP-Adresse fest, wenn Sie kein SIP-Konto verwenden."
+
+#: ../gtk/parameters.ui.h:51
+msgid "Your display name (eg: John Doe):"
+msgstr "Ihr angezeigter Name (z. B. Heinz Müller):"
+
+#: ../gtk/parameters.ui.h:52
+msgid "Your username:"
+msgstr "Ihr Benutzername:"
+
+#: ../gtk/parameters.ui.h:53
+msgid "Your resulting SIP address:"
+msgstr "Sich ergebende SIP-Adresse:"
+
+#: ../gtk/parameters.ui.h:54
+msgid "<b>Default identity</b>"
+msgstr "<b>Standard-Identität</b>"
+
+#: ../gtk/parameters.ui.h:55
+msgid "Wizard"
+msgstr "Assistent"
+
+#: ../gtk/parameters.ui.h:56
+msgid "Add"
+msgstr "Hinzufügen"
+
+#: ../gtk/parameters.ui.h:57
+msgid "Edit"
+msgstr "Bearbeiten"
+
+#: ../gtk/parameters.ui.h:58
+msgid "Remove"
+msgstr "Entfernen"
+
+#: ../gtk/parameters.ui.h:59
+msgid "<b>Proxy accounts</b>"
+msgstr "<b>Proxy-Konten</b>"
+
+#: ../gtk/parameters.ui.h:60
+msgid "Erase all passwords"
+msgstr "Alle Passwörter löschen"
+
+#: ../gtk/parameters.ui.h:61
+msgid "<b>Privacy</b>"
+msgstr "<b>Privatsphäre</b>"
+
+#: ../gtk/parameters.ui.h:62
+msgid "Manage SIP Accounts"
+msgstr "SIP-Konten verwalten"
+
+#: ../gtk/parameters.ui.h:63 ../gtk/tunnel_config.ui.h:4
+msgid "Enable"
+msgstr "Freigeben"
+
+#: ../gtk/parameters.ui.h:64 ../gtk/tunnel_config.ui.h:5
+msgid "Disable"
+msgstr "Sperren"
+
+#: ../gtk/parameters.ui.h:65
+msgid "<b>Codecs</b>"
+msgstr "<b>Codecs</b>"
+
+#: ../gtk/parameters.ui.h:66
+msgid "0 stands for \"unlimited\""
+msgstr "0 bedeutet „unbegrenzt“"
+
+#: ../gtk/parameters.ui.h:67
+msgid "Upload speed limit in Kbit/sec:"
+msgstr "Upload-Bandbreite (kbit/sec):"
+
+#: ../gtk/parameters.ui.h:68
+msgid "Download speed limit in Kbit/sec:"
+msgstr "Download-Bandbreite (kbit/sec):"
+
+#: ../gtk/parameters.ui.h:69
+msgid "Enable adaptive rate control"
+msgstr "Adaptive Ratenregelung ein"
+
+#: ../gtk/parameters.ui.h:70
+msgid ""
+"<i>Adaptive rate control is a technique to dynamically guess the available "
+"bandwidth during a call.</i>"
+msgstr "<i>Adaptive Ratenregelung ist eine Technik zur dynamischen Abschätzung der zur Verfügung stehenden Bandbreite während eines Anrufs.</i>"
+
+#: ../gtk/parameters.ui.h:71
+msgid "<b>Bandwidth control</b>"
+msgstr "<b>Bandbreiten-Einstellungen</b>"
+
+#: ../gtk/parameters.ui.h:72
+msgid "Codecs"
+msgstr "Codecs"
+
+#: ../gtk/parameters.ui.h:73
+msgid "<b>Language</b>"
+msgstr "<b>Sprache</b>"
+
+#: ../gtk/parameters.ui.h:74
+msgid "Show advanced settings"
+msgstr "Fortgeschrittene Einstellungen anzeigen"
+
+#: ../gtk/parameters.ui.h:75
+msgid "<b>Level</b>"
+msgstr "<b>Detaillierung</b>"
+
+#: ../gtk/parameters.ui.h:76
+msgid "User interface"
+msgstr "Benutzeroberfläche"
+
+#: ../gtk/parameters.ui.h:77 ../gtk/ldap.ui.h:2
+msgid "Server address:"
+msgstr "Server-Adresse"
+
+#: ../gtk/parameters.ui.h:78 ../gtk/ldap.ui.h:3
+msgid "Authentication method:"
+msgstr "Authentifizierungsmethode"
+
+#: ../gtk/parameters.ui.h:80
+msgid "label"
+msgstr "Hinweisschild"
+
+#: ../gtk/parameters.ui.h:81
+msgid "<b>LDAP Account setup</b>"
+msgstr "LDAP-Kontoeinrichtung"
+
+#: ../gtk/parameters.ui.h:82
+msgid "LDAP"
+msgstr "LDAP"
+
+#: ../gtk/parameters.ui.h:83
+msgid "Done"
+msgstr "Fertig"
+
+#: ../gtk/buddylookup.ui.h:1
+msgid "Search contacts in directory"
+msgstr "Kontakte im Verzeichnis suchen"
+
+#: ../gtk/buddylookup.ui.h:2
+msgid "Add to my list"
+msgstr "Zur Kontaktliste hinzufügen"
+
+#: ../gtk/buddylookup.ui.h:3
+msgid "<b>Search somebody</b>"
+msgstr "<b>Kontaktsuche</b>"
+
+#: ../gtk/waiting.ui.h:1
+msgid "Linphone"
+msgstr "Linphone"
+
+#: ../gtk/waiting.ui.h:2
+msgid "Please wait"
+msgstr "Bitte warten"
+
+#: ../gtk/dscp_settings.ui.h:1
+msgid "DSCP settings"
+msgstr "DSCP-Einstellungen"
+
+#: ../gtk/dscp_settings.ui.h:2
+msgid "SIP"
+msgstr "SIP"
+
+#: ../gtk/dscp_settings.ui.h:3
+msgid "Audio RTP stream"
+msgstr "Audio-RTP-Datenstrom"
+
+#: ../gtk/dscp_settings.ui.h:4
+msgid "Video RTP stream"
+msgstr "Video-RTP-Datenstrom"
+
+#: ../gtk/dscp_settings.ui.h:5
+msgid "<b>Set DSCP values (in hexadecimal)</b>"
+msgstr "<b>DSCP-Werte setzen (hexadezimal)</b>"
+
+#: ../gtk/call_statistics.ui.h:1
+msgid "Call statistics"
+msgstr "Anrufstatistik"
+
+#: ../gtk/call_statistics.ui.h:2
+msgid "Audio codec"
+msgstr "Audio-Codec"
+
+#: ../gtk/call_statistics.ui.h:3
+msgid "Video codec"
+msgstr "Video-Codec"
+
+#: ../gtk/call_statistics.ui.h:4
+msgid "Audio IP bandwidth usage"
+msgstr "Genutzte IP-Bandbreite Audio"
+
+#: ../gtk/call_statistics.ui.h:5
+msgid "Audio Media connectivity"
+msgstr "Audio-Konnektivität"
+
+#: ../gtk/call_statistics.ui.h:6
+msgid "Video IP bandwidth usage"
+msgstr "Genutzte IP-Bandbreite Video"
+
+#: ../gtk/call_statistics.ui.h:7
+msgid "Video Media connectivity"
+msgstr "Video-Konnektivität"
+
+#: ../gtk/call_statistics.ui.h:8
+msgid "Round trip time"
+msgstr "Umlaufzeit"
+
+#: ../gtk/call_statistics.ui.h:9
+msgid "Video resolution received"
+msgstr "Videoauflösung empfangen"
+
+#: ../gtk/call_statistics.ui.h:10
+msgid "Video resolution sent"
+msgstr "Videoauflösung gesendet"
+
+#: ../gtk/call_statistics.ui.h:11
+msgid "RTP profile"
+msgstr "RTP-Profil"
+
+#: ../gtk/call_statistics.ui.h:12
+msgid "<b>Call statistics and information</b>"
+msgstr "<b>Anrufstatistik und -informationen</b>"
+
+#: ../gtk/tunnel_config.ui.h:1
+msgid "Configure VoIP tunnel"
+msgstr "VoIP-Tunnel einrichten"
+
+#: ../gtk/tunnel_config.ui.h:2
+msgid "Host"
+msgstr "Host"
+
+#: ../gtk/tunnel_config.ui.h:3
+msgid "Port"
+msgstr "Port"
+
+#: ../gtk/tunnel_config.ui.h:6
+msgid "<b>Configure tunnel</b>"
+msgstr "<b>Tunnel einrichten</b>"
+
+#: ../gtk/tunnel_config.ui.h:9
+msgid "<b>Configure http proxy (optional)</b>"
+msgstr "<b>Configure http proxy (optional)</b>"
+
+#: ../gtk/keypad.ui.h:1
+msgid "D"
+msgstr "D"
+
+#: ../gtk/keypad.ui.h:2
+msgid "#"
+msgstr "#"
+
+#: ../gtk/keypad.ui.h:3
+msgid "0"
+msgstr "0"
+
+#: ../gtk/keypad.ui.h:4
+msgid "*"
+msgstr "*"
+
+#: ../gtk/keypad.ui.h:6
+msgid "9"
+msgstr "9"
+
+#: ../gtk/keypad.ui.h:7
+msgid "8"
+msgstr "8"
+
+#: ../gtk/keypad.ui.h:8
+msgid "7"
+msgstr "7"
+
+#: ../gtk/keypad.ui.h:9
+msgid "B"
+msgstr "B"
+
+#: ../gtk/keypad.ui.h:10
+msgid "6"
+msgstr "6"
+
+#: ../gtk/keypad.ui.h:11
+msgid "5"
+msgstr "5"
+
+#: ../gtk/keypad.ui.h:12
+msgid "4"
+msgstr "4"
+
+#: ../gtk/keypad.ui.h:13
+msgid "A"
+msgstr "A"
+
+#: ../gtk/keypad.ui.h:14
+msgid "3"
+msgstr "3"
+
+#: ../gtk/keypad.ui.h:15
+msgid "2"
+msgstr "2"
+
+#: ../gtk/keypad.ui.h:16
+msgid "1"
+msgstr "1"
+
+#: ../gtk/ldap.ui.h:1
+msgid "LDAP Settings"
+msgstr "LDAP-Einstellungen"
+
+#: ../gtk/ldap.ui.h:6
+msgid "Use TLS Connection"
+msgstr "TLS-Verbindung verwenden"
+
+#: ../gtk/ldap.ui.h:7
+msgid "Not yet available"
+msgstr "Aktuell nicht verfügbar"
+
+#: ../gtk/ldap.ui.h:8
+msgid "<b>Connection</b>"
+msgstr "<b>Verbindung</b>"
+
+#: ../gtk/ldap.ui.h:9
+msgid "Bind DN"
+msgstr "Bind-DN"
+
+#: ../gtk/ldap.ui.h:10
+msgid "Authname"
+msgstr "Authentifizierungsname"
+
+#: ../gtk/ldap.ui.h:11
+msgid "Realm"
+msgstr "Bereich"
+
+#: ../gtk/ldap.ui.h:12
+msgid "<b>SASL</b>"
+msgstr "<b>SASL</b>"
+
+#: ../gtk/ldap.ui.h:13
+msgid "Base object:"
+msgstr "Basis-Objekt:"
+
+#: ../gtk/ldap.ui.h:15
+#, no-c-format
+msgid "Filter (%s for name):"
+msgstr "Filter (%s nach Name):"
+
+#: ../gtk/ldap.ui.h:16
+msgid "Name Attribute:"
+msgstr "Name:"
+
+#: ../gtk/ldap.ui.h:17
+msgid "SIP address attribute:"
+msgstr "SIP-Adresse:"
+
+#: ../gtk/ldap.ui.h:18
+msgid "Attributes to query:"
+msgstr "Sucheigenschaft:"
+
+#: ../gtk/ldap.ui.h:19
+msgid "<b>Search</b>"
+msgstr "<b>Suche</b>"
+
+#: ../gtk/ldap.ui.h:20
+msgid "Timeout for search:"
+msgstr "Zeitüberschreitung bei der Suche:"
+
+#: ../gtk/ldap.ui.h:21
+msgid "Max results:"
+msgstr "Max Ergebnisse:"
+
+#: ../gtk/ldap.ui.h:22
+msgid "Follow Aliases"
+msgstr "folge Pseudonymen"
+
+#: ../gtk/ldap.ui.h:23
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>Sonstiges</b>"
+
+#: ../gtk/ldap.ui.h:24
+msgid "ANONYMOUS"
+msgstr "ANONYMOUS"
+
+#: ../gtk/ldap.ui.h:25
+msgid "SIMPLE"
+msgstr "SIMPLE"
+
+#: ../gtk/ldap.ui.h:26
+msgid "DIGEST-MD5"
+msgstr "DIGEST-MD5"
+
+#: ../gtk/ldap.ui.h:27
+msgid "NTLM"
+msgstr "NTLM"
+
+#: ../gtk/config-uri.ui.h:1
+msgid "Specifying a remote configuration URI"
+msgstr "Eine URI zur FErnkonfiguration angeben"
+
+#: ../gtk/config-uri.ui.h:2
+msgid ""
+"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
+msgstr "Diese Maske erlaubt Ihnen für das Laden der Konfiguration beim Programmstart eine http- oder https-Adresse anzugeben.\nBitte geben Sie unten die Konfigurations-URI ein oder ändern diese. Nach dem Bestätigen mit OK wird Linphone automatisch neustarten, um die neuen Einstellungen zu übernehmen."
+
+#: ../gtk/config-uri.ui.h:4
+msgid "https://"
+msgstr "https://"
+
+#: ../gtk/provisioning-fetch.ui.h:1
+msgid "Configuring..."
+msgstr "Einstellen..."
+
+#: ../gtk/provisioning-fetch.ui.h:2
+msgid "Please wait while fetching configuration from server..."
+msgstr "Bitte warten Sie während die Einstellungen vom Server abgerufen werden..."
+
+#: ../coreapi/linphonecore.c:1511
+msgid "Ready"
+msgstr "Bereit"
+
+#: ../coreapi/linphonecore.c:2470
+msgid "Configuring"
+msgstr "Einstellen"
+
+#: ../coreapi/linphonecore.c:2635
+msgid "Looking for telephone number destination..."
+msgstr "Telefonnummernziel wird gesucht..."
+
+#: ../coreapi/linphonecore.c:2637
+msgid "Could not resolve this number."
+msgstr "Diese Nummer kann nicht aufgelöst werden."
+
+#. must be known at that time
+#: ../coreapi/linphonecore.c:2919
+msgid "Contacting"
+msgstr "Verbindungsaufbau"
+
+#: ../coreapi/linphonecore.c:2924
+msgid "Could not call"
+msgstr "Anruf kann nicht getätigt werden."
+
+#: ../coreapi/linphonecore.c:3074
+msgid "Sorry, we have reached the maximum number of simultaneous calls"
+msgstr "Die maximale Anzahl der gleichzeitigen Anrufe ist erreicht."
+
+#: ../coreapi/linphonecore.c:3233
+msgid "is contacting you"
+msgstr "ruft Sie an"
+
+#: ../coreapi/linphonecore.c:3234
+msgid " and asked autoanswer."
+msgstr " und fragt nach automatischer Antwort."
+
+#: ../coreapi/linphonecore.c:3234
+msgid "."
+msgstr "."
+
+#: ../coreapi/linphonecore.c:3352
+msgid "Modifying call parameters..."
+msgstr "Die Anrufparameter werden verändert..."
+
+#: ../coreapi/linphonecore.c:3700
+msgid "Connected."
+msgstr "Verbunden."
+
+#: ../coreapi/linphonecore.c:3725
+msgid "Call aborted"
+msgstr "Anruf abgebrochen"
+
+#: ../coreapi/linphonecore.c:3915
+msgid "Could not pause the call"
+msgstr "Anruf kann nicht gehalten werden"
+
+#: ../coreapi/linphonecore.c:3919
+msgid "Pausing the current call..."
+msgstr "Aktueller Anruf wird gehalten..."
+
+#: ../coreapi/misc.c:438
+msgid "Stun lookup in progress..."
+msgstr "STUN-Ermittlung läuft..."
+
+#: ../coreapi/misc.c:619
+msgid "ICE local candidates gathering in progress..."
+msgstr "Lokale Kandidaten für ICE werden zusammengestellt..."
+
+#: ../coreapi/friend.c:33
+msgid "Online"
+msgstr "Angemeldet"
+
+#: ../coreapi/friend.c:36
+msgid "Busy"
+msgstr "Besetzt"
+
+#: ../coreapi/friend.c:39
+msgid "Be right back"
+msgstr "Bald wieder da"
+
+#: ../coreapi/friend.c:42
+msgid "Away"
+msgstr "Abwesend"
+
+#: ../coreapi/friend.c:45
+msgid "On the phone"
+msgstr "Im Gespräch"
+
+#: ../coreapi/friend.c:48
+msgid "Out to lunch"
+msgstr "Beim Essen"
+
+#: ../coreapi/friend.c:51
+msgid "Do not disturb"
+msgstr "Nicht stören"
+
+#: ../coreapi/friend.c:54
+msgid "Moved"
+msgstr "Umgezogen"
+
+#: ../coreapi/friend.c:57
+msgid "Using another messaging service"
+msgstr "Ein anderer Nachrichtendienst wird benutzt"
+
+#: ../coreapi/friend.c:60
+msgid "Offline"
+msgstr "Abgemeldet"
+
+#: ../coreapi/friend.c:63
+msgid "Pending"
+msgstr "Ausstehend"
+
+#: ../coreapi/friend.c:66
+msgid "Vacation"
+msgstr "Urlaub"
+
+#: ../coreapi/friend.c:68
+msgid "Unknown-bug"
+msgstr "Unbekannter Fehler"
+
+#: ../coreapi/proxy.c:319
+msgid ""
+"The sip proxy address you entered is invalid, it must start with \"sip:\" "
+"followed by a hostname."
+msgstr "Die von Ihnen eingegebene SIP-Proxy-Adresse ist ungültig, sie muss mit „sip:“ gefolgt vom Hostnamen beginnen."
+
+#: ../coreapi/proxy.c:325
+msgid ""
+"The sip identity you entered is invalid.\n"
+"It should look like sip:username@proxydomain, such as sip:alice@example.net"
+msgstr "Die von Ihnen eingegebene SIP-Identität ist ungültig.\nSie sollte wie sip:benutzername@proxydomain aussehen, also z.B. sip:alice@beispiel.net"
+
+#: ../coreapi/proxy.c:1377
+#, c-format
+msgid "Could not login as %s"
+msgstr "Anmeldung als %s fehlgeschlagen"
+
+#: ../coreapi/callbacks.c:383
+msgid "Remote ringing."
+msgstr "Klingeln bei der Gegenseite."
+
+#: ../coreapi/callbacks.c:404
+msgid "Remote ringing..."
+msgstr "Klingeln bei der Gegenseite..."
+
+#: ../coreapi/callbacks.c:414
+msgid "Early media."
+msgstr "nicht kompatibel, prüfe Codecs oder Sicherheitseinstellungen..."
+
+#: ../coreapi/callbacks.c:475
+#, c-format
+msgid "Call with %s is paused."
+msgstr "Anruf mit %s wird gehalten."
+
+#: ../coreapi/callbacks.c:488
+#, c-format
+msgid "Call answered by %s - on hold."
+msgstr "Der von %s entgegengenommene Anruf wird gehalten."
+
+#: ../coreapi/callbacks.c:498
+msgid "Call resumed."
+msgstr "Anruf fortgesetzt."
+
+#: ../coreapi/callbacks.c:502
+#, c-format
+msgid "Call answered by %s."
+msgstr "Anruf wird von %s entgegengenommen."
+
+#: ../coreapi/callbacks.c:525
+msgid "Incompatible, check codecs or security settings..."
+msgstr "Inkompatibel, prüfe Codecs oder Sicherheitseinstellungen..."
+
+#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:826
+msgid "Incompatible media parameters."
+msgstr "Inkompatible Medienparameter."
+
+#: ../coreapi/callbacks.c:560
+msgid "We have been resumed."
+msgstr "Anruf wird fortgesetzt."
+
+#. we are being paused
+#: ../coreapi/callbacks.c:568
+msgid "We are paused by other party."
+msgstr "Anruf wird von der Gegenseite gehalten."
+
+#. reINVITE and in-dialogs UPDATE go here
+#: ../coreapi/callbacks.c:602
+msgid "Call is updated by remote."
+msgstr "Anruf ist von der Gegenseite aktualisiert worden."
+
+#: ../coreapi/callbacks.c:705
+msgid "Call terminated."
+msgstr "Anruf beendet."
+
+#: ../coreapi/callbacks.c:733
+msgid "User is busy."
+msgstr "Teilnehmer ist besetzt."
+
+#: ../coreapi/callbacks.c:734
+msgid "User is temporarily unavailable."
+msgstr "Teilnehmer zur Zeit nicht verfügbar."
+
+#. char *retrymsg=_("%s. Retry after %i minute(s).");
+#: ../coreapi/callbacks.c:736
+msgid "User does not want to be disturbed."
+msgstr "Teilnehmer möchte nicht gestört werden."
+
+#: ../coreapi/callbacks.c:737
+msgid "Call declined."
+msgstr "Anruf abgewiesen"
+
+#: ../coreapi/callbacks.c:752
+msgid "Request timeout."
+msgstr "Zeitüberschreitung bei der Anfrage"
+
+#: ../coreapi/callbacks.c:780
+msgid "Redirected"
+msgstr "Umgeleitet"
+
+#: ../coreapi/callbacks.c:835
+msgid "Call failed."
+msgstr "Anruf fehlgeschlagen."
+
+#: ../coreapi/callbacks.c:913
+#, c-format
+msgid "Registration on %s successful."
+msgstr "Registrierung auf %s erfolgreich."
+
+#: ../coreapi/callbacks.c:914
+#, c-format
+msgid "Unregistration on %s done."
+msgstr "Abmeldung von %s ist erfolgt."
+
+#: ../coreapi/callbacks.c:932
+msgid "no response timeout"
+msgstr "Zeitüberschreitung bei der Antwort"
+
+#: ../coreapi/callbacks.c:935
+#, c-format
+msgid "Registration on %s failed: %s"
+msgstr "Registrierung auf %s fehlgeschlagen: %s"
+
+#: ../coreapi/callbacks.c:942
+msgid "Service unavailable, retrying"
+msgstr "Service nicht verfügbar, versuche erneut"
+
+#: ../coreapi/linphonecall.c:174
+#, c-format
+msgid "Authentication token is %s"
+msgstr "Authentifizierungs-Token ist %s"
+
+#: ../coreapi/linphonecall.c:3020
+#, c-format
+msgid "You have missed %i call."
+msgid_plural "You have missed %i calls."
+msgstr[0] "Sie haben %i Anruf in Abwesenheit."
+msgstr[1] "Sie haben %i Anrufe in Abwesenheit."
diff --git a/po/he.po b/po/he.po
index a574873b0..6a1730255 100644
--- a/po/he.po
+++ b/po/he.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Eli Zaretskii <eliz@gnu.org>, 2012
+# GenghisKhan <genghiskhan@gmx.ca>, 2014
 # GenghisKhan <genghiskhan@gmx.ca>, 2012-2013
 msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-19 10:39+0100\n"
-"PO-Revision-Date: 2014-11-19 10:08+0000\n"
-"Last-Translator: Cqnqrd <gautier.pelloux@gmail.com>\n"
+"PO-Revision-Date: 2014-11-24 10:22+0000\n"
+"Last-Translator: GenghisKhan <genghiskhan@gmx.ca>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/linphone-gtk/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -151,7 +152,7 @@ msgstr "‫%s מעוניין להוסיפך אל רשימת אנשי הקשר ש
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
-msgstr ""
+msgstr "אנא הזן סיסמה עבור משתמש <i>%s</i>\nבמתחם <i>%s</i>:"
 
 #: ../gtk/main.c:1283
 msgid "Call error"
@@ -754,15 +755,15 @@ msgstr ""
 
 #: ../gtk/audio_assistant.c:99
 msgid "Too low"
-msgstr ""
+msgstr "נמוך מדי"
 
 #: ../gtk/audio_assistant.c:100
 msgid "Good"
-msgstr ""
+msgstr "טוב"
 
 #: ../gtk/audio_assistant.c:101
 msgid "Too loud"
-msgstr ""
+msgstr "חזק מדי"
 
 #: ../gtk/audio_assistant.c:318
 msgid ""
@@ -772,7 +773,7 @@ msgstr ""
 
 #: ../gtk/audio_assistant.c:328
 msgid "Capture device"
-msgstr ""
+msgstr "התקן לכידה"
 
 #: ../gtk/audio_assistant.c:329
 msgid "Recorded volume"
@@ -780,15 +781,15 @@ msgstr ""
 
 #: ../gtk/audio_assistant.c:333
 msgid "No voice"
-msgstr ""
+msgstr "אין קול"
 
 #: ../gtk/audio_assistant.c:369
 msgid "Playback device"
-msgstr ""
+msgstr "התקן השמעה"
 
 #: ../gtk/audio_assistant.c:370
 msgid "Play three beeps"
-msgstr ""
+msgstr "נגן שלושה צפצופים"
 
 #: ../gtk/audio_assistant.c:403
 msgid "Press the record button and say some words"
@@ -800,7 +801,7 @@ msgstr ""
 
 #: ../gtk/audio_assistant.c:433
 msgid "Let's start Linphone now"
-msgstr ""
+msgstr "הבא נתחיל את Linphone עכשיו"
 
 #: ../gtk/audio_assistant.c:496
 msgid "Audio Assistant"
@@ -1096,7 +1097,7 @@ msgstr "ניתוב (רשות):"
 
 #: ../gtk/sip_account.ui.h:11
 msgid "Transport"
-msgstr ""
+msgstr "טרנספורט"
 
 #: ../gtk/sip_account.ui.h:12
 msgid "Register"
@@ -1108,7 +1109,7 @@ msgstr "פרסם מידע נוכחות"
 
 #: ../gtk/sip_account.ui.h:14
 msgid "Enable AVPF"
-msgstr ""
+msgstr "אפשר AVPF"
 
 #: ../gtk/sip_account.ui.h:15
 msgid "Configure a SIP account"
@@ -1466,7 +1467,7 @@ msgstr "נא להמתין"
 
 #: ../gtk/dscp_settings.ui.h:1
 msgid "DSCP settings"
-msgstr ""
+msgstr "אפשרויות DSCP"
 
 #: ../gtk/dscp_settings.ui.h:2
 msgid "SIP"
@@ -1667,7 +1668,7 @@ msgstr ""
 
 #: ../gtk/ldap.ui.h:19
 msgid "<b>Search</b>"
-msgstr ""
+msgstr "<b>חיפוש</b>"
 
 #: ../gtk/ldap.ui.h:20
 msgid "Timeout for search:"
@@ -1683,7 +1684,7 @@ msgstr ""
 
 #: ../gtk/ldap.ui.h:23
 msgid "<b>Miscellaneous</b>"
-msgstr ""
+msgstr "<b>שונות</b>"
 
 #: ../gtk/ldap.ui.h:24
 msgid "ANONYMOUS"
diff --git a/po/ja.po b/po/ja.po
index 87ead9898..5a48f3008 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Alexander, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-19 10:39+0100\n"
-"PO-Revision-Date: 2014-11-19 10:08+0000\n"
-"Last-Translator: Cqnqrd <gautier.pelloux@gmail.com>\n"
+"PO-Revision-Date: 2014-11-26 14:34+0000\n"
+"Last-Translator: Alexander\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/linphone-gtk/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,72 +21,72 @@ msgstr ""
 #: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974
 #, c-format
 msgid "Call %s"
-msgstr ""
+msgstr "%s 呼出中"
 
 #: ../gtk/calllogs.c:149 ../gtk/friendlist.c:975
 #, c-format
 msgid "Send text to %s"
-msgstr ""
+msgstr "%s にテキストを送信"
 
 #: ../gtk/calllogs.c:232
 #, c-format
 msgid "<b>Recent calls (%i)</b>"
-msgstr ""
+msgstr "<b>通話時間 (%i)</b>"
 
 #: ../gtk/calllogs.c:314
 msgid "n/a"
-msgstr ""
+msgstr "n/a"
 
 #: ../gtk/calllogs.c:317
 msgid "Aborted"
-msgstr ""
+msgstr "中断"
 
 #: ../gtk/calllogs.c:320
 msgid "Missed"
-msgstr ""
+msgstr "失敗"
 
 #: ../gtk/calllogs.c:323
 msgid "Declined"
-msgstr ""
+msgstr "辞退"
 
 #: ../gtk/calllogs.c:329
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
-msgstr[0] ""
+msgstr[0] "%i 分"
 
 #: ../gtk/calllogs.c:332
 #, c-format
 msgid "%i second"
 msgid_plural "%i seconds"
-msgstr[0] ""
+msgstr[0] "%i 秒"
 
 #: ../gtk/calllogs.c:335 ../gtk/calllogs.c:341
 #, c-format
 msgid "<big><b>%s</b></big>\t%s"
-msgstr ""
+msgstr "<big><b>%s</b></big>⇥%s"
 
 #: ../gtk/calllogs.c:337
 #, c-format
 msgid ""
 "<small><i>%s</i>\t<i>Quality: %s</i></small>\n"
 "%s\t%s\t"
-msgstr ""
+msgstr "<small><i>%s</i>⇥<i>品質: %s</i></small>\n%s⇥%s⇥"
 
 #: ../gtk/calllogs.c:343
 #, c-format
 msgid ""
 "<small><i>%s</i></small>\t\n"
 "%s"
-msgstr ""
+msgstr "<small><i>%s</i></small>⇥\n%s"
 
 #: ../gtk/conference.c:38 ../gtk/main.ui.h:13
 msgid "Conference"
-msgstr ""
+msgstr "会議"
 
 #: ../gtk/conference.c:46
 msgid "Me"
-msgstr ""
+msgstr "自分"
 
 #: ../gtk/support.c:49 ../gtk/support.c:73 ../gtk/support.c:102
 #, c-format
@@ -94,45 +95,45 @@ msgstr "pixmapファイルが見つかりません %s"
 
 #: ../gtk/chat.c:364 ../gtk/friendlist.c:924
 msgid "Invalid sip contact !"
-msgstr ""
+msgstr "無効なSIP接続です！"
 
 #: ../gtk/main.c:107
 msgid "log to stdout some debug information while running."
-msgstr ""
+msgstr "実行中にいくつかのデバッグ情報をstdoutに送信します。"
 
 #: ../gtk/main.c:114
 msgid "path to a file to write logs into."
-msgstr ""
+msgstr "ログを書き込むファイルへのパス。"
 
 #: ../gtk/main.c:121
 msgid "Start linphone with video disabled."
-msgstr ""
+msgstr "ビデオを無効にしてLinphoneを開始します。"
 
 #: ../gtk/main.c:128
 msgid "Start only in the system tray, do not show the main interface."
-msgstr ""
+msgstr "主なインターフェイスを表示しないでシステムトレイに移動します。"
 
 #: ../gtk/main.c:135
 msgid "address to call right now"
-msgstr ""
+msgstr "今すぐに呼び出す"
 
 #: ../gtk/main.c:142
 msgid "if set automatically answer incoming calls"
-msgstr ""
+msgstr "着信呼び出しが設定されている場合自動的に応答する"
 
 #: ../gtk/main.c:149
 msgid ""
 "Specifiy a working directory (should be the base of the installation, eg: "
 "c:\\Program Files\\Linphone)"
-msgstr ""
+msgstr "作業ディレクトリをSpecifiy (インストールした時のベースである必要があります。例:c:\\Program Files\\Linphone)"
 
 #: ../gtk/main.c:156
 msgid "Configuration file"
-msgstr ""
+msgstr "設定ファイル"
 
 #: ../gtk/main.c:163
 msgid "Run the audio assistant"
-msgstr ""
+msgstr "オーディオアシスタントを実行"
 
 #: ../gtk/main.c:1085
 #, c-format
@@ -140,7 +141,7 @@ msgid ""
 "%s would like to add you to his contact list.\n"
 "Would you allow him to see your presence status or add him to your contact list ?\n"
 "If you answer no, this person will be temporarily blacklisted."
-msgstr ""
+msgstr "%s が連絡相手にあなたを追加しようとしています。\nあなたのステータスを参照させるか、もしくは連絡先リストに追加することができます。\nあなたが拒否すると、この人は一時的にブラックリストへ登録されます。"
 
 #: ../gtk/main.c:1162
 #, c-format
@@ -151,32 +152,32 @@ msgstr ""
 
 #: ../gtk/main.c:1283
 msgid "Call error"
-msgstr ""
+msgstr "呼出エラー"
 
 #: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3744
 msgid "Call ended"
-msgstr ""
+msgstr "呼出終了"
 
 #: ../gtk/main.c:1289
 msgid "Incoming call"
-msgstr ""
+msgstr "着信"
 
 #: ../gtk/main.c:1291 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
 msgid "Answer"
-msgstr ""
+msgstr "応答"
 
 #: ../gtk/main.c:1293 ../gtk/main.ui.h:6
 msgid "Decline"
-msgstr ""
+msgstr "拒否"
 
 #: ../gtk/main.c:1299
 msgid "Call paused"
-msgstr ""
+msgstr "呼び出しの一時停止"
 
 #: ../gtk/main.c:1299
 #, c-format
 msgid "<b>by %s</b>"
-msgstr ""
+msgstr "<b>%s</b>"
 
 #: ../gtk/main.c:1366
 #, c-format
@@ -185,21 +186,21 @@ msgstr ""
 
 #: ../gtk/main.c:1528
 msgid "Website link"
-msgstr ""
+msgstr "ウェブサイトリンク"
 
 #: ../gtk/main.c:1577
 msgid "Linphone - a video internet phone"
-msgstr ""
+msgstr "Linphone - ビデオインターネット電話"
 
 #: ../gtk/main.c:1669
 #, c-format
 msgid "%s (Default)"
-msgstr ""
+msgstr "%s (デフォルト)"
 
 #: ../gtk/main.c:2006 ../coreapi/callbacks.c:983
 #, c-format
 msgid "We are transferred to %s"
-msgstr ""
+msgstr "%s に転送しました"
 
 #: ../gtk/main.c:2016
 msgid ""
@@ -209,15 +210,15 @@ msgstr ""
 
 #: ../gtk/main.c:2157
 msgid "A free SIP video-phone"
-msgstr ""
+msgstr "無料 SIP ビデオ-電話"
 
 #: ../gtk/friendlist.c:505
 msgid "Add to addressbook"
-msgstr ""
+msgstr "電話帳に追加する"
 
 #: ../gtk/friendlist.c:691
 msgid "Presence status"
-msgstr ""
+msgstr "状態のステータス"
 
 #: ../gtk/friendlist.c:709 ../gtk/propertybox.c:552 ../gtk/contact.ui.h:1
 msgid "Name"
@@ -225,31 +226,31 @@ msgstr "名前"
 
 #: ../gtk/friendlist.c:721
 msgid "Call"
-msgstr ""
+msgstr "通話"
 
 #: ../gtk/friendlist.c:726
 msgid "Chat"
-msgstr ""
+msgstr "チャット"
 
 #: ../gtk/friendlist.c:756
 #, c-format
 msgid "Search in %s directory"
-msgstr ""
+msgstr "%s のディレクトリ内を検索"
 
 #: ../gtk/friendlist.c:976
 #, c-format
 msgid "Edit contact '%s'"
-msgstr ""
+msgstr "'%s' の連絡先を編集"
 
 #: ../gtk/friendlist.c:977
 #, c-format
 msgid "Delete contact '%s'"
-msgstr ""
+msgstr "'%s' の連絡先を削除"
 
 #: ../gtk/friendlist.c:978
 #, c-format
 msgid "Delete chat history of '%s'"
-msgstr ""
+msgstr "'%s' のチャット履歴を削除"
 
 #: ../gtk/friendlist.c:1029
 #, c-format
@@ -258,7 +259,7 @@ msgstr ""
 
 #: ../gtk/propertybox.c:558
 msgid "Rate (Hz)"
-msgstr ""
+msgstr "レート (Hz)"
 
 #: ../gtk/propertybox.c:564
 msgid "Status"
@@ -266,7 +267,7 @@ msgstr "状態"
 
 #: ../gtk/propertybox.c:570
 msgid "IP Bitrate (kbit/s)"
-msgstr ""
+msgstr "IP ビットレート (kbit/s)"
 
 #: ../gtk/propertybox.c:577
 msgid "Parameters"
@@ -282,11 +283,11 @@ msgstr "使用しない"
 
 #: ../gtk/propertybox.c:809
 msgid "Account"
-msgstr ""
+msgstr "アカウント"
 
 #: ../gtk/propertybox.c:1072
 msgid "English"
-msgstr ""
+msgstr "English"
 
 #: ../gtk/propertybox.c:1073
 msgid "French"
@@ -294,31 +295,31 @@ msgstr "Français"
 
 #: ../gtk/propertybox.c:1074
 msgid "Swedish"
-msgstr ""
+msgstr "Svenska"
 
 #: ../gtk/propertybox.c:1075
 msgid "Italian"
-msgstr ""
+msgstr "Italiano"
 
 #: ../gtk/propertybox.c:1076
 msgid "Spanish"
-msgstr ""
+msgstr "Español"
 
 #: ../gtk/propertybox.c:1077
 msgid "Brazilian Portugese"
-msgstr ""
+msgstr "Português do Brasil"
 
 #: ../gtk/propertybox.c:1078
 msgid "Polish"
-msgstr ""
+msgstr "Polski"
 
 #: ../gtk/propertybox.c:1079
 msgid "German"
-msgstr ""
+msgstr "Deutsch"
 
 #: ../gtk/propertybox.c:1080
 msgid "Russian"
-msgstr ""
+msgstr "Pусский"
 
 #: ../gtk/propertybox.c:1081
 msgid "Japanese"
@@ -326,7 +327,7 @@ msgstr "日本語"
 
 #: ../gtk/propertybox.c:1082
 msgid "Dutch"
-msgstr ""
+msgstr "Nederlands"
 
 #: ../gtk/propertybox.c:1083
 msgid "Hungarian"
@@ -342,87 +343,87 @@ msgstr "简体中文"
 
 #: ../gtk/propertybox.c:1086
 msgid "Traditional Chinese"
-msgstr ""
+msgstr "繁体中文"
 
 #: ../gtk/propertybox.c:1087
 msgid "Norwegian"
-msgstr ""
+msgstr "Norsk"
 
 #: ../gtk/propertybox.c:1088
 msgid "Hebrew"
-msgstr ""
+msgstr "עברית"
 
 #: ../gtk/propertybox.c:1089
 msgid "Serbian"
-msgstr ""
+msgstr "Cрпски"
 
 #: ../gtk/propertybox.c:1156
 msgid ""
 "You need to restart linphone for the new language selection to take effect."
-msgstr ""
+msgstr "言語の選択を有効にするには、 Linphoneを再起動する必要があります。"
 
 #: ../gtk/propertybox.c:1234
 msgid "None"
-msgstr ""
+msgstr "なし"
 
 #: ../gtk/propertybox.c:1238
 msgid "SRTP"
-msgstr ""
+msgstr "SRTP"
 
 #: ../gtk/propertybox.c:1244
 msgid "ZRTP"
-msgstr ""
+msgstr "ZRTP"
 
 #: ../gtk/update.c:80
 #, c-format
 msgid ""
 "A more recent version is availalble from %s.\n"
 "Would you like to open a browser to download it ?"
-msgstr ""
+msgstr "%s よりも新しいバージョンが利用可能です。\nダウンロードするために、ブラウザを開きますか？"
 
 #: ../gtk/update.c:91
 msgid "You are running the lastest version."
-msgstr ""
+msgstr "最新版です。"
 
 #: ../gtk/buddylookup.c:85
 msgid "Firstname, Lastname"
-msgstr ""
+msgstr "名前、名字"
 
 #: ../gtk/buddylookup.c:160
 msgid "Error communicating with server."
-msgstr ""
+msgstr "サーバーとの通信エラーが発生しました。"
 
 #: ../gtk/buddylookup.c:164
 msgid "Connecting..."
-msgstr ""
+msgstr "接続中..."
 
 #: ../gtk/buddylookup.c:168
 msgid "Connected"
-msgstr ""
+msgstr "接続"
 
 #: ../gtk/buddylookup.c:172
 msgid "Receiving data..."
-msgstr ""
+msgstr "データを受信中…"
 
 #: ../gtk/buddylookup.c:180
 #, c-format
 msgid "Found %i contact"
 msgid_plural "Found %i contacts"
-msgstr[0] ""
+msgstr[0] "%i 件発見"
 
 #: ../gtk/setupwizard.c:34
 msgid ""
 "Welcome !\n"
 "This assistant will help you to use a SIP account for your calls."
-msgstr ""
+msgstr "ようこそ！\nこのアシスタントは、あなたのSIPアカウントを使用するのに役立ちます。"
 
 #: ../gtk/setupwizard.c:43
 msgid "Create an account on linphone.org"
-msgstr ""
+msgstr "linphone.orgのアカウントを作成"
 
 #: ../gtk/setupwizard.c:44
 msgid "I have already a linphone.org account and I just want to use it"
-msgstr ""
+msgstr "linphone.orgのアカウントを持っているのでそれを使います"
 
 #: ../gtk/setupwizard.c:45
 msgid "I have already a sip account and I just want to use it"
@@ -434,55 +435,55 @@ msgstr ""
 
 #: ../gtk/setupwizard.c:89
 msgid "Enter your linphone.org username"
-msgstr ""
+msgstr "linphone.orgで取得したユーザー名を入力"
 
 #: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:79 ../gtk/ldap.ui.h:4
 msgid "Username:"
-msgstr ""
+msgstr "ユーザー名:"
 
 #: ../gtk/setupwizard.c:104 ../gtk/password.ui.h:4 ../gtk/ldap.ui.h:5
 msgid "Password:"
-msgstr ""
+msgstr "パスワード:"
 
 #: ../gtk/setupwizard.c:124
 msgid "Enter your account informations"
-msgstr ""
+msgstr "アカウント情報を入力"
 
 #: ../gtk/setupwizard.c:140
 msgid "Username*"
-msgstr ""
+msgstr "ユーザー名*"
 
 #: ../gtk/setupwizard.c:141
 msgid "Password*"
-msgstr ""
+msgstr "パスワード*"
 
 #: ../gtk/setupwizard.c:144
 msgid "Domain*"
-msgstr ""
+msgstr "ドメイン*"
 
 #: ../gtk/setupwizard.c:145
 msgid "Proxy"
-msgstr ""
+msgstr "プロキシ*"
 
 #: ../gtk/setupwizard.c:317
 msgid "(*) Required fields"
-msgstr ""
+msgstr "(*) 必須"
 
 #: ../gtk/setupwizard.c:318
 msgid "Username: (*)"
-msgstr ""
+msgstr "ユーザー名: (*)"
 
 #: ../gtk/setupwizard.c:320
 msgid "Password: (*)"
-msgstr ""
+msgstr "パスワード: (*)"
 
 #: ../gtk/setupwizard.c:322
 msgid "Email: (*)"
-msgstr ""
+msgstr "メールアドレス: (*)"
 
 #: ../gtk/setupwizard.c:324
 msgid "Confirm your password: (*)"
-msgstr ""
+msgstr "パスワードを再入力: (*)"
 
 #: ../gtk/setupwizard.c:338
 msgid "Keep me informed with linphone updates"
@@ -510,11 +511,11 @@ msgstr ""
 
 #: ../gtk/setupwizard.c:618
 msgid "Welcome to the account setup assistant"
-msgstr ""
+msgstr "アカウント設定アシスタントへようこそ"
 
 #: ../gtk/setupwizard.c:623
 msgid "Account setup assistant"
-msgstr ""
+msgstr "アカウント設定アシスタント"
 
 #: ../gtk/setupwizard.c:629
 msgid "Configure your account (step 1/1)"
@@ -534,7 +535,7 @@ msgstr ""
 
 #: ../gtk/setupwizard.c:652
 msgid "Error"
-msgstr ""
+msgstr "エラー"
 
 #: ../gtk/setupwizard.c:656 ../gtk/audio_assistant.c:527
 msgid "Terminating"
@@ -552,19 +553,19 @@ msgstr ""
 
 #: ../gtk/incall_view.c:211 ../gtk/incall_view.c:214
 msgid "Not used"
-msgstr ""
+msgstr "使用しない"
 
 #: ../gtk/incall_view.c:221
 msgid "ICE not activated"
-msgstr ""
+msgstr "ICE 未認証"
 
 #: ../gtk/incall_view.c:223
 msgid "ICE failed"
-msgstr ""
+msgstr "ICE 失敗"
 
 #: ../gtk/incall_view.c:225
 msgid "ICE in progress"
-msgstr ""
+msgstr "ICE 進行中"
 
 #: ../gtk/incall_view.c:227
 msgid "Going through one or more NATs"
@@ -572,11 +573,11 @@ msgstr ""
 
 #: ../gtk/incall_view.c:229
 msgid "Direct"
-msgstr ""
+msgstr "直接"
 
 #: ../gtk/incall_view.c:231
 msgid "Through a relay server"
-msgstr ""
+msgstr "間接的にリレーサーバーを使う"
 
 #: ../gtk/incall_view.c:239
 msgid "uPnP not activated"
@@ -612,12 +613,12 @@ msgstr ""
 #: ../gtk/incall_view.c:272 ../gtk/incall_view.c:274
 #, c-format
 msgid "%ix%i @ %f fps"
-msgstr ""
+msgstr "%ix%i @ %f fps"
 
 #: ../gtk/incall_view.c:304
 #, c-format
 msgid "%.3f seconds"
-msgstr ""
+msgstr "%.3f 秒"
 
 #: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12
 msgid "Hang up"
@@ -629,11 +630,11 @@ msgstr ""
 
 #: ../gtk/incall_view.c:514 ../gtk/incall_view.c:727
 msgid "00::00::00"
-msgstr ""
+msgstr "00::00::00"
 
 #: ../gtk/incall_view.c:525
 msgid "<b>Incoming call</b>"
-msgstr ""
+msgstr "<b>着信</b>"
 
 #: ../gtk/incall_view.c:562
 msgid "good"
@@ -641,7 +642,7 @@ msgstr ""
 
 #: ../gtk/incall_view.c:564
 msgid "average"
-msgstr ""
+msgstr "アベレージ"
 
 #: ../gtk/incall_view.c:566
 msgid "poor"
@@ -661,7 +662,7 @@ msgstr ""
 
 #: ../gtk/incall_view.c:679
 msgid "Secured by SRTP"
-msgstr ""
+msgstr "SRTPのセキュリティ"
 
 #: ../gtk/incall_view.c:685
 #, c-format
@@ -691,7 +692,7 @@ msgstr ""
 #: ../gtk/incall_view.c:771
 #, c-format
 msgid "%02i::%02i::%02i"
-msgstr ""
+msgstr "%02i::%02i::%02i"
 
 #: ../gtk/incall_view.c:794
 msgid "<b>Call ended.</b>"
@@ -703,19 +704,19 @@ msgstr ""
 
 #: ../gtk/incall_view.c:828
 msgid "Transfer done."
-msgstr ""
+msgstr "転送完了。"
 
 #: ../gtk/incall_view.c:831
 msgid "Transfer failed."
-msgstr ""
+msgstr "転送失敗。"
 
 #: ../gtk/incall_view.c:875
 msgid "Resume"
-msgstr ""
+msgstr "レジューム"
 
 #: ../gtk/incall_view.c:882 ../gtk/main.ui.h:9
 msgid "Pause"
-msgstr ""
+msgstr "一時停止"
 
 #: ../gtk/incall_view.c:948
 #, c-format
@@ -726,7 +727,7 @@ msgstr ""
 
 #: ../gtk/incall_view.c:948
 msgid "(Paused)"
-msgstr ""
+msgstr "(停止中)"
 
 #: ../gtk/loginframe.c:88
 #, c-format
@@ -775,7 +776,7 @@ msgstr ""
 
 #: ../gtk/audio_assistant.c:333
 msgid "No voice"
-msgstr ""
+msgstr "音声なし"
 
 #: ../gtk/audio_assistant.c:369
 msgid "Playback device"
@@ -791,31 +792,31 @@ msgstr ""
 
 #: ../gtk/audio_assistant.c:404
 msgid "Listen to your record voice"
-msgstr ""
+msgstr "録音した音声を聞く"
 
 #: ../gtk/audio_assistant.c:433
 msgid "Let's start Linphone now"
-msgstr ""
+msgstr "Linphoneをはじめる"
 
 #: ../gtk/audio_assistant.c:496
 msgid "Audio Assistant"
-msgstr ""
+msgstr "音声アシスタント"
 
 #: ../gtk/audio_assistant.c:506 ../gtk/main.ui.h:31
 msgid "Audio assistant"
-msgstr ""
+msgstr "音声アシスタント"
 
 #: ../gtk/audio_assistant.c:511
 msgid "Mic Gain calibration"
-msgstr ""
+msgstr "マイクのゲイン測定"
 
 #: ../gtk/audio_assistant.c:517
 msgid "Speaker volume calibration"
-msgstr ""
+msgstr "スピーカーの音量測定"
 
 #: ../gtk/audio_assistant.c:522
 msgid "Record and Play"
-msgstr ""
+msgstr "録音して再生"
 
 #: ../gtk/main.ui.h:1
 msgid "<b>Callee name</b>"
@@ -823,7 +824,7 @@ msgstr ""
 
 #: ../gtk/main.ui.h:2
 msgid "Send"
-msgstr ""
+msgstr "送信"
 
 #: ../gtk/main.ui.h:3
 msgid "End conference"
@@ -835,15 +836,15 @@ msgstr ""
 
 #: ../gtk/main.ui.h:8
 msgid "Video"
-msgstr ""
+msgstr "ビデオ"
 
 #: ../gtk/main.ui.h:10
 msgid "Mute"
-msgstr ""
+msgstr "消音"
 
 #: ../gtk/main.ui.h:11
 msgid "Transfer"
-msgstr ""
+msgstr "転送"
 
 #: ../gtk/main.ui.h:14
 msgid "In call"
@@ -859,15 +860,15 @@ msgstr ""
 
 #: ../gtk/main.ui.h:17
 msgid "All users"
-msgstr ""
+msgstr "すべての利用者"
 
 #: ../gtk/main.ui.h:18
 msgid "Online users"
-msgstr ""
+msgstr "オンラインの利用者"
 
 #: ../gtk/main.ui.h:19
 msgid "ADSL"
-msgstr ""
+msgstr "ADSL"
 
 #: ../gtk/main.ui.h:20
 msgid "Fiber Channel"
@@ -875,7 +876,7 @@ msgstr ""
 
 #: ../gtk/main.ui.h:21
 msgid "Default"
-msgstr ""
+msgstr "デフォルト"
 
 #: ../gtk/main.ui.h:22
 msgid "_Options"
@@ -903,7 +904,7 @@ msgstr ""
 
 #: ../gtk/main.ui.h:28
 msgid "_Homepage"
-msgstr ""
+msgstr "_ホームページ"
 
 #: ../gtk/main.ui.h:29
 msgid "Check _Updates"
@@ -911,7 +912,7 @@ msgstr ""
 
 #: ../gtk/main.ui.h:30
 msgid "Account assistant"
-msgstr ""
+msgstr "アカウントのアシスタント"
 
 #: ../gtk/main.ui.h:32
 msgid "SIP address or phone number:"
@@ -927,7 +928,7 @@ msgstr ""
 
 #: ../gtk/main.ui.h:35
 msgid "Search"
-msgstr ""
+msgstr "検索"
 
 #: ../gtk/main.ui.h:36
 msgid "<b>Add contacts from directory</b>"
@@ -947,11 +948,11 @@ msgstr ""
 
 #: ../gtk/main.ui.h:40 ../gtk/tunnel_config.ui.h:7
 msgid "Username"
-msgstr ""
+msgstr "ユーザー名"
 
 #: ../gtk/main.ui.h:41 ../gtk/tunnel_config.ui.h:8
 msgid "Password"
-msgstr ""
+msgstr "パスワード"
 
 #: ../gtk/main.ui.h:42
 msgid "Internet connection:"
@@ -959,7 +960,7 @@ msgstr ""
 
 #: ../gtk/main.ui.h:43
 msgid "Automatically log me in"
-msgstr ""
+msgstr "自動的にログインする"
 
 #: ../gtk/main.ui.h:44 ../gtk/password.ui.h:3
 msgid "UserID"
@@ -967,23 +968,23 @@ msgstr ""
 
 #: ../gtk/main.ui.h:45
 msgid "Login information"
-msgstr ""
+msgstr "ログイン情報"
 
 #: ../gtk/main.ui.h:46
 msgid "<b>Welcome !</b>"
-msgstr ""
+msgstr "<b>ようこそ</b>"
 
 #: ../gtk/main.ui.h:47
 msgid "Delete"
-msgstr ""
+msgstr "削除"
 
 #: ../gtk/about.ui.h:1
 msgid "About linphone"
-msgstr ""
+msgstr "linphoneについて"
 
 #: ../gtk/about.ui.h:2
 msgid "(C) Belledonne Communications,2010\n"
-msgstr ""
+msgstr "(C) Belledonne Communications,2010\n"
 
 #: ../gtk/about.ui.h:4
 msgid "An internet video phone using the standard SIP (rfc3261) protocol."
@@ -1007,7 +1008,7 @@ msgstr ""
 
 #: ../gtk/contact.ui.h:2
 msgid "SIP Address"
-msgstr ""
+msgstr "SIPアドレス"
 
 #: ../gtk/contact.ui.h:3
 msgid "Show this contact presence status"
@@ -1023,7 +1024,7 @@ msgstr ""
 
 #: ../gtk/log.ui.h:1
 msgid "Linphone debug window"
-msgstr ""
+msgstr "Linphoneデバッグウインドウ"
 
 #: ../gtk/log.ui.h:2
 msgid "Scroll to end"
@@ -1039,11 +1040,11 @@ msgstr ""
 
 #: ../gtk/call_logs.ui.h:1
 msgid "Call history"
-msgstr ""
+msgstr "呼出履歴"
 
 #: ../gtk/call_logs.ui.h:2
 msgid "Clear all"
-msgstr ""
+msgstr "すべて消去する"
 
 #: ../gtk/call_logs.ui.h:3
 msgid "Call back"
@@ -1067,7 +1068,7 @@ msgstr "sip:"
 
 #: ../gtk/sip_account.ui.h:5
 msgid "SIP Proxy address:"
-msgstr ""
+msgstr "SIP プロキシ:"
 
 #: ../gtk/sip_account.ui.h:6
 msgid "Looks like sip:<proxy hostname>"
@@ -1091,19 +1092,19 @@ msgstr ""
 
 #: ../gtk/sip_account.ui.h:11
 msgid "Transport"
-msgstr ""
+msgstr "転送"
 
 #: ../gtk/sip_account.ui.h:12
 msgid "Register"
-msgstr ""
+msgstr "登録"
 
 #: ../gtk/sip_account.ui.h:13
 msgid "Publish presence information"
-msgstr ""
+msgstr "パブリッシュ情報"
 
 #: ../gtk/sip_account.ui.h:14
 msgid "Enable AVPF"
-msgstr ""
+msgstr "AVPFを有効にする"
 
 #: ../gtk/sip_account.ui.h:15
 msgid "Configure a SIP account"
@@ -1111,15 +1112,15 @@ msgstr ""
 
 #: ../gtk/parameters.ui.h:1
 msgid "anonymous"
-msgstr ""
+msgstr "anonymous"
 
 #: ../gtk/parameters.ui.h:2
 msgid "GSSAPI"
-msgstr ""
+msgstr "GSSAPI"
 
 #: ../gtk/parameters.ui.h:3
 msgid "SASL"
-msgstr ""
+msgstr "SASL"
 
 #: ../gtk/parameters.ui.h:4
 msgid "default soundcard"
@@ -1127,23 +1128,23 @@ msgstr ""
 
 #: ../gtk/parameters.ui.h:5
 msgid "a sound card"
-msgstr ""
+msgstr "サウンドカード"
 
 #: ../gtk/parameters.ui.h:6
 msgid "default camera"
-msgstr ""
+msgstr "デフォルトのカメラ"
 
 #: ../gtk/parameters.ui.h:7
 msgid "CIF"
-msgstr ""
+msgstr "CIF"
 
 #: ../gtk/parameters.ui.h:8
 msgid "Audio codecs"
-msgstr ""
+msgstr "オーディオのコーデック"
 
 #: ../gtk/parameters.ui.h:9
 msgid "Video codecs"
-msgstr ""
+msgstr "ビデオのコーデック"
 
 #: ../gtk/parameters.ui.h:10 ../gtk/keypad.ui.h:5
 msgid "C"
@@ -1151,19 +1152,19 @@ msgstr ""
 
 #: ../gtk/parameters.ui.h:11
 msgid "SIP (UDP)"
-msgstr ""
+msgstr "SIP (UDP)"
 
 #: ../gtk/parameters.ui.h:12
 msgid "SIP (TCP)"
-msgstr ""
+msgstr "SIP (TCP)"
 
 #: ../gtk/parameters.ui.h:13
 msgid "SIP (TLS)"
-msgstr ""
+msgstr "SIP (TLS)"
 
 #: ../gtk/parameters.ui.h:14
 msgid "Settings"
-msgstr ""
+msgstr "設定"
 
 #: ../gtk/parameters.ui.h:15
 msgid "Set Maximum Transmission Unit:"
@@ -1171,27 +1172,27 @@ msgstr ""
 
 #: ../gtk/parameters.ui.h:16
 msgid "Send DTMFs as SIP info"
-msgstr ""
+msgstr "DTMFをSIP情報で送信する"
 
 #: ../gtk/parameters.ui.h:17
 msgid "Use IPv6 instead of IPv4"
-msgstr ""
+msgstr "IPv4ではなくIPv6を使用する"
 
 #: ../gtk/parameters.ui.h:18
 msgid "<b>Transport</b>"
-msgstr ""
+msgstr "<b>転送</b>"
 
 #: ../gtk/parameters.ui.h:19
 msgid "Media encryption type"
-msgstr ""
+msgstr "メディアの暗号化の種類"
 
 #: ../gtk/parameters.ui.h:20
 msgid "Video RTP/UDP:"
-msgstr ""
+msgstr "ビデオ RTP/UDP:"
 
 #: ../gtk/parameters.ui.h:21
 msgid "Audio RTP/UDP:"
-msgstr ""
+msgstr "オーディオ RTP/UDP:"
 
 #: ../gtk/parameters.ui.h:22
 msgid "Fixed"
@@ -1203,23 +1204,23 @@ msgstr ""
 
 #: ../gtk/parameters.ui.h:24
 msgid "Tunnel"
-msgstr ""
+msgstr "トンネル"
 
 #: ../gtk/parameters.ui.h:25
 msgid "DSCP fields"
-msgstr ""
+msgstr "DSCP値"
 
 #: ../gtk/parameters.ui.h:26
 msgid "SIP/TCP port"
-msgstr ""
+msgstr "SIP/TCP ポート"
 
 #: ../gtk/parameters.ui.h:27
 msgid "SIP/UDP port"
-msgstr ""
+msgstr "SIP/UDP ポート"
 
 #: ../gtk/parameters.ui.h:28
 msgid "<b>Network protocol and ports</b>"
-msgstr ""
+msgstr "<b>ネットワークのプロトコルとポート</b>"
 
 #: ../gtk/parameters.ui.h:29
 msgid "Direct connection to the Internet"
@@ -1243,23 +1244,23 @@ msgstr ""
 
 #: ../gtk/parameters.ui.h:34
 msgid "Public IP address:"
-msgstr ""
+msgstr "パブリック IP アドレス:"
 
 #: ../gtk/parameters.ui.h:35
 msgid "Stun server:"
-msgstr ""
+msgstr "Stunサーバー:"
 
 #: ../gtk/parameters.ui.h:36
 msgid "<b>NAT and Firewall</b>"
-msgstr ""
+msgstr "<b>NAT と ファイヤーウォール</b>"
 
 #: ../gtk/parameters.ui.h:37
 msgid "Network settings"
-msgstr ""
+msgstr "ネットワーク設定"
 
 #: ../gtk/parameters.ui.h:38
 msgid "Ring sound:"
-msgstr ""
+msgstr "鳴動音:"
 
 #: ../gtk/parameters.ui.h:39
 msgid "ALSA special device (optional):"
@@ -1279,11 +1280,11 @@ msgstr ""
 
 #: ../gtk/parameters.ui.h:43
 msgid "Enable echo cancellation"
-msgstr ""
+msgstr "エコーキャンセラーを有効にする"
 
 #: ../gtk/parameters.ui.h:44
 msgid "<b>Audio</b>"
-msgstr ""
+msgstr "<b>オーディオ</b>"
 
 #: ../gtk/parameters.ui.h:45
 msgid "Video input device:"
@@ -1299,11 +1300,11 @@ msgstr ""
 
 #: ../gtk/parameters.ui.h:48
 msgid "<b>Video</b>"
-msgstr ""
+msgstr "<b>ビデオ</b>"
 
 #: ../gtk/parameters.ui.h:49
 msgid "Multimedia settings"
-msgstr ""
+msgstr "マルチメディア設定"
 
 #: ../gtk/parameters.ui.h:50
 msgid "This section defines your SIP address when not using a SIP account"
@@ -1311,11 +1312,11 @@ msgstr ""
 
 #: ../gtk/parameters.ui.h:51
 msgid "Your display name (eg: John Doe):"
-msgstr ""
+msgstr "あなたの表示名 (例: John Doe):"
 
 #: ../gtk/parameters.ui.h:52
 msgid "Your username:"
-msgstr ""
+msgstr "あなたのユーザー名:"
 
 #: ../gtk/parameters.ui.h:53
 msgid "Your resulting SIP address:"
@@ -1327,7 +1328,7 @@ msgstr ""
 
 #: ../gtk/parameters.ui.h:55
 msgid "Wizard"
-msgstr ""
+msgstr "ウィザード"
 
 #: ../gtk/parameters.ui.h:56
 msgid "Add"
@@ -1335,7 +1336,7 @@ msgstr "追加する"
 
 #: ../gtk/parameters.ui.h:57
 msgid "Edit"
-msgstr ""
+msgstr "編集する"
 
 #: ../gtk/parameters.ui.h:58
 msgid "Remove"
@@ -1351,7 +1352,7 @@ msgstr ""
 
 #: ../gtk/parameters.ui.h:61
 msgid "<b>Privacy</b>"
-msgstr ""
+msgstr "<b>プライバシー</b>"
 
 #: ../gtk/parameters.ui.h:62
 msgid "Manage SIP Accounts"
@@ -1367,7 +1368,7 @@ msgstr "使用しない"
 
 #: ../gtk/parameters.ui.h:65
 msgid "<b>Codecs</b>"
-msgstr ""
+msgstr "<b>コーデック</b>"
 
 #: ../gtk/parameters.ui.h:66
 msgid "0 stands for \"unlimited\""
@@ -1375,11 +1376,11 @@ msgstr ""
 
 #: ../gtk/parameters.ui.h:67
 msgid "Upload speed limit in Kbit/sec:"
-msgstr ""
+msgstr "アップロード速度制限 Kbit/sec:"
 
 #: ../gtk/parameters.ui.h:68
 msgid "Download speed limit in Kbit/sec:"
-msgstr ""
+msgstr "ダウンロード速度制限 Kbit/sec:"
 
 #: ../gtk/parameters.ui.h:69
 msgid "Enable adaptive rate control"
@@ -1393,31 +1394,31 @@ msgstr ""
 
 #: ../gtk/parameters.ui.h:71
 msgid "<b>Bandwidth control</b>"
-msgstr ""
+msgstr "<b>帯域幅制御</b>"
 
 #: ../gtk/parameters.ui.h:72
 msgid "Codecs"
-msgstr ""
+msgstr "コーデック"
 
 #: ../gtk/parameters.ui.h:73
 msgid "<b>Language</b>"
-msgstr ""
+msgstr "<b>言語</b>"
 
 #: ../gtk/parameters.ui.h:74
 msgid "Show advanced settings"
-msgstr ""
+msgstr "拡張設定を表示する"
 
 #: ../gtk/parameters.ui.h:75
 msgid "<b>Level</b>"
-msgstr ""
+msgstr "<b>レベル</b>"
 
 #: ../gtk/parameters.ui.h:76
 msgid "User interface"
-msgstr ""
+msgstr "ユーザーインターフェイス"
 
 #: ../gtk/parameters.ui.h:77 ../gtk/ldap.ui.h:2
 msgid "Server address:"
-msgstr ""
+msgstr "サーバーアドレス:"
 
 #: ../gtk/parameters.ui.h:78 ../gtk/ldap.ui.h:3
 msgid "Authentication method:"
@@ -1425,7 +1426,7 @@ msgstr ""
 
 #: ../gtk/parameters.ui.h:80
 msgid "label"
-msgstr ""
+msgstr "ラベル"
 
 #: ../gtk/parameters.ui.h:81
 msgid "<b>LDAP Account setup</b>"
@@ -1453,15 +1454,15 @@ msgstr ""
 
 #: ../gtk/waiting.ui.h:1
 msgid "Linphone"
-msgstr ""
+msgstr "Linphone"
 
 #: ../gtk/waiting.ui.h:2
 msgid "Please wait"
-msgstr ""
+msgstr "お待ちください"
 
 #: ../gtk/dscp_settings.ui.h:1
 msgid "DSCP settings"
-msgstr ""
+msgstr "DSCP設定"
 
 #: ../gtk/dscp_settings.ui.h:2
 msgid "SIP"
@@ -1469,11 +1470,11 @@ msgstr "SIP"
 
 #: ../gtk/dscp_settings.ui.h:3
 msgid "Audio RTP stream"
-msgstr ""
+msgstr "オーディオのRTP"
 
 #: ../gtk/dscp_settings.ui.h:4
 msgid "Video RTP stream"
-msgstr ""
+msgstr "ビデオのRTP"
 
 #: ../gtk/dscp_settings.ui.h:5
 msgid "<b>Set DSCP values (in hexadecimal)</b>"
@@ -1485,11 +1486,11 @@ msgstr ""
 
 #: ../gtk/call_statistics.ui.h:2
 msgid "Audio codec"
-msgstr ""
+msgstr "オーディオのコーデック"
 
 #: ../gtk/call_statistics.ui.h:3
 msgid "Video codec"
-msgstr ""
+msgstr "ビデオのコーデック"
 
 #: ../gtk/call_statistics.ui.h:4
 msgid "Audio IP bandwidth usage"
@@ -1521,7 +1522,7 @@ msgstr ""
 
 #: ../gtk/call_statistics.ui.h:11
 msgid "RTP profile"
-msgstr ""
+msgstr "RTPプロファイル"
 
 #: ../gtk/call_statistics.ui.h:12
 msgid "<b>Call statistics and information</b>"
@@ -1533,11 +1534,11 @@ msgstr ""
 
 #: ../gtk/tunnel_config.ui.h:2
 msgid "Host"
-msgstr ""
+msgstr "ホスト"
 
 #: ../gtk/tunnel_config.ui.h:3
 msgid "Port"
-msgstr ""
+msgstr "ポート"
 
 #: ../gtk/tunnel_config.ui.h:6
 msgid "<b>Configure tunnel</b>"
@@ -1613,7 +1614,7 @@ msgstr ""
 
 #: ../gtk/ldap.ui.h:6
 msgid "Use TLS Connection"
-msgstr ""
+msgstr "TLS接続を使用する"
 
 #: ../gtk/ldap.ui.h:7
 msgid "Not yet available"
@@ -1621,7 +1622,7 @@ msgstr ""
 
 #: ../gtk/ldap.ui.h:8
 msgid "<b>Connection</b>"
-msgstr ""
+msgstr "<b>接続</b>"
 
 #: ../gtk/ldap.ui.h:9
 msgid "Bind DN"
@@ -1633,11 +1634,11 @@ msgstr ""
 
 #: ../gtk/ldap.ui.h:11
 msgid "Realm"
-msgstr ""
+msgstr "Realm"
 
 #: ../gtk/ldap.ui.h:12
 msgid "<b>SASL</b>"
-msgstr ""
+msgstr "<b>SASL</b>"
 
 #: ../gtk/ldap.ui.h:13
 msgid "Base object:"
@@ -1662,7 +1663,7 @@ msgstr ""
 
 #: ../gtk/ldap.ui.h:19
 msgid "<b>Search</b>"
-msgstr ""
+msgstr "<b>検索</b>"
 
 #: ../gtk/ldap.ui.h:20
 msgid "Timeout for search:"
@@ -1678,11 +1679,11 @@ msgstr ""
 
 #: ../gtk/ldap.ui.h:23
 msgid "<b>Miscellaneous</b>"
-msgstr ""
+msgstr "<b>種々</b>"
 
 #: ../gtk/ldap.ui.h:24
 msgid "ANONYMOUS"
-msgstr ""
+msgstr "匿名"
 
 #: ../gtk/ldap.ui.h:25
 msgid "SIMPLE"
@@ -1690,7 +1691,7 @@ msgstr ""
 
 #: ../gtk/ldap.ui.h:26
 msgid "DIGEST-MD5"
-msgstr ""
+msgstr "ダイジェスト-MD5"
 
 #: ../gtk/ldap.ui.h:27
 msgid "NTLM"
@@ -1708,7 +1709,7 @@ msgstr ""
 
 #: ../gtk/config-uri.ui.h:4
 msgid "https://"
-msgstr ""
+msgstr "https://"
 
 #: ../gtk/provisioning-fetch.ui.h:1
 msgid "Configuring..."
@@ -1720,7 +1721,7 @@ msgstr ""
 
 #: ../coreapi/linphonecore.c:1511
 msgid "Ready"
-msgstr ""
+msgstr "準備"
 
 #: ../coreapi/linphonecore.c:2470
 msgid "Configuring"
@@ -1757,7 +1758,7 @@ msgstr ""
 
 #: ../coreapi/linphonecore.c:3234
 msgid "."
-msgstr ""
+msgstr "."
 
 #: ../coreapi/linphonecore.c:3352
 msgid "Modifying call parameters..."
@@ -1789,11 +1790,11 @@ msgstr ""
 
 #: ../coreapi/friend.c:33
 msgid "Online"
-msgstr ""
+msgstr "オンライン"
 
 #: ../coreapi/friend.c:36
 msgid "Busy"
-msgstr ""
+msgstr "ビジー"
 
 #: ../coreapi/friend.c:39
 msgid "Be right back"
@@ -1801,7 +1802,7 @@ msgstr ""
 
 #: ../coreapi/friend.c:42
 msgid "Away"
-msgstr "退席中"
+msgstr "離席中"
 
 #: ../coreapi/friend.c:45
 msgid "On the phone"
@@ -1817,7 +1818,7 @@ msgstr "手が離せません"
 
 #: ../coreapi/friend.c:54
 msgid "Moved"
-msgstr ""
+msgstr "移動中"
 
 #: ../coreapi/friend.c:57
 msgid "Using another messaging service"
@@ -1825,19 +1826,19 @@ msgstr ""
 
 #: ../coreapi/friend.c:60
 msgid "Offline"
-msgstr ""
+msgstr "オフライン"
 
 #: ../coreapi/friend.c:63
 msgid "Pending"
-msgstr ""
+msgstr "保留"
 
 #: ../coreapi/friend.c:66
 msgid "Vacation"
-msgstr ""
+msgstr "休暇中"
 
 #: ../coreapi/friend.c:68
 msgid "Unknown-bug"
-msgstr ""
+msgstr "不明なバグ"
 
 #: ../coreapi/proxy.c:319
 msgid ""
@@ -1866,7 +1867,7 @@ msgstr ""
 
 #: ../coreapi/callbacks.c:414
 msgid "Early media."
-msgstr ""
+msgstr "Early media."
 
 #: ../coreapi/callbacks.c:475
 #, c-format
@@ -1915,16 +1916,16 @@ msgstr ""
 
 #: ../coreapi/callbacks.c:733
 msgid "User is busy."
-msgstr "ユーザーはビジーです"
+msgstr "相手はビジーです。"
 
 #: ../coreapi/callbacks.c:734
 msgid "User is temporarily unavailable."
-msgstr "ユーザーは、今出られません。"
+msgstr "相手は、今出られません。"
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
 #: ../coreapi/callbacks.c:736
 msgid "User does not want to be disturbed."
-msgstr "ユーザーは手が離せないようです。"
+msgstr "相手は手が離せないようです。"
 
 #: ../coreapi/callbacks.c:737
 msgid "Call declined."
@@ -1932,7 +1933,7 @@ msgstr "通話は拒否されました。"
 
 #: ../coreapi/callbacks.c:752
 msgid "Request timeout."
-msgstr ""
+msgstr "リクエストは時間切れです。"
 
 #: ../coreapi/callbacks.c:780
 msgid "Redirected"
diff --git a/po/sr.po b/po/sr.po
index 89a40b99c..0b98e236f 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-19 10:39+0100\n"
-"PO-Revision-Date: 2014-11-19 10:15+0000\n"
-"Last-Translator: Cqnqrd <gautier.pelloux@gmail.com>\n"
+"PO-Revision-Date: 2014-11-26 20:58+0000\n"
+"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/linphone-gtk/language/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,7 +31,7 @@ msgstr "Пошаљи текст за %s"
 #: ../gtk/calllogs.c:232
 #, c-format
 msgid "<b>Recent calls (%i)</b>"
-msgstr ""
+msgstr "<b>Недавни позиви (%i)</b>"
 
 #: ../gtk/calllogs.c:314
 msgid "n/a"
@@ -38,50 +39,50 @@ msgstr "н/д"
 
 #: ../gtk/calllogs.c:317
 msgid "Aborted"
-msgstr ""
+msgstr "Прекинут"
 
 #: ../gtk/calllogs.c:320
 msgid "Missed"
-msgstr ""
+msgstr "Пропуштен"
 
 #: ../gtk/calllogs.c:323
 msgid "Declined"
-msgstr ""
+msgstr "Одбијен"
 
 #: ../gtk/calllogs.c:329
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%i минут"
+msgstr[1] "%i минута"
+msgstr[2] "%i минута"
 
 #: ../gtk/calllogs.c:332
 #, c-format
 msgid "%i second"
 msgid_plural "%i seconds"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%i секунда"
+msgstr[1] "%i секунде"
+msgstr[2] "%i секунди"
 
 #: ../gtk/calllogs.c:335 ../gtk/calllogs.c:341
 #, c-format
 msgid "<big><b>%s</b></big>\t%s"
-msgstr ""
+msgstr "<big><b>%s</b></big>\t%s"
 
 #: ../gtk/calllogs.c:337
 #, c-format
 msgid ""
 "<small><i>%s</i>\t<i>Quality: %s</i></small>\n"
 "%s\t%s\t"
-msgstr ""
+msgstr "<small><i>%s</i>\t<i>Квалитет: %s</i></small>\n%s\t%s\t"
 
 #: ../gtk/calllogs.c:343
 #, c-format
 msgid ""
 "<small><i>%s</i></small>\t\n"
 "%s"
-msgstr ""
+msgstr "<small><i>%s</i></small>\t\n%s"
 
 #: ../gtk/conference.c:38 ../gtk/main.ui.h:13
 msgid "Conference"
@@ -102,15 +103,15 @@ msgstr "Неисправан сип контакт !"
 
 #: ../gtk/main.c:107
 msgid "log to stdout some debug information while running."
-msgstr "бележи у стандардни излаз неке податке за уклањање грешака док ради."
+msgstr "бележи на стандардни излаз неке податке прочишћавања док ради."
 
 #: ../gtk/main.c:114
 msgid "path to a file to write logs into."
-msgstr "путања до датотеке за уписивање бележака."
+msgstr "путања до датотеке за уписивање дневника."
 
 #: ../gtk/main.c:121
 msgid "Start linphone with video disabled."
-msgstr ""
+msgstr "Покреће линфон са искљученим видеом."
 
 #: ../gtk/main.c:128
 msgid "Start only in the system tray, do not show the main interface."
@@ -128,15 +129,15 @@ msgstr "ако је подешено сам ће се јављати на дол
 msgid ""
 "Specifiy a working directory (should be the base of the installation, eg: "
 "c:\\Program Files\\Linphone)"
-msgstr "Наводи радни директоријум (треба да буде основа инсталације, нпр: c:\\Program Files\\Linphone)"
+msgstr "Наводи радни директоријум (треба да буде основа инсталације, нпр: „c:\\Program Files\\Linphone“)"
 
 #: ../gtk/main.c:156
 msgid "Configuration file"
-msgstr ""
+msgstr "Датотека подешавања"
 
 #: ../gtk/main.c:163
 msgid "Run the audio assistant"
-msgstr ""
+msgstr "Покреће помоћника звука"
 
 #: ../gtk/main.c:1085
 #, c-format
@@ -144,14 +145,14 @@ msgid ""
 "%s would like to add you to his contact list.\n"
 "Would you allow him to see your presence status or add him to your contact list ?\n"
 "If you answer no, this person will be temporarily blacklisted."
-msgstr "%s жели да вас дода на списак пријатеља.\nДа ли желите да му допустите да види ваше стање присуства или да га додате на ваш списак пријатеља ?\nАко одговорите са не, ова особа ће привремено бити стављена на црни списак."
+msgstr "%s жели да вас дода на списак пријатеља.\nДа ли желите да му допустите да види ваше стање присуства или да га додате на ваш списак пријатеља ?\nАко одговорите са не, ова особа ће привремено бити стављена на списак забрана."
 
 #: ../gtk/main.c:1162
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
-msgstr ""
+msgstr "Унесите вашу лозинку за корисничко име <i>%s</i>\n на подручју <i>%s</i>:"
 
 #: ../gtk/main.c:1283
 msgid "Call error"
@@ -180,12 +181,12 @@ msgstr "Позив је заустављен"
 #: ../gtk/main.c:1299
 #, c-format
 msgid "<b>by %s</b>"
-msgstr ""
+msgstr "<b>од %s</b>"
 
 #: ../gtk/main.c:1366
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
-msgstr ""
+msgstr "%s предлаже да започнете видео. Да ли прихватате ?"
 
 #: ../gtk/main.c:1528
 msgid "Website link"
@@ -209,7 +210,7 @@ msgstr "Преселили смо се на %s"
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
-msgstr "Ниједна звучна картица није откривен ана овом рачунару.\nНећете бити у могућности да шаљете или да примате звучне позиве."
+msgstr "Ниједна звучна картица није откривена на овом рачунару.\nНећете бити у могућности да шаљете или да примате звучне позиве."
 
 #: ../gtk/main.c:2157
 msgid "A free SIP video-phone"
@@ -233,7 +234,7 @@ msgstr "Позови"
 
 #: ../gtk/friendlist.c:726
 msgid "Chat"
-msgstr ""
+msgstr "Ћаскај"
 
 #: ../gtk/friendlist.c:756
 #, c-format
@@ -253,7 +254,7 @@ msgstr "Обришите контакт „%s“"
 #: ../gtk/friendlist.c:978
 #, c-format
 msgid "Delete chat history of '%s'"
-msgstr ""
+msgstr "Обришите историјат ћаскања за „%s“"
 
 #: ../gtk/friendlist.c:1029
 #, c-format
@@ -270,7 +271,7 @@ msgstr "Стање"
 
 #: ../gtk/propertybox.c:570
 msgid "IP Bitrate (kbit/s)"
-msgstr ""
+msgstr "Проток бита ИП-а (kbit/s)"
 
 #: ../gtk/propertybox.c:577
 msgid "Parameters"
@@ -354,16 +355,16 @@ msgstr "Норвешки"
 
 #: ../gtk/propertybox.c:1088
 msgid "Hebrew"
-msgstr ""
+msgstr "Јеврејски"
 
 #: ../gtk/propertybox.c:1089
 msgid "Serbian"
-msgstr ""
+msgstr "Српски"
 
 #: ../gtk/propertybox.c:1156
 msgid ""
 "You need to restart linphone for the new language selection to take effect."
-msgstr "Трба поново да покренете линфон да би нови изабрани језик ступио на снагу."
+msgstr "Треба поново да покренете линфон да би нови изабрани језик ступио у дејство."
 
 #: ../gtk/propertybox.c:1234
 msgid "None"
@@ -382,7 +383,7 @@ msgstr "ЗРТП"
 msgid ""
 "A more recent version is availalble from %s.\n"
 "Would you like to open a browser to download it ?"
-msgstr "Новије издање је доступно са „%s“.\nДа ли желите да отворите прегледник да га преузмете ?"
+msgstr "Новије издање је доступно са „%s“.\nДа ли желите да отворите прегледник и да га преузмете ?"
 
 #: ../gtk/update.c:91
 msgid "You are running the lastest version."
@@ -412,35 +413,35 @@ msgstr "Примам податке..."
 #, c-format
 msgid "Found %i contact"
 msgid_plural "Found %i contacts"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Нашао сам %i контакт"
+msgstr[1] "Нашао сам %i контакта"
+msgstr[2] "Нашао сам %i контаката"
 
 #: ../gtk/setupwizard.c:34
 msgid ""
 "Welcome !\n"
 "This assistant will help you to use a SIP account for your calls."
-msgstr "Добродошли !\nОвај помоћник ће вам помоћи да користите СИП налог за ваше позиве."
+msgstr "Добро дошли !\nОвај помоћник ће вам помоћи да користите СИП налог за ваше позиве."
 
 #: ../gtk/setupwizard.c:43
 msgid "Create an account on linphone.org"
-msgstr ""
+msgstr "Направи налог на линфон.орг-у"
 
 #: ../gtk/setupwizard.c:44
 msgid "I have already a linphone.org account and I just want to use it"
-msgstr ""
+msgstr "Већ имам налог линфон.орг-а и желим да га користим"
 
 #: ../gtk/setupwizard.c:45
 msgid "I have already a sip account and I just want to use it"
-msgstr ""
+msgstr "Већ имам сип налог и желим да га користим"
 
 #: ../gtk/setupwizard.c:46
 msgid "I want to specify a remote configuration URI"
-msgstr ""
+msgstr "Желим да наведем удаљену путању подешавања"
 
 #: ../gtk/setupwizard.c:89
 msgid "Enter your linphone.org username"
-msgstr ""
+msgstr "Унесите ваше корисничко име линфон.орг-а"
 
 #: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:79 ../gtk/ldap.ui.h:4
 msgid "Username:"
@@ -452,53 +453,53 @@ msgstr "Лозинка:"
 
 #: ../gtk/setupwizard.c:124
 msgid "Enter your account informations"
-msgstr ""
+msgstr "Унесите податке вашег налога"
 
 #: ../gtk/setupwizard.c:140
 msgid "Username*"
-msgstr ""
+msgstr "Корисник*"
 
 #: ../gtk/setupwizard.c:141
 msgid "Password*"
-msgstr ""
+msgstr "Лозинка*"
 
 #: ../gtk/setupwizard.c:144
 msgid "Domain*"
-msgstr ""
+msgstr "Домен*"
 
 #: ../gtk/setupwizard.c:145
 msgid "Proxy"
-msgstr ""
+msgstr "Посредник"
 
 #: ../gtk/setupwizard.c:317
 msgid "(*) Required fields"
-msgstr ""
+msgstr "(*) Обавезна поља"
 
 #: ../gtk/setupwizard.c:318
 msgid "Username: (*)"
-msgstr ""
+msgstr "Корисник: (*)"
 
 #: ../gtk/setupwizard.c:320
 msgid "Password: (*)"
-msgstr ""
+msgstr "Лозинка: (*)"
 
 #: ../gtk/setupwizard.c:322
 msgid "Email: (*)"
-msgstr ""
+msgstr "Ел. пошта: (*)"
 
 #: ../gtk/setupwizard.c:324
 msgid "Confirm your password: (*)"
-msgstr ""
+msgstr "Потврдите вашу лозинку: (*)"
 
 #: ../gtk/setupwizard.c:338
 msgid "Keep me informed with linphone updates"
-msgstr ""
+msgstr "Обавештавај ме о ажурирањима линфона"
 
 #: ../gtk/setupwizard.c:394
 msgid ""
 "Error, account not validated, username already used or server unreachable.\n"
 "Please go back and try again."
-msgstr ""
+msgstr "Грешка, налог није потврђен, корисничко име је већ у употреби или је сервер недоступан.\nВратите се назад и покушајте опет."
 
 #: ../gtk/setupwizard.c:405
 msgid "Thank you. Your account is now configured and ready for use."
@@ -508,15 +509,15 @@ msgstr "Хвала вам. Ваш налог је сада подешен и с
 msgid ""
 "Please validate your account by clicking on the link we just sent you by email.\n"
 "Then come back here and press Next button."
-msgstr ""
+msgstr "Потврдите ваш налог притиском на везу коју смо вам управо послали ел. поштом.\nЗатим се вратите овде и притисните дугме „Напред“."
 
 #: ../gtk/setupwizard.c:600
 msgid "SIP account configuration assistant"
-msgstr ""
+msgstr "Помоћник подешавања СИП налога"
 
 #: ../gtk/setupwizard.c:618
 msgid "Welcome to the account setup assistant"
-msgstr "Добродошли у помоћника подешавања налога"
+msgstr "Добро дошли у помоћника подешавања налога"
 
 #: ../gtk/setupwizard.c:623
 msgid "Account setup assistant"
@@ -524,32 +525,32 @@ msgstr "Помоћник подешавања налога"
 
 #: ../gtk/setupwizard.c:629
 msgid "Configure your account (step 1/1)"
-msgstr ""
+msgstr "Подесите ваш налог (корак 1/1)"
 
 #: ../gtk/setupwizard.c:634
 msgid "Enter your sip username (step 1/1)"
-msgstr ""
+msgstr "Унесите ваше корисничко име сип-а (корак 1/1)"
 
 #: ../gtk/setupwizard.c:638
 msgid "Enter account information (step 1/2)"
-msgstr ""
+msgstr "Унесите податке налога (корак 1/2)"
 
 #: ../gtk/setupwizard.c:647
 msgid "Validation (step 2/2)"
-msgstr ""
+msgstr "Потврђивање (корак 2/2)"
 
 #: ../gtk/setupwizard.c:652
 msgid "Error"
-msgstr ""
+msgstr "Грешка"
 
 #: ../gtk/setupwizard.c:656 ../gtk/audio_assistant.c:527
 msgid "Terminating"
-msgstr ""
+msgstr "Завршавам"
 
 #: ../gtk/incall_view.c:70 ../gtk/incall_view.c:94
 #, c-format
 msgid "Call #%i"
-msgstr "Позови #%i"
+msgstr "Позив бр. %i"
 
 #: ../gtk/incall_view.c:155
 #, c-format
@@ -558,76 +559,76 @@ msgstr "Пребаци позив #%i са %s"
 
 #: ../gtk/incall_view.c:211 ../gtk/incall_view.c:214
 msgid "Not used"
-msgstr ""
+msgstr "Не користи се"
 
 #: ../gtk/incall_view.c:221
 msgid "ICE not activated"
-msgstr ""
+msgstr "ИЦЕ није покренут"
 
 #: ../gtk/incall_view.c:223
 msgid "ICE failed"
-msgstr ""
+msgstr "ИЦЕ није успео"
 
 #: ../gtk/incall_view.c:225
 msgid "ICE in progress"
-msgstr ""
+msgstr "ИЦЕ је у току"
 
 #: ../gtk/incall_view.c:227
 msgid "Going through one or more NATs"
-msgstr ""
+msgstr "Пролазим кроз један или више НАТ-са"
 
 #: ../gtk/incall_view.c:229
 msgid "Direct"
-msgstr ""
+msgstr "Непосредно"
 
 #: ../gtk/incall_view.c:231
 msgid "Through a relay server"
-msgstr ""
+msgstr "Преко преносног сервера"
 
 #: ../gtk/incall_view.c:239
 msgid "uPnP not activated"
-msgstr ""
+msgstr "уПнП није покренут"
 
 #: ../gtk/incall_view.c:241
 msgid "uPnP in progress"
-msgstr ""
+msgstr "уПнП је у току"
 
 #: ../gtk/incall_view.c:243
 msgid "uPnp not available"
-msgstr ""
+msgstr "уПнП није доступан"
 
 #: ../gtk/incall_view.c:245
 msgid "uPnP is running"
-msgstr ""
+msgstr "уПнП ради"
 
 #: ../gtk/incall_view.c:247
 msgid "uPnP failed"
-msgstr ""
+msgstr "уПнП није успео"
 
 #: ../gtk/incall_view.c:257 ../gtk/incall_view.c:258
 msgid "Direct or through server"
-msgstr ""
+msgstr "Непосредно или кроз сервер"
 
 #: ../gtk/incall_view.c:267 ../gtk/incall_view.c:279
 #, c-format
 msgid ""
 "download: %f\n"
 "upload: %f (kbit/s)"
-msgstr ""
+msgstr "преузимање: %f\nотпремање: %f (kbit/s)"
 
 #: ../gtk/incall_view.c:272 ../gtk/incall_view.c:274
 #, c-format
 msgid "%ix%i @ %f fps"
-msgstr ""
+msgstr "%ix%i @ %f к/с"
 
 #: ../gtk/incall_view.c:304
 #, c-format
 msgid "%.3f seconds"
-msgstr ""
+msgstr "%.3f секунде"
 
 #: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12
 msgid "Hang up"
-msgstr ""
+msgstr "Прекини"
 
 #: ../gtk/incall_view.c:511
 msgid "<b>Calling...</b>"
@@ -705,15 +706,15 @@ msgstr "<b>Позив је завршен.</b>"
 
 #: ../gtk/incall_view.c:825
 msgid "Transfer in progress"
-msgstr ""
+msgstr "Пренос је у току"
 
 #: ../gtk/incall_view.c:828
 msgid "Transfer done."
-msgstr ""
+msgstr "Пренос је обављен."
 
 #: ../gtk/incall_view.c:831
 msgid "Transfer failed."
-msgstr ""
+msgstr "Пренос није успео."
 
 #: ../gtk/incall_view.c:875
 msgid "Resume"
@@ -728,11 +729,11 @@ msgstr "Застани"
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
-msgstr ""
+msgstr "<small><i>Снимам у\n%s %s</i></small>"
 
 #: ../gtk/incall_view.c:948
 msgid "(Paused)"
-msgstr ""
+msgstr "(Паузирано)"
 
 #: ../gtk/loginframe.c:88
 #, c-format
@@ -742,86 +743,86 @@ msgstr "Унесите податке пријављивања за %s"
 #: ../gtk/config-fetching.c:57
 #, c-format
 msgid "fetching from %s"
-msgstr ""
+msgstr "довлачим са „%s“"
 
 #: ../gtk/config-fetching.c:73
 #, c-format
 msgid "Downloading of remote configuration from %s failed."
-msgstr ""
+msgstr "Преузимање удаљеног подешавања са „%s“ није успело."
 
 #: ../gtk/audio_assistant.c:98
 msgid "No voice detected"
-msgstr ""
+msgstr "Глас није откривен"
 
 #: ../gtk/audio_assistant.c:99
 msgid "Too low"
-msgstr ""
+msgstr "Сувише низак"
 
 #: ../gtk/audio_assistant.c:100
 msgid "Good"
-msgstr ""
+msgstr "Добар"
 
 #: ../gtk/audio_assistant.c:101
 msgid "Too loud"
-msgstr ""
+msgstr "Сувише гласан"
 
 #: ../gtk/audio_assistant.c:318
 msgid ""
 "Welcome !\n"
 "This assistant will help you to configure audio settings for Linphone"
-msgstr ""
+msgstr "Добро дошли !\nОвај помоћник ће вам помоћи да подесите звучне поставке за Линфон"
 
 #: ../gtk/audio_assistant.c:328
 msgid "Capture device"
-msgstr ""
+msgstr "Уређај за снимање"
 
 #: ../gtk/audio_assistant.c:329
 msgid "Recorded volume"
-msgstr ""
+msgstr "Снимљени волумен"
 
 #: ../gtk/audio_assistant.c:333
 msgid "No voice"
-msgstr ""
+msgstr "Нема гласа"
 
 #: ../gtk/audio_assistant.c:369
 msgid "Playback device"
-msgstr ""
+msgstr "Уређај за пуштање"
 
 #: ../gtk/audio_assistant.c:370
 msgid "Play three beeps"
-msgstr ""
+msgstr "Пусти три писка"
 
 #: ../gtk/audio_assistant.c:403
 msgid "Press the record button and say some words"
-msgstr ""
+msgstr "Притисните дугме за снимање и реците нешто"
 
 #: ../gtk/audio_assistant.c:404
 msgid "Listen to your record voice"
-msgstr ""
+msgstr "Слушајте ваш снимљени глас"
 
 #: ../gtk/audio_assistant.c:433
 msgid "Let's start Linphone now"
-msgstr ""
+msgstr "Хајде сада да покренемо Линфон"
 
 #: ../gtk/audio_assistant.c:496
 msgid "Audio Assistant"
-msgstr ""
+msgstr "Помоћник звука"
 
 #: ../gtk/audio_assistant.c:506 ../gtk/main.ui.h:31
 msgid "Audio assistant"
-msgstr ""
+msgstr "Помоћник звука"
 
 #: ../gtk/audio_assistant.c:511
 msgid "Mic Gain calibration"
-msgstr ""
+msgstr "Дотеривање појачања микрофона"
 
 #: ../gtk/audio_assistant.c:517
 msgid "Speaker volume calibration"
-msgstr ""
+msgstr "Дотеривање јачине звука звучника"
 
 #: ../gtk/audio_assistant.c:522
 msgid "Record and Play"
-msgstr ""
+msgstr "Снимите и пустите"
 
 #: ../gtk/main.ui.h:1
 msgid "<b>Callee name</b>"
@@ -833,23 +834,23 @@ msgstr "Пошаљи"
 
 #: ../gtk/main.ui.h:3
 msgid "End conference"
-msgstr ""
+msgstr "Заврши конференцију"
 
 #: ../gtk/main.ui.h:7
 msgid "Record this call to an audio file"
-msgstr ""
+msgstr "Сними овај позив у звучну датотеку"
 
 #: ../gtk/main.ui.h:8
 msgid "Video"
-msgstr ""
+msgstr "Видео"
 
 #: ../gtk/main.ui.h:10
 msgid "Mute"
-msgstr ""
+msgstr "Утишај"
 
 #: ../gtk/main.ui.h:11
 msgid "Transfer"
-msgstr "Пребаци"
+msgstr "Пренос"
 
 #: ../gtk/main.ui.h:14
 msgid "In call"
@@ -869,7 +870,7 @@ msgstr "Сви корисници"
 
 #: ../gtk/main.ui.h:18
 msgid "Online users"
-msgstr "Корисницима на мрежи"
+msgstr "Корисници на мрежи"
 
 #: ../gtk/main.ui.h:19
 msgid "ADSL"
@@ -889,11 +890,11 @@ msgstr "_Могућности"
 
 #: ../gtk/main.ui.h:23
 msgid "Set configuration URI"
-msgstr ""
+msgstr "Постави путању подешавања"
 
 #: ../gtk/main.ui.h:24
 msgid "Always start video"
-msgstr ""
+msgstr "Увек покрени видео"
 
 #: ../gtk/main.ui.h:25
 msgid "Enable self-view"
@@ -917,7 +918,7 @@ msgstr "Провери _ажурирања"
 
 #: ../gtk/main.ui.h:30
 msgid "Account assistant"
-msgstr ""
+msgstr "Помоћник налога"
 
 #: ../gtk/main.ui.h:32
 msgid "SIP address or phone number:"
@@ -953,7 +954,7 @@ msgstr "Мој тренутни идентитет:"
 
 #: ../gtk/main.ui.h:40 ../gtk/tunnel_config.ui.h:7
 msgid "Username"
-msgstr "Корисничко име"
+msgstr "Корисник"
 
 #: ../gtk/main.ui.h:41 ../gtk/tunnel_config.ui.h:8
 msgid "Password"
@@ -977,11 +978,11 @@ msgstr "Подаци пријављивања"
 
 #: ../gtk/main.ui.h:46
 msgid "<b>Welcome !</b>"
-msgstr "<b>Добродошли !</b>"
+msgstr "<b>Добро дошли !</b>"
 
 #: ../gtk/main.ui.h:47
 msgid "Delete"
-msgstr ""
+msgstr "Обриши"
 
 #: ../gtk/about.ui.h:1
 msgid "About linphone"
@@ -989,11 +990,11 @@ msgstr "О линфону"
 
 #: ../gtk/about.ui.h:2
 msgid "(C) Belledonne Communications,2010\n"
-msgstr "(C) Беледон комуникације,2010\n"
+msgstr "(C) Беледоне комуникације, 2010\n"
 
 #: ../gtk/about.ui.h:4
 msgid "An internet video phone using the standard SIP (rfc3261) protocol."
-msgstr "Интернет телефон са снимком који користи уобичајени СИП (rfc3261) протокол."
+msgstr "Интернет телефон са снимком који користи уобичајени СИП протокол (rfc3261)."
 
 #: ../gtk/about.ui.h:5
 msgid ""
@@ -1009,7 +1010,7 @@ msgid ""
 "cs: Petr Pisar <petr.pisar@atlas.cz>\n"
 "hu: anonymous\n"
 "he: Eli Zaretskii <eliz@gnu.org>\n"
-msgstr ""
+msgstr "fr: Simon Morlat\nen: Simon Morlat and Delphine Perreau\nit: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\nde: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\nsv: Daniel Nylander <po@danielnylander.se>\nes: Jesus Benitez <gnelson at inMail dot sk>\nja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\npt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\npl: Robert Nasiadek <darkone@darkone.pl>\ncs: Petr Pisar <petr.pisar@atlas.cz>\nhu: anonymous\nhe: Eli Zaretskii <eliz@gnu.org>\nsr: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 
 #: ../gtk/contact.ui.h:2
 msgid "SIP Address"
@@ -1033,7 +1034,7 @@ msgstr "Линфоново прозорче прочишћавања"
 
 #: ../gtk/log.ui.h:2
 msgid "Scroll to end"
-msgstr ""
+msgstr "Премакни на крај"
 
 #: ../gtk/password.ui.h:1
 msgid "Linphone - Authentication required"
@@ -1065,7 +1066,7 @@ msgstr "Ваш СИП идентитет:"
 
 #: ../gtk/sip_account.ui.h:3
 msgid "Looks like sip:<username>@<domain>"
-msgstr "Изгледа као „sip:<корисничко-име>@<домен>"
+msgstr "Изгледа као „sip:<корисничко-име>@<домен>“"
 
 #: ../gtk/sip_account.ui.h:4
 msgid "sip:"
@@ -1077,7 +1078,7 @@ msgstr "Адреса СИП посредника:"
 
 #: ../gtk/sip_account.ui.h:6
 msgid "Looks like sip:<proxy hostname>"
-msgstr "Изгледа као „sip:<назив посредника>"
+msgstr "Изгледа као „sip:<назив посредника>“"
 
 #: ../gtk/sip_account.ui.h:7
 msgid "Registration duration (sec):"
@@ -1085,11 +1086,11 @@ msgstr "Трајање уписа (сек):"
 
 #: ../gtk/sip_account.ui.h:8
 msgid "Contact params (optional):"
-msgstr ""
+msgstr "Параметри пријатеља (изборно):"
 
 #: ../gtk/sip_account.ui.h:9
 msgid "AVPF regular RTCP interval (sec):"
-msgstr ""
+msgstr "АВПФ редован РТЦП интервал (сек):"
 
 #: ../gtk/sip_account.ui.h:10
 msgid "Route (optional):"
@@ -1097,7 +1098,7 @@ msgstr "Рута (изборно):"
 
 #: ../gtk/sip_account.ui.h:11
 msgid "Transport"
-msgstr ""
+msgstr "Пренос"
 
 #: ../gtk/sip_account.ui.h:12
 msgid "Register"
@@ -1109,7 +1110,7 @@ msgstr "Објави податке о присуству"
 
 #: ../gtk/sip_account.ui.h:14
 msgid "Enable AVPF"
-msgstr ""
+msgstr "Укључи АВПФ"
 
 #: ../gtk/sip_account.ui.h:15
 msgid "Configure a SIP account"
@@ -1117,15 +1118,15 @@ msgstr "Подесите СИП налог"
 
 #: ../gtk/parameters.ui.h:1
 msgid "anonymous"
-msgstr ""
+msgstr "безимено"
 
 #: ../gtk/parameters.ui.h:2
 msgid "GSSAPI"
-msgstr ""
+msgstr "ГССАПИ"
 
 #: ../gtk/parameters.ui.h:3
 msgid "SASL"
-msgstr ""
+msgstr "САСЛ"
 
 #: ../gtk/parameters.ui.h:4
 msgid "default soundcard"
@@ -1137,7 +1138,7 @@ msgstr "звучна картица"
 
 #: ../gtk/parameters.ui.h:6
 msgid "default camera"
-msgstr "основна камера"
+msgstr "основна камерица"
 
 #: ../gtk/parameters.ui.h:7
 msgid "CIF"
@@ -1145,7 +1146,7 @@ msgstr "ЦИФ"
 
 #: ../gtk/parameters.ui.h:8
 msgid "Audio codecs"
-msgstr "Звучни кодеци"
+msgstr "Кодеци звука"
 
 #: ../gtk/parameters.ui.h:9
 msgid "Video codecs"
@@ -1201,27 +1202,27 @@ msgstr "РТП/УДП звука:"
 
 #: ../gtk/parameters.ui.h:22
 msgid "Fixed"
-msgstr ""
+msgstr "Неизмењиво"
 
 #: ../gtk/parameters.ui.h:23
 msgid "Media encryption is mandatory"
-msgstr ""
+msgstr "Шифровање медија је обавезно"
 
 #: ../gtk/parameters.ui.h:24
 msgid "Tunnel"
-msgstr ""
+msgstr "Тунел"
 
 #: ../gtk/parameters.ui.h:25
 msgid "DSCP fields"
-msgstr ""
+msgstr "ДСЦП поља"
 
 #: ../gtk/parameters.ui.h:26
 msgid "SIP/TCP port"
-msgstr ""
+msgstr "СИП/ТЦП прикључник"
 
 #: ../gtk/parameters.ui.h:27
 msgid "SIP/UDP port"
-msgstr ""
+msgstr "СИП/УДП прикључник"
 
 #: ../gtk/parameters.ui.h:28
 msgid "<b>Network protocol and ports</b>"
@@ -1233,7 +1234,7 @@ msgstr "Непосредна веза на Интернет"
 
 #: ../gtk/parameters.ui.h:30
 msgid "Behind NAT / Firewall (specify gateway IP )"
-msgstr ""
+msgstr "Иза НАТ-а / мрежне баријере (наведите ИП мрежног пролаза)"
 
 #: ../gtk/parameters.ui.h:31
 msgid "Behind NAT / Firewall (use STUN to resolve)"
@@ -1241,11 +1242,11 @@ msgstr "Иза НАТ-а / мрежне баријере (користите С
 
 #: ../gtk/parameters.ui.h:32
 msgid "Behind NAT / Firewall (use ICE)"
-msgstr ""
+msgstr "Иза НАТ-а / мрежне баријере (користите ИЦЕ)"
 
 #: ../gtk/parameters.ui.h:33
 msgid "Behind NAT / Firewall (use uPnP)"
-msgstr ""
+msgstr "Иза НАТ-а / мрежне баријере (користите уПнП)"
 
 #: ../gtk/parameters.ui.h:34
 msgid "Public IP address:"
@@ -1261,7 +1262,7 @@ msgstr "<b>НАТ и мрежна баријера</b>"
 
 #: ../gtk/parameters.ui.h:37
 msgid "Network settings"
-msgstr "Подешавања мреже"
+msgstr "Мрежа"
 
 #: ../gtk/parameters.ui.h:38
 msgid "Ring sound:"
@@ -1301,7 +1302,7 @@ msgstr "Жељена резолуција снимка:"
 
 #: ../gtk/parameters.ui.h:47
 msgid "Video output method:"
-msgstr ""
+msgstr "Начин излаза снимка:"
 
 #: ../gtk/parameters.ui.h:48
 msgid "<b>Video</b>"
@@ -1309,7 +1310,7 @@ msgstr "<b>Снимак</b>"
 
 #: ../gtk/parameters.ui.h:49
 msgid "Multimedia settings"
-msgstr "Подешавања мултимедија"
+msgstr "Мултимедија"
 
 #: ../gtk/parameters.ui.h:50
 msgid "This section defines your SIP address when not using a SIP account"
@@ -1333,7 +1334,7 @@ msgstr "<b>Основни идентитет</b>"
 
 #: ../gtk/parameters.ui.h:55
 msgid "Wizard"
-msgstr ""
+msgstr "Чаробњак"
 
 #: ../gtk/parameters.ui.h:56
 msgid "Add"
@@ -1361,7 +1362,7 @@ msgstr "<b>Приватност</b>"
 
 #: ../gtk/parameters.ui.h:62
 msgid "Manage SIP Accounts"
-msgstr "Управљај СИП налозима"
+msgstr "СИП налози"
 
 #: ../gtk/parameters.ui.h:63 ../gtk/tunnel_config.ui.h:4
 msgid "Enable"
@@ -1381,11 +1382,11 @@ msgstr "0 значи „неограничено“"
 
 #: ../gtk/parameters.ui.h:67
 msgid "Upload speed limit in Kbit/sec:"
-msgstr "Ограничење брзине слања у Kb/s:"
+msgstr "Ограничи брзину слања на (Kb/s):"
 
 #: ../gtk/parameters.ui.h:68
 msgid "Download speed limit in Kbit/sec:"
-msgstr "Ограничење брзине преузимања у Kb/s:"
+msgstr "Ограничи брзину преузимања на (Kb/s):"
 
 #: ../gtk/parameters.ui.h:69
 msgid "Enable adaptive rate control"
@@ -1423,11 +1424,11 @@ msgstr "Корисничко сучеље"
 
 #: ../gtk/parameters.ui.h:77 ../gtk/ldap.ui.h:2
 msgid "Server address:"
-msgstr ""
+msgstr "Адреса сервера:"
 
 #: ../gtk/parameters.ui.h:78 ../gtk/ldap.ui.h:3
 msgid "Authentication method:"
-msgstr ""
+msgstr "Начин потврђивања идентитета:"
 
 #: ../gtk/parameters.ui.h:80
 msgid "label"
@@ -1435,11 +1436,11 @@ msgstr "натпис"
 
 #: ../gtk/parameters.ui.h:81
 msgid "<b>LDAP Account setup</b>"
-msgstr ""
+msgstr "<b>Подешавања ЛДАП налога</b>"
 
 #: ../gtk/parameters.ui.h:82
 msgid "LDAP"
-msgstr ""
+msgstr "ЛДАП"
 
 #: ../gtk/parameters.ui.h:83
 msgid "Done"
@@ -1463,95 +1464,95 @@ msgstr "Линфон"
 
 #: ../gtk/waiting.ui.h:2
 msgid "Please wait"
-msgstr "Молим сачекајте"
+msgstr "Сачекајте мало"
 
 #: ../gtk/dscp_settings.ui.h:1
 msgid "DSCP settings"
-msgstr ""
+msgstr "ДСЦП подешавања"
 
 #: ../gtk/dscp_settings.ui.h:2
 msgid "SIP"
-msgstr ""
+msgstr "СИП"
 
 #: ../gtk/dscp_settings.ui.h:3
 msgid "Audio RTP stream"
-msgstr ""
+msgstr "РТП ток звука"
 
 #: ../gtk/dscp_settings.ui.h:4
 msgid "Video RTP stream"
-msgstr ""
+msgstr "РТП ток снимка"
 
 #: ../gtk/dscp_settings.ui.h:5
 msgid "<b>Set DSCP values (in hexadecimal)</b>"
-msgstr ""
+msgstr "<b>Подесите ДСЦП вредности (хексадецимално)</b>"
 
 #: ../gtk/call_statistics.ui.h:1
 msgid "Call statistics"
-msgstr ""
+msgstr "Статистика позива"
 
 #: ../gtk/call_statistics.ui.h:2
 msgid "Audio codec"
-msgstr ""
+msgstr "Звучни кодек"
 
 #: ../gtk/call_statistics.ui.h:3
 msgid "Video codec"
-msgstr ""
+msgstr "Видео кодек"
 
 #: ../gtk/call_statistics.ui.h:4
 msgid "Audio IP bandwidth usage"
-msgstr ""
+msgstr "Искоришћеност ИП пропусног опсега звука"
 
 #: ../gtk/call_statistics.ui.h:5
 msgid "Audio Media connectivity"
-msgstr ""
+msgstr "Повезивост медија звука"
 
 #: ../gtk/call_statistics.ui.h:6
 msgid "Video IP bandwidth usage"
-msgstr ""
+msgstr "Искоришћеност ИП пропусног опсега снимка"
 
 #: ../gtk/call_statistics.ui.h:7
 msgid "Video Media connectivity"
-msgstr ""
+msgstr "Повезивост медија снимка"
 
 #: ../gtk/call_statistics.ui.h:8
 msgid "Round trip time"
-msgstr ""
+msgstr "Време повратног путовања"
 
 #: ../gtk/call_statistics.ui.h:9
 msgid "Video resolution received"
-msgstr ""
+msgstr "Примљена резолуција снимка"
 
 #: ../gtk/call_statistics.ui.h:10
 msgid "Video resolution sent"
-msgstr ""
+msgstr "Послата резолуција снимка"
 
 #: ../gtk/call_statistics.ui.h:11
 msgid "RTP profile"
-msgstr ""
+msgstr "РТП профил"
 
 #: ../gtk/call_statistics.ui.h:12
 msgid "<b>Call statistics and information</b>"
-msgstr ""
+msgstr "<b>Статистика позива и подаци</b>"
 
 #: ../gtk/tunnel_config.ui.h:1
 msgid "Configure VoIP tunnel"
-msgstr ""
+msgstr "Подесите ВоИП тунел"
 
 #: ../gtk/tunnel_config.ui.h:2
 msgid "Host"
-msgstr ""
+msgstr "Домаћин"
 
 #: ../gtk/tunnel_config.ui.h:3
 msgid "Port"
-msgstr ""
+msgstr "Прикључник"
 
 #: ../gtk/tunnel_config.ui.h:6
 msgid "<b>Configure tunnel</b>"
-msgstr ""
+msgstr "<b>Подесите тунел</b>"
 
 #: ../gtk/tunnel_config.ui.h:9
 msgid "<b>Configure http proxy (optional)</b>"
-msgstr ""
+msgstr "<b>Подесите хттп посредника (изборно)</b>"
 
 #: ../gtk/keypad.ui.h:1
 msgid "D"
@@ -1615,114 +1616,114 @@ msgstr "1"
 
 #: ../gtk/ldap.ui.h:1
 msgid "LDAP Settings"
-msgstr ""
+msgstr "ЛДАП подешавања"
 
 #: ../gtk/ldap.ui.h:6
 msgid "Use TLS Connection"
-msgstr ""
+msgstr "Користи ТЛС везу"
 
 #: ../gtk/ldap.ui.h:7
 msgid "Not yet available"
-msgstr ""
+msgstr "Још није доступно"
 
 #: ../gtk/ldap.ui.h:8
 msgid "<b>Connection</b>"
-msgstr ""
+msgstr "<b>Веза</b>"
 
 #: ../gtk/ldap.ui.h:9
 msgid "Bind DN"
-msgstr ""
+msgstr "Свежи назив домена"
 
 #: ../gtk/ldap.ui.h:10
 msgid "Authname"
-msgstr ""
+msgstr "Назив потврђивања"
 
 #: ../gtk/ldap.ui.h:11
 msgid "Realm"
-msgstr ""
+msgstr "Подручје"
 
 #: ../gtk/ldap.ui.h:12
 msgid "<b>SASL</b>"
-msgstr ""
+msgstr "<b>САСЛ</b>"
 
 #: ../gtk/ldap.ui.h:13
 msgid "Base object:"
-msgstr ""
+msgstr "Предмет основе:"
 
 #: ../gtk/ldap.ui.h:15
 #, no-c-format
 msgid "Filter (%s for name):"
-msgstr ""
+msgstr "Пропусник (%s за име):"
 
 #: ../gtk/ldap.ui.h:16
 msgid "Name Attribute:"
-msgstr ""
+msgstr "Особине имена:"
 
 #: ../gtk/ldap.ui.h:17
 msgid "SIP address attribute:"
-msgstr ""
+msgstr "Особине СИП адресе:"
 
 #: ../gtk/ldap.ui.h:18
 msgid "Attributes to query:"
-msgstr ""
+msgstr "Особине за пропитивање:"
 
 #: ../gtk/ldap.ui.h:19
 msgid "<b>Search</b>"
-msgstr ""
+msgstr "<b>Потражите</b>"
 
 #: ../gtk/ldap.ui.h:20
 msgid "Timeout for search:"
-msgstr ""
+msgstr "Време за претрагу:"
 
 #: ../gtk/ldap.ui.h:21
 msgid "Max results:"
-msgstr ""
+msgstr "Највише резултата:"
 
 #: ../gtk/ldap.ui.h:22
 msgid "Follow Aliases"
-msgstr ""
+msgstr "Прати надимке"
 
 #: ../gtk/ldap.ui.h:23
 msgid "<b>Miscellaneous</b>"
-msgstr ""
+msgstr "<b>Разно</b>"
 
 #: ../gtk/ldap.ui.h:24
 msgid "ANONYMOUS"
-msgstr ""
+msgstr "БЕЗИМЕНО"
 
 #: ../gtk/ldap.ui.h:25
 msgid "SIMPLE"
-msgstr ""
+msgstr "ЈЕДНОСТАВНО"
 
 #: ../gtk/ldap.ui.h:26
 msgid "DIGEST-MD5"
-msgstr ""
+msgstr "ДИГЕСТ-МД5"
 
 #: ../gtk/ldap.ui.h:27
 msgid "NTLM"
-msgstr ""
+msgstr "НТЛМ"
 
 #: ../gtk/config-uri.ui.h:1
 msgid "Specifying a remote configuration URI"
-msgstr ""
+msgstr "Наводим удаљену путању подешавања"
 
 #: ../gtk/config-uri.ui.h:2
 msgid ""
 "This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
 "Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
-msgstr ""
+msgstr "Ово прозорче омогућава подешавање хттп или хттпс адресе када се подешавање добавља на покретању.\nУнесите или измените путању подешавања. Након што притиснете „У реду“, Линфон ће се сам поново покренути како би довукао и унео у налог нова подешавања. "
 
 #: ../gtk/config-uri.ui.h:4
 msgid "https://"
-msgstr ""
+msgstr "https://"
 
 #: ../gtk/provisioning-fetch.ui.h:1
 msgid "Configuring..."
-msgstr ""
+msgstr "Подешавам..."
 
 #: ../gtk/provisioning-fetch.ui.h:2
 msgid "Please wait while fetching configuration from server..."
-msgstr ""
+msgstr "Сачекајте док довучем подешавања са сервера..."
 
 #: ../coreapi/linphonecore.c:1511
 msgid "Ready"
@@ -1730,7 +1731,7 @@ msgstr "Спреман"
 
 #: ../coreapi/linphonecore.c:2470
 msgid "Configuring"
-msgstr ""
+msgstr "Подешавам"
 
 #: ../coreapi/linphonecore.c:2635
 msgid "Looking for telephone number destination..."
@@ -1791,7 +1792,7 @@ msgstr "У току је тражење стуна..."
 
 #: ../coreapi/misc.c:619
 msgid "ICE local candidates gathering in progress..."
-msgstr ""
+msgstr "Прикупљање месних ИЦЕ кандидата је у току..."
 
 #: ../coreapi/friend.c:33
 msgid "Online"
@@ -1839,7 +1840,7 @@ msgstr "На чекању"
 
 #: ../coreapi/friend.c:66
 msgid "Vacation"
-msgstr ""
+msgstr "На одмору"
 
 #: ../coreapi/friend.c:68
 msgid "Unknown-bug"
@@ -1895,25 +1896,25 @@ msgstr "На позив је одговорио „%s“."
 
 #: ../coreapi/callbacks.c:525
 msgid "Incompatible, check codecs or security settings..."
-msgstr ""
+msgstr "Несагласно, проверите кодеке или безбедносна подешавања..."
 
 #: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:826
 msgid "Incompatible media parameters."
-msgstr ""
+msgstr "Медијски параметри су несагласни."
 
 #: ../coreapi/callbacks.c:560
 msgid "We have been resumed."
-msgstr ""
+msgstr "Наставили смо."
 
 #. we are being paused
 #: ../coreapi/callbacks.c:568
 msgid "We are paused by other party."
-msgstr ""
+msgstr "Друга страна нас је паузирала."
 
 #. reINVITE and in-dialogs UPDATE go here
 #: ../coreapi/callbacks.c:602
 msgid "Call is updated by remote."
-msgstr ""
+msgstr "Позив је освежен удаљеним."
 
 #: ../coreapi/callbacks.c:705
 msgid "Call terminated."
@@ -1938,7 +1939,7 @@ msgstr "Позив је одбијен."
 
 #: ../coreapi/callbacks.c:752
 msgid "Request timeout."
-msgstr ""
+msgstr "Истекло је време захтева."
 
 #: ../coreapi/callbacks.c:780
 msgid "Redirected"
@@ -1969,7 +1970,7 @@ msgstr "Уписивање на „%s“ није успело: %s"
 
 #: ../coreapi/callbacks.c:942
 msgid "Service unavailable, retrying"
-msgstr ""
+msgstr "Услуга није доступна, поново покушавам"
 
 #: ../coreapi/linphonecall.c:174
 #, c-format
@@ -1980,6 +1981,6 @@ msgstr "Симбол потврђивања идентитета је „%s“"
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Пропустили сте %i позив."
+msgstr[1] "Пропустили сте %i позива."
+msgstr[2] "Пропустили сте %i позива."

From 9a8236180cffe68418357a1f9e717a8e6a32974a Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Thu, 27 Nov 2014 16:59:21 +0100
Subject: [PATCH 068/496] Activate -Werror when building with CMake.

---
 CMakeLists.txt | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0272d671c..1740cc44f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -107,6 +107,25 @@ endif()
 add_definitions(-DIN_LINPHONE)
 
 
+if(MSVC)
+	set(CMAKE_C_FLAGS "/W3")
+	set(CMAKE_CXX_FLAGS "/W3")
+else()
+	set(CMAKE_C_FLAGS "-Wall -Wuninitialized -Wdeclaration-after-statement -fno-strict-aliasing -Werror")
+	set(CMAKE_CXX_FLAGS "-Wall -Wuninitialized -Werror")
+	if(CMAKE_C_COMPILER_ID STREQUAL "Clang")
+		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Qunused-arguments -Wno-array-bounds")
+	endif()
+	if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Qunused-arguments -Wno-array-bounds")
+	endif()
+	if(APPLE)
+		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error=unknown-warning-option -Wno-tautological-compare -Wno-unused-function")
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=unknown-warning-option -Wno-tautological-compare -Wno-unused-function")
+	endif()
+endif()
+
+
 set(GETTEXT_PACKAGE "linphone")
 if(ENABLE_RELATIVE_PREFIX)
 	set(LINPHONE_DATA_DIR ".")

From ff42eeab99e1f85c2c3e68e587cc5aecad05dd50 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Fri, 28 Nov 2014 10:27:38 +0100
Subject: [PATCH 069/496] Update localization

---
 po/cat-id-tbl.c |    0
 po/cs.po        |    2 +-
 po/de_DE.po     | 1984 -----------------------------------------------
 po/es.po        |    2 +-
 po/fr.po        |  152 ++--
 po/hu.po        |    2 +-
 po/it.po        |    2 +-
 po/ja.po        |   16 +-
 po/nb_NO.po     |    2 +-
 po/nl.po        |    2 +-
 po/pl.po        |    2 +-
 po/pt_BR.po     |    2 +-
 po/ru.po        |    3 +-
 po/sv.po        |    2 +-
 po/zh_CN.po     |    2 +-
 po/zh_TW.po     |    2 +-
 16 files changed, 98 insertions(+), 2079 deletions(-)
 delete mode 100644 po/cat-id-tbl.c
 delete mode 100644 po/de_DE.po

diff --git a/po/cat-id-tbl.c b/po/cat-id-tbl.c
deleted file mode 100644
index e69de29bb..000000000
diff --git a/po/cs.po b/po/cs.po
index f6056909d..9df6476d2 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -11,7 +11,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-19 10:39+0100\n"
 "PO-Revision-Date: 2014-11-19 10:17+0000\n"
-"Last-Translator: Cqnqrd <gautier.pelloux@gmail.com>\n"
+"Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Czech (http://www.transifex.com/projects/p/linphone-gtk/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/po/de_DE.po b/po/de_DE.po
deleted file mode 100644
index c65ead393..000000000
--- a/po/de_DE.po
+++ /dev/null
@@ -1,1984 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-# andreas, 2014
-# Gerhard Stengel <gstengel@gmx.net>, 2011-2012
-# Simon Morlat <linphone@free.fr>, 2001
-msgid ""
-msgstr ""
-"Project-Id-Version: linphone-gtk\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-19 10:39+0100\n"
-"PO-Revision-Date: 2014-11-25 16:45+0000\n"
-"Last-Translator: andreas\n"
-"Language-Team: German (http://www.transifex.com/projects/p/linphone-gtk/language/de/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974
-#, c-format
-msgid "Call %s"
-msgstr "„%s“ anrufen"
-
-#: ../gtk/calllogs.c:149 ../gtk/friendlist.c:975
-#, c-format
-msgid "Send text to %s"
-msgstr "Text zu „%s“ schicken"
-
-#: ../gtk/calllogs.c:232
-#, c-format
-msgid "<b>Recent calls (%i)</b>"
-msgstr "<b>letzte Anrufe (%i)</b>"
-
-#: ../gtk/calllogs.c:314
-msgid "n/a"
-msgstr "nicht verfügbar"
-
-#: ../gtk/calllogs.c:317
-msgid "Aborted"
-msgstr "Abgebrochen"
-
-#: ../gtk/calllogs.c:320
-msgid "Missed"
-msgstr "Entgangen"
-
-#: ../gtk/calllogs.c:323
-msgid "Declined"
-msgstr "Abgewiesen"
-
-#: ../gtk/calllogs.c:329
-#, c-format
-msgid "%i minute"
-msgid_plural "%i minutes"
-msgstr[0] "%i Minute"
-msgstr[1] "%i Minuten"
-
-#: ../gtk/calllogs.c:332
-#, c-format
-msgid "%i second"
-msgid_plural "%i seconds"
-msgstr[0] "%i Sekunde"
-msgstr[1] "%i Sekunden"
-
-#: ../gtk/calllogs.c:335 ../gtk/calllogs.c:341
-#, c-format
-msgid "<big><b>%s</b></big>\t%s"
-msgstr "<big><b>%s</b></big>\t%s"
-
-#: ../gtk/calllogs.c:337
-#, c-format
-msgid ""
-"<small><i>%s</i>\t<i>Quality: %s</i></small>\n"
-"%s\t%s\t"
-msgstr "<small><i>%s</i>\t<i>Qualität: %s</i></small>\n%s\t%s\t"
-
-#: ../gtk/calllogs.c:343
-#, c-format
-msgid ""
-"<small><i>%s</i></small>\t\n"
-"%s"
-msgstr "<small><i>%s</i></small>\t\n%s"
-
-#: ../gtk/conference.c:38 ../gtk/main.ui.h:13
-msgid "Conference"
-msgstr "Konferenz"
-
-#: ../gtk/conference.c:46
-msgid "Me"
-msgstr "Eigenes Telefon"
-
-#: ../gtk/support.c:49 ../gtk/support.c:73 ../gtk/support.c:102
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Pixmapdatei %s kann nicht gefunden werden."
-
-#: ../gtk/chat.c:364 ../gtk/friendlist.c:924
-msgid "Invalid sip contact !"
-msgstr "Ungültiger SIP-Kontakt!"
-
-#: ../gtk/main.c:107
-msgid "log to stdout some debug information while running."
-msgstr "Ausgabe von Debug-Informationen auf stdout während der Laufzeit"
-
-#: ../gtk/main.c:114
-msgid "path to a file to write logs into."
-msgstr "Pfad zu einer Datei, in die Protokolle geschrieben werden."
-
-#: ../gtk/main.c:121
-msgid "Start linphone with video disabled."
-msgstr "Linphone mit ausgeschaltetem Video starten."
-
-#: ../gtk/main.c:128
-msgid "Start only in the system tray, do not show the main interface."
-msgstr "Nur im Systemabschnitt der Kontrollleiste starten, aber das Hauptfenster nicht zeigen."
-
-#: ../gtk/main.c:135
-msgid "address to call right now"
-msgstr "Im Moment anzurufende Adresse"
-
-#: ../gtk/main.c:142
-msgid "if set automatically answer incoming calls"
-msgstr "Falls aktiviert, werden eingehende Anrufe automatisch beantwortet"
-
-#: ../gtk/main.c:149
-msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: "
-"c:\\Program Files\\Linphone)"
-msgstr "Geben Sie einen Arbeitsordner an (sollte der Installationsordner sein, z. B. C:\\Programme\\Linphone)"
-
-#: ../gtk/main.c:156
-msgid "Configuration file"
-msgstr "Konfigurationsdatei"
-
-#: ../gtk/main.c:163
-msgid "Run the audio assistant"
-msgstr "Starte den Audio-Assistent"
-
-#: ../gtk/main.c:1085
-#, c-format
-msgid ""
-"%s would like to add you to his contact list.\n"
-"Would you allow him to see your presence status or add him to your contact list ?\n"
-"If you answer no, this person will be temporarily blacklisted."
-msgstr "%s möchte Sie zu seiner Kontaktliste hinzufügen.\nMöchten Sie ihm erlauben, Ihren Anwesenheitsstatus zu sehen, oder ihn zu Ihrer Kontaktliste hinzufügen?\nWenn Sie mit Nein antworten, wird diese Person vorläufig blockiert."
-
-#: ../gtk/main.c:1162
-#, c-format
-msgid ""
-"Please enter your password for username <i>%s</i>\n"
-" at realm <i>%s</i>:"
-msgstr "Bitte geben Sie Ihr Passwort für den Benutzernamen <i>%s</i>\n für  Bereich <i>%s</i> ein:"
-
-#: ../gtk/main.c:1283
-msgid "Call error"
-msgstr "Anruf fehlgeschlagen"
-
-#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3744
-msgid "Call ended"
-msgstr "Anruf beendet"
-
-#: ../gtk/main.c:1289
-msgid "Incoming call"
-msgstr "Eingehender Anruf"
-
-#: ../gtk/main.c:1291 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
-msgid "Answer"
-msgstr "Annehmen"
-
-#: ../gtk/main.c:1293 ../gtk/main.ui.h:6
-msgid "Decline"
-msgstr "Abweisen"
-
-#: ../gtk/main.c:1299
-msgid "Call paused"
-msgstr "Anruf wird gehalten"
-
-#: ../gtk/main.c:1299
-#, c-format
-msgid "<b>by %s</b>"
-msgstr "<b>von %s</b>"
-
-#: ../gtk/main.c:1366
-#, c-format
-msgid "%s proposed to start video. Do you accept ?"
-msgstr "%s schlägt vor, eine Videoübertragung zu starten. Nehmen Sie an?"
-
-#: ../gtk/main.c:1528
-msgid "Website link"
-msgstr "Website-Verknüpfung"
-
-#: ../gtk/main.c:1577
-msgid "Linphone - a video internet phone"
-msgstr "Linphone - ein Internet-Video-Telefon"
-
-#: ../gtk/main.c:1669
-#, c-format
-msgid "%s (Default)"
-msgstr "%s (Vorgabe)"
-
-#: ../gtk/main.c:2006 ../coreapi/callbacks.c:983
-#, c-format
-msgid "We are transferred to %s"
-msgstr "Vermittlung nach %s"
-
-#: ../gtk/main.c:2016
-msgid ""
-"No sound cards have been detected on this computer.\n"
-"You won't be able to send or receive audio calls."
-msgstr "Auf diesem Rechner können keine Soundkarten gefunden werden.\nSie können keine Audio-Anrufe tätigen oder entgegennehmen."
-
-#: ../gtk/main.c:2157
-msgid "A free SIP video-phone"
-msgstr "Ein freies SIP-Video-Telefon"
-
-#: ../gtk/friendlist.c:505
-msgid "Add to addressbook"
-msgstr "Zum Adressbuch hinzufügen"
-
-#: ../gtk/friendlist.c:691
-msgid "Presence status"
-msgstr "Anwesenheitsstatus"
-
-#: ../gtk/friendlist.c:709 ../gtk/propertybox.c:552 ../gtk/contact.ui.h:1
-msgid "Name"
-msgstr "Name"
-
-#: ../gtk/friendlist.c:721
-msgid "Call"
-msgstr "Anrufen"
-
-#: ../gtk/friendlist.c:726
-msgid "Chat"
-msgstr "Chat"
-
-#: ../gtk/friendlist.c:756
-#, c-format
-msgid "Search in %s directory"
-msgstr "Im %s-Verzeichnis suchen"
-
-#: ../gtk/friendlist.c:976
-#, c-format
-msgid "Edit contact '%s'"
-msgstr "Kontakt „%s“ bearbeiten"
-
-#: ../gtk/friendlist.c:977
-#, c-format
-msgid "Delete contact '%s'"
-msgstr "Kontakt „%s“ löschen"
-
-#: ../gtk/friendlist.c:978
-#, c-format
-msgid "Delete chat history of '%s'"
-msgstr "Lösche Gesprächshistorie von '%s'"
-
-#: ../gtk/friendlist.c:1029
-#, c-format
-msgid "Add new contact from %s directory"
-msgstr "Einen neuen Kontakt aus dem %s-Verzeichnis hinzufügen"
-
-#: ../gtk/propertybox.c:558
-msgid "Rate (Hz)"
-msgstr "Rate (Hz)"
-
-#: ../gtk/propertybox.c:564
-msgid "Status"
-msgstr "Status"
-
-#: ../gtk/propertybox.c:570
-msgid "IP Bitrate (kbit/s)"
-msgstr "IP Bit-Rate (kbit/s)"
-
-#: ../gtk/propertybox.c:577
-msgid "Parameters"
-msgstr "Parameter"
-
-#: ../gtk/propertybox.c:620 ../gtk/propertybox.c:763
-msgid "Enabled"
-msgstr "Freigegeben"
-
-#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763
-msgid "Disabled"
-msgstr "Gesperrt"
-
-#: ../gtk/propertybox.c:809
-msgid "Account"
-msgstr "Konto"
-
-#: ../gtk/propertybox.c:1072
-msgid "English"
-msgstr "Englisch"
-
-#: ../gtk/propertybox.c:1073
-msgid "French"
-msgstr "Französisch"
-
-#: ../gtk/propertybox.c:1074
-msgid "Swedish"
-msgstr "Schwedisch"
-
-#: ../gtk/propertybox.c:1075
-msgid "Italian"
-msgstr "Italienisch"
-
-#: ../gtk/propertybox.c:1076
-msgid "Spanish"
-msgstr "Spanisch"
-
-#: ../gtk/propertybox.c:1077
-msgid "Brazilian Portugese"
-msgstr "Brasilianisches Portugiesisch"
-
-#: ../gtk/propertybox.c:1078
-msgid "Polish"
-msgstr "Polnisch"
-
-#: ../gtk/propertybox.c:1079
-msgid "German"
-msgstr "Deutsch"
-
-#: ../gtk/propertybox.c:1080
-msgid "Russian"
-msgstr "Russisch"
-
-#: ../gtk/propertybox.c:1081
-msgid "Japanese"
-msgstr "Japanisch"
-
-#: ../gtk/propertybox.c:1082
-msgid "Dutch"
-msgstr "Niederländisch"
-
-#: ../gtk/propertybox.c:1083
-msgid "Hungarian"
-msgstr "Ungarisch"
-
-#: ../gtk/propertybox.c:1084
-msgid "Czech"
-msgstr "Tschechisch"
-
-#: ../gtk/propertybox.c:1085
-msgid "Chinese"
-msgstr "Chinesisch"
-
-#: ../gtk/propertybox.c:1086
-msgid "Traditional Chinese"
-msgstr "Traditionelles Chinesisch"
-
-#: ../gtk/propertybox.c:1087
-msgid "Norwegian"
-msgstr "Norwegisch"
-
-#: ../gtk/propertybox.c:1088
-msgid "Hebrew"
-msgstr "Hebräisch"
-
-#: ../gtk/propertybox.c:1089
-msgid "Serbian"
-msgstr "Serbisch"
-
-#: ../gtk/propertybox.c:1156
-msgid ""
-"You need to restart linphone for the new language selection to take effect."
-msgstr "Linphone muss neu gestartet werden, damit die neue Spracheinstellung wirksam wird."
-
-#: ../gtk/propertybox.c:1234
-msgid "None"
-msgstr "Keinen"
-
-#: ../gtk/propertybox.c:1238
-msgid "SRTP"
-msgstr "SRTP"
-
-#: ../gtk/propertybox.c:1244
-msgid "ZRTP"
-msgstr "ZRTP"
-
-#: ../gtk/update.c:80
-#, c-format
-msgid ""
-"A more recent version is availalble from %s.\n"
-"Would you like to open a browser to download it ?"
-msgstr "Eine neuere Version ist von %s verfügbar.\nMöchten Sie einen Browser zum Herunterladen öffnen?"
-
-#: ../gtk/update.c:91
-msgid "You are running the lastest version."
-msgstr "Sie verwenden bereits die aktuellste Version."
-
-#: ../gtk/buddylookup.c:85
-msgid "Firstname, Lastname"
-msgstr "Vorname, Nachname"
-
-#: ../gtk/buddylookup.c:160
-msgid "Error communicating with server."
-msgstr "Fehler bei der Kommunikation mit dem Server."
-
-#: ../gtk/buddylookup.c:164
-msgid "Connecting..."
-msgstr "Verbinden..."
-
-#: ../gtk/buddylookup.c:168
-msgid "Connected"
-msgstr "Verbunden"
-
-#: ../gtk/buddylookup.c:172
-msgid "Receiving data..."
-msgstr "Daten werden empfangen..."
-
-#: ../gtk/buddylookup.c:180
-#, c-format
-msgid "Found %i contact"
-msgid_plural "Found %i contacts"
-msgstr[0] "%i Kontakt gefunden"
-msgstr[1] "%i Kontakte gefunden"
-
-#: ../gtk/setupwizard.c:34
-msgid ""
-"Welcome !\n"
-"This assistant will help you to use a SIP account for your calls."
-msgstr "Willkommen!\nDieser Assistent wird Ihnen dabei helfen, ein SIP-Konto für Ihre Anrufe zu verwenden."
-
-#: ../gtk/setupwizard.c:43
-msgid "Create an account on linphone.org"
-msgstr "Ein Konto bei linphone.org erstellen."
-
-#: ../gtk/setupwizard.c:44
-msgid "I have already a linphone.org account and I just want to use it"
-msgstr "Ich habe bereits ein Konto bei linphone.org und möchte es jetzt benutzen."
-
-#: ../gtk/setupwizard.c:45
-msgid "I have already a sip account and I just want to use it"
-msgstr "Ich habe bereits ein SIP-Konto und möchte es jetzt benutzen."
-
-#: ../gtk/setupwizard.c:46
-msgid "I want to specify a remote configuration URI"
-msgstr "Ich möchte eine URI zur Fernkonfiguration angeben"
-
-#: ../gtk/setupwizard.c:89
-msgid "Enter your linphone.org username"
-msgstr "Geben Sie Ihren Benutzernamen bei linphone.org ein."
-
-#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:79 ../gtk/ldap.ui.h:4
-msgid "Username:"
-msgstr "Benutzername:"
-
-#: ../gtk/setupwizard.c:104 ../gtk/password.ui.h:4 ../gtk/ldap.ui.h:5
-msgid "Password:"
-msgstr "Passwort:"
-
-#: ../gtk/setupwizard.c:124
-msgid "Enter your account informations"
-msgstr "Geben Sie Ihre Zugangsdaten ein."
-
-#: ../gtk/setupwizard.c:140
-msgid "Username*"
-msgstr "Benutzername*"
-
-#: ../gtk/setupwizard.c:141
-msgid "Password*"
-msgstr "Passwort*"
-
-#: ../gtk/setupwizard.c:144
-msgid "Domain*"
-msgstr "Domäne*"
-
-#: ../gtk/setupwizard.c:145
-msgid "Proxy"
-msgstr "Proxy"
-
-#: ../gtk/setupwizard.c:317
-msgid "(*) Required fields"
-msgstr "(*) erforderliche Felder"
-
-#: ../gtk/setupwizard.c:318
-msgid "Username: (*)"
-msgstr "Benutzername: (*)"
-
-#: ../gtk/setupwizard.c:320
-msgid "Password: (*)"
-msgstr "Passwort: (*)"
-
-#: ../gtk/setupwizard.c:322
-msgid "Email: (*)"
-msgstr "E-Mail: (*)"
-
-#: ../gtk/setupwizard.c:324
-msgid "Confirm your password: (*)"
-msgstr "Bestätigen Sie Ihr Passwort: (*)"
-
-#: ../gtk/setupwizard.c:338
-msgid "Keep me informed with linphone updates"
-msgstr "Halte mich über linphone Aktualisierungen auf dem laufenden"
-
-#: ../gtk/setupwizard.c:394
-msgid ""
-"Error, account not validated, username already used or server unreachable.\n"
-"Please go back and try again."
-msgstr "Fehler, Konto kann nicht bestätigt werden. Der Benutzername wird bereits\nverwendet oder der Server ist unerreichbar.\nBitte gehen Sie zurück und versuchen Sie es noch einmal."
-
-#: ../gtk/setupwizard.c:405
-msgid "Thank you. Your account is now configured and ready for use."
-msgstr "Danke. Ihr Konto ist nun fertig eingerichtet und kann verwendet werden."
-
-#: ../gtk/setupwizard.c:413
-msgid ""
-"Please validate your account by clicking on the link we just sent you by email.\n"
-"Then come back here and press Next button."
-msgstr "Bitte bestätigen Sie Ihr Konto, indem Sie auf die Verknüpfung klicken, die wir Ihnen soeben per E-Mail geschickt haben.\nDanach gehen Sie hierher zurück und drücken auf „Vor“."
-
-#: ../gtk/setupwizard.c:600
-msgid "SIP account configuration assistant"
-msgstr "SIP-Konto-Einrichtungsassistent"
-
-#: ../gtk/setupwizard.c:618
-msgid "Welcome to the account setup assistant"
-msgstr "Willkommen zum Konto-Einrichtungsassistenten"
-
-#: ../gtk/setupwizard.c:623
-msgid "Account setup assistant"
-msgstr "Konto-Einrichtungsassistent"
-
-#: ../gtk/setupwizard.c:629
-msgid "Configure your account (step 1/1)"
-msgstr "Konto einrichten (Schritt 1/1)"
-
-#: ../gtk/setupwizard.c:634
-msgid "Enter your sip username (step 1/1)"
-msgstr "Geben Sie Ihren SIP-Benutzernamen ein (Schritt 1/1)"
-
-#: ../gtk/setupwizard.c:638
-msgid "Enter account information (step 1/2)"
-msgstr "Geben Sie Ihre Zugangsdaten ein (Schritt 1/2)"
-
-#: ../gtk/setupwizard.c:647
-msgid "Validation (step 2/2)"
-msgstr "Bestätigung (Schritt 2/2)"
-
-#: ../gtk/setupwizard.c:652
-msgid "Error"
-msgstr "Fehler"
-
-#: ../gtk/setupwizard.c:656 ../gtk/audio_assistant.c:527
-msgid "Terminating"
-msgstr "Fertigstellen"
-
-#: ../gtk/incall_view.c:70 ../gtk/incall_view.c:94
-#, c-format
-msgid "Call #%i"
-msgstr "Anruf #%i"
-
-#: ../gtk/incall_view.c:155
-#, c-format
-msgid "Transfer to call #%i with %s"
-msgstr "Vermittlung zum Anruf #%i mit %s"
-
-#: ../gtk/incall_view.c:211 ../gtk/incall_view.c:214
-msgid "Not used"
-msgstr "Nicht verwendet"
-
-#: ../gtk/incall_view.c:221
-msgid "ICE not activated"
-msgstr "ICE nicht aktiviert"
-
-#: ../gtk/incall_view.c:223
-msgid "ICE failed"
-msgstr "ICE fehlgeschlagen"
-
-#: ../gtk/incall_view.c:225
-msgid "ICE in progress"
-msgstr "ICE läuft"
-
-#: ../gtk/incall_view.c:227
-msgid "Going through one or more NATs"
-msgstr "Ein oder mehrere NATs werden durchquert"
-
-#: ../gtk/incall_view.c:229
-msgid "Direct"
-msgstr "Direkt"
-
-#: ../gtk/incall_view.c:231
-msgid "Through a relay server"
-msgstr "Über einen Relay-Server"
-
-#: ../gtk/incall_view.c:239
-msgid "uPnP not activated"
-msgstr "uPnP nicht aktiviert"
-
-#: ../gtk/incall_view.c:241
-msgid "uPnP in progress"
-msgstr "uPnP läuft"
-
-#: ../gtk/incall_view.c:243
-msgid "uPnp not available"
-msgstr "uPnp nicht verfügbar"
-
-#: ../gtk/incall_view.c:245
-msgid "uPnP is running"
-msgstr "uPnP läuft"
-
-#: ../gtk/incall_view.c:247
-msgid "uPnP failed"
-msgstr "uPnP fehlgeschlagen"
-
-#: ../gtk/incall_view.c:257 ../gtk/incall_view.c:258
-msgid "Direct or through server"
-msgstr "Direkt oder über Server"
-
-#: ../gtk/incall_view.c:267 ../gtk/incall_view.c:279
-#, c-format
-msgid ""
-"download: %f\n"
-"upload: %f (kbit/s)"
-msgstr "Herunterladen: %f\nHochladen: %f (kbit/s)"
-
-#: ../gtk/incall_view.c:272 ../gtk/incall_view.c:274
-#, c-format
-msgid "%ix%i @ %f fps"
-msgstr "%ix%i @ %f bps"
-
-#: ../gtk/incall_view.c:304
-#, c-format
-msgid "%.3f seconds"
-msgstr "%.3f Sekunden"
-
-#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12
-msgid "Hang up"
-msgstr "Auflegen"
-
-#: ../gtk/incall_view.c:511
-msgid "<b>Calling...</b>"
-msgstr "<b>Verbindungsaufbau...</b>"
-
-#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:727
-msgid "00::00::00"
-msgstr "00::00::00"
-
-#: ../gtk/incall_view.c:525
-msgid "<b>Incoming call</b>"
-msgstr "<b>Eingehender Anruf</b>"
-
-#: ../gtk/incall_view.c:562
-msgid "good"
-msgstr "gut"
-
-#: ../gtk/incall_view.c:564
-msgid "average"
-msgstr "durchschnittlich"
-
-#: ../gtk/incall_view.c:566
-msgid "poor"
-msgstr "schlecht"
-
-#: ../gtk/incall_view.c:568
-msgid "very poor"
-msgstr "sehr schlecht"
-
-#: ../gtk/incall_view.c:570
-msgid "too bad"
-msgstr "zu schlecht"
-
-#: ../gtk/incall_view.c:571 ../gtk/incall_view.c:587
-msgid "unavailable"
-msgstr "nicht verfügbar"
-
-#: ../gtk/incall_view.c:679
-msgid "Secured by SRTP"
-msgstr "Gesichert durch SRTP"
-
-#: ../gtk/incall_view.c:685
-#, c-format
-msgid "Secured by ZRTP - [auth token: %s]"
-msgstr "Gesichert durch ZRTP - [Auth.-Token: %s]"
-
-#: ../gtk/incall_view.c:691
-msgid "Set unverified"
-msgstr "Auf „Ungeprüft“ setzen"
-
-#: ../gtk/incall_view.c:691 ../gtk/main.ui.h:4
-msgid "Set verified"
-msgstr "Auf „Geprüft“ setzen"
-
-#: ../gtk/incall_view.c:722
-msgid "In conference"
-msgstr "In Konferenz"
-
-#: ../gtk/incall_view.c:722
-msgid "<b>In call</b>"
-msgstr "<b>Im Gespräch</b>"
-
-#: ../gtk/incall_view.c:758
-msgid "<b>Paused call</b>"
-msgstr "<b>Gehaltener Anruf</b>"
-
-#: ../gtk/incall_view.c:771
-#, c-format
-msgid "%02i::%02i::%02i"
-msgstr "%02i::%02i::%02i"
-
-#: ../gtk/incall_view.c:794
-msgid "<b>Call ended.</b>"
-msgstr "<b>Anruf beendet.</b>"
-
-#: ../gtk/incall_view.c:825
-msgid "Transfer in progress"
-msgstr "Vermittlung läuft"
-
-#: ../gtk/incall_view.c:828
-msgid "Transfer done."
-msgstr "Vermittlung abgeschlossen."
-
-#: ../gtk/incall_view.c:831
-msgid "Transfer failed."
-msgstr "Vermittlung fehlgeschlagen."
-
-#: ../gtk/incall_view.c:875
-msgid "Resume"
-msgstr "Fortsetzen"
-
-#: ../gtk/incall_view.c:882 ../gtk/main.ui.h:9
-msgid "Pause"
-msgstr "Halten"
-
-#: ../gtk/incall_view.c:948
-#, c-format
-msgid ""
-"<small><i>Recording into\n"
-"%s %s</i></small>"
-msgstr "<small><i>Recording into\n%s %s</i></small>"
-
-#: ../gtk/incall_view.c:948
-msgid "(Paused)"
-msgstr "(pausiert)"
-
-#: ../gtk/loginframe.c:88
-#, c-format
-msgid "Please enter login information for %s"
-msgstr "Bitte geben Sie die Anmeldeinformationen für %s ein."
-
-#: ../gtk/config-fetching.c:57
-#, c-format
-msgid "fetching from %s"
-msgstr "abrufen von %s"
-
-#: ../gtk/config-fetching.c:73
-#, c-format
-msgid "Downloading of remote configuration from %s failed."
-msgstr "Herunterladen der Fernkonfiguration von %s fehlgeschlagen"
-
-#: ../gtk/audio_assistant.c:98
-msgid "No voice detected"
-msgstr "Keine Stimme ermittelt"
-
-#: ../gtk/audio_assistant.c:99
-msgid "Too low"
-msgstr "zu gering"
-
-#: ../gtk/audio_assistant.c:100
-msgid "Good"
-msgstr "gut"
-
-#: ../gtk/audio_assistant.c:101
-msgid "Too loud"
-msgstr "zu laut"
-
-#: ../gtk/audio_assistant.c:318
-msgid ""
-"Welcome !\n"
-"This assistant will help you to configure audio settings for Linphone"
-msgstr "Willkommen!\nDieser Assistent wird Ihnen dabei helfen, die Audio-Einstellungen für Linphone vorzunehmen."
-
-#: ../gtk/audio_assistant.c:328
-msgid "Capture device"
-msgstr "Aufnahmegerät"
-
-#: ../gtk/audio_assistant.c:329
-msgid "Recorded volume"
-msgstr "aufgenommene Lautstärke"
-
-#: ../gtk/audio_assistant.c:333
-msgid "No voice"
-msgstr "Keine Stimme"
-
-#: ../gtk/audio_assistant.c:369
-msgid "Playback device"
-msgstr "Wiedergabegerät"
-
-#: ../gtk/audio_assistant.c:370
-msgid "Play three beeps"
-msgstr "spiele drei Pieptöne ab"
-
-#: ../gtk/audio_assistant.c:403
-msgid "Press the record button and say some words"
-msgstr "Drücken Sie den Aufnahmeknopf und sagen Sie etwas"
-
-#: ../gtk/audio_assistant.c:404
-msgid "Listen to your record voice"
-msgstr "Hören Sie das Aufgenommene"
-
-#: ../gtk/audio_assistant.c:433
-msgid "Let's start Linphone now"
-msgstr "Linphone jetzt starten"
-
-#: ../gtk/audio_assistant.c:496
-msgid "Audio Assistant"
-msgstr "Audio-Assistant"
-
-#: ../gtk/audio_assistant.c:506 ../gtk/main.ui.h:31
-msgid "Audio assistant"
-msgstr "Audio-Assistant"
-
-#: ../gtk/audio_assistant.c:511
-msgid "Mic Gain calibration"
-msgstr "Einrichtung MIkrofonverstärker"
-
-#: ../gtk/audio_assistant.c:517
-msgid "Speaker volume calibration"
-msgstr "Einrichtung Lautstärke"
-
-#: ../gtk/audio_assistant.c:522
-msgid "Record and Play"
-msgstr "aufnehmen und abspielen"
-
-#: ../gtk/main.ui.h:1
-msgid "<b>Callee name</b>"
-msgstr "<b>Name des Angerufenen</b>"
-
-#: ../gtk/main.ui.h:2
-msgid "Send"
-msgstr "Senden"
-
-#: ../gtk/main.ui.h:3
-msgid "End conference"
-msgstr "Konferenz beenden"
-
-#: ../gtk/main.ui.h:7
-msgid "Record this call to an audio file"
-msgstr "Speichere den Anruf in eine Audio-Datei"
-
-#: ../gtk/main.ui.h:8
-msgid "Video"
-msgstr "Video"
-
-#: ../gtk/main.ui.h:10
-msgid "Mute"
-msgstr "Stumm"
-
-#: ../gtk/main.ui.h:11
-msgid "Transfer"
-msgstr "Vermittlung"
-
-#: ../gtk/main.ui.h:14
-msgid "In call"
-msgstr "Im Gespräch"
-
-#: ../gtk/main.ui.h:15
-msgid "Duration"
-msgstr "Dauer"
-
-#: ../gtk/main.ui.h:16
-msgid "Call quality rating"
-msgstr "Bewertung der Verbindungsqualität"
-
-#: ../gtk/main.ui.h:17
-msgid "All users"
-msgstr "Alle Teilnehmer"
-
-#: ../gtk/main.ui.h:18
-msgid "Online users"
-msgstr "Angemeldete Teilnehmer"
-
-#: ../gtk/main.ui.h:19
-msgid "ADSL"
-msgstr "ADSL"
-
-#: ../gtk/main.ui.h:20
-msgid "Fiber Channel"
-msgstr "Glasfaserkabel"
-
-#: ../gtk/main.ui.h:21
-msgid "Default"
-msgstr "Vorgabe"
-
-#: ../gtk/main.ui.h:22
-msgid "_Options"
-msgstr "_Optionen"
-
-#: ../gtk/main.ui.h:23
-msgid "Set configuration URI"
-msgstr "Konfigurations URI angeben"
-
-#: ../gtk/main.ui.h:24
-msgid "Always start video"
-msgstr "Video immer starten"
-
-#: ../gtk/main.ui.h:25
-msgid "Enable self-view"
-msgstr "Selbstansicht ein"
-
-#: ../gtk/main.ui.h:26
-msgid "_Help"
-msgstr "_Hilfe"
-
-#: ../gtk/main.ui.h:27
-msgid "Show debug window"
-msgstr "Debug-Fenster anzeigen"
-
-#: ../gtk/main.ui.h:28
-msgid "_Homepage"
-msgstr "_Homepage"
-
-#: ../gtk/main.ui.h:29
-msgid "Check _Updates"
-msgstr "Auf _Aktualisierungen überprüfen"
-
-#: ../gtk/main.ui.h:30
-msgid "Account assistant"
-msgstr "Konto-Einrichtungsassistent"
-
-#: ../gtk/main.ui.h:32
-msgid "SIP address or phone number:"
-msgstr "SIP-Adresse oder Telefonnummer:"
-
-#: ../gtk/main.ui.h:33
-msgid "Initiate a new call"
-msgstr "Einen neuen Anruf beginnen"
-
-#: ../gtk/main.ui.h:34
-msgid "Contacts"
-msgstr "Kontakte"
-
-#: ../gtk/main.ui.h:35
-msgid "Search"
-msgstr "Suchen"
-
-#: ../gtk/main.ui.h:36
-msgid "<b>Add contacts from directory</b>"
-msgstr "<b>Kontakte aus einem Verzeichnis hinzufügen</b>"
-
-#: ../gtk/main.ui.h:37
-msgid "Add contact"
-msgstr "Kontakt hinzufügen"
-
-#: ../gtk/main.ui.h:38
-msgid "Recent calls"
-msgstr "Letzte Gespräche"
-
-#: ../gtk/main.ui.h:39
-msgid "My current identity:"
-msgstr "Aktuelle Identität:"
-
-#: ../gtk/main.ui.h:40 ../gtk/tunnel_config.ui.h:7
-msgid "Username"
-msgstr "Benutzername"
-
-#: ../gtk/main.ui.h:41 ../gtk/tunnel_config.ui.h:8
-msgid "Password"
-msgstr "Passwort"
-
-#: ../gtk/main.ui.h:42
-msgid "Internet connection:"
-msgstr "Internetverbindung:"
-
-#: ../gtk/main.ui.h:43
-msgid "Automatically log me in"
-msgstr "Automatisch anmelden"
-
-#: ../gtk/main.ui.h:44 ../gtk/password.ui.h:3
-msgid "UserID"
-msgstr "Benutzer-ID"
-
-#: ../gtk/main.ui.h:45
-msgid "Login information"
-msgstr "Anmeldeinformationen"
-
-#: ../gtk/main.ui.h:46
-msgid "<b>Welcome !</b>"
-msgstr "<b>Willkommen !</b>"
-
-#: ../gtk/main.ui.h:47
-msgid "Delete"
-msgstr "Löschen"
-
-#: ../gtk/about.ui.h:1
-msgid "About linphone"
-msgstr "Über Linphone"
-
-#: ../gtk/about.ui.h:2
-msgid "(C) Belledonne Communications,2010\n"
-msgstr "(C) Belledonne Communications,2010\n"
-
-#: ../gtk/about.ui.h:4
-msgid "An internet video phone using the standard SIP (rfc3261) protocol."
-msgstr "Ein Internet-Video-Telefon, das das Standard-SIP-Protokoll (RFC3261) verwendet."
-
-#: ../gtk/about.ui.h:5
-msgid ""
-"fr: Simon Morlat\n"
-"en: Simon Morlat and Delphine Perreau\n"
-"it: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\n"
-"de: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\n"
-"sv: Daniel Nylander <po@danielnylander.se>\n"
-"es: Jesus Benitez <gnelson at inMail dot sk>\n"
-"ja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\n"
-"pt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\n"
-"pl: Robert Nasiadek <darkone@darkone.pl>\n"
-"cs: Petr Pisar <petr.pisar@atlas.cz>\n"
-"hu: anonymous\n"
-"he: Eli Zaretskii <eliz@gnu.org>\n"
-msgstr "fr: Simon Morlat\nen: Simon Morlat and Delphine Perreau\nit: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\nde: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\nsv: Daniel Nylander <po@danielnylander.se>\nes: Jesus Benitez <gnelson at inMail dot sk>\nja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\npt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\npl: Robert Nasiadek <darkone@darkone.pl>\ncs: Petr Pisar <petr.pisar@atlas.cz>\nhu: anonymous\nhe: Eli Zaretskii <eliz@gnu.org>\n"
-
-#: ../gtk/contact.ui.h:2
-msgid "SIP Address"
-msgstr "SIP-Adresse"
-
-#: ../gtk/contact.ui.h:3
-msgid "Show this contact presence status"
-msgstr "Anwesenheitsstatus dieses Kontakts zeigen"
-
-#: ../gtk/contact.ui.h:4
-msgid "Allow this contact to see my presence status"
-msgstr "Diesem Kontakt erlauben, meinen Anwesenheitsstatus zu sehen"
-
-#: ../gtk/contact.ui.h:5
-msgid "<b>Contact information</b>"
-msgstr "<b>Kontaktinformationen</b>"
-
-#: ../gtk/log.ui.h:1
-msgid "Linphone debug window"
-msgstr "Linphone Debug-Fenster"
-
-#: ../gtk/log.ui.h:2
-msgid "Scroll to end"
-msgstr "Ans Ende rollen"
-
-#: ../gtk/password.ui.h:1
-msgid "Linphone - Authentication required"
-msgstr "Linphone - Authentifikation erforderlich"
-
-#: ../gtk/password.ui.h:2
-msgid "Please enter the domain password"
-msgstr "Bitte das Passwort der Domäne eingeben"
-
-#: ../gtk/call_logs.ui.h:1
-msgid "Call history"
-msgstr "Anrufchronik"
-
-#: ../gtk/call_logs.ui.h:2
-msgid "Clear all"
-msgstr "Alle löschen"
-
-#: ../gtk/call_logs.ui.h:3
-msgid "Call back"
-msgstr "Anrufen"
-
-#: ../gtk/sip_account.ui.h:1
-msgid "Linphone - Configure a SIP account"
-msgstr "Linphone - SIP-Konto einrichten"
-
-#: ../gtk/sip_account.ui.h:2
-msgid "Your SIP identity:"
-msgstr "Ihre SIP-Identität:"
-
-#: ../gtk/sip_account.ui.h:3
-msgid "Looks like sip:<username>@<domain>"
-msgstr "Sieht aus wie sip:<benutzername>@<domain>"
-
-#: ../gtk/sip_account.ui.h:4
-msgid "sip:"
-msgstr "sip:"
-
-#: ../gtk/sip_account.ui.h:5
-msgid "SIP Proxy address:"
-msgstr "SIP-Proxy-Adresse:"
-
-#: ../gtk/sip_account.ui.h:6
-msgid "Looks like sip:<proxy hostname>"
-msgstr "Sieht aus wie sip:<proxy hostname>"
-
-#: ../gtk/sip_account.ui.h:7
-msgid "Registration duration (sec):"
-msgstr "Registrierungsdauer (sec):"
-
-#: ../gtk/sip_account.ui.h:8
-msgid "Contact params (optional):"
-msgstr "Kontaktdetails (optional)"
-
-#: ../gtk/sip_account.ui.h:9
-msgid "AVPF regular RTCP interval (sec):"
-msgstr "AVPF Standard RTCP Interval (sek):"
-
-#: ../gtk/sip_account.ui.h:10
-msgid "Route (optional):"
-msgstr "Route (optional):"
-
-#: ../gtk/sip_account.ui.h:11
-msgid "Transport"
-msgstr "Übertragung"
-
-#: ../gtk/sip_account.ui.h:12
-msgid "Register"
-msgstr "Registrieren"
-
-#: ../gtk/sip_account.ui.h:13
-msgid "Publish presence information"
-msgstr "Anwesenheitsstatus veröffentlichen"
-
-#: ../gtk/sip_account.ui.h:14
-msgid "Enable AVPF"
-msgstr "Aktiviere AVPF"
-
-#: ../gtk/sip_account.ui.h:15
-msgid "Configure a SIP account"
-msgstr "SIP-Konto einrichten"
-
-#: ../gtk/parameters.ui.h:1
-msgid "anonymous"
-msgstr "Anonym"
-
-#: ../gtk/parameters.ui.h:2
-msgid "GSSAPI"
-msgstr "GSSAPI"
-
-#: ../gtk/parameters.ui.h:3
-msgid "SASL"
-msgstr "SASL"
-
-#: ../gtk/parameters.ui.h:4
-msgid "default soundcard"
-msgstr "Standard-Soundkarte"
-
-#: ../gtk/parameters.ui.h:5
-msgid "a sound card"
-msgstr "eine Soundkarte"
-
-#: ../gtk/parameters.ui.h:6
-msgid "default camera"
-msgstr "Standard-Kamera"
-
-#: ../gtk/parameters.ui.h:7
-msgid "CIF"
-msgstr "CIF"
-
-#: ../gtk/parameters.ui.h:8
-msgid "Audio codecs"
-msgstr "Audio-Codecs"
-
-#: ../gtk/parameters.ui.h:9
-msgid "Video codecs"
-msgstr "Video-Codecs"
-
-#: ../gtk/parameters.ui.h:10 ../gtk/keypad.ui.h:5
-msgid "C"
-msgstr "C"
-
-#: ../gtk/parameters.ui.h:11
-msgid "SIP (UDP)"
-msgstr "SIP (UDP)"
-
-#: ../gtk/parameters.ui.h:12
-msgid "SIP (TCP)"
-msgstr "SIP (TCP)"
-
-#: ../gtk/parameters.ui.h:13
-msgid "SIP (TLS)"
-msgstr "SIP (TLS)"
-
-#: ../gtk/parameters.ui.h:14
-msgid "Settings"
-msgstr "Einstellungen"
-
-#: ../gtk/parameters.ui.h:15
-msgid "Set Maximum Transmission Unit:"
-msgstr "Maximum Transmission Unit setzen:"
-
-#: ../gtk/parameters.ui.h:16
-msgid "Send DTMFs as SIP info"
-msgstr "DTMFs als SIP-Info senden"
-
-#: ../gtk/parameters.ui.h:17
-msgid "Use IPv6 instead of IPv4"
-msgstr "IPv6 statt IPv4 verwenden"
-
-#: ../gtk/parameters.ui.h:18
-msgid "<b>Transport</b>"
-msgstr "<b>Übertragung</b>"
-
-#: ../gtk/parameters.ui.h:19
-msgid "Media encryption type"
-msgstr "Verschlüsselungstyp der Medien"
-
-#: ../gtk/parameters.ui.h:20
-msgid "Video RTP/UDP:"
-msgstr "Video RTP/UDP:"
-
-#: ../gtk/parameters.ui.h:21
-msgid "Audio RTP/UDP:"
-msgstr "Audio RTP/UDP:"
-
-#: ../gtk/parameters.ui.h:22
-msgid "Fixed"
-msgstr "Fest"
-
-#: ../gtk/parameters.ui.h:23
-msgid "Media encryption is mandatory"
-msgstr "Medienverschlüsselung erzwingen"
-
-#: ../gtk/parameters.ui.h:24
-msgid "Tunnel"
-msgstr "Tunnel"
-
-#: ../gtk/parameters.ui.h:25
-msgid "DSCP fields"
-msgstr "DSCP-Felder"
-
-#: ../gtk/parameters.ui.h:26
-msgid "SIP/TCP port"
-msgstr "SIP/TCP Port"
-
-#: ../gtk/parameters.ui.h:27
-msgid "SIP/UDP port"
-msgstr "SIP/UDP Port"
-
-#: ../gtk/parameters.ui.h:28
-msgid "<b>Network protocol and ports</b>"
-msgstr "<b>Netzwerkprotokoll und Ports</b>"
-
-#: ../gtk/parameters.ui.h:29
-msgid "Direct connection to the Internet"
-msgstr "Direkte Verbindung ins Internet"
-
-#: ../gtk/parameters.ui.h:30
-msgid "Behind NAT / Firewall (specify gateway IP )"
-msgstr "Hinter NAT / Firewall (Gateway IP angeben)"
-
-#: ../gtk/parameters.ui.h:31
-msgid "Behind NAT / Firewall (use STUN to resolve)"
-msgstr "Hinter NAT / Firewall (STUN verwenden)"
-
-#: ../gtk/parameters.ui.h:32
-msgid "Behind NAT / Firewall (use ICE)"
-msgstr "Hinter NAT / Firewall (ICE verwenden)"
-
-#: ../gtk/parameters.ui.h:33
-msgid "Behind NAT / Firewall (use uPnP)"
-msgstr "Hinter NAT / Firewall (uPnP verwenden)"
-
-#: ../gtk/parameters.ui.h:34
-msgid "Public IP address:"
-msgstr "Öffentliche IP-Adresse:"
-
-#: ../gtk/parameters.ui.h:35
-msgid "Stun server:"
-msgstr "STUN-Server:"
-
-#: ../gtk/parameters.ui.h:36
-msgid "<b>NAT and Firewall</b>"
-msgstr "<b>NAT und Firewall</b>"
-
-#: ../gtk/parameters.ui.h:37
-msgid "Network settings"
-msgstr "Netzwerkeinstellungen"
-
-#: ../gtk/parameters.ui.h:38
-msgid "Ring sound:"
-msgstr "Klingelton:"
-
-#: ../gtk/parameters.ui.h:39
-msgid "ALSA special device (optional):"
-msgstr "Spezielles ALSA-Gerät (optional):"
-
-#: ../gtk/parameters.ui.h:40
-msgid "Capture device:"
-msgstr "Aufnahmegerät:"
-
-#: ../gtk/parameters.ui.h:41
-msgid "Ring device:"
-msgstr "Gerät für Klingelton:"
-
-#: ../gtk/parameters.ui.h:42
-msgid "Playback device:"
-msgstr "Wiedergabegerät:"
-
-#: ../gtk/parameters.ui.h:43
-msgid "Enable echo cancellation"
-msgstr "Echounterdrückung ein"
-
-#: ../gtk/parameters.ui.h:44
-msgid "<b>Audio</b>"
-msgstr "<b>Audio</b>"
-
-#: ../gtk/parameters.ui.h:45
-msgid "Video input device:"
-msgstr "Video-Aufnahmegerät:"
-
-#: ../gtk/parameters.ui.h:46
-msgid "Prefered video resolution:"
-msgstr "Bevorzugte Video-Auflösung:"
-
-#: ../gtk/parameters.ui.h:47
-msgid "Video output method:"
-msgstr "Methode zur Videoausgabe"
-
-#: ../gtk/parameters.ui.h:48
-msgid "<b>Video</b>"
-msgstr "<b>Video</b>"
-
-#: ../gtk/parameters.ui.h:49
-msgid "Multimedia settings"
-msgstr "Multimedia-Einstellungen"
-
-#: ../gtk/parameters.ui.h:50
-msgid "This section defines your SIP address when not using a SIP account"
-msgstr "In diesem Bereich legen Sie Ihre SIP-Adresse fest, wenn Sie kein SIP-Konto verwenden."
-
-#: ../gtk/parameters.ui.h:51
-msgid "Your display name (eg: John Doe):"
-msgstr "Ihr angezeigter Name (z. B. Heinz Müller):"
-
-#: ../gtk/parameters.ui.h:52
-msgid "Your username:"
-msgstr "Ihr Benutzername:"
-
-#: ../gtk/parameters.ui.h:53
-msgid "Your resulting SIP address:"
-msgstr "Sich ergebende SIP-Adresse:"
-
-#: ../gtk/parameters.ui.h:54
-msgid "<b>Default identity</b>"
-msgstr "<b>Standard-Identität</b>"
-
-#: ../gtk/parameters.ui.h:55
-msgid "Wizard"
-msgstr "Assistent"
-
-#: ../gtk/parameters.ui.h:56
-msgid "Add"
-msgstr "Hinzufügen"
-
-#: ../gtk/parameters.ui.h:57
-msgid "Edit"
-msgstr "Bearbeiten"
-
-#: ../gtk/parameters.ui.h:58
-msgid "Remove"
-msgstr "Entfernen"
-
-#: ../gtk/parameters.ui.h:59
-msgid "<b>Proxy accounts</b>"
-msgstr "<b>Proxy-Konten</b>"
-
-#: ../gtk/parameters.ui.h:60
-msgid "Erase all passwords"
-msgstr "Alle Passwörter löschen"
-
-#: ../gtk/parameters.ui.h:61
-msgid "<b>Privacy</b>"
-msgstr "<b>Privatsphäre</b>"
-
-#: ../gtk/parameters.ui.h:62
-msgid "Manage SIP Accounts"
-msgstr "SIP-Konten verwalten"
-
-#: ../gtk/parameters.ui.h:63 ../gtk/tunnel_config.ui.h:4
-msgid "Enable"
-msgstr "Freigeben"
-
-#: ../gtk/parameters.ui.h:64 ../gtk/tunnel_config.ui.h:5
-msgid "Disable"
-msgstr "Sperren"
-
-#: ../gtk/parameters.ui.h:65
-msgid "<b>Codecs</b>"
-msgstr "<b>Codecs</b>"
-
-#: ../gtk/parameters.ui.h:66
-msgid "0 stands for \"unlimited\""
-msgstr "0 bedeutet „unbegrenzt“"
-
-#: ../gtk/parameters.ui.h:67
-msgid "Upload speed limit in Kbit/sec:"
-msgstr "Upload-Bandbreite (kbit/sec):"
-
-#: ../gtk/parameters.ui.h:68
-msgid "Download speed limit in Kbit/sec:"
-msgstr "Download-Bandbreite (kbit/sec):"
-
-#: ../gtk/parameters.ui.h:69
-msgid "Enable adaptive rate control"
-msgstr "Adaptive Ratenregelung ein"
-
-#: ../gtk/parameters.ui.h:70
-msgid ""
-"<i>Adaptive rate control is a technique to dynamically guess the available "
-"bandwidth during a call.</i>"
-msgstr "<i>Adaptive Ratenregelung ist eine Technik zur dynamischen Abschätzung der zur Verfügung stehenden Bandbreite während eines Anrufs.</i>"
-
-#: ../gtk/parameters.ui.h:71
-msgid "<b>Bandwidth control</b>"
-msgstr "<b>Bandbreiten-Einstellungen</b>"
-
-#: ../gtk/parameters.ui.h:72
-msgid "Codecs"
-msgstr "Codecs"
-
-#: ../gtk/parameters.ui.h:73
-msgid "<b>Language</b>"
-msgstr "<b>Sprache</b>"
-
-#: ../gtk/parameters.ui.h:74
-msgid "Show advanced settings"
-msgstr "Fortgeschrittene Einstellungen anzeigen"
-
-#: ../gtk/parameters.ui.h:75
-msgid "<b>Level</b>"
-msgstr "<b>Detaillierung</b>"
-
-#: ../gtk/parameters.ui.h:76
-msgid "User interface"
-msgstr "Benutzeroberfläche"
-
-#: ../gtk/parameters.ui.h:77 ../gtk/ldap.ui.h:2
-msgid "Server address:"
-msgstr "Server-Adresse"
-
-#: ../gtk/parameters.ui.h:78 ../gtk/ldap.ui.h:3
-msgid "Authentication method:"
-msgstr "Authentifizierungsmethode"
-
-#: ../gtk/parameters.ui.h:80
-msgid "label"
-msgstr "Hinweisschild"
-
-#: ../gtk/parameters.ui.h:81
-msgid "<b>LDAP Account setup</b>"
-msgstr "LDAP-Kontoeinrichtung"
-
-#: ../gtk/parameters.ui.h:82
-msgid "LDAP"
-msgstr "LDAP"
-
-#: ../gtk/parameters.ui.h:83
-msgid "Done"
-msgstr "Fertig"
-
-#: ../gtk/buddylookup.ui.h:1
-msgid "Search contacts in directory"
-msgstr "Kontakte im Verzeichnis suchen"
-
-#: ../gtk/buddylookup.ui.h:2
-msgid "Add to my list"
-msgstr "Zur Kontaktliste hinzufügen"
-
-#: ../gtk/buddylookup.ui.h:3
-msgid "<b>Search somebody</b>"
-msgstr "<b>Kontaktsuche</b>"
-
-#: ../gtk/waiting.ui.h:1
-msgid "Linphone"
-msgstr "Linphone"
-
-#: ../gtk/waiting.ui.h:2
-msgid "Please wait"
-msgstr "Bitte warten"
-
-#: ../gtk/dscp_settings.ui.h:1
-msgid "DSCP settings"
-msgstr "DSCP-Einstellungen"
-
-#: ../gtk/dscp_settings.ui.h:2
-msgid "SIP"
-msgstr "SIP"
-
-#: ../gtk/dscp_settings.ui.h:3
-msgid "Audio RTP stream"
-msgstr "Audio-RTP-Datenstrom"
-
-#: ../gtk/dscp_settings.ui.h:4
-msgid "Video RTP stream"
-msgstr "Video-RTP-Datenstrom"
-
-#: ../gtk/dscp_settings.ui.h:5
-msgid "<b>Set DSCP values (in hexadecimal)</b>"
-msgstr "<b>DSCP-Werte setzen (hexadezimal)</b>"
-
-#: ../gtk/call_statistics.ui.h:1
-msgid "Call statistics"
-msgstr "Anrufstatistik"
-
-#: ../gtk/call_statistics.ui.h:2
-msgid "Audio codec"
-msgstr "Audio-Codec"
-
-#: ../gtk/call_statistics.ui.h:3
-msgid "Video codec"
-msgstr "Video-Codec"
-
-#: ../gtk/call_statistics.ui.h:4
-msgid "Audio IP bandwidth usage"
-msgstr "Genutzte IP-Bandbreite Audio"
-
-#: ../gtk/call_statistics.ui.h:5
-msgid "Audio Media connectivity"
-msgstr "Audio-Konnektivität"
-
-#: ../gtk/call_statistics.ui.h:6
-msgid "Video IP bandwidth usage"
-msgstr "Genutzte IP-Bandbreite Video"
-
-#: ../gtk/call_statistics.ui.h:7
-msgid "Video Media connectivity"
-msgstr "Video-Konnektivität"
-
-#: ../gtk/call_statistics.ui.h:8
-msgid "Round trip time"
-msgstr "Umlaufzeit"
-
-#: ../gtk/call_statistics.ui.h:9
-msgid "Video resolution received"
-msgstr "Videoauflösung empfangen"
-
-#: ../gtk/call_statistics.ui.h:10
-msgid "Video resolution sent"
-msgstr "Videoauflösung gesendet"
-
-#: ../gtk/call_statistics.ui.h:11
-msgid "RTP profile"
-msgstr "RTP-Profil"
-
-#: ../gtk/call_statistics.ui.h:12
-msgid "<b>Call statistics and information</b>"
-msgstr "<b>Anrufstatistik und -informationen</b>"
-
-#: ../gtk/tunnel_config.ui.h:1
-msgid "Configure VoIP tunnel"
-msgstr "VoIP-Tunnel einrichten"
-
-#: ../gtk/tunnel_config.ui.h:2
-msgid "Host"
-msgstr "Host"
-
-#: ../gtk/tunnel_config.ui.h:3
-msgid "Port"
-msgstr "Port"
-
-#: ../gtk/tunnel_config.ui.h:6
-msgid "<b>Configure tunnel</b>"
-msgstr "<b>Tunnel einrichten</b>"
-
-#: ../gtk/tunnel_config.ui.h:9
-msgid "<b>Configure http proxy (optional)</b>"
-msgstr "<b>Configure http proxy (optional)</b>"
-
-#: ../gtk/keypad.ui.h:1
-msgid "D"
-msgstr "D"
-
-#: ../gtk/keypad.ui.h:2
-msgid "#"
-msgstr "#"
-
-#: ../gtk/keypad.ui.h:3
-msgid "0"
-msgstr "0"
-
-#: ../gtk/keypad.ui.h:4
-msgid "*"
-msgstr "*"
-
-#: ../gtk/keypad.ui.h:6
-msgid "9"
-msgstr "9"
-
-#: ../gtk/keypad.ui.h:7
-msgid "8"
-msgstr "8"
-
-#: ../gtk/keypad.ui.h:8
-msgid "7"
-msgstr "7"
-
-#: ../gtk/keypad.ui.h:9
-msgid "B"
-msgstr "B"
-
-#: ../gtk/keypad.ui.h:10
-msgid "6"
-msgstr "6"
-
-#: ../gtk/keypad.ui.h:11
-msgid "5"
-msgstr "5"
-
-#: ../gtk/keypad.ui.h:12
-msgid "4"
-msgstr "4"
-
-#: ../gtk/keypad.ui.h:13
-msgid "A"
-msgstr "A"
-
-#: ../gtk/keypad.ui.h:14
-msgid "3"
-msgstr "3"
-
-#: ../gtk/keypad.ui.h:15
-msgid "2"
-msgstr "2"
-
-#: ../gtk/keypad.ui.h:16
-msgid "1"
-msgstr "1"
-
-#: ../gtk/ldap.ui.h:1
-msgid "LDAP Settings"
-msgstr "LDAP-Einstellungen"
-
-#: ../gtk/ldap.ui.h:6
-msgid "Use TLS Connection"
-msgstr "TLS-Verbindung verwenden"
-
-#: ../gtk/ldap.ui.h:7
-msgid "Not yet available"
-msgstr "Aktuell nicht verfügbar"
-
-#: ../gtk/ldap.ui.h:8
-msgid "<b>Connection</b>"
-msgstr "<b>Verbindung</b>"
-
-#: ../gtk/ldap.ui.h:9
-msgid "Bind DN"
-msgstr "Bind-DN"
-
-#: ../gtk/ldap.ui.h:10
-msgid "Authname"
-msgstr "Authentifizierungsname"
-
-#: ../gtk/ldap.ui.h:11
-msgid "Realm"
-msgstr "Bereich"
-
-#: ../gtk/ldap.ui.h:12
-msgid "<b>SASL</b>"
-msgstr "<b>SASL</b>"
-
-#: ../gtk/ldap.ui.h:13
-msgid "Base object:"
-msgstr "Basis-Objekt:"
-
-#: ../gtk/ldap.ui.h:15
-#, no-c-format
-msgid "Filter (%s for name):"
-msgstr "Filter (%s nach Name):"
-
-#: ../gtk/ldap.ui.h:16
-msgid "Name Attribute:"
-msgstr "Name:"
-
-#: ../gtk/ldap.ui.h:17
-msgid "SIP address attribute:"
-msgstr "SIP-Adresse:"
-
-#: ../gtk/ldap.ui.h:18
-msgid "Attributes to query:"
-msgstr "Sucheigenschaft:"
-
-#: ../gtk/ldap.ui.h:19
-msgid "<b>Search</b>"
-msgstr "<b>Suche</b>"
-
-#: ../gtk/ldap.ui.h:20
-msgid "Timeout for search:"
-msgstr "Zeitüberschreitung bei der Suche:"
-
-#: ../gtk/ldap.ui.h:21
-msgid "Max results:"
-msgstr "Max Ergebnisse:"
-
-#: ../gtk/ldap.ui.h:22
-msgid "Follow Aliases"
-msgstr "folge Pseudonymen"
-
-#: ../gtk/ldap.ui.h:23
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>Sonstiges</b>"
-
-#: ../gtk/ldap.ui.h:24
-msgid "ANONYMOUS"
-msgstr "ANONYMOUS"
-
-#: ../gtk/ldap.ui.h:25
-msgid "SIMPLE"
-msgstr "SIMPLE"
-
-#: ../gtk/ldap.ui.h:26
-msgid "DIGEST-MD5"
-msgstr "DIGEST-MD5"
-
-#: ../gtk/ldap.ui.h:27
-msgid "NTLM"
-msgstr "NTLM"
-
-#: ../gtk/config-uri.ui.h:1
-msgid "Specifying a remote configuration URI"
-msgstr "Eine URI zur FErnkonfiguration angeben"
-
-#: ../gtk/config-uri.ui.h:2
-msgid ""
-"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
-msgstr "Diese Maske erlaubt Ihnen für das Laden der Konfiguration beim Programmstart eine http- oder https-Adresse anzugeben.\nBitte geben Sie unten die Konfigurations-URI ein oder ändern diese. Nach dem Bestätigen mit OK wird Linphone automatisch neustarten, um die neuen Einstellungen zu übernehmen."
-
-#: ../gtk/config-uri.ui.h:4
-msgid "https://"
-msgstr "https://"
-
-#: ../gtk/provisioning-fetch.ui.h:1
-msgid "Configuring..."
-msgstr "Einstellen..."
-
-#: ../gtk/provisioning-fetch.ui.h:2
-msgid "Please wait while fetching configuration from server..."
-msgstr "Bitte warten Sie während die Einstellungen vom Server abgerufen werden..."
-
-#: ../coreapi/linphonecore.c:1511
-msgid "Ready"
-msgstr "Bereit"
-
-#: ../coreapi/linphonecore.c:2470
-msgid "Configuring"
-msgstr "Einstellen"
-
-#: ../coreapi/linphonecore.c:2635
-msgid "Looking for telephone number destination..."
-msgstr "Telefonnummernziel wird gesucht..."
-
-#: ../coreapi/linphonecore.c:2637
-msgid "Could not resolve this number."
-msgstr "Diese Nummer kann nicht aufgelöst werden."
-
-#. must be known at that time
-#: ../coreapi/linphonecore.c:2919
-msgid "Contacting"
-msgstr "Verbindungsaufbau"
-
-#: ../coreapi/linphonecore.c:2924
-msgid "Could not call"
-msgstr "Anruf kann nicht getätigt werden."
-
-#: ../coreapi/linphonecore.c:3074
-msgid "Sorry, we have reached the maximum number of simultaneous calls"
-msgstr "Die maximale Anzahl der gleichzeitigen Anrufe ist erreicht."
-
-#: ../coreapi/linphonecore.c:3233
-msgid "is contacting you"
-msgstr "ruft Sie an"
-
-#: ../coreapi/linphonecore.c:3234
-msgid " and asked autoanswer."
-msgstr " und fragt nach automatischer Antwort."
-
-#: ../coreapi/linphonecore.c:3234
-msgid "."
-msgstr "."
-
-#: ../coreapi/linphonecore.c:3352
-msgid "Modifying call parameters..."
-msgstr "Die Anrufparameter werden verändert..."
-
-#: ../coreapi/linphonecore.c:3700
-msgid "Connected."
-msgstr "Verbunden."
-
-#: ../coreapi/linphonecore.c:3725
-msgid "Call aborted"
-msgstr "Anruf abgebrochen"
-
-#: ../coreapi/linphonecore.c:3915
-msgid "Could not pause the call"
-msgstr "Anruf kann nicht gehalten werden"
-
-#: ../coreapi/linphonecore.c:3919
-msgid "Pausing the current call..."
-msgstr "Aktueller Anruf wird gehalten..."
-
-#: ../coreapi/misc.c:438
-msgid "Stun lookup in progress..."
-msgstr "STUN-Ermittlung läuft..."
-
-#: ../coreapi/misc.c:619
-msgid "ICE local candidates gathering in progress..."
-msgstr "Lokale Kandidaten für ICE werden zusammengestellt..."
-
-#: ../coreapi/friend.c:33
-msgid "Online"
-msgstr "Angemeldet"
-
-#: ../coreapi/friend.c:36
-msgid "Busy"
-msgstr "Besetzt"
-
-#: ../coreapi/friend.c:39
-msgid "Be right back"
-msgstr "Bald wieder da"
-
-#: ../coreapi/friend.c:42
-msgid "Away"
-msgstr "Abwesend"
-
-#: ../coreapi/friend.c:45
-msgid "On the phone"
-msgstr "Im Gespräch"
-
-#: ../coreapi/friend.c:48
-msgid "Out to lunch"
-msgstr "Beim Essen"
-
-#: ../coreapi/friend.c:51
-msgid "Do not disturb"
-msgstr "Nicht stören"
-
-#: ../coreapi/friend.c:54
-msgid "Moved"
-msgstr "Umgezogen"
-
-#: ../coreapi/friend.c:57
-msgid "Using another messaging service"
-msgstr "Ein anderer Nachrichtendienst wird benutzt"
-
-#: ../coreapi/friend.c:60
-msgid "Offline"
-msgstr "Abgemeldet"
-
-#: ../coreapi/friend.c:63
-msgid "Pending"
-msgstr "Ausstehend"
-
-#: ../coreapi/friend.c:66
-msgid "Vacation"
-msgstr "Urlaub"
-
-#: ../coreapi/friend.c:68
-msgid "Unknown-bug"
-msgstr "Unbekannter Fehler"
-
-#: ../coreapi/proxy.c:319
-msgid ""
-"The sip proxy address you entered is invalid, it must start with \"sip:\" "
-"followed by a hostname."
-msgstr "Die von Ihnen eingegebene SIP-Proxy-Adresse ist ungültig, sie muss mit „sip:“ gefolgt vom Hostnamen beginnen."
-
-#: ../coreapi/proxy.c:325
-msgid ""
-"The sip identity you entered is invalid.\n"
-"It should look like sip:username@proxydomain, such as sip:alice@example.net"
-msgstr "Die von Ihnen eingegebene SIP-Identität ist ungültig.\nSie sollte wie sip:benutzername@proxydomain aussehen, also z.B. sip:alice@beispiel.net"
-
-#: ../coreapi/proxy.c:1377
-#, c-format
-msgid "Could not login as %s"
-msgstr "Anmeldung als %s fehlgeschlagen"
-
-#: ../coreapi/callbacks.c:383
-msgid "Remote ringing."
-msgstr "Klingeln bei der Gegenseite."
-
-#: ../coreapi/callbacks.c:404
-msgid "Remote ringing..."
-msgstr "Klingeln bei der Gegenseite..."
-
-#: ../coreapi/callbacks.c:414
-msgid "Early media."
-msgstr "nicht kompatibel, prüfe Codecs oder Sicherheitseinstellungen..."
-
-#: ../coreapi/callbacks.c:475
-#, c-format
-msgid "Call with %s is paused."
-msgstr "Anruf mit %s wird gehalten."
-
-#: ../coreapi/callbacks.c:488
-#, c-format
-msgid "Call answered by %s - on hold."
-msgstr "Der von %s entgegengenommene Anruf wird gehalten."
-
-#: ../coreapi/callbacks.c:498
-msgid "Call resumed."
-msgstr "Anruf fortgesetzt."
-
-#: ../coreapi/callbacks.c:502
-#, c-format
-msgid "Call answered by %s."
-msgstr "Anruf wird von %s entgegengenommen."
-
-#: ../coreapi/callbacks.c:525
-msgid "Incompatible, check codecs or security settings..."
-msgstr "Inkompatibel, prüfe Codecs oder Sicherheitseinstellungen..."
-
-#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:826
-msgid "Incompatible media parameters."
-msgstr "Inkompatible Medienparameter."
-
-#: ../coreapi/callbacks.c:560
-msgid "We have been resumed."
-msgstr "Anruf wird fortgesetzt."
-
-#. we are being paused
-#: ../coreapi/callbacks.c:568
-msgid "We are paused by other party."
-msgstr "Anruf wird von der Gegenseite gehalten."
-
-#. reINVITE and in-dialogs UPDATE go here
-#: ../coreapi/callbacks.c:602
-msgid "Call is updated by remote."
-msgstr "Anruf ist von der Gegenseite aktualisiert worden."
-
-#: ../coreapi/callbacks.c:705
-msgid "Call terminated."
-msgstr "Anruf beendet."
-
-#: ../coreapi/callbacks.c:733
-msgid "User is busy."
-msgstr "Teilnehmer ist besetzt."
-
-#: ../coreapi/callbacks.c:734
-msgid "User is temporarily unavailable."
-msgstr "Teilnehmer zur Zeit nicht verfügbar."
-
-#. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:736
-msgid "User does not want to be disturbed."
-msgstr "Teilnehmer möchte nicht gestört werden."
-
-#: ../coreapi/callbacks.c:737
-msgid "Call declined."
-msgstr "Anruf abgewiesen"
-
-#: ../coreapi/callbacks.c:752
-msgid "Request timeout."
-msgstr "Zeitüberschreitung bei der Anfrage"
-
-#: ../coreapi/callbacks.c:780
-msgid "Redirected"
-msgstr "Umgeleitet"
-
-#: ../coreapi/callbacks.c:835
-msgid "Call failed."
-msgstr "Anruf fehlgeschlagen."
-
-#: ../coreapi/callbacks.c:913
-#, c-format
-msgid "Registration on %s successful."
-msgstr "Registrierung auf %s erfolgreich."
-
-#: ../coreapi/callbacks.c:914
-#, c-format
-msgid "Unregistration on %s done."
-msgstr "Abmeldung von %s ist erfolgt."
-
-#: ../coreapi/callbacks.c:932
-msgid "no response timeout"
-msgstr "Zeitüberschreitung bei der Antwort"
-
-#: ../coreapi/callbacks.c:935
-#, c-format
-msgid "Registration on %s failed: %s"
-msgstr "Registrierung auf %s fehlgeschlagen: %s"
-
-#: ../coreapi/callbacks.c:942
-msgid "Service unavailable, retrying"
-msgstr "Service nicht verfügbar, versuche erneut"
-
-#: ../coreapi/linphonecall.c:174
-#, c-format
-msgid "Authentication token is %s"
-msgstr "Authentifizierungs-Token ist %s"
-
-#: ../coreapi/linphonecall.c:3020
-#, c-format
-msgid "You have missed %i call."
-msgid_plural "You have missed %i calls."
-msgstr[0] "Sie haben %i Anruf in Abwesenheit."
-msgstr[1] "Sie haben %i Anrufe in Abwesenheit."
diff --git a/po/es.po b/po/es.po
index 366c345de..a1d349dcf 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-19 10:39+0100\n"
 "PO-Revision-Date: 2014-11-19 10:17+0000\n"
-"Last-Translator: Cqnqrd <gautier.pelloux@gmail.com>\n"
+"Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/linphone-gtk/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/po/fr.po b/po/fr.po
index 173b4b260..ce23e2726 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -3,15 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Cqnqrd <gautier.pelloux@gmail.com>, 2014
+# Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>, 2014
+# Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>, 2014
+# Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>, 2014
 # Simon Morlat <simon.morlat@linphone.org>, 2001
 msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-19 10:39+0100\n"
-"PO-Revision-Date: 2014-11-19 18:33+0000\n"
-"Last-Translator: Cqnqrd <gautier.pelloux@gmail.com>\n"
+"PO-Revision-Date: 2014-11-27 15:47+0000\n"
+"Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/linphone-gtk/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -67,7 +69,7 @@ msgstr[1] "%i secondes"
 #: ../gtk/calllogs.c:335 ../gtk/calllogs.c:341
 #, c-format
 msgid "<big><b>%s</b></big>\t%s"
-msgstr ""
+msgstr "<big><b>%s</b></big>\t%s"
 
 #: ../gtk/calllogs.c:337
 #, c-format
@@ -81,7 +83,7 @@ msgstr "<small><i>%s</i>\t<i>Qualité: %s</i></small>\n%s\t%s\t"
 msgid ""
 "<small><i>%s</i></small>\t\n"
 "%s"
-msgstr ""
+msgstr "<small><i>%s</i></small>\t\n%s"
 
 #: ../gtk/conference.c:38 ../gtk/main.ui.h:13
 msgid "Conference"
@@ -233,7 +235,7 @@ msgstr "Appeler"
 
 #: ../gtk/friendlist.c:726
 msgid "Chat"
-msgstr ""
+msgstr "Chat"
 
 #: ../gtk/friendlist.c:756
 #, c-format
@@ -483,7 +485,7 @@ msgstr "Mot de passe: (*)"
 
 #: ../gtk/setupwizard.c:322
 msgid "Email: (*)"
-msgstr ""
+msgstr "Email : (*)"
 
 #: ../gtk/setupwizard.c:324
 msgid "Confirm your password: (*)"
@@ -491,7 +493,7 @@ msgstr "Confirmez votre mot de passe: (*)"
 
 #: ../gtk/setupwizard.c:338
 msgid "Keep me informed with linphone updates"
-msgstr ""
+msgstr "Me tenir informer des mises à jour de Linphone "
 
 #: ../gtk/setupwizard.c:394
 msgid ""
@@ -617,12 +619,12 @@ msgstr ""
 #: ../gtk/incall_view.c:272 ../gtk/incall_view.c:274
 #, c-format
 msgid "%ix%i @ %f fps"
-msgstr ""
+msgstr "%ix%i @ %f fps"
 
 #: ../gtk/incall_view.c:304
 #, c-format
 msgid "%.3f seconds"
-msgstr ""
+msgstr "%.3f secondes"
 
 #: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12
 msgid "Hang up"
@@ -727,7 +729,7 @@ msgstr "Pause"
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
-msgstr ""
+msgstr "<small><i>Enregistrement dans\n%s %s</i></small>"
 
 #: ../gtk/incall_view.c:948
 msgid "(Paused)"
@@ -750,19 +752,19 @@ msgstr "Le chargement de la configuration depuis %s a échoué."
 
 #: ../gtk/audio_assistant.c:98
 msgid "No voice detected"
-msgstr ""
+msgstr "Voix non détectée"
 
 #: ../gtk/audio_assistant.c:99
 msgid "Too low"
-msgstr ""
+msgstr "Trop bas"
 
 #: ../gtk/audio_assistant.c:100
 msgid "Good"
-msgstr ""
+msgstr "Bien"
 
 #: ../gtk/audio_assistant.c:101
 msgid "Too loud"
-msgstr ""
+msgstr "Trop bruyant"
 
 #: ../gtk/audio_assistant.c:318
 msgid ""
@@ -872,11 +874,11 @@ msgstr "En ligne"
 
 #: ../gtk/main.ui.h:19
 msgid "ADSL"
-msgstr ""
+msgstr "ADSL"
 
 #: ../gtk/main.ui.h:20
 msgid "Fiber Channel"
-msgstr ""
+msgstr "Fibre optique"
 
 #: ../gtk/main.ui.h:21
 msgid "Default"
@@ -884,7 +886,7 @@ msgstr "Par défaut"
 
 #: ../gtk/main.ui.h:22
 msgid "_Options"
-msgstr ""
+msgstr "_Options"
 
 #: ../gtk/main.ui.h:23
 msgid "Set configuration URI"
@@ -968,7 +970,7 @@ msgstr "Me connecter automatiquement"
 
 #: ../gtk/main.ui.h:44 ../gtk/password.ui.h:3
 msgid "UserID"
-msgstr ""
+msgstr "ID utilisateur"
 
 #: ../gtk/main.ui.h:45
 msgid "Login information"
@@ -988,7 +990,7 @@ msgstr "A propos de linphone"
 
 #: ../gtk/about.ui.h:2
 msgid "(C) Belledonne Communications,2010\n"
-msgstr ""
+msgstr "(C) Belledonne Communications, 2010\n"
 
 #: ../gtk/about.ui.h:4
 msgid "An internet video phone using the standard SIP (rfc3261) protocol."
@@ -1008,7 +1010,7 @@ msgid ""
 "cs: Petr Pisar <petr.pisar@atlas.cz>\n"
 "hu: anonymous\n"
 "he: Eli Zaretskii <eliz@gnu.org>\n"
-msgstr ""
+msgstr "fr: Simon Morlat\nen: Simon Morlat and Delphine Perreau\nit: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\nde: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\nsv: Daniel Nylander <po@danielnylander.se>\nes: Jesus Benitez <gnelson at inMail dot sk>\nja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\npt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\npl: Robert Nasiadek <darkone@darkone.pl>\ncs: Petr Pisar <petr.pisar@atlas.cz>\nhu: anonymous\nhe: Eli Zaretskii <eliz@gnu.org>\n"
 
 #: ../gtk/contact.ui.h:2
 msgid "SIP Address"
@@ -1032,7 +1034,7 @@ msgstr "Fenêtre de débogage de linphone"
 
 #: ../gtk/log.ui.h:2
 msgid "Scroll to end"
-msgstr ""
+msgstr "Défiler jusqu'à la fin"
 
 #: ../gtk/password.ui.h:1
 msgid "Linphone - Authentication required"
@@ -1068,7 +1070,7 @@ msgstr "De la forme sip:<username>@<domain>"
 
 #: ../gtk/sip_account.ui.h:4
 msgid "sip:"
-msgstr ""
+msgstr "sip:"
 
 #: ../gtk/sip_account.ui.h:5
 msgid "SIP Proxy address:"
@@ -1116,11 +1118,11 @@ msgstr "Configurer un compte SIP"
 
 #: ../gtk/parameters.ui.h:1
 msgid "anonymous"
-msgstr ""
+msgstr "anonyme"
 
 #: ../gtk/parameters.ui.h:2
 msgid "GSSAPI"
-msgstr ""
+msgstr "GSSAPI"
 
 #: ../gtk/parameters.ui.h:3
 msgid "SASL"
@@ -1140,7 +1142,7 @@ msgstr "camera par défaut"
 
 #: ../gtk/parameters.ui.h:7
 msgid "CIF"
-msgstr ""
+msgstr "CIF"
 
 #: ../gtk/parameters.ui.h:8
 msgid "Audio codecs"
@@ -1152,19 +1154,19 @@ msgstr "Codecs vidéo"
 
 #: ../gtk/parameters.ui.h:10 ../gtk/keypad.ui.h:5
 msgid "C"
-msgstr ""
+msgstr "C"
 
 #: ../gtk/parameters.ui.h:11
 msgid "SIP (UDP)"
-msgstr ""
+msgstr "SIP (UDP)"
 
 #: ../gtk/parameters.ui.h:12
 msgid "SIP (TCP)"
-msgstr ""
+msgstr "SIP (TCP)"
 
 #: ../gtk/parameters.ui.h:13
 msgid "SIP (TLS)"
-msgstr ""
+msgstr "SIP (TLS)"
 
 #: ../gtk/parameters.ui.h:14
 msgid "Settings"
@@ -1192,11 +1194,11 @@ msgstr "Type d'encryption media"
 
 #: ../gtk/parameters.ui.h:20
 msgid "Video RTP/UDP:"
-msgstr ""
+msgstr "Vidéo RTP / UDP :"
 
 #: ../gtk/parameters.ui.h:21
 msgid "Audio RTP/UDP:"
-msgstr ""
+msgstr "Audio RTP / UDP :"
 
 #: ../gtk/parameters.ui.h:22
 msgid "Fixed"
@@ -1204,11 +1206,11 @@ msgstr "Fixe"
 
 #: ../gtk/parameters.ui.h:23
 msgid "Media encryption is mandatory"
-msgstr ""
+msgstr "Le chiffrement media est obligatoire"
 
 #: ../gtk/parameters.ui.h:24
 msgid "Tunnel"
-msgstr ""
+msgstr "Tunnel"
 
 #: ../gtk/parameters.ui.h:25
 msgid "DSCP fields"
@@ -1216,11 +1218,11 @@ msgstr "Champs DSCP"
 
 #: ../gtk/parameters.ui.h:26
 msgid "SIP/TCP port"
-msgstr ""
+msgstr "Port SIP / TCP"
 
 #: ../gtk/parameters.ui.h:27
 msgid "SIP/UDP port"
-msgstr ""
+msgstr "Port SIP / UDP"
 
 #: ../gtk/parameters.ui.h:28
 msgid "<b>Network protocol and ports</b>"
@@ -1268,7 +1270,7 @@ msgstr "Sonnerie:"
 
 #: ../gtk/parameters.ui.h:39
 msgid "ALSA special device (optional):"
-msgstr ""
+msgstr "Appareil ALSA spécifique (optionnel) :"
 
 #: ../gtk/parameters.ui.h:40
 msgid "Capture device:"
@@ -1402,7 +1404,7 @@ msgstr "<b>Gestion de la bande passante</b>"
 
 #: ../gtk/parameters.ui.h:72
 msgid "Codecs"
-msgstr ""
+msgstr "Codecs"
 
 #: ../gtk/parameters.ui.h:73
 msgid "<b>Language</b>"
@@ -1430,7 +1432,7 @@ msgstr "Méthode d'authentification:"
 
 #: ../gtk/parameters.ui.h:80
 msgid "label"
-msgstr ""
+msgstr "label"
 
 #: ../gtk/parameters.ui.h:81
 msgid "<b>LDAP Account setup</b>"
@@ -1438,7 +1440,7 @@ msgstr "<b>Configuration LDAP</b>"
 
 #: ../gtk/parameters.ui.h:82
 msgid "LDAP"
-msgstr ""
+msgstr "LDAP"
 
 #: ../gtk/parameters.ui.h:83
 msgid "Done"
@@ -1470,15 +1472,15 @@ msgstr "Réglages DSCP"
 
 #: ../gtk/dscp_settings.ui.h:2
 msgid "SIP"
-msgstr ""
+msgstr "SIP"
 
 #: ../gtk/dscp_settings.ui.h:3
 msgid "Audio RTP stream"
-msgstr ""
+msgstr "Flux RTP audio"
 
 #: ../gtk/dscp_settings.ui.h:4
 msgid "Video RTP stream"
-msgstr ""
+msgstr "Flux RTP vidéo"
 
 #: ../gtk/dscp_settings.ui.h:5
 msgid "<b>Set DSCP values (in hexadecimal)</b>"
@@ -1542,7 +1544,7 @@ msgstr "Hôte"
 
 #: ../gtk/tunnel_config.ui.h:3
 msgid "Port"
-msgstr ""
+msgstr "Port"
 
 #: ../gtk/tunnel_config.ui.h:6
 msgid "<b>Configure tunnel</b>"
@@ -1554,63 +1556,63 @@ msgstr "<b>Configuration d'un proxy http (optionel)</b>"
 
 #: ../gtk/keypad.ui.h:1
 msgid "D"
-msgstr ""
+msgstr "D"
 
 #: ../gtk/keypad.ui.h:2
 msgid "#"
-msgstr ""
+msgstr "#"
 
 #: ../gtk/keypad.ui.h:3
 msgid "0"
-msgstr ""
+msgstr "0"
 
 #: ../gtk/keypad.ui.h:4
 msgid "*"
-msgstr ""
+msgstr "*"
 
 #: ../gtk/keypad.ui.h:6
 msgid "9"
-msgstr ""
+msgstr "9"
 
 #: ../gtk/keypad.ui.h:7
 msgid "8"
-msgstr ""
+msgstr "8"
 
 #: ../gtk/keypad.ui.h:8
 msgid "7"
-msgstr ""
+msgstr "7"
 
 #: ../gtk/keypad.ui.h:9
 msgid "B"
-msgstr ""
+msgstr "B"
 
 #: ../gtk/keypad.ui.h:10
 msgid "6"
-msgstr ""
+msgstr "6"
 
 #: ../gtk/keypad.ui.h:11
 msgid "5"
-msgstr ""
+msgstr "5"
 
 #: ../gtk/keypad.ui.h:12
 msgid "4"
-msgstr ""
+msgstr "4"
 
 #: ../gtk/keypad.ui.h:13
 msgid "A"
-msgstr ""
+msgstr "A"
 
 #: ../gtk/keypad.ui.h:14
 msgid "3"
-msgstr ""
+msgstr "3"
 
 #: ../gtk/keypad.ui.h:15
 msgid "2"
-msgstr ""
+msgstr "2"
 
 #: ../gtk/keypad.ui.h:16
 msgid "1"
-msgstr ""
+msgstr "1"
 
 #: ../gtk/ldap.ui.h:1
 msgid "LDAP Settings"
@@ -1634,11 +1636,11 @@ msgstr ""
 
 #: ../gtk/ldap.ui.h:10
 msgid "Authname"
-msgstr ""
+msgstr "Nom d'authentification"
 
 #: ../gtk/ldap.ui.h:11
 msgid "Realm"
-msgstr ""
+msgstr "Realm"
 
 #: ../gtk/ldap.ui.h:12
 msgid "<b>SASL</b>"
@@ -1646,16 +1648,16 @@ msgstr "<b>SASL</b>"
 
 #: ../gtk/ldap.ui.h:13
 msgid "Base object:"
-msgstr ""
+msgstr "Object de base :"
 
 #: ../gtk/ldap.ui.h:15
 #, no-c-format
 msgid "Filter (%s for name):"
-msgstr ""
+msgstr "Filtre (nom avec %s) : "
 
 #: ../gtk/ldap.ui.h:16
 msgid "Name Attribute:"
-msgstr ""
+msgstr "Attribut nom :"
 
 #: ../gtk/ldap.ui.h:17
 msgid "SIP address attribute:"
@@ -1687,19 +1689,19 @@ msgstr "<b>Divers</b>"
 
 #: ../gtk/ldap.ui.h:24
 msgid "ANONYMOUS"
-msgstr ""
+msgstr "ANONYME"
 
 #: ../gtk/ldap.ui.h:25
 msgid "SIMPLE"
-msgstr ""
+msgstr "SIMPLE"
 
 #: ../gtk/ldap.ui.h:26
 msgid "DIGEST-MD5"
-msgstr ""
+msgstr "DIGEST-MD5"
 
 #: ../gtk/ldap.ui.h:27
 msgid "NTLM"
-msgstr ""
+msgstr "NTLM"
 
 #: ../gtk/config-uri.ui.h:1
 msgid "Specifying a remote configuration URI"
@@ -1713,7 +1715,7 @@ msgstr "Cette boite de dialogue vous permet de spécifier une addresse http ou h
 
 #: ../gtk/config-uri.ui.h:4
 msgid "https://"
-msgstr ""
+msgstr "https://"
 
 #: ../gtk/provisioning-fetch.ui.h:1
 msgid "Configuring..."
@@ -1762,7 +1764,7 @@ msgstr "et sollicite un décrochage automatique."
 
 #: ../coreapi/linphonecore.c:3234
 msgid "."
-msgstr ""
+msgstr "."
 
 #: ../coreapi/linphonecore.c:3352
 msgid "Modifying call parameters..."
@@ -1790,7 +1792,7 @@ msgstr "Découverte STUN en cours"
 
 #: ../coreapi/misc.c:619
 msgid "ICE local candidates gathering in progress..."
-msgstr ""
+msgstr "Collection des candidats locaux ICE en cours..."
 
 #: ../coreapi/friend.c:33
 msgid "Online"
@@ -1894,7 +1896,7 @@ msgstr "Appel répondu par %s."
 
 #: ../coreapi/callbacks.c:525
 msgid "Incompatible, check codecs or security settings..."
-msgstr ""
+msgstr "Incompatible, vérfiez les codecs ou les paramètres de sécurité..."
 
 #: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:826
 msgid "Incompatible media parameters."
@@ -1912,7 +1914,7 @@ msgstr "L'appel a été mis en attente."
 #. reINVITE and in-dialogs UPDATE go here
 #: ../coreapi/callbacks.c:602
 msgid "Call is updated by remote."
-msgstr ""
+msgstr "L'appel est modifié par la partie distante."
 
 #: ../coreapi/callbacks.c:705
 msgid "Call terminated."
@@ -1937,7 +1939,7 @@ msgstr "Appel décliné."
 
 #: ../coreapi/callbacks.c:752
 msgid "Request timeout."
-msgstr ""
+msgstr "Délai d'attente de la requête dépassé."
 
 #: ../coreapi/callbacks.c:780
 msgid "Redirected"
@@ -1968,7 +1970,7 @@ msgstr "Echec de l'enregistrement sur %s: %s"
 
 #: ../coreapi/callbacks.c:942
 msgid "Service unavailable, retrying"
-msgstr ""
+msgstr "Service indisponible, nouvelle tentative"
 
 #: ../coreapi/linphonecall.c:174
 #, c-format
diff --git a/po/hu.po b/po/hu.po
index 792868436..d620e646b 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -9,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-19 10:39+0100\n"
 "PO-Revision-Date: 2014-11-19 10:16+0000\n"
-"Last-Translator: Cqnqrd <gautier.pelloux@gmail.com>\n"
+"Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Hungarian (http://www.transifex.com/projects/p/linphone-gtk/language/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/po/it.po b/po/it.po
index d9d6c0e41..a7e15fd13 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-19 10:39+0100\n"
 "PO-Revision-Date: 2014-11-19 10:16+0000\n"
-"Last-Translator: Cqnqrd <gautier.pelloux@gmail.com>\n"
+"Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/linphone-gtk/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/po/ja.po b/po/ja.po
index 5a48f3008..cc365010a 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-19 10:39+0100\n"
-"PO-Revision-Date: 2014-11-26 14:34+0000\n"
+"PO-Revision-Date: 2014-11-28 09:19+0000\n"
 "Last-Translator: Alexander\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/linphone-gtk/language/ja/)\n"
 "MIME-Version: 1.0\n"
@@ -487,7 +487,7 @@ msgstr "パスワードを再入力: (*)"
 
 #: ../gtk/setupwizard.c:338
 msgid "Keep me informed with linphone updates"
-msgstr ""
+msgstr "アップデートでLinphoneを常に最新にする"
 
 #: ../gtk/setupwizard.c:394
 msgid ""
@@ -593,11 +593,11 @@ msgstr ""
 
 #: ../gtk/incall_view.c:245
 msgid "uPnP is running"
-msgstr ""
+msgstr "uPnP作動中"
 
 #: ../gtk/incall_view.c:247
 msgid "uPnP failed"
-msgstr ""
+msgstr "uPnP失敗"
 
 #: ../gtk/incall_view.c:257 ../gtk/incall_view.c:258
 msgid "Direct or through server"
@@ -896,7 +896,7 @@ msgstr ""
 
 #: ../gtk/main.ui.h:26
 msgid "_Help"
-msgstr ""
+msgstr "_ヘルプ"
 
 #: ../gtk/main.ui.h:27
 msgid "Show debug window"
@@ -956,7 +956,7 @@ msgstr "パスワード"
 
 #: ../gtk/main.ui.h:42
 msgid "Internet connection:"
-msgstr ""
+msgstr "インターネット接続:"
 
 #: ../gtk/main.ui.h:43
 msgid "Automatically log me in"
@@ -1004,7 +1004,7 @@ msgid ""
 "cs: Petr Pisar <petr.pisar@atlas.cz>\n"
 "hu: anonymous\n"
 "he: Eli Zaretskii <eliz@gnu.org>\n"
-msgstr ""
+msgstr "fr: Simon Morlat\nen: Simon Morlat and Delphine Perreau\nit: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\nde: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\nsv: Daniel Nylander <po@danielnylander.se>\nes: Jesus Benitez <gnelson at inMail dot sk>\nja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\npt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\npl: Robert Nasiadek <darkone@darkone.pl>\ncs: Petr Pisar <petr.pisar@atlas.cz>\nhu: anonymous\nhe: Eli Zaretskii <eliz@gnu.org>\n"
 
 #: ../gtk/contact.ui.h:2
 msgid "SIP Address"
@@ -1687,7 +1687,7 @@ msgstr "匿名"
 
 #: ../gtk/ldap.ui.h:25
 msgid "SIMPLE"
-msgstr ""
+msgstr "シンプル"
 
 #: ../gtk/ldap.ui.h:26
 msgid "DIGEST-MD5"
diff --git a/po/nb_NO.po b/po/nb_NO.po
index ed39ef92c..a4b047ac4 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-19 10:39+0100\n"
 "PO-Revision-Date: 2014-11-19 10:17+0000\n"
-"Last-Translator: Cqnqrd <gautier.pelloux@gmail.com>\n"
+"Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/linphone-gtk/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/po/nl.po b/po/nl.po
index b64a2cc2d..be7b007b6 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-19 10:39+0100\n"
 "PO-Revision-Date: 2014-11-19 10:08+0000\n"
-"Last-Translator: Cqnqrd <gautier.pelloux@gmail.com>\n"
+"Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/linphone-gtk/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/po/pl.po b/po/pl.po
index 794b0c996..99a4937a0 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-19 10:39+0100\n"
 "PO-Revision-Date: 2014-11-19 10:08+0000\n"
-"Last-Translator: Cqnqrd <gautier.pelloux@gmail.com>\n"
+"Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/linphone-gtk/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 4cc377ec9..46209da20 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -9,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-19 10:39+0100\n"
 "PO-Revision-Date: 2014-11-19 10:08+0000\n"
-"Last-Translator: Cqnqrd <gautier.pelloux@gmail.com>\n"
+"Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/linphone-gtk/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/po/ru.po b/po/ru.po
index 50023c1f8..ed3767e23 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -4,6 +4,7 @@
 # 
 # Translators:
 # a <loginov.alex.valer@gmail.com>, 2014
+# a <loginov.alex.valer@gmail.com>, 2014
 # Maxim Prokopyev <jazzelastic@gmail.com>, 2010
 # Simon Morlat <linphone@free.fr>, 2001
 msgid ""
@@ -12,7 +13,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-19 10:39+0100\n"
 "PO-Revision-Date: 2014-11-19 10:13+0000\n"
-"Last-Translator: Cqnqrd <gautier.pelloux@gmail.com>\n"
+"Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/linphone-gtk/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/po/sv.po b/po/sv.po
index de2c7ec48..befddf083 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-19 10:39+0100\n"
 "PO-Revision-Date: 2014-11-19 10:15+0000\n"
-"Last-Translator: Cqnqrd <gautier.pelloux@gmail.com>\n"
+"Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/linphone-gtk/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index f0897d0da..34f97d9fe 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-19 10:39+0100\n"
 "PO-Revision-Date: 2014-11-19 10:15+0000\n"
-"Last-Translator: Cqnqrd <gautier.pelloux@gmail.com>\n"
+"Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/linphone-gtk/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 22cfa3c0c..673029508 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-19 10:39+0100\n"
 "PO-Revision-Date: 2014-11-19 10:15+0000\n"
-"Last-Translator: Cqnqrd <gautier.pelloux@gmail.com>\n"
+"Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/linphone-gtk/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

From bd7a6b2fa7d3f7665aaa8089a5bbce683d7e7798 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Fri, 28 Nov 2014 10:49:32 +0100
Subject: [PATCH 070/496] Improve build with CMake.

 - Install the GTK UI binary under the name linphone instead of linphone-gtk.
 - Install all sounds and rings.
 - Install freedesktop files.
---
 CMakeLists.txt                   |  2 ++
 gtk/CMakeLists.txt               |  1 +
 share/CMakeLists.txt             | 37 ++++++++++++++++++++++++++------
 share/audio-assistant.desktop.in |  2 +-
 share/rings/CMakeLists.txt       | 21 ++++++++++++++----
 5 files changed, 52 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1740cc44f..7d91afd8e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -136,6 +136,8 @@ set(LINPHONE_PLUGINS_DIR "${LINPHONE_DATA_DIR}/lib/liblinphone/plugins")
 set(PACKAGE_LOCALE_DIR "${LINPHONE_DATA_DIR}/share/locale")
 set(PACKAGE_DATA_DIR "${LINPHONE_DATA_DIR}/share")
 set(PACKAGE_SOUND_DIR "${LINPHONE_DATA_DIR}/share/sounds/linphone")
+set(PACKAGE_RING_DIR "${PACKAGE_SOUND_DIR}/rings")
+set(PACKAGE_FREEDESKTOP_DIR "${PACKAGE_DATA_DIR}/applications")
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/config.h PROPERTIES GENERATED ON)
 add_definitions(-DHAVE_CONFIG_H)
diff --git a/gtk/CMakeLists.txt b/gtk/CMakeLists.txt
index ae395500d..6bc50e5e9 100644
--- a/gtk/CMakeLists.txt
+++ b/gtk/CMakeLists.txt
@@ -66,6 +66,7 @@ set(SOURCE_FILES
 )
 
 add_executable(linphone-gtk ${SOURCE_FILES})
+set_target_properties(linphone-gtk PROPERTIES OUTPUT_NAME linphone)
 target_include_directories(linphone-gtk PUBLIC ${GTK2_INCLUDE_DIRS})
 target_link_libraries(linphone-gtk linphone ${GTK2_LIBRARIES})
 
diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt
index 03b36a74d..0ae15ce76 100644
--- a/share/CMakeLists.txt
+++ b/share/CMakeLists.txt
@@ -21,12 +21,37 @@
 ############################################################################
 
 install(FILES archived-rootca.pem
-		RENAME rootca.pem
-        DESTINATION share/linphone
-        PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
+	RENAME rootca.pem
+	DESTINATION ${PACKAGE_DATA_DIR}/linphone
+	PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+)
 
-install(FILES ringback.wav
-        DESTINATION share/sounds/linphone
-        PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
+set(SOUND_FILES
+	hello16000.wav
+	hello8000.wav
+	incoming_chat.wav
+	ringback.wav
+)
+
+install(FILES ${SOUND_FILES}
+	DESTINATION ${PACKAGE_SOUND_DIR}
+	PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+)
+
+if(ENABLE_GTK_UI)
+	set(prefix "${CMAKE_INSTALL_PREFIX}")
+	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/audio-assistant.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/audio-assistant.desktop)
+	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/linphone.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/linphone.desktop)
+
+	set(FREEDESKTOP_FILES
+		${CMAKE_CURRENT_BINARY_DIR}/audio-assistant.desktop
+		${CMAKE_CURRENT_BINARY_DIR}/linphone.desktop
+	)
+
+	install(FILES ${FREEDESKTOP_FILES}
+		DESTINATION ${PACKAGE_FREEDESKTOP_DIR}
+		PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+	)
+endif()
 
 add_subdirectory(rings)
diff --git a/share/audio-assistant.desktop.in b/share/audio-assistant.desktop.in
index 8f2ef4c54..dc0734bc6 100644
--- a/share/audio-assistant.desktop.in
+++ b/share/audio-assistant.desktop.in
@@ -6,6 +6,6 @@ Comment[fr]=Assistant audio de Linphone.
 Comment[ru]=Помощник аудио Linphone
 Type=Application
 Exec=linphone --run-audio-assistant
-Icon=/usr/local/share/pixmaps/linphone/linphone.png
+Icon=@prefix@/share/pixmaps/linphone/linphone.png
 Terminal=false
 Categories=Network;Telephony;
\ No newline at end of file
diff --git a/share/rings/CMakeLists.txt b/share/rings/CMakeLists.txt
index 63f2c47ac..6ec2182e2 100644
--- a/share/rings/CMakeLists.txt
+++ b/share/rings/CMakeLists.txt
@@ -20,7 +20,20 @@
 #
 ############################################################################
 
-install(FILES oldphone.wav toy-mono.wav
-		COMPONENT COMP_liblinphone
-        DESTINATION share/sounds/linphone/rings
-        PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
+set(RING_FILES
+	bigben.wav
+	oldphone-mono-30s.caf
+	oldphone-mono.wav
+	oldphone.wav
+	orig.wav
+	rock.wav
+	sweet.wav
+	synth.wav
+	tapping.wav
+	toy-mono.wav
+)
+
+install(FILES ${RING_FILES}
+	DESTINATION ${PACKAGE_RING_DIR}
+	PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+)

From 0e273ee722d292397b0c0eb0174e4d833cb42e11 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Fri, 28 Nov 2014 11:01:49 +0100
Subject: [PATCH 071/496] Cleanup translations

---
 coreapi/friend.c       |   2 +-
 coreapi/linphonecore.c |   2 +-
 gtk/about.ui           |   4 +-
 gtk/audio_assistant.c  |   2 +-
 gtk/calllogs.c         |   6 +-
 gtk/config-uri.ui      |   2 +-
 gtk/incall_view.c      |   6 +-
 gtk/keypad.ui          |  32 ++--
 gtk/main.ui            |   2 +-
 gtk/p2pwizard.ui       |   4 +-
 gtk/parameters.ui      |   6 +-
 gtk/setupwizard.c      |   2 +-
 po/cs.po               | 304 ++++++++++++++++++----------------
 po/de.po               | 367 ++++++++++++++++++++++++-----------------
 po/es.po               | 279 +++++++++++++++----------------
 po/fr.po               | 352 ++++++++++++++++++++++-----------------
 po/he.po               | 273 +++++++++++++++---------------
 po/hu.po               | 308 ++++++++++++++++++----------------
 po/it.po               | 261 ++++++++++++++---------------
 po/ja.po               | 283 ++++++++++++++++---------------
 po/nb_NO.po            | 278 +++++++++++++++----------------
 po/nl.po               | 197 ++++++++--------------
 po/pl.po               | 221 ++++++++++---------------
 po/pt_BR.po            | 182 ++++++--------------
 po/ru.po               | 362 +++++++++++++++++++++++-----------------
 po/sr.po               | 351 ++++++++++++++++++++++-----------------
 po/sv.po               | 224 ++++++++++---------------
 po/zh_CN.po            | 264 +++++++++++++++--------------
 po/zh_TW.po            | 271 +++++++++++++++---------------
 29 files changed, 2421 insertions(+), 2426 deletions(-)

diff --git a/coreapi/friend.c b/coreapi/friend.c
index d1ecd560c..44a2a6f82 100644
--- a/coreapi/friend.c
+++ b/coreapi/friend.c
@@ -65,7 +65,7 @@ const char *linphone_online_status_to_string(LinphoneOnlineStatus ss){
 		case LinphoneStatusVacation:
 		str=_("Vacation");
 		default:
-		str=_("Unknown-bug");
+		str=_("Unknown status");
 	}
 	return str;
 }
diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index b57c18d4f..9a7053d07 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -3234,7 +3234,7 @@ void linphone_core_notify_incoming_call(LinphoneCore *lc, LinphoneCall *call){
 	tmp=linphone_address_as_string(from_parsed);
 	linphone_address_destroy(from_parsed);
 	barmesg=ortp_strdup_printf("%s %s%s",tmp,_("is contacting you"),
-		(sal_call_autoanswer_asked(call->op)) ?_(" and asked autoanswer."):_("."));
+		(sal_call_autoanswer_asked(call->op)) ?_(" and asked autoanswer."):".");
 	linphone_core_notify_show_interface(lc);
 	linphone_core_notify_display_status(lc,barmesg);
 
diff --git a/gtk/about.ui b/gtk/about.ui
index 38fc2e796..d647724b2 100644
--- a/gtk/about.ui
+++ b/gtk/about.ui
@@ -5,14 +5,14 @@
   <object class="GtkAboutDialog" id="about">
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
     <property name="border_width">5</property>
-    <property name="title" translatable="yes">About linphone</property>
+    <property name="title" translatable="yes">About Linphone</property>
     <property name="resizable">False</property>
     <property name="window_position">center-on-parent</property>
     <property name="type_hint">dialog</property>
     <property name="has_separator">False</property>
     <property name="program_name">Linphone</property>
     <property name="version">undef</property>
-    <property name="copyright" translatable="yes">(C) Belledonne Communications,2010
+    <property name="copyright" translatable="yes">(C) Belledonne Communications, 2010
 </property>
     <property name="comments" translatable="yes">An internet video phone using the standard SIP (rfc3261) protocol.</property>
     <property name="website">http://www.linphone.org</property>
diff --git a/gtk/audio_assistant.c b/gtk/audio_assistant.c
index 83a89a3eb..7d50fedc2 100644
--- a/gtk/audio_assistant.c
+++ b/gtk/audio_assistant.c
@@ -315,7 +315,7 @@ static void open_mixer(){
 
 static GtkWidget *create_intro(){
 	GtkWidget *vbox=gtk_vbox_new(FALSE,2);
-	GtkWidget *label=gtk_label_new(_("Welcome !\nThis assistant will help you to configure audio settings for Linphone"));
+	GtkWidget *label=gtk_label_new(_("Welcome!\nThis assistant will help you to configure audio settings for Linphone"));
 	gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 2);
 	gtk_widget_show_all(vbox);
 	return vbox;
diff --git a/gtk/calllogs.c b/gtk/calllogs.c
index a4b86240a..7960708c7 100644
--- a/gtk/calllogs.c
+++ b/gtk/calllogs.c
@@ -332,7 +332,7 @@ void linphone_gtk_call_log_update(GtkWidget *w){
 			ngettext("%i second", "%i seconds", duration%60),
 			duration%60);
 		if (status==NULL) {
-				headtxt=g_markup_printf_escaped(_("<big><b>%s</b></big>\t%s"),display,start_date ? start_date : "");
+				headtxt=g_markup_printf_escaped("<big><b>%s</b></big>\t%s",display,start_date ? start_date : "");
 				logtxt=g_markup_printf_escaped(
 				_("<small><i>%s</i>\t"
 				  "<i>Quality: %s</i></small>\n%s\t%s\t"),
@@ -340,8 +340,8 @@ void linphone_gtk_call_log_update(GtkWidget *w){
 		} else {
 			headtxt=g_markup_printf_escaped(_("<big><b>%s</b></big>\t%s"),display,start_date ? start_date : "");
 			logtxt=g_markup_printf_escaped(
-			_("<small><i>%s</i></small>\t"
-				"\n%s"),addr, status);
+			"<small><i>%s</i></small>\t"
+				"\n%s",addr, status);
 		}
 		g_free(minutes);
 		g_free(seconds);
diff --git a/gtk/config-uri.ui b/gtk/config-uri.ui
index 5e864743e..cc99c40db 100644
--- a/gtk/config-uri.ui
+++ b/gtk/config-uri.ui
@@ -77,7 +77,7 @@ Please enter or modify the configuration URI below. After clicking OK, Linphone
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="invisible_char">•</property>
-            <property name="text" translatable="yes">https://</property>
+            <property name="text" translatable="no">https://</property>
             <property name="primary_icon_activatable">False</property>
             <property name="secondary_icon_activatable">False</property>
             <property name="primary_icon_sensitive">True</property>
diff --git a/gtk/incall_view.c b/gtk/incall_view.c
index 4fa0bd66b..1d1c95e6a 100644
--- a/gtk/incall_view.c
+++ b/gtk/incall_view.c
@@ -428,7 +428,7 @@ void linphone_gtk_update_video_button(LinphoneCall *call){
 	gboolean has_video=linphone_call_params_video_enabled(params);
 	gboolean button_sensitive=FALSE;
 	if (call_view==NULL) return;
-	
+
 	button=linphone_gtk_get_widget(call_view,"video_button");
 
 	gtk_button_set_image(GTK_BUTTON(button),
@@ -715,7 +715,7 @@ void linphone_gtk_in_call_view_set_in_call(LinphoneCall *call){
 	GtkWidget *call_stats=(GtkWidget*)g_object_get_data(G_OBJECT(callview),"call_stats");
 
 	linphone_gtk_in_call_show_video(call);
-	
+
 	display_peer_name_in_label(callee,linphone_call_get_remote_address (call));
 
 	gtk_widget_hide(linphone_gtk_get_widget(callview,"answer_decline_panel"));
@@ -768,7 +768,7 @@ void linphone_gtk_in_call_view_update_duration(LinphoneCall *call){
 	int seconds=duration%60;
 	int minutes=(duration/60)%60;
 	int hours=duration/3600;
-	snprintf(tmp,sizeof(tmp)-1,_("%02i::%02i::%02i"),hours,minutes,seconds);
+	snprintf(tmp,sizeof(tmp)-1,"%02i::%02i::%02i",hours,minutes,seconds);
 	gtk_label_set_text(GTK_LABEL(duration_label),tmp);
 }
 
diff --git a/gtk/keypad.ui b/gtk/keypad.ui
index 2dd62a0f0..86c957531 100644
--- a/gtk/keypad.ui
+++ b/gtk/keypad.ui
@@ -29,7 +29,7 @@
                 <property name="homogeneous">True</property>
                 <child>
                   <object class="GtkButton" id="dtmf_D">
-                    <property name="label" translatable="yes">D</property>
+                    <property name="label" translatable="no">D</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -45,7 +45,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="dtmf_#">
-                    <property name="label" translatable="yes">#</property>
+                    <property name="label" translatable="no">#</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -61,7 +61,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="dtmf_0">
-                    <property name="label" translatable="yes">0</property>
+                    <property name="label" translatable="no">0</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -77,7 +77,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="dtmf_*">
-                    <property name="label" translatable="yes">*</property>
+                    <property name="label" translatable="no">*</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -91,7 +91,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="dtmf_C">
-                    <property name="label" translatable="yes">C</property>
+                    <property name="label" translatable="no">C</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -107,7 +107,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="dtmf_9">
-                    <property name="label" translatable="yes">9</property>
+                    <property name="label" translatable="no">9</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -123,7 +123,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="dtmf_8">
-                    <property name="label" translatable="yes">8</property>
+                    <property name="label" translatable="no">8</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -139,7 +139,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="dtmf_7">
-                    <property name="label" translatable="yes">7</property>
+                    <property name="label" translatable="no">7</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -153,7 +153,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="dtmf_B">
-                    <property name="label" translatable="yes">B</property>
+                    <property name="label" translatable="no">B</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -169,7 +169,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="dtmf_6">
-                    <property name="label" translatable="yes">6</property>
+                    <property name="label" translatable="no">6</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -185,7 +185,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="dtmf_5">
-                    <property name="label" translatable="yes">5</property>
+                    <property name="label" translatable="no">5</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -201,7 +201,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="dtmf_4">
-                    <property name="label" translatable="yes">4</property>
+                    <property name="label" translatable="no">4</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -215,7 +215,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="dtmf_A">
-                    <property name="label" translatable="yes">A</property>
+                    <property name="label" translatable="no">A</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -229,7 +229,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="dtmf_3">
-                    <property name="label" translatable="yes">3</property>
+                    <property name="label" translatable="no">3</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -243,7 +243,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="dtmf_2">
-                    <property name="label" translatable="yes">2</property>
+                    <property name="label" translatable="no">2</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -257,7 +257,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="dtmf_1">
-                    <property name="label" translatable="yes">1</property>
+                    <property name="label" translatable="no">1</property>
                     <property name="width_request">40</property>
                     <property name="height_request">40</property>
                     <property name="visible">True</property>
diff --git a/gtk/main.ui b/gtk/main.ui
index 06909d6c6..c66728af5 100644
--- a/gtk/main.ui
+++ b/gtk/main.ui
@@ -1890,7 +1890,7 @@
                   <object class="GtkLabel" id="label6">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Welcome !&lt;/b&gt;</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Welcome!&lt;/b&gt;</property>
                     <property name="use_markup">True</property>
                   </object>
                 </child>
diff --git a/gtk/p2pwizard.ui b/gtk/p2pwizard.ui
index e8e6703ee..111f46ff5 100644
--- a/gtk/p2pwizard.ui
+++ b/gtk/p2pwizard.ui
@@ -8,8 +8,8 @@
     <child>
       <object class="GtkLabel" id="label1">
         <property name="visible">True</property>
-        <property name="label" translatable="yes">Welcome !
-This wizard will help you to setup a SIP account. 
+        <property name="label" translatable="yes">Welcome!
+This wizard will help you to setup a SIP account.
 </property>
         <property name="use_markup">True</property>
         <property name="justify">GTK_JUSTIFY_CENTER</property>
diff --git a/gtk/parameters.ui b/gtk/parameters.ui
index 7705e1319..aa8480aa9 100644
--- a/gtk/parameters.ui
+++ b/gtk/parameters.ui
@@ -2538,7 +2538,7 @@
                               <object class="GtkLabel" id="ldap_server">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">label</property>
+                                <property name="label" translatable="no">label</property>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -2550,7 +2550,7 @@
                               <object class="GtkLabel" id="ldap_auth_method">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">label</property>
+                                <property name="label" translatable="no">label</property>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -2564,7 +2564,7 @@
                               <object class="GtkLabel" id="ldap_username">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">label</property>
+                                <property name="label" translatable="no">label</property>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
diff --git a/gtk/setupwizard.c b/gtk/setupwizard.c
index 1cb86f3af..8e269e266 100644
--- a/gtk/setupwizard.c
+++ b/gtk/setupwizard.c
@@ -31,7 +31,7 @@ static GdkPixbuf *notok;
 
 static GtkWidget *create_intro(){
 	GtkWidget *vbox=gtk_vbox_new(FALSE,2);
-	GtkWidget *label=gtk_label_new(_("Welcome !\nThis assistant will help you to use a SIP account for your calls."));
+	GtkWidget *label=gtk_label_new(_("Welcome!\nThis assistant will help you to use a SIP account for your calls."));
 	gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 2);
 	g_object_set_data(G_OBJECT(vbox),"label",label);
 	gtk_widget_show_all(vbox);
diff --git a/po/cs.po b/po/cs.po
index 9df6476d2..a8a550fa4 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Klara Cihlarova <koty@seznam.cz>, 2005
 # Petr Pisar <petr.pisar@atlas.cz>, 2006-2011,2013
@@ -9,14 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-19 10:39+0100\n"
+"POT-Creation-Date: 2014-11-28 10:55+0100\n"
 "PO-Revision-Date: 2014-11-19 10:17+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
-"Language-Team: Czech (http://www.transifex.com/projects/p/linphone-gtk/language/cs/)\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/linphone-gtk/"
+"language/cs/)\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: cs\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974
@@ -66,24 +67,19 @@ msgstr[0] "%i sekunda"
 msgstr[1] "%i sekundy"
 msgstr[2] "%i sekund"
 
-#: ../gtk/calllogs.c:335 ../gtk/calllogs.c:341
-#, c-format
-msgid "<big><b>%s</b></big>\t%s"
-msgstr "<big><b>%s</b></big>\t%s"
-
 #: ../gtk/calllogs.c:337
 #, c-format
 msgid ""
 "<small><i>%s</i>\t<i>Quality: %s</i></small>\n"
 "%s\t%s\t"
-msgstr "<small><i>%s</i>\t<i>Kvalita: %s</i></small>\n%s\t%s\t"
+msgstr ""
+"<small><i>%s</i>\t<i>Kvalita: %s</i></small>\n"
+"%s\t%s\t"
 
-#: ../gtk/calllogs.c:343
+#: ../gtk/calllogs.c:341
 #, c-format
-msgid ""
-"<small><i>%s</i></small>\t\n"
-"%s"
-msgstr "<small><i>%s</i></small>\t\n%s"
+msgid "<big><b>%s</b></big>\t%s"
+msgstr "<big><b>%s</b></big>\t%s"
 
 #: ../gtk/conference.c:38 ../gtk/main.ui.h:13
 msgid "Conference"
@@ -98,7 +94,7 @@ msgstr "Já"
 msgid "Couldn't find pixmap file: %s"
 msgstr "Nelze najít soubor s obrázkem: %s"
 
-#: ../gtk/chat.c:364 ../gtk/friendlist.c:924
+#: ../gtk/chat.c:367 ../gtk/friendlist.c:924
 msgid "Invalid sip contact !"
 msgstr "Neplatný sipový kontakt!"
 
@@ -128,9 +124,11 @@ msgstr "je-li nastaveno, automaticky zvedne příchozí hovor"
 
 #: ../gtk/main.c:149
 msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: "
+"Specifiy a working directory (should be the base of the installation, eg: c:"
+"\\Program Files\\Linphone)"
+msgstr ""
+"Zadejte pracovní adresář (měl by být základní instalační adresář, například "
 "c:\\Program Files\\Linphone)"
-msgstr "Zadejte pracovní adresář (měl by být základní instalační adresář, například c:\\Program Files\\Linphone)"
 
 #: ../gtk/main.c:156
 msgid "Configuration file"
@@ -144,9 +142,14 @@ msgstr ""
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
-"Would you allow him to see your presence status or add him to your contact list ?\n"
+"Would you allow him to see your presence status or add him to your contact "
+"list ?\n"
 "If you answer no, this person will be temporarily blacklisted."
-msgstr "%s si vás chce přidat do svého adresáře.\nDovolíte mu, aby viděl váš stav přítomnosti, nebo si ho také chcete přidat do svého adresáře?\nOdpovíte-li ne, tato osobo bude dočasně blokována."
+msgstr ""
+"%s si vás chce přidat do svého adresáře.\n"
+"Dovolíte mu, aby viděl váš stav přítomnosti, nebo si ho také chcete přidat "
+"do svého adresáře?\n"
+"Odpovíte-li ne, tato osobo bude dočasně blokována."
 
 #: ../gtk/main.c:1162
 #, c-format
@@ -159,7 +162,7 @@ msgstr ""
 msgid "Call error"
 msgstr "Chyba hovoru"
 
-#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3744
+#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3747
 msgid "Call ended"
 msgstr "Hovor ukončen"
 
@@ -211,7 +214,9 @@ msgstr "Byly jsme přepojeni na %s"
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
-msgstr "Na tomto počítači nebyla objevena žádná zvuková karta.\nNebudete moci vytáčet a přijímat a zvukové hovory."
+msgstr ""
+"Na tomto počítači nebyla objevena žádná zvuková karta.\n"
+"Nebudete moci vytáčet a přijímat a zvukové hovory."
 
 #: ../gtk/main.c:2157
 msgid "A free SIP video-phone"
@@ -384,7 +389,9 @@ msgstr "ZRTP"
 msgid ""
 "A more recent version is availalble from %s.\n"
 "Would you like to open a browser to download it ?"
-msgstr "Na %s je dostupná novější verze.\nPřejete si otevřít prohlížeč, abyste si ji mohli stáhnout?"
+msgstr ""
+"Na %s je dostupná novější verze.\n"
+"Přejete si otevřít prohlížeč, abyste si ji mohli stáhnout?"
 
 #: ../gtk/update.c:91
 msgid "You are running the lastest version."
@@ -419,10 +426,13 @@ msgstr[1] "Nalezeny %i kontakty"
 msgstr[2] "Nalezeno %i kontaktů"
 
 #: ../gtk/setupwizard.c:34
+#, fuzzy
 msgid ""
-"Welcome !\n"
+"Welcome!\n"
 "This assistant will help you to use a SIP account for your calls."
-msgstr "Vítejte!\nTento průvodce vám pomůže používat sipový účet při vašich hovorech."
+msgstr ""
+"Vítejte!\n"
+"Tento průvodce vám pomůže používat sipový účet při vašich hovorech."
 
 #: ../gtk/setupwizard.c:43
 msgid "Create an account on linphone.org"
@@ -500,7 +510,10 @@ msgstr ""
 msgid ""
 "Error, account not validated, username already used or server unreachable.\n"
 "Please go back and try again."
-msgstr "Došlo k chybě (účet nebyl ověřen, uživatelské jméno již existuje nebo server není dostupný).\nProsím, vraťte se a zkoste to znovu."
+msgstr ""
+"Došlo k chybě (účet nebyl ověřen, uživatelské jméno již existuje nebo server "
+"není dostupný).\n"
+"Prosím, vraťte se a zkoste to znovu."
 
 #: ../gtk/setupwizard.c:405
 msgid "Thank you. Your account is now configured and ready for use."
@@ -508,43 +521,47 @@ msgstr "Děkujeme vám. Váš účet je nyní nastaven a připraven k použití
 
 #: ../gtk/setupwizard.c:413
 msgid ""
-"Please validate your account by clicking on the link we just sent you by email.\n"
+"Please validate your account by clicking on the link we just sent you by "
+"email.\n"
 "Then come back here and press Next button."
-msgstr "Prosím, ověřte svůj účet tak, že kliknete na odkaz, který jsme vám právě zaslali e-mailem.\nPak se sem vraťte a stiskněte tlačítko Další."
+msgstr ""
+"Prosím, ověřte svůj účet tak, že kliknete na odkaz, který jsme vám právě "
+"zaslali e-mailem.\n"
+"Pak se sem vraťte a stiskněte tlačítko Další."
 
-#: ../gtk/setupwizard.c:600
+#: ../gtk/setupwizard.c:602
 msgid "SIP account configuration assistant"
 msgstr ""
 
-#: ../gtk/setupwizard.c:618
+#: ../gtk/setupwizard.c:620
 msgid "Welcome to the account setup assistant"
 msgstr "Vítejte v průvodci nastavení účtu"
 
-#: ../gtk/setupwizard.c:623
+#: ../gtk/setupwizard.c:625
 msgid "Account setup assistant"
 msgstr "Průvodce nastavením účtu"
 
-#: ../gtk/setupwizard.c:629
+#: ../gtk/setupwizard.c:631
 msgid "Configure your account (step 1/1)"
 msgstr "Nastavit účet (krok 1/1)"
 
-#: ../gtk/setupwizard.c:634
+#: ../gtk/setupwizard.c:636
 msgid "Enter your sip username (step 1/1)"
 msgstr "Zadejte vaše sipové uživatelské jméno (krok 1/1)"
 
-#: ../gtk/setupwizard.c:638
+#: ../gtk/setupwizard.c:640
 msgid "Enter account information (step 1/2)"
 msgstr "Zadejte údaje o účtu (krok 1/2)"
 
-#: ../gtk/setupwizard.c:647
+#: ../gtk/setupwizard.c:649
 msgid "Validation (step 2/2)"
 msgstr "Ověření (krok 2/2)"
 
-#: ../gtk/setupwizard.c:652
+#: ../gtk/setupwizard.c:654
 msgid "Error"
 msgstr "Chyba"
 
-#: ../gtk/setupwizard.c:656 ../gtk/audio_assistant.c:527
+#: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:527
 msgid "Terminating"
 msgstr "Ukončuje se"
 
@@ -615,7 +632,9 @@ msgstr "Přímé nebo skrze server"
 msgid ""
 "download: %f\n"
 "upload: %f (kbit/s)"
-msgstr "příchozí: %f\nodchozí: %f (kb/s)"
+msgstr ""
+"příchozí: %f\n"
+"odchozí: %f (kb/s)"
 
 #: ../gtk/incall_view.c:272 ../gtk/incall_view.c:274
 #, c-format
@@ -696,11 +715,6 @@ msgstr "<b>Probíhá hovor</b>"
 msgid "<b>Paused call</b>"
 msgstr "<b>Odložený hovor</b>"
 
-#: ../gtk/incall_view.c:771
-#, c-format
-msgid "%02i::%02i::%02i"
-msgstr "%02i:%02i:%02i"
-
 #: ../gtk/incall_view.c:794
 msgid "<b>Call ended.</b>"
 msgstr "<b>Hovor skončil.</b>"
@@ -730,7 +744,9 @@ msgstr "Odložit"
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
-msgstr "<small><i>Nahrává se do\n%s %s</i></small>"
+msgstr ""
+"<small><i>Nahrává se do\n"
+"%s %s</i></small>"
 
 #: ../gtk/incall_view.c:948
 msgid "(Paused)"
@@ -768,10 +784,13 @@ msgid "Too loud"
 msgstr ""
 
 #: ../gtk/audio_assistant.c:318
+#, fuzzy
 msgid ""
-"Welcome !\n"
+"Welcome!\n"
 "This assistant will help you to configure audio settings for Linphone"
 msgstr ""
+"Vítejte!\n"
+"Tento průvodce vám pomůže používat sipový účet při vašich hovorech."
 
 #: ../gtk/audio_assistant.c:328
 msgid "Capture device"
@@ -978,7 +997,8 @@ msgid "Login information"
 msgstr "Informace o přihlášení"
 
 #: ../gtk/main.ui.h:46
-msgid "<b>Welcome !</b>"
+#, fuzzy
+msgid "<b>Welcome!</b>"
 msgstr "<b>Vítejte!</b>"
 
 #: ../gtk/main.ui.h:47
@@ -986,11 +1006,13 @@ msgid "Delete"
 msgstr "Smazat"
 
 #: ../gtk/about.ui.h:1
-msgid "About linphone"
+#, fuzzy
+msgid "About Linphone"
 msgstr "O Linphonu"
 
 #: ../gtk/about.ui.h:2
-msgid "(C) Belledonne Communications,2010\n"
+#, fuzzy
+msgid "(C) Belledonne Communications, 2010\n"
 msgstr "© Belledonne Communications, 2010\n"
 
 #: ../gtk/about.ui.h:4
@@ -1153,7 +1175,7 @@ msgstr "Kodeky zvuku"
 msgid "Video codecs"
 msgstr "Kodeky obrazu"
 
-#: ../gtk/parameters.ui.h:10 ../gtk/keypad.ui.h:5
+#: ../gtk/parameters.ui.h:10
 msgid "C"
 msgstr "C"
 
@@ -1397,7 +1419,9 @@ msgstr "Zapnout přizpůsobující se řízení rychlosti"
 msgid ""
 "<i>Adaptive rate control is a technique to dynamically guess the available "
 "bandwidth during a call.</i>"
-msgstr "<i>Přizpůsobující se řízení rychlosti je technika dynamického odhadu dostupného pásma během hovoru.</i>"
+msgstr ""
+"<i>Přizpůsobující se řízení rychlosti je technika dynamického odhadu "
+"dostupného pásma během hovoru.</i>"
 
 #: ../gtk/parameters.ui.h:71
 msgid "<b>Bandwidth control</b>"
@@ -1432,18 +1456,14 @@ msgid "Authentication method:"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:80
-msgid "label"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:81
 msgid "<b>LDAP Account setup</b>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:82
+#: ../gtk/parameters.ui.h:81
 msgid "LDAP"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:83
+#: ../gtk/parameters.ui.h:82
 msgid "Done"
 msgstr "Hotovo"
 
@@ -1555,66 +1575,6 @@ msgstr "<b>Nastavit tunel</b>"
 msgid "<b>Configure http proxy (optional)</b>"
 msgstr "<b>Nastavit HTTP proxy (volitelné)</b>"
 
-#: ../gtk/keypad.ui.h:1
-msgid "D"
-msgstr "D"
-
-#: ../gtk/keypad.ui.h:2
-msgid "#"
-msgstr "#"
-
-#: ../gtk/keypad.ui.h:3
-msgid "0"
-msgstr "0"
-
-#: ../gtk/keypad.ui.h:4
-msgid "*"
-msgstr "*"
-
-#: ../gtk/keypad.ui.h:6
-msgid "9"
-msgstr "9"
-
-#: ../gtk/keypad.ui.h:7
-msgid "8"
-msgstr "8"
-
-#: ../gtk/keypad.ui.h:8
-msgid "7"
-msgstr "7"
-
-#: ../gtk/keypad.ui.h:9
-msgid "B"
-msgstr "B"
-
-#: ../gtk/keypad.ui.h:10
-msgid "6"
-msgstr "6"
-
-#: ../gtk/keypad.ui.h:11
-msgid "5"
-msgstr "5"
-
-#: ../gtk/keypad.ui.h:12
-msgid "4"
-msgstr "4"
-
-#: ../gtk/keypad.ui.h:13
-msgid "A"
-msgstr "A"
-
-#: ../gtk/keypad.ui.h:14
-msgid "3"
-msgstr "3"
-
-#: ../gtk/keypad.ui.h:15
-msgid "2"
-msgstr "2"
-
-#: ../gtk/keypad.ui.h:16
-msgid "1"
-msgstr "1"
-
 #: ../gtk/ldap.ui.h:1
 msgid "LDAP Settings"
 msgstr ""
@@ -1710,12 +1670,11 @@ msgstr ""
 
 #: ../gtk/config-uri.ui.h:2
 msgid ""
-"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
-msgstr ""
-
-#: ../gtk/config-uri.ui.h:4
-msgid "https://"
+"This dialog allows to set an http or https address when configuration is to "
+"be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, "
+"Linphone will restart automatically in order to fetch and take into account "
+"the new configuration. "
 msgstr ""
 
 #: ../gtk/provisioning-fetch.ui.h:1
@@ -1726,64 +1685,60 @@ msgstr ""
 msgid "Please wait while fetching configuration from server..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1511
+#: ../coreapi/linphonecore.c:1510
 msgid "Ready"
 msgstr "Připraven."
 
-#: ../coreapi/linphonecore.c:2470
+#: ../coreapi/linphonecore.c:2473
 msgid "Configuring"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2635
+#: ../coreapi/linphonecore.c:2638
 msgid "Looking for telephone number destination..."
 msgstr "Vyhledává se umístění čísla…"
 
-#: ../coreapi/linphonecore.c:2637
+#: ../coreapi/linphonecore.c:2640
 msgid "Could not resolve this number."
 msgstr "Toto číslo nelze vyhledat."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2919
+#: ../coreapi/linphonecore.c:2922
 msgid "Contacting"
 msgstr "Navazuje se spojení"
 
-#: ../coreapi/linphonecore.c:2924
+#: ../coreapi/linphonecore.c:2927
 msgid "Could not call"
 msgstr "Nelze volat"
 
-#: ../coreapi/linphonecore.c:3074
+#: ../coreapi/linphonecore.c:3077
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "Je nám líto, ale byl dosažen maximální počet současných hovorů."
 
-#: ../coreapi/linphonecore.c:3233
+#: ../coreapi/linphonecore.c:3236
 msgid "is contacting you"
 msgstr "vás volá"
 
-#: ../coreapi/linphonecore.c:3234
+#: ../coreapi/linphonecore.c:3237
 msgid " and asked autoanswer."
 msgstr " a požaduje automatickou zvednutí."
 
-#: ../coreapi/linphonecore.c:3234
-msgid "."
-msgstr "."
-
-#: ../coreapi/linphonecore.c:3352
+#: ../coreapi/linphonecore.c:3355
 msgid "Modifying call parameters..."
 msgstr "Upravují se parametry hovoru…"
 
-#: ../coreapi/linphonecore.c:3700
+#: ../coreapi/linphonecore.c:3703
 msgid "Connected."
 msgstr "Připojeno."
 
-#: ../coreapi/linphonecore.c:3725
+#: ../coreapi/linphonecore.c:3728
 msgid "Call aborted"
 msgstr "Hovor přerušen"
 
-#: ../coreapi/linphonecore.c:3915
+#: ../coreapi/linphonecore.c:3918
 msgid "Could not pause the call"
 msgstr "Hovor nebylo možné odložit"
 
-#: ../coreapi/linphonecore.c:3919
+#: ../coreapi/linphonecore.c:3922
 msgid "Pausing the current call..."
 msgstr "Současný hovor se odkládá…"
 
@@ -1844,20 +1799,25 @@ msgid "Vacation"
 msgstr ""
 
 #: ../coreapi/friend.c:68
-msgid "Unknown-bug"
+#, fuzzy
+msgid "Unknown status"
 msgstr "Neznámá chyba"
 
 #: ../coreapi/proxy.c:319
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
-msgstr "Adresa SIP proxy, kterou jste zadali, není platná. Musí začínat na „sip:“ a pak musí následovat jméno stroje."
+msgstr ""
+"Adresa SIP proxy, kterou jste zadali, není platná. Musí začínat na „sip:“ a "
+"pak musí následovat jméno stroje."
 
 #: ../coreapi/proxy.c:325
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
-msgstr "SIP identita, kterou jste zadali, není platná.\nMěla by mít tvar sip:uživatel@proxydoména, například sip:alice@example.net"
+msgstr ""
+"SIP identita, kterou jste zadali, není platná.\n"
+"Měla by mít tvar sip:uživatel@proxydoména, například sip:alice@example.net"
 
 #: ../coreapi/proxy.c:1377
 #, c-format
@@ -1985,3 +1945,61 @@ msgid_plural "You have missed %i calls."
 msgstr[0] "Máte %i zmeškaný hovor."
 msgstr[1] "Máte %i zmeškané hovory."
 msgstr[2] "Máte %i zmeškaných hovorů."
+
+#~ msgid "D"
+#~ msgstr "D"
+
+#~ msgid "#"
+#~ msgstr "#"
+
+#~ msgid "0"
+#~ msgstr "0"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "9"
+#~ msgstr "9"
+
+#~ msgid "8"
+#~ msgstr "8"
+
+#~ msgid "7"
+#~ msgstr "7"
+
+#~ msgid "B"
+#~ msgstr "B"
+
+#~ msgid "6"
+#~ msgstr "6"
+
+#~ msgid "5"
+#~ msgstr "5"
+
+#~ msgid "4"
+#~ msgstr "4"
+
+#~ msgid "A"
+#~ msgstr "A"
+
+#~ msgid "3"
+#~ msgstr "3"
+
+#~ msgid "2"
+#~ msgstr "2"
+
+#~ msgid "1"
+#~ msgstr "1"
+
+#~ msgid ""
+#~ "<small><i>%s</i></small>\t\n"
+#~ "%s"
+#~ msgstr ""
+#~ "<small><i>%s</i></small>\t\n"
+#~ "%s"
+
+#~ msgid "%02i::%02i::%02i"
+#~ msgstr "%02i:%02i:%02i"
+
+#~ msgid "."
+#~ msgstr "."
diff --git a/po/de.po b/po/de.po
index c65ead393..a36d864f0 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # andreas, 2014
 # Gerhard Stengel <gstengel@gmx.net>, 2011-2012
@@ -10,14 +10,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-19 10:39+0100\n"
+"POT-Creation-Date: 2014-11-28 10:55+0100\n"
 "PO-Revision-Date: 2014-11-25 16:45+0000\n"
 "Last-Translator: andreas\n"
-"Language-Team: German (http://www.transifex.com/projects/p/linphone-gtk/language/de/)\n"
+"Language-Team: German (http://www.transifex.com/projects/p/linphone-gtk/"
+"language/de/)\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974
@@ -65,24 +66,19 @@ msgid_plural "%i seconds"
 msgstr[0] "%i Sekunde"
 msgstr[1] "%i Sekunden"
 
-#: ../gtk/calllogs.c:335 ../gtk/calllogs.c:341
-#, c-format
-msgid "<big><b>%s</b></big>\t%s"
-msgstr "<big><b>%s</b></big>\t%s"
-
 #: ../gtk/calllogs.c:337
 #, c-format
 msgid ""
 "<small><i>%s</i>\t<i>Quality: %s</i></small>\n"
 "%s\t%s\t"
-msgstr "<small><i>%s</i>\t<i>Qualität: %s</i></small>\n%s\t%s\t"
+msgstr ""
+"<small><i>%s</i>\t<i>Qualität: %s</i></small>\n"
+"%s\t%s\t"
 
-#: ../gtk/calllogs.c:343
+#: ../gtk/calllogs.c:341
 #, c-format
-msgid ""
-"<small><i>%s</i></small>\t\n"
-"%s"
-msgstr "<small><i>%s</i></small>\t\n%s"
+msgid "<big><b>%s</b></big>\t%s"
+msgstr "<big><b>%s</b></big>\t%s"
 
 #: ../gtk/conference.c:38 ../gtk/main.ui.h:13
 msgid "Conference"
@@ -97,7 +93,7 @@ msgstr "Eigenes Telefon"
 msgid "Couldn't find pixmap file: %s"
 msgstr "Pixmapdatei %s kann nicht gefunden werden."
 
-#: ../gtk/chat.c:364 ../gtk/friendlist.c:924
+#: ../gtk/chat.c:367 ../gtk/friendlist.c:924
 msgid "Invalid sip contact !"
 msgstr "Ungültiger SIP-Kontakt!"
 
@@ -115,7 +111,9 @@ msgstr "Linphone mit ausgeschaltetem Video starten."
 
 #: ../gtk/main.c:128
 msgid "Start only in the system tray, do not show the main interface."
-msgstr "Nur im Systemabschnitt der Kontrollleiste starten, aber das Hauptfenster nicht zeigen."
+msgstr ""
+"Nur im Systemabschnitt der Kontrollleiste starten, aber das Hauptfenster "
+"nicht zeigen."
 
 #: ../gtk/main.c:135
 msgid "address to call right now"
@@ -127,9 +125,11 @@ msgstr "Falls aktiviert, werden eingehende Anrufe automatisch beantwortet"
 
 #: ../gtk/main.c:149
 msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: "
-"c:\\Program Files\\Linphone)"
-msgstr "Geben Sie einen Arbeitsordner an (sollte der Installationsordner sein, z. B. C:\\Programme\\Linphone)"
+"Specifiy a working directory (should be the base of the installation, eg: c:"
+"\\Program Files\\Linphone)"
+msgstr ""
+"Geben Sie einen Arbeitsordner an (sollte der Installationsordner sein, z. B. "
+"C:\\Programme\\Linphone)"
 
 #: ../gtk/main.c:156
 msgid "Configuration file"
@@ -143,22 +143,29 @@ msgstr "Starte den Audio-Assistent"
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
-"Would you allow him to see your presence status or add him to your contact list ?\n"
+"Would you allow him to see your presence status or add him to your contact "
+"list ?\n"
 "If you answer no, this person will be temporarily blacklisted."
-msgstr "%s möchte Sie zu seiner Kontaktliste hinzufügen.\nMöchten Sie ihm erlauben, Ihren Anwesenheitsstatus zu sehen, oder ihn zu Ihrer Kontaktliste hinzufügen?\nWenn Sie mit Nein antworten, wird diese Person vorläufig blockiert."
+msgstr ""
+"%s möchte Sie zu seiner Kontaktliste hinzufügen.\n"
+"Möchten Sie ihm erlauben, Ihren Anwesenheitsstatus zu sehen, oder ihn zu "
+"Ihrer Kontaktliste hinzufügen?\n"
+"Wenn Sie mit Nein antworten, wird diese Person vorläufig blockiert."
 
 #: ../gtk/main.c:1162
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
-msgstr "Bitte geben Sie Ihr Passwort für den Benutzernamen <i>%s</i>\n für  Bereich <i>%s</i> ein:"
+msgstr ""
+"Bitte geben Sie Ihr Passwort für den Benutzernamen <i>%s</i>\n"
+" für  Bereich <i>%s</i> ein:"
 
 #: ../gtk/main.c:1283
 msgid "Call error"
 msgstr "Anruf fehlgeschlagen"
 
-#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3744
+#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3747
 msgid "Call ended"
 msgstr "Anruf beendet"
 
@@ -210,7 +217,9 @@ msgstr "Vermittlung nach %s"
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
-msgstr "Auf diesem Rechner können keine Soundkarten gefunden werden.\nSie können keine Audio-Anrufe tätigen oder entgegennehmen."
+msgstr ""
+"Auf diesem Rechner können keine Soundkarten gefunden werden.\n"
+"Sie können keine Audio-Anrufe tätigen oder entgegennehmen."
 
 #: ../gtk/main.c:2157
 msgid "A free SIP video-phone"
@@ -364,7 +373,9 @@ msgstr "Serbisch"
 #: ../gtk/propertybox.c:1156
 msgid ""
 "You need to restart linphone for the new language selection to take effect."
-msgstr "Linphone muss neu gestartet werden, damit die neue Spracheinstellung wirksam wird."
+msgstr ""
+"Linphone muss neu gestartet werden, damit die neue Spracheinstellung wirksam "
+"wird."
 
 #: ../gtk/propertybox.c:1234
 msgid "None"
@@ -383,7 +394,9 @@ msgstr "ZRTP"
 msgid ""
 "A more recent version is availalble from %s.\n"
 "Would you like to open a browser to download it ?"
-msgstr "Eine neuere Version ist von %s verfügbar.\nMöchten Sie einen Browser zum Herunterladen öffnen?"
+msgstr ""
+"Eine neuere Version ist von %s verfügbar.\n"
+"Möchten Sie einen Browser zum Herunterladen öffnen?"
 
 #: ../gtk/update.c:91
 msgid "You are running the lastest version."
@@ -417,10 +430,14 @@ msgstr[0] "%i Kontakt gefunden"
 msgstr[1] "%i Kontakte gefunden"
 
 #: ../gtk/setupwizard.c:34
+#, fuzzy
 msgid ""
-"Welcome !\n"
+"Welcome!\n"
 "This assistant will help you to use a SIP account for your calls."
-msgstr "Willkommen!\nDieser Assistent wird Ihnen dabei helfen, ein SIP-Konto für Ihre Anrufe zu verwenden."
+msgstr ""
+"Willkommen!\n"
+"Dieser Assistent wird Ihnen dabei helfen, ein SIP-Konto für Ihre Anrufe zu "
+"verwenden."
 
 #: ../gtk/setupwizard.c:43
 msgid "Create an account on linphone.org"
@@ -428,7 +445,8 @@ msgstr "Ein Konto bei linphone.org erstellen."
 
 #: ../gtk/setupwizard.c:44
 msgid "I have already a linphone.org account and I just want to use it"
-msgstr "Ich habe bereits ein Konto bei linphone.org und möchte es jetzt benutzen."
+msgstr ""
+"Ich habe bereits ein Konto bei linphone.org und möchte es jetzt benutzen."
 
 #: ../gtk/setupwizard.c:45
 msgid "I have already a sip account and I just want to use it"
@@ -498,51 +516,59 @@ msgstr "Halte mich über linphone Aktualisierungen auf dem laufenden"
 msgid ""
 "Error, account not validated, username already used or server unreachable.\n"
 "Please go back and try again."
-msgstr "Fehler, Konto kann nicht bestätigt werden. Der Benutzername wird bereits\nverwendet oder der Server ist unerreichbar.\nBitte gehen Sie zurück und versuchen Sie es noch einmal."
+msgstr ""
+"Fehler, Konto kann nicht bestätigt werden. Der Benutzername wird bereits\n"
+"verwendet oder der Server ist unerreichbar.\n"
+"Bitte gehen Sie zurück und versuchen Sie es noch einmal."
 
 #: ../gtk/setupwizard.c:405
 msgid "Thank you. Your account is now configured and ready for use."
-msgstr "Danke. Ihr Konto ist nun fertig eingerichtet und kann verwendet werden."
+msgstr ""
+"Danke. Ihr Konto ist nun fertig eingerichtet und kann verwendet werden."
 
 #: ../gtk/setupwizard.c:413
 msgid ""
-"Please validate your account by clicking on the link we just sent you by email.\n"
+"Please validate your account by clicking on the link we just sent you by "
+"email.\n"
 "Then come back here and press Next button."
-msgstr "Bitte bestätigen Sie Ihr Konto, indem Sie auf die Verknüpfung klicken, die wir Ihnen soeben per E-Mail geschickt haben.\nDanach gehen Sie hierher zurück und drücken auf „Vor“."
+msgstr ""
+"Bitte bestätigen Sie Ihr Konto, indem Sie auf die Verknüpfung klicken, die "
+"wir Ihnen soeben per E-Mail geschickt haben.\n"
+"Danach gehen Sie hierher zurück und drücken auf „Vor“."
 
-#: ../gtk/setupwizard.c:600
+#: ../gtk/setupwizard.c:602
 msgid "SIP account configuration assistant"
 msgstr "SIP-Konto-Einrichtungsassistent"
 
-#: ../gtk/setupwizard.c:618
+#: ../gtk/setupwizard.c:620
 msgid "Welcome to the account setup assistant"
 msgstr "Willkommen zum Konto-Einrichtungsassistenten"
 
-#: ../gtk/setupwizard.c:623
+#: ../gtk/setupwizard.c:625
 msgid "Account setup assistant"
 msgstr "Konto-Einrichtungsassistent"
 
-#: ../gtk/setupwizard.c:629
+#: ../gtk/setupwizard.c:631
 msgid "Configure your account (step 1/1)"
 msgstr "Konto einrichten (Schritt 1/1)"
 
-#: ../gtk/setupwizard.c:634
+#: ../gtk/setupwizard.c:636
 msgid "Enter your sip username (step 1/1)"
 msgstr "Geben Sie Ihren SIP-Benutzernamen ein (Schritt 1/1)"
 
-#: ../gtk/setupwizard.c:638
+#: ../gtk/setupwizard.c:640
 msgid "Enter account information (step 1/2)"
 msgstr "Geben Sie Ihre Zugangsdaten ein (Schritt 1/2)"
 
-#: ../gtk/setupwizard.c:647
+#: ../gtk/setupwizard.c:649
 msgid "Validation (step 2/2)"
 msgstr "Bestätigung (Schritt 2/2)"
 
-#: ../gtk/setupwizard.c:652
+#: ../gtk/setupwizard.c:654
 msgid "Error"
 msgstr "Fehler"
 
-#: ../gtk/setupwizard.c:656 ../gtk/audio_assistant.c:527
+#: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:527
 msgid "Terminating"
 msgstr "Fertigstellen"
 
@@ -613,7 +639,9 @@ msgstr "Direkt oder über Server"
 msgid ""
 "download: %f\n"
 "upload: %f (kbit/s)"
-msgstr "Herunterladen: %f\nHochladen: %f (kbit/s)"
+msgstr ""
+"Herunterladen: %f\n"
+"Hochladen: %f (kbit/s)"
 
 #: ../gtk/incall_view.c:272 ../gtk/incall_view.c:274
 #, c-format
@@ -694,11 +722,6 @@ msgstr "<b>Im Gespräch</b>"
 msgid "<b>Paused call</b>"
 msgstr "<b>Gehaltener Anruf</b>"
 
-#: ../gtk/incall_view.c:771
-#, c-format
-msgid "%02i::%02i::%02i"
-msgstr "%02i::%02i::%02i"
-
 #: ../gtk/incall_view.c:794
 msgid "<b>Call ended.</b>"
 msgstr "<b>Anruf beendet.</b>"
@@ -728,7 +751,9 @@ msgstr "Halten"
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
-msgstr "<small><i>Recording into\n%s %s</i></small>"
+msgstr ""
+"<small><i>Recording into\n"
+"%s %s</i></small>"
 
 #: ../gtk/incall_view.c:948
 msgid "(Paused)"
@@ -766,10 +791,14 @@ msgid "Too loud"
 msgstr "zu laut"
 
 #: ../gtk/audio_assistant.c:318
+#, fuzzy
 msgid ""
-"Welcome !\n"
+"Welcome!\n"
 "This assistant will help you to configure audio settings for Linphone"
-msgstr "Willkommen!\nDieser Assistent wird Ihnen dabei helfen, die Audio-Einstellungen für Linphone vorzunehmen."
+msgstr ""
+"Willkommen!\n"
+"Dieser Assistent wird Ihnen dabei helfen, die Audio-Einstellungen für "
+"Linphone vorzunehmen."
 
 #: ../gtk/audio_assistant.c:328
 msgid "Capture device"
@@ -976,7 +1005,8 @@ msgid "Login information"
 msgstr "Anmeldeinformationen"
 
 #: ../gtk/main.ui.h:46
-msgid "<b>Welcome !</b>"
+#, fuzzy
+msgid "<b>Welcome!</b>"
 msgstr "<b>Willkommen !</b>"
 
 #: ../gtk/main.ui.h:47
@@ -984,16 +1014,20 @@ msgid "Delete"
 msgstr "Löschen"
 
 #: ../gtk/about.ui.h:1
-msgid "About linphone"
+#, fuzzy
+msgid "About Linphone"
 msgstr "Über Linphone"
 
 #: ../gtk/about.ui.h:2
-msgid "(C) Belledonne Communications,2010\n"
+#, fuzzy
+msgid "(C) Belledonne Communications, 2010\n"
 msgstr "(C) Belledonne Communications,2010\n"
 
 #: ../gtk/about.ui.h:4
 msgid "An internet video phone using the standard SIP (rfc3261) protocol."
-msgstr "Ein Internet-Video-Telefon, das das Standard-SIP-Protokoll (RFC3261) verwendet."
+msgstr ""
+"Ein Internet-Video-Telefon, das das Standard-SIP-Protokoll (RFC3261) "
+"verwendet."
 
 #: ../gtk/about.ui.h:5
 msgid ""
@@ -1009,7 +1043,19 @@ msgid ""
 "cs: Petr Pisar <petr.pisar@atlas.cz>\n"
 "hu: anonymous\n"
 "he: Eli Zaretskii <eliz@gnu.org>\n"
-msgstr "fr: Simon Morlat\nen: Simon Morlat and Delphine Perreau\nit: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\nde: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\nsv: Daniel Nylander <po@danielnylander.se>\nes: Jesus Benitez <gnelson at inMail dot sk>\nja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\npt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\npl: Robert Nasiadek <darkone@darkone.pl>\ncs: Petr Pisar <petr.pisar@atlas.cz>\nhu: anonymous\nhe: Eli Zaretskii <eliz@gnu.org>\n"
+msgstr ""
+"fr: Simon Morlat\n"
+"en: Simon Morlat and Delphine Perreau\n"
+"it: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\n"
+"de: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\n"
+"sv: Daniel Nylander <po@danielnylander.se>\n"
+"es: Jesus Benitez <gnelson at inMail dot sk>\n"
+"ja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\n"
+"pt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\n"
+"pl: Robert Nasiadek <darkone@darkone.pl>\n"
+"cs: Petr Pisar <petr.pisar@atlas.cz>\n"
+"hu: anonymous\n"
+"he: Eli Zaretskii <eliz@gnu.org>\n"
 
 #: ../gtk/contact.ui.h:2
 msgid "SIP Address"
@@ -1151,7 +1197,7 @@ msgstr "Audio-Codecs"
 msgid "Video codecs"
 msgstr "Video-Codecs"
 
-#: ../gtk/parameters.ui.h:10 ../gtk/keypad.ui.h:5
+#: ../gtk/parameters.ui.h:10
 msgid "C"
 msgstr "C"
 
@@ -1313,7 +1359,9 @@ msgstr "Multimedia-Einstellungen"
 
 #: ../gtk/parameters.ui.h:50
 msgid "This section defines your SIP address when not using a SIP account"
-msgstr "In diesem Bereich legen Sie Ihre SIP-Adresse fest, wenn Sie kein SIP-Konto verwenden."
+msgstr ""
+"In diesem Bereich legen Sie Ihre SIP-Adresse fest, wenn Sie kein SIP-Konto "
+"verwenden."
 
 #: ../gtk/parameters.ui.h:51
 msgid "Your display name (eg: John Doe):"
@@ -1395,7 +1443,9 @@ msgstr "Adaptive Ratenregelung ein"
 msgid ""
 "<i>Adaptive rate control is a technique to dynamically guess the available "
 "bandwidth during a call.</i>"
-msgstr "<i>Adaptive Ratenregelung ist eine Technik zur dynamischen Abschätzung der zur Verfügung stehenden Bandbreite während eines Anrufs.</i>"
+msgstr ""
+"<i>Adaptive Ratenregelung ist eine Technik zur dynamischen Abschätzung der "
+"zur Verfügung stehenden Bandbreite während eines Anrufs.</i>"
 
 #: ../gtk/parameters.ui.h:71
 msgid "<b>Bandwidth control</b>"
@@ -1430,18 +1480,14 @@ msgid "Authentication method:"
 msgstr "Authentifizierungsmethode"
 
 #: ../gtk/parameters.ui.h:80
-msgid "label"
-msgstr "Hinweisschild"
-
-#: ../gtk/parameters.ui.h:81
 msgid "<b>LDAP Account setup</b>"
 msgstr "LDAP-Kontoeinrichtung"
 
-#: ../gtk/parameters.ui.h:82
+#: ../gtk/parameters.ui.h:81
 msgid "LDAP"
 msgstr "LDAP"
 
-#: ../gtk/parameters.ui.h:83
+#: ../gtk/parameters.ui.h:82
 msgid "Done"
 msgstr "Fertig"
 
@@ -1553,66 +1599,6 @@ msgstr "<b>Tunnel einrichten</b>"
 msgid "<b>Configure http proxy (optional)</b>"
 msgstr "<b>Configure http proxy (optional)</b>"
 
-#: ../gtk/keypad.ui.h:1
-msgid "D"
-msgstr "D"
-
-#: ../gtk/keypad.ui.h:2
-msgid "#"
-msgstr "#"
-
-#: ../gtk/keypad.ui.h:3
-msgid "0"
-msgstr "0"
-
-#: ../gtk/keypad.ui.h:4
-msgid "*"
-msgstr "*"
-
-#: ../gtk/keypad.ui.h:6
-msgid "9"
-msgstr "9"
-
-#: ../gtk/keypad.ui.h:7
-msgid "8"
-msgstr "8"
-
-#: ../gtk/keypad.ui.h:8
-msgid "7"
-msgstr "7"
-
-#: ../gtk/keypad.ui.h:9
-msgid "B"
-msgstr "B"
-
-#: ../gtk/keypad.ui.h:10
-msgid "6"
-msgstr "6"
-
-#: ../gtk/keypad.ui.h:11
-msgid "5"
-msgstr "5"
-
-#: ../gtk/keypad.ui.h:12
-msgid "4"
-msgstr "4"
-
-#: ../gtk/keypad.ui.h:13
-msgid "A"
-msgstr "A"
-
-#: ../gtk/keypad.ui.h:14
-msgid "3"
-msgstr "3"
-
-#: ../gtk/keypad.ui.h:15
-msgid "2"
-msgstr "2"
-
-#: ../gtk/keypad.ui.h:16
-msgid "1"
-msgstr "1"
-
 #: ../gtk/ldap.ui.h:1
 msgid "LDAP Settings"
 msgstr "LDAP-Einstellungen"
@@ -1708,13 +1694,17 @@ msgstr "Eine URI zur FErnkonfiguration angeben"
 
 #: ../gtk/config-uri.ui.h:2
 msgid ""
-"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
-msgstr "Diese Maske erlaubt Ihnen für das Laden der Konfiguration beim Programmstart eine http- oder https-Adresse anzugeben.\nBitte geben Sie unten die Konfigurations-URI ein oder ändern diese. Nach dem Bestätigen mit OK wird Linphone automatisch neustarten, um die neuen Einstellungen zu übernehmen."
-
-#: ../gtk/config-uri.ui.h:4
-msgid "https://"
-msgstr "https://"
+"This dialog allows to set an http or https address when configuration is to "
+"be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, "
+"Linphone will restart automatically in order to fetch and take into account "
+"the new configuration. "
+msgstr ""
+"Diese Maske erlaubt Ihnen für das Laden der Konfiguration beim Programmstart "
+"eine http- oder https-Adresse anzugeben.\n"
+"Bitte geben Sie unten die Konfigurations-URI ein oder ändern diese. Nach dem "
+"Bestätigen mit OK wird Linphone automatisch neustarten, um die neuen "
+"Einstellungen zu übernehmen."
 
 #: ../gtk/provisioning-fetch.ui.h:1
 msgid "Configuring..."
@@ -1722,66 +1712,63 @@ msgstr "Einstellen..."
 
 #: ../gtk/provisioning-fetch.ui.h:2
 msgid "Please wait while fetching configuration from server..."
-msgstr "Bitte warten Sie während die Einstellungen vom Server abgerufen werden..."
+msgstr ""
+"Bitte warten Sie während die Einstellungen vom Server abgerufen werden..."
 
-#: ../coreapi/linphonecore.c:1511
+#: ../coreapi/linphonecore.c:1510
 msgid "Ready"
 msgstr "Bereit"
 
-#: ../coreapi/linphonecore.c:2470
+#: ../coreapi/linphonecore.c:2473
 msgid "Configuring"
 msgstr "Einstellen"
 
-#: ../coreapi/linphonecore.c:2635
+#: ../coreapi/linphonecore.c:2638
 msgid "Looking for telephone number destination..."
 msgstr "Telefonnummernziel wird gesucht..."
 
-#: ../coreapi/linphonecore.c:2637
+#: ../coreapi/linphonecore.c:2640
 msgid "Could not resolve this number."
 msgstr "Diese Nummer kann nicht aufgelöst werden."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2919
+#: ../coreapi/linphonecore.c:2922
 msgid "Contacting"
 msgstr "Verbindungsaufbau"
 
-#: ../coreapi/linphonecore.c:2924
+#: ../coreapi/linphonecore.c:2927
 msgid "Could not call"
 msgstr "Anruf kann nicht getätigt werden."
 
-#: ../coreapi/linphonecore.c:3074
+#: ../coreapi/linphonecore.c:3077
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "Die maximale Anzahl der gleichzeitigen Anrufe ist erreicht."
 
-#: ../coreapi/linphonecore.c:3233
+#: ../coreapi/linphonecore.c:3236
 msgid "is contacting you"
 msgstr "ruft Sie an"
 
-#: ../coreapi/linphonecore.c:3234
+#: ../coreapi/linphonecore.c:3237
 msgid " and asked autoanswer."
 msgstr " und fragt nach automatischer Antwort."
 
-#: ../coreapi/linphonecore.c:3234
-msgid "."
-msgstr "."
-
-#: ../coreapi/linphonecore.c:3352
+#: ../coreapi/linphonecore.c:3355
 msgid "Modifying call parameters..."
 msgstr "Die Anrufparameter werden verändert..."
 
-#: ../coreapi/linphonecore.c:3700
+#: ../coreapi/linphonecore.c:3703
 msgid "Connected."
 msgstr "Verbunden."
 
-#: ../coreapi/linphonecore.c:3725
+#: ../coreapi/linphonecore.c:3728
 msgid "Call aborted"
 msgstr "Anruf abgebrochen"
 
-#: ../coreapi/linphonecore.c:3915
+#: ../coreapi/linphonecore.c:3918
 msgid "Could not pause the call"
 msgstr "Anruf kann nicht gehalten werden"
 
-#: ../coreapi/linphonecore.c:3919
+#: ../coreapi/linphonecore.c:3922
 msgid "Pausing the current call..."
 msgstr "Aktueller Anruf wird gehalten..."
 
@@ -1842,20 +1829,26 @@ msgid "Vacation"
 msgstr "Urlaub"
 
 #: ../coreapi/friend.c:68
-msgid "Unknown-bug"
+#, fuzzy
+msgid "Unknown status"
 msgstr "Unbekannter Fehler"
 
 #: ../coreapi/proxy.c:319
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
-msgstr "Die von Ihnen eingegebene SIP-Proxy-Adresse ist ungültig, sie muss mit „sip:“ gefolgt vom Hostnamen beginnen."
+msgstr ""
+"Die von Ihnen eingegebene SIP-Proxy-Adresse ist ungültig, sie muss mit "
+"„sip:“ gefolgt vom Hostnamen beginnen."
 
 #: ../coreapi/proxy.c:325
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
-msgstr "Die von Ihnen eingegebene SIP-Identität ist ungültig.\nSie sollte wie sip:benutzername@proxydomain aussehen, also z.B. sip:alice@beispiel.net"
+msgstr ""
+"Die von Ihnen eingegebene SIP-Identität ist ungültig.\n"
+"Sie sollte wie sip:benutzername@proxydomain aussehen, also z.B. sip:"
+"alice@beispiel.net"
 
 #: ../coreapi/proxy.c:1377
 #, c-format
@@ -1982,3 +1975,67 @@ msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
 msgstr[0] "Sie haben %i Anruf in Abwesenheit."
 msgstr[1] "Sie haben %i Anrufe in Abwesenheit."
+
+#~ msgid "https://"
+#~ msgstr "https://"
+
+#~ msgid "label"
+#~ msgstr "Hinweisschild"
+
+#~ msgid "D"
+#~ msgstr "D"
+
+#~ msgid "#"
+#~ msgstr "#"
+
+#~ msgid "0"
+#~ msgstr "0"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "9"
+#~ msgstr "9"
+
+#~ msgid "8"
+#~ msgstr "8"
+
+#~ msgid "7"
+#~ msgstr "7"
+
+#~ msgid "B"
+#~ msgstr "B"
+
+#~ msgid "6"
+#~ msgstr "6"
+
+#~ msgid "5"
+#~ msgstr "5"
+
+#~ msgid "4"
+#~ msgstr "4"
+
+#~ msgid "A"
+#~ msgstr "A"
+
+#~ msgid "3"
+#~ msgstr "3"
+
+#~ msgid "2"
+#~ msgstr "2"
+
+#~ msgid "1"
+#~ msgstr "1"
+
+#~ msgid ""
+#~ "<small><i>%s</i></small>\t\n"
+#~ "%s"
+#~ msgstr ""
+#~ "<small><i>%s</i></small>\t\n"
+#~ "%s"
+
+#~ msgid "%02i::%02i::%02i"
+#~ msgstr "%02i::%02i::%02i"
+
+#~ msgid "."
+#~ msgstr "."
diff --git a/po/es.po b/po/es.po
index a1d349dcf..b2054661d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-19 10:39+0100\n"
+"POT-Creation-Date: 2014-11-28 10:55+0100\n"
 "PO-Revision-Date: 2014-11-19 10:17+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/linphone-gtk/language/es/)\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/linphone-gtk/"
+"language/es/)\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974
@@ -62,11 +63,6 @@ msgid_plural "%i seconds"
 msgstr[0] "%i segundo"
 msgstr[1] "%i segundos"
 
-#: ../gtk/calllogs.c:335 ../gtk/calllogs.c:341
-#, c-format
-msgid "<big><b>%s</b></big>\t%s"
-msgstr ""
-
 #: ../gtk/calllogs.c:337
 #, c-format
 msgid ""
@@ -74,11 +70,9 @@ msgid ""
 "%s\t%s\t"
 msgstr ""
 
-#: ../gtk/calllogs.c:343
+#: ../gtk/calllogs.c:341
 #, c-format
-msgid ""
-"<small><i>%s</i></small>\t\n"
-"%s"
+msgid "<big><b>%s</b></big>\t%s"
 msgstr ""
 
 #: ../gtk/conference.c:38 ../gtk/main.ui.h:13
@@ -94,13 +88,14 @@ msgstr "Yo"
 msgid "Couldn't find pixmap file: %s"
 msgstr "No se pudo encontrar el archivo pixmap: %s"
 
-#: ../gtk/chat.c:364 ../gtk/friendlist.c:924
+#: ../gtk/chat.c:367 ../gtk/friendlist.c:924
 msgid "Invalid sip contact !"
 msgstr "¡Contacto SIP no válido!"
 
 #: ../gtk/main.c:107
 msgid "log to stdout some debug information while running."
-msgstr "registra a stdout cierta información de depuración durante la ejecución."
+msgstr ""
+"registra a stdout cierta información de depuración durante la ejecución."
 
 #: ../gtk/main.c:114
 msgid "path to a file to write logs into."
@@ -124,9 +119,11 @@ msgstr "si está activo, responder a llamadas entrantes automáticamente"
 
 #: ../gtk/main.c:149
 msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: "
-"c:\\Program Files\\Linphone)"
-msgstr "Especifique un directorio de trabajo (debería ser la raíz de la instalación, ej: c:\\Archivos de Programa\\Linphone)"
+"Specifiy a working directory (should be the base of the installation, eg: c:"
+"\\Program Files\\Linphone)"
+msgstr ""
+"Especifique un directorio de trabajo (debería ser la raíz de la instalación, "
+"ej: c:\\Archivos de Programa\\Linphone)"
 
 #: ../gtk/main.c:156
 msgid "Configuration file"
@@ -140,9 +137,14 @@ msgstr ""
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
-"Would you allow him to see your presence status or add him to your contact list ?\n"
+"Would you allow him to see your presence status or add him to your contact "
+"list ?\n"
 "If you answer no, this person will be temporarily blacklisted."
-msgstr "%s desea añadirle a su lista de contactos.\n¿Desea permitirle ver su estado de presencia o añadirle a su lista de contactos?\nSi responde no, esta persona será bloqueada temporalmente."
+msgstr ""
+"%s desea añadirle a su lista de contactos.\n"
+"¿Desea permitirle ver su estado de presencia o añadirle a su lista de "
+"contactos?\n"
+"Si responde no, esta persona será bloqueada temporalmente."
 
 #: ../gtk/main.c:1162
 #, c-format
@@ -155,7 +157,7 @@ msgstr ""
 msgid "Call error"
 msgstr ""
 
-#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3744
+#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3747
 msgid "Call ended"
 msgstr ""
 
@@ -207,7 +209,9 @@ msgstr "Somos transferidos a %s"
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
-msgstr "No se ha encontrado una tarjeta de sonido en este equipo.\nNo será posible realizar o recibir llamadas de audio."
+msgstr ""
+"No se ha encontrado una tarjeta de sonido en este equipo.\n"
+"No será posible realizar o recibir llamadas de audio."
 
 #: ../gtk/main.c:2157
 msgid "A free SIP video-phone"
@@ -414,10 +418,13 @@ msgstr[0] "Se encontró %i contacto"
 msgstr[1] "Se encontraron %i contactos"
 
 #: ../gtk/setupwizard.c:34
+#, fuzzy
 msgid ""
-"Welcome !\n"
+"Welcome!\n"
 "This assistant will help you to use a SIP account for your calls."
-msgstr "¡Bienvenido/a !\nEste asistente le ayudará a utilizar una cuenta SIP para sus llamadas."
+msgstr ""
+"¡Bienvenido/a !\n"
+"Este asistente le ayudará a utilizar una cuenta SIP para sus llamadas."
 
 #: ../gtk/setupwizard.c:43
 msgid "Create an account on linphone.org"
@@ -503,43 +510,44 @@ msgstr "Gracias. Su cuenta está configurada y lista para su utilización."
 
 #: ../gtk/setupwizard.c:413
 msgid ""
-"Please validate your account by clicking on the link we just sent you by email.\n"
+"Please validate your account by clicking on the link we just sent you by "
+"email.\n"
 "Then come back here and press Next button."
 msgstr ""
 
-#: ../gtk/setupwizard.c:600
+#: ../gtk/setupwizard.c:602
 msgid "SIP account configuration assistant"
 msgstr ""
 
-#: ../gtk/setupwizard.c:618
+#: ../gtk/setupwizard.c:620
 msgid "Welcome to the account setup assistant"
 msgstr "Bienvenido al asistente de configuración de cuenta"
 
-#: ../gtk/setupwizard.c:623
+#: ../gtk/setupwizard.c:625
 msgid "Account setup assistant"
 msgstr "Asistente de configuración de cuenta"
 
-#: ../gtk/setupwizard.c:629
+#: ../gtk/setupwizard.c:631
 msgid "Configure your account (step 1/1)"
 msgstr ""
 
-#: ../gtk/setupwizard.c:634
+#: ../gtk/setupwizard.c:636
 msgid "Enter your sip username (step 1/1)"
 msgstr ""
 
-#: ../gtk/setupwizard.c:638
+#: ../gtk/setupwizard.c:640
 msgid "Enter account information (step 1/2)"
 msgstr ""
 
-#: ../gtk/setupwizard.c:647
+#: ../gtk/setupwizard.c:649
 msgid "Validation (step 2/2)"
 msgstr ""
 
-#: ../gtk/setupwizard.c:652
+#: ../gtk/setupwizard.c:654
 msgid "Error"
 msgstr ""
 
-#: ../gtk/setupwizard.c:656 ../gtk/audio_assistant.c:527
+#: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:527
 msgid "Terminating"
 msgstr ""
 
@@ -691,11 +699,6 @@ msgstr ""
 msgid "<b>Paused call</b>"
 msgstr ""
 
-#: ../gtk/incall_view.c:771
-#, c-format
-msgid "%02i::%02i::%02i"
-msgstr "%02i::%02i::%02i"
-
 #: ../gtk/incall_view.c:794
 msgid "<b>Call ended.</b>"
 msgstr ""
@@ -763,10 +766,13 @@ msgid "Too loud"
 msgstr ""
 
 #: ../gtk/audio_assistant.c:318
+#, fuzzy
 msgid ""
-"Welcome !\n"
+"Welcome!\n"
 "This assistant will help you to configure audio settings for Linphone"
 msgstr ""
+"¡Bienvenido/a !\n"
+"Este asistente le ayudará a utilizar una cuenta SIP para sus llamadas."
 
 #: ../gtk/audio_assistant.c:328
 msgid "Capture device"
@@ -973,7 +979,7 @@ msgid "Login information"
 msgstr ""
 
 #: ../gtk/main.ui.h:46
-msgid "<b>Welcome !</b>"
+msgid "<b>Welcome!</b>"
 msgstr ""
 
 #: ../gtk/main.ui.h:47
@@ -981,16 +987,18 @@ msgid "Delete"
 msgstr ""
 
 #: ../gtk/about.ui.h:1
-msgid "About linphone"
+msgid "About Linphone"
 msgstr ""
 
 #: ../gtk/about.ui.h:2
-msgid "(C) Belledonne Communications,2010\n"
+msgid "(C) Belledonne Communications, 2010\n"
 msgstr ""
 
 #: ../gtk/about.ui.h:4
 msgid "An internet video phone using the standard SIP (rfc3261) protocol."
-msgstr "Un vídeo-teléfono a través de Internet que usa el protocolo estándar SIP (rfc3261)"
+msgstr ""
+"Un vídeo-teléfono a través de Internet que usa el protocolo estándar SIP "
+"(rfc3261)"
 
 #: ../gtk/about.ui.h:5
 msgid ""
@@ -1148,7 +1156,7 @@ msgstr ""
 msgid "Video codecs"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:10 ../gtk/keypad.ui.h:5
+#: ../gtk/parameters.ui.h:10
 msgid "C"
 msgstr "C"
 
@@ -1392,7 +1400,9 @@ msgstr "Activar control de frecuencia adaptativo"
 msgid ""
 "<i>Adaptive rate control is a technique to dynamically guess the available "
 "bandwidth during a call.</i>"
-msgstr "<i>Control de frecuencia adaptativo es una técnica que estima dinámicamente el ancho de banda disponible durante la llamada.</i>"
+msgstr ""
+"<i>Control de frecuencia adaptativo es una técnica que estima dinámicamente "
+"el ancho de banda disponible durante la llamada.</i>"
 
 #: ../gtk/parameters.ui.h:71
 msgid "<b>Bandwidth control</b>"
@@ -1427,18 +1437,14 @@ msgid "Authentication method:"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:80
-msgid "label"
-msgstr "etiqueta"
-
-#: ../gtk/parameters.ui.h:81
 msgid "<b>LDAP Account setup</b>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:82
+#: ../gtk/parameters.ui.h:81
 msgid "LDAP"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:83
+#: ../gtk/parameters.ui.h:82
 msgid "Done"
 msgstr ""
 
@@ -1550,66 +1556,6 @@ msgstr ""
 msgid "<b>Configure http proxy (optional)</b>"
 msgstr ""
 
-#: ../gtk/keypad.ui.h:1
-msgid "D"
-msgstr "D"
-
-#: ../gtk/keypad.ui.h:2
-msgid "#"
-msgstr "#"
-
-#: ../gtk/keypad.ui.h:3
-msgid "0"
-msgstr "0"
-
-#: ../gtk/keypad.ui.h:4
-msgid "*"
-msgstr "*"
-
-#: ../gtk/keypad.ui.h:6
-msgid "9"
-msgstr "9"
-
-#: ../gtk/keypad.ui.h:7
-msgid "8"
-msgstr "8"
-
-#: ../gtk/keypad.ui.h:8
-msgid "7"
-msgstr "7"
-
-#: ../gtk/keypad.ui.h:9
-msgid "B"
-msgstr "B"
-
-#: ../gtk/keypad.ui.h:10
-msgid "6"
-msgstr "6"
-
-#: ../gtk/keypad.ui.h:11
-msgid "5"
-msgstr "5"
-
-#: ../gtk/keypad.ui.h:12
-msgid "4"
-msgstr "4"
-
-#: ../gtk/keypad.ui.h:13
-msgid "A"
-msgstr "A"
-
-#: ../gtk/keypad.ui.h:14
-msgid "3"
-msgstr "3"
-
-#: ../gtk/keypad.ui.h:15
-msgid "2"
-msgstr "2"
-
-#: ../gtk/keypad.ui.h:16
-msgid "1"
-msgstr "1"
-
 #: ../gtk/ldap.ui.h:1
 msgid "LDAP Settings"
 msgstr ""
@@ -1705,12 +1651,11 @@ msgstr ""
 
 #: ../gtk/config-uri.ui.h:2
 msgid ""
-"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
-msgstr ""
-
-#: ../gtk/config-uri.ui.h:4
-msgid "https://"
+"This dialog allows to set an http or https address when configuration is to "
+"be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, "
+"Linphone will restart automatically in order to fetch and take into account "
+"the new configuration. "
 msgstr ""
 
 #: ../gtk/provisioning-fetch.ui.h:1
@@ -1721,64 +1666,60 @@ msgstr ""
 msgid "Please wait while fetching configuration from server..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1511
+#: ../coreapi/linphonecore.c:1510
 msgid "Ready"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2470
+#: ../coreapi/linphonecore.c:2473
 msgid "Configuring"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2635
+#: ../coreapi/linphonecore.c:2638
 msgid "Looking for telephone number destination..."
 msgstr "Buscando el número de teléfono del destinatario…"
 
-#: ../coreapi/linphonecore.c:2637
+#: ../coreapi/linphonecore.c:2640
 msgid "Could not resolve this number."
 msgstr "No se ha podido resolver este número."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2919
+#: ../coreapi/linphonecore.c:2922
 msgid "Contacting"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2924
+#: ../coreapi/linphonecore.c:2927
 msgid "Could not call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3074
+#: ../coreapi/linphonecore.c:3077
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "Disculpe, se ha alcanzado el máximo número de llamadas simultáneas"
 
-#: ../coreapi/linphonecore.c:3233
+#: ../coreapi/linphonecore.c:3236
 msgid "is contacting you"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3234
+#: ../coreapi/linphonecore.c:3237
 msgid " and asked autoanswer."
 msgstr "y ha solicitado auto respuesta."
 
-#: ../coreapi/linphonecore.c:3234
-msgid "."
-msgstr "."
-
-#: ../coreapi/linphonecore.c:3352
+#: ../coreapi/linphonecore.c:3355
 msgid "Modifying call parameters..."
 msgstr "Modificando parámetros de llamada…"
 
-#: ../coreapi/linphonecore.c:3700
+#: ../coreapi/linphonecore.c:3703
 msgid "Connected."
 msgstr "Conectado."
 
-#: ../coreapi/linphonecore.c:3725
+#: ../coreapi/linphonecore.c:3728
 msgid "Call aborted"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3915
+#: ../coreapi/linphonecore.c:3918
 msgid "Could not pause the call"
 msgstr "No se pudo pausar la llamada"
 
-#: ../coreapi/linphonecore.c:3919
+#: ../coreapi/linphonecore.c:3922
 msgid "Pausing the current call..."
 msgstr "Pausando la llamada actual..."
 
@@ -1839,20 +1780,26 @@ msgid "Vacation"
 msgstr ""
 
 #: ../coreapi/friend.c:68
-msgid "Unknown-bug"
+#, fuzzy
+msgid "Unknown status"
 msgstr "Bug-desconocido"
 
 #: ../coreapi/proxy.c:319
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
-msgstr "La dirección del Proxy SIP que ha introducido no es válida, debe empezar con \"sip:\" seguido del hostname."
+msgstr ""
+"La dirección del Proxy SIP que ha introducido no es válida, debe empezar con "
+"\"sip:\" seguido del hostname."
 
 #: ../coreapi/proxy.c:325
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
-msgstr "La identidad SIP que ha introducido no es válida.\nDebe ser del tipo sip:username@proxydomain, como por ejemplo sip:alice@example.net"
+msgstr ""
+"La identidad SIP que ha introducido no es válida.\n"
+"Debe ser del tipo sip:username@proxydomain, como por ejemplo sip:"
+"alice@example.net"
 
 #: ../coreapi/proxy.c:1377
 #, c-format
@@ -1979,3 +1926,57 @@ msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
 msgstr[0] "Tiene %i llamada perdida."
 msgstr[1] "Tiene %i llamadas perdidas."
+
+#~ msgid "label"
+#~ msgstr "etiqueta"
+
+#~ msgid "D"
+#~ msgstr "D"
+
+#~ msgid "#"
+#~ msgstr "#"
+
+#~ msgid "0"
+#~ msgstr "0"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "9"
+#~ msgstr "9"
+
+#~ msgid "8"
+#~ msgstr "8"
+
+#~ msgid "7"
+#~ msgstr "7"
+
+#~ msgid "B"
+#~ msgstr "B"
+
+#~ msgid "6"
+#~ msgstr "6"
+
+#~ msgid "5"
+#~ msgstr "5"
+
+#~ msgid "4"
+#~ msgstr "4"
+
+#~ msgid "A"
+#~ msgstr "A"
+
+#~ msgid "3"
+#~ msgstr "3"
+
+#~ msgid "2"
+#~ msgstr "2"
+
+#~ msgid "1"
+#~ msgstr "1"
+
+#~ msgid "%02i::%02i::%02i"
+#~ msgstr "%02i::%02i::%02i"
+
+#~ msgid "."
+#~ msgstr "."
diff --git a/po/fr.po b/po/fr.po
index ce23e2726..5e64f94e2 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>, 2014
 # Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>, 2014
@@ -11,14 +11,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-19 10:39+0100\n"
+"POT-Creation-Date: 2014-11-28 10:55+0100\n"
 "PO-Revision-Date: 2014-11-27 15:47+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/linphone-gtk/language/fr/)\n"
+"Language-Team: French (http://www.transifex.com/projects/p/linphone-gtk/"
+"language/fr/)\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974
@@ -66,24 +67,19 @@ msgid_plural "%i seconds"
 msgstr[0] "%i seconde"
 msgstr[1] "%i secondes"
 
-#: ../gtk/calllogs.c:335 ../gtk/calllogs.c:341
-#, c-format
-msgid "<big><b>%s</b></big>\t%s"
-msgstr "<big><b>%s</b></big>\t%s"
-
 #: ../gtk/calllogs.c:337
 #, c-format
 msgid ""
 "<small><i>%s</i>\t<i>Quality: %s</i></small>\n"
 "%s\t%s\t"
-msgstr "<small><i>%s</i>\t<i>Qualité: %s</i></small>\n%s\t%s\t"
+msgstr ""
+"<small><i>%s</i>\t<i>Qualité: %s</i></small>\n"
+"%s\t%s\t"
 
-#: ../gtk/calllogs.c:343
+#: ../gtk/calllogs.c:341
 #, c-format
-msgid ""
-"<small><i>%s</i></small>\t\n"
-"%s"
-msgstr "<small><i>%s</i></small>\t\n%s"
+msgid "<big><b>%s</b></big>\t%s"
+msgstr "<big><b>%s</b></big>\t%s"
 
 #: ../gtk/conference.c:38 ../gtk/main.ui.h:13
 msgid "Conference"
@@ -98,7 +94,7 @@ msgstr "Moi"
 msgid "Couldn't find pixmap file: %s"
 msgstr "Icone non trouvée: %s"
 
-#: ../gtk/chat.c:364 ../gtk/friendlist.c:924
+#: ../gtk/chat.c:367 ../gtk/friendlist.c:924
 msgid "Invalid sip contact !"
 msgstr "Contact sip invalide !"
 
@@ -128,9 +124,11 @@ msgstr "si positionné, répond automatiquement aux appels entrants"
 
 #: ../gtk/main.c:149
 msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: "
-"c:\\Program Files\\Linphone)"
-msgstr "Spécifie un répertoire de travail (qui devrait être le répertoire d'installation, par exemple c:\\Program Files\\Linphone)"
+"Specifiy a working directory (should be the base of the installation, eg: c:"
+"\\Program Files\\Linphone)"
+msgstr ""
+"Spécifie un répertoire de travail (qui devrait être le répertoire "
+"d'installation, par exemple c:\\Program Files\\Linphone)"
 
 #: ../gtk/main.c:156
 msgid "Configuration file"
@@ -144,22 +142,30 @@ msgstr "Démarre l'assistant audio"
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
-"Would you allow him to see your presence status or add him to your contact list ?\n"
+"Would you allow him to see your presence status or add him to your contact "
+"list ?\n"
 "If you answer no, this person will be temporarily blacklisted."
-msgstr "%s souhaite vous ajouter à sa liste de contact.\nSouhaitez vous l'autoriser à voir votre information de présence et l'ajouter à votre liste également ?\nSi vous répondez non, cette personne sera mise temporairement sur liste noire."
+msgstr ""
+"%s souhaite vous ajouter à sa liste de contact.\n"
+"Souhaitez vous l'autoriser à voir votre information de présence et l'ajouter "
+"à votre liste également ?\n"
+"Si vous répondez non, cette personne sera mise temporairement sur liste "
+"noire."
 
 #: ../gtk/main.c:1162
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
-msgstr "Entrez le mot de passe pour <i>%s</i>\n sur le domaine <i>%s</i>:"
+msgstr ""
+"Entrez le mot de passe pour <i>%s</i>\n"
+" sur le domaine <i>%s</i>:"
 
 #: ../gtk/main.c:1283
 msgid "Call error"
 msgstr "Erreur lors de l'appel"
 
-#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3744
+#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3747
 msgid "Call ended"
 msgstr "Appel terminé."
 
@@ -211,7 +217,9 @@ msgstr "Transfert vers %s"
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
-msgstr "Aucune carte son n'a été détectée sur cet ordinateur.\nVous ne pourrez pas effectuer d'appels audio."
+msgstr ""
+"Aucune carte son n'a été détectée sur cet ordinateur.\n"
+"Vous ne pourrez pas effectuer d'appels audio."
 
 #: ../gtk/main.c:2157
 msgid "A free SIP video-phone"
@@ -365,7 +373,9 @@ msgstr "Serbe"
 #: ../gtk/propertybox.c:1156
 msgid ""
 "You need to restart linphone for the new language selection to take effect."
-msgstr "La nouvelle selection de langue prendra effet au prochain démarrage de linphone."
+msgstr ""
+"La nouvelle selection de langue prendra effet au prochain démarrage de "
+"linphone."
 
 #: ../gtk/propertybox.c:1234
 msgid "None"
@@ -384,7 +394,10 @@ msgstr "ZRTP"
 msgid ""
 "A more recent version is availalble from %s.\n"
 "Would you like to open a browser to download it ?"
-msgstr "Une version plus récente est disponible sur %s.\nVoulez vous ouvrir le navigateur afin de pouvoir télécharger la dernière version ?"
+msgstr ""
+"Une version plus récente est disponible sur %s.\n"
+"Voulez vous ouvrir le navigateur afin de pouvoir télécharger la dernière "
+"version ?"
 
 #: ../gtk/update.c:91
 msgid "You are running the lastest version."
@@ -418,10 +431,13 @@ msgstr[0] "%i contact trouvé."
 msgstr[1] "%i contacts trouvés."
 
 #: ../gtk/setupwizard.c:34
+#, fuzzy
 msgid ""
-"Welcome !\n"
+"Welcome!\n"
 "This assistant will help you to use a SIP account for your calls."
-msgstr "Bienvenue!\nCet assistant va vous aider à utiliser un compte SIP pour vos appels."
+msgstr ""
+"Bienvenue!\n"
+"Cet assistant va vous aider à utiliser un compte SIP pour vos appels."
 
 #: ../gtk/setupwizard.c:43
 msgid "Create an account on linphone.org"
@@ -499,7 +515,10 @@ msgstr "Me tenir informer des mises à jour de Linphone "
 msgid ""
 "Error, account not validated, username already used or server unreachable.\n"
 "Please go back and try again."
-msgstr "Erreur, le compte n'est pas validé, l'identifiant est déjà utilisé ou le serveur n'est pas accessible.\nMerci d'essayer à nouveau."
+msgstr ""
+"Erreur, le compte n'est pas validé, l'identifiant est déjà utilisé ou le "
+"serveur n'est pas accessible.\n"
+"Merci d'essayer à nouveau."
 
 #: ../gtk/setupwizard.c:405
 msgid "Thank you. Your account is now configured and ready for use."
@@ -507,43 +526,47 @@ msgstr "Merci. Votre compte est maintenant configuré et prêt à être utilisé
 
 #: ../gtk/setupwizard.c:413
 msgid ""
-"Please validate your account by clicking on the link we just sent you by email.\n"
+"Please validate your account by clicking on the link we just sent you by "
+"email.\n"
 "Then come back here and press Next button."
-msgstr "Merci de valider votre compte en cliquant sur le lien que nous avons envoyé par email.\nPuis appuyez sur suivant."
+msgstr ""
+"Merci de valider votre compte en cliquant sur le lien que nous avons envoyé "
+"par email.\n"
+"Puis appuyez sur suivant."
 
-#: ../gtk/setupwizard.c:600
+#: ../gtk/setupwizard.c:602
 msgid "SIP account configuration assistant"
 msgstr "Assistant de configuration de compte."
 
-#: ../gtk/setupwizard.c:618
+#: ../gtk/setupwizard.c:620
 msgid "Welcome to the account setup assistant"
 msgstr "Bienvenue dans l'assistant de configuration de compte."
 
-#: ../gtk/setupwizard.c:623
+#: ../gtk/setupwizard.c:625
 msgid "Account setup assistant"
 msgstr "Assistant de configuration de compte."
 
-#: ../gtk/setupwizard.c:629
+#: ../gtk/setupwizard.c:631
 msgid "Configure your account (step 1/1)"
 msgstr "Configurez votre compte (étape 1/1)"
 
-#: ../gtk/setupwizard.c:634
+#: ../gtk/setupwizard.c:636
 msgid "Enter your sip username (step 1/1)"
 msgstr "Entrez votre identifiant sip (étape 1/1)"
 
-#: ../gtk/setupwizard.c:638
+#: ../gtk/setupwizard.c:640
 msgid "Enter account information (step 1/2)"
 msgstr "Entrez les informations concernant votre compte (étape 1/2)"
 
-#: ../gtk/setupwizard.c:647
+#: ../gtk/setupwizard.c:649
 msgid "Validation (step 2/2)"
 msgstr "Validation (étape 2/2)"
 
-#: ../gtk/setupwizard.c:652
+#: ../gtk/setupwizard.c:654
 msgid "Error"
 msgstr "Erreur"
 
-#: ../gtk/setupwizard.c:656 ../gtk/audio_assistant.c:527
+#: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:527
 msgid "Terminating"
 msgstr "En cours d’arrêt."
 
@@ -695,11 +718,6 @@ msgstr "<b>Appel en cours</b>"
 msgid "<b>Paused call</b>"
 msgstr "<b>Appel en attente</b>"
 
-#: ../gtk/incall_view.c:771
-#, c-format
-msgid "%02i::%02i::%02i"
-msgstr "%02i::%02i::%02i"
-
 #: ../gtk/incall_view.c:794
 msgid "<b>Call ended.</b>"
 msgstr "<b>Appel terminé.</b>"
@@ -729,7 +747,9 @@ msgstr "Pause"
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
-msgstr "<small><i>Enregistrement dans\n%s %s</i></small>"
+msgstr ""
+"<small><i>Enregistrement dans\n"
+"%s %s</i></small>"
 
 #: ../gtk/incall_view.c:948
 msgid "(Paused)"
@@ -767,10 +787,14 @@ msgid "Too loud"
 msgstr "Trop bruyant"
 
 #: ../gtk/audio_assistant.c:318
+#, fuzzy
 msgid ""
-"Welcome !\n"
+"Welcome!\n"
 "This assistant will help you to configure audio settings for Linphone"
-msgstr "Bienvenue!\nCet assistant va vous aider à régler les paramètres audio de votre ordinateur pour une utilisation optimale avec Linphone."
+msgstr ""
+"Bienvenue!\n"
+"Cet assistant va vous aider à régler les paramètres audio de votre "
+"ordinateur pour une utilisation optimale avec Linphone."
 
 #: ../gtk/audio_assistant.c:328
 msgid "Capture device"
@@ -977,7 +1001,8 @@ msgid "Login information"
 msgstr "Information de login"
 
 #: ../gtk/main.ui.h:46
-msgid "<b>Welcome !</b>"
+#, fuzzy
+msgid "<b>Welcome!</b>"
 msgstr "<b>Bienvenue !</b>"
 
 #: ../gtk/main.ui.h:47
@@ -985,11 +1010,13 @@ msgid "Delete"
 msgstr "Supprimer"
 
 #: ../gtk/about.ui.h:1
-msgid "About linphone"
+#, fuzzy
+msgid "About Linphone"
 msgstr "A propos de linphone"
 
 #: ../gtk/about.ui.h:2
-msgid "(C) Belledonne Communications,2010\n"
+#, fuzzy
+msgid "(C) Belledonne Communications, 2010\n"
 msgstr "(C) Belledonne Communications, 2010\n"
 
 #: ../gtk/about.ui.h:4
@@ -1010,7 +1037,19 @@ msgid ""
 "cs: Petr Pisar <petr.pisar@atlas.cz>\n"
 "hu: anonymous\n"
 "he: Eli Zaretskii <eliz@gnu.org>\n"
-msgstr "fr: Simon Morlat\nen: Simon Morlat and Delphine Perreau\nit: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\nde: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\nsv: Daniel Nylander <po@danielnylander.se>\nes: Jesus Benitez <gnelson at inMail dot sk>\nja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\npt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\npl: Robert Nasiadek <darkone@darkone.pl>\ncs: Petr Pisar <petr.pisar@atlas.cz>\nhu: anonymous\nhe: Eli Zaretskii <eliz@gnu.org>\n"
+msgstr ""
+"fr: Simon Morlat\n"
+"en: Simon Morlat and Delphine Perreau\n"
+"it: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\n"
+"de: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\n"
+"sv: Daniel Nylander <po@danielnylander.se>\n"
+"es: Jesus Benitez <gnelson at inMail dot sk>\n"
+"ja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\n"
+"pt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\n"
+"pl: Robert Nasiadek <darkone@darkone.pl>\n"
+"cs: Petr Pisar <petr.pisar@atlas.cz>\n"
+"hu: anonymous\n"
+"he: Eli Zaretskii <eliz@gnu.org>\n"
 
 #: ../gtk/contact.ui.h:2
 msgid "SIP Address"
@@ -1152,7 +1191,7 @@ msgstr "Codecs audio"
 msgid "Video codecs"
 msgstr "Codecs vidéo"
 
-#: ../gtk/parameters.ui.h:10 ../gtk/keypad.ui.h:5
+#: ../gtk/parameters.ui.h:10
 msgid "C"
 msgstr "C"
 
@@ -1314,7 +1353,9 @@ msgstr "Paramètres multimedia"
 
 #: ../gtk/parameters.ui.h:50
 msgid "This section defines your SIP address when not using a SIP account"
-msgstr "Cette rubrique permet de définir son adresse SIP lorsqu'on ne possède pas de compte SIP"
+msgstr ""
+"Cette rubrique permet de définir son adresse SIP lorsqu'on ne possède pas de "
+"compte SIP"
 
 #: ../gtk/parameters.ui.h:51
 msgid "Your display name (eg: John Doe):"
@@ -1396,7 +1437,10 @@ msgstr "Activer le control de débit adaptatif."
 msgid ""
 "<i>Adaptive rate control is a technique to dynamically guess the available "
 "bandwidth during a call.</i>"
-msgstr "<i>Le control de débit adaptatif est une technique pour adapter la qualité de l'audio et de la video en fonction de la bande passante disponible, durant l'appel.</i>"
+msgstr ""
+"<i>Le control de débit adaptatif est une technique pour adapter la qualité "
+"de l'audio et de la video en fonction de la bande passante disponible, "
+"durant l'appel.</i>"
 
 #: ../gtk/parameters.ui.h:71
 msgid "<b>Bandwidth control</b>"
@@ -1431,18 +1475,14 @@ msgid "Authentication method:"
 msgstr "Méthode d'authentification:"
 
 #: ../gtk/parameters.ui.h:80
-msgid "label"
-msgstr "label"
-
-#: ../gtk/parameters.ui.h:81
 msgid "<b>LDAP Account setup</b>"
 msgstr "<b>Configuration LDAP</b>"
 
-#: ../gtk/parameters.ui.h:82
+#: ../gtk/parameters.ui.h:81
 msgid "LDAP"
 msgstr "LDAP"
 
-#: ../gtk/parameters.ui.h:83
+#: ../gtk/parameters.ui.h:82
 msgid "Done"
 msgstr "Fermer"
 
@@ -1554,66 +1594,6 @@ msgstr "<b>Configuration du tunnel</b>"
 msgid "<b>Configure http proxy (optional)</b>"
 msgstr "<b>Configuration d'un proxy http (optionel)</b>"
 
-#: ../gtk/keypad.ui.h:1
-msgid "D"
-msgstr "D"
-
-#: ../gtk/keypad.ui.h:2
-msgid "#"
-msgstr "#"
-
-#: ../gtk/keypad.ui.h:3
-msgid "0"
-msgstr "0"
-
-#: ../gtk/keypad.ui.h:4
-msgid "*"
-msgstr "*"
-
-#: ../gtk/keypad.ui.h:6
-msgid "9"
-msgstr "9"
-
-#: ../gtk/keypad.ui.h:7
-msgid "8"
-msgstr "8"
-
-#: ../gtk/keypad.ui.h:8
-msgid "7"
-msgstr "7"
-
-#: ../gtk/keypad.ui.h:9
-msgid "B"
-msgstr "B"
-
-#: ../gtk/keypad.ui.h:10
-msgid "6"
-msgstr "6"
-
-#: ../gtk/keypad.ui.h:11
-msgid "5"
-msgstr "5"
-
-#: ../gtk/keypad.ui.h:12
-msgid "4"
-msgstr "4"
-
-#: ../gtk/keypad.ui.h:13
-msgid "A"
-msgstr "A"
-
-#: ../gtk/keypad.ui.h:14
-msgid "3"
-msgstr "3"
-
-#: ../gtk/keypad.ui.h:15
-msgid "2"
-msgstr "2"
-
-#: ../gtk/keypad.ui.h:16
-msgid "1"
-msgstr "1"
-
 #: ../gtk/ldap.ui.h:1
 msgid "LDAP Settings"
 msgstr "Paramètres LDAP"
@@ -1709,13 +1689,17 @@ msgstr "Spécifier une URI de configuration"
 
 #: ../gtk/config-uri.ui.h:2
 msgid ""
-"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
-msgstr "Cette boite de dialogue vous permet de spécifier une addresse http ou https où la configuration doit être téléchargée au démarrage.\nVeuillez entrer l'URI http(s) ci dessous. Après avoir validé, Linphone va redémarrer automatiquement pour charger et prendre en compte la nouvelle configuration."
-
-#: ../gtk/config-uri.ui.h:4
-msgid "https://"
-msgstr "https://"
+"This dialog allows to set an http or https address when configuration is to "
+"be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, "
+"Linphone will restart automatically in order to fetch and take into account "
+"the new configuration. "
+msgstr ""
+"Cette boite de dialogue vous permet de spécifier une addresse http ou https "
+"où la configuration doit être téléchargée au démarrage.\n"
+"Veuillez entrer l'URI http(s) ci dessous. Après avoir validé, Linphone va "
+"redémarrer automatiquement pour charger et prendre en compte la nouvelle "
+"configuration."
 
 #: ../gtk/provisioning-fetch.ui.h:1
 msgid "Configuring..."
@@ -1723,66 +1707,64 @@ msgstr "Configuration en cours"
 
 #: ../gtk/provisioning-fetch.ui.h:2
 msgid "Please wait while fetching configuration from server..."
-msgstr "Veuillez patenter un instant pendant le chargement de la configuration distante..."
+msgstr ""
+"Veuillez patenter un instant pendant le chargement de la configuration "
+"distante..."
 
-#: ../coreapi/linphonecore.c:1511
+#: ../coreapi/linphonecore.c:1510
 msgid "Ready"
 msgstr "Prêt."
 
-#: ../coreapi/linphonecore.c:2470
+#: ../coreapi/linphonecore.c:2473
 msgid "Configuring"
 msgstr "Configuration en cours"
 
-#: ../coreapi/linphonecore.c:2635
+#: ../coreapi/linphonecore.c:2638
 msgid "Looking for telephone number destination..."
 msgstr "Recherche de la destination du numéro de téléphone..."
 
-#: ../coreapi/linphonecore.c:2637
+#: ../coreapi/linphonecore.c:2640
 msgid "Could not resolve this number."
 msgstr "La destination n'a pu être trouvée."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2919
+#: ../coreapi/linphonecore.c:2922
 msgid "Contacting"
 msgstr "Appel de"
 
-#: ../coreapi/linphonecore.c:2924
+#: ../coreapi/linphonecore.c:2927
 msgid "Could not call"
 msgstr "Echec de l'appel"
 
-#: ../coreapi/linphonecore.c:3074
+#: ../coreapi/linphonecore.c:3077
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "Désolé, le nombre maximum d'appels simultanés est atteint."
 
-#: ../coreapi/linphonecore.c:3233
+#: ../coreapi/linphonecore.c:3236
 msgid "is contacting you"
 msgstr "vous appelle"
 
-#: ../coreapi/linphonecore.c:3234
+#: ../coreapi/linphonecore.c:3237
 msgid " and asked autoanswer."
 msgstr "et sollicite un décrochage automatique."
 
-#: ../coreapi/linphonecore.c:3234
-msgid "."
-msgstr "."
-
-#: ../coreapi/linphonecore.c:3352
+#: ../coreapi/linphonecore.c:3355
 msgid "Modifying call parameters..."
 msgstr "Modifications des paramètres d'appels..."
 
-#: ../coreapi/linphonecore.c:3700
+#: ../coreapi/linphonecore.c:3703
 msgid "Connected."
 msgstr "En ligne."
 
-#: ../coreapi/linphonecore.c:3725
+#: ../coreapi/linphonecore.c:3728
 msgid "Call aborted"
 msgstr "Appel abandonné"
 
-#: ../coreapi/linphonecore.c:3915
+#: ../coreapi/linphonecore.c:3918
 msgid "Could not pause the call"
 msgstr "La mise en attente a échoué"
 
-#: ../coreapi/linphonecore.c:3919
+#: ../coreapi/linphonecore.c:3922
 msgid "Pausing the current call..."
 msgstr "Mise en attente de l'appel..."
 
@@ -1843,20 +1825,26 @@ msgid "Vacation"
 msgstr "En congé"
 
 #: ../coreapi/friend.c:68
-msgid "Unknown-bug"
+#, fuzzy
+msgid "Unknown status"
 msgstr "Bug inconnu"
 
 #: ../coreapi/proxy.c:319
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
-msgstr "L'adresse SIP du proxy est invalide. Elle doit commencer par \"sip:\" suivie par un nom de domaine."
+msgstr ""
+"L'adresse SIP du proxy est invalide. Elle doit commencer par \"sip:\" suivie "
+"par un nom de domaine."
 
 #: ../coreapi/proxy.c:325
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
-msgstr "L'identité SIP que vous avez fourni est invalide.\nElle doit être de la forme sip:username@domain, comme par example sip:alice@example.net"
+msgstr ""
+"L'identité SIP que vous avez fourni est invalide.\n"
+"Elle doit être de la forme sip:username@domain, comme par example sip:"
+"alice@example.net"
 
 #: ../coreapi/proxy.c:1377
 #, c-format
@@ -1983,3 +1971,67 @@ msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
 msgstr[0] "Vous avez manqué %i appel"
 msgstr[1] "Vous avez manqué %i appels"
+
+#~ msgid "https://"
+#~ msgstr "https://"
+
+#~ msgid "label"
+#~ msgstr "label"
+
+#~ msgid "D"
+#~ msgstr "D"
+
+#~ msgid "#"
+#~ msgstr "#"
+
+#~ msgid "0"
+#~ msgstr "0"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "9"
+#~ msgstr "9"
+
+#~ msgid "8"
+#~ msgstr "8"
+
+#~ msgid "7"
+#~ msgstr "7"
+
+#~ msgid "B"
+#~ msgstr "B"
+
+#~ msgid "6"
+#~ msgstr "6"
+
+#~ msgid "5"
+#~ msgstr "5"
+
+#~ msgid "4"
+#~ msgstr "4"
+
+#~ msgid "A"
+#~ msgstr "A"
+
+#~ msgid "3"
+#~ msgstr "3"
+
+#~ msgid "2"
+#~ msgstr "2"
+
+#~ msgid "1"
+#~ msgstr "1"
+
+#~ msgid ""
+#~ "<small><i>%s</i></small>\t\n"
+#~ "%s"
+#~ msgstr ""
+#~ "<small><i>%s</i></small>\t\n"
+#~ "%s"
+
+#~ msgid "%02i::%02i::%02i"
+#~ msgstr "%02i::%02i::%02i"
+
+#~ msgid "."
+#~ msgstr "."
diff --git a/po/he.po b/po/he.po
index 6a1730255..e25b70afb 100644
--- a/po/he.po
+++ b/po/he.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Eli Zaretskii <eliz@gnu.org>, 2012
 # GenghisKhan <genghiskhan@gmx.ca>, 2014
@@ -10,14 +10,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-19 10:39+0100\n"
+"POT-Creation-Date: 2014-11-28 10:55+0100\n"
 "PO-Revision-Date: 2014-11-24 10:22+0000\n"
 "Last-Translator: GenghisKhan <genghiskhan@gmx.ca>\n"
-"Language-Team: Hebrew (http://www.transifex.com/projects/p/linphone-gtk/language/he/)\n"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/linphone-gtk/"
+"language/he/)\n"
+"Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974
@@ -65,23 +66,18 @@ msgid_plural "%i seconds"
 msgstr[0] "שניה %i"
 msgstr[1] "%i שניות"
 
-#: ../gtk/calllogs.c:335 ../gtk/calllogs.c:341
-#, c-format
-msgid "<big><b>%s</b></big>\t%s"
-msgstr ""
-
 #: ../gtk/calllogs.c:337
 #, c-format
 msgid ""
 "<small><i>%s</i>\t<i>Quality: %s</i></small>\n"
 "%s\t%s\t"
-msgstr "<small><i>%s</i>\t<i>איכות: %s</i></small>\n%s\t%s\t"
+msgstr ""
+"<small><i>%s</i>\t<i>איכות: %s</i></small>\n"
+"%s\t%s\t"
 
-#: ../gtk/calllogs.c:343
+#: ../gtk/calllogs.c:341
 #, c-format
-msgid ""
-"<small><i>%s</i></small>\t\n"
-"%s"
+msgid "<big><b>%s</b></big>\t%s"
 msgstr ""
 
 #: ../gtk/conference.c:38 ../gtk/main.ui.h:13
@@ -97,7 +93,7 @@ msgstr "אני"
 msgid "Couldn't find pixmap file: %s"
 msgstr "לא ניתן למצוא קובץ ‫pixmap: ‫%s"
 
-#: ../gtk/chat.c:364 ../gtk/friendlist.c:924
+#: ../gtk/chat.c:367 ../gtk/friendlist.c:924
 msgid "Invalid sip contact !"
 msgstr "כתובת sip לא תקפה !"
 
@@ -127,8 +123,8 @@ msgstr ""
 
 #: ../gtk/main.c:149
 msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: "
-"c:\\Program Files\\Linphone)"
+"Specifiy a working directory (should be the base of the installation, eg: c:"
+"\\Program Files\\Linphone)"
 msgstr ""
 
 #: ../gtk/main.c:156
@@ -143,22 +139,29 @@ msgstr ""
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
-"Would you allow him to see your presence status or add him to your contact list ?\n"
+"Would you allow him to see your presence status or add him to your contact "
+"list ?\n"
 "If you answer no, this person will be temporarily blacklisted."
-msgstr "‫%s מעוניין להוסיפך אל רשימת אנשי הקשר שלו.\nהאם ברצונך להרשות להם לראות את מצב נוכחותך או להוסיפם אל רשימת אנשי הקשר שלך ?\nהיה ותשובתך תהיה לא, אדם זה יהיה מסומן באופן זמני ברשימה השחורה."
+msgstr ""
+"‫%s מעוניין להוסיפך אל רשימת אנשי הקשר שלו.\n"
+"האם ברצונך להרשות להם לראות את מצב נוכחותך או להוסיפם אל רשימת אנשי הקשר "
+"שלך ?\n"
+"היה ותשובתך תהיה לא, אדם זה יהיה מסומן באופן זמני ברשימה השחורה."
 
 #: ../gtk/main.c:1162
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
-msgstr "אנא הזן סיסמה עבור משתמש <i>%s</i>\nבמתחם <i>%s</i>:"
+msgstr ""
+"אנא הזן סיסמה עבור משתמש <i>%s</i>\n"
+"במתחם <i>%s</i>:"
 
 #: ../gtk/main.c:1283
 msgid "Call error"
 msgstr "שגיאת קריאה"
 
-#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3744
+#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3747
 msgid "Call ended"
 msgstr "שיחה הסתיימה"
 
@@ -210,7 +213,9 @@ msgstr "אנחנו מועברים אל %s"
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
-msgstr "לא אותרו כרטיסי קול במחשב זה.\nלא תהיה ביכולתך לשלוח או לקבל שיחות אודיו."
+msgstr ""
+"לא אותרו כרטיסי קול במחשב זה.\n"
+"לא תהיה ביכולתך לשלוח או לקבל שיחות אודיו."
 
 #: ../gtk/main.c:2157
 msgid "A free SIP video-phone"
@@ -383,7 +388,9 @@ msgstr ""
 msgid ""
 "A more recent version is availalble from %s.\n"
 "Would you like to open a browser to download it ?"
-msgstr "גרסא מאוחרת יותר זמינה מן %s.\nהאם ברצונך לפתוח דפדפן בכדי להורידה ?"
+msgstr ""
+"גרסא מאוחרת יותר זמינה מן %s.\n"
+"האם ברצונך לפתוח דפדפן בכדי להורידה ?"
 
 #: ../gtk/update.c:91
 msgid "You are running the lastest version."
@@ -417,10 +424,13 @@ msgstr[0] "נמצא איש קשר %i"
 msgstr[1] "נמצאו %i אנשי קשר"
 
 #: ../gtk/setupwizard.c:34
+#, fuzzy
 msgid ""
-"Welcome !\n"
+"Welcome!\n"
 "This assistant will help you to use a SIP account for your calls."
-msgstr "ברוך בואך !\nאשף זה יסייע לך לעשות שימוש בחשבון SIP עבור שיחותייך."
+msgstr ""
+"ברוך בואך !\n"
+"אשף זה יסייע לך לעשות שימוש בחשבון SIP עבור שיחותייך."
 
 #: ../gtk/setupwizard.c:43
 msgid "Create an account on linphone.org"
@@ -498,7 +508,9 @@ msgstr ""
 msgid ""
 "Error, account not validated, username already used or server unreachable.\n"
 "Please go back and try again."
-msgstr "שגיאה, חשבון לא אומת, שם משתמש כבר בשימוש או שרת לא ניתן להשגה.\nנא לחזור ולנסות שוב."
+msgstr ""
+"שגיאה, חשבון לא אומת, שם משתמש כבר בשימוש או שרת לא ניתן להשגה.\n"
+"נא לחזור ולנסות שוב."
 
 #: ../gtk/setupwizard.c:405
 msgid "Thank you. Your account is now configured and ready for use."
@@ -506,43 +518,46 @@ msgstr "תודה לך. חשבונך מוגדר ומוכן לשימוש כעת."
 
 #: ../gtk/setupwizard.c:413
 msgid ""
-"Please validate your account by clicking on the link we just sent you by email.\n"
+"Please validate your account by clicking on the link we just sent you by "
+"email.\n"
 "Then come back here and press Next button."
-msgstr "נא לאמת את חשבונך באמצעות הקלקה על הקישור ששלחנו לך עתה באמצעות דוא״ל.\nאחרי כן נא לחזור לכאן וללחוץ על הלחצן 'קדימה'."
+msgstr ""
+"נא לאמת את חשבונך באמצעות הקלקה על הקישור ששלחנו לך עתה באמצעות דוא״ל.\n"
+"אחרי כן נא לחזור לכאן וללחוץ על הלחצן 'קדימה'."
 
-#: ../gtk/setupwizard.c:600
+#: ../gtk/setupwizard.c:602
 msgid "SIP account configuration assistant"
 msgstr ""
 
-#: ../gtk/setupwizard.c:618
+#: ../gtk/setupwizard.c:620
 msgid "Welcome to the account setup assistant"
 msgstr "ברוך בואך אל אשף הגדרת החשבון"
 
-#: ../gtk/setupwizard.c:623
+#: ../gtk/setupwizard.c:625
 msgid "Account setup assistant"
 msgstr "אשף הגדרת חשבון"
 
-#: ../gtk/setupwizard.c:629
+#: ../gtk/setupwizard.c:631
 msgid "Configure your account (step 1/1)"
 msgstr "הגדרת חשבונך (צעד 1/1)"
 
-#: ../gtk/setupwizard.c:634
+#: ../gtk/setupwizard.c:636
 msgid "Enter your sip username (step 1/1)"
 msgstr "הזנת שם משתמש sip (צעד 1/1)"
 
-#: ../gtk/setupwizard.c:638
+#: ../gtk/setupwizard.c:640
 msgid "Enter account information (step 1/2)"
 msgstr "הזנת מידע חשבון (צעד 1/2)"
 
-#: ../gtk/setupwizard.c:647
+#: ../gtk/setupwizard.c:649
 msgid "Validation (step 2/2)"
 msgstr "אימות (צעד 2/2)"
 
-#: ../gtk/setupwizard.c:652
+#: ../gtk/setupwizard.c:654
 msgid "Error"
 msgstr "שגיאה"
 
-#: ../gtk/setupwizard.c:656 ../gtk/audio_assistant.c:527
+#: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:527
 msgid "Terminating"
 msgstr "מסיים כעת"
 
@@ -613,7 +628,9 @@ msgstr "ישיר או דרך שרת"
 msgid ""
 "download: %f\n"
 "upload: %f (kbit/s)"
-msgstr "הורדה: %f\nהעלאה: %f (קי״ב/שנ׳)"
+msgstr ""
+"הורדה: %f\n"
+"העלאה: %f (קי״ב/שנ׳)"
 
 #: ../gtk/incall_view.c:272 ../gtk/incall_view.c:274
 #, c-format
@@ -694,11 +711,6 @@ msgstr "<b>בשיחה כעת</b>"
 msgid "<b>Paused call</b>"
 msgstr "<b>שיחה מושהית</b>"
 
-#: ../gtk/incall_view.c:771
-#, c-format
-msgid "%02i::%02i::%02i"
-msgstr "‭%02i::%02i::%02i"
-
 #: ../gtk/incall_view.c:794
 msgid "<b>Call ended.</b>"
 msgstr "<b>שיחה הסתיימה.</b>"
@@ -728,7 +740,9 @@ msgstr "השהה"
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
-msgstr "<small><i>מקליט אל תוך\n%s %s</i></small>"
+msgstr ""
+"<small><i>מקליט אל תוך\n"
+"%s %s</i></small>"
 
 #: ../gtk/incall_view.c:948
 msgid "(Paused)"
@@ -766,10 +780,13 @@ msgid "Too loud"
 msgstr "חזק מדי"
 
 #: ../gtk/audio_assistant.c:318
+#, fuzzy
 msgid ""
-"Welcome !\n"
+"Welcome!\n"
 "This assistant will help you to configure audio settings for Linphone"
 msgstr ""
+"ברוך בואך !\n"
+"אשף זה יסייע לך לעשות שימוש בחשבון SIP עבור שיחותייך."
 
 #: ../gtk/audio_assistant.c:328
 msgid "Capture device"
@@ -976,7 +993,8 @@ msgid "Login information"
 msgstr "מידע התחברות"
 
 #: ../gtk/main.ui.h:46
-msgid "<b>Welcome !</b>"
+#, fuzzy
+msgid "<b>Welcome!</b>"
 msgstr "<b>ברוך בואך !</b>"
 
 #: ../gtk/main.ui.h:47
@@ -984,11 +1002,13 @@ msgid "Delete"
 msgstr "מחק"
 
 #: ../gtk/about.ui.h:1
-msgid "About linphone"
+#, fuzzy
+msgid "About Linphone"
 msgstr "אודות לינפון"
 
 #: ../gtk/about.ui.h:2
-msgid "(C) Belledonne Communications,2010\n"
+#, fuzzy
+msgid "(C) Belledonne Communications, 2010\n"
 msgstr "‫(C) ‫Belledonne Communications,‫2010\n"
 
 #: ../gtk/about.ui.h:4
@@ -1151,7 +1171,7 @@ msgstr "קודקים של אודיו"
 msgid "Video codecs"
 msgstr "קודקים של וידאו"
 
-#: ../gtk/parameters.ui.h:10 ../gtk/keypad.ui.h:5
+#: ../gtk/parameters.ui.h:10
 msgid "C"
 msgstr ""
 
@@ -1395,7 +1415,9 @@ msgstr "אפשר בקרת קצב מסתגלת"
 msgid ""
 "<i>Adaptive rate control is a technique to dynamically guess the available "
 "bandwidth during a call.</i>"
-msgstr "<i>בקרת קצב מסתגלת הינה טכניקה להשערה דינמית של רוחב הפס הזמין במהלך שיחה.</i>"
+msgstr ""
+"<i>בקרת קצב מסתגלת הינה טכניקה להשערה דינמית של רוחב הפס הזמין במהלך שיחה.</"
+"i>"
 
 #: ../gtk/parameters.ui.h:71
 msgid "<b>Bandwidth control</b>"
@@ -1430,18 +1452,14 @@ msgid "Authentication method:"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:80
-msgid "label"
-msgstr "תוויות"
-
-#: ../gtk/parameters.ui.h:81
 msgid "<b>LDAP Account setup</b>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:82
+#: ../gtk/parameters.ui.h:81
 msgid "LDAP"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:83
+#: ../gtk/parameters.ui.h:82
 msgid "Done"
 msgstr "סיום"
 
@@ -1553,66 +1571,6 @@ msgstr "<b>הגדר מינהור</b>"
 msgid "<b>Configure http proxy (optional)</b>"
 msgstr "<b>הגדר http proxy (רשות)</b>"
 
-#: ../gtk/keypad.ui.h:1
-msgid "D"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:2
-msgid "#"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:3
-msgid "0"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:4
-msgid "*"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:6
-msgid "9"
-msgstr "9 [סעפ]"
-
-#: ../gtk/keypad.ui.h:7
-msgid "8"
-msgstr "8 [צק]"
-
-#: ../gtk/keypad.ui.h:8
-msgid "7"
-msgstr "7 [רשת]"
-
-#: ../gtk/keypad.ui.h:9
-msgid "B"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:10
-msgid "6"
-msgstr "6 [זחט]"
-
-#: ../gtk/keypad.ui.h:11
-msgid "5"
-msgstr "5 [יכל]"
-
-#: ../gtk/keypad.ui.h:12
-msgid "4"
-msgstr "4 [מנ]"
-
-#: ../gtk/keypad.ui.h:13
-msgid "A"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:14
-msgid "3"
-msgstr "3 [אבג]"
-
-#: ../gtk/keypad.ui.h:15
-msgid "2"
-msgstr "2 [דהו]"
-
-#: ../gtk/keypad.ui.h:16
-msgid "1"
-msgstr ""
-
 #: ../gtk/ldap.ui.h:1
 msgid "LDAP Settings"
 msgstr ""
@@ -1708,12 +1666,11 @@ msgstr ""
 
 #: ../gtk/config-uri.ui.h:2
 msgid ""
-"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
-msgstr ""
-
-#: ../gtk/config-uri.ui.h:4
-msgid "https://"
+"This dialog allows to set an http or https address when configuration is to "
+"be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, "
+"Linphone will restart automatically in order to fetch and take into account "
+"the new configuration. "
 msgstr ""
 
 #: ../gtk/provisioning-fetch.ui.h:1
@@ -1724,64 +1681,60 @@ msgstr ""
 msgid "Please wait while fetching configuration from server..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1511
+#: ../coreapi/linphonecore.c:1510
 msgid "Ready"
 msgstr "מוכן"
 
-#: ../coreapi/linphonecore.c:2470
+#: ../coreapi/linphonecore.c:2473
 msgid "Configuring"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2635
+#: ../coreapi/linphonecore.c:2638
 msgid "Looking for telephone number destination..."
 msgstr "מחפש כעת עבור יעד מספר טלפון..."
 
-#: ../coreapi/linphonecore.c:2637
+#: ../coreapi/linphonecore.c:2640
 msgid "Could not resolve this number."
 msgstr "לא ניתן לפתור את מספר זה."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2919
+#: ../coreapi/linphonecore.c:2922
 msgid "Contacting"
 msgstr "מתקשר כעת"
 
-#: ../coreapi/linphonecore.c:2924
+#: ../coreapi/linphonecore.c:2927
 msgid "Could not call"
 msgstr "לא ניתן להתקשר"
 
-#: ../coreapi/linphonecore.c:3074
+#: ../coreapi/linphonecore.c:3077
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "הגענו אל המספר המרבי של שיחות מקבילות, עמך הסליחה"
 
-#: ../coreapi/linphonecore.c:3233
+#: ../coreapi/linphonecore.c:3236
 msgid "is contacting you"
 msgstr "מתקשר/ת אליך"
 
-#: ../coreapi/linphonecore.c:3234
+#: ../coreapi/linphonecore.c:3237
 msgid " and asked autoanswer."
 msgstr " ומבקש/ת מענה אוטומטי."
 
-#: ../coreapi/linphonecore.c:3234
-msgid "."
-msgstr ""
-
-#: ../coreapi/linphonecore.c:3352
+#: ../coreapi/linphonecore.c:3355
 msgid "Modifying call parameters..."
 msgstr "מתאים כעת פרמטרים של שיחה..."
 
-#: ../coreapi/linphonecore.c:3700
+#: ../coreapi/linphonecore.c:3703
 msgid "Connected."
 msgstr "מקושר."
 
-#: ../coreapi/linphonecore.c:3725
+#: ../coreapi/linphonecore.c:3728
 msgid "Call aborted"
 msgstr "קריאה בוטלה"
 
-#: ../coreapi/linphonecore.c:3915
+#: ../coreapi/linphonecore.c:3918
 msgid "Could not pause the call"
 msgstr "לא ניתן להשהות את השיחה"
 
-#: ../coreapi/linphonecore.c:3919
+#: ../coreapi/linphonecore.c:3922
 msgid "Pausing the current call..."
 msgstr "משהה כעת שיחה נוכחית..."
 
@@ -1842,20 +1795,24 @@ msgid "Vacation"
 msgstr ""
 
 #: ../coreapi/friend.c:68
-msgid "Unknown-bug"
+#, fuzzy
+msgid "Unknown status"
 msgstr "תקלה לא מוכרת"
 
 #: ../coreapi/proxy.c:319
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
-msgstr "כתובת sip proxy שהזנת הינה שגויה, זו צריכה להתחיל עם‭\"sip:\" ‬ לאחר שם מארח."
+msgstr ""
+"כתובת sip proxy שהזנת הינה שגויה, זו צריכה להתחיל עם‭\"sip:\" ‬ לאחר שם מארח."
 
 #: ../coreapi/proxy.c:325
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
-msgstr "זהות sip שהוזנה הינה שגויה.\nזו צריכה להיראות כמו sip:username@proxydomain, למשל sip:alice@example.net"
+msgstr ""
+"זהות sip שהוזנה הינה שגויה.\n"
+"זו צריכה להיראות כמו sip:username@proxydomain, למשל sip:alice@example.net"
 
 #: ../coreapi/proxy.c:1377
 #, c-format
@@ -1982,3 +1939,33 @@ msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
 msgstr[0] "החמצת שיחה %i."
 msgstr[1] "החמצת %i שיחות."
+
+#~ msgid "label"
+#~ msgstr "תוויות"
+
+#~ msgid "9"
+#~ msgstr "9 [סעפ]"
+
+#~ msgid "8"
+#~ msgstr "8 [צק]"
+
+#~ msgid "7"
+#~ msgstr "7 [רשת]"
+
+#~ msgid "6"
+#~ msgstr "6 [זחט]"
+
+#~ msgid "5"
+#~ msgstr "5 [יכל]"
+
+#~ msgid "4"
+#~ msgstr "4 [מנ]"
+
+#~ msgid "3"
+#~ msgstr "3 [אבג]"
+
+#~ msgid "2"
+#~ msgstr "2 [דהו]"
+
+#~ msgid "%02i::%02i::%02i"
+#~ msgstr "‭%02i::%02i::%02i"
diff --git a/po/hu.po b/po/hu.po
index d620e646b..1287f3928 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-19 10:39+0100\n"
+"POT-Creation-Date: 2014-11-28 10:55+0100\n"
 "PO-Revision-Date: 2014-11-19 10:16+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
-"Language-Team: Hungarian (http://www.transifex.com/projects/p/linphone-gtk/language/hu/)\n"
+"Language-Team: Hungarian (http://www.transifex.com/projects/p/linphone-gtk/"
+"language/hu/)\n"
+"Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974
@@ -62,11 +63,6 @@ msgid_plural "%i seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gtk/calllogs.c:335 ../gtk/calllogs.c:341
-#, c-format
-msgid "<big><b>%s</b></big>\t%s"
-msgstr ""
-
 #: ../gtk/calllogs.c:337
 #, c-format
 msgid ""
@@ -74,11 +70,9 @@ msgid ""
 "%s\t%s\t"
 msgstr ""
 
-#: ../gtk/calllogs.c:343
+#: ../gtk/calllogs.c:341
 #, c-format
-msgid ""
-"<small><i>%s</i></small>\t\n"
-"%s"
+msgid "<big><b>%s</b></big>\t%s"
 msgstr ""
 
 #: ../gtk/conference.c:38 ../gtk/main.ui.h:13
@@ -94,7 +88,7 @@ msgstr "én"
 msgid "Couldn't find pixmap file: %s"
 msgstr "Nemtalálható a pixmap fájl: %s"
 
-#: ../gtk/chat.c:364 ../gtk/friendlist.c:924
+#: ../gtk/chat.c:367 ../gtk/friendlist.c:924
 msgid "Invalid sip contact !"
 msgstr "Érvénytelen sip partner !"
 
@@ -124,9 +118,11 @@ msgstr "Bekapcsolva automatikusan válaszol a bejövő hívásokra"
 
 #: ../gtk/main.c:149
 msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: "
-"c:\\Program Files\\Linphone)"
-msgstr "Adjon meg egy munkakönyvtárat (ennek az installációs könyvtárnak kéne lennie, pl. C:\\Program Files\\Linphone)"
+"Specifiy a working directory (should be the base of the installation, eg: c:"
+"\\Program Files\\Linphone)"
+msgstr ""
+"Adjon meg egy munkakönyvtárat (ennek az installációs könyvtárnak kéne "
+"lennie, pl. C:\\Program Files\\Linphone)"
 
 #: ../gtk/main.c:156
 msgid "Configuration file"
@@ -140,9 +136,14 @@ msgstr ""
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
-"Would you allow him to see your presence status or add him to your contact list ?\n"
+"Would you allow him to see your presence status or add him to your contact "
+"list ?\n"
 "If you answer no, this person will be temporarily blacklisted."
-msgstr "%s szeretné Önt hozzáadni partnerlistájához.\nSzeretné megengedni neki, hogy lássa az Ön jelenlétét, illetve hozzá szeretné adni a partnerlistához?\nHa nemmel válaszol, ez a személy átmenetileg tiltólistára kerül."
+msgstr ""
+"%s szeretné Önt hozzáadni partnerlistájához.\n"
+"Szeretné megengedni neki, hogy lássa az Ön jelenlétét, illetve hozzá "
+"szeretné adni a partnerlistához?\n"
+"Ha nemmel válaszol, ez a személy átmenetileg tiltólistára kerül."
 
 #: ../gtk/main.c:1162
 #, c-format
@@ -155,7 +156,7 @@ msgstr ""
 msgid "Call error"
 msgstr "Hiba a hívás közben"
 
-#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3744
+#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3747
 msgid "Call ended"
 msgstr "Hívás vége"
 
@@ -207,7 +208,9 @@ msgstr "Át vagyunk irányítva ide: %s"
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
-msgstr "Hangkártya nincs érzékelve ezen a számítógépen.\nNem fog tudni hang hívásokat küldeni vagy fogadni."
+msgstr ""
+"Hangkártya nincs érzékelve ezen a számítógépen.\n"
+"Nem fog tudni hang hívásokat küldeni vagy fogadni."
 
 #: ../gtk/main.c:2157
 msgid "A free SIP video-phone"
@@ -361,7 +364,9 @@ msgstr ""
 #: ../gtk/propertybox.c:1156
 msgid ""
 "You need to restart linphone for the new language selection to take effect."
-msgstr "Újra kell indítania a linphone-t, hogy az új nyelv kiválasztása érvényre jusson. "
+msgstr ""
+"Újra kell indítania a linphone-t, hogy az új nyelv kiválasztása érvényre "
+"jusson. "
 
 #: ../gtk/propertybox.c:1234
 msgid "None"
@@ -380,7 +385,9 @@ msgstr "ZRTP"
 msgid ""
 "A more recent version is availalble from %s.\n"
 "Would you like to open a browser to download it ?"
-msgstr "Elérhető egy újabb verzió a következőn: %s.\nSzeretné, hogy a letöltéshez egy új böngésző ablak nyíljon?"
+msgstr ""
+"Elérhető egy újabb verzió a következőn: %s.\n"
+"Szeretné, hogy a letöltéshez egy új böngésző ablak nyíljon?"
 
 #: ../gtk/update.c:91
 msgid "You are running the lastest version."
@@ -414,10 +421,13 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: ../gtk/setupwizard.c:34
+#, fuzzy
 msgid ""
-"Welcome !\n"
+"Welcome!\n"
 "This assistant will help you to use a SIP account for your calls."
-msgstr "Üdvözöljük !\nEz a varázsló segít Önnek, hogy sip fiókot használjon hívásaihoz."
+msgstr ""
+"Üdvözöljük !\n"
+"Ez a varázsló segít Önnek, hogy sip fiókot használjon hívásaihoz."
 
 #: ../gtk/setupwizard.c:43
 msgid "Create an account on linphone.org"
@@ -495,7 +505,10 @@ msgstr ""
 msgid ""
 "Error, account not validated, username already used or server unreachable.\n"
 "Please go back and try again."
-msgstr "Hiba, a fiók nincs érvényesítve. Valaki már használja ezt a felhasználónevet vagy a kiszolgáló nem elérhető.\nKérjük, lépjen vissza és próbálja újra."
+msgstr ""
+"Hiba, a fiók nincs érvényesítve. Valaki már használja ezt a felhasználónevet "
+"vagy a kiszolgáló nem elérhető.\n"
+"Kérjük, lépjen vissza és próbálja újra."
 
 #: ../gtk/setupwizard.c:405
 msgid "Thank you. Your account is now configured and ready for use."
@@ -503,43 +516,47 @@ msgstr "Köszönjük! Az Ön fiókját beállítottuk és használatra kész."
 
 #: ../gtk/setupwizard.c:413
 msgid ""
-"Please validate your account by clicking on the link we just sent you by email.\n"
+"Please validate your account by clicking on the link we just sent you by "
+"email.\n"
 "Then come back here and press Next button."
-msgstr "Kérjük, érvényesítse fiókját az általunk elektronikus levélben küldött hivatkozásra kattintva.\nAzután térjen vissza ide és kattintson a Következő gombra."
+msgstr ""
+"Kérjük, érvényesítse fiókját az általunk elektronikus levélben küldött "
+"hivatkozásra kattintva.\n"
+"Azután térjen vissza ide és kattintson a Következő gombra."
 
-#: ../gtk/setupwizard.c:600
+#: ../gtk/setupwizard.c:602
 msgid "SIP account configuration assistant"
 msgstr ""
 
-#: ../gtk/setupwizard.c:618
+#: ../gtk/setupwizard.c:620
 msgid "Welcome to the account setup assistant"
 msgstr "A fiók beállítása varázsló üdvözli Önt"
 
-#: ../gtk/setupwizard.c:623
+#: ../gtk/setupwizard.c:625
 msgid "Account setup assistant"
 msgstr "Fiók beállítása varázsló"
 
-#: ../gtk/setupwizard.c:629
+#: ../gtk/setupwizard.c:631
 msgid "Configure your account (step 1/1)"
 msgstr "Az Ön fiókjának beállítása (1/1 lépés)"
 
-#: ../gtk/setupwizard.c:634
+#: ../gtk/setupwizard.c:636
 msgid "Enter your sip username (step 1/1)"
 msgstr "Adja meg sip felhasználónevét (1/2 lépés)"
 
-#: ../gtk/setupwizard.c:638
+#: ../gtk/setupwizard.c:640
 msgid "Enter account information (step 1/2)"
 msgstr "Adja meg a fiókinformációt (1/2 lépés)"
 
-#: ../gtk/setupwizard.c:647
+#: ../gtk/setupwizard.c:649
 msgid "Validation (step 2/2)"
 msgstr "Érvényesítés (2/2 lépés)"
 
-#: ../gtk/setupwizard.c:652
+#: ../gtk/setupwizard.c:654
 msgid "Error"
 msgstr "Hiba"
 
-#: ../gtk/setupwizard.c:656 ../gtk/audio_assistant.c:527
+#: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:527
 msgid "Terminating"
 msgstr "Befejezés"
 
@@ -610,7 +627,9 @@ msgstr "közvetlen vagy kiszolgálón keresztül"
 msgid ""
 "download: %f\n"
 "upload: %f (kbit/s)"
-msgstr "letöltés: %f\nfeltöltés: %f (kbit/mp)"
+msgstr ""
+"letöltés: %f\n"
+"feltöltés: %f (kbit/mp)"
 
 #: ../gtk/incall_view.c:272 ../gtk/incall_view.c:274
 #, c-format
@@ -691,11 +710,6 @@ msgstr "<b>vonalban</b>"
 msgid "<b>Paused call</b>"
 msgstr "<b>Várakoztatott hívás</b>"
 
-#: ../gtk/incall_view.c:771
-#, c-format
-msgid "%02i::%02i::%02i"
-msgstr "%02i::%02i::%02i"
-
 #: ../gtk/incall_view.c:794
 msgid "<b>Call ended.</b>"
 msgstr "<b>Hívás vége.</b>"
@@ -725,7 +739,9 @@ msgstr "Várakoztatás"
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
-msgstr "<small><i>Felvétel a következőbe\n%s %s</i></small>"
+msgstr ""
+"<small><i>Felvétel a következőbe\n"
+"%s %s</i></small>"
 
 #: ../gtk/incall_view.c:948
 msgid "(Paused)"
@@ -763,10 +779,13 @@ msgid "Too loud"
 msgstr ""
 
 #: ../gtk/audio_assistant.c:318
+#, fuzzy
 msgid ""
-"Welcome !\n"
+"Welcome!\n"
 "This assistant will help you to configure audio settings for Linphone"
 msgstr ""
+"Üdvözöljük !\n"
+"Ez a varázsló segít Önnek, hogy sip fiókot használjon hívásaihoz."
 
 #: ../gtk/audio_assistant.c:328
 msgid "Capture device"
@@ -973,7 +992,8 @@ msgid "Login information"
 msgstr "Bejelentkezési információ"
 
 #: ../gtk/main.ui.h:46
-msgid "<b>Welcome !</b>"
+#, fuzzy
+msgid "<b>Welcome!</b>"
 msgstr "<b>Üdvözöljük !</b>"
 
 #: ../gtk/main.ui.h:47
@@ -981,16 +1001,20 @@ msgid "Delete"
 msgstr "Törlés"
 
 #: ../gtk/about.ui.h:1
-msgid "About linphone"
+#, fuzzy
+msgid "About Linphone"
 msgstr "Linphone névjegy"
 
 #: ../gtk/about.ui.h:2
-msgid "(C) Belledonne Communications,2010\n"
+#, fuzzy
+msgid "(C) Belledonne Communications, 2010\n"
 msgstr "(C) Belledonne Communications,2010\n"
 
 #: ../gtk/about.ui.h:4
 msgid "An internet video phone using the standard SIP (rfc3261) protocol."
-msgstr "Internetes videó telefon, mely a szabványos SIP (rfc3261) protokolt használja."
+msgstr ""
+"Internetes videó telefon, mely a szabványos SIP (rfc3261) protokolt "
+"használja."
 
 #: ../gtk/about.ui.h:5
 msgid ""
@@ -1148,7 +1172,7 @@ msgstr "Audió kódekek"
 msgid "Video codecs"
 msgstr "Videó kódekek"
 
-#: ../gtk/parameters.ui.h:10 ../gtk/keypad.ui.h:5
+#: ../gtk/parameters.ui.h:10
 msgid "C"
 msgstr "C"
 
@@ -1392,7 +1416,9 @@ msgstr "Alkalmazkodó mérték-szabályozás engedélyezése"
 msgid ""
 "<i>Adaptive rate control is a technique to dynamically guess the available "
 "bandwidth during a call.</i>"
-msgstr "<i>Az alkalmazkodó mérték-szabályozás egy módszer, mely erőteljesen próbálja megállapítani a rendelkezésre álló sávszélességet hívás alatt.</i>"
+msgstr ""
+"<i>Az alkalmazkodó mérték-szabályozás egy módszer, mely erőteljesen próbálja "
+"megállapítani a rendelkezésre álló sávszélességet hívás alatt.</i>"
 
 #: ../gtk/parameters.ui.h:71
 msgid "<b>Bandwidth control</b>"
@@ -1427,18 +1453,14 @@ msgid "Authentication method:"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:80
-msgid "label"
-msgstr "címke"
-
-#: ../gtk/parameters.ui.h:81
 msgid "<b>LDAP Account setup</b>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:82
+#: ../gtk/parameters.ui.h:81
 msgid "LDAP"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:83
+#: ../gtk/parameters.ui.h:82
 msgid "Done"
 msgstr "Kész"
 
@@ -1550,66 +1572,6 @@ msgstr "<b>Alagút beállítása</b>"
 msgid "<b>Configure http proxy (optional)</b>"
 msgstr "<b>http proxy beállítása (nem kötelező)</b>"
 
-#: ../gtk/keypad.ui.h:1
-msgid "D"
-msgstr "D"
-
-#: ../gtk/keypad.ui.h:2
-msgid "#"
-msgstr "#"
-
-#: ../gtk/keypad.ui.h:3
-msgid "0"
-msgstr "0"
-
-#: ../gtk/keypad.ui.h:4
-msgid "*"
-msgstr "*"
-
-#: ../gtk/keypad.ui.h:6
-msgid "9"
-msgstr "9"
-
-#: ../gtk/keypad.ui.h:7
-msgid "8"
-msgstr "8"
-
-#: ../gtk/keypad.ui.h:8
-msgid "7"
-msgstr "7"
-
-#: ../gtk/keypad.ui.h:9
-msgid "B"
-msgstr "B"
-
-#: ../gtk/keypad.ui.h:10
-msgid "6"
-msgstr "6"
-
-#: ../gtk/keypad.ui.h:11
-msgid "5"
-msgstr "5"
-
-#: ../gtk/keypad.ui.h:12
-msgid "4"
-msgstr "4"
-
-#: ../gtk/keypad.ui.h:13
-msgid "A"
-msgstr "A"
-
-#: ../gtk/keypad.ui.h:14
-msgid "3"
-msgstr "3"
-
-#: ../gtk/keypad.ui.h:15
-msgid "2"
-msgstr "2"
-
-#: ../gtk/keypad.ui.h:16
-msgid "1"
-msgstr "1"
-
 #: ../gtk/ldap.ui.h:1
 msgid "LDAP Settings"
 msgstr ""
@@ -1705,12 +1667,11 @@ msgstr ""
 
 #: ../gtk/config-uri.ui.h:2
 msgid ""
-"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
-msgstr ""
-
-#: ../gtk/config-uri.ui.h:4
-msgid "https://"
+"This dialog allows to set an http or https address when configuration is to "
+"be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, "
+"Linphone will restart automatically in order to fetch and take into account "
+"the new configuration. "
 msgstr ""
 
 #: ../gtk/provisioning-fetch.ui.h:1
@@ -1721,64 +1682,60 @@ msgstr ""
 msgid "Please wait while fetching configuration from server..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1511
+#: ../coreapi/linphonecore.c:1510
 msgid "Ready"
 msgstr "Kész"
 
-#: ../coreapi/linphonecore.c:2470
+#: ../coreapi/linphonecore.c:2473
 msgid "Configuring"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2635
+#: ../coreapi/linphonecore.c:2638
 msgid "Looking for telephone number destination..."
 msgstr "Telefonszám-cél keresése..."
 
-#: ../coreapi/linphonecore.c:2637
+#: ../coreapi/linphonecore.c:2640
 msgid "Could not resolve this number."
 msgstr "Nem sikkerült értelmezni a számot."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2919
+#: ../coreapi/linphonecore.c:2922
 msgid "Contacting"
 msgstr "Kapcsolódás"
 
-#: ../coreapi/linphonecore.c:2924
+#: ../coreapi/linphonecore.c:2927
 msgid "Could not call"
 msgstr "Nem sikerült hívni"
 
-#: ../coreapi/linphonecore.c:3074
+#: ../coreapi/linphonecore.c:3077
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "Elnézést, elértük a egyidejű hívások maximális számát"
 
-#: ../coreapi/linphonecore.c:3233
+#: ../coreapi/linphonecore.c:3236
 msgid "is contacting you"
 msgstr "kapcsolatba lépett veled."
 
-#: ../coreapi/linphonecore.c:3234
+#: ../coreapi/linphonecore.c:3237
 msgid " and asked autoanswer."
 msgstr "és automatikus választ kért."
 
-#: ../coreapi/linphonecore.c:3234
-msgid "."
-msgstr "."
-
-#: ../coreapi/linphonecore.c:3352
+#: ../coreapi/linphonecore.c:3355
 msgid "Modifying call parameters..."
 msgstr "A hívási jellemzők módosítása..."
 
-#: ../coreapi/linphonecore.c:3700
+#: ../coreapi/linphonecore.c:3703
 msgid "Connected."
 msgstr "Kapcsolódva."
 
-#: ../coreapi/linphonecore.c:3725
+#: ../coreapi/linphonecore.c:3728
 msgid "Call aborted"
 msgstr "Hívás megszakítva"
 
-#: ../coreapi/linphonecore.c:3915
+#: ../coreapi/linphonecore.c:3918
 msgid "Could not pause the call"
 msgstr "Nem sikerült várakoztatni a hívást"
 
-#: ../coreapi/linphonecore.c:3919
+#: ../coreapi/linphonecore.c:3922
 msgid "Pausing the current call..."
 msgstr "Jelenlegi hívás várakoztatásának aktiválása..."
 
@@ -1839,20 +1796,26 @@ msgid "Vacation"
 msgstr ""
 
 #: ../coreapi/friend.c:68
-msgid "Unknown-bug"
+#, fuzzy
+msgid "Unknown status"
 msgstr "Ismeretlen programhiba"
 
 #: ../coreapi/proxy.c:319
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
-msgstr "Az Ön által megadott SIP proxy cím érvénytelen. \"sip:\"-tal kell kezdődnie, ezt egy hosztnév követi."
+msgstr ""
+"Az Ön által megadott SIP proxy cím érvénytelen. \"sip:\"-tal kell kezdődnie, "
+"ezt egy hosztnév követi."
 
 #: ../coreapi/proxy.c:325
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
-msgstr "Az Ön által megadott SIP identitás érvénytelen.\nÍgy kéne kinéznie: sip:felhasznalonev@proxytartomany, például sip:aladar@pelda.hu"
+msgstr ""
+"Az Ön által megadott SIP identitás érvénytelen.\n"
+"Így kéne kinéznie: sip:felhasznalonev@proxytartomany, például sip:"
+"aladar@pelda.hu"
 
 #: ../coreapi/proxy.c:1377
 #, c-format
@@ -1892,7 +1855,8 @@ msgstr "%s válaszolt a hívásra."
 
 #: ../coreapi/callbacks.c:525
 msgid "Incompatible, check codecs or security settings..."
-msgstr "Nem kompatibilis, ellenőrizze a kódek- vagy a biztonsági beállításokat..."
+msgstr ""
+"Nem kompatibilis, ellenőrizze a kódek- vagy a biztonsági beállításokat..."
 
 #: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:826
 msgid "Incompatible media parameters."
@@ -1979,3 +1943,57 @@ msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
 msgstr[0] ""
 msgstr[1] ""
+
+#~ msgid "label"
+#~ msgstr "címke"
+
+#~ msgid "D"
+#~ msgstr "D"
+
+#~ msgid "#"
+#~ msgstr "#"
+
+#~ msgid "0"
+#~ msgstr "0"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "9"
+#~ msgstr "9"
+
+#~ msgid "8"
+#~ msgstr "8"
+
+#~ msgid "7"
+#~ msgstr "7"
+
+#~ msgid "B"
+#~ msgstr "B"
+
+#~ msgid "6"
+#~ msgstr "6"
+
+#~ msgid "5"
+#~ msgstr "5"
+
+#~ msgid "4"
+#~ msgstr "4"
+
+#~ msgid "A"
+#~ msgstr "A"
+
+#~ msgid "3"
+#~ msgstr "3"
+
+#~ msgid "2"
+#~ msgstr "2"
+
+#~ msgid "1"
+#~ msgstr "1"
+
+#~ msgid "%02i::%02i::%02i"
+#~ msgstr "%02i::%02i::%02i"
+
+#~ msgid "."
+#~ msgstr "."
diff --git a/po/it.po b/po/it.po
index a7e15fd13..dbd9daf78 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-19 10:39+0100\n"
+"POT-Creation-Date: 2014-11-28 10:55+0100\n"
 "PO-Revision-Date: 2014-11-19 10:16+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/linphone-gtk/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/linphone-gtk/"
+"language/it/)\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974
@@ -62,11 +63,6 @@ msgid_plural "%i seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gtk/calllogs.c:335 ../gtk/calllogs.c:341
-#, c-format
-msgid "<big><b>%s</b></big>\t%s"
-msgstr ""
-
 #: ../gtk/calllogs.c:337
 #, c-format
 msgid ""
@@ -74,11 +70,9 @@ msgid ""
 "%s\t%s\t"
 msgstr ""
 
-#: ../gtk/calllogs.c:343
+#: ../gtk/calllogs.c:341
 #, c-format
-msgid ""
-"<small><i>%s</i></small>\t\n"
-"%s"
+msgid "<big><b>%s</b></big>\t%s"
 msgstr ""
 
 #: ../gtk/conference.c:38 ../gtk/main.ui.h:13
@@ -94,7 +88,7 @@ msgstr ""
 msgid "Couldn't find pixmap file: %s"
 msgstr ""
 
-#: ../gtk/chat.c:364 ../gtk/friendlist.c:924
+#: ../gtk/chat.c:367 ../gtk/friendlist.c:924
 msgid "Invalid sip contact !"
 msgstr "Contatto SIP non valido"
 
@@ -124,8 +118,8 @@ msgstr ""
 
 #: ../gtk/main.c:149
 msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: "
-"c:\\Program Files\\Linphone)"
+"Specifiy a working directory (should be the base of the installation, eg: c:"
+"\\Program Files\\Linphone)"
 msgstr ""
 
 #: ../gtk/main.c:156
@@ -140,9 +134,13 @@ msgstr ""
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
-"Would you allow him to see your presence status or add him to your contact list ?\n"
+"Would you allow him to see your presence status or add him to your contact "
+"list ?\n"
 "If you answer no, this person will be temporarily blacklisted."
-msgstr "%s voui aggiungere il tuo contatto alla sua listaVoui permettere che lui veda il tuo stato o aggiungerlo alla tua lista dei contatti Se rispondi no questo utente sarà momentaneamente bloccato."
+msgstr ""
+"%s voui aggiungere il tuo contatto alla sua listaVoui permettere che lui "
+"veda il tuo stato o aggiungerlo alla tua lista dei contatti Se rispondi no "
+"questo utente sarà momentaneamente bloccato."
 
 #: ../gtk/main.c:1162
 #, c-format
@@ -155,7 +153,7 @@ msgstr ""
 msgid "Call error"
 msgstr ""
 
-#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3744
+#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3747
 msgid "Call ended"
 msgstr "Chiamata terminata"
 
@@ -380,7 +378,9 @@ msgstr ""
 msgid ""
 "A more recent version is availalble from %s.\n"
 "Would you like to open a browser to download it ?"
-msgstr "Una versione più recente è disponibile da %s.\nVuoi aprire un browser per eseguire il download ?"
+msgstr ""
+"Una versione più recente è disponibile da %s.\n"
+"Vuoi aprire un browser per eseguire il download ?"
 
 #: ../gtk/update.c:91
 msgid "You are running the lastest version."
@@ -414,10 +414,13 @@ msgstr[0] "Trovato %i contatto"
 msgstr[1] "Trovato %i contatti"
 
 #: ../gtk/setupwizard.c:34
+#, fuzzy
 msgid ""
-"Welcome !\n"
+"Welcome!\n"
 "This assistant will help you to use a SIP account for your calls."
-msgstr "Benvenuti !\nLa procedura vi aiutera a configurare un account SIP."
+msgstr ""
+"Benvenuti !\n"
+"La procedura vi aiutera a configurare un account SIP."
 
 #: ../gtk/setupwizard.c:43
 msgid "Create an account on linphone.org"
@@ -503,43 +506,44 @@ msgstr "Grazie. Il tuo account è configurato e pronto all'uso"
 
 #: ../gtk/setupwizard.c:413
 msgid ""
-"Please validate your account by clicking on the link we just sent you by email.\n"
+"Please validate your account by clicking on the link we just sent you by "
+"email.\n"
 "Then come back here and press Next button."
 msgstr ""
 
-#: ../gtk/setupwizard.c:600
+#: ../gtk/setupwizard.c:602
 msgid "SIP account configuration assistant"
 msgstr ""
 
-#: ../gtk/setupwizard.c:618
+#: ../gtk/setupwizard.c:620
 msgid "Welcome to the account setup assistant"
 msgstr "Benvenuto nel configuratore di account"
 
-#: ../gtk/setupwizard.c:623
+#: ../gtk/setupwizard.c:625
 msgid "Account setup assistant"
 msgstr "Configuratore di account"
 
-#: ../gtk/setupwizard.c:629
+#: ../gtk/setupwizard.c:631
 msgid "Configure your account (step 1/1)"
 msgstr ""
 
-#: ../gtk/setupwizard.c:634
+#: ../gtk/setupwizard.c:636
 msgid "Enter your sip username (step 1/1)"
 msgstr ""
 
-#: ../gtk/setupwizard.c:638
+#: ../gtk/setupwizard.c:640
 msgid "Enter account information (step 1/2)"
 msgstr ""
 
-#: ../gtk/setupwizard.c:647
+#: ../gtk/setupwizard.c:649
 msgid "Validation (step 2/2)"
 msgstr ""
 
-#: ../gtk/setupwizard.c:652
+#: ../gtk/setupwizard.c:654
 msgid "Error"
 msgstr ""
 
-#: ../gtk/setupwizard.c:656 ../gtk/audio_assistant.c:527
+#: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:527
 msgid "Terminating"
 msgstr ""
 
@@ -691,11 +695,6 @@ msgstr ""
 msgid "<b>Paused call</b>"
 msgstr ""
 
-#: ../gtk/incall_view.c:771
-#, c-format
-msgid "%02i::%02i::%02i"
-msgstr ""
-
 #: ../gtk/incall_view.c:794
 msgid "<b>Call ended.</b>"
 msgstr "<b>Chiamata terminata.</b>"
@@ -763,10 +762,13 @@ msgid "Too loud"
 msgstr ""
 
 #: ../gtk/audio_assistant.c:318
+#, fuzzy
 msgid ""
-"Welcome !\n"
+"Welcome!\n"
 "This assistant will help you to configure audio settings for Linphone"
 msgstr ""
+"Benvenuti !\n"
+"La procedura vi aiutera a configurare un account SIP."
 
 #: ../gtk/audio_assistant.c:328
 msgid "Capture device"
@@ -973,7 +975,8 @@ msgid "Login information"
 msgstr "Credenziali di accesso"
 
 #: ../gtk/main.ui.h:46
-msgid "<b>Welcome !</b>"
+#, fuzzy
+msgid "<b>Welcome!</b>"
 msgstr "<b>Benvenuto !</b>"
 
 #: ../gtk/main.ui.h:47
@@ -981,11 +984,12 @@ msgid "Delete"
 msgstr ""
 
 #: ../gtk/about.ui.h:1
-msgid "About linphone"
+#, fuzzy
+msgid "About Linphone"
 msgstr "Info Linphone"
 
 #: ../gtk/about.ui.h:2
-msgid "(C) Belledonne Communications,2010\n"
+msgid "(C) Belledonne Communications, 2010\n"
 msgstr ""
 
 #: ../gtk/about.ui.h:4
@@ -1148,7 +1152,7 @@ msgstr ""
 msgid "Video codecs"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:10 ../gtk/keypad.ui.h:5
+#: ../gtk/parameters.ui.h:10
 msgid "C"
 msgstr "C"
 
@@ -1310,7 +1314,8 @@ msgstr "Impostazioni multimediali"
 
 #: ../gtk/parameters.ui.h:50
 msgid "This section defines your SIP address when not using a SIP account"
-msgstr "questa sezione definisce il tuo indirizzo SIP se non hai account attivi"
+msgstr ""
+"questa sezione definisce il tuo indirizzo SIP se non hai account attivi"
 
 #: ../gtk/parameters.ui.h:51
 msgid "Your display name (eg: John Doe):"
@@ -1427,18 +1432,14 @@ msgid "Authentication method:"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:80
-msgid "label"
-msgstr "etichetta"
-
-#: ../gtk/parameters.ui.h:81
 msgid "<b>LDAP Account setup</b>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:82
+#: ../gtk/parameters.ui.h:81
 msgid "LDAP"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:83
+#: ../gtk/parameters.ui.h:82
 msgid "Done"
 msgstr "Fatto"
 
@@ -1550,66 +1551,6 @@ msgstr ""
 msgid "<b>Configure http proxy (optional)</b>"
 msgstr ""
 
-#: ../gtk/keypad.ui.h:1
-msgid "D"
-msgstr "D"
-
-#: ../gtk/keypad.ui.h:2
-msgid "#"
-msgstr "#"
-
-#: ../gtk/keypad.ui.h:3
-msgid "0"
-msgstr "0"
-
-#: ../gtk/keypad.ui.h:4
-msgid "*"
-msgstr "*"
-
-#: ../gtk/keypad.ui.h:6
-msgid "9"
-msgstr "9"
-
-#: ../gtk/keypad.ui.h:7
-msgid "8"
-msgstr "8"
-
-#: ../gtk/keypad.ui.h:8
-msgid "7"
-msgstr "7"
-
-#: ../gtk/keypad.ui.h:9
-msgid "B"
-msgstr "B"
-
-#: ../gtk/keypad.ui.h:10
-msgid "6"
-msgstr "6"
-
-#: ../gtk/keypad.ui.h:11
-msgid "5"
-msgstr "5"
-
-#: ../gtk/keypad.ui.h:12
-msgid "4"
-msgstr "4"
-
-#: ../gtk/keypad.ui.h:13
-msgid "A"
-msgstr "A"
-
-#: ../gtk/keypad.ui.h:14
-msgid "3"
-msgstr "3"
-
-#: ../gtk/keypad.ui.h:15
-msgid "2"
-msgstr "2"
-
-#: ../gtk/keypad.ui.h:16
-msgid "1"
-msgstr "1"
-
 #: ../gtk/ldap.ui.h:1
 msgid "LDAP Settings"
 msgstr ""
@@ -1705,12 +1646,11 @@ msgstr ""
 
 #: ../gtk/config-uri.ui.h:2
 msgid ""
-"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
-msgstr ""
-
-#: ../gtk/config-uri.ui.h:4
-msgid "https://"
+"This dialog allows to set an http or https address when configuration is to "
+"be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, "
+"Linphone will restart automatically in order to fetch and take into account "
+"the new configuration. "
 msgstr ""
 
 #: ../gtk/provisioning-fetch.ui.h:1
@@ -1721,64 +1661,60 @@ msgstr ""
 msgid "Please wait while fetching configuration from server..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1511
+#: ../coreapi/linphonecore.c:1510
 msgid "Ready"
 msgstr "Pronto"
 
-#: ../coreapi/linphonecore.c:2470
+#: ../coreapi/linphonecore.c:2473
 msgid "Configuring"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2635
+#: ../coreapi/linphonecore.c:2638
 msgid "Looking for telephone number destination..."
 msgstr "Ricerca numero destinazione..."
 
-#: ../coreapi/linphonecore.c:2637
+#: ../coreapi/linphonecore.c:2640
 msgid "Could not resolve this number."
 msgstr "Impossibile risolvere il numero."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2919
+#: ../coreapi/linphonecore.c:2922
 msgid "Contacting"
 msgstr "In connessione"
 
-#: ../coreapi/linphonecore.c:2924
+#: ../coreapi/linphonecore.c:2927
 msgid "Could not call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3074
+#: ../coreapi/linphonecore.c:3077
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3233
+#: ../coreapi/linphonecore.c:3236
 msgid "is contacting you"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3234
+#: ../coreapi/linphonecore.c:3237
 msgid " and asked autoanswer."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3234
-msgid "."
-msgstr ""
-
-#: ../coreapi/linphonecore.c:3352
+#: ../coreapi/linphonecore.c:3355
 msgid "Modifying call parameters..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3700
+#: ../coreapi/linphonecore.c:3703
 msgid "Connected."
 msgstr "Connessione"
 
-#: ../coreapi/linphonecore.c:3725
+#: ../coreapi/linphonecore.c:3728
 msgid "Call aborted"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3915
+#: ../coreapi/linphonecore.c:3918
 msgid "Could not pause the call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3919
+#: ../coreapi/linphonecore.c:3922
 msgid "Pausing the current call..."
 msgstr ""
 
@@ -1839,20 +1775,25 @@ msgid "Vacation"
 msgstr ""
 
 #: ../coreapi/friend.c:68
-msgid "Unknown-bug"
+#, fuzzy
+msgid "Unknown status"
 msgstr "Bug-sconosciuto"
 
 #: ../coreapi/proxy.c:319
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
-msgstr "L'indirizzo sip proxy utilizzato è invalido, deve iniziare con  \"sip:\" seguito dall' hostaname."
+msgstr ""
+"L'indirizzo sip proxy utilizzato è invalido, deve iniziare con  \"sip:\" "
+"seguito dall' hostaname."
 
 #: ../coreapi/proxy.c:325
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
-msgstr "L'identità sip utilizza è invalida.\nDovrebbre essere sip:username@proxydomain, esempio: sip:alice@example.net"
+msgstr ""
+"L'identità sip utilizza è invalida.\n"
+"Dovrebbre essere sip:username@proxydomain, esempio: sip:alice@example.net"
 
 #: ../coreapi/proxy.c:1377
 #, c-format
@@ -1979,3 +1920,51 @@ msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
 msgstr[0] ""
 msgstr[1] ""
+
+#~ msgid "label"
+#~ msgstr "etichetta"
+
+#~ msgid "D"
+#~ msgstr "D"
+
+#~ msgid "#"
+#~ msgstr "#"
+
+#~ msgid "0"
+#~ msgstr "0"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "9"
+#~ msgstr "9"
+
+#~ msgid "8"
+#~ msgstr "8"
+
+#~ msgid "7"
+#~ msgstr "7"
+
+#~ msgid "B"
+#~ msgstr "B"
+
+#~ msgid "6"
+#~ msgstr "6"
+
+#~ msgid "5"
+#~ msgstr "5"
+
+#~ msgid "4"
+#~ msgstr "4"
+
+#~ msgid "A"
+#~ msgstr "A"
+
+#~ msgid "3"
+#~ msgstr "3"
+
+#~ msgid "2"
+#~ msgstr "2"
+
+#~ msgid "1"
+#~ msgstr "1"
diff --git a/po/ja.po b/po/ja.po
index cc365010a..61385c5df 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,21 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Alexander, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-19 10:39+0100\n"
+"POT-Creation-Date: 2014-11-28 10:55+0100\n"
 "PO-Revision-Date: 2014-11-28 09:19+0000\n"
 "Last-Translator: Alexander\n"
-"Language-Team: Japanese (http://www.transifex.com/projects/p/linphone-gtk/language/ja/)\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/linphone-gtk/"
+"language/ja/)\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974
@@ -61,24 +62,19 @@ msgid "%i second"
 msgid_plural "%i seconds"
 msgstr[0] "%i 秒"
 
-#: ../gtk/calllogs.c:335 ../gtk/calllogs.c:341
-#, c-format
-msgid "<big><b>%s</b></big>\t%s"
-msgstr "<big><b>%s</b></big>⇥%s"
-
 #: ../gtk/calllogs.c:337
 #, c-format
 msgid ""
 "<small><i>%s</i>\t<i>Quality: %s</i></small>\n"
 "%s\t%s\t"
-msgstr "<small><i>%s</i>⇥<i>品質: %s</i></small>\n%s⇥%s⇥"
+msgstr ""
+"<small><i>%s</i>⇥<i>品質: %s</i></small>\n"
+"%s⇥%s⇥"
 
-#: ../gtk/calllogs.c:343
+#: ../gtk/calllogs.c:341
 #, c-format
-msgid ""
-"<small><i>%s</i></small>\t\n"
-"%s"
-msgstr "<small><i>%s</i></small>⇥\n%s"
+msgid "<big><b>%s</b></big>\t%s"
+msgstr "<big><b>%s</b></big>⇥%s"
 
 #: ../gtk/conference.c:38 ../gtk/main.ui.h:13
 msgid "Conference"
@@ -93,7 +89,7 @@ msgstr "自分"
 msgid "Couldn't find pixmap file: %s"
 msgstr "pixmapファイルが見つかりません %s"
 
-#: ../gtk/chat.c:364 ../gtk/friendlist.c:924
+#: ../gtk/chat.c:367 ../gtk/friendlist.c:924
 msgid "Invalid sip contact !"
 msgstr "無効なSIP接続です！"
 
@@ -123,9 +119,11 @@ msgstr "着信呼び出しが設定されている場合自動的に応答する
 
 #: ../gtk/main.c:149
 msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: "
-"c:\\Program Files\\Linphone)"
-msgstr "作業ディレクトリをSpecifiy (インストールした時のベースである必要があります。例:c:\\Program Files\\Linphone)"
+"Specifiy a working directory (should be the base of the installation, eg: c:"
+"\\Program Files\\Linphone)"
+msgstr ""
+"作業ディレクトリをSpecifiy (インストールした時のベースである必要があります。"
+"例:c:\\Program Files\\Linphone)"
 
 #: ../gtk/main.c:156
 msgid "Configuration file"
@@ -139,9 +137,14 @@ msgstr "オーディオアシスタントを実行"
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
-"Would you allow him to see your presence status or add him to your contact list ?\n"
+"Would you allow him to see your presence status or add him to your contact "
+"list ?\n"
 "If you answer no, this person will be temporarily blacklisted."
-msgstr "%s が連絡相手にあなたを追加しようとしています。\nあなたのステータスを参照させるか、もしくは連絡先リストに追加することができます。\nあなたが拒否すると、この人は一時的にブラックリストへ登録されます。"
+msgstr ""
+"%s が連絡相手にあなたを追加しようとしています。\n"
+"あなたのステータスを参照させるか、もしくは連絡先リストに追加することができま"
+"す。\n"
+"あなたが拒否すると、この人は一時的にブラックリストへ登録されます。"
 
 #: ../gtk/main.c:1162
 #, c-format
@@ -154,7 +157,7 @@ msgstr ""
 msgid "Call error"
 msgstr "呼出エラー"
 
-#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3744
+#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3747
 msgid "Call ended"
 msgstr "呼出終了"
 
@@ -379,7 +382,9 @@ msgstr "ZRTP"
 msgid ""
 "A more recent version is availalble from %s.\n"
 "Would you like to open a browser to download it ?"
-msgstr "%s よりも新しいバージョンが利用可能です。\nダウンロードするために、ブラウザを開きますか？"
+msgstr ""
+"%s よりも新しいバージョンが利用可能です。\n"
+"ダウンロードするために、ブラウザを開きますか？"
 
 #: ../gtk/update.c:91
 msgid "You are running the lastest version."
@@ -412,10 +417,13 @@ msgid_plural "Found %i contacts"
 msgstr[0] "%i 件発見"
 
 #: ../gtk/setupwizard.c:34
+#, fuzzy
 msgid ""
-"Welcome !\n"
+"Welcome!\n"
 "This assistant will help you to use a SIP account for your calls."
-msgstr "ようこそ！\nこのアシスタントは、あなたのSIPアカウントを使用するのに役立ちます。"
+msgstr ""
+"ようこそ！\n"
+"このアシスタントは、あなたのSIPアカウントを使用するのに役立ちます。"
 
 #: ../gtk/setupwizard.c:43
 msgid "Create an account on linphone.org"
@@ -501,43 +509,44 @@ msgstr ""
 
 #: ../gtk/setupwizard.c:413
 msgid ""
-"Please validate your account by clicking on the link we just sent you by email.\n"
+"Please validate your account by clicking on the link we just sent you by "
+"email.\n"
 "Then come back here and press Next button."
 msgstr ""
 
-#: ../gtk/setupwizard.c:600
+#: ../gtk/setupwizard.c:602
 msgid "SIP account configuration assistant"
 msgstr ""
 
-#: ../gtk/setupwizard.c:618
+#: ../gtk/setupwizard.c:620
 msgid "Welcome to the account setup assistant"
 msgstr "アカウント設定アシスタントへようこそ"
 
-#: ../gtk/setupwizard.c:623
+#: ../gtk/setupwizard.c:625
 msgid "Account setup assistant"
 msgstr "アカウント設定アシスタント"
 
-#: ../gtk/setupwizard.c:629
+#: ../gtk/setupwizard.c:631
 msgid "Configure your account (step 1/1)"
 msgstr ""
 
-#: ../gtk/setupwizard.c:634
+#: ../gtk/setupwizard.c:636
 msgid "Enter your sip username (step 1/1)"
 msgstr ""
 
-#: ../gtk/setupwizard.c:638
+#: ../gtk/setupwizard.c:640
 msgid "Enter account information (step 1/2)"
 msgstr ""
 
-#: ../gtk/setupwizard.c:647
+#: ../gtk/setupwizard.c:649
 msgid "Validation (step 2/2)"
 msgstr ""
 
-#: ../gtk/setupwizard.c:652
+#: ../gtk/setupwizard.c:654
 msgid "Error"
 msgstr "エラー"
 
-#: ../gtk/setupwizard.c:656 ../gtk/audio_assistant.c:527
+#: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:527
 msgid "Terminating"
 msgstr ""
 
@@ -689,11 +698,6 @@ msgstr ""
 msgid "<b>Paused call</b>"
 msgstr ""
 
-#: ../gtk/incall_view.c:771
-#, c-format
-msgid "%02i::%02i::%02i"
-msgstr "%02i::%02i::%02i"
-
 #: ../gtk/incall_view.c:794
 msgid "<b>Call ended.</b>"
 msgstr ""
@@ -761,10 +765,13 @@ msgid "Too loud"
 msgstr ""
 
 #: ../gtk/audio_assistant.c:318
+#, fuzzy
 msgid ""
-"Welcome !\n"
+"Welcome!\n"
 "This assistant will help you to configure audio settings for Linphone"
 msgstr ""
+"ようこそ！\n"
+"このアシスタントは、あなたのSIPアカウントを使用するのに役立ちます。"
 
 #: ../gtk/audio_assistant.c:328
 msgid "Capture device"
@@ -971,7 +978,8 @@ msgid "Login information"
 msgstr "ログイン情報"
 
 #: ../gtk/main.ui.h:46
-msgid "<b>Welcome !</b>"
+#, fuzzy
+msgid "<b>Welcome!</b>"
 msgstr "<b>ようこそ</b>"
 
 #: ../gtk/main.ui.h:47
@@ -979,11 +987,13 @@ msgid "Delete"
 msgstr "削除"
 
 #: ../gtk/about.ui.h:1
-msgid "About linphone"
+#, fuzzy
+msgid "About Linphone"
 msgstr "linphoneについて"
 
 #: ../gtk/about.ui.h:2
-msgid "(C) Belledonne Communications,2010\n"
+#, fuzzy
+msgid "(C) Belledonne Communications, 2010\n"
 msgstr "(C) Belledonne Communications,2010\n"
 
 #: ../gtk/about.ui.h:4
@@ -1004,7 +1014,19 @@ msgid ""
 "cs: Petr Pisar <petr.pisar@atlas.cz>\n"
 "hu: anonymous\n"
 "he: Eli Zaretskii <eliz@gnu.org>\n"
-msgstr "fr: Simon Morlat\nen: Simon Morlat and Delphine Perreau\nit: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\nde: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\nsv: Daniel Nylander <po@danielnylander.se>\nes: Jesus Benitez <gnelson at inMail dot sk>\nja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\npt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\npl: Robert Nasiadek <darkone@darkone.pl>\ncs: Petr Pisar <petr.pisar@atlas.cz>\nhu: anonymous\nhe: Eli Zaretskii <eliz@gnu.org>\n"
+msgstr ""
+"fr: Simon Morlat\n"
+"en: Simon Morlat and Delphine Perreau\n"
+"it: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\n"
+"de: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\n"
+"sv: Daniel Nylander <po@danielnylander.se>\n"
+"es: Jesus Benitez <gnelson at inMail dot sk>\n"
+"ja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\n"
+"pt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\n"
+"pl: Robert Nasiadek <darkone@darkone.pl>\n"
+"cs: Petr Pisar <petr.pisar@atlas.cz>\n"
+"hu: anonymous\n"
+"he: Eli Zaretskii <eliz@gnu.org>\n"
 
 #: ../gtk/contact.ui.h:2
 msgid "SIP Address"
@@ -1146,7 +1168,7 @@ msgstr "オーディオのコーデック"
 msgid "Video codecs"
 msgstr "ビデオのコーデック"
 
-#: ../gtk/parameters.ui.h:10 ../gtk/keypad.ui.h:5
+#: ../gtk/parameters.ui.h:10
 msgid "C"
 msgstr ""
 
@@ -1425,18 +1447,14 @@ msgid "Authentication method:"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:80
-msgid "label"
-msgstr "ラベル"
-
-#: ../gtk/parameters.ui.h:81
 msgid "<b>LDAP Account setup</b>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:82
+#: ../gtk/parameters.ui.h:81
 msgid "LDAP"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:83
+#: ../gtk/parameters.ui.h:82
 msgid "Done"
 msgstr ""
 
@@ -1548,66 +1566,6 @@ msgstr ""
 msgid "<b>Configure http proxy (optional)</b>"
 msgstr ""
 
-#: ../gtk/keypad.ui.h:1
-msgid "D"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:2
-msgid "#"
-msgstr "#"
-
-#: ../gtk/keypad.ui.h:3
-msgid "0"
-msgstr "0"
-
-#: ../gtk/keypad.ui.h:4
-msgid "*"
-msgstr "*"
-
-#: ../gtk/keypad.ui.h:6
-msgid "9"
-msgstr "9"
-
-#: ../gtk/keypad.ui.h:7
-msgid "8"
-msgstr "8"
-
-#: ../gtk/keypad.ui.h:8
-msgid "7"
-msgstr "7"
-
-#: ../gtk/keypad.ui.h:9
-msgid "B"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:10
-msgid "6"
-msgstr "6"
-
-#: ../gtk/keypad.ui.h:11
-msgid "5"
-msgstr "5"
-
-#: ../gtk/keypad.ui.h:12
-msgid "4"
-msgstr "4"
-
-#: ../gtk/keypad.ui.h:13
-msgid "A"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:14
-msgid "3"
-msgstr "3"
-
-#: ../gtk/keypad.ui.h:15
-msgid "2"
-msgstr "2"
-
-#: ../gtk/keypad.ui.h:16
-msgid "1"
-msgstr "1"
-
 #: ../gtk/ldap.ui.h:1
 msgid "LDAP Settings"
 msgstr ""
@@ -1703,14 +1661,13 @@ msgstr ""
 
 #: ../gtk/config-uri.ui.h:2
 msgid ""
-"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
+"This dialog allows to set an http or https address when configuration is to "
+"be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, "
+"Linphone will restart automatically in order to fetch and take into account "
+"the new configuration. "
 msgstr ""
 
-#: ../gtk/config-uri.ui.h:4
-msgid "https://"
-msgstr "https://"
-
 #: ../gtk/provisioning-fetch.ui.h:1
 msgid "Configuring..."
 msgstr ""
@@ -1719,64 +1676,60 @@ msgstr ""
 msgid "Please wait while fetching configuration from server..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1511
+#: ../coreapi/linphonecore.c:1510
 msgid "Ready"
 msgstr "準備"
 
-#: ../coreapi/linphonecore.c:2470
+#: ../coreapi/linphonecore.c:2473
 msgid "Configuring"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2635
+#: ../coreapi/linphonecore.c:2638
 msgid "Looking for telephone number destination..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2637
+#: ../coreapi/linphonecore.c:2640
 msgid "Could not resolve this number."
 msgstr ""
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2919
+#: ../coreapi/linphonecore.c:2922
 msgid "Contacting"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2924
+#: ../coreapi/linphonecore.c:2927
 msgid "Could not call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3074
+#: ../coreapi/linphonecore.c:3077
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3233
+#: ../coreapi/linphonecore.c:3236
 msgid "is contacting you"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3234
+#: ../coreapi/linphonecore.c:3237
 msgid " and asked autoanswer."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3234
-msgid "."
-msgstr "."
-
-#: ../coreapi/linphonecore.c:3352
+#: ../coreapi/linphonecore.c:3355
 msgid "Modifying call parameters..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3700
+#: ../coreapi/linphonecore.c:3703
 msgid "Connected."
 msgstr "接続しました。"
 
-#: ../coreapi/linphonecore.c:3725
+#: ../coreapi/linphonecore.c:3728
 msgid "Call aborted"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3915
+#: ../coreapi/linphonecore.c:3918
 msgid "Could not pause the call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3919
+#: ../coreapi/linphonecore.c:3922
 msgid "Pausing the current call..."
 msgstr ""
 
@@ -1837,7 +1790,8 @@ msgid "Vacation"
 msgstr "休暇中"
 
 #: ../coreapi/friend.c:68
-msgid "Unknown-bug"
+#, fuzzy
+msgid "Unknown status"
 msgstr "不明なバグ"
 
 #: ../coreapi/proxy.c:319
@@ -1976,3 +1930,58 @@ msgstr ""
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
 msgstr[0] ""
+
+#~ msgid "https://"
+#~ msgstr "https://"
+
+#~ msgid "label"
+#~ msgstr "ラベル"
+
+#~ msgid "#"
+#~ msgstr "#"
+
+#~ msgid "0"
+#~ msgstr "0"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "9"
+#~ msgstr "9"
+
+#~ msgid "8"
+#~ msgstr "8"
+
+#~ msgid "7"
+#~ msgstr "7"
+
+#~ msgid "6"
+#~ msgstr "6"
+
+#~ msgid "5"
+#~ msgstr "5"
+
+#~ msgid "4"
+#~ msgstr "4"
+
+#~ msgid "3"
+#~ msgstr "3"
+
+#~ msgid "2"
+#~ msgstr "2"
+
+#~ msgid "1"
+#~ msgstr "1"
+
+#~ msgid ""
+#~ "<small><i>%s</i></small>\t\n"
+#~ "%s"
+#~ msgstr ""
+#~ "<small><i>%s</i></small>⇥\n"
+#~ "%s"
+
+#~ msgid "%02i::%02i::%02i"
+#~ msgstr "%02i::%02i::%02i"
+
+#~ msgid "."
+#~ msgstr "."
diff --git a/po/nb_NO.po b/po/nb_NO.po
index a4b047ac4..2a316169b 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -1,21 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Øyvind Sæther <oyvinds@everdot.org>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-19 10:39+0100\n"
+"POT-Creation-Date: 2014-11-28 10:55+0100\n"
 "PO-Revision-Date: 2014-11-19 10:17+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
-"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/linphone-gtk/language/nb_NO/)\n"
+"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/"
+"p/linphone-gtk/language/nb_NO/)\n"
+"Language: nb_NO\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974
@@ -63,11 +64,6 @@ msgid_plural "%i seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gtk/calllogs.c:335 ../gtk/calllogs.c:341
-#, c-format
-msgid "<big><b>%s</b></big>\t%s"
-msgstr ""
-
 #: ../gtk/calllogs.c:337
 #, c-format
 msgid ""
@@ -75,11 +71,9 @@ msgid ""
 "%s\t%s\t"
 msgstr ""
 
-#: ../gtk/calllogs.c:343
+#: ../gtk/calllogs.c:341
 #, c-format
-msgid ""
-"<small><i>%s</i></small>\t\n"
-"%s"
+msgid "<big><b>%s</b></big>\t%s"
 msgstr ""
 
 #: ../gtk/conference.c:38 ../gtk/main.ui.h:13
@@ -95,7 +89,7 @@ msgstr ""
 msgid "Couldn't find pixmap file: %s"
 msgstr "Fant ikke pixmap fli: %s"
 
-#: ../gtk/chat.c:364 ../gtk/friendlist.c:924
+#: ../gtk/chat.c:367 ../gtk/friendlist.c:924
 msgid "Invalid sip contact !"
 msgstr "Ugyldig SIP kontakt !"
 
@@ -125,9 +119,11 @@ msgstr "besvarer innkommende samtaler automatisk om valgt"
 
 #: ../gtk/main.c:149
 msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: "
-"c:\\Program Files\\Linphone)"
-msgstr "Spesifiser arbeidsmappe (bør være base for installasjonen, f.eks: c:\\Programfiler\\Linphone)"
+"Specifiy a working directory (should be the base of the installation, eg: c:"
+"\\Program Files\\Linphone)"
+msgstr ""
+"Spesifiser arbeidsmappe (bør være base for installasjonen, f.eks: c:"
+"\\Programfiler\\Linphone)"
 
 #: ../gtk/main.c:156
 msgid "Configuration file"
@@ -141,9 +137,14 @@ msgstr ""
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
-"Would you allow him to see your presence status or add him to your contact list ?\n"
+"Would you allow him to see your presence status or add him to your contact "
+"list ?\n"
 "If you answer no, this person will be temporarily blacklisted."
-msgstr "%s vil legge deg til i hans/hennes kontaktliste.\nVil du tillate vedkommende å se din tilstedestatus eller legge vedkommende i din kontaktliste?\nHvis du svarer nei vil personen bli svartelyst midlertidig."
+msgstr ""
+"%s vil legge deg til i hans/hennes kontaktliste.\n"
+"Vil du tillate vedkommende å se din tilstedestatus eller legge vedkommende i "
+"din kontaktliste?\n"
+"Hvis du svarer nei vil personen bli svartelyst midlertidig."
 
 #: ../gtk/main.c:1162
 #, c-format
@@ -156,7 +157,7 @@ msgstr ""
 msgid "Call error"
 msgstr ""
 
-#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3744
+#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3747
 msgid "Call ended"
 msgstr "Samtale avsluttet"
 
@@ -208,7 +209,9 @@ msgstr "Vi er overført til %s"
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
-msgstr "Klarte ikke å finne noe lydkort på denne datamaskinen.\nDu vil ikke kunne sende eller motta lydsamtaler."
+msgstr ""
+"Klarte ikke å finne noe lydkort på denne datamaskinen.\n"
+"Du vil ikke kunne sende eller motta lydsamtaler."
 
 #: ../gtk/main.c:2157
 msgid "A free SIP video-phone"
@@ -381,7 +384,9 @@ msgstr ""
 msgid ""
 "A more recent version is availalble from %s.\n"
 "Would you like to open a browser to download it ?"
-msgstr "En nyere utgave er tilgjengelig fra %s.\nVil du åpne en nettleser og laste den ned ?"
+msgstr ""
+"En nyere utgave er tilgjengelig fra %s.\n"
+"Vil du åpne en nettleser og laste den ned ?"
 
 #: ../gtk/update.c:91
 msgid "You are running the lastest version."
@@ -415,10 +420,13 @@ msgstr[0] "Fant kontakt %i"
 msgstr[1] "Hittat kontakt %i"
 
 #: ../gtk/setupwizard.c:34
+#, fuzzy
 msgid ""
-"Welcome !\n"
+"Welcome!\n"
 "This assistant will help you to use a SIP account for your calls."
-msgstr "Velkommen\nDenne veiviseren vil hjelpe deg sette opp en SIP-konto for dine samtaler."
+msgstr ""
+"Velkommen\n"
+"Denne veiviseren vil hjelpe deg sette opp en SIP-konto for dine samtaler."
 
 #: ../gtk/setupwizard.c:43
 msgid "Create an account on linphone.org"
@@ -504,43 +512,44 @@ msgstr "Takk. Ditt konto er nå satt opp og klart til bruk."
 
 #: ../gtk/setupwizard.c:413
 msgid ""
-"Please validate your account by clicking on the link we just sent you by email.\n"
+"Please validate your account by clicking on the link we just sent you by "
+"email.\n"
 "Then come back here and press Next button."
 msgstr ""
 
-#: ../gtk/setupwizard.c:600
+#: ../gtk/setupwizard.c:602
 msgid "SIP account configuration assistant"
 msgstr ""
 
-#: ../gtk/setupwizard.c:618
+#: ../gtk/setupwizard.c:620
 msgid "Welcome to the account setup assistant"
 msgstr "Velkommen til brukerkontoveiviseren"
 
-#: ../gtk/setupwizard.c:623
+#: ../gtk/setupwizard.c:625
 msgid "Account setup assistant"
 msgstr "Brukerkontoveiviser"
 
-#: ../gtk/setupwizard.c:629
+#: ../gtk/setupwizard.c:631
 msgid "Configure your account (step 1/1)"
 msgstr ""
 
-#: ../gtk/setupwizard.c:634
+#: ../gtk/setupwizard.c:636
 msgid "Enter your sip username (step 1/1)"
 msgstr ""
 
-#: ../gtk/setupwizard.c:638
+#: ../gtk/setupwizard.c:640
 msgid "Enter account information (step 1/2)"
 msgstr ""
 
-#: ../gtk/setupwizard.c:647
+#: ../gtk/setupwizard.c:649
 msgid "Validation (step 2/2)"
 msgstr ""
 
-#: ../gtk/setupwizard.c:652
+#: ../gtk/setupwizard.c:654
 msgid "Error"
 msgstr ""
 
-#: ../gtk/setupwizard.c:656 ../gtk/audio_assistant.c:527
+#: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:527
 msgid "Terminating"
 msgstr ""
 
@@ -692,11 +701,6 @@ msgstr "<b>I samtale med</b>"
 msgid "<b>Paused call</b>"
 msgstr "<b>Pauset samtale</b>"
 
-#: ../gtk/incall_view.c:771
-#, c-format
-msgid "%02i::%02i::%02i"
-msgstr "%02i:%02i:%02i"
-
 #: ../gtk/incall_view.c:794
 msgid "<b>Call ended.</b>"
 msgstr "<b>Samtale avsluttet.</b>"
@@ -764,10 +768,13 @@ msgid "Too loud"
 msgstr ""
 
 #: ../gtk/audio_assistant.c:318
+#, fuzzy
 msgid ""
-"Welcome !\n"
+"Welcome!\n"
 "This assistant will help you to configure audio settings for Linphone"
 msgstr ""
+"Velkommen\n"
+"Denne veiviseren vil hjelpe deg sette opp en SIP-konto for dine samtaler."
 
 #: ../gtk/audio_assistant.c:328
 msgid "Capture device"
@@ -974,7 +981,8 @@ msgid "Login information"
 msgstr "Innlogginsinformasjon"
 
 #: ../gtk/main.ui.h:46
-msgid "<b>Welcome !</b>"
+#, fuzzy
+msgid "<b>Welcome!</b>"
 msgstr "<b>Velkommen!</b>"
 
 #: ../gtk/main.ui.h:47
@@ -982,16 +990,20 @@ msgid "Delete"
 msgstr ""
 
 #: ../gtk/about.ui.h:1
-msgid "About linphone"
+#, fuzzy
+msgid "About Linphone"
 msgstr "Om Linphone"
 
 #: ../gtk/about.ui.h:2
-msgid "(C) Belledonne Communications,2010\n"
+#, fuzzy
+msgid "(C) Belledonne Communications, 2010\n"
 msgstr "(C) Belledonne Communications,2011\n"
 
 #: ../gtk/about.ui.h:4
 msgid "An internet video phone using the standard SIP (rfc3261) protocol."
-msgstr "En Internet Videotelefon som bruker den standardiserte SIP-protokollen (rfc3261)."
+msgstr ""
+"En Internet Videotelefon som bruker den standardiserte SIP-protokollen "
+"(rfc3261)."
 
 #: ../gtk/about.ui.h:5
 msgid ""
@@ -1149,7 +1161,7 @@ msgstr "Lyd kodek"
 msgid "Video codecs"
 msgstr "Video kodek"
 
-#: ../gtk/parameters.ui.h:10 ../gtk/keypad.ui.h:5
+#: ../gtk/parameters.ui.h:10
 msgid "C"
 msgstr "C"
 
@@ -1428,18 +1440,14 @@ msgid "Authentication method:"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:80
-msgid "label"
-msgstr "etikett"
-
-#: ../gtk/parameters.ui.h:81
 msgid "<b>LDAP Account setup</b>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:82
+#: ../gtk/parameters.ui.h:81
 msgid "LDAP"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:83
+#: ../gtk/parameters.ui.h:82
 msgid "Done"
 msgstr "Ferdig"
 
@@ -1551,66 +1559,6 @@ msgstr ""
 msgid "<b>Configure http proxy (optional)</b>"
 msgstr ""
 
-#: ../gtk/keypad.ui.h:1
-msgid "D"
-msgstr "D"
-
-#: ../gtk/keypad.ui.h:2
-msgid "#"
-msgstr "#"
-
-#: ../gtk/keypad.ui.h:3
-msgid "0"
-msgstr "0"
-
-#: ../gtk/keypad.ui.h:4
-msgid "*"
-msgstr "*"
-
-#: ../gtk/keypad.ui.h:6
-msgid "9"
-msgstr "9"
-
-#: ../gtk/keypad.ui.h:7
-msgid "8"
-msgstr "8"
-
-#: ../gtk/keypad.ui.h:8
-msgid "7"
-msgstr "7"
-
-#: ../gtk/keypad.ui.h:9
-msgid "B"
-msgstr "B"
-
-#: ../gtk/keypad.ui.h:10
-msgid "6"
-msgstr "6"
-
-#: ../gtk/keypad.ui.h:11
-msgid "5"
-msgstr "5"
-
-#: ../gtk/keypad.ui.h:12
-msgid "4"
-msgstr "4"
-
-#: ../gtk/keypad.ui.h:13
-msgid "A"
-msgstr "A"
-
-#: ../gtk/keypad.ui.h:14
-msgid "3"
-msgstr "3"
-
-#: ../gtk/keypad.ui.h:15
-msgid "2"
-msgstr "2"
-
-#: ../gtk/keypad.ui.h:16
-msgid "1"
-msgstr "1"
-
 #: ../gtk/ldap.ui.h:1
 msgid "LDAP Settings"
 msgstr ""
@@ -1706,12 +1654,11 @@ msgstr ""
 
 #: ../gtk/config-uri.ui.h:2
 msgid ""
-"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
-msgstr ""
-
-#: ../gtk/config-uri.ui.h:4
-msgid "https://"
+"This dialog allows to set an http or https address when configuration is to "
+"be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, "
+"Linphone will restart automatically in order to fetch and take into account "
+"the new configuration. "
 msgstr ""
 
 #: ../gtk/provisioning-fetch.ui.h:1
@@ -1722,64 +1669,60 @@ msgstr ""
 msgid "Please wait while fetching configuration from server..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1511
+#: ../coreapi/linphonecore.c:1510
 msgid "Ready"
 msgstr "Klar"
 
-#: ../coreapi/linphonecore.c:2470
+#: ../coreapi/linphonecore.c:2473
 msgid "Configuring"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2635
+#: ../coreapi/linphonecore.c:2638
 msgid "Looking for telephone number destination..."
 msgstr "Ser etter telefonnummer for destinasjonen..."
 
-#: ../coreapi/linphonecore.c:2637
+#: ../coreapi/linphonecore.c:2640
 msgid "Could not resolve this number."
 msgstr "Kan ikke tilkoble dette nummeret."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2919
+#: ../coreapi/linphonecore.c:2922
 msgid "Contacting"
 msgstr "Tilknytter"
 
-#: ../coreapi/linphonecore.c:2924
+#: ../coreapi/linphonecore.c:2927
 msgid "Could not call"
 msgstr "Kunne ikke ringe"
 
-#: ../coreapi/linphonecore.c:3074
+#: ../coreapi/linphonecore.c:3077
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "Beklager, du har nådd maksimalt antall samtidige samtaler"
 
-#: ../coreapi/linphonecore.c:3233
+#: ../coreapi/linphonecore.c:3236
 msgid "is contacting you"
 msgstr "Kontakter deg."
 
-#: ../coreapi/linphonecore.c:3234
+#: ../coreapi/linphonecore.c:3237
 msgid " and asked autoanswer."
 msgstr " og ba om autosvar."
 
-#: ../coreapi/linphonecore.c:3234
-msgid "."
-msgstr "."
-
-#: ../coreapi/linphonecore.c:3352
+#: ../coreapi/linphonecore.c:3355
 msgid "Modifying call parameters..."
 msgstr "Endrer ringeparametre..."
 
-#: ../coreapi/linphonecore.c:3700
+#: ../coreapi/linphonecore.c:3703
 msgid "Connected."
 msgstr "Tilkoblet"
 
-#: ../coreapi/linphonecore.c:3725
+#: ../coreapi/linphonecore.c:3728
 msgid "Call aborted"
 msgstr "Samtale avbrutt"
 
-#: ../coreapi/linphonecore.c:3915
+#: ../coreapi/linphonecore.c:3918
 msgid "Could not pause the call"
 msgstr "Kunne ikke pause samtalen"
 
-#: ../coreapi/linphonecore.c:3919
+#: ../coreapi/linphonecore.c:3922
 msgid "Pausing the current call..."
 msgstr "Pauser nåværende samtale"
 
@@ -1840,20 +1783,25 @@ msgid "Vacation"
 msgstr ""
 
 #: ../coreapi/friend.c:68
-msgid "Unknown-bug"
+#, fuzzy
+msgid "Unknown status"
 msgstr "Ukjent feil"
 
 #: ../coreapi/proxy.c:319
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
-msgstr "SIP proxy adressen du har angitt er ugyldig, den må begynne med \"sip:\" etterfult av vertsnavn."
+msgstr ""
+"SIP proxy adressen du har angitt er ugyldig, den må begynne med \"sip:\" "
+"etterfult av vertsnavn."
 
 #: ../coreapi/proxy.c:325
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
-msgstr "SIP adressen du har angitt er feil. Adressen bør se ut som sip: brukernavn@domenenavn, f.eks sip:ola@eksempel.no"
+msgstr ""
+"SIP adressen du har angitt er feil. Adressen bør se ut som sip: "
+"brukernavn@domenenavn, f.eks sip:ola@eksempel.no"
 
 #: ../coreapi/proxy.c:1377
 #, c-format
@@ -1980,3 +1928,57 @@ msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
 msgstr[0] "Du har %i ubesvarte anrop."
 msgstr[1] "Du har %i missade samtal"
+
+#~ msgid "label"
+#~ msgstr "etikett"
+
+#~ msgid "D"
+#~ msgstr "D"
+
+#~ msgid "#"
+#~ msgstr "#"
+
+#~ msgid "0"
+#~ msgstr "0"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "9"
+#~ msgstr "9"
+
+#~ msgid "8"
+#~ msgstr "8"
+
+#~ msgid "7"
+#~ msgstr "7"
+
+#~ msgid "B"
+#~ msgstr "B"
+
+#~ msgid "6"
+#~ msgstr "6"
+
+#~ msgid "5"
+#~ msgstr "5"
+
+#~ msgid "4"
+#~ msgstr "4"
+
+#~ msgid "A"
+#~ msgstr "A"
+
+#~ msgid "3"
+#~ msgstr "3"
+
+#~ msgid "2"
+#~ msgstr "2"
+
+#~ msgid "1"
+#~ msgstr "1"
+
+#~ msgid "%02i::%02i::%02i"
+#~ msgstr "%02i:%02i:%02i"
+
+#~ msgid "."
+#~ msgstr "."
diff --git a/po/nl.po b/po/nl.po
index be7b007b6..9d3ccea4e 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-19 10:39+0100\n"
+"POT-Creation-Date: 2014-11-28 10:55+0100\n"
 "PO-Revision-Date: 2014-11-19 10:08+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/linphone-gtk/language/nl/)\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/linphone-gtk/"
+"language/nl/)\n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974
@@ -62,11 +63,6 @@ msgid_plural "%i seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gtk/calllogs.c:335 ../gtk/calllogs.c:341
-#, c-format
-msgid "<big><b>%s</b></big>\t%s"
-msgstr ""
-
 #: ../gtk/calllogs.c:337
 #, c-format
 msgid ""
@@ -74,11 +70,9 @@ msgid ""
 "%s\t%s\t"
 msgstr ""
 
-#: ../gtk/calllogs.c:343
+#: ../gtk/calllogs.c:341
 #, c-format
-msgid ""
-"<small><i>%s</i></small>\t\n"
-"%s"
+msgid "<big><b>%s</b></big>\t%s"
 msgstr ""
 
 #: ../gtk/conference.c:38 ../gtk/main.ui.h:13
@@ -94,7 +88,7 @@ msgstr ""
 msgid "Couldn't find pixmap file: %s"
 msgstr "Kon pixmap bestand %s niet vinden"
 
-#: ../gtk/chat.c:364 ../gtk/friendlist.c:924
+#: ../gtk/chat.c:367 ../gtk/friendlist.c:924
 msgid "Invalid sip contact !"
 msgstr ""
 
@@ -124,8 +118,8 @@ msgstr ""
 
 #: ../gtk/main.c:149
 msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: "
-"c:\\Program Files\\Linphone)"
+"Specifiy a working directory (should be the base of the installation, eg: c:"
+"\\Program Files\\Linphone)"
 msgstr ""
 
 #: ../gtk/main.c:156
@@ -140,7 +134,8 @@ msgstr ""
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
-"Would you allow him to see your presence status or add him to your contact list ?\n"
+"Would you allow him to see your presence status or add him to your contact "
+"list ?\n"
 "If you answer no, this person will be temporarily blacklisted."
 msgstr ""
 
@@ -155,7 +150,7 @@ msgstr ""
 msgid "Call error"
 msgstr ""
 
-#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3744
+#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3747
 msgid "Call ended"
 msgstr "Oproep beeindigd"
 
@@ -415,7 +410,7 @@ msgstr[1] ""
 
 #: ../gtk/setupwizard.c:34
 msgid ""
-"Welcome !\n"
+"Welcome!\n"
 "This assistant will help you to use a SIP account for your calls."
 msgstr ""
 
@@ -503,43 +498,44 @@ msgstr ""
 
 #: ../gtk/setupwizard.c:413
 msgid ""
-"Please validate your account by clicking on the link we just sent you by email.\n"
+"Please validate your account by clicking on the link we just sent you by "
+"email.\n"
 "Then come back here and press Next button."
 msgstr ""
 
-#: ../gtk/setupwizard.c:600
+#: ../gtk/setupwizard.c:602
 msgid "SIP account configuration assistant"
 msgstr ""
 
-#: ../gtk/setupwizard.c:618
+#: ../gtk/setupwizard.c:620
 msgid "Welcome to the account setup assistant"
 msgstr ""
 
-#: ../gtk/setupwizard.c:623
+#: ../gtk/setupwizard.c:625
 msgid "Account setup assistant"
 msgstr ""
 
-#: ../gtk/setupwizard.c:629
+#: ../gtk/setupwizard.c:631
 msgid "Configure your account (step 1/1)"
 msgstr ""
 
-#: ../gtk/setupwizard.c:634
+#: ../gtk/setupwizard.c:636
 msgid "Enter your sip username (step 1/1)"
 msgstr ""
 
-#: ../gtk/setupwizard.c:638
+#: ../gtk/setupwizard.c:640
 msgid "Enter account information (step 1/2)"
 msgstr ""
 
-#: ../gtk/setupwizard.c:647
+#: ../gtk/setupwizard.c:649
 msgid "Validation (step 2/2)"
 msgstr ""
 
-#: ../gtk/setupwizard.c:652
+#: ../gtk/setupwizard.c:654
 msgid "Error"
 msgstr ""
 
-#: ../gtk/setupwizard.c:656 ../gtk/audio_assistant.c:527
+#: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:527
 msgid "Terminating"
 msgstr ""
 
@@ -691,11 +687,6 @@ msgstr ""
 msgid "<b>Paused call</b>"
 msgstr ""
 
-#: ../gtk/incall_view.c:771
-#, c-format
-msgid "%02i::%02i::%02i"
-msgstr ""
-
 #: ../gtk/incall_view.c:794
 msgid "<b>Call ended.</b>"
 msgstr ""
@@ -764,7 +755,7 @@ msgstr ""
 
 #: ../gtk/audio_assistant.c:318
 msgid ""
-"Welcome !\n"
+"Welcome!\n"
 "This assistant will help you to configure audio settings for Linphone"
 msgstr ""
 
@@ -973,7 +964,7 @@ msgid "Login information"
 msgstr ""
 
 #: ../gtk/main.ui.h:46
-msgid "<b>Welcome !</b>"
+msgid "<b>Welcome!</b>"
 msgstr ""
 
 #: ../gtk/main.ui.h:47
@@ -981,11 +972,11 @@ msgid "Delete"
 msgstr ""
 
 #: ../gtk/about.ui.h:1
-msgid "About linphone"
+msgid "About Linphone"
 msgstr ""
 
 #: ../gtk/about.ui.h:2
-msgid "(C) Belledonne Communications,2010\n"
+msgid "(C) Belledonne Communications, 2010\n"
 msgstr ""
 
 #: ../gtk/about.ui.h:4
@@ -1148,7 +1139,7 @@ msgstr ""
 msgid "Video codecs"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:10 ../gtk/keypad.ui.h:5
+#: ../gtk/parameters.ui.h:10
 msgid "C"
 msgstr ""
 
@@ -1427,18 +1418,14 @@ msgid "Authentication method:"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:80
-msgid "label"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:81
 msgid "<b>LDAP Account setup</b>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:82
+#: ../gtk/parameters.ui.h:81
 msgid "LDAP"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:83
+#: ../gtk/parameters.ui.h:82
 msgid "Done"
 msgstr ""
 
@@ -1550,66 +1537,6 @@ msgstr ""
 msgid "<b>Configure http proxy (optional)</b>"
 msgstr ""
 
-#: ../gtk/keypad.ui.h:1
-msgid "D"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:2
-msgid "#"
-msgstr "#"
-
-#: ../gtk/keypad.ui.h:3
-msgid "0"
-msgstr "0"
-
-#: ../gtk/keypad.ui.h:4
-msgid "*"
-msgstr "*"
-
-#: ../gtk/keypad.ui.h:6
-msgid "9"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:7
-msgid "8"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:8
-msgid "7"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:9
-msgid "B"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:10
-msgid "6"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:11
-msgid "5"
-msgstr "5"
-
-#: ../gtk/keypad.ui.h:12
-msgid "4"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:13
-msgid "A"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:14
-msgid "3"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:15
-msgid "2"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:16
-msgid "1"
-msgstr "1"
-
 #: ../gtk/ldap.ui.h:1
 msgid "LDAP Settings"
 msgstr ""
@@ -1705,12 +1632,11 @@ msgstr ""
 
 #: ../gtk/config-uri.ui.h:2
 msgid ""
-"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
-msgstr ""
-
-#: ../gtk/config-uri.ui.h:4
-msgid "https://"
+"This dialog allows to set an http or https address when configuration is to "
+"be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, "
+"Linphone will restart automatically in order to fetch and take into account "
+"the new configuration. "
 msgstr ""
 
 #: ../gtk/provisioning-fetch.ui.h:1
@@ -1721,64 +1647,60 @@ msgstr ""
 msgid "Please wait while fetching configuration from server..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1511
+#: ../coreapi/linphonecore.c:1510
 msgid "Ready"
 msgstr "Gereed."
 
-#: ../coreapi/linphonecore.c:2470
+#: ../coreapi/linphonecore.c:2473
 msgid "Configuring"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2635
+#: ../coreapi/linphonecore.c:2638
 msgid "Looking for telephone number destination..."
 msgstr "Zoekt de lokatie van het telefoonnummer..."
 
-#: ../coreapi/linphonecore.c:2637
+#: ../coreapi/linphonecore.c:2640
 msgid "Could not resolve this number."
 msgstr "Kon dit nummer niet vinden."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2919
+#: ../coreapi/linphonecore.c:2922
 msgid "Contacting"
 msgstr "Verbinden"
 
-#: ../coreapi/linphonecore.c:2924
+#: ../coreapi/linphonecore.c:2927
 msgid "Could not call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3074
+#: ../coreapi/linphonecore.c:3077
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3233
+#: ../coreapi/linphonecore.c:3236
 msgid "is contacting you"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3234
+#: ../coreapi/linphonecore.c:3237
 msgid " and asked autoanswer."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3234
-msgid "."
-msgstr ""
-
-#: ../coreapi/linphonecore.c:3352
+#: ../coreapi/linphonecore.c:3355
 msgid "Modifying call parameters..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3700
+#: ../coreapi/linphonecore.c:3703
 msgid "Connected."
 msgstr "Verbonden."
 
-#: ../coreapi/linphonecore.c:3725
+#: ../coreapi/linphonecore.c:3728
 msgid "Call aborted"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3915
+#: ../coreapi/linphonecore.c:3918
 msgid "Could not pause the call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3919
+#: ../coreapi/linphonecore.c:3922
 msgid "Pausing the current call..."
 msgstr ""
 
@@ -1839,7 +1761,7 @@ msgid "Vacation"
 msgstr ""
 
 #: ../coreapi/friend.c:68
-msgid "Unknown-bug"
+msgid "Unknown status"
 msgstr ""
 
 #: ../coreapi/proxy.c:319
@@ -1979,3 +1901,18 @@ msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
 msgstr[0] ""
 msgstr[1] ""
+
+#~ msgid "#"
+#~ msgstr "#"
+
+#~ msgid "0"
+#~ msgstr "0"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "5"
+#~ msgstr "5"
+
+#~ msgid "1"
+#~ msgstr "1"
diff --git a/po/pl.po b/po/pl.po
index 99a4937a0..2112163f9 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,21 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-19 10:39+0100\n"
+"POT-Creation-Date: 2014-11-28 10:55+0100\n"
 "PO-Revision-Date: 2014-11-19 10:08+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/linphone-gtk/language/pl/)\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/linphone-gtk/"
+"language/pl/)\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pl\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
 
 #: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974
 #, c-format
@@ -64,11 +66,6 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../gtk/calllogs.c:335 ../gtk/calllogs.c:341
-#, c-format
-msgid "<big><b>%s</b></big>\t%s"
-msgstr ""
-
 #: ../gtk/calllogs.c:337
 #, c-format
 msgid ""
@@ -76,11 +73,9 @@ msgid ""
 "%s\t%s\t"
 msgstr ""
 
-#: ../gtk/calllogs.c:343
+#: ../gtk/calllogs.c:341
 #, c-format
-msgid ""
-"<small><i>%s</i></small>\t\n"
-"%s"
+msgid "<big><b>%s</b></big>\t%s"
 msgstr ""
 
 #: ../gtk/conference.c:38 ../gtk/main.ui.h:13
@@ -96,7 +91,7 @@ msgstr ""
 msgid "Couldn't find pixmap file: %s"
 msgstr "Nie można znaleźć pixmapy: %s"
 
-#: ../gtk/chat.c:364 ../gtk/friendlist.c:924
+#: ../gtk/chat.c:367 ../gtk/friendlist.c:924
 msgid "Invalid sip contact !"
 msgstr ""
 
@@ -126,8 +121,8 @@ msgstr ""
 
 #: ../gtk/main.c:149
 msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: "
-"c:\\Program Files\\Linphone)"
+"Specifiy a working directory (should be the base of the installation, eg: c:"
+"\\Program Files\\Linphone)"
 msgstr ""
 
 #: ../gtk/main.c:156
@@ -142,7 +137,8 @@ msgstr ""
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
-"Would you allow him to see your presence status or add him to your contact list ?\n"
+"Would you allow him to see your presence status or add him to your contact "
+"list ?\n"
 "If you answer no, this person will be temporarily blacklisted."
 msgstr ""
 
@@ -157,7 +153,7 @@ msgstr ""
 msgid "Call error"
 msgstr ""
 
-#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3744
+#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3747
 msgid "Call ended"
 msgstr ""
 
@@ -418,7 +414,7 @@ msgstr[2] ""
 
 #: ../gtk/setupwizard.c:34
 msgid ""
-"Welcome !\n"
+"Welcome!\n"
 "This assistant will help you to use a SIP account for your calls."
 msgstr ""
 
@@ -506,43 +502,44 @@ msgstr ""
 
 #: ../gtk/setupwizard.c:413
 msgid ""
-"Please validate your account by clicking on the link we just sent you by email.\n"
+"Please validate your account by clicking on the link we just sent you by "
+"email.\n"
 "Then come back here and press Next button."
 msgstr ""
 
-#: ../gtk/setupwizard.c:600
+#: ../gtk/setupwizard.c:602
 msgid "SIP account configuration assistant"
 msgstr ""
 
-#: ../gtk/setupwizard.c:618
+#: ../gtk/setupwizard.c:620
 msgid "Welcome to the account setup assistant"
 msgstr ""
 
-#: ../gtk/setupwizard.c:623
+#: ../gtk/setupwizard.c:625
 msgid "Account setup assistant"
 msgstr ""
 
-#: ../gtk/setupwizard.c:629
+#: ../gtk/setupwizard.c:631
 msgid "Configure your account (step 1/1)"
 msgstr ""
 
-#: ../gtk/setupwizard.c:634
+#: ../gtk/setupwizard.c:636
 msgid "Enter your sip username (step 1/1)"
 msgstr ""
 
-#: ../gtk/setupwizard.c:638
+#: ../gtk/setupwizard.c:640
 msgid "Enter account information (step 1/2)"
 msgstr ""
 
-#: ../gtk/setupwizard.c:647
+#: ../gtk/setupwizard.c:649
 msgid "Validation (step 2/2)"
 msgstr ""
 
-#: ../gtk/setupwizard.c:652
+#: ../gtk/setupwizard.c:654
 msgid "Error"
 msgstr ""
 
-#: ../gtk/setupwizard.c:656 ../gtk/audio_assistant.c:527
+#: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:527
 msgid "Terminating"
 msgstr ""
 
@@ -694,11 +691,6 @@ msgstr ""
 msgid "<b>Paused call</b>"
 msgstr ""
 
-#: ../gtk/incall_view.c:771
-#, c-format
-msgid "%02i::%02i::%02i"
-msgstr ""
-
 #: ../gtk/incall_view.c:794
 msgid "<b>Call ended.</b>"
 msgstr ""
@@ -767,7 +759,7 @@ msgstr ""
 
 #: ../gtk/audio_assistant.c:318
 msgid ""
-"Welcome !\n"
+"Welcome!\n"
 "This assistant will help you to configure audio settings for Linphone"
 msgstr ""
 
@@ -976,7 +968,7 @@ msgid "Login information"
 msgstr ""
 
 #: ../gtk/main.ui.h:46
-msgid "<b>Welcome !</b>"
+msgid "<b>Welcome!</b>"
 msgstr ""
 
 #: ../gtk/main.ui.h:47
@@ -984,11 +976,11 @@ msgid "Delete"
 msgstr ""
 
 #: ../gtk/about.ui.h:1
-msgid "About linphone"
+msgid "About Linphone"
 msgstr ""
 
 #: ../gtk/about.ui.h:2
-msgid "(C) Belledonne Communications,2010\n"
+msgid "(C) Belledonne Communications, 2010\n"
 msgstr ""
 
 #: ../gtk/about.ui.h:4
@@ -1151,7 +1143,7 @@ msgstr ""
 msgid "Video codecs"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:10 ../gtk/keypad.ui.h:5
+#: ../gtk/parameters.ui.h:10
 msgid "C"
 msgstr ""
 
@@ -1430,18 +1422,14 @@ msgid "Authentication method:"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:80
-msgid "label"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:81
 msgid "<b>LDAP Account setup</b>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:82
+#: ../gtk/parameters.ui.h:81
 msgid "LDAP"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:83
+#: ../gtk/parameters.ui.h:82
 msgid "Done"
 msgstr ""
 
@@ -1553,66 +1541,6 @@ msgstr ""
 msgid "<b>Configure http proxy (optional)</b>"
 msgstr ""
 
-#: ../gtk/keypad.ui.h:1
-msgid "D"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:2
-msgid "#"
-msgstr "#"
-
-#: ../gtk/keypad.ui.h:3
-msgid "0"
-msgstr "0"
-
-#: ../gtk/keypad.ui.h:4
-msgid "*"
-msgstr "*"
-
-#: ../gtk/keypad.ui.h:6
-msgid "9"
-msgstr "9"
-
-#: ../gtk/keypad.ui.h:7
-msgid "8"
-msgstr "8"
-
-#: ../gtk/keypad.ui.h:8
-msgid "7"
-msgstr "7"
-
-#: ../gtk/keypad.ui.h:9
-msgid "B"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:10
-msgid "6"
-msgstr "6"
-
-#: ../gtk/keypad.ui.h:11
-msgid "5"
-msgstr "5"
-
-#: ../gtk/keypad.ui.h:12
-msgid "4"
-msgstr "4"
-
-#: ../gtk/keypad.ui.h:13
-msgid "A"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:14
-msgid "3"
-msgstr "3"
-
-#: ../gtk/keypad.ui.h:15
-msgid "2"
-msgstr "2"
-
-#: ../gtk/keypad.ui.h:16
-msgid "1"
-msgstr "1"
-
 #: ../gtk/ldap.ui.h:1
 msgid "LDAP Settings"
 msgstr ""
@@ -1708,12 +1636,11 @@ msgstr ""
 
 #: ../gtk/config-uri.ui.h:2
 msgid ""
-"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
-msgstr ""
-
-#: ../gtk/config-uri.ui.h:4
-msgid "https://"
+"This dialog allows to set an http or https address when configuration is to "
+"be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, "
+"Linphone will restart automatically in order to fetch and take into account "
+"the new configuration. "
 msgstr ""
 
 #: ../gtk/provisioning-fetch.ui.h:1
@@ -1724,64 +1651,60 @@ msgstr ""
 msgid "Please wait while fetching configuration from server..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1511
+#: ../coreapi/linphonecore.c:1510
 msgid "Ready"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2470
+#: ../coreapi/linphonecore.c:2473
 msgid "Configuring"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2635
+#: ../coreapi/linphonecore.c:2638
 msgid "Looking for telephone number destination..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2637
+#: ../coreapi/linphonecore.c:2640
 msgid "Could not resolve this number."
 msgstr ""
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2919
+#: ../coreapi/linphonecore.c:2922
 msgid "Contacting"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2924
+#: ../coreapi/linphonecore.c:2927
 msgid "Could not call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3074
+#: ../coreapi/linphonecore.c:3077
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3233
+#: ../coreapi/linphonecore.c:3236
 msgid "is contacting you"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3234
+#: ../coreapi/linphonecore.c:3237
 msgid " and asked autoanswer."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3234
-msgid "."
-msgstr ""
-
-#: ../coreapi/linphonecore.c:3352
+#: ../coreapi/linphonecore.c:3355
 msgid "Modifying call parameters..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3700
+#: ../coreapi/linphonecore.c:3703
 msgid "Connected."
 msgstr "Połączony"
 
-#: ../coreapi/linphonecore.c:3725
+#: ../coreapi/linphonecore.c:3728
 msgid "Call aborted"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3915
+#: ../coreapi/linphonecore.c:3918
 msgid "Could not pause the call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3919
+#: ../coreapi/linphonecore.c:3922
 msgid "Pausing the current call..."
 msgstr ""
 
@@ -1842,7 +1765,7 @@ msgid "Vacation"
 msgstr ""
 
 #: ../coreapi/friend.c:68
-msgid "Unknown-bug"
+msgid "Unknown status"
 msgstr ""
 
 #: ../coreapi/proxy.c:319
@@ -1983,3 +1906,39 @@ msgid_plural "You have missed %i calls."
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
+
+#~ msgid "#"
+#~ msgstr "#"
+
+#~ msgid "0"
+#~ msgstr "0"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "9"
+#~ msgstr "9"
+
+#~ msgid "8"
+#~ msgstr "8"
+
+#~ msgid "7"
+#~ msgstr "7"
+
+#~ msgid "6"
+#~ msgstr "6"
+
+#~ msgid "5"
+#~ msgstr "5"
+
+#~ msgid "4"
+#~ msgstr "4"
+
+#~ msgid "3"
+#~ msgstr "3"
+
+#~ msgid "2"
+#~ msgstr "2"
+
+#~ msgid "1"
+#~ msgstr "1"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 46209da20..0b474b49e 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-19 10:39+0100\n"
+"POT-Creation-Date: 2014-11-28 10:55+0100\n"
 "PO-Revision-Date: 2014-11-19 10:08+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/linphone-gtk/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
+"linphone-gtk/language/pt_BR/)\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974
@@ -62,11 +63,6 @@ msgid_plural "%i seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gtk/calllogs.c:335 ../gtk/calllogs.c:341
-#, c-format
-msgid "<big><b>%s</b></big>\t%s"
-msgstr ""
-
 #: ../gtk/calllogs.c:337
 #, c-format
 msgid ""
@@ -74,11 +70,9 @@ msgid ""
 "%s\t%s\t"
 msgstr ""
 
-#: ../gtk/calllogs.c:343
+#: ../gtk/calllogs.c:341
 #, c-format
-msgid ""
-"<small><i>%s</i></small>\t\n"
-"%s"
+msgid "<big><b>%s</b></big>\t%s"
 msgstr ""
 
 #: ../gtk/conference.c:38 ../gtk/main.ui.h:13
@@ -94,7 +88,7 @@ msgstr ""
 msgid "Couldn't find pixmap file: %s"
 msgstr "Não é possível achar arquivo pixmap: %s"
 
-#: ../gtk/chat.c:364 ../gtk/friendlist.c:924
+#: ../gtk/chat.c:367 ../gtk/friendlist.c:924
 msgid "Invalid sip contact !"
 msgstr ""
 
@@ -124,8 +118,8 @@ msgstr ""
 
 #: ../gtk/main.c:149
 msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: "
-"c:\\Program Files\\Linphone)"
+"Specifiy a working directory (should be the base of the installation, eg: c:"
+"\\Program Files\\Linphone)"
 msgstr ""
 
 #: ../gtk/main.c:156
@@ -140,7 +134,8 @@ msgstr ""
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
-"Would you allow him to see your presence status or add him to your contact list ?\n"
+"Would you allow him to see your presence status or add him to your contact "
+"list ?\n"
 "If you answer no, this person will be temporarily blacklisted."
 msgstr ""
 
@@ -155,7 +150,7 @@ msgstr ""
 msgid "Call error"
 msgstr ""
 
-#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3744
+#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3747
 msgid "Call ended"
 msgstr ""
 
@@ -415,7 +410,7 @@ msgstr[1] ""
 
 #: ../gtk/setupwizard.c:34
 msgid ""
-"Welcome !\n"
+"Welcome!\n"
 "This assistant will help you to use a SIP account for your calls."
 msgstr ""
 
@@ -503,43 +498,44 @@ msgstr ""
 
 #: ../gtk/setupwizard.c:413
 msgid ""
-"Please validate your account by clicking on the link we just sent you by email.\n"
+"Please validate your account by clicking on the link we just sent you by "
+"email.\n"
 "Then come back here and press Next button."
 msgstr ""
 
-#: ../gtk/setupwizard.c:600
+#: ../gtk/setupwizard.c:602
 msgid "SIP account configuration assistant"
 msgstr ""
 
-#: ../gtk/setupwizard.c:618
+#: ../gtk/setupwizard.c:620
 msgid "Welcome to the account setup assistant"
 msgstr ""
 
-#: ../gtk/setupwizard.c:623
+#: ../gtk/setupwizard.c:625
 msgid "Account setup assistant"
 msgstr ""
 
-#: ../gtk/setupwizard.c:629
+#: ../gtk/setupwizard.c:631
 msgid "Configure your account (step 1/1)"
 msgstr ""
 
-#: ../gtk/setupwizard.c:634
+#: ../gtk/setupwizard.c:636
 msgid "Enter your sip username (step 1/1)"
 msgstr ""
 
-#: ../gtk/setupwizard.c:638
+#: ../gtk/setupwizard.c:640
 msgid "Enter account information (step 1/2)"
 msgstr ""
 
-#: ../gtk/setupwizard.c:647
+#: ../gtk/setupwizard.c:649
 msgid "Validation (step 2/2)"
 msgstr ""
 
-#: ../gtk/setupwizard.c:652
+#: ../gtk/setupwizard.c:654
 msgid "Error"
 msgstr ""
 
-#: ../gtk/setupwizard.c:656 ../gtk/audio_assistant.c:527
+#: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:527
 msgid "Terminating"
 msgstr ""
 
@@ -691,11 +687,6 @@ msgstr ""
 msgid "<b>Paused call</b>"
 msgstr ""
 
-#: ../gtk/incall_view.c:771
-#, c-format
-msgid "%02i::%02i::%02i"
-msgstr ""
-
 #: ../gtk/incall_view.c:794
 msgid "<b>Call ended.</b>"
 msgstr ""
@@ -764,7 +755,7 @@ msgstr ""
 
 #: ../gtk/audio_assistant.c:318
 msgid ""
-"Welcome !\n"
+"Welcome!\n"
 "This assistant will help you to configure audio settings for Linphone"
 msgstr ""
 
@@ -973,7 +964,7 @@ msgid "Login information"
 msgstr ""
 
 #: ../gtk/main.ui.h:46
-msgid "<b>Welcome !</b>"
+msgid "<b>Welcome!</b>"
 msgstr ""
 
 #: ../gtk/main.ui.h:47
@@ -981,11 +972,11 @@ msgid "Delete"
 msgstr ""
 
 #: ../gtk/about.ui.h:1
-msgid "About linphone"
+msgid "About Linphone"
 msgstr ""
 
 #: ../gtk/about.ui.h:2
-msgid "(C) Belledonne Communications,2010\n"
+msgid "(C) Belledonne Communications, 2010\n"
 msgstr ""
 
 #: ../gtk/about.ui.h:4
@@ -1148,7 +1139,7 @@ msgstr ""
 msgid "Video codecs"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:10 ../gtk/keypad.ui.h:5
+#: ../gtk/parameters.ui.h:10
 msgid "C"
 msgstr ""
 
@@ -1427,18 +1418,14 @@ msgid "Authentication method:"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:80
-msgid "label"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:81
 msgid "<b>LDAP Account setup</b>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:82
+#: ../gtk/parameters.ui.h:81
 msgid "LDAP"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:83
+#: ../gtk/parameters.ui.h:82
 msgid "Done"
 msgstr ""
 
@@ -1550,66 +1537,6 @@ msgstr ""
 msgid "<b>Configure http proxy (optional)</b>"
 msgstr ""
 
-#: ../gtk/keypad.ui.h:1
-msgid "D"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:2
-msgid "#"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:3
-msgid "0"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:4
-msgid "*"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:6
-msgid "9"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:7
-msgid "8"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:8
-msgid "7"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:9
-msgid "B"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:10
-msgid "6"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:11
-msgid "5"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:12
-msgid "4"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:13
-msgid "A"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:14
-msgid "3"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:15
-msgid "2"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:16
-msgid "1"
-msgstr ""
-
 #: ../gtk/ldap.ui.h:1
 msgid "LDAP Settings"
 msgstr ""
@@ -1705,12 +1632,11 @@ msgstr ""
 
 #: ../gtk/config-uri.ui.h:2
 msgid ""
-"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
-msgstr ""
-
-#: ../gtk/config-uri.ui.h:4
-msgid "https://"
+"This dialog allows to set an http or https address when configuration is to "
+"be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, "
+"Linphone will restart automatically in order to fetch and take into account "
+"the new configuration. "
 msgstr ""
 
 #: ../gtk/provisioning-fetch.ui.h:1
@@ -1721,64 +1647,60 @@ msgstr ""
 msgid "Please wait while fetching configuration from server..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1511
+#: ../coreapi/linphonecore.c:1510
 msgid "Ready"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2470
+#: ../coreapi/linphonecore.c:2473
 msgid "Configuring"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2635
+#: ../coreapi/linphonecore.c:2638
 msgid "Looking for telephone number destination..."
 msgstr "Procurando por telefone de destino..."
 
-#: ../coreapi/linphonecore.c:2637
+#: ../coreapi/linphonecore.c:2640
 msgid "Could not resolve this number."
 msgstr "Não foi possível encontrar este número."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2919
+#: ../coreapi/linphonecore.c:2922
 msgid "Contacting"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2924
+#: ../coreapi/linphonecore.c:2927
 msgid "Could not call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3074
+#: ../coreapi/linphonecore.c:3077
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3233
+#: ../coreapi/linphonecore.c:3236
 msgid "is contacting you"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3234
+#: ../coreapi/linphonecore.c:3237
 msgid " and asked autoanswer."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3234
-msgid "."
-msgstr ""
-
-#: ../coreapi/linphonecore.c:3352
+#: ../coreapi/linphonecore.c:3355
 msgid "Modifying call parameters..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3700
+#: ../coreapi/linphonecore.c:3703
 msgid "Connected."
 msgstr "Conectado."
 
-#: ../coreapi/linphonecore.c:3725
+#: ../coreapi/linphonecore.c:3728
 msgid "Call aborted"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3915
+#: ../coreapi/linphonecore.c:3918
 msgid "Could not pause the call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3919
+#: ../coreapi/linphonecore.c:3922
 msgid "Pausing the current call..."
 msgstr ""
 
@@ -1839,7 +1761,7 @@ msgid "Vacation"
 msgstr ""
 
 #: ../coreapi/friend.c:68
-msgid "Unknown-bug"
+msgid "Unknown status"
 msgstr ""
 
 #: ../coreapi/proxy.c:319
diff --git a/po/ru.po b/po/ru.po
index ed3767e23..410947d4f 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # a <loginov.alex.valer@gmail.com>, 2014
 # a <loginov.alex.valer@gmail.com>, 2014
@@ -11,15 +11,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-19 10:39+0100\n"
+"POT-Creation-Date: 2014-11-28 10:55+0100\n"
 "PO-Revision-Date: 2014-11-19 10:13+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/linphone-gtk/language/ru/)\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/linphone-gtk/"
+"language/ru/)\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974
 #, c-format
@@ -68,24 +70,19 @@ msgstr[0] "%i секунда"
 msgstr[1] "%i секунды"
 msgstr[2] "%i секунд"
 
-#: ../gtk/calllogs.c:335 ../gtk/calllogs.c:341
-#, c-format
-msgid "<big><b>%s</b></big>\t%s"
-msgstr "<big><b>%s</b></big>\t%s"
-
 #: ../gtk/calllogs.c:337
 #, c-format
 msgid ""
 "<small><i>%s</i>\t<i>Quality: %s</i></small>\n"
 "%s\t%s\t"
-msgstr "<small><i>%s</i>\t<i>Качество: %s</i></small>\n%s\t%s\t"
+msgstr ""
+"<small><i>%s</i>\t<i>Качество: %s</i></small>\n"
+"%s\t%s\t"
 
-#: ../gtk/calllogs.c:343
+#: ../gtk/calllogs.c:341
 #, c-format
-msgid ""
-"<small><i>%s</i></small>\t\n"
-"%s"
-msgstr "<small><i>%s</i></small>\t\n%s"
+msgid "<big><b>%s</b></big>\t%s"
+msgstr "<big><b>%s</b></big>\t%s"
 
 #: ../gtk/conference.c:38 ../gtk/main.ui.h:13
 msgid "Conference"
@@ -100,13 +97,15 @@ msgstr "Мне"
 msgid "Couldn't find pixmap file: %s"
 msgstr "Невозможно найти графический файл: %s"
 
-#: ../gtk/chat.c:364 ../gtk/friendlist.c:924
+#: ../gtk/chat.c:367 ../gtk/friendlist.c:924
 msgid "Invalid sip contact !"
 msgstr "Неверный sip контакт!"
 
 #: ../gtk/main.c:107
 msgid "log to stdout some debug information while running."
-msgstr "Вывод некоторой отладочной информации на устройство стандартного вывода во время работы."
+msgstr ""
+"Вывод некоторой отладочной информации на устройство стандартного вывода во "
+"время работы."
 
 #: ../gtk/main.c:114
 msgid "path to a file to write logs into."
@@ -130,9 +129,11 @@ msgstr "Если установлено, то автоматический пр
 
 #: ../gtk/main.c:149
 msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: "
-"c:\\Program Files\\Linphone)"
-msgstr "Определить рабочий каталог (относительно каталога установки, например: c:\\Program Files\\Linphone)"
+"Specifiy a working directory (should be the base of the installation, eg: c:"
+"\\Program Files\\Linphone)"
+msgstr ""
+"Определить рабочий каталог (относительно каталога установки, например: c:"
+"\\Program Files\\Linphone)"
 
 #: ../gtk/main.c:156
 msgid "Configuration file"
@@ -146,22 +147,29 @@ msgstr "Запустить помощника аудио"
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
-"Would you allow him to see your presence status or add him to your contact list ?\n"
+"Would you allow him to see your presence status or add him to your contact "
+"list ?\n"
 "If you answer no, this person will be temporarily blacklisted."
-msgstr "%s вы бы хотели быть добавленным в этот контактный лист.\nВы разрешаете ему(ей) видеть ваш статус присутствия или добавить в контактный лист?\nЕсли вы ответите Нет, эта персона будет временно в чёрном списке."
+msgstr ""
+"%s вы бы хотели быть добавленным в этот контактный лист.\n"
+"Вы разрешаете ему(ей) видеть ваш статус присутствия или добавить в "
+"контактный лист?\n"
+"Если вы ответите Нет, эта персона будет временно в чёрном списке."
 
 #: ../gtk/main.c:1162
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
-msgstr "Пожалуйста, введите пароль для пользователя <i>%s</i>\n для реалм (рилм) <i>%s</i>:"
+msgstr ""
+"Пожалуйста, введите пароль для пользователя <i>%s</i>\n"
+" для реалм (рилм) <i>%s</i>:"
 
 #: ../gtk/main.c:1283
 msgid "Call error"
 msgstr "Ошибка звонка"
 
-#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3744
+#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3747
 msgid "Call ended"
 msgstr "Звонок окончен"
 
@@ -213,7 +221,9 @@ msgstr "Мы передали в %s"
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
-msgstr "Звуковые карты не были обнаружены на этом компьютере.\nВы не сможете отправлять или получать аудио звонки."
+msgstr ""
+"Звуковые карты не были обнаружены на этом компьютере.\n"
+"Вы не сможете отправлять или получать аудио звонки."
 
 #: ../gtk/main.c:2157
 msgid "A free SIP video-phone"
@@ -367,7 +377,9 @@ msgstr "Сербский"
 #: ../gtk/propertybox.c:1156
 msgid ""
 "You need to restart linphone for the new language selection to take effect."
-msgstr "Вы должны перезагрузить linphone для того, чтобы языковые настройки вступили в силу."
+msgstr ""
+"Вы должны перезагрузить linphone для того, чтобы языковые настройки вступили "
+"в силу."
 
 #: ../gtk/propertybox.c:1234
 msgid "None"
@@ -386,7 +398,9 @@ msgstr "ZRTP"
 msgid ""
 "A more recent version is availalble from %s.\n"
 "Would you like to open a browser to download it ?"
-msgstr "Доступна новая версия с %s.\nОткрыть браузер для загрузки?"
+msgstr ""
+"Доступна новая версия с %s.\n"
+"Открыть браузер для загрузки?"
 
 #: ../gtk/update.c:91
 msgid "You are running the lastest version."
@@ -421,10 +435,13 @@ msgstr[1] "Найдено %i контакта"
 msgstr[2] "Найдено %i контактов"
 
 #: ../gtk/setupwizard.c:34
+#, fuzzy
 msgid ""
-"Welcome !\n"
+"Welcome!\n"
 "This assistant will help you to use a SIP account for your calls."
-msgstr "Добро пожаловать!\nЭтот помощник поможет вам использовать учётную запись SIP для ваших звонков."
+msgstr ""
+"Добро пожаловать!\n"
+"Этот помощник поможет вам использовать учётную запись SIP для ваших звонков."
 
 #: ../gtk/setupwizard.c:43
 msgid "Create an account on linphone.org"
@@ -432,7 +449,8 @@ msgstr "Создать учётную запись на linphone.org"
 
 #: ../gtk/setupwizard.c:44
 msgid "I have already a linphone.org account and I just want to use it"
-msgstr "Я уже имею учётную запись на linphone.org и только хочу использовать её"
+msgstr ""
+"Я уже имею учётную запись на linphone.org и только хочу использовать её"
 
 #: ../gtk/setupwizard.c:45
 msgid "I have already a sip account and I just want to use it"
@@ -502,7 +520,10 @@ msgstr "Информировать об обновлениях linphone"
 msgid ""
 "Error, account not validated, username already used or server unreachable.\n"
 "Please go back and try again."
-msgstr "Ошибка, учётная запись не подтверждена, имя пользователя уже используется или\nсервер недоступен. Пожалуйста, зайдите снова и попробуйте ещё раз."
+msgstr ""
+"Ошибка, учётная запись не подтверждена, имя пользователя уже используется "
+"или\n"
+"сервер недоступен. Пожалуйста, зайдите снова и попробуйте ещё раз."
 
 #: ../gtk/setupwizard.c:405
 msgid "Thank you. Your account is now configured and ready for use."
@@ -510,43 +531,48 @@ msgstr "Спасибо! Учётная запись успешно настро
 
 #: ../gtk/setupwizard.c:413
 msgid ""
-"Please validate your account by clicking on the link we just sent you by email.\n"
+"Please validate your account by clicking on the link we just sent you by "
+"email.\n"
 "Then come back here and press Next button."
-msgstr "Пожалуйста, подтвердите вашу учётную запись, щёлкнув на ссылку, которую вы только\nчто получили по электронной почте. Затем вернитесь сюда и нажмите кнопку Далее."
+msgstr ""
+"Пожалуйста, подтвердите вашу учётную запись, щёлкнув на ссылку, которую вы "
+"только\n"
+"что получили по электронной почте. Затем вернитесь сюда и нажмите кнопку "
+"Далее."
 
-#: ../gtk/setupwizard.c:600
+#: ../gtk/setupwizard.c:602
 msgid "SIP account configuration assistant"
 msgstr "Помощник настройки учётной записи SIP"
 
-#: ../gtk/setupwizard.c:618
+#: ../gtk/setupwizard.c:620
 msgid "Welcome to the account setup assistant"
 msgstr "Добро пожаловать в помощник настройки учётной записи"
 
-#: ../gtk/setupwizard.c:623
+#: ../gtk/setupwizard.c:625
 msgid "Account setup assistant"
 msgstr "Помощник настройки учётной записи"
 
-#: ../gtk/setupwizard.c:629
+#: ../gtk/setupwizard.c:631
 msgid "Configure your account (step 1/1)"
 msgstr "Настроить вашу учётную запись (шаг 1/1)"
 
-#: ../gtk/setupwizard.c:634
+#: ../gtk/setupwizard.c:636
 msgid "Enter your sip username (step 1/1)"
 msgstr "Введите ваше sip имя пользователя (шаг 1/1)"
 
-#: ../gtk/setupwizard.c:638
+#: ../gtk/setupwizard.c:640
 msgid "Enter account information (step 1/2)"
 msgstr "Введите информацию об учётной записи (шаг 1/2)"
 
-#: ../gtk/setupwizard.c:647
+#: ../gtk/setupwizard.c:649
 msgid "Validation (step 2/2)"
 msgstr "Подтверждение (шаг 2/2)"
 
-#: ../gtk/setupwizard.c:652
+#: ../gtk/setupwizard.c:654
 msgid "Error"
 msgstr "Ошибка"
 
-#: ../gtk/setupwizard.c:656 ../gtk/audio_assistant.c:527
+#: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:527
 msgid "Terminating"
 msgstr "Прерывание"
 
@@ -617,7 +643,9 @@ msgstr "Напрямую или через сервер"
 msgid ""
 "download: %f\n"
 "upload: %f (kbit/s)"
-msgstr "загрузка: %f\nотдача: %f (КБит/сек)"
+msgstr ""
+"загрузка: %f\n"
+"отдача: %f (КБит/сек)"
 
 #: ../gtk/incall_view.c:272 ../gtk/incall_view.c:274
 #, c-format
@@ -698,11 +726,6 @@ msgstr "<b>Звоним</b>"
 msgid "<b>Paused call</b>"
 msgstr "<b>Звонок приостановлен</b>"
 
-#: ../gtk/incall_view.c:771
-#, c-format
-msgid "%02i::%02i::%02i"
-msgstr "%02i::%02i::%02i"
-
 #: ../gtk/incall_view.c:794
 msgid "<b>Call ended.</b>"
 msgstr "<b>Звонок закончен.</b>"
@@ -732,7 +755,9 @@ msgstr "Пауза"
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
-msgstr "<small><i>Записывается в\n%s %s</i></small>"
+msgstr ""
+"<small><i>Записывается в\n"
+"%s %s</i></small>"
 
 #: ../gtk/incall_view.c:948
 msgid "(Paused)"
@@ -770,10 +795,13 @@ msgid "Too loud"
 msgstr "Слишком громко"
 
 #: ../gtk/audio_assistant.c:318
+#, fuzzy
 msgid ""
-"Welcome !\n"
+"Welcome!\n"
 "This assistant will help you to configure audio settings for Linphone"
-msgstr "Добро пожаловать!\nЭтот помощник поможет вам сконфигурировать настройки аудио для linphone"
+msgstr ""
+"Добро пожаловать!\n"
+"Этот помощник поможет вам сконфигурировать настройки аудио для linphone"
 
 #: ../gtk/audio_assistant.c:328
 msgid "Capture device"
@@ -980,7 +1008,8 @@ msgid "Login information"
 msgstr "Информация для входа"
 
 #: ../gtk/main.ui.h:46
-msgid "<b>Welcome !</b>"
+#, fuzzy
+msgid "<b>Welcome!</b>"
 msgstr "<b>Добро пожаловать!</b>"
 
 #: ../gtk/main.ui.h:47
@@ -988,11 +1017,13 @@ msgid "Delete"
 msgstr "Удалить"
 
 #: ../gtk/about.ui.h:1
-msgid "About linphone"
+#, fuzzy
+msgid "About Linphone"
 msgstr "Про linphone"
 
 #: ../gtk/about.ui.h:2
-msgid "(C) Belledonne Communications,2010\n"
+#, fuzzy
+msgid "(C) Belledonne Communications, 2010\n"
 msgstr "(C) Belledonne Communications,2010\n"
 
 #: ../gtk/about.ui.h:4
@@ -1013,7 +1044,19 @@ msgid ""
 "cs: Petr Pisar <petr.pisar@atlas.cz>\n"
 "hu: anonymous\n"
 "he: Eli Zaretskii <eliz@gnu.org>\n"
-msgstr "fr: Simon Morlat\nen: Simon Morlat and Delphine Perreau\nit: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\nde: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\nsv: Daniel Nylander <po@danielnylander.se>\nes: Jesus Benitez <gnelson at inMail dot sk>\nja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\npt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\npl: Robert Nasiadek <darkone@darkone.pl>\ncs: Petr Pisar <petr.pisar@atlas.cz>\nhu: anonymous\nhe: Eli Zaretskii <eliz@gnu.org>\n"
+msgstr ""
+"fr: Simon Morlat\n"
+"en: Simon Morlat and Delphine Perreau\n"
+"it: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\n"
+"de: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\n"
+"sv: Daniel Nylander <po@danielnylander.se>\n"
+"es: Jesus Benitez <gnelson at inMail dot sk>\n"
+"ja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\n"
+"pt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\n"
+"pl: Robert Nasiadek <darkone@darkone.pl>\n"
+"cs: Petr Pisar <petr.pisar@atlas.cz>\n"
+"hu: anonymous\n"
+"he: Eli Zaretskii <eliz@gnu.org>\n"
 
 #: ../gtk/contact.ui.h:2
 msgid "SIP Address"
@@ -1155,7 +1198,7 @@ msgstr "Аудио кодеки"
 msgid "Video codecs"
 msgstr "Видео кодеки"
 
-#: ../gtk/parameters.ui.h:10 ../gtk/keypad.ui.h:5
+#: ../gtk/parameters.ui.h:10
 msgid "C"
 msgstr "C"
 
@@ -1317,7 +1360,9 @@ msgstr "Настройки мультимедиа"
 
 #: ../gtk/parameters.ui.h:50
 msgid "This section defines your SIP address when not using a SIP account"
-msgstr "Эта секция определяет ваш SIP адрес, когда вы не используете учётную запись SIP"
+msgstr ""
+"Эта секция определяет ваш SIP адрес, когда вы не используете учётную запись "
+"SIP"
 
 #: ../gtk/parameters.ui.h:51
 msgid "Your display name (eg: John Doe):"
@@ -1399,7 +1444,9 @@ msgstr "Разрешить адаптивное управление скоро
 msgid ""
 "<i>Adaptive rate control is a technique to dynamically guess the available "
 "bandwidth during a call.</i>"
-msgstr "<i>Адаптивное управление скоростью - это технология динамического угадывания доступной пропускной способности во время звонка.</i>"
+msgstr ""
+"<i>Адаптивное управление скоростью - это технология динамического угадывания "
+"доступной пропускной способности во время звонка.</i>"
 
 #: ../gtk/parameters.ui.h:71
 msgid "<b>Bandwidth control</b>"
@@ -1434,18 +1481,14 @@ msgid "Authentication method:"
 msgstr "Метод аутентификации:"
 
 #: ../gtk/parameters.ui.h:80
-msgid "label"
-msgstr "метка"
-
-#: ../gtk/parameters.ui.h:81
 msgid "<b>LDAP Account setup</b>"
 msgstr "<b>Установка учётной записи LDAP</b>"
 
-#: ../gtk/parameters.ui.h:82
+#: ../gtk/parameters.ui.h:81
 msgid "LDAP"
 msgstr "LDAP"
 
-#: ../gtk/parameters.ui.h:83
+#: ../gtk/parameters.ui.h:82
 msgid "Done"
 msgstr "Готово"
 
@@ -1557,66 +1600,6 @@ msgstr "<b>Конфигурировать тунель</b>"
 msgid "<b>Configure http proxy (optional)</b>"
 msgstr "<b>Конфигурировать http прокси (опционально)</b>"
 
-#: ../gtk/keypad.ui.h:1
-msgid "D"
-msgstr "D"
-
-#: ../gtk/keypad.ui.h:2
-msgid "#"
-msgstr "#"
-
-#: ../gtk/keypad.ui.h:3
-msgid "0"
-msgstr "0"
-
-#: ../gtk/keypad.ui.h:4
-msgid "*"
-msgstr "*"
-
-#: ../gtk/keypad.ui.h:6
-msgid "9"
-msgstr "9"
-
-#: ../gtk/keypad.ui.h:7
-msgid "8"
-msgstr "8"
-
-#: ../gtk/keypad.ui.h:8
-msgid "7"
-msgstr "7"
-
-#: ../gtk/keypad.ui.h:9
-msgid "B"
-msgstr "B"
-
-#: ../gtk/keypad.ui.h:10
-msgid "6"
-msgstr "6"
-
-#: ../gtk/keypad.ui.h:11
-msgid "5"
-msgstr "5"
-
-#: ../gtk/keypad.ui.h:12
-msgid "4"
-msgstr "4"
-
-#: ../gtk/keypad.ui.h:13
-msgid "A"
-msgstr "A"
-
-#: ../gtk/keypad.ui.h:14
-msgid "3"
-msgstr "3"
-
-#: ../gtk/keypad.ui.h:15
-msgid "2"
-msgstr "2"
-
-#: ../gtk/keypad.ui.h:16
-msgid "1"
-msgstr "1"
-
 #: ../gtk/ldap.ui.h:1
 msgid "LDAP Settings"
 msgstr "Настройки LDAP"
@@ -1712,13 +1695,17 @@ msgstr "Указание удалённой конфигурации URI"
 
 #: ../gtk/config-uri.ui.h:2
 msgid ""
-"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
-msgstr "Этот диалог позволяет установить HTTP или HTTPS адрес, когда конфигурация будет получена при запуске.\nПожалуйста, введите или измените настройки URI ниже. После нажатия OK linphone автоматически перезагрузится чтобы получить и учесть новую конфигурацию в учётной записи."
-
-#: ../gtk/config-uri.ui.h:4
-msgid "https://"
-msgstr "https://"
+"This dialog allows to set an http or https address when configuration is to "
+"be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, "
+"Linphone will restart automatically in order to fetch and take into account "
+"the new configuration. "
+msgstr ""
+"Этот диалог позволяет установить HTTP или HTTPS адрес, когда конфигурация "
+"будет получена при запуске.\n"
+"Пожалуйста, введите или измените настройки URI ниже. После нажатия OK "
+"linphone автоматически перезагрузится чтобы получить и учесть новую "
+"конфигурацию в учётной записи."
 
 #: ../gtk/provisioning-fetch.ui.h:1
 msgid "Configuring..."
@@ -1728,64 +1715,61 @@ msgstr "Конфигурирование..."
 msgid "Please wait while fetching configuration from server..."
 msgstr "Пожалуйста, подождите пока получается конфигурация с сервера..."
 
-#: ../coreapi/linphonecore.c:1511
+#: ../coreapi/linphonecore.c:1510
 msgid "Ready"
 msgstr "Готов"
 
-#: ../coreapi/linphonecore.c:2470
+#: ../coreapi/linphonecore.c:2473
 msgid "Configuring"
 msgstr "Конфигурирование"
 
-#: ../coreapi/linphonecore.c:2635
+#: ../coreapi/linphonecore.c:2638
 msgid "Looking for telephone number destination..."
 msgstr "Поиск назначения для телефонного номера.."
 
-#: ../coreapi/linphonecore.c:2637
+#: ../coreapi/linphonecore.c:2640
 msgid "Could not resolve this number."
 msgstr "Не получилось принять решение по этому номеру."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2919
+#: ../coreapi/linphonecore.c:2922
 msgid "Contacting"
 msgstr "Соединение"
 
-#: ../coreapi/linphonecore.c:2924
+#: ../coreapi/linphonecore.c:2927
 msgid "Could not call"
 msgstr "Невозможно позвонить"
 
-#: ../coreapi/linphonecore.c:3074
+#: ../coreapi/linphonecore.c:3077
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
-msgstr "К сожалению, мы достигли максимального количества одновременных звонков"
+msgstr ""
+"К сожалению, мы достигли максимального количества одновременных звонков"
 
-#: ../coreapi/linphonecore.c:3233
+#: ../coreapi/linphonecore.c:3236
 msgid "is contacting you"
 msgstr "контактирует с вами"
 
-#: ../coreapi/linphonecore.c:3234
+#: ../coreapi/linphonecore.c:3237
 msgid " and asked autoanswer."
 msgstr "и спросил автоматический ответ."
 
-#: ../coreapi/linphonecore.c:3234
-msgid "."
-msgstr "."
-
-#: ../coreapi/linphonecore.c:3352
+#: ../coreapi/linphonecore.c:3355
 msgid "Modifying call parameters..."
 msgstr "Изменение параметров звонка..."
 
-#: ../coreapi/linphonecore.c:3700
+#: ../coreapi/linphonecore.c:3703
 msgid "Connected."
 msgstr "Соединён."
 
-#: ../coreapi/linphonecore.c:3725
+#: ../coreapi/linphonecore.c:3728
 msgid "Call aborted"
 msgstr "Звонок отменён"
 
-#: ../coreapi/linphonecore.c:3915
+#: ../coreapi/linphonecore.c:3918
 msgid "Could not pause the call"
 msgstr "Невозможно приостановить звонок"
 
-#: ../coreapi/linphonecore.c:3919
+#: ../coreapi/linphonecore.c:3922
 msgid "Pausing the current call..."
 msgstr "Приостановка текущего звонка..."
 
@@ -1846,20 +1830,26 @@ msgid "Vacation"
 msgstr "Отдых"
 
 #: ../coreapi/friend.c:68
-msgid "Unknown-bug"
+#, fuzzy
+msgid "Unknown status"
 msgstr "Неизвестная ошибка"
 
 #: ../coreapi/proxy.c:319
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
-msgstr "Введённый SIP-адрес прокси является недействительным, он должен начинаться с \"sip:имя_хоста\""
+msgstr ""
+"Введённый SIP-адрес прокси является недействительным, он должен начинаться с "
+"\"sip:имя_хоста\""
 
 #: ../coreapi/proxy.c:325
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
-msgstr "Неверные параметры для sip идентификации\nДолжно выглядеть как sip:имя_пользователя@домен_прокси, как например, sip:alice@example.net"
+msgstr ""
+"Неверные параметры для sip идентификации\n"
+"Должно выглядеть как sip:имя_пользователя@домен_прокси, как например, sip:"
+"alice@example.net"
 
 #: ../coreapi/proxy.c:1377
 #, c-format
@@ -1987,3 +1977,67 @@ msgid_plural "You have missed %i calls."
 msgstr[0] "У вас %i пропущенный вызов."
 msgstr[1] "У вас %i пропущенных вызова."
 msgstr[2] "У вас %i пропущенных вызов."
+
+#~ msgid "https://"
+#~ msgstr "https://"
+
+#~ msgid "label"
+#~ msgstr "метка"
+
+#~ msgid "D"
+#~ msgstr "D"
+
+#~ msgid "#"
+#~ msgstr "#"
+
+#~ msgid "0"
+#~ msgstr "0"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "9"
+#~ msgstr "9"
+
+#~ msgid "8"
+#~ msgstr "8"
+
+#~ msgid "7"
+#~ msgstr "7"
+
+#~ msgid "B"
+#~ msgstr "B"
+
+#~ msgid "6"
+#~ msgstr "6"
+
+#~ msgid "5"
+#~ msgstr "5"
+
+#~ msgid "4"
+#~ msgstr "4"
+
+#~ msgid "A"
+#~ msgstr "A"
+
+#~ msgid "3"
+#~ msgstr "3"
+
+#~ msgid "2"
+#~ msgstr "2"
+
+#~ msgid "1"
+#~ msgstr "1"
+
+#~ msgid ""
+#~ "<small><i>%s</i></small>\t\n"
+#~ "%s"
+#~ msgstr ""
+#~ "<small><i>%s</i></small>\t\n"
+#~ "%s"
+
+#~ msgid "%02i::%02i::%02i"
+#~ msgstr "%02i::%02i::%02i"
+
+#~ msgid "."
+#~ msgstr "."
diff --git a/po/sr.po b/po/sr.po
index 0b98e236f..653de971f 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,22 +1,24 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Мирослав Николић <miroslavnikolic@rocketmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-19 10:39+0100\n"
+"POT-Creation-Date: 2014-11-28 10:55+0100\n"
 "PO-Revision-Date: 2014-11-26 20:58+0000\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
-"Language-Team: Serbian (http://www.transifex.com/projects/p/linphone-gtk/language/sr/)\n"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/linphone-gtk/"
+"language/sr/)\n"
+"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sr\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974
 #, c-format
@@ -65,24 +67,19 @@ msgstr[0] "%i секунда"
 msgstr[1] "%i секунде"
 msgstr[2] "%i секунди"
 
-#: ../gtk/calllogs.c:335 ../gtk/calllogs.c:341
-#, c-format
-msgid "<big><b>%s</b></big>\t%s"
-msgstr "<big><b>%s</b></big>\t%s"
-
 #: ../gtk/calllogs.c:337
 #, c-format
 msgid ""
 "<small><i>%s</i>\t<i>Quality: %s</i></small>\n"
 "%s\t%s\t"
-msgstr "<small><i>%s</i>\t<i>Квалитет: %s</i></small>\n%s\t%s\t"
+msgstr ""
+"<small><i>%s</i>\t<i>Квалитет: %s</i></small>\n"
+"%s\t%s\t"
 
-#: ../gtk/calllogs.c:343
+#: ../gtk/calllogs.c:341
 #, c-format
-msgid ""
-"<small><i>%s</i></small>\t\n"
-"%s"
-msgstr "<small><i>%s</i></small>\t\n%s"
+msgid "<big><b>%s</b></big>\t%s"
+msgstr "<big><b>%s</b></big>\t%s"
 
 #: ../gtk/conference.c:38 ../gtk/main.ui.h:13
 msgid "Conference"
@@ -97,7 +94,7 @@ msgstr "Ја"
 msgid "Couldn't find pixmap file: %s"
 msgstr "Не могу да пронађем датотеку сличице: %s"
 
-#: ../gtk/chat.c:364 ../gtk/friendlist.c:924
+#: ../gtk/chat.c:367 ../gtk/friendlist.c:924
 msgid "Invalid sip contact !"
 msgstr "Неисправан сип контакт !"
 
@@ -127,9 +124,11 @@ msgstr "ако је подешено сам ће се јављати на дол
 
 #: ../gtk/main.c:149
 msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: "
-"c:\\Program Files\\Linphone)"
-msgstr "Наводи радни директоријум (треба да буде основа инсталације, нпр: „c:\\Program Files\\Linphone“)"
+"Specifiy a working directory (should be the base of the installation, eg: c:"
+"\\Program Files\\Linphone)"
+msgstr ""
+"Наводи радни директоријум (треба да буде основа инсталације, нпр: „c:"
+"\\Program Files\\Linphone“)"
 
 #: ../gtk/main.c:156
 msgid "Configuration file"
@@ -143,22 +142,30 @@ msgstr "Покреће помоћника звука"
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
-"Would you allow him to see your presence status or add him to your contact list ?\n"
+"Would you allow him to see your presence status or add him to your contact "
+"list ?\n"
 "If you answer no, this person will be temporarily blacklisted."
-msgstr "%s жели да вас дода на списак пријатеља.\nДа ли желите да му допустите да види ваше стање присуства или да га додате на ваш списак пријатеља ?\nАко одговорите са не, ова особа ће привремено бити стављена на списак забрана."
+msgstr ""
+"%s жели да вас дода на списак пријатеља.\n"
+"Да ли желите да му допустите да види ваше стање присуства или да га додате "
+"на ваш списак пријатеља ?\n"
+"Ако одговорите са не, ова особа ће привремено бити стављена на списак "
+"забрана."
 
 #: ../gtk/main.c:1162
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
-msgstr "Унесите вашу лозинку за корисничко име <i>%s</i>\n на подручју <i>%s</i>:"
+msgstr ""
+"Унесите вашу лозинку за корисничко име <i>%s</i>\n"
+" на подручју <i>%s</i>:"
 
 #: ../gtk/main.c:1283
 msgid "Call error"
 msgstr "Грешка позива"
 
-#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3744
+#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3747
 msgid "Call ended"
 msgstr "Позив је завршен"
 
@@ -210,7 +217,9 @@ msgstr "Преселили смо се на %s"
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
-msgstr "Ниједна звучна картица није откривена на овом рачунару.\nНећете бити у могућности да шаљете или да примате звучне позиве."
+msgstr ""
+"Ниједна звучна картица није откривена на овом рачунару.\n"
+"Нећете бити у могућности да шаљете или да примате звучне позиве."
 
 #: ../gtk/main.c:2157
 msgid "A free SIP video-phone"
@@ -364,7 +373,8 @@ msgstr "Српски"
 #: ../gtk/propertybox.c:1156
 msgid ""
 "You need to restart linphone for the new language selection to take effect."
-msgstr "Треба поново да покренете линфон да би нови изабрани језик ступио у дејство."
+msgstr ""
+"Треба поново да покренете линфон да би нови изабрани језик ступио у дејство."
 
 #: ../gtk/propertybox.c:1234
 msgid "None"
@@ -383,7 +393,9 @@ msgstr "ЗРТП"
 msgid ""
 "A more recent version is availalble from %s.\n"
 "Would you like to open a browser to download it ?"
-msgstr "Новије издање је доступно са „%s“.\nДа ли желите да отворите прегледник и да га преузмете ?"
+msgstr ""
+"Новије издање је доступно са „%s“.\n"
+"Да ли желите да отворите прегледник и да га преузмете ?"
 
 #: ../gtk/update.c:91
 msgid "You are running the lastest version."
@@ -418,10 +430,13 @@ msgstr[1] "Нашао сам %i контакта"
 msgstr[2] "Нашао сам %i контаката"
 
 #: ../gtk/setupwizard.c:34
+#, fuzzy
 msgid ""
-"Welcome !\n"
+"Welcome!\n"
 "This assistant will help you to use a SIP account for your calls."
-msgstr "Добро дошли !\nОвај помоћник ће вам помоћи да користите СИП налог за ваше позиве."
+msgstr ""
+"Добро дошли !\n"
+"Овај помоћник ће вам помоћи да користите СИП налог за ваше позиве."
 
 #: ../gtk/setupwizard.c:43
 msgid "Create an account on linphone.org"
@@ -499,7 +514,10 @@ msgstr "Обавештавај ме о ажурирањима линфона"
 msgid ""
 "Error, account not validated, username already used or server unreachable.\n"
 "Please go back and try again."
-msgstr "Грешка, налог није потврђен, корисничко име је већ у употреби или је сервер недоступан.\nВратите се назад и покушајте опет."
+msgstr ""
+"Грешка, налог није потврђен, корисничко име је већ у употреби или је сервер "
+"недоступан.\n"
+"Вратите се назад и покушајте опет."
 
 #: ../gtk/setupwizard.c:405
 msgid "Thank you. Your account is now configured and ready for use."
@@ -507,43 +525,47 @@ msgstr "Хвала вам. Ваш налог је сада подешен и с
 
 #: ../gtk/setupwizard.c:413
 msgid ""
-"Please validate your account by clicking on the link we just sent you by email.\n"
+"Please validate your account by clicking on the link we just sent you by "
+"email.\n"
 "Then come back here and press Next button."
-msgstr "Потврдите ваш налог притиском на везу коју смо вам управо послали ел. поштом.\nЗатим се вратите овде и притисните дугме „Напред“."
+msgstr ""
+"Потврдите ваш налог притиском на везу коју смо вам управо послали ел. "
+"поштом.\n"
+"Затим се вратите овде и притисните дугме „Напред“."
 
-#: ../gtk/setupwizard.c:600
+#: ../gtk/setupwizard.c:602
 msgid "SIP account configuration assistant"
 msgstr "Помоћник подешавања СИП налога"
 
-#: ../gtk/setupwizard.c:618
+#: ../gtk/setupwizard.c:620
 msgid "Welcome to the account setup assistant"
 msgstr "Добро дошли у помоћника подешавања налога"
 
-#: ../gtk/setupwizard.c:623
+#: ../gtk/setupwizard.c:625
 msgid "Account setup assistant"
 msgstr "Помоћник подешавања налога"
 
-#: ../gtk/setupwizard.c:629
+#: ../gtk/setupwizard.c:631
 msgid "Configure your account (step 1/1)"
 msgstr "Подесите ваш налог (корак 1/1)"
 
-#: ../gtk/setupwizard.c:634
+#: ../gtk/setupwizard.c:636
 msgid "Enter your sip username (step 1/1)"
 msgstr "Унесите ваше корисничко име сип-а (корак 1/1)"
 
-#: ../gtk/setupwizard.c:638
+#: ../gtk/setupwizard.c:640
 msgid "Enter account information (step 1/2)"
 msgstr "Унесите податке налога (корак 1/2)"
 
-#: ../gtk/setupwizard.c:647
+#: ../gtk/setupwizard.c:649
 msgid "Validation (step 2/2)"
 msgstr "Потврђивање (корак 2/2)"
 
-#: ../gtk/setupwizard.c:652
+#: ../gtk/setupwizard.c:654
 msgid "Error"
 msgstr "Грешка"
 
-#: ../gtk/setupwizard.c:656 ../gtk/audio_assistant.c:527
+#: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:527
 msgid "Terminating"
 msgstr "Завршавам"
 
@@ -614,7 +636,9 @@ msgstr "Непосредно или кроз сервер"
 msgid ""
 "download: %f\n"
 "upload: %f (kbit/s)"
-msgstr "преузимање: %f\nотпремање: %f (kbit/s)"
+msgstr ""
+"преузимање: %f\n"
+"отпремање: %f (kbit/s)"
 
 #: ../gtk/incall_view.c:272 ../gtk/incall_view.c:274
 #, c-format
@@ -695,11 +719,6 @@ msgstr "<b>У позиву</b>"
 msgid "<b>Paused call</b>"
 msgstr "<b>Заустављен позив</b>"
 
-#: ../gtk/incall_view.c:771
-#, c-format
-msgid "%02i::%02i::%02i"
-msgstr "%02i::%02i::%02i"
-
 #: ../gtk/incall_view.c:794
 msgid "<b>Call ended.</b>"
 msgstr "<b>Позив је завршен.</b>"
@@ -729,7 +748,9 @@ msgstr "Застани"
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
-msgstr "<small><i>Снимам у\n%s %s</i></small>"
+msgstr ""
+"<small><i>Снимам у\n"
+"%s %s</i></small>"
 
 #: ../gtk/incall_view.c:948
 msgid "(Paused)"
@@ -767,10 +788,13 @@ msgid "Too loud"
 msgstr "Сувише гласан"
 
 #: ../gtk/audio_assistant.c:318
+#, fuzzy
 msgid ""
-"Welcome !\n"
+"Welcome!\n"
 "This assistant will help you to configure audio settings for Linphone"
-msgstr "Добро дошли !\nОвај помоћник ће вам помоћи да подесите звучне поставке за Линфон"
+msgstr ""
+"Добро дошли !\n"
+"Овај помоћник ће вам помоћи да подесите звучне поставке за Линфон"
 
 #: ../gtk/audio_assistant.c:328
 msgid "Capture device"
@@ -977,7 +1001,8 @@ msgid "Login information"
 msgstr "Подаци пријављивања"
 
 #: ../gtk/main.ui.h:46
-msgid "<b>Welcome !</b>"
+#, fuzzy
+msgid "<b>Welcome!</b>"
 msgstr "<b>Добро дошли !</b>"
 
 #: ../gtk/main.ui.h:47
@@ -985,16 +1010,19 @@ msgid "Delete"
 msgstr "Обриши"
 
 #: ../gtk/about.ui.h:1
-msgid "About linphone"
+#, fuzzy
+msgid "About Linphone"
 msgstr "О линфону"
 
 #: ../gtk/about.ui.h:2
-msgid "(C) Belledonne Communications,2010\n"
+#, fuzzy
+msgid "(C) Belledonne Communications, 2010\n"
 msgstr "(C) Беледоне комуникације, 2010\n"
 
 #: ../gtk/about.ui.h:4
 msgid "An internet video phone using the standard SIP (rfc3261) protocol."
-msgstr "Интернет телефон са снимком који користи уобичајени СИП протокол (rfc3261)."
+msgstr ""
+"Интернет телефон са снимком који користи уобичајени СИП протокол (rfc3261)."
 
 #: ../gtk/about.ui.h:5
 msgid ""
@@ -1010,7 +1038,20 @@ msgid ""
 "cs: Petr Pisar <petr.pisar@atlas.cz>\n"
 "hu: anonymous\n"
 "he: Eli Zaretskii <eliz@gnu.org>\n"
-msgstr "fr: Simon Morlat\nen: Simon Morlat and Delphine Perreau\nit: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\nde: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\nsv: Daniel Nylander <po@danielnylander.se>\nes: Jesus Benitez <gnelson at inMail dot sk>\nja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\npt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\npl: Robert Nasiadek <darkone@darkone.pl>\ncs: Petr Pisar <petr.pisar@atlas.cz>\nhu: anonymous\nhe: Eli Zaretskii <eliz@gnu.org>\nsr: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
+msgstr ""
+"fr: Simon Morlat\n"
+"en: Simon Morlat and Delphine Perreau\n"
+"it: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\n"
+"de: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\n"
+"sv: Daniel Nylander <po@danielnylander.se>\n"
+"es: Jesus Benitez <gnelson at inMail dot sk>\n"
+"ja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\n"
+"pt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\n"
+"pl: Robert Nasiadek <darkone@darkone.pl>\n"
+"cs: Petr Pisar <petr.pisar@atlas.cz>\n"
+"hu: anonymous\n"
+"he: Eli Zaretskii <eliz@gnu.org>\n"
+"sr: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 
 #: ../gtk/contact.ui.h:2
 msgid "SIP Address"
@@ -1152,7 +1193,7 @@ msgstr "Кодеци звука"
 msgid "Video codecs"
 msgstr "Кодеци снимка"
 
-#: ../gtk/parameters.ui.h:10 ../gtk/keypad.ui.h:5
+#: ../gtk/parameters.ui.h:10
 msgid "C"
 msgstr "В"
 
@@ -1396,7 +1437,9 @@ msgstr "Укључи прилагодљиво управљање протоко
 msgid ""
 "<i>Adaptive rate control is a technique to dynamically guess the available "
 "bandwidth during a call.</i>"
-msgstr "<i>Прилагодљиво управљање протоком је техника за променљиво погађање доступног пропусног опсега за време позива.</i>"
+msgstr ""
+"<i>Прилагодљиво управљање протоком је техника за променљиво погађање "
+"доступног пропусног опсега за време позива.</i>"
 
 #: ../gtk/parameters.ui.h:71
 msgid "<b>Bandwidth control</b>"
@@ -1431,18 +1474,14 @@ msgid "Authentication method:"
 msgstr "Начин потврђивања идентитета:"
 
 #: ../gtk/parameters.ui.h:80
-msgid "label"
-msgstr "натпис"
-
-#: ../gtk/parameters.ui.h:81
 msgid "<b>LDAP Account setup</b>"
 msgstr "<b>Подешавања ЛДАП налога</b>"
 
-#: ../gtk/parameters.ui.h:82
+#: ../gtk/parameters.ui.h:81
 msgid "LDAP"
 msgstr "ЛДАП"
 
-#: ../gtk/parameters.ui.h:83
+#: ../gtk/parameters.ui.h:82
 msgid "Done"
 msgstr "Готово"
 
@@ -1554,66 +1593,6 @@ msgstr "<b>Подесите тунел</b>"
 msgid "<b>Configure http proxy (optional)</b>"
 msgstr "<b>Подесите хттп посредника (изборно)</b>"
 
-#: ../gtk/keypad.ui.h:1
-msgid "D"
-msgstr "Г"
-
-#: ../gtk/keypad.ui.h:2
-msgid "#"
-msgstr "#"
-
-#: ../gtk/keypad.ui.h:3
-msgid "0"
-msgstr "0"
-
-#: ../gtk/keypad.ui.h:4
-msgid "*"
-msgstr "*"
-
-#: ../gtk/keypad.ui.h:6
-msgid "9"
-msgstr "9"
-
-#: ../gtk/keypad.ui.h:7
-msgid "8"
-msgstr "8"
-
-#: ../gtk/keypad.ui.h:8
-msgid "7"
-msgstr "7"
-
-#: ../gtk/keypad.ui.h:9
-msgid "B"
-msgstr "Б"
-
-#: ../gtk/keypad.ui.h:10
-msgid "6"
-msgstr "6"
-
-#: ../gtk/keypad.ui.h:11
-msgid "5"
-msgstr "5"
-
-#: ../gtk/keypad.ui.h:12
-msgid "4"
-msgstr "4"
-
-#: ../gtk/keypad.ui.h:13
-msgid "A"
-msgstr "А"
-
-#: ../gtk/keypad.ui.h:14
-msgid "3"
-msgstr "3"
-
-#: ../gtk/keypad.ui.h:15
-msgid "2"
-msgstr "2"
-
-#: ../gtk/keypad.ui.h:16
-msgid "1"
-msgstr "1"
-
 #: ../gtk/ldap.ui.h:1
 msgid "LDAP Settings"
 msgstr "ЛДАП подешавања"
@@ -1709,13 +1688,17 @@ msgstr "Наводим удаљену путању подешавања"
 
 #: ../gtk/config-uri.ui.h:2
 msgid ""
-"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
-msgstr "Ово прозорче омогућава подешавање хттп или хттпс адресе када се подешавање добавља на покретању.\nУнесите или измените путању подешавања. Након што притиснете „У реду“, Линфон ће се сам поново покренути како би довукао и унео у налог нова подешавања. "
-
-#: ../gtk/config-uri.ui.h:4
-msgid "https://"
-msgstr "https://"
+"This dialog allows to set an http or https address when configuration is to "
+"be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, "
+"Linphone will restart automatically in order to fetch and take into account "
+"the new configuration. "
+msgstr ""
+"Ово прозорче омогућава подешавање хттп или хттпс адресе када се подешавање "
+"добавља на покретању.\n"
+"Унесите или измените путању подешавања. Након што притиснете „У реду“, "
+"Линфон ће се сам поново покренути како би довукао и унео у налог нова "
+"подешавања. "
 
 #: ../gtk/provisioning-fetch.ui.h:1
 msgid "Configuring..."
@@ -1725,64 +1708,60 @@ msgstr "Подешавам..."
 msgid "Please wait while fetching configuration from server..."
 msgstr "Сачекајте док довучем подешавања са сервера..."
 
-#: ../coreapi/linphonecore.c:1511
+#: ../coreapi/linphonecore.c:1510
 msgid "Ready"
 msgstr "Спреман"
 
-#: ../coreapi/linphonecore.c:2470
+#: ../coreapi/linphonecore.c:2473
 msgid "Configuring"
 msgstr "Подешавам"
 
-#: ../coreapi/linphonecore.c:2635
+#: ../coreapi/linphonecore.c:2638
 msgid "Looking for telephone number destination..."
 msgstr "Тражим одредиште телефонског броја..."
 
-#: ../coreapi/linphonecore.c:2637
+#: ../coreapi/linphonecore.c:2640
 msgid "Could not resolve this number."
 msgstr "Не могу да решим овај број."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2919
+#: ../coreapi/linphonecore.c:2922
 msgid "Contacting"
 msgstr "Ступам у везу"
 
-#: ../coreapi/linphonecore.c:2924
+#: ../coreapi/linphonecore.c:2927
 msgid "Could not call"
 msgstr "Не могу да позовем"
 
-#: ../coreapi/linphonecore.c:3074
+#: ../coreapi/linphonecore.c:3077
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "Извините, достигли смо највећи број истовремених позива"
 
-#: ../coreapi/linphonecore.c:3233
+#: ../coreapi/linphonecore.c:3236
 msgid "is contacting you"
 msgstr "вам се обраћа"
 
-#: ../coreapi/linphonecore.c:3234
+#: ../coreapi/linphonecore.c:3237
 msgid " and asked autoanswer."
 msgstr " и затражени само-одговор."
 
-#: ../coreapi/linphonecore.c:3234
-msgid "."
-msgstr "."
-
-#: ../coreapi/linphonecore.c:3352
+#: ../coreapi/linphonecore.c:3355
 msgid "Modifying call parameters..."
 msgstr "Мењам параметре позива..."
 
-#: ../coreapi/linphonecore.c:3700
+#: ../coreapi/linphonecore.c:3703
 msgid "Connected."
 msgstr "Повезан сам."
 
-#: ../coreapi/linphonecore.c:3725
+#: ../coreapi/linphonecore.c:3728
 msgid "Call aborted"
 msgstr "Позив је прекинут"
 
-#: ../coreapi/linphonecore.c:3915
+#: ../coreapi/linphonecore.c:3918
 msgid "Could not pause the call"
 msgstr "Не могу да зауставим позив"
 
-#: ../coreapi/linphonecore.c:3919
+#: ../coreapi/linphonecore.c:3922
 msgid "Pausing the current call..."
 msgstr "Заустављам тренутни позив..."
 
@@ -1843,20 +1822,26 @@ msgid "Vacation"
 msgstr "На одмору"
 
 #: ../coreapi/friend.c:68
-msgid "Unknown-bug"
+#, fuzzy
+msgid "Unknown status"
 msgstr "Непозната грешка"
 
 #: ../coreapi/proxy.c:319
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
-msgstr "Адреса сип посредника коју сте унели је неисправна, мора почети на „sip:“ за којим следи назив домаћина."
+msgstr ""
+"Адреса сип посредника коју сте унели је неисправна, мора почети на „sip:“ за "
+"којим следи назив домаћина."
 
 #: ../coreapi/proxy.c:325
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
-msgstr "Сип идентитет који сте унели није исправан.\nТреба да изгледа као „sip:корисник@домен-посредника, као што је „sip:alice@example.net“"
+msgstr ""
+"Сип идентитет који сте унели није исправан.\n"
+"Треба да изгледа као „sip:корисник@домен-посредника, као што је „sip:"
+"alice@example.net“"
 
 #: ../coreapi/proxy.c:1377
 #, c-format
@@ -1984,3 +1969,67 @@ msgid_plural "You have missed %i calls."
 msgstr[0] "Пропустили сте %i позив."
 msgstr[1] "Пропустили сте %i позива."
 msgstr[2] "Пропустили сте %i позива."
+
+#~ msgid "https://"
+#~ msgstr "https://"
+
+#~ msgid "label"
+#~ msgstr "натпис"
+
+#~ msgid "D"
+#~ msgstr "Г"
+
+#~ msgid "#"
+#~ msgstr "#"
+
+#~ msgid "0"
+#~ msgstr "0"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "9"
+#~ msgstr "9"
+
+#~ msgid "8"
+#~ msgstr "8"
+
+#~ msgid "7"
+#~ msgstr "7"
+
+#~ msgid "B"
+#~ msgstr "Б"
+
+#~ msgid "6"
+#~ msgstr "6"
+
+#~ msgid "5"
+#~ msgstr "5"
+
+#~ msgid "4"
+#~ msgstr "4"
+
+#~ msgid "A"
+#~ msgstr "А"
+
+#~ msgid "3"
+#~ msgstr "3"
+
+#~ msgid "2"
+#~ msgstr "2"
+
+#~ msgid "1"
+#~ msgstr "1"
+
+#~ msgid ""
+#~ "<small><i>%s</i></small>\t\n"
+#~ "%s"
+#~ msgstr ""
+#~ "<small><i>%s</i></small>\t\n"
+#~ "%s"
+
+#~ msgid "%02i::%02i::%02i"
+#~ msgstr "%02i::%02i::%02i"
+
+#~ msgid "."
+#~ msgstr "."
diff --git a/po/sv.po b/po/sv.po
index befddf083..1a4a4efee 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-19 10:39+0100\n"
+"POT-Creation-Date: 2014-11-28 10:55+0100\n"
 "PO-Revision-Date: 2014-11-19 10:15+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/linphone-gtk/language/sv/)\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/linphone-gtk/"
+"language/sv/)\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974
@@ -62,11 +63,6 @@ msgid_plural "%i seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gtk/calllogs.c:335 ../gtk/calllogs.c:341
-#, c-format
-msgid "<big><b>%s</b></big>\t%s"
-msgstr ""
-
 #: ../gtk/calllogs.c:337
 #, c-format
 msgid ""
@@ -74,11 +70,9 @@ msgid ""
 "%s\t%s\t"
 msgstr ""
 
-#: ../gtk/calllogs.c:343
+#: ../gtk/calllogs.c:341
 #, c-format
-msgid ""
-"<small><i>%s</i></small>\t\n"
-"%s"
+msgid "<big><b>%s</b></big>\t%s"
 msgstr ""
 
 #: ../gtk/conference.c:38 ../gtk/main.ui.h:13
@@ -94,7 +88,7 @@ msgstr ""
 msgid "Couldn't find pixmap file: %s"
 msgstr "Kunde inte hitta pixmap filen: %s"
 
-#: ../gtk/chat.c:364 ../gtk/friendlist.c:924
+#: ../gtk/chat.c:367 ../gtk/friendlist.c:924
 msgid "Invalid sip contact !"
 msgstr "ogiltig SIP kontakt!"
 
@@ -124,9 +118,11 @@ msgstr "Om på, besvara automatisk alla inkommande samtal"
 
 #: ../gtk/main.c:149
 msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: "
-"c:\\Program Files\\Linphone)"
-msgstr "Välj en arbetskatalog som ska vara basen för installationen, såsom C:\\Program\\Linphone"
+"Specifiy a working directory (should be the base of the installation, eg: c:"
+"\\Program Files\\Linphone)"
+msgstr ""
+"Välj en arbetskatalog som ska vara basen för installationen, såsom C:"
+"\\Program\\Linphone"
 
 #: ../gtk/main.c:156
 msgid "Configuration file"
@@ -140,9 +136,14 @@ msgstr ""
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
-"Would you allow him to see your presence status or add him to your contact list ?\n"
+"Would you allow him to see your presence status or add him to your contact "
+"list ?\n"
 "If you answer no, this person will be temporarily blacklisted."
-msgstr "%s skulle vilja lägga till dig till hans/hennes kontaktlista.\nVill du tillåta honom/henne att se din närvarostatus eller lägga till honom/henne till din kontaktlista?\nOm du svarar nej, personen kommer att vara bannlyst."
+msgstr ""
+"%s skulle vilja lägga till dig till hans/hennes kontaktlista.\n"
+"Vill du tillåta honom/henne att se din närvarostatus eller lägga till honom/"
+"henne till din kontaktlista?\n"
+"Om du svarar nej, personen kommer att vara bannlyst."
 
 #: ../gtk/main.c:1162
 #, c-format
@@ -155,7 +156,7 @@ msgstr ""
 msgid "Call error"
 msgstr ""
 
-#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3744
+#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3747
 msgid "Call ended"
 msgstr "Samtalet slut"
 
@@ -380,7 +381,9 @@ msgstr ""
 msgid ""
 "A more recent version is availalble from %s.\n"
 "Would you like to open a browser to download it ?"
-msgstr "En nyare version är tillgänglig på %s.\nVill du öppna en browser för att ladda ner den?"
+msgstr ""
+"En nyare version är tillgänglig på %s.\n"
+"Vill du öppna en browser för att ladda ner den?"
 
 #: ../gtk/update.c:91
 msgid "You are running the lastest version."
@@ -414,10 +417,13 @@ msgstr[0] "Hittat kontakt %i"
 msgstr[1] "Hittat kontakt %i"
 
 #: ../gtk/setupwizard.c:34
+#, fuzzy
 msgid ""
-"Welcome !\n"
+"Welcome!\n"
 "This assistant will help you to use a SIP account for your calls."
-msgstr "Välkommen!\nAssistenten kommer att hjälpa dig använda ett SIP konto för dina samtal:"
+msgstr ""
+"Välkommen!\n"
+"Assistenten kommer att hjälpa dig använda ett SIP konto för dina samtal:"
 
 #: ../gtk/setupwizard.c:43
 msgid "Create an account on linphone.org"
@@ -503,43 +509,44 @@ msgstr "Tack. Ditt konto är nu konfigurerad och färdig att användas."
 
 #: ../gtk/setupwizard.c:413
 msgid ""
-"Please validate your account by clicking on the link we just sent you by email.\n"
+"Please validate your account by clicking on the link we just sent you by "
+"email.\n"
 "Then come back here and press Next button."
 msgstr ""
 
-#: ../gtk/setupwizard.c:600
+#: ../gtk/setupwizard.c:602
 msgid "SIP account configuration assistant"
 msgstr ""
 
-#: ../gtk/setupwizard.c:618
+#: ../gtk/setupwizard.c:620
 msgid "Welcome to the account setup assistant"
 msgstr "Välkommen till kontoinstallationsassistenten"
 
-#: ../gtk/setupwizard.c:623
+#: ../gtk/setupwizard.c:625
 msgid "Account setup assistant"
 msgstr "Kontoinstallationsassistenten"
 
-#: ../gtk/setupwizard.c:629
+#: ../gtk/setupwizard.c:631
 msgid "Configure your account (step 1/1)"
 msgstr ""
 
-#: ../gtk/setupwizard.c:634
+#: ../gtk/setupwizard.c:636
 msgid "Enter your sip username (step 1/1)"
 msgstr ""
 
-#: ../gtk/setupwizard.c:638
+#: ../gtk/setupwizard.c:640
 msgid "Enter account information (step 1/2)"
 msgstr ""
 
-#: ../gtk/setupwizard.c:647
+#: ../gtk/setupwizard.c:649
 msgid "Validation (step 2/2)"
 msgstr ""
 
-#: ../gtk/setupwizard.c:652
+#: ../gtk/setupwizard.c:654
 msgid "Error"
 msgstr ""
 
-#: ../gtk/setupwizard.c:656 ../gtk/audio_assistant.c:527
+#: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:527
 msgid "Terminating"
 msgstr ""
 
@@ -691,11 +698,6 @@ msgstr ""
 msgid "<b>Paused call</b>"
 msgstr ""
 
-#: ../gtk/incall_view.c:771
-#, c-format
-msgid "%02i::%02i::%02i"
-msgstr "%02i:%02i:%02i"
-
 #: ../gtk/incall_view.c:794
 msgid "<b>Call ended.</b>"
 msgstr "<b>Samtalet slut.</b>"
@@ -763,10 +765,13 @@ msgid "Too loud"
 msgstr ""
 
 #: ../gtk/audio_assistant.c:318
+#, fuzzy
 msgid ""
-"Welcome !\n"
+"Welcome!\n"
 "This assistant will help you to configure audio settings for Linphone"
 msgstr ""
+"Välkommen!\n"
+"Assistenten kommer att hjälpa dig använda ett SIP konto för dina samtal:"
 
 #: ../gtk/audio_assistant.c:328
 msgid "Capture device"
@@ -973,7 +978,8 @@ msgid "Login information"
 msgstr "Login information"
 
 #: ../gtk/main.ui.h:46
-msgid "<b>Welcome !</b>"
+#, fuzzy
+msgid "<b>Welcome!</b>"
 msgstr "<b>Välkommen!</b>"
 
 #: ../gtk/main.ui.h:47
@@ -981,11 +987,12 @@ msgid "Delete"
 msgstr ""
 
 #: ../gtk/about.ui.h:1
-msgid "About linphone"
+#, fuzzy
+msgid "About Linphone"
 msgstr "Apropå linphone"
 
 #: ../gtk/about.ui.h:2
-msgid "(C) Belledonne Communications,2010\n"
+msgid "(C) Belledonne Communications, 2010\n"
 msgstr ""
 
 #: ../gtk/about.ui.h:4
@@ -1148,7 +1155,7 @@ msgstr ""
 msgid "Video codecs"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:10 ../gtk/keypad.ui.h:5
+#: ../gtk/parameters.ui.h:10
 msgid "C"
 msgstr ""
 
@@ -1310,7 +1317,8 @@ msgstr "Multimedia inställningar"
 
 #: ../gtk/parameters.ui.h:50
 msgid "This section defines your SIP address when not using a SIP account"
-msgstr "Denna sektion specificerar din SIP adress när du inte använder ett SIP konto"
+msgstr ""
+"Denna sektion specificerar din SIP adress när du inte använder ett SIP konto"
 
 #: ../gtk/parameters.ui.h:51
 msgid "Your display name (eg: John Doe):"
@@ -1427,18 +1435,14 @@ msgid "Authentication method:"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:80
-msgid "label"
-msgstr "etikett"
-
-#: ../gtk/parameters.ui.h:81
 msgid "<b>LDAP Account setup</b>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:82
+#: ../gtk/parameters.ui.h:81
 msgid "LDAP"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:83
+#: ../gtk/parameters.ui.h:82
 msgid "Done"
 msgstr "Klar"
 
@@ -1550,66 +1554,6 @@ msgstr ""
 msgid "<b>Configure http proxy (optional)</b>"
 msgstr ""
 
-#: ../gtk/keypad.ui.h:1
-msgid "D"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:2
-msgid "#"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:3
-msgid "0"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:4
-msgid "*"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:6
-msgid "9"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:7
-msgid "8"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:8
-msgid "7"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:9
-msgid "B"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:10
-msgid "6"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:11
-msgid "5"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:12
-msgid "4"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:13
-msgid "A"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:14
-msgid "3"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:15
-msgid "2"
-msgstr ""
-
-#: ../gtk/keypad.ui.h:16
-msgid "1"
-msgstr ""
-
 #: ../gtk/ldap.ui.h:1
 msgid "LDAP Settings"
 msgstr ""
@@ -1705,12 +1649,11 @@ msgstr ""
 
 #: ../gtk/config-uri.ui.h:2
 msgid ""
-"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
-msgstr ""
-
-#: ../gtk/config-uri.ui.h:4
-msgid "https://"
+"This dialog allows to set an http or https address when configuration is to "
+"be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, "
+"Linphone will restart automatically in order to fetch and take into account "
+"the new configuration. "
 msgstr ""
 
 #: ../gtk/provisioning-fetch.ui.h:1
@@ -1721,64 +1664,60 @@ msgstr ""
 msgid "Please wait while fetching configuration from server..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1511
+#: ../coreapi/linphonecore.c:1510
 msgid "Ready"
 msgstr "Redo"
 
-#: ../coreapi/linphonecore.c:2470
+#: ../coreapi/linphonecore.c:2473
 msgid "Configuring"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2635
+#: ../coreapi/linphonecore.c:2638
 msgid "Looking for telephone number destination..."
 msgstr "Leta efter telefonnummer för destinationen..."
 
-#: ../coreapi/linphonecore.c:2637
+#: ../coreapi/linphonecore.c:2640
 msgid "Could not resolve this number."
 msgstr "Kan inte nå dett nummer."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2919
+#: ../coreapi/linphonecore.c:2922
 msgid "Contacting"
 msgstr "Kontaktar"
 
-#: ../coreapi/linphonecore.c:2924
+#: ../coreapi/linphonecore.c:2927
 msgid "Could not call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3074
+#: ../coreapi/linphonecore.c:3077
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3233
+#: ../coreapi/linphonecore.c:3236
 msgid "is contacting you"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3234
+#: ../coreapi/linphonecore.c:3237
 msgid " and asked autoanswer."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3234
-msgid "."
-msgstr ""
-
-#: ../coreapi/linphonecore.c:3352
+#: ../coreapi/linphonecore.c:3355
 msgid "Modifying call parameters..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3700
+#: ../coreapi/linphonecore.c:3703
 msgid "Connected."
 msgstr "Kopplad"
 
-#: ../coreapi/linphonecore.c:3725
+#: ../coreapi/linphonecore.c:3728
 msgid "Call aborted"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3915
+#: ../coreapi/linphonecore.c:3918
 msgid "Could not pause the call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3919
+#: ../coreapi/linphonecore.c:3922
 msgid "Pausing the current call..."
 msgstr ""
 
@@ -1839,20 +1778,25 @@ msgid "Vacation"
 msgstr ""
 
 #: ../coreapi/friend.c:68
-msgid "Unknown-bug"
+#, fuzzy
+msgid "Unknown status"
 msgstr "Okänd bug"
 
 #: ../coreapi/proxy.c:319
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
-msgstr "SIP proxy adressen som du matade in är inte rätt, adressen måste starta med \"sip:\", följd av ett hostnamn"
+msgstr ""
+"SIP proxy adressen som du matade in är inte rätt, adressen måste starta med "
+"\"sip:\", följd av ett hostnamn"
 
 #: ../coreapi/proxy.c:325
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
-msgstr "SIP adressen som du matade in är inte rätt. Adressen borde se ut som sip:namn@domän, såsom sip:peter@exempel.se"
+msgstr ""
+"SIP adressen som du matade in är inte rätt. Adressen borde se ut som sip:"
+"namn@domän, såsom sip:peter@exempel.se"
 
 #: ../coreapi/proxy.c:1377
 #, c-format
@@ -1979,3 +1923,9 @@ msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
 msgstr[0] "Du har %i missat samtal"
 msgstr[1] "Du har %i missade samtal"
+
+#~ msgid "label"
+#~ msgstr "etikett"
+
+#~ msgid "%02i::%02i::%02i"
+#~ msgstr "%02i:%02i:%02i"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 34f97d9fe..50b6812f8 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-19 10:39+0100\n"
+"POT-Creation-Date: 2014-11-28 10:55+0100\n"
 "PO-Revision-Date: 2014-11-19 10:15+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/linphone-gtk/language/zh_CN/)\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/linphone-"
+"gtk/language/zh_CN/)\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974
@@ -60,11 +61,6 @@ msgid "%i second"
 msgid_plural "%i seconds"
 msgstr[0] ""
 
-#: ../gtk/calllogs.c:335 ../gtk/calllogs.c:341
-#, c-format
-msgid "<big><b>%s</b></big>\t%s"
-msgstr ""
-
 #: ../gtk/calllogs.c:337
 #, c-format
 msgid ""
@@ -72,11 +68,9 @@ msgid ""
 "%s\t%s\t"
 msgstr ""
 
-#: ../gtk/calllogs.c:343
+#: ../gtk/calllogs.c:341
 #, c-format
-msgid ""
-"<small><i>%s</i></small>\t\n"
-"%s"
+msgid "<big><b>%s</b></big>\t%s"
 msgstr ""
 
 #: ../gtk/conference.c:38 ../gtk/main.ui.h:13
@@ -92,7 +86,7 @@ msgstr ""
 msgid "Couldn't find pixmap file: %s"
 msgstr "无法打开位图文件：%s"
 
-#: ../gtk/chat.c:364 ../gtk/friendlist.c:924
+#: ../gtk/chat.c:367 ../gtk/friendlist.c:924
 msgid "Invalid sip contact !"
 msgstr "无效的 SIP 联系人！"
 
@@ -122,8 +116,8 @@ msgstr "是否设置呼叫自动应答"
 
 #: ../gtk/main.c:149
 msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: "
-"c:\\Program Files\\Linphone)"
+"Specifiy a working directory (should be the base of the installation, eg: c:"
+"\\Program Files\\Linphone)"
 msgstr "指定工作目录(应为安装目录例如 C:\\Program Files\\Linphone)"
 
 #: ../gtk/main.c:156
@@ -138,9 +132,13 @@ msgstr ""
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
-"Would you allow him to see your presence status or add him to your contact list ?\n"
+"Would you allow him to see your presence status or add him to your contact "
+"list ?\n"
 "If you answer no, this person will be temporarily blacklisted."
-msgstr "%s 想加您为联系人。\n您是否允许他看到您的在线状态或者将它加为您的联系人允许?\n如果您回答否，则会将该人临时性的放入黑名单"
+msgstr ""
+"%s 想加您为联系人。\n"
+"您是否允许他看到您的在线状态或者将它加为您的联系人允许?\n"
+"如果您回答否，则会将该人临时性的放入黑名单"
 
 #: ../gtk/main.c:1162
 #, c-format
@@ -153,7 +151,7 @@ msgstr ""
 msgid "Call error"
 msgstr ""
 
-#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3744
+#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3747
 msgid "Call ended"
 msgstr "呼叫结束"
 
@@ -205,7 +203,9 @@ msgstr ""
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
-msgstr "未在此计算机上检测到声卡。\n您无法发送或接收音频呼叫。"
+msgstr ""
+"未在此计算机上检测到声卡。\n"
+"您无法发送或接收音频呼叫。"
 
 #: ../gtk/main.c:2157
 msgid "A free SIP video-phone"
@@ -378,7 +378,9 @@ msgstr ""
 msgid ""
 "A more recent version is availalble from %s.\n"
 "Would you like to open a browser to download it ?"
-msgstr "%s 有新版本。\n您是否要打开浏览器下载它？"
+msgstr ""
+"%s 有新版本。\n"
+"您是否要打开浏览器下载它？"
 
 #: ../gtk/update.c:91
 msgid "You are running the lastest version."
@@ -411,10 +413,13 @@ msgid_plural "Found %i contacts"
 msgstr[0] "找到 %i 联系方式"
 
 #: ../gtk/setupwizard.c:34
+#, fuzzy
 msgid ""
-"Welcome !\n"
+"Welcome!\n"
 "This assistant will help you to use a SIP account for your calls."
-msgstr "欢迎使用 Linphone！\n设置向导将帮助您配置打网络电话的 SIP 帐户。"
+msgstr ""
+"欢迎使用 Linphone！\n"
+"设置向导将帮助您配置打网络电话的 SIP 帐户。"
 
 #: ../gtk/setupwizard.c:43
 msgid "Create an account on linphone.org"
@@ -500,43 +505,44 @@ msgstr "谢谢，您的帐户已经配置完毕，可以使用。"
 
 #: ../gtk/setupwizard.c:413
 msgid ""
-"Please validate your account by clicking on the link we just sent you by email.\n"
+"Please validate your account by clicking on the link we just sent you by "
+"email.\n"
 "Then come back here and press Next button."
 msgstr ""
 
-#: ../gtk/setupwizard.c:600
+#: ../gtk/setupwizard.c:602
 msgid "SIP account configuration assistant"
 msgstr ""
 
-#: ../gtk/setupwizard.c:618
+#: ../gtk/setupwizard.c:620
 msgid "Welcome to the account setup assistant"
 msgstr "欢迎使用帐户设置向导"
 
-#: ../gtk/setupwizard.c:623
+#: ../gtk/setupwizard.c:625
 msgid "Account setup assistant"
 msgstr "帐户设置向导"
 
-#: ../gtk/setupwizard.c:629
+#: ../gtk/setupwizard.c:631
 msgid "Configure your account (step 1/1)"
 msgstr ""
 
-#: ../gtk/setupwizard.c:634
+#: ../gtk/setupwizard.c:636
 msgid "Enter your sip username (step 1/1)"
 msgstr ""
 
-#: ../gtk/setupwizard.c:638
+#: ../gtk/setupwizard.c:640
 msgid "Enter account information (step 1/2)"
 msgstr ""
 
-#: ../gtk/setupwizard.c:647
+#: ../gtk/setupwizard.c:649
 msgid "Validation (step 2/2)"
 msgstr ""
 
-#: ../gtk/setupwizard.c:652
+#: ../gtk/setupwizard.c:654
 msgid "Error"
 msgstr ""
 
-#: ../gtk/setupwizard.c:656 ../gtk/audio_assistant.c:527
+#: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:527
 msgid "Terminating"
 msgstr ""
 
@@ -688,11 +694,6 @@ msgstr ""
 msgid "<b>Paused call</b>"
 msgstr ""
 
-#: ../gtk/incall_view.c:771
-#, c-format
-msgid "%02i::%02i::%02i"
-msgstr "%02i::%02i::%02i"
-
 #: ../gtk/incall_view.c:794
 msgid "<b>Call ended.</b>"
 msgstr "<b>通话结束。</b>"
@@ -760,10 +761,13 @@ msgid "Too loud"
 msgstr ""
 
 #: ../gtk/audio_assistant.c:318
+#, fuzzy
 msgid ""
-"Welcome !\n"
+"Welcome!\n"
 "This assistant will help you to configure audio settings for Linphone"
 msgstr ""
+"欢迎使用 Linphone！\n"
+"设置向导将帮助您配置打网络电话的 SIP 帐户。"
 
 #: ../gtk/audio_assistant.c:328
 msgid "Capture device"
@@ -970,7 +974,8 @@ msgid "Login information"
 msgstr "登录信息"
 
 #: ../gtk/main.ui.h:46
-msgid "<b>Welcome !</b>"
+#, fuzzy
+msgid "<b>Welcome!</b>"
 msgstr "<b>欢迎！</b>"
 
 #: ../gtk/main.ui.h:47
@@ -978,11 +983,12 @@ msgid "Delete"
 msgstr ""
 
 #: ../gtk/about.ui.h:1
-msgid "About linphone"
+#, fuzzy
+msgid "About Linphone"
 msgstr "关于 Linphone"
 
 #: ../gtk/about.ui.h:2
-msgid "(C) Belledonne Communications,2010\n"
+msgid "(C) Belledonne Communications, 2010\n"
 msgstr ""
 
 #: ../gtk/about.ui.h:4
@@ -1145,7 +1151,7 @@ msgstr ""
 msgid "Video codecs"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:10 ../gtk/keypad.ui.h:5
+#: ../gtk/parameters.ui.h:10
 msgid "C"
 msgstr "C"
 
@@ -1424,18 +1430,14 @@ msgid "Authentication method:"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:80
-msgid "label"
-msgstr "标签"
-
-#: ../gtk/parameters.ui.h:81
 msgid "<b>LDAP Account setup</b>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:82
+#: ../gtk/parameters.ui.h:81
 msgid "LDAP"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:83
+#: ../gtk/parameters.ui.h:82
 msgid "Done"
 msgstr "完成"
 
@@ -1547,66 +1549,6 @@ msgstr ""
 msgid "<b>Configure http proxy (optional)</b>"
 msgstr ""
 
-#: ../gtk/keypad.ui.h:1
-msgid "D"
-msgstr "D"
-
-#: ../gtk/keypad.ui.h:2
-msgid "#"
-msgstr "#"
-
-#: ../gtk/keypad.ui.h:3
-msgid "0"
-msgstr "0"
-
-#: ../gtk/keypad.ui.h:4
-msgid "*"
-msgstr "*"
-
-#: ../gtk/keypad.ui.h:6
-msgid "9"
-msgstr "9"
-
-#: ../gtk/keypad.ui.h:7
-msgid "8"
-msgstr "8"
-
-#: ../gtk/keypad.ui.h:8
-msgid "7"
-msgstr "7"
-
-#: ../gtk/keypad.ui.h:9
-msgid "B"
-msgstr "B"
-
-#: ../gtk/keypad.ui.h:10
-msgid "6"
-msgstr "6"
-
-#: ../gtk/keypad.ui.h:11
-msgid "5"
-msgstr "5"
-
-#: ../gtk/keypad.ui.h:12
-msgid "4"
-msgstr "4"
-
-#: ../gtk/keypad.ui.h:13
-msgid "A"
-msgstr "A"
-
-#: ../gtk/keypad.ui.h:14
-msgid "3"
-msgstr "3"
-
-#: ../gtk/keypad.ui.h:15
-msgid "2"
-msgstr "2"
-
-#: ../gtk/keypad.ui.h:16
-msgid "1"
-msgstr "1"
-
 #: ../gtk/ldap.ui.h:1
 msgid "LDAP Settings"
 msgstr ""
@@ -1702,12 +1644,11 @@ msgstr ""
 
 #: ../gtk/config-uri.ui.h:2
 msgid ""
-"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
-msgstr ""
-
-#: ../gtk/config-uri.ui.h:4
-msgid "https://"
+"This dialog allows to set an http or https address when configuration is to "
+"be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, "
+"Linphone will restart automatically in order to fetch and take into account "
+"the new configuration. "
 msgstr ""
 
 #: ../gtk/provisioning-fetch.ui.h:1
@@ -1718,64 +1659,60 @@ msgstr ""
 msgid "Please wait while fetching configuration from server..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1511
+#: ../coreapi/linphonecore.c:1510
 msgid "Ready"
 msgstr "就绪"
 
-#: ../coreapi/linphonecore.c:2470
+#: ../coreapi/linphonecore.c:2473
 msgid "Configuring"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2635
+#: ../coreapi/linphonecore.c:2638
 msgid "Looking for telephone number destination..."
 msgstr "查询电话号码目的地..."
 
-#: ../coreapi/linphonecore.c:2637
+#: ../coreapi/linphonecore.c:2640
 msgid "Could not resolve this number."
 msgstr "该号码无法解析。"
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2919
+#: ../coreapi/linphonecore.c:2922
 msgid "Contacting"
 msgstr "联系中"
 
-#: ../coreapi/linphonecore.c:2924
+#: ../coreapi/linphonecore.c:2927
 msgid "Could not call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3074
+#: ../coreapi/linphonecore.c:3077
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3233
+#: ../coreapi/linphonecore.c:3236
 msgid "is contacting you"
 msgstr "正在联系您"
 
-#: ../coreapi/linphonecore.c:3234
+#: ../coreapi/linphonecore.c:3237
 msgid " and asked autoanswer."
 msgstr " 并询问了自动回答。"
 
-#: ../coreapi/linphonecore.c:3234
-msgid "."
-msgstr "."
-
-#: ../coreapi/linphonecore.c:3352
+#: ../coreapi/linphonecore.c:3355
 msgid "Modifying call parameters..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3700
+#: ../coreapi/linphonecore.c:3703
 msgid "Connected."
 msgstr "已连接。"
 
-#: ../coreapi/linphonecore.c:3725
+#: ../coreapi/linphonecore.c:3728
 msgid "Call aborted"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3915
+#: ../coreapi/linphonecore.c:3918
 msgid "Could not pause the call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3919
+#: ../coreapi/linphonecore.c:3922
 msgid "Pausing the current call..."
 msgstr ""
 
@@ -1836,7 +1773,8 @@ msgid "Vacation"
 msgstr ""
 
 #: ../coreapi/friend.c:68
-msgid "Unknown-bug"
+#, fuzzy
+msgid "Unknown status"
 msgstr "未知错误"
 
 #: ../coreapi/proxy.c:319
@@ -1849,7 +1787,9 @@ msgstr "您输入的 SIP 代理地址无效，它必须是以“sip:”开头，
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
-msgstr "您输入的地址无效。\n它应具有“sip:用户名@代理域”的形式，例如 sip:alice@example.net"
+msgstr ""
+"您输入的地址无效。\n"
+"它应具有“sip:用户名@代理域”的形式，例如 sip:alice@example.net"
 
 #: ../coreapi/proxy.c:1377
 #, c-format
@@ -1975,3 +1915,57 @@ msgstr ""
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
 msgstr[0] "您错过了 %i 个呼叫。"
+
+#~ msgid "label"
+#~ msgstr "标签"
+
+#~ msgid "D"
+#~ msgstr "D"
+
+#~ msgid "#"
+#~ msgstr "#"
+
+#~ msgid "0"
+#~ msgstr "0"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "9"
+#~ msgstr "9"
+
+#~ msgid "8"
+#~ msgstr "8"
+
+#~ msgid "7"
+#~ msgstr "7"
+
+#~ msgid "B"
+#~ msgstr "B"
+
+#~ msgid "6"
+#~ msgstr "6"
+
+#~ msgid "5"
+#~ msgstr "5"
+
+#~ msgid "4"
+#~ msgstr "4"
+
+#~ msgid "A"
+#~ msgstr "A"
+
+#~ msgid "3"
+#~ msgstr "3"
+
+#~ msgid "2"
+#~ msgstr "2"
+
+#~ msgid "1"
+#~ msgstr "1"
+
+#~ msgid "%02i::%02i::%02i"
+#~ msgstr "%02i::%02i::%02i"
+
+#~ msgid "."
+#~ msgstr "."
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 673029508..4efff36e4 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-19 10:39+0100\n"
+"POT-Creation-Date: 2014-11-28 10:55+0100\n"
 "PO-Revision-Date: 2014-11-19 10:15+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/linphone-gtk/language/zh_TW/)\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/"
+"linphone-gtk/language/zh_TW/)\n"
+"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974
@@ -60,11 +61,6 @@ msgid "%i second"
 msgid_plural "%i seconds"
 msgstr[0] ""
 
-#: ../gtk/calllogs.c:335 ../gtk/calllogs.c:341
-#, c-format
-msgid "<big><b>%s</b></big>\t%s"
-msgstr ""
-
 #: ../gtk/calllogs.c:337
 #, c-format
 msgid ""
@@ -72,11 +68,9 @@ msgid ""
 "%s\t%s\t"
 msgstr ""
 
-#: ../gtk/calllogs.c:343
+#: ../gtk/calllogs.c:341
 #, c-format
-msgid ""
-"<small><i>%s</i></small>\t\n"
-"%s"
+msgid "<big><b>%s</b></big>\t%s"
 msgstr ""
 
 #: ../gtk/conference.c:38 ../gtk/main.ui.h:13
@@ -92,7 +86,7 @@ msgstr ""
 msgid "Couldn't find pixmap file: %s"
 msgstr "找不到 pixmap 檔：%s"
 
-#: ../gtk/chat.c:364 ../gtk/friendlist.c:924
+#: ../gtk/chat.c:367 ../gtk/friendlist.c:924
 msgid "Invalid sip contact !"
 msgstr "無效的 sip 連絡人！"
 
@@ -122,9 +116,10 @@ msgstr "如啟用此項，將會自動接聽來電"
 
 #: ../gtk/main.c:149
 msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: "
-"c:\\Program Files\\Linphone)"
-msgstr "指定一個工作目錄（應該為安裝的根目錄，例如：c:\\Program Files\\Linphone）"
+"Specifiy a working directory (should be the base of the installation, eg: c:"
+"\\Program Files\\Linphone)"
+msgstr ""
+"指定一個工作目錄（應該為安裝的根目錄，例如：c:\\Program Files\\Linphone）"
 
 #: ../gtk/main.c:156
 msgid "Configuration file"
@@ -138,9 +133,13 @@ msgstr ""
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
-"Would you allow him to see your presence status or add him to your contact list ?\n"
+"Would you allow him to see your presence status or add him to your contact "
+"list ?\n"
 "If you answer no, this person will be temporarily blacklisted."
-msgstr "%s 想要加您加入他的連絡人清單。\n您是否要允許他看見您的上線狀態或將他加入您的連絡人清單？\n如果您回答否，這個人會被暫時列入黑名單。"
+msgstr ""
+"%s 想要加您加入他的連絡人清單。\n"
+"您是否要允許他看見您的上線狀態或將他加入您的連絡人清單？\n"
+"如果您回答否，這個人會被暫時列入黑名單。"
 
 #: ../gtk/main.c:1162
 #, c-format
@@ -153,7 +152,7 @@ msgstr ""
 msgid "Call error"
 msgstr ""
 
-#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3744
+#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3747
 msgid "Call ended"
 msgstr "通話已結束"
 
@@ -205,7 +204,9 @@ msgstr "我們被轉接到 %s"
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
-msgstr "在這臺電腦中偵測不到音效卡。\n您將無法傳送或接收語音電話。"
+msgstr ""
+"在這臺電腦中偵測不到音效卡。\n"
+"您將無法傳送或接收語音電話。"
 
 #: ../gtk/main.c:2157
 msgid "A free SIP video-phone"
@@ -378,7 +379,9 @@ msgstr ""
 msgid ""
 "A more recent version is availalble from %s.\n"
 "Would you like to open a browser to download it ?"
-msgstr "在 %s 有最新的版本。\n您想要開啟瀏覽器下載它嗎？"
+msgstr ""
+"在 %s 有最新的版本。\n"
+"您想要開啟瀏覽器下載它嗎？"
 
 #: ../gtk/update.c:91
 msgid "You are running the lastest version."
@@ -411,10 +414,13 @@ msgid_plural "Found %i contacts"
 msgstr[0] "找不到 %i 個連絡人"
 
 #: ../gtk/setupwizard.c:34
+#, fuzzy
 msgid ""
-"Welcome !\n"
+"Welcome!\n"
 "This assistant will help you to use a SIP account for your calls."
-msgstr "歡迎！\n這個助理會協助您使用電話的 SIP 帳號。"
+msgstr ""
+"歡迎！\n"
+"這個助理會協助您使用電話的 SIP 帳號。"
 
 #: ../gtk/setupwizard.c:43
 msgid "Create an account on linphone.org"
@@ -500,43 +506,44 @@ msgstr "謝謝您。您的帳號已設定完成並且可以使用。"
 
 #: ../gtk/setupwizard.c:413
 msgid ""
-"Please validate your account by clicking on the link we just sent you by email.\n"
+"Please validate your account by clicking on the link we just sent you by "
+"email.\n"
 "Then come back here and press Next button."
 msgstr ""
 
-#: ../gtk/setupwizard.c:600
+#: ../gtk/setupwizard.c:602
 msgid "SIP account configuration assistant"
 msgstr ""
 
-#: ../gtk/setupwizard.c:618
+#: ../gtk/setupwizard.c:620
 msgid "Welcome to the account setup assistant"
 msgstr "歡迎使用帳號設定助理"
 
-#: ../gtk/setupwizard.c:623
+#: ../gtk/setupwizard.c:625
 msgid "Account setup assistant"
 msgstr "帳號設定助理"
 
-#: ../gtk/setupwizard.c:629
+#: ../gtk/setupwizard.c:631
 msgid "Configure your account (step 1/1)"
 msgstr ""
 
-#: ../gtk/setupwizard.c:634
+#: ../gtk/setupwizard.c:636
 msgid "Enter your sip username (step 1/1)"
 msgstr ""
 
-#: ../gtk/setupwizard.c:638
+#: ../gtk/setupwizard.c:640
 msgid "Enter account information (step 1/2)"
 msgstr ""
 
-#: ../gtk/setupwizard.c:647
+#: ../gtk/setupwizard.c:649
 msgid "Validation (step 2/2)"
 msgstr ""
 
-#: ../gtk/setupwizard.c:652
+#: ../gtk/setupwizard.c:654
 msgid "Error"
 msgstr ""
 
-#: ../gtk/setupwizard.c:656 ../gtk/audio_assistant.c:527
+#: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:527
 msgid "Terminating"
 msgstr ""
 
@@ -688,11 +695,6 @@ msgstr "<b>通話中</b>"
 msgid "<b>Paused call</b>"
 msgstr "<b>暫停通話</b>"
 
-#: ../gtk/incall_view.c:771
-#, c-format
-msgid "%02i::%02i::%02i"
-msgstr "%02i::%02i::%02i"
-
 #: ../gtk/incall_view.c:794
 msgid "<b>Call ended.</b>"
 msgstr "<b>通話結束。</b>"
@@ -760,10 +762,13 @@ msgid "Too loud"
 msgstr ""
 
 #: ../gtk/audio_assistant.c:318
+#, fuzzy
 msgid ""
-"Welcome !\n"
+"Welcome!\n"
 "This assistant will help you to configure audio settings for Linphone"
 msgstr ""
+"歡迎！\n"
+"這個助理會協助您使用電話的 SIP 帳號。"
 
 #: ../gtk/audio_assistant.c:328
 msgid "Capture device"
@@ -970,7 +975,8 @@ msgid "Login information"
 msgstr "登入資訊"
 
 #: ../gtk/main.ui.h:46
-msgid "<b>Welcome !</b>"
+#, fuzzy
+msgid "<b>Welcome!</b>"
 msgstr "<b>歡迎使用！</b>"
 
 #: ../gtk/main.ui.h:47
@@ -978,11 +984,13 @@ msgid "Delete"
 msgstr ""
 
 #: ../gtk/about.ui.h:1
-msgid "About linphone"
+#, fuzzy
+msgid "About Linphone"
 msgstr "關於 linphone"
 
 #: ../gtk/about.ui.h:2
-msgid "(C) Belledonne Communications,2010\n"
+#, fuzzy
+msgid "(C) Belledonne Communications, 2010\n"
 msgstr "(C) Belledonne Communications,2010\n"
 
 #: ../gtk/about.ui.h:4
@@ -1145,7 +1153,7 @@ msgstr "音訊編碼解碼器"
 msgid "Video codecs"
 msgstr "視訊編碼解碼器"
 
-#: ../gtk/parameters.ui.h:10 ../gtk/keypad.ui.h:5
+#: ../gtk/parameters.ui.h:10
 msgid "C"
 msgstr "C"
 
@@ -1424,18 +1432,14 @@ msgid "Authentication method:"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:80
-msgid "label"
-msgstr "標籤"
-
-#: ../gtk/parameters.ui.h:81
 msgid "<b>LDAP Account setup</b>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:82
+#: ../gtk/parameters.ui.h:81
 msgid "LDAP"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:83
+#: ../gtk/parameters.ui.h:82
 msgid "Done"
 msgstr "完成"
 
@@ -1547,66 +1551,6 @@ msgstr ""
 msgid "<b>Configure http proxy (optional)</b>"
 msgstr ""
 
-#: ../gtk/keypad.ui.h:1
-msgid "D"
-msgstr "D"
-
-#: ../gtk/keypad.ui.h:2
-msgid "#"
-msgstr "#"
-
-#: ../gtk/keypad.ui.h:3
-msgid "0"
-msgstr "0"
-
-#: ../gtk/keypad.ui.h:4
-msgid "*"
-msgstr "*"
-
-#: ../gtk/keypad.ui.h:6
-msgid "9"
-msgstr "9"
-
-#: ../gtk/keypad.ui.h:7
-msgid "8"
-msgstr "8"
-
-#: ../gtk/keypad.ui.h:8
-msgid "7"
-msgstr "7"
-
-#: ../gtk/keypad.ui.h:9
-msgid "B"
-msgstr "B"
-
-#: ../gtk/keypad.ui.h:10
-msgid "6"
-msgstr "6"
-
-#: ../gtk/keypad.ui.h:11
-msgid "5"
-msgstr "5"
-
-#: ../gtk/keypad.ui.h:12
-msgid "4"
-msgstr "4"
-
-#: ../gtk/keypad.ui.h:13
-msgid "A"
-msgstr "A"
-
-#: ../gtk/keypad.ui.h:14
-msgid "3"
-msgstr "3"
-
-#: ../gtk/keypad.ui.h:15
-msgid "2"
-msgstr "2"
-
-#: ../gtk/keypad.ui.h:16
-msgid "1"
-msgstr "1"
-
 #: ../gtk/ldap.ui.h:1
 msgid "LDAP Settings"
 msgstr ""
@@ -1702,12 +1646,11 @@ msgstr ""
 
 #: ../gtk/config-uri.ui.h:2
 msgid ""
-"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
-msgstr ""
-
-#: ../gtk/config-uri.ui.h:4
-msgid "https://"
+"This dialog allows to set an http or https address when configuration is to "
+"be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, "
+"Linphone will restart automatically in order to fetch and take into account "
+"the new configuration. "
 msgstr ""
 
 #: ../gtk/provisioning-fetch.ui.h:1
@@ -1718,64 +1661,60 @@ msgstr ""
 msgid "Please wait while fetching configuration from server..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1511
+#: ../coreapi/linphonecore.c:1510
 msgid "Ready"
 msgstr "準備就緒"
 
-#: ../coreapi/linphonecore.c:2470
+#: ../coreapi/linphonecore.c:2473
 msgid "Configuring"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2635
+#: ../coreapi/linphonecore.c:2638
 msgid "Looking for telephone number destination..."
 msgstr "尋找電話號碼目的端..."
 
-#: ../coreapi/linphonecore.c:2637
+#: ../coreapi/linphonecore.c:2640
 msgid "Could not resolve this number."
 msgstr "無法解析這個號碼。"
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2919
+#: ../coreapi/linphonecore.c:2922
 msgid "Contacting"
 msgstr "正在連絡"
 
-#: ../coreapi/linphonecore.c:2924
+#: ../coreapi/linphonecore.c:2927
 msgid "Could not call"
 msgstr "無法通話"
 
-#: ../coreapi/linphonecore.c:3074
+#: ../coreapi/linphonecore.c:3077
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "抱歉，我們已達瀏同步通話的最大數目"
 
-#: ../coreapi/linphonecore.c:3233
+#: ../coreapi/linphonecore.c:3236
 msgid "is contacting you"
 msgstr "正在連絡您"
 
-#: ../coreapi/linphonecore.c:3234
+#: ../coreapi/linphonecore.c:3237
 msgid " and asked autoanswer."
 msgstr "並要求自動接聽。"
 
-#: ../coreapi/linphonecore.c:3234
-msgid "."
-msgstr "."
-
-#: ../coreapi/linphonecore.c:3352
+#: ../coreapi/linphonecore.c:3355
 msgid "Modifying call parameters..."
 msgstr "修改通話參數..."
 
-#: ../coreapi/linphonecore.c:3700
+#: ../coreapi/linphonecore.c:3703
 msgid "Connected."
 msgstr "已連線。"
 
-#: ../coreapi/linphonecore.c:3725
+#: ../coreapi/linphonecore.c:3728
 msgid "Call aborted"
 msgstr "通話已放棄"
 
-#: ../coreapi/linphonecore.c:3915
+#: ../coreapi/linphonecore.c:3918
 msgid "Could not pause the call"
 msgstr "無法暫停通話"
 
-#: ../coreapi/linphonecore.c:3919
+#: ../coreapi/linphonecore.c:3922
 msgid "Pausing the current call..."
 msgstr "暫停目前的通話..."
 
@@ -1836,20 +1775,24 @@ msgid "Vacation"
 msgstr ""
 
 #: ../coreapi/friend.c:68
-msgid "Unknown-bug"
+#, fuzzy
+msgid "Unknown status"
 msgstr "不明錯誤"
 
 #: ../coreapi/proxy.c:319
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
-msgstr "您輸入的 sip 代理位址是無效的，它必須要以「sip:」開頭，後面接主機名稱。"
+msgstr ""
+"您輸入的 sip 代理位址是無效的，它必須要以「sip:」開頭，後面接主機名稱。"
 
 #: ../coreapi/proxy.c:325
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
-msgstr "您輸入的 sip 身分是無效的。\n它應該看起來像 sip:使用者名稱@代理網域，像是 sip:alice@example.net"
+msgstr ""
+"您輸入的 sip 身分是無效的。\n"
+"它應該看起來像 sip:使用者名稱@代理網域，像是 sip:alice@example.net"
 
 #: ../coreapi/proxy.c:1377
 #, c-format
@@ -1975,3 +1918,57 @@ msgstr ""
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
 msgstr[0] "您有 %i 通未接來電。"
+
+#~ msgid "label"
+#~ msgstr "標籤"
+
+#~ msgid "D"
+#~ msgstr "D"
+
+#~ msgid "#"
+#~ msgstr "#"
+
+#~ msgid "0"
+#~ msgstr "0"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "9"
+#~ msgstr "9"
+
+#~ msgid "8"
+#~ msgstr "8"
+
+#~ msgid "7"
+#~ msgstr "7"
+
+#~ msgid "B"
+#~ msgstr "B"
+
+#~ msgid "6"
+#~ msgstr "6"
+
+#~ msgid "5"
+#~ msgstr "5"
+
+#~ msgid "4"
+#~ msgstr "4"
+
+#~ msgid "A"
+#~ msgstr "A"
+
+#~ msgid "3"
+#~ msgstr "3"
+
+#~ msgid "2"
+#~ msgstr "2"
+
+#~ msgid "1"
+#~ msgstr "1"
+
+#~ msgid "%02i::%02i::%02i"
+#~ msgstr "%02i::%02i::%02i"
+
+#~ msgid "."
+#~ msgstr "."

From f03bb1849b96f41e8ec4a9a6c4570436bb833f26 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Fri, 28 Nov 2014 11:13:48 +0100
Subject: [PATCH 072/496] Handle download of rootca.pem when building with
 CMake.

---
 coreapi/gitversion.cmake |  2 +-
 share/CMakeLists.txt     | 20 ++++++++++++++++++--
 share/rootca.cmake       | 40 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 59 insertions(+), 3 deletions(-)
 create mode 100644 share/rootca.cmake

diff --git a/coreapi/gitversion.cmake b/coreapi/gitversion.cmake
index 5c6facdab..23fecb10c 100644
--- a/coreapi/gitversion.cmake
+++ b/coreapi/gitversion.cmake
@@ -1,5 +1,5 @@
 ############################################################################
-# CMakeLists.txt
+# gitversion.cmake
 # Copyright (C) 2014  Belledonne Communications, Grenoble France
 #
 ############################################################################
diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt
index 0ae15ce76..6fcf96392 100644
--- a/share/CMakeLists.txt
+++ b/share/CMakeLists.txt
@@ -20,8 +20,24 @@
 #
 ############################################################################
 
-install(FILES archived-rootca.pem
-	RENAME rootca.pem
+if(APPLE)
+	find_program(OPENSSL_PROGRAM openssl)
+	find_program(SED_PROGRAM sed)
+	execute_process(
+		COMMAND ${OPENSSL_PROGRAM} version -d
+		OUTPUT_VARIABLE OPENSSL_VERSION
+		OUTPUT_STRIP_TRAILING_WHITESPACE
+	)
+	execute_process(
+		COMMAND ${SED_PROGRAM} "s/OPENSSLDIR: \"\(.*\)\"/\1/" "${OPENSSL_VERSION}"
+		OUTPUT_VARIABLE HTTPS_CA_DIR
+		OUTPUT_STRIP_TRAILING_WHITESPACE
+	)
+endif()
+
+execute_process(COMMAND ${CMAKE_COMMAND} -DHTTPS_CA_DIR=${HTTPS_CA_DIR} -DWORK_DIR=${CMAKE_CURRENT_SOURCE_DIR} -DOUTPUT_DIR=${CMAKE_CURRENT_BINARY_DIR} -P ${CMAKE_CURRENT_SOURCE_DIR}/rootca.cmake)
+
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/rootca.pem
 	DESTINATION ${PACKAGE_DATA_DIR}/linphone
 	PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
 )
diff --git a/share/rootca.cmake b/share/rootca.cmake
new file mode 100644
index 000000000..d988b778e
--- /dev/null
+++ b/share/rootca.cmake
@@ -0,0 +1,40 @@
+############################################################################
+# rootca.cmake
+# Copyright (C) 2014  Belledonne Communications, Grenoble France
+#
+############################################################################
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# 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.
+#
+############################################################################
+
+if(HTTPS_CA_DIR)
+	set(ENV{HTTPS_CA_DIR} "${HTTPS_CA_DIR}")
+endif()
+
+execute_process(
+	COMMAND ${CMAKE_COMMAND} -E remove "fresh-rootca.pem"
+	WORKING_DIRECTORY ${OUTPUT_DIR}
+)
+execute_process(
+	COMMAND "../scripts/mk-ca-bundle.pl" "${OUTPUT_DIR}/fresh-rootca.pem"
+	WORKING_DIRECTORY ${WORK_DIR}
+)
+if(EXISTS "${OUTPUT_DIR}/fresh-rootca.pem")
+	file(RENAME "${OUTPUT_DIR}/fresh-rootca.pem" "${OUTPUT_DIR}/rootca.pem")
+else()
+	file(COPY "${WORK_DIR}/archived-rootca.pem" DESTINATION "${OUTPUT_DIR}")
+	file(RENAME "${OUTPUT_DIR}/archived-rootca.pem" "${OUTPUT_DIR}/rootca.pem")
+endif()

From d4d078189749d2820ee4c7b9a18e5d7890b549bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
 <francois.grisez@belledonne-communications.com>
Date: Fri, 28 Nov 2014 11:04:51 +0100
Subject: [PATCH 073/496] Fix "Call/Call with mkv file player" tester when opus
 is not supported by mediastreamer2

---
 tester/call_tester.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tester/call_tester.c b/tester/call_tester.c
index ad5ee315d..6b21e2bd6 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -2104,7 +2104,12 @@ static void call_with_mkv_file_player(void) {
 	player=linphone_call_get_player(linphone_core_get_current_call(marie->lc));
 	CU_ASSERT_PTR_NOT_NULL(player);
 	if (player){
-		CU_ASSERT_TRUE(linphone_player_open(player,hellomkv,on_eof,marie)==0);
+		int res = linphone_player_open(player,hellomkv,on_eof,marie);
+		if(!ms_filter_codec_supported("opus")) {
+			CU_ASSERT_EQUAL(res, -1);
+			goto end;
+		}
+		CU_ASSERT_EQUAL(res, 0);
 		CU_ASSERT_TRUE(linphone_player_start(player)==0);
 		CU_ASSERT_TRUE(wait_for_until(pauline->lc,marie->lc,&marie->stat.number_of_player_eof,1,12000));
 		linphone_player_close(player);

From 1fb767e2ad060d7c4222b4c8239ffdf3351a0195 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Fri, 28 Nov 2014 15:32:33 +0100
Subject: [PATCH 074/496] Fix HTTPS_CA_DIR definition on Mac OS X when building
 with CMake.

---
 share/CMakeLists.txt | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt
index 6fcf96392..58c575c90 100644
--- a/share/CMakeLists.txt
+++ b/share/CMakeLists.txt
@@ -22,17 +22,12 @@
 
 if(APPLE)
 	find_program(OPENSSL_PROGRAM openssl)
-	find_program(SED_PROGRAM sed)
 	execute_process(
 		COMMAND ${OPENSSL_PROGRAM} version -d
 		OUTPUT_VARIABLE OPENSSL_VERSION
 		OUTPUT_STRIP_TRAILING_WHITESPACE
 	)
-	execute_process(
-		COMMAND ${SED_PROGRAM} "s/OPENSSLDIR: \"\(.*\)\"/\1/" "${OPENSSL_VERSION}"
-		OUTPUT_VARIABLE HTTPS_CA_DIR
-		OUTPUT_STRIP_TRAILING_WHITESPACE
-	)
+	string(REGEX REPLACE "OPENSSLDIR: \"(.*)\"" "\\1" HTTPS_CA_DIR "${OPENSSL_VERSION}")
 endif()
 
 execute_process(COMMAND ${CMAKE_COMMAND} -DHTTPS_CA_DIR=${HTTPS_CA_DIR} -DWORK_DIR=${CMAKE_CURRENT_SOURCE_DIR} -DOUTPUT_DIR=${CMAKE_CURRENT_BINARY_DIR} -P ${CMAKE_CURRENT_SOURCE_DIR}/rootca.cmake)

From 23232b101fb876a2ea6a53e5d2e22fa86aefb377 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Fri, 28 Nov 2014 16:00:00 +0100
Subject: [PATCH 075/496] Handle libnotify support when building with CMake.

---
 CMakeLists.txt                                | 22 ++++++--
 .../FindLinphone.cmake                        |  4 +-
 cmake/FindNotify.cmake                        | 56 +++++++++++++++++++
 config.h.cmake                                |  1 +
 gtk/CMakeLists.txt                            |  4 ++
 5 files changed, 79 insertions(+), 8 deletions(-)
 rename FindLinphone.cmake => cmake/FindLinphone.cmake (98%)
 create mode 100644 cmake/FindNotify.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7d91afd8e..babea3ee9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,9 +41,9 @@ option(ENABLE_DATE "Use build date in internal version number." NO)
 option(ENABLE_GTK_UI "Turn on or off compilation of gtk interface." YES)
 option(ENABLE_LDAP "Enable LDAP support." NO)
 option(ENABLE_MSG_STORAGE "Turn on compilation of message storage." YES)
-option(ENABLE_NOTIFY "Enable libnotify support." YES)
+cmake_dependent_option(ENABLE_NOTIFY "Enable libnotify support." YES "ENABLE_GTK_UI" NO)
 option(ENABLE_RELATIVE_PREFIX "Find resources relatively to the installation directory." NO)
-option(ENABLE_TOOLS "Turn on or off compilation of console interface" YES)
+option(ENABLE_TOOLS "Turn on or off compilation of tools." YES)
 option(ENABLE_TUNNEL "Turn on compilation of tunnel support." NO)
 option(ENABLE_TUTORIALS "Enable compilation of tutorials." YES)
 option(ENABLE_UNIT_TESTS "Enable compilation of unit tests." YES)
@@ -52,13 +52,14 @@ option(ENABLE_VIDEO "Build with video support." YES)
 cmake_dependent_option(ENABLE_ASSISTANT "Turn on assistant compiling." YES "ENABLE_GTK_UI" NO)
 
 
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_PREFIX_PATH}/share/cmake/Modules)
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_PREFIX_PATH}/share/cmake/Modules")
 
 include(CheckIncludeFile)
 include(CheckSymbolExists)
 
 if(MSVC)
-	list(APPEND CMAKE_REQUIRED_INCLUDES ${CMAKE_PREFIX_PATH}/include/MSVC)
+	list(APPEND CMAKE_REQUIRED_INCLUDES "${CMAKE_PREFIX_PATH}/include/MSVC")
 endif()
 
 find_package(BelleSIP REQUIRED)
@@ -82,7 +83,16 @@ if(ENABLE_TUNNEL)
 	find_package(Tunnel)
 	if(NOT TUNNEL_FOUND)
 		message(WARNING "Could not find the tunnel library!")
-		set(ENABLE_TUNNEL OFF CACHE BOOL "Enable tunnel support" FORCE)
+		set(ENABLE_TUNNEL OFF CACHE BOOL "Enable tunnel support." FORCE)
+	endif()
+endif()
+if(ENABLE_NOTIFY)
+	find_package(Notify)
+	if(NOTIFY_FOUND)
+		set(HAVE_NOTIFY4 1)
+	else()
+		message(WARNING "Could not find the notify library!")
+		set(ENABLE_NOTIFY OFF CACHE BOOL "Enable libnotify support." FORCE)
 	endif()
 endif()
 
@@ -157,7 +167,7 @@ if(ENABLE_UNIT_TESTS)
 endif()
 
 
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/FindLinphone.cmake
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindLinphone.cmake
 	DESTINATION share/cmake/Modules
 	PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
 )
diff --git a/FindLinphone.cmake b/cmake/FindLinphone.cmake
similarity index 98%
rename from FindLinphone.cmake
rename to cmake/FindLinphone.cmake
index 6c6871330..065e1c865 100644
--- a/FindLinphone.cmake
+++ b/cmake/FindLinphone.cmake
@@ -1,5 +1,5 @@
 ############################################################################
-# FindLinphone.txt
+# FindLinphone.cmake
 # Copyright (C) 2014  Belledonne Communications, Grenoble France
 #
 ############################################################################
@@ -33,7 +33,7 @@ find_package(MS2 REQUIRED)
 find_package(XML2 REQUIRED)
 find_package(BelleSIP REQUIRED)
 
-set(_LINPHONEROOT_PATHS
+set(_LINPHONE_ROOT_PATHS
 	${WITH_LINPHONE}
 	${CMAKE_INSTALL_PREFIX}
 )
diff --git a/cmake/FindNotify.cmake b/cmake/FindNotify.cmake
new file mode 100644
index 000000000..26bd5bac1
--- /dev/null
+++ b/cmake/FindNotify.cmake
@@ -0,0 +1,56 @@
+############################################################################
+# FindNotify.cmake
+# Copyright (C) 2014  Belledonne Communications, Grenoble France
+#
+############################################################################
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# 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.
+#
+############################################################################
+#
+# - Find the notify include file and library
+#
+#  NOTIFY_FOUND - system has linphone
+#  NOTIFY_INCLUDE_DIRS - the linphone include directory
+#  NOTIFY_LIBRARIES - The libraries needed to use linphone
+
+set(_NOTIFY_ROOT_PATHS
+	${WITH_NOTIFY}
+	${CMAKE_INSTALL_PREFIX}
+)
+
+find_path(NOTIFY_INCLUDE_DIRS
+	NAMES libnotify/notify.h
+	HINTS _NOTIFY_ROOT_PATHS
+	PATH_SUFFIXES include
+)
+
+if(NOTIFY_INCLUDE_DIRS)
+	set(HAVE_LIBNOTIFY_NOTIFY_H 1)
+endif()
+
+find_library(NOTIFY_LIBRARIES
+	NAMES notify
+	HINTS ${_NOTIFY_ROOT_PATHS}
+	PATH_SUFFIXES bin lib
+)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Notify
+	DEFAULT_MSG
+	NOTIFY_INCLUDE_DIRS NOTIFY_LIBRARIES HAVE_LIBNOTIFY_NOTIFY_H
+)
+
+mark_as_advanced(NOTIFY_INCLUDE_DIRS NOTIFY_LIBRARIES HAVE_LIBNOTIFY_NOTIFY_H)
diff --git a/config.h.cmake b/config.h.cmake
index a7020d97a..9690bff27 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -36,5 +36,6 @@
 #define PACKAGE_DATA_DIR "${PACKAGE_DATA_DIR}"
 #define PACKAGE_SOUND_DIR "${PACKAGE_SOUND_DIR}"
 
+#cmakedefine HAVE_NOTIFY4
 #cmakedefine HAVE_CU_GET_SUITE 1
 #cmakedefine HAVE_CU_CURSES 1
\ No newline at end of file
diff --git a/gtk/CMakeLists.txt b/gtk/CMakeLists.txt
index 6bc50e5e9..e5d66561b 100644
--- a/gtk/CMakeLists.txt
+++ b/gtk/CMakeLists.txt
@@ -69,6 +69,10 @@ add_executable(linphone-gtk ${SOURCE_FILES})
 set_target_properties(linphone-gtk PROPERTIES OUTPUT_NAME linphone)
 target_include_directories(linphone-gtk PUBLIC ${GTK2_INCLUDE_DIRS})
 target_link_libraries(linphone-gtk linphone ${GTK2_LIBRARIES})
+if(ENABLE_NOTIFY)
+	target_include_directories(linphone-gtk PUBLIC ${NOTIFY_INCLUDE_DIRS})
+	target_link_libraries(linphone-gtk ${NOTIFY_LIBRARIES})
+endif()
 
 install(TARGETS linphone-gtk
 	RUNTIME DESTINATION bin

From ea4c24e84e2e953d92400dbad7f2842d3c5f9040 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
 <francois.grisez@belledonne-communications.com>
Date: Fri, 28 Nov 2014 16:32:20 +0100
Subject: [PATCH 076/496] Fix "Player/Local MKV file" liblinphone's tester

---
 tester/player_tester.c | 32 ++++++++++----------------------
 1 file changed, 10 insertions(+), 22 deletions(-)

diff --git a/tester/player_tester.c b/tester/player_tester.c
index 2894b92e7..8f0c5af43 100644
--- a/tester/player_tester.c
+++ b/tester/player_tester.c
@@ -17,24 +17,7 @@
 */
 
 #include "liblinphone_tester.h"
-
-static const char *_get_default_video_renderer(void){
-#ifdef WIN32
-	return "MSDrawDibDisplay";
-#elif defined(ANDROID)
-	return "MSAndroidDisplay";
-#elif __APPLE__ && !defined(__ios)
-	return "MSOSXGLDisplay";
-#elif defined (HAVE_XV)
-	return "MSX11Video";
-#elif defined(HAVE_GL)
-	return "MSGLXVideo";
-#elif defined(__ios)
-	return "IOSDisplay";
-#else
-	return "MSVideoOut";
-#endif
-}
+#include <mediastreamer2/mediastream.h>
 
 static bool_t wait_for_eof(bool_t *eof, int *time,int time_refresh, int timeout) {
 	while(*time < timeout && !*eof) {
@@ -49,7 +32,7 @@ static void eof_callback(LinphonePlayer *player, void *user_data) {
 	*eof = TRUE;
 }
 
-static void play_file(const char *filename, bool_t unsupported_format) {
+static void play_file(const char *filename, bool_t unsupported_format, const char *audio_mime, const char *video_mime) {
 	LinphoneCoreManager *lc_manager;
 	LinphonePlayer *player;
 	int res, time = 0;
@@ -59,12 +42,15 @@ static void play_file(const char *filename, bool_t unsupported_format) {
 	CU_ASSERT_PTR_NOT_NULL(lc_manager);
 	if(lc_manager == NULL) return;
 
-	player = linphone_core_create_local_player(lc_manager->lc, ms_snd_card_manager_get_default_card(ms_snd_card_manager_get()), _get_default_video_renderer(), 0);
+	player = linphone_core_create_local_player(lc_manager->lc, ms_snd_card_manager_get_default_card(ms_snd_card_manager_get()), video_stream_get_default_video_renderer(), 0);
 	CU_ASSERT_PTR_NOT_NULL(player);
 	if(player == NULL) goto fail;
 
 	res = linphone_player_open(player, filename, eof_callback, &eof);
-	if(unsupported_format) {
+	if(unsupported_format
+			|| (audio_mime == NULL && video_mime == NULL)
+			|| (video_mime == NULL && audio_mime && !ms_filter_codec_supported(audio_mime))
+			|| (audio_mime == NULL && video_mime && !ms_filter_codec_supported(video_mime))) {
 		CU_ASSERT_EQUAL(res, -1);
 	} else {
 		CU_ASSERT_EQUAL(res, 0);
@@ -85,7 +71,9 @@ static void play_file(const char *filename, bool_t unsupported_format) {
 
 static void playing_test(void) {
 	char *filename = ms_strdup_printf("%s/sounds/hello_opus_h264.mkv", liblinphone_tester_file_prefix);
-	play_file(filename, !linphone_local_player_matroska_supported());
+	const char *audio_mime = "opus";
+	const char *video_mime = "h264";
+	play_file(filename, !linphone_local_player_matroska_supported(), audio_mime, video_mime);
 	ms_free(filename);
 }
 

From 1bb6ebed6cc02fef789f1d1fb091cef50a9858d5 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Fri, 28 Nov 2014 17:11:21 +0100
Subject: [PATCH 077/496] fix crash in vp8 depacketizer

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 042feb909..42600e413 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 042feb9096af9fbe1a45e8c76b4121d738329e1e
+Subproject commit 42600e413e5007402fe1969f1dcd016cede3a8be

From 3f53d5f045d65efcf58182c4979aba68d1711830 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@linphone.org>
Date: Fri, 28 Nov 2014 17:23:39 +0100
Subject: [PATCH 078/496] Reworked jni layer to be able to set multiple vtables
 for callbacks in android app

---
 coreapi/linphonecore.c      |  22 +-
 coreapi/linphonecore.h      |  25 +-
 coreapi/linphonecore_jni.cc | 556 ++++++++++++++++++++----------------
 coreapi/private.h           |   1 +
 4 files changed, 358 insertions(+), 246 deletions(-)

diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 9a7053d07..f89bc5643 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -7025,16 +7025,34 @@ LinphoneCoreVTable *linphone_core_v_table_new() {
 	return ms_new0(LinphoneCoreVTable,1);
 }
 
+void linphone_core_v_table_set_user_data(LinphoneCoreVTable *table, void *data) {
+	if (table->user_data) {
+		ms_free(table->user_data);
+	}
+	table->user_data = data;
+}
+
+void* linphone_core_v_table_get_user_data(LinphoneCoreVTable *table) {
+	return table->user_data;
+}
+
 void linphone_core_v_table_destroy(LinphoneCoreVTable* table) {
+	if (table->user_data) {
+		ms_free(table->user_data);
+	}
 	ms_free(table);
 }
+
+LinphoneCoreVTable *linphone_core_get_current_vtable(LinphoneCore *lc) {
+	return lc->current_vtable;
+}
+ 
 #define NOTIFY_IF_EXIST(function_name) \
 	MSList* iterator; \
 	ms_message ("Linphone core [%p] notifying [%s]",lc,#function_name);\
 	for (iterator=lc->vtables; iterator!=NULL; iterator=iterator->next) \
-			if (((LinphoneCoreVTable*)(iterator->data))->function_name)\
+			if ((lc->current_vtable=((LinphoneCoreVTable*)(iterator->data)))->function_name)\
 				((LinphoneCoreVTable*)(iterator->data))->function_name
-
 void linphone_core_notify_global_state_changed(LinphoneCore *lc, LinphoneGlobalState gstate, const char *message) {
 	NOTIFY_IF_EXIST(global_state_changed)(lc,gstate,message);
 }
diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h
index e3ad83ff7..ac72246ad 100644
--- a/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@ -1558,7 +1558,7 @@ typedef enum _LinphoneCoreLogCollectionUploadState {
  * @param gstate the global state
  * @param message informational message.
  */
-typedef void (*LinphoneCoreGlobalStateChangedCb )(LinphoneCore *lc, LinphoneGlobalState gstate, const char *message);
+typedef void (*LinphoneCoreGlobalStateChangedCb)(LinphoneCore *lc, LinphoneGlobalState gstate, const char *message);
 /**
  * Call state notification callback.
  * @param lc the LinphoneCore
@@ -1809,6 +1809,7 @@ typedef struct _LinphoneCoreVTable{
 	LinphoneCoreNetworkReachableCb network_reachable; /**< Callback to report IP network status (I.E up/down )*/
 	LinphoneCoreLogCollectionUploadStateChangedCb log_collection_upload_state_changed; /**< Callback to upload collected logs */
 	LinphoneCoreLogCollectionUploadProgressIndicationCb log_collection_upload_progress_indication; /**< Callback to indicate log collection upload progress */
+	void *user_data;
 } LinphoneCoreVTable;
 
 /**
@@ -1817,6 +1818,28 @@ typedef struct _LinphoneCoreVTable{
  */
 LINPHONE_PUBLIC LinphoneCoreVTable *linphone_core_v_table_new();
 
+/**
+ * Sets a user data pointer in the vtable.
+ * @param table the vtable
+ * @param data the user data to attach
+ */
+LINPHONE_PUBLIC void linphone_core_v_table_set_user_data(LinphoneCoreVTable *table, void *data);
+
+/**
+ * Gets a user data pointer in the vtable.
+ * @param table the vtable
+ * @returns the data attached to the vtable
+ */
+LINPHONE_PUBLIC void* linphone_core_v_table_get_user_data(LinphoneCoreVTable *table);
+
+/**
+ * Gets the current VTable.
+ * This is meant only to be called from a callback to be able to get the user_data associated with the vtable that called the callback.
+ * @param lc the linphonecore
+ * @returns the vtable that called the last callback 
+ */
+LINPHONE_PUBLIC LinphoneCoreVTable *linphone_core_get_current_vtable(LinphoneCore *lc);
+
 /**
  * Destroy a vtable.
  * @param vtable to be destroyed
diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index be72e283f..128da582d 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -163,70 +163,154 @@ extern "C" void Java_org_linphone_core_LinphoneCoreFactoryImpl_setDebugMode(JNIE
 }
 // LinphoneCore
 
+/*
+ * returns the java LinphoneProxyConfig associated with a C LinphoneProxyConfig.
+**/
+jobject getProxy(JNIEnv *env, LinphoneProxyConfig *proxy, jobject core){
+	jobject jobj=0;
+
+	if (proxy!=NULL){
+		jclass proxyClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneProxyConfigImpl"));
+		jmethodID proxyCtrId = env->GetMethodID(proxyClass,"<init>", "(Lorg/linphone/core/LinphoneCoreImpl;J)V");
+		
+		void *up=linphone_proxy_config_get_user_data(proxy);
+
+		if (up==NULL){
+			jobj=env->NewObject(proxyClass,proxyCtrId,core,(jlong)proxy);
+			linphone_proxy_config_set_user_data(proxy,(void*)env->NewWeakGlobalRef(jobj));
+			linphone_proxy_config_ref(proxy);
+		}else{
+			//promote the weak ref to local ref
+			jobj=env->NewLocalRef((jobject)up);
+			if (jobj == NULL){
+				//the weak ref was dead
+				jobj=env->NewObject(proxyClass,proxyCtrId,core,(jlong)proxy);
+				linphone_proxy_config_set_user_data(proxy,(void*)env->NewWeakGlobalRef(jobj));
+			}
+		}
+		env->DeleteGlobalRef(proxyClass);
+	}
+	return jobj;
+}
+
+jobject getCall(JNIEnv *env, LinphoneCall *call){
+	jobject jobj=0;
+
+	if (call!=NULL){
+		jclass callClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneCallImpl"));
+		jmethodID callCtrId = env->GetMethodID(callClass,"<init>", "(J)V");
+		
+		void *up=linphone_call_get_user_pointer(call);
+
+		if (up==NULL){
+			jobj=env->NewObject(callClass,callCtrId,(jlong)call);
+			jobj=env->NewGlobalRef(jobj);
+			linphone_call_set_user_pointer(call,(void*)jobj);
+			linphone_call_ref(call);
+		}else{
+			jobj=(jobject)up;
+		}
+		env->DeleteGlobalRef(callClass);
+	}
+	return jobj;
+}
+
+jobject getChatMessage(JNIEnv *env, LinphoneChatMessage *msg){
+	jobject jobj = 0;
+
+	if (msg != NULL){
+		jclass chatMessageClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneChatMessageImpl"));
+		jmethodID chatMessageCtrId = env->GetMethodID(chatMessageClass,"<init>", "(J)V");
+		
+		void *up = linphone_chat_message_get_user_data(msg);
+
+		if (up == NULL) {
+			jobj = env->NewObject(chatMessageClass,chatMessageCtrId,(jlong)linphone_chat_message_ref(msg));
+			jobj = env->NewGlobalRef(jobj);
+			linphone_chat_message_set_user_data(msg,(void*)jobj);
+		} else {
+			jobj = (jobject)up;
+		}
+		env->DeleteGlobalRef(chatMessageClass);
+	}
+	return jobj;
+}
+
+jobject getEvent(JNIEnv *env, LinphoneEvent *lev){
+	if (lev==NULL) return NULL;
+	jobject jev=(jobject)linphone_event_get_user_data(lev);
+	if (jev==NULL){
+		jclass linphoneEventClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneEventImpl"));
+		jmethodID linphoneEventCtrId = env->GetMethodID(linphoneEventClass,"<init>", "(J)V");
+		
+		jev=env->NewObject(linphoneEventClass,linphoneEventCtrId,(jlong)linphone_event_ref(lev));
+		jev=env->NewGlobalRef(jev);
+		linphone_event_set_user_data(lev,jev);
+		
+		env->DeleteGlobalRef(linphoneEventClass);
+	}
+	return jev;
+}
+
 class LinphoneCoreData {
 public:
-	LinphoneCoreData(JNIEnv*  env, jobject lc,jobject alistener, jobject auserdata) {
-
+	LinphoneCoreData(JNIEnv *env, jobject lc, LinphoneCoreVTable *vTable, jobject alistener) {
 		core = env->NewGlobalRef(lc);
 		listener = env->NewGlobalRef(alistener);
-		userdata = auserdata?env->NewGlobalRef(auserdata):0;
-		memset(&vTable,0,sizeof(vTable));
-		vTable.show = showInterfaceCb;
-		vTable.auth_info_requested = authInfoRequested;
-		vTable.display_status = displayStatusCb;
-		vTable.display_message = displayMessageCb;
-		vTable.display_warning = displayMessageCb;
-		vTable.global_state_changed = globalStateChange;
-		vTable.registration_state_changed = registrationStateChange;
-		vTable.call_state_changed = callStateChange;
-		vTable.call_encryption_changed = callEncryptionChange;
-		vTable.text_received = text_received;
-		vTable.message_received = message_received;
-		vTable.is_composing_received = is_composing_received;
-		vTable.dtmf_received = dtmf_received;
-		vTable.new_subscription_requested = new_subscription_requested;
-		vTable.notify_presence_received = notify_presence_received;
-		vTable.call_stats_updated = callStatsUpdated;
-		vTable.transfer_state_changed = transferStateChanged;
-		vTable.info_received = infoReceived;
-		vTable.subscription_state_changed=subscriptionStateChanged;
-		vTable.notify_received=notifyReceived;
-		vTable.publish_state_changed=publishStateChanged;
-		vTable.configuring_status=configuringStatus;
-		vTable.file_transfer_progress_indication=fileTransferProgressIndication;
-		vTable.file_transfer_send=fileTransferSend;
-		vTable.file_transfer_recv=fileTransferRecv;
-
-		listenerClass = (jclass)env->NewGlobalRef(env->GetObjectClass( alistener));
+		
+		memset(vTable, 0, sizeof(LinphoneCoreVTable));
+		
+		listenerClass = (jclass)env->NewGlobalRef(env->GetObjectClass(alistener));
 
 		/*displayStatus(LinphoneCore lc,String message);*/
 		displayStatusId = env->GetMethodID(listenerClass,"displayStatus","(Lorg/linphone/core/LinphoneCore;Ljava/lang/String;)V");
+		if (displayStatusId) {
+			vTable->display_status = displayStatusCb;
+		}
 
 		/*void generalState(LinphoneCore lc,int state); */
 		globalStateId = env->GetMethodID(listenerClass,"globalState","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneCore$GlobalState;Ljava/lang/String;)V");
 		globalStateClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneCore$GlobalState"));
 		globalStateFromIntId = env->GetStaticMethodID(globalStateClass,"fromInt","(I)Lorg/linphone/core/LinphoneCore$GlobalState;");
-
+		if (globalStateId) {
+			vTable->global_state_changed = globalStateChange;
+		}
+		
 		/*registrationState(LinphoneCore lc, LinphoneProxyConfig cfg, LinphoneCore.RegistrationState cstate, String smessage);*/
 		registrationStateId = env->GetMethodID(listenerClass,"registrationState","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneProxyConfig;Lorg/linphone/core/LinphoneCore$RegistrationState;Ljava/lang/String;)V");
 		registrationStateClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneCore$RegistrationState"));
 		registrationStateFromIntId = env->GetStaticMethodID(registrationStateClass,"fromInt","(I)Lorg/linphone/core/LinphoneCore$RegistrationState;");
-
+		if (registrationStateId) {
+			vTable->registration_state_changed = registrationStateChange;
+		}
+		
 		/*callState(LinphoneCore lc, LinphoneCall call, LinphoneCall.State cstate,String message);*/
 		callStateId = env->GetMethodID(listenerClass,"callState","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneCall;Lorg/linphone/core/LinphoneCall$State;Ljava/lang/String;)V");
 		callStateClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneCall$State"));
 		callStateFromIntId = env->GetStaticMethodID(callStateClass,"fromInt","(I)Lorg/linphone/core/LinphoneCall$State;");
-
+		if (callStateId) {
+			vTable->call_state_changed = callStateChange;
+		}
+		
 		transferStateId = env->GetMethodID(listenerClass,"transferState","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneCall;Lorg/linphone/core/LinphoneCall$State;)V");
+		if (transferStateId) {
+			vTable->transfer_state_changed = transferStateChanged;
+		}
 
 		/*callStatsUpdated(LinphoneCore lc, LinphoneCall call, LinphoneCallStats stats);*/
 		callStatsUpdatedId = env->GetMethodID(listenerClass, "callStatsUpdated", "(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneCall;Lorg/linphone/core/LinphoneCallStats;)V");
+		if (callStatsUpdatedId) {
+			vTable->call_stats_updated = callStatsUpdated;
+		}
 
 		chatMessageStateClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneChatMessage$State"));
 		chatMessageStateFromIntId = env->GetStaticMethodID(chatMessageStateClass,"fromInt","(I)Lorg/linphone/core/LinphoneChatMessage$State;");
 
 		/*callEncryption(LinphoneCore lc, LinphoneCall call, boolean encrypted,String auth_token);*/
-		callEncryptionChangedId=env->GetMethodID(listenerClass,"callEncryptionChanged","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneCall;ZLjava/lang/String;)V");
+		callEncryptionChangedId = env->GetMethodID(listenerClass,"callEncryptionChanged","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneCall;ZLjava/lang/String;)V");
+		if (callEncryptionChangedId) {
+			vTable->call_encryption_changed = callEncryptionChange;
+		}
 
 		/*void ecCalibrationStatus(LinphoneCore.EcCalibratorStatus status, int delay_ms, Object data);*/
 		ecCalibrationStatusId = env->GetMethodID(listenerClass,"ecCalibrationStatus","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneCore$EcCalibratorStatus;ILjava/lang/Object;)V");
@@ -235,28 +319,88 @@ public:
 
 		/*void newSubscriptionRequest(LinphoneCore lc, LinphoneFriend lf, String url)*/
 		newSubscriptionRequestId = env->GetMethodID(listenerClass,"newSubscriptionRequest","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneFriend;Ljava/lang/String;)V");
+		if (newSubscriptionRequestId) {
+			vTable->new_subscription_requested = new_subscription_requested;
+		}
 
 		authInfoRequestedId = env->GetMethodID(listenerClass,"authInfoRequested","(Lorg/linphone/core/LinphoneCore;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V");
+		if (authInfoRequestedId) {
+			vTable->auth_info_requested = authInfoRequested;
+		}
 
 		/*void notifyPresenceReceived(LinphoneCore lc, LinphoneFriend lf);*/
 		notifyPresenceReceivedId = env->GetMethodID(listenerClass,"notifyPresenceReceived","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneFriend;)V");
+		if (notifyPresenceReceivedId) {
+			vTable->notify_presence_received = notify_presence_received;
+		}
 
 		/*void textReceived(LinphoneCore lc, LinphoneChatRoom cr,LinphoneAddress from,String message);*/
 		textReceivedId = env->GetMethodID(listenerClass,"textReceived","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneChatRoom;Lorg/linphone/core/LinphoneAddress;Ljava/lang/String;)V");
+		if (textReceivedId) {
+			vTable->text_received = text_received;
+		}
+		
 		messageReceivedId = env->GetMethodID(listenerClass,"messageReceived","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneChatRoom;Lorg/linphone/core/LinphoneChatMessage;)V");
+		if (messageReceivedId) {
+			vTable->message_received = message_received;
+		}
+		
 		isComposingReceivedId = env->GetMethodID(listenerClass,"isComposingReceived","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneChatRoom;)V");
+		if (isComposingReceivedId) {
+			vTable->is_composing_received = is_composing_received;
+		}
+		
 		dtmfReceivedId = env->GetMethodID(listenerClass,"dtmfReceived","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneCall;I)V");
-		infoReceivedId = env->GetMethodID(listenerClass,"infoReceived",
-										  "(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneCall;Lorg/linphone/core/LinphoneInfoMessage;)V");
+		if (dtmfReceivedId) {
+			vTable->dtmf_received = dtmf_received;
+		}
+		
+		infoReceivedId = env->GetMethodID(listenerClass,"infoReceived", "(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneCall;Lorg/linphone/core/LinphoneInfoMessage;)V");
+		if (infoReceivedId) {
+			vTable->info_received = infoReceived;
+		}
 
-		subscriptionStateId = env->GetMethodID(listenerClass,"subscriptionStateChanged",
-										  "(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneEvent;Lorg/linphone/core/SubscriptionState;)V");
-		publishStateId = env->GetMethodID(listenerClass,"publishStateChanged",
-										  "(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneEvent;Lorg/linphone/core/PublishState;)V");
-		notifyRecvId = env->GetMethodID(listenerClass,"notifyReceived",
-										  "(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneEvent;Ljava/lang/String;Lorg/linphone/core/LinphoneContent;)V");
+		subscriptionStateId = env->GetMethodID(listenerClass,"subscriptionStateChanged", "(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneEvent;Lorg/linphone/core/SubscriptionState;)V");
+		subscriptionStateClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/SubscriptionState"));
+		subscriptionStateFromIntId = env->GetStaticMethodID(subscriptionStateClass,"fromInt","(I)Lorg/linphone/core/SubscriptionState;");
+		if (subscriptionStateId) {
+			vTable->subscription_state_changed = subscriptionStateChanged;
+		}
+		
+		publishStateId = env->GetMethodID(listenerClass,"publishStateChanged", "(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneEvent;Lorg/linphone/core/PublishState;)V");
+		publishStateClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/PublishState"));
+		publishStateFromIntId = env->GetStaticMethodID(publishStateClass,"fromInt","(I)Lorg/linphone/core/PublishState;");
+		if (publishStateId) {
+			vTable->publish_state_changed = publishStateChanged;
+		}
+		
+		notifyRecvId = env->GetMethodID(listenerClass,"notifyReceived", "(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneEvent;Ljava/lang/String;Lorg/linphone/core/LinphoneContent;)V");
+		if (notifyRecvId) {
+			vTable->notify_received = notifyReceived;
+		}
 
+		configuringStateId = env->GetMethodID(listenerClass,"configuringStatus","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneCore$RemoteProvisioningState;Ljava/lang/String;)V");
+		configuringStateClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneCore$RemoteProvisioningState"));
+		configuringStateFromIntId = env->GetStaticMethodID(configuringStateClass,"fromInt","(I)Lorg/linphone/core/LinphoneCore$RemoteProvisioningState;");
+		if (configuringStateId) {
+			vTable->configuring_status = configuringStatus;
+		}
 
+		fileTransferProgressIndicationId = env->GetMethodID(listenerClass, "fileTransferProgressIndication", "(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneChatMessage;Lorg/linphone/core/LinphoneContent;I)V");
+		if (fileTransferProgressIndicationId) {
+			vTable->file_transfer_progress_indication = fileTransferProgressIndication;
+		}
+		
+		fileTransferSendId = env->GetMethodID(listenerClass, "fileTransferSend", "(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneChatMessage;Lorg/linphone/core/LinphoneContent;Ljava/nio/ByteBuffer;I)I");
+		if (fileTransferSendId) {
+			vTable->file_transfer_send = fileTransferSend;
+		}
+
+		fileTransferRecvId = env->GetMethodID(listenerClass, "fileTransferRecv", "(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneChatMessage;Lorg/linphone/core/LinphoneContent;[BI)V");
+		if (fileTransferRecvId) {
+			vTable->file_transfer_recv = fileTransferRecv;
+		}
+		
 		proxyClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneProxyConfigImpl"));
 		proxyCtrId = env->GetMethodID(proxyClass,"<init>", "(Lorg/linphone/core/LinphoneCoreImpl;J)V");
 
@@ -270,10 +414,10 @@ public:
 		chatRoomCtrId = env->GetMethodID(chatRoomClass,"<init>", "(J)V");
 
 		friendClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneFriendImpl"));;
-		friendCtrId =env->GetMethodID(friendClass,"<init>", "(J)V");
+		friendCtrId = env->GetMethodID(friendClass,"<init>", "(J)V");
 
 		addressClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneAddressImpl"));
-		addressCtrId =env->GetMethodID(addressClass,"<init>", "(J)V");
+		addressCtrId = env->GetMethodID(addressClass,"<init>", "(J)V");
 
 		callStatsClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneCallStatsImpl"));
 		callStatsId = env->GetMethodID(callStatsClass, "<init>", "(JJ)V");
@@ -286,22 +430,8 @@ public:
 		linphoneEventClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneEventImpl"));
 		linphoneEventCtrId = env->GetMethodID(linphoneEventClass,"<init>", "(J)V");
 
-		subscriptionStateClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/SubscriptionState"));
-		subscriptionStateFromIntId = env->GetStaticMethodID(subscriptionStateClass,"fromInt","(I)Lorg/linphone/core/SubscriptionState;");
-
-		publishStateClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/PublishState"));
-		publishStateFromIntId = env->GetStaticMethodID(publishStateClass,"fromInt","(I)Lorg/linphone/core/PublishState;");
-
 		subscriptionDirClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/SubscriptionDir"));
 		subscriptionDirFromIntId = env->GetStaticMethodID(subscriptionDirClass,"fromInt","(I)Lorg/linphone/core/SubscriptionDir;");
-
-		configuringStateId = env->GetMethodID(listenerClass,"configuringStatus","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneCore$RemoteProvisioningState;Ljava/lang/String;)V");
-		configuringStateClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneCore$RemoteProvisioningState"));
-		configuringStateFromIntId = env->GetStaticMethodID(configuringStateClass,"fromInt","(I)Lorg/linphone/core/LinphoneCore$RemoteProvisioningState;");
-
-		fileTransferProgressIndicationId = env->GetMethodID(listenerClass, "fileTransferProgressIndication", "(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneChatMessage;Lorg/linphone/core/LinphoneContent;I)V");
-		fileTransferSendId = env->GetMethodID(listenerClass, "fileTransferSend", "(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneChatMessage;Lorg/linphone/core/LinphoneContent;Ljava/nio/ByteBuffer;I)I");
-		fileTransferRecvId = env->GetMethodID(listenerClass, "fileTransferRecv", "(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneChatMessage;Lorg/linphone/core/LinphoneContent;[BI)V");
 	}
 
 	~LinphoneCoreData() {
@@ -309,7 +439,6 @@ public:
 		jvm->AttachCurrentThread(&env,NULL);
 		env->DeleteGlobalRef(core);
 		env->DeleteGlobalRef(listener);
-		if (userdata) env->DeleteGlobalRef(userdata);
 		env->DeleteGlobalRef(listenerClass);
 		env->DeleteGlobalRef(globalStateClass);
 		env->DeleteGlobalRef(configuringStateClass);
@@ -328,7 +457,6 @@ public:
 	}
 	jobject core;
 	jobject listener;
-	jobject userdata;
 
 	jclass listenerClass;
 	jmethodID displayStatusId;
@@ -414,13 +542,7 @@ public:
 	jmethodID fileTransferRecvId;
 
 	LinphoneCoreVTable vTable;
-
-	static void showInterfaceCb(LinphoneCore *lc) {
-
-	}
-	static void byeReceivedCb(LinphoneCore *lc, const char *from) {
-
-	}
+	
 	static void displayStatusCb(LinphoneCore *lc, const char *message) {
 		JNIEnv *env = 0;
 		jint result = jvm->AttachCurrentThread(&env,NULL);
@@ -428,11 +550,9 @@ public:
 			ms_error("cannot attach VM");
 			return;
 		}
-		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_get_user_data(lc);
+		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
+		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
 		env->CallVoidMethod(lcData->listener,lcData->displayStatusId,lcData->core,message ? env->NewStringUTF(message) : NULL);
-	}
-	static void displayMessageCb(LinphoneCore *lc, const char *message) {
-
 	}
 	static void authInfoRequested(LinphoneCore *lc, const char *realm, const char *username, const char *domain) {
 		JNIEnv *env = 0;
@@ -441,7 +561,8 @@ public:
 			ms_error("cannot attach VM");
 			return;
 		}
-		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_get_user_data(lc);
+		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
+		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
 		env->CallVoidMethod(lcData->listener,
 							lcData->authInfoRequestedId,
 							lcData->core,
@@ -456,38 +577,14 @@ public:
 			ms_error("cannot attach VM");
 			return;
 		}
-		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_get_user_data(lc);
+		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
+		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
 		env->CallVoidMethod(lcData->listener
 							,lcData->globalStateId
 							,lcData->core
 							,env->CallStaticObjectMethod(lcData->globalStateClass,lcData->globalStateFromIntId,(jint)gstate),
 							message ? env->NewStringUTF(message) : NULL);
 	}
-	/*
-	 * returns the java LinphoneProxyConfig associated with a C LinphoneProxyConfig.
-	**/
-	jobject getProxy(JNIEnv *env , LinphoneProxyConfig *proxy, jobject core){
-		jobject jobj=0;
-
-		if (proxy!=NULL){
-			void *up=linphone_proxy_config_get_user_data(proxy);
-
-			if (up==NULL){
-				jobj=env->NewObject(proxyClass,proxyCtrId,core,(jlong)proxy);
-				linphone_proxy_config_set_user_data(proxy,(void*)env->NewWeakGlobalRef(jobj));
-				linphone_proxy_config_ref(proxy);
-			}else{
-				//promote the weak ref to local ref
-				jobj=env->NewLocalRef((jobject)up);
-				if (jobj == NULL){
-					//the weak ref was dead
-					jobj=env->NewObject(proxyClass,proxyCtrId,core,(jlong)proxy);
-					linphone_proxy_config_set_user_data(proxy,(void*)env->NewWeakGlobalRef(jobj));
-				}
-			}
-		}
-		return jobj;
-	}
 	static void registrationStateChange(LinphoneCore *lc, LinphoneProxyConfig* proxy,LinphoneRegistrationState state,const char* message) {
 		JNIEnv *env = 0;
 		jint result = jvm->AttachCurrentThread(&env,NULL);
@@ -496,31 +593,15 @@ public:
 			ms_error("cannot attach VM");
 			return;
 		}
-		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_get_user_data(lc);
+		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
+		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
 		env->CallVoidMethod(lcData->listener
 							,lcData->registrationStateId
 							,lcData->core
-							,(jproxy=lcData->getProxy(env,proxy,lcData->core))
+							,(jproxy=getProxy(env,proxy,lcData->core))
 							,env->CallStaticObjectMethod(lcData->registrationStateClass,lcData->registrationStateFromIntId,(jint)state),
 							message ? env->NewStringUTF(message) : NULL);
 	}
-	jobject getCall(JNIEnv *env , LinphoneCall *call){
-		jobject jobj=0;
-
-		if (call!=NULL){
-			void *up=linphone_call_get_user_pointer(call);
-
-			if (up==NULL){
-				jobj=env->NewObject(callClass,callCtrId,(jlong)call);
-				jobj=env->NewGlobalRef(jobj);
-				linphone_call_set_user_pointer(call,(void*)jobj);
-				linphone_call_ref(call);
-			}else{
-				jobj=(jobject)up;
-			}
-		}
-		return jobj;
-	}
 
 	static void callStateChange(LinphoneCore *lc, LinphoneCall* call,LinphoneCallState state,const char* message) {
 		JNIEnv *env = 0;
@@ -530,11 +611,12 @@ public:
 			ms_error("cannot attach VM");
 			return;
 		}
-		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_get_user_data(lc);
+		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
+		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
 		env->CallVoidMethod(lcData->listener
 							,lcData->callStateId
 							,lcData->core
-							,(jcall=lcData->getCall(env,call))
+							,(jcall=getCall(env,call))
 							,env->CallStaticObjectMethod(lcData->callStateClass,lcData->callStateFromIntId,(jint)state),
 							message ? env->NewStringUTF(message) : NULL);
 		if (state==LinphoneCallReleased){
@@ -549,11 +631,12 @@ public:
 			ms_error("cannot attach VM");
 			return;
 		}
-		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_get_user_data(lc);
+		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
+		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
 		env->CallVoidMethod(lcData->listener
 							,lcData->callEncryptionChangedId
 							,lcData->core
-							,lcData->getCall(env,call)
+							,getCall(env,call)
 							,encrypted
 							,authentication_token ? env->NewStringUTF(authentication_token) : NULL);
 	}
@@ -564,7 +647,8 @@ public:
 			ms_error("cannot attach VM");
 			return;
 		}
-		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_get_user_data(lc);
+		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
+		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
 		env->CallVoidMethod(lcData->listener
 							,lcData->notifyPresenceReceivedId
 							,lcData->core
@@ -577,7 +661,8 @@ public:
 			ms_error("cannot attach VM");
 			return;
 		}
-		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_get_user_data(lc);
+		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
+		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
 		env->CallVoidMethod(lcData->listener
 							,lcData->newSubscriptionRequestId
 							,lcData->core
@@ -591,11 +676,12 @@ public:
 			ms_error("cannot attach VM");
 			return;
 		}
-		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_get_user_data(lc);
+		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
+		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
 		env->CallVoidMethod(lcData->listener
 							,lcData->dtmfReceivedId
 							,lcData->core
-							,lcData->getCall(env,call)
+							,getCall(env,call)
 							,dtmf);
 	}
 	static void text_received(LinphoneCore *lc, LinphoneChatRoom *room, const LinphoneAddress *from, const char *message) {
@@ -605,7 +691,8 @@ public:
 			ms_error("cannot attach VM");
 			return;
 		}
-		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_get_user_data(lc);
+		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
+		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
 		env->CallVoidMethod(lcData->listener
 							,lcData->textReceivedId
 							,lcData->core
@@ -613,38 +700,23 @@ public:
 							,env->NewObject(lcData->addressClass,lcData->addressCtrId,(jlong)from)
 							,message ? env->NewStringUTF(message) : NULL);
 	}
-	jobject getChatMessage(JNIEnv *env , LinphoneChatMessage *msg){
-		jobject jobj = 0;
-
-		if (msg != NULL){
-			void *up = linphone_chat_message_get_user_data(msg);
-
-			if (up == NULL) {
-				jobj = env->NewObject(chatMessageClass,chatMessageCtrId,(jlong)linphone_chat_message_ref(msg));
-				jobj = env->NewGlobalRef(jobj);
-				linphone_chat_message_set_user_data(msg,(void*)jobj);
-			} else {
-				jobj = (jobject)up;
-			}
-		}
-		return jobj;
-	}
 	static void message_received(LinphoneCore *lc, LinphoneChatRoom *room, LinphoneChatMessage *msg) {
-			JNIEnv *env = 0;
-			jobject jmsg;
-			jint result = jvm->AttachCurrentThread(&env,NULL);
-			if (result != 0) {
-				ms_error("cannot attach VM");
-				return;
-			}
-			LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_get_user_data(lc);
-			/*note: we call linphone_chat_message_ref() because the application does not acquire the object when invoked from a callback*/
-			env->CallVoidMethod(lcData->listener
-								,lcData->messageReceivedId
-								,lcData->core
-								,env->NewObject(lcData->chatRoomClass,lcData->chatRoomCtrId,(jlong)room)
-								,(jmsg = lcData->getChatMessage(env, msg)));
+		JNIEnv *env = 0;
+		jobject jmsg;
+		jint result = jvm->AttachCurrentThread(&env,NULL);
+		if (result != 0) {
+			ms_error("cannot attach VM");
+			return;
 		}
+		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
+		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
+		/*note: we call linphone_chat_message_ref() because the application does not acquire the object when invoked from a callback*/
+		env->CallVoidMethod(lcData->listener
+							,lcData->messageReceivedId
+							,lcData->core
+							,env->NewObject(lcData->chatRoomClass,lcData->chatRoomCtrId,(jlong)room)
+							,(jmsg = getChatMessage(env, msg)));
+	}
 	static void is_composing_received(LinphoneCore *lc, LinphoneChatRoom *room) {
 		JNIEnv *env = 0;
 		jint result = jvm->AttachCurrentThread(&env,NULL);
@@ -652,7 +724,8 @@ public:
 			ms_error("cannot attach VM");
 			return;
 		}
-		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_get_user_data(lc);
+		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
+		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
 		env->CallVoidMethod(lcData->listener
 							,lcData->isComposingReceivedId
 							,lcData->core
@@ -665,7 +738,8 @@ public:
 			ms_error("cannot attach VM");
 			return;
 		}
-		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_get_user_data(lc);
+		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
+		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
 		env->CallVoidMethod(lcData->listener
 							,lcData->ecCalibrationStatusId
 							,lcData->core
@@ -687,9 +761,10 @@ public:
 			ms_error("cannot attach VM");
 			return;
 		}
-		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_get_user_data(lc);
+		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
+		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
 		statsobj = env->NewObject(lcData->callStatsClass, lcData->callStatsId, (jlong)call, (jlong)stats);
-		callobj = lcData->getCall(env, call);
+		callobj = getCall(env, call);
 		if (stats->type == LINPHONE_CALL_STATS_AUDIO)
 			env->CallVoidMethod(callobj, lcData->callSetAudioStatsId, statsobj);
 		else
@@ -704,11 +779,12 @@ public:
 			ms_error("cannot attach VM");
 			return;
 		}
-		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_get_user_data(lc);
+		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
+		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
 		env->CallVoidMethod(lcData->listener
 							,lcData->transferStateId
 							,lcData->core
-							,(jcall=lcData->getCall(env,call))
+							,(jcall=getCall(env,call))
 							,env->CallStaticObjectMethod(lcData->callStateClass,lcData->callStateFromIntId,(jint)remote_call_state)
 							);
 	}
@@ -720,24 +796,15 @@ public:
 			return;
 		}
 		LinphoneInfoMessage *copy_info=linphone_info_message_copy(info);
-		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_get_user_data(lc);
+		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
+		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
 		env->CallVoidMethod(lcData->listener
 							,lcData->infoReceivedId
 							,lcData->core
-							,lcData->getCall(env,call)
+							,getCall(env,call)
 							,env->NewObject(lcData->infoMessageClass,lcData->infoMessageCtor,(jlong)copy_info)
 							);
 	}
-	jobject getEvent(JNIEnv *env, LinphoneEvent *lev){
-		if (lev==NULL) return NULL;
-		jobject jev=(jobject)linphone_event_get_user_data(lev);
-		if (jev==NULL){
-			jev=env->NewObject(linphoneEventClass,linphoneEventCtrId,(jlong)linphone_event_ref(lev));
-			jev=env->NewGlobalRef(jev);
-			linphone_event_set_user_data(lev,jev);
-		}
-		return jev;
-	}
 	static void subscriptionStateChanged(LinphoneCore *lc, LinphoneEvent *ev, LinphoneSubscriptionState state){
 		JNIEnv *env = 0;
 		jint result = jvm->AttachCurrentThread(&env,NULL);
@@ -747,8 +814,9 @@ public:
 			ms_error("cannot attach VM");
 			return;
 		}
-		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_get_user_data(lc);
-		jevent=lcData->getEvent(env,ev);
+		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
+		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
+		jevent=getEvent(env,ev);
 		jstate=env->CallStaticObjectMethod(lcData->subscriptionStateClass,lcData->subscriptionStateFromIntId,(jint)state);
 		env->CallVoidMethod(lcData->listener
 							,lcData->subscriptionStateId
@@ -771,8 +839,9 @@ public:
 			ms_error("cannot attach VM");
 			return;
 		}
-		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_get_user_data(lc);
-		jevent=lcData->getEvent(env,ev);
+		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
+		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
+		jevent=getEvent(env,ev);
 		jstate=env->CallStaticObjectMethod(lcData->publishStateClass,lcData->publishStateFromIntId,(jint)state);
 		env->CallVoidMethod(lcData->listener
 							,lcData->publishStateId
@@ -789,8 +858,9 @@ public:
 			ms_error("cannot attach VM");
 			return;
 		}
-		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_get_user_data(lc);
-		jevent=lcData->getEvent(env,ev);
+		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
+		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
+		jevent=getEvent(env,ev);
 		env->CallVoidMethod(lcData->listener
 							,lcData->notifyRecvId
 							,lcData->core
@@ -807,7 +877,8 @@ public:
 			ms_error("cannot attach VM");
 			return;
 		}
-		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_get_user_data(lc);
+		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
+		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
 		env->CallVoidMethod(lcData->listener, lcData->configuringStateId, lcData->core, env->CallStaticObjectMethod(lcData->configuringStateClass,lcData->configuringStateFromIntId,(jint)status), message ? env->NewStringUTF(message) : NULL);
 	}
 
@@ -820,11 +891,12 @@ public:
 			ms_error("cannot attach VM");
 			return;
 		}
-		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_get_user_data(lc);
+		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
+		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
 		env->CallVoidMethod(lcData->listener,
 				lcData->fileTransferProgressIndicationId,
 				lcData->core,
-				(jmsg = lcData->getChatMessage(env, message)),
+				(jmsg = getChatMessage(env, message)),
 				content ? create_java_linphone_content(env, content) : NULL,
 				progress);
 	}
@@ -838,11 +910,12 @@ public:
 			ms_error("cannot attach VM");
 			return;
 		}
-		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_get_user_data(lc);
+		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
+		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
 		*size = env->CallIntMethod(lcData->listener,
 				lcData->fileTransferSendId,
 				lcData->core,
-				(jmsg = lcData->getChatMessage(env, message)),
+				(jmsg = getChatMessage(env, message)),
 				content ? create_java_linphone_content(env, content) : NULL,
 				buff ? env->NewDirectByteBuffer(buff, asking) : NULL,
 				asking);
@@ -856,7 +929,8 @@ public:
 			ms_error("cannot attach VM");
 			return;
 		}
-		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_get_user_data(lc);
+		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
+		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
 
 		jbyteArray jbytes = env->NewByteArray(size);
 		env->SetByteArrayRegion(jbytes, 0, size, (jbyte*)buff);
@@ -864,7 +938,7 @@ public:
 		env->CallVoidMethod(lcData->listener,
 				lcData->fileTransferRecvId,
 				lcData->core,
-				(jmsg = lcData->getChatMessage(env, message)),
+				(jmsg = getChatMessage(env, message)),
 				content ? create_java_linphone_content(env, content) : NULL,
 				jbytes,
 				size);
@@ -872,15 +946,18 @@ public:
 };
 
 extern "C" jlong Java_org_linphone_core_LinphoneCoreImpl_newLinphoneCore(JNIEnv*  env
-		,jobject  thiz
+		,jobject thiz
 		,jobject jlistener
 		,jstring juserConfig
 		,jstring jfactoryConfig
-		,jobject  juserdata){
+		,jobject juserdata){
 
 	const char* userConfig = juserConfig?env->GetStringUTFChars(juserConfig, NULL):NULL;
 	const char* factoryConfig = jfactoryConfig?env->GetStringUTFChars(jfactoryConfig, NULL):NULL;
-	LinphoneCoreData* ldata = new LinphoneCoreData(env,thiz,jlistener,juserdata);
+	
+	LinphoneCoreVTable *vTable = linphone_core_v_table_new();
+	LinphoneCoreData* ldata = new LinphoneCoreData(env, thiz, vTable, jlistener);
+	linphone_core_v_table_set_user_data(vTable, ldata);
 
 	ms_init(); // Initialize mediastreamer2 before loading the plugins
 
@@ -906,23 +983,31 @@ extern "C" jlong Java_org_linphone_core_LinphoneCoreImpl_newLinphoneCore(JNIEnv*
 	libmswebrtc_init();
 #endif
 
-	jlong nativePtr = (jlong)linphone_core_new(	&ldata->vTable
-			,userConfig
-			,factoryConfig
-			,ldata);
-
+	jobject core = env->NewGlobalRef(thiz);
+	jlong nativePtr = (jlong)linphone_core_new(vTable, userConfig, factoryConfig, core);
 
 	if (userConfig) env->ReleaseStringUTFChars(juserConfig, userConfig);
 	if (factoryConfig) env->ReleaseStringUTFChars(jfactoryConfig, factoryConfig);
 	return nativePtr;
 }
-extern "C" void Java_org_linphone_core_LinphoneCoreImpl_delete(JNIEnv*  env
-		,jobject  thiz
-		,jlong lc) {
-	LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_get_user_data((LinphoneCore*)lc);
+extern "C" void Java_org_linphone_core_LinphoneCoreImpl_delete(JNIEnv* env, jobject thiz, jlong lc) {
+	jobject core = (jobject)linphone_core_get_user_data((LinphoneCore*)lc);
 	linphone_core_destroy((LinphoneCore*)lc);
 	ms_exit();
-	delete lcData;
+	if (core) {
+		env->DeleteGlobalRef(core);
+	}
+}
+
+extern "C" void Java_org_linphone_core_LinphoneCoreImpl_AddListener(JNIEnv* env, jobject thiz, jlong lc, jobject jlistener) {
+	LinphoneCoreVTable *vTable = linphone_core_v_table_new();
+	LinphoneCoreData* ldata = new LinphoneCoreData(env, thiz, vTable, jlistener);
+	linphone_core_v_table_set_user_data(vTable, ldata);
+	linphone_core_add_listener((LinphoneCore*)lc, vTable);
+}
+
+extern "C" void Java_org_linphone_core_LinphoneCoreImpl_RemoveListener(JNIEnv* env, jobject thiz, jlong lc) {
+	//TODO
 }
 
 extern "C" jint Java_org_linphone_core_LinphoneCoreImpl_migrateToMultiTransport(JNIEnv*  env
@@ -992,15 +1077,14 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setDefaultProxyConfig(	J
 		,jlong pc) {
 	linphone_core_set_default_proxy((LinphoneCore*)lc,(LinphoneProxyConfig*)pc);
 }
-
+	
 extern "C" jobject Java_org_linphone_core_LinphoneCoreImpl_getDefaultProxyConfig(JNIEnv*  env
 		,jobject  thiz
 		,jlong lc) {
 	LinphoneProxyConfig *config=0;
-	LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_get_user_data((LinphoneCore*)lc);
 	linphone_core_get_default_proxy((LinphoneCore*)lc,&config);
 	if(config != 0) {
-		jobject jproxy = lcData->getProxy(env,config,lcData->core);
+		jobject jproxy = getProxy(env,config,thiz);
 		return jproxy;
 	} else {
 		return NULL;
@@ -1012,11 +1096,10 @@ extern "C" jobjectArray Java_org_linphone_core_LinphoneCoreImpl_getProxyConfigLi
 	int proxyCount = ms_list_size(proxies);
 	jclass cls = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneProxyConfigImpl"));
 	jobjectArray jProxies = env->NewObjectArray(proxyCount,cls,NULL);
-	LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_get_user_data((LinphoneCore*)lc);
 
 	for (int i = 0; i < proxyCount; i++ ) {
 		LinphoneProxyConfig* proxy = (LinphoneProxyConfig*)proxies->data;
-		jobject jproxy = lcData->getProxy(env,proxy,lcData->core);
+		jobject jproxy = getProxy(env,proxy,thiz);
 		if(jproxy != NULL){
 			env->SetObjectArrayElement(jProxies, i, jproxy);
 		}
@@ -1098,17 +1181,15 @@ extern "C" jobject Java_org_linphone_core_LinphoneCoreImpl_invite(JNIEnv* env
 		,jlong lc
 		,jstring juri) {
 	const char* uri = env->GetStringUTFChars(juri, NULL);
-	LinphoneCoreData *lcd=(LinphoneCoreData*)linphone_core_get_user_data((LinphoneCore*)lc);
 	LinphoneCall* lCall = linphone_core_invite((LinphoneCore*)lc,uri);
 	env->ReleaseStringUTFChars(juri, uri);
-	return lcd->getCall(env,lCall);
+	return getCall(env,lCall);
 }
 extern "C" jobject Java_org_linphone_core_LinphoneCoreImpl_inviteAddress(JNIEnv* env
 		,jobject  thiz
 		,jlong lc
 		,jlong to) {
-	LinphoneCoreData *lcd=(LinphoneCoreData*)linphone_core_get_user_data((LinphoneCore*)lc);
-	return lcd->getCall(env, linphone_core_invite_address((LinphoneCore*)lc,(LinphoneAddress*)to));
+	return getCall(env, linphone_core_invite_address((LinphoneCore*)lc,(LinphoneAddress*)to));
 }
 
 extern "C" void Java_org_linphone_core_LinphoneCoreImpl_terminateCall(JNIEnv* env
@@ -1458,9 +1539,7 @@ extern "C" jobject Java_org_linphone_core_LinphoneCoreImpl_getCurrentCall(JNIEnv
 																			,jobject  thiz
 																			,jlong lc
 																			) {
-	LinphoneCoreData *lcdata=(LinphoneCoreData*)linphone_core_get_user_data((LinphoneCore*)lc);
-
-	return lcdata->getCall(env,linphone_core_get_current_call((LinphoneCore*)lc));
+	return getCall(env,linphone_core_get_current_call((LinphoneCore*)lc));
 }
 extern "C" void Java_org_linphone_core_LinphoneCoreImpl_addFriend(JNIEnv*  env
 																			,jobject  thiz
@@ -2384,9 +2463,8 @@ JNIEXPORT jint JNICALL Java_org_linphone_core_LinphoneCallImpl_getTransferState(
 JNIEXPORT jobject JNICALL Java_org_linphone_core_LinphoneCallImpl_getTransfererCall(JNIEnv *env, jobject jCall, jlong callptr){
 	LinphoneCall *call=(LinphoneCall*)callptr;
 	LinphoneCore *lc=linphone_call_get_core(call);
-	LinphoneCoreData *lcdata=(LinphoneCoreData*)linphone_core_get_user_data(lc);
 	LinphoneCall *ret=linphone_call_get_transferer_call(call);
-	return lcdata->getCall(env,ret);
+	return getCall(env,ret);
 }
 
 /*
@@ -2397,9 +2475,8 @@ JNIEXPORT jobject JNICALL Java_org_linphone_core_LinphoneCallImpl_getTransfererC
 JNIEXPORT jobject JNICALL Java_org_linphone_core_LinphoneCallImpl_getTransferTargetCall(JNIEnv *env, jobject jCall, jlong callptr){
 	LinphoneCall *call=(LinphoneCall*)callptr;
 	LinphoneCore *lc=linphone_call_get_core(call);
-	LinphoneCoreData *lcdata=(LinphoneCoreData*)linphone_core_get_user_data(lc);
 	LinphoneCall *ret=linphone_call_get_transfer_target_call(call);
-	return lcdata->getCall(env,ret);
+	return getCall(env,ret);
 }
 
 extern "C" void Java_org_linphone_core_LinphoneCallImpl_enableEchoCancellation(	JNIEnv*  env
@@ -2429,8 +2506,7 @@ extern "C" jboolean Java_org_linphone_core_LinphoneCallImpl_isEchoLimiterEnabled
 extern "C" jobject Java_org_linphone_core_LinphoneCallImpl_getReplacedCall(	JNIEnv*  env
 																		,jobject  thiz
 																		,jlong ptr) {
-	LinphoneCoreData *lcd=(LinphoneCoreData*)linphone_core_get_user_data(linphone_call_get_core((LinphoneCall*)ptr));
-	return lcd->getCall(env,linphone_call_get_replaced_call((LinphoneCall*)ptr));
+	return getCall(env,linphone_call_get_replaced_call((LinphoneCall*)ptr));
 }
 
 extern "C" jfloat Java_org_linphone_core_LinphoneCallImpl_getCurrentQuality(	JNIEnv*  env
@@ -2507,8 +2583,8 @@ extern "C" jobject Java_org_linphone_core_LinphoneFriendImpl_getCore(JNIEnv*  en
 																		,jlong ptr) {
 	LinphoneCore *lc=linphone_friend_get_core((LinphoneFriend*)ptr);
 	if (lc!=NULL){
-		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_get_user_data(lc);
-		return lcData->core;
+		jobject core = (jobject)linphone_core_get_user_data(lc);
+		return core;
 	}
 	return NULL;
 }
@@ -2876,12 +2952,14 @@ static void chat_room_impl_callback(LinphoneChatMessage* msg, LinphoneChatMessag
 	jmethodID method = env->GetMethodID(clazz, "onLinphoneChatMessageStateChanged","(Lorg/linphone/core/LinphoneChatMessage;Lorg/linphone/core/LinphoneChatMessage$State;)V");
 	jobject jmessage=(jobject)linphone_chat_message_get_user_data(msg);
 	LinphoneCore *lc = linphone_chat_room_get_lc(linphone_chat_message_get_chat_room(msg));
-	LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_get_user_data(lc);
+	
+	jclass chatMessageStateClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneChatMessage$State"));
+	jmethodID chatMessageStateFromIntId = env->GetStaticMethodID(chatMessageStateClass,"fromInt","(I)Lorg/linphone/core/LinphoneChatMessage$State;");
 	env->CallVoidMethod(
 			listener,
 			method,
 			jmessage,
-			env->CallStaticObjectMethod(lcData->chatMessageStateClass,lcData->chatMessageStateFromIntId,(jint)state));
+			env->CallStaticObjectMethod(chatMessageStateClass,chatMessageStateFromIntId,(jint)state));
 
 	if (state == LinphoneChatMessageStateDelivered || state == LinphoneChatMessageStateNotDelivered) {
 		env->DeleteGlobalRef(listener);
@@ -2894,8 +2972,8 @@ extern "C" jobject Java_org_linphone_core_LinphoneChatRoomImpl_getCore(JNIEnv*
 																		,jobject  thiz
 																		,jlong chatroom_ptr){
 	LinphoneCore *lc=linphone_chat_room_get_core((LinphoneChatRoom*)chatroom_ptr);
-	LinphoneCoreData *lcd=(LinphoneCoreData*)linphone_core_get_user_data(lc);
-	return lcd->core;
+	jobject core = (jobject)linphone_core_get_user_data(lc);
+	return core;
 }
 
 extern "C" void Java_org_linphone_core_LinphoneChatRoomImpl_sendMessage2(JNIEnv*  env
@@ -3134,8 +3212,7 @@ extern "C" void Java_org_linphone_core_LinphoneCallImpl_stopRecording(JNIEnv *en
 }
 
 extern "C" jobject Java_org_linphone_core_LinphoneCoreImpl_inviteAddressWithParams(JNIEnv *env, jobject thiz, jlong lc, jlong addr, jlong params){
-	LinphoneCoreData *lcd=(LinphoneCoreData*)linphone_core_get_user_data((LinphoneCore*)lc);
-	return  lcd->getCall(env,linphone_core_invite_address_with_params((LinphoneCore *)lc, (const LinphoneAddress *)addr, (const LinphoneCallParams *)params));
+	return  getCall(env,linphone_core_invite_address_with_params((LinphoneCore *)lc, (const LinphoneAddress *)addr, (const LinphoneCallParams *)params));
 }
 
 extern "C" jint Java_org_linphone_core_LinphoneCoreImpl_updateAddressWithParams(JNIEnv *env, jobject thiz, jlong lc, jlong call, jlong params){
@@ -3386,9 +3463,8 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_terminateAllCalls(JNIEnv
 	linphone_core_terminate_all_calls((LinphoneCore *) pCore);
 }
 extern "C" jobject Java_org_linphone_core_LinphoneCoreImpl_getCall(JNIEnv *env,jobject thiz,jlong pCore,jint position) {
-	LinphoneCoreData *lcd=(LinphoneCoreData*)linphone_core_get_user_data((LinphoneCore*)pCore);
 	LinphoneCall* lCall = (LinphoneCall*) ms_list_nth_data(linphone_core_get_calls((LinphoneCore *) pCore),position);
-	return lcd->getCall(env,lCall);
+	return getCall(env,lCall);
 }
 extern "C" jint Java_org_linphone_core_LinphoneCoreImpl_getCallsNb(JNIEnv *env,jobject thiz,jlong pCore) {
 	return (jint)ms_list_size(linphone_core_get_calls((LinphoneCore *) pCore));
@@ -3405,8 +3481,7 @@ extern "C" jint Java_org_linphone_core_LinphoneCoreImpl_transferCallToAnother(JN
 }
 
 extern "C" jobject Java_org_linphone_core_LinphoneCoreImpl_startReferedCall(JNIEnv *env, jobject thiz, jlong lc, jlong callptr, jlong params){
-	LinphoneCoreData *lcd=(LinphoneCoreData*)linphone_core_get_user_data((LinphoneCore*)lc);
-	return  lcd->getCall(env,linphone_core_start_refered_call((LinphoneCore *)lc, (LinphoneCall *)callptr, (const LinphoneCallParams *)params));
+	return  getCall(env,linphone_core_start_refered_call((LinphoneCore *)lc, (LinphoneCall *)callptr, (const LinphoneCallParams *)params));
 }
 
 extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setZrtpSecretsCache(JNIEnv *env,jobject thiz,jlong pCore, jstring jFile) {
@@ -3423,8 +3498,7 @@ extern "C" jobject Java_org_linphone_core_LinphoneCoreImpl_findCallFromUri(JNIEn
 	const char* cUri=env->GetStringUTFChars(jUri, NULL);
 	const LinphoneCall *call=linphone_core_find_call_from_uri((const LinphoneCore *) pCore,cUri);
 	env->ReleaseStringUTFChars(jUri, cUri);
-	LinphoneCoreData *lcdata=(LinphoneCoreData*)linphone_core_get_user_data((LinphoneCore*)pCore);
-	return (jobject) lcdata->getCall(env,(LinphoneCall*)call);
+	return (jobject) getCall(env,(LinphoneCall*)call);
 }
 
 
@@ -3794,7 +3868,6 @@ JNIEXPORT jobject JNICALL Java_org_linphone_core_LinphoneCoreImpl_subscribe(JNIE
 	LinphoneEvent *ev;
 	jobject jev=NULL;
 	const char *evname=env->GetStringUTFChars(jevname,NULL);
-	LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_get_user_data(lc);
 
 	if (jtype){
 		content.type=(char*)env->GetStringUTFChars(jtype,NULL);
@@ -3812,7 +3885,7 @@ JNIEXPORT jobject JNICALL Java_org_linphone_core_LinphoneCoreImpl_subscribe(JNIE
 	}
 	env->ReleaseStringUTFChars(jevname,evname);
 	if (ev){
-		jev=lcData->getEvent(env,ev);
+		jev=getEvent(env,ev);
 	}
 	return jev;
 }
@@ -3830,7 +3903,6 @@ JNIEXPORT jobject JNICALL Java_org_linphone_core_LinphoneCoreImpl_publish(JNIEnv
 	LinphoneEvent *ev;
 	jobject jev=NULL;
 	const char *evname=env->GetStringUTFChars(jevname,NULL);
-	LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_get_user_data(lc);
 
 	if (jtype){
 		content.type=(char*)env->GetStringUTFChars(jtype,NULL);
@@ -3848,7 +3920,7 @@ JNIEXPORT jobject JNICALL Java_org_linphone_core_LinphoneCoreImpl_publish(JNIEnv
 	}
 	env->ReleaseStringUTFChars(jevname,evname);
 	if (ev){
-		jev=lcData->getEvent(env,ev);
+		jev=getEvent(env,ev);
 	}
 	return jev;
 }
@@ -4094,8 +4166,8 @@ JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneCoreFactoryImpl__1setLogHa
 
 JNIEXPORT jobject JNICALL Java_org_linphone_core_LinphoneEventImpl_getCore(JNIEnv *env, jobject jobj, jlong evptr){
 	LinphoneCore *lc=linphone_event_get_core((LinphoneEvent*)evptr);
-	LinphoneCoreData *lcd=(LinphoneCoreData*)linphone_core_get_user_data(lc);
-	return lcd->core;
+	jobject core = (jobject)linphone_core_get_user_data(lc);
+	return core;
 }
 
 /*
@@ -4264,7 +4336,6 @@ JNIEXPORT jint JNICALL Java_org_linphone_core_LinphoneEventImpl_getSubscriptionS
 
 JNIEXPORT jobject JNICALL Java_org_linphone_core_LinphoneCoreImpl_createSubscribe(JNIEnv *env, jobject thiz, jlong jcore, jlong jaddr, jstring jeventname, jint expires) {
 	LinphoneCore *lc = (LinphoneCore*) jcore;
-	LinphoneCoreData* lcData = (LinphoneCoreData*) linphone_core_get_user_data(lc);
 	LinphoneAddress *addr = (LinphoneAddress*) jaddr;
 	LinphoneEvent *event;
 	jobject jevent = NULL;
@@ -4273,7 +4344,7 @@ JNIEXPORT jobject JNICALL Java_org_linphone_core_LinphoneCoreImpl_createSubscrib
 	event = linphone_core_create_subscribe(lc, addr, event_name, expires);
 	env->ReleaseStringUTFChars(jeventname, event_name);
 	if (event) {
-		jevent = lcData->getEvent(env, event);
+		jevent = getEvent(env, event);
 	}
 	return jevent;
 }
@@ -4298,7 +4369,6 @@ JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneEventImpl_sendSubscribe(JN
 
 JNIEXPORT jobject JNICALL Java_org_linphone_core_LinphoneCoreImpl_createPublish(JNIEnv *env, jobject thiz, jlong jcore, jlong jaddr, jstring jeventname, jint expires) {
 	LinphoneCore *lc = (LinphoneCore*) jcore;
-	LinphoneCoreData* lcData = (LinphoneCoreData*) linphone_core_get_user_data(lc);
 	LinphoneAddress *addr = (LinphoneAddress*) jaddr;
 	LinphoneEvent *event;
 	jobject jevent = NULL;
@@ -4307,7 +4377,7 @@ JNIEXPORT jobject JNICALL Java_org_linphone_core_LinphoneCoreImpl_createPublish(
 	event = linphone_core_create_publish(lc, addr, event_name, expires);
 	env->ReleaseStringUTFChars(jeventname, event_name);
 	if (event) {
-		jevent = lcData->getEvent(env, event);
+		jevent = getEvent(env, event);
 	}
 	return jevent;
 }
diff --git a/coreapi/private.h b/coreapi/private.h
index d9d1eeb07..0ce88fee5 100644
--- a/coreapi/private.h
+++ b/coreapi/private.h
@@ -784,6 +784,7 @@ struct _LinphoneCore
 	LinphoneReason chat_deny_code;
 	const char **supported_formats;
 	LinphoneContent *log_collection_upload_information;
+	LinphoneCoreVTable *current_vtable; // the latest vtable to call a callback, see linphone_core_get_current_vtable
 };
 
 

From e7e36bb329326b3eba0d2a836f85c13823728724 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Fri, 28 Nov 2014 18:03:52 +0100
Subject: [PATCH 079/496] add basic support for tel uri in incomming calls

---
 coreapi/bellesip_sal/sal_address_impl.c | 20 +++++++++++++++++---
 coreapi/bellesip_sal/sal_impl.c         | 23 ++++++++++++++++++-----
 coreapi/linphonecore.c                  |  4 ++++
 3 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/coreapi/bellesip_sal/sal_address_impl.c b/coreapi/bellesip_sal/sal_address_impl.c
index 024b83264..f51e421da 100644
--- a/coreapi/bellesip_sal/sal_address_impl.c
+++ b/coreapi/bellesip_sal/sal_address_impl.c
@@ -39,10 +39,13 @@ SalAddress * sal_address_clone(const SalAddress *addr){
 const char *sal_address_get_scheme(const SalAddress *addr){
 	belle_sip_header_address_t* header_addr = BELLE_SIP_HEADER_ADDRESS(addr);
 	belle_sip_uri_t* uri = belle_sip_header_address_get_uri(header_addr);
+	belle_generic_uri_t* generic_uri = belle_sip_header_address_get_absolute_uri(header_addr);
 	if (uri) {
 		if (belle_sip_uri_is_secure(uri)) return "sips";
 		else return "sip";
-	} else
+	} else if (generic_uri)
+		return belle_generic_uri_get_scheme(generic_uri);
+	else
 		return NULL;
 }
 
@@ -142,10 +145,21 @@ char *sal_address_as_string(const SalAddress *addr){
 
 char *sal_address_as_string_uri_only(const SalAddress *addr){
 	belle_sip_header_address_t* header_addr = BELLE_SIP_HEADER_ADDRESS(addr);
-	belle_sip_uri_t* uri = belle_sip_header_address_get_uri(header_addr);
+	belle_sip_uri_t* sip_uri = belle_sip_header_address_get_uri(header_addr);
+	belle_generic_uri_t* absolute_uri = belle_sip_header_address_get_absolute_uri(header_addr);
 	char tmp[1024]={0};
 	size_t off=0;
-	belle_sip_object_marshal((belle_sip_object_t*)uri,tmp,sizeof(tmp),&off);
+	belle_sip_object_t* uri;
+
+	if (sip_uri) {
+		uri=(belle_sip_object_t*)sip_uri;
+	} else if (absolute_uri) {
+		uri=(belle_sip_object_t*)absolute_uri;
+	} else {
+		ms_error("Cannot generate string for addr [%p] with null uri",addr);
+		return NULL;
+	}
+	belle_sip_object_marshal(uri,tmp,sizeof(tmp),&off);
 	return ms_strdup(tmp);
 }
 
diff --git a/coreapi/bellesip_sal/sal_impl.c b/coreapi/bellesip_sal/sal_impl.c
index 052c83971..1330f5269 100644
--- a/coreapi/bellesip_sal/sal_impl.c
+++ b/coreapi/bellesip_sal/sal_impl.c
@@ -204,7 +204,7 @@ static void process_request_event(void *ud, const belle_sip_request_event_t *eve
 	belle_sip_request_t* req = belle_sip_request_event_get_request(event);
 	belle_sip_dialog_t* dialog=belle_sip_request_event_get_dialog(event);
 	belle_sip_header_address_t* origin_address;
-	belle_sip_header_address_t* address;
+	belle_sip_header_address_t* address=NULL;
 	belle_sip_header_from_t* from_header;
 	belle_sip_header_to_t* to;
 	belle_sip_response_t* resp;
@@ -266,8 +266,14 @@ static void process_request_event(void *ud, const belle_sip_request_event_t *eve
 	}
 
 	if (!op->base.from_address)  {
-		address=belle_sip_header_address_create(belle_sip_header_address_get_displayname(BELLE_SIP_HEADER_ADDRESS(from_header))
-														,belle_sip_header_address_get_uri(BELLE_SIP_HEADER_ADDRESS(from_header)));
+		if (belle_sip_header_address_get_uri(BELLE_SIP_HEADER_ADDRESS(from_header)))
+			address=belle_sip_header_address_create(belle_sip_header_address_get_displayname(BELLE_SIP_HEADER_ADDRESS(from_header))
+					,belle_sip_header_address_get_uri(BELLE_SIP_HEADER_ADDRESS(from_header)));
+		else if ((belle_sip_header_address_get_absolute_uri(BELLE_SIP_HEADER_ADDRESS(from_header))))
+			address=belle_sip_header_address_create2(belle_sip_header_address_get_displayname(BELLE_SIP_HEADER_ADDRESS(from_header))
+					,belle_sip_header_address_get_absolute_uri(BELLE_SIP_HEADER_ADDRESS(from_header)));
+		else
+			ms_error("Cannot not find from uri from request [%p]",req);
 		sal_op_set_from_address(op,(SalAddress*)address);
 		belle_sip_object_unref(address);
 	}
@@ -278,8 +284,15 @@ static void process_request_event(void *ud, const belle_sip_request_event_t *eve
 
 	if (!op->base.to_address) {
 		to=belle_sip_message_get_header_by_type(BELLE_SIP_MESSAGE(req),belle_sip_header_to_t);
-		address=belle_sip_header_address_create(belle_sip_header_address_get_displayname(BELLE_SIP_HEADER_ADDRESS(to))
-												,belle_sip_header_address_get_uri(BELLE_SIP_HEADER_ADDRESS(to)));
+		if (belle_sip_header_address_get_uri(BELLE_SIP_HEADER_ADDRESS(to)))
+			address=belle_sip_header_address_create(belle_sip_header_address_get_displayname(BELLE_SIP_HEADER_ADDRESS(to))
+					,belle_sip_header_address_get_uri(BELLE_SIP_HEADER_ADDRESS(to)));
+		else if ((belle_sip_header_address_get_absolute_uri(BELLE_SIP_HEADER_ADDRESS(to))))
+			address=belle_sip_header_address_create2(belle_sip_header_address_get_displayname(BELLE_SIP_HEADER_ADDRESS(to))
+					,belle_sip_header_address_get_absolute_uri(BELLE_SIP_HEADER_ADDRESS(to)));
+		else
+			ms_error("Cannot not find to uri from request [%p]",req);
+
 		sal_op_set_to_address(op,(SalAddress*)address);
 		belle_sip_object_unref(address);
 	}
diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index f89bc5643..16de123a7 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -2801,6 +2801,10 @@ LinphoneProxyConfig * linphone_core_lookup_known_proxy(LinphoneCore *lc, const L
 	LinphoneProxyConfig *found_noreg_cfg=NULL;
 	LinphoneProxyConfig *default_cfg=lc->default_proxy;
 
+	if (linphone_address_get_domain(uri) == NULL) {
+		ms_message("cannot seach for proxy for uri [%p] if no domain set. returning default",uri);
+		return default_cfg;
+	}
 	/*return default proxy if it is matching the destination uri*/
 	if (default_cfg){
 		const char *domain=linphone_proxy_config_get_domain(default_cfg);

From 0204cb48606e0f82ed35687c254eb81090934c60 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Sun, 30 Nov 2014 09:42:50 +0100
Subject: [PATCH 080/496] update ms2

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 42600e413..06a14487a 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 42600e413e5007402fe1969f1dcd016cede3a8be
+Subproject commit 06a14487aa5acc0e3f0d4931c9a974762829d7bd

From 6045f50dc5a2d6840474e7fd939e956ce0c88612 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Mon, 1 Dec 2014 10:59:23 +0100
Subject: [PATCH 081/496] Fix compilation with CMake on Windows.

---
 CMakeLists.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index babea3ee9..6f762ad8e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -118,11 +118,11 @@ add_definitions(-DIN_LINPHONE)
 
 
 if(MSVC)
-	set(CMAKE_C_FLAGS "/W3")
-	set(CMAKE_CXX_FLAGS "/W3")
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W3")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W3")
 else()
-	set(CMAKE_C_FLAGS "-Wall -Wuninitialized -Wdeclaration-after-statement -fno-strict-aliasing -Werror")
-	set(CMAKE_CXX_FLAGS "-Wall -Wuninitialized -Werror")
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wuninitialized -Wdeclaration-after-statement -fno-strict-aliasing -Werror")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wuninitialized -Werror")
 	if(CMAKE_C_COMPILER_ID STREQUAL "Clang")
 		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Qunused-arguments -Wno-array-bounds")
 	endif()

From de2e98bd9635c49acd45d1d5b7d2bb900383e235 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@linphone.org>
Date: Mon, 1 Dec 2014 12:36:24 +0100
Subject: [PATCH 082/496] Added ClearException in jni layer to prevent crash
 when listener doesn't implement all callbacks + reworked linphonecorelistener

---
 .../core/tutorials/TutorialBuddyStatus.java   |   4 +-
 .../core/tutorials/TutorialChatRoom.java      |   4 +-
 .../core/tutorials/TutorialHelloWorld.java    |  10 +-
 .../core/tutorials/TutorialRegistration.java  |   4 +-
 coreapi/linphonecore_jni.cc                   |  73 ++--
 .../org/linphone/core/LinphoneCore.java       |  12 +
 .../linphone/core/LinphoneCoreListener.java   | 391 +++++++++---------
 .../org/linphone/core/LinphoneCoreImpl.java   |  12 +
 8 files changed, 291 insertions(+), 219 deletions(-)

diff --git a/coreapi/help/java/org/linphone/core/tutorials/TutorialBuddyStatus.java b/coreapi/help/java/org/linphone/core/tutorials/TutorialBuddyStatus.java
index 69d8b9869..a1db1a25d 100644
--- a/coreapi/help/java/org/linphone/core/tutorials/TutorialBuddyStatus.java
+++ b/coreapi/help/java/org/linphone/core/tutorials/TutorialBuddyStatus.java
@@ -34,7 +34,7 @@ import org.linphone.core.LinphoneCore.RegistrationState;
 import org.linphone.core.LinphoneCore.RemoteProvisioningState;
 import org.linphone.core.LinphoneCoreException;
 import org.linphone.core.LinphoneCoreFactory;
-import org.linphone.core.LinphoneCoreListener;
+import org.linphone.core.LinphoneCoreListener.LinphoneListener;
 import org.linphone.core.LinphoneEvent;
 import org.linphone.core.LinphoneFriend;
 import org.linphone.core.LinphoneFriend.SubscribePolicy;
@@ -60,7 +60,7 @@ import org.linphone.core.SubscriptionState;
  * @author Guillaume Beraudo
  *
  */
-public class TutorialBuddyStatus implements LinphoneCoreListener {
+public class TutorialBuddyStatus implements LinphoneListener {
 
 	private boolean running;
 	private TutorialNotifier TutorialNotifier;
diff --git a/coreapi/help/java/org/linphone/core/tutorials/TutorialChatRoom.java b/coreapi/help/java/org/linphone/core/tutorials/TutorialChatRoom.java
index f5a34746c..eff31682d 100644
--- a/coreapi/help/java/org/linphone/core/tutorials/TutorialChatRoom.java
+++ b/coreapi/help/java/org/linphone/core/tutorials/TutorialChatRoom.java
@@ -34,7 +34,7 @@ import org.linphone.core.LinphoneCore.RegistrationState;
 import org.linphone.core.LinphoneCore.RemoteProvisioningState;
 import org.linphone.core.LinphoneCoreException;
 import org.linphone.core.LinphoneCoreFactory;
-import org.linphone.core.LinphoneCoreListener;
+import org.linphone.core.LinphoneCoreListener.LinphoneListener;
 import org.linphone.core.LinphoneEvent;
 import org.linphone.core.LinphoneFriend;
 import org.linphone.core.LinphoneInfoMessage;
@@ -58,7 +58,7 @@ import org.linphone.core.SubscriptionState;
  * @author Guillaume Beraudo
  *
  */
-public class TutorialChatRoom implements LinphoneCoreListener, LinphoneChatMessage.StateListener {
+public class TutorialChatRoom implements LinphoneListener, LinphoneChatMessage.StateListener {
 	private boolean running;
 	private TutorialNotifier TutorialNotifier;
 
diff --git a/coreapi/help/java/org/linphone/core/tutorials/TutorialHelloWorld.java b/coreapi/help/java/org/linphone/core/tutorials/TutorialHelloWorld.java
index 5a80f4824..8806b8da1 100644
--- a/coreapi/help/java/org/linphone/core/tutorials/TutorialHelloWorld.java
+++ b/coreapi/help/java/org/linphone/core/tutorials/TutorialHelloWorld.java
@@ -22,23 +22,23 @@ import java.nio.ByteBuffer;
 
 import org.linphone.core.LinphoneAddress;
 import org.linphone.core.LinphoneCall;
+import org.linphone.core.LinphoneCall.State;
 import org.linphone.core.LinphoneCallStats;
 import org.linphone.core.LinphoneChatMessage;
 import org.linphone.core.LinphoneChatRoom;
 import org.linphone.core.LinphoneContent;
 import org.linphone.core.LinphoneCore;
 import org.linphone.core.LinphoneCore.EcCalibratorStatus;
+import org.linphone.core.LinphoneCore.GlobalState;
+import org.linphone.core.LinphoneCore.RegistrationState;
 import org.linphone.core.LinphoneCore.RemoteProvisioningState;
 import org.linphone.core.LinphoneCoreException;
 import org.linphone.core.LinphoneCoreFactory;
-import org.linphone.core.LinphoneCoreListener;
+import org.linphone.core.LinphoneCoreListener.LinphoneListener;
 import org.linphone.core.LinphoneEvent;
 import org.linphone.core.LinphoneFriend;
 import org.linphone.core.LinphoneInfoMessage;
 import org.linphone.core.LinphoneProxyConfig;
-import org.linphone.core.LinphoneCall.State;
-import org.linphone.core.LinphoneCore.GlobalState;
-import org.linphone.core.LinphoneCore.RegistrationState;
 import org.linphone.core.PublishState;
 import org.linphone.core.SubscriptionState;
 
@@ -52,7 +52,7 @@ import org.linphone.core.SubscriptionState;
  * @author Guillaume Beraudo
  *
  */
-public class TutorialHelloWorld implements LinphoneCoreListener {
+public class TutorialHelloWorld implements LinphoneListener {
 	private boolean running;
 	private TutorialNotifier TutorialNotifier;
 
diff --git a/coreapi/help/java/org/linphone/core/tutorials/TutorialRegistration.java b/coreapi/help/java/org/linphone/core/tutorials/TutorialRegistration.java
index 2d2135a62..afc2fe16c 100644
--- a/coreapi/help/java/org/linphone/core/tutorials/TutorialRegistration.java
+++ b/coreapi/help/java/org/linphone/core/tutorials/TutorialRegistration.java
@@ -34,7 +34,7 @@ import org.linphone.core.LinphoneCore.RegistrationState;
 import org.linphone.core.LinphoneCore.RemoteProvisioningState;
 import org.linphone.core.LinphoneCoreException;
 import org.linphone.core.LinphoneCoreFactory;
-import org.linphone.core.LinphoneCoreListener;
+import org.linphone.core.LinphoneCoreListener.LinphoneListener;
 import org.linphone.core.LinphoneEvent;
 import org.linphone.core.LinphoneFriend;
 import org.linphone.core.LinphoneInfoMessage;
@@ -57,7 +57,7 @@ import org.linphone.core.SubscriptionState;
  * @author Guillaume Beraudo
  *
  */
-public class TutorialRegistration implements LinphoneCoreListener {
+public class TutorialRegistration implements LinphoneListener {
 	private boolean running;
 	private TutorialNotifier TutorialNotifier;
 
diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index 128da582d..83d28ef8c 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -264,151 +264,178 @@ public:
 
 		/*displayStatus(LinphoneCore lc,String message);*/
 		displayStatusId = env->GetMethodID(listenerClass,"displayStatus","(Lorg/linphone/core/LinphoneCore;Ljava/lang/String;)V");
+		env->ExceptionClear();
 		if (displayStatusId) {
 			vTable->display_status = displayStatusCb;
 		}
 
 		/*void generalState(LinphoneCore lc,int state); */
-		globalStateId = env->GetMethodID(listenerClass,"globalState","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneCore$GlobalState;Ljava/lang/String;)V");
 		globalStateClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneCore$GlobalState"));
 		globalStateFromIntId = env->GetStaticMethodID(globalStateClass,"fromInt","(I)Lorg/linphone/core/LinphoneCore$GlobalState;");
+		globalStateId = env->GetMethodID(listenerClass,"globalState","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneCore$GlobalState;Ljava/lang/String;)V");
+		env->ExceptionClear();
 		if (globalStateId) {
 			vTable->global_state_changed = globalStateChange;
 		}
 		
 		/*registrationState(LinphoneCore lc, LinphoneProxyConfig cfg, LinphoneCore.RegistrationState cstate, String smessage);*/
-		registrationStateId = env->GetMethodID(listenerClass,"registrationState","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneProxyConfig;Lorg/linphone/core/LinphoneCore$RegistrationState;Ljava/lang/String;)V");
 		registrationStateClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneCore$RegistrationState"));
 		registrationStateFromIntId = env->GetStaticMethodID(registrationStateClass,"fromInt","(I)Lorg/linphone/core/LinphoneCore$RegistrationState;");
+		registrationStateId = env->GetMethodID(listenerClass,"registrationState","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneProxyConfig;Lorg/linphone/core/LinphoneCore$RegistrationState;Ljava/lang/String;)V");
+		env->ExceptionClear();
 		if (registrationStateId) {
 			vTable->registration_state_changed = registrationStateChange;
 		}
 		
 		/*callState(LinphoneCore lc, LinphoneCall call, LinphoneCall.State cstate,String message);*/
-		callStateId = env->GetMethodID(listenerClass,"callState","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneCall;Lorg/linphone/core/LinphoneCall$State;Ljava/lang/String;)V");
 		callStateClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneCall$State"));
 		callStateFromIntId = env->GetStaticMethodID(callStateClass,"fromInt","(I)Lorg/linphone/core/LinphoneCall$State;");
+		callStateId = env->GetMethodID(listenerClass,"callState","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneCall;Lorg/linphone/core/LinphoneCall$State;Ljava/lang/String;)V");
+		env->ExceptionClear();
 		if (callStateId) {
 			vTable->call_state_changed = callStateChange;
 		}
-		
+	
 		transferStateId = env->GetMethodID(listenerClass,"transferState","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneCall;Lorg/linphone/core/LinphoneCall$State;)V");
+		env->ExceptionClear();
 		if (transferStateId) {
 			vTable->transfer_state_changed = transferStateChanged;
 		}
 
 		/*callStatsUpdated(LinphoneCore lc, LinphoneCall call, LinphoneCallStats stats);*/
 		callStatsUpdatedId = env->GetMethodID(listenerClass, "callStatsUpdated", "(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneCall;Lorg/linphone/core/LinphoneCallStats;)V");
+		env->ExceptionClear();
 		if (callStatsUpdatedId) {
 			vTable->call_stats_updated = callStatsUpdated;
 		}
 
-		chatMessageStateClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneChatMessage$State"));
-		chatMessageStateFromIntId = env->GetStaticMethodID(chatMessageStateClass,"fromInt","(I)Lorg/linphone/core/LinphoneChatMessage$State;");
-
 		/*callEncryption(LinphoneCore lc, LinphoneCall call, boolean encrypted,String auth_token);*/
 		callEncryptionChangedId = env->GetMethodID(listenerClass,"callEncryptionChanged","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneCall;ZLjava/lang/String;)V");
+		env->ExceptionClear();
 		if (callEncryptionChangedId) {
 			vTable->call_encryption_changed = callEncryptionChange;
 		}
 
 		/*void ecCalibrationStatus(LinphoneCore.EcCalibratorStatus status, int delay_ms, Object data);*/
-		ecCalibrationStatusId = env->GetMethodID(listenerClass,"ecCalibrationStatus","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneCore$EcCalibratorStatus;ILjava/lang/Object;)V");
 		ecCalibratorStatusClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneCore$EcCalibratorStatus"));
 		ecCalibratorStatusFromIntId = env->GetStaticMethodID(ecCalibratorStatusClass,"fromInt","(I)Lorg/linphone/core/LinphoneCore$EcCalibratorStatus;");
+		ecCalibrationStatusId = env->GetMethodID(listenerClass,"ecCalibrationStatus","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneCore$EcCalibratorStatus;ILjava/lang/Object;)V");
+		env->ExceptionClear();
 
 		/*void newSubscriptionRequest(LinphoneCore lc, LinphoneFriend lf, String url)*/
 		newSubscriptionRequestId = env->GetMethodID(listenerClass,"newSubscriptionRequest","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneFriend;Ljava/lang/String;)V");
+		env->ExceptionClear();
 		if (newSubscriptionRequestId) {
 			vTable->new_subscription_requested = new_subscription_requested;
 		}
 
 		authInfoRequestedId = env->GetMethodID(listenerClass,"authInfoRequested","(Lorg/linphone/core/LinphoneCore;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V");
+		env->ExceptionClear();
 		if (authInfoRequestedId) {
 			vTable->auth_info_requested = authInfoRequested;
 		}
 
 		/*void notifyPresenceReceived(LinphoneCore lc, LinphoneFriend lf);*/
 		notifyPresenceReceivedId = env->GetMethodID(listenerClass,"notifyPresenceReceived","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneFriend;)V");
+		env->ExceptionClear();
 		if (notifyPresenceReceivedId) {
 			vTable->notify_presence_received = notify_presence_received;
 		}
 
 		/*void textReceived(LinphoneCore lc, LinphoneChatRoom cr,LinphoneAddress from,String message);*/
 		textReceivedId = env->GetMethodID(listenerClass,"textReceived","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneChatRoom;Lorg/linphone/core/LinphoneAddress;Ljava/lang/String;)V");
+		env->ExceptionClear();
 		if (textReceivedId) {
 			vTable->text_received = text_received;
 		}
-		
+	
 		messageReceivedId = env->GetMethodID(listenerClass,"messageReceived","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneChatRoom;Lorg/linphone/core/LinphoneChatMessage;)V");
+		env->ExceptionClear();
 		if (messageReceivedId) {
 			vTable->message_received = message_received;
 		}
-		
+	
 		isComposingReceivedId = env->GetMethodID(listenerClass,"isComposingReceived","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneChatRoom;)V");
+		env->ExceptionClear();
 		if (isComposingReceivedId) {
 			vTable->is_composing_received = is_composing_received;
 		}
-		
+	
 		dtmfReceivedId = env->GetMethodID(listenerClass,"dtmfReceived","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneCall;I)V");
+		env->ExceptionClear();
 		if (dtmfReceivedId) {
 			vTable->dtmf_received = dtmf_received;
 		}
-		
+	
 		infoReceivedId = env->GetMethodID(listenerClass,"infoReceived", "(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneCall;Lorg/linphone/core/LinphoneInfoMessage;)V");
+		env->ExceptionClear();
 		if (infoReceivedId) {
 			vTable->info_received = infoReceived;
 		}
 
-		subscriptionStateId = env->GetMethodID(listenerClass,"subscriptionStateChanged", "(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneEvent;Lorg/linphone/core/SubscriptionState;)V");
 		subscriptionStateClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/SubscriptionState"));
 		subscriptionStateFromIntId = env->GetStaticMethodID(subscriptionStateClass,"fromInt","(I)Lorg/linphone/core/SubscriptionState;");
+		subscriptionStateId = env->GetMethodID(listenerClass,"subscriptionStateChanged", "(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneEvent;Lorg/linphone/core/SubscriptionState;)V");
+		env->ExceptionClear();
 		if (subscriptionStateId) {
 			vTable->subscription_state_changed = subscriptionStateChanged;
 		}
-		
-		publishStateId = env->GetMethodID(listenerClass,"publishStateChanged", "(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneEvent;Lorg/linphone/core/PublishState;)V");
+	
 		publishStateClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/PublishState"));
 		publishStateFromIntId = env->GetStaticMethodID(publishStateClass,"fromInt","(I)Lorg/linphone/core/PublishState;");
+		publishStateId = env->GetMethodID(listenerClass,"publishStateChanged", "(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneEvent;Lorg/linphone/core/PublishState;)V");
+		env->ExceptionClear();
 		if (publishStateId) {
 			vTable->publish_state_changed = publishStateChanged;
 		}
-		
+	
 		notifyRecvId = env->GetMethodID(listenerClass,"notifyReceived", "(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneEvent;Ljava/lang/String;Lorg/linphone/core/LinphoneContent;)V");
+		env->ExceptionClear();
 		if (notifyRecvId) {
 			vTable->notify_received = notifyReceived;
 		}
 
-		configuringStateId = env->GetMethodID(listenerClass,"configuringStatus","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneCore$RemoteProvisioningState;Ljava/lang/String;)V");
 		configuringStateClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneCore$RemoteProvisioningState"));
 		configuringStateFromIntId = env->GetStaticMethodID(configuringStateClass,"fromInt","(I)Lorg/linphone/core/LinphoneCore$RemoteProvisioningState;");
+		configuringStateId = env->GetMethodID(listenerClass,"configuringStatus","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneCore$RemoteProvisioningState;Ljava/lang/String;)V");
+		env->ExceptionClear();
 		if (configuringStateId) {
 			vTable->configuring_status = configuringStatus;
 		}
 
 		fileTransferProgressIndicationId = env->GetMethodID(listenerClass, "fileTransferProgressIndication", "(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneChatMessage;Lorg/linphone/core/LinphoneContent;I)V");
+		env->ExceptionClear();
 		if (fileTransferProgressIndicationId) {
 			vTable->file_transfer_progress_indication = fileTransferProgressIndication;
 		}
-		
+	
 		fileTransferSendId = env->GetMethodID(listenerClass, "fileTransferSend", "(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneChatMessage;Lorg/linphone/core/LinphoneContent;Ljava/nio/ByteBuffer;I)I");
+		env->ExceptionClear();
 		if (fileTransferSendId) {
 			vTable->file_transfer_send = fileTransferSend;
 		}
 
 		fileTransferRecvId = env->GetMethodID(listenerClass, "fileTransferRecv", "(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneChatMessage;Lorg/linphone/core/LinphoneContent;[BI)V");
+		env->ExceptionClear();
 		if (fileTransferRecvId) {
 			vTable->file_transfer_recv = fileTransferRecv;
 		}
-		
+
+		chatMessageStateClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneChatMessage$State"));
+		chatMessageStateFromIntId = env->GetStaticMethodID(chatMessageStateClass,"fromInt","(I)Lorg/linphone/core/LinphoneChatMessage$State;");
+	
 		proxyClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneProxyConfigImpl"));
 		proxyCtrId = env->GetMethodID(proxyClass,"<init>", "(Lorg/linphone/core/LinphoneCoreImpl;J)V");
 
 		callClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneCallImpl"));
 		callCtrId = env->GetMethodID(callClass,"<init>", "(J)V");
+		callSetAudioStatsId = env->GetMethodID(callClass, "setAudioStats", "(Lorg/linphone/core/LinphoneCallStats;)V");
+		callSetVideoStatsId = env->GetMethodID(callClass, "setVideoStats", "(Lorg/linphone/core/LinphoneCallStats;)V");
 
 		chatMessageClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneChatMessageImpl"));
-		if (chatMessageClass) chatMessageCtrId = env->GetMethodID(chatMessageClass,"<init>", "(J)V");
+		if (chatMessageClass) {
+			chatMessageCtrId = env->GetMethodID(chatMessageClass,"<init>", "(J)V");
+		}
 
 		chatRoomClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneChatRoomImpl"));
 		chatRoomCtrId = env->GetMethodID(chatRoomClass,"<init>", "(J)V");
@@ -421,8 +448,6 @@ public:
 
 		callStatsClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneCallStatsImpl"));
 		callStatsId = env->GetMethodID(callStatsClass, "<init>", "(JJ)V");
-		callSetAudioStatsId = env->GetMethodID(callClass, "setAudioStats", "(Lorg/linphone/core/LinphoneCallStats;)V");
-		callSetVideoStatsId = env->GetMethodID(callClass, "setVideoStats", "(Lorg/linphone/core/LinphoneCallStats;)V");
 
 		infoMessageClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneInfoMessageImpl"));
 		infoMessageCtor = env->GetMethodID(infoMessageClass,"<init>", "(J)V");
@@ -999,14 +1024,14 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_delete(JNIEnv* env, jobj
 	}
 }
 
-extern "C" void Java_org_linphone_core_LinphoneCoreImpl_AddListener(JNIEnv* env, jobject thiz, jlong lc, jobject jlistener) {
+extern "C" void Java_org_linphone_core_LinphoneCoreImpl_addListener(JNIEnv* env, jobject thiz, jlong lc, jobject jlistener) {
 	LinphoneCoreVTable *vTable = linphone_core_v_table_new();
 	LinphoneCoreData* ldata = new LinphoneCoreData(env, thiz, vTable, jlistener);
 	linphone_core_v_table_set_user_data(vTable, ldata);
 	linphone_core_add_listener((LinphoneCore*)lc, vTable);
 }
 
-extern "C" void Java_org_linphone_core_LinphoneCoreImpl_RemoveListener(JNIEnv* env, jobject thiz, jlong lc) {
+extern "C" void Java_org_linphone_core_LinphoneCoreImpl_removeListener(JNIEnv* env, jobject thiz, jlong lc, jobject jlistener) {
 	//TODO
 }
 
diff --git a/java/common/org/linphone/core/LinphoneCore.java b/java/common/org/linphone/core/LinphoneCore.java
index af878e24f..b13a510d6 100644
--- a/java/common/org/linphone/core/LinphoneCore.java
+++ b/java/common/org/linphone/core/LinphoneCore.java
@@ -1787,4 +1787,16 @@ public interface LinphoneCore {
 	 * @return An object that implement LinphonePlayer
 	 */
 	public LinphonePlayer createLocalPlayer(AndroidVideoWindowImpl window);
+	
+	/**
+	 * Adds a new listener to be called by the core
+	 * @param listener to add
+	 */
+	public void addListener(LinphoneCoreListener listener);
+	
+	/**
+	 * Removes a listener previously added with addListener
+	 * @param listener to remove
+	 */
+	public void removeListener(LinphoneCoreListener listener);
 }
diff --git a/java/common/org/linphone/core/LinphoneCoreListener.java b/java/common/org/linphone/core/LinphoneCoreListener.java
index c82390c48..d92743ce1 100644
--- a/java/common/org/linphone/core/LinphoneCoreListener.java
+++ b/java/common/org/linphone/core/LinphoneCoreListener.java
@@ -22,203 +22,226 @@ import java.nio.ByteBuffer;
 
 import org.linphone.core.LinphoneCore.RemoteProvisioningState;
 
-
 /**
  * 
  *This interface holds all callbacks that the application should implement. None is mandatory.
  */
 public interface LinphoneCoreListener {
-	/**< Ask the application some authentication information 
-	 * @return */
-	void authInfoRequested(LinphoneCore lc, String realm, String username, String Domain); 
-
-	/** General State notification  
-	 * @param state LinphoneCore.State
-	 * @return 
-	 * */		
-	void globalState(LinphoneCore lc,LinphoneCore.GlobalState state, String message);
-
-	/** Call  State notification  
-	 * @param state LinphoneCall.State
-	 * @return 
-	 * */		
-	void callState(LinphoneCore lc, LinphoneCall call, LinphoneCall.State cstate,String message);
-
-	/**
-	 * Call stats notification
-	 */
-	void callStatsUpdated(LinphoneCore lc, LinphoneCall call, LinphoneCallStats stats);
-
-	/**
-	 * Callback to display change in encryption state.
-	 * @param encrypted true if all streams of the call are encrypted
-	 * @param authenticationToken token like ZRTP SAS that may be displayed to user
-	 */
-	void callEncryptionChanged(LinphoneCore lc, LinphoneCall call, boolean encrypted, String authenticationToken);
-
-	/**
-	 * Registration state notification
-	 * */
-	void registrationState(LinphoneCore lc, LinphoneProxyConfig cfg, LinphoneCore.RegistrationState cstate, String smessage);
-
-	/**
-	 * Reports that a new subscription request has been received and wait for a decision. 
-	 *Status on this subscription request is notified by changing policy for this friend
-	 *@param lc LinphoneCore 	
-	 *@param lf LinphoneFriend corresponding to the subscriber
-	 *@param url of the subscriber
-	 * 
-	 */
-	void newSubscriptionRequest(LinphoneCore lc, LinphoneFriend lf, String url);
-
-	/**
-	 * Report status change for a friend previously added to LinphoneCore.
-	 * @param lc LinphoneCore
-	 * @param lf updated LinphoneFriend
-	 */
-	void notifyPresenceReceived(LinphoneCore lc, LinphoneFriend lf);
-
-	/**
-	 * invoked when a new text message is received
-	 * @param lc LinphoneCore
-	 * @param  room 	LinphoneChatRoom involved in this conversation. Can be be created by the framework in case the from is not present in any chat room.
-	 * @param from  	LinphoneAddress from
-	 * @param message 	incoming message
-	 */
-	void textReceived(LinphoneCore lc, LinphoneChatRoom cr, LinphoneAddress from, String message);
 	
-	/**
-	 * invoked when a new linphone chat message is received
-	 * @param lc LinphoneCore
-	 * @param  room 	LinphoneChatRoom involved in this conversation. Can be be created by the framework in case the from is not present in any chat room.
-	 * @param message 	incoming linphone chat message message
-	 */
-	void messageReceived(LinphoneCore lc, LinphoneChatRoom cr, LinphoneChatMessage message);
+	public interface LinphoneListener extends LinphoneCoreListener, 
+			LinphoneRemoteProvisioningListener, LinphoneMessageListener, LinphoneCallStateListener, 
+			LinphoneCallEncryptionStateListener, LinphoneNotifyListener, LinphoneComposingListener,
+			LinphoneGlobalStateListener, LinphoneRegistrationStateListener {
+		/**< Ask the application some authentication information 
+		 * @return */
+		void authInfoRequested(LinphoneCore lc, String realm, String username, String Domain); 
 
-	/**
-	 * invoked when a composing notification is received
-	 * @param lc LinphoneCore
-	 * @param room LinphoneChatRoom involved in the conversation.
-	 */
-	void isComposingReceived(LinphoneCore lc, LinphoneChatRoom cr);
+		/**
+		 * Call stats notification
+		 */
+		void callStatsUpdated(LinphoneCore lc, LinphoneCall call, LinphoneCallStats stats);
 
-	/**
-	 * invoked when a new dtmf is received
-	 * @param lc 	LinphoneCore
-	 * @param call 	LinphoneCall involved in the dtmf sending
-	 * @param dtmf 	value of the dtmf sent
-	 */
-	void dtmfReceived(LinphoneCore lc, LinphoneCall call, int dtmf);
-	
-	/**
-	 * Invoked when echo cancalation calibration is completed
-	 * @param lc LinphoneCore
-	 * @param status 
-	 * @param delay_ms echo delay
-	 * @param data
-	 */
-	void ecCalibrationStatus(LinphoneCore lc,LinphoneCore.EcCalibratorStatus status, int delay_ms, Object data);
-	/**
-	 *  Report Notified message received for this identity.
-	 *  @param lc LinphoneCore
-	 *  @param call LinphoneCall in case the notify is part of a dialog, may be null
-	 *  @param from LinphoneAddress the message comes from
-	 *  @param event String the raw body of the notify event.
-	 *  
-	 */
-	void notifyReceived(LinphoneCore lc, LinphoneCall call, LinphoneAddress from, byte[] event);
+		/**
+		 * Reports that a new subscription request has been received and wait for a decision. 
+		 *Status on this subscription request is notified by changing policy for this friend
+		 *@param lc LinphoneCore 	
+		 *@param lf LinphoneFriend corresponding to the subscriber
+		 *@param url of the subscriber
+		 * 
+		 */
+		void newSubscriptionRequest(LinphoneCore lc, LinphoneFriend lf, String url);
 
-	/** 
-	 * Notifies progress of a call transfer. 
-	 * @param lc the LinphoneCore
-	 * @param call the call through which the transfer was sent.
-	 * @param new_call_state the state of the call resulting of the transfer, at the other party. 
-	 **/
-	void transferState(LinphoneCore lc, LinphoneCall call, LinphoneCall.State new_call_state);
-	
-	/**
-	 * Notifies an incoming INFO message.
-	 * @param lc the LinphoneCore.
-	 * @param info the info message
-	 */
-	void infoReceived(LinphoneCore lc, LinphoneCall call, LinphoneInfoMessage info);
-	
-	/**
-	 * Notifies of subscription requests state changes, including new incoming subscriptions.
-	 * @param lc the LinphoneCore
-	 * @param ev LinphoneEvent object representing the subscription context.
-	 * @param state actual state of the subscription.
-	 */
-	void subscriptionStateChanged(LinphoneCore lc, LinphoneEvent ev, SubscriptionState state);
-	
-	/**
-	 * Notifies of an incoming NOTIFY received.
-	 * @param lc the linphoneCore
-	 * @param ev a LinphoneEvent representing the subscription context for which this notify belongs, or null if it is a NOTIFY out of of any subscription. 
-	 * @param eventName the event name
-	 * @param content content of the NOTIFY request.
-	 */
-	void notifyReceived(LinphoneCore lc, LinphoneEvent ev, String eventName, LinphoneContent content);
-	/**
-	 * Notifies about outgoing generic publish states.
-	 * @param lc the LinphoneCore
-	 * @param ev a LinphoneEvent representing the publish, typically created by {@link LinphoneCore#publish}
-	 * @param state the publish state
-	 */
-	void publishStateChanged(LinphoneCore lc, LinphoneEvent ev, PublishState state);
-	
-	/**
-	 * Notifies the changes about the remote provisioning step
-	 * @param lc the LinphoneCore
-	 * @param state the RemoteProvisioningState
-	 * @param message the error message if state == Failed
-	 */
-	void configuringStatus(LinphoneCore lc, RemoteProvisioningState state,
-			String message);
-	
-	/**< @Deprecated Notifies the application that it should show up
-	 * @return */
-	void show(LinphoneCore lc);
-	/**< @Deprecated Callback that notifies various events with human readable text.
-	 * @return */
-	void displayStatus(LinphoneCore lc,String message);
+		/**
+		 * Report status change for a friend previously added to LinphoneCore.
+		 * @param lc LinphoneCore
+		 * @param lf updated LinphoneFriend
+		 */
+		void notifyPresenceReceived(LinphoneCore lc, LinphoneFriend lf);
 
-	/**< @Deprecated Callback to display a message to the user 
-	 * @return */
-	void displayMessage(LinphoneCore lc,String message);
+		/**
+		 * invoked when a new text message is received
+		 * @param lc LinphoneCore
+		 * @param  room 	LinphoneChatRoom involved in this conversation. Can be be created by the framework in case the from is not present in any chat room.
+		 * @param from  	LinphoneAddress from
+		 * @param message 	incoming message
+		 */
+		void textReceived(LinphoneCore lc, LinphoneChatRoom cr, LinphoneAddress from, String message);
+		
+		/**
+		 * invoked when a new dtmf is received
+		 * @param lc 	LinphoneCore
+		 * @param call 	LinphoneCall involved in the dtmf sending
+		 * @param dtmf 	value of the dtmf sent
+		 */
+		void dtmfReceived(LinphoneCore lc, LinphoneCall call, int dtmf);
+		
+		/**
+		 * Invoked when echo cancalation calibration is completed
+		 * @param lc LinphoneCore
+		 * @param status 
+		 * @param delay_ms echo delay
+		 * @param data
+		 */
+		void ecCalibrationStatus(LinphoneCore lc,LinphoneCore.EcCalibratorStatus status, int delay_ms, Object data);
+		
+		/**
+		 *  Report Notified message received for this identity.
+		 *  @param lc LinphoneCore
+		 *  @param call LinphoneCall in case the notify is part of a dialog, may be null
+		 *  @param from LinphoneAddress the message comes from
+		 *  @param event String the raw body of the notify event.
+		 *  
+		 */
+		void notifyReceived(LinphoneCore lc, LinphoneCall call, LinphoneAddress from, byte[] event);
 
-	/** @Deprecated Callback to display a warning to the user 
-	 * @return */
-	void displayWarning(LinphoneCore lc,String message);
+		/** 
+		 * Notifies progress of a call transfer. 
+		 * @param lc the LinphoneCore
+		 * @param call the call through which the transfer was sent.
+		 * @param new_call_state the state of the call resulting of the transfer, at the other party. 
+		 **/
+		void transferState(LinphoneCore lc, LinphoneCall call, LinphoneCall.State new_call_state);
+		
+		/**
+		 * Notifies an incoming INFO message.
+		 * @param lc the LinphoneCore.
+		 * @param info the info message
+		 */
+		void infoReceived(LinphoneCore lc, LinphoneCall call, LinphoneInfoMessage info);
+		
+		/**
+		 * Notifies of subscription requests state changes, including new incoming subscriptions.
+		 * @param lc the LinphoneCore
+		 * @param ev LinphoneEvent object representing the subscription context.
+		 * @param state actual state of the subscription.
+		 */
+		void subscriptionStateChanged(LinphoneCore lc, LinphoneEvent ev, SubscriptionState state);
+		
+		/**
+		 * Notifies about outgoing generic publish states.
+		 * @param lc the LinphoneCore
+		 * @param ev a LinphoneEvent representing the publish, typically created by {@link LinphoneCore#publish}
+		 * @param state the publish state
+		 */
+		void publishStateChanged(LinphoneCore lc, LinphoneEvent ev, PublishState state);
+		
+		/**< @Deprecated Notifies the application that it should show up
+		 * @return */
+		void show(LinphoneCore lc);
+		
+		/**< @Deprecated Callback that notifies various events with human readable text.
+		 * @return */
+		void displayStatus(LinphoneCore lc,String message);
+
+		/**< @Deprecated Callback to display a message to the user 
+		 * @return */
+		void displayMessage(LinphoneCore lc,String message);
+
+		/** @Deprecated Callback to display a warning to the user 
+		 * @return */
+		void displayWarning(LinphoneCore lc,String message);
+		
+		/**
+		 * Callback to be notified about the transfer progress.
+		 * @param lc the LinphoneCore
+		 * @param message the LinphoneChatMessage
+		 * @param content the LinphoneContent
+		 * @param progress percentage of the transfer done
+		 */
+		void fileTransferProgressIndication(LinphoneCore lc, LinphoneChatMessage message, LinphoneContent content, int progress);
+		
+		/**
+		 * Callback to be notified when new data has been received
+		 * @param lc the LinphoneCore
+		 * @param message the LinphoneChatMessage
+		 * @param content the LinphoneContent
+		 * @param buffer
+		 * @param size
+		 */
+		void fileTransferRecv(LinphoneCore lc, LinphoneChatMessage message, LinphoneContent content, byte[] buffer, int size);
+		
+		/**
+		 * Callback to be notified when new data needs to be sent
+		 * @param lc the LinphoneCore
+		 * @param message the LinphoneChatMessage
+		 * @param content the LinphoneContent
+		 * @param buffer
+		 * @param size
+		 * @return the number of bytes written into buffer
+		 */
+		int fileTransferSend(LinphoneCore lc, LinphoneChatMessage message, LinphoneContent content, ByteBuffer buffer, int size);
+	}
 	
-	/**
-	 * Callback to be notified about the transfer progress.
-	 * @param lc the LinphoneCore
-	 * @param message the LinphoneChatMessage
-	 * @param content the LinphoneContent
-	 * @param progress percentage of the transfer done
-	 */
-	void fileTransferProgressIndication(LinphoneCore lc, LinphoneChatMessage message, LinphoneContent content, int progress);
+	public interface LinphoneGlobalStateListener extends LinphoneCoreListener {
+		/** General State notification  
+		 * @param state LinphoneCore.State
+		 * @return 
+		 * */		
+		void globalState(LinphoneCore lc,LinphoneCore.GlobalState state, String message);
+	}
 	
-	/**
-	 * Callback to be notified when new data has been received
-	 * @param lc the LinphoneCore
-	 * @param message the LinphoneChatMessage
-	 * @param content the LinphoneContent
-	 * @param buffer
-	 * @param size
-	 */
-	void fileTransferRecv(LinphoneCore lc, LinphoneChatMessage message, LinphoneContent content, byte[] buffer, int size);
+	public interface LinphoneRegistrationStateListener extends LinphoneCoreListener {
+		/**
+		 * Registration state notification
+		 * */
+		void registrationState(LinphoneCore lc, LinphoneProxyConfig cfg, LinphoneCore.RegistrationState state, String smessage);
+	}
 	
-	/**
-	 * Callback to be notified when new data needs to be sent
-	 * @param lc the LinphoneCore
-	 * @param message the LinphoneChatMessage
-	 * @param content the LinphoneContent
-	 * @param buffer
-	 * @param size
-	 * @return the number of bytes written into buffer
-	 */
-	int fileTransferSend(LinphoneCore lc, LinphoneChatMessage message, LinphoneContent content, ByteBuffer buffer, int size);
+	public interface LinphoneRemoteProvisioningListener extends LinphoneCoreListener {
+		/**
+		 * Notifies the changes about the remote provisioning step
+		 * @param lc the LinphoneCore
+		 * @param state the RemoteProvisioningState
+		 * @param message the error message if state == Failed
+		 */
+		void configuringStatus(LinphoneCore lc, RemoteProvisioningState state, String message);
+	}
+	
+	public interface LinphoneMessageListener extends LinphoneCoreListener {
+		/**
+		 * invoked when a new linphone chat message is received
+		 * @param lc LinphoneCore
+		 * @param  room 	LinphoneChatRoom involved in this conversation. Can be be created by the framework in case the from is not present in any chat room.
+		 * @param message 	incoming linphone chat message message
+		 */
+		void messageReceived(LinphoneCore lc, LinphoneChatRoom cr, LinphoneChatMessage message);
+	}
+	
+	public interface LinphoneCallStateListener extends LinphoneCoreListener {
+		/** Call  State notification  
+		 * @param state LinphoneCall.State
+		 * @return 
+		 * */		
+		void callState(LinphoneCore lc, LinphoneCall call, LinphoneCall.State state, String message);
+	}
+	
+	public interface LinphoneCallEncryptionStateListener extends LinphoneCoreListener {
+		/**
+		 * Callback to display change in encryption state.
+		 * @param encrypted true if all streams of the call are encrypted
+		 * @param authenticationToken token like ZRTP SAS that may be displayed to user
+		 */
+		void callEncryptionChanged(LinphoneCore lc, LinphoneCall call, boolean encrypted, String authenticationToken);
+	}
+	
+	public interface LinphoneNotifyListener extends LinphoneCoreListener {
+		/**
+		 * Notifies of an incoming NOTIFY received.
+		 * @param lc the linphoneCore
+		 * @param ev a LinphoneEvent representing the subscription context for which this notify belongs, or null if it is a NOTIFY out of of any subscription. 
+		 * @param eventName the event name
+		 * @param content content of the NOTIFY request.
+		 */
+		void notifyReceived(LinphoneCore lc, LinphoneEvent ev, String eventName, LinphoneContent content);
+	}
+
+	public interface LinphoneComposingListener extends LinphoneCoreListener {
+		/**
+		 * invoked when a composing notification is received
+		 * @param lc LinphoneCore
+		 * @param room LinphoneChatRoom involved in the conversation.
+		 */
+		void isComposingReceived(LinphoneCore lc, LinphoneChatRoom cr);
+	}
 }
 
diff --git a/java/impl/org/linphone/core/LinphoneCoreImpl.java b/java/impl/org/linphone/core/LinphoneCoreImpl.java
index ee360e13c..d5db2ad48 100644
--- a/java/impl/org/linphone/core/LinphoneCoreImpl.java
+++ b/java/impl/org/linphone/core/LinphoneCoreImpl.java
@@ -1291,4 +1291,16 @@ class LinphoneCoreImpl implements LinphoneCore {
 			return null;
 		}
 	}
+	
+	private native void addListener(long nativePtr, LinphoneCoreListener listener);
+	@Override
+	public void addListener(LinphoneCoreListener listener) {
+		addListener(nativePtr, listener);
+	}
+	
+	private native void removeListener(long nativePtr, LinphoneCoreListener listener);
+	@Override
+	public void removeListener(LinphoneCoreListener listener) {
+		removeListener(nativePtr, listener);
+	}
 }

From b06019c599bc17786e59ae4d17dd985160deb127 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Mon, 1 Dec 2014 14:26:27 +0100
Subject: [PATCH 083/496] Add some missing sources code to localization process

---
 po/POTFILES.in   |    2 +
 po/POTFILES.skip |    3 +
 po/ar.po         | 1946 ++++++++++++++++++++++++++++++++++++++++++++++
 po/cs.po         |  125 ++-
 po/de.po         |  135 ++--
 po/es.po         |  112 +--
 po/fr.po         |  146 ++--
 po/he.po         |  100 ++-
 po/hu.po         |  121 ++-
 po/it.po         |  112 +--
 po/ja.po         |  135 ++--
 po/nb_NO.po      |  121 ++-
 po/nl.po         |   66 +-
 po/pl.po         |   85 +-
 po/pt_BR.po      |   61 +-
 po/ru.po         |  131 ++--
 po/sr.po         |  133 ++--
 po/sv.po         |   78 +-
 po/zh_CN.po      |  118 +--
 po/zh_TW.po      |  121 ++-
 20 files changed, 2721 insertions(+), 1130 deletions(-)
 create mode 100644 po/ar.po

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5d2aabf39..19003b0f6 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -40,3 +40,5 @@ coreapi/proxy.c
 coreapi/callbacks.c
 coreapi/linphonecall.c
 
+coreapi/call_log.c
+gtk/videowindow.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 6b9ad1b55..32dcd19f2 100755
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -48,3 +48,6 @@ mediastreamer2/src/videofilters/winvideo2.c
 mediastreamer2/src/videofilters/x11video.c
 mediastreamer2/src/voip/ice.c
 build/vsx/LibLinphoneTester-wp8/LibLinphoneTester-wp8/Resources/AppResources.Designer.cs
+build/wp8/LibLinphoneTester-wp8/Resources/AppResources.Designer.cs
+mediastreamer2/build/wp8/mediastreamer2-tester-wp8/Resources/AppResources.Designer.cs
+share/linphone.desktop.in
diff --git a/po/ar.po b/po/ar.po
new file mode 100644
index 000000000..455a8df4c
--- /dev/null
+++ b/po/ar.po
@@ -0,0 +1,1946 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# محيي الدين <tx99h4@hotmail.com>, 2014
+# محيي الدين <tx99h4@hotmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: linphone-gtk\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-12-01 14:27+0100\n"
+"PO-Revision-Date: 2014-12-01 13:28+0000\n"
+"Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/linphone-gtk/language/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+
+#: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974
+#, c-format
+msgid "Call %s"
+msgstr "اتصل بـ %s"
+
+#: ../gtk/calllogs.c:149 ../gtk/friendlist.c:975
+#, c-format
+msgid "Send text to %s"
+msgstr "أرسل رسالة إلى %s"
+
+#: ../gtk/calllogs.c:232
+#, c-format
+msgid "<b>Recent calls (%i)</b>"
+msgstr "<b>المكالمات الفائتة (%i)</b>"
+
+#: ../gtk/calllogs.c:314
+msgid "n/a"
+msgstr "—"
+
+#: ../gtk/calllogs.c:317
+msgid "Aborted"
+msgstr "أُلغيت"
+
+#: ../gtk/calllogs.c:320
+msgid "Missed"
+msgstr "فائتة"
+
+#: ../gtk/calllogs.c:323
+msgid "Declined"
+msgstr "مرفوضة"
+
+#: ../gtk/calllogs.c:329
+#, c-format
+msgid "%i minute"
+msgid_plural "%i minutes"
+msgstr[0] "%i دقيقة"
+msgstr[1] "دقيقة واحدة"
+msgstr[2] "دقيقتان"
+msgstr[3] "%i دقائق"
+msgstr[4] "%i دقيقة"
+msgstr[5] "%i دقيقة"
+
+#: ../gtk/calllogs.c:332
+#, c-format
+msgid "%i second"
+msgid_plural "%i seconds"
+msgstr[0] "%i ثانية"
+msgstr[1] "ثانية واحدة"
+msgstr[2] "ثانيتان"
+msgstr[3] "%i ثوان"
+msgstr[4] "%i ثانية"
+msgstr[5] "%i ثانية"
+
+#: ../gtk/calllogs.c:337
+#, c-format
+msgid ""
+"<small><i>%s</i>\t<i>Quality: %s</i></small>\n"
+"%s\t%s\t"
+msgstr "<small><i>%s</i>\t<i>الجودة : %s</i></small>\n%s\t%s\t"
+
+#: ../gtk/calllogs.c:341
+#, c-format
+msgid "<big><b>%s</b></big>\t%s"
+msgstr "<big><b>%s</b></big>\t%s"
+
+#: ../gtk/conference.c:38 ../gtk/main.ui.h:13
+msgid "Conference"
+msgstr "اجتماع"
+
+#: ../gtk/conference.c:46
+msgid "Me"
+msgstr "أنا"
+
+#: ../gtk/support.c:49 ../gtk/support.c:73 ../gtk/support.c:102
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "أيقونة غير موجودة : %s"
+
+#: ../gtk/chat.c:367 ../gtk/friendlist.c:924
+msgid "Invalid sip contact !"
+msgstr "جهة اتصال sip غير صالحة !"
+
+#: ../gtk/main.c:107
+msgid "log to stdout some debug information while running."
+msgstr "أظهِرْ بعض معلومات التنقيح خلال التشغيل."
+
+#: ../gtk/main.c:114
+msgid "path to a file to write logs into."
+msgstr "الدليل إلى الملف الذي سيُكتَب فيه سجل الوقائع."
+
+#: ../gtk/main.c:121
+msgid "Start linphone with video disabled."
+msgstr "ابدأ لِنْفُونْ لكن دون تفعيل الفيديو."
+
+#: ../gtk/main.c:128
+msgid "Start only in the system tray, do not show the main interface."
+msgstr "شغِّله مُصغَّرا، ولا تُظهِر الواجهة الرئيسية."
+
+#: ../gtk/main.c:135
+msgid "address to call right now"
+msgstr "العنوان المُراد الاتصال به الآن"
+
+#: ../gtk/main.c:142
+msgid "if set automatically answer incoming calls"
+msgstr "إذا تم التفعيل، سيجيب تلقائيا عن المكالمات الواردة"
+
+#: ../gtk/main.c:149
+msgid ""
+"Specifiy a working directory (should be the base of the installation, eg: "
+"c:\\Program Files\\Linphone)"
+msgstr "حدِّد مجلد العمل (الذي سيكون مجلد التثبيت، مثلا c:\\Program Files\\Linphone)"
+
+#: ../gtk/main.c:156
+msgid "Configuration file"
+msgstr "ملف التهيئة"
+
+#: ../gtk/main.c:163
+msgid "Run the audio assistant"
+msgstr "ابدأ مرشد الصوت"
+
+#: ../gtk/main.c:1085
+#, c-format
+msgid ""
+"%s would like to add you to his contact list.\n"
+"Would you allow him to see your presence status or add him to your contact list ?\n"
+"If you answer no, this person will be temporarily blacklisted."
+msgstr "%s يريد إضافتك إلى جهة اتصاله.\nهل تريد السماح له برؤية معلومات حضورك وكذا إضافته إلى جهة اتصالك أيضا ؟ إذا أجبت ب لا، سيُحظَر هذا الشخص مؤقتا."
+
+#: ../gtk/main.c:1162
+#, c-format
+msgid ""
+"Please enter your password for username <i>%s</i>\n"
+" at realm <i>%s</i>:"
+msgstr "ادخل كلمة السر ل  <i>%s</i>\n في نطاق <i>%s</i>:"
+
+#: ../gtk/main.c:1283
+msgid "Call error"
+msgstr "خطأ في المكالمة"
+
+#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3751
+msgid "Call ended"
+msgstr "إنتهت المكالمة"
+
+#: ../gtk/main.c:1289 ../coreapi/call_log.c:221
+msgid "Incoming call"
+msgstr "مكالمة واردة"
+
+#: ../gtk/main.c:1291 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
+msgid "Answer"
+msgstr "أجِبْ"
+
+#: ../gtk/main.c:1293 ../gtk/main.ui.h:6
+msgid "Decline"
+msgstr "ارفضْ"
+
+#: ../gtk/main.c:1299
+msgid "Call paused"
+msgstr "المكالمة متوقفة"
+
+#: ../gtk/main.c:1299
+#, c-format
+msgid "<b>by %s</b>"
+msgstr "<b>بواسطة %s</b>"
+
+#: ../gtk/main.c:1366
+#, c-format
+msgid "%s proposed to start video. Do you accept ?"
+msgstr "يود %s تشغيل الفيديو. هل تقبل ذلك ؟"
+
+#: ../gtk/main.c:1528
+msgid "Website link"
+msgstr "وصلة إلى الموقع وِبْ"
+
+#: ../gtk/main.c:1577
+msgid "Linphone - a video internet phone"
+msgstr "لِنْفُونْ - الهاتف المرئي عبر الإنترنت"
+
+#: ../gtk/main.c:1669
+#, c-format
+msgid "%s (Default)"
+msgstr "%s (افتراضي)"
+
+#: ../gtk/main.c:2006 ../coreapi/callbacks.c:983
+#, c-format
+msgid "We are transferred to %s"
+msgstr "التحويل إلى %s"
+
+#: ../gtk/main.c:2016
+msgid ""
+"No sound cards have been detected on this computer.\n"
+"You won't be able to send or receive audio calls."
+msgstr "لا وجود للوحة الصوت على هذا الحاسوب.\nلن تتمكن من تلقي أو إجراء أي مكالمة."
+
+#: ../gtk/main.c:2157
+msgid "A free SIP video-phone"
+msgstr "هاتف SIP المرئي الحر"
+
+#: ../gtk/friendlist.c:505
+msgid "Add to addressbook"
+msgstr "أضف إلى دفتر العناوين"
+
+#: ../gtk/friendlist.c:691
+msgid "Presence status"
+msgstr "معلومة الحضور"
+
+#: ../gtk/friendlist.c:709 ../gtk/propertybox.c:552 ../gtk/contact.ui.h:1
+msgid "Name"
+msgstr "الإسم"
+
+#: ../gtk/friendlist.c:721
+msgid "Call"
+msgstr "اتصل"
+
+#: ../gtk/friendlist.c:726
+msgid "Chat"
+msgstr "محادثة"
+
+#: ../gtk/friendlist.c:756
+#, c-format
+msgid "Search in %s directory"
+msgstr "ابحث في دليل %s"
+
+#: ../gtk/friendlist.c:976
+#, c-format
+msgid "Edit contact '%s'"
+msgstr "حرر جهة الاتصال '%s'"
+
+#: ../gtk/friendlist.c:977
+#, c-format
+msgid "Delete contact '%s'"
+msgstr "احذف جهة الاتصال '%s'"
+
+#: ../gtk/friendlist.c:978
+#, c-format
+msgid "Delete chat history of '%s'"
+msgstr "احذف تاريخ دردشات '%s'"
+
+#: ../gtk/friendlist.c:1029
+#, c-format
+msgid "Add new contact from %s directory"
+msgstr "اضف جهة اتصال انطلاقا من الدليل %s"
+
+#: ../gtk/propertybox.c:558
+msgid "Rate (Hz)"
+msgstr "التردد (هرتز)"
+
+#: ../gtk/propertybox.c:564
+msgid "Status"
+msgstr "الحالة"
+
+#: ../gtk/propertybox.c:570
+msgid "IP Bitrate (kbit/s)"
+msgstr "صبيب IP (ك.بِتْ/ثانية)"
+
+#: ../gtk/propertybox.c:577
+msgid "Parameters"
+msgstr "الإعدادات"
+
+#: ../gtk/propertybox.c:620 ../gtk/propertybox.c:763
+msgid "Enabled"
+msgstr "مفعَّل"
+
+#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763
+msgid "Disabled"
+msgstr "غير مفعَّل"
+
+#: ../gtk/propertybox.c:809
+msgid "Account"
+msgstr "الحساب"
+
+#: ../gtk/propertybox.c:1072
+msgid "English"
+msgstr "الإنجليزية"
+
+#: ../gtk/propertybox.c:1073
+msgid "French"
+msgstr "الفرنسية"
+
+#: ../gtk/propertybox.c:1074
+msgid "Swedish"
+msgstr "السويدية"
+
+#: ../gtk/propertybox.c:1075
+msgid "Italian"
+msgstr "الإيطالية"
+
+#: ../gtk/propertybox.c:1076
+msgid "Spanish"
+msgstr "الإسبانية"
+
+#: ../gtk/propertybox.c:1077
+msgid "Brazilian Portugese"
+msgstr "البرتغالية البرازيلية"
+
+#: ../gtk/propertybox.c:1078
+msgid "Polish"
+msgstr "البولونية"
+
+#: ../gtk/propertybox.c:1079
+msgid "German"
+msgstr "الألمانية"
+
+#: ../gtk/propertybox.c:1080
+msgid "Russian"
+msgstr "الروسية"
+
+#: ../gtk/propertybox.c:1081
+msgid "Japanese"
+msgstr "اليابانية"
+
+#: ../gtk/propertybox.c:1082
+msgid "Dutch"
+msgstr "الهولندية"
+
+#: ../gtk/propertybox.c:1083
+msgid "Hungarian"
+msgstr "الهنغارية"
+
+#: ../gtk/propertybox.c:1084
+msgid "Czech"
+msgstr "التشيكية"
+
+#: ../gtk/propertybox.c:1085
+msgid "Chinese"
+msgstr "الصينية المبسَّطة"
+
+#: ../gtk/propertybox.c:1086
+msgid "Traditional Chinese"
+msgstr "الصينية التقليدية"
+
+#: ../gtk/propertybox.c:1087
+msgid "Norwegian"
+msgstr "النرويجية"
+
+#: ../gtk/propertybox.c:1088
+msgid "Hebrew"
+msgstr "العبرية"
+
+#: ../gtk/propertybox.c:1089
+msgid "Serbian"
+msgstr "الصربية"
+
+#: ../gtk/propertybox.c:1156
+msgid ""
+"You need to restart linphone for the new language selection to take effect."
+msgstr "يجب إعادة تشغيل لِنْفُونْ لكي تٌفعَّل اللغة المختارة."
+
+#: ../gtk/propertybox.c:1234
+msgid "None"
+msgstr "بدون"
+
+#: ../gtk/propertybox.c:1238
+msgid "SRTP"
+msgstr "SRTP"
+
+#: ../gtk/propertybox.c:1244
+msgid "ZRTP"
+msgstr "ZRTP"
+
+#: ../gtk/update.c:80
+#, c-format
+msgid ""
+"A more recent version is availalble from %s.\n"
+"Would you like to open a browser to download it ?"
+msgstr "يوجد إصدار حديث من طرف %s.\nهل تريد فتح المتصفح لتنزيله ؟"
+
+#: ../gtk/update.c:91
+msgid "You are running the lastest version."
+msgstr "أنت تستخدم الإصدار الأحدث."
+
+#: ../gtk/buddylookup.c:85
+msgid "Firstname, Lastname"
+msgstr "الإسم، اللقب"
+
+#: ../gtk/buddylookup.c:160
+msgid "Error communicating with server."
+msgstr "خطأ في الاتصال مع الخادم."
+
+#: ../gtk/buddylookup.c:164
+msgid "Connecting..."
+msgstr "يجري الاتصال..."
+
+#: ../gtk/buddylookup.c:168
+msgid "Connected"
+msgstr "متصل"
+
+#: ../gtk/buddylookup.c:172
+msgid "Receiving data..."
+msgstr "يجري تلقي البيانات..."
+
+#: ../gtk/buddylookup.c:180
+#, c-format
+msgid "Found %i contact"
+msgid_plural "Found %i contacts"
+msgstr[0] "لم يُعثَر على أي جهة اتصال"
+msgstr[1] "عُثِر على جهة اتصال واحدة"
+msgstr[2] "عُثِر على جهتي اتصال"
+msgstr[3] "عُثِر على %i جهات اتصال"
+msgstr[4] "عُثِر على %i جهة اتصال"
+msgstr[5] "عُثِر على %i جهة اتصال"
+
+#: ../gtk/setupwizard.c:34
+msgid ""
+"Welcome!\n"
+"This assistant will help you to use a SIP account for your calls."
+msgstr "مرحبا !\nسيمكنك هذا المرشد من إعداد حسابك SIP لإجراء المكالمات."
+
+#: ../gtk/setupwizard.c:43
+msgid "Create an account on linphone.org"
+msgstr "إنشاء حساب في linphone.org"
+
+#: ../gtk/setupwizard.c:44
+msgid "I have already a linphone.org account and I just want to use it"
+msgstr "أتوفر مسبقا على حساب في linphone.org وأريد فقط استخدامه"
+
+#: ../gtk/setupwizard.c:45
+msgid "I have already a sip account and I just want to use it"
+msgstr "أتوفر مسبقا على حساب sip وأريد فقط استخدامه"
+
+#: ../gtk/setupwizard.c:46
+msgid "I want to specify a remote configuration URI"
+msgstr "أريد تحديد عنوان التهيئة عن بعد"
+
+#: ../gtk/setupwizard.c:89
+msgid "Enter your linphone.org username"
+msgstr "أدخِلْ إسم المستخدم في linphone.org"
+
+#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:79 ../gtk/ldap.ui.h:4
+msgid "Username:"
+msgstr "إسم المستخدم :"
+
+#: ../gtk/setupwizard.c:104 ../gtk/password.ui.h:4 ../gtk/ldap.ui.h:5
+msgid "Password:"
+msgstr "كلمة السر :"
+
+#: ../gtk/setupwizard.c:124
+msgid "Enter your account informations"
+msgstr "أدخل معلومات حسابك"
+
+#: ../gtk/setupwizard.c:140
+msgid "Username*"
+msgstr "إسم المستخدم*"
+
+#: ../gtk/setupwizard.c:141
+msgid "Password*"
+msgstr "كلمة السر*"
+
+#: ../gtk/setupwizard.c:144
+msgid "Domain*"
+msgstr "النطاق*"
+
+#: ../gtk/setupwizard.c:145
+msgid "Proxy"
+msgstr "الوكيل"
+
+#: ../gtk/setupwizard.c:317
+msgid "(*) Required fields"
+msgstr "(*) حقول ضرورية"
+
+#: ../gtk/setupwizard.c:318
+msgid "Username: (*)"
+msgstr "إسم المستخدم* : (*)"
+
+#: ../gtk/setupwizard.c:320
+msgid "Password: (*)"
+msgstr "كلمة السر* : (*)"
+
+#: ../gtk/setupwizard.c:322
+msgid "Email: (*)"
+msgstr "البريد الالكتروني : (*)"
+
+#: ../gtk/setupwizard.c:324
+msgid "Confirm your password: (*)"
+msgstr "أكِّد كلمة السر : (*)"
+
+#: ../gtk/setupwizard.c:338
+msgid "Keep me informed with linphone updates"
+msgstr "أحطني علما بتحديثات لِنْفُونْ"
+
+#: ../gtk/setupwizard.c:394
+msgid ""
+"Error, account not validated, username already used or server unreachable.\n"
+"Please go back and try again."
+msgstr "خطأ، لم يتم تأكيد الحساب، إسم المستخدم سبق استخدامه أو تعذر الوصول للخادم.\nيُرجى إعادة المحاولة لاحقا."
+
+#: ../gtk/setupwizard.c:405
+msgid "Thank you. Your account is now configured and ready for use."
+msgstr "شكرا لك، لقد جرت تهيئة حسابك وهو الآن قابل للاستخدام."
+
+#: ../gtk/setupwizard.c:413
+msgid ""
+"Please validate your account by clicking on the link we just sent you by email.\n"
+"Then come back here and press Next button."
+msgstr "يُرجى تأكيد حسابك وذلك بالضغط على الوصلة التي أرسلناها لك بالبريد الإلكتروني.\nثم ارجع إلى هنا واضغط على زر التالي."
+
+#: ../gtk/setupwizard.c:602
+msgid "SIP account configuration assistant"
+msgstr "مرشد تهيئة حساب SIP"
+
+#: ../gtk/setupwizard.c:620
+msgid "Welcome to the account setup assistant"
+msgstr "مرحبا بك في مرشد إعداد الحساب"
+
+#: ../gtk/setupwizard.c:625
+msgid "Account setup assistant"
+msgstr "مرشد تهيئة الحساب"
+
+#: ../gtk/setupwizard.c:631
+msgid "Configure your account (step 1/1)"
+msgstr "تهيئة حسابك (المرحلة 1/1)"
+
+#: ../gtk/setupwizard.c:636
+msgid "Enter your sip username (step 1/1)"
+msgstr "أدخل إسم المستخدم SIP لديك (المرحلة 1/1)"
+
+#: ../gtk/setupwizard.c:640
+msgid "Enter account information (step 1/2)"
+msgstr "أدخل معلومات حسابك (المرحلة 1/2)"
+
+#: ../gtk/setupwizard.c:649
+msgid "Validation (step 2/2)"
+msgstr "تأكيد (المرحلة 2/2)"
+
+#: ../gtk/setupwizard.c:654
+msgid "Error"
+msgstr "خطأ"
+
+#: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:527
+msgid "Terminating"
+msgstr "في طور الإنهاء"
+
+#: ../gtk/incall_view.c:70 ../gtk/incall_view.c:94
+#, c-format
+msgid "Call #%i"
+msgstr "مكالمة #%i"
+
+#: ../gtk/incall_view.c:155
+#, c-format
+msgid "Transfer to call #%i with %s"
+msgstr "حوِّل إلى المكالمة  #%i مع %s"
+
+#: ../gtk/incall_view.c:211 ../gtk/incall_view.c:214
+msgid "Not used"
+msgstr "غير مستخدَم"
+
+#: ../gtk/incall_view.c:221
+msgid "ICE not activated"
+msgstr "ICE غير مفعَّل"
+
+#: ../gtk/incall_view.c:223
+msgid "ICE failed"
+msgstr "فَشِل ICE"
+
+#: ../gtk/incall_view.c:225
+msgid "ICE in progress"
+msgstr "تجري مساومة ICE"
+
+#: ../gtk/incall_view.c:227
+msgid "Going through one or more NATs"
+msgstr "المرور عبد واحد أو عدة NAT"
+
+#: ../gtk/incall_view.c:229
+msgid "Direct"
+msgstr "مباشر"
+
+#: ../gtk/incall_view.c:231
+msgid "Through a relay server"
+msgstr "عبر خادم بديل"
+
+#: ../gtk/incall_view.c:239
+msgid "uPnP not activated"
+msgstr "uPnP غير مفعَّل"
+
+#: ../gtk/incall_view.c:241
+msgid "uPnP in progress"
+msgstr "يجري uPnP"
+
+#: ../gtk/incall_view.c:243
+msgid "uPnp not available"
+msgstr "uPnP غير متوفر"
+
+#: ../gtk/incall_view.c:245
+msgid "uPnP is running"
+msgstr "uPnP مشغَّل"
+
+#: ../gtk/incall_view.c:247
+msgid "uPnP failed"
+msgstr "فَشِل uPnP"
+
+#: ../gtk/incall_view.c:257 ../gtk/incall_view.c:258
+msgid "Direct or through server"
+msgstr "مباشرة أو عبر خادم"
+
+#: ../gtk/incall_view.c:267 ../gtk/incall_view.c:279
+#, c-format
+msgid ""
+"download: %f\n"
+"upload: %f (kbit/s)"
+msgstr "التنزيل % f\nالرفع : %f (ك.بِتْ/الثانية)"
+
+#: ../gtk/incall_view.c:272 ../gtk/incall_view.c:274
+#, c-format
+msgid "%ix%i @ %f fps"
+msgstr "%ix%i @ %f fps"
+
+#: ../gtk/incall_view.c:304
+#, c-format
+msgid "%.3f seconds"
+msgstr "%.3f ثانية"
+
+#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12 ../gtk/videowindow.c:232
+msgid "Hang up"
+msgstr "ضع السماعة"
+
+#: ../gtk/incall_view.c:511
+msgid "<b>Calling...</b>"
+msgstr "<b>يجري الاتصال...</b>"
+
+#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:727
+msgid "00::00::00"
+msgstr "00::00::00"
+
+#: ../gtk/incall_view.c:525
+msgid "<b>Incoming call</b>"
+msgstr "<b>المكالمة الواردة</b>"
+
+#: ../gtk/incall_view.c:562
+msgid "good"
+msgstr "جيدة"
+
+#: ../gtk/incall_view.c:564
+msgid "average"
+msgstr "متوسطة"
+
+#: ../gtk/incall_view.c:566
+msgid "poor"
+msgstr "ضعيفة"
+
+#: ../gtk/incall_view.c:568
+msgid "very poor"
+msgstr "ضعيفة جدا"
+
+#: ../gtk/incall_view.c:570
+msgid "too bad"
+msgstr "سيِّئة جيدا"
+
+#: ../gtk/incall_view.c:571 ../gtk/incall_view.c:587
+msgid "unavailable"
+msgstr "غير متاحة"
+
+#: ../gtk/incall_view.c:679
+msgid "Secured by SRTP"
+msgstr "آمن بواسطة SRTP"
+
+#: ../gtk/incall_view.c:685
+#, c-format
+msgid "Secured by ZRTP - [auth token: %s]"
+msgstr "آمن بواسطة ZRTP - [شارة الهوية : %s]"
+
+#: ../gtk/incall_view.c:691
+msgid "Set unverified"
+msgstr "أكِّدْ عدم تحقُّقك"
+
+#: ../gtk/incall_view.c:691 ../gtk/main.ui.h:4
+msgid "Set verified"
+msgstr "أكِّدْ تحقُّقَك"
+
+#: ../gtk/incall_view.c:722
+msgid "In conference"
+msgstr "في اجتماع"
+
+#: ../gtk/incall_view.c:722
+msgid "<b>In call</b>"
+msgstr "<b>المكالمة جارية</b>"
+
+#: ../gtk/incall_view.c:758
+msgid "<b>Paused call</b>"
+msgstr "<b>المكالمة متوقفة مؤقتا</b>"
+
+#: ../gtk/incall_view.c:794
+msgid "<b>Call ended.</b>"
+msgstr "<b>إنتهت المكالمة.</b>"
+
+#: ../gtk/incall_view.c:825
+msgid "Transfer in progress"
+msgstr "يجري الإرسال"
+
+#: ../gtk/incall_view.c:828
+msgid "Transfer done."
+msgstr "انتهى الإرسال."
+
+#: ../gtk/incall_view.c:831
+msgid "Transfer failed."
+msgstr "فَشِل الإرسال."
+
+#: ../gtk/incall_view.c:875
+msgid "Resume"
+msgstr "استأنِفْ"
+
+#: ../gtk/incall_view.c:882 ../gtk/main.ui.h:9
+msgid "Pause"
+msgstr "إيقاف مؤقت"
+
+#: ../gtk/incall_view.c:948
+#, c-format
+msgid ""
+"<small><i>Recording into\n"
+"%s %s</i></small>"
+msgstr "<small><i>يسجل في\n%s %s</i></small>"
+
+#: ../gtk/incall_view.c:948
+msgid "(Paused)"
+msgstr "(متوقف)"
+
+#: ../gtk/loginframe.c:88
+#, c-format
+msgid "Please enter login information for %s"
+msgstr "يُرجى إدخال معلومات الولوج ل %s"
+
+#: ../gtk/config-fetching.c:57
+#, c-format
+msgid "fetching from %s"
+msgstr "يجلب من %s"
+
+#: ../gtk/config-fetching.c:73
+#, c-format
+msgid "Downloading of remote configuration from %s failed."
+msgstr "فَشِل تنزيل التهيئة عن بعد من %s ."
+
+#: ../gtk/audio_assistant.c:98
+msgid "No voice detected"
+msgstr "لم يكتشف صوتاً"
+
+#: ../gtk/audio_assistant.c:99
+msgid "Too low"
+msgstr "خافِت"
+
+#: ../gtk/audio_assistant.c:100
+msgid "Good"
+msgstr "جيد"
+
+#: ../gtk/audio_assistant.c:101
+msgid "Too loud"
+msgstr "صاخب"
+
+#: ../gtk/audio_assistant.c:318
+msgid ""
+"Welcome!\n"
+"This assistant will help you to configure audio settings for Linphone"
+msgstr "مرحبا !\nسيمكنك هذا المرشد من تهيئة إعدادات الصوت للِنْفُونْ"
+
+#: ../gtk/audio_assistant.c:328
+msgid "Capture device"
+msgstr "جهاز الالتقاط"
+
+#: ../gtk/audio_assistant.c:329
+msgid "Recorded volume"
+msgstr "الحجم المسجَّل"
+
+#: ../gtk/audio_assistant.c:333
+msgid "No voice"
+msgstr "صامت"
+
+#: ../gtk/audio_assistant.c:369
+msgid "Playback device"
+msgstr "جهاز السماع"
+
+#: ../gtk/audio_assistant.c:370
+msgid "Play three beeps"
+msgstr "شغِّل ثلاث رنَّات"
+
+#: ../gtk/audio_assistant.c:403
+msgid "Press the record button and say some words"
+msgstr "اضغط على زر التسجيل وانطق ببعض الكلمات"
+
+#: ../gtk/audio_assistant.c:404
+msgid "Listen to your record voice"
+msgstr "استمع لصوتك المسجَّل"
+
+#: ../gtk/audio_assistant.c:433
+msgid "Let's start Linphone now"
+msgstr "لنُشغِّل لِنْفُونْ الآن"
+
+#: ../gtk/audio_assistant.c:496
+msgid "Audio Assistant"
+msgstr "مرشد الصوت"
+
+#: ../gtk/audio_assistant.c:506 ../gtk/main.ui.h:31
+msgid "Audio assistant"
+msgstr "مرشد الصوت"
+
+#: ../gtk/audio_assistant.c:511
+msgid "Mic Gain calibration"
+msgstr "معايرة كسب الميكروفون"
+
+#: ../gtk/audio_assistant.c:517
+msgid "Speaker volume calibration"
+msgstr "معايرة شدة مكبر الصوت"
+
+#: ../gtk/audio_assistant.c:522
+msgid "Record and Play"
+msgstr "سَجِّل واقرأ "
+
+#: ../gtk/main.ui.h:1
+msgid "<b>Callee name</b>"
+msgstr "<b>إسم المنادَى</b>"
+
+#: ../gtk/main.ui.h:2
+msgid "Send"
+msgstr "أرسِلْ"
+
+#: ../gtk/main.ui.h:3
+msgid "End conference"
+msgstr "أنْهِ الاجتماع"
+
+#: ../gtk/main.ui.h:7
+msgid "Record this call to an audio file"
+msgstr "سَجِّل هذه المكالمة في ملف صوتي"
+
+#: ../gtk/main.ui.h:8
+msgid "Video"
+msgstr "مرئي"
+
+#: ../gtk/main.ui.h:10
+msgid "Mute"
+msgstr "اصمُتْ"
+
+#: ../gtk/main.ui.h:11
+msgid "Transfer"
+msgstr "إرسال"
+
+#: ../gtk/main.ui.h:14
+msgid "In call"
+msgstr "المكالمة جارية"
+
+#: ../gtk/main.ui.h:15
+msgid "Duration"
+msgstr "المدة"
+
+#: ../gtk/main.ui.h:16
+msgid "Call quality rating"
+msgstr "تقييم جودة المكالمة"
+
+#: ../gtk/main.ui.h:17
+msgid "All users"
+msgstr "كل المستخدمين"
+
+#: ../gtk/main.ui.h:18
+msgid "Online users"
+msgstr "المستخدمون المتصلون"
+
+#: ../gtk/main.ui.h:19
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../gtk/main.ui.h:20
+msgid "Fiber Channel"
+msgstr "قناة الألياف الضوئية"
+
+#: ../gtk/main.ui.h:21
+msgid "Default"
+msgstr "افتراضي"
+
+#: ../gtk/main.ui.h:22
+msgid "_Options"
+msgstr "الخ_يارات"
+
+#: ../gtk/main.ui.h:23
+msgid "Set configuration URI"
+msgstr "عنوان URI للتهيئة"
+
+#: ../gtk/main.ui.h:24
+msgid "Always start video"
+msgstr "شغِّل الفيديو دائما"
+
+#: ../gtk/main.ui.h:25
+msgid "Enable self-view"
+msgstr "تفعيل رؤية نفسي"
+
+#: ../gtk/main.ui.h:26
+msgid "_Help"
+msgstr "_مساعدة"
+
+#: ../gtk/main.ui.h:27
+msgid "Show debug window"
+msgstr "أظهِر نافذة التنقيح"
+
+#: ../gtk/main.ui.h:28
+msgid "_Homepage"
+msgstr "موق_ع الوِبْ"
+
+#: ../gtk/main.ui.h:29
+msgid "Check _Updates"
+msgstr "تحقق من التح_ديثات"
+
+#: ../gtk/main.ui.h:30
+msgid "Account assistant"
+msgstr "مرشد الحساب"
+
+#: ../gtk/main.ui.h:32
+msgid "SIP address or phone number:"
+msgstr "عنوان SIP أو رقم الهاتف :"
+
+#: ../gtk/main.ui.h:33
+msgid "Initiate a new call"
+msgstr "ابدأ مكالمة جديدة"
+
+#: ../gtk/main.ui.h:34
+msgid "Contacts"
+msgstr "جهات الاتصال"
+
+#: ../gtk/main.ui.h:35
+msgid "Search"
+msgstr "بحث"
+
+#: ../gtk/main.ui.h:36
+msgid "<b>Add contacts from directory</b>"
+msgstr "<b>إضافة جهات الاتصال من الدليل</b>"
+
+#: ../gtk/main.ui.h:37
+msgid "Add contact"
+msgstr "إضافة جهة الاتصال"
+
+#: ../gtk/main.ui.h:38
+msgid "Recent calls"
+msgstr "المكالمات السابقة"
+
+#: ../gtk/main.ui.h:39
+msgid "My current identity:"
+msgstr "هويتي الحالية :"
+
+#: ../gtk/main.ui.h:40 ../gtk/tunnel_config.ui.h:7
+msgid "Username"
+msgstr "إسم المستخدم"
+
+#: ../gtk/main.ui.h:41 ../gtk/tunnel_config.ui.h:8
+msgid "Password"
+msgstr "كلمة السر"
+
+#: ../gtk/main.ui.h:42
+msgid "Internet connection:"
+msgstr "الاتصال بالإنترنت :"
+
+#: ../gtk/main.ui.h:43
+msgid "Automatically log me in"
+msgstr "سَجِّل دخولي تلقائيا"
+
+#: ../gtk/main.ui.h:44 ../gtk/password.ui.h:3
+msgid "UserID"
+msgstr "مُعرِّف المستخدم"
+
+#: ../gtk/main.ui.h:45
+msgid "Login information"
+msgstr "معلومات الولوج"
+
+#: ../gtk/main.ui.h:46
+msgid "<b>Welcome!</b>"
+msgstr "<b>مرحبا !</b>"
+
+#: ../gtk/main.ui.h:47
+msgid "Delete"
+msgstr "احذف"
+
+#: ../gtk/about.ui.h:1
+msgid "About Linphone"
+msgstr "حول لِنْفُونْ"
+
+#: ../gtk/about.ui.h:2
+msgid "(C) Belledonne Communications, 2010\n"
+msgstr "(C) Belledonne Communications, 2010\n"
+
+#: ../gtk/about.ui.h:4
+msgid "An internet video phone using the standard SIP (rfc3261) protocol."
+msgstr "الهاتف المرئي للإنترنت الموافق للبروتوكول المعياري SIP (rfc3261)."
+
+#: ../gtk/about.ui.h:5
+msgid ""
+"fr: Simon Morlat\n"
+"en: Simon Morlat and Delphine Perreau\n"
+"it: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\n"
+"de: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\n"
+"sv: Daniel Nylander <po@danielnylander.se>\n"
+"es: Jesus Benitez <gnelson at inMail dot sk>\n"
+"ja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\n"
+"pt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\n"
+"pl: Robert Nasiadek <darkone@darkone.pl>\n"
+"cs: Petr Pisar <petr.pisar@atlas.cz>\n"
+"hu: anonymous\n"
+"he: Eli Zaretskii <eliz@gnu.org>\n"
+msgstr "fr: Simon Morlat\nen: Simon Morlat and Delphine Perreau\nit: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\nde: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\nsv: Daniel Nylander <po@danielnylander.se>\nes: Jesus Benitez <gnelson at inMail dot sk>\nja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\npt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\npl: Robert Nasiadek <darkone@darkone.pl>\ncs: Petr Pisar <petr.pisar@atlas.cz>\nhu: anonymous\nhe: Eli Zaretskii <eliz@gnu.org>\nar: Muhiyeddine Cherik <tx99h4@hotmail.com>\n"
+
+#: ../gtk/contact.ui.h:2
+msgid "SIP Address"
+msgstr "عنوان SIP"
+
+#: ../gtk/contact.ui.h:3
+msgid "Show this contact presence status"
+msgstr "رؤية حالة حضور جهة الاتصال هذه"
+
+#: ../gtk/contact.ui.h:4
+msgid "Allow this contact to see my presence status"
+msgstr "السماح لجهة الاتصال هذه برؤية حالة حضوري"
+
+#: ../gtk/contact.ui.h:5
+msgid "<b>Contact information</b>"
+msgstr "<b>معلومات جهة الاتصال</b>"
+
+#: ../gtk/log.ui.h:1
+msgid "Linphone debug window"
+msgstr "نافذة تنقيح لِنْفُونْ"
+
+#: ../gtk/log.ui.h:2
+msgid "Scroll to end"
+msgstr "مرِّر إلى الآخر"
+
+#: ../gtk/password.ui.h:1
+msgid "Linphone - Authentication required"
+msgstr "لِنْفُونْ - يجب التحقق من الهوية"
+
+#: ../gtk/password.ui.h:2
+msgid "Please enter the domain password"
+msgstr "أدخل كلمة سر النطاق"
+
+#: ../gtk/call_logs.ui.h:1
+msgid "Call history"
+msgstr "تاريخ المكالمات"
+
+#: ../gtk/call_logs.ui.h:2
+msgid "Clear all"
+msgstr "أفْرِغ الكل"
+
+#: ../gtk/call_logs.ui.h:3
+msgid "Call back"
+msgstr "إعادة الاتصال"
+
+#: ../gtk/sip_account.ui.h:1
+msgid "Linphone - Configure a SIP account"
+msgstr "لِنْفُونْ - تهيئة حساب SIP"
+
+#: ../gtk/sip_account.ui.h:2
+msgid "Your SIP identity:"
+msgstr "هوية SIP لديك :"
+
+#: ../gtk/sip_account.ui.h:3
+msgid "Looks like sip:<username>@<domain>"
+msgstr "يشبه sip:<username>@<domain>"
+
+#: ../gtk/sip_account.ui.h:4
+msgid "sip:"
+msgstr "sip:"
+
+#: ../gtk/sip_account.ui.h:5
+msgid "SIP Proxy address:"
+msgstr "عنوان وكيل SIP :"
+
+#: ../gtk/sip_account.ui.h:6
+msgid "Looks like sip:<proxy hostname>"
+msgstr "يشبه sip:<proxy hostname>"
+
+#: ../gtk/sip_account.ui.h:7
+msgid "Registration duration (sec):"
+msgstr "مدة التسجيل (بالثواني) :"
+
+#: ../gtk/sip_account.ui.h:8
+msgid "Contact params (optional):"
+msgstr "إعدادات جهة الاتصال (اختيارية) :"
+
+#: ../gtk/sip_account.ui.h:9
+msgid "AVPF regular RTCP interval (sec):"
+msgstr "مجال RTCP الاعتيادي ل AVPF (بالثواني) :"
+
+#: ../gtk/sip_account.ui.h:10
+msgid "Route (optional):"
+msgstr "التوجيه (اختياري) :"
+
+#: ../gtk/sip_account.ui.h:11
+msgid "Transport"
+msgstr "النقل"
+
+#: ../gtk/sip_account.ui.h:12
+msgid "Register"
+msgstr "التسجيل"
+
+#: ../gtk/sip_account.ui.h:13
+msgid "Publish presence information"
+msgstr "انشر معلومات الحضور"
+
+#: ../gtk/sip_account.ui.h:14
+msgid "Enable AVPF"
+msgstr "فعِّل AVPF "
+
+#: ../gtk/sip_account.ui.h:15
+msgid "Configure a SIP account"
+msgstr "تهيئة حساب SIP"
+
+#: ../gtk/parameters.ui.h:1
+msgid "anonymous"
+msgstr "مجهول"
+
+#: ../gtk/parameters.ui.h:2
+msgid "GSSAPI"
+msgstr "GSSAPI"
+
+#: ../gtk/parameters.ui.h:3
+msgid "SASL"
+msgstr "SASL"
+
+#: ../gtk/parameters.ui.h:4
+msgid "default soundcard"
+msgstr "لوحة الصوت الافتراضية"
+
+#: ../gtk/parameters.ui.h:5
+msgid "a sound card"
+msgstr "لوحة الصوت"
+
+#: ../gtk/parameters.ui.h:6
+msgid "default camera"
+msgstr "الكاميرا الافتراضية"
+
+#: ../gtk/parameters.ui.h:7
+msgid "CIF"
+msgstr "CIF"
+
+#: ../gtk/parameters.ui.h:8
+msgid "Audio codecs"
+msgstr "مرمازات الصوت"
+
+#: ../gtk/parameters.ui.h:9
+msgid "Video codecs"
+msgstr "مرمازات الفيديو"
+
+#: ../gtk/parameters.ui.h:10
+msgid "C"
+msgstr "C"
+
+#: ../gtk/parameters.ui.h:11
+msgid "SIP (UDP)"
+msgstr "SIP (UDP)"
+
+#: ../gtk/parameters.ui.h:12
+msgid "SIP (TCP)"
+msgstr "SIP (TCP)"
+
+#: ../gtk/parameters.ui.h:13
+msgid "SIP (TLS)"
+msgstr "SIP (TLS)"
+
+#: ../gtk/parameters.ui.h:14
+msgid "Settings"
+msgstr "الإعدادات"
+
+#: ../gtk/parameters.ui.h:15
+msgid "Set Maximum Transmission Unit:"
+msgstr "حدِّد Maximum Transmission Unit :"
+
+#: ../gtk/parameters.ui.h:16
+msgid "Send DTMFs as SIP info"
+msgstr "أرسِل الأرقام الهاتفية على هيئة SIP INFO"
+
+#: ../gtk/parameters.ui.h:17
+msgid "Use IPv6 instead of IPv4"
+msgstr "استخدم IPv6 عوضا عن IPv4"
+
+#: ../gtk/parameters.ui.h:18
+msgid "<b>Transport</b>"
+msgstr "<b>النقل</b>"
+
+#: ../gtk/parameters.ui.h:19
+msgid "Media encryption type"
+msgstr "نوع وسيط التعمية"
+
+#: ../gtk/parameters.ui.h:20
+msgid "Video RTP/UDP:"
+msgstr "فيديو RTP/UDP :"
+
+#: ../gtk/parameters.ui.h:21
+msgid "Audio RTP/UDP:"
+msgstr "صوت RTP/UDP :"
+
+#: ../gtk/parameters.ui.h:22
+msgid "Fixed"
+msgstr "ثابت"
+
+#: ../gtk/parameters.ui.h:23
+msgid "Media encryption is mandatory"
+msgstr "وسيط التعمية إجباري"
+
+#: ../gtk/parameters.ui.h:24
+msgid "Tunnel"
+msgstr "النفق"
+
+#: ../gtk/parameters.ui.h:25
+msgid "DSCP fields"
+msgstr "حقول DSCP"
+
+#: ../gtk/parameters.ui.h:26
+msgid "SIP/TCP port"
+msgstr "منفذ SIP/TCP"
+
+#: ../gtk/parameters.ui.h:27
+msgid "SIP/UDP port"
+msgstr "منفذ SIP/UDP"
+
+#: ../gtk/parameters.ui.h:28
+msgid "<b>Network protocol and ports</b>"
+msgstr "<b>بروتوكول الشبكة والمنافذ</b>"
+
+#: ../gtk/parameters.ui.h:29
+msgid "Direct connection to the Internet"
+msgstr "الاتصال مباشر بالإنترنت"
+
+#: ../gtk/parameters.ui.h:30
+msgid "Behind NAT / Firewall (specify gateway IP )"
+msgstr "وراء جدار ناري (حدِّد عنوان IP البوابة)"
+
+#: ../gtk/parameters.ui.h:31
+msgid "Behind NAT / Firewall (use STUN to resolve)"
+msgstr "وراء جدار ناري (استخدم STUN)"
+
+#: ../gtk/parameters.ui.h:32
+msgid "Behind NAT / Firewall (use ICE)"
+msgstr "وراء جدار ناري (استخدم ICE)"
+
+#: ../gtk/parameters.ui.h:33
+msgid "Behind NAT / Firewall (use uPnP)"
+msgstr "وراء جدار ناري (استخدم uPnP)"
+
+#: ../gtk/parameters.ui.h:34
+msgid "Public IP address:"
+msgstr "عنوان IP العمومي :"
+
+#: ../gtk/parameters.ui.h:35
+msgid "Stun server:"
+msgstr "خادم STUN :"
+
+#: ../gtk/parameters.ui.h:36
+msgid "<b>NAT and Firewall</b>"
+msgstr "<b>إعدادات حول الجدار الناري</b>"
+
+#: ../gtk/parameters.ui.h:37
+msgid "Network settings"
+msgstr "إعدادات الشبكة"
+
+#: ../gtk/parameters.ui.h:38
+msgid "Ring sound:"
+msgstr "صوت الجرس :"
+
+#: ../gtk/parameters.ui.h:39
+msgid "ALSA special device (optional):"
+msgstr "عتاد ALSA الخصوصي (اختياري) :"
+
+#: ../gtk/parameters.ui.h:40
+msgid "Capture device:"
+msgstr "جهاز الالتقاط :"
+
+#: ../gtk/parameters.ui.h:41
+msgid "Ring device:"
+msgstr "جهاز الرنين :"
+
+#: ../gtk/parameters.ui.h:42
+msgid "Playback device:"
+msgstr "جهاز السمع :"
+
+#: ../gtk/parameters.ui.h:43
+msgid "Enable echo cancellation"
+msgstr "فعِّل إزالة الصدى"
+
+#: ../gtk/parameters.ui.h:44
+msgid "<b>Audio</b>"
+msgstr "<b>الصوت</b>"
+
+#: ../gtk/parameters.ui.h:45
+msgid "Video input device:"
+msgstr "جهاز إدخال الفيديو :"
+
+#: ../gtk/parameters.ui.h:46
+msgid "Prefered video resolution:"
+msgstr "المقدار المُراد لدقة الفيديو :"
+
+#: ../gtk/parameters.ui.h:47
+msgid "Video output method:"
+msgstr "طريقة إخراج الفيديو :"
+
+#: ../gtk/parameters.ui.h:48
+msgid "<b>Video</b>"
+msgstr "<b>الفيديو</b>"
+
+#: ../gtk/parameters.ui.h:49
+msgid "Multimedia settings"
+msgstr "إعدادات الوسائط المتعددة"
+
+#: ../gtk/parameters.ui.h:50
+msgid "This section defines your SIP address when not using a SIP account"
+msgstr "هذه الفقرة تحدد عنوانك SIP إن كنت لا تستخدم حساب SIP"
+
+#: ../gtk/parameters.ui.h:51
+msgid "Your display name (eg: John Doe):"
+msgstr "إسمك المعروض (مثلا : زيد عمرو) :"
+
+#: ../gtk/parameters.ui.h:52
+msgid "Your username:"
+msgstr "إسم المستخدم لديك :"
+
+#: ../gtk/parameters.ui.h:53
+msgid "Your resulting SIP address:"
+msgstr "عنوانك SIP :"
+
+#: ../gtk/parameters.ui.h:54
+msgid "<b>Default identity</b>"
+msgstr "<b>الهوية الافتراضية</b>"
+
+#: ../gtk/parameters.ui.h:55
+msgid "Wizard"
+msgstr "المرشد"
+
+#: ../gtk/parameters.ui.h:56
+msgid "Add"
+msgstr "إضافة"
+
+#: ../gtk/parameters.ui.h:57
+msgid "Edit"
+msgstr "حرر"
+
+#: ../gtk/parameters.ui.h:58
+msgid "Remove"
+msgstr "أزل"
+
+#: ../gtk/parameters.ui.h:59
+msgid "<b>Proxy accounts</b>"
+msgstr "<b>حسابات الوكيل</b>"
+
+#: ../gtk/parameters.ui.h:60
+msgid "Erase all passwords"
+msgstr "احذف جميع كلمات السر"
+
+#: ../gtk/parameters.ui.h:61
+msgid "<b>Privacy</b>"
+msgstr "<b>الأمان</b>"
+
+#: ../gtk/parameters.ui.h:62
+msgid "Manage SIP Accounts"
+msgstr "إدارة حسابات SIP"
+
+#: ../gtk/parameters.ui.h:63 ../gtk/tunnel_config.ui.h:4
+msgid "Enable"
+msgstr "فعِّل"
+
+#: ../gtk/parameters.ui.h:64 ../gtk/tunnel_config.ui.h:5
+msgid "Disable"
+msgstr "إلغاء التفعيل"
+
+#: ../gtk/parameters.ui.h:65
+msgid "<b>Codecs</b>"
+msgstr "<b>المراميز</b>"
+
+#: ../gtk/parameters.ui.h:66
+msgid "0 stands for \"unlimited\""
+msgstr "حدِّد 0 لعدم وضع أي حد"
+
+#: ../gtk/parameters.ui.h:67
+msgid "Upload speed limit in Kbit/sec:"
+msgstr "حد سرعة الرفع بالكيلوبِتْ/الثانية :"
+
+#: ../gtk/parameters.ui.h:68
+msgid "Download speed limit in Kbit/sec:"
+msgstr "حد سرعة التنزيل بالكيلوبِتْ/الثانية :"
+
+#: ../gtk/parameters.ui.h:69
+msgid "Enable adaptive rate control"
+msgstr "فعِّل التحكم المتكيف مع الصبيب"
+
+#: ../gtk/parameters.ui.h:70
+msgid ""
+"<i>Adaptive rate control is a technique to dynamically guess the available "
+"bandwidth during a call.</i>"
+msgstr "<i>التحكم المتكيف مع الصبيب هو تقنية لملائمة جودة الصوت والصورة بناءً على سعة قناة الاتصال المتاحة خلال المكالمة.</i>"
+
+#: ../gtk/parameters.ui.h:71
+msgid "<b>Bandwidth control</b>"
+msgstr "<b>إدارة سعة القناة</b>"
+
+#: ../gtk/parameters.ui.h:72
+msgid "Codecs"
+msgstr "المراميز"
+
+#: ../gtk/parameters.ui.h:73
+msgid "<b>Language</b>"
+msgstr "<b>اللغة</b>"
+
+#: ../gtk/parameters.ui.h:74
+msgid "Show advanced settings"
+msgstr "أظهر الإعدادات المتقدمة"
+
+#: ../gtk/parameters.ui.h:75
+msgid "<b>Level</b>"
+msgstr "<b>المستوى</b>"
+
+#: ../gtk/parameters.ui.h:76
+msgid "User interface"
+msgstr "واجهة المستخدم"
+
+#: ../gtk/parameters.ui.h:77 ../gtk/ldap.ui.h:2
+msgid "Server address:"
+msgstr "عنوان الخادم :"
+
+#: ../gtk/parameters.ui.h:78 ../gtk/ldap.ui.h:3
+msgid "Authentication method:"
+msgstr "طريقة التحقق من الهوية :"
+
+#: ../gtk/parameters.ui.h:80
+msgid "<b>LDAP Account setup</b>"
+msgstr "<b>تهيئة LDAP</b>"
+
+#: ../gtk/parameters.ui.h:81
+msgid "LDAP"
+msgstr "LDAP"
+
+#: ../gtk/parameters.ui.h:82
+msgid "Done"
+msgstr "أغلق"
+
+#: ../gtk/buddylookup.ui.h:1
+msgid "Search contacts in directory"
+msgstr "البحث عن جهات الاتصال في الدليل"
+
+#: ../gtk/buddylookup.ui.h:2
+msgid "Add to my list"
+msgstr "الإضافة إلى قائمتي"
+
+#: ../gtk/buddylookup.ui.h:3
+msgid "<b>Search somebody</b>"
+msgstr "<b>البحث عن شخص</b>"
+
+#: ../gtk/waiting.ui.h:1
+msgid "Linphone"
+msgstr "لِنْفُونْ"
+
+#: ../gtk/waiting.ui.h:2
+msgid "Please wait"
+msgstr "يُرجى الانتظار"
+
+#: ../gtk/dscp_settings.ui.h:1
+msgid "DSCP settings"
+msgstr "إعدادات DSCP"
+
+#: ../gtk/dscp_settings.ui.h:2
+msgid "SIP"
+msgstr "SIP"
+
+#: ../gtk/dscp_settings.ui.h:3
+msgid "Audio RTP stream"
+msgstr "تدفق RTP الصوتي"
+
+#: ../gtk/dscp_settings.ui.h:4
+msgid "Video RTP stream"
+msgstr "تدفق RTP المرئي"
+
+#: ../gtk/dscp_settings.ui.h:5
+msgid "<b>Set DSCP values (in hexadecimal)</b>"
+msgstr "<b>حدد قيم DSCP (بالنظام الست-عشري)</b>"
+
+#: ../gtk/call_statistics.ui.h:1
+msgid "Call statistics"
+msgstr "إحصاء المكالمات"
+
+#: ../gtk/call_statistics.ui.h:2
+msgid "Audio codec"
+msgstr "مرمازات الصوت"
+
+#: ../gtk/call_statistics.ui.h:3
+msgid "Video codec"
+msgstr "مرمازات الفيديو"
+
+#: ../gtk/call_statistics.ui.h:4
+msgid "Audio IP bandwidth usage"
+msgstr "سعة القناة الصوتية"
+
+#: ../gtk/call_statistics.ui.h:5
+msgid "Audio Media connectivity"
+msgstr "اتصالات الصوت"
+
+#: ../gtk/call_statistics.ui.h:6
+msgid "Video IP bandwidth usage"
+msgstr "سعة قناة الفيديو"
+
+#: ../gtk/call_statistics.ui.h:7
+msgid "Video Media connectivity"
+msgstr "اتصالات الفيديو"
+
+#: ../gtk/call_statistics.ui.h:8
+msgid "Round trip time"
+msgstr "مدة الذهاب والإياب"
+
+#: ../gtk/call_statistics.ui.h:9
+msgid "Video resolution received"
+msgstr "حجم الفيديو المستلَم"
+
+#: ../gtk/call_statistics.ui.h:10
+msgid "Video resolution sent"
+msgstr "حجم الفيديو المرسَل"
+
+#: ../gtk/call_statistics.ui.h:11
+msgid "RTP profile"
+msgstr "تشكيلة RTP"
+
+#: ../gtk/call_statistics.ui.h:12
+msgid "<b>Call statistics and information</b>"
+msgstr "<b>إحصاء المكالمات والمعلومات</b>"
+
+#: ../gtk/tunnel_config.ui.h:1
+msgid "Configure VoIP tunnel"
+msgstr "تهيئة نفق VoIP"
+
+#: ../gtk/tunnel_config.ui.h:2
+msgid "Host"
+msgstr "المضيف"
+
+#: ../gtk/tunnel_config.ui.h:3
+msgid "Port"
+msgstr "المنفذ"
+
+#: ../gtk/tunnel_config.ui.h:6
+msgid "<b>Configure tunnel</b>"
+msgstr "<b>تهيئة النفق</b>"
+
+#: ../gtk/tunnel_config.ui.h:9
+msgid "<b>Configure http proxy (optional)</b>"
+msgstr "<b>تهيئة وكيل http (اختياري)</b>"
+
+#: ../gtk/ldap.ui.h:1
+msgid "LDAP Settings"
+msgstr "إعدادات LDAP"
+
+#: ../gtk/ldap.ui.h:6
+msgid "Use TLS Connection"
+msgstr "استخدم TLS"
+
+#: ../gtk/ldap.ui.h:7
+msgid "Not yet available"
+msgstr "غير متاح"
+
+#: ../gtk/ldap.ui.h:8
+msgid "<b>Connection</b>"
+msgstr "<b>الاتصال </b>"
+
+#: ../gtk/ldap.ui.h:9
+msgid "Bind DN"
+msgstr "ربط DN"
+
+#: ../gtk/ldap.ui.h:10
+msgid "Authname"
+msgstr "إسم الهوية"
+
+#: ../gtk/ldap.ui.h:11
+msgid "Realm"
+msgstr "النطاق"
+
+#: ../gtk/ldap.ui.h:12
+msgid "<b>SASL</b>"
+msgstr "<b>SASL</b>"
+
+#: ../gtk/ldap.ui.h:13
+msgid "Base object:"
+msgstr "الكائن الأساسي :"
+
+#: ../gtk/ldap.ui.h:15
+#, no-c-format
+msgid "Filter (%s for name):"
+msgstr "رشِّح (%s كإسم) :"
+
+#: ../gtk/ldap.ui.h:16
+msgid "Name Attribute:"
+msgstr "خاصية الإسم :"
+
+#: ../gtk/ldap.ui.h:17
+msgid "SIP address attribute:"
+msgstr "خاصية عنوان SIP :"
+
+#: ../gtk/ldap.ui.h:18
+msgid "Attributes to query:"
+msgstr "الخاصيات المبحوث عنها :"
+
+#: ../gtk/ldap.ui.h:19
+msgid "<b>Search</b>"
+msgstr "<b>البحث</b>"
+
+#: ../gtk/ldap.ui.h:20
+msgid "Timeout for search:"
+msgstr "المهلة القصوى للبحث :"
+
+#: ../gtk/ldap.ui.h:21
+msgid "Max results:"
+msgstr "العدد الأقصى للنتائج :"
+
+#: ../gtk/ldap.ui.h:22
+msgid "Follow Aliases"
+msgstr "متابعة الكنية"
+
+#: ../gtk/ldap.ui.h:23
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>متفرقات</b>"
+
+#: ../gtk/ldap.ui.h:24
+msgid "ANONYMOUS"
+msgstr "مجهول الهوية"
+
+#: ../gtk/ldap.ui.h:25
+msgid "SIMPLE"
+msgstr "بسيط"
+
+#: ../gtk/ldap.ui.h:26
+msgid "DIGEST-MD5"
+msgstr "DIGEST-MD5"
+
+#: ../gtk/ldap.ui.h:27
+msgid "NTLM"
+msgstr "NTLM"
+
+#: ../gtk/config-uri.ui.h:1
+msgid "Specifying a remote configuration URI"
+msgstr "تحديد عنوان URI التهيئة عن بعد"
+
+#: ../gtk/config-uri.ui.h:2
+msgid ""
+"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
+msgstr "يسمح لك مربع الحوار هذا بإعداد عنوان http أو https الذي من خلاله تود جلب التهيئة عند بدء البرنامج.\nأدخل العنوان أسفله. بعد تأكيد الأمر، ستجري إعادة تشغيل لِنْفُونْ تلقائيا من أجل جلب والأخذ بعين الاعتبار الإعدادات الحديثة."
+
+#: ../gtk/provisioning-fetch.ui.h:1
+msgid "Configuring..."
+msgstr "تجري التهيئة..."
+
+#: ../gtk/provisioning-fetch.ui.h:2
+msgid "Please wait while fetching configuration from server..."
+msgstr "رجاءً انتظر ريثما ينتهي من جلب الإعدادات من الخادم..."
+
+#: ../coreapi/linphonecore.c:1510
+msgid "Ready"
+msgstr "جاهز"
+
+#: ../coreapi/linphonecore.c:2473
+msgid "Configuring"
+msgstr "تجري التهيئة"
+
+#: ../coreapi/linphonecore.c:2638
+msgid "Looking for telephone number destination..."
+msgstr "يجري البحث عن وجهة رقم الهاتف..."
+
+#: ../coreapi/linphonecore.c:2640
+msgid "Could not resolve this number."
+msgstr "لم يتمكن من إيجاد هذا الرقم."
+
+#. must be known at that time
+#: ../coreapi/linphonecore.c:2926
+msgid "Contacting"
+msgstr "يتصل ب"
+
+#: ../coreapi/linphonecore.c:2931
+msgid "Could not call"
+msgstr "لم يتمكن من الاتصال"
+
+#: ../coreapi/linphonecore.c:3081
+msgid "Sorry, we have reached the maximum number of simultaneous calls"
+msgstr "آسف، وصل عدد المكالمات الآنية إلى حده الأقصى"
+
+#: ../coreapi/linphonecore.c:3240
+msgid "is contacting you"
+msgstr "يتصل بك"
+
+#: ../coreapi/linphonecore.c:3241
+msgid " and asked autoanswer."
+msgstr "ويطلب ردا تلقائيا."
+
+#: ../coreapi/linphonecore.c:3359
+msgid "Modifying call parameters..."
+msgstr "يجري تعديل إعدادات المكالمة..."
+
+#: ../coreapi/linphonecore.c:3707
+msgid "Connected."
+msgstr "متصل."
+
+#: ../coreapi/linphonecore.c:3732
+msgid "Call aborted"
+msgstr "أُلغيت المكالمة"
+
+#: ../coreapi/linphonecore.c:3922
+msgid "Could not pause the call"
+msgstr "لم يتمكن من توقيف المكالمة مؤقتا"
+
+#: ../coreapi/linphonecore.c:3926
+msgid "Pausing the current call..."
+msgstr "وضع المكالمة قيد الانتظار..."
+
+#: ../coreapi/misc.c:438
+msgid "Stun lookup in progress..."
+msgstr "يجري بحث STUN..."
+
+#: ../coreapi/misc.c:619
+msgid "ICE local candidates gathering in progress..."
+msgstr "يجري جلب مرشَّحي ICE المحلين..."
+
+#: ../coreapi/friend.c:33
+msgid "Online"
+msgstr "على الخط"
+
+#: ../coreapi/friend.c:36
+msgid "Busy"
+msgstr "مشغول"
+
+#: ../coreapi/friend.c:39
+msgid "Be right back"
+msgstr "سأعود"
+
+#: ../coreapi/friend.c:42
+msgid "Away"
+msgstr "غائب"
+
+#: ../coreapi/friend.c:45
+msgid "On the phone"
+msgstr "على الهاتف"
+
+#: ../coreapi/friend.c:48
+msgid "Out to lunch"
+msgstr "أمام مائدة الطعام"
+
+#: ../coreapi/friend.c:51
+msgid "Do not disturb"
+msgstr "لا تزعجني"
+
+#: ../coreapi/friend.c:54
+msgid "Moved"
+msgstr "ذهبتُ"
+
+#: ../coreapi/friend.c:57
+msgid "Using another messaging service"
+msgstr "استخدام خدمة أخرى للتراسل الفوري"
+
+#: ../coreapi/friend.c:60
+msgid "Offline"
+msgstr "غير متصل"
+
+#: ../coreapi/friend.c:63
+msgid "Pending"
+msgstr "قيد الانتظار"
+
+#: ../coreapi/friend.c:66
+msgid "Vacation"
+msgstr "في عطلة"
+
+#: ../coreapi/friend.c:68
+msgid "Unknown status"
+msgstr "حالة مجهولة"
+
+#: ../coreapi/proxy.c:319
+msgid ""
+"The sip proxy address you entered is invalid, it must start with \"sip:\" "
+"followed by a hostname."
+msgstr "عنوان SIP الذي أدخلت غير صالح، يجب أن يبدأ ب \"sip:\" متبوعا بإسم النطاق."
+
+#: ../coreapi/proxy.c:325
+msgid ""
+"The sip identity you entered is invalid.\n"
+"It should look like sip:username@proxydomain, such as sip:alice@example.net"
+msgstr "هوية SIP التي أدخلت غير صحيحة.\nيجب أن تشبه هذا النمط sip:username@proxydomain، مثلا sip:alice@example.net"
+
+#: ../coreapi/proxy.c:1377
+#, c-format
+msgid "Could not login as %s"
+msgstr "تعذر الولوج بالهوية %s"
+
+#: ../coreapi/callbacks.c:383
+msgid "Remote ringing."
+msgstr "يرن الجرس عن بعد..."
+
+#: ../coreapi/callbacks.c:404
+msgid "Remote ringing..."
+msgstr "يرن الجرس عن بعد..."
+
+#: ../coreapi/callbacks.c:414
+msgid "Early media."
+msgstr "أخذ المكالمة مبكرا."
+
+#: ../coreapi/callbacks.c:475
+#, c-format
+msgid "Call with %s is paused."
+msgstr "المكاملة مع %s متوقفة."
+
+#: ../coreapi/callbacks.c:488
+#, c-format
+msgid "Call answered by %s - on hold."
+msgstr "يجيب %s عن المكالمة - في وضع الانتظار."
+
+#: ../coreapi/callbacks.c:498
+msgid "Call resumed."
+msgstr "استُعيدت المكالمة."
+
+#: ../coreapi/callbacks.c:502
+#, c-format
+msgid "Call answered by %s."
+msgstr "أجاب عن المكالمة %s."
+
+#: ../coreapi/callbacks.c:525
+msgid "Incompatible, check codecs or security settings..."
+msgstr "غير موائم، تحقق من المراميز أو إعدادات الأمان..."
+
+#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:826
+msgid "Incompatible media parameters."
+msgstr "إعدادات الوسائط غير موائمة."
+
+#: ../coreapi/callbacks.c:560
+msgid "We have been resumed."
+msgstr "استُأنِفت المكالمة."
+
+#. we are being paused
+#: ../coreapi/callbacks.c:568
+msgid "We are paused by other party."
+msgstr "وُقِّفت المكالمة مؤقتا من طرف آخر."
+
+#. reINVITE and in-dialogs UPDATE go here
+#: ../coreapi/callbacks.c:602
+msgid "Call is updated by remote."
+msgstr "حُدِّث الاتصال من البعيد."
+
+#: ../coreapi/callbacks.c:705
+msgid "Call terminated."
+msgstr "أُنهيت المكالمة."
+
+#: ../coreapi/callbacks.c:733
+msgid "User is busy."
+msgstr "المستخدم مشغول."
+
+#: ../coreapi/callbacks.c:734
+msgid "User is temporarily unavailable."
+msgstr "المستخدم غير متاح مؤقتا."
+
+#. char *retrymsg=_("%s. Retry after %i minute(s).");
+#: ../coreapi/callbacks.c:736
+msgid "User does not want to be disturbed."
+msgstr "لا يريد المستخدم أي إزعاج."
+
+#: ../coreapi/callbacks.c:737
+msgid "Call declined."
+msgstr "تم تجاهل المكالمة."
+
+#: ../coreapi/callbacks.c:752
+msgid "Request timeout."
+msgstr "انتهت مهلة الطلب."
+
+#: ../coreapi/callbacks.c:780
+msgid "Redirected"
+msgstr "مُوجَّه"
+
+#: ../coreapi/callbacks.c:835
+msgid "Call failed."
+msgstr "فشل الاتصال."
+
+#: ../coreapi/callbacks.c:913
+#, c-format
+msgid "Registration on %s successful."
+msgstr "تم التسجيل في %s بنجاح."
+
+#: ../coreapi/callbacks.c:914
+#, c-format
+msgid "Unregistration on %s done."
+msgstr "أُلغي التسجيل في %s ."
+
+#: ../coreapi/callbacks.c:932
+msgid "no response timeout"
+msgstr "لا إجابة قبل انتهاء المهلة"
+
+#: ../coreapi/callbacks.c:935
+#, c-format
+msgid "Registration on %s failed: %s"
+msgstr "فَشِل التسجيل في %s: %s"
+
+#: ../coreapi/callbacks.c:942
+msgid "Service unavailable, retrying"
+msgstr "خدمة غير متاحة، تجري الإعادة"
+
+#: ../coreapi/linphonecall.c:174
+#, c-format
+msgid "Authentication token is %s"
+msgstr "شارة التحقق من الهوية هي %s"
+
+#: ../coreapi/linphonecall.c:3020
+#, c-format
+msgid "You have missed %i call."
+msgid_plural "You have missed %i calls."
+msgstr[0] "لم تفتك أي مكالمة."
+msgstr[1] "فاتتك مكالمة واحدة."
+msgstr[2] "فاتتك مكالمتان."
+msgstr[3] "فاتتك %i مكالمات."
+msgstr[4] "فاتتك %i مكالمة."
+msgstr[5] "فاتتك %i مكالمة."
+
+#: ../coreapi/call_log.c:209
+msgid "aborted"
+msgstr ""
+
+#: ../coreapi/call_log.c:212
+msgid "completed"
+msgstr ""
+
+#: ../coreapi/call_log.c:215
+msgid "missed"
+msgstr ""
+
+#: ../coreapi/call_log.c:220
+#, c-format
+msgid ""
+"%s at %s\n"
+"From: %s\n"
+"To: %s\n"
+"Status: %s\n"
+"Duration: %i mn %i sec\n"
+msgstr ""
+
+#: ../coreapi/call_log.c:221
+msgid "Outgoing call"
+msgstr ""
+
+#: ../gtk/videowindow.c:66
+#, c-format
+msgid "Cannot play %s."
+msgstr ""
diff --git a/po/cs.po b/po/cs.po
index a8a550fa4..f7b9c76f2 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-28 10:55+0100\n"
-"PO-Revision-Date: 2014-11-19 10:17+0000\n"
+"POT-Creation-Date: 2014-12-01 14:27+0100\n"
+"PO-Revision-Date: 2014-12-01 13:28+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Czech (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/cs/)\n"
@@ -162,11 +162,11 @@ msgstr ""
 msgid "Call error"
 msgstr "Chyba hovoru"
 
-#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3747
+#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3751
 msgid "Call ended"
 msgstr "Hovor ukončen"
 
-#: ../gtk/main.c:1289
+#: ../gtk/main.c:1289 ../coreapi/call_log.c:221
 msgid "Incoming call"
 msgstr "Příchozí hovor"
 
@@ -426,13 +426,10 @@ msgstr[1] "Nalezeny %i kontakty"
 msgstr[2] "Nalezeno %i kontaktů"
 
 #: ../gtk/setupwizard.c:34
-#, fuzzy
 msgid ""
 "Welcome!\n"
 "This assistant will help you to use a SIP account for your calls."
 msgstr ""
-"Vítejte!\n"
-"Tento průvodce vám pomůže používat sipový účet při vašich hovorech."
 
 #: ../gtk/setupwizard.c:43
 msgid "Create an account on linphone.org"
@@ -646,7 +643,7 @@ msgstr ""
 msgid "%.3f seconds"
 msgstr "%.3f sekund"
 
-#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12
+#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12 ../gtk/videowindow.c:232
 msgid "Hang up"
 msgstr "Zavěsit"
 
@@ -784,13 +781,10 @@ msgid "Too loud"
 msgstr ""
 
 #: ../gtk/audio_assistant.c:318
-#, fuzzy
 msgid ""
 "Welcome!\n"
 "This assistant will help you to configure audio settings for Linphone"
 msgstr ""
-"Vítejte!\n"
-"Tento průvodce vám pomůže používat sipový účet při vašich hovorech."
 
 #: ../gtk/audio_assistant.c:328
 msgid "Capture device"
@@ -997,23 +991,20 @@ msgid "Login information"
 msgstr "Informace o přihlášení"
 
 #: ../gtk/main.ui.h:46
-#, fuzzy
 msgid "<b>Welcome!</b>"
-msgstr "<b>Vítejte!</b>"
+msgstr ""
 
 #: ../gtk/main.ui.h:47
 msgid "Delete"
 msgstr "Smazat"
 
 #: ../gtk/about.ui.h:1
-#, fuzzy
 msgid "About Linphone"
-msgstr "O Linphonu"
+msgstr ""
 
 #: ../gtk/about.ui.h:2
-#, fuzzy
 msgid "(C) Belledonne Communications, 2010\n"
-msgstr "© Belledonne Communications, 2010\n"
+msgstr ""
 
 #: ../gtk/about.ui.h:4
 msgid "An internet video phone using the standard SIP (rfc3261) protocol."
@@ -1702,43 +1693,43 @@ msgid "Could not resolve this number."
 msgstr "Toto číslo nelze vyhledat."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2922
+#: ../coreapi/linphonecore.c:2926
 msgid "Contacting"
 msgstr "Navazuje se spojení"
 
-#: ../coreapi/linphonecore.c:2927
+#: ../coreapi/linphonecore.c:2931
 msgid "Could not call"
 msgstr "Nelze volat"
 
-#: ../coreapi/linphonecore.c:3077
+#: ../coreapi/linphonecore.c:3081
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "Je nám líto, ale byl dosažen maximální počet současných hovorů."
 
-#: ../coreapi/linphonecore.c:3236
+#: ../coreapi/linphonecore.c:3240
 msgid "is contacting you"
 msgstr "vás volá"
 
-#: ../coreapi/linphonecore.c:3237
+#: ../coreapi/linphonecore.c:3241
 msgid " and asked autoanswer."
 msgstr " a požaduje automatickou zvednutí."
 
-#: ../coreapi/linphonecore.c:3355
+#: ../coreapi/linphonecore.c:3359
 msgid "Modifying call parameters..."
 msgstr "Upravují se parametry hovoru…"
 
-#: ../coreapi/linphonecore.c:3703
+#: ../coreapi/linphonecore.c:3707
 msgid "Connected."
 msgstr "Připojeno."
 
-#: ../coreapi/linphonecore.c:3728
+#: ../coreapi/linphonecore.c:3732
 msgid "Call aborted"
 msgstr "Hovor přerušen"
 
-#: ../coreapi/linphonecore.c:3918
+#: ../coreapi/linphonecore.c:3922
 msgid "Could not pause the call"
 msgstr "Hovor nebylo možné odložit"
 
-#: ../coreapi/linphonecore.c:3922
+#: ../coreapi/linphonecore.c:3926
 msgid "Pausing the current call..."
 msgstr "Současný hovor se odkládá…"
 
@@ -1799,9 +1790,8 @@ msgid "Vacation"
 msgstr ""
 
 #: ../coreapi/friend.c:68
-#, fuzzy
 msgid "Unknown status"
-msgstr "Neznámá chyba"
+msgstr ""
 
 #: ../coreapi/proxy.c:319
 msgid ""
@@ -1946,60 +1936,33 @@ msgstr[0] "Máte %i zmeškaný hovor."
 msgstr[1] "Máte %i zmeškané hovory."
 msgstr[2] "Máte %i zmeškaných hovorů."
 
-#~ msgid "D"
-#~ msgstr "D"
+#: ../coreapi/call_log.c:209
+msgid "aborted"
+msgstr ""
 
-#~ msgid "#"
-#~ msgstr "#"
+#: ../coreapi/call_log.c:212
+msgid "completed"
+msgstr ""
 
-#~ msgid "0"
-#~ msgstr "0"
+#: ../coreapi/call_log.c:215
+msgid "missed"
+msgstr ""
 
-#~ msgid "*"
-#~ msgstr "*"
+#: ../coreapi/call_log.c:220
+#, c-format
+msgid ""
+"%s at %s\n"
+"From: %s\n"
+"To: %s\n"
+"Status: %s\n"
+"Duration: %i mn %i sec\n"
+msgstr ""
 
-#~ msgid "9"
-#~ msgstr "9"
+#: ../coreapi/call_log.c:221
+msgid "Outgoing call"
+msgstr ""
 
-#~ msgid "8"
-#~ msgstr "8"
-
-#~ msgid "7"
-#~ msgstr "7"
-
-#~ msgid "B"
-#~ msgstr "B"
-
-#~ msgid "6"
-#~ msgstr "6"
-
-#~ msgid "5"
-#~ msgstr "5"
-
-#~ msgid "4"
-#~ msgstr "4"
-
-#~ msgid "A"
-#~ msgstr "A"
-
-#~ msgid "3"
-#~ msgstr "3"
-
-#~ msgid "2"
-#~ msgstr "2"
-
-#~ msgid "1"
-#~ msgstr "1"
-
-#~ msgid ""
-#~ "<small><i>%s</i></small>\t\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<small><i>%s</i></small>\t\n"
-#~ "%s"
-
-#~ msgid "%02i::%02i::%02i"
-#~ msgstr "%02i:%02i:%02i"
-
-#~ msgid "."
-#~ msgstr "."
+#: ../gtk/videowindow.c:66
+#, c-format
+msgid "Cannot play %s."
+msgstr ""
diff --git a/po/de.po b/po/de.po
index a36d864f0..a97e08884 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,15 +4,16 @@
 #
 # Translators:
 # andreas, 2014
+# andreas, 2014
 # Gerhard Stengel <gstengel@gmx.net>, 2011-2012
 # Simon Morlat <linphone@free.fr>, 2001
 msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-28 10:55+0100\n"
-"PO-Revision-Date: 2014-11-25 16:45+0000\n"
-"Last-Translator: andreas\n"
+"POT-Creation-Date: 2014-12-01 14:27+0100\n"
+"PO-Revision-Date: 2014-12-01 13:28+0000\n"
+"Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/de/)\n"
 "Language: de\n"
@@ -165,11 +166,11 @@ msgstr ""
 msgid "Call error"
 msgstr "Anruf fehlgeschlagen"
 
-#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3747
+#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3751
 msgid "Call ended"
 msgstr "Anruf beendet"
 
-#: ../gtk/main.c:1289
+#: ../gtk/main.c:1289 ../coreapi/call_log.c:221
 msgid "Incoming call"
 msgstr "Eingehender Anruf"
 
@@ -430,14 +431,12 @@ msgstr[0] "%i Kontakt gefunden"
 msgstr[1] "%i Kontakte gefunden"
 
 #: ../gtk/setupwizard.c:34
-#, fuzzy
 msgid ""
 "Welcome!\n"
 "This assistant will help you to use a SIP account for your calls."
 msgstr ""
 "Willkommen!\n"
-"Dieser Assistent wird Ihnen dabei helfen, ein SIP-Konto für Ihre Anrufe zu "
-"verwenden."
+"Dieser Assistent hilft Ihnen dabei ein SIP-Konto einzurichten."
 
 #: ../gtk/setupwizard.c:43
 msgid "Create an account on linphone.org"
@@ -653,7 +652,7 @@ msgstr "%ix%i @ %f bps"
 msgid "%.3f seconds"
 msgstr "%.3f Sekunden"
 
-#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12
+#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12 ../gtk/videowindow.c:232
 msgid "Hang up"
 msgstr "Auflegen"
 
@@ -791,14 +790,13 @@ msgid "Too loud"
 msgstr "zu laut"
 
 #: ../gtk/audio_assistant.c:318
-#, fuzzy
 msgid ""
 "Welcome!\n"
 "This assistant will help you to configure audio settings for Linphone"
 msgstr ""
 "Willkommen!\n"
-"Dieser Assistent wird Ihnen dabei helfen, die Audio-Einstellungen für "
-"Linphone vorzunehmen."
+"Dieser Assistent hilft Ihnen die Audioeinstellungen für Linphone "
+"einzurichten."
 
 #: ../gtk/audio_assistant.c:328
 msgid "Capture device"
@@ -1005,23 +1003,20 @@ msgid "Login information"
 msgstr "Anmeldeinformationen"
 
 #: ../gtk/main.ui.h:46
-#, fuzzy
 msgid "<b>Welcome!</b>"
-msgstr "<b>Willkommen !</b>"
+msgstr "<b>Willkommen!</b>"
 
 #: ../gtk/main.ui.h:47
 msgid "Delete"
 msgstr "Löschen"
 
 #: ../gtk/about.ui.h:1
-#, fuzzy
 msgid "About Linphone"
 msgstr "Über Linphone"
 
 #: ../gtk/about.ui.h:2
-#, fuzzy
 msgid "(C) Belledonne Communications, 2010\n"
-msgstr "(C) Belledonne Communications,2010\n"
+msgstr "(C) Belledonne Communications, 2010\n"
 
 #: ../gtk/about.ui.h:4
 msgid "An internet video phone using the standard SIP (rfc3261) protocol."
@@ -1732,43 +1727,43 @@ msgid "Could not resolve this number."
 msgstr "Diese Nummer kann nicht aufgelöst werden."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2922
+#: ../coreapi/linphonecore.c:2926
 msgid "Contacting"
 msgstr "Verbindungsaufbau"
 
-#: ../coreapi/linphonecore.c:2927
+#: ../coreapi/linphonecore.c:2931
 msgid "Could not call"
 msgstr "Anruf kann nicht getätigt werden."
 
-#: ../coreapi/linphonecore.c:3077
+#: ../coreapi/linphonecore.c:3081
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "Die maximale Anzahl der gleichzeitigen Anrufe ist erreicht."
 
-#: ../coreapi/linphonecore.c:3236
+#: ../coreapi/linphonecore.c:3240
 msgid "is contacting you"
 msgstr "ruft Sie an"
 
-#: ../coreapi/linphonecore.c:3237
+#: ../coreapi/linphonecore.c:3241
 msgid " and asked autoanswer."
 msgstr " und fragt nach automatischer Antwort."
 
-#: ../coreapi/linphonecore.c:3355
+#: ../coreapi/linphonecore.c:3359
 msgid "Modifying call parameters..."
 msgstr "Die Anrufparameter werden verändert..."
 
-#: ../coreapi/linphonecore.c:3703
+#: ../coreapi/linphonecore.c:3707
 msgid "Connected."
 msgstr "Verbunden."
 
-#: ../coreapi/linphonecore.c:3728
+#: ../coreapi/linphonecore.c:3732
 msgid "Call aborted"
 msgstr "Anruf abgebrochen"
 
-#: ../coreapi/linphonecore.c:3918
+#: ../coreapi/linphonecore.c:3922
 msgid "Could not pause the call"
 msgstr "Anruf kann nicht gehalten werden"
 
-#: ../coreapi/linphonecore.c:3922
+#: ../coreapi/linphonecore.c:3926
 msgid "Pausing the current call..."
 msgstr "Aktueller Anruf wird gehalten..."
 
@@ -1829,9 +1824,8 @@ msgid "Vacation"
 msgstr "Urlaub"
 
 #: ../coreapi/friend.c:68
-#, fuzzy
 msgid "Unknown status"
-msgstr "Unbekannter Fehler"
+msgstr "Unbekannter Status"
 
 #: ../coreapi/proxy.c:319
 msgid ""
@@ -1976,66 +1970,33 @@ msgid_plural "You have missed %i calls."
 msgstr[0] "Sie haben %i Anruf in Abwesenheit."
 msgstr[1] "Sie haben %i Anrufe in Abwesenheit."
 
-#~ msgid "https://"
-#~ msgstr "https://"
+#: ../coreapi/call_log.c:209
+msgid "aborted"
+msgstr ""
 
-#~ msgid "label"
-#~ msgstr "Hinweisschild"
+#: ../coreapi/call_log.c:212
+msgid "completed"
+msgstr ""
 
-#~ msgid "D"
-#~ msgstr "D"
+#: ../coreapi/call_log.c:215
+msgid "missed"
+msgstr ""
 
-#~ msgid "#"
-#~ msgstr "#"
+#: ../coreapi/call_log.c:220
+#, c-format
+msgid ""
+"%s at %s\n"
+"From: %s\n"
+"To: %s\n"
+"Status: %s\n"
+"Duration: %i mn %i sec\n"
+msgstr ""
 
-#~ msgid "0"
-#~ msgstr "0"
+#: ../coreapi/call_log.c:221
+msgid "Outgoing call"
+msgstr ""
 
-#~ msgid "*"
-#~ msgstr "*"
-
-#~ msgid "9"
-#~ msgstr "9"
-
-#~ msgid "8"
-#~ msgstr "8"
-
-#~ msgid "7"
-#~ msgstr "7"
-
-#~ msgid "B"
-#~ msgstr "B"
-
-#~ msgid "6"
-#~ msgstr "6"
-
-#~ msgid "5"
-#~ msgstr "5"
-
-#~ msgid "4"
-#~ msgstr "4"
-
-#~ msgid "A"
-#~ msgstr "A"
-
-#~ msgid "3"
-#~ msgstr "3"
-
-#~ msgid "2"
-#~ msgstr "2"
-
-#~ msgid "1"
-#~ msgstr "1"
-
-#~ msgid ""
-#~ "<small><i>%s</i></small>\t\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<small><i>%s</i></small>\t\n"
-#~ "%s"
-
-#~ msgid "%02i::%02i::%02i"
-#~ msgstr "%02i::%02i::%02i"
-
-#~ msgid "."
-#~ msgstr "."
+#: ../gtk/videowindow.c:66
+#, c-format
+msgid "Cannot play %s."
+msgstr ""
diff --git a/po/es.po b/po/es.po
index b2054661d..f8a5bfba5 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-28 10:55+0100\n"
-"PO-Revision-Date: 2014-11-19 10:17+0000\n"
+"POT-Creation-Date: 2014-12-01 14:27+0100\n"
+"PO-Revision-Date: 2014-12-01 13:28+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/es/)\n"
@@ -157,11 +157,11 @@ msgstr ""
 msgid "Call error"
 msgstr ""
 
-#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3747
+#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3751
 msgid "Call ended"
 msgstr ""
 
-#: ../gtk/main.c:1289
+#: ../gtk/main.c:1289 ../coreapi/call_log.c:221
 msgid "Incoming call"
 msgstr "Llamada entrante"
 
@@ -418,13 +418,10 @@ msgstr[0] "Se encontró %i contacto"
 msgstr[1] "Se encontraron %i contactos"
 
 #: ../gtk/setupwizard.c:34
-#, fuzzy
 msgid ""
 "Welcome!\n"
 "This assistant will help you to use a SIP account for your calls."
 msgstr ""
-"¡Bienvenido/a !\n"
-"Este asistente le ayudará a utilizar una cuenta SIP para sus llamadas."
 
 #: ../gtk/setupwizard.c:43
 msgid "Create an account on linphone.org"
@@ -630,7 +627,7 @@ msgstr ""
 msgid "%.3f seconds"
 msgstr ""
 
-#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12
+#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12 ../gtk/videowindow.c:232
 msgid "Hang up"
 msgstr ""
 
@@ -766,13 +763,10 @@ msgid "Too loud"
 msgstr ""
 
 #: ../gtk/audio_assistant.c:318
-#, fuzzy
 msgid ""
 "Welcome!\n"
 "This assistant will help you to configure audio settings for Linphone"
 msgstr ""
-"¡Bienvenido/a !\n"
-"Este asistente le ayudará a utilizar una cuenta SIP para sus llamadas."
 
 #: ../gtk/audio_assistant.c:328
 msgid "Capture device"
@@ -1683,43 +1677,43 @@ msgid "Could not resolve this number."
 msgstr "No se ha podido resolver este número."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2922
+#: ../coreapi/linphonecore.c:2926
 msgid "Contacting"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2927
+#: ../coreapi/linphonecore.c:2931
 msgid "Could not call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3077
+#: ../coreapi/linphonecore.c:3081
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "Disculpe, se ha alcanzado el máximo número de llamadas simultáneas"
 
-#: ../coreapi/linphonecore.c:3236
+#: ../coreapi/linphonecore.c:3240
 msgid "is contacting you"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3237
+#: ../coreapi/linphonecore.c:3241
 msgid " and asked autoanswer."
 msgstr "y ha solicitado auto respuesta."
 
-#: ../coreapi/linphonecore.c:3355
+#: ../coreapi/linphonecore.c:3359
 msgid "Modifying call parameters..."
 msgstr "Modificando parámetros de llamada…"
 
-#: ../coreapi/linphonecore.c:3703
+#: ../coreapi/linphonecore.c:3707
 msgid "Connected."
 msgstr "Conectado."
 
-#: ../coreapi/linphonecore.c:3728
+#: ../coreapi/linphonecore.c:3732
 msgid "Call aborted"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3918
+#: ../coreapi/linphonecore.c:3922
 msgid "Could not pause the call"
 msgstr "No se pudo pausar la llamada"
 
-#: ../coreapi/linphonecore.c:3922
+#: ../coreapi/linphonecore.c:3926
 msgid "Pausing the current call..."
 msgstr "Pausando la llamada actual..."
 
@@ -1780,9 +1774,8 @@ msgid "Vacation"
 msgstr ""
 
 #: ../coreapi/friend.c:68
-#, fuzzy
 msgid "Unknown status"
-msgstr "Bug-desconocido"
+msgstr ""
 
 #: ../coreapi/proxy.c:319
 msgid ""
@@ -1927,56 +1920,33 @@ msgid_plural "You have missed %i calls."
 msgstr[0] "Tiene %i llamada perdida."
 msgstr[1] "Tiene %i llamadas perdidas."
 
-#~ msgid "label"
-#~ msgstr "etiqueta"
+#: ../coreapi/call_log.c:209
+msgid "aborted"
+msgstr ""
 
-#~ msgid "D"
-#~ msgstr "D"
+#: ../coreapi/call_log.c:212
+msgid "completed"
+msgstr ""
 
-#~ msgid "#"
-#~ msgstr "#"
+#: ../coreapi/call_log.c:215
+msgid "missed"
+msgstr ""
 
-#~ msgid "0"
-#~ msgstr "0"
+#: ../coreapi/call_log.c:220
+#, c-format
+msgid ""
+"%s at %s\n"
+"From: %s\n"
+"To: %s\n"
+"Status: %s\n"
+"Duration: %i mn %i sec\n"
+msgstr ""
 
-#~ msgid "*"
-#~ msgstr "*"
+#: ../coreapi/call_log.c:221
+msgid "Outgoing call"
+msgstr ""
 
-#~ msgid "9"
-#~ msgstr "9"
-
-#~ msgid "8"
-#~ msgstr "8"
-
-#~ msgid "7"
-#~ msgstr "7"
-
-#~ msgid "B"
-#~ msgstr "B"
-
-#~ msgid "6"
-#~ msgstr "6"
-
-#~ msgid "5"
-#~ msgstr "5"
-
-#~ msgid "4"
-#~ msgstr "4"
-
-#~ msgid "A"
-#~ msgstr "A"
-
-#~ msgid "3"
-#~ msgstr "3"
-
-#~ msgid "2"
-#~ msgstr "2"
-
-#~ msgid "1"
-#~ msgstr "1"
-
-#~ msgid "%02i::%02i::%02i"
-#~ msgstr "%02i::%02i::%02i"
-
-#~ msgid "."
-#~ msgstr "."
+#: ../gtk/videowindow.c:66
+#, c-format
+msgid "Cannot play %s."
+msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 5e64f94e2..c83a84985 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-28 10:55+0100\n"
-"PO-Revision-Date: 2014-11-27 15:47+0000\n"
+"POT-Creation-Date: 2014-12-01 14:27+0100\n"
+"PO-Revision-Date: 2014-12-01 13:30+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/fr/)\n"
@@ -57,8 +57,8 @@ msgstr "Refusé"
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%i minute"
+msgstr[1] "%i minutes"
 
 #: ../gtk/calllogs.c:332
 #, c-format
@@ -165,11 +165,11 @@ msgstr ""
 msgid "Call error"
 msgstr "Erreur lors de l'appel"
 
-#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3747
+#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3751
 msgid "Call ended"
 msgstr "Appel terminé."
 
-#: ../gtk/main.c:1289
+#: ../gtk/main.c:1289 ../coreapi/call_log.c:221
 msgid "Incoming call"
 msgstr "Appel entrant"
 
@@ -431,12 +431,11 @@ msgstr[0] "%i contact trouvé."
 msgstr[1] "%i contacts trouvés."
 
 #: ../gtk/setupwizard.c:34
-#, fuzzy
 msgid ""
 "Welcome!\n"
 "This assistant will help you to use a SIP account for your calls."
 msgstr ""
-"Bienvenue!\n"
+"Bienvenue !\n"
 "Cet assistant va vous aider à utiliser un compte SIP pour vos appels."
 
 #: ../gtk/setupwizard.c:43
@@ -638,6 +637,8 @@ msgid ""
 "download: %f\n"
 "upload: %f (kbit/s)"
 msgstr ""
+"débit descendant : %f\n"
+"débit ascendant : %f (kbits/s)"
 
 #: ../gtk/incall_view.c:272 ../gtk/incall_view.c:274
 #, c-format
@@ -649,7 +650,7 @@ msgstr "%ix%i @ %f fps"
 msgid "%.3f seconds"
 msgstr "%.3f secondes"
 
-#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12
+#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12 ../gtk/videowindow.c:232
 msgid "Hang up"
 msgstr "Raccrocher"
 
@@ -787,12 +788,11 @@ msgid "Too loud"
 msgstr "Trop bruyant"
 
 #: ../gtk/audio_assistant.c:318
-#, fuzzy
 msgid ""
 "Welcome!\n"
 "This assistant will help you to configure audio settings for Linphone"
 msgstr ""
-"Bienvenue!\n"
+"Bienvenue !\n"
 "Cet assistant va vous aider à régler les paramètres audio de votre "
 "ordinateur pour une utilisation optimale avec Linphone."
 
@@ -938,7 +938,7 @@ msgstr "_Site web"
 
 #: ../gtk/main.ui.h:29
 msgid "Check _Updates"
-msgstr ""
+msgstr "_Mises à jour"
 
 #: ../gtk/main.ui.h:30
 msgid "Account assistant"
@@ -1001,7 +1001,6 @@ msgid "Login information"
 msgstr "Information de login"
 
 #: ../gtk/main.ui.h:46
-#, fuzzy
 msgid "<b>Welcome!</b>"
 msgstr "<b>Bienvenue !</b>"
 
@@ -1010,12 +1009,10 @@ msgid "Delete"
 msgstr "Supprimer"
 
 #: ../gtk/about.ui.h:1
-#, fuzzy
 msgid "About Linphone"
-msgstr "A propos de linphone"
+msgstr "À propos de Linphone"
 
 #: ../gtk/about.ui.h:2
-#, fuzzy
 msgid "(C) Belledonne Communications, 2010\n"
 msgstr "(C) Belledonne Communications, 2010\n"
 
@@ -1129,7 +1126,7 @@ msgstr "Paramètres de contact (optionnel):"
 
 #: ../gtk/sip_account.ui.h:9
 msgid "AVPF regular RTCP interval (sec):"
-msgstr ""
+msgstr "Intervalle standard RTCP AVPF (sec) :"
 
 #: ../gtk/sip_account.ui.h:10
 msgid "Route (optional):"
@@ -1165,7 +1162,7 @@ msgstr "GSSAPI"
 
 #: ../gtk/parameters.ui.h:3
 msgid "SASL"
-msgstr ""
+msgstr "SASL"
 
 #: ../gtk/parameters.ui.h:4
 msgid "default soundcard"
@@ -1612,7 +1609,7 @@ msgstr "<b>Connexion</b>"
 
 #: ../gtk/ldap.ui.h:9
 msgid "Bind DN"
-msgstr ""
+msgstr "Assigner ND"
 
 #: ../gtk/ldap.ui.h:10
 msgid "Authname"
@@ -1728,43 +1725,43 @@ msgid "Could not resolve this number."
 msgstr "La destination n'a pu être trouvée."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2922
+#: ../coreapi/linphonecore.c:2926
 msgid "Contacting"
 msgstr "Appel de"
 
-#: ../coreapi/linphonecore.c:2927
+#: ../coreapi/linphonecore.c:2931
 msgid "Could not call"
 msgstr "Echec de l'appel"
 
-#: ../coreapi/linphonecore.c:3077
+#: ../coreapi/linphonecore.c:3081
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "Désolé, le nombre maximum d'appels simultanés est atteint."
 
-#: ../coreapi/linphonecore.c:3236
+#: ../coreapi/linphonecore.c:3240
 msgid "is contacting you"
 msgstr "vous appelle"
 
-#: ../coreapi/linphonecore.c:3237
+#: ../coreapi/linphonecore.c:3241
 msgid " and asked autoanswer."
 msgstr "et sollicite un décrochage automatique."
 
-#: ../coreapi/linphonecore.c:3355
+#: ../coreapi/linphonecore.c:3359
 msgid "Modifying call parameters..."
 msgstr "Modifications des paramètres d'appels..."
 
-#: ../coreapi/linphonecore.c:3703
+#: ../coreapi/linphonecore.c:3707
 msgid "Connected."
 msgstr "En ligne."
 
-#: ../coreapi/linphonecore.c:3728
+#: ../coreapi/linphonecore.c:3732
 msgid "Call aborted"
 msgstr "Appel abandonné"
 
-#: ../coreapi/linphonecore.c:3918
+#: ../coreapi/linphonecore.c:3922
 msgid "Could not pause the call"
 msgstr "La mise en attente a échoué"
 
-#: ../coreapi/linphonecore.c:3922
+#: ../coreapi/linphonecore.c:3926
 msgid "Pausing the current call..."
 msgstr "Mise en attente de l'appel..."
 
@@ -1825,9 +1822,8 @@ msgid "Vacation"
 msgstr "En congé"
 
 #: ../coreapi/friend.c:68
-#, fuzzy
 msgid "Unknown status"
-msgstr "Bug inconnu"
+msgstr "Status inconnu"
 
 #: ../coreapi/proxy.c:319
 msgid ""
@@ -1972,66 +1968,38 @@ msgid_plural "You have missed %i calls."
 msgstr[0] "Vous avez manqué %i appel"
 msgstr[1] "Vous avez manqué %i appels"
 
-#~ msgid "https://"
-#~ msgstr "https://"
+#: ../coreapi/call_log.c:209
+msgid "aborted"
+msgstr "interrompu"
 
-#~ msgid "label"
-#~ msgstr "label"
+#: ../coreapi/call_log.c:212
+msgid "completed"
+msgstr "terminé"
 
-#~ msgid "D"
-#~ msgstr "D"
+#: ../coreapi/call_log.c:215
+msgid "missed"
+msgstr "manqué"
 
-#~ msgid "#"
-#~ msgstr "#"
+#: ../coreapi/call_log.c:220
+#, c-format
+msgid ""
+"%s at %s\n"
+"From: %s\n"
+"To: %s\n"
+"Status: %s\n"
+"Duration: %i mn %i sec\n"
+msgstr ""
+"%s à %s\n"
+"De : %s\n"
+"Vers : %s\n"
+"Status : %s\n"
+"Durée : %i min %i sec\n"
 
-#~ msgid "0"
-#~ msgstr "0"
+#: ../coreapi/call_log.c:221
+msgid "Outgoing call"
+msgstr "Appel sortant"
 
-#~ msgid "*"
-#~ msgstr "*"
-
-#~ msgid "9"
-#~ msgstr "9"
-
-#~ msgid "8"
-#~ msgstr "8"
-
-#~ msgid "7"
-#~ msgstr "7"
-
-#~ msgid "B"
-#~ msgstr "B"
-
-#~ msgid "6"
-#~ msgstr "6"
-
-#~ msgid "5"
-#~ msgstr "5"
-
-#~ msgid "4"
-#~ msgstr "4"
-
-#~ msgid "A"
-#~ msgstr "A"
-
-#~ msgid "3"
-#~ msgstr "3"
-
-#~ msgid "2"
-#~ msgstr "2"
-
-#~ msgid "1"
-#~ msgstr "1"
-
-#~ msgid ""
-#~ "<small><i>%s</i></small>\t\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<small><i>%s</i></small>\t\n"
-#~ "%s"
-
-#~ msgid "%02i::%02i::%02i"
-#~ msgstr "%02i::%02i::%02i"
-
-#~ msgid "."
-#~ msgstr "."
+#: ../gtk/videowindow.c:66
+#, c-format
+msgid "Cannot play %s."
+msgstr "Impossibde de jouer %s."
diff --git a/po/he.po b/po/he.po
index e25b70afb..594308819 100644
--- a/po/he.po
+++ b/po/he.po
@@ -5,14 +5,15 @@
 # Translators:
 # Eli Zaretskii <eliz@gnu.org>, 2012
 # GenghisKhan <genghiskhan@gmx.ca>, 2014
+# GenghisKhan <genghiskhan@gmx.ca>, 2014
 # GenghisKhan <genghiskhan@gmx.ca>, 2012-2013
 msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-28 10:55+0100\n"
-"PO-Revision-Date: 2014-11-24 10:22+0000\n"
-"Last-Translator: GenghisKhan <genghiskhan@gmx.ca>\n"
+"POT-Creation-Date: 2014-12-01 14:27+0100\n"
+"PO-Revision-Date: 2014-12-01 13:28+0000\n"
+"Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/he/)\n"
 "Language: he\n"
@@ -161,11 +162,11 @@ msgstr ""
 msgid "Call error"
 msgstr "שגיאת קריאה"
 
-#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3747
+#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3751
 msgid "Call ended"
 msgstr "שיחה הסתיימה"
 
-#: ../gtk/main.c:1289
+#: ../gtk/main.c:1289 ../coreapi/call_log.c:221
 msgid "Incoming call"
 msgstr "קריאה נכנסת"
 
@@ -424,13 +425,10 @@ msgstr[0] "נמצא איש קשר %i"
 msgstr[1] "נמצאו %i אנשי קשר"
 
 #: ../gtk/setupwizard.c:34
-#, fuzzy
 msgid ""
 "Welcome!\n"
 "This assistant will help you to use a SIP account for your calls."
 msgstr ""
-"ברוך בואך !\n"
-"אשף זה יסייע לך לעשות שימוש בחשבון SIP עבור שיחותייך."
 
 #: ../gtk/setupwizard.c:43
 msgid "Create an account on linphone.org"
@@ -642,7 +640,7 @@ msgstr ""
 msgid "%.3f seconds"
 msgstr "%.3f שניות"
 
-#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12
+#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12 ../gtk/videowindow.c:232
 msgid "Hang up"
 msgstr "נתק"
 
@@ -780,13 +778,10 @@ msgid "Too loud"
 msgstr "חזק מדי"
 
 #: ../gtk/audio_assistant.c:318
-#, fuzzy
 msgid ""
 "Welcome!\n"
 "This assistant will help you to configure audio settings for Linphone"
 msgstr ""
-"ברוך בואך !\n"
-"אשף זה יסייע לך לעשות שימוש בחשבון SIP עבור שיחותייך."
 
 #: ../gtk/audio_assistant.c:328
 msgid "Capture device"
@@ -993,23 +988,20 @@ msgid "Login information"
 msgstr "מידע התחברות"
 
 #: ../gtk/main.ui.h:46
-#, fuzzy
 msgid "<b>Welcome!</b>"
-msgstr "<b>ברוך בואך !</b>"
+msgstr ""
 
 #: ../gtk/main.ui.h:47
 msgid "Delete"
 msgstr "מחק"
 
 #: ../gtk/about.ui.h:1
-#, fuzzy
 msgid "About Linphone"
-msgstr "אודות לינפון"
+msgstr ""
 
 #: ../gtk/about.ui.h:2
-#, fuzzy
 msgid "(C) Belledonne Communications, 2010\n"
-msgstr "‫(C) ‫Belledonne Communications,‫2010\n"
+msgstr ""
 
 #: ../gtk/about.ui.h:4
 msgid "An internet video phone using the standard SIP (rfc3261) protocol."
@@ -1698,43 +1690,43 @@ msgid "Could not resolve this number."
 msgstr "לא ניתן לפתור את מספר זה."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2922
+#: ../coreapi/linphonecore.c:2926
 msgid "Contacting"
 msgstr "מתקשר כעת"
 
-#: ../coreapi/linphonecore.c:2927
+#: ../coreapi/linphonecore.c:2931
 msgid "Could not call"
 msgstr "לא ניתן להתקשר"
 
-#: ../coreapi/linphonecore.c:3077
+#: ../coreapi/linphonecore.c:3081
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "הגענו אל המספר המרבי של שיחות מקבילות, עמך הסליחה"
 
-#: ../coreapi/linphonecore.c:3236
+#: ../coreapi/linphonecore.c:3240
 msgid "is contacting you"
 msgstr "מתקשר/ת אליך"
 
-#: ../coreapi/linphonecore.c:3237
+#: ../coreapi/linphonecore.c:3241
 msgid " and asked autoanswer."
 msgstr " ומבקש/ת מענה אוטומטי."
 
-#: ../coreapi/linphonecore.c:3355
+#: ../coreapi/linphonecore.c:3359
 msgid "Modifying call parameters..."
 msgstr "מתאים כעת פרמטרים של שיחה..."
 
-#: ../coreapi/linphonecore.c:3703
+#: ../coreapi/linphonecore.c:3707
 msgid "Connected."
 msgstr "מקושר."
 
-#: ../coreapi/linphonecore.c:3728
+#: ../coreapi/linphonecore.c:3732
 msgid "Call aborted"
 msgstr "קריאה בוטלה"
 
-#: ../coreapi/linphonecore.c:3918
+#: ../coreapi/linphonecore.c:3922
 msgid "Could not pause the call"
 msgstr "לא ניתן להשהות את השיחה"
 
-#: ../coreapi/linphonecore.c:3922
+#: ../coreapi/linphonecore.c:3926
 msgid "Pausing the current call..."
 msgstr "משהה כעת שיחה נוכחית..."
 
@@ -1795,9 +1787,8 @@ msgid "Vacation"
 msgstr ""
 
 #: ../coreapi/friend.c:68
-#, fuzzy
 msgid "Unknown status"
-msgstr "תקלה לא מוכרת"
+msgstr ""
 
 #: ../coreapi/proxy.c:319
 msgid ""
@@ -1940,32 +1931,33 @@ msgid_plural "You have missed %i calls."
 msgstr[0] "החמצת שיחה %i."
 msgstr[1] "החמצת %i שיחות."
 
-#~ msgid "label"
-#~ msgstr "תוויות"
+#: ../coreapi/call_log.c:209
+msgid "aborted"
+msgstr ""
 
-#~ msgid "9"
-#~ msgstr "9 [סעפ]"
+#: ../coreapi/call_log.c:212
+msgid "completed"
+msgstr ""
 
-#~ msgid "8"
-#~ msgstr "8 [צק]"
+#: ../coreapi/call_log.c:215
+msgid "missed"
+msgstr ""
 
-#~ msgid "7"
-#~ msgstr "7 [רשת]"
+#: ../coreapi/call_log.c:220
+#, c-format
+msgid ""
+"%s at %s\n"
+"From: %s\n"
+"To: %s\n"
+"Status: %s\n"
+"Duration: %i mn %i sec\n"
+msgstr ""
 
-#~ msgid "6"
-#~ msgstr "6 [זחט]"
+#: ../coreapi/call_log.c:221
+msgid "Outgoing call"
+msgstr ""
 
-#~ msgid "5"
-#~ msgstr "5 [יכל]"
-
-#~ msgid "4"
-#~ msgstr "4 [מנ]"
-
-#~ msgid "3"
-#~ msgstr "3 [אבג]"
-
-#~ msgid "2"
-#~ msgstr "2 [דהו]"
-
-#~ msgid "%02i::%02i::%02i"
-#~ msgstr "‭%02i::%02i::%02i"
+#: ../gtk/videowindow.c:66
+#, c-format
+msgid "Cannot play %s."
+msgstr ""
diff --git a/po/hu.po b/po/hu.po
index 1287f3928..1fe343f05 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-28 10:55+0100\n"
-"PO-Revision-Date: 2014-11-19 10:16+0000\n"
+"POT-Creation-Date: 2014-12-01 14:27+0100\n"
+"PO-Revision-Date: 2014-12-01 13:28+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Hungarian (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/hu/)\n"
@@ -156,11 +156,11 @@ msgstr ""
 msgid "Call error"
 msgstr "Hiba a hívás közben"
 
-#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3747
+#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3751
 msgid "Call ended"
 msgstr "Hívás vége"
 
-#: ../gtk/main.c:1289
+#: ../gtk/main.c:1289 ../coreapi/call_log.c:221
 msgid "Incoming call"
 msgstr "Beérkező hívás"
 
@@ -421,13 +421,10 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: ../gtk/setupwizard.c:34
-#, fuzzy
 msgid ""
 "Welcome!\n"
 "This assistant will help you to use a SIP account for your calls."
 msgstr ""
-"Üdvözöljük !\n"
-"Ez a varázsló segít Önnek, hogy sip fiókot használjon hívásaihoz."
 
 #: ../gtk/setupwizard.c:43
 msgid "Create an account on linphone.org"
@@ -641,7 +638,7 @@ msgstr ""
 msgid "%.3f seconds"
 msgstr "%.3f másodperc"
 
-#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12
+#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12 ../gtk/videowindow.c:232
 msgid "Hang up"
 msgstr "Befejezés"
 
@@ -779,13 +776,10 @@ msgid "Too loud"
 msgstr ""
 
 #: ../gtk/audio_assistant.c:318
-#, fuzzy
 msgid ""
 "Welcome!\n"
 "This assistant will help you to configure audio settings for Linphone"
 msgstr ""
-"Üdvözöljük !\n"
-"Ez a varázsló segít Önnek, hogy sip fiókot használjon hívásaihoz."
 
 #: ../gtk/audio_assistant.c:328
 msgid "Capture device"
@@ -992,23 +986,20 @@ msgid "Login information"
 msgstr "Bejelentkezési információ"
 
 #: ../gtk/main.ui.h:46
-#, fuzzy
 msgid "<b>Welcome!</b>"
-msgstr "<b>Üdvözöljük !</b>"
+msgstr ""
 
 #: ../gtk/main.ui.h:47
 msgid "Delete"
 msgstr "Törlés"
 
 #: ../gtk/about.ui.h:1
-#, fuzzy
 msgid "About Linphone"
-msgstr "Linphone névjegy"
+msgstr ""
 
 #: ../gtk/about.ui.h:2
-#, fuzzy
 msgid "(C) Belledonne Communications, 2010\n"
-msgstr "(C) Belledonne Communications,2010\n"
+msgstr ""
 
 #: ../gtk/about.ui.h:4
 msgid "An internet video phone using the standard SIP (rfc3261) protocol."
@@ -1699,43 +1690,43 @@ msgid "Could not resolve this number."
 msgstr "Nem sikkerült értelmezni a számot."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2922
+#: ../coreapi/linphonecore.c:2926
 msgid "Contacting"
 msgstr "Kapcsolódás"
 
-#: ../coreapi/linphonecore.c:2927
+#: ../coreapi/linphonecore.c:2931
 msgid "Could not call"
 msgstr "Nem sikerült hívni"
 
-#: ../coreapi/linphonecore.c:3077
+#: ../coreapi/linphonecore.c:3081
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "Elnézést, elértük a egyidejű hívások maximális számát"
 
-#: ../coreapi/linphonecore.c:3236
+#: ../coreapi/linphonecore.c:3240
 msgid "is contacting you"
 msgstr "kapcsolatba lépett veled."
 
-#: ../coreapi/linphonecore.c:3237
+#: ../coreapi/linphonecore.c:3241
 msgid " and asked autoanswer."
 msgstr "és automatikus választ kért."
 
-#: ../coreapi/linphonecore.c:3355
+#: ../coreapi/linphonecore.c:3359
 msgid "Modifying call parameters..."
 msgstr "A hívási jellemzők módosítása..."
 
-#: ../coreapi/linphonecore.c:3703
+#: ../coreapi/linphonecore.c:3707
 msgid "Connected."
 msgstr "Kapcsolódva."
 
-#: ../coreapi/linphonecore.c:3728
+#: ../coreapi/linphonecore.c:3732
 msgid "Call aborted"
 msgstr "Hívás megszakítva"
 
-#: ../coreapi/linphonecore.c:3918
+#: ../coreapi/linphonecore.c:3922
 msgid "Could not pause the call"
 msgstr "Nem sikerült várakoztatni a hívást"
 
-#: ../coreapi/linphonecore.c:3922
+#: ../coreapi/linphonecore.c:3926
 msgid "Pausing the current call..."
 msgstr "Jelenlegi hívás várakoztatásának aktiválása..."
 
@@ -1796,9 +1787,8 @@ msgid "Vacation"
 msgstr ""
 
 #: ../coreapi/friend.c:68
-#, fuzzy
 msgid "Unknown status"
-msgstr "Ismeretlen programhiba"
+msgstr ""
 
 #: ../coreapi/proxy.c:319
 msgid ""
@@ -1944,56 +1934,33 @@ msgid_plural "You have missed %i calls."
 msgstr[0] ""
 msgstr[1] ""
 
-#~ msgid "label"
-#~ msgstr "címke"
+#: ../coreapi/call_log.c:209
+msgid "aborted"
+msgstr ""
 
-#~ msgid "D"
-#~ msgstr "D"
+#: ../coreapi/call_log.c:212
+msgid "completed"
+msgstr ""
 
-#~ msgid "#"
-#~ msgstr "#"
+#: ../coreapi/call_log.c:215
+msgid "missed"
+msgstr ""
 
-#~ msgid "0"
-#~ msgstr "0"
+#: ../coreapi/call_log.c:220
+#, c-format
+msgid ""
+"%s at %s\n"
+"From: %s\n"
+"To: %s\n"
+"Status: %s\n"
+"Duration: %i mn %i sec\n"
+msgstr ""
 
-#~ msgid "*"
-#~ msgstr "*"
+#: ../coreapi/call_log.c:221
+msgid "Outgoing call"
+msgstr ""
 
-#~ msgid "9"
-#~ msgstr "9"
-
-#~ msgid "8"
-#~ msgstr "8"
-
-#~ msgid "7"
-#~ msgstr "7"
-
-#~ msgid "B"
-#~ msgstr "B"
-
-#~ msgid "6"
-#~ msgstr "6"
-
-#~ msgid "5"
-#~ msgstr "5"
-
-#~ msgid "4"
-#~ msgstr "4"
-
-#~ msgid "A"
-#~ msgstr "A"
-
-#~ msgid "3"
-#~ msgstr "3"
-
-#~ msgid "2"
-#~ msgstr "2"
-
-#~ msgid "1"
-#~ msgstr "1"
-
-#~ msgid "%02i::%02i::%02i"
-#~ msgstr "%02i::%02i::%02i"
-
-#~ msgid "."
-#~ msgstr "."
+#: ../gtk/videowindow.c:66
+#, c-format
+msgid "Cannot play %s."
+msgstr ""
diff --git a/po/it.po b/po/it.po
index dbd9daf78..29577b62b 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-28 10:55+0100\n"
-"PO-Revision-Date: 2014-11-19 10:16+0000\n"
+"POT-Creation-Date: 2014-12-01 14:27+0100\n"
+"PO-Revision-Date: 2014-12-01 13:28+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/it/)\n"
@@ -153,11 +153,11 @@ msgstr ""
 msgid "Call error"
 msgstr ""
 
-#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3747
+#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3751
 msgid "Call ended"
 msgstr "Chiamata terminata"
 
-#: ../gtk/main.c:1289
+#: ../gtk/main.c:1289 ../coreapi/call_log.c:221
 msgid "Incoming call"
 msgstr "Chimata in entrata"
 
@@ -414,13 +414,10 @@ msgstr[0] "Trovato %i contatto"
 msgstr[1] "Trovato %i contatti"
 
 #: ../gtk/setupwizard.c:34
-#, fuzzy
 msgid ""
 "Welcome!\n"
 "This assistant will help you to use a SIP account for your calls."
 msgstr ""
-"Benvenuti !\n"
-"La procedura vi aiutera a configurare un account SIP."
 
 #: ../gtk/setupwizard.c:43
 msgid "Create an account on linphone.org"
@@ -626,7 +623,7 @@ msgstr ""
 msgid "%.3f seconds"
 msgstr ""
 
-#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12
+#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12 ../gtk/videowindow.c:232
 msgid "Hang up"
 msgstr ""
 
@@ -762,13 +759,10 @@ msgid "Too loud"
 msgstr ""
 
 #: ../gtk/audio_assistant.c:318
-#, fuzzy
 msgid ""
 "Welcome!\n"
 "This assistant will help you to configure audio settings for Linphone"
 msgstr ""
-"Benvenuti !\n"
-"La procedura vi aiutera a configurare un account SIP."
 
 #: ../gtk/audio_assistant.c:328
 msgid "Capture device"
@@ -975,18 +969,16 @@ msgid "Login information"
 msgstr "Credenziali di accesso"
 
 #: ../gtk/main.ui.h:46
-#, fuzzy
 msgid "<b>Welcome!</b>"
-msgstr "<b>Benvenuto !</b>"
+msgstr ""
 
 #: ../gtk/main.ui.h:47
 msgid "Delete"
 msgstr ""
 
 #: ../gtk/about.ui.h:1
-#, fuzzy
 msgid "About Linphone"
-msgstr "Info Linphone"
+msgstr ""
 
 #: ../gtk/about.ui.h:2
 msgid "(C) Belledonne Communications, 2010\n"
@@ -1678,43 +1670,43 @@ msgid "Could not resolve this number."
 msgstr "Impossibile risolvere il numero."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2922
+#: ../coreapi/linphonecore.c:2926
 msgid "Contacting"
 msgstr "In connessione"
 
-#: ../coreapi/linphonecore.c:2927
+#: ../coreapi/linphonecore.c:2931
 msgid "Could not call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3077
+#: ../coreapi/linphonecore.c:3081
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3236
+#: ../coreapi/linphonecore.c:3240
 msgid "is contacting you"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3237
+#: ../coreapi/linphonecore.c:3241
 msgid " and asked autoanswer."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3355
+#: ../coreapi/linphonecore.c:3359
 msgid "Modifying call parameters..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3703
+#: ../coreapi/linphonecore.c:3707
 msgid "Connected."
 msgstr "Connessione"
 
-#: ../coreapi/linphonecore.c:3728
+#: ../coreapi/linphonecore.c:3732
 msgid "Call aborted"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3918
+#: ../coreapi/linphonecore.c:3922
 msgid "Could not pause the call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3922
+#: ../coreapi/linphonecore.c:3926
 msgid "Pausing the current call..."
 msgstr ""
 
@@ -1775,9 +1767,8 @@ msgid "Vacation"
 msgstr ""
 
 #: ../coreapi/friend.c:68
-#, fuzzy
 msgid "Unknown status"
-msgstr "Bug-sconosciuto"
+msgstr ""
 
 #: ../coreapi/proxy.c:319
 msgid ""
@@ -1921,50 +1912,33 @@ msgid_plural "You have missed %i calls."
 msgstr[0] ""
 msgstr[1] ""
 
-#~ msgid "label"
-#~ msgstr "etichetta"
+#: ../coreapi/call_log.c:209
+msgid "aborted"
+msgstr ""
 
-#~ msgid "D"
-#~ msgstr "D"
+#: ../coreapi/call_log.c:212
+msgid "completed"
+msgstr ""
 
-#~ msgid "#"
-#~ msgstr "#"
+#: ../coreapi/call_log.c:215
+msgid "missed"
+msgstr ""
 
-#~ msgid "0"
-#~ msgstr "0"
+#: ../coreapi/call_log.c:220
+#, c-format
+msgid ""
+"%s at %s\n"
+"From: %s\n"
+"To: %s\n"
+"Status: %s\n"
+"Duration: %i mn %i sec\n"
+msgstr ""
 
-#~ msgid "*"
-#~ msgstr "*"
+#: ../coreapi/call_log.c:221
+msgid "Outgoing call"
+msgstr ""
 
-#~ msgid "9"
-#~ msgstr "9"
-
-#~ msgid "8"
-#~ msgstr "8"
-
-#~ msgid "7"
-#~ msgstr "7"
-
-#~ msgid "B"
-#~ msgstr "B"
-
-#~ msgid "6"
-#~ msgstr "6"
-
-#~ msgid "5"
-#~ msgstr "5"
-
-#~ msgid "4"
-#~ msgstr "4"
-
-#~ msgid "A"
-#~ msgstr "A"
-
-#~ msgid "3"
-#~ msgstr "3"
-
-#~ msgid "2"
-#~ msgstr "2"
-
-#~ msgid "1"
-#~ msgstr "1"
+#: ../gtk/videowindow.c:66
+#, c-format
+msgid "Cannot play %s."
+msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 61385c5df..004469d0b 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -4,13 +4,14 @@
 #
 # Translators:
 # Alexander, 2014
+# Alexander, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-28 10:55+0100\n"
-"PO-Revision-Date: 2014-11-28 09:19+0000\n"
-"Last-Translator: Alexander\n"
+"POT-Creation-Date: 2014-12-01 14:27+0100\n"
+"PO-Revision-Date: 2014-12-01 13:28+0000\n"
+"Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/ja/)\n"
 "Language: ja\n"
@@ -22,12 +23,12 @@ msgstr ""
 #: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974
 #, c-format
 msgid "Call %s"
-msgstr "%s 呼出中"
+msgstr "%s を呼び出し中"
 
 #: ../gtk/calllogs.c:149 ../gtk/friendlist.c:975
 #, c-format
 msgid "Send text to %s"
-msgstr "%s にテキストを送信"
+msgstr "%s に文章を送信"
 
 #: ../gtk/calllogs.c:232
 #, c-format
@@ -157,11 +158,11 @@ msgstr ""
 msgid "Call error"
 msgstr "呼出エラー"
 
-#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3747
+#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3751
 msgid "Call ended"
 msgstr "呼出終了"
 
-#: ../gtk/main.c:1289
+#: ../gtk/main.c:1289 ../coreapi/call_log.c:221
 msgid "Incoming call"
 msgstr "着信"
 
@@ -417,13 +418,10 @@ msgid_plural "Found %i contacts"
 msgstr[0] "%i 件発見"
 
 #: ../gtk/setupwizard.c:34
-#, fuzzy
 msgid ""
 "Welcome!\n"
 "This assistant will help you to use a SIP account for your calls."
 msgstr ""
-"ようこそ！\n"
-"このアシスタントは、あなたのSIPアカウントを使用するのに役立ちます。"
 
 #: ../gtk/setupwizard.c:43
 msgid "Create an account on linphone.org"
@@ -435,7 +433,7 @@ msgstr "linphone.orgのアカウントを持っているのでそれを使いま
 
 #: ../gtk/setupwizard.c:45
 msgid "I have already a sip account and I just want to use it"
-msgstr ""
+msgstr "SIPアカウントを持っているのでそれを使います"
 
 #: ../gtk/setupwizard.c:46
 msgid "I want to specify a remote configuration URI"
@@ -594,7 +592,7 @@ msgstr ""
 
 #: ../gtk/incall_view.c:241
 msgid "uPnP in progress"
-msgstr ""
+msgstr "uPnPを使用中"
 
 #: ../gtk/incall_view.c:243
 msgid "uPnp not available"
@@ -629,13 +627,13 @@ msgstr "%ix%i @ %f fps"
 msgid "%.3f seconds"
 msgstr "%.3f 秒"
 
-#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12
+#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12 ../gtk/videowindow.c:232
 msgid "Hang up"
 msgstr ""
 
 #: ../gtk/incall_view.c:511
 msgid "<b>Calling...</b>"
-msgstr ""
+msgstr "<b>かけています…</b>"
 
 #: ../gtk/incall_view.c:514 ../gtk/incall_view.c:727
 msgid "00::00::00"
@@ -765,13 +763,10 @@ msgid "Too loud"
 msgstr ""
 
 #: ../gtk/audio_assistant.c:318
-#, fuzzy
 msgid ""
 "Welcome!\n"
 "This assistant will help you to configure audio settings for Linphone"
 msgstr ""
-"ようこそ！\n"
-"このアシスタントは、あなたのSIPアカウントを使用するのに役立ちます。"
 
 #: ../gtk/audio_assistant.c:328
 msgid "Capture device"
@@ -978,23 +973,20 @@ msgid "Login information"
 msgstr "ログイン情報"
 
 #: ../gtk/main.ui.h:46
-#, fuzzy
 msgid "<b>Welcome!</b>"
-msgstr "<b>ようこそ</b>"
+msgstr ""
 
 #: ../gtk/main.ui.h:47
 msgid "Delete"
 msgstr "削除"
 
 #: ../gtk/about.ui.h:1
-#, fuzzy
 msgid "About Linphone"
-msgstr "linphoneについて"
+msgstr ""
 
 #: ../gtk/about.ui.h:2
-#, fuzzy
 msgid "(C) Belledonne Communications, 2010\n"
-msgstr "(C) Belledonne Communications,2010\n"
+msgstr ""
 
 #: ../gtk/about.ui.h:4
 msgid "An internet video phone using the standard SIP (rfc3261) protocol."
@@ -1693,43 +1685,43 @@ msgid "Could not resolve this number."
 msgstr ""
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2922
+#: ../coreapi/linphonecore.c:2926
 msgid "Contacting"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2927
+#: ../coreapi/linphonecore.c:2931
 msgid "Could not call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3077
+#: ../coreapi/linphonecore.c:3081
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3236
+#: ../coreapi/linphonecore.c:3240
 msgid "is contacting you"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3237
+#: ../coreapi/linphonecore.c:3241
 msgid " and asked autoanswer."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3355
+#: ../coreapi/linphonecore.c:3359
 msgid "Modifying call parameters..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3703
+#: ../coreapi/linphonecore.c:3707
 msgid "Connected."
 msgstr "接続しました。"
 
-#: ../coreapi/linphonecore.c:3728
+#: ../coreapi/linphonecore.c:3732
 msgid "Call aborted"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3918
+#: ../coreapi/linphonecore.c:3922
 msgid "Could not pause the call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3922
+#: ../coreapi/linphonecore.c:3926
 msgid "Pausing the current call..."
 msgstr ""
 
@@ -1790,9 +1782,8 @@ msgid "Vacation"
 msgstr "休暇中"
 
 #: ../coreapi/friend.c:68
-#, fuzzy
 msgid "Unknown status"
-msgstr "不明なバグ"
+msgstr ""
 
 #: ../coreapi/proxy.c:319
 msgid ""
@@ -1931,57 +1922,33 @@ msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
 msgstr[0] ""
 
-#~ msgid "https://"
-#~ msgstr "https://"
+#: ../coreapi/call_log.c:209
+msgid "aborted"
+msgstr ""
 
-#~ msgid "label"
-#~ msgstr "ラベル"
+#: ../coreapi/call_log.c:212
+msgid "completed"
+msgstr ""
 
-#~ msgid "#"
-#~ msgstr "#"
+#: ../coreapi/call_log.c:215
+msgid "missed"
+msgstr ""
 
-#~ msgid "0"
-#~ msgstr "0"
+#: ../coreapi/call_log.c:220
+#, c-format
+msgid ""
+"%s at %s\n"
+"From: %s\n"
+"To: %s\n"
+"Status: %s\n"
+"Duration: %i mn %i sec\n"
+msgstr ""
 
-#~ msgid "*"
-#~ msgstr "*"
+#: ../coreapi/call_log.c:221
+msgid "Outgoing call"
+msgstr ""
 
-#~ msgid "9"
-#~ msgstr "9"
-
-#~ msgid "8"
-#~ msgstr "8"
-
-#~ msgid "7"
-#~ msgstr "7"
-
-#~ msgid "6"
-#~ msgstr "6"
-
-#~ msgid "5"
-#~ msgstr "5"
-
-#~ msgid "4"
-#~ msgstr "4"
-
-#~ msgid "3"
-#~ msgstr "3"
-
-#~ msgid "2"
-#~ msgstr "2"
-
-#~ msgid "1"
-#~ msgstr "1"
-
-#~ msgid ""
-#~ "<small><i>%s</i></small>\t\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<small><i>%s</i></small>⇥\n"
-#~ "%s"
-
-#~ msgid "%02i::%02i::%02i"
-#~ msgstr "%02i::%02i::%02i"
-
-#~ msgid "."
-#~ msgstr "."
+#: ../gtk/videowindow.c:66
+#, c-format
+msgid "Cannot play %s."
+msgstr ""
diff --git a/po/nb_NO.po b/po/nb_NO.po
index 2a316169b..fb24b907a 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-28 10:55+0100\n"
-"PO-Revision-Date: 2014-11-19 10:17+0000\n"
+"POT-Creation-Date: 2014-12-01 14:27+0100\n"
+"PO-Revision-Date: 2014-12-01 13:28+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/"
 "p/linphone-gtk/language/nb_NO/)\n"
@@ -157,11 +157,11 @@ msgstr ""
 msgid "Call error"
 msgstr ""
 
-#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3747
+#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3751
 msgid "Call ended"
 msgstr "Samtale avsluttet"
 
-#: ../gtk/main.c:1289
+#: ../gtk/main.c:1289 ../coreapi/call_log.c:221
 msgid "Incoming call"
 msgstr "Innkommende samtale"
 
@@ -420,13 +420,10 @@ msgstr[0] "Fant kontakt %i"
 msgstr[1] "Hittat kontakt %i"
 
 #: ../gtk/setupwizard.c:34
-#, fuzzy
 msgid ""
 "Welcome!\n"
 "This assistant will help you to use a SIP account for your calls."
 msgstr ""
-"Velkommen\n"
-"Denne veiviseren vil hjelpe deg sette opp en SIP-konto for dine samtaler."
 
 #: ../gtk/setupwizard.c:43
 msgid "Create an account on linphone.org"
@@ -632,7 +629,7 @@ msgstr ""
 msgid "%.3f seconds"
 msgstr ""
 
-#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12
+#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12 ../gtk/videowindow.c:232
 msgid "Hang up"
 msgstr ""
 
@@ -768,13 +765,10 @@ msgid "Too loud"
 msgstr ""
 
 #: ../gtk/audio_assistant.c:318
-#, fuzzy
 msgid ""
 "Welcome!\n"
 "This assistant will help you to configure audio settings for Linphone"
 msgstr ""
-"Velkommen\n"
-"Denne veiviseren vil hjelpe deg sette opp en SIP-konto for dine samtaler."
 
 #: ../gtk/audio_assistant.c:328
 msgid "Capture device"
@@ -981,23 +975,20 @@ msgid "Login information"
 msgstr "Innlogginsinformasjon"
 
 #: ../gtk/main.ui.h:46
-#, fuzzy
 msgid "<b>Welcome!</b>"
-msgstr "<b>Velkommen!</b>"
+msgstr ""
 
 #: ../gtk/main.ui.h:47
 msgid "Delete"
 msgstr ""
 
 #: ../gtk/about.ui.h:1
-#, fuzzy
 msgid "About Linphone"
-msgstr "Om Linphone"
+msgstr ""
 
 #: ../gtk/about.ui.h:2
-#, fuzzy
 msgid "(C) Belledonne Communications, 2010\n"
-msgstr "(C) Belledonne Communications,2011\n"
+msgstr ""
 
 #: ../gtk/about.ui.h:4
 msgid "An internet video phone using the standard SIP (rfc3261) protocol."
@@ -1686,43 +1677,43 @@ msgid "Could not resolve this number."
 msgstr "Kan ikke tilkoble dette nummeret."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2922
+#: ../coreapi/linphonecore.c:2926
 msgid "Contacting"
 msgstr "Tilknytter"
 
-#: ../coreapi/linphonecore.c:2927
+#: ../coreapi/linphonecore.c:2931
 msgid "Could not call"
 msgstr "Kunne ikke ringe"
 
-#: ../coreapi/linphonecore.c:3077
+#: ../coreapi/linphonecore.c:3081
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "Beklager, du har nådd maksimalt antall samtidige samtaler"
 
-#: ../coreapi/linphonecore.c:3236
+#: ../coreapi/linphonecore.c:3240
 msgid "is contacting you"
 msgstr "Kontakter deg."
 
-#: ../coreapi/linphonecore.c:3237
+#: ../coreapi/linphonecore.c:3241
 msgid " and asked autoanswer."
 msgstr " og ba om autosvar."
 
-#: ../coreapi/linphonecore.c:3355
+#: ../coreapi/linphonecore.c:3359
 msgid "Modifying call parameters..."
 msgstr "Endrer ringeparametre..."
 
-#: ../coreapi/linphonecore.c:3703
+#: ../coreapi/linphonecore.c:3707
 msgid "Connected."
 msgstr "Tilkoblet"
 
-#: ../coreapi/linphonecore.c:3728
+#: ../coreapi/linphonecore.c:3732
 msgid "Call aborted"
 msgstr "Samtale avbrutt"
 
-#: ../coreapi/linphonecore.c:3918
+#: ../coreapi/linphonecore.c:3922
 msgid "Could not pause the call"
 msgstr "Kunne ikke pause samtalen"
 
-#: ../coreapi/linphonecore.c:3922
+#: ../coreapi/linphonecore.c:3926
 msgid "Pausing the current call..."
 msgstr "Pauser nåværende samtale"
 
@@ -1783,9 +1774,8 @@ msgid "Vacation"
 msgstr ""
 
 #: ../coreapi/friend.c:68
-#, fuzzy
 msgid "Unknown status"
-msgstr "Ukjent feil"
+msgstr ""
 
 #: ../coreapi/proxy.c:319
 msgid ""
@@ -1929,56 +1919,33 @@ msgid_plural "You have missed %i calls."
 msgstr[0] "Du har %i ubesvarte anrop."
 msgstr[1] "Du har %i missade samtal"
 
-#~ msgid "label"
-#~ msgstr "etikett"
+#: ../coreapi/call_log.c:209
+msgid "aborted"
+msgstr ""
 
-#~ msgid "D"
-#~ msgstr "D"
+#: ../coreapi/call_log.c:212
+msgid "completed"
+msgstr ""
 
-#~ msgid "#"
-#~ msgstr "#"
+#: ../coreapi/call_log.c:215
+msgid "missed"
+msgstr ""
 
-#~ msgid "0"
-#~ msgstr "0"
+#: ../coreapi/call_log.c:220
+#, c-format
+msgid ""
+"%s at %s\n"
+"From: %s\n"
+"To: %s\n"
+"Status: %s\n"
+"Duration: %i mn %i sec\n"
+msgstr ""
 
-#~ msgid "*"
-#~ msgstr "*"
+#: ../coreapi/call_log.c:221
+msgid "Outgoing call"
+msgstr ""
 
-#~ msgid "9"
-#~ msgstr "9"
-
-#~ msgid "8"
-#~ msgstr "8"
-
-#~ msgid "7"
-#~ msgstr "7"
-
-#~ msgid "B"
-#~ msgstr "B"
-
-#~ msgid "6"
-#~ msgstr "6"
-
-#~ msgid "5"
-#~ msgstr "5"
-
-#~ msgid "4"
-#~ msgstr "4"
-
-#~ msgid "A"
-#~ msgstr "A"
-
-#~ msgid "3"
-#~ msgstr "3"
-
-#~ msgid "2"
-#~ msgstr "2"
-
-#~ msgid "1"
-#~ msgstr "1"
-
-#~ msgid "%02i::%02i::%02i"
-#~ msgstr "%02i:%02i:%02i"
-
-#~ msgid "."
-#~ msgstr "."
+#: ../gtk/videowindow.c:66
+#, c-format
+msgid "Cannot play %s."
+msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 9d3ccea4e..8ea8053c2 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-28 10:55+0100\n"
-"PO-Revision-Date: 2014-11-19 10:08+0000\n"
+"POT-Creation-Date: 2014-12-01 14:27+0100\n"
+"PO-Revision-Date: 2014-12-01 13:28+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/nl/)\n"
@@ -150,11 +150,11 @@ msgstr ""
 msgid "Call error"
 msgstr ""
 
-#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3747
+#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3751
 msgid "Call ended"
 msgstr "Oproep beeindigd"
 
-#: ../gtk/main.c:1289
+#: ../gtk/main.c:1289 ../coreapi/call_log.c:221
 msgid "Incoming call"
 msgstr "Inkomende oproep"
 
@@ -618,7 +618,7 @@ msgstr ""
 msgid "%.3f seconds"
 msgstr ""
 
-#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12
+#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12 ../gtk/videowindow.c:232
 msgid "Hang up"
 msgstr ""
 
@@ -1664,43 +1664,43 @@ msgid "Could not resolve this number."
 msgstr "Kon dit nummer niet vinden."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2922
+#: ../coreapi/linphonecore.c:2926
 msgid "Contacting"
 msgstr "Verbinden"
 
-#: ../coreapi/linphonecore.c:2927
+#: ../coreapi/linphonecore.c:2931
 msgid "Could not call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3077
+#: ../coreapi/linphonecore.c:3081
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3236
+#: ../coreapi/linphonecore.c:3240
 msgid "is contacting you"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3237
+#: ../coreapi/linphonecore.c:3241
 msgid " and asked autoanswer."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3355
+#: ../coreapi/linphonecore.c:3359
 msgid "Modifying call parameters..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3703
+#: ../coreapi/linphonecore.c:3707
 msgid "Connected."
 msgstr "Verbonden."
 
-#: ../coreapi/linphonecore.c:3728
+#: ../coreapi/linphonecore.c:3732
 msgid "Call aborted"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3918
+#: ../coreapi/linphonecore.c:3922
 msgid "Could not pause the call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3922
+#: ../coreapi/linphonecore.c:3926
 msgid "Pausing the current call..."
 msgstr ""
 
@@ -1902,17 +1902,33 @@ msgid_plural "You have missed %i calls."
 msgstr[0] ""
 msgstr[1] ""
 
-#~ msgid "#"
-#~ msgstr "#"
+#: ../coreapi/call_log.c:209
+msgid "aborted"
+msgstr ""
 
-#~ msgid "0"
-#~ msgstr "0"
+#: ../coreapi/call_log.c:212
+msgid "completed"
+msgstr ""
 
-#~ msgid "*"
-#~ msgstr "*"
+#: ../coreapi/call_log.c:215
+msgid "missed"
+msgstr ""
 
-#~ msgid "5"
-#~ msgstr "5"
+#: ../coreapi/call_log.c:220
+#, c-format
+msgid ""
+"%s at %s\n"
+"From: %s\n"
+"To: %s\n"
+"Status: %s\n"
+"Duration: %i mn %i sec\n"
+msgstr ""
 
-#~ msgid "1"
-#~ msgstr "1"
+#: ../coreapi/call_log.c:221
+msgid "Outgoing call"
+msgstr ""
+
+#: ../gtk/videowindow.c:66
+#, c-format
+msgid "Cannot play %s."
+msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 2112163f9..e2bcc91a4 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-28 10:55+0100\n"
-"PO-Revision-Date: 2014-11-19 10:08+0000\n"
+"POT-Creation-Date: 2014-12-01 14:27+0100\n"
+"PO-Revision-Date: 2014-12-01 13:28+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/pl/)\n"
@@ -153,11 +153,11 @@ msgstr ""
 msgid "Call error"
 msgstr ""
 
-#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3747
+#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3751
 msgid "Call ended"
 msgstr ""
 
-#: ../gtk/main.c:1289
+#: ../gtk/main.c:1289 ../coreapi/call_log.c:221
 msgid "Incoming call"
 msgstr ""
 
@@ -622,7 +622,7 @@ msgstr ""
 msgid "%.3f seconds"
 msgstr ""
 
-#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12
+#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12 ../gtk/videowindow.c:232
 msgid "Hang up"
 msgstr ""
 
@@ -1668,43 +1668,43 @@ msgid "Could not resolve this number."
 msgstr ""
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2922
+#: ../coreapi/linphonecore.c:2926
 msgid "Contacting"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2927
+#: ../coreapi/linphonecore.c:2931
 msgid "Could not call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3077
+#: ../coreapi/linphonecore.c:3081
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3236
+#: ../coreapi/linphonecore.c:3240
 msgid "is contacting you"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3237
+#: ../coreapi/linphonecore.c:3241
 msgid " and asked autoanswer."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3355
+#: ../coreapi/linphonecore.c:3359
 msgid "Modifying call parameters..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3703
+#: ../coreapi/linphonecore.c:3707
 msgid "Connected."
 msgstr "Połączony"
 
-#: ../coreapi/linphonecore.c:3728
+#: ../coreapi/linphonecore.c:3732
 msgid "Call aborted"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3918
+#: ../coreapi/linphonecore.c:3922
 msgid "Could not pause the call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3922
+#: ../coreapi/linphonecore.c:3926
 msgid "Pausing the current call..."
 msgstr ""
 
@@ -1907,38 +1907,33 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#~ msgid "#"
-#~ msgstr "#"
+#: ../coreapi/call_log.c:209
+msgid "aborted"
+msgstr ""
 
-#~ msgid "0"
-#~ msgstr "0"
+#: ../coreapi/call_log.c:212
+msgid "completed"
+msgstr ""
 
-#~ msgid "*"
-#~ msgstr "*"
+#: ../coreapi/call_log.c:215
+msgid "missed"
+msgstr ""
 
-#~ msgid "9"
-#~ msgstr "9"
+#: ../coreapi/call_log.c:220
+#, c-format
+msgid ""
+"%s at %s\n"
+"From: %s\n"
+"To: %s\n"
+"Status: %s\n"
+"Duration: %i mn %i sec\n"
+msgstr ""
 
-#~ msgid "8"
-#~ msgstr "8"
+#: ../coreapi/call_log.c:221
+msgid "Outgoing call"
+msgstr ""
 
-#~ msgid "7"
-#~ msgstr "7"
-
-#~ msgid "6"
-#~ msgstr "6"
-
-#~ msgid "5"
-#~ msgstr "5"
-
-#~ msgid "4"
-#~ msgstr "4"
-
-#~ msgid "3"
-#~ msgstr "3"
-
-#~ msgid "2"
-#~ msgstr "2"
-
-#~ msgid "1"
-#~ msgstr "1"
+#: ../gtk/videowindow.c:66
+#, c-format
+msgid "Cannot play %s."
+msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 0b474b49e..26581a852 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-28 10:55+0100\n"
-"PO-Revision-Date: 2014-11-19 10:08+0000\n"
+"POT-Creation-Date: 2014-12-01 14:27+0100\n"
+"PO-Revision-Date: 2014-12-01 13:28+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
 "linphone-gtk/language/pt_BR/)\n"
@@ -150,11 +150,11 @@ msgstr ""
 msgid "Call error"
 msgstr ""
 
-#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3747
+#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3751
 msgid "Call ended"
 msgstr ""
 
-#: ../gtk/main.c:1289
+#: ../gtk/main.c:1289 ../coreapi/call_log.c:221
 msgid "Incoming call"
 msgstr "Camadas recebidas"
 
@@ -618,7 +618,7 @@ msgstr ""
 msgid "%.3f seconds"
 msgstr ""
 
-#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12
+#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12 ../gtk/videowindow.c:232
 msgid "Hang up"
 msgstr ""
 
@@ -1664,43 +1664,43 @@ msgid "Could not resolve this number."
 msgstr "Não foi possível encontrar este número."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2922
+#: ../coreapi/linphonecore.c:2926
 msgid "Contacting"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2927
+#: ../coreapi/linphonecore.c:2931
 msgid "Could not call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3077
+#: ../coreapi/linphonecore.c:3081
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3236
+#: ../coreapi/linphonecore.c:3240
 msgid "is contacting you"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3237
+#: ../coreapi/linphonecore.c:3241
 msgid " and asked autoanswer."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3355
+#: ../coreapi/linphonecore.c:3359
 msgid "Modifying call parameters..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3703
+#: ../coreapi/linphonecore.c:3707
 msgid "Connected."
 msgstr "Conectado."
 
-#: ../coreapi/linphonecore.c:3728
+#: ../coreapi/linphonecore.c:3732
 msgid "Call aborted"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3918
+#: ../coreapi/linphonecore.c:3922
 msgid "Could not pause the call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3922
+#: ../coreapi/linphonecore.c:3926
 msgid "Pausing the current call..."
 msgstr ""
 
@@ -1901,3 +1901,34 @@ msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
 msgstr[0] ""
 msgstr[1] ""
+
+#: ../coreapi/call_log.c:209
+msgid "aborted"
+msgstr ""
+
+#: ../coreapi/call_log.c:212
+msgid "completed"
+msgstr ""
+
+#: ../coreapi/call_log.c:215
+msgid "missed"
+msgstr ""
+
+#: ../coreapi/call_log.c:220
+#, c-format
+msgid ""
+"%s at %s\n"
+"From: %s\n"
+"To: %s\n"
+"Status: %s\n"
+"Duration: %i mn %i sec\n"
+msgstr ""
+
+#: ../coreapi/call_log.c:221
+msgid "Outgoing call"
+msgstr ""
+
+#: ../gtk/videowindow.c:66
+#, c-format
+msgid "Cannot play %s."
+msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 410947d4f..850f002c0 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-28 10:55+0100\n"
-"PO-Revision-Date: 2014-11-19 10:13+0000\n"
+"POT-Creation-Date: 2014-12-01 14:27+0100\n"
+"PO-Revision-Date: 2014-12-01 13:28+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/ru/)\n"
@@ -169,11 +169,11 @@ msgstr ""
 msgid "Call error"
 msgstr "Ошибка звонка"
 
-#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3747
+#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3751
 msgid "Call ended"
 msgstr "Звонок окончен"
 
-#: ../gtk/main.c:1289
+#: ../gtk/main.c:1289 ../coreapi/call_log.c:221
 msgid "Incoming call"
 msgstr "Входящий звонок"
 
@@ -435,13 +435,10 @@ msgstr[1] "Найдено %i контакта"
 msgstr[2] "Найдено %i контактов"
 
 #: ../gtk/setupwizard.c:34
-#, fuzzy
 msgid ""
 "Welcome!\n"
 "This assistant will help you to use a SIP account for your calls."
 msgstr ""
-"Добро пожаловать!\n"
-"Этот помощник поможет вам использовать учётную запись SIP для ваших звонков."
 
 #: ../gtk/setupwizard.c:43
 msgid "Create an account on linphone.org"
@@ -657,7 +654,7 @@ msgstr "%ix%i @ %f кадр/сек"
 msgid "%.3f seconds"
 msgstr "%.3f секунд"
 
-#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12
+#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12 ../gtk/videowindow.c:232
 msgid "Hang up"
 msgstr "Повесить трубку"
 
@@ -795,13 +792,10 @@ msgid "Too loud"
 msgstr "Слишком громко"
 
 #: ../gtk/audio_assistant.c:318
-#, fuzzy
 msgid ""
 "Welcome!\n"
 "This assistant will help you to configure audio settings for Linphone"
 msgstr ""
-"Добро пожаловать!\n"
-"Этот помощник поможет вам сконфигурировать настройки аудио для linphone"
 
 #: ../gtk/audio_assistant.c:328
 msgid "Capture device"
@@ -1008,23 +1002,20 @@ msgid "Login information"
 msgstr "Информация для входа"
 
 #: ../gtk/main.ui.h:46
-#, fuzzy
 msgid "<b>Welcome!</b>"
-msgstr "<b>Добро пожаловать!</b>"
+msgstr ""
 
 #: ../gtk/main.ui.h:47
 msgid "Delete"
 msgstr "Удалить"
 
 #: ../gtk/about.ui.h:1
-#, fuzzy
 msgid "About Linphone"
-msgstr "Про linphone"
+msgstr ""
 
 #: ../gtk/about.ui.h:2
-#, fuzzy
 msgid "(C) Belledonne Communications, 2010\n"
-msgstr "(C) Belledonne Communications,2010\n"
+msgstr ""
 
 #: ../gtk/about.ui.h:4
 msgid "An internet video phone using the standard SIP (rfc3261) protocol."
@@ -1732,44 +1723,44 @@ msgid "Could not resolve this number."
 msgstr "Не получилось принять решение по этому номеру."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2922
+#: ../coreapi/linphonecore.c:2926
 msgid "Contacting"
 msgstr "Соединение"
 
-#: ../coreapi/linphonecore.c:2927
+#: ../coreapi/linphonecore.c:2931
 msgid "Could not call"
 msgstr "Невозможно позвонить"
 
-#: ../coreapi/linphonecore.c:3077
+#: ../coreapi/linphonecore.c:3081
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr ""
 "К сожалению, мы достигли максимального количества одновременных звонков"
 
-#: ../coreapi/linphonecore.c:3236
+#: ../coreapi/linphonecore.c:3240
 msgid "is contacting you"
 msgstr "контактирует с вами"
 
-#: ../coreapi/linphonecore.c:3237
+#: ../coreapi/linphonecore.c:3241
 msgid " and asked autoanswer."
 msgstr "и спросил автоматический ответ."
 
-#: ../coreapi/linphonecore.c:3355
+#: ../coreapi/linphonecore.c:3359
 msgid "Modifying call parameters..."
 msgstr "Изменение параметров звонка..."
 
-#: ../coreapi/linphonecore.c:3703
+#: ../coreapi/linphonecore.c:3707
 msgid "Connected."
 msgstr "Соединён."
 
-#: ../coreapi/linphonecore.c:3728
+#: ../coreapi/linphonecore.c:3732
 msgid "Call aborted"
 msgstr "Звонок отменён"
 
-#: ../coreapi/linphonecore.c:3918
+#: ../coreapi/linphonecore.c:3922
 msgid "Could not pause the call"
 msgstr "Невозможно приостановить звонок"
 
-#: ../coreapi/linphonecore.c:3922
+#: ../coreapi/linphonecore.c:3926
 msgid "Pausing the current call..."
 msgstr "Приостановка текущего звонка..."
 
@@ -1830,9 +1821,8 @@ msgid "Vacation"
 msgstr "Отдых"
 
 #: ../coreapi/friend.c:68
-#, fuzzy
 msgid "Unknown status"
-msgstr "Неизвестная ошибка"
+msgstr ""
 
 #: ../coreapi/proxy.c:319
 msgid ""
@@ -1978,66 +1968,33 @@ msgstr[0] "У вас %i пропущенный вызов."
 msgstr[1] "У вас %i пропущенных вызова."
 msgstr[2] "У вас %i пропущенных вызов."
 
-#~ msgid "https://"
-#~ msgstr "https://"
+#: ../coreapi/call_log.c:209
+msgid "aborted"
+msgstr ""
 
-#~ msgid "label"
-#~ msgstr "метка"
+#: ../coreapi/call_log.c:212
+msgid "completed"
+msgstr ""
 
-#~ msgid "D"
-#~ msgstr "D"
+#: ../coreapi/call_log.c:215
+msgid "missed"
+msgstr ""
 
-#~ msgid "#"
-#~ msgstr "#"
+#: ../coreapi/call_log.c:220
+#, c-format
+msgid ""
+"%s at %s\n"
+"From: %s\n"
+"To: %s\n"
+"Status: %s\n"
+"Duration: %i mn %i sec\n"
+msgstr ""
 
-#~ msgid "0"
-#~ msgstr "0"
+#: ../coreapi/call_log.c:221
+msgid "Outgoing call"
+msgstr ""
 
-#~ msgid "*"
-#~ msgstr "*"
-
-#~ msgid "9"
-#~ msgstr "9"
-
-#~ msgid "8"
-#~ msgstr "8"
-
-#~ msgid "7"
-#~ msgstr "7"
-
-#~ msgid "B"
-#~ msgstr "B"
-
-#~ msgid "6"
-#~ msgstr "6"
-
-#~ msgid "5"
-#~ msgstr "5"
-
-#~ msgid "4"
-#~ msgstr "4"
-
-#~ msgid "A"
-#~ msgstr "A"
-
-#~ msgid "3"
-#~ msgstr "3"
-
-#~ msgid "2"
-#~ msgstr "2"
-
-#~ msgid "1"
-#~ msgstr "1"
-
-#~ msgid ""
-#~ "<small><i>%s</i></small>\t\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<small><i>%s</i></small>\t\n"
-#~ "%s"
-
-#~ msgid "%02i::%02i::%02i"
-#~ msgstr "%02i::%02i::%02i"
-
-#~ msgid "."
-#~ msgstr "."
+#: ../gtk/videowindow.c:66
+#, c-format
+msgid "Cannot play %s."
+msgstr ""
diff --git a/po/sr.po b/po/sr.po
index 653de971f..cc7879209 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-28 10:55+0100\n"
-"PO-Revision-Date: 2014-11-26 20:58+0000\n"
-"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
+"POT-Creation-Date: 2014-12-01 14:27+0100\n"
+"PO-Revision-Date: 2014-12-01 13:28+0000\n"
+"Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/sr/)\n"
 "Language: sr\n"
@@ -165,11 +165,11 @@ msgstr ""
 msgid "Call error"
 msgstr "Грешка позива"
 
-#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3747
+#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3751
 msgid "Call ended"
 msgstr "Позив је завршен"
 
-#: ../gtk/main.c:1289
+#: ../gtk/main.c:1289 ../coreapi/call_log.c:221
 msgid "Incoming call"
 msgstr "Долазни позив"
 
@@ -430,12 +430,11 @@ msgstr[1] "Нашао сам %i контакта"
 msgstr[2] "Нашао сам %i контаката"
 
 #: ../gtk/setupwizard.c:34
-#, fuzzy
 msgid ""
 "Welcome!\n"
 "This assistant will help you to use a SIP account for your calls."
 msgstr ""
-"Добро дошли !\n"
+"Добро дошли!\n"
 "Овај помоћник ће вам помоћи да користите СИП налог за ваше позиве."
 
 #: ../gtk/setupwizard.c:43
@@ -650,7 +649,7 @@ msgstr "%ix%i @ %f к/с"
 msgid "%.3f seconds"
 msgstr "%.3f секунде"
 
-#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12
+#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12 ../gtk/videowindow.c:232
 msgid "Hang up"
 msgstr "Прекини"
 
@@ -788,13 +787,12 @@ msgid "Too loud"
 msgstr "Сувише гласан"
 
 #: ../gtk/audio_assistant.c:318
-#, fuzzy
 msgid ""
 "Welcome!\n"
 "This assistant will help you to configure audio settings for Linphone"
 msgstr ""
-"Добро дошли !\n"
-"Овај помоћник ће вам помоћи да подесите звучне поставке за Линфон"
+"Добро дошли!\n"
+"Овај помоћник ће вам помоћи да подесите поставке звука за Линфон"
 
 #: ../gtk/audio_assistant.c:328
 msgid "Capture device"
@@ -1001,21 +999,18 @@ msgid "Login information"
 msgstr "Подаци пријављивања"
 
 #: ../gtk/main.ui.h:46
-#, fuzzy
 msgid "<b>Welcome!</b>"
-msgstr "<b>Добро дошли !</b>"
+msgstr "<b>Добро дошли!</b>"
 
 #: ../gtk/main.ui.h:47
 msgid "Delete"
 msgstr "Обриши"
 
 #: ../gtk/about.ui.h:1
-#, fuzzy
 msgid "About Linphone"
-msgstr "О линфону"
+msgstr "О Линфону"
 
 #: ../gtk/about.ui.h:2
-#, fuzzy
 msgid "(C) Belledonne Communications, 2010\n"
 msgstr "(C) Беледоне комуникације, 2010\n"
 
@@ -1725,43 +1720,43 @@ msgid "Could not resolve this number."
 msgstr "Не могу да решим овај број."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2922
+#: ../coreapi/linphonecore.c:2926
 msgid "Contacting"
 msgstr "Ступам у везу"
 
-#: ../coreapi/linphonecore.c:2927
+#: ../coreapi/linphonecore.c:2931
 msgid "Could not call"
 msgstr "Не могу да позовем"
 
-#: ../coreapi/linphonecore.c:3077
+#: ../coreapi/linphonecore.c:3081
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "Извините, достигли смо највећи број истовремених позива"
 
-#: ../coreapi/linphonecore.c:3236
+#: ../coreapi/linphonecore.c:3240
 msgid "is contacting you"
 msgstr "вам се обраћа"
 
-#: ../coreapi/linphonecore.c:3237
+#: ../coreapi/linphonecore.c:3241
 msgid " and asked autoanswer."
 msgstr " и затражени само-одговор."
 
-#: ../coreapi/linphonecore.c:3355
+#: ../coreapi/linphonecore.c:3359
 msgid "Modifying call parameters..."
 msgstr "Мењам параметре позива..."
 
-#: ../coreapi/linphonecore.c:3703
+#: ../coreapi/linphonecore.c:3707
 msgid "Connected."
 msgstr "Повезан сам."
 
-#: ../coreapi/linphonecore.c:3728
+#: ../coreapi/linphonecore.c:3732
 msgid "Call aborted"
 msgstr "Позив је прекинут"
 
-#: ../coreapi/linphonecore.c:3918
+#: ../coreapi/linphonecore.c:3922
 msgid "Could not pause the call"
 msgstr "Не могу да зауставим позив"
 
-#: ../coreapi/linphonecore.c:3922
+#: ../coreapi/linphonecore.c:3926
 msgid "Pausing the current call..."
 msgstr "Заустављам тренутни позив..."
 
@@ -1822,9 +1817,8 @@ msgid "Vacation"
 msgstr "На одмору"
 
 #: ../coreapi/friend.c:68
-#, fuzzy
 msgid "Unknown status"
-msgstr "Непозната грешка"
+msgstr "Непознато стање"
 
 #: ../coreapi/proxy.c:319
 msgid ""
@@ -1970,66 +1964,33 @@ msgstr[0] "Пропустили сте %i позив."
 msgstr[1] "Пропустили сте %i позива."
 msgstr[2] "Пропустили сте %i позива."
 
-#~ msgid "https://"
-#~ msgstr "https://"
+#: ../coreapi/call_log.c:209
+msgid "aborted"
+msgstr ""
 
-#~ msgid "label"
-#~ msgstr "натпис"
+#: ../coreapi/call_log.c:212
+msgid "completed"
+msgstr ""
 
-#~ msgid "D"
-#~ msgstr "Г"
+#: ../coreapi/call_log.c:215
+msgid "missed"
+msgstr ""
 
-#~ msgid "#"
-#~ msgstr "#"
+#: ../coreapi/call_log.c:220
+#, c-format
+msgid ""
+"%s at %s\n"
+"From: %s\n"
+"To: %s\n"
+"Status: %s\n"
+"Duration: %i mn %i sec\n"
+msgstr ""
 
-#~ msgid "0"
-#~ msgstr "0"
+#: ../coreapi/call_log.c:221
+msgid "Outgoing call"
+msgstr ""
 
-#~ msgid "*"
-#~ msgstr "*"
-
-#~ msgid "9"
-#~ msgstr "9"
-
-#~ msgid "8"
-#~ msgstr "8"
-
-#~ msgid "7"
-#~ msgstr "7"
-
-#~ msgid "B"
-#~ msgstr "Б"
-
-#~ msgid "6"
-#~ msgstr "6"
-
-#~ msgid "5"
-#~ msgstr "5"
-
-#~ msgid "4"
-#~ msgstr "4"
-
-#~ msgid "A"
-#~ msgstr "А"
-
-#~ msgid "3"
-#~ msgstr "3"
-
-#~ msgid "2"
-#~ msgstr "2"
-
-#~ msgid "1"
-#~ msgstr "1"
-
-#~ msgid ""
-#~ "<small><i>%s</i></small>\t\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<small><i>%s</i></small>\t\n"
-#~ "%s"
-
-#~ msgid "%02i::%02i::%02i"
-#~ msgstr "%02i::%02i::%02i"
-
-#~ msgid "."
-#~ msgstr "."
+#: ../gtk/videowindow.c:66
+#, c-format
+msgid "Cannot play %s."
+msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 1a4a4efee..9c326620c 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-28 10:55+0100\n"
-"PO-Revision-Date: 2014-11-19 10:15+0000\n"
+"POT-Creation-Date: 2014-12-01 14:27+0100\n"
+"PO-Revision-Date: 2014-12-01 13:28+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/sv/)\n"
@@ -156,11 +156,11 @@ msgstr ""
 msgid "Call error"
 msgstr ""
 
-#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3747
+#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3751
 msgid "Call ended"
 msgstr "Samtalet slut"
 
-#: ../gtk/main.c:1289
+#: ../gtk/main.c:1289 ../coreapi/call_log.c:221
 msgid "Incoming call"
 msgstr "Inkommande samtal"
 
@@ -417,13 +417,10 @@ msgstr[0] "Hittat kontakt %i"
 msgstr[1] "Hittat kontakt %i"
 
 #: ../gtk/setupwizard.c:34
-#, fuzzy
 msgid ""
 "Welcome!\n"
 "This assistant will help you to use a SIP account for your calls."
 msgstr ""
-"Välkommen!\n"
-"Assistenten kommer att hjälpa dig använda ett SIP konto för dina samtal:"
 
 #: ../gtk/setupwizard.c:43
 msgid "Create an account on linphone.org"
@@ -629,7 +626,7 @@ msgstr ""
 msgid "%.3f seconds"
 msgstr ""
 
-#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12
+#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12 ../gtk/videowindow.c:232
 msgid "Hang up"
 msgstr ""
 
@@ -765,13 +762,10 @@ msgid "Too loud"
 msgstr ""
 
 #: ../gtk/audio_assistant.c:318
-#, fuzzy
 msgid ""
 "Welcome!\n"
 "This assistant will help you to configure audio settings for Linphone"
 msgstr ""
-"Välkommen!\n"
-"Assistenten kommer att hjälpa dig använda ett SIP konto för dina samtal:"
 
 #: ../gtk/audio_assistant.c:328
 msgid "Capture device"
@@ -978,18 +972,16 @@ msgid "Login information"
 msgstr "Login information"
 
 #: ../gtk/main.ui.h:46
-#, fuzzy
 msgid "<b>Welcome!</b>"
-msgstr "<b>Välkommen!</b>"
+msgstr ""
 
 #: ../gtk/main.ui.h:47
 msgid "Delete"
 msgstr ""
 
 #: ../gtk/about.ui.h:1
-#, fuzzy
 msgid "About Linphone"
-msgstr "Apropå linphone"
+msgstr ""
 
 #: ../gtk/about.ui.h:2
 msgid "(C) Belledonne Communications, 2010\n"
@@ -1681,43 +1673,43 @@ msgid "Could not resolve this number."
 msgstr "Kan inte nå dett nummer."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2922
+#: ../coreapi/linphonecore.c:2926
 msgid "Contacting"
 msgstr "Kontaktar"
 
-#: ../coreapi/linphonecore.c:2927
+#: ../coreapi/linphonecore.c:2931
 msgid "Could not call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3077
+#: ../coreapi/linphonecore.c:3081
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3236
+#: ../coreapi/linphonecore.c:3240
 msgid "is contacting you"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3237
+#: ../coreapi/linphonecore.c:3241
 msgid " and asked autoanswer."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3355
+#: ../coreapi/linphonecore.c:3359
 msgid "Modifying call parameters..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3703
+#: ../coreapi/linphonecore.c:3707
 msgid "Connected."
 msgstr "Kopplad"
 
-#: ../coreapi/linphonecore.c:3728
+#: ../coreapi/linphonecore.c:3732
 msgid "Call aborted"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3918
+#: ../coreapi/linphonecore.c:3922
 msgid "Could not pause the call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3922
+#: ../coreapi/linphonecore.c:3926
 msgid "Pausing the current call..."
 msgstr ""
 
@@ -1778,9 +1770,8 @@ msgid "Vacation"
 msgstr ""
 
 #: ../coreapi/friend.c:68
-#, fuzzy
 msgid "Unknown status"
-msgstr "Okänd bug"
+msgstr ""
 
 #: ../coreapi/proxy.c:319
 msgid ""
@@ -1924,8 +1915,33 @@ msgid_plural "You have missed %i calls."
 msgstr[0] "Du har %i missat samtal"
 msgstr[1] "Du har %i missade samtal"
 
-#~ msgid "label"
-#~ msgstr "etikett"
+#: ../coreapi/call_log.c:209
+msgid "aborted"
+msgstr ""
 
-#~ msgid "%02i::%02i::%02i"
-#~ msgstr "%02i:%02i:%02i"
+#: ../coreapi/call_log.c:212
+msgid "completed"
+msgstr ""
+
+#: ../coreapi/call_log.c:215
+msgid "missed"
+msgstr ""
+
+#: ../coreapi/call_log.c:220
+#, c-format
+msgid ""
+"%s at %s\n"
+"From: %s\n"
+"To: %s\n"
+"Status: %s\n"
+"Duration: %i mn %i sec\n"
+msgstr ""
+
+#: ../coreapi/call_log.c:221
+msgid "Outgoing call"
+msgstr ""
+
+#: ../gtk/videowindow.c:66
+#, c-format
+msgid "Cannot play %s."
+msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 50b6812f8..18a459c64 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-28 10:55+0100\n"
-"PO-Revision-Date: 2014-11-19 10:15+0000\n"
+"POT-Creation-Date: 2014-12-01 14:27+0100\n"
+"PO-Revision-Date: 2014-12-01 13:28+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/linphone-"
 "gtk/language/zh_CN/)\n"
@@ -151,11 +151,11 @@ msgstr ""
 msgid "Call error"
 msgstr ""
 
-#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3747
+#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3751
 msgid "Call ended"
 msgstr "呼叫结束"
 
-#: ../gtk/main.c:1289
+#: ../gtk/main.c:1289 ../coreapi/call_log.c:221
 msgid "Incoming call"
 msgstr "呼入"
 
@@ -413,13 +413,10 @@ msgid_plural "Found %i contacts"
 msgstr[0] "找到 %i 联系方式"
 
 #: ../gtk/setupwizard.c:34
-#, fuzzy
 msgid ""
 "Welcome!\n"
 "This assistant will help you to use a SIP account for your calls."
 msgstr ""
-"欢迎使用 Linphone！\n"
-"设置向导将帮助您配置打网络电话的 SIP 帐户。"
 
 #: ../gtk/setupwizard.c:43
 msgid "Create an account on linphone.org"
@@ -625,7 +622,7 @@ msgstr ""
 msgid "%.3f seconds"
 msgstr ""
 
-#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12
+#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12 ../gtk/videowindow.c:232
 msgid "Hang up"
 msgstr ""
 
@@ -761,13 +758,10 @@ msgid "Too loud"
 msgstr ""
 
 #: ../gtk/audio_assistant.c:318
-#, fuzzy
 msgid ""
 "Welcome!\n"
 "This assistant will help you to configure audio settings for Linphone"
 msgstr ""
-"欢迎使用 Linphone！\n"
-"设置向导将帮助您配置打网络电话的 SIP 帐户。"
 
 #: ../gtk/audio_assistant.c:328
 msgid "Capture device"
@@ -974,18 +968,16 @@ msgid "Login information"
 msgstr "登录信息"
 
 #: ../gtk/main.ui.h:46
-#, fuzzy
 msgid "<b>Welcome!</b>"
-msgstr "<b>欢迎！</b>"
+msgstr ""
 
 #: ../gtk/main.ui.h:47
 msgid "Delete"
 msgstr ""
 
 #: ../gtk/about.ui.h:1
-#, fuzzy
 msgid "About Linphone"
-msgstr "关于 Linphone"
+msgstr ""
 
 #: ../gtk/about.ui.h:2
 msgid "(C) Belledonne Communications, 2010\n"
@@ -1676,43 +1668,43 @@ msgid "Could not resolve this number."
 msgstr "该号码无法解析。"
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2922
+#: ../coreapi/linphonecore.c:2926
 msgid "Contacting"
 msgstr "联系中"
 
-#: ../coreapi/linphonecore.c:2927
+#: ../coreapi/linphonecore.c:2931
 msgid "Could not call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3077
+#: ../coreapi/linphonecore.c:3081
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3236
+#: ../coreapi/linphonecore.c:3240
 msgid "is contacting you"
 msgstr "正在联系您"
 
-#: ../coreapi/linphonecore.c:3237
+#: ../coreapi/linphonecore.c:3241
 msgid " and asked autoanswer."
 msgstr " 并询问了自动回答。"
 
-#: ../coreapi/linphonecore.c:3355
+#: ../coreapi/linphonecore.c:3359
 msgid "Modifying call parameters..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3703
+#: ../coreapi/linphonecore.c:3707
 msgid "Connected."
 msgstr "已连接。"
 
-#: ../coreapi/linphonecore.c:3728
+#: ../coreapi/linphonecore.c:3732
 msgid "Call aborted"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3918
+#: ../coreapi/linphonecore.c:3922
 msgid "Could not pause the call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3922
+#: ../coreapi/linphonecore.c:3926
 msgid "Pausing the current call..."
 msgstr ""
 
@@ -1773,9 +1765,8 @@ msgid "Vacation"
 msgstr ""
 
 #: ../coreapi/friend.c:68
-#, fuzzy
 msgid "Unknown status"
-msgstr "未知错误"
+msgstr ""
 
 #: ../coreapi/proxy.c:319
 msgid ""
@@ -1916,56 +1907,33 @@ msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
 msgstr[0] "您错过了 %i 个呼叫。"
 
-#~ msgid "label"
-#~ msgstr "标签"
+#: ../coreapi/call_log.c:209
+msgid "aborted"
+msgstr ""
 
-#~ msgid "D"
-#~ msgstr "D"
+#: ../coreapi/call_log.c:212
+msgid "completed"
+msgstr ""
 
-#~ msgid "#"
-#~ msgstr "#"
+#: ../coreapi/call_log.c:215
+msgid "missed"
+msgstr ""
 
-#~ msgid "0"
-#~ msgstr "0"
+#: ../coreapi/call_log.c:220
+#, c-format
+msgid ""
+"%s at %s\n"
+"From: %s\n"
+"To: %s\n"
+"Status: %s\n"
+"Duration: %i mn %i sec\n"
+msgstr ""
 
-#~ msgid "*"
-#~ msgstr "*"
+#: ../coreapi/call_log.c:221
+msgid "Outgoing call"
+msgstr ""
 
-#~ msgid "9"
-#~ msgstr "9"
-
-#~ msgid "8"
-#~ msgstr "8"
-
-#~ msgid "7"
-#~ msgstr "7"
-
-#~ msgid "B"
-#~ msgstr "B"
-
-#~ msgid "6"
-#~ msgstr "6"
-
-#~ msgid "5"
-#~ msgstr "5"
-
-#~ msgid "4"
-#~ msgstr "4"
-
-#~ msgid "A"
-#~ msgstr "A"
-
-#~ msgid "3"
-#~ msgstr "3"
-
-#~ msgid "2"
-#~ msgstr "2"
-
-#~ msgid "1"
-#~ msgstr "1"
-
-#~ msgid "%02i::%02i::%02i"
-#~ msgstr "%02i::%02i::%02i"
-
-#~ msgid "."
-#~ msgstr "."
+#: ../gtk/videowindow.c:66
+#, c-format
+msgid "Cannot play %s."
+msgstr ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 4efff36e4..d3dfa7ab7 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-28 10:55+0100\n"
-"PO-Revision-Date: 2014-11-19 10:15+0000\n"
+"POT-Creation-Date: 2014-12-01 14:27+0100\n"
+"PO-Revision-Date: 2014-12-01 13:28+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/"
 "linphone-gtk/language/zh_TW/)\n"
@@ -152,11 +152,11 @@ msgstr ""
 msgid "Call error"
 msgstr ""
 
-#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3747
+#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3751
 msgid "Call ended"
 msgstr "通話已結束"
 
-#: ../gtk/main.c:1289
+#: ../gtk/main.c:1289 ../coreapi/call_log.c:221
 msgid "Incoming call"
 msgstr "來電"
 
@@ -414,13 +414,10 @@ msgid_plural "Found %i contacts"
 msgstr[0] "找不到 %i 個連絡人"
 
 #: ../gtk/setupwizard.c:34
-#, fuzzy
 msgid ""
 "Welcome!\n"
 "This assistant will help you to use a SIP account for your calls."
 msgstr ""
-"歡迎！\n"
-"這個助理會協助您使用電話的 SIP 帳號。"
 
 #: ../gtk/setupwizard.c:43
 msgid "Create an account on linphone.org"
@@ -626,7 +623,7 @@ msgstr ""
 msgid "%.3f seconds"
 msgstr ""
 
-#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12
+#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12 ../gtk/videowindow.c:232
 msgid "Hang up"
 msgstr ""
 
@@ -762,13 +759,10 @@ msgid "Too loud"
 msgstr ""
 
 #: ../gtk/audio_assistant.c:318
-#, fuzzy
 msgid ""
 "Welcome!\n"
 "This assistant will help you to configure audio settings for Linphone"
 msgstr ""
-"歡迎！\n"
-"這個助理會協助您使用電話的 SIP 帳號。"
 
 #: ../gtk/audio_assistant.c:328
 msgid "Capture device"
@@ -975,23 +969,20 @@ msgid "Login information"
 msgstr "登入資訊"
 
 #: ../gtk/main.ui.h:46
-#, fuzzy
 msgid "<b>Welcome!</b>"
-msgstr "<b>歡迎使用！</b>"
+msgstr ""
 
 #: ../gtk/main.ui.h:47
 msgid "Delete"
 msgstr ""
 
 #: ../gtk/about.ui.h:1
-#, fuzzy
 msgid "About Linphone"
-msgstr "關於 linphone"
+msgstr ""
 
 #: ../gtk/about.ui.h:2
-#, fuzzy
 msgid "(C) Belledonne Communications, 2010\n"
-msgstr "(C) Belledonne Communications,2010\n"
+msgstr ""
 
 #: ../gtk/about.ui.h:4
 msgid "An internet video phone using the standard SIP (rfc3261) protocol."
@@ -1678,43 +1669,43 @@ msgid "Could not resolve this number."
 msgstr "無法解析這個號碼。"
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2922
+#: ../coreapi/linphonecore.c:2926
 msgid "Contacting"
 msgstr "正在連絡"
 
-#: ../coreapi/linphonecore.c:2927
+#: ../coreapi/linphonecore.c:2931
 msgid "Could not call"
 msgstr "無法通話"
 
-#: ../coreapi/linphonecore.c:3077
+#: ../coreapi/linphonecore.c:3081
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "抱歉，我們已達瀏同步通話的最大數目"
 
-#: ../coreapi/linphonecore.c:3236
+#: ../coreapi/linphonecore.c:3240
 msgid "is contacting you"
 msgstr "正在連絡您"
 
-#: ../coreapi/linphonecore.c:3237
+#: ../coreapi/linphonecore.c:3241
 msgid " and asked autoanswer."
 msgstr "並要求自動接聽。"
 
-#: ../coreapi/linphonecore.c:3355
+#: ../coreapi/linphonecore.c:3359
 msgid "Modifying call parameters..."
 msgstr "修改通話參數..."
 
-#: ../coreapi/linphonecore.c:3703
+#: ../coreapi/linphonecore.c:3707
 msgid "Connected."
 msgstr "已連線。"
 
-#: ../coreapi/linphonecore.c:3728
+#: ../coreapi/linphonecore.c:3732
 msgid "Call aborted"
 msgstr "通話已放棄"
 
-#: ../coreapi/linphonecore.c:3918
+#: ../coreapi/linphonecore.c:3922
 msgid "Could not pause the call"
 msgstr "無法暫停通話"
 
-#: ../coreapi/linphonecore.c:3922
+#: ../coreapi/linphonecore.c:3926
 msgid "Pausing the current call..."
 msgstr "暫停目前的通話..."
 
@@ -1775,9 +1766,8 @@ msgid "Vacation"
 msgstr ""
 
 #: ../coreapi/friend.c:68
-#, fuzzy
 msgid "Unknown status"
-msgstr "不明錯誤"
+msgstr ""
 
 #: ../coreapi/proxy.c:319
 msgid ""
@@ -1919,56 +1909,33 @@ msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
 msgstr[0] "您有 %i 通未接來電。"
 
-#~ msgid "label"
-#~ msgstr "標籤"
+#: ../coreapi/call_log.c:209
+msgid "aborted"
+msgstr ""
 
-#~ msgid "D"
-#~ msgstr "D"
+#: ../coreapi/call_log.c:212
+msgid "completed"
+msgstr ""
 
-#~ msgid "#"
-#~ msgstr "#"
+#: ../coreapi/call_log.c:215
+msgid "missed"
+msgstr ""
 
-#~ msgid "0"
-#~ msgstr "0"
+#: ../coreapi/call_log.c:220
+#, c-format
+msgid ""
+"%s at %s\n"
+"From: %s\n"
+"To: %s\n"
+"Status: %s\n"
+"Duration: %i mn %i sec\n"
+msgstr ""
 
-#~ msgid "*"
-#~ msgstr "*"
+#: ../coreapi/call_log.c:221
+msgid "Outgoing call"
+msgstr ""
 
-#~ msgid "9"
-#~ msgstr "9"
-
-#~ msgid "8"
-#~ msgstr "8"
-
-#~ msgid "7"
-#~ msgstr "7"
-
-#~ msgid "B"
-#~ msgstr "B"
-
-#~ msgid "6"
-#~ msgstr "6"
-
-#~ msgid "5"
-#~ msgstr "5"
-
-#~ msgid "4"
-#~ msgstr "4"
-
-#~ msgid "A"
-#~ msgstr "A"
-
-#~ msgid "3"
-#~ msgstr "3"
-
-#~ msgid "2"
-#~ msgstr "2"
-
-#~ msgid "1"
-#~ msgstr "1"
-
-#~ msgid "%02i::%02i::%02i"
-#~ msgstr "%02i::%02i::%02i"
-
-#~ msgid "."
-#~ msgstr "."
+#: ../gtk/videowindow.c:66
+#, c-format
+msgid "Cannot play %s."
+msgstr ""

From 93493976b374c1226f28a9b7a54db270ff53d3e8 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Mon, 1 Dec 2014 15:25:08 +0100
Subject: [PATCH 084/496] tester automatically creates unique accounts on
 flexisip server before running tests. This allows several developer to run
 the test suite simultaneously !

---
 coreapi/address.c                       |  31 ++++
 coreapi/bellesip_sal/sal_address_impl.c |  12 ++
 coreapi/bellesip_sal/sal_impl.c         |   4 +
 coreapi/bellesip_sal/sal_op_impl.c      |   1 +
 coreapi/linphonecore.c                  |   2 +
 coreapi/linphonecore.h                  |   5 +
 coreapi/misc.c                          |  20 +++
 include/sal/sal.h                       |   4 +
 tester/Makefile.am                      |   3 +-
 tester/accountmanager.c                 | 215 ++++++++++++++++++++++++
 tester/call_tester.c                    |  22 +--
 tester/flexisip/flexisip.conf           |   9 +
 tester/liblinphone_tester.h             |   3 +
 tester/tester.c                         |   6 +-
 14 files changed, 320 insertions(+), 17 deletions(-)
 create mode 100644 tester/accountmanager.c

diff --git a/coreapi/address.c b/coreapi/address.c
index 250026911..6530551ea 100644
--- a/coreapi/address.c
+++ b/coreapi/address.c
@@ -201,6 +201,37 @@ int linphone_address_get_port(const LinphoneAddress *u) {
 	return sal_address_get_port(u);
 }
 
+/**
+ * Set the password encoded in the address.
+ * It is used for basic authentication (not recommended).
+ * @param addr the LinphoneAddress
+ * @param passwd the password to set.
+**/
+void linphone_address_set_password(LinphoneAddress *addr, const char *passwd){
+	sal_address_set_password(addr,passwd);
+}
+
+/**
+ * Get the password encoded in the address.
+ * It is used for basic authentication (not recommended).
+ * @param addr the address
+ * @return the password, if any, NULL otherwise.
+**/
+const char *linphone_address_get_password(const LinphoneAddress *addr){
+	return sal_address_get_password(addr);
+}
+
+/**
+ * Set a header into the address.
+ * Headers appear in the URI with '?', such as <sip:test@linphone.org?SomeHeader=SomeValue>.
+ * @param addr the address
+ * @param header_name the header name
+ * @param header_value the header value
+**/
+void linphone_address_set_header(LinphoneAddress *addr, const char *header_name, const char *header_value){
+	sal_address_set_header(addr,header_name,header_value);
+}
+
 LinphoneAddress * linphone_core_create_address(LinphoneCore *lc, const char *address) {
 	return linphone_address_new(address);
 }
diff --git a/coreapi/bellesip_sal/sal_address_impl.c b/coreapi/bellesip_sal/sal_address_impl.c
index f51e421da..c4ff234d7 100644
--- a/coreapi/bellesip_sal/sal_address_impl.c
+++ b/coreapi/bellesip_sal/sal_address_impl.c
@@ -117,6 +117,14 @@ void sal_address_set_username(SalAddress *addr, const char *username){
 	SAL_ADDRESS_SET(addr,user,username);
 }
 
+void sal_address_set_password(SalAddress *addr, const char *passwd){
+	SAL_ADDRESS_SET(addr,user_password,passwd);
+}
+
+const char* sal_address_get_password(const SalAddress *addr){
+	SAL_ADDRESS_GET(addr,user_password);
+}
+
 void sal_address_set_domain(SalAddress *addr, const char *host){
 	SAL_ADDRESS_SET(addr,host,host);
 }
@@ -180,6 +188,10 @@ void sal_address_set_uri_params(SalAddress *addr, const char *params){
 	belle_sip_parameters_set(parameters,params);
 }
 
+void sal_address_set_header(SalAddress *addr, const char *header_name, const char *header_value){
+	belle_sip_uri_set_header(belle_sip_header_address_get_uri(BELLE_SIP_HEADER_ADDRESS(addr)),header_name, header_value);
+}
+
 void sal_address_set_transport(SalAddress* addr,SalTransport transport){
 	if (!sal_address_is_secure(addr)){
 		SAL_ADDRESS_SET(addr,transport_param,sal_transport_to_string(transport));
diff --git a/coreapi/bellesip_sal/sal_impl.c b/coreapi/bellesip_sal/sal_impl.c
index 1330f5269..7cb02eeeb 100644
--- a/coreapi/bellesip_sal/sal_impl.c
+++ b/coreapi/bellesip_sal/sal_impl.c
@@ -1077,6 +1077,10 @@ unsigned char * sal_get_random_bytes(unsigned char *ret, size_t size){
 	return belle_sip_random_bytes(ret,size);
 }
 
+char *sal_get_random_token(int size){
+	return belle_sip_random_token(ms_malloc(size),size);
+}
+
 unsigned int sal_get_random(void){
 	unsigned int ret=0;
 	belle_sip_random_bytes((unsigned char*)&ret,4);
diff --git a/coreapi/bellesip_sal/sal_op_impl.c b/coreapi/bellesip_sal/sal_op_impl.c
index 5acfd5eae..1f734719f 100644
--- a/coreapi/bellesip_sal/sal_op_impl.c
+++ b/coreapi/bellesip_sal/sal_op_impl.c
@@ -103,6 +103,7 @@ belle_sip_header_contact_t* sal_op_create_contact(SalOp *op){
 		belle_sip_header_address_set_uri(BELLE_SIP_HEADER_ADDRESS(contact_header),contact_uri);
 	}
 
+	belle_sip_uri_set_user_password(contact_uri,NULL);
 	belle_sip_uri_set_secure(contact_uri,sal_op_is_secure(op));
 	if (op->privacy!=SalPrivacyNone){
 		belle_sip_uri_set_user(contact_uri,NULL);
diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 16de123a7..de0c1228d 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -6048,6 +6048,8 @@ void sip_config_uninit(LinphoneCore *lc)
 		if (i>=20) ms_warning("Cannot complete unregistration, giving up");
 	}
 	config->proxies=ms_list_free_with_data(config->proxies,(void (*)(void*)) _linphone_proxy_config_release);
+	
+	config->deleted_proxies=ms_list_free_with_data(config->deleted_proxies,(void (*)(void*)) _linphone_proxy_config_release);
 
 	/*no longuer need to write proxy config if not changedlinphone_proxy_config_write_to_config_file(lc->config,NULL,i);*/	/*mark the end */
 
diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h
index ac72246ad..bed8fdf0e 100644
--- a/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@ -400,6 +400,9 @@ LINPHONE_PUBLIC void linphone_address_set_transport(LinphoneAddress *uri,Linphon
 LINPHONE_PUBLIC	char *linphone_address_as_string(const LinphoneAddress *u);
 LINPHONE_PUBLIC	char *linphone_address_as_string_uri_only(const LinphoneAddress *u);
 LINPHONE_PUBLIC	bool_t linphone_address_weak_equal(const LinphoneAddress *a1, const LinphoneAddress *a2);
+LINPHONE_PUBLIC void linphone_address_set_password(LinphoneAddress *addr, const char *passwd);
+LINPHONE_PUBLIC const char *linphone_address_get_password(const LinphoneAddress *addr);
+LINPHONE_PUBLIC void linphone_address_set_header(LinphoneAddress *addr, const char *header_name, const char *header_value);
 LINPHONE_PUBLIC	void linphone_address_destroy(LinphoneAddress *u);
 
 /**
@@ -477,6 +480,8 @@ enum _LinphoneIceState{
 **/
 typedef enum _LinphoneIceState LinphoneIceState;
 
+LINPHONE_PUBLIC const char *linphone_ice_state_to_string(LinphoneIceState state);
+
 /**
  * Enum describing uPnP states.
  * @ingroup initializing
diff --git a/coreapi/misc.c b/coreapi/misc.c
index 5de319246..a869d5301 100644
--- a/coreapi/misc.c
+++ b/coreapi/misc.c
@@ -641,6 +641,24 @@ int linphone_core_gather_ice_candidates(LinphoneCore *lc, LinphoneCall *call)
 	return 0;
 }
 
+const char *linphone_ice_state_to_string(LinphoneIceState state){
+	switch(state){
+		case LinphoneIceStateFailed:
+			return "IceStateFailed";
+		case LinphoneIceStateHostConnection:
+			return "IceStateHostConnection";
+		case LinphoneIceStateInProgress:
+			return "IceStateInProgress";
+		case LinphoneIceStateNotActivated:
+			return "IceStateNotActivated";
+		case LinphoneIceStateReflexiveConnection:
+			return "IceStateReflexiveConnection";
+		case LinphoneIceStateRelayConnection:
+			return "IceStateRelayConnection";
+	}
+	return "invalid";
+}
+
 void linphone_core_update_ice_state_in_call_stats(LinphoneCall *call)
 {
 	IceCheckList *audio_check_list;
@@ -699,6 +717,8 @@ void linphone_core_update_ice_state_in_call_stats(LinphoneCall *call)
 			call->stats[LINPHONE_CALL_STATS_VIDEO].ice_state = LinphoneIceStateFailed;
 		}
 	}
+	ms_message("Call [%p] New ICE state: audio: [%s]    video: [%s]", call, 
+		   linphone_ice_state_to_string(call->stats[LINPHONE_CALL_STATS_AUDIO].ice_state), linphone_ice_state_to_string(call->stats[LINPHONE_CALL_STATS_VIDEO].ice_state));
 }
 
 void _update_local_media_description_from_ice(SalMediaDescription *desc, IceSession *session)
diff --git a/include/sal/sal.h b/include/sal/sal.h
index 5fb0fbd92..040ab9951 100644
--- a/include/sal/sal.h
+++ b/include/sal/sal.h
@@ -110,6 +110,9 @@ void sal_address_set_transport_name(SalAddress* addr,const char* transport);
 void sal_address_set_params(SalAddress *addr, const char *params);
 void sal_address_set_uri_params(SalAddress *addr, const char *params);
 bool_t sal_address_is_ipv6(SalAddress *addr);
+void sal_address_set_password(SalAddress *addr, const char *passwd);
+const char *sal_address_get_password(const SalAddress *addr);
+void sal_address_set_header(SalAddress *addr, const char *header_name, const char *header_value);
 
 Sal * sal_init();
 void sal_uninit(Sal* sal);
@@ -755,6 +758,7 @@ LINPHONE_PUBLIC bool_t sal_dns_srv_enabled(const Sal *sal);
 LINPHONE_PUBLIC void sal_set_dns_user_hosts_file(Sal *sal, const char *hosts_file);
 LINPHONE_PUBLIC const char *sal_get_dns_user_hosts_file(const Sal *sal);
 unsigned int sal_get_random(void);
+char *sal_get_random_token(int size);
 unsigned char * sal_get_random_bytes(unsigned char *ret, size_t size);
 belle_sip_source_t * sal_create_timer(Sal *sal, belle_sip_source_func_t func, void *data, unsigned int timeout_value_ms, const char* timer_name);
 void sal_cancel_timer(Sal *sal, belle_sip_source_t *timer);
diff --git a/tester/Makefile.am b/tester/Makefile.am
index 88f17ea28..d296841ad 100644
--- a/tester/Makefile.am
+++ b/tester/Makefile.am
@@ -25,7 +25,8 @@ liblinphonetester_la_SOURCES = tester.c \
 				log_collection_tester.c \
 				transport_tester.c \
 				player_tester.c \
-				dtmf_tester.c
+				dtmf_tester.c \
+				accountmanager.c
 
 liblinphonetester_la_LDFLAGS= -no-undefined
 liblinphonetester_la_LIBADD= ../coreapi/liblinphone.la $(CUNIT_LIBS)
diff --git a/tester/accountmanager.c b/tester/accountmanager.c
new file mode 100644
index 000000000..c0fc054cc
--- /dev/null
+++ b/tester/accountmanager.c
@@ -0,0 +1,215 @@
+ /*
+ tester - liblinphone test suite
+ Copyright (C) 2013  Belledonne Communications SARL
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "liblinphone_tester.h"
+#include "private.h"
+
+struct _Account{
+	LinphoneAddress *identity;
+	LinphoneAddress *modified_identity;
+	char *password;
+	int created;
+	int done;
+	int auth_requested;
+};
+
+typedef struct _Account Account;
+
+Account *account_new(LinphoneAddress *identity, const char *unique_id){
+	char *modified_username;
+	Account *obj=ms_new0(Account,1);
+	
+	/* we need to inhibit leak detector because the two LinphoneAddress will remain behond the scope of the test being run */
+	belle_sip_object_inhibit_leak_detector(TRUE);
+	obj->identity=linphone_address_clone(identity);
+	obj->password=sal_get_random_token(8);
+	obj->modified_identity=linphone_address_clone(identity);
+	modified_username=ms_strdup_printf("%s_%s",linphone_address_get_username(identity), unique_id);
+	linphone_address_set_username(obj->modified_identity, modified_username);
+	ms_free(modified_username);
+	belle_sip_object_inhibit_leak_detector(FALSE);
+	return obj;
+};
+
+void account_destroy(Account *obj){
+	linphone_address_unref(obj->identity);
+	linphone_address_unref(obj->modified_identity);
+	ms_free(obj->password);
+	ms_free(obj);
+}
+
+struct _AccountManager{
+	char *unique_id;
+	MSList *accounts;
+};
+
+typedef struct _AccountManager AccountManager;
+
+static AccountManager *the_am=NULL;
+
+AccountManager *account_manager_get(void){
+	if (the_am==NULL){
+		the_am=ms_new0(AccountManager,1);
+		the_am->unique_id=sal_get_random_token(6);
+	}
+	return the_am;
+}
+
+void account_manager_destroy(void){
+	if (the_am){
+		ms_free(the_am->unique_id);
+		ms_list_free_with_data(the_am->accounts,(void(*)(void*))account_destroy);
+		ms_free(the_am);
+	}
+	the_am=NULL;
+}
+
+Account *account_manager_get_account(AccountManager *m, const LinphoneAddress *identity){
+	MSList *it;
+	
+	for(it=m->accounts;it!=NULL;it=it->next){
+		Account *a=(Account*)it->data;
+		if (linphone_address_weak_equal(a->identity,identity)){
+			return a;
+		}
+	}
+	return NULL;
+}
+
+static void account_created_on_server_cb(LinphoneCore *lc, LinphoneProxyConfig *cfg, LinphoneRegistrationState state, const char *info){
+	Account *account=(Account*)linphone_core_get_user_data(lc);
+	switch(state){
+		case LinphoneRegistrationOk:
+			account->created=1;
+		break;
+		case LinphoneRegistrationCleared:
+			account->done=1;
+		break;
+		default:
+		break;
+	}
+}
+
+static void account_created_auth_requested_cb(LinphoneCore *lc, const char *username, const char *realm, const char *domain){
+	Account *account=(Account*)linphone_core_get_user_data(lc);
+	account->auth_requested=1;
+}
+
+void account_create_on_server(Account *account, const LinphoneProxyConfig *refcfg){
+	LinphoneCoreVTable vtable={0};
+	LinphoneCore *lc;
+	LinphoneAddress *tmp_identity=linphone_address_clone(account->modified_identity);
+	LinphoneProxyConfig *cfg;
+	LinphoneAuthInfo *ai;
+	char *tmp;
+	LinphoneAddress *server_addr;
+	
+	vtable.registration_state_changed=account_created_on_server_cb;
+	vtable.auth_info_requested=account_created_auth_requested_cb;
+	lc=configure_lc_from(&vtable,NULL,NULL,account);
+	
+	cfg=linphone_core_create_proxy_config(lc);
+	linphone_address_set_password(tmp_identity,account->password);
+	linphone_address_set_header(tmp_identity,"X-Create-Account","yes");
+	tmp=linphone_address_as_string(tmp_identity);
+	linphone_proxy_config_set_identity(cfg,tmp);
+	ms_free(tmp);
+	linphone_address_unref(tmp_identity);
+	
+	server_addr=linphone_address_new(linphone_proxy_config_get_server_addr(refcfg));
+	linphone_address_set_transport(server_addr,LinphoneTransportTcp); /*use tcp for account creation*/
+	tmp=linphone_address_as_string(server_addr);
+	linphone_proxy_config_set_server_addr(cfg,tmp);
+	ms_free(tmp);
+	linphone_address_unref(server_addr);
+	linphone_proxy_config_set_expires(cfg,3600);
+	
+	linphone_core_add_proxy_config(lc,cfg);
+	
+	if (wait_for_until(lc,NULL,&account->auth_requested,1,10000)==FALSE){
+		ms_fatal("Account for %s could not be created on server.", linphone_proxy_config_get_identity(refcfg));
+	}
+	linphone_proxy_config_stop_refreshing(cfg); /*so that op is destroyed; we need to remove the X-create-account*/
+	linphone_proxy_config_edit(cfg);
+	tmp=linphone_address_as_string(account->modified_identity);
+	linphone_proxy_config_set_identity(cfg,tmp); /*remove the X-Create-Account header*/
+	ms_free(tmp);
+	linphone_proxy_config_done(cfg);
+	
+	ai=linphone_auth_info_new(linphone_address_get_username(account->modified_identity),
+				NULL,
+				account->password,NULL,NULL,linphone_address_get_domain(account->modified_identity));
+	linphone_core_add_auth_info(lc,ai);
+	linphone_auth_info_destroy(ai);
+	
+	if (wait_for_until(lc,NULL,&account->created,1,3000)==FALSE){
+		ms_fatal("Account for %s is not working on server.", linphone_proxy_config_get_identity(refcfg));
+	}
+	linphone_core_remove_proxy_config(lc,cfg);
+	linphone_proxy_config_unref(cfg);
+	if (wait_for_until(lc,NULL,&account->done,1,3000)==FALSE){
+		ms_error("Account creation could not clean the registration context.");
+	}
+	linphone_core_destroy(lc);
+}
+
+LinphoneAddress *account_manager_check_account(AccountManager *m, LinphoneProxyConfig *cfg){
+	LinphoneCore *lc=linphone_proxy_config_get_core(cfg);
+	const char *identity=linphone_proxy_config_get_identity(cfg);
+	LinphoneAddress *id_addr=linphone_address_new(identity);
+	Account *account=account_manager_get_account(m,id_addr);
+	LinphoneAuthInfo *ai;
+	char *tmp;
+	bool_t create_account=FALSE;
+	
+	if (!account){
+		account=account_new(id_addr,m->unique_id);
+		ms_message("No account for %s exists, going to create one.",identity);
+		create_account=TRUE;
+		m->accounts=ms_list_append(m->accounts,account);
+	}
+	tmp=linphone_address_as_string(account->modified_identity);
+	linphone_proxy_config_set_identity(cfg,tmp);
+	ms_free(tmp);
+	
+	if (create_account){
+		account_create_on_server(account,cfg);
+	}
+	ai=linphone_auth_info_new(linphone_address_get_username(account->modified_identity),
+				NULL,
+				account->password,NULL,NULL,linphone_address_get_domain(account->modified_identity));
+	linphone_core_add_auth_info(lc,ai);
+	linphone_auth_info_destroy(ai);
+	
+	linphone_address_unref(id_addr);
+	return account->modified_identity;
+}
+
+void linphone_core_manager_check_accounts(LinphoneCoreManager *m){
+	const MSList *it;
+	AccountManager *am=account_manager_get();
+
+	for(it=linphone_core_get_proxy_config_list(m->lc);it!=NULL;it=it->next){
+		LinphoneProxyConfig *cfg=(LinphoneProxyConfig *)it->data;
+		LinphoneAddress *modified_identity=account_manager_check_account(am,cfg);
+		if (m->identity){
+			linphone_address_unref(m->identity);
+		}
+		m->identity=linphone_address_ref(modified_identity);
+	}
+}
diff --git a/tester/call_tester.c b/tester/call_tester.c
index 6b21e2bd6..453c684ad 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -206,9 +206,6 @@ bool_t call_with_params2(LinphoneCoreManager* caller_mgr
 		CU_ASSERT_PTR_NOT_NULL(linphone_core_invite_address_with_params(caller_mgr->lc,callee_mgr->identity,caller_params));
 	}
 
-
-	/*linphone_core_invite(caller_mgr->lc,"pauline");*/
-
 	did_received_call = wait_for(callee_mgr->lc
 				,caller_mgr->lc
 				,&callee_mgr->stat.number_of_LinphoneCallIncomingReceived
@@ -641,7 +638,7 @@ static void simple_call_compatibility_mode(void) {
 
 	CU_ASSERT_TRUE (wait_for(lc_marie,lc_marie,&stat_marie->number_of_LinphoneRegistrationOk,1));
 
-	linphone_core_invite(lc_marie,"pauline");
+	linphone_core_invite_address(lc_marie,pauline->identity);
 
 	CU_ASSERT_TRUE (wait_for(lc_pauline,lc_marie,&stat_pauline->number_of_LinphoneCallIncomingReceived,1));
 	CU_ASSERT_TRUE(linphone_core_inc_invite_pending(lc_pauline));
@@ -674,7 +671,7 @@ static void cancelled_call(void) {
 	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
 
-	LinphoneCall* out_call = linphone_core_invite(pauline->lc,"marie");
+	LinphoneCall* out_call = linphone_core_invite_address(pauline->lc,marie->identity);
 	linphone_call_ref(out_call);
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallOutgoingInit,1));
 
@@ -730,7 +727,7 @@ static void call_failed_because_of_codecs(void) {
 
 		disable_all_audio_codecs_except_one(marie->lc,"pcmu",-1);
 		disable_all_audio_codecs_except_one(pauline->lc,"pcma",-1);
-		out_call = linphone_core_invite(pauline->lc,"marie");
+		out_call = linphone_core_invite_address(pauline->lc,marie->identity);
 		linphone_call_ref(out_call);
 		CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallOutgoingInit,1));
 
@@ -801,7 +798,7 @@ static void cancelled_ringing_call(void) {
 	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
 
-	LinphoneCall* out_call = linphone_core_invite(pauline->lc,"marie");
+	LinphoneCall* out_call = linphone_core_invite_address(pauline->lc,marie->identity);
 	linphone_call_ref(out_call);
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallIncomingReceived,1));
 
@@ -823,7 +820,7 @@ static void early_declined_call(void) {
 	LinphoneCall* out_call;
 
 	linphone_core_set_max_calls(marie->lc,0);
-	out_call = linphone_core_invite(pauline->lc,"marie");
+	out_call = linphone_core_invite_address(pauline->lc,marie->identity);
 	linphone_call_ref(out_call);
 
 	/*wait until flexisip transfers the busy...*/
@@ -943,7 +940,7 @@ static bool_t check_ice(LinphoneCoreManager* caller, LinphoneCoreManager* callee
 				linphone_core_iterate(callee->lc);
 			}
 			ms_usleep(20000);
-		}while(!liblinphone_tester_clock_elapsed(&ts,5000));
+		}while(!liblinphone_tester_clock_elapsed(&ts,10000));
 	}
 
 	 /*make sure encryption mode are preserved*/
@@ -980,7 +977,6 @@ static void _call_with_ice_base(LinphoneCoreManager* pauline,LinphoneCoreManager
 	CU_ASSERT_TRUE(call(pauline,marie));
 
 	if (callee_with_ice && caller_with_ice) {
-		check_ice(pauline,marie,LinphoneIceStateHostConnection);
 		/*wait for the ICE reINVITE to complete*/
 		CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallStreamsRunning,2));
 		CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallStreamsRunning,2));
@@ -1631,7 +1627,7 @@ static void video_call_with_ice_no_matching_audio_codecs(void) {
 	linphone_core_set_firewall_policy(pauline->lc, LinphonePolicyUseIce);
 	linphone_core_set_stun_server(pauline->lc, "stun.linphone.org");
 
-	out_call = linphone_core_invite(marie->lc, "pauline");
+	out_call = linphone_core_invite_address(marie->lc, pauline->identity);
 	linphone_call_ref(out_call);
 	CU_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallOutgoingInit, 1));
 
@@ -2822,7 +2818,7 @@ static void call_established_with_rejected_reinvite_with_error(void) {
 
 static void call_rejected_because_wrong_credentials_with_params(const char* user_agent,bool_t enable_auth_req_cb) {
 	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
-	LinphoneAuthInfo* good_auth_info=linphone_auth_info_clone((LinphoneAuthInfo*)(linphone_core_get_auth_info_list(marie->lc)->data));
+	LinphoneAuthInfo* good_auth_info=linphone_auth_info_clone(linphone_core_find_auth_info(marie->lc,NULL,linphone_address_get_username(marie->identity),NULL));
 	LinphoneAuthInfo* wrong_auth_info=linphone_auth_info_clone(good_auth_info);
 	bool_t result=FALSE;
 	linphone_auth_info_set_passwd(wrong_auth_info,"passecretdutout");
@@ -2855,7 +2851,7 @@ static void call_rejected_because_wrong_credentials_with_params(const char* user
 	/*to make sure unregister will work*/
 	linphone_core_clear_all_auth_info(marie->lc);
 	linphone_core_add_auth_info(marie->lc,good_auth_info);
-
+	linphone_auth_info_destroy(good_auth_info);
 	linphone_core_manager_destroy(marie);
 }
 
diff --git a/tester/flexisip/flexisip.conf b/tester/flexisip/flexisip.conf
index 12f42d945..635ae0bda 100755
--- a/tester/flexisip/flexisip.conf
+++ b/tester/flexisip/flexisip.conf
@@ -205,6 +205,15 @@ hashed-passwords=false
 #  Default value: false
 new-auth-on-407=false
 
+# Enable a feature useful for automatic tests, allowing a client
+# to create a temporary account in the password database in memory.
+# This MUST not be used for production as it is a real security
+# hole.
+#  Default value: false
+
+enable-test-accounts-creation=true
+
+
 ##
 ## ...
 ##
diff --git a/tester/liblinphone_tester.h b/tester/liblinphone_tester.h
index a7c82913a..12531a57f 100644
--- a/tester/liblinphone_tester.h
+++ b/tester/liblinphone_tester.h
@@ -278,6 +278,9 @@ void liblinphone_tester_chat_message_msg_state_changed(LinphoneChatMessage *msg,
 void liblinphone_tester_check_rtcp(LinphoneCoreManager* caller, LinphoneCoreManager* callee);
 void liblinphone_tester_clock_start(MSTimeSpec *start);
 bool_t liblinphone_tester_clock_elapsed(const MSTimeSpec *start, int value_ms);
+void linphone_core_manager_check_accounts(LinphoneCoreManager *m);
+void account_manager_destroy(void);
+LinphoneCore* configure_lc_from(LinphoneCoreVTable* v_table, const char* path, const char* file, void* user_data);
 #ifdef ANDROID
 void cunit_android_trace_handler(int level, const char *fmt, va_list args) ;
 #endif
diff --git a/tester/tester.c b/tester/tester.c
index d8639db47..98186c134 100644
--- a/tester/tester.c
+++ b/tester/tester.c
@@ -25,8 +25,6 @@
 #include "CUnit/CUCurses.h"
 #endif
 
-static LinphoneCore* configure_lc_from(LinphoneCoreVTable* v_table, const char* path, const char* file, void* user_data);
-
 static test_suite_t **test_suite = NULL;
 static int nb_test_suites = 0;
 
@@ -108,7 +106,7 @@ void reset_counters( stats* counters) {
 	memset(counters,0,sizeof(stats));
 }
 
-static LinphoneCore* configure_lc_from(LinphoneCoreVTable* v_table, const char* path, const char* file, void* user_data) {
+LinphoneCore* configure_lc_from(LinphoneCoreVTable* v_table, const char* path, const char* file, void* user_data) {
 	LinphoneCore* lc;
 	LpConfig* config = NULL;
 	char *filepath         = NULL;
@@ -252,6 +250,7 @@ LinphoneCoreManager* linphone_core_manager_new2(const char* rc_file, int check_f
 	reset_counters(&mgr->stat);
 	if (rc_file) rc_path = ms_strdup_printf("rcfiles/%s", rc_file);
 	mgr->lc=configure_lc_from(&mgr->v_table, liblinphone_tester_file_prefix, rc_path, mgr);
+	linphone_core_manager_check_accounts(mgr);
 	/*CU_ASSERT_EQUAL(ms_list_size(linphone_core_get_proxy_config_list(lc)),proxy_count);*/
 	if (check_for_proxies && rc_file) /**/
 		proxy_count=ms_list_size(linphone_core_get_proxy_config_list(mgr->lc));
@@ -545,6 +544,7 @@ int liblinphone_tester_run_tests(const char *suite_name, const char *test_name)
 	}
 
 	CU_cleanup_registry();
+	account_manager_destroy();
 	return ret;
 }
 

From 65283e00ee5800160c9fdc9ba31d703b7c13e0fc Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Mon, 1 Dec 2014 16:25:13 +0100
Subject: [PATCH 085/496] Add compilation of accountmanager.c when building
 with CMake.

---
 tester/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tester/CMakeLists.txt b/tester/CMakeLists.txt
index 3131a1054..8f3bd33a8 100644
--- a/tester/CMakeLists.txt
+++ b/tester/CMakeLists.txt
@@ -21,6 +21,7 @@
 ############################################################################
 
 set(SOURCE_FILES
+	accountmanager.c
 	call_tester.c
 	dtmf_tester.c
 	eventapi_tester.c

From 43fe5b0b23ec20cf6356e2ab270f8866870eede5 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Mon, 1 Dec 2014 16:32:10 +0100
Subject: [PATCH 086/496] Enable video in unit tests when building with CMake.

---
 CMakeLists.txt         | 5 +++++
 coreapi/CMakeLists.txt | 4 ----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6f762ad8e..ac04dc879 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -153,6 +153,11 @@ set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/config.h PROPERTIES GENE
 add_definitions(-DHAVE_CONFIG_H)
 
 
+if(ENABLE_VIDEO)
+	add_definitions(-DVIDEO_ENABLED)
+endif()
+
+
 add_subdirectory(coreapi)
 add_subdirectory(share)
 if(ENABLE_GTK_UI)
diff --git a/coreapi/CMakeLists.txt b/coreapi/CMakeLists.txt
index e3bae9640..cb417a612 100644
--- a/coreapi/CMakeLists.txt
+++ b/coreapi/CMakeLists.txt
@@ -110,10 +110,6 @@ add_definitions(
 	-DLIBLINPHONE_EXPORTS
 )
 
-if(ENABLE_VIDEO)
-	add_definitions(-DVIDEO_ENABLED)
-endif()
-
 set(LIBS
 	${LIBGCC}
 	${LIBMINGWEX}

From 10c057eae4615cd3faa61ce9fe6a4458ebcf48f2 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Mon, 1 Dec 2014 17:12:59 +0100
Subject: [PATCH 087/496] Make translatable some GUI text

---
 coreapi/call_log.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/coreapi/call_log.c b/coreapi/call_log.c
index 7ce488096..1449c1920 100644
--- a/coreapi/call_log.c
+++ b/coreapi/call_log.c
@@ -215,7 +215,7 @@ char * linphone_call_log_to_str(LinphoneCallLog *cl){
 			status=_("missed");
 			break;
 		default:
-			status="unknown";
+			status=_("unknown");
 	}
 	tmp=ortp_strdup_printf(_("%s at %s\nFrom: %s\nTo: %s\nStatus: %s\nDuration: %i mn %i sec\n"),
 			(cl->dir==LinphoneCallIncoming) ? _("Incoming call") : _("Outgoing call"),

From b9b8166ad8aa6ee6b697ff266c7a6ee6f50b4876 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Tue, 2 Dec 2014 11:16:00 +0100
Subject: [PATCH 088/496] fix tester, update oRTP for bugfixes

---
 oRTP                           | 2 +-
 tester/rcfiles/pauline_alt_rc  | 2 ++
 tester/rcfiles/pauline_wild_rc | 2 ++
 tester/register_tester.c       | 2 +-
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/oRTP b/oRTP
index a3debbd39..93607074c 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit a3debbd394fb32ab54ed265d2190711971c890e7
+Subproject commit 93607074c723d6d5181e48d6d7989b1c39b9bb8b
diff --git a/tester/rcfiles/pauline_alt_rc b/tester/rcfiles/pauline_alt_rc
index 7c1fe55ac..c8e730729 100644
--- a/tester/rcfiles/pauline_alt_rc
+++ b/tester/rcfiles/pauline_alt_rc
@@ -1,4 +1,6 @@
 [sip]
+sip_port=-1
+sip_tcp_port=-1
 sip_tls_port=-1
 default_proxy=0
 register_only_when_network_is_up=0
diff --git a/tester/rcfiles/pauline_wild_rc b/tester/rcfiles/pauline_wild_rc
index d828c807d..1d0d9b164 100644
--- a/tester/rcfiles/pauline_wild_rc
+++ b/tester/rcfiles/pauline_wild_rc
@@ -1,4 +1,6 @@
 [sip]
+sip_port=-1
+sip_tcp_port=-1
 sip_tls_port=-1
 default_proxy=0
 register_only_when_network_is_up=0
diff --git a/tester/register_tester.c b/tester/register_tester.c
index 907a10db7..fc778d865 100644
--- a/tester/register_tester.c
+++ b/tester/register_tester.c
@@ -781,7 +781,7 @@ static void tls_alt_name_register(){
 	linphone_core_refresh_registers(mgr->lc);
 	CU_ASSERT_TRUE(wait_for(lc,lc,&mgr->stat.number_of_LinphoneRegistrationOk,1));
 	CU_ASSERT_EQUAL(mgr->stat.number_of_LinphoneRegistrationFailed,0);
-	linphone_core_destroy(mgr->lc);
+	linphone_core_manager_destroy(mgr);
 }
 
 static void tls_wildcard_register(){

From f8d7cdfdada17094c8eac9ee529f56d8b2ee1196 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Tue, 2 Dec 2014 11:27:43 +0100
Subject: [PATCH 089/496] fix problem when port is set to a TLS port only

---
 tester/accountmanager.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tester/accountmanager.c b/tester/accountmanager.c
index c0fc054cc..3d6875453 100644
--- a/tester/accountmanager.c
+++ b/tester/accountmanager.c
@@ -133,6 +133,7 @@ void account_create_on_server(Account *account, const LinphoneProxyConfig *refcf
 	
 	server_addr=linphone_address_new(linphone_proxy_config_get_server_addr(refcfg));
 	linphone_address_set_transport(server_addr,LinphoneTransportTcp); /*use tcp for account creation*/
+	linphone_address_set_port(server_addr,0);
 	tmp=linphone_address_as_string(server_addr);
 	linphone_proxy_config_set_server_addr(cfg,tmp);
 	ms_free(tmp);

From d8ce5b8904f5bec4f02dc2ad172e9bfa7a53464a Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Tue, 2 Dec 2014 12:11:55 +0100
Subject: [PATCH 090/496] fix crash when tunnel mode is compiled but disabled

---
 coreapi/bellesip_sal/sal_op_impl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/coreapi/bellesip_sal/sal_op_impl.c b/coreapi/bellesip_sal/sal_op_impl.c
index 1f734719f..2e68146a0 100644
--- a/coreapi/bellesip_sal/sal_op_impl.c
+++ b/coreapi/bellesip_sal/sal_op_impl.c
@@ -313,7 +313,7 @@ static int _sal_op_send_request_with_contact(SalOp* op, belle_sip_request_t* req
 			}
 		}else{
 #ifdef TUNNEL_ENABLED
-			if (BELLE_SIP_OBJECT_IS_INSTANCE_OF(udplp,belle_sip_tunnel_listening_point_t)){
+			if (udplp && BELLE_SIP_OBJECT_IS_INSTANCE_OF(udplp,belle_sip_tunnel_listening_point_t)){
 				/* our tunnel mode only supports UDP. Force transport to be set to UDP */
 				belle_sip_uri_set_transport_param(next_hop_uri,"udp");
 			}

From 44665fe88a1a22a0fb39a27c2d5a35f8ff2df7b1 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@linphone.org>
Date: Tue, 2 Dec 2014 12:42:57 +0100
Subject: [PATCH 091/496] Added implem of remove_listener in jni layer, fixing
 crash occuring on second call

---
 coreapi/linphonecore_jni.cc | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index 83d28ef8c..42d22a0e1 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -1032,7 +1032,21 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_addListener(JNIEnv* env,
 }
 
 extern "C" void Java_org_linphone_core_LinphoneCoreImpl_removeListener(JNIEnv* env, jobject thiz, jlong lc, jobject jlistener) {
-	//TODO
+	MSList* iterator;
+	LinphoneCore *core = (LinphoneCore*)lc;
+	jobject listener = env->NewGlobalRef(jlistener);
+	for (iterator = core->vtables; iterator != NULL; iterator = iterator->next) {
+		LinphoneCoreVTable *vTable = (LinphoneCoreVTable*)(iterator->data);
+		if (vTable) {
+			LinphoneCoreData *data = (LinphoneCoreData*) linphone_core_v_table_get_user_data(vTable);
+			if (data && env->IsSameObject(data->listener, listener)) {
+				linphone_core_remove_listener(core, vTable);
+				linphone_core_v_table_destroy(vTable);
+				break;
+			}
+		}
+	}
+	env->DeleteGlobalRef(listener);
 }
 
 extern "C" jint Java_org_linphone_core_LinphoneCoreImpl_migrateToMultiTransport(JNIEnv*  env

From d0966f027f2462632c8590e5471616225a564d2d Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@linphone.org>
Date: Tue, 2 Dec 2014 13:40:42 +0100
Subject: [PATCH 092/496] Fix android tester build

---
 build/android/liblinphone_tester.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build/android/liblinphone_tester.mk b/build/android/liblinphone_tester.mk
index 430f203be..ee2018621 100644
--- a/build/android/liblinphone_tester.mk
+++ b/build/android/liblinphone_tester.mk
@@ -17,7 +17,8 @@ common_SRC_FILES := \
 	log_collection_tester.c \
 	transport_tester.c \
 	player_tester.c \
-	dtmf_tester.c
+	dtmf_tester.c \
+	accountmanager.c
 
 common_C_INCLUDES += \
         $(LOCAL_PATH) \

From 7ce476ffb084ea6e110fd27f6033e932518234e9 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Tue, 2 Dec 2014 15:17:26 +0100
Subject: [PATCH 093/496] fix memory leak in case Message tests are passed in
 sequence

---
 tester/message_tester.c | 1 +
 tester/tester.c         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/tester/message_tester.c b/tester/message_tester.c
index a44973227..784acb49b 100644
--- a/tester/message_tester.c
+++ b/tester/message_tester.c
@@ -358,6 +358,7 @@ static void text_message_with_ack(void) {
 		CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneMessageReceived,1));
 		CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneMessageDelivered,1));
 		CU_ASSERT_EQUAL(pauline->stat.number_of_LinphoneMessageInProgress,1);
+
 		linphone_core_manager_destroy(marie);
 		linphone_core_manager_destroy(pauline);
 	}
diff --git a/tester/tester.c b/tester/tester.c
index 98186c134..b705a8912 100644
--- a/tester/tester.c
+++ b/tester/tester.c
@@ -103,6 +103,7 @@ static void auth_info_requested(LinphoneCore *lc, const char *realm, const char
 
 
 void reset_counters( stats* counters) {
+	if (counters->last_received_chat_message) linphone_chat_message_unref(counters->last_received_chat_message);
 	memset(counters,0,sizeof(stats));
 }
 

From 02ed5338ed1f7cbbd4a1d5d3d49a02ab01ea9273 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Tue, 2 Dec 2014 16:02:19 +0100
Subject: [PATCH 094/496] Handle translations when building with CMake.

---
 CMakeLists.txt     |  4 +++-
 gtk/CMakeLists.txt |  4 ++++
 po/CMakeLists.txt  | 33 +++++++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 po/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ac04dc879..85a86bf42 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -95,6 +95,7 @@ if(ENABLE_NOTIFY)
 		set(ENABLE_NOTIFY OFF CACHE BOOL "Enable libnotify support." FORCE)
 	endif()
 endif()
+find_package(Gettext)
 
 
 include_directories(
@@ -114,7 +115,7 @@ if(MSVC)
 	include_directories(${CMAKE_PREFIX_PATH}/include/MSVC)
 endif()
 
-add_definitions(-DIN_LINPHONE)
+add_definitions("-DIN_LINPHONE")
 
 
 if(MSVC)
@@ -163,6 +164,7 @@ add_subdirectory(share)
 if(ENABLE_GTK_UI)
 	add_subdirectory(gtk)
 	add_subdirectory(pixmaps)
+	add_subdirectory(po)
 endif()
 if(ENABLE_TOOLS)
 	add_subdirectory(tools)
diff --git a/gtk/CMakeLists.txt b/gtk/CMakeLists.txt
index e5d66561b..89d5805a6 100644
--- a/gtk/CMakeLists.txt
+++ b/gtk/CMakeLists.txt
@@ -65,6 +65,10 @@ set(SOURCE_FILES
 	videowindow.c
 )
 
+if(GETTEXT_FOUND)
+	add_definitions("-DENABLE_NLS")
+endif()
+
 add_executable(linphone-gtk ${SOURCE_FILES})
 set_target_properties(linphone-gtk PROPERTIES OUTPUT_NAME linphone)
 target_include_directories(linphone-gtk PUBLIC ${GTK2_INCLUDE_DIRS})
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
new file mode 100644
index 000000000..7c39caac6
--- /dev/null
+++ b/po/CMakeLists.txt
@@ -0,0 +1,33 @@
+############################################################################
+# CMakeLists.txt
+# Copyright (C) 2014  Belledonne Communications, Grenoble France
+#
+############################################################################
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# 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.
+#
+############################################################################
+
+if(GETTEXT_FOUND)
+	string(REPLACE " " ";" LANGUAGES ${LINPHONE_ALL_LANGS})
+	foreach(language ${LANGUAGES})
+		GETTEXT_PROCESS_PO_FILES(${language} ALL PO_FILES ${language}.po)
+		install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${language}.gmo
+			DESTINATION ${PACKAGE_LOCALE_DIR}/${language}/LC_MESSAGES
+			RENAME linphone.mo
+			PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+		)
+	endforeach()
+endif()

From 399e6767071863816625cf19c346bb021025ff92 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Wed, 3 Dec 2014 10:28:15 +0100
Subject: [PATCH 095/496] update ms2

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 06a14487a..22374b292 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 06a14487aa5acc0e3f0d4931c9a974762829d7bd
+Subproject commit 22374b2929edfc2a6e18a6101f179f27a49a7be0

From b58f23ecefe22c8c4cfa2d5b2a69411fd3448201 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@linphone.org>
Date: Wed, 3 Dec 2014 10:35:10 +0100
Subject: [PATCH 096/496] Fix tester by adding prefix for files in
 accountmanager

---
 tester/accountmanager.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tester/accountmanager.c b/tester/accountmanager.c
index 3d6875453..a3086f9cf 100644
--- a/tester/accountmanager.c
+++ b/tester/accountmanager.c
@@ -121,7 +121,7 @@ void account_create_on_server(Account *account, const LinphoneProxyConfig *refcf
 	
 	vtable.registration_state_changed=account_created_on_server_cb;
 	vtable.auth_info_requested=account_created_auth_requested_cb;
-	lc=configure_lc_from(&vtable,NULL,NULL,account);
+	lc=configure_lc_from(&vtable,liblinphone_tester_file_prefix,NULL,account);
 	
 	cfg=linphone_core_create_proxy_config(lc);
 	linphone_address_set_password(tmp_identity,account->password);

From b8e643f7b15e611c08be5e0aa6f126b6ec3bd3e1 Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Wed, 3 Dec 2014 12:29:03 +0100
Subject: [PATCH 097/496] Fix reinvite in case of redirection: we should use
 the linphone_core_restart_invite function, which correctly handles the
 streams close/reopen

---
 coreapi/callbacks.c  | 7 +++++--
 tester/call_tester.c | 4 +++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/coreapi/callbacks.c b/coreapi/callbacks.c
index 0cc5bf6fa..c43c84479 100644
--- a/coreapi/callbacks.c
+++ b/coreapi/callbacks.c
@@ -772,8 +772,11 @@ static void call_failure(SalOp *op){
 					char* url = linphone_address_as_string(redirection_to);
 					ms_warning("Redirecting call [%p] to %s",call, url);
 					ms_free(url);
-					linphone_call_create_op(call);
-					linphone_core_start_invite(lc, call, redirection_to);
+					if( call->log->to != NULL ) {
+						linphone_address_unref(call->log->to);
+					}
+					call->log->to = linphone_address_ref(redirection_to);
+					linphone_core_restart_invite(lc, call);
 					return;
 				}
 			}
diff --git a/tester/call_tester.c b/tester/call_tester.c
index 453c684ad..4e8a323c3 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -1820,6 +1820,7 @@ static void call_waiting_indication_with_param(bool_t enable_caller_privacy) {
 
 	/*use playfile for callee to avoid locking on capture card*/
 	linphone_core_use_files (laure->lc,TRUE);
+	linphone_core_use_files (marie->lc,TRUE);
 	snprintf(hellopath,sizeof(hellopath), "%s/sounds/hello8000.wav", liblinphone_tester_file_prefix);
 	linphone_core_set_play_file(laure->lc,hellopath);
 	if (enable_caller_privacy)
@@ -1844,7 +1845,8 @@ static void call_waiting_indication_with_param(bool_t enable_caller_privacy) {
 		LinphoneCall *call=(LinphoneCall *)iterator->data;
 		if (call != pauline_called_by_marie) {
 			/*fine, this is the call waiting*/
-			linphone_core_accept_call(pauline->lc,pauline_called_by_laure=call);
+			pauline_called_by_laure=call;
+			linphone_core_accept_call(pauline->lc,pauline_called_by_laure);
 		}
 	}
 

From 601de8ed364b3686d42add71dc2c5ee9be99e821 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Wed, 3 Dec 2014 12:36:47 +0100
Subject: [PATCH 098/496] update ms2

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 22374b292..19cd01c94 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 22374b2929edfc2a6e18a6101f179f27a49a7be0
+Subproject commit 19cd01c941af61b791636ac941f75787884c2e6f

From a8f774a24b5bdde76ec4462938c4ee8349ad1c94 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Wed, 3 Dec 2014 12:44:37 +0100
Subject: [PATCH 099/496] Add some missing translations

---
 gtk/audio_assistant.c | 16 +++++------
 gtk/propertybox.c     |  6 ++--
 po/ar.po              | 18 ++++++------
 po/cs.po              | 48 ++++++++++++++++++++++++-------
 po/de.po              | 49 +++++++++++++++++++++++++-------
 po/es.po              | 48 ++++++++++++++++++++++++-------
 po/fr.po              | 51 +++++++++++++++++++++++++--------
 po/he.po              | 49 +++++++++++++++++++++++++-------
 po/hu.po              | 48 ++++++++++++++++++++++++-------
 po/it.po              | 48 ++++++++++++++++++++++++-------
 po/ja.po              | 60 ++++++++++++++++++++++++++++-----------
 po/nb_NO.po           | 48 ++++++++++++++++++++++++-------
 po/nl.po              | 48 ++++++++++++++++++++++++-------
 po/pl.po              | 48 ++++++++++++++++++++++++-------
 po/pt_BR.po           | 48 ++++++++++++++++++++++++-------
 po/ru.po              | 49 +++++++++++++++++++++++++-------
 po/sr.po              | 66 ++++++++++++++++++++++++++++++++-----------
 po/sv.po              | 48 ++++++++++++++++++++++++-------
 po/zh_CN.po           | 48 ++++++++++++++++++++++++-------
 po/zh_TW.po           | 48 ++++++++++++++++++++++++-------
 20 files changed, 689 insertions(+), 203 deletions(-)

diff --git a/gtk/audio_assistant.c b/gtk/audio_assistant.c
index 7d50fedc2..ad5d95ea4 100644
--- a/gtk/audio_assistant.c
+++ b/gtk/audio_assistant.c
@@ -180,7 +180,7 @@ static void calibration_finished(LinphoneCore *lc, LinphoneEcCalibratorStatus st
 			GTK_DIALOG_DESTROY_WITH_PARENT,
 			GTK_MESSAGE_QUESTION,
 			GTK_BUTTONS_YES_NO,
-			"%s","Did you hear three beeps ?");
+			"%s",_("Did you hear three beeps ?"));
 
 	g_signal_connect(G_OBJECT (dialog), "response",
 			G_CALLBACK (dialog_click),speaker_page);
@@ -289,12 +289,12 @@ static void open_mixer(){
 
 #ifdef WIN32
 	if(!g_spawn_command_line_async("control mmsys.cpl",&error)){
-		display_popup(GTK_MESSAGE_WARNING,"Sound preferences not found ");
+		display_popup(GTK_MESSAGE_WARNING,_("Sound preferences not found "));
 		g_error_free(error);
 	}
 #elif __APPLE__
 	if(!g_spawn_command_line_async("open /System/Library/PreferencePanes/Sound.prefPane",&error)){
-		display_popup(GTK_MESSAGE_WARNING,"Sound preferences not found ");
+		display_popup(GTK_MESSAGE_WARNING,_("Sound preferences not found "));
 		g_error_free(error);
 	}
 #else
@@ -303,7 +303,7 @@ static void open_mixer(){
 			if(!g_spawn_command_line_async("kmix",&error)){
 				if(!g_spawn_command_line_async("mate-volume-control",&error)){
 					if(!g_spawn_command_line_async("xterm alsamixer",&error)){
-						display_popup(GTK_MESSAGE_WARNING,"Cannot launch system sound control ");
+						display_popup(GTK_MESSAGE_WARNING,_("Cannot launch system sound control "));
 						g_error_free(error);
 					}
 				}
@@ -331,7 +331,7 @@ static GtkWidget *create_mic_page(){
 	GtkWidget *capture_device=gtk_combo_box_new();
 	GtkWidget *box = gtk_vbox_new(FALSE,0);
 	GtkWidget *label_audiolevel=gtk_label_new(_("No voice"));
-	GtkWidget *mixer_button=gtk_button_new_with_label("System sound preferences");
+	GtkWidget *mixer_button=gtk_button_new_with_label(_("System sound preferences"));
 	GtkWidget *image;
 
 	image=gtk_image_new_from_stock(GTK_STOCK_PREFERENCES,GTK_ICON_SIZE_MENU);
@@ -370,7 +370,7 @@ static GtkWidget *create_speaker_page(){
 	GtkWidget *labelSpeakerLevel=gtk_label_new(_("Play three beeps"));
 	GtkWidget *spk_button=gtk_button_new_from_stock(GTK_STOCK_MEDIA_PLAY);
 	GtkWidget *playback_device=gtk_combo_box_new();
-	GtkWidget *mixer_button=gtk_button_new_with_label("System sound preferences");
+	GtkWidget *mixer_button=gtk_button_new_with_label(_("System sound preferences"));
 	GtkWidget *image;
 	const char **sound_devices;
 
@@ -402,8 +402,8 @@ static GtkWidget *create_play_record_page(){
 	GtkWidget *vbox=gtk_table_new(2,2,FALSE);
 	GtkWidget *labelRecord=gtk_label_new(_("Press the record button and say some words"));
 	GtkWidget *labelPlay=gtk_label_new(_("Listen to your record voice"));
-	GtkWidget *rec_button=gtk_toggle_button_new_with_label("Record");
-	GtkWidget *play_button=gtk_toggle_button_new_with_label("Play");
+	GtkWidget *rec_button=gtk_toggle_button_new_with_label(_("Record"));
+	GtkWidget *play_button=gtk_toggle_button_new_with_label(_("Play"));
 	GtkWidget *image;
 
 	image=gtk_image_new_from_stock(GTK_STOCK_MEDIA_RECORD,GTK_ICON_SIZE_MENU);
diff --git a/gtk/propertybox.c b/gtk/propertybox.c
index 677fe5f06..bdb066616 100644
--- a/gtk/propertybox.c
+++ b/gtk/propertybox.c
@@ -913,13 +913,13 @@ void linphone_gtk_show_proxy_config(GtkWidget *pb, LinphoneProxyConfig *cfg){
 	GtkWidget *w=linphone_gtk_create_window("sip_account");
 	const char *tmp;
 	gboolean is_new=FALSE;
-	
+
 	if (!cfg) {
 		cfg=linphone_core_create_proxy_config(linphone_gtk_get_core());
 		is_new=TRUE;
 		g_object_set_data(G_OBJECT(w),"is_new",GINT_TO_POINTER(TRUE));
 	}
-	
+
 	if (!is_new){
 		linphone_proxy_config_edit(cfg);
 		gtk_entry_set_text(GTK_ENTRY(linphone_gtk_get_widget(w,"identity")),
@@ -930,7 +930,7 @@ void linphone_gtk_show_proxy_config(GtkWidget *pb, LinphoneProxyConfig *cfg){
 		tmp=linphone_proxy_config_get_contact_parameters(cfg);
 		if (tmp) gtk_entry_set_text(GTK_ENTRY(linphone_gtk_get_widget(w,"params")),tmp);
 	}
-	
+
 	gtk_spin_button_set_value(GTK_SPIN_BUTTON(linphone_gtk_get_widget(w,"regperiod")),
 		linphone_proxy_config_get_expires(cfg));
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(linphone_gtk_get_widget(w,"register")),
diff --git a/po/ar.po b/po/ar.po
index 455a8df4c..9ffd49675 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -10,8 +10,8 @@ msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-12-01 14:27+0100\n"
-"PO-Revision-Date: 2014-12-01 13:28+0000\n"
-"Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
+"PO-Revision-Date: 2014-12-01 17:44+0000\n"
+"Last-Translator: محيي الدين <tx99h4@hotmail.com>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/linphone-gtk/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -768,7 +768,7 @@ msgstr "صاخب"
 msgid ""
 "Welcome!\n"
 "This assistant will help you to configure audio settings for Linphone"
-msgstr "مرحبا !\nسيمكنك هذا المرشد من تهيئة إعدادات الصوت للِنْفُونْ"
+msgstr "مرحبا !\nسيمكنك هذا المرشد من تهيئة إعدادات الصوت من أجل لِنْفُونْ"
 
 #: ../gtk/audio_assistant.c:328
 msgid "Capture device"
@@ -1916,15 +1916,15 @@ msgstr[5] "فاتتك %i مكالمة."
 
 #: ../coreapi/call_log.c:209
 msgid "aborted"
-msgstr ""
+msgstr "أُجهِضت"
 
 #: ../coreapi/call_log.c:212
 msgid "completed"
-msgstr ""
+msgstr "اكتملت"
 
 #: ../coreapi/call_log.c:215
 msgid "missed"
-msgstr ""
+msgstr "فاتت"
 
 #: ../coreapi/call_log.c:220
 #, c-format
@@ -1934,13 +1934,13 @@ msgid ""
 "To: %s\n"
 "Status: %s\n"
 "Duration: %i mn %i sec\n"
-msgstr ""
+msgstr "%s في %s\nمن : %s\nإلى : %s\nالحالة : %s\nالمدة : %i دقيقة %i ثانية\n"
 
 #: ../coreapi/call_log.c:221
 msgid "Outgoing call"
-msgstr ""
+msgstr "المكالمة الصادرة"
 
 #: ../gtk/videowindow.c:66
 #, c-format
 msgid "Cannot play %s."
-msgstr ""
+msgstr "لم يتمكن من تشغيل %s"
diff --git a/po/cs.po b/po/cs.po
index f7b9c76f2..28b929f6a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-01 14:27+0100\n"
+"POT-Creation-Date: 2014-12-03 13:39+0100\n"
 "PO-Revision-Date: 2014-12-01 13:28+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Czech (http://www.transifex.com/projects/p/linphone-gtk/"
@@ -205,7 +205,7 @@ msgstr "Lipnhone – internetový videofon"
 msgid "%s (Default)"
 msgstr "%s (Výchozí)"
 
-#: ../gtk/main.c:2006 ../coreapi/callbacks.c:983
+#: ../gtk/main.c:2006 ../coreapi/callbacks.c:986
 #, c-format
 msgid "We are transferred to %s"
 msgstr "Byly jsme přepojeni na %s"
@@ -780,6 +780,18 @@ msgstr ""
 msgid "Too loud"
 msgstr ""
 
+#: ../gtk/audio_assistant.c:183
+msgid "Did you hear three beeps ?"
+msgstr ""
+
+#: ../gtk/audio_assistant.c:292 ../gtk/audio_assistant.c:297
+msgid "Sound preferences not found "
+msgstr ""
+
+#: ../gtk/audio_assistant.c:306
+msgid "Cannot launch system sound control "
+msgstr ""
+
 #: ../gtk/audio_assistant.c:318
 msgid ""
 "Welcome!\n"
@@ -798,6 +810,10 @@ msgstr ""
 msgid "No voice"
 msgstr ""
 
+#: ../gtk/audio_assistant.c:334 ../gtk/audio_assistant.c:373
+msgid "System sound preferences"
+msgstr ""
+
 #: ../gtk/audio_assistant.c:369
 msgid "Playback device"
 msgstr ""
@@ -814,6 +830,14 @@ msgstr ""
 msgid "Listen to your record voice"
 msgstr ""
 
+#: ../gtk/audio_assistant.c:405
+msgid "Record"
+msgstr ""
+
+#: ../gtk/audio_assistant.c:406
+msgid "Play"
+msgstr ""
+
 #: ../gtk/audio_assistant.c:433
 msgid "Let's start Linphone now"
 msgstr ""
@@ -1849,7 +1873,7 @@ msgstr "Hovor přijat kým: %s."
 msgid "Incompatible, check codecs or security settings..."
 msgstr "Není slučitelné. Zkontrolujte nastavení kodeků a zabezpečení…"
 
-#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:826
+#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:829
 msgid "Incompatible media parameters."
 msgstr "Neslučitelné parametry médií."
 
@@ -1892,34 +1916,34 @@ msgstr "Volání odmítnuto."
 msgid "Request timeout."
 msgstr ""
 
-#: ../coreapi/callbacks.c:780
+#: ../coreapi/callbacks.c:783
 msgid "Redirected"
 msgstr "Přesměrováno"
 
-#: ../coreapi/callbacks.c:835
+#: ../coreapi/callbacks.c:838
 msgid "Call failed."
 msgstr "Volání se nezdařilo."
 
-#: ../coreapi/callbacks.c:913
+#: ../coreapi/callbacks.c:916
 #, c-format
 msgid "Registration on %s successful."
 msgstr "Registrace na %s byla úspěšná."
 
-#: ../coreapi/callbacks.c:914
+#: ../coreapi/callbacks.c:917
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "Odregistrování z %s hotovo."
 
-#: ../coreapi/callbacks.c:932
+#: ../coreapi/callbacks.c:935
 msgid "no response timeout"
 msgstr "odpověď nedorazila včas"
 
-#: ../coreapi/callbacks.c:935
+#: ../coreapi/callbacks.c:938
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "Registrace na %s selhala: %s"
 
-#: ../coreapi/callbacks.c:942
+#: ../coreapi/callbacks.c:945
 msgid "Service unavailable, retrying"
 msgstr ""
 
@@ -1948,6 +1972,10 @@ msgstr ""
 msgid "missed"
 msgstr ""
 
+#: ../coreapi/call_log.c:218
+msgid "unknown"
+msgstr ""
+
 #: ../coreapi/call_log.c:220
 #, c-format
 msgid ""
diff --git a/po/de.po b/po/de.po
index a97e08884..2cec8ab38 100644
--- a/po/de.po
+++ b/po/de.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-01 14:27+0100\n"
+"POT-Creation-Date: 2014-12-03 13:39+0100\n"
 "PO-Revision-Date: 2014-12-01 13:28+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/linphone-gtk/"
@@ -209,7 +209,7 @@ msgstr "Linphone - ein Internet-Video-Telefon"
 msgid "%s (Default)"
 msgstr "%s (Vorgabe)"
 
-#: ../gtk/main.c:2006 ../coreapi/callbacks.c:983
+#: ../gtk/main.c:2006 ../coreapi/callbacks.c:986
 #, c-format
 msgid "We are transferred to %s"
 msgstr "Vermittlung nach %s"
@@ -789,6 +789,19 @@ msgstr "gut"
 msgid "Too loud"
 msgstr "zu laut"
 
+#: ../gtk/audio_assistant.c:183
+#, fuzzy
+msgid "Did you hear three beeps ?"
+msgstr "spiele drei Pieptöne ab"
+
+#: ../gtk/audio_assistant.c:292 ../gtk/audio_assistant.c:297
+msgid "Sound preferences not found "
+msgstr ""
+
+#: ../gtk/audio_assistant.c:306
+msgid "Cannot launch system sound control "
+msgstr ""
+
 #: ../gtk/audio_assistant.c:318
 msgid ""
 "Welcome!\n"
@@ -810,6 +823,10 @@ msgstr "aufgenommene Lautstärke"
 msgid "No voice"
 msgstr "Keine Stimme"
 
+#: ../gtk/audio_assistant.c:334 ../gtk/audio_assistant.c:373
+msgid "System sound preferences"
+msgstr ""
+
 #: ../gtk/audio_assistant.c:369
 msgid "Playback device"
 msgstr "Wiedergabegerät"
@@ -826,6 +843,14 @@ msgstr "Drücken Sie den Aufnahmeknopf und sagen Sie etwas"
 msgid "Listen to your record voice"
 msgstr "Hören Sie das Aufgenommene"
 
+#: ../gtk/audio_assistant.c:405
+msgid "Record"
+msgstr ""
+
+#: ../gtk/audio_assistant.c:406
+msgid "Play"
+msgstr ""
+
 #: ../gtk/audio_assistant.c:433
 msgid "Let's start Linphone now"
 msgstr "Linphone jetzt starten"
@@ -1884,7 +1909,7 @@ msgstr "Anruf wird von %s entgegengenommen."
 msgid "Incompatible, check codecs or security settings..."
 msgstr "Inkompatibel, prüfe Codecs oder Sicherheitseinstellungen..."
 
-#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:826
+#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:829
 msgid "Incompatible media parameters."
 msgstr "Inkompatible Medienparameter."
 
@@ -1927,34 +1952,34 @@ msgstr "Anruf abgewiesen"
 msgid "Request timeout."
 msgstr "Zeitüberschreitung bei der Anfrage"
 
-#: ../coreapi/callbacks.c:780
+#: ../coreapi/callbacks.c:783
 msgid "Redirected"
 msgstr "Umgeleitet"
 
-#: ../coreapi/callbacks.c:835
+#: ../coreapi/callbacks.c:838
 msgid "Call failed."
 msgstr "Anruf fehlgeschlagen."
 
-#: ../coreapi/callbacks.c:913
+#: ../coreapi/callbacks.c:916
 #, c-format
 msgid "Registration on %s successful."
 msgstr "Registrierung auf %s erfolgreich."
 
-#: ../coreapi/callbacks.c:914
+#: ../coreapi/callbacks.c:917
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "Abmeldung von %s ist erfolgt."
 
-#: ../coreapi/callbacks.c:932
+#: ../coreapi/callbacks.c:935
 msgid "no response timeout"
 msgstr "Zeitüberschreitung bei der Antwort"
 
-#: ../coreapi/callbacks.c:935
+#: ../coreapi/callbacks.c:938
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "Registrierung auf %s fehlgeschlagen: %s"
 
-#: ../coreapi/callbacks.c:942
+#: ../coreapi/callbacks.c:945
 msgid "Service unavailable, retrying"
 msgstr "Service nicht verfügbar, versuche erneut"
 
@@ -1982,6 +2007,10 @@ msgstr ""
 msgid "missed"
 msgstr ""
 
+#: ../coreapi/call_log.c:218
+msgid "unknown"
+msgstr ""
+
 #: ../coreapi/call_log.c:220
 #, c-format
 msgid ""
diff --git a/po/es.po b/po/es.po
index f8a5bfba5..23516be7b 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-01 14:27+0100\n"
+"POT-Creation-Date: 2014-12-03 13:39+0100\n"
 "PO-Revision-Date: 2014-12-01 13:28+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/linphone-gtk/"
@@ -200,7 +200,7 @@ msgstr "Linphone - un video-teléfono a través de Internet"
 msgid "%s (Default)"
 msgstr "%s (Opción predeterminada)"
 
-#: ../gtk/main.c:2006 ../coreapi/callbacks.c:983
+#: ../gtk/main.c:2006 ../coreapi/callbacks.c:986
 #, c-format
 msgid "We are transferred to %s"
 msgstr "Somos transferidos a %s"
@@ -762,6 +762,18 @@ msgstr ""
 msgid "Too loud"
 msgstr ""
 
+#: ../gtk/audio_assistant.c:183
+msgid "Did you hear three beeps ?"
+msgstr ""
+
+#: ../gtk/audio_assistant.c:292 ../gtk/audio_assistant.c:297
+msgid "Sound preferences not found "
+msgstr ""
+
+#: ../gtk/audio_assistant.c:306
+msgid "Cannot launch system sound control "
+msgstr ""
+
 #: ../gtk/audio_assistant.c:318
 msgid ""
 "Welcome!\n"
@@ -780,6 +792,10 @@ msgstr ""
 msgid "No voice"
 msgstr ""
 
+#: ../gtk/audio_assistant.c:334 ../gtk/audio_assistant.c:373
+msgid "System sound preferences"
+msgstr ""
+
 #: ../gtk/audio_assistant.c:369
 msgid "Playback device"
 msgstr ""
@@ -796,6 +812,14 @@ msgstr ""
 msgid "Listen to your record voice"
 msgstr ""
 
+#: ../gtk/audio_assistant.c:405
+msgid "Record"
+msgstr ""
+
+#: ../gtk/audio_assistant.c:406
+msgid "Play"
+msgstr ""
+
 #: ../gtk/audio_assistant.c:433
 msgid "Let's start Linphone now"
 msgstr ""
@@ -1834,7 +1858,7 @@ msgstr ""
 msgid "Incompatible, check codecs or security settings..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:826
+#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:829
 msgid "Incompatible media parameters."
 msgstr ""
 
@@ -1877,34 +1901,34 @@ msgstr "Llamada rechazada."
 msgid "Request timeout."
 msgstr ""
 
-#: ../coreapi/callbacks.c:780
+#: ../coreapi/callbacks.c:783
 msgid "Redirected"
 msgstr "Redigirida"
 
-#: ../coreapi/callbacks.c:835
+#: ../coreapi/callbacks.c:838
 msgid "Call failed."
 msgstr ""
 
-#: ../coreapi/callbacks.c:913
+#: ../coreapi/callbacks.c:916
 #, c-format
 msgid "Registration on %s successful."
 msgstr ""
 
-#: ../coreapi/callbacks.c:914
+#: ../coreapi/callbacks.c:917
 #, c-format
 msgid "Unregistration on %s done."
 msgstr ""
 
-#: ../coreapi/callbacks.c:932
+#: ../coreapi/callbacks.c:935
 msgid "no response timeout"
 msgstr "timeout sin respuesta"
 
-#: ../coreapi/callbacks.c:935
+#: ../coreapi/callbacks.c:938
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr ""
 
-#: ../coreapi/callbacks.c:942
+#: ../coreapi/callbacks.c:945
 msgid "Service unavailable, retrying"
 msgstr ""
 
@@ -1932,6 +1956,10 @@ msgstr ""
 msgid "missed"
 msgstr ""
 
+#: ../coreapi/call_log.c:218
+msgid "unknown"
+msgstr ""
+
 #: ../coreapi/call_log.c:220
 #, c-format
 msgid ""
diff --git a/po/fr.po b/po/fr.po
index c83a84985..6293ef88b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-01 14:27+0100\n"
-"PO-Revision-Date: 2014-12-01 13:30+0000\n"
+"POT-Creation-Date: 2014-12-03 13:39+0100\n"
+"PO-Revision-Date: 2014-12-01 13:41+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/fr/)\n"
@@ -208,7 +208,7 @@ msgstr "Linphone - un téléphone video pour l'internet"
 msgid "%s (Default)"
 msgstr "%s (par défaut)"
 
-#: ../gtk/main.c:2006 ../coreapi/callbacks.c:983
+#: ../gtk/main.c:2006 ../coreapi/callbacks.c:986
 #, c-format
 msgid "We are transferred to %s"
 msgstr "Transfert vers %s"
@@ -787,6 +787,19 @@ msgstr "Bien"
 msgid "Too loud"
 msgstr "Trop bruyant"
 
+#: ../gtk/audio_assistant.c:183
+#, fuzzy
+msgid "Did you hear three beeps ?"
+msgstr "Joue trois bips"
+
+#: ../gtk/audio_assistant.c:292 ../gtk/audio_assistant.c:297
+msgid "Sound preferences not found "
+msgstr ""
+
+#: ../gtk/audio_assistant.c:306
+msgid "Cannot launch system sound control "
+msgstr ""
+
 #: ../gtk/audio_assistant.c:318
 msgid ""
 "Welcome!\n"
@@ -808,6 +821,10 @@ msgstr "Volume enregistré"
 msgid "No voice"
 msgstr "Silencieux"
 
+#: ../gtk/audio_assistant.c:334 ../gtk/audio_assistant.c:373
+msgid "System sound preferences"
+msgstr ""
+
 #: ../gtk/audio_assistant.c:369
 msgid "Playback device"
 msgstr "Périphérique d'écoute"
@@ -824,6 +841,14 @@ msgstr "Appuyer sur le bouton enregistrer et dites quelques mots"
 msgid "Listen to your record voice"
 msgstr "Ecoutez votre voix enregistrée"
 
+#: ../gtk/audio_assistant.c:405
+msgid "Record"
+msgstr ""
+
+#: ../gtk/audio_assistant.c:406
+msgid "Play"
+msgstr ""
+
 #: ../gtk/audio_assistant.c:433
 msgid "Let's start Linphone now"
 msgstr "Démarrons Linphone maintenant"
@@ -1882,7 +1907,7 @@ msgstr "Appel répondu par %s."
 msgid "Incompatible, check codecs or security settings..."
 msgstr "Incompatible, vérfiez les codecs ou les paramètres de sécurité..."
 
-#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:826
+#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:829
 msgid "Incompatible media parameters."
 msgstr "Paramètres media incompatibles."
 
@@ -1925,34 +1950,34 @@ msgstr "Appel décliné."
 msgid "Request timeout."
 msgstr "Délai d'attente de la requête dépassé."
 
-#: ../coreapi/callbacks.c:780
+#: ../coreapi/callbacks.c:783
 msgid "Redirected"
 msgstr "Redirection"
 
-#: ../coreapi/callbacks.c:835
+#: ../coreapi/callbacks.c:838
 msgid "Call failed."
 msgstr "L'appel a échoué."
 
-#: ../coreapi/callbacks.c:913
+#: ../coreapi/callbacks.c:916
 #, c-format
 msgid "Registration on %s successful."
 msgstr "Enregistrement sur %s effectué."
 
-#: ../coreapi/callbacks.c:914
+#: ../coreapi/callbacks.c:917
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "Désenregistrement sur %s effectué."
 
-#: ../coreapi/callbacks.c:932
+#: ../coreapi/callbacks.c:935
 msgid "no response timeout"
 msgstr "Pas de réponse"
 
-#: ../coreapi/callbacks.c:935
+#: ../coreapi/callbacks.c:938
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "Echec de l'enregistrement sur %s: %s"
 
-#: ../coreapi/callbacks.c:942
+#: ../coreapi/callbacks.c:945
 msgid "Service unavailable, retrying"
 msgstr "Service indisponible, nouvelle tentative"
 
@@ -1980,6 +2005,10 @@ msgstr "terminé"
 msgid "missed"
 msgstr "manqué"
 
+#: ../coreapi/call_log.c:218
+msgid "unknown"
+msgstr ""
+
 #: ../coreapi/call_log.c:220
 #, c-format
 msgid ""
diff --git a/po/he.po b/po/he.po
index 594308819..8860ed86d 100644
--- a/po/he.po
+++ b/po/he.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-01 14:27+0100\n"
+"POT-Creation-Date: 2014-12-03 13:39+0100\n"
 "PO-Revision-Date: 2014-12-01 13:28+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/linphone-gtk/"
@@ -205,7 +205,7 @@ msgstr "‫Linphone - וידאופון אינטרנטי"
 msgid "%s (Default)"
 msgstr "‫%s (ברירת מחדל)"
 
-#: ../gtk/main.c:2006 ../coreapi/callbacks.c:983
+#: ../gtk/main.c:2006 ../coreapi/callbacks.c:986
 #, c-format
 msgid "We are transferred to %s"
 msgstr "אנחנו מועברים אל %s"
@@ -777,6 +777,19 @@ msgstr "טוב"
 msgid "Too loud"
 msgstr "חזק מדי"
 
+#: ../gtk/audio_assistant.c:183
+#, fuzzy
+msgid "Did you hear three beeps ?"
+msgstr "נגן שלושה צפצופים"
+
+#: ../gtk/audio_assistant.c:292 ../gtk/audio_assistant.c:297
+msgid "Sound preferences not found "
+msgstr ""
+
+#: ../gtk/audio_assistant.c:306
+msgid "Cannot launch system sound control "
+msgstr ""
+
 #: ../gtk/audio_assistant.c:318
 msgid ""
 "Welcome!\n"
@@ -795,6 +808,10 @@ msgstr ""
 msgid "No voice"
 msgstr "אין קול"
 
+#: ../gtk/audio_assistant.c:334 ../gtk/audio_assistant.c:373
+msgid "System sound preferences"
+msgstr ""
+
 #: ../gtk/audio_assistant.c:369
 msgid "Playback device"
 msgstr "התקן השמעה"
@@ -811,6 +828,14 @@ msgstr ""
 msgid "Listen to your record voice"
 msgstr ""
 
+#: ../gtk/audio_assistant.c:405
+msgid "Record"
+msgstr ""
+
+#: ../gtk/audio_assistant.c:406
+msgid "Play"
+msgstr ""
+
 #: ../gtk/audio_assistant.c:433
 msgid "Let's start Linphone now"
 msgstr "הבא נתחיל את Linphone עכשיו"
@@ -1845,7 +1870,7 @@ msgstr "קריאה נענתה על ידי %s."
 msgid "Incompatible, check codecs or security settings..."
 msgstr "חוסר תאימות, בדוק קודקים או הגדרות אבטחה..."
 
-#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:826
+#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:829
 msgid "Incompatible media parameters."
 msgstr "פרמטריי מדיה חסרי תואמים."
 
@@ -1888,34 +1913,34 @@ msgstr "קריאה סורבה."
 msgid "Request timeout."
 msgstr ""
 
-#: ../coreapi/callbacks.c:780
+#: ../coreapi/callbacks.c:783
 msgid "Redirected"
 msgstr "מכוון מחדש"
 
-#: ../coreapi/callbacks.c:835
+#: ../coreapi/callbacks.c:838
 msgid "Call failed."
 msgstr "קריאה נכשלה."
 
-#: ../coreapi/callbacks.c:913
+#: ../coreapi/callbacks.c:916
 #, c-format
 msgid "Registration on %s successful."
 msgstr "רישום אצל %s הושלם בהצלחה."
 
-#: ../coreapi/callbacks.c:914
+#: ../coreapi/callbacks.c:917
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "אי רישום אצל %s סוים."
 
-#: ../coreapi/callbacks.c:932
+#: ../coreapi/callbacks.c:935
 msgid "no response timeout"
 msgstr "אין היענות תוך זמן מוגדר"
 
-#: ../coreapi/callbacks.c:935
+#: ../coreapi/callbacks.c:938
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "רישום אצל %s נכשל: %s"
 
-#: ../coreapi/callbacks.c:942
+#: ../coreapi/callbacks.c:945
 msgid "Service unavailable, retrying"
 msgstr ""
 
@@ -1943,6 +1968,10 @@ msgstr ""
 msgid "missed"
 msgstr ""
 
+#: ../coreapi/call_log.c:218
+msgid "unknown"
+msgstr ""
+
 #: ../coreapi/call_log.c:220
 #, c-format
 msgid ""
diff --git a/po/hu.po b/po/hu.po
index 1fe343f05..314af405f 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-01 14:27+0100\n"
+"POT-Creation-Date: 2014-12-03 13:39+0100\n"
 "PO-Revision-Date: 2014-12-01 13:28+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Hungarian (http://www.transifex.com/projects/p/linphone-gtk/"
@@ -199,7 +199,7 @@ msgstr "Linphone - internetes videó telefon"
 msgid "%s (Default)"
 msgstr "%s (Alapértelmezett)"
 
-#: ../gtk/main.c:2006 ../coreapi/callbacks.c:983
+#: ../gtk/main.c:2006 ../coreapi/callbacks.c:986
 #, c-format
 msgid "We are transferred to %s"
 msgstr "Át vagyunk irányítva ide: %s"
@@ -775,6 +775,18 @@ msgstr ""
 msgid "Too loud"
 msgstr ""
 
+#: ../gtk/audio_assistant.c:183
+msgid "Did you hear three beeps ?"
+msgstr ""
+
+#: ../gtk/audio_assistant.c:292 ../gtk/audio_assistant.c:297
+msgid "Sound preferences not found "
+msgstr ""
+
+#: ../gtk/audio_assistant.c:306
+msgid "Cannot launch system sound control "
+msgstr ""
+
 #: ../gtk/audio_assistant.c:318
 msgid ""
 "Welcome!\n"
@@ -793,6 +805,10 @@ msgstr ""
 msgid "No voice"
 msgstr ""
 
+#: ../gtk/audio_assistant.c:334 ../gtk/audio_assistant.c:373
+msgid "System sound preferences"
+msgstr ""
+
 #: ../gtk/audio_assistant.c:369
 msgid "Playback device"
 msgstr ""
@@ -809,6 +825,14 @@ msgstr ""
 msgid "Listen to your record voice"
 msgstr ""
 
+#: ../gtk/audio_assistant.c:405
+msgid "Record"
+msgstr ""
+
+#: ../gtk/audio_assistant.c:406
+msgid "Play"
+msgstr ""
+
 #: ../gtk/audio_assistant.c:433
 msgid "Let's start Linphone now"
 msgstr ""
@@ -1848,7 +1872,7 @@ msgid "Incompatible, check codecs or security settings..."
 msgstr ""
 "Nem kompatibilis, ellenőrizze a kódek- vagy a biztonsági beállításokat..."
 
-#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:826
+#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:829
 msgid "Incompatible media parameters."
 msgstr "Nem kompatibilis médiajellemzők."
 
@@ -1891,34 +1915,34 @@ msgstr "Hívás elutasítva"
 msgid "Request timeout."
 msgstr ""
 
-#: ../coreapi/callbacks.c:780
+#: ../coreapi/callbacks.c:783
 msgid "Redirected"
 msgstr "Átirányítva"
 
-#: ../coreapi/callbacks.c:835
+#: ../coreapi/callbacks.c:838
 msgid "Call failed."
 msgstr "Nem sikerült a hívás."
 
-#: ../coreapi/callbacks.c:913
+#: ../coreapi/callbacks.c:916
 #, c-format
 msgid "Registration on %s successful."
 msgstr "A regisztáció a %s -n sikerült."
 
-#: ../coreapi/callbacks.c:914
+#: ../coreapi/callbacks.c:917
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "A kiregisztrálás kész a következőn: %s ."
 
-#: ../coreapi/callbacks.c:932
+#: ../coreapi/callbacks.c:935
 msgid "no response timeout"
 msgstr "időtúllépés után nincs válasz"
 
-#: ../coreapi/callbacks.c:935
+#: ../coreapi/callbacks.c:938
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "A regisztáció a %s -n nem sikerült: %s"
 
-#: ../coreapi/callbacks.c:942
+#: ../coreapi/callbacks.c:945
 msgid "Service unavailable, retrying"
 msgstr ""
 
@@ -1946,6 +1970,10 @@ msgstr ""
 msgid "missed"
 msgstr ""
 
+#: ../coreapi/call_log.c:218
+msgid "unknown"
+msgstr ""
+
 #: ../coreapi/call_log.c:220
 #, c-format
 msgid ""
diff --git a/po/it.po b/po/it.po
index 29577b62b..53fab0c8b 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-01 14:27+0100\n"
+"POT-Creation-Date: 2014-12-03 13:39+0100\n"
 "PO-Revision-Date: 2014-12-01 13:28+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/linphone-gtk/"
@@ -196,7 +196,7 @@ msgstr ""
 msgid "%s (Default)"
 msgstr "%s (Default)"
 
-#: ../gtk/main.c:2006 ../coreapi/callbacks.c:983
+#: ../gtk/main.c:2006 ../coreapi/callbacks.c:986
 #, c-format
 msgid "We are transferred to %s"
 msgstr ""
@@ -758,6 +758,18 @@ msgstr ""
 msgid "Too loud"
 msgstr ""
 
+#: ../gtk/audio_assistant.c:183
+msgid "Did you hear three beeps ?"
+msgstr ""
+
+#: ../gtk/audio_assistant.c:292 ../gtk/audio_assistant.c:297
+msgid "Sound preferences not found "
+msgstr ""
+
+#: ../gtk/audio_assistant.c:306
+msgid "Cannot launch system sound control "
+msgstr ""
+
 #: ../gtk/audio_assistant.c:318
 msgid ""
 "Welcome!\n"
@@ -776,6 +788,10 @@ msgstr ""
 msgid "No voice"
 msgstr ""
 
+#: ../gtk/audio_assistant.c:334 ../gtk/audio_assistant.c:373
+msgid "System sound preferences"
+msgstr ""
+
 #: ../gtk/audio_assistant.c:369
 msgid "Playback device"
 msgstr ""
@@ -792,6 +808,14 @@ msgstr ""
 msgid "Listen to your record voice"
 msgstr ""
 
+#: ../gtk/audio_assistant.c:405
+msgid "Record"
+msgstr ""
+
+#: ../gtk/audio_assistant.c:406
+msgid "Play"
+msgstr ""
+
 #: ../gtk/audio_assistant.c:433
 msgid "Let's start Linphone now"
 msgstr ""
@@ -1826,7 +1850,7 @@ msgstr ""
 msgid "Incompatible, check codecs or security settings..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:826
+#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:829
 msgid "Incompatible media parameters."
 msgstr ""
 
@@ -1869,34 +1893,34 @@ msgstr "Chiamata rifiutata"
 msgid "Request timeout."
 msgstr ""
 
-#: ../coreapi/callbacks.c:780
+#: ../coreapi/callbacks.c:783
 msgid "Redirected"
 msgstr ""
 
-#: ../coreapi/callbacks.c:835
+#: ../coreapi/callbacks.c:838
 msgid "Call failed."
 msgstr ""
 
-#: ../coreapi/callbacks.c:913
+#: ../coreapi/callbacks.c:916
 #, c-format
 msgid "Registration on %s successful."
 msgstr "Registrazione su %s attiva"
 
-#: ../coreapi/callbacks.c:914
+#: ../coreapi/callbacks.c:917
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "Unregistrazione su %s"
 
-#: ../coreapi/callbacks.c:932
+#: ../coreapi/callbacks.c:935
 msgid "no response timeout"
 msgstr "timeout no risposta"
 
-#: ../coreapi/callbacks.c:935
+#: ../coreapi/callbacks.c:938
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "Registrazione su %s fallita: %s"
 
-#: ../coreapi/callbacks.c:942
+#: ../coreapi/callbacks.c:945
 msgid "Service unavailable, retrying"
 msgstr ""
 
@@ -1924,6 +1948,10 @@ msgstr ""
 msgid "missed"
 msgstr ""
 
+#: ../coreapi/call_log.c:218
+msgid "unknown"
+msgstr ""
+
 #: ../coreapi/call_log.c:220
 #, c-format
 msgid ""
diff --git a/po/ja.po b/po/ja.po
index 004469d0b..b3cfa7019 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-01 14:27+0100\n"
-"PO-Revision-Date: 2014-12-01 13:28+0000\n"
-"Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
+"POT-Creation-Date: 2014-12-03 13:39+0100\n"
+"PO-Revision-Date: 2014-12-01 16:32+0000\n"
+"Last-Translator: Alexander\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/ja/)\n"
 "Language: ja\n"
@@ -201,7 +201,7 @@ msgstr "Linphone - ビデオインターネット電話"
 msgid "%s (Default)"
 msgstr "%s (デフォルト)"
 
-#: ../gtk/main.c:2006 ../coreapi/callbacks.c:983
+#: ../gtk/main.c:2006 ../coreapi/callbacks.c:986
 #, c-format
 msgid "We are transferred to %s"
 msgstr "%s に転送しました"
@@ -546,7 +546,7 @@ msgstr "エラー"
 
 #: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:527
 msgid "Terminating"
-msgstr ""
+msgstr "終了"
 
 #: ../gtk/incall_view.c:70 ../gtk/incall_view.c:94
 #, c-format
@@ -657,15 +657,15 @@ msgstr ""
 
 #: ../gtk/incall_view.c:568
 msgid "very poor"
-msgstr ""
+msgstr "非常にプアな"
 
 #: ../gtk/incall_view.c:570
 msgid "too bad"
-msgstr ""
+msgstr "非常にバッドな"
 
 #: ../gtk/incall_view.c:571 ../gtk/incall_view.c:587
 msgid "unavailable"
-msgstr ""
+msgstr "利用できません"
 
 #: ../gtk/incall_view.c:679
 msgid "Secured by SRTP"
@@ -762,6 +762,18 @@ msgstr ""
 msgid "Too loud"
 msgstr ""
 
+#: ../gtk/audio_assistant.c:183
+msgid "Did you hear three beeps ?"
+msgstr ""
+
+#: ../gtk/audio_assistant.c:292 ../gtk/audio_assistant.c:297
+msgid "Sound preferences not found "
+msgstr ""
+
+#: ../gtk/audio_assistant.c:306
+msgid "Cannot launch system sound control "
+msgstr ""
+
 #: ../gtk/audio_assistant.c:318
 msgid ""
 "Welcome!\n"
@@ -780,6 +792,10 @@ msgstr ""
 msgid "No voice"
 msgstr "音声なし"
 
+#: ../gtk/audio_assistant.c:334 ../gtk/audio_assistant.c:373
+msgid "System sound preferences"
+msgstr ""
+
 #: ../gtk/audio_assistant.c:369
 msgid "Playback device"
 msgstr ""
@@ -796,6 +812,14 @@ msgstr ""
 msgid "Listen to your record voice"
 msgstr "録音した音声を聞く"
 
+#: ../gtk/audio_assistant.c:405
+msgid "Record"
+msgstr ""
+
+#: ../gtk/audio_assistant.c:406
+msgid "Play"
+msgstr ""
+
 #: ../gtk/audio_assistant.c:433
 msgid "Let's start Linphone now"
 msgstr "Linphoneをはじめる"
@@ -1837,7 +1861,7 @@ msgstr ""
 msgid "Incompatible, check codecs or security settings..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:826
+#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:829
 msgid "Incompatible media parameters."
 msgstr ""
 
@@ -1880,34 +1904,34 @@ msgstr "通話は拒否されました。"
 msgid "Request timeout."
 msgstr "リクエストは時間切れです。"
 
-#: ../coreapi/callbacks.c:780
+#: ../coreapi/callbacks.c:783
 msgid "Redirected"
 msgstr ""
 
-#: ../coreapi/callbacks.c:835
+#: ../coreapi/callbacks.c:838
 msgid "Call failed."
 msgstr ""
 
-#: ../coreapi/callbacks.c:913
+#: ../coreapi/callbacks.c:916
 #, c-format
 msgid "Registration on %s successful."
 msgstr ""
 
-#: ../coreapi/callbacks.c:914
+#: ../coreapi/callbacks.c:917
 #, c-format
 msgid "Unregistration on %s done."
 msgstr ""
 
-#: ../coreapi/callbacks.c:932
+#: ../coreapi/callbacks.c:935
 msgid "no response timeout"
 msgstr ""
 
-#: ../coreapi/callbacks.c:935
+#: ../coreapi/callbacks.c:938
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr ""
 
-#: ../coreapi/callbacks.c:942
+#: ../coreapi/callbacks.c:945
 msgid "Service unavailable, retrying"
 msgstr ""
 
@@ -1934,6 +1958,10 @@ msgstr ""
 msgid "missed"
 msgstr ""
 
+#: ../coreapi/call_log.c:218
+msgid "unknown"
+msgstr ""
+
 #: ../coreapi/call_log.c:220
 #, c-format
 msgid ""
diff --git a/po/nb_NO.po b/po/nb_NO.po
index fb24b907a..fda1ca808 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-01 14:27+0100\n"
+"POT-Creation-Date: 2014-12-03 13:39+0100\n"
 "PO-Revision-Date: 2014-12-01 13:28+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/"
@@ -200,7 +200,7 @@ msgstr "Linphone - en video Internet telefon"
 msgid "%s (Default)"
 msgstr "%s (Standard)"
 
-#: ../gtk/main.c:2006 ../coreapi/callbacks.c:983
+#: ../gtk/main.c:2006 ../coreapi/callbacks.c:986
 #, c-format
 msgid "We are transferred to %s"
 msgstr "Vi er overført til %s"
@@ -764,6 +764,18 @@ msgstr ""
 msgid "Too loud"
 msgstr ""
 
+#: ../gtk/audio_assistant.c:183
+msgid "Did you hear three beeps ?"
+msgstr ""
+
+#: ../gtk/audio_assistant.c:292 ../gtk/audio_assistant.c:297
+msgid "Sound preferences not found "
+msgstr ""
+
+#: ../gtk/audio_assistant.c:306
+msgid "Cannot launch system sound control "
+msgstr ""
+
 #: ../gtk/audio_assistant.c:318
 msgid ""
 "Welcome!\n"
@@ -782,6 +794,10 @@ msgstr ""
 msgid "No voice"
 msgstr ""
 
+#: ../gtk/audio_assistant.c:334 ../gtk/audio_assistant.c:373
+msgid "System sound preferences"
+msgstr ""
+
 #: ../gtk/audio_assistant.c:369
 msgid "Playback device"
 msgstr ""
@@ -798,6 +814,14 @@ msgstr ""
 msgid "Listen to your record voice"
 msgstr ""
 
+#: ../gtk/audio_assistant.c:405
+msgid "Record"
+msgstr ""
+
+#: ../gtk/audio_assistant.c:406
+msgid "Play"
+msgstr ""
+
 #: ../gtk/audio_assistant.c:433
 msgid "Let's start Linphone now"
 msgstr ""
@@ -1833,7 +1857,7 @@ msgstr "Samtale besvart av %s."
 msgid "Incompatible, check codecs or security settings..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:826
+#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:829
 msgid "Incompatible media parameters."
 msgstr ""
 
@@ -1876,34 +1900,34 @@ msgstr "Samtale avvist."
 msgid "Request timeout."
 msgstr ""
 
-#: ../coreapi/callbacks.c:780
+#: ../coreapi/callbacks.c:783
 msgid "Redirected"
 msgstr "Omdirigert"
 
-#: ../coreapi/callbacks.c:835
+#: ../coreapi/callbacks.c:838
 msgid "Call failed."
 msgstr "Samtale feilet."
 
-#: ../coreapi/callbacks.c:913
+#: ../coreapi/callbacks.c:916
 #, c-format
 msgid "Registration on %s successful."
 msgstr "Registrering hos %s lykkes."
 
-#: ../coreapi/callbacks.c:914
+#: ../coreapi/callbacks.c:917
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "Avregistrering hos %s lykkes."
 
-#: ../coreapi/callbacks.c:932
+#: ../coreapi/callbacks.c:935
 msgid "no response timeout"
 msgstr "ingen svar innen angitt tid"
 
-#: ../coreapi/callbacks.c:935
+#: ../coreapi/callbacks.c:938
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "Registrering hos %s mislykkes: %s"
 
-#: ../coreapi/callbacks.c:942
+#: ../coreapi/callbacks.c:945
 msgid "Service unavailable, retrying"
 msgstr ""
 
@@ -1931,6 +1955,10 @@ msgstr ""
 msgid "missed"
 msgstr ""
 
+#: ../coreapi/call_log.c:218
+msgid "unknown"
+msgstr ""
+
 #: ../coreapi/call_log.c:220
 #, c-format
 msgid ""
diff --git a/po/nl.po b/po/nl.po
index 8ea8053c2..efa0e6ec5 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-01 14:27+0100\n"
+"POT-Creation-Date: 2014-12-03 13:39+0100\n"
 "PO-Revision-Date: 2014-12-01 13:28+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/linphone-gtk/"
@@ -193,7 +193,7 @@ msgstr ""
 msgid "%s (Default)"
 msgstr ""
 
-#: ../gtk/main.c:2006 ../coreapi/callbacks.c:983
+#: ../gtk/main.c:2006 ../coreapi/callbacks.c:986
 #, c-format
 msgid "We are transferred to %s"
 msgstr ""
@@ -753,6 +753,18 @@ msgstr ""
 msgid "Too loud"
 msgstr ""
 
+#: ../gtk/audio_assistant.c:183
+msgid "Did you hear three beeps ?"
+msgstr ""
+
+#: ../gtk/audio_assistant.c:292 ../gtk/audio_assistant.c:297
+msgid "Sound preferences not found "
+msgstr ""
+
+#: ../gtk/audio_assistant.c:306
+msgid "Cannot launch system sound control "
+msgstr ""
+
 #: ../gtk/audio_assistant.c:318
 msgid ""
 "Welcome!\n"
@@ -771,6 +783,10 @@ msgstr ""
 msgid "No voice"
 msgstr ""
 
+#: ../gtk/audio_assistant.c:334 ../gtk/audio_assistant.c:373
+msgid "System sound preferences"
+msgstr ""
+
 #: ../gtk/audio_assistant.c:369
 msgid "Playback device"
 msgstr ""
@@ -787,6 +803,14 @@ msgstr ""
 msgid "Listen to your record voice"
 msgstr ""
 
+#: ../gtk/audio_assistant.c:405
+msgid "Record"
+msgstr ""
+
+#: ../gtk/audio_assistant.c:406
+msgid "Play"
+msgstr ""
+
 #: ../gtk/audio_assistant.c:433
 msgid "Let's start Linphone now"
 msgstr ""
@@ -1816,7 +1840,7 @@ msgstr ""
 msgid "Incompatible, check codecs or security settings..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:826
+#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:829
 msgid "Incompatible media parameters."
 msgstr ""
 
@@ -1859,34 +1883,34 @@ msgstr "Oproep geweigerd."
 msgid "Request timeout."
 msgstr ""
 
-#: ../coreapi/callbacks.c:780
+#: ../coreapi/callbacks.c:783
 msgid "Redirected"
 msgstr ""
 
-#: ../coreapi/callbacks.c:835
+#: ../coreapi/callbacks.c:838
 msgid "Call failed."
 msgstr ""
 
-#: ../coreapi/callbacks.c:913
+#: ../coreapi/callbacks.c:916
 #, c-format
 msgid "Registration on %s successful."
 msgstr "Registratie op %s gelukt."
 
-#: ../coreapi/callbacks.c:914
+#: ../coreapi/callbacks.c:917
 #, c-format
 msgid "Unregistration on %s done."
 msgstr ""
 
-#: ../coreapi/callbacks.c:932
+#: ../coreapi/callbacks.c:935
 msgid "no response timeout"
 msgstr ""
 
-#: ../coreapi/callbacks.c:935
+#: ../coreapi/callbacks.c:938
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr ""
 
-#: ../coreapi/callbacks.c:942
+#: ../coreapi/callbacks.c:945
 msgid "Service unavailable, retrying"
 msgstr ""
 
@@ -1914,6 +1938,10 @@ msgstr ""
 msgid "missed"
 msgstr ""
 
+#: ../coreapi/call_log.c:218
+msgid "unknown"
+msgstr ""
+
 #: ../coreapi/call_log.c:220
 #, c-format
 msgid ""
diff --git a/po/pl.po b/po/pl.po
index e2bcc91a4..6ab8c39dc 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-01 14:27+0100\n"
+"POT-Creation-Date: 2014-12-03 13:39+0100\n"
 "PO-Revision-Date: 2014-12-01 13:28+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/linphone-gtk/"
@@ -196,7 +196,7 @@ msgstr ""
 msgid "%s (Default)"
 msgstr ""
 
-#: ../gtk/main.c:2006 ../coreapi/callbacks.c:983
+#: ../gtk/main.c:2006 ../coreapi/callbacks.c:986
 #, c-format
 msgid "We are transferred to %s"
 msgstr ""
@@ -757,6 +757,18 @@ msgstr ""
 msgid "Too loud"
 msgstr ""
 
+#: ../gtk/audio_assistant.c:183
+msgid "Did you hear three beeps ?"
+msgstr ""
+
+#: ../gtk/audio_assistant.c:292 ../gtk/audio_assistant.c:297
+msgid "Sound preferences not found "
+msgstr ""
+
+#: ../gtk/audio_assistant.c:306
+msgid "Cannot launch system sound control "
+msgstr ""
+
 #: ../gtk/audio_assistant.c:318
 msgid ""
 "Welcome!\n"
@@ -775,6 +787,10 @@ msgstr ""
 msgid "No voice"
 msgstr ""
 
+#: ../gtk/audio_assistant.c:334 ../gtk/audio_assistant.c:373
+msgid "System sound preferences"
+msgstr ""
+
 #: ../gtk/audio_assistant.c:369
 msgid "Playback device"
 msgstr ""
@@ -791,6 +807,14 @@ msgstr ""
 msgid "Listen to your record voice"
 msgstr ""
 
+#: ../gtk/audio_assistant.c:405
+msgid "Record"
+msgstr ""
+
+#: ../gtk/audio_assistant.c:406
+msgid "Play"
+msgstr ""
+
 #: ../gtk/audio_assistant.c:433
 msgid "Let's start Linphone now"
 msgstr ""
@@ -1820,7 +1844,7 @@ msgstr ""
 msgid "Incompatible, check codecs or security settings..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:826
+#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:829
 msgid "Incompatible media parameters."
 msgstr ""
 
@@ -1863,34 +1887,34 @@ msgstr "Rozmowa odrzucona."
 msgid "Request timeout."
 msgstr ""
 
-#: ../coreapi/callbacks.c:780
+#: ../coreapi/callbacks.c:783
 msgid "Redirected"
 msgstr ""
 
-#: ../coreapi/callbacks.c:835
+#: ../coreapi/callbacks.c:838
 msgid "Call failed."
 msgstr ""
 
-#: ../coreapi/callbacks.c:913
+#: ../coreapi/callbacks.c:916
 #, c-format
 msgid "Registration on %s successful."
 msgstr ""
 
-#: ../coreapi/callbacks.c:914
+#: ../coreapi/callbacks.c:917
 #, c-format
 msgid "Unregistration on %s done."
 msgstr ""
 
-#: ../coreapi/callbacks.c:932
+#: ../coreapi/callbacks.c:935
 msgid "no response timeout"
 msgstr ""
 
-#: ../coreapi/callbacks.c:935
+#: ../coreapi/callbacks.c:938
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr ""
 
-#: ../coreapi/callbacks.c:942
+#: ../coreapi/callbacks.c:945
 msgid "Service unavailable, retrying"
 msgstr ""
 
@@ -1919,6 +1943,10 @@ msgstr ""
 msgid "missed"
 msgstr ""
 
+#: ../coreapi/call_log.c:218
+msgid "unknown"
+msgstr ""
+
 #: ../coreapi/call_log.c:220
 #, c-format
 msgid ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 26581a852..fde6c49fb 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-01 14:27+0100\n"
+"POT-Creation-Date: 2014-12-03 13:39+0100\n"
 "PO-Revision-Date: 2014-12-01 13:28+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
@@ -193,7 +193,7 @@ msgstr ""
 msgid "%s (Default)"
 msgstr ""
 
-#: ../gtk/main.c:2006 ../coreapi/callbacks.c:983
+#: ../gtk/main.c:2006 ../coreapi/callbacks.c:986
 #, c-format
 msgid "We are transferred to %s"
 msgstr ""
@@ -753,6 +753,18 @@ msgstr ""
 msgid "Too loud"
 msgstr ""
 
+#: ../gtk/audio_assistant.c:183
+msgid "Did you hear three beeps ?"
+msgstr ""
+
+#: ../gtk/audio_assistant.c:292 ../gtk/audio_assistant.c:297
+msgid "Sound preferences not found "
+msgstr ""
+
+#: ../gtk/audio_assistant.c:306
+msgid "Cannot launch system sound control "
+msgstr ""
+
 #: ../gtk/audio_assistant.c:318
 msgid ""
 "Welcome!\n"
@@ -771,6 +783,10 @@ msgstr ""
 msgid "No voice"
 msgstr ""
 
+#: ../gtk/audio_assistant.c:334 ../gtk/audio_assistant.c:373
+msgid "System sound preferences"
+msgstr ""
+
 #: ../gtk/audio_assistant.c:369
 msgid "Playback device"
 msgstr ""
@@ -787,6 +803,14 @@ msgstr ""
 msgid "Listen to your record voice"
 msgstr ""
 
+#: ../gtk/audio_assistant.c:405
+msgid "Record"
+msgstr ""
+
+#: ../gtk/audio_assistant.c:406
+msgid "Play"
+msgstr ""
+
 #: ../gtk/audio_assistant.c:433
 msgid "Let's start Linphone now"
 msgstr ""
@@ -1816,7 +1840,7 @@ msgstr ""
 msgid "Incompatible, check codecs or security settings..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:826
+#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:829
 msgid "Incompatible media parameters."
 msgstr ""
 
@@ -1859,34 +1883,34 @@ msgstr ""
 msgid "Request timeout."
 msgstr ""
 
-#: ../coreapi/callbacks.c:780
+#: ../coreapi/callbacks.c:783
 msgid "Redirected"
 msgstr ""
 
-#: ../coreapi/callbacks.c:835
+#: ../coreapi/callbacks.c:838
 msgid "Call failed."
 msgstr ""
 
-#: ../coreapi/callbacks.c:913
+#: ../coreapi/callbacks.c:916
 #, c-format
 msgid "Registration on %s successful."
 msgstr ""
 
-#: ../coreapi/callbacks.c:914
+#: ../coreapi/callbacks.c:917
 #, c-format
 msgid "Unregistration on %s done."
 msgstr ""
 
-#: ../coreapi/callbacks.c:932
+#: ../coreapi/callbacks.c:935
 msgid "no response timeout"
 msgstr ""
 
-#: ../coreapi/callbacks.c:935
+#: ../coreapi/callbacks.c:938
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr ""
 
-#: ../coreapi/callbacks.c:942
+#: ../coreapi/callbacks.c:945
 msgid "Service unavailable, retrying"
 msgstr ""
 
@@ -1914,6 +1938,10 @@ msgstr ""
 msgid "missed"
 msgstr ""
 
+#: ../coreapi/call_log.c:218
+msgid "unknown"
+msgstr ""
+
 #: ../coreapi/call_log.c:220
 #, c-format
 msgid ""
diff --git a/po/ru.po b/po/ru.po
index 850f002c0..cd9f26fee 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-01 14:27+0100\n"
+"POT-Creation-Date: 2014-12-03 13:39+0100\n"
 "PO-Revision-Date: 2014-12-01 13:28+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/linphone-gtk/"
@@ -212,7 +212,7 @@ msgstr "Linphone - интернет видео телефон"
 msgid "%s (Default)"
 msgstr "%s (по умолчанию)"
 
-#: ../gtk/main.c:2006 ../coreapi/callbacks.c:983
+#: ../gtk/main.c:2006 ../coreapi/callbacks.c:986
 #, c-format
 msgid "We are transferred to %s"
 msgstr "Мы передали в %s"
@@ -791,6 +791,19 @@ msgstr "Хорошо"
 msgid "Too loud"
 msgstr "Слишком громко"
 
+#: ../gtk/audio_assistant.c:183
+#, fuzzy
+msgid "Did you hear three beeps ?"
+msgstr "Проиграть три сигнала"
+
+#: ../gtk/audio_assistant.c:292 ../gtk/audio_assistant.c:297
+msgid "Sound preferences not found "
+msgstr ""
+
+#: ../gtk/audio_assistant.c:306
+msgid "Cannot launch system sound control "
+msgstr ""
+
 #: ../gtk/audio_assistant.c:318
 msgid ""
 "Welcome!\n"
@@ -809,6 +822,10 @@ msgstr "Уровень записи"
 msgid "No voice"
 msgstr "Нет голоса"
 
+#: ../gtk/audio_assistant.c:334 ../gtk/audio_assistant.c:373
+msgid "System sound preferences"
+msgstr ""
+
 #: ../gtk/audio_assistant.c:369
 msgid "Playback device"
 msgstr "Устройство воспроизведения"
@@ -825,6 +842,14 @@ msgstr "Нажмите кнопку записи и скажите нескол
 msgid "Listen to your record voice"
 msgstr "Прослушайте ваш записанный голос"
 
+#: ../gtk/audio_assistant.c:405
+msgid "Record"
+msgstr ""
+
+#: ../gtk/audio_assistant.c:406
+msgid "Play"
+msgstr ""
+
 #: ../gtk/audio_assistant.c:433
 msgid "Let's start Linphone now"
 msgstr "Давайте сейчас запустим linphone"
@@ -1881,7 +1906,7 @@ msgstr "На звонок ответил %s."
 msgid "Incompatible, check codecs or security settings..."
 msgstr "Несовместимость, проверьте кодеки или параметры безопасности..."
 
-#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:826
+#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:829
 msgid "Incompatible media parameters."
 msgstr "Несовместимость медиа-параметров."
 
@@ -1924,34 +1949,34 @@ msgstr "Звонок отклонён."
 msgid "Request timeout."
 msgstr "Таймаут запроса."
 
-#: ../coreapi/callbacks.c:780
+#: ../coreapi/callbacks.c:783
 msgid "Redirected"
 msgstr "Переадресован"
 
-#: ../coreapi/callbacks.c:835
+#: ../coreapi/callbacks.c:838
 msgid "Call failed."
 msgstr "Звонок не удался."
 
-#: ../coreapi/callbacks.c:913
+#: ../coreapi/callbacks.c:916
 #, c-format
 msgid "Registration on %s successful."
 msgstr "Регистрация на %s прошла успешно."
 
-#: ../coreapi/callbacks.c:914
+#: ../coreapi/callbacks.c:917
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "Отмена регистрации на %s завершена."
 
-#: ../coreapi/callbacks.c:932
+#: ../coreapi/callbacks.c:935
 msgid "no response timeout"
 msgstr "время ожидания истекло"
 
-#: ../coreapi/callbacks.c:935
+#: ../coreapi/callbacks.c:938
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "Регистрация на %s не удалась: %s"
 
-#: ../coreapi/callbacks.c:942
+#: ../coreapi/callbacks.c:945
 msgid "Service unavailable, retrying"
 msgstr "Сервис недоступен, повтор"
 
@@ -1980,6 +2005,10 @@ msgstr ""
 msgid "missed"
 msgstr ""
 
+#: ../coreapi/call_log.c:218
+msgid "unknown"
+msgstr ""
+
 #: ../coreapi/call_log.c:220
 #, c-format
 msgid ""
diff --git a/po/sr.po b/po/sr.po
index cc7879209..0b339c65e 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-01 14:27+0100\n"
-"PO-Revision-Date: 2014-12-01 13:28+0000\n"
-"Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
+"POT-Creation-Date: 2014-12-03 13:39+0100\n"
+"PO-Revision-Date: 2014-12-02 10:05+0000\n"
+"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/sr/)\n"
 "Language: sr\n"
@@ -208,7 +208,7 @@ msgstr "Линфон — интернет телефон са снимком"
 msgid "%s (Default)"
 msgstr "%s (основно)"
 
-#: ../gtk/main.c:2006 ../coreapi/callbacks.c:983
+#: ../gtk/main.c:2006 ../coreapi/callbacks.c:986
 #, c-format
 msgid "We are transferred to %s"
 msgstr "Преселили смо се на %s"
@@ -786,6 +786,19 @@ msgstr "Добар"
 msgid "Too loud"
 msgstr "Сувише гласан"
 
+#: ../gtk/audio_assistant.c:183
+#, fuzzy
+msgid "Did you hear three beeps ?"
+msgstr "Пусти три писка"
+
+#: ../gtk/audio_assistant.c:292 ../gtk/audio_assistant.c:297
+msgid "Sound preferences not found "
+msgstr ""
+
+#: ../gtk/audio_assistant.c:306
+msgid "Cannot launch system sound control "
+msgstr ""
+
 #: ../gtk/audio_assistant.c:318
 msgid ""
 "Welcome!\n"
@@ -806,6 +819,10 @@ msgstr "Снимљени волумен"
 msgid "No voice"
 msgstr "Нема гласа"
 
+#: ../gtk/audio_assistant.c:334 ../gtk/audio_assistant.c:373
+msgid "System sound preferences"
+msgstr ""
+
 #: ../gtk/audio_assistant.c:369
 msgid "Playback device"
 msgstr "Уређај за пуштање"
@@ -822,6 +839,14 @@ msgstr "Притисните дугме за снимање и реците не
 msgid "Listen to your record voice"
 msgstr "Слушајте ваш снимљени глас"
 
+#: ../gtk/audio_assistant.c:405
+msgid "Record"
+msgstr ""
+
+#: ../gtk/audio_assistant.c:406
+msgid "Play"
+msgstr ""
+
 #: ../gtk/audio_assistant.c:433
 msgid "Let's start Linphone now"
 msgstr "Хајде сада да покренемо Линфон"
@@ -1877,7 +1902,7 @@ msgstr "На позив је одговорио „%s“."
 msgid "Incompatible, check codecs or security settings..."
 msgstr "Несагласно, проверите кодеке или безбедносна подешавања..."
 
-#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:826
+#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:829
 msgid "Incompatible media parameters."
 msgstr "Медијски параметри су несагласни."
 
@@ -1920,34 +1945,34 @@ msgstr "Позив је одбијен."
 msgid "Request timeout."
 msgstr "Истекло је време захтева."
 
-#: ../coreapi/callbacks.c:780
+#: ../coreapi/callbacks.c:783
 msgid "Redirected"
 msgstr "Преусмерен"
 
-#: ../coreapi/callbacks.c:835
+#: ../coreapi/callbacks.c:838
 msgid "Call failed."
 msgstr "Позив није успео."
 
-#: ../coreapi/callbacks.c:913
+#: ../coreapi/callbacks.c:916
 #, c-format
 msgid "Registration on %s successful."
 msgstr "Уписивање на „%s“ је успело."
 
-#: ../coreapi/callbacks.c:914
+#: ../coreapi/callbacks.c:917
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "Исписивање са „%s“ је обављено."
 
-#: ../coreapi/callbacks.c:932
+#: ../coreapi/callbacks.c:935
 msgid "no response timeout"
 msgstr "нема ограничења одговора"
 
-#: ../coreapi/callbacks.c:935
+#: ../coreapi/callbacks.c:938
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "Уписивање на „%s“ није успело: %s"
 
-#: ../coreapi/callbacks.c:942
+#: ../coreapi/callbacks.c:945
 msgid "Service unavailable, retrying"
 msgstr "Услуга није доступна, поново покушавам"
 
@@ -1966,14 +1991,18 @@ msgstr[2] "Пропустили сте %i позива."
 
 #: ../coreapi/call_log.c:209
 msgid "aborted"
-msgstr ""
+msgstr "прекинут"
 
 #: ../coreapi/call_log.c:212
 msgid "completed"
-msgstr ""
+msgstr "завршен"
 
 #: ../coreapi/call_log.c:215
 msgid "missed"
+msgstr "пропуштен"
+
+#: ../coreapi/call_log.c:218
+msgid "unknown"
 msgstr ""
 
 #: ../coreapi/call_log.c:220
@@ -1985,12 +2014,17 @@ msgid ""
 "Status: %s\n"
 "Duration: %i mn %i sec\n"
 msgstr ""
+"%s на %s\n"
+"Позивач: %s\n"
+"Позивник: %s\n"
+"Стање: %s\n"
+"Трајање: %i мин. %i сек.\n"
 
 #: ../coreapi/call_log.c:221
 msgid "Outgoing call"
-msgstr ""
+msgstr "Одлазни позив"
 
 #: ../gtk/videowindow.c:66
 #, c-format
 msgid "Cannot play %s."
-msgstr ""
+msgstr "Не могу да пустим „%s“."
diff --git a/po/sv.po b/po/sv.po
index 9c326620c..e4cc62a10 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-01 14:27+0100\n"
+"POT-Creation-Date: 2014-12-03 13:39+0100\n"
 "PO-Revision-Date: 2014-12-01 13:28+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/linphone-gtk/"
@@ -199,7 +199,7 @@ msgstr "Linphone - en video Internet telefon"
 msgid "%s (Default)"
 msgstr "%s (Default)"
 
-#: ../gtk/main.c:2006 ../coreapi/callbacks.c:983
+#: ../gtk/main.c:2006 ../coreapi/callbacks.c:986
 #, c-format
 msgid "We are transferred to %s"
 msgstr ""
@@ -761,6 +761,18 @@ msgstr ""
 msgid "Too loud"
 msgstr ""
 
+#: ../gtk/audio_assistant.c:183
+msgid "Did you hear three beeps ?"
+msgstr ""
+
+#: ../gtk/audio_assistant.c:292 ../gtk/audio_assistant.c:297
+msgid "Sound preferences not found "
+msgstr ""
+
+#: ../gtk/audio_assistant.c:306
+msgid "Cannot launch system sound control "
+msgstr ""
+
 #: ../gtk/audio_assistant.c:318
 msgid ""
 "Welcome!\n"
@@ -779,6 +791,10 @@ msgstr ""
 msgid "No voice"
 msgstr ""
 
+#: ../gtk/audio_assistant.c:334 ../gtk/audio_assistant.c:373
+msgid "System sound preferences"
+msgstr ""
+
 #: ../gtk/audio_assistant.c:369
 msgid "Playback device"
 msgstr ""
@@ -795,6 +811,14 @@ msgstr ""
 msgid "Listen to your record voice"
 msgstr ""
 
+#: ../gtk/audio_assistant.c:405
+msgid "Record"
+msgstr ""
+
+#: ../gtk/audio_assistant.c:406
+msgid "Play"
+msgstr ""
+
 #: ../gtk/audio_assistant.c:433
 msgid "Let's start Linphone now"
 msgstr ""
@@ -1829,7 +1853,7 @@ msgstr ""
 msgid "Incompatible, check codecs or security settings..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:826
+#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:829
 msgid "Incompatible media parameters."
 msgstr ""
 
@@ -1872,34 +1896,34 @@ msgstr "Samtalet avböjdes."
 msgid "Request timeout."
 msgstr ""
 
-#: ../coreapi/callbacks.c:780
+#: ../coreapi/callbacks.c:783
 msgid "Redirected"
 msgstr ""
 
-#: ../coreapi/callbacks.c:835
+#: ../coreapi/callbacks.c:838
 msgid "Call failed."
 msgstr ""
 
-#: ../coreapi/callbacks.c:913
+#: ../coreapi/callbacks.c:916
 #, c-format
 msgid "Registration on %s successful."
 msgstr "Registrering hos %s lyckades."
 
-#: ../coreapi/callbacks.c:914
+#: ../coreapi/callbacks.c:917
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "Avregistrering hos %s lyckades."
 
-#: ../coreapi/callbacks.c:932
+#: ../coreapi/callbacks.c:935
 msgid "no response timeout"
 msgstr "Inget svar inom angiven tid"
 
-#: ../coreapi/callbacks.c:935
+#: ../coreapi/callbacks.c:938
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "Registrering hos %s mislyckades: %s"
 
-#: ../coreapi/callbacks.c:942
+#: ../coreapi/callbacks.c:945
 msgid "Service unavailable, retrying"
 msgstr ""
 
@@ -1927,6 +1951,10 @@ msgstr ""
 msgid "missed"
 msgstr ""
 
+#: ../coreapi/call_log.c:218
+msgid "unknown"
+msgstr ""
+
 #: ../coreapi/call_log.c:220
 #, c-format
 msgid ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 18a459c64..c7f5f7fd4 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-01 14:27+0100\n"
+"POT-Creation-Date: 2014-12-03 13:39+0100\n"
 "PO-Revision-Date: 2014-12-01 13:28+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/linphone-"
@@ -194,7 +194,7 @@ msgstr "Linphone - 互联网视频电话"
 msgid "%s (Default)"
 msgstr "%s (默认)"
 
-#: ../gtk/main.c:2006 ../coreapi/callbacks.c:983
+#: ../gtk/main.c:2006 ../coreapi/callbacks.c:986
 #, c-format
 msgid "We are transferred to %s"
 msgstr ""
@@ -757,6 +757,18 @@ msgstr ""
 msgid "Too loud"
 msgstr ""
 
+#: ../gtk/audio_assistant.c:183
+msgid "Did you hear three beeps ?"
+msgstr ""
+
+#: ../gtk/audio_assistant.c:292 ../gtk/audio_assistant.c:297
+msgid "Sound preferences not found "
+msgstr ""
+
+#: ../gtk/audio_assistant.c:306
+msgid "Cannot launch system sound control "
+msgstr ""
+
 #: ../gtk/audio_assistant.c:318
 msgid ""
 "Welcome!\n"
@@ -775,6 +787,10 @@ msgstr ""
 msgid "No voice"
 msgstr ""
 
+#: ../gtk/audio_assistant.c:334 ../gtk/audio_assistant.c:373
+msgid "System sound preferences"
+msgstr ""
+
 #: ../gtk/audio_assistant.c:369
 msgid "Playback device"
 msgstr ""
@@ -791,6 +807,14 @@ msgstr ""
 msgid "Listen to your record voice"
 msgstr ""
 
+#: ../gtk/audio_assistant.c:405
+msgid "Record"
+msgstr ""
+
+#: ../gtk/audio_assistant.c:406
+msgid "Play"
+msgstr ""
+
 #: ../gtk/audio_assistant.c:433
 msgid "Let's start Linphone now"
 msgstr ""
@@ -1822,7 +1846,7 @@ msgstr ""
 msgid "Incompatible, check codecs or security settings..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:826
+#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:829
 msgid "Incompatible media parameters."
 msgstr ""
 
@@ -1865,34 +1889,34 @@ msgstr "呼叫被拒绝。"
 msgid "Request timeout."
 msgstr ""
 
-#: ../coreapi/callbacks.c:780
+#: ../coreapi/callbacks.c:783
 msgid "Redirected"
 msgstr "已重定向"
 
-#: ../coreapi/callbacks.c:835
+#: ../coreapi/callbacks.c:838
 msgid "Call failed."
 msgstr "呼叫失败。"
 
-#: ../coreapi/callbacks.c:913
+#: ../coreapi/callbacks.c:916
 #, c-format
 msgid "Registration on %s successful."
 msgstr "成功注册到 %s"
 
-#: ../coreapi/callbacks.c:914
+#: ../coreapi/callbacks.c:917
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "已在 %s 解除注册。"
 
-#: ../coreapi/callbacks.c:932
+#: ../coreapi/callbacks.c:935
 msgid "no response timeout"
 msgstr "没有响应，超时"
 
-#: ../coreapi/callbacks.c:935
+#: ../coreapi/callbacks.c:938
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "注册到 %s 失败: %s"
 
-#: ../coreapi/callbacks.c:942
+#: ../coreapi/callbacks.c:945
 msgid "Service unavailable, retrying"
 msgstr ""
 
@@ -1919,6 +1943,10 @@ msgstr ""
 msgid "missed"
 msgstr ""
 
+#: ../coreapi/call_log.c:218
+msgid "unknown"
+msgstr ""
+
 #: ../coreapi/call_log.c:220
 #, c-format
 msgid ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index d3dfa7ab7..977249f46 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-01 14:27+0100\n"
+"POT-Creation-Date: 2014-12-03 13:39+0100\n"
 "PO-Revision-Date: 2014-12-01 13:28+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/"
@@ -195,7 +195,7 @@ msgstr "Linphone - 網路視訊電話"
 msgid "%s (Default)"
 msgstr "%s （預設值）"
 
-#: ../gtk/main.c:2006 ../coreapi/callbacks.c:983
+#: ../gtk/main.c:2006 ../coreapi/callbacks.c:986
 #, c-format
 msgid "We are transferred to %s"
 msgstr "我們被轉接到 %s"
@@ -758,6 +758,18 @@ msgstr ""
 msgid "Too loud"
 msgstr ""
 
+#: ../gtk/audio_assistant.c:183
+msgid "Did you hear three beeps ?"
+msgstr ""
+
+#: ../gtk/audio_assistant.c:292 ../gtk/audio_assistant.c:297
+msgid "Sound preferences not found "
+msgstr ""
+
+#: ../gtk/audio_assistant.c:306
+msgid "Cannot launch system sound control "
+msgstr ""
+
 #: ../gtk/audio_assistant.c:318
 msgid ""
 "Welcome!\n"
@@ -776,6 +788,10 @@ msgstr ""
 msgid "No voice"
 msgstr ""
 
+#: ../gtk/audio_assistant.c:334 ../gtk/audio_assistant.c:373
+msgid "System sound preferences"
+msgstr ""
+
 #: ../gtk/audio_assistant.c:369
 msgid "Playback device"
 msgstr ""
@@ -792,6 +808,14 @@ msgstr ""
 msgid "Listen to your record voice"
 msgstr ""
 
+#: ../gtk/audio_assistant.c:405
+msgid "Record"
+msgstr ""
+
+#: ../gtk/audio_assistant.c:406
+msgid "Play"
+msgstr ""
+
 #: ../gtk/audio_assistant.c:433
 msgid "Let's start Linphone now"
 msgstr ""
@@ -1824,7 +1848,7 @@ msgstr "通話由 %s 接聽。"
 msgid "Incompatible, check codecs or security settings..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:826
+#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:829
 msgid "Incompatible media parameters."
 msgstr ""
 
@@ -1867,34 +1891,34 @@ msgstr "通話被拒接。"
 msgid "Request timeout."
 msgstr ""
 
-#: ../coreapi/callbacks.c:780
+#: ../coreapi/callbacks.c:783
 msgid "Redirected"
 msgstr "已重新導向"
 
-#: ../coreapi/callbacks.c:835
+#: ../coreapi/callbacks.c:838
 msgid "Call failed."
 msgstr "通話失敗。"
 
-#: ../coreapi/callbacks.c:913
+#: ../coreapi/callbacks.c:916
 #, c-format
 msgid "Registration on %s successful."
 msgstr "在 %s 註冊成功。"
 
-#: ../coreapi/callbacks.c:914
+#: ../coreapi/callbacks.c:917
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "在 %s 取消註冊完成。"
 
-#: ../coreapi/callbacks.c:932
+#: ../coreapi/callbacks.c:935
 msgid "no response timeout"
 msgstr "沒有回應逾時"
 
-#: ../coreapi/callbacks.c:935
+#: ../coreapi/callbacks.c:938
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "在 %s 註冊失敗：%s"
 
-#: ../coreapi/callbacks.c:942
+#: ../coreapi/callbacks.c:945
 msgid "Service unavailable, retrying"
 msgstr ""
 
@@ -1921,6 +1945,10 @@ msgstr ""
 msgid "missed"
 msgstr ""
 
+#: ../coreapi/call_log.c:218
+msgid "unknown"
+msgstr ""
+
 #: ../coreapi/call_log.c:220
 #, c-format
 msgid ""

From 15c6f3b8987fbe1958dc2b5cc9a194f7b0892f70 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Wed, 3 Dec 2014 17:36:39 +0100
Subject: [PATCH 100/496] Correctly fill ALL_LINGUAS in configure.ac

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 067a13b62..aa93f23e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -129,7 +129,7 @@ AC_CONFIG_COMMANDS([libtool-hacking],
 
 dnl Add the languages which your application supports here.
 PKG_PROG_PKG_CONFIG
-ALL_LINGUAS="fr it de ja es pl cs nl sv pt_BR hu ru zh_CN nb_NO zh_TW he sr"
+ALL_LINGUAS=$(cd po && echo *.po | sed 's/\.po//g')
 AC_SUBST(ALL_LINGUAS)
 AC_DEFINE_UNQUOTED(LINPHONE_ALL_LANGS, "$ALL_LINGUAS", [All supported languages])
 

From 124beb8e559a05da2a8ba6a77c2ada07c5116356 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@linphone.org>
Date: Thu, 4 Dec 2014 10:39:46 +0100
Subject: [PATCH 101/496] Fix linphonecontent when ZLIB is available

---
 coreapi/linphonecore.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index de0c1228d..f051c7b2d 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -559,8 +559,8 @@ void linphone_core_upload_log_collection(LinphoneCore *core) {
 		core->log_collection_upload_information = (LinphoneContent *)malloc(sizeof(LinphoneContent));
 		memset(core->log_collection_upload_information, 0, sizeof(LinphoneContent));
 #ifdef HAVE_ZLIB
-		core->log_collection_upload_information->type = "application";
-		core->log_collection_upload_information->subtype = "gzip";
+		linphone_content_set_type(core->log_collection_upload_information, "application");
+		linphone_content_set_subtype(core->log_collection_upload_information, "gzip");
 #else
 		linphone_content_set_type(core->log_collection_upload_information, "text");
 		linphone_content_set_subtype(core->log_collection_upload_information,"plain");

From a3080b65c292a2f7e3ea6d8e70e1fd96ea6d4c41 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Thu, 4 Dec 2014 11:05:31 +0100
Subject: [PATCH 102/496] Add .desktop files on Transifex

---
 .gitignore                |  3 +++
 .tx/config                | 12 ++++++++-
 share/linphone.desktop.in | 56 ++++++++++++---------------------------
 3 files changed, 31 insertions(+), 40 deletions(-)

diff --git a/.gitignore b/.gitignore
index 85a6aed1d..2bbd7b4c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -78,3 +78,6 @@ Linphone.app
 *.dmg
 tester/linphone*.log
 tester/linphone_log.txt
+.tx/linphone-gtk.linphonedesktopin/
+po/linphone.pot
+.tx/linphone-gtk.audio-assistantdesktopin/
diff --git a/.tx/config b/.tx/config
index 4c2a2acd7..0b35698f1 100644
--- a/.tx/config
+++ b/.tx/config
@@ -1,10 +1,20 @@
 [main]
 host = https://www.transifex.com
 minimum_perc = 1
-type = PO
 
 [linphone-gtk.linphonepot]
 file_filter = po/<lang>.po
 source_file = po/linphone.pot
 source_lang = en
+type = PO
+
+[linphone-gtk.linphonedesktopin]
+source_file = share/linphone.desktop.in
+source_lang = en
+type = DESKTOP
+
+[linphone-gtk.audio-assistantdesktopin]
+source_file = share/audio-assistant.desktop.in
+source_lang = en
+type = DESKTOP
 
diff --git a/share/linphone.desktop.in b/share/linphone.desktop.in
index c162ed904..725c7e105 100644
--- a/share/linphone.desktop.in
+++ b/share/linphone.desktop.in
@@ -1,47 +1,25 @@
 [Desktop Entry]
 Name=Linphone
 Comment=Linphone is a web-phone
-Comment[fr]=Linphone est un web-phone.
-Comment[de]=Linphone ist ein web-phone.
-Comment[af]=Linphone is 'n webtelefoon
-Comment[sq]=Linphone është një telefon interneti
-Comment[ast]=Linphone ye un teléfonu web
-Comment[bn]=Linphone একটি ওয়েব ফোন
-Comment[bs]=Linphone je mrežni telefon
-Comment[pt_BR]=Linphone é um telefone web
-Comment[bg]=Linphone е уеб телефон
-Comment[ca@valencia]=El Linphone és un telèfon web
-Comment[ca]=El Linphone és un telèfon web
-Comment[zh_HK]=Linphone 是網絡電話(web-phone)
-Comment[zh_TW]=Linphone 是網路電話(web-phone)
-Comment[zh_CN]=Linphone 是一个网络电话程序
-Comment[crh]=Linphone bir web-telefonudur
-Comment[nl]=Linphone is een webtelefoon
-Comment[da]=Linphone er en nettelefon
-Comment[cs]=Linphone webový telefon
-Comment[fi]=Linphone on verkkopuhelin
-Comment[gl]=Linphone é un teléfono-web
-Comment[el]=Το Linphone είναι ένα διαδικτυακό τηλέφωνο
-Comment[hu]=A Linphone egy webes telefon
-Comment[is]=Linphone er vefsími
-Comment[it]=Linphone è un telefono web
-Comment[ja]=Linphone はウェブ電話です
-Comment[ky]=Linphone - бул веб - телефон
-Comment[ms]=Linphone adalah telefon-sesawang
-Comment[oc]=Linphone es una aisina de telefonia IP
-Comment[pl]=Rozbudowany telefon internetowy z funkcją wideorozmowy
-Comment[nb]=Lintelefon er en nett-telefon
-Comment[pt]=Linphone é um telefone da internet
-Comment[ro]=Linphone este un telefon web
-Comment[ru]=Linphone — это веб-телефон
-Comment[sl]=Linphone je spletni telefon
-Comment[sv]=Webbtelefon
-Comment[es]=Linphone es un teléfono web
-Comment[vi]=Linphone là một điện thoại web
-Comment[uk]=Інтернет-телефон
-Comment[tr]=Linphone bir web-telefonudur
 Type=Application
 Exec=linphone
 Icon=@prefix@/share/pixmaps/linphone/linphone.png
 Terminal=false
 Categories=Network;Telephony;
+
+
+# Translations
+Name[de]=Linphone
+Name[he]=Linphone
+Name[ar]=لِنْفُونْ
+Name[hu]=Linphone
+Name[ru]=Linphone
+Name[nb_NO]=Linphone
+Name[it]=Linphone
+Name[ja]=Linphone
+Name[cs]=Linphone
+Name[sr]=Линфон
+Name[sv]=Linphone
+Name[zh_CN]=Linphone
+Name[fr]=Linphone
+Name[zh_TW]=Linphone

From 08d1dd066e57d553ec6d937cf3dfad233aa0fcba Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Thu, 4 Dec 2014 11:07:20 +0100
Subject: [PATCH 103/496] update po files

---
 po/ar.po    | 165 +++++++++++++++++++++++++++++++++++++++-------------
 po/cs.po    |   2 +-
 po/de.po    |   5 +-
 po/es.po    |   2 +-
 po/fr.po    |  17 +++---
 po/he.po    |   5 +-
 po/hu.po    |   2 +-
 po/it.po    |   2 +-
 po/ja.po    |  30 +++++-----
 po/nb_NO.po |   2 +-
 po/nl.po    |   2 +-
 po/pl.po    |   2 +-
 po/pt_BR.po |   2 +-
 po/ru.po    |   5 +-
 po/sr.po    |  17 +++---
 po/sv.po    |   2 +-
 po/zh_CN.po |   2 +-
 po/zh_TW.po |   2 +-
 18 files changed, 174 insertions(+), 92 deletions(-)

diff --git a/po/ar.po b/po/ar.po
index 9ffd49675..23def9ce8 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # محيي الدين <tx99h4@hotmail.com>, 2014
 # محيي الدين <tx99h4@hotmail.com>, 2014
@@ -9,15 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-01 14:27+0100\n"
-"PO-Revision-Date: 2014-12-01 17:44+0000\n"
+"POT-Creation-Date: 2014-12-03 13:39+0100\n"
+"PO-Revision-Date: 2014-12-04 09:51+0000\n"
 "Last-Translator: محيي الدين <tx99h4@hotmail.com>\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/linphone-gtk/language/ar/)\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/linphone-gtk/"
+"language/ar/)\n"
+"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
 #: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974
 #, c-format
@@ -77,7 +79,9 @@ msgstr[5] "%i ثانية"
 msgid ""
 "<small><i>%s</i>\t<i>Quality: %s</i></small>\n"
 "%s\t%s\t"
-msgstr "<small><i>%s</i>\t<i>الجودة : %s</i></small>\n%s\t%s\t"
+msgstr ""
+"<small><i>%s</i>\t<i>الجودة : %s</i></small>\n"
+"%s\t%s\t"
 
 #: ../gtk/calllogs.c:341
 #, c-format
@@ -127,9 +131,10 @@ msgstr "إذا تم التفعيل، سيجيب تلقائيا عن المكال
 
 #: ../gtk/main.c:149
 msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: "
-"c:\\Program Files\\Linphone)"
-msgstr "حدِّد مجلد العمل (الذي سيكون مجلد التثبيت، مثلا c:\\Program Files\\Linphone)"
+"Specifiy a working directory (should be the base of the installation, eg: c:"
+"\\Program Files\\Linphone)"
+msgstr ""
+"حدِّد مجلد العمل (الذي سيكون مجلد التثبيت، مثلا c:\\Program Files\\Linphone)"
 
 #: ../gtk/main.c:156
 msgid "Configuration file"
@@ -143,16 +148,22 @@ msgstr "ابدأ مرشد الصوت"
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
-"Would you allow him to see your presence status or add him to your contact list ?\n"
+"Would you allow him to see your presence status or add him to your contact "
+"list ?\n"
 "If you answer no, this person will be temporarily blacklisted."
-msgstr "%s يريد إضافتك إلى جهة اتصاله.\nهل تريد السماح له برؤية معلومات حضورك وكذا إضافته إلى جهة اتصالك أيضا ؟ إذا أجبت ب لا، سيُحظَر هذا الشخص مؤقتا."
+msgstr ""
+"%s يريد إضافتك إلى جهة اتصاله.\n"
+"هل تريد السماح له برؤية معلومات حضورك وكذا إضافته إلى جهة اتصالك أيضا ؟ إذا "
+"أجبت ب لا، سيُحظَر هذا الشخص مؤقتا."
 
 #: ../gtk/main.c:1162
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
-msgstr "ادخل كلمة السر ل  <i>%s</i>\n في نطاق <i>%s</i>:"
+msgstr ""
+"ادخل كلمة السر ل  <i>%s</i>\n"
+" في نطاق <i>%s</i>:"
 
 #: ../gtk/main.c:1283
 msgid "Call error"
@@ -201,7 +212,7 @@ msgstr "لِنْفُونْ - الهاتف المرئي عبر الإنترنت"
 msgid "%s (Default)"
 msgstr "%s (افتراضي)"
 
-#: ../gtk/main.c:2006 ../coreapi/callbacks.c:983
+#: ../gtk/main.c:2006 ../coreapi/callbacks.c:986
 #, c-format
 msgid "We are transferred to %s"
 msgstr "التحويل إلى %s"
@@ -210,7 +221,9 @@ msgstr "التحويل إلى %s"
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
-msgstr "لا وجود للوحة الصوت على هذا الحاسوب.\nلن تتمكن من تلقي أو إجراء أي مكالمة."
+msgstr ""
+"لا وجود للوحة الصوت على هذا الحاسوب.\n"
+"لن تتمكن من تلقي أو إجراء أي مكالمة."
 
 #: ../gtk/main.c:2157
 msgid "A free SIP video-phone"
@@ -383,7 +396,9 @@ msgstr "ZRTP"
 msgid ""
 "A more recent version is availalble from %s.\n"
 "Would you like to open a browser to download it ?"
-msgstr "يوجد إصدار حديث من طرف %s.\nهل تريد فتح المتصفح لتنزيله ؟"
+msgstr ""
+"يوجد إصدار حديث من طرف %s.\n"
+"هل تريد فتح المتصفح لتنزيله ؟"
 
 #: ../gtk/update.c:91
 msgid "You are running the lastest version."
@@ -424,7 +439,9 @@ msgstr[5] "عُثِر على %i جهة اتصال"
 msgid ""
 "Welcome!\n"
 "This assistant will help you to use a SIP account for your calls."
-msgstr "مرحبا !\nسيمكنك هذا المرشد من إعداد حسابك SIP لإجراء المكالمات."
+msgstr ""
+"مرحبا !\n"
+"سيمكنك هذا المرشد من إعداد حسابك SIP لإجراء المكالمات."
 
 #: ../gtk/setupwizard.c:43
 msgid "Create an account on linphone.org"
@@ -502,7 +519,9 @@ msgstr "أحطني علما بتحديثات لِنْفُونْ"
 msgid ""
 "Error, account not validated, username already used or server unreachable.\n"
 "Please go back and try again."
-msgstr "خطأ، لم يتم تأكيد الحساب، إسم المستخدم سبق استخدامه أو تعذر الوصول للخادم.\nيُرجى إعادة المحاولة لاحقا."
+msgstr ""
+"خطأ، لم يتم تأكيد الحساب، إسم المستخدم سبق استخدامه أو تعذر الوصول للخادم.\n"
+"يُرجى إعادة المحاولة لاحقا."
 
 #: ../gtk/setupwizard.c:405
 msgid "Thank you. Your account is now configured and ready for use."
@@ -510,9 +529,13 @@ msgstr "شكرا لك، لقد جرت تهيئة حسابك وهو الآن قا
 
 #: ../gtk/setupwizard.c:413
 msgid ""
-"Please validate your account by clicking on the link we just sent you by email.\n"
+"Please validate your account by clicking on the link we just sent you by "
+"email.\n"
 "Then come back here and press Next button."
-msgstr "يُرجى تأكيد حسابك وذلك بالضغط على الوصلة التي أرسلناها لك بالبريد الإلكتروني.\nثم ارجع إلى هنا واضغط على زر التالي."
+msgstr ""
+"يُرجى تأكيد حسابك وذلك بالضغط على الوصلة التي أرسلناها لك بالبريد "
+"الإلكتروني.\n"
+"ثم ارجع إلى هنا واضغط على زر التالي."
 
 #: ../gtk/setupwizard.c:602
 msgid "SIP account configuration assistant"
@@ -617,7 +640,9 @@ msgstr "مباشرة أو عبر خادم"
 msgid ""
 "download: %f\n"
 "upload: %f (kbit/s)"
-msgstr "التنزيل % f\nالرفع : %f (ك.بِتْ/الثانية)"
+msgstr ""
+"التنزيل % f\n"
+"الرفع : %f (ك.بِتْ/الثانية)"
 
 #: ../gtk/incall_view.c:272 ../gtk/incall_view.c:274
 #, c-format
@@ -727,7 +752,9 @@ msgstr "إيقاف مؤقت"
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
-msgstr "<small><i>يسجل في\n%s %s</i></small>"
+msgstr ""
+"<small><i>يسجل في\n"
+"%s %s</i></small>"
 
 #: ../gtk/incall_view.c:948
 msgid "(Paused)"
@@ -764,11 +791,25 @@ msgstr "جيد"
 msgid "Too loud"
 msgstr "صاخب"
 
+#: ../gtk/audio_assistant.c:183
+msgid "Did you hear three beeps ?"
+msgstr "هل سمعت ثلاث رنات ؟"
+
+#: ../gtk/audio_assistant.c:292 ../gtk/audio_assistant.c:297
+msgid "Sound preferences not found "
+msgstr "لم يعثر على تفضيلات الصوت"
+
+#: ../gtk/audio_assistant.c:306
+msgid "Cannot launch system sound control "
+msgstr "لم يتمكن من تشغيل التحكم في الصوت للنظام"
+
 #: ../gtk/audio_assistant.c:318
 msgid ""
 "Welcome!\n"
 "This assistant will help you to configure audio settings for Linphone"
-msgstr "مرحبا !\nسيمكنك هذا المرشد من تهيئة إعدادات الصوت من أجل لِنْفُونْ"
+msgstr ""
+"مرحبا !\n"
+"سيمكنك هذا المرشد من تهيئة إعدادات الصوت من أجل لِنْفُونْ"
 
 #: ../gtk/audio_assistant.c:328
 msgid "Capture device"
@@ -782,6 +823,10 @@ msgstr "الحجم المسجَّل"
 msgid "No voice"
 msgstr "صامت"
 
+#: ../gtk/audio_assistant.c:334 ../gtk/audio_assistant.c:373
+msgid "System sound preferences"
+msgstr "تفضيلات الصوت للنظام"
+
 #: ../gtk/audio_assistant.c:369
 msgid "Playback device"
 msgstr "جهاز السماع"
@@ -798,6 +843,14 @@ msgstr "اضغط على زر التسجيل وانطق ببعض الكلمات"
 msgid "Listen to your record voice"
 msgstr "استمع لصوتك المسجَّل"
 
+#: ../gtk/audio_assistant.c:405
+msgid "Record"
+msgstr "تسجيل"
+
+#: ../gtk/audio_assistant.c:406
+msgid "Play"
+msgstr "تشغيل"
+
 #: ../gtk/audio_assistant.c:433
 msgid "Let's start Linphone now"
 msgstr "لنُشغِّل لِنْفُونْ الآن"
@@ -1008,7 +1061,20 @@ msgid ""
 "cs: Petr Pisar <petr.pisar@atlas.cz>\n"
 "hu: anonymous\n"
 "he: Eli Zaretskii <eliz@gnu.org>\n"
-msgstr "fr: Simon Morlat\nen: Simon Morlat and Delphine Perreau\nit: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\nde: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\nsv: Daniel Nylander <po@danielnylander.se>\nes: Jesus Benitez <gnelson at inMail dot sk>\nja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\npt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\npl: Robert Nasiadek <darkone@darkone.pl>\ncs: Petr Pisar <petr.pisar@atlas.cz>\nhu: anonymous\nhe: Eli Zaretskii <eliz@gnu.org>\nar: Muhiyeddine Cherik <tx99h4@hotmail.com>\n"
+msgstr ""
+"fr: Simon Morlat\n"
+"en: Simon Morlat and Delphine Perreau\n"
+"it: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\n"
+"de: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\n"
+"sv: Daniel Nylander <po@danielnylander.se>\n"
+"es: Jesus Benitez <gnelson at inMail dot sk>\n"
+"ja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\n"
+"pt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\n"
+"pl: Robert Nasiadek <darkone@darkone.pl>\n"
+"cs: Petr Pisar <petr.pisar@atlas.cz>\n"
+"hu: anonymous\n"
+"he: Eli Zaretskii <eliz@gnu.org>\n"
+"ar: Muhiyeddine Cherik <tx99h4@hotmail.com>\n"
 
 #: ../gtk/contact.ui.h:2
 msgid "SIP Address"
@@ -1394,7 +1460,9 @@ msgstr "فعِّل التحكم المتكيف مع الصبيب"
 msgid ""
 "<i>Adaptive rate control is a technique to dynamically guess the available "
 "bandwidth during a call.</i>"
-msgstr "<i>التحكم المتكيف مع الصبيب هو تقنية لملائمة جودة الصوت والصورة بناءً على سعة قناة الاتصال المتاحة خلال المكالمة.</i>"
+msgstr ""
+"<i>التحكم المتكيف مع الصبيب هو تقنية لملائمة جودة الصوت والصورة بناءً على سعة "
+"قناة الاتصال المتاحة خلال المكالمة.</i>"
 
 #: ../gtk/parameters.ui.h:71
 msgid "<b>Bandwidth control</b>"
@@ -1643,9 +1711,16 @@ msgstr "تحديد عنوان URI التهيئة عن بعد"
 
 #: ../gtk/config-uri.ui.h:2
 msgid ""
-"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
-msgstr "يسمح لك مربع الحوار هذا بإعداد عنوان http أو https الذي من خلاله تود جلب التهيئة عند بدء البرنامج.\nأدخل العنوان أسفله. بعد تأكيد الأمر، ستجري إعادة تشغيل لِنْفُونْ تلقائيا من أجل جلب والأخذ بعين الاعتبار الإعدادات الحديثة."
+"This dialog allows to set an http or https address when configuration is to "
+"be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, "
+"Linphone will restart automatically in order to fetch and take into account "
+"the new configuration. "
+msgstr ""
+"يسمح لك مربع الحوار هذا بإعداد عنوان http أو https الذي من خلاله تود جلب "
+"التهيئة عند بدء البرنامج.\n"
+"أدخل العنوان أسفله. بعد تأكيد الأمر، ستجري إعادة تشغيل لِنْفُونْ تلقائيا من أجل "
+"جلب والأخذ بعين الاعتبار الإعدادات الحديثة."
 
 #: ../gtk/provisioning-fetch.ui.h:1
 msgid "Configuring..."
@@ -1776,13 +1851,16 @@ msgstr "حالة مجهولة"
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
-msgstr "عنوان SIP الذي أدخلت غير صالح، يجب أن يبدأ ب \"sip:\" متبوعا بإسم النطاق."
+msgstr ""
+"عنوان SIP الذي أدخلت غير صالح، يجب أن يبدأ ب \"sip:\" متبوعا بإسم النطاق."
 
 #: ../coreapi/proxy.c:325
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
-msgstr "هوية SIP التي أدخلت غير صحيحة.\nيجب أن تشبه هذا النمط sip:username@proxydomain، مثلا sip:alice@example.net"
+msgstr ""
+"هوية SIP التي أدخلت غير صحيحة.\n"
+"يجب أن تشبه هذا النمط sip:username@proxydomain، مثلا sip:alice@example.net"
 
 #: ../coreapi/proxy.c:1377
 #, c-format
@@ -1824,7 +1902,7 @@ msgstr "أجاب عن المكالمة %s."
 msgid "Incompatible, check codecs or security settings..."
 msgstr "غير موائم، تحقق من المراميز أو إعدادات الأمان..."
 
-#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:826
+#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:829
 msgid "Incompatible media parameters."
 msgstr "إعدادات الوسائط غير موائمة."
 
@@ -1867,34 +1945,34 @@ msgstr "تم تجاهل المكالمة."
 msgid "Request timeout."
 msgstr "انتهت مهلة الطلب."
 
-#: ../coreapi/callbacks.c:780
+#: ../coreapi/callbacks.c:783
 msgid "Redirected"
 msgstr "مُوجَّه"
 
-#: ../coreapi/callbacks.c:835
+#: ../coreapi/callbacks.c:838
 msgid "Call failed."
 msgstr "فشل الاتصال."
 
-#: ../coreapi/callbacks.c:913
+#: ../coreapi/callbacks.c:916
 #, c-format
 msgid "Registration on %s successful."
 msgstr "تم التسجيل في %s بنجاح."
 
-#: ../coreapi/callbacks.c:914
+#: ../coreapi/callbacks.c:917
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "أُلغي التسجيل في %s ."
 
-#: ../coreapi/callbacks.c:932
+#: ../coreapi/callbacks.c:935
 msgid "no response timeout"
 msgstr "لا إجابة قبل انتهاء المهلة"
 
-#: ../coreapi/callbacks.c:935
+#: ../coreapi/callbacks.c:938
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "فَشِل التسجيل في %s: %s"
 
-#: ../coreapi/callbacks.c:942
+#: ../coreapi/callbacks.c:945
 msgid "Service unavailable, retrying"
 msgstr "خدمة غير متاحة، تجري الإعادة"
 
@@ -1926,6 +2004,10 @@ msgstr "اكتملت"
 msgid "missed"
 msgstr "فاتت"
 
+#: ../coreapi/call_log.c:218
+msgid "unknown"
+msgstr "مجهول"
+
 #: ../coreapi/call_log.c:220
 #, c-format
 msgid ""
@@ -1934,7 +2016,12 @@ msgid ""
 "To: %s\n"
 "Status: %s\n"
 "Duration: %i mn %i sec\n"
-msgstr "%s في %s\nمن : %s\nإلى : %s\nالحالة : %s\nالمدة : %i دقيقة %i ثانية\n"
+msgstr ""
+"%s في %s\n"
+"من : %s\n"
+"إلى : %s\n"
+"الحالة : %s\n"
+"المدة : %i دقيقة %i ثانية\n"
 
 #: ../coreapi/call_log.c:221
 msgid "Outgoing call"
diff --git a/po/cs.po b/po/cs.po
index 28b929f6a..36f3908b2 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-12-03 13:39+0100\n"
-"PO-Revision-Date: 2014-12-01 13:28+0000\n"
+"PO-Revision-Date: 2014-12-04 09:51+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Czech (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/cs/)\n"
diff --git a/po/de.po b/po/de.po
index 2cec8ab38..722a39390 100644
--- a/po/de.po
+++ b/po/de.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-12-03 13:39+0100\n"
-"PO-Revision-Date: 2014-12-01 13:28+0000\n"
+"PO-Revision-Date: 2014-12-04 09:51+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/de/)\n"
@@ -790,9 +790,8 @@ msgid "Too loud"
 msgstr "zu laut"
 
 #: ../gtk/audio_assistant.c:183
-#, fuzzy
 msgid "Did you hear three beeps ?"
-msgstr "spiele drei Pieptöne ab"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:292 ../gtk/audio_assistant.c:297
 msgid "Sound preferences not found "
diff --git a/po/es.po b/po/es.po
index 23516be7b..94034a03e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-12-03 13:39+0100\n"
-"PO-Revision-Date: 2014-12-01 13:28+0000\n"
+"PO-Revision-Date: 2014-12-03 12:39+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/es/)\n"
diff --git a/po/fr.po b/po/fr.po
index 6293ef88b..5e41a459f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-12-03 13:39+0100\n"
-"PO-Revision-Date: 2014-12-01 13:41+0000\n"
+"PO-Revision-Date: 2014-12-04 09:51+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/fr/)\n"
@@ -788,17 +788,16 @@ msgid "Too loud"
 msgstr "Trop bruyant"
 
 #: ../gtk/audio_assistant.c:183
-#, fuzzy
 msgid "Did you hear three beeps ?"
-msgstr "Joue trois bips"
+msgstr "Avez-vous entendu trois bips ?"
 
 #: ../gtk/audio_assistant.c:292 ../gtk/audio_assistant.c:297
 msgid "Sound preferences not found "
-msgstr ""
+msgstr "Préférences son non trouvé"
 
 #: ../gtk/audio_assistant.c:306
 msgid "Cannot launch system sound control "
-msgstr ""
+msgstr "Impossible de démarrer le contrôleur système du son"
 
 #: ../gtk/audio_assistant.c:318
 msgid ""
@@ -823,7 +822,7 @@ msgstr "Silencieux"
 
 #: ../gtk/audio_assistant.c:334 ../gtk/audio_assistant.c:373
 msgid "System sound preferences"
-msgstr ""
+msgstr "Préférences son système"
 
 #: ../gtk/audio_assistant.c:369
 msgid "Playback device"
@@ -843,11 +842,11 @@ msgstr "Ecoutez votre voix enregistrée"
 
 #: ../gtk/audio_assistant.c:405
 msgid "Record"
-msgstr ""
+msgstr "Enregistrer"
 
 #: ../gtk/audio_assistant.c:406
 msgid "Play"
-msgstr ""
+msgstr "Jouer"
 
 #: ../gtk/audio_assistant.c:433
 msgid "Let's start Linphone now"
@@ -2007,7 +2006,7 @@ msgstr "manqué"
 
 #: ../coreapi/call_log.c:218
 msgid "unknown"
-msgstr ""
+msgstr "inconnu"
 
 #: ../coreapi/call_log.c:220
 #, c-format
diff --git a/po/he.po b/po/he.po
index 8860ed86d..841b4e161 100644
--- a/po/he.po
+++ b/po/he.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-12-03 13:39+0100\n"
-"PO-Revision-Date: 2014-12-01 13:28+0000\n"
+"PO-Revision-Date: 2014-12-04 09:51+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/he/)\n"
@@ -778,9 +778,8 @@ msgid "Too loud"
 msgstr "חזק מדי"
 
 #: ../gtk/audio_assistant.c:183
-#, fuzzy
 msgid "Did you hear three beeps ?"
-msgstr "נגן שלושה צפצופים"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:292 ../gtk/audio_assistant.c:297
 msgid "Sound preferences not found "
diff --git a/po/hu.po b/po/hu.po
index 314af405f..e993a1b8a 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-12-03 13:39+0100\n"
-"PO-Revision-Date: 2014-12-01 13:28+0000\n"
+"PO-Revision-Date: 2014-12-04 09:51+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Hungarian (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/hu/)\n"
diff --git a/po/it.po b/po/it.po
index 53fab0c8b..b2f0d2ca6 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-12-03 13:39+0100\n"
-"PO-Revision-Date: 2014-12-01 13:28+0000\n"
+"PO-Revision-Date: 2014-12-04 09:51+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/it/)\n"
diff --git a/po/ja.po b/po/ja.po
index b3cfa7019..a3d453f47 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-12-03 13:39+0100\n"
-"PO-Revision-Date: 2014-12-01 16:32+0000\n"
+"PO-Revision-Date: 2014-12-04 09:51+0000\n"
 "Last-Translator: Alexander\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/ja/)\n"
@@ -645,7 +645,7 @@ msgstr "<b>着信</b>"
 
 #: ../gtk/incall_view.c:562
 msgid "good"
-msgstr ""
+msgstr "良い"
 
 #: ../gtk/incall_view.c:564
 msgid "average"
@@ -653,7 +653,7 @@ msgstr "アベレージ"
 
 #: ../gtk/incall_view.c:566
 msgid "poor"
-msgstr ""
+msgstr "悪い"
 
 #: ../gtk/incall_view.c:568
 msgid "very poor"
@@ -674,19 +674,19 @@ msgstr "SRTPのセキュリティ"
 #: ../gtk/incall_view.c:685
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
-msgstr ""
+msgstr "ZRTP によるセキュリティ - [auth token: %s]"
 
 #: ../gtk/incall_view.c:691
 msgid "Set unverified"
-msgstr ""
+msgstr "セット未検証"
 
 #: ../gtk/incall_view.c:691 ../gtk/main.ui.h:4
 msgid "Set verified"
-msgstr ""
+msgstr "セット検証済"
 
 #: ../gtk/incall_view.c:722
 msgid "In conference"
-msgstr ""
+msgstr "会議で"
 
 #: ../gtk/incall_view.c:722
 msgid "<b>In call</b>"
@@ -702,7 +702,7 @@ msgstr ""
 
 #: ../gtk/incall_view.c:825
 msgid "Transfer in progress"
-msgstr ""
+msgstr "進行中の転送"
 
 #: ../gtk/incall_view.c:828
 msgid "Transfer done."
@@ -748,31 +748,31 @@ msgstr ""
 
 #: ../gtk/audio_assistant.c:98
 msgid "No voice detected"
-msgstr ""
+msgstr "音声が検出できません"
 
 #: ../gtk/audio_assistant.c:99
 msgid "Too low"
-msgstr ""
+msgstr "小さい"
 
 #: ../gtk/audio_assistant.c:100
 msgid "Good"
-msgstr ""
+msgstr "丁度よい"
 
 #: ../gtk/audio_assistant.c:101
 msgid "Too loud"
-msgstr ""
+msgstr "大きい"
 
 #: ../gtk/audio_assistant.c:183
 msgid "Did you hear three beeps ?"
-msgstr ""
+msgstr "3回のビープ音が聞こえましたか？"
 
 #: ../gtk/audio_assistant.c:292 ../gtk/audio_assistant.c:297
 msgid "Sound preferences not found "
-msgstr ""
+msgstr "音声の設定が見つかりません"
 
 #: ../gtk/audio_assistant.c:306
 msgid "Cannot launch system sound control "
-msgstr ""
+msgstr "音声制御システムを起動できません"
 
 #: ../gtk/audio_assistant.c:318
 msgid ""
diff --git a/po/nb_NO.po b/po/nb_NO.po
index fda1ca808..fbf404aa5 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-12-03 13:39+0100\n"
-"PO-Revision-Date: 2014-12-01 13:28+0000\n"
+"PO-Revision-Date: 2014-12-04 09:51+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/"
 "p/linphone-gtk/language/nb_NO/)\n"
diff --git a/po/nl.po b/po/nl.po
index efa0e6ec5..a9b238bc5 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-12-03 13:39+0100\n"
-"PO-Revision-Date: 2014-12-01 13:28+0000\n"
+"PO-Revision-Date: 2014-12-03 12:39+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/nl/)\n"
diff --git a/po/pl.po b/po/pl.po
index 6ab8c39dc..11376931f 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-12-03 13:39+0100\n"
-"PO-Revision-Date: 2014-12-01 13:28+0000\n"
+"PO-Revision-Date: 2014-12-03 12:39+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/pl/)\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index fde6c49fb..cafe7bd91 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-12-03 13:39+0100\n"
-"PO-Revision-Date: 2014-12-01 13:28+0000\n"
+"PO-Revision-Date: 2014-12-03 12:39+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
 "linphone-gtk/language/pt_BR/)\n"
diff --git a/po/ru.po b/po/ru.po
index cd9f26fee..f8fa42081 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-12-03 13:39+0100\n"
-"PO-Revision-Date: 2014-12-01 13:28+0000\n"
+"PO-Revision-Date: 2014-12-04 09:51+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/ru/)\n"
@@ -792,9 +792,8 @@ msgid "Too loud"
 msgstr "Слишком громко"
 
 #: ../gtk/audio_assistant.c:183
-#, fuzzy
 msgid "Did you hear three beeps ?"
-msgstr "Проиграть три сигнала"
+msgstr ""
 
 #: ../gtk/audio_assistant.c:292 ../gtk/audio_assistant.c:297
 msgid "Sound preferences not found "
diff --git a/po/sr.po b/po/sr.po
index 0b339c65e..84541289d 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-12-03 13:39+0100\n"
-"PO-Revision-Date: 2014-12-02 10:05+0000\n"
+"PO-Revision-Date: 2014-12-04 09:51+0000\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/sr/)\n"
@@ -787,17 +787,16 @@ msgid "Too loud"
 msgstr "Сувише гласан"
 
 #: ../gtk/audio_assistant.c:183
-#, fuzzy
 msgid "Did you hear three beeps ?"
-msgstr "Пусти три писка"
+msgstr "Да ли сте чули три писка ?"
 
 #: ../gtk/audio_assistant.c:292 ../gtk/audio_assistant.c:297
 msgid "Sound preferences not found "
-msgstr ""
+msgstr "Нисам пронашао поставке звука "
 
 #: ../gtk/audio_assistant.c:306
 msgid "Cannot launch system sound control "
-msgstr ""
+msgstr "Не могу да покренем управљање звуком система "
 
 #: ../gtk/audio_assistant.c:318
 msgid ""
@@ -821,7 +820,7 @@ msgstr "Нема гласа"
 
 #: ../gtk/audio_assistant.c:334 ../gtk/audio_assistant.c:373
 msgid "System sound preferences"
-msgstr ""
+msgstr "Поставке звука система"
 
 #: ../gtk/audio_assistant.c:369
 msgid "Playback device"
@@ -841,11 +840,11 @@ msgstr "Слушајте ваш снимљени глас"
 
 #: ../gtk/audio_assistant.c:405
 msgid "Record"
-msgstr ""
+msgstr "Сними"
 
 #: ../gtk/audio_assistant.c:406
 msgid "Play"
-msgstr ""
+msgstr "Пусти"
 
 #: ../gtk/audio_assistant.c:433
 msgid "Let's start Linphone now"
@@ -2003,7 +2002,7 @@ msgstr "пропуштен"
 
 #: ../coreapi/call_log.c:218
 msgid "unknown"
-msgstr ""
+msgstr "непознато"
 
 #: ../coreapi/call_log.c:220
 #, c-format
diff --git a/po/sv.po b/po/sv.po
index e4cc62a10..631dde639 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-12-03 13:39+0100\n"
-"PO-Revision-Date: 2014-12-01 13:28+0000\n"
+"PO-Revision-Date: 2014-12-04 09:51+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/sv/)\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index c7f5f7fd4..79bd07e81 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-12-03 13:39+0100\n"
-"PO-Revision-Date: 2014-12-01 13:28+0000\n"
+"PO-Revision-Date: 2014-12-04 09:51+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/linphone-"
 "gtk/language/zh_CN/)\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 977249f46..60fc52aee 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-12-03 13:39+0100\n"
-"PO-Revision-Date: 2014-12-01 13:28+0000\n"
+"PO-Revision-Date: 2014-12-04 09:51+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/"
 "linphone-gtk/language/zh_TW/)\n"

From a2b77426c66fc63b7c60a0209eafd66176e89187 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Thu, 4 Dec 2014 15:39:38 +0100
Subject: [PATCH 104/496] Minor README change - should be totally rewrite
 though

---
 po/README | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/po/README b/po/README
index 19a1dbd53..68c47a874 100644
--- a/po/README
+++ b/po/README
@@ -1,13 +1,12 @@
 How to add a translation file
 *****************************
 To add a translation file in linphone project you should first :
-	- change the variable ALL_LINGUAS in configure.ac by adding the language (ex: fr)
-	- then add the file .po in the directory /po
+	- add the file .po in the directory /po
 	- run ./autogen.sh
 
-Update the translation files 
+Update the translation files
 ***************************
-To update all the translation files, in the directory /po run the following command 
+To update all the translation files, in the directory /po run the following command
 	$ make update-po
 
 

From 570ed0f598e303b29a62ad0e02ad419217cabb95 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Thu, 4 Dec 2014 15:55:24 +0100
Subject: [PATCH 105/496] Invert check order in log collection because file
 checking consumes lot of time

---
 tester/log_collection_tester.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tester/log_collection_tester.c b/tester/log_collection_tester.c
index b9c1835c5..4f18f1224 100644
--- a/tester/log_collection_tester.c
+++ b/tester/log_collection_tester.c
@@ -161,7 +161,7 @@ static void collect_files_filled() {
 	LinphoneCoreManager* marie = setup(TRUE);
 	char * filepath = linphone_core_compress_log_collection(marie->lc);
 	CU_ASSERT_PTR_NOT_NULL(filepath);
-	CU_ASSERT_EQUAL(ms_time(0), check_file(filepath));
+	CU_ASSERT_EQUAL(check_file(filepath), ms_time(0));
 	linphone_core_manager_destroy(marie);
 }
 
@@ -171,7 +171,7 @@ static void collect_files_small_size()  {
 	linphone_core_set_log_collection_max_file_size(5000);
 	filepath = linphone_core_compress_log_collection(marie->lc);
 	CU_ASSERT_PTR_NOT_NULL(filepath);
-	CU_ASSERT_EQUAL(ms_time(0), check_file(filepath));
+	CU_ASSERT_EQUAL(check_file(filepath), ms_time(0));
 	linphone_core_manager_destroy(marie);
 }
 
@@ -182,7 +182,7 @@ static void collect_files_changing_size()  {
 
 	filepath = linphone_core_compress_log_collection(marie->lc);
 	CU_ASSERT_PTR_NOT_NULL(filepath);
-	CU_ASSERT_EQUAL(ms_time(0), check_file(filepath));
+	CU_ASSERT_EQUAL(check_file(filepath), ms_time(0));
 
 	linphone_core_set_log_collection_max_file_size(5000);
 	// Generate some logs
@@ -190,7 +190,7 @@ static void collect_files_changing_size()  {
 
 	filepath = linphone_core_compress_log_collection(marie->lc);
 	CU_ASSERT_PTR_NOT_NULL(filepath);
-	CU_ASSERT_EQUAL(ms_time(0), check_file(filepath));
+	CU_ASSERT_EQUAL(check_file(filepath), ms_time(0));
 
 	linphone_core_manager_destroy(marie);
 }

From 381744b0f4f2b68bb2c56fbbd7482808a312c830 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Thu, 4 Dec 2014 16:25:36 +0100
Subject: [PATCH 106/496] Handle msg storage option when building with CMake.

---
 CMakeLists.txt         | 10 ++++++++++
 coreapi/CMakeLists.txt |  3 +++
 2 files changed, 13 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 85a86bf42..390812533 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -86,6 +86,12 @@ if(ENABLE_TUNNEL)
 		set(ENABLE_TUNNEL OFF CACHE BOOL "Enable tunnel support." FORCE)
 	endif()
 endif()
+if(ENABLE_MSG_STORAGE)
+	find_package(Sqlite3)
+	if(NOT SQLITE3_FOUND)
+		message(FATAL_ERROR "Could not find the sqlite3 library!")
+	endif()
+endif()
 if(ENABLE_NOTIFY)
 	find_package(Notify)
 	if(NOTIFY_FOUND)
@@ -107,6 +113,10 @@ include_directories(
 	${MS2_INCLUDE_DIRS}
 	${XML2_INCLUDE_DIRS}
 )
+if(SQLITE3_FOUND)
+	include_directories(${SQLITE3_INCLUDE_DIRS})
+	add_definitions("-DMSG_STORAGE_ENABLED")
+endif()
 if(ENABLE_TUNNEL)
 	include_directories(${TUNNEL_INCLUDE_DIRS})
 endif()
diff --git a/coreapi/CMakeLists.txt b/coreapi/CMakeLists.txt
index cb417a612..92689dcb8 100644
--- a/coreapi/CMakeLists.txt
+++ b/coreapi/CMakeLists.txt
@@ -117,6 +117,9 @@ set(LIBS
 	${MS2_LIBRARIES}
 	${XML2_LIBRARIES}
 )
+if(SQLITE3_FOUND)
+	list(APPEND LIBS ${SQLITE3_LIBRARIES})
+endif()
 if(ENABLE_TUNNEL)
 	list(APPEND LIBS ${TUNNEL_LIBRARIES})
 endif()

From 754f4657cda73459969668b338d20def501dc102 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Thu, 4 Dec 2014 22:20:30 +0100
Subject: [PATCH 107/496] pass workdir with environment variable, because
 passing it from arguments doesn't work if the path has a space.

---
 build/macos/environment.sh | 3 ++-
 gtk/main.c                 | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/build/macos/environment.sh b/build/macos/environment.sh
index 3b9ff16af..b466fecc4 100644
--- a/build/macos/environment.sh
+++ b/build/macos/environment.sh
@@ -1,4 +1,5 @@
-export EXTRA_ARGS="--workdir $bundle_res"
+#export EXTRA_ARGS="--workdir $bundle_res"
+export LINPHONE_WORKDIR="$bundle_res"
 export GIO_EXTRA_MODULES="$bundle_lib/gio/modules"
 export PANGO_LIBDIR="$bundle_lib"
 export PANGO_SYSCONFDIR="$bundle_etc"
diff --git a/gtk/main.c b/gtk/main.c
index ea3078c9a..1a582ebd8 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -2101,6 +2101,7 @@ int main(int argc, char *argv[]){
 	LpConfig *factory;
 	const char *db_file;
 	GError *error=NULL;
+	const char *tmp;
 
 #if !GLIB_CHECK_VERSION(2, 31, 0)
 	g_thread_init(NULL);
@@ -2110,6 +2111,8 @@ int main(int argc, char *argv[]){
 	progpath = strdup(argv[0]);
 
 	config_file=linphone_gtk_get_config_file(NULL);
+	
+	workingdir= (tmp=g_getenv("LINPHONE_WORKDIR")) ? g_strdup(tmp) : NULL;
 
 #ifdef WIN32
 	/*workaround for windows: sometimes LANG is defined to an integer value, not understood by gtk */

From b67b596f390767d2e7e294de1e3e327276cb9bc6 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Thu, 4 Dec 2014 22:46:41 +0100
Subject: [PATCH 108/496] allow passing of directory prefix where to pickup
 dependencies when running the mac bundler.

---
 Makefile.am                 | 4 +++-
 build/macos/linphone.bundle | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index dd66874b2..2fd425a0d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -205,7 +205,8 @@ MACAPPZIP=$(PACKAGE)-$(VERSION).app.zip
 MACAPPDMG=$(PACKAGE)-$(VERSION).dmg
 BUNDLEPREFIX=./
 BUNDLEDIR=$(BUNDLEPREFIX)$(MACAPPNAME)
-
+#a path prefix where additional libs can be cherry-picked by the bundler.
+LINPHONE_ADDITIONAL_DEPENDENCIES_PREFIX=/usr/local
 
 bundle:
 	rm -rf $(INSTALLDIR)
@@ -215,6 +216,7 @@ bundle:
 	LINPHONE_INSTALL_PREFIX=$(INSTALLDIR_WITH_PREFIX) \
 	LIBLINPHONE_INSTALL_PREFIX=$(INSTALLDIR_WITH_PREFIX) \
 	MS2_PLUGINS_INSTALL_PREFIX=$(prefix) \
+	LINPHONE_ADDITIONAL_DEPENDENCIES_PREFIX=$(LINPHONE_ADDITIONAL_DEPENDENCIES_PREFIX) \
 	gtk-mac-bundler $(PACKAGE_BUNDLE_FILE)
 	printf "[Pango]\nModuleFiles=./etc/pango/pango.modules\n" \
 	> $(BUNDLEDIR)/Contents/Resources/etc/pango/pangorc
diff --git a/build/macos/linphone.bundle b/build/macos/linphone.bundle
index 8896fa7d3..7a5906e9e 100644
--- a/build/macos/linphone.bundle
+++ b/build/macos/linphone.bundle
@@ -16,7 +16,7 @@
     <prefix name="linphone">${env:LINPHONE_INSTALL_PREFIX}</prefix>
     <prefix name="ms2plugins">${env:MS2_PLUGINS_INSTALL_PREFIX}</prefix>
     <!-- This prefix definition is necessary if some dependencies are to be taken from /usr/local/lib -->
-    <prefix name="local">/usr/local</prefix>
+    <prefix name="local">${env:LINPHONE_ADDITIONAL_DEPENDENCIES_PREFIX}</prefix>
     <!-- The project directory is the default location of the created
          app. If you leave out the path, the current directory is
          used. Note the usage of an environment variable here again.

From 1cd616cf17eadf862246fbe239d33065f4c97216 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Fri, 5 Dec 2014 14:20:24 +0100
Subject: [PATCH 109/496] add --selfttest option to gtk app for very minimal
 app checking

---
 gtk/main.c                    | 12 ++++++++++++
 tester/flexisip/flexisip.conf |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/gtk/main.c b/gtk/main.c
index 1a582ebd8..2bb9d5446 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -77,6 +77,7 @@ void linphone_gtk_status_icon_set_blinking(gboolean val);
 void _linphone_gtk_enable_video(gboolean val);
 void linphone_gtk_on_uribar_changed(GtkEditable *uribar, gpointer user_data);
 static void linphone_gtk_init_ui(void);
+static void linphone_gtk_quit(void);
 
 #ifndef HAVE_GTK_OSX
 static gint main_window_x=0;
@@ -90,6 +91,7 @@ static int start_option = START_LINPHONE;
 static gboolean no_video=FALSE;
 static gboolean iconified=FALSE;
 static gboolean run_audio_assistant=FALSE;
+static gboolean selftest=FALSE;
 static gchar *workingdir=NULL;
 static char *progpath=NULL;
 gchar *linphone_logfile=NULL;
@@ -162,6 +164,13 @@ static GOptionEntry linphone_options[]={
 		.arg_data = (gpointer) &run_audio_assistant,
 		.description = N_("Run the audio assistant")
 	},
+	{
+		.long_name = "selftest",
+		.short_name = '\0',
+		.arg = G_OPTION_ARG_NONE,
+		.arg_data = (gpointer) &selftest,
+		.description = N_("Run self test and exit 0 if succeed")
+	},
 	{0}
 };
 
@@ -1319,6 +1328,9 @@ static void linphone_gtk_global_state_changed(LinphoneCore *lc, LinphoneGlobalSt
 		break;
 		case LinphoneGlobalOn:
 			linphone_gtk_init_ui();
+			if (selftest) {
+				gtk_timeout_add(300,(GtkFunction)gtk_main_quit,NULL);
+			}
 		break;
 		default:
 		break;
diff --git a/tester/flexisip/flexisip.conf b/tester/flexisip/flexisip.conf
index 635ae0bda..96ac77cc4 100755
--- a/tester/flexisip/flexisip.conf
+++ b/tester/flexisip/flexisip.conf
@@ -18,7 +18,7 @@ auto-respawn=true
 # List of white space separated host names pointing to this machine.
 # This is to prevent loops while routing SIP messages.
 #  Default value: localhost
-aliases=localhost sipopen.example.org sip.example.org auth.example.org auth1.example.org auth2.example.org client.example.org
+aliases=localhost sipopen.example.org sip.example.org auth.example.org auth1.example.org auth2.example.org client.example.org sip2.linphone.org
 
 # List of white space separated SIP uris where the proxy must listen.Wildcard
 # (*) can be used to mean 'all local ip addresses'. If 'transport'

From 1656945e31a7289a7d23e41465cebdda16e2c5b1 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Fri, 5 Dec 2014 15:34:58 +0100
Subject: [PATCH 110/496] make sure send/received bw is acurate in
 early_media_call_forking tester

---
 tester/flexisip_tester.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/tester/flexisip_tester.c b/tester/flexisip_tester.c
index 8abd9b903..a1d37209c 100644
--- a/tester/flexisip_tester.c
+++ b/tester/flexisip_tester.c
@@ -573,6 +573,7 @@ static void early_media_call_forking(void) {
 	CU_ASSERT_TRUE(wait_for_list(lcs, &marie1->stat.number_of_LinphoneCallIncomingEarlyMedia,1,3000));
 	CU_ASSERT_TRUE(wait_for_list(lcs, &marie2->stat.number_of_LinphoneCallIncomingEarlyMedia,1,3000));
 	CU_ASSERT_TRUE(wait_for_list(lcs, &pauline->stat.number_of_LinphoneCallOutgoingEarlyMedia,1,3000));
+	CU_ASSERT_EQUAL(pauline->stat.number_of_LinphoneCallOutgoingEarlyMedia,1);
 	
 	pauline_call=linphone_core_get_current_call(pauline->lc);
 	marie1_call=linphone_core_get_current_call(marie1->lc);
@@ -580,9 +581,12 @@ static void early_media_call_forking(void) {
 	
 	/*wait a bit that streams are established*/
 	wait_for_list(lcs,&dummy,1,3000);
-	CU_ASSERT_TRUE(linphone_call_get_audio_stats(pauline_call)->download_bandwidth>70);
-	CU_ASSERT_TRUE(linphone_call_get_audio_stats(marie1_call)->download_bandwidth>70);
-	CU_ASSERT_TRUE(linphone_call_get_audio_stats(marie2_call)->download_bandwidth>70);
+	CU_ASSERT_TRUE(linphone_call_get_audio_stats(pauline_call)->download_bandwidth>70
+					&& linphone_call_get_audio_stats(pauline_call)->download_bandwidth<90);
+	CU_ASSERT_TRUE(linphone_call_get_audio_stats(marie1_call)->download_bandwidth>70
+					&& linphone_call_get_audio_stats(marie1_call)->download_bandwidth<90);
+	CU_ASSERT_TRUE(linphone_call_get_audio_stats(marie2_call)->download_bandwidth>70
+					&& linphone_call_get_audio_stats(marie2_call)->download_bandwidth<90);
 	
 	linphone_core_accept_call(marie1->lc,linphone_core_get_current_call(marie1->lc));
 	CU_ASSERT_TRUE(wait_for_list(lcs,&marie1->stat.number_of_LinphoneCallStreamsRunning,1,3000));
@@ -593,8 +597,10 @@ static void early_media_call_forking(void) {
 	
 	/*wait a bit that streams are established*/
 	wait_for_list(lcs,&dummy,1,1000);
-	CU_ASSERT_TRUE(linphone_call_get_audio_stats(pauline_call)->download_bandwidth>71);
-	CU_ASSERT_TRUE(linphone_call_get_audio_stats(marie1_call)->download_bandwidth>71);
+	CU_ASSERT_TRUE(linphone_call_get_audio_stats(pauline_call)->download_bandwidth>71
+					&& linphone_call_get_audio_stats(pauline_call)->download_bandwidth<91 );
+	CU_ASSERT_TRUE(linphone_call_get_audio_stats(marie1_call)->download_bandwidth>71
+					&& linphone_call_get_audio_stats(marie1_call)->download_bandwidth<91 );
 	
 	linphone_core_terminate_all_calls(pauline->lc);
 	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallEnd,1,1000));

From a6cfecf3e48c14b993447a513f8dd48c798f143f Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Fri, 5 Dec 2014 14:22:49 +0100
Subject: [PATCH 111/496] Handle events in classes other than LinphoneCore.

Callbacks getters still need to be implemented correctly.
---
 coreapi/chat.c                                |  16 +--
 coreapi/linphonecore.h                        |  31 ++---
 coreapi/private.h                             |   8 +-
 tools/genapixml.py                            |  41 ++++---
 .../handwritten_definitions.mustache          |   8 +-
 tools/python/apixml2python/linphone.py        | 108 +++++++++++++-----
 .../apixml2python/linphone_module.mustache    |  10 +-
 7 files changed, 143 insertions(+), 79 deletions(-)

diff --git a/coreapi/chat.c b/coreapi/chat.c
index 6302af243..7bec11b01 100644
--- a/coreapi/chat.c
+++ b/coreapi/chat.c
@@ -95,7 +95,7 @@ void linphone_chat_message_cbs_set_user_data(LinphoneChatMessageCbs *cbs, void *
  * @param[in] cbs LinphoneChatMessageCbs object.
  * @return The current message state changed callback.
  */
-LinphoneChatMessageMsgStateChangedCb linphone_chat_message_cbs_get_msg_state_changed(const LinphoneChatMessageCbs *cbs) {
+LinphoneChatMessageCbsMsgStateChangedCb linphone_chat_message_cbs_get_msg_state_changed(const LinphoneChatMessageCbs *cbs) {
 	return cbs->msg_state_changed;
 }
 
@@ -104,7 +104,7 @@ LinphoneChatMessageMsgStateChangedCb linphone_chat_message_cbs_get_msg_state_cha
  * @param[in] cbs LinphoneChatMessageCbs object.
  * @param[in] cb The message state changed callback to be used.
  */
-void linphone_chat_message_cbs_set_msg_state_changed(LinphoneChatMessageCbs *cbs, LinphoneChatMessageMsgStateChangedCb cb) {
+void linphone_chat_message_cbs_set_msg_state_changed(LinphoneChatMessageCbs *cbs, LinphoneChatMessageCbsMsgStateChangedCb cb) {
 	cbs->msg_state_changed = cb;
 }
 
@@ -113,7 +113,7 @@ void linphone_chat_message_cbs_set_msg_state_changed(LinphoneChatMessageCbs *cbs
  * @param[in] cbs LinphoneChatMessageCbs object.
  * @return The current file transfer receive callback.
  */
-LinphoneChatMessageFileTransferRecvCb linphone_chat_message_cbs_get_file_transfer_recv(const LinphoneChatMessageCbs *cbs) {
+LinphoneChatMessageCbsFileTransferRecvCb linphone_chat_message_cbs_get_file_transfer_recv(const LinphoneChatMessageCbs *cbs) {
 	return cbs->file_transfer_recv;
 }
 
@@ -122,7 +122,7 @@ LinphoneChatMessageFileTransferRecvCb linphone_chat_message_cbs_get_file_transfe
  * @param[in] cbs LinphoneChatMessageCbs object.
  * @param[in] cb The file transfer receive callback to be used.
  */
-void linphone_chat_message_cbs_set_file_transfer_recv(LinphoneChatMessageCbs *cbs, LinphoneChatMessageFileTransferRecvCb cb) {
+void linphone_chat_message_cbs_set_file_transfer_recv(LinphoneChatMessageCbs *cbs, LinphoneChatMessageCbsFileTransferRecvCb cb) {
 	cbs->file_transfer_recv = cb;
 }
 
@@ -131,7 +131,7 @@ void linphone_chat_message_cbs_set_file_transfer_recv(LinphoneChatMessageCbs *cb
  * @param[in] cbs LinphoneChatMessageCbs object.
  * @return The current file transfer send callback.
  */
-LinphoneChatMessageFileTransferSendCb linphone_chat_message_cbs_get_file_transfer_send(const LinphoneChatMessageCbs *cbs) {
+LinphoneChatMessageCbsFileTransferSendCb linphone_chat_message_cbs_get_file_transfer_send(const LinphoneChatMessageCbs *cbs) {
 	return cbs->file_transfer_send;
 }
 
@@ -140,7 +140,7 @@ LinphoneChatMessageFileTransferSendCb linphone_chat_message_cbs_get_file_transfe
  * @param[in] cbs LinphoneChatMessageCbs object.
  * @param[in] cb The file transfer send callback to be used.
  */
-void linphone_chat_message_cbs_set_file_transfer_send(LinphoneChatMessageCbs *cbs, LinphoneChatMessageFileTransferSendCb cb) {
+void linphone_chat_message_cbs_set_file_transfer_send(LinphoneChatMessageCbs *cbs, LinphoneChatMessageCbsFileTransferSendCb cb) {
 	cbs->file_transfer_send = cb;
 }
 
@@ -149,7 +149,7 @@ void linphone_chat_message_cbs_set_file_transfer_send(LinphoneChatMessageCbs *cb
  * @param[in] cbs LinphoneChatMessageCbs object.
  * @return The current file transfer progress indication callback.
  */
-LinphoneChatMessageFileTransferProgressIndicationCb linphone_chat_message_cbs_get_file_transfer_progress_indication(const LinphoneChatMessageCbs *cbs) {
+LinphoneChatMessageCbsFileTransferProgressIndicationCb linphone_chat_message_cbs_get_file_transfer_progress_indication(const LinphoneChatMessageCbs *cbs) {
 	return cbs->file_transfer_progress_indication;
 }
 
@@ -158,7 +158,7 @@ LinphoneChatMessageFileTransferProgressIndicationCb linphone_chat_message_cbs_ge
  * @param[in] cbs LinphoneChatMessageCbs object.
  * @param[in] cb The file transfer progress indication callback to be used.
  */
-void linphone_chat_message_cbs_set_file_transfer_progress_indication(LinphoneChatMessageCbs *cbs, LinphoneChatMessageFileTransferProgressIndicationCb cb) {
+void linphone_chat_message_cbs_set_file_transfer_progress_indication(LinphoneChatMessageCbs *cbs, LinphoneChatMessageCbsFileTransferProgressIndicationCb cb) {
 	cbs->file_transfer_progress_indication = cb;
 }
 
diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h
index bed8fdf0e..0daf1f03b 100644
--- a/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@ -1331,9 +1331,10 @@ typedef enum _LinphoneChatMessageState {
 
 /**
  * Call back used to notify message delivery status
- *@param msg #LinphoneChatMessage object
- *@param status LinphoneChatMessageState
- *@param ud application user data
+ * @param msg #LinphoneChatMessage object
+ * @param status LinphoneChatMessageState
+ * @param ud application user data
+ * @deprecated
  */
 typedef void (*LinphoneChatMessageStateChangedCb)(LinphoneChatMessage* msg,LinphoneChatMessageState state,void* ud);
 
@@ -1342,7 +1343,7 @@ typedef void (*LinphoneChatMessageStateChangedCb)(LinphoneChatMessage* msg,Linph
  * @param msg #LinphoneChatMessage object
  * @param status LinphoneChatMessageState
  */
-typedef void (*LinphoneChatMessageMsgStateChangedCb)(LinphoneChatMessage* msg, LinphoneChatMessageState state);
+typedef void (*LinphoneChatMessageCbsMsgStateChangedCb)(LinphoneChatMessage* msg, LinphoneChatMessageState state);
 
 /**
  * File transfer receive callback prototype. This function is called by the core upon an incoming File transfer is started. This function may be call several time for the same file in case of large file.
@@ -1353,7 +1354,7 @@ typedef void (*LinphoneChatMessageMsgStateChangedCb)(LinphoneChatMessage* msg, L
  * @param size number of bytes to be read from buff. 0 means end of file.
  *
  */
-typedef void (*LinphoneChatMessageFileTransferRecvCb)(LinphoneChatMessage *message, const LinphoneContent* content, const char* buff, size_t size);
+typedef void (*LinphoneChatMessageCbsFileTransferRecvCb)(LinphoneChatMessage *message, const LinphoneContent* content, const char* buff, size_t size);
 
 /**
  * File transfer send callback prototype. This function is called by the core upon an outgoing File transfer is started. This function is called until size is set to 0.
@@ -1365,7 +1366,7 @@ typedef void (*LinphoneChatMessageFileTransferRecvCb)(LinphoneChatMessage *messa
  * @param size as input value, it represents the number of bytes expected by the framework. As output value, it means the number of bytes wrote by the application in the buffer. 0 means end of file.
  *
  */
-typedef void (*LinphoneChatMessageFileTransferSendCb)(LinphoneChatMessage *message,  const LinphoneContent* content, char* buff, size_t* size);
+typedef void (*LinphoneChatMessageCbsFileTransferSendCb)(LinphoneChatMessage *message,  const LinphoneContent* content, char* buff, size_t* size);
 
 /**
  * File transfer progress indication callback prototype.
@@ -1375,7 +1376,7 @@ typedef void (*LinphoneChatMessageFileTransferSendCb)(LinphoneChatMessage *messa
  * @param offset The number of bytes sent/received since the beginning of the transfer.
  * @param total The total number of bytes to be sent/received.
  */
-typedef void (*LinphoneChatMessageFileTransferProgressIndicationCb)(LinphoneChatMessage *message, const LinphoneContent* content, size_t offset, size_t total);
+typedef void (*LinphoneChatMessageCbsFileTransferProgressIndicationCb)(LinphoneChatMessage *message, const LinphoneContent* content, size_t offset, size_t total);
 
 LINPHONE_PUBLIC void linphone_core_set_chat_database_path(LinphoneCore *lc, const char *path);
 LINPHONE_PUBLIC	LinphoneChatRoom * linphone_core_create_chat_room(LinphoneCore *lc, const char *to);
@@ -1515,14 +1516,14 @@ LINPHONE_PUBLIC LinphoneChatMessageCbs * linphone_chat_message_cbs_ref(LinphoneC
 LINPHONE_PUBLIC void linphone_chat_message_cbs_unref(LinphoneChatMessageCbs *cbs);
 LINPHONE_PUBLIC void *linphone_chat_message_cbs_get_user_data(const LinphoneChatMessageCbs *cbs);
 LINPHONE_PUBLIC void linphone_chat_message_cbs_set_user_data(LinphoneChatMessageCbs *cbs, void *ud);
-LINPHONE_PUBLIC LinphoneChatMessageMsgStateChangedCb linphone_chat_message_cbs_get_msg_state_changed(const LinphoneChatMessageCbs *cbs);
-LINPHONE_PUBLIC void linphone_chat_message_cbs_set_msg_state_changed(LinphoneChatMessageCbs *cbs, LinphoneChatMessageMsgStateChangedCb cb);
-LINPHONE_PUBLIC LinphoneChatMessageFileTransferRecvCb linphone_chat_message_cbs_get_file_transfer_recv(const LinphoneChatMessageCbs *cbs);
-LINPHONE_PUBLIC void linphone_chat_message_cbs_set_file_transfer_recv(LinphoneChatMessageCbs *cbs, LinphoneChatMessageFileTransferRecvCb cb);
-LINPHONE_PUBLIC LinphoneChatMessageFileTransferSendCb linphone_chat_message_cbs_get_file_transfer_send(const LinphoneChatMessageCbs *cbs);
-LINPHONE_PUBLIC void linphone_chat_message_cbs_set_file_transfer_send(LinphoneChatMessageCbs *cbs, LinphoneChatMessageFileTransferSendCb cb);
-LINPHONE_PUBLIC LinphoneChatMessageFileTransferProgressIndicationCb linphone_chat_message_cbs_get_file_transfer_progress_indication(const LinphoneChatMessageCbs *cbs);
-LINPHONE_PUBLIC void linphone_chat_message_cbs_set_file_transfer_progress_indication(LinphoneChatMessageCbs *cbs, LinphoneChatMessageFileTransferProgressIndicationCb cb);
+LINPHONE_PUBLIC LinphoneChatMessageCbsMsgStateChangedCb linphone_chat_message_cbs_get_msg_state_changed(const LinphoneChatMessageCbs *cbs);
+LINPHONE_PUBLIC void linphone_chat_message_cbs_set_msg_state_changed(LinphoneChatMessageCbs *cbs, LinphoneChatMessageCbsMsgStateChangedCb cb);
+LINPHONE_PUBLIC LinphoneChatMessageCbsFileTransferRecvCb linphone_chat_message_cbs_get_file_transfer_recv(const LinphoneChatMessageCbs *cbs);
+LINPHONE_PUBLIC void linphone_chat_message_cbs_set_file_transfer_recv(LinphoneChatMessageCbs *cbs, LinphoneChatMessageCbsFileTransferRecvCb cb);
+LINPHONE_PUBLIC LinphoneChatMessageCbsFileTransferSendCb linphone_chat_message_cbs_get_file_transfer_send(const LinphoneChatMessageCbs *cbs);
+LINPHONE_PUBLIC void linphone_chat_message_cbs_set_file_transfer_send(LinphoneChatMessageCbs *cbs, LinphoneChatMessageCbsFileTransferSendCb cb);
+LINPHONE_PUBLIC LinphoneChatMessageCbsFileTransferProgressIndicationCb linphone_chat_message_cbs_get_file_transfer_progress_indication(const LinphoneChatMessageCbs *cbs);
+LINPHONE_PUBLIC void linphone_chat_message_cbs_set_file_transfer_progress_indication(LinphoneChatMessageCbs *cbs, LinphoneChatMessageCbsFileTransferProgressIndicationCb cb);
 
 /**
  * @}
diff --git a/coreapi/private.h b/coreapi/private.h
index 0ce88fee5..424fa1f4e 100644
--- a/coreapi/private.h
+++ b/coreapi/private.h
@@ -149,10 +149,10 @@ typedef struct _CallCallbackObj
 struct _LinphoneChatMessageCbs {
 	belle_sip_object_t base;
 	void *user_data;
-	LinphoneChatMessageMsgStateChangedCb msg_state_changed;
-	LinphoneChatMessageFileTransferRecvCb file_transfer_recv; /**< Callback to store file received attached to a #LinphoneChatMessage */
-	LinphoneChatMessageFileTransferSendCb file_transfer_send; /**< Callback to collect file chunk to be sent for a #LinphoneChatMessage */
-	LinphoneChatMessageFileTransferProgressIndicationCb file_transfer_progress_indication; /**< Callback to indicate file transfer progress */
+	LinphoneChatMessageCbsMsgStateChangedCb msg_state_changed;
+	LinphoneChatMessageCbsFileTransferRecvCb file_transfer_recv; /**< Callback to store file received attached to a #LinphoneChatMessage */
+	LinphoneChatMessageCbsFileTransferSendCb file_transfer_send; /**< Callback to collect file chunk to be sent for a #LinphoneChatMessage */
+	LinphoneChatMessageCbsFileTransferProgressIndicationCb file_transfer_progress_indication; /**< Callback to indicate file transfer progress */
 };
 
 BELLE_SIP_DECLARE_VPTR(LinphoneChatMessageCbs);
diff --git a/tools/genapixml.py b/tools/genapixml.py
index 4f834fb0c..42afb2e08 100755
--- a/tools/genapixml.py
+++ b/tools/genapixml.py
@@ -198,15 +198,15 @@ class CClass(CObject):
 
 	def __addClassMethod(self, f):
 		name = f.name[len(self.cFunctionPrefix):]
-		if string.find(name, 'get_') == 0 and len(f.arguments) == 0:
+		if name.startswith('get_') and len(f.arguments) == 0:
 			self.__addPropertyGetter(name[4:], f)
-		elif string.find(name, 'is_') == 0 and len(f.arguments) == 0 and f.returnArgument.ctype == 'bool_t':
+		elif name.startswith('is_') and len(f.arguments) == 0 and f.returnArgument.ctype == 'bool_t':
 			self.__addPropertyGetter(name[3:], f)
-		elif string.rfind(name, '_enabled') == (len(name) - 8) and len(f.arguments) == 0 and f.returnArgument.ctype == 'bool_t':
+		elif name.endswith('_enabled') and len(f.arguments) == 0 and f.returnArgument.ctype == 'bool_t':
 			self.__addPropertyGetter(name, f)
-		elif string.find(name, 'set_') == 0 and len(f.arguments) == 1:
+		elif name.startswith('set_') and len(f.arguments) == 1:
 			self.__addPropertySetter(name[4:], f)
-		elif string.find(name, 'enable_') == 0 and len(f.arguments) == 1 and f.arguments[0].ctype == 'bool_t':
+		elif name.startswith('enable_') and len(f.arguments) == 1 and f.arguments[0].ctype == 'bool_t':
 			self.__addPropertySetter(name[7:] + '_enabled', f)
 		else:
 			if not f.name in self.classMethods:
@@ -214,15 +214,15 @@ class CClass(CObject):
 
 	def __addInstanceMethod(self, f):
 		name = f.name[len(self.cFunctionPrefix):]
-		if string.find(name, 'get_') == 0 and len(f.arguments) == 1:
+		if name.startswith('get_') and len(f.arguments) == 1:
 			self.__addPropertyGetter(name[4:], f)
-		elif string.find(name, 'is_') == 0 and len(f.arguments) == 1 and f.returnArgument.ctype == 'bool_t':
+		elif name.startswith('is_') and len(f.arguments) == 1 and f.returnArgument.ctype == 'bool_t':
 			self.__addPropertyGetter(name[3:], f)
-		elif string.rfind(name, '_enabled') == (len(name) - 8) and len(f.arguments) == 1 and f.returnArgument.ctype == 'bool_t':
+		elif name.endswith('_enabled') and len(f.arguments) == 1 and f.returnArgument.ctype == 'bool_t':
 			self.__addPropertyGetter(name, f)
-		elif string.find(name, 'set_') == 0 and len(f.arguments) == 2:
+		elif name.startswith('set_') and len(f.arguments) == 2:
 			self.__addPropertySetter(name[4:], f)
-		elif string.find(name, 'enable_') == 0 and len(f.arguments) == 2 and f.arguments[1].ctype == 'bool_t':
+		elif name.startswith('enable_') and len(f.arguments) == 2 and f.arguments[1].ctype == 'bool_t':
 			self.__addPropertySetter(name[7:] + '_enabled', f)
 		else:
 			if not f.name in self.instanceMethods:
@@ -314,12 +314,12 @@ class Project:
 
 	def __discoverClasses(self):
 		for td in self.__typedefs:
-			if string.find(td.definition, 'enum ') == 0:
+			if td.definition.startswith('enum '):
 				for e in self.enums:
 					if (e.associatedTypedef is None) and td.definition[5:] == e.name:
 						e.associatedTypedef = td
 						break
-			elif string.find(td.definition, 'struct ') == 0:
+			elif td.definition.startswith('struct '):
 				structFound = False
 				for st in self.__structs:
 					if (st.associatedTypedef is None) and td.definition[7:] == st.name:
@@ -333,7 +333,7 @@ class Project:
 					st.associatedTypedef = td
 					self.add(st)
 		for td in self.__typedefs:
-			if string.find(td.definition, 'struct ') == 0:
+			if td.definition.startswith('struct '):
 				for st in self.__structs:
 					if st.associatedTypedef == td:
 						self.add(CClass(st))
@@ -346,9 +346,18 @@ class Project:
 		# Sort classes by length of name (longest first), so that methods are put in the right class
 		self.classes.sort(key = lambda c: len(c.name), reverse = True)
 		for e in self.__events:
+			eventAdded = False
 			for c in self.classes:
-				if string.find(e.name, c.name) == 0:
+				if c.name.endswith('Cbs') and e.name.startswith(c.name):
 					c.addEvent(e)
+					eventAdded = True
+					break
+			if not eventAdded:
+				for c in self.classes:
+					if e.name.startswith(c.name):
+						c.addEvent(e)
+						eventAdded = True
+						break
 		for f in self.__functions:
 			for c in self.classes:
 				if c.cFunctionPrefix == f.name[0 : len(c.cFunctionPrefix)]:
@@ -417,9 +426,9 @@ class Project:
 	def __parseCTypedefMemberdef(self, node):
 		name = node.find('./name').text
 		definition = node.find('./definition').text
-		if string.find(definition, 'typedef ') == 0:
+		if definition.startswith('typedef '):
 			definition = definition[8 :]
-		if string.rfind(name, 'Cb') == len(name) - 2:
+		if name.endswith('Cb'):
 			pos = string.find(definition, "(*")
 			if pos == -1:
 				return None
diff --git a/tools/python/apixml2python/handwritten_definitions.mustache b/tools/python/apixml2python/handwritten_definitions.mustache
index 52dfc7016..86b439c20 100644
--- a/tools/python/apixml2python/handwritten_definitions.mustache
+++ b/tools/python/apixml2python/handwritten_definitions.mustache
@@ -201,9 +201,9 @@ static PyObject * pylinphone_Core_class_method_new(PyObject *cls, PyObject *args
 	}
 	Py_INCREF(_vtable_dict);
 	self->vtable_dict = _vtable_dict;
-{{#events}}
+{{#core_events}}
 	{{{event_vtable_reference}}}
-{{/events}}
+{{/core_events}}
 
 	pylinphone_trace(1, "[PYLINPHONE] >>> %s(%p, \"%s\", \"%s\")", __FUNCTION__, _vtable_dict, _config_path, _factory_config_path);
 	cresult = linphone_core_new(&_vtable, _config_path, _factory_config_path, self);
@@ -243,9 +243,9 @@ static PyObject * pylinphone_Core_class_method_new_with_config(PyObject *cls, Py
 	}
 	Py_INCREF(_vtable_dict);
 	self->vtable_dict = _vtable_dict;
-{{#events}}
+{{#core_events}}
 	{{{event_vtable_reference}}}
-{{/events}}
+{{/core_events}}
 
 	pylinphone_trace(1, "[PYLINPHONE] >>> %s(%p [%p])", __FUNCTION__, _config, _config_native_ptr);
 	cresult = linphone_core_new_with_config(&_vtable, _config_native_ptr, self);
diff --git a/tools/python/apixml2python/linphone.py b/tools/python/apixml2python/linphone.py
index 0d88af2ab..ea3fd93f0 100644
--- a/tools/python/apixml2python/linphone.py
+++ b/tools/python/apixml2python/linphone.py
@@ -25,9 +25,12 @@ def strip_leading_linphone(s):
 	else:
 		return s
 
-def compute_event_name(s):
+def is_callback(s):
+	return s.startswith('Linphone') and s.endswith('Cb')
+
+def compute_event_name(s, className):
 	s = strip_leading_linphone(s)
-	s = s[4:-2] # Remove leading 'Core' and tailing 'Cb'
+	s = s[len(className):-2] # Remove leading class name and tailing 'Cb'
 	event_name = ''
 	first = True
 	for l in s:
@@ -198,6 +201,10 @@ class ArgumentType:
 				self.convert_func = 'PyInt_AsLong'
 				self.fmt_str = 'i'
 				self.cfmt_str = '%d'
+			elif is_callback(self.complete_type):
+				self.type_str = 'callable'
+				self.check_func = 'PyCallable_Check'
+				self.cnativefmt_str = None
 			elif '*' in splitted_type:
 				self.type_str = 'linphone.' + strip_leading_linphone(self.basic_type)
 				self.use_native_pointer = True
@@ -245,7 +252,9 @@ class MethodDefinition:
 			arg_contained_type = xml_method_arg.get('containedtype')
 			argument_type = ArgumentType(arg_type, arg_complete_type, arg_contained_type, self.linphone_module)
 			self.parse_tuple_format += argument_type.fmt_str
-			if argument_type.fmt_str == 'O' and argument_type.use_native_pointer:
+			if is_callback(arg_complete_type):
+				body += "\tPyObject * {arg_name};\n".format(arg_name=arg_name)
+			elif argument_type.fmt_str == 'O' and argument_type.use_native_pointer:
 				body += "\tPyObject * " + arg_name + ";\n"
 				body += "\t" + arg_complete_type + " " + arg_name + "_native_ptr = NULL;\n"
 			elif argument_type.fmt_str == 'O' and argument_type.convert_func is not None:
@@ -308,7 +317,7 @@ class MethodDefinition:
 			argument_type = ArgumentType(arg_type, arg_complete_type, arg_contained_type, self.linphone_module)
 			fmt += argument_type.cfmt_str
 			args.append(arg_name)
-			if argument_type.fmt_str == 'O':
+			if argument_type.fmt_str == 'O' and argument_type.cnativefmt_str is not None:
 				fmt += ' [' + argument_type.cnativefmt_str + ']'
 				if argument_type.use_native_pointer:
 					args.append(arg_name + '_native_ptr')
@@ -663,6 +672,12 @@ class SetterMethodDefinition(MethodDefinition):
 	}}
 """.format(checknotnone=checknotnone, checkfunc=self.first_argument_type.check_func, attribute_name=self.attribute_name, type_str=self.first_argument_type.type_str)
 		attribute_conversion_code = ''
+		callback_setting_code = ''
+		if is_callback(self.first_argument_type.complete_type):
+			callback_setting_code = \
+"""Py_XDECREF(((pylinphone_{class_name}Object *)self)->{callback_name});
+	((pylinphone_{class_name}Object *)self)->{callback_name} = Py_INCREF(value);
+""".format(class_name=self.class_['class_name'], callback_name=compute_event_name(self.first_arg_complete_type, self.class_['class_name']))
 		if (self.first_argument_type.convert_func is None) or \
 			(self.first_argument_type.fmt_str == 'O' and self.first_argument_type.convert_func is not None):
 			attribute_conversion_code += "{arg_name} = value;\n".format(arg_name="_" + self.first_arg_name)
@@ -693,14 +708,21 @@ class SetterMethodDefinition(MethodDefinition):
 	}}
 	{attribute_type_check_code}
 	{attribute_conversion_code}
+	{callback_setting_code}
 	{attribute_native_ptr_check_code}
 """.format(attribute_name=self.attribute_name,
 		native_ptr_check_code=self.format_class_native_pointer_check(True),
 		attribute_type_check_code=attribute_type_check_code,
 		attribute_conversion_code=attribute_conversion_code,
+		callback_setting_code=callback_setting_code,
 		attribute_native_ptr_check_code=attribute_native_ptr_check_code)
 
 	def format_c_function_call(self):
+		if is_callback(self.first_argument_type.complete_type):
+			return \
+"""	{method_name}(native_ptr, pylinphone_{class_name}_callback_{callback_name});
+	pylinphone_dispatch_messages();
+""".format(method_name=self.method_node.get('name'), class_name=self.class_['class_name'], callback_name=compute_event_name(self.first_argument_type.complete_type, self.class_['class_name']))
 		suffix = ''
 		if self.first_argument_type.fmt_str == 'O' and self.first_argument_type.use_native_pointer:
 			suffix = '_native_ptr'
@@ -735,11 +757,19 @@ class EventCallbackMethodDefinition(MethodDefinition):
 		MethodDefinition.__init__(self, linphone_module, class_, method_node)
 
 	def format_local_variables_definition(self):
+		class_name = self.class_['event_class']
+		nocallbacks_class_name = class_name
+		if class_name.endswith('Cbs'):
+			nocallbacks_class_name = class_name[:-3]
 		common = \
-"""	pylinphone_CoreObject *pylc = (pylinphone_CoreObject *)linphone_core_get_user_data(lc);
+"""	pylinphone_{class_name}Object *pyself = (pylinphone_{class_name}Object *){function_prefix}get_user_data(self);
 	PyObject *func;
 	PyObject *args;
-	PyGILState_STATE pygil_state;"""
+	PyGILState_STATE pygil_state;""".format(class_name=nocallbacks_class_name, function_prefix=self.find_class_definition(nocallbacks_class_name)['class_c_function_prefix'])
+		if class_name.endswith('Cbs'):
+			common += """
+	pylinphone_{class_name}Object *pycbs = (pylinphone_{class_name}Object *){cbs_function_prefix}get_user_data({function_prefix}get_callbacks(self));
+""".format(class_name=class_name, cbs_function_prefix=self.find_class_definition(class_name)['class_c_function_prefix'], function_prefix=self.find_class_definition(nocallbacks_class_name)['class_c_function_prefix'])
 		specific = ''
 		for xml_method_arg in self.xml_method_args:
 			arg_name = xml_method_arg.get('name')
@@ -752,15 +782,22 @@ class EventCallbackMethodDefinition(MethodDefinition):
 		return "{common}\n{specific}".format(common=common, specific=specific)
 
 	def format_arguments_parsing(self):
-		return \
-"""	if (Py_REFCNT(pylc) <= 0) return;
-	func = PyDict_GetItemString(pylc->vtable_dict, "{name}");
+		if self.class_['event_class'] == 'Core':
+			return \
+"""	if (Py_REFCNT(pyself) <= 0) return;
+	func = PyDict_GetItemString(pyself->vtable_dict, "{name}");
 	pygil_state = PyGILState_Ensure();
 """.format(name=self.class_['event_name'])
+		else:
+			return \
+"""	if (Py_REFCNT(pyself) <= 0) return;
+	func = pycbs->{event_name};
+	pygil_state = PyGILState_Ensure();
+""".format(event_name=self.class_['event_name'])
 
 	def format_enter_trace(self):
 		fmt = '%p'
-		args = ['lc']
+		args = ['self']
 		for xml_method_arg in self.xml_method_args:
 			arg_name = xml_method_arg.get('name')
 			arg_type = xml_method_arg.get('type')
@@ -779,7 +816,7 @@ class EventCallbackMethodDefinition(MethodDefinition):
 	def format_c_function_call(self):
 		create_python_objects_code = ''
 		fmt = 'O'
-		args = ['pylc']
+		args = ['pyself']
 		for xml_method_arg in self.xml_method_args:
 			arg_name = xml_method_arg.get('name')
 			arg_type = xml_method_arg.get('type')
@@ -817,17 +854,21 @@ class EventCallbackMethodDefinition(MethodDefinition):
 
 	def format(self):
 		body = MethodDefinition.format(self)
-		arguments = ['LinphoneCore * lc']
+		class_name = self.class_['event_class']
+		nocallbacks_class_name = class_name
+		if class_name.endswith('Cbs'):
+			nocallbacks_class_name = class_name[:-3]
+		arguments = ['Linphone' + nocallbacks_class_name + ' * self']
 		for xml_method_arg in self.xml_method_args:
 			arg_name = xml_method_arg.get('name')
 			arg_type = xml_method_arg.get('type')
 			arg_complete_type = xml_method_arg.get('completetype')
 			arguments.append(arg_complete_type + ' ' + arg_name)
 		definition = \
-"""static void pylinphone_Core_callback_{event_name}({arguments}) {{
+"""static void pylinphone_{class_name}_callback_{event_name}({arguments}) {{
 {body}
 }}
-""".format(event_name=self.class_['event_name'], arguments=', '.join(arguments), body=body)
+""".format(class_name=class_name, event_name=self.class_['event_name'], arguments=', '.join(arguments), body=body)
 		return definition
 
 
@@ -863,7 +904,7 @@ class LinphoneModule(object):
 			e['enum_doc'] = self.__replace_doc_special_chars(e['enum_doc'])
 			self.enums.append(e)
 			self.enum_names.append(e['enum_name'])
-		self.events = []
+		self.core_events = []
 		self.classes = []
 		xml_classes = tree.findall("./classes/class")
 		for xml_class in xml_classes:
@@ -886,35 +927,39 @@ class LinphoneModule(object):
 			c['class_hand_written_properties'] = []
 			c['class_object_members'] = []
 			c['class_object_members_code'] = ''
+			c['class_events'] = []
 			if c['class_name'] == 'Core':
 				c['class_object_members'].append("vtable_dict")
 				c['class_object_members_code'] = "\tPyObject *vtable_dict;"
-				xml_events = xml_class.findall("./events/event")
-				for xml_event in xml_events:
-					if xml_event.get('deprecated') == 'true':
+			xml_events = xml_class.findall("./events/event")
+			for xml_event in xml_events:
+				if xml_event.get('deprecated') == 'true':
+					continue
+				if xml_event.get('name') in blacklisted_events:
 						continue
-					if xml_event.get('name') in blacklisted_events:
-						  continue
-					ev = {}
-					ev['event_xml_node'] = xml_event
-					ev['event_cname'] = xml_event.get('name')
-					ev['event_name'] = compute_event_name(ev['event_cname'])
-					ev['event_doc'] = self.__format_doc(xml_event.find('briefdescription'), xml_event.find('detaileddescription'))
-					self.events.append(ev)
+				ev = {}
+				ev['event_class'] = c['class_name']
+				ev['event_xml_node'] = xml_event
+				ev['event_cname'] = xml_event.get('name')
+				ev['event_name'] = compute_event_name(ev['event_cname'], c['class_name'])
+				ev['event_doc'] = self.__format_doc(xml_event.find('briefdescription'), xml_event.find('detaileddescription'))
+				if c['class_name'] == 'Core':
+					self.core_events.append(ev)
+				else:
+					c['class_events'].append(ev)
+					c['class_object_members'].append(ev['event_name'])
+					c['class_object_members_code'] += "\tPyObject *" + ev['event_name'] + ";\n"
 			for hand_written_code in hand_written_codes:
 				if hand_written_code._class == c['class_name']:
 					if isinstance(hand_written_code, HandWrittenClassMethod):
-						print "HandWrittenClassMethod"
 						m = {}
 						m['method_name'] = hand_written_code.name
 						c['class_type_hand_written_methods'].append(m)
 					elif isinstance(hand_written_code, HandWrittenInstanceMethod):
-						print "HandWrittenInstanceMethod"
 						m = {}
 						m['method_name'] = hand_written_code.name
 						c['class_instance_hand_written_methods'].append(m)
 					elif isinstance(hand_written_code, HandWrittenProperty):
-						print "HandWrittenProperty"
 						p = {}
 						p['property_name'] = hand_written_code.name
 						if hand_written_code.getter_cfunction is None:
@@ -992,9 +1037,12 @@ class LinphoneModule(object):
 				c['class_properties'].append(p)
 			self.classes.append(c)
 		# Format events definitions
-		for ev in self.events:
+		for ev in self.core_events:
 			ev['event_callback_definition'] = EventCallbackMethodDefinition(self, ev, ev['event_xml_node']).format()
 			ev['event_vtable_reference'] = "_vtable.{name} = pylinphone_Core_callback_{name};".format(name=ev['event_name'])
+		for c in self.classes:
+			for ev in c['class_events']:
+				ev['event_callback_definition'] = EventCallbackMethodDefinition(self, ev, ev['event_xml_node']).format()
 		# Format methods' bodies
 		for c in self.classes:
 			xml_new_method = c['class_xml_node'].find("./classmethods/classmethod[@name='" + c['class_c_function_prefix'] + "new']")
diff --git a/tools/python/apixml2python/linphone_module.mustache b/tools/python/apixml2python/linphone_module.mustache
index 925902da7..f9067d6fa 100644
--- a/tools/python/apixml2python/linphone_module.mustache
+++ b/tools/python/apixml2python/linphone_module.mustache
@@ -97,9 +97,15 @@ MSList * PyList_AsMSListOf{{c_contained_type}}(PyObject *pyl) {
 
 {{/mslist_types}}
 
-{{#events}}
+{{#core_events}}
 {{{event_callback_definition}}}
-{{/events}}
+{{/core_events}}
+
+{{#classes}}
+{{#class_events}}
+{{{event_callback_definition}}}
+{{/class_events}}
+{{/classes}}
 
 {{#classes}}
 

From 9066a82f3c8da1071883f5ef29719580e91d99cb Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Fri, 5 Dec 2014 16:40:26 +0100
Subject: [PATCH 112/496] Handle callbacks getters in Python module.

---
 tools/python/apixml2python/linphone.py | 29 +++++++++++++++++---------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/tools/python/apixml2python/linphone.py b/tools/python/apixml2python/linphone.py
index ea3fd93f0..f328bdba2 100644
--- a/tools/python/apixml2python/linphone.py
+++ b/tools/python/apixml2python/linphone.py
@@ -235,7 +235,12 @@ class MethodDefinition:
 			self.return_type = self.xml_method_return.get('type')
 			self.return_complete_type = self.xml_method_return.get('completetype')
 			self.return_contained_type = self.xml_method_return.get('containedtype')
-		if self.return_complete_type != 'void':
+		if is_callback(self.return_complete_type):
+			body += "\tPyObject * pyresult;\n"
+			body += "\tPyObject * pyret;\n"
+			argument_type = ArgumentType(self.return_type, self.return_complete_type, self.return_contained_type, self.linphone_module)
+			self.build_value_format = argument_type.fmt_str
+		elif self.return_complete_type != 'void':
 			body += "\t" + self.return_complete_type + " cresult;\n"
 			argument_type = ArgumentType(self.return_type, self.return_complete_type, self.return_contained_type, self.linphone_module)
 			self.build_value_format = argument_type.fmt_str
@@ -343,14 +348,17 @@ class MethodDefinition:
 				arg_names.append(arg_name + "_native_obj")
 			else:
 				arg_names.append(arg_name)
-		if self.return_complete_type != 'void':
-			c_function_call_code += "cresult = "
-		c_function_call_code += self.method_node.get('name') + "("
-		if self.self_arg is not None:
-			c_function_call_code += "native_ptr"
-			if len(arg_names) > 0:
-				c_function_call_code += ', '
-		c_function_call_code += ', '.join(arg_names) + ");"
+		if is_callback(self.return_complete_type):
+			c_function_call_code = "pyresult = ((pylinphone_{class_name}Object *)self)->{callback_name};".format(class_name=self.class_['class_name'], callback_name=compute_event_name(self.return_complete_type, self.class_['class_name']))
+		else:
+			if self.return_complete_type != 'void':
+				c_function_call_code += "cresult = "
+			c_function_call_code += self.method_node.get('name') + "("
+			if self.self_arg is not None:
+				c_function_call_code += "native_ptr"
+				if len(arg_names) > 0:
+					c_function_call_code += ', '
+			c_function_call_code += ', '.join(arg_names) + ");"
 		from_native_pointer_code = ''
 		convert_from_code = ''
 		build_value_code = ''
@@ -676,7 +684,8 @@ class SetterMethodDefinition(MethodDefinition):
 		if is_callback(self.first_argument_type.complete_type):
 			callback_setting_code = \
 """Py_XDECREF(((pylinphone_{class_name}Object *)self)->{callback_name});
-	((pylinphone_{class_name}Object *)self)->{callback_name} = Py_INCREF(value);
+	Py_INCREF(value);
+	((pylinphone_{class_name}Object *)self)->{callback_name} = value;
 """.format(class_name=self.class_['class_name'], callback_name=compute_event_name(self.first_arg_complete_type, self.class_['class_name']))
 		if (self.first_argument_type.convert_func is None) or \
 			(self.first_argument_type.fmt_str == 'O' and self.first_argument_type.convert_func is not None):

From 908b906e4d62a9353472057533f22362805f539a Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Fri, 5 Dec 2014 16:58:07 +0100
Subject: [PATCH 113/496] Remove some functions from the blacklist of the
 Python module.

---
 tools/python/apixml2python.py | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/tools/python/apixml2python.py b/tools/python/apixml2python.py
index f6248ca69..728c45880 100755
--- a/tools/python/apixml2python.py
+++ b/tools/python/apixml2python.py
@@ -42,10 +42,7 @@ blacklisted_functions = [
 	'linphone_call_log_get_remote_stats',	# missing rtp_stats_t
 	'linphone_call_params_get_privacy',	# missing LinphonePrivacyMask
 	'linphone_call_params_set_privacy',	# missing LinphonePrivacyMask
-	'linphone_chat_message_get_file_transfer_information',	# missing LinphoneContent
-	'linphone_chat_message_start_file_download',	# to be handwritten because of callback
 	'linphone_chat_message_state_to_string',	# There is no use to wrap this function
-	'linphone_chat_room_create_file_transfer_message',	# missing LinphoneContent
 	'linphone_core_add_listener',
 	'linphone_core_can_we_add_call',	# private function
 	'linphone_core_enable_log_collection',	# need to handle class properties
@@ -55,7 +52,6 @@ blacklisted_functions = [
 	'linphone_core_get_supported_video_sizes',	# missing MSVideoSizeDef
 	'linphone_core_get_video_policy',	# missing LinphoneVideoPolicy
 	'linphone_core_get_video_port_range',	# to be handwritten because of result via arguments
-	'linphone_core_publish',	# missing LinphoneContent
 	'linphone_core_remove_listener',
 	'linphone_core_serialize_logs',	# There is no use to wrap this function
 	'linphone_core_set_log_collection_max_file_size',	# need to handle class properties
@@ -66,12 +62,6 @@ blacklisted_functions = [
 	'linphone_core_set_log_level',	# There is no use to wrap this function
 	'linphone_core_set_video_policy',	# missing LinphoneVideoPolicy
 	'linphone_core_set_sip_transports',	# missing LCSipTransports
-	'linphone_core_subscribe',	# missing LinphoneContent
-	'linphone_event_notify',	# missing LinphoneContent
-	'linphone_event_send_publish',	# missing LinphoneContent
-	'linphone_event_send_subscribe',	# missing LinphoneContent
-	'linphone_event_update_publish',	# missing LinphoneContent
-	'linphone_event_update_subscribe',	# missing LinphoneContent
 	'linphone_proxy_config_get_privacy',	# missing LinphonePrivacyMask
 	'linphone_proxy_config_normalize_number',	# to be handwritten because of result via arguments
 	'linphone_proxy_config_set_file_transfer_server',	# defined but not implemented in linphone core

From 21d25ef90e45aff19f1eb1d999aa65dbb2255c2c Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Fri, 5 Dec 2014 17:54:21 +0100
Subject: [PATCH 114/496] add get/set RemoteRingbackTone() to java wrapper

---
 coreapi/linphonecore_jni.cc                       | 13 +++++++++++++
 java/common/org/linphone/core/LinphoneCore.java   | 13 +++++++++++++
 java/impl/org/linphone/core/LinphoneCoreImpl.java | 10 ++++++++++
 3 files changed, 36 insertions(+)

diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index 42d22a0e1..adc3ada56 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -3074,6 +3074,19 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setDeviceRotation(JNIEnv
 	linphone_core_set_device_rotation((LinphoneCore*)lc,rotation);
 }
 
+extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setRemoteRingbackTone(JNIEnv *env, jobject thiz, jlong lc, jstring jtone){
+	const char* tone = NULL;
+	if (jtone) tone=env->GetStringUTFChars(jtone, NULL);
+	linphone_core_set_remote_ringback_tone((LinphoneCore*)lc,tone);
+	if (tone) env->ReleaseStringUTFChars(jtone,tone);
+}
+
+extern "C" jstring Java_org_linphone_core_LinphoneCoreImpl_getRemoteRingbackTone(JNIEnv *env, jobject thiz, jlong lc){
+	const char *ret= linphone_core_get_remote_ringback_tone((LinphoneCore*)lc);
+	if (ret==NULL) return NULL;
+	jstring jvalue =env->NewStringUTF(ret);
+	return jvalue;
+}
 
 extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setFirewallPolicy(JNIEnv *env, jobject thiz, jlong lc, jint enum_value){
 	linphone_core_set_firewall_policy((LinphoneCore*)lc,(LinphoneFirewallPolicy)enum_value);
diff --git a/java/common/org/linphone/core/LinphoneCore.java b/java/common/org/linphone/core/LinphoneCore.java
index b13a510d6..93c5fe1cf 100644
--- a/java/common/org/linphone/core/LinphoneCore.java
+++ b/java/common/org/linphone/core/LinphoneCore.java
@@ -1799,4 +1799,17 @@ public interface LinphoneCore {
 	 * @param listener to remove
 	 */
 	public void removeListener(LinphoneCoreListener listener);
+	
+	/**
+	 * Specifies a ring back tone to be played to far end during incoming calls, when early media is requested.
+	 * @param file
+	 */
+	public void setRemoteRingbackTone(String file);
+
+	/**
+	 * Return the ringback tone file used when doing early media. It may be null.
+	 * @return the ringback tone file path.
+	 */
+	String getRemoteRingbackTone();
+	
 }
diff --git a/java/impl/org/linphone/core/LinphoneCoreImpl.java b/java/impl/org/linphone/core/LinphoneCoreImpl.java
index d5db2ad48..ea8899883 100644
--- a/java/impl/org/linphone/core/LinphoneCoreImpl.java
+++ b/java/impl/org/linphone/core/LinphoneCoreImpl.java
@@ -1303,4 +1303,14 @@ class LinphoneCoreImpl implements LinphoneCore {
 	public void removeListener(LinphoneCoreListener listener) {
 		removeListener(nativePtr, listener);
 	}
+	private native void setRemoteRingbackTone(long nativePtr, String file);
+	@Override
+	public void setRemoteRingbackTone(String file) {
+		setRemoteRingbackTone(nativePtr,file);
+	}
+	private native String getRemoteRingbackTone(long nativePtr);
+	@Override
+	public String getRemoteRingbackTone() {
+		return getRemoteRingbackTone(nativePtr);
+	}
 }

From bebf7992e5e79860ab78b14960449a608e1ec978 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Mon, 8 Dec 2014 09:36:04 +0100
Subject: [PATCH 115/496] wait a bit more

---
 tester/flexisip_tester.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tester/flexisip_tester.c b/tester/flexisip_tester.c
index a1d37209c..63ae8b79d 100644
--- a/tester/flexisip_tester.c
+++ b/tester/flexisip_tester.c
@@ -596,7 +596,7 @@ static void early_media_call_forking(void) {
 	CU_ASSERT_TRUE(wait_for_list(lcs,&marie2->stat.number_of_LinphoneCallEnd,1,1000));
 	
 	/*wait a bit that streams are established*/
-	wait_for_list(lcs,&dummy,1,1000);
+	wait_for_list(lcs,&dummy,1,3000);
 	CU_ASSERT_TRUE(linphone_call_get_audio_stats(pauline_call)->download_bandwidth>71
 					&& linphone_call_get_audio_stats(pauline_call)->download_bandwidth<91 );
 	CU_ASSERT_TRUE(linphone_call_get_audio_stats(marie1_call)->download_bandwidth>71

From 0547b5b99821bec7d6e2e957cc1d8029a2246752 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Mon, 8 Dec 2014 10:34:41 +0100
Subject: [PATCH 116/496] Handle search for sqlite3 dependency when searching
 for liblinphone when building with CMake.

---
 CMakeLists.txt                                      | 4 +++-
 cmake/{FindLinphone.cmake => FindLinphone.cmake.in} | 9 +++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)
 rename cmake/{FindLinphone.cmake => FindLinphone.cmake.in} (92%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 390812533..f1664f68d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -184,7 +184,9 @@ if(ENABLE_UNIT_TESTS)
 endif()
 
 
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindLinphone.cmake
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindLinphone.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/FindLinphone.cmake)
+
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/FindLinphone.cmake
 	DESTINATION share/cmake/Modules
 	PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
 )
diff --git a/cmake/FindLinphone.cmake b/cmake/FindLinphone.cmake.in
similarity index 92%
rename from cmake/FindLinphone.cmake
rename to cmake/FindLinphone.cmake.in
index 065e1c865..5f8b03b19 100644
--- a/cmake/FindLinphone.cmake
+++ b/cmake/FindLinphone.cmake.in
@@ -32,6 +32,9 @@ find_package(ORTP REQUIRED)
 find_package(MS2 REQUIRED)
 find_package(XML2 REQUIRED)
 find_package(BelleSIP REQUIRED)
+if(@ENABLE_MSG_STORAGE@)
+	find_package(Sqlite3)
+endif()
 
 set(_LINPHONE_ROOT_PATHS
 	${WITH_LINPHONE}
@@ -56,6 +59,12 @@ find_library(LINPHONE_LIBRARIES
 
 list(APPEND LINPHONE_INCLUDE_DIRS ${ORTP_INCLUDE_DIRS} ${MS2_INCLUDE_DIRS} ${XML2_INCLUDE_DIRS} ${BELLESIP_INCLUDE_DIRS})
 list(APPEND LINPHONE_LIBRARIES ${ORTP_LIBRARIES} ${MS2_LIBRARIES} ${XML2_LIBRARIES} ${BELLESIP_LIBRARIES})
+
+if(SQLITE3_FOUND)
+	list(APPEND LINPHONE_INCLUDE_DIRS ${SQLITE3_INCLUDE_DIRS})
+	list(APPEND LINPHONE_LIBRARIES ${SQLITE3_LIBRARIES})
+endif()
+
 if(WIN32)
 	list(APPEND LINPHONE_LIBRARIES shlwapi)
 endif(WIN32)

From b61302f9b1e0563e34bcb392fbaa1c3483dc3c73 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Mon, 8 Dec 2014 11:30:58 +0100
Subject: [PATCH 117/496] Handle accounts manager to the Python module unit
 tests.

---
 tester/accountmanager.c                       | 16 ++++--
 tester/liblinphone_tester.h                   |  1 +
 .../linphone_testing_module.mustache          | 52 +++++++++++++++++++
 tools/python/unittests/linphonetester.py      |  1 +
 tools/python/unittests/test_call.py           |  4 ++
 tools/python/unittests/test_message.py        |  4 ++
 tools/python/unittests/test_presence.py       |  4 ++
 tools/python/unittests/test_register.py       |  4 ++
 tools/python/unittests/test_setup.py          |  4 ++
 9 files changed, 85 insertions(+), 5 deletions(-)

diff --git a/tester/accountmanager.c b/tester/accountmanager.c
index a3086f9cf..23794a6db 100644
--- a/tester/accountmanager.c
+++ b/tester/accountmanager.c
@@ -201,16 +201,22 @@ LinphoneAddress *account_manager_check_account(AccountManager *m, LinphoneProxyC
 	return account->modified_identity;
 }
 
-void linphone_core_manager_check_accounts(LinphoneCoreManager *m){
+LinphoneAddress * account_manager_check_accounts(LinphoneCore *lc, LinphoneAddress *identity){
 	const MSList *it;
 	AccountManager *am=account_manager_get();
 
-	for(it=linphone_core_get_proxy_config_list(m->lc);it!=NULL;it=it->next){
+	for(it=linphone_core_get_proxy_config_list(lc);it!=NULL;it=it->next){
 		LinphoneProxyConfig *cfg=(LinphoneProxyConfig *)it->data;
 		LinphoneAddress *modified_identity=account_manager_check_account(am,cfg);
-		if (m->identity){
-			linphone_address_unref(m->identity);
+		if (identity){
+			linphone_address_unref(identity);
 		}
-		m->identity=linphone_address_ref(modified_identity);
+		identity=linphone_address_ref(modified_identity);
 	}
+
+	return identity;
+}
+
+void linphone_core_manager_check_accounts(LinphoneCoreManager *m){
+	m->identity=account_manager_check_accounts(m->lc,m->identity);
 }
diff --git a/tester/liblinphone_tester.h b/tester/liblinphone_tester.h
index 12531a57f..f776c21c8 100644
--- a/tester/liblinphone_tester.h
+++ b/tester/liblinphone_tester.h
@@ -279,6 +279,7 @@ void liblinphone_tester_check_rtcp(LinphoneCoreManager* caller, LinphoneCoreMana
 void liblinphone_tester_clock_start(MSTimeSpec *start);
 bool_t liblinphone_tester_clock_elapsed(const MSTimeSpec *start, int value_ms);
 void linphone_core_manager_check_accounts(LinphoneCoreManager *m);
+LinphoneAddress * account_manager_check_accounts(LinphoneCore *lc, LinphoneAddress *identity);
 void account_manager_destroy(void);
 LinphoneCore* configure_lc_from(LinphoneCoreVTable* v_table, const char* path, const char* file, void* user_data);
 #ifdef ANDROID
diff --git a/tools/python/apixml2python/linphone_testing_module.mustache b/tools/python/apixml2python/linphone_testing_module.mustache
index b68f8a558..81b96f96d 100644
--- a/tools/python/apixml2python/linphone_testing_module.mustache
+++ b/tools/python/apixml2python/linphone_testing_module.mustache
@@ -1,4 +1,54 @@
 #include "private.h"
+#include "liblinphone_tester.h"
+
+static PyObject * pylinphone_testing_module_method_check_accounts(PyObject *self, PyObject *args) {
+	PyObject *_core;
+	PyObject *_identity;
+	PyObject * pyresult;
+	PyObject * pyret;
+	LinphoneCore *_core_native_ptr;
+	LinphoneAddress *_identity_native_ptr;
+
+	if (!PyArg_ParseTuple(args, "OO", &_core, &_identity)) {
+		return NULL;
+	}
+	if ((_core != Py_None) && !PyObject_IsInstance(_core, (PyObject *)&pylinphone_CoreType)) {
+		PyErr_SetString(PyExc_TypeError, "The '_core' argument must be a linphone.Core instance.");
+		return NULL;
+	}
+	if ((_core != Py_None) && !PyObject_IsInstance(_identity, (PyObject *)&pylinphone_AddressType)) {
+		PyErr_SetString(PyExc_TypeError, "The '_identity' argument must be a linphone.Address instance.");
+		return NULL;
+	}
+
+	if ((_core != NULL) && (_core != Py_None)) {
+		if ((_core_native_ptr = pylinphone_Core_get_native_ptr(_core)) == NULL) {
+			return NULL;
+		}
+	}
+	if ((_identity != NULL) && (_identity != Py_None)) {
+		if ((_identity_native_ptr = pylinphone_Address_get_native_ptr(_core)) == NULL) {
+			return NULL;
+		}
+	}
+
+	pylinphone_trace(1, "[PYLINPHONE] >>> %s(%p [%p], %p [%p])", __FUNCTION__, _core, _core_native_ptr, _identity, _identity_native_ptr);
+	_identity_native_ptr = account_manager_check_accounts(_core_native_ptr, _identity_native_ptr);
+	pylinphone_dispatch_messages();
+	pyresult = pylinphone_Address_from_native_ptr(&pylinphone_AddressType, _identity_native_ptr);
+	pyret = Py_BuildValue("O", pyresult);
+
+	pylinphone_trace(-1, "[PYLINPHONE] <<< %s -> %p", __FUNCTION__, pyret);
+	return pyret;
+}
+
+static PyObject * pylinphone_testing_module_method_clean_accounts(PyObject *self, PyObject *args) {
+	pylinphone_trace(1, "[PYLINPHONE] >>> %s()", __FUNCTION__);
+	account_manager_destroy();
+	pylinphone_dispatch_messages();
+	pylinphone_trace(-1, "[PYLINPHONE] <<< %s -> None", __FUNCTION__);
+	Py_RETURN_NONE;
+}
 
 static PyObject * pylinphone_testing_module_method_set_dns_user_hosts_file(PyObject *self, PyObject *args) {
 	PyObject *_core;
@@ -28,6 +78,8 @@ static PyObject * pylinphone_testing_module_method_set_dns_user_hosts_file(PyObj
 }
 
 static PyMethodDef pylinphone_TestingModuleMethods[] = {
+	{ "check_accounts", pylinphone_testing_module_method_check_accounts, METH_VARARGS, "Checks that testing SIP accounts are created or creates them." },
+	{ "clean_accounts", pylinphone_testing_module_method_clean_accounts, METH_VARARGS, "Cleans the testing SIP accounts." },
 	{ "set_dns_user_hosts_file", pylinphone_testing_module_method_set_dns_user_hosts_file, METH_VARARGS, "Allows to set a user specified hosts file." },
 	/* Sentinel */
 	{ NULL, NULL, 0, NULL }
diff --git a/tools/python/unittests/linphonetester.py b/tools/python/unittests/linphonetester.py
index fcd485c79..8ed12e7f7 100644
--- a/tools/python/unittests/linphonetester.py
+++ b/tools/python/unittests/linphonetester.py
@@ -493,6 +493,7 @@ class CoreManager:
             assert_equals(os.path.isfile(filepath), True)
         lc = linphone.Core.new(vtable, None, filepath)
         linphone.testing.set_dns_user_hosts_file(lc, os.path.join(resources_path, 'tester_hosts'))
+        self.identity = linphone.testing.check_accounts(lc, self.identity)
         lc.root_ca = os.path.join(resources_path, 'certificates', 'cn', 'cafile.pem')
         lc.ring = os.path.join(resources_path, 'sounds', 'oldphone.wav')
         lc.ringback = os.path.join(resources_path, 'sounds', 'ringback.wav')
diff --git a/tools/python/unittests/test_call.py b/tools/python/unittests/test_call.py
index 93dfd1175..b02daefea 100644
--- a/tools/python/unittests/test_call.py
+++ b/tools/python/unittests/test_call.py
@@ -12,6 +12,10 @@ class TestCall:
         base, ext = os.path.splitext(os.path.basename(__file__))
         cls.logger = Logger(base + '.log')
 
+    @classmethod
+    def teardown_class(cls):
+        linphone.testing.clean_accounts()
+
     def test_early_declined_call(self):
         marie = CoreManager('marie_rc', logger=TestCall.logger)
         pauline = CoreManager('pauline_rc', logger=TestCall.logger)
diff --git a/tools/python/unittests/test_message.py b/tools/python/unittests/test_message.py
index 56a7e9e17..04c6fa260 100644
--- a/tools/python/unittests/test_message.py
+++ b/tools/python/unittests/test_message.py
@@ -13,6 +13,10 @@ class TestMessage:
         base, ext = os.path.splitext(os.path.basename(__file__))
         cls.logger = Logger(base + '.log')
 
+    @classmethod
+    def teardown_class(cls):
+        linphone.testing.clean_accounts()
+
     def wait_for_server_to_purge_messages(self, manager1, manager2):
         # Wait a little bit just to have time to purge message stored in the server
         CoreManager.wait_for_until(manager1, manager2, lambda manager1, manager2: False, 100)
diff --git a/tools/python/unittests/test_presence.py b/tools/python/unittests/test_presence.py
index 3de4e2e2a..192dbae0f 100644
--- a/tools/python/unittests/test_presence.py
+++ b/tools/python/unittests/test_presence.py
@@ -21,6 +21,10 @@ class TestPresence:
         base, ext = os.path.splitext(os.path.basename(__file__))
         cls.logger = Logger(base + '.log')
 
+    @classmethod
+    def teardown_class(cls):
+        linphone.testing.clean_accounts()
+
     def subscribe_to_callee_presence(self, caller_mgr, callee_mgr):
         initial_caller_stats = deepcopy(caller_mgr.stats)
         initial_callee_stats = deepcopy(callee_mgr.stats)
diff --git a/tools/python/unittests/test_register.py b/tools/python/unittests/test_register.py
index 2660fbf1c..6d444e70b 100644
--- a/tools/python/unittests/test_register.py
+++ b/tools/python/unittests/test_register.py
@@ -81,6 +81,10 @@ class TestRegister:
         base, ext = os.path.splitext(os.path.basename(__file__))
         cls.logger = Logger(base + '.log')
 
+    @classmethod
+    def teardown_class(cls):
+        linphone.testing.clean_accounts()
+
     def test_simple_register(self):
         cm = RegisterCoreManager(logger=TestRegister.logger)
         cm.register_with_refresh(False, None, None)
diff --git a/tools/python/unittests/test_setup.py b/tools/python/unittests/test_setup.py
index ff710217f..bb3d29c63 100644
--- a/tools/python/unittests/test_setup.py
+++ b/tools/python/unittests/test_setup.py
@@ -10,6 +10,10 @@ class TestSetup:
         base, ext = os.path.splitext(os.path.basename(__file__))
         cls.logger = Logger(base + '.log')
 
+    @classmethod
+    def teardown_class(cls):
+        linphone.testing.clean_accounts()
+
     def test_address(self):
         create_address(None)
 

From 180de834ee72c1854fd5571c23eb91ec87431970 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Mon, 8 Dec 2014 14:31:17 +0100
Subject: [PATCH 118/496] Revert "Handle accounts manager to the Python module
 unit tests."

This reverts commit b61302f9b1e0563e34bcb392fbaa1c3483dc3c73.
---
 tester/accountmanager.c                       | 16 ++----
 tester/liblinphone_tester.h                   |  1 -
 .../linphone_testing_module.mustache          | 52 -------------------
 tools/python/unittests/linphonetester.py      |  1 -
 tools/python/unittests/test_call.py           |  4 --
 tools/python/unittests/test_message.py        |  4 --
 tools/python/unittests/test_presence.py       |  4 --
 tools/python/unittests/test_register.py       |  4 --
 tools/python/unittests/test_setup.py          |  4 --
 9 files changed, 5 insertions(+), 85 deletions(-)

diff --git a/tester/accountmanager.c b/tester/accountmanager.c
index 23794a6db..a3086f9cf 100644
--- a/tester/accountmanager.c
+++ b/tester/accountmanager.c
@@ -201,22 +201,16 @@ LinphoneAddress *account_manager_check_account(AccountManager *m, LinphoneProxyC
 	return account->modified_identity;
 }
 
-LinphoneAddress * account_manager_check_accounts(LinphoneCore *lc, LinphoneAddress *identity){
+void linphone_core_manager_check_accounts(LinphoneCoreManager *m){
 	const MSList *it;
 	AccountManager *am=account_manager_get();
 
-	for(it=linphone_core_get_proxy_config_list(lc);it!=NULL;it=it->next){
+	for(it=linphone_core_get_proxy_config_list(m->lc);it!=NULL;it=it->next){
 		LinphoneProxyConfig *cfg=(LinphoneProxyConfig *)it->data;
 		LinphoneAddress *modified_identity=account_manager_check_account(am,cfg);
-		if (identity){
-			linphone_address_unref(identity);
+		if (m->identity){
+			linphone_address_unref(m->identity);
 		}
-		identity=linphone_address_ref(modified_identity);
+		m->identity=linphone_address_ref(modified_identity);
 	}
-
-	return identity;
-}
-
-void linphone_core_manager_check_accounts(LinphoneCoreManager *m){
-	m->identity=account_manager_check_accounts(m->lc,m->identity);
 }
diff --git a/tester/liblinphone_tester.h b/tester/liblinphone_tester.h
index f776c21c8..12531a57f 100644
--- a/tester/liblinphone_tester.h
+++ b/tester/liblinphone_tester.h
@@ -279,7 +279,6 @@ void liblinphone_tester_check_rtcp(LinphoneCoreManager* caller, LinphoneCoreMana
 void liblinphone_tester_clock_start(MSTimeSpec *start);
 bool_t liblinphone_tester_clock_elapsed(const MSTimeSpec *start, int value_ms);
 void linphone_core_manager_check_accounts(LinphoneCoreManager *m);
-LinphoneAddress * account_manager_check_accounts(LinphoneCore *lc, LinphoneAddress *identity);
 void account_manager_destroy(void);
 LinphoneCore* configure_lc_from(LinphoneCoreVTable* v_table, const char* path, const char* file, void* user_data);
 #ifdef ANDROID
diff --git a/tools/python/apixml2python/linphone_testing_module.mustache b/tools/python/apixml2python/linphone_testing_module.mustache
index 81b96f96d..b68f8a558 100644
--- a/tools/python/apixml2python/linphone_testing_module.mustache
+++ b/tools/python/apixml2python/linphone_testing_module.mustache
@@ -1,54 +1,4 @@
 #include "private.h"
-#include "liblinphone_tester.h"
-
-static PyObject * pylinphone_testing_module_method_check_accounts(PyObject *self, PyObject *args) {
-	PyObject *_core;
-	PyObject *_identity;
-	PyObject * pyresult;
-	PyObject * pyret;
-	LinphoneCore *_core_native_ptr;
-	LinphoneAddress *_identity_native_ptr;
-
-	if (!PyArg_ParseTuple(args, "OO", &_core, &_identity)) {
-		return NULL;
-	}
-	if ((_core != Py_None) && !PyObject_IsInstance(_core, (PyObject *)&pylinphone_CoreType)) {
-		PyErr_SetString(PyExc_TypeError, "The '_core' argument must be a linphone.Core instance.");
-		return NULL;
-	}
-	if ((_core != Py_None) && !PyObject_IsInstance(_identity, (PyObject *)&pylinphone_AddressType)) {
-		PyErr_SetString(PyExc_TypeError, "The '_identity' argument must be a linphone.Address instance.");
-		return NULL;
-	}
-
-	if ((_core != NULL) && (_core != Py_None)) {
-		if ((_core_native_ptr = pylinphone_Core_get_native_ptr(_core)) == NULL) {
-			return NULL;
-		}
-	}
-	if ((_identity != NULL) && (_identity != Py_None)) {
-		if ((_identity_native_ptr = pylinphone_Address_get_native_ptr(_core)) == NULL) {
-			return NULL;
-		}
-	}
-
-	pylinphone_trace(1, "[PYLINPHONE] >>> %s(%p [%p], %p [%p])", __FUNCTION__, _core, _core_native_ptr, _identity, _identity_native_ptr);
-	_identity_native_ptr = account_manager_check_accounts(_core_native_ptr, _identity_native_ptr);
-	pylinphone_dispatch_messages();
-	pyresult = pylinphone_Address_from_native_ptr(&pylinphone_AddressType, _identity_native_ptr);
-	pyret = Py_BuildValue("O", pyresult);
-
-	pylinphone_trace(-1, "[PYLINPHONE] <<< %s -> %p", __FUNCTION__, pyret);
-	return pyret;
-}
-
-static PyObject * pylinphone_testing_module_method_clean_accounts(PyObject *self, PyObject *args) {
-	pylinphone_trace(1, "[PYLINPHONE] >>> %s()", __FUNCTION__);
-	account_manager_destroy();
-	pylinphone_dispatch_messages();
-	pylinphone_trace(-1, "[PYLINPHONE] <<< %s -> None", __FUNCTION__);
-	Py_RETURN_NONE;
-}
 
 static PyObject * pylinphone_testing_module_method_set_dns_user_hosts_file(PyObject *self, PyObject *args) {
 	PyObject *_core;
@@ -78,8 +28,6 @@ static PyObject * pylinphone_testing_module_method_set_dns_user_hosts_file(PyObj
 }
 
 static PyMethodDef pylinphone_TestingModuleMethods[] = {
-	{ "check_accounts", pylinphone_testing_module_method_check_accounts, METH_VARARGS, "Checks that testing SIP accounts are created or creates them." },
-	{ "clean_accounts", pylinphone_testing_module_method_clean_accounts, METH_VARARGS, "Cleans the testing SIP accounts." },
 	{ "set_dns_user_hosts_file", pylinphone_testing_module_method_set_dns_user_hosts_file, METH_VARARGS, "Allows to set a user specified hosts file." },
 	/* Sentinel */
 	{ NULL, NULL, 0, NULL }
diff --git a/tools/python/unittests/linphonetester.py b/tools/python/unittests/linphonetester.py
index 8ed12e7f7..fcd485c79 100644
--- a/tools/python/unittests/linphonetester.py
+++ b/tools/python/unittests/linphonetester.py
@@ -493,7 +493,6 @@ class CoreManager:
             assert_equals(os.path.isfile(filepath), True)
         lc = linphone.Core.new(vtable, None, filepath)
         linphone.testing.set_dns_user_hosts_file(lc, os.path.join(resources_path, 'tester_hosts'))
-        self.identity = linphone.testing.check_accounts(lc, self.identity)
         lc.root_ca = os.path.join(resources_path, 'certificates', 'cn', 'cafile.pem')
         lc.ring = os.path.join(resources_path, 'sounds', 'oldphone.wav')
         lc.ringback = os.path.join(resources_path, 'sounds', 'ringback.wav')
diff --git a/tools/python/unittests/test_call.py b/tools/python/unittests/test_call.py
index b02daefea..93dfd1175 100644
--- a/tools/python/unittests/test_call.py
+++ b/tools/python/unittests/test_call.py
@@ -12,10 +12,6 @@ class TestCall:
         base, ext = os.path.splitext(os.path.basename(__file__))
         cls.logger = Logger(base + '.log')
 
-    @classmethod
-    def teardown_class(cls):
-        linphone.testing.clean_accounts()
-
     def test_early_declined_call(self):
         marie = CoreManager('marie_rc', logger=TestCall.logger)
         pauline = CoreManager('pauline_rc', logger=TestCall.logger)
diff --git a/tools/python/unittests/test_message.py b/tools/python/unittests/test_message.py
index 04c6fa260..56a7e9e17 100644
--- a/tools/python/unittests/test_message.py
+++ b/tools/python/unittests/test_message.py
@@ -13,10 +13,6 @@ class TestMessage:
         base, ext = os.path.splitext(os.path.basename(__file__))
         cls.logger = Logger(base + '.log')
 
-    @classmethod
-    def teardown_class(cls):
-        linphone.testing.clean_accounts()
-
     def wait_for_server_to_purge_messages(self, manager1, manager2):
         # Wait a little bit just to have time to purge message stored in the server
         CoreManager.wait_for_until(manager1, manager2, lambda manager1, manager2: False, 100)
diff --git a/tools/python/unittests/test_presence.py b/tools/python/unittests/test_presence.py
index 192dbae0f..3de4e2e2a 100644
--- a/tools/python/unittests/test_presence.py
+++ b/tools/python/unittests/test_presence.py
@@ -21,10 +21,6 @@ class TestPresence:
         base, ext = os.path.splitext(os.path.basename(__file__))
         cls.logger = Logger(base + '.log')
 
-    @classmethod
-    def teardown_class(cls):
-        linphone.testing.clean_accounts()
-
     def subscribe_to_callee_presence(self, caller_mgr, callee_mgr):
         initial_caller_stats = deepcopy(caller_mgr.stats)
         initial_callee_stats = deepcopy(callee_mgr.stats)
diff --git a/tools/python/unittests/test_register.py b/tools/python/unittests/test_register.py
index 6d444e70b..2660fbf1c 100644
--- a/tools/python/unittests/test_register.py
+++ b/tools/python/unittests/test_register.py
@@ -81,10 +81,6 @@ class TestRegister:
         base, ext = os.path.splitext(os.path.basename(__file__))
         cls.logger = Logger(base + '.log')
 
-    @classmethod
-    def teardown_class(cls):
-        linphone.testing.clean_accounts()
-
     def test_simple_register(self):
         cm = RegisterCoreManager(logger=TestRegister.logger)
         cm.register_with_refresh(False, None, None)
diff --git a/tools/python/unittests/test_setup.py b/tools/python/unittests/test_setup.py
index bb3d29c63..ff710217f 100644
--- a/tools/python/unittests/test_setup.py
+++ b/tools/python/unittests/test_setup.py
@@ -10,10 +10,6 @@ class TestSetup:
         base, ext = os.path.splitext(os.path.basename(__file__))
         cls.logger = Logger(base + '.log')
 
-    @classmethod
-    def teardown_class(cls):
-        linphone.testing.clean_accounts()
-
     def test_address(self):
         create_address(None)
 

From 0e924f4b4e85f51da43cfc3d7ced2713ef107902 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Mon, 8 Dec 2014 15:49:43 +0100
Subject: [PATCH 119/496] Handle testing accounts creation in Python.

---
 .../linphone_testing_module.mustache          |  20 +++
 tools/python/unittests/linphonetester.py      | 146 ++++++++++++++++--
 2 files changed, 151 insertions(+), 15 deletions(-)

diff --git a/tools/python/apixml2python/linphone_testing_module.mustache b/tools/python/apixml2python/linphone_testing_module.mustache
index b68f8a558..454c81fb2 100644
--- a/tools/python/apixml2python/linphone_testing_module.mustache
+++ b/tools/python/apixml2python/linphone_testing_module.mustache
@@ -1,5 +1,24 @@
 #include "private.h"
 
+static PyObject * pylinphone_testing_module_method_get_random_token(PyObject *self, PyObject *args) {
+	PyObject *pyret;
+	char * cresult;
+	int _len;
+
+	if (!PyArg_ParseTuple(args, "i", &_len)) {
+		return NULL;
+	}
+
+	pylinphone_trace(1, "[PYLINPHONE] >>> %s(%d)", __FUNCTION__, _len);
+	cresult = sal_get_random_token(_len);
+	pylinphone_dispatch_messages();
+
+	pyret = Py_BuildValue("z", cresult);
+	ms_free(cresult);
+	pylinphone_trace(-1, "[PYLINPHONE] <<< %s -> %p", __FUNCTION__, pyret);
+	return pyret;
+}
+
 static PyObject * pylinphone_testing_module_method_set_dns_user_hosts_file(PyObject *self, PyObject *args) {
 	PyObject *_core;
 	char *_path;
@@ -28,6 +47,7 @@ static PyObject * pylinphone_testing_module_method_set_dns_user_hosts_file(PyObj
 }
 
 static PyMethodDef pylinphone_TestingModuleMethods[] = {
+	{ "get_random_token", pylinphone_testing_module_method_get_random_token, METH_VARARGS, "Gets a random token of the specified length." },
 	{ "set_dns_user_hosts_file", pylinphone_testing_module_method_set_dns_user_hosts_file, METH_VARARGS, "Allows to set a user specified hosts file." },
 	/* Sentinel */
 	{ NULL, NULL, 0, NULL }
diff --git a/tools/python/unittests/linphonetester.py b/tools/python/unittests/linphonetester.py
index fcd485c79..1edbddf94 100644
--- a/tools/python/unittests/linphonetester.py
+++ b/tools/python/unittests/linphonetester.py
@@ -4,6 +4,7 @@ from copy import deepcopy
 import linphone
 import logging
 import os
+import sys
 import time
 
 
@@ -51,6 +52,114 @@ class Logger(logging.Logger):
         method(msg)
 
 
+class Account:
+    def __init__(self, id_addr, unique_id):
+        self.created = False
+        self.done = False
+        self.auth_requested = False
+        self.identity = id_addr.clone()
+        self.password = linphone.testing.get_random_token(8)
+        self.modified_identity = id_addr.clone()
+        modified_username = "{username}_{unique_id}".format(username=id_addr.username, unique_id=unique_id)
+        self.modified_identity.username = modified_username
+
+
+class AccountManager:
+    def __init__(self):
+        self.unique_id = linphone.testing.get_random_token(6)
+        self.accounts = []
+
+    @classmethod
+    def wait_for_until(cls, lc1, lc2, func, timeout):
+        lcs = []
+        if lc1 is not None:
+            lcs.append(lc1)
+        if lc2 is not None:
+            lcs.append(lc2)
+        return cls.wait_for_list(lcs, func, timeout)
+
+    @classmethod
+    def wait_for_list(cls, lcs, func, timeout):
+        start = datetime.now()
+        end = start + timedelta(milliseconds = timeout)
+        res = func(*lcs)
+        while not res and datetime.now() < end:
+            for lc in lcs:
+                lc.iterate()
+            time.sleep(0.02)
+            res = func(*lcs)
+        return res
+
+    @classmethod
+    def account_created_on_server_cb(cls, lc, cfg, state, message):
+        if state == linphone.RegistrationOk:
+            lc.user_data.created = True
+        elif state == linphone.RegistrationCleared:
+            lc.user_data.done = True
+
+    @classmethod
+    def account_created_auth_requested_cb(cls, lc, realm, username, domain):
+        lc.user_data.auth_requested = True
+
+    def check_account(self, cfg, logger=None):
+        create_account = False
+        lc = cfg.core
+        identity = cfg.identity
+        id_addr = linphone.Address.new(identity)
+        account = get_account(id_addr)
+        if account is None:
+            if logger is not None:
+                logger.info("No account for {identity} exists, going to create one.".format(identity=identity))
+            account = Account(id_addr, self.unique_id)
+            self.accounts.append(account)
+            create_account = True
+        cfg.identity = account.modified_identity.as_string()
+        if create_account:
+            self._create_account_on_server(account, cfg, logger)
+        ai = linphone.AuthInfo.new(account.modified_identity.username, None, account.password, None, None, account.modified_identity.domain)
+        lc.add_auth_info(ai)
+        return account.modified_identity
+
+    def _create_account_on_server(self, account, refcfg, logger=None):
+        vtable = {}
+        tmp_identity = account.modified_identity.clone()
+        vtable['registration_state_changed'] = AccountManager.account_created_on_server_cb
+        vtable['auth_info_requested'] = AccountManager.account_created_auth_requested_cb
+        lc = CoreManager.configure_lc_from(vtable, tester_resources_path, None, account)
+        cfg = lc.create_proxy_config()
+        tmp_identity.password = account.password
+        tmp_identity.set_header("X-Create-Account", "yes")
+        cfg.identity = tmp_identity.as_string()
+        server_addr = linphone.Address.new(refcfg.server_addr)
+        server_addr.transport = linphone.TransportType.TransportTcp;
+        server_addr.port = 0
+        cfg.server_addr = server_addr.as_string()
+        cfg.expires = 3600
+        lc.add_proxy_config(cfg)
+        if AccountManager.wait_for_until(lc, None, lambda lc: lc.user_data.auth_requested == True, 10000) != True:
+            if logger is not None:
+                logger.critical("[TESTER] Account for {identity} could not be created on server.".format(identity=refcfg.identity))
+            sys.exit(-1)
+        cfg.stop_refreshing()
+        cfg.edit()
+        cfg.identity = account.modified_identity.as_string()
+        cfg.done()
+        ai = linphone.AuthInfo.new(account.modified_identity.username, None, account.password, None, None, account.modified_identity.domain)
+        lc.add_auth_info(ai)
+        if AccountManager.wait_for_until(lc, None, lambda lc: lc.user_data.created == True, 3000) != True:
+            if logger is not None:
+                logger.critical("[TESTER] Account for {identity} is not working on server.".format(identity=refcfg.identity))
+            sys.exit(-1)
+        lc.remove_proxy_config(cfg)
+        if AccountManager.wait_for_until(lc, None, lambda lc: lc.user_data.done == True, 3000) != True:
+            if logger is not None:
+                logger.critical("[TESTER] Account creation could not clean the registration context.")
+            sys.exit(-1)
+
+
+account_manager = AccountManager()
+
+
 class CoreManagerStats:
     def __init__(self):
         self.reset()
@@ -162,6 +271,21 @@ class CoreManagerStats:
 
 class CoreManager:
 
+    @classmethod
+    def configure_lc_from(vtable, resources_path, rc_path, user_data=None):
+        filepath = None
+        if rc_path is not None:
+            filepath = os.path.join(resources_path, rc_path)
+            assert_equals(os.path.isfile(filepath), True)
+        lc = linphone.Core.new(vtable, None, filepath)
+        linphone.testing.set_dns_user_hosts_file(lc, os.path.join(resources_path, 'tester_hosts'))
+        lc.root_ca = os.path.join(resources_path, 'certificates', 'cn', 'cafile.pem')
+        lc.ring = os.path.join(resources_path, 'sounds', 'oldphone.wav')
+        lc.ringback = os.path.join(resources_path, 'sounds', 'ringback.wav')
+        lc.static_picture = os.path.join(resources_path, 'images', 'nowebcamCIF.jpg')
+        lc.user_data = user_data
+        return lc
+
     @classmethod
     def wait_for_until(cls, manager1, manager2, func, timeout):
         managers = []
@@ -468,8 +592,8 @@ class CoreManager:
         rc_path = None
         if rc_file is not None:
             rc_path = os.path.join('rcfiles', rc_file)
-        self.lc = self.configure_lc_from(vtable, tester_resources_path, rc_path)
-        self.lc.user_data = self
+        self.lc = CoreManager.configure_lc_from(vtable, tester_resources_path, rc_path, self)
+        self.check_accounts()
         if check_for_proxies and rc_file is not None:
             proxy_count = len(self.lc.proxy_config_list)
         else:
@@ -486,19 +610,6 @@ class CoreManager:
     def stop(self):
         self.lc = None
 
-    def configure_lc_from(self, vtable, resources_path, rc_path):
-        filepath = None
-        if rc_path is not None:
-            filepath = os.path.join(resources_path, rc_path)
-            assert_equals(os.path.isfile(filepath), True)
-        lc = linphone.Core.new(vtable, None, filepath)
-        linphone.testing.set_dns_user_hosts_file(lc, os.path.join(resources_path, 'tester_hosts'))
-        lc.root_ca = os.path.join(resources_path, 'certificates', 'cn', 'cafile.pem')
-        lc.ring = os.path.join(resources_path, 'sounds', 'oldphone.wav')
-        lc.ringback = os.path.join(resources_path, 'sounds', 'ringback.wav')
-        lc.static_picture = os.path.join(resources_path, 'images', 'nowebcamCIF.jpg')
-        return lc
-
     def enable_audio_codec(self, mime, rate):
         codecs = self.lc.audio_codecs
         for codec in codecs:
@@ -510,3 +621,8 @@ class CoreManager:
 
     def disable_all_audio_codecs_except_one(self, mime):
         self.enable_audio_codec(mime, -1)
+
+    def check_accounts(self):
+        pcl = self.lc.proxy_config_list
+        for cfg in pcl:
+            self.identity = account_manager.check_account(cfg, self.logger)

From 6c85f0edf98590dbae9b472cb91a79ca5942bb99 Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Mon, 8 Dec 2014 16:11:23 +0100
Subject: [PATCH 120/496] Add documentation for wrapper generation

---
 coreapi/linphonecore.h | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h
index 0daf1f03b..098d539a2 100644
--- a/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@ -1431,8 +1431,23 @@ LINPHONE_PUBLIC	void linphone_chat_room_send_message2(LinphoneChatRoom *cr, Linp
 LINPHONE_PUBLIC void linphone_chat_room_send_chat_message(LinphoneChatRoom *cr, LinphoneChatMessage *msg);
 LINPHONE_PUBLIC void linphone_chat_room_update_url(LinphoneChatRoom *cr, LinphoneChatMessage *msg);
 LINPHONE_PUBLIC MSList *linphone_chat_room_get_history(LinphoneChatRoom *cr,int nb_message);
+
+/**
+ * Mark all messages of the conversation as read
+ * @param[in] cr The #LinphoneChatRoom object corresponding to the conversation.
+ */
 LINPHONE_PUBLIC void linphone_chat_room_mark_as_read(LinphoneChatRoom *cr);
+/**
+ * Delete a message from the chat room history.
+ * @param[in] cr The #LinphoneChatRoom object corresponding to the conversation.
+ * @param[in] msg The #LinphoneChatMessage object to remove. 
+ */
+
 LINPHONE_PUBLIC void linphone_chat_room_delete_message(LinphoneChatRoom *cr, LinphoneChatMessage *msg);
+/**
+ * Delete all messages from the history
+ * @param[in] cr The #LinphoneChatRoom object corresponding to the conversation.
+ */
 LINPHONE_PUBLIC void linphone_chat_room_delete_history(LinphoneChatRoom *cr);
 /**
  * Gets the number of messages in a chat room.
@@ -1463,6 +1478,11 @@ LINPHONE_PUBLIC void linphone_chat_room_compose(LinphoneChatRoom *cr);
  */
 LINPHONE_PUBLIC bool_t linphone_chat_room_is_remote_composing(const LinphoneChatRoom *cr);
 
+/**
+ * Gets the number of unread messages in the chatroom.
+ * @param[in] cr The "LinphoneChatRoom object corresponding to the conversation.
+ * @return the number of unread messages.
+ */
 LINPHONE_PUBLIC int linphone_chat_room_get_unread_messages_count(LinphoneChatRoom *cr);
 LINPHONE_PUBLIC LinphoneCore* linphone_chat_room_get_lc(LinphoneChatRoom *cr);
 LINPHONE_PUBLIC LinphoneCore* linphone_chat_room_get_core(LinphoneChatRoom *cr);

From fc107e780518931e5c0772a44d30d6e064149175 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Mon, 8 Dec 2014 17:22:24 +0100
Subject: [PATCH 121/496] fix unused variables

---
 coreapi/linphonecore_jni.cc | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index adc3ada56..0e0c11891 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -2501,7 +2501,6 @@ JNIEXPORT jint JNICALL Java_org_linphone_core_LinphoneCallImpl_getTransferState(
  */
 JNIEXPORT jobject JNICALL Java_org_linphone_core_LinphoneCallImpl_getTransfererCall(JNIEnv *env, jobject jCall, jlong callptr){
 	LinphoneCall *call=(LinphoneCall*)callptr;
-	LinphoneCore *lc=linphone_call_get_core(call);
 	LinphoneCall *ret=linphone_call_get_transferer_call(call);
 	return getCall(env,ret);
 }
@@ -2513,7 +2512,6 @@ JNIEXPORT jobject JNICALL Java_org_linphone_core_LinphoneCallImpl_getTransfererC
  */
 JNIEXPORT jobject JNICALL Java_org_linphone_core_LinphoneCallImpl_getTransferTargetCall(JNIEnv *env, jobject jCall, jlong callptr){
 	LinphoneCall *call=(LinphoneCall*)callptr;
-	LinphoneCore *lc=linphone_call_get_core(call);
 	LinphoneCall *ret=linphone_call_get_transfer_target_call(call);
 	return getCall(env,ret);
 }
@@ -2990,7 +2988,6 @@ static void chat_room_impl_callback(LinphoneChatMessage* msg, LinphoneChatMessag
 	jclass clazz = (jclass) env->GetObjectClass(listener);
 	jmethodID method = env->GetMethodID(clazz, "onLinphoneChatMessageStateChanged","(Lorg/linphone/core/LinphoneChatMessage;Lorg/linphone/core/LinphoneChatMessage$State;)V");
 	jobject jmessage=(jobject)linphone_chat_message_get_user_data(msg);
-	LinphoneCore *lc = linphone_chat_room_get_lc(linphone_chat_message_get_chat_room(msg));
 	
 	jclass chatMessageStateClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneChatMessage$State"));
 	jmethodID chatMessageStateFromIntId = env->GetStaticMethodID(chatMessageStateClass,"fromInt","(I)Lorg/linphone/core/LinphoneChatMessage$State;");

From 273207b25c2087d665f45f3793c625dc5bf83545 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Mon, 8 Dec 2014 18:07:00 +0100
Subject: [PATCH 122/496] differentiate rtp/rtcp bandwidth reporting

---
 coreapi/linphonecall.c | 13 ++++++++++++-
 coreapi/linphonecore.h |  2 ++
 mediastreamer2         |  2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index dc991c616..e6254e93a 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -2782,13 +2782,24 @@ static void report_bandwidth(LinphoneCall *call, MediaStream *as, MediaStream *v
 	call->stats[LINPHONE_CALL_STATS_AUDIO].upload_bandwidth=(as!=NULL) ? (media_stream_get_up_bw(as)*1e-3) : 0;
 	call->stats[LINPHONE_CALL_STATS_VIDEO].download_bandwidth=(vs!=NULL) ? (media_stream_get_down_bw(vs)*1e-3) : 0;
 	call->stats[LINPHONE_CALL_STATS_VIDEO].upload_bandwidth=(vs!=NULL) ? (media_stream_get_up_bw(vs)*1e-3) : 0;
-	ms_message("bandwidth usage for call [%p]: audio=[d=%.1f,u=%.1f] video=[d=%.1f,u=%.1f] kbit/sec",
+	call->stats[LINPHONE_CALL_STATS_AUDIO].rtcp_download_bandwidth=(as!=NULL) ? (media_stream_get_rtcp_down_bw(as)*1e-3) : 0;
+	call->stats[LINPHONE_CALL_STATS_AUDIO].rtcp_upload_bandwidth=(as!=NULL) ? (media_stream_get_rtcp_up_bw(as)*1e-3) : 0;
+	call->stats[LINPHONE_CALL_STATS_VIDEO].rtcp_download_bandwidth=(vs!=NULL) ? (media_stream_get_rtcp_down_bw(vs)*1e-3) : 0;
+	call->stats[LINPHONE_CALL_STATS_VIDEO].rtcp_upload_bandwidth=(vs!=NULL) ? (media_stream_get_rtcp_up_bw(vs)*1e-3) : 0;
+
+	ms_message("Bandwidth usage for call [%p]: audio[ rtp]=[d=%.1f,u=%.1f], video[ rtp]=[d=%.1f,u=%.1f] kbit/sec",
 		call,
 		call->stats[LINPHONE_CALL_STATS_AUDIO].download_bandwidth,
 		call->stats[LINPHONE_CALL_STATS_AUDIO].upload_bandwidth ,
 		call->stats[LINPHONE_CALL_STATS_VIDEO].download_bandwidth,
 		call->stats[LINPHONE_CALL_STATS_VIDEO].upload_bandwidth
 	);
+	ms_message("                                             [rtcp]=[d=%.1f,u=%.1f], video[rtcp]=[d=%.1f,u=%.1f] kbit/sec",
+		call->stats[LINPHONE_CALL_STATS_AUDIO].rtcp_download_bandwidth,
+		call->stats[LINPHONE_CALL_STATS_AUDIO].rtcp_upload_bandwidth ,
+		call->stats[LINPHONE_CALL_STATS_VIDEO].rtcp_download_bandwidth,
+		call->stats[LINPHONE_CALL_STATS_VIDEO].rtcp_upload_bandwidth
+	);
 }
 
 static void linphone_core_disconnected(LinphoneCore *lc, LinphoneCall *call){
diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h
index 098d539a2..515bbcf7e 100644
--- a/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@ -539,6 +539,8 @@ struct _LinphoneCallStats {
 	float local_late_rate; /**<percentage of packet received too late over last second*/
 	float local_loss_rate; /**<percentage of lost packet over last second*/
 	int updated; /**< Tell which RTCP packet has been updated (received_rtcp or sent_rtcp). Can be either LINPHONE_CALL_STATS_RECEIVED_RTCP_UPDATE or LINPHONE_CALL_STATS_SENT_RTCP_UPDATE */
+	float rtcp_download_bandwidth; /**<RTCP download bandwidth measurement of received stream, expressed in kbit/s, including IP/UDP/RTP headers*/
+	float rtcp_upload_bandwidth; /**<RTCP download bandwidth measurement of sent stream, expressed in kbit/s, including IP/UDP/RTP headers*/
 };
 
 /**
diff --git a/mediastreamer2 b/mediastreamer2
index 19cd01c94..e615c7489 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 19cd01c941af61b791636ac941f75787884c2e6f
+Subproject commit e615c74896a34f5457a1a8cc111cf890b310cd97

From 6b2be053e9e9dfeea34d28679d4bab68068f97f7 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Tue, 9 Dec 2014 10:14:33 +0100
Subject: [PATCH 123/496] Improve change of identity of a proxy config.

- Add the function linphone_address_equal().
- The comparison of two proxy config addresses now returns one of these three values: equal, weak-equal or different.
- If the new proxy config identity is equal to the previous one, a call to linphone_proxy_config_done() does not
unregister and does not delete the sal op. If it's weak-equal the sal op is destroyed but the unregister is not
done. Finally, if it's different the unregister is performed and the sal op is destroyed.
---
 coreapi/address.c       | 26 +++++++++++++++++++++++-
 coreapi/linphonecore.h  |  1 +
 coreapi/private.h       | 10 ++++++++--
 coreapi/proxy.c         | 44 +++++++++++++++++++++++------------------
 tester/accountmanager.c |  6 +++++-
 tester/setup_tester.c   | 30 ++++++++++++++++------------
 6 files changed, 81 insertions(+), 36 deletions(-)

diff --git a/coreapi/address.c b/coreapi/address.c
index 6530551ea..764a8fb24 100644
--- a/coreapi/address.c
+++ b/coreapi/address.c
@@ -167,7 +167,10 @@ static bool_t strings_equals(const char *s1, const char *s2){
 
 /**
  * Compare two LinphoneAddress ignoring tags and headers, basically just domain, username, and port.
- * Returns TRUE if they are equal.
+ * @param[in] a1 LinphoneAddress object
+ * @param[in] a2 LinphoneAddress object
+ * @return Boolean value telling if the LinphoneAddress objects are equal.
+ * @see linphone_address_equal()
 **/
 bool_t linphone_address_weak_equal(const LinphoneAddress *a1, const LinphoneAddress *a2){
 	const char *u1,*u2;
@@ -182,6 +185,27 @@ bool_t linphone_address_weak_equal(const LinphoneAddress *a1, const LinphoneAddr
 	return strings_equals(u1,u2) && strings_equals(h1,h2) && p1==p2;
 }
 
+/**
+ * Compare two LinphoneAddress taking the tags and headers into account.
+ * @param[in] a1 LinphoneAddress object
+ * @param[in] a2 LinphoneAddress object
+ * @return Boolean value telling if the LinphoneAddress objects are equal.
+ * @see linphone_address_weak_equal()
+ */
+bool_t linphone_address_equal(const LinphoneAddress *a1, const LinphoneAddress *a2) {
+	char *s1;
+	char *s2;
+	bool_t res;
+	if ((a1 == NULL) && (a2 == NULL)) return TRUE;
+	if ((a1 == NULL) || (a2 == NULL)) return FALSE;
+	s1 = linphone_address_as_string(a1);
+	s2 = linphone_address_as_string(a2);
+	res = (strcmp(s1, s2) == 0) ? TRUE : FALSE;
+	ms_free(s1);
+	ms_free(s2);
+	return res;
+}
+
 /**
  * Destroys a LinphoneAddress object (actually calls linphone_address_unref()).
  * @deprecated Use linphone_address_unref() instead
diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h
index 515bbcf7e..448c9aa57 100644
--- a/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@ -400,6 +400,7 @@ LINPHONE_PUBLIC void linphone_address_set_transport(LinphoneAddress *uri,Linphon
 LINPHONE_PUBLIC	char *linphone_address_as_string(const LinphoneAddress *u);
 LINPHONE_PUBLIC	char *linphone_address_as_string_uri_only(const LinphoneAddress *u);
 LINPHONE_PUBLIC	bool_t linphone_address_weak_equal(const LinphoneAddress *a1, const LinphoneAddress *a2);
+LINPHONE_PUBLIC bool_t linphone_address_equal(const LinphoneAddress *a1, const LinphoneAddress *a2);
 LINPHONE_PUBLIC void linphone_address_set_password(LinphoneAddress *addr, const char *passwd);
 LINPHONE_PUBLIC const char *linphone_address_get_password(const LinphoneAddress *addr);
 LINPHONE_PUBLIC void linphone_address_set_header(LinphoneAddress *addr, const char *header_name, const char *header_value);
diff --git a/coreapi/private.h b/coreapi/private.h
index 424fa1f4e..3aa9b283d 100644
--- a/coreapi/private.h
+++ b/coreapi/private.h
@@ -445,8 +445,14 @@ bool_t linphone_core_symmetric_rtp_enabled(LinphoneCore*lc);
 
 void linphone_core_queue_task(LinphoneCore *lc, belle_sip_source_func_t task_fun, void *data, const char *task_description);
 
-LINPHONE_PUBLIC bool_t linphone_proxy_config_address_equal(const LinphoneAddress *a, const LinphoneAddress *b);
-LINPHONE_PUBLIC bool_t linphone_proxy_config_is_server_config_changed(const LinphoneProxyConfig* obj);
+typedef enum _LinphoneProxyConfigAddressComparisonResult{
+	LinphoneProxyConfigAddressDifferent,
+	LinphoneProxyConfigAddressEqual,
+	LinphoneProxyConfigAddressWeakEqual
+} LinphoneProxyConfigAddressComparisonResult;
+
+LINPHONE_PUBLIC LinphoneProxyConfigAddressComparisonResult linphone_proxy_config_address_equal(const LinphoneAddress *a, const LinphoneAddress *b);
+LINPHONE_PUBLIC LinphoneProxyConfigAddressComparisonResult linphone_proxy_config_is_server_config_changed(const LinphoneProxyConfig* obj);
 void _linphone_proxy_config_unregister(LinphoneProxyConfig *obj);
 void _linphone_proxy_config_release_ops(LinphoneProxyConfig *obj);
 
diff --git a/coreapi/proxy.c b/coreapi/proxy.c
index ca9c21c9d..275613477 100644
--- a/coreapi/proxy.c
+++ b/coreapi/proxy.c
@@ -41,33 +41,34 @@ static void linphone_proxy_config_store_server_config(LinphoneProxyConfig* obj)
 		obj->saved_proxy = NULL;
 }
 
-bool_t linphone_proxy_config_address_equal(const LinphoneAddress *a, const LinphoneAddress *b) {
+LinphoneProxyConfigAddressComparisonResult linphone_proxy_config_address_equal(const LinphoneAddress *a, const LinphoneAddress *b) {
 	if (a == NULL && b == NULL)
-		return TRUE;
+		return LinphoneProxyConfigAddressEqual;
 	else if (!a || !b)
-		return FALSE;
+		return LinphoneProxyConfigAddressDifferent;
 
+	if (linphone_address_equal(a,b))
+		return LinphoneProxyConfigAddressEqual;
 	if (linphone_address_weak_equal(a,b)) {
 		/*also check both transport and uri */
-		return linphone_address_is_secure(a) == linphone_address_is_secure(b) && linphone_address_get_transport(a) == linphone_address_get_transport(b);
-	} else
-		return FALSE; /*either username, domain or port ar not equals*/
-
+		if (linphone_address_is_secure(a) == linphone_address_is_secure(b) && linphone_address_get_transport(a) == linphone_address_get_transport(b))
+			return LinphoneProxyConfigAddressWeakEqual;
+		else
+			return LinphoneProxyConfigAddressDifferent;
+	}
+	return LinphoneProxyConfigAddressDifferent; /*either username, domain or port ar not equals*/
 }
 
-bool_t linphone_proxy_config_is_server_config_changed(const LinphoneProxyConfig* obj) {
+LinphoneProxyConfigAddressComparisonResult linphone_proxy_config_is_server_config_changed(const LinphoneProxyConfig* obj) {
 	LinphoneAddress *current_identity=obj->reg_identity?linphone_address_new(obj->reg_identity):NULL;
 	LinphoneAddress *current_proxy=obj->reg_proxy?linphone_address_new(obj->reg_proxy):NULL;
-	bool_t result=FALSE;
+	LinphoneProxyConfigAddressComparisonResult result=LinphoneProxyConfigAddressDifferent;
 
-	if (!linphone_proxy_config_address_equal(obj->saved_identity,current_identity)){
-		result=TRUE;
-		goto end;
-	}
-	if (!linphone_proxy_config_address_equal(obj->saved_proxy,current_proxy)){
-		result=TRUE;
-		goto end;
-	}
+	result = linphone_proxy_config_address_equal(obj->saved_identity,current_identity);
+	if (result == LinphoneProxyConfigAddressDifferent) goto end;
+
+	result = linphone_proxy_config_address_equal(obj->saved_proxy,current_proxy);
+	if (result == LinphoneProxyConfigAddressDifferent) goto end;
 
 	end:
 	if (current_identity) linphone_address_destroy(current_identity);
@@ -976,14 +977,19 @@ int linphone_proxy_config_normalize_number(LinphoneProxyConfig *proxy, const cha
 **/
 int linphone_proxy_config_done(LinphoneProxyConfig *obj)
 {
+	LinphoneProxyConfigAddressComparisonResult res;
+
 	if (!linphone_proxy_config_check(obj->lc,obj))
 		return -1;
 
 	/*check if server address as changed*/
-	if (linphone_proxy_config_is_server_config_changed(obj)) {
+	res = linphone_proxy_config_is_server_config_changed(obj);
+	if (res != LinphoneProxyConfigAddressEqual) {
 		/* server config has changed, need to unregister from previous first*/
 		if (obj->op) {
-			_linphone_proxy_config_unregister(obj);
+			if (res == LinphoneProxyConfigAddressDifferent) {
+				_linphone_proxy_config_unregister(obj);
+			}
 			sal_op_set_user_pointer(obj->op,NULL); /*we don't want to receive status for this un register*/
 			sal_op_unref(obj->op); /*but we keep refresher to handle authentication if needed*/
 			obj->op=NULL;
diff --git a/tester/accountmanager.c b/tester/accountmanager.c
index a3086f9cf..97cf8803b 100644
--- a/tester/accountmanager.c
+++ b/tester/accountmanager.c
@@ -118,10 +118,15 @@ void account_create_on_server(Account *account, const LinphoneProxyConfig *refcf
 	LinphoneAuthInfo *ai;
 	char *tmp;
 	LinphoneAddress *server_addr;
+	LCSipTransports tr;
 	
 	vtable.registration_state_changed=account_created_on_server_cb;
 	vtable.auth_info_requested=account_created_auth_requested_cb;
 	lc=configure_lc_from(&vtable,liblinphone_tester_file_prefix,NULL,account);
+	tr.udp_port=LC_SIP_TRANSPORT_RANDOM;
+	tr.tcp_port=LC_SIP_TRANSPORT_RANDOM;
+	tr.tls_port=LC_SIP_TRANSPORT_RANDOM;
+	linphone_core_set_sip_transports(lc,&tr);
 	
 	cfg=linphone_core_create_proxy_config(lc);
 	linphone_address_set_password(tmp_identity,account->password);
@@ -145,7 +150,6 @@ void account_create_on_server(Account *account, const LinphoneProxyConfig *refcf
 	if (wait_for_until(lc,NULL,&account->auth_requested,1,10000)==FALSE){
 		ms_fatal("Account for %s could not be created on server.", linphone_proxy_config_get_identity(refcfg));
 	}
-	linphone_proxy_config_stop_refreshing(cfg); /*so that op is destroyed; we need to remove the X-create-account*/
 	linphone_proxy_config_edit(cfg);
 	tmp=linphone_address_as_string(account->modified_identity);
 	linphone_proxy_config_set_identity(cfg,tmp); /*remove the X-Create-Account header*/
diff --git a/tester/setup_tester.c b/tester/setup_tester.c
index eaa9b6a97..21fcfd091 100644
--- a/tester/setup_tester.c
+++ b/tester/setup_tester.c
@@ -170,13 +170,17 @@ void linphone_proxy_config_address_equal_test() {
 	LinphoneAddress *c = linphone_address_new("sip:toto@titi;transport=tcp");
 	LinphoneAddress *d = linphone_address_new("sip:toto@titu");
 	LinphoneAddress *e = linphone_address_new("sip:toto@titi;transport=udp");
+	LinphoneAddress *f = linphone_address_new("sip:toto@titi?X-Create-Account=yes");
 
-	CU_ASSERT_FALSE(linphone_proxy_config_address_equal(a,NULL));
-	CU_ASSERT_FALSE(linphone_proxy_config_address_equal(a,b));
-	CU_ASSERT_FALSE(linphone_proxy_config_address_equal(a,c));
-	CU_ASSERT_FALSE(linphone_proxy_config_address_equal(a,d));
-	CU_ASSERT_TRUE(linphone_proxy_config_address_equal(a,e));
-	CU_ASSERT_TRUE(linphone_proxy_config_address_equal(NULL,NULL));
+	CU_ASSERT_EQUAL(linphone_proxy_config_address_equal(a,NULL), LinphoneProxyConfigAddressDifferent);
+	CU_ASSERT_EQUAL(linphone_proxy_config_address_equal(a,b), LinphoneProxyConfigAddressDifferent);
+	CU_ASSERT_EQUAL(linphone_proxy_config_address_equal(a,c), LinphoneProxyConfigAddressDifferent);
+	CU_ASSERT_EQUAL(linphone_proxy_config_address_equal(a,d), LinphoneProxyConfigAddressDifferent);
+	CU_ASSERT_EQUAL(linphone_proxy_config_address_equal(a,e), LinphoneProxyConfigAddressWeakEqual);
+	CU_ASSERT_EQUAL(linphone_proxy_config_address_equal(NULL,NULL), LinphoneProxyConfigAddressEqual);
+	CU_ASSERT_EQUAL(linphone_proxy_config_address_equal(a,f), LinphoneProxyConfigAddressWeakEqual);
+	CU_ASSERT_EQUAL(linphone_proxy_config_address_equal(c,f), LinphoneProxyConfigAddressDifferent);
+	CU_ASSERT_EQUAL(linphone_proxy_config_address_equal(e,f), LinphoneProxyConfigAddressWeakEqual);
 
 	linphone_address_destroy(a);
 	linphone_address_destroy(b);
@@ -192,36 +196,36 @@ void linphone_proxy_config_is_server_config_changed_test() {
 	linphone_proxy_config_set_identity(proxy_config,"sip:toto@titi");
 	linphone_proxy_config_edit(proxy_config);
 	linphone_proxy_config_set_identity(proxy_config,"sips:toto@titi");
-	CU_ASSERT_TRUE(linphone_proxy_config_is_server_config_changed(proxy_config));
+	CU_ASSERT_EQUAL(linphone_proxy_config_is_server_config_changed(proxy_config), LinphoneProxyConfigAddressDifferent);
 
 	linphone_proxy_config_set_server_addr(proxy_config,"sip:sip.linphone.org");
 	linphone_proxy_config_edit(proxy_config);
 	linphone_proxy_config_set_server_addr(proxy_config,"sip:toto.com");
-	CU_ASSERT_TRUE(linphone_proxy_config_is_server_config_changed(proxy_config));
+	CU_ASSERT_EQUAL(linphone_proxy_config_is_server_config_changed(proxy_config), LinphoneProxyConfigAddressDifferent);
 
 	linphone_proxy_config_set_server_addr(proxy_config,"sip:sip.linphone.org");
 	linphone_proxy_config_edit(proxy_config);
 	linphone_proxy_config_set_server_addr(proxy_config,"sip:sip.linphone.org:4444");
-	CU_ASSERT_TRUE(linphone_proxy_config_is_server_config_changed(proxy_config));
+	CU_ASSERT_EQUAL(linphone_proxy_config_is_server_config_changed(proxy_config), LinphoneProxyConfigAddressDifferent);
 
 	linphone_proxy_config_set_server_addr(proxy_config,"sip:sip.linphone.org");
 	linphone_proxy_config_edit(proxy_config);
 	linphone_proxy_config_set_server_addr(proxy_config,"sip:sip.linphone.org;transport=tcp");
-	CU_ASSERT_TRUE(linphone_proxy_config_is_server_config_changed(proxy_config));
+	CU_ASSERT_EQUAL(linphone_proxy_config_is_server_config_changed(proxy_config), LinphoneProxyConfigAddressDifferent);
 
 	linphone_proxy_config_set_server_addr(proxy_config,"sip:sip.linphone.org");
 	linphone_proxy_config_edit(proxy_config);
 	linphone_proxy_config_set_server_addr(proxy_config,"sip:sip.linphone.org;param=blue");
-	CU_ASSERT_FALSE(linphone_proxy_config_is_server_config_changed(proxy_config));
+	CU_ASSERT_EQUAL(linphone_proxy_config_is_server_config_changed(proxy_config), LinphoneProxyConfigAddressWeakEqual);
 
 
 	linphone_proxy_config_edit(proxy_config);
 	linphone_proxy_config_set_contact_parameters(proxy_config,"blabla=blue");
-	CU_ASSERT_FALSE(linphone_proxy_config_is_server_config_changed(proxy_config));
+	CU_ASSERT_EQUAL(linphone_proxy_config_is_server_config_changed(proxy_config), LinphoneProxyConfigAddressEqual);
 
 	linphone_proxy_config_edit(proxy_config);
 	linphone_proxy_config_enable_register(proxy_config,TRUE);
-	CU_ASSERT_FALSE(linphone_proxy_config_is_server_config_changed(proxy_config));
+	CU_ASSERT_EQUAL(linphone_proxy_config_is_server_config_changed(proxy_config), LinphoneProxyConfigAddressEqual);
 
 	linphone_proxy_config_destroy(proxy_config);
 }

From 2ff5e8612b9523d1fd9cb94af9160374db24347d Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Tue, 9 Dec 2014 10:57:29 +0100
Subject: [PATCH 124/496] Update oRTP and mediastreamer2 submodules.

---
 mediastreamer2 | 2 +-
 oRTP           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mediastreamer2 b/mediastreamer2
index e615c7489..b4c77370f 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit e615c74896a34f5457a1a8cc111cf890b310cd97
+Subproject commit b4c77370f549f2bd325df484ce123c9f75a44aac
diff --git a/oRTP b/oRTP
index 93607074c..5ab29c50a 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 93607074c723d6d5181e48d6d7989b1c39b9bb8b
+Subproject commit 5ab29c50adc7948b11449e3aeee66010379ff7dc

From 395448491a09d94e1854a0a2f3059df435de1d14 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Tue, 9 Dec 2014 11:21:12 +0100
Subject: [PATCH 125/496] Add LCSipTransports wrapper in the Python module.

---
 tools/python/apixml2python.py                 |   3 -
 .../handwritten_declarations.mustache         |  11 ++
 .../handwritten_definitions.mustache          | 119 ++++++++++++++++++
 tools/python/apixml2python/linphone.py        |   8 ++
 .../apixml2python/linphone_module.mustache    |   2 +
 5 files changed, 140 insertions(+), 3 deletions(-)

diff --git a/tools/python/apixml2python.py b/tools/python/apixml2python.py
index 728c45880..8d89b79c2 100755
--- a/tools/python/apixml2python.py
+++ b/tools/python/apixml2python.py
@@ -47,8 +47,6 @@ blacklisted_functions = [
 	'linphone_core_can_we_add_call',	# private function
 	'linphone_core_enable_log_collection',	# need to handle class properties
 	'linphone_core_get_audio_port_range',	# to be handwritten because of result via arguments
-	'linphone_core_get_sip_transports',	# missing LCSipTransports
-	'linphone_core_get_sip_transports_used',	# missing LCSipTransports
 	'linphone_core_get_supported_video_sizes',	# missing MSVideoSizeDef
 	'linphone_core_get_video_policy',	# missing LinphoneVideoPolicy
 	'linphone_core_get_video_port_range',	# to be handwritten because of result via arguments
@@ -61,7 +59,6 @@ blacklisted_functions = [
 	'linphone_core_set_log_handler',	# Hand-written but put directly in the linphone module
 	'linphone_core_set_log_level',	# There is no use to wrap this function
 	'linphone_core_set_video_policy',	# missing LinphoneVideoPolicy
-	'linphone_core_set_sip_transports',	# missing LCSipTransports
 	'linphone_proxy_config_get_privacy',	# missing LinphonePrivacyMask
 	'linphone_proxy_config_normalize_number',	# to be handwritten because of result via arguments
 	'linphone_proxy_config_set_file_transfer_server',	# defined but not implemented in linphone core
diff --git a/tools/python/apixml2python/handwritten_declarations.mustache b/tools/python/apixml2python/handwritten_declarations.mustache
index 6f7ae5b92..78fcebc22 100644
--- a/tools/python/apixml2python/handwritten_declarations.mustache
+++ b/tools/python/apixml2python/handwritten_declarations.mustache
@@ -2,15 +2,26 @@ static PyObject * pylinphone_Core_get_sound_devices(PyObject *self, void *closur
 static PyObject * pylinphone_Core_get_video_devices(PyObject *self, void *closure);
 
 static PyTypeObject pylinphone_VideoSizeType;
+static PyTypeObject pylinphone_SipTransportsType;
 
 typedef struct {
 	PyObject_HEAD
 	MSVideoSize vs;
 } pylinphone_VideoSizeObject;
 
+typedef struct {
+	PyObject_HEAD
+	LCSipTransports lcst;
+} pylinphone_SipTransportsObject;
+
 int PyLinphoneVideoSize_Check(PyObject *p);
 MSVideoSize PyLinphoneVideoSize_AsMSVideoSize(PyObject *obj);
 PyObject * PyLinphoneVideoSize_FromMSVideoSize(MSVideoSize vs);
+
+int PyLinphoneSipTransports_Check(PyObject *p);
+LCSipTransports * PyLinphoneSipTransports_AsLCSipTransports(PyObject *obj);
+PyObject * PyLinphoneSipTransports_FromLCSipTransports(LCSipTransports lcst);
+
 time_t PyDateTime_As_time_t(PyObject *obj);
 PyObject * PyDateTime_From_time_t(time_t t);
 
diff --git a/tools/python/apixml2python/handwritten_definitions.mustache b/tools/python/apixml2python/handwritten_definitions.mustache
index 86b439c20..3ff9db17b 100644
--- a/tools/python/apixml2python/handwritten_definitions.mustache
+++ b/tools/python/apixml2python/handwritten_definitions.mustache
@@ -431,6 +431,125 @@ PyObject * PyLinphoneVideoSize_FromMSVideoSize(MSVideoSize vs) {
 }
 
 
+
+static void pylinphone_SipTransports_dealloc(PyObject *self) {
+	pylinphone_trace(1, "[PYLINPHONE] >>> %s(%p)", __FUNCTION__, self);
+	self->ob_type->tp_free(self);
+	pylinphone_trace(-1, "[PYLINPHONE] <<< %s", __FUNCTION__);
+}
+
+static PyObject * pylinphone_SipTransports_new(PyTypeObject *type, PyObject *args, PyObject *kw) {
+	pylinphone_SipTransportsObject *self = (pylinphone_SipTransportsObject *)type->tp_alloc(type, 0);
+	pylinphone_trace(1, "[PYLINPHONE] >>> %s()", __FUNCTION__);
+	pylinphone_trace(-1, "[PYLINPHONE] <<< %s -> %p", __FUNCTION__, self);
+	return (PyObject *)self;
+}
+
+static int pylinphone_SipTransports_init(PyObject *self, PyObject *args, PyObject *kw) {
+	pylinphone_SipTransportsObject *sto = (pylinphone_SipTransportsObject *)self;
+	int udp_port;
+	int tcp_port;
+	int tls_port;
+	int dtls_port;
+	if (!PyArg_ParseTuple(args, "iiii", &udp_port, &tcp_port, &tls_port, &dtls_port)) {
+		return -1;
+	}
+	sto->lcst.udp_port = udp_port;
+	sto->lcst.tcp_port = tcp_port;
+	sto->lcst.tls_port = tls_port;
+	sto->lcst.dtls_port = dtls_port;
+	return 0;
+}
+
+static PyMemberDef pylinphone_SipTransports_members[] = {
+	{ "udp_port", T_INT, offsetof(pylinphone_SipTransportsObject, lcst) + offsetof(LCSipTransports, udp_port), 0, "[int] The port used for UDP SIP transport" },
+	{ "tcp_port", T_INT, offsetof(pylinphone_SipTransportsObject, lcst) + offsetof(LCSipTransports, tcp_port), 0, "[int] The port used for TCP SIP transport" },
+	{ "tls_port", T_INT, offsetof(pylinphone_SipTransportsObject, lcst) + offsetof(LCSipTransports, tls_port), 0, "[int] The port used for TLS SIP transport" },
+	{ "dtls_port", T_INT, offsetof(pylinphone_SipTransportsObject, lcst) + offsetof(LCSipTransports, dtls_port), 0, "[int] The port used for DTLS SIP transport" },
+	{ NULL, 0, 0, 0, NULL }	/* Sentinel */
+};
+
+static PyTypeObject pylinphone_SipTransportsType = {
+	PyObject_HEAD_INIT(NULL)
+	0,	/* ob_size */
+	"linphone.SipTransports",	/* tp_name */
+	sizeof(pylinphone_SipTransportsObject),	/* tp_basicsize */
+	0,	/* tp_itemsize */
+	pylinphone_SipTransports_dealloc,	/* tp_dealloc */
+	0,	/* tp_print */
+	0,	/* tp_getattr */
+	0,	/* tp_setattr */
+	0,	/* tp_compare */
+	0,	/* tp_repr */
+	0,	/* tp_as_number */
+	0,	/* tp_as_sequence */
+	0,	/* tp_as_mapping */
+	0,	/* tp_hash */
+	0,	/* tp_call */
+	0,	/* tp_str */
+	0,	/* tp_getattro */
+	0,	/* tp_setattro */
+	0,	/* tp_as_buffer */
+	Py_TPFLAGS_DEFAULT,	/* tp_flags */
+	"Object representing the SIP transports: its UDP, TCP, TLS and DTLS ports.",	/* tp_doc */
+	0,	/* tp_traverse */
+	0,	/* tp_clear */
+	0,	/* tp_richcompare */
+	0,	/* tp_weaklistoffset */
+	0,	/* tp_iter */
+	0,	/* tp_iternext */
+	0,	/* tp_methods */
+	pylinphone_SipTransports_members,	/* tp_members */
+	0,	/* tp_getset */
+	0,	/* tp_base */
+	0,	/* tp_dict */
+	0,	/* tp_descr_get */
+	0,	/* tp_descr_set */
+	0,	/* tp_dictoffset */
+	pylinphone_SipTransports_init,	/* tp_init */
+	0,	/* tp_alloc */
+	pylinphone_SipTransports_new,	/* tp_new */
+	0,	/* tp_free */
+};
+
+int PyLinphoneSipTransports_Check(PyObject *p) {
+	return PyObject_IsInstance(p, (PyObject *)&pylinphone_SipTransportsType);
+}
+
+LCSipTransports * PyLinphoneSipTransports_AsLCSipTransports(PyObject *obj) {
+	return &((pylinphone_SipTransportsObject *)obj)->lcst;
+}
+
+PyObject * PyLinphoneSipTransports_FromLCSipTransports(LCSipTransports lcst) {
+	PyObject *linphone_module;
+	PyObject *pyret = NULL;
+	PyGILState_STATE gstate;
+
+	gstate = PyGILState_Ensure();
+	linphone_module = PyImport_ImportModule("linphone.linphone");
+	if (linphone_module != NULL) {
+		PyObject *cls = PyObject_GetAttrString(linphone_module, "SipTransports");
+		if (cls != NULL) {
+			PyObject *args = Py_BuildValue("iiii", lcst.udp_port, lcst.tcp_port, lcst.tls_port, lcst.dtls_port);
+			pyret = PyEval_CallObject(cls, args);
+			if (pyret == NULL) {
+				PyErr_Print();
+			}
+			Py_DECREF(args);
+			Py_DECREF(cls);
+		}
+		Py_DECREF(linphone_module);
+	}
+	PyGILState_Release(gstate);
+
+	if (pyret == NULL) {
+		Py_RETURN_NONE;
+	}
+	return pyret;
+}
+
+
+
 time_t PyDateTime_As_time_t(PyObject *obj) {
 	time_t ret = -1;
 	PyObject *utctimetuple = PyObject_GetAttrString(obj, "utctimetuple");
diff --git a/tools/python/apixml2python/linphone.py b/tools/python/apixml2python/linphone.py
index f328bdba2..93f5f4c31 100644
--- a/tools/python/apixml2python/linphone.py
+++ b/tools/python/apixml2python/linphone.py
@@ -194,6 +194,14 @@ class ArgumentType:
 			self.fmt_str = 'O'
 			self.cfmt_str = '%p'
 			self.cast_convert_func_result = False
+		elif self.basic_type == 'LCSipTransports':
+			self.type_str = 'linphone.SipTransports'
+			self.check_func = 'PyLinphoneSipTransports_Check'
+			self.convert_func = 'PyLinphoneSipTransports_AsLCSipTransports'
+			self.convert_from_func = 'PyLinphoneSipTransports_FromLCSipTransports'
+			self.fmt_str = 'O'
+			self.cfmt_str = '%p'
+			self.cast_convert_func_result = False
 		else:
 			if strip_leading_linphone(self.basic_type) in self.linphone_module.enum_names:
 				self.type_str = 'int'
diff --git a/tools/python/apixml2python/linphone_module.mustache b/tools/python/apixml2python/linphone_module.mustache
index f9067d6fa..548a2afe3 100644
--- a/tools/python/apixml2python/linphone_module.mustache
+++ b/tools/python/apixml2python/linphone_module.mustache
@@ -326,6 +326,8 @@ PyMODINIT_FUNC initlinphone(void) {
 	/* Hand-written classes. */
 	Py_INCREF(&pylinphone_VideoSizeType);
 	PyModule_AddObject(m, "VideoSize", (PyObject *)&pylinphone_VideoSizeType);
+	Py_INCREF(&pylinphone_SipTransportsType);
+	PyModule_AddObject(m, "SipTransports", (PyObject *)&pylinphone_SipTransportsType);
 
 	pylinphone_init_testing_module(m);
 }

From bff27f5c6ddc97890ca75b2265d20ea21a44ec8f Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Tue, 9 Dec 2014 11:27:21 +0100
Subject: [PATCH 126/496] Fix account creation in Python.

---
 tools/python/unittests/linphonetester.py | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/tools/python/unittests/linphonetester.py b/tools/python/unittests/linphonetester.py
index 1edbddf94..9654d8201 100644
--- a/tools/python/unittests/linphonetester.py
+++ b/tools/python/unittests/linphonetester.py
@@ -92,9 +92,9 @@ class AccountManager:
 
     @classmethod
     def account_created_on_server_cb(cls, lc, cfg, state, message):
-        if state == linphone.RegistrationOk:
+        if state == linphone.RegistrationState.RegistrationOk:
             lc.user_data.created = True
-        elif state == linphone.RegistrationCleared:
+        elif state == linphone.RegistrationState.RegistrationCleared:
             lc.user_data.done = True
 
     @classmethod
@@ -106,10 +106,10 @@ class AccountManager:
         lc = cfg.core
         identity = cfg.identity
         id_addr = linphone.Address.new(identity)
-        account = get_account(id_addr)
+        account = self._get_account(id_addr)
         if account is None:
             if logger is not None:
-                logger.info("No account for {identity} exists, going to create one.".format(identity=identity))
+                logger.info("[TESTER] No account for {identity} exists, going to create one.".format(identity=identity))
             account = Account(id_addr, self.unique_id)
             self.accounts.append(account)
             create_account = True
@@ -120,12 +120,19 @@ class AccountManager:
         lc.add_auth_info(ai)
         return account.modified_identity
 
+    def _get_account(self, id_addr):
+        for account in self.accounts:
+            if account.identity.weak_equal(id_addr):
+                return account
+        return None
+
     def _create_account_on_server(self, account, refcfg, logger=None):
         vtable = {}
         tmp_identity = account.modified_identity.clone()
         vtable['registration_state_changed'] = AccountManager.account_created_on_server_cb
         vtable['auth_info_requested'] = AccountManager.account_created_auth_requested_cb
         lc = CoreManager.configure_lc_from(vtable, tester_resources_path, None, account)
+        lc.sip_transports = linphone.SipTransports.new(-1, -1, -1, -1)
         cfg = lc.create_proxy_config()
         tmp_identity.password = account.password
         tmp_identity.set_header("X-Create-Account", "yes")
@@ -140,7 +147,6 @@ class AccountManager:
             if logger is not None:
                 logger.critical("[TESTER] Account for {identity} could not be created on server.".format(identity=refcfg.identity))
             sys.exit(-1)
-        cfg.stop_refreshing()
         cfg.edit()
         cfg.identity = account.modified_identity.as_string()
         cfg.done()
@@ -272,7 +278,7 @@ class CoreManagerStats:
 class CoreManager:
 
     @classmethod
-    def configure_lc_from(vtable, resources_path, rc_path, user_data=None):
+    def configure_lc_from(cls, vtable, resources_path, rc_path, user_data=None):
         filepath = None
         if rc_path is not None:
             filepath = os.path.join(resources_path, rc_path)

From 9a59eb892466f7e9de1766dda67e9717fdd0fadd Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Tue, 9 Dec 2014 13:35:00 +0100
Subject: [PATCH 127/496] Fix linphone_proxy_config_is_server_config_changed()
 to return weak-equal if the identities are weak-equal but the proxies are
 equal.

---
 coreapi/proxy.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/coreapi/proxy.c b/coreapi/proxy.c
index 275613477..807a03db3 100644
--- a/coreapi/proxy.c
+++ b/coreapi/proxy.c
@@ -62,13 +62,20 @@ LinphoneProxyConfigAddressComparisonResult linphone_proxy_config_address_equal(c
 LinphoneProxyConfigAddressComparisonResult linphone_proxy_config_is_server_config_changed(const LinphoneProxyConfig* obj) {
 	LinphoneAddress *current_identity=obj->reg_identity?linphone_address_new(obj->reg_identity):NULL;
 	LinphoneAddress *current_proxy=obj->reg_proxy?linphone_address_new(obj->reg_proxy):NULL;
-	LinphoneProxyConfigAddressComparisonResult result=LinphoneProxyConfigAddressDifferent;
+	LinphoneProxyConfigAddressComparisonResult result_identity;
+	LinphoneProxyConfigAddressComparisonResult result;
 
 	result = linphone_proxy_config_address_equal(obj->saved_identity,current_identity);
 	if (result == LinphoneProxyConfigAddressDifferent) goto end;
+	result_identity = result;
 
 	result = linphone_proxy_config_address_equal(obj->saved_proxy,current_proxy);
 	if (result == LinphoneProxyConfigAddressDifferent) goto end;
+	/** If the proxies are equal use the result of the difference between the identities,
+	  * otherwise the result is weak-equal and so weak-equal must be returned even if the
+	  * identities were equal.
+	  */
+	if (result == LinphoneProxyConfigAddressEqual) result = result_identity;
 
 	end:
 	if (current_identity) linphone_address_destroy(current_identity);

From 56eb5c3e7bdafdcdbbbb05b216f36f1e5f0b27f6 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Tue, 9 Dec 2014 13:35:48 +0100
Subject: [PATCH 128/496] Fix the use of SipTransports in the Python module.

---
 tools/python/apixml2python/linphone_module.mustache | 1 +
 tools/python/unittests/linphonetester.py            | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/python/apixml2python/linphone_module.mustache b/tools/python/apixml2python/linphone_module.mustache
index 548a2afe3..9704f0563 100644
--- a/tools/python/apixml2python/linphone_module.mustache
+++ b/tools/python/apixml2python/linphone_module.mustache
@@ -293,6 +293,7 @@ PyMODINIT_FUNC initlinphone(void) {
 
 	/* Hand-written classes. */
 	if (PyType_Ready(&pylinphone_VideoSizeType) < 0) return;
+	if (PyType_Ready(&pylinphone_SipTransportsType) < 0) return;
 
 	m = Py_InitModule3("linphone", pylinphone_ModuleMethods, "Python module giving access to the Linphone library.");
 	if (m == NULL) return;
diff --git a/tools/python/unittests/linphonetester.py b/tools/python/unittests/linphonetester.py
index 9654d8201..94a422ea3 100644
--- a/tools/python/unittests/linphonetester.py
+++ b/tools/python/unittests/linphonetester.py
@@ -132,7 +132,7 @@ class AccountManager:
         vtable['registration_state_changed'] = AccountManager.account_created_on_server_cb
         vtable['auth_info_requested'] = AccountManager.account_created_auth_requested_cb
         lc = CoreManager.configure_lc_from(vtable, tester_resources_path, None, account)
-        lc.sip_transports = linphone.SipTransports.new(-1, -1, -1, -1)
+        lc.sip_transports = linphone.SipTransports(-1, -1, -1, -1)
         cfg = lc.create_proxy_config()
         tmp_identity.password = account.password
         tmp_identity.set_header("X-Create-Account", "yes")

From 4ebc9c85b954fd0e993a3f7e8890ae190fd8a79e Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Tue, 9 Dec 2014 15:10:03 +0100
Subject: [PATCH 129/496] Add port getter/setter

---
 coreapi/linphonecore_jni.cc                   | 56 +++++++++++--------
 .../org/linphone/core/LinphoneAddress.java    | 23 +++-----
 .../linphone/core/LinphoneAddressImpl.java    | 41 ++++++--------
 3 files changed, 59 insertions(+), 61 deletions(-)

diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index 0e0c11891..00e2c3692 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -172,7 +172,7 @@ jobject getProxy(JNIEnv *env, LinphoneProxyConfig *proxy, jobject core){
 	if (proxy!=NULL){
 		jclass proxyClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneProxyConfigImpl"));
 		jmethodID proxyCtrId = env->GetMethodID(proxyClass,"<init>", "(Lorg/linphone/core/LinphoneCoreImpl;J)V");
-		
+
 		void *up=linphone_proxy_config_get_user_data(proxy);
 
 		if (up==NULL){
@@ -199,7 +199,7 @@ jobject getCall(JNIEnv *env, LinphoneCall *call){
 	if (call!=NULL){
 		jclass callClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneCallImpl"));
 		jmethodID callCtrId = env->GetMethodID(callClass,"<init>", "(J)V");
-		
+
 		void *up=linphone_call_get_user_pointer(call);
 
 		if (up==NULL){
@@ -221,7 +221,7 @@ jobject getChatMessage(JNIEnv *env, LinphoneChatMessage *msg){
 	if (msg != NULL){
 		jclass chatMessageClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneChatMessageImpl"));
 		jmethodID chatMessageCtrId = env->GetMethodID(chatMessageClass,"<init>", "(J)V");
-		
+
 		void *up = linphone_chat_message_get_user_data(msg);
 
 		if (up == NULL) {
@@ -242,11 +242,11 @@ jobject getEvent(JNIEnv *env, LinphoneEvent *lev){
 	if (jev==NULL){
 		jclass linphoneEventClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneEventImpl"));
 		jmethodID linphoneEventCtrId = env->GetMethodID(linphoneEventClass,"<init>", "(J)V");
-		
+
 		jev=env->NewObject(linphoneEventClass,linphoneEventCtrId,(jlong)linphone_event_ref(lev));
 		jev=env->NewGlobalRef(jev);
 		linphone_event_set_user_data(lev,jev);
-		
+
 		env->DeleteGlobalRef(linphoneEventClass);
 	}
 	return jev;
@@ -257,9 +257,9 @@ public:
 	LinphoneCoreData(JNIEnv *env, jobject lc, LinphoneCoreVTable *vTable, jobject alistener) {
 		core = env->NewGlobalRef(lc);
 		listener = env->NewGlobalRef(alistener);
-		
+
 		memset(vTable, 0, sizeof(LinphoneCoreVTable));
-		
+
 		listenerClass = (jclass)env->NewGlobalRef(env->GetObjectClass(alistener));
 
 		/*displayStatus(LinphoneCore lc,String message);*/
@@ -277,7 +277,7 @@ public:
 		if (globalStateId) {
 			vTable->global_state_changed = globalStateChange;
 		}
-		
+
 		/*registrationState(LinphoneCore lc, LinphoneProxyConfig cfg, LinphoneCore.RegistrationState cstate, String smessage);*/
 		registrationStateClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneCore$RegistrationState"));
 		registrationStateFromIntId = env->GetStaticMethodID(registrationStateClass,"fromInt","(I)Lorg/linphone/core/LinphoneCore$RegistrationState;");
@@ -286,7 +286,7 @@ public:
 		if (registrationStateId) {
 			vTable->registration_state_changed = registrationStateChange;
 		}
-		
+
 		/*callState(LinphoneCore lc, LinphoneCall call, LinphoneCall.State cstate,String message);*/
 		callStateClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneCall$State"));
 		callStateFromIntId = env->GetStaticMethodID(callStateClass,"fromInt","(I)Lorg/linphone/core/LinphoneCall$State;");
@@ -295,7 +295,7 @@ public:
 		if (callStateId) {
 			vTable->call_state_changed = callStateChange;
 		}
-	
+
 		transferStateId = env->GetMethodID(listenerClass,"transferState","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneCall;Lorg/linphone/core/LinphoneCall$State;)V");
 		env->ExceptionClear();
 		if (transferStateId) {
@@ -348,25 +348,25 @@ public:
 		if (textReceivedId) {
 			vTable->text_received = text_received;
 		}
-	
+
 		messageReceivedId = env->GetMethodID(listenerClass,"messageReceived","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneChatRoom;Lorg/linphone/core/LinphoneChatMessage;)V");
 		env->ExceptionClear();
 		if (messageReceivedId) {
 			vTable->message_received = message_received;
 		}
-	
+
 		isComposingReceivedId = env->GetMethodID(listenerClass,"isComposingReceived","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneChatRoom;)V");
 		env->ExceptionClear();
 		if (isComposingReceivedId) {
 			vTable->is_composing_received = is_composing_received;
 		}
-	
+
 		dtmfReceivedId = env->GetMethodID(listenerClass,"dtmfReceived","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneCall;I)V");
 		env->ExceptionClear();
 		if (dtmfReceivedId) {
 			vTable->dtmf_received = dtmf_received;
 		}
-	
+
 		infoReceivedId = env->GetMethodID(listenerClass,"infoReceived", "(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneCall;Lorg/linphone/core/LinphoneInfoMessage;)V");
 		env->ExceptionClear();
 		if (infoReceivedId) {
@@ -380,7 +380,7 @@ public:
 		if (subscriptionStateId) {
 			vTable->subscription_state_changed = subscriptionStateChanged;
 		}
-	
+
 		publishStateClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/PublishState"));
 		publishStateFromIntId = env->GetStaticMethodID(publishStateClass,"fromInt","(I)Lorg/linphone/core/PublishState;");
 		publishStateId = env->GetMethodID(listenerClass,"publishStateChanged", "(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneEvent;Lorg/linphone/core/PublishState;)V");
@@ -388,7 +388,7 @@ public:
 		if (publishStateId) {
 			vTable->publish_state_changed = publishStateChanged;
 		}
-	
+
 		notifyRecvId = env->GetMethodID(listenerClass,"notifyReceived", "(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneEvent;Ljava/lang/String;Lorg/linphone/core/LinphoneContent;)V");
 		env->ExceptionClear();
 		if (notifyRecvId) {
@@ -408,7 +408,7 @@ public:
 		if (fileTransferProgressIndicationId) {
 			vTable->file_transfer_progress_indication = fileTransferProgressIndication;
 		}
-	
+
 		fileTransferSendId = env->GetMethodID(listenerClass, "fileTransferSend", "(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneChatMessage;Lorg/linphone/core/LinphoneContent;Ljava/nio/ByteBuffer;I)I");
 		env->ExceptionClear();
 		if (fileTransferSendId) {
@@ -423,7 +423,7 @@ public:
 
 		chatMessageStateClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneChatMessage$State"));
 		chatMessageStateFromIntId = env->GetStaticMethodID(chatMessageStateClass,"fromInt","(I)Lorg/linphone/core/LinphoneChatMessage$State;");
-	
+
 		proxyClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneProxyConfigImpl"));
 		proxyCtrId = env->GetMethodID(proxyClass,"<init>", "(Lorg/linphone/core/LinphoneCoreImpl;J)V");
 
@@ -567,7 +567,7 @@ public:
 	jmethodID fileTransferRecvId;
 
 	LinphoneCoreVTable vTable;
-	
+
 	static void displayStatusCb(LinphoneCore *lc, const char *message) {
 		JNIEnv *env = 0;
 		jint result = jvm->AttachCurrentThread(&env,NULL);
@@ -979,7 +979,7 @@ extern "C" jlong Java_org_linphone_core_LinphoneCoreImpl_newLinphoneCore(JNIEnv*
 
 	const char* userConfig = juserConfig?env->GetStringUTFChars(juserConfig, NULL):NULL;
 	const char* factoryConfig = jfactoryConfig?env->GetStringUTFChars(jfactoryConfig, NULL):NULL;
-	
+
 	LinphoneCoreVTable *vTable = linphone_core_v_table_new();
 	LinphoneCoreData* ldata = new LinphoneCoreData(env, thiz, vTable, jlistener);
 	linphone_core_v_table_set_user_data(vTable, ldata);
@@ -1116,7 +1116,7 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setDefaultProxyConfig(	J
 		,jlong pc) {
 	linphone_core_set_default_proxy((LinphoneCore*)lc,(LinphoneProxyConfig*)pc);
 }
-	
+
 extern "C" jobject Java_org_linphone_core_LinphoneCoreImpl_getDefaultProxyConfig(JNIEnv*  env
 		,jobject  thiz
 		,jlong lc) {
@@ -2245,6 +2245,12 @@ extern "C" jint Java_org_linphone_core_LinphoneAddressImpl_getTransport(JNIEnv*
 	LinphoneTransportType transporttype = linphone_address_get_transport((LinphoneAddress*)ptr);
 	return (jint)transporttype;
 }
+extern "C" jint Java_org_linphone_core_LinphoneAddressImpl_getPort(JNIEnv*  env
+																		,jobject  thiz
+																		,jlong ptr) {
+	int port = linphone_address_get_port((LinphoneAddress*)ptr);
+	return (jint)port;
+}
 extern "C" jstring Java_org_linphone_core_LinphoneAddressImpl_toString(JNIEnv*  env
 																		,jobject  thiz
 																		,jlong ptr) {
@@ -2291,6 +2297,12 @@ extern "C" void Java_org_linphone_core_LinphoneAddressImpl_setTransport(JNIEnv*
 																		,jint jtransport) {
 	linphone_address_set_transport((LinphoneAddress*)address, (LinphoneTransportType) jtransport);
 }
+extern "C" void Java_org_linphone_core_LinphoneAddressImpl_setPort(JNIEnv*  env
+									,jobject  thiz
+									,jlong address
+									,jint jport) {
+	linphone_address_set_port((LinphoneAddress*)address, (LinphoneTransportType) jport);
+}
 
 //CallLog
 extern "C" jlong Java_org_linphone_core_LinphoneCallLogImpl_getFrom(JNIEnv*  env
@@ -2988,7 +3000,7 @@ static void chat_room_impl_callback(LinphoneChatMessage* msg, LinphoneChatMessag
 	jclass clazz = (jclass) env->GetObjectClass(listener);
 	jmethodID method = env->GetMethodID(clazz, "onLinphoneChatMessageStateChanged","(Lorg/linphone/core/LinphoneChatMessage;Lorg/linphone/core/LinphoneChatMessage$State;)V");
 	jobject jmessage=(jobject)linphone_chat_message_get_user_data(msg);
-	
+
 	jclass chatMessageStateClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneChatMessage$State"));
 	jmethodID chatMessageStateFromIntId = env->GetStaticMethodID(chatMessageStateClass,"fromInt","(I)Lorg/linphone/core/LinphoneChatMessage$State;");
 	env->CallVoidMethod(
diff --git a/java/common/org/linphone/core/LinphoneAddress.java b/java/common/org/linphone/core/LinphoneAddress.java
index f6c271bd6..fefb0edc0 100644
--- a/java/common/org/linphone/core/LinphoneAddress.java
+++ b/java/common/org/linphone/core/LinphoneAddress.java
@@ -79,15 +79,10 @@ public interface LinphoneAddress {
 	 */
 	public String getDomain();
 	/**
-	 * Port as String
-	 * @return null if not set
+	 * Port
+	 * @return 0 if not set
 	 */
-	public String getPort();
-	/**
-	 * Port as integer value. 
-	 * @return negative value if not set if not set
-	 */
-	public int getPortInt();
+	public int getPort();
 	/**
 	 * set display name 
 	 * @param name
@@ -104,15 +99,11 @@ public interface LinphoneAddress {
 	 */
 	public void setDomain(String domain);
 	/**
-	 * set port as String 
-	 * @param port, null if not set
+	 * set port
+	 * @param port, 0 if not set
 	 */
-	public void setPort(String port);
-	/**
-	 * set port as int 
-	 * @param port, negative value if not set
-	 */
-	public void setPortInt(int port);
+	public void setPort(int port);
+
 	/**
 	 * Removes address's tags and uri headers so that it is displayable to the user.
 	**/
diff --git a/java/impl/org/linphone/core/LinphoneAddressImpl.java b/java/impl/org/linphone/core/LinphoneAddressImpl.java
index 2d05c720b..e5c2b53d8 100644
--- a/java/impl/org/linphone/core/LinphoneAddressImpl.java
+++ b/java/impl/org/linphone/core/LinphoneAddressImpl.java
@@ -35,11 +35,13 @@ public class LinphoneAddressImpl implements LinphoneAddress {
 	private native String getUserName(long ptr);
 	private native String getDomain(long ptr);
 	private native int getTransport(long ptr);
+    private native int getPort(long ptr);
 	private native String toUri(long ptr);
 	private native void setDisplayName(long ptr,String name);
 	private native void setDomain(long ptr,String domain);
 	private native void setUserName(long ptr,String username);
 	private native void setTransport(long ptr, int transport);
+    private native void setPort(long ptr, int port);
 	private native String toString(long ptr);
 	
 	protected LinphoneAddressImpl(String identity)  throws LinphoneCoreException{
@@ -89,40 +91,33 @@ public class LinphoneAddressImpl implements LinphoneAddress {
 	public TransportType getTransport() {
 		return TransportType.fromInt(getTransport(nativePtr));
 	}
-	
-	public String toString() {
+    public int getPort() { return getPort(nativePtr); }
+
+    public String toString() {
 		return toString(nativePtr);
 	}
 	public String toUri() {
 		return toUri(nativePtr);	
 	}
+
+    public String asString() {
+        return toString();
+    }
+    public String asStringUriOnly() {
+        return toUri(nativePtr);
+    }
+
+    public void clean() {
+        throw new RuntimeException("Not implemented");
+    }
+
 	public void setDisplayName(String name) {
 		setDisplayName(nativePtr,name);
 	}
-	public String asString() {
-		return toString();
-	}
-	public String asStringUriOnly() {
-		return toUri(nativePtr);
-	}
-	public void clean() {
-		throw new RuntimeException("Not implemented");
-	}
-	public String getPort() {
-		return String.valueOf(getPortInt());
-	}
-	public int getPortInt() {
-		return getPortInt();
-	}
 	public void setDomain(String domain) {
 		setDomain(nativePtr, domain);
 	}
-	public void setPort(String port) {
-		throw new RuntimeException("Not implemented");
-	}
-	public void setPortInt(int port) {
-		throw new RuntimeException("Not implemented");
-	}
+	public void setPort(int port) { setPort(nativePtr, port); }
 	public void setUserName(String username) {
 		setUserName(nativePtr,username);
 	}

From cc9bf0e6bfa35f7621deac35e0e3c2804afe2236 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Tue, 9 Dec 2014 15:17:06 +0100
Subject: [PATCH 130/496] Prevent downloading rootca at each build when
 building with CMake.

---
 share/CMakeLists.txt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt
index 58c575c90..b12eb85ef 100644
--- a/share/CMakeLists.txt
+++ b/share/CMakeLists.txt
@@ -30,7 +30,10 @@ if(APPLE)
 	string(REGEX REPLACE "OPENSSLDIR: \"(.*)\"" "\\1" HTTPS_CA_DIR "${OPENSSL_VERSION}")
 endif()
 
-execute_process(COMMAND ${CMAKE_COMMAND} -DHTTPS_CA_DIR=${HTTPS_CA_DIR} -DWORK_DIR=${CMAKE_CURRENT_SOURCE_DIR} -DOUTPUT_DIR=${CMAKE_CURRENT_BINARY_DIR} -P ${CMAKE_CURRENT_SOURCE_DIR}/rootca.cmake)
+set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/rootca.pem PROPERTIES GENERATED TRUE)
+add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/rootca.pem
+	COMMAND ${CMAKE_COMMAND} -DHTTPS_CA_DIR=${HTTPS_CA_DIR} -DWORK_DIR=${CMAKE_CURRENT_SOURCE_DIR} -DOUTPUT_DIR=${CMAKE_CURRENT_BINARY_DIR} -P ${CMAKE_CURRENT_SOURCE_DIR}/rootca.cmake)
+add_custom_target(rootca ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/rootca.pem)
 
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/rootca.pem
 	DESTINATION ${PACKAGE_DATA_DIR}/linphone

From 3a39a1da6f22df17e44f47ddf46148aedfb85c2d Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Tue, 9 Dec 2014 15:52:20 +0100
Subject: [PATCH 131/496] Update call tester for Python module.

---
 tools/python/unittests/test_call.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/tools/python/unittests/test_call.py b/tools/python/unittests/test_call.py
index 93dfd1175..fa9069a99 100644
--- a/tools/python/unittests/test_call.py
+++ b/tools/python/unittests/test_call.py
@@ -16,12 +16,13 @@ class TestCall:
         marie = CoreManager('marie_rc', logger=TestCall.logger)
         pauline = CoreManager('pauline_rc', logger=TestCall.logger)
         marie.lc.max_calls = 0
-        out_call = pauline.lc.invite('marie')
+        out_call = pauline.lc.invite_address(marie.identity)
 
         # Wait until flexisip transfers the busy...
         assert_equals(CoreManager.wait_for_until(pauline, marie, lambda pauline, marie: pauline.stats.number_of_LinphoneCallError == 1, 33000), True)
         assert_equals(pauline.stats.number_of_LinphoneCallError, 1)
-        assert_equals(out_call.reason, linphone.Reason.ReasonBusy)
+        #FIXME http://git.linphone.org/mantis/view.php?id=757
+        #assert_equals(out_call.reason, linphone.Reason.ReasonBusy)
         if len(pauline.lc.call_logs) > 0:
             out_call_log = pauline.lc.call_logs[0]
             assert out_call_log is not None
@@ -50,7 +51,7 @@ class TestCall:
     def test_cancelled_call(self):
         marie = CoreManager('marie_rc', logger=TestCall.logger)
         pauline = CoreManager('pauline_rc', logger=TestCall.logger)
-        out_call = pauline.lc.invite('marie')
+        out_call = pauline.lc.invite_address(marie.identity)
         assert_equals(CoreManager.wait_for(pauline, marie, lambda pauline, marie: pauline.stats.number_of_LinphoneCallOutgoingInit == 1), True)
         pauline.lc.terminate_call(out_call)
         assert_equals(CoreManager.wait_for(pauline, marie, lambda pauline, marie: pauline.stats.number_of_LinphoneCallEnd == 1), True)
@@ -82,7 +83,7 @@ class TestCall:
     def test_cancelled_ringing_call(self):
         marie = CoreManager('marie_rc', logger=TestCall.logger)
         pauline = CoreManager('pauline_rc', logger=TestCall.logger)
-        out_call = pauline.lc.invite('marie')
+        out_call = pauline.lc.invite_address(marie.identity)
         assert_equals(CoreManager.wait_for(pauline, marie, lambda pauline, marie: marie.stats.number_of_LinphoneCallIncomingReceived == 1), True)
         pauline.lc.terminate_call(out_call)
         assert_equals(CoreManager.wait_for(pauline, marie, lambda pauline, marie: (pauline.stats.number_of_LinphoneCallReleased == 1) and (marie.stats.number_of_LinphoneCallReleased == 1)), True)
@@ -96,13 +97,14 @@ class TestCall:
         pauline = CoreManager('pauline_rc', logger=TestCall.logger)
         marie.disable_all_audio_codecs_except_one('pcmu')
         pauline.disable_all_audio_codecs_except_one('pcma')
-        out_call = pauline.lc.invite('marie')
+        out_call = pauline.lc.invite_address(marie.identity)
         assert_equals(CoreManager.wait_for(pauline, marie, lambda pauline, marie: pauline.stats.number_of_LinphoneCallOutgoingInit == 1), True)
 
         # flexisip will retain the 488 until the "urgent reply" timeout arrives.
-        assert_equals(CoreManager.wait_for_until(pauline, marie, lambda pauline, marie: pauline.stats.number_of_LinphoneCallError == 1, 6000), True)
+        assert_equals(CoreManager.wait_for_until(pauline, marie, lambda pauline, marie: pauline.stats.number_of_LinphoneCallError == 1, 7000), True)
         assert_equals(out_call.reason, linphone.Reason.ReasonNotAcceptable)
         assert_equals(marie.stats.number_of_LinphoneCallIncomingReceived, 0)
+        assert_equals(marie.stats.number_of_LinphoneCallReleased, 0)
         marie.stop()
         pauline.stop()
 

From 141af7de15d8a4755a77122caa5448997947621b Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Tue, 9 Dec 2014 17:33:41 +0100
Subject: [PATCH 132/496] Fix threading issues in the Python module.

Reinitialize log serialization only when all the linphone cores have been destroyed.
---
 coreapi/linphonecore.c                        | 26 ++++++++++++++-----
 .../apixml2python/linphone_module.mustache    |  1 +
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index f051c7b2d..bc08d68f1 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -1523,6 +1523,24 @@ void linphone_configuring_terminated(LinphoneCore *lc, LinphoneConfiguringState
 	linphone_core_start(lc);
 }
 
+static int linphone_core_serialization_ref = 0;
+
+static void linphone_core_activate_log_serialization_if_needed(void) {
+	if (liblinphone_serialize_logs == TRUE) {
+		linphone_core_serialization_ref++;
+		if (linphone_core_serialization_ref == 1)
+			ortp_set_log_thread_id(ortp_thread_self());
+	}
+}
+
+static void linphone_core_deactivate_log_serialization_if_needed(void) {
+	if (liblinphone_serialize_logs == TRUE) {
+		--linphone_core_serialization_ref;
+		if (linphone_core_serialization_ref == 0)
+			ortp_set_log_thread_id(0);
+	}
+}
+
 static void linphone_core_init(LinphoneCore * lc, const LinphoneCoreVTable *vtable, LpConfig *config, void * userdata)
 {
 	const char *remote_provisioning_uri = NULL;
@@ -1539,9 +1557,7 @@ static void linphone_core_init(LinphoneCore * lc, const LinphoneCoreVTable *vtab
 
 	linphone_core_set_state(lc,LinphoneGlobalStartup,"Starting up");
 	ortp_init();
-	if (liblinphone_serialize_logs == TRUE) {
-		ortp_set_log_thread_id(ortp_thread_self());
-	}
+	linphone_core_activate_log_serialization_if_needed();
 	lc->dyn_pt=96;
 	lc->default_profile=rtp_profile_new("default profile");
 	linphone_core_assign_payload_type(lc,&payload_type_pcmu8000,0,NULL);
@@ -6279,9 +6295,7 @@ static void linphone_core_uninit(LinphoneCore *lc)
 	linphone_core_message_storage_close(lc);
 	ms_exit();
 	linphone_core_set_state(lc,LinphoneGlobalOff,"Off");
-	if (liblinphone_serialize_logs == TRUE) {
-		ortp_set_log_thread_id(0);
-	}
+	linphone_core_deactivate_log_serialization_if_needed();
 	ms_list_free_with_data(lc->vtables,(void (*)(void *))linphone_core_v_table_destroy);
 }
 
diff --git a/tools/python/apixml2python/linphone_module.mustache b/tools/python/apixml2python/linphone_module.mustache
index 9704f0563..e31451cfa 100644
--- a/tools/python/apixml2python/linphone_module.mustache
+++ b/tools/python/apixml2python/linphone_module.mustache
@@ -285,6 +285,7 @@ PyMODINIT_FUNC initlinphone(void) {
 	PyObject *menum;
 
 	PyDateTime_IMPORT;
+	PyEval_InitThreads();
 	pylinphone_init_logging();
 
 {{#classes}}

From e3d198d247050723d47718dde22f28f20f78101a Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Wed, 10 Dec 2014 10:59:59 +0100
Subject: [PATCH 133/496] Simplify logging in unit tests of Python module.

---
 tools/python/unittests/linphonetester.py | 86 ++++++++++--------------
 tools/python/unittests/test_call.py      | 33 ++++-----
 tools/python/unittests/test_message.py   | 13 ++--
 tools/python/unittests/test_presence.py  | 13 ++--
 tools/python/unittests/test_register.py  | 11 +--
 tools/python/unittests/test_setup.py     |  5 --
 6 files changed, 61 insertions(+), 100 deletions(-)

diff --git a/tools/python/unittests/linphonetester.py b/tools/python/unittests/linphonetester.py
index 94a422ea3..a8a43e4e6 100644
--- a/tools/python/unittests/linphonetester.py
+++ b/tools/python/unittests/linphonetester.py
@@ -19,6 +19,21 @@ else:
     tester_resources_path = os.path.abspath(os.path.join(os.path.dirname(__file__), "../../../tester/"))
 
 
+def linphonetester_log_handler(level, msg):
+    method = getattr(logging.getLogger("linphonetester"), level)
+    if not msg.strip().startswith('[PYLINPHONE]'):
+        msg = '[CORE] ' + msg
+    method(msg)
+
+linphonetester_logger = logging.getLogger("linphonetester")
+handler = logging.StreamHandler(sys.stdout)
+handler.setLevel(logging.INFO)
+formatter = logging.Formatter('%(asctime)s.%(msecs)03d %(levelname)s: %(message)s', '%H:%M:%S')
+handler.setFormatter(formatter)
+linphonetester_logger.addHandler(handler)
+linphone.set_log_handler(linphonetester_log_handler)
+
+
 def create_address(domain):
     addr = linphone.Address.new(None)
     assert addr != None
@@ -34,24 +49,6 @@ def create_address(domain):
     return addr
 
 
-class Logger(logging.Logger):
-
-    def __init__(self, filename):
-        logging.Logger.__init__(self, filename)
-        handler = logging.FileHandler(filename)
-        handler.setLevel(logging.INFO)
-        formatter = logging.Formatter('%(asctime)s.%(msecs)03d %(levelname)s: %(message)s', '%H:%M:%S')
-        handler.setFormatter(formatter)
-        self.addHandler(handler)
-        linphone.set_log_handler(self.log_handler)
-
-    def log_handler(self, level, msg):
-        method = getattr(self, level)
-        if not msg.strip().startswith('[PYLINPHONE]'):
-            msg = '[CORE] ' + msg
-        method(msg)
-
-
 class Account:
     def __init__(self, id_addr, unique_id):
         self.created = False
@@ -101,21 +98,20 @@ class AccountManager:
     def account_created_auth_requested_cb(cls, lc, realm, username, domain):
         lc.user_data.auth_requested = True
 
-    def check_account(self, cfg, logger=None):
+    def check_account(self, cfg):
         create_account = False
         lc = cfg.core
         identity = cfg.identity
         id_addr = linphone.Address.new(identity)
         account = self._get_account(id_addr)
         if account is None:
-            if logger is not None:
-                logger.info("[TESTER] No account for {identity} exists, going to create one.".format(identity=identity))
+            linphonetester_logger.info("[TESTER] No account for {identity} exists, going to create one.".format(identity=identity))
             account = Account(id_addr, self.unique_id)
             self.accounts.append(account)
             create_account = True
         cfg.identity = account.modified_identity.as_string()
         if create_account:
-            self._create_account_on_server(account, cfg, logger)
+            self._create_account_on_server(account, cfg)
         ai = linphone.AuthInfo.new(account.modified_identity.username, None, account.password, None, None, account.modified_identity.domain)
         lc.add_auth_info(ai)
         return account.modified_identity
@@ -126,7 +122,7 @@ class AccountManager:
                 return account
         return None
 
-    def _create_account_on_server(self, account, refcfg, logger=None):
+    def _create_account_on_server(self, account, refcfg):
         vtable = {}
         tmp_identity = account.modified_identity.clone()
         vtable['registration_state_changed'] = AccountManager.account_created_on_server_cb
@@ -144,8 +140,7 @@ class AccountManager:
         cfg.expires = 3600
         lc.add_proxy_config(cfg)
         if AccountManager.wait_for_until(lc, None, lambda lc: lc.user_data.auth_requested == True, 10000) != True:
-            if logger is not None:
-                logger.critical("[TESTER] Account for {identity} could not be created on server.".format(identity=refcfg.identity))
+            linphonetester_logger.critical("[TESTER] Account for {identity} could not be created on server.".format(identity=refcfg.identity))
             sys.exit(-1)
         cfg.edit()
         cfg.identity = account.modified_identity.as_string()
@@ -153,13 +148,11 @@ class AccountManager:
         ai = linphone.AuthInfo.new(account.modified_identity.username, None, account.password, None, None, account.modified_identity.domain)
         lc.add_auth_info(ai)
         if AccountManager.wait_for_until(lc, None, lambda lc: lc.user_data.created == True, 3000) != True:
-            if logger is not None:
-                logger.critical("[TESTER] Account for {identity} is not working on server.".format(identity=refcfg.identity))
+            linphonetester_logger.critical("[TESTER] Account for {identity} is not working on server.".format(identity=refcfg.identity))
             sys.exit(-1)
         lc.remove_proxy_config(cfg)
         if AccountManager.wait_for_until(lc, None, lambda lc: lc.user_data.done == True, 3000) != True:
-            if logger is not None:
-                logger.critical("[TESTER] Account creation could not clean the registration context.")
+            linphonetester_logger.critical("[TESTER] Account creation could not clean the registration context.")
             sys.exit(-1)
 
 
@@ -392,9 +385,8 @@ class CoreManager:
     @classmethod
     def registration_state_changed(cls, lc, cfg, state, message):
         manager = lc.user_data
-        if manager.logger is not None:
-            manager.logger.info("[TESTER] New registration state {state} for user id [{identity}] at proxy [{addr}]".format(
-                state=linphone.RegistrationState.string(state), identity=cfg.identity, addr=cfg.server_addr))
+        linphonetester_logger.info("[TESTER] New registration state {state} for user id [{identity}] at proxy [{addr}]".format(
+            state=linphone.RegistrationState.string(state), identity=cfg.identity, addr=cfg.server_addr))
         if state == linphone.RegistrationState.RegistrationNone:
             manager.stats.number_of_LinphoneRegistrationNone += 1
         elif state == linphone.RegistrationState.RegistrationProgress:
@@ -411,9 +403,8 @@ class CoreManager:
     @classmethod
     def auth_info_requested(cls, lc, realm, username, domain):
         manager = lc.user_data
-        if manager.logger is not None:
-            manager.logger.info("[TESTER] Auth info requested  for user id [{username}] at realm [{realm}]".format(
-                username=username, realm=realm))
+        linphonetester_logger.info("[TESTER] Auth info requested  for user id [{username}] at realm [{realm}]".format(
+            username=username, realm=realm))
         manager.stats.number_of_auth_info_requested +=1
 
     @classmethod
@@ -424,9 +415,8 @@ class CoreManager:
         direction = "Outgoing"
         if call.call_log.dir == linphone.CallDir.CallIncoming:
             direction = "Incoming"
-        if manager.logger is not None:
-            manager.logger.info("[TESTER] {direction} call from [{from_address}] to [{to_address}], new state is [{state}]".format(
-                direction=direction, from_address=from_address, to_address=to_address, state=linphone.CallState.string(state)))
+        linphonetester_logger.info("[TESTER] {direction} call from [{from_address}] to [{to_address}], new state is [{state}]".format(
+            direction=direction, from_address=from_address, to_address=to_address, state=linphone.CallState.string(state)))
         if state == linphone.CallState.CallIncomingReceived:
             manager.stats.number_of_LinphoneCallIncomingReceived += 1
         elif state == linphone.CallState.CallOutgoingInit:
@@ -472,9 +462,8 @@ class CoreManager:
         from_str = message.from_address.as_string()
         text_str = message.text
         external_body_url = message.external_body_url
-        if manager.logger is not None:
-            manager.logger.info("[TESTER] Message from [{from_str}] is [{text_str}], external URL [{external_body_url}]".format(
-                from_str=from_str, text_str=text_str, external_body_url=external_body_url))
+        linphonetester_logger.info("[TESTER] Message from [{from_str}] is [{text_str}], external URL [{external_body_url}]".format(
+            from_str=from_str, text_str=text_str, external_body_url=external_body_url))
         manager.stats.number_of_LinphoneMessageReceived += 1
 
         if message.external_body_url is not None:
@@ -483,18 +472,16 @@ class CoreManager:
     @classmethod
     def new_subscription_requested(cls, lc, lf, url):
         manager = lc.user_data
-        if manager.logger is not None:
-            manager.logger.info("[TESTER] New subscription request: from [{from_str}], url [{url}]".format(
-                from_str=lf.address.as_string(), url=url))
+        linphonetester_logger.info("[TESTER] New subscription request: from [{from_str}], url [{url}]".format(
+            from_str=lf.address.as_string(), url=url))
         manager.stats.number_of_NewSubscriptionRequest += 1
         lc.add_friend(lf) # Accept subscription
 
     @classmethod
     def notify_presence_received(cls, lc, lf):
         manager = lc.user_data
-        if manager.logger is not None:
-            manager.logger.info("[TESTER] New notify request: from [{from_str}]".format(
-                from_str=lf.address.as_string()))
+        linphonetester_logger.info("[TESTER] New notify request: from [{from_str}]".format(
+            from_str=lf.address.as_string()))
         manager.stats.number_of_NotifyReceived += 1
         manager.stats.last_received_presence = lf.presence_model
         acttype = manager.stats.last_received_presence.activity.type
@@ -557,8 +544,7 @@ class CoreManager:
         elif acttype == linphone.PresenceActivityType.PresenceActivityWorship:
             manager.stats.number_of_LinphonePresenceActivityWorship += 1
 
-    def __init__(self, rc_file = None, check_for_proxies = True, vtable = {}, logger=None):
-        self.logger = logger
+    def __init__(self, rc_file = None, check_for_proxies = True, vtable = {}):
         if not vtable.has_key('registration_state_changed'):
             vtable['registration_state_changed'] = CoreManager.registration_state_changed
         if not vtable.has_key('auth_info_requested'):
@@ -631,4 +617,4 @@ class CoreManager:
     def check_accounts(self):
         pcl = self.lc.proxy_config_list
         for cfg in pcl:
-            self.identity = account_manager.check_account(cfg, self.logger)
+            self.identity = account_manager.check_account(cfg)
diff --git a/tools/python/unittests/test_call.py b/tools/python/unittests/test_call.py
index fa9069a99..daf1f8e83 100644
--- a/tools/python/unittests/test_call.py
+++ b/tools/python/unittests/test_call.py
@@ -7,14 +7,9 @@ import time
 
 class TestCall:
 
-    @classmethod
-    def setup_class(cls):
-        base, ext = os.path.splitext(os.path.basename(__file__))
-        cls.logger = Logger(base + '.log')
-
     def test_early_declined_call(self):
-        marie = CoreManager('marie_rc', logger=TestCall.logger)
-        pauline = CoreManager('pauline_rc', logger=TestCall.logger)
+        marie = CoreManager('marie_rc')
+        pauline = CoreManager('pauline_rc')
         marie.lc.max_calls = 0
         out_call = pauline.lc.invite_address(marie.identity)
 
@@ -31,8 +26,8 @@ class TestCall:
         pauline.stop()
 
     def test_declined_call(self):
-        marie = CoreManager('marie_rc', logger=TestCall.logger)
-        pauline = CoreManager('pauline_rc', logger=TestCall.logger)
+        marie = CoreManager('marie_rc')
+        pauline = CoreManager('pauline_rc')
         out_call = pauline.lc.invite_address(marie.identity)
         assert_equals(CoreManager.wait_for(pauline, marie, lambda pauline, marie: marie.stats.number_of_LinphoneCallIncomingReceived == 1), True)
         in_call = marie.lc.current_call
@@ -49,8 +44,8 @@ class TestCall:
         pauline.stop()
 
     def test_cancelled_call(self):
-        marie = CoreManager('marie_rc', logger=TestCall.logger)
-        pauline = CoreManager('pauline_rc', logger=TestCall.logger)
+        marie = CoreManager('marie_rc')
+        pauline = CoreManager('pauline_rc')
         out_call = pauline.lc.invite_address(marie.identity)
         assert_equals(CoreManager.wait_for(pauline, marie, lambda pauline, marie: pauline.stats.number_of_LinphoneCallOutgoingInit == 1), True)
         pauline.lc.terminate_call(out_call)
@@ -62,8 +57,8 @@ class TestCall:
         pauline.stop()
 
     def test_early_cancelled_call(self):
-        marie = CoreManager('marie_rc', logger=TestCall.logger)
-        pauline = CoreManager('empty_rc', check_for_proxies=False, logger=TestCall.logger)
+        marie = CoreManager('marie_rc')
+        pauline = CoreManager('empty_rc', check_for_proxies=False)
         out_call = pauline.lc.invite_address(marie.identity)
         assert_equals(CoreManager.wait_for(pauline, marie, lambda pauline, marie: pauline.stats.number_of_LinphoneCallOutgoingInit == 1), True)
         pauline.lc.terminate_call(out_call)
@@ -81,8 +76,8 @@ class TestCall:
         pauline.stop()
 
     def test_cancelled_ringing_call(self):
-        marie = CoreManager('marie_rc', logger=TestCall.logger)
-        pauline = CoreManager('pauline_rc', logger=TestCall.logger)
+        marie = CoreManager('marie_rc')
+        pauline = CoreManager('pauline_rc')
         out_call = pauline.lc.invite_address(marie.identity)
         assert_equals(CoreManager.wait_for(pauline, marie, lambda pauline, marie: marie.stats.number_of_LinphoneCallIncomingReceived == 1), True)
         pauline.lc.terminate_call(out_call)
@@ -93,8 +88,8 @@ class TestCall:
         pauline.stop()
 
     def test_call_failed_because_of_codecs(self):
-        marie = CoreManager('marie_rc', logger=TestCall.logger)
-        pauline = CoreManager('pauline_rc', logger=TestCall.logger)
+        marie = CoreManager('marie_rc')
+        pauline = CoreManager('pauline_rc')
         marie.disable_all_audio_codecs_except_one('pcmu')
         pauline.disable_all_audio_codecs_except_one('pcma')
         out_call = pauline.lc.invite_address(marie.identity)
@@ -109,8 +104,8 @@ class TestCall:
         pauline.stop()
 
     def test_simple_call(self):
-        marie = CoreManager('marie_rc', logger=TestCall.logger)
-        pauline = CoreManager('pauline_rc', logger=TestCall.logger)
+        marie = CoreManager('marie_rc')
+        pauline = CoreManager('pauline_rc')
         assert_equals(CoreManager.call(pauline, marie), True)
         #liblinphone_tester_check_rtcp(marie,pauline);
         CoreManager.end_call(marie, pauline)
diff --git a/tools/python/unittests/test_message.py b/tools/python/unittests/test_message.py
index 56a7e9e17..2e12793c0 100644
--- a/tools/python/unittests/test_message.py
+++ b/tools/python/unittests/test_message.py
@@ -8,11 +8,6 @@ import time
 
 class TestMessage:
 
-    @classmethod
-    def setup_class(cls):
-        base, ext = os.path.splitext(os.path.basename(__file__))
-        cls.logger = Logger(base + '.log')
-
     def wait_for_server_to_purge_messages(self, manager1, manager2):
         # Wait a little bit just to have time to purge message stored in the server
         CoreManager.wait_for_until(manager1, manager2, lambda manager1, manager2: False, 100)
@@ -20,8 +15,8 @@ class TestMessage:
         manager2.stats.reset()
 
     def test_text_message(self):
-        marie = CoreManager('marie_rc', logger=TestMessage.logger)
-        pauline = CoreManager('pauline_rc', logger=TestMessage.logger)
+        marie = CoreManager('marie_rc')
+        pauline = CoreManager('pauline_rc')
         chat_room = pauline.lc.get_chat_room(marie.identity)
         self.wait_for_server_to_purge_messages(marie, pauline)
         msg = chat_room.create_message("Bla bla bla bla")
@@ -32,8 +27,8 @@ class TestMessage:
         pauline.stop()
 
     def test_text_message_within_dialog(self):
-        marie = CoreManager('marie_rc', logger=TestMessage.logger)
-        pauline = CoreManager('pauline_rc', logger=TestMessage.logger)
+        marie = CoreManager('marie_rc')
+        pauline = CoreManager('pauline_rc')
         pauline.lc.config.set_int('sip', 'chat_use_call_dialogs', 1)
         chat_room = pauline.lc.get_chat_room(marie.identity)
         self.wait_for_server_to_purge_messages(marie, pauline)
diff --git a/tools/python/unittests/test_presence.py b/tools/python/unittests/test_presence.py
index 3de4e2e2a..59ac3e1f9 100644
--- a/tools/python/unittests/test_presence.py
+++ b/tools/python/unittests/test_presence.py
@@ -8,19 +8,14 @@ import time
 
 class PresenceCoreManager(CoreManager):
 
-    def __init__(self, username, logger = None):
-        CoreManager.__init__(self, 'empty_rc', False, logger=logger)
+    def __init__(self, username):
+        CoreManager.__init__(self, 'empty_rc', False)
         self.identity = self.lc.primary_contact_parsed
         self.identity.username = username
         self.lc.primary_contact = self.identity.as_string()
 
 class TestPresence:
 
-    @classmethod
-    def setup_class(cls):
-        base, ext = os.path.splitext(os.path.basename(__file__))
-        cls.logger = Logger(base + '.log')
-
     def subscribe_to_callee_presence(self, caller_mgr, callee_mgr):
         initial_caller_stats = deepcopy(caller_mgr.stats)
         initial_callee_stats = deepcopy(callee_mgr.stats)
@@ -37,8 +32,8 @@ class TestPresence:
         return result
 
     def test_simple_subscribe(self):
-        marie = PresenceCoreManager('marie', logger=TestPresence.logger)
-        pauline = PresenceCoreManager('pauline', logger=TestPresence.logger)
+        marie = PresenceCoreManager('marie')
+        pauline = PresenceCoreManager('pauline')
         assert_equals(self.subscribe_to_callee_presence(marie, pauline), True)
         marie.stop()
         pauline.stop()
diff --git a/tools/python/unittests/test_register.py b/tools/python/unittests/test_register.py
index 2660fbf1c..2a42194f0 100644
--- a/tools/python/unittests/test_register.py
+++ b/tools/python/unittests/test_register.py
@@ -12,11 +12,11 @@ class RegisterCoreManager(CoreManager):
         info = linphone.AuthInfo.new(test_username, None, test_password, None, realm, domain) # Create authentication structure from identity
         lc.add_auth_info(info) # Add authentication info to LinphoneCore
 
-    def __init__(self, with_auth = False, logger = None):
+    def __init__(self, with_auth = False):
         vtable = {}
         if with_auth:
             vtable['auth_info_requested'] = RegisterCoreManager.auth_info_requested
-        CoreManager.__init__(self, vtable=vtable, logger=logger)
+        CoreManager.__init__(self, vtable=vtable)
 
     def register_with_refresh(self, refresh, domain, route, late_auth_info = False, expected_final_state = linphone.RegistrationState.RegistrationOk):
         assert self.lc is not None
@@ -76,12 +76,7 @@ class RegisterCoreManager(CoreManager):
 
 class TestRegister:
 
-    @classmethod
-    def setup_class(cls):
-        base, ext = os.path.splitext(os.path.basename(__file__))
-        cls.logger = Logger(base + '.log')
-
     def test_simple_register(self):
-        cm = RegisterCoreManager(logger=TestRegister.logger)
+        cm = RegisterCoreManager()
         cm.register_with_refresh(False, None, None)
         assert_equals(cm.stats.number_of_auth_info_requested, 0)
diff --git a/tools/python/unittests/test_setup.py b/tools/python/unittests/test_setup.py
index ff710217f..9afcda434 100644
--- a/tools/python/unittests/test_setup.py
+++ b/tools/python/unittests/test_setup.py
@@ -5,11 +5,6 @@ import os
 
 class TestSetup:
 
-    @classmethod
-    def setup_class(cls):
-        base, ext = os.path.splitext(os.path.basename(__file__))
-        cls.logger = Logger(base + '.log')
-
     def test_address(self):
         create_address(None)
 

From 110d44b87c7ef8ebb9846456e2442b0710adeec8 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Wed, 10 Dec 2014 12:02:00 +0100
Subject: [PATCH 134/496] Fix file_transfer_server documentation for automatic
 wrappers.

---
 coreapi/linphonecore.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h
index 448c9aa57..81d9e4ab0 100644
--- a/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@ -3211,6 +3211,7 @@ LINPHONE_PUBLIC void linphone_core_set_tone(LinphoneCore *lc, LinphoneToneID id,
  * Globaly set an http file transfer server to be used for content type application/vnd.gsma.rcs-ft-http+xml. This value can also be set for a dedicated account using #linphone_proxy_config_set_file_transfer_server
  * @param[in] core #LinphoneCore to be modified
  * @param[in] server_url URL of the file server like https://file.linphone.org/upload.php
+ * @ingroup misc
  * */
 LINPHONE_PUBLIC void linphone_core_set_file_transfer_server(LinphoneCore *core, const char * server_url);
 
@@ -3218,6 +3219,7 @@ LINPHONE_PUBLIC void linphone_core_set_file_transfer_server(LinphoneCore *core,
  * Get the globaly set http file transfer server to be used for content type application/vnd.gsma.rcs-ft-http+xml.
  * @param[in] core #LinphoneCore from which to get the server_url
  * @return URL of the file server like https://file.linphone.org/upload.php
+ * @ingroup misc
  * */
 LINPHONE_PUBLIC const char * linphone_core_get_file_transfer_server(LinphoneCore *core);
 

From f229bd10da3cd6d9d06ffeb287dc476a54a014d1 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Wed, 10 Dec 2014 12:02:37 +0100
Subject: [PATCH 135/496] Add file transfer message test in Python.

---
 tools/python/unittests/linphonetester.py | 14 +++---
 tools/python/unittests/test_message.py   | 61 ++++++++++++++++++++++++
 2 files changed, 67 insertions(+), 8 deletions(-)

diff --git a/tools/python/unittests/linphonetester.py b/tools/python/unittests/linphonetester.py
index a8a43e4e6..76564d9b8 100644
--- a/tools/python/unittests/linphonetester.py
+++ b/tools/python/unittests/linphonetester.py
@@ -267,6 +267,8 @@ class CoreManagerStats:
         self.number_of_LinphoneCallEncryptedOn = 0
         self.number_of_LinphoneCallEncryptedOff = 0
 
+        self.last_received_chat_message = None
+
 
 class CoreManager:
 
@@ -465,8 +467,10 @@ class CoreManager:
         linphonetester_logger.info("[TESTER] Message from [{from_str}] is [{text_str}], external URL [{external_body_url}]".format(
             from_str=from_str, text_str=text_str, external_body_url=external_body_url))
         manager.stats.number_of_LinphoneMessageReceived += 1
-
-        if message.external_body_url is not None:
+        manager.stats.last_received_chat_message = message
+        if message.file_transfer_information is not None:
+            manager.stats.number_of_LinphoneMessageReceivedWithFile += 1
+        elif message.external_body_url is not None:
             manager.stats.number_of_LinphoneMessageExtBodyReceived += 1
 
     @classmethod
@@ -553,12 +557,6 @@ class CoreManager:
             vtable['call_state_changed'] = CoreManager.call_state_changed
         if not vtable.has_key('message_received'):
             vtable['message_received'] = CoreManager.message_received
-        #if not vtable.has_key('file_transfer_recv'):
-            #vtable['file_transfer_recv'] = CoreManager.file_transfer_recv
-        #if not vtable.has_key('file_transfer_send'):
-            #vtable['file_transfer_send'] = CoreManager.file_transfer_send
-        #if not vtable.has_key('file_transfer_progress_indication'):
-            #vtable['file_transfer_progress_indication'] = CoreManager.file_transfer_progress_indication
         #if not vtable.has_key('is_composing_received'):
             #vtable['is_composing_received'] = CoreManager.is_composing_received
         if not vtable.has_key('new_subscription_requested'):
diff --git a/tools/python/unittests/test_message.py b/tools/python/unittests/test_message.py
index 2e12793c0..ebd53fc66 100644
--- a/tools/python/unittests/test_message.py
+++ b/tools/python/unittests/test_message.py
@@ -8,6 +8,35 @@ import time
 
 class TestMessage:
 
+    @classmethod
+    def msg_state_changed(cls, msg, state):
+        stats = msg.chat_room.core.user_data.stats
+        linphonetester_logger.info("[TESTER] Message [{text}] [{state}]".format(text=msg.text, state=linphone.ChatMessageState.string(state)))
+        if state == linphone.ChatMessageState.ChatMessageStateDelivered:
+            stats.number_of_LinphoneMessageDelivered += 1
+        elif state == linphone.ChatMessageState.ChatMessageStateNotDelivered:
+            stats.number_of_LinphoneMessageNotDelivered += 1
+        elif state == linphone.ChatMessageState.ChatMessageStateInProgress:
+            stats.number_of_LinphoneMessageInProgress += 1
+        elif state == linphone.ChatMessageState.ChatMessageStateFileTransferError:
+            stats.number_of_LinphoneMessageNotDelivered += 1
+        else:
+            linphonetester_logger.error("[TESTER] Unexpected state [{state}] for message [{msg}]".format(msg=msg, state=linphone.ChatMessageState.string(state)))
+
+    @classmethod
+    def file_transfer_received(cls, msg, content, buf, size):
+        print buf, size
+        stats = msg.chat_room.core.user_data.stats
+        if msg.user_data is None:
+            msg.user_data = open('receive_file.dump', 'wb')
+            msg.user_data.write(buf)
+        else:
+            if size == 0: # Transfer complete
+                stats.number_of_LinphoneMessageExtBodyReceived += 1
+                msg.user_data.close()
+            else: # Store content
+                msg.user_data.write(buf)
+
     def wait_for_server_to_purge_messages(self, manager1, manager2):
         # Wait a little bit just to have time to purge message stored in the server
         CoreManager.wait_for_until(manager1, manager2, lambda manager1, manager2: False, 100)
@@ -39,3 +68,35 @@ class TestMessage:
         assert marie.lc.get_chat_room(pauline.identity) is not None
         marie.stop()
         pauline.stop()
+
+    def test_file_transfer_message(self):
+        big_file = "big file"
+        marie = CoreManager('marie_rc')
+        pauline = CoreManager('pauline_rc')
+        while len(big_file) < 128000:
+            big_file += big_file
+        l = list(big_file)
+        l[0] = 'S'
+        l[-1] = 'E'
+        big_file = ''.join(l)
+        pauline.lc.file_transfer_server = "https://www.linphone.org:444/lft.php"
+        chat_room = pauline.lc.get_chat_room(marie.identity)
+        content = pauline.lc.create_content()
+        content.type = 'text'
+        content.subtype = 'plain'
+        content.size = len(big_file) # total size to be transfered
+        content.name = 'bigfile.txt'
+        message = chat_room.create_file_transfer_message(content)
+        self.wait_for_server_to_purge_messages(marie, pauline)
+        message.callbacks.msg_state_changed = TestMessage.msg_state_changed
+        chat_room.send_chat_message(message)
+        assert_equals(CoreManager.wait_for(pauline, marie, lambda pauline, marie: marie.stats.number_of_LinphoneMessageReceivedWithFile == 1), True)
+        if marie.stats.last_received_chat_message is not None:
+            cbs = marie.stats.last_received_chat_message.callbacks
+            cbs.msg_state_changed = TestMessage.msg_state_changed
+            cbs.file_transfer_recv = TestMessage.file_transfer_received
+            marie.stats.last_received_chat_message.download_file()
+        assert_equals(CoreManager.wait_for(pauline, marie, lambda pauline, marie: marie.stats.number_of_LinphoneMessageExtBodyReceived == 1), True)
+        assert_equals(pauline.stats.number_of_LinphoneMessageInProgress, 1)
+        assert_equals(pauline.stats.number_of_LinphoneMessageDelivered, 1)
+        assert_equals(marie.stats.number_of_LinphoneMessageExtBodyReceived, 1)

From f0a3a75d99f9f89304dc53f20aea0cf7dc8a5661 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Wed, 10 Dec 2014 14:19:17 +0100
Subject: [PATCH 136/496] fix ice issue when ufrag/pwd are present in sdp media
 description only

---
 coreapi/misc.c | 28 ++++++++++++++++++++++++----
 mediastreamer2 |  2 +-
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/coreapi/misc.c b/coreapi/misc.c
index a869d5301..50ebe68ee 100644
--- a/coreapi/misc.c
+++ b/coreapi/misc.c
@@ -845,8 +845,25 @@ static void clear_ice_check_list(LinphoneCall *call, IceCheckList *removed){
 void linphone_call_update_ice_from_remote_media_description(LinphoneCall *call, const SalMediaDescription *md)
 {
 	bool_t ice_restarted = FALSE;
-
-	if ((md->ice_pwd[0] != '\0') && (md->ice_ufrag[0] != '\0')) {
+	bool_t ice_params_found=FALSE;
+	if ((md->ice_pwd[0] != '\0') && (md->ice_ufrag[0] != '\0'))  {
+		ice_params_found=TRUE;
+	} else {
+		int i;
+		for (i = 0; i < md->nb_streams; i++) {
+			const SalStreamDescription *stream = &md->streams[i];
+			IceCheckList *cl = ice_session_check_list(call->ice_session, i);
+			if (cl) {
+				if ((stream->ice_pwd[0] != '\0') && (stream->ice_ufrag[0] != '\0')) {
+					ice_params_found=TRUE;
+				} else {
+					ice_params_found=FALSE;
+					break;
+				}
+			}
+		}
+	}
+	if (ice_params_found) {
 		int i, j;
 
 		/* Check for ICE restart and set remote credentials. */
@@ -878,11 +895,14 @@ void linphone_call_update_ice_from_remote_media_description(LinphoneCall *call,
 			IceCheckList *cl = ice_session_check_list(call->ice_session, i);
 			if (cl && (stream->ice_pwd[0] != '\0') && (stream->ice_ufrag[0] != '\0')) {
 				if (ice_check_list_remote_credentials_changed(cl, stream->ice_ufrag, stream->ice_pwd)) {
-					if (ice_restarted == FALSE) {
+					if (ice_restarted == FALSE
+							&& ice_check_list_remote_ufrag(cl)
+							&& ice_check_list_remote_pwd(cl)) {
+							/* restart onlu if remote ufrag/paswd was already set*/
 						ice_session_restart(call->ice_session);
 						ice_restarted = TRUE;
 					}
-					ice_session_set_remote_credentials(call->ice_session, md->ice_ufrag, md->ice_pwd);
+					ice_check_list_set_remote_credentials(cl, stream->ice_ufrag, stream->ice_pwd);
 					break;
 				}
 			}
diff --git a/mediastreamer2 b/mediastreamer2
index b4c77370f..5837b2c2a 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit b4c77370f549f2bd325df484ce123c9f75a44aac
+Subproject commit 5837b2c2a0cee22b20f7fc73efdfed41455bba74

From 85c7fa27734c4ede8b8ffbd14e52b11db3fe359d Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Tue, 9 Dec 2014 10:18:17 +0100
Subject: [PATCH 137/496] Add an API to keep the accounts created on flexisip
 across calls to liblinphone_tester_run_tests(). This is used by iOS because
 of how the XCTest framework works.

---
 tester/liblinphone_tester.h | 18 ++++++++++++++++++
 tester/tester.c             | 15 ++++++++++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/tester/liblinphone_tester.h b/tester/liblinphone_tester.h
index 12531a57f..2c926b27d 100644
--- a/tester/liblinphone_tester.h
+++ b/tester/liblinphone_tester.h
@@ -79,6 +79,24 @@ extern void liblinphone_tester_set_fileprefix(const char* file_prefix);
 extern void liblinphone_tester_set_writable_dir_prefix(const char* writable_dir_prefix);
 extern int liblinphone_tester_ipv6_available(void);
 
+/**
+ * @brief Tells the tester whether or not to clean the accounts it has created between runs.
+ * @details Setting this to 1 will not clear the list of created accounts between successive
+ * calls to liblinphone_run_tests(). Some testing APIs call this function for *each* test, 
+ * in which case we should keep the accounts that were created for further testing.
+ * 
+ * You are supposed to manually call liblinphone_tester_clear_account when all the tests are 
+ * finished.
+ * 
+ * @param keep 1 to keep the accounts in-between runs, 0 to clear them after each run.
+ */
+extern void liblinphone_tester_keep_accounts( int keep );
+
+/**
+ * @brief Clears the created accounts during the testing session.
+ */
+extern void liblinphone_tester_clear_accounts(void);
+
 #ifdef __cplusplus
 };
 #endif
diff --git a/tester/tester.c b/tester/tester.c
index b705a8912..7c6ac48da 100644
--- a/tester/tester.c
+++ b/tester/tester.c
@@ -39,6 +39,7 @@ const char* test_username="liblinphone_tester";
 const char* test_password="secret";
 const char* test_route="sip2.linphone.org";
 int liblinphone_tester_use_log_file=0;
+static int liblinphone_tester_keep_accounts_flag = 0;
 
 #if WINAPI_FAMILY_PHONE_APP
 const char *liblinphone_tester_file_prefix="Assets";
@@ -545,7 +546,10 @@ int liblinphone_tester_run_tests(const char *suite_name, const char *test_name)
 	}
 
 	CU_cleanup_registry();
-	account_manager_destroy();
+
+	if( liblinphone_tester_keep_accounts_flag == 0){
+		liblinphone_tester_clear_accounts();
+	}
 	return ret;
 }
 
@@ -583,3 +587,12 @@ int liblinphone_tester_ipv6_available(void){
 	return FALSE;
 }
 
+void liblinphone_tester_keep_accounts( int keep ){
+	liblinphone_tester_keep_accounts_flag = keep;
+}
+
+void liblinphone_tester_clear_accounts(void){
+	account_manager_destroy();
+}
+
+

From 77aaf5bb8cf7ab29cadb64c424616655fefebbf3 Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Tue, 9 Dec 2014 10:22:22 +0100
Subject: [PATCH 138/496] Automatically use cores with file-backed sound in the
 tester for iOS. A lot of tests were missing linphone_core_user_files() calls,
 so having them automatically set up is easier.

---
 tester/tester.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tester/tester.c b/tester/tester.c
index 7c6ac48da..7cb44fc36 100644
--- a/tester/tester.c
+++ b/tester/tester.c
@@ -40,6 +40,7 @@ const char* test_password="secret";
 const char* test_route="sip2.linphone.org";
 int liblinphone_tester_use_log_file=0;
 static int liblinphone_tester_keep_accounts_flag = 0;
+static int manager_count = 0;
 
 #if WINAPI_FAMILY_PHONE_APP
 const char *liblinphone_tester_file_prefix="Assets";
@@ -259,11 +260,17 @@ LinphoneCoreManager* linphone_core_manager_new2(const char* rc_file, int check_f
 	else
 		proxy_count=0;
 
+	manager_count++;
+
 #if TARGET_OS_IPHONE
 	linphone_core_set_playback_device( mgr->lc, "AU: Audio Unit Tester");
 	linphone_core_set_capture_device( mgr->lc, "AU: Audio Unit Tester");
 	linphone_core_set_ringer_device( mgr->lc, "AQ: Audio Queue Device");
 	linphone_core_set_ringback(mgr->lc, NULL);
+	if( manager_count >= 2){
+		ms_message("Manager for '%s' using files", rc_file ? rc_file : "--");
+		linphone_core_use_files(mgr->lc, TRUE);
+	}
 #endif
 
 	if (proxy_count)
@@ -295,6 +302,7 @@ void linphone_core_manager_destroy(LinphoneCoreManager* mgr) {
 	if (mgr->lc) linphone_core_destroy(mgr->lc);
 	if (mgr->identity) linphone_address_destroy(mgr->identity);
 	if (mgr->stat.last_received_chat_message) linphone_chat_message_unref(mgr->stat.last_received_chat_message);
+	manager_count--;
 	ms_free(mgr);
 }
 

From dc78b3fe8a7cf49145557a253fd76d38294aace7 Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Tue, 9 Dec 2014 11:08:14 +0100
Subject: [PATCH 139/496] Skip file-based remote provisioning for iPhone, it is
 quite complicated to implement

---
 tester/remote_provisioning_tester.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tester/remote_provisioning_tester.c b/tester/remote_provisioning_tester.c
index 6864b573a..12c194a67 100644
--- a/tester/remote_provisioning_tester.c
+++ b/tester/remote_provisioning_tester.c
@@ -104,7 +104,10 @@ static void remote_provisioning_default_values(void) {
 static void remote_provisioning_file(void) {
 	LinphoneCoreManager* marie;
 	const LpConfig* conf;
-#if ANDROID
+#if TARGET_OS_IPHONE
+	ms_message("Skipping remote provisioning from file on iOS");
+	return;
+#elif defined(ANDROID)
 	marie = linphone_core_manager_new2("marie_remote_localfile_android_rc", FALSE);
 #else
 	marie = linphone_core_manager_new2("marie_remote_localfile_rc", FALSE);

From dc2d250d997a88849271c3564cb0a806ff377dec Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Wed, 10 Dec 2014 14:22:56 +0100
Subject: [PATCH 140/496] Perform sound card usage check when a call is
 dismissed or when a call transitions to pausing state

---
 coreapi/linphonecall.c |  1 +
 coreapi/linphonecore.c | 27 +++++++++++++++++++++++++--
 coreapi/private.h      |  2 ++
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index e6254e93a..ce9bfa38b 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -1018,6 +1018,7 @@ void linphone_call_set_state(LinphoneCall *call, LinphoneCallState cstate, const
 		if (cstate==LinphoneCallReleased){
 			linphone_call_set_released(call);
 		}
+		linphone_core_soundcard_hint_check(lc);
 	}
 }
 
diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index bc08d68f1..c3a838aef 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -6415,11 +6415,32 @@ bool_t linphone_core_can_we_add_call(LinphoneCore *lc)
 static void notify_soundcard_usage(LinphoneCore *lc, bool_t used){
 	MSSndCard *card=lc->sound_conf.capt_sndcard;
 	if (card && ms_snd_card_get_capabilities(card) & MS_SND_CARD_CAP_IS_SLOW){
-		ms_message("Notifying soundcard that we don't need it anymore for calls.");
 		ms_snd_card_set_usage_hint(card,used);
 	}
 }
 
+void linphone_core_soundcard_hint_check( LinphoneCore* lc){
+	MSList* the_calls = lc->calls;
+	LinphoneCall* call = NULL;
+	bool_t remaining_paused = FALSE;
+
+	/* check if the remaining calls are paused */
+	while( the_calls ){
+		call = the_calls->data;
+		if( call->state == LinphoneCallPausing || call->state == LinphoneCallPaused ){
+			remaining_paused = TRUE;
+			break;
+		}
+		the_calls = the_calls->next;
+	}
+
+	/* if no more calls or all calls are paused, we can free the soundcard */
+	if ( (lc->calls==NULL || remaining_paused) && !lc->use_files){
+		ms_message("Notifying soundcard that we don't need it anymore for calls.");
+		notify_soundcard_usage(lc,FALSE);
+	}
+}
+
 int linphone_core_add_call( LinphoneCore *lc, LinphoneCall *call)
 {
 	if (linphone_core_can_we_add_call(lc)){
@@ -6446,7 +6467,9 @@ int linphone_core_del_call( LinphoneCore *lc, LinphoneCall *call)
 		return -1;
 	}
 	lc->calls = the_calls;
-	if (lc->calls==NULL) notify_soundcard_usage(lc,FALSE);
+
+	linphone_core_soundcard_hint_check(lc);
+
 	return 0;
 }
 
diff --git a/coreapi/private.h b/coreapi/private.h
index 3aa9b283d..a8816b04b 100644
--- a/coreapi/private.h
+++ b/coreapi/private.h
@@ -374,6 +374,8 @@ void linphone_notify_parse_presence(SalOp *op, const char *content_type, const c
 void linphone_notify_convert_presence_to_xml(SalOp *op, SalPresenceModel *presence, const char *contact, char **content);
 void linphone_notify_recv(LinphoneCore *lc, SalOp *op, SalSubscribeStatus ss, SalPresenceModel *model);
 void linphone_proxy_config_process_authentication_failure(LinphoneCore *lc, SalOp *op);
+void linphone_core_soundcard_hint_check(LinphoneCore* lc);
+
 
 void linphone_subscription_answered(LinphoneCore *lc, SalOp *op);
 void linphone_subscription_closed(LinphoneCore *lc, SalOp *op);

From 1b61ea215ef8bbf2d8d85a1b5c802ffe4074f1a9 Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Wed, 10 Dec 2014 14:23:03 +0100
Subject: [PATCH 141/496] Update ms2

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 5837b2c2a..faabba0fb 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 5837b2c2a0cee22b20f7fc73efdfed41455bba74
+Subproject commit faabba0fb7d388cf20c620c103e4955e8afc903f

From b986af37339679319d4c912b91d8dfaf28051fe1 Mon Sep 17 00:00:00 2001
From: Johan Pascal <johan.pascal@belledonne-communications.com>
Date: Wed, 10 Dec 2014 15:11:36 +0100
Subject: [PATCH 142/496] Add dtls srtp

---
 configure.ac                    |  12 ++++
 coreapi/bellesip_sal/sal_impl.c |  36 ++++++++++
 coreapi/bellesip_sal/sal_sdp.c  |  98 +++++++++++++++++++++++++
 coreapi/call_params.c           |   2 +
 coreapi/linphonecall.c          | 124 ++++++++++++++++++++++++++++----
 coreapi/linphonecore.c          |  33 +++++++++
 coreapi/linphonecore.h          |  19 ++++-
 coreapi/offeranswer.c           |  46 ++++++++++++
 coreapi/private.h               |   2 +
 coreapi/sal.c                   |  18 ++++-
 gtk/incall_view.c               |   6 ++
 gtk/main.c                      |   5 ++
 gtk/propertybox.c               |  32 +++++++--
 include/sal/sal.h               |  27 +++++++
 mediastreamer2                  |   2 +-
 oRTP                            |   2 +-
 16 files changed, 440 insertions(+), 24 deletions(-)

diff --git a/configure.ac b/configure.ac
index 067a13b62..02b034f8d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -585,6 +585,16 @@ AC_ARG_ENABLE(zrtp,
 	[zrtp=false]
 )
 
+AC_ARG_ENABLE(dtls,
+	[AS_HELP_STRING([--enable-dtls], [Turn on dtls support - requires polarssl > 1.4])],
+	[case "${enableval}" in
+		yes)	dtls=true ;;
+		no)	dtls=false ;;
+		*)	AC_MSG_ERROR(bad value ${enableval} for --enable-dtls) ;;
+	esac],
+	[dtls=false]
+)
+
 dnl build console if required
 AM_CONDITIONAL(BUILD_CONSOLE, test x$console_ui = xtrue)
 
@@ -595,6 +605,7 @@ dnl compilation of gtk user interface
 AM_CONDITIONAL(BUILD_GTK_UI, [test x$gtk_ui = xtrue ] )
 AM_CONDITIONAL(BUILD_WIN32, test x$mingw_found = xyes )
 AM_CONDITIONAL(BUILD_ZRTP, test x$zrtp = xtrue)
+AM_CONDITIONAL(BUILD_DTLS, test x$dtls = xtrue)
 
 dnl check getenv
 AH_TEMPLATE([HAVE_GETENV])
@@ -943,6 +954,7 @@ printf "* %-30s %s\n" "Console interface"	$console_ui
 printf "* %-30s %s\n" "Tools"			$build_tools
 printf "* %-30s %s\n" "Message storage"		$enable_msg_storage
 printf "* %-30s %s\n" "zRTP encryption"		$zrtp
+printf "* %-30s %s\n" "DTLS encryption"		$dtls
 printf "* %-30s %s\n" "uPnP support" 		$build_upnp
 printf "* %-30s %s\n" "LDAP support" 		$enable_ldap
 
diff --git a/coreapi/bellesip_sal/sal_impl.c b/coreapi/bellesip_sal/sal_impl.c
index 052c83971..0dfc10aa7 100644
--- a/coreapi/bellesip_sal/sal_impl.c
+++ b/coreapi/bellesip_sal/sal_impl.c
@@ -1060,6 +1060,42 @@ void sal_signing_key_parse_file(SalAuthInfo* auth_info, const char* path, const
 	if (auth_info->key) belle_sip_object_ref((belle_sip_object_t *) auth_info->key);
 }
 
+/**
+ * Parse a directory to get a certificate with the given subject common name
+ *
+ */
+void sal_certificates_chain_parse_directory(unsigned char **certificate_pem, unsigned char **key_pem, unsigned char **fingerprint, const char* path, const char *subject, SalCertificateRawFormat format, bool_t generate_certificate, bool_t generate_dtls_fingerprint) {
+	belle_sip_certificates_chain_t *certificate = NULL;
+	belle_sip_signing_key_t *key = NULL;
+	*certificate_pem = NULL;
+	*key_pem = NULL;
+	if (belle_sip_get_certificate_and_pkey_in_dir(path, subject, &certificate, &key, (belle_sip_certificate_raw_format_t)format) == 0) {
+		*certificate_pem = belle_sip_get_certificates_pem(certificate);
+		*key_pem = belle_sip_get_key_pem(key);
+		ms_message("Retrieve certificate with CN=%s successful\n", subject);
+	} else {
+		if (generate_certificate == TRUE) {
+			if ( belle_sip_generate_self_signed_certificate(path, subject, &certificate, &key) == 0) {
+				*certificate_pem = belle_sip_get_certificates_pem(certificate);
+				*key_pem = belle_sip_get_key_pem(key);
+				ms_message("Generate self-signed certificate with CN=%s successful\n", subject);
+			}
+		}
+	}
+	/* generate the fingerprint as described in RFC4572 if needed */
+	if ((generate_dtls_fingerprint == TRUE) && (fingerprint != NULL)) {
+		*fingerprint = belle_sip_generate_certificate_fingerprint(certificate);
+	}
+
+	/* free key and certificate */
+	if ( certificate != NULL ) {
+		belle_sip_object_unref(certificate);
+	}
+	if ( key != NULL ) {
+		belle_sip_object_unref(key);
+	}
+}
+
 unsigned char * sal_get_random_bytes(unsigned char *ret, size_t size){
 	return belle_sip_random_bytes(ret,size);
 }
diff --git a/coreapi/bellesip_sal/sal_sdp.c b/coreapi/bellesip_sal/sal_sdp.c
index fe952bb56..cc6db442f 100644
--- a/coreapi/bellesip_sal/sal_sdp.c
+++ b/coreapi/bellesip_sal/sal_sdp.c
@@ -233,6 +233,26 @@ static void stream_description_to_sdp ( belle_sdp_session_description_t *session
 			}else break;
 		}
 	}
+
+	/* insert DTLS session attribute if needed */
+	if ((stream->proto == SalProtoUdpTlsRtpSavpf) || (stream->proto == SalProtoUdpTlsRtpSavp)) {
+		if ((stream->dtls_role != SalDtlsRoleInvalid) && (strlen(stream->dtls_fingerprint)>0)) {
+			switch(stream->dtls_role) {
+				case SalDtlsRoleIsClient:
+					belle_sdp_media_description_add_attribute(media_desc, belle_sdp_attribute_create("setup","active"));
+					break;
+				case SalDtlsRoleIsServer:
+					belle_sdp_media_description_add_attribute(media_desc, belle_sdp_attribute_create("setup","passive"));
+					break;
+				case SalDtlsRoleUnset:
+				default:
+					belle_sdp_media_description_add_attribute(media_desc, belle_sdp_attribute_create("setup","actpass"));
+					break;
+			}
+			belle_sdp_media_description_add_attribute(media_desc, belle_sdp_attribute_create("fingerprint",stream->dtls_fingerprint));
+		}
+	}
+
 	switch ( stream->dir ) {
 		case SalStreamSendRecv:
 			/*dir="sendrecv";*/
@@ -351,6 +371,23 @@ belle_sdp_session_description_t * media_description_to_sdp ( const SalMediaDescr
 	if (desc->ice_pwd[0] != '\0') belle_sdp_session_description_add_attribute(session_desc, belle_sdp_attribute_create("ice-pwd",desc->ice_pwd));
 	if (desc->ice_ufrag[0] != '\0') belle_sdp_session_description_add_attribute(session_desc, belle_sdp_attribute_create("ice-ufrag",desc->ice_ufrag));
 
+	/* insert DTLS session attribute if needed */
+	if ((desc->dtls_role != SalDtlsRoleInvalid) && (strlen(desc->dtls_fingerprint)>0)) {
+		switch(desc->dtls_role) {
+			case SalDtlsRoleIsClient:
+				belle_sdp_session_description_add_attribute(session_desc, belle_sdp_attribute_create("setup","active"));
+				break;
+			case SalDtlsRoleIsServer:
+				belle_sdp_session_description_add_attribute(session_desc, belle_sdp_attribute_create("setup","passive"));
+				break;
+			case SalDtlsRoleUnset:
+			default:
+				belle_sdp_session_description_add_attribute(session_desc, belle_sdp_attribute_create("setup","actpass"));
+				break;
+		}
+		belle_sdp_session_description_add_attribute(session_desc, belle_sdp_attribute_create("fingerprint",desc->dtls_fingerprint));
+	}
+
 	if (desc->rtcp_xr.enabled == TRUE) {
 		belle_sdp_session_description_add_attribute(session_desc, create_rtcp_xr_attribute(&desc->rtcp_xr));
 	}
@@ -646,6 +683,10 @@ static SalStreamDescription * sdp_to_stream_description(SalMediaDescription *md,
 			stream->proto = SalProtoRtpAvpf;
 		} else if (strcasecmp(proto, "RTP/SAVPF") == 0) {
 			stream->proto = SalProtoRtpSavpf;
+		} else if (strcasecmp(proto, "UDP/TLS/RTP/SAVP") == 0) {
+			stream->proto = SalProtoUdpTlsRtpSavp;
+		} else if (strcasecmp(proto, "UDP/TLS/RTP/SAVPF") == 0) {
+			stream->proto = SalProtoUdpTlsRtpSavpf;
 		} else {
 			strncpy(stream->proto_other,proto,sizeof(stream->proto_other)-1);
 		}
@@ -701,6 +742,36 @@ static SalStreamDescription * sdp_to_stream_description(SalMediaDescription *md,
 		}
 	}
 
+	/* Read DTLS specific attributes : check is some are found in the stream description otherwise copy the session description one(which are at least set to Invalid) */
+	stream->dtls_role = SalDtlsRoleInvalid;
+	stream->dtls_fingerprint[0] = '\0';
+	if (((stream->proto == SalProtoUdpTlsRtpSavpf) || (stream->proto == SalProtoUdpTlsRtpSavp))) {
+		attribute=belle_sdp_media_description_get_attribute(media_desc,"setup");
+		if (attribute && (value=belle_sdp_attribute_get_value(attribute))!=NULL){
+			if (strncmp(value, "actpass", 7) == 0) {
+				stream->dtls_role = SalDtlsRoleUnset;
+			} else if (strncmp(value, "active", 6) == 0) {
+				stream->dtls_role = SalDtlsRoleIsClient;
+			} else if (strncmp(value, "passive", 7) == 0) {
+				stream->dtls_role = SalDtlsRoleIsServer;
+			}
+
+			if (stream->dtls_role != SalDtlsRoleInvalid) {
+				attribute=belle_sdp_media_description_get_attribute(media_desc,"fingerprint");
+				if (attribute && (value=belle_sdp_attribute_get_value(attribute))!=NULL){
+					strncpy(stream->dtls_fingerprint, value, strlen(value)+1);
+				} else {
+					/* no valid stream attributes, get them from session */
+					stream->dtls_role = md->dtls_role;
+					strncpy(stream->dtls_fingerprint, md->dtls_fingerprint, strlen(md->dtls_fingerprint)+1);
+				}
+			}
+		} else { /* no setup attribute found in the stream, get the one from the session */
+			stream->dtls_role = md->dtls_role;
+			strncpy(stream->dtls_fingerprint, md->dtls_fingerprint, strlen(md->dtls_fingerprint)+1);
+		}
+	}
+
 	/* Read crypto lines if any */
 	if ((stream->proto == SalProtoRtpSavpf) || (stream->proto == SalProtoRtpSavp)) {
 		sdp_parse_media_crypto_parameters(media_desc, stream);
@@ -756,6 +827,33 @@ int sdp_to_media_description ( belle_sdp_session_description_t  *session_desc, S
 		desc->dir=SalStreamInactive;
 	}
 
+	/* Read dtls specific session attributes if any (setup and fingerprint - rfc5763) */
+	/* Presence of a valid dtls offer(setup and fingerprint attribute) is set in media Description by a dtls_fingerprint string longer than 0
+	 * and a dtls_role != SalDtlsRoleInvalid */
+	desc->dtls_role = SalDtlsRoleInvalid;
+	desc->dtls_fingerprint[0] = '\0';
+	value=belle_sdp_session_description_get_attribute_value(session_desc,"setup");
+	if (value){
+		if (strncmp(value, "actpass", 7) == 0) {
+			desc->dtls_role = SalDtlsRoleUnset;
+		} else if (strncmp(value, "active", 6) == 0) {
+			desc->dtls_role = SalDtlsRoleIsClient;
+		} else if (strncmp(value, "passive", 7) == 0) {
+			desc->dtls_role = SalDtlsRoleIsServer;
+		}
+	}
+
+	if (desc->dtls_role != SalDtlsRoleInvalid) {
+		value=belle_sdp_session_description_get_attribute_value(session_desc,"fingerprint");
+		if (value){
+			strncpy(desc->dtls_fingerprint, value, strlen(value)+1);
+		} else {
+			desc->dtls_role = SalDtlsRoleInvalid;
+		}
+	}
+
+
+
 	/* Get ICE remote ufrag and remote pwd, and ice_lite flag */
 	value=belle_sdp_session_description_get_attribute_value(session_desc,"ice-ufrag");
 	if (value) strncpy(desc->ice_ufrag, value, sizeof(desc->ice_ufrag) - 1);
diff --git a/coreapi/call_params.c b/coreapi/call_params.c
index a48066169..255103fb8 100644
--- a/coreapi/call_params.c
+++ b/coreapi/call_params.c
@@ -27,6 +27,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 SalMediaProto get_proto_from_call_params(const LinphoneCallParams *params) {
 	if ((params->media_encryption == LinphoneMediaEncryptionSRTP) && params->avpf_enabled) return SalProtoRtpSavpf;
 	if (params->media_encryption == LinphoneMediaEncryptionSRTP) return SalProtoRtpSavp;
+	if ((params->media_encryption == LinphoneMediaEncryptionDTLS) && params->avpf_enabled) return SalProtoUdpTlsRtpSavpf;
+	if (params->media_encryption == LinphoneMediaEncryptionDTLS) return SalProtoUdpTlsRtpSavp;
 	if (params->avpf_enabled) return SalProtoRtpAvpf;
 	return SalProtoRtpAvp;
 }
diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index dc991c616..2990406aa 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -158,8 +158,12 @@ static void propagate_encryption_changed(LinphoneCall *call){
 		call->current_params->media_encryption=LinphoneMediaEncryptionNone;
 		linphone_core_notify_call_encryption_changed(call->core, call, FALSE, call->auth_token);
 	} else {
-		ms_message("All streams are encrypted");
-		call->current_params->media_encryption=LinphoneMediaEncryptionZRTP;
+		ms_message("All streams are encrypted key exchanged using %s", call->current_params->media_encryption==LinphoneMediaEncryptionZRTP?"ZRTP":call->current_params->media_encryption==LinphoneMediaEncryptionDTLS?"DTLS":"Unknown mechanism");
+		if (call->auth_token) {/* ZRTP only is using auth_token */
+			call->current_params->media_encryption=LinphoneMediaEncryptionZRTP;
+		} else { /* otherwise it must be DTLS as SDES doesn't go through this function */
+			call->current_params->media_encryption=LinphoneMediaEncryptionDTLS;
+		}
 		linphone_core_notify_call_encryption_changed(call->core, call, TRUE, call->auth_token);
 	}
 }
@@ -171,8 +175,10 @@ static void linphone_call_audiostream_encryption_changed(void *data, bool_t encr
 	call = (LinphoneCall *)data;
 
 	if (encrypted) {
-		snprintf(status,sizeof(status)-1,_("Authentication token is %s"),call->auth_token);
-		linphone_core_notify_display_status(call->core, status);
+		if (call->params->media_encryption==LinphoneMediaEncryptionZRTP) { /* if encryption is DTLS, no status to be displayed */
+			snprintf(status,sizeof(status)-1,_("Authentication token is %s"),call->auth_token);
+			linphone_core_notify_display_status(call->core, status);
+		}
 	}
 
 	propagate_encryption_changed(call);
@@ -472,6 +478,14 @@ void linphone_call_make_local_media_description(LinphoneCore *lc, LinphoneCall *
 	}
 
 	setup_encryption_keys(call,md);
+	/* if media encryption is set to DTLS check presence of fingerprint in the call which shall have been set at stream init but it may have failed when retrieving certificate resulting in no fingerprint present and then DTLS not usable */
+	if ((call->params->media_encryption==LinphoneMediaEncryptionDTLS) && (call->dtls_certificate_fingerprint!= NULL)) {
+		memcpy(md->dtls_fingerprint, call->dtls_certificate_fingerprint, strlen((const char *)(call->dtls_certificate_fingerprint))); /* get the self fingerprint from call(it's computed at stream init) */
+		md->dtls_role = SalDtlsRoleUnset; /* if we are offering, SDP will have actpass setup attribute when role is unset, if we are responding the result mediadescription will be set to SalDtlsRoleIsClient */
+	} else {
+		md->dtls_fingerprint[0] = '\0';
+		md->dtls_role = SalDtlsRoleInvalid;
+	}
 	setup_rtcp_fb(call, md);
 	setup_rtcp_xr(call, md);
 
@@ -572,6 +586,7 @@ static void linphone_call_init_common(LinphoneCall *call, LinphoneAddress *from,
 	call->camera_enabled=TRUE;
 	call->current_params = linphone_call_params_new();
 	call->current_params->media_encryption=LinphoneMediaEncryptionNone;
+	call->dtls_certificate_fingerprint = NULL;
 
 	linphone_core_get_audio_port_range(call->core, &min_port, &max_port);
 	port_config_set(call,0,min_port,max_port);
@@ -735,7 +750,7 @@ static void linphone_call_incoming_select_ip_version(LinphoneCall *call){
 void linphone_call_set_compatible_incoming_call_parameters(LinphoneCall *call, const SalMediaDescription *md) {
 	call->params->has_video &= linphone_core_media_description_contains_video_stream(md);
 
-	/* Handle AVPF and SRTP. */
+	/* Handle AVPF, SRTP and DTLS. */
 	call->params->avpf_enabled = sal_media_description_has_avpf(md);
 	if (call->params->avpf_enabled == TRUE) {
 		if (call->dest_proxy != NULL) {
@@ -744,6 +759,9 @@ void linphone_call_set_compatible_incoming_call_parameters(LinphoneCall *call, c
 			call->params->avpf_rr_interval = linphone_core_get_avpf_rr_interval(call->core)*1000;
 		}
 	}
+	if ((sal_media_description_has_dtls(md) == TRUE) && (media_stream_dtls_supported() == TRUE)) {
+		call->params->media_encryption = LinphoneMediaEncryptionDTLS;
+	}
 	if ((sal_media_description_has_srtp(md) == TRUE) && (media_stream_srtp_supported() == TRUE)) {
 		call->params->media_encryption = LinphoneMediaEncryptionSRTP;
 	}
@@ -917,8 +935,19 @@ static void linphone_call_set_terminated(LinphoneCall *call){
 void linphone_call_fix_call_parameters(LinphoneCall *call){
 	call->params->has_video=call->current_params->has_video;
 
-	if (call->params->media_encryption != LinphoneMediaEncryptionZRTP) /*in case of ZRTP call parameter are handle after zrtp negociation*/
-		call->params->media_encryption=call->current_params->media_encryption;
+	switch(call->params->media_encryption) {
+		case LinphoneMediaEncryptionZRTP:
+		case LinphoneMediaEncryptionDTLS:
+		case LinphoneMediaEncryptionNone:
+			/* do nothing */
+			break;
+		case LinphoneMediaEncryptionSRTP:
+			call->params->media_encryption=call->current_params->media_encryption;
+			break;
+		default:
+			ms_fatal("Unknown media encryption type on call [%p]", call);
+			break;
+	}
 }
 
 const char *linphone_call_state_to_string(LinphoneCallState cs){
@@ -1066,6 +1095,10 @@ static void linphone_call_destroy(LinphoneCall *obj){
 		ms_free(obj->auth_token);
 		obj->auth_token=NULL;
 	}
+	if (obj->dtls_certificate_fingerprint) {
+		ms_free(obj->dtls_certificate_fingerprint);
+		obj->dtls_certificate_fingerprint=NULL;
+	}
 	if (obj->dtmfs_timer) {
 		linphone_call_cancel_dtmfs(obj);
 	}
@@ -1118,11 +1151,16 @@ const LinphoneCallParams * linphone_call_get_current_params(LinphoneCall *call){
 #endif
 
 	if (linphone_call_all_streams_encrypted(call)) {
-		 if (linphone_call_get_authentication_token(call)) {
-			 call->current_params->media_encryption=LinphoneMediaEncryptionZRTP;
-		 } else {
-			 call->current_params->media_encryption=LinphoneMediaEncryptionSRTP;
-		 }
+		if (linphone_call_get_authentication_token(call)) {
+			call->current_params->media_encryption=LinphoneMediaEncryptionZRTP;
+		} else {
+			/* TODO : check this or presence of dtls_fingerprint in the call? */
+			if (call->params->media_encryption == LinphoneMediaEncryptionDTLS) {
+				call->current_params->media_encryption=LinphoneMediaEncryptionDTLS;
+			} else {
+				call->current_params->media_encryption=LinphoneMediaEncryptionSRTP;
+			}
+		}
 	} else {
 		call->current_params->media_encryption=LinphoneMediaEncryptionNone;
 	}
@@ -1553,6 +1591,34 @@ void linphone_call_init_audio_stream(LinphoneCall *call){
 	if (call->sessions[0].rtp_session==NULL){
 		call->audiostream=audiostream=audio_stream_new(call->media_ports[0].rtp_port,call->media_ports[0].rtcp_port,call->af==AF_INET6);
 		rtp_session_set_symmetric_rtp(audiostream->ms.sessions.rtp_session,linphone_core_symmetric_rtp_enabled(lc));
+		if (call->params->media_encryption==LinphoneMediaEncryptionDTLS) {
+			MSDtlsSrtpParams params;
+			unsigned char *certificate, *key;
+			memset(&params,0,sizeof(MSDtlsSrtpParams));
+			/* TODO : search for a certificate with CNAME=sip uri(retrieved from variable me) or defautl  celui par default linphone-dtls-default-identity */
+			/* This will parse the directory to find a matching fingerprint or generate it if not found */
+			/* returned string must be freed */
+			sal_certificates_chain_parse_directory(&certificate, &key, &call->dtls_certificate_fingerprint, lc->user_certificates_path, "linphone-dtls-default-identity", SAL_CERTIFICATE_RAW_FORMAT_PEM, TRUE, TRUE);
+
+			if (key!= NULL && certificate!=NULL) {
+				params.pem_certificate = (char *)certificate;
+				params.pem_pkey = (char *)key;
+				params.role = MSDtlsSrtpRoleUnset; /* default is unset, then check if we have a result SalMediaDescription */
+				audio_stream_enable_dtls(call->audiostream,&params);
+				ms_free(certificate);
+				ms_free(key);
+			} else {
+				ms_error("Unable to retrieve or generate DTLS certificate and key - DTLS disabled");
+				/* TODO : check if encryption forced, if yes, stop call */
+			}
+		#if TODO_DTLS_VIDEO_ENCRYPTION //VIDEO_ENABLED
+			if (media_stream_secured((MediaStream *)call->audiostream) && media_stream_get_state((MediaStream *)call->videostream) == MSStreamStarted) {
+				/*audio stream is already encrypted and video stream is active*/
+				memset(&params,0,sizeof(MSDtlsSrtpParams));
+				video_stream_enable_dtls(call->videostream,call->audiostream,&params);
+			}
+		#endif
+		}
 	}else{
 		call->audiostream=audio_stream_new_with_sessions(&call->sessions[0]);
 	}
@@ -2241,9 +2307,32 @@ void linphone_call_start_media_streams(LinphoneCall *call, bool_t all_inputs_mut
 			video_stream_enable_zrtp(call->videostream,call->audiostream,&params);
 		}
 #endif
-	}else{
+	} else if (call->params->media_encryption==LinphoneMediaEncryptionDTLS) {
+		/* DTLS engine was already initialised during stream init. Before starting it we must be sure that the role(client or server) is set.
+		 * Role may have already been set to server if we initiate the call and already received a packet from peer, in that case do nothing */
+		SalDtlsRole salRole = call->resultdesc->streams[0].dtls_role; /* TODO: is streams[0] necessary the audiostream in the media description ? */
+		if (salRole==SalDtlsRoleInvalid) { /* it's invalid in streams[0] but check also at session level */
+			salRole = call->resultdesc->dtls_role;
+		}
+
+		if (salRole!=SalDtlsRoleInvalid) { /* if DTLS is available at both end points */
+			/* give the peer certificate fingerprint to dtls context */
+			SalMediaDescription *remote_desc = sal_call_get_remote_media_description(call->op);
+			ms_dtls_srtp_set_peer_fingerprint(call->audiostream->ms.sessions.dtls_context, remote_desc->streams[0].dtls_fingerprint);
+		} else {
+			ms_warning("unable to start DTLS engine, Dtls role in resulting media description is invalid\n");
+		}
+		if (salRole == SalDtlsRoleIsClient) { /* local endpoint is client */
+			ms_dtls_srtp_set_role(call->audiostream->ms.sessions.dtls_context, MSDtlsSrtpRoleIsClient); /* set the role to client */
+			ms_dtls_srtp_start(call->audiostream->ms.sessions.dtls_context);  /* then start the engine, it will send the DTLS client Hello */
+		} else if (salRole == SalDtlsRoleIsServer) { /* local endpoint is server */
+			ms_dtls_srtp_set_role(call->audiostream->ms.sessions.dtls_context, MSDtlsSrtpRoleIsServer); /* this may complete the server setup */
+			/* no need to start engine, we are waiting for DTLS Client Hello */
+		}
+
+	} else {
 		call->current_params->media_encryption=linphone_call_all_streams_encrypted(call) ?
-			LinphoneMediaEncryptionSRTP : LinphoneMediaEncryptionNone;
+		LinphoneMediaEncryptionSRTP : LinphoneMediaEncryptionNone;
 	}
 
 	if ((call->ice_session != NULL) && (ice_session_state(call->ice_session) != IS_Completed)) {
@@ -2968,7 +3057,12 @@ void linphone_call_handle_stream_events(LinphoneCall *call, int stream_index){
 		} else if (evt == ORTP_EVENT_ZRTP_SAS_READY) {
 			if (ms->type==AudioStreamType)
 				linphone_call_audiostream_auth_token_ready(call, evd->info.zrtp_sas.sas, evd->info.zrtp_sas.verified);
-		} else if ((evt == ORTP_EVENT_ICE_SESSION_PROCESSING_FINISHED) || (evt == ORTP_EVENT_ICE_GATHERING_FINISHED)
+		} else if (evt == ORTP_EVENT_DTLS_ENCRYPTION_CHANGED) {
+			if (ms->type==AudioStreamType)
+				linphone_call_audiostream_encryption_changed(call, evd->info.dtls_stream_encrypted);
+			else if (ms->type==VideoStreamType)
+				propagate_encryption_changed(call);
+		}else if ((evt == ORTP_EVENT_ICE_SESSION_PROCESSING_FINISHED) || (evt == ORTP_EVENT_ICE_GATHERING_FINISHED)
 			|| (evt == ORTP_EVENT_ICE_LOSING_PAIRS_COMPLETED) || (evt == ORTP_EVENT_ICE_RESTART_NEEDED)) {
 			handle_ice_events(call, ev);
 		} else if (evt==ORTP_EVENT_TELEPHONE_EVENT){
diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 3ead49966..a3fbb21c7 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -28,6 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <sys/stat.h>
 #include <ortp/telephonyevents.h>
 #include <mediastreamer2/zrtp.h>
+#include <mediastreamer2/dtls_srtp.h>
 #include "mediastreamer2/mediastream.h"
 #include "mediastreamer2/mseventqueue.h"
 #include "mediastreamer2/msvolume.h"
@@ -1487,6 +1488,11 @@ static void misc_config_read(LinphoneCore *lc) {
 		lp_config_set_string(config,"misc","uuid",tmp);
 	}else if (strcmp(uuid,"0")!=0) /*to allow to disable sip.instance*/
 		sal_set_uuid(lc->sal, uuid);
+
+	/* DTLS: if media_encryption is DTLS, get or create the certificate directory */
+	if (linphone_core_get_media_encryption(lc) == LinphoneMediaEncryptionDTLS) {
+		/* TODO*/
+	}
 }
 
 static void linphone_core_start(LinphoneCore * lc) {
@@ -6253,6 +6259,9 @@ static void linphone_core_uninit(LinphoneCore *lc)
 	if(lc->zrtp_secrets_cache != NULL) {
 		ms_free(lc->zrtp_secrets_cache);
 	}
+	if(lc->user_certificates_path != NULL) {
+		ms_free(lc->user_certificates_path);
+	}
 	if(lc->play_file!=NULL){
 		ms_free(lc->play_file);
 	}
@@ -6685,6 +6694,17 @@ const char *linphone_core_get_zrtp_secrets_file(LinphoneCore *lc){
 	return lc->zrtp_secrets_cache;
 }
 
+void linphone_core_set_user_certificates_path(LinphoneCore *lc, const char* path){
+	if (lc->user_certificates_path != NULL) {
+		ms_free(lc->user_certificates_path);
+	}
+	lc->user_certificates_path = path ? ms_strdup(path) : NULL;
+}
+
+const char *linphone_core_get_user_certificates_path(LinphoneCore *lc){
+	return lc->user_certificates_path;
+}
+
 LinphoneCall* linphone_core_find_call_from_uri(const LinphoneCore *lc, const char *uri) {
 	MSList *calls;
 	LinphoneCall *c;
@@ -6745,6 +6765,8 @@ const char *linphone_media_encryption_to_string(LinphoneMediaEncryption menc){
 	switch(menc){
 		case LinphoneMediaEncryptionSRTP:
 			return "LinphoneMediaEncryptionSRTP";
+		case LinphoneMediaEncryptionDTLS:
+			return "LinphoneMediaEncryptionDTLS";
 		case LinphoneMediaEncryptionZRTP:
 			return "LinphoneMediaEncryptionZRTP";
 		case LinphoneMediaEncryptionNone:
@@ -6761,6 +6783,8 @@ bool_t linphone_core_media_encryption_supported(const LinphoneCore *lc, Linphone
 	switch(menc){
 		case LinphoneMediaEncryptionSRTP:
 			return media_stream_srtp_supported();
+		case LinphoneMediaEncryptionDTLS:
+			return ms_dtls_available();
 		case LinphoneMediaEncryptionZRTP:
 			return ms_zrtp_available();
 		case LinphoneMediaEncryptionNone:
@@ -6784,7 +6808,14 @@ int linphone_core_set_media_encryption(LinphoneCore *lc, LinphoneMediaEncryption
 			type="none";
 			ret=-1;
 		}else type="zrtp";
+	}else if (menc == LinphoneMediaEncryptionDTLS){
+		if (!ms_dtls_available()){
+			ms_warning("DTLS not supported by library.");
+			type="none";
+			ret=-1;
+		}else type="dtls";
 	}
+
 	lp_config_set_string(lc->config,"sip","media_encryption",type);
 	return ret;
 }
@@ -6796,6 +6827,8 @@ LinphoneMediaEncryption linphone_core_get_media_encryption(LinphoneCore *lc) {
 		return LinphoneMediaEncryptionNone;
 	else if (strcmp(menc, "srtp")==0)
 		return LinphoneMediaEncryptionSRTP;
+	else if (strcmp(menc, "dtls")==0)
+		return LinphoneMediaEncryptionDTLS;
 	else if (strcmp(menc, "zrtp")==0)
 		return LinphoneMediaEncryptionZRTP;
 	else
diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h
index add43e4a0..37c09e7b2 100644
--- a/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@ -287,7 +287,8 @@ typedef enum _LinphoneAVPFMode  LinphoneAVPFMode;
 enum _LinphoneMediaEncryption {
 	LinphoneMediaEncryptionNone, /**< No media encryption is used */
 	LinphoneMediaEncryptionSRTP, /**< Use SRTP media encryption */
-	LinphoneMediaEncryptionZRTP /**< Use ZRTP media encryption */
+	LinphoneMediaEncryptionZRTP, /**< Use ZRTP media encryption */
+	LinphoneMediaEncryptionDTLS /**< Use DTLS media encryption */
 };
 
 /**
@@ -2908,6 +2909,22 @@ LINPHONE_PUBLIC void linphone_core_set_zrtp_secrets_file(LinphoneCore *lc, const
  */
 LINPHONE_PUBLIC const char *linphone_core_get_zrtp_secrets_file(LinphoneCore *lc);
 
+/**
+ * Set the path to the directory storing the user's x509 certificates (used by dtls)
+ * @param[in] lc #LinphoneCore object
+ * @param[in] path The path to the directory to use to store the user's certificates.
+ * @ingroup initializing
+ */
+LINPHONE_PUBLIC void linphone_core_set_user_certificates_path(LinphoneCore *lc, const char* path);
+
+/**
+ * Get the path to the directory storing the user's certificates.
+ * @param[in] lc #LinphoneCore object.
+ * @returns The path to the directory storing the user's certificates.
+ * @ingroup initializing
+ */
+LINPHONE_PUBLIC const char *linphone_core_get_user_certificates_path(LinphoneCore *lc);
+
 /**
  * Search from the list of current calls if a remote address match uri
  * @ingroup call_control
diff --git a/coreapi/offeranswer.c b/coreapi/offeranswer.c
index d7d2e6e84..9f2ce5f6b 100644
--- a/coreapi/offeranswer.c
+++ b/coreapi/offeranswer.c
@@ -315,6 +315,21 @@ int offer_answer_initiate_outgoing(const SalMediaDescription *local_offer,
 		result->rtcp_xr.enabled = FALSE;
 	}
 
+	// Handle dtls session attribute: if both local and remote have a dtls fingerprint and a dtls setup, get the remote fingerprint into the result
+	if ((local_offer->dtls_role!=SalDtlsRoleInvalid) && (remote_answer->dtls_role!=SalDtlsRoleInvalid)
+			&&(strlen(local_offer->dtls_fingerprint)>0) && (strlen(remote_answer->dtls_fingerprint)>0)) {
+		strcpy(result->dtls_fingerprint, remote_answer->dtls_fingerprint);
+		if (remote_answer->dtls_role==SalDtlsRoleIsClient) {
+			result->dtls_role = SalDtlsRoleIsServer;
+		} else {
+			result->dtls_role = SalDtlsRoleIsClient;
+		}
+	} else {
+		result->dtls_fingerprint[0] = '\0';
+		result->dtls_role = SalDtlsRoleInvalid;
+	}
+
+
 	return 0;
 }
 
@@ -334,7 +349,9 @@ static bool_t local_stream_not_already_used(const SalMediaDescription *result, c
 static bool_t proto_compatible(SalMediaProto local, SalMediaProto remote) {
 	if (local == remote) return TRUE;
 	if ((remote == SalProtoRtpAvp) && ((local == SalProtoRtpSavp) || (local == SalProtoRtpSavpf))) return TRUE;
+	if ((remote == SalProtoRtpAvp) && ((local == SalProtoUdpTlsRtpSavp) || (local == SalProtoUdpTlsRtpSavpf))) return TRUE;
 	if ((remote == SalProtoRtpAvpf) && (local == SalProtoRtpSavpf)) return TRUE;
+	if ((remote == SalProtoRtpAvpf) && (local == SalProtoUdpTlsRtpSavpf)) return TRUE;
 	return FALSE;
 }
 
@@ -368,6 +385,23 @@ int offer_answer_initiate_incoming(const SalMediaDescription *local_capabilities
 		if (ls){
 			initiate_incoming(ls,rs,&result->streams[i],one_matching_codec);
 
+			// Handle dtls stream attribute: if both local and remote have a dtls fingerprint and a dtls setup, add the local fingerprint to the answer
+			// Note: local description usually stores dtls config at session level which means it apply to all streams, check this too
+			if (((ls->dtls_role!=SalDtlsRoleInvalid) || (local_capabilities->dtls_role!=SalDtlsRoleInvalid)) && (rs->dtls_role!=SalDtlsRoleInvalid)
+					&& ((strlen(ls->dtls_fingerprint)>0) || (strlen(local_capabilities->dtls_fingerprint)>0)) && (strlen(rs->dtls_fingerprint)>0)) {
+				if (strlen(ls->dtls_fingerprint)>0) { /* get the fingerprint in stream description */
+					strcpy(result->streams[i].dtls_fingerprint, ls->dtls_fingerprint);
+				} else { /* get the fingerprint in session description */
+					strcpy(result->streams[i].dtls_fingerprint, local_capabilities->dtls_fingerprint);
+				}
+				if (rs->dtls_role==SalDtlsRoleUnset) {
+					result->streams[i].dtls_role = SalDtlsRoleIsClient;
+				}
+			} else {
+				result->streams[i].dtls_fingerprint[0] = '\0';
+				result->streams[i].dtls_role = SalDtlsRoleInvalid;
+			}
+
 			// Handle media RTCP XR attribute
 			memset(&result->streams[i].rtcp_xr, 0, sizeof(result->streams[i].rtcp_xr));
 			if (rs->rtcp_xr.enabled == TRUE) {
@@ -408,6 +442,18 @@ int offer_answer_initiate_incoming(const SalMediaDescription *local_capabilities
 
 	strcpy(result->name,local_capabilities->name);
 
+	// Handle dtls session attribute: if both local and remote have a dtls fingerprint and a dtls setup, add the local fingerprint to the answer
+	if ((local_capabilities->dtls_role!=SalDtlsRoleInvalid) && (remote_offer->dtls_role!=SalDtlsRoleInvalid)
+			&&(strlen(local_capabilities->dtls_fingerprint)>0) && (strlen(remote_offer->dtls_fingerprint)>0)) {
+		strcpy(result->dtls_fingerprint, local_capabilities->dtls_fingerprint);
+		if (remote_offer->dtls_role==SalDtlsRoleUnset) {
+			result->dtls_role = SalDtlsRoleIsClient;
+		}
+	} else {
+		result->dtls_fingerprint[0] = '\0';
+		result->dtls_role = SalDtlsRoleInvalid;
+	}
+
 	// Handle session RTCP XR attribute
 	memset(&result->rtcp_xr, 0, sizeof(result->rtcp_xr));
 	if (remote_offer->rtcp_xr.enabled == TRUE) {
diff --git a/coreapi/private.h b/coreapi/private.h
index 8e1bfaf8a..8198e08af 100644
--- a/coreapi/private.h
+++ b/coreapi/private.h
@@ -241,6 +241,7 @@ struct _LinphoneCall{
 	char *dtmf_sequence; /*DTMF sequence needed to be sent using #dtmfs_timer*/
 	belle_sip_source_t *dtmfs_timer; /*DTMF timer needed to send a DTMF sequence*/
 
+	unsigned char *dtls_certificate_fingerprint; /**> This fingerprint is computed during stream init and is stored in call to be used when making local media description */
 	bool_t refer_pending;
 	bool_t expect_media_in_ack;
 	bool_t audio_muted;
@@ -734,6 +735,7 @@ struct _LinphoneCore
 	MSList *hooks;
 	LinphoneConference conf_ctx;
 	char* zrtp_secrets_cache;
+	char* user_certificates_path;
 	LinphoneVideoPolicy video_policy;
 	bool_t use_files;
 	bool_t apply_nat_settings;
diff --git a/coreapi/sal.c b/coreapi/sal.c
index b8395c897..5d43546be 100644
--- a/coreapi/sal.c
+++ b/coreapi/sal.c
@@ -194,13 +194,17 @@ bool_t sal_stream_description_active(const SalStreamDescription *sd) {
 }
 
 bool_t sal_stream_description_has_avpf(const SalStreamDescription *sd) {
-	return ((sd->proto == SalProtoRtpAvpf) || (sd->proto == SalProtoRtpSavpf));
+	return ((sd->proto == SalProtoRtpAvpf) || (sd->proto == SalProtoRtpSavpf) || (sd->proto == SalProtoUdpTlsRtpSavpf));
 }
 
 bool_t sal_stream_description_has_srtp(const SalStreamDescription *sd) {
 	return ((sd->proto == SalProtoRtpSavp) || (sd->proto == SalProtoRtpSavpf));
 }
 
+bool_t sal_stream_description_has_dtls(const SalStreamDescription *sd) {
+	return ((sd->proto == SalProtoUdpTlsRtpSavp) || (sd->proto == SalProtoUdpTlsRtpSavpf));
+}
+
 bool_t sal_media_description_has_avpf(const SalMediaDescription *md) {
 	int i;
 	if (md->nb_streams == 0) return FALSE;
@@ -221,6 +225,16 @@ bool_t sal_media_description_has_srtp(const SalMediaDescription *md) {
 	return TRUE;
 }
 
+bool_t sal_media_description_has_dtls(const SalMediaDescription *md) {
+	int i;
+	if (md->nb_streams == 0) return FALSE;
+	for (i = 0; i < md->nb_streams; i++) {
+		if (!sal_stream_description_active(&md->streams[i])) continue;
+		if (sal_stream_description_has_dtls(&md->streams[i]) != TRUE) return FALSE;
+	}
+	return TRUE;
+}
+
 /*
 static bool_t fmtp_equals(const char *p1, const char *p2){
 	if (p1 && p2 && strcmp(p1,p2)==0) return TRUE;
@@ -607,8 +621,10 @@ const char* sal_media_proto_to_string(SalMediaProto type) {
 	switch (type) {
 	case SalProtoRtpAvp:return "RTP/AVP";
 	case SalProtoRtpSavp:return "RTP/SAVP";
+	case SalProtoUdpTlsRtpSavp:return "UDP/TLS/RTP/SAVP";
 	case SalProtoRtpAvpf:return "RTP/AVPF";
 	case SalProtoRtpSavpf:return "RTP/SAVPF";
+	case SalProtoUdpTlsRtpSavpf:return "UDP/TLS/RTP/SAVPF";
 	default: return "unknown";
 	}
 }
diff --git a/gtk/incall_view.c b/gtk/incall_view.c
index 4fa0bd66b..0d6606aee 100644
--- a/gtk/incall_view.c
+++ b/gtk/incall_view.c
@@ -680,6 +680,12 @@ void linphone_gtk_in_call_view_show_encryption(LinphoneCall *call){
 			gtk_widget_hide(status_icon);
 			gtk_widget_hide(verify_button);
 		break;
+		case LinphoneMediaEncryptionDTLS:
+			gtk_widget_show_all(encryption_box);
+			gtk_label_set_markup(GTK_LABEL(label),_("Secured by DTLS"));
+			gtk_widget_hide(status_icon);
+			gtk_widget_hide(verify_button);
+		break;
 		case LinphoneMediaEncryptionZRTP:
 		{
 			gchar *text=g_strdup_printf(_("Secured by ZRTP - [auth token: %s]"),linphone_call_get_authentication_token(call));
diff --git a/gtk/main.c b/gtk/main.c
index ea3078c9a..13e622969 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -172,9 +172,11 @@ static GOptionEntry linphone_options[]={
 #ifndef WIN32
 #define CONFIG_FILE ".linphonerc"
 #define SECRETS_FILE ".linphone-zidcache"
+#define CERTIFICATES_PATH ".linphone-usr-crt"
 #else
 #define CONFIG_FILE "linphonerc"
 #define SECRETS_FILE "linphone-zidcache"
+#define CERTIFICATES_PATH "linphone-usr-crt"
 #endif
 
 char *linphone_gtk_get_config_file(const char *filename){
@@ -279,6 +281,7 @@ static void linphone_gtk_init_liblinphone(const char *config_file,
 		const char *factory_config_file, const char *db_file) {
 	LinphoneCoreVTable vtable={0};
 	gchar *secrets_file=linphone_gtk_get_config_file(SECRETS_FILE);
+	gchar *user_certificates_dir=linphone_gtk_get_config_file(CERTIFICATES_PATH);
 
 	vtable.global_state_changed=linphone_gtk_global_state_changed;
 	vtable.call_state_changed=linphone_gtk_call_state_changed;
@@ -316,6 +319,8 @@ static void linphone_gtk_init_liblinphone(const char *config_file,
 	linphone_core_set_waiting_callback(the_core,linphone_gtk_wait,NULL);
 	linphone_core_set_zrtp_secrets_file(the_core,secrets_file);
 	g_free(secrets_file);
+	linphone_core_set_user_certificates_path(the_core,user_certificates_dir);
+	g_free(user_certificates_dir);
 	linphone_core_enable_video_capture(the_core, TRUE);
 	linphone_core_enable_video_display(the_core, TRUE);
 	linphone_core_set_native_video_window_id(the_core,-1);/*don't create the window*/
diff --git a/gtk/propertybox.c b/gtk/propertybox.c
index 677fe5f06..c075fe91c 100644
--- a/gtk/propertybox.c
+++ b/gtk/propertybox.c
@@ -1199,11 +1199,13 @@ static void linphone_gtk_media_encryption_changed(GtkWidget *combo){
 		if (strcasecmp(selected,"SRTP")==0){
 			linphone_core_set_media_encryption(lc,LinphoneMediaEncryptionSRTP);
 			linphone_gtk_set_media_encryption_mandatory_sensitive(toplevel,TRUE);
+		}else if (strcasecmp(selected,"DTLS")==0){
+			linphone_core_set_media_encryption(lc,LinphoneMediaEncryptionDTLS);
+			linphone_gtk_set_media_encryption_mandatory_sensitive(toplevel,FALSE);
 		}else if (strcasecmp(selected,"ZRTP")==0){
 			linphone_core_set_media_encryption(lc,LinphoneMediaEncryptionZRTP);
 			linphone_gtk_set_media_encryption_mandatory_sensitive(toplevel,FALSE);
-		}
-		else {
+		} else {
 			linphone_core_set_media_encryption(lc,LinphoneMediaEncryptionNone);
 			linphone_gtk_set_media_encryption_mandatory_sensitive(toplevel,FALSE);
 		}
@@ -1219,7 +1221,7 @@ static void linphone_gtk_show_media_encryption(GtkWidget *pb){
 	LinphoneCore *lc=linphone_gtk_get_core();
 	GtkWidget *combo=linphone_gtk_get_widget(pb,"media_encryption_combo");
 	bool_t no_enc=TRUE;
-	int srtp_id=-1,zrtp_id=-1;
+	int srtp_id=-1,zrtp_id=-1,dtls_id=-1;
 	GtkTreeModel *model;
 	GtkListStore *store;
 	GtkTreeIter iter;
@@ -1239,12 +1241,26 @@ static void linphone_gtk_show_media_encryption(GtkWidget *pb){
 		srtp_id=1;
 		no_enc=FALSE;
 	}
+	if (linphone_core_media_encryption_supported(lc,LinphoneMediaEncryptionDTLS)){
+		gtk_list_store_append(store,&iter);
+		gtk_list_store_set(store,&iter,0,_("DTLS"),-1);
+		if (srtp_id!=-1) dtls_id=2;
+		else dtls_id=1;
+		no_enc=FALSE;
+	}
 	if (linphone_core_media_encryption_supported(lc,LinphoneMediaEncryptionZRTP)){
 		gtk_list_store_append(store,&iter);
 		gtk_list_store_set(store,&iter,0,_("ZRTP"),-1);
 		no_enc=FALSE;
-		if (srtp_id!=-1) zrtp_id=2;
-		else zrtp_id=1;
+		if (srtp_id!=-1) {
+			if (dtls_id!=-1)
+				zrtp_id=3;
+			else zrtp_id=2;
+		} else {
+			if (dtls_id!=-1)
+				zrtp_id=2;
+			else zrtp_id=1;
+		}
 	}
 	if (no_enc){
 		/*hide this setting*/
@@ -1264,6 +1280,12 @@ static void linphone_gtk_show_media_encryption(GtkWidget *pb){
 					linphone_gtk_set_media_encryption_mandatory_sensitive(pb,TRUE);
 				}
 			break;
+			case LinphoneMediaEncryptionDTLS:
+				if (dtls_id!=-1) {
+					gtk_combo_box_set_active(GTK_COMBO_BOX(combo),dtls_id);
+					linphone_gtk_set_media_encryption_mandatory_sensitive(pb,TRUE);
+				}
+			break;
 			case LinphoneMediaEncryptionZRTP:
 				if (zrtp_id!=-1) {
 					gtk_combo_box_set_active(GTK_COMBO_BOX(combo),zrtp_id);
diff --git a/include/sal/sal.h b/include/sal/sal.h
index 5fb0fbd92..a4c155b99 100644
--- a/include/sal/sal.h
+++ b/include/sal/sal.h
@@ -129,6 +129,8 @@ typedef enum{
 	SalProtoRtpSavp,
 	SalProtoRtpAvpf,
 	SalProtoRtpSavpf,
+	SalProtoUdpTlsRtpSavp,
+	SalProtoUdpTlsRtpSavpf,
 	SalProtoOther
 }SalMediaProto;
 const char* sal_media_proto_to_string(SalMediaProto type);
@@ -182,6 +184,13 @@ typedef struct SalSrtpCryptoAlgo {
 
 #define SAL_CRYPTO_ALGO_MAX 4
 
+typedef enum {
+	SalDtlsRoleInvalid,
+	SalDtlsRoleIsServer,
+	SalDtlsRoleIsClient,
+	SalDtlsRoleUnset
+} SalDtlsRole;
+
 typedef struct SalStreamDescription{
 	char name[16]; /*unique name of stream, in order to ease offer/answer model algorithm*/
 	SalMediaProto proto;
@@ -207,6 +216,8 @@ typedef struct SalStreamDescription{
 	bool_t ice_mismatch;
 	bool_t ice_completed;
 	bool_t pad[2];
+	char dtls_fingerprint[256];
+	SalDtlsRole dtls_role;
 } SalStreamDescription;
 
 const char *sal_stream_description_get_type_as_string(const SalStreamDescription *desc);
@@ -231,6 +242,8 @@ typedef struct SalMediaDescription{
 	bool_t ice_lite;
 	bool_t ice_completed;
 	bool_t pad[2];
+	char dtls_fingerprint[256];
+	SalDtlsRole dtls_role;
 } SalMediaDescription;
 
 typedef struct SalMessage{
@@ -265,8 +278,10 @@ void sal_media_description_set_dir(SalMediaDescription *md, SalStreamDir stream_
 bool_t sal_stream_description_active(const SalStreamDescription *sd);
 bool_t sal_stream_description_has_avpf(const SalStreamDescription *sd);
 bool_t sal_stream_description_has_srtp(const SalStreamDescription *sd);
+bool_t sal_stream_description_has_dtls(const SalStreamDescription *sd);
 bool_t sal_media_description_has_avpf(const SalMediaDescription *md);
 bool_t sal_media_description_has_srtp(const SalMediaDescription *md);
+bool_t sal_media_description_has_dtls(const SalMediaDescription *md);
 int sal_media_description_get_nb_active_streams(const SalMediaDescription *md);
 
 
@@ -510,6 +525,18 @@ void sal_certificates_chain_parse_file(SalAuthInfo* auth_info, const char* path,
  */
 void sal_signing_key_parse_file(SalAuthInfo* auth_info, const char* path, const char *passwd);
 
+/**
+ * Parse a directory for files containing certificate with the given subject CNAME
+ * @param[out]	certificate_pem				the address of a string to store the certificate in PEM format. To be freed by caller
+ * @param[out]	key_pem						the address of a string to store the key in PEM format. To be freed by caller
+ * @param[in]	path						directory to parse
+ * @param[in]	subject						subject CNAME
+ * @param[in]	format 						either PEM or DER
+ * @param[in]	generate_certificate		if true, if matching certificate and key can't be found, generate it and store it into the given dir, filename will be subject.pem
+ * @param[in]	generate_dtls_fingerprint	if true and we have a certificate, generate the dtls fingerprint as described in rfc4572
+ */
+void sal_certificates_chain_parse_directory(unsigned char **certificate_pem, unsigned char **key_pem, unsigned char **fingerprint, const char* path, const char *subject, SalCertificateRawFormat format, bool_t generate_certificate, bool_t generate_dtls_fingerprint); 
+
 void sal_certificates_chain_delete(SalCertificatesChain *chain);
 void sal_signing_key_delete(SalSigningKey *key);
 
diff --git a/mediastreamer2 b/mediastreamer2
index 90bad6f9e..dd1d93944 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 90bad6f9e48f7d18cba2d1a50c4e55fbc6b3c686
+Subproject commit dd1d93944369d5e19808109ea94b51f28b0e5a92
diff --git a/oRTP b/oRTP
index 5333d998c..29802b08d 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 5333d998c8eaf3c43e66c4a5335c0606c8dea3df
+Subproject commit 29802b08dac2de2f320db28249d5d459a47507e8

From 89565386ac1fe2c9c610342ef488c36a83158eba Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Wed, 10 Dec 2014 16:33:12 +0100
Subject: [PATCH 143/496] Working file transfer in Python.

- Add the LinphoneBuffer object so that file transfer callbacks do not pass out parameters
- Use the LinphoneBuffer object in the file transfer callbacks
- Implement the file_transfer_send callback in the Python file transfer test
---
 build/android/Android.mk               |   1 +
 build/wp8/LibLinphone.vcxproj          |   2 +
 coreapi/CMakeLists.txt                 |   2 +
 coreapi/Makefile.am                    |   2 +
 coreapi/buffer.c                       | 105 ++++++++++++++++++
 coreapi/buffer.h                       | 147 +++++++++++++++++++++++++
 coreapi/chat.c                         |  16 ++-
 coreapi/linphonecore.h                 |  22 ++--
 coreapi/private.h                      |   9 ++
 tools/genapixml.py                     |  11 +-
 tools/python/apixml2python.py          |   3 +
 tools/python/apixml2python/linphone.py |  84 ++++++++++----
 tools/python/unittests/test_message.py |  25 ++++-
 13 files changed, 381 insertions(+), 48 deletions(-)
 create mode 100644 coreapi/buffer.c
 create mode 100644 coreapi/buffer.h

diff --git a/build/android/Android.mk b/build/android/Android.mk
index adc78454c..9690877ee 100755
--- a/build/android/Android.mk
+++ b/build/android/Android.mk
@@ -40,6 +40,7 @@ LOCAL_SRC_FILES := \
 	bellesip_sal/sal_op_publish.c \
 	bellesip_sal/sal_op_registration.c \
 	bellesip_sal/sal_sdp.c \
+	buffer.c \
 	callbacks.c \
 	call_log.c \
 	call_params.c \
diff --git a/build/wp8/LibLinphone.vcxproj b/build/wp8/LibLinphone.vcxproj
index 6a3d8e034..7e692e325 100644
--- a/build/wp8/LibLinphone.vcxproj
+++ b/build/wp8/LibLinphone.vcxproj
@@ -110,6 +110,7 @@
     <ClCompile Include="..\..\coreapi\bellesip_sal\sal_op_publish.c" />
     <ClCompile Include="..\..\coreapi\bellesip_sal\sal_op_registration.c" />
     <ClCompile Include="..\..\coreapi\bellesip_sal\sal_sdp.c" />
+    <ClCompile Include="..\..\coreapi\buffer.c" />
     <ClCompile Include="..\..\coreapi\call_log.c" />
     <ClCompile Include="..\..\coreapi\call_params.c" />
     <ClCompile Include="..\..\coreapi\callbacks.c" />
@@ -145,6 +146,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\coreapi\bellesip_sal\sal_impl.h" />
+    <ClInclude Include="..\..\coreapi\buffer.h" />
     <ClInclude Include="..\..\coreapi\content.h" />
     <ClInclude Include="..\..\coreapi\enum.h" />
     <ClInclude Include="..\..\coreapi\event.h" />
diff --git a/coreapi/CMakeLists.txt b/coreapi/CMakeLists.txt
index 92689dcb8..1a4f48665 100644
--- a/coreapi/CMakeLists.txt
+++ b/coreapi/CMakeLists.txt
@@ -42,6 +42,7 @@ set(SOURCE_FILES
 	bellesip_sal/sal_op_publish.c
 	bellesip_sal/sal_op_registration.c
 	bellesip_sal/sal_sdp.c
+	buffer.c
 	callbacks.c
 	call_log.c
 	call_params.c
@@ -153,6 +154,7 @@ install(TARGETS linphone
 
 
 set(HEADER_FILES
+	buffer.h
 	call_log.h
 	call_params.h
 	content.h
diff --git a/coreapi/Makefile.am b/coreapi/Makefile.am
index f7d163749..160d0a420 100644
--- a/coreapi/Makefile.am
+++ b/coreapi/Makefile.am
@@ -25,6 +25,7 @@ CLEANFILES=$(GITVERSION_FILE)
 linphone_includedir=$(includedir)/linphone
 
 linphone_include_HEADERS=\
+	buffer.h \
 	call_log.h \
 	call_params.h \
 	content.h \
@@ -44,6 +45,7 @@ lib_LTLIBRARIES=liblinphone.la
 liblinphone_la_SOURCES=\
 	address.c \
 	authentication.c \
+	buffer.c \
 	callbacks.c \
 	call_log.c \
 	call_params.c \
diff --git a/coreapi/buffer.c b/coreapi/buffer.c
new file mode 100644
index 000000000..8e44f832b
--- /dev/null
+++ b/coreapi/buffer.c
@@ -0,0 +1,105 @@
+/*
+linphone
+Copyright (C) 2010-2014 Belledonne Communications SARL
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+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.
+*/
+
+#include "linphonecore.h"
+#include "private.h"
+
+
+
+static void linphone_buffer_destroy(LinphoneBuffer *buffer) {
+	if (buffer->content) belle_sip_free(buffer->content);
+}
+
+BELLE_SIP_DECLARE_NO_IMPLEMENTED_INTERFACES(LinphoneBuffer);
+
+BELLE_SIP_INSTANCIATE_VPTR(LinphoneBuffer, belle_sip_object_t,
+	(belle_sip_object_destroy_t)linphone_buffer_destroy,
+	NULL, // clone
+	NULL, // marshal
+	TRUE
+);
+
+
+LinphoneBuffer * linphone_buffer_new(void) {
+	LinphoneBuffer *buffer = belle_sip_object_new(LinphoneBuffer);
+	belle_sip_object_ref(buffer);
+	return buffer;
+}
+
+LinphoneBuffer * linphone_buffer_new_from_data(const uint8_t *data, size_t size) {
+	LinphoneBuffer *buffer = linphone_buffer_new();
+	linphone_buffer_set_content(buffer, data, size);
+	return buffer;
+}
+
+LinphoneBuffer * linphone_buffer_new_from_string(const char *data) {
+	LinphoneBuffer *buffer = linphone_buffer_new();
+	linphone_buffer_set_string_content(buffer, data);
+	return buffer;
+}
+
+LinphoneBuffer * linphone_buffer_ref(LinphoneBuffer *buffer) {
+	belle_sip_object_ref(buffer);
+	return buffer;
+}
+
+void linphone_buffer_unref(LinphoneBuffer *buffer) {
+	belle_sip_object_unref(buffer);
+}
+
+void *linphone_buffer_get_user_data(const LinphoneBuffer *buffer) {
+	return buffer->user_data;
+}
+
+void linphone_buffer_set_user_data(LinphoneBuffer *buffer, void *ud) {
+	buffer->user_data = ud;
+}
+
+const uint8_t * linphone_buffer_get_content(const LinphoneBuffer *buffer) {
+	return buffer->content;
+}
+
+void linphone_buffer_set_content(LinphoneBuffer *buffer, const uint8_t *content, size_t size) {
+	buffer->size = size;
+	if (buffer->content) belle_sip_free(buffer->content);
+	buffer->content = belle_sip_malloc(size);
+	memcpy(buffer->content, content, size);
+}
+
+const char * linphone_buffer_get_string_content(const LinphoneBuffer *buffer) {
+	return (const char *)buffer->content;
+}
+
+void linphone_buffer_set_string_content(LinphoneBuffer *buffer, const char *content) {
+	buffer->size = strlen(content);
+	if (buffer->content) belle_sip_free(buffer->content);
+	buffer->content = (uint8_t *)belle_sip_strdup(content);
+}
+
+size_t linphone_buffer_get_size(const LinphoneBuffer *buffer) {
+	return buffer->size;
+}
+
+void linphone_buffer_set_size(LinphoneBuffer *buffer, size_t size) {
+	buffer->size = size;
+}
+
+bool_t linphone_buffer_is_empty(const LinphoneBuffer *buffer) {
+	return (buffer->size == 0) ? TRUE : FALSE;
+}
diff --git a/coreapi/buffer.h b/coreapi/buffer.h
new file mode 100644
index 000000000..0d22e9ad2
--- /dev/null
+++ b/coreapi/buffer.h
@@ -0,0 +1,147 @@
+/*
+buffer.h
+Copyright (C) 2010-2014 Belledonne Communications SARL
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+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.
+*/
+
+#ifndef LINPHONE_BUFFER_H_
+#define LINPHONE_BUFFER_H_
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/**
+ * @addtogroup misc
+ * @{
+ */
+
+/**
+ * The LinphoneContent object representing a data buffer.
+**/
+typedef struct _LinphoneBuffer LinphoneBuffer;
+
+
+/**
+ * Create a new empty LinphoneBuffer object.
+ * @return A new LinphoneBuffer object.
+ */
+LINPHONE_PUBLIC LinphoneBuffer * linphone_buffer_new(void);
+
+/**
+ * Create a new LinphoneBuffer object from existing data.
+ * @param[in] data The initial data to store in the LinphoneBuffer.
+ * @param[in] size The size of the initial data to stroe in the LinphoneBuffer.
+ * @return A new LinphoneBuffer object.
+ */
+LINPHONE_PUBLIC LinphoneBuffer * linphone_buffer_new_from_data(const uint8_t *data, size_t size);
+
+/**
+ * Create a new LinphoneBuffer object from a string.
+ * @param[in] data The initial string content of the LinphoneBuffer.
+ * @return A new LinphoneBuffer object.
+ */
+LINPHONE_PUBLIC LinphoneBuffer * linphone_buffer_new_from_string(const char *data);
+
+/**
+ * Acquire a reference to the buffer.
+ * @param[in] buffer LinphoneBuffer object.
+ * @return The same LinphoneBuffer object.
+**/
+LINPHONE_PUBLIC LinphoneBuffer * linphone_buffer_ref(LinphoneBuffer *buffer);
+
+/**
+ * Release reference to the buffer.
+ * @param[in] buffer LinphoneBuffer object.
+**/
+LINPHONE_PUBLIC void linphone_buffer_unref(LinphoneBuffer *buffer);
+
+/**
+ * Retrieve the user pointer associated with the buffer.
+ * @param[in] buffer LinphoneBuffer object.
+ * @return The user pointer associated with the buffer.
+**/
+LINPHONE_PUBLIC void *linphone_buffer_get_user_data(const LinphoneBuffer *buffer);
+
+/**
+ * Assign a user pointer to the buffer.
+ * @param[in] buffer LinphoneBuffer object.
+ * @param[in] ud The user pointer to associate with the buffer.
+**/
+LINPHONE_PUBLIC void linphone_buffer_set_user_data(LinphoneBuffer *buffer, void *ud);
+
+/**
+ * Get the content of the data buffer.
+ * @param[in] buffer LinphoneBuffer object.
+ * @return The content of the data buffer.
+ */
+LINPHONE_PUBLIC const uint8_t * linphone_buffer_get_content(const LinphoneBuffer *buffer);
+
+/**
+ * Set the content of the data buffer.
+ * @param[in] buffer LinphoneBuffer object.
+ * @param[in] content The content of the data buffer.
+ * @param[in] size The size of the content of the data buffer.
+ */
+LINPHONE_PUBLIC void linphone_buffer_set_content(LinphoneBuffer *buffer, const uint8_t *content, size_t size);
+
+/**
+ * Get the string content of the data buffer.
+ * @param[in] buffer LinphoneBuffer object
+ * @return The string content of the data buffer.
+ */
+LINPHONE_PUBLIC const char * linphone_buffer_get_string_content(const LinphoneBuffer *buffer);
+
+/**
+ * Set the string content of the data buffer.
+ * @param[in] buffer LinphoneBuffer object.
+ * @param[in] content The string content of the data buffer.
+ */
+LINPHONE_PUBLIC void linphone_buffer_set_string_content(LinphoneBuffer *buffer, const char *content);
+
+/**
+ * Get the size of the content of the data buffer.
+ * @param[in] buffer LinphoneBuffer object.
+ * @return The size of the content of the data buffer.
+ */
+LINPHONE_PUBLIC size_t linphone_buffer_get_size(const LinphoneBuffer *buffer);
+
+/**
+ * Set the size of the content of the data buffer.
+ * @param[in] buffer LinphoneBuffer object
+ * @param[in] size The size of the content of the data buffer.
+ */
+LINPHONE_PUBLIC void linphone_buffer_set_size(LinphoneBuffer *buffer, size_t size);
+
+/**
+ * Tell whether the LinphoneBuffer is empty.
+ * @param[in] buffer LinphoneBuffer object
+ * @return A boolean value telling whether the LinphoneBuffer is empty or not.
+ */
+LINPHONE_PUBLIC bool_t linphone_buffer_is_empty(const LinphoneBuffer *buffer);
+
+/**
+ * @}
+ */
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LINPHONE_CONTENT_H_ */
diff --git a/coreapi/chat.c b/coreapi/chat.c
index 7bec11b01..d80f133b1 100644
--- a/coreapi/chat.c
+++ b/coreapi/chat.c
@@ -246,7 +246,13 @@ static int linphone_chat_message_file_transfer_on_send_body(belle_sip_user_body_
 	if (offset<linphone_content_get_size(chatMsg->file_transfer_information)){
 		/* get data from call back */
 		if (linphone_chat_message_cbs_get_file_transfer_send(chatMsg->callbacks)) {
-			linphone_chat_message_cbs_get_file_transfer_send(chatMsg->callbacks)(chatMsg, chatMsg->file_transfer_information, buf, size);
+			LinphoneBuffer *lb = linphone_chat_message_cbs_get_file_transfer_send(chatMsg->callbacks)(chatMsg, chatMsg->file_transfer_information, offset, *size);
+			if (lb == NULL) *size = 0;
+			else {
+				*size = linphone_buffer_get_size(lb);
+				memcpy(buffer, linphone_buffer_get_content(lb), *size);
+				linphone_buffer_unref(lb);
+			}
 		} else {
 			/* Legacy */
 			linphone_core_notify_file_transfer_send(lc, chatMsg, chatMsg->file_transfer_information, buf, size);
@@ -1205,7 +1211,9 @@ static void on_recv_body(belle_sip_user_body_handler_t *bh, belle_sip_message_t
 		return;
 	}
 	if (linphone_chat_message_cbs_get_file_transfer_recv(chatMsg->callbacks)) {
-		linphone_chat_message_cbs_get_file_transfer_recv(chatMsg->callbacks)(chatMsg, chatMsg->file_transfer_information, (char *)buffer, size);
+		LinphoneBuffer *lb = linphone_buffer_new_from_data(buffer, size);
+		linphone_chat_message_cbs_get_file_transfer_recv(chatMsg->callbacks)(chatMsg, chatMsg->file_transfer_information, lb);
+		linphone_buffer_unref(lb);
 	} else {
 		/* Legacy: call back given by application level */
 		linphone_core_notify_file_transfer_recv(lc, chatMsg, chatMsg->file_transfer_information, (char *)buffer, size);
@@ -1279,7 +1287,9 @@ static void linphone_chat_process_response_from_get_file(void *data, const belle
 			LinphoneCore *lc = chatMsg->chat_room->lc;
 			/* file downloaded succesfully, call again the callback with size at zero */
 			if (linphone_chat_message_cbs_get_file_transfer_recv(chatMsg->callbacks)) {
-				linphone_chat_message_cbs_get_file_transfer_recv(chatMsg->callbacks)(chatMsg, chatMsg->file_transfer_information, NULL, 0);
+				LinphoneBuffer *lb = linphone_buffer_new();
+				linphone_chat_message_cbs_get_file_transfer_recv(chatMsg->callbacks)(chatMsg, chatMsg->file_transfer_information, lb);
+				linphone_buffer_unref(lb);
 			} else {
 				linphone_core_notify_file_transfer_recv(lc, chatMsg, chatMsg->file_transfer_information, NULL, 0);
 			}
diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h
index 81d9e4ab0..5c24d14a7 100644
--- a/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@ -366,12 +366,14 @@ LINPHONE_PUBLIC const char* linphone_privacy_to_string(LinphonePrivacy privacy);
 
 
 #ifdef IN_LINPHONE
+#include "buffer.h"
 #include "call_log.h"
 #include "call_params.h"
 #include "content.h"
 #include "event.h"
 #include "linphonefriend.h"
 #else
+#include "linphone/buffer.h"
 #include "linphone/call_log.h"
 #include "linphone/call_params.h"
 #include "linphone/content.h"
@@ -1350,30 +1352,24 @@ typedef void (*LinphoneChatMessageCbsMsgStateChangedCb)(LinphoneChatMessage* msg
 
 /**
  * File transfer receive callback prototype. This function is called by the core upon an incoming File transfer is started. This function may be call several time for the same file in case of large file.
- *
  * @param message #LinphoneChatMessage message from which the body is received.
  * @param content #LinphoneContent incoming content information
- * @param buff pointer to the received data
- * @param size number of bytes to be read from buff. 0 means end of file.
- *
+ * @param buffer #LinphoneBuffer holding the received data. Empty buffer means end of file.
  */
-typedef void (*LinphoneChatMessageCbsFileTransferRecvCb)(LinphoneChatMessage *message, const LinphoneContent* content, const char* buff, size_t size);
+typedef void (*LinphoneChatMessageCbsFileTransferRecvCb)(LinphoneChatMessage *message, const LinphoneContent* content, const LinphoneBuffer *buffer);
 
 /**
- * File transfer send callback prototype. This function is called by the core upon an outgoing File transfer is started. This function is called until size is set to 0.
- * <br> a #LinphoneContent with a size equal zero
- *
+ * File transfer send callback prototype. This function is called by the core when an outgoing file transfer is started. This function is called until size is set to 0.
  * @param message #LinphoneChatMessage message from which the body is received.
  * @param content #LinphoneContent outgoing content
- * @param buff pointer to the buffer where data chunk shall be written by the app
- * @param size as input value, it represents the number of bytes expected by the framework. As output value, it means the number of bytes wrote by the application in the buffer. 0 means end of file.
- *
+ * @param offset the offset in the file from where to get the data to be sent
+ * @param size the number of bytes expected by the framework
+ * @return A LinphoneBuffer object holding the data written by the application. An empty buffer means end of file.
  */
-typedef void (*LinphoneChatMessageCbsFileTransferSendCb)(LinphoneChatMessage *message,  const LinphoneContent* content, char* buff, size_t* size);
+typedef LinphoneBuffer * (*LinphoneChatMessageCbsFileTransferSendCb)(LinphoneChatMessage *message,  const LinphoneContent* content, size_t offset, size_t size);
 
 /**
  * File transfer progress indication callback prototype.
- *
  * @param message #LinphoneChatMessage message from which the body is received.
  * @param content #LinphoneContent incoming content information
  * @param offset The number of bytes sent/received since the beginning of the transfer.
diff --git a/coreapi/private.h b/coreapi/private.h
index a8816b04b..fb84eab14 100644
--- a/coreapi/private.h
+++ b/coreapi/private.h
@@ -936,6 +936,14 @@ struct _LinphoneContent {
 
 BELLE_SIP_DECLARE_VPTR(LinphoneContent);
 
+struct _LinphoneBuffer {
+	belle_sip_object_t base;
+	void *user_data;
+	uint8_t *content;	/**< A pointer to the buffer content */
+	size_t size;	/**< The size of the buffer content */
+};
+
+BELLE_SIP_DECLARE_VPTR(LinphoneBuffer);
 
 
 /*****************************************************************************
@@ -1012,6 +1020,7 @@ const MSCryptoSuite * linphone_core_get_srtp_crypto_suites(LinphoneCore *lc);
   */
 
 BELLE_SIP_DECLARE_TYPES_BEGIN(linphone,10000)
+BELLE_SIP_TYPE_ID(LinphoneBuffer),
 BELLE_SIP_TYPE_ID(LinphoneContactProvider),
 BELLE_SIP_TYPE_ID(LinphoneContactSearch),
 BELLE_SIP_TYPE_ID(LinphoneCall),
diff --git a/tools/genapixml.py b/tools/genapixml.py
index 42afb2e08..656428b9e 100755
--- a/tools/genapixml.py
+++ b/tools/genapixml.py
@@ -433,9 +433,16 @@ class Project:
 			if pos == -1:
 				return None
 			returntype = definition[0:pos].strip()
-			if returntype != "void":
-				return None
 			returnarg = CArgument(returntype, enums = self.enums, structs = self.__structs)
+			returndesc = node.find("./detaileddescription/para/simplesect[@kind='return']")
+			if returndesc is not None:
+				if returnarg.ctype == 'MSList':
+					n = returndesc.find('.//mslist')
+					if n is not None:
+						returnarg.containedType = n.text
+				returnarg.description = self.__cleanDescription(returndesc)
+			elif returnarg.completeType != 'void':
+				missingDocWarning += "\tReturn value is not documented\n"
 			definition = definition[pos + 2 :]
 			pos = string.find(definition, "(")
 			definition = definition[pos + 1 : -1]
diff --git a/tools/python/apixml2python.py b/tools/python/apixml2python.py
index 8d89b79c2..ff62efd30 100755
--- a/tools/python/apixml2python.py
+++ b/tools/python/apixml2python.py
@@ -38,6 +38,9 @@ blacklisted_events = [
 	'LinphoneCoreFileTransferSendCb'	# missing LinphoneContent
 ]
 blacklisted_functions = [
+	'linphone_buffer_new_from_data',
+	'linphone_buffer_get_content',
+	'linphone_buffer_set_content',
 	'linphone_call_log_get_local_stats',	# missing rtp_stats_t
 	'linphone_call_log_get_remote_stats',	# missing rtp_stats_t
 	'linphone_call_params_get_privacy',	# missing LinphonePrivacyMask
diff --git a/tools/python/apixml2python/linphone.py b/tools/python/apixml2python/linphone.py
index 93f5f4c31..19f4cd6f7 100644
--- a/tools/python/apixml2python/linphone.py
+++ b/tools/python/apixml2python/linphone.py
@@ -238,24 +238,7 @@ class MethodDefinition:
 		self.method_type = 'instancemethod'
 
 	def format_local_variables_definition(self):
-		body = ''
-		if self.xml_method_return is not None:
-			self.return_type = self.xml_method_return.get('type')
-			self.return_complete_type = self.xml_method_return.get('completetype')
-			self.return_contained_type = self.xml_method_return.get('containedtype')
-		if is_callback(self.return_complete_type):
-			body += "\tPyObject * pyresult;\n"
-			body += "\tPyObject * pyret;\n"
-			argument_type = ArgumentType(self.return_type, self.return_complete_type, self.return_contained_type, self.linphone_module)
-			self.build_value_format = argument_type.fmt_str
-		elif self.return_complete_type != 'void':
-			body += "\t" + self.return_complete_type + " cresult;\n"
-			argument_type = ArgumentType(self.return_type, self.return_complete_type, self.return_contained_type, self.linphone_module)
-			self.build_value_format = argument_type.fmt_str
-			if self.build_value_format == 'O':
-				body += "\tPyObject * pyresult;\n"
-			body += "\tPyObject * pyret;\n"
-			body += "\tconst char *pyret_fmt;\n"
+		body = self.format_local_return_variables_definition()
 		if self.self_arg is not None:
 			body += "\t" + self.self_arg.get('completetype') + "native_ptr;\n"
 		for xml_method_arg in self.xml_method_args:
@@ -473,6 +456,27 @@ class MethodDefinition:
 			body = body[1:] # Remove leading '\t'
 		return body
 
+	def format_local_return_variables_definition(self):
+		body = ''
+		if self.xml_method_return is not None:
+			self.return_type = self.xml_method_return.get('type')
+			self.return_complete_type = self.xml_method_return.get('completetype')
+			self.return_contained_type = self.xml_method_return.get('containedtype')
+		if is_callback(self.return_complete_type):
+			body += "\tPyObject * pyresult;\n"
+			body += "\tPyObject * pyret;\n"
+			argument_type = ArgumentType(self.return_type, self.return_complete_type, self.return_contained_type, self.linphone_module)
+			self.build_value_format = argument_type.fmt_str
+		elif self.return_complete_type != 'void':
+			body += "\t" + self.return_complete_type + " cresult;\n"
+			argument_type = ArgumentType(self.return_type, self.return_complete_type, self.return_contained_type, self.linphone_module)
+			self.build_value_format = argument_type.fmt_str
+			if self.build_value_format == 'O':
+				body += "\tPyObject * pyresult;\n"
+			body += "\tPyObject * pyret;\n"
+			body += "\tconst char *pyret_fmt;\n"
+		return body
+
 	def parse_method_node(self):
 		if self.method_node is not None:
 			self.xml_method_return = self.method_node.find('./return')
@@ -778,6 +782,7 @@ class EventCallbackMethodDefinition(MethodDefinition):
 		nocallbacks_class_name = class_name
 		if class_name.endswith('Cbs'):
 			nocallbacks_class_name = class_name[:-3]
+		returnvars = self.format_local_return_variables_definition()
 		common = \
 """	pylinphone_{class_name}Object *pyself = (pylinphone_{class_name}Object *){function_prefix}get_user_data(self);
 	PyObject *func;
@@ -796,7 +801,7 @@ class EventCallbackMethodDefinition(MethodDefinition):
 			argument_type = ArgumentType(arg_type, arg_complete_type, arg_contained_type, self.linphone_module)
 			if argument_type.fmt_str == 'O':
 				specific += "\tPyObject * py" + arg_name + " = NULL;\n"
-		return "{common}\n{specific}".format(common=common, specific=specific)
+		return "{returnvars}\n{common}\n{specific}".format(returnvars=returnvars, common=common, specific=specific)
 
 	def format_arguments_parsing(self):
 		if self.class_['event_class'] == 'Core':
@@ -832,6 +837,7 @@ class EventCallbackMethodDefinition(MethodDefinition):
 
 	def format_c_function_call(self):
 		create_python_objects_code = ''
+		convert_python_result_code = ''
 		fmt = 'O'
 		args = ['pyself']
 		for xml_method_arg in self.xml_method_args:
@@ -852,22 +858,52 @@ class EventCallbackMethodDefinition(MethodDefinition):
 					type_class = self.find_class_definition(arg_type)
 					create_python_objects_code += "\t\tpy{name} = pylinphone_{arg_type}_from_native_ptr(&pylinphone_{arg_type}Type, {name});\n".format(name=arg_name, arg_type=strip_leading_linphone(arg_type))
 		args=', '.join(args)
+		if self.return_complete_type != 'void':
+			argument_type = ArgumentType(self.return_type, self.return_complete_type, self.return_contained_type, self.linphone_module)
+			if argument_type.fmt_str == 'O':
+				convert_python_result_code = \
+"""		if ((pyresult != Py_None) && !PyObject_IsInstance(pyresult, (PyObject *)&pylinphone_{class_name}Type)) {{
+			PyErr_SetString(PyExc_TypeError, "The return value must be a linphone.{class_name} instance.");
+			return NULL;
+		}}
+		if ((cresult = pylinphone_{class_name}_get_native_ptr(pyresult)) == NULL) {{
+			return NULL;
+		}}
+""".format(class_name=strip_leading_linphone(self.return_type))
+
+			else:
+				convert_python_result_code = "\t\tcresult = {convertfunc}(pyresult);\n".format(convertfunc=argument_type.convert_func)			
 		return \
 """	if ((func != NULL) && PyCallable_Check(func)) {{
 {create_python_objects_code}
 		args = Py_BuildValue("{fmt}", {args});
-		if (PyEval_CallObject(func, args) == NULL) {{
+		pyresult = PyEval_CallObject(func, args);
+		if (pyresult == NULL) {{
 			PyErr_Print();
 		}}
 		Py_DECREF(args);
+{convert_python_result_code}
 	}}
-""".format(fmt=fmt, args=args, create_python_objects_code=create_python_objects_code)
+""".format(fmt=fmt, args=args, create_python_objects_code=create_python_objects_code, convert_python_result_code=convert_python_result_code)
 
 	def format_return_trace(self):
 		return "\tpylinphone_trace(-1, \"[PYLINPHONE] <<< %s\", __FUNCTION__);\n"
 
 	def format_return_result(self):
-		return '\tPyGILState_Release(pygil_state);'
+		s = '\tPyGILState_Release(pygil_state);'
+		if self.return_complete_type != 'void':
+			s += '\n\treturn cresult;'
+		return s
+
+	def format_local_return_variables_definition(self):
+		body = "\tPyObject * pyresult;"
+		if self.xml_method_return is not None:
+			self.return_type = self.xml_method_return.get('type')
+			self.return_complete_type = self.xml_method_return.get('completetype')
+			self.return_contained_type = self.xml_method_return.get('containedtype')
+		if self.return_complete_type != 'void':
+			body += "\n\t" + self.return_complete_type + " cresult;"
+		return body
 
 	def format(self):
 		body = MethodDefinition.format(self)
@@ -882,10 +918,10 @@ class EventCallbackMethodDefinition(MethodDefinition):
 			arg_complete_type = xml_method_arg.get('completetype')
 			arguments.append(arg_complete_type + ' ' + arg_name)
 		definition = \
-"""static void pylinphone_{class_name}_callback_{event_name}({arguments}) {{
+"""static {returntype} pylinphone_{class_name}_callback_{event_name}({arguments}) {{
 {body}
 }}
-""".format(class_name=class_name, event_name=self.class_['event_name'], arguments=', '.join(arguments), body=body)
+""".format(returntype=self.return_complete_type, class_name=class_name, event_name=self.class_['event_name'], arguments=', '.join(arguments), body=body)
 		return definition
 
 
diff --git a/tools/python/unittests/test_message.py b/tools/python/unittests/test_message.py
index ebd53fc66..a17b8f47e 100644
--- a/tools/python/unittests/test_message.py
+++ b/tools/python/unittests/test_message.py
@@ -3,11 +3,17 @@ from copy import deepcopy
 import linphone
 from linphonetester import *
 import os
+import os.path
 import time
 
 
 class TestMessage:
 
+    @classmethod
+    def teardown_class(cls):
+        if os.path.exists('receive_file.dump'):
+            os.remove('receive_file.dump')
+
     @classmethod
     def msg_state_changed(cls, msg, state):
         stats = msg.chat_room.core.user_data.stats
@@ -24,18 +30,23 @@ class TestMessage:
             linphonetester_logger.error("[TESTER] Unexpected state [{state}] for message [{msg}]".format(msg=msg, state=linphone.ChatMessageState.string(state)))
 
     @classmethod
-    def file_transfer_received(cls, msg, content, buf, size):
-        print buf, size
+    def file_transfer_send(cls, msg, content, offset, size):
+        if offset >= len(msg.user_data):
+            return linphone.Buffer.new() # end of file
+        return linphone.Buffer.new_from_string(msg.user_data[offset:offset+size])
+
+    @classmethod
+    def file_transfer_recv(cls, msg, content, buf):
         stats = msg.chat_room.core.user_data.stats
         if msg.user_data is None:
             msg.user_data = open('receive_file.dump', 'wb')
-            msg.user_data.write(buf)
+            msg.user_data.write(buf.string_content)
         else:
-            if size == 0: # Transfer complete
+            if buf.size == 0: # Transfer complete
                 stats.number_of_LinphoneMessageExtBodyReceived += 1
                 msg.user_data.close()
             else: # Store content
-                msg.user_data.write(buf)
+                msg.user_data.write(buf.string_content)
 
     def wait_for_server_to_purge_messages(self, manager1, manager2):
         # Wait a little bit just to have time to purge message stored in the server
@@ -87,14 +98,16 @@ class TestMessage:
         content.size = len(big_file) # total size to be transfered
         content.name = 'bigfile.txt'
         message = chat_room.create_file_transfer_message(content)
+        message.user_data = big_file # Store the file in the user data of the chat message
         self.wait_for_server_to_purge_messages(marie, pauline)
         message.callbacks.msg_state_changed = TestMessage.msg_state_changed
+        message.callbacks.file_transfer_send = TestMessage.file_transfer_send
         chat_room.send_chat_message(message)
         assert_equals(CoreManager.wait_for(pauline, marie, lambda pauline, marie: marie.stats.number_of_LinphoneMessageReceivedWithFile == 1), True)
         if marie.stats.last_received_chat_message is not None:
             cbs = marie.stats.last_received_chat_message.callbacks
             cbs.msg_state_changed = TestMessage.msg_state_changed
-            cbs.file_transfer_recv = TestMessage.file_transfer_received
+            cbs.file_transfer_recv = TestMessage.file_transfer_recv
             marie.stats.last_received_chat_message.download_file()
         assert_equals(CoreManager.wait_for(pauline, marie, lambda pauline, marie: marie.stats.number_of_LinphoneMessageExtBodyReceived == 1), True)
         assert_equals(pauline.stats.number_of_LinphoneMessageInProgress, 1)

From 099d846fbeffc65a4039ace21006b44655117e10 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Wed, 10 Dec 2014 16:52:56 +0100
Subject: [PATCH 144/496] Fix file transfer tests.

---
 tester/liblinphone_tester.h |  4 ++--
 tester/message_tester.c     | 34 +++++++++++-----------------------
 2 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/tester/liblinphone_tester.h b/tester/liblinphone_tester.h
index 2c926b27d..2921a4349 100644
--- a/tester/liblinphone_tester.h
+++ b/tester/liblinphone_tester.h
@@ -257,8 +257,8 @@ void linphone_transfer_state_changed(LinphoneCore *lc, LinphoneCall *transfered,
 void notify_presence_received(LinphoneCore *lc, LinphoneFriend * lf);
 void text_message_received(LinphoneCore *lc, LinphoneChatRoom *room, const LinphoneAddress *from_address, const char *message);
 void message_received(LinphoneCore *lc, LinphoneChatRoom *room, LinphoneChatMessage* message);
-void file_transfer_received(LinphoneChatMessage *message, const LinphoneContent* content, const char* buff, size_t size);
-void file_transfer_send(LinphoneChatMessage *message,  const LinphoneContent* content, char* buff, size_t* size);
+void file_transfer_received(LinphoneChatMessage *message, const LinphoneContent* content, const LinphoneBuffer *buffer);
+LinphoneBuffer * file_transfer_send(LinphoneChatMessage *message, const LinphoneContent* content, size_t offset, size_t size);
 void file_transfer_progress_indication(LinphoneChatMessage *message, const LinphoneContent* content, size_t offset, size_t total);
 void is_composing_received(LinphoneCore *lc, LinphoneChatRoom *room);
 void info_message_received(LinphoneCore *lc, LinphoneCall *call, const LinphoneInfoMessage *msg);
diff --git a/tester/message_tester.c b/tester/message_tester.c
index 784acb49b..62bf70302 100644
--- a/tester/message_tester.c
+++ b/tester/message_tester.c
@@ -62,7 +62,7 @@ void message_received(LinphoneCore *lc, LinphoneChatRoom *room, LinphoneChatMess
 /**
  * function invoked when a file transfer is received.
  * */
-void file_transfer_received(LinphoneChatMessage *message, const LinphoneContent* content, const char* buff, size_t size){
+void file_transfer_received(LinphoneChatMessage *message, const LinphoneContent* content, const LinphoneBuffer *buffer){
 	FILE* file=NULL;
 	char receive_file[256];
 	LinphoneChatRoom *cr = linphone_chat_message_get_chat_room(message);
@@ -76,12 +76,12 @@ void file_transfer_received(LinphoneChatMessage *message, const LinphoneContent*
 		/*next chunk*/
 		file = (FILE*)linphone_chat_message_get_user_data(message);
 
-		if (size==0) { /* tranfer complete */
+		if (linphone_buffer_is_empty(buffer)) { /* tranfer complete */
 			stats* counters = get_stats(lc);
 			counters->number_of_LinphoneMessageExtBodyReceived++;
 			fclose(file);
 		} else { /* store content on a file*/
-			if (fwrite(buff,size,1,file)==-1){
+			if (fwrite(linphone_buffer_get_content(buffer),linphone_buffer_get_size(buffer),1,file)==-1){
 				ms_error("file_transfer_received(): write() failed: %s",strerror(errno));
 			}
 		}
@@ -93,26 +93,10 @@ static char big_file [128000]; /* a buffer to simulate a big file for the file t
 /*
  * function called when the file transfer is initiated. file content should be feed into object LinphoneContent
  * */
-void file_transfer_send(LinphoneChatMessage *message,  const LinphoneContent* content, char* buff, size_t* size){
-	int offset=-1;
-
-	if (!linphone_chat_message_get_user_data(message)) {
-		/*first chunk*/
-		offset=0;
-	} else {
-		/*subsequent chunk*/
-		offset = (int)((long)(linphone_chat_message_get_user_data(message))&0x00000000FFFFFFFF);
-	}
-	*size = MIN(*size,sizeof(big_file)-offset); /*updating content->size with minimun between remaining data and requested size*/
-
-	if (*size==0) {
-		/*end of file*/
-		return;
-	}
-	memcpy(buff,big_file+offset,*size);
-
-	/*store offset for next chunk*/
-	linphone_chat_message_set_user_data(message,(void*)(offset+*size));
+LinphoneBuffer * file_transfer_send(LinphoneChatMessage *message, const LinphoneContent* content, size_t offset, size_t size){
+	size_t size_to_send = MIN(size, sizeof(big_file) - offset);
+	if (size == 0) return linphone_buffer_new(); /*end of file*/
+	return linphone_buffer_new_from_data((uint8_t *)big_file + offset, size_to_send);
 }
 
 /**
@@ -443,6 +427,7 @@ static void file_transfer_message(void) {
 		reset_counters(&pauline->stat);
 	}
 	linphone_chat_message_cbs_set_msg_state_changed(cbs,liblinphone_tester_chat_message_msg_state_changed);
+	linphone_chat_message_cbs_set_file_transfer_send(cbs, file_transfer_send);
 	linphone_chat_room_send_chat_message(chat_room,message);
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneMessageReceivedWithFile,1));
 	if (marie->stat.last_received_chat_message ) {
@@ -505,6 +490,7 @@ static void small_file_transfer_message(void) {
 	}
 	cbs = linphone_chat_message_get_callbacks(message);
 	linphone_chat_message_cbs_set_msg_state_changed(cbs, liblinphone_tester_chat_message_msg_state_changed);
+	linphone_chat_message_cbs_set_file_transfer_send(cbs, file_transfer_send);
 	linphone_chat_room_send_chat_message(chat_room,message);
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneMessageReceivedWithFile,1));
 	if (marie->stat.last_received_chat_message ) {
@@ -566,6 +552,7 @@ static void file_transfer_message_io_error_upload(void) {
 	}
 	cbs = linphone_chat_message_get_callbacks(message);
 	linphone_chat_message_cbs_set_msg_state_changed(cbs, liblinphone_tester_chat_message_msg_state_changed);
+	linphone_chat_message_cbs_set_file_transfer_send(cbs, file_transfer_send);
 	linphone_chat_message_cbs_set_file_transfer_progress_indication(cbs, file_transfer_progress_indication);
 	linphone_chat_room_send_chat_message(chat_room,message);
 
@@ -696,6 +683,7 @@ static void file_transfer_message_upload_cancelled(void) {
 	}
 	cbs = linphone_chat_message_get_callbacks(message);
 	linphone_chat_message_cbs_set_msg_state_changed(cbs, liblinphone_tester_chat_message_msg_state_changed);
+	linphone_chat_message_cbs_set_file_transfer_send(cbs, file_transfer_send);
 	linphone_chat_message_cbs_set_file_transfer_progress_indication(cbs, file_transfer_progress_indication);
 	linphone_chat_room_send_chat_message(chat_room,message);
 

From e568e7e21db6cc03c6c3eadecf504c643846bda9 Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Wed, 10 Dec 2014 17:33:30 +0100
Subject: [PATCH 145/496] Don't use 'tester' audio unit in iOS, since linphone
 is now intelligent enough to not kill the audio unit in between ringing and
 actual call. This allows tests to run more closely to the real soudncard
 usage

---
 mediastreamer2  | 2 +-
 tester/tester.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/mediastreamer2 b/mediastreamer2
index faabba0fb..a9b195ade 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit faabba0fb7d388cf20c620c103e4955e8afc903f
+Subproject commit a9b195ade60a094240700dc6cbe6d72663f2e524
diff --git a/tester/tester.c b/tester/tester.c
index 7cb44fc36..2d39e7e67 100644
--- a/tester/tester.c
+++ b/tester/tester.c
@@ -263,8 +263,6 @@ LinphoneCoreManager* linphone_core_manager_new2(const char* rc_file, int check_f
 	manager_count++;
 
 #if TARGET_OS_IPHONE
-	linphone_core_set_playback_device( mgr->lc, "AU: Audio Unit Tester");
-	linphone_core_set_capture_device( mgr->lc, "AU: Audio Unit Tester");
 	linphone_core_set_ringer_device( mgr->lc, "AQ: Audio Queue Device");
 	linphone_core_set_ringback(mgr->lc, NULL);
 	if( manager_count >= 2){

From 4f155a034728a8890f9a667484a6e43990a423b9 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Wed, 10 Dec 2014 17:46:44 +0100
Subject: [PATCH 146/496] Minor MacOS README updates

---
 README.macos.md | 45 ++++++++++++++++++++++++++++-----------------
 1 file changed, 28 insertions(+), 17 deletions(-)

diff --git a/README.macos.md b/README.macos.md
index cfe0a40a9..563a5b407 100644
--- a/README.macos.md
+++ b/README.macos.md
@@ -1,12 +1,16 @@
-# Compiling Linphone on MacOS X
+# Linphone on MacOS X
 
-## Dependencies
+## Build prerequisite
 
 * Xcode (download from apple or using appstore application)
 * Java SE
 * [HomeBrew](http://brew.sh) or [Macports](http://www.macports.org/).
 
-### Multiple MacOS version support
+### Dependencies
+
+#### Using MacPorts
+
+##### Multiple MacOS version support
 
 In order to enable generation of bundle for multiple MacOS version and 32 bit processors, it is recommended to:
 
@@ -18,17 +22,16 @@ In order to enable generation of bundle for multiple MacOS version and 32 bit pr
 
  > +universal
 
-### Build time dependencies
 
-#### Using MacPorts
+##### Linphone library (liblinphone)
 
-* Linphone core dependencies
-
-        sudo port install automake autoconf libtool intltool wget cunit \
+        sudo port install automake autoconf libtool pkgconfig intltool wget cunit \
         antlr3 speex libvpx readline sqlite3 libsoup openldap libupnp \
         ffmpeg-devel -gpl2
 
-* UI dependencies: install `GTK`. It is recommended to use the `quartz` backend for better integration.
+##### Linphone UI (GTK version)
+
+Install `GTK`. It is recommended to use the `quartz` backend for better integration.
 
         sudo port install gtk2 +quartz +no_x11
         sudo port install gtk-osx-application -python27
@@ -36,16 +39,23 @@ In order to enable generation of bundle for multiple MacOS version and 32 bit pr
 
 #### Using HomeBrew
 
-        brew install automake intltool libtool pkg-config coreutils \
-        yasm nasm wget imagemagick gettext gtk+ speex ffmpeg pygtk
-        brew link gettext --force
-        # readline is required from linphonec.c otherwise compilation will fail
-        brew link readline --force
+##### Linphone library (liblinphone)
 
-        # then you have to install some dependencies from a tap.
+        brew install automake intltool libtool pkg-config coreutils \
+        yasm nasm wget imagemagick speex ffmpeg
+
+        #then you have to install some dependencies from a tap.
         brew tap Gui13/linphone
         brew install antlr3.2 libantlr3.4c mattintosh4/gtk-mac-integration/gtk-mac-integration
 
+##### Linphone UI (GTK version)
+
+        brew install gettext pygtk gtk+
+        brew link gettext --force
+        #readline is required from linphonec.c otherwise compilation will fail
+        brew link readline --force
+
+
 ### Building Linphone
 
 The next pieces need to be compiled manually.
@@ -58,7 +68,7 @@ The next pieces need to be compiled manually.
         export CXXFLAGS="-arch i386 -arch x86_64 -mmacosx-version-min=10.5"
         export LDFLAGS="-arch i386 -arch x86_64 -mmacosx-version-min=10.5 -Wl,-headerpad_max_install_names -Wl,-read_only_relocs -Wl,suppress"
 
-* Install libantlr3c (library used by belle-sip for parsing)
+* (MacPorts only) Install libantlr3c (library used by belle-sip for parsing)
 
         git clone -b linphone git://git.linphone.org/antlr3.git
         cd antlr3/runtime/C
@@ -117,6 +127,7 @@ The libvpx build isn't able to produce dual architecture files. To workaround th
 * Install on the system
 
         sudo make install
+
  You are done.
 
 ### Generate portable bundle
@@ -126,7 +137,7 @@ If you want to generate a portable bundle, then install `gtk-mac-bundler`:
         git clone https://github.com/jralls/gtk-mac-bundler.git
         cd gtk-mac-bundler && make install
         export PATH=$PATH:~/.local/bin
-        #make this dummy charset.alias file for the bundler to be happy:
+        # make this dummy charset.alias file for the bundler to be happy:
         sudo touch /opt/local/lib/charset.alias
 
 The bundler file in `build/MacOS/linphone.bundle` expects some plugins to be installed in `/opt/local/lib/mediastreamer/plugins`.

From 94b4002cbf36a979a55fe33d59a6773dfb8bf598 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Thu, 11 Dec 2014 08:35:42 +0100
Subject: [PATCH 147/496] fix ice parsing

---
 coreapi/bellesip_sal/sal_sdp.c | 7 ++++---
 coreapi/misc.c                 | 4 ++--
 mediastreamer2                 | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/coreapi/bellesip_sal/sal_sdp.c b/coreapi/bellesip_sal/sal_sdp.c
index cc6db442f..63a735717 100644
--- a/coreapi/bellesip_sal/sal_sdp.c
+++ b/coreapi/bellesip_sal/sal_sdp.c
@@ -489,10 +489,11 @@ static void sdp_parse_media_ice_parameters(belle_sdp_media_description_t *media_
 
 		if ((keywordcmp("candidate", att_name) == 0) && (value != NULL)) {
 			SalIceCandidate *candidate = &stream->ice_candidates[nb_ice_candidates];
-			int nb = sscanf(value, "%s %u UDP %u %s %d typ %s raddr %s rport %d",
-				candidate->foundation, &candidate->componentID, &candidate->priority, candidate->addr, &candidate->port,
+			char proto[4];
+			int nb = sscanf(value, "%s %u %3s %u %s %d typ %s raddr %s rport %d",
+				candidate->foundation, &candidate->componentID, proto, &candidate->priority, candidate->addr, &candidate->port,
 				candidate->type, candidate->raddr, &candidate->rport);
-			if ((nb == 6) || (nb == 8)) nb_ice_candidates++;
+			if (strcasecmp("udp",proto)==0 && ((nb == 7) || (nb == 9))) nb_ice_candidates++;
 			else memset(candidate, 0, sizeof(*candidate));
 		} else if ((keywordcmp("remote-candidates", att_name) == 0) && (value != NULL)) {
 			SalIceRemoteCandidate candidate;
diff --git a/coreapi/misc.c b/coreapi/misc.c
index 50ebe68ee..6ed3bb709 100644
--- a/coreapi/misc.c
+++ b/coreapi/misc.c
@@ -896,8 +896,8 @@ void linphone_call_update_ice_from_remote_media_description(LinphoneCall *call,
 			if (cl && (stream->ice_pwd[0] != '\0') && (stream->ice_ufrag[0] != '\0')) {
 				if (ice_check_list_remote_credentials_changed(cl, stream->ice_ufrag, stream->ice_pwd)) {
 					if (ice_restarted == FALSE
-							&& ice_check_list_remote_ufrag(cl)
-							&& ice_check_list_remote_pwd(cl)) {
+							&& ice_check_list_get_remote_ufrag(cl)
+							&& ice_check_list_get_remote_pwd(cl)) {
 							/* restart onlu if remote ufrag/paswd was already set*/
 						ice_session_restart(call->ice_session);
 						ice_restarted = TRUE;
diff --git a/mediastreamer2 b/mediastreamer2
index 6ef87545a..4b87cdd23 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 6ef87545afabc2f66e28b1092bc490cbe7a994c3
+Subproject commit 4b87cdd23ca14e9b39212b73f0a545d4f89a9d56

From 26620d4c0ff8627525949b40adc69fe647799a9e Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Thu, 11 Dec 2014 09:35:52 +0100
Subject: [PATCH 148/496] Fix compilation of file transfer tutorial.

---
 coreapi/help/filetransfer.c | 34 ++++++++--------------------------
 1 file changed, 8 insertions(+), 26 deletions(-)

diff --git a/coreapi/help/filetransfer.c b/coreapi/help/filetransfer.c
index c592c501b..b3863c248 100644
--- a/coreapi/help/filetransfer.c
+++ b/coreapi/help/filetransfer.c
@@ -63,7 +63,7 @@ static void file_transfer_progress_indication(LinphoneChatMessage *message, cons
 /**
  * function invoked when a file transfer is received.
  **/
-static void file_transfer_received(LinphoneChatMessage *message, const LinphoneContent* content, const char* buff, size_t size){
+static void file_transfer_received(LinphoneChatMessage *message, const LinphoneContent* content, const LinphoneBuffer *buffer){
 	FILE* file=NULL;
 	if (!linphone_chat_message_get_user_data(message)) {
 		/*first chunk, creating file*/
@@ -72,16 +72,14 @@ static void file_transfer_received(LinphoneChatMessage *message, const LinphoneC
 	} else {
 		/*next chunk*/
 		file = (FILE*)linphone_chat_message_get_user_data(message);
-
-		if (size==0) {
-
+		if (linphone_buffer_is_empty(buffer)) {
 			printf("File transfert completed\n");
 			linphone_chat_room_destroy(linphone_chat_message_get_chat_room(message));
 			linphone_chat_message_destroy(message);
 			fclose(file);
 			running=FALSE;
 		} else { /* store content on a file*/
-			if (fwrite(buff,size,1,file)==-1){
+			if (fwrite(linphone_buffer_get_content(buffer),linphone_buffer_get_size(buffer),1,file)==-1){
 				ms_warning("file_transfer_received() write failed: %s",strerror(errno));
 			}
 		}
@@ -89,30 +87,14 @@ static void file_transfer_received(LinphoneChatMessage *message, const LinphoneC
 }
 
 char big_file [128000];
+
 /*
  * function called when the file transfer is initiated. file content should be feed into object LinphoneContent
  * */
-static void file_transfer_send(LinphoneChatMessage *message,  const LinphoneContent* content, char* buff, size_t* size){
-	int offset=-1;
-
-	if (!linphone_chat_message_get_user_data(message)) {
-		/*first chunk*/
-		offset=0;
-	} else {
-		/*subsequent chunk*/
-		offset = (int)((long)(linphone_chat_message_get_user_data(message))&0x00000000FFFFFFFF);
-	}
-	*size = MIN(*size,sizeof(big_file)-offset); /*updating content->size with minimun between remaining data and requested size*/
-
-	if (*size==0) {
-		/*end of file*/
-		return;
-	}
-	memcpy(buff,big_file+offset,*size);
-
-	/*store offset for next chunk*/
-	linphone_chat_message_set_user_data(message,(void*)(offset+*size));
-
+static LinphoneBuffer * file_transfer_send(LinphoneChatMessage *message,  const LinphoneContent* content, size_t offset, size_t size){
+	size_t size_to_send = MIN(size, sizeof(big_file) - offset);
+	if (size == 0) return linphone_buffer_new(); /*end of file*/
+	return linphone_buffer_new_from_data((uint8_t *)big_file + offset, size_to_send);
 }
 
 /*

From 95de57a6c6752fcd436799d9a59ea98a2a5b4cf2 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@linphone.org>
Date: Thu, 11 Dec 2014 11:16:15 +0100
Subject: [PATCH 149/496] Fix ec calibration crash in Android

---
 coreapi/linphonecore_jni.cc                   | 39 +++++++++++--------
 .../org/linphone/core/LinphoneCore.java       |  5 ++-
 .../linphone/core/LinphoneCoreListener.java   | 20 +++++-----
 .../org/linphone/core/LinphoneCoreImpl.java   |  5 ++-
 4 files changed, 40 insertions(+), 29 deletions(-)

diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index 00e2c3692..98f14bff9 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -763,17 +763,24 @@ public:
 			ms_error("cannot attach VM");
 			return;
 		}
-		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
-		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
-		env->CallVoidMethod(lcData->listener
-							,lcData->ecCalibrationStatusId
-							,lcData->core
-							,env->CallStaticObjectMethod(lcData->ecCalibratorStatusClass,lcData->ecCalibratorStatusFromIntId,(jint)status)
-							,delay_ms
-							,data ? data : NULL);
-		if (data != NULL &&status !=LinphoneEcCalibratorInProgress ) {
-			//final state, releasing global ref
-			env->DeleteGlobalRef((jobject)data);
+		
+		LinphoneCoreVTable *table = (LinphoneCoreVTable*) data;
+		if (table) {
+			LinphoneCoreData* lcData = (LinphoneCoreData*) linphone_core_v_table_get_user_data(table);
+			if (lcData->ecCalibrationStatusId) {
+				jobject ecData = env->NewGlobalRef((jobject) data);
+				jobject state = env->CallStaticObjectMethod(lcData->ecCalibratorStatusClass, lcData->ecCalibratorStatusFromIntId, (jint)status);
+				env->CallVoidMethod(lcData->listener
+								,lcData->ecCalibrationStatusId
+								,lcData->core
+								,state
+								,delay_ms
+								,ecData);
+				env->DeleteGlobalRef(ecData);
+			}
+			if (status != LinphoneEcCalibratorInProgress) {
+				linphone_core_v_table_destroy(table);
+			}
 		}
 
 	}
@@ -1727,11 +1734,11 @@ extern "C" jint Java_org_linphone_core_LinphoneCoreImpl_startEchoCalibration(JNI
 																				,jobject  thiz
 																				,jlong lc
 																				,jobject data) {
-	return (jint)linphone_core_start_echo_calibration((LinphoneCore*)lc
-													, LinphoneCoreData::ecCalibrationStatus
-													, NULL
-													, NULL
-													, data?env->NewGlobalRef(data):NULL);
+	LinphoneCoreVTable *vTable = linphone_core_v_table_new();
+	LinphoneCoreData* ldata = new LinphoneCoreData(env, thiz, vTable, data);
+	linphone_core_v_table_set_user_data(vTable, ldata);
+	
+	return (jint)linphone_core_start_echo_calibration((LinphoneCore*)lc, ldata->ecCalibrationStatus, NULL, NULL, vTable);
 
 }
 
diff --git a/java/common/org/linphone/core/LinphoneCore.java b/java/common/org/linphone/core/LinphoneCore.java
index 93c5fe1cf..4b8f42a1b 100644
--- a/java/common/org/linphone/core/LinphoneCore.java
+++ b/java/common/org/linphone/core/LinphoneCore.java
@@ -20,6 +20,7 @@ package org.linphone.core;
 
 import java.util.Vector;
 
+import org.linphone.core.LinphoneCoreListener.LinphoneEchoCalibrationListener;
 import org.linphone.mediastream.video.AndroidVideoWindowImpl;
 import org.linphone.mediastream.video.capture.hwconf.AndroidCameraConfiguration;
 
@@ -1057,10 +1058,10 @@ public interface LinphoneCore {
 	/**
 	 * Start an echo calibration of the sound devices, in order to find adequate settings for the echo canceler automatically.
 	 * status is notified to {@link LinphoneCoreListener#ecCalibrationStatus(EcCalibratorStatus, int, Object)}
-	 * @param User object
+	 * @param listener the LinphoneEchoCalibrationListener to call when the calibration is done
 	 * @throws LinphoneCoreException if operation is still in progress;
 	**/
-	void startEchoCalibration(Object data) throws LinphoneCoreException;
+	void startEchoCalibration(LinphoneEchoCalibrationListener listener) throws LinphoneCoreException;
 
 	/**
 	 * Returns true if echo calibration is recommended.
diff --git a/java/common/org/linphone/core/LinphoneCoreListener.java b/java/common/org/linphone/core/LinphoneCoreListener.java
index d92743ce1..4be9ff799 100644
--- a/java/common/org/linphone/core/LinphoneCoreListener.java
+++ b/java/common/org/linphone/core/LinphoneCoreListener.java
@@ -75,15 +75,6 @@ public interface LinphoneCoreListener {
 		 */
 		void dtmfReceived(LinphoneCore lc, LinphoneCall call, int dtmf);
 		
-		/**
-		 * Invoked when echo cancalation calibration is completed
-		 * @param lc LinphoneCore
-		 * @param status 
-		 * @param delay_ms echo delay
-		 * @param data
-		 */
-		void ecCalibrationStatus(LinphoneCore lc,LinphoneCore.EcCalibratorStatus status, int delay_ms, Object data);
-		
 		/**
 		 *  Report Notified message received for this identity.
 		 *  @param lc LinphoneCore
@@ -243,5 +234,16 @@ public interface LinphoneCoreListener {
 		 */
 		void isComposingReceived(LinphoneCore lc, LinphoneChatRoom cr);
 	}
+	
+	public interface LinphoneEchoCalibrationListener extends LinphoneCoreListener {
+		/**
+		 * Invoked when echo cancalation calibration is completed
+		 * @param lc LinphoneCore
+		 * @param status 
+		 * @param delay_ms echo delay
+		 * @param data
+		 */
+		void ecCalibrationStatus(LinphoneCore lc,LinphoneCore.EcCalibratorStatus status, int delay_ms, Object data);
+	}
 }
 
diff --git a/java/impl/org/linphone/core/LinphoneCoreImpl.java b/java/impl/org/linphone/core/LinphoneCoreImpl.java
index ea8899883..21a356490 100644
--- a/java/impl/org/linphone/core/LinphoneCoreImpl.java
+++ b/java/impl/org/linphone/core/LinphoneCoreImpl.java
@@ -24,6 +24,7 @@ import java.io.File;
 import java.io.IOException;
 
 import org.linphone.core.LinphoneCall.State;
+import org.linphone.core.LinphoneCoreListener.LinphoneEchoCalibrationListener;
 import org.linphone.mediastream.Log;
 import org.linphone.mediastream.video.AndroidVideoWindowImpl;
 import org.linphone.mediastream.video.capture.hwconf.Hacks;
@@ -558,8 +559,8 @@ class LinphoneCoreImpl implements LinphoneCore {
 	public synchronized boolean isKeepAliveEnabled() {
 		return isKeepAliveEnabled(nativePtr);
 	}
-	public synchronized void startEchoCalibration(Object data) throws LinphoneCoreException {
-		startEchoCalibration(nativePtr, data);
+	public synchronized void startEchoCalibration(LinphoneEchoCalibrationListener listener) throws LinphoneCoreException {
+		startEchoCalibration(nativePtr, listener);
 	}
 
 	public synchronized Transports getSignalingTransportPorts() {

From f3c7c993eacd8f9eccb8088e53875ccbd50f346b Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@linphone.org>
Date: Thu, 11 Dec 2014 11:19:37 +0100
Subject: [PATCH 150/496] Fix mistake in previous commit

---
 coreapi/linphonecore_jni.cc | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index 98f14bff9..a56e1d14b 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -768,15 +768,13 @@ public:
 		if (table) {
 			LinphoneCoreData* lcData = (LinphoneCoreData*) linphone_core_v_table_get_user_data(table);
 			if (lcData->ecCalibrationStatusId) {
-				jobject ecData = env->NewGlobalRef((jobject) data);
 				jobject state = env->CallStaticObjectMethod(lcData->ecCalibratorStatusClass, lcData->ecCalibratorStatusFromIntId, (jint)status);
 				env->CallVoidMethod(lcData->listener
 								,lcData->ecCalibrationStatusId
 								,lcData->core
 								,state
 								,delay_ms
-								,ecData);
-				env->DeleteGlobalRef(ecData);
+								,NULL);
 			}
 			if (status != LinphoneEcCalibratorInProgress) {
 				linphone_core_v_table_destroy(table);

From b0f621ad13b8f827b79bbd2ae6f6e73ba632606e Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Thu, 11 Dec 2014 11:40:28 +0100
Subject: [PATCH 151/496] Use real file for file upload test and check that the
 received file is the same as the sent one.

---
 tester/liblinphone_tester.h |  1 +
 tester/message_tester.c     | 84 ++++++++++++++++++++++++++++++-------
 2 files changed, 71 insertions(+), 14 deletions(-)

diff --git a/tester/liblinphone_tester.h b/tester/liblinphone_tester.h
index 2921a4349..d7bbb64e9 100644
--- a/tester/liblinphone_tester.h
+++ b/tester/liblinphone_tester.h
@@ -259,6 +259,7 @@ void text_message_received(LinphoneCore *lc, LinphoneChatRoom *room, const Linph
 void message_received(LinphoneCore *lc, LinphoneChatRoom *room, LinphoneChatMessage* message);
 void file_transfer_received(LinphoneChatMessage *message, const LinphoneContent* content, const LinphoneBuffer *buffer);
 LinphoneBuffer * file_transfer_send(LinphoneChatMessage *message, const LinphoneContent* content, size_t offset, size_t size);
+LinphoneBuffer * memory_file_transfer_send(LinphoneChatMessage *message, const LinphoneContent* content, size_t offset, size_t size);
 void file_transfer_progress_indication(LinphoneChatMessage *message, const LinphoneContent* content, size_t offset, size_t total);
 void is_composing_received(LinphoneCore *lc, LinphoneChatRoom *room);
 void info_message_received(LinphoneCore *lc, LinphoneCall *call, const LinphoneInfoMessage *msg);
diff --git a/tester/message_tester.c b/tester/message_tester.c
index 62bf70302..bce4c2989 100644
--- a/tester/message_tester.c
+++ b/tester/message_tester.c
@@ -94,6 +94,25 @@ static char big_file [128000]; /* a buffer to simulate a big file for the file t
  * function called when the file transfer is initiated. file content should be feed into object LinphoneContent
  * */
 LinphoneBuffer * file_transfer_send(LinphoneChatMessage *message, const LinphoneContent* content, size_t offset, size_t size){
+	LinphoneBuffer *lb;
+	size_t file_size;
+	size_t size_to_send;
+	FILE *file_to_send;
+	uint8_t *buf;
+	if (size == 0) return linphone_buffer_new(); /*end of file*/
+	file_to_send = linphone_chat_message_get_user_data(message);
+	fseek(file_to_send, 0, SEEK_END);
+	file_size = ftell(file_to_send);
+	fseek(file_to_send, offset, SEEK_SET);
+	size_to_send = MIN(size, file_size - offset);
+	buf = ms_malloc(size_to_send);
+	fread(buf, size_to_send, 1, file_to_send);
+	lb = linphone_buffer_new_from_data(buf, size_to_send);
+	ms_free(buf);
+	return lb;
+}
+
+LinphoneBuffer * memory_file_transfer_send(LinphoneChatMessage *message, const LinphoneContent* content, size_t offset, size_t size){
 	size_t size_to_send = MIN(size, sizeof(big_file) - offset);
 	if (size == 0) return linphone_buffer_new(); /*end of file*/
 	return linphone_buffer_new_from_data((uint8_t *)big_file + offset, size_to_send);
@@ -386,24 +405,56 @@ static void text_message_with_external_body(void) {
 	linphone_core_manager_destroy(pauline);
 }
 
+static bool_t compare_files(const char *path1, const char *path2) {
+	bool_t res;
+	size_t size1;
+	size_t size2;
+	uint8_t *buf1;
+	uint8_t *buf2;
+	FILE *f1 = fopen(path1, "rb");
+	FILE *f2 = fopen(path2, "rb");
+	fseek(f1, 0, SEEK_END);
+	size1 = ftell(f1);
+	fseek(f1, 0, SEEK_SET);
+	fseek(f2, 0, SEEK_END);
+	size2 = ftell(f2);
+	fseek(f2, 0, SEEK_SET);
+	if (size1 != size2) {
+		fclose(f1);
+		fclose(f2);
+		return FALSE;
+	}
+	buf1 = ms_malloc(size1);
+	buf2 = ms_malloc(size2);
+	fread(buf1, size1, 1, f1);
+	fread(buf2, size2, 1, f2);
+	fclose(f1);
+	fclose(f2);
+	res = (memcmp(buf1, buf2, size1) == 0) ? TRUE : FALSE;
+	ms_free(buf1);
+	ms_free(buf2);
+	return res;
+}
+
 static void file_transfer_message(void) {
-	int i;
 	char* to;
 	LinphoneChatRoom* chat_room;
 	LinphoneChatMessage* message;
 	LinphoneChatMessageCbs *cbs;
 	LinphoneContent* content;
-	const char* big_file_content="big file"; /* setting dummy file content to something */
+	FILE *file_to_send = NULL;
+	size_t file_size;
+	char *send_filepath = ms_strdup_printf("%s/images/nowebcamCIF.jpg", liblinphone_tester_file_prefix);
+	char *receive_filepath = ms_strdup_printf("%s/receive_file.dump", liblinphone_tester_writable_dir_prefix);
 	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
 	reset_counters(&marie->stat);
 	reset_counters(&pauline->stat);
 
-	for (i=0;i<sizeof(big_file);i+=strlen(big_file_content))
-		memcpy(big_file+i, big_file_content, strlen(big_file_content));
-
-	big_file[0]=*"S";
-	big_file[sizeof(big_file)-1]=*"E";
+	file_to_send = fopen(send_filepath, "rb");
+	fseek(file_to_send, 0, SEEK_END);
+	file_size = ftell(file_to_send);
+	fseek(file_to_send, 0, SEEK_SET);
 
 	/* Globally configure an http file transfer server. */
 	linphone_core_set_file_transfer_server(pauline->lc,"https://www.linphone.org:444/lft.php");
@@ -414,11 +465,12 @@ static void file_transfer_message(void) {
 	ms_free(to);
 	/* create a file transfer message */
 	content = linphone_core_create_content(pauline->lc);
-	linphone_content_set_type(content,"text");
-	linphone_content_set_subtype(content,"plain");
-	linphone_content_set_size(content,sizeof(big_file)); /*total size to be transfered*/
-	linphone_content_set_name(content,"bigfile.txt");
+	linphone_content_set_type(content,"image");
+	linphone_content_set_subtype(content,"jpeg");
+	linphone_content_set_size(content,file_size); /*total size to be transfered*/
+	linphone_content_set_name(content,"nowebcamCIF.jpg");
 	message = linphone_chat_room_create_file_transfer_message(chat_room, content);
+	linphone_chat_message_set_user_data(message, file_to_send);
 	cbs = linphone_chat_message_get_callbacks(message);
 	{
 		int dummy=0;
@@ -430,6 +482,7 @@ static void file_transfer_message(void) {
 	linphone_chat_message_cbs_set_file_transfer_send(cbs, file_transfer_send);
 	linphone_chat_room_send_chat_message(chat_room,message);
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneMessageReceivedWithFile,1));
+	fclose(file_to_send);
 	if (marie->stat.last_received_chat_message ) {
 		cbs = linphone_chat_message_get_callbacks(marie->stat.last_received_chat_message);
 		linphone_chat_message_cbs_set_msg_state_changed(cbs, liblinphone_tester_chat_message_msg_state_changed);
@@ -441,10 +494,13 @@ static void file_transfer_message(void) {
 	CU_ASSERT_EQUAL(pauline->stat.number_of_LinphoneMessageInProgress,1);
 	CU_ASSERT_EQUAL(pauline->stat.number_of_LinphoneMessageDelivered,1);
 	CU_ASSERT_EQUAL(marie->stat.number_of_LinphoneMessageExtBodyReceived,1);
+	CU_ASSERT_TRUE(compare_files(send_filepath, receive_filepath));
 
 	linphone_content_unref(content);
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
+	ms_free(send_filepath);
+	ms_free(receive_filepath);
 }
 
 /* same than previous but with a 160 characters file */
@@ -490,7 +546,7 @@ static void small_file_transfer_message(void) {
 	}
 	cbs = linphone_chat_message_get_callbacks(message);
 	linphone_chat_message_cbs_set_msg_state_changed(cbs, liblinphone_tester_chat_message_msg_state_changed);
-	linphone_chat_message_cbs_set_file_transfer_send(cbs, file_transfer_send);
+	linphone_chat_message_cbs_set_file_transfer_send(cbs, memory_file_transfer_send);
 	linphone_chat_room_send_chat_message(chat_room,message);
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneMessageReceivedWithFile,1));
 	if (marie->stat.last_received_chat_message ) {
@@ -552,7 +608,7 @@ static void file_transfer_message_io_error_upload(void) {
 	}
 	cbs = linphone_chat_message_get_callbacks(message);
 	linphone_chat_message_cbs_set_msg_state_changed(cbs, liblinphone_tester_chat_message_msg_state_changed);
-	linphone_chat_message_cbs_set_file_transfer_send(cbs, file_transfer_send);
+	linphone_chat_message_cbs_set_file_transfer_send(cbs, memory_file_transfer_send);
 	linphone_chat_message_cbs_set_file_transfer_progress_indication(cbs, file_transfer_progress_indication);
 	linphone_chat_room_send_chat_message(chat_room,message);
 
@@ -683,7 +739,7 @@ static void file_transfer_message_upload_cancelled(void) {
 	}
 	cbs = linphone_chat_message_get_callbacks(message);
 	linphone_chat_message_cbs_set_msg_state_changed(cbs, liblinphone_tester_chat_message_msg_state_changed);
-	linphone_chat_message_cbs_set_file_transfer_send(cbs, file_transfer_send);
+	linphone_chat_message_cbs_set_file_transfer_send(cbs, memory_file_transfer_send);
 	linphone_chat_message_cbs_set_file_transfer_progress_indication(cbs, file_transfer_progress_indication);
 	linphone_chat_room_send_chat_message(chat_room,message);
 

From 78a06d3e5474885f7c10ccf95aebae2548b3a964 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Thu, 11 Dec 2014 11:46:08 +0100
Subject: [PATCH 152/496] Fix return value in callbacks of Python module.

---
 tools/python/apixml2python/linphone.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/tools/python/apixml2python/linphone.py b/tools/python/apixml2python/linphone.py
index 19f4cd6f7..ce333a475 100644
--- a/tools/python/apixml2python/linphone.py
+++ b/tools/python/apixml2python/linphone.py
@@ -804,18 +804,23 @@ class EventCallbackMethodDefinition(MethodDefinition):
 		return "{returnvars}\n{common}\n{specific}".format(returnvars=returnvars, common=common, specific=specific)
 
 	def format_arguments_parsing(self):
+		return_str = ''
+		if self.return_complete_type != 'void':
+			argument_type = ArgumentType(self.return_type, self.return_complete_type, self.return_contained_type, self.linphone_module)
+			if argument_type.fmt_str == 'O':
+				return_str = 'NULL'
 		if self.class_['event_class'] == 'Core':
 			return \
-"""	if (Py_REFCNT(pyself) <= 0) return;
+"""	if (Py_REFCNT(pyself) <= 0) return {return_str};
 	func = PyDict_GetItemString(pyself->vtable_dict, "{name}");
 	pygil_state = PyGILState_Ensure();
-""".format(name=self.class_['event_name'])
+""".format(name=self.class_['event_name'], return_str=return_str)
 		else:
 			return \
-"""	if (Py_REFCNT(pyself) <= 0) return;
+"""	if (Py_REFCNT(pyself) <= 0) return {return_str};
 	func = pycbs->{event_name};
 	pygil_state = PyGILState_Ensure();
-""".format(event_name=self.class_['event_name'])
+""".format(event_name=self.class_['event_name'], return_str=return_str)
 
 	def format_enter_trace(self):
 		fmt = '%p'

From 24f4d44496c57f13d124b6769980dae703152068 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Thu, 11 Dec 2014 14:34:45 +0100
Subject: [PATCH 153/496] There is no longer a dummy call to the
 file_transfer_recv callback at the beginning of a file download.

---
 coreapi/help/filetransfer.c | 25 ++++++++++++-------------
 tester/message_tester.c     | 21 ++++++++++-----------
 2 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/coreapi/help/filetransfer.c b/coreapi/help/filetransfer.c
index b3863c248..570e22692 100644
--- a/coreapi/help/filetransfer.c
+++ b/coreapi/help/filetransfer.c
@@ -69,19 +69,18 @@ static void file_transfer_received(LinphoneChatMessage *message, const LinphoneC
 		/*first chunk, creating file*/
 		file = fopen("receive_file.dump","wb");
 		linphone_chat_message_set_user_data(message,(void*)file); /*store fd for next chunks*/
-	} else {
-		/*next chunk*/
-		file = (FILE*)linphone_chat_message_get_user_data(message);
-		if (linphone_buffer_is_empty(buffer)) {
-			printf("File transfert completed\n");
-			linphone_chat_room_destroy(linphone_chat_message_get_chat_room(message));
-			linphone_chat_message_destroy(message);
-			fclose(file);
-			running=FALSE;
-		} else { /* store content on a file*/
-			if (fwrite(linphone_buffer_get_content(buffer),linphone_buffer_get_size(buffer),1,file)==-1){
-				ms_warning("file_transfer_received() write failed: %s",strerror(errno));
-			}
+	}
+
+	file = (FILE*)linphone_chat_message_get_user_data(message);
+	if (linphone_buffer_is_empty(buffer)) {
+		printf("File transfert completed\n");
+		linphone_chat_room_destroy(linphone_chat_message_get_chat_room(message));
+		linphone_chat_message_destroy(message);
+		fclose(file);
+		running=FALSE;
+	} else { /* store content on a file*/
+		if (fwrite(linphone_buffer_get_content(buffer),linphone_buffer_get_size(buffer),1,file)==-1){
+			ms_warning("file_transfer_received() write failed: %s",strerror(errno));
 		}
 	}
 }
diff --git a/tester/message_tester.c b/tester/message_tester.c
index bce4c2989..7ec828ccc 100644
--- a/tester/message_tester.c
+++ b/tester/message_tester.c
@@ -72,18 +72,17 @@ void file_transfer_received(LinphoneChatMessage *message, const LinphoneContent*
 		/*first chunk, creating file*/
 		file = fopen(receive_file,"wb");
 		linphone_chat_message_set_user_data(message,(void*)file); /*store fd for next chunks*/
-	} else {
-		/*next chunk*/
-		file = (FILE*)linphone_chat_message_get_user_data(message);
+	}
 
-		if (linphone_buffer_is_empty(buffer)) { /* tranfer complete */
-			stats* counters = get_stats(lc);
-			counters->number_of_LinphoneMessageExtBodyReceived++;
-			fclose(file);
-		} else { /* store content on a file*/
-			if (fwrite(linphone_buffer_get_content(buffer),linphone_buffer_get_size(buffer),1,file)==-1){
-				ms_error("file_transfer_received(): write() failed: %s",strerror(errno));
-			}
+	file = (FILE*)linphone_chat_message_get_user_data(message);
+
+	if (linphone_buffer_is_empty(buffer)) { /* tranfer complete */
+		stats* counters = get_stats(lc);
+		counters->number_of_LinphoneMessageExtBodyReceived++;
+		fclose(file);
+	} else { /* store content on a file*/
+		if (fwrite(linphone_buffer_get_content(buffer),linphone_buffer_get_size(buffer),1,file)==-1){
+			ms_error("file_transfer_received(): write() failed: %s",strerror(errno));
 		}
 	}
 }

From 0cd96056444c4abcec9acacdcd7099421bf71c90 Mon Sep 17 00:00:00 2001
From: johan <johan@mint>
Date: Thu, 11 Dec 2014 14:52:59 +0100
Subject: [PATCH 154/496] Add Dtls proto when looking for best stream in media
 description

---
 coreapi/sal.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/coreapi/sal.c b/coreapi/sal.c
index 5d43546be..6aa444947 100644
--- a/coreapi/sal.c
+++ b/coreapi/sal.c
@@ -120,7 +120,9 @@ SalStreamDescription * sal_media_description_find_secure_stream_of_type(SalMedia
 }
 
 SalStreamDescription * sal_media_description_find_best_stream(SalMediaDescription *md, SalStreamType type) {
-	SalStreamDescription *desc = sal_media_description_find_stream(md, SalProtoRtpSavpf, type);
+	SalStreamDescription *desc = sal_media_description_find_stream(md, SalProtoUdpTlsRtpSavpf, type);
+	if (desc == NULL) desc = sal_media_description_find_stream(md, SalProtoUdpTlsRtpSavp, type);
+	if (desc == NULL) desc = sal_media_description_find_stream(md, SalProtoRtpSavpf, type);
 	if (desc == NULL) desc = sal_media_description_find_stream(md, SalProtoRtpSavp, type);
 	if (desc == NULL) desc = sal_media_description_find_stream(md, SalProtoRtpAvpf, type);
 	if (desc == NULL) desc = sal_media_description_find_stream(md, SalProtoRtpAvp, type);

From 20fe706f7d4e5f3832a9e3fd15f31c533454dd33 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Thu, 11 Dec 2014 14:56:28 +0100
Subject: [PATCH 155/496] check if number of ice candidate does not exceed
 stirage size

---
 coreapi/bellesip_sal/sal_sdp.c | 4 +++-
 include/sal/sal.h              | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/coreapi/bellesip_sal/sal_sdp.c b/coreapi/bellesip_sal/sal_sdp.c
index 63a735717..34720f5b4 100644
--- a/coreapi/bellesip_sal/sal_sdp.c
+++ b/coreapi/bellesip_sal/sal_sdp.c
@@ -487,7 +487,9 @@ static void sdp_parse_media_ice_parameters(belle_sdp_media_description_t *media_
 		att_name = belle_sdp_attribute_get_name(attribute);
 		value = belle_sdp_attribute_get_value(attribute);
 
-		if ((keywordcmp("candidate", att_name) == 0) && (value != NULL)) {
+		if (	(nb_ice_candidates < sizeof (stream->ice_candidates)/sizeof(SalIceCandidate))
+				&& (keywordcmp("candidate", att_name) == 0)
+				&& (value != NULL)) {
 			SalIceCandidate *candidate = &stream->ice_candidates[nb_ice_candidates];
 			char proto[4];
 			int nb = sscanf(value, "%s %u %3s %u %s %d typ %s raddr %s rport %d",
diff --git a/include/sal/sal.h b/include/sal/sal.h
index 47a5f71fc..43284179e 100644
--- a/include/sal/sal.h
+++ b/include/sal/sal.h
@@ -164,7 +164,7 @@ typedef struct SalIceCandidate {
 	int rport;
 } SalIceCandidate;
 
-#define SAL_MEDIA_DESCRIPTION_MAX_ICE_CANDIDATES 10
+#define SAL_MEDIA_DESCRIPTION_MAX_ICE_CANDIDATES 20
 
 typedef struct SalIceRemoteCandidate {
 	char addr[SAL_MEDIA_DESCRIPTION_MAX_ICE_ADDR_LEN];

From 8b33ed404ebbe56157e455c50b8ffaa4e71174f6 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Thu, 11 Dec 2014 15:58:58 +0100
Subject: [PATCH 156/496] Always store a NULL character at the end of a
 LinphoneBuffer.

---
 coreapi/buffer.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/coreapi/buffer.c b/coreapi/buffer.c
index 8e44f832b..9db65798e 100644
--- a/coreapi/buffer.c
+++ b/coreapi/buffer.c
@@ -78,8 +78,9 @@ const uint8_t * linphone_buffer_get_content(const LinphoneBuffer *buffer) {
 void linphone_buffer_set_content(LinphoneBuffer *buffer, const uint8_t *content, size_t size) {
 	buffer->size = size;
 	if (buffer->content) belle_sip_free(buffer->content);
-	buffer->content = belle_sip_malloc(size);
+	buffer->content = belle_sip_malloc(size + 1);
 	memcpy(buffer->content, content, size);
+    ((char *)buffer->content)[size] = '\0';
 }
 
 const char * linphone_buffer_get_string_content(const LinphoneBuffer *buffer) {

From 340d927c3c73d5a7cebeb30bac2d9bf5f608b747 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Thu, 11 Dec 2014 15:59:29 +0100
Subject: [PATCH 157/496] File transfer with binary content working in Python.

---
 tools/python/apixml2python.py                 |   6 +-
 .../handwritten_declarations.mustache         |   3 +
 .../handwritten_definitions.mustache          | 145 +++++++++-------
 tools/python/unittests/test_message.py        | 157 ++++++++++++++----
 4 files changed, 219 insertions(+), 92 deletions(-)

diff --git a/tools/python/apixml2python.py b/tools/python/apixml2python.py
index ff62efd30..d6746ad08 100755
--- a/tools/python/apixml2python.py
+++ b/tools/python/apixml2python.py
@@ -38,9 +38,6 @@ blacklisted_events = [
 	'LinphoneCoreFileTransferSendCb'	# missing LinphoneContent
 ]
 blacklisted_functions = [
-	'linphone_buffer_new_from_data',
-	'linphone_buffer_get_content',
-	'linphone_buffer_set_content',
 	'linphone_call_log_get_local_stats',	# missing rtp_stats_t
 	'linphone_call_log_get_remote_stats',	# missing rtp_stats_t
 	'linphone_call_params_get_privacy',	# missing LinphonePrivacyMask
@@ -74,7 +71,8 @@ blacklisted_functions = [
 	'lp_config_section_to_dict'	# missing LinphoneDictionary
 ]
 hand_written_functions = [
-	HandWrittenInstanceMethod('ChatRoom', 'send_message2', 'linphone_chat_room_send_message2'),
+	HandWrittenClassMethod('Buffer', 'new_from_data', 'linphone_buffer_new_from_data'),
+	HandWrittenProperty('Buffer', 'content', 'linphone_buffer_get_content', 'linphone_buffer_set_content'),
 	HandWrittenProperty('Content', 'buffer', 'linphone_content_get_buffer', 'linphone_content_set_buffer'),
 	HandWrittenProperty('Core', 'sound_devices', 'linphone_core_get_sound_devices', None),
 	HandWrittenProperty('Core', 'video_devices', 'linphone_core_get_video_devices', None),
diff --git a/tools/python/apixml2python/handwritten_declarations.mustache b/tools/python/apixml2python/handwritten_declarations.mustache
index 78fcebc22..a9c2d1ee6 100644
--- a/tools/python/apixml2python/handwritten_declarations.mustache
+++ b/tools/python/apixml2python/handwritten_declarations.mustache
@@ -25,5 +25,8 @@ PyObject * PyLinphoneSipTransports_FromLCSipTransports(LCSipTransports lcst);
 time_t PyDateTime_As_time_t(PyObject *obj);
 PyObject * PyDateTime_From_time_t(time_t t);
 
+static PyObject * pylinphone_Buffer_get_content(PyObject *self, void *closure);
+static int pylinphone_Buffer_set_content(PyObject *self, PyObject *value, void *closure);
+
 static PyObject * pylinphone_Content_get_buffer(PyObject *self, void *closure);
 static int pylinphone_Content_set_buffer(PyObject *self, PyObject *value, void *closure);
diff --git a/tools/python/apixml2python/handwritten_definitions.mustache b/tools/python/apixml2python/handwritten_definitions.mustache
index 3ff9db17b..6b2e176f1 100644
--- a/tools/python/apixml2python/handwritten_definitions.mustache
+++ b/tools/python/apixml2python/handwritten_definitions.mustache
@@ -259,66 +259,6 @@ static PyObject * pylinphone_Core_class_method_new_with_config(PyObject *cls, Py
 }
 
 
-static void pylinphone_ChatRoom_callback_chat_message_state_changed(LinphoneChatMessage *msg, LinphoneChatMessageState state, void *ud) {
-	PyGILState_STATE pygil_state;
-	PyObject *pycm = NULL;
-	PyObject *_dict = (PyObject *)ud;
-	PyObject *_cb = PyDict_GetItemString(_dict, "callback");
-	PyObject *_ud = PyDict_GetItemString(_dict, "user_data");
-
-	pygil_state = PyGILState_Ensure();
-	pycm = pylinphone_ChatMessage_from_native_ptr(&pylinphone_ChatMessageType, msg);
-	pylinphone_trace(1, "[PYLINPHONE] >>> %s(%p, %p [%p], %d, %p)", __FUNCTION__, pycm, msg, state, ud);
-	if ((_cb != NULL) && PyCallable_Check(_cb)) {
-		PyObject *args = Py_BuildValue("OiO", pycm, state, _ud);
-		if (PyEval_CallObject(_cb, args) == NULL) {
-			PyErr_Print();
-		}
-		Py_DECREF(args);
-	}
-	pylinphone_trace(-1, "[PYLINPHONE] <<< %s", __FUNCTION__);
-	PyGILState_Release(pygil_state);
-}
-
-static PyObject * pylinphone_ChatRoom_instance_method_send_message2(PyObject *self, PyObject *args) {
-	PyObject *_chat_message;
-	PyObject *_dict;
-	PyObject *_cb;
-	PyObject *_ud;
-	LinphoneChatMessage * _chat_message_native_ptr;
-	LinphoneChatRoom *native_ptr = pylinphone_ChatRoom_get_native_ptr(self);
-
-	if (native_ptr == NULL) {
-		PyErr_SetString(PyExc_TypeError, "Invalid linphone.ChatRoom instance");
-		return NULL;
-	}
-	if (!PyArg_ParseTuple(args, "OOO", &_chat_message, &_cb, &_ud)) {
-		return NULL;
-	}
-	if (!PyObject_IsInstance(_chat_message, (PyObject *)&pylinphone_ChatMessageType)) {
-		PyErr_SetString(PyExc_TypeError, "The msg argument must be a linphone.ChatMessage");
-		return NULL;
-	}
-	if ((_cb != Py_None) && !PyCallable_Check(_cb)) {
-		PyErr_SetString(PyExc_TypeError, "The status_cb argument must be a callable");
-		return NULL;
-	}
-	if ((_chat_message_native_ptr = pylinphone_ChatMessage_get_native_ptr(_chat_message)) == NULL) {
-		return NULL;
-	}
-	_dict = PyDict_New();
-	PyDict_SetItemString(_dict, "callback", _cb);
-	PyDict_SetItemString(_dict, "user_data", _ud);
-
-	pylinphone_trace(1, "[PYLINPHONE] >>> %s(%p [%p], %p [%p], %p, %p)", __FUNCTION__, self, native_ptr, _chat_message, _chat_message_native_ptr, _cb, _ud);
-	linphone_chat_room_send_message2(native_ptr, _chat_message_native_ptr, pylinphone_ChatRoom_callback_chat_message_state_changed, _dict);
-	pylinphone_dispatch_messages();
-
-	pylinphone_trace(-1, "[PYLINPHONE] <<< %s -> None", __FUNCTION__);
-	Py_RETURN_NONE;
-}
-
-
 
 static void pylinphone_VideoSize_dealloc(PyObject *self) {
 	pylinphone_trace(1, "[PYLINPHONE] >>> %s(%p)", __FUNCTION__, self);
@@ -647,6 +587,91 @@ static PyMethodDef pylinphone_PayloadTypeType_ModuleMethods[] = {
 };
 
 
+static PyObject * pylinphone_Buffer_class_method_new_from_data(PyObject *cls, PyObject *args) {
+	LinphoneBuffer * cresult;
+	pylinphone_BufferObject *self;
+	PyObject * pyret;
+	PyObject * _byte_array;
+
+	if (!PyArg_ParseTuple(args, "O", &_byte_array)) {
+		return NULL;
+	}
+	if (!PyByteArray_Check(_byte_array)) {
+		PyErr_SetString(PyExc_TypeError, "The argument must be a ByteArray");
+		return NULL;
+	}
+
+	self = (pylinphone_BufferObject *)PyObject_CallObject((PyObject *) &pylinphone_BufferType, NULL);
+	if (self == NULL) {
+		return NULL;
+	}
+
+	pylinphone_trace(1, "[PYLINPHONE] >>> %s(%p)", __FUNCTION__, _byte_array);
+	cresult = linphone_buffer_new_from_data((uint8_t *)PyByteArray_AsString(_byte_array), PyByteArray_Size(_byte_array));
+	self->native_ptr = cresult;
+
+	pyret = Py_BuildValue("O", self);
+
+	pylinphone_trace(-1, "[PYLINPHONE] <<< %s -> %p", __FUNCTION__, pyret);
+	Py_DECREF(self);
+	return pyret;
+}
+
+static PyObject * pylinphone_Buffer_get_content(PyObject *self, void *closure) {
+	const uint8_t * ccontent;
+	size_t csize;
+	PyObject * pyresult;
+	PyObject * pyret;
+	const char *pyret_fmt;
+	const LinphoneBuffer *native_ptr;
+	native_ptr = pylinphone_Buffer_get_native_ptr(self);
+	if (native_ptr == NULL) {
+		PyErr_SetString(PyExc_TypeError, "Invalid linphone.Buffer instance");
+		return NULL;
+	}
+
+	pylinphone_trace(1, "[PYLINPHONE] >>> %s(%p [%p])", __FUNCTION__, self, native_ptr);
+	ccontent = linphone_buffer_get_content(native_ptr);
+	csize = linphone_buffer_get_size(native_ptr);
+	pylinphone_dispatch_messages();
+
+	pyresult = PyByteArray_FromStringAndSize((const char *)ccontent, csize);
+	pyret = Py_BuildValue("O", pyresult);
+	pylinphone_trace(-1, "[PYLINPHONE] <<< %s -> %p", __FUNCTION__, pyret);
+	return pyret;
+}
+
+static int pylinphone_Buffer_set_content(PyObject *self, PyObject *value, void *closure) {
+	LinphoneBuffer *native_ptr;
+	uint8_t * _content;
+	size_t _size;
+	LinphonePresenceModel * _presence_native_ptr = NULL;
+	native_ptr = pylinphone_Buffer_get_native_ptr(self);
+	if (native_ptr == NULL) {
+		PyErr_SetString(PyExc_TypeError, "Invalid linphone.Buffer instance");
+		return -1;
+	}
+
+	if (value == NULL) {
+		PyErr_SetString(PyExc_TypeError, "Cannot delete the 'content' attribute.");
+		return -1;
+	}
+	if ((value != Py_None) && !PyByteArray_Check(value)) {
+		PyErr_SetString(PyExc_TypeError, "The 'content' attribute value must be a ByteArray instance.");
+		return -1;
+	}
+
+	_content = (uint8_t *)PyByteArray_AsString(value);
+	_size = PyByteArray_Size(value);
+
+	pylinphone_trace(1, "[PYLINPHONE] >>> %s(%p [%p], %p [%p])", __FUNCTION__, self, native_ptr, value, _content);
+	linphone_buffer_set_content(native_ptr, _content, _size);
+	pylinphone_dispatch_messages();
+	pylinphone_trace(-1, "[PYLINPHONE] <<< %s -> 0", __FUNCTION__);
+	return 0;
+}
+
+
 static PyObject * pylinphone_Content_get_buffer(PyObject *self, void *closure) {
 	void * cbuffer;
 	size_t csize;
diff --git a/tools/python/unittests/test_message.py b/tools/python/unittests/test_message.py
index a17b8f47e..d4b83971e 100644
--- a/tools/python/unittests/test_message.py
+++ b/tools/python/unittests/test_message.py
@@ -1,5 +1,6 @@
 from nose.tools import assert_equals
 from copy import deepcopy
+import filecmp
 import linphone
 from linphonetester import *
 import os
@@ -9,11 +10,6 @@ import time
 
 class TestMessage:
 
-    @classmethod
-    def teardown_class(cls):
-        if os.path.exists('receive_file.dump'):
-            os.remove('receive_file.dump')
-
     @classmethod
     def msg_state_changed(cls, msg, state):
         stats = msg.chat_room.core.user_data.stats
@@ -29,24 +25,63 @@ class TestMessage:
         else:
             linphonetester_logger.error("[TESTER] Unexpected state [{state}] for message [{msg}]".format(msg=msg, state=linphone.ChatMessageState.string(state)))
 
+    @classmethod
+    def file_transfer_progress_indication(cls, msg, content, offset, total):
+        stats = msg.chat_room.core.user_data.stats
+        progress = int((offset * 100) / total)
+        direction = 'received'
+        tofrom = 'from'
+        address = msg.from_address
+        if msg.outgoing:
+            direction = 'sent'
+            tofrom = 'to'
+            address = msg.to_address
+        linphonetester_logger.info("[TESTER] File transfer [{progress}%] {direction} of type [{type}/{subtype}] {tofrom} {address}".format(
+            progress=progress, direction=direction, type=content.type, subtype=content.subtype, tofrom=tofrom, address=address.as_string()));
+        stats.progress_of_LinphoneFileTransfer = progress
+
     @classmethod
     def file_transfer_send(cls, msg, content, offset, size):
-        if offset >= len(msg.user_data):
+        send_filepath = msg.user_data
+        send_filesize = os.path.getsize(send_filepath)
+        if offset >= send_filesize:
             return linphone.Buffer.new() # end of file
-        return linphone.Buffer.new_from_string(msg.user_data[offset:offset+size])
+        f = open(send_filepath, 'rb')
+        f.seek(offset, 0)
+        if (send_filesize - offset) < size:
+            size = send_filesize - offset
+        lb = linphone.Buffer.new_from_data(bytearray(f.read(size)))
+        f.close()
+        return lb
 
     @classmethod
     def file_transfer_recv(cls, msg, content, buf):
+        receive_filepath = msg.user_data
         stats = msg.chat_room.core.user_data.stats
-        if msg.user_data is None:
-            msg.user_data = open('receive_file.dump', 'wb')
-            msg.user_data.write(buf.string_content)
-        else:
-            if buf.size == 0: # Transfer complete
-                stats.number_of_LinphoneMessageExtBodyReceived += 1
-                msg.user_data.close()
-            else: # Store content
-                msg.user_data.write(buf.string_content)
+        if buf.empty: # Transfer complete
+            stats.number_of_LinphoneMessageExtBodyReceived += 1
+        else: # Store content
+            f = open(receive_filepath, 'ab')
+            f.write(buf.content)
+            f.close()
+
+    @classmethod
+    def memory_file_transfer_send(cls, msg, content, offset, size):
+        send_buf = msg.user_data
+        send_size = len(send_buf)
+        if offset >= send_size:
+            return linphone.Buffer.new()
+        if (send_size - offset) < size:
+            size = send_size - offset
+        return linphone.Buffer.new_from_string(send_buf[offset:offset+size])
+
+    @classmethod
+    def memory_file_transfer_recv(cls, msg, content, buf):
+        stats = msg.chat_room.core.user_data.stats
+        if buf.empty: # Transfer complete
+            stats.number_of_LinphoneMessageExtBodyReceived += 1
+        else: # Store content
+            msg.user_data += buf.string_content
 
     def wait_for_server_to_purge_messages(self, manager1, manager2):
         # Wait a little bit just to have time to purge message stored in the server
@@ -81,24 +116,19 @@ class TestMessage:
         pauline.stop()
 
     def test_file_transfer_message(self):
-        big_file = "big file"
         marie = CoreManager('marie_rc')
         pauline = CoreManager('pauline_rc')
-        while len(big_file) < 128000:
-            big_file += big_file
-        l = list(big_file)
-        l[0] = 'S'
-        l[-1] = 'E'
-        big_file = ''.join(l)
+        send_filepath = os.path.join(tester_resources_path, 'images', 'nowebcamCIF.jpg')
+        receive_filepath = 'receive_file.dump'
         pauline.lc.file_transfer_server = "https://www.linphone.org:444/lft.php"
         chat_room = pauline.lc.get_chat_room(marie.identity)
         content = pauline.lc.create_content()
-        content.type = 'text'
-        content.subtype = 'plain'
-        content.size = len(big_file) # total size to be transfered
-        content.name = 'bigfile.txt'
+        content.type = 'image'
+        content.subtype = 'jpeg'
+        content.size = os.path.getsize(send_filepath) # total size to be transfered
+        content.name = 'nowebcamCIF.jpg'
         message = chat_room.create_file_transfer_message(content)
-        message.user_data = big_file # Store the file in the user data of the chat message
+        message.user_data = send_filepath
         self.wait_for_server_to_purge_messages(marie, pauline)
         message.callbacks.msg_state_changed = TestMessage.msg_state_changed
         message.callbacks.file_transfer_send = TestMessage.file_transfer_send
@@ -108,8 +138,79 @@ class TestMessage:
             cbs = marie.stats.last_received_chat_message.callbacks
             cbs.msg_state_changed = TestMessage.msg_state_changed
             cbs.file_transfer_recv = TestMessage.file_transfer_recv
+            marie.stats.last_received_chat_message.user_data = receive_filepath
             marie.stats.last_received_chat_message.download_file()
         assert_equals(CoreManager.wait_for(pauline, marie, lambda pauline, marie: marie.stats.number_of_LinphoneMessageExtBodyReceived == 1), True)
         assert_equals(pauline.stats.number_of_LinphoneMessageInProgress, 1)
         assert_equals(pauline.stats.number_of_LinphoneMessageDelivered, 1)
         assert_equals(marie.stats.number_of_LinphoneMessageExtBodyReceived, 1)
+        assert_equals(filecmp.cmp(send_filepath, receive_filepath, shallow=False), True)
+        if os.path.exists(receive_filepath):
+            os.remove(receive_filepath)
+
+    def test_small_file_transfer_message(self):
+        send_buf = "small file"
+        marie = CoreManager('marie_rc')
+        pauline = CoreManager('pauline_rc')
+        while len(send_buf) < 160:
+            send_buf += send_buf
+        l = list(send_buf[0:160])
+        l[0] = 'S'
+        l[-1] = 'E'
+        send_buf = ''.join(l)
+        pauline.lc.file_transfer_server = "https://www.linphone.org:444/lft.php"
+        chat_room = pauline.lc.get_chat_room(marie.identity)
+        content = pauline.lc.create_content()
+        content.type = 'text'
+        content.subtype = 'plain'
+        content.size = len(send_buf) # total size to be transfered
+        content.name = 'small_file.txt'
+        message = chat_room.create_file_transfer_message(content)
+        message.user_data = send_buf
+        self.wait_for_server_to_purge_messages(marie, pauline)
+        message.callbacks.msg_state_changed = TestMessage.msg_state_changed
+        message.callbacks.file_transfer_send = TestMessage.memory_file_transfer_send
+        chat_room.send_chat_message(message)
+        assert_equals(CoreManager.wait_for(pauline, marie, lambda pauline, marie: marie.stats.number_of_LinphoneMessageReceivedWithFile == 1), True)
+        if marie.stats.last_received_chat_message is not None:
+            cbs = marie.stats.last_received_chat_message.callbacks
+            cbs.msg_state_changed = TestMessage.msg_state_changed
+            cbs.file_transfer_recv = TestMessage.memory_file_transfer_recv
+            marie.stats.last_received_chat_message.user_data = ''
+            marie.stats.last_received_chat_message.download_file()
+        assert_equals(CoreManager.wait_for(pauline, marie, lambda pauline, marie: marie.stats.number_of_LinphoneMessageExtBodyReceived == 1), True)
+        assert_equals(pauline.stats.number_of_LinphoneMessageInProgress, 1)
+        assert_equals(pauline.stats.number_of_LinphoneMessageDelivered, 1)
+        assert_equals(marie.stats.number_of_LinphoneMessageExtBodyReceived, 1)
+        assert_equals(send_buf, marie.stats.last_received_chat_message.user_data)
+
+    def test_file_transfer_message_upload_cancelled(self):
+        send_buf = "big file"
+        marie = CoreManager('marie_rc')
+        pauline = CoreManager('pauline_rc')
+        while len(send_buf) < 128000:
+            send_buf += send_buf
+        l = list(send_buf[0:128000])
+        l[0] = 'S'
+        l[-1] = 'E'
+        send_buf = ''.join(l)
+        pauline.lc.file_transfer_server = "https://www.linphone.org:444/lft.php"
+        chat_room = pauline.lc.get_chat_room(marie.identity)
+        content = pauline.lc.create_content()
+        content.type = 'text'
+        content.subtype = 'plain'
+        content.size = len(send_buf) # total size to be transfered
+        content.name = 'big_file.txt'
+        message = chat_room.create_file_transfer_message(content)
+        message.user_data = send_buf
+        self.wait_for_server_to_purge_messages(marie, pauline)
+        message.callbacks.msg_state_changed = TestMessage.msg_state_changed
+        message.callbacks.file_transfer_send = TestMessage.memory_file_transfer_send
+        message.callbacks.file_transfer_progress_indication = TestMessage.file_transfer_progress_indication
+        chat_room.send_chat_message(message)
+        # Wait for file to be at least 50% uploaded and cancel the transfer
+        assert_equals(CoreManager.wait_for(pauline, marie, lambda pauline, marie: pauline.stats.progress_of_LinphoneFileTransfer >= 50), True)
+        message.cancel_file_transfer()
+        assert_equals(CoreManager.wait_for(pauline, marie, lambda pauline, marie: pauline.stats.number_of_LinphoneMessageNotDelivered == 1), True)
+        assert_equals(pauline.stats.number_of_LinphoneMessageNotDelivered, 1)
+        assert_equals(marie.stats.number_of_LinphoneMessageExtBodyReceived, 0)

From 11b9ed01d93e4f21861edfb36615d1029abb0218 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@linphone.org>
Date: Thu, 11 Dec 2014 17:37:22 +0100
Subject: [PATCH 158/496] Improved LocalRef (see issue 1925) on Android JNI
 layer

---
 coreapi/linphonecore_jni.cc | 60 +++++++++++++++++++++++++++----------
 1 file changed, 44 insertions(+), 16 deletions(-)

diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index a56e1d14b..76cbbad5c 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -170,7 +170,7 @@ jobject getProxy(JNIEnv *env, LinphoneProxyConfig *proxy, jobject core){
 	jobject jobj=0;
 
 	if (proxy!=NULL){
-		jclass proxyClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneProxyConfigImpl"));
+		jclass proxyClass = (jclass)env->FindClass("org/linphone/core/LinphoneProxyConfigImpl");
 		jmethodID proxyCtrId = env->GetMethodID(proxyClass,"<init>", "(Lorg/linphone/core/LinphoneCoreImpl;J)V");
 
 		void *up=linphone_proxy_config_get_user_data(proxy);
@@ -188,7 +188,7 @@ jobject getProxy(JNIEnv *env, LinphoneProxyConfig *proxy, jobject core){
 				linphone_proxy_config_set_user_data(proxy,(void*)env->NewWeakGlobalRef(jobj));
 			}
 		}
-		env->DeleteGlobalRef(proxyClass);
+		env->DeleteLocalRef(proxyClass);
 	}
 	return jobj;
 }
@@ -197,7 +197,7 @@ jobject getCall(JNIEnv *env, LinphoneCall *call){
 	jobject jobj=0;
 
 	if (call!=NULL){
-		jclass callClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneCallImpl"));
+		jclass callClass = (jclass)env->FindClass("org/linphone/core/LinphoneCallImpl");
 		jmethodID callCtrId = env->GetMethodID(callClass,"<init>", "(J)V");
 
 		void *up=linphone_call_get_user_pointer(call);
@@ -210,7 +210,7 @@ jobject getCall(JNIEnv *env, LinphoneCall *call){
 		}else{
 			jobj=(jobject)up;
 		}
-		env->DeleteGlobalRef(callClass);
+		env->DeleteLocalRef(callClass);
 	}
 	return jobj;
 }
@@ -219,7 +219,7 @@ jobject getChatMessage(JNIEnv *env, LinphoneChatMessage *msg){
 	jobject jobj = 0;
 
 	if (msg != NULL){
-		jclass chatMessageClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneChatMessageImpl"));
+		jclass chatMessageClass = (jclass)env->FindClass("org/linphone/core/LinphoneChatMessageImpl");
 		jmethodID chatMessageCtrId = env->GetMethodID(chatMessageClass,"<init>", "(J)V");
 
 		void *up = linphone_chat_message_get_user_data(msg);
@@ -231,7 +231,7 @@ jobject getChatMessage(JNIEnv *env, LinphoneChatMessage *msg){
 		} else {
 			jobj = (jobject)up;
 		}
-		env->DeleteGlobalRef(chatMessageClass);
+		env->DeleteLocalRef(chatMessageClass);
 	}
 	return jobj;
 }
@@ -240,14 +240,14 @@ jobject getEvent(JNIEnv *env, LinphoneEvent *lev){
 	if (lev==NULL) return NULL;
 	jobject jev=(jobject)linphone_event_get_user_data(lev);
 	if (jev==NULL){
-		jclass linphoneEventClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneEventImpl"));
+		jclass linphoneEventClass = (jclass)env->FindClass("org/linphone/core/LinphoneEventImpl");
 		jmethodID linphoneEventCtrId = env->GetMethodID(linphoneEventClass,"<init>", "(J)V");
 
 		jev=env->NewObject(linphoneEventClass,linphoneEventCtrId,(jlong)linphone_event_ref(lev));
 		jev=env->NewGlobalRef(jev);
 		linphone_event_set_user_data(lev,jev);
 
-		env->DeleteGlobalRef(linphoneEventClass);
+		env->DeleteLocalRef(linphoneEventClass);
 	}
 	return jev;
 }
@@ -577,7 +577,11 @@ public:
 		}
 		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
 		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
-		env->CallVoidMethod(lcData->listener,lcData->displayStatusId,lcData->core,message ? env->NewStringUTF(message) : NULL);
+		jstring msg = message ? env->NewStringUTF(message) : NULL;
+		env->CallVoidMethod(lcData->listener,lcData->displayStatusId,lcData->core,msg);
+		if (msg) {
+			env->DeleteLocalRef(msg);
+		}
 	}
 	static void authInfoRequested(LinphoneCore *lc, const char *realm, const char *username, const char *domain) {
 		JNIEnv *env = 0;
@@ -588,12 +592,24 @@ public:
 		}
 		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
 		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
+		jstring r = realm ? env->NewStringUTF(realm) : NULL;
+		jstring u = username ? env->NewStringUTF(username) : NULL;
+		jstring d = domain ? env->NewStringUTF(domain) : NULL;
 		env->CallVoidMethod(lcData->listener,
 							lcData->authInfoRequestedId,
 							lcData->core,
-							realm ? env->NewStringUTF(realm):NULL,
-							username ? env->NewStringUTF(username) : NULL,
-							domain ? env->NewStringUTF(domain) : NULL);
+							r,
+							u,
+							d);
+		if (r) {
+			env->DeleteLocalRef(r);
+		}
+		if (u) {
+			env->DeleteLocalRef(u);
+		}
+		if (d) {
+			env->DeleteLocalRef(d);
+		}
 	}
 	static void globalStateChange(LinphoneCore *lc, LinphoneGlobalState gstate,const char* message) {
 		JNIEnv *env = 0;
@@ -604,11 +620,15 @@ public:
 		}
 		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
 		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
+		jstring msg = message ? env->NewStringUTF(message) : NULL;
 		env->CallVoidMethod(lcData->listener
 							,lcData->globalStateId
 							,lcData->core
 							,env->CallStaticObjectMethod(lcData->globalStateClass,lcData->globalStateFromIntId,(jint)gstate),
-							message ? env->NewStringUTF(message) : NULL);
+							msg);
+		if (msg) {
+			env->DeleteLocalRef(msg);
+		}
 	}
 	static void registrationStateChange(LinphoneCore *lc, LinphoneProxyConfig* proxy,LinphoneRegistrationState state,const char* message) {
 		JNIEnv *env = 0;
@@ -620,12 +640,16 @@ public:
 		}
 		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
 		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
+		jstring msg = message ? env->NewStringUTF(message) : NULL;
 		env->CallVoidMethod(lcData->listener
 							,lcData->registrationStateId
 							,lcData->core
 							,(jproxy=getProxy(env,proxy,lcData->core))
 							,env->CallStaticObjectMethod(lcData->registrationStateClass,lcData->registrationStateFromIntId,(jint)state),
-							message ? env->NewStringUTF(message) : NULL);
+							msg);
+		if (msg) {
+			env->DeleteLocalRef(msg);
+		}
 	}
 
 	static void callStateChange(LinphoneCore *lc, LinphoneCall* call,LinphoneCallState state,const char* message) {
@@ -638,16 +662,20 @@ public:
 		}
 		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
 		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
+		jstring msg = message ? env->NewStringUTF(message) : NULL;
 		env->CallVoidMethod(lcData->listener
 							,lcData->callStateId
 							,lcData->core
 							,(jcall=getCall(env,call))
 							,env->CallStaticObjectMethod(lcData->callStateClass,lcData->callStateFromIntId,(jint)state),
-							message ? env->NewStringUTF(message) : NULL);
-		if (state==LinphoneCallReleased){
+							msg);
+		if (state==LinphoneCallReleased) {
 			linphone_call_set_user_pointer(call,NULL);
 			env->DeleteGlobalRef(jcall);
 		}
+		if (msg) {
+			env->DeleteLocalRef(msg);
+		}
 	}
 	static void callEncryptionChange(LinphoneCore *lc, LinphoneCall* call, bool_t encrypted,const char* authentication_token) {
 		JNIEnv *env = 0;

From 84e3d60838ed0e6a819d51a83229d42e2d3658a5 Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Thu, 11 Dec 2014 17:39:25 +0100
Subject: [PATCH 159/496] fix the tests for ios

---
 tester/call_tester.c | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/tester/call_tester.c b/tester/call_tester.c
index 4e8a323c3..5a3a1c112 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -326,12 +326,32 @@ static void simple_call(void) {
 	LinphoneCoreManager* pauline;
 	const LinphoneAddress *from;
 	LinphoneCall *pauline_call;
+	LinphoneProxyConfig* marie_cfg;
+	const char* marie_id = NULL;
 
 	belle_sip_object_enable_leak_detector(TRUE);
 	begin=belle_sip_object_get_object_count();
 
 	marie = linphone_core_manager_new( "marie_rc");
 	pauline = linphone_core_manager_new( "pauline_rc");
+	
+	/* with the account manager, we might lose the identity */
+	marie_cfg = linphone_core_get_default_proxy_config(marie->lc);
+	marie_id = linphone_proxy_config_get_identity(marie_cfg);
+	{
+		LinphoneAddress* marie_addr = linphone_address_new(marie_id);
+		char* marie_tmp_id = NULL;
+		linphone_address_set_display_name(marie_addr, "Super Marie");
+		marie_tmp_id = linphone_address_as_string(marie_addr);
+
+		linphone_proxy_config_edit(marie_cfg);
+		linphone_proxy_config_set_identity(marie_cfg,marie_tmp_id);
+		linphone_proxy_config_done(marie_cfg);
+
+		ms_free(marie_tmp_id);
+		linphone_address_unref(marie_addr);
+	}
+
 	CU_ASSERT_TRUE(call(marie,pauline));
 	pauline_call=linphone_core_get_current_call(pauline->lc);
 	CU_ASSERT_PTR_NOT_NULL(pauline_call);
@@ -2925,7 +2945,7 @@ static void multiple_early_media(void) {
 	marie2_call=linphone_core_get_current_call(marie2->lc);
 
 	/*wait a bit that streams are established*/
-	wait_for_list(lcs,&dummy,1,6000);
+	wait_for_list(lcs,&dummy,1,3000);
 	CU_ASSERT_TRUE(linphone_call_get_audio_stats(pauline_call)->download_bandwidth>70);
 	CU_ASSERT_TRUE(linphone_call_get_audio_stats(marie1_call)->download_bandwidth>70);
 	CU_ASSERT_TRUE(linphone_call_get_audio_stats(marie2_call)->download_bandwidth>70);

From db5fc6ea89802168e61a73d34cffa9582872d6e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
 <francois.grisez@belledonne-communications.com>
Date: Fri, 12 Dec 2014 12:11:51 +0100
Subject: [PATCH 160/496] Fix the reading of .linpohne.ecstate

---
 coreapi/linphonecall.c | 10 ++++++----
 coreapi/lpconfig.c     | 29 +++++++++++++++--------------
 coreapi/lpconfig.h     |  8 +++++---
 3 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index ce9bfa38b..9cf05f1a2 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -38,6 +38,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "mediastreamer2/mssndcard.h"
 
 static const char EC_STATE_STORE[] = ".linphone.ecstate";
+static const size_t EC_STATE_MAX_LEN = 1048576; // 1Mo
 
 static void linphone_call_stats_uninit(LinphoneCallStats *stats);
 
@@ -1581,14 +1582,15 @@ void linphone_call_init_audio_stream(LinphoneCall *call){
 	audio_stream_enable_gain_control(audiostream,TRUE);
 	if (linphone_core_echo_cancellation_enabled(lc)){
 		int len,delay,framesize;
-		char *statestr=lp_config_read_relative_file(lc->config, EC_STATE_STORE);
+		char statestr[EC_STATE_MAX_LEN];
 		len=lp_config_get_int(lc->config,"sound","ec_tail_len",0);
 		delay=lp_config_get_int(lc->config,"sound","ec_delay",0);
 		framesize=lp_config_get_int(lc->config,"sound","ec_framesize",0);
 		audio_stream_set_echo_canceller_params(audiostream,len,delay,framesize);
-		if (statestr && audiostream->ec){
-			ms_filter_call_method(audiostream->ec,MS_ECHO_CANCELLER_SET_STATE_STRING,(void*)statestr);
-			ms_free(statestr);
+		if (audiostream->ec) {
+			if (lp_config_read_relative_file(lc->config, EC_STATE_STORE, statestr, EC_STATE_MAX_LEN) == 0) {
+				ms_filter_call_method(audiostream->ec, MS_ECHO_CANCELLER_SET_STATE_STRING, statestr);
+			}
 		}
 	}
 	audio_stream_enable_automatic_gain_control(audiostream,linphone_core_agc_enabled(lc));
diff --git a/coreapi/lpconfig.c b/coreapi/lpconfig.c
index a940fb696..ee87ac023 100644
--- a/coreapi/lpconfig.c
+++ b/coreapi/lpconfig.c
@@ -734,25 +734,26 @@ void lp_config_write_relative_file(const LpConfig *lpconfig, const char *filenam
 	}
 }
 
-char *lp_config_read_relative_file(const LpConfig *lpconfig, const char *filename) {
+int lp_config_read_relative_file(const LpConfig *lpconfig, const char *filename, char *data, size_t max_length) {
 	char *dir = _lp_config_dirname(lpconfig->filename);
 	char *filepath = ms_strdup_printf("%s/%s", dir, filename);
-	char *result = NULL;
-	if(ortp_file_exist(filepath) == 0) {
-		FILE *file = fopen(filepath, "r");
-		if(file != NULL) {
-			result = ms_new0(char, MAX_LEN);
-			if(fgets(result, MAX_LEN, file) == NULL) {
-				ms_error("%s could not be loaded", filepath);
-			}
-			fclose(file);
-		} else {
-			ms_error("Could not open %s for read", filepath);
+	FILE *file = fopen(filepath, "r");
+	if(file != NULL) {
+		if(fgets(data, max_length, file) == NULL) {
+			ms_error("%s could not be loaded. %s", filepath, strerror(errno));
+			goto err;
 		}
+		fclose(file);
 	} else {
-		ms_message("%s does not exist", filepath);
+		ms_error("Could not open %s for read. %s", filepath, strerror(errno));
+		goto err;
 	}
 	ms_free(dir);
 	ms_free(filepath);
-	return result;
+	return 0;
+	
+err:
+	ms_free(dir);
+	ms_free(filepath);
+	return -1;
 }
diff --git a/coreapi/lpconfig.h b/coreapi/lpconfig.h
index 3498f00d2..65fd613f4 100644
--- a/coreapi/lpconfig.h
+++ b/coreapi/lpconfig.h
@@ -281,12 +281,14 @@ LINPHONE_PUBLIC void lp_config_unref(LpConfig *lpconfig);
 LINPHONE_PUBLIC void lp_config_write_relative_file(const LpConfig *lpconfig, const char *filename, const char *data);
 
 /**
- * @brief Read a string from a file placed relatively with the Linphone configuration file
+ * @brief Read a string from a file placed beside the Linphone configuration file
  * @param lpconfig LpConfig instance used as a reference
  * @param filename Name of the file where data will be read from. The name is relative to the place of the config file
- * @return The read string
+ * @param data Buffer where read string will be stored
+ * @param max_length Length of the buffer
+ * @return 0 on success, -1 on failure
  */
-LINPHONE_PUBLIC char *lp_config_read_relative_file(const LpConfig *lpconfig, const char *filename);
+LINPHONE_PUBLIC int lp_config_read_relative_file(const LpConfig *lpconfig, const char *filename, char *data, size_t max_length);
 
 #ifdef __cplusplus
 }

From 45e1da743ce82fa35cd357b7c51cdf410aba83fd Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Fri, 12 Dec 2014 15:47:09 +0100
Subject: [PATCH 161/496] make sure rtp destination is change as soon as ice is
 terminated

---
 coreapi/linphonecall.c | 26 ++++++++++++++++++++++++++
 mediastreamer2         |  2 +-
 oRTP                   |  2 +-
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index ded5c53e4..504a6c214 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -2906,6 +2906,31 @@ static void linphone_core_disconnected(LinphoneCore *lc, LinphoneCall *call){
 	linphone_core_play_named_tone(lc,LinphoneToneCallLost);
 }
 
+static void change_ice_media_destinations(LinphoneCall *call) {
+    const char *rtp_addr;
+    const char *rtcp_addr;
+    int rtp_port;
+    int rtcp_port;
+    bool_t result;
+
+    if (call->audiostream && ice_session_check_list(call->ice_session, 0)) {
+        result = ice_check_list_selected_valid_remote_candidate(ice_session_check_list(call->ice_session, 0), &rtp_addr, &rtp_port, &rtcp_addr, &rtcp_port);
+        if (result == TRUE) {
+            ms_message("Change audio stream destination: RTP=%s:%d RTCP=%s:%d", rtp_addr, rtp_port, rtcp_addr, rtcp_port);
+            rtp_session_set_remote_addr_full(call->audiostream->ms.sessions.rtp_session, rtp_addr, rtp_port, rtcp_addr, rtcp_port);
+        }
+    }
+#ifdef VIDEO_ENABLED
+    if (call->videostream && ice_session_check_list(call->ice_session, 1)) {
+        result = ice_check_list_selected_valid_remote_candidate(ice_session_check_list(call->ice_session, 1), &rtp_addr, &rtp_port, &rtcp_addr, &rtcp_port);
+        if (result == TRUE) {
+            ms_message("Change video stream destination: RTP=%s:%d RTCP=%s:%d", rtp_addr, rtp_port, rtcp_addr, rtcp_port);
+            rtp_session_set_remote_addr_full(call->videostream->ms.sessions.rtp_session, rtp_addr, rtp_port, rtcp_addr, rtcp_port);
+        }
+    }
+#endif
+}
+
 static void handle_ice_events(LinphoneCall *call, OrtpEvent *ev){
 	OrtpEventType evt=ortp_event_get_type(ev);
 	OrtpEventData *evd=ortp_event_get_data(ev);
@@ -2923,6 +2948,7 @@ static void handle_ice_events(LinphoneCall *call, OrtpEvent *ev){
 				if (ice_session_role(call->ice_session) == IR_Controlling) {
 					linphone_core_update_call(call->core, call, params);
 				}
+				change_ice_media_destinations(call);
 				break;
 			case IS_Failed:
 				if (ice_session_has_completed_check_list(call->ice_session) == TRUE) {
diff --git a/mediastreamer2 b/mediastreamer2
index 4b87cdd23..f47428f68 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 4b87cdd23ca14e9b39212b73f0a545d4f89a9d56
+Subproject commit f47428f6880ec1a9afd5206ff84646168595cf19
diff --git a/oRTP b/oRTP
index 1ad385634..2c94d5783 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 1ad38563419acb9665af4bf65543ccdcfd76fda6
+Subproject commit 2c94d5783a48efda91191c922e077560f3df5876

From 52dc1aacdcb2b6e01252c6656f0eb92c4d250621 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Fri, 12 Dec 2014 16:21:29 +0100
Subject: [PATCH 162/496] finilize stun files move from ortp to ms2

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index f47428f68..32fcc17e3 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit f47428f6880ec1a9afd5206ff84646168595cf19
+Subproject commit 32fcc17e34a0a5559b7bc154116aa46d72c03a1b

From 1cf049cabdea59c22b8ddbdbb53d7c3dbaea8687 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Fri, 12 Dec 2014 16:29:54 +0100
Subject: [PATCH 163/496] fix leak of RtpTransport when call is updated/paused.
 Fix reporting of bandwidth, which was displayed even if the stream was
 inactive.

---
 coreapi/linphonecall.c | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index 9cf05f1a2..a1c3ad003 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -1550,6 +1550,8 @@ void linphone_call_init_audio_stream(LinphoneCall *call){
 	AudioStream *audiostream;
 	const char *location;
 	int dscp;
+	RtpTransport *meta_rtp=NULL;
+	RtpTransport *meta_rtcp=NULL;
 
 	if (call->audiostream != NULL) return;
 	if (call->sessions[0].rtp_session==NULL){
@@ -1600,12 +1602,11 @@ void linphone_call_init_audio_stream(LinphoneCall *call){
 	}
 
 	audio_stream_set_features(audiostream,linphone_core_get_audio_features(lc));
-
-	if (lc->rtptf){
+	rtp_session_get_transports(audiostream->ms.sessions.rtp_session,&meta_rtp,&meta_rtcp);
+	if (lc->rtptf && (meta_rtp==NULL && meta_rtcp==NULL)){
+		/*the transport just need to be created once, then they are kept into the RtpSession, which is the same for the entire call duration.*/
 		RtpTransport *artp=lc->rtptf->audio_rtp_func(lc->rtptf->audio_rtp_func_data, call->media_ports[0].rtp_port);
 		RtpTransport *artcp=lc->rtptf->audio_rtcp_func(lc->rtptf->audio_rtcp_func_data, call->media_ports[0].rtcp_port);
-		RtpTransport *meta_rtp;
-		RtpTransport *meta_rtcp;
 		meta_rtp_transport_new(&meta_rtp,TRUE,artp, 0);
 		meta_rtp_transport_new(&meta_rtcp,FALSE,artcp, 0);
 		rtp_session_set_transports(audiostream->ms.sessions.rtp_session,meta_rtp,meta_rtcp);
@@ -2781,14 +2782,17 @@ void linphone_call_stop_recording(LinphoneCall *call){
 **/
 
 static void report_bandwidth(LinphoneCall *call, MediaStream *as, MediaStream *vs){
-	call->stats[LINPHONE_CALL_STATS_AUDIO].download_bandwidth=(as!=NULL) ? (media_stream_get_down_bw(as)*1e-3) : 0;
-	call->stats[LINPHONE_CALL_STATS_AUDIO].upload_bandwidth=(as!=NULL) ? (media_stream_get_up_bw(as)*1e-3) : 0;
-	call->stats[LINPHONE_CALL_STATS_VIDEO].download_bandwidth=(vs!=NULL) ? (media_stream_get_down_bw(vs)*1e-3) : 0;
-	call->stats[LINPHONE_CALL_STATS_VIDEO].upload_bandwidth=(vs!=NULL) ? (media_stream_get_up_bw(vs)*1e-3) : 0;
-	call->stats[LINPHONE_CALL_STATS_AUDIO].rtcp_download_bandwidth=(as!=NULL) ? (media_stream_get_rtcp_down_bw(as)*1e-3) : 0;
-	call->stats[LINPHONE_CALL_STATS_AUDIO].rtcp_upload_bandwidth=(as!=NULL) ? (media_stream_get_rtcp_up_bw(as)*1e-3) : 0;
-	call->stats[LINPHONE_CALL_STATS_VIDEO].rtcp_download_bandwidth=(vs!=NULL) ? (media_stream_get_rtcp_down_bw(vs)*1e-3) : 0;
-	call->stats[LINPHONE_CALL_STATS_VIDEO].rtcp_upload_bandwidth=(vs!=NULL) ? (media_stream_get_rtcp_up_bw(vs)*1e-3) : 0;
+	bool_t as_active =  as ? (media_stream_get_state(as) == MSStreamStarted) : FALSE;
+	bool_t vs_active =  vs ? (media_stream_get_state(vs) == MSStreamStarted) : FALSE;
+	
+	call->stats[LINPHONE_CALL_STATS_AUDIO].download_bandwidth=(as_active) ? (media_stream_get_down_bw(as)*1e-3) : 0;
+	call->stats[LINPHONE_CALL_STATS_AUDIO].upload_bandwidth=(as_active) ? (media_stream_get_up_bw(as)*1e-3) : 0;
+	call->stats[LINPHONE_CALL_STATS_VIDEO].download_bandwidth=(vs_active) ? (media_stream_get_down_bw(vs)*1e-3) : 0;
+	call->stats[LINPHONE_CALL_STATS_VIDEO].upload_bandwidth=(vs_active) ? (media_stream_get_up_bw(vs)*1e-3) : 0;
+	call->stats[LINPHONE_CALL_STATS_AUDIO].rtcp_download_bandwidth=(as_active) ? (media_stream_get_rtcp_down_bw(as)*1e-3) : 0;
+	call->stats[LINPHONE_CALL_STATS_AUDIO].rtcp_upload_bandwidth=as_active) ? (media_stream_get_rtcp_up_bw(as)*1e-3) : 0;
+	call->stats[LINPHONE_CALL_STATS_VIDEO].rtcp_download_bandwidth=(vs_active) ? (media_stream_get_rtcp_down_bw(vs)*1e-3) : 0;
+	call->stats[LINPHONE_CALL_STATS_VIDEO].rtcp_upload_bandwidth=(vs_active) ? (media_stream_get_rtcp_up_bw(vs)*1e-3) : 0;
 
 	ms_message("Bandwidth usage for call [%p]: audio[ rtp]=[d=%.1f,u=%.1f], video[ rtp]=[d=%.1f,u=%.1f] kbit/sec",
 		call,

From a6da440cfd453b93a0f0ea01ee86e693b58ad8cf Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Fri, 12 Dec 2014 16:41:48 +0100
Subject: [PATCH 164/496] add test to check absence of SDP in ACK in a scenario
 of INVITE without SDP.

---
 tester/call_tester.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/tester/call_tester.c b/tester/call_tester.c
index 5a3a1c112..2d186e1e1 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -914,6 +914,26 @@ static void call_with_no_sdp(void) {
 	linphone_core_manager_destroy(pauline);
 }
 
+static void call_with_no_sdp_ack_without_sdp(void){
+	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
+	LinphoneCall *call;
+
+	linphone_core_enable_sdp_200_ack(marie->lc,TRUE);
+	
+	linphone_core_invite_address(marie->lc,pauline->identity);
+	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallIncomingReceived,1));
+	call=linphone_core_get_current_call(pauline->lc);
+	if (call){
+		sal_call_enable_sdp_removal(call->op, TRUE); /*this will have the effect that the SDP received in the ACK will be ignored*/
+		linphone_core_accept_call(pauline->lc, call);
+		CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallError,1));
+		CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1));
+	}
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
 
 static bool_t check_ice(LinphoneCoreManager* caller, LinphoneCoreManager* callee, LinphoneIceState state) {
 	LinphoneCall *c1,*c2;
@@ -3490,6 +3510,7 @@ test_t call_tests[] = {
 	{ "Early-media call with updated codec", early_media_call_with_codec_update},
 	{ "Call terminated by caller", call_terminated_by_caller },
 	{ "Call without SDP", call_with_no_sdp},
+	{ "Call without SDP and ACK without SDP", call_with_no_sdp_ack_without_sdp},
 	{ "Call paused resumed", call_paused_resumed },
 	{ "Call paused resumed with loss", call_paused_resumed_with_loss },
 	{ "Call paused resumed from callee", call_paused_resumed_from_callee },

From 5863df792e94e9dc183fd7a138069867f2b61fb2 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Fri, 12 Dec 2014 16:42:27 +0100
Subject: [PATCH 165/496] Make the preview window a real gtk window. Move
 camera preview test within the settings.

---
 NEWS                   | 11 +++++++
 coreapi/linphonecore.c | 16 ++++++++++
 coreapi/linphonecore.h |  1 +
 gtk/linphone.h         |  1 +
 gtk/main.c             | 22 ++-----------
 gtk/parameters.ui      | 30 +++++++++++++-----
 gtk/videowindow.c      | 71 +++++++++++++++++++++++++++++++++++++-----
 7 files changed, 118 insertions(+), 34 deletions(-)

diff --git a/NEWS b/NEWS
index 6fada612f..bb1d573a0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,14 @@
+linphone-3.8.0 -- Date to be defined
+	Application level improvements:
+	* The video window has now controls in order to switch fullscreen mode and terminate call.
+	* The out of call video preview feature (to test camera) is moved into the settings and is no longer linked to the in-call video preview feature.
+	* Lots of updated translations.
+
+	Liblinphone level improvements:
+	* Support for RTP/AVPF (RFCxxxx) for video streams, allowing fast transmission error recovery with VP8 codec only.
+	* API enhancements, most objects can be ref-counted.
+	* Call video recording feature, in mkv format (H264 streams only for the moment)
+
 linphone-3.7.0 -- February 20th, 2014
 	Application level improvements:
 	* It is now possible to configure multiple proxy accounts with different transports (UDP, TCP, TLS)
diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index c3a838aef..b0fa65e12 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -5640,6 +5640,22 @@ MSVideoSize linphone_core_get_preview_video_size(const LinphoneCore *lc){
 	return lc->video_conf.preview_vsize;
 }
 
+/**
+ * Returns the effective video size for the captured video as provided by the camera.
+ * When preview is disabled or not yet started, this function returns a zeroed video size.
+ * @see linphone_core_set_preview_video_size()
+ * @ingroup media_parameters
+ * @param lc the core
+ * @return a MSVideoSize
+**/
+MSVideoSize linphone_core_get_current_preview_video_size(const LinphoneCore *lc){
+	MSVideoSize ret={0};
+	if (lc->previewstream){
+		ret=video_preview_get_current_size(lc->previewstream);
+	}
+	return ret;
+}
+
 /**
  * Sets the preview video size by its name. See linphone_core_set_preview_video_size() for more information about this feature.
  *
diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h
index 5c24d14a7..155170338 100644
--- a/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@ -2811,6 +2811,7 @@ LINPHONE_PUBLIC void linphone_core_set_preferred_video_size(LinphoneCore *lc, MS
 LINPHONE_PUBLIC void linphone_core_set_preview_video_size(LinphoneCore *lc, MSVideoSize vsize);
 LINPHONE_PUBLIC void linphone_core_set_preview_video_size_by_name(LinphoneCore *lc, const char *name);
 LINPHONE_PUBLIC MSVideoSize linphone_core_get_preview_video_size(const LinphoneCore *lc);
+LINPHONE_PUBLIC MSVideoSize linphone_core_get_current_preview_video_size(const LinphoneCore *lc);
 LINPHONE_PUBLIC MSVideoSize linphone_core_get_preferred_video_size(const LinphoneCore *lc);
 
 /**
diff --git a/gtk/linphone.h b/gtk/linphone.h
index 70f1c58e3..cfb52f5e7 100644
--- a/gtk/linphone.h
+++ b/gtk/linphone.h
@@ -199,4 +199,5 @@ void linphone_gtk_close_config_fetching(GtkWidget *w, LinphoneConfiguringState s
 const char *linphone_gtk_get_sound_path(const char *file);
 void linphone_gtk_in_call_show_video(LinphoneCall *call);
 char *linphone_gtk_address(const LinphoneAddress *addr);/*return human readable identifier for a LinphoneAddress */
+GtkWidget *linphone_gtk_get_camera_preview_window(void);
 
diff --git a/gtk/main.c b/gtk/main.c
index 2bb9d5446..4303a770c 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -827,9 +827,6 @@ bool_t linphone_gtk_video_enabled(void){
 
 void linphone_gtk_show_main_window(){
 	GtkWidget *w=linphone_gtk_get_main_window();
-	LinphoneCore *lc=linphone_gtk_get_core();
-	linphone_core_enable_video_preview(lc,linphone_gtk_get_ui_config_int("videoselfview",
-	    	VIDEOSELFVIEW_DEFAULT));
 	gtk_widget_show(w);
 	gtk_window_present(GTK_WINDOW(w));
 }
@@ -1023,13 +1020,6 @@ void _linphone_gtk_enable_video(gboolean val){
 	linphone_core_enable_video_capture(linphone_gtk_get_core(), TRUE);
 	linphone_core_enable_video_display(linphone_gtk_get_core(), TRUE);
 	linphone_core_set_video_policy(linphone_gtk_get_core(),&policy);
-
-	if (val){
-		linphone_core_enable_video_preview(linphone_gtk_get_core(),
-		linphone_gtk_get_ui_config_int("videoselfview",VIDEOSELFVIEW_DEFAULT));
-	}else{
-		linphone_core_enable_video_preview(linphone_gtk_get_core(),FALSE);
-	}
 }
 
 void linphone_gtk_enable_video(GtkWidget *w){
@@ -1041,7 +1031,6 @@ void linphone_gtk_enable_video(GtkWidget *w){
 void linphone_gtk_enable_self_view(GtkWidget *w){
 	gboolean val=gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(w));
 	LinphoneCore *lc=linphone_gtk_get_core();
-	linphone_core_enable_video_preview(lc,val);
 	linphone_core_enable_self_view(lc,val);
 	linphone_gtk_set_ui_config_int("videoselfview",val);
 }
@@ -1838,10 +1827,11 @@ void linphone_gtk_manage_login(void){
 gboolean linphone_gtk_close(GtkWidget *mw){
 	/*shutdown calls if any*/
 	LinphoneCore *lc=linphone_gtk_get_core();
+	GtkWidget *camera_preview=linphone_gtk_get_camera_preview_window();
 	if (linphone_core_in_call(lc)){
 		linphone_core_terminate_all_calls(lc);
 	}
-	linphone_core_enable_video_preview(lc,FALSE);
+	if (camera_preview) gtk_widget_destroy(camera_preview);
 #ifdef __APPLE__ /*until with have a better option*/
 	gtk_window_iconify(GTK_WINDOW(mw));
 #else
@@ -1852,13 +1842,6 @@ gboolean linphone_gtk_close(GtkWidget *mw){
 
 #ifdef HAVE_GTK_OSX
 static gboolean on_window_state_event(GtkWidget *w, GdkEventWindowState *event){
-	bool_t video_enabled=linphone_gtk_video_enabled();
-	if ((event->new_window_state & GDK_WINDOW_STATE_ICONIFIED) ||(event->new_window_state & GDK_WINDOW_STATE_WITHDRAWN) ){
-		linphone_core_enable_video_preview(linphone_gtk_get_core(),FALSE);
-	}else{
-		linphone_core_enable_video_preview(linphone_gtk_get_core(),
-		linphone_gtk_get_ui_config_int("videoselfview",VIDEOSELFVIEW_DEFAULT) && video_enabled);
-	}
 	return FALSE;
 }
 #endif
@@ -1969,6 +1952,7 @@ static void linphone_gtk_init_main_window(){
 	g_signal_connect(G_OBJECT(main_window), "window-state-event",G_CALLBACK(on_window_state_event), NULL);
 #endif
 	linphone_gtk_check_menu_items();
+	linphone_core_enable_video_preview(linphone_gtk_get_core(),FALSE);
 }
 
 void linphone_gtk_log_handler(OrtpLogLevel lev, const char *fmt, va_list args){
diff --git a/gtk/parameters.ui b/gtk/parameters.ui
index aa8480aa9..8c2483ef7 100644
--- a/gtk/parameters.ui
+++ b/gtk/parameters.ui
@@ -1233,7 +1233,7 @@
                           <object class="GtkTable" id="table2">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="n_rows">3</property>
+                            <property name="n_rows">4</property>
                             <property name="n_columns">2</property>
                             <child>
                               <object class="GtkLabel" id="label9">
@@ -1330,6 +1330,22 @@
                                 <property name="y_options">GTK_EXPAND</property>
                               </packing>
                             </child>
+                            <child>
+                              <object class="GtkButton" id="button2">
+                                <property name="label" translatable="yes">Show camera preview</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                                <property name="use_action_appearance">False</property>
+                                <signal name="clicked" handler="linphone_gtk_show_camera_preview_clicked" swapped="no"/>
+                              </object>
+                              <packing>
+                                <property name="right_attach">2</property>
+                                <property name="top_attach">3</property>
+                                <property name="bottom_attach">4</property>
+                                <property name="x_options">GTK_EXPAND</property>
+                              </packing>
+                            </child>
                           </object>
                         </child>
                       </object>
@@ -2188,7 +2204,7 @@
                                 <property name="top_attach">1</property>
                                 <property name="bottom_attach">2</property>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
@@ -2250,7 +2266,7 @@
                                 <property name="top_attach">2</property>
                                 <property name="bottom_attach">3</property>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
@@ -2265,7 +2281,7 @@
                                 <property name="top_attach">2</property>
                                 <property name="bottom_attach">3</property>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                           </object>
@@ -2538,7 +2554,7 @@
                               <object class="GtkLabel" id="ldap_server">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="no">label</property>
+                                <property name="label">label</property>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -2550,7 +2566,7 @@
                               <object class="GtkLabel" id="ldap_auth_method">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="no">label</property>
+                                <property name="label">label</property>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -2564,7 +2580,7 @@
                               <object class="GtkLabel" id="ldap_username">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="no">label</property>
+                                <property name="label">label</property>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
diff --git a/gtk/videowindow.c b/gtk/videowindow.c
index f2247e573..220569077 100644
--- a/gtk/videowindow.c
+++ b/gtk/videowindow.c
@@ -94,7 +94,7 @@ static gboolean drag_drop(GtkWidget *widget, GdkDragContext *drag_context, gint
 	return TRUE;
 }
 
-unsigned long get_native_handle(GdkWindow *gdkw){
+static unsigned long get_native_handle(GdkWindow *gdkw){
 #ifdef GDK_WINDOWING_X11
 	return (unsigned long)GDK_WINDOW_XID(gdkw);
 #elif defined(WIN32)
@@ -106,6 +106,15 @@ unsigned long get_native_handle(GdkWindow *gdkw){
 	return 0;
 }
 
+static void _resize_video_window(GtkWidget *video_window, MSVideoSize vsize){
+	MSVideoSize cur;
+	gtk_window_get_size(GTK_WINDOW(video_window),&cur.width,&cur.height);
+	if (vsize.width*vsize.height > cur.width*cur.height || 
+		ms_video_size_get_orientation(vsize)!=ms_video_size_get_orientation(cur) ){
+		gtk_window_resize(GTK_WINDOW(video_window),vsize.width,vsize.height);
+	}
+}
+
 static gint resize_video_window(LinphoneCall *call){
 	const LinphoneCallParams *params=linphone_call_get_current_params(call);
 	if (params){
@@ -114,13 +123,7 @@ static gint resize_video_window(LinphoneCall *call){
 			GtkWidget *callview=(GtkWidget*)linphone_call_get_user_pointer(call);
 			GtkWidget *video_window=(GtkWidget*)g_object_get_data(G_OBJECT(callview),"video_window");
 			if (video_window){
-				MSVideoSize cur;
-				gtk_window_get_size(GTK_WINDOW(video_window),&cur.width,&cur.height);
-				if (vsize.width*vsize.height > cur.width*cur.height || 
-					ms_video_size_get_orientation(vsize)!=ms_video_size_get_orientation(cur) ){
-					g_message("Resized to %ix%i",vsize.width,vsize.height);
-					gtk_window_resize(GTK_WINDOW(video_window),vsize.width,vsize.height);
-				}
+				_resize_video_window(video_window,vsize);
 			}
 		}
 	}
@@ -308,3 +311,55 @@ void linphone_gtk_in_call_show_video(LinphoneCall *call){
 		}
 	}
 }
+
+static void on_video_preview_destroyed(GtkWidget *video_preview, GtkWidget *mw){
+	LinphoneCore *lc=linphone_gtk_get_core();
+	guint timeout_id=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(video_preview),"timeout-id"));
+	g_object_set_data(G_OBJECT(mw),"video_preview",NULL);
+	linphone_core_enable_video_preview(lc,FALSE);
+	linphone_core_set_native_preview_window_id(lc,-1);
+	g_source_remove(timeout_id);
+}
+
+GtkWidget *linphone_gtk_get_camera_preview_window(void){
+	return (GtkWidget *)g_object_get_data(G_OBJECT(linphone_gtk_get_main_window()),"video_preview");
+}
+
+static gboolean check_preview_size(GtkWidget *video_preview){
+	MSVideoSize vsize=linphone_core_get_current_preview_video_size(linphone_gtk_get_core());
+	if (vsize.width && vsize.height){
+		MSVideoSize cur;
+		gtk_window_get_size(GTK_WINDOW(video_preview),&cur.width,&cur.height);
+		if (cur.width!=vsize.width || cur.height!=vsize.height){
+			gtk_window_resize(GTK_WINDOW(video_preview),vsize.width,vsize.height);
+		}
+	}
+	return TRUE;
+}
+
+void linphone_gtk_show_camera_preview_clicked(GtkButton *button){
+	GtkWidget *mw=linphone_gtk_get_main_window();
+	GtkWidget *video_preview=(GtkWidget *)g_object_get_data(G_OBJECT(mw),"video_preview");
+	
+	if (!video_preview){
+		gchar *title;
+		LinphoneCore *lc=linphone_gtk_get_core();
+		GdkColor color;
+		guint tid;
+		
+		video_preview=gtk_window_new(GTK_WINDOW_TOPLEVEL);
+		title=g_strdup_printf("%s - Video preview",linphone_gtk_get_ui_config("title","Linphone"));
+		gtk_window_set_title(GTK_WINDOW(video_preview),title);
+		gdk_color_parse("black",&color);
+		gtk_widget_modify_bg(video_preview,GTK_STATE_NORMAL,&color);
+		g_free(title);
+		g_object_set_data(G_OBJECT(mw),"video_preview",video_preview);
+		g_signal_connect(video_preview,"destroy",(GCallback)on_video_preview_destroyed,mw);
+		gtk_widget_show(video_preview);
+		linphone_core_set_native_preview_window_id(lc,get_native_handle(gtk_widget_get_window(video_preview)));
+		linphone_core_enable_video_preview(lc,TRUE);
+		tid=g_timeout_add(100,(GSourceFunc)check_preview_size,video_preview);
+		g_object_set_data(G_OBJECT(video_preview),"timeout-id",GINT_TO_POINTER(tid));
+	}
+}
+

From f48780782c2c6acfed277753d5de9c642e917f65 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Fri, 12 Dec 2014 16:54:30 +0100
Subject: [PATCH 166/496] fix compilation

---
 coreapi/linphonecall.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index a1c3ad003..e6329dbce 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -2790,7 +2790,7 @@ static void report_bandwidth(LinphoneCall *call, MediaStream *as, MediaStream *v
 	call->stats[LINPHONE_CALL_STATS_VIDEO].download_bandwidth=(vs_active) ? (media_stream_get_down_bw(vs)*1e-3) : 0;
 	call->stats[LINPHONE_CALL_STATS_VIDEO].upload_bandwidth=(vs_active) ? (media_stream_get_up_bw(vs)*1e-3) : 0;
 	call->stats[LINPHONE_CALL_STATS_AUDIO].rtcp_download_bandwidth=(as_active) ? (media_stream_get_rtcp_down_bw(as)*1e-3) : 0;
-	call->stats[LINPHONE_CALL_STATS_AUDIO].rtcp_upload_bandwidth=as_active) ? (media_stream_get_rtcp_up_bw(as)*1e-3) : 0;
+	call->stats[LINPHONE_CALL_STATS_AUDIO].rtcp_upload_bandwidth=(as_active) ? (media_stream_get_rtcp_up_bw(as)*1e-3) : 0;
 	call->stats[LINPHONE_CALL_STATS_VIDEO].rtcp_download_bandwidth=(vs_active) ? (media_stream_get_rtcp_down_bw(vs)*1e-3) : 0;
 	call->stats[LINPHONE_CALL_STATS_VIDEO].rtcp_upload_bandwidth=(vs_active) ? (media_stream_get_rtcp_up_bw(vs)*1e-3) : 0;
 

From 25532e628544475d0b044fd7c35969c4ef1b6d6d Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Fri, 12 Dec 2014 16:56:13 +0100
Subject: [PATCH 167/496] ms2:stun api shall be public

---
 coreapi/misc.c | 2 +-
 mediastreamer2 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/coreapi/misc.c b/coreapi/misc.c
index 6ed3bb709..c238b13a0 100644
--- a/coreapi/misc.c
+++ b/coreapi/misc.c
@@ -41,7 +41,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #endif /*_WIN32_WCE*/
 
 #undef snprintf
-#include <ortp/stun.h>
+#include <mediastreamer2/stun.h>
 
 #ifdef HAVE_GETIFADDRS
 #include <net/if.h>
diff --git a/mediastreamer2 b/mediastreamer2
index 32fcc17e3..d7e7fb21f 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 32fcc17e34a0a5559b7bc154116aa46d72c03a1b
+Subproject commit d7e7fb21f2c45e32e641ca4349ca5f1242ee4fe8

From 4292c1fc150ee25bad69e112d464a514d2e8b822 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Fri, 12 Dec 2014 17:02:52 +0100
Subject: [PATCH 168/496] fix compilation errors

---
 tester/message_tester.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/tester/message_tester.c b/tester/message_tester.c
index 7ec828ccc..254737a04 100644
--- a/tester/message_tester.c
+++ b/tester/message_tester.c
@@ -105,7 +105,9 @@ LinphoneBuffer * file_transfer_send(LinphoneChatMessage *message, const Linphone
 	fseek(file_to_send, offset, SEEK_SET);
 	size_to_send = MIN(size, file_size - offset);
 	buf = ms_malloc(size_to_send);
-	fread(buf, size_to_send, 1, file_to_send);
+	if (fread(buf, size_to_send, 1, file_to_send)!=size_to_send){
+		ms_error("fread error");
+	}
 	lb = linphone_buffer_new_from_data(buf, size_to_send);
 	ms_free(buf);
 	return lb;
@@ -425,8 +427,12 @@ static bool_t compare_files(const char *path1, const char *path2) {
 	}
 	buf1 = ms_malloc(size1);
 	buf2 = ms_malloc(size2);
-	fread(buf1, size1, 1, f1);
-	fread(buf2, size2, 1, f2);
+	if (fread(buf1, size1, 1, f1)!=size1){
+		ms_error("fread() error");
+	}
+	if (fread(buf2, size2, 1, f2)!=size2){
+		ms_error("fread() error");
+	}
 	fclose(f1);
 	fclose(f2);
 	res = (memcmp(buf1, buf2, size1) == 0) ? TRUE : FALSE;

From 2a5e6eafb9ac1049779611c1bde64af80d1fe39e Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Fri, 12 Dec 2014 17:04:44 +0100
Subject: [PATCH 169/496] fix stun_tester.c

---
 tester/stun_tester.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tester/stun_tester.c b/tester/stun_tester.c
index 99b1190ed..58a069f3d 100644
--- a/tester/stun_tester.c
+++ b/tester/stun_tester.c
@@ -21,7 +21,7 @@
 #include "linphonecore.h"
 #include "private.h"
 #include "liblinphone_tester.h"
-#include "ortp/stun.h"
+#include "mediastreamer2/stun.h"
 #include "ortp/port.h"
 
 

From d997814f823d2a2bdfa6fe3427ca2fc9e53291da Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Fri, 12 Dec 2014 17:05:56 +0100
Subject: [PATCH 170/496] Better hinting for soundcard

---
 coreapi/linphonecore.c | 4 +---
 mediastreamer2         | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index b0fa65e12..694ad2695 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -3938,10 +3938,10 @@ int _linphone_core_pause_call(LinphoneCore *lc, LinphoneCall *call)
 		linphone_core_notify_display_warning(lc,_("Could not pause the call"));
 	}
 	lc->current_call=NULL;
-	linphone_call_set_state(call,LinphoneCallPausing,"Pausing call");
 	linphone_core_notify_display_status(lc,_("Pausing the current call..."));
 	if (call->audiostream || call->videostream)
 		linphone_call_stop_media_streams (call);
+	linphone_call_set_state(call,LinphoneCallPausing,"Pausing call");
 	call->paused_by_app=FALSE;
 	return 0;
 }
@@ -6484,8 +6484,6 @@ int linphone_core_del_call( LinphoneCore *lc, LinphoneCall *call)
 	}
 	lc->calls = the_calls;
 
-	linphone_core_soundcard_hint_check(lc);
-
 	return 0;
 }
 
diff --git a/mediastreamer2 b/mediastreamer2
index a9b195ade..323dcac7f 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit a9b195ade60a094240700dc6cbe6d72663f2e524
+Subproject commit 323dcac7fd1b8f2fc5c2acaa1fe73dc3d4ce15eb

From 1ac1cd5fe8aba5299771faffae8c408ded1ad035 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Fri, 12 Dec 2014 18:55:47 +0100
Subject: [PATCH 171/496] fix RtpTransport leak on video side as well

---
 coreapi/linphonecall.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index e6329dbce..2697724f5 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -1621,6 +1621,8 @@ void linphone_call_init_audio_stream(LinphoneCall *call){
 void linphone_call_init_video_stream(LinphoneCall *call){
 #ifdef VIDEO_ENABLED
 	LinphoneCore *lc=call->core;
+	RtpTransport *meta_rtp=NULL;
+	RtpTransport *meta_rtcp=NULL;
 
 	if (call->videostream == NULL){
 		int video_recv_buf_size=lp_config_get_int(lc->config,"video","recv_buf_size",0);
@@ -1644,11 +1646,11 @@ void linphone_call_init_video_stream(LinphoneCall *call){
 		if (display_filter != NULL)
 			video_stream_set_display_filter_name(call->videostream,display_filter);
 		video_stream_set_event_callback(call->videostream,video_stream_event_cb, call);
-		if (lc->rtptf){
+		rtp_session_get_transports(call->videostream->ms.sessions.rtp_session,&meta_rtp,&meta_rtcp);
+		if (lc->rtptf && (meta_rtp==NULL && meta_rtcp==NULL)){
 			RtpTransport *vrtp=lc->rtptf->video_rtp_func(lc->rtptf->video_rtp_func_data, call->media_ports[1].rtp_port);
 			RtpTransport *vrtcp=lc->rtptf->video_rtcp_func(lc->rtptf->video_rtcp_func_data, call->media_ports[1].rtcp_port);
-			RtpTransport *meta_rtp;
-			RtpTransport *meta_rtcp;
+			
 			meta_rtp_transport_new(&meta_rtp,TRUE,vrtp, 0);
 			meta_rtp_transport_new(&meta_rtcp,FALSE,vrtcp, 0);
 			rtp_session_set_transports(call->videostream->ms.sessions.rtp_session,meta_rtp,meta_rtcp);

From d9bc65287c1e77de3f2d27db46e683bfec43aa6e Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Mon, 15 Dec 2014 11:10:44 +0100
Subject: [PATCH 172/496] Enable XML output for liblinphone tester

---
 tester/liblinphone_tester.c | 20 ++++++++
 tester/liblinphone_tester.h |  5 ++
 tester/tester.c             | 96 +++++++++++++++++++++++--------------
 3 files changed, 86 insertions(+), 35 deletions(-)

diff --git a/tester/liblinphone_tester.c b/tester/liblinphone_tester.c
index addf99566..aa4f78f29 100644
--- a/tester/liblinphone_tester.c
+++ b/tester/liblinphone_tester.c
@@ -135,6 +135,8 @@ void helper(const char *name) {
 #if HAVE_CU_CURSES
 			"\t\t\t--curses\n"
 #endif
+			"\t\t\t--xml\n"		
+			"\t\t\t--xml-file <xml file prefix (will be suffixed by '-Results.xml')>\n"
 			, name);
 }
 
@@ -153,6 +155,8 @@ int main (int argc, char *argv[])
 	int ret;
 	const char *suite_name=NULL;
 	const char *test_name=NULL;
+	const char *xml_file=NULL;
+	int xml = 0;
 	FILE* log_file=NULL;
 #if defined(ANDROID)
 	linphone_core_set_log_handler(linphone_android_ortp_log_handler);
@@ -198,6 +202,11 @@ int main (int argc, char *argv[])
 			suite_name = argv[i];
 			liblinphone_tester_list_suite_tests(suite_name);
 			return 0;
+		} else if (strcmp(argv[i], "--xml-file") == 0){
+			CHECK_ARG("--xml-file", ++i, argc);
+			xml_file = argv[i];
+		} else if (strcmp(argv[i], "--xml") == 0){
+			xml = 1;
 		} else if (strcmp(argv[i],"--log-file")==0){
 			CHECK_ARG("--log-file", ++i, argc);
 			log_file=fopen(argv[i],"w");
@@ -216,6 +225,17 @@ int main (int argc, char *argv[])
 		}
 	}
 
+	if( xml && (suite_name || test_name) ){
+		printf("Cannot use both xml and specific test suite\n");
+		return -1;
+	}
+
+	if( xml_file != NULL ){
+		liblinphone_tester_set_xml_output(xml_file);
+	}
+	liblinphone_tester_enable_xml(xml);
+
+
 	ret = liblinphone_tester_run_tests(suite_name, test_name);
 	liblinphone_tester_uninit();
 	return ret;
diff --git a/tester/liblinphone_tester.h b/tester/liblinphone_tester.h
index d7bbb64e9..0ae708b70 100644
--- a/tester/liblinphone_tester.h
+++ b/tester/liblinphone_tester.h
@@ -79,6 +79,11 @@ extern void liblinphone_tester_set_fileprefix(const char* file_prefix);
 extern void liblinphone_tester_set_writable_dir_prefix(const char* writable_dir_prefix);
 extern int liblinphone_tester_ipv6_available(void);
 
+
+extern        void liblinphone_tester_enable_xml( bool_t enable );
+extern        void liblinphone_tester_set_xml_output(const char *xml_path );
+extern const char* liblinphone_tester_get_xml_output(void);
+
 /**
  * @brief Tells the tester whether or not to clean the accounts it has created between runs.
  * @details Setting this to 1 will not clear the list of created accounts between successive
diff --git a/tester/tester.c b/tester/tester.c
index 2d39e7e67..125ebd5df 100644
--- a/tester/tester.c
+++ b/tester/tester.c
@@ -18,6 +18,7 @@
 
 #include <stdio.h>
 #include "CUnit/TestRun.h"
+#include "CUnit/Automated.h"
 #include "linphonecore.h"
 #include "private.h"
 #include "liblinphone_tester.h"
@@ -42,6 +43,9 @@ int liblinphone_tester_use_log_file=0;
 static int liblinphone_tester_keep_accounts_flag = 0;
 static int manager_count = 0;
 
+static const char* liblinphone_tester_xml_file = NULL;
+static int      liblinphone_tester_xml_enabled = FALSE;
+
 #if WINAPI_FAMILY_PHONE_APP
 const char *liblinphone_tester_file_prefix="Assets";
 #elif defined(__QNX__)
@@ -500,49 +504,57 @@ int liblinphone_tester_run_tests(const char *suite_name, const char *test_name)
 	CU_set_suite_start_handler(test_suite_start_message_handler);
 
 
+	if( liblinphone_tester_xml_file != NULL ){
+		CU_set_output_filename(liblinphone_tester_xml_file);
+	}
+	if( liblinphone_tester_xml_enabled != 0 ){
+		CU_automated_run_tests();
+	} else {
+
 #if !HAVE_CU_GET_SUITE
-	if( suite_name ){
-		ms_warning("Tester compiled without CU_get_suite() function, running all tests instead of suite '%s'\n", suite_name);
-	}
-#else
-	if (suite_name){
-		CU_pSuite suite;
-		suite=CU_get_suite(suite_name);
-		if (!suite) {
-			ms_error("Could not find suite '%s'. Available suites are:", suite_name);
-			liblinphone_tester_list_suites();
-			return -1;
-		} else if (test_name) {
-			CU_pTest test=CU_get_test_by_name(test_name, suite);
-			if (!test) {
-				ms_error("Could not find test '%s' in suite '%s'. Available tests are:", test_name, suite_name);
-				// do not use suite_name here, since this method is case sentisitive
-				liblinphone_tester_list_suite_tests(suite->pName);
-				return -2;
-			} else {
-				CU_ErrorCode err= CU_run_test(suite, test);
-				if (err != CUE_SUCCESS) ms_error("CU_basic_run_test error %d", err);
-			}
-		} else {
-			CU_run_suite(suite);
+		if( suite_name ){
+			ms_warning("Tester compiled without CU_get_suite() function, running all tests instead of suite '%s'\n", suite_name);
 		}
-	}
-	else
-#endif
-	{
-#if HAVE_CU_CURSES
-		if (curses) {
-			/* Run tests using the CUnit curses interface */
-			CU_curses_run_tests();
+#else
+		if (suite_name){
+			CU_pSuite suite;
+			suite=CU_get_suite(suite_name);
+			if (!suite) {
+				ms_error("Could not find suite '%s'. Available suites are:", suite_name);
+				liblinphone_tester_list_suites();
+				return -1;
+			} else if (test_name) {
+				CU_pTest test=CU_get_test_by_name(test_name, suite);
+				if (!test) {
+					ms_error("Could not find test '%s' in suite '%s'. Available tests are:", test_name, suite_name);
+					// do not use suite_name here, since this method is case sentisitive
+					liblinphone_tester_list_suite_tests(suite->pName);
+					return -2;
+				} else {
+					CU_ErrorCode err= CU_run_test(suite, test);
+					if (err != CUE_SUCCESS) ms_error("CU_basic_run_test error %d", err);
+				}
+			} else {
+				CU_run_suite(suite);
+			}
 		}
 		else
 #endif
 		{
-			/* Run all tests using the CUnit Basic interface */
-			CU_run_all_tests();
+#if HAVE_CU_CURSES
+			if (curses) {
+				/* Run tests using the CUnit curses interface */
+				CU_curses_run_tests();
+			}
+			else
+#endif
+			{
+				/* Run all tests using the CUnit Basic interface */
+				CU_run_all_tests();
+			}
 		}
-	}
 
+	}
 	ret=CU_get_number_of_tests_failed()!=0;
 
 	/* Redisplay list of failed tests on end */
@@ -601,4 +613,18 @@ void liblinphone_tester_clear_accounts(void){
 	account_manager_destroy();
 }
 
+void liblinphone_tester_enable_xml( bool_t enable ){
+	liblinphone_tester_xml_enabled = enable;
+}
+
+void liblinphone_tester_set_xml_output(const char *xml_path ) {
+	liblinphone_tester_xml_file = xml_path;
+}
+
+const char* liblinphone_tester_get_xml_output( void ) {
+	return liblinphone_tester_xml_file;
+}
+
+
+
 

From 04a66a165c4a53a2dc5708d7730a12ff1af8d3aa Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Mon, 15 Dec 2014 12:33:57 +0100
Subject: [PATCH 173/496] Fix lpconfig test on read-only storage

---
 tester/setup_tester.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tester/setup_tester.c b/tester/setup_tester.c
index 21fcfd091..63a8616d5 100644
--- a/tester/setup_tester.c
+++ b/tester/setup_tester.c
@@ -132,7 +132,9 @@ static void linphone_lpconfig_from_file_zerolen_value(){
 	char* rc_path = ms_strdup_printf("%s/rcfiles/%s", liblinphone_tester_file_prefix, zero_rc_file);
 	LpConfig* conf;
 
-	conf = lp_config_new(rc_path);
+	/* not using lp_config_new() because it expects a readable file, and iOS (for instance)
+	   stores the app bundle in read-only */
+	conf = lp_config_new_with_factory(NULL, rc_path);
 
 	CU_ASSERT_STRING_EQUAL(lp_config_get_string(conf,"test","zero_len","LOL"),"LOL");
 	CU_ASSERT_STRING_EQUAL(lp_config_get_string(conf,"test","non_zero_len",""),"test");

From 3e56dcac160b45562af0898898c84c918848fffc Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Mon, 15 Dec 2014 12:36:18 +0100
Subject: [PATCH 174/496] Remove (now) unneeded use_files and fix the way we
 manage use_files in the linphone_core_manager to include a ringback tone

---
 tester/call_tester.c     | 66 +---------------------------------------
 tester/flexisip_tester.c | 35 ++-------------------
 tester/setup_tester.c    |  2 ++
 tester/tester.c          |  6 +++-
 4 files changed, 11 insertions(+), 98 deletions(-)

diff --git a/tester/call_tester.c b/tester/call_tester.c
index 2d186e1e1..df3b8636b 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -188,7 +188,6 @@ bool_t call_with_params2(LinphoneCoreManager* caller_mgr
 	stats initial_caller=caller_mgr->stat;
 	stats initial_callee=callee_mgr->stat;
 	bool_t result=FALSE;
-	char hellopath[256];
 	LinphoneCallParams *caller_params = caller_test_params->base;
 	LinphoneCallParams *callee_params = callee_test_params->base;
 	bool_t did_received_call;
@@ -196,10 +195,6 @@ bool_t call_with_params2(LinphoneCoreManager* caller_mgr
 	sal_default_enable_sdp_removal(caller_mgr->lc->sal, caller_test_params->sdp_removal);
 	sal_default_enable_sdp_removal(callee_mgr->lc->sal, callee_test_params->sdp_removal);
 
-	/*use playfile for callee to avoid locking on capture card*/
-	linphone_core_use_files (callee_mgr->lc,TRUE);
-	snprintf(hellopath,sizeof(hellopath), "%s/sounds/hello8000.wav", liblinphone_tester_file_prefix);
-	linphone_core_set_play_file(callee_mgr->lc,hellopath);
 	if (!caller_params){
 		CU_ASSERT_PTR_NOT_NULL(linphone_core_invite_address(caller_mgr->lc,callee_mgr->identity));
 	}else{
@@ -388,15 +383,9 @@ static void direct_call_over_ipv6(){
 	if (liblinphone_tester_ipv6_available()){
 		LCSipTransports pauline_transports;
 		LinphoneAddress* pauline_dest = linphone_address_new("sip:[::1];transport=tcp");
-		char hellopath[256];
 		marie = linphone_core_manager_new( "marie_rc");
 		pauline = linphone_core_manager_new( "pauline_tcp_rc");
 
-		/*use playfile for callee to avoid locking on capture card*/
-		snprintf(hellopath,sizeof(hellopath), "%s/sounds/hello8000.wav", liblinphone_tester_file_prefix);
-		linphone_core_set_play_file(pauline->lc,hellopath);
-		linphone_core_use_files (pauline->lc,TRUE);
-
 		linphone_core_enable_ipv6(marie->lc,TRUE);
 		linphone_core_enable_ipv6(pauline->lc,TRUE);
 		linphone_core_set_default_proxy_config(marie->lc,NULL);
@@ -468,7 +457,6 @@ static void multiple_answers_call() {
 	/* Scenario is this: pauline calls marie, which is registered 2 times.
 	   Both linphones answer at the same time, and only one should get the
 	   call running, the other should be terminated */
-	char ringbackpath[256];
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc" );
 	LinphoneCoreManager* marie1  = linphone_core_manager_new( "marie_rc" );
 	LinphoneCoreManager* marie2  = linphone_core_manager_new( "marie_rc" );
@@ -479,11 +467,6 @@ static void multiple_answers_call() {
 	lcs = ms_list_append(lcs,marie1->lc);
 	lcs = ms_list_append(lcs,marie2->lc);
 
-	linphone_core_use_files(pauline->lc, TRUE);
-	linphone_core_use_files(marie1->lc, TRUE);
-	linphone_core_use_files(marie2->lc, TRUE);
-
-	snprintf(ringbackpath,sizeof(ringbackpath), "%s/sounds/hello8000.wav" /*use hello because rinback is too short*/, liblinphone_tester_file_prefix);
 
 	CU_ASSERT_TRUE(wait_for_until(pauline->lc, NULL, &pauline->stat.number_of_LinphoneRegistrationOk, 1, 2000));
 
@@ -519,7 +502,6 @@ static void multiple_answers_call_with_media_relay() {
 	/* Scenario is this: pauline calls marie, which is registered 2 times.
 	 *   Both linphones answer at the same time, and only one should get the
 	 *   call running, the other should be terminated */
-	char ringbackpath[256];
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc" );
 	LinphoneCoreManager* marie1  = linphone_core_manager_new( "marie_rc" );
 	LinphoneCoreManager* marie2  = linphone_core_manager_new( "marie_rc" );
@@ -530,16 +512,10 @@ static void multiple_answers_call_with_media_relay() {
 	lcs = ms_list_append(lcs,marie1->lc);
 	lcs = ms_list_append(lcs,marie2->lc);
 
-	linphone_core_use_files(pauline->lc, TRUE);
-	linphone_core_use_files(marie1->lc, TRUE);
-	linphone_core_use_files(marie2->lc, TRUE);
-
 	linphone_core_set_user_agent(pauline->lc, "Natted Linphone", NULL);
 	linphone_core_set_user_agent(marie1->lc, "Natted Linphone", NULL);
 	linphone_core_set_user_agent(marie2->lc, "Natted Linphone", NULL);
 
-	snprintf(ringbackpath,sizeof(ringbackpath), "%s/sounds/hello8000.wav" /*use hello because rinback is too short*/, liblinphone_tester_file_prefix);
-
 	CU_ASSERT_TRUE(wait_for_until(pauline->lc, NULL, &pauline->stat.number_of_LinphoneRegistrationOk, 1, 2000));
 
 	CU_ASSERT_PTR_NOT_NULL( linphone_core_invite_address(pauline->lc, marie1->identity ) );
@@ -1839,7 +1815,6 @@ static void call_waiting_indication_with_param(bool_t enable_caller_privacy) {
 	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
 	LinphoneCoreManager* laure = linphone_core_manager_new( "laure_rc");
-	char hellopath[256];
 	MSList *iterator;
 	MSList* lcs;
 	LinphoneCall* pauline_called_by_marie;
@@ -1857,12 +1832,6 @@ static void call_waiting_indication_with_param(bool_t enable_caller_privacy) {
 	CU_ASSERT_TRUE(call_with_caller_params(marie,pauline,marie_params));
 	pauline_called_by_marie=linphone_core_get_current_call(pauline->lc);
 
-
-	/*use playfile for callee to avoid locking on capture card*/
-	linphone_core_use_files (laure->lc,TRUE);
-	linphone_core_use_files (marie->lc,TRUE);
-	snprintf(hellopath,sizeof(hellopath), "%s/sounds/hello8000.wav", liblinphone_tester_file_prefix);
-	linphone_core_set_play_file(laure->lc,hellopath);
 	if (enable_caller_privacy)
 		linphone_call_params_set_privacy(laure_params,LinphonePrivacyId);
 
@@ -2295,7 +2264,6 @@ static void early_media_call(void) {
 }
 
 static void early_media_call_with_ringing(void){
-	char hellopath[256];
 	LinphoneCoreManager* marie   = linphone_core_manager_new("marie_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new("pauline_rc");
 	MSList* lcs = NULL;
@@ -2311,11 +2279,6 @@ static void early_media_call_with_ringing(void){
 		Marie calls Pauline, and after the call has rung, transitions to an early_media session
 	*/
 
-	/*use playfile for callee to avoid locking on capture card*/
-	linphone_core_use_files (pauline->lc,TRUE);
-	snprintf(hellopath,sizeof(hellopath), "%s/sounds/hello8000.wav", liblinphone_tester_file_prefix);
-	linphone_core_set_play_file(pauline->lc,hellopath);
-
 	marie_call = linphone_core_invite_address(marie->lc, pauline->identity);
 	marie_call_log = linphone_call_get_call_log(marie_call);
 
@@ -2359,7 +2322,6 @@ static void early_media_call_with_ringing(void){
 }
 
 static void early_media_call_with_update_base(bool_t media_change){
-	char hellopath[256];
 	LinphoneCoreManager* marie   = linphone_core_manager_new("marie_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new("pauline_rc");
 	MSList* lcs = NULL;
@@ -2376,11 +2338,6 @@ static void early_media_call_with_update_base(bool_t media_change){
 		Marie calls Pauline, and after the call has rung, transitions to an early_media session
 	*/
 
-	/*use playfile for callee to avoid locking on capture card*/
-	linphone_core_use_files (pauline->lc,TRUE);
-	snprintf(hellopath,sizeof(hellopath), "%s/sounds/hello8000.wav", liblinphone_tester_file_prefix);
-	linphone_core_set_play_file(pauline->lc,hellopath);
-
 	marie_call = linphone_core_invite_address(marie->lc, pauline->identity);
 
 	CU_ASSERT_TRUE(wait_for_list(lcs, &pauline->stat.number_of_LinphoneCallIncomingReceived,1,1000));
@@ -2598,9 +2555,6 @@ static void call_transfer_existing_call_outgoing_call(void) {
 	MSList* lcs=ms_list_append(NULL,marie->lc);
 	const MSList* calls;
 
-	linphone_core_use_files (pauline->lc,TRUE);
-	linphone_core_use_files (laure->lc,TRUE);
-
 	lcs=ms_list_append(lcs,pauline->lc);
 	lcs=ms_list_append(lcs,laure->lc);
 
@@ -2766,7 +2720,6 @@ static void call_established_with_rejected_incoming_reinvite(void) {
 }
 
 static void call_redirect(void){
-	char hellopath[256];
 	LinphoneCoreManager* marie   = linphone_core_manager_new("marie_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new("pauline_rc");
 	LinphoneCoreManager* laure   = linphone_core_manager_new("laure_rc");
@@ -2781,13 +2734,6 @@ static void call_redirect(void){
 		Marie calls Pauline, which will redirect the call to Laure via a 302
 	*/
 
-	/*use playfile for callee to avoid locking on capture card*/
-	linphone_core_use_files (pauline->lc,TRUE);
-	linphone_core_use_files (laure->lc,TRUE);
-	snprintf(hellopath,sizeof(hellopath), "%s/sounds/hello8000.wav", liblinphone_tester_file_prefix);
-	linphone_core_set_play_file(pauline->lc,hellopath);
-	linphone_core_set_play_file(laure->lc,hellopath);
-
 	marie_call = linphone_core_invite_address(marie->lc, pauline->identity);
 
 	CU_ASSERT_TRUE(wait_for_list(lcs, &pauline->stat.number_of_LinphoneCallIncomingReceived,1,1000));
@@ -2912,9 +2858,9 @@ static void call_rejected_without_403_because_wrong_credentials_no_auth_req_cb()
 #ifdef VIDEO_ENABLED
 /*this is call forking with early media managed at client side (not by flexisip server)*/
 static void multiple_early_media(void) {
+	LinphoneCoreManager* pauline = linphone_core_manager_new("pauline_tcp_rc");
 	LinphoneCoreManager* marie1 = linphone_core_manager_new("marie_early_rc");
 	LinphoneCoreManager* marie2 = linphone_core_manager_new("marie_early_rc");
-	LinphoneCoreManager* pauline = linphone_core_manager_new("pauline_tcp_rc");
 	MSList *lcs=NULL;
 	LinphoneCallParams *params=linphone_core_create_default_call_parameters(pauline->lc);
 	LinphoneVideoPolicy pol;
@@ -2923,9 +2869,6 @@ static void multiple_early_media(void) {
 	LinphoneCall *pauline_call;
 	LinphoneInfoMessage *info;
 	int dummy=0;
-	char ringbackpath[256];
-	snprintf(ringbackpath,sizeof(ringbackpath), "%s/sounds/hello8000.wav" /*use hello because rinback is too short*/, liblinphone_tester_file_prefix);
-
 	pol.automatically_accept=1;
 	pol.automatically_initiate=1;
 
@@ -2933,18 +2876,11 @@ static void multiple_early_media(void) {
 
 	linphone_core_enable_video(marie1->lc,TRUE,TRUE);
 	linphone_core_set_video_policy(marie1->lc,&pol);
-	/*use playfile for marie1 to avoid locking on capture card*/
-	linphone_core_use_files(marie1->lc,TRUE);
-	linphone_core_set_play_file(marie1->lc,ringbackpath);
 
 	linphone_core_enable_video(marie2->lc,TRUE,TRUE);
 	linphone_core_set_video_policy(marie2->lc,&pol);
 	linphone_core_set_audio_port_range(marie2->lc,40200,40300);
 	linphone_core_set_video_port_range(marie2->lc,40400,40500);
-	/*use playfile for marie2 to avoid locking on capture card*/
-	linphone_core_use_files(marie2->lc,TRUE);
-	linphone_core_set_play_file(marie2->lc,ringbackpath);
-
 
 	lcs=ms_list_append(lcs,marie1->lc);
 	lcs=ms_list_append(lcs,marie2->lc);
diff --git a/tester/flexisip_tester.c b/tester/flexisip_tester.c
index 63ae8b79d..282894f09 100644
--- a/tester/flexisip_tester.c
+++ b/tester/flexisip_tester.c
@@ -307,7 +307,6 @@ static void call_forking_cancelled(void){
 }
 
 static void call_forking_declined(bool_t declined_globaly){
-	char hellopath[256];
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
 	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
 	LinphoneCoreManager* marie2 = linphone_core_manager_new( "marie_rc");
@@ -323,11 +322,6 @@ static void call_forking_declined(bool_t declined_globaly){
 	linphone_core_set_user_agent(marie3->lc,"Natted Linphone",NULL);
 	linphone_core_set_user_agent(pauline->lc,"Natted Linphone",NULL);
 	
-	/*use playfile for callee to avoid locking on capture card*/
-	linphone_core_use_files (pauline->lc,TRUE);
-	snprintf(hellopath,sizeof(hellopath), "%s/sounds/hello8000.wav", liblinphone_tester_file_prefix);
-	linphone_core_set_play_file(pauline->lc,hellopath);
-	
 	linphone_core_invite_address(pauline->lc,marie->identity);
 	/*pauline should hear ringback*/
 	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallOutgoingRinging,1,3000));
@@ -376,7 +370,6 @@ static void call_forking_declined_localy(void){
 }
 
 static void call_forking_with_push_notification_single(void){
-	char hellopath[256];
 	MSList* lcs;
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
 	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
@@ -391,11 +384,6 @@ static void call_forking_with_push_notification_single(void){
 	/*unfortunately marie gets unreachable due to crappy 3G operator or iOS bug...*/
 	linphone_core_set_network_reachable(marie->lc,FALSE);
 	
-	/*use playfile for callee to avoid locking on capture card*/
-	linphone_core_use_files (pauline->lc,TRUE);
-	snprintf(hellopath,sizeof(hellopath), "%s/sounds/hello8000.wav", liblinphone_tester_file_prefix);
-	linphone_core_set_play_file(pauline->lc,hellopath);
-	
 	linphone_core_invite_address(pauline->lc,marie->identity);
 	
 	/*the server is expected to send a push notification to marie, this will wake up linphone, that will reconnect:*/
@@ -425,7 +413,6 @@ static void call_forking_with_push_notification_single(void){
 }
 
 static void call_forking_with_push_notification_multiple(void){
-	char hellopath[256];
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
 	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
 	LinphoneCoreManager* marie2 = linphone_core_manager_new( "marie_rc");
@@ -442,13 +429,6 @@ static void call_forking_with_push_notification_multiple(void){
 	/*unfortunately marie gets unreachable due to crappy 3G operator or iOS bug...*/
 	linphone_core_set_network_reachable(marie2->lc,FALSE);
 	
-	/*use playfile for callee to avoid locking on capture card*/
-	snprintf(hellopath,sizeof(hellopath), "%s/sounds/hello8000.wav", liblinphone_tester_file_prefix);
-	linphone_core_use_files (marie->lc,TRUE);
-	linphone_core_set_play_file(marie->lc,hellopath);
-	linphone_core_use_files (marie2->lc,TRUE);
-	linphone_core_set_play_file(marie2->lc,hellopath);
-	
 	linphone_core_invite_address(pauline->lc,marie->identity);
 	
 	/*marie1 will ring*/
@@ -523,9 +503,9 @@ void call_forking_not_responded(void){
 }
 
 static void early_media_call_forking(void) {
+	LinphoneCoreManager* pauline = linphone_core_manager_new("pauline_tcp_rc");
 	LinphoneCoreManager* marie1 = linphone_core_manager_new("marie_early_rc");
 	LinphoneCoreManager* marie2 = linphone_core_manager_new("marie_early_rc");
-	LinphoneCoreManager* pauline = linphone_core_manager_new("pauline_tcp_rc");
 	MSList *lcs=NULL;
 	LinphoneCallParams *params=linphone_core_create_default_call_parameters(pauline->lc);
 	LinphoneVideoPolicy pol;
@@ -533,9 +513,7 @@ static void early_media_call_forking(void) {
 	LinphoneCall *marie2_call;
 	LinphoneCall *pauline_call;
 	int dummy=0;
-	char ringbackpath[256];
-	snprintf(ringbackpath,sizeof(ringbackpath), "%s/sounds/hello8000.wav" /*use hello because rinback is too short*/, liblinphone_tester_file_prefix);
-	
+
 	pol.automatically_accept=1;
 	pol.automatically_initiate=1;
 	
@@ -547,18 +525,11 @@ static void early_media_call_forking(void) {
 	
 	linphone_core_enable_video(marie1->lc,TRUE,TRUE);
 	linphone_core_set_video_policy(marie1->lc,&pol);
-	/*use playfile for marie1 to avoid locking on capture card*/
-	linphone_core_use_files (marie1->lc,TRUE);
-	linphone_core_set_play_file(marie1->lc,ringbackpath);
-
+	
 	linphone_core_enable_video(marie2->lc,TRUE,TRUE);
 	linphone_core_set_video_policy(marie2->lc,&pol);
 	linphone_core_set_audio_port_range(marie2->lc,40200,40300);
 	linphone_core_set_video_port_range(marie2->lc,40400,40500);
-	/*use playfile for marie2 to avoid locking on capture card*/
-	linphone_core_use_files (marie2->lc,TRUE);
-	linphone_core_set_play_file(marie2->lc,ringbackpath);
-	
 	
 	lcs=ms_list_append(lcs,marie1->lc);
 	lcs=ms_list_append(lcs,marie2->lc);
diff --git a/tester/setup_tester.c b/tester/setup_tester.c
index 63a8616d5..bab077623 100644
--- a/tester/setup_tester.c
+++ b/tester/setup_tester.c
@@ -137,6 +137,8 @@ static void linphone_lpconfig_from_file_zerolen_value(){
 	conf = lp_config_new_with_factory(NULL, rc_path);
 
 	CU_ASSERT_STRING_EQUAL(lp_config_get_string(conf,"test","zero_len","LOL"),"LOL");
+
+	// non_zero_len=test -> should return test
 	CU_ASSERT_STRING_EQUAL(lp_config_get_string(conf,"test","non_zero_len",""),"test");
 
 	lp_config_set_string(conf, "test", "non_zero_len", ""); /* should remove "non_zero_len" */
diff --git a/tester/tester.c b/tester/tester.c
index 125ebd5df..8b73026b4 100644
--- a/tester/tester.c
+++ b/tester/tester.c
@@ -269,11 +269,15 @@ LinphoneCoreManager* linphone_core_manager_new2(const char* rc_file, int check_f
 #if TARGET_OS_IPHONE
 	linphone_core_set_ringer_device( mgr->lc, "AQ: Audio Queue Device");
 	linphone_core_set_ringback(mgr->lc, NULL);
+#endif
+
 	if( manager_count >= 2){
+		char hellopath[512];
 		ms_message("Manager for '%s' using files", rc_file ? rc_file : "--");
 		linphone_core_use_files(mgr->lc, TRUE);
+		snprintf(hellopath,sizeof(hellopath), "%s/sounds/hello8000.wav", liblinphone_tester_file_prefix);
+		linphone_core_set_play_file(mgr->lc,hellopath);
 	}
-#endif
 
 	if (proxy_count)
 		wait_for_until(mgr->lc,NULL,&mgr->stat.number_of_LinphoneRegistrationOk,proxy_count,5000*proxy_count);

From 39399545003c1487cd6e6aec5aa4e24a387b85f7 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Mon, 15 Dec 2014 13:04:40 +0100
Subject: [PATCH 175/496] add ssrc attribute in case of srtp dtls

---
 coreapi/bellesip_sal/sal_sdp.c | 12 +++++++
 coreapi/linphonecall.c         | 62 +++++++++++++++++++++++++---------
 coreapi/offeranswer.c          |  6 ++++
 coreapi/private.h              |  1 +
 include/sal/sal.h              |  2 ++
 5 files changed, 67 insertions(+), 16 deletions(-)

diff --git a/coreapi/bellesip_sal/sal_sdp.c b/coreapi/bellesip_sal/sal_sdp.c
index 34720f5b4..67a583a31 100644
--- a/coreapi/bellesip_sal/sal_sdp.c
+++ b/coreapi/bellesip_sal/sal_sdp.c
@@ -236,6 +236,7 @@ static void stream_description_to_sdp ( belle_sdp_session_description_t *session
 
 	/* insert DTLS session attribute if needed */
 	if ((stream->proto == SalProtoUdpTlsRtpSavpf) || (stream->proto == SalProtoUdpTlsRtpSavp)) {
+		char* ssrc_attribute = ms_strdup_printf("%u cname:%s",htonl(stream->rtp_ssrc),stream->rtcp_cname);
 		if ((stream->dtls_role != SalDtlsRoleInvalid) && (strlen(stream->dtls_fingerprint)>0)) {
 			switch(stream->dtls_role) {
 				case SalDtlsRoleIsClient:
@@ -251,6 +252,10 @@ static void stream_description_to_sdp ( belle_sdp_session_description_t *session
 			}
 			belle_sdp_media_description_add_attribute(media_desc, belle_sdp_attribute_create("fingerprint",stream->dtls_fingerprint));
 		}
+
+		belle_sdp_media_description_add_attribute(media_desc, belle_sdp_attribute_create("ssrc",ssrc_attribute));
+		ms_free(ssrc_attribute);
+
 	}
 
 	switch ( stream->dir ) {
@@ -321,6 +326,13 @@ static void stream_description_to_sdp ( belle_sdp_session_description_t *session
 			belle_sip_object_unref((belle_sip_object_t*)media_attribute);
 		}
 	}
+	/*
+	 * rfc5576
+	 * 4.1.  The "ssrc" Media Attribute
+	 * <ssrc-id> is the synchronization source (SSRC) ID of the
+	 * source being described, interpreted as a 32-bit unsigned integer in
+	 * network byte order and represented in decimal.*/
+
 
 	belle_sdp_session_description_add_media_description(session_desc, media_desc);
 }
diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index 504a6c214..964f6e30f 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -448,6 +448,14 @@ void linphone_call_make_local_media_description(LinphoneCore *lc, LinphoneCall *
 	pt=payload_type_clone(rtp_profile_get_payload_from_mime(lc->default_profile,"telephone-event"));
 	l=ms_list_append(l,pt);
 	md->streams[0].payloads=l;
+	if (call->audiostream && call->audiostream->ms.sessions.rtp_session) {
+		char* me = linphone_address_as_string_uri_only(call->me);
+		md->streams[0].rtp_ssrc=rtp_session_get_send_ssrc(call->audiostream->ms.sessions.rtp_session);
+		strncpy(md->streams[0].rtcp_cname,me,sizeof(md->streams[0].rtcp_cname));
+		ms_free(me);
+	}
+	else
+		ms_warning("Cannot get audio local ssrc for call [%p]",call);
 	nb_active_streams++;
 
 	if (call->params->has_video){
@@ -460,6 +468,14 @@ void linphone_call_make_local_media_description(LinphoneCore *lc, LinphoneCall *
 		md->streams[1].type=SalVideo;
 		l=make_codec_list(lc,lc->codecs_conf.video_codecs,0,NULL,-1);
 		md->streams[1].payloads=l;
+		if (call->videostream && call->videostream->ms.sessions.rtp_session) {
+			char* me = linphone_address_as_string_uri_only(call->me);
+			md->streams[0].rtp_ssrc=rtp_session_get_send_ssrc(call->videostream->ms.sessions.rtp_session);
+			strncpy(md->streams[0].rtcp_cname,me,sizeof(md->streams[0].rtcp_cname));
+			ms_free(me);
+		}
+		else
+			ms_warning("Cannot get video local ssrc for call [%p]",call);
 		nb_active_streams++;
 	}
 
@@ -831,6 +847,14 @@ LinphoneCall * linphone_call_new_incoming(LinphoneCore *lc, LinphoneAddress *fro
 			ms_warning("ICE not supported for incoming INVITE without SDP.");
 		}
 	}
+
+
+	if (linphone_call_log_get_dir(call->log) == LinphoneCallIncoming)
+		call->me=linphone_call_log_get_to_address(call->log);
+	 else
+		 call->me=linphone_call_log_get_from_address(call->log);
+
+
 	/*reserve the sockets immediately*/
 	linphone_call_init_media_streams(call);
 	switch (fpol) {
@@ -1115,6 +1139,11 @@ static void linphone_call_destroy(LinphoneCall *obj){
 		linphone_call_params_unref(obj->remote_params);
 		obj->remote_params=NULL;
 	}
+	if (obj->me) {
+		linphone_address_destroy(obj->me);
+		obj->me = NULL;
+	}
+
 	sal_error_info_reset(&obj->non_op_error);
 }
 
@@ -1587,10 +1616,16 @@ void linphone_call_init_audio_stream(LinphoneCall *call){
 	AudioStream *audiostream;
 	const char *location;
 	int dscp;
+	char rtcp_tool[128]={0};
+	char* cname;
+	snprintf(rtcp_tool,sizeof(rtcp_tool)-1,"%s-%s",linphone_core_get_user_agent_name(),linphone_core_get_user_agent_version());
 
 	if (call->audiostream != NULL) return;
 	if (call->sessions[0].rtp_session==NULL){
 		call->audiostream=audiostream=audio_stream_new(call->media_ports[0].rtp_port,call->media_ports[0].rtcp_port,call->af==AF_INET6);
+		cname = linphone_address_as_string_uri_only(call->me);
+		audio_stream_set_rtcp_information(call->audiostream, cname, rtcp_tool);
+		ms_free(cname);
 		rtp_session_set_symmetric_rtp(audiostream->ms.sessions.rtp_session,linphone_core_symmetric_rtp_enabled(lc));
 		if (call->params->media_encryption==LinphoneMediaEncryptionDTLS) {
 			MSDtlsSrtpParams params;
@@ -1684,6 +1719,9 @@ void linphone_call_init_audio_stream(LinphoneCall *call){
 void linphone_call_init_video_stream(LinphoneCall *call){
 #ifdef VIDEO_ENABLED
 	LinphoneCore *lc=call->core;
+	char* cname;
+	char rtcp_tool[128];
+	snprintf(rtcp_tool,sizeof(rtcp_tool)-1,"%s-%s",linphone_core_get_user_agent_name(),linphone_core_get_user_agent_version());
 
 	if (call->videostream == NULL){
 		int video_recv_buf_size=lp_config_get_int(lc->config,"video","recv_buf_size",0);
@@ -1692,10 +1730,14 @@ void linphone_call_init_video_stream(LinphoneCall *call){
 
 		if (call->sessions[1].rtp_session==NULL){
 			call->videostream=video_stream_new(call->media_ports[1].rtp_port,call->media_ports[1].rtcp_port, call->af==AF_INET6);
+			cname = linphone_address_as_string_uri_only(call->me);
+			video_stream_set_rtcp_information(call->videostream, cname, rtcp_tool);
+			ms_free(cname);
 			rtp_session_set_symmetric_rtp(call->videostream->ms.sessions.rtp_session,linphone_core_symmetric_rtp_enabled(lc));
 		}else{
 			call->videostream=video_stream_new_with_sessions(&call->sessions[1]);
 		}
+
 		if (call->media_ports[1].rtp_port==-1){
 			port_config_set_random_choosed(call,1,call->videostream->ms.sessions.rtp_session);
 		}
@@ -2008,7 +2050,7 @@ static void configure_rtp_session_for_rtcp_xr(LinphoneCore *lc, LinphoneCall *ca
 	rtp_session_configure_rtcp_xr(session, &currentconfig);
 }
 
-static void linphone_call_start_audio_stream(LinphoneCall *call, const char *cname, bool_t muted, bool_t send_ringbacktone, bool_t use_arc){
+static void linphone_call_start_audio_stream(LinphoneCall *call, bool_t muted, bool_t send_ringbacktone, bool_t use_arc){
 	LinphoneCore *lc=call->core;
 	LpConfig* conf;
 	int used_pt=-1;
@@ -2100,7 +2142,6 @@ static void linphone_call_start_audio_stream(LinphoneCall *call, const char *cna
 				}
 			}
 			configure_rtp_session_for_rtcp_xr(lc, call, SalAudio);
-			audio_stream_set_rtcp_information(call->audiostream, cname, rtcp_tool);
 			audio_stream_start_full(
 				call->audiostream,
 				call->audio_profile,
@@ -2136,16 +2177,14 @@ static void linphone_call_start_audio_stream(LinphoneCall *call, const char *cna
 	}
 }
 
-static void linphone_call_start_video_stream(LinphoneCall *call, const char *cname,bool_t all_inputs_muted){
+static void linphone_call_start_video_stream(LinphoneCall *call, bool_t all_inputs_muted){
 #ifdef VIDEO_ENABLED
 	LinphoneCore *lc=call->core;
 	int used_pt=-1;
-	char rtcp_tool[128]={0};
 	const SalStreamDescription *vstream;
 	MSFilter* source = NULL;
 	bool_t reused_preview = FALSE;
 
-	snprintf(rtcp_tool,sizeof(rtcp_tool)-1,"%s-%s",linphone_core_get_user_agent_name(),linphone_core_get_user_agent_version());
 
 	/* shutdown preview */
 	if (lc->previewstream!=NULL) {
@@ -2225,7 +2264,6 @@ static void linphone_call_start_video_stream(LinphoneCall *call, const char *cna
 				video_stream_set_direction (call->videostream, dir);
 				ms_message("%s lc rotation:%d\n", __FUNCTION__, lc->device_rotation);
 				video_stream_set_device_rotation(call->videostream, lc->device_rotation);
-				video_stream_set_rtcp_information(call->videostream, cname, rtcp_tool);
 				video_stream_set_freeze_on_error(call->videostream, lp_config_get_int(lc->config, "video", "freeze_on_error", 0));
 				if( lc->video_conf.reuse_preview_source && source ){
 					ms_message("video_stream_start_with_source kept: %p", source);
@@ -2257,8 +2295,6 @@ static void linphone_call_start_video_stream(LinphoneCall *call, const char *cna
 
 void linphone_call_start_media_streams(LinphoneCall *call, bool_t all_inputs_muted, bool_t send_ringbacktone){
 	LinphoneCore *lc=call->core;
-	LinphoneAddress *me=linphone_core_get_primary_contact_parsed(lc);
-	char *cname;
 	bool_t use_arc=linphone_core_adaptive_rate_control_enabled(lc);
 #ifdef VIDEO_ENABLED
 	const SalStreamDescription *vstream=sal_media_description_find_best_stream(call->resultdesc,SalVideo);
@@ -2271,8 +2307,6 @@ void linphone_call_start_media_streams(LinphoneCall *call, bool_t all_inputs_mut
 		ms_fatal("start_media_stream() called without prior init !");
 		return;
 	}
-	cname=linphone_address_as_string_uri_only(me);
-
 #if defined(VIDEO_ENABLED)
 	if (vstream!=NULL && vstream->dir!=SalStreamInactive && vstream->payloads!=NULL){
 		/*when video is used, do not make adaptive rate control on audio, it is stupid.*/
@@ -2283,12 +2317,12 @@ void linphone_call_start_media_streams(LinphoneCall *call, bool_t all_inputs_mut
 		   call, linphone_core_get_upload_bandwidth(lc),linphone_core_get_download_bandwidth(lc));
 
 	if (call->audiostream!=NULL) {
-		linphone_call_start_audio_stream(call,cname,all_inputs_muted||call->audio_muted,send_ringbacktone,use_arc);
+		linphone_call_start_audio_stream(call,all_inputs_muted||call->audio_muted,send_ringbacktone,use_arc);
 	}
 	call->current_params->has_video=FALSE;
 	if (call->videostream!=NULL) {
 		if (call->audiostream) audio_stream_link_video(call->audiostream,call->videostream);
-		linphone_call_start_video_stream(call,cname,all_inputs_muted);
+		linphone_call_start_video_stream(call,all_inputs_muted);
 	}
 
 	call->all_muted=all_inputs_muted;
@@ -2340,10 +2374,6 @@ void linphone_call_start_media_streams(LinphoneCall *call, bool_t all_inputs_mut
 		ice_session_start_connectivity_checks(call->ice_session);
 	}
 
-	goto end;
-	end:
-		ms_free(cname);
-		linphone_address_destroy(me);
 }
 
 void linphone_call_stop_media_streams_for_ice_gathering(LinphoneCall *call){
diff --git a/coreapi/offeranswer.c b/coreapi/offeranswer.c
index 9f2ce5f6b..755c6bcd7 100644
--- a/coreapi/offeranswer.c
+++ b/coreapi/offeranswer.c
@@ -247,6 +247,9 @@ static void initiate_outgoing(const SalStreamDescription *local_offer,
 		if (!match_crypto_algo(local_offer->crypto, remote_answer->crypto, &result->crypto[0], &result->crypto_local_tag, FALSE))
 			result->rtp_port = 0;
 	}
+	result->rtp_ssrc=local_offer->rtp_ssrc;
+	strncpy(result->rtcp_cname,local_offer->rtcp_cname,sizeof(result->rtcp_cname));
+
 }
 
 
@@ -281,6 +284,9 @@ static void initiate_incoming(const SalStreamDescription *local_cap,
 	memcpy(result->ice_candidates, local_cap->ice_candidates, sizeof(result->ice_candidates));
 	memcpy(result->ice_remote_candidates, local_cap->ice_remote_candidates, sizeof(result->ice_remote_candidates));
 	strcpy(result->name,local_cap->name);
+	result->rtp_ssrc=local_cap->rtp_ssrc;
+	strncpy(result->rtcp_cname,local_cap->rtcp_cname,sizeof(result->rtcp_cname));
+
 }
 
 /**
diff --git a/coreapi/private.h b/coreapi/private.h
index 62a31fc74..0b929929f 100644
--- a/coreapi/private.h
+++ b/coreapi/private.h
@@ -213,6 +213,7 @@ struct _LinphoneCall{
 	struct _RtpProfile *audio_profile;
 	struct _RtpProfile *video_profile;
 	struct _LinphoneCallLog *log;
+	LinphoneAddress *me; /*Either from or to based on call dir*/
 	SalOp *op;
 	SalOp *ping_op;
 	char localip[LINPHONE_IPADDR_SIZE]; /* our best guess for local ipaddress for this call */
diff --git a/include/sal/sal.h b/include/sal/sal.h
index 43284179e..b7238b9b4 100644
--- a/include/sal/sal.h
+++ b/include/sal/sal.h
@@ -202,6 +202,8 @@ typedef struct SalStreamDescription{
 	char proto_other[32];
 	char rtp_addr[64];
 	char rtcp_addr[64];
+	unsigned int rtp_ssrc;
+	char rtcp_cname[255];
 	int rtp_port;
 	int rtcp_port;
 	MSList *payloads; //<list of PayloadType

From 697a6d4a89c22241a19d23359ac6ac786d7caeb9 Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Mon, 15 Dec 2014 14:49:42 +0100
Subject: [PATCH 176/496] Fix the soundcard hint so that it trigger only when
 _all_ calls are paused or pausing (instead of just one call suffice). Also
 increase the test delay.

---
 coreapi/linphonecore.c | 8 ++++----
 tester/call_tester.c   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 694ad2695..9798e4636 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -6438,20 +6438,20 @@ static void notify_soundcard_usage(LinphoneCore *lc, bool_t used){
 void linphone_core_soundcard_hint_check( LinphoneCore* lc){
 	MSList* the_calls = lc->calls;
 	LinphoneCall* call = NULL;
-	bool_t remaining_paused = FALSE;
+	bool_t dont_need_sound = TRUE;
 
 	/* check if the remaining calls are paused */
 	while( the_calls ){
 		call = the_calls->data;
-		if( call->state == LinphoneCallPausing || call->state == LinphoneCallPaused ){
-			remaining_paused = TRUE;
+		if( call->state != LinphoneCallPausing && call->state != LinphoneCallPaused ){
+			dont_need_sound = FALSE;
 			break;
 		}
 		the_calls = the_calls->next;
 	}
 
 	/* if no more calls or all calls are paused, we can free the soundcard */
-	if ( (lc->calls==NULL || remaining_paused) && !lc->use_files){
+	if ( (lc->calls==NULL || dont_need_sound) && !lc->use_files){
 		ms_message("Notifying soundcard that we don't need it anymore for calls.");
 		notify_soundcard_usage(lc,FALSE);
 	}
diff --git a/tester/call_tester.c b/tester/call_tester.c
index df3b8636b..426282097 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -2581,8 +2581,8 @@ static void call_transfer_existing_call_outgoing_call(void) {
 	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallRefered,1,2000));
 
 	/*pauline pausing marie*/
-	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallPausing,1,2000));
-	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallPaused,1,2000));
+	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallPausing,1,4000));
+	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallPaused,1,4000));
 	/*pauline calling laure*/
 	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallOutgoingProgress,1,2000));
 	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneTransferCallOutgoingInit,1,2000));

From 42ddf0cf814494e5dda5b236c84a01dd77f7564d Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Mon, 15 Dec 2014 15:54:59 +0100
Subject: [PATCH 177/496] Improve Python module documentation.

---
 tools/python/apixml2python.py                 | 14 ++---
 tools/python/apixml2python/linphone.py        | 54 ++++++++++++++----
 .../apixml2python/linphone_module.mustache    | 17 ++++--
 tools/python/doc/Makefile                     |  6 +-
 tools/python/doc/generate_enums.py            | 28 ++++++++++
 tools/python/doc/source/_static/pylinphone.js | 52 +++++++++++++++++
 tools/python/doc/source/api_reference.rst     | 24 ++++++++
 tools/python/doc/source/conf.py               |  6 +-
 tools/python/doc/source/getting_started.rst   | 44 +++++++++++++++
 tools/python/doc/source/index.rst             | 56 +------------------
 10 files changed, 224 insertions(+), 77 deletions(-)
 create mode 100644 tools/python/doc/generate_enums.py
 create mode 100644 tools/python/doc/source/_static/pylinphone.js
 create mode 100644 tools/python/doc/source/api_reference.rst
 create mode 100644 tools/python/doc/source/getting_started.rst

diff --git a/tools/python/apixml2python.py b/tools/python/apixml2python.py
index d6746ad08..2c32a24f6 100755
--- a/tools/python/apixml2python.py
+++ b/tools/python/apixml2python.py
@@ -71,13 +71,13 @@ blacklisted_functions = [
 	'lp_config_section_to_dict'	# missing LinphoneDictionary
 ]
 hand_written_functions = [
-	HandWrittenClassMethod('Buffer', 'new_from_data', 'linphone_buffer_new_from_data'),
-	HandWrittenProperty('Buffer', 'content', 'linphone_buffer_get_content', 'linphone_buffer_set_content'),
-	HandWrittenProperty('Content', 'buffer', 'linphone_content_get_buffer', 'linphone_content_set_buffer'),
-	HandWrittenProperty('Core', 'sound_devices', 'linphone_core_get_sound_devices', None),
-	HandWrittenProperty('Core', 'video_devices', 'linphone_core_get_video_devices', None),
-	HandWrittenClassMethod('Core', 'new', 'linphone_core_new'),
-	HandWrittenClassMethod('Core', 'new_with_config', 'linphone_core_new_with_config')
+	HandWrittenClassMethod('Buffer', 'new_from_data', 'linphone_buffer_new_from_data', "Create a new LinphoneBuffer object from existing data.\n\n:param data: The initial data to store in the LinphoneBuffer.\n:type data: ByteArray\n:returns: A new LinphoneBuffer object.\n:rtype: linphone.Buffer"),
+	HandWrittenProperty('Buffer', 'content', 'linphone_buffer_get_content', 'linphone_buffer_set_content', "[ByteArray] Set the content of the data buffer."),
+	HandWrittenProperty('Content', 'buffer', 'linphone_content_get_buffer', 'linphone_content_set_buffer', "[ByteArray] Set the content data buffer."),
+	HandWrittenProperty('Core', 'sound_devices', 'linphone_core_get_sound_devices', None, "[list of string] Get the available sound devices."),
+	HandWrittenProperty('Core', 'video_devices', 'linphone_core_get_video_devices', None, "[list of string] Get the available video capture devices."),
+	HandWrittenClassMethod('Core', 'new', 'linphone_core_new', "Instantiate a LinphoneCore object.\n\n:param vtable: The callbacks.\n:type vtable: dictionary\n:param configPath: A path to a config file. If it does not exists it will be created. The config file is used to store all settings, call logs, friends, proxies... so that all these settings become persistent over the life of the LinphoneCore object. It is allowed to set to None. In that case LinphoneCore will not store any settings.\n:type configPath: string\n:param factoryConfigPath: A path to a read-only config file that can be used to store hard-coded preference such as proxy settings or internal preferences. The settings in this factory file always override the one in the normal config file. It is OPTIONAL, use None if unneeded.\n:type factoryConfigPath: string\n:rtype: linphone.Core"),
+	HandWrittenClassMethod('Core', 'new_with_config', 'linphone_core_new_with_config', "Instantiate a LinphoneCore object from a LpConfig.\n\n:param vtable: The callbacks.\n:type vtable: dictionary\n:param config: A LpConfig object holding the configuration of the LinphoneCore to be instantiated.\n:rtype: linphone.Core")
 ]
 
 def generate(apixmlfile, outputfile):
diff --git a/tools/python/apixml2python/linphone.py b/tools/python/apixml2python/linphone.py
index ce333a475..c1d37858d 100644
--- a/tools/python/apixml2python/linphone.py
+++ b/tools/python/apixml2python/linphone.py
@@ -15,6 +15,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 
+import re
 from sets import Set
 import sys
 
@@ -25,6 +26,18 @@ def strip_leading_linphone(s):
 	else:
 		return s
 
+def remove_useless_enum_prefix(senum, svalue):
+	lenum = re.findall('[A-Z][^A-Z]*', senum)
+	lvalue = re.findall('[A-Z][^A-Z]*', svalue)
+	if len(lenum) == 0 or len(lvalue) == 0:
+		return svalue
+	if lenum[0] == lvalue[0]:
+		i = 0
+		while i < len(lenum) and lenum[i] == lvalue[i]:
+			i += 1
+		return ''.join(lvalue[i:])
+	return svalue
+
 def is_callback(s):
 	return s.startswith('Linphone') and s.endswith('Cb')
 
@@ -42,27 +55,28 @@ def compute_event_name(s, className):
 
 
 class HandWrittenCode:
-	def __init__(self, _class, name, func_list):
+	def __init__(self, _class, name, func_list, doc = ''):
 		self._class = _class
 		self.name = name
 		self.func_list = func_list
+		self.doc = doc
 
 class HandWrittenInstanceMethod(HandWrittenCode):
-	def __init__(self, _class, name, cfunction):
-		HandWrittenCode.__init__(self, _class, name, [cfunction])
+	def __init__(self, _class, name, cfunction, doc = ''):
+		HandWrittenCode.__init__(self, _class, name, [cfunction], doc)
 
 class HandWrittenClassMethod(HandWrittenCode):
-	def __init__(self, _class, name, cfunction):
-		HandWrittenCode.__init__(self, _class, name, [cfunction])
+	def __init__(self, _class, name, cfunction, doc = ''):
+		HandWrittenCode.__init__(self, _class, name, [cfunction], doc)
 
 class HandWrittenProperty(HandWrittenCode):
-	def __init__(self, _class, name, getter_cfunction = None, setter_cfunction = None):
+	def __init__(self, _class, name, getter_cfunction = None, setter_cfunction = None, doc = ''):
 		func_list = []
 		if getter_cfunction is not None:
 			func_list.append(getter_cfunction)
 		if setter_cfunction is not None:
 			func_list.append(setter_cfunction)
-		HandWrittenCode.__init__(self, _class, name, func_list)
+		HandWrittenCode.__init__(self, _class, name, func_list, doc)
 		self.getter_cfunction = getter_cfunction
 		self.setter_cfunction = setter_cfunction
 
@@ -947,18 +961,35 @@ class LinphoneModule(object):
 			e = {}
 			e['enum_name'] = strip_leading_linphone(xml_enum.get('name'))
 			e['enum_doc'] = self.__format_doc_content(xml_enum.find('briefdescription'), xml_enum.find('detaileddescription'))
-			e['enum_doc'] += "\n\nValues:\n"
+			e['enum_doc'] = self.__replace_doc_special_chars(e['enum_doc'])
+			e['enum_doc'] += """
+
+.. csv-table::
+   :delim: |
+   :widths: 30, 70
+   :header: Value,Description
+
+"""
 			e['enum_values'] = []
+			e['enum_deprecated_values'] = []
 			xml_enum_values = xml_enum.findall("./values/value")
 			for xml_enum_value in xml_enum_values:
 				if xml_enum_value.get('deprecated') == 'true':
 					continue
 				v = {}
 				v['enum_value_cname'] = xml_enum_value.get('name')
-				v['enum_value_name'] = strip_leading_linphone(v['enum_value_cname'])
+				valname = strip_leading_linphone(v['enum_value_cname'])
+				v['enum_value_name'] = remove_useless_enum_prefix(e['enum_name'], valname)
 				v['enum_value_doc'] = self.__format_doc(xml_enum_value.find('briefdescription'), xml_enum_value.find('detaileddescription'))
-				e['enum_doc'] += '\t' + v['enum_value_name'] + ': ' + v['enum_value_doc'] + '\n'
+				e['enum_doc'] += '   ' + v['enum_value_name'] + '|' + v['enum_value_doc'] + '\n'
 				e['enum_values'].append(v)
+				if v['enum_value_name'] != valname:
+					# TODO: To remove. Add deprecated value name.
+					v = {}
+					v['enum_value_cname'] = xml_enum_value.get('name')
+					v['enum_value_name'] = strip_leading_linphone(v['enum_value_cname'])
+					v['enum_value_doc'] = self.__format_doc(xml_enum_value.find('briefdescription'), xml_enum_value.find('detaileddescription'))
+					e['enum_deprecated_values'].append(v)
 			e['enum_doc'] = self.__replace_doc_special_chars(e['enum_doc'])
 			self.enums.append(e)
 			self.enum_names.append(e['enum_name'])
@@ -1012,10 +1043,12 @@ class LinphoneModule(object):
 					if isinstance(hand_written_code, HandWrittenClassMethod):
 						m = {}
 						m['method_name'] = hand_written_code.name
+						m['method_doc'] = self.__replace_doc_special_chars(hand_written_code.doc)
 						c['class_type_hand_written_methods'].append(m)
 					elif isinstance(hand_written_code, HandWrittenInstanceMethod):
 						m = {}
 						m['method_name'] = hand_written_code.name
+						m['method_doc'] = self.__replace_doc_special_chars(hand_written_code.doc)
 						c['class_instance_hand_written_methods'].append(m)
 					elif isinstance(hand_written_code, HandWrittenProperty):
 						p = {}
@@ -1028,6 +1061,7 @@ class LinphoneModule(object):
 							p['setter_reference'] = 'NULL'
 						else:
 							p['setter_reference'] = '(setter)pylinphone_' + c['class_name'] + '_set_' + p['property_name']
+						p['property_doc'] = self.__replace_doc_special_chars(hand_written_code.doc)
 						c['class_hand_written_properties'].append(p)
 			xml_type_methods = xml_class.findall("./classmethods/classmethod")
 			for xml_type_method in xml_type_methods:
diff --git a/tools/python/apixml2python/linphone_module.mustache b/tools/python/apixml2python/linphone_module.mustache
index e31451cfa..13e0c1c6b 100644
--- a/tools/python/apixml2python/linphone_module.mustache
+++ b/tools/python/apixml2python/linphone_module.mustache
@@ -148,14 +148,14 @@ static PyObject * pylinphone_{{class_name}}_instance_method_{{method_name}}(PyOb
 static PyMethodDef pylinphone_{{class_name}}_methods[] = {
 	/* Class methods */
 {{#class_type_hand_written_methods}}
-	{ "{{method_name}}", pylinphone_{{class_name}}_class_method_{{method_name}}, METH_VARARGS | METH_CLASS, "" },
+	{ "{{method_name}}", pylinphone_{{class_name}}_class_method_{{method_name}}, METH_VARARGS | METH_CLASS, "{{{method_doc}}}" },
 {{/class_type_hand_written_methods}}
 {{#class_type_methods}}
 	{ "{{method_name}}", pylinphone_{{class_name}}_class_method_{{method_name}}, METH_VARARGS | METH_CLASS, "{{{method_doc}}}" },
 {{/class_type_methods}}
 	/* Instance methods */
 {{#class_instance_hand_written_methods}}
-	{ "{{method_name}}", pylinphone_{{class_name}}_instance_method_{{method_name}}, METH_VARARGS, "" },
+	{ "{{method_name}}", pylinphone_{{class_name}}_instance_method_{{method_name}}, METH_VARARGS, "{{{method_doc}}}" },
 {{/class_instance_hand_written_methods}}
 {{#class_instance_methods}}
 	{ "{{method_name}}", pylinphone_{{class_name}}_instance_method_{{method_name}}, METH_VARARGS, "{{{method_doc}}}" },
@@ -183,7 +183,7 @@ static PyMemberDef pylinphone_{{class_name}}_members[] = {
 
 static PyGetSetDef pylinphone_{{class_name}}_getseters[] = {
 {{#class_hand_written_properties}}
-	{ "{{property_name}}", {{getter_reference}}, {{setter_reference}}, "" },
+	{ "{{property_name}}", {{getter_reference}}, {{setter_reference}}, "{{{property_doc}}}" },
 {{/class_hand_written_properties}}
 {{#class_properties}}
 	{ "{{property_name}}", {{getter_reference}}, {{setter_reference}}, "{{{property_doc}}}" },
@@ -308,12 +308,21 @@ PyMODINIT_FUNC initlinphone(void) {
 {{#enum_values}}
 	if (PyModule_AddIntConstant(menum, "{{enum_value_name}}", {{enum_value_cname}}) < 0) return;
 {{/enum_values}}
+{{#enum_deprecated_values}}
+	if (PyModule_AddIntConstant(menum, "{{enum_value_name}}", {{enum_value_cname}}) < 0) return;
+{{/enum_deprecated_values}}
 {{/enums}}
 
-	menum = Py_InitModule3("PayloadTypeType", pylinphone_PayloadTypeType_ModuleMethods, "Type of linphone.PayloadType.");
+	menum = Py_InitModule3("PayloadTypeType", pylinphone_PayloadTypeType_ModuleMethods, "Type of linphone.PayloadType.\n\n.. csv-table::\n   :delim: |\n   :header: Value,Description\n\n   AudioContinuous|\n   AudioPacketized|\n   Video|\n   Text|\n   Other|\n");
 	if (menum == NULL) return;
 	Py_INCREF(menum);
 	if (PyModule_AddObject(m, "PayloadTypeType", menum) < 0) return;
+	if (PyModule_AddIntConstant(menum, "AudioContinuous", PAYLOAD_AUDIO_CONTINUOUS) < 0) return;
+	if (PyModule_AddIntConstant(menum, "AudioPacketized", PAYLOAD_AUDIO_PACKETIZED) < 0) return;
+	if (PyModule_AddIntConstant(menum, "Video", PAYLOAD_VIDEO) < 0) return;
+	if (PyModule_AddIntConstant(menum, "Text", PAYLOAD_TEXT) < 0) return;
+	if (PyModule_AddIntConstant(menum, "Other", PAYLOAD_OTHER) < 0) return;
+	// TODO: To remove. Deprecated enum values.
 	if (PyModule_AddIntConstant(menum, "PAYLOAD_AUDIO_CONTINUOUS", PAYLOAD_AUDIO_CONTINUOUS) < 0) return;
 	if (PyModule_AddIntConstant(menum, "PAYLOAD_AUDIO_PACKETIZED", PAYLOAD_AUDIO_PACKETIZED) < 0) return;
 	if (PyModule_AddIntConstant(menum, "PAYLOAD_VIDEO", PAYLOAD_VIDEO) < 0) return;
diff --git a/tools/python/doc/Makefile b/tools/python/doc/Makefile
index b8c40c718..158616058 100644
--- a/tools/python/doc/Makefile
+++ b/tools/python/doc/Makefile
@@ -48,8 +48,12 @@ help:
 
 clean:
 	rm -rf $(BUILDDIR)/*
+	rm -f source/enums.rst
 
-html:
+source/enums.rst:
+	python generate_enums.py -o source/enums.rst
+
+html: source/enums.rst
 	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
diff --git a/tools/python/doc/generate_enums.py b/tools/python/doc/generate_enums.py
new file mode 100644
index 000000000..2f24a7a93
--- /dev/null
+++ b/tools/python/doc/generate_enums.py
@@ -0,0 +1,28 @@
+#!/usr/bin/python
+
+import argparse
+import types
+import sys
+
+def main(argv = None):
+    if argv is None:
+        argv = sys.argv
+    argparser = argparse.ArgumentParser(description="Generate enums documentation of the Linphone API.")
+    argparser.add_argument('-o', '--outputfile', metavar='outputfile', type=argparse.FileType('w'), help="Output .rst file describing the Linphone API enums.")
+    args = argparser.parse_args()
+    if args.outputfile == None:
+        args.outputfile = open('enums.rst', 'w')
+
+    module = __import__('linphone', globals(), locals())
+
+    for name in dir(module):
+        if name == 'testing' or name == 'linphone':
+            continue
+        if type(getattr(module, name)) == types.ModuleType:
+            args.outputfile.write('linphone.' + name + '\n')
+            args.outputfile.write('^' * len('linphone.' + name) + '\n\n')
+            args.outputfile.write(getattr(module, name).__doc__)
+            args.outputfile.write('\n')
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/tools/python/doc/source/_static/pylinphone.js b/tools/python/doc/source/_static/pylinphone.js
new file mode 100644
index 000000000..b0b7617a0
--- /dev/null
+++ b/tools/python/doc/source/_static/pylinphone.js
@@ -0,0 +1,52 @@
+$(function (){
+var createList = function(selector){
+
+    var ul = $('<ul>');
+    var selected = $(selector);
+
+    if (selected.length === 0){
+        return;
+    }
+
+    selected.clone().each(function (i,e){
+
+        var p = $(e).children('.descclassname');
+        var n = $(e).children('.descname');
+        var l = $(e).children('.headerlink');
+
+        var a = $('<a>');
+        a.attr('href',l.attr('href')).attr('title', 'Link to this definition');
+
+        a.append(p).append(n);
+
+        var entry = $('<li>').append(a);
+        ul.append(entry);
+    });
+    return ul;
+}
+
+
+var c = $('<div style="min-width: 300px;">');
+
+var ul0 = c.clone().append($('.submodule-index'))
+
+customIndex = $('.custom-index');
+customIndex.empty();
+customIndex.append(ul0);
+
+var x = [];
+x.push(['Classes','dl.class > dt']);
+x.push(['Functions','dl.function > dt']);
+x.push(['Variables','dl.data > dt']);
+
+x.forEach(function (e){
+    var l = createList(e[1]);
+    if (l) {        
+        var ul = c.clone()
+            .append('<p class="rubric">'+e[0]+'</p>')
+            .append(l);
+    }
+    customIndex.append(ul);
+});
+
+});
\ No newline at end of file
diff --git a/tools/python/doc/source/api_reference.rst b/tools/python/doc/source/api_reference.rst
new file mode 100644
index 000000000..d08c68d77
--- /dev/null
+++ b/tools/python/doc/source/api_reference.rst
@@ -0,0 +1,24 @@
+API reference
+=============
+
+Enums
+-----
+
+.. include:: enums.rst
+
+Classes
+-------
+
+.. container:: custom-index
+
+   .. raw:: html
+
+      <script type="text/javascript" src='_static/pylinphone.js'></script>
+
+.. currentmodule:: linphone
+
+.. automodule:: linphone
+   :members:
+   :undoc-members:
+
+.. autoattribute:: linphone.__version__
diff --git a/tools/python/doc/source/conf.py b/tools/python/doc/source/conf.py
index 125e5c6d9..8dfeec972 100644
--- a/tools/python/doc/source/conf.py
+++ b/tools/python/doc/source/conf.py
@@ -29,7 +29,7 @@ import os
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
 extensions = [
-    'sphinx.ext.autodoc',
+    'sphinx.ext.autodoc'
 ]
 
 # Add any paths that contain templates here, relative to this directory.
@@ -145,7 +145,9 @@ html_static_path = ['_static']
 #html_use_smartypants = True
 
 # Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
+html_sidebars = {
+  '**': ['localtoc.html', 'relations.html', 'searchbox.html']
+}
 
 # Additional templates that should be rendered to pages, maps page names to
 # template names.
diff --git a/tools/python/doc/source/getting_started.rst b/tools/python/doc/source/getting_started.rst
new file mode 100644
index 000000000..f0b830c59
--- /dev/null
+++ b/tools/python/doc/source/getting_started.rst
@@ -0,0 +1,44 @@
+Getting started
+===============
+
+Installing the Python module
+----------------------------
+
+You can install prebuilt packages of Linphone for Python. You will find the
+releases at https://pypi.python.org/pypi/linphone. This includes only packages
+for the Windows platform right now. The easiest way to install is to use pip,
+eg.:
+
+.. code-block:: none
+
+   > pip install linphone --pre
+
+You can also find nightly-built packages for Windows, Mac OS X and Linux at
+https://www.linphone.org/snapshots/linphone-python/.
+
+Otherwise you can compile the Python module. To do so get the build system code
+using the command:
+
+.. code-block:: none
+
+   > git clone git://git.linphone.org/linphone-cmake-builder.git
+
+Then follow the instructions in the *README.python* file.
+
+Running some code
+-----------------
+
+Here is a sample source code using PyQt4 that enables you to register on a SIP
+server in just a few lines of code. This is a very basic example, but it shows
+how to create a linphone.Core object that is the main object of Linphone. From
+there, you can use the API reference below to use more advanced feature and
+perform some SIP calls, use text messaging and more...
+
+.. literalinclude:: pyqt_linphone_example.py
+
+In the Linphone Python module package you installed previously you will also
+find some unit tests that you can run. These unit tests will be located in the
+*site-packages/linphone/unittests/* directory of Python installation where you
+installed the Linphone Python module package. To run these unit tests, follow
+the instructions contained in the README.txt file of this *unittests/*
+directory.
diff --git a/tools/python/doc/source/index.rst b/tools/python/doc/source/index.rst
index f1c615162..a77d768f0 100644
--- a/tools/python/doc/source/index.rst
+++ b/tools/python/doc/source/index.rst
@@ -6,62 +6,12 @@
 Linphone for Python documentation
 =================================
 
-Getting started
----------------
-
-Installing the Python module
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-You can install prebuilt packages of Linphone for Python. You will find the
-releases at https://pypi.python.org/pypi/linphone. This includes only packages
-for the Windows platform right now. The easiest way to install is to use pip,
-eg.:
-
-.. code-block:: none
-
-   > pip install linphone --pre
-
-You can also find nightly-built packages for Windows, Mac OS X and Linux at
-https://www.linphone.org/snapshots/linphone-python/.
-
-Otherwise you can compile the Python module. To do so get the build system code
-using the command:
-
-.. code-block:: none
-
-   > git clone git://git.linphone.org/linphone-cmake-builder.git
-
-Then follow the instructions in the *README.python* file.
-
-Running some code
-^^^^^^^^^^^^^^^^^
-
-Here is a sample source code using PyQt4 that enables you to register on a SIP
-server in just a few lines of code. This is a very basic example, but it shows
-how to create a linphone.Core object that is the main object of Linphone. From
-there, you can use the API reference below to use more advanced feature and
-perform some SIP calls, use text messaging and more...
-
-.. literalinclude:: pyqt_linphone_example.py
-
-In the Linphone Python module package you installed previously you will also
-find some unit tests that you can run. These unit tests will be located in the
-*site-packages/linphone/unittests/* directory of Python installation where you
-installed the Linphone Python module package. To run these unit tests, follow
-the instructions contained in the README.txt file of this *unittests/*
-directory.
-
-API reference
--------------
-
 .. toctree::
    :maxdepth: 2
+   :numbered:
 
-.. automodule:: linphone
-   :members:
-   :undoc-members:
-
-.. autoattribute:: linphone.__version__
+   getting_started
+   api_reference
 
 
 Indices and tables

From da9cffd5fed25e2695308d5197ad0eeefec88407 Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Mon, 15 Dec 2014 15:55:39 +0100
Subject: [PATCH 178/496] Use ms_time() instead of time()

---
 tester/call_tester.c     | 10 +++++-----
 tester/presence_tester.c |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tester/call_tester.c b/tester/call_tester.c
index 426282097..3f317a338 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -2269,8 +2269,8 @@ static void early_media_call_with_ringing(void){
 	MSList* lcs = NULL;
 	LinphoneCall* marie_call;
 	LinphoneCallLog *marie_call_log;
-	time_t connected_time=0;
-	time_t ended_time=0;
+	uint64_t connected_time=0;
+	uint64_t ended_time=0;
 	int dummy=0;
 
 	lcs = ms_list_append(lcs,marie->lc);
@@ -2299,7 +2299,7 @@ static void early_media_call_with_ringing(void){
 		linphone_core_accept_call(pauline->lc, linphone_core_get_current_call(pauline->lc));
 
 		CU_ASSERT_TRUE(wait_for_list(lcs, &marie->stat.number_of_LinphoneCallConnected, 1,1000));
-		connected_time=time(NULL);
+		connected_time=ms_get_cur_time_ms();
 		CU_ASSERT_TRUE(wait_for_list(lcs, &marie->stat.number_of_LinphoneCallStreamsRunning, 1,1000));
 
 		CU_ASSERT_EQUAL(marie_call, linphone_core_get_current_call(marie->lc));
@@ -2312,8 +2312,8 @@ static void early_media_call_with_ringing(void){
 
 		CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallEnd,1,1000));
 		CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallEnd,1,1000));
-		ended_time=time(NULL);
-		CU_ASSERT_TRUE (labs (linphone_call_log_get_duration(marie_call_log) - (ended_time - connected_time)) <1 );
+		ended_time=ms_get_cur_time_ms();
+		CU_ASSERT_TRUE( labs((linphone_call_log_get_duration(marie_call_log)*1000) - (ended_time - connected_time)) <=1000 );
 		ms_list_free(lcs);
 	}
 
diff --git a/tester/presence_tester.c b/tester/presence_tester.c
index ca3c8c18e..ed39d1b74 100644
--- a/tester/presence_tester.c
+++ b/tester/presence_tester.c
@@ -336,7 +336,7 @@ static void presence_information(void) {
 	}
 
 	/* Presence timestamp. */
-	current_timestamp = time(NULL);
+	current_timestamp = ms_time(NULL);
 	presence = linphone_presence_model_new_with_activity(LinphonePresenceActivityShopping, NULL);
 	linphone_core_set_presence_model(pauline->lc, presence);
 	wait_for(marie->lc,pauline->lc,&marie->stat.number_of_LinphonePresenceActivityShopping,1);

From bb6123477bbfb008782ae0938acb8512e491a42b Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Mon, 15 Dec 2014 15:55:50 +0100
Subject: [PATCH 179/496] Allow for longer timeout in register

---
 tester/tester.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/tester/tester.c b/tester/tester.c
index 8b73026b4..6cc636546 100644
--- a/tester/tester.c
+++ b/tester/tester.c
@@ -279,8 +279,14 @@ LinphoneCoreManager* linphone_core_manager_new2(const char* rc_file, int check_f
 		linphone_core_set_play_file(mgr->lc,hellopath);
 	}
 
-	if (proxy_count)
-		wait_for_until(mgr->lc,NULL,&mgr->stat.number_of_LinphoneRegistrationOk,proxy_count,5000*proxy_count);
+	if (proxy_count){
+#define REGISTER_TIMEOUT 20 /* seconds */
+		int success = wait_for_until(mgr->lc,NULL,&mgr->stat.number_of_LinphoneRegistrationOk,
+									proxy_count,(REGISTER_TIMEOUT * 1000 * proxy_count);
+		if( !success ){
+			ms_error("Did not register after %d seconds for %d proxies", REGISTER_TIMEOUT, proxy_count);
+		}
+	}
 	CU_ASSERT_EQUAL(mgr->stat.number_of_LinphoneRegistrationOk,proxy_count);
 	enable_codec(mgr->lc,"PCMU",8000);
 

From 8d13609402005159f229fc6f34a57a8cfcf74fd8 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Mon, 15 Dec 2014 16:02:27 +0100
Subject: [PATCH 180/496] various ice fix for better interwork

---
 coreapi/bellesip_sal/sal_sdp.c | 2 +-
 coreapi/linphonecall.c         | 3 ++-
 mediastreamer2                 | 2 +-
 oRTP                           | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/coreapi/bellesip_sal/sal_sdp.c b/coreapi/bellesip_sal/sal_sdp.c
index 67a583a31..6023ef7e4 100644
--- a/coreapi/bellesip_sal/sal_sdp.c
+++ b/coreapi/bellesip_sal/sal_sdp.c
@@ -253,7 +253,7 @@ static void stream_description_to_sdp ( belle_sdp_session_description_t *session
 			belle_sdp_media_description_add_attribute(media_desc, belle_sdp_attribute_create("fingerprint",stream->dtls_fingerprint));
 		}
 
-		belle_sdp_media_description_add_attribute(media_desc, belle_sdp_attribute_create("ssrc",ssrc_attribute));
+		/*belle_sdp_media_description_add_attribute(media_desc, belle_sdp_attribute_create("ssrc",ssrc_attribute));*/
 		ms_free(ssrc_attribute);
 
 	}
diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index 964f6e30f..131a3a933 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -854,6 +854,7 @@ LinphoneCall * linphone_call_new_incoming(LinphoneCore *lc, LinphoneAddress *fro
 	 else
 		 call->me=linphone_call_log_get_from_address(call->log);
 
+	linphone_address_ref(call->me);
 
 	/*reserve the sockets immediately*/
 	linphone_call_init_media_streams(call);
@@ -1140,7 +1141,7 @@ static void linphone_call_destroy(LinphoneCall *obj){
 		obj->remote_params=NULL;
 	}
 	if (obj->me) {
-		linphone_address_destroy(obj->me);
+		linphone_address_unref(obj->me);
 		obj->me = NULL;
 	}
 
diff --git a/mediastreamer2 b/mediastreamer2
index d7e7fb21f..d2d7291eb 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit d7e7fb21f2c45e32e641ca4349ca5f1242ee4fe8
+Subproject commit d2d7291eb0dece51a68dfd2b8d005618e945c73b
diff --git a/oRTP b/oRTP
index 2c94d5783..f4d6250a9 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 2c94d5783a48efda91191c922e077560f3df5876
+Subproject commit f4d6250a9de606025669f6caa6819c7d8d0cd77d

From 5128769b005d1613a23ea7a87072ac45de0e2d6e Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Mon, 15 Dec 2014 16:02:58 +0100
Subject: [PATCH 181/496] Typo

---
 tester/tester.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tester/tester.c b/tester/tester.c
index 6cc636546..8c09b90f1 100644
--- a/tester/tester.c
+++ b/tester/tester.c
@@ -282,7 +282,7 @@ LinphoneCoreManager* linphone_core_manager_new2(const char* rc_file, int check_f
 	if (proxy_count){
 #define REGISTER_TIMEOUT 20 /* seconds */
 		int success = wait_for_until(mgr->lc,NULL,&mgr->stat.number_of_LinphoneRegistrationOk,
-									proxy_count,(REGISTER_TIMEOUT * 1000 * proxy_count);
+									proxy_count,(REGISTER_TIMEOUT * 1000 * proxy_count));
 		if( !success ){
 			ms_error("Did not register after %d seconds for %d proxies", REGISTER_TIMEOUT, proxy_count);
 		}

From 9e1b6e6956cdb74ae1bf63b8b4b4071259b93d0e Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Mon, 15 Dec 2014 16:37:46 +0100
Subject: [PATCH 182/496] Handle links between methods in the Python module
 documentation.

---
 tools/python/apixml2python/linphone.py           | 16 ++++++++++++++++
 .../apixml2python/linphone_module.mustache       |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/tools/python/apixml2python/linphone.py b/tools/python/apixml2python/linphone.py
index c1d37858d..ea60c8a57 100644
--- a/tools/python/apixml2python/linphone.py
+++ b/tools/python/apixml2python/linphone.py
@@ -951,6 +951,7 @@ class LinphoneModule(object):
 		self.mslist_types = Set([])
 		self.enums = []
 		self.enum_names = []
+		self.cfunction2methodmap = {}
 		hand_written_functions = []
 		for hand_written_code in hand_written_codes:
 			hand_written_functions += hand_written_code.func_list
@@ -1074,6 +1075,7 @@ class LinphoneModule(object):
 				m['method_name'] = method_name.replace(c['class_c_function_prefix'], '')
 				if method_name not in hand_written_functions:
 					m['method_xml_node'] = xml_type_method
+					self.cfunction2methodmap[method_name] = ':py:meth:`linphone.' + c['class_name'] + '.' + m['method_name'] + '`'
 					c['class_type_methods'].append(m)
 			c['class_instance_methods'] = []
 			xml_instance_methods = xml_class.findall("./instancemethods/instancemethod")
@@ -1089,6 +1091,7 @@ class LinphoneModule(object):
 				m['method_name'] = method_name.replace(c['class_c_function_prefix'], '')
 				if method_name not in hand_written_functions:
 					m['method_xml_node'] = xml_instance_method
+					self.cfunction2methodmap[method_name] = ':py:meth:`linphone.' + c['class_name'] + '.' + m['method_name'] + '`'
 					c['class_instance_methods'].append(m)
 			c['class_properties'] = []
 			xml_properties = xml_class.findall("./properties/property")
@@ -1115,6 +1118,7 @@ class LinphoneModule(object):
 					p['getter_reference'] = "(getter)pylinphone_" + c['class_name'] + "_" + p['getter_name']
 					p['getter_definition_begin'] = "static PyObject * pylinphone_" + c['class_name'] + "_" + p['getter_name'] + "(PyObject *self, void *closure) {"
 					p['getter_definition_end'] = "}"
+					self.cfunction2methodmap[xml_property_getter.get('name')] = ':py:attr:`linphone.' + c['class_name'] + '.' + property_name + '`'
 				else:
 					p['getter_reference'] = "NULL"
 				if xml_property_setter is not None:
@@ -1124,6 +1128,7 @@ class LinphoneModule(object):
 					p['setter_reference'] = "(setter)pylinphone_" + c['class_name'] + "_" + p['setter_name']
 					p['setter_definition_begin'] = "static int pylinphone_" + c['class_name'] + "_" + p['setter_name'] + "(PyObject *self, PyObject *value, void *closure) {"
 					p['setter_definition_end'] = "}"
+					self.cfunction2methodmap[xml_property_setter.get('name')] = ':py:attr:`linphone.' + c['class_name'] + '.' + property_name + '`'
 				else:
 					p['setter_reference'] = "NULL"
 				c['class_properties'].append(p)
@@ -1243,8 +1248,16 @@ class LinphoneModule(object):
 	def __replace_doc_special_chars(self, doc):
 		return doc.replace('"', '').encode('string-escape')
 
+	def __replace_doc_cfunction_by_method(self, doc):
+		for cfunction, method in self.cfunction2methodmap.iteritems():
+			doc = doc.replace(cfunction + '()', method)
+		for cfunction, method in self.cfunction2methodmap.iteritems():
+			doc = doc.replace(cfunction, method)
+		return doc
+
 	def __format_doc(self, brief_description, detailed_description):
 		doc = self.__format_doc_content(brief_description, detailed_description)
+		doc = self.__replace_doc_cfunction_by_method(doc)
 		doc = self.__replace_doc_special_chars(doc)
 		return doc
 
@@ -1277,6 +1290,7 @@ class LinphoneModule(object):
 				return_argument_type = ArgumentType(return_type, return_complete_type, return_contained_type, self)
 				doc += '\n:returns: ' + return_doc
 				doc += '\n:rtype: ' + return_argument_type.type_str
+		doc = self.__replace_doc_cfunction_by_method(doc)
 		doc = self.__replace_doc_special_chars(doc)
 		return doc
 
@@ -1288,6 +1302,7 @@ class LinphoneModule(object):
 		argument_type = ArgumentType(arg_type, arg_complete_type, arg_contained_type, self)
 		doc = self.__format_doc_content(xml_node.find('briefdescription'), xml_node.find('detaileddescription'))
 		doc = '[' + argument_type.type_str + '] ' + doc
+		doc = self.__replace_doc_cfunction_by_method(doc)
 		doc = self.__replace_doc_special_chars(doc)
 		return doc
 
@@ -1299,5 +1314,6 @@ class LinphoneModule(object):
 		return_argument_type = ArgumentType(return_type, return_complete_type, return_contained_type, self)
 		doc = self.__format_doc_content(xml_node.find('briefdescription'), xml_node.find('detaileddescription'))
 		doc = '[' + return_argument_type.type_str + '] ' + doc
+		doc = self.__replace_doc_cfunction_by_method(doc)
 		doc = self.__replace_doc_special_chars(doc)
 		return doc
diff --git a/tools/python/apixml2python/linphone_module.mustache b/tools/python/apixml2python/linphone_module.mustache
index 13e0c1c6b..000b16a8a 100644
--- a/tools/python/apixml2python/linphone_module.mustache
+++ b/tools/python/apixml2python/linphone_module.mustache
@@ -313,7 +313,7 @@ PyMODINIT_FUNC initlinphone(void) {
 {{/enum_deprecated_values}}
 {{/enums}}
 
-	menum = Py_InitModule3("PayloadTypeType", pylinphone_PayloadTypeType_ModuleMethods, "Type of linphone.PayloadType.\n\n.. csv-table::\n   :delim: |\n   :header: Value,Description\n\n   AudioContinuous|\n   AudioPacketized|\n   Video|\n   Text|\n   Other|\n");
+	menum = Py_InitModule3("PayloadTypeType", pylinphone_PayloadTypeType_ModuleMethods, "Type of :py:class:`linphone.PayloadType`.\n\n.. csv-table::\n   :delim: |\n   :header: Value,Description\n\n   AudioContinuous|\n   AudioPacketized|\n   Video|\n   Text|\n   Other|\n");
 	if (menum == NULL) return;
 	Py_INCREF(menum);
 	if (PyModule_AddObject(m, "PayloadTypeType", menum) < 0) return;

From 3241b33633841e3549c63ea328bbf03d43e3fda0 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Mon, 15 Dec 2014 16:41:00 +0100
Subject: [PATCH 183/496] Replace NULL by None in the Python module
 documentation.

---
 tools/python/apixml2python/linphone.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tools/python/apixml2python/linphone.py b/tools/python/apixml2python/linphone.py
index ea60c8a57..6412b2bb7 100644
--- a/tools/python/apixml2python/linphone.py
+++ b/tools/python/apixml2python/linphone.py
@@ -1255,9 +1255,13 @@ class LinphoneModule(object):
 			doc = doc.replace(cfunction, method)
 		return doc
 
+	def __replace_doc_keywords(self, doc):
+		return doc.replace('NULL', 'None')
+
 	def __format_doc(self, brief_description, detailed_description):
 		doc = self.__format_doc_content(brief_description, detailed_description)
 		doc = self.__replace_doc_cfunction_by_method(doc)
+		doc = self.__replace_doc_keywords(doc)
 		doc = self.__replace_doc_special_chars(doc)
 		return doc
 
@@ -1291,6 +1295,7 @@ class LinphoneModule(object):
 				doc += '\n:returns: ' + return_doc
 				doc += '\n:rtype: ' + return_argument_type.type_str
 		doc = self.__replace_doc_cfunction_by_method(doc)
+		doc = self.__replace_doc_keywords(doc)
 		doc = self.__replace_doc_special_chars(doc)
 		return doc
 
@@ -1303,6 +1308,7 @@ class LinphoneModule(object):
 		doc = self.__format_doc_content(xml_node.find('briefdescription'), xml_node.find('detaileddescription'))
 		doc = '[' + argument_type.type_str + '] ' + doc
 		doc = self.__replace_doc_cfunction_by_method(doc)
+		doc = self.__replace_doc_keywords(doc)
 		doc = self.__replace_doc_special_chars(doc)
 		return doc
 
@@ -1315,5 +1321,6 @@ class LinphoneModule(object):
 		doc = self.__format_doc_content(xml_node.find('briefdescription'), xml_node.find('detaileddescription'))
 		doc = '[' + return_argument_type.type_str + '] ' + doc
 		doc = self.__replace_doc_cfunction_by_method(doc)
+		doc = self.__replace_doc_keywords(doc)
 		doc = self.__replace_doc_special_chars(doc)
 		return doc

From 60c5edf39745f5a122d815477e4f3d3b4ef1a4da Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Mon, 15 Dec 2014 16:39:00 +0100
Subject: [PATCH 184/496] Factor check_file in tester and fix last log time
 check

---
 tester/log_collection_tester.c | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/tester/log_collection_tester.c b/tester/log_collection_tester.c
index 4f18f1224..cd5d801a0 100644
--- a/tester/log_collection_tester.c
+++ b/tester/log_collection_tester.c
@@ -100,8 +100,14 @@ LinphoneCoreManager* setup(bool_t enable_logs)  {
 	return marie;
 }
 
-time_t check_file(char * filepath)  {
-	time_t time_curr = -1;
+time_t check_file(LinphoneCoreManager* mgr)  {
+
+	uint64_t last_log = ms_get_cur_time_ms();
+	char*    filepath = linphone_core_compress_log_collection(mgr->lc);
+	time_t  time_curr = -1;
+
+	CU_ASSERT_PTR_NOT_NULL(filepath);	
+
 	if (filepath != NULL) {
 		int line_count = 0;
 		FILE *file = fopen(filepath, "r");
@@ -134,6 +140,8 @@ time_t check_file(char * filepath)  {
 		fclose(file);
 		ms_free(filepath);
 	}
+
+	CU_ASSERT_TRUE( labs(time_curr*1000 - last_log) <= 1000 );
 	// return latest time in file
 	return time_curr;
 }
@@ -159,19 +167,14 @@ static void collect_files_disabled()  {
 
 static void collect_files_filled() {
 	LinphoneCoreManager* marie = setup(TRUE);
-	char * filepath = linphone_core_compress_log_collection(marie->lc);
-	CU_ASSERT_PTR_NOT_NULL(filepath);
-	CU_ASSERT_EQUAL(check_file(filepath), ms_time(0));
+	check_file(marie);
 	linphone_core_manager_destroy(marie);
 }
 
 static void collect_files_small_size()  {
 	LinphoneCoreManager* marie = setup(TRUE);
-	char * filepath;
 	linphone_core_set_log_collection_max_file_size(5000);
-	filepath = linphone_core_compress_log_collection(marie->lc);
-	CU_ASSERT_PTR_NOT_NULL(filepath);
-	CU_ASSERT_EQUAL(check_file(filepath), ms_time(0));
+	check_file(marie);
 	linphone_core_manager_destroy(marie);
 }
 
@@ -180,17 +183,13 @@ static void collect_files_changing_size()  {
 	char * filepath;
 	int waiting = 100;
 
-	filepath = linphone_core_compress_log_collection(marie->lc);
-	CU_ASSERT_PTR_NOT_NULL(filepath);
-	CU_ASSERT_EQUAL(check_file(filepath), ms_time(0));
+	check_file(marie);
 
 	linphone_core_set_log_collection_max_file_size(5000);
 	// Generate some logs
 	while (--waiting) ms_error("(test error)Waiting %d...", waiting);
 
-	filepath = linphone_core_compress_log_collection(marie->lc);
-	CU_ASSERT_PTR_NOT_NULL(filepath);
-	CU_ASSERT_EQUAL(check_file(filepath), ms_time(0));
+	check_file(marie);
 
 	linphone_core_manager_destroy(marie);
 }

From b0459fd16c5b21ca93330d0887c1e46bda2387d3 Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Tue, 16 Dec 2014 10:30:43 +0100
Subject: [PATCH 185/496] Lengthen the hello8000 to accomodate slow devices
 where 10s sound might be too short for bandwidth measurement

---
 tester/sounds/hello8000.wav | Bin 180268 -> 360492 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/tester/sounds/hello8000.wav b/tester/sounds/hello8000.wav
index b787b202eef3cad48a4635a2006dd65f3f137383..b5629df7ac1a10ee6267c9a1007a212a2a7b11aa 100644
GIT binary patch
literal 360492
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%0AZ&(FF^M<1f4buxm3VA
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
XEh)N@cg;HM&Am36uhvYlG4}rer;KKv

literal 180268
zcmXtA2YeL8_n+C_Yv~Cgp_kBmS9(>7BGQ{kk)jlp4x%8aNbgmU4pKx=1O=q`-aDa}
zkN~Nd+}-ZZ%>VoD{y+A!m#woiZ(jYrH*{>%vSsN^^?kQyUEd${<>(SIj4_U_X>rCT
zH)c#@F>FA;(ft^nd8$&dy;QH%P4z;(QBSdZ)mt2AsdSvBD^tD3m0bM#l~kEHk}9Bl
z%EGUMxmXyJ%FT2ZjaH*sc<@RAmX9UkJU>gqp2!NZD3-vAu?QB&3bS}@C2+kUD~>Im
zm0}ffuQc|2c&add^Rx2!n}DNIII4iBi?EWx-=b(C4(~+Zej)t2gJ=2i8^%2Nx|5mc
zt%m;igFW;Hdny!dGzJ^vOU2lp;`c2^eNR2cc1JzL@hx=&RJg7#tJ}D8U7f@EW&FLa
zuBr35ds|&l5AfuDyp@b=*YMO$?8(^gt7qyieu<JV(eg8FY3ez?l8LXq!ImA|yr8FF
zappx&!Z8y%Gnh~=7Kz?#!QTjsJ_;jCU<Ghg98@WREeU^%gHB~wQ5==Td0EhgC|Ejp
zR1$aSN@YA#5=Tj(TWM^iaFm4iOJXaJv$A-*6wVXzZamtjZ_xb2g4U6sCebqiRMeOc
zJ&nZN=75?WaE}-C^s78v&BB=Sz!_;6>1*r{K*1M5o}s^~80Qnv?6G<Ty4(Xz9)ZK2
zfo^y4<V#SVHlq6j+$XBOL|e~5E27t1eB({9eWFwr?!Cbb62IkwV#IYi`o_^i7j^^m
zbD+l&nE4PdB;YJRMwW=*!Wbt}tsJ-~0l#IiR|SP?uxj{Qo4t$U@~jdlRu<0^9V_9S
zs8<DBC2XbeY<1i(g;q*pj|ZiS<E#j1S`1rh{4I?y#e(}Hu#-dx^fOmwpr;P>G#Y&9
zQyxar;>B3rV%$$LzU%4|M(SiIRTxWA|EWsssX7TdoCozDf+or8l)8fFlR+gvt_Y<-
zzkDnQZ|8z;&p_9!xOW*da1noBgL=83jR*7O#T#yx2kN~7<r#WK^OXm=^`Jja%zPZ4
z%MY#K#$N_XMuQJr*b87Zl`+0*7*_=x6$_5P9LAmq+EoWt3V{F0;ctE1smmG$uhnLC
zK+V#iaUsx=c&}oRf;Dmd9aa<VltXKYn2mVM6LB4BfhhbYp)VzIog_L6eF+D@X&7TV
zxGo3%r;(T#In6ok7RKnuXr6%29%0nUpynI!$a9P|6;Ee?zNta}BHki-B-y<ieEtpE
z%f|ZwJd+vJd5>}b0q!RU+erfjv(cKV4A6u@kI;-|<NP(A&&FFm^n<ia7<yYcC^d1Q
zTr945(7P~D(2d{xpg?KxS{01E7ARQ}qbJ!c2HM4AFNQPXIg->mtWl5)%YhPQK#5|Y
zZoZ)2B#AEts+Ghq-63sPAV?nr+)uO!!&x|<jSbFTA++tnb((Dx{Y?*!mSmVXha^a1
z(^xJj_ZakeiTx?|hZuVrMjfJDD(IMo{SoBz2DYovZ%=Ui5d8K6GeWk(i+72}ME@tj
zIk=C%k3k_Hc+7|I(u~>Q|6E)nEkPR40v}r7%J85i$cGsZN57+k6pMxoJFydQ6oPCO
zz)m!*0`4jU?kE)0b44I|g}`GZ&s9O!>Y!j{+$T;AQ8yB;MuYyO&q(JL$9qLVyV7Vc
z5qF}{emK5EN2D=m?h<e<Ciq?$sOJZrM37oujFxD}A<slN(%K3m$^;)g2L)bZdkcD`
zfD+Gx{P8BpgK4<>64W3XKLKrTgL+RvJCaYbJKo^jq~Z$k>}$MFGD_4XI$8K4Y1Rxp
zmy0vv=nPQNLSIPdk=Em&BZKB6+0`%_PmqQV@Iw^FMAk7xhXhc9bYKzeq~(dWg@b>|
zE*JQJjv|?-ck+Q6WWPxg6NC52KE&c~LHvg36$J`$T+I*a+0b1@a1@E&Sc-J7iNE9z
zXy8Gzy*5S?Ku>k1@HZQ07IxBr=@?fYM*Ipic#83*<JxPSldjLk-@BkkGU!GWOa)!i
zK%p1d(}MJ(-<Ls(y~bT??KR$e9c-1TOWYRH9;8Kxj--$2i#F!b0L4fzJA$@@ydsh(
z`X!2nVLUWelBqE4QNi;_(AABj2v8^=#-D&KG58c65uGBj#er5uah)hgbR<b94onQv
zmgXWB8_}3-EuE32C4KC|M)u19r6lIrf&SPyBB{`DWTOA1zjK2UmW>g<!N{^eIpRi=
zSfXEQkS@=IbbS$|4|#T^7s=xxsZPOP;<?ly-N_2mJH*GYg3r;DZ$L-dbI>+%o)>dR
za!pn&011%LfjYD_^^YV&VTQ@OBumWETOEBS&Lk}v+KCpVr9vD?vKi84L`jlM;xN)}
z1#nDfMRB!Y@LEyOuV|2_p?d{`bSDavj1!*{U(+nnoP}W{4eSW+BrWd$?-4_Pd62f$
zR|$HOJo&H@Ul6a5R-?ap_)A)g#!h>BkQ#JMbRxMV%}V_C78_A3#CdNq8|2^R;40Y|
z+Nn(+=tlEKUK4qsM7PjJ)FVluej5KzGt%fJ&EcRHQH{8S##jhjkswuy1bK=mL_6_U
z3D^hn@W>-9g^m2Y&_-S!Sr0m+`z5fERwNrkI)N-$NZRw^OT?EkK{`g@C<6VUzPLb5
zvNa?%WEIKsI6z4nOCY%UF=pZtqDMxMF2s|>kHnYcArfzqPfX{;hoLLPo1w_#C9b^0
z@e6Fv@i+7|NqZ{JLYk3iPc$bAXJV(>BHw`eK-w@g!{kf5gY+anC@RPqG#auAqz&_d
zmSls8zvzfO=|cD=?jt|D5O#_*LdS)JSIB}C4APorfM$ZuiU!{&ekDIM0rM3VoHNoF
zq$h~?Nlro*nKU-p5Sn?ST!{a?K?#0?agsa}Pmvy^Ba%__V~A?cg8LI#Te2ySussag
z-RGbcMIscBJPK;dThN;ip*53(SI8<o#k(ZouY!~#?hW}=G-ITX{oqXEOOj=pSF$f;
zhh6A>$e*QnjWirt3*sj7d5KPigA^zn<SMeS<lj_)T`r9)<Ym)Nd`IyIaUk(s30$T7
z#FxagbcHBN)~O(V$txuLO_YoQ_mLK%*>qxd6?`&<zLKU6$#RH_Gy)n8Y5ljLBxyV1
z6tWRyamjLo_=~uUyqXaGC}MjUq|igym=qk*MjDddO9iDef-MoZk<BJarr8T%*WeK-
z^dw|M4D>Q0xRE~_kDc^=SnzM?Jb#b|6u*`WZbU2EDBdN>CAlSPB*CjG51)`cL)ysu
zDGQoW{7e3GnIKguVj+*GD&C@4FbR|+3X&Cf2Wd#rV>l>U2xlRSLs4-^LsJY)8r=%|
zG9*FdsS#&TO!o#H_7rrvALJqOik}4KkG!39&?gNvB%hHyzgxIV9`-|AAwQa8II_hl
z*okU12egw<P1=!c7x@H)J`nZDPar))^XUgoN$Zi^#9}mLHOYFG!nlcJii0{OF;<c~
zl1Ac1LJo=tDN`{RvsFbrLNQxuTq}z!W$<<t{1S~z2hXV$;z8oS|JfIc3uEzJ!XikL
z$u`Gh{z(7Epf@B16d^IpIaxm+#zyv#crFW6Aqgd4j(iu=V1xy{!nmKoZ@!D8G*E{m
zm!jJc2NJc&11B1jkN5!hUIpJL{v{43ABgk-dGHje{LhZ~K`rv8NF!71OMU`b5c)^w
zq3DDB5W-LjV?-3Q64wy5NEV6L2ooS1P!@a^;==OqrK<$_s~nDMf>tGh{8kCS6#tR^
zAst7wBe|}?CbI|VNdrVT6(GUn3B_QG4eCCk7-?Rz(PUK$;F#hRN3fqHH3HPj3i4oH
zkcwn=Nh1cp2gIBIiya7UBFPW=<P<%SB_&^uEDg;8Nj=R3`I98^X*hZlq$P1ISrVcr
zp;so}qeznIrw2WH@>@uj$@-FZiN?Is{F8@AF@AASkT5L5T1sM+q^Xi1m8FAxNKtYU
zt`P!2QcE&S=mE)X1^lf7>XP0gOo4ciW`p9sqWDHZJWX>#c88)9x*LOjkOUBpW@6k5
zJ<}i=3gaVRnj@+st{^R!gRy6W>z)Ovkb&_M%0#-0B$Hx|5XM3XRLFi(d`$i`-KS`d
zP^;VEKC&mI|42qD!X+I*7M3DjdY3pb1IOg`_(3CzH;9G~%rVIYoe{!8ae@=)6jhMq
zlBY+<WLM*Hh3G{3ji^x()Tw}@^57)03n34WWS;nwXhvut;V&e|r1e4`3$;qI8qEpm
zHR3mlZ7A9a`AiY$1I2DOs76|bB6ym2vbjF+0BLlhV91A{v4#AHJX|B6j<nk&jGOdY
z2+<-NN~0&e7V`SYlYWl7kMK(f3?W;Y_{#shNaF7hG8T$*$Zq7}`w}QmWU%k#V?|*M
z#9eMYtp(2s_Y7fq#90*GmJ5!q2*yuH6HzLTtzz@oA@&Q~#Wt{k>@(JdwO}6rVW|p=
zwPIsgZ`OhJVBfPTY&aXk`mq6Q1p5|SA2tfl4`tu6nQT5AkE21X8*2yr=G|ZvT@&xu
z!*MOpGlbKUkC?#PvxR730e(-hMQFVnzS57q&zhrmt?~7?>^;^5t&L!vaqT_Um3;_Y
zs4@D}0DEQVlG^B9E%dz#kd8_i0r?vgvAzbC34frdk8ov*cTym`3X!B2^t}n%5~^?>
zDA*DFo>ylv5A89hWbf*MTgV2JuS9tD6X28uf_{NeaiA3kWd*RVczln6&Pkws0myj_
zcq|fh_JDUv;tF{;)E`?BcX{wczTou&cq1`5OYu0bjIoi;Aw0GMP*EBK#k4*ZgSW{K
zNx=wmRRZpj_P-Cgx&!3ovO1)Wqu-aoCCR{2?xLq;4bp;~_YBuB;<;zQ0gqt6iK9Ds
znlRF2ynPf;UdQhZ^)F=f29W1-pv7Tz8hF($>{oE_h&qGqsM?`6slU};+&hW=7Fxal
ziamiOKZCT>cOIZu*YJ&}_{L*gC%z<KiLlyN;9!oC(A8{=M~AMVxd`B{7l;j^t8^_4
z^do=P!nlir!lbv!=ZR({Nu)1H5}lCWSllIhM6ya!Nwz!!GvW%Kkr!v+y+quhnJS9E
zX=s5EAs?Qh_$+|$N8t^^>PXkWg`Oen8tP#VG-5dJQcOycO?ZDE#_A8sDq&fK6f3l-
z@EqZ}mB8zyrz?YZ>Z120gBm11__!G6xiESVg%$+(zynH1^ny@%p~?rx9t|CoA9G&_
z{s7rC1N?h8X!&n~Mv0KoD&VZ*kj9qyMio#X9M2O{SpcnMf$lfe9?ZxI%)~v=If6Yw
zzhZ*apz&7$Z&d)#6~(s$XwQjz65}VNp-@m)kj^WP=M6|`0CXo*%8gMJMsH{YIwK^?
zhmqe#&*Gs~2=5^Lm-N(a^pf!RYv2Pvcz|#_dOj6gOa7n_Qb>5rZ9MS=zfZAW0sUU#
zohuk;E_m?)?w`ddo}k4Y*#1)M!Qbb=ZD;Vzzu>@MaefB-9&mjcu02!7z_GW$k$b?u
z7Fx|jJ7h<4&_^%Ye}XG7KxLZ$Bj95j*RO&`lo7ayHc~O;;h+Jb>V+}-Wc;NVFAF0p
z1{#sa`5djhg_IM&8JL|EoEbqr4Jh&xLpCK_kzFbet|J7NJd?|y^b>shF-C4+UMcdV
zXg!=!1d$2tk%3;=_)a7vnYD4vz_n1!o`*h?wR{Lk%TpzwK}^U8hhKCK<G2MmdWmu0
z#aqOUWLXFuq%6lp@If;4))`PB9z6XD)O`x+yn@!=;5P>xLi*zso;`<Fv+?X5jLDC;
z9-*E4crF!Z56~*<nth;vj^4k(lNmTRf;<%RrpZd?2d`y-UkI@#L`wr5WARJ`bZG_L
zB}vdgC$iPWfall6Rt7q|G;}!~g?wopb|My|B(EkPB!z(wb+nWKo}~!85;&eD@&RT%
z6<n_Y0Za@^jE7M?kpp^CBt^0KOPogqb%w+YQ9n$K+y*VLVw_}QAK}R~^qP3(1?Y7b
z^CUs(v$&TQr2GR=<^||{7PLwOCC@`MK0zDTpasbmKg2BD#yc8De;#dWn0d-zF^qyS
z(wXENkk3TClOKI2WYUQdrsEsrCtU>>r>IzHka*a+CKzYFU|(GrrNaGyN&?Nuqp1b?
z&4<5*K+F0;?ko&l<G~1}ssc+$*^)}I({x|q8?op|6zE5D5s7a{;I0$*$V)1OD{l0V
z@UAHQC0-=ol(L&4PdEi*Bkm-Bgmhmz&M$-RxtROs7;7%BkcCJF|2zd9uYiu^9i9UH
z_NYJb_W;Is4Q*tBdPjn-T?2gyv!dwb3A7aDSF%BU6TKykOJ3wte9eHCNk)650|;sL
z;!eo=(X$>#d4hCM?gHdJ4>YHoL{U&C8k|rzm<J-1sWe7sLwgaHLTE}HMotk~0F<VT
zXeP2;gqD&PtO7dvz)z&LD}mc;<ESWTN`6a2P?mvar9tW2&@W^)NoPcZc45KTC>K4>
zKu^fJ`N4IR%c1N<4(9weuKRI?G$z^E^N`r<7^T42l5w4I6Us*3!2JX2cTnm#wI4El
z5xKgDXyFy8@CIY1Oy)gYKL@(eo44>Dp*D{(`!04L^bnvE@jS)Aq-zKnCVk~VuZZ)g
zZ-hn?jz!s{T(tcZ?~tXX=r|Ts3I~Ngh96fo$Z-`xEs7W-U=wP90x|Hin&PMg{J3|5
zlqv`6Q~{+3^Cw@rIKD|J4Oyln_%kiQZ<O0C3HrLhk(B8Z=o@Lr1Uy*~ZRN+@Q?#3l
z(Y!`a2$><?kB8)wblMmZ<<VY&Mj>pOeCh{~M9Sb^#h4#q)G46E1#I_l=P0=GCMbOz
zmf;TM_bw<-QF0cZx(doY1{DZ{pxEO9=t;E+#AC05yr<!-#2cht$ZsH2gYZ<!Q4lr5
zFkZqzs(>#jHVZ|bl$j+gg~t94Mn+glImmM}oYe#u)yJJ8@VCo=MpT(VS#ydwO5&NO
zXr~&Us}a0b5l@r^&GUn%#XtiKwxI}GH*n1XedmXDB2S58I*L?E!U|FJNvMayI4J)S
zLP5Q_O3~O={F2{t8C0O$5FwvrXUVP+Izkre0wk6!>=pQkr@?`T!GEVgaq{pezj+lj
zJP+#L#&bs?(J%1U3vg&COG4R|Oi+)IeJ?oC!i-WJO?;INej^$(*kj62OZ@uLSF(<T
zKvR@j9J5XlF;QB>RnkOJ7;_=esUo<MP%Mh!qQEf}A(w-cQk4N=SCpTlY&zjr<f#z4
zM=@b2zgHed6bVsQ)CC#OgIB3R2T&$NgVa(6jG|sbrm`Segxn?L?~CAAFG3DaLFQ<r
z7eJX4pvg(K8&tZD;}f`Z728={y8>Nz37oeNN4LOthjH~bsC*9Fbv$zeoOl=QJjd^K
zw0a3o-A1b<!-OZ0mrGs-VKtO%CW}m2V!~(WE@9Y|879q69wSkd{8q{{yD^6p9aH2-
zC?Vy>2?eYMic#DfLg5KfB_x{YN9aLO(2rui5}*#rrV-@#NX!FyI8?Vm87u>IqMVBd
zt&<NPhVN4KhCuJge<56edPsAcj^2=dCp7das7RTgM;IYV8R1V<Z$Mefl%T{?b<0b<
zeIKKy2!X1A9^#xba(6+U>!9^fYzMJj3(|~!uLs+@i5AFvxsK<kc8IJKRlpE#K{zaB
zl*n#SZ^(LOgWo9IMOX)AjVVSW^nmhf6eClFPgxE^?5ReD>_-?zNpS~l<Rg~=4-zjD
z`a<3ac{&s~Q%;z)Tybz<IdEAdC`7p-LLQ0FbzGqw9QiGjcO@H0m|iAkj;tf0QZ{->
z{u?2gl#K{&gw#>wlmXgNodMwmcd^kCSrf7u#7$R%Ty{Bl{uHuJ$UITuF^&iUyp5f%
z5#n$OPm$k2s5IFg;xLk7;xm$A%Kwo>80b44Q~$}Mp_&hhu|l3PWwrl@h7jUFoJTs5
z=vfdHAv~3Mi+nw@zLbdzW!Vz{|1UkAi07k&97|OhG$TZLLPd$YiGmd85fT}i2SS4)
zaYm6e;X{;-p*Wc|A9-%nUkg_V&!o%-Nf3Fv#0`XyQZ+{ixg$BFj0a_YiId2ud5Dc<
zkuX$3n~CPhc!ThILTm`9B1xq)svM$LX>Q1aA*Att^dkBZhlOHx>JepR$d*t9LKGzY
znc|30eG#Dpk+?!J14Us}ze4y{5~xF16meQXP=zX3C<j~=v?Z*t8150a9~Y!;LGWKl
z_a&k=LPZJVCbWSx0)3b24k!yqXfDYCq2YwA5jsvWsTJf#%5#w2$iNlCK55K^ggyfW
zC@!E%Dyp@jtPfRmgfeb~-&36xWj-j%AdU+~5oCV}6C^wI1nrWKM>rvEAzG(`+E369
zwMet}I`}>E%Ke}!aU{(#MVW-z5)Mn}p<d^rmt-L+)+ftBBO#6<drdq{8BfaPxWFqk
zC!w4?#de|H8Kk@u{1(ck5p@VzrYtV`AQXiWl?VwBVd9iipqdk^*~vq1Xtqg~Nz;)2
zAv;0{Dp|se{~s-BJo4FyCifw+|Euf^VNYal9^)F(jPxYk4Q(W^L~FVl`X#@ao)6X3
zJi}kot|8Q)uoTj~B-J5|HI#8C%qWx}CTl@6O)*Ibvn1r3G!miJL<NdyDI@#8oCHZ@
zC~Hd@V&cY7F0vqwDKGv%-<otN<xj}NCVNA6xNuMd6bfDmT_qh$_J^{3q&umugW4dA
zMC}s#ML8xq4&9;3%upQ!VdjxIrffCYA<8(Bwjg^&e?u8jvP`6#{->QNOCPEgpb-*B
zP^LLl&qv%qnS7dI$~Tk!qud|OJ7oY!AJaUBYM1U~F79HEZUsHdbMS=@!9zL-pZy=i
zJ3H}v4CmY7y>EsW|GQeJR;i6@tJ<K}s?}<-nyx0Quhr-3Q`K2@RIOA!RYoPKaOF@=
zC8a4fWyv=(MJCHT@`gMm_sQMz54lBdmaFA5>>K0~`Li4;2gshXij?B5NE1)QHL*=B
z6f?wEqPeIn@{2g(6wmDw_P_Qfd%iuz{?T4!|8D<=vom&vodb~CC5nr8MHA5u@BAW;
zpp`gTQ+|anoRLxLGx#=PKv_33i}mDd_(kr~KG&{k@p?_Yr~Zq6Mt`H{=y`gSkzm}{
z*XhgjrTPTDyWT?oSZ|`c_2=4EZ2xLAv`@4F+Ayu9R!*y_b=LZ5L$xK^Htihl9@Y+O
z4>hH|)-0{0-dq1xAFqF-kJJ0<t@L7gNxgzzP!HEFP1C*F4ehq}3U5u*+GtI+1noZG
zhV3Sg(%f1$kJJijF6|7T&nNH?_$&4gJIC&`yDXgrn1i?FC3!ZpSrpG=uW>z#RpRw{
zG5$WE&X4d*d>Nm^FYpI^JKw<n=5M(}d&3{|7_F+twPgN+CusGxBG?*h-)QqOmXEYC
z+A{5ZTxo=Bt+mS9Y5s(_&`N0cxQ0<SgQ6J5OYoMw5I@Mauzl<r+s}HzM<ooLBI&E(
zpgi!+Bw$#7LCz@xe}zaRlHG*gm;$~dB*Fyx(F}1_6V`@x0)jq*tzgU9Pe9t2vV-hT
zwjLOJGu-P2Y`iRdkp%F5c|@uP(3w}@z^Q6HIIO<v1%8_bympQ1uSThUs+4*mUr1Ye
zl&)-9R@G4P%B|ADZKuI)+vQPtL7tG$WSV>=^JKR4OBZ<3E16>8(ZZ^bs;=I_-au7V
zVd@T^ejuOV?OXDkJSZ=Lb5DU^H-VG3%YWrG`L+C3&XYgMiE;*bcPH-riRa(Q=h#wY
zs?5N5{sGrrm&c@(HB_Q1rrJR&s;f`X<F@$yTFq0t)N)AEZAc^8EF1W5f8-a|V@8ws
zXM8qa%};>(4YdwhJ?#Sbu!ZunXeqMo6nn7fCuhN?c%d&hswfpLBgAq0xP8igX15c^
zM3$%|b@>o~ABr{NKk-_Wk)7lOxm3QDHC10VPR&=P*e%GxOa7hKP(P<{HNJFMj@8aI
zXGd2-*Ks}B++tO+dzsTruUS<F_&~=fqk~@0Sgk)`pNod(w`NOgi~XKmSWe;&W3JIz
zudl7*qgiV?&vIJ<>kH9MX3ELzE3K;DNPEk!DXuiR%HCr2gR~A3eZ)-2`3hM_E);b{
zBk{m)Y{%MP+7Y4`r2e(oCY_kmALS&u2Q!ugEwqFk;zzV0dYB=MfFsJ;)Y;CN;wbJ|
zpbavInUAe?W(6zLIwpPmvg4w$MH{dGti4c8#88u)^Q>heTD+0zJWt<YY|>BjOVGka
z<u0p<_1GFM9?PH9G*(LMr4{1usi}5jYki=5;P=25tAfat0Y$aD->aswozPI~u~D>?
z;fR?#^H}Yc)=%$bBsz{cdO3e^?RF3G4D<ZzUZ%Y<r`j*f7J;XM0#;W!PcPx>?U?Ua
z>1=5n=1)X3b9LZHE6V=Qs-v1~ImQ>x=8mcQD{UkHT;8|dm}RXn@r7)qQrV}V`7u3@
z?^B)S6#JFGS>6F(yjkB)7vX9?tE*+OALUuQr(MFXY2UP*qO>~Cx<c01YFG7*#vP-K
zqm*;G>lgPj&xc_R!*U#(t&>)wwboxN@J?W@RhPeT7IqGHa91D43cVo9GDrJcn+vV+
zW|GKK(2CAQ&K}06dSSgE8zkPfUInIF+r+oBl-k5Q>4S}(dIH}n+Swuy?r-NC?Z0pS
zBZ`7APq8%iSe1|yZMQueJlR~dm$7UvU!r-n!*F`@IVU?kt}^aFJQ3l`!Y_r5Ge($?
z?e%7ozg1wIKf;dD7P^Kz+B$!AJ#*|cF0piTufK%#(5z$bvTw?R+Ck@e=Rd|YqqVVs
z4^>V(B~a7KvFnN3;*3h>Nyf*<PHm_fDKe~!0jIx;Z@<5SHAK{u4rIAj!29nZ>k8AJ
zAifq$MGd)A4d+9(uKHvn$Fan<$UWUNE^Kc2#}WI(Z1y&=RJ`)N@VD_l%*}7TV3E$=
z`W5GH=TS#(cQ<W>sA&mnn0YVo%-kPXE?;Op^ppBjW0<kZSYqh>8LUtpF~NRd=US(%
z3-Wtlm}}TYF;?7>-Nb+P7Q3DOyNFQDrAtPrl8Cj#SzR?pb%#cr#xAqB>|0(>`%3#o
ztE+pABu6c0UDpBEaHpnE)0=9=ftyYer>uEad9lZ8X^$7bSZ5_i_HY&J$CvPFe6oIv
zzso!G!>l{9n(I}H_*>@4sgS2w^`)Gv)<AQYW|P=Kl_C4fIbxOlhuzW6v_7{_+exsZ
z)n$tKOAdtIO;<ya1x;n0cy;Kdr@SRxkHetYc}FYP1ovgv8NI1qM$cf+*-3fPx@*=D
z-K}-jOM9gGjTjBT@}O$V^H@X7O%Lq=U&|}<pIB2~l06XX<#*6c>GFu&El$W{Y&SIF
zYPAxcL9(1Bj@irXBK92HYmdioKe1nQf?nMudjc1p#a^=Fu#QYSpjFbJ=-Z6_jtQ=3
z?);ug&N2FEqXxb-o~;sR&35)``;ggQL|9j>Y4SDvoTY3%pU)P7st2^XT9OveNAqM}
zLoI;D?<N<@9x7a(5Whk@Z-tgUByWl1@&kF#eqwjAlk6s<fM^P?-YmGRtu$rIM(hsD
z$5Z$%-bVXf?+>{f;r!Q?;qL4?<)~{EF_!aYJeG~I?*}Yvp!piwp_Tc$)j%#+-zle7
zoLAzS@dQ4`udw~?*jR3{ZL+;QF2Y5!_*2#ri^N)4R~CY`nj_v5`K2Kmz#IA#+SDy(
z+7Ink;)Oi~UXCRXsWB{>HPGH@#W6pV97mjo-9}g)&zFwbMhoLK|CwJ<pIPaFl6IKc
z%xY&J46LzY;k~_83$*{(T7Dd%MG8Eap}ZS2`DR$1rSdNkDOSpRvYzmZ60)f5r4GxJ
z@VQEh?e-+__fTts-2(i4!rEf>w;zigstc>Yzt(2yI~?_0?c77d7DkkgeiYT)u|aKS
zzQ9fE9cxX_eXlEU)vBP1>OZo5n$vyOo#U)x>|*cR@2VZ5e<0bP=ig@TRM)gzwn$rM
zJakNQPH<FWOYBBgYjZ%}L2qyG(A<_L6EUKryr71G@At~Tpwsu;-NXc0RXu0Zj3%Ce
z5#^)f^L0wNn=mP2w76{koV_l)b<T|R5?Q1Cwz1BW8$Bwje)ye;Nn!i-@#aSF_Zc^{
zs`@_jdl86tb}o-N6#YeH71tZx$vfFw0}H)>WsS`FCXj8_6I<YW9OLV?S?YajYQXEi
z>u+Fo3nZB<MKqtLf8dzv%;&xnzAb8C%%Hdt`Lbeu)$as;%j=%m*?Y)aIJc+&eO@H2
zYvj(@K@l$ZMaLlRzEvgfWp>}pVY#d98Yoad;mY;A2tOFH+U;d$>|g!5Z>DdB?^JG+
zz&JTxW$;manrtHaiIrwo{}=vGeU$=(?6)FQj^R!9XU107OZS4X5|I<5-Eqz1@5FTH
zJ^c5*r8B4IHp<(ZSJ~f2YajM))TFq};hP<wYaQ4|^Y6U(b4q7QZ;D9O9y<qlDtan;
zc7-i>HDf7e!Ms}Do4LFFd;Qg{gCbVOz|ZWZYTM_{TK?+(9|Af4oq_jluk`Sq#z;qN
zXFkv6@Ci{xV`t}c#ovxRESLGxGJnWu;?2zc*8iJ%%=jd1Tg>vfpCZOO3bP(|hVMr1
z(45LyCv(q=5{4(NbVS+k&)qfL`;8ImSF>I2@$4Di9{x*#udHk0ciD|6=nL6Y`$}N0
zuc$9R@LiykdChjSE81Jf1=o0YTzJo@$1!X2{g%I9?0SCCH!17;H;1y#+=78Ufr;8f
z_vomd@!>J)u0Cw6wIT1l+#hobW{=8wV#e@H_wL9hQ7t^#&N@bZ^|5`~H#z%U<_zyn
ze`#?7S<1<37hB8n%lg(5-`BZ=^9BUgS+;nqe&kh*9<GU=Kf}93eH^nmu1o%%akKRn
z{`#4TY1K2g<lZ%7tjbz7S5-hB)#K8_KI31Q;oh6s>A9V~8Q!OXe`Euv7I`QpJVLlU
zy0EXC2mLK`f5~c*6P@>gb&5x8MR`?7#eVA>>s}x=ua@r<zhO0%qj(co`fr?{A~;+W
z{c~KE_%aE;*y7qbf13<X+Kco*yerJR)->Z+7?_FqTE&%%IHrAO-OsL_)!mz(vpz4%
z8mn43;v&w)jEOuRR?`R<&cGyJzTAJZS9wq7RyKj$YZbH$Y@CdNhcz^C#8<#yFfa$Y
z)MlS(lZ`azD)%ShMWcJf9g44%SUle{-4V!554_rkBCEaTyY{=rM(5t}VR6oUrK2i1
zUfH{{Z)L2{UX)|yePrE}#q>>{q0x<^>O`J*K9w8&-{!UQUe7L_`&;f|{}j6<tHbZ}
z#VplMu=4!n{HJ~60(H!I`+-bnGxT!KYM#%+t4Hf`N8@KCK8pX!=`|Z?%t=|F)-!8G
z;1heG;dRsu>l9<hO^6xh(YWn(WZcN`WNphWZ9R~;_+{t%h>4L6quYju8`mt&*D~jq
ztZv?2xrzS6)=Jq@#qu)z2bp1?F(>-B`#QptTWA^Z$r5>{{@VGIXMN<OnC|(;CoC$^
zIJTbtOQ8GfMJd0hUC(~%@2Wm@c6Qc?_%^0s+`rK)!fvs1-sFt>>E86L+;P?;bwf*X
z&kGw9(JK0%@chmVa+JSn_N2^3+3$FJ`evIi>{_w{&)})-3)S7e<FDj9;_L3W%_*X)
zis0Ytg`7=1mm({~KF@at<uu-yJ$eK4$m`!ymZh%E?B@GKZgCWH{vBR1`hHAmbd8A3
zdJX@^tYvS1dy|-R(%(xC(h>lJYzT8k$#B~pt$%Fq_5PRnHX~owh}?qaX#28gqJ)fB
zGgUEp)Z*qR{+_;)ff3e7@jjcaRWNQiH-!y~>J;}wLZ^b|5^ILHX9cn!rA$cSub1Ww
z3$)eh8GpLQML46!#SV`-8~z!e>H90Q=j&T<r{}Z{v{3_e+xe4gR``yHZV~Om{xBMf
zzj8mxTA02ovrKLW|72^Sn20#-J7kNJ)L~KF`qh8QcgbJO>@6CwXsxGl)_KIUFfuOg
zZT_+azc278@}hP%_h#yvlxL}XvcB{UWb^ej$JVe?ksrlG#YRROu7P5H?k0?VM&_j4
zaNE!7IsSGec%Fs*6Fw$lkEgM5&|Z-DMdpR{mRYmBll%v*apD{CRxVOo;NAZz2itjp
zH2-`40<bW@sG-^&Bi^;Z(<?G9=6?L*0%ZzJj;i6f<$Lk^!mDekwKA*ZwNxAU4P&u;
zLs;>sGcmJc-iFQAUDnX7w&@i!nr6>I@o575!{g37t_;t-h@laSJY$WTa(LeFSw}Np
zXYR=P%y%oW)Ouh3p{6n$G5%DwQuMQG2c`#d%+2;9RbNXmW;thg#z)kS=^cMEv1)-L
zvBTU;>|ZmRzuA`dVMZ74X3M2oYiAri+#f^)qNl|^jJn{t$q)IXa-L*<ko9@)`oK8x
zy;`j`H|o01g*}b%MJx^b&ygZ42LAK@m~G_T@#f{8@XZRmGB=2J%&BeF9`VL%u)We;
z6qsx-v{xdcYp$KtcRFskCr5ORsRE$vcK)QOz0SE-o$P!WX>TL4)_d;+ezhLSC7R|O
z5mrCCNzAmUPGQ~k3)X|Yh28}@S948Y_keEA5U9P<>p*){i5MRKgX?`QM*d_@^Ucn?
zms{QYO->tc*IciEt=PeiYge>MY@9f5jWV~G!|Y!~D_I7y^Fr1}U+!!cRv@YzmILk2
z*F0vfXP&;z9F^NRdw14`>{H%6-?6}Av6KJoxax_D91)olzQ}!3|4Y7az4YJ8OV3-C
zw?8k}SK4eK9<kz%&8`#hK@K^K8fSPv)mBWj-Uf1WSLRH~`V7mVcKL<<Evuqc=B3r=
zVt`%SJ}7$2B0wB&%9FAL`%C-7G1xO8;-{$SnAWjpW0prq_hzl1UCTc!cbxZ`H@|PZ
z|EzgmywB?!OWeD{=7nDiyY4RIIM1uADfZXqf<U5wu`k!RA+XCTs(#S+Au5b@Epx7Q
zBpW^SmHaOiCb&7px6yk!C&HVMcgla&3Wz+}N1c#^WJN^xKLfEKoa43}u6|-ZUdRxL
zQi_HZh&UVBA$nufv#@TiVmw;Z3w-Y%?OW;#_ZRgS2z+ZL%RX8cXAk##p8D<<u11cN
z`T{MDZIOL#r`gm0+Ses;!|W&utG#SE|6N<EuQ%Rtw0C6d1+=qjo9JLw54_GRn>*2~
z<^G*lBhUvi^EtufK5<Z#m&avCL=Q_;q$;SsR9~@2e68Nxam6{t{mAogxQJ*LG0?Nb
z`6K^NUbP~u-hqey>Avc|{=TJw{B{qul+V>K=v9nr#-~P{u|kj3POA^a*Omwz4m=37
zH3ypkbG&uYo*);pqFQHtf&PP@pr>k6wL|=d+GEF=vHlId^ZqI3C2I*hWrsK_p36c&
z&=vs8I?OJz>#Q2z1i$?vFQGltZ2hofnCqH*uV;&=i|aQ>l%B~hAud^9Z4Gqy&-JzS
zErd22ZLPEG0o5$Ue&KgCTg%f{Y2WcasEH}2ipWvIvOh-5a>o8w{6M;d^#R@%t|#j?
zj4?((qpv=ZC#zpXS$mFE#(K|s-@0HOur}LuMIx}O&B%6+0YW*HZ{)Xu+uh^gKpV^H
zE~6$8hR<A+-F@Mc4Ry73)-YOX{n%oaETZjrMC{RK5A!!`vE51ZKy*}tmEkqD)#%w^
z?HEr6k~UwhmGIldTssm-%LMze-5X!LBnPO5ES9h5c|e=K=KYzbc8l}&bL%Usl~vA)
zv+7$5EU&f3ZXkAxVnDzi0blD5thb>`0;1Iz@zHzCWJmcnZJGYFG1zg|anCUI#abhN
z9rwSH>qMG8)^1}D!w92*s4Y_+fMr(Z>-aOC4U};&AHu`=G1S*mg%DLZS3}i6Z`9eI
z#5^_RWB6u7W^N6Vr!@c))*6Ud4XwG>Mf*~lsqF@W8vuq|2^ei}eWX4^-wrhEp`Hbb
z#TX@wB%_j1!)OGgptaG?=w$RTzAz>mYmI%zCZo2oRd1*t*FFX&`W?{Ib3ord1m2hh
zG?VIYX#F`=bWn8`t*5OByHp40Wn<LvegKrR75Yh4H1t0&!~k&*AX{+(sNOH?2Q?fR
zUvuDnN#J}P*q5#%5OWt&MO1lJOEps+fWi${-$FKKAl_dD6z^~3gem9y67gmjzD8?P
z%AvlZ32LW4VT0K))D3?KOw_@ip+ak!`U&#XMKuCqSw!Vi`5|A0REgl6R0aayK@Cu2
zfy^&MRpD;n3fGW_Ne2o`wNtbzgsSW-;VW)rm{Jkt{sSDJQ2fu(?{2ES`Vctlr)m(Q
z(;v~h)xar_pm&s!p(+cioTN+#<=m+rohm%)psuJf(A(CivgycrqLR4-s$@zdUy+Bm
zt{{i7Tdl-szfmLbl}~|!Hc@qe)Yek(ViYZakM;&dCaVR=D(nDeOl$Y44w$}3IW}4^
za|x~N0msb*g82m~*iCgpzM&DY+nPXyTdJP_Pt!SSDJV)+9@j9oWaO1nflfPv^H>5i
zTpfL->g(R903U!#?+K{*9>+!kef|*jQH6jvzX67Q1(gne!WUSJelJ76=ELT!Ll$H!
z=6D}w`YtkG*=Uv4Q`35d2B=-_7_8%Ngn3H}()Jaex`<rL4%B+C175uzS(8m@b0_LO
z4`DQ?kZqwA;<xZU%6QSL3#uTd)ko#PZ>>SeK|o&SB5(08I}MZ}kHzuA+ynn`6}}dO
ziq18N-WvnOcENKqkaZ~xdVCC=`A6hyPJ(V!M@Fl(X=P6(%v2L_Zd>*d<}DuCp-XB7
zxV0rPbdu*Xm<^f<!l$>P-?^yKYr=+rKJ(ab!04|)V@B~>ygqLOZSgat_+S1HzsnPW
zoi5i-Xg=*-WIX<W1cn<&^x4`<-hr=X3)Ku+NKO&`MF-JLyd$oNv2qPELu*t~RLGA+
zJ^om1y)a&)`X=yRS@3m9WRJpu<8PJ=fVcOR;qrj^P%O5W+UJq?nQc47Ct{<hhP=`5
zvLdnrR1?{OeZw}fr>qzMi&xO@Y2A_6`Ovs&9CVCz4s^ZaF72rhmM`2D(IjHAJKpui
zwal@Sk3laUiaGWw>!#(hzZO@;Y;h8C{apSz|5qEO*M)v4!Mn2-YLk3qJMGr?G3%tc
z$~*(Sc@WUI&+HY*M-8#N+27f_tuy9!^NHEcyc4Kw{$f5dZSx~58#d~Zecj#(RAMCX
zw<_u@(DyR5^jzrPq5K$6)n4nzjNOjUTx;BWjrv-K;p0DuPppbU1lsu{{G0t10!_?=
zW<zU<tjM~kJuF5qs`ujsk(sgBPwJ>#ExL)r_DXA(wcUPd*Rsn1xx0j1MQ3QRqtMt%
z$jC*@@yH;&BMjuynu`Ns9I_V<@ZmJ9X?Vo8@z?w^Y|bcck~UeppcT;P>goD7#sEi6
zX9-tz_xqmWp5M8pZ*;X}e_8=qixo3xn7>=$c7`>|9u0q}GB1bxOI2->UWM&pbF|XD
zB61(qRi5}8ecNPD7QMwMb^*~x{v=M=o5eDb2|wzTHQlOiwKGo#hMG;yeSw0e+j3Yj
z)?TYJD0<kwXSWu);s&t4I&zWhC#TB_(0TL0Jq-EMU2GL^t+m%r1B)DL+}FM}ZfgOx
zRKAvb?QrWq^J}w;`7UN6*L-C!MP9Lu(xB@L@}jUL2f4;CK(qd&-pa1>dsz@Xc2z8w
z>p-{5vZ3k&&01D%l#7u|nJ3DMqGG+>8MD0_Jh;>@0wiuTvW)fQdYJ|6tq}B2-Jl${
zg7)12xtq^Q@RPg`GAw0`Hje#{yT)MSobjvvC%*_i5v6X6pOLNfAh+30To);F0!AcR
zaqUy>2dxlnQ?@o+n+JP$jt>V1*5Va_q2{n3cu(FA7W*Dw1iRIRKZR~cV$)$&64gXG
zP>w*>^SX$Z<z;;!nd{_DSqoadDD1^~*qYhUTCG7hpBm5Zv1jZoYk(*_PV0?~$wK44
zam48CXzs}G=xAgj16oc0N^`*SUgb03kyJ!}a3bvOApN|afUM6hqnx9*qqHN|QPgqO
zn2D{95pUem)AXnMJ^c{=K7;(d(63|Pid<@vep?%kY-4$?wDu16i}<n)6f2s4#0T;u
zK7jRwwz~m6c2<r6#~uZLo|lhBUvO<VF$;dx=k_SOubpa*urJ%I>;iTeyv)O5q=<nJ
zTv_@>4sgoZ$jS|tS7d2*SC&*$pi!Tw2C$xw*$eDCcVo_bLr**d=a0aw#i&boqnhj@
zpCDKEooFn4Vx?VKthLV}%ly6VwMN^|tc%t&>yS0qx?%0Nwp+a{KXAq@E5Ci&s)0OC
zC;O@8wjbk}s`goHv~}DnYmc<c+bhLMd$7#4KbOhkfJ{U_%ZI#of^q{lt^~eXhS{p5
zUdfNa(GOtBYGEEr!j8CMO`5acu}Y!@->a(eEAWRZawqupTYi&`;?;ofSKur8VBpqE
z!3z=E5I$3zz<<MRJ>ciGx!gupxtrEQOVcW8e(f{uw6;Zi5Bc5%c*hI*r`l28K=Wuj
zd0#C`E2-tza`;zTcivQUYS(~aZ{)gmoWJ5GpT&#gsZ{<OzYg3!9odBQd@TIuUc4W2
z%jJ-39>TlwDd^X`(3j=Gsg;l=9?5I+Vd&u(=;<E*4s_fz-Us^(czhpgTltro7de-)
zT7UFtqqYv&=WK9#bA6g-!dJeiMe8@UJ6dUdjFzdbL7x1O)<V0lnf$00jePZoT0HnD
zOe+lE_zrK5Y<4Q&j!}K071su!{e}E{d}}qb;jhs{O?!`j%*S)ickmaiHgCo6vF7{+
z@+%|wB6bORgbesB9au@8p&p>VqX={IA5|_a;~Mw~XH*$JM3v-mOjoaY7daO-v?Wzl
zzE$4CT$MrAdbE7VegrRl$F9j+Y%r=LTC?VA6>F<1!|UFqnz4`YTv7H5xNrql)cghS
zX)QdHSaw`3L_O+URas49r(`E~0#8?D-Bnw*6?YE6|CDMZDqN`U?R$7j?V&T4!9Q3F
zU#um3ntAXdEa>*;Yzln4x@wjh#Wuh`+=S)+fX$P=*a6&a$BxKy9NAQ~y-)te_DHJK
z9-$huO|l#NT1BIZ>8xzUYQbmth)s~?m|I<x87fv5U?=34GEGTw7MTSN+5Io2&I-!z
z@Qdcl%gTrU5a(BDmdfzk>O;Tm$5}D;uS`XrVhMC0dBaUrP4>6^2UP+0WJ6X6zUxDE
zM$SMl7^|u(U=;tzCM*(t>j+<M6}-Avko#`9pM~*N#aR(}fsx2hESAqyHspGQnjk6i
ztghC{c=;LhLv{6^I4xfaxB5!9mWQP&#^L^9*-}21zsZiGmO3O1NcUM}v?|CW&=OVT
zFq{kVz3d2yY=Qj!W#sPTkgM;8uRGac`6b(ndfH*g%%{Oi+{Ko$IeaDT<U~#u=Lze;
zJMm1!D07jm$!7VXy~45Qp;BWX+sMZvyWX20Vw3p+HUT_%2xww?wnCc$E^|R|-)3u|
z&tth4mgp36YL6g8I!|Z2`3Y8wpJL^aFS>{LXB|6@>JN)Gfv@!e?+B@yigzOTVpOpF
z&G+-hd>q~%#y^2a_7C#D0p1)oe7shN?}X*4sZHgzv}2Hif3+RFKO|!hU&w#u4-kjn
zM^DbN8mJ_x!raijPf&GHo2_F%KnH(-dgf;E7-{v=8C4ZrbOsf{VXP}=brO7+Kh$Hn
z50w}1vf=Py+p#O);Y4;`^@nFU5ePZe-%~yJKWaLwfK`0~H34%u6C5%C+%f`3wZYMo
z;PuWy?a`lVG%7{<qdsW{szhcXZmGxGAeQ<UzI`Fq8N5}PwTDl<4Cl%4azBAjn1uKt
zOLkHo$l}K;9d#Df(Wgg<pi|_1ISYu)3Aq-wV>Pm9CxM83hxu*`OFkJ^VH_;tzo^z2
z2rE-r)kaN3BLy8T<4{SFh)n1}aQR`xY<uMn#2FnCSz(O;Do<XiYHA29bSK#OfsoZ6
zkRpS923d?@8^Pt7@br(VM(hIo`xv$X{+$oL`AZzHM^5uU_|pF&%KHr?ybKDgfOqj-
zu*G8d>xRc2hOy1U$dX_Ony6IyCFE)}DpY>P_e!8AiHIN%z(Y?#?;2qn2dv;@)M7UU
z<v&K<$Sl;-Y~^=ZH0pk)^A$i2dZWUrsWuXP*^u{UVQPy!AdiZs;+`$wk7n9CQ8jf|
zNO)J{WmCiu(TL1`LTq+Vej)S3aa2?7u-Dpq>|gE4_7S^^7>JB{RoM!@Rg4;jnaff0
zkXb&@T&P!R&5xqOXpWYmwbt+Ijf~Sqd1D+r!Q)y-z8LeHq#hs_z7qM<?sh4Ar1iet
z6<%mdF-rb`wrWC-IOL=<U&?-D7Z6*12U=`YlVq%9@^g`Fe`8;@E?X_^3)Xq-Jg|#u
zs1GY3$I4Z*7<A7)RR<Msr4U2BV%u3fFr5G_+aaxquJj4UbK^Zng5xD>yY}dVwPJid
zyq}$jNZN`l`!2@U*S=&U`z(sWkGqQ%i>Fvy{s+&8dMQ7@3LDag??!EolMMk+oECFL
zXXHBL?6R=$HSG6MhgMmf7p1^Ymr$#6S$07r{S*;g1H4lQ(a3q`V{IUv(eUQVAvXHJ
zh;c+adK!!LcZ@Lo0G|#mQv=l!t;A7#2J-Kz)?I6ZU0x)JU1F~sjVP`!yMc`U4A|l}
zpmbF}604flfjfrFD7jsHDLRS$b_eSRdz^jLT5pAmcu`fHhQFK*1a6}Yhz{VDQixv9
zA%m3xDV+t3X()WI)qIM!4>dKf^gBj-hh<#U8yjK9BF)SGLwtV)8nU){Y(Ga1z8rj^
z^Ww3n3|VQ78j5;+AH2Z<u-|EjUjF7qk<b4Sqg|^EH4k$#SQe9B(F_$lKSKt8LFHdD
z@ONKW0jiUIfeMG}@WDQS-Mz)GvRu>xOb7pzMr%8?e%ev(lIGM8>eKbE#x^6rqn|!T
zf3Cl$cjbxP2fZ>x&4iCzR5p{}q0(=Sv>^3U)C4x2?Pl9h7uNuuNC}<*O2zUoQ0emu
zaybx)RU~}ma_Xh558CyG-Z%hkV-O<v?U2tmKzyj)EI(>s>q6^qW?O+td6|bd!Z*jG
z#d-X9U{PCvlubcx-E;K!3slPu0+(C_udL#qavIAL_->b>v-$!<aj9I{AJKFl=(^pA
z^?itLAHo89*g0S~`PppD%LK^wSEyI31u3U0w883v+=kvZ2Rc+7YXrW7o?V7m{ucWG
z32>Mv&=1$3OB$<B**nlZbyy$O1QvfeYFnzn)2IbG*o1X8exM!&P<L?%a+-&?cR^dH
zfh$wtDI_pjJ+vA4$YW@+(rf|{p8T-Jsc7#jw7m}fZ;JD}(Co#46C40F{)DWzL4-aJ
ztJQlWT0hMGP-XdZHJTORZrHkts0h4_D$_-LvI+y@cv=nNx#}$ZslJ#M#&%*I;zYIs
ztH!+Wyjx&R{B-p&xc)wcEl{(#13i1ouB$W9qf^xr9KC~QN}^^YKkV-bXoaglmqtMj
z*1#k4t4^q1yQoU@y}&lc@WQA#+Jl+9ifDd6OGIx{*;M?`fc1GLaO*nsxH#_$B<cxE
z0Rqw)JzdAX2IjMfZHCVH9Vp8*b`vX^o&yV-29%=;R*C`bN0iVIHtj9Dss^)((Blu-
zGEjdIXxsp};4i>uDq<yAOW-OmfooEI@+9`T`W3cwFJ`4I@WFDZ!yV54g-@5C%~bya
z;n30c3HX9;P-HTyCz}IdDU7xMJy8>>AQ^{%Q@vEXakgJwKuZSVJBB?!@Skyz%U>`u
zovmiGgDBg0^fv|)T?vSeo3Dn&J<L$Ii!AjMbp;aE9wVUf{S0)g4Q65jBCL_9yxfMb
z)MqQvhuN5gV(bWNgr|bu$?76{+YTC{F!WM$e0dY7z8#c{!pxVzo6Rw<u8{SYY6#Zu
zarP-R;{!DUJQxvtzBc+i4o@FbKf^NJ#=7AY__49zMJKe+9pJ^=U?t1IXZ-?ofeTc9
z%u6_Ey%TcL4fFmAw7Ct;DiNHpRv}IX|22kJJ`_imss_1y0&cAb9IqkJ(EISa)6r%E
zcrzSzq!)qO^}=rws=v#Ds^fvAmBza@@r7DJ+-nWSw;rp6+TxypyR9%%C-BfuK;bsH
zwjOg$tIBANhlxs-qTuBM;JtZ3(?+vd&?R4>g>3a9diV@B(2eoL!?RDt?>_iFM}fQU
z#@Sflm9OFVJi=J^A`VSty`XPWVf}xFpBu{tf;MsZ-%F=qG;7gz0uUzpzj?oemXH|5
z=c*09wgGtSDzp=gcF#bLGvEUeqIwc_`p<wBZ-Z^U2#N9Hdj}BRUx!b%6!vE#)(DOU
zTKYGz#_qr$=c2l`AE-S5Xy$R~!CiQ=GJa<Po8E`m!HI|?6&}zSXsEA%rHzK>=nTDc
z4|?np^w%nAruondL-FN>@Z`4Ow+r4Fh3zc9@eQ6^i#I=qC$krCoA`1+jQJp1Pr-Nd
zaC{3EeI&HaWzcgubPoNm6{|p<7Z`65wg{T(i24!|^#U1CT5sF|b9xtCME}1~2h3m?
z<mnp5))^9$0f{Pzw|l^r4@aw;fLecsb>>+z4l>pN`uqZV+!!8eEqq}(`t4$I=tlw2
zeLDQMGSH+Z{ILDdcb~!sT?5Jt#F%5@>CVB(EL<B2uX6|x+>@Xnt$(Nut{M$=A6PH6
zc{1jSgTt>vuUCOCKMl$qhemyZ_D_Q{X`s<MQ2862&qZ|q1W&)j7#aHa0@xo%Z_BU|
z;F?~D4KvX8Ma*Cg=!Vu96Ro3L2}&~dJ7%#0B<v<Ax*EN?jvl<m3{cGJ1)m%TWy4|P
z(qYRUqsM*mL|<@25wu+d{b&Ubv^zY_Jd8D2?!-K;fiK@47UMZa*&lM73>kWdZ9yhz
z4Sem7*k)+B#_-6#g=QEA$+(Irw+H(QG0-YJ*B(-S02=iRVCOyAF+>dp{x_8tEE8wt
z*ipQB8ye<wymb!oQW3Os6SA^`eWPyUjr*z!m*DkG%qi)(Y;^!Wqy_y^4my4ge7HsM
zcRq$}*Mpwv1U>x*+F=#wzYg}aGV1{^`a1Y14N=H(jP4%h={MNX%gA|LkYwH4!a|;r
zqcB@BDn}lHcd!C+!D-a>odrslsBX!Xz>^>1cQ~rX#{e@Qh-&UQbyBVY{|*7?%vB$N
z{%zowj)MOkhxp=^i~vQK;4Ak*<tnhn$+8K)_#NWg(eOVz%Ux(AMh-zd`5tPTH;KBU
zA&}MxQ63e1Be0I4vRoxn?3ea6dzQV!?rQ&F{|WRe)xIYFk+Z=Yok8IX>?in%FR=!o
zx%QHuhUfVwp9-J)XXLqVX@(xFKLaZAJE~~MYxz*O*b-|81_KLetL?&dL(jtsgt^++
zz<}=aIob-WNXXER0AabQjf1Ds8x{WPyqs1MZ%)-(;TuhnQQL>_?cj%jm;Z)}t_bZZ
z5T!PVNZ(+7E5U*`$9&#|-$83~Gr-X!p#!EM`tV8((N{R+?H(eiaM0-w)Ny_+%gSi^
zfjDO$L(S$LREQU|o7f-Om2DdcT8v!@TcrIVR&e}{di6v0NxK-TVW)_Fz}&_oa_bJw
z*^9kl3sBX$Sc}lN=$i4Z(ZaFCdC=8?$B6b~j@8&K>tE(OlUL7n$qYpB&3GrEN1tk`
z(n9vLr#(C{-9Ode!#_Td9e9I$^e8b%<l41_ZT$?S`Db%xU@LI+4^jL00A6-!RGR05
z&%YX!DX$MO_Bpbh<vo+a7e{W7Y^yc^+4~r^0z0yMc(3G~Qw}YF+9Nlrg#UHUHwue2
zfqwS-Kz8o-+?s*1Hv9(T9$#)$aDC}op><?oVyijHdL78j`#f)xHOa1wbqDn!)n1k@
z&zaM$nbrWSxfN+MdyX8*2H_6l!!d6@EZM2%80w1jT=!&$PmD^9!2jZe-Zn#pp(nSO
zZ?M0K-pkp}Xy8hBxjh>l=d~5q6n}TCzS+w!1AmIEys4w0yQbqi$Jfs3Mo)IrUTfu`
zChD3UiR|=`atDv$Em%dM+`l0wv&1T8uC)pRG5!?s22dMBKR)Qp*?fwA7geOkjSpSb
zJvYLRMs$h(DyFTouT?}$3uO5><n{3-2kNp9JeG5f>#(z|tBB({ziV&y)iv*-HnfZ!
z&r0fh9kX3Yj=ET?Rukw?2T=s8bf&8BwVs-Wy4#Ix81U9av#UARGQ=n`Q_fVs$VjzH
zT(W1{r^HLK5&8N#!Tj<CeXP;IdDbP|u5dHran!}ghuRo(xwvL-vVJhD*lpBc<D}<0
zvh1naVtz>N7Xh;vDqgPP{Z0I(Hd*gw*!mpaOa28<B^r8d8Y_tUxpn$I;5GQ)qts=q
zmc7QBW6rj>qlUpDzgB%vgS%e*WRJ0LV9iByAX^uJ&6LtEBeEQ16mqt8U3K3JGb0LM
z2}U}q2^Y&T)^6)=V7}c+8IA;Z1-*n3t~b%ntG%L`)!Ez)l<!@&oh54B^hJ7%eib&U
zD&o;b>@9q@4<Uc!wI9*94or%T=5%|C)y>+5Xg$lWAm^xd;N$_~l&y;wSliJ`j)nG3
z0*>28k2ZdG)O9^`UH0UKJEK}gx!tYACSc-2tzS(muu&dk6`im2E!sJwi~bM)Q+_W_
zTQBUdRd1|bd5_oC^65W9C!A+}fyj4;k2eP~)GPKiaOWJ=krh|(*-Nc4ke^woqxj42
zD4xhlayaJl9kI)9EVhd`s2h6^e)CwKtlih27{i=1U4Oe@hFy!89Qi!V$JWV@m}w=O
zWdeEjOPK&vSFq2GwfcTOLXDN1fD1ep<AD#P!Sd)p#_}OI6N|k6CS)jHz<;IHwoO@U
zRZ;ycQ;>6-kA;!j%#~I(<OB*x2e`T^qTYV?KIC|MiPdrpEMq}FSDT4ym9L!hTvyzC
z!q!H77}+kYJYs`a?3&fl%<x~gFNiM4Xs%<cjg|V>{4Tt$o3aM@FvE@!yAip)K;%<R
z%LUq9QyYtn%SPzM_h6YyF$s<Ty?7I-X4kSRn-j2V;(dFt-9nzW*Ndm397gmG*0Fpc
z(&Riu2IqM*RD~~f%tL;!Fe-AoM0Sj5<G9QYXqG5yN&h7?-F{!pR8Qn@TCVQV&cG8L
z##YO@Vu_exx0M%>`Ra+Po}2s*+Y9R0yt1|kC}eHK4@1>YqOmp7N;jVb2BI=%uern;
zh?<Ksz&YmtMJNld=?JvsQ$)#5#80TqGIlzex&Cm^4*N3V^T=}HUVRyADZHqZ-|TO1
zO|gd9`^9(i5T6bFBOQ@~gRfWXWoguZk3qI|7gq1>R1U;=bGV-m!V0pc+9j;0sfCDe
ziQOLSODdVO0^xx$bCS8yS_I^1lW@vD(hbC=y=;Q@Q6Is^-eK=(f9P+FMb1j@=&;y`
zd6CB>K6OQ*c4RVdCcBw4&B@l^R)+n7;IR7LP!Y-aH{gUdh(_L^uIN5idyRz$y9_?@
zX|@md4dj*bAxBV-C$K&uAJ)TcH!lXB`nLr7nI)}gAX!UA7}jMCfK}fJ4{ad$wLHIp
zDE?D@h%v>n&soqt&C@4ryXT>Epix|Jk6EZ9yCYLM!Jck!6@LJ0t|AY~A;5^o!3&|d
zI1kbDK&+gn|2L^Cq~>=><U{y2v)O2%0PWz1Y?bYRQV9E?JrTArfK@*Ub{%^=q~;vZ
znLWq@El1vZ4I<T(=t)IXuADUvJN|Tj>MH5Va(wNOsD64^y8#WspwS|cG4zODSc7m2
zh|C!~4j9<aKsbBBi|vIN<quX9Ir&+93;z!oMQ`2$h;(ISB5q@~+9%>?tgvch&$HTE
zn}MP&vr5<jdn9n8;j$h4)5)wo>TI?kXI|5Ycf>k%*G|_A*9XpD9Nh7)QBhk7?{%vj
zhD>f9u?-7_4_hPc{>aB&veU3yX&3yV$It=g5L4&plkn{sd^u3GhP)JijS7j^z+S7$
zKB7KGA7^*9ggMmu%NlFlvyNl!zy?(CH-s1T6*4nnSkKW{FK<+IBsrtehyJdL&iRf!
zqnN?96+ljw$*)8@*17EgC0|(!!0B7;qCoWL0GIq8Uhhbt6EE06R3@zAXHZ4;nor=}
z`4-gmG*G*Nh80FmZi+3e71jpph;`I*VAV?*cx<g<cg`SwZ^$!&LQT-?8igI@oTXeh
zT!&n%oUa^x9W#w>S|;MfY^)857vscRyB>1iGcdDD(S!VQIaZI1h2<Q<zQh`g58=Hn
zL)PpzPs2LS0em@Pz3%Fm%)wf{V|G7e3<qPq#B%FLtU=p>nVc&c$s&ka=CS^~g!Wkb
zTVG%-bNu66>f-JyuG-Ecjwr_oeHLHA#vyl@B<hQjqCN7D`Ry;zkA0|I_*jmTMG@0A
z1H$kZ@csGl=}=pMJl+ldBXR`I!3lrK&d9!RwTIg!?Zwtq>zwt_x@tAFv+Yr$0`fUG
z)MD11*U{Yi4Xl-0?Kt5)>}ug&?)uJI%Guvh%*f<#*(ucp+%#N#B)+!`Vm`;%&FnY!
zJXD@7l^-BN>4G(#_gFLJD9&K5PywtuwSb)U<6RJ0#H(**e{tI0Y*({q!=~)CmRP@A
z@7Zs$W<!%N<x%w`>%prc%X~*aVqA3OI3K$jxqG@kadKxF$6<XdvLjz8A2e)Zpu$OZ
zij@F7IT1MS7ow2-M!ttww-92KL*T-1vHtZGGJz+6R*pmFGJ&;H*H9~2Ty(W3AzNF?
zs$tEsx?AI{()I;AAMny-xgL6<CoCdE?ZXS>r6b1WbXRqkaCLINb-XhA>ofR2EJmFY
zC4y*n8PtPRL$zNkTN6`7eQ1Y;hyp(ZitvWj#d_ZJz@cqO;xS}QKj1^yuj)@(5*B8M
zT^DP@zP8@AdRPmsf3Vi_uKkV3hc&4wSi$!g>l<1cO&$H6cU^@%H$DHkJ2`FRKmCN(
znR_Whwg0fDS<SKDvlcM<37~}&ynh5(AVsOu5g&CyZKDU7?o&W&zv9KT544l;>GEI+
zCS&zXN}xp`f1pO-P9Vkn4qo|5o6BfKrv-U=_`ubS4vu-w{jSy?D{MtX(a7IDt&K|j
z1n}0v;<{Dbnh@AzX4qSl4{~+`k#Z4?_iw~&S@NvtfE-L~@cw-0fm&Ez+fm!D{e--7
zcSO5?$S(FH^R9oFZ?Eqms!ERsT-N{bbPiB*WnUM6tg2RQ+eydv#I|iutd1tuL=)S#
zZQHi(bl3C$cav{@t5*k&s`u`@_h6rW_NijMv^NuZ9)pLH8YIP*EP0)hjc(NP{@Eex
z!{WrciQw6>z)Gbqe9jPOl$FP9W9&6{*r@K2*}TB!Mv-TBlQk)=yOJKjsqS@n7i+*>
z+Dgae4C+|5k5U`2nNA)f6?LbYrGt56_C}wGiHUg|d}<`JPQqJ>1B$NGDgMp<LCv?T
zyhQ1&_4c(1tO@-TJ}`F9xY4n6e>=GVjNpoP19PphIoQTr@64kUAeZu;vtC8g<a5$_
z_XJik7kG4Kkk)!+=GUd3$|yCHx|+K4IgsuZ(sO5#ks@eB$BTIzb3A52@SbtTI!71n
z6go?X5bai{H*YZ*$aVRmI#R#wKNNB{tZuCNajwVd6V^bD?fESUw&!Z2knuWL+}_~5
zqPzUFY?FEal>U-Gd8?cVBBG<tQP9W9AXUYsP^CA0?enOKC!q3}k25&OQOxT>E9PXd
zL-0<_qTpX<OZ#6ZGj&q2hkrVMV?}nl7rk+EGc_suzeC_fs2VXYcK*0kVn6U7mG?V~
ztd(|G^PaISIM(dq+?JDSo8U-Yq0Z3-7C;J^$_41upXbH_(_01V@B=Q;4|rkqmE}Zr
z4ZzcPc+Z?ob`4`kaAdH5%&6eTU|uuK&I=D_0Zf|}_EK!iVxCC?BJ~||6Y3LX{D%YA
zL-&R+i?uKI?TAMHQpyddFDHKv{GK<#N#<z#o79CocZ|FqB={W|a98&GV*93Dl$ynI
z>gRJn9nZ>n)GFl3Phn1Ek`1D#6P(75=18-)kp&sCAHhmSjM*Kw>jpZ8vpP+9CWiBt
z?EQ}0nJZ~eJekrr&)+#DLD<RgII*rqY!A`(2J(6;j3w|!iOufj7qhTiQi=ofp(oXV
z;aHP1#A&D9)bxvo|K>KH0%52pHK&X664`n{X^WTK0Z!hI+R1PyI~AZ`u*Q0r)vR^a
zH9M=5$t{j$J?lP$IbyhJz#I;M_MahUcrN$CQg2Y(XgTy-`efe}-)()n_EBA+_E#$6
z^9JFun^Kud<c7F&;LsExdZ<NLYC5+$70*H-9Lw<hU#J@N!(;f!`}6PwW67tu@?KoE
z&^LTUtznUy&utF_Cx?CC8bXHi)+$0w^qTB_HvQ)LsGke(zW_G%5xG2PzMT40UCb%&
z=1b>~^ylHKa_ckI3`!IE4IZ#FwV^R|FkZ9A*;DMM_CdQGwfVf<T@+YUG0w>mcp3xc
z6S6Dkgz=F~xe7}tJ)FnE)YOWAN$&-Lq2JN%?~Jq)!e>5W-L-0ishqO2W8-!?5k#7o
zspQ`CqNE5|DEH+?%4VgY`dVG6b<wN)-uf2$VB6{awb#l~ST$qe_LXukIaNSxCfkke
zLUswNUb(3*WyL4eW|b1~d?r(=s){E)$-18aHR;Z7zC@KGKM3U~>eb_@N|$y|gZ3=4
zA6TiW#?7&k5_9#0tC*8I-2>MBA1crzK(l6{p^z2^&ug;Di)4eI`b68I*Y<7q*?JB5
zSC7;-%6_W!bwQd2Q?)Gzk~EE2r;ojY%I#J<G1s`2!B&5IE5MB+eluQP%O%iih{x{U
z0q4dq?+3%l2x>YL^z*oTorooqlhY2di`h@Ot`i^%>BtLC!|Pr^J-jiPS{`YkB*6(N
zE6?NpF7SFg$PG8C)wJtcCw+o`TAQKO(bB7lm0O&%Ng!c|-3LUFJsjP+YfIEq>rppO
zO14q}r0Aa4lzntWDgpPPFLCKQ*lH!^UvQbSf_0XL&GDa`*?j@)>TfcX5>6~f#g~=f
zI?p@dF!Bx%k+lT<{0Y9=6ZG*gUR9Hm$fbFmcJf4GisP~j3O15@VP17Lb?4z~N3|J#
zG6Y^wKG^KP;2<dQQiiyN-23EX*PJKxF1CXe7Y`h7JIG=^wAjzE^E1M!>nJyt^UDcY
z^@ZS<xv4801Jj-W%GVn#xeffjCPe;=siUgYeEP$O)w!ScL>Xt{z}^Hu+rsXsNcZk$
z(7e>tHEwWHcY^Ak1HBd4Z(OPtl|WL*QK?u<#cTyN`(=2`?z~?k;`h8@o*MY@8Ftfh
z(BC$08n+lZO9cO4g?~&(%_bY3H6=K#9~As9wSz6->+3;77w|qu*s1sUbisyw)SIHg
zvP~?o&{+J$9*&P+F2JkQr26z1*lTe-RVF?^5VZ)+x258pVMjb6NBd4aW;#5gaJU7x
z@$svu$W`U%qTTcG6&A7{^I>7{r5<(wRP+jQuSHHY5>&sYcbz`%p70LGQ~k+EM(~_2
z^Df+BDehiq>n3G&bAc=hUCKtR!9+5kN0Nh=E+-eD_o){jO{jI(f<IgV-V1#zuwD|#
zKgron!i3(+Z?xm16p>y{RxJl-Fh75%MsY+aC(9t>K2UU_QYKV^gc9XbstfzMN1^{G
z6rcCNk~+x!9^@Xbk$YSLaev002wh^K87matgy!Wt{{IR*Sg1=M<MRPF>W}8#H(v8H
zzkPz&rG^O-+=f3#^6&pxn*~%&Mu5`~;$KmGMX>#cQE`|+MWQlM+(-91e2h)RtewE7
zBi#4S6=$8(ncDqxdp~^Ig!Wx)p4E~Lj92D)bCtQ!TxV`GPn*fD8d%^A<S@2fhSR3P
zkSL6jMk!8=_-KiZS?_Lk9XGkx0ABPv{N6;?>=FBX1(msi>>i;GnjfTpDEsgru|r9s
z<MCt*yU5s9khP2j@u<t{mx9X|8@s!O9X*CKSefUQma1C>D=icZYtfl7f!CGfoIIuW
z#Q4=fkF&}t@F79szff#RDeUAPn1h+&`~3%cy$3XVnKB6-oqX7KlS=wEI7`pv>nPPk
z!1HSWPhv4Yvk|Uo0T=<Rv2873E5wt}avx>6ZZW|?=4@vLwJXYwYK0A+LtXSgvhMa=
zVQM~vj&65hk7233feCa8zgdYLP=ZS6Q81smT>midE4<J0&LR5|swF4P1?EfhU)Y`%
zh=S_C)b0aoC?9;WG2lyE@h&C6t}j}vt-7Esv&o${TZf3pdckDLPKDqmxnl@t-=#ts
zDix>SriS~syA4a&#jD8GtpiDE$m%ZySIWl;y3F3}#hT_Pw_oj9Ze_T~c^sb|uzcos
z`nf~t&k6=>nSHR;pY2g(xXFoOGGedxa1TxRy-d`|qS?`F*>O4W^e3Db<YLFI7*r`z
z6M^L>FOc!=dF3DQyYhQ^=v(`TuA}T^T@&pGPF`wGZRHPi?gX^`YGyT~Qcz0Z{<4aj
zd4lm{(!{Ke2^eF|JhtLKB^s=vlu&oT<h?{M(;M|TQDtd$5=iSXEKmn_aAK;Ni(msh
z!)v#P&AE$QqLS8D|EU-DjrW!CIodp}I%*=D;Gx!l#YtTPi`k9XI2R1;V)U>CVfPj0
zgcXxcNV8-|>8st)o@lA{VtPFNnf6QjprzL%VH;P|ujo;Fas4m7zrIp$p?h@o)Y4YN
zmyU#Ed{}v|q)}1yz%L|Vf5n5LF%b5sq~^j$^j5Q=!n6Q(@@!ZojZ_=YJB|oyla^B(
zsP<J4^6&QQKh#?OQG2SNsjX}xMr+ItJ|=&|+ni-Tj^lq9xyByUr&`0bC`E-C1`}ug
zBelY#Sd?#AjJZ@4ck-0aU?EmvN9$wRZ<Cv=Jc**zTPMOtc|b>01Zo$NU?T>oZXz=C
zXEscAyC@mqEn=)bbQaLfjK0eas{=?yeqw+ykk>L`CXdloxdZBO1Wx1>c6To<nwY67
zriWC9$yXR#f03AF4Y~L(qM)lN*7%iHN?#bi6_nK|i;RaKe1iJW4@E|yYM9zV?WSH)
z@4yIBw1Qd%tr+N2Y*^iI@vUprA!;Sn;bc~aMZ5vNOFiPncTytooeR<fcmnm|0%Rr!
zO+pp_1#9peJoO-%SSjj}#i<L=z>0naBdWnUJ&7&)O2(N7D>D$J=r*xNE#)*kWxrZp
zZKAGJEw#8dOiQV6*1N$j-wt=afjWad6A72?1Z#H`+u5HJ_P{L$GiD7uMbX34ohR|l
zs}38m8O+d5L=^k5rb|!{IRr-W%#KaPqZyyWoblM&E>2f4(oL*<BuY<3cv2a;msVK8
zbjntgyo$0*zHuFowe9*>HIC9&n+$Jd67g$(c;W4>>t<oQIVeu3(;60f0xDszT(~pz
zBf;;5jlT+p_kJpXpPYMS_urgi)EjeBA#<Ijj^Mv7g<Ds_{$V|{;u0;sAgZpzS5EST
zo1>647si#zM|_x0f5W5t;AUYb-2+cPPG`YZdNrmgIuXwSwXAlJto@T#MlGdXQ!Znx
zTfl`K%iS+TFX|9?zs1?&q<|Tjl1l!2cwps;%UaSwR17<KiHh(Ts{4cR7X$H6P2mTW
zp|ZDzNIgBg+6^G$_2KGe0`IR$tVZ>KoV^H4`$HfWS$Mw9`TceHRR#N27hC*B%0(=7
zRn7zh@uHHSopT3H;5MxU*~u~Wn|2oEw9WE#EV)DtA|t-9Em34ND>WRBe0HwkIM)4N
z__cTOEstUJ?Uc@v*DYW&M>jsoVE2WV-4(959lXU4WFYhC3>ie9&|vz7h7sZ2A&SXP
z9xiwrZ>f<N0J&=cdOU>aZXX!MJED!s__=9#9!<%p^rG^1P<f@Kpz~t7dRaZG9!33a
zliEmG&b1E4`xGHE>x$aTPU7YEd<-J4yvF<FXK%0JJtDB=;yvoZH);5Lb<0sLNJYf+
z4LdNJHOdHDatm*?k;r#B-5FcZ6}wFZHLjN(BxNG!<r2|`IKSDj?`3$$df>{U1FS9g
zE*NeLdA6(ZB%4r!I|wt$;N)eJze@4(y0L#V-h$}j>?gwPfOl|-(}sKHcvqK-_YH9K
zV?@<L(d-p9+az=f)*!MShW}VZ47mgQaSjahBI~-3cyJZ5?i9Y;mb(@mW#x%~8}Ts=
zmd6sF(RN~~L+nQ}kx5M0{7J<4iP-ZKanw8FB%wn8oIN2lx%0CMW$6?w!s*Y<X91$W
zQar^X#G%=!?IhzXV!m~9a&ox##F8$rC$vw6hPs&Z66^QpA8pnM{GQ<TxkLi*;9uOu
z@(Rs%!N7RPwco-D3w`5f+>eO;UT_spu}g2*`O$d20Jc~rj|}qLpW)$%DIYiZ&Fe&h
zA_BY%yXHPI#s~NpLR(SH>JggHLeo{Ks=wylg@XP&I3UkiuiM<~ed2JTw*3=!iBNU_
z%GLXbQc|KZn-~sse6C-p3(Lf%0cz>-U=L-1GnScC5SN%rC_smB|AKcU<{18&24%y@
z_%qj4X!Q#9$Ox_?1_p=6-G@-0OZ5A7?cc92@m&MV<P-1klvjO0%>Rw6d(YiH;W{sI
zwL<Y)?8guME%Z5WaQ{2`-eS)03MwNj*bN(b_WSr0eTpmj*GzWDEO<rh@o`(&8QZz<
z{k+mSdWudH+it?P&t(6I&(*LzkNw^oC)h_9SfdlH#b%z(f4u(|cFad!$K-@R;ya?N
zQ_KRo#}2y0b-d<XkMq;Zd5zWl{&BAEkD{u_^?u}Mg~sw{zT<JOzw`TI*6u|xjFbFJ
z%y)Umo)_BG>)4SqScgZvT2k0kVt35pRVQ<&M~KEzk|$s3O)P(s?}_;le>BAfJLf!W
zcpe`5FMdBg`z(^oDG6u$72P>uaGI#tutyFM*+1vCF8*d_Me+aX<cIG$=POyAj^to#
zS&>WZ#cAB@8CFT?9sgmLiFrYd@mO`SX8(~J-Iw-alak0UC5t-DYmk(@ba|ElrAmcb
zRx+5c4T!P-rsJytdGB;G&6nWHNyznI!@FJz_x~`M)&jEFUh+_Sa(WXrH~8(N(~^<?
z!q&wH4|c#D-r})U*~LabAP(L|9J3SN;}hvS(d$e8^%kzqF)U;qasv@fw<BLD#!1aU
zq+N-VT9WgShTQlJt33zIW5n-%(e6~mdSM4EV<{To|C+-y5`E6;V6xVtkE1?0bQ!Xv
ze!sb_=Xj<W*}?gU8S)bi48>xuWlGXouHz)Dkbu63D)cmz=YFb?2lkLV(DBrh?0PFW
z!W}t*k{IR98Cd2oc);vLEt^zXyN9RguQo;Dawm3k0$nYu$ctWqB<68L-D=osKYQw^
zmmANr1OIo0ez1Ai)RLUMyHo`mll%S)R`v-*VkjT|oY5c~tLQS_OV8?SYHiu+Kb!@}
zI|92om(!Dk{AUYRxF}b6ia!4)$~mIm?sU9W(8g$Yw42o2XKGup&i$lg*!)CJ2I}`S
zi0)E4)11m^=^Y_@dBB;NNHp0S4s{DwcOeX$99ZW|@Rr_Tvu}gdrJ{2@6;V`9qKjW}
zmOL`NRn*klyCu1*bi^}TsI8@;DzpoJKm+2D3gj(w>3AGVUKz<f6(ANl#p?~^+$19=
zjFINBj$@UqXr1a>d+j9Me~Mn2n7Dze<9SO^W%}3ILX}|z@xxYn*~A*8#Ah7h+!P0O
zAI(nb$J2`slkFvTV=*3VHWA-qKE+&{gIIw>c#wbC0i|J}zr*w01YOvK2lC-NJHR2x
zO7_~4^}g>+cNP*Q9iyZ2JP1-tcvQ!TEgEBsDuIv~un`W(4S3=SVFiV0eYCG|WTNyb
z`gt{*c2F%W&6kIIW5DoI(YLS=Y%&D2=M48>mRP$hzS+mKPRx_947);1W=crCTG*cR
zSe2dpeFm#EfegMsnMi7wV~<(k5yTSB(8lXY)h;!CLS?{@PB<BfzT3m_x=(dFGdWv0
zQRI53FGz6<cO=n4M{Lhc*oaq9VHm`&7zTT*3vqQrZITuP)4nP!j416S81)KCuu950
zYpJM4IMvWtcuO?;kz8u8`-dy56Y)&r{B^)<jwj<TOAg!u?y~5VtcNX1A|1eX4&mf=
zVQ-|Mf5kz6RA`^(AtOu=<E;(Xth)uBiXiJ7!1x_!l5^47#@A|*bzGz3FcRC|mOOp~
zHH3e$DkX@53aHzt!7kC>Xo>VL`g&9|8*7#5{6mS1=;sD}tt)m%xH0Q_^-Inj^6M?`
zVV?IlR&o$mmkPU92=qG_*EyO0_u{JC;{Sz~`BK)q33j3&46=7H^Pa%cyGf<ICpxR=
z=)$P)jzS^yJgXAooaLH(J5kPMSQST|!gLgDckfZ>J;7a912wuY<&?M6f8K&ME~@@Z
zpFmAIQ_pF-o(Khqztv1~a-}6~jf=!vHrRI~cnCg52lqq=b_jgI^H}W<WN-(tbYnmT
zW`T4pr_25UjPko=PY1a24%oi9L?nB$9n;xMd9Y-OIfXu0aEa(q*+!?tXRd85`av-u
zv&~QlE#p1{X&el;)1I?i9V}w6R~~EEkxV=`mVBX{kq+boN=~(fIv?9rRvWB!*RHBx
z$-*yS!A{Y46o*cn`Q-33x$<|s+G@8pxP3m(L|az63TH3^o6(Hxo<hCvE*AY0*~=ZQ
zXcWFG8$0GTQOPwtY8&it4I)>Y{rrfY(`U{YP|zLZJ^vDWf1u~N8+l1DV%f>muygXW
z4S7aldT~|u+kRfTHmJ~5dOilyG2+1ym<pC&n*H2COR2R`JHgf)AgASeUUAL`xg|kX
zI@61Hfb6sp_)8;liqSA|Yv4`m!d73*%9`L3#X*g-vKsNJDsLykox=JQ#@EE5?{XS;
zBN=&IY;b{WZhW_^Ti%_@?#;^XI|k#R6?~Fja689g*Mz=IUh<dScyS+Rq$<1lu9S)#
zWSbmAHF+pmNNlwoHSIK7J<X?OP<Me2%#$+{PhDl5>!VhCocDOj{>b9Kb2?xrf4EtR
zRt#c|aANSk!Ef&4IkVE4mxhlB{OB4i%1G`>%r$yUTu}jEmjGPv1J%suFhL8#2W^Z+
z%FHe(@8)53FSva<J<sV*yXe-T`Z5HoBPKJHz>ZD^*GWjH>?+xki;_1jRX!`p)#fOQ
zX3`pJ4t2z<WGG9i;8iA$EDhhX1l;ZByvqzuawM2vJUm1jB09kb&PH@GkevKBe5#CK
zs>1t6Q-vG_;?xBH9V8~(MP8nd=k=54)ETs@A^gn*FgQ!mIbIO_YZNDPEU&wYo%f6t
z`Q#=8QER|DuV6RdgOgqYueF}IC4@Y_8_~xl`i6^e?VC}+uB^_$FE3JZ)9XD)?tn#z
zpf}<KzAFiKx(wcMD(|_9nwaQ*S&rR!1+JcztVi&CE`as>*%gn#j!$CwI%7jhlNmVd
z=oLf}o#3qRz&@`hmx2jL9yOJ<y?{Mii8XOtgY#XC?!9V6BGZY&mJ!8X<XNU9hUvg_
zJ4pS-U<cNdN5T$x3QAN(8N&MBf$`W16lsi7h|cM;@<K3;+<4@y?BI%Uhqt05eG>JG
z2X1;ga$6D8iSC93Shh-7y!pgZr^(E&&<DC6yWN=GoQ?QiO#awI%-M#0x{>F#lATc%
z>o6XSaU!d~f^)f^*L;K~b!L2j5wff{d<q8gaO~v;;>-|`jmku1Q`jdrz*h6X=orjy
zIR{TpfyvtoZ1pC)Iu@+0Gd%Aoel{M=@}BtQTEq)K$oO8f_fim}btPYY%}Ggx)vLyt
zn@ALMk(GYVs+?tQ{sTv8%e&?HosZpTZx=#YB$^uJJnZOx;*yi>hj-+WZ+V`fs3bJR
zCbb6vAIa{BVqXvC{BGy2W5`c(V2!$QB3BSsejt}G03T-vdG|(e-)K1{QPW5|$#mrs
z9ce}7rCfJrIL87h@6V|Yr7OXQJ&6y()q;5Q6j8L8zLt!=Qjy-E{+yh}#H!=Tk6VCi
z<lsC-6K~%ja_CG?l|$aU9Q0%YmSQ%T2HnV<zO!_JzQt~&ff-*3U(^^?@wR;Q<b9VD
z&wr=?qX_nTFdktW=jIbuI}g|03lF)Oeg5S)tD-t_=zFfZHC3tg>`^h}O-vR#@jLRL
zLzX;)Xy_2H_l#X4rU+*NAt^}&@;4d!bZS2<S?dYBOG~U)b|P&R3wi>+bqhG?iLiV@
ztjRYlXk3&vY}CYmvaf&Qd0b9=I{bY$c1s>U$`Na~<T<S*V|q!}BJ_$Xu^wV|)_{0F
zWw*=V@}<DiCxdT&!ZJ>x#v(eQ$})HCAGq%Yc)yZVm}3(G<$~kgm6NlSjO8`iX42oW
zhL|iKmuRF4XR#f-yE7|P7C)bqSpFSrzMcEc&6;|w^99&2`>An!=6b`ul-R12SlSR?
zJ3e=o2wNreqe`*%!^zn8kPD<@T~4#opNN--$RoJE)A$?>rf_^t=Txl9d3io@c5f<R
z*LhM&*%in5pbw6SsTvtqCwAaU*847b>M1hqljNg^iNy|+h20?^k4<JSri6*E;~DJH
z#>Azmv4B~*rZikjYy9*uY{d~yU>YJSkGr@{1b&bc+L*3^S+J+7VJk<Y7BZArPxKY6
zCid}xK_wwN??&WzmUYO&>I}f2T_l^!L<OrI_0$tsnK<z7ODNmWmidAg{6g+jjSl8y
zM4JWJdjr`oTgYrh*1UsE^)Q}$1v_aUe(flJ{Oj*sFEpXbumVZ3;kVf-!>~eS=yu4%
z8LiB#4CcIVVGmtq6~wF|G0$N)Iq(La&OyF@oBi<}Uo57gr6)eigB2H%Nn3o-SR$aU
z*shbD)cx%HrCen%{6%R_RWfh}gZNI&GkMIb+ypH-%We~|zLT@Ik$c~WJzUSb@8^9^
zas{_o3o(oA!|%QqG5sn%@70i98AYvNGg;VfKKEjMHe!>faV7?m3peLl%CoD)98l5!
z=5XSF@c9`JA+V;0zu#X>a20ctF0fwr_?oy^F%w9<pTLCDVH<L>J6lp=tjA6rNbG-|
z_qsz3*^mDY2QP~Qs~{ljoZeXcFBF9h162A37Iqmw-;fAPOrg<0aK3{yeI>USGi9%E
zcUw3a3()$SgPofQ#yEq|DbzbBa0Z2<*9z9<Ef`NEu}DvL!ghLie@My6#rwjGyA7YX
z5}g<y<sx!HG_U)D77MMgxp=^a)a7ck2I;^ZhJd+M!mf4$Q#inVrQnXjz=6cfv4>p8
zCGJ;fObKNyaZOYCjZs|F8lLoZRxCELiNJ_naMg#{0h`!IViu-Qm=ZIM#6-BOJgLLH
zy0B6&v8-ZZmY6ao=DLfiGGbDem?k4;(f*muBj%fksVL%q+4#u99ugCm|4c#8$=~^T
zdc}$3=)lC@iTRG1saA=PY}m+rV12pyDe*gE!dW_ADIMPvlhH-gDyFT7Npxa9RUGbD
z%)I<F#YRj{5;MFcu3XH$v8d3B$!B6pk(gxuXHLwYY4Bn?&ntF<nAjyId5gK;V%E=d
z?(!KsMNI7ybCASLpL_i4G2eT_pJL*VsQo_u{TqMg`iS2ZQ}o0P(vQ5Cn2;kTHJR*d
zkAK-%cQH>&Oj=R-6q9xYW++g+czlZgi8*Fss<)U0BPNukC#w*vkb^rHYasOA#P`I6
znG}3aOqt4pPsqYL{h1S&i=W8CPp9GgV)aw=I%)VjBcDlmI^wA%;Jw9l2%J*PXLtYq
zs?`5mF)^b{%q$j@d!BM%e`djmiD%-zzVaP0gXbY@a-01n&_OZFTWGO~y11B%Ce}wx
zSiH;kuW-g6@)KeWpYvLOW+DqzRm^G@=km|WirGM7lBAe4FD5mLxlLkPJ+yAlw?Iq9
ztjP%0Nz6+YbMV9r#l*i?LQIVk>nP^#WaO^JgztiU6lN#o`@O^R@biDB#z*pZR(4-0
zymvu9i(&!9Jnc-ZbZ)+r>9-FSQ!oqiDq^3OWT)o-{eD?l@wmVDmzXmp<{rl8d5PU9
z&cdG=bP~2eOyl~&^@_>LVkWc0E);W<#B8PStd5wFBrs>OyM$hzU=xT5ax^XQ8!uTG
zu{uv!Uoq`XJc&PZqQoq+Pke|zVlk&r>`h_uL@(h7-cjMX8ozg(!l@L~jl>K>;m<yE
zMR8ayaY7SvW-_ub#I#8<>rKoy63<@Di%!Pfi2I4;zQugEbo^X0{!GSQi|Iv)_%k)@
zEb5tJDq$ABpNhZZ@@@i?7VqhB?OV}v%<Wz$)89<JuPePPnWQ&p#kg>;=1D>7bMvU*
z)Z^Jc!g4YHllY@7=OR96{}SwQ8usS^;_w>0%WIx}VeI{TEY=?E<`|Ge8+EvXL^O?1
z_^U-M)Q2ihIs9{d?Av_&^E|BYCVb=t?mq(+onvIE_pq^3$VWP2JG<kzw&79Au})&%
z;eKqRQ19D;&F+ZWpwJwwh4(K*1S0wY2J<<dNbMv~<T%%%W3_t`QSO!$^1aE#d{J<Y
zGRYoRd;|G*e{z)OtkO#?eKW4N2L8A7?`)$QIGsmiEOhva5Kj!kCa=J{9^pyGVz)LY
z9@~qDQOSDa%BkTcZ-cEhg1A@38+`?P7*0Gm8T>68PjnM~qH}oRURcn$Sj`^%dkcu|
zIr`Z<@p}Q(x!cNBy-Z}6$J`6}n{2G@9uR=9RFvv4QOU;|EyjP;U?m$-ZR_D)bvoI*
zssF1e-nhhR`N;EHqjFl5UXx1vd^PVG*<OG2O$QMNG(;C_x4J;9px5xt_b&>h3@N21
z2&NCNFrGPGV12Fv5o)bxQJXUtW(&&xo4h_sE8@vs?68~iS}EK;W^Z!qkYiO;o)GB_
zrMEAu+=i&Wtc!J&pL>1i;;RBv><mcvNi0SgFpUv(V;;1ASY_R5OssiF#I?r>ct^oD
z-_x7YgkG59-Zm$m+X7UeDG_pZFFT0&N3gQtbP&W*7NSqKS6isB@tMAUbjgM38|-+&
zFUA9Fw7d-E&`$ClrW0&n+D0Mks~L0#5oZbol?`a&eUx&06P(S?Q7<dKRk`KztX?Gb
zwueN7Ny*;D#OVZH9^N?>jE|#4agjvhX&oP3Xw9we&I}?C1I&i0J8)d5qf|y`0aoTV
zS?+ze9Q(B$$loj_S`BK0^+?}p-xhznfE|eMOX(hn`4Vhw4Ux_=b?F?+aiQ9AnHi{7
zZ5Y>GS<efgt+P0F<K#}#1h6vrq$spsmans`>B1*^mZT_fk^IDagS>O(JaN5$q|8Lj
zqrF>>Y&V0wnZ>^9G-5xl@UFVE=}CPHk7%y5#qETh@x%DaO4MJ94hmO3tBh8cX^ZsS
zzIODM4MTf&vtO371nUMz8-={n=tBqTEjX>lz|M*7d^4t4&)jO%=aa}4h+6Z=_vnf*
zNOoS{n?-*856V|9uvi<(k)zRSE6LugK(?@&XnHj(IfJ^&U)DIImATxm4IY?}eNms@
z+ucq#81@p#bC8VTrJIev1*>5eOzo#i2J}JJ=-GV{{!)R_AtOUy2GYx&&<#HjoaAO#
z`k)f_hzUhUmEFo)r=I!MJnpOltsf+pAU{aYslF$r@`{ibh7+Avl?O_F$lgw|hpy3Q
za*6u;7xr3m?-2LU+N<KuvU^xhta{WFK5|-?fkkbFZM7AIQbKF0H78yrgP>y$uH##|
zzLJm5JWYS7&tn?M%Rq|Id!bna6}_dwUNNhJMZLjv>28NFn@LTB(%v$sytT?q?<_z$
zBbgiv&yZdkkJgCi)dqw9;hmI@z~_&mq8*QXH=mTkYe^T%1!n;@{gmEj`@NMNO~L~3
zNPgIVkt`;LQ!DBi_ndv;oHxnXYmwQdL+z|PeTH-4oVM2tZ6aqR%0D3RI3!Nk#}GqF
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


From e22eb31debb6d8615d2c58717c145b39e4ca4752 Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Tue, 16 Dec 2014 10:42:01 +0100
Subject: [PATCH 186/496] Remove unused variable

---
 tester/log_collection_tester.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tester/log_collection_tester.c b/tester/log_collection_tester.c
index cd5d801a0..25c824cf7 100644
--- a/tester/log_collection_tester.c
+++ b/tester/log_collection_tester.c
@@ -180,7 +180,6 @@ static void collect_files_small_size()  {
 
 static void collect_files_changing_size()  {
 	LinphoneCoreManager* marie = setup(TRUE);
-	char * filepath;
 	int waiting = 100;
 
 	check_file(marie);

From f16696d24255d73313ee5861ebf38f0a2839a205 Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Tue, 16 Dec 2014 10:47:42 +0100
Subject: [PATCH 187/496] Update file player test to take in account the new
 hello8000 duration

---
 tester/call_tester.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tester/call_tester.c b/tester/call_tester.c
index 3f317a338..0ebe9173b 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -2052,7 +2052,9 @@ static void call_with_file_player(void) {
 		CU_ASSERT_TRUE(linphone_player_open(player,hellopath,on_eof,marie)==0);
 		CU_ASSERT_TRUE(linphone_player_start(player)==0);
 	}
-	CU_ASSERT_TRUE(wait_for_until(pauline->lc,marie->lc,&marie->stat.number_of_player_eof,1,12000));
+
+	/* This assert should be modified to be at least as long as the hello8000.wav file */
+	CU_ASSERT_TRUE(wait_for_until(pauline->lc,marie->lc,&marie->stat.number_of_player_eof,1,30000));
 
 	/*just to sleep*/
 	linphone_core_terminate_all_calls(marie->lc);

From 551cb17583647e8a96f3831e8c6504d3b9808bf4 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Tue, 16 Dec 2014 11:22:14 +0100
Subject: [PATCH 188/496] fix crash in outgoing call case

---
 coreapi/linphonecall.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index 131a3a933..530706ada 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -603,6 +603,11 @@ static void linphone_call_init_common(LinphoneCall *call, LinphoneAddress *from,
 	call->current_params = linphone_call_params_new();
 	call->current_params->media_encryption=LinphoneMediaEncryptionNone;
 	call->dtls_certificate_fingerprint = NULL;
+	if (call->dir == LinphoneCallIncoming)
+		call->me=to;
+	 else
+		call->me=from;
+	linphone_address_ref(call->me);
 
 	linphone_core_get_audio_port_range(call->core, &min_port, &max_port);
 	port_config_set(call,0,min_port,max_port);
@@ -848,14 +853,6 @@ LinphoneCall * linphone_call_new_incoming(LinphoneCore *lc, LinphoneAddress *fro
 		}
 	}
 
-
-	if (linphone_call_log_get_dir(call->log) == LinphoneCallIncoming)
-		call->me=linphone_call_log_get_to_address(call->log);
-	 else
-		 call->me=linphone_call_log_get_from_address(call->log);
-
-	linphone_address_ref(call->me);
-
 	/*reserve the sockets immediately*/
 	linphone_call_init_media_streams(call);
 	switch (fpol) {

From a5288b94cdb166356ebe83dd0d1a431b2994e5dc Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Tue, 16 Dec 2014 11:26:25 +0100
Subject: [PATCH 189/496] Fix Python module tests.

---
 tools/python/unittests/linphonetester.py | 118 +++++++++++------------
 tools/python/unittests/test_call.py      |  10 +-
 tools/python/unittests/test_message.py   |  12 +--
 tools/python/unittests/test_register.py  |  14 +--
 4 files changed, 77 insertions(+), 77 deletions(-)

diff --git a/tools/python/unittests/linphonetester.py b/tools/python/unittests/linphonetester.py
index 76564d9b8..c08c8dbd3 100644
--- a/tools/python/unittests/linphonetester.py
+++ b/tools/python/unittests/linphonetester.py
@@ -89,9 +89,9 @@ class AccountManager:
 
     @classmethod
     def account_created_on_server_cb(cls, lc, cfg, state, message):
-        if state == linphone.RegistrationState.RegistrationOk:
+        if state == linphone.RegistrationState.Ok:
             lc.user_data.created = True
-        elif state == linphone.RegistrationState.RegistrationCleared:
+        elif state == linphone.RegistrationState.Cleared:
             lc.user_data.done = True
 
     @classmethod
@@ -134,7 +134,7 @@ class AccountManager:
         tmp_identity.set_header("X-Create-Account", "yes")
         cfg.identity = tmp_identity.as_string()
         server_addr = linphone.Address.new(refcfg.server_addr)
-        server_addr.transport = linphone.TransportType.TransportTcp;
+        server_addr.transport = linphone.TransportType.Tcp;
         server_addr.port = 0
         cfg.server_addr = server_addr.as_string()
         cfg.expires = 3600
@@ -365,12 +365,12 @@ class CoreManager:
             lambda callee_manager, caller_manager: (callee_manager.stats.number_of_LinphoneCallStreamsRunning == initial_callee_stats.number_of_LinphoneCallStreamsRunning + 1) and \
                 (caller_manager.stats.number_of_LinphoneCallStreamsRunning == initial_caller_stats.number_of_LinphoneCallStreamsRunning + 1))
 
-        if caller_manager.lc.media_encryption != linphone.MediaEncryption.MediaEncryptionNone and callee_manager.lc.media_encryption != linphone.MediaEncryption.MediaEncryptionNone:
+        if caller_manager.lc.media_encryption != linphone.MediaEncryption.MediaEncryptionNone and callee_manager.lc.media_encryption != linphone.MediaEncryption.None:
             # Wait for encryption to be on, in case of zrtp, it can take a few seconds
-            if caller_manager.lc.media_encryption == linphone.MediaEncryption.MediaEncryptionZRTP:
+            if caller_manager.lc.media_encryption == linphone.MediaEncryption.ZRTP:
                 CoreManager.wait_for(callee_manager, caller_manager,
                     lambda callee_manager, caller_manager: caller_manager.stats.number_of_LinphoneCallEncryptedOn == initial_caller_stats.number_of_LinphoneCallEncryptedOn + 1)
-            if callee_manager.lc.media_encryption == linphone.MediaEncryption.MediaEncryptionZRTP:
+            if callee_manager.lc.media_encryption == linphone.MediaEncryption.ZRTP:
                 CoreManager.wait_for(callee_manager, caller_manager,
                     lambda callee_manager, caller_manager: callee_manager.stats.number_of_LinphoneCallEncryptedOn == initial_callee_stats.number_of_LinphoneCallEncryptedOn + 1)
             assert_equals(callee_manager.lc.current_call.current_params.media_encryption, caller_manager.lc.media_encryption)
@@ -389,15 +389,15 @@ class CoreManager:
         manager = lc.user_data
         linphonetester_logger.info("[TESTER] New registration state {state} for user id [{identity}] at proxy [{addr}]".format(
             state=linphone.RegistrationState.string(state), identity=cfg.identity, addr=cfg.server_addr))
-        if state == linphone.RegistrationState.RegistrationNone:
+        if state == linphone.RegistrationState.None:
             manager.stats.number_of_LinphoneRegistrationNone += 1
-        elif state == linphone.RegistrationState.RegistrationProgress:
+        elif state == linphone.RegistrationState.Progress:
             manager.stats.number_of_LinphoneRegistrationProgress += 1
-        elif state == linphone.RegistrationState.RegistrationOk:
+        elif state == linphone.RegistrationState.Ok:
             manager.stats.number_of_LinphoneRegistrationOk += 1
-        elif state == linphone.RegistrationState.RegistrationCleared:
+        elif state == linphone.RegistrationState.Cleared:
             manager.stats.number_of_LinphoneRegistrationCleared += 1
-        elif state == linphone.RegistrationState.RegistrationFailed:
+        elif state == linphone.RegistrationState.Failed:
             manager.stats.number_of_LinphoneRegistrationFailed += 1
         else:
             raise Exception("Unexpected registration state")
@@ -415,45 +415,45 @@ class CoreManager:
         to_address = call.call_log.to_address.as_string()
         from_address = call.call_log.from_address.as_string()
         direction = "Outgoing"
-        if call.call_log.dir == linphone.CallDir.CallIncoming:
+        if call.call_log.dir == linphone.CallDir.Incoming:
             direction = "Incoming"
         linphonetester_logger.info("[TESTER] {direction} call from [{from_address}] to [{to_address}], new state is [{state}]".format(
             direction=direction, from_address=from_address, to_address=to_address, state=linphone.CallState.string(state)))
-        if state == linphone.CallState.CallIncomingReceived:
+        if state == linphone.CallState.IncomingReceived:
             manager.stats.number_of_LinphoneCallIncomingReceived += 1
-        elif state == linphone.CallState.CallOutgoingInit:
+        elif state == linphone.CallState.OutgoingInit:
             manager.stats.number_of_LinphoneCallOutgoingInit += 1
-        elif state == linphone.CallState.CallOutgoingProgress:
+        elif state == linphone.CallState.OutgoingProgress:
             manager.stats.number_of_LinphoneCallOutgoingProgress += 1
-        elif state == linphone.CallState.CallOutgoingRinging:
+        elif state == linphone.CallState.OutgoingRinging:
             manager.stats.number_of_LinphoneCallOutgoingRinging += 1
-        elif state == linphone.CallState.CallOutgoingEarlyMedia:
+        elif state == linphone.CallState.OutgoingEarlyMedia:
             manager.stats.number_of_LinphoneCallOutgoingEarlyMedia += 1
-        elif state == linphone.CallState.CallConnected:
+        elif state == linphone.CallState.Connected:
             manager.stats.number_of_LinphoneCallConnected += 1
-        elif state == linphone.CallState.CallStreamsRunning:
+        elif state == linphone.CallState.StreamsRunning:
             manager.stats.number_of_LinphoneCallStreamsRunning += 1
-        elif state == linphone.CallState.CallPausing:
+        elif state == linphone.CallState.Pausing:
             manager.stats.number_of_LinphoneCallPausing += 1
-        elif state == linphone.CallState.CallPaused:
+        elif state == linphone.CallState.Paused:
             manager.stats.number_of_LinphoneCallPaused += 1
-        elif state == linphone.CallState.CallResuming:
+        elif state == linphone.CallState.Resuming:
             manager.stats.number_of_LinphoneCallResuming += 1
-        elif state == linphone.CallState.CallRefered:
+        elif state == linphone.CallState.Refered:
             manager.stats.number_of_LinphoneCallRefered += 1
-        elif state == linphone.CallState.CallError:
+        elif state == linphone.CallState.Error:
             manager.stats.number_of_LinphoneCallError += 1
-        elif state == linphone.CallState.CallEnd:
+        elif state == linphone.CallState.End:
             manager.stats.number_of_LinphoneCallEnd += 1
-        elif state == linphone.CallState.CallPausedByRemote:
+        elif state == linphone.CallState.PausedByRemote:
             manager.stats.number_of_LinphoneCallPausedByRemote += 1
-        elif state == linphone.CallState.CallUpdatedByRemote:
+        elif state == linphone.CallState.UpdatedByRemote:
             manager.stats.number_of_LinphoneCallUpdatedByRemote += 1
-        elif state == linphone.CallState.CallIncomingEarlyMedia:
+        elif state == linphone.CallState.IncomingEarlyMedia:
             manager.stats.number_of_LinphoneCallIncomingEarlyMedia += 1
-        elif state == linphone.CallState.CallUpdating:
+        elif state == linphone.CallState.Updating:
             manager.stats.number_of_LinphoneCallUpdating += 1
-        elif state == linphone.CallState.CallReleased:
+        elif state == linphone.CallState.Released:
             manager.stats.number_of_LinphoneCallReleased += 1
         else:
             raise Exception("Unexpected call state")
@@ -489,63 +489,63 @@ class CoreManager:
         manager.stats.number_of_NotifyReceived += 1
         manager.stats.last_received_presence = lf.presence_model
         acttype = manager.stats.last_received_presence.activity.type
-        if acttype == linphone.PresenceActivityType.PresenceActivityOffline:
+        if acttype == linphone.PresenceActivityType.Offline:
             manager.stats.number_of_LinphonePresenceActivityOffline += 1
-        elif acttype == linphone.PresenceActivityType.PresenceActivityOnline:
+        elif acttype == linphone.PresenceActivityType.Online:
             manager.stats.number_of_LinphonePresenceActivityOnline += 1
-        elif acttype == linphone.PresenceActivityType.PresenceActivityAppointment:
+        elif acttype == linphone.PresenceActivityType.Appointment:
             manager.stats.number_of_LinphonePresenceActivityAppointment += 1
-        elif acttype == linphone.PresenceActivityType.PresenceActivityAway:
+        elif acttype == linphone.PresenceActivityType.Away:
             manager.stats.number_of_LinphonePresenceActivityAway += 1
-        elif acttype == linphone.PresenceActivityType.PresenceActivityBreakfast:
+        elif acttype == linphone.PresenceActivityType.Breakfast:
             manager.stats.number_of_LinphonePresenceActivityBreakfast += 1
-        elif acttype == linphone.PresenceActivityType.PresenceActivityBusy:
+        elif acttype == linphone.PresenceActivityType.Busy:
             manager.stats.number_of_LinphonePresenceActivityBusy += 1
-        elif acttype == linphone.PresenceActivityType.PresenceActivityDinner:
+        elif acttype == linphone.PresenceActivityType.Dinner:
             manager.stats.number_of_LinphonePresenceActivityDinner += 1
-        elif acttype == linphone.PresenceActivityType.PresenceActivityHoliday:
+        elif acttype == linphone.PresenceActivityType.Holiday:
             manager.stats.number_of_LinphonePresenceActivityHoliday += 1
-        elif acttype == linphone.PresenceActivityType.PresenceActivityInTransit:
+        elif acttype == linphone.PresenceActivityType.InTransit:
             manager.stats.number_of_LinphonePresenceActivityInTransit += 1
-        elif acttype == linphone.PresenceActivityType.PresenceActivityLookingForWork:
+        elif acttype == linphone.PresenceActivityType.LookingForWork:
             manager.stats.number_of_LinphonePresenceActivityLookingForWork += 1
-        elif acttype == linphone.PresenceActivityType.PresenceActivityLunch:
+        elif acttype == linphone.PresenceActivityType.Lunch:
             manager.stats.number_of_LinphonePresenceActivityLunch += 1
-        elif acttype == linphone.PresenceActivityType.PresenceActivityMeal:
+        elif acttype == linphone.PresenceActivityType.Meal:
             manager.stats.number_of_LinphonePresenceActivityMeal += 1
-        elif acttype == linphone.PresenceActivityType.PresenceActivityMeeting:
+        elif acttype == linphone.PresenceActivityType.Meeting:
             manager.stats.number_of_LinphonePresenceActivityMeeting += 1
-        elif acttype == linphone.PresenceActivityType.PresenceActivityOnThePhone:
+        elif acttype == linphone.PresenceActivityType.OnThePhone:
             manager.stats.number_of_LinphonePresenceActivityOnThePhone += 1
-        elif acttype == linphone.PresenceActivityType.PresenceActivityOther:
+        elif acttype == linphone.PresenceActivityType.Other:
             manager.stats.number_of_LinphonePresenceActivityOther += 1
-        elif acttype == linphone.PresenceActivityType.PresenceActivityPerformance:
+        elif acttype == linphone.PresenceActivityType.Performance:
             manager.stats.number_of_LinphonePresenceActivityPerformance += 1
-        elif acttype == linphone.PresenceActivityType.PresenceActivityPermanentAbsence:
+        elif acttype == linphone.PresenceActivityType.PermanentAbsence:
             manager.stats.number_of_LinphonePresenceActivityPermanentAbsence += 1
-        elif acttype == linphone.PresenceActivityType.PresenceActivityPlaying:
+        elif acttype == linphone.PresenceActivityType.Playing:
             manager.stats.number_of_LinphonePresenceActivityPlaying += 1
-        elif acttype == linphone.PresenceActivityType.PresenceActivityPresentation:
+        elif acttype == linphone.PresenceActivityType.Presentation:
             manager.stats.number_of_LinphonePresenceActivityPresentation += 1
-        elif acttype == linphone.PresenceActivityType.PresenceActivityShopping:
+        elif acttype == linphone.PresenceActivityType.Shopping:
             manager.stats.number_of_LinphonePresenceActivityShopping += 1
-        elif acttype == linphone.PresenceActivityType.PresenceActivitySleeping:
+        elif acttype == linphone.PresenceActivityType.Sleeping:
             manager.stats.number_of_LinphonePresenceActivitySleeping += 1
-        elif acttype == linphone.PresenceActivityType.PresenceActivitySpectator:
+        elif acttype == linphone.PresenceActivityType.Spectator:
             manager.stats.number_of_LinphonePresenceActivitySpectator += 1
-        elif acttype == linphone.PresenceActivityType.PresenceActivitySteering:
+        elif acttype == linphone.PresenceActivityType.Steering:
             manager.stats.number_of_LinphonePresenceActivitySteering += 1
-        elif acttype == linphone.PresenceActivityType.PresenceActivityTravel:
+        elif acttype == linphone.PresenceActivityType.Travel:
             manager.stats.number_of_LinphonePresenceActivityTravel += 1
-        elif acttype == linphone.PresenceActivityType.PresenceActivityTV:
+        elif acttype == linphone.PresenceActivityType.TV:
             manager.stats.number_of_LinphonePresenceActivityTV += 1
-        elif acttype == linphone.PresenceActivityType.PresenceActivityUnknown:
+        elif acttype == linphone.PresenceActivityType.Unknown:
             manager.stats.number_of_LinphonePresenceActivityUnknown += 1
-        elif acttype == linphone.PresenceActivityType.PresenceActivityVacation:
+        elif acttype == linphone.PresenceActivityType.Vacation:
             manager.stats.number_of_LinphonePresenceActivityVacation += 1
-        elif acttype == linphone.PresenceActivityType.PresenceActivityWorking:
+        elif acttype == linphone.PresenceActivityType.Working:
             manager.stats.number_of_LinphonePresenceActivityWorking += 1
-        elif acttype == linphone.PresenceActivityType.PresenceActivityWorship:
+        elif acttype == linphone.PresenceActivityType.Worship:
             manager.stats.number_of_LinphonePresenceActivityWorship += 1
 
     def __init__(self, rc_file = None, check_for_proxies = True, vtable = {}):
diff --git a/tools/python/unittests/test_call.py b/tools/python/unittests/test_call.py
index daf1f8e83..4357f245c 100644
--- a/tools/python/unittests/test_call.py
+++ b/tools/python/unittests/test_call.py
@@ -17,11 +17,11 @@ class TestCall:
         assert_equals(CoreManager.wait_for_until(pauline, marie, lambda pauline, marie: pauline.stats.number_of_LinphoneCallError == 1, 33000), True)
         assert_equals(pauline.stats.number_of_LinphoneCallError, 1)
         #FIXME http://git.linphone.org/mantis/view.php?id=757
-        #assert_equals(out_call.reason, linphone.Reason.ReasonBusy)
+        #assert_equals(out_call.reason, linphone.Reason.Busy)
         if len(pauline.lc.call_logs) > 0:
             out_call_log = pauline.lc.call_logs[0]
             assert out_call_log is not None
-            assert_equals(out_call_log.status, linphone.CallStatus.CallAborted)
+            assert_equals(out_call_log.status, linphone.CallStatus.Aborted)
         marie.stop()
         pauline.stop()
 
@@ -38,8 +38,8 @@ class TestCall:
             assert_equals(CoreManager.wait_for(pauline, marie, lambda pauline, marie: pauline.stats.number_of_LinphoneCallReleased == 1), True)
             assert_equals(marie.stats.number_of_LinphoneCallEnd, 1)
             assert_equals(pauline.stats.number_of_LinphoneCallEnd, 1)
-            assert_equals(in_call.reason, linphone.Reason.ReasonDeclined)
-            assert_equals(out_call.reason, linphone.Reason.ReasonDeclined)
+            assert_equals(in_call.reason, linphone.Reason.Declined)
+            assert_equals(out_call.reason, linphone.Reason.Declined)
         marie.stop()
         pauline.stop()
 
@@ -97,7 +97,7 @@ class TestCall:
 
         # flexisip will retain the 488 until the "urgent reply" timeout arrives.
         assert_equals(CoreManager.wait_for_until(pauline, marie, lambda pauline, marie: pauline.stats.number_of_LinphoneCallError == 1, 7000), True)
-        assert_equals(out_call.reason, linphone.Reason.ReasonNotAcceptable)
+        assert_equals(out_call.reason, linphone.Reason.NotAcceptable)
         assert_equals(marie.stats.number_of_LinphoneCallIncomingReceived, 0)
         assert_equals(marie.stats.number_of_LinphoneCallReleased, 0)
         marie.stop()
diff --git a/tools/python/unittests/test_message.py b/tools/python/unittests/test_message.py
index d4b83971e..8cfb05c87 100644
--- a/tools/python/unittests/test_message.py
+++ b/tools/python/unittests/test_message.py
@@ -14,13 +14,13 @@ class TestMessage:
     def msg_state_changed(cls, msg, state):
         stats = msg.chat_room.core.user_data.stats
         linphonetester_logger.info("[TESTER] Message [{text}] [{state}]".format(text=msg.text, state=linphone.ChatMessageState.string(state)))
-        if state == linphone.ChatMessageState.ChatMessageStateDelivered:
+        if state == linphone.ChatMessageState.Delivered:
             stats.number_of_LinphoneMessageDelivered += 1
-        elif state == linphone.ChatMessageState.ChatMessageStateNotDelivered:
+        elif state == linphone.ChatMessageState.NotDelivered:
             stats.number_of_LinphoneMessageNotDelivered += 1
-        elif state == linphone.ChatMessageState.ChatMessageStateInProgress:
+        elif state == linphone.ChatMessageState.InProgress:
             stats.number_of_LinphoneMessageInProgress += 1
-        elif state == linphone.ChatMessageState.ChatMessageStateFileTransferError:
+        elif state == linphone.ChatMessageState.FileTransferError:
             stats.number_of_LinphoneMessageNotDelivered += 1
         else:
             linphonetester_logger.error("[TESTER] Unexpected state [{state}] for message [{msg}]".format(msg=msg, state=linphone.ChatMessageState.string(state)))
@@ -95,7 +95,7 @@ class TestMessage:
         chat_room = pauline.lc.get_chat_room(marie.identity)
         self.wait_for_server_to_purge_messages(marie, pauline)
         msg = chat_room.create_message("Bla bla bla bla")
-        chat_room.send_message2(msg, None, None)
+        chat_room.send_chat_message(msg)
         assert_equals(CoreManager.wait_for(pauline, marie, lambda pauline, marie: marie.stats.number_of_LinphoneMessageReceived == 1), True)
         assert marie.lc.get_chat_room(pauline.identity) is not None
         marie.stop()
@@ -109,7 +109,7 @@ class TestMessage:
         self.wait_for_server_to_purge_messages(marie, pauline)
         assert_equals(CoreManager.call(marie, pauline), True)
         msg = chat_room.create_message("Bla bla bla bla")
-        chat_room.send_message2(msg, None, None)
+        chat_room.send_chat_message(msg)
         assert_equals(CoreManager.wait_for(pauline, marie, lambda pauline, marie: marie.stats.number_of_LinphoneMessageReceived == 1), True)
         assert marie.lc.get_chat_room(pauline.identity) is not None
         marie.stop()
diff --git a/tools/python/unittests/test_register.py b/tools/python/unittests/test_register.py
index 2a42194f0..6ded44215 100644
--- a/tools/python/unittests/test_register.py
+++ b/tools/python/unittests/test_register.py
@@ -18,7 +18,7 @@ class RegisterCoreManager(CoreManager):
             vtable['auth_info_requested'] = RegisterCoreManager.auth_info_requested
         CoreManager.__init__(self, vtable=vtable)
 
-    def register_with_refresh(self, refresh, domain, route, late_auth_info = False, expected_final_state = linphone.RegistrationState.RegistrationOk):
+    def register_with_refresh(self, refresh, domain, route, late_auth_info = False, expected_final_state = linphone.RegistrationState.Ok):
         assert self.lc is not None
         self.stats.reset()
         proxy_cfg = self.lc.create_proxy_config()
@@ -42,25 +42,25 @@ class RegisterCoreManager(CoreManager):
         if refresh:
             expected_count += 1
         max_retry = 110
-        if expected_final_state == linphone.RegistrationState.RegistrationProgress:
+        if expected_final_state == linphone.RegistrationState.Progress:
             max_retry += 200
         while self.stats.number_of_LinphoneRegistrationOk < expected_count and retry < max_retry:
             retry += 1
             self.lc.iterate()
-            if self.stats.number_of_auth_info_requested > 0 and proxy_cfg.state == linphone.RegistrationState.RegistrationFailed and late_auth_info:
+            if self.stats.number_of_auth_info_requested > 0 and proxy_cfg.state == linphone.RegistrationState.Failed and late_auth_info:
                 if len(self.lc.auth_info_list) == 0:
-                    assert_equals(proxy_cfg.error, linphone.Reason.ReasonUnauthorized)
+                    assert_equals(proxy_cfg.error, linphone.Reason.Unauthorized)
                     info = linphone.AuthInfo.new(test_username, None, test_password, None, None, None) # Create authentication structure from identity
                     self.lc.add_auth_info(info)
-            if proxy_cfg.error == linphone.Reason.ReasonForbidden or \
-                (self.stats.number_of_auth_info_requested > 2 and proxy_cfg.error == linphone.Reason.ReasonUnauthorized):
+            if proxy_cfg.error == linphone.Reason.Forbidden or \
+                (self.stats.number_of_auth_info_requested > 2 and proxy_cfg.error == linphone.Reason.Unauthorized):
                 break
             time.sleep(0.1)
 
         assert_equals(proxy_cfg.state, expected_final_state)
         assert_equals(self.stats.number_of_LinphoneRegistrationNone, 0)
         assert self.stats.number_of_LinphoneRegistrationProgress >= 1
-        if expected_final_state == linphone.RegistrationState.RegistrationOk:
+        if expected_final_state == linphone.RegistrationState.Ok:
             assert_equals(self.stats.number_of_LinphoneRegistrationOk, expected_count)
             expected_failed = 0
             if late_auth_info:

From 33aaac313b839253cb2edf5165520082bfc4c2f4 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Tue, 16 Dec 2014 11:32:51 +0100
Subject: [PATCH 190/496] Fix compilation with Visual Studio.

---
 coreapi/linphonecall.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index 2697724f5..8caf6ae7e 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -38,7 +38,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "mediastreamer2/mssndcard.h"
 
 static const char EC_STATE_STORE[] = ".linphone.ecstate";
-static const size_t EC_STATE_MAX_LEN = 1048576; // 1Mo
+#define EC_STATE_MAX_LEN 1048576 // 1Mo
 
 static void linphone_call_stats_uninit(LinphoneCallStats *stats);
 

From 080cb97898df5e1fa9bafb59b558224a8334c93b Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Tue, 16 Dec 2014 14:33:27 +0100
Subject: [PATCH 191/496] Disable x11 support on MacOS X target by default

---
 configure.ac | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index aa93f23e7..b7c876000 100644
--- a/configure.ac
+++ b/configure.ac
@@ -158,13 +158,16 @@ dnl AC_CHECK_LIB(intl,libintl_gettext)
 AC_CHECK_FUNCS([get_current_dir_name strndup stpcpy] )
 
 AC_ARG_ENABLE(x11,
-	[AS_HELP_STRING([--disable-x11], [Disable X11 support (default=no)])],
+	[AS_HELP_STRING([--disable-x11], [Disable X11 support (default=yes for MacOSX, no otherwise)])],
 	[case "${enableval}" in
 		yes)	enable_x11=true ;;
 		no)	enable_x11=false ;;
 		*)	AC_MSG_ERROR(bad value ${enableval} for --disable-x11) ;;
 	esac],
-	[enable_x11=true]
+	[case "$target_os" in
+		*darwin*) enable_x11=false ;; #disable x11 on MacOS by default
+		*) enable_x11=true ;;
+	esac]
 )
 
 dnl conditional build of LDAP support

From d3170478690276fdb95695bbac1d96b9d3a6e876 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Tue, 16 Dec 2014 14:34:34 +0100
Subject: [PATCH 192/496] Fix homebrew README (MacOSX): user must install gtk+
 --without-x11 to avoid segmentation fault at launch

---
 README.macos.md | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/README.macos.md b/README.macos.md
index 563a5b407..ff1f46ac4 100644
--- a/README.macos.md
+++ b/README.macos.md
@@ -3,8 +3,10 @@
 ## Build prerequisite
 
 * Xcode (download from apple or using appstore application)
-* Java SE
-* [HomeBrew](http://brew.sh) or [Macports](http://www.macports.org/).
+* [Java SE](http://www.oracle.com/technetwork/java/javase/downloads/index.html) or openJDK
+ This is required to generate a C sourcefile from SIP grammar using [antlr3](http://www.antlr3.org/) generator.
+ * [HomeBrew](http://brew.sh) or [Macports](http://www.macports.org/).
+ * [XQuartz](https://xquartz.macosforge.org) for GTK version.
 
 ### Dependencies
 
@@ -41,21 +43,19 @@ Install `GTK`. It is recommended to use the `quartz` backend for better integrat
 
 ##### Linphone library (liblinphone)
 
-        brew install automake intltool libtool pkg-config coreutils \
-        yasm nasm wget imagemagick speex ffmpeg
-
-        #then you have to install some dependencies from a tap.
         brew tap Gui13/linphone
-        brew install antlr3.2 libantlr3.4c mattintosh4/gtk-mac-integration/gtk-mac-integration
+        brew install intltool libtool wget pkg-config automake libantlr3.4c \
+                antlr3.2 gettext speex ffmpeg readline
+        ln -s /usr/local/bin/glibtoolize /usr/local/bin/libtoolize
+        brew link --force gettext
 
 ##### Linphone UI (GTK version)
 
-        brew install gettext pygtk gtk+
-        brew link gettext --force
+        brew install gtk+ --without-x11
+        brew install gettext gtk-mac-integration
         #readline is required from linphonec.c otherwise compilation will fail
         brew link readline --force
 
-
 ### Building Linphone
 
 The next pieces need to be compiled manually.
@@ -122,7 +122,7 @@ The libvpx build isn't able to produce dual architecture files. To workaround th
  If you got the source code from git, run `./autogen.sh` first.
  Then or otherwise, :
 
-        PKG_CONFIG_PATH=/usr/local/lib/pkgconfig ./configure --prefix=/opt/local --disable-x11 --with-srtp=/opt/local --with-gsm=/opt/local --enable-zrtp --disable-strict && make
+        PKG_CONFIG_PATH=/usr/local/lib/pkgconfig ./configure --prefix=/opt/local --with-srtp=/opt/local --with-gsm=/opt/local --enable-zrtp --disable-strict && make
 
 * Install on the system
 

From a466a05a4401fa0488f0841ec826e0ec7cec3fa6 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Tue, 16 Dec 2014 15:43:43 +0100
Subject: [PATCH 193/496] More permissive type checking in the Python module.

- int values are accepted where a long is expected.
- int or long values are accepted where a float is expected.
---
 tools/python/apixml2python/linphone.py | 137 ++++++++++++++-----------
 1 file changed, 75 insertions(+), 62 deletions(-)

diff --git a/tools/python/apixml2python/linphone.py b/tools/python/apixml2python/linphone.py
index 6412b2bb7..ce1488769 100644
--- a/tools/python/apixml2python/linphone.py
+++ b/tools/python/apixml2python/linphone.py
@@ -88,8 +88,8 @@ class ArgumentType:
 		self.contained_type = contained_type
 		self.linphone_module = linphone_module
 		self.type_str = None
-		self.check_func = None
-		self.convert_func = None
+		self.check_condition = None
+		self.convert_code = None
 		self.convert_from_func = None
 		self.fmt_str = 'O'
 		self.cfmt_str = '%p'
@@ -105,33 +105,33 @@ class ArgumentType:
 		if self.basic_type == 'char':
 			if '*' in splitted_type:
 				self.type_str = 'string'
-				self.check_func = 'PyString_Check'
-				self.convert_func = 'PyString_AsString'
+				self.check_condition = "!PyString_Check({arg_name})"
+				self.convert_code = "{result_name}{result_suffix} = {cast}PyString_AsString({arg_name});\n"
 				self.fmt_str = 'z'
 				self.cfmt_str = '\\"%s\\"'
 			else:
 				self.type_str = 'int'
-				self.check_func = 'PyInt_Check'
-				self.convert_func = 'PyInt_AsLong'
+				self.check_condition = "!PyInt_Check({arg_name}) && !PyLong_Check({arg_name})"
+				self.convert_code = "{result_name}{result_suffix} = {cast}PyInt_AsLong({arg_name});\n"
 				self.fmt_str = 'b'
 				self.cfmt_str = '%08x'
 		elif self.basic_type == 'int':
 			if 'unsigned' in splitted_type:
 				self.type_str = 'unsigned int'
-				self.check_func = 'PyInt_Check'
-				self.convert_func = 'PyInt_AsUnsignedLongMask'
+				self.check_condition = "!PyInt_Check({arg_name})"
+				self.convert_code = "{result_name}{result_suffix} = {cast}PyInt_AsUnsignedLongMask({arg_name});\n"
 				self.fmt_str = 'I'
 				self.cfmt_str = '%u'
 			else:
 				self.type_str = 'int'
-				self.check_func = 'PyInt_Check'
-				self.convert_func = 'PyInt_AS_LONG'
+				self.check_condition = "!PyInt_Check({arg_name})"
+				self.convert_code = "{result_name}{result_suffix} = {cast}PyInt_AS_LONG({arg_name});\n"
 				self.fmt_str = 'i'
 				self.cfmt_str = '%d'
 		elif self.basic_type in ['int8_t', 'int16_t' 'int32_t']:
 			self.type_str = 'int'
-			self.check_func = 'PyInt_Check'
-			self.convert_func = 'PyInt_AS_LONG'
+			self.check_condition = "!PyInt_Check({arg_name})"
+			self.convert_code = "{result_name}{result_suffix} = {cast}PyInt_AS_LONG({arg_name});\n"
 			if self.basic_type == 'int8_t':
 					self.fmt_str = 'c'
 			elif self.basic_type == 'int16_t':
@@ -141,8 +141,8 @@ class ArgumentType:
 			self.cfmt_str = '%d'
 		elif self.basic_type in ['uint8_t', 'uint16_t', 'uint32_t']:
 			self.type_str = 'unsigned int'
-			self.check_func = 'PyInt_Check'
-			self.convert_func = 'PyInt_AsUnsignedLongMask'
+			self.check_condition = "!PyInt_Check({arg_name})"
+			self.convert_code = "{result_name}{result_suffix} = {cast}PyInt_AsUnsignedLongMask({arg_name});\n"
 			if self.basic_type == 'uint8_t':
 				self.fmt_str = 'b'
 			elif self.basic_type == 'uint16_t':
@@ -152,66 +152,83 @@ class ArgumentType:
 			self.cfmt_str = '%u'
 		elif self.basic_type == 'int64_t':
 			self.type_str = '64bits int'
-			self.check_func = 'PyLong_Check'
-			self.convert_func = 'PyLong_AsLongLong'
+			self.check_condition = "!PyInt_Check({arg_name}) && !PyLong_Check({arg_name})"
+			self.convert_code = \
+"""if (PyInt_Check({arg_name})) {result_name}{result_suffix} = {cast}(PY_LONG_LONG)PyInt_AsLong({arg_name});
+	else if (PyLong_Check({arg_name})) {result_name}{result_suffix} = {cast}PyLong_AsLongLong({arg_name});
+"""
 			self.fmt_str = 'L'
 			self.cfmt_str = '%ld'
 		elif self.basic_type == 'uint64_t':
 			self.type_str = '64bits unsigned int'
-			self.check_func = 'PyLong_Check'
-			self.convert_func = 'PyLong_AsUnsignedLongLong'
+			self.check_condition = "!PyLong_Check({arg_name})"
+			self.convert_code = "{result_name}{result_suffix} = {cast}PyLong_AsUnsignedLongLong({arg_name});\n"
 			self.fmt_str = 'K'
 			self.cfmt_str = '%lu'
 		elif self.basic_type == 'size_t':
-			self.type_str = 'size_t'
-			self.check_func = 'PyInt_Check'
-			self.convert_func = 'PyInt_AsSsize_t'
-			self.fmt_str = 'n'
+			self.type_str = 'int'
+			self.check_condition = "!PyInt_Check({arg_name}) && !PyLong_Check({arg_name})"
+			self.convert_code = \
+"""if (PyInt_Check({arg_name})) {result_name}{result_suffix} = {cast}(size_t)PyInt_AsSsize_t({arg_name});
+	else if (PyLong_Check({arg_name})) {result_name}{result_suffix} = {cast}(size_t)PyLong_AsSsize_t({arg_name});
+"""
+			self.fmt_str = 'L'
 			self.cfmt_str = '%lu'
-		elif self.basic_type in ['float', 'double']:
+		elif self.basic_type == 'float':
 			self.type_str = 'float'
-			self.check_func = 'PyFloat_Check'
-			self.convert_func = 'PyFloat_AsDouble'
-			if self.basic_type == 'float':
-				self.fmt_str = 'f'
-			elif self.basic_type == 'double':
-				self.fmt_str = 'd'
+			self.check_condition = "!PyFloat_Check({arg_name})"
+			self.convert_code = \
+"""if (PyInt_Check({arg_name})) {result_name}{result_suffix} = {cast}(float)PyInt_AsLong({arg_name});
+	else if (PyLong_Check({arg_name})) {result_name}{result_suffix} = {cast}(float)PyLong_AsLong({arg_name});
+	else if (PyFloat_Check({arg_name})) {result_name}{result_suffix} = {cast}(float)PyFloat_AsDouble({arg_name});
+"""
+			self.fmt_str = 'f'
+			self.cfmt_str = '%f'
+		elif self.basic_type == 'double':
+			self.type_str = 'float'
+			self.check_condition = "!PyFloat_Check({arg_name})"
+			self.convert_code = \
+"""if (PyInt_Check({arg_name})) {result_name}{result_suffix} = {cast}(double)PyInt_AsLong({arg_name});
+	else if (PyLong_Check({arg_name})) {result_name}{result_suffix} = {cast}(double)PyLong_AsLong({arg_name});
+	else if (PyFloat_Check({arg_name})) {result_name}{result_suffix} = {cast}(double)PyFloat_AsDouble({arg_name});
+"""
+			self.fmt_str = 'd'
 			self.cfmt_str = '%f'
 		elif self.basic_type == 'bool_t':
 			self.type_str = 'bool'
-			self.check_func = 'PyBool_Check'
-			self.convert_func = 'PyObject_IsTrue'
+			self.check_condition = "!PyBool_Check({arg_name})"
+			self.convert_code = "{result_name}{result_suffix} = {cast}PyObject_IsTrue({arg_name});\n"
 			self.convert_from_func = 'PyBool_FromLong'
 			self.fmt_str = 'O'
 			self.cfmt_str = '%p'
 			self.cnativefmt_str = '%u'
 		elif self.basic_type == 'time_t':
 			self.type_str = 'DateTime'
-			self.check_func = 'PyDateTime_Check'
-			self.convert_func = 'PyDateTime_As_time_t'
+			self.check_condition = "!PyDateTime_Check({arg_name})"
+			self.convert_code = "{result_name}{result_suffix} = {cast}PyDateTime_As_time_t({arg_name});\n"
 			self.convert_from_func = 'PyDateTime_From_time_t'
 			self.fmt_str = 'O'
 			self.cfmt_str = '%p'
 			self.cnativefmt_str = '%ld'
 		elif self.basic_type == 'MSList':
 			self.type_str = 'list of linphone.' + self.contained_type
-			self.check_func = 'PyList_Check'
-			self.convert_func = 'PyList_AsMSListOf' + self.contained_type
+			self.check_condition = "!PyList_Check({arg_name})"
+			self.convert_code = "{result_name}{result_suffix} = {cast}PyList_AsMSListOf" + self.contained_type + "({arg_name});\n"
 			self.convert_from_func = 'PyList_FromMSListOf' + self.contained_type
 			self.fmt_str = 'O'
 			self.cfmt_str = '%p'
 		elif self.basic_type == 'MSVideoSize':
 			self.type_str = 'linphone.VideoSize'
-			self.check_func = 'PyLinphoneVideoSize_Check'
-			self.convert_func = 'PyLinphoneVideoSize_AsMSVideoSize'
+			self.check_condition = "!PyLinphoneVideoSize_Check({arg_name})"
+			self.convert_code = "{result_name}{result_suffix} = {cast}PyLinphoneVideoSize_AsMSVideoSize({arg_name});\n"
 			self.convert_from_func = 'PyLinphoneVideoSize_FromMSVideoSize'
 			self.fmt_str = 'O'
 			self.cfmt_str = '%p'
 			self.cast_convert_func_result = False
 		elif self.basic_type == 'LCSipTransports':
 			self.type_str = 'linphone.SipTransports'
-			self.check_func = 'PyLinphoneSipTransports_Check'
-			self.convert_func = 'PyLinphoneSipTransports_AsLCSipTransports'
+			self.check_condition = "!PyLinphoneSipTransports_Check({arg_name})"
+			self.convert_code = "{result_name}{result_suffix} = {cast}PyLinphoneSipTransports_AsLCSipTransports({arg_name});\n"
 			self.convert_from_func = 'PyLinphoneSipTransports_FromLCSipTransports'
 			self.fmt_str = 'O'
 			self.cfmt_str = '%p'
@@ -219,13 +236,13 @@ class ArgumentType:
 		else:
 			if strip_leading_linphone(self.basic_type) in self.linphone_module.enum_names:
 				self.type_str = 'int'
-				self.check_func = 'PyInt_Check'
-				self.convert_func = 'PyInt_AsLong'
+				self.check_condition = "!PyInt_Check({arg_name})"
+				self.convert_code = "{result_name}{result_suffix} = {cast}PyInt_AsLong({arg_name});\n"
 				self.fmt_str = 'i'
 				self.cfmt_str = '%d'
 			elif is_callback(self.complete_type):
 				self.type_str = 'callable'
-				self.check_func = 'PyCallable_Check'
+				self.check_condition = "!PyCallable_Check({arg_name})"
 				self.cnativefmt_str = None
 			elif '*' in splitted_type:
 				self.type_str = 'linphone.' + strip_leading_linphone(self.basic_type)
@@ -267,7 +284,7 @@ class MethodDefinition:
 			elif argument_type.fmt_str == 'O' and argument_type.use_native_pointer:
 				body += "\tPyObject * " + arg_name + ";\n"
 				body += "\t" + arg_complete_type + " " + arg_name + "_native_ptr = NULL;\n"
-			elif argument_type.fmt_str == 'O' and argument_type.convert_func is not None:
+			elif argument_type.fmt_str == 'O' and argument_type.convert_code is not None:
 				body += "\tPyObject * " + arg_name + ";\n"
 				body += "\t" + arg_complete_type + " " + arg_name + "_native_obj;\n"
 			elif strip_leading_linphone(arg_complete_type) in self.linphone_module.enum_names:
@@ -295,10 +312,8 @@ class MethodDefinition:
 			arg_complete_type = xml_method_arg.get('completetype')
 			arg_contained_type = xml_method_arg.get('containedtype')
 			argument_type = ArgumentType(arg_type, arg_complete_type, arg_contained_type, self.linphone_module)
-			if argument_type.fmt_str == 'O' and argument_type.convert_func is not None:
-				args_conversion_code += \
-"""	{arg_name}_native_obj = {convert_func}({arg_name});
-""".format(arg_name=arg_name, convert_func=argument_type.convert_func)
+			if argument_type.fmt_str == 'O' and argument_type.convert_code is not None:
+				args_conversion_code += argument_type.convert_code.format(result_name=arg_name, result_suffix='_native_obj', cast='', arg_name=arg_name)
 		return \
 """	{class_native_ptr_check_code}
 	{parse_tuple_code}
@@ -349,7 +364,7 @@ class MethodDefinition:
 			argument_type = ArgumentType(arg_type, arg_complete_type, arg_contained_type, self.linphone_module)
 			if argument_type.fmt_str == 'O' and argument_type.use_native_pointer:
 				arg_names.append(arg_name + "_native_ptr")
-			elif argument_type.fmt_str == 'O' and argument_type.convert_func is not None:
+			elif argument_type.fmt_str == 'O' and argument_type.convert_code is not None:
 				arg_names.append(arg_name + "_native_obj")
 			else:
 				arg_names.append(arg_name)
@@ -441,11 +456,11 @@ class MethodDefinition:
 """.format(arg_name=arg_name, arg_type=strip_leading_linphone(arg_type), type_str=argument_type.type_str)
 				else:
 					body += \
-"""	if (!{check_func}({arg_name})) {{
+"""	if ({check_condition}) {{
 		PyErr_SetString(PyExc_TypeError, "The '{arg_name}' argument must be a {type_str} instance.");
 		return NULL;
 	}}
-""".format(arg_name=arg_name, check_func=argument_type.check_func, type_str=argument_type.type_str)
+""".format(arg_name=arg_name, check_condition=argument_type.check_condition.format(arg_name=arg_name), type_str=argument_type.type_str)
 		if body != '':
 			body = body[1:] # Remove leading '\t'
 		return body
@@ -488,7 +503,6 @@ class MethodDefinition:
 			if self.build_value_format == 'O':
 				body += "\tPyObject * pyresult;\n"
 			body += "\tPyObject * pyret;\n"
-			body += "\tconst char *pyret_fmt;\n"
 		return body
 
 	def parse_method_node(self):
@@ -688,7 +702,7 @@ class SetterMethodDefinition(MethodDefinition):
 		MethodDefinition.__init__(self, linphone_module, class_, method_node)
 
 	def format_arguments_parsing(self):
-		if self.first_argument_type.check_func is None:
+		if self.first_argument_type.check_condition is None:
 			attribute_type_check_code = \
 """if ((value != Py_None) && !PyObject_IsInstance(value, (PyObject *)&pylinphone_{class_name}Type)) {{
 		PyErr_SetString(PyExc_TypeError, "The '{attribute_name}' attribute value must be a linphone.{class_name} instance.");
@@ -700,11 +714,11 @@ class SetterMethodDefinition(MethodDefinition):
 			if self.first_argument_type.type_str == 'string':
 				checknotnone = "(value != Py_None) && "
 			attribute_type_check_code = \
-"""if ({checknotnone}!{checkfunc}(value)) {{
+"""if ({checknotnone}{check_condition}) {{
 		PyErr_SetString(PyExc_TypeError, "The '{attribute_name}' attribute value must be a {type_str}.");
 		return -1;
 	}}
-""".format(checknotnone=checknotnone, checkfunc=self.first_argument_type.check_func, attribute_name=self.attribute_name, type_str=self.first_argument_type.type_str)
+""".format(checknotnone=checknotnone, check_condition=self.first_argument_type.check_condition.format(arg_name='value'), attribute_name=self.attribute_name, type_str=self.first_argument_type.type_str)
 		attribute_conversion_code = ''
 		callback_setting_code = ''
 		if is_callback(self.first_argument_type.complete_type):
@@ -713,18 +727,17 @@ class SetterMethodDefinition(MethodDefinition):
 	Py_INCREF(value);
 	((pylinphone_{class_name}Object *)self)->{callback_name} = value;
 """.format(class_name=self.class_['class_name'], callback_name=compute_event_name(self.first_arg_complete_type, self.class_['class_name']))
-		if (self.first_argument_type.convert_func is None) or \
-			(self.first_argument_type.fmt_str == 'O' and self.first_argument_type.convert_func is not None):
+		if (self.first_argument_type.convert_code is None) or \
+			(self.first_argument_type.fmt_str == 'O' and self.first_argument_type.convert_code is not None):
 			attribute_conversion_code += "{arg_name} = value;\n".format(arg_name="_" + self.first_arg_name)
-		if self.first_argument_type.convert_func is not None:
+		if self.first_argument_type.convert_code is not None:
 			cast_code = ''
 			suffix = ''
 			if self.first_argument_type.cast_convert_func_result:
 				cast_code = "({arg_type})".format(arg_type=self.first_arg_complete_type)
-			if self.first_argument_type.fmt_str == 'O' and self.first_argument_type.convert_func is not None:
+			if self.first_argument_type.fmt_str == 'O' and self.first_argument_type.convert_code is not None:
 				suffix = '_native_obj'
-			attribute_conversion_code += "\t{arg_name}{suffix} = {cast_code}{convertfunc}(value);\n".format(
-				arg_name="_" + self.first_arg_name, suffix=suffix, cast_code=cast_code, convertfunc=self.first_argument_type.convert_func)
+			attribute_conversion_code += self.first_argument_type.convert_code.format(result_name="_" + self.first_arg_name, result_suffix=suffix, cast=cast_code, arg_name='value')
 		attribute_native_ptr_check_code = ''
 		if self.first_argument_type.use_native_pointer:
 			attribute_native_ptr_check_code = \
@@ -761,7 +774,7 @@ class SetterMethodDefinition(MethodDefinition):
 		suffix = ''
 		if self.first_argument_type.fmt_str == 'O' and self.first_argument_type.use_native_pointer:
 			suffix = '_native_ptr'
-		elif self.first_argument_type.fmt_str == 'O' and self.first_argument_type.convert_func is not None:
+		elif self.first_argument_type.fmt_str == 'O' and self.first_argument_type.convert_code is not None:
 			suffix = '_native_obj'
 		return \
 """	{method_name}(native_ptr, {arg_name}{suffix});
@@ -891,7 +904,7 @@ class EventCallbackMethodDefinition(MethodDefinition):
 """.format(class_name=strip_leading_linphone(self.return_type))
 
 			else:
-				convert_python_result_code = "\t\tcresult = {convertfunc}(pyresult);\n".format(convertfunc=argument_type.convert_func)			
+				convert_python_result_code = '\t\t' + argument_type.convert_code.format(result_name='cresult', result_suffix='', cast='', arg_name='pyresult')
 		return \
 """	if ((func != NULL) && PyCallable_Check(func)) {{
 {create_python_objects_code}

From fff1e94168c5714afcd28e6b6f181ffb748ecd3e Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Tue, 16 Dec 2014 17:12:30 +0100
Subject: [PATCH 194/496] fix detection of sqlite and message storage
 enablement.

---
 configure.ac | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index b7c876000..3c1d9b9f5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -784,8 +784,6 @@ AC_ARG_ENABLE(msg-storage,
 	[enable_msg_storage=auto]
 )
 
-AM_CONDITIONAL(BUILD_MSG_STORAGE, test x$enable_msg_storage = xtrue)
-
 if test x$enable_msg_storage != xfalse; then
 	PKG_CHECK_MODULES(SQLITE3,[sqlite3 >= 3.6.0],[found_sqlite=yes],[found_sqlite=no])
 	if test "$found_sqlite" = "no"; then
@@ -794,6 +792,7 @@ if test x$enable_msg_storage != xfalse; then
 	fi
 	if test "$found_sqlite" = "yes"; then
 		SQLITE3_CFLAGS+="-DMSG_STORAGE_ENABLED"
+		enable_msg_storage=true
 	else
 		if test x$enable_msg_storage = xtrue; then
 			AC_MSG_ERROR([sqlite3, required for message storage, not found])
@@ -805,7 +804,7 @@ if test x$enable_msg_storage != xfalse; then
 	AC_SUBST(SQLITE3_LIBS)
 fi
 
-
+AM_CONDITIONAL(BUILD_MSG_STORAGE, test x$enable_msg_storage = xtrue)
 
 PKG_CHECK_MODULES(BELLESIP, [belle-sip >= 1.3.1])
 

From 39c2d93bddd4aa22f50d5b14b4515e938e882212 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Tue, 16 Dec 2014 17:24:24 +0100
Subject: [PATCH 195/496] Fix format string for size_t type in Python module.

---
 tools/python/apixml2python/linphone.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/python/apixml2python/linphone.py b/tools/python/apixml2python/linphone.py
index ce1488769..751e0b367 100644
--- a/tools/python/apixml2python/linphone.py
+++ b/tools/python/apixml2python/linphone.py
@@ -172,7 +172,7 @@ class ArgumentType:
 """if (PyInt_Check({arg_name})) {result_name}{result_suffix} = {cast}(size_t)PyInt_AsSsize_t({arg_name});
 	else if (PyLong_Check({arg_name})) {result_name}{result_suffix} = {cast}(size_t)PyLong_AsSsize_t({arg_name});
 """
-			self.fmt_str = 'L'
+			self.fmt_str = 'n'
 			self.cfmt_str = '%lu'
 		elif self.basic_type == 'float':
 			self.type_str = 'float'

From 8be032a9dfbd54c395eeb6ee4c02c8dad150789f Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Wed, 17 Dec 2014 12:17:40 +0100
Subject: [PATCH 196/496] Fix compilation

---
 tester/call_tester.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tester/call_tester.c b/tester/call_tester.c
index 0ebe9173b..29ccf1a1a 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -329,7 +329,7 @@ static void simple_call(void) {
 
 	marie = linphone_core_manager_new( "marie_rc");
 	pauline = linphone_core_manager_new( "pauline_rc");
-	
+
 	/* with the account manager, we might lose the identity */
 	marie_cfg = linphone_core_get_default_proxy_config(marie->lc);
 	marie_id = linphone_proxy_config_get_identity(marie_cfg);
@@ -896,7 +896,7 @@ static void call_with_no_sdp_ack_without_sdp(void){
 	LinphoneCall *call;
 
 	linphone_core_enable_sdp_200_ack(marie->lc,TRUE);
-	
+
 	linphone_core_invite_address(marie->lc,pauline->identity);
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallIncomingReceived,1));
 	call=linphone_core_get_current_call(pauline->lc);
@@ -2315,7 +2315,7 @@ static void early_media_call_with_ringing(void){
 		CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallEnd,1,1000));
 		CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallEnd,1,1000));
 		ended_time=ms_get_cur_time_ms();
-		CU_ASSERT_TRUE( labs((linphone_call_log_get_duration(marie_call_log)*1000) - (ended_time - connected_time)) <=1000 );
+		CU_ASSERT_TRUE( labs((linphone_call_log_get_duration(marie_call_log)*1000) - (int64_t)(ended_time - connected_time)) <=1000 );
 		ms_list_free(lcs);
 	}
 

From 0acd6b941c2bb7312ecc5bef879aa16ff4fa67e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
 <francois.grisez@belledonne-communications.com>
Date: Wed, 17 Dec 2014 15:09:55 +0100
Subject: [PATCH 197/496] Fix bad config.h includion while mkv.c building

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 323dcac7f..a3483e6b5 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 323dcac7fd1b8f2fc5c2acaa1fe73dc3d4ce15eb
+Subproject commit a3483e6b5273f58408d2e0dbeb3cc7605460c541

From 369e6930d0fe95639ebabe3d04bce78a04036cf0 Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Wed, 17 Dec 2014 16:21:57 +0100
Subject: [PATCH 198/496] Fix log collection tester

---
 tester/log_collection_tester.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/tester/log_collection_tester.c b/tester/log_collection_tester.c
index 25c824cf7..d3851717a 100644
--- a/tester/log_collection_tester.c
+++ b/tester/log_collection_tester.c
@@ -102,9 +102,10 @@ LinphoneCoreManager* setup(bool_t enable_logs)  {
 
 time_t check_file(LinphoneCoreManager* mgr)  {
 
-	uint64_t last_log = ms_get_cur_time_ms();
+	uint64_t last_log = ms_time(NULL);
 	char*    filepath = linphone_core_compress_log_collection(mgr->lc);
 	time_t  time_curr = -1;
+	uint32_t timediff = 0;
 
 	CU_ASSERT_PTR_NOT_NULL(filepath);	
 
@@ -141,7 +142,12 @@ time_t check_file(LinphoneCoreManager* mgr)  {
 		ms_free(filepath);
 	}
 
-	CU_ASSERT_TRUE( labs(time_curr*1000 - last_log) <= 1000 );
+	timediff = labs(time_curr - last_log);
+
+	CU_ASSERT_TRUE( timediff <= 1 );
+	if( !(timediff <= 1) ){
+		ms_error("time_curr: %ld, last_log: %ld timediff: %d", time_curr, last_log, timediff );
+	}
 	// return latest time in file
 	return time_curr;
 }

From 79b8c557e5a41f10776a40c34319f8630e9d2a0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
 <francois.grisez@belledonne-communications.com>
Date: Wed, 17 Dec 2014 16:24:51 +0100
Subject: [PATCH 199/496] Fix build when video support is disabled

---
 coreapi/linphonecore.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 9798e4636..6dc8aef36 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -5650,9 +5650,13 @@ MSVideoSize linphone_core_get_preview_video_size(const LinphoneCore *lc){
 **/
 MSVideoSize linphone_core_get_current_preview_video_size(const LinphoneCore *lc){
 	MSVideoSize ret={0};
+#ifndef VIDEO_ENABLED
+	ms_error("linphone_core_get_current_preview_video_size() fail. Support for video is disabled");
+#else
 	if (lc->previewstream){
 		ret=video_preview_get_current_size(lc->previewstream);
 	}
+#endif
 	return ret;
 }
 

From 96bd60cc477fb516b2bb14a12662fc79f25024b2 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Wed, 17 Dec 2014 17:02:23 +0100
Subject: [PATCH 200/496] Fix crash when sending file transfer message with a
 file transfer server that has not been set.

---
 coreapi/chat.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/coreapi/chat.c b/coreapi/chat.c
index d80f133b1..d1dae2686 100644
--- a/coreapi/chat.c
+++ b/coreapi/chat.c
@@ -584,8 +584,13 @@ static void _linphone_chat_room_send_message(LinphoneChatRoom *cr, LinphoneChatM
 		belle_http_request_listener_t *l;
 		belle_generic_uri_t *uri;
 		belle_http_request_t *req;
+		const char *transfer_server = linphone_core_get_file_transfer_server(cr->lc);
 
-		uri=belle_generic_uri_parse(linphone_core_get_file_transfer_server(cr->lc));
+		if (transfer_server == NULL) {
+			ms_warning("Cannot send file transfer message: no file transfer server configured.");
+			return;
+		}
+		uri=belle_generic_uri_parse(transfer_server);
 
 		req=belle_http_request_create("POST",
 				uri,

From 1b32ed0316baa3ddec194e0db2ac610b8ecef8c6 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Wed, 17 Dec 2014 17:02:52 +0100
Subject: [PATCH 201/496] Handle file transfer upload with memory body handler.

---
 coreapi/chat.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/coreapi/chat.c b/coreapi/chat.c
index d1dae2686..4a437ffa6 100644
--- a/coreapi/chat.c
+++ b/coreapi/chat.c
@@ -293,6 +293,11 @@ static void linphone_chat_message_process_response_from_post_file(void *data, co
 			/* create a user body handler to take care of the file and add the content disposition and content-type headers */
 			if (msg->file_transfer_filepath != NULL) {
 				first_part_bh=(belle_sip_body_handler_t *)belle_sip_file_body_handler_new(msg->file_transfer_filepath,NULL,msg);
+			} else if (linphone_content_get_buffer(msg->file_transfer_information) != NULL) {
+				first_part_bh=(belle_sip_body_handler_t *)belle_sip_memory_body_handler_new_from_buffer(
+					linphone_content_get_buffer(msg->file_transfer_information),
+					linphone_content_get_size(msg->file_transfer_information),
+					NULL,msg);
 			} else {
 				first_part_bh=(belle_sip_body_handler_t *)belle_sip_user_body_handler_new(linphone_content_get_size(msg->file_transfer_information),NULL,NULL,linphone_chat_message_file_transfer_on_send_body,msg);
 			}

From 69307afc50da17b6780f24da6e2df8979855cebd Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Thu, 18 Dec 2014 08:41:52 +0100
Subject: [PATCH 202/496] fix crash when receiving an external body SIP MESSAGE
 on android.

---
 coreapi/linphonecore_jni.cc                          | 12 +++++++-----
 .../org/linphone/core/LinphoneChatMessageImpl.java   |  4 +++-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index 76cbbad5c..eb026bf6d 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -2888,11 +2888,13 @@ extern "C" jbyteArray Java_org_linphone_core_LinphoneChatMessageImpl_getText(JNI
 																		,jobject  thiz
 																		,jlong ptr) {
 	const char *message = linphone_chat_message_get_text((LinphoneChatMessage*)ptr);
-	size_t length = strlen(message);
-	jbyteArray array = env->NewByteArray(length);
-	env->SetByteArrayRegion(array, 0, length, (const jbyte*)message);
-
-	return array;
+	if (message){
+		size_t length = strlen(message);
+		jbyteArray array = env->NewByteArray(length);
+		env->SetByteArrayRegion(array, 0, length, (const jbyte*)message);
+		return array;
+	}
+	return NULL;
 }
 
 extern "C" jint Java_org_linphone_core_LinphoneChatMessageImpl_getReason(JNIEnv*  env
diff --git a/java/impl/org/linphone/core/LinphoneChatMessageImpl.java b/java/impl/org/linphone/core/LinphoneChatMessageImpl.java
index 6d6009c92..59a1dc509 100644
--- a/java/impl/org/linphone/core/LinphoneChatMessageImpl.java
+++ b/java/impl/org/linphone/core/LinphoneChatMessageImpl.java
@@ -27,8 +27,10 @@ public class LinphoneChatMessageImpl implements LinphoneChatMessage {
 	
 	@Override
 	public String getText() {
+		byte rawText[];
 		try {
-			return new String(getText(nativePtr), "UTF-8");
+			rawText=getText(nativePtr);
+			if (rawText!=null) return new String(rawText, "UTF-8");
 		} catch (UnsupportedEncodingException e) {
 			e.printStackTrace();
 		}

From 9033898be9ca67f0f3b3311ba657e13e2df87e4d Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Thu, 18 Dec 2014 10:33:57 +0100
Subject: [PATCH 203/496] Fix 32 bits warnings

---
 tester/log_collection_tester.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tester/log_collection_tester.c b/tester/log_collection_tester.c
index d3851717a..c7b43beb7 100644
--- a/tester/log_collection_tester.c
+++ b/tester/log_collection_tester.c
@@ -102,7 +102,7 @@ LinphoneCoreManager* setup(bool_t enable_logs)  {
 
 time_t check_file(LinphoneCoreManager* mgr)  {
 
-	uint64_t last_log = ms_time(NULL);
+	time_t last_log = ms_time(NULL);
 	char*    filepath = linphone_core_compress_log_collection(mgr->lc);
 	time_t  time_curr = -1;
 	uint32_t timediff = 0;
@@ -142,7 +142,7 @@ time_t check_file(LinphoneCoreManager* mgr)  {
 		ms_free(filepath);
 	}
 
-	timediff = labs(time_curr - last_log);
+	timediff = labs((long int)time_curr - (long int)last_log);
 
 	CU_ASSERT_TRUE( timediff <= 1 );
 	if( !(timediff <= 1) ){

From 3347aa9a534c3c34fc88331e75bb54d30d7c2954 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Thu, 18 Dec 2014 11:51:25 +0100
Subject: [PATCH 204/496] Fix const string return values so that wrapper
 generators know that these strings do not need to be dealloced.

---
 coreapi/content.c      | 2 +-
 coreapi/content.h      | 2 +-
 coreapi/linphonecore.c | 2 +-
 coreapi/linphonecore.h | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/coreapi/content.c b/coreapi/content.c
index 74d04ebb7..332789d2a 100644
--- a/coreapi/content.c
+++ b/coreapi/content.c
@@ -115,7 +115,7 @@ void linphone_content_set_buffer(LinphoneContent *content, const void *buffer, s
 	((char *)content->lcp.data)[size] = '\0';
 }
 
-char * linphone_content_get_string_buffer(const LinphoneContent *content) {
+const char * linphone_content_get_string_buffer(const LinphoneContent *content) {
 	return (char *)content->lcp.data;
 }
 
diff --git a/coreapi/content.h b/coreapi/content.h
index 400f5f5fb..e3e0166ce 100644
--- a/coreapi/content.h
+++ b/coreapi/content.h
@@ -165,7 +165,7 @@ LINPHONE_PUBLIC void linphone_content_set_buffer(LinphoneContent *content, const
  * @param[in] content LinphoneContent object
  * @return The string content data buffer.
  */
-LINPHONE_PUBLIC char * linphone_content_get_string_buffer(const LinphoneContent *content);
+LINPHONE_PUBLIC const char * linphone_content_get_string_buffer(const LinphoneContent *content);
 
 /**
  * Set the string content data buffer.
diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 6dc8aef36..152128a2c 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -7074,7 +7074,7 @@ int linphone_payload_type_get_normal_bitrate(const LinphonePayloadType *pt) {
 	return pt->normal_bitrate;
 }
 
-char * linphone_payload_type_get_mime_type(const LinphonePayloadType *pt) {
+const char * linphone_payload_type_get_mime_type(const LinphonePayloadType *pt) {
 	return pt->mime_type;
 }
 
diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h
index 155170338..63ee7f7e0 100644
--- a/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@ -257,7 +257,7 @@ LINPHONE_PUBLIC int linphone_payload_type_get_normal_bitrate(const LinphonePaylo
  * @param[in] pt LinphonePayloadType object
  * @return The mime type.
  */
-LINPHONE_PUBLIC char * linphone_payload_type_get_mime_type(const LinphonePayloadType *pt);
+LINPHONE_PUBLIC const char * linphone_payload_type_get_mime_type(const LinphonePayloadType *pt);
 
 /**
  * Get the number of channels.

From a2b93b2019d0e2d6a32352b19d0ca764d61a9322 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Thu, 18 Dec 2014 11:53:49 +0100
Subject: [PATCH 205/496] Replace ortp_strdup_printf by ms_strdup_printf.

---
 coreapi/call_log.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/coreapi/call_log.c b/coreapi/call_log.c
index 1449c1920..d1750df56 100644
--- a/coreapi/call_log.c
+++ b/coreapi/call_log.c
@@ -217,7 +217,7 @@ char * linphone_call_log_to_str(LinphoneCallLog *cl){
 		default:
 			status=_("unknown");
 	}
-	tmp=ortp_strdup_printf(_("%s at %s\nFrom: %s\nTo: %s\nStatus: %s\nDuration: %i mn %i sec\n"),
+	tmp=ms_strdup_printf(_("%s at %s\nFrom: %s\nTo: %s\nStatus: %s\nDuration: %i mn %i sec\n"),
 			(cl->dir==LinphoneCallIncoming) ? _("Incoming call") : _("Outgoing call"),
 			cl->start_date,
 			from,

From 88c902d12dea1fe5332c3a8a3b0e8bd63e4690a2 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Thu, 18 Dec 2014 16:07:07 +0100
Subject: [PATCH 206/496] Fix memory leak of returned strings in Python module.

---
 tools/python/apixml2python/linphone.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tools/python/apixml2python/linphone.py b/tools/python/apixml2python/linphone.py
index 751e0b367..a4f6f8a2d 100644
--- a/tools/python/apixml2python/linphone.py
+++ b/tools/python/apixml2python/linphone.py
@@ -382,6 +382,7 @@ class MethodDefinition:
 		from_native_pointer_code = ''
 		convert_from_code = ''
 		build_value_code = ''
+		cfree_code = ''
 		result_variable = ''
 		if self.return_complete_type != 'void':
 			if self.build_value_format == 'O':
@@ -400,16 +401,20 @@ class MethodDefinition:
 				result_variable = 'cresult'
 		if result_variable != '':
 			build_value_code = "pyret = Py_BuildValue(\"{fmt}\", {result_variable});".format(fmt=self.build_value_format, result_variable=result_variable)
+		if self.return_complete_type == 'char *':
+			cfree_code = 'ms_free(cresult);';
 		body = \
 """	{c_function_call_code}
 	pylinphone_dispatch_messages();
 	{from_native_pointer_code}
 	{convert_from_code}
 	{build_value_code}
+	{cfree_code}
 """.format(c_function_call_code=c_function_call_code,
 		from_native_pointer_code=from_native_pointer_code,
 		convert_from_code=convert_from_code,
-		build_value_code=build_value_code)
+		build_value_code=build_value_code,
+		cfree_code=cfree_code)
 		return body
 
 	def format_return_trace(self):

From 8f633b21fc2a112c05b2c33b550e403825b8df58 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Thu, 18 Dec 2014 16:17:02 +0100
Subject: [PATCH 207/496] fix stack overflow.

---
 coreapi/linphonecall.c | 3 ++-
 coreapi/lpconfig.c     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index 8caf6ae7e..28fd77526 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -1584,15 +1584,16 @@ void linphone_call_init_audio_stream(LinphoneCall *call){
 	audio_stream_enable_gain_control(audiostream,TRUE);
 	if (linphone_core_echo_cancellation_enabled(lc)){
 		int len,delay,framesize;
-		char statestr[EC_STATE_MAX_LEN];
 		len=lp_config_get_int(lc->config,"sound","ec_tail_len",0);
 		delay=lp_config_get_int(lc->config,"sound","ec_delay",0);
 		framesize=lp_config_get_int(lc->config,"sound","ec_framesize",0);
 		audio_stream_set_echo_canceller_params(audiostream,len,delay,framesize);
 		if (audiostream->ec) {
+			char *statestr=ms_malloc0(EC_STATE_MAX_LEN);
 			if (lp_config_read_relative_file(lc->config, EC_STATE_STORE, statestr, EC_STATE_MAX_LEN) == 0) {
 				ms_filter_call_method(audiostream->ec, MS_ECHO_CANCELLER_SET_STATE_STRING, statestr);
 			}
+			ms_free(statestr);
 		}
 	}
 	audio_stream_enable_automatic_gain_control(audiostream,linphone_core_agc_enabled(lc));
diff --git a/coreapi/lpconfig.c b/coreapi/lpconfig.c
index ee87ac023..e6b7b4098 100644
--- a/coreapi/lpconfig.c
+++ b/coreapi/lpconfig.c
@@ -739,7 +739,7 @@ int lp_config_read_relative_file(const LpConfig *lpconfig, const char *filename,
 	char *filepath = ms_strdup_printf("%s/%s", dir, filename);
 	FILE *file = fopen(filepath, "r");
 	if(file != NULL) {
-		if(fgets(data, max_length, file) == NULL) {
+		if(fread(data, 1, max_length, file)<=0) {
 			ms_error("%s could not be loaded. %s", filepath, strerror(errno));
 			goto err;
 		}

From 74c44f6c251412c36bc0dddbdef5221d7b7d9db3 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Thu, 18 Dec 2014 19:15:29 +0100
Subject: [PATCH 208/496] User pointer must remain the property of the user.

---
 coreapi/linphonecore.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 152128a2c..d5248b96e 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -7087,9 +7087,6 @@ LinphoneCoreVTable *linphone_core_v_table_new() {
 }
 
 void linphone_core_v_table_set_user_data(LinphoneCoreVTable *table, void *data) {
-	if (table->user_data) {
-		ms_free(table->user_data);
-	}
 	table->user_data = data;
 }
 
@@ -7098,9 +7095,6 @@ void* linphone_core_v_table_get_user_data(LinphoneCoreVTable *table) {
 }
 
 void linphone_core_v_table_destroy(LinphoneCoreVTable* table) {
-	if (table->user_data) {
-		ms_free(table->user_data);
-	}
 	ms_free(table);
 }
 

From 18328644bb900a0c42bb24d7edb72110da876e53 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Thu, 18 Dec 2014 22:54:05 +0100
Subject: [PATCH 209/496] update ms2

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index a3483e6b5..bb912b0dc 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit a3483e6b5273f58408d2e0dbeb3cc7605460c541
+Subproject commit bb912b0dc4d2941ec0d5963830d8c8f79822d5d9

From 5789f8cd1a0f778a2ea6bf446476f7bb2b551d91 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Thu, 18 Dec 2014 22:59:39 +0100
Subject: [PATCH 210/496] update oRTP

---
 oRTP | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/oRTP b/oRTP
index 5ab29c50a..93d40979c 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 5ab29c50adc7948b11449e3aeee66010379ff7dc
+Subproject commit 93d40979cf89f99dfc2af5c491efdbf8a478565e

From 2af1f05dd845ebb94705e08a9dad9f90e5c6233c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
 <francois.grisez@belledonne-communications.com>
Date: Fri, 19 Dec 2014 12:14:58 +0100
Subject: [PATCH 211/496] Update README.macos.md

---
 README.macos.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.macos.md b/README.macos.md
index ff1f46ac4..381efcf2f 100644
--- a/README.macos.md
+++ b/README.macos.md
@@ -45,14 +45,15 @@ Install `GTK`. It is recommended to use the `quartz` backend for better integrat
 
         brew tap Gui13/linphone
         brew install intltool libtool wget pkg-config automake libantlr3.4c \
-                antlr3.2 gettext speex ffmpeg readline
+                antlr3.2 gettext speex ffmpeg readline libvpx opus
         ln -s /usr/local/bin/glibtoolize /usr/local/bin/libtoolize
         brew link --force gettext
 
 ##### Linphone UI (GTK version)
 
+	brew install cairo --without-x11
         brew install gtk+ --without-x11
-        brew install gettext gtk-mac-integration
+        brew install gettext gtk-mac-integration libsoup
         #readline is required from linphonec.c otherwise compilation will fail
         brew link readline --force
 

From 98d1d15b0c0862109c0fe1a9f256a9c60416a0f3 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Fri, 19 Dec 2014 14:32:45 +0100
Subject: [PATCH 212/496] Set body size when using the file body handler.

---
 coreapi/chat.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/coreapi/chat.c b/coreapi/chat.c
index 4a437ffa6..4bdf5e133 100644
--- a/coreapi/chat.c
+++ b/coreapi/chat.c
@@ -1280,10 +1280,12 @@ static void linphone_chat_process_response_headers_from_get_file(void *data, con
 				(belle_sip_body_handler_t*)belle_sip_user_body_handler_new(body_size, linphone_chat_message_file_transfer_on_progress,on_recv_body,NULL,message)
 			);
 		} else {
-			belle_sip_message_set_body_handler(
-				(belle_sip_message_t *)event->response,
-				(belle_sip_body_handler_t *)belle_sip_file_body_handler_new(message->file_transfer_filepath, linphone_chat_message_file_transfer_on_progress, message)
-			);
+			belle_sip_body_handler_t *bh = (belle_sip_body_handler_t *)belle_sip_file_body_handler_new(message->file_transfer_filepath, linphone_chat_message_file_transfer_on_progress, message);
+			if (belle_sip_body_handler_get_size(bh) == 0) {
+				/* If the size of the body has not been initialized from the file stat, use the one from the file_transfer_information. */
+				belle_sip_body_handler_set_size(bh, body_size);
+			}
+			belle_sip_message_set_body_handler((belle_sip_message_t *)event->response, bh);
 		}
 	}
 }

From afe5abba860de13f92e28545ad682a5a976a7dbe Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Fri, 19 Dec 2014 15:56:30 +0100
Subject: [PATCH 213/496] Add some Python setup tests.

---
 coreapi/linphonecore.c                        |  4 +-
 tools/python/apixml2python.py                 |  2 +
 .../handwritten_declarations.mustache         |  3 +
 .../handwritten_definitions.mustache          | 69 +++++++++++++++++++
 tools/python/unittests/test_setup.py          | 40 +++++++++++
 5 files changed, 116 insertions(+), 2 deletions(-)

diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index d5248b96e..a90b25162 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -2125,7 +2125,7 @@ void linphone_core_set_use_rfc2833_for_dtmf(LinphoneCore *lc,bool_t use_rfc2833)
 /**
  * Returns the UDP port used by SIP.
  *
- * Deprecated: use linphone_core_get_sip_transports() instead.
+ * @deprecated use linphone_core_get_sip_transports() instead.
  * @ingroup network_parameters
 **/
 int linphone_core_get_sip_port(LinphoneCore *lc){
@@ -2293,7 +2293,7 @@ void linphone_core_get_sip_transports_used(LinphoneCore *lc, LCSipTransports *tr
 /**
  * Sets the UDP port to be used by SIP.
  *
- * Deprecated: use linphone_core_set_sip_transports() instead.
+ * @deprecated use linphone_core_set_sip_transports() instead.
  * @ingroup network_parameters
 **/
 void linphone_core_set_sip_port(LinphoneCore *lc,int port)
diff --git a/tools/python/apixml2python.py b/tools/python/apixml2python.py
index 2c32a24f6..2e976abe9 100755
--- a/tools/python/apixml2python.py
+++ b/tools/python/apixml2python.py
@@ -74,6 +74,8 @@ hand_written_functions = [
 	HandWrittenClassMethod('Buffer', 'new_from_data', 'linphone_buffer_new_from_data', "Create a new LinphoneBuffer object from existing data.\n\n:param data: The initial data to store in the LinphoneBuffer.\n:type data: ByteArray\n:returns: A new LinphoneBuffer object.\n:rtype: linphone.Buffer"),
 	HandWrittenProperty('Buffer', 'content', 'linphone_buffer_get_content', 'linphone_buffer_set_content', "[ByteArray] Set the content of the data buffer."),
 	HandWrittenProperty('Content', 'buffer', 'linphone_content_get_buffer', 'linphone_content_set_buffer', "[ByteArray] Set the content data buffer."),
+	HandWrittenProperty('Core', 'sip_transports', 'linphone_core_get_sip_transports', 'linphone_core_set_sip_transports', "[:py:class:`linphone.SipTransports`] Sets the ports to be used for each transport. A zero value port for a given transport means the transport is not used. A value of LC_SIP_TRANSPORT_RANDOM (-1) means the port is to be chosen randomly by the system."),
+	HandWrittenProperty('Core', 'sip_transports_used', 'linphone_core_get_sip_transports_used', None, "[:py:class:`linphone.SipTransports`] Retrieves the real port number assigned for each sip transport (udp, tcp, tls). A zero value means that the transport is not activated. If LC_SIP_TRANSPORT_RANDOM was passed to :py:attr:`linphone.Core.sip_transports`, the random port choosed by the system is returned."),
 	HandWrittenProperty('Core', 'sound_devices', 'linphone_core_get_sound_devices', None, "[list of string] Get the available sound devices."),
 	HandWrittenProperty('Core', 'video_devices', 'linphone_core_get_video_devices', None, "[list of string] Get the available video capture devices."),
 	HandWrittenClassMethod('Core', 'new', 'linphone_core_new', "Instantiate a LinphoneCore object.\n\n:param vtable: The callbacks.\n:type vtable: dictionary\n:param configPath: A path to a config file. If it does not exists it will be created. The config file is used to store all settings, call logs, friends, proxies... so that all these settings become persistent over the life of the LinphoneCore object. It is allowed to set to None. In that case LinphoneCore will not store any settings.\n:type configPath: string\n:param factoryConfigPath: A path to a read-only config file that can be used to store hard-coded preference such as proxy settings or internal preferences. The settings in this factory file always override the one in the normal config file. It is OPTIONAL, use None if unneeded.\n:type factoryConfigPath: string\n:rtype: linphone.Core"),
diff --git a/tools/python/apixml2python/handwritten_declarations.mustache b/tools/python/apixml2python/handwritten_declarations.mustache
index a9c2d1ee6..3fcb43c2b 100644
--- a/tools/python/apixml2python/handwritten_declarations.mustache
+++ b/tools/python/apixml2python/handwritten_declarations.mustache
@@ -1,3 +1,6 @@
+static PyObject * pylinphone_Core_get_sip_transports(PyObject *self, void *closure);
+static int pylinphone_Core_set_sip_transports(PyObject *self, PyObject *value, void *closure);
+static PyObject * pylinphone_Core_get_sip_transports_used(PyObject *self, void *closure);
 static PyObject * pylinphone_Core_get_sound_devices(PyObject *self, void *closure);
 static PyObject * pylinphone_Core_get_video_devices(PyObject *self, void *closure);
 
diff --git a/tools/python/apixml2python/handwritten_definitions.mustache b/tools/python/apixml2python/handwritten_definitions.mustache
index 6b2e176f1..cf1b9b1d8 100644
--- a/tools/python/apixml2python/handwritten_definitions.mustache
+++ b/tools/python/apixml2python/handwritten_definitions.mustache
@@ -128,6 +128,75 @@ static PyObject * pylinphone_module_method_set_log_handler(PyObject *self, PyObj
 }
 
 
+static PyObject * pylinphone_Core_get_sip_transports(PyObject *self, void *closure) {
+    PyObject *pytr;
+    LCSipTransports tr = { 0 };
+    LinphoneCore *native_ptr = pylinphone_Core_get_native_ptr(self);
+
+    if (native_ptr == NULL) {
+        PyErr_SetString(PyExc_TypeError, "Invalid linphone.Core instance");
+        return NULL;
+    }
+
+    pylinphone_trace(1, "[PYLINPHONE] >>> %s(%p [%p])", __FUNCTION__, self, native_ptr);
+    linphone_core_get_sip_transports(native_ptr, &tr);
+    pylinphone_dispatch_messages();
+
+    pytr = PyLinphoneSipTransports_FromLCSipTransports(tr);
+    pylinphone_trace(-1, "[PYLINPHONE] <<< %s -> %p", __FUNCTION__, pytr);
+    return pytr;
+}
+
+static int pylinphone_Core_set_sip_transports(PyObject *self, PyObject *value, void *closure) {
+    LinphoneCore *native_ptr;
+    PyObject * _tr_config;
+    const LCSipTransports * _tr_config_native_obj;
+    native_ptr = pylinphone_Core_get_native_ptr(self);
+    if (native_ptr == NULL) {
+        PyErr_SetString(PyExc_TypeError, "Invalid linphone.Core instance");
+        return -1;
+    }
+
+    if (value == NULL) {
+        PyErr_SetString(PyExc_TypeError, "Cannot delete the 'sip_transports' attribute.");
+        return -1;
+    }
+    if (!PyLinphoneSipTransports_Check(value)) {
+        PyErr_SetString(PyExc_TypeError, "The 'sip_transports' attribute value must be a linphone.SipTransports.");
+        return -1;
+    }
+
+    _tr_config = value;
+    _tr_config_native_obj = PyLinphoneSipTransports_AsLCSipTransports(value);
+
+    pylinphone_trace(1, "[PYLINPHONE] >>> %s(%p [%p], %p [%p])", __FUNCTION__, self, native_ptr, _tr_config, _tr_config_native_obj);
+    linphone_core_set_sip_transports(native_ptr, _tr_config_native_obj);
+    pylinphone_dispatch_messages();
+    pylinphone_trace(-1, "[PYLINPHONE] <<< %s -> 0", __FUNCTION__);
+    return 0;
+}
+
+static PyObject * pylinphone_Core_get_sip_transports_used(PyObject *self, void *closure) {
+    PyObject *pytr;
+    LCSipTransports tr = { 0 };
+    LinphoneCore *native_ptr = pylinphone_Core_get_native_ptr(self);
+
+    if (native_ptr == NULL) {
+        PyErr_SetString(PyExc_TypeError, "Invalid linphone.Core instance");
+        return NULL;
+    }
+
+    pylinphone_trace(1, "[PYLINPHONE] >>> %s(%p [%p])", __FUNCTION__, self, native_ptr);
+    linphone_core_get_sip_transports_used(native_ptr, &tr);
+    pylinphone_dispatch_messages();
+
+    pytr = PyLinphoneSipTransports_FromLCSipTransports(tr);
+    pylinphone_trace(-1, "[PYLINPHONE] <<< %s -> %p", __FUNCTION__, pytr);
+    return pytr;
+}
+
+
+
 static PyObject * pylinphone_Core_get_sound_devices(PyObject *self, void *closure) {
 	PyObject *_list;
 	const char **_devices;
diff --git a/tools/python/unittests/test_setup.py b/tools/python/unittests/test_setup.py
index 9afcda434..9fcafa8b8 100644
--- a/tools/python/unittests/test_setup.py
+++ b/tools/python/unittests/test_setup.py
@@ -5,6 +5,13 @@ import os
 
 class TestSetup:
 
+    def test_address(self):
+        create_address(None)
+
+    def test_version(self):
+        lc = linphone.Core.new({}, None, None)
+        assert_equals(lc.version.find("unknown"), -1)
+
     def test_address(self):
         create_address(None)
 
@@ -14,6 +21,23 @@ class TestSetup:
         if lc is not None:
             lc.verify_server_certificates(False)
 
+    def test_random_transport(self):
+        lc = linphone.Core.new({}, None, None)
+        assert lc is not None
+        tr = lc.sip_transports
+        assert_equals(tr.udp_port, 5060) # default config
+        assert_equals(tr.tcp_port, 5060) # default config
+        tr.udp_port = -1
+        tr.tcp_port = -1
+        tr.tls_port = -1
+        lc.sip_transports = tr
+        tr = lc.sip_transports
+        assert tr.udp_port != 5060 # default config
+        assert tr.tcp_port != 5060 # default config
+        assert_equals(lc.config.get_int('sip', 'sip_port', -2), -1)
+        assert_equals(lc.config.get_int('sip', 'sip_tcp_port', -2), -1)
+        assert_equals(lc.config.get_int('sip', 'sip_tls_port', -2), -1)
+
     def test_interpret_url(self):
         lc = linphone.Core.new({}, None, None)
         assert lc is not None
@@ -32,6 +56,22 @@ class TestSetup:
         conf = linphone.LpConfig.new_from_buffer(buffer_linebreaks)
         assert_equals(conf.get_string("buffer_linebreaks", "test", ""), "ok")
 
+    def test_lpconfig_zerolen_value_from_buffer(self):
+        zerolen = "[test]\nzero_len=\nnon_zero_len=test"
+        conf = linphone.LpConfig.new_from_buffer(zerolen)
+        assert_equals(conf.get_string("test", "zero_len", "LOL"), "LOL")
+        assert_equals(conf.get_string("test", "non_zero_len", ""), "test")
+        conf.set_string("test", "non_zero_len", "") # should remove "non_zero_len"
+        assert_equals(conf.get_string("test", "non_zero_len", "LOL"), "LOL")
+
+    def test_lpconfig_zerolen_value_from_file(self):
+        conf = linphone.LpConfig.new_with_factory(None, os.path.join(tester_resources_path, 'rcfiles', 'zero_length_params_rc'))
+        assert_equals(conf.get_string("test", "zero_len", "LOL"), "LOL")
+        # non_zero_len=test -> should return test
+        assert_equals(conf.get_string("test", "non_zero_len", ""), "test")
+        conf.set_string("test", "non_zero_len", "") # should remove "non_zero_len"
+        assert_equals(conf.get_string("test", "non_zero_len", "LOL"), "LOL")
+
     def test_create_chat_room(self):
         lc = linphone.Core.new({}, None, None)
         assert lc is not None

From 564627ed46f640cfd0c3c73319a76a3d9e001222 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Fri, 19 Dec 2014 17:07:55 +0100
Subject: [PATCH 214/496] Add some registration tests in Python.

---
 tools/python/unittests/linphonetester.py |  1 +
 tools/python/unittests/test_register.py  | 71 +++++++++++++++++++++++-
 2 files changed, 69 insertions(+), 3 deletions(-)

diff --git a/tools/python/unittests/linphonetester.py b/tools/python/unittests/linphonetester.py
index c08c8dbd3..0d803c348 100644
--- a/tools/python/unittests/linphonetester.py
+++ b/tools/python/unittests/linphonetester.py
@@ -8,6 +8,7 @@ import sys
 import time
 
 
+test_domain = "sipopen.example.org"
 test_username = "liblinphone_tester"
 test_password = "secret"
 test_route = "sip2.linphone.org"
diff --git a/tools/python/unittests/test_register.py b/tools/python/unittests/test_register.py
index 6ded44215..be6918251 100644
--- a/tools/python/unittests/test_register.py
+++ b/tools/python/unittests/test_register.py
@@ -18,9 +18,10 @@ class RegisterCoreManager(CoreManager):
             vtable['auth_info_requested'] = RegisterCoreManager.auth_info_requested
         CoreManager.__init__(self, vtable=vtable)
 
-    def register_with_refresh(self, refresh, domain, route, late_auth_info = False, expected_final_state = linphone.RegistrationState.Ok):
+    def register_with_refresh_base(self, refresh, domain, route, late_auth_info = False, transport = linphone.SipTransports(5070, 5070, 5071, 0), expected_final_state = linphone.RegistrationState.Ok):
         assert self.lc is not None
         self.stats.reset()
+        self.lc.sip_transports = transport
         proxy_cfg = self.lc.create_proxy_config()
         from_address = create_address(domain)
         proxy_cfg.identity = from_address.as_string()
@@ -35,8 +36,6 @@ class RegisterCoreManager(CoreManager):
         self.lc.add_proxy_config(proxy_cfg)
         self.lc.default_proxy_config = proxy_cfg
 
-        #linphone_core_set_sip_transports(lc,&transport);
-
         retry = 0
         expected_count = 1
         if refresh:
@@ -69,6 +68,8 @@ class RegisterCoreManager(CoreManager):
         else:
             assert_equals(self.stats.number_of_LinphoneRegistrationCleared, 0)
 
+    def register_with_refresh(self, refresh, domain, route, late_auth_info = False, transport = linphone.SipTransports(5070, 5070, 5071, 0), expected_final_state = linphone.RegistrationState.Ok):
+        self.register_with_refresh_base(refresh, domain, route, late_auth_info, expected_final_state = expected_final_state)
         self.stop()
         # Not testable as the callbacks can not be called once the core destruction has started
         #assert_equals(self.stats.number_of_LinphoneRegistrationCleared, 1)
@@ -80,3 +81,67 @@ class TestRegister:
         cm = RegisterCoreManager()
         cm.register_with_refresh(False, None, None)
         assert_equals(cm.stats.number_of_auth_info_requested, 0)
+
+    def test_simple_unregister(self):
+        cm = RegisterCoreManager()
+        cm.register_with_refresh_base(False, None, None)
+        pc = cm.lc.default_proxy_config
+        pc.edit()
+        cm.stats.reset() # clear stats
+        # nothing is supposed to arrive until done
+        assert_equals(CoreManager.wait_for_until(cm, cm, lambda cm1, cm2: cm1.stats.number_of_LinphoneRegistrationCleared == 1, 3000), False)
+        pc.register_enabled = False
+        pc.done()
+        assert_equals(CoreManager.wait_for(cm, cm, lambda cm1, cm2: cm1.stats.number_of_LinphoneRegistrationCleared == 1), True)
+
+    def test_simple_tcp_register(self):
+        cm = RegisterCoreManager()
+        cm.register_with_refresh(False, test_domain, "sip:{route};transport=tcp".format(route=test_route))
+
+    def test_simple_tcp_register_compatibility_mode(self):
+        cm = RegisterCoreManager()
+        cm.register_with_refresh(False, test_domain, "sip:{route}".format(route=test_route), transport=linphone.SipTransports(0, 5070, 0, 0))
+
+    def test_simple_tls_register(self):
+        cm = RegisterCoreManager()
+        cm.register_with_refresh(False, test_domain, "sip:{route};transport=tls".format(route=test_route))
+
+    def test_tls_register_with_alt_name(self):
+        cm = CoreManager('pauline_alt_rc', False)
+        cm.lc.root_ca = os.path.join(tester_resources_path, 'certificates', 'cn', 'cafile.pem')
+        cm.lc.refresh_registers()
+        assert_equals(CoreManager.wait_for(cm, cm, lambda cm1, cm2: cm1.stats.number_of_LinphoneRegistrationOk == 1), True)
+        assert_equals(cm.stats.number_of_LinphoneRegistrationFailed, 0)
+
+    def test_tls_wildcard_register(self):
+        cm = CoreManager('pauline_wild_rc', False)
+        cm.lc.root_ca = os.path.join(tester_resources_path, 'certificates', 'cn', 'cafile.pem')
+        cm.lc.refresh_registers()
+        assert_equals(CoreManager.wait_for(cm, cm, lambda cm1, cm2: cm1.stats.number_of_LinphoneRegistrationOk == 2), True)
+        assert_equals(cm.stats.number_of_LinphoneRegistrationFailed, 0)
+
+    def test_tls_certificate_failure(self):
+        cm = CoreManager('pauline_rc', False)
+        cm.lc.root_ca = os.path.join(tester_resources_path, 'certificates', 'cn', 'agent.pem') # bad root ca
+        cm.lc.network_reachable = True
+        assert_equals(CoreManager.wait_for(cm, cm, lambda cm1, cm2: cm1.stats.number_of_LinphoneRegistrationFailed == 1), True)
+        cm.lc.root_ca = None # no root ca
+        cm.lc.refresh_registers()
+        assert_equals(CoreManager.wait_for(cm, cm, lambda cm1, cm2: cm1.stats.number_of_LinphoneRegistrationFailed == 2), True)
+        cm.lc.root_ca = os.path.join(tester_resources_path, 'certificates', 'cn', 'cafile.pem') # good root ca
+        cm.lc.refresh_registers()
+        assert_equals(CoreManager.wait_for(cm, cm, lambda cm1, cm2: cm1.stats.number_of_LinphoneRegistrationOk == 1), True)
+        assert_equals(cm.stats.number_of_LinphoneRegistrationFailed, 2)
+
+    def test_tls_with_non_tls_server(self):
+        cm = CoreManager('marie_rc', False)
+        cm.lc.sip_transport_timeout = 3000
+        pc = cm.lc.default_proxy_config
+        pc.edit()
+        addr = linphone.Address.new(pc.server_addr)
+        port = addr.port
+        if port <= 0:
+            port = 5060
+        pc.server_addr = "sip:{domain}:{port};transport=tls".format(domain=addr.domain, port=port)
+        pc.done()
+        assert_equals(CoreManager.wait_for_until(cm, cm, lambda cm1, cm2: cm1.stats.number_of_LinphoneRegistrationFailed == 1, 5000), True)

From 9b06383c7e75ee3d6dacb564bd6598b00df16128 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Fri, 19 Dec 2014 18:44:28 +0100
Subject: [PATCH 215/496] update ms2 for linuxgl and mac gl bugfixes

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index bb912b0dc..4030154eb 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit bb912b0dc4d2941ec0d5963830d8c8f79822d5d9
+Subproject commit 4030154ebc76f59c1187882e723ddc24e123f1de

From 76c6886119e27e70f9287348dd9a84e3f6fec94a Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Mon, 22 Dec 2014 16:23:26 +0100
Subject: [PATCH 216/496] fix potential crash when receiving an incoming call
 for which audio is declined (due to incompatible codecs), but video is
 accepted.

---
 coreapi/bellesip_sal/sal_op_call.c | 21 +++++----
 tester/call_tester.c               | 74 +++++++++++++++++++++++++-----
 tester/flexisip_tester.c           | 20 ++++----
 3 files changed, 85 insertions(+), 30 deletions(-)

diff --git a/coreapi/bellesip_sal/sal_op_call.c b/coreapi/bellesip_sal/sal_op_call.c
index c2e9a4a64..921184cf6 100644
--- a/coreapi/bellesip_sal/sal_op_call.c
+++ b/coreapi/bellesip_sal/sal_op_call.c
@@ -62,16 +62,19 @@ static void sdp_process(SalOp *h){
 		strcpy(h->result->addr,h->base.remote_media->addr);
 		h->result->bandwidth=h->base.remote_media->bandwidth;
 
-		for(i=0;i<sal_media_description_get_nb_active_streams(h->result);++i){
-			strcpy(h->result->streams[i].rtp_addr,h->base.remote_media->streams[i].rtp_addr);
-			h->result->streams[i].ptime=h->base.remote_media->streams[i].ptime;
-			h->result->streams[i].bandwidth=h->base.remote_media->streams[i].bandwidth;
-			h->result->streams[i].rtp_port=h->base.remote_media->streams[i].rtp_port;
-			strcpy(h->result->streams[i].rtcp_addr,h->base.remote_media->streams[i].rtcp_addr);
-			h->result->streams[i].rtcp_port=h->base.remote_media->streams[i].rtcp_port;
+		for(i=0;i<h->result->nb_streams;++i){
+			/*copy back parameters from remote description that we need in our result description*/
+			if (h->result->streams[i].rtp_port!=0){ /*if stream was accepted*/
+				strcpy(h->result->streams[i].rtp_addr,h->base.remote_media->streams[i].rtp_addr);
+				h->result->streams[i].ptime=h->base.remote_media->streams[i].ptime;
+				h->result->streams[i].bandwidth=h->base.remote_media->streams[i].bandwidth;
+				h->result->streams[i].rtp_port=h->base.remote_media->streams[i].rtp_port;
+				strcpy(h->result->streams[i].rtcp_addr,h->base.remote_media->streams[i].rtcp_addr);
+				h->result->streams[i].rtcp_port=h->base.remote_media->streams[i].rtcp_port;
 
-			if ((h->result->streams[i].proto == SalProtoRtpSavpf) || (h->result->streams[i].proto == SalProtoRtpSavp)) {
-				h->result->streams[i].crypto[0] = h->base.remote_media->streams[i].crypto[0];
+				if ((h->result->streams[i].proto == SalProtoRtpSavpf) || (h->result->streams[i].proto == SalProtoRtpSavp)) {
+					h->result->streams[i].crypto[0] = h->base.remote_media->streams[i].crypto[0];
+				}
 			}
 		}
 	}
diff --git a/tester/call_tester.c b/tester/call_tester.c
index 29ccf1a1a..fa3550db1 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -1265,6 +1265,32 @@ static void call_paused_resumed_from_callee(void) {
 	linphone_core_manager_destroy(pauline);
 }
 
+static void audio_call_with_ice_no_matching_audio_codecs(void) {
+	LinphoneCoreManager *marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager *pauline = linphone_core_manager_new("pauline_rc");
+	LinphoneCall *out_call;
+
+	linphone_core_enable_payload_type(marie->lc, linphone_core_find_payload_type(marie->lc, "PCMU", 8000, 1), FALSE); /* Disable PCMU */
+	linphone_core_enable_payload_type(marie->lc, linphone_core_find_payload_type(marie->lc, "PCMA", 8000, 1), TRUE); /* Enable PCMA */
+	linphone_core_set_firewall_policy(marie->lc, LinphonePolicyUseIce);
+	linphone_core_set_stun_server(marie->lc, "stun.linphone.org");
+	linphone_core_set_firewall_policy(pauline->lc, LinphonePolicyUseIce);
+	linphone_core_set_stun_server(pauline->lc, "stun.linphone.org");
+
+	out_call = linphone_core_invite_address(marie->lc, pauline->identity);
+	linphone_call_ref(out_call);
+	CU_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallOutgoingInit, 1));
+
+	/* flexisip will retain the 488 until the "urgent reply" timeout arrives. */
+	CU_ASSERT_TRUE(wait_for_until(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallError, 1, 6000));
+	CU_ASSERT_EQUAL(linphone_call_get_reason(out_call), LinphoneReasonNotAcceptable);
+	CU_ASSERT_EQUAL(pauline->stat.number_of_LinphoneCallIncomingReceived, 0);
+
+	linphone_call_unref(out_call);
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
 #ifdef VIDEO_ENABLED
 static LinphoneCall* setup_video(LinphoneCoreManager* caller,LinphoneCoreManager* callee) {
 	LinphoneVideoPolicy  caller_policy;
@@ -1511,6 +1537,7 @@ static void video_call_base(LinphoneCoreManager* pauline,LinphoneCoreManager* ma
 	LinphoneCall* marie_call;
 	LinphoneCall* pauline_call;
 	LinphoneVideoPolicy marie_policy, pauline_policy;
+	
 	linphone_core_enable_video_capture(marie->lc, TRUE);
 	linphone_core_enable_video_display(marie->lc, TRUE);
 	linphone_core_enable_video_capture(pauline->lc, TRUE);
@@ -1631,27 +1658,51 @@ static void call_with_ice_video_added(void) {
 	linphone_core_manager_destroy(pauline);
 }
 
-static void video_call_with_ice_no_matching_audio_codecs(void) {
+static void video_call_with_early_media_no_matching_audio_codecs(void) {
 	LinphoneCoreManager *marie = linphone_core_manager_new("marie_rc");
 	LinphoneCoreManager *pauline = linphone_core_manager_new("pauline_rc");
 	LinphoneCall *out_call;
-
+	LinphoneVideoPolicy vpol={0};
+	
+	linphone_core_enable_video_capture(marie->lc, TRUE);
+	linphone_core_enable_video_display(marie->lc, TRUE);
+	linphone_core_enable_video_capture(pauline->lc, TRUE);
+	linphone_core_enable_video_display(pauline->lc, FALSE);
+	
+	vpol.automatically_initiate=TRUE;
+	vpol.automatically_accept=TRUE;
+	linphone_core_set_video_policy(pauline->lc,&vpol);
+	linphone_core_set_video_policy(marie->lc,&vpol);
+	
 	linphone_core_enable_payload_type(marie->lc, linphone_core_find_payload_type(marie->lc, "PCMU", 8000, 1), FALSE); /* Disable PCMU */
 	linphone_core_enable_payload_type(marie->lc, linphone_core_find_payload_type(marie->lc, "PCMA", 8000, 1), TRUE); /* Enable PCMA */
-	linphone_core_set_firewall_policy(marie->lc, LinphonePolicyUseIce);
-	linphone_core_set_stun_server(marie->lc, "stun.linphone.org");
-	linphone_core_set_firewall_policy(pauline->lc, LinphonePolicyUseIce);
-	linphone_core_set_stun_server(pauline->lc, "stun.linphone.org");
 
 	out_call = linphone_core_invite_address(marie->lc, pauline->identity);
 	linphone_call_ref(out_call);
 	CU_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallOutgoingInit, 1));
+	CU_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallIncomingReceived, 1));
+	CU_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallOutgoingRinging, 1));
 
-	/* flexisip will retain the 488 until the "urgent reply" timeout arrives. */
-	CU_ASSERT_TRUE(wait_for_until(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallError, 1, 6000));
-	CU_ASSERT_EQUAL(linphone_call_get_reason(out_call), LinphoneReasonNotAcceptable);
-	CU_ASSERT_EQUAL(pauline->stat.number_of_LinphoneCallIncomingReceived, 0);
+	linphone_core_accept_early_media(pauline->lc,linphone_core_get_current_call(pauline->lc));
 
+	CU_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallIncomingEarlyMedia, 1));
+	CU_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallOutgoingEarlyMedia, 1));
+	/*audio stream shall not have been requested to start*/
+	CU_ASSERT_PTR_NULL(linphone_core_get_current_call(pauline->lc)->audiostream->soundread);
+	
+	CU_ASSERT_TRUE(linphone_call_params_video_enabled(linphone_call_get_current_params(out_call))==TRUE);
+	CU_ASSERT_TRUE(linphone_call_params_video_enabled(linphone_call_get_current_params(linphone_core_get_current_call(pauline->lc)))==TRUE);
+	
+	linphone_core_accept_call(pauline->lc, linphone_core_get_current_call(pauline->lc));
+	
+	CU_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallStreamsRunning, 1));
+	CU_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallStreamsRunning, 1));
+	
+	linphone_core_terminate_call(marie->lc, out_call);
+	
+	CU_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallEnd, 1));
+	CU_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallEnd, 1));
+	
 	linphone_call_unref(out_call);
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
@@ -3458,6 +3509,7 @@ test_t call_tests[] = {
 	{ "SRTP call with declined srtp", call_with_declined_srtp },
 	{ "Call with file player", call_with_file_player},
 	{ "Call with mkv file player", call_with_mkv_file_player},
+	{ "Audio call with ICE no matching audio codecs", audio_call_with_ice_no_matching_audio_codecs },
 #ifdef VIDEO_ENABLED
 	{ "Simple video call",video_call},
 	{ "Simple video call using policy",video_call_using_policy},
@@ -3473,9 +3525,9 @@ test_t call_tests[] = {
 	{ "Call with multiple early media", multiple_early_media },
 	{ "Call with ICE from video to non-video", call_with_ice_video_to_novideo},
 	{ "Call with ICE and video added", call_with_ice_video_added },
-	{ "Video call with ICE no matching audio codecs", video_call_with_ice_no_matching_audio_codecs },
 	{ "Video call recording", video_call_recording_test },
 	{ "Snapshot", video_call_snapshot },
+	{ "Video call with early media and no matching audio codecs", video_call_with_early_media_no_matching_audio_codecs },
 #endif
 	{ "SRTP ice call", srtp_ice_call },
 	{ "ZRTP ice call", zrtp_ice_call },
diff --git a/tester/flexisip_tester.c b/tester/flexisip_tester.c
index 282894f09..4b310be88 100644
--- a/tester/flexisip_tester.c
+++ b/tester/flexisip_tester.c
@@ -552,12 +552,12 @@ static void early_media_call_forking(void) {
 	
 	/*wait a bit that streams are established*/
 	wait_for_list(lcs,&dummy,1,3000);
-	CU_ASSERT_TRUE(linphone_call_get_audio_stats(pauline_call)->download_bandwidth>70
-					&& linphone_call_get_audio_stats(pauline_call)->download_bandwidth<90);
-	CU_ASSERT_TRUE(linphone_call_get_audio_stats(marie1_call)->download_bandwidth>70
-					&& linphone_call_get_audio_stats(marie1_call)->download_bandwidth<90);
-	CU_ASSERT_TRUE(linphone_call_get_audio_stats(marie2_call)->download_bandwidth>70
-					&& linphone_call_get_audio_stats(marie2_call)->download_bandwidth<90);
+	CU_ASSERT_TRUE(linphone_call_get_audio_stats(pauline_call)->download_bandwidth>60
+					&& linphone_call_get_audio_stats(pauline_call)->download_bandwidth<99);
+	CU_ASSERT_TRUE(linphone_call_get_audio_stats(marie1_call)->download_bandwidth>60
+					&& linphone_call_get_audio_stats(marie1_call)->download_bandwidth<99);
+	CU_ASSERT_TRUE(linphone_call_get_audio_stats(marie2_call)->download_bandwidth>60
+					&& linphone_call_get_audio_stats(marie2_call)->download_bandwidth<99);
 	
 	linphone_core_accept_call(marie1->lc,linphone_core_get_current_call(marie1->lc));
 	CU_ASSERT_TRUE(wait_for_list(lcs,&marie1->stat.number_of_LinphoneCallStreamsRunning,1,3000));
@@ -568,10 +568,10 @@ static void early_media_call_forking(void) {
 	
 	/*wait a bit that streams are established*/
 	wait_for_list(lcs,&dummy,1,3000);
-	CU_ASSERT_TRUE(linphone_call_get_audio_stats(pauline_call)->download_bandwidth>71
-					&& linphone_call_get_audio_stats(pauline_call)->download_bandwidth<91 );
-	CU_ASSERT_TRUE(linphone_call_get_audio_stats(marie1_call)->download_bandwidth>71
-					&& linphone_call_get_audio_stats(marie1_call)->download_bandwidth<91 );
+	CU_ASSERT_TRUE(linphone_call_get_audio_stats(pauline_call)->download_bandwidth>60
+					&& linphone_call_get_audio_stats(pauline_call)->download_bandwidth<99 );
+	CU_ASSERT_TRUE(linphone_call_get_audio_stats(marie1_call)->download_bandwidth>60
+					&& linphone_call_get_audio_stats(marie1_call)->download_bandwidth<99 );
 	
 	linphone_core_terminate_all_calls(pauline->lc);
 	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallEnd,1,1000));

From d7437ef1f5cd41b582b36ac9efc51d0b5a3506bc Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Mon, 22 Dec 2014 21:47:35 +0100
Subject: [PATCH 217/496] enable ice with tunnel

---
 coreapi/TunnelManager.cc    | 15 ++++++-------
 coreapi/TunnelManager.hh    |  1 +
 coreapi/callbacks.c         |  2 +-
 coreapi/linphonecall.c      | 40 +++++++++++++++++++---------------
 coreapi/linphonecore.c      | 21 +++---------------
 coreapi/private.h           | 14 ------------
 mediastreamer2              |  2 +-
 oRTP                        |  2 +-
 tester/call_tester.c        | 43 ++++++++++++++++++++++++++-----------
 tester/liblinphone_tester.h |  1 +
 tester/transport_tester.c   | 34 +++++++++++++++++++++++++++++
 11 files changed, 101 insertions(+), 74 deletions(-)

diff --git a/coreapi/TunnelManager.cc b/coreapi/TunnelManager.cc
index 53d7f288f..bbce579a3 100644
--- a/coreapi/TunnelManager.cc
+++ b/coreapi/TunnelManager.cc
@@ -16,9 +16,6 @@
 #include "ortp/rtpsession.h"
 #include "linphonecore.h"
 #include "linphonecore_utils.h"
-#ifndef USE_BELLESIP
-#include "eXosip2/eXosip_transport_hook.h"
-#endif
 #include "private.h"
 
 #ifdef ANDROID
@@ -97,7 +94,7 @@ RtpTransport *TunnelManager::createRtpTransport(int port){
 
 void TunnelManager::startClient() {
 	ms_message("TunnelManager: Starting tunnel client");
-	mTunnelClient = new TunnelClient();
+	mTunnelClient = new TunnelClient(TRUE);
 	mTunnelClient->setCallback((TunnelClientController::StateCallback)tunnelCallback,this);
 	list<ServerAddr>::iterator it;
 	for(it=mServerAddrs.begin();it!=mServerAddrs.end();++it){
@@ -122,18 +119,16 @@ int TunnelManager::customSendto(struct _RtpTransport *t, mblk_t *msg , int flags
 }
 
 int TunnelManager::customRecvfrom(struct _RtpTransport *t, mblk_t *msg, int flags, struct sockaddr *from, socklen_t *fromlen){
+	memset(&msg->recv_addr,0,sizeof(msg->recv_addr));
 	int err=((TunnelSocket*)t->data)->recvfrom(msg->b_wptr,msg->b_datap->db_lim-msg->b_datap->db_base,from,*fromlen);
+	//to make ice happy
+	inet_aton(((TunnelManager*)((TunnelSocket*)t->data)->getUserPointer())->mLocalAddr,&msg->recv_addr.addr.ipi_addr);
 	if (err>0) return err;
 	return 0;
 }
 
-
 TunnelManager::TunnelManager(LinphoneCore* lc) :
 	mCore(lc),
-#ifndef USE_BELLESIP
-	mSipSocket(NULL),
-	mExosipTransport(NULL),
-#endif
 	mMode(LinphoneTunnelModeDisable),
 	mState(disabled),
 	mTunnelizeSipPackets(true),
@@ -153,6 +148,7 @@ TunnelManager::TunnelManager(LinphoneCore* lc) :
 	mVTable = linphone_core_v_table_new();
 	mVTable->network_reachable = networkReachableCb;
 	linphone_core_add_listener(mCore, mVTable);
+	linphone_core_get_local_ip_for(AF_INET, NULL, mLocalAddr);
 }
 
 TunnelManager::~TunnelManager(){
@@ -371,6 +367,7 @@ void TunnelManager::networkReachableCb(LinphoneCore *lc, bool_t reachable) {
 		tunnel->startAutoDetection();
 		tunnel->mState = autodetecting;
 	}
+	linphone_core_get_local_ip_for(AF_INET, NULL,tunnel->mLocalAddr);
 }
 
 bool TunnelManager::startAutoDetection() {
diff --git a/coreapi/TunnelManager.hh b/coreapi/TunnelManager.hh
index 0af89fce9..fdda28beb 100644
--- a/coreapi/TunnelManager.hh
+++ b/coreapi/TunnelManager.hh
@@ -200,6 +200,7 @@ namespace belledonnecomm {
 		LinphoneRtpTransportFactories mTransportFactories;
 		Mutex mMutex;
 		std::queue<Event> mEvq;
+		char mLocalAddr[64];
 	};
 
 /**
diff --git a/coreapi/callbacks.c b/coreapi/callbacks.c
index c43c84479..fe65a4282 100644
--- a/coreapi/callbacks.c
+++ b/coreapi/callbacks.c
@@ -321,7 +321,7 @@ static void call_received(SalOp *h){
 	linphone_core_add_call(lc,call);
 	linphone_call_ref(call); /*prevent the call from being destroyed while we are notifying, if the user declines within the state callback */
 
-	if ((_linphone_core_get_firewall_policy(lc) == LinphonePolicyUseIce) && (call->ice_session != NULL)) {
+	if ((linphone_core_get_firewall_policy(lc) == LinphonePolicyUseIce) && (call->ice_session != NULL)) {
 		/* Defer ringing until the end of the ICE candidates gathering process. */
 		ms_message("Defer ringing to gather ICE candidates");
 		return;
diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index 530706ada..c5c7e6a7a 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -698,7 +698,7 @@ static void linphone_call_get_local_ip(LinphoneCall *call, const LinphoneAddress
 		}
 		if (res != NULL) freeaddrinfo(res);
 	}
-	if (_linphone_core_get_firewall_policy(call->core)==LinphonePolicyUseNatAddress
+	if (linphone_core_get_firewall_policy(call->core)==LinphonePolicyUseNatAddress
 		&& (ip=linphone_core_get_nat_address_resolved(call->core))!=NULL){
 		strncpy(call->localip,ip,LINPHONE_IPADDR_SIZE);
 		return;
@@ -735,11 +735,11 @@ LinphoneCall * linphone_call_new_outgoing(struct _LinphoneCore *lc, LinphoneAddr
 	linphone_call_init_common(call,from,to);
 	call->params = linphone_call_params_copy(params);
 
-	if (_linphone_core_get_firewall_policy(call->core) == LinphonePolicyUseIce) {
+	if (linphone_core_get_firewall_policy(call->core) == LinphonePolicyUseIce) {
 		call->ice_session = ice_session_new();
 		ice_session_set_role(call->ice_session, IR_Controlling);
 	}
-	if (_linphone_core_get_firewall_policy(call->core) == LinphonePolicyUseStun) {
+	if (linphone_core_get_firewall_policy(call->core) == LinphonePolicyUseStun) {
 		call->ping_time=linphone_core_run_stun_tests(call->core,call);
 	}
 #ifdef BUILD_UPNP
@@ -841,7 +841,7 @@ LinphoneCall * linphone_call_new_incoming(LinphoneCore *lc, LinphoneAddress *fro
 		// In this case WE chose the media parameters according to policy.
 		linphone_call_set_compatible_incoming_call_parameters(call, md);
 	}
-	fpol=_linphone_core_get_firewall_policy(call->core);
+	fpol=linphone_core_get_firewall_policy(call->core);
 	/*create the ice session now if ICE is required*/
 	if (fpol==LinphonePolicyUseIce){
 		if (md){
@@ -1557,7 +1557,7 @@ static void port_config_set_random_choosed(LinphoneCall *call, int stream_index,
 
 static void _linphone_call_prepare_ice_for_stream(LinphoneCall *call, int stream_index, bool_t create_checklist){
 	MediaStream *ms=stream_index == 0 ? (MediaStream*)call->audiostream : (MediaStream*)call->videostream;
-	if ((_linphone_core_get_firewall_policy(call->core) == LinphonePolicyUseIce) && (call->ice_session != NULL)){
+	if ((linphone_core_get_firewall_policy(call->core) == LinphonePolicyUseIce) && (call->ice_session != NULL)){
 		IceCheckList *cl;
 		rtp_session_set_pktinfo(ms->sessions.rtp_session, TRUE);
 		rtp_session_set_symmetric_rtp(ms->sessions.rtp_session, FALSE);
@@ -1578,7 +1578,7 @@ int linphone_call_prepare_ice(LinphoneCall *call, bool_t incoming_offer){
 	SalMediaDescription *remote = NULL;
 	bool_t has_video=FALSE;
 
-	if ((_linphone_core_get_firewall_policy(call->core) == LinphonePolicyUseIce) && (call->ice_session != NULL)){
+	if ((linphone_core_get_firewall_policy(call->core) == LinphonePolicyUseIce) && (call->ice_session != NULL)){
 		if (incoming_offer){
 			remote=sal_call_get_remote_media_description(call->op);
 			has_video=call->params->has_video && linphone_core_media_description_contains_video_stream(remote);
@@ -1699,13 +1699,16 @@ void linphone_call_init_audio_stream(LinphoneCall *call){
 	audio_stream_set_features(audiostream,linphone_core_get_audio_features(lc));
 
 	if (lc->rtptf){
-		RtpTransport *artp=lc->rtptf->audio_rtp_func(lc->rtptf->audio_rtp_func_data, call->media_ports[0].rtp_port);
-		RtpTransport *artcp=lc->rtptf->audio_rtcp_func(lc->rtptf->audio_rtcp_func_data, call->media_ports[0].rtcp_port);
 		RtpTransport *meta_rtp;
 		RtpTransport *meta_rtcp;
-		meta_rtp_transport_new(&meta_rtp,TRUE,artp, 0);
-		meta_rtp_transport_new(&meta_rtcp,FALSE,artcp, 0);
-		rtp_session_set_transports(audiostream->ms.sessions.rtp_session,meta_rtp,meta_rtcp);
+
+		rtp_session_get_transports(audiostream->ms.sessions.rtp_session,&meta_rtp,&meta_rtcp);
+		if (meta_rtp_transport_get_endpoint(meta_rtp) == NULL) {
+			meta_rtp_transport_set_endpoint(meta_rtp,lc->rtptf->audio_rtp_func(lc->rtptf->audio_rtp_func_data, call->media_ports[0].rtp_port));
+		}
+		if (meta_rtp_transport_get_endpoint(meta_rtcp) == NULL) {
+			meta_rtp_transport_set_endpoint(meta_rtcp,lc->rtptf->audio_rtcp_func(lc->rtptf->audio_rtcp_func_data, call->media_ports[0].rtcp_port));
+		}
 	}
 
 	call->audiostream_app_evq = ortp_ev_queue_new();
@@ -1748,13 +1751,16 @@ void linphone_call_init_video_stream(LinphoneCall *call){
 			video_stream_set_display_filter_name(call->videostream,display_filter);
 		video_stream_set_event_callback(call->videostream,video_stream_event_cb, call);
 		if (lc->rtptf){
-			RtpTransport *vrtp=lc->rtptf->video_rtp_func(lc->rtptf->video_rtp_func_data, call->media_ports[1].rtp_port);
-			RtpTransport *vrtcp=lc->rtptf->video_rtcp_func(lc->rtptf->video_rtcp_func_data, call->media_ports[1].rtcp_port);
 			RtpTransport *meta_rtp;
 			RtpTransport *meta_rtcp;
-			meta_rtp_transport_new(&meta_rtp,TRUE,vrtp, 0);
-			meta_rtp_transport_new(&meta_rtcp,FALSE,vrtcp, 0);
-			rtp_session_set_transports(call->videostream->ms.sessions.rtp_session,meta_rtp,meta_rtcp);
+
+			rtp_session_get_transports(call->videostream->ms.sessions.rtp_session,&meta_rtp,&meta_rtcp);
+			if (meta_rtp_transport_get_endpoint(meta_rtp) == NULL) {
+				meta_rtp_transport_set_endpoint(meta_rtp,lc->rtptf->video_rtp_func(lc->rtptf->video_rtp_func_data, call->media_ports[1].rtp_port));
+			}
+			if (meta_rtp_transport_get_endpoint(meta_rtcp) == NULL) {
+				meta_rtp_transport_set_endpoint(meta_rtcp,lc->rtptf->video_rtcp_func(lc->rtptf->video_rtcp_func_data, call->media_ports[1].rtcp_port));
+			}
 		}
 		call->videostream_app_evq = ortp_ev_queue_new();
 		rtp_session_register_event_queue(call->videostream->ms.sessions.rtp_session,call->videostream_app_evq);
@@ -3262,7 +3268,7 @@ static LinphoneAddress *get_fixed_contact(LinphoneCore *lc, LinphoneCall *call ,
 	const char *localip=call->localip;
 
 	/* first use user's supplied ip address if asked*/
-	if (_linphone_core_get_firewall_policy(lc)==LinphonePolicyUseNatAddress){
+	if (linphone_core_get_firewall_policy(lc)==LinphonePolicyUseNatAddress){
 		ctt=linphone_core_get_primary_contact_parsed(lc);
 		linphone_address_set_domain(ctt,linphone_core_get_nat_address_resolved(lc));
 		ret=ctt;
diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index c3e526db9..66bef51c8 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -3137,12 +3137,12 @@ LinphoneCall * linphone_core_invite_address_with_params(LinphoneCore *lc, const
 	call->log->start_date_time=ms_time(NULL);
 	linphone_call_init_media_streams(call);
 
-	if (_linphone_core_get_firewall_policy(call->core) == LinphonePolicyUseIce) {
+	if (linphone_core_get_firewall_policy(call->core) == LinphonePolicyUseIce) {
 		/* Defer the start of the call after the ICE gathering process. */
 		if (linphone_call_prepare_ice(call,FALSE)==1)
 			defer=TRUE;
 	}
-	else if (_linphone_core_get_firewall_policy(call->core) == LinphonePolicyUseUpnp) {
+	else if (linphone_core_get_firewall_policy(call->core) == LinphonePolicyUseUpnp) {
 #ifdef BUILD_UPNP
 		if (linphone_core_update_upnp(lc,call)<0) {
 			/* uPnP port mappings failed, proceed with the call anyway. */
@@ -4965,23 +4965,8 @@ void linphone_core_set_firewall_policy(LinphoneCore *lc, LinphoneFirewallPolicy
 	if (linphone_core_ready(lc))
 		lp_config_set_string(lc->config,"net","firewall_policy",policy);
 }
-
-LinphoneFirewallPolicy linphone_core_get_firewall_policy(const LinphoneCore *lc) {
-	return _linphone_core_get_firewall_policy_with_lie(lc, FALSE);
-}
-
-LinphoneFirewallPolicy _linphone_core_get_firewall_policy(const LinphoneCore *lc) {
-	return _linphone_core_get_firewall_policy_with_lie(lc, TRUE);
-}
-
-LinphoneFirewallPolicy _linphone_core_get_firewall_policy_with_lie(const LinphoneCore *lc, bool_t lie){
+LinphoneFirewallPolicy linphone_core_get_firewall_policy(const LinphoneCore *lc){
 	const char *policy;
-	if(lie) {
-		LinphoneTunnel *tunnel = linphone_core_get_tunnel(lc);
-		if(tunnel != NULL && linphone_tunnel_get_mode(tunnel)) {
-			return LinphonePolicyNoFirewall;
-		}
-	}
 	policy = lp_config_get_string(lc->config, "net", "firewall_policy", NULL);
 	if ((policy == NULL) || (strcmp(policy, "0") == 0))
 		return LinphonePolicyNoFirewall;
diff --git a/coreapi/private.h b/coreapi/private.h
index 0b929929f..4d94267c2 100644
--- a/coreapi/private.h
+++ b/coreapi/private.h
@@ -298,20 +298,6 @@ void linphone_core_update_proxy_register(LinphoneCore *lc);
 void linphone_core_refresh_subscribes(LinphoneCore *lc);
 int linphone_core_abort_call(LinphoneCore *lc, LinphoneCall *call, const char *error);
 const char *linphone_core_get_nat_address_resolved(LinphoneCore *lc);
-/**
- * @brief Equivalent to _linphone_core_get_firewall_policy_with_lie(lc, TRUE)
- * @param lc LinphoneCore instance
- * @return Fairewall policy
- */
-LinphoneFirewallPolicy _linphone_core_get_firewall_policy(const LinphoneCore *lc);
-/**
- * @brief Get the firwall policy which has been set.
- * @param lc Instance of LinphoneCore
- * @param lie If true, the configured firewall policy will be returned only if no tunnel are enabled.
- * Otherwise, NoFirewallPolicy value will be returned.
- * @return The firewall policy
- */
-LinphoneFirewallPolicy _linphone_core_get_firewall_policy_with_lie(const LinphoneCore *lc, bool_t lie);
 
 int linphone_proxy_config_send_publish(LinphoneProxyConfig *cfg, LinphonePresenceModel *presence);
 void linphone_proxy_config_set_state(LinphoneProxyConfig *cfg, LinphoneRegistrationState rstate, const char *message);
diff --git a/mediastreamer2 b/mediastreamer2
index d2d7291eb..87cf71d76 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit d2d7291eb0dece51a68dfd2b8d005618e945c73b
+Subproject commit 87cf71d765ae035ad5a1b6bdcaf2970410459c2d
diff --git a/oRTP b/oRTP
index f4d6250a9..227f06f72 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit f4d6250a9de606025669f6caa6819c7d8d0cd77d
+Subproject commit 227f06f7256302404e29d2e2ab40dde00c5d1aca
diff --git a/tester/call_tester.c b/tester/call_tester.c
index 4e8a323c3..8620485c7 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -32,7 +32,7 @@
 #endif
 
 static void srtp_call(void);
-static void call_base(LinphoneMediaEncryption mode, bool_t enable_video,bool_t enable_relay,LinphoneFirewallPolicy policy);
+
 static void disable_all_audio_codecs_except_one(LinphoneCore *lc, const char *mime, int rate);
 static char *create_filepath(const char *dir, const char *filename, const char *ext);
 
@@ -1978,14 +1978,14 @@ static void simple_conference_with_ice(void) {
 }
 
 static void srtp_call() {
-	call_base(LinphoneMediaEncryptionSRTP,FALSE,FALSE,LinphonePolicyNoFirewall);
+	call_base(LinphoneMediaEncryptionSRTP,FALSE,FALSE,LinphonePolicyNoFirewall,FALSE);
 }
 
 static void zrtp_call() {
-	call_base(LinphoneMediaEncryptionZRTP,FALSE,FALSE,LinphonePolicyNoFirewall);
+	call_base(LinphoneMediaEncryptionZRTP,FALSE,FALSE,LinphonePolicyNoFirewall,FALSE);
 }
 static void zrtp_video_call() {
-	call_base(LinphoneMediaEncryptionZRTP,TRUE,FALSE,LinphonePolicyNoFirewall);
+	call_base(LinphoneMediaEncryptionZRTP,TRUE,FALSE,LinphonePolicyNoFirewall,FALSE);
 }
 
 static void call_with_declined_srtp(void) {
@@ -2132,13 +2132,31 @@ end:
 }
 
 
-static void call_base(LinphoneMediaEncryption mode, bool_t enable_video,bool_t enable_relay,LinphoneFirewallPolicy policy) {
+void call_base(LinphoneMediaEncryption mode, bool_t enable_video,bool_t enable_relay,LinphoneFirewallPolicy policy,bool_t enable_tunnel) {
 	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
 	if (enable_relay) {
 		linphone_core_set_user_agent(marie->lc,"Natted Linphone",NULL);
 		linphone_core_set_user_agent(pauline->lc,"Natted Linphone",NULL);
 	}
+	if (enable_tunnel) {
+		int i;
+		LinphoneTunnelConfig * tunnel_config = linphone_tunnel_config_new();
+		linphone_tunnel_config_set_host(tunnel_config,"tunnel.linphone.org");
+		linphone_tunnel_config_set_port(tunnel_config,443);
+		linphone_tunnel_add_server(linphone_core_get_tunnel(marie->lc),tunnel_config);
+		linphone_tunnel_enable_sip(linphone_core_get_tunnel(marie->lc),FALSE);
+		linphone_tunnel_set_mode(linphone_core_get_tunnel(marie->lc),LinphoneTunnelModeEnable);
+		for (i=0;i<10;i++) {
+			if (linphone_tunnel_connected(linphone_core_get_tunnel(marie->lc))) {
+				break;
+			}
+			linphone_core_iterate(marie->lc);
+			ms_usleep(200000);
+		}
+		CU_ASSERT_TRUE(linphone_tunnel_connected(linphone_core_get_tunnel(marie->lc)));
+
+	}
 	if (linphone_core_media_encryption_supported(marie->lc,mode)) {
 		linphone_core_set_media_encryption(marie->lc,mode);
 		linphone_core_set_media_encryption(pauline->lc,mode);
@@ -2172,7 +2190,7 @@ static void call_base(LinphoneMediaEncryption mode, bool_t enable_video,bool_t e
 		}
 
 		if (policy == LinphonePolicyUseIce)
-			CU_ASSERT_TRUE(check_ice(pauline,marie,LinphoneIceStateHostConnection));
+			CU_ASSERT_TRUE(check_ice(pauline,marie,enable_tunnel?LinphoneIceStateReflexiveConnection:LinphoneIceStateHostConnection));
 #ifdef VIDEO_ENABLED
 		if (enable_video) {
 			int i=0;
@@ -2185,7 +2203,7 @@ static void call_base(LinphoneMediaEncryption mode, bool_t enable_video,bool_t e
 
 				add_video(pauline,marie);
 				if (policy == LinphonePolicyUseIce)
-					CU_ASSERT_TRUE(check_ice(pauline,marie,LinphoneIceStateHostConnection));
+					CU_ASSERT_TRUE(check_ice(pauline,marie,enable_tunnel?LinphoneIceStateReflexiveConnection:LinphoneIceStateHostConnection));
 
 				liblinphone_tester_check_rtcp(marie,pauline);
 				/*wait for ice to found the direct path*/
@@ -2208,25 +2226,24 @@ static void call_base(LinphoneMediaEncryption mode, bool_t enable_video,bool_t e
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
 }
-
 #ifdef VIDEO_ENABLED
 static void srtp_video_ice_call(void) {
-	call_base(LinphoneMediaEncryptionSRTP,TRUE,FALSE,LinphonePolicyUseIce);
+	call_base(LinphoneMediaEncryptionSRTP,TRUE,FALSE,LinphonePolicyUseIce,FALSE);
 }
 static void zrtp_video_ice_call(void) {
-	call_base(LinphoneMediaEncryptionZRTP,TRUE,FALSE,LinphonePolicyUseIce);
+	call_base(LinphoneMediaEncryptionZRTP,TRUE,FALSE,LinphonePolicyUseIce,FALSE);
 }
 #endif
 
 static void srtp_ice_call(void) {
-	call_base(LinphoneMediaEncryptionSRTP,FALSE,FALSE,LinphonePolicyUseIce);
+	call_base(LinphoneMediaEncryptionSRTP,FALSE,FALSE,LinphonePolicyUseIce,FALSE);
 }
 
 static void zrtp_ice_call(void) {
-	call_base(LinphoneMediaEncryptionZRTP,FALSE,FALSE,LinphonePolicyUseIce);
+	call_base(LinphoneMediaEncryptionZRTP,FALSE,FALSE,LinphonePolicyUseIce,FALSE);
 }
 static void zrtp_ice_call_with_relay(void) {
-	call_base(LinphoneMediaEncryptionZRTP,FALSE,TRUE,LinphonePolicyUseIce);
+	call_base(LinphoneMediaEncryptionZRTP,FALSE,TRUE,LinphonePolicyUseIce,FALSE);
 }
 
 static void early_media_call(void) {
diff --git a/tester/liblinphone_tester.h b/tester/liblinphone_tester.h
index 2c926b27d..0c4e658c5 100644
--- a/tester/liblinphone_tester.h
+++ b/tester/liblinphone_tester.h
@@ -304,5 +304,6 @@ void cunit_android_trace_handler(int level, const char *fmt, va_list args) ;
 #endif
 int  liblinphone_tester_fprintf(FILE * stream, const char * format, ...);
 
+void call_base(LinphoneMediaEncryption mode, bool_t enable_video,bool_t enable_relay,LinphoneFirewallPolicy policy,bool_t enable_tunnel);
 #endif /* LIBLINPHONE_TESTER_H_ */
 
diff --git a/tester/transport_tester.c b/tester/transport_tester.c
index fdc4a194f..c44f84547 100644
--- a/tester/transport_tester.c
+++ b/tester/transport_tester.c
@@ -59,6 +59,8 @@ static char* get_public_contact_ip(LinphoneCore* lc)  {
 	ms_free(contact);
 	return ms_strdup(contact_host_ip);
 }
+
+
 static void call_with_transport_base(LinphoneTunnelMode tunnel_mode, bool_t with_sip, LinphoneMediaEncryption encryption) {
 	if (linphone_core_tunnel_available()){
 		LinphoneCoreManager *pauline = linphone_core_manager_new( "pauline_rc");
@@ -131,6 +133,7 @@ static void call_with_transport_base(LinphoneTunnelMode tunnel_mode, bool_t with
 	}
 }
 
+
 static void call_with_tunnel(void) {
 	call_with_transport_base(LinphoneTunnelModeEnable, TRUE, LinphoneMediaEncryptionNone);
 }
@@ -151,12 +154,43 @@ static void call_with_tunnel_auto_without_sip_with_srtp(void) {
 	call_with_transport_base(LinphoneTunnelModeAuto, FALSE, LinphoneMediaEncryptionSRTP);
 }
 
+#ifdef VIDEO_ENABLED
+static void tunnel_srtp_video_ice_call(void) {
+	call_base(LinphoneMediaEncryptionSRTP,TRUE,FALSE,LinphonePolicyUseIce,TRUE);
+}
+static void tunnel_zrtp_video_ice_call(void) {
+	call_base(LinphoneMediaEncryptionZRTP,TRUE,FALSE,LinphonePolicyUseIce,TRUE);
+}
+static void tunnel_video_ice_call(void) {
+	call_base(LinphoneMediaEncryptionNone,TRUE,FALSE,LinphonePolicyUseIce,TRUE);
+}
+#endif
+
+static void tunnel_srtp_ice_call(void) {
+	call_base(LinphoneMediaEncryptionSRTP,FALSE,FALSE,LinphonePolicyUseIce,TRUE);
+}
+
+static void tunnel_zrtp_ice_call(void) {
+	call_base(LinphoneMediaEncryptionZRTP,FALSE,FALSE,LinphonePolicyUseIce,TRUE);
+}
+
+static void tunnel_ice_call(void) {
+	call_base(LinphoneMediaEncryptionNone,FALSE,FALSE,LinphonePolicyUseIce,TRUE);
+}
 test_t transport_tests[] = {
 	{ "Tunnel only", call_with_tunnel },
 	{ "Tunnel with SRTP", call_with_tunnel_srtp },
 	{ "Tunnel without SIP", call_with_tunnel_without_sip },
 	{ "Tunnel in automatic mode", call_with_tunnel_auto },
 	{ "Tunnel in automatic mode with SRTP without SIP", call_with_tunnel_auto_without_sip_with_srtp },
+	{ "Tunnel ice call", tunnel_ice_call },
+	{ "Tunnel SRTP ice call", tunnel_srtp_ice_call },
+	{ "Tunnel ZRTP ice call", tunnel_zrtp_ice_call },
+#ifdef VIDEO_ENABLED
+	{ "Tunnel ice video call", tunnel_video_ice_call },
+	{ "Tunnel SRTP ice video call", tunnel_srtp_video_ice_call },
+	{ "Tunnel ZRTP ice video call", tunnel_zrtp_video_ice_call },
+#endif
 };
 
 test_suite_t transport_test_suite = {

From 11f58f732401627c7871eea40d382bda43d99369 Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Tue, 23 Dec 2014 14:51:00 +0100
Subject: [PATCH 218/496] Update oRTP

---
 oRTP | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/oRTP b/oRTP
index 93d40979c..fbe5a32a9 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 93d40979cf89f99dfc2af5c491efdbf8a478565e
+Subproject commit fbe5a32a9a90b0224a6d598c1e060a89f5bd4aba

From be7413c7054282c7610b6d4d94e5f0e6b66fb24e Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Wed, 24 Dec 2014 09:10:38 +0100
Subject: [PATCH 219/496] fix crash in ms2

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 4030154eb..7f2055c55 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 4030154ebc76f59c1187882e723ddc24e123f1de
+Subproject commit 7f2055c5562d15d114edf87c3941de7b74d0a306

From 7fe891b4ae172340cb6f62ce34e0f56543ecbc5e Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Sat, 27 Dec 2014 19:45:19 +0100
Subject: [PATCH 220/496] add ice option to enable backward compatibility with
 previous version of ice

---
 coreapi/linphonecall.c | 4 ++++
 mediastreamer2         | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index c5c7e6a7a..0f2f02383 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -737,6 +737,8 @@ LinphoneCall * linphone_call_new_outgoing(struct _LinphoneCore *lc, LinphoneAddr
 
 	if (linphone_core_get_firewall_policy(call->core) == LinphonePolicyUseIce) {
 		call->ice_session = ice_session_new();
+		/*for backward compatibility purposes, shall be enabled by default in futur*/
+		ice_session_enable_message_integrity_check(call->ice_session,lp_config_get_int(lc->config,"net","ice_session_enable_message_integrity_check",0));
 		ice_session_set_role(call->ice_session, IR_Controlling);
 	}
 	if (linphone_core_get_firewall_policy(call->core) == LinphonePolicyUseStun) {
@@ -846,6 +848,8 @@ LinphoneCall * linphone_call_new_incoming(LinphoneCore *lc, LinphoneAddress *fro
 	if (fpol==LinphonePolicyUseIce){
 		if (md){
 			call->ice_session = ice_session_new();
+			/*for backward compatibility purposes, shall be enabled by default in futur*/
+			ice_session_enable_message_integrity_check(call->ice_session,lp_config_get_int(lc->config,"net","ice_session_enable_message_integrity_check",0));
 			ice_session_set_role(call->ice_session, IR_Controlled);
 		}else{
 			fpol=LinphonePolicyNoFirewall;
diff --git a/mediastreamer2 b/mediastreamer2
index 87cf71d76..08ed3f8a6 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 87cf71d765ae035ad5a1b6bdcaf2970410459c2d
+Subproject commit 08ed3f8a65ad830baa1023e5c0d3ec9e5421ef32

From 507ca786282c310d2ae14edc38302679ec725bbd Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Fri, 2 Jan 2015 11:01:13 +0100
Subject: [PATCH 221/496] Updated ms2

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 7f2055c55..f07213216 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 7f2055c5562d15d114edf87c3941de7b74d0a306
+Subproject commit f07213216893c60359601801b867cd678e916de1

From 86b74cc52117ee2ca13fc3a871915def10c7a921 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Fri, 2 Jan 2015 16:55:44 +0100
Subject: [PATCH 222/496] Handle compilation of account assistant when building
 with CMake.

---
 CMakeLists.txt         | 12 ++++++++
 cmake/FindNotify.cmake |  6 ++--
 cmake/FindSoup.cmake   | 63 ++++++++++++++++++++++++++++++++++++++++++
 config.h.cmake         |  1 +
 coreapi/CMakeLists.txt |  6 ++++
 gtk/CMakeLists.txt     |  7 +++++
 6 files changed, 92 insertions(+), 3 deletions(-)
 create mode 100644 cmake/FindSoup.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f1664f68d..89333bde4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -101,6 +101,15 @@ if(ENABLE_NOTIFY)
 		set(ENABLE_NOTIFY OFF CACHE BOOL "Enable libnotify support." FORCE)
 	endif()
 endif()
+if(ENABLE_ASSISTANT)
+	find_package(Soup)
+	if(SOUP_FOUND)
+		set(BUILD_WIZARD 1)
+	else()
+		message(WARNING "Could not find the soup library!")
+		set(ENABLE_ASSISTANT OFF CACHE BOOL "Turn on assistant compiling." FORCE)
+	endif()
+endif()
 find_package(Gettext)
 
 
@@ -120,6 +129,9 @@ endif()
 if(ENABLE_TUNNEL)
 	include_directories(${TUNNEL_INCLUDE_DIRS})
 endif()
+if(ENABLE_ASSISTANT)
+	include_directories(${SOUP_INCLUDE_DIRS})
+endif()
 
 if(MSVC)
 	include_directories(${CMAKE_PREFIX_PATH}/include/MSVC)
diff --git a/cmake/FindNotify.cmake b/cmake/FindNotify.cmake
index 26bd5bac1..f77e0885f 100644
--- a/cmake/FindNotify.cmake
+++ b/cmake/FindNotify.cmake
@@ -22,9 +22,9 @@
 #
 # - Find the notify include file and library
 #
-#  NOTIFY_FOUND - system has linphone
-#  NOTIFY_INCLUDE_DIRS - the linphone include directory
-#  NOTIFY_LIBRARIES - The libraries needed to use linphone
+#  NOTIFY_FOUND - system has libnotify
+#  NOTIFY_INCLUDE_DIRS - the libnotify include directory
+#  NOTIFY_LIBRARIES - The libraries needed to use libnotify
 
 set(_NOTIFY_ROOT_PATHS
 	${WITH_NOTIFY}
diff --git a/cmake/FindSoup.cmake b/cmake/FindSoup.cmake
new file mode 100644
index 000000000..82735a317
--- /dev/null
+++ b/cmake/FindSoup.cmake
@@ -0,0 +1,63 @@
+############################################################################
+# FindSoup.cmake
+# Copyright (C) 2014  Belledonne Communications, Grenoble France
+#
+############################################################################
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# 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.
+#
+############################################################################
+#
+# - Find the soup include file and library
+#
+#  SOUP_FOUND - system has libsoup
+#  SOUP_INCLUDE_DIRS - the libsoup include directory
+#  SOUP_LIBRARIES - The libraries needed to use libsoup
+
+find_package(GTK2 2.18 REQUIRED gtk)
+
+set(_SOUP_ROOT_PATHS
+	${WITH_SOUP}
+	${CMAKE_INSTALL_PREFIX}
+)
+
+find_path(SOUP_INCLUDE_DIRS
+	NAMES libsoup/soup.h
+	HINTS _SOUP_ROOT_PATHS
+	PATH_SUFFIXES include/libsoup-2.4
+)
+
+if(SOUP_INCLUDE_DIRS)
+	set(HAVE_LIBSOUP_SOUP_H 1)
+	list(APPEND SOUP_INCLUDE_DIRS ${GTK2_INCLUDE_DIRS})
+endif()
+
+find_library(SOUP_LIBRARIES
+	NAMES soup-2.4
+	HINTS ${_SOUP_ROOT_PATHS}
+	PATH_SUFFIXES bin lib
+)
+
+if(SOUP_LIBRARIES)
+	list(APPEND SOUP_LIBRARIES ${GTK2_LIBRARIES})
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Soup
+	DEFAULT_MSG
+	SOUP_INCLUDE_DIRS SOUP_LIBRARIES HAVE_LIBSOUP_SOUP_H
+)
+
+mark_as_advanced(SOUP_INCLUDE_DIRS SOUP_LIBRARIES HAVE_LIBSOUP_SOUP_H)
diff --git a/config.h.cmake b/config.h.cmake
index 9690bff27..0d442cb36 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -36,6 +36,7 @@
 #define PACKAGE_DATA_DIR "${PACKAGE_DATA_DIR}"
 #define PACKAGE_SOUND_DIR "${PACKAGE_SOUND_DIR}"
 
+#cmakedefine BUILD_WIZARD
 #cmakedefine HAVE_NOTIFY4
 #cmakedefine HAVE_CU_GET_SUITE 1
 #cmakedefine HAVE_CU_CURSES 1
\ No newline at end of file
diff --git a/coreapi/CMakeLists.txt b/coreapi/CMakeLists.txt
index 1a4f48665..541e0d670 100644
--- a/coreapi/CMakeLists.txt
+++ b/coreapi/CMakeLists.txt
@@ -97,6 +97,9 @@ if(ENABLE_TUNNEL)
 else()
 	list(APPEND SOURCE_FILES linphone_tunnel_stubs.c)
 endif()
+if(ENABLE_ASSISTANT)
+	list(APPEND SOURCE_FILES sipwizard.c)
+endif()
 
 set(GENERATED_SOURCE_FILES
 	${CMAKE_CURRENT_BINARY_DIR}/liblinphone_gitversion.h
@@ -124,6 +127,9 @@ endif()
 if(ENABLE_TUNNEL)
 	list(APPEND LIBS ${TUNNEL_LIBRARIES})
 endif()
+if(ENABLE_ASSISTANT)
+	list(APPEND LIBS ${SOUP_LIBRARIES})
+endif()
 if(WIN32)
 	list(APPEND LIBS shlwapi)
 endif()
diff --git a/gtk/CMakeLists.txt b/gtk/CMakeLists.txt
index 89d5805a6..7af375971 100644
--- a/gtk/CMakeLists.txt
+++ b/gtk/CMakeLists.txt
@@ -65,6 +65,10 @@ set(SOURCE_FILES
 	videowindow.c
 )
 
+if(ENABLE_ASSISTANT)
+	list(APPEND SOURCE_FILES setupwizard.c)
+endif()
+
 if(GETTEXT_FOUND)
 	add_definitions("-DENABLE_NLS")
 endif()
@@ -77,6 +81,9 @@ if(ENABLE_NOTIFY)
 	target_include_directories(linphone-gtk PUBLIC ${NOTIFY_INCLUDE_DIRS})
 	target_link_libraries(linphone-gtk ${NOTIFY_LIBRARIES})
 endif()
+if(ENABLE_ASSISTANT)
+	target_link_libraries(linphone-gtk ${SOUP_LIBRARIES})
+endif()
 
 install(TARGETS linphone-gtk
 	RUNTIME DESTINATION bin

From 36d535354feaabbdbe46726f7467a8adfde14559 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Fri, 2 Jan 2015 17:43:01 +0100
Subject: [PATCH 223/496] Add initialization of mediastreamer plugins in the
 Python module.

---
 .../apixml2python/handwritten_definitions.mustache       | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tools/python/apixml2python/handwritten_definitions.mustache b/tools/python/apixml2python/handwritten_definitions.mustache
index cf1b9b1d8..d3bd0cbdb 100644
--- a/tools/python/apixml2python/handwritten_definitions.mustache
+++ b/tools/python/apixml2python/handwritten_definitions.mustache
@@ -247,6 +247,13 @@ static PyObject * pylinphone_Core_get_video_devices(PyObject *self, void *closur
 	return _list;
 }
 
+static void pylinphone_init_ms2_plugins(void) {
+	ms_init(); // Initialize mediastreamer2 before loading the plugins
+#ifdef ENABLE_OPENH264
+	libmsopenh264_init();
+#endif
+}
+
 static PyObject * pylinphone_Core_class_method_new(PyObject *cls, PyObject *args) {
 	LinphoneCore * cresult;
 	pylinphone_CoreObject *self;
@@ -275,6 +282,7 @@ static PyObject * pylinphone_Core_class_method_new(PyObject *cls, PyObject *args
 {{/core_events}}
 
 	pylinphone_trace(1, "[PYLINPHONE] >>> %s(%p, \"%s\", \"%s\")", __FUNCTION__, _vtable_dict, _config_path, _factory_config_path);
+	pylinphone_init_ms2_plugins();
 	cresult = linphone_core_new(&_vtable, _config_path, _factory_config_path, self);
 	self->native_ptr = cresult;
 
@@ -317,6 +325,7 @@ static PyObject * pylinphone_Core_class_method_new_with_config(PyObject *cls, Py
 {{/core_events}}
 
 	pylinphone_trace(1, "[PYLINPHONE] >>> %s(%p [%p])", __FUNCTION__, _config, _config_native_ptr);
+	pylinphone_init_ms2_plugins();
 	cresult = linphone_core_new_with_config(&_vtable, _config_native_ptr, self);
 	self->native_ptr = cresult;
 

From 75bfeeba882afcac510c43ecca88fb9aa8f115fb Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Mon, 5 Jan 2015 09:48:53 +0100
Subject: [PATCH 224/496] Handle handwritten dealloc methods in Python module.

---
 tools/python/apixml2python.py                 |  5 ++-
 .../handwritten_declarations.mustache         |  1 +
 .../handwritten_definitions.mustache          | 18 +++++++++
 tools/python/apixml2python/linphone.py        | 37 +++++++++++++------
 .../apixml2python/linphone_module.mustache    |  4 +-
 5 files changed, 48 insertions(+), 17 deletions(-)

diff --git a/tools/python/apixml2python.py b/tools/python/apixml2python.py
index 2e976abe9..da91429b5 100755
--- a/tools/python/apixml2python.py
+++ b/tools/python/apixml2python.py
@@ -23,7 +23,7 @@ import sys
 import xml.etree.ElementTree as ET
 
 sys.path.append(os.path.realpath(__file__))
-from apixml2python.linphone import LinphoneModule, HandWrittenClassMethod, HandWrittenInstanceMethod, HandWrittenProperty
+from apixml2python.linphone import LinphoneModule, HandWrittenClassMethod, HandWrittenInstanceMethod, HandWrittenDeallocMethod, HandWrittenProperty
 
 
 blacklisted_classes = [
@@ -79,7 +79,8 @@ hand_written_functions = [
 	HandWrittenProperty('Core', 'sound_devices', 'linphone_core_get_sound_devices', None, "[list of string] Get the available sound devices."),
 	HandWrittenProperty('Core', 'video_devices', 'linphone_core_get_video_devices', None, "[list of string] Get the available video capture devices."),
 	HandWrittenClassMethod('Core', 'new', 'linphone_core_new', "Instantiate a LinphoneCore object.\n\n:param vtable: The callbacks.\n:type vtable: dictionary\n:param configPath: A path to a config file. If it does not exists it will be created. The config file is used to store all settings, call logs, friends, proxies... so that all these settings become persistent over the life of the LinphoneCore object. It is allowed to set to None. In that case LinphoneCore will not store any settings.\n:type configPath: string\n:param factoryConfigPath: A path to a read-only config file that can be used to store hard-coded preference such as proxy settings or internal preferences. The settings in this factory file always override the one in the normal config file. It is OPTIONAL, use None if unneeded.\n:type factoryConfigPath: string\n:rtype: linphone.Core"),
-	HandWrittenClassMethod('Core', 'new_with_config', 'linphone_core_new_with_config', "Instantiate a LinphoneCore object from a LpConfig.\n\n:param vtable: The callbacks.\n:type vtable: dictionary\n:param config: A LpConfig object holding the configuration of the LinphoneCore to be instantiated.\n:rtype: linphone.Core")
+	HandWrittenClassMethod('Core', 'new_with_config', 'linphone_core_new_with_config', "Instantiate a LinphoneCore object from a LpConfig.\n\n:param vtable: The callbacks.\n:type vtable: dictionary\n:param config: A LpConfig object holding the configuration of the LinphoneCore to be instantiated.\n:rtype: linphone.Core"),
+	HandWrittenDeallocMethod('Core', 'linphone_core_destroy')
 ]
 
 def generate(apixmlfile, outputfile):
diff --git a/tools/python/apixml2python/handwritten_declarations.mustache b/tools/python/apixml2python/handwritten_declarations.mustache
index 3fcb43c2b..4a4b2c1ef 100644
--- a/tools/python/apixml2python/handwritten_declarations.mustache
+++ b/tools/python/apixml2python/handwritten_declarations.mustache
@@ -1,5 +1,6 @@
 static PyObject * pylinphone_Core_get_sip_transports(PyObject *self, void *closure);
 static int pylinphone_Core_set_sip_transports(PyObject *self, PyObject *value, void *closure);
+static void pylinphone_Core_dealloc(PyObject *self);
 static PyObject * pylinphone_Core_get_sip_transports_used(PyObject *self, void *closure);
 static PyObject * pylinphone_Core_get_sound_devices(PyObject *self, void *closure);
 static PyObject * pylinphone_Core_get_video_devices(PyObject *self, void *closure);
diff --git a/tools/python/apixml2python/handwritten_definitions.mustache b/tools/python/apixml2python/handwritten_definitions.mustache
index d3bd0cbdb..13e27d873 100644
--- a/tools/python/apixml2python/handwritten_definitions.mustache
+++ b/tools/python/apixml2python/handwritten_definitions.mustache
@@ -336,6 +336,24 @@ static PyObject * pylinphone_Core_class_method_new_with_config(PyObject *cls, Py
 	return pyret;
 }
 
+static void pylinphone_Core_dealloc(PyObject *self) {
+	LinphoneCore * native_ptr = pylinphone_Core_get_native_ptr(self);
+	if (Py_REFCNT(self) < 0) return;
+	pylinphone_trace(1, "[PYLINPHONE] >>> %s(%p [%p])", __FUNCTION__, self, native_ptr);
+	
+	if (native_ptr != NULL) {
+		linphone_core_destroy(native_ptr);
+		ms_exit();	// De-initialize mediastreamer
+	}
+
+	pylinphone_dispatch_messages();
+	Py_XDECREF(((pylinphone_CoreObject *)self)->user_data);
+	Py_XDECREF(((pylinphone_CoreObject *)self)->vtable_dict);
+
+	self->ob_type->tp_free(self);
+	pylinphone_trace(-1, "[PYLINPHONE] <<< %s", __FUNCTION__);
+}
+
 
 
 static void pylinphone_VideoSize_dealloc(PyObject *self) {
diff --git a/tools/python/apixml2python/linphone.py b/tools/python/apixml2python/linphone.py
index a4f6f8a2d..16d726850 100644
--- a/tools/python/apixml2python/linphone.py
+++ b/tools/python/apixml2python/linphone.py
@@ -69,6 +69,10 @@ class HandWrittenClassMethod(HandWrittenCode):
 	def __init__(self, _class, name, cfunction, doc = ''):
 		HandWrittenCode.__init__(self, _class, name, [cfunction], doc)
 
+class HandWrittenDeallocMethod(HandWrittenCode):
+	def __init__(self, _class, cfunction):
+		HandWrittenCode.__init__(self, _class, 'dealloc', [cfunction], '')
+
 class HandWrittenProperty(HandWrittenCode):
 	def __init__(self, _class, name, getter_cfunction = None, setter_cfunction = None, doc = ''):
 		func_list = []
@@ -698,6 +702,12 @@ class DeallocMethodDefinition(MethodDefinition):
 	def format_return_result(self):
 		return ''
 
+	def format(self):
+		return \
+"""static void pylinphone_{class_name}_dealloc(PyObject *self) {{
+{method_body}
+}}""".format(class_name=self.class_['class_name'], method_body=MethodDefinition.format(self))
+
 class GetterMethodDefinition(MethodDefinition):
 	def __init__(self, linphone_module, class_, method_node = None):
 		MethodDefinition.__init__(self, linphone_module, class_, method_node)
@@ -1069,6 +1079,8 @@ class LinphoneModule(object):
 						m['method_name'] = hand_written_code.name
 						m['method_doc'] = self.__replace_doc_special_chars(hand_written_code.doc)
 						c['class_instance_hand_written_methods'].append(m)
+					elif isinstance(hand_written_code, HandWrittenDeallocMethod):
+						c['class_has_hand_written_dealloc'] = True
 					elif isinstance(hand_written_code, HandWrittenProperty):
 						p = {}
 						p['property_name'] = hand_written_code.name
@@ -1199,18 +1211,19 @@ class LinphoneModule(object):
 			except Exception, e:
 				e.args += (c['class_name'], p['property_name'])
 				raise
-			try:
-				if c['class_refcountable']:
-					xml_instance_method = c['class_xml_node'].find("./instancemethods/instancemethod[@name='" + c['class_c_function_prefix'] + "unref']")
-					c['dealloc_body'] = DeallocMethodDefinition(self, c, xml_instance_method).format()
-				elif c['class_destroyable']:
-					xml_instance_method = c['class_xml_node'].find("./instancemethods/instancemethod[@name='" + c['class_c_function_prefix'] + "destroy']")
-					c['dealloc_body'] = DeallocMethodDefinition(self, c, xml_instance_method).format()
-				else:
-					c['dealloc_body'] = DeallocMethodDefinition(self, c).format()
-			except Exception, e:
-				e.args += (c['class_name'], 'dealloc_body')
-				raise
+			if not 'class_has_hand_written_dealloc' in c:
+				try:
+					if c['class_refcountable']:
+						xml_instance_method = c['class_xml_node'].find("./instancemethods/instancemethod[@name='" + c['class_c_function_prefix'] + "unref']")
+						c['dealloc_definition'] = DeallocMethodDefinition(self, c, xml_instance_method).format()
+					elif c['class_destroyable']:
+						xml_instance_method = c['class_xml_node'].find("./instancemethods/instancemethod[@name='" + c['class_c_function_prefix'] + "destroy']")
+						c['dealloc_definition'] = DeallocMethodDefinition(self, c, xml_instance_method).format()
+					else:
+						c['dealloc_definition'] = DeallocMethodDefinition(self, c).format()
+				except Exception, e:
+					e.args += (c['class_name'], 'dealloc_body')
+					raise
 		# Convert mslist_types to a list of dictionaries for the template
 		d = []
 		for mslist_type in self.mslist_types:
diff --git a/tools/python/apixml2python/linphone_module.mustache b/tools/python/apixml2python/linphone_module.mustache
index 000b16a8a..403a2491a 100644
--- a/tools/python/apixml2python/linphone_module.mustache
+++ b/tools/python/apixml2python/linphone_module.mustache
@@ -125,9 +125,7 @@ static int pylinphone_{{class_name}}_init(PyObject *self, PyObject *args, PyObje
 {{{init_body}}}
 }
 
-static void pylinphone_{{class_name}}_dealloc(PyObject *self) {
-{{{dealloc_body}}}
-}
+{{{dealloc_definition}}}
 
 {{#class_type_methods}}
 

From 88e2ba76250825c36b61a16621308440aecc6abc Mon Sep 17 00:00:00 2001
From: Johan Pascal <johan.pascal@belledonne-communications.com>
Date: Mon, 5 Jan 2015 15:02:52 +0100
Subject: [PATCH 225/496] move srtp from ortp to mediastreamer2

---
 coreapi/linphonecall.c | 14 +++++++-------
 coreapi/linphonecore.c |  4 ++--
 mediastreamer2         |  2 +-
 oRTP                   |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index 28fd77526..e182d625c 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -745,7 +745,7 @@ void linphone_call_set_compatible_incoming_call_parameters(LinphoneCall *call, c
 			call->params->avpf_rr_interval = linphone_core_get_avpf_rr_interval(call->core)*1000;
 		}
 	}
-	if ((sal_media_description_has_srtp(md) == TRUE) && (media_stream_srtp_supported() == TRUE)) {
+	if ((sal_media_description_has_srtp(md) == TRUE) && (ms_srtp_supported() == TRUE)) {
 		call->params->media_encryption = LinphoneMediaEncryptionSRTP;
 	}
 }
@@ -2033,8 +2033,8 @@ static void linphone_call_start_audio_stream(LinphoneCall *call, const char *cna
 				crypto_idx = find_crypto_index_from_tag(local_st_desc->crypto, stream->crypto_local_tag);
 
 				if (crypto_idx >= 0) {
-					media_stream_set_srtp_recv_key(&call->audiostream->ms,stream->crypto[0].algo,stream->crypto[0].master_key, TRUE);
-					media_stream_set_srtp_send_key(&call->audiostream->ms,stream->crypto[0].algo,local_st_desc->crypto[crypto_idx].master_key, TRUE);
+					media_stream_set_srtp_recv_key_b64(&call->audiostream->ms,stream->crypto[0].algo,stream->crypto[0].master_key);
+					media_stream_set_srtp_send_key_b64(&call->audiostream->ms,stream->crypto[0].algo,local_st_desc->crypto[crypto_idx].master_key);
 				} else {
 					ms_warning("Failed to find local crypto algo with tag: %d", stream->crypto_local_tag);
 				}
@@ -2155,8 +2155,8 @@ static void linphone_call_start_video_stream(LinphoneCall *call, const char *cna
 				if (sal_stream_description_has_srtp(vstream) == TRUE) {
 					int crypto_idx = find_crypto_index_from_tag(local_st_desc->crypto, vstream->crypto_local_tag);
 					if (crypto_idx >= 0) {
-						media_stream_set_srtp_recv_key(&call->videostream->ms,vstream->crypto[0].algo,vstream->crypto[0].master_key, TRUE);
-						media_stream_set_srtp_send_key(&call->videostream->ms,vstream->crypto[0].algo,local_st_desc->crypto[crypto_idx].master_key, TRUE);
+						media_stream_set_srtp_recv_key_b64(&call->videostream->ms,vstream->crypto[0].algo,vstream->crypto[0].master_key);
+						media_stream_set_srtp_send_key_b64(&call->videostream->ms,vstream->crypto[0].algo,local_st_desc->crypto[crypto_idx].master_key);
 					}
 				}
 				configure_rtp_session_for_rtcp_xr(lc, call, SalVideo);
@@ -2276,9 +2276,9 @@ static bool_t update_stream_crypto_params(LinphoneCall *call, const SalStreamDes
 	int crypto_idx = find_crypto_index_from_tag(local_st_desc->crypto, new_stream->crypto_local_tag);
 	if (crypto_idx >= 0) {
 		if (call->localdesc_changed & SAL_MEDIA_DESCRIPTION_CRYPTO_KEYS_CHANGED)
-			media_stream_set_srtp_send_key(ms,new_stream->crypto[0].algo,local_st_desc->crypto[crypto_idx].master_key, TRUE);
+			media_stream_set_srtp_send_key_b64(ms,new_stream->crypto[0].algo,local_st_desc->crypto[crypto_idx].master_key);
 		if (strcmp(old_stream->crypto[0].master_key,new_stream->crypto[0].master_key)!=0){
-			media_stream_set_srtp_recv_key(ms,new_stream->crypto[0].algo,new_stream->crypto[0].master_key,TRUE);
+			media_stream_set_srtp_recv_key_b64(ms,new_stream->crypto[0].algo,new_stream->crypto[0].master_key);
 		}
 		return TRUE;
 	} else {
diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index a90b25162..d74631359 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -6825,7 +6825,7 @@ const char *linphone_media_encryption_to_string(LinphoneMediaEncryption menc){
 bool_t linphone_core_media_encryption_supported(const LinphoneCore *lc, LinphoneMediaEncryption menc){
 	switch(menc){
 		case LinphoneMediaEncryptionSRTP:
-			return media_stream_srtp_supported();
+			return ms_srtp_supported();
 		case LinphoneMediaEncryptionZRTP:
 			return ms_zrtp_available();
 		case LinphoneMediaEncryptionNone:
@@ -6838,7 +6838,7 @@ int linphone_core_set_media_encryption(LinphoneCore *lc, LinphoneMediaEncryption
 	const char *type="none";
 	int ret=0;
 	if (menc == LinphoneMediaEncryptionSRTP){
-		if (!media_stream_srtp_supported()){
+		if (!ms_srtp_supported()){
 			ms_warning("SRTP not supported by library.");
 			type="none";
 			ret=-1;
diff --git a/mediastreamer2 b/mediastreamer2
index f07213216..221583f6a 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit f07213216893c60359601801b867cd678e916de1
+Subproject commit 221583f6a3804940fb16a198d77dea82584840f4
diff --git a/oRTP b/oRTP
index fbe5a32a9..5e37fa55f 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit fbe5a32a9a90b0224a6d598c1e060a89f5bd4aba
+Subproject commit 5e37fa55f1f15f5896d69156e64cdc95a1ff68bf

From 4e5e409dc27546cb72406f49e852afd02d4cdc6c Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 5 Jan 2015 15:10:17 +0100
Subject: [PATCH 226/496] Started to bind log collection methods in JNI layer

---
 .../core/tutorials/TutorialBuddyStatus.java   | 14 ++++
 .../core/tutorials/TutorialChatRoom.java      | 14 ++++
 .../core/tutorials/TutorialHelloWorld.java    | 14 ++++
 .../core/tutorials/TutorialRegistration.java  | 13 +++-
 coreapi/linphonecore_jni.cc                   | 69 +++++++++++++++++++
 .../org/linphone/core/LinphoneCore.java       | 49 ++++++++++++-
 .../linphone/core/LinphoneCoreListener.java   | 22 ++++--
 .../core/LinphoneCoreFactoryImpl.java         |  1 -
 .../org/linphone/core/LinphoneCoreImpl.java   | 20 +++++-
 9 files changed, 207 insertions(+), 9 deletions(-)

diff --git a/coreapi/help/java/org/linphone/core/tutorials/TutorialBuddyStatus.java b/coreapi/help/java/org/linphone/core/tutorials/TutorialBuddyStatus.java
index a1db1a25d..ef5dd2fd1 100644
--- a/coreapi/help/java/org/linphone/core/tutorials/TutorialBuddyStatus.java
+++ b/coreapi/help/java/org/linphone/core/tutorials/TutorialBuddyStatus.java
@@ -30,6 +30,7 @@ import org.linphone.core.LinphoneContent;
 import org.linphone.core.LinphoneCore;
 import org.linphone.core.LinphoneCore.EcCalibratorStatus;
 import org.linphone.core.LinphoneCore.GlobalState;
+import org.linphone.core.LinphoneCore.LogCollectionUploadState;
 import org.linphone.core.LinphoneCore.RegistrationState;
 import org.linphone.core.LinphoneCore.RemoteProvisioningState;
 import org.linphone.core.LinphoneCoreException;
@@ -322,4 +323,17 @@ public class TutorialBuddyStatus implements LinphoneListener {
 		// TODO Auto-generated method stub
 		return 0;
 	}
+
+	@Override
+	public void uploadProgressIndication(LinphoneCore lc, int offset, int total) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void uploadStateChanged(LinphoneCore lc,
+			LogCollectionUploadState state, String info) {
+		// TODO Auto-generated method stub
+		
+	}
 }
diff --git a/coreapi/help/java/org/linphone/core/tutorials/TutorialChatRoom.java b/coreapi/help/java/org/linphone/core/tutorials/TutorialChatRoom.java
index eff31682d..046c23ada 100644
--- a/coreapi/help/java/org/linphone/core/tutorials/TutorialChatRoom.java
+++ b/coreapi/help/java/org/linphone/core/tutorials/TutorialChatRoom.java
@@ -30,6 +30,7 @@ import org.linphone.core.LinphoneContent;
 import org.linphone.core.LinphoneCore;
 import org.linphone.core.LinphoneCore.EcCalibratorStatus;
 import org.linphone.core.LinphoneCore.GlobalState;
+import org.linphone.core.LinphoneCore.LogCollectionUploadState;
 import org.linphone.core.LinphoneCore.RegistrationState;
 import org.linphone.core.LinphoneCore.RemoteProvisioningState;
 import org.linphone.core.LinphoneCoreException;
@@ -241,5 +242,18 @@ public class TutorialChatRoom implements LinphoneListener, LinphoneChatMessage.S
 		return 0;
 	}
 
+	@Override
+	public void uploadProgressIndication(LinphoneCore lc, int offset, int total) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void uploadStateChanged(LinphoneCore lc,
+			LogCollectionUploadState state, String info) {
+		// TODO Auto-generated method stub
+		
+	}
+
 
 }
diff --git a/coreapi/help/java/org/linphone/core/tutorials/TutorialHelloWorld.java b/coreapi/help/java/org/linphone/core/tutorials/TutorialHelloWorld.java
index 8806b8da1..2e2e50b0b 100644
--- a/coreapi/help/java/org/linphone/core/tutorials/TutorialHelloWorld.java
+++ b/coreapi/help/java/org/linphone/core/tutorials/TutorialHelloWorld.java
@@ -30,6 +30,7 @@ import org.linphone.core.LinphoneContent;
 import org.linphone.core.LinphoneCore;
 import org.linphone.core.LinphoneCore.EcCalibratorStatus;
 import org.linphone.core.LinphoneCore.GlobalState;
+import org.linphone.core.LinphoneCore.LogCollectionUploadState;
 import org.linphone.core.LinphoneCore.RegistrationState;
 import org.linphone.core.LinphoneCore.RemoteProvisioningState;
 import org.linphone.core.LinphoneCoreException;
@@ -243,5 +244,18 @@ public class TutorialHelloWorld implements LinphoneListener {
 		return 0;
 	}
 
+	@Override
+	public void uploadProgressIndication(LinphoneCore lc, int offset, int total) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void uploadStateChanged(LinphoneCore lc,
+			LogCollectionUploadState state, String info) {
+		// TODO Auto-generated method stub
+		
+	}
+
 
 }
diff --git a/coreapi/help/java/org/linphone/core/tutorials/TutorialRegistration.java b/coreapi/help/java/org/linphone/core/tutorials/TutorialRegistration.java
index afc2fe16c..ce985d288 100644
--- a/coreapi/help/java/org/linphone/core/tutorials/TutorialRegistration.java
+++ b/coreapi/help/java/org/linphone/core/tutorials/TutorialRegistration.java
@@ -30,6 +30,7 @@ import org.linphone.core.LinphoneContent;
 import org.linphone.core.LinphoneCore;
 import org.linphone.core.LinphoneCore.EcCalibratorStatus;
 import org.linphone.core.LinphoneCore.GlobalState;
+import org.linphone.core.LinphoneCore.LogCollectionUploadState;
 import org.linphone.core.LinphoneCore.RegistrationState;
 import org.linphone.core.LinphoneCore.RemoteProvisioningState;
 import org.linphone.core.LinphoneCoreException;
@@ -274,6 +275,16 @@ public class TutorialRegistration implements LinphoneListener {
 		return 0;
 	}
 
+	@Override
+	public void uploadProgressIndication(LinphoneCore lc, int offset, int total) {
+		// TODO Auto-generated method stub
+		
+	}
 
-
+	@Override
+	public void uploadStateChanged(LinphoneCore lc,
+			LogCollectionUploadState state, String info) {
+		// TODO Auto-generated method stub
+		
+	}
 }
diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index eb026bf6d..34cdd17ba 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -420,6 +420,19 @@ public:
 		if (fileTransferRecvId) {
 			vTable->file_transfer_recv = fileTransferRecv;
 		}
+		
+		logCollectionUploadStateClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneCore$LogCollectionUploadState"));
+		logCollectionUploadStateFromIntId = env->GetStaticMethodID(logCollectionUploadStateClass, "fromInt", "(I)Lorg/linphone/core/LinphoneCore$LogCollectionUploadState;");
+		logCollectionUploadProgressId = env->GetMethodID(listenerClass, "uploadProgressIndication", "(Lorg/linphone/core/LinphoneCore;I;I)V");
+		env->ExceptionClear();
+		if (logCollectionUploadProgressId) {
+			vTable->log_collection_upload_progress_indication = logCollectionUploadProgressIndication;
+		}
+		logCollectionUploadStateId = env->GetMethodID(listenerClass, "uploadStateChanged", "(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneCore$LogCollectionUploadState;Ljava/lang/String;)V");
+		env->ExceptionClear();
+		if (logCollectionUploadStateId) {
+			vTable->log_collection_upload_state_changed = logCollectionUploadStateChange;
+		}
 
 		chatMessageStateClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneChatMessage$State"));
 		chatMessageStateFromIntId = env->GetStaticMethodID(chatMessageStateClass,"fromInt","(I)Lorg/linphone/core/LinphoneChatMessage$State;");
@@ -479,6 +492,7 @@ public:
 		env->DeleteGlobalRef(linphoneEventClass);
 		env->DeleteGlobalRef(subscriptionStateClass);
 		env->DeleteGlobalRef(subscriptionDirClass);
+		env->DeleteGlobalRef(logCollectionUploadStateClass);
 	}
 	jobject core;
 	jobject listener;
@@ -566,6 +580,11 @@ public:
 	jmethodID fileTransferSendId;
 	jmethodID fileTransferRecvId;
 
+	jclass logCollectionUploadStateClass;
+	jmethodID logCollectionUploadStateId;
+	jmethodID logCollectionUploadStateFromIntId;
+	jmethodID logCollectionUploadProgressId;
+
 	LinphoneCoreVTable vTable;
 
 	static void displayStatusCb(LinphoneCore *lc, const char *message) {
@@ -1001,6 +1020,40 @@ public:
 				jbytes,
 				size);
 	}
+	static void logCollectionUploadProgressIndication(LinphoneCore *lc, size_t offset, size_t total) {
+		JNIEnv *env = 0;
+		jint result = jvm->AttachCurrentThread(&env,NULL);
+		if (result != 0) {
+			ms_error("cannot attach VM");
+			return;
+		}
+		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
+		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
+		env->CallVoidMethod(lcData->listener
+							,lcData->logCollectionUploadProgressId
+							,lcData->core
+							,(jlong)offset
+							,(jlong)total);
+	}
+	static void logCollectionUploadStateChange(LinphoneCore *lc, LinphoneCoreLogCollectionUploadState state, const char *info) {
+		JNIEnv *env = 0;
+		jint result = jvm->AttachCurrentThread(&env,NULL);
+		if (result != 0) {
+			ms_error("cannot attach VM");
+			return;
+		}
+		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
+		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
+		jstring msg = info ? env->NewStringUTF(info) : NULL;
+		env->CallVoidMethod(lcData->listener
+							,lcData->logCollectionUploadStateId
+							,lcData->core
+							,env->CallStaticObjectMethod(lcData->logCollectionUploadStateClass,lcData->logCollectionUploadStateFromIntId,(jint)state),
+							msg);
+		if (msg) {
+			env->DeleteLocalRef(msg);
+		}
+	}
 };
 
 extern "C" jlong Java_org_linphone_core_LinphoneCoreImpl_newLinphoneCore(JNIEnv*  env
@@ -1082,6 +1135,22 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_removeListener(JNIEnv* e
 	env->DeleteGlobalRef(listener);
 }
 
+
+extern "C" void Java_org_linphone_core_LinphoneCoreImpl_uploadLogCollection(JNIEnv* env, jobject thiz, jlong lc) {
+	LinphoneCore *core = (LinphoneCore*)lc;
+	linphone_core_upload_log_collection(core);
+}
+
+extern "C" void Java_org_linphone_core_LinphoneCoreImpl_enableLogCollection(JNIEnv* env, jclass cls, jboolean enable) {
+	linphone_core_enable_log_collection(enable ? LinphoneLogCollectionEnabledWithoutPreviousLogHandler : LinphoneLogCollectionDisabled);
+}
+
+extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setLogCollectionPath(JNIEnv* env, jclass cls, jstring jpath) {
+	const char* path = env->GetStringUTFChars(jpath, NULL);
+	linphone_core_set_log_collection_path(path);
+	env->ReleaseStringUTFChars(jpath, path);
+}
+
 extern "C" jint Java_org_linphone_core_LinphoneCoreImpl_migrateToMultiTransport(JNIEnv*  env
 		,jobject  thiz
 		,jlong lc) {
diff --git a/java/common/org/linphone/core/LinphoneCore.java b/java/common/org/linphone/core/LinphoneCore.java
index 4b8f42a1b..c9de0e2e4 100644
--- a/java/common/org/linphone/core/LinphoneCore.java
+++ b/java/common/org/linphone/core/LinphoneCore.java
@@ -430,6 +430,45 @@ public interface LinphoneCore {
 			return mStringValue;
 		}
 	}
+	/**
+	 * linphone log collection upload states
+	 */
+	static public class LogCollectionUploadState {
+
+		static private Vector<LogCollectionUploadState> values = new Vector<LogCollectionUploadState>();
+		/**
+		 * Delivery in progress
+		 */
+		static public LogCollectionUploadState LogCollectionUploadStateInProgress = new LogCollectionUploadState(0,"LinphoneCoreLogCollectionUploadStateInProgress");
+		/**
+		 * Log collection upload successfully delivered and acknowledged by remote end point
+		 */
+		static public LogCollectionUploadState LogCollectionUploadStateDelivered = new LogCollectionUploadState(1,"LinphoneCoreLogCollectionUploadStateDelivered");
+		/**
+		 * Log collection upload was not delivered
+		 */
+		static public LogCollectionUploadState LogCollectionUploadStateNotDelivered = new LogCollectionUploadState(2,"LinphoneCoreLogCollectionUploadStateNotDelivered");
+
+		private final int mValue;
+		private final String mStringValue;
+
+		private LogCollectionUploadState(int value, String stringValue) {
+			mValue = value;
+			values.addElement(this);
+			mStringValue=stringValue;
+		}
+		public static LogCollectionUploadState fromInt(int value) {
+
+			for (int i=0; i<values.size();i++) {
+				LogCollectionUploadState state = (LogCollectionUploadState) values.elementAt(i);
+				if (state.mValue == value) return state;
+			}
+			throw new RuntimeException("state not found ["+value+"]");
+		}
+		public String toString() {
+			return mStringValue;
+		}
+	}
 
 	/**
 	 * Set the context of creation of the LinphoneCore.
@@ -1808,9 +1847,17 @@ public interface LinphoneCore {
 	public void setRemoteRingbackTone(String file);
 
 	/**
-	 * Return the ringback tone file used when doing early media. It may be null.
+	 * Return the ringback tone file used when doing early media. It may be
+
+	jclass logCollectionUploadStateClass;
+	jmethodID logCollectionUploadStateId;
+	jmethodID logCollectionUploadStateFromIntId; null.
 	 * @return the ringback tone file path.
 	 */
 	String getRemoteRingbackTone();
 	
+	/**
+	 * Upload the log collection to the configured server url.
+	 */
+	public void uploadLogCollection();
 }
diff --git a/java/common/org/linphone/core/LinphoneCoreListener.java b/java/common/org/linphone/core/LinphoneCoreListener.java
index 4be9ff799..42a59a4a7 100644
--- a/java/common/org/linphone/core/LinphoneCoreListener.java
+++ b/java/common/org/linphone/core/LinphoneCoreListener.java
@@ -20,7 +20,6 @@ package org.linphone.core;
 
 import java.nio.ByteBuffer;
 
-import org.linphone.core.LinphoneCore.RemoteProvisioningState;
 
 /**
  * 
@@ -31,7 +30,7 @@ public interface LinphoneCoreListener {
 	public interface LinphoneListener extends LinphoneCoreListener, 
 			LinphoneRemoteProvisioningListener, LinphoneMessageListener, LinphoneCallStateListener, 
 			LinphoneCallEncryptionStateListener, LinphoneNotifyListener, LinphoneComposingListener,
-			LinphoneGlobalStateListener, LinphoneRegistrationStateListener {
+			LinphoneGlobalStateListener, LinphoneRegistrationStateListener, LinphoneLogCollectionUploadListener {
 		/**< Ask the application some authentication information 
 		 * @return */
 		void authInfoRequested(LinphoneCore lc, String realm, String username, String Domain); 
@@ -185,7 +184,7 @@ public interface LinphoneCoreListener {
 		 * @param state the RemoteProvisioningState
 		 * @param message the error message if state == Failed
 		 */
-		void configuringStatus(LinphoneCore lc, RemoteProvisioningState state, String message);
+		void configuringStatus(LinphoneCore lc, LinphoneCore.RemoteProvisioningState state, String message);
 	}
 	
 	public interface LinphoneMessageListener extends LinphoneCoreListener {
@@ -243,7 +242,22 @@ public interface LinphoneCoreListener {
 		 * @param delay_ms echo delay
 		 * @param data
 		 */
-		void ecCalibrationStatus(LinphoneCore lc,LinphoneCore.EcCalibratorStatus status, int delay_ms, Object data);
+		void ecCalibrationStatus(LinphoneCore lc, LinphoneCore.EcCalibratorStatus status, int delay_ms, Object data);
+	}
+	
+	public interface LinphoneLogCollectionUploadListener extends LinphoneCoreListener {
+		/**
+		 * Callback prototype for reporting log collection upload progress indication.
+		 */
+		void uploadProgressIndication(LinphoneCore lc, int offset, int total);
+		
+		/**
+		 * Callback prototype for reporting log collection upload state change.
+		 * @param lc LinphoneCore object
+		 * @param state The state of the log collection upload
+		 * @param info Additional information: error message in case of error state, URL of uploaded file in case of success.
+		 */
+		void uploadStateChanged(LinphoneCore lc, LinphoneCore.LogCollectionUploadState state, String info);
 	}
 }
 
diff --git a/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java b/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
index 925bae78d..fb019db3d 100644
--- a/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
+++ b/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
@@ -173,5 +173,4 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
 	public PresenceModel createPresenceModel(PresenceActivityType type, String description, String note, String lang) {
 		return new PresenceModelImpl(type, description, note, lang);
 	}
-
 }
diff --git a/java/impl/org/linphone/core/LinphoneCoreImpl.java b/java/impl/org/linphone/core/LinphoneCoreImpl.java
index 21a356490..cef11598c 100644
--- a/java/impl/org/linphone/core/LinphoneCoreImpl.java
+++ b/java/impl/org/linphone/core/LinphoneCoreImpl.java
@@ -32,8 +32,7 @@ import org.linphone.mediastream.video.capture.hwconf.Hacks;
 import android.content.Context;
 import android.media.AudioManager;
 
-
-class LinphoneCoreImpl implements LinphoneCore {
+public class LinphoneCoreImpl implements LinphoneCore {
 
 	private final  LinphoneCoreListener mListener; //to make sure to keep a reference on this object
 	protected long nativePtr = 0;
@@ -1314,4 +1313,21 @@ class LinphoneCoreImpl implements LinphoneCore {
 	public String getRemoteRingbackTone() {
 		return getRemoteRingbackTone(nativePtr);
 	}
+	
+	private native void uploadLogCollection(long nativePtr);
+	@Override
+	public void uploadLogCollection() {
+		uploadLogCollection(nativePtr);
+	}
+	
+	/**
+	 * Enable the linphone core log collection to upload logs on a server.
+	 */
+	public native static void enableLogCollection(boolean enable);
+
+	/**
+	 * Set the path where the log files will be written for log collection.
+	 * @param path The path where the log files will be written.
+	 */
+	public native static void setLogCollectionPath(String path);
 }

From 468932a57941467f14b80c31e54455848022a21c Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 5 Jan 2015 15:49:25 +0100
Subject: [PATCH 227/496] Fix Android compil

---
 oRTP | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/oRTP b/oRTP
index 5e37fa55f..54179e2e0 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 5e37fa55f1f15f5896d69156e64cdc95a1ff68bf
+Subproject commit 54179e2e08bc6281e954ce3cd2a7c3a06cac8508

From f965333d7133b369f4dc50e999ace69bb4113eaa Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 5 Jan 2015 16:10:33 +0100
Subject: [PATCH 228/496] Fix typos

---
 coreapi/linphonecore_jni.cc                     | 2 +-
 java/common/org/linphone/core/LinphoneCore.java | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index 34cdd17ba..76d68cc60 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -423,7 +423,7 @@ public:
 		
 		logCollectionUploadStateClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneCore$LogCollectionUploadState"));
 		logCollectionUploadStateFromIntId = env->GetStaticMethodID(logCollectionUploadStateClass, "fromInt", "(I)Lorg/linphone/core/LinphoneCore$LogCollectionUploadState;");
-		logCollectionUploadProgressId = env->GetMethodID(listenerClass, "uploadProgressIndication", "(Lorg/linphone/core/LinphoneCore;I;I)V");
+		logCollectionUploadProgressId = env->GetMethodID(listenerClass, "uploadProgressIndication", "(Lorg/linphone/core/LinphoneCore;II)V");
 		env->ExceptionClear();
 		if (logCollectionUploadProgressId) {
 			vTable->log_collection_upload_progress_indication = logCollectionUploadProgressIndication;
diff --git a/java/common/org/linphone/core/LinphoneCore.java b/java/common/org/linphone/core/LinphoneCore.java
index c9de0e2e4..0e5c36d6d 100644
--- a/java/common/org/linphone/core/LinphoneCore.java
+++ b/java/common/org/linphone/core/LinphoneCore.java
@@ -1847,11 +1847,7 @@ public interface LinphoneCore {
 	public void setRemoteRingbackTone(String file);
 
 	/**
-	 * Return the ringback tone file used when doing early media. It may be
-
-	jclass logCollectionUploadStateClass;
-	jmethodID logCollectionUploadStateId;
-	jmethodID logCollectionUploadStateFromIntId; null.
+	 * Return the ringback tone file used when doing early media. It may be null.
 	 * @return the ringback tone file path.
 	 */
 	String getRemoteRingbackTone();

From 0da96496ec0f06d4458621f2404652eac107c4b5 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Mon, 5 Jan 2015 17:46:59 +0100
Subject: [PATCH 229/496] MS2: rework a bit srtp

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 221583f6a..640f2d31e 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 221583f6a3804940fb16a198d77dea82584840f4
+Subproject commit 640f2d31ef3ec80822e99254d62baa0006c09c82

From 849af108df820346c5db89b6a878c3e733d700ba Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Tue, 6 Jan 2015 09:29:22 +0100
Subject: [PATCH 230/496] MS2:fix audio stream tester tester in case srtp is
 disabled

---
 .cproject      | 2 +-
 mediastreamer2 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.cproject b/.cproject
index 0d1eed0ed..5fb15ef62 100644
--- a/.cproject
+++ b/.cproject
@@ -22,7 +22,7 @@
 					<folderInfo id="0.2079208171." name="/" resourcePath="">
 						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.2084203071" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
 							<targetPlatform binaryParser="org.eclipse.cdt.core.MachO64;org.eclipse.cdt.core.ELF" id="org.eclipse.cdt.build.core.prefbase.toolchain.2084203071.81924294" name=""/>
-							<builder arguments="-j4 CFLAGS=&quot;-g -Wall -Werror -Qunused-arguments&quot; CXXFLAGS=&quot;-g&quot;" autoBuildTarget="all" cleanBuildTarget="clean" command="make" enableAutoBuild="false" enableCleanBuild="true" enabledIncrementalBuild="true" id="org.eclipse.cdt.build.core.settings.default.builder.731584538" incrementalBuildTarget="all" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="false" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
+							<builder arguments="-j4" autoBuildTarget="all" cleanBuildTarget="clean" command="make" enableAutoBuild="false" enableCleanBuild="true" enabledIncrementalBuild="true" id="org.eclipse.cdt.build.core.settings.default.builder.731584538" incrementalBuildTarget="all" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="false" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
 							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.1252970003" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
 							<tool id="org.eclipse.cdt.build.core.settings.holder.1371414073" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">
 								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.306286573" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
diff --git a/mediastreamer2 b/mediastreamer2
index 640f2d31e..7167b2f95 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 640f2d31ef3ec80822e99254d62baa0006c09c82
+Subproject commit 7167b2f95ec30479860bbf8f95511494f544c59d

From 456ca8d6458e62a2a8eb9e0f590e4f2242900b59 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Tue, 6 Jan 2015 10:44:04 +0100
Subject: [PATCH 231/496] MS2:add missing file to distribution

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 7167b2f95..470c29b1f 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 7167b2f95ec30479860bbf8f95511494f544c59d
+Subproject commit 470c29b1fd66955b95cb289debb5673d722a4898

From 67e2205d92194c5edc9025767c48e97150b24e55 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Tue, 6 Jan 2015 12:26:25 +0100
Subject: [PATCH 232/496] Added possibility to set random/disabled port for
 UDP/TCP SIP

---
 gtk/parameters.ui | 557 +++++++++++++++++++++++++++-------------------
 gtk/propertybox.c |  73 +++++-
 2 files changed, 391 insertions(+), 239 deletions(-)

diff --git a/gtk/parameters.ui b/gtk/parameters.ui
index 8c2483ef7..864674822 100644
--- a/gtk/parameters.ui
+++ b/gtk/parameters.ui
@@ -360,143 +360,257 @@
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="n_rows">8</property>
                             <property name="n_columns">2</property>
+
                             <child>
-                              <object class="GtkSpinButton" id="sip_udp_port">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="invisible_char">•</property>
-                                <property name="invisible_char_set">True</property>
-                                <property name="primary_icon_activatable">False</property>
-                                <property name="secondary_icon_activatable">False</property>
-                                <property name="primary_icon_sensitive">True</property>
-                                <property name="secondary_icon_sensitive">True</property>
-                                <property name="adjustment">adjustment7</property>
-                                <signal name="value-changed" handler="linphone_gtk_udp_port_value_changed" swapped="no"/>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
-                              </packing>
+                                <object class="GtkLabel" id="sip_udp_port_label">
+                                  <property name="visible">True</property>
+                                  <property name="can_focus">False</property>
+                                  <property name="label" translatable="yes">SIP/UDP port</property>
+                                </object>
                             </child>
                             <child>
-                              <object class="GtkLabel" id="media_encryption_label">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Media encryption type</property>
-                              </object>
-                              <packing>
-                                <property name="top_attach">4</property>
-                                <property name="bottom_attach">6</property>
-                              </packing>
+                                <object class="GtkHBox" id="hbox65">
+                                  <property name="visible">True</property>
+                                  <property name="can_focus">False</property>
+
+                                  <child>
+                                      <object class="GtkCheckButton" id="disabled_udp_port">
+                                        <property name="label" translatable="yes">Disabled</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
+                                        <property name="use_action_appearance">False</property>
+                                        <property name="draw_indicator">True</property>
+                                        <signal name="toggled" handler="linphone_gtk_disabled_udp_port_toggle" swapped="no"/>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                  </child>
+
+                                  <child>
+                                      <object class="GtkCheckButton" id="random_udp_port">
+                                        <property name="label" translatable="yes">Random</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
+                                        <property name="use_action_appearance">False</property>
+                                        <property name="draw_indicator">True</property>
+                                        <signal name="toggled" handler="linphone_gtk_random_udp_port_toggle" swapped="no"/>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                  </child>
+
+                                    <child>
+                                      <object class="GtkSpinButton" id="sip_udp_port">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="invisible_char">•</property>
+                                        <property name="invisible_char_set">True</property>
+                                        <property name="primary_icon_activatable">False</property>
+                                        <property name="secondary_icon_activatable">False</property>
+                                        <property name="primary_icon_sensitive">True</property>
+                                        <property name="secondary_icon_sensitive">True</property>
+                                        <property name="adjustment">adjustment8</property>
+                                        <signal name="value-changed" handler="linphone_gtk_udp_port_value_changed" swapped="no"/>
+                                      </object>
+                                        <packing>
+                                          <property name="expand">True</property>
+                                          <property name="fill">True</property>
+                                          <property name="position">2</property>
+                                        </packing>
+                                  </child>
+                                </object>
+                                <packing>
+                                  <property name="left_attach">1</property>
+                                  <property name="right_attach">2</property>
+                                  <property name="top_attach">1</property>
+                                  <property name="bottom_attach">1</property>
+                                </packing>
+                            </child>
+
+                            <child>
+                                <object class="GtkLabel" id="sip_tcp_port_label">
+                                  <property name="visible">True</property>
+                                  <property name="can_focus">False</property>
+                                  <property name="label" translatable="yes">SIP/TCP port</property>
+                                </object>
+                                <packing>
+                                  <property name="top_attach">1</property>
+                                  <property name="bottom_attach">2</property>
+                                </packing>
                             </child>
                             <child>
-                              <object class="GtkComboBox" id="media_encryption_combo">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="active">0</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
-                                <property name="top_attach">4</property>
-                                <property name="bottom_attach">5</property>
-                              </packing>
+                                <object class="GtkHBox" id="hbox66">
+                                  <property name="visible">True</property>
+                                  <property name="can_focus">False</property>
+
+                                  <child>
+                                      <object class="GtkCheckButton" id="disabled_tcp_port">
+                                        <property name="label" translatable="yes">Disabled</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
+                                        <property name="use_action_appearance">False</property>
+                                        <property name="draw_indicator">True</property>
+                                        <signal name="toggled" handler="linphone_gtk_disabled_tcp_port_toggle" swapped="no"/>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                  </child>
+
+                                  <child>
+                                      <object class="GtkCheckButton" id="random_tcp_port">
+                                        <property name="label" translatable="yes">Random</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
+                                        <property name="use_action_appearance">False</property>
+                                        <property name="draw_indicator">True</property>
+                                        <signal name="toggled" handler="linphone_gtk_random_tcp_port_toggle" swapped="no"/>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                  </child>
+
+                                    <child>
+                                      <object class="GtkSpinButton" id="sip_tcp_port">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="invisible_char">•</property>
+                                        <property name="invisible_char_set">True</property>
+                                        <property name="primary_icon_activatable">False</property>
+                                        <property name="secondary_icon_activatable">False</property>
+                                        <property name="primary_icon_sensitive">True</property>
+                                        <property name="secondary_icon_sensitive">True</property>
+                                        <property name="adjustment">adjustment8</property>
+                                        <signal name="value-changed" handler="linphone_gtk_tcp_port_value_changed" swapped="no"/>
+                                      </object>
+                                        <packing>
+                                          <property name="expand">True</property>
+                                          <property name="fill">True</property>
+                                          <property name="position">2</property>
+                                        </packing>
+                                  </child>
+                                </object>
+                                <packing>
+                                  <property name="left_attach">1</property>
+                                  <property name="right_attach">2</property>
+                                  <property name="top_attach">1</property>
+                                  <property name="bottom_attach">2</property>
+                                </packing>
+                            </child>
+
+
+
+                            <child>
+                                <object class="GtkLabel" id="audio_rtp_port_label">
+                                  <property name="visible">True</property>
+                                  <property name="can_focus">False</property>
+                                  <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                  <property name="label" translatable="yes">Audio RTP/UDP:</property>
+                                  <property name="justify">right</property>
+                                </object>
+                                <packing>
+                                  <property name="top_attach">2</property>
+                                  <property name="bottom_attach">3</property>
+                                </packing>
                             </child>
                             <child>
-                              <object class="GtkLabel" id="label7">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="label" translatable="yes">Video RTP/UDP:</property>
-                                <property name="justify">right</property>
-                              </object>
-                              <packing>
-                                <property name="top_attach">3</property>
-                                <property name="bottom_attach">4</property>
-                              </packing>
+                                <object class="GtkHBox" id="hbox6">
+                                  <property name="visible">True</property>
+                                  <property name="can_focus">False</property>
+                                  <child>
+                                      <object class="GtkSpinButton" id="audio_min_rtp_port">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="invisible_char">•</property>
+                                        <property name="primary_icon_activatable">False</property>
+                                        <property name="secondary_icon_activatable">False</property>
+                                        <property name="primary_icon_sensitive">True</property>
+                                        <property name="secondary_icon_sensitive">True</property>
+                                        <property name="adjustment">adjustment_min_audio_port</property>
+                                        <property name="numeric">True</property>
+                                        <signal name="value-changed" handler="linphone_gtk_min_audio_port_changed" swapped="no"/>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                  </child>
+                                  <child>
+                                      <object class="GtkSpinButton" id="audio_max_rtp_port">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="invisible_char">•</property>
+                                        <property name="invisible_char_set">True</property>
+                                        <property name="primary_icon_activatable">False</property>
+                                        <property name="secondary_icon_activatable">False</property>
+                                        <property name="primary_icon_sensitive">True</property>
+                                        <property name="secondary_icon_sensitive">True</property>
+                                        <property name="adjustment">adjustment_max_audio_port</property>
+                                        <property name="numeric">True</property>
+                                        <signal name="value-changed" handler="linphone_gtk_max_audio_port_changed" swapped="no"/>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                  </child>
+                                  <child>
+                                      <object class="GtkCheckButton" id="fixed_audio_port">
+                                        <property name="label" translatable="yes">Fixed</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
+                                        <property name="use_action_appearance">False</property>
+                                        <property name="draw_indicator">True</property>
+                                        <signal name="toggled" handler="linphone_gtk_fixed_audio_port_toggle" swapped="no"/>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">2</property>
+                                      </packing>
+                                  </child>
+                                </object>
+                                <packing>
+                                  <property name="left_attach">1</property>
+                                  <property name="right_attach">2</property>
+                                  <property name="top_attach">2</property>
+                                  <property name="bottom_attach">3</property>
+                                </packing>
+                            </child>
+
+                            <child>
+                                <object class="GtkLabel" id="video_rtp_port_label">
+                                  <property name="visible">True</property>
+                                  <property name="can_focus">False</property>
+                                  <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                  <property name="label" translatable="yes">Video RTP/UDP:</property>
+                                  <property name="justify">right</property>
+                                </object>
+                                <packing>
+                                  <property name="top_attach">3</property>
+                                  <property name="bottom_attach">4</property>
+                                </packing>
                             </child>
                             <child>
-                              <object class="GtkLabel" id="label6">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="label" translatable="yes">Audio RTP/UDP:</property>
-                                <property name="justify">right</property>
-                              </object>
-                              <packing>
-                                <property name="top_attach">2</property>
-                                <property name="bottom_attach">3</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkHBox" id="hbox6">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <child>
-                                  <object class="GtkSpinButton" id="audio_min_rtp_port">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="invisible_char">•</property>
-                                    <property name="primary_icon_activatable">False</property>
-                                    <property name="secondary_icon_activatable">False</property>
-                                    <property name="primary_icon_sensitive">True</property>
-                                    <property name="secondary_icon_sensitive">True</property>
-                                    <property name="adjustment">adjustment_min_audio_port</property>
-                                    <property name="numeric">True</property>
-                                    <signal name="value-changed" handler="linphone_gtk_min_audio_port_changed" swapped="no"/>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkSpinButton" id="audio_max_rtp_port">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="invisible_char">•</property>
-                                    <property name="invisible_char_set">True</property>
-                                    <property name="primary_icon_activatable">False</property>
-                                    <property name="secondary_icon_activatable">False</property>
-                                    <property name="primary_icon_sensitive">True</property>
-                                    <property name="secondary_icon_sensitive">True</property>
-                                    <property name="adjustment">adjustment_max_audio_port</property>
-                                    <property name="numeric">True</property>
-                                    <signal name="value-changed" handler="linphone_gtk_max_audio_port_changed" swapped="no"/>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkCheckButton" id="fixed_audio_port">
-                                    <property name="label" translatable="yes">Fixed</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="use_action_appearance">False</property>
-                                    <property name="draw_indicator">True</property>
-                                    <signal name="toggled" handler="linphone_gtk_fixed_audio_port_toggle" swapped="no"/>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">2</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
-                                <property name="top_attach">2</property>
-                                <property name="bottom_attach">3</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkHBox" id="hbox17">
+                               <object class="GtkHBox" id="hbox17">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <child>
@@ -554,122 +668,109 @@
                                     <property name="position">2</property>
                                   </packing>
                                 </child>
-                              </object>
-                              <packing>
+                                </object>
+                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="right_attach">2</property>
                                 <property name="top_attach">3</property>
                                 <property name="bottom_attach">4</property>
-                              </packing>
+                               </packing>
+                            </child>
+
+                            <child>
+                                <object class="GtkLabel" id="media_encryption_label">
+                                  <property name="visible">True</property>
+                                  <property name="can_focus">False</property>
+                                  <property name="label" translatable="yes">Media encryption type</property>
+                                </object>
+                                <packing>
+                                  <property name="top_attach">4</property>
+                                  <property name="bottom_attach">6</property>
+                                </packing>
                             </child>
                             <child>
-                              <object class="GtkCheckButton" id="media_encryption_mandatory">
-                                <property name="label" translatable="yes">Media encryption is mandatory</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="use_action_appearance">False</property>
-                                <property name="draw_indicator">True</property>
-                                <signal name="toggled" handler="linphone_gtk_set_media_encryption_mandatory" swapped="no"/>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
-                                <property name="top_attach">5</property>
-                                <property name="bottom_attach">6</property>
-                              </packing>
+                                <object class="GtkComboBox" id="media_encryption_combo">
+                                  <property name="visible">True</property>
+                                  <property name="can_focus">False</property>
+                                  <property name="active">0</property>
+                                </object>
+                                <packing>
+                                  <property name="left_attach">1</property>
+                                  <property name="right_attach">2</property>
+                                  <property name="top_attach">4</property>
+                                  <property name="bottom_attach">5</property>
+                                </packing>
                             </child>
                             <child>
-                              <object class="GtkLabel" id="tunnel_label">
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Tunnel</property>
-                              </object>
-                              <packing>
-                                <property name="top_attach">7</property>
-                                <property name="bottom_attach">8</property>
-                              </packing>
+                                <object class="GtkCheckButton" id="media_encryption_mandatory">
+                                  <property name="label" translatable="yes">Media encryption is mandatory</property>
+                                  <property name="visible">True</property>
+                                  <property name="can_focus">True</property>
+                                  <property name="receives_default">False</property>
+                                  <property name="use_action_appearance">False</property>
+                                  <property name="draw_indicator">True</property>
+                                  <signal name="toggled" handler="linphone_gtk_set_media_encryption_mandatory" swapped="no"/>
+                                </object>
+                                <packing>
+                                  <property name="left_attach">1</property>
+                                  <property name="right_attach">2</property>
+                                  <property name="top_attach">5</property>
+                                  <property name="bottom_attach">6</property>
+                                </packing>
                             </child>
                             <child>
-                              <object class="GtkButton" id="tunnel_edit_button">
-                                <property name="label">gtk-edit</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="use_action_appearance">False</property>
-                                <property name="use_stock">True</property>
-                                <signal name="clicked" handler="linphone_gtk_edit_tunnel" swapped="no"/>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
-                                <property name="top_attach">7</property>
-                                <property name="bottom_attach">8</property>
-                              </packing>
+                                <object class="GtkLabel" id="tunnel_label">
+                                  <property name="can_focus">False</property>
+                                  <property name="label" translatable="yes">Tunnel</property>
+                                </object>
+                                <packing>
+                                  <property name="top_attach">7</property>
+                                  <property name="bottom_attach">8</property>
+                                </packing>
                             </child>
                             <child>
-                              <object class="GtkLabel" id="label13">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">DSCP fields</property>
-                              </object>
-                              <packing>
-                                <property name="top_attach">6</property>
-                                <property name="bottom_attach">7</property>
-                              </packing>
+                                <object class="GtkButton" id="tunnel_edit_button">
+                                  <property name="label">gtk-edit</property>
+                                  <property name="can_focus">True</property>
+                                  <property name="receives_default">True</property>
+                                  <property name="use_action_appearance">False</property>
+                                  <property name="use_stock">True</property>
+                                  <signal name="clicked" handler="linphone_gtk_edit_tunnel" swapped="no"/>
+                                </object>
+                                <packing>
+                                  <property name="left_attach">1</property>
+                                  <property name="right_attach">2</property>
+                                  <property name="top_attach">7</property>
+                                  <property name="bottom_attach">8</property>
+                                </packing>
                             </child>
                             <child>
-                              <object class="GtkButton" id="dscp_edit_button">
-                                <property name="label">gtk-edit</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="use_action_appearance">False</property>
-                                <property name="use_stock">True</property>
-                                <signal name="clicked" handler="linphone_gtk_dscp_edit" swapped="no"/>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
-                                <property name="top_attach">6</property>
-                                <property name="bottom_attach">7</property>
-                              </packing>
+                                <object class="GtkLabel" id="label13">
+                                  <property name="visible">True</property>
+                                  <property name="can_focus">False</property>
+                                  <property name="label" translatable="yes">DSCP fields</property>
+                                </object>
+                                <packing>
+                                  <property name="top_attach">6</property>
+                                  <property name="bottom_attach">7</property>
+                                </packing>
                             </child>
                             <child>
-                              <object class="GtkLabel" id="label14">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">SIP/TCP port</property>
-                              </object>
-                              <packing>
-                                <property name="top_attach">1</property>
-                                <property name="bottom_attach">2</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkSpinButton" id="sip_tcp_port">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="invisible_char">•</property>
-                                <property name="invisible_char_set">True</property>
-                                <property name="primary_icon_activatable">False</property>
-                                <property name="secondary_icon_activatable">False</property>
-                                <property name="primary_icon_sensitive">True</property>
-                                <property name="secondary_icon_sensitive">True</property>
-                                <property name="adjustment">adjustment8</property>
-                                <signal name="value-changed" handler="linphone_gtk_tcp_port_value_changed" swapped="no"/>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
-                                <property name="top_attach">1</property>
-                                <property name="bottom_attach">2</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="label15">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">SIP/UDP port</property>
-                              </object>
+                                <object class="GtkButton" id="dscp_edit_button">
+                                  <property name="label">gtk-edit</property>
+                                  <property name="visible">True</property>
+                                  <property name="can_focus">True</property>
+                                  <property name="receives_default">True</property>
+                                  <property name="use_action_appearance">False</property>
+                                  <property name="use_stock">True</property>
+                                  <signal name="clicked" handler="linphone_gtk_dscp_edit" swapped="no"/>
+                                </object>
+                                <packing>
+                                  <property name="left_attach">1</property>
+                                  <property name="right_attach">2</property>
+                                  <property name="top_attach">6</property>
+                                  <property name="bottom_attach">7</property>
+                                </packing>
                             </child>
                           </object>
                         </child>
diff --git a/gtk/propertybox.c b/gtk/propertybox.c
index bdb066616..2f5fc2a16 100644
--- a/gtk/propertybox.c
+++ b/gtk/propertybox.c
@@ -1361,26 +1361,76 @@ static gboolean apply_transports(PortConfigCtx *ctx){
 	return FALSE;
 }
 
-static void transport_changed(GtkWidget *parameters){
+static PortConfigCtx* get_port_config() {
 	GtkWidget *mw=linphone_gtk_get_main_window();
 	PortConfigCtx *cfg=(PortConfigCtx*)g_object_get_data(G_OBJECT(mw),"port_config");
 	if (cfg==NULL){
 		cfg=g_new0(PortConfigCtx,1);
 		g_object_set_data_full(G_OBJECT(mw),"port_config",cfg,(GDestroyNotify)port_config_free);
 	}
-	if (cfg->timeout_id!=0)
+	if (cfg->timeout_id!=0) {
 		g_source_remove(cfg->timeout_id);
-	cfg->tp.udp_port=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(linphone_gtk_get_widget(parameters,"sip_udp_port")));
-	cfg->tp.tcp_port=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(linphone_gtk_get_widget(parameters,"sip_tcp_port")));
+	}
 	cfg->timeout_id=g_timeout_add_seconds(2,(GSourceFunc)apply_transports,cfg);
+	return cfg;
+}
+
+static void transport_changed(GtkWidget *parameters){
+	PortConfigCtx *cfg = get_port_config();
+
+	GtkWidget *udp_random_port=linphone_gtk_get_widget(parameters,"random_udp_port");
+	GtkWidget *tcp_random_port=linphone_gtk_get_widget(parameters,"random_tcp_port");
+
+	GtkWidget *sip_udp_port=linphone_gtk_get_widget(parameters,"sip_udp_port");
+	GtkWidget *sip_tcp_port=linphone_gtk_get_widget(parameters,"sip_tcp_port");
+
+	gboolean udp_is_disabled=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(linphone_gtk_get_widget(parameters,"disabled_udp_port")));
+	gboolean tcp_is_disabled=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(linphone_gtk_get_widget(parameters,"disabled_tcp_port")));
+
+	gboolean udp_is_random=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(udp_random_port));
+	gboolean tcp_is_random=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(tcp_random_port));
+
+	int udp_port = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(sip_udp_port));
+	int tcp_port = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(sip_tcp_port));
+
+
+	gtk_widget_set_sensitive(udp_random_port, !udp_is_disabled);
+	gtk_widget_set_sensitive(tcp_random_port, !tcp_is_disabled);
+	gtk_widget_set_sensitive(sip_udp_port, !udp_is_disabled && !udp_is_random);
+	gtk_widget_set_sensitive(sip_tcp_port, !tcp_is_disabled && !tcp_is_random);
+
+	cfg->tp.udp_port=udp_is_disabled?0:udp_is_random?-1:udp_port;
+	cfg->tp.tcp_port=tcp_is_disabled?0:tcp_is_random?-1:tcp_port;
+}
+
+void linphone_gtk_disabled_udp_port_toggle(GtkCheckButton *button){
+	GtkWidget *parameters = gtk_widget_get_toplevel((GtkWidget*)button);
+	transport_changed(parameters);
+}
+
+void linphone_gtk_random_udp_port_toggle(GtkCheckButton *button){
+	GtkWidget *parameters = gtk_widget_get_toplevel((GtkWidget*)button);
+	transport_changed(parameters);
 }
 
 void linphone_gtk_udp_port_value_changed(GtkSpinButton *button){
-	transport_changed(gtk_widget_get_toplevel((GtkWidget*)button));
+	GtkWidget *parameters = gtk_widget_get_toplevel((GtkWidget*)button);
+	transport_changed(parameters);
+}
+
+void linphone_gtk_disabled_tcp_port_toggle(GtkCheckButton *button){
+	GtkWidget *parameters = gtk_widget_get_toplevel((GtkWidget*)button);
+	transport_changed(parameters);
+}
+
+void linphone_gtk_random_tcp_port_toggle(GtkCheckButton *button){
+	GtkWidget *parameters = gtk_widget_get_toplevel((GtkWidget*)button);
+	transport_changed(parameters);
 }
 
 void linphone_gtk_tcp_port_value_changed(GtkSpinButton *button){
-	transport_changed(gtk_widget_get_toplevel((GtkWidget*)button));
+	GtkWidget *parameters = gtk_widget_get_toplevel((GtkWidget*)button);
+	transport_changed(parameters);
 }
 
 void linphone_gtk_show_parameters(void){
@@ -1410,11 +1460,12 @@ void linphone_gtk_show_parameters(void){
 				linphone_core_ipv6_enabled(lc));
 	linphone_core_get_sip_transports(lc,&tr);
 
-	gtk_spin_button_set_value(GTK_SPIN_BUTTON(linphone_gtk_get_widget(pb,"sip_udp_port")),
-				tr.udp_port);
-	gtk_spin_button_set_value(GTK_SPIN_BUTTON(linphone_gtk_get_widget(pb,"sip_tcp_port")),
-				tr.tcp_port);
-
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(linphone_gtk_get_widget(pb,"disabled_udp_port")), tr.udp_port==0);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(linphone_gtk_get_widget(pb,"disabled_tcp_port")), tr.tcp_port==0);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(linphone_gtk_get_widget(pb,"random_udp_port")), tr.udp_port==-1);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(linphone_gtk_get_widget(pb,"random_tcp_port")), tr.tcp_port==-1);
+	gtk_spin_button_set_value(GTK_SPIN_BUTTON(linphone_gtk_get_widget(pb,"sip_udp_port")), tr.udp_port);
+	gtk_spin_button_set_value(GTK_SPIN_BUTTON(linphone_gtk_get_widget(pb,"sip_tcp_port")), tr.tcp_port);
 
 	linphone_core_get_audio_port_range(lc, &min_port, &max_port);
 	gtk_spin_button_set_value(GTK_SPIN_BUTTON(linphone_gtk_get_widget(pb, "audio_min_rtp_port")), min_port);

From e63aad18b307ee878079ea6408cf53f6c0709507 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Tue, 6 Jan 2015 12:28:46 +0100
Subject: [PATCH 233/496] Update localization

---
 po/ar.po    | 280 ++++++++++++++++++-----------------
 po/cs.po    | 278 ++++++++++++++++++-----------------
 po/de.po    | 278 ++++++++++++++++++-----------------
 po/es.po    | 278 ++++++++++++++++++-----------------
 po/fr.po    | 280 ++++++++++++++++++-----------------
 po/he.po    | 278 ++++++++++++++++++-----------------
 po/hu.po    | 278 ++++++++++++++++++-----------------
 po/it.po    | 282 +++++++++++++++++++-----------------
 po/ja.po    | 410 +++++++++++++++++++++++++++-------------------------
 po/nb_NO.po | 282 +++++++++++++++++++-----------------
 po/nl.po    | 282 +++++++++++++++++++-----------------
 po/pl.po    | 278 ++++++++++++++++++-----------------
 po/pt_BR.po | 282 +++++++++++++++++++-----------------
 po/ru.po    | 324 ++++++++++++++++++++++-------------------
 po/sr.po    | 280 ++++++++++++++++++-----------------
 po/sv.po    | 282 +++++++++++++++++++-----------------
 po/zh_CN.po | 282 +++++++++++++++++++-----------------
 po/zh_TW.po | 282 +++++++++++++++++++-----------------
 18 files changed, 2725 insertions(+), 2491 deletions(-)

diff --git a/po/ar.po b/po/ar.po
index 23def9ce8..f8773b668 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-03 13:39+0100\n"
-"PO-Revision-Date: 2014-12-04 09:51+0000\n"
-"Last-Translator: محيي الدين <tx99h4@hotmail.com>\n"
+"POT-Creation-Date: 2015-01-06 12:28+0100\n"
+"PO-Revision-Date: 2015-01-06 11:29+0000\n"
+"Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/ar/)\n"
 "Language: ar\n"
@@ -105,46 +105,50 @@ msgstr "أيقونة غير موجودة : %s"
 msgid "Invalid sip contact !"
 msgstr "جهة اتصال sip غير صالحة !"
 
-#: ../gtk/main.c:107
+#: ../gtk/main.c:109
 msgid "log to stdout some debug information while running."
 msgstr "أظهِرْ بعض معلومات التنقيح خلال التشغيل."
 
-#: ../gtk/main.c:114
+#: ../gtk/main.c:116
 msgid "path to a file to write logs into."
 msgstr "الدليل إلى الملف الذي سيُكتَب فيه سجل الوقائع."
 
-#: ../gtk/main.c:121
+#: ../gtk/main.c:123
 msgid "Start linphone with video disabled."
 msgstr "ابدأ لِنْفُونْ لكن دون تفعيل الفيديو."
 
-#: ../gtk/main.c:128
+#: ../gtk/main.c:130
 msgid "Start only in the system tray, do not show the main interface."
 msgstr "شغِّله مُصغَّرا، ولا تُظهِر الواجهة الرئيسية."
 
-#: ../gtk/main.c:135
+#: ../gtk/main.c:137
 msgid "address to call right now"
 msgstr "العنوان المُراد الاتصال به الآن"
 
-#: ../gtk/main.c:142
+#: ../gtk/main.c:144
 msgid "if set automatically answer incoming calls"
 msgstr "إذا تم التفعيل، سيجيب تلقائيا عن المكالمات الواردة"
 
-#: ../gtk/main.c:149
+#: ../gtk/main.c:151
 msgid ""
 "Specifiy a working directory (should be the base of the installation, eg: c:"
 "\\Program Files\\Linphone)"
 msgstr ""
 "حدِّد مجلد العمل (الذي سيكون مجلد التثبيت، مثلا c:\\Program Files\\Linphone)"
 
-#: ../gtk/main.c:156
+#: ../gtk/main.c:158
 msgid "Configuration file"
 msgstr "ملف التهيئة"
 
-#: ../gtk/main.c:163
+#: ../gtk/main.c:165
 msgid "Run the audio assistant"
 msgstr "ابدأ مرشد الصوت"
 
-#: ../gtk/main.c:1085
+#: ../gtk/main.c:172
+msgid "Run self test and exit 0 if succeed"
+msgstr ""
+
+#: ../gtk/main.c:1083
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
@@ -156,7 +160,7 @@ msgstr ""
 "هل تريد السماح له برؤية معلومات حضورك وكذا إضافته إلى جهة اتصالك أيضا ؟ إذا "
 "أجبت ب لا، سيُحظَر هذا الشخص مؤقتا."
 
-#: ../gtk/main.c:1162
+#: ../gtk/main.c:1160
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
@@ -165,59 +169,59 @@ msgstr ""
 "ادخل كلمة السر ل  <i>%s</i>\n"
 " في نطاق <i>%s</i>:"
 
-#: ../gtk/main.c:1283
+#: ../gtk/main.c:1281
 msgid "Call error"
 msgstr "خطأ في المكالمة"
 
-#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3751
+#: ../gtk/main.c:1284 ../coreapi/linphonecore.c:3767
 msgid "Call ended"
 msgstr "إنتهت المكالمة"
 
-#: ../gtk/main.c:1289 ../coreapi/call_log.c:221
+#: ../gtk/main.c:1287 ../coreapi/call_log.c:221
 msgid "Incoming call"
 msgstr "مكالمة واردة"
 
-#: ../gtk/main.c:1291 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
+#: ../gtk/main.c:1289 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
 msgid "Answer"
 msgstr "أجِبْ"
 
-#: ../gtk/main.c:1293 ../gtk/main.ui.h:6
+#: ../gtk/main.c:1291 ../gtk/main.ui.h:6
 msgid "Decline"
 msgstr "ارفضْ"
 
-#: ../gtk/main.c:1299
+#: ../gtk/main.c:1297
 msgid "Call paused"
 msgstr "المكالمة متوقفة"
 
-#: ../gtk/main.c:1299
+#: ../gtk/main.c:1297
 #, c-format
 msgid "<b>by %s</b>"
 msgstr "<b>بواسطة %s</b>"
 
-#: ../gtk/main.c:1366
+#: ../gtk/main.c:1367
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr "يود %s تشغيل الفيديو. هل تقبل ذلك ؟"
 
-#: ../gtk/main.c:1528
+#: ../gtk/main.c:1529
 msgid "Website link"
 msgstr "وصلة إلى الموقع وِبْ"
 
-#: ../gtk/main.c:1577
+#: ../gtk/main.c:1578
 msgid "Linphone - a video internet phone"
 msgstr "لِنْفُونْ - الهاتف المرئي عبر الإنترنت"
 
-#: ../gtk/main.c:1669
+#: ../gtk/main.c:1670
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (افتراضي)"
 
-#: ../gtk/main.c:2006 ../coreapi/callbacks.c:986
+#: ../gtk/main.c:2002 ../coreapi/callbacks.c:986
 #, c-format
 msgid "We are transferred to %s"
 msgstr "التحويل إلى %s"
 
-#: ../gtk/main.c:2016
+#: ../gtk/main.c:2012
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
@@ -225,7 +229,7 @@ msgstr ""
 "لا وجود للوحة الصوت على هذا الحاسوب.\n"
 "لن تتمكن من تلقي أو إجراء أي مكالمة."
 
-#: ../gtk/main.c:2157
+#: ../gtk/main.c:2156
 msgid "A free SIP video-phone"
 msgstr "هاتف SIP المرئي الحر"
 
@@ -294,7 +298,7 @@ msgstr "الإعدادات"
 msgid "Enabled"
 msgstr "مفعَّل"
 
-#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763
+#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763 ../gtk/parameters.ui.h:20
 msgid "Disabled"
 msgstr "غير مفعَّل"
 
@@ -463,7 +467,7 @@ msgstr "أريد تحديد عنوان التهيئة عن بعد"
 msgid "Enter your linphone.org username"
 msgstr "أدخِلْ إسم المستخدم في linphone.org"
 
-#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:79 ../gtk/ldap.ui.h:4
+#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:82 ../gtk/ldap.ui.h:4
 msgid "Username:"
 msgstr "إسم المستخدم :"
 
@@ -654,7 +658,7 @@ msgstr "%ix%i @ %f fps"
 msgid "%.3f seconds"
 msgstr "%.3f ثانية"
 
-#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12 ../gtk/videowindow.c:232
+#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12 ../gtk/videowindow.c:235
 msgid "Hang up"
 msgstr "ضع السماعة"
 
@@ -1253,210 +1257,218 @@ msgid "<b>Transport</b>"
 msgstr "<b>النقل</b>"
 
 #: ../gtk/parameters.ui.h:19
-msgid "Media encryption type"
-msgstr "نوع وسيط التعمية"
-
-#: ../gtk/parameters.ui.h:20
-msgid "Video RTP/UDP:"
-msgstr "فيديو RTP/UDP :"
-
-#: ../gtk/parameters.ui.h:21
-msgid "Audio RTP/UDP:"
-msgstr "صوت RTP/UDP :"
-
-#: ../gtk/parameters.ui.h:22
-msgid "Fixed"
-msgstr "ثابت"
-
-#: ../gtk/parameters.ui.h:23
-msgid "Media encryption is mandatory"
-msgstr "وسيط التعمية إجباري"
-
-#: ../gtk/parameters.ui.h:24
-msgid "Tunnel"
-msgstr "النفق"
-
-#: ../gtk/parameters.ui.h:25
-msgid "DSCP fields"
-msgstr "حقول DSCP"
-
-#: ../gtk/parameters.ui.h:26
-msgid "SIP/TCP port"
-msgstr "منفذ SIP/TCP"
-
-#: ../gtk/parameters.ui.h:27
 msgid "SIP/UDP port"
 msgstr "منفذ SIP/UDP"
 
+#: ../gtk/parameters.ui.h:21
+msgid "Random"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:22
+msgid "SIP/TCP port"
+msgstr "منفذ SIP/TCP"
+
+#: ../gtk/parameters.ui.h:23
+msgid "Audio RTP/UDP:"
+msgstr "صوت RTP/UDP :"
+
+#: ../gtk/parameters.ui.h:24
+msgid "Fixed"
+msgstr "ثابت"
+
+#: ../gtk/parameters.ui.h:25
+msgid "Video RTP/UDP:"
+msgstr "فيديو RTP/UDP :"
+
+#: ../gtk/parameters.ui.h:26
+msgid "Media encryption type"
+msgstr "نوع وسيط التعمية"
+
+#: ../gtk/parameters.ui.h:27
+msgid "Media encryption is mandatory"
+msgstr "وسيط التعمية إجباري"
+
 #: ../gtk/parameters.ui.h:28
+msgid "Tunnel"
+msgstr "النفق"
+
+#: ../gtk/parameters.ui.h:29
+msgid "DSCP fields"
+msgstr "حقول DSCP"
+
+#: ../gtk/parameters.ui.h:30
 msgid "<b>Network protocol and ports</b>"
 msgstr "<b>بروتوكول الشبكة والمنافذ</b>"
 
-#: ../gtk/parameters.ui.h:29
+#: ../gtk/parameters.ui.h:31
 msgid "Direct connection to the Internet"
 msgstr "الاتصال مباشر بالإنترنت"
 
-#: ../gtk/parameters.ui.h:30
+#: ../gtk/parameters.ui.h:32
 msgid "Behind NAT / Firewall (specify gateway IP )"
 msgstr "وراء جدار ناري (حدِّد عنوان IP البوابة)"
 
-#: ../gtk/parameters.ui.h:31
+#: ../gtk/parameters.ui.h:33
 msgid "Behind NAT / Firewall (use STUN to resolve)"
 msgstr "وراء جدار ناري (استخدم STUN)"
 
-#: ../gtk/parameters.ui.h:32
+#: ../gtk/parameters.ui.h:34
 msgid "Behind NAT / Firewall (use ICE)"
 msgstr "وراء جدار ناري (استخدم ICE)"
 
-#: ../gtk/parameters.ui.h:33
+#: ../gtk/parameters.ui.h:35
 msgid "Behind NAT / Firewall (use uPnP)"
 msgstr "وراء جدار ناري (استخدم uPnP)"
 
-#: ../gtk/parameters.ui.h:34
+#: ../gtk/parameters.ui.h:36
 msgid "Public IP address:"
 msgstr "عنوان IP العمومي :"
 
-#: ../gtk/parameters.ui.h:35
+#: ../gtk/parameters.ui.h:37
 msgid "Stun server:"
 msgstr "خادم STUN :"
 
-#: ../gtk/parameters.ui.h:36
+#: ../gtk/parameters.ui.h:38
 msgid "<b>NAT and Firewall</b>"
 msgstr "<b>إعدادات حول الجدار الناري</b>"
 
-#: ../gtk/parameters.ui.h:37
+#: ../gtk/parameters.ui.h:39
 msgid "Network settings"
 msgstr "إعدادات الشبكة"
 
-#: ../gtk/parameters.ui.h:38
+#: ../gtk/parameters.ui.h:40
 msgid "Ring sound:"
 msgstr "صوت الجرس :"
 
-#: ../gtk/parameters.ui.h:39
+#: ../gtk/parameters.ui.h:41
 msgid "ALSA special device (optional):"
 msgstr "عتاد ALSA الخصوصي (اختياري) :"
 
-#: ../gtk/parameters.ui.h:40
+#: ../gtk/parameters.ui.h:42
 msgid "Capture device:"
 msgstr "جهاز الالتقاط :"
 
-#: ../gtk/parameters.ui.h:41
+#: ../gtk/parameters.ui.h:43
 msgid "Ring device:"
 msgstr "جهاز الرنين :"
 
-#: ../gtk/parameters.ui.h:42
+#: ../gtk/parameters.ui.h:44
 msgid "Playback device:"
 msgstr "جهاز السمع :"
 
-#: ../gtk/parameters.ui.h:43
+#: ../gtk/parameters.ui.h:45
 msgid "Enable echo cancellation"
 msgstr "فعِّل إزالة الصدى"
 
-#: ../gtk/parameters.ui.h:44
+#: ../gtk/parameters.ui.h:46
 msgid "<b>Audio</b>"
 msgstr "<b>الصوت</b>"
 
-#: ../gtk/parameters.ui.h:45
+#: ../gtk/parameters.ui.h:47
 msgid "Video input device:"
 msgstr "جهاز إدخال الفيديو :"
 
-#: ../gtk/parameters.ui.h:46
+#: ../gtk/parameters.ui.h:48
 msgid "Prefered video resolution:"
 msgstr "المقدار المُراد لدقة الفيديو :"
 
-#: ../gtk/parameters.ui.h:47
+#: ../gtk/parameters.ui.h:49
 msgid "Video output method:"
 msgstr "طريقة إخراج الفيديو :"
 
-#: ../gtk/parameters.ui.h:48
+#: ../gtk/parameters.ui.h:50
+msgid "Show camera preview"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:51
 msgid "<b>Video</b>"
 msgstr "<b>الفيديو</b>"
 
-#: ../gtk/parameters.ui.h:49
+#: ../gtk/parameters.ui.h:52
 msgid "Multimedia settings"
 msgstr "إعدادات الوسائط المتعددة"
 
-#: ../gtk/parameters.ui.h:50
+#: ../gtk/parameters.ui.h:53
 msgid "This section defines your SIP address when not using a SIP account"
 msgstr "هذه الفقرة تحدد عنوانك SIP إن كنت لا تستخدم حساب SIP"
 
-#: ../gtk/parameters.ui.h:51
+#: ../gtk/parameters.ui.h:54
 msgid "Your display name (eg: John Doe):"
 msgstr "إسمك المعروض (مثلا : زيد عمرو) :"
 
-#: ../gtk/parameters.ui.h:52
+#: ../gtk/parameters.ui.h:55
 msgid "Your username:"
 msgstr "إسم المستخدم لديك :"
 
-#: ../gtk/parameters.ui.h:53
+#: ../gtk/parameters.ui.h:56
 msgid "Your resulting SIP address:"
 msgstr "عنوانك SIP :"
 
-#: ../gtk/parameters.ui.h:54
+#: ../gtk/parameters.ui.h:57
 msgid "<b>Default identity</b>"
 msgstr "<b>الهوية الافتراضية</b>"
 
-#: ../gtk/parameters.ui.h:55
+#: ../gtk/parameters.ui.h:58
 msgid "Wizard"
 msgstr "المرشد"
 
-#: ../gtk/parameters.ui.h:56
+#: ../gtk/parameters.ui.h:59
 msgid "Add"
 msgstr "إضافة"
 
-#: ../gtk/parameters.ui.h:57
+#: ../gtk/parameters.ui.h:60
 msgid "Edit"
 msgstr "حرر"
 
-#: ../gtk/parameters.ui.h:58
+#: ../gtk/parameters.ui.h:61
 msgid "Remove"
 msgstr "أزل"
 
-#: ../gtk/parameters.ui.h:59
+#: ../gtk/parameters.ui.h:62
 msgid "<b>Proxy accounts</b>"
 msgstr "<b>حسابات الوكيل</b>"
 
-#: ../gtk/parameters.ui.h:60
+#: ../gtk/parameters.ui.h:63
 msgid "Erase all passwords"
 msgstr "احذف جميع كلمات السر"
 
-#: ../gtk/parameters.ui.h:61
+#: ../gtk/parameters.ui.h:64
 msgid "<b>Privacy</b>"
 msgstr "<b>الأمان</b>"
 
-#: ../gtk/parameters.ui.h:62
+#: ../gtk/parameters.ui.h:65
 msgid "Manage SIP Accounts"
 msgstr "إدارة حسابات SIP"
 
-#: ../gtk/parameters.ui.h:63 ../gtk/tunnel_config.ui.h:4
+#: ../gtk/parameters.ui.h:66 ../gtk/tunnel_config.ui.h:4
 msgid "Enable"
 msgstr "فعِّل"
 
-#: ../gtk/parameters.ui.h:64 ../gtk/tunnel_config.ui.h:5
+#: ../gtk/parameters.ui.h:67 ../gtk/tunnel_config.ui.h:5
 msgid "Disable"
 msgstr "إلغاء التفعيل"
 
-#: ../gtk/parameters.ui.h:65
+#: ../gtk/parameters.ui.h:68
 msgid "<b>Codecs</b>"
 msgstr "<b>المراميز</b>"
 
-#: ../gtk/parameters.ui.h:66
+#: ../gtk/parameters.ui.h:69
 msgid "0 stands for \"unlimited\""
 msgstr "حدِّد 0 لعدم وضع أي حد"
 
-#: ../gtk/parameters.ui.h:67
+#: ../gtk/parameters.ui.h:70
 msgid "Upload speed limit in Kbit/sec:"
 msgstr "حد سرعة الرفع بالكيلوبِتْ/الثانية :"
 
-#: ../gtk/parameters.ui.h:68
+#: ../gtk/parameters.ui.h:71
 msgid "Download speed limit in Kbit/sec:"
 msgstr "حد سرعة التنزيل بالكيلوبِتْ/الثانية :"
 
-#: ../gtk/parameters.ui.h:69
+#: ../gtk/parameters.ui.h:72
 msgid "Enable adaptive rate control"
 msgstr "فعِّل التحكم المتكيف مع الصبيب"
 
-#: ../gtk/parameters.ui.h:70
+#: ../gtk/parameters.ui.h:73
 msgid ""
 "<i>Adaptive rate control is a technique to dynamically guess the available "
 "bandwidth during a call.</i>"
@@ -1464,47 +1476,47 @@ msgstr ""
 "<i>التحكم المتكيف مع الصبيب هو تقنية لملائمة جودة الصوت والصورة بناءً على سعة "
 "قناة الاتصال المتاحة خلال المكالمة.</i>"
 
-#: ../gtk/parameters.ui.h:71
+#: ../gtk/parameters.ui.h:74
 msgid "<b>Bandwidth control</b>"
 msgstr "<b>إدارة سعة القناة</b>"
 
-#: ../gtk/parameters.ui.h:72
+#: ../gtk/parameters.ui.h:75
 msgid "Codecs"
 msgstr "المراميز"
 
-#: ../gtk/parameters.ui.h:73
+#: ../gtk/parameters.ui.h:76
 msgid "<b>Language</b>"
 msgstr "<b>اللغة</b>"
 
-#: ../gtk/parameters.ui.h:74
+#: ../gtk/parameters.ui.h:77
 msgid "Show advanced settings"
 msgstr "أظهر الإعدادات المتقدمة"
 
-#: ../gtk/parameters.ui.h:75
+#: ../gtk/parameters.ui.h:78
 msgid "<b>Level</b>"
 msgstr "<b>المستوى</b>"
 
-#: ../gtk/parameters.ui.h:76
+#: ../gtk/parameters.ui.h:79
 msgid "User interface"
 msgstr "واجهة المستخدم"
 
-#: ../gtk/parameters.ui.h:77 ../gtk/ldap.ui.h:2
+#: ../gtk/parameters.ui.h:80 ../gtk/ldap.ui.h:2
 msgid "Server address:"
 msgstr "عنوان الخادم :"
 
-#: ../gtk/parameters.ui.h:78 ../gtk/ldap.ui.h:3
+#: ../gtk/parameters.ui.h:81 ../gtk/ldap.ui.h:3
 msgid "Authentication method:"
 msgstr "طريقة التحقق من الهوية :"
 
-#: ../gtk/parameters.ui.h:80
+#: ../gtk/parameters.ui.h:83
 msgid "<b>LDAP Account setup</b>"
 msgstr "<b>تهيئة LDAP</b>"
 
-#: ../gtk/parameters.ui.h:81
+#: ../gtk/parameters.ui.h:84
 msgid "LDAP"
 msgstr "LDAP"
 
-#: ../gtk/parameters.ui.h:82
+#: ../gtk/parameters.ui.h:85
 msgid "Done"
 msgstr "أغلق"
 
@@ -1734,56 +1746,56 @@ msgstr "رجاءً انتظر ريثما ينتهي من جلب الإعدادا
 msgid "Ready"
 msgstr "جاهز"
 
-#: ../coreapi/linphonecore.c:2473
+#: ../coreapi/linphonecore.c:2489
 msgid "Configuring"
 msgstr "تجري التهيئة"
 
-#: ../coreapi/linphonecore.c:2638
+#: ../coreapi/linphonecore.c:2654
 msgid "Looking for telephone number destination..."
 msgstr "يجري البحث عن وجهة رقم الهاتف..."
 
-#: ../coreapi/linphonecore.c:2640
+#: ../coreapi/linphonecore.c:2656
 msgid "Could not resolve this number."
 msgstr "لم يتمكن من إيجاد هذا الرقم."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2926
+#: ../coreapi/linphonecore.c:2942
 msgid "Contacting"
 msgstr "يتصل ب"
 
-#: ../coreapi/linphonecore.c:2931
+#: ../coreapi/linphonecore.c:2947
 msgid "Could not call"
 msgstr "لم يتمكن من الاتصال"
 
-#: ../coreapi/linphonecore.c:3081
+#: ../coreapi/linphonecore.c:3097
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "آسف، وصل عدد المكالمات الآنية إلى حده الأقصى"
 
-#: ../coreapi/linphonecore.c:3240
+#: ../coreapi/linphonecore.c:3256
 msgid "is contacting you"
 msgstr "يتصل بك"
 
-#: ../coreapi/linphonecore.c:3241
+#: ../coreapi/linphonecore.c:3257
 msgid " and asked autoanswer."
 msgstr "ويطلب ردا تلقائيا."
 
-#: ../coreapi/linphonecore.c:3359
+#: ../coreapi/linphonecore.c:3375
 msgid "Modifying call parameters..."
 msgstr "يجري تعديل إعدادات المكالمة..."
 
-#: ../coreapi/linphonecore.c:3707
+#: ../coreapi/linphonecore.c:3723
 msgid "Connected."
 msgstr "متصل."
 
-#: ../coreapi/linphonecore.c:3732
+#: ../coreapi/linphonecore.c:3748
 msgid "Call aborted"
 msgstr "أُلغيت المكالمة"
 
-#: ../coreapi/linphonecore.c:3922
+#: ../coreapi/linphonecore.c:3938
 msgid "Could not pause the call"
 msgstr "لم يتمكن من توقيف المكالمة مؤقتا"
 
-#: ../coreapi/linphonecore.c:3926
+#: ../coreapi/linphonecore.c:3941
 msgid "Pausing the current call..."
 msgstr "وضع المكالمة قيد الانتظار..."
 
@@ -1847,14 +1859,14 @@ msgstr "في عطلة"
 msgid "Unknown status"
 msgstr "حالة مجهولة"
 
-#: ../coreapi/proxy.c:319
+#: ../coreapi/proxy.c:327
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
 msgstr ""
 "عنوان SIP الذي أدخلت غير صالح، يجب أن يبدأ ب \"sip:\" متبوعا بإسم النطاق."
 
-#: ../coreapi/proxy.c:325
+#: ../coreapi/proxy.c:333
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
@@ -1862,7 +1874,7 @@ msgstr ""
 "هوية SIP التي أدخلت غير صحيحة.\n"
 "يجب أن تشبه هذا النمط sip:username@proxydomain، مثلا sip:alice@example.net"
 
-#: ../coreapi/proxy.c:1377
+#: ../coreapi/proxy.c:1390
 #, c-format
 msgid "Could not login as %s"
 msgstr "تعذر الولوج بالهوية %s"
@@ -1976,12 +1988,12 @@ msgstr "فَشِل التسجيل في %s: %s"
 msgid "Service unavailable, retrying"
 msgstr "خدمة غير متاحة، تجري الإعادة"
 
-#: ../coreapi/linphonecall.c:174
+#: ../coreapi/linphonecall.c:175
 #, c-format
 msgid "Authentication token is %s"
 msgstr "شارة التحقق من الهوية هي %s"
 
-#: ../coreapi/linphonecall.c:3020
+#: ../coreapi/linphonecall.c:3041
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
diff --git a/po/cs.po b/po/cs.po
index 36f3908b2..a4f6b849b 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-03 13:39+0100\n"
-"PO-Revision-Date: 2014-12-04 09:51+0000\n"
+"POT-Creation-Date: 2015-01-06 12:28+0100\n"
+"PO-Revision-Date: 2015-01-06 11:29+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Czech (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/cs/)\n"
@@ -98,31 +98,31 @@ msgstr "Nelze najít soubor s obrázkem: %s"
 msgid "Invalid sip contact !"
 msgstr "Neplatný sipový kontakt!"
 
-#: ../gtk/main.c:107
+#: ../gtk/main.c:109
 msgid "log to stdout some debug information while running."
 msgstr "Za běhu vypisuje některé ladicí informace na standardní výstup."
 
-#: ../gtk/main.c:114
+#: ../gtk/main.c:116
 msgid "path to a file to write logs into."
 msgstr "Soubor, kam zapisovat protokol."
 
-#: ../gtk/main.c:121
+#: ../gtk/main.c:123
 msgid "Start linphone with video disabled."
 msgstr "Spustí linphone se zakázaným obrazem."
 
-#: ../gtk/main.c:128
+#: ../gtk/main.c:130
 msgid "Start only in the system tray, do not show the main interface."
 msgstr "Spustí se pouze do systémové oblasti, nezobrazí hlavní okno."
 
-#: ../gtk/main.c:135
+#: ../gtk/main.c:137
 msgid "address to call right now"
 msgstr "Zavolá právě teď na tuto adresu"
 
-#: ../gtk/main.c:142
+#: ../gtk/main.c:144
 msgid "if set automatically answer incoming calls"
 msgstr "je-li nastaveno, automaticky zvedne příchozí hovor"
 
-#: ../gtk/main.c:149
+#: ../gtk/main.c:151
 msgid ""
 "Specifiy a working directory (should be the base of the installation, eg: c:"
 "\\Program Files\\Linphone)"
@@ -130,15 +130,19 @@ msgstr ""
 "Zadejte pracovní adresář (měl by být základní instalační adresář, například "
 "c:\\Program Files\\Linphone)"
 
-#: ../gtk/main.c:156
+#: ../gtk/main.c:158
 msgid "Configuration file"
 msgstr ""
 
-#: ../gtk/main.c:163
+#: ../gtk/main.c:165
 msgid "Run the audio assistant"
 msgstr ""
 
-#: ../gtk/main.c:1085
+#: ../gtk/main.c:172
+msgid "Run self test and exit 0 if succeed"
+msgstr ""
+
+#: ../gtk/main.c:1083
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
@@ -151,66 +155,66 @@ msgstr ""
 "do svého adresáře?\n"
 "Odpovíte-li ne, tato osobo bude dočasně blokována."
 
-#: ../gtk/main.c:1162
+#: ../gtk/main.c:1160
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
 msgstr ""
 
-#: ../gtk/main.c:1283
+#: ../gtk/main.c:1281
 msgid "Call error"
 msgstr "Chyba hovoru"
 
-#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3751
+#: ../gtk/main.c:1284 ../coreapi/linphonecore.c:3767
 msgid "Call ended"
 msgstr "Hovor ukončen"
 
-#: ../gtk/main.c:1289 ../coreapi/call_log.c:221
+#: ../gtk/main.c:1287 ../coreapi/call_log.c:221
 msgid "Incoming call"
 msgstr "Příchozí hovor"
 
-#: ../gtk/main.c:1291 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
+#: ../gtk/main.c:1289 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
 msgid "Answer"
 msgstr "Odpovědět"
 
-#: ../gtk/main.c:1293 ../gtk/main.ui.h:6
+#: ../gtk/main.c:1291 ../gtk/main.ui.h:6
 msgid "Decline"
 msgstr "Odmítnout"
 
-#: ../gtk/main.c:1299
+#: ../gtk/main.c:1297
 msgid "Call paused"
 msgstr "Hovor odložen"
 
-#: ../gtk/main.c:1299
+#: ../gtk/main.c:1297
 #, c-format
 msgid "<b>by %s</b>"
 msgstr "<b>kým: %s</b>"
 
-#: ../gtk/main.c:1366
+#: ../gtk/main.c:1367
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr "%s navrhuje začít videohovor. Přijímáte?"
 
-#: ../gtk/main.c:1528
+#: ../gtk/main.c:1529
 msgid "Website link"
 msgstr "Odkaz na webovou stránku"
 
-#: ../gtk/main.c:1577
+#: ../gtk/main.c:1578
 msgid "Linphone - a video internet phone"
 msgstr "Lipnhone – internetový videofon"
 
-#: ../gtk/main.c:1669
+#: ../gtk/main.c:1670
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (Výchozí)"
 
-#: ../gtk/main.c:2006 ../coreapi/callbacks.c:986
+#: ../gtk/main.c:2002 ../coreapi/callbacks.c:986
 #, c-format
 msgid "We are transferred to %s"
 msgstr "Byly jsme přepojeni na %s"
 
-#: ../gtk/main.c:2016
+#: ../gtk/main.c:2012
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
@@ -218,7 +222,7 @@ msgstr ""
 "Na tomto počítači nebyla objevena žádná zvuková karta.\n"
 "Nebudete moci vytáčet a přijímat a zvukové hovory."
 
-#: ../gtk/main.c:2157
+#: ../gtk/main.c:2156
 msgid "A free SIP video-phone"
 msgstr "Volný SIP videofon"
 
@@ -287,7 +291,7 @@ msgstr "Parametry"
 msgid "Enabled"
 msgstr "Povoleno"
 
-#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763
+#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763 ../gtk/parameters.ui.h:20
 msgid "Disabled"
 msgstr "Zakázáno"
 
@@ -451,7 +455,7 @@ msgstr ""
 msgid "Enter your linphone.org username"
 msgstr "Zadejte uživatelské jméno na linphone.org"
 
-#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:79 ../gtk/ldap.ui.h:4
+#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:82 ../gtk/ldap.ui.h:4
 msgid "Username:"
 msgstr "Uživatelské jméno:"
 
@@ -643,7 +647,7 @@ msgstr ""
 msgid "%.3f seconds"
 msgstr "%.3f sekund"
 
-#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12 ../gtk/videowindow.c:232
+#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12 ../gtk/videowindow.c:235
 msgid "Hang up"
 msgstr "Zavěsit"
 
@@ -1227,210 +1231,218 @@ msgid "<b>Transport</b>"
 msgstr "<b>Přenos</b>"
 
 #: ../gtk/parameters.ui.h:19
-msgid "Media encryption type"
-msgstr "Druh šifrování médií"
-
-#: ../gtk/parameters.ui.h:20
-msgid "Video RTP/UDP:"
-msgstr "Obrazový RTP/UDP:"
-
-#: ../gtk/parameters.ui.h:21
-msgid "Audio RTP/UDP:"
-msgstr "Zvukový RTP/UDP:"
-
-#: ../gtk/parameters.ui.h:22
-msgid "Fixed"
-msgstr "Stálý"
-
-#: ../gtk/parameters.ui.h:23
-msgid "Media encryption is mandatory"
-msgstr "Šifrování médií je povinné"
-
-#: ../gtk/parameters.ui.h:24
-msgid "Tunnel"
-msgstr "Tunel"
-
-#: ../gtk/parameters.ui.h:25
-msgid "DSCP fields"
-msgstr "Položky DSCP"
-
-#: ../gtk/parameters.ui.h:26
-msgid "SIP/TCP port"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:27
 msgid "SIP/UDP port"
 msgstr ""
 
+#: ../gtk/parameters.ui.h:21
+msgid "Random"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:22
+msgid "SIP/TCP port"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:23
+msgid "Audio RTP/UDP:"
+msgstr "Zvukový RTP/UDP:"
+
+#: ../gtk/parameters.ui.h:24
+msgid "Fixed"
+msgstr "Stálý"
+
+#: ../gtk/parameters.ui.h:25
+msgid "Video RTP/UDP:"
+msgstr "Obrazový RTP/UDP:"
+
+#: ../gtk/parameters.ui.h:26
+msgid "Media encryption type"
+msgstr "Druh šifrování médií"
+
+#: ../gtk/parameters.ui.h:27
+msgid "Media encryption is mandatory"
+msgstr "Šifrování médií je povinné"
+
 #: ../gtk/parameters.ui.h:28
+msgid "Tunnel"
+msgstr "Tunel"
+
+#: ../gtk/parameters.ui.h:29
+msgid "DSCP fields"
+msgstr "Položky DSCP"
+
+#: ../gtk/parameters.ui.h:30
 msgid "<b>Network protocol and ports</b>"
 msgstr "<b>Síťové protokoly a porty</b>"
 
-#: ../gtk/parameters.ui.h:29
+#: ../gtk/parameters.ui.h:31
 msgid "Direct connection to the Internet"
 msgstr "Přímé připojení do Internetu"
 
-#: ../gtk/parameters.ui.h:30
+#: ../gtk/parameters.ui.h:32
 msgid "Behind NAT / Firewall (specify gateway IP )"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:31
+#: ../gtk/parameters.ui.h:33
 msgid "Behind NAT / Firewall (use STUN to resolve)"
 msgstr "Za NAT/firewallem (adresu určí STUN)"
 
-#: ../gtk/parameters.ui.h:32
+#: ../gtk/parameters.ui.h:34
 msgid "Behind NAT / Firewall (use ICE)"
 msgstr "Za NAT/firewallem (adresu určí ICE)"
 
-#: ../gtk/parameters.ui.h:33
+#: ../gtk/parameters.ui.h:35
 msgid "Behind NAT / Firewall (use uPnP)"
 msgstr "Za NAT/firewallem (adresu určí UPnP)"
 
-#: ../gtk/parameters.ui.h:34
+#: ../gtk/parameters.ui.h:36
 msgid "Public IP address:"
 msgstr "Veřejná IP adresa:"
 
-#: ../gtk/parameters.ui.h:35
+#: ../gtk/parameters.ui.h:37
 msgid "Stun server:"
 msgstr "STUN server:"
 
-#: ../gtk/parameters.ui.h:36
+#: ../gtk/parameters.ui.h:38
 msgid "<b>NAT and Firewall</b>"
 msgstr "<b>NAT a firewall</b>"
 
-#: ../gtk/parameters.ui.h:37
+#: ../gtk/parameters.ui.h:39
 msgid "Network settings"
 msgstr "Nastavení sítě"
 
-#: ../gtk/parameters.ui.h:38
+#: ../gtk/parameters.ui.h:40
 msgid "Ring sound:"
 msgstr "Vyzvánění:"
 
-#: ../gtk/parameters.ui.h:39
+#: ../gtk/parameters.ui.h:41
 msgid "ALSA special device (optional):"
 msgstr "Zvláštní ALSA zařízení (volitelné):"
 
-#: ../gtk/parameters.ui.h:40
+#: ../gtk/parameters.ui.h:42
 msgid "Capture device:"
 msgstr "Zařízení pro nahrávání:"
 
-#: ../gtk/parameters.ui.h:41
+#: ../gtk/parameters.ui.h:43
 msgid "Ring device:"
 msgstr "Zařízení pro vyzvánění:"
 
-#: ../gtk/parameters.ui.h:42
+#: ../gtk/parameters.ui.h:44
 msgid "Playback device:"
 msgstr "Zařízení pro přehrávání:"
 
-#: ../gtk/parameters.ui.h:43
+#: ../gtk/parameters.ui.h:45
 msgid "Enable echo cancellation"
 msgstr "Zapnout potlačení ozvěny"
 
-#: ../gtk/parameters.ui.h:44
+#: ../gtk/parameters.ui.h:46
 msgid "<b>Audio</b>"
 msgstr "<b>Zvuk</b>"
 
-#: ../gtk/parameters.ui.h:45
+#: ../gtk/parameters.ui.h:47
 msgid "Video input device:"
 msgstr "Vstupní zařízení obrazu:"
 
-#: ../gtk/parameters.ui.h:46
+#: ../gtk/parameters.ui.h:48
 msgid "Prefered video resolution:"
 msgstr "Upřednostňované rozlišení obrazu:"
 
-#: ../gtk/parameters.ui.h:47
+#: ../gtk/parameters.ui.h:49
 msgid "Video output method:"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:48
+#: ../gtk/parameters.ui.h:50
+msgid "Show camera preview"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:51
 msgid "<b>Video</b>"
 msgstr "<b>Obraz</b>"
 
-#: ../gtk/parameters.ui.h:49
+#: ../gtk/parameters.ui.h:52
 msgid "Multimedia settings"
 msgstr "Nastavení multimédií"
 
-#: ../gtk/parameters.ui.h:50
+#: ../gtk/parameters.ui.h:53
 msgid "This section defines your SIP address when not using a SIP account"
 msgstr "Tento oddíl určuje vaši SIP adresu, když se nepoužívá žádný účet"
 
-#: ../gtk/parameters.ui.h:51
+#: ../gtk/parameters.ui.h:54
 msgid "Your display name (eg: John Doe):"
 msgstr "Vaše zobrazované jméno (např. Jan Novák):"
 
-#: ../gtk/parameters.ui.h:52
+#: ../gtk/parameters.ui.h:55
 msgid "Your username:"
 msgstr "Vaše uživatelské jméno:"
 
-#: ../gtk/parameters.ui.h:53
+#: ../gtk/parameters.ui.h:56
 msgid "Your resulting SIP address:"
 msgstr "Vaše výsledná SIP adresa:"
 
-#: ../gtk/parameters.ui.h:54
+#: ../gtk/parameters.ui.h:57
 msgid "<b>Default identity</b>"
 msgstr "<b>Implicitní totožnost</b>"
 
-#: ../gtk/parameters.ui.h:55
+#: ../gtk/parameters.ui.h:58
 msgid "Wizard"
 msgstr "Průvodce"
 
-#: ../gtk/parameters.ui.h:56
+#: ../gtk/parameters.ui.h:59
 msgid "Add"
 msgstr "Přidat"
 
-#: ../gtk/parameters.ui.h:57
+#: ../gtk/parameters.ui.h:60
 msgid "Edit"
 msgstr "Upravit"
 
-#: ../gtk/parameters.ui.h:58
+#: ../gtk/parameters.ui.h:61
 msgid "Remove"
 msgstr "Odstranit"
 
-#: ../gtk/parameters.ui.h:59
+#: ../gtk/parameters.ui.h:62
 msgid "<b>Proxy accounts</b>"
 msgstr "<b>Proxy účty</b>"
 
-#: ../gtk/parameters.ui.h:60
+#: ../gtk/parameters.ui.h:63
 msgid "Erase all passwords"
 msgstr "Vymazat všechna hesla"
 
-#: ../gtk/parameters.ui.h:61
+#: ../gtk/parameters.ui.h:64
 msgid "<b>Privacy</b>"
 msgstr "<b>Soukromí</b>"
 
-#: ../gtk/parameters.ui.h:62
+#: ../gtk/parameters.ui.h:65
 msgid "Manage SIP Accounts"
 msgstr "Nastavení SIP účtů"
 
-#: ../gtk/parameters.ui.h:63 ../gtk/tunnel_config.ui.h:4
+#: ../gtk/parameters.ui.h:66 ../gtk/tunnel_config.ui.h:4
 msgid "Enable"
 msgstr "Povolit"
 
-#: ../gtk/parameters.ui.h:64 ../gtk/tunnel_config.ui.h:5
+#: ../gtk/parameters.ui.h:67 ../gtk/tunnel_config.ui.h:5
 msgid "Disable"
 msgstr "Zakázat"
 
-#: ../gtk/parameters.ui.h:65
+#: ../gtk/parameters.ui.h:68
 msgid "<b>Codecs</b>"
 msgstr "<b>Kodeky</b>"
 
-#: ../gtk/parameters.ui.h:66
+#: ../gtk/parameters.ui.h:69
 msgid "0 stands for \"unlimited\""
 msgstr "0 znamená „neomezeno“"
 
-#: ../gtk/parameters.ui.h:67
+#: ../gtk/parameters.ui.h:70
 msgid "Upload speed limit in Kbit/sec:"
 msgstr "Omezení odchozí rychlosti (kb/s):"
 
-#: ../gtk/parameters.ui.h:68
+#: ../gtk/parameters.ui.h:71
 msgid "Download speed limit in Kbit/sec:"
 msgstr "Omezení příchozí rychlosti (kb/s):"
 
-#: ../gtk/parameters.ui.h:69
+#: ../gtk/parameters.ui.h:72
 msgid "Enable adaptive rate control"
 msgstr "Zapnout přizpůsobující se řízení rychlosti"
 
-#: ../gtk/parameters.ui.h:70
+#: ../gtk/parameters.ui.h:73
 msgid ""
 "<i>Adaptive rate control is a technique to dynamically guess the available "
 "bandwidth during a call.</i>"
@@ -1438,47 +1450,47 @@ msgstr ""
 "<i>Přizpůsobující se řízení rychlosti je technika dynamického odhadu "
 "dostupného pásma během hovoru.</i>"
 
-#: ../gtk/parameters.ui.h:71
+#: ../gtk/parameters.ui.h:74
 msgid "<b>Bandwidth control</b>"
 msgstr "<b>Využití šířky pásma</b>"
 
-#: ../gtk/parameters.ui.h:72
+#: ../gtk/parameters.ui.h:75
 msgid "Codecs"
 msgstr "Kodeky"
 
-#: ../gtk/parameters.ui.h:73
+#: ../gtk/parameters.ui.h:76
 msgid "<b>Language</b>"
 msgstr "<b>Jazyk</b>"
 
-#: ../gtk/parameters.ui.h:74
+#: ../gtk/parameters.ui.h:77
 msgid "Show advanced settings"
 msgstr "Zobrazit podrobnější nastavení"
 
-#: ../gtk/parameters.ui.h:75
+#: ../gtk/parameters.ui.h:78
 msgid "<b>Level</b>"
 msgstr "<b>Úroveň</b>"
 
-#: ../gtk/parameters.ui.h:76
+#: ../gtk/parameters.ui.h:79
 msgid "User interface"
 msgstr "Uživatelské rozhraní"
 
-#: ../gtk/parameters.ui.h:77 ../gtk/ldap.ui.h:2
+#: ../gtk/parameters.ui.h:80 ../gtk/ldap.ui.h:2
 msgid "Server address:"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:78 ../gtk/ldap.ui.h:3
+#: ../gtk/parameters.ui.h:81 ../gtk/ldap.ui.h:3
 msgid "Authentication method:"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:80
+#: ../gtk/parameters.ui.h:83
 msgid "<b>LDAP Account setup</b>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:81
+#: ../gtk/parameters.ui.h:84
 msgid "LDAP"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:82
+#: ../gtk/parameters.ui.h:85
 msgid "Done"
 msgstr "Hotovo"
 
@@ -1704,56 +1716,56 @@ msgstr ""
 msgid "Ready"
 msgstr "Připraven."
 
-#: ../coreapi/linphonecore.c:2473
+#: ../coreapi/linphonecore.c:2489
 msgid "Configuring"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2638
+#: ../coreapi/linphonecore.c:2654
 msgid "Looking for telephone number destination..."
 msgstr "Vyhledává se umístění čísla…"
 
-#: ../coreapi/linphonecore.c:2640
+#: ../coreapi/linphonecore.c:2656
 msgid "Could not resolve this number."
 msgstr "Toto číslo nelze vyhledat."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2926
+#: ../coreapi/linphonecore.c:2942
 msgid "Contacting"
 msgstr "Navazuje se spojení"
 
-#: ../coreapi/linphonecore.c:2931
+#: ../coreapi/linphonecore.c:2947
 msgid "Could not call"
 msgstr "Nelze volat"
 
-#: ../coreapi/linphonecore.c:3081
+#: ../coreapi/linphonecore.c:3097
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "Je nám líto, ale byl dosažen maximální počet současných hovorů."
 
-#: ../coreapi/linphonecore.c:3240
+#: ../coreapi/linphonecore.c:3256
 msgid "is contacting you"
 msgstr "vás volá"
 
-#: ../coreapi/linphonecore.c:3241
+#: ../coreapi/linphonecore.c:3257
 msgid " and asked autoanswer."
 msgstr " a požaduje automatickou zvednutí."
 
-#: ../coreapi/linphonecore.c:3359
+#: ../coreapi/linphonecore.c:3375
 msgid "Modifying call parameters..."
 msgstr "Upravují se parametry hovoru…"
 
-#: ../coreapi/linphonecore.c:3707
+#: ../coreapi/linphonecore.c:3723
 msgid "Connected."
 msgstr "Připojeno."
 
-#: ../coreapi/linphonecore.c:3732
+#: ../coreapi/linphonecore.c:3748
 msgid "Call aborted"
 msgstr "Hovor přerušen"
 
-#: ../coreapi/linphonecore.c:3922
+#: ../coreapi/linphonecore.c:3938
 msgid "Could not pause the call"
 msgstr "Hovor nebylo možné odložit"
 
-#: ../coreapi/linphonecore.c:3926
+#: ../coreapi/linphonecore.c:3941
 msgid "Pausing the current call..."
 msgstr "Současný hovor se odkládá…"
 
@@ -1817,7 +1829,7 @@ msgstr ""
 msgid "Unknown status"
 msgstr ""
 
-#: ../coreapi/proxy.c:319
+#: ../coreapi/proxy.c:327
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
@@ -1825,7 +1837,7 @@ msgstr ""
 "Adresa SIP proxy, kterou jste zadali, není platná. Musí začínat na „sip:“ a "
 "pak musí následovat jméno stroje."
 
-#: ../coreapi/proxy.c:325
+#: ../coreapi/proxy.c:333
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
@@ -1833,7 +1845,7 @@ msgstr ""
 "SIP identita, kterou jste zadali, není platná.\n"
 "Měla by mít tvar sip:uživatel@proxydoména, například sip:alice@example.net"
 
-#: ../coreapi/proxy.c:1377
+#: ../coreapi/proxy.c:1390
 #, c-format
 msgid "Could not login as %s"
 msgstr "Nelze se přihlásit jako %s"
@@ -1947,12 +1959,12 @@ msgstr "Registrace na %s selhala: %s"
 msgid "Service unavailable, retrying"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:174
+#: ../coreapi/linphonecall.c:175
 #, c-format
 msgid "Authentication token is %s"
 msgstr "Klíč k ověření totožnosti je %s"
 
-#: ../coreapi/linphonecall.c:3020
+#: ../coreapi/linphonecall.c:3041
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
diff --git a/po/de.po b/po/de.po
index 722a39390..613593329 100644
--- a/po/de.po
+++ b/po/de.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-03 13:39+0100\n"
-"PO-Revision-Date: 2014-12-04 09:51+0000\n"
+"POT-Creation-Date: 2015-01-06 12:28+0100\n"
+"PO-Revision-Date: 2015-01-06 11:29+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/de/)\n"
@@ -98,33 +98,33 @@ msgstr "Pixmapdatei %s kann nicht gefunden werden."
 msgid "Invalid sip contact !"
 msgstr "Ungültiger SIP-Kontakt!"
 
-#: ../gtk/main.c:107
+#: ../gtk/main.c:109
 msgid "log to stdout some debug information while running."
 msgstr "Ausgabe von Debug-Informationen auf stdout während der Laufzeit"
 
-#: ../gtk/main.c:114
+#: ../gtk/main.c:116
 msgid "path to a file to write logs into."
 msgstr "Pfad zu einer Datei, in die Protokolle geschrieben werden."
 
-#: ../gtk/main.c:121
+#: ../gtk/main.c:123
 msgid "Start linphone with video disabled."
 msgstr "Linphone mit ausgeschaltetem Video starten."
 
-#: ../gtk/main.c:128
+#: ../gtk/main.c:130
 msgid "Start only in the system tray, do not show the main interface."
 msgstr ""
 "Nur im Systemabschnitt der Kontrollleiste starten, aber das Hauptfenster "
 "nicht zeigen."
 
-#: ../gtk/main.c:135
+#: ../gtk/main.c:137
 msgid "address to call right now"
 msgstr "Im Moment anzurufende Adresse"
 
-#: ../gtk/main.c:142
+#: ../gtk/main.c:144
 msgid "if set automatically answer incoming calls"
 msgstr "Falls aktiviert, werden eingehende Anrufe automatisch beantwortet"
 
-#: ../gtk/main.c:149
+#: ../gtk/main.c:151
 msgid ""
 "Specifiy a working directory (should be the base of the installation, eg: c:"
 "\\Program Files\\Linphone)"
@@ -132,15 +132,19 @@ msgstr ""
 "Geben Sie einen Arbeitsordner an (sollte der Installationsordner sein, z. B. "
 "C:\\Programme\\Linphone)"
 
-#: ../gtk/main.c:156
+#: ../gtk/main.c:158
 msgid "Configuration file"
 msgstr "Konfigurationsdatei"
 
-#: ../gtk/main.c:163
+#: ../gtk/main.c:165
 msgid "Run the audio assistant"
 msgstr "Starte den Audio-Assistent"
 
-#: ../gtk/main.c:1085
+#: ../gtk/main.c:172
+msgid "Run self test and exit 0 if succeed"
+msgstr ""
+
+#: ../gtk/main.c:1083
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
@@ -153,7 +157,7 @@ msgstr ""
 "Ihrer Kontaktliste hinzufügen?\n"
 "Wenn Sie mit Nein antworten, wird diese Person vorläufig blockiert."
 
-#: ../gtk/main.c:1162
+#: ../gtk/main.c:1160
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
@@ -162,59 +166,59 @@ msgstr ""
 "Bitte geben Sie Ihr Passwort für den Benutzernamen <i>%s</i>\n"
 " für  Bereich <i>%s</i> ein:"
 
-#: ../gtk/main.c:1283
+#: ../gtk/main.c:1281
 msgid "Call error"
 msgstr "Anruf fehlgeschlagen"
 
-#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3751
+#: ../gtk/main.c:1284 ../coreapi/linphonecore.c:3767
 msgid "Call ended"
 msgstr "Anruf beendet"
 
-#: ../gtk/main.c:1289 ../coreapi/call_log.c:221
+#: ../gtk/main.c:1287 ../coreapi/call_log.c:221
 msgid "Incoming call"
 msgstr "Eingehender Anruf"
 
-#: ../gtk/main.c:1291 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
+#: ../gtk/main.c:1289 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
 msgid "Answer"
 msgstr "Annehmen"
 
-#: ../gtk/main.c:1293 ../gtk/main.ui.h:6
+#: ../gtk/main.c:1291 ../gtk/main.ui.h:6
 msgid "Decline"
 msgstr "Abweisen"
 
-#: ../gtk/main.c:1299
+#: ../gtk/main.c:1297
 msgid "Call paused"
 msgstr "Anruf wird gehalten"
 
-#: ../gtk/main.c:1299
+#: ../gtk/main.c:1297
 #, c-format
 msgid "<b>by %s</b>"
 msgstr "<b>von %s</b>"
 
-#: ../gtk/main.c:1366
+#: ../gtk/main.c:1367
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr "%s schlägt vor, eine Videoübertragung zu starten. Nehmen Sie an?"
 
-#: ../gtk/main.c:1528
+#: ../gtk/main.c:1529
 msgid "Website link"
 msgstr "Website-Verknüpfung"
 
-#: ../gtk/main.c:1577
+#: ../gtk/main.c:1578
 msgid "Linphone - a video internet phone"
 msgstr "Linphone - ein Internet-Video-Telefon"
 
-#: ../gtk/main.c:1669
+#: ../gtk/main.c:1670
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (Vorgabe)"
 
-#: ../gtk/main.c:2006 ../coreapi/callbacks.c:986
+#: ../gtk/main.c:2002 ../coreapi/callbacks.c:986
 #, c-format
 msgid "We are transferred to %s"
 msgstr "Vermittlung nach %s"
 
-#: ../gtk/main.c:2016
+#: ../gtk/main.c:2012
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
@@ -222,7 +226,7 @@ msgstr ""
 "Auf diesem Rechner können keine Soundkarten gefunden werden.\n"
 "Sie können keine Audio-Anrufe tätigen oder entgegennehmen."
 
-#: ../gtk/main.c:2157
+#: ../gtk/main.c:2156
 msgid "A free SIP video-phone"
 msgstr "Ein freies SIP-Video-Telefon"
 
@@ -291,7 +295,7 @@ msgstr "Parameter"
 msgid "Enabled"
 msgstr "Freigegeben"
 
-#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763
+#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763 ../gtk/parameters.ui.h:20
 msgid "Disabled"
 msgstr "Gesperrt"
 
@@ -459,7 +463,7 @@ msgstr "Ich möchte eine URI zur Fernkonfiguration angeben"
 msgid "Enter your linphone.org username"
 msgstr "Geben Sie Ihren Benutzernamen bei linphone.org ein."
 
-#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:79 ../gtk/ldap.ui.h:4
+#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:82 ../gtk/ldap.ui.h:4
 msgid "Username:"
 msgstr "Benutzername:"
 
@@ -652,7 +656,7 @@ msgstr "%ix%i @ %f bps"
 msgid "%.3f seconds"
 msgstr "%.3f Sekunden"
 
-#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12 ../gtk/videowindow.c:232
+#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12 ../gtk/videowindow.c:235
 msgid "Hang up"
 msgstr "Auflegen"
 
@@ -1253,212 +1257,220 @@ msgid "<b>Transport</b>"
 msgstr "<b>Übertragung</b>"
 
 #: ../gtk/parameters.ui.h:19
-msgid "Media encryption type"
-msgstr "Verschlüsselungstyp der Medien"
-
-#: ../gtk/parameters.ui.h:20
-msgid "Video RTP/UDP:"
-msgstr "Video RTP/UDP:"
-
-#: ../gtk/parameters.ui.h:21
-msgid "Audio RTP/UDP:"
-msgstr "Audio RTP/UDP:"
-
-#: ../gtk/parameters.ui.h:22
-msgid "Fixed"
-msgstr "Fest"
-
-#: ../gtk/parameters.ui.h:23
-msgid "Media encryption is mandatory"
-msgstr "Medienverschlüsselung erzwingen"
-
-#: ../gtk/parameters.ui.h:24
-msgid "Tunnel"
-msgstr "Tunnel"
-
-#: ../gtk/parameters.ui.h:25
-msgid "DSCP fields"
-msgstr "DSCP-Felder"
-
-#: ../gtk/parameters.ui.h:26
-msgid "SIP/TCP port"
-msgstr "SIP/TCP Port"
-
-#: ../gtk/parameters.ui.h:27
 msgid "SIP/UDP port"
 msgstr "SIP/UDP Port"
 
+#: ../gtk/parameters.ui.h:21
+msgid "Random"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:22
+msgid "SIP/TCP port"
+msgstr "SIP/TCP Port"
+
+#: ../gtk/parameters.ui.h:23
+msgid "Audio RTP/UDP:"
+msgstr "Audio RTP/UDP:"
+
+#: ../gtk/parameters.ui.h:24
+msgid "Fixed"
+msgstr "Fest"
+
+#: ../gtk/parameters.ui.h:25
+msgid "Video RTP/UDP:"
+msgstr "Video RTP/UDP:"
+
+#: ../gtk/parameters.ui.h:26
+msgid "Media encryption type"
+msgstr "Verschlüsselungstyp der Medien"
+
+#: ../gtk/parameters.ui.h:27
+msgid "Media encryption is mandatory"
+msgstr "Medienverschlüsselung erzwingen"
+
 #: ../gtk/parameters.ui.h:28
+msgid "Tunnel"
+msgstr "Tunnel"
+
+#: ../gtk/parameters.ui.h:29
+msgid "DSCP fields"
+msgstr "DSCP-Felder"
+
+#: ../gtk/parameters.ui.h:30
 msgid "<b>Network protocol and ports</b>"
 msgstr "<b>Netzwerkprotokoll und Ports</b>"
 
-#: ../gtk/parameters.ui.h:29
+#: ../gtk/parameters.ui.h:31
 msgid "Direct connection to the Internet"
 msgstr "Direkte Verbindung ins Internet"
 
-#: ../gtk/parameters.ui.h:30
+#: ../gtk/parameters.ui.h:32
 msgid "Behind NAT / Firewall (specify gateway IP )"
 msgstr "Hinter NAT / Firewall (Gateway IP angeben)"
 
-#: ../gtk/parameters.ui.h:31
+#: ../gtk/parameters.ui.h:33
 msgid "Behind NAT / Firewall (use STUN to resolve)"
 msgstr "Hinter NAT / Firewall (STUN verwenden)"
 
-#: ../gtk/parameters.ui.h:32
+#: ../gtk/parameters.ui.h:34
 msgid "Behind NAT / Firewall (use ICE)"
 msgstr "Hinter NAT / Firewall (ICE verwenden)"
 
-#: ../gtk/parameters.ui.h:33
+#: ../gtk/parameters.ui.h:35
 msgid "Behind NAT / Firewall (use uPnP)"
 msgstr "Hinter NAT / Firewall (uPnP verwenden)"
 
-#: ../gtk/parameters.ui.h:34
+#: ../gtk/parameters.ui.h:36
 msgid "Public IP address:"
 msgstr "Öffentliche IP-Adresse:"
 
-#: ../gtk/parameters.ui.h:35
+#: ../gtk/parameters.ui.h:37
 msgid "Stun server:"
 msgstr "STUN-Server:"
 
-#: ../gtk/parameters.ui.h:36
+#: ../gtk/parameters.ui.h:38
 msgid "<b>NAT and Firewall</b>"
 msgstr "<b>NAT und Firewall</b>"
 
-#: ../gtk/parameters.ui.h:37
+#: ../gtk/parameters.ui.h:39
 msgid "Network settings"
 msgstr "Netzwerkeinstellungen"
 
-#: ../gtk/parameters.ui.h:38
+#: ../gtk/parameters.ui.h:40
 msgid "Ring sound:"
 msgstr "Klingelton:"
 
-#: ../gtk/parameters.ui.h:39
+#: ../gtk/parameters.ui.h:41
 msgid "ALSA special device (optional):"
 msgstr "Spezielles ALSA-Gerät (optional):"
 
-#: ../gtk/parameters.ui.h:40
+#: ../gtk/parameters.ui.h:42
 msgid "Capture device:"
 msgstr "Aufnahmegerät:"
 
-#: ../gtk/parameters.ui.h:41
+#: ../gtk/parameters.ui.h:43
 msgid "Ring device:"
 msgstr "Gerät für Klingelton:"
 
-#: ../gtk/parameters.ui.h:42
+#: ../gtk/parameters.ui.h:44
 msgid "Playback device:"
 msgstr "Wiedergabegerät:"
 
-#: ../gtk/parameters.ui.h:43
+#: ../gtk/parameters.ui.h:45
 msgid "Enable echo cancellation"
 msgstr "Echounterdrückung ein"
 
-#: ../gtk/parameters.ui.h:44
+#: ../gtk/parameters.ui.h:46
 msgid "<b>Audio</b>"
 msgstr "<b>Audio</b>"
 
-#: ../gtk/parameters.ui.h:45
+#: ../gtk/parameters.ui.h:47
 msgid "Video input device:"
 msgstr "Video-Aufnahmegerät:"
 
-#: ../gtk/parameters.ui.h:46
+#: ../gtk/parameters.ui.h:48
 msgid "Prefered video resolution:"
 msgstr "Bevorzugte Video-Auflösung:"
 
-#: ../gtk/parameters.ui.h:47
+#: ../gtk/parameters.ui.h:49
 msgid "Video output method:"
 msgstr "Methode zur Videoausgabe"
 
-#: ../gtk/parameters.ui.h:48
+#: ../gtk/parameters.ui.h:50
+msgid "Show camera preview"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:51
 msgid "<b>Video</b>"
 msgstr "<b>Video</b>"
 
-#: ../gtk/parameters.ui.h:49
+#: ../gtk/parameters.ui.h:52
 msgid "Multimedia settings"
 msgstr "Multimedia-Einstellungen"
 
-#: ../gtk/parameters.ui.h:50
+#: ../gtk/parameters.ui.h:53
 msgid "This section defines your SIP address when not using a SIP account"
 msgstr ""
 "In diesem Bereich legen Sie Ihre SIP-Adresse fest, wenn Sie kein SIP-Konto "
 "verwenden."
 
-#: ../gtk/parameters.ui.h:51
+#: ../gtk/parameters.ui.h:54
 msgid "Your display name (eg: John Doe):"
 msgstr "Ihr angezeigter Name (z. B. Heinz Müller):"
 
-#: ../gtk/parameters.ui.h:52
+#: ../gtk/parameters.ui.h:55
 msgid "Your username:"
 msgstr "Ihr Benutzername:"
 
-#: ../gtk/parameters.ui.h:53
+#: ../gtk/parameters.ui.h:56
 msgid "Your resulting SIP address:"
 msgstr "Sich ergebende SIP-Adresse:"
 
-#: ../gtk/parameters.ui.h:54
+#: ../gtk/parameters.ui.h:57
 msgid "<b>Default identity</b>"
 msgstr "<b>Standard-Identität</b>"
 
-#: ../gtk/parameters.ui.h:55
+#: ../gtk/parameters.ui.h:58
 msgid "Wizard"
 msgstr "Assistent"
 
-#: ../gtk/parameters.ui.h:56
+#: ../gtk/parameters.ui.h:59
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: ../gtk/parameters.ui.h:57
+#: ../gtk/parameters.ui.h:60
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: ../gtk/parameters.ui.h:58
+#: ../gtk/parameters.ui.h:61
 msgid "Remove"
 msgstr "Entfernen"
 
-#: ../gtk/parameters.ui.h:59
+#: ../gtk/parameters.ui.h:62
 msgid "<b>Proxy accounts</b>"
 msgstr "<b>Proxy-Konten</b>"
 
-#: ../gtk/parameters.ui.h:60
+#: ../gtk/parameters.ui.h:63
 msgid "Erase all passwords"
 msgstr "Alle Passwörter löschen"
 
-#: ../gtk/parameters.ui.h:61
+#: ../gtk/parameters.ui.h:64
 msgid "<b>Privacy</b>"
 msgstr "<b>Privatsphäre</b>"
 
-#: ../gtk/parameters.ui.h:62
+#: ../gtk/parameters.ui.h:65
 msgid "Manage SIP Accounts"
 msgstr "SIP-Konten verwalten"
 
-#: ../gtk/parameters.ui.h:63 ../gtk/tunnel_config.ui.h:4
+#: ../gtk/parameters.ui.h:66 ../gtk/tunnel_config.ui.h:4
 msgid "Enable"
 msgstr "Freigeben"
 
-#: ../gtk/parameters.ui.h:64 ../gtk/tunnel_config.ui.h:5
+#: ../gtk/parameters.ui.h:67 ../gtk/tunnel_config.ui.h:5
 msgid "Disable"
 msgstr "Sperren"
 
-#: ../gtk/parameters.ui.h:65
+#: ../gtk/parameters.ui.h:68
 msgid "<b>Codecs</b>"
 msgstr "<b>Codecs</b>"
 
-#: ../gtk/parameters.ui.h:66
+#: ../gtk/parameters.ui.h:69
 msgid "0 stands for \"unlimited\""
 msgstr "0 bedeutet „unbegrenzt“"
 
-#: ../gtk/parameters.ui.h:67
+#: ../gtk/parameters.ui.h:70
 msgid "Upload speed limit in Kbit/sec:"
 msgstr "Upload-Bandbreite (kbit/sec):"
 
-#: ../gtk/parameters.ui.h:68
+#: ../gtk/parameters.ui.h:71
 msgid "Download speed limit in Kbit/sec:"
 msgstr "Download-Bandbreite (kbit/sec):"
 
-#: ../gtk/parameters.ui.h:69
+#: ../gtk/parameters.ui.h:72
 msgid "Enable adaptive rate control"
 msgstr "Adaptive Ratenregelung ein"
 
-#: ../gtk/parameters.ui.h:70
+#: ../gtk/parameters.ui.h:73
 msgid ""
 "<i>Adaptive rate control is a technique to dynamically guess the available "
 "bandwidth during a call.</i>"
@@ -1466,47 +1478,47 @@ msgstr ""
 "<i>Adaptive Ratenregelung ist eine Technik zur dynamischen Abschätzung der "
 "zur Verfügung stehenden Bandbreite während eines Anrufs.</i>"
 
-#: ../gtk/parameters.ui.h:71
+#: ../gtk/parameters.ui.h:74
 msgid "<b>Bandwidth control</b>"
 msgstr "<b>Bandbreiten-Einstellungen</b>"
 
-#: ../gtk/parameters.ui.h:72
+#: ../gtk/parameters.ui.h:75
 msgid "Codecs"
 msgstr "Codecs"
 
-#: ../gtk/parameters.ui.h:73
+#: ../gtk/parameters.ui.h:76
 msgid "<b>Language</b>"
 msgstr "<b>Sprache</b>"
 
-#: ../gtk/parameters.ui.h:74
+#: ../gtk/parameters.ui.h:77
 msgid "Show advanced settings"
 msgstr "Fortgeschrittene Einstellungen anzeigen"
 
-#: ../gtk/parameters.ui.h:75
+#: ../gtk/parameters.ui.h:78
 msgid "<b>Level</b>"
 msgstr "<b>Detaillierung</b>"
 
-#: ../gtk/parameters.ui.h:76
+#: ../gtk/parameters.ui.h:79
 msgid "User interface"
 msgstr "Benutzeroberfläche"
 
-#: ../gtk/parameters.ui.h:77 ../gtk/ldap.ui.h:2
+#: ../gtk/parameters.ui.h:80 ../gtk/ldap.ui.h:2
 msgid "Server address:"
 msgstr "Server-Adresse"
 
-#: ../gtk/parameters.ui.h:78 ../gtk/ldap.ui.h:3
+#: ../gtk/parameters.ui.h:81 ../gtk/ldap.ui.h:3
 msgid "Authentication method:"
 msgstr "Authentifizierungsmethode"
 
-#: ../gtk/parameters.ui.h:80
+#: ../gtk/parameters.ui.h:83
 msgid "<b>LDAP Account setup</b>"
 msgstr "LDAP-Kontoeinrichtung"
 
-#: ../gtk/parameters.ui.h:81
+#: ../gtk/parameters.ui.h:84
 msgid "LDAP"
 msgstr "LDAP"
 
-#: ../gtk/parameters.ui.h:82
+#: ../gtk/parameters.ui.h:85
 msgid "Done"
 msgstr "Fertig"
 
@@ -1738,56 +1750,56 @@ msgstr ""
 msgid "Ready"
 msgstr "Bereit"
 
-#: ../coreapi/linphonecore.c:2473
+#: ../coreapi/linphonecore.c:2489
 msgid "Configuring"
 msgstr "Einstellen"
 
-#: ../coreapi/linphonecore.c:2638
+#: ../coreapi/linphonecore.c:2654
 msgid "Looking for telephone number destination..."
 msgstr "Telefonnummernziel wird gesucht..."
 
-#: ../coreapi/linphonecore.c:2640
+#: ../coreapi/linphonecore.c:2656
 msgid "Could not resolve this number."
 msgstr "Diese Nummer kann nicht aufgelöst werden."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2926
+#: ../coreapi/linphonecore.c:2942
 msgid "Contacting"
 msgstr "Verbindungsaufbau"
 
-#: ../coreapi/linphonecore.c:2931
+#: ../coreapi/linphonecore.c:2947
 msgid "Could not call"
 msgstr "Anruf kann nicht getätigt werden."
 
-#: ../coreapi/linphonecore.c:3081
+#: ../coreapi/linphonecore.c:3097
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "Die maximale Anzahl der gleichzeitigen Anrufe ist erreicht."
 
-#: ../coreapi/linphonecore.c:3240
+#: ../coreapi/linphonecore.c:3256
 msgid "is contacting you"
 msgstr "ruft Sie an"
 
-#: ../coreapi/linphonecore.c:3241
+#: ../coreapi/linphonecore.c:3257
 msgid " and asked autoanswer."
 msgstr " und fragt nach automatischer Antwort."
 
-#: ../coreapi/linphonecore.c:3359
+#: ../coreapi/linphonecore.c:3375
 msgid "Modifying call parameters..."
 msgstr "Die Anrufparameter werden verändert..."
 
-#: ../coreapi/linphonecore.c:3707
+#: ../coreapi/linphonecore.c:3723
 msgid "Connected."
 msgstr "Verbunden."
 
-#: ../coreapi/linphonecore.c:3732
+#: ../coreapi/linphonecore.c:3748
 msgid "Call aborted"
 msgstr "Anruf abgebrochen"
 
-#: ../coreapi/linphonecore.c:3922
+#: ../coreapi/linphonecore.c:3938
 msgid "Could not pause the call"
 msgstr "Anruf kann nicht gehalten werden"
 
-#: ../coreapi/linphonecore.c:3926
+#: ../coreapi/linphonecore.c:3941
 msgid "Pausing the current call..."
 msgstr "Aktueller Anruf wird gehalten..."
 
@@ -1851,7 +1863,7 @@ msgstr "Urlaub"
 msgid "Unknown status"
 msgstr "Unbekannter Status"
 
-#: ../coreapi/proxy.c:319
+#: ../coreapi/proxy.c:327
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
@@ -1859,7 +1871,7 @@ msgstr ""
 "Die von Ihnen eingegebene SIP-Proxy-Adresse ist ungültig, sie muss mit "
 "„sip:“ gefolgt vom Hostnamen beginnen."
 
-#: ../coreapi/proxy.c:325
+#: ../coreapi/proxy.c:333
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
@@ -1868,7 +1880,7 @@ msgstr ""
 "Sie sollte wie sip:benutzername@proxydomain aussehen, also z.B. sip:"
 "alice@beispiel.net"
 
-#: ../coreapi/proxy.c:1377
+#: ../coreapi/proxy.c:1390
 #, c-format
 msgid "Could not login as %s"
 msgstr "Anmeldung als %s fehlgeschlagen"
@@ -1982,12 +1994,12 @@ msgstr "Registrierung auf %s fehlgeschlagen: %s"
 msgid "Service unavailable, retrying"
 msgstr "Service nicht verfügbar, versuche erneut"
 
-#: ../coreapi/linphonecall.c:174
+#: ../coreapi/linphonecall.c:175
 #, c-format
 msgid "Authentication token is %s"
 msgstr "Authentifizierungs-Token ist %s"
 
-#: ../coreapi/linphonecall.c:3020
+#: ../coreapi/linphonecall.c:3041
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
diff --git a/po/es.po b/po/es.po
index 94034a03e..856cad9c6 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-03 13:39+0100\n"
-"PO-Revision-Date: 2014-12-03 12:39+0000\n"
+"POT-Creation-Date: 2015-01-06 12:28+0100\n"
+"PO-Revision-Date: 2015-01-06 11:29+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/es/)\n"
@@ -92,32 +92,32 @@ msgstr "No se pudo encontrar el archivo pixmap: %s"
 msgid "Invalid sip contact !"
 msgstr "¡Contacto SIP no válido!"
 
-#: ../gtk/main.c:107
+#: ../gtk/main.c:109
 msgid "log to stdout some debug information while running."
 msgstr ""
 "registra a stdout cierta información de depuración durante la ejecución."
 
-#: ../gtk/main.c:114
+#: ../gtk/main.c:116
 msgid "path to a file to write logs into."
 msgstr "ruta a un fichero donde escribir logs."
 
-#: ../gtk/main.c:121
+#: ../gtk/main.c:123
 msgid "Start linphone with video disabled."
 msgstr ""
 
-#: ../gtk/main.c:128
+#: ../gtk/main.c:130
 msgid "Start only in the system tray, do not show the main interface."
 msgstr "Iniciar sólo en la barra de tareas, no mostrar la interfaz principal."
 
-#: ../gtk/main.c:135
+#: ../gtk/main.c:137
 msgid "address to call right now"
 msgstr "dirección a la que llamar inmediatamente"
 
-#: ../gtk/main.c:142
+#: ../gtk/main.c:144
 msgid "if set automatically answer incoming calls"
 msgstr "si está activo, responder a llamadas entrantes automáticamente"
 
-#: ../gtk/main.c:149
+#: ../gtk/main.c:151
 msgid ""
 "Specifiy a working directory (should be the base of the installation, eg: c:"
 "\\Program Files\\Linphone)"
@@ -125,15 +125,19 @@ msgstr ""
 "Especifique un directorio de trabajo (debería ser la raíz de la instalación, "
 "ej: c:\\Archivos de Programa\\Linphone)"
 
-#: ../gtk/main.c:156
+#: ../gtk/main.c:158
 msgid "Configuration file"
 msgstr ""
 
-#: ../gtk/main.c:163
+#: ../gtk/main.c:165
 msgid "Run the audio assistant"
 msgstr ""
 
-#: ../gtk/main.c:1085
+#: ../gtk/main.c:172
+msgid "Run self test and exit 0 if succeed"
+msgstr ""
+
+#: ../gtk/main.c:1083
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
@@ -146,66 +150,66 @@ msgstr ""
 "contactos?\n"
 "Si responde no, esta persona será bloqueada temporalmente."
 
-#: ../gtk/main.c:1162
+#: ../gtk/main.c:1160
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
 msgstr ""
 
-#: ../gtk/main.c:1283
+#: ../gtk/main.c:1281
 msgid "Call error"
 msgstr ""
 
-#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3751
+#: ../gtk/main.c:1284 ../coreapi/linphonecore.c:3767
 msgid "Call ended"
 msgstr ""
 
-#: ../gtk/main.c:1289 ../coreapi/call_log.c:221
+#: ../gtk/main.c:1287 ../coreapi/call_log.c:221
 msgid "Incoming call"
 msgstr "Llamada entrante"
 
-#: ../gtk/main.c:1291 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
+#: ../gtk/main.c:1289 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
 msgid "Answer"
 msgstr "Contestar"
 
-#: ../gtk/main.c:1293 ../gtk/main.ui.h:6
+#: ../gtk/main.c:1291 ../gtk/main.ui.h:6
 msgid "Decline"
 msgstr ""
 
-#: ../gtk/main.c:1299
+#: ../gtk/main.c:1297
 msgid "Call paused"
 msgstr ""
 
-#: ../gtk/main.c:1299
+#: ../gtk/main.c:1297
 #, c-format
 msgid "<b>by %s</b>"
 msgstr ""
 
-#: ../gtk/main.c:1366
+#: ../gtk/main.c:1367
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr ""
 
-#: ../gtk/main.c:1528
+#: ../gtk/main.c:1529
 msgid "Website link"
 msgstr "Enlace a la Web"
 
-#: ../gtk/main.c:1577
+#: ../gtk/main.c:1578
 msgid "Linphone - a video internet phone"
 msgstr "Linphone - un video-teléfono a través de Internet"
 
-#: ../gtk/main.c:1669
+#: ../gtk/main.c:1670
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (Opción predeterminada)"
 
-#: ../gtk/main.c:2006 ../coreapi/callbacks.c:986
+#: ../gtk/main.c:2002 ../coreapi/callbacks.c:986
 #, c-format
 msgid "We are transferred to %s"
 msgstr "Somos transferidos a %s"
 
-#: ../gtk/main.c:2016
+#: ../gtk/main.c:2012
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
@@ -213,7 +217,7 @@ msgstr ""
 "No se ha encontrado una tarjeta de sonido en este equipo.\n"
 "No será posible realizar o recibir llamadas de audio."
 
-#: ../gtk/main.c:2157
+#: ../gtk/main.c:2156
 msgid "A free SIP video-phone"
 msgstr "Un video-teléfono SIP gratuito"
 
@@ -282,7 +286,7 @@ msgstr "Parámetros"
 msgid "Enabled"
 msgstr "Activado"
 
-#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763
+#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763 ../gtk/parameters.ui.h:20
 msgid "Disabled"
 msgstr "Desactivado"
 
@@ -443,7 +447,7 @@ msgstr ""
 msgid "Enter your linphone.org username"
 msgstr ""
 
-#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:79 ../gtk/ldap.ui.h:4
+#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:82 ../gtk/ldap.ui.h:4
 msgid "Username:"
 msgstr ""
 
@@ -627,7 +631,7 @@ msgstr ""
 msgid "%.3f seconds"
 msgstr ""
 
-#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12 ../gtk/videowindow.c:232
+#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12 ../gtk/videowindow.c:235
 msgid "Hang up"
 msgstr ""
 
@@ -1211,210 +1215,218 @@ msgid "<b>Transport</b>"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:19
-msgid "Media encryption type"
-msgstr "Tipo de cifrado de medios"
-
-#: ../gtk/parameters.ui.h:20
-msgid "Video RTP/UDP:"
-msgstr "Vídeo RTP/UDP"
-
-#: ../gtk/parameters.ui.h:21
-msgid "Audio RTP/UDP:"
-msgstr "Audio RTP/UDP:"
-
-#: ../gtk/parameters.ui.h:22
-msgid "Fixed"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:23
-msgid "Media encryption is mandatory"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:24
-msgid "Tunnel"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:25
-msgid "DSCP fields"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:26
-msgid "SIP/TCP port"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:27
 msgid "SIP/UDP port"
 msgstr ""
 
+#: ../gtk/parameters.ui.h:21
+msgid "Random"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:22
+msgid "SIP/TCP port"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:23
+msgid "Audio RTP/UDP:"
+msgstr "Audio RTP/UDP:"
+
+#: ../gtk/parameters.ui.h:24
+msgid "Fixed"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:25
+msgid "Video RTP/UDP:"
+msgstr "Vídeo RTP/UDP"
+
+#: ../gtk/parameters.ui.h:26
+msgid "Media encryption type"
+msgstr "Tipo de cifrado de medios"
+
+#: ../gtk/parameters.ui.h:27
+msgid "Media encryption is mandatory"
+msgstr ""
+
 #: ../gtk/parameters.ui.h:28
+msgid "Tunnel"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:29
+msgid "DSCP fields"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:30
 msgid "<b>Network protocol and ports</b>"
 msgstr "<b>Protocolo de red y puertos</b>"
 
-#: ../gtk/parameters.ui.h:29
+#: ../gtk/parameters.ui.h:31
 msgid "Direct connection to the Internet"
 msgstr "Conexión directa a Internet"
 
-#: ../gtk/parameters.ui.h:30
+#: ../gtk/parameters.ui.h:32
 msgid "Behind NAT / Firewall (specify gateway IP )"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:31
+#: ../gtk/parameters.ui.h:33
 msgid "Behind NAT / Firewall (use STUN to resolve)"
 msgstr "Tras un NAT/Firewall (utilizar STUN para resolver)"
 
-#: ../gtk/parameters.ui.h:32
+#: ../gtk/parameters.ui.h:34
 msgid "Behind NAT / Firewall (use ICE)"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:33
+#: ../gtk/parameters.ui.h:35
 msgid "Behind NAT / Firewall (use uPnP)"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:34
+#: ../gtk/parameters.ui.h:36
 msgid "Public IP address:"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:35
+#: ../gtk/parameters.ui.h:37
 msgid "Stun server:"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:36
+#: ../gtk/parameters.ui.h:38
 msgid "<b>NAT and Firewall</b>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:37
+#: ../gtk/parameters.ui.h:39
 msgid "Network settings"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:38
+#: ../gtk/parameters.ui.h:40
 msgid "Ring sound:"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:39
+#: ../gtk/parameters.ui.h:41
 msgid "ALSA special device (optional):"
 msgstr "Dispositivo especial ALSA (opcional):"
 
-#: ../gtk/parameters.ui.h:40
+#: ../gtk/parameters.ui.h:42
 msgid "Capture device:"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:41
+#: ../gtk/parameters.ui.h:43
 msgid "Ring device:"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:42
+#: ../gtk/parameters.ui.h:44
 msgid "Playback device:"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:43
+#: ../gtk/parameters.ui.h:45
 msgid "Enable echo cancellation"
 msgstr "Activar cancelación de eco"
 
-#: ../gtk/parameters.ui.h:44
+#: ../gtk/parameters.ui.h:46
 msgid "<b>Audio</b>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:45
+#: ../gtk/parameters.ui.h:47
 msgid "Video input device:"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:46
+#: ../gtk/parameters.ui.h:48
 msgid "Prefered video resolution:"
 msgstr "Resolución de vídeo preferida:"
 
-#: ../gtk/parameters.ui.h:47
+#: ../gtk/parameters.ui.h:49
 msgid "Video output method:"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:48
+#: ../gtk/parameters.ui.h:50
+msgid "Show camera preview"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:51
 msgid "<b>Video</b>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:49
+#: ../gtk/parameters.ui.h:52
 msgid "Multimedia settings"
 msgstr "Configuración multimedia"
 
-#: ../gtk/parameters.ui.h:50
+#: ../gtk/parameters.ui.h:53
 msgid "This section defines your SIP address when not using a SIP account"
 msgstr "Esta sección define su dirección SIP cuando no utiliza una cuenta SIP"
 
-#: ../gtk/parameters.ui.h:51
+#: ../gtk/parameters.ui.h:54
 msgid "Your display name (eg: John Doe):"
 msgstr "Su nombre a mostrar (x ej: Pepito Pérez):"
 
-#: ../gtk/parameters.ui.h:52
+#: ../gtk/parameters.ui.h:55
 msgid "Your username:"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:53
+#: ../gtk/parameters.ui.h:56
 msgid "Your resulting SIP address:"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:54
+#: ../gtk/parameters.ui.h:57
 msgid "<b>Default identity</b>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:55
+#: ../gtk/parameters.ui.h:58
 msgid "Wizard"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:56
+#: ../gtk/parameters.ui.h:59
 msgid "Add"
 msgstr "Añadir"
 
-#: ../gtk/parameters.ui.h:57
+#: ../gtk/parameters.ui.h:60
 msgid "Edit"
 msgstr "Editar"
 
-#: ../gtk/parameters.ui.h:58
+#: ../gtk/parameters.ui.h:61
 msgid "Remove"
 msgstr "Eliminar"
 
-#: ../gtk/parameters.ui.h:59
+#: ../gtk/parameters.ui.h:62
 msgid "<b>Proxy accounts</b>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:60
+#: ../gtk/parameters.ui.h:63
 msgid "Erase all passwords"
 msgstr "Borrar todas las contraseñas"
 
-#: ../gtk/parameters.ui.h:61
+#: ../gtk/parameters.ui.h:64
 msgid "<b>Privacy</b>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:62
+#: ../gtk/parameters.ui.h:65
 msgid "Manage SIP Accounts"
 msgstr "Gestionar cuentas SIP"
 
-#: ../gtk/parameters.ui.h:63 ../gtk/tunnel_config.ui.h:4
+#: ../gtk/parameters.ui.h:66 ../gtk/tunnel_config.ui.h:4
 msgid "Enable"
 msgstr "Activar"
 
-#: ../gtk/parameters.ui.h:64 ../gtk/tunnel_config.ui.h:5
+#: ../gtk/parameters.ui.h:67 ../gtk/tunnel_config.ui.h:5
 msgid "Disable"
 msgstr "Desactivar"
 
-#: ../gtk/parameters.ui.h:65
+#: ../gtk/parameters.ui.h:68
 msgid "<b>Codecs</b>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:66
+#: ../gtk/parameters.ui.h:69
 msgid "0 stands for \"unlimited\""
 msgstr "0 significa \"ilimitado\""
 
-#: ../gtk/parameters.ui.h:67
+#: ../gtk/parameters.ui.h:70
 msgid "Upload speed limit in Kbit/sec:"
 msgstr "Velocidad límite de subida en Kbit/seg"
 
-#: ../gtk/parameters.ui.h:68
+#: ../gtk/parameters.ui.h:71
 msgid "Download speed limit in Kbit/sec:"
 msgstr "Velocidad límite de descarga en Kbit/seg:"
 
-#: ../gtk/parameters.ui.h:69
+#: ../gtk/parameters.ui.h:72
 msgid "Enable adaptive rate control"
 msgstr "Activar control de frecuencia adaptativo"
 
-#: ../gtk/parameters.ui.h:70
+#: ../gtk/parameters.ui.h:73
 msgid ""
 "<i>Adaptive rate control is a technique to dynamically guess the available "
 "bandwidth during a call.</i>"
@@ -1422,47 +1434,47 @@ msgstr ""
 "<i>Control de frecuencia adaptativo es una técnica que estima dinámicamente "
 "el ancho de banda disponible durante la llamada.</i>"
 
-#: ../gtk/parameters.ui.h:71
+#: ../gtk/parameters.ui.h:74
 msgid "<b>Bandwidth control</b>"
 msgstr "<b>Control de ancho de banda</b>"
 
-#: ../gtk/parameters.ui.h:72
+#: ../gtk/parameters.ui.h:75
 msgid "Codecs"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:73
+#: ../gtk/parameters.ui.h:76
 msgid "<b>Language</b>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:74
+#: ../gtk/parameters.ui.h:77
 msgid "Show advanced settings"
 msgstr "Mostrar opciones avanzadas"
 
-#: ../gtk/parameters.ui.h:75
+#: ../gtk/parameters.ui.h:78
 msgid "<b>Level</b>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:76
+#: ../gtk/parameters.ui.h:79
 msgid "User interface"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:77 ../gtk/ldap.ui.h:2
+#: ../gtk/parameters.ui.h:80 ../gtk/ldap.ui.h:2
 msgid "Server address:"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:78 ../gtk/ldap.ui.h:3
+#: ../gtk/parameters.ui.h:81 ../gtk/ldap.ui.h:3
 msgid "Authentication method:"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:80
+#: ../gtk/parameters.ui.h:83
 msgid "<b>LDAP Account setup</b>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:81
+#: ../gtk/parameters.ui.h:84
 msgid "LDAP"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:82
+#: ../gtk/parameters.ui.h:85
 msgid "Done"
 msgstr ""
 
@@ -1688,56 +1700,56 @@ msgstr ""
 msgid "Ready"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2473
+#: ../coreapi/linphonecore.c:2489
 msgid "Configuring"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2638
+#: ../coreapi/linphonecore.c:2654
 msgid "Looking for telephone number destination..."
 msgstr "Buscando el número de teléfono del destinatario…"
 
-#: ../coreapi/linphonecore.c:2640
+#: ../coreapi/linphonecore.c:2656
 msgid "Could not resolve this number."
 msgstr "No se ha podido resolver este número."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2926
+#: ../coreapi/linphonecore.c:2942
 msgid "Contacting"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2931
+#: ../coreapi/linphonecore.c:2947
 msgid "Could not call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3081
+#: ../coreapi/linphonecore.c:3097
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "Disculpe, se ha alcanzado el máximo número de llamadas simultáneas"
 
-#: ../coreapi/linphonecore.c:3240
+#: ../coreapi/linphonecore.c:3256
 msgid "is contacting you"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3241
+#: ../coreapi/linphonecore.c:3257
 msgid " and asked autoanswer."
 msgstr "y ha solicitado auto respuesta."
 
-#: ../coreapi/linphonecore.c:3359
+#: ../coreapi/linphonecore.c:3375
 msgid "Modifying call parameters..."
 msgstr "Modificando parámetros de llamada…"
 
-#: ../coreapi/linphonecore.c:3707
+#: ../coreapi/linphonecore.c:3723
 msgid "Connected."
 msgstr "Conectado."
 
-#: ../coreapi/linphonecore.c:3732
+#: ../coreapi/linphonecore.c:3748
 msgid "Call aborted"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3922
+#: ../coreapi/linphonecore.c:3938
 msgid "Could not pause the call"
 msgstr "No se pudo pausar la llamada"
 
-#: ../coreapi/linphonecore.c:3926
+#: ../coreapi/linphonecore.c:3941
 msgid "Pausing the current call..."
 msgstr "Pausando la llamada actual..."
 
@@ -1801,7 +1813,7 @@ msgstr ""
 msgid "Unknown status"
 msgstr ""
 
-#: ../coreapi/proxy.c:319
+#: ../coreapi/proxy.c:327
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
@@ -1809,7 +1821,7 @@ msgstr ""
 "La dirección del Proxy SIP que ha introducido no es válida, debe empezar con "
 "\"sip:\" seguido del hostname."
 
-#: ../coreapi/proxy.c:325
+#: ../coreapi/proxy.c:333
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
@@ -1818,7 +1830,7 @@ msgstr ""
 "Debe ser del tipo sip:username@proxydomain, como por ejemplo sip:"
 "alice@example.net"
 
-#: ../coreapi/proxy.c:1377
+#: ../coreapi/proxy.c:1390
 #, c-format
 msgid "Could not login as %s"
 msgstr ""
@@ -1932,12 +1944,12 @@ msgstr ""
 msgid "Service unavailable, retrying"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:174
+#: ../coreapi/linphonecall.c:175
 #, c-format
 msgid "Authentication token is %s"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:3020
+#: ../coreapi/linphonecall.c:3041
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
diff --git a/po/fr.po b/po/fr.po
index 5e41a459f..54a0968b9 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,14 +5,14 @@
 # Translators:
 # Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>, 2014
 # Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>, 2014
-# Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>, 2014
+# Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>, 2014-2015
 # Simon Morlat <simon.morlat@linphone.org>, 2001
 msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-03 13:39+0100\n"
-"PO-Revision-Date: 2014-12-04 09:51+0000\n"
+"POT-Creation-Date: 2015-01-06 12:28+0100\n"
+"PO-Revision-Date: 2015-01-06 11:31+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/fr/)\n"
@@ -98,31 +98,31 @@ msgstr "Icone non trouvée: %s"
 msgid "Invalid sip contact !"
 msgstr "Contact sip invalide !"
 
-#: ../gtk/main.c:107
+#: ../gtk/main.c:109
 msgid "log to stdout some debug information while running."
 msgstr "affiche des informations de debogage"
 
-#: ../gtk/main.c:114
+#: ../gtk/main.c:116
 msgid "path to a file to write logs into."
 msgstr "chemin vers le fichier de logs."
 
-#: ../gtk/main.c:121
+#: ../gtk/main.c:123
 msgid "Start linphone with video disabled."
 msgstr "Démarrer linphone avec la vidéo désactivée."
 
-#: ../gtk/main.c:128
+#: ../gtk/main.c:130
 msgid "Start only in the system tray, do not show the main interface."
 msgstr "Démarre iconifié, sans interface principale."
 
-#: ../gtk/main.c:135
+#: ../gtk/main.c:137
 msgid "address to call right now"
 msgstr "adresse à appeler maintenant"
 
-#: ../gtk/main.c:142
+#: ../gtk/main.c:144
 msgid "if set automatically answer incoming calls"
 msgstr "si positionné, répond automatiquement aux appels entrants"
 
-#: ../gtk/main.c:149
+#: ../gtk/main.c:151
 msgid ""
 "Specifiy a working directory (should be the base of the installation, eg: c:"
 "\\Program Files\\Linphone)"
@@ -130,15 +130,19 @@ msgstr ""
 "Spécifie un répertoire de travail (qui devrait être le répertoire "
 "d'installation, par exemple c:\\Program Files\\Linphone)"
 
-#: ../gtk/main.c:156
+#: ../gtk/main.c:158
 msgid "Configuration file"
 msgstr "Ficher de configuration"
 
-#: ../gtk/main.c:163
+#: ../gtk/main.c:165
 msgid "Run the audio assistant"
 msgstr "Démarre l'assistant audio"
 
-#: ../gtk/main.c:1085
+#: ../gtk/main.c:172
+msgid "Run self test and exit 0 if succeed"
+msgstr "Exécuter le test local et retourner 0 en cas de succès"
+
+#: ../gtk/main.c:1083
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
@@ -152,7 +156,7 @@ msgstr ""
 "Si vous répondez non, cette personne sera mise temporairement sur liste "
 "noire."
 
-#: ../gtk/main.c:1162
+#: ../gtk/main.c:1160
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
@@ -161,59 +165,59 @@ msgstr ""
 "Entrez le mot de passe pour <i>%s</i>\n"
 " sur le domaine <i>%s</i>:"
 
-#: ../gtk/main.c:1283
+#: ../gtk/main.c:1281
 msgid "Call error"
 msgstr "Erreur lors de l'appel"
 
-#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3751
+#: ../gtk/main.c:1284 ../coreapi/linphonecore.c:3767
 msgid "Call ended"
 msgstr "Appel terminé."
 
-#: ../gtk/main.c:1289 ../coreapi/call_log.c:221
+#: ../gtk/main.c:1287 ../coreapi/call_log.c:221
 msgid "Incoming call"
 msgstr "Appel entrant"
 
-#: ../gtk/main.c:1291 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
+#: ../gtk/main.c:1289 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
 msgid "Answer"
 msgstr "Répondre"
 
-#: ../gtk/main.c:1293 ../gtk/main.ui.h:6
+#: ../gtk/main.c:1291 ../gtk/main.ui.h:6
 msgid "Decline"
 msgstr "Refuser"
 
-#: ../gtk/main.c:1299
+#: ../gtk/main.c:1297
 msgid "Call paused"
 msgstr "Appel en pause"
 
-#: ../gtk/main.c:1299
+#: ../gtk/main.c:1297
 #, c-format
 msgid "<b>by %s</b>"
 msgstr "b>par %s</b>"
 
-#: ../gtk/main.c:1366
+#: ../gtk/main.c:1367
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr "%s propose de démarrer la vidéo. Acceptez-vous ?"
 
-#: ../gtk/main.c:1528
+#: ../gtk/main.c:1529
 msgid "Website link"
 msgstr "Lien site web"
 
-#: ../gtk/main.c:1577
+#: ../gtk/main.c:1578
 msgid "Linphone - a video internet phone"
 msgstr "Linphone - un téléphone video pour l'internet"
 
-#: ../gtk/main.c:1669
+#: ../gtk/main.c:1670
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (par défaut)"
 
-#: ../gtk/main.c:2006 ../coreapi/callbacks.c:986
+#: ../gtk/main.c:2002 ../coreapi/callbacks.c:986
 #, c-format
 msgid "We are transferred to %s"
 msgstr "Transfert vers %s"
 
-#: ../gtk/main.c:2016
+#: ../gtk/main.c:2012
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
@@ -221,7 +225,7 @@ msgstr ""
 "Aucune carte son n'a été détectée sur cet ordinateur.\n"
 "Vous ne pourrez pas effectuer d'appels audio."
 
-#: ../gtk/main.c:2157
+#: ../gtk/main.c:2156
 msgid "A free SIP video-phone"
 msgstr "Un visiophone libre"
 
@@ -290,7 +294,7 @@ msgstr "Paramètres"
 msgid "Enabled"
 msgstr "Activé"
 
-#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763
+#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763 ../gtk/parameters.ui.h:20
 msgid "Disabled"
 msgstr "Désactivé"
 
@@ -458,7 +462,7 @@ msgstr "Je veux spécifier une URI de configuration"
 msgid "Enter your linphone.org username"
 msgstr "Entrez votre identifiant linphone.org"
 
-#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:79 ../gtk/ldap.ui.h:4
+#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:82 ../gtk/ldap.ui.h:4
 msgid "Username:"
 msgstr "Nom d'utilisateur:"
 
@@ -650,7 +654,7 @@ msgstr "%ix%i @ %f fps"
 msgid "%.3f seconds"
 msgstr "%.3f secondes"
 
-#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12 ../gtk/videowindow.c:232
+#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12 ../gtk/videowindow.c:235
 msgid "Hang up"
 msgstr "Raccrocher"
 
@@ -1249,212 +1253,220 @@ msgid "<b>Transport</b>"
 msgstr "<b>Transport</b>"
 
 #: ../gtk/parameters.ui.h:19
-msgid "Media encryption type"
-msgstr "Type d'encryption media"
-
-#: ../gtk/parameters.ui.h:20
-msgid "Video RTP/UDP:"
-msgstr "Vidéo RTP / UDP :"
-
-#: ../gtk/parameters.ui.h:21
-msgid "Audio RTP/UDP:"
-msgstr "Audio RTP / UDP :"
-
-#: ../gtk/parameters.ui.h:22
-msgid "Fixed"
-msgstr "Fixe"
-
-#: ../gtk/parameters.ui.h:23
-msgid "Media encryption is mandatory"
-msgstr "Le chiffrement media est obligatoire"
-
-#: ../gtk/parameters.ui.h:24
-msgid "Tunnel"
-msgstr "Tunnel"
-
-#: ../gtk/parameters.ui.h:25
-msgid "DSCP fields"
-msgstr "Champs DSCP"
-
-#: ../gtk/parameters.ui.h:26
-msgid "SIP/TCP port"
-msgstr "Port SIP / TCP"
-
-#: ../gtk/parameters.ui.h:27
 msgid "SIP/UDP port"
 msgstr "Port SIP / UDP"
 
+#: ../gtk/parameters.ui.h:21
+msgid "Random"
+msgstr "Aléatoire"
+
+#: ../gtk/parameters.ui.h:22
+msgid "SIP/TCP port"
+msgstr "Port SIP / TCP"
+
+#: ../gtk/parameters.ui.h:23
+msgid "Audio RTP/UDP:"
+msgstr "Audio RTP / UDP :"
+
+#: ../gtk/parameters.ui.h:24
+msgid "Fixed"
+msgstr "Fixe"
+
+#: ../gtk/parameters.ui.h:25
+msgid "Video RTP/UDP:"
+msgstr "Vidéo RTP / UDP :"
+
+#: ../gtk/parameters.ui.h:26
+msgid "Media encryption type"
+msgstr "Type d'encryption media"
+
+#: ../gtk/parameters.ui.h:27
+msgid "Media encryption is mandatory"
+msgstr "Le chiffrement media est obligatoire"
+
 #: ../gtk/parameters.ui.h:28
+msgid "Tunnel"
+msgstr "Tunnel"
+
+#: ../gtk/parameters.ui.h:29
+msgid "DSCP fields"
+msgstr "Champs DSCP"
+
+#: ../gtk/parameters.ui.h:30
 msgid "<b>Network protocol and ports</b>"
 msgstr "<b>Protocoles réseaux et ports</b>"
 
-#: ../gtk/parameters.ui.h:29
+#: ../gtk/parameters.ui.h:31
 msgid "Direct connection to the Internet"
 msgstr "Connexion directe à l'Internet"
 
-#: ../gtk/parameters.ui.h:30
+#: ../gtk/parameters.ui.h:32
 msgid "Behind NAT / Firewall (specify gateway IP )"
 msgstr "Derrière un pare-feu (spécifier la passerelle ci dessous)"
 
-#: ../gtk/parameters.ui.h:31
+#: ../gtk/parameters.ui.h:33
 msgid "Behind NAT / Firewall (use STUN to resolve)"
 msgstr "Derrière un pare-feu (utiliser STUN)"
 
-#: ../gtk/parameters.ui.h:32
+#: ../gtk/parameters.ui.h:34
 msgid "Behind NAT / Firewall (use ICE)"
 msgstr "Derrière un pare-feu (utiliser ICE)"
 
-#: ../gtk/parameters.ui.h:33
+#: ../gtk/parameters.ui.h:35
 msgid "Behind NAT / Firewall (use uPnP)"
 msgstr "Derrière un pare-feu (utiliser uPnP)"
 
-#: ../gtk/parameters.ui.h:34
+#: ../gtk/parameters.ui.h:36
 msgid "Public IP address:"
 msgstr "Adresse IP publique:"
 
-#: ../gtk/parameters.ui.h:35
+#: ../gtk/parameters.ui.h:37
 msgid "Stun server:"
 msgstr "Serveur STUN:"
 
-#: ../gtk/parameters.ui.h:36
+#: ../gtk/parameters.ui.h:38
 msgid "<b>NAT and Firewall</b>"
 msgstr "<b>Paramètres liés au pare-feu</b>"
 
-#: ../gtk/parameters.ui.h:37
+#: ../gtk/parameters.ui.h:39
 msgid "Network settings"
 msgstr "Paramètres réseau"
 
-#: ../gtk/parameters.ui.h:38
+#: ../gtk/parameters.ui.h:40
 msgid "Ring sound:"
 msgstr "Sonnerie:"
 
-#: ../gtk/parameters.ui.h:39
+#: ../gtk/parameters.ui.h:41
 msgid "ALSA special device (optional):"
 msgstr "Appareil ALSA spécifique (optionnel) :"
 
-#: ../gtk/parameters.ui.h:40
+#: ../gtk/parameters.ui.h:42
 msgid "Capture device:"
 msgstr "Périphérique de capture:"
 
-#: ../gtk/parameters.ui.h:41
+#: ../gtk/parameters.ui.h:43
 msgid "Ring device:"
 msgstr "Périphérique de sonnerie:"
 
-#: ../gtk/parameters.ui.h:42
+#: ../gtk/parameters.ui.h:44
 msgid "Playback device:"
 msgstr "Périphérique d'écoute:"
 
-#: ../gtk/parameters.ui.h:43
+#: ../gtk/parameters.ui.h:45
 msgid "Enable echo cancellation"
 msgstr "Activer l'annulation d'écho"
 
-#: ../gtk/parameters.ui.h:44
+#: ../gtk/parameters.ui.h:46
 msgid "<b>Audio</b>"
 msgstr "<b>Son</b>"
 
-#: ../gtk/parameters.ui.h:45
+#: ../gtk/parameters.ui.h:47
 msgid "Video input device:"
 msgstr "Périphérique d'entrée vidéo"
 
-#: ../gtk/parameters.ui.h:46
+#: ../gtk/parameters.ui.h:48
 msgid "Prefered video resolution:"
 msgstr "Résolution de vidéo préférée:"
 
-#: ../gtk/parameters.ui.h:47
+#: ../gtk/parameters.ui.h:49
 msgid "Video output method:"
 msgstr "Type de rendu video:"
 
-#: ../gtk/parameters.ui.h:48
+#: ../gtk/parameters.ui.h:50
+msgid "Show camera preview"
+msgstr "Afficher la vidéo"
+
+#: ../gtk/parameters.ui.h:51
 msgid "<b>Video</b>"
 msgstr "<b>Video</b>"
 
-#: ../gtk/parameters.ui.h:49
+#: ../gtk/parameters.ui.h:52
 msgid "Multimedia settings"
 msgstr "Paramètres multimedia"
 
-#: ../gtk/parameters.ui.h:50
+#: ../gtk/parameters.ui.h:53
 msgid "This section defines your SIP address when not using a SIP account"
 msgstr ""
 "Cette rubrique permet de définir son adresse SIP lorsqu'on ne possède pas de "
 "compte SIP"
 
-#: ../gtk/parameters.ui.h:51
+#: ../gtk/parameters.ui.h:54
 msgid "Your display name (eg: John Doe):"
 msgstr "Votre nom d'affichage (ex: John Doe)"
 
-#: ../gtk/parameters.ui.h:52
+#: ../gtk/parameters.ui.h:55
 msgid "Your username:"
 msgstr "Votre nom d'utilisateur:"
 
-#: ../gtk/parameters.ui.h:53
+#: ../gtk/parameters.ui.h:56
 msgid "Your resulting SIP address:"
 msgstr "Votre adresse SIP:"
 
-#: ../gtk/parameters.ui.h:54
+#: ../gtk/parameters.ui.h:57
 msgid "<b>Default identity</b>"
 msgstr "<b>Identité par défaut</b>"
 
-#: ../gtk/parameters.ui.h:55
+#: ../gtk/parameters.ui.h:58
 msgid "Wizard"
 msgstr "Assistant"
 
-#: ../gtk/parameters.ui.h:56
+#: ../gtk/parameters.ui.h:59
 msgid "Add"
 msgstr "Ajouter"
 
-#: ../gtk/parameters.ui.h:57
+#: ../gtk/parameters.ui.h:60
 msgid "Edit"
 msgstr "Editer"
 
-#: ../gtk/parameters.ui.h:58
+#: ../gtk/parameters.ui.h:61
 msgid "Remove"
 msgstr "Enlever"
 
-#: ../gtk/parameters.ui.h:59
+#: ../gtk/parameters.ui.h:62
 msgid "<b>Proxy accounts</b>"
 msgstr "<b>Comptes SIP via des proxy</b>"
 
-#: ../gtk/parameters.ui.h:60
+#: ../gtk/parameters.ui.h:63
 msgid "Erase all passwords"
 msgstr "Effacer tous les mots de passe"
 
-#: ../gtk/parameters.ui.h:61
+#: ../gtk/parameters.ui.h:64
 msgid "<b>Privacy</b>"
 msgstr "<b>Sécurité</b>"
 
-#: ../gtk/parameters.ui.h:62
+#: ../gtk/parameters.ui.h:65
 msgid "Manage SIP Accounts"
 msgstr "Gérer mes comptes SIP"
 
-#: ../gtk/parameters.ui.h:63 ../gtk/tunnel_config.ui.h:4
+#: ../gtk/parameters.ui.h:66 ../gtk/tunnel_config.ui.h:4
 msgid "Enable"
 msgstr "Activer"
 
-#: ../gtk/parameters.ui.h:64 ../gtk/tunnel_config.ui.h:5
+#: ../gtk/parameters.ui.h:67 ../gtk/tunnel_config.ui.h:5
 msgid "Disable"
 msgstr "Désactiver"
 
-#: ../gtk/parameters.ui.h:65
+#: ../gtk/parameters.ui.h:68
 msgid "<b>Codecs</b>"
 msgstr "<b>Codecs</b>"
 
-#: ../gtk/parameters.ui.h:66
+#: ../gtk/parameters.ui.h:69
 msgid "0 stands for \"unlimited\""
 msgstr "Indiquez 0 pour ne pas mettre de limite"
 
-#: ../gtk/parameters.ui.h:67
+#: ../gtk/parameters.ui.h:70
 msgid "Upload speed limit in Kbit/sec:"
 msgstr "Limite de débit montant en kbits/sec:"
 
-#: ../gtk/parameters.ui.h:68
+#: ../gtk/parameters.ui.h:71
 msgid "Download speed limit in Kbit/sec:"
 msgstr "Limite de débit descendant en kbits/sec:"
 
-#: ../gtk/parameters.ui.h:69
+#: ../gtk/parameters.ui.h:72
 msgid "Enable adaptive rate control"
 msgstr "Activer le control de débit adaptatif."
 
-#: ../gtk/parameters.ui.h:70
+#: ../gtk/parameters.ui.h:73
 msgid ""
 "<i>Adaptive rate control is a technique to dynamically guess the available "
 "bandwidth during a call.</i>"
@@ -1463,47 +1475,47 @@ msgstr ""
 "de l'audio et de la video en fonction de la bande passante disponible, "
 "durant l'appel.</i>"
 
-#: ../gtk/parameters.ui.h:71
+#: ../gtk/parameters.ui.h:74
 msgid "<b>Bandwidth control</b>"
 msgstr "<b>Gestion de la bande passante</b>"
 
-#: ../gtk/parameters.ui.h:72
+#: ../gtk/parameters.ui.h:75
 msgid "Codecs"
 msgstr "Codecs"
 
-#: ../gtk/parameters.ui.h:73
+#: ../gtk/parameters.ui.h:76
 msgid "<b>Language</b>"
 msgstr "<b>Langue</b>"
 
-#: ../gtk/parameters.ui.h:74
+#: ../gtk/parameters.ui.h:77
 msgid "Show advanced settings"
 msgstr "Montrer les réglages avancés"
 
-#: ../gtk/parameters.ui.h:75
+#: ../gtk/parameters.ui.h:78
 msgid "<b>Level</b>"
 msgstr "<b>Niveau</b>"
 
-#: ../gtk/parameters.ui.h:76
+#: ../gtk/parameters.ui.h:79
 msgid "User interface"
 msgstr "Interface utilisateur"
 
-#: ../gtk/parameters.ui.h:77 ../gtk/ldap.ui.h:2
+#: ../gtk/parameters.ui.h:80 ../gtk/ldap.ui.h:2
 msgid "Server address:"
 msgstr "Adresse du serveur:"
 
-#: ../gtk/parameters.ui.h:78 ../gtk/ldap.ui.h:3
+#: ../gtk/parameters.ui.h:81 ../gtk/ldap.ui.h:3
 msgid "Authentication method:"
 msgstr "Méthode d'authentification:"
 
-#: ../gtk/parameters.ui.h:80
+#: ../gtk/parameters.ui.h:83
 msgid "<b>LDAP Account setup</b>"
 msgstr "<b>Configuration LDAP</b>"
 
-#: ../gtk/parameters.ui.h:81
+#: ../gtk/parameters.ui.h:84
 msgid "LDAP"
 msgstr "LDAP"
 
-#: ../gtk/parameters.ui.h:82
+#: ../gtk/parameters.ui.h:85
 msgid "Done"
 msgstr "Fermer"
 
@@ -1736,56 +1748,56 @@ msgstr ""
 msgid "Ready"
 msgstr "Prêt."
 
-#: ../coreapi/linphonecore.c:2473
+#: ../coreapi/linphonecore.c:2489
 msgid "Configuring"
 msgstr "Configuration en cours"
 
-#: ../coreapi/linphonecore.c:2638
+#: ../coreapi/linphonecore.c:2654
 msgid "Looking for telephone number destination..."
 msgstr "Recherche de la destination du numéro de téléphone..."
 
-#: ../coreapi/linphonecore.c:2640
+#: ../coreapi/linphonecore.c:2656
 msgid "Could not resolve this number."
 msgstr "La destination n'a pu être trouvée."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2926
+#: ../coreapi/linphonecore.c:2942
 msgid "Contacting"
 msgstr "Appel de"
 
-#: ../coreapi/linphonecore.c:2931
+#: ../coreapi/linphonecore.c:2947
 msgid "Could not call"
 msgstr "Echec de l'appel"
 
-#: ../coreapi/linphonecore.c:3081
+#: ../coreapi/linphonecore.c:3097
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "Désolé, le nombre maximum d'appels simultanés est atteint."
 
-#: ../coreapi/linphonecore.c:3240
+#: ../coreapi/linphonecore.c:3256
 msgid "is contacting you"
 msgstr "vous appelle"
 
-#: ../coreapi/linphonecore.c:3241
+#: ../coreapi/linphonecore.c:3257
 msgid " and asked autoanswer."
 msgstr "et sollicite un décrochage automatique."
 
-#: ../coreapi/linphonecore.c:3359
+#: ../coreapi/linphonecore.c:3375
 msgid "Modifying call parameters..."
 msgstr "Modifications des paramètres d'appels..."
 
-#: ../coreapi/linphonecore.c:3707
+#: ../coreapi/linphonecore.c:3723
 msgid "Connected."
 msgstr "En ligne."
 
-#: ../coreapi/linphonecore.c:3732
+#: ../coreapi/linphonecore.c:3748
 msgid "Call aborted"
 msgstr "Appel abandonné"
 
-#: ../coreapi/linphonecore.c:3922
+#: ../coreapi/linphonecore.c:3938
 msgid "Could not pause the call"
 msgstr "La mise en attente a échoué"
 
-#: ../coreapi/linphonecore.c:3926
+#: ../coreapi/linphonecore.c:3941
 msgid "Pausing the current call..."
 msgstr "Mise en attente de l'appel..."
 
@@ -1849,7 +1861,7 @@ msgstr "En congé"
 msgid "Unknown status"
 msgstr "Status inconnu"
 
-#: ../coreapi/proxy.c:319
+#: ../coreapi/proxy.c:327
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
@@ -1857,7 +1869,7 @@ msgstr ""
 "L'adresse SIP du proxy est invalide. Elle doit commencer par \"sip:\" suivie "
 "par un nom de domaine."
 
-#: ../coreapi/proxy.c:325
+#: ../coreapi/proxy.c:333
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
@@ -1866,7 +1878,7 @@ msgstr ""
 "Elle doit être de la forme sip:username@domain, comme par example sip:"
 "alice@example.net"
 
-#: ../coreapi/proxy.c:1377
+#: ../coreapi/proxy.c:1390
 #, c-format
 msgid "Could not login as %s"
 msgstr "Echec de la connexion en tant que %s"
@@ -1980,12 +1992,12 @@ msgstr "Echec de l'enregistrement sur %s: %s"
 msgid "Service unavailable, retrying"
 msgstr "Service indisponible, nouvelle tentative"
 
-#: ../coreapi/linphonecall.c:174
+#: ../coreapi/linphonecall.c:175
 #, c-format
 msgid "Authentication token is %s"
 msgstr "Le jeton d'authentification est %s"
 
-#: ../coreapi/linphonecall.c:3020
+#: ../coreapi/linphonecall.c:3041
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
diff --git a/po/he.po b/po/he.po
index 841b4e161..573a9e1a9 100644
--- a/po/he.po
+++ b/po/he.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-03 13:39+0100\n"
-"PO-Revision-Date: 2014-12-04 09:51+0000\n"
+"POT-Creation-Date: 2015-01-06 12:28+0100\n"
+"PO-Revision-Date: 2015-01-06 11:29+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/he/)\n"
@@ -98,45 +98,49 @@ msgstr "לא ניתן למצוא קובץ ‫pixmap: ‫%s"
 msgid "Invalid sip contact !"
 msgstr "כתובת sip לא תקפה !"
 
-#: ../gtk/main.c:107
+#: ../gtk/main.c:109
 msgid "log to stdout some debug information while running."
 msgstr ""
 
-#: ../gtk/main.c:114
+#: ../gtk/main.c:116
 msgid "path to a file to write logs into."
 msgstr ""
 
-#: ../gtk/main.c:121
+#: ../gtk/main.c:123
 msgid "Start linphone with video disabled."
 msgstr ""
 
-#: ../gtk/main.c:128
+#: ../gtk/main.c:130
 msgid "Start only in the system tray, do not show the main interface."
 msgstr ""
 
-#: ../gtk/main.c:135
+#: ../gtk/main.c:137
 msgid "address to call right now"
 msgstr ""
 
-#: ../gtk/main.c:142
+#: ../gtk/main.c:144
 msgid "if set automatically answer incoming calls"
 msgstr ""
 
-#: ../gtk/main.c:149
+#: ../gtk/main.c:151
 msgid ""
 "Specifiy a working directory (should be the base of the installation, eg: c:"
 "\\Program Files\\Linphone)"
 msgstr ""
 
-#: ../gtk/main.c:156
+#: ../gtk/main.c:158
 msgid "Configuration file"
 msgstr ""
 
-#: ../gtk/main.c:163
+#: ../gtk/main.c:165
 msgid "Run the audio assistant"
 msgstr ""
 
-#: ../gtk/main.c:1085
+#: ../gtk/main.c:172
+msgid "Run self test and exit 0 if succeed"
+msgstr ""
+
+#: ../gtk/main.c:1083
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
@@ -149,7 +153,7 @@ msgstr ""
 "שלך ?\n"
 "היה ותשובתך תהיה לא, אדם זה יהיה מסומן באופן זמני ברשימה השחורה."
 
-#: ../gtk/main.c:1162
+#: ../gtk/main.c:1160
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
@@ -158,59 +162,59 @@ msgstr ""
 "אנא הזן סיסמה עבור משתמש <i>%s</i>\n"
 "במתחם <i>%s</i>:"
 
-#: ../gtk/main.c:1283
+#: ../gtk/main.c:1281
 msgid "Call error"
 msgstr "שגיאת קריאה"
 
-#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3751
+#: ../gtk/main.c:1284 ../coreapi/linphonecore.c:3767
 msgid "Call ended"
 msgstr "שיחה הסתיימה"
 
-#: ../gtk/main.c:1289 ../coreapi/call_log.c:221
+#: ../gtk/main.c:1287 ../coreapi/call_log.c:221
 msgid "Incoming call"
 msgstr "קריאה נכנסת"
 
-#: ../gtk/main.c:1291 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
+#: ../gtk/main.c:1289 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
 msgid "Answer"
 msgstr "לענות"
 
-#: ../gtk/main.c:1293 ../gtk/main.ui.h:6
+#: ../gtk/main.c:1291 ../gtk/main.ui.h:6
 msgid "Decline"
 msgstr "לדחות"
 
-#: ../gtk/main.c:1299
+#: ../gtk/main.c:1297
 msgid "Call paused"
 msgstr "שיחה הושהתה"
 
-#: ../gtk/main.c:1299
+#: ../gtk/main.c:1297
 #, c-format
 msgid "<b>by %s</b>"
 msgstr "<b>על ידי %s</b>"
 
-#: ../gtk/main.c:1366
+#: ../gtk/main.c:1367
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr "‏%s רוצה להתחיל וידאו. האם אתה מסכים ?"
 
-#: ../gtk/main.c:1528
+#: ../gtk/main.c:1529
 msgid "Website link"
 msgstr "קישור אתר רשת"
 
-#: ../gtk/main.c:1577
+#: ../gtk/main.c:1578
 msgid "Linphone - a video internet phone"
 msgstr "‫Linphone - וידאופון אינטרנטי"
 
-#: ../gtk/main.c:1669
+#: ../gtk/main.c:1670
 #, c-format
 msgid "%s (Default)"
 msgstr "‫%s (ברירת מחדל)"
 
-#: ../gtk/main.c:2006 ../coreapi/callbacks.c:986
+#: ../gtk/main.c:2002 ../coreapi/callbacks.c:986
 #, c-format
 msgid "We are transferred to %s"
 msgstr "אנחנו מועברים אל %s"
 
-#: ../gtk/main.c:2016
+#: ../gtk/main.c:2012
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
@@ -218,7 +222,7 @@ msgstr ""
 "לא אותרו כרטיסי קול במחשב זה.\n"
 "לא תהיה ביכולתך לשלוח או לקבל שיחות אודיו."
 
-#: ../gtk/main.c:2157
+#: ../gtk/main.c:2156
 msgid "A free SIP video-phone"
 msgstr "וידאופון SIP חופשי"
 
@@ -287,7 +291,7 @@ msgstr "פרמטרים"
 msgid "Enabled"
 msgstr "מופעל"
 
-#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763
+#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763 ../gtk/parameters.ui.h:20
 msgid "Disabled"
 msgstr "לא מופעל"
 
@@ -450,7 +454,7 @@ msgstr ""
 msgid "Enter your linphone.org username"
 msgstr "הזן את שם משתמשך אצל linphone.org"
 
-#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:79 ../gtk/ldap.ui.h:4
+#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:82 ../gtk/ldap.ui.h:4
 msgid "Username:"
 msgstr "שם משתמש:"
 
@@ -640,7 +644,7 @@ msgstr ""
 msgid "%.3f seconds"
 msgstr "%.3f שניות"
 
-#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12 ../gtk/videowindow.c:232
+#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12 ../gtk/videowindow.c:235
 msgid "Hang up"
 msgstr "נתק"
 
@@ -1224,210 +1228,218 @@ msgid "<b>Transport</b>"
 msgstr "<b>טרנספורט</b>"
 
 #: ../gtk/parameters.ui.h:19
-msgid "Media encryption type"
-msgstr "סוג הצפנת מדיה"
-
-#: ../gtk/parameters.ui.h:20
-msgid "Video RTP/UDP:"
-msgstr "וידאו RTP/UDP:"
-
-#: ../gtk/parameters.ui.h:21
-msgid "Audio RTP/UDP:"
-msgstr "אודיו RTP/UDP:"
-
-#: ../gtk/parameters.ui.h:22
-msgid "Fixed"
-msgstr "מקובע"
-
-#: ../gtk/parameters.ui.h:23
-msgid "Media encryption is mandatory"
-msgstr "הצפנת מדיה הינה מנדטורית"
-
-#: ../gtk/parameters.ui.h:24
-msgid "Tunnel"
-msgstr "מינהור"
-
-#: ../gtk/parameters.ui.h:25
-msgid "DSCP fields"
-msgstr "שדות DSCP"
-
-#: ../gtk/parameters.ui.h:26
-msgid "SIP/TCP port"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:27
 msgid "SIP/UDP port"
 msgstr ""
 
+#: ../gtk/parameters.ui.h:21
+msgid "Random"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:22
+msgid "SIP/TCP port"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:23
+msgid "Audio RTP/UDP:"
+msgstr "אודיו RTP/UDP:"
+
+#: ../gtk/parameters.ui.h:24
+msgid "Fixed"
+msgstr "מקובע"
+
+#: ../gtk/parameters.ui.h:25
+msgid "Video RTP/UDP:"
+msgstr "וידאו RTP/UDP:"
+
+#: ../gtk/parameters.ui.h:26
+msgid "Media encryption type"
+msgstr "סוג הצפנת מדיה"
+
+#: ../gtk/parameters.ui.h:27
+msgid "Media encryption is mandatory"
+msgstr "הצפנת מדיה הינה מנדטורית"
+
 #: ../gtk/parameters.ui.h:28
+msgid "Tunnel"
+msgstr "מינהור"
+
+#: ../gtk/parameters.ui.h:29
+msgid "DSCP fields"
+msgstr "שדות DSCP"
+
+#: ../gtk/parameters.ui.h:30
 msgid "<b>Network protocol and ports</b>"
 msgstr "<b>פרוטוקולי רשת תקשורת ופורטים</b>"
 
-#: ../gtk/parameters.ui.h:29
+#: ../gtk/parameters.ui.h:31
 msgid "Direct connection to the Internet"
 msgstr "חיבור ישיר אל האינטרנט"
 
-#: ../gtk/parameters.ui.h:30
+#: ../gtk/parameters.ui.h:32
 msgid "Behind NAT / Firewall (specify gateway IP )"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:31
+#: ../gtk/parameters.ui.h:33
 msgid "Behind NAT / Firewall (use STUN to resolve)"
 msgstr "מאחורי NAT  /  חומת אש (בעזרת STUN לפתירה)"
 
-#: ../gtk/parameters.ui.h:32
+#: ../gtk/parameters.ui.h:34
 msgid "Behind NAT / Firewall (use ICE)"
 msgstr "מאחורי NAT  /  חומת אש (בעזרת ICE)"
 
-#: ../gtk/parameters.ui.h:33
+#: ../gtk/parameters.ui.h:35
 msgid "Behind NAT / Firewall (use uPnP)"
 msgstr "מאחורי NAT  /  חומת אש (בעזרת uPnP)"
 
-#: ../gtk/parameters.ui.h:34
+#: ../gtk/parameters.ui.h:36
 msgid "Public IP address:"
 msgstr "כתובת IP פומבית:"
 
-#: ../gtk/parameters.ui.h:35
+#: ../gtk/parameters.ui.h:37
 msgid "Stun server:"
 msgstr "שרת STUN:"
 
-#: ../gtk/parameters.ui.h:36
+#: ../gtk/parameters.ui.h:38
 msgid "<b>NAT and Firewall</b>"
 msgstr "<b>‫NAT וחומת אש</b>"
 
-#: ../gtk/parameters.ui.h:37
+#: ../gtk/parameters.ui.h:39
 msgid "Network settings"
 msgstr "הגדרות רשת תקשורת"
 
-#: ../gtk/parameters.ui.h:38
+#: ../gtk/parameters.ui.h:40
 msgid "Ring sound:"
 msgstr "צליל צלצול:"
 
-#: ../gtk/parameters.ui.h:39
+#: ../gtk/parameters.ui.h:41
 msgid "ALSA special device (optional):"
 msgstr "התקן ALSA מיוחד (רשות):"
 
-#: ../gtk/parameters.ui.h:40
+#: ../gtk/parameters.ui.h:42
 msgid "Capture device:"
 msgstr "התקן לכידה:"
 
-#: ../gtk/parameters.ui.h:41
+#: ../gtk/parameters.ui.h:43
 msgid "Ring device:"
 msgstr "התקן צלצול:"
 
-#: ../gtk/parameters.ui.h:42
+#: ../gtk/parameters.ui.h:44
 msgid "Playback device:"
 msgstr "התקן פס קול:"
 
-#: ../gtk/parameters.ui.h:43
+#: ../gtk/parameters.ui.h:45
 msgid "Enable echo cancellation"
 msgstr "אפשר ביטול הד"
 
-#: ../gtk/parameters.ui.h:44
+#: ../gtk/parameters.ui.h:46
 msgid "<b>Audio</b>"
 msgstr "<b>אודיו</b>"
 
-#: ../gtk/parameters.ui.h:45
+#: ../gtk/parameters.ui.h:47
 msgid "Video input device:"
 msgstr "התקן קלט וידאו:"
 
-#: ../gtk/parameters.ui.h:46
+#: ../gtk/parameters.ui.h:48
 msgid "Prefered video resolution:"
 msgstr "רזולוציית וידאו מועדפת:"
 
-#: ../gtk/parameters.ui.h:47
+#: ../gtk/parameters.ui.h:49
 msgid "Video output method:"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:48
+#: ../gtk/parameters.ui.h:50
+msgid "Show camera preview"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:51
 msgid "<b>Video</b>"
 msgstr "<b>וידאו</b>"
 
-#: ../gtk/parameters.ui.h:49
+#: ../gtk/parameters.ui.h:52
 msgid "Multimedia settings"
 msgstr "הגדרות מולטימדיה"
 
-#: ../gtk/parameters.ui.h:50
+#: ../gtk/parameters.ui.h:53
 msgid "This section defines your SIP address when not using a SIP account"
 msgstr "חלק זה מגדיר את כתובת ה־SIP כאשר אינך עושה שימוש בחשבון SIP"
 
-#: ../gtk/parameters.ui.h:51
+#: ../gtk/parameters.ui.h:54
 msgid "Your display name (eg: John Doe):"
 msgstr "שם התצוגה שלך (למשל: יורם יהודה):"
 
-#: ../gtk/parameters.ui.h:52
+#: ../gtk/parameters.ui.h:55
 msgid "Your username:"
 msgstr "שם המשתמש שלך:"
 
-#: ../gtk/parameters.ui.h:53
+#: ../gtk/parameters.ui.h:56
 msgid "Your resulting SIP address:"
 msgstr "כתובת SIP נובעת:"
 
-#: ../gtk/parameters.ui.h:54
+#: ../gtk/parameters.ui.h:57
 msgid "<b>Default identity</b>"
 msgstr "<b>זהות משתמטת</b>"
 
-#: ../gtk/parameters.ui.h:55
+#: ../gtk/parameters.ui.h:58
 msgid "Wizard"
 msgstr "אשף"
 
-#: ../gtk/parameters.ui.h:56
+#: ../gtk/parameters.ui.h:59
 msgid "Add"
 msgstr "הוסף"
 
-#: ../gtk/parameters.ui.h:57
+#: ../gtk/parameters.ui.h:60
 msgid "Edit"
 msgstr "ערוך"
 
-#: ../gtk/parameters.ui.h:58
+#: ../gtk/parameters.ui.h:61
 msgid "Remove"
 msgstr "הסר"
 
-#: ../gtk/parameters.ui.h:59
+#: ../gtk/parameters.ui.h:62
 msgid "<b>Proxy accounts</b>"
 msgstr "<b>חשבונות Proxy</b>"
 
-#: ../gtk/parameters.ui.h:60
+#: ../gtk/parameters.ui.h:63
 msgid "Erase all passwords"
 msgstr "מחק סיסמאות"
 
-#: ../gtk/parameters.ui.h:61
+#: ../gtk/parameters.ui.h:64
 msgid "<b>Privacy</b>"
 msgstr "<b>פרטיות</b>"
 
-#: ../gtk/parameters.ui.h:62
+#: ../gtk/parameters.ui.h:65
 msgid "Manage SIP Accounts"
 msgstr "ניהול חשבונות ‫SIP"
 
-#: ../gtk/parameters.ui.h:63 ../gtk/tunnel_config.ui.h:4
+#: ../gtk/parameters.ui.h:66 ../gtk/tunnel_config.ui.h:4
 msgid "Enable"
 msgstr "אפשר"
 
-#: ../gtk/parameters.ui.h:64 ../gtk/tunnel_config.ui.h:5
+#: ../gtk/parameters.ui.h:67 ../gtk/tunnel_config.ui.h:5
 msgid "Disable"
 msgstr "נטרל"
 
-#: ../gtk/parameters.ui.h:65
+#: ../gtk/parameters.ui.h:68
 msgid "<b>Codecs</b>"
 msgstr "<b>קודקים</b>"
 
-#: ../gtk/parameters.ui.h:66
+#: ../gtk/parameters.ui.h:69
 msgid "0 stands for \"unlimited\""
 msgstr "0 מסמל \"בלי הגבלה\""
 
-#: ../gtk/parameters.ui.h:67
+#: ../gtk/parameters.ui.h:70
 msgid "Upload speed limit in Kbit/sec:"
 msgstr "מגבלת מהירות העלאה בקי״ב/שנ׳:"
 
-#: ../gtk/parameters.ui.h:68
+#: ../gtk/parameters.ui.h:71
 msgid "Download speed limit in Kbit/sec:"
 msgstr "מגבלת מהירות הורדה בקי״ב/שנ׳:"
 
-#: ../gtk/parameters.ui.h:69
+#: ../gtk/parameters.ui.h:72
 msgid "Enable adaptive rate control"
 msgstr "אפשר בקרת קצב מסתגלת"
 
-#: ../gtk/parameters.ui.h:70
+#: ../gtk/parameters.ui.h:73
 msgid ""
 "<i>Adaptive rate control is a technique to dynamically guess the available "
 "bandwidth during a call.</i>"
@@ -1435,47 +1447,47 @@ msgstr ""
 "<i>בקרת קצב מסתגלת הינה טכניקה להשערה דינמית של רוחב הפס הזמין במהלך שיחה.</"
 "i>"
 
-#: ../gtk/parameters.ui.h:71
+#: ../gtk/parameters.ui.h:74
 msgid "<b>Bandwidth control</b>"
 msgstr "<b>בקרת רוחב פס</b>"
 
-#: ../gtk/parameters.ui.h:72
+#: ../gtk/parameters.ui.h:75
 msgid "Codecs"
 msgstr "קודקים"
 
-#: ../gtk/parameters.ui.h:73
+#: ../gtk/parameters.ui.h:76
 msgid "<b>Language</b>"
 msgstr "<b>שפה</b>"
 
-#: ../gtk/parameters.ui.h:74
+#: ../gtk/parameters.ui.h:77
 msgid "Show advanced settings"
 msgstr "הצג הגדרות מתקדמות"
 
-#: ../gtk/parameters.ui.h:75
+#: ../gtk/parameters.ui.h:78
 msgid "<b>Level</b>"
 msgstr "<b>רמה</b>"
 
-#: ../gtk/parameters.ui.h:76
+#: ../gtk/parameters.ui.h:79
 msgid "User interface"
 msgstr "ממשק משתמש"
 
-#: ../gtk/parameters.ui.h:77 ../gtk/ldap.ui.h:2
+#: ../gtk/parameters.ui.h:80 ../gtk/ldap.ui.h:2
 msgid "Server address:"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:78 ../gtk/ldap.ui.h:3
+#: ../gtk/parameters.ui.h:81 ../gtk/ldap.ui.h:3
 msgid "Authentication method:"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:80
+#: ../gtk/parameters.ui.h:83
 msgid "<b>LDAP Account setup</b>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:81
+#: ../gtk/parameters.ui.h:84
 msgid "LDAP"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:82
+#: ../gtk/parameters.ui.h:85
 msgid "Done"
 msgstr "סיום"
 
@@ -1701,56 +1713,56 @@ msgstr ""
 msgid "Ready"
 msgstr "מוכן"
 
-#: ../coreapi/linphonecore.c:2473
+#: ../coreapi/linphonecore.c:2489
 msgid "Configuring"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2638
+#: ../coreapi/linphonecore.c:2654
 msgid "Looking for telephone number destination..."
 msgstr "מחפש כעת עבור יעד מספר טלפון..."
 
-#: ../coreapi/linphonecore.c:2640
+#: ../coreapi/linphonecore.c:2656
 msgid "Could not resolve this number."
 msgstr "לא ניתן לפתור את מספר זה."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2926
+#: ../coreapi/linphonecore.c:2942
 msgid "Contacting"
 msgstr "מתקשר כעת"
 
-#: ../coreapi/linphonecore.c:2931
+#: ../coreapi/linphonecore.c:2947
 msgid "Could not call"
 msgstr "לא ניתן להתקשר"
 
-#: ../coreapi/linphonecore.c:3081
+#: ../coreapi/linphonecore.c:3097
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "הגענו אל המספר המרבי של שיחות מקבילות, עמך הסליחה"
 
-#: ../coreapi/linphonecore.c:3240
+#: ../coreapi/linphonecore.c:3256
 msgid "is contacting you"
 msgstr "מתקשר/ת אליך"
 
-#: ../coreapi/linphonecore.c:3241
+#: ../coreapi/linphonecore.c:3257
 msgid " and asked autoanswer."
 msgstr " ומבקש/ת מענה אוטומטי."
 
-#: ../coreapi/linphonecore.c:3359
+#: ../coreapi/linphonecore.c:3375
 msgid "Modifying call parameters..."
 msgstr "מתאים כעת פרמטרים של שיחה..."
 
-#: ../coreapi/linphonecore.c:3707
+#: ../coreapi/linphonecore.c:3723
 msgid "Connected."
 msgstr "מקושר."
 
-#: ../coreapi/linphonecore.c:3732
+#: ../coreapi/linphonecore.c:3748
 msgid "Call aborted"
 msgstr "קריאה בוטלה"
 
-#: ../coreapi/linphonecore.c:3922
+#: ../coreapi/linphonecore.c:3938
 msgid "Could not pause the call"
 msgstr "לא ניתן להשהות את השיחה"
 
-#: ../coreapi/linphonecore.c:3926
+#: ../coreapi/linphonecore.c:3941
 msgid "Pausing the current call..."
 msgstr "משהה כעת שיחה נוכחית..."
 
@@ -1814,14 +1826,14 @@ msgstr ""
 msgid "Unknown status"
 msgstr ""
 
-#: ../coreapi/proxy.c:319
+#: ../coreapi/proxy.c:327
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
 msgstr ""
 "כתובת sip proxy שהזנת הינה שגויה, זו צריכה להתחיל עם‭\"sip:\" ‬ לאחר שם מארח."
 
-#: ../coreapi/proxy.c:325
+#: ../coreapi/proxy.c:333
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
@@ -1829,7 +1841,7 @@ msgstr ""
 "זהות sip שהוזנה הינה שגויה.\n"
 "זו צריכה להיראות כמו sip:username@proxydomain, למשל sip:alice@example.net"
 
-#: ../coreapi/proxy.c:1377
+#: ../coreapi/proxy.c:1390
 #, c-format
 msgid "Could not login as %s"
 msgstr "לא ניתן להתחבר בזהות %s"
@@ -1943,12 +1955,12 @@ msgstr "רישום אצל %s נכשל: %s"
 msgid "Service unavailable, retrying"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:174
+#: ../coreapi/linphonecall.c:175
 #, c-format
 msgid "Authentication token is %s"
 msgstr "אות האימות הינה %s"
 
-#: ../coreapi/linphonecall.c:3020
+#: ../coreapi/linphonecall.c:3041
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
diff --git a/po/hu.po b/po/hu.po
index e993a1b8a..8d4bef4d7 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-03 13:39+0100\n"
-"PO-Revision-Date: 2014-12-04 09:51+0000\n"
+"POT-Creation-Date: 2015-01-06 12:28+0100\n"
+"PO-Revision-Date: 2015-01-06 11:29+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Hungarian (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/hu/)\n"
@@ -92,31 +92,31 @@ msgstr "Nemtalálható a pixmap fájl: %s"
 msgid "Invalid sip contact !"
 msgstr "Érvénytelen sip partner !"
 
-#: ../gtk/main.c:107
+#: ../gtk/main.c:109
 msgid "log to stdout some debug information while running."
 msgstr "Futás közben némi hibakeresési információ az stdout-ra naplózása."
 
-#: ../gtk/main.c:114
+#: ../gtk/main.c:116
 msgid "path to a file to write logs into."
 msgstr "fájl elérési útja, melybe a naplók kerülnek."
 
-#: ../gtk/main.c:121
+#: ../gtk/main.c:123
 msgid "Start linphone with video disabled."
 msgstr "Linphone indítása, videó kikpacsolva. "
 
-#: ../gtk/main.c:128
+#: ../gtk/main.c:130
 msgid "Start only in the system tray, do not show the main interface."
 msgstr "Csak a tálcaikon indítása, ne mutassa a fő ablakot."
 
-#: ../gtk/main.c:135
+#: ../gtk/main.c:137
 msgid "address to call right now"
 msgstr "Cím azonnali híváshoz"
 
-#: ../gtk/main.c:142
+#: ../gtk/main.c:144
 msgid "if set automatically answer incoming calls"
 msgstr "Bekapcsolva automatikusan válaszol a bejövő hívásokra"
 
-#: ../gtk/main.c:149
+#: ../gtk/main.c:151
 msgid ""
 "Specifiy a working directory (should be the base of the installation, eg: c:"
 "\\Program Files\\Linphone)"
@@ -124,15 +124,19 @@ msgstr ""
 "Adjon meg egy munkakönyvtárat (ennek az installációs könyvtárnak kéne "
 "lennie, pl. C:\\Program Files\\Linphone)"
 
-#: ../gtk/main.c:156
+#: ../gtk/main.c:158
 msgid "Configuration file"
 msgstr ""
 
-#: ../gtk/main.c:163
+#: ../gtk/main.c:165
 msgid "Run the audio assistant"
 msgstr ""
 
-#: ../gtk/main.c:1085
+#: ../gtk/main.c:172
+msgid "Run self test and exit 0 if succeed"
+msgstr ""
+
+#: ../gtk/main.c:1083
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
@@ -145,66 +149,66 @@ msgstr ""
 "szeretné adni a partnerlistához?\n"
 "Ha nemmel válaszol, ez a személy átmenetileg tiltólistára kerül."
 
-#: ../gtk/main.c:1162
+#: ../gtk/main.c:1160
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
 msgstr ""
 
-#: ../gtk/main.c:1283
+#: ../gtk/main.c:1281
 msgid "Call error"
 msgstr "Hiba a hívás közben"
 
-#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3751
+#: ../gtk/main.c:1284 ../coreapi/linphonecore.c:3767
 msgid "Call ended"
 msgstr "Hívás vége"
 
-#: ../gtk/main.c:1289 ../coreapi/call_log.c:221
+#: ../gtk/main.c:1287 ../coreapi/call_log.c:221
 msgid "Incoming call"
 msgstr "Beérkező hívás"
 
-#: ../gtk/main.c:1291 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
+#: ../gtk/main.c:1289 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
 msgid "Answer"
 msgstr "Hívás fogadása"
 
-#: ../gtk/main.c:1293 ../gtk/main.ui.h:6
+#: ../gtk/main.c:1291 ../gtk/main.ui.h:6
 msgid "Decline"
 msgstr "Elutasítás"
 
-#: ../gtk/main.c:1299
+#: ../gtk/main.c:1297
 msgid "Call paused"
 msgstr "Hívás várakoztatva"
 
-#: ../gtk/main.c:1299
+#: ../gtk/main.c:1297
 #, c-format
 msgid "<b>by %s</b>"
 msgstr "<b>a következő által: %s</b>"
 
-#: ../gtk/main.c:1366
+#: ../gtk/main.c:1367
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr "%s szerené elidítani a videót. Elfogadja?"
 
-#: ../gtk/main.c:1528
+#: ../gtk/main.c:1529
 msgid "Website link"
 msgstr "Internetes oldal"
 
-#: ../gtk/main.c:1577
+#: ../gtk/main.c:1578
 msgid "Linphone - a video internet phone"
 msgstr "Linphone - internetes videó telefon"
 
-#: ../gtk/main.c:1669
+#: ../gtk/main.c:1670
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (Alapértelmezett)"
 
-#: ../gtk/main.c:2006 ../coreapi/callbacks.c:986
+#: ../gtk/main.c:2002 ../coreapi/callbacks.c:986
 #, c-format
 msgid "We are transferred to %s"
 msgstr "Át vagyunk irányítva ide: %s"
 
-#: ../gtk/main.c:2016
+#: ../gtk/main.c:2012
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
@@ -212,7 +216,7 @@ msgstr ""
 "Hangkártya nincs érzékelve ezen a számítógépen.\n"
 "Nem fog tudni hang hívásokat küldeni vagy fogadni."
 
-#: ../gtk/main.c:2157
+#: ../gtk/main.c:2156
 msgid "A free SIP video-phone"
 msgstr "Egy ingyenes SIP video-telefon"
 
@@ -281,7 +285,7 @@ msgstr "Paraméterek"
 msgid "Enabled"
 msgstr "Engedélyezve"
 
-#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763
+#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763 ../gtk/parameters.ui.h:20
 msgid "Disabled"
 msgstr "Tiltva"
 
@@ -446,7 +450,7 @@ msgstr ""
 msgid "Enter your linphone.org username"
 msgstr "Adja meg linphone.org felhasználónevét"
 
-#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:79 ../gtk/ldap.ui.h:4
+#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:82 ../gtk/ldap.ui.h:4
 msgid "Username:"
 msgstr "Felhasználónév:"
 
@@ -638,7 +642,7 @@ msgstr ""
 msgid "%.3f seconds"
 msgstr "%.3f másodperc"
 
-#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12 ../gtk/videowindow.c:232
+#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12 ../gtk/videowindow.c:235
 msgid "Hang up"
 msgstr "Befejezés"
 
@@ -1224,210 +1228,218 @@ msgid "<b>Transport</b>"
 msgstr "<b>Átvitel</b>"
 
 #: ../gtk/parameters.ui.h:19
-msgid "Media encryption type"
-msgstr "Média titkosítás típusa"
-
-#: ../gtk/parameters.ui.h:20
-msgid "Video RTP/UDP:"
-msgstr "Videó RTP/UDP:"
-
-#: ../gtk/parameters.ui.h:21
-msgid "Audio RTP/UDP:"
-msgstr "Audió RTP/UDP:"
-
-#: ../gtk/parameters.ui.h:22
-msgid "Fixed"
-msgstr "Javítva"
-
-#: ../gtk/parameters.ui.h:23
-msgid "Media encryption is mandatory"
-msgstr "Média titkosítás kötelező"
-
-#: ../gtk/parameters.ui.h:24
-msgid "Tunnel"
-msgstr "Alagút"
-
-#: ../gtk/parameters.ui.h:25
-msgid "DSCP fields"
-msgstr "DSCP mezők"
-
-#: ../gtk/parameters.ui.h:26
-msgid "SIP/TCP port"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:27
 msgid "SIP/UDP port"
 msgstr ""
 
+#: ../gtk/parameters.ui.h:21
+msgid "Random"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:22
+msgid "SIP/TCP port"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:23
+msgid "Audio RTP/UDP:"
+msgstr "Audió RTP/UDP:"
+
+#: ../gtk/parameters.ui.h:24
+msgid "Fixed"
+msgstr "Javítva"
+
+#: ../gtk/parameters.ui.h:25
+msgid "Video RTP/UDP:"
+msgstr "Videó RTP/UDP:"
+
+#: ../gtk/parameters.ui.h:26
+msgid "Media encryption type"
+msgstr "Média titkosítás típusa"
+
+#: ../gtk/parameters.ui.h:27
+msgid "Media encryption is mandatory"
+msgstr "Média titkosítás kötelező"
+
 #: ../gtk/parameters.ui.h:28
+msgid "Tunnel"
+msgstr "Alagút"
+
+#: ../gtk/parameters.ui.h:29
+msgid "DSCP fields"
+msgstr "DSCP mezők"
+
+#: ../gtk/parameters.ui.h:30
 msgid "<b>Network protocol and ports</b>"
 msgstr "<b>Hálózati protokoll és port</b>"
 
-#: ../gtk/parameters.ui.h:29
+#: ../gtk/parameters.ui.h:31
 msgid "Direct connection to the Internet"
 msgstr "Közvetlen Internet kapcsolat"
 
-#: ../gtk/parameters.ui.h:30
+#: ../gtk/parameters.ui.h:32
 msgid "Behind NAT / Firewall (specify gateway IP )"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:31
+#: ../gtk/parameters.ui.h:33
 msgid "Behind NAT / Firewall (use STUN to resolve)"
 msgstr "NAT / tűzfal mögött (STUN használata a feloldáshoz)"
 
-#: ../gtk/parameters.ui.h:32
+#: ../gtk/parameters.ui.h:34
 msgid "Behind NAT / Firewall (use ICE)"
 msgstr "NAT / tűzfal mögött (ICE használata)"
 
-#: ../gtk/parameters.ui.h:33
+#: ../gtk/parameters.ui.h:35
 msgid "Behind NAT / Firewall (use uPnP)"
 msgstr "NAT / tűzfal mögött (uPnP használata)"
 
-#: ../gtk/parameters.ui.h:34
+#: ../gtk/parameters.ui.h:36
 msgid "Public IP address:"
 msgstr "Publikus IP cím:"
 
-#: ../gtk/parameters.ui.h:35
+#: ../gtk/parameters.ui.h:37
 msgid "Stun server:"
 msgstr "STUN kiszolgáló:"
 
-#: ../gtk/parameters.ui.h:36
+#: ../gtk/parameters.ui.h:38
 msgid "<b>NAT and Firewall</b>"
 msgstr "<b>NAT és tűzfal</b>"
 
-#: ../gtk/parameters.ui.h:37
+#: ../gtk/parameters.ui.h:39
 msgid "Network settings"
 msgstr "Hálózati beállítások"
 
-#: ../gtk/parameters.ui.h:38
+#: ../gtk/parameters.ui.h:40
 msgid "Ring sound:"
 msgstr "Csengőhang:"
 
-#: ../gtk/parameters.ui.h:39
+#: ../gtk/parameters.ui.h:41
 msgid "ALSA special device (optional):"
 msgstr "Különleges ALSA eszköz (nem kötelező):"
 
-#: ../gtk/parameters.ui.h:40
+#: ../gtk/parameters.ui.h:42
 msgid "Capture device:"
 msgstr "Felvevő hang eszköz:"
 
-#: ../gtk/parameters.ui.h:41
+#: ../gtk/parameters.ui.h:43
 msgid "Ring device:"
 msgstr "Csengőhang eszköz:"
 
-#: ../gtk/parameters.ui.h:42
+#: ../gtk/parameters.ui.h:44
 msgid "Playback device:"
 msgstr "Lejátszó hang eszköz:"
 
-#: ../gtk/parameters.ui.h:43
+#: ../gtk/parameters.ui.h:45
 msgid "Enable echo cancellation"
 msgstr "Visszhang-elnyomás engedélyezése"
 
-#: ../gtk/parameters.ui.h:44
+#: ../gtk/parameters.ui.h:46
 msgid "<b>Audio</b>"
 msgstr "<b>Audió</b>"
 
-#: ../gtk/parameters.ui.h:45
+#: ../gtk/parameters.ui.h:47
 msgid "Video input device:"
 msgstr "Videó bemeneti eszköz:"
 
-#: ../gtk/parameters.ui.h:46
+#: ../gtk/parameters.ui.h:48
 msgid "Prefered video resolution:"
 msgstr "Kívánt videó felbontás:"
 
-#: ../gtk/parameters.ui.h:47
+#: ../gtk/parameters.ui.h:49
 msgid "Video output method:"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:48
+#: ../gtk/parameters.ui.h:50
+msgid "Show camera preview"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:51
 msgid "<b>Video</b>"
 msgstr "<b>Videó</b>"
 
-#: ../gtk/parameters.ui.h:49
+#: ../gtk/parameters.ui.h:52
 msgid "Multimedia settings"
 msgstr "Multimédia beállítások"
 
-#: ../gtk/parameters.ui.h:50
+#: ../gtk/parameters.ui.h:53
 msgid "This section defines your SIP address when not using a SIP account"
 msgstr "Ez a rész határozza meg az Ön SIP címét, amikor nem használ SIP fiókot"
 
-#: ../gtk/parameters.ui.h:51
+#: ../gtk/parameters.ui.h:54
 msgid "Your display name (eg: John Doe):"
 msgstr "Az Ön megjelenített neve (pl. Kis József):"
 
-#: ../gtk/parameters.ui.h:52
+#: ../gtk/parameters.ui.h:55
 msgid "Your username:"
 msgstr "Az Ön felhasználóneve:"
 
-#: ../gtk/parameters.ui.h:53
+#: ../gtk/parameters.ui.h:56
 msgid "Your resulting SIP address:"
 msgstr "Az Ön így keletkezett SIP címe:"
 
-#: ../gtk/parameters.ui.h:54
+#: ../gtk/parameters.ui.h:57
 msgid "<b>Default identity</b>"
 msgstr "<b>Alapértelmezett identitás</b>"
 
-#: ../gtk/parameters.ui.h:55
+#: ../gtk/parameters.ui.h:58
 msgid "Wizard"
 msgstr "Varázsló"
 
-#: ../gtk/parameters.ui.h:56
+#: ../gtk/parameters.ui.h:59
 msgid "Add"
 msgstr "Hozzáadás"
 
-#: ../gtk/parameters.ui.h:57
+#: ../gtk/parameters.ui.h:60
 msgid "Edit"
 msgstr "Szerkesztés"
 
-#: ../gtk/parameters.ui.h:58
+#: ../gtk/parameters.ui.h:61
 msgid "Remove"
 msgstr "Eltávolítás"
 
-#: ../gtk/parameters.ui.h:59
+#: ../gtk/parameters.ui.h:62
 msgid "<b>Proxy accounts</b>"
 msgstr "<b>Proxy fiókok</b>"
 
-#: ../gtk/parameters.ui.h:60
+#: ../gtk/parameters.ui.h:63
 msgid "Erase all passwords"
 msgstr "Minden kulcsszó törlése"
 
-#: ../gtk/parameters.ui.h:61
+#: ../gtk/parameters.ui.h:64
 msgid "<b>Privacy</b>"
 msgstr "<b>Titoktartás</b>"
 
-#: ../gtk/parameters.ui.h:62
+#: ../gtk/parameters.ui.h:65
 msgid "Manage SIP Accounts"
 msgstr "SIP fiókok beállítása"
 
-#: ../gtk/parameters.ui.h:63 ../gtk/tunnel_config.ui.h:4
+#: ../gtk/parameters.ui.h:66 ../gtk/tunnel_config.ui.h:4
 msgid "Enable"
 msgstr "Engedélyezés"
 
-#: ../gtk/parameters.ui.h:64 ../gtk/tunnel_config.ui.h:5
+#: ../gtk/parameters.ui.h:67 ../gtk/tunnel_config.ui.h:5
 msgid "Disable"
 msgstr "Tiltás"
 
-#: ../gtk/parameters.ui.h:65
+#: ../gtk/parameters.ui.h:68
 msgid "<b>Codecs</b>"
 msgstr "<b>Kódekek</b>"
 
-#: ../gtk/parameters.ui.h:66
+#: ../gtk/parameters.ui.h:69
 msgid "0 stands for \"unlimited\""
 msgstr "A 0 jelentése \"végtelen\""
 
-#: ../gtk/parameters.ui.h:67
+#: ../gtk/parameters.ui.h:70
 msgid "Upload speed limit in Kbit/sec:"
 msgstr "Feltöltési sebesség korlát (kbit/mp):"
 
-#: ../gtk/parameters.ui.h:68
+#: ../gtk/parameters.ui.h:71
 msgid "Download speed limit in Kbit/sec:"
 msgstr "Letöltési sebesség korlát (kbit/mp):"
 
-#: ../gtk/parameters.ui.h:69
+#: ../gtk/parameters.ui.h:72
 msgid "Enable adaptive rate control"
 msgstr "Alkalmazkodó mérték-szabályozás engedélyezése"
 
-#: ../gtk/parameters.ui.h:70
+#: ../gtk/parameters.ui.h:73
 msgid ""
 "<i>Adaptive rate control is a technique to dynamically guess the available "
 "bandwidth during a call.</i>"
@@ -1435,47 +1447,47 @@ msgstr ""
 "<i>Az alkalmazkodó mérték-szabályozás egy módszer, mely erőteljesen próbálja "
 "megállapítani a rendelkezésre álló sávszélességet hívás alatt.</i>"
 
-#: ../gtk/parameters.ui.h:71
+#: ../gtk/parameters.ui.h:74
 msgid "<b>Bandwidth control</b>"
 msgstr "<b>Sávszélesség szabályozása</b>"
 
-#: ../gtk/parameters.ui.h:72
+#: ../gtk/parameters.ui.h:75
 msgid "Codecs"
 msgstr "Kódekek"
 
-#: ../gtk/parameters.ui.h:73
+#: ../gtk/parameters.ui.h:76
 msgid "<b>Language</b>"
 msgstr "<b>Nyelv</b>"
 
-#: ../gtk/parameters.ui.h:74
+#: ../gtk/parameters.ui.h:77
 msgid "Show advanced settings"
 msgstr "Haladó beállítások megjelenítése"
 
-#: ../gtk/parameters.ui.h:75
+#: ../gtk/parameters.ui.h:78
 msgid "<b>Level</b>"
 msgstr "<b>Szint</b>"
 
-#: ../gtk/parameters.ui.h:76
+#: ../gtk/parameters.ui.h:79
 msgid "User interface"
 msgstr "Felhasználói környezet"
 
-#: ../gtk/parameters.ui.h:77 ../gtk/ldap.ui.h:2
+#: ../gtk/parameters.ui.h:80 ../gtk/ldap.ui.h:2
 msgid "Server address:"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:78 ../gtk/ldap.ui.h:3
+#: ../gtk/parameters.ui.h:81 ../gtk/ldap.ui.h:3
 msgid "Authentication method:"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:80
+#: ../gtk/parameters.ui.h:83
 msgid "<b>LDAP Account setup</b>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:81
+#: ../gtk/parameters.ui.h:84
 msgid "LDAP"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:82
+#: ../gtk/parameters.ui.h:85
 msgid "Done"
 msgstr "Kész"
 
@@ -1701,56 +1713,56 @@ msgstr ""
 msgid "Ready"
 msgstr "Kész"
 
-#: ../coreapi/linphonecore.c:2473
+#: ../coreapi/linphonecore.c:2489
 msgid "Configuring"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2638
+#: ../coreapi/linphonecore.c:2654
 msgid "Looking for telephone number destination..."
 msgstr "Telefonszám-cél keresése..."
 
-#: ../coreapi/linphonecore.c:2640
+#: ../coreapi/linphonecore.c:2656
 msgid "Could not resolve this number."
 msgstr "Nem sikkerült értelmezni a számot."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2926
+#: ../coreapi/linphonecore.c:2942
 msgid "Contacting"
 msgstr "Kapcsolódás"
 
-#: ../coreapi/linphonecore.c:2931
+#: ../coreapi/linphonecore.c:2947
 msgid "Could not call"
 msgstr "Nem sikerült hívni"
 
-#: ../coreapi/linphonecore.c:3081
+#: ../coreapi/linphonecore.c:3097
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "Elnézést, elértük a egyidejű hívások maximális számát"
 
-#: ../coreapi/linphonecore.c:3240
+#: ../coreapi/linphonecore.c:3256
 msgid "is contacting you"
 msgstr "kapcsolatba lépett veled."
 
-#: ../coreapi/linphonecore.c:3241
+#: ../coreapi/linphonecore.c:3257
 msgid " and asked autoanswer."
 msgstr "és automatikus választ kért."
 
-#: ../coreapi/linphonecore.c:3359
+#: ../coreapi/linphonecore.c:3375
 msgid "Modifying call parameters..."
 msgstr "A hívási jellemzők módosítása..."
 
-#: ../coreapi/linphonecore.c:3707
+#: ../coreapi/linphonecore.c:3723
 msgid "Connected."
 msgstr "Kapcsolódva."
 
-#: ../coreapi/linphonecore.c:3732
+#: ../coreapi/linphonecore.c:3748
 msgid "Call aborted"
 msgstr "Hívás megszakítva"
 
-#: ../coreapi/linphonecore.c:3922
+#: ../coreapi/linphonecore.c:3938
 msgid "Could not pause the call"
 msgstr "Nem sikerült várakoztatni a hívást"
 
-#: ../coreapi/linphonecore.c:3926
+#: ../coreapi/linphonecore.c:3941
 msgid "Pausing the current call..."
 msgstr "Jelenlegi hívás várakoztatásának aktiválása..."
 
@@ -1814,7 +1826,7 @@ msgstr ""
 msgid "Unknown status"
 msgstr ""
 
-#: ../coreapi/proxy.c:319
+#: ../coreapi/proxy.c:327
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
@@ -1822,7 +1834,7 @@ msgstr ""
 "Az Ön által megadott SIP proxy cím érvénytelen. \"sip:\"-tal kell kezdődnie, "
 "ezt egy hosztnév követi."
 
-#: ../coreapi/proxy.c:325
+#: ../coreapi/proxy.c:333
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
@@ -1831,7 +1843,7 @@ msgstr ""
 "Így kéne kinéznie: sip:felhasznalonev@proxytartomany, például sip:"
 "aladar@pelda.hu"
 
-#: ../coreapi/proxy.c:1377
+#: ../coreapi/proxy.c:1390
 #, c-format
 msgid "Could not login as %s"
 msgstr "Nem sikerült belépni ezzel: %s"
@@ -1946,12 +1958,12 @@ msgstr "A regisztáció a %s -n nem sikerült: %s"
 msgid "Service unavailable, retrying"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:174
+#: ../coreapi/linphonecall.c:175
 #, c-format
 msgid "Authentication token is %s"
 msgstr "Hitelesítési jel: %s"
 
-#: ../coreapi/linphonecall.c:3020
+#: ../coreapi/linphonecall.c:3041
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
diff --git a/po/it.po b/po/it.po
index b2f0d2ca6..90bd17dca 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-03 13:39+0100\n"
-"PO-Revision-Date: 2014-12-04 09:51+0000\n"
+"POT-Creation-Date: 2015-01-06 12:28+0100\n"
+"PO-Revision-Date: 2015-01-06 11:29+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/it/)\n"
@@ -92,45 +92,49 @@ msgstr ""
 msgid "Invalid sip contact !"
 msgstr "Contatto SIP non valido"
 
-#: ../gtk/main.c:107
+#: ../gtk/main.c:109
 msgid "log to stdout some debug information while running."
 msgstr ""
 
-#: ../gtk/main.c:114
+#: ../gtk/main.c:116
 msgid "path to a file to write logs into."
 msgstr ""
 
-#: ../gtk/main.c:121
+#: ../gtk/main.c:123
 msgid "Start linphone with video disabled."
 msgstr ""
 
-#: ../gtk/main.c:128
+#: ../gtk/main.c:130
 msgid "Start only in the system tray, do not show the main interface."
 msgstr ""
 
-#: ../gtk/main.c:135
+#: ../gtk/main.c:137
 msgid "address to call right now"
 msgstr ""
 
-#: ../gtk/main.c:142
+#: ../gtk/main.c:144
 msgid "if set automatically answer incoming calls"
 msgstr ""
 
-#: ../gtk/main.c:149
+#: ../gtk/main.c:151
 msgid ""
 "Specifiy a working directory (should be the base of the installation, eg: c:"
 "\\Program Files\\Linphone)"
 msgstr ""
 
-#: ../gtk/main.c:156
+#: ../gtk/main.c:158
 msgid "Configuration file"
 msgstr ""
 
-#: ../gtk/main.c:163
+#: ../gtk/main.c:165
 msgid "Run the audio assistant"
 msgstr ""
 
-#: ../gtk/main.c:1085
+#: ../gtk/main.c:172
+msgid "Run self test and exit 0 if succeed"
+msgstr ""
+
+#: ../gtk/main.c:1083
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
@@ -142,72 +146,72 @@ msgstr ""
 "veda il tuo stato o aggiungerlo alla tua lista dei contatti Se rispondi no "
 "questo utente sarà momentaneamente bloccato."
 
-#: ../gtk/main.c:1162
+#: ../gtk/main.c:1160
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
 msgstr ""
 
-#: ../gtk/main.c:1283
+#: ../gtk/main.c:1281
 msgid "Call error"
 msgstr ""
 
-#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3751
+#: ../gtk/main.c:1284 ../coreapi/linphonecore.c:3767
 msgid "Call ended"
 msgstr "Chiamata terminata"
 
-#: ../gtk/main.c:1289 ../coreapi/call_log.c:221
+#: ../gtk/main.c:1287 ../coreapi/call_log.c:221
 msgid "Incoming call"
 msgstr "Chimata in entrata"
 
-#: ../gtk/main.c:1291 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
+#: ../gtk/main.c:1289 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
 msgid "Answer"
 msgstr ""
 
-#: ../gtk/main.c:1293 ../gtk/main.ui.h:6
+#: ../gtk/main.c:1291 ../gtk/main.ui.h:6
 msgid "Decline"
 msgstr "Rifiuta"
 
-#: ../gtk/main.c:1299
+#: ../gtk/main.c:1297
 msgid "Call paused"
 msgstr ""
 
-#: ../gtk/main.c:1299
+#: ../gtk/main.c:1297
 #, c-format
 msgid "<b>by %s</b>"
 msgstr ""
 
-#: ../gtk/main.c:1366
+#: ../gtk/main.c:1367
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr ""
 
-#: ../gtk/main.c:1528
+#: ../gtk/main.c:1529
 msgid "Website link"
 msgstr ""
 
-#: ../gtk/main.c:1577
+#: ../gtk/main.c:1578
 msgid "Linphone - a video internet phone"
 msgstr ""
 
-#: ../gtk/main.c:1669
+#: ../gtk/main.c:1670
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (Default)"
 
-#: ../gtk/main.c:2006 ../coreapi/callbacks.c:986
+#: ../gtk/main.c:2002 ../coreapi/callbacks.c:986
 #, c-format
 msgid "We are transferred to %s"
 msgstr ""
 
-#: ../gtk/main.c:2016
+#: ../gtk/main.c:2012
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
 msgstr ""
 
-#: ../gtk/main.c:2157
+#: ../gtk/main.c:2156
 msgid "A free SIP video-phone"
 msgstr ""
 
@@ -276,7 +280,7 @@ msgstr "Parametri"
 msgid "Enabled"
 msgstr "Attivato"
 
-#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763
+#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763 ../gtk/parameters.ui.h:20
 msgid "Disabled"
 msgstr "Disattivato"
 
@@ -439,7 +443,7 @@ msgstr ""
 msgid "Enter your linphone.org username"
 msgstr ""
 
-#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:79 ../gtk/ldap.ui.h:4
+#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:82 ../gtk/ldap.ui.h:4
 msgid "Username:"
 msgstr "Manuale utente"
 
@@ -623,7 +627,7 @@ msgstr ""
 msgid "%.3f seconds"
 msgstr ""
 
-#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12 ../gtk/videowindow.c:232
+#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12 ../gtk/videowindow.c:235
 msgid "Hang up"
 msgstr ""
 
@@ -1205,257 +1209,265 @@ msgid "<b>Transport</b>"
 msgstr "<b>Transporto</b>"
 
 #: ../gtk/parameters.ui.h:19
-msgid "Media encryption type"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:20
-msgid "Video RTP/UDP:"
-msgstr "Video RTP/UDP"
-
-#: ../gtk/parameters.ui.h:21
-msgid "Audio RTP/UDP:"
-msgstr "Audio RTP/UDP:"
-
-#: ../gtk/parameters.ui.h:22
-msgid "Fixed"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:23
-msgid "Media encryption is mandatory"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:24
-msgid "Tunnel"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:25
-msgid "DSCP fields"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:26
-msgid "SIP/TCP port"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:27
 msgid "SIP/UDP port"
 msgstr ""
 
+#: ../gtk/parameters.ui.h:21
+msgid "Random"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:22
+msgid "SIP/TCP port"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:23
+msgid "Audio RTP/UDP:"
+msgstr "Audio RTP/UDP:"
+
+#: ../gtk/parameters.ui.h:24
+msgid "Fixed"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:25
+msgid "Video RTP/UDP:"
+msgstr "Video RTP/UDP"
+
+#: ../gtk/parameters.ui.h:26
+msgid "Media encryption type"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:27
+msgid "Media encryption is mandatory"
+msgstr ""
+
 #: ../gtk/parameters.ui.h:28
-msgid "<b>Network protocol and ports</b>"
+msgid "Tunnel"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:29
-msgid "Direct connection to the Internet"
-msgstr "Connessione diretta a internet"
+msgid "DSCP fields"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:30
-msgid "Behind NAT / Firewall (specify gateway IP )"
+msgid "<b>Network protocol and ports</b>"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:31
-msgid "Behind NAT / Firewall (use STUN to resolve)"
-msgstr "Dietro NAT / Firewall (utilizza STUN)"
+msgid "Direct connection to the Internet"
+msgstr "Connessione diretta a internet"
 
 #: ../gtk/parameters.ui.h:32
-msgid "Behind NAT / Firewall (use ICE)"
+msgid "Behind NAT / Firewall (specify gateway IP )"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:33
+msgid "Behind NAT / Firewall (use STUN to resolve)"
+msgstr "Dietro NAT / Firewall (utilizza STUN)"
+
+#: ../gtk/parameters.ui.h:34
+msgid "Behind NAT / Firewall (use ICE)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:35
 msgid "Behind NAT / Firewall (use uPnP)"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:34
+#: ../gtk/parameters.ui.h:36
 msgid "Public IP address:"
 msgstr "Indirizzo ip pubblico:"
 
-#: ../gtk/parameters.ui.h:35
+#: ../gtk/parameters.ui.h:37
 msgid "Stun server:"
 msgstr "Stun server:"
 
-#: ../gtk/parameters.ui.h:36
+#: ../gtk/parameters.ui.h:38
 msgid "<b>NAT and Firewall</b>"
 msgstr "<b>NAT and Firewall</b>"
 
-#: ../gtk/parameters.ui.h:37
+#: ../gtk/parameters.ui.h:39
 msgid "Network settings"
 msgstr "Impostazioni di rete"
 
-#: ../gtk/parameters.ui.h:38
+#: ../gtk/parameters.ui.h:40
 msgid "Ring sound:"
 msgstr "Suoneria:"
 
-#: ../gtk/parameters.ui.h:39
+#: ../gtk/parameters.ui.h:41
 msgid "ALSA special device (optional):"
 msgstr "Dispositivo ALSA (optional):"
 
-#: ../gtk/parameters.ui.h:40
+#: ../gtk/parameters.ui.h:42
 msgid "Capture device:"
 msgstr "Dispositivo microfono:"
 
-#: ../gtk/parameters.ui.h:41
+#: ../gtk/parameters.ui.h:43
 msgid "Ring device:"
 msgstr "Dispositivo squillo:"
 
-#: ../gtk/parameters.ui.h:42
+#: ../gtk/parameters.ui.h:44
 msgid "Playback device:"
 msgstr "Dispositivo uscita audio:"
 
-#: ../gtk/parameters.ui.h:43
+#: ../gtk/parameters.ui.h:45
 msgid "Enable echo cancellation"
 msgstr "Attiva cancellazione eco"
 
-#: ../gtk/parameters.ui.h:44
+#: ../gtk/parameters.ui.h:46
 msgid "<b>Audio</b>"
 msgstr "<b>Audio</b>"
 
-#: ../gtk/parameters.ui.h:45
+#: ../gtk/parameters.ui.h:47
 msgid "Video input device:"
 msgstr "Dispositivo Video:"
 
-#: ../gtk/parameters.ui.h:46
+#: ../gtk/parameters.ui.h:48
 msgid "Prefered video resolution:"
 msgstr "Risoluzione video preferita"
 
-#: ../gtk/parameters.ui.h:47
+#: ../gtk/parameters.ui.h:49
 msgid "Video output method:"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:48
+#: ../gtk/parameters.ui.h:50
+msgid "Show camera preview"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:51
 msgid "<b>Video</b>"
 msgstr "<b>Video</b>"
 
-#: ../gtk/parameters.ui.h:49
+#: ../gtk/parameters.ui.h:52
 msgid "Multimedia settings"
 msgstr "Impostazioni multimediali"
 
-#: ../gtk/parameters.ui.h:50
+#: ../gtk/parameters.ui.h:53
 msgid "This section defines your SIP address when not using a SIP account"
 msgstr ""
 "questa sezione definisce il tuo indirizzo SIP se non hai account attivi"
 
-#: ../gtk/parameters.ui.h:51
+#: ../gtk/parameters.ui.h:54
 msgid "Your display name (eg: John Doe):"
 msgstr "Nome visualizzato (es: Mario Rossi):"
 
-#: ../gtk/parameters.ui.h:52
+#: ../gtk/parameters.ui.h:55
 msgid "Your username:"
 msgstr "Username"
 
-#: ../gtk/parameters.ui.h:53
+#: ../gtk/parameters.ui.h:56
 msgid "Your resulting SIP address:"
 msgstr "Il tuo indirizzo sip:"
 
-#: ../gtk/parameters.ui.h:54
+#: ../gtk/parameters.ui.h:57
 msgid "<b>Default identity</b>"
 msgstr "<b>Identità di default</b>"
 
-#: ../gtk/parameters.ui.h:55
+#: ../gtk/parameters.ui.h:58
 msgid "Wizard"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:56
+#: ../gtk/parameters.ui.h:59
 msgid "Add"
 msgstr "Aggiungi"
 
-#: ../gtk/parameters.ui.h:57
+#: ../gtk/parameters.ui.h:60
 msgid "Edit"
 msgstr "Edita"
 
-#: ../gtk/parameters.ui.h:58
+#: ../gtk/parameters.ui.h:61
 msgid "Remove"
 msgstr "Rimuovi"
 
-#: ../gtk/parameters.ui.h:59
+#: ../gtk/parameters.ui.h:62
 msgid "<b>Proxy accounts</b>"
 msgstr "<b>Account proxy</b>"
 
-#: ../gtk/parameters.ui.h:60
+#: ../gtk/parameters.ui.h:63
 msgid "Erase all passwords"
 msgstr "Cancella tutte le password"
 
-#: ../gtk/parameters.ui.h:61
+#: ../gtk/parameters.ui.h:64
 msgid "<b>Privacy</b>"
 msgstr "<b>Privacy</b>"
 
-#: ../gtk/parameters.ui.h:62
+#: ../gtk/parameters.ui.h:65
 msgid "Manage SIP Accounts"
 msgstr "Gestici SIP Account"
 
-#: ../gtk/parameters.ui.h:63 ../gtk/tunnel_config.ui.h:4
+#: ../gtk/parameters.ui.h:66 ../gtk/tunnel_config.ui.h:4
 msgid "Enable"
 msgstr "Attivato"
 
-#: ../gtk/parameters.ui.h:64 ../gtk/tunnel_config.ui.h:5
+#: ../gtk/parameters.ui.h:67 ../gtk/tunnel_config.ui.h:5
 msgid "Disable"
 msgstr "Disattivato"
 
-#: ../gtk/parameters.ui.h:65
+#: ../gtk/parameters.ui.h:68
 msgid "<b>Codecs</b>"
 msgstr "<b>Codecs</b>"
 
-#: ../gtk/parameters.ui.h:66
+#: ../gtk/parameters.ui.h:69
 msgid "0 stands for \"unlimited\""
 msgstr "0 sta per illimitato"
 
-#: ../gtk/parameters.ui.h:67
+#: ../gtk/parameters.ui.h:70
 msgid "Upload speed limit in Kbit/sec:"
 msgstr "Velocità massima in upload Kbit/sec:"
 
-#: ../gtk/parameters.ui.h:68
+#: ../gtk/parameters.ui.h:71
 msgid "Download speed limit in Kbit/sec:"
 msgstr "Velocita massima in Dowload Kbit/sec"
 
-#: ../gtk/parameters.ui.h:69
+#: ../gtk/parameters.ui.h:72
 msgid "Enable adaptive rate control"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:70
+#: ../gtk/parameters.ui.h:73
 msgid ""
 "<i>Adaptive rate control is a technique to dynamically guess the available "
 "bandwidth during a call.</i>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:71
+#: ../gtk/parameters.ui.h:74
 msgid "<b>Bandwidth control</b>"
 msgstr "<b>Gestione banda</b>"
 
-#: ../gtk/parameters.ui.h:72
+#: ../gtk/parameters.ui.h:75
 msgid "Codecs"
 msgstr "Codec"
 
-#: ../gtk/parameters.ui.h:73
+#: ../gtk/parameters.ui.h:76
 msgid "<b>Language</b>"
 msgstr "<b>Linguaggio</b>"
 
-#: ../gtk/parameters.ui.h:74
+#: ../gtk/parameters.ui.h:77
 msgid "Show advanced settings"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:75
+#: ../gtk/parameters.ui.h:78
 msgid "<b>Level</b>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:76
+#: ../gtk/parameters.ui.h:79
 msgid "User interface"
 msgstr "Interfaccia utente"
 
-#: ../gtk/parameters.ui.h:77 ../gtk/ldap.ui.h:2
+#: ../gtk/parameters.ui.h:80 ../gtk/ldap.ui.h:2
 msgid "Server address:"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:78 ../gtk/ldap.ui.h:3
+#: ../gtk/parameters.ui.h:81 ../gtk/ldap.ui.h:3
 msgid "Authentication method:"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:80
+#: ../gtk/parameters.ui.h:83
 msgid "<b>LDAP Account setup</b>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:81
+#: ../gtk/parameters.ui.h:84
 msgid "LDAP"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:82
+#: ../gtk/parameters.ui.h:85
 msgid "Done"
 msgstr "Fatto"
 
@@ -1681,56 +1693,56 @@ msgstr ""
 msgid "Ready"
 msgstr "Pronto"
 
-#: ../coreapi/linphonecore.c:2473
+#: ../coreapi/linphonecore.c:2489
 msgid "Configuring"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2638
+#: ../coreapi/linphonecore.c:2654
 msgid "Looking for telephone number destination..."
 msgstr "Ricerca numero destinazione..."
 
-#: ../coreapi/linphonecore.c:2640
+#: ../coreapi/linphonecore.c:2656
 msgid "Could not resolve this number."
 msgstr "Impossibile risolvere il numero."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2926
+#: ../coreapi/linphonecore.c:2942
 msgid "Contacting"
 msgstr "In connessione"
 
-#: ../coreapi/linphonecore.c:2931
+#: ../coreapi/linphonecore.c:2947
 msgid "Could not call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3081
+#: ../coreapi/linphonecore.c:3097
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3240
+#: ../coreapi/linphonecore.c:3256
 msgid "is contacting you"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3241
+#: ../coreapi/linphonecore.c:3257
 msgid " and asked autoanswer."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3359
+#: ../coreapi/linphonecore.c:3375
 msgid "Modifying call parameters..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3707
+#: ../coreapi/linphonecore.c:3723
 msgid "Connected."
 msgstr "Connessione"
 
-#: ../coreapi/linphonecore.c:3732
+#: ../coreapi/linphonecore.c:3748
 msgid "Call aborted"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3922
+#: ../coreapi/linphonecore.c:3938
 msgid "Could not pause the call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3926
+#: ../coreapi/linphonecore.c:3941
 msgid "Pausing the current call..."
 msgstr ""
 
@@ -1794,7 +1806,7 @@ msgstr ""
 msgid "Unknown status"
 msgstr ""
 
-#: ../coreapi/proxy.c:319
+#: ../coreapi/proxy.c:327
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
@@ -1802,7 +1814,7 @@ msgstr ""
 "L'indirizzo sip proxy utilizzato è invalido, deve iniziare con  \"sip:\" "
 "seguito dall' hostaname."
 
-#: ../coreapi/proxy.c:325
+#: ../coreapi/proxy.c:333
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
@@ -1810,7 +1822,7 @@ msgstr ""
 "L'identità sip utilizza è invalida.\n"
 "Dovrebbre essere sip:username@proxydomain, esempio: sip:alice@example.net"
 
-#: ../coreapi/proxy.c:1377
+#: ../coreapi/proxy.c:1390
 #, c-format
 msgid "Could not login as %s"
 msgstr "impossibile login come %s"
@@ -1924,12 +1936,12 @@ msgstr "Registrazione su %s fallita: %s"
 msgid "Service unavailable, retrying"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:174
+#: ../coreapi/linphonecall.c:175
 #, c-format
 msgid "Authentication token is %s"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:3020
+#: ../coreapi/linphonecall.c:3041
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
diff --git a/po/ja.po b/po/ja.po
index a3d453f47..3a4494abe 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -4,14 +4,14 @@
 #
 # Translators:
 # Alexander, 2014
-# Alexander, 2014
+# Alexander, 2014-2015
 msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-03 13:39+0100\n"
-"PO-Revision-Date: 2014-12-04 09:51+0000\n"
-"Last-Translator: Alexander\n"
+"POT-Creation-Date: 2015-01-06 12:28+0100\n"
+"PO-Revision-Date: 2015-01-06 11:29+0000\n"
+"Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/ja/)\n"
 "Language: ja\n"
@@ -94,31 +94,31 @@ msgstr "pixmapファイルが見つかりません %s"
 msgid "Invalid sip contact !"
 msgstr "無効なSIP接続です！"
 
-#: ../gtk/main.c:107
+#: ../gtk/main.c:109
 msgid "log to stdout some debug information while running."
 msgstr "実行中にいくつかのデバッグ情報をstdoutに送信します。"
 
-#: ../gtk/main.c:114
+#: ../gtk/main.c:116
 msgid "path to a file to write logs into."
 msgstr "ログを書き込むファイルへのパス。"
 
-#: ../gtk/main.c:121
+#: ../gtk/main.c:123
 msgid "Start linphone with video disabled."
 msgstr "ビデオを無効にしてLinphoneを開始します。"
 
-#: ../gtk/main.c:128
+#: ../gtk/main.c:130
 msgid "Start only in the system tray, do not show the main interface."
 msgstr "主なインターフェイスを表示しないでシステムトレイに移動します。"
 
-#: ../gtk/main.c:135
+#: ../gtk/main.c:137
 msgid "address to call right now"
 msgstr "今すぐに呼び出す"
 
-#: ../gtk/main.c:142
+#: ../gtk/main.c:144
 msgid "if set automatically answer incoming calls"
 msgstr "着信呼び出しが設定されている場合自動的に応答する"
 
-#: ../gtk/main.c:149
+#: ../gtk/main.c:151
 msgid ""
 "Specifiy a working directory (should be the base of the installation, eg: c:"
 "\\Program Files\\Linphone)"
@@ -126,15 +126,19 @@ msgstr ""
 "作業ディレクトリをSpecifiy (インストールした時のベースである必要があります。"
 "例:c:\\Program Files\\Linphone)"
 
-#: ../gtk/main.c:156
+#: ../gtk/main.c:158
 msgid "Configuration file"
 msgstr "設定ファイル"
 
-#: ../gtk/main.c:163
+#: ../gtk/main.c:165
 msgid "Run the audio assistant"
 msgstr "オーディオアシスタントを実行"
 
-#: ../gtk/main.c:1085
+#: ../gtk/main.c:172
+msgid "Run self test and exit 0 if succeed"
+msgstr ""
+
+#: ../gtk/main.c:1083
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
@@ -147,72 +151,72 @@ msgstr ""
 "す。\n"
 "あなたが拒否すると、この人は一時的にブラックリストへ登録されます。"
 
-#: ../gtk/main.c:1162
+#: ../gtk/main.c:1160
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
 msgstr ""
 
-#: ../gtk/main.c:1283
+#: ../gtk/main.c:1281
 msgid "Call error"
 msgstr "呼出エラー"
 
-#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3751
+#: ../gtk/main.c:1284 ../coreapi/linphonecore.c:3767
 msgid "Call ended"
 msgstr "呼出終了"
 
-#: ../gtk/main.c:1289 ../coreapi/call_log.c:221
+#: ../gtk/main.c:1287 ../coreapi/call_log.c:221
 msgid "Incoming call"
 msgstr "着信"
 
-#: ../gtk/main.c:1291 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
+#: ../gtk/main.c:1289 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
 msgid "Answer"
 msgstr "応答"
 
-#: ../gtk/main.c:1293 ../gtk/main.ui.h:6
+#: ../gtk/main.c:1291 ../gtk/main.ui.h:6
 msgid "Decline"
 msgstr "拒否"
 
-#: ../gtk/main.c:1299
+#: ../gtk/main.c:1297
 msgid "Call paused"
 msgstr "呼び出しの一時停止"
 
-#: ../gtk/main.c:1299
+#: ../gtk/main.c:1297
 #, c-format
 msgid "<b>by %s</b>"
 msgstr "<b>%s</b>"
 
-#: ../gtk/main.c:1366
+#: ../gtk/main.c:1367
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr ""
 
-#: ../gtk/main.c:1528
+#: ../gtk/main.c:1529
 msgid "Website link"
 msgstr "ウェブサイトリンク"
 
-#: ../gtk/main.c:1577
+#: ../gtk/main.c:1578
 msgid "Linphone - a video internet phone"
 msgstr "Linphone - ビデオインターネット電話"
 
-#: ../gtk/main.c:1669
+#: ../gtk/main.c:1670
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (デフォルト)"
 
-#: ../gtk/main.c:2006 ../coreapi/callbacks.c:986
+#: ../gtk/main.c:2002 ../coreapi/callbacks.c:986
 #, c-format
 msgid "We are transferred to %s"
 msgstr "%s に転送しました"
 
-#: ../gtk/main.c:2016
+#: ../gtk/main.c:2012
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
 msgstr ""
 
-#: ../gtk/main.c:2157
+#: ../gtk/main.c:2156
 msgid "A free SIP video-phone"
 msgstr "無料 SIP ビデオ-電話"
 
@@ -281,7 +285,7 @@ msgstr "パラメーター"
 msgid "Enabled"
 msgstr "使用する"
 
-#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763
+#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763 ../gtk/parameters.ui.h:20
 msgid "Disabled"
 msgstr "使用しない"
 
@@ -443,7 +447,7 @@ msgstr ""
 msgid "Enter your linphone.org username"
 msgstr "linphone.orgで取得したユーザー名を入力"
 
-#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:79 ../gtk/ldap.ui.h:4
+#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:82 ../gtk/ldap.ui.h:4
 msgid "Username:"
 msgstr "ユーザー名:"
 
@@ -504,6 +508,7 @@ msgstr ""
 #: ../gtk/setupwizard.c:405
 msgid "Thank you. Your account is now configured and ready for use."
 msgstr ""
+"ありがとう。あなたのアカウントは無事に設定され、使用する準備ができました。"
 
 #: ../gtk/setupwizard.c:413
 msgid ""
@@ -511,10 +516,13 @@ msgid ""
 "email.\n"
 "Then come back here and press Next button."
 msgstr ""
+"送信されたメールの本文内にあるリンクをクリックしてアカウントを有効にしてくだ"
+"さい。\n"
+"その後こちらへ戻って「次へ」を押してください。"
 
 #: ../gtk/setupwizard.c:602
 msgid "SIP account configuration assistant"
-msgstr ""
+msgstr "SIPアカウント設定アシスタント"
 
 #: ../gtk/setupwizard.c:620
 msgid "Welcome to the account setup assistant"
@@ -526,19 +534,19 @@ msgstr "アカウント設定アシスタント"
 
 #: ../gtk/setupwizard.c:631
 msgid "Configure your account (step 1/1)"
-msgstr ""
+msgstr "アカウントを設定します (1/1)"
 
 #: ../gtk/setupwizard.c:636
 msgid "Enter your sip username (step 1/1)"
-msgstr ""
+msgstr "SIPのユーザー名を入力してください (1/1)"
 
 #: ../gtk/setupwizard.c:640
 msgid "Enter account information (step 1/2)"
-msgstr ""
+msgstr "アカウント情報を入力してください (1/2)"
 
 #: ../gtk/setupwizard.c:649
 msgid "Validation (step 2/2)"
-msgstr ""
+msgstr "検証します (2/2)"
 
 #: ../gtk/setupwizard.c:654
 msgid "Error"
@@ -551,7 +559,7 @@ msgstr "終了"
 #: ../gtk/incall_view.c:70 ../gtk/incall_view.c:94
 #, c-format
 msgid "Call #%i"
-msgstr ""
+msgstr "呼び出し #%i"
 
 #: ../gtk/incall_view.c:155
 #, c-format
@@ -588,7 +596,7 @@ msgstr "間接的にリレーサーバーを使う"
 
 #: ../gtk/incall_view.c:239
 msgid "uPnP not activated"
-msgstr ""
+msgstr "uPnPは作動しておりません"
 
 #: ../gtk/incall_view.c:241
 msgid "uPnP in progress"
@@ -596,7 +604,7 @@ msgstr "uPnPを使用中"
 
 #: ../gtk/incall_view.c:243
 msgid "uPnp not available"
-msgstr ""
+msgstr "uPnPは利用できません"
 
 #: ../gtk/incall_view.c:245
 msgid "uPnP is running"
@@ -616,6 +624,8 @@ msgid ""
 "download: %f\n"
 "upload: %f (kbit/s)"
 msgstr ""
+"ダウンロード： %f\n"
+"アップロード： %f (kbit/s)"
 
 #: ../gtk/incall_view.c:272 ../gtk/incall_view.c:274
 #, c-format
@@ -627,7 +637,7 @@ msgstr "%ix%i @ %f fps"
 msgid "%.3f seconds"
 msgstr "%.3f 秒"
 
-#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12 ../gtk/videowindow.c:232
+#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12 ../gtk/videowindow.c:235
 msgid "Hang up"
 msgstr ""
 
@@ -690,15 +700,15 @@ msgstr "会議で"
 
 #: ../gtk/incall_view.c:722
 msgid "<b>In call</b>"
-msgstr ""
+msgstr "<b>呼び出し中</b>"
 
 #: ../gtk/incall_view.c:758
 msgid "<b>Paused call</b>"
-msgstr ""
+msgstr "<b>呼び出し停止</b>"
 
 #: ../gtk/incall_view.c:794
 msgid "<b>Call ended.</b>"
-msgstr ""
+msgstr "<b>呼び出し終了</b>"
 
 #: ../gtk/incall_view.c:825
 msgid "Transfer in progress"
@@ -782,11 +792,11 @@ msgstr ""
 
 #: ../gtk/audio_assistant.c:328
 msgid "Capture device"
-msgstr ""
+msgstr "キャプチャーデバイス"
 
 #: ../gtk/audio_assistant.c:329
 msgid "Recorded volume"
-msgstr ""
+msgstr "録音音量"
 
 #: ../gtk/audio_assistant.c:333
 msgid "No voice"
@@ -794,7 +804,7 @@ msgstr "音声なし"
 
 #: ../gtk/audio_assistant.c:334 ../gtk/audio_assistant.c:373
 msgid "System sound preferences"
-msgstr ""
+msgstr "システムサウンド設定"
 
 #: ../gtk/audio_assistant.c:369
 msgid "Playback device"
@@ -802,7 +812,7 @@ msgstr ""
 
 #: ../gtk/audio_assistant.c:370
 msgid "Play three beeps"
-msgstr ""
+msgstr "3回分のビープ音を再生する"
 
 #: ../gtk/audio_assistant.c:403
 msgid "Press the record button and say some words"
@@ -814,11 +824,11 @@ msgstr "録音した音声を聞く"
 
 #: ../gtk/audio_assistant.c:405
 msgid "Record"
-msgstr ""
+msgstr "録音"
 
 #: ../gtk/audio_assistant.c:406
 msgid "Play"
-msgstr ""
+msgstr "再生"
 
 #: ../gtk/audio_assistant.c:433
 msgid "Let's start Linphone now"
@@ -854,11 +864,11 @@ msgstr "送信"
 
 #: ../gtk/main.ui.h:3
 msgid "End conference"
-msgstr ""
+msgstr "会議を終了する"
 
 #: ../gtk/main.ui.h:7
 msgid "Record this call to an audio file"
-msgstr ""
+msgstr "この通話をファイルに録音する"
 
 #: ../gtk/main.ui.h:8
 msgid "Video"
@@ -874,11 +884,11 @@ msgstr "転送"
 
 #: ../gtk/main.ui.h:14
 msgid "In call"
-msgstr ""
+msgstr "着信"
 
 #: ../gtk/main.ui.h:15
 msgid "Duration"
-msgstr ""
+msgstr "期限"
 
 #: ../gtk/main.ui.h:16
 msgid "Call quality rating"
@@ -906,7 +916,7 @@ msgstr "デフォルト"
 
 #: ../gtk/main.ui.h:22
 msgid "_Options"
-msgstr ""
+msgstr "_オプション"
 
 #: ../gtk/main.ui.h:23
 msgid "Set configuration URI"
@@ -914,11 +924,11 @@ msgstr ""
 
 #: ../gtk/main.ui.h:24
 msgid "Always start video"
-msgstr ""
+msgstr "いつでもビデオをスタートする"
 
 #: ../gtk/main.ui.h:25
 msgid "Enable self-view"
-msgstr ""
+msgstr "セルフビューを有効にする"
 
 #: ../gtk/main.ui.h:26
 msgid "_Help"
@@ -926,7 +936,7 @@ msgstr "_ヘルプ"
 
 #: ../gtk/main.ui.h:27
 msgid "Show debug window"
-msgstr ""
+msgstr "デバッグウインドウを見る"
 
 #: ../gtk/main.ui.h:28
 msgid "_Homepage"
@@ -934,7 +944,7 @@ msgstr "_ホームページ"
 
 #: ../gtk/main.ui.h:29
 msgid "Check _Updates"
-msgstr ""
+msgstr "チェック _アップデート"
 
 #: ../gtk/main.ui.h:30
 msgid "Account assistant"
@@ -942,7 +952,7 @@ msgstr "アカウントのアシスタント"
 
 #: ../gtk/main.ui.h:32
 msgid "SIP address or phone number:"
-msgstr ""
+msgstr "SIPアドレスもしくは電話番号："
 
 #: ../gtk/main.ui.h:33
 msgid "Initiate a new call"
@@ -962,7 +972,7 @@ msgstr ""
 
 #: ../gtk/main.ui.h:37
 msgid "Add contact"
-msgstr ""
+msgstr "連絡相手に追加する"
 
 #: ../gtk/main.ui.h:38
 msgid "Recent calls"
@@ -990,7 +1000,7 @@ msgstr "自動的にログインする"
 
 #: ../gtk/main.ui.h:44 ../gtk/password.ui.h:3
 msgid "UserID"
-msgstr ""
+msgstr "ユーザーID"
 
 #: ../gtk/main.ui.h:45
 msgid "Login information"
@@ -1006,15 +1016,17 @@ msgstr "削除"
 
 #: ../gtk/about.ui.h:1
 msgid "About Linphone"
-msgstr ""
+msgstr "Linphoneについて"
 
 #: ../gtk/about.ui.h:2
 msgid "(C) Belledonne Communications, 2010\n"
-msgstr ""
+msgstr "(C) Belledonne Communications, 2010\n"
 
 #: ../gtk/about.ui.h:4
 msgid "An internet video phone using the standard SIP (rfc3261) protocol."
 msgstr ""
+"インターネットによる動画送信には標準的なSIPプロトコル (rfc3261) を使用してい"
+"ます。"
 
 #: ../gtk/about.ui.h:5
 msgid ""
@@ -1186,7 +1198,7 @@ msgstr "ビデオのコーデック"
 
 #: ../gtk/parameters.ui.h:10
 msgid "C"
-msgstr ""
+msgstr "C"
 
 #: ../gtk/parameters.ui.h:11
 msgid "SIP (UDP)"
@@ -1221,258 +1233,266 @@ msgid "<b>Transport</b>"
 msgstr "<b>転送</b>"
 
 #: ../gtk/parameters.ui.h:19
-msgid "Media encryption type"
-msgstr "メディアの暗号化の種類"
-
-#: ../gtk/parameters.ui.h:20
-msgid "Video RTP/UDP:"
-msgstr "ビデオ RTP/UDP:"
-
-#: ../gtk/parameters.ui.h:21
-msgid "Audio RTP/UDP:"
-msgstr "オーディオ RTP/UDP:"
-
-#: ../gtk/parameters.ui.h:22
-msgid "Fixed"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:23
-msgid "Media encryption is mandatory"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:24
-msgid "Tunnel"
-msgstr "トンネル"
-
-#: ../gtk/parameters.ui.h:25
-msgid "DSCP fields"
-msgstr "DSCP値"
-
-#: ../gtk/parameters.ui.h:26
-msgid "SIP/TCP port"
-msgstr "SIP/TCP ポート"
-
-#: ../gtk/parameters.ui.h:27
 msgid "SIP/UDP port"
 msgstr "SIP/UDP ポート"
 
+#: ../gtk/parameters.ui.h:21
+msgid "Random"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:22
+msgid "SIP/TCP port"
+msgstr "SIP/TCP ポート"
+
+#: ../gtk/parameters.ui.h:23
+msgid "Audio RTP/UDP:"
+msgstr "オーディオ RTP/UDP:"
+
+#: ../gtk/parameters.ui.h:24
+msgid "Fixed"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:25
+msgid "Video RTP/UDP:"
+msgstr "ビデオ RTP/UDP:"
+
+#: ../gtk/parameters.ui.h:26
+msgid "Media encryption type"
+msgstr "メディアの暗号化の種類"
+
+#: ../gtk/parameters.ui.h:27
+msgid "Media encryption is mandatory"
+msgstr ""
+
 #: ../gtk/parameters.ui.h:28
+msgid "Tunnel"
+msgstr "トンネル"
+
+#: ../gtk/parameters.ui.h:29
+msgid "DSCP fields"
+msgstr "DSCP値"
+
+#: ../gtk/parameters.ui.h:30
 msgid "<b>Network protocol and ports</b>"
 msgstr "<b>ネットワークのプロトコルとポート</b>"
 
-#: ../gtk/parameters.ui.h:29
+#: ../gtk/parameters.ui.h:31
 msgid "Direct connection to the Internet"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:30
+#: ../gtk/parameters.ui.h:32
 msgid "Behind NAT / Firewall (specify gateway IP )"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:31
+#: ../gtk/parameters.ui.h:33
 msgid "Behind NAT / Firewall (use STUN to resolve)"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:32
+#: ../gtk/parameters.ui.h:34
 msgid "Behind NAT / Firewall (use ICE)"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:33
+#: ../gtk/parameters.ui.h:35
 msgid "Behind NAT / Firewall (use uPnP)"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:34
+#: ../gtk/parameters.ui.h:36
 msgid "Public IP address:"
 msgstr "パブリック IP アドレス:"
 
-#: ../gtk/parameters.ui.h:35
+#: ../gtk/parameters.ui.h:37
 msgid "Stun server:"
 msgstr "Stunサーバー:"
 
-#: ../gtk/parameters.ui.h:36
+#: ../gtk/parameters.ui.h:38
 msgid "<b>NAT and Firewall</b>"
 msgstr "<b>NAT と ファイヤーウォール</b>"
 
-#: ../gtk/parameters.ui.h:37
+#: ../gtk/parameters.ui.h:39
 msgid "Network settings"
 msgstr "ネットワーク設定"
 
-#: ../gtk/parameters.ui.h:38
+#: ../gtk/parameters.ui.h:40
 msgid "Ring sound:"
 msgstr "鳴動音:"
 
-#: ../gtk/parameters.ui.h:39
+#: ../gtk/parameters.ui.h:41
 msgid "ALSA special device (optional):"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:40
+#: ../gtk/parameters.ui.h:42
 msgid "Capture device:"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:41
+#: ../gtk/parameters.ui.h:43
 msgid "Ring device:"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:42
+#: ../gtk/parameters.ui.h:44
 msgid "Playback device:"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:43
+#: ../gtk/parameters.ui.h:45
 msgid "Enable echo cancellation"
 msgstr "エコーキャンセラーを有効にする"
 
-#: ../gtk/parameters.ui.h:44
+#: ../gtk/parameters.ui.h:46
 msgid "<b>Audio</b>"
 msgstr "<b>オーディオ</b>"
 
-#: ../gtk/parameters.ui.h:45
+#: ../gtk/parameters.ui.h:47
 msgid "Video input device:"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:46
+#: ../gtk/parameters.ui.h:48
 msgid "Prefered video resolution:"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:47
+#: ../gtk/parameters.ui.h:49
 msgid "Video output method:"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:48
-msgid "<b>Video</b>"
-msgstr "<b>ビデオ</b>"
-
-#: ../gtk/parameters.ui.h:49
-msgid "Multimedia settings"
-msgstr "マルチメディア設定"
-
 #: ../gtk/parameters.ui.h:50
-msgid "This section defines your SIP address when not using a SIP account"
+msgid "Show camera preview"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:51
-msgid "Your display name (eg: John Doe):"
-msgstr "あなたの表示名 (例: John Doe):"
+msgid "<b>Video</b>"
+msgstr "<b>ビデオ</b>"
 
 #: ../gtk/parameters.ui.h:52
-msgid "Your username:"
-msgstr "あなたのユーザー名:"
+msgid "Multimedia settings"
+msgstr "マルチメディア設定"
 
 #: ../gtk/parameters.ui.h:53
-msgid "Your resulting SIP address:"
+msgid "This section defines your SIP address when not using a SIP account"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:54
+msgid "Your display name (eg: John Doe):"
+msgstr "あなたの表示名 (例: John Doe):"
+
+#: ../gtk/parameters.ui.h:55
+msgid "Your username:"
+msgstr "あなたのユーザー名:"
+
+#: ../gtk/parameters.ui.h:56
+msgid "Your resulting SIP address:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:57
 msgid "<b>Default identity</b>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:55
+#: ../gtk/parameters.ui.h:58
 msgid "Wizard"
 msgstr "ウィザード"
 
-#: ../gtk/parameters.ui.h:56
+#: ../gtk/parameters.ui.h:59
 msgid "Add"
 msgstr "追加する"
 
-#: ../gtk/parameters.ui.h:57
+#: ../gtk/parameters.ui.h:60
 msgid "Edit"
 msgstr "編集する"
 
-#: ../gtk/parameters.ui.h:58
+#: ../gtk/parameters.ui.h:61
 msgid "Remove"
 msgstr "削除する"
 
-#: ../gtk/parameters.ui.h:59
+#: ../gtk/parameters.ui.h:62
 msgid "<b>Proxy accounts</b>"
-msgstr ""
+msgstr "プロキシアカウント"
 
-#: ../gtk/parameters.ui.h:60
+#: ../gtk/parameters.ui.h:63
 msgid "Erase all passwords"
-msgstr ""
+msgstr "すべてのパスワードを消去する"
 
-#: ../gtk/parameters.ui.h:61
+#: ../gtk/parameters.ui.h:64
 msgid "<b>Privacy</b>"
 msgstr "<b>プライバシー</b>"
 
-#: ../gtk/parameters.ui.h:62
+#: ../gtk/parameters.ui.h:65
 msgid "Manage SIP Accounts"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:63 ../gtk/tunnel_config.ui.h:4
+#: ../gtk/parameters.ui.h:66 ../gtk/tunnel_config.ui.h:4
 msgid "Enable"
 msgstr "使用する"
 
-#: ../gtk/parameters.ui.h:64 ../gtk/tunnel_config.ui.h:5
+#: ../gtk/parameters.ui.h:67 ../gtk/tunnel_config.ui.h:5
 msgid "Disable"
 msgstr "使用しない"
 
-#: ../gtk/parameters.ui.h:65
+#: ../gtk/parameters.ui.h:68
 msgid "<b>Codecs</b>"
 msgstr "<b>コーデック</b>"
 
-#: ../gtk/parameters.ui.h:66
+#: ../gtk/parameters.ui.h:69
 msgid "0 stands for \"unlimited\""
 msgstr ""
 
-#: ../gtk/parameters.ui.h:67
+#: ../gtk/parameters.ui.h:70
 msgid "Upload speed limit in Kbit/sec:"
 msgstr "アップロード速度制限 Kbit/sec:"
 
-#: ../gtk/parameters.ui.h:68
+#: ../gtk/parameters.ui.h:71
 msgid "Download speed limit in Kbit/sec:"
 msgstr "ダウンロード速度制限 Kbit/sec:"
 
-#: ../gtk/parameters.ui.h:69
+#: ../gtk/parameters.ui.h:72
 msgid "Enable adaptive rate control"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:70
+#: ../gtk/parameters.ui.h:73
 msgid ""
 "<i>Adaptive rate control is a technique to dynamically guess the available "
 "bandwidth during a call.</i>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:71
+#: ../gtk/parameters.ui.h:74
 msgid "<b>Bandwidth control</b>"
 msgstr "<b>帯域幅制御</b>"
 
-#: ../gtk/parameters.ui.h:72
+#: ../gtk/parameters.ui.h:75
 msgid "Codecs"
 msgstr "コーデック"
 
-#: ../gtk/parameters.ui.h:73
+#: ../gtk/parameters.ui.h:76
 msgid "<b>Language</b>"
 msgstr "<b>言語</b>"
 
-#: ../gtk/parameters.ui.h:74
+#: ../gtk/parameters.ui.h:77
 msgid "Show advanced settings"
 msgstr "拡張設定を表示する"
 
-#: ../gtk/parameters.ui.h:75
+#: ../gtk/parameters.ui.h:78
 msgid "<b>Level</b>"
 msgstr "<b>レベル</b>"
 
-#: ../gtk/parameters.ui.h:76
+#: ../gtk/parameters.ui.h:79
 msgid "User interface"
 msgstr "ユーザーインターフェイス"
 
-#: ../gtk/parameters.ui.h:77 ../gtk/ldap.ui.h:2
+#: ../gtk/parameters.ui.h:80 ../gtk/ldap.ui.h:2
 msgid "Server address:"
 msgstr "サーバーアドレス:"
 
-#: ../gtk/parameters.ui.h:78 ../gtk/ldap.ui.h:3
+#: ../gtk/parameters.ui.h:81 ../gtk/ldap.ui.h:3
 msgid "Authentication method:"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:80
+#: ../gtk/parameters.ui.h:83
 msgid "<b>LDAP Account setup</b>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:81
+#: ../gtk/parameters.ui.h:84
 msgid "LDAP"
-msgstr ""
+msgstr "LDAP"
 
-#: ../gtk/parameters.ui.h:82
+#: ../gtk/parameters.ui.h:85
 msgid "Done"
-msgstr ""
+msgstr "完了"
 
 #: ../gtk/buddylookup.ui.h:1
 msgid "Search contacts in directory"
@@ -1516,7 +1536,7 @@ msgstr ""
 
 #: ../gtk/call_statistics.ui.h:1
 msgid "Call statistics"
-msgstr ""
+msgstr "通信統計"
 
 #: ../gtk/call_statistics.ui.h:2
 msgid "Audio codec"
@@ -1528,19 +1548,19 @@ msgstr "ビデオのコーデック"
 
 #: ../gtk/call_statistics.ui.h:4
 msgid "Audio IP bandwidth usage"
-msgstr ""
+msgstr "音声で使用しているIP通信帯域"
 
 #: ../gtk/call_statistics.ui.h:5
 msgid "Audio Media connectivity"
-msgstr ""
+msgstr "接続している音声用メディア"
 
 #: ../gtk/call_statistics.ui.h:6
 msgid "Video IP bandwidth usage"
-msgstr ""
+msgstr "ビデオで使用しているIP通信帯域"
 
 #: ../gtk/call_statistics.ui.h:7
 msgid "Video Media connectivity"
-msgstr ""
+msgstr "接続しているビデオ用メディア"
 
 #: ../gtk/call_statistics.ui.h:8
 msgid "Round trip time"
@@ -1584,7 +1604,7 @@ msgstr ""
 
 #: ../gtk/ldap.ui.h:1
 msgid "LDAP Settings"
-msgstr ""
+msgstr "LDAP設定"
 
 #: ../gtk/ldap.ui.h:6
 msgid "Use TLS Connection"
@@ -1604,7 +1624,7 @@ msgstr ""
 
 #: ../gtk/ldap.ui.h:10
 msgid "Authname"
-msgstr ""
+msgstr "Authname"
 
 #: ../gtk/ldap.ui.h:11
 msgid "Realm"
@@ -1669,7 +1689,7 @@ msgstr "ダイジェスト-MD5"
 
 #: ../gtk/ldap.ui.h:27
 msgid "NTLM"
-msgstr ""
+msgstr "NTLM"
 
 #: ../gtk/config-uri.ui.h:1
 msgid "Specifying a remote configuration URI"
@@ -1696,62 +1716,62 @@ msgstr ""
 msgid "Ready"
 msgstr "準備"
 
-#: ../coreapi/linphonecore.c:2473
+#: ../coreapi/linphonecore.c:2489
 msgid "Configuring"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2638
+#: ../coreapi/linphonecore.c:2654
 msgid "Looking for telephone number destination..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2640
+#: ../coreapi/linphonecore.c:2656
 msgid "Could not resolve this number."
 msgstr ""
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2926
+#: ../coreapi/linphonecore.c:2942
 msgid "Contacting"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2931
+#: ../coreapi/linphonecore.c:2947
 msgid "Could not call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3081
+#: ../coreapi/linphonecore.c:3097
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3240
+#: ../coreapi/linphonecore.c:3256
 msgid "is contacting you"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3241
+#: ../coreapi/linphonecore.c:3257
 msgid " and asked autoanswer."
-msgstr ""
+msgstr "と自動応答を尋ねる"
 
-#: ../coreapi/linphonecore.c:3359
+#: ../coreapi/linphonecore.c:3375
 msgid "Modifying call parameters..."
-msgstr ""
+msgstr "コールパラメーターの変更..."
 
-#: ../coreapi/linphonecore.c:3707
+#: ../coreapi/linphonecore.c:3723
 msgid "Connected."
 msgstr "接続しました。"
 
-#: ../coreapi/linphonecore.c:3732
+#: ../coreapi/linphonecore.c:3748
 msgid "Call aborted"
-msgstr ""
+msgstr "呼び出しを打ち切る"
 
-#: ../coreapi/linphonecore.c:3922
+#: ../coreapi/linphonecore.c:3938
 msgid "Could not pause the call"
-msgstr ""
+msgstr "呼び出しを一時停止できませんでした"
 
-#: ../coreapi/linphonecore.c:3926
+#: ../coreapi/linphonecore.c:3941
 msgid "Pausing the current call..."
-msgstr ""
+msgstr "現在の通話を一時停止..."
 
 #: ../coreapi/misc.c:438
 msgid "Stun lookup in progress..."
-msgstr ""
+msgstr "Stunによるルックアップの進行中…"
 
 #: ../coreapi/misc.c:619
 msgid "ICE local candidates gathering in progress..."
@@ -1807,21 +1827,21 @@ msgstr "休暇中"
 
 #: ../coreapi/friend.c:68
 msgid "Unknown status"
-msgstr ""
+msgstr "不明なステータス"
 
-#: ../coreapi/proxy.c:319
+#: ../coreapi/proxy.c:327
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
 msgstr ""
 
-#: ../coreapi/proxy.c:325
+#: ../coreapi/proxy.c:333
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
 msgstr ""
 
-#: ../coreapi/proxy.c:1377
+#: ../coreapi/proxy.c:1390
 #, c-format
 msgid "Could not login as %s"
 msgstr ""
@@ -1881,7 +1901,7 @@ msgstr ""
 
 #: ../coreapi/callbacks.c:705
 msgid "Call terminated."
-msgstr ""
+msgstr "呼び出し終了。"
 
 #: ../coreapi/callbacks.c:733
 msgid "User is busy."
@@ -1935,12 +1955,12 @@ msgstr ""
 msgid "Service unavailable, retrying"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:174
+#: ../coreapi/linphonecall.c:175
 #, c-format
 msgid "Authentication token is %s"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:3020
+#: ../coreapi/linphonecall.c:3041
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
@@ -1960,7 +1980,7 @@ msgstr ""
 
 #: ../coreapi/call_log.c:218
 msgid "unknown"
-msgstr ""
+msgstr "不明"
 
 #: ../coreapi/call_log.c:220
 #, c-format
diff --git a/po/nb_NO.po b/po/nb_NO.po
index fbf404aa5..a17243481 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-03 13:39+0100\n"
-"PO-Revision-Date: 2014-12-04 09:51+0000\n"
+"POT-Creation-Date: 2015-01-06 12:28+0100\n"
+"PO-Revision-Date: 2015-01-06 11:29+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/"
 "p/linphone-gtk/language/nb_NO/)\n"
@@ -93,31 +93,31 @@ msgstr "Fant ikke pixmap fli: %s"
 msgid "Invalid sip contact !"
 msgstr "Ugyldig SIP kontakt !"
 
-#: ../gtk/main.c:107
+#: ../gtk/main.c:109
 msgid "log to stdout some debug information while running."
 msgstr "skriv logg-informasjon under kjøring"
 
-#: ../gtk/main.c:114
+#: ../gtk/main.c:116
 msgid "path to a file to write logs into."
 msgstr ""
 
-#: ../gtk/main.c:121
+#: ../gtk/main.c:123
 msgid "Start linphone with video disabled."
 msgstr ""
 
-#: ../gtk/main.c:128
+#: ../gtk/main.c:130
 msgid "Start only in the system tray, do not show the main interface."
 msgstr "Start skjult i systemkurven, ikke vis programbildet."
 
-#: ../gtk/main.c:135
+#: ../gtk/main.c:137
 msgid "address to call right now"
 msgstr "address som skal ringes nå"
 
-#: ../gtk/main.c:142
+#: ../gtk/main.c:144
 msgid "if set automatically answer incoming calls"
 msgstr "besvarer innkommende samtaler automatisk om valgt"
 
-#: ../gtk/main.c:149
+#: ../gtk/main.c:151
 msgid ""
 "Specifiy a working directory (should be the base of the installation, eg: c:"
 "\\Program Files\\Linphone)"
@@ -125,15 +125,19 @@ msgstr ""
 "Spesifiser arbeidsmappe (bør være base for installasjonen, f.eks: c:"
 "\\Programfiler\\Linphone)"
 
-#: ../gtk/main.c:156
+#: ../gtk/main.c:158
 msgid "Configuration file"
 msgstr ""
 
-#: ../gtk/main.c:163
+#: ../gtk/main.c:165
 msgid "Run the audio assistant"
 msgstr ""
 
-#: ../gtk/main.c:1085
+#: ../gtk/main.c:172
+msgid "Run self test and exit 0 if succeed"
+msgstr ""
+
+#: ../gtk/main.c:1083
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
@@ -146,66 +150,66 @@ msgstr ""
 "din kontaktliste?\n"
 "Hvis du svarer nei vil personen bli svartelyst midlertidig."
 
-#: ../gtk/main.c:1162
+#: ../gtk/main.c:1160
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
 msgstr ""
 
-#: ../gtk/main.c:1283
+#: ../gtk/main.c:1281
 msgid "Call error"
 msgstr ""
 
-#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3751
+#: ../gtk/main.c:1284 ../coreapi/linphonecore.c:3767
 msgid "Call ended"
 msgstr "Samtale avsluttet"
 
-#: ../gtk/main.c:1289 ../coreapi/call_log.c:221
+#: ../gtk/main.c:1287 ../coreapi/call_log.c:221
 msgid "Incoming call"
 msgstr "Innkommende samtale"
 
-#: ../gtk/main.c:1291 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
+#: ../gtk/main.c:1289 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
 msgid "Answer"
 msgstr "Svarer"
 
-#: ../gtk/main.c:1293 ../gtk/main.ui.h:6
+#: ../gtk/main.c:1291 ../gtk/main.ui.h:6
 msgid "Decline"
 msgstr "Avvis"
 
-#: ../gtk/main.c:1299
+#: ../gtk/main.c:1297
 msgid "Call paused"
 msgstr ""
 
-#: ../gtk/main.c:1299
+#: ../gtk/main.c:1297
 #, c-format
 msgid "<b>by %s</b>"
 msgstr ""
 
-#: ../gtk/main.c:1366
+#: ../gtk/main.c:1367
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr ""
 
-#: ../gtk/main.c:1528
+#: ../gtk/main.c:1529
 msgid "Website link"
 msgstr "Peker til nettsted"
 
-#: ../gtk/main.c:1577
+#: ../gtk/main.c:1578
 msgid "Linphone - a video internet phone"
 msgstr "Linphone - en video Internet telefon"
 
-#: ../gtk/main.c:1669
+#: ../gtk/main.c:1670
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (Standard)"
 
-#: ../gtk/main.c:2006 ../coreapi/callbacks.c:986
+#: ../gtk/main.c:2002 ../coreapi/callbacks.c:986
 #, c-format
 msgid "We are transferred to %s"
 msgstr "Vi er overført til %s"
 
-#: ../gtk/main.c:2016
+#: ../gtk/main.c:2012
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
@@ -213,7 +217,7 @@ msgstr ""
 "Klarte ikke å finne noe lydkort på denne datamaskinen.\n"
 "Du vil ikke kunne sende eller motta lydsamtaler."
 
-#: ../gtk/main.c:2157
+#: ../gtk/main.c:2156
 msgid "A free SIP video-phone"
 msgstr "En gratis SIP video-telefon"
 
@@ -282,7 +286,7 @@ msgstr "Parametere"
 msgid "Enabled"
 msgstr "På"
 
-#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763
+#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763 ../gtk/parameters.ui.h:20
 msgid "Disabled"
 msgstr "Av"
 
@@ -445,7 +449,7 @@ msgstr ""
 msgid "Enter your linphone.org username"
 msgstr ""
 
-#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:79 ../gtk/ldap.ui.h:4
+#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:82 ../gtk/ldap.ui.h:4
 msgid "Username:"
 msgstr "Brukernavn:"
 
@@ -629,7 +633,7 @@ msgstr ""
 msgid "%.3f seconds"
 msgstr ""
 
-#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12 ../gtk/videowindow.c:232
+#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12 ../gtk/videowindow.c:235
 msgid "Hang up"
 msgstr ""
 
@@ -1213,256 +1217,264 @@ msgid "<b>Transport</b>"
 msgstr "<b>Transport</b>"
 
 #: ../gtk/parameters.ui.h:19
-msgid "Media encryption type"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:20
-msgid "Video RTP/UDP:"
-msgstr "Video RTP/UDP:"
-
-#: ../gtk/parameters.ui.h:21
-msgid "Audio RTP/UDP:"
-msgstr "Lyd RTP/UDP:"
-
-#: ../gtk/parameters.ui.h:22
-msgid "Fixed"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:23
-msgid "Media encryption is mandatory"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:24
-msgid "Tunnel"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:25
-msgid "DSCP fields"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:26
-msgid "SIP/TCP port"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:27
 msgid "SIP/UDP port"
 msgstr ""
 
+#: ../gtk/parameters.ui.h:21
+msgid "Random"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:22
+msgid "SIP/TCP port"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:23
+msgid "Audio RTP/UDP:"
+msgstr "Lyd RTP/UDP:"
+
+#: ../gtk/parameters.ui.h:24
+msgid "Fixed"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:25
+msgid "Video RTP/UDP:"
+msgstr "Video RTP/UDP:"
+
+#: ../gtk/parameters.ui.h:26
+msgid "Media encryption type"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:27
+msgid "Media encryption is mandatory"
+msgstr ""
+
 #: ../gtk/parameters.ui.h:28
-msgid "<b>Network protocol and ports</b>"
+msgid "Tunnel"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:29
-msgid "Direct connection to the Internet"
-msgstr "Tilkoblet Internett direkte"
+msgid "DSCP fields"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:30
-msgid "Behind NAT / Firewall (specify gateway IP )"
+msgid "<b>Network protocol and ports</b>"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:31
-msgid "Behind NAT / Firewall (use STUN to resolve)"
-msgstr "Bak NAT / Brannmur (bruk STUN for å avgjøre)"
+msgid "Direct connection to the Internet"
+msgstr "Tilkoblet Internett direkte"
 
 #: ../gtk/parameters.ui.h:32
-msgid "Behind NAT / Firewall (use ICE)"
+msgid "Behind NAT / Firewall (specify gateway IP )"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:33
+msgid "Behind NAT / Firewall (use STUN to resolve)"
+msgstr "Bak NAT / Brannmur (bruk STUN for å avgjøre)"
+
+#: ../gtk/parameters.ui.h:34
+msgid "Behind NAT / Firewall (use ICE)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:35
 msgid "Behind NAT / Firewall (use uPnP)"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:34
+#: ../gtk/parameters.ui.h:36
 msgid "Public IP address:"
 msgstr "Offentlig IP-addresse:"
 
-#: ../gtk/parameters.ui.h:35
+#: ../gtk/parameters.ui.h:37
 msgid "Stun server:"
 msgstr "STUN tjener:"
 
-#: ../gtk/parameters.ui.h:36
+#: ../gtk/parameters.ui.h:38
 msgid "<b>NAT and Firewall</b>"
 msgstr "<b>NAT og Brannvegg</b>"
 
-#: ../gtk/parameters.ui.h:37
+#: ../gtk/parameters.ui.h:39
 msgid "Network settings"
 msgstr "Nettverksinnstillinger"
 
-#: ../gtk/parameters.ui.h:38
+#: ../gtk/parameters.ui.h:40
 msgid "Ring sound:"
 msgstr "Ringelyd:"
 
-#: ../gtk/parameters.ui.h:39
+#: ../gtk/parameters.ui.h:41
 msgid "ALSA special device (optional):"
 msgstr "Spesiell ALSA enhet (valgfritt):"
 
-#: ../gtk/parameters.ui.h:40
+#: ../gtk/parameters.ui.h:42
 msgid "Capture device:"
 msgstr "Mikrofonenhet:"
 
-#: ../gtk/parameters.ui.h:41
+#: ../gtk/parameters.ui.h:43
 msgid "Ring device:"
 msgstr "Ringe-enhet:"
 
-#: ../gtk/parameters.ui.h:42
+#: ../gtk/parameters.ui.h:44
 msgid "Playback device:"
 msgstr "Avspillingsenhet:"
 
-#: ../gtk/parameters.ui.h:43
+#: ../gtk/parameters.ui.h:45
 msgid "Enable echo cancellation"
 msgstr "Bruk ekko-kansellering"
 
-#: ../gtk/parameters.ui.h:44
+#: ../gtk/parameters.ui.h:46
 msgid "<b>Audio</b>"
 msgstr "<b>Lyd</b>"
 
-#: ../gtk/parameters.ui.h:45
+#: ../gtk/parameters.ui.h:47
 msgid "Video input device:"
 msgstr "Videoenhet:"
 
-#: ../gtk/parameters.ui.h:46
+#: ../gtk/parameters.ui.h:48
 msgid "Prefered video resolution:"
 msgstr "Foretrukke video-oppløsning:"
 
-#: ../gtk/parameters.ui.h:47
+#: ../gtk/parameters.ui.h:49
 msgid "Video output method:"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:48
+#: ../gtk/parameters.ui.h:50
+msgid "Show camera preview"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:51
 msgid "<b>Video</b>"
 msgstr "<b>Video</b>"
 
-#: ../gtk/parameters.ui.h:49
+#: ../gtk/parameters.ui.h:52
 msgid "Multimedia settings"
 msgstr "Multimediainnstillinger"
 
-#: ../gtk/parameters.ui.h:50
+#: ../gtk/parameters.ui.h:53
 msgid "This section defines your SIP address when not using a SIP account"
 msgstr "Denne seksjonen velger SIP-addresse når du ikke bruker en SIP-konto"
 
-#: ../gtk/parameters.ui.h:51
+#: ../gtk/parameters.ui.h:54
 msgid "Your display name (eg: John Doe):"
 msgstr "Vist navn (eks: Ola Nordmann):"
 
-#: ../gtk/parameters.ui.h:52
+#: ../gtk/parameters.ui.h:55
 msgid "Your username:"
 msgstr "Ditt brukernavn:"
 
-#: ../gtk/parameters.ui.h:53
+#: ../gtk/parameters.ui.h:56
 msgid "Your resulting SIP address:"
 msgstr "Din resulterende SIP addresse:"
 
-#: ../gtk/parameters.ui.h:54
+#: ../gtk/parameters.ui.h:57
 msgid "<b>Default identity</b>"
 msgstr "<b>Standard identitet</b>"
 
-#: ../gtk/parameters.ui.h:55
+#: ../gtk/parameters.ui.h:58
 msgid "Wizard"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:56
+#: ../gtk/parameters.ui.h:59
 msgid "Add"
 msgstr "Legg til"
 
-#: ../gtk/parameters.ui.h:57
+#: ../gtk/parameters.ui.h:60
 msgid "Edit"
 msgstr "Rediger"
 
-#: ../gtk/parameters.ui.h:58
+#: ../gtk/parameters.ui.h:61
 msgid "Remove"
 msgstr "Fjern"
 
-#: ../gtk/parameters.ui.h:59
+#: ../gtk/parameters.ui.h:62
 msgid "<b>Proxy accounts</b>"
 msgstr "<b>Proxy kontoer</b>"
 
-#: ../gtk/parameters.ui.h:60
+#: ../gtk/parameters.ui.h:63
 msgid "Erase all passwords"
 msgstr "Slett alle passord"
 
-#: ../gtk/parameters.ui.h:61
+#: ../gtk/parameters.ui.h:64
 msgid "<b>Privacy</b>"
 msgstr "<b>Personvern</b>"
 
-#: ../gtk/parameters.ui.h:62
+#: ../gtk/parameters.ui.h:65
 msgid "Manage SIP Accounts"
 msgstr "Behandle SIP-kontoer"
 
-#: ../gtk/parameters.ui.h:63 ../gtk/tunnel_config.ui.h:4
+#: ../gtk/parameters.ui.h:66 ../gtk/tunnel_config.ui.h:4
 msgid "Enable"
 msgstr "Aktiver"
 
-#: ../gtk/parameters.ui.h:64 ../gtk/tunnel_config.ui.h:5
+#: ../gtk/parameters.ui.h:67 ../gtk/tunnel_config.ui.h:5
 msgid "Disable"
 msgstr "Deaktiver"
 
-#: ../gtk/parameters.ui.h:65
+#: ../gtk/parameters.ui.h:68
 msgid "<b>Codecs</b>"
 msgstr "<b>Kodeker</b>"
 
-#: ../gtk/parameters.ui.h:66
+#: ../gtk/parameters.ui.h:69
 msgid "0 stands for \"unlimited\""
 msgstr "0 betyr \"ubegrenset\""
 
-#: ../gtk/parameters.ui.h:67
+#: ../gtk/parameters.ui.h:70
 msgid "Upload speed limit in Kbit/sec:"
 msgstr "Maks opplastningshastighet i Kbit/sek:"
 
-#: ../gtk/parameters.ui.h:68
+#: ../gtk/parameters.ui.h:71
 msgid "Download speed limit in Kbit/sec:"
 msgstr "Nedlastningsbegrensning i Kbit/sek:"
 
-#: ../gtk/parameters.ui.h:69
+#: ../gtk/parameters.ui.h:72
 msgid "Enable adaptive rate control"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:70
+#: ../gtk/parameters.ui.h:73
 msgid ""
 "<i>Adaptive rate control is a technique to dynamically guess the available "
 "bandwidth during a call.</i>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:71
+#: ../gtk/parameters.ui.h:74
 msgid "<b>Bandwidth control</b>"
 msgstr "<b>Båndbreddekontrol</b>"
 
-#: ../gtk/parameters.ui.h:72
+#: ../gtk/parameters.ui.h:75
 msgid "Codecs"
 msgstr "Kodek"
 
-#: ../gtk/parameters.ui.h:73
+#: ../gtk/parameters.ui.h:76
 msgid "<b>Language</b>"
 msgstr "<b>Språk</b>"
 
-#: ../gtk/parameters.ui.h:74
+#: ../gtk/parameters.ui.h:77
 msgid "Show advanced settings"
 msgstr "Vis avanserte innstillinger"
 
-#: ../gtk/parameters.ui.h:75
+#: ../gtk/parameters.ui.h:78
 msgid "<b>Level</b>"
 msgstr "<b>Nivå</b>"
 
-#: ../gtk/parameters.ui.h:76
+#: ../gtk/parameters.ui.h:79
 msgid "User interface"
 msgstr "Brukergrensesnitt"
 
-#: ../gtk/parameters.ui.h:77 ../gtk/ldap.ui.h:2
+#: ../gtk/parameters.ui.h:80 ../gtk/ldap.ui.h:2
 msgid "Server address:"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:78 ../gtk/ldap.ui.h:3
+#: ../gtk/parameters.ui.h:81 ../gtk/ldap.ui.h:3
 msgid "Authentication method:"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:80
+#: ../gtk/parameters.ui.h:83
 msgid "<b>LDAP Account setup</b>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:81
+#: ../gtk/parameters.ui.h:84
 msgid "LDAP"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:82
+#: ../gtk/parameters.ui.h:85
 msgid "Done"
 msgstr "Ferdig"
 
@@ -1688,56 +1700,56 @@ msgstr ""
 msgid "Ready"
 msgstr "Klar"
 
-#: ../coreapi/linphonecore.c:2473
+#: ../coreapi/linphonecore.c:2489
 msgid "Configuring"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2638
+#: ../coreapi/linphonecore.c:2654
 msgid "Looking for telephone number destination..."
 msgstr "Ser etter telefonnummer for destinasjonen..."
 
-#: ../coreapi/linphonecore.c:2640
+#: ../coreapi/linphonecore.c:2656
 msgid "Could not resolve this number."
 msgstr "Kan ikke tilkoble dette nummeret."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2926
+#: ../coreapi/linphonecore.c:2942
 msgid "Contacting"
 msgstr "Tilknytter"
 
-#: ../coreapi/linphonecore.c:2931
+#: ../coreapi/linphonecore.c:2947
 msgid "Could not call"
 msgstr "Kunne ikke ringe"
 
-#: ../coreapi/linphonecore.c:3081
+#: ../coreapi/linphonecore.c:3097
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "Beklager, du har nådd maksimalt antall samtidige samtaler"
 
-#: ../coreapi/linphonecore.c:3240
+#: ../coreapi/linphonecore.c:3256
 msgid "is contacting you"
 msgstr "Kontakter deg."
 
-#: ../coreapi/linphonecore.c:3241
+#: ../coreapi/linphonecore.c:3257
 msgid " and asked autoanswer."
 msgstr " og ba om autosvar."
 
-#: ../coreapi/linphonecore.c:3359
+#: ../coreapi/linphonecore.c:3375
 msgid "Modifying call parameters..."
 msgstr "Endrer ringeparametre..."
 
-#: ../coreapi/linphonecore.c:3707
+#: ../coreapi/linphonecore.c:3723
 msgid "Connected."
 msgstr "Tilkoblet"
 
-#: ../coreapi/linphonecore.c:3732
+#: ../coreapi/linphonecore.c:3748
 msgid "Call aborted"
 msgstr "Samtale avbrutt"
 
-#: ../coreapi/linphonecore.c:3922
+#: ../coreapi/linphonecore.c:3938
 msgid "Could not pause the call"
 msgstr "Kunne ikke pause samtalen"
 
-#: ../coreapi/linphonecore.c:3926
+#: ../coreapi/linphonecore.c:3941
 msgid "Pausing the current call..."
 msgstr "Pauser nåværende samtale"
 
@@ -1801,7 +1813,7 @@ msgstr ""
 msgid "Unknown status"
 msgstr ""
 
-#: ../coreapi/proxy.c:319
+#: ../coreapi/proxy.c:327
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
@@ -1809,7 +1821,7 @@ msgstr ""
 "SIP proxy adressen du har angitt er ugyldig, den må begynne med \"sip:\" "
 "etterfult av vertsnavn."
 
-#: ../coreapi/proxy.c:325
+#: ../coreapi/proxy.c:333
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
@@ -1817,7 +1829,7 @@ msgstr ""
 "SIP adressen du har angitt er feil. Adressen bør se ut som sip: "
 "brukernavn@domenenavn, f.eks sip:ola@eksempel.no"
 
-#: ../coreapi/proxy.c:1377
+#: ../coreapi/proxy.c:1390
 #, c-format
 msgid "Could not login as %s"
 msgstr "Ikke ikke logge inn som %s"
@@ -1931,12 +1943,12 @@ msgstr "Registrering hos %s mislykkes: %s"
 msgid "Service unavailable, retrying"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:174
+#: ../coreapi/linphonecall.c:175
 #, c-format
 msgid "Authentication token is %s"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:3020
+#: ../coreapi/linphonecall.c:3041
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
diff --git a/po/nl.po b/po/nl.po
index a9b238bc5..243364c8b 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-03 13:39+0100\n"
-"PO-Revision-Date: 2014-12-03 12:39+0000\n"
+"POT-Creation-Date: 2015-01-06 12:28+0100\n"
+"PO-Revision-Date: 2015-01-06 11:29+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/nl/)\n"
@@ -92,45 +92,49 @@ msgstr "Kon pixmap bestand %s niet vinden"
 msgid "Invalid sip contact !"
 msgstr ""
 
-#: ../gtk/main.c:107
+#: ../gtk/main.c:109
 msgid "log to stdout some debug information while running."
 msgstr ""
 
-#: ../gtk/main.c:114
+#: ../gtk/main.c:116
 msgid "path to a file to write logs into."
 msgstr ""
 
-#: ../gtk/main.c:121
+#: ../gtk/main.c:123
 msgid "Start linphone with video disabled."
 msgstr ""
 
-#: ../gtk/main.c:128
+#: ../gtk/main.c:130
 msgid "Start only in the system tray, do not show the main interface."
 msgstr ""
 
-#: ../gtk/main.c:135
+#: ../gtk/main.c:137
 msgid "address to call right now"
 msgstr ""
 
-#: ../gtk/main.c:142
+#: ../gtk/main.c:144
 msgid "if set automatically answer incoming calls"
 msgstr ""
 
-#: ../gtk/main.c:149
+#: ../gtk/main.c:151
 msgid ""
 "Specifiy a working directory (should be the base of the installation, eg: c:"
 "\\Program Files\\Linphone)"
 msgstr ""
 
-#: ../gtk/main.c:156
+#: ../gtk/main.c:158
 msgid "Configuration file"
 msgstr ""
 
-#: ../gtk/main.c:163
+#: ../gtk/main.c:165
 msgid "Run the audio assistant"
 msgstr ""
 
-#: ../gtk/main.c:1085
+#: ../gtk/main.c:172
+msgid "Run self test and exit 0 if succeed"
+msgstr ""
+
+#: ../gtk/main.c:1083
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
@@ -139,72 +143,72 @@ msgid ""
 "If you answer no, this person will be temporarily blacklisted."
 msgstr ""
 
-#: ../gtk/main.c:1162
+#: ../gtk/main.c:1160
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
 msgstr ""
 
-#: ../gtk/main.c:1283
+#: ../gtk/main.c:1281
 msgid "Call error"
 msgstr ""
 
-#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3751
+#: ../gtk/main.c:1284 ../coreapi/linphonecore.c:3767
 msgid "Call ended"
 msgstr "Oproep beeindigd"
 
-#: ../gtk/main.c:1289 ../coreapi/call_log.c:221
+#: ../gtk/main.c:1287 ../coreapi/call_log.c:221
 msgid "Incoming call"
 msgstr "Inkomende oproep"
 
-#: ../gtk/main.c:1291 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
+#: ../gtk/main.c:1289 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
 msgid "Answer"
 msgstr ""
 
-#: ../gtk/main.c:1293 ../gtk/main.ui.h:6
+#: ../gtk/main.c:1291 ../gtk/main.ui.h:6
 msgid "Decline"
 msgstr ""
 
-#: ../gtk/main.c:1299
+#: ../gtk/main.c:1297
 msgid "Call paused"
 msgstr ""
 
-#: ../gtk/main.c:1299
+#: ../gtk/main.c:1297
 #, c-format
 msgid "<b>by %s</b>"
 msgstr ""
 
-#: ../gtk/main.c:1366
+#: ../gtk/main.c:1367
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr ""
 
-#: ../gtk/main.c:1528
+#: ../gtk/main.c:1529
 msgid "Website link"
 msgstr ""
 
-#: ../gtk/main.c:1577
+#: ../gtk/main.c:1578
 msgid "Linphone - a video internet phone"
 msgstr ""
 
-#: ../gtk/main.c:1669
+#: ../gtk/main.c:1670
 #, c-format
 msgid "%s (Default)"
 msgstr ""
 
-#: ../gtk/main.c:2006 ../coreapi/callbacks.c:986
+#: ../gtk/main.c:2002 ../coreapi/callbacks.c:986
 #, c-format
 msgid "We are transferred to %s"
 msgstr ""
 
-#: ../gtk/main.c:2016
+#: ../gtk/main.c:2012
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
 msgstr ""
 
-#: ../gtk/main.c:2157
+#: ../gtk/main.c:2156
 msgid "A free SIP video-phone"
 msgstr "Een Vrije SIP video-telefoon"
 
@@ -273,7 +277,7 @@ msgstr "Parameters"
 msgid "Enabled"
 msgstr "Aan"
 
-#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763
+#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763 ../gtk/parameters.ui.h:20
 msgid "Disabled"
 msgstr "Uit"
 
@@ -434,7 +438,7 @@ msgstr ""
 msgid "Enter your linphone.org username"
 msgstr ""
 
-#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:79 ../gtk/ldap.ui.h:4
+#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:82 ../gtk/ldap.ui.h:4
 msgid "Username:"
 msgstr ""
 
@@ -618,7 +622,7 @@ msgstr ""
 msgid "%.3f seconds"
 msgstr ""
 
-#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12 ../gtk/videowindow.c:232
+#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12 ../gtk/videowindow.c:235
 msgid "Hang up"
 msgstr ""
 
@@ -1200,256 +1204,264 @@ msgid "<b>Transport</b>"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:19
-msgid "Media encryption type"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:20
-msgid "Video RTP/UDP:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:21
-msgid "Audio RTP/UDP:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:22
-msgid "Fixed"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:23
-msgid "Media encryption is mandatory"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:24
-msgid "Tunnel"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:25
-msgid "DSCP fields"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:26
-msgid "SIP/TCP port"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:27
 msgid "SIP/UDP port"
 msgstr ""
 
+#: ../gtk/parameters.ui.h:21
+msgid "Random"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:22
+msgid "SIP/TCP port"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:23
+msgid "Audio RTP/UDP:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:24
+msgid "Fixed"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:25
+msgid "Video RTP/UDP:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:26
+msgid "Media encryption type"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:27
+msgid "Media encryption is mandatory"
+msgstr ""
+
 #: ../gtk/parameters.ui.h:28
-msgid "<b>Network protocol and ports</b>"
+msgid "Tunnel"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:29
-msgid "Direct connection to the Internet"
+msgid "DSCP fields"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:30
-msgid "Behind NAT / Firewall (specify gateway IP )"
+msgid "<b>Network protocol and ports</b>"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:31
-msgid "Behind NAT / Firewall (use STUN to resolve)"
+msgid "Direct connection to the Internet"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:32
-msgid "Behind NAT / Firewall (use ICE)"
+msgid "Behind NAT / Firewall (specify gateway IP )"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:33
-msgid "Behind NAT / Firewall (use uPnP)"
+msgid "Behind NAT / Firewall (use STUN to resolve)"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:34
-msgid "Public IP address:"
+msgid "Behind NAT / Firewall (use ICE)"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:35
-msgid "Stun server:"
+msgid "Behind NAT / Firewall (use uPnP)"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:36
-msgid "<b>NAT and Firewall</b>"
+msgid "Public IP address:"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:37
-msgid "Network settings"
+msgid "Stun server:"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:38
-msgid "Ring sound:"
+msgid "<b>NAT and Firewall</b>"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:39
-msgid "ALSA special device (optional):"
+msgid "Network settings"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:40
-msgid "Capture device:"
+msgid "Ring sound:"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:41
-msgid "Ring device:"
+msgid "ALSA special device (optional):"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:42
-msgid "Playback device:"
+msgid "Capture device:"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:43
-msgid "Enable echo cancellation"
+msgid "Ring device:"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:44
-msgid "<b>Audio</b>"
+msgid "Playback device:"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:45
-msgid "Video input device:"
+msgid "Enable echo cancellation"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:46
-msgid "Prefered video resolution:"
+msgid "<b>Audio</b>"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:47
-msgid "Video output method:"
+msgid "Video input device:"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:48
-msgid "<b>Video</b>"
+msgid "Prefered video resolution:"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:49
-msgid "Multimedia settings"
+msgid "Video output method:"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:50
-msgid "This section defines your SIP address when not using a SIP account"
+msgid "Show camera preview"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:51
-msgid "Your display name (eg: John Doe):"
+msgid "<b>Video</b>"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:52
-msgid "Your username:"
+msgid "Multimedia settings"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:53
-msgid "Your resulting SIP address:"
+msgid "This section defines your SIP address when not using a SIP account"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:54
-msgid "<b>Default identity</b>"
+msgid "Your display name (eg: John Doe):"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:55
-msgid "Wizard"
+msgid "Your username:"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:56
-msgid "Add"
+msgid "Your resulting SIP address:"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:57
-msgid "Edit"
-msgstr "Bewerken"
+msgid "<b>Default identity</b>"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:58
-msgid "Remove"
-msgstr "Verwijderen"
+msgid "Wizard"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:59
-msgid "<b>Proxy accounts</b>"
+msgid "Add"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:60
+msgid "Edit"
+msgstr "Bewerken"
+
+#: ../gtk/parameters.ui.h:61
+msgid "Remove"
+msgstr "Verwijderen"
+
+#: ../gtk/parameters.ui.h:62
+msgid "<b>Proxy accounts</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:63
 msgid "Erase all passwords"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:61
+#: ../gtk/parameters.ui.h:64
 msgid "<b>Privacy</b>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:62
+#: ../gtk/parameters.ui.h:65
 msgid "Manage SIP Accounts"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:63 ../gtk/tunnel_config.ui.h:4
+#: ../gtk/parameters.ui.h:66 ../gtk/tunnel_config.ui.h:4
 msgid "Enable"
 msgstr "Aan"
 
-#: ../gtk/parameters.ui.h:64 ../gtk/tunnel_config.ui.h:5
+#: ../gtk/parameters.ui.h:67 ../gtk/tunnel_config.ui.h:5
 msgid "Disable"
 msgstr "Uit"
 
-#: ../gtk/parameters.ui.h:65
+#: ../gtk/parameters.ui.h:68
 msgid "<b>Codecs</b>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:66
+#: ../gtk/parameters.ui.h:69
 msgid "0 stands for \"unlimited\""
 msgstr ""
 
-#: ../gtk/parameters.ui.h:67
+#: ../gtk/parameters.ui.h:70
 msgid "Upload speed limit in Kbit/sec:"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:68
+#: ../gtk/parameters.ui.h:71
 msgid "Download speed limit in Kbit/sec:"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:69
+#: ../gtk/parameters.ui.h:72
 msgid "Enable adaptive rate control"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:70
+#: ../gtk/parameters.ui.h:73
 msgid ""
 "<i>Adaptive rate control is a technique to dynamically guess the available "
 "bandwidth during a call.</i>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:71
+#: ../gtk/parameters.ui.h:74
 msgid "<b>Bandwidth control</b>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:72
+#: ../gtk/parameters.ui.h:75
 msgid "Codecs"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:73
+#: ../gtk/parameters.ui.h:76
 msgid "<b>Language</b>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:74
+#: ../gtk/parameters.ui.h:77
 msgid "Show advanced settings"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:75
+#: ../gtk/parameters.ui.h:78
 msgid "<b>Level</b>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:76
+#: ../gtk/parameters.ui.h:79
 msgid "User interface"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:77 ../gtk/ldap.ui.h:2
+#: ../gtk/parameters.ui.h:80 ../gtk/ldap.ui.h:2
 msgid "Server address:"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:78 ../gtk/ldap.ui.h:3
+#: ../gtk/parameters.ui.h:81 ../gtk/ldap.ui.h:3
 msgid "Authentication method:"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:80
+#: ../gtk/parameters.ui.h:83
 msgid "<b>LDAP Account setup</b>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:81
+#: ../gtk/parameters.ui.h:84
 msgid "LDAP"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:82
+#: ../gtk/parameters.ui.h:85
 msgid "Done"
 msgstr ""
 
@@ -1675,56 +1687,56 @@ msgstr ""
 msgid "Ready"
 msgstr "Gereed."
 
-#: ../coreapi/linphonecore.c:2473
+#: ../coreapi/linphonecore.c:2489
 msgid "Configuring"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2638
+#: ../coreapi/linphonecore.c:2654
 msgid "Looking for telephone number destination..."
 msgstr "Zoekt de lokatie van het telefoonnummer..."
 
-#: ../coreapi/linphonecore.c:2640
+#: ../coreapi/linphonecore.c:2656
 msgid "Could not resolve this number."
 msgstr "Kon dit nummer niet vinden."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2926
+#: ../coreapi/linphonecore.c:2942
 msgid "Contacting"
 msgstr "Verbinden"
 
-#: ../coreapi/linphonecore.c:2931
+#: ../coreapi/linphonecore.c:2947
 msgid "Could not call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3081
+#: ../coreapi/linphonecore.c:3097
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3240
+#: ../coreapi/linphonecore.c:3256
 msgid "is contacting you"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3241
+#: ../coreapi/linphonecore.c:3257
 msgid " and asked autoanswer."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3359
+#: ../coreapi/linphonecore.c:3375
 msgid "Modifying call parameters..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3707
+#: ../coreapi/linphonecore.c:3723
 msgid "Connected."
 msgstr "Verbonden."
 
-#: ../coreapi/linphonecore.c:3732
+#: ../coreapi/linphonecore.c:3748
 msgid "Call aborted"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3922
+#: ../coreapi/linphonecore.c:3938
 msgid "Could not pause the call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3926
+#: ../coreapi/linphonecore.c:3941
 msgid "Pausing the current call..."
 msgstr ""
 
@@ -1788,19 +1800,19 @@ msgstr ""
 msgid "Unknown status"
 msgstr ""
 
-#: ../coreapi/proxy.c:319
+#: ../coreapi/proxy.c:327
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
 msgstr ""
 
-#: ../coreapi/proxy.c:325
+#: ../coreapi/proxy.c:333
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
 msgstr ""
 
-#: ../coreapi/proxy.c:1377
+#: ../coreapi/proxy.c:1390
 #, c-format
 msgid "Could not login as %s"
 msgstr ""
@@ -1914,12 +1926,12 @@ msgstr ""
 msgid "Service unavailable, retrying"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:174
+#: ../coreapi/linphonecall.c:175
 #, c-format
 msgid "Authentication token is %s"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:3020
+#: ../coreapi/linphonecall.c:3041
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
diff --git a/po/pl.po b/po/pl.po
index 11376931f..d61587d3f 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-03 13:39+0100\n"
-"PO-Revision-Date: 2014-12-03 12:39+0000\n"
+"POT-Creation-Date: 2015-01-06 12:28+0100\n"
+"PO-Revision-Date: 2015-01-06 11:29+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/pl/)\n"
@@ -95,45 +95,49 @@ msgstr "Nie można znaleźć pixmapy: %s"
 msgid "Invalid sip contact !"
 msgstr ""
 
-#: ../gtk/main.c:107
+#: ../gtk/main.c:109
 msgid "log to stdout some debug information while running."
 msgstr ""
 
-#: ../gtk/main.c:114
+#: ../gtk/main.c:116
 msgid "path to a file to write logs into."
 msgstr ""
 
-#: ../gtk/main.c:121
+#: ../gtk/main.c:123
 msgid "Start linphone with video disabled."
 msgstr ""
 
-#: ../gtk/main.c:128
+#: ../gtk/main.c:130
 msgid "Start only in the system tray, do not show the main interface."
 msgstr ""
 
-#: ../gtk/main.c:135
+#: ../gtk/main.c:137
 msgid "address to call right now"
 msgstr ""
 
-#: ../gtk/main.c:142
+#: ../gtk/main.c:144
 msgid "if set automatically answer incoming calls"
 msgstr ""
 
-#: ../gtk/main.c:149
+#: ../gtk/main.c:151
 msgid ""
 "Specifiy a working directory (should be the base of the installation, eg: c:"
 "\\Program Files\\Linphone)"
 msgstr ""
 
-#: ../gtk/main.c:156
+#: ../gtk/main.c:158
 msgid "Configuration file"
 msgstr ""
 
-#: ../gtk/main.c:163
+#: ../gtk/main.c:165
 msgid "Run the audio assistant"
 msgstr ""
 
-#: ../gtk/main.c:1085
+#: ../gtk/main.c:172
+msgid "Run self test and exit 0 if succeed"
+msgstr ""
+
+#: ../gtk/main.c:1083
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
@@ -142,72 +146,72 @@ msgid ""
 "If you answer no, this person will be temporarily blacklisted."
 msgstr ""
 
-#: ../gtk/main.c:1162
+#: ../gtk/main.c:1160
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
 msgstr ""
 
-#: ../gtk/main.c:1283
+#: ../gtk/main.c:1281
 msgid "Call error"
 msgstr ""
 
-#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3751
+#: ../gtk/main.c:1284 ../coreapi/linphonecore.c:3767
 msgid "Call ended"
 msgstr ""
 
-#: ../gtk/main.c:1289 ../coreapi/call_log.c:221
+#: ../gtk/main.c:1287 ../coreapi/call_log.c:221
 msgid "Incoming call"
 msgstr ""
 
-#: ../gtk/main.c:1291 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
+#: ../gtk/main.c:1289 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
 msgid "Answer"
 msgstr ""
 
-#: ../gtk/main.c:1293 ../gtk/main.ui.h:6
+#: ../gtk/main.c:1291 ../gtk/main.ui.h:6
 msgid "Decline"
 msgstr ""
 
-#: ../gtk/main.c:1299
+#: ../gtk/main.c:1297
 msgid "Call paused"
 msgstr ""
 
-#: ../gtk/main.c:1299
+#: ../gtk/main.c:1297
 #, c-format
 msgid "<b>by %s</b>"
 msgstr ""
 
-#: ../gtk/main.c:1366
+#: ../gtk/main.c:1367
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr ""
 
-#: ../gtk/main.c:1528
+#: ../gtk/main.c:1529
 msgid "Website link"
 msgstr ""
 
-#: ../gtk/main.c:1577
+#: ../gtk/main.c:1578
 msgid "Linphone - a video internet phone"
 msgstr ""
 
-#: ../gtk/main.c:1669
+#: ../gtk/main.c:1670
 #, c-format
 msgid "%s (Default)"
 msgstr ""
 
-#: ../gtk/main.c:2006 ../coreapi/callbacks.c:986
+#: ../gtk/main.c:2002 ../coreapi/callbacks.c:986
 #, c-format
 msgid "We are transferred to %s"
 msgstr ""
 
-#: ../gtk/main.c:2016
+#: ../gtk/main.c:2012
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
 msgstr ""
 
-#: ../gtk/main.c:2157
+#: ../gtk/main.c:2156
 msgid "A free SIP video-phone"
 msgstr ""
 
@@ -276,7 +280,7 @@ msgstr "Parametr"
 msgid "Enabled"
 msgstr "Włączone"
 
-#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763
+#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763 ../gtk/parameters.ui.h:20
 msgid "Disabled"
 msgstr "Wyłączone"
 
@@ -438,7 +442,7 @@ msgstr ""
 msgid "Enter your linphone.org username"
 msgstr ""
 
-#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:79 ../gtk/ldap.ui.h:4
+#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:82 ../gtk/ldap.ui.h:4
 msgid "Username:"
 msgstr ""
 
@@ -622,7 +626,7 @@ msgstr ""
 msgid "%.3f seconds"
 msgstr ""
 
-#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12 ../gtk/videowindow.c:232
+#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12 ../gtk/videowindow.c:235
 msgid "Hang up"
 msgstr ""
 
@@ -1204,256 +1208,264 @@ msgid "<b>Transport</b>"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:19
-msgid "Media encryption type"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:20
-msgid "Video RTP/UDP:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:21
-msgid "Audio RTP/UDP:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:22
-msgid "Fixed"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:23
-msgid "Media encryption is mandatory"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:24
-msgid "Tunnel"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:25
-msgid "DSCP fields"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:26
-msgid "SIP/TCP port"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:27
 msgid "SIP/UDP port"
 msgstr ""
 
+#: ../gtk/parameters.ui.h:21
+msgid "Random"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:22
+msgid "SIP/TCP port"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:23
+msgid "Audio RTP/UDP:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:24
+msgid "Fixed"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:25
+msgid "Video RTP/UDP:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:26
+msgid "Media encryption type"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:27
+msgid "Media encryption is mandatory"
+msgstr ""
+
 #: ../gtk/parameters.ui.h:28
-msgid "<b>Network protocol and ports</b>"
+msgid "Tunnel"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:29
-msgid "Direct connection to the Internet"
+msgid "DSCP fields"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:30
-msgid "Behind NAT / Firewall (specify gateway IP )"
+msgid "<b>Network protocol and ports</b>"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:31
-msgid "Behind NAT / Firewall (use STUN to resolve)"
+msgid "Direct connection to the Internet"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:32
-msgid "Behind NAT / Firewall (use ICE)"
+msgid "Behind NAT / Firewall (specify gateway IP )"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:33
-msgid "Behind NAT / Firewall (use uPnP)"
+msgid "Behind NAT / Firewall (use STUN to resolve)"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:34
-msgid "Public IP address:"
+msgid "Behind NAT / Firewall (use ICE)"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:35
-msgid "Stun server:"
+msgid "Behind NAT / Firewall (use uPnP)"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:36
-msgid "<b>NAT and Firewall</b>"
+msgid "Public IP address:"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:37
-msgid "Network settings"
+msgid "Stun server:"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:38
-msgid "Ring sound:"
+msgid "<b>NAT and Firewall</b>"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:39
-msgid "ALSA special device (optional):"
+msgid "Network settings"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:40
-msgid "Capture device:"
+msgid "Ring sound:"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:41
-msgid "Ring device:"
+msgid "ALSA special device (optional):"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:42
-msgid "Playback device:"
+msgid "Capture device:"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:43
-msgid "Enable echo cancellation"
+msgid "Ring device:"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:44
-msgid "<b>Audio</b>"
+msgid "Playback device:"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:45
-msgid "Video input device:"
+msgid "Enable echo cancellation"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:46
-msgid "Prefered video resolution:"
+msgid "<b>Audio</b>"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:47
-msgid "Video output method:"
+msgid "Video input device:"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:48
-msgid "<b>Video</b>"
+msgid "Prefered video resolution:"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:49
-msgid "Multimedia settings"
+msgid "Video output method:"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:50
-msgid "This section defines your SIP address when not using a SIP account"
+msgid "Show camera preview"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:51
-msgid "Your display name (eg: John Doe):"
+msgid "<b>Video</b>"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:52
-msgid "Your username:"
+msgid "Multimedia settings"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:53
-msgid "Your resulting SIP address:"
+msgid "This section defines your SIP address when not using a SIP account"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:54
-msgid "<b>Default identity</b>"
+msgid "Your display name (eg: John Doe):"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:55
-msgid "Wizard"
+msgid "Your username:"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:56
-msgid "Add"
+msgid "Your resulting SIP address:"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:57
-msgid "Edit"
+msgid "<b>Default identity</b>"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:58
-msgid "Remove"
+msgid "Wizard"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:59
-msgid "<b>Proxy accounts</b>"
+msgid "Add"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:60
-msgid "Erase all passwords"
+msgid "Edit"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:61
-msgid "<b>Privacy</b>"
+msgid "Remove"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:62
+msgid "<b>Proxy accounts</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:63
+msgid "Erase all passwords"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:64
+msgid "<b>Privacy</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:65
 msgid "Manage SIP Accounts"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:63 ../gtk/tunnel_config.ui.h:4
+#: ../gtk/parameters.ui.h:66 ../gtk/tunnel_config.ui.h:4
 msgid "Enable"
 msgstr "Włączony"
 
-#: ../gtk/parameters.ui.h:64 ../gtk/tunnel_config.ui.h:5
+#: ../gtk/parameters.ui.h:67 ../gtk/tunnel_config.ui.h:5
 msgid "Disable"
 msgstr "Wyłącz"
 
-#: ../gtk/parameters.ui.h:65
+#: ../gtk/parameters.ui.h:68
 msgid "<b>Codecs</b>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:66
+#: ../gtk/parameters.ui.h:69
 msgid "0 stands for \"unlimited\""
 msgstr ""
 
-#: ../gtk/parameters.ui.h:67
+#: ../gtk/parameters.ui.h:70
 msgid "Upload speed limit in Kbit/sec:"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:68
+#: ../gtk/parameters.ui.h:71
 msgid "Download speed limit in Kbit/sec:"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:69
+#: ../gtk/parameters.ui.h:72
 msgid "Enable adaptive rate control"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:70
+#: ../gtk/parameters.ui.h:73
 msgid ""
 "<i>Adaptive rate control is a technique to dynamically guess the available "
 "bandwidth during a call.</i>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:71
+#: ../gtk/parameters.ui.h:74
 msgid "<b>Bandwidth control</b>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:72
+#: ../gtk/parameters.ui.h:75
 msgid "Codecs"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:73
+#: ../gtk/parameters.ui.h:76
 msgid "<b>Language</b>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:74
+#: ../gtk/parameters.ui.h:77
 msgid "Show advanced settings"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:75
+#: ../gtk/parameters.ui.h:78
 msgid "<b>Level</b>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:76
+#: ../gtk/parameters.ui.h:79
 msgid "User interface"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:77 ../gtk/ldap.ui.h:2
+#: ../gtk/parameters.ui.h:80 ../gtk/ldap.ui.h:2
 msgid "Server address:"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:78 ../gtk/ldap.ui.h:3
+#: ../gtk/parameters.ui.h:81 ../gtk/ldap.ui.h:3
 msgid "Authentication method:"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:80
+#: ../gtk/parameters.ui.h:83
 msgid "<b>LDAP Account setup</b>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:81
+#: ../gtk/parameters.ui.h:84
 msgid "LDAP"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:82
+#: ../gtk/parameters.ui.h:85
 msgid "Done"
 msgstr ""
 
@@ -1679,56 +1691,56 @@ msgstr ""
 msgid "Ready"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2473
+#: ../coreapi/linphonecore.c:2489
 msgid "Configuring"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2638
+#: ../coreapi/linphonecore.c:2654
 msgid "Looking for telephone number destination..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2640
+#: ../coreapi/linphonecore.c:2656
 msgid "Could not resolve this number."
 msgstr ""
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2926
+#: ../coreapi/linphonecore.c:2942
 msgid "Contacting"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2931
+#: ../coreapi/linphonecore.c:2947
 msgid "Could not call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3081
+#: ../coreapi/linphonecore.c:3097
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3240
+#: ../coreapi/linphonecore.c:3256
 msgid "is contacting you"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3241
+#: ../coreapi/linphonecore.c:3257
 msgid " and asked autoanswer."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3359
+#: ../coreapi/linphonecore.c:3375
 msgid "Modifying call parameters..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3707
+#: ../coreapi/linphonecore.c:3723
 msgid "Connected."
 msgstr "Połączony"
 
-#: ../coreapi/linphonecore.c:3732
+#: ../coreapi/linphonecore.c:3748
 msgid "Call aborted"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3922
+#: ../coreapi/linphonecore.c:3938
 msgid "Could not pause the call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3926
+#: ../coreapi/linphonecore.c:3941
 msgid "Pausing the current call..."
 msgstr ""
 
@@ -1792,19 +1804,19 @@ msgstr ""
 msgid "Unknown status"
 msgstr ""
 
-#: ../coreapi/proxy.c:319
+#: ../coreapi/proxy.c:327
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
 msgstr ""
 
-#: ../coreapi/proxy.c:325
+#: ../coreapi/proxy.c:333
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
 msgstr ""
 
-#: ../coreapi/proxy.c:1377
+#: ../coreapi/proxy.c:1390
 #, c-format
 msgid "Could not login as %s"
 msgstr ""
@@ -1918,12 +1930,12 @@ msgstr ""
 msgid "Service unavailable, retrying"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:174
+#: ../coreapi/linphonecall.c:175
 #, c-format
 msgid "Authentication token is %s"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:3020
+#: ../coreapi/linphonecall.c:3041
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index cafe7bd91..7fe04b407 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-03 13:39+0100\n"
-"PO-Revision-Date: 2014-12-03 12:39+0000\n"
+"POT-Creation-Date: 2015-01-06 12:28+0100\n"
+"PO-Revision-Date: 2015-01-06 11:29+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
 "linphone-gtk/language/pt_BR/)\n"
@@ -92,45 +92,49 @@ msgstr "Não é possível achar arquivo pixmap: %s"
 msgid "Invalid sip contact !"
 msgstr ""
 
-#: ../gtk/main.c:107
+#: ../gtk/main.c:109
 msgid "log to stdout some debug information while running."
 msgstr ""
 
-#: ../gtk/main.c:114
+#: ../gtk/main.c:116
 msgid "path to a file to write logs into."
 msgstr ""
 
-#: ../gtk/main.c:121
+#: ../gtk/main.c:123
 msgid "Start linphone with video disabled."
 msgstr ""
 
-#: ../gtk/main.c:128
+#: ../gtk/main.c:130
 msgid "Start only in the system tray, do not show the main interface."
 msgstr ""
 
-#: ../gtk/main.c:135
+#: ../gtk/main.c:137
 msgid "address to call right now"
 msgstr ""
 
-#: ../gtk/main.c:142
+#: ../gtk/main.c:144
 msgid "if set automatically answer incoming calls"
 msgstr ""
 
-#: ../gtk/main.c:149
+#: ../gtk/main.c:151
 msgid ""
 "Specifiy a working directory (should be the base of the installation, eg: c:"
 "\\Program Files\\Linphone)"
 msgstr ""
 
-#: ../gtk/main.c:156
+#: ../gtk/main.c:158
 msgid "Configuration file"
 msgstr ""
 
-#: ../gtk/main.c:163
+#: ../gtk/main.c:165
 msgid "Run the audio assistant"
 msgstr ""
 
-#: ../gtk/main.c:1085
+#: ../gtk/main.c:172
+msgid "Run self test and exit 0 if succeed"
+msgstr ""
+
+#: ../gtk/main.c:1083
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
@@ -139,72 +143,72 @@ msgid ""
 "If you answer no, this person will be temporarily blacklisted."
 msgstr ""
 
-#: ../gtk/main.c:1162
+#: ../gtk/main.c:1160
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
 msgstr ""
 
-#: ../gtk/main.c:1283
+#: ../gtk/main.c:1281
 msgid "Call error"
 msgstr ""
 
-#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3751
+#: ../gtk/main.c:1284 ../coreapi/linphonecore.c:3767
 msgid "Call ended"
 msgstr ""
 
-#: ../gtk/main.c:1289 ../coreapi/call_log.c:221
+#: ../gtk/main.c:1287 ../coreapi/call_log.c:221
 msgid "Incoming call"
 msgstr "Camadas recebidas"
 
-#: ../gtk/main.c:1291 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
+#: ../gtk/main.c:1289 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
 msgid "Answer"
 msgstr ""
 
-#: ../gtk/main.c:1293 ../gtk/main.ui.h:6
+#: ../gtk/main.c:1291 ../gtk/main.ui.h:6
 msgid "Decline"
 msgstr ""
 
-#: ../gtk/main.c:1299
+#: ../gtk/main.c:1297
 msgid "Call paused"
 msgstr ""
 
-#: ../gtk/main.c:1299
+#: ../gtk/main.c:1297
 #, c-format
 msgid "<b>by %s</b>"
 msgstr ""
 
-#: ../gtk/main.c:1366
+#: ../gtk/main.c:1367
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr ""
 
-#: ../gtk/main.c:1528
+#: ../gtk/main.c:1529
 msgid "Website link"
 msgstr ""
 
-#: ../gtk/main.c:1577
+#: ../gtk/main.c:1578
 msgid "Linphone - a video internet phone"
 msgstr ""
 
-#: ../gtk/main.c:1669
+#: ../gtk/main.c:1670
 #, c-format
 msgid "%s (Default)"
 msgstr ""
 
-#: ../gtk/main.c:2006 ../coreapi/callbacks.c:986
+#: ../gtk/main.c:2002 ../coreapi/callbacks.c:986
 #, c-format
 msgid "We are transferred to %s"
 msgstr ""
 
-#: ../gtk/main.c:2016
+#: ../gtk/main.c:2012
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
 msgstr ""
 
-#: ../gtk/main.c:2157
+#: ../gtk/main.c:2156
 msgid "A free SIP video-phone"
 msgstr ""
 
@@ -273,7 +277,7 @@ msgstr "Parâmetros"
 msgid "Enabled"
 msgstr "Ativado"
 
-#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763
+#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763 ../gtk/parameters.ui.h:20
 msgid "Disabled"
 msgstr "Desativado"
 
@@ -434,7 +438,7 @@ msgstr ""
 msgid "Enter your linphone.org username"
 msgstr ""
 
-#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:79 ../gtk/ldap.ui.h:4
+#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:82 ../gtk/ldap.ui.h:4
 msgid "Username:"
 msgstr ""
 
@@ -618,7 +622,7 @@ msgstr ""
 msgid "%.3f seconds"
 msgstr ""
 
-#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12 ../gtk/videowindow.c:232
+#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12 ../gtk/videowindow.c:235
 msgid "Hang up"
 msgstr ""
 
@@ -1200,256 +1204,264 @@ msgid "<b>Transport</b>"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:19
-msgid "Media encryption type"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:20
-msgid "Video RTP/UDP:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:21
-msgid "Audio RTP/UDP:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:22
-msgid "Fixed"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:23
-msgid "Media encryption is mandatory"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:24
-msgid "Tunnel"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:25
-msgid "DSCP fields"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:26
-msgid "SIP/TCP port"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:27
 msgid "SIP/UDP port"
 msgstr ""
 
+#: ../gtk/parameters.ui.h:21
+msgid "Random"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:22
+msgid "SIP/TCP port"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:23
+msgid "Audio RTP/UDP:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:24
+msgid "Fixed"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:25
+msgid "Video RTP/UDP:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:26
+msgid "Media encryption type"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:27
+msgid "Media encryption is mandatory"
+msgstr ""
+
 #: ../gtk/parameters.ui.h:28
-msgid "<b>Network protocol and ports</b>"
+msgid "Tunnel"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:29
-msgid "Direct connection to the Internet"
+msgid "DSCP fields"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:30
-msgid "Behind NAT / Firewall (specify gateway IP )"
+msgid "<b>Network protocol and ports</b>"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:31
-msgid "Behind NAT / Firewall (use STUN to resolve)"
+msgid "Direct connection to the Internet"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:32
-msgid "Behind NAT / Firewall (use ICE)"
+msgid "Behind NAT / Firewall (specify gateway IP )"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:33
-msgid "Behind NAT / Firewall (use uPnP)"
+msgid "Behind NAT / Firewall (use STUN to resolve)"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:34
-msgid "Public IP address:"
+msgid "Behind NAT / Firewall (use ICE)"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:35
-msgid "Stun server:"
+msgid "Behind NAT / Firewall (use uPnP)"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:36
-msgid "<b>NAT and Firewall</b>"
+msgid "Public IP address:"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:37
-msgid "Network settings"
+msgid "Stun server:"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:38
-msgid "Ring sound:"
+msgid "<b>NAT and Firewall</b>"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:39
-msgid "ALSA special device (optional):"
+msgid "Network settings"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:40
-msgid "Capture device:"
+msgid "Ring sound:"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:41
-msgid "Ring device:"
+msgid "ALSA special device (optional):"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:42
-msgid "Playback device:"
+msgid "Capture device:"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:43
-msgid "Enable echo cancellation"
+msgid "Ring device:"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:44
-msgid "<b>Audio</b>"
+msgid "Playback device:"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:45
-msgid "Video input device:"
+msgid "Enable echo cancellation"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:46
-msgid "Prefered video resolution:"
+msgid "<b>Audio</b>"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:47
-msgid "Video output method:"
+msgid "Video input device:"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:48
-msgid "<b>Video</b>"
+msgid "Prefered video resolution:"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:49
-msgid "Multimedia settings"
+msgid "Video output method:"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:50
-msgid "This section defines your SIP address when not using a SIP account"
+msgid "Show camera preview"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:51
-msgid "Your display name (eg: John Doe):"
+msgid "<b>Video</b>"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:52
-msgid "Your username:"
+msgid "Multimedia settings"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:53
-msgid "Your resulting SIP address:"
+msgid "This section defines your SIP address when not using a SIP account"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:54
-msgid "<b>Default identity</b>"
+msgid "Your display name (eg: John Doe):"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:55
-msgid "Wizard"
+msgid "Your username:"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:56
-msgid "Add"
+msgid "Your resulting SIP address:"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:57
-msgid "Edit"
-msgstr "Editar"
+msgid "<b>Default identity</b>"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:58
-msgid "Remove"
-msgstr "Remover"
+msgid "Wizard"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:59
-msgid "<b>Proxy accounts</b>"
+msgid "Add"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:60
+msgid "Edit"
+msgstr "Editar"
+
+#: ../gtk/parameters.ui.h:61
+msgid "Remove"
+msgstr "Remover"
+
+#: ../gtk/parameters.ui.h:62
+msgid "<b>Proxy accounts</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:63
 msgid "Erase all passwords"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:61
+#: ../gtk/parameters.ui.h:64
 msgid "<b>Privacy</b>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:62
+#: ../gtk/parameters.ui.h:65
 msgid "Manage SIP Accounts"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:63 ../gtk/tunnel_config.ui.h:4
+#: ../gtk/parameters.ui.h:66 ../gtk/tunnel_config.ui.h:4
 msgid "Enable"
 msgstr "Ativado"
 
-#: ../gtk/parameters.ui.h:64 ../gtk/tunnel_config.ui.h:5
+#: ../gtk/parameters.ui.h:67 ../gtk/tunnel_config.ui.h:5
 msgid "Disable"
 msgstr "Desativar"
 
-#: ../gtk/parameters.ui.h:65
+#: ../gtk/parameters.ui.h:68
 msgid "<b>Codecs</b>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:66
+#: ../gtk/parameters.ui.h:69
 msgid "0 stands for \"unlimited\""
 msgstr ""
 
-#: ../gtk/parameters.ui.h:67
+#: ../gtk/parameters.ui.h:70
 msgid "Upload speed limit in Kbit/sec:"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:68
+#: ../gtk/parameters.ui.h:71
 msgid "Download speed limit in Kbit/sec:"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:69
+#: ../gtk/parameters.ui.h:72
 msgid "Enable adaptive rate control"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:70
+#: ../gtk/parameters.ui.h:73
 msgid ""
 "<i>Adaptive rate control is a technique to dynamically guess the available "
 "bandwidth during a call.</i>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:71
+#: ../gtk/parameters.ui.h:74
 msgid "<b>Bandwidth control</b>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:72
+#: ../gtk/parameters.ui.h:75
 msgid "Codecs"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:73
+#: ../gtk/parameters.ui.h:76
 msgid "<b>Language</b>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:74
+#: ../gtk/parameters.ui.h:77
 msgid "Show advanced settings"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:75
+#: ../gtk/parameters.ui.h:78
 msgid "<b>Level</b>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:76
+#: ../gtk/parameters.ui.h:79
 msgid "User interface"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:77 ../gtk/ldap.ui.h:2
+#: ../gtk/parameters.ui.h:80 ../gtk/ldap.ui.h:2
 msgid "Server address:"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:78 ../gtk/ldap.ui.h:3
+#: ../gtk/parameters.ui.h:81 ../gtk/ldap.ui.h:3
 msgid "Authentication method:"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:80
+#: ../gtk/parameters.ui.h:83
 msgid "<b>LDAP Account setup</b>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:81
+#: ../gtk/parameters.ui.h:84
 msgid "LDAP"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:82
+#: ../gtk/parameters.ui.h:85
 msgid "Done"
 msgstr ""
 
@@ -1675,56 +1687,56 @@ msgstr ""
 msgid "Ready"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2473
+#: ../coreapi/linphonecore.c:2489
 msgid "Configuring"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2638
+#: ../coreapi/linphonecore.c:2654
 msgid "Looking for telephone number destination..."
 msgstr "Procurando por telefone de destino..."
 
-#: ../coreapi/linphonecore.c:2640
+#: ../coreapi/linphonecore.c:2656
 msgid "Could not resolve this number."
 msgstr "Não foi possível encontrar este número."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2926
+#: ../coreapi/linphonecore.c:2942
 msgid "Contacting"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2931
+#: ../coreapi/linphonecore.c:2947
 msgid "Could not call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3081
+#: ../coreapi/linphonecore.c:3097
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3240
+#: ../coreapi/linphonecore.c:3256
 msgid "is contacting you"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3241
+#: ../coreapi/linphonecore.c:3257
 msgid " and asked autoanswer."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3359
+#: ../coreapi/linphonecore.c:3375
 msgid "Modifying call parameters..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3707
+#: ../coreapi/linphonecore.c:3723
 msgid "Connected."
 msgstr "Conectado."
 
-#: ../coreapi/linphonecore.c:3732
+#: ../coreapi/linphonecore.c:3748
 msgid "Call aborted"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3922
+#: ../coreapi/linphonecore.c:3938
 msgid "Could not pause the call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3926
+#: ../coreapi/linphonecore.c:3941
 msgid "Pausing the current call..."
 msgstr ""
 
@@ -1788,19 +1800,19 @@ msgstr ""
 msgid "Unknown status"
 msgstr ""
 
-#: ../coreapi/proxy.c:319
+#: ../coreapi/proxy.c:327
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
 msgstr ""
 
-#: ../coreapi/proxy.c:325
+#: ../coreapi/proxy.c:333
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
 msgstr ""
 
-#: ../coreapi/proxy.c:1377
+#: ../coreapi/proxy.c:1390
 #, c-format
 msgid "Could not login as %s"
 msgstr ""
@@ -1914,12 +1926,12 @@ msgstr ""
 msgid "Service unavailable, retrying"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:174
+#: ../coreapi/linphonecall.c:175
 #, c-format
 msgid "Authentication token is %s"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:3020
+#: ../coreapi/linphonecall.c:3041
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
diff --git a/po/ru.po b/po/ru.po
index f8fa42081..6ffa7ef1f 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -3,16 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
-# a <loginov.alex.valer@gmail.com>, 2014
-# a <loginov.alex.valer@gmail.com>, 2014
+# AlexL <loginov.alex.valer@gmail.com>, 2014
+# AlexL <loginov.alex.valer@gmail.com>, 2014
+# AlexL <loginov.alex.valer@gmail.com>, 2014
 # Maxim Prokopyev <jazzelastic@gmail.com>, 2010
 # Simon Morlat <linphone@free.fr>, 2001
 msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-03 13:39+0100\n"
-"PO-Revision-Date: 2014-12-04 09:51+0000\n"
+"POT-Creation-Date: 2015-01-06 12:28+0100\n"
+"PO-Revision-Date: 2015-01-06 11:29+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/ru/)\n"
@@ -101,33 +102,33 @@ msgstr "Невозможно найти графический файл: %s"
 msgid "Invalid sip contact !"
 msgstr "Неверный sip контакт!"
 
-#: ../gtk/main.c:107
+#: ../gtk/main.c:109
 msgid "log to stdout some debug information while running."
 msgstr ""
 "Вывод некоторой отладочной информации на устройство стандартного вывода во "
 "время работы."
 
-#: ../gtk/main.c:114
+#: ../gtk/main.c:116
 msgid "path to a file to write logs into."
 msgstr "Путь к файлу для записи логов."
 
-#: ../gtk/main.c:121
+#: ../gtk/main.c:123
 msgid "Start linphone with video disabled."
 msgstr "Запуск linphone с видео отключен."
 
-#: ../gtk/main.c:128
+#: ../gtk/main.c:130
 msgid "Start only in the system tray, do not show the main interface."
 msgstr "Показывать только в системном лотке, не запуская главное окно."
 
-#: ../gtk/main.c:135
+#: ../gtk/main.c:137
 msgid "address to call right now"
 msgstr "Адрес для звонка прямо сейчас."
 
-#: ../gtk/main.c:142
+#: ../gtk/main.c:144
 msgid "if set automatically answer incoming calls"
 msgstr "Если установлено, то автоматический приём входящих звонков."
 
-#: ../gtk/main.c:149
+#: ../gtk/main.c:151
 msgid ""
 "Specifiy a working directory (should be the base of the installation, eg: c:"
 "\\Program Files\\Linphone)"
@@ -135,15 +136,19 @@ msgstr ""
 "Определить рабочий каталог (относительно каталога установки, например: c:"
 "\\Program Files\\Linphone)"
 
-#: ../gtk/main.c:156
+#: ../gtk/main.c:158
 msgid "Configuration file"
 msgstr "Файл конфигурации"
 
-#: ../gtk/main.c:163
+#: ../gtk/main.c:165
 msgid "Run the audio assistant"
 msgstr "Запустить помощника аудио"
 
-#: ../gtk/main.c:1085
+#: ../gtk/main.c:172
+msgid "Run self test and exit 0 if succeed"
+msgstr ""
+
+#: ../gtk/main.c:1083
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
@@ -156,7 +161,7 @@ msgstr ""
 "контактный лист?\n"
 "Если вы ответите Нет, эта персона будет временно в чёрном списке."
 
-#: ../gtk/main.c:1162
+#: ../gtk/main.c:1160
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
@@ -165,59 +170,59 @@ msgstr ""
 "Пожалуйста, введите пароль для пользователя <i>%s</i>\n"
 " для реалм (рилм) <i>%s</i>:"
 
-#: ../gtk/main.c:1283
+#: ../gtk/main.c:1281
 msgid "Call error"
 msgstr "Ошибка звонка"
 
-#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3751
+#: ../gtk/main.c:1284 ../coreapi/linphonecore.c:3767
 msgid "Call ended"
 msgstr "Звонок окончен"
 
-#: ../gtk/main.c:1289 ../coreapi/call_log.c:221
+#: ../gtk/main.c:1287 ../coreapi/call_log.c:221
 msgid "Incoming call"
 msgstr "Входящий звонок"
 
-#: ../gtk/main.c:1291 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
+#: ../gtk/main.c:1289 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
 msgid "Answer"
 msgstr "Ответ"
 
-#: ../gtk/main.c:1293 ../gtk/main.ui.h:6
+#: ../gtk/main.c:1291 ../gtk/main.ui.h:6
 msgid "Decline"
 msgstr "Отклонить"
 
-#: ../gtk/main.c:1299
+#: ../gtk/main.c:1297
 msgid "Call paused"
 msgstr "Звонок приостановлен"
 
-#: ../gtk/main.c:1299
+#: ../gtk/main.c:1297
 #, c-format
 msgid "<b>by %s</b>"
 msgstr "<b>%s</b>"
 
-#: ../gtk/main.c:1366
+#: ../gtk/main.c:1367
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr "%s предложил запустить видео. Вы принимаете?"
 
-#: ../gtk/main.c:1528
+#: ../gtk/main.c:1529
 msgid "Website link"
 msgstr "Домашняя страница"
 
-#: ../gtk/main.c:1577
+#: ../gtk/main.c:1578
 msgid "Linphone - a video internet phone"
 msgstr "Linphone - интернет видео телефон"
 
-#: ../gtk/main.c:1669
+#: ../gtk/main.c:1670
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (по умолчанию)"
 
-#: ../gtk/main.c:2006 ../coreapi/callbacks.c:986
+#: ../gtk/main.c:2002 ../coreapi/callbacks.c:986
 #, c-format
 msgid "We are transferred to %s"
 msgstr "Мы передали в %s"
 
-#: ../gtk/main.c:2016
+#: ../gtk/main.c:2012
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
@@ -225,7 +230,7 @@ msgstr ""
 "Звуковые карты не были обнаружены на этом компьютере.\n"
 "Вы не сможете отправлять или получать аудио звонки."
 
-#: ../gtk/main.c:2157
+#: ../gtk/main.c:2156
 msgid "A free SIP video-phone"
 msgstr "Свободный SIP видео-телефон"
 
@@ -294,7 +299,7 @@ msgstr "Параметры"
 msgid "Enabled"
 msgstr "Разрешён"
 
-#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763
+#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763 ../gtk/parameters.ui.h:20
 msgid "Disabled"
 msgstr "Не разрешён"
 
@@ -439,6 +444,8 @@ msgid ""
 "Welcome!\n"
 "This assistant will help you to use a SIP account for your calls."
 msgstr ""
+"Добро пожаловать!\n"
+"Этот ассистент поможет вам использовать SIP аккаунт для ваших звонков."
 
 #: ../gtk/setupwizard.c:43
 msgid "Create an account on linphone.org"
@@ -461,7 +468,7 @@ msgstr "Я хочу указать удалённую конфигурацию U
 msgid "Enter your linphone.org username"
 msgstr "Введите ваше имя пользователя для linphone.org"
 
-#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:79 ../gtk/ldap.ui.h:4
+#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:82 ../gtk/ldap.ui.h:4
 msgid "Username:"
 msgstr "Имя пользователя:"
 
@@ -654,7 +661,7 @@ msgstr "%ix%i @ %f кадр/сек"
 msgid "%.3f seconds"
 msgstr "%.3f секунд"
 
-#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12 ../gtk/videowindow.c:232
+#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12 ../gtk/videowindow.c:235
 msgid "Hang up"
 msgstr "Повесить трубку"
 
@@ -793,21 +800,23 @@ msgstr "Слишком громко"
 
 #: ../gtk/audio_assistant.c:183
 msgid "Did you hear three beeps ?"
-msgstr ""
+msgstr "Вы слышали 3 сигнала?"
 
 #: ../gtk/audio_assistant.c:292 ../gtk/audio_assistant.c:297
 msgid "Sound preferences not found "
-msgstr ""
+msgstr "Настройки звука не найдены"
 
 #: ../gtk/audio_assistant.c:306
 msgid "Cannot launch system sound control "
-msgstr ""
+msgstr "Не удаётся запустить системное управление звуком"
 
 #: ../gtk/audio_assistant.c:318
 msgid ""
 "Welcome!\n"
 "This assistant will help you to configure audio settings for Linphone"
 msgstr ""
+"Добро пожаловать!\n"
+"Этот ассистент поможет вам настроить настройки аудио для Linphone."
 
 #: ../gtk/audio_assistant.c:328
 msgid "Capture device"
@@ -823,7 +832,7 @@ msgstr "Нет голоса"
 
 #: ../gtk/audio_assistant.c:334 ../gtk/audio_assistant.c:373
 msgid "System sound preferences"
-msgstr ""
+msgstr "Системные настройки звука"
 
 #: ../gtk/audio_assistant.c:369
 msgid "Playback device"
@@ -843,11 +852,11 @@ msgstr "Прослушайте ваш записанный голос"
 
 #: ../gtk/audio_assistant.c:405
 msgid "Record"
-msgstr ""
+msgstr "Запись"
 
 #: ../gtk/audio_assistant.c:406
 msgid "Play"
-msgstr ""
+msgstr "Воспроизведение"
 
 #: ../gtk/audio_assistant.c:433
 msgid "Let's start Linphone now"
@@ -1027,7 +1036,7 @@ msgstr "Информация для входа"
 
 #: ../gtk/main.ui.h:46
 msgid "<b>Welcome!</b>"
-msgstr ""
+msgstr "<b>Добро пожаловать!</b>"
 
 #: ../gtk/main.ui.h:47
 msgid "Delete"
@@ -1035,11 +1044,11 @@ msgstr "Удалить"
 
 #: ../gtk/about.ui.h:1
 msgid "About Linphone"
-msgstr ""
+msgstr "О Linphone"
 
 #: ../gtk/about.ui.h:2
 msgid "(C) Belledonne Communications, 2010\n"
-msgstr ""
+msgstr "(C) Belledonne Communications, 2010\n"
 
 #: ../gtk/about.ui.h:4
 msgid "An internet video phone using the standard SIP (rfc3261) protocol."
@@ -1250,212 +1259,220 @@ msgid "<b>Transport</b>"
 msgstr "<b>Транспорт</b>"
 
 #: ../gtk/parameters.ui.h:19
-msgid "Media encryption type"
-msgstr "Тип медиа-шифрования"
-
-#: ../gtk/parameters.ui.h:20
-msgid "Video RTP/UDP:"
-msgstr "Видео RTP/UDP:"
-
-#: ../gtk/parameters.ui.h:21
-msgid "Audio RTP/UDP:"
-msgstr "Аудио RTP/UDP:"
-
-#: ../gtk/parameters.ui.h:22
-msgid "Fixed"
-msgstr "Фиксированный"
-
-#: ../gtk/parameters.ui.h:23
-msgid "Media encryption is mandatory"
-msgstr "Медиа-шифрование обязательно"
-
-#: ../gtk/parameters.ui.h:24
-msgid "Tunnel"
-msgstr "Тунель"
-
-#: ../gtk/parameters.ui.h:25
-msgid "DSCP fields"
-msgstr "Поля DSCP"
-
-#: ../gtk/parameters.ui.h:26
-msgid "SIP/TCP port"
-msgstr "Порт SIP/TCP"
-
-#: ../gtk/parameters.ui.h:27
 msgid "SIP/UDP port"
 msgstr "Порт SIP/UDP"
 
+#: ../gtk/parameters.ui.h:21
+msgid "Random"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:22
+msgid "SIP/TCP port"
+msgstr "Порт SIP/TCP"
+
+#: ../gtk/parameters.ui.h:23
+msgid "Audio RTP/UDP:"
+msgstr "Аудио RTP/UDP:"
+
+#: ../gtk/parameters.ui.h:24
+msgid "Fixed"
+msgstr "Фиксированный"
+
+#: ../gtk/parameters.ui.h:25
+msgid "Video RTP/UDP:"
+msgstr "Видео RTP/UDP:"
+
+#: ../gtk/parameters.ui.h:26
+msgid "Media encryption type"
+msgstr "Тип медиа-шифрования"
+
+#: ../gtk/parameters.ui.h:27
+msgid "Media encryption is mandatory"
+msgstr "Медиа-шифрование обязательно"
+
 #: ../gtk/parameters.ui.h:28
+msgid "Tunnel"
+msgstr "Тунель"
+
+#: ../gtk/parameters.ui.h:29
+msgid "DSCP fields"
+msgstr "Поля DSCP"
+
+#: ../gtk/parameters.ui.h:30
 msgid "<b>Network protocol and ports</b>"
 msgstr "<b>Сетевые протоколы и порты</b>"
 
-#: ../gtk/parameters.ui.h:29
+#: ../gtk/parameters.ui.h:31
 msgid "Direct connection to the Internet"
 msgstr "Прямое подключение к интернет"
 
-#: ../gtk/parameters.ui.h:30
+#: ../gtk/parameters.ui.h:32
 msgid "Behind NAT / Firewall (specify gateway IP )"
 msgstr "За NAT / брандмауэром (указать IP шлюза)"
 
-#: ../gtk/parameters.ui.h:31
+#: ../gtk/parameters.ui.h:33
 msgid "Behind NAT / Firewall (use STUN to resolve)"
 msgstr "За NAT / брандмауэром (использовать STUN)"
 
-#: ../gtk/parameters.ui.h:32
+#: ../gtk/parameters.ui.h:34
 msgid "Behind NAT / Firewall (use ICE)"
 msgstr "За NAT / брандмауэром (использовать ICE)"
 
-#: ../gtk/parameters.ui.h:33
+#: ../gtk/parameters.ui.h:35
 msgid "Behind NAT / Firewall (use uPnP)"
 msgstr "За NAT / брандмауэром (использовать uPnP)"
 
-#: ../gtk/parameters.ui.h:34
+#: ../gtk/parameters.ui.h:36
 msgid "Public IP address:"
 msgstr "Выделенный (публичный) IP-адрес:"
 
-#: ../gtk/parameters.ui.h:35
+#: ../gtk/parameters.ui.h:37
 msgid "Stun server:"
 msgstr "STUN сервер:"
 
-#: ../gtk/parameters.ui.h:36
+#: ../gtk/parameters.ui.h:38
 msgid "<b>NAT and Firewall</b>"
 msgstr "<b>NAT и брандмауэр</b>"
 
-#: ../gtk/parameters.ui.h:37
+#: ../gtk/parameters.ui.h:39
 msgid "Network settings"
 msgstr "Настройки сети"
 
-#: ../gtk/parameters.ui.h:38
+#: ../gtk/parameters.ui.h:40
 msgid "Ring sound:"
 msgstr "Мелодия звонка:"
 
-#: ../gtk/parameters.ui.h:39
+#: ../gtk/parameters.ui.h:41
 msgid "ALSA special device (optional):"
 msgstr "Специальное устройство ALSA (опционально)"
 
-#: ../gtk/parameters.ui.h:40
+#: ../gtk/parameters.ui.h:42
 msgid "Capture device:"
 msgstr "Устройство захвата:"
 
-#: ../gtk/parameters.ui.h:41
+#: ../gtk/parameters.ui.h:43
 msgid "Ring device:"
 msgstr "Устройство звонка:"
 
-#: ../gtk/parameters.ui.h:42
+#: ../gtk/parameters.ui.h:44
 msgid "Playback device:"
 msgstr "Устройство воспроизведения:"
 
-#: ../gtk/parameters.ui.h:43
+#: ../gtk/parameters.ui.h:45
 msgid "Enable echo cancellation"
 msgstr "Разрешить подавление эха"
 
-#: ../gtk/parameters.ui.h:44
+#: ../gtk/parameters.ui.h:46
 msgid "<b>Audio</b>"
 msgstr "<b>Аудио</b>"
 
-#: ../gtk/parameters.ui.h:45
+#: ../gtk/parameters.ui.h:47
 msgid "Video input device:"
 msgstr "Устройство для вывода видео:"
 
-#: ../gtk/parameters.ui.h:46
+#: ../gtk/parameters.ui.h:48
 msgid "Prefered video resolution:"
 msgstr "Предпочтительное разрешение видео:"
 
-#: ../gtk/parameters.ui.h:47
+#: ../gtk/parameters.ui.h:49
 msgid "Video output method:"
 msgstr "Метод вывода видео:"
 
-#: ../gtk/parameters.ui.h:48
+#: ../gtk/parameters.ui.h:50
+msgid "Show camera preview"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:51
 msgid "<b>Video</b>"
 msgstr "<b>Видео</b>"
 
-#: ../gtk/parameters.ui.h:49
+#: ../gtk/parameters.ui.h:52
 msgid "Multimedia settings"
 msgstr "Настройки мультимедиа"
 
-#: ../gtk/parameters.ui.h:50
+#: ../gtk/parameters.ui.h:53
 msgid "This section defines your SIP address when not using a SIP account"
 msgstr ""
 "Эта секция определяет ваш SIP адрес, когда вы не используете учётную запись "
 "SIP"
 
-#: ../gtk/parameters.ui.h:51
+#: ../gtk/parameters.ui.h:54
 msgid "Your display name (eg: John Doe):"
 msgstr "Отображаемое имя (например: Иван Сидоров):"
 
-#: ../gtk/parameters.ui.h:52
+#: ../gtk/parameters.ui.h:55
 msgid "Your username:"
 msgstr "Ваше имя пользователя:"
 
-#: ../gtk/parameters.ui.h:53
+#: ../gtk/parameters.ui.h:56
 msgid "Your resulting SIP address:"
 msgstr "Ваш результирующий SIP адрес:"
 
-#: ../gtk/parameters.ui.h:54
+#: ../gtk/parameters.ui.h:57
 msgid "<b>Default identity</b>"
 msgstr "<b>Идентификатор по умолчанию</b>"
 
-#: ../gtk/parameters.ui.h:55
+#: ../gtk/parameters.ui.h:58
 msgid "Wizard"
 msgstr "Мастер"
 
-#: ../gtk/parameters.ui.h:56
+#: ../gtk/parameters.ui.h:59
 msgid "Add"
 msgstr "Добавить"
 
-#: ../gtk/parameters.ui.h:57
+#: ../gtk/parameters.ui.h:60
 msgid "Edit"
 msgstr "Редактировать"
 
-#: ../gtk/parameters.ui.h:58
+#: ../gtk/parameters.ui.h:61
 msgid "Remove"
 msgstr "Удалить"
 
-#: ../gtk/parameters.ui.h:59
+#: ../gtk/parameters.ui.h:62
 msgid "<b>Proxy accounts</b>"
 msgstr "<b>Учётные записи</b>"
 
-#: ../gtk/parameters.ui.h:60
+#: ../gtk/parameters.ui.h:63
 msgid "Erase all passwords"
 msgstr "Стереть все пароли"
 
-#: ../gtk/parameters.ui.h:61
+#: ../gtk/parameters.ui.h:64
 msgid "<b>Privacy</b>"
 msgstr "<b>Секретность</b>"
 
-#: ../gtk/parameters.ui.h:62
+#: ../gtk/parameters.ui.h:65
 msgid "Manage SIP Accounts"
 msgstr "Управление учётными записями SIP"
 
-#: ../gtk/parameters.ui.h:63 ../gtk/tunnel_config.ui.h:4
+#: ../gtk/parameters.ui.h:66 ../gtk/tunnel_config.ui.h:4
 msgid "Enable"
 msgstr "Разрешить"
 
-#: ../gtk/parameters.ui.h:64 ../gtk/tunnel_config.ui.h:5
+#: ../gtk/parameters.ui.h:67 ../gtk/tunnel_config.ui.h:5
 msgid "Disable"
 msgstr "Выключить"
 
-#: ../gtk/parameters.ui.h:65
+#: ../gtk/parameters.ui.h:68
 msgid "<b>Codecs</b>"
 msgstr "<b>Кодеки</b>"
 
-#: ../gtk/parameters.ui.h:66
+#: ../gtk/parameters.ui.h:69
 msgid "0 stands for \"unlimited\""
 msgstr "0 означает \"безлимитный\""
 
-#: ../gtk/parameters.ui.h:67
+#: ../gtk/parameters.ui.h:70
 msgid "Upload speed limit in Kbit/sec:"
 msgstr "Ограничение исходящего потока КБит/сек:"
 
-#: ../gtk/parameters.ui.h:68
+#: ../gtk/parameters.ui.h:71
 msgid "Download speed limit in Kbit/sec:"
 msgstr "Ограничение скорости входящего потока КБит/сек:"
 
-#: ../gtk/parameters.ui.h:69
+#: ../gtk/parameters.ui.h:72
 msgid "Enable adaptive rate control"
 msgstr "Разрешить адаптивное управление скоростью"
 
-#: ../gtk/parameters.ui.h:70
+#: ../gtk/parameters.ui.h:73
 msgid ""
 "<i>Adaptive rate control is a technique to dynamically guess the available "
 "bandwidth during a call.</i>"
@@ -1463,47 +1480,47 @@ msgstr ""
 "<i>Адаптивное управление скоростью - это технология динамического угадывания "
 "доступной пропускной способности во время звонка.</i>"
 
-#: ../gtk/parameters.ui.h:71
+#: ../gtk/parameters.ui.h:74
 msgid "<b>Bandwidth control</b>"
 msgstr "<b>Пропускная способность</b>"
 
-#: ../gtk/parameters.ui.h:72
+#: ../gtk/parameters.ui.h:75
 msgid "Codecs"
 msgstr "Кодеки"
 
-#: ../gtk/parameters.ui.h:73
+#: ../gtk/parameters.ui.h:76
 msgid "<b>Language</b>"
 msgstr "<b>Язык</b>"
 
-#: ../gtk/parameters.ui.h:74
+#: ../gtk/parameters.ui.h:77
 msgid "Show advanced settings"
 msgstr "Показать дополнительные настройки"
 
-#: ../gtk/parameters.ui.h:75
+#: ../gtk/parameters.ui.h:78
 msgid "<b>Level</b>"
 msgstr "<b>Уровень</b>"
 
-#: ../gtk/parameters.ui.h:76
+#: ../gtk/parameters.ui.h:79
 msgid "User interface"
 msgstr "Пользовательский интерфейс"
 
-#: ../gtk/parameters.ui.h:77 ../gtk/ldap.ui.h:2
+#: ../gtk/parameters.ui.h:80 ../gtk/ldap.ui.h:2
 msgid "Server address:"
 msgstr "Адрес сервера:"
 
-#: ../gtk/parameters.ui.h:78 ../gtk/ldap.ui.h:3
+#: ../gtk/parameters.ui.h:81 ../gtk/ldap.ui.h:3
 msgid "Authentication method:"
 msgstr "Метод аутентификации:"
 
-#: ../gtk/parameters.ui.h:80
+#: ../gtk/parameters.ui.h:83
 msgid "<b>LDAP Account setup</b>"
 msgstr "<b>Установка учётной записи LDAP</b>"
 
-#: ../gtk/parameters.ui.h:81
+#: ../gtk/parameters.ui.h:84
 msgid "LDAP"
 msgstr "LDAP"
 
-#: ../gtk/parameters.ui.h:82
+#: ../gtk/parameters.ui.h:85
 msgid "Done"
 msgstr "Готово"
 
@@ -1734,57 +1751,57 @@ msgstr "Пожалуйста, подождите пока получается 
 msgid "Ready"
 msgstr "Готов"
 
-#: ../coreapi/linphonecore.c:2473
+#: ../coreapi/linphonecore.c:2489
 msgid "Configuring"
 msgstr "Конфигурирование"
 
-#: ../coreapi/linphonecore.c:2638
+#: ../coreapi/linphonecore.c:2654
 msgid "Looking for telephone number destination..."
 msgstr "Поиск назначения для телефонного номера.."
 
-#: ../coreapi/linphonecore.c:2640
+#: ../coreapi/linphonecore.c:2656
 msgid "Could not resolve this number."
 msgstr "Не получилось принять решение по этому номеру."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2926
+#: ../coreapi/linphonecore.c:2942
 msgid "Contacting"
 msgstr "Соединение"
 
-#: ../coreapi/linphonecore.c:2931
+#: ../coreapi/linphonecore.c:2947
 msgid "Could not call"
 msgstr "Невозможно позвонить"
 
-#: ../coreapi/linphonecore.c:3081
+#: ../coreapi/linphonecore.c:3097
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr ""
 "К сожалению, мы достигли максимального количества одновременных звонков"
 
-#: ../coreapi/linphonecore.c:3240
+#: ../coreapi/linphonecore.c:3256
 msgid "is contacting you"
 msgstr "контактирует с вами"
 
-#: ../coreapi/linphonecore.c:3241
+#: ../coreapi/linphonecore.c:3257
 msgid " and asked autoanswer."
 msgstr "и спросил автоматический ответ."
 
-#: ../coreapi/linphonecore.c:3359
+#: ../coreapi/linphonecore.c:3375
 msgid "Modifying call parameters..."
 msgstr "Изменение параметров звонка..."
 
-#: ../coreapi/linphonecore.c:3707
+#: ../coreapi/linphonecore.c:3723
 msgid "Connected."
 msgstr "Соединён."
 
-#: ../coreapi/linphonecore.c:3732
+#: ../coreapi/linphonecore.c:3748
 msgid "Call aborted"
 msgstr "Звонок отменён"
 
-#: ../coreapi/linphonecore.c:3922
+#: ../coreapi/linphonecore.c:3938
 msgid "Could not pause the call"
 msgstr "Невозможно приостановить звонок"
 
-#: ../coreapi/linphonecore.c:3926
+#: ../coreapi/linphonecore.c:3941
 msgid "Pausing the current call..."
 msgstr "Приостановка текущего звонка..."
 
@@ -1846,9 +1863,9 @@ msgstr "Отдых"
 
 #: ../coreapi/friend.c:68
 msgid "Unknown status"
-msgstr ""
+msgstr "Неизвестный статус"
 
-#: ../coreapi/proxy.c:319
+#: ../coreapi/proxy.c:327
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
@@ -1856,7 +1873,7 @@ msgstr ""
 "Введённый SIP-адрес прокси является недействительным, он должен начинаться с "
 "\"sip:имя_хоста\""
 
-#: ../coreapi/proxy.c:325
+#: ../coreapi/proxy.c:333
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
@@ -1865,7 +1882,7 @@ msgstr ""
 "Должно выглядеть как sip:имя_пользователя@домен_прокси, как например, sip:"
 "alice@example.net"
 
-#: ../coreapi/proxy.c:1377
+#: ../coreapi/proxy.c:1390
 #, c-format
 msgid "Could not login as %s"
 msgstr "Невозможно зайти как: %s"
@@ -1979,12 +1996,12 @@ msgstr "Регистрация на %s не удалась: %s"
 msgid "Service unavailable, retrying"
 msgstr "Сервис недоступен, повтор"
 
-#: ../coreapi/linphonecall.c:174
+#: ../coreapi/linphonecall.c:175
 #, c-format
 msgid "Authentication token is %s"
 msgstr "Маркер проверки подлинности: %s"
 
-#: ../coreapi/linphonecall.c:3020
+#: ../coreapi/linphonecall.c:3041
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
@@ -1994,19 +2011,19 @@ msgstr[2] "У вас %i пропущенных вызов."
 
 #: ../coreapi/call_log.c:209
 msgid "aborted"
-msgstr ""
+msgstr "прервано"
 
 #: ../coreapi/call_log.c:212
 msgid "completed"
-msgstr ""
+msgstr "завершено"
 
 #: ../coreapi/call_log.c:215
 msgid "missed"
-msgstr ""
+msgstr "пропущено"
 
 #: ../coreapi/call_log.c:218
 msgid "unknown"
-msgstr ""
+msgstr "неизвестно"
 
 #: ../coreapi/call_log.c:220
 #, c-format
@@ -2017,12 +2034,17 @@ msgid ""
 "Status: %s\n"
 "Duration: %i mn %i sec\n"
 msgstr ""
+"%s в %s\n"
+"От: %s\n"
+"До: %s\n"
+"Статус: %s\n"
+"Продолжительность: %i мин %i сек\n"
 
 #: ../coreapi/call_log.c:221
 msgid "Outgoing call"
-msgstr ""
+msgstr "Исходящий вызов"
 
 #: ../gtk/videowindow.c:66
 #, c-format
 msgid "Cannot play %s."
-msgstr ""
+msgstr "Невозможно воспроизвести %s."
diff --git a/po/sr.po b/po/sr.po
index 84541289d..ff2a80f96 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-03 13:39+0100\n"
-"PO-Revision-Date: 2014-12-04 09:51+0000\n"
-"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
+"POT-Creation-Date: 2015-01-06 12:28+0100\n"
+"PO-Revision-Date: 2015-01-06 11:29+0000\n"
+"Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/sr/)\n"
 "Language: sr\n"
@@ -98,31 +98,31 @@ msgstr "Не могу да пронађем датотеку сличице: %s"
 msgid "Invalid sip contact !"
 msgstr "Неисправан сип контакт !"
 
-#: ../gtk/main.c:107
+#: ../gtk/main.c:109
 msgid "log to stdout some debug information while running."
 msgstr "бележи на стандардни излаз неке податке прочишћавања док ради."
 
-#: ../gtk/main.c:114
+#: ../gtk/main.c:116
 msgid "path to a file to write logs into."
 msgstr "путања до датотеке за уписивање дневника."
 
-#: ../gtk/main.c:121
+#: ../gtk/main.c:123
 msgid "Start linphone with video disabled."
 msgstr "Покреће линфон са искљученим видеом."
 
-#: ../gtk/main.c:128
+#: ../gtk/main.c:130
 msgid "Start only in the system tray, do not show the main interface."
 msgstr "Покреће се само у системској фиоци, не приказује главно сучеље."
 
-#: ../gtk/main.c:135
+#: ../gtk/main.c:137
 msgid "address to call right now"
 msgstr "адреса за позивање управо сада"
 
-#: ../gtk/main.c:142
+#: ../gtk/main.c:144
 msgid "if set automatically answer incoming calls"
 msgstr "ако је подешено сам ће се јављати на долазне позиве"
 
-#: ../gtk/main.c:149
+#: ../gtk/main.c:151
 msgid ""
 "Specifiy a working directory (should be the base of the installation, eg: c:"
 "\\Program Files\\Linphone)"
@@ -130,15 +130,19 @@ msgstr ""
 "Наводи радни директоријум (треба да буде основа инсталације, нпр: „c:"
 "\\Program Files\\Linphone“)"
 
-#: ../gtk/main.c:156
+#: ../gtk/main.c:158
 msgid "Configuration file"
 msgstr "Датотека подешавања"
 
-#: ../gtk/main.c:163
+#: ../gtk/main.c:165
 msgid "Run the audio assistant"
 msgstr "Покреће помоћника звука"
 
-#: ../gtk/main.c:1085
+#: ../gtk/main.c:172
+msgid "Run self test and exit 0 if succeed"
+msgstr ""
+
+#: ../gtk/main.c:1083
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
@@ -152,7 +156,7 @@ msgstr ""
 "Ако одговорите са не, ова особа ће привремено бити стављена на списак "
 "забрана."
 
-#: ../gtk/main.c:1162
+#: ../gtk/main.c:1160
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
@@ -161,59 +165,59 @@ msgstr ""
 "Унесите вашу лозинку за корисничко име <i>%s</i>\n"
 " на подручју <i>%s</i>:"
 
-#: ../gtk/main.c:1283
+#: ../gtk/main.c:1281
 msgid "Call error"
 msgstr "Грешка позива"
 
-#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3751
+#: ../gtk/main.c:1284 ../coreapi/linphonecore.c:3767
 msgid "Call ended"
 msgstr "Позив је завршен"
 
-#: ../gtk/main.c:1289 ../coreapi/call_log.c:221
+#: ../gtk/main.c:1287 ../coreapi/call_log.c:221
 msgid "Incoming call"
 msgstr "Долазни позив"
 
-#: ../gtk/main.c:1291 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
+#: ../gtk/main.c:1289 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
 msgid "Answer"
 msgstr "Јави се"
 
-#: ../gtk/main.c:1293 ../gtk/main.ui.h:6
+#: ../gtk/main.c:1291 ../gtk/main.ui.h:6
 msgid "Decline"
 msgstr "Одбиј"
 
-#: ../gtk/main.c:1299
+#: ../gtk/main.c:1297
 msgid "Call paused"
 msgstr "Позив је заустављен"
 
-#: ../gtk/main.c:1299
+#: ../gtk/main.c:1297
 #, c-format
 msgid "<b>by %s</b>"
 msgstr "<b>од %s</b>"
 
-#: ../gtk/main.c:1366
+#: ../gtk/main.c:1367
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr "%s предлаже да започнете видео. Да ли прихватате ?"
 
-#: ../gtk/main.c:1528
+#: ../gtk/main.c:1529
 msgid "Website link"
 msgstr "Веза веб сајта"
 
-#: ../gtk/main.c:1577
+#: ../gtk/main.c:1578
 msgid "Linphone - a video internet phone"
 msgstr "Линфон — интернет телефон са снимком"
 
-#: ../gtk/main.c:1669
+#: ../gtk/main.c:1670
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (основно)"
 
-#: ../gtk/main.c:2006 ../coreapi/callbacks.c:986
+#: ../gtk/main.c:2002 ../coreapi/callbacks.c:986
 #, c-format
 msgid "We are transferred to %s"
 msgstr "Преселили смо се на %s"
 
-#: ../gtk/main.c:2016
+#: ../gtk/main.c:2012
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
@@ -221,7 +225,7 @@ msgstr ""
 "Ниједна звучна картица није откривена на овом рачунару.\n"
 "Нећете бити у могућности да шаљете или да примате звучне позиве."
 
-#: ../gtk/main.c:2157
+#: ../gtk/main.c:2156
 msgid "A free SIP video-phone"
 msgstr "Слободан СИП телефон са снимком"
 
@@ -290,7 +294,7 @@ msgstr "Параметри"
 msgid "Enabled"
 msgstr "Укључено"
 
-#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763
+#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763 ../gtk/parameters.ui.h:20
 msgid "Disabled"
 msgstr "Искључено"
 
@@ -457,7 +461,7 @@ msgstr "Желим да наведем удаљену путању подеша
 msgid "Enter your linphone.org username"
 msgstr "Унесите ваше корисничко име линфон.орг-а"
 
-#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:79 ../gtk/ldap.ui.h:4
+#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:82 ../gtk/ldap.ui.h:4
 msgid "Username:"
 msgstr "Корисничко име:"
 
@@ -649,7 +653,7 @@ msgstr "%ix%i @ %f к/с"
 msgid "%.3f seconds"
 msgstr "%.3f секунде"
 
-#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12 ../gtk/videowindow.c:232
+#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12 ../gtk/videowindow.c:235
 msgid "Hang up"
 msgstr "Прекини"
 
@@ -1249,210 +1253,218 @@ msgid "<b>Transport</b>"
 msgstr "<b>Пренос</b>"
 
 #: ../gtk/parameters.ui.h:19
-msgid "Media encryption type"
-msgstr "Врста шифровања медија"
-
-#: ../gtk/parameters.ui.h:20
-msgid "Video RTP/UDP:"
-msgstr "РТП/УДП снимка:"
-
-#: ../gtk/parameters.ui.h:21
-msgid "Audio RTP/UDP:"
-msgstr "РТП/УДП звука:"
-
-#: ../gtk/parameters.ui.h:22
-msgid "Fixed"
-msgstr "Неизмењиво"
-
-#: ../gtk/parameters.ui.h:23
-msgid "Media encryption is mandatory"
-msgstr "Шифровање медија је обавезно"
-
-#: ../gtk/parameters.ui.h:24
-msgid "Tunnel"
-msgstr "Тунел"
-
-#: ../gtk/parameters.ui.h:25
-msgid "DSCP fields"
-msgstr "ДСЦП поља"
-
-#: ../gtk/parameters.ui.h:26
-msgid "SIP/TCP port"
-msgstr "СИП/ТЦП прикључник"
-
-#: ../gtk/parameters.ui.h:27
 msgid "SIP/UDP port"
 msgstr "СИП/УДП прикључник"
 
+#: ../gtk/parameters.ui.h:21
+msgid "Random"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:22
+msgid "SIP/TCP port"
+msgstr "СИП/ТЦП прикључник"
+
+#: ../gtk/parameters.ui.h:23
+msgid "Audio RTP/UDP:"
+msgstr "РТП/УДП звука:"
+
+#: ../gtk/parameters.ui.h:24
+msgid "Fixed"
+msgstr "Неизмењиво"
+
+#: ../gtk/parameters.ui.h:25
+msgid "Video RTP/UDP:"
+msgstr "РТП/УДП снимка:"
+
+#: ../gtk/parameters.ui.h:26
+msgid "Media encryption type"
+msgstr "Врста шифровања медија"
+
+#: ../gtk/parameters.ui.h:27
+msgid "Media encryption is mandatory"
+msgstr "Шифровање медија је обавезно"
+
 #: ../gtk/parameters.ui.h:28
+msgid "Tunnel"
+msgstr "Тунел"
+
+#: ../gtk/parameters.ui.h:29
+msgid "DSCP fields"
+msgstr "ДСЦП поља"
+
+#: ../gtk/parameters.ui.h:30
 msgid "<b>Network protocol and ports</b>"
 msgstr "<b>Мрежни протокол и прикључници</b>"
 
-#: ../gtk/parameters.ui.h:29
+#: ../gtk/parameters.ui.h:31
 msgid "Direct connection to the Internet"
 msgstr "Непосредна веза на Интернет"
 
-#: ../gtk/parameters.ui.h:30
+#: ../gtk/parameters.ui.h:32
 msgid "Behind NAT / Firewall (specify gateway IP )"
 msgstr "Иза НАТ-а / мрежне баријере (наведите ИП мрежног пролаза)"
 
-#: ../gtk/parameters.ui.h:31
+#: ../gtk/parameters.ui.h:33
 msgid "Behind NAT / Firewall (use STUN to resolve)"
 msgstr "Иза НАТ-а / мрежне баријере (користите СТУН за решавање)"
 
-#: ../gtk/parameters.ui.h:32
+#: ../gtk/parameters.ui.h:34
 msgid "Behind NAT / Firewall (use ICE)"
 msgstr "Иза НАТ-а / мрежне баријере (користите ИЦЕ)"
 
-#: ../gtk/parameters.ui.h:33
+#: ../gtk/parameters.ui.h:35
 msgid "Behind NAT / Firewall (use uPnP)"
 msgstr "Иза НАТ-а / мрежне баријере (користите уПнП)"
 
-#: ../gtk/parameters.ui.h:34
+#: ../gtk/parameters.ui.h:36
 msgid "Public IP address:"
 msgstr "Јавна ИП адреса:"
 
-#: ../gtk/parameters.ui.h:35
+#: ../gtk/parameters.ui.h:37
 msgid "Stun server:"
 msgstr "Стун сервер:"
 
-#: ../gtk/parameters.ui.h:36
+#: ../gtk/parameters.ui.h:38
 msgid "<b>NAT and Firewall</b>"
 msgstr "<b>НАТ и мрежна баријера</b>"
 
-#: ../gtk/parameters.ui.h:37
+#: ../gtk/parameters.ui.h:39
 msgid "Network settings"
 msgstr "Мрежа"
 
-#: ../gtk/parameters.ui.h:38
+#: ../gtk/parameters.ui.h:40
 msgid "Ring sound:"
 msgstr "Звук звона:"
 
-#: ../gtk/parameters.ui.h:39
+#: ../gtk/parameters.ui.h:41
 msgid "ALSA special device (optional):"
 msgstr "АЛСА-ин посебни уређај (изборно):"
 
-#: ../gtk/parameters.ui.h:40
+#: ../gtk/parameters.ui.h:42
 msgid "Capture device:"
 msgstr "Уређај за снимање:"
 
-#: ../gtk/parameters.ui.h:41
+#: ../gtk/parameters.ui.h:43
 msgid "Ring device:"
 msgstr "Уређај за звоно:"
 
-#: ../gtk/parameters.ui.h:42
+#: ../gtk/parameters.ui.h:44
 msgid "Playback device:"
 msgstr "Уређај за пуштање:"
 
-#: ../gtk/parameters.ui.h:43
+#: ../gtk/parameters.ui.h:45
 msgid "Enable echo cancellation"
 msgstr "Укључи поништавање одјека"
 
-#: ../gtk/parameters.ui.h:44
+#: ../gtk/parameters.ui.h:46
 msgid "<b>Audio</b>"
 msgstr "<b>Звук</b>"
 
-#: ../gtk/parameters.ui.h:45
+#: ../gtk/parameters.ui.h:47
 msgid "Video input device:"
 msgstr "Улазни уређај снимка:"
 
-#: ../gtk/parameters.ui.h:46
+#: ../gtk/parameters.ui.h:48
 msgid "Prefered video resolution:"
 msgstr "Жељена резолуција снимка:"
 
-#: ../gtk/parameters.ui.h:47
+#: ../gtk/parameters.ui.h:49
 msgid "Video output method:"
 msgstr "Начин излаза снимка:"
 
-#: ../gtk/parameters.ui.h:48
+#: ../gtk/parameters.ui.h:50
+msgid "Show camera preview"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:51
 msgid "<b>Video</b>"
 msgstr "<b>Снимак</b>"
 
-#: ../gtk/parameters.ui.h:49
+#: ../gtk/parameters.ui.h:52
 msgid "Multimedia settings"
 msgstr "Мултимедија"
 
-#: ../gtk/parameters.ui.h:50
+#: ../gtk/parameters.ui.h:53
 msgid "This section defines your SIP address when not using a SIP account"
 msgstr "Овај одељак одређује вашу СИП адресу када не користите СИП налог"
 
-#: ../gtk/parameters.ui.h:51
+#: ../gtk/parameters.ui.h:54
 msgid "Your display name (eg: John Doe):"
 msgstr "Ваше приказано име (нпр: Пера Перић):"
 
-#: ../gtk/parameters.ui.h:52
+#: ../gtk/parameters.ui.h:55
 msgid "Your username:"
 msgstr "Ваше корисничко име:"
 
-#: ../gtk/parameters.ui.h:53
+#: ../gtk/parameters.ui.h:56
 msgid "Your resulting SIP address:"
 msgstr "Ваша резултирајућа СИП адреса:"
 
-#: ../gtk/parameters.ui.h:54
+#: ../gtk/parameters.ui.h:57
 msgid "<b>Default identity</b>"
 msgstr "<b>Основни идентитет</b>"
 
-#: ../gtk/parameters.ui.h:55
+#: ../gtk/parameters.ui.h:58
 msgid "Wizard"
 msgstr "Чаробњак"
 
-#: ../gtk/parameters.ui.h:56
+#: ../gtk/parameters.ui.h:59
 msgid "Add"
 msgstr "Додај"
 
-#: ../gtk/parameters.ui.h:57
+#: ../gtk/parameters.ui.h:60
 msgid "Edit"
 msgstr "Уреди"
 
-#: ../gtk/parameters.ui.h:58
+#: ../gtk/parameters.ui.h:61
 msgid "Remove"
 msgstr "Уклони"
 
-#: ../gtk/parameters.ui.h:59
+#: ../gtk/parameters.ui.h:62
 msgid "<b>Proxy accounts</b>"
 msgstr "<b>Посреднички налози</b>"
 
-#: ../gtk/parameters.ui.h:60
+#: ../gtk/parameters.ui.h:63
 msgid "Erase all passwords"
 msgstr "Обриши све лозинке"
 
-#: ../gtk/parameters.ui.h:61
+#: ../gtk/parameters.ui.h:64
 msgid "<b>Privacy</b>"
 msgstr "<b>Приватност</b>"
 
-#: ../gtk/parameters.ui.h:62
+#: ../gtk/parameters.ui.h:65
 msgid "Manage SIP Accounts"
 msgstr "СИП налози"
 
-#: ../gtk/parameters.ui.h:63 ../gtk/tunnel_config.ui.h:4
+#: ../gtk/parameters.ui.h:66 ../gtk/tunnel_config.ui.h:4
 msgid "Enable"
 msgstr "Укључи"
 
-#: ../gtk/parameters.ui.h:64 ../gtk/tunnel_config.ui.h:5
+#: ../gtk/parameters.ui.h:67 ../gtk/tunnel_config.ui.h:5
 msgid "Disable"
 msgstr "Искључи"
 
-#: ../gtk/parameters.ui.h:65
+#: ../gtk/parameters.ui.h:68
 msgid "<b>Codecs</b>"
 msgstr "<b>Кодеци</b>"
 
-#: ../gtk/parameters.ui.h:66
+#: ../gtk/parameters.ui.h:69
 msgid "0 stands for \"unlimited\""
 msgstr "0 значи „неограничено“"
 
-#: ../gtk/parameters.ui.h:67
+#: ../gtk/parameters.ui.h:70
 msgid "Upload speed limit in Kbit/sec:"
 msgstr "Ограничи брзину слања на (Kb/s):"
 
-#: ../gtk/parameters.ui.h:68
+#: ../gtk/parameters.ui.h:71
 msgid "Download speed limit in Kbit/sec:"
 msgstr "Ограничи брзину преузимања на (Kb/s):"
 
-#: ../gtk/parameters.ui.h:69
+#: ../gtk/parameters.ui.h:72
 msgid "Enable adaptive rate control"
 msgstr "Укључи прилагодљиво управљање протоком"
 
-#: ../gtk/parameters.ui.h:70
+#: ../gtk/parameters.ui.h:73
 msgid ""
 "<i>Adaptive rate control is a technique to dynamically guess the available "
 "bandwidth during a call.</i>"
@@ -1460,47 +1472,47 @@ msgstr ""
 "<i>Прилагодљиво управљање протоком је техника за променљиво погађање "
 "доступног пропусног опсега за време позива.</i>"
 
-#: ../gtk/parameters.ui.h:71
+#: ../gtk/parameters.ui.h:74
 msgid "<b>Bandwidth control</b>"
 msgstr "<b>Управљање пропусним опсегом</b>"
 
-#: ../gtk/parameters.ui.h:72
+#: ../gtk/parameters.ui.h:75
 msgid "Codecs"
 msgstr "Kодеци"
 
-#: ../gtk/parameters.ui.h:73
+#: ../gtk/parameters.ui.h:76
 msgid "<b>Language</b>"
 msgstr "<b>Језик</b>"
 
-#: ../gtk/parameters.ui.h:74
+#: ../gtk/parameters.ui.h:77
 msgid "Show advanced settings"
 msgstr "Прикажи напредна подешавања"
 
-#: ../gtk/parameters.ui.h:75
+#: ../gtk/parameters.ui.h:78
 msgid "<b>Level</b>"
 msgstr "<b>Ниво</b>"
 
-#: ../gtk/parameters.ui.h:76
+#: ../gtk/parameters.ui.h:79
 msgid "User interface"
 msgstr "Корисничко сучеље"
 
-#: ../gtk/parameters.ui.h:77 ../gtk/ldap.ui.h:2
+#: ../gtk/parameters.ui.h:80 ../gtk/ldap.ui.h:2
 msgid "Server address:"
 msgstr "Адреса сервера:"
 
-#: ../gtk/parameters.ui.h:78 ../gtk/ldap.ui.h:3
+#: ../gtk/parameters.ui.h:81 ../gtk/ldap.ui.h:3
 msgid "Authentication method:"
 msgstr "Начин потврђивања идентитета:"
 
-#: ../gtk/parameters.ui.h:80
+#: ../gtk/parameters.ui.h:83
 msgid "<b>LDAP Account setup</b>"
 msgstr "<b>Подешавања ЛДАП налога</b>"
 
-#: ../gtk/parameters.ui.h:81
+#: ../gtk/parameters.ui.h:84
 msgid "LDAP"
 msgstr "ЛДАП"
 
-#: ../gtk/parameters.ui.h:82
+#: ../gtk/parameters.ui.h:85
 msgid "Done"
 msgstr "Готово"
 
@@ -1731,56 +1743,56 @@ msgstr "Сачекајте док довучем подешавања са се
 msgid "Ready"
 msgstr "Спреман"
 
-#: ../coreapi/linphonecore.c:2473
+#: ../coreapi/linphonecore.c:2489
 msgid "Configuring"
 msgstr "Подешавам"
 
-#: ../coreapi/linphonecore.c:2638
+#: ../coreapi/linphonecore.c:2654
 msgid "Looking for telephone number destination..."
 msgstr "Тражим одредиште телефонског броја..."
 
-#: ../coreapi/linphonecore.c:2640
+#: ../coreapi/linphonecore.c:2656
 msgid "Could not resolve this number."
 msgstr "Не могу да решим овај број."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2926
+#: ../coreapi/linphonecore.c:2942
 msgid "Contacting"
 msgstr "Ступам у везу"
 
-#: ../coreapi/linphonecore.c:2931
+#: ../coreapi/linphonecore.c:2947
 msgid "Could not call"
 msgstr "Не могу да позовем"
 
-#: ../coreapi/linphonecore.c:3081
+#: ../coreapi/linphonecore.c:3097
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "Извините, достигли смо највећи број истовремених позива"
 
-#: ../coreapi/linphonecore.c:3240
+#: ../coreapi/linphonecore.c:3256
 msgid "is contacting you"
 msgstr "вам се обраћа"
 
-#: ../coreapi/linphonecore.c:3241
+#: ../coreapi/linphonecore.c:3257
 msgid " and asked autoanswer."
 msgstr " и затражени само-одговор."
 
-#: ../coreapi/linphonecore.c:3359
+#: ../coreapi/linphonecore.c:3375
 msgid "Modifying call parameters..."
 msgstr "Мењам параметре позива..."
 
-#: ../coreapi/linphonecore.c:3707
+#: ../coreapi/linphonecore.c:3723
 msgid "Connected."
 msgstr "Повезан сам."
 
-#: ../coreapi/linphonecore.c:3732
+#: ../coreapi/linphonecore.c:3748
 msgid "Call aborted"
 msgstr "Позив је прекинут"
 
-#: ../coreapi/linphonecore.c:3922
+#: ../coreapi/linphonecore.c:3938
 msgid "Could not pause the call"
 msgstr "Не могу да зауставим позив"
 
-#: ../coreapi/linphonecore.c:3926
+#: ../coreapi/linphonecore.c:3941
 msgid "Pausing the current call..."
 msgstr "Заустављам тренутни позив..."
 
@@ -1844,7 +1856,7 @@ msgstr "На одмору"
 msgid "Unknown status"
 msgstr "Непознато стање"
 
-#: ../coreapi/proxy.c:319
+#: ../coreapi/proxy.c:327
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
@@ -1852,7 +1864,7 @@ msgstr ""
 "Адреса сип посредника коју сте унели је неисправна, мора почети на „sip:“ за "
 "којим следи назив домаћина."
 
-#: ../coreapi/proxy.c:325
+#: ../coreapi/proxy.c:333
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
@@ -1861,7 +1873,7 @@ msgstr ""
 "Треба да изгледа као „sip:корисник@домен-посредника, као што је „sip:"
 "alice@example.net“"
 
-#: ../coreapi/proxy.c:1377
+#: ../coreapi/proxy.c:1390
 #, c-format
 msgid "Could not login as %s"
 msgstr "Не могу да се пријавим као %s"
@@ -1975,12 +1987,12 @@ msgstr "Уписивање на „%s“ није успело: %s"
 msgid "Service unavailable, retrying"
 msgstr "Услуга није доступна, поново покушавам"
 
-#: ../coreapi/linphonecall.c:174
+#: ../coreapi/linphonecall.c:175
 #, c-format
 msgid "Authentication token is %s"
 msgstr "Симбол потврђивања идентитета је „%s“"
 
-#: ../coreapi/linphonecall.c:3020
+#: ../coreapi/linphonecall.c:3041
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
diff --git a/po/sv.po b/po/sv.po
index 631dde639..0127ae3d8 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-03 13:39+0100\n"
-"PO-Revision-Date: 2014-12-04 09:51+0000\n"
+"POT-Creation-Date: 2015-01-06 12:28+0100\n"
+"PO-Revision-Date: 2015-01-06 11:29+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/sv/)\n"
@@ -92,31 +92,31 @@ msgstr "Kunde inte hitta pixmap filen: %s"
 msgid "Invalid sip contact !"
 msgstr "ogiltig SIP kontakt!"
 
-#: ../gtk/main.c:107
+#: ../gtk/main.c:109
 msgid "log to stdout some debug information while running."
 msgstr "skriv loggning information under körning"
 
-#: ../gtk/main.c:114
+#: ../gtk/main.c:116
 msgid "path to a file to write logs into."
 msgstr ""
 
-#: ../gtk/main.c:121
+#: ../gtk/main.c:123
 msgid "Start linphone with video disabled."
 msgstr ""
 
-#: ../gtk/main.c:128
+#: ../gtk/main.c:130
 msgid "Start only in the system tray, do not show the main interface."
 msgstr "Starta ikonifierat, visa inte huvudfönstret"
 
-#: ../gtk/main.c:135
+#: ../gtk/main.c:137
 msgid "address to call right now"
 msgstr "Samtalsmottagare"
 
-#: ../gtk/main.c:142
+#: ../gtk/main.c:144
 msgid "if set automatically answer incoming calls"
 msgstr "Om på, besvara automatisk alla inkommande samtal"
 
-#: ../gtk/main.c:149
+#: ../gtk/main.c:151
 msgid ""
 "Specifiy a working directory (should be the base of the installation, eg: c:"
 "\\Program Files\\Linphone)"
@@ -124,15 +124,19 @@ msgstr ""
 "Välj en arbetskatalog som ska vara basen för installationen, såsom C:"
 "\\Program\\Linphone"
 
-#: ../gtk/main.c:156
+#: ../gtk/main.c:158
 msgid "Configuration file"
 msgstr ""
 
-#: ../gtk/main.c:163
+#: ../gtk/main.c:165
 msgid "Run the audio assistant"
 msgstr ""
 
-#: ../gtk/main.c:1085
+#: ../gtk/main.c:172
+msgid "Run self test and exit 0 if succeed"
+msgstr ""
+
+#: ../gtk/main.c:1083
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
@@ -145,72 +149,72 @@ msgstr ""
 "henne till din kontaktlista?\n"
 "Om du svarar nej, personen kommer att vara bannlyst."
 
-#: ../gtk/main.c:1162
+#: ../gtk/main.c:1160
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
 msgstr ""
 
-#: ../gtk/main.c:1283
+#: ../gtk/main.c:1281
 msgid "Call error"
 msgstr ""
 
-#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3751
+#: ../gtk/main.c:1284 ../coreapi/linphonecore.c:3767
 msgid "Call ended"
 msgstr "Samtalet slut"
 
-#: ../gtk/main.c:1289 ../coreapi/call_log.c:221
+#: ../gtk/main.c:1287 ../coreapi/call_log.c:221
 msgid "Incoming call"
 msgstr "Inkommande samtal"
 
-#: ../gtk/main.c:1291 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
+#: ../gtk/main.c:1289 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
 msgid "Answer"
 msgstr ""
 
-#: ../gtk/main.c:1293 ../gtk/main.ui.h:6
+#: ../gtk/main.c:1291 ../gtk/main.ui.h:6
 msgid "Decline"
 msgstr "Avböj"
 
-#: ../gtk/main.c:1299
+#: ../gtk/main.c:1297
 msgid "Call paused"
 msgstr ""
 
-#: ../gtk/main.c:1299
+#: ../gtk/main.c:1297
 #, c-format
 msgid "<b>by %s</b>"
 msgstr ""
 
-#: ../gtk/main.c:1366
+#: ../gtk/main.c:1367
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr ""
 
-#: ../gtk/main.c:1528
+#: ../gtk/main.c:1529
 msgid "Website link"
 msgstr "Webbsajt"
 
-#: ../gtk/main.c:1577
+#: ../gtk/main.c:1578
 msgid "Linphone - a video internet phone"
 msgstr "Linphone - en video Internet telefon"
 
-#: ../gtk/main.c:1669
+#: ../gtk/main.c:1670
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (Default)"
 
-#: ../gtk/main.c:2006 ../coreapi/callbacks.c:986
+#: ../gtk/main.c:2002 ../coreapi/callbacks.c:986
 #, c-format
 msgid "We are transferred to %s"
 msgstr ""
 
-#: ../gtk/main.c:2016
+#: ../gtk/main.c:2012
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
 msgstr ""
 
-#: ../gtk/main.c:2157
+#: ../gtk/main.c:2156
 msgid "A free SIP video-phone"
 msgstr "En gratis SIP video-telefon"
 
@@ -279,7 +283,7 @@ msgstr "Parametrar"
 msgid "Enabled"
 msgstr "På"
 
-#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763
+#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763 ../gtk/parameters.ui.h:20
 msgid "Disabled"
 msgstr "Av"
 
@@ -442,7 +446,7 @@ msgstr ""
 msgid "Enter your linphone.org username"
 msgstr ""
 
-#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:79 ../gtk/ldap.ui.h:4
+#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:82 ../gtk/ldap.ui.h:4
 msgid "Username:"
 msgstr "Användarnamn:"
 
@@ -626,7 +630,7 @@ msgstr ""
 msgid "%.3f seconds"
 msgstr ""
 
-#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12 ../gtk/videowindow.c:232
+#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12 ../gtk/videowindow.c:235
 msgid "Hang up"
 msgstr ""
 
@@ -1208,257 +1212,265 @@ msgid "<b>Transport</b>"
 msgstr "<b>Transport</b>"
 
 #: ../gtk/parameters.ui.h:19
-msgid "Media encryption type"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:20
-msgid "Video RTP/UDP:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:21
-msgid "Audio RTP/UDP:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:22
-msgid "Fixed"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:23
-msgid "Media encryption is mandatory"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:24
-msgid "Tunnel"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:25
-msgid "DSCP fields"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:26
-msgid "SIP/TCP port"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:27
 msgid "SIP/UDP port"
 msgstr ""
 
+#: ../gtk/parameters.ui.h:21
+msgid "Random"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:22
+msgid "SIP/TCP port"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:23
+msgid "Audio RTP/UDP:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:24
+msgid "Fixed"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:25
+msgid "Video RTP/UDP:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:26
+msgid "Media encryption type"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:27
+msgid "Media encryption is mandatory"
+msgstr ""
+
 #: ../gtk/parameters.ui.h:28
-msgid "<b>Network protocol and ports</b>"
+msgid "Tunnel"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:29
-msgid "Direct connection to the Internet"
-msgstr "Direkt förbindelse till Internet"
+msgid "DSCP fields"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:30
-msgid "Behind NAT / Firewall (specify gateway IP )"
+msgid "<b>Network protocol and ports</b>"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:31
-msgid "Behind NAT / Firewall (use STUN to resolve)"
-msgstr "Bakom en NAT / brandvägg (använd STUN för att avgöra adressen)"
+msgid "Direct connection to the Internet"
+msgstr "Direkt förbindelse till Internet"
 
 #: ../gtk/parameters.ui.h:32
-msgid "Behind NAT / Firewall (use ICE)"
+msgid "Behind NAT / Firewall (specify gateway IP )"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:33
+msgid "Behind NAT / Firewall (use STUN to resolve)"
+msgstr "Bakom en NAT / brandvägg (använd STUN för att avgöra adressen)"
+
+#: ../gtk/parameters.ui.h:34
+msgid "Behind NAT / Firewall (use ICE)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:35
 msgid "Behind NAT / Firewall (use uPnP)"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:34
+#: ../gtk/parameters.ui.h:36
 msgid "Public IP address:"
 msgstr "Publik IP adress:"
 
-#: ../gtk/parameters.ui.h:35
+#: ../gtk/parameters.ui.h:37
 msgid "Stun server:"
 msgstr "STUN server:"
 
-#: ../gtk/parameters.ui.h:36
+#: ../gtk/parameters.ui.h:38
 msgid "<b>NAT and Firewall</b>"
 msgstr "<b>NAT och Brandvägg</b>"
 
-#: ../gtk/parameters.ui.h:37
+#: ../gtk/parameters.ui.h:39
 msgid "Network settings"
 msgstr "Nätverksinställningar"
 
-#: ../gtk/parameters.ui.h:38
+#: ../gtk/parameters.ui.h:40
 msgid "Ring sound:"
 msgstr "Ring signal:"
 
-#: ../gtk/parameters.ui.h:39
+#: ../gtk/parameters.ui.h:41
 msgid "ALSA special device (optional):"
 msgstr "ALSA speciell enhet (tillval):"
 
-#: ../gtk/parameters.ui.h:40
+#: ../gtk/parameters.ui.h:42
 msgid "Capture device:"
 msgstr "Mikrofon enhet:"
 
-#: ../gtk/parameters.ui.h:41
+#: ../gtk/parameters.ui.h:43
 msgid "Ring device:"
 msgstr "Ringning enhet:"
 
-#: ../gtk/parameters.ui.h:42
+#: ../gtk/parameters.ui.h:44
 msgid "Playback device:"
 msgstr "Uppspelningsenhet:"
 
-#: ../gtk/parameters.ui.h:43
+#: ../gtk/parameters.ui.h:45
 msgid "Enable echo cancellation"
 msgstr "Tillåta ekokancellering"
 
-#: ../gtk/parameters.ui.h:44
+#: ../gtk/parameters.ui.h:46
 msgid "<b>Audio</b>"
 msgstr "<b>Audio</b>"
 
-#: ../gtk/parameters.ui.h:45
+#: ../gtk/parameters.ui.h:47
 msgid "Video input device:"
 msgstr "Video ingångsenhet:"
 
-#: ../gtk/parameters.ui.h:46
+#: ../gtk/parameters.ui.h:48
 msgid "Prefered video resolution:"
 msgstr "Video upplösning:"
 
-#: ../gtk/parameters.ui.h:47
+#: ../gtk/parameters.ui.h:49
 msgid "Video output method:"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:48
+#: ../gtk/parameters.ui.h:50
+msgid "Show camera preview"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:51
 msgid "<b>Video</b>"
 msgstr "<b>Video</b>"
 
-#: ../gtk/parameters.ui.h:49
+#: ../gtk/parameters.ui.h:52
 msgid "Multimedia settings"
 msgstr "Multimedia inställningar"
 
-#: ../gtk/parameters.ui.h:50
+#: ../gtk/parameters.ui.h:53
 msgid "This section defines your SIP address when not using a SIP account"
 msgstr ""
 "Denna sektion specificerar din SIP adress när du inte använder ett SIP konto"
 
-#: ../gtk/parameters.ui.h:51
+#: ../gtk/parameters.ui.h:54
 msgid "Your display name (eg: John Doe):"
 msgstr "Ditt synliga namn, e.g. Kalle Karlsson:"
 
-#: ../gtk/parameters.ui.h:52
+#: ../gtk/parameters.ui.h:55
 msgid "Your username:"
 msgstr "Ditt användarnamn:"
 
-#: ../gtk/parameters.ui.h:53
+#: ../gtk/parameters.ui.h:56
 msgid "Your resulting SIP address:"
 msgstr "Din SIP adress:"
 
-#: ../gtk/parameters.ui.h:54
+#: ../gtk/parameters.ui.h:57
 msgid "<b>Default identity</b>"
 msgstr "<b>Default identitet</b>"
 
-#: ../gtk/parameters.ui.h:55
+#: ../gtk/parameters.ui.h:58
 msgid "Wizard"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:56
+#: ../gtk/parameters.ui.h:59
 msgid "Add"
 msgstr "Lägg till"
 
-#: ../gtk/parameters.ui.h:57
+#: ../gtk/parameters.ui.h:60
 msgid "Edit"
 msgstr "Editera"
 
-#: ../gtk/parameters.ui.h:58
+#: ../gtk/parameters.ui.h:61
 msgid "Remove"
 msgstr "Ta bort"
 
-#: ../gtk/parameters.ui.h:59
+#: ../gtk/parameters.ui.h:62
 msgid "<b>Proxy accounts</b>"
 msgstr "<b>Proxy konton</b>"
 
-#: ../gtk/parameters.ui.h:60
+#: ../gtk/parameters.ui.h:63
 msgid "Erase all passwords"
 msgstr "Glöm alla lösenord"
 
-#: ../gtk/parameters.ui.h:61
+#: ../gtk/parameters.ui.h:64
 msgid "<b>Privacy</b>"
 msgstr "<b>Integritet</b>"
 
-#: ../gtk/parameters.ui.h:62
+#: ../gtk/parameters.ui.h:65
 msgid "Manage SIP Accounts"
 msgstr "Hantera SIP konton"
 
-#: ../gtk/parameters.ui.h:63 ../gtk/tunnel_config.ui.h:4
+#: ../gtk/parameters.ui.h:66 ../gtk/tunnel_config.ui.h:4
 msgid "Enable"
 msgstr "Möjliggör"
 
-#: ../gtk/parameters.ui.h:64 ../gtk/tunnel_config.ui.h:5
+#: ../gtk/parameters.ui.h:67 ../gtk/tunnel_config.ui.h:5
 msgid "Disable"
 msgstr "Inaktivera"
 
-#: ../gtk/parameters.ui.h:65
+#: ../gtk/parameters.ui.h:68
 msgid "<b>Codecs</b>"
 msgstr "<b>Codecs</b>"
 
-#: ../gtk/parameters.ui.h:66
+#: ../gtk/parameters.ui.h:69
 msgid "0 stands for \"unlimited\""
 msgstr "0 står för \"utan begränsning\""
 
-#: ../gtk/parameters.ui.h:67
+#: ../gtk/parameters.ui.h:70
 msgid "Upload speed limit in Kbit/sec:"
 msgstr "Max upstream bandbreddshastighet i kbit/sek:"
 
-#: ../gtk/parameters.ui.h:68
+#: ../gtk/parameters.ui.h:71
 msgid "Download speed limit in Kbit/sec:"
 msgstr "Max downstream bandbreddshastighet i kbit/sek:"
 
-#: ../gtk/parameters.ui.h:69
+#: ../gtk/parameters.ui.h:72
 msgid "Enable adaptive rate control"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:70
+#: ../gtk/parameters.ui.h:73
 msgid ""
 "<i>Adaptive rate control is a technique to dynamically guess the available "
 "bandwidth during a call.</i>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:71
+#: ../gtk/parameters.ui.h:74
 msgid "<b>Bandwidth control</b>"
 msgstr "<b>Bandbreddskontroll</b>"
 
-#: ../gtk/parameters.ui.h:72
+#: ../gtk/parameters.ui.h:75
 msgid "Codecs"
 msgstr "Codecs"
 
-#: ../gtk/parameters.ui.h:73
+#: ../gtk/parameters.ui.h:76
 msgid "<b>Language</b>"
 msgstr "<b>Språk</b>"
 
-#: ../gtk/parameters.ui.h:74
+#: ../gtk/parameters.ui.h:77
 msgid "Show advanced settings"
 msgstr "Visa avancerade inställningar"
 
-#: ../gtk/parameters.ui.h:75
+#: ../gtk/parameters.ui.h:78
 msgid "<b>Level</b>"
 msgstr "<b>Nivå</b>"
 
-#: ../gtk/parameters.ui.h:76
+#: ../gtk/parameters.ui.h:79
 msgid "User interface"
 msgstr "Användarinterface"
 
-#: ../gtk/parameters.ui.h:77 ../gtk/ldap.ui.h:2
+#: ../gtk/parameters.ui.h:80 ../gtk/ldap.ui.h:2
 msgid "Server address:"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:78 ../gtk/ldap.ui.h:3
+#: ../gtk/parameters.ui.h:81 ../gtk/ldap.ui.h:3
 msgid "Authentication method:"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:80
+#: ../gtk/parameters.ui.h:83
 msgid "<b>LDAP Account setup</b>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:81
+#: ../gtk/parameters.ui.h:84
 msgid "LDAP"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:82
+#: ../gtk/parameters.ui.h:85
 msgid "Done"
 msgstr "Klar"
 
@@ -1684,56 +1696,56 @@ msgstr ""
 msgid "Ready"
 msgstr "Redo"
 
-#: ../coreapi/linphonecore.c:2473
+#: ../coreapi/linphonecore.c:2489
 msgid "Configuring"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2638
+#: ../coreapi/linphonecore.c:2654
 msgid "Looking for telephone number destination..."
 msgstr "Leta efter telefonnummer för destinationen..."
 
-#: ../coreapi/linphonecore.c:2640
+#: ../coreapi/linphonecore.c:2656
 msgid "Could not resolve this number."
 msgstr "Kan inte nå dett nummer."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2926
+#: ../coreapi/linphonecore.c:2942
 msgid "Contacting"
 msgstr "Kontaktar"
 
-#: ../coreapi/linphonecore.c:2931
+#: ../coreapi/linphonecore.c:2947
 msgid "Could not call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3081
+#: ../coreapi/linphonecore.c:3097
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3240
+#: ../coreapi/linphonecore.c:3256
 msgid "is contacting you"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3241
+#: ../coreapi/linphonecore.c:3257
 msgid " and asked autoanswer."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3359
+#: ../coreapi/linphonecore.c:3375
 msgid "Modifying call parameters..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3707
+#: ../coreapi/linphonecore.c:3723
 msgid "Connected."
 msgstr "Kopplad"
 
-#: ../coreapi/linphonecore.c:3732
+#: ../coreapi/linphonecore.c:3748
 msgid "Call aborted"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3922
+#: ../coreapi/linphonecore.c:3938
 msgid "Could not pause the call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3926
+#: ../coreapi/linphonecore.c:3941
 msgid "Pausing the current call..."
 msgstr ""
 
@@ -1797,7 +1809,7 @@ msgstr ""
 msgid "Unknown status"
 msgstr ""
 
-#: ../coreapi/proxy.c:319
+#: ../coreapi/proxy.c:327
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
@@ -1805,7 +1817,7 @@ msgstr ""
 "SIP proxy adressen som du matade in är inte rätt, adressen måste starta med "
 "\"sip:\", följd av ett hostnamn"
 
-#: ../coreapi/proxy.c:325
+#: ../coreapi/proxy.c:333
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
@@ -1813,7 +1825,7 @@ msgstr ""
 "SIP adressen som du matade in är inte rätt. Adressen borde se ut som sip:"
 "namn@domän, såsom sip:peter@exempel.se"
 
-#: ../coreapi/proxy.c:1377
+#: ../coreapi/proxy.c:1390
 #, c-format
 msgid "Could not login as %s"
 msgstr "Kunde inte logga in som %s"
@@ -1927,12 +1939,12 @@ msgstr "Registrering hos %s mislyckades: %s"
 msgid "Service unavailable, retrying"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:174
+#: ../coreapi/linphonecall.c:175
 #, c-format
 msgid "Authentication token is %s"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:3020
+#: ../coreapi/linphonecall.c:3041
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 79bd07e81..fcafc6c1b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-03 13:39+0100\n"
-"PO-Revision-Date: 2014-12-04 09:51+0000\n"
+"POT-Creation-Date: 2015-01-06 12:28+0100\n"
+"PO-Revision-Date: 2015-01-06 11:29+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/linphone-"
 "gtk/language/zh_CN/)\n"
@@ -90,45 +90,49 @@ msgstr "无法打开位图文件：%s"
 msgid "Invalid sip contact !"
 msgstr "无效的 SIP 联系人！"
 
-#: ../gtk/main.c:107
+#: ../gtk/main.c:109
 msgid "log to stdout some debug information while running."
 msgstr "运行时向标准输出记录调试信息。"
 
-#: ../gtk/main.c:114
+#: ../gtk/main.c:116
 msgid "path to a file to write logs into."
 msgstr ""
 
-#: ../gtk/main.c:121
+#: ../gtk/main.c:123
 msgid "Start linphone with video disabled."
 msgstr ""
 
-#: ../gtk/main.c:128
+#: ../gtk/main.c:130
 msgid "Start only in the system tray, do not show the main interface."
 msgstr "启动到系统托盘，不显示主界面。"
 
-#: ../gtk/main.c:135
+#: ../gtk/main.c:137
 msgid "address to call right now"
 msgstr "现在呼叫的地址"
 
-#: ../gtk/main.c:142
+#: ../gtk/main.c:144
 msgid "if set automatically answer incoming calls"
 msgstr "是否设置呼叫自动应答"
 
-#: ../gtk/main.c:149
+#: ../gtk/main.c:151
 msgid ""
 "Specifiy a working directory (should be the base of the installation, eg: c:"
 "\\Program Files\\Linphone)"
 msgstr "指定工作目录(应为安装目录例如 C:\\Program Files\\Linphone)"
 
-#: ../gtk/main.c:156
+#: ../gtk/main.c:158
 msgid "Configuration file"
 msgstr ""
 
-#: ../gtk/main.c:163
+#: ../gtk/main.c:165
 msgid "Run the audio assistant"
 msgstr ""
 
-#: ../gtk/main.c:1085
+#: ../gtk/main.c:172
+msgid "Run self test and exit 0 if succeed"
+msgstr ""
+
+#: ../gtk/main.c:1083
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
@@ -140,66 +144,66 @@ msgstr ""
 "您是否允许他看到您的在线状态或者将它加为您的联系人允许?\n"
 "如果您回答否，则会将该人临时性的放入黑名单"
 
-#: ../gtk/main.c:1162
+#: ../gtk/main.c:1160
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
 msgstr ""
 
-#: ../gtk/main.c:1283
+#: ../gtk/main.c:1281
 msgid "Call error"
 msgstr ""
 
-#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3751
+#: ../gtk/main.c:1284 ../coreapi/linphonecore.c:3767
 msgid "Call ended"
 msgstr "呼叫结束"
 
-#: ../gtk/main.c:1289 ../coreapi/call_log.c:221
+#: ../gtk/main.c:1287 ../coreapi/call_log.c:221
 msgid "Incoming call"
 msgstr "呼入"
 
-#: ../gtk/main.c:1291 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
+#: ../gtk/main.c:1289 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
 msgid "Answer"
 msgstr ""
 
-#: ../gtk/main.c:1293 ../gtk/main.ui.h:6
+#: ../gtk/main.c:1291 ../gtk/main.ui.h:6
 msgid "Decline"
 msgstr "拒绝"
 
-#: ../gtk/main.c:1299
+#: ../gtk/main.c:1297
 msgid "Call paused"
 msgstr ""
 
-#: ../gtk/main.c:1299
+#: ../gtk/main.c:1297
 #, c-format
 msgid "<b>by %s</b>"
 msgstr ""
 
-#: ../gtk/main.c:1366
+#: ../gtk/main.c:1367
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr ""
 
-#: ../gtk/main.c:1528
+#: ../gtk/main.c:1529
 msgid "Website link"
 msgstr "网站"
 
-#: ../gtk/main.c:1577
+#: ../gtk/main.c:1578
 msgid "Linphone - a video internet phone"
 msgstr "Linphone - 互联网视频电话"
 
-#: ../gtk/main.c:1669
+#: ../gtk/main.c:1670
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (默认)"
 
-#: ../gtk/main.c:2006 ../coreapi/callbacks.c:986
+#: ../gtk/main.c:2002 ../coreapi/callbacks.c:986
 #, c-format
 msgid "We are transferred to %s"
 msgstr ""
 
-#: ../gtk/main.c:2016
+#: ../gtk/main.c:2012
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
@@ -207,7 +211,7 @@ msgstr ""
 "未在此计算机上检测到声卡。\n"
 "您无法发送或接收音频呼叫。"
 
-#: ../gtk/main.c:2157
+#: ../gtk/main.c:2156
 msgid "A free SIP video-phone"
 msgstr "免费的 SIP 视频电话"
 
@@ -276,7 +280,7 @@ msgstr "参数"
 msgid "Enabled"
 msgstr "启用"
 
-#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763
+#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763 ../gtk/parameters.ui.h:20
 msgid "Disabled"
 msgstr "禁用"
 
@@ -438,7 +442,7 @@ msgstr ""
 msgid "Enter your linphone.org username"
 msgstr ""
 
-#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:79 ../gtk/ldap.ui.h:4
+#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:82 ../gtk/ldap.ui.h:4
 msgid "Username:"
 msgstr "用户名:"
 
@@ -622,7 +626,7 @@ msgstr ""
 msgid "%.3f seconds"
 msgstr ""
 
-#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12 ../gtk/videowindow.c:232
+#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12 ../gtk/videowindow.c:235
 msgid "Hang up"
 msgstr ""
 
@@ -1204,256 +1208,264 @@ msgid "<b>Transport</b>"
 msgstr "<b>传输协议</b>"
 
 #: ../gtk/parameters.ui.h:19
-msgid "Media encryption type"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:20
-msgid "Video RTP/UDP:"
-msgstr "视频 RTP/UDP："
-
-#: ../gtk/parameters.ui.h:21
-msgid "Audio RTP/UDP:"
-msgstr "音频 RTP/UDP："
-
-#: ../gtk/parameters.ui.h:22
-msgid "Fixed"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:23
-msgid "Media encryption is mandatory"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:24
-msgid "Tunnel"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:25
-msgid "DSCP fields"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:26
-msgid "SIP/TCP port"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:27
 msgid "SIP/UDP port"
 msgstr ""
 
+#: ../gtk/parameters.ui.h:21
+msgid "Random"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:22
+msgid "SIP/TCP port"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:23
+msgid "Audio RTP/UDP:"
+msgstr "音频 RTP/UDP："
+
+#: ../gtk/parameters.ui.h:24
+msgid "Fixed"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:25
+msgid "Video RTP/UDP:"
+msgstr "视频 RTP/UDP："
+
+#: ../gtk/parameters.ui.h:26
+msgid "Media encryption type"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:27
+msgid "Media encryption is mandatory"
+msgstr ""
+
 #: ../gtk/parameters.ui.h:28
-msgid "<b>Network protocol and ports</b>"
+msgid "Tunnel"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:29
-msgid "Direct connection to the Internet"
-msgstr "直接连接到互联网"
+msgid "DSCP fields"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:30
-msgid "Behind NAT / Firewall (specify gateway IP )"
+msgid "<b>Network protocol and ports</b>"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:31
-msgid "Behind NAT / Firewall (use STUN to resolve)"
-msgstr "在 NAT 或防火墙后(使用 STUN 解决)"
+msgid "Direct connection to the Internet"
+msgstr "直接连接到互联网"
 
 #: ../gtk/parameters.ui.h:32
-msgid "Behind NAT / Firewall (use ICE)"
+msgid "Behind NAT / Firewall (specify gateway IP )"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:33
+msgid "Behind NAT / Firewall (use STUN to resolve)"
+msgstr "在 NAT 或防火墙后(使用 STUN 解决)"
+
+#: ../gtk/parameters.ui.h:34
+msgid "Behind NAT / Firewall (use ICE)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:35
 msgid "Behind NAT / Firewall (use uPnP)"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:34
+#: ../gtk/parameters.ui.h:36
 msgid "Public IP address:"
 msgstr "公网 IP 地址："
 
-#: ../gtk/parameters.ui.h:35
+#: ../gtk/parameters.ui.h:37
 msgid "Stun server:"
 msgstr "Stun 服务器："
 
-#: ../gtk/parameters.ui.h:36
+#: ../gtk/parameters.ui.h:38
 msgid "<b>NAT and Firewall</b>"
 msgstr "<b>NAT 及防火墙</b>"
 
-#: ../gtk/parameters.ui.h:37
+#: ../gtk/parameters.ui.h:39
 msgid "Network settings"
 msgstr "网络设置"
 
-#: ../gtk/parameters.ui.h:38
+#: ../gtk/parameters.ui.h:40
 msgid "Ring sound:"
 msgstr "铃声文件："
 
-#: ../gtk/parameters.ui.h:39
+#: ../gtk/parameters.ui.h:41
 msgid "ALSA special device (optional):"
 msgstr "ALSA 特殊设备(可选)："
 
-#: ../gtk/parameters.ui.h:40
+#: ../gtk/parameters.ui.h:42
 msgid "Capture device:"
 msgstr "录音设备："
 
-#: ../gtk/parameters.ui.h:41
+#: ../gtk/parameters.ui.h:43
 msgid "Ring device:"
 msgstr "响铃设备："
 
-#: ../gtk/parameters.ui.h:42
+#: ../gtk/parameters.ui.h:44
 msgid "Playback device:"
 msgstr "回放设备："
 
-#: ../gtk/parameters.ui.h:43
+#: ../gtk/parameters.ui.h:45
 msgid "Enable echo cancellation"
 msgstr "启用回声抑制"
 
-#: ../gtk/parameters.ui.h:44
+#: ../gtk/parameters.ui.h:46
 msgid "<b>Audio</b>"
 msgstr "<b>音频</b>"
 
-#: ../gtk/parameters.ui.h:45
+#: ../gtk/parameters.ui.h:47
 msgid "Video input device:"
 msgstr "视频输入设备："
 
-#: ../gtk/parameters.ui.h:46
+#: ../gtk/parameters.ui.h:48
 msgid "Prefered video resolution:"
 msgstr "视频分辨率："
 
-#: ../gtk/parameters.ui.h:47
+#: ../gtk/parameters.ui.h:49
 msgid "Video output method:"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:48
+#: ../gtk/parameters.ui.h:50
+msgid "Show camera preview"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:51
 msgid "<b>Video</b>"
 msgstr "<b>视频</b>"
 
-#: ../gtk/parameters.ui.h:49
+#: ../gtk/parameters.ui.h:52
 msgid "Multimedia settings"
 msgstr "音视频设置"
 
-#: ../gtk/parameters.ui.h:50
+#: ../gtk/parameters.ui.h:53
 msgid "This section defines your SIP address when not using a SIP account"
 msgstr "该段在您不使用SIP帐户时的SIP地址"
 
-#: ../gtk/parameters.ui.h:51
+#: ../gtk/parameters.ui.h:54
 msgid "Your display name (eg: John Doe):"
 msgstr "您的显示名："
 
-#: ../gtk/parameters.ui.h:52
+#: ../gtk/parameters.ui.h:55
 msgid "Your username:"
 msgstr "您的用户名："
 
-#: ../gtk/parameters.ui.h:53
+#: ../gtk/parameters.ui.h:56
 msgid "Your resulting SIP address:"
 msgstr "您的 SIP 地址结果："
 
-#: ../gtk/parameters.ui.h:54
+#: ../gtk/parameters.ui.h:57
 msgid "<b>Default identity</b>"
 msgstr "<b>默认帐户</b>"
 
-#: ../gtk/parameters.ui.h:55
+#: ../gtk/parameters.ui.h:58
 msgid "Wizard"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:56
+#: ../gtk/parameters.ui.h:59
 msgid "Add"
 msgstr "添加"
 
-#: ../gtk/parameters.ui.h:57
+#: ../gtk/parameters.ui.h:60
 msgid "Edit"
 msgstr "编辑"
 
-#: ../gtk/parameters.ui.h:58
+#: ../gtk/parameters.ui.h:61
 msgid "Remove"
 msgstr "移除"
 
-#: ../gtk/parameters.ui.h:59
+#: ../gtk/parameters.ui.h:62
 msgid "<b>Proxy accounts</b>"
 msgstr "<b>代理帐户</b>"
 
-#: ../gtk/parameters.ui.h:60
+#: ../gtk/parameters.ui.h:63
 msgid "Erase all passwords"
 msgstr "清除所有密码"
 
-#: ../gtk/parameters.ui.h:61
+#: ../gtk/parameters.ui.h:64
 msgid "<b>Privacy</b>"
 msgstr "<b>隐私</b>"
 
-#: ../gtk/parameters.ui.h:62
+#: ../gtk/parameters.ui.h:65
 msgid "Manage SIP Accounts"
 msgstr "SIP 帐户管理"
 
-#: ../gtk/parameters.ui.h:63 ../gtk/tunnel_config.ui.h:4
+#: ../gtk/parameters.ui.h:66 ../gtk/tunnel_config.ui.h:4
 msgid "Enable"
 msgstr "启用"
 
-#: ../gtk/parameters.ui.h:64 ../gtk/tunnel_config.ui.h:5
+#: ../gtk/parameters.ui.h:67 ../gtk/tunnel_config.ui.h:5
 msgid "Disable"
 msgstr "禁用"
 
-#: ../gtk/parameters.ui.h:65
+#: ../gtk/parameters.ui.h:68
 msgid "<b>Codecs</b>"
 msgstr "<b>编解码器</b>"
 
-#: ../gtk/parameters.ui.h:66
+#: ../gtk/parameters.ui.h:69
 msgid "0 stands for \"unlimited\""
 msgstr "0 表示 “没有限制”"
 
-#: ../gtk/parameters.ui.h:67
+#: ../gtk/parameters.ui.h:70
 msgid "Upload speed limit in Kbit/sec:"
 msgstr "上传速率限制 kbit/s："
 
-#: ../gtk/parameters.ui.h:68
+#: ../gtk/parameters.ui.h:71
 msgid "Download speed limit in Kbit/sec:"
 msgstr "下载速率限制 kbit/s："
 
-#: ../gtk/parameters.ui.h:69
+#: ../gtk/parameters.ui.h:72
 msgid "Enable adaptive rate control"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:70
+#: ../gtk/parameters.ui.h:73
 msgid ""
 "<i>Adaptive rate control is a technique to dynamically guess the available "
 "bandwidth during a call.</i>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:71
+#: ../gtk/parameters.ui.h:74
 msgid "<b>Bandwidth control</b>"
 msgstr "<b>带宽控制</b>"
 
-#: ../gtk/parameters.ui.h:72
+#: ../gtk/parameters.ui.h:75
 msgid "Codecs"
 msgstr "编解码器"
 
-#: ../gtk/parameters.ui.h:73
+#: ../gtk/parameters.ui.h:76
 msgid "<b>Language</b>"
 msgstr "<b>语言</b>"
 
-#: ../gtk/parameters.ui.h:74
+#: ../gtk/parameters.ui.h:77
 msgid "Show advanced settings"
 msgstr "显示高级设置"
 
-#: ../gtk/parameters.ui.h:75
+#: ../gtk/parameters.ui.h:78
 msgid "<b>Level</b>"
 msgstr "<b>级别</b>"
 
-#: ../gtk/parameters.ui.h:76
+#: ../gtk/parameters.ui.h:79
 msgid "User interface"
 msgstr "用户界面"
 
-#: ../gtk/parameters.ui.h:77 ../gtk/ldap.ui.h:2
+#: ../gtk/parameters.ui.h:80 ../gtk/ldap.ui.h:2
 msgid "Server address:"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:78 ../gtk/ldap.ui.h:3
+#: ../gtk/parameters.ui.h:81 ../gtk/ldap.ui.h:3
 msgid "Authentication method:"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:80
+#: ../gtk/parameters.ui.h:83
 msgid "<b>LDAP Account setup</b>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:81
+#: ../gtk/parameters.ui.h:84
 msgid "LDAP"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:82
+#: ../gtk/parameters.ui.h:85
 msgid "Done"
 msgstr "完成"
 
@@ -1679,56 +1691,56 @@ msgstr ""
 msgid "Ready"
 msgstr "就绪"
 
-#: ../coreapi/linphonecore.c:2473
+#: ../coreapi/linphonecore.c:2489
 msgid "Configuring"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2638
+#: ../coreapi/linphonecore.c:2654
 msgid "Looking for telephone number destination..."
 msgstr "查询电话号码目的地..."
 
-#: ../coreapi/linphonecore.c:2640
+#: ../coreapi/linphonecore.c:2656
 msgid "Could not resolve this number."
 msgstr "该号码无法解析。"
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2926
+#: ../coreapi/linphonecore.c:2942
 msgid "Contacting"
 msgstr "联系中"
 
-#: ../coreapi/linphonecore.c:2931
+#: ../coreapi/linphonecore.c:2947
 msgid "Could not call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3081
+#: ../coreapi/linphonecore.c:3097
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3240
+#: ../coreapi/linphonecore.c:3256
 msgid "is contacting you"
 msgstr "正在联系您"
 
-#: ../coreapi/linphonecore.c:3241
+#: ../coreapi/linphonecore.c:3257
 msgid " and asked autoanswer."
 msgstr " 并询问了自动回答。"
 
-#: ../coreapi/linphonecore.c:3359
+#: ../coreapi/linphonecore.c:3375
 msgid "Modifying call parameters..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3707
+#: ../coreapi/linphonecore.c:3723
 msgid "Connected."
 msgstr "已连接。"
 
-#: ../coreapi/linphonecore.c:3732
+#: ../coreapi/linphonecore.c:3748
 msgid "Call aborted"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3922
+#: ../coreapi/linphonecore.c:3938
 msgid "Could not pause the call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3926
+#: ../coreapi/linphonecore.c:3941
 msgid "Pausing the current call..."
 msgstr ""
 
@@ -1792,13 +1804,13 @@ msgstr ""
 msgid "Unknown status"
 msgstr ""
 
-#: ../coreapi/proxy.c:319
+#: ../coreapi/proxy.c:327
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
 msgstr "您输入的 SIP 代理地址无效，它必须是以“sip:”开头，并紧随一个主机名。"
 
-#: ../coreapi/proxy.c:325
+#: ../coreapi/proxy.c:333
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
@@ -1806,7 +1818,7 @@ msgstr ""
 "您输入的地址无效。\n"
 "它应具有“sip:用户名@代理域”的形式，例如 sip:alice@example.net"
 
-#: ../coreapi/proxy.c:1377
+#: ../coreapi/proxy.c:1390
 #, c-format
 msgid "Could not login as %s"
 msgstr "无法登录为 %s"
@@ -1920,12 +1932,12 @@ msgstr "注册到 %s 失败: %s"
 msgid "Service unavailable, retrying"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:174
+#: ../coreapi/linphonecall.c:175
 #, c-format
 msgid "Authentication token is %s"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:3020
+#: ../coreapi/linphonecall.c:3041
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 60fc52aee..f1de4bbc7 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-03 13:39+0100\n"
-"PO-Revision-Date: 2014-12-04 09:51+0000\n"
+"POT-Creation-Date: 2015-01-06 12:28+0100\n"
+"PO-Revision-Date: 2015-01-06 11:29+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/"
 "linphone-gtk/language/zh_TW/)\n"
@@ -90,46 +90,50 @@ msgstr "找不到 pixmap 檔：%s"
 msgid "Invalid sip contact !"
 msgstr "無效的 sip 連絡人！"
 
-#: ../gtk/main.c:107
+#: ../gtk/main.c:109
 msgid "log to stdout some debug information while running."
 msgstr "執行時將一些除錯資訊記錄到標準輸出。"
 
-#: ../gtk/main.c:114
+#: ../gtk/main.c:116
 msgid "path to a file to write logs into."
 msgstr ""
 
-#: ../gtk/main.c:121
+#: ../gtk/main.c:123
 msgid "Start linphone with video disabled."
 msgstr ""
 
-#: ../gtk/main.c:128
+#: ../gtk/main.c:130
 msgid "Start only in the system tray, do not show the main interface."
 msgstr "只在系統匣啟動，不要顯示主要介面。"
 
-#: ../gtk/main.c:135
+#: ../gtk/main.c:137
 msgid "address to call right now"
 msgstr "現在要打電話的位址"
 
-#: ../gtk/main.c:142
+#: ../gtk/main.c:144
 msgid "if set automatically answer incoming calls"
 msgstr "如啟用此項，將會自動接聽來電"
 
-#: ../gtk/main.c:149
+#: ../gtk/main.c:151
 msgid ""
 "Specifiy a working directory (should be the base of the installation, eg: c:"
 "\\Program Files\\Linphone)"
 msgstr ""
 "指定一個工作目錄（應該為安裝的根目錄，例如：c:\\Program Files\\Linphone）"
 
-#: ../gtk/main.c:156
+#: ../gtk/main.c:158
 msgid "Configuration file"
 msgstr ""
 
-#: ../gtk/main.c:163
+#: ../gtk/main.c:165
 msgid "Run the audio assistant"
 msgstr ""
 
-#: ../gtk/main.c:1085
+#: ../gtk/main.c:172
+msgid "Run self test and exit 0 if succeed"
+msgstr ""
+
+#: ../gtk/main.c:1083
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
@@ -141,66 +145,66 @@ msgstr ""
 "您是否要允許他看見您的上線狀態或將他加入您的連絡人清單？\n"
 "如果您回答否，這個人會被暫時列入黑名單。"
 
-#: ../gtk/main.c:1162
+#: ../gtk/main.c:1160
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
 msgstr ""
 
-#: ../gtk/main.c:1283
+#: ../gtk/main.c:1281
 msgid "Call error"
 msgstr ""
 
-#: ../gtk/main.c:1286 ../coreapi/linphonecore.c:3751
+#: ../gtk/main.c:1284 ../coreapi/linphonecore.c:3767
 msgid "Call ended"
 msgstr "通話已結束"
 
-#: ../gtk/main.c:1289 ../coreapi/call_log.c:221
+#: ../gtk/main.c:1287 ../coreapi/call_log.c:221
 msgid "Incoming call"
 msgstr "來電"
 
-#: ../gtk/main.c:1291 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
+#: ../gtk/main.c:1289 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
 msgid "Answer"
 msgstr "接聽"
 
-#: ../gtk/main.c:1293 ../gtk/main.ui.h:6
+#: ../gtk/main.c:1291 ../gtk/main.ui.h:6
 msgid "Decline"
 msgstr "拒接"
 
-#: ../gtk/main.c:1299
+#: ../gtk/main.c:1297
 msgid "Call paused"
 msgstr ""
 
-#: ../gtk/main.c:1299
+#: ../gtk/main.c:1297
 #, c-format
 msgid "<b>by %s</b>"
 msgstr ""
 
-#: ../gtk/main.c:1366
+#: ../gtk/main.c:1367
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr ""
 
-#: ../gtk/main.c:1528
+#: ../gtk/main.c:1529
 msgid "Website link"
 msgstr "網站連結"
 
-#: ../gtk/main.c:1577
+#: ../gtk/main.c:1578
 msgid "Linphone - a video internet phone"
 msgstr "Linphone - 網路視訊電話"
 
-#: ../gtk/main.c:1669
+#: ../gtk/main.c:1670
 #, c-format
 msgid "%s (Default)"
 msgstr "%s （預設值）"
 
-#: ../gtk/main.c:2006 ../coreapi/callbacks.c:986
+#: ../gtk/main.c:2002 ../coreapi/callbacks.c:986
 #, c-format
 msgid "We are transferred to %s"
 msgstr "我們被轉接到 %s"
 
-#: ../gtk/main.c:2016
+#: ../gtk/main.c:2012
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
@@ -208,7 +212,7 @@ msgstr ""
 "在這臺電腦中偵測不到音效卡。\n"
 "您將無法傳送或接收語音電話。"
 
-#: ../gtk/main.c:2157
+#: ../gtk/main.c:2156
 msgid "A free SIP video-phone"
 msgstr "自由的 SIP 視訊電話"
 
@@ -277,7 +281,7 @@ msgstr "參數"
 msgid "Enabled"
 msgstr "已啟用"
 
-#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763
+#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763 ../gtk/parameters.ui.h:20
 msgid "Disabled"
 msgstr "已停用"
 
@@ -439,7 +443,7 @@ msgstr ""
 msgid "Enter your linphone.org username"
 msgstr ""
 
-#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:79 ../gtk/ldap.ui.h:4
+#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:82 ../gtk/ldap.ui.h:4
 msgid "Username:"
 msgstr "使用者名稱："
 
@@ -623,7 +627,7 @@ msgstr ""
 msgid "%.3f seconds"
 msgstr ""
 
-#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12 ../gtk/videowindow.c:232
+#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12 ../gtk/videowindow.c:235
 msgid "Hang up"
 msgstr ""
 
@@ -1205,256 +1209,264 @@ msgid "<b>Transport</b>"
 msgstr "<b>傳輸</b>"
 
 #: ../gtk/parameters.ui.h:19
-msgid "Media encryption type"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:20
-msgid "Video RTP/UDP:"
-msgstr "視訊 RTP/UDP:"
-
-#: ../gtk/parameters.ui.h:21
-msgid "Audio RTP/UDP:"
-msgstr "音效 RTP/UDP:"
-
-#: ../gtk/parameters.ui.h:22
-msgid "Fixed"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:23
-msgid "Media encryption is mandatory"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:24
-msgid "Tunnel"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:25
-msgid "DSCP fields"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:26
-msgid "SIP/TCP port"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:27
 msgid "SIP/UDP port"
 msgstr ""
 
+#: ../gtk/parameters.ui.h:21
+msgid "Random"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:22
+msgid "SIP/TCP port"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:23
+msgid "Audio RTP/UDP:"
+msgstr "音效 RTP/UDP:"
+
+#: ../gtk/parameters.ui.h:24
+msgid "Fixed"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:25
+msgid "Video RTP/UDP:"
+msgstr "視訊 RTP/UDP:"
+
+#: ../gtk/parameters.ui.h:26
+msgid "Media encryption type"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:27
+msgid "Media encryption is mandatory"
+msgstr ""
+
 #: ../gtk/parameters.ui.h:28
-msgid "<b>Network protocol and ports</b>"
+msgid "Tunnel"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:29
-msgid "Direct connection to the Internet"
-msgstr "直接連線到網際網路"
+msgid "DSCP fields"
+msgstr ""
 
 #: ../gtk/parameters.ui.h:30
-msgid "Behind NAT / Firewall (specify gateway IP )"
+msgid "<b>Network protocol and ports</b>"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:31
-msgid "Behind NAT / Firewall (use STUN to resolve)"
-msgstr "在 NAT / 防火牆之後 (使用 STUN 解析)"
+msgid "Direct connection to the Internet"
+msgstr "直接連線到網際網路"
 
 #: ../gtk/parameters.ui.h:32
-msgid "Behind NAT / Firewall (use ICE)"
+msgid "Behind NAT / Firewall (specify gateway IP )"
 msgstr ""
 
 #: ../gtk/parameters.ui.h:33
+msgid "Behind NAT / Firewall (use STUN to resolve)"
+msgstr "在 NAT / 防火牆之後 (使用 STUN 解析)"
+
+#: ../gtk/parameters.ui.h:34
+msgid "Behind NAT / Firewall (use ICE)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:35
 msgid "Behind NAT / Firewall (use uPnP)"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:34
+#: ../gtk/parameters.ui.h:36
 msgid "Public IP address:"
 msgstr "公共 IP 地址:"
 
-#: ../gtk/parameters.ui.h:35
+#: ../gtk/parameters.ui.h:37
 msgid "Stun server:"
 msgstr "Stun 伺服器:"
 
-#: ../gtk/parameters.ui.h:36
+#: ../gtk/parameters.ui.h:38
 msgid "<b>NAT and Firewall</b>"
 msgstr "<b>NAT 與防火牆</b>"
 
-#: ../gtk/parameters.ui.h:37
+#: ../gtk/parameters.ui.h:39
 msgid "Network settings"
 msgstr "網路設定值"
 
-#: ../gtk/parameters.ui.h:38
+#: ../gtk/parameters.ui.h:40
 msgid "Ring sound:"
 msgstr "鈴聲音效:"
 
-#: ../gtk/parameters.ui.h:39
+#: ../gtk/parameters.ui.h:41
 msgid "ALSA special device (optional):"
 msgstr "ALSA 特殊裝置 (選擇性)："
 
-#: ../gtk/parameters.ui.h:40
+#: ../gtk/parameters.ui.h:42
 msgid "Capture device:"
 msgstr "捕捉裝置:"
 
-#: ../gtk/parameters.ui.h:41
+#: ../gtk/parameters.ui.h:43
 msgid "Ring device:"
 msgstr "響鈴裝置:"
 
-#: ../gtk/parameters.ui.h:42
+#: ../gtk/parameters.ui.h:44
 msgid "Playback device:"
 msgstr "播放裝置"
 
-#: ../gtk/parameters.ui.h:43
+#: ../gtk/parameters.ui.h:45
 msgid "Enable echo cancellation"
 msgstr "啟用回音消除"
 
-#: ../gtk/parameters.ui.h:44
+#: ../gtk/parameters.ui.h:46
 msgid "<b>Audio</b>"
 msgstr "<b>音效</b>"
 
-#: ../gtk/parameters.ui.h:45
+#: ../gtk/parameters.ui.h:47
 msgid "Video input device:"
 msgstr "視訊輸入裝置:"
 
-#: ../gtk/parameters.ui.h:46
+#: ../gtk/parameters.ui.h:48
 msgid "Prefered video resolution:"
 msgstr "偏好的視訊解析度:"
 
-#: ../gtk/parameters.ui.h:47
+#: ../gtk/parameters.ui.h:49
 msgid "Video output method:"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:48
+#: ../gtk/parameters.ui.h:50
+msgid "Show camera preview"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:51
 msgid "<b>Video</b>"
 msgstr "<b>視訊</b>"
 
-#: ../gtk/parameters.ui.h:49
+#: ../gtk/parameters.ui.h:52
 msgid "Multimedia settings"
 msgstr "多媒體設定值"
 
-#: ../gtk/parameters.ui.h:50
+#: ../gtk/parameters.ui.h:53
 msgid "This section defines your SIP address when not using a SIP account"
 msgstr "這一區在不使用 SIP 帳號時定義您的 SIP 位址"
 
-#: ../gtk/parameters.ui.h:51
+#: ../gtk/parameters.ui.h:54
 msgid "Your display name (eg: John Doe):"
 msgstr "您的顯示名稱 (例如: John Doe):"
 
-#: ../gtk/parameters.ui.h:52
+#: ../gtk/parameters.ui.h:55
 msgid "Your username:"
 msgstr "您的使用者名稱:"
 
-#: ../gtk/parameters.ui.h:53
+#: ../gtk/parameters.ui.h:56
 msgid "Your resulting SIP address:"
 msgstr "您組成的 SIP 位址:"
 
-#: ../gtk/parameters.ui.h:54
+#: ../gtk/parameters.ui.h:57
 msgid "<b>Default identity</b>"
 msgstr "<b>預設身分識別</b>"
 
-#: ../gtk/parameters.ui.h:55
+#: ../gtk/parameters.ui.h:58
 msgid "Wizard"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:56
+#: ../gtk/parameters.ui.h:59
 msgid "Add"
 msgstr "加入"
 
-#: ../gtk/parameters.ui.h:57
+#: ../gtk/parameters.ui.h:60
 msgid "Edit"
 msgstr "編輯"
 
-#: ../gtk/parameters.ui.h:58
+#: ../gtk/parameters.ui.h:61
 msgid "Remove"
 msgstr "移除"
 
-#: ../gtk/parameters.ui.h:59
+#: ../gtk/parameters.ui.h:62
 msgid "<b>Proxy accounts</b>"
 msgstr "<b>代理伺服器帳號</b>"
 
-#: ../gtk/parameters.ui.h:60
+#: ../gtk/parameters.ui.h:63
 msgid "Erase all passwords"
 msgstr "消除所有的密碼"
 
-#: ../gtk/parameters.ui.h:61
+#: ../gtk/parameters.ui.h:64
 msgid "<b>Privacy</b>"
 msgstr "<b>隱私</b>"
 
-#: ../gtk/parameters.ui.h:62
+#: ../gtk/parameters.ui.h:65
 msgid "Manage SIP Accounts"
 msgstr "管理 SIP 帳號"
 
-#: ../gtk/parameters.ui.h:63 ../gtk/tunnel_config.ui.h:4
+#: ../gtk/parameters.ui.h:66 ../gtk/tunnel_config.ui.h:4
 msgid "Enable"
 msgstr "啟用"
 
-#: ../gtk/parameters.ui.h:64 ../gtk/tunnel_config.ui.h:5
+#: ../gtk/parameters.ui.h:67 ../gtk/tunnel_config.ui.h:5
 msgid "Disable"
 msgstr "停用"
 
-#: ../gtk/parameters.ui.h:65
+#: ../gtk/parameters.ui.h:68
 msgid "<b>Codecs</b>"
 msgstr "<b>編碼解碼器</b>"
 
-#: ../gtk/parameters.ui.h:66
+#: ../gtk/parameters.ui.h:69
 msgid "0 stands for \"unlimited\""
 msgstr "0 表示「不限制」"
 
-#: ../gtk/parameters.ui.h:67
+#: ../gtk/parameters.ui.h:70
 msgid "Upload speed limit in Kbit/sec:"
 msgstr "上傳速度限制於 Kbit/sec:"
 
-#: ../gtk/parameters.ui.h:68
+#: ../gtk/parameters.ui.h:71
 msgid "Download speed limit in Kbit/sec:"
 msgstr "下載速度限制於 Kbit/sec:"
 
-#: ../gtk/parameters.ui.h:69
+#: ../gtk/parameters.ui.h:72
 msgid "Enable adaptive rate control"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:70
+#: ../gtk/parameters.ui.h:73
 msgid ""
 "<i>Adaptive rate control is a technique to dynamically guess the available "
 "bandwidth during a call.</i>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:71
+#: ../gtk/parameters.ui.h:74
 msgid "<b>Bandwidth control</b>"
 msgstr "<b>頻寬控制</b>"
 
-#: ../gtk/parameters.ui.h:72
+#: ../gtk/parameters.ui.h:75
 msgid "Codecs"
 msgstr "編碼解碼器"
 
-#: ../gtk/parameters.ui.h:73
+#: ../gtk/parameters.ui.h:76
 msgid "<b>Language</b>"
 msgstr "<b>語言</b>"
 
-#: ../gtk/parameters.ui.h:74
+#: ../gtk/parameters.ui.h:77
 msgid "Show advanced settings"
 msgstr "顯示進階設定值"
 
-#: ../gtk/parameters.ui.h:75
+#: ../gtk/parameters.ui.h:78
 msgid "<b>Level</b>"
 msgstr "<b>級數</b>"
 
-#: ../gtk/parameters.ui.h:76
+#: ../gtk/parameters.ui.h:79
 msgid "User interface"
 msgstr "使用者介面"
 
-#: ../gtk/parameters.ui.h:77 ../gtk/ldap.ui.h:2
+#: ../gtk/parameters.ui.h:80 ../gtk/ldap.ui.h:2
 msgid "Server address:"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:78 ../gtk/ldap.ui.h:3
+#: ../gtk/parameters.ui.h:81 ../gtk/ldap.ui.h:3
 msgid "Authentication method:"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:80
+#: ../gtk/parameters.ui.h:83
 msgid "<b>LDAP Account setup</b>"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:81
+#: ../gtk/parameters.ui.h:84
 msgid "LDAP"
 msgstr ""
 
-#: ../gtk/parameters.ui.h:82
+#: ../gtk/parameters.ui.h:85
 msgid "Done"
 msgstr "完成"
 
@@ -1680,56 +1692,56 @@ msgstr ""
 msgid "Ready"
 msgstr "準備就緒"
 
-#: ../coreapi/linphonecore.c:2473
+#: ../coreapi/linphonecore.c:2489
 msgid "Configuring"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2638
+#: ../coreapi/linphonecore.c:2654
 msgid "Looking for telephone number destination..."
 msgstr "尋找電話號碼目的端..."
 
-#: ../coreapi/linphonecore.c:2640
+#: ../coreapi/linphonecore.c:2656
 msgid "Could not resolve this number."
 msgstr "無法解析這個號碼。"
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2926
+#: ../coreapi/linphonecore.c:2942
 msgid "Contacting"
 msgstr "正在連絡"
 
-#: ../coreapi/linphonecore.c:2931
+#: ../coreapi/linphonecore.c:2947
 msgid "Could not call"
 msgstr "無法通話"
 
-#: ../coreapi/linphonecore.c:3081
+#: ../coreapi/linphonecore.c:3097
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "抱歉，我們已達瀏同步通話的最大數目"
 
-#: ../coreapi/linphonecore.c:3240
+#: ../coreapi/linphonecore.c:3256
 msgid "is contacting you"
 msgstr "正在連絡您"
 
-#: ../coreapi/linphonecore.c:3241
+#: ../coreapi/linphonecore.c:3257
 msgid " and asked autoanswer."
 msgstr "並要求自動接聽。"
 
-#: ../coreapi/linphonecore.c:3359
+#: ../coreapi/linphonecore.c:3375
 msgid "Modifying call parameters..."
 msgstr "修改通話參數..."
 
-#: ../coreapi/linphonecore.c:3707
+#: ../coreapi/linphonecore.c:3723
 msgid "Connected."
 msgstr "已連線。"
 
-#: ../coreapi/linphonecore.c:3732
+#: ../coreapi/linphonecore.c:3748
 msgid "Call aborted"
 msgstr "通話已放棄"
 
-#: ../coreapi/linphonecore.c:3922
+#: ../coreapi/linphonecore.c:3938
 msgid "Could not pause the call"
 msgstr "無法暫停通話"
 
-#: ../coreapi/linphonecore.c:3926
+#: ../coreapi/linphonecore.c:3941
 msgid "Pausing the current call..."
 msgstr "暫停目前的通話..."
 
@@ -1793,14 +1805,14 @@ msgstr ""
 msgid "Unknown status"
 msgstr ""
 
-#: ../coreapi/proxy.c:319
+#: ../coreapi/proxy.c:327
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
 msgstr ""
 "您輸入的 sip 代理位址是無效的，它必須要以「sip:」開頭，後面接主機名稱。"
 
-#: ../coreapi/proxy.c:325
+#: ../coreapi/proxy.c:333
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
@@ -1808,7 +1820,7 @@ msgstr ""
 "您輸入的 sip 身分是無效的。\n"
 "它應該看起來像 sip:使用者名稱@代理網域，像是 sip:alice@example.net"
 
-#: ../coreapi/proxy.c:1377
+#: ../coreapi/proxy.c:1390
 #, c-format
 msgid "Could not login as %s"
 msgstr "無法以 %s 登入"
@@ -1922,12 +1934,12 @@ msgstr "在 %s 註冊失敗：%s"
 msgid "Service unavailable, retrying"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:174
+#: ../coreapi/linphonecall.c:175
 #, c-format
 msgid "Authentication token is %s"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:3020
+#: ../coreapi/linphonecall.c:3041
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."

From 8518bd1bf4bb6938443bebc78dcc5a06b547dec2 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Tue, 6 Jan 2015 13:25:19 +0100
Subject: [PATCH 234/496] add test for timeouted BYE

---
 mediastreamer2       |  2 +-
 tester/call_tester.c | 45 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 470c29b1f..3652a4826 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 470c29b1fd66955b95cb289debb5673d722a4898
+Subproject commit 3652a48264faf8b7931bf735c45a9b3ec0d31b80
diff --git a/tester/call_tester.c b/tester/call_tester.c
index fa3550db1..c6b13462f 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -26,6 +26,7 @@
 #include "private.h"
 #include "liblinphone_tester.h"
 #include "mediastreamer2/dsptools.h"
+#include "belle-sip/sipstack.h"
 
 #ifdef WIN32
 #define unlink _unlink
@@ -376,6 +377,49 @@ static void simple_call(void) {
 	}
 }
 
+static void call_with_timeouted_bye(void) {
+	int begin;
+	int leaked_objects;
+	LinphoneCoreManager* marie;
+	LinphoneCoreManager* pauline;
+	belle_sip_timer_config_t timer_config;
+	belle_sip_object_enable_leak_detector(TRUE);
+	begin=belle_sip_object_get_object_count();
+
+	marie = linphone_core_manager_new( "marie_rc");
+	pauline = linphone_core_manager_new( "pauline_rc");
+
+	CU_ASSERT_TRUE(call(marie,pauline));
+
+	sal_set_send_error(pauline->lc->sal,1500); /*to trash the message without generating error*/
+	timer_config.T1=50; /*to have timer F = 3s*/
+	timer_config.T2=4000;
+	timer_config.T3=0;
+	timer_config.T4=5000;
+
+	belle_sip_stack_set_timer_config(sal_get_belle_sip_stack(pauline->lc->sal),&timer_config);
+	linphone_core_terminate_all_calls(pauline->lc);
+
+	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,1));
+	CU_ASSERT_TRUE(wait_for_until(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallReleased,1,timer_config.T1*84));
+
+	sal_set_send_error(pauline->lc->sal,0);
+
+	linphone_core_terminate_all_calls(marie->lc);
+	CU_ASSERT_TRUE(wait_for_until(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1,5000));
+	CU_ASSERT_TRUE(wait_for_until(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallReleased,1,5000));
+
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+
+	leaked_objects=belle_sip_object_get_object_count()-begin;
+	CU_ASSERT_TRUE(leaked_objects==0);
+	if (leaked_objects>0){
+		belle_sip_object_dump_active_objects();
+	}
+}
+
+
 static void direct_call_over_ipv6(){
 	LinphoneCoreManager* marie;
 	LinphoneCoreManager* pauline;
@@ -3483,6 +3527,7 @@ test_t call_tests[] = {
 	{ "Cancelled ringing call", cancelled_ringing_call },
 	{ "Call failed because of codecs", call_failed_because_of_codecs },
 	{ "Simple call", simple_call },
+	{ "Call with timeouted bye", call_with_timeouted_bye },
 	{ "Direct call over IPv6", direct_call_over_ipv6},
 	{ "Outbound call with multiple proxy possible", call_outbound_with_multiple_proxy },
 	{ "Audio call recording", audio_call_recording_test },

From b3aefec17a9ea19ee668abe7245265378d6afce8 Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Tue, 6 Jan 2015 13:29:07 +0100
Subject: [PATCH 235/496] Check for ZLIB in configure

---
 configure.ac | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/configure.ac b/configure.ac
index 3c1d9b9f5..e254f8810 100644
--- a/configure.ac
+++ b/configure.ac
@@ -271,6 +271,32 @@ if test "$build_upnp" != "false" ; then
 	AC_DEFINE(BUILD_UPNP, 1, [Define if upnp enabled])
 fi
 
+dnl check zlib
+PKG_CHECK_MODULES(ZLIB, [zlib], [found_zlib=yes], [found_zlib=no])
+if test "x$found_zlib" = "xno" ; then
+	AC_CHECK_LIB(z, inflate,
+		[AC_CHECK_HEADER([zlib.h],
+		[AC_COMPILE_IFELSE(
+			[AC_LANG_PROGRAM([[
+			 #include <zlib.h>
+			 #if !defined(ZLIB_VERNUM) || (ZLIB_VERNUM < 0x1230)
+			 // compile error
+			 #endif
+		]],[])],
+		[found_zlib=yes])])])
+	if test "x$found_zlib" = "xno" ; then
+		AC_MSG_NOTICE([zlib library and headers not found])
+	else
+		AC_DEFINE( HAVE_ZLIB, 1, [ZLIB support] )
+		ZLIBS_LIBS='-z'
+		AC_SUBST(ZLIB_LIBS)
+	fi
+else
+	AC_MSG_NOTICE([ZLIB found])
+	AC_DEFINE( HAVE_ZLIB, 1, [ZLIB support] )
+fi
+
+
 dnl check libxml2
 PKG_CHECK_MODULES(LIBXML2, [libxml-2.0],[libxml2_found=yes],foo=bar)
 if test "$libxml2_found" != "yes" ; then
@@ -947,6 +973,7 @@ printf "* %-30s %s\n" "Message storage"		$enable_msg_storage
 printf "* %-30s %s\n" "zRTP encryption"		$zrtp
 printf "* %-30s %s\n" "uPnP support" 		$build_upnp
 printf "* %-30s %s\n" "LDAP support" 		$enable_ldap
+printf "* %-30s %s\n" "ZLIB support" 		$found_zlib
 
 if test "$enable_tunnel" = "true" ; then
 	printf "* %-30s %s\n" "Tunnel support" "true"

From ea855ba9887609aad3b08acb622f8b77a07651ea Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Tue, 6 Jan 2015 13:34:49 +0100
Subject: [PATCH 236/496] Update ms2

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 3652a4826..f389b67d6 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 3652a48264faf8b7931bf735c45a9b3ec0d31b80
+Subproject commit f389b67d610728fd886665e35ef235f5a84f93af

From c2f64f76d3ad9affaea81d475b791b432cc9d843 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Tue, 6 Jan 2015 15:35:56 +0100
Subject: [PATCH 237/496] MS2:fix compilation issue

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index c837c019d..bbe9f1f77 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit c837c019d5b1ff5e6ba35ba76e6d9b9ad5d1cd51
+Subproject commit bbe9f1f77ce7ae83de3cd3baabc89775a361c53a

From ce396cc98279b99ac6b67f8e15c09ae059241843 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Tue, 6 Jan 2015 16:07:16 +0100
Subject: [PATCH 238/496] add -L/lib to mingw compilation

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index e254f8810..218862508 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,7 +62,7 @@ case $target in
 	*mingw*)
 		CFLAGS="$CFLAGS -DORTP_STATIC -D_WIN32_WINNT=0x0501 "
 		CXXFLAGS="$CXXFLAGS -DORTP_STATIC -D_WIN32_WINNT=0x0501"
-		LIBS="$LIBS -lws2_32"
+		LIBS="$LIBS -L/lib -lws2_32"
 		GUI_FLAGS="-mwindows"
 		CONSOLE_FLAGS="-mconsole"
 		mingw_found=yes

From 0e055ae4f9242d5b8be23746c1fa1ccd312fa923 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Tue, 6 Jan 2015 16:16:16 +0100
Subject: [PATCH 239/496] Fix documentation of
 linphone_proxy_config_get_transport().

---
 coreapi/linphonecore.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h
index 63ee7f7e0..2036ce0b0 100644
--- a/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@ -1027,11 +1027,11 @@ LINPHONE_PUBLIC LinphoneReason linphone_proxy_config_get_error(const LinphonePro
 **/
 LINPHONE_PUBLIC const LinphoneErrorInfo *linphone_proxy_config_get_error_info(const LinphoneProxyConfig *cfg);
 
-/*
- * return the transport from either : service route, route, or addr
- * @returns cfg object
- * @return transport as string (I.E udp, tcp, tls, dtls)*/
-
+/**
+ * Get the transport from either service route, route or addr.
+ * @param[in] cfg #LinphoneProxyConfig object.
+ * @returns The transport as a string (I.E udp, tcp, tls, dtls)
+**/
 LINPHONE_PUBLIC const char* linphone_proxy_config_get_transport(const LinphoneProxyConfig *cfg);
 
 

From 06115e939b3f300a8a8b073efe1a0ba06d7d3ba4 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Tue, 6 Jan 2015 16:16:40 +0100
Subject: [PATCH 240/496] Add some registration unit tests in Python.

---
 tools/python/unittests/linphonetester.py |  2 ++
 tools/python/unittests/test_register.py  | 46 +++++++++++++++++++++++-
 2 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/tools/python/unittests/linphonetester.py b/tools/python/unittests/linphonetester.py
index 0d803c348..bc7392832 100644
--- a/tools/python/unittests/linphonetester.py
+++ b/tools/python/unittests/linphonetester.py
@@ -9,6 +9,7 @@ import time
 
 
 test_domain = "sipopen.example.org"
+auth_domain = "sip.example.org"
 test_username = "liblinphone_tester"
 test_password = "secret"
 test_route = "sip2.linphone.org"
@@ -21,6 +22,7 @@ else:
 
 
 def linphonetester_log_handler(level, msg):
+    import logging
     method = getattr(logging.getLogger("linphonetester"), level)
     if not msg.strip().startswith('[PYLINPHONE]'):
         msg = '[CORE] ' + msg
diff --git a/tools/python/unittests/test_register.py b/tools/python/unittests/test_register.py
index be6918251..f62da77e0 100644
--- a/tools/python/unittests/test_register.py
+++ b/tools/python/unittests/test_register.py
@@ -8,7 +8,7 @@ class RegisterCoreManager(CoreManager):
 
     @classmethod
     def auth_info_requested(cls, lc, realm, username, domain):
-        CoreManager.auth_info_requested(cls, lc, realm, username, domain)
+        CoreManager.auth_info_requested(lc, realm, username, domain)
         info = linphone.AuthInfo.new(test_username, None, test_password, None, realm, domain) # Create authentication structure from identity
         lc.add_auth_info(info) # Add authentication info to LinphoneCore
 
@@ -145,3 +145,47 @@ class TestRegister:
         pc.server_addr = "sip:{domain}:{port};transport=tls".format(domain=addr.domain, port=port)
         pc.done()
         assert_equals(CoreManager.wait_for_until(cm, cm, lambda cm1, cm2: cm1.stats.number_of_LinphoneRegistrationFailed == 1, 5000), True)
+
+    def test_simple_authenticated_register(self):
+        cm = RegisterCoreManager()
+        info = linphone.AuthInfo.new(test_username, None, test_password, None, auth_domain, None) # Create authentication structure from identity
+        cm.lc.add_auth_info(info)
+        cm.register_with_refresh(False, auth_domain, "sip:{route}".format(route=test_route))
+        assert_equals(cm.stats.number_of_auth_info_requested, 0)
+
+    def test_digest_auth_without_initial_credentials(self):
+        cm = RegisterCoreManager(with_auth=True)
+        cm.register_with_refresh(False, auth_domain, "sip:{route}".format(route=test_route))
+        assert_equals(cm.stats.number_of_auth_info_requested, 1)
+
+    def test_authenticated_register_with_late_credentials(self):
+        cm = RegisterCoreManager()
+        cm.register_with_refresh(False, auth_domain, "sip:{route}".format(route=test_route), True, linphone.SipTransports(5070, 5070, 5071, 0))
+        assert_equals(cm.stats.number_of_auth_info_requested, 1)
+
+    def test_simple_register_with_refresh(self):
+        cm = RegisterCoreManager()
+        cm.register_with_refresh(True, None, None)
+        assert_equals(cm.stats.number_of_auth_info_requested, 0)
+
+    def test_simple_auth_register_with_refresh(self):
+        cm = RegisterCoreManager(with_auth=True)
+        cm.register_with_refresh(True, auth_domain, "sip:{route}".format(route=test_route))
+        assert_equals(cm.stats.number_of_auth_info_requested, 1)
+
+    def test_multiple_accounts(self):
+        cm = CoreManager('multi_account_rc', False)
+        assert_equals(CoreManager.wait_for(cm, cm, lambda cm1, cm2: cm1.stats.number_of_LinphoneRegistrationOk == len(cm.lc.proxy_config_list)), True)
+
+    def test_transport_change(self):
+        cm = CoreManager('multi_account_rc', False)
+        number_of_udp_proxies = reduce(lambda x, y: x + int(y.transport == "udp"), cm.lc.proxy_config_list, 0)
+        total_number_of_proxies = len(cm.lc.proxy_config_list)
+        # Keep only UDP
+        tr = cm.lc.sip_transports
+        tr.tcp_port = 0
+        tr.tls_port = 0
+        tr.dtls_port = 0
+        cm.lc.sip_transports = tr
+        assert_equals(CoreManager.wait_for(cm, cm, lambda cm1, cm2: cm1.stats.number_of_LinphoneRegistrationOk == number_of_udp_proxies), True)
+        assert_equals(CoreManager.wait_for(cm, cm, lambda cm1, cm2: cm1.stats.number_of_LinphoneRegistrationFailed == (total_number_of_proxies - number_of_udp_proxies)), True)

From 800909073dc1c60f95f76f15111d8e10a6d1e76c Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Tue, 6 Jan 2015 17:36:40 +0100
Subject: [PATCH 241/496] Set correct soversion when building with CMake.

---
 coreapi/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/coreapi/CMakeLists.txt b/coreapi/CMakeLists.txt
index 541e0d670..4c35d14a7 100644
--- a/coreapi/CMakeLists.txt
+++ b/coreapi/CMakeLists.txt
@@ -139,7 +139,7 @@ if(ENABLE_STATIC)
 	target_link_libraries(linphone ${LIBS})
 else()
 	add_library(linphone SHARED ${SOURCE_FILES} ${GENERATED_SOURCE_FILES})
-	set_target_properties(linphone PROPERTIES VERSION ${LINPHONE_VERSION} SOVERSION ${LINPHONE_SO_VERSION} LINKER_LANGUAGE CXX)
+	set_target_properties(linphone PROPERTIES VERSION ${LINPHONE_SO_VERSION} LINKER_LANGUAGE CXX)
 	target_link_libraries(linphone ${LIBS})
 	if(MSVC)
 		if(CMAKE_BUILD_TYPE STREQUAL "Debug")

From a46902e39fd8094862380f932967f0818fe6807e Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Wed, 7 Jan 2015 08:30:14 +0100
Subject: [PATCH 242/496] MS2:fix various compilation issues

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index f389b67d6..1288220ff 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit f389b67d610728fd886665e35ef235f5a84f93af
+Subproject commit 1288220ff95f00c88f7925a6e62882679ed9c97f

From c40ca96ba07f97f60fb14acdbc6230674132d65f Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Wed, 7 Jan 2015 09:38:30 +0100
Subject: [PATCH 243/496] Add genericName in desktop file

---
 share/linphone.desktop.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/share/linphone.desktop.in b/share/linphone.desktop.in
index 725c7e105..d037b7ebb 100644
--- a/share/linphone.desktop.in
+++ b/share/linphone.desktop.in
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Linphone
+GenericName=web-phone
 Comment=Linphone is a web-phone
 Type=Application
 Exec=linphone

From 38c9b96b7a2c1eadfd62eeca86fa700f85d8c608 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Wed, 7 Jan 2015 09:41:56 +0100
Subject: [PATCH 244/496] Add genericName in desktop file

---
 share/linphone.desktop.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/linphone.desktop.in b/share/linphone.desktop.in
index d037b7ebb..748076ecf 100644
--- a/share/linphone.desktop.in
+++ b/share/linphone.desktop.in
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=Linphone
-GenericName=web-phone
+GenericName=Web-phone
 Comment=Linphone is a web-phone
 Type=Application
 Exec=linphone

From ff330203afef25cb00b50210f4111af883e6b0f1 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Wed, 7 Jan 2015 10:30:03 +0100
Subject: [PATCH 245/496] ILBC build is now optionnal on Android

---
 build/android/Android.mk | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/build/android/Android.mk b/build/android/Android.mk
index 9690877ee..9cf269871 100755
--- a/build/android/Android.mk
+++ b/build/android/Android.mk
@@ -218,16 +218,18 @@ LOCAL_CFLAGS += -DBUILD_UPNP
 LOCAL_SRC_FILES += upnp.c
 endif
 
-LOCAL_STATIC_LIBRARIES += libspeex 
+LOCAL_STATIC_LIBRARIES += libspeex
 
 ifeq ($(BUILD_SRTP), 1)
 	LOCAL_C_INCLUDES += $(SRTP_C_INCLUDE)
 endif
 
+ifeq ($(BUILD_ILBC), 1)
 ifneq ($(TARGET_ARCH_ABI),armeabi)
 LOCAL_CFLAGS += -DHAVE_ILBC=1
 LOCAL_STATIC_LIBRARIES += libmsilbc
 endif
+endif
 
 LOCAL_C_INCLUDES += $(LIBLINPHONE_EXTENDED_C_INCLUDES)
 LOCAL_WHOLE_STATIC_LIBRARIES += $(LIBLINPHONE_EXTENDED_STATIC_LIBS)
@@ -253,8 +255,8 @@ endif
 ifeq ($(BUILD_OPUS),1)
 LOCAL_STATIC_LIBRARIES += libopus
 endif
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES) 
-LOCAL_EXPORT_CFLAGS := $(LOCAL_CFLAGS) 
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
+LOCAL_EXPORT_CFLAGS := $(LOCAL_CFLAGS)
 
 ifeq ($(_BUILD_VIDEO),1)
 LOCAL_SHARED_LIBRARIES += \

From 3a62072c55f5a4a368dd6d8b2f468db8c6935bb6 Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Wed, 7 Jan 2015 10:51:29 +0100
Subject: [PATCH 246/496] Link with ZLIB when it is detected

---
 coreapi/Makefile.am | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/coreapi/Makefile.am b/coreapi/Makefile.am
index 160d0a420..26fff6f6e 100644
--- a/coreapi/Makefile.am
+++ b/coreapi/Makefile.am
@@ -138,7 +138,9 @@ liblinphone_la_LIBADD= \
 		$(LIBSOUP_LIBS) \
 		$(SQLITE3_LIBS) \
 		$(LIBXML2_LIBS) \
-		$(LDAP_LIBS) $(SASL_LIBS)
+		$(LDAP_LIBS) \
+		$(SASL_LIBS) \
+		$(ZLIB_LIBS)
 
 
 if ENABLE_TESTS
@@ -175,7 +177,9 @@ COMMON_CFLAGS=\
 	$(TUNNEL_CFLAGS) \
 	$(SQLITE3_CFLAGS) \
 	$(LIBXML2_CFLAGS) \
-	$(LDAP_CFLAGS) $(SASL_CFLAGS)
+	$(LDAP_CFLAGS) \
+	$(SASL_CFLAGS) \
+	$(ZLIB_CFLAGS)
 
 if BUILD_WIZARD
 COMMON_CFLAGS+= -DBUILD_WIZARD

From 9ff2841b18dae9a6aa47d0b4d89f28354747d5b5 Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Wed, 7 Jan 2015 10:55:19 +0100
Subject: [PATCH 247/496] Use debug trace instead of message

---
 coreapi/misc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/coreapi/misc.c b/coreapi/misc.c
index 50ebe68ee..9aa185cd2 100644
--- a/coreapi/misc.c
+++ b/coreapi/misc.c
@@ -177,7 +177,7 @@ static int lookup_vbr_typical_bitrate(int maxbw, int clock_rate){
 static int get_audio_payload_bandwidth(LinphoneCore *lc, const PayloadType *pt, int maxbw){
 	if (linphone_core_payload_type_is_vbr(lc,pt)){
 		if (pt->flags & PAYLOAD_TYPE_BITRATE_OVERRIDE){
-			ms_message("PayloadType %s/%i has bitrate override",pt->mime_type,pt->clock_rate);
+			ms_debug("PayloadType %s/%i has bitrate override",pt->mime_type,pt->clock_rate);
 			return pt->normal_bitrate/1000;
 		}
 		return lookup_vbr_typical_bitrate(maxbw,pt->clock_rate);

From a79a5ceaa8242bf9436ff6b04c4d4b9fefe9d898 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Wed, 7 Jan 2015 15:24:01 +0100
Subject: [PATCH 248/496] MS2:remove check on HAVE_SRTP_SHUTDOWN

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 1288220ff..182c23b1e 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 1288220ff95f00c88f7925a6e62882679ed9c97f
+Subproject commit 182c23b1e5ec28539da1e7ebaed3a2a3a7649674

From b8f297f6be67c26e60b568109dd89bdc00cb62f0 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Thu, 8 Jan 2015 11:38:39 +0100
Subject: [PATCH 249/496] Change linphone_proxy_ocnifg_normalize_number API to
 return a boolean value: TRUE if input was a phone number, FALSE otherwise

Conflicts:
	coreapi/linphonecore.h
---
 coreapi/linphonecore.h | 82 +++++++++++++++++++++++-------------------
 coreapi/private.h      |  2 +-
 coreapi/proxy.c        | 13 +++----
 3 files changed, 53 insertions(+), 44 deletions(-)

diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h
index 2036ce0b0..225b05209 100644
--- a/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@ -962,7 +962,7 @@ LINPHONE_PUBLIC int linphone_proxy_config_get_quality_reporting_interval(Linphon
 /**
  * Get the registration state of the given proxy config.
  * @param[in] obj #LinphoneProxyConfig object.
- * @returns The registration state of the proxy config.
+ * @return The registration state of the proxy config.
 **/
 LINPHONE_PUBLIC	LinphoneRegistrationState linphone_proxy_config_get_state(const LinphoneProxyConfig *obj);
 
@@ -971,21 +971,21 @@ LINPHONE_PUBLIC	bool_t linphone_proxy_config_is_registered(const LinphoneProxyCo
 /**
  * Get the domain name of the given proxy config.
  * @param[in] cfg #LinphoneProxyConfig object.
- * @returns The domain name of the proxy config.
+ * @return The domain name of the proxy config.
 **/
 LINPHONE_PUBLIC	const char *linphone_proxy_config_get_domain(const LinphoneProxyConfig *cfg);
 
 /**
  * Get the realm of the given proxy config.
  * @param[in] cfg #LinphoneProxyConfig object.
- * @returns The realm of the proxy config.
+ * @return The realm of the proxy config.
 **/
 LINPHONE_PUBLIC	const char *linphone_proxy_config_get_realm(const LinphoneProxyConfig *cfg);
 /**
  * Set the realm of the given proxy config.
  * @param[in] cfg #LinphoneProxyConfig object.
  * @param[in] realm New realm value.
- * @returns The realm of the proxy config.
+ * @return The realm of the proxy config.
 **/
 LINPHONE_PUBLIC	void linphone_proxy_config_set_realm(LinphoneProxyConfig *cfg, const char * realm);
 
@@ -1006,7 +1006,7 @@ LINPHONE_PUBLIC const char* linphone_proxy_config_get_contact_uri_parameters(con
 /**
  * Get the #LinphoneCore object to which is associated the #LinphoneProxyConfig.
  * @param[in] obj #LinphoneProxyConfig object.
- * @returns The #LinphoneCore object to which is associated the #LinphoneProxyConfig.
+ * @return The #LinphoneCore object to which is associated the #LinphoneProxyConfig.
 **/
 LINPHONE_PUBLIC LinphoneCore * linphone_proxy_config_get_core(const LinphoneProxyConfig *obj);
 
@@ -1016,21 +1016,21 @@ LINPHONE_PUBLIC	const char * linphone_proxy_config_get_dial_prefix(const Linphon
 /**
  * Get the reason why registration failed when the proxy config state is LinphoneRegistrationFailed.
  * @param[in] cfg #LinphoneProxyConfig object.
- * @returns The reason why registration failed for this proxy config.
+ * @return The reason why registration failed for this proxy config.
 **/
 LINPHONE_PUBLIC LinphoneReason linphone_proxy_config_get_error(const LinphoneProxyConfig *cfg);
 
 /**
  * Get detailed information why registration failed when the proxy config state is LinphoneRegistrationFailed.
  * @param[in] cfg #LinphoneProxyConfig object.
- * @returns The details why registration failed for this proxy config.
+ * @return The details why registration failed for this proxy config.
 **/
 LINPHONE_PUBLIC const LinphoneErrorInfo *linphone_proxy_config_get_error_info(const LinphoneProxyConfig *cfg);
 
 /**
  * Get the transport from either service route, route or addr.
  * @param[in] cfg #LinphoneProxyConfig object.
- * @returns The transport as a string (I.E udp, tcp, tls, dtls)
+ * @return The transport as a string (I.E udp, tcp, tls, dtls)
 **/
 LINPHONE_PUBLIC const char* linphone_proxy_config_get_transport(const LinphoneProxyConfig *cfg);
 
@@ -1041,9 +1041,17 @@ LINPHONE_PUBLIC void linphone_proxy_config_set_sip_setup(LinphoneProxyConfig *cf
 SipSetupContext *linphone_proxy_config_get_sip_setup_context(LinphoneProxyConfig *cfg);
 LINPHONE_PUBLIC SipSetup *linphone_proxy_config_get_sip_setup(LinphoneProxyConfig *cfg);
 /**
- * normalize a human readable phone number into a basic string. 888-444-222 becomes 888444222
+ * Normalize a human readable phone number into a basic string. 888-444-222 becomes 888444222
+ * or +33888444222 depending on the #LinphoneProxyConfig argument. This function will always
+ * generate a normalized username; if input is not a phone number, output will be a copy of input.
+ * @param proxy #LinphoneProxyConfig object containing country code and/or escape symbol.
+ * @param username the string to parse
+ * @param result the newly normalized number
+ * @param result_len the size of the normalized number \a result
+ * @return TRUE if a phone number was recognized, FALSE otherwise.
  */
-LINPHONE_PUBLIC	int linphone_proxy_config_normalize_number(LinphoneProxyConfig *proxy, const char *username, char *result, size_t result_len);
+LINPHONE_PUBLIC	bool_t linphone_proxy_config_normalize_number(LinphoneProxyConfig *proxy, const char *username,
+																char *result, size_t result_len);
 
 /**
  * Set default privacy policy for all calls routed through this proxy.
@@ -1439,7 +1447,7 @@ LINPHONE_PUBLIC void linphone_chat_room_mark_as_read(LinphoneChatRoom *cr);
 /**
  * Delete a message from the chat room history.
  * @param[in] cr The #LinphoneChatRoom object corresponding to the conversation.
- * @param[in] msg The #LinphoneChatMessage object to remove. 
+ * @param[in] msg The #LinphoneChatMessage object to remove.
  */
 
 LINPHONE_PUBLIC void linphone_chat_room_delete_message(LinphoneChatRoom *cr, LinphoneChatMessage *msg);
@@ -1839,7 +1847,7 @@ typedef struct _LinphoneCoreVTable{
 
 /**
  * Instantiate a vtable with all arguments set to NULL
- * @returns newly allocated vtable
+ * @return newly allocated vtable
  */
 LINPHONE_PUBLIC LinphoneCoreVTable *linphone_core_v_table_new();
 
@@ -1861,7 +1869,7 @@ LINPHONE_PUBLIC void* linphone_core_v_table_get_user_data(LinphoneCoreVTable *ta
  * Gets the current VTable.
  * This is meant only to be called from a callback to be able to get the user_data associated with the vtable that called the callback.
  * @param lc the linphonecore
- * @returns the vtable that called the last callback 
+ * @returns the vtable that called the last callback
  */
 LINPHONE_PUBLIC LinphoneCoreVTable *linphone_core_get_current_vtable(LinphoneCore *lc);
 
@@ -1913,7 +1921,7 @@ typedef enum _LinphoneLogCollectionState {
 /**
  * Tells whether the linphone core log collection is enabled.
  * @ingroup misc
- * @returns The state of the linphone core log collection.
+ * @return The state of the linphone core log collection.
  */
 LINPHONE_PUBLIC LinphoneLogCollectionState linphone_core_log_collection_enabled(void);
 
@@ -1927,7 +1935,7 @@ LINPHONE_PUBLIC void linphone_core_enable_log_collection(LinphoneLogCollectionSt
 /**
  * Get the path where the log files will be written for log collection.
  * @ingroup misc
- * @returns The path where the log files will be written.
+ * @return The path where the log files will be written.
  */
 LINPHONE_PUBLIC const char * linphone_core_get_log_collection_path(void);
 
@@ -1941,7 +1949,7 @@ LINPHONE_PUBLIC void linphone_core_set_log_collection_path(const char *path);
 /**
  * Get the prefix of the filenames that will be used for log collection.
  * @ingroup misc
- * @returns The prefix of the filenames used for log collection.
+ * @return The prefix of the filenames used for log collection.
  */
 LINPHONE_PUBLIC const char * linphone_core_get_log_collection_prefix(void);
 
@@ -1955,7 +1963,7 @@ LINPHONE_PUBLIC void linphone_core_set_log_collection_prefix(const char *prefix)
 /**
  * Get the max file size in bytes of the files used for log collection.
  * @ingroup misc
- * @returns The max file size in bytes of the files used for log collection.
+ * @return The max file size in bytes of the files used for log collection.
  */
 LINPHONE_PUBLIC int linphone_core_get_log_collection_max_file_size(void);
 
@@ -2139,7 +2147,7 @@ LINPHONE_PUBLIC	int linphone_core_terminate_call(LinphoneCore *lc, LinphoneCall
  * @param[in] lc #LinphoneCore object.
  * @param[in] call The #LinphoneCall to redirect.
  * @param[in] redirect_uri The URI to redirect the call to.
- * @returns 0 if successful, -1 on error.
+ * @return 0 if successful, -1 on error.
  * @ingroup call_control
  */
 LINPHONE_PUBLIC int linphone_core_redirect_call(LinphoneCore *lc, LinphoneCall *call, const char *redirect_uri);
@@ -2245,7 +2253,7 @@ LINPHONE_PUBLIC void linphone_core_enable_dns_srv(LinphoneCore *lc, bool_t enabl
 /**
  * Tells whether DNS SRV resolution is enabled.
  * @param[in] lc #LinphoneCore object.
- * @returns TRUE if DNS SRV resolution is enabled, FALSE if disabled.
+ * @return TRUE if DNS SRV resolution is enabled, FALSE if disabled.
  * @ingroup media_parameters
  */
 LINPHONE_PUBLIC bool_t linphone_core_dns_srv_enabled(const LinphoneCore *lc);
@@ -2263,7 +2271,7 @@ LINPHONE_PUBLIC int linphone_core_set_video_codecs(LinphoneCore *lc, MSList *cod
  * Tells whether the specified payload type is enabled.
  * @param[in] lc #LinphoneCore object.
  * @param[in] pt The #LinphonePayloadType we want to know is enabled or not.
- * @returns TRUE if the payload type is enabled, FALSE if disabled.
+ * @return TRUE if the payload type is enabled, FALSE if disabled.
  * @ingroup media_parameters
  */
 LINPHONE_PUBLIC bool_t linphone_core_payload_type_enabled(LinphoneCore *lc, const LinphonePayloadType *pt);
@@ -2272,7 +2280,7 @@ LINPHONE_PUBLIC bool_t linphone_core_payload_type_enabled(LinphoneCore *lc, cons
  * Tells whether the specified payload type represents a variable bitrate codec.
  * @param[in] lc #LinphoneCore object.
  * @param[in] pt The #LinphonePayloadType we want to know
- * @returns TRUE if the payload type represents a VBR codec, FALSE if disabled.
+ * @return TRUE if the payload type represents a VBR codec, FALSE if disabled.
  * @ingroup media_parameters
  */
 LINPHONE_PUBLIC bool_t linphone_core_payload_type_is_vbr(LinphoneCore *lc, const LinphonePayloadType *pt);
@@ -2397,7 +2405,7 @@ LINPHONE_PUBLIC void linphone_core_enable_audio_adaptive_jittcomp(LinphoneCore *
 /**
  * Tells whether the audio adaptive jitter compensation is enabled.
  * @param[in] lc #LinphoneCore object
- * @returns TRUE if the audio adaptive jitter compensation is enabled, FALSE otherwise.
+ * @return TRUE if the audio adaptive jitter compensation is enabled, FALSE otherwise.
  * @ingroup media_parameters
  */
 LINPHONE_PUBLIC bool_t linphone_core_audio_adaptive_jittcomp_enabled(LinphoneCore *lc);
@@ -2417,7 +2425,7 @@ LINPHONE_PUBLIC void linphone_core_enable_video_adaptive_jittcomp(LinphoneCore *
 /**
  * Tells whether the video adaptive jitter compensation is enabled.
  * @param[in] lc #LinphoneCore object
- * @returns TRUE if the video adaptive jitter compensation is enabled, FALSE otherwise.
+ * @return TRUE if the video adaptive jitter compensation is enabled, FALSE otherwise.
  * @ingroup media_parameters
  */
 LINPHONE_PUBLIC bool_t linphone_core_video_adaptive_jittcomp_enabled(LinphoneCore *lc);
@@ -2496,7 +2504,7 @@ LINPHONE_PUBLIC	void linphone_core_set_stun_server(LinphoneCore *lc, const char
 /**
  * Get the STUN server address being used.
  * @param[in] lc #LinphoneCore object
- * @returns The STUN server address being used.
+ * @return The STUN server address being used.
  * @ingroup network_parameters
  */
 LINPHONE_PUBLIC	const char * linphone_core_get_stun_server(const LinphoneCore *lc);
@@ -2541,7 +2549,7 @@ LINPHONE_PUBLIC void linphone_core_set_nat_address(LinphoneCore *lc, const char
 /**
  * Get the public IP address of NAT being used.
  * @param[in] lc #LinphoneCore object.
- * @returns The public IP address of NAT being used.
+ * @return The public IP address of NAT being used.
  * @ingroup network_parameters
  */
 LINPHONE_PUBLIC const char *linphone_core_get_nat_address(const LinphoneCore *lc);
@@ -2557,7 +2565,7 @@ LINPHONE_PUBLIC	void linphone_core_set_firewall_policy(LinphoneCore *lc, Linphon
 /**
  * Get the policy that is used to pass through firewalls.
  * @param[in] lc #LinphoneCore object.
- * @returns The #LinphoneFirewallPolicy that is being used.
+ * @return The #LinphoneFirewallPolicy that is being used.
  * @ingroup network_parameters
  */
 LINPHONE_PUBLIC	LinphoneFirewallPolicy linphone_core_get_firewall_policy(const LinphoneCore *lc);
@@ -2627,7 +2635,7 @@ LINPHONE_PUBLIC	void linphone_core_enable_echo_limiter(LinphoneCore *lc, bool_t
 /**
  * Tells whether echo limiter is enabled.
  * @param[in] lc #LinphoneCore object.
- * @returns TRUE if the echo limiter is enabled, FALSE otherwise.
+ * @return TRUE if the echo limiter is enabled, FALSE otherwise.
  * @ingroup media_parameters
 **/
 LINPHONE_PUBLIC	bool_t linphone_core_echo_limiter_enabled(const LinphoneCore *lc);
@@ -2657,7 +2665,7 @@ LINPHONE_PUBLIC void linphone_core_enable_mic(LinphoneCore *lc, bool_t enable);
 /**
  * Tells whether the microphone is enabled.
  * @param[in] lc #LinphoneCore object
- * @returns TRUE if the microphone is enabled, FALSE if disabled.
+ * @return TRUE if the microphone is enabled, FALSE if disabled.
  * @ingroup media_parameters
 **/
 LINPHONE_PUBLIC bool_t linphone_core_mic_enabled(LinphoneCore *lc);
@@ -2694,7 +2702,7 @@ LINPHONE_PUBLIC void linphone_core_clear_call_logs(LinphoneCore *lc);
  * Get the number of missed calls.
  * Once checked, this counter can be reset with linphone_core_reset_missed_calls_count().
  * @param[in] lc #LinphoneCore object.
- * @returns The number of missed calls.
+ * @return The number of missed calls.
 **/
 LINPHONE_PUBLIC int linphone_core_get_missed_calls_count(LinphoneCore *lc);
 
@@ -2785,7 +2793,7 @@ LINPHONE_PUBLIC void linphone_core_enable_video_source_reuse(LinphoneCore* lc, b
 /**
  * Tells whether video capture is enabled.
  * @param[in] lc #LinphoneCore object.
- * @returns TRUE if video capture is enabled, FALSE if disabled.
+ * @return TRUE if video capture is enabled, FALSE if disabled.
  * @ingroup media_parameters
 **/
 LINPHONE_PUBLIC bool_t linphone_core_video_capture_enabled(LinphoneCore *lc);
@@ -2793,7 +2801,7 @@ LINPHONE_PUBLIC bool_t linphone_core_video_capture_enabled(LinphoneCore *lc);
 /**
  * Tells whether video display is enabled.
  * @param[in] lc #LinphoneCore object.
- * @returns TRUE if video display is enabled, FALSE if disabled.
+ * @return TRUE if video display is enabled, FALSE if disabled.
  * @ingroup media_parameters
 **/
 LINPHONE_PUBLIC bool_t linphone_core_video_display_enabled(LinphoneCore *lc);
@@ -2817,7 +2825,7 @@ LINPHONE_PUBLIC MSVideoSize linphone_core_get_preferred_video_size(const Linphon
 /**
  * Get the name of the current preferred video size for sending.
  * @param[in] lc #LinphoneCore object.
- * @returns A string containing the name of the current preferred video size (to be freed with ms_free()).
+ * @return A string containing the name of the current preferred video size (to be freed with ms_free()).
  */
 LINPHONE_PUBLIC char * linphone_core_get_preferred_video_size_name(const LinphoneCore *lc);
 LINPHONE_PUBLIC void linphone_core_set_preferred_video_size_by_name(LinphoneCore *lc, const char *name);
@@ -2857,7 +2865,7 @@ LINPHONE_PUBLIC int linphone_core_set_static_picture(LinphoneCore *lc, const cha
 /**
  * Get the path to the image file streamed when "Static picture" is set as the video device.
  * @param[in] lc #LinphoneCore object.
- * @returns The path to the image file streamed when "Static picture" is set as the video device.
+ * @return The path to the image file streamed when "Static picture" is set as the video device.
  * @ingroup media_parameters
  */
 LINPHONE_PUBLIC const char *linphone_core_get_static_picture(LinphoneCore *lc);
@@ -3014,7 +3022,7 @@ LINPHONE_PUBLIC void linphone_core_set_zrtp_secrets_file(LinphoneCore *lc, const
 /**
  * Get the path to the file storing the zrtp secrets cache.
  * @param[in] lc #LinphoneCore object.
- * @returns The path to the file storing the zrtp secrets cache.
+ * @return The path to the file storing the zrtp secrets cache.
  * @ingroup initializing
  */
 LINPHONE_PUBLIC const char *linphone_core_get_zrtp_secrets_file(LinphoneCore *lc);
@@ -3063,7 +3071,7 @@ LINPHONE_PUBLIC	bool_t linphone_core_media_encryption_supported(const LinphoneCo
  * Choose the media encryption policy to be used for RTP packets.
  * @param[in] lc #LinphoneCore object.
  * @param[in] menc The media encryption policy to be used.
- * @returns 0 if successful, any other value otherwise.
+ * @return 0 if successful, any other value otherwise.
  * @ingroup media_parameters
  */
 LINPHONE_PUBLIC	int linphone_core_set_media_encryption(LinphoneCore *lc, LinphoneMediaEncryption menc);
@@ -3071,7 +3079,7 @@ LINPHONE_PUBLIC	int linphone_core_set_media_encryption(LinphoneCore *lc, Linphon
 /**
  * Get the media encryption policy being used for RTP packets.
  * @param[in] lc #LinphoneCore object.
- * @returns The media encryption policy being used.
+ * @return The media encryption policy being used.
  * @ingroup media_parameters
  */
 LINPHONE_PUBLIC	LinphoneMediaEncryption linphone_core_get_media_encryption(LinphoneCore *lc);
@@ -3079,7 +3087,7 @@ LINPHONE_PUBLIC	LinphoneMediaEncryption linphone_core_get_media_encryption(Linph
 /**
  * Get behaviour when encryption parameters negociation fails on outgoing call.
  * @param[in] lc #LinphoneCore object.
- * @returns TRUE means the call will fail; FALSE means an INVITE will be resent with encryption disabled.
+ * @return TRUE means the call will fail; FALSE means an INVITE will be resent with encryption disabled.
  * @ingroup media_parameters
  */
 LINPHONE_PUBLIC	bool_t linphone_core_is_media_encryption_mandatory(LinphoneCore *lc);
diff --git a/coreapi/private.h b/coreapi/private.h
index fb84eab14..55f1f1034 100644
--- a/coreapi/private.h
+++ b/coreapi/private.h
@@ -409,7 +409,7 @@ void linphone_core_get_local_ip(LinphoneCore *lc, int af, const char *dest, char
 LinphoneProxyConfig *linphone_proxy_config_new_from_config_file(LinphoneCore *lc, int index);
 void linphone_proxy_config_write_to_config_file(struct _LpConfig* config,LinphoneProxyConfig *obj, int index);
 
-int linphone_proxy_config_normalize_number(LinphoneProxyConfig *cfg, const char *username, char *result, size_t result_len);
+bool_t linphone_proxy_config_normalize_number(LinphoneProxyConfig *cfg, const char *username, char *result, size_t result_len);
 
 void linphone_core_message_received(LinphoneCore *lc, SalOp *op, const SalMessage *msg);
 void linphone_core_is_composing_received(LinphoneCore *lc, SalOp *op, const SalIsComposing *is_composing);
diff --git a/coreapi/proxy.c b/coreapi/proxy.c
index 807a03db3..1907ad3da 100644
--- a/coreapi/proxy.c
+++ b/coreapi/proxy.c
@@ -927,8 +927,7 @@ static void replace_plus(const char *src, char *dest, size_t destlen, const char
 }
 
 
-int linphone_proxy_config_normalize_number(LinphoneProxyConfig *proxy, const char *username, char *result, size_t result_len){
-	int numlen;
+bool_t linphone_proxy_config_normalize_number(LinphoneProxyConfig *proxy, const char *username, char *result, size_t result_len){
 	if (is_a_phone_number(username)){
 		char *flatten;
 		flatten=flatten_number(username);
@@ -938,7 +937,6 @@ int linphone_proxy_config_normalize_number(LinphoneProxyConfig *proxy, const cha
 			/*no prefix configured, nothing else to do*/
 			strncpy(result,flatten,result_len);
 			ms_free(flatten);
-			return 0;
 		}else{
 			dial_plan_t dialplan;
 			lookup_dial_plan(proxy->dial_prefix,&dialplan);
@@ -949,8 +947,8 @@ int linphone_proxy_config_normalize_number(LinphoneProxyConfig *proxy, const cha
 				/*eventually replace the plus*/
 				replace_plus(flatten,result,result_len,proxy->dial_escape_plus ? dialplan.icp : NULL);
 				ms_free(flatten);
-				return 0;
 			}else{
+				int numlen;
 				int i=0;
 				int skip;
 				numlen=strlen(flatten);
@@ -975,8 +973,11 @@ int linphone_proxy_config_normalize_number(LinphoneProxyConfig *proxy, const cha
 				ms_free(flatten);
 			}
 		}
-	}else strncpy(result,username,result_len);
-	return 0;
+		return TRUE;
+	} else {
+		strncpy(result,username,result_len);
+		return FALSE;
+	}
 }
 
 /**

From a14fa22cf675d8193d90714548b17851accd0102 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Thu, 8 Jan 2015 11:51:07 +0100
Subject: [PATCH 250/496] Add linphone_proxy_config_is_phone_number in public
 API

---
 coreapi/linphonecore.h | 9 +++++++++
 coreapi/proxy.c        | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h
index 225b05209..40b8724eb 100644
--- a/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@ -1040,6 +1040,15 @@ LINPHONE_PUBLIC void linphone_proxy_config_destroy(LinphoneProxyConfig *cfg);
 LINPHONE_PUBLIC void linphone_proxy_config_set_sip_setup(LinphoneProxyConfig *cfg, const char *type);
 SipSetupContext *linphone_proxy_config_get_sip_setup_context(LinphoneProxyConfig *cfg);
 LINPHONE_PUBLIC SipSetup *linphone_proxy_config_get_sip_setup(LinphoneProxyConfig *cfg);
+
+/**
+ * Detect if the given input is a phone number or not.
+ * @param proxy #LinphoneProxyConfig argument, unused yet but may contain useful data. Can be NULL.
+ * @param username string to parse.
+ * @return TRUE if input is a phone number, FALSE otherwise.
+**/
+LINPHONE_PUBLIC bool_t linphone_proxy_config_is_phone_number(LinphoneProxyConfig *proxy, const char *username);
+
 /**
  * Normalize a human readable phone number into a basic string. 888-444-222 becomes 888444222
  * or +33888444222 depending on the #LinphoneProxyConfig argument. This function will always
diff --git a/coreapi/proxy.c b/coreapi/proxy.c
index 1907ad3da..beed88ce3 100644
--- a/coreapi/proxy.c
+++ b/coreapi/proxy.c
@@ -879,7 +879,7 @@ static void lookup_dial_plan(const char *ccc, dial_plan_t *plan){
 	strcpy(plan->ccc,ccc);
 }
 
-static bool_t is_a_phone_number(const char *username){
+bool_t linphone_proxy_config_is_phone_number(LinphoneProxyConfig *proxy, const char *username){
 	const char *p;
 	for(p=username;*p!='\0';++p){
 		if (isdigit(*p) ||
@@ -928,7 +928,7 @@ static void replace_plus(const char *src, char *dest, size_t destlen, const char
 
 
 bool_t linphone_proxy_config_normalize_number(LinphoneProxyConfig *proxy, const char *username, char *result, size_t result_len){
-	if (is_a_phone_number(username)){
+	if (linphone_proxy_config_is_phone_number(proxy, username)){
 		char *flatten;
 		flatten=flatten_number(username);
 		ms_debug("Flattened number is '%s'",flatten);

From 5fdf3b82baca844b9706380e732f412536e619db Mon Sep 17 00:00:00 2001
From: Johan Pascal <johan.pascal@belledonne-communications.com>
Date: Thu, 8 Jan 2015 12:56:10 +0100
Subject: [PATCH 251/496] Enable DTLS-SRTP protection on video stream

---
 coreapi/linphonecall.c | 58 ++++++++++++++++++++++++++++++++++--------
 mediastreamer2         |  2 +-
 oRTP                   |  2 +-
 3 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index bc7a8c9ee..2336f6498 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -159,12 +159,12 @@ static void propagate_encryption_changed(LinphoneCall *call){
 		call->current_params->media_encryption=LinphoneMediaEncryptionNone;
 		linphone_core_notify_call_encryption_changed(call->core, call, FALSE, call->auth_token);
 	} else {
-		ms_message("All streams are encrypted key exchanged using %s", call->current_params->media_encryption==LinphoneMediaEncryptionZRTP?"ZRTP":call->current_params->media_encryption==LinphoneMediaEncryptionDTLS?"DTLS":"Unknown mechanism");
 		if (call->auth_token) {/* ZRTP only is using auth_token */
 			call->current_params->media_encryption=LinphoneMediaEncryptionZRTP;
 		} else { /* otherwise it must be DTLS as SDES doesn't go through this function */
 			call->current_params->media_encryption=LinphoneMediaEncryptionDTLS;
 		}
+		ms_message("All streams are encrypted key exchanged using %s", call->current_params->media_encryption==LinphoneMediaEncryptionZRTP?"ZRTP":call->current_params->media_encryption==LinphoneMediaEncryptionDTLS?"DTLS":"Unknown mechanism");
 		linphone_core_notify_call_encryption_changed(call->core, call, TRUE, call->auth_token);
 	}
 }
@@ -1634,7 +1634,7 @@ void linphone_call_init_audio_stream(LinphoneCall *call){
 			MSDtlsSrtpParams params;
 			char *certificate, *key;
 			memset(&params,0,sizeof(MSDtlsSrtpParams));
-			/* TODO : search for a certificate with CNAME=sip uri(retrieved from variable me) or defautl  celui par default linphone-dtls-default-identity */
+			/* TODO : search for a certificate with CNAME=sip uri(retrieved from variable me) or default : linphone-dtls-default-identity */
 			/* This will parse the directory to find a matching fingerprint or generate it if not found */
 			/* returned string must be freed */
 			sal_certificates_chain_parse_directory(&certificate, &key, &call->dtls_certificate_fingerprint, lc->user_certificates_path, "linphone-dtls-default-identity", SAL_CERTIFICATE_RAW_FORMAT_PEM, TRUE, TRUE);
@@ -1650,13 +1650,6 @@ void linphone_call_init_audio_stream(LinphoneCall *call){
 				ms_error("Unable to retrieve or generate DTLS certificate and key - DTLS disabled");
 				/* TODO : check if encryption forced, if yes, stop call */
 			}
-		#if TODO_DTLS_VIDEO_ENCRYPTION //VIDEO_ENABLED
-			if (media_stream_secured((MediaStream *)call->audiostream) && media_stream_get_state((MediaStream *)call->videostream) == MSStreamStarted) {
-				/*audio stream is already encrypted and video stream is active*/
-				memset(&params,0,sizeof(MSDtlsSrtpParams));
-				video_stream_enable_dtls(call->videostream,call->audiostream,&params);
-			}
-		#endif
 		}
 	}else{
 		call->audiostream=audio_stream_new_with_sessions(&call->sessions[0]);
@@ -1742,6 +1735,29 @@ void linphone_call_init_video_stream(LinphoneCall *call){
 			video_stream_set_rtcp_information(call->videostream, cname, rtcp_tool);
 			ms_free(cname);
 			rtp_session_set_symmetric_rtp(call->videostream->ms.sessions.rtp_session,linphone_core_symmetric_rtp_enabled(lc));
+
+			if (call->params->media_encryption==LinphoneMediaEncryptionDTLS) {
+			MSDtlsSrtpParams params;
+			char *certificate, *key;
+			memset(&params,0,sizeof(MSDtlsSrtpParams));
+			/* TODO : search for a certificate with CNAME=sip uri(retrieved from variable me) or default : linphone-dtls-default-identity */
+			/* This will parse the directory to find a matching fingerprint or generate it if not found */
+			/* returned string must be freed */
+			sal_certificates_chain_parse_directory(&certificate, &key, &call->dtls_certificate_fingerprint, lc->user_certificates_path, "linphone-dtls-default-identity", SAL_CERTIFICATE_RAW_FORMAT_PEM, TRUE, TRUE);
+
+			if (key!= NULL && certificate!=NULL) {
+				params.pem_certificate = (char *)certificate;
+				params.pem_pkey = (char *)key;
+				params.role = MSDtlsSrtpRoleUnset; /* default is unset, then check if we have a result SalMediaDescription */
+				video_stream_enable_dtls(call->videostream,&params);
+				ms_free(certificate);
+				ms_free(key);
+			} else {
+				ms_error("Unable to retrieve or generate DTLS certificate and key - DTLS disabled");
+				/* TODO : check if encryption forced, if yes, stop call */
+			}
+		}
+
 		}else{
 			call->videostream=video_stream_new_with_sessions(&call->sessions[1]);
 		}
@@ -2372,7 +2388,7 @@ void linphone_call_start_media_streams(LinphoneCall *call, bool_t all_inputs_mut
 			SalMediaDescription *remote_desc = sal_call_get_remote_media_description(call->op);
 			ms_dtls_srtp_set_peer_fingerprint(call->audiostream->ms.sessions.dtls_context, remote_desc->streams[0].dtls_fingerprint);
 		} else {
-			ms_warning("unable to start DTLS engine, Dtls role in resulting media description is invalid\n");
+			ms_warning("unable to start DTLS engine on audiostream, Dtls role in resulting media description is invalid\n");
 		}
 		if (salRole == SalDtlsRoleIsClient) { /* local endpoint is client */
 			ms_dtls_srtp_set_role(call->audiostream->ms.sessions.dtls_context, MSDtlsSrtpRoleIsClient); /* set the role to client */
@@ -2381,6 +2397,28 @@ void linphone_call_start_media_streams(LinphoneCall *call, bool_t all_inputs_mut
 			ms_dtls_srtp_set_role(call->audiostream->ms.sessions.dtls_context, MSDtlsSrtpRoleIsServer); /* this may complete the server setup */
 			/* no need to start engine, we are waiting for DTLS Client Hello */
 		}
+#ifdef VIDEO_ENABLED
+		salRole = call->resultdesc->streams[1].dtls_role; /* TODO: is streams[1] necessary the videostream in the media description ? */
+		if (salRole==SalDtlsRoleInvalid) { /* it's invalid in streams[0] but check also at session level */
+			salRole = call->resultdesc->dtls_role;
+		}
+
+		if (salRole!=SalDtlsRoleInvalid) { /* if DTLS is available at both end points */
+			/* give the peer certificate fingerprint to dtls context */
+			SalMediaDescription *remote_desc = sal_call_get_remote_media_description(call->op);
+			ms_dtls_srtp_set_peer_fingerprint(call->videostream->ms.sessions.dtls_context, remote_desc->streams[1].dtls_fingerprint);
+		} else {
+			ms_warning("unable to start DTLS engine on videostream, Dtls role in resulting media description is invalid\n");
+		}
+		if (salRole == SalDtlsRoleIsClient) { /* local endpoint is client */
+			ms_dtls_srtp_set_role(call->videostream->ms.sessions.dtls_context, MSDtlsSrtpRoleIsClient); /* set the role to client */
+			ms_dtls_srtp_start(call->videostream->ms.sessions.dtls_context);  /* then start the engine, it will send the DTLS client Hello */
+		} else if (salRole == SalDtlsRoleIsServer) { /* local endpoint is server */
+			ms_dtls_srtp_set_role(call->videostream->ms.sessions.dtls_context, MSDtlsSrtpRoleIsServer); /* this may complete the server setup */
+			/* no need to start engine, we are waiting for DTLS Client Hello */
+		}
+
+#endif
 
 	} else {
 		call->current_params->media_encryption=linphone_call_all_streams_encrypted(call) ?
diff --git a/mediastreamer2 b/mediastreamer2
index bbe9f1f77..712ebd2d8 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit bbe9f1f77ce7ae83de3cd3baabc89775a361c53a
+Subproject commit 712ebd2d8cae8efdf224539a93c3ce81184f0106
diff --git a/oRTP b/oRTP
index dffa5e73c..9eca0967d 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit dffa5e73c4e6228766426efd23ff42130ef6c731
+Subproject commit 9eca0967dd773c364dcfce09ec13138338767872

From 7afeede178dd6be5f675896b246b44af2f9feb99 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Fri, 9 Jan 2015 09:42:14 +0100
Subject: [PATCH 252/496] Do not test MKV intercorrelation on Android, because
 the test lasts 20 minutes which is unacceptable

---
 tester/call_tester.c | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/tester/call_tester.c b/tester/call_tester.c
index c6b13462f..d608e9723 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -1581,7 +1581,7 @@ static void video_call_base(LinphoneCoreManager* pauline,LinphoneCoreManager* ma
 	LinphoneCall* marie_call;
 	LinphoneCall* pauline_call;
 	LinphoneVideoPolicy marie_policy, pauline_policy;
-	
+
 	linphone_core_enable_video_capture(marie->lc, TRUE);
 	linphone_core_enable_video_display(marie->lc, TRUE);
 	linphone_core_enable_video_capture(pauline->lc, TRUE);
@@ -1707,17 +1707,17 @@ static void video_call_with_early_media_no_matching_audio_codecs(void) {
 	LinphoneCoreManager *pauline = linphone_core_manager_new("pauline_rc");
 	LinphoneCall *out_call;
 	LinphoneVideoPolicy vpol={0};
-	
+
 	linphone_core_enable_video_capture(marie->lc, TRUE);
 	linphone_core_enable_video_display(marie->lc, TRUE);
 	linphone_core_enable_video_capture(pauline->lc, TRUE);
 	linphone_core_enable_video_display(pauline->lc, FALSE);
-	
+
 	vpol.automatically_initiate=TRUE;
 	vpol.automatically_accept=TRUE;
 	linphone_core_set_video_policy(pauline->lc,&vpol);
 	linphone_core_set_video_policy(marie->lc,&vpol);
-	
+
 	linphone_core_enable_payload_type(marie->lc, linphone_core_find_payload_type(marie->lc, "PCMU", 8000, 1), FALSE); /* Disable PCMU */
 	linphone_core_enable_payload_type(marie->lc, linphone_core_find_payload_type(marie->lc, "PCMA", 8000, 1), TRUE); /* Enable PCMA */
 
@@ -1733,20 +1733,20 @@ static void video_call_with_early_media_no_matching_audio_codecs(void) {
 	CU_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallOutgoingEarlyMedia, 1));
 	/*audio stream shall not have been requested to start*/
 	CU_ASSERT_PTR_NULL(linphone_core_get_current_call(pauline->lc)->audiostream->soundread);
-	
+
 	CU_ASSERT_TRUE(linphone_call_params_video_enabled(linphone_call_get_current_params(out_call))==TRUE);
 	CU_ASSERT_TRUE(linphone_call_params_video_enabled(linphone_call_get_current_params(linphone_core_get_current_call(pauline->lc)))==TRUE);
-	
+
 	linphone_core_accept_call(pauline->lc, linphone_core_get_current_call(pauline->lc));
-	
+
 	CU_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallStreamsRunning, 1));
 	CU_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallStreamsRunning, 1));
-	
+
 	linphone_core_terminate_call(marie->lc, out_call);
-	
+
 	CU_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallEnd, 1));
 	CU_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallEnd, 1));
-	
+
 	linphone_call_unref(out_call);
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
@@ -2223,12 +2223,17 @@ static void call_with_mkv_file_player(void) {
 	linphone_core_terminate_all_calls(marie->lc);
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,1));
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1));
+#ifdef ANDROID
+	/*inter-correlation process is too much CPU consuming ending in a 20 minutes test on Android...*/
+	remove(recordpath);
+#else
 	CU_ASSERT_TRUE(ms_audio_diff(hellowav,recordpath,&similar,NULL,NULL)==0);
 	CU_ASSERT_TRUE(similar>threshold);
 	CU_ASSERT_TRUE(similar<=1.0);
 	if(similar>threshold && similar<=1.0) {
 		remove(recordpath);
 	}
+#endif
 	ms_free(recordpath);
 
 end:

From 9e6fa8ceb600177dbd64788e41cfeeff64fa3a8a Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Fri, 9 Jan 2015 11:42:05 +0100
Subject: [PATCH 253/496] Doxygen: replace invalid @returns with @return

---
 .../linphone-tester-native.h                  |  2 +-
 coreapi/chat.c                                |  4 +--
 coreapi/conference.c                          | 18 ++++++------
 coreapi/linphonecall.c                        |  2 +-
 coreapi/linphonecore.c                        |  2 +-
 coreapi/linphonecore.h                        |  8 +++---
 coreapi/linphonefriend.h                      | 10 +++----
 coreapi/linphonepresence.h                    | 28 +++++++++----------
 coreapi/misc.c                                |  2 +-
 mediastreamer2                                |  2 +-
 oRTP                                          |  2 +-
 11 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/build/wp8/LibLinphoneTester-native/linphone-tester-native.h b/build/wp8/LibLinphoneTester-native/linphone-tester-native.h
index b46b57af0..1839cc481 100644
--- a/build/wp8/LibLinphoneTester-native/linphone-tester-native.h
+++ b/build/wp8/LibLinphoneTester-native/linphone-tester-native.h
@@ -30,4 +30,4 @@ namespace linphone_tester_native
 		Platform::String^ testName(Platform::String^ suiteName, int testIndex);
 		void run(Platform::String^ suiteName, Platform::String^ caseName, Platform::Boolean verbose);
     };
-}
\ No newline at end of file
+}
diff --git a/coreapi/chat.c b/coreapi/chat.c
index 4bdf5e133..568c6887b 100644
--- a/coreapi/chat.c
+++ b/coreapi/chat.c
@@ -484,7 +484,7 @@ LinphoneChatRoom * linphone_core_create_chat_room(LinphoneCore *lc, const char *
  * Get a chat room whose peer is the supplied address. If it does not exist yet, it will be created.
  * @param lc the linphone core
  * @param addr a linphone address.
- * @returns #LinphoneChatRoom where messaging can take place.
+ * @return #LinphoneChatRoom where messaging can take place.
 **/
 LinphoneChatRoom *linphone_core_get_chat_room(LinphoneCore *lc, const LinphoneAddress *addr){
 	LinphoneChatRoom *ret = _linphone_core_get_chat_room(lc, addr);
@@ -498,7 +498,7 @@ LinphoneChatRoom *linphone_core_get_chat_room(LinphoneCore *lc, const LinphoneAd
  * Get a chat room for messaging from a sip uri like sip:joe@sip.linphone.org. If it does not exist yet, it will be created.
  * @param lc The linphone core
  * @param to The destination address for messages.
- * @returns #LinphoneChatRoom where messaging can take place.
+ * @return #LinphoneChatRoom where messaging can take place.
 **/
 LinphoneChatRoom * linphone_core_get_chat_room_from_uri(LinphoneCore *lc, const char *to) {
 	return _linphone_core_get_or_create_chat_room(lc, to);
diff --git a/coreapi/conference.c b/coreapi/conference.c
index f860c33ad..75f451736 100644
--- a/coreapi/conference.c
+++ b/coreapi/conference.c
@@ -157,7 +157,7 @@ static void add_local_endpoint(LinphoneConference *conf,LinphoneCore *lc){
 /**
  * Returns the sound volume (mic input) of the local participant of the conference.
  * @param lc the linphone core
- * @returns the measured input volume expressed in dbm0.
+ * @return the measured input volume expressed in dbm0.
  **/
 float linphone_core_get_conference_local_input_volume(LinphoneCore *lc){
 	LinphoneConference *conf=&lc->conf_ctx;
@@ -180,7 +180,7 @@ float linphone_core_get_conference_local_input_volume(LinphoneCore *lc){
  * If the local user was actively part of the call (ie not in paused state), then the local user is automatically entered into the conference.
  * If the call was in paused state, then it is automatically resumed when entering into the conference.
  * 
- * @returns 0 if successful, -1 otherwise.
+ * @return 0 if successful, -1 otherwise.
 **/
 int linphone_core_add_to_conference(LinphoneCore *lc, LinphoneCall *call){
 	LinphoneConference *conf=&lc->conf_ctx;
@@ -289,7 +289,7 @@ static int convert_conference_to_call(LinphoneCore *lc){
  * In other words, unless linphone_core_leave_conference() is explicitely called, the last remote participant of a conference is automatically
  * put in a simple call in running state.
  * 
- * @returns 0 if successful, -1 otherwise.
+ * @return 0 if successful, -1 otherwise.
  **/
 int linphone_core_remove_from_conference(LinphoneCore *lc, LinphoneCall *call){
 	int err;
@@ -314,7 +314,7 @@ int linphone_core_remove_from_conference(LinphoneCore *lc, LinphoneCall *call){
 /**
  * Indicates whether the local participant is part of the conference.
  * @param lc the linphone core
- * @returns TRUE if the local participant is in the conference, FALSE otherwise.
+ * @return TRUE if the local participant is in the conference, FALSE otherwise.
 **/
 bool_t linphone_core_is_in_conference(const LinphoneCore *lc){
 	return lc->conf_ctx.local_participant!=NULL;
@@ -324,7 +324,7 @@ bool_t linphone_core_is_in_conference(const LinphoneCore *lc){
  * Moves the local participant out of the conference.
  * @param lc the linphone core
  * When the local participant is out of the conference, the remote participants can continue to talk normally.
- * @returns 0 if successful, -1 otherwise.
+ * @return 0 if successful, -1 otherwise.
 **/
 int linphone_core_leave_conference(LinphoneCore *lc){
 	LinphoneConference *conf=&lc->conf_ctx;
@@ -342,7 +342,7 @@ int linphone_core_leave_conference(LinphoneCore *lc){
  * However, by calling linphone_core_leave_conference() and linphone_core_enter_conference() the application can decide to temporarily
  * move out and in the local participant from the conference.
  * 
- * @returns 0 if successful, -1 otherwise
+ * @return 0 if successful, -1 otherwise
 **/
 int linphone_core_enter_conference(LinphoneCore *lc){
 	LinphoneConference *conf;
@@ -363,7 +363,7 @@ int linphone_core_enter_conference(LinphoneCore *lc){
  * 
  * Merge all established calls (either in LinphoneCallStreamsRunning or LinphoneCallPaused) into a conference.
  * 
- * @returns 0 if successful, -1 otherwise
+ * @return 0 if successful, -1 otherwise
 **/
 int linphone_core_add_all_to_conference(LinphoneCore *lc) {
 	MSList *calls=lc->calls;
@@ -384,7 +384,7 @@ int linphone_core_add_all_to_conference(LinphoneCore *lc) {
  * 
  * All the calls that were merged to the conference are terminated, and the conference resources are destroyed.
  * 
- * @returns 0 if successful, -1 otherwise
+ * @return 0 if successful, -1 otherwise
 **/
 int linphone_core_terminate_conference(LinphoneCore *lc) {
 	MSList *calls=lc->calls;
@@ -408,7 +408,7 @@ int linphone_core_terminate_conference(LinphoneCore *lc) {
  * Typically, after merging two calls into the conference, there is total of 3 participants:
  * the local participant (or local user), and two remote participants that were the destinations of the two previously establised calls.
  * 
- * @returns the number of participants to the conference
+ * @return the number of participants to the conference
 **/
 int linphone_core_get_conference_size(LinphoneCore *lc) {
 	LinphoneConference *conf=&lc->conf_ctx;
diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index e182d625c..498c0accf 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -2511,7 +2511,7 @@ float linphone_call_get_record_volume(LinphoneCall *call){
  * 1-2 = very poor quality <br>
  * 0-1 = can't be worse, mostly unusable <br>
  *
- * @returns The function returns -1 if no quality measurement is available, for example if no
+ * @return The function returns -1 if no quality measurement is available, for example if no
  * active audio stream exist. Otherwise it returns the quality rating.
 **/
 float linphone_call_get_current_quality(LinphoneCall *call){
diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index d74631359..8205d5f09 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -6011,7 +6011,7 @@ void linphone_core_set_rtp_transport_factories(LinphoneCore* lc, LinphoneRtpTran
  *
  * @note Remote RTP statistics is not implemented yet.
  *
- * @returns 0 or -1 if no call is running.
+ * @return 0 or -1 if no call is running.
 **/
 
 int linphone_core_get_current_call_stats(LinphoneCore *lc, rtp_stats_t *local, rtp_stats_t *remote){
diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h
index 40b8724eb..8ff6cb69d 100644
--- a/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@ -729,7 +729,7 @@ LINPHONE_PUBLIC bool_t linphone_call_media_in_progress(LinphoneCall *call);
  * The dtmf is automatically played to the user.
  * @param call The LinphoneCall object
  * @param dtmf The dtmf name specified as a char, such as '0', '#' etc...
- * @returns 0 if successful, -1 on error.
+ * @return 0 if successful, -1 on error.
 **/
 LINPHONE_PUBLIC	int linphone_call_send_dtmf(LinphoneCall *lc,char dtmf);
 
@@ -740,7 +740,7 @@ LINPHONE_PUBLIC	int linphone_call_send_dtmf(LinphoneCall *lc,char dtmf);
  * Sending is canceled if the call state changes to something not LinphoneCallStreamsRunning.
  * @param call The LinphoneCall object
  * @param dtmfs A dtmf sequence such as '123#123123'
- * @returns -2 if there is already a DTMF sequence, -1 if call is not ready, 0 otherwise.
+ * @return -2 if there is already a DTMF sequence, -1 if call is not ready, 0 otherwise.
 **/
 LINPHONE_PUBLIC	int linphone_call_send_dtmfs(LinphoneCall *call,char *dtmfs);
 
@@ -1870,7 +1870,7 @@ LINPHONE_PUBLIC void linphone_core_v_table_set_user_data(LinphoneCoreVTable *tab
 /**
  * Gets a user data pointer in the vtable.
  * @param table the vtable
- * @returns the data attached to the vtable
+ * @return the data attached to the vtable
  */
 LINPHONE_PUBLIC void* linphone_core_v_table_get_user_data(LinphoneCoreVTable *table);
 
@@ -1878,7 +1878,7 @@ LINPHONE_PUBLIC void* linphone_core_v_table_get_user_data(LinphoneCoreVTable *ta
  * Gets the current VTable.
  * This is meant only to be called from a callback to be able to get the user_data associated with the vtable that called the callback.
  * @param lc the linphonecore
- * @returns the vtable that called the last callback
+ * @return the vtable that called the last callback
  */
 LINPHONE_PUBLIC LinphoneCoreVTable *linphone_core_get_current_vtable(LinphoneCore *lc);
 
diff --git a/coreapi/linphonefriend.h b/coreapi/linphonefriend.h
index f64286c0e..d0c18825d 100644
--- a/coreapi/linphonefriend.h
+++ b/coreapi/linphonefriend.h
@@ -261,14 +261,14 @@ LINPHONE_PUBLIC void linphone_friend_set_ref_key(LinphoneFriend *lf, const char
 /**
  * Get the reference key of a friend.
  * @param[in] lf #LinphoneFriend object.
- * @returns The reference key of the friend.
+ * @return The reference key of the friend.
 **/
 LINPHONE_PUBLIC const char *linphone_friend_get_ref_key(const LinphoneFriend *lf);
 
 /**
  * Check that the given friend is in a friend list.
  * @param[in] lf #LinphoneFriend object.
- * @returns TRUE if the friend is in a friend list, FALSE otherwise.
+ * @return TRUE if the friend is in a friend list, FALSE otherwise.
 **/
 LINPHONE_PUBLIC bool_t linphone_friend_in_list(const LinphoneFriend *lf);
 
@@ -372,7 +372,7 @@ LINPHONE_PUBLIC void linphone_core_notify_all_friends(LinphoneCore *lc, Linphone
  * Search a LinphoneFriend by its address.
  * @param[in] lc #LinphoneCore object.
  * @param[in] addr The address to use to search the friend.
- * @returns The #LinphoneFriend object corresponding to the given address.
+ * @return The #LinphoneFriend object corresponding to the given address.
  * @deprecated use linphone_core_find_friend() instead.
  */
 LINPHONE_PUBLIC LinphoneFriend *linphone_core_get_friend_by_address(const LinphoneCore *lc, const char *addr);
@@ -381,7 +381,7 @@ LINPHONE_PUBLIC LinphoneFriend *linphone_core_get_friend_by_address(const Linpho
  * Search a LinphoneFriend by its address.
  * @param[in] lc #LinphoneCore object.
  * @param[in] addr The address to use to search the friend.
- * @returns The #LinphoneFriend object corresponding to the given address.
+ * @return The #LinphoneFriend object corresponding to the given address.
  */
 LINPHONE_PUBLIC LinphoneFriend *linphone_core_find_friend(const LinphoneCore *lc, const LinphoneAddress *addr);
 
@@ -389,7 +389,7 @@ LINPHONE_PUBLIC LinphoneFriend *linphone_core_find_friend(const LinphoneCore *lc
  * Search a LinphoneFriend by its reference key.
  * @param[in] lc #LinphoneCore object.
  * @param[in] key The reference key to use to search the friend.
- * @returns The #LinphoneFriend object corresponding to the given reference key.
+ * @return The #LinphoneFriend object corresponding to the given reference key.
  */
 LINPHONE_PUBLIC LinphoneFriend *linphone_core_get_friend_by_ref_key(const LinphoneCore *lc, const char *key);
 
diff --git a/coreapi/linphonepresence.h b/coreapi/linphonepresence.h
index 014821328..c0168cb8b 100644
--- a/coreapi/linphonepresence.h
+++ b/coreapi/linphonepresence.h
@@ -200,7 +200,7 @@ typedef struct _LinphonePresenceNote LinphonePresenceNote;
  * Creates a presence model specifying an activity.
  * @param[in] activity The activity to set for the created presence model.
  * @param[in] description An additional description of the activity (mainly useful for the 'other' activity). Set it to NULL to not add a description.
- * @returns The created presence model, or NULL if an error occured.
+ * @return The created presence model, or NULL if an error occured.
  * @see linphone_presence_model_new
  * @see linphone_presence_model_new_with_activity_and_note
  *
@@ -214,7 +214,7 @@ LINPHONE_PUBLIC LinphonePresenceModel * linphone_presence_model_new_with_activit
  * @param[in] description An additional description of the activity (mainly useful for the 'other' activity). Set it to NULL to not add a description.
  * @param[in] note An additional note giving additional information about the contact presence.
  * @param[in] lang The language the note is written in. It can be set to NULL in order to not specify the language of the note.
- * @returns The created presence model, or NULL if an error occured.
+ * @return The created presence model, or NULL if an error occured.
  * @see linphone_presence_model_new_with_activity
  * @see linphone_presence_model_new_with_activity_and_note
  *
@@ -344,7 +344,7 @@ LINPHONE_PUBLIC int linphone_presence_model_clear_notes(LinphonePresenceModel *m
 
 /**
  * Creates a default presence model.
- * @returns The created presence model, NULL on error.
+ * @return The created presence model, NULL on error.
  * @see linphone_presence_model_new_with_activity
  * @see linphone_presence_model_new_with_activity_and_note
  *
@@ -422,7 +422,7 @@ LINPHONE_PUBLIC int linphone_presence_model_clear_persons(LinphonePresenceModel
  * @param[in] id The id of the presence service to be created. Can be NULL to generate it automatically.
  * @param[in] basic_status The #LinphonePresenceBasicStatus to set for the #LinphonePresenceService object.
  * @param[in] contact The contact string to set.
- * @returns The created presence service, NULL on error.
+ * @return The created presence service, NULL on error.
  *
  * The created presence service has the basic status 'closed'.
  */
@@ -515,7 +515,7 @@ LINPHONE_PUBLIC int linphone_presence_service_clear_notes(LinphonePresenceServic
 /**
  * Creates a presence person.
  * @param[in] id The id of the presence person to be created. Can be NULL to generate it automatically.
- * @returns The created presence person, NULL on error.
+ * @return The created presence person, NULL on error.
  */
 LINPHONE_PUBLIC LinphonePresencePerson * linphone_presence_person_new(const char *id);
 
@@ -635,7 +635,7 @@ LINPHONE_PUBLIC int linphone_presence_person_clear_activities_notes(LinphonePres
  * Creates a presence activity.
  * @param[in] acttype The #LinphonePresenceActivityType to set for the activity.
  * @param[in] description An additional description of the activity to set for the activity. Can be NULL if no additional description is to be added.
- * @returns The created presence activity, NULL on error.
+ * @return The created presence activity, NULL on error.
  */
 LINPHONE_PUBLIC LinphonePresenceActivity * linphone_presence_activity_new(LinphonePresenceActivityType acttype, const char *description);
 
@@ -687,7 +687,7 @@ LINPHONE_PUBLIC int linphone_presence_activity_set_description(LinphonePresenceA
  * Creates a presence note.
  * @param[in] content The content of the note to be created.
  * @param[in] lang The language of the note to be created. Can be NULL if no language is to be specified for the note.
- * @returns The created presence note, NULL on error.
+ * @return The created presence note, NULL on error.
  */
 LINPHONE_PUBLIC LinphonePresenceNote * linphone_presence_note_new(const char *content, const char *lang);
 
@@ -876,14 +876,14 @@ LINPHONE_PUBLIC void * linphone_presence_note_get_user_data(const LinphonePresen
  * @param[in] lc #LinphoneCore object.
  * @param[in] acttype The #LinphonePresenceActivityType to set for the activity.
  * @param[in] description An additional description of the activity to set for the activity. Can be NULL if no additional description is to be added.
- * @returns The created #LinphonePresenceActivity object.
+ * @return The created #LinphonePresenceActivity object.
  */
 LINPHONE_PUBLIC LinphonePresenceActivity * linphone_core_create_presence_activity(LinphoneCore *lc, LinphonePresenceActivityType acttype, const char *description);
 
 /**
  * Create a default LinphonePresenceModel.
  * @param[in] lc #LinphoneCore object.
- * @returns The created #LinphonePresenceModel object.
+ * @return The created #LinphonePresenceModel object.
  */
 LINPHONE_PUBLIC LinphonePresenceModel * linphone_core_create_presence_model(LinphoneCore *lc);
 
@@ -892,7 +892,7 @@ LINPHONE_PUBLIC LinphonePresenceModel * linphone_core_create_presence_model(Linp
  * @param[in] lc #LinphoneCore object.
  * @param[in] acttype The #LinphonePresenceActivityType to set for the activity of the created model.
  * @param[in] description An additional description of the activity to set for the activity. Can be NULL if no additional description is to be added.
- * @returns The created #LinphonePresenceModel object.
+ * @return The created #LinphonePresenceModel object.
  */
 LINPHONE_PUBLIC LinphonePresenceModel * linphone_core_create_presence_model_with_activity(LinphoneCore *lc, LinphonePresenceActivityType acttype, const char *description);
 
@@ -903,7 +903,7 @@ LINPHONE_PUBLIC LinphonePresenceModel * linphone_core_create_presence_model_with
  * @param[in] description An additional description of the activity to set for the activity. Can be NULL if no additional description is to be added.
  * @param[in] note The content of the note to be added to the created model.
  * @param[in] lang The language of the note to be added to the created model.
- * @returns The created #LinphonePresenceModel object.
+ * @return The created #LinphonePresenceModel object.
  */
 LINPHONE_PUBLIC LinphonePresenceModel * linphone_core_create_presence_model_with_activity_and_note(LinphoneCore *lc, LinphonePresenceActivityType acttype, const char *description, const char *note, const char *lang);
 
@@ -912,7 +912,7 @@ LINPHONE_PUBLIC LinphonePresenceModel * linphone_core_create_presence_model_with
  * @param[in] lc #LinphoneCore object.
  * @param[in] content The content of the note to be created.
  * @param[in] lang The language of the note to be created.
- * @returns The created #LinphonePresenceNote object.
+ * @return The created #LinphonePresenceNote object.
  */
 LINPHONE_PUBLIC LinphonePresenceNote * linphone_core_create_presence_note(LinphoneCore *lc, const char *content, const char *lang);
 
@@ -920,7 +920,7 @@ LINPHONE_PUBLIC LinphonePresenceNote * linphone_core_create_presence_note(Linpho
  * Create a LinphonePresencePerson with the given id.
  * @param[in] lc #LinphoneCore object
  * @param[in] id The id of the person to be created.
- * @returns The created #LinphonePresencePerson object.
+ * @return The created #LinphonePresencePerson object.
  */
 LINPHONE_PUBLIC LinphonePresencePerson * linphone_core_create_presence_person(LinphoneCore *lc, const char *id);
 
@@ -930,7 +930,7 @@ LINPHONE_PUBLIC LinphonePresencePerson * linphone_core_create_presence_person(Li
  * @param[in] id The id of the service to be created.
  * @param[in] basic_status The basic status of the service to be created.
  * @param[in] contact A string containing a contact information corresponding to the service to be created.
- * @returns The created #LinphonePresenceService object.
+ * @return The created #LinphonePresenceService object.
  */
 LINPHONE_PUBLIC LinphonePresenceService * linphone_core_create_presence_service(LinphoneCore *lc, const char *id, LinphonePresenceBasicStatus basic_status, const char *contact);
 
diff --git a/coreapi/misc.c b/coreapi/misc.c
index 9aa185cd2..59244d3de 100644
--- a/coreapi/misc.c
+++ b/coreapi/misc.c
@@ -1449,7 +1449,7 @@ static void linphone_core_migrate_proxy_config(LinphoneCore *lc, LinphoneTranspo
  * Existing proxy configuration are added a transport parameter so that they continue using the unique transport that was set previously.
  * This function must be used just after creating the core, before any call to linphone_core_iterate()
  * @param lc the linphone core
- * @returns 1 if migration was done, 0 if not done because unnecessary or already done, -1 in case of error.
+ * @return 1 if migration was done, 0 if not done because unnecessary or already done, -1 in case of error.
  * @ingroup initializing
 **/
 int linphone_core_migrate_to_multi_transport(LinphoneCore *lc){
diff --git a/mediastreamer2 b/mediastreamer2
index 182c23b1e..0450c04a3 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 182c23b1e5ec28539da1e7ebaed3a2a3a7649674
+Subproject commit 0450c04a38ce2c78430208d90e41dbe23163b950
diff --git a/oRTP b/oRTP
index 54179e2e0..d806b0e0a 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 54179e2e08bc6281e954ce3cd2a7c3a06cac8508
+Subproject commit d806b0e0ae878e70c4c1acb20b7f7116a6e6400b

From 1c59fe2e94351258a72a667c195e7699b10a4fc9 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Fri, 9 Jan 2015 12:04:47 +0100
Subject: [PATCH 254/496] Add option to disable ZLIB

---
 configure.ac | 47 +++++++++++++++++++++++++++++------------------
 1 file changed, 29 insertions(+), 18 deletions(-)

diff --git a/configure.ac b/configure.ac
index 218862508..b774fc448 100644
--- a/configure.ac
+++ b/configure.ac
@@ -272,28 +272,39 @@ if test "$build_upnp" != "false" ; then
 fi
 
 dnl check zlib
-PKG_CHECK_MODULES(ZLIB, [zlib], [found_zlib=yes], [found_zlib=no])
-if test "x$found_zlib" = "xno" ; then
-	AC_CHECK_LIB(z, inflate,
-		[AC_CHECK_HEADER([zlib.h],
-		[AC_COMPILE_IFELSE(
-			[AC_LANG_PROGRAM([[
-			 #include <zlib.h>
-			 #if !defined(ZLIB_VERNUM) || (ZLIB_VERNUM < 0x1230)
-			 // compile error
-			 #endif
-		]],[])],
-		[found_zlib=yes])])])
+AC_ARG_ENABLE(zlib,
+	[AS_HELP_STRING([--disable-zlib], [Disable ZLib support])],
+	[case "${enableval}" in
+		yes)	build_zlib=true ;;
+		no)	build_zlib=false ;;
+		*)	AC_MSG_ERROR(bad value ${enableval} for --disable-zlib) ;;
+	esac],
+	[build_zlib=auto]
+)
+if test "$build_zlib" != "false" ; then
+	PKG_CHECK_MODULES(ZLIB, [zlib], [found_zlib=yes], [found_zlib=no])
 	if test "x$found_zlib" = "xno" ; then
-		AC_MSG_NOTICE([zlib library and headers not found])
+		AC_CHECK_LIB(z, inflate,
+			[AC_CHECK_HEADER([zlib.h],
+			[AC_COMPILE_IFELSE(
+				[AC_LANG_PROGRAM([[
+				 #include <zlib.h>
+				 #if !defined(ZLIB_VERNUM) || (ZLIB_VERNUM < 0x1230)
+				 // compile error
+				 #endif
+			]],[])],
+			[found_zlib=yes])])])
+		if test "x$found_zlib" = "xno" ; then
+			AC_MSG_NOTICE([zlib library and headers not found])
+		else
+			AC_DEFINE( HAVE_ZLIB, 1, [ZLIB support] )
+			ZLIBS_LIBS='-z'
+			AC_SUBST(ZLIB_LIBS)
+		fi
 	else
+		AC_MSG_NOTICE([ZLIB found])
 		AC_DEFINE( HAVE_ZLIB, 1, [ZLIB support] )
-		ZLIBS_LIBS='-z'
-		AC_SUBST(ZLIB_LIBS)
 	fi
-else
-	AC_MSG_NOTICE([ZLIB found])
-	AC_DEFINE( HAVE_ZLIB, 1, [ZLIB support] )
 fi
 
 

From b8ce037ffcccc802e5f6becb79b5fd59e3c7c736 Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Fri, 9 Jan 2015 17:04:17 +0100
Subject: [PATCH 255/496] Add read flag to transfert message

---
 coreapi/chat.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/coreapi/chat.c b/coreapi/chat.c
index 568c6887b..72660e011 100644
--- a/coreapi/chat.c
+++ b/coreapi/chat.c
@@ -1634,6 +1634,7 @@ LinphoneChatMessage* linphone_chat_room_create_file_transfer_message(LinphoneCha
 	msg->callbacks=linphone_chat_message_cbs_new();
 	msg->chat_room=(LinphoneChatRoom*)cr;
 	msg->message = NULL;
+	msg->is_read=TRUE;
 	msg->file_transfer_information = linphone_content_copy(initial_content);
 	msg->dir=LinphoneChatMessageOutgoing;
 	linphone_chat_message_set_to(msg, linphone_chat_room_get_peer_address(cr));

From c0870da1e7e360dadc511bc404f7f5a24f56e4f8 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Mon, 12 Jan 2015 11:41:53 +0100
Subject: [PATCH 256/496] Fix logcollection suite in case of ZLIB enabled

---
 .gitignore                     |  1 +
 tester/log_collection_tester.c | 36 +++++++++++++++++++++++++++++++---
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2bbd7b4c4..0a2707182 100644
--- a/.gitignore
+++ b/.gitignore
@@ -81,3 +81,4 @@ tester/linphone_log.txt
 .tx/linphone-gtk.linphonedesktopin/
 po/linphone.pot
 .tx/linphone-gtk.audio-assistantdesktopin/
+tester/linphone_log.gz.txt
diff --git a/tester/log_collection_tester.c b/tester/log_collection_tester.c
index c7b43beb7..66af7720e 100644
--- a/tester/log_collection_tester.c
+++ b/tester/log_collection_tester.c
@@ -27,6 +27,10 @@
 #include "private.h"
 #include "liblinphone_tester.h"
 
+#ifdef HAVE_ZLIB
+#include <zlib.h>
+#endif
+
 
 /*getline is not available on android...*/
 #ifdef ANDROID
@@ -100,23 +104,50 @@ LinphoneCoreManager* setup(bool_t enable_logs)  {
 	return marie;
 }
 
+#if HAVE_ZLIB
+/*returns uncompressed log file*/
+FILE* gzuncompress(const char* filepath) {
+		gzFile file = gzopen(filepath, "rb");
+		FILE *output = NULL;
+		char *newname = ms_strdup_printf("%s.txt", filepath);
+		char buffer[512];
+		output = fopen(newname, "w+");
+		while (gzread(file, buffer, 511) > 0) {
+			fprintf(output, buffer, strlen(buffer));
+		}
+
+		gzclose(file);
+		ms_free(newname);
+
+		fseek(output, 0, SEEK_SET);
+		return (FILE*)output;
+}
+#endif
+
 time_t check_file(LinphoneCoreManager* mgr)  {
 
 	time_t last_log = ms_time(NULL);
 	char*    filepath = linphone_core_compress_log_collection(mgr->lc);
 	time_t  time_curr = -1;
 	uint32_t timediff = 0;
+	FILE *file = NULL;
 
-	CU_ASSERT_PTR_NOT_NULL(filepath);	
+	CU_ASSERT_PTR_NOT_NULL(filepath);
 
 	if (filepath != NULL) {
 		int line_count = 0;
-		FILE *file = fopen(filepath, "r");
 		char *line = NULL;
 		size_t line_size = 256;
 		struct tm tm_curr;
 		time_t time_prev = -1;
 
+#if HAVE_ZLIB
+		// 0) if zlib is enabled, we must decompress the file first
+		file = gzuncompress(filepath);
+#else
+		file = fopen(filepath, "r");
+#endif
+
 		// 1) expect to find folder name in filename path
 		CU_ASSERT_PTR_NOT_NULL(strstr(filepath, liblinphone_tester_writable_dir_prefix));
 
@@ -124,7 +155,6 @@ time_t check_file(LinphoneCoreManager* mgr)  {
 		while (getline(&line, &line_size, file) != -1) {
 			// a) there should be at least 25 lines
 			++line_count;
-
 			// b) logs should be ordered by date (format: 2014-11-04 15:22:12:606)
 			if (strlen(line) > 24) {
 				char date[24] = {'\0'};

From 54e91b639434450319e0a5292902bf35a0329cda Mon Sep 17 00:00:00 2001
From: Johan Pascal <johan.pascal@belledonne-communications.com>
Date: Mon, 12 Jan 2015 15:35:28 +0100
Subject: [PATCH 257/496] Update srtp to rely on stream sessions structure and
 not complete stream structure

---
 coreapi/linphonecall.c | 49 +++++++++++++++++++++---------------------
 mediastreamer2         |  2 +-
 2 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index 2336f6498..25a258067 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -1737,27 +1737,26 @@ void linphone_call_init_video_stream(LinphoneCall *call){
 			rtp_session_set_symmetric_rtp(call->videostream->ms.sessions.rtp_session,linphone_core_symmetric_rtp_enabled(lc));
 
 			if (call->params->media_encryption==LinphoneMediaEncryptionDTLS) {
-			MSDtlsSrtpParams params;
-			char *certificate, *key;
-			memset(&params,0,sizeof(MSDtlsSrtpParams));
-			/* TODO : search for a certificate with CNAME=sip uri(retrieved from variable me) or default : linphone-dtls-default-identity */
-			/* This will parse the directory to find a matching fingerprint or generate it if not found */
-			/* returned string must be freed */
-			sal_certificates_chain_parse_directory(&certificate, &key, &call->dtls_certificate_fingerprint, lc->user_certificates_path, "linphone-dtls-default-identity", SAL_CERTIFICATE_RAW_FORMAT_PEM, TRUE, TRUE);
+				MSDtlsSrtpParams params;
+				char *certificate, *key;
+				memset(&params,0,sizeof(MSDtlsSrtpParams));
+				/* TODO : search for a certificate with CNAME=sip uri(retrieved from variable me) or default : linphone-dtls-default-identity */
+				/* This will parse the directory to find a matching fingerprint or generate it if not found */
+				/* returned string must be freed */
+				sal_certificates_chain_parse_directory(&certificate, &key, &call->dtls_certificate_fingerprint, lc->user_certificates_path, "linphone-dtls-default-identity", SAL_CERTIFICATE_RAW_FORMAT_PEM, TRUE, TRUE);
 
-			if (key!= NULL && certificate!=NULL) {
-				params.pem_certificate = (char *)certificate;
-				params.pem_pkey = (char *)key;
-				params.role = MSDtlsSrtpRoleUnset; /* default is unset, then check if we have a result SalMediaDescription */
-				video_stream_enable_dtls(call->videostream,&params);
-				ms_free(certificate);
-				ms_free(key);
-			} else {
-				ms_error("Unable to retrieve or generate DTLS certificate and key - DTLS disabled");
-				/* TODO : check if encryption forced, if yes, stop call */
+				if (key!= NULL && certificate!=NULL) {
+					params.pem_certificate = (char *)certificate;
+					params.pem_pkey = (char *)key;
+					params.role = MSDtlsSrtpRoleUnset; /* default is unset, then check if we have a result SalMediaDescription */
+					video_stream_enable_dtls(call->videostream,&params);
+					ms_free(certificate);
+					ms_free(key);
+				} else {
+					ms_error("Unable to retrieve or generate DTLS certificate and key - DTLS disabled");
+					/* TODO : check if encryption forced, if yes, stop call */
+				}
 			}
-		}
-
 		}else{
 			call->videostream=video_stream_new_with_sessions(&call->sessions[1]);
 		}
@@ -2166,8 +2165,8 @@ static void linphone_call_start_audio_stream(LinphoneCall *call, bool_t muted, b
 				crypto_idx = find_crypto_index_from_tag(local_st_desc->crypto, stream->crypto_local_tag);
 
 				if (crypto_idx >= 0) {
-					media_stream_set_srtp_recv_key_b64(&call->audiostream->ms,stream->crypto[0].algo,stream->crypto[0].master_key);
-					media_stream_set_srtp_send_key_b64(&call->audiostream->ms,stream->crypto[0].algo,local_st_desc->crypto[crypto_idx].master_key);
+					media_stream_set_srtp_recv_key_b64(&(call->audiostream->ms.sessions),stream->crypto[0].algo,stream->crypto[0].master_key);
+					media_stream_set_srtp_send_key_b64(&(call->audiostream->ms.sessions),stream->crypto[0].algo,local_st_desc->crypto[crypto_idx].master_key);
 				} else {
 					ms_warning("Failed to find local crypto algo with tag: %d", stream->crypto_local_tag);
 				}
@@ -2285,8 +2284,8 @@ static void linphone_call_start_video_stream(LinphoneCall *call, bool_t all_inpu
 				if (sal_stream_description_has_srtp(vstream) == TRUE) {
 					int crypto_idx = find_crypto_index_from_tag(local_st_desc->crypto, vstream->crypto_local_tag);
 					if (crypto_idx >= 0) {
-						media_stream_set_srtp_recv_key_b64(&call->videostream->ms,vstream->crypto[0].algo,vstream->crypto[0].master_key);
-						media_stream_set_srtp_send_key_b64(&call->videostream->ms,vstream->crypto[0].algo,local_st_desc->crypto[crypto_idx].master_key);
+						media_stream_set_srtp_recv_key_b64(&(call->videostream->ms.sessions),vstream->crypto[0].algo,vstream->crypto[0].master_key);
+						media_stream_set_srtp_send_key_b64(&(call->videostream->ms.sessions),vstream->crypto[0].algo,local_st_desc->crypto[crypto_idx].master_key);
 					}
 				}
 				configure_rtp_session_for_rtcp_xr(lc, call, SalVideo);
@@ -2444,9 +2443,9 @@ static bool_t update_stream_crypto_params(LinphoneCall *call, const SalStreamDes
 	int crypto_idx = find_crypto_index_from_tag(local_st_desc->crypto, new_stream->crypto_local_tag);
 	if (crypto_idx >= 0) {
 		if (call->localdesc_changed & SAL_MEDIA_DESCRIPTION_CRYPTO_KEYS_CHANGED)
-			media_stream_set_srtp_send_key_b64(ms,new_stream->crypto[0].algo,local_st_desc->crypto[crypto_idx].master_key);
+			media_stream_set_srtp_send_key_b64(&(ms->sessions),new_stream->crypto[0].algo,local_st_desc->crypto[crypto_idx].master_key);
 		if (strcmp(old_stream->crypto[0].master_key,new_stream->crypto[0].master_key)!=0){
-			media_stream_set_srtp_recv_key_b64(ms,new_stream->crypto[0].algo,new_stream->crypto[0].master_key);
+			media_stream_set_srtp_recv_key_b64(&(ms->sessions),new_stream->crypto[0].algo,new_stream->crypto[0].master_key);
 		}
 		return TRUE;
 	} else {
diff --git a/mediastreamer2 b/mediastreamer2
index 712ebd2d8..44b25ea43 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 712ebd2d8cae8efdf224539a93c3ce81184f0106
+Subproject commit 44b25ea43a65afc118d9586fca82bd772c41cd76

From b2748f52832a69da46926f6e463526148563f012 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Tue, 13 Jan 2015 11:25:44 +0100
Subject: [PATCH 258/496] Log collection suite: collect_init and
 collect_cleanup should be call between each tests, not at end/start of the
 suite execution...

---
 tester/log_collection_tester.c | 49 +++++++++++++++++-----------------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/tester/log_collection_tester.c b/tester/log_collection_tester.c
index 66af7720e..35eb0cb3e 100644
--- a/tester/log_collection_tester.c
+++ b/tester/log_collection_tester.c
@@ -88,10 +88,24 @@ size_t getline(char **lineptr, size_t *n, FILE *stream) {
 }
 #endif
 
+static LinphoneLogCollectionState old_collection_state;
+void collect_init()  {
+	old_collection_state = linphone_core_log_collection_enabled();
+	linphone_core_set_log_collection_path(liblinphone_tester_writable_dir_prefix);
+}
+
+void collect_cleanup(LinphoneCoreManager *marie)  {
+	linphone_core_manager_destroy(marie);
+
+	linphone_core_enable_log_collection(old_collection_state);
+	linphone_core_reset_log_collection();
+}
+
 LinphoneCoreManager* setup(bool_t enable_logs)  {
 	LinphoneCoreManager *marie;
 	int timeout = 300;
 
+	collect_init();
 	linphone_core_enable_log_collection(enable_logs);
 
 	marie = linphone_core_manager_new( "marie_rc");
@@ -170,48 +184,35 @@ time_t check_file(LinphoneCoreManager* mgr)  {
 		free(line);
 		fclose(file);
 		ms_free(filepath);
-	}
 
-	timediff = labs((long int)time_curr - (long int)last_log);
+		timediff = labs((long int)time_curr - (long int)last_log);
 
-	CU_ASSERT_TRUE( timediff <= 1 );
-	if( !(timediff <= 1) ){
-		ms_error("time_curr: %ld, last_log: %ld timediff: %d", time_curr, last_log, timediff );
+		CU_ASSERT_TRUE( timediff <= 1 );
+		if( !(timediff <= 1) ){
+			ms_error("time_curr: %ld, last_log: %ld timediff: %d", time_curr, last_log, timediff );
+		}
 	}
 	// return latest time in file
 	return time_curr;
 }
 
-static LinphoneLogCollectionState old_collection_state;
-static int collect_init()  {
-	old_collection_state = linphone_core_log_collection_enabled();
-	linphone_core_set_log_collection_path(liblinphone_tester_writable_dir_prefix);
-	return 0;
-}
-
-static int collect_cleanup()  {
-	linphone_core_enable_log_collection(old_collection_state);
-	linphone_core_reset_log_collection();
-	return 0;
-}
-
 static void collect_files_disabled()  {
 	LinphoneCoreManager* marie = setup(FALSE);
 	CU_ASSERT_PTR_NULL(linphone_core_compress_log_collection(marie->lc));
-	linphone_core_manager_destroy(marie);
+	collect_cleanup(marie);
 }
 
 static void collect_files_filled() {
 	LinphoneCoreManager* marie = setup(TRUE);
 	check_file(marie);
-	linphone_core_manager_destroy(marie);
+	collect_cleanup(marie);
 }
 
 static void collect_files_small_size()  {
 	LinphoneCoreManager* marie = setup(TRUE);
 	linphone_core_set_log_collection_max_file_size(5000);
 	check_file(marie);
-	linphone_core_manager_destroy(marie);
+	collect_cleanup(marie);
 }
 
 static void collect_files_changing_size()  {
@@ -226,7 +227,7 @@ static void collect_files_changing_size()  {
 
 	check_file(marie);
 
-	linphone_core_manager_destroy(marie);
+	collect_cleanup(marie);
 }
 
 test_t log_collection_tests[] = {
@@ -238,8 +239,8 @@ test_t log_collection_tests[] = {
 
 test_suite_t log_collection_test_suite = {
 	"LogCollection",
-	collect_init,
-	collect_cleanup,
+	NULL,
+	NULL,
 	sizeof(log_collection_tests) / sizeof(log_collection_tests[0]),
 	log_collection_tests
 };

From 8164e9434c0d290b97900f4545ae4f7d5e27fb2b Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Tue, 13 Jan 2015 12:10:15 +0100
Subject: [PATCH 259/496] Correctly write in file: do not use fprintf but
 fputs...

---
 tester/log_collection_tester.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tester/log_collection_tester.c b/tester/log_collection_tester.c
index 35eb0cb3e..35cf8d1f2 100644
--- a/tester/log_collection_tester.c
+++ b/tester/log_collection_tester.c
@@ -127,10 +127,11 @@ FILE* gzuncompress(const char* filepath) {
 		char buffer[512];
 		output = fopen(newname, "w+");
 		while (gzread(file, buffer, 511) > 0) {
-			fprintf(output, buffer, strlen(buffer));
+			fputs(buffer, output);
+			memset(buffer, 0, strlen(buffer));
 		}
 
-		gzclose(file);
+		CU_ASSERT_EQUAL(gzclose(file), Z_OK);
 		ms_free(newname);
 
 		fseek(output, 0, SEEK_SET);

From 37e5ccfbc24b9bbc6b1c8c7c4acd5f7eb3ec11ee Mon Sep 17 00:00:00 2001
From: Johan Pascal <johan.pascal@belledonne-communications.com>
Date: Tue, 13 Jan 2015 14:53:18 +0100
Subject: [PATCH 260/496] DTLS-SRTP init linphone console too

---
 console/linphonec.c    |  6 ++++++
 coreapi/linphonecore.c | 13 +++++++------
 mediastreamer2         |  2 +-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/console/linphonec.c b/console/linphonec.c
index 439702b85..d768b4a08 100644
--- a/console/linphonec.c
+++ b/console/linphonec.c
@@ -161,6 +161,7 @@ static int trace_level = 0;
 static char *logfile_name = NULL;
 static char configfile_name[PATH_MAX];
 static char zrtpsecrets[PATH_MAX];
+static char usr_certificates_path[PATH_MAX];
 static const char *factory_configfile_name=NULL;
 static char *sip_addr_to_call = NULL; /* for autocall */
 static int window_id = 0; /* 0=standalone window, or window id for embedding video */
@@ -680,6 +681,8 @@ linphonec_init(int argc, char **argv)
 			getenv("HOME"));
 	snprintf(zrtpsecrets, PATH_MAX, "%s/.linphone-zidcache",
 			getenv("HOME"));
+	snprintf(usr_certificates_path, PATH_MAX, "%s/.linphone-usr-crt",
+			getenv("HOME"));
 #elif defined(_WIN32_WCE)
 	strncpy(configfile_name,PACKAGE_DIR "\\linphonerc",PATH_MAX);
 	mylogfile=fopen(PACKAGE_DIR "\\" "linphonec.log","w");
@@ -689,6 +692,8 @@ linphonec_init(int argc, char **argv)
 			getenv("APPDATA"));
 	snprintf(zrtpsecrets, PATH_MAX, "%s/Linphone/linphone-zidcache",
 			getenv("APPDATA"));
+	snprintf(usr_certificates_path, PATH_MAX, "%s/Linphone/linphone-usr-crt",
+			getenv("APPDATA"));
 #endif
 	/* Handle configuration filename changes */
 	switch (handle_configfile_migration())
@@ -745,6 +750,7 @@ linphonec_init(int argc, char **argv)
 
 	linphone_core_set_user_agent(linphonec,"Linphonec", LINPHONE_VERSION);
 	linphone_core_set_zrtp_secrets_file(linphonec,zrtpsecrets);
+	linphone_core_set_user_certificates_path(linphonec,usr_certificates_path);
 	linphone_core_enable_video_capture(linphonec, vcap_enabled);
 	linphone_core_enable_video_display(linphonec, display_enabled);
 	if (display_enabled && window_id != 0)
diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 057e3be32..c8ba1b332 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -1489,10 +1489,11 @@ static void misc_config_read(LinphoneCore *lc) {
 	}else if (strcmp(uuid,"0")!=0) /*to allow to disable sip.instance*/
 		sal_set_uuid(lc->sal, uuid);
 
-	/* DTLS: if media_encryption is DTLS, get or create the certificate directory */
-	if (linphone_core_get_media_encryption(lc) == LinphoneMediaEncryptionDTLS) {
-		/* TODO*/
-	}
+	/* DTLS: if media_encryption DTLS SRTP is available, get or create the certificate directory */
+	/*if (ms_dtls_srtp_available()){
+		*//*JOHAN: USELESS? REMOVE IT*/
+		//const char *user_certificate_config_path = lp_config_get_string(config,"misc","uuid",);
+//	}*/
 }
 
 static void linphone_core_start(LinphoneCore * lc) {
@@ -6834,7 +6835,7 @@ bool_t linphone_core_media_encryption_supported(const LinphoneCore *lc, Linphone
 		case LinphoneMediaEncryptionSRTP:
 			return ms_srtp_supported();
 		case LinphoneMediaEncryptionDTLS:
-			return ms_dtls_available();
+			return ms_dtls_srtp_available();
 		case LinphoneMediaEncryptionZRTP:
 			return ms_zrtp_available();
 		case LinphoneMediaEncryptionNone:
@@ -6859,7 +6860,7 @@ int linphone_core_set_media_encryption(LinphoneCore *lc, LinphoneMediaEncryption
 			ret=-1;
 		}else type="zrtp";
 	}else if (menc == LinphoneMediaEncryptionDTLS){
-		if (!ms_dtls_available()){
+		if (!ms_dtls_srtp_available()){
 			ms_warning("DTLS not supported by library.");
 			type="none";
 			ret=-1;
diff --git a/mediastreamer2 b/mediastreamer2
index 44b25ea43..c300a5806 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 44b25ea43a65afc118d9586fca82bd772c41cd76
+Subproject commit c300a5806ca1f731fe2899aa39925c20dc825899

From 0c57766f35c7d63e01707302128041832e7b4db4 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Tue, 13 Jan 2015 16:17:07 +0100
Subject: [PATCH 261/496] Add genericName for audio assistant

---
 po/ar.po                         | 16 ++++++++--------
 po/cs.po                         |  4 ++--
 po/de.po                         |  4 ++--
 po/es.po                         |  4 ++--
 po/fr.po                         |  6 +++---
 po/he.po                         |  4 ++--
 po/hu.po                         |  4 ++--
 po/it.po                         |  4 ++--
 po/ja.po                         | 10 +++++-----
 po/nb_NO.po                      |  4 ++--
 po/nl.po                         |  4 ++--
 po/pl.po                         |  4 ++--
 po/pt_BR.po                      |  4 ++--
 po/ru.po                         | 16 ++++++++--------
 po/sr.po                         | 14 +++++++-------
 po/sv.po                         |  4 ++--
 po/zh_CN.po                      |  4 ++--
 po/zh_TW.po                      |  4 ++--
 share/audio-assistant.desktop.in |  3 ++-
 19 files changed, 59 insertions(+), 58 deletions(-)

diff --git a/po/ar.po b/po/ar.po
index f8773b668..c5eaa0244 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -4,14 +4,14 @@
 #
 # Translators:
 # محيي الدين <tx99h4@hotmail.com>, 2014
-# محيي الدين <tx99h4@hotmail.com>, 2014
+# محيي الدين <tx99h4@hotmail.com>, 2014-2015
 msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-06 12:28+0100\n"
-"PO-Revision-Date: 2015-01-06 11:29+0000\n"
-"Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
+"POT-Creation-Date: 2015-01-13 16:18+0100\n"
+"PO-Revision-Date: 2015-01-06 14:11+0000\n"
+"Last-Translator: محيي الدين <tx99h4@hotmail.com>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/ar/)\n"
 "Language: ar\n"
@@ -146,7 +146,7 @@ msgstr "ابدأ مرشد الصوت"
 
 #: ../gtk/main.c:172
 msgid "Run self test and exit 0 if succeed"
-msgstr ""
+msgstr "شغِّل الاختبار الذاتي ثم اخرِجْ 0 إذا نجح"
 
 #: ../gtk/main.c:1083
 #, c-format
@@ -1262,7 +1262,7 @@ msgstr "منفذ SIP/UDP"
 
 #: ../gtk/parameters.ui.h:21
 msgid "Random"
-msgstr ""
+msgstr "عشوائي"
 
 #: ../gtk/parameters.ui.h:22
 msgid "SIP/TCP port"
@@ -1378,7 +1378,7 @@ msgstr "طريقة إخراج الفيديو :"
 
 #: ../gtk/parameters.ui.h:50
 msgid "Show camera preview"
-msgstr ""
+msgstr "اظهر معاينة الكاميرا"
 
 #: ../gtk/parameters.ui.h:51
 msgid "<b>Video</b>"
@@ -1874,7 +1874,7 @@ msgstr ""
 "هوية SIP التي أدخلت غير صحيحة.\n"
 "يجب أن تشبه هذا النمط sip:username@proxydomain، مثلا sip:alice@example.net"
 
-#: ../coreapi/proxy.c:1390
+#: ../coreapi/proxy.c:1391
 #, c-format
 msgid "Could not login as %s"
 msgstr "تعذر الولوج بالهوية %s"
diff --git a/po/cs.po b/po/cs.po
index a4f6b849b..1df2c980c 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-06 12:28+0100\n"
+"POT-Creation-Date: 2015-01-13 16:18+0100\n"
 "PO-Revision-Date: 2015-01-06 11:29+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Czech (http://www.transifex.com/projects/p/linphone-gtk/"
@@ -1845,7 +1845,7 @@ msgstr ""
 "SIP identita, kterou jste zadali, není platná.\n"
 "Měla by mít tvar sip:uživatel@proxydoména, například sip:alice@example.net"
 
-#: ../coreapi/proxy.c:1390
+#: ../coreapi/proxy.c:1391
 #, c-format
 msgid "Could not login as %s"
 msgstr "Nelze se přihlásit jako %s"
diff --git a/po/de.po b/po/de.po
index 613593329..2446bd02c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-06 12:28+0100\n"
+"POT-Creation-Date: 2015-01-13 16:18+0100\n"
 "PO-Revision-Date: 2015-01-06 11:29+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/linphone-gtk/"
@@ -1880,7 +1880,7 @@ msgstr ""
 "Sie sollte wie sip:benutzername@proxydomain aussehen, also z.B. sip:"
 "alice@beispiel.net"
 
-#: ../coreapi/proxy.c:1390
+#: ../coreapi/proxy.c:1391
 #, c-format
 msgid "Could not login as %s"
 msgstr "Anmeldung als %s fehlgeschlagen"
diff --git a/po/es.po b/po/es.po
index 856cad9c6..6a133760e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-06 12:28+0100\n"
+"POT-Creation-Date: 2015-01-13 16:18+0100\n"
 "PO-Revision-Date: 2015-01-06 11:29+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/linphone-gtk/"
@@ -1830,7 +1830,7 @@ msgstr ""
 "Debe ser del tipo sip:username@proxydomain, como por ejemplo sip:"
 "alice@example.net"
 
-#: ../coreapi/proxy.c:1390
+#: ../coreapi/proxy.c:1391
 #, c-format
 msgid "Could not login as %s"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 54a0968b9..23a2060fa 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-06 12:28+0100\n"
-"PO-Revision-Date: 2015-01-06 11:31+0000\n"
+"POT-Creation-Date: 2015-01-13 16:18+0100\n"
+"PO-Revision-Date: 2015-01-06 11:41+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/fr/)\n"
@@ -1878,7 +1878,7 @@ msgstr ""
 "Elle doit être de la forme sip:username@domain, comme par example sip:"
 "alice@example.net"
 
-#: ../coreapi/proxy.c:1390
+#: ../coreapi/proxy.c:1391
 #, c-format
 msgid "Could not login as %s"
 msgstr "Echec de la connexion en tant que %s"
diff --git a/po/he.po b/po/he.po
index 573a9e1a9..4feae78d6 100644
--- a/po/he.po
+++ b/po/he.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-06 12:28+0100\n"
+"POT-Creation-Date: 2015-01-13 16:18+0100\n"
 "PO-Revision-Date: 2015-01-06 11:29+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/linphone-gtk/"
@@ -1841,7 +1841,7 @@ msgstr ""
 "זהות sip שהוזנה הינה שגויה.\n"
 "זו צריכה להיראות כמו sip:username@proxydomain, למשל sip:alice@example.net"
 
-#: ../coreapi/proxy.c:1390
+#: ../coreapi/proxy.c:1391
 #, c-format
 msgid "Could not login as %s"
 msgstr "לא ניתן להתחבר בזהות %s"
diff --git a/po/hu.po b/po/hu.po
index 8d4bef4d7..e9b61953f 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-06 12:28+0100\n"
+"POT-Creation-Date: 2015-01-13 16:18+0100\n"
 "PO-Revision-Date: 2015-01-06 11:29+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Hungarian (http://www.transifex.com/projects/p/linphone-gtk/"
@@ -1843,7 +1843,7 @@ msgstr ""
 "Így kéne kinéznie: sip:felhasznalonev@proxytartomany, például sip:"
 "aladar@pelda.hu"
 
-#: ../coreapi/proxy.c:1390
+#: ../coreapi/proxy.c:1391
 #, c-format
 msgid "Could not login as %s"
 msgstr "Nem sikerült belépni ezzel: %s"
diff --git a/po/it.po b/po/it.po
index 90bd17dca..111737c48 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-06 12:28+0100\n"
+"POT-Creation-Date: 2015-01-13 16:18+0100\n"
 "PO-Revision-Date: 2015-01-06 11:29+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/linphone-gtk/"
@@ -1822,7 +1822,7 @@ msgstr ""
 "L'identità sip utilizza è invalida.\n"
 "Dovrebbre essere sip:username@proxydomain, esempio: sip:alice@example.net"
 
-#: ../coreapi/proxy.c:1390
+#: ../coreapi/proxy.c:1391
 #, c-format
 msgid "Could not login as %s"
 msgstr "impossibile login come %s"
diff --git a/po/ja.po b/po/ja.po
index 3a4494abe..0ebeaa016 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-06 12:28+0100\n"
-"PO-Revision-Date: 2015-01-06 11:29+0000\n"
-"Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
+"POT-Creation-Date: 2015-01-13 16:18+0100\n"
+"PO-Revision-Date: 2015-01-09 16:31+0000\n"
+"Last-Translator: Alexander\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/ja/)\n"
 "Language: ja\n"
@@ -1841,7 +1841,7 @@ msgid ""
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
 msgstr ""
 
-#: ../coreapi/proxy.c:1390
+#: ../coreapi/proxy.c:1391
 #, c-format
 msgid "Could not login as %s"
 msgstr ""
@@ -1999,4 +1999,4 @@ msgstr ""
 #: ../gtk/videowindow.c:66
 #, c-format
 msgid "Cannot play %s."
-msgstr ""
+msgstr "%s が再生出来ません。"
diff --git a/po/nb_NO.po b/po/nb_NO.po
index a17243481..fb7035231 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-06 12:28+0100\n"
+"POT-Creation-Date: 2015-01-13 16:18+0100\n"
 "PO-Revision-Date: 2015-01-06 11:29+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/"
@@ -1829,7 +1829,7 @@ msgstr ""
 "SIP adressen du har angitt er feil. Adressen bør se ut som sip: "
 "brukernavn@domenenavn, f.eks sip:ola@eksempel.no"
 
-#: ../coreapi/proxy.c:1390
+#: ../coreapi/proxy.c:1391
 #, c-format
 msgid "Could not login as %s"
 msgstr "Ikke ikke logge inn som %s"
diff --git a/po/nl.po b/po/nl.po
index 243364c8b..cfda5add0 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-06 12:28+0100\n"
+"POT-Creation-Date: 2015-01-13 16:18+0100\n"
 "PO-Revision-Date: 2015-01-06 11:29+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/linphone-gtk/"
@@ -1812,7 +1812,7 @@ msgid ""
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
 msgstr ""
 
-#: ../coreapi/proxy.c:1390
+#: ../coreapi/proxy.c:1391
 #, c-format
 msgid "Could not login as %s"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index d61587d3f..f83b391c4 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-06 12:28+0100\n"
+"POT-Creation-Date: 2015-01-13 16:18+0100\n"
 "PO-Revision-Date: 2015-01-06 11:29+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/linphone-gtk/"
@@ -1816,7 +1816,7 @@ msgid ""
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
 msgstr ""
 
-#: ../coreapi/proxy.c:1390
+#: ../coreapi/proxy.c:1391
 #, c-format
 msgid "Could not login as %s"
 msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 7fe04b407..8f7a8c319 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-06 12:28+0100\n"
+"POT-Creation-Date: 2015-01-13 16:18+0100\n"
 "PO-Revision-Date: 2015-01-06 11:29+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
@@ -1812,7 +1812,7 @@ msgid ""
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
 msgstr ""
 
-#: ../coreapi/proxy.c:1390
+#: ../coreapi/proxy.c:1391
 #, c-format
 msgid "Could not login as %s"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 6ffa7ef1f..fd7b8f5b9 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -4,7 +4,7 @@
 #
 # Translators:
 # AlexL <loginov.alex.valer@gmail.com>, 2014
-# AlexL <loginov.alex.valer@gmail.com>, 2014
+# AlexL <loginov.alex.valer@gmail.com>, 2014-2015
 # AlexL <loginov.alex.valer@gmail.com>, 2014
 # Maxim Prokopyev <jazzelastic@gmail.com>, 2010
 # Simon Morlat <linphone@free.fr>, 2001
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-06 12:28+0100\n"
-"PO-Revision-Date: 2015-01-06 11:29+0000\n"
-"Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
+"POT-Creation-Date: 2015-01-13 16:18+0100\n"
+"PO-Revision-Date: 2015-01-07 08:31+0000\n"
+"Last-Translator: AlexL <loginov.alex.valer@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/ru/)\n"
 "Language: ru\n"
@@ -146,7 +146,7 @@ msgstr "Запустить помощника аудио"
 
 #: ../gtk/main.c:172
 msgid "Run self test and exit 0 if succeed"
-msgstr ""
+msgstr "Запустить самотест и выйти при успехе со статусом 0"
 
 #: ../gtk/main.c:1083
 #, c-format
@@ -1264,7 +1264,7 @@ msgstr "Порт SIP/UDP"
 
 #: ../gtk/parameters.ui.h:21
 msgid "Random"
-msgstr ""
+msgstr "Случайно"
 
 #: ../gtk/parameters.ui.h:22
 msgid "SIP/TCP port"
@@ -1380,7 +1380,7 @@ msgstr "Метод вывода видео:"
 
 #: ../gtk/parameters.ui.h:50
 msgid "Show camera preview"
-msgstr ""
+msgstr "Показать предпросмотр с камеры"
 
 #: ../gtk/parameters.ui.h:51
 msgid "<b>Video</b>"
@@ -1882,7 +1882,7 @@ msgstr ""
 "Должно выглядеть как sip:имя_пользователя@домен_прокси, как например, sip:"
 "alice@example.net"
 
-#: ../coreapi/proxy.c:1390
+#: ../coreapi/proxy.c:1391
 #, c-format
 msgid "Could not login as %s"
 msgstr "Невозможно зайти как: %s"
diff --git a/po/sr.po b/po/sr.po
index ff2a80f96..ae6f5da59 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-06 12:28+0100\n"
-"PO-Revision-Date: 2015-01-06 11:29+0000\n"
-"Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
+"POT-Creation-Date: 2015-01-13 16:18+0100\n"
+"PO-Revision-Date: 2015-01-07 17:21+0000\n"
+"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/sr/)\n"
 "Language: sr\n"
@@ -140,7 +140,7 @@ msgstr "Покреће помоћника звука"
 
 #: ../gtk/main.c:172
 msgid "Run self test and exit 0 if succeed"
-msgstr ""
+msgstr "Покреће самоиспробавање и излази 0 ако је успешно"
 
 #: ../gtk/main.c:1083
 #, c-format
@@ -1258,7 +1258,7 @@ msgstr "СИП/УДП прикључник"
 
 #: ../gtk/parameters.ui.h:21
 msgid "Random"
-msgstr ""
+msgstr "Насумично"
 
 #: ../gtk/parameters.ui.h:22
 msgid "SIP/TCP port"
@@ -1374,7 +1374,7 @@ msgstr "Начин излаза снимка:"
 
 #: ../gtk/parameters.ui.h:50
 msgid "Show camera preview"
-msgstr ""
+msgstr "Прикажи претпреглед камерице"
 
 #: ../gtk/parameters.ui.h:51
 msgid "<b>Video</b>"
@@ -1873,7 +1873,7 @@ msgstr ""
 "Треба да изгледа као „sip:корисник@домен-посредника, као што је „sip:"
 "alice@example.net“"
 
-#: ../coreapi/proxy.c:1390
+#: ../coreapi/proxy.c:1391
 #, c-format
 msgid "Could not login as %s"
 msgstr "Не могу да се пријавим као %s"
diff --git a/po/sv.po b/po/sv.po
index 0127ae3d8..b43407cf6 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-06 12:28+0100\n"
+"POT-Creation-Date: 2015-01-13 16:18+0100\n"
 "PO-Revision-Date: 2015-01-06 11:29+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/linphone-gtk/"
@@ -1825,7 +1825,7 @@ msgstr ""
 "SIP adressen som du matade in är inte rätt. Adressen borde se ut som sip:"
 "namn@domän, såsom sip:peter@exempel.se"
 
-#: ../coreapi/proxy.c:1390
+#: ../coreapi/proxy.c:1391
 #, c-format
 msgid "Could not login as %s"
 msgstr "Kunde inte logga in som %s"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index fcafc6c1b..44b01c13b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-06 12:28+0100\n"
+"POT-Creation-Date: 2015-01-13 16:18+0100\n"
 "PO-Revision-Date: 2015-01-06 11:29+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/linphone-"
@@ -1818,7 +1818,7 @@ msgstr ""
 "您输入的地址无效。\n"
 "它应具有“sip:用户名@代理域”的形式，例如 sip:alice@example.net"
 
-#: ../coreapi/proxy.c:1390
+#: ../coreapi/proxy.c:1391
 #, c-format
 msgid "Could not login as %s"
 msgstr "无法登录为 %s"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index f1de4bbc7..cf24e3fc7 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-06 12:28+0100\n"
+"POT-Creation-Date: 2015-01-13 16:18+0100\n"
 "PO-Revision-Date: 2015-01-06 11:29+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/"
@@ -1820,7 +1820,7 @@ msgstr ""
 "您輸入的 sip 身分是無效的。\n"
 "它應該看起來像 sip:使用者名稱@代理網域，像是 sip:alice@example.net"
 
-#: ../coreapi/proxy.c:1390
+#: ../coreapi/proxy.c:1391
 #, c-format
 msgid "Could not login as %s"
 msgstr "無法以 %s 登入"
diff --git a/share/audio-assistant.desktop.in b/share/audio-assistant.desktop.in
index dc0734bc6..72c871521 100644
--- a/share/audio-assistant.desktop.in
+++ b/share/audio-assistant.desktop.in
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Audio assistant
+GenericName=Audio assistant
 Name[ru]=Помощник аудио
 Comment=Linphone audio assistant
 Comment[fr]=Assistant audio de Linphone.
@@ -8,4 +9,4 @@ Type=Application
 Exec=linphone --run-audio-assistant
 Icon=@prefix@/share/pixmaps/linphone/linphone.png
 Terminal=false
-Categories=Network;Telephony;
\ No newline at end of file
+Categories=Network;Telephony;

From fbcb1007f2d0cd97c6876136320a41d856c1748c Mon Sep 17 00:00:00 2001
From: Johan Pascal <johan.pascal@belledonne-communications.com>
Date: Wed, 14 Jan 2015 00:06:19 +0100
Subject: [PATCH 262/496] DTLS-SRTP add simple test call

---
 mediastreamer2       |  2 +-
 tester/call_tester.c | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/mediastreamer2 b/mediastreamer2
index c300a5806..2f03f8b38 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit c300a5806ca1f731fe2899aa39925c20dc825899
+Subproject commit 2f03f8b386bf20ff27a1ecfad916a65ae5653a82
diff --git a/tester/call_tester.c b/tester/call_tester.c
index e8c96dc39..9826040cd 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -106,6 +106,7 @@ void linphone_call_encryption_changed(LinphoneCore *lc, LinphoneCall *call, bool
 	else
 		counters->number_of_LinphoneCallEncryptedOff++;
 }
+
 void linphone_transfer_state_changed(LinphoneCore *lc, LinphoneCall *transfered, LinphoneCallState new_call_state) {
 	char* to=linphone_address_as_string(linphone_call_get_call_log(transfered)->to);
 	char* from=linphone_address_as_string(linphone_call_get_call_log(transfered)->from);
@@ -267,10 +268,10 @@ bool_t call_with_params2(LinphoneCoreManager* caller_mgr
 
 	if (linphone_core_get_media_encryption(caller_mgr->lc) != LinphoneMediaEncryptionNone
 		&& linphone_core_get_media_encryption(callee_mgr->lc) != LinphoneMediaEncryptionNone) {
-		/*wait for encryption to be on, in case of zrtp, it can take a few seconds*/
-		if (linphone_core_get_media_encryption(caller_mgr->lc) == LinphoneMediaEncryptionZRTP)
+		/*wait for encryption to be on, in case of zrtp or dtls, it can take a few seconds*/
+		if ((linphone_core_get_media_encryption(caller_mgr->lc) == LinphoneMediaEncryptionZRTP) || (linphone_core_get_media_encryption(caller_mgr->lc) == LinphoneMediaEncryptionDTLS))
 			wait_for(callee_mgr->lc,caller_mgr->lc,&caller_mgr->stat.number_of_LinphoneCallEncryptedOn,initial_caller.number_of_LinphoneCallEncryptedOn+1);
-		if (linphone_core_get_media_encryption(callee_mgr->lc) == LinphoneMediaEncryptionZRTP)
+		if ((linphone_core_get_media_encryption(callee_mgr->lc) == LinphoneMediaEncryptionZRTP) || (linphone_core_get_media_encryption(callee_mgr->lc) == LinphoneMediaEncryptionDTLS))
 			wait_for(callee_mgr->lc,caller_mgr->lc,&callee_mgr->stat.number_of_LinphoneCallEncryptedOn,initial_callee.number_of_LinphoneCallEncryptedOn+1);
 		{
 		const LinphoneCallParams* call_param = linphone_call_get_current_params(linphone_core_get_current_call(callee_mgr->lc));
@@ -2092,6 +2093,10 @@ static void zrtp_video_call() {
 	call_base(LinphoneMediaEncryptionZRTP,TRUE,FALSE,LinphonePolicyNoFirewall,FALSE);
 }
 
+static void dtls_srtp_call() {
+	call_base(LinphoneMediaEncryptionDTLS,FALSE,FALSE,LinphonePolicyNoFirewall,FALSE);
+}
+
 static void call_with_declined_srtp(void) {
 	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
@@ -2237,7 +2242,6 @@ end:
 
 }
 
-
 void call_base(LinphoneMediaEncryption mode, bool_t enable_video,bool_t enable_relay,LinphoneFirewallPolicy policy,bool_t enable_tunnel) {
 	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
@@ -2266,6 +2270,10 @@ void call_base(LinphoneMediaEncryption mode, bool_t enable_video,bool_t enable_r
 	if (linphone_core_media_encryption_supported(marie->lc,mode)) {
 		linphone_core_set_media_encryption(marie->lc,mode);
 		linphone_core_set_media_encryption(pauline->lc,mode);
+		if (mode==LinphoneMediaEncryptionDTLS) { /* for DTLS we must access certificates or at least have a directory to store them */
+			marie->lc->user_certificates_path = ms_strdup_printf("%s/certificates/marie", liblinphone_tester_file_prefix);
+			pauline->lc->user_certificates_path = ms_strdup_printf("%s/certificates/pauline", liblinphone_tester_file_prefix);
+		}
 
 		linphone_core_set_firewall_policy(marie->lc,policy);
 		linphone_core_set_stun_server(marie->lc,"stun.linphone.org");
@@ -3567,6 +3575,7 @@ test_t call_tests[] = {
 	{ "Call paused resumed from callee", call_paused_resumed_from_callee },
 	{ "SRTP call", srtp_call },
 	{ "ZRTP call",zrtp_call},
+	{ "DTLS SRTP call",dtls_srtp_call},
 	{ "ZRTP video call",zrtp_video_call},
 	{ "SRTP call with declined srtp", call_with_declined_srtp },
 	{ "Call with file player", call_with_file_player},

From 2a9ad45d2723266beb3dceb416697178fabae592 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Wed, 14 Jan 2015 11:26:53 +0100
Subject: [PATCH 263/496] Update localization

---
 po/ar.po | 2 +-
 po/de.po | 2 +-
 po/fr.po | 2 +-
 po/ja.po | 2 +-
 po/ru.po | 2 +-
 po/sr.po | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/po/ar.po b/po/ar.po
index c5eaa0244..c93c03c58 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-01-13 16:18+0100\n"
-"PO-Revision-Date: 2015-01-06 14:11+0000\n"
+"PO-Revision-Date: 2015-01-13 16:34+0000\n"
 "Last-Translator: محيي الدين <tx99h4@hotmail.com>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/ar/)\n"
diff --git a/po/de.po b/po/de.po
index 2446bd02c..229f60c71 100644
--- a/po/de.po
+++ b/po/de.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-01-13 16:18+0100\n"
-"PO-Revision-Date: 2015-01-06 11:29+0000\n"
+"PO-Revision-Date: 2015-01-13 16:34+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/de/)\n"
diff --git a/po/fr.po b/po/fr.po
index 23a2060fa..aff7882d6 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-01-13 16:18+0100\n"
-"PO-Revision-Date: 2015-01-06 11:41+0000\n"
+"PO-Revision-Date: 2015-01-13 16:34+0000\n"
 "Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/fr/)\n"
diff --git a/po/ja.po b/po/ja.po
index 0ebeaa016..e998ee25c 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-01-13 16:18+0100\n"
-"PO-Revision-Date: 2015-01-09 16:31+0000\n"
+"PO-Revision-Date: 2015-01-13 16:34+0000\n"
 "Last-Translator: Alexander\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/ja/)\n"
diff --git a/po/ru.po b/po/ru.po
index fd7b8f5b9..b3e312070 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-01-13 16:18+0100\n"
-"PO-Revision-Date: 2015-01-07 08:31+0000\n"
+"PO-Revision-Date: 2015-01-14 09:11+0000\n"
 "Last-Translator: AlexL <loginov.alex.valer@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/ru/)\n"
diff --git a/po/sr.po b/po/sr.po
index ae6f5da59..56f9e5f19 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-01-13 16:18+0100\n"
-"PO-Revision-Date: 2015-01-07 17:21+0000\n"
+"PO-Revision-Date: 2015-01-13 16:34+0000\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/sr/)\n"

From f2a4cb60d2928f96b5300011aa8398d14c8e22a2 Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Thu, 15 Jan 2015 11:37:20 +0100
Subject: [PATCH 266/496] Fix a crash when an absolute address is passed to
 linphone_core_invite. See bug #2009.

---
 coreapi/bellesip_sal/sal_op_call.c     |  5 +++++
 coreapi/bellesip_sal/sal_op_events.c   |  3 +++
 coreapi/bellesip_sal/sal_op_impl.c     | 23 ++++++++++++++++++++---
 coreapi/bellesip_sal/sal_op_message.c  |  3 +++
 coreapi/bellesip_sal/sal_op_presence.c |  6 ++++--
 coreapi/bellesip_sal/sal_op_publish.c  |  9 +++++++++
 6 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/coreapi/bellesip_sal/sal_op_call.c b/coreapi/bellesip_sal/sal_op_call.c
index 921184cf6..da9871cec 100644
--- a/coreapi/bellesip_sal/sal_op_call.c
+++ b/coreapi/bellesip_sal/sal_op_call.c
@@ -687,6 +687,11 @@ int sal_call(SalOp *op, const char *from, const char *to){
 	ms_message("[%s] calling [%s] on op [%p]", from, to, op);
 	invite=sal_op_build_request(op,"INVITE");
 
+	if( invite == NULL ){
+		/* can happen if the op has an invalid address */
+		return -1;
+	}
+
 	sal_op_fill_invite(op,invite);
 
 	sal_op_call_fill_cbs(op);
diff --git a/coreapi/bellesip_sal/sal_op_events.c b/coreapi/bellesip_sal/sal_op_events.c
index 4409c73a3..d4a24bd9b 100644
--- a/coreapi/bellesip_sal/sal_op_events.c
+++ b/coreapi/bellesip_sal/sal_op_events.c
@@ -198,6 +198,9 @@ int sal_subscribe(SalOp *op, const char *from, const char *to, const char *event
 		sal_op_subscribe_fill_cbs(op);
 		/*???sal_exosip_fix_route(op); make sure to ha ;lr*/
 		req=sal_op_build_request(op,"SUBSCRIBE");
+		if( req == NULL ) {
+			return -1;
+		}
 		if (eventname){
 			if (op->event) belle_sip_object_unref(op->event);
 			op->event=belle_sip_header_create("Event",eventname);
diff --git a/coreapi/bellesip_sal/sal_op_impl.c b/coreapi/bellesip_sal/sal_op_impl.c
index 2e68146a0..451ac0f56 100644
--- a/coreapi/bellesip_sal/sal_op_impl.c
+++ b/coreapi/bellesip_sal/sal_op_impl.c
@@ -150,20 +150,37 @@ belle_sip_request_t* sal_op_build_request(SalOp *op,const char* method) {
 	belle_sip_provider_t* prov=op->base.root->prov;
 	belle_sip_request_t *req;
 	belle_sip_uri_t* req_uri;
+	belle_sip_uri_t* to_uri;
+
+	const SalAddress* to_address;
 	const MSList *elem=sal_op_get_route_addresses(op);
 	char token[10];
 
+	/* check that the op has a correct to address */
+	to_address = sal_op_get_to_address(op);
+	if( to_address == NULL ){
+		ms_error("No To: address, cannot build request");
+		return NULL;
+	}
+	
+	to_uri = belle_sip_header_address_get_uri(BELLE_SIP_HEADER_ADDRESS(to_address));
+	if( to_uri == NULL ){
+		ms_error("To: address is invalid, cannot build request");
+		return NULL;
+	}
+
 	if (strcmp("REGISTER",method)==0 || op->privacy==SalPrivacyNone) {
-		from_header = belle_sip_header_from_create(BELLE_SIP_HEADER_ADDRESS(sal_op_get_from_address(op))
+		from_header = belle_sip_header_from_create(BELLE_SIP_HEADER_ADDRESS(to_address)
 												,belle_sip_random_token(token,sizeof(token)));
 	} else {
 		from_header=belle_sip_header_from_create2("Anonymous <sip:anonymous@anonymous.invalid>",belle_sip_random_token(token,sizeof(token)));
 	}
 	/*make sure to preserve components like headers or port*/
-	req_uri = (belle_sip_uri_t*)belle_sip_object_clone((belle_sip_object_t*)belle_sip_header_address_get_uri(BELLE_SIP_HEADER_ADDRESS(sal_op_get_to_address(op))));
+
+	req_uri = (belle_sip_uri_t*)belle_sip_object_clone((belle_sip_object_t*)to_uri);
 	belle_sip_uri_set_secure(req_uri,sal_op_is_secure(op));
 
-	to_header = belle_sip_header_to_create(BELLE_SIP_HEADER_ADDRESS(sal_op_get_to_address(op)),NULL);
+	to_header = belle_sip_header_to_create(BELLE_SIP_HEADER_ADDRESS(to_address),NULL);
 
 	req=belle_sip_request_create(
 					req_uri,
diff --git a/coreapi/bellesip_sal/sal_op_message.c b/coreapi/bellesip_sal/sal_op_message.c
index 3324cefb7..017845833 100644
--- a/coreapi/bellesip_sal/sal_op_message.c
+++ b/coreapi/bellesip_sal/sal_op_message.c
@@ -172,6 +172,9 @@ int sal_message_send(SalOp *op, const char *from, const char *to, const char* co
 		op->dir=SalOpDirOutgoing;
 
 		req=sal_op_build_request(op,"MESSAGE");
+		if (req == NULL ){
+			return -1;
+		}
 		if (sal_op_get_contact_address(op)){
 			belle_sip_message_add_header(BELLE_SIP_MESSAGE(req),BELLE_SIP_HEADER(sal_op_create_contact(op)));
 		}
diff --git a/coreapi/bellesip_sal/sal_op_presence.c b/coreapi/bellesip_sal/sal_op_presence.c
index 23db49e6f..6de0a0fbf 100644
--- a/coreapi/bellesip_sal/sal_op_presence.c
+++ b/coreapi/bellesip_sal/sal_op_presence.c
@@ -306,8 +306,10 @@ int sal_subscribe_presence(SalOp *op, const char *from, const char *to, int expi
 	belle_sip_parameters_remove_parameter(BELLE_SIP_PARAMETERS(op->base.from_address),"tag");
 	belle_sip_parameters_remove_parameter(BELLE_SIP_PARAMETERS(op->base.to_address),"tag");
 	req=sal_op_build_request(op,"SUBSCRIBE");
-	belle_sip_message_add_header(BELLE_SIP_MESSAGE(req),op->event);
-	belle_sip_message_add_header(BELLE_SIP_MESSAGE(req),BELLE_SIP_HEADER(belle_sip_header_expires_create(expires)));
+	if( req ){
+		belle_sip_message_add_header(BELLE_SIP_MESSAGE(req),op->event);
+		belle_sip_message_add_header(BELLE_SIP_MESSAGE(req),BELLE_SIP_HEADER(belle_sip_header_expires_create(expires)));
+	}
 
 	return sal_op_send_request(op,req);
 }
diff --git a/coreapi/bellesip_sal/sal_op_publish.c b/coreapi/bellesip_sal/sal_op_publish.c
index 2655c58d2..17ef8e8db 100644
--- a/coreapi/bellesip_sal/sal_op_publish.c
+++ b/coreapi/bellesip_sal/sal_op_publish.c
@@ -76,6 +76,11 @@ int sal_publish_presence(SalOp *op, const char *from, const char *to, int expire
 
 		op->type=SalOpPublish;
 		req=sal_op_build_request(op,"PUBLISH");
+		
+		if( req == NULL ){
+			return -1;
+		}
+
 		if (sal_op_get_contact_address(op)){
 			belle_sip_message_add_header(BELLE_SIP_MESSAGE(req),BELLE_SIP_HEADER(sal_op_create_contact(op)));
 		}
@@ -101,6 +106,10 @@ int sal_publish(SalOp *op, const char *from, const char *to, const char *eventna
 
 		sal_op_publish_fill_cbs(op);
 		req=sal_op_build_request(op,"PUBLISH");
+		if( req == NULL ){
+			return -1;
+		}
+
 		if (sal_op_get_contact_address(op)){
 			belle_sip_message_add_header(BELLE_SIP_MESSAGE(req),BELLE_SIP_HEADER(sal_op_create_contact(op)));
 		}

From 0c4e7456d913b3dfb947937c73ce896dcaa27850 Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Thu, 15 Jan 2015 17:19:45 +0100
Subject: [PATCH 267/496] Prevent creating sip addresses which are not valid
 when using them

---
 coreapi/address.c                       |  7 +++++++
 coreapi/bellesip_sal/sal_address_impl.c |  5 +++++
 coreapi/linphonecore.c                  | 17 +++++++++++++----
 coreapi/linphonecore.h                  |  1 +
 include/sal/sal.h                       |  1 +
 5 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/coreapi/address.c b/coreapi/address.c
index 764a8fb24..d9d772337 100644
--- a/coreapi/address.c
+++ b/coreapi/address.c
@@ -159,6 +159,13 @@ bool_t linphone_address_is_secure(const LinphoneAddress *uri){
 	return sal_address_is_secure(uri);
 }
 
+/**
+ * returns true if address is a routable sip address
+ */
+bool_t linphone_address_is_sip(const LinphoneAddress *uri){
+	return sal_address_is_sip(uri);
+}
+
 static bool_t strings_equals(const char *s1, const char *s2){
 	if (s1==NULL && s2==NULL) return TRUE;
 	if (s1!=NULL && s2!=NULL && strcmp(s1,s2)==0) return TRUE;
diff --git a/coreapi/bellesip_sal/sal_address_impl.c b/coreapi/bellesip_sal/sal_address_impl.c
index c4ff234d7..18e7dc84b 100644
--- a/coreapi/bellesip_sal/sal_address_impl.c
+++ b/coreapi/bellesip_sal/sal_address_impl.c
@@ -151,6 +151,11 @@ char *sal_address_as_string(const SalAddress *addr){
 	return ms_strdup(tmp);
 }
 
+bool_t sal_address_is_sip(const SalAddress *addr){
+	belle_sip_header_address_t* header_addr = BELLE_SIP_HEADER_ADDRESS(addr);
+	return belle_sip_header_address_get_uri(header_addr) != NULL;
+}
+
 char *sal_address_as_string_uri_only(const SalAddress *addr){
 	belle_sip_header_address_t* header_addr = BELLE_SIP_HEADER_ADDRESS(addr);
 	belle_sip_uri_t* sip_uri = belle_sip_header_address_get_uri(header_addr);
diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 8205d5f09..ef4133d87 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -2625,6 +2625,15 @@ void linphone_core_iterate(LinphoneCore *lc){
 	}
 }
 
+static LinphoneAddress* _linphone_core_destroy_addr_if_not_sip( LinphoneAddress* addr ){
+	if( linphone_address_is_sip(addr) ) {
+		return addr;
+	} else {
+		linphone_address_destroy(addr);
+		return NULL;
+	}
+}
+
 /**
  * Interpret a call destination as supplied by the user, and returns a fully qualified
  * LinphoneAddress.
@@ -2661,7 +2670,7 @@ LinphoneAddress * linphone_core_interpret_url(LinphoneCore *lc, const char *url)
 		tmpurl=enumres->sip_address[0];
 		uri=linphone_address_new(tmpurl);
 		enum_lookup_res_free(enumres);
-		return uri;
+		return _linphone_core_destroy_addr_if_not_sip(uri);
 	}
 	/* check if we have a "sip:" or a "sips:" */
 	if ( (strstr(url,"sip:")==NULL) && (strstr(url,"sips:")==NULL) ){
@@ -2672,7 +2681,7 @@ LinphoneAddress * linphone_core_interpret_url(LinphoneCore *lc, const char *url)
 			uri=linphone_address_new(tmpurl);
 			ms_free(tmpurl);
 			if (uri){
-				return uri;
+				return _linphone_core_destroy_addr_if_not_sip(uri);
 			}
 		}
 
@@ -2688,12 +2697,12 @@ LinphoneAddress * linphone_core_interpret_url(LinphoneCore *lc, const char *url)
 			linphone_proxy_config_normalize_number(proxy,url,normalized_username,
 									sizeof(normalized_username));
 			linphone_address_set_username(uri,normalized_username);
-			return uri;
+			return _linphone_core_destroy_addr_if_not_sip(uri);
 		}else return NULL;
 	}
 	uri=linphone_address_new(url);
 	if (uri!=NULL){
-		return uri;
+		return _linphone_core_destroy_addr_if_not_sip(uri);
 	}
 
 	return NULL;
diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h
index 8ff6cb69d..c8a259f25 100644
--- a/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@ -397,6 +397,7 @@ LINPHONE_PUBLIC	void linphone_address_set_port(LinphoneAddress *uri, int port);
 /*remove tags, params etc... so that it is displayable to the user*/
 LINPHONE_PUBLIC	void linphone_address_clean(LinphoneAddress *uri);
 LINPHONE_PUBLIC bool_t linphone_address_is_secure(const LinphoneAddress *uri);
+LINPHONE_PUBLIC bool_t linphone_address_is_sip(const LinphoneAddress *uri);
 LINPHONE_PUBLIC LinphoneTransportType linphone_address_get_transport(const LinphoneAddress *uri);
 LINPHONE_PUBLIC void linphone_address_set_transport(LinphoneAddress *uri,LinphoneTransportType type);
 LINPHONE_PUBLIC	char *linphone_address_as_string(const LinphoneAddress *u);
diff --git a/include/sal/sal.h b/include/sal/sal.h
index 040ab9951..39085074f 100644
--- a/include/sal/sal.h
+++ b/include/sal/sal.h
@@ -110,6 +110,7 @@ void sal_address_set_transport_name(SalAddress* addr,const char* transport);
 void sal_address_set_params(SalAddress *addr, const char *params);
 void sal_address_set_uri_params(SalAddress *addr, const char *params);
 bool_t sal_address_is_ipv6(SalAddress *addr);
+bool_t sal_address_is_sip(const SalAddress *addr);
 void sal_address_set_password(SalAddress *addr, const char *passwd);
 const char *sal_address_get_password(const SalAddress *addr);
 void sal_address_set_header(SalAddress *addr, const char *header_name, const char *header_value);

From 838520350c0a96d5730d745db06e5cc886a61c25 Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Thu, 15 Jan 2015 17:19:58 +0100
Subject: [PATCH 268/496] Use const for sal_address_is_ipv6()

---
 coreapi/bellesip_sal/sal_address_impl.c | 2 +-
 include/sal/sal.h                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/coreapi/bellesip_sal/sal_address_impl.c b/coreapi/bellesip_sal/sal_address_impl.c
index 18e7dc84b..034135f72 100644
--- a/coreapi/bellesip_sal/sal_address_impl.c
+++ b/coreapi/bellesip_sal/sal_address_impl.c
@@ -215,7 +215,7 @@ void sal_address_unref(SalAddress *addr){
 	belle_sip_object_unref(BELLE_SIP_HEADER_ADDRESS(addr));
 }
 
-bool_t sal_address_is_ipv6(SalAddress *addr){
+bool_t sal_address_is_ipv6(const SalAddress *addr){
 	belle_sip_header_address_t* header_addr = BELLE_SIP_HEADER_ADDRESS(addr);
 	belle_sip_uri_t* uri = belle_sip_header_address_get_uri(header_addr);
 	if (uri){
diff --git a/include/sal/sal.h b/include/sal/sal.h
index 39085074f..c44317c88 100644
--- a/include/sal/sal.h
+++ b/include/sal/sal.h
@@ -109,7 +109,7 @@ void sal_address_set_transport(SalAddress* addr,SalTransport transport);
 void sal_address_set_transport_name(SalAddress* addr,const char* transport);
 void sal_address_set_params(SalAddress *addr, const char *params);
 void sal_address_set_uri_params(SalAddress *addr, const char *params);
-bool_t sal_address_is_ipv6(SalAddress *addr);
+bool_t sal_address_is_ipv6(const SalAddress *addr);
 bool_t sal_address_is_sip(const SalAddress *addr);
 void sal_address_set_password(SalAddress *addr, const char *passwd);
 const char *sal_address_get_password(const SalAddress *addr);

From 546b953c5dc7bf9635998fa3c2ad71ce06325b83 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Thu, 15 Jan 2015 21:34:14 +0100
Subject: [PATCH 269/496] fix severe bug (everything broken)

---
 coreapi/bellesip_sal/sal_op_impl.c | 4 ++--
 oRTP                               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/coreapi/bellesip_sal/sal_op_impl.c b/coreapi/bellesip_sal/sal_op_impl.c
index 451ac0f56..f9647f7ad 100644
--- a/coreapi/bellesip_sal/sal_op_impl.c
+++ b/coreapi/bellesip_sal/sal_op_impl.c
@@ -170,8 +170,8 @@ belle_sip_request_t* sal_op_build_request(SalOp *op,const char* method) {
 	}
 
 	if (strcmp("REGISTER",method)==0 || op->privacy==SalPrivacyNone) {
-		from_header = belle_sip_header_from_create(BELLE_SIP_HEADER_ADDRESS(to_address)
-												,belle_sip_random_token(token,sizeof(token)));
+		from_header = belle_sip_header_from_create(BELLE_SIP_HEADER_ADDRESS(sal_op_get_from_address(op))
+						,belle_sip_random_token(token,sizeof(token)));
 	} else {
 		from_header=belle_sip_header_from_create2("Anonymous <sip:anonymous@anonymous.invalid>",belle_sip_random_token(token,sizeof(token)));
 	}
diff --git a/oRTP b/oRTP
index d806b0e0a..0ad89f5e1 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit d806b0e0ae878e70c4c1acb20b7f7116a6e6400b
+Subproject commit 0ad89f5e106d9f9a4a1d0608101d26b9a10be8b7

From 23f950a73fe9bacd00e934fddfe40cd7acf970a9 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Thu, 15 Jan 2015 22:18:56 +0100
Subject: [PATCH 270/496] update ms2

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 0450c04a3..85c710a5b 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 0450c04a38ce2c78430208d90e41dbe23163b950
+Subproject commit 85c710a5b69def49bb53c88a367e957d19ec5105

From a5d51cb821b1dd34cdfa251665c15b1a26b37cc3 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Fri, 16 Jan 2015 09:16:40 +0100
Subject: [PATCH 271/496] Update Mac README a bit for bundle

---
 README.macos.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/README.macos.md b/README.macos.md
index 381efcf2f..b3768eea9 100644
--- a/README.macos.md
+++ b/README.macos.md
@@ -53,7 +53,7 @@ Install `GTK`. It is recommended to use the `quartz` backend for better integrat
 
 	brew install cairo --without-x11
         brew install gtk+ --without-x11
-        brew install gettext gtk-mac-integration libsoup
+        brew install gettext gtk-mac-integration libsoup hicolor-icon-theme
         #readline is required from linphonec.c otherwise compilation will fail
         brew link readline --force
 
@@ -148,6 +148,10 @@ If you don't need plugins, remove or comment out this line from the bundler file
         ${prefix:ms2plugins}/lib/mediastreamer/plugins/*.*.so
         </binary>
 
+If using HomeBrew, this is not working yet. However you will at least need to install `glib-networking` and modify also:
+
+        <prefix name="default">/usr/local</prefix>
+
 Then run, inside Linphone source tree configure as told before but with `--enable-relativeprefix` appended.
 
         make && make bundle

From 67dbf48b2596f58abac13037ad4a57f420a68337 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Fri, 16 Jan 2015 09:19:00 +0100
Subject: [PATCH 272/496] Update ms2 submodule.

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 85c710a5b..25e08954e 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 85c710a5b69def49bb53c88a367e957d19ec5105
+Subproject commit 25e08954ef94a6e5dc17f783681945174273b455

From 47c92f50fa441b3f958e133c45abb9d2cd57e0d8 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Fri, 16 Jan 2015 09:30:16 +0100
Subject: [PATCH 273/496] Update Mac README a bit for bundle for global icons

---
 README.macos.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/README.macos.md b/README.macos.md
index b3768eea9..4028bb40a 100644
--- a/README.macos.md
+++ b/README.macos.md
@@ -148,7 +148,12 @@ If you don't need plugins, remove or comment out this line from the bundler file
         ${prefix:ms2plugins}/lib/mediastreamer/plugins/*.*.so
         </binary>
 
-If using HomeBrew, this is not working yet. However you will at least need to install `glib-networking` and modify also:
+If using HomeBrew, this is not working yet. However you will at least need to:
+
+        brew install shared-mime-info glib-networking hicolor-icon-theme
+        update-mime-database /usr/local/share/mime
+
+ And modify also:
 
         <prefix name="default">/usr/local</prefix>
 

From 07376579418c12518e0efbb4f57075d4b655355f Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Fri, 16 Jan 2015 17:08:51 +0100
Subject: [PATCH 274/496] Possible fix for App Nap problem

---
 build/macos/Info-linphone.plist.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/build/macos/Info-linphone.plist.in b/build/macos/Info-linphone.plist.in
index b9cde78a9..7d20d4ac6 100644
--- a/build/macos/Info-linphone.plist.in
+++ b/build/macos/Info-linphone.plist.in
@@ -26,6 +26,8 @@
     <string>Copyright 2011 Belledonne Communications</string>
     <key>LSMinimumSystemVersion</key>
     <string>10.4</string>
+    <key>NSAppSleepDisabled</key>
+    <string>YES</string>
 </dict>
 </plist>
 

From d282ec6ad9c05e1e18c2cb9a917cb6b4f417e56d Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Fri, 16 Jan 2015 17:31:30 +0100
Subject: [PATCH 275/496] Update ms2 for ios crash when camera access is denied

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 25e08954e..453c56062 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 25e08954ef94a6e5dc17f783681945174273b455
+Subproject commit 453c5606251d79bd0ac32dd6daec0ca8336de41d

From 55973deb0e8fcf3776e6791115c90e08c1fecef4 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Sat, 17 Jan 2015 11:58:46 +0100
Subject: [PATCH 276/496] modularize payload type matching exceptions in
 offer/answer

---
 coreapi/offeranswer.c | 125 ++++++++++++++++++++++++++++++++----------
 mediastreamer2        |   2 +-
 2 files changed, 97 insertions(+), 30 deletions(-)

diff --git a/coreapi/offeranswer.c b/coreapi/offeranswer.c
index d7d2e6e84..a77774457 100644
--- a/coreapi/offeranswer.c
+++ b/coreapi/offeranswer.c
@@ -31,7 +31,50 @@ static bool_t only_telephone_event(const MSList *l){
 	return TRUE;
 }
 
-static PayloadType * find_payload_type_best_match(const MSList *l, const PayloadType *refpt){
+typedef struct _PayloadTypeMatcher{
+	const char *mime_type;
+	PayloadType *(*match_func)(const MSList *l, const PayloadType *refpt);
+}PayloadTypeMatcher;
+
+static PayloadType * opus_match(const MSList *l, const PayloadType *refpt){
+	PayloadType *pt;
+	const MSList *elem;
+	PayloadType *candidate=NULL;
+
+	for (elem=l;elem!=NULL;elem=elem->next){
+		pt=(PayloadType*)elem->data;
+		
+		/*workaround a bug in earlier versions of linphone where opus/48000/1 is offered, which is uncompliant with opus rtp draft*/
+		if (strcasecmp(pt->mime_type,"opus")==0 ){
+			if (refpt->channels==1){
+				pt->channels=1; /*so that we respond with same number of channels */
+				candidate=pt;
+			}else if (refpt->channels==2){
+				return pt;
+			}
+		}
+	}
+	return candidate;
+}
+
+/* the reason for this matcher is for some stupid uncompliant phone that offer G729a mime type !*/
+static PayloadType * g729A_match(const MSList *l, const PayloadType *refpt){
+	PayloadType *pt;
+	const MSList *elem;
+	PayloadType *candidate=NULL;
+
+	for (elem=l;elem!=NULL;elem=elem->next){
+		pt=(PayloadType*)elem->data;
+		
+		/*workaround a bug in earlier versions of linphone where opus/48000/1 is offered, which is uncompliant with opus rtp draft*/
+		if (strcasecmp(pt->mime_type,"G729")==0 && refpt->channels==pt->channels){
+			candidate=pt;
+		}
+	}
+	return candidate;
+}
+
+static PayloadType * amr_match(const MSList *l, const PayloadType *refpt){
 	PayloadType *pt;
 	char value[10];
 	const MSList *elem;
@@ -40,39 +83,63 @@ static PayloadType * find_payload_type_best_match(const MSList *l, const Payload
 	for (elem=l;elem!=NULL;elem=elem->next){
 		pt=(PayloadType*)elem->data;
 		
-		/*workaround a bug in earlier versions of linphone where opus/48000/1 is offered, which is uncompliant with opus rtp draft*/
-		if (refpt->mime_type && strcasecmp(refpt->mime_type,"opus")==0 && refpt->channels==1
-			&& strcasecmp(pt->mime_type,refpt->mime_type)==0){
-			pt->channels=1; /*so that we respond with same number of channels */
-			candidate=pt;
-			break;
-		}
-		
-		/* the compare between G729 and G729A is for some stupid uncompliant phone*/
-		if ( pt->mime_type && refpt->mime_type &&
-			(strcasecmp(pt->mime_type,refpt->mime_type)==0  ||
-			(strcasecmp(pt->mime_type, "G729") == 0 && strcasecmp(refpt->mime_type, "G729A") == 0 ))
-			&& pt->clock_rate==refpt->clock_rate && pt->channels==refpt->channels){
-			candidate=pt;
-			/*good candidate, check fmtp for H264 */
-			if (strcasecmp(pt->mime_type,"H264")==0){
-				if (pt->recv_fmtp!=NULL && refpt->recv_fmtp!=NULL){
-					int mode1=0,mode2=0;
-					if (fmtp_get_value(pt->recv_fmtp,"packetization-mode",value,sizeof(value))){
-						mode1=atoi(value);
-					}
-					if (fmtp_get_value(refpt->recv_fmtp,"packetization-mode",value,sizeof(value))){
-						mode2=atoi(value);
-					}
-					if (mode1==mode2)
-						break; /*exact match */
-				}
-			}else break;
+		if ( pt->mime_type && refpt->mime_type 
+			&& strcasecmp(pt->mime_type, refpt->mime_type)==0
+			&& pt->clock_rate==refpt->clock_rate
+			&& pt->channels==refpt->channels) {
+			int octedalign1=0,octedalign2=0;
+			if (pt->recv_fmtp!=NULL && fmtp_get_value(pt->recv_fmtp,"octet-align",value,sizeof(value))){
+				octedalign1=atoi(value);
+			}
+			if (refpt->send_fmtp!=NULL && fmtp_get_value(refpt->send_fmtp,"octet-align",value,sizeof(value))){
+				octedalign2=atoi(value);
+			}
+			if (octedalign1==octedalign2) {
+				candidate=pt;
+				break; /*exact match */
+			}
 		}
 	}
 	return candidate;
 }
 
+static PayloadType * generic_match(const MSList *l, const PayloadType *refpt){
+	PayloadType *pt;
+	const MSList *elem;
+
+	for (elem=l;elem!=NULL;elem=elem->next){
+		pt=(PayloadType*)elem->data;
+		
+		if ( pt->mime_type && refpt->mime_type 
+			&& strcasecmp(pt->mime_type, refpt->mime_type)==0
+			&& pt->clock_rate==refpt->clock_rate
+			&& pt->channels==refpt->channels)
+			return pt;
+	}
+	return NULL;
+}
+
+static PayloadTypeMatcher matchers[]={
+	{"opus", opus_match},
+	{"G729A", g729A_match},
+	{"AMR", amr_match},
+	{"AMR-WB", amr_match},
+	{NULL, NULL}
+};
+
+
+
+static PayloadType * find_payload_type_best_match(const MSList *l, const PayloadType *refpt){
+	PayloadTypeMatcher *m;
+	for(m=matchers;m->mime_type!=NULL;++m){
+		if (refpt->mime_type && strcasecmp(m->mime_type,refpt->mime_type)==0){
+			return m->match_func(l,refpt);
+		}
+	}
+	return generic_match(l,refpt);
+}
+
+
 static MSList *match_payloads(const MSList *local, const MSList *remote, bool_t reading_response, bool_t one_matching_codec){
 	const MSList *e2,*e1;
 	MSList *res=NULL;
diff --git a/mediastreamer2 b/mediastreamer2
index 0450c04a3..81e6bd551 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 0450c04a38ce2c78430208d90e41dbe23163b950
+Subproject commit 81e6bd5511c16133df340e732807d64faac1f7b2

From de83e6795f3fa0f6e5356d70a8d022f9c1f3626f Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Sat, 17 Jan 2015 11:59:53 +0100
Subject: [PATCH 277/496] update ms2

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 453c56062..81e6bd551 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 453c5606251d79bd0ac32dd6daec0ca8336de41d
+Subproject commit 81e6bd5511c16133df340e732807d64faac1f7b2

From c1443751eca8d1ae5da981d286ef551869c5ba69 Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Mon, 19 Jan 2015 10:35:37 +0100
Subject: [PATCH 278/496] Update ms2

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 81e6bd551..3312ddff4 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 81e6bd5511c16133df340e732807d64faac1f7b2
+Subproject commit 3312ddff4bded88adbf41d61bf0b7cf95615473d

From 25b40de1ba6b8ba434ac9d5589784b40a46b4c3d Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Mon, 19 Jan 2015 14:07:37 +0100
Subject: [PATCH 279/496] Update ms2 for arm64 downscaling routine

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 3312ddff4..a58ecee4b 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 3312ddff4bded88adbf41d61bf0b7cf95615473d
+Subproject commit a58ecee4bc3dfbdfcb6ce4c90324308242b57041

From c95fd55126d88a8cfe7db2ee7929a40ade188d2e Mon Sep 17 00:00:00 2001
From: Johan Pascal <johan.pascal@belledonne-communications.com>
Date: Tue, 20 Jan 2015 00:59:25 +0100
Subject: [PATCH 280/496] DTLS-SRTP fix memory leak

---
 coreapi/bellesip_sal/sal_impl.c | 3 +++
 mediastreamer2                  | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/coreapi/bellesip_sal/sal_impl.c b/coreapi/bellesip_sal/sal_impl.c
index 4208bd105..84964ecf1 100644
--- a/coreapi/bellesip_sal/sal_impl.c
+++ b/coreapi/bellesip_sal/sal_impl.c
@@ -1097,6 +1097,9 @@ void sal_certificates_chain_parse_directory(char **certificate_pem, char **key_p
 	}
 	/* generate the fingerprint as described in RFC4572 if needed */
 	if ((generate_dtls_fingerprint == TRUE) && (fingerprint != NULL)) {
+		if (*fingerprint != NULL) {
+			ms_free(*fingerprint);
+		}
 		*fingerprint = belle_sip_certificates_chain_get_fingerprint(certificate);
 	}
 
diff --git a/mediastreamer2 b/mediastreamer2
index a27c77bdc..d5389594e 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit a27c77bdc96bbc4d727a5d6226a0587cbe8c5aa3
+Subproject commit d5389594e93c3499d70d9ddd556f9aac62aabc0a

From af79c042080109f7ed73fd4db90d34f4c3f83652 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Tue, 20 Jan 2015 08:54:26 +0100
Subject: [PATCH 281/496] always create lib/mediastreamer/plugins at install
 time

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index a58ecee4b..0547e9ff4 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit a58ecee4bc3dfbdfcb6ce4c90324308242b57041
+Subproject commit 0547e9ff4adc89c91f972ab6aba86f7410626a8e

From b4dc7b3868a6fe6f5aa9ece5c08d28393ba0e8dd Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Tue, 20 Jan 2015 10:46:12 +0100
Subject: [PATCH 282/496] Fix typo for ZLIB

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index b774fc448..db0356adb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -298,7 +298,7 @@ if test "$build_zlib" != "false" ; then
 			AC_MSG_NOTICE([zlib library and headers not found])
 		else
 			AC_DEFINE( HAVE_ZLIB, 1, [ZLIB support] )
-			ZLIBS_LIBS='-z'
+			ZLIB_LIBS='-lz'
 			AC_SUBST(ZLIB_LIBS)
 		fi
 	else

From 7f7671cfa26deffcb125018086189ccb39b4de47 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Tue, 20 Jan 2015 12:33:32 +0100
Subject: [PATCH 283/496] Include the git revision in the Windows setup.exe and
 Mac bundle file names.

---
 Makefile.am | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 2fd425a0d..030964b09 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,6 +7,8 @@ SUBDIRS = build m4 pixmaps po @ORTP_DIR@ @MS2_DIR@ \
 		coreapi console gtk share scripts tools tester include
 
 
+GITVERSION=`cd $(top_srcdir) && git describe --always || echo $(VERSION)`
+
 
 ACLOCAL_FLAGS=-I$(top_srcdir)/m4
 
@@ -20,11 +22,11 @@ OPTIONAL_SOUNDS=\
 
 INSTALLDIR=$(abs_top_builddir)/linphone-install
 INSTALLDIR_WITH_PREFIX=$(INSTALLDIR)/$(prefix)
-ZIPFILE=$(abs_top_builddir)/$(PACKAGE)-win32-$(VERSION).zip
+ZIPFILE=$(abs_top_builddir)/$(PACKAGE)-$(GITVERSION)-win32.zip
 ZIP_EXCLUDED=include lib \
 		$(OPTIONAL_SOUNDS)
 
-SDK_ZIPFILE=$(abs_top_builddir)/lib$(PACKAGE)-win32-$(VERSION).zip
+SDK_ZIPFILE=$(abs_top_builddir)/lib$(PACKAGE)-$(GITVERSION)-win32.zip
 SDK_EXCLUDED= \
 	bin/linphone.exe \
 	lib/*.la \
@@ -173,7 +175,7 @@ setup.exe: filelist
 	cp $(ISS_SCRIPT) $(INSTALLDIR_WITH_PREFIX)/.
 	cd $(INSTALLDIR_WITH_PREFIX) && \
 	$(ISCC) $(ISS_SCRIPT)
-	mv $(INSTALLDIR_WITH_PREFIX)/Output/setup.exe $(PACKAGE)-$(VERSION)-setup.exe
+	mv $(INSTALLDIR_WITH_PREFIX)/Output/setup.exe $(PACKAGE)-$(GITVERSION)-setup.exe
 	rm -rf $(INSTALLDIR_WITH_PREFIX)/Output
 	rm -f $(INSTALLDIR_WITH_PREFIX)/$(PACKAGE_WIN32_FILELIST)
 	rm -f $(INSTALLDIR_WITH_PREFIX)/$(ISS_SCRIPT)
@@ -201,8 +203,8 @@ Portfile-devel:	$(top_srcdir)/scripts/Portfile-devel.tmpl dist
 ### MAC
 
 MACAPPNAME=Linphone.app
-MACAPPZIP=$(PACKAGE)-$(VERSION).app.zip
-MACAPPDMG=$(PACKAGE)-$(VERSION).dmg
+MACAPPZIP=$(PACKAGE)-$(GITVERSION).app.zip
+MACAPPDMG=$(PACKAGE)-$(GITVERSION).dmg
 BUNDLEPREFIX=./
 BUNDLEDIR=$(BUNDLEPREFIX)$(MACAPPNAME)
 #a path prefix where additional libs can be cherry-picked by the bundler.

From 23530d3d27ed8fed42ea3c754ff2c4322d5c6243 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Tue, 20 Jan 2015 12:34:05 +0100
Subject: [PATCH 284/496] Update ms2 submodule.

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 0547e9ff4..ebbef5c0c 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 0547e9ff4adc89c91f972ab6aba86f7410626a8e
+Subproject commit ebbef5c0cb97e181fb6055ff3e16f52c119147dc

From 0d32bfbd3b336a55d13790b9d56b82d363e020a2 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Tue, 20 Jan 2015 16:22:38 +0100
Subject: [PATCH 285/496] Improve transport change test in Python.

---
 tools/python/unittests/test_register.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/python/unittests/test_register.py b/tools/python/unittests/test_register.py
index f62da77e0..abfa6fa17 100644
--- a/tools/python/unittests/test_register.py
+++ b/tools/python/unittests/test_register.py
@@ -181,11 +181,11 @@ class TestRegister:
         cm = CoreManager('multi_account_rc', False)
         number_of_udp_proxies = reduce(lambda x, y: x + int(y.transport == "udp"), cm.lc.proxy_config_list, 0)
         total_number_of_proxies = len(cm.lc.proxy_config_list)
+        assert_equals(CoreManager.wait_for(cm, cm, lambda cm1, cm2: cm1.stats.number_of_LinphoneRegistrationOk == total_number_of_proxies), True)
+        register_ok = cm.stats.number_of_LinphoneRegistrationOk
         # Keep only UDP
-        tr = cm.lc.sip_transports
-        tr.tcp_port = 0
-        tr.tls_port = 0
-        tr.dtls_port = 0
+        tr = linphone.SipTransports(0, 0, 0, 0)
+        tr.udp_port = cm.lc.sip_transports.udp_port
         cm.lc.sip_transports = tr
-        assert_equals(CoreManager.wait_for(cm, cm, lambda cm1, cm2: cm1.stats.number_of_LinphoneRegistrationOk == number_of_udp_proxies), True)
+        assert_equals(CoreManager.wait_for(cm, cm, lambda cm1, cm2: cm1.stats.number_of_LinphoneRegistrationOk == (register_ok + number_of_udp_proxies)), True)
         assert_equals(CoreManager.wait_for(cm, cm, lambda cm1, cm2: cm1.stats.number_of_LinphoneRegistrationFailed == (total_number_of_proxies - number_of_udp_proxies)), True)

From 5824199483fbd4ff62d92722cd2c5175e41e7888 Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Wed, 21 Jan 2015 12:29:13 +0100
Subject: [PATCH 286/496] Add keepAccounts(bool) and clearAccounts() to JNI

---
 tester/liblinphone_tester.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tester/liblinphone_tester.c b/tester/liblinphone_tester.c
index aa4f78f29..27b9672b0 100644
--- a/tester/liblinphone_tester.c
+++ b/tester/liblinphone_tester.c
@@ -109,6 +109,14 @@ JNIEXPORT jint JNICALL Java_org_linphone_tester_Tester_run(JNIEnv *env, jobject
 	return ret;
 }
 
+JNIEXPORT void JNICALL Java_org_linphone_tester_Tester_keepAccounts(JNIEnv *env, jclass c, jboolean keep) {
+	liblinphone_tester_keep_accounts((int)keep);
+}
+
+JNIEXPORT void JNICALL Java_org_linphone_tester_Tester_clearAccounts(JNIEnv *env, jclass c) {
+	liblinphone_tester_clear_accounts();
+}
+
 #endif /* ANDROID */
 
 #ifdef __QNX__

From 317504a30655635d3c8bcfea3741de18f374674c Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Wed, 21 Jan 2015 13:59:01 +0100
Subject: [PATCH 287/496] Update ms2

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index ebbef5c0c..5662b24bc 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit ebbef5c0cb97e181fb6055ff3e16f52c119147dc
+Subproject commit 5662b24bc9ddd186daae74555b05b42bfedd763d

From 16180e24301bad46d60570689b8d11e3a07561de Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Wed, 21 Jan 2015 22:36:23 +0100
Subject: [PATCH 288/496] change the way payload type numbers are assigned, so
 that an application can support more payload type than the RTP profile table
 allows to contain. Compliance with RFC3264 (offer answer model) is improved,
 by reusing numbers in case of reINVITEs. Fix memory leaks Move offer/answer
 related tests into a new test suite.

---
 build/android/liblinphone_tester.mk |   3 +-
 coreapi/bellesip_sal/sal_op_impl.c  |   5 +-
 coreapi/callbacks.c                 |  17 ++
 coreapi/linphonecall.c              | 192 ++++++++++++--
 coreapi/linphonecore.c              | 394 ++++++++++++----------------
 coreapi/linphonecore.h              |  11 +
 coreapi/misc.c                      |  13 +-
 coreapi/offeranswer.c               |   5 +-
 coreapi/private.h                   |  22 +-
 coreapi/quality_reporting.c         |   1 +
 coreapi/sal.c                       |   5 +-
 include/sal/sal.h                   |   3 +-
 mediastreamer2                      |   2 +-
 oRTP                                |   2 +-
 tester/Makefile.am                  |   3 +-
 tester/accountmanager.c             |   7 +-
 tester/call_tester.c                | 163 +-----------
 tester/liblinphone_tester.h         |   2 +
 tester/offeranswer_tester.c         | 297 +++++++++++++++++++++
 tester/tester.c                     |   1 +
 20 files changed, 704 insertions(+), 444 deletions(-)
 create mode 100644 tester/offeranswer_tester.c

diff --git a/build/android/liblinphone_tester.mk b/build/android/liblinphone_tester.mk
index ee2018621..d92bb60b5 100644
--- a/build/android/liblinphone_tester.mk
+++ b/build/android/liblinphone_tester.mk
@@ -18,7 +18,8 @@ common_SRC_FILES := \
 	transport_tester.c \
 	player_tester.c \
 	dtmf_tester.c \
-	accountmanager.c
+	accountmanager.c \
+	offeranswer_tester.c
 
 common_C_INCLUDES += \
         $(LOCAL_PATH) \
diff --git a/coreapi/bellesip_sal/sal_op_impl.c b/coreapi/bellesip_sal/sal_op_impl.c
index f9647f7ad..5c953ffc5 100644
--- a/coreapi/bellesip_sal/sal_op_impl.c
+++ b/coreapi/bellesip_sal/sal_op_impl.c
@@ -235,7 +235,10 @@ int sal_ping(SalOp *op, const char *from, const char *to){
 void sal_op_set_remote_ua(SalOp*op,belle_sip_message_t* message) {
 	belle_sip_header_user_agent_t* user_agent=belle_sip_message_get_header_by_type(message,belle_sip_header_user_agent_t);
 	char user_agent_string[256];
-	if(user_agent && belle_sip_header_user_agent_get_products_as_string(user_agent,user_agent_string,sizeof(user_agent_string))>0) {
+	if (user_agent && belle_sip_header_user_agent_get_products_as_string(user_agent,user_agent_string,sizeof(user_agent_string))>0) {
+		if (op->base.remote_ua!=NULL){
+			ms_free(op->base.remote_ua);
+		}
 		op->base.remote_ua=ms_strdup(user_agent_string);
 	}
 }
diff --git a/coreapi/callbacks.c b/coreapi/callbacks.c
index c43c84479..2d9ff58ae 100644
--- a/coreapi/callbacks.c
+++ b/coreapi/callbacks.c
@@ -96,7 +96,23 @@ static void prepare_early_media_forking(LinphoneCall *call){
 	if (call->videostream){
 		rtp_session_set_symmetric_rtp(call->videostream->ms.sessions.rtp_session,FALSE);
 	}
+}
 
+void linphone_call_update_frozen_payloads(LinphoneCall *call, SalMediaDescription *result_desc){
+	SalMediaDescription *local=call->localdesc;
+	int i;
+	for(i=0;i<result_desc->nb_streams;++i){
+		MSList *elem;
+		for (elem=result_desc->streams[i].payloads;elem!=NULL;elem=elem->next){
+			PayloadType *pt=(PayloadType*)elem->data;
+			if (is_payload_type_number_available(local->streams[i].already_assigned_payloads, payload_type_get_number(pt), NULL)){
+				/*new codec, needs to be added to the list*/
+				local->streams[i].already_assigned_payloads=ms_list_append(local->streams[i].already_assigned_payloads, payload_type_clone(pt));
+				ms_message("LinphoneCall[%p] : payload type %i %s/%i fmtp=%s added to frozen list.",
+					   call, payload_type_get_number(pt), pt->mime_type, pt->clock_rate, pt->recv_fmtp ? pt->recv_fmtp : NULL);
+			}
+		}
+	}
 }
 
 void linphone_core_update_streams(LinphoneCore *lc, LinphoneCall *call, SalMediaDescription *new_md){
@@ -181,6 +197,7 @@ void linphone_core_update_streams(LinphoneCore *lc, LinphoneCall *call, SalMedia
 	if (call->state==LinphoneCallPausing && call->paused_by_app && ms_list_size(lc->calls)==1){
 		linphone_core_play_named_tone(lc,LinphoneToneCallOnHold);
 	}
+	linphone_call_update_frozen_payloads(call, new_md);
 	end:
 	if (oldmd)
 		sal_media_description_unref(oldmd);
diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index 498c0accf..3c9dfaf90 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -228,35 +228,154 @@ void linphone_call_set_authentication_token_verified(LinphoneCall *call, bool_t
 	propagate_encryption_changed(call);
 }
 
-static MSList *make_codec_list(LinphoneCore *lc, const MSList *codecs, int bandwidth_limit,int* max_sample_rate, int nb_codecs_limit){
-	MSList *l=NULL;
+static int get_max_codec_sample_rate(const MSList *codecs){
+	int max_sample_rate=0;
 	const MSList *it;
-	int nb = 0;
-	if (max_sample_rate) *max_sample_rate=0;
 	for(it=codecs;it!=NULL;it=it->next){
 		PayloadType *pt=(PayloadType*)it->data;
-		if (pt->flags & PAYLOAD_TYPE_ENABLED){
-			int sample_rate = payload_type_get_rate(pt);
+		int sample_rate;
+		
+		if( strcasecmp("G722",pt->mime_type) == 0 ){
+			/* G722 spec says 8000 but the codec actually requires 16000 */
+			sample_rate = 16000;
+		}else sample_rate=pt->clock_rate;
+		if (sample_rate>max_sample_rate) max_sample_rate=sample_rate;
+	}
+	return max_sample_rate;
+}
 
-			if( strcasecmp("G722",pt->mime_type) == 0 ){
-				/* G722 spec says 8000 but the codec actually requires 16000 */
-				ms_debug("Correcting sample rate for G722");
-				sample_rate = 16000;
-			}
-
-			if (bandwidth_limit>0 && !linphone_core_is_payload_type_usable_for_bandwidth(lc,pt,bandwidth_limit)){
-				ms_message("Codec %s/%i eliminated because of audio bandwidth constraint of %i kbit/s",
-					   pt->mime_type,pt->clock_rate,bandwidth_limit);
-				continue;
-			}
-			if (linphone_core_check_payload_type_usability(lc,pt)){
-				l=ms_list_append(l,payload_type_clone(pt));
-				nb++;
-				if (max_sample_rate && sample_rate>*max_sample_rate) *max_sample_rate=sample_rate;
+static int find_payload_type_number(const MSList *assigned, const PayloadType *pt){
+	const MSList *elem;
+	const PayloadType *candidate=NULL;
+	for(elem=assigned;elem!=NULL;elem=elem->next){
+		const PayloadType *it=(const PayloadType*)elem->data;
+		if ((strcasecmp(pt->mime_type, payload_type_get_mime(it)) == 0)
+			&& (it->clock_rate==pt->clock_rate)
+			&& (it->channels==pt->channels || pt->channels<=0)) {
+			candidate=it;
+			if ((it->recv_fmtp!=NULL && pt->recv_fmtp!=NULL && strcasecmp(it->recv_fmtp, pt->recv_fmtp)==0)
+				|| (it->recv_fmtp==NULL && pt->recv_fmtp==NULL)){
+				break;/*exact match*/
 			}
 		}
-		if ((nb_codecs_limit > 0) && (nb >= nb_codecs_limit)) break;
 	}
+	return candidate ? payload_type_get_number(candidate) : -1;
+}
+
+bool_t is_payload_type_number_available(const MSList *l, int number, const PayloadType *ignore){
+	const MSList *elem;
+	for (elem=l; elem!=NULL; elem=elem->next){
+		const PayloadType *pt=(PayloadType*)elem->data;
+		if (pt!=ignore && payload_type_get_number(pt)==number) return FALSE;
+	}
+	return TRUE;
+}
+
+static void linphone_core_assign_payload_type_numbers(LinphoneCore *lc, MSList *codecs){
+	MSList *elem;
+	int dyn_number=lc->codecs_conf.dyn_pt;
+	for (elem=codecs; elem!=NULL; elem=elem->next){
+		PayloadType *pt=(PayloadType*)elem->data;
+		int number=payload_type_get_number(pt);
+		
+		/*check if number is duplicated: it could be the case if the remote forced us to use a mapping with a previous offer*/
+		if (number!=-1 && !(pt->flags & PAYLOAD_TYPE_FROZEN_NUMBER)){
+			if (!is_payload_type_number_available(codecs, number, pt)){
+				ms_message("Reassigning payload type %i %s/%i because already offered.", number, pt->mime_type, pt->clock_rate);
+				number=-1; /*need to be re-assigned*/
+			}
+		}
+		
+		if (number==-1){
+			while(dyn_number<127){
+				if (is_payload_type_number_available(codecs, dyn_number, NULL)){
+					payload_type_set_number(pt, dyn_number);
+					dyn_number++;
+					break;
+				}
+				dyn_number++;
+			}
+			if (dyn_number==127){
+				ms_error("Too many payload types configured ! codec %s/%i is disabled.", pt->mime_type, pt->clock_rate);
+				payload_type_set_enable(pt, FALSE);
+			}
+		}
+	}
+}
+
+static bool_t has_telephone_event_at_rate(const MSList *tev, int rate){
+	const MSList *it;
+	for(it=tev;it!=NULL;it=it->next){
+		const PayloadType *pt=(PayloadType*)it->data;
+		if (pt->clock_rate==rate) return TRUE;
+	}
+	return FALSE;
+}
+
+static MSList * create_telephone_events(LinphoneCore *lc, const MSList *codecs){
+	const MSList *it;
+	MSList *ret=NULL;
+	for(it=codecs;it!=NULL;it=it->next){
+		const PayloadType *pt=(PayloadType*)it->data;
+		if (!has_telephone_event_at_rate(ret,pt->clock_rate)){
+			PayloadType *tev=payload_type_clone(&payload_type_telephone_event);
+			tev->clock_rate=pt->clock_rate;
+			/*let it choose the number dynamically as for normal codecs*/
+			payload_type_set_number(tev, -1);
+			if (ret==NULL){
+				/*But for first telephone-event, prefer the number that was configured in the core*/
+				if (is_payload_type_number_available(codecs, lc->codecs_conf.telephone_event_pt, NULL)){
+					payload_type_set_number(tev, lc->codecs_conf.telephone_event_pt);
+				}
+			}
+			ret=ms_list_append(ret,tev);
+		}
+	}
+	return ret;
+}
+
+typedef struct _CodecConstraints{
+	int bandwidth_limit;
+	int max_codecs;
+	MSList *previously_used;
+}CodecConstraints;
+
+static MSList *make_codec_list(LinphoneCore *lc, CodecConstraints * hints, const MSList *codecs){
+	MSList *l=NULL;
+	MSList *tevs=NULL;
+	const MSList *it;
+	int nb = 0;
+
+	for(it=codecs;it!=NULL;it=it->next){
+		PayloadType *pt=(PayloadType*)it->data;
+		int num;
+		
+		if (!(pt->flags & PAYLOAD_TYPE_ENABLED))
+			continue;
+		if (hints->bandwidth_limit>0 && !linphone_core_is_payload_type_usable_for_bandwidth(lc,pt,hints->bandwidth_limit)){
+			ms_message("Codec %s/%i eliminated because of audio bandwidth constraint of %i kbit/s",
+					pt->mime_type,pt->clock_rate,hints->bandwidth_limit);
+			continue;
+		}
+		if (!linphone_core_check_payload_type_usability(lc,pt)){
+			continue;
+		}
+		pt=payload_type_clone(pt);
+		
+		/*look for a previously assigned number for this codec*/
+		num=find_payload_type_number(hints->previously_used, pt);
+		if (num!=-1){
+			payload_type_set_number(pt,num);
+			payload_type_set_flag(pt, PAYLOAD_TYPE_FROZEN_NUMBER);
+		}
+		
+		l=ms_list_append(l, pt);
+		nb++;
+		if ((hints->max_codecs > 0) && (nb >= hints->max_codecs)) break;
+	}
+	tevs=create_telephone_events(lc,l);
+	l=ms_list_concat(l,tevs);
+	linphone_core_assign_payload_type_numbers(lc, l);
 	return l;
 }
 
@@ -395,9 +514,16 @@ void linphone_call_update_local_media_description_from_ice_or_upnp(LinphoneCall
 #endif  //BUILD_UPNP
 }
 
+static void transfer_already_assigned_payload_types(SalMediaDescription *old, SalMediaDescription *md){
+	int i;
+	for(i=0;i<old->nb_streams;++i){
+		md->streams[i].already_assigned_payloads=old->streams[i].already_assigned_payloads;
+		old->streams[i].already_assigned_payloads=NULL;
+	}
+}
+
 void linphone_call_make_local_media_description(LinphoneCore *lc, LinphoneCall *call){
 	MSList *l;
-	PayloadType *pt;
 	SalMediaDescription *old_md=call->localdesc;
 	int i;
 	int nb_active_streams = 0;
@@ -406,6 +532,7 @@ void linphone_call_make_local_media_description(LinphoneCore *lc, LinphoneCall *
 	LinphoneAddress *addr;
 	char* local_ip=call->localip;
 	const char *subject=linphone_call_params_get_session_name(call->params);
+	CodecConstraints codec_hints={0};
 
 	linphone_core_adapt_to_network(lc,call->ping_time,call->params);
 
@@ -439,9 +566,11 @@ void linphone_call_make_local_media_description(LinphoneCore *lc, LinphoneCall *
 		md->streams[0].ptime=call->params->down_ptime;
 	else
 		md->streams[0].ptime=linphone_core_get_download_ptime(lc);
-	l=make_codec_list(lc,lc->codecs_conf.audio_codecs,call->params->audio_bw,&md->streams[0].max_rate,-1);
-	pt=payload_type_clone(rtp_profile_get_payload_from_mime(lc->default_profile,"telephone-event"));
-	l=ms_list_append(l,pt);
+	codec_hints.bandwidth_limit=call->params->audio_bw;
+	codec_hints.max_codecs=-1;
+	codec_hints.previously_used=old_md ? old_md->streams[0].already_assigned_payloads : NULL;
+	l=make_codec_list(lc, &codec_hints, lc->codecs_conf.audio_codecs);
+	md->streams[0].max_rate=get_max_codec_sample_rate(l);
 	md->streams[0].payloads=l;
 	nb_active_streams++;
 
@@ -453,7 +582,10 @@ void linphone_call_make_local_media_description(LinphoneCore *lc, LinphoneCall *
 		md->streams[1].rtcp_port=call->media_ports[1].rtcp_port;
 		md->streams[1].proto=md->streams[0].proto;
 		md->streams[1].type=SalVideo;
-		l=make_codec_list(lc,lc->codecs_conf.video_codecs,0,NULL,-1);
+		codec_hints.bandwidth_limit=0;
+		codec_hints.max_codecs=-1;
+		codec_hints.previously_used=old_md ? old_md->streams[1].already_assigned_payloads : NULL;
+		l=make_codec_list(lc, &codec_hints, lc->codecs_conf.video_codecs);
 		md->streams[1].payloads=l;
 		nb_active_streams++;
 	}
@@ -468,7 +600,10 @@ void linphone_call_make_local_media_description(LinphoneCore *lc, LinphoneCall *
 		md->streams[i].proto = call->biggestdesc->streams[i].proto;
 		md->streams[i].type = call->biggestdesc->streams[i].type;
 		md->streams[i].dir = SalStreamInactive;
-		l = make_codec_list(lc, lc->codecs_conf.video_codecs, 0, NULL, 1);
+		codec_hints.bandwidth_limit=0;
+		codec_hints.max_codecs=1;
+		codec_hints.previously_used=NULL;
+		l = make_codec_list(lc, &codec_hints, lc->codecs_conf.video_codecs);
 		md->streams[i].payloads = l;
 	}
 
@@ -481,6 +616,7 @@ void linphone_call_make_local_media_description(LinphoneCore *lc, LinphoneCall *
 	linphone_call_update_local_media_description_from_ice_or_upnp(call);
 	linphone_address_destroy(addr);
 	if (old_md){
+		transfer_already_assigned_payload_types(old_md,md);
 		call->localdesc_changed=sal_media_description_equals(md,old_md);
 		sal_media_description_unref(old_md);
 	}
diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index ef4133d87..2543cb007 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -982,12 +982,13 @@ static void rtp_config_read(LinphoneCore *lc)
 	linphone_core_set_avpf_mode(lc,lp_config_get_int(lc->config,"rtp","avpf",0));
 }
 
-static PayloadType * find_payload(RtpProfile *prof, const char *mime_type, int clock_rate, int channels, const char *recv_fmtp){
+static PayloadType * find_payload(const MSList *default_list, const char *mime_type, int clock_rate, int channels, const char *recv_fmtp){
 	PayloadType *candidate=NULL;
-	int i;
 	PayloadType *it;
-	for(i=0;i<RTP_PROFILE_MAX_PAYLOADS;++i){
-		it=rtp_profile_get_payload(prof,i);
+	const MSList *elem;
+	
+	for(elem=default_list;elem!=NULL;elem=elem->next){
+		it=(PayloadType*)elem->data;
 		if (it!=NULL && strcasecmp(mime_type,it->mime_type)==0
 			&& (clock_rate==it->clock_rate || clock_rate<=0)
 			&& (channels==it->channels || channels<=0) ){
@@ -1009,7 +1010,20 @@ static PayloadType * find_payload(RtpProfile *prof, const char *mime_type, int c
 	return candidate;
 }
 
-static bool_t get_codec(LinphoneCore *lc, const char* type, int index, PayloadType **ret){
+static PayloadType* find_payload_type_from_list(const char* type, int rate, int channels, const MSList* from) {
+	const MSList *elem;
+	for(elem=from;elem!=NULL;elem=elem->next){
+		PayloadType *pt=(PayloadType*)elem->data;
+		if ((strcasecmp(type, payload_type_get_mime(pt)) == 0)
+			&& (rate == LINPHONE_FIND_PAYLOAD_IGNORE_RATE || rate==pt->clock_rate)
+			&& (channels == LINPHONE_FIND_PAYLOAD_IGNORE_CHANNELS || channels==pt->channels)) {
+			return pt;
+		}
+	}
+	return NULL;
+}
+
+static bool_t get_codec(LinphoneCore *lc, SalStreamType type, int index, PayloadType **ret){
 	char codeckey[50];
 	const char *mime,*fmtp;
 	int rate,channels,enabled;
@@ -1017,7 +1031,7 @@ static bool_t get_codec(LinphoneCore *lc, const char* type, int index, PayloadTy
 	LpConfig *config=lc->config;
 
 	*ret=NULL;
-	snprintf(codeckey,50,"%s_%i",type,index);
+	snprintf(codeckey,50,"%s_codec_%i",type==SalAudio ? "audio" : "video", index);
 	mime=lp_config_get_string(config,codeckey,"mime",NULL);
 	if (mime==NULL || strlen(mime)==0 ) return FALSE;
 
@@ -1025,85 +1039,52 @@ static bool_t get_codec(LinphoneCore *lc, const char* type, int index, PayloadTy
 	fmtp=lp_config_get_string(config,codeckey,"recv_fmtp",NULL);
 	channels=lp_config_get_int(config,codeckey,"channels",0);
 	enabled=lp_config_get_int(config,codeckey,"enabled",1);
-	pt=find_payload(lc->default_profile,mime,rate,channels,fmtp);
-	if (pt && enabled ) pt->flags|=PAYLOAD_TYPE_ENABLED;
-	//ms_message("Found codec %s/%i",pt->mime_type,pt->clock_rate);
-	if (pt==NULL) ms_warning("Ignoring codec config %s/%i with fmtp=%s because unsupported",
-				mime,rate,fmtp ? fmtp : "");
+	if (!ms_filter_codec_supported(mime)){
+		ms_warning("Codec %s/%i read from conf is not supported by mediastreamer2, ignored.",mime,rate);
+		return TRUE;
+	}
+	pt=find_payload(type==SalAudio ? lc->default_audio_codecs : lc->default_video_codecs,mime,rate,channels,fmtp);
+	if (!pt){
+		MSList **default_list=(type==SalAudio) ? &lc->default_audio_codecs :  &lc->default_video_codecs;
+		ms_warning("Codec %s/%i read from conf is not in the default list.",mime,rate);
+		pt=payload_type_new();
+		pt->type=(type==SalAudio) ? PAYLOAD_AUDIO_PACKETIZED :  PAYLOAD_VIDEO;
+		pt->mime_type=ortp_strdup(mime);
+		pt->clock_rate=rate;
+		pt->channels=channels;
+		payload_type_set_recv_fmtp(pt,fmtp);
+		*default_list=ms_list_append(*default_list, pt);
+	}
+	if (enabled ) pt->flags|=PAYLOAD_TYPE_ENABLED;
 	*ret=pt;
 	return TRUE;
 }
 
-#define RANK_END 10000
-
-typedef struct codec_desc{
-	const char *name;
-	int rate;
-}codec_desc_t;
-
-static codec_desc_t codec_pref_order[]={
-	{"opus", 48000},
-	{"SILK", 16000},
-	{"speex", 16000},
-	{"speex", 8000},
-	{"pcmu",8000},
-	{"pcma",8000},
-	{"VP8",90000},
-	{"H264",90000},
-	{"MP4V-ES",90000},
-	{NULL,0}
-};
-
-static int find_codec_rank(const char *mime, int clock_rate){
-	int i;
-
-#ifdef __arm__
-	/*hack for opus, that needs to be disabed by default on ARM single processor, otherwise there is no cpu left for video processing*/
-	if (strcasecmp(mime,"opus")==0){
-		if (ms_get_cpu_count()==1) return RANK_END;
-	}
-#endif
-	for(i=0;codec_pref_order[i].name!=NULL;++i){
-		if (strcasecmp(codec_pref_order[i].name,mime)==0 && clock_rate==codec_pref_order[i].rate)
-			return i;
-	}
-	return RANK_END;
-}
-
-static int codec_compare(const PayloadType *a, const PayloadType *b){
-	int ra,rb;
-	ra=find_codec_rank(a->mime_type,a->clock_rate);
-	rb=find_codec_rank(b->mime_type,b->clock_rate);
-	if (ra>rb) return 1;
-	if (ra<rb) return -1;
-	return 1;
-}
-
-static MSList *add_missing_codecs(LinphoneCore *lc, SalStreamType mtype, MSList *l){
-	int i;
-	for(i=0;i<RTP_PROFILE_MAX_PAYLOADS;++i){
-		PayloadType *pt=rtp_profile_get_payload(lc->default_profile,i);
-		if (pt){
-			if (mtype==SalVideo && pt->type!=PAYLOAD_VIDEO)
-				pt=NULL;
-			else if (mtype==SalAudio && (pt->type!=PAYLOAD_AUDIO_PACKETIZED
-				&& pt->type!=PAYLOAD_AUDIO_CONTINUOUS)){
-				pt=NULL;
-			}
-			if (pt && ms_filter_codec_supported(pt->mime_type)){
-				if (ms_list_find(l,pt)==NULL){
-					/*unranked codecs are disabled by default*/
-					if (find_codec_rank(pt->mime_type, pt->clock_rate)!=RANK_END){
-						payload_type_set_flag(pt,PAYLOAD_TYPE_ENABLED);
-					}
-					ms_message("Adding new codec %s/%i with fmtp %s",
-						pt->mime_type,pt->clock_rate,pt->recv_fmtp ? pt->recv_fmtp : "");
-					l=ms_list_insert_sorted(l,pt,(int (*)(const void *, const void *))codec_compare);
-				}
+/*this function merges the payload types from the codec default list with the list read from configuration file.
+ * If a new codec becomes supported in Liblinphone or if the list from configuration file is empty or incomplete, all the supported codecs are added
+ * automatically. This 'l' list is entirely destroyed and rewritten.*/
+static MSList *add_missing_codecs(const MSList *default_list, MSList *l){
+	const MSList *elem;
+	MSList *newlist;
+	
+	for(elem=default_list; elem!=NULL; elem=elem->next){
+		MSList *elem2=ms_list_find(l,elem->data);
+		if (!elem2){
+			PayloadType *pt=(PayloadType*)elem->data;
+			/*this codec from default list should be inserted in the list*/
+			if (!elem->prev){
+				l=ms_list_prepend(l,pt);
+			}else{
+				const MSList *after=ms_list_find(l,elem->prev->data);
+				l=ms_list_insert(l, after->next, pt);
 			}
+			ms_message("Supported codec %s/%i fmtp=%s automatically added to codec list.", pt->mime_type,
+				   pt->clock_rate, pt->recv_fmtp ? pt->recv_fmtp : "");
 		}
 	}
-	return l;
+	newlist=ms_list_copy_with_data(l,(void *(*)(void*))payload_type_clone);
+	ms_list_free(l);
+	return newlist;
 }
 
 static MSList *codec_append_if_new(MSList *l, PayloadType *pt){
@@ -1123,23 +1104,23 @@ static void codecs_config_read(LinphoneCore *lc)
 	PayloadType *pt;
 	MSList *audio_codecs=NULL;
 	MSList *video_codecs=NULL;
-	for (i=0;get_codec(lc,"audio_codec",i,&pt);i++){
+	
+	lc->codecs_conf.dyn_pt=96;
+	lc->codecs_conf.telephone_event_pt=lp_config_get_int(lc->config,"misc","telephone_event_pt",101);
+	
+	for (i=0;get_codec(lc,SalAudio,i,&pt);i++){
 		if (pt){
-			if (!ms_filter_codec_supported(pt->mime_type)){
-				ms_warning("Codec %s is not supported by mediastreamer2, removed.",pt->mime_type);
-			}else audio_codecs=codec_append_if_new(audio_codecs,pt);
+			audio_codecs=codec_append_if_new(audio_codecs, pt);
 		}
 	}
-	audio_codecs=add_missing_codecs(lc,SalAudio,audio_codecs);
+	audio_codecs=add_missing_codecs(lc->default_audio_codecs,audio_codecs);
 
-	for (i=0;get_codec(lc,"video_codec",i,&pt);i++){
+	for (i=0;get_codec(lc,SalVideo,i,&pt);i++){
 		if (pt){
-			if (!ms_filter_codec_supported(pt->mime_type)){
-				ms_warning("Codec %s is not supported by mediastreamer2, removed.",pt->mime_type);
-			}else video_codecs=codec_append_if_new(video_codecs,(void *)pt);
+			video_codecs=codec_append_if_new(video_codecs, pt);
 		}
 	}
-	video_codecs=add_missing_codecs(lc,SalVideo,video_codecs);
+	video_codecs=add_missing_codecs(lc->default_video_codecs,video_codecs);
 	linphone_core_set_audio_codecs(lc,audio_codecs);
 	linphone_core_set_video_codecs(lc,video_codecs);
 	linphone_core_update_allocated_audio_bandwidth(lc);
@@ -1412,60 +1393,45 @@ const char * linphone_core_get_version(void){
 	return liblinphone_version;
 }
 
-static void linphone_core_assign_payload_type(LinphoneCore *lc, PayloadType *const_pt, int number, const char *recv_fmtp){
-	PayloadType *pt;
-
-	pt=payload_type_clone(const_pt);
-	if (number==-1){
-		/*look for a free number */
-		MSList *elem;
-		int i;
-		for(i=lc->dyn_pt;i<RTP_PROFILE_MAX_PAYLOADS;++i){
-			bool_t already_assigned=FALSE;
-			for(elem=lc->payload_types;elem!=NULL;elem=elem->next){
-				PayloadType *it=(PayloadType*)elem->data;
-				if (payload_type_get_number(it)==i){
-					already_assigned=TRUE;
-					break;
-				}
-			}
-			if (!already_assigned){
-				number=i;
-				lc->dyn_pt=i+1;
-				break;
-			}
-		}
-		if (number==-1){
-			ms_fatal("FIXME: too many codecs, no more free numbers.");
-		}
+static void linphone_core_register_payload_type(LinphoneCore *lc, const PayloadType *const_pt, const char *recv_fmtp, bool_t enabled){
+	MSList **codec_list=const_pt->type==PAYLOAD_VIDEO ? &lc->default_video_codecs : &lc->default_audio_codecs;
+	if (ms_filter_codec_supported(const_pt->mime_type)){
+		PayloadType *pt=payload_type_clone(const_pt);
+		int number=-1;
+		payload_type_set_enable(pt,enabled);
+		if (recv_fmtp!=NULL) payload_type_set_recv_fmtp(pt,recv_fmtp);
+		/*Set a number to the payload type from the statically defined (RFC3551) profile, if not static, -1 is returned
+		 and the payload type number will be determined dynamically later, at call time.*/
+		payload_type_set_number(pt,
+			(number=rtp_profile_find_payload_number(&av_profile, pt->mime_type, pt->clock_rate, pt->channels))
+		); 
+		ms_message("Codec %s/%i fmtp=[%s] number=%i, enabled=%i) added to default capabilities.", pt->mime_type, pt->clock_rate, 
+			   pt->recv_fmtp ? pt->recv_fmtp : "", number, (int)payload_type_enabled(pt));
+		*codec_list=ms_list_append(*codec_list,pt);
 	}
-	ms_message("assigning %s/%i payload type number %i",pt->mime_type,pt->clock_rate,number);
-	payload_type_set_number(pt,number);
-	if (recv_fmtp!=NULL) payload_type_set_recv_fmtp(pt,recv_fmtp);
-	rtp_profile_set_payload(lc->default_profile,number,pt);
-	lc->payload_types=ms_list_append(lc->payload_types,pt);
 }
 
-static void linphone_core_handle_static_payloads(LinphoneCore *lc){
+static void linphone_core_register_static_payloads(LinphoneCore *lc){
 	RtpProfile *prof=&av_profile;
 	int i;
 	for(i=0;i<RTP_PROFILE_MAX_PAYLOADS;++i){
 		PayloadType *pt=rtp_profile_get_payload(prof,i);
 		if (pt){
-			// insert static payload only if no profile exists
-			if (rtp_profile_get_payload(lc->default_profile,i) == NULL){
-				linphone_core_assign_payload_type(lc,pt,i,NULL);
+#ifndef VIDEO_ENABLED
+			if (pt->type==PAYLOAD_VIDEO) continue;
+#endif
+			if (find_payload_type_from_list(
+				pt->mime_type, pt->clock_rate, pt->type!=PAYLOAD_VIDEO ? pt->channels : LINPHONE_FIND_PAYLOAD_IGNORE_CHANNELS,
+				pt->type==PAYLOAD_VIDEO ? lc->default_video_codecs : lc->default_audio_codecs)==NULL){
+				linphone_core_register_payload_type(lc,pt,NULL,FALSE);
 			}
 		}
 	}
 }
 
 static void linphone_core_free_payload_types(LinphoneCore *lc){
-	rtp_profile_clear_all(lc->default_profile);
-	rtp_profile_destroy(lc->default_profile);
-	ms_list_for_each(lc->payload_types,(void (*)(void*))payload_type_destroy);
-	ms_list_free(lc->payload_types);
-	lc->payload_types=NULL;
+	ms_list_free_with_data(lc->default_audio_codecs, (void (*)(void*))payload_type_destroy);
+	ms_list_free_with_data(lc->default_video_codecs, (void (*)(void*))payload_type_destroy);
 }
 
 void linphone_core_set_state(LinphoneCore *lc, LinphoneGlobalState gstate, const char *message){
@@ -1541,10 +1507,73 @@ static void linphone_core_deactivate_log_serialization_if_needed(void) {
 	}
 }
 
-static void linphone_core_init(LinphoneCore * lc, const LinphoneCoreVTable *vtable, LpConfig *config, void * userdata)
-{
-	const char *remote_provisioning_uri = NULL;
+static void linphone_core_register_default_codecs(LinphoneCore *lc){
 	const char *aac_fmtp162248, *aac_fmtp3244;
+	bool_t opus_enabled=TRUE;
+	/*default enabled audio codecs, in order of preference*/
+#ifdef __arm__
+	/*hack for opus, that needs to be disabed by default on ARM single processor, otherwise there is no cpu left for video processing*/
+	if (ms_get_cpu_count()==1) opus_enabled=FALSE;
+#endif
+	linphone_core_register_payload_type(lc,&payload_type_opus,"useinbandfec=1; stereo=0; sprop-stereo=0",opus_enabled);
+	linphone_core_register_payload_type(lc,&payload_type_silk_wb,NULL,TRUE);
+	linphone_core_register_payload_type(lc,&payload_type_speex_wb,"vbr=on",TRUE);
+	linphone_core_register_payload_type(lc,&payload_type_speex_nb,"vbr=on",TRUE);
+	linphone_core_register_payload_type(lc,&payload_type_pcmu8000,NULL,TRUE);
+	linphone_core_register_payload_type(lc,&payload_type_pcma8000,NULL,TRUE);
+	
+	/*other audio codecs, not enabled by default, in order of preference*/
+	linphone_core_register_payload_type(lc,&payload_type_gsm,NULL,FALSE);
+	linphone_core_register_payload_type(lc,&payload_type_g722,NULL,FALSE);
+	linphone_core_register_payload_type(lc,&payload_type_ilbc,"mode=30",FALSE);
+	linphone_core_register_payload_type(lc,&payload_type_amr,"octet-align=1",FALSE);
+	linphone_core_register_payload_type(lc,&payload_type_amrwb,"octet-align=1",FALSE);
+	linphone_core_register_payload_type(lc,&payload_type_g729,"annexb=no",FALSE);
+	/* For AAC, we use a config value to determine if we ought to support SBR. Since it is not offically supported
+	 * for the mpeg4-generic mime type, setting this flag to 1 will break compatibility with other clients. */
+	if( lp_config_get_int(lc->config, "misc", "aac_use_sbr", FALSE) ) {
+		ms_message("Using SBR for AAC");
+		aac_fmtp162248 = "config=F8EE2000; constantDuration=512; indexDeltaLength=3; indexLength=3; mode=AAC-hbr; profile-level-id=76; sizeLength=13; streamType=5; SBR-enabled=1";
+		aac_fmtp3244   = "config=F8E82000; constantDuration=512; indexDeltaLength=3; indexLength=3; mode=AAC-hbr; profile-level-id=76; sizeLength=13; streamType=5; SBR-enabled=1";
+	} else {
+		aac_fmtp162248 = "config=F8EE2000; constantDuration=512; indexDeltaLength=3; indexLength=3; mode=AAC-hbr; profile-level-id=76; sizeLength=13; streamType=5";
+		aac_fmtp3244   = "config=F8E82000; constantDuration=512; indexDeltaLength=3; indexLength=3; mode=AAC-hbr; profile-level-id=76; sizeLength=13; streamType=5";
+	}
+	linphone_core_register_payload_type(lc,&payload_type_aaceld_16k,aac_fmtp162248,FALSE);
+	linphone_core_register_payload_type(lc,&payload_type_aaceld_22k,aac_fmtp162248,FALSE);
+	linphone_core_register_payload_type(lc,&payload_type_aaceld_32k,aac_fmtp3244,FALSE);
+	linphone_core_register_payload_type(lc,&payload_type_aaceld_44k,aac_fmtp3244,FALSE);
+	linphone_core_register_payload_type(lc,&payload_type_aaceld_48k,aac_fmtp162248,FALSE);
+	linphone_core_register_payload_type(lc,&payload_type_isac,NULL,FALSE);
+	linphone_core_register_payload_type(lc,&payload_type_speex_uwb,"vbr=on",FALSE);
+	linphone_core_register_payload_type(lc,&payload_type_silk_nb,NULL,FALSE);
+	linphone_core_register_payload_type(lc,&payload_type_silk_mb,NULL,FALSE);
+	linphone_core_register_payload_type(lc,&payload_type_silk_swb,NULL,FALSE);
+	linphone_core_register_payload_type(lc,&payload_type_g726_16,NULL,FALSE);
+	linphone_core_register_payload_type(lc,&payload_type_g726_24,NULL,FALSE);
+	linphone_core_register_payload_type(lc,&payload_type_g726_32,NULL,FALSE);
+	linphone_core_register_payload_type(lc,&payload_type_g726_40,NULL,FALSE);
+	linphone_core_register_payload_type(lc,&payload_type_aal2_g726_16,NULL,FALSE);
+	linphone_core_register_payload_type(lc,&payload_type_aal2_g726_24,NULL,FALSE);
+	linphone_core_register_payload_type(lc,&payload_type_aal2_g726_32,NULL,FALSE);
+	linphone_core_register_payload_type(lc,&payload_type_aal2_g726_40,NULL,FALSE);
+	
+	
+
+#ifdef VIDEO_ENABLED
+	/*default enabled video codecs, in order of preference*/
+	linphone_core_register_payload_type(lc,&payload_type_vp8,NULL,TRUE);
+	linphone_core_register_payload_type(lc,&payload_type_h264,"profile-level-id=42801F",TRUE);
+	linphone_core_register_payload_type(lc,&payload_type_mp4v,"profile-level-id=3",TRUE);
+	linphone_core_register_payload_type(lc,&payload_type_h263_1998,"CIF=1;QCIF=1",FALSE);
+	linphone_core_register_payload_type(lc,&payload_type_h263,NULL,FALSE);
+#endif
+	/*register all static payload types declared in av_profile of oRTP, if not already declared above*/
+	linphone_core_register_static_payloads(lc);
+}
+
+static void linphone_core_init(LinphoneCore * lc, const LinphoneCoreVTable *vtable, LpConfig *config, void * userdata){
+	const char *remote_provisioning_uri = NULL;
 	LinphoneCoreVTable* local_vtable= linphone_core_v_table_new();
 	ms_message("Initializing LinphoneCore %s", linphone_core_get_version());
 
@@ -1558,83 +1587,10 @@ static void linphone_core_init(LinphoneCore * lc, const LinphoneCoreVTable *vtab
 	linphone_core_set_state(lc,LinphoneGlobalStartup,"Starting up");
 	ortp_init();
 	linphone_core_activate_log_serialization_if_needed();
-	lc->dyn_pt=96;
-	lc->default_profile=rtp_profile_new("default profile");
-	linphone_core_assign_payload_type(lc,&payload_type_pcmu8000,0,NULL);
-	linphone_core_assign_payload_type(lc,&payload_type_gsm,3,NULL);
-	linphone_core_assign_payload_type(lc,&payload_type_pcma8000,8,NULL);
-	linphone_core_assign_payload_type(lc,&payload_type_speex_nb,110,"vbr=on");
-	linphone_core_assign_payload_type(lc,&payload_type_speex_wb,111,"vbr=on");
-	linphone_core_assign_payload_type(lc,&payload_type_speex_uwb,112,"vbr=on");
-	linphone_core_assign_payload_type(lc,&payload_type_telephone_event,101,"0-15");
-	linphone_core_assign_payload_type(lc,&payload_type_g722,9,NULL);
-
-#ifdef ENABLE_NONSTANDARD_GSM
-	{
-		PayloadType *pt;
-		pt=payload_type_clone(&payload_type_gsm);
-		pt->clock_rate=11025;
-		linphone_core_assign_payload_type(lc,pt,-1,NULL);
-		pt->clock_rate=22050;
-		linphone_core_assign_payload_type(lc,pt,-1,NULL);
-		payload_type_destroy(pt);
-	}
-#endif
-
-#ifdef VIDEO_ENABLED
-
-	linphone_core_assign_payload_type(lc,&payload_type_h263,34,NULL);
-	linphone_core_assign_payload_type(lc,&payload_type_h263_1998,98,"CIF=1;QCIF=1");
-	linphone_core_assign_payload_type(lc,&payload_type_mp4v,99,"profile-level-id=3");
-	linphone_core_assign_payload_type(lc,&payload_type_h264,102,"profile-level-id=42801F");
-	linphone_core_assign_payload_type(lc,&payload_type_vp8,103,NULL);
-
-	/* linphone_core_assign_payload_type(lc,&payload_type_theora,97,NULL); commented out to free 1 slot */
-	/* linphone_core_assign_payload_type(lc,&payload_type_x_snow,-1,NULL); commented out to free 1 slot */
-	/* due to limited space in SDP, we have to disable this h264 line which is normally no more necessary */
-	/* linphone_core_assign_payload_type(&payload_type_h264,-1,"packetization-mode=1;profile-level-id=428014");*/
-#endif
-
-	/* For AAC, we use a config value to determine if we ought to support SBR. Since it is not offically supported
-	 * for the mpeg4-generic mime type, setting this flag to 1 will break compatibility with other clients. */
-	if( lp_config_get_int(lc->config, "misc", "aac_use_sbr", FALSE) ) {
-		ms_message("Using SBR for AAC");
-		aac_fmtp162248 = "config=F8EE2000; constantDuration=512; indexDeltaLength=3; indexLength=3; mode=AAC-hbr; profile-level-id=76; sizeLength=13; streamType=5; SBR-enabled=1";
-		aac_fmtp3244   = "config=F8E82000; constantDuration=512; indexDeltaLength=3; indexLength=3; mode=AAC-hbr; profile-level-id=76; sizeLength=13; streamType=5; SBR-enabled=1";
-	} else {
-		aac_fmtp162248 = "config=F8EE2000; constantDuration=512; indexDeltaLength=3; indexLength=3; mode=AAC-hbr; profile-level-id=76; sizeLength=13; streamType=5";
-		aac_fmtp3244   = "config=F8E82000; constantDuration=512; indexDeltaLength=3; indexLength=3; mode=AAC-hbr; profile-level-id=76; sizeLength=13; streamType=5";
-	}
-
-
-	/*add all payload type for which we don't care about the number */
-	linphone_core_assign_payload_type(lc,&payload_type_ilbc,-1,"mode=30");
-	linphone_core_assign_payload_type(lc,&payload_type_amr,-1,"octet-align=1");
-	linphone_core_assign_payload_type(lc,&payload_type_amrwb,-1,"octet-align=1");
-	/* linphone_core_assign_payload_type(lc,&payload_type_lpc1015,-1,NULL); commented out to free 1 slot */
-	linphone_core_assign_payload_type(lc,&payload_type_g726_16,-1,NULL);
-	linphone_core_assign_payload_type(lc,&payload_type_g726_24,-1,NULL);
-	linphone_core_assign_payload_type(lc,&payload_type_g726_32,-1,NULL);
-	linphone_core_assign_payload_type(lc,&payload_type_g726_40,-1,NULL);
-	linphone_core_assign_payload_type(lc,&payload_type_aal2_g726_16,-1,NULL);
-	linphone_core_assign_payload_type(lc,&payload_type_aal2_g726_24,-1,NULL);
-	linphone_core_assign_payload_type(lc,&payload_type_aal2_g726_32,-1,NULL);
-	linphone_core_assign_payload_type(lc,&payload_type_aal2_g726_40,-1,NULL);
-	linphone_core_assign_payload_type(lc,&payload_type_silk_nb,-1,NULL);
-	linphone_core_assign_payload_type(lc,&payload_type_silk_mb,-1,NULL);
-	linphone_core_assign_payload_type(lc,&payload_type_silk_wb,-1,NULL);
-	linphone_core_assign_payload_type(lc,&payload_type_silk_swb,-1,NULL);
-	linphone_core_assign_payload_type(lc,&payload_type_g729,18,"annexb=no");
-	linphone_core_assign_payload_type(lc,&payload_type_aaceld_16k,-1,aac_fmtp162248);
-	linphone_core_assign_payload_type(lc,&payload_type_aaceld_22k,-1,aac_fmtp162248);
-	linphone_core_assign_payload_type(lc,&payload_type_aaceld_32k,-1,aac_fmtp3244);
-	linphone_core_assign_payload_type(lc,&payload_type_aaceld_44k,-1,aac_fmtp3244);
-	linphone_core_assign_payload_type(lc,&payload_type_aaceld_48k,-1,aac_fmtp162248);
-	linphone_core_assign_payload_type(lc,&payload_type_opus,-1,"useinbandfec=1; stereo=0; sprop-stereo=0");
-	linphone_core_assign_payload_type(lc,&payload_type_isac,-1,NULL);
-	linphone_core_handle_static_payloads(lc);
-
+	
 	ms_init();
+	
+	linphone_core_register_default_codecs(lc);
 	/* create a mediastreamer2 event queue and set it as global */
 	/* This allows to run event's callback in linphone_core_iterate() */
 	lc->msevq=ms_event_queue_new();
@@ -1841,8 +1797,7 @@ LinphoneAddress *linphone_core_get_primary_contact_parsed(LinphoneCore *lc){
  * The list is taken by the LinphoneCore thus the application should not free it.
  * This list is made of struct PayloadType describing the codec parameters.
 **/
-int linphone_core_set_audio_codecs(LinphoneCore *lc, MSList *codecs)
-{
+int linphone_core_set_audio_codecs(LinphoneCore *lc, MSList *codecs){
 	if (lc->codecs_conf.audio_codecs!=NULL) ms_list_free(lc->codecs_conf.audio_codecs);
 	lc->codecs_conf.audio_codecs=codecs;
 	_linphone_core_codec_config_write(lc);
@@ -1860,8 +1815,7 @@ int linphone_core_set_audio_codecs(LinphoneCore *lc, MSList *codecs)
  * The list is taken by the LinphoneCore thus the application should not free it.
  * This list is made of struct PayloadType describing the codec parameters.
 **/
-int linphone_core_set_video_codecs(LinphoneCore *lc, MSList *codecs)
-{
+int linphone_core_set_video_codecs(LinphoneCore *lc, MSList *codecs){
 	if (lc->codecs_conf.video_codecs!=NULL) ms_list_free(lc->codecs_conf.video_codecs);
 	lc->codecs_conf.video_codecs=codecs;
 	_linphone_core_codec_config_write(lc);
@@ -6212,8 +6166,8 @@ void _linphone_core_codec_config_write(LinphoneCore *lc){
 static void codecs_config_uninit(LinphoneCore *lc)
 {
 	_linphone_core_codec_config_write(lc);
-	ms_list_free(lc->codecs_conf.audio_codecs);
-	ms_list_free(lc->codecs_conf.video_codecs);
+	ms_list_free_with_data(lc->codecs_conf.audio_codecs, (void (*)(void*))payload_type_destroy);
+	ms_list_free_with_data(lc->codecs_conf.video_codecs, (void (*)(void*))payload_type_destroy);
 }
 
 void ui_config_uninit(LinphoneCore* lc)
@@ -6519,20 +6473,6 @@ const char *linphone_core_get_remote_ringback_tone(const LinphoneCore *lc){
 	return lc->sound_conf.ringback_tone;
 }
 
-static PayloadType* find_payload_type_from_list(const char* type, int rate, int channels, const MSList* from) {
-	const MSList *elem;
-	for(elem=from;elem!=NULL;elem=elem->next){
-		PayloadType *pt=(PayloadType*)elem->data;
-		if ((strcasecmp((char*)type, payload_type_get_mime(pt)) == 0)
-			&& (rate == LINPHONE_FIND_PAYLOAD_IGNORE_RATE || rate==pt->clock_rate)
-			&& (channels == LINPHONE_FIND_PAYLOAD_IGNORE_CHANNELS || channels==pt->channels)) {
-			return pt;
-		}
-	}
-	return NULL;
-}
-
-
 LinphonePayloadType* linphone_core_find_payload_type(LinphoneCore* lc, const char* type, int rate, int channels) {
 	LinphonePayloadType* result = find_payload_type_from_list(type, rate, channels, linphone_core_get_audio_codecs(lc));
 	if (result)  {
diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h
index c8a259f25..1e72fcd0a 100644
--- a/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@ -2345,8 +2345,19 @@ LINPHONE_PUBLIC	int linphone_core_enable_payload_type(LinphoneCore *lc, Linphone
  */
 LINPHONE_PUBLIC	LinphonePayloadType* linphone_core_find_payload_type(LinphoneCore* lc, const char* type, int rate, int channels) ;
 
+/**
+ * @ingroup media_parameters
+ * Returns the payload type number assigned for this codec.
+**/
 LINPHONE_PUBLIC	int linphone_core_get_payload_type_number(LinphoneCore *lc, const PayloadType *pt);
 
+/**
+ * @ingroup media_parameters
+ * Force a number for a payload type. The LinphoneCore does payload type number assignment automatically. THis function is to be used mainly for tests, in order
+ * to override the automatic assignment mechanism.
+**/
+LINPHONE_PUBLIC void linphone_core_set_payload_type_number(LinphoneCore *lc, PayloadType *pt, int number);
+
 LINPHONE_PUBLIC	const char *linphone_core_get_payload_type_description(LinphoneCore *lc, PayloadType *pt);
 
 LINPHONE_PUBLIC	bool_t linphone_core_check_payload_type_usability(LinphoneCore *lc, const PayloadType *pt);
diff --git a/coreapi/misc.c b/coreapi/misc.c
index 59244d3de..d88c80cd5 100644
--- a/coreapi/misc.c
+++ b/coreapi/misc.c
@@ -59,15 +59,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define RTP_HDR_SZ 12
 #define IP4_HDR_SZ 20   /*20 is the minimum, but there may be some options*/
 
-static void payload_type_set_enable(PayloadType *pt,int value)
-{
-	if ((value)!=0) payload_type_set_flag(pt,PAYLOAD_TYPE_ENABLED); \
-	else payload_type_unset_flag(pt,PAYLOAD_TYPE_ENABLED);
-}
-
-static bool_t payload_type_enabled(const PayloadType *pt) {
-	return (((pt)->flags & PAYLOAD_TYPE_ENABLED)!=0);
-}
 
 bool_t linphone_core_payload_type_enabled(LinphoneCore *lc, const LinphonePayloadType *pt){
 	if (ms_list_find(lc->codecs_conf.audio_codecs, (PayloadType*) pt) || ms_list_find(lc->codecs_conf.video_codecs, (PayloadType*)pt)){
@@ -97,6 +88,10 @@ int linphone_core_get_payload_type_number(LinphoneCore *lc, const PayloadType *p
 	return payload_type_get_number(pt);
 }
 
+void linphone_core_set_payload_type_number(LinphoneCore *lc, PayloadType *pt, int number){
+	payload_type_set_number(pt,number);
+}
+
 const char *linphone_core_get_payload_type_description(LinphoneCore *lc, PayloadType *pt){
 	if (ms_filter_codec_supported(pt->mime_type)){
 		MSFilterDesc *desc=ms_filter_get_encoder(pt->mime_type);
diff --git a/coreapi/offeranswer.c b/coreapi/offeranswer.c
index d7d2e6e84..b9ece30d8 100644
--- a/coreapi/offeranswer.c
+++ b/coreapi/offeranswer.c
@@ -110,6 +110,7 @@ static MSList *match_payloads(const MSList *local, const MSList *remote, bool_t
 			res=ms_list_append(res,newp);
 			/* we should use the remote numbering even when parsing a response */
 			payload_type_set_number(newp,remote_number);
+			payload_type_set_flag(newp, PAYLOAD_TYPE_FROZEN_NUMBER);
 			if (reading_response && remote_number!=local_number){
 				ms_warning("For payload type %s, proposed number was %i but the remote phone answered %i",
 						  newp->mime_type, local_number, remote_number);
@@ -120,6 +121,7 @@ static MSList *match_payloads(const MSList *local, const MSList *remote, bool_t
 				*/
 				newp=payload_type_clone(newp);
 				payload_type_set_number(newp,local_number);
+				payload_type_set_flag(newp, PAYLOAD_TYPE_FROZEN_NUMBER);
 				res=ms_list_append(res,newp);
 			}
 		}else{
@@ -143,7 +145,8 @@ static MSList *match_payloads(const MSList *local, const MSList *remote, bool_t
 			if (!found){
 				ms_message("Adding %s/%i for compatibility, just in case.",p1->mime_type,p1->clock_rate);
 				p1=payload_type_clone(p1);
-				p1->flags|=PAYLOAD_TYPE_FLAG_CAN_RECV;
+				payload_type_set_flag(p1, PAYLOAD_TYPE_FLAG_CAN_RECV);
+				payload_type_set_flag(p1, PAYLOAD_TYPE_FROZEN_NUMBER);
 				res=ms_list_append(res,p1);
 			}
 		}
diff --git a/coreapi/private.h b/coreapi/private.h
index 55f1f1034..68a0e6354 100644
--- a/coreapi/private.h
+++ b/coreapi/private.h
@@ -365,6 +365,7 @@ static MS2_INLINE void set_string(char **dest, const char *src){
 
 #define PAYLOAD_TYPE_ENABLED	PAYLOAD_TYPE_USER_FLAG_0
 #define PAYLOAD_TYPE_BITRATE_OVERRIDE PAYLOAD_TYPE_USER_FLAG_3
+#define PAYLOAD_TYPE_FROZEN_NUMBER	PAYLOAD_TYPE_USER_FLAG_4
 
 void linphone_process_authentication(LinphoneCore* lc, SalOp *op);
 void linphone_authentication_ok(LinphoneCore *lc, SalOp *op);
@@ -643,7 +644,9 @@ typedef struct sound_config
 typedef struct codecs_config
 {
 	MSList *audio_codecs;  /* list of audio codecs in order of preference*/
-	MSList *video_codecs;	/* for later use*/
+	MSList *video_codecs;
+	int dyn_pt;
+	int telephone_event_pt;
 }codecs_config_t;
 
 typedef struct video_config{
@@ -710,7 +713,8 @@ struct _LinphoneCore
 	Sal *sal;
 	LinphoneGlobalState state;
 	struct _LpConfig *config;
-	RtpProfile *default_profile;
+	MSList *default_audio_codecs;
+	MSList *default_video_codecs;
 	net_config_t net_conf;
 	sip_config_t sip_conf;
 	rtp_config_t rtp_conf;
@@ -719,8 +723,6 @@ struct _LinphoneCore
 	codecs_config_t codecs_conf;
 	ui_config_t ui_conf;
 	autoreplier_config_t autoreplier_conf;
-	MSList *payload_types;
-	int dyn_pt;
 	LinphoneProxyConfig *default_proxy;
 	MSList *friends;
 	MSList *auth_info;
@@ -1014,6 +1016,18 @@ static MS2_INLINE const LinphoneErrorInfo *linphone_error_info_from_sal_op(const
 	return (const LinphoneErrorInfo*)sal_op_get_error_info(op);
 }
 
+static MS2_INLINE void payload_type_set_enable(PayloadType *pt,int value)
+{
+	if ((value)!=0) payload_type_set_flag(pt,PAYLOAD_TYPE_ENABLED); \
+	else payload_type_unset_flag(pt,PAYLOAD_TYPE_ENABLED);
+}
+
+static MS2_INLINE bool_t payload_type_enabled(const PayloadType *pt) {
+	return (((pt)->flags & PAYLOAD_TYPE_ENABLED)!=0);
+}
+
+bool_t is_payload_type_number_available(const MSList *l, int number, const PayloadType *ignore);
+
 const MSCryptoSuite * linphone_core_get_srtp_crypto_suites(LinphoneCore *lc);
 
 /** Belle Sip-based objects need unique ids
diff --git a/coreapi/quality_reporting.c b/coreapi/quality_reporting.c
index bb1d443bf..e22f7229c 100644
--- a/coreapi/quality_reporting.c
+++ b/coreapi/quality_reporting.c
@@ -332,6 +332,7 @@ static int send_report(LinphoneCall* call, reporting_session_report_t * report,
 	}
 
 	linphone_content_set_buffer(content, buffer, strlen(buffer));
+	ms_free(buffer);
 
 	if (call->log->reporting.on_report_sent != NULL){
 		call->log->reporting.on_report_sent(
diff --git a/coreapi/sal.c b/coreapi/sal.c
index b8395c897..1577f95f6 100644
--- a/coreapi/sal.c
+++ b/coreapi/sal.c
@@ -62,9 +62,10 @@ SalMediaDescription *sal_media_description_new(){
 static void sal_media_description_destroy(SalMediaDescription *md){
 	int i;
 	for(i=0;i<SAL_MEDIA_DESCRIPTION_MAX_STREAMS;i++){
-		ms_list_for_each(md->streams[i].payloads,(void (*)(void *))payload_type_destroy);
-		ms_list_free(md->streams[i].payloads);
+		ms_list_free_with_data(md->streams[i].payloads,(void (*)(void *))payload_type_destroy);
+		ms_list_free_with_data(md->streams[i].already_assigned_payloads,(void (*)(void *))payload_type_destroy);
 		md->streams[i].payloads=NULL;
+		md->streams[i].already_assigned_payloads=NULL;
 	}
 	ms_free(md);
 }
diff --git a/include/sal/sal.h b/include/sal/sal.h
index c44317c88..42f2d6da8 100644
--- a/include/sal/sal.h
+++ b/include/sal/sal.h
@@ -196,7 +196,8 @@ typedef struct SalStreamDescription{
 	char rtcp_addr[64];
 	int rtp_port;
 	int rtcp_port;
-	MSList *payloads; //<list of PayloadType
+	MSList *payloads; /*<list of PayloadType */
+	MSList *already_assigned_payloads; /*<list of PayloadType offered in the past, used for correct allocation of payload type numbers*/
 	int bandwidth;
 	int ptime;
 	SalStreamDir dir;
diff --git a/mediastreamer2 b/mediastreamer2
index 5662b24bc..7d2a30214 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 5662b24bc9ddd186daae74555b05b42bfedd763d
+Subproject commit 7d2a30214b8010224eed26bc1f239907618b9674
diff --git a/oRTP b/oRTP
index 0ad89f5e1..e5470e271 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 0ad89f5e106d9f9a4a1d0608101d26b9a10be8b7
+Subproject commit e5470e271d5be74f425db9221cd35a60ce4cf52e
diff --git a/tester/Makefile.am b/tester/Makefile.am
index d296841ad..6c5ba79bc 100644
--- a/tester/Makefile.am
+++ b/tester/Makefile.am
@@ -26,7 +26,8 @@ liblinphonetester_la_SOURCES = tester.c \
 				transport_tester.c \
 				player_tester.c \
 				dtmf_tester.c \
-				accountmanager.c
+				accountmanager.c \
+				offeranswer_tester.c
 
 liblinphonetester_la_LDFLAGS= -no-undefined
 liblinphonetester_la_LIBADD= ../coreapi/liblinphone.la $(CUNIT_LIBS)
diff --git a/tester/accountmanager.c b/tester/accountmanager.c
index 97cf8803b..2236b2039 100644
--- a/tester/accountmanager.c
+++ b/tester/accountmanager.c
@@ -77,6 +77,7 @@ void account_manager_destroy(void){
 		ms_free(the_am);
 	}
 	the_am=NULL;
+	ms_message("Test account manager destroyed.");
 }
 
 Account *account_manager_get_account(AccountManager *m, const LinphoneAddress *identity){
@@ -211,10 +212,6 @@ void linphone_core_manager_check_accounts(LinphoneCoreManager *m){
 
 	for(it=linphone_core_get_proxy_config_list(m->lc);it!=NULL;it=it->next){
 		LinphoneProxyConfig *cfg=(LinphoneProxyConfig *)it->data;
-		LinphoneAddress *modified_identity=account_manager_check_account(am,cfg);
-		if (m->identity){
-			linphone_address_unref(m->identity);
-		}
-		m->identity=linphone_address_ref(modified_identity);
+		account_manager_check_account(am,cfg);
 	}
 }
diff --git a/tester/call_tester.c b/tester/call_tester.c
index d608e9723..51cd2d550 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -34,7 +34,6 @@
 
 static void srtp_call(void);
 static void call_base(LinphoneMediaEncryption mode, bool_t enable_video,bool_t enable_relay,LinphoneFirewallPolicy policy);
-static void disable_all_audio_codecs_except_one(LinphoneCore *lc, const char *mime, int rate);
 static char *create_filepath(const char *dir, const char *filename, const char *ext);
 
 // prototype definition for call_recording()
@@ -727,7 +726,7 @@ static void cancelled_call(void) {
 	linphone_core_manager_destroy(pauline);
 }
 
-static void disable_all_audio_codecs_except_one(LinphoneCore *lc, const char *mime, int rate){
+void disable_all_audio_codecs_except_one(LinphoneCore *lc, const char *mime, int rate){
 	const MSList *elem=linphone_core_get_audio_codecs(lc);
 	PayloadType *pt;
 
@@ -754,40 +753,6 @@ static void disable_all_video_codecs_except_one(LinphoneCore *lc, const char *mi
 }
 #endif
 
-static void call_failed_because_of_codecs(void) {
-	int begin,leaked_objects;
-
-	belle_sip_object_enable_leak_detector(TRUE);
-	begin=belle_sip_object_get_object_count();
-
-	{
-		LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
-		LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
-		LinphoneCall* out_call;
-
-		disable_all_audio_codecs_except_one(marie->lc,"pcmu",-1);
-		disable_all_audio_codecs_except_one(pauline->lc,"pcma",-1);
-		out_call = linphone_core_invite_address(pauline->lc,marie->identity);
-		linphone_call_ref(out_call);
-		CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallOutgoingInit,1));
-
-		/*flexisip will retain the 488 until the "urgent reply" timeout (I.E 5s) arrives.*/
-		CU_ASSERT_TRUE(wait_for_until(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallError,1,7000));
-		CU_ASSERT_EQUAL(linphone_call_get_reason(out_call),LinphoneReasonNotAcceptable);
-		CU_ASSERT_EQUAL(marie->stat.number_of_LinphoneCallIncomingReceived,0);
-		CU_ASSERT_EQUAL(marie->stat.number_of_LinphoneCallReleased,0);
-
-		linphone_call_unref(out_call);
-		linphone_core_manager_destroy(marie);
-		linphone_core_manager_destroy(pauline);
-	}
-	leaked_objects=belle_sip_object_get_object_count()-begin;
-	CU_ASSERT_TRUE(leaked_objects==0);
-	if (leaked_objects>0){
-		belle_sip_object_dump_active_objects();
-	}
-}
-
 static void call_with_dns_time_out(void) {
 	LinphoneCoreManager* marie = linphone_core_manager_new2( "empty_rc", FALSE);
 	LCSipTransports transport = {9773,0,0,0};
@@ -3036,115 +3001,6 @@ static void multiple_early_media(void) {
 }
 #endif
 
-static void profile_call(bool_t avpf1, bool_t srtp1, bool_t avpf2, bool_t srtp2, const char *expected_profile) {
-	LinphoneCoreManager *marie = linphone_core_manager_new("marie_rc");
-	LinphoneCoreManager *pauline = linphone_core_manager_new("pauline_rc");
-	LinphoneProxyConfig *lpc;
-	const LinphoneCallParams *params;
-
-	if (avpf1) {
-		linphone_core_get_default_proxy(marie->lc, &lpc);
-		linphone_proxy_config_enable_avpf(lpc, TRUE);
-		linphone_proxy_config_set_avpf_rr_interval(lpc, 3);
-	}
-	if (avpf2) {
-		linphone_core_get_default_proxy(pauline->lc, &lpc);
-		linphone_proxy_config_enable_avpf(lpc, TRUE);
-		linphone_proxy_config_set_avpf_rr_interval(lpc, 3);
-	}
-	if (srtp1) {
-		if (linphone_core_media_encryption_supported(marie->lc, LinphoneMediaEncryptionSRTP)) {
-			linphone_core_set_media_encryption(marie->lc, LinphoneMediaEncryptionSRTP);
-		}
-	}
-	if (srtp2) {
-		if (linphone_core_media_encryption_supported(pauline->lc, LinphoneMediaEncryptionSRTP)) {
-			linphone_core_set_media_encryption(pauline->lc, LinphoneMediaEncryptionSRTP);
-		}
-	}
-
-	CU_ASSERT_TRUE(call(marie, pauline));
-	CU_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallStreamsRunning, 1));
-	CU_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallStreamsRunning, 1));
-	params = linphone_call_get_current_params(linphone_core_get_current_call(marie->lc));
-	CU_ASSERT_STRING_EQUAL(linphone_call_params_get_rtp_profile(params), expected_profile);
-	params = linphone_call_get_current_params(linphone_core_get_current_call(pauline->lc));
-	CU_ASSERT_STRING_EQUAL(linphone_call_params_get_rtp_profile(params), expected_profile);
-
-	linphone_core_terminate_all_calls(marie->lc);
-	CU_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallEnd, 1));
-	CU_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallEnd, 1));
-	CU_ASSERT_EQUAL(marie->stat.number_of_LinphoneCallConnected, 1);
-	CU_ASSERT_EQUAL(pauline->stat.number_of_LinphoneCallConnected, 1);
-
-	linphone_core_manager_destroy(pauline);
-	linphone_core_manager_destroy(marie);
-}
-
-static void avp_to_avp_call(void) {
-	profile_call(FALSE, FALSE, FALSE, FALSE, "RTP/AVP");
-}
-
-static void avp_to_avpf_call(void) {
-	profile_call(FALSE, FALSE, TRUE, FALSE, "RTP/AVP");
-}
-
-static void avp_to_savp_call(void) {
-	profile_call(FALSE, FALSE, FALSE, TRUE, "RTP/AVP");
-}
-
-static void avp_to_savpf_call(void) {
-	profile_call(FALSE, FALSE, TRUE, TRUE, "RTP/AVP");
-}
-
-static void avpf_to_avp_call(void) {
-	profile_call(TRUE, FALSE, FALSE, FALSE, "RTP/AVPF");
-}
-
-static void avpf_to_avpf_call(void) {
-	profile_call(TRUE, FALSE, TRUE, FALSE, "RTP/AVPF");
-}
-
-static void avpf_to_savp_call(void) {
-	profile_call(TRUE, FALSE, FALSE, TRUE, "RTP/AVPF");
-}
-
-static void avpf_to_savpf_call(void) {
-	profile_call(TRUE, FALSE, TRUE, TRUE, "RTP/AVPF");
-}
-
-static void savp_to_avp_call(void) {
-	profile_call(FALSE, TRUE, FALSE, FALSE, "RTP/SAVP");
-}
-
-static void savp_to_avpf_call(void) {
-	profile_call(FALSE, TRUE, TRUE, FALSE, "RTP/SAVP");
-}
-
-static void savp_to_savp_call(void) {
-	profile_call(FALSE, TRUE, FALSE, TRUE, "RTP/SAVP");
-}
-
-static void savp_to_savpf_call(void) {
-	profile_call(FALSE, TRUE, TRUE, TRUE, "RTP/SAVP");
-}
-
-static void savpf_to_avp_call(void) {
-	profile_call(TRUE, TRUE, FALSE, FALSE, "RTP/SAVPF");
-}
-
-static void savpf_to_avpf_call(void) {
-	profile_call(TRUE, TRUE, TRUE, FALSE, "RTP/SAVPF");
-}
-
-static void savpf_to_savp_call(void) {
-	profile_call(TRUE, TRUE, FALSE, TRUE, "RTP/SAVPF");
-}
-
-static void savpf_to_savpf_call(void) {
-	profile_call(TRUE, TRUE, TRUE, TRUE, "RTP/SAVPF");
-}
-
 static char *create_filepath(const char *dir, const char *filename, const char *ext) {
 	return ms_strdup_printf("%s/%s.%s",dir,filename,ext);
 }
@@ -3530,7 +3386,6 @@ test_t call_tests[] = {
 	{ "Early cancelled call", early_cancelled_call},
 	{ "Call with DNS timeout", call_with_dns_time_out },
 	{ "Cancelled ringing call", cancelled_ringing_call },
-	{ "Call failed because of codecs", call_failed_because_of_codecs },
 	{ "Simple call", simple_call },
 	{ "Call with timeouted bye", call_with_timeouted_bye },
 	{ "Direct call over IPv6", direct_call_over_ipv6},
@@ -3607,22 +3462,6 @@ test_t call_tests[] = {
 	{ "Call established with rejected RE-INVITE in error", call_established_with_rejected_reinvite_with_error},
 	{ "Call redirected by callee", call_redirect},
 	{ "Call with specified codec bitrate", call_with_specified_codec_bitrate},
-	{ "AVP to AVP call", avp_to_avp_call },
-	{ "AVP to AVPF call", avp_to_avpf_call },
-	{ "AVP to SAVP call", avp_to_savp_call },
-	{ "AVP to SAVPF call", avp_to_savpf_call },
-	{ "AVPF to AVP call", avpf_to_avp_call },
-	{ "AVPF to AVPF call", avpf_to_avpf_call },
-	{ "AVPF to SAVP call", avpf_to_savp_call },
-	{ "AVPF to SAVPF call", avpf_to_savpf_call },
-	{ "SAVP to AVP call", savp_to_avp_call },
-	{ "SAVP to AVPF call", savp_to_avpf_call },
-	{ "SAVP to SAVP call", savp_to_savp_call },
-	{ "SAVP to SAVPF call", savp_to_savpf_call },
-	{ "SAVPF to AVP call", savpf_to_avp_call },
-	{ "SAVPF to AVPF call", savpf_to_avpf_call },
-	{ "SAVPF to SAVP call", savpf_to_savp_call },
-	{ "SAVPF to SAVPF call", savpf_to_savpf_call },
 	{ "Call with in-dialog UPDATE request", call_with_in_dialog_update },
 	{ "Call with in-dialog codec change", call_with_in_dialog_codec_change },
 	{ "Call with in-dialog codec change no sdp", call_with_in_dialog_codec_change_no_sdp },
diff --git a/tester/liblinphone_tester.h b/tester/liblinphone_tester.h
index 0ae708b70..5f257bb08 100644
--- a/tester/liblinphone_tester.h
+++ b/tester/liblinphone_tester.h
@@ -62,6 +62,7 @@ extern test_suite_t log_collection_test_suite;
 extern test_suite_t transport_test_suite;
 extern test_suite_t player_test_suite;
 extern test_suite_t dtmf_test_suite;
+extern test_suite_t offeranswer_test_suite;
 
 
 extern int liblinphone_tester_nb_test_suites(void);
@@ -293,6 +294,7 @@ bool_t call_with_test_params(LinphoneCoreManager* caller_mgr
 
 bool_t call(LinphoneCoreManager* caller_mgr,LinphoneCoreManager* callee_mgr);
 void end_call(LinphoneCoreManager *m1, LinphoneCoreManager *m2);
+void disable_all_audio_codecs_except_one(LinphoneCore *lc, const char *mime, int rate);
 stats * get_stats(LinphoneCore *lc);
 LinphoneCoreManager *get_manager(LinphoneCore *lc);
 const char *liblinphone_tester_get_subscribe_content(void);
diff --git a/tester/offeranswer_tester.c b/tester/offeranswer_tester.c
new file mode 100644
index 000000000..b9de6a879
--- /dev/null
+++ b/tester/offeranswer_tester.c
@@ -0,0 +1,297 @@
+/*
+	liblinphone_tester - liblinphone test suite
+	Copyright (C) 2013  Belledonne Communications SARL
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 2 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include "CUnit/Basic.h"
+#include "linphonecore.h"
+#include "lpconfig.h"
+#include "private.h"
+#include "liblinphone_tester.h"
+
+static int get_codec_position(const MSList *l, const char *mime_type, int rate){
+	const MSList *elem;
+	int i;
+	for (elem=l, i=0; elem!=NULL; elem=elem->next,i++){
+		PayloadType *pt=(PayloadType*)elem->data;
+		if (strcasecmp(pt->mime_type, mime_type)==0 && pt->clock_rate==rate) return i;
+	}
+	return -1;
+}
+
+/*check basic things about codecs at startup: order and enablement*/
+static void start_with_no_config(void){
+	LinphoneCoreVTable vtable={0};
+	LinphoneCore *lc=linphone_core_new(&vtable, NULL, NULL, NULL);
+	const MSList *codecs=linphone_core_get_audio_codecs(lc);
+	int opus_codec_pos;
+	int speex_codec_pos=get_codec_position(codecs, "speex", 8000);
+	int speex16_codec_pos=get_codec_position(codecs, "speex", 16000);
+	PayloadType *pt;
+	opus_codec_pos=get_codec_position(codecs, "opus", 48000);
+	if (opus_codec_pos!=-1) CU_ASSERT_TRUE(opus_codec_pos==0);
+	CU_ASSERT_TRUE(speex16_codec_pos<speex_codec_pos);
+	
+	pt=linphone_core_find_payload_type(lc, "speex", 16000, 1);
+	CU_ASSERT_PTR_NOT_NULL(pt);
+	if (pt) {
+		CU_ASSERT_TRUE(linphone_core_payload_type_enabled(lc, pt)==TRUE);
+	}
+	linphone_core_destroy(lc);
+}
+
+static void check_payload_type_numbers(LinphoneCall *call1, LinphoneCall *call2, int expected_number){
+	const LinphoneCallParams *params=linphone_call_get_current_params(call1);
+	const PayloadType *pt=linphone_call_params_get_used_audio_codec(params);
+	CU_ASSERT_PTR_NOT_NULL(pt);
+	if (pt){
+		CU_ASSERT_TRUE(linphone_core_get_payload_type_number(linphone_call_get_core(call1),pt)==expected_number);
+	}
+	params=linphone_call_get_current_params(call2);
+	pt=linphone_call_params_get_used_audio_codec(params);
+	CU_ASSERT_PTR_NOT_NULL(pt);
+	if (pt){
+		CU_ASSERT_TRUE(linphone_core_get_payload_type_number(linphone_call_get_core(call1),pt)==expected_number);
+	}
+}
+
+static void simple_call_with_different_codec_mappings(void) {
+	int begin;
+	int leaked_objects;
+	LinphoneCoreManager* marie;
+	LinphoneCoreManager* pauline;
+	LinphoneCall *pauline_call;
+
+	belle_sip_object_enable_leak_detector(TRUE);
+	begin=belle_sip_object_get_object_count();
+
+	marie = linphone_core_manager_new( "marie_rc");
+	pauline = linphone_core_manager_new( "pauline_rc");
+	
+	disable_all_audio_codecs_except_one(marie->lc,"pcmu",-1);
+	disable_all_audio_codecs_except_one(pauline->lc,"pcmu",-1);
+	
+	/*marie set a fantasy number to PCMU*/
+	linphone_core_set_payload_type_number(marie->lc,
+		linphone_core_find_payload_type(marie->lc, "PCMU", 8000, -1),
+		104);
+	
+	CU_ASSERT_TRUE(call(marie,pauline));
+	pauline_call=linphone_core_get_current_call(pauline->lc);
+	CU_ASSERT_PTR_NOT_NULL(pauline_call);
+	if (pauline_call){
+		LinphoneCallParams *params;
+		check_payload_type_numbers(linphone_core_get_current_call(marie->lc), pauline_call, 104);
+		/*make a reinvite in the other direction*/
+		linphone_core_update_call(pauline->lc, pauline_call, 
+			params=linphone_core_create_call_params(pauline->lc, pauline_call));
+		linphone_call_params_unref(params);
+		CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallUpdating,1));
+		CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallUpdatedByRemote,1));
+		CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallStreamsRunning,2));
+		CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallStreamsRunning,2));
+		/*payload type numbers shall remain the same*/
+		check_payload_type_numbers(linphone_core_get_current_call(marie->lc), pauline_call, 104);
+	}
+
+	end_call(marie,pauline);
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+
+	leaked_objects=belle_sip_object_get_object_count()-begin;
+	CU_ASSERT_TRUE(leaked_objects==0);
+	if (leaked_objects>0){
+		belle_sip_object_dump_active_objects();
+	}
+}
+
+static void call_failed_because_of_codecs(void) {
+	int begin,leaked_objects;
+
+	belle_sip_object_enable_leak_detector(TRUE);
+	begin=belle_sip_object_get_object_count();
+
+	{
+		LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+		LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
+		LinphoneCall* out_call;
+
+		disable_all_audio_codecs_except_one(marie->lc,"pcmu",-1);
+		disable_all_audio_codecs_except_one(pauline->lc,"pcma",-1);
+		out_call = linphone_core_invite_address(pauline->lc,marie->identity);
+		linphone_call_ref(out_call);
+		CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallOutgoingInit,1));
+
+		/*flexisip will retain the 488 until the "urgent reply" timeout (I.E 5s) arrives.*/
+		CU_ASSERT_TRUE(wait_for_until(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallError,1,7000));
+		CU_ASSERT_EQUAL(linphone_call_get_reason(out_call),LinphoneReasonNotAcceptable);
+		CU_ASSERT_EQUAL(marie->stat.number_of_LinphoneCallIncomingReceived,0);
+		CU_ASSERT_EQUAL(marie->stat.number_of_LinphoneCallReleased,0);
+
+		linphone_call_unref(out_call);
+		linphone_core_manager_destroy(marie);
+		linphone_core_manager_destroy(pauline);
+	}
+	leaked_objects=belle_sip_object_get_object_count()-begin;
+	CU_ASSERT_TRUE(leaked_objects==0);
+	if (leaked_objects>0){
+		belle_sip_object_dump_active_objects();
+	}
+}
+
+
+static void profile_call(bool_t avpf1, bool_t srtp1, bool_t avpf2, bool_t srtp2, const char *expected_profile) {
+	LinphoneCoreManager *marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager *pauline = linphone_core_manager_new("pauline_rc");
+	LinphoneProxyConfig *lpc;
+	const LinphoneCallParams *params;
+
+	if (avpf1) {
+		linphone_core_get_default_proxy(marie->lc, &lpc);
+		linphone_proxy_config_enable_avpf(lpc, TRUE);
+		linphone_proxy_config_set_avpf_rr_interval(lpc, 3);
+	}
+	if (avpf2) {
+		linphone_core_get_default_proxy(pauline->lc, &lpc);
+		linphone_proxy_config_enable_avpf(lpc, TRUE);
+		linphone_proxy_config_set_avpf_rr_interval(lpc, 3);
+	}
+	if (srtp1) {
+		if (linphone_core_media_encryption_supported(marie->lc, LinphoneMediaEncryptionSRTP)) {
+			linphone_core_set_media_encryption(marie->lc, LinphoneMediaEncryptionSRTP);
+		}
+	}
+	if (srtp2) {
+		if (linphone_core_media_encryption_supported(pauline->lc, LinphoneMediaEncryptionSRTP)) {
+			linphone_core_set_media_encryption(pauline->lc, LinphoneMediaEncryptionSRTP);
+		}
+	}
+
+	CU_ASSERT_TRUE(call(marie, pauline));
+	CU_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallStreamsRunning, 1));
+	CU_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallStreamsRunning, 1));
+	params = linphone_call_get_current_params(linphone_core_get_current_call(marie->lc));
+	CU_ASSERT_STRING_EQUAL(linphone_call_params_get_rtp_profile(params), expected_profile);
+	params = linphone_call_get_current_params(linphone_core_get_current_call(pauline->lc));
+	CU_ASSERT_STRING_EQUAL(linphone_call_params_get_rtp_profile(params), expected_profile);
+
+	linphone_core_terminate_all_calls(marie->lc);
+	CU_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallEnd, 1));
+	CU_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallEnd, 1));
+	CU_ASSERT_EQUAL(marie->stat.number_of_LinphoneCallConnected, 1);
+	CU_ASSERT_EQUAL(pauline->stat.number_of_LinphoneCallConnected, 1);
+
+	linphone_core_manager_destroy(pauline);
+	linphone_core_manager_destroy(marie);
+}
+
+static void avp_to_avp_call(void) {
+	profile_call(FALSE, FALSE, FALSE, FALSE, "RTP/AVP");
+}
+
+static void avp_to_avpf_call(void) {
+	profile_call(FALSE, FALSE, TRUE, FALSE, "RTP/AVP");
+}
+
+static void avp_to_savp_call(void) {
+	profile_call(FALSE, FALSE, FALSE, TRUE, "RTP/AVP");
+}
+
+static void avp_to_savpf_call(void) {
+	profile_call(FALSE, FALSE, TRUE, TRUE, "RTP/AVP");
+}
+
+static void avpf_to_avp_call(void) {
+	profile_call(TRUE, FALSE, FALSE, FALSE, "RTP/AVPF");
+}
+
+static void avpf_to_avpf_call(void) {
+	profile_call(TRUE, FALSE, TRUE, FALSE, "RTP/AVPF");
+}
+
+static void avpf_to_savp_call(void) {
+	profile_call(TRUE, FALSE, FALSE, TRUE, "RTP/AVPF");
+}
+
+static void avpf_to_savpf_call(void) {
+	profile_call(TRUE, FALSE, TRUE, TRUE, "RTP/AVPF");
+}
+
+static void savp_to_avp_call(void) {
+	profile_call(FALSE, TRUE, FALSE, FALSE, "RTP/SAVP");
+}
+
+static void savp_to_avpf_call(void) {
+	profile_call(FALSE, TRUE, TRUE, FALSE, "RTP/SAVP");
+}
+
+static void savp_to_savp_call(void) {
+	profile_call(FALSE, TRUE, FALSE, TRUE, "RTP/SAVP");
+}
+
+static void savp_to_savpf_call(void) {
+	profile_call(FALSE, TRUE, TRUE, TRUE, "RTP/SAVP");
+}
+
+static void savpf_to_avp_call(void) {
+	profile_call(TRUE, TRUE, FALSE, FALSE, "RTP/SAVPF");
+}
+
+static void savpf_to_avpf_call(void) {
+	profile_call(TRUE, TRUE, TRUE, FALSE, "RTP/SAVPF");
+}
+
+static void savpf_to_savp_call(void) {
+	profile_call(TRUE, TRUE, FALSE, TRUE, "RTP/SAVPF");
+}
+
+static void savpf_to_savpf_call(void) {
+	profile_call(TRUE, TRUE, TRUE, TRUE, "RTP/SAVPF");
+}
+
+static test_t offeranswer_tests[] = {
+	{ "Start with no config", start_with_no_config },
+	{ "Call failed because of codecs", call_failed_because_of_codecs },
+	{ "Simple call with different codec mappings", simple_call_with_different_codec_mappings},
+	{ "AVP to AVP call", avp_to_avp_call },
+	{ "AVP to AVPF call", avp_to_avpf_call },
+	{ "AVP to SAVP call", avp_to_savp_call },
+	{ "AVP to SAVPF call", avp_to_savpf_call },
+	{ "AVPF to AVP call", avpf_to_avp_call },
+	{ "AVPF to AVPF call", avpf_to_avpf_call },
+	{ "AVPF to SAVP call", avpf_to_savp_call },
+	{ "AVPF to SAVPF call", avpf_to_savpf_call },
+	{ "SAVP to AVP call", savp_to_avp_call },
+	{ "SAVP to AVPF call", savp_to_avpf_call },
+	{ "SAVP to SAVP call", savp_to_savp_call },
+	{ "SAVP to SAVPF call", savp_to_savpf_call },
+	{ "SAVPF to AVP call", savpf_to_avp_call },
+	{ "SAVPF to AVPF call", savpf_to_avpf_call },
+	{ "SAVPF to SAVP call", savpf_to_savp_call },
+	{ "SAVPF to SAVPF call", savpf_to_savpf_call },
+};
+
+test_suite_t offeranswer_test_suite = {
+	"Offer-answer",
+	NULL,
+	NULL,
+	sizeof(offeranswer_tests) / sizeof(offeranswer_tests[0]),
+	offeranswer_tests
+};
diff --git a/tester/tester.c b/tester/tester.c
index 8c09b90f1..d3a34a375 100644
--- a/tester/tester.c
+++ b/tester/tester.c
@@ -420,6 +420,7 @@ void liblinphone_tester_set_writable_dir_prefix(const char* writable_dir_prefix)
 void liblinphone_tester_init(void) {
 	add_test_suite(&setup_test_suite);
 	add_test_suite(&register_test_suite);
+	add_test_suite(&offeranswer_test_suite);
 	add_test_suite(&call_test_suite);
 	add_test_suite(&message_test_suite);
 	add_test_suite(&presence_test_suite);

From a75e8496116a2f1d4bfa10805e4cc37be02159d9 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Thu, 22 Jan 2015 10:21:11 +0100
Subject: [PATCH 289/496] disable cross correlation tests, on arm, too long.

---
 tester/call_tester.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/tester/call_tester.c b/tester/call_tester.c
index 51cd2d550..dc8512f61 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -2120,12 +2120,16 @@ static void call_with_file_player(void) {
 	linphone_core_terminate_all_calls(marie->lc);
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,1));
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1));
+#ifndef __arm__
 	CU_ASSERT_TRUE(ms_audio_diff(hellopath,recordpath,&similar,NULL,NULL)==0);
 	CU_ASSERT_TRUE(similar>threshold);
 	CU_ASSERT_TRUE(similar<=1.0);
 	if(similar > threshold && similar <=1.0) {
 		remove(recordpath);
 	}
+#else
+	remove(recordpath);
+#endif 
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
 	ms_free(recordpath);
@@ -2188,16 +2192,16 @@ static void call_with_mkv_file_player(void) {
 	linphone_core_terminate_all_calls(marie->lc);
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,1));
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1));
-#ifdef ANDROID
-	/*inter-correlation process is too much CPU consuming ending in a 20 minutes test on Android...*/
-	remove(recordpath);
-#else
+#ifndef __arm__
 	CU_ASSERT_TRUE(ms_audio_diff(hellowav,recordpath,&similar,NULL,NULL)==0);
 	CU_ASSERT_TRUE(similar>threshold);
 	CU_ASSERT_TRUE(similar<=1.0);
 	if(similar>threshold && similar<=1.0) {
 		remove(recordpath);
 	}
+#else
+	/*inter-correlation process is too much CPU consuming ending in a 20 minutes test on arm...*/
+	remove(recordpath);
 #endif
 	ms_free(recordpath);
 

From 9d3e0e736ee630c0b72ad06ec09c534b6f64c039 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Thu, 22 Jan 2015 10:22:58 +0100
Subject: [PATCH 290/496] fix conference with ice on android

---
 tester/call_tester.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tester/call_tester.c b/tester/call_tester.c
index dc8512f61..ad703753e 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -1981,15 +1981,13 @@ static void simple_conference_base(LinphoneCoreManager* marie, LinphoneCoreManag
 
 	CU_ASSERT_PTR_NOT_NULL_FATAL(marie_call_laure);
 	linphone_core_add_to_conference(marie->lc,marie_call_laure);
-	CU_ASSERT_TRUE(wait_for(marie->lc,laure->lc,&marie->stat.number_of_LinphoneCallUpdating,initial_marie_stat.number_of_LinphoneCallUpdating+1));
-
-
+	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallUpdating,initial_marie_stat.number_of_LinphoneCallUpdating+1,5000));
 
 	linphone_core_add_to_conference(marie->lc,marie_call_pauline);
 
 	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallResuming,initial_marie_stat.number_of_LinphoneCallResuming+1,2000));
 
-	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallStreamsRunning,initial_pauline_stat.number_of_LinphoneCallStreamsRunning+1,2000));
+	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallStreamsRunning,initial_pauline_stat.number_of_LinphoneCallStreamsRunning+1,5000));
 	CU_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallStreamsRunning,initial_laure_stat.number_of_LinphoneCallStreamsRunning+1,2000));
 	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallStreamsRunning,initial_marie_stat.number_of_LinphoneCallStreamsRunning+2,3000));
 

From 14451691c2c15c2849d0072b1eac0c5b2753bf98 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Thu, 22 Jan 2015 11:37:40 +0100
Subject: [PATCH 291/496] More coherent naming of SDK and setup package on
 Windows.

---
 Makefile.am | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 030964b09..4f3f46860 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,11 +22,11 @@ OPTIONAL_SOUNDS=\
 
 INSTALLDIR=$(abs_top_builddir)/linphone-install
 INSTALLDIR_WITH_PREFIX=$(INSTALLDIR)/$(prefix)
-ZIPFILE=$(abs_top_builddir)/$(PACKAGE)-$(GITVERSION)-win32.zip
+ZIPFILE=$(abs_top_builddir)/$(PACKAGE)-win32-$(GITVERSION).zip
 ZIP_EXCLUDED=include lib \
 		$(OPTIONAL_SOUNDS)
 
-SDK_ZIPFILE=$(abs_top_builddir)/lib$(PACKAGE)-$(GITVERSION)-win32.zip
+SDK_ZIPFILE=$(abs_top_builddir)/lib$(PACKAGE)-win32-sdk-$(GITVERSION).zip
 SDK_EXCLUDED= \
 	bin/linphone.exe \
 	lib/*.la \
@@ -175,7 +175,7 @@ setup.exe: filelist
 	cp $(ISS_SCRIPT) $(INSTALLDIR_WITH_PREFIX)/.
 	cd $(INSTALLDIR_WITH_PREFIX) && \
 	$(ISCC) $(ISS_SCRIPT)
-	mv $(INSTALLDIR_WITH_PREFIX)/Output/setup.exe $(PACKAGE)-$(GITVERSION)-setup.exe
+	mv $(INSTALLDIR_WITH_PREFIX)/Output/setup.exe $(PACKAGE)-setup-$(GITVERSION).exe
 	rm -rf $(INSTALLDIR_WITH_PREFIX)/Output
 	rm -f $(INSTALLDIR_WITH_PREFIX)/$(PACKAGE_WIN32_FILELIST)
 	rm -f $(INSTALLDIR_WITH_PREFIX)/$(ISS_SCRIPT)

From f48e34c4ee6306a3c482dc7326410efecf568ca1 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Fri, 23 Jan 2015 12:47:14 +0100
Subject: [PATCH 292/496] fix bad comment

---
 coreapi/offeranswer.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/coreapi/offeranswer.c b/coreapi/offeranswer.c
index e24e4a215..f71734798 100644
--- a/coreapi/offeranswer.c
+++ b/coreapi/offeranswer.c
@@ -66,7 +66,6 @@ static PayloadType * g729A_match(const MSList *l, const PayloadType *refpt){
 	for (elem=l;elem!=NULL;elem=elem->next){
 		pt=(PayloadType*)elem->data;
 		
-		/*workaround a bug in earlier versions of linphone where opus/48000/1 is offered, which is uncompliant with opus rtp draft*/
 		if (strcasecmp(pt->mime_type,"G729")==0 && refpt->channels==pt->channels){
 			candidate=pt;
 		}

From 7acf4df8831ac2b7f46c40033c307556afc34413 Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Fri, 23 Jan 2015 09:38:34 +0100
Subject: [PATCH 293/496] Add a unit test for a no-sdp reinvite after a pause,
 and implement a correction to handle this case.

---
 coreapi/callbacks.c    | 17 ++++++++++--
 coreapi/linphonecore.c | 12 ++++++++-
 tester/call_tester.c   | 60 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 86 insertions(+), 3 deletions(-)

diff --git a/coreapi/callbacks.c b/coreapi/callbacks.c
index 2d9ff58ae..2592f46a5 100644
--- a/coreapi/callbacks.c
+++ b/coreapi/callbacks.c
@@ -614,7 +614,7 @@ static void call_updated_by_remote(LinphoneCore *lc, LinphoneCall *call, bool_t
 		}
 	}
 
-	if (call->state==LinphoneCallStreamsRunning) {
+	if ( call->state == LinphoneCallStreamsRunning) {
 		/*reINVITE and in-dialogs UPDATE go here*/
 		linphone_core_notify_display_status(lc,_("Call is updated by remote."));
 		call->defer_update=FALSE;
@@ -622,8 +622,21 @@ static void call_updated_by_remote(LinphoneCore *lc, LinphoneCall *call, bool_t
 		if (call->defer_update==FALSE){
 			linphone_core_accept_call_update(lc,call,NULL);
 		}
-		if (rmd==NULL)
+		if (rmd==NULL){
 			call->expect_media_in_ack=TRUE;
+		}
+
+	} else if( call->state == LinphoneCallPausedByRemote ){
+		/* Case where no SDP is present and we were paused by remote.
+		 * We send back an ACK with our SDP and expect the remote to send its own.
+		 * No state change here until an answer is received. */
+		call->defer_update=FALSE;
+		if (call->defer_update==FALSE){
+			_linphone_core_accept_call_update(lc,call,NULL,call->state,linphone_call_state_to_string(call->state));
+		}
+		if (rmd==NULL){
+			call->expect_media_in_ack=TRUE;
+		}
 	} else if (is_update){ /*SIP UPDATE case, can occur in early states*/
 		linphone_call_set_state(call, LinphoneCallEarlyUpdatedByRemote, "EarlyUpdatedByRemote");
 		_linphone_core_accept_call_update(lc,call,NULL,call->prevstate,linphone_call_state_to_string(call->prevstate));
diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 2543cb007..9a7a4af6b 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -3977,7 +3977,11 @@ int linphone_core_resume_call(LinphoneCore *lc, LinphoneCall *call){
 		linphone_core_update_local_media_description_from_upnp(call->localdesc, call->upnp_session);
 	}
 #endif //BUILD_UPNP
-	sal_call_set_local_media_description(call->op,call->localdesc);
+	if (!lc->sip_conf.sdp_200_ack){
+		sal_call_set_local_media_description(call->op,call->localdesc);
+	} else {
+		sal_call_set_local_media_description(call->op,NULL);
+	}
 	sal_media_description_set_dir(call->localdesc,SalStreamSendRecv);
 	if (call->params->in_conference && !call->current_params->in_conference) subject="Conference";
 	if ( sal_call_update(call->op,subject,FALSE) != 0){
@@ -3988,6 +3992,12 @@ int linphone_core_resume_call(LinphoneCore *lc, LinphoneCall *call){
 		lc->current_call=call;
 	snprintf(temp,sizeof(temp)-1,"Resuming the call with %s",linphone_call_get_remote_address_as_string(call));
 	linphone_core_notify_display_status(lc,temp);
+
+	if (lc->sip_conf.sdp_200_ack){
+		/*we are NOT offering, set local media description after sending the call so that we are ready to
+		 process the remote offer when it will arrive*/
+		sal_call_set_local_media_description(call->op,call->localdesc);
+	}
 	return 0;
 }
 
diff --git a/tester/call_tester.c b/tester/call_tester.c
index ad703753e..b7146d5f8 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -3381,6 +3381,65 @@ static void outgoing_reinvite_without_ack_sdp()  {
 #endif
 }
 
+
+static void call_with_paused_no_sdp_on_resume() {
+	int begin;
+	int leaked_objects;
+	int dummy=0;
+	LinphoneCoreManager* marie;
+	LinphoneCoreManager* pauline;
+	LinphoneCall* call_marie = NULL;
+
+	belle_sip_object_enable_leak_detector(TRUE);
+	begin=belle_sip_object_get_object_count();
+
+	marie = linphone_core_manager_new( "marie_rc");
+	pauline = linphone_core_manager_new( "pauline_rc");
+	CU_ASSERT_TRUE(call(pauline,marie));
+	liblinphone_tester_check_rtcp(marie,pauline);
+
+	call_marie = linphone_core_get_current_call(marie->lc);
+	CU_ASSERT_PTR_NOT_NULL(call_marie);
+
+	ms_message("== Call is OK ==");
+
+	/* the called party pause the call */
+	wait_for_until(pauline->lc, marie->lc, NULL, 5, 3000);
+
+	linphone_core_pause_call(marie->lc,call_marie);
+	ms_message("== Call pausing ==");
+	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallPausing,1));
+	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallPausedByRemote,1));
+	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallPaused,1));
+
+	/*stay in pause a little while in order to generate traffic*/
+	wait_for_until(pauline->lc, marie->lc, NULL, 5, 2000);
+
+	ms_message("== Call paused, marie call: %p ==", call_marie);
+	
+	linphone_core_enable_sdp_200_ack(marie->lc,TRUE);
+	
+	linphone_core_resume_call(marie->lc,call_marie);
+
+	CU_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&marie->stat.number_of_LinphoneCallStreamsRunning,2));
+	CU_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&pauline->stat.number_of_LinphoneCallStreamsRunning,2));
+
+	wait_for_until(marie->lc, pauline->lc, &dummy, 1, 3000);
+	CU_ASSERT_TRUE(linphone_call_get_audio_stats(call_marie)->download_bandwidth>70);
+	CU_ASSERT_TRUE(linphone_call_get_audio_stats(linphone_core_get_current_call(pauline->lc))->download_bandwidth>70);
+
+	end_call(marie,pauline);
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+
+	leaked_objects=belle_sip_object_get_object_count()-begin;
+	CU_ASSERT_TRUE(leaked_objects==0);
+	if (leaked_objects>0){
+		belle_sip_object_dump_active_objects();
+	}
+}
+
+
 test_t call_tests[] = {
 	{ "Early declined call", early_declined_call },
 	{ "Call declined", call_declined },
@@ -3467,6 +3526,7 @@ test_t call_tests[] = {
 	{ "Call with in-dialog UPDATE request", call_with_in_dialog_update },
 	{ "Call with in-dialog codec change", call_with_in_dialog_codec_change },
 	{ "Call with in-dialog codec change no sdp", call_with_in_dialog_codec_change_no_sdp },
+	{ "Call with pause no SDP on resume", call_with_paused_no_sdp_on_resume },
 	{ "Call with custom supported tags", call_with_custom_supported_tags },
 	{ "Call log from taken from asserted id",call_log_from_taken_from_p_asserted_id},
 	{ "Incoming INVITE without SDP",incoming_invite_without_sdp},

From f65ec2e2e92d8f408173a27d36db1058e63de01b Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Fri, 23 Jan 2015 16:26:57 +0100
Subject: [PATCH 294/496] Fix lengthy SDP buffer allocation

---
 coreapi/bellesip_sal/sal_op_call.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/coreapi/bellesip_sal/sal_op_call.c b/coreapi/bellesip_sal/sal_op_call.c
index da9871cec..4aca82a81 100644
--- a/coreapi/bellesip_sal/sal_op_call.c
+++ b/coreapi/bellesip_sal/sal_op_call.c
@@ -97,6 +97,7 @@ static int set_sdp(belle_sip_message_t *msg,belle_sdp_session_description_t* ses
  			error = belle_sip_object_marshal(BELLE_SIP_OBJECT(session_desc),buff,bufLen,&length);
 			if( error != BELLE_SIP_OK ){
 				bufLen *= 2;
+				length  = 0;
 				buff = belle_sip_realloc(buff,bufLen);
 			}
 		}

From 82419bbeea1d4f76f7688af05028babd17a003c0 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Fri, 23 Jan 2015 19:25:54 +0100
Subject: [PATCH 295/496] fix mingw compilation

---
 autogen.sh     | 5 +++++
 mediastreamer2 | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/autogen.sh b/autogen.sh
index 9cedbf164..d5ec9ea80 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -33,6 +33,11 @@ fi
 
 INTLTOOLIZE=$(which intltoolize)
 
+#workaround for mingw bug in intltoolize script.
+if test "$INTLTOOLIZE" = "/bin/intltoolize" ; then
+	INTLTOOLIZE=/usr/bin/intltoolize
+fi
+
 echo "Generating build scripts in linphone..."
 set -x
 $LIBTOOLIZE --copy --force
diff --git a/mediastreamer2 b/mediastreamer2
index 7d2a30214..7ddb43caf 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 7d2a30214b8010224eed26bc1f239907618b9674
+Subproject commit 7ddb43caf21b79a3f45c93ff7532c4a4ab81031d

From dd7524264209e6a4bebd01b119b1eed029b159ed Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Fri, 23 Jan 2015 22:38:31 +0100
Subject: [PATCH 296/496] fix multiple compilation problems with mingw

---
 mediastreamer2                 |  2 +-
 tester/log_collection_tester.c | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 7ddb43caf..ae0c6d4b4 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 7ddb43caf21b79a3f45c93ff7532c4a4ab81031d
+Subproject commit ae0c6d4b4088ea803b99b1339bcfa8fc2eb47aba
diff --git a/tester/log_collection_tester.c b/tester/log_collection_tester.c
index 35cf8d1f2..3260e3078 100644
--- a/tester/log_collection_tester.c
+++ b/tester/log_collection_tester.c
@@ -32,8 +32,8 @@
 #endif
 
 
-/*getline is not available on android...*/
-#ifdef ANDROID
+/*getline is POSIX 2008, not available on many systems.*/
+#if defined(ANDROID) || defined(WIN32)
 /* This code is public domain -- Will Hartung 4/9/09 */
 size_t getline(char **lineptr, size_t *n, FILE *stream) {
 	char *bufptr = NULL;
@@ -153,8 +153,10 @@ time_t check_file(LinphoneCoreManager* mgr)  {
 		int line_count = 0;
 		char *line = NULL;
 		size_t line_size = 256;
+#ifndef WIN32
 		struct tm tm_curr;
 		time_t time_prev = -1;
+#endif
 
 #if HAVE_ZLIB
 		// 0) if zlib is enabled, we must decompress the file first
@@ -170,6 +172,7 @@ time_t check_file(LinphoneCoreManager* mgr)  {
 		while (getline(&line, &line_size, file) != -1) {
 			// a) there should be at least 25 lines
 			++line_count;
+#ifndef WIN32
 			// b) logs should be ordered by date (format: 2014-11-04 15:22:12:606)
 			if (strlen(line) > 24) {
 				char date[24] = {'\0'};
@@ -180,6 +183,9 @@ time_t check_file(LinphoneCoreManager* mgr)  {
 					time_prev = time_curr;
 				}
 			}
+#else
+			ms_warning("strptime() not available for this platform, test is incomplete.");
+#endif
 		}
 		CU_ASSERT_TRUE(line_count > 25);
 		free(line);

From acab82a28bb24df182833b173133f35fc559ca2a Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Mon, 26 Jan 2015 17:29:33 +0100
Subject: [PATCH 297/496] Add /usr/include to the include path for MinGW.

---
 configure.ac | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index db0356adb..64458d5ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,7 +62,10 @@ case $target in
 	*mingw*)
 		CFLAGS="$CFLAGS -DORTP_STATIC -D_WIN32_WINNT=0x0501 "
 		CXXFLAGS="$CXXFLAGS -DORTP_STATIC -D_WIN32_WINNT=0x0501"
-		LIBS="$LIBS -L/lib -lws2_32"
+		dnl Workaround for mingw, whose compiler does not check in /usr/include ...
+		CPPFLAGS="$CPPFLAGS -I/usr/include"
+		LDFLAGS="$LDFLAGS -L/usr/lib"
+		LIBS="$LIBS -lws2_32"
 		GUI_FLAGS="-mwindows"
 		CONSOLE_FLAGS="-mconsole"
 		mingw_found=yes

From b0f5e339798a3e2bbf5bcbcdd8c832b9da75a78c Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Tue, 27 Jan 2015 10:58:21 +0100
Subject: [PATCH 298/496] Update ms2

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index ae0c6d4b4..06c11ea38 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit ae0c6d4b4088ea803b99b1339bcfa8fc2eb47aba
+Subproject commit 06c11ea38a8a3a90f0ce8e3d726b5b2fee60f270

From f63ec9b8bf94152c0326e0dba231091235762164 Mon Sep 17 00:00:00 2001
From: Johan Pascal <johan.pascal@belledonne-communications.com>
Date: Tue, 27 Jan 2015 11:15:00 +0100
Subject: [PATCH 299/496] update ms

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 30e90d0f8..1f3804020 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 30e90d0f8a1a17fcd5b718a3eb8758f005f2052b
+Subproject commit 1f38040205eaeeebeb17eae6c1408cc71e1bfca2

From 816ab8dfbdc3e562126e13fe68b0ba774f5012a3 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Tue, 27 Jan 2015 17:03:27 +0100
Subject: [PATCH 300/496] adapt to mediastreamer2

---
 coreapi/linphonecore.c | 19 +++++++++++++++++++
 coreapi/linphonecore.h |  4 ++++
 mediastreamer2         |  2 +-
 tester/call_tester.c   |  2 +-
 4 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 393f405ea..d5a09b404 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -1829,6 +1829,25 @@ int linphone_core_set_video_codecs(LinphoneCore *lc, MSList *codecs){
 	return 0;
 }
 
+/**
+ * Enable RFC3389 generic confort noise algorithm (CN payload type).
+ * It is disabled by default, because this algorithm is only relevant for legacy codecs (PCMU, PCMA, G722).
+ * @param lc the LinphoneCore
+ * @param enabled TRUE if enabled, FALSE otherwise.
+**/
+void linphone_core_enable_generic_confort_noise(LinphoneCore *lc, bool_t enabled){
+	lp_config_set_int(lc->config, "misc", "use_cn", enabled);
+}
+
+/**
+ * Returns enablement of RFC3389 generic confort noise algorithm.
+ * @param lc the LinphoneCore
+ * @return TRUE or FALSE.
+**/
+bool_t linphone_core_generic_confort_noise_enabled(const LinphoneCore *lc){
+	return lp_config_get_int(lc->config, "misc", "use_cn", FALSE);
+}
+
 const MSList * linphone_core_get_friend_list(const LinphoneCore *lc)
 {
 	return lc->friends;
diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h
index f7d8af700..8297eb61e 100644
--- a/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@ -2278,6 +2278,10 @@ LINPHONE_PUBLIC const MSList *linphone_core_get_video_codecs(const LinphoneCore
 
 LINPHONE_PUBLIC int linphone_core_set_video_codecs(LinphoneCore *lc, MSList *codecs);
 
+LINPHONE_PUBLIC void linphone_core_enable_generic_confort_noise(LinphoneCore *lc, bool_t enabled);
+
+LINPHONE_PUBLIC bool_t linphone_core_generic_confort_noise_enabled(const LinphoneCore *lc);
+
 /**
  * Tells whether the specified payload type is enabled.
  * @param[in] lc #LinphoneCore object.
diff --git a/mediastreamer2 b/mediastreamer2
index cf926c312..5ae1633ed 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit cf926c3127bec00dde2bcabef9c1591cd39a6c8f
+Subproject commit 5ae1633ed1a025f40e3887950524663b892251e4
diff --git a/tester/call_tester.c b/tester/call_tester.c
index 5103ea15e..50d0032f6 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -25,7 +25,7 @@
 #include "lpconfig.h"
 #include "private.h"
 #include "liblinphone_tester.h"
-#include "mediastreamer2/dsptools.h"
+#include "mediastreamer2/msutils.h"
 #include "belle-sip/sipstack.h"
 
 #ifdef WIN32

From 10788ebc20a2cdd9f6117219803e74b010bd9e26 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Tue, 27 Jan 2015 17:04:28 +0100
Subject: [PATCH 301/496] update oRTP

---
 oRTP | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/oRTP b/oRTP
index 4ef1702f7..a2c611865 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 4ef1702f7f8f21d65e6e9da68d4f8f2c2376f614
+Subproject commit a2c611865579c0e7fa55c3990752988a90e3f43b

From 022268ae5900e298c5271029389c9643872268a0 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Wed, 28 Jan 2015 13:53:42 +0100
Subject: [PATCH 302/496] Update ms2

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 5ae1633ed..2c877a1be 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 5ae1633ed1a025f40e3887950524663b892251e4
+Subproject commit 2c877a1bec00af62e85a6831351f53bf83d8fb6e

From 2f35778bf03d22cff57dd2ccedb29b1a5f780ddb Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Wed, 28 Jan 2015 15:07:31 +0100
Subject: [PATCH 303/496] Update submodules

---
 mediastreamer2 | 2 +-
 oRTP           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 2c877a1be..96dbc6ca2 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 2c877a1bec00af62e85a6831351f53bf83d8fb6e
+Subproject commit 96dbc6ca203be90381ea4c30a814b8d6aabaad60
diff --git a/oRTP b/oRTP
index a2c611865..05ce6e814 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit a2c611865579c0e7fa55c3990752988a90e3f43b
+Subproject commit 05ce6e81406c0a4b0a21d37f5c8aad8c7130f3b3

From 1af933de411877061b9ac72d09177cd2c0fd78d5 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Wed, 28 Jan 2015 16:53:59 +0100
Subject: [PATCH 304/496] Fix compilation on Windows.

---
 tester/log_collection_tester.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tester/log_collection_tester.c b/tester/log_collection_tester.c
index 3260e3078..3b05a6346 100644
--- a/tester/log_collection_tester.c
+++ b/tester/log_collection_tester.c
@@ -196,7 +196,7 @@ time_t check_file(LinphoneCoreManager* mgr)  {
 
 		CU_ASSERT_TRUE( timediff <= 1 );
 		if( !(timediff <= 1) ){
-			ms_error("time_curr: %ld, last_log: %ld timediff: %d", time_curr, last_log, timediff );
+			ms_error("time_curr: %ld, last_log: %ld timediff: %u", (long int)time_curr, (long int)last_log, timediff );
 		}
 	}
 	// return latest time in file

From 7de6efb0d228119fbd75464a9f6e948b3a2a9bef Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Thu, 29 Jan 2015 10:33:49 +0100
Subject: [PATCH 305/496] Do not write XML tests output until end of execution
 to avoid corrupted XML in case of crash

---
 oRTP                        |  2 +-
 tester/liblinphone_tester.c | 14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/oRTP b/oRTP
index 05ce6e814..f16c49c5f 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 05ce6e81406c0a4b0a21d37f5c8aad8c7130f3b3
+Subproject commit f16c49c5f1372f6d7dfd55c3f7f43d4bdad80a03
diff --git a/tester/liblinphone_tester.c b/tester/liblinphone_tester.c
index 27b9672b0..a084cb21a 100644
--- a/tester/liblinphone_tester.c
+++ b/tester/liblinphone_tester.c
@@ -143,7 +143,7 @@ void helper(const char *name) {
 #if HAVE_CU_CURSES
 			"\t\t\t--curses\n"
 #endif
-			"\t\t\t--xml\n"		
+			"\t\t\t--xml\n"
 			"\t\t\t--xml-file <xml file prefix (will be suffixed by '-Results.xml')>\n"
 			, name);
 }
@@ -164,6 +164,7 @@ int main (int argc, char *argv[])
 	const char *suite_name=NULL;
 	const char *test_name=NULL;
 	const char *xml_file=NULL;
+	char *xml_tmp_file=NULL;
 	int xml = 0;
 	FILE* log_file=NULL;
 #if defined(ANDROID)
@@ -213,6 +214,7 @@ int main (int argc, char *argv[])
 		} else if (strcmp(argv[i], "--xml-file") == 0){
 			CHECK_ARG("--xml-file", ++i, argc);
 			xml_file = argv[i];
+			xml_tmp_file = ms_strdup_printf("%s.tmp", argv[i]);
 		} else if (strcmp(argv[i], "--xml") == 0){
 			xml = 1;
 		} else if (strcmp(argv[i],"--log-file")==0){
@@ -238,14 +240,20 @@ int main (int argc, char *argv[])
 		return -1;
 	}
 
-	if( xml_file != NULL ){
-		liblinphone_tester_set_xml_output(xml_file);
+	if( xml_tmp_file != NULL ){
+		liblinphone_tester_set_xml_output(xml_tmp_file);
 	}
 	liblinphone_tester_enable_xml(xml);
 
 
 	ret = liblinphone_tester_run_tests(suite_name, test_name);
 	liblinphone_tester_uninit();
+
+	if (xml_tmp_file != NULL) {
+		/*create real xml file only if tester did not crash*/
+		rename(xml_tmp_file, xml_file);
+		ms_free(xml_tmp_file);
+	}
 	return ret;
 }
 #endif /* WINAPI_FAMILY_PHONE_APP */

From 5a9e7e66d70b979dbcb3d7f78dc7ae1eae191604 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Thu, 29 Jan 2015 10:36:19 +0100
Subject: [PATCH 306/496] Add /usr/include for MinGW at the end of the
 CPPFLAGS.

---
 configure.ac | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6edb22499..d165231d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,9 +62,6 @@ case $target in
 	*mingw*)
 		CFLAGS="$CFLAGS -DORTP_STATIC -D_WIN32_WINNT=0x0501 "
 		CXXFLAGS="$CXXFLAGS -DORTP_STATIC -D_WIN32_WINNT=0x0501"
-		dnl Workaround for mingw, whose compiler does not check in /usr/include ...
-		CPPFLAGS="$CPPFLAGS -I/usr/include"
-		LDFLAGS="$LDFLAGS -L/usr/lib"
 		LIBS="$LIBS -lws2_32"
 		GUI_FLAGS="-mwindows"
 		CONSOLE_FLAGS="-mconsole"
@@ -946,6 +943,15 @@ case "$target_os" in
 	;;
 esac
 
+case $target in
+	*mingw*)
+		dnl Workaround for mingw, whose compiler does not check in /usr/include ...
+		CPPFLAGS="$CPPFLAGS -I/usr/include"
+		LDFLAGS="$LDFLAGS -L/usr/lib"
+	;;
+esac
+
+
 dnl ##################################################
 dnl # Check for doxygen
 dnl ##################################################

From 1bb0df344455241628103dd7693a791f1040cb2f Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Thu, 29 Jan 2015 10:39:48 +0100
Subject: [PATCH 307/496] Do not write XML tests output until end of execution
 to avoid corrupted XML in case of crash (bis)

---
 tester/liblinphone_tester.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tester/liblinphone_tester.c b/tester/liblinphone_tester.c
index a084cb21a..d6cf4ba88 100644
--- a/tester/liblinphone_tester.c
+++ b/tester/liblinphone_tester.c
@@ -163,7 +163,7 @@ int main (int argc, char *argv[])
 	int ret;
 	const char *suite_name=NULL;
 	const char *test_name=NULL;
-	const char *xml_file=NULL;
+	const char *xml_file="CUnitAutomated-Results.xml";
 	char *xml_tmp_file=NULL;
 	int xml = 0;
 	FILE* log_file=NULL;
@@ -214,7 +214,6 @@ int main (int argc, char *argv[])
 		} else if (strcmp(argv[i], "--xml-file") == 0){
 			CHECK_ARG("--xml-file", ++i, argc);
 			xml_file = argv[i];
-			xml_tmp_file = ms_strdup_printf("%s.tmp", argv[i]);
 		} else if (strcmp(argv[i], "--xml") == 0){
 			xml = 1;
 		} else if (strcmp(argv[i],"--log-file")==0){
@@ -240,7 +239,8 @@ int main (int argc, char *argv[])
 		return -1;
 	}
 
-	if( xml_tmp_file != NULL ){
+	if( xml ){
+		xml_tmp_file = ms_strdup_printf("%s.tmp", xml_file);
 		liblinphone_tester_set_xml_output(xml_tmp_file);
 	}
 	liblinphone_tester_enable_xml(xml);
@@ -249,8 +249,9 @@ int main (int argc, char *argv[])
 	ret = liblinphone_tester_run_tests(suite_name, test_name);
 	liblinphone_tester_uninit();
 
-	if (xml_tmp_file != NULL) {
+	if ( xml ) {
 		/*create real xml file only if tester did not crash*/
+		ms_strcat_printf(xml_tmp_file, "-Results.xml");
 		rename(xml_tmp_file, xml_file);
 		ms_free(xml_tmp_file);
 	}

From 78cd8521a2a02275e3093c7424ce6527ccaa2172 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Thu, 29 Jan 2015 10:47:52 +0100
Subject: [PATCH 308/496] Enable xml output if user gives --xml-file, even
 without --xml

---
 mediastreamer2              | 2 +-
 tester/liblinphone_tester.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 96dbc6ca2..a7f233d15 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 96dbc6ca203be90381ea4c30a814b8d6aabaad60
+Subproject commit a7f233d15940315f9d1362e2aea1a5bc2220268d
diff --git a/tester/liblinphone_tester.c b/tester/liblinphone_tester.c
index d6cf4ba88..f04a5c16d 100644
--- a/tester/liblinphone_tester.c
+++ b/tester/liblinphone_tester.c
@@ -214,6 +214,7 @@ int main (int argc, char *argv[])
 		} else if (strcmp(argv[i], "--xml-file") == 0){
 			CHECK_ARG("--xml-file", ++i, argc);
 			xml_file = argv[i];
+			xml = 1;
 		} else if (strcmp(argv[i], "--xml") == 0){
 			xml = 1;
 		} else if (strcmp(argv[i],"--log-file")==0){

From a36c94f18dbefe9f9e30daf1eac27c41cc7c9c28 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Thu, 29 Jan 2015 11:12:55 +0100
Subject: [PATCH 309/496] Move the inclusion of /usr/include for MinGW one more
 time.

---
 configure.ac | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index d165231d7..8d884a193 100644
--- a/configure.ac
+++ b/configure.ac
@@ -806,6 +806,14 @@ AC_SUBST([MS2_VERSION])
 AC_SUBST([MS2_DIR])
 
 
+case $target in
+	*mingw*)
+		dnl Workaround for mingw, whose compiler does not check in /usr/include ...
+		CPPFLAGS="$CPPFLAGS -I/usr/include"
+		LDFLAGS="$LDFLAGS -L/usr/lib"
+	;;
+esac
+
 
 AC_ARG_ENABLE(tunnel,
 	[AS_HELP_STRING([--enable-tunnel=[yes/no]], [Turn on compilation of tunnel support (default=no)])],
@@ -943,14 +951,6 @@ case "$target_os" in
 	;;
 esac
 
-case $target in
-	*mingw*)
-		dnl Workaround for mingw, whose compiler does not check in /usr/include ...
-		CPPFLAGS="$CPPFLAGS -I/usr/include"
-		LDFLAGS="$LDFLAGS -L/usr/lib"
-	;;
-esac
-
 
 dnl ##################################################
 dnl # Check for doxygen

From 37c17e2703eabe5dcc27edd92807011ade7cf7d1 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Thu, 29 Jan 2015 11:21:31 +0100
Subject: [PATCH 310/496] add setPreferredFramerate()

---
 coreapi/linphonecore_jni.cc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index 76d68cc60..fd89d9578 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -3395,6 +3395,10 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setPreferredVideoSize(JN
 	linphone_core_set_preferred_video_size((LinphoneCore *)lc, vsize);
 }
 
+extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setPreferredFramerate(JNIEnv *env, jobject thiz, jlong lc, jfloat framerate){
+	linphone_core_set_preferred_framerate((LinphoneCore *)lc, framerate);
+}
+
 JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneCoreImpl_setPreferredVideoSizeByName(JNIEnv *env, jobject thiz, jlong lc, jstring jName) {
 	const char* cName = env->GetStringUTFChars(jName, NULL);
 	linphone_core_set_preferred_video_size_by_name((LinphoneCore *)lc, cName);

From d3f2881587ed012e6b9136edd7e2eac2d534a5ef Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Thu, 29 Jan 2015 11:45:00 +0100
Subject: [PATCH 311/496] Fix android build

---
 coreapi/linphonecore_jni.cc | 7 ++++---
 mediastreamer2              | 2 +-
 oRTP                        | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index fd89d9578..10e4bb2ab 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -29,6 +29,7 @@ extern "C" {
 #include "mediastreamer2/mscommon.h"
 #include "mediastreamer2/dsptools.h"
 #include "mediastreamer2/msmediaplayer.h"
+#include "mediastreamer2/msutils.h"
 }
 #include "mediastreamer2/msjava.h"
 #include "private.h"
@@ -420,7 +421,7 @@ public:
 		if (fileTransferRecvId) {
 			vTable->file_transfer_recv = fileTransferRecv;
 		}
-		
+
 		logCollectionUploadStateClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneCore$LogCollectionUploadState"));
 		logCollectionUploadStateFromIntId = env->GetStaticMethodID(logCollectionUploadStateClass, "fromInt", "(I)Lorg/linphone/core/LinphoneCore$LogCollectionUploadState;");
 		logCollectionUploadProgressId = env->GetMethodID(listenerClass, "uploadProgressIndication", "(Lorg/linphone/core/LinphoneCore;II)V");
@@ -810,7 +811,7 @@ public:
 			ms_error("cannot attach VM");
 			return;
 		}
-		
+
 		LinphoneCoreVTable *table = (LinphoneCoreVTable*) data;
 		if (table) {
 			LinphoneCoreData* lcData = (LinphoneCoreData*) linphone_core_v_table_get_user_data(table);
@@ -1832,7 +1833,7 @@ extern "C" jint Java_org_linphone_core_LinphoneCoreImpl_startEchoCalibration(JNI
 	LinphoneCoreVTable *vTable = linphone_core_v_table_new();
 	LinphoneCoreData* ldata = new LinphoneCoreData(env, thiz, vTable, data);
 	linphone_core_v_table_set_user_data(vTable, ldata);
-	
+
 	return (jint)linphone_core_start_echo_calibration((LinphoneCore*)lc, ldata->ecCalibrationStatus, NULL, NULL, vTable);
 
 }
diff --git a/mediastreamer2 b/mediastreamer2
index a7f233d15..923716634 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit a7f233d15940315f9d1362e2aea1a5bc2220268d
+Subproject commit 9237166347c79198fb2b43930143573a8a97766d
diff --git a/oRTP b/oRTP
index f16c49c5f..e54ac4094 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit f16c49c5f1372f6d7dfd55c3f7f43d4bdad80a03
+Subproject commit e54ac40941b30d15c3981ec374b02b0a06de2120

From da8d7aa36f20a960d5d7c78640b2e59b93781c69 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Thu, 29 Jan 2015 12:43:47 +0100
Subject: [PATCH 312/496] Reorder commands alphabetically

---
 console/commands.c  | 163 ++++++++++++++++++++++++--------------------
 console/linphonec.c |   5 +-
 2 files changed, 91 insertions(+), 77 deletions(-)

diff --git a/console/commands.c b/console/commands.c
index 9f6d0c1c2..cd968f555 100644
--- a/console/commands.c
+++ b/console/commands.c
@@ -150,6 +150,15 @@ static LPC_COMMAND commands[] = {
 		"'help <command>'\t: displays specific help for command.\n"
 		"'help advanced'\t: shows advanced commands.\n"
 	},
+	{ "answer", lpc_cmd_answer, "Answer a call",
+		"'answer' : Answer the current incoming call\n"
+		"'answer <call id>' : Answer the call with given id\n"
+	},
+	{ "autoanswer", lpc_cmd_autoanswer, "Show/set auto-answer mode",
+		"'autoanswer'       \t: show current autoanswer mode\n"
+		"'autoanswer enable'\t: enable autoanswer mode\n"
+		"'autoanswer disable'\t: disable autoanswer mode\n"
+	},
 	{ "call", lpc_cmd_call, "Call a SIP uri or number",
 #ifdef VIDEO_ENABLED
 		"'call <sip-url or number>  [options]' \t: initiate a call to the specified destination.\n"
@@ -162,83 +171,24 @@ static LPC_COMMAND commands[] = {
 		},
 	{ "calls", lpc_cmd_calls, "Show all the current calls with their id and status.",
 		NULL
-		},
+	},
+	{ "call-logs", lpc_cmd_call_logs, "Calls history", NULL
+	},
+#ifdef VIDEO_ENABLED
+	{ "camera", lpc_cmd_camera, "Send camera output for current call.",
+		"'camera on'\t: allow sending of local camera video to remote end.\n"
+		"'camera off'\t: disable sending of local camera's video to remote end.\n"
+	},
+#endif
 	{ "chat", lpc_cmd_chat, "Chat with a SIP uri",
 		"'chat <sip-url> \"message\"' "
 		": send a chat message \"message\" to the specified destination."
-		},
-	{ "terminate", lpc_cmd_terminate, "Terminate a call",
-		"'terminate' : Terminate the current call\n"
-		"'terminate <call id>' : Terminate the call with supplied id\n"
-		"'terminate <all>' : Terminate all the current calls\n"
-		},
-	{ "answer", lpc_cmd_answer, "Answer a call",
-		"'answer' : Answer the current incoming call\n"
-		"'answer <call id>' : Answer the call with given id\n"
-	},
-	{ "pause", lpc_cmd_pause, "pause a call",
-		"'pause' : pause the current call\n"},
-	{ "resume", lpc_cmd_resume, "resume a call",
-		"'resume' : resume the unique call\n"
-		"'resume <call id>' : hold off the call with given id\n"},
-	{ "transfer", lpc_cmd_transfer,
-		"Transfer a call to a specified destination.",
-		"'transfer <sip-uri>' : transfers the current active call to the destination sip-uri\n"
-		"'transfer <call id> <sip-uri>': transfers the call with 'id' to the destination sip-uri\n"
-		"'transfer <call id1> --to-call <call id2>': transfers the call with 'id1' to the destination of call 'id2' (attended transfer)\n"
 	},
 	{ "conference", lpc_cmd_conference, "Create and manage an audio conference.",
 		"'conference add <call id> : join the call with id 'call id' into the audio conference."
 		"'conference rm <call id> : remove the call with id 'call id' from the audio conference."
 	},
-	{ "mute", lpc_cmd_mute_mic,
-	  "Mute microphone and suspend voice transmission."},
-#ifdef VIDEO_ENABLED
-	{ "camera", lpc_cmd_camera, "Send camera output for current call.",
-		"'camera on'\t: allow sending of local camera video to remote end.\n"
-		"'camera off'\t: disable sending of local camera's video to remote end.\n"},
-#endif
-	{ "unmute", lpc_cmd_unmute_mic,
-		  "Unmute microphone and resume voice transmission."},
-	{ "playbackgain", lpc_cmd_playback_gain,
-		  "Adjust playback gain."},
-	{ "duration", lpc_cmd_duration, "Print duration in seconds of the last call.", NULL },
-
-	{ "autoanswer", lpc_cmd_autoanswer, "Show/set auto-answer mode",
-		"'autoanswer'       \t: show current autoanswer mode\n"
-		"'autoanswer enable'\t: enable autoanswer mode\n"
-		"'autoanswer disable'\t: disable autoanswer mode��\n"},
-	{ "proxy", lpc_cmd_proxy, "Manage proxies",
-		"'proxy list' : list all proxy setups.\n"
-		"'proxy add' : add a new proxy setup.\n"
-		"'proxy remove <index>' : remove proxy setup with number index.\n"
-		"'proxy use <index>' : use proxy with number index as default proxy.\n"
-		"'proxy unuse' : don't use a default proxy.\n"
-		"'proxy show <index>' : show configuration and status of the proxy numbered by index.\n"
-		"'proxy show default' : show configuration and status of the default proxy.\n"
-	},
-	{ "soundcard", lpc_cmd_soundcard, "Manage soundcards",
-		"'soundcard list' : list all sound devices.\n"
-		"'soundcard show' : show current sound devices configuration.\n"
-		"'soundcard use <index>' : select a sound device.\n"
-		"'soundcard use files' : use .wav files instead of soundcard\n"
-	},
-	{ "webcam", lpc_cmd_webcam, "Manage webcams",
-		"'webcam list' : list all known devices.\n"
-		"'webcam use <index>' : select a video device.\n"
-	},
-	{ "ipv6", lpc_cmd_ipv6, "Use IPV6",
-		"'ipv6 status' : show ipv6 usage status.\n"
-		"'ipv6 enable' : enable the use of the ipv6 network.\n"
-		"'ipv6 disable' : do not use ipv6 network."
-	},
-	{ "nat", lpc_cmd_nat, "Set nat address",
-		"'nat'        : show nat settings.\n"
-		"'nat <addr>' : set nat address.\n"
-	},
-	{ "stun", lpc_cmd_stun, "Set stun server address",
-		"'stun'        : show stun settings.\n"
-		"'stun <addr>' : set stun server address.\n"
+	{ "duration", lpc_cmd_duration, "Print duration in seconds of the last call.", NULL
 	},
 	{ "firewall", lpc_cmd_firewall, "Set firewall policy",
 		"'firewall'        : show current firewall policy.\n"
@@ -248,7 +198,6 @@ static LPC_COMMAND commands[] = {
 		"'firewall ice'    : use ice.\n"
 		"'firewall upnp'   : use uPnP IGD.\n"
 	},
-	{ "call-logs", lpc_cmd_call_logs, "Calls history", NULL },
 	{ "friend", lpc_cmd_friend, "Manage friends",
 		"'friend list [<pattern>]'    : list friends.\n"
 		"'friend call <index>'        : call a friend.\n"
@@ -257,18 +206,79 @@ static LPC_COMMAND commands[] = {
 	    "                               there.  Don't use '<' '>' around <addr>.\n"
 		"'friend delete <index>'      : remove friend, 'all' removes all\n"
 	},
+	{ "ipv6", lpc_cmd_ipv6, "Use IPV6",
+		"'ipv6 status' : show ipv6 usage status.\n"
+		"'ipv6 enable' : enable the use of the ipv6 network.\n"
+		"'ipv6 disable' : do not use ipv6 network."
+	},
+	{ "mute", lpc_cmd_mute_mic,
+	  "Mute microphone and suspend voice transmission."
+	},
+	{ "nat", lpc_cmd_nat, "Set nat address",
+		"'nat'        : show nat settings.\n"
+		"'nat <addr>' : set nat address.\n"
+	},
+	{ "pause", lpc_cmd_pause, "pause a call",
+		"'pause' : pause the current call\n"
+	},
 	{ "play", lpc_cmd_play, "play a wav file",
 		"This command has two roles:\n"
 		"Plays a file instead of capturing from soundcard - only available in file mode (see 'help soundcard')\n"
 		"Specifies a wav file to be played to play music to far end when putting it on hold (pause)\n"
 		"'play <wav file>'    : play a wav file."
 	},
+	{ "playbackgain", lpc_cmd_playback_gain,
+		"Adjust playback gain."
+	},
+	{ "proxy", lpc_cmd_proxy, "Manage proxies",
+		"'proxy list' : list all proxy setups.\n"
+		"'proxy add' : add a new proxy setup.\n"
+		"'proxy remove <index>' : remove proxy setup with number index.\n"
+		"'proxy use <index>' : use proxy with number index as default proxy.\n"
+		"'proxy unuse' : don't use a default proxy.\n"
+		"'proxy show <index>' : show configuration and status of the proxy numbered by index.\n"
+		"'proxy show default' : show configuration and status of the default proxy.\n"
+	},
 	{ "record", lpc_cmd_record, "record to a wav file",
 		"This feature is available only in file mode (see 'help soundcard')\n"
 		"'record <wav file>'    : record into wav file."
 	},
-	{ "quit", lpc_cmd_quit, "Exit linphonec", NULL },
-	{ (char *)NULL, (lpc_cmd_handler)NULL, (char *)NULL, (char *)NULL }
+	{ "resume", lpc_cmd_resume, "resume a call",
+		"'resume' : resume the unique call\n"
+		"'resume <call id>' : hold off the call with given id\n"
+	},
+	{ "soundcard", lpc_cmd_soundcard, "Manage soundcards",
+		"'soundcard list' : list all sound devices.\n"
+		"'soundcard show' : show current sound devices configuration.\n"
+		"'soundcard use <index>' : select a sound device.\n"
+		"'soundcard use files' : use .wav files instead of soundcard\n"
+	},
+	{ "stun", lpc_cmd_stun, "Set stun server address",
+		"'stun'        : show stun settings.\n"
+		"'stun <addr>' : set stun server address.\n"
+	},
+	{ "terminate", lpc_cmd_terminate, "Terminate a call",
+		"'terminate' : Terminate the current call\n"
+		"'terminate <call id>' : Terminate the call with supplied id\n"
+		"'terminate <all>' : Terminate all the current calls\n"
+	},
+	{ "transfer", lpc_cmd_transfer,
+		"Transfer a call to a specified destination.",
+		"'transfer <sip-uri>' : transfers the current active call to the destination sip-uri\n"
+		"'transfer <call id> <sip-uri>': transfers the call with 'id' to the destination sip-uri\n"
+		"'transfer <call id1> --to-call <call id2>': transfers the call with 'id1' to the destination of call 'id2' (attended transfer)\n"
+	},
+	{ "unmute", lpc_cmd_unmute_mic,
+		"Unmute microphone and resume voice transmission."
+	},
+	{ "webcam", lpc_cmd_webcam, "Manage webcams",
+		"'webcam list' : list all known devices.\n"
+		"'webcam use <index>' : select a video device.\n"
+	},
+	{ "quit", lpc_cmd_quit, "Exit linphonec", NULL
+	},
+	{ (char *)NULL, (lpc_cmd_handler)NULL, (char *)NULL, (char *)NULL
+	}
 };
 
 
@@ -292,7 +302,8 @@ static LPC_COMMAND advanced_commands[] = {
 	{ "nortp-on-audio-mute", lpc_cmd_rtp_no_xmit_on_audio_mute,
 		  "Set the rtp_no_xmit_on_audio_mute configuration parameter",
 		  "   If set to 1 then rtp transmission will be muted when\n"
-		  "   audio is muted , otherwise rtp is always sent."},
+		  "   audio is muted , otherwise rtp is always sent."
+		},
 #ifdef VIDEO_ENABLED
 	{ "vwindow", lpc_cmd_video_window, "Control video display window",
 		"'vwindow show': shows video window\n"
@@ -316,14 +327,16 @@ static LPC_COMMAND advanced_commands[] = {
 	{ "preview-snapshot", lpc_cmd_preview_snapshot, "Take a snapshot of currently captured video stream",
 		"'preview-snapshot <file path>': take a snapshot and records it in jpeg format into the supplied path\n"
 	},
-	{ "vfureq", lpc_cmd_vfureq, "Request the other side to send VFU for the current call"},
+	{ "vfureq", lpc_cmd_vfureq, "Request the other side to send VFU for the current call"
+},
 #endif
 	{ "states", lpc_cmd_states, "Show internal states of liblinphone, registrations and calls, according to linphonecore.h definitions",
 		"'states global': shows global state of liblinphone \n"
 		"'states calls': shows state of calls\n"
 		"'states proxies': shows state of proxy configurations"
 	},
-	{ "register", lpc_cmd_register, "Register in one line to a proxy" , "register <sip identity> <sip proxy> <password>"},
+	{ "register", lpc_cmd_register, "Register in one line to a proxy" , "register <sip identity> <sip proxy> <password>"
+},
 	{ "unregister", lpc_cmd_unregister, "Unregister from default proxy", NULL	},
 	{ "status", lpc_cmd_status, "Print various status information",
 			"'status register'  \t: print status concerning registration\n"
diff --git a/console/linphonec.c b/console/linphonec.c
index d768b4a08..4840a621f 100644
--- a/console/linphonec.c
+++ b/console/linphonec.c
@@ -536,7 +536,7 @@ char *linphonec_readline(char *prompt){
 		fprintf(stdout,"%s",prompt);
 		fflush(stdout);
 		while(1){
-			
+
 			ms_mutex_lock(&prompt_mutex);
 			if (have_prompt){
 				char *ret=strdup(received_prompt);
@@ -931,7 +931,8 @@ print_usage (int exit_status)
 "  -D                   enable video display only (disabled by default)\n"
 "  -S                   show general state messages (disabled by default)\n"
 "  --wid  windowid      force embedding of video window into provided windowid (disabled by default)\n"
-"  -v or --version      display version and exits.\n");
+"  -v or --version      display version and exits.\n"
+);
 
   	exit(exit_status);
 }

From 217be11870bb0ecf5eadf7749d6c7c75c20b1f76 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Thu, 29 Jan 2015 12:57:44 +0100
Subject: [PATCH 313/496] fix Android conpilation issue

---
 coreapi/linphonecore_jni.cc | 1 -
 mediastreamer2              | 2 +-
 oRTP                        | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index 10e4bb2ab..e940303c6 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -27,7 +27,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 extern "C" {
 #include "mediastreamer2/mediastream.h"
 #include "mediastreamer2/mscommon.h"
-#include "mediastreamer2/dsptools.h"
 #include "mediastreamer2/msmediaplayer.h"
 #include "mediastreamer2/msutils.h"
 }
diff --git a/mediastreamer2 b/mediastreamer2
index 923716634..88141afd7 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 9237166347c79198fb2b43930143573a8a97766d
+Subproject commit 88141afd7223345851ce9c04c759a996b1bf2d58
diff --git a/oRTP b/oRTP
index e54ac4094..0917823b9 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit e54ac40941b30d15c3981ec374b02b0a06de2120
+Subproject commit 0917823b9b56cb2710da7ce22979804119adef8c

From 5f6b3fa729baad15ebe542ffb82075ed3b774041 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Thu, 29 Jan 2015 15:34:40 +0100
Subject: [PATCH 314/496] add setPreferredFramerate/getPreferredFramerate
 accessors

---
 coreapi/linphonecore_jni.cc                       |  4 ++++
 java/common/org/linphone/core/LinphoneCore.java   | 14 ++++++++++++++
 java/impl/org/linphone/core/LinphoneCoreImpl.java | 11 +++++++++++
 3 files changed, 29 insertions(+)

diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index e940303c6..2ef8868cf 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -3399,6 +3399,10 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setPreferredFramerate(JN
 	linphone_core_set_preferred_framerate((LinphoneCore *)lc, framerate);
 }
 
+extern "C" float Java_org_linphone_core_LinphoneCoreImpl_getPreferredFramerate(JNIEnv *env, jobject thiz, jlong lc){
+	return linphone_core_get_preferred_framerate((LinphoneCore *)lc);
+}
+
 JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneCoreImpl_setPreferredVideoSizeByName(JNIEnv *env, jobject thiz, jlong lc, jstring jName) {
 	const char* cName = env->GetStringUTFChars(jName, NULL);
 	linphone_core_set_preferred_video_size_by_name((LinphoneCore *)lc, cName);
diff --git a/java/common/org/linphone/core/LinphoneCore.java b/java/common/org/linphone/core/LinphoneCore.java
index 0e5c36d6d..04ee7478a 100644
--- a/java/common/org/linphone/core/LinphoneCore.java
+++ b/java/common/org/linphone/core/LinphoneCore.java
@@ -1075,6 +1075,20 @@ public interface LinphoneCore {
 	**/
 	VideoSize getPreferredVideoSize();
 
+	/**
+	 * Set the preferred frame rate for video.
+	 * Based on the available bandwidth constraints and network conditions, the video encoder
+	 * remains free to lower the framerate. There is no warranty that the preferred frame rate be the actual framerate.
+	 * used during a call. Default value is 0, which means "use encoder's default fps value".
+	 * @param fps the target frame rate in number of frames per seconds.
+	**/
+	void setPreferredFramerate(float fps);
+	
+	/**
+	 * Returns the preferred video framerate, previously set by setPreferredFramerate().
+	 * @return frame rate in number of frames per seconds.
+	**/
+	float getPreferredFramerate();
 	/**
 	 * Returns the currently supported audio codecs, as PayloadType elements
 	 * @return
diff --git a/java/impl/org/linphone/core/LinphoneCoreImpl.java b/java/impl/org/linphone/core/LinphoneCoreImpl.java
index cef11598c..4cca85957 100644
--- a/java/impl/org/linphone/core/LinphoneCoreImpl.java
+++ b/java/impl/org/linphone/core/LinphoneCoreImpl.java
@@ -1330,4 +1330,15 @@ public class LinphoneCoreImpl implements LinphoneCore {
 	 * @param path The path where the log files will be written.
 	 */
 	public native static void setLogCollectionPath(String path);
+	
+	private native void setPreferredFramerate(long nativePtr, float fps);
+	@Override
+	public void setPreferredFramerate(float fps) {
+		setPreferredFramerate(nativePtr,fps);
+	}
+	private native float getPreferredFramerate(long nativePtr);
+	@Override
+	public float getPreferredFramerate() {
+		return getPreferredFramerate(nativePtr);
+	}
 }

From 41232a3954803528d89434f800bad64ec7ac6b62 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Fri, 30 Jan 2015 00:00:19 +0100
Subject: [PATCH 315/496] adapt for lastest polarssl on windows, fix system
 include paths preempting ortp and ms2 include paths.

---
 configure.ac           | 12 +++---------
 coreapi/Makefile.am    |  6 +++---
 linphone-deps.filelist |  2 +-
 mediastreamer2         |  2 +-
 4 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/configure.ac b/configure.ac
index 8d884a193..dd0c323f5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,6 +60,9 @@ case $target in
 		mingwce_found=yes
 	;;
 	*mingw*)
+		dnl Workaround for mingw, whose compiler does not check in /usr/include ...
+		CPPFLAGS="$CPPFLAGS -I/usr/include"
+		LDFLAGS="$LDFLAGS -L/usr/lib"
 		CFLAGS="$CFLAGS -DORTP_STATIC -D_WIN32_WINNT=0x0501 "
 		CXXFLAGS="$CXXFLAGS -DORTP_STATIC -D_WIN32_WINNT=0x0501"
 		LIBS="$LIBS -lws2_32"
@@ -806,15 +809,6 @@ AC_SUBST([MS2_VERSION])
 AC_SUBST([MS2_DIR])
 
 
-case $target in
-	*mingw*)
-		dnl Workaround for mingw, whose compiler does not check in /usr/include ...
-		CPPFLAGS="$CPPFLAGS -I/usr/include"
-		LDFLAGS="$LDFLAGS -L/usr/lib"
-	;;
-esac
-
-
 AC_ARG_ENABLE(tunnel,
 	[AS_HELP_STRING([--enable-tunnel=[yes/no]], [Turn on compilation of tunnel support (default=no)])],
 	[case "${enableval}" in
diff --git a/coreapi/Makefile.am b/coreapi/Makefile.am
index 26fff6f6e..85f65bcf1 100644
--- a/coreapi/Makefile.am
+++ b/coreapi/Makefile.am
@@ -160,13 +160,13 @@ test_numbers_LDADD=liblinphone.la $(liblinphone_la_LIBADD)
 endif
 
 AM_CPPFLAGS=\
-	-I$(top_srcdir) -I$(top_srcdir)/include -I$(builddir)
+	-I$(top_srcdir) -I$(top_srcdir)/include -I$(builddir) \
+		$(ORTP_CFLAGS) \
+		$(MEDIASTREAMER_CFLAGS) 
 
 COMMON_CFLAGS=\
 	$(STRICT_OPTIONS) \
 	-DIN_LINPHONE \
-	$(ORTP_CFLAGS) \
-	$(MEDIASTREAMER_CFLAGS) \
 	$(SIPSTACK_CFLAGS) \
 	$(LIBSOUP_CFLAGS) \
 	-DENABLE_TRACE 	\
diff --git a/linphone-deps.filelist b/linphone-deps.filelist
index 53cde44a9..8a77ad29b 100755
--- a/linphone-deps.filelist
+++ b/linphone-deps.filelist
@@ -2,9 +2,9 @@
 ./bin/libspeex-1.dll
 ./bin/libspeexdsp-1.dll
 ./bin/avutil-51.dll
+./bin/libpolarssl-0.dll
 ./bin/libbellesip-0.dll
 ./bin/libantlr3c.dll
-./lib/libpolarssl.dll
 ./bin/libogg-0.dll
 ./bin/libtheora-0.dll
 ./bin/libxml2-2.dll
diff --git a/mediastreamer2 b/mediastreamer2
index 88141afd7..adbdf050e 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 88141afd7223345851ce9c04c759a996b1bf2d58
+Subproject commit adbdf050e08933859bdc424026adb24fa4b3f951

From 31d3bd0bfaa3838d55dbfaf722fe3d9b23160214 Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Fri, 30 Jan 2015 10:25:43 +0100
Subject: [PATCH 316/496] Add JNI setRingback function

---
 coreapi/linphonecore_jni.cc                       | 10 ++++++++++
 java/common/org/linphone/core/LinphoneCore.java   |  9 +++++++++
 java/impl/org/linphone/core/LinphoneCoreImpl.java |  5 +++++
 3 files changed, 24 insertions(+)

diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index 2ef8868cf..8dbb4f382 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -1812,6 +1812,16 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setRootCA(JNIEnv*  env
 	linphone_core_set_root_ca((LinphoneCore*)lc,path);
 	if (path) env->ReleaseStringUTFChars(jpath, path);
 }
+extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setRingback(JNIEnv*  env
+																			,jobject  thiz
+																			,jlong lc
+																			,jstring jpath) {
+	const char* path = jpath?env->GetStringUTFChars(jpath, NULL):NULL;
+	linphone_core_set_ringback((LinphoneCore*)lc,path);
+	if (path) env->ReleaseStringUTFChars(jpath, path);
+
+}
+
 extern "C" void Java_org_linphone_core_LinphoneCoreImpl_enableKeepAlive(JNIEnv*  env
 																,jobject  thiz
 																,jlong lc
diff --git a/java/common/org/linphone/core/LinphoneCore.java b/java/common/org/linphone/core/LinphoneCore.java
index 04ee7478a..0a50f4f3d 100644
--- a/java/common/org/linphone/core/LinphoneCore.java
+++ b/java/common/org/linphone/core/LinphoneCore.java
@@ -1025,6 +1025,15 @@ public interface LinphoneCore {
 	 */
 	void setRootCA(String path);
 
+	/**
+	 * Sets the path to a wav file used for for ringing back.
+	 *
+	 * Ringback means the ring that is heard when it's ringing at the remote party.
+	 *
+	 * @param path The file must be a wav 16bit linear.
+	 */
+	void setRingback(String path);
+
 	void setUploadBandwidth(int bw);
 	/**
 	 * Sets maximum available download bandwidth
diff --git a/java/impl/org/linphone/core/LinphoneCoreImpl.java b/java/impl/org/linphone/core/LinphoneCoreImpl.java
index 4cca85957..4823a2a2b 100644
--- a/java/impl/org/linphone/core/LinphoneCoreImpl.java
+++ b/java/impl/org/linphone/core/LinphoneCoreImpl.java
@@ -110,6 +110,7 @@ public class LinphoneCoreImpl implements LinphoneCore {
 	private native void setRing(long nativePtr, String path);
 	private native String getRing(long nativePtr);
 	private native void setRootCA(long nativePtr, String path);
+	private native void setRingback(long nativePtr, String path);	
 	private native long[] listVideoPayloadTypes(long nativePtr);
 	private native LinphoneProxyConfig[] getProxyConfigList(long nativePtr);
 	private native long[] getAuthInfosList(long nativePtr);
@@ -519,6 +520,10 @@ public class LinphoneCoreImpl implements LinphoneCore {
 		setRootCA(nativePtr, path);
 	}
 
+	public synchronized void setRingback(String path) {
+		setRingback(nativePtr, path);
+	}
+
 	public synchronized LinphoneProxyConfig[] getProxyConfigList() {
 		return getProxyConfigList(nativePtr);
 	}

From b4e301ada0065b603ac5a5b662451e6a47e33a6c Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Fri, 30 Jan 2015 10:32:29 +0100
Subject: [PATCH 317/496] Copy message tester database file in binary mode.

---
 tester/message_tester.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tester/message_tester.c b/tester/message_tester.c
index 254737a04..dd6cf4700 100644
--- a/tester/message_tester.c
+++ b/tester/message_tester.c
@@ -1006,7 +1006,7 @@ message_tester_copy_file(const char *from, const char *to)
 	size_t n;
 
 	/* Open "from" file for reading */
-	in=fopen(from, "r");
+	in=fopen(from, "rb");
 	if ( in == NULL )
 	{
 		ms_error("Can't open %s for reading: %s\n",from,strerror(errno));
@@ -1014,7 +1014,7 @@ message_tester_copy_file(const char *from, const char *to)
 	}
 
 	/* Open "to" file for writing (will truncate existing files) */
-	out=fopen(to, "w");
+	out=fopen(to, "wb");
 	if ( out == NULL )
 	{
 		ms_error("Can't open %s for writing: %s\n",to,strerror(errno));

From cced42ebc51606491daf621b1548e67bb0c6e3ef Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Fri, 30 Jan 2015 20:00:35 +0100
Subject: [PATCH 318/496] add test for generic CN, update oRTP and ms2

---
 coreapi/event.c        |  3 ++-
 coreapi/linphonecall.c | 16 ++++++++++---
 mediastreamer2         |  2 +-
 oRTP                   |  2 +-
 tester/call_tester.c   | 54 ++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 71 insertions(+), 6 deletions(-)

diff --git a/coreapi/event.c b/coreapi/event.c
index 372e0a953..ac2a8db3d 100644
--- a/coreapi/event.c
+++ b/coreapi/event.c
@@ -106,7 +106,8 @@ void linphone_event_set_publish_state(LinphoneEvent *lev, LinphonePublishState s
 		linphone_core_notify_publish_state_changed(lev->lc,lev,state);
 		switch(state){
 			case LinphonePublishCleared:
-				linphone_event_unref(lev);
+				if (lev->expires!=-1)
+					linphone_event_unref(lev);
 				break;
 			case LinphonePublishOk:
 			case LinphonePublishError:
diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index d3766c174..44d64929c 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -340,6 +340,16 @@ static MSList * create_telephone_events(LinphoneCore *lc, const MSList *codecs){
 	return ret;
 }
 
+static MSList *create_special_payload_types(LinphoneCore *lc, const MSList *codecs){
+	MSList *ret=create_telephone_events(lc, codecs);
+	if (linphone_core_generic_confort_noise_enabled(lc)){
+		PayloadType *cn=payload_type_clone(&payload_type_cn);
+		payload_type_set_number(cn, 13);
+		ret=ms_list_append(ret, cn);
+	}
+	return ret;
+}
+
 typedef struct _CodecConstraints{
 	int bandwidth_limit;
 	int max_codecs;
@@ -348,7 +358,7 @@ typedef struct _CodecConstraints{
 
 static MSList *make_codec_list(LinphoneCore *lc, CodecConstraints * hints, const MSList *codecs){
 	MSList *l=NULL;
-	MSList *tevs=NULL;
+	MSList *specials=NULL;
 	const MSList *it;
 	int nb = 0;
 
@@ -379,8 +389,8 @@ static MSList *make_codec_list(LinphoneCore *lc, CodecConstraints * hints, const
 		nb++;
 		if ((hints->max_codecs > 0) && (nb >= hints->max_codecs)) break;
 	}
-	tevs=create_telephone_events(lc,l);
-	l=ms_list_concat(l,tevs);
+	specials=create_special_payload_types(lc,l);
+	l=ms_list_concat(l,specials);
 	linphone_core_assign_payload_type_numbers(lc, l);
 	return l;
 }
diff --git a/mediastreamer2 b/mediastreamer2
index adbdf050e..02d311ca6 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit adbdf050e08933859bdc424026adb24fa4b3f951
+Subproject commit 02d311ca6158ad707edadcd20121de57182e8972
diff --git a/oRTP b/oRTP
index 0917823b9..753a2d67e 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 0917823b9b56cb2710da7ce22979804119adef8c
+Subproject commit 753a2d67ee0e4e9a8c2f64f92b598ac11187378a
diff --git a/tester/call_tester.c b/tester/call_tester.c
index 50d0032f6..96b90f0e8 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -3463,6 +3463,59 @@ static void call_with_paused_no_sdp_on_resume() {
 	}
 }
 
+static void call_with_generic_cn(void) {
+	int begin;
+	int leaked_objects;
+	LinphoneCoreManager* marie;
+	LinphoneCoreManager* pauline;
+	LinphoneCall *pauline_call;
+	char *audio_file_with_silence=ms_strdup_printf("%s/%s",liblinphone_tester_file_prefix,"sounds/ahbahouaismaisbon.wav");
+	char *recorded_file=ms_strdup_printf("%s/%s",liblinphone_tester_writable_dir_prefix,"result.wav");
+	
+	belle_sip_object_enable_leak_detector(TRUE);
+	begin=belle_sip_object_get_object_count();
+
+	marie = linphone_core_manager_new( "marie_rc");
+	pauline = linphone_core_manager_new( "pauline_rc");
+	
+	remove(recorded_file);
+
+	linphone_core_use_files(marie->lc,TRUE);
+	linphone_core_use_files(pauline->lc,TRUE);
+	linphone_core_set_play_file(marie->lc, audio_file_with_silence);
+	/*linphone_core_set_play_file(pauline->lc, NULL);*/
+	linphone_core_set_record_file(pauline->lc, recorded_file);
+	linphone_core_enable_generic_confort_noise(marie->lc, TRUE);
+	linphone_core_enable_generic_confort_noise(pauline->lc, TRUE);
+	CU_ASSERT_TRUE(call(marie,pauline));
+	pauline_call=linphone_core_get_current_call(pauline->lc);
+	CU_ASSERT_PTR_NOT_NULL(pauline_call);
+	if (pauline_call){
+		const rtp_stats_t *rtps;
+		struct stat stbuf;
+		int err;
+		
+		wait_for_until(marie->lc, pauline->lc, NULL, 0, 8000);
+		rtps=rtp_session_get_stats(pauline_call->audiostream->ms.sessions.rtp_session);
+		CU_ASSERT_TRUE(rtps->packet_recv<=300 && rtps->packet_recv>=200);
+		CU_ASSERT_EQUAL((err=stat(recorded_file,&stbuf)), 0);
+		if (err==0){
+			CU_ASSERT_TRUE(stbuf.st_size>120000);
+		}
+	}
+	end_call(marie,pauline);
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+
+	leaked_objects=belle_sip_object_get_object_count()-begin;
+	CU_ASSERT_TRUE(leaked_objects==0);
+	if (leaked_objects>0){
+		belle_sip_object_dump_active_objects();
+	}
+	ms_free(audio_file_with_silence);
+	ms_free(recorded_file);
+}
+
 
 test_t call_tests[] = {
 	{ "Early declined call", early_declined_call },
@@ -3558,6 +3611,7 @@ test_t call_tests[] = {
 	{ "Outgoing INVITE without ACK SDP",outgoing_invite_without_sdp},
 	{ "Incoming REINVITE without SDP",incoming_reinvite_without_ack_sdp},
 	{ "Outgoing REINVITE without ACK SDP",outgoing_reinvite_without_ack_sdp},
+	{ "Call with generic CN", call_with_generic_cn }
 };
 
 test_suite_t call_test_suite = {

From c78383dda96d9c8b2915640e343e0546c250f43a Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Fri, 30 Jan 2015 22:34:07 +0100
Subject: [PATCH 319/496] add file required for tests

---
 tester/sounds/ahbahouaismaisbon.wav | Bin 0 -> 105258 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 tester/sounds/ahbahouaismaisbon.wav

diff --git a/tester/sounds/ahbahouaismaisbon.wav b/tester/sounds/ahbahouaismaisbon.wav
new file mode 100644
index 0000000000000000000000000000000000000000..dca22773a9bc2b81415558572e061174278265c8
GIT binary patch
literal 105258
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

literal 0
HcmV?d00001


From 92c1c6d4acccde84f4e14533e9e2ce070d07656e Mon Sep 17 00:00:00 2001
From: Johan Pascal <johan.pascal@belledonne-communications.com>
Date: Sat, 31 Jan 2015 22:40:56 +0100
Subject: [PATCH 320/496] code cleaning remove useless DTLS debug traces

---
 coreapi/linphonecall.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index 44d64929c..5b2ffe19e 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -2241,9 +2241,7 @@ static void linphone_call_start_audio_stream(LinphoneCall *call, bool_t muted, b
 	snprintf(rtcp_tool,sizeof(rtcp_tool)-1,"%s-%s",linphone_core_get_user_agent_name(),linphone_core_get_user_agent_version());
 
 	stream = sal_media_description_find_best_stream(call->resultdesc, SalAudio);
-	ms_message("DTLS: call_start_audio_stream, stream is %s", stream==NULL?"NULL":"not NULL");
 	if (stream && stream->dir!=SalStreamInactive && stream->rtp_port!=0){
-		ms_message("DTLS: call_start_audio_stream : we have stream and all stuff to start it");
 		playcard=lc->sound_conf.lsd_card ?
 			lc->sound_conf.lsd_card : lc->sound_conf.play_sndcard;
 		captcard=lc->sound_conf.capt_sndcard;
@@ -2252,7 +2250,6 @@ static void linphone_call_start_audio_stream(LinphoneCall *call, bool_t muted, b
 		call->audio_profile=make_profile(call,call->resultdesc,stream,&used_pt);
 
 		if (used_pt!=-1){
-			ms_message("DTLS: call_start_audio_stream : we made a profile and have used_pt != -1");
 			call->current_params->audio_codec = rtp_profile_get_payload(call->audio_profile, used_pt);
 			if (playcard==NULL) {
 				ms_warning("No card defined for playback !");

From a98c9df5205494ce4aa2458da91e773aa30467b7 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Mon, 2 Feb 2015 12:20:16 +0100
Subject: [PATCH 321/496] Build offeranswer tests with CMake.

---
 tester/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tester/CMakeLists.txt b/tester/CMakeLists.txt
index 8f3bd33a8..015bd579c 100644
--- a/tester/CMakeLists.txt
+++ b/tester/CMakeLists.txt
@@ -29,6 +29,7 @@ set(SOURCE_FILES
 	liblinphone_tester.c
 	log_collection_tester.c
 	message_tester.c
+	offeranswer_tester.c
 	player_tester.c
 	presence_tester.c
 	quality_reporting_tester.c

From ac2cbd71af94fe30d3e18f241f68bc4e1cc38d27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
 <francois.grisez@belledonne-communications.com>
Date: Mon, 2 Feb 2015 12:23:38 +0100
Subject: [PATCH 322/496] Fix bug #2051

Fix invalid reads due to an unstopped audiostream
---
 gtk/audio_assistant.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/gtk/audio_assistant.c b/gtk/audio_assistant.c
index ad5d95ea4..815752a2d 100644
--- a/gtk/audio_assistant.c
+++ b/gtk/audio_assistant.c
@@ -466,10 +466,17 @@ static void prepare(GtkAssistant *w){
 }
 
 void linphone_gtk_close_audio_assistant(GtkWidget *w){
-	gchar *path = g_object_get_data(G_OBJECT(audio_assistant),"path");
+	gchar *path;
+	AudioStream *stream;
+	
+	path = g_object_get_data(G_OBJECT(audio_assistant),"path");
 	if(path != NULL){
 		g_unlink(path);
 	}
+	stream = (AudioStream *)g_object_get_data(G_OBJECT(audio_assistant), "stream");
+	if(stream) {
+		audio_stream_stop(stream);
+	}
 	gtk_widget_destroy(w);
 	if(linphone_gtk_get_audio_assistant_option()){
 		gtk_main_quit();

From ecf4ba1b5cb669d419d776d2cb7b8e511d194346 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Mon, 2 Feb 2015 14:25:57 +0100
Subject: [PATCH 323/496] Enable setting a different video window id for each
 call.

---
 coreapi/linphonecall.c | 25 ++++++++++++++++++++++++-
 coreapi/linphonecore.h | 13 +++++++++++++
 coreapi/private.h      |  2 +-
 3 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index 5b2ffe19e..e6dc3cb56 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -2394,7 +2394,9 @@ static void linphone_call_start_video_stream(LinphoneCall *call, bool_t all_inpu
 			video_stream_set_fps(call->videostream,linphone_core_get_preferred_framerate(lc));
 			video_stream_set_sent_video_size(call->videostream,linphone_core_get_preferred_video_size(lc));
 			video_stream_enable_self_view(call->videostream,lc->video_conf.selfview);
-			if (lc->video_window_id!=0)
+			if (call->video_window_id != 0)
+				video_stream_set_native_window_id(call->videostream,call->video_window_id);
+			else if (lc->video_window_id!=0)
 				video_stream_set_native_window_id(call->videostream,lc->video_window_id);
 			if (lc->preview_window_id!=0)
 				video_stream_set_native_preview_window_id (call->videostream,lc->preview_window_id);
@@ -3596,3 +3598,24 @@ void linphone_call_cancel_dtmfs(LinphoneCall *call) {
 		call->dtmf_sequence = NULL;
 	}
 }
+
+unsigned long linphone_call_get_native_video_window_id(const LinphoneCall *call) {
+	if (call->video_window_id) {
+		/* The video id was previously set by the app. */
+		return call->video_window_id;
+	}
+#ifdef VIDEO_ENABLED
+	else if (call->videostream) {
+		/* It was not set but we want to get the one automatically created by mediastreamer2 (desktop versions only). */
+		return video_stream_get_native_window_id(call->videostream);
+	}
+#endif
+	return 0;
+}
+
+void linphone_call_set_native_video_window_id(LinphoneCall *call, unsigned long id) {
+	call->video_window_id = id;
+	if (call->videostream) {
+		video_stream_set_native_window_id(call->videostream, id);
+	}
+}
diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h
index 8297eb61e..6997c3470 100644
--- a/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@ -757,6 +757,19 @@ LINPHONE_PUBLIC	int linphone_call_send_dtmfs(LinphoneCall *call,char *dtmfs);
 **/
 LINPHONE_PUBLIC	void linphone_call_cancel_dtmfs(LinphoneCall *call);
 
+/**
+ * Get the native window handle of the video window, casted as an unsigned long.
+ * @ingroup media_parameters
+**/
+LINPHONE_PUBLIC unsigned long linphone_call_get_native_video_window_id(const LinphoneCall *call);
+
+/**
+ * Set the native video window id where the video is to be displayed.
+ * For MacOS, Linux, Windows: if not set or 0 a window will be automatically created, unless the special id -1 is given.
+ * @ingroup media_parameters
+**/
+LINPHONE_PUBLIC void linphone_call_set_native_video_window_id(LinphoneCall *call, unsigned long id);
+
 /**
  * Return TRUE if this call is currently part of a conference
  * @param call #LinphoneCall
diff --git a/coreapi/private.h b/coreapi/private.h
index 8778f1020..13bc91456 100644
--- a/coreapi/private.h
+++ b/coreapi/private.h
@@ -226,7 +226,7 @@ struct _LinphoneCall{
 	StunCandidate ac,vc; /*audio video ip/port discovered by STUN*/
 	struct _AudioStream *audiostream;  /**/
 	struct _VideoStream *videostream;
-
+	unsigned long video_window_id;
 	MSAudioEndpoint *endpoint; /*used for conferencing*/
 	char *refer_to;
 	LinphoneCallParams *params;

From 639b5dee1d33e9c260f51d3d4df2ef2f90d082cd Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Mon, 2 Feb 2015 14:48:15 +0100
Subject: [PATCH 324/496] Update ms2 for CIF

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 02d311ca6..738fcf99d 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 02d311ca6158ad707edadcd20121de57182e8972
+Subproject commit 738fcf99df2f930fe64bf8e5dc3fb4d65a004a7d

From 53bc2cd5a0ad55c2c378d570dd678a79879c4c29 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Mon, 2 Feb 2015 18:13:20 +0100
Subject: [PATCH 325/496] add tests to check sips and ipv6 support of flexisip

---
 coreapi/address.c                       |  16 ++++
 coreapi/bellesip_sal/sal_address_impl.c |   6 ++
 coreapi/linphonecore.h                  |   4 +-
 include/sal/sal.h                       |   1 +
 tester/accountmanager.c                 |   9 +-
 tester/flexisip_tester.c                | 116 ++++++++++++++++++++++++
 tester/liblinphone_tester.h             |   1 +
 tester/rcfiles/marie_sips_rc            |  53 +++++++++++
 tester/rcfiles/pauline_sips_rc          |  50 ++++++++++
 tester/tester.c                         |   6 ++
 tester/tester_hosts                     |   1 +
 11 files changed, 260 insertions(+), 3 deletions(-)
 create mode 100644 tester/rcfiles/marie_sips_rc
 create mode 100644 tester/rcfiles/pauline_sips_rc

diff --git a/coreapi/address.c b/coreapi/address.c
index d9d772337..1299a5351 100644
--- a/coreapi/address.c
+++ b/coreapi/address.c
@@ -154,11 +154,27 @@ char *linphone_address_as_string_uri_only(const LinphoneAddress *u){
 
 /**
  * Returns true if address refers to a secure location (sips)
+ * @deprecated use linphone_address_get_secure()
 **/
 bool_t linphone_address_is_secure(const LinphoneAddress *uri){
 	return sal_address_is_secure(uri);
 }
 
+/**
+ * Returns true if address refers to a secure location (sips)
+**/
+bool_t linphone_address_get_secure(const LinphoneAddress *uri){
+	return sal_address_is_secure(uri);
+}
+
+/**
+ * Make the address refer to a secure location (sips scheme)
+ * @param enabled TRUE if address is requested to be secure.
+**/
+void linphone_address_set_secure(LinphoneAddress *addr, bool_t enabled){
+	sal_address_set_secure(addr, enabled);
+}
+
 /**
  * returns true if address is a routable sip address
  */
diff --git a/coreapi/bellesip_sal/sal_address_impl.c b/coreapi/bellesip_sal/sal_address_impl.c
index 034135f72..2546e7850 100644
--- a/coreapi/bellesip_sal/sal_address_impl.c
+++ b/coreapi/bellesip_sal/sal_address_impl.c
@@ -49,6 +49,12 @@ const char *sal_address_get_scheme(const SalAddress *addr){
 		return NULL;
 }
 
+void sal_address_set_secure(SalAddress *addr, bool_t enabled){
+	belle_sip_header_address_t* header_addr = BELLE_SIP_HEADER_ADDRESS(addr);
+	belle_sip_uri_t* uri = belle_sip_header_address_get_uri(header_addr);
+	if (uri) belle_sip_uri_set_secure(uri,enabled);
+}
+
 bool_t sal_address_is_secure(const SalAddress *addr){
 	belle_sip_header_address_t* header_addr = BELLE_SIP_HEADER_ADDRESS(addr);
 	belle_sip_uri_t* uri = belle_sip_header_address_get_uri(header_addr);
diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h
index 6997c3470..a17efa793 100644
--- a/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@ -397,7 +397,9 @@ LINPHONE_PUBLIC	void linphone_address_set_domain(LinphoneAddress *uri, const cha
 LINPHONE_PUBLIC	void linphone_address_set_port(LinphoneAddress *uri, int port);
 /*remove tags, params etc... so that it is displayable to the user*/
 LINPHONE_PUBLIC	void linphone_address_clean(LinphoneAddress *uri);
-LINPHONE_PUBLIC bool_t linphone_address_is_secure(const LinphoneAddress *uri);
+LINPHONE_PUBLIC bool_t linphone_address_is_secure(const LinphoneAddress *addr);
+LINPHONE_PUBLIC bool_t linphone_address_get_secure(const LinphoneAddress *addr);
+LINPHONE_PUBLIC void linphone_address_set_secure(LinphoneAddress *addr, bool_t enabled);
 LINPHONE_PUBLIC bool_t linphone_address_is_sip(const LinphoneAddress *uri);
 LINPHONE_PUBLIC LinphoneTransportType linphone_address_get_transport(const LinphoneAddress *uri);
 LINPHONE_PUBLIC void linphone_address_set_transport(LinphoneAddress *uri,LinphoneTransportType type);
diff --git a/include/sal/sal.h b/include/sal/sal.h
index f765bf349..95037fe0e 100644
--- a/include/sal/sal.h
+++ b/include/sal/sal.h
@@ -92,6 +92,7 @@ const char *sal_address_get_username(const SalAddress *addr);
 const char *sal_address_get_domain(const SalAddress *addr);
 int sal_address_get_port(const SalAddress *addr);
 bool_t sal_address_is_secure(const SalAddress *addr);
+void sal_address_set_secure(SalAddress *addr, bool_t enabled);
 
 SalTransport sal_address_get_transport(const SalAddress* addr);
 const char* sal_address_get_transport_name(const SalAddress* addr);
diff --git a/tester/accountmanager.c b/tester/accountmanager.c
index 2236b2039..93c250135 100644
--- a/tester/accountmanager.c
+++ b/tester/accountmanager.c
@@ -130,6 +130,7 @@ void account_create_on_server(Account *account, const LinphoneProxyConfig *refcf
 	linphone_core_set_sip_transports(lc,&tr);
 	
 	cfg=linphone_core_create_proxy_config(lc);
+	linphone_address_set_secure(tmp_identity, FALSE);
 	linphone_address_set_password(tmp_identity,account->password);
 	linphone_address_set_header(tmp_identity,"X-Create-Account","yes");
 	tmp=linphone_address_as_string(tmp_identity);
@@ -138,7 +139,8 @@ void account_create_on_server(Account *account, const LinphoneProxyConfig *refcf
 	linphone_address_unref(tmp_identity);
 	
 	server_addr=linphone_address_new(linphone_proxy_config_get_server_addr(refcfg));
-	linphone_address_set_transport(server_addr,LinphoneTransportTcp); /*use tcp for account creation*/
+	linphone_address_set_secure(server_addr, FALSE);
+	linphone_address_set_transport(server_addr,LinphoneTransportTcp); /*use tcp for account creation, we may not have certificates configured at this stage*/
 	linphone_address_set_port(server_addr,0);
 	tmp=linphone_address_as_string(server_addr);
 	linphone_proxy_config_set_server_addr(cfg,tmp);
@@ -152,8 +154,11 @@ void account_create_on_server(Account *account, const LinphoneProxyConfig *refcf
 		ms_fatal("Account for %s could not be created on server.", linphone_proxy_config_get_identity(refcfg));
 	}
 	linphone_proxy_config_edit(cfg);
-	tmp=linphone_address_as_string(account->modified_identity);
+	tmp_identity=linphone_address_clone(account->modified_identity);
+	linphone_address_set_secure(tmp_identity, FALSE);
+	tmp=linphone_address_as_string(tmp_identity);
 	linphone_proxy_config_set_identity(cfg,tmp); /*remove the X-Create-Account header*/
+	linphone_address_unref(tmp_identity);
 	ms_free(tmp);
 	linphone_proxy_config_done(cfg);
 	
diff --git a/tester/flexisip_tester.c b/tester/flexisip_tester.c
index 4b310be88..3e5992988 100644
--- a/tester/flexisip_tester.c
+++ b/tester/flexisip_tester.c
@@ -583,6 +583,119 @@ static void early_media_call_forking(void) {
 	linphone_core_manager_destroy(pauline);
 }
 
+static void call_with_sips(void){
+	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_sips_rc");
+	LinphoneCoreManager* pauline1 = linphone_core_manager_new( "pauline_sips_rc");
+	LinphoneCoreManager* pauline2 = linphone_core_manager_new( "pauline_tcp_rc");
+	MSList* lcs=ms_list_append(NULL,marie->lc);
+	
+	lcs=ms_list_append(lcs,pauline1->lc);
+	lcs=ms_list_append(lcs,pauline2->lc);
+	
+	linphone_core_set_user_agent(marie->lc,"Natted Linphone",NULL);
+	linphone_core_set_user_agent(pauline1->lc,"Natted Linphone",NULL);
+	linphone_core_set_user_agent(pauline2->lc,"Natted Linphone",NULL);
+	
+	linphone_core_invite_address(marie->lc,pauline1->identity);
+
+	/*marie should hear ringback*/
+	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallOutgoingRinging,1,3000));
+	/*Only the sips registered device from pauline should ring*/
+	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline1->stat.number_of_LinphoneCallIncomingReceived,1,1000));
+	
+	/*pauline accepts the call */
+	linphone_core_accept_call(pauline1->lc,linphone_core_get_current_call(pauline1->lc));
+	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline1->stat.number_of_LinphoneCallConnected,1,1000));
+	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline1->stat.number_of_LinphoneCallStreamsRunning,1,1000));
+	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallConnected,1,1000));
+	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallStreamsRunning,1,1000));
+	
+	/*pauline2 should not have ring*/
+	CU_ASSERT_TRUE(pauline2->stat.number_of_LinphoneCallIncomingReceived==0);
+	
+	linphone_core_terminate_call(pauline1->lc,linphone_core_get_current_call(pauline1->lc));
+	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline1->stat.number_of_LinphoneCallEnd,1,3000));
+	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallEnd,1,3000));
+	
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline1);
+	linphone_core_manager_destroy(pauline2);
+	ms_list_free(lcs);
+}
+
+static void call_with_sips_not_achievable(void){
+	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_sips_rc");
+	LinphoneCoreManager* pauline1 = linphone_core_manager_new( "pauline_rc");
+	LinphoneCoreManager* pauline2 = linphone_core_manager_new( "pauline_tcp_rc");
+	MSList* lcs=ms_list_append(NULL,marie->lc);
+	LinphoneAddress *dest;
+	LinphoneCall *call;
+	const LinphoneErrorInfo *ei;
+	
+	lcs=ms_list_append(lcs,pauline1->lc);
+	lcs=ms_list_append(lcs,pauline2->lc);
+
+	
+	dest=linphone_address_clone(pauline1->identity);
+	linphone_address_set_secure(dest,TRUE);
+	call=linphone_core_invite_address(marie->lc,dest);
+	linphone_call_ref(call);
+	linphone_address_unref(dest);
+
+	/*Call should be rejected by server with 480*/
+	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallError,1,3000));
+	ei=linphone_call_get_error_info(call);
+	CU_ASSERT_PTR_NOT_NULL(ei);
+	if (ei){
+		CU_ASSERT_EQUAL(linphone_error_info_get_reason(ei), LinphoneReasonTemporarilyUnavailable);
+	}
+	
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline1);
+	linphone_core_manager_destroy(pauline2);
+	ms_list_free(lcs);
+}
+
+static void call_with_ipv6(void) {
+	int begin;
+	int leaked_objects;
+	LinphoneCoreManager* marie;
+	LinphoneCoreManager* pauline;
+	LinphoneCall *pauline_call;
+	
+	/*skipped until sip2 has ipv6 address*/
+	return;
+
+	if (!liblinphone_tester_ipv6_available()){
+		ms_warning("Call with ipv6 not tested, no ipv6 connectivity");
+		return;
+	}
+	
+	belle_sip_object_enable_leak_detector(TRUE);
+	begin=belle_sip_object_get_object_count();
+
+	liblinphone_tester_enable_ipv6(TRUE);
+	marie = linphone_core_manager_new( "marie_rc");
+	pauline = linphone_core_manager_new( "pauline_rc");
+
+	linphone_core_set_user_agent(marie->lc,"Natted Linphone",NULL);
+	linphone_core_set_user_agent(pauline->lc,"Natted Linphone",NULL);
+	CU_ASSERT_TRUE(call(marie,pauline));
+	pauline_call=linphone_core_get_current_call(pauline->lc);
+	CU_ASSERT_PTR_NOT_NULL(pauline_call);
+
+	liblinphone_tester_check_rtcp(marie,pauline);
+	end_call(marie,pauline);
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+	liblinphone_tester_enable_ipv6(FALSE);
+
+	leaked_objects=belle_sip_object_get_object_count()-begin;
+	CU_ASSERT_TRUE(leaked_objects==0);
+	if (leaked_objects>0){
+		belle_sip_object_dump_active_objects();
+	}
+}
 
 test_t flexisip_tests[] = {
 	{ "Subscribe forking", subscribe_forking },
@@ -598,6 +711,9 @@ test_t flexisip_tests[] = {
 	{ "Call forking with push notification (multiple)", call_forking_with_push_notification_multiple },
 	{ "Call forking not responded", call_forking_not_responded },
 	{ "Early-media call forking", early_media_call_forking },
+	{ "Call with sips", call_with_sips },
+	{ "Call with sips not achievable", call_with_sips_not_achievable },
+	{ "Call with ipv6", call_with_ipv6 }
 };
 
 
diff --git a/tester/liblinphone_tester.h b/tester/liblinphone_tester.h
index b6aca2626..8111015f0 100644
--- a/tester/liblinphone_tester.h
+++ b/tester/liblinphone_tester.h
@@ -307,6 +307,7 @@ bool_t liblinphone_tester_clock_elapsed(const MSTimeSpec *start, int value_ms);
 void linphone_core_manager_check_accounts(LinphoneCoreManager *m);
 void account_manager_destroy(void);
 LinphoneCore* configure_lc_from(LinphoneCoreVTable* v_table, const char* path, const char* file, void* user_data);
+void liblinphone_tester_enable_ipv6(bool_t enabled);
 #ifdef ANDROID
 void cunit_android_trace_handler(int level, const char *fmt, va_list args) ;
 #endif
diff --git a/tester/rcfiles/marie_sips_rc b/tester/rcfiles/marie_sips_rc
new file mode 100644
index 000000000..0723c13a0
--- /dev/null
+++ b/tester/rcfiles/marie_sips_rc
@@ -0,0 +1,53 @@
+[sip]
+sip_port=-1
+sip_tcp_port=-1
+sip_tls_port=-1
+default_proxy=0
+ping_with_options=0
+register_only_when_network_is_up=0
+composing_idle_timeout=1
+
+[auth_info_0]
+username=marie
+userid=marie
+passwd=secret
+realm=sip2.linphone.org
+
+
+[proxy_0]
+reg_proxy=sips:sip2.linphone.org
+reg_route=sips:sip2.linphone.org
+reg_identity="Super Marie" <sips:marie@sip.example.org>
+reg_expires=3600
+reg_sendregister=1
+publish=0
+dial_escape_plus=0
+quality_reporting_collector=sip:collector@sip2.linphone.org
+quality_reporting_enabled=1
+
+[friend_0]
+url="Paupoche" <sip:pauline@sip2.linphone.org>
+pol=accept
+subscribe=0
+
+
+[rtp]
+audio_rtp_port=8070
+video_rtp_port=9072
+
+[video]
+display=0
+capture=0
+show_local=0
+size=vga
+enabled=0
+self_view=0
+automatically_initiate=0
+automatically_accept=0
+device=StaticImage: Static picture
+
+[sound]
+echocancellation=0 #to not overload cpu in case of VG
+
+[net]
+dns_srv_enabled=0 #no srv needed in general
diff --git a/tester/rcfiles/pauline_sips_rc b/tester/rcfiles/pauline_sips_rc
new file mode 100644
index 000000000..5d9f3d5ed
--- /dev/null
+++ b/tester/rcfiles/pauline_sips_rc
@@ -0,0 +1,50 @@
+[sip]
+sip_port=-1
+sip_tcp_port=-1
+sip_tls_port=-1
+default_proxy=0
+ping_with_options=0
+register_only_when_network_is_up=0
+composing_idle_timeout=1
+
+[auth_info_0]
+username=pauline
+userid=pauline
+passwd=secret
+realm=sip.example.org
+
+
+[proxy_0]
+reg_proxy=sips:sip2.linphone.org
+reg_route=sips:sip2.linphone.org
+reg_identity=sips:pauline@sip.example.org
+reg_expires=3600
+reg_sendregister=1
+publish=0
+dial_escape_plus=0
+
+#[friend_0]
+#url="Mariette" <sip:marie@sip.example.org>
+#pol=accept
+#subscribe=0
+
+[rtp]
+audio_rtp_port=8090
+video_rtp_port=9092
+
+[video]
+display=0
+capture=0
+show_local=0
+size=vga
+enabled=0
+self_view=0
+automatically_initiate=0
+automatically_accept=0
+device=StaticImage: Static picture
+
+[sound]
+echocancellation=0 #to not overload cpu in case of VG
+
+[net]
+dns_srv_enabled=0 #no srv needed in general
diff --git a/tester/tester.c b/tester/tester.c
index d3a34a375..cbd1bfd44 100644
--- a/tester/tester.c
+++ b/tester/tester.c
@@ -41,6 +41,7 @@ const char* test_password="secret";
 const char* test_route="sip2.linphone.org";
 int liblinphone_tester_use_log_file=0;
 static int liblinphone_tester_keep_accounts_flag = 0;
+static bool_t liblinphone_tester_ipv6_enabled=FALSE;
 static int manager_count = 0;
 
 static const char* liblinphone_tester_xml_file = NULL;
@@ -83,6 +84,10 @@ bool_t liblinphone_tester_clock_elapsed(const MSTimeSpec *start, int value_ms){
 	return FALSE;
 }
 
+void liblinphone_tester_enable_ipv6(bool_t enabled){
+	liblinphone_tester_ipv6_enabled=enabled;
+}
+
 LinphoneAddress * create_linphone_address(const char * domain) {
 	LinphoneAddress *addr = linphone_address_new(NULL);
 	CU_ASSERT_PTR_NOT_NULL_FATAL(addr);
@@ -157,6 +162,7 @@ LinphoneCore* configure_lc_from(LinphoneCoreVTable* v_table, const char* path, c
 	sal_set_dns_user_hosts_file(lc->sal, dnsuserhostspath);
 	linphone_core_set_static_picture(lc,nowebcampath);
 
+	linphone_core_enable_ipv6(lc, liblinphone_tester_ipv6_enabled);
 
 	ms_free(ringpath);
 	ms_free(ringbackpath);
diff --git a/tester/tester_hosts b/tester/tester_hosts
index b7056b863..872dd4a63 100644
--- a/tester/tester_hosts
+++ b/tester/tester_hosts
@@ -1 +1,2 @@
 94.23.19.176	sip2.linphone.org sip.example.org sipopen.example.org auth.example.org auth1.example.org auth2.example.org altname.linphone.org sip.wildcard1.linphone.org altname.wildcard2.linphone.org 
+2001:41d0:2:14b0::1 sip2.linphone.org sip.example.org sipopen.example.org auth.example.org auth1.example.org auth2.example.org altname.linphone.org sip.wildcard1.linphone.org altname.wildcard2.linphone.org
\ No newline at end of file

From d2d0458cae8e58fed78993bdc95a540fad7572f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
 <francois.grisez@belledonne-communications.com>
Date: Tue, 3 Feb 2015 14:53:42 +0100
Subject: [PATCH 326/496] Fix bug #1961

Fix crash when receiving an INVITE message with an empty body
---
 coreapi/bellesip_sal/sal_op_call.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/coreapi/bellesip_sal/sal_op_call.c b/coreapi/bellesip_sal/sal_op_call.c
index 4aca82a81..7cf64947e 100644
--- a/coreapi/bellesip_sal/sal_op_call.c
+++ b/coreapi/bellesip_sal/sal_op_call.c
@@ -389,7 +389,8 @@ static void unsupported_method(belle_sip_server_transaction_t* server_transactio
  *
 **/
 static int extract_sdp(SalOp *op, belle_sip_message_t* message,belle_sdp_session_description_t** session_desc, SalReason *error) {
-	belle_sip_header_content_type_t* content_type=belle_sip_message_get_header_by_type(message,belle_sip_header_content_type_t);
+	const char *body;
+	belle_sip_header_content_type_t* content_type;
 
 	if (op&&op->sdp_removal){
 		ms_error("Removed willingly SDP because sal_call_enable_sdp_removal was set to TRUE.");
@@ -397,11 +398,18 @@ static int extract_sdp(SalOp *op, belle_sip_message_t* message,belle_sdp_session
 		*error=SalReasonNotAcceptable;
 		return -1;
 	}
-
+	
+	body = belle_sip_message_get_body(message);
+	if(body == NULL) {
+		*session_desc = NULL;
+		return 0;
+	}
+	
+	content_type = belle_sip_message_get_header_by_type(message,belle_sip_header_content_type_t);
 	if (content_type){
 		if (strcmp("application",belle_sip_header_content_type_get_type(content_type))==0
 			&& strcmp("sdp",belle_sip_header_content_type_get_subtype(content_type))==0) {
-			*session_desc=belle_sdp_session_description_parse(belle_sip_message_get_body(message));
+			*session_desc=belle_sdp_session_description_parse(body);
 			if (*session_desc==NULL) {
 				ms_error("Failed to parse SDP message.");
 				*error=SalReasonNotAcceptable;

From ef7413d063de3efbaf08788c8a6ec161eb933b9b Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Tue, 3 Feb 2015 14:57:04 +0100
Subject: [PATCH 327/496] enable ipv6 test

---
 mediastreamer2           | 2 +-
 oRTP                     | 2 +-
 tester/flexisip_tester.c | 3 ---
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 738fcf99d..31ec76f3e 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 738fcf99df2f930fe64bf8e5dc3fb4d65a004a7d
+Subproject commit 31ec76f3e3955c2521fc770308c39f1de641de67
diff --git a/oRTP b/oRTP
index 753a2d67e..8cac6a399 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 753a2d67ee0e4e9a8c2f64f92b598ac11187378a
+Subproject commit 8cac6a399755001f5df7a933bc26c7b9629981fc
diff --git a/tester/flexisip_tester.c b/tester/flexisip_tester.c
index 3e5992988..dc0250eb8 100644
--- a/tester/flexisip_tester.c
+++ b/tester/flexisip_tester.c
@@ -662,9 +662,6 @@ static void call_with_ipv6(void) {
 	LinphoneCoreManager* marie;
 	LinphoneCoreManager* pauline;
 	LinphoneCall *pauline_call;
-	
-	/*skipped until sip2 has ipv6 address*/
-	return;
 
 	if (!liblinphone_tester_ipv6_available()){
 		ms_warning("Call with ipv6 not tested, no ipv6 connectivity");

From c7437e6ffc7438eff3b9e7ae685ab424df09d799 Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Tue, 3 Feb 2015 16:47:26 +0100
Subject: [PATCH 328/496] Revert LinphoneCoreListener modifications for Android

---
 .../core/tutorials/TutorialBuddyStatus.java   |   4 +-
 .../core/tutorials/TutorialChatRoom.java      |   4 +-
 .../core/tutorials/TutorialHelloWorld.java    |   4 +-
 .../core/tutorials/TutorialRegistration.java  |   4 +-
 coreapi/linphonecore_jni.cc                   |  28 +-
 .../org/linphone/core/LinphoneCore.java       |   4 +-
 .../linphone/core/LinphoneCoreListener.java   | 426 +++++++++---------
 .../core/LinphoneCoreListenerBase.java        | 208 +++++++++
 .../org/linphone/core/LinphoneCoreImpl.java   |   4 +-
 9 files changed, 427 insertions(+), 259 deletions(-)
 create mode 100644 java/common/org/linphone/core/LinphoneCoreListenerBase.java

diff --git a/coreapi/help/java/org/linphone/core/tutorials/TutorialBuddyStatus.java b/coreapi/help/java/org/linphone/core/tutorials/TutorialBuddyStatus.java
index ef5dd2fd1..22a850b36 100644
--- a/coreapi/help/java/org/linphone/core/tutorials/TutorialBuddyStatus.java
+++ b/coreapi/help/java/org/linphone/core/tutorials/TutorialBuddyStatus.java
@@ -35,7 +35,7 @@ import org.linphone.core.LinphoneCore.RegistrationState;
 import org.linphone.core.LinphoneCore.RemoteProvisioningState;
 import org.linphone.core.LinphoneCoreException;
 import org.linphone.core.LinphoneCoreFactory;
-import org.linphone.core.LinphoneCoreListener.LinphoneListener;
+import org.linphone.core.LinphoneCoreListener;
 import org.linphone.core.LinphoneEvent;
 import org.linphone.core.LinphoneFriend;
 import org.linphone.core.LinphoneFriend.SubscribePolicy;
@@ -61,7 +61,7 @@ import org.linphone.core.SubscriptionState;
  * @author Guillaume Beraudo
  *
  */
-public class TutorialBuddyStatus implements LinphoneListener {
+public class TutorialBuddyStatus implements LinphoneCoreListener {
 
 	private boolean running;
 	private TutorialNotifier TutorialNotifier;
diff --git a/coreapi/help/java/org/linphone/core/tutorials/TutorialChatRoom.java b/coreapi/help/java/org/linphone/core/tutorials/TutorialChatRoom.java
index 046c23ada..e8a7da936 100644
--- a/coreapi/help/java/org/linphone/core/tutorials/TutorialChatRoom.java
+++ b/coreapi/help/java/org/linphone/core/tutorials/TutorialChatRoom.java
@@ -35,7 +35,7 @@ import org.linphone.core.LinphoneCore.RegistrationState;
 import org.linphone.core.LinphoneCore.RemoteProvisioningState;
 import org.linphone.core.LinphoneCoreException;
 import org.linphone.core.LinphoneCoreFactory;
-import org.linphone.core.LinphoneCoreListener.LinphoneListener;
+import org.linphone.core.LinphoneCoreListener;
 import org.linphone.core.LinphoneEvent;
 import org.linphone.core.LinphoneFriend;
 import org.linphone.core.LinphoneInfoMessage;
@@ -59,7 +59,7 @@ import org.linphone.core.SubscriptionState;
  * @author Guillaume Beraudo
  *
  */
-public class TutorialChatRoom implements LinphoneListener, LinphoneChatMessage.StateListener {
+public class TutorialChatRoom implements LinphoneCoreListener, LinphoneChatMessage.StateListener {
 	private boolean running;
 	private TutorialNotifier TutorialNotifier;
 
diff --git a/coreapi/help/java/org/linphone/core/tutorials/TutorialHelloWorld.java b/coreapi/help/java/org/linphone/core/tutorials/TutorialHelloWorld.java
index 2e2e50b0b..3fc9b78c5 100644
--- a/coreapi/help/java/org/linphone/core/tutorials/TutorialHelloWorld.java
+++ b/coreapi/help/java/org/linphone/core/tutorials/TutorialHelloWorld.java
@@ -35,7 +35,7 @@ import org.linphone.core.LinphoneCore.RegistrationState;
 import org.linphone.core.LinphoneCore.RemoteProvisioningState;
 import org.linphone.core.LinphoneCoreException;
 import org.linphone.core.LinphoneCoreFactory;
-import org.linphone.core.LinphoneCoreListener.LinphoneListener;
+import org.linphone.core.LinphoneCoreListener;
 import org.linphone.core.LinphoneEvent;
 import org.linphone.core.LinphoneFriend;
 import org.linphone.core.LinphoneInfoMessage;
@@ -53,7 +53,7 @@ import org.linphone.core.SubscriptionState;
  * @author Guillaume Beraudo
  *
  */
-public class TutorialHelloWorld implements LinphoneListener {
+public class TutorialHelloWorld implements LinphoneCoreListener {
 	private boolean running;
 	private TutorialNotifier TutorialNotifier;
 
diff --git a/coreapi/help/java/org/linphone/core/tutorials/TutorialRegistration.java b/coreapi/help/java/org/linphone/core/tutorials/TutorialRegistration.java
index ce985d288..44c432271 100644
--- a/coreapi/help/java/org/linphone/core/tutorials/TutorialRegistration.java
+++ b/coreapi/help/java/org/linphone/core/tutorials/TutorialRegistration.java
@@ -35,7 +35,7 @@ import org.linphone.core.LinphoneCore.RegistrationState;
 import org.linphone.core.LinphoneCore.RemoteProvisioningState;
 import org.linphone.core.LinphoneCoreException;
 import org.linphone.core.LinphoneCoreFactory;
-import org.linphone.core.LinphoneCoreListener.LinphoneListener;
+import org.linphone.core.LinphoneCoreListener;
 import org.linphone.core.LinphoneEvent;
 import org.linphone.core.LinphoneFriend;
 import org.linphone.core.LinphoneInfoMessage;
@@ -58,7 +58,7 @@ import org.linphone.core.SubscriptionState;
  * @author Guillaume Beraudo
  *
  */
-public class TutorialRegistration implements LinphoneListener {
+public class TutorialRegistration implements LinphoneCoreListener {
 	private boolean running;
 	private TutorialNotifier TutorialNotifier;
 
diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index 8dbb4f382..b159050f0 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -273,7 +273,6 @@ public:
 		globalStateClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneCore$GlobalState"));
 		globalStateFromIntId = env->GetStaticMethodID(globalStateClass,"fromInt","(I)Lorg/linphone/core/LinphoneCore$GlobalState;");
 		globalStateId = env->GetMethodID(listenerClass,"globalState","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneCore$GlobalState;Ljava/lang/String;)V");
-		env->ExceptionClear();
 		if (globalStateId) {
 			vTable->global_state_changed = globalStateChange;
 		}
@@ -282,7 +281,6 @@ public:
 		registrationStateClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneCore$RegistrationState"));
 		registrationStateFromIntId = env->GetStaticMethodID(registrationStateClass,"fromInt","(I)Lorg/linphone/core/LinphoneCore$RegistrationState;");
 		registrationStateId = env->GetMethodID(listenerClass,"registrationState","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneProxyConfig;Lorg/linphone/core/LinphoneCore$RegistrationState;Ljava/lang/String;)V");
-		env->ExceptionClear();
 		if (registrationStateId) {
 			vTable->registration_state_changed = registrationStateChange;
 		}
@@ -291,7 +289,6 @@ public:
 		callStateClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneCall$State"));
 		callStateFromIntId = env->GetStaticMethodID(callStateClass,"fromInt","(I)Lorg/linphone/core/LinphoneCall$State;");
 		callStateId = env->GetMethodID(listenerClass,"callState","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneCall;Lorg/linphone/core/LinphoneCall$State;Ljava/lang/String;)V");
-		env->ExceptionClear();
 		if (callStateId) {
 			vTable->call_state_changed = callStateChange;
 		}
@@ -304,14 +301,12 @@ public:
 
 		/*callStatsUpdated(LinphoneCore lc, LinphoneCall call, LinphoneCallStats stats);*/
 		callStatsUpdatedId = env->GetMethodID(listenerClass, "callStatsUpdated", "(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneCall;Lorg/linphone/core/LinphoneCallStats;)V");
-		env->ExceptionClear();
 		if (callStatsUpdatedId) {
 			vTable->call_stats_updated = callStatsUpdated;
 		}
 
 		/*callEncryption(LinphoneCore lc, LinphoneCall call, boolean encrypted,String auth_token);*/
 		callEncryptionChangedId = env->GetMethodID(listenerClass,"callEncryptionChanged","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneCall;ZLjava/lang/String;)V");
-		env->ExceptionClear();
 		if (callEncryptionChangedId) {
 			vTable->call_encryption_changed = callEncryptionChange;
 		}
@@ -320,7 +315,6 @@ public:
 		ecCalibratorStatusClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneCore$EcCalibratorStatus"));
 		ecCalibratorStatusFromIntId = env->GetStaticMethodID(ecCalibratorStatusClass,"fromInt","(I)Lorg/linphone/core/LinphoneCore$EcCalibratorStatus;");
 		ecCalibrationStatusId = env->GetMethodID(listenerClass,"ecCalibrationStatus","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneCore$EcCalibratorStatus;ILjava/lang/Object;)V");
-		env->ExceptionClear();
 
 		/*void newSubscriptionRequest(LinphoneCore lc, LinphoneFriend lf, String url)*/
 		newSubscriptionRequestId = env->GetMethodID(listenerClass,"newSubscriptionRequest","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneFriend;Ljava/lang/String;)V");
@@ -362,13 +356,11 @@ public:
 		}
 
 		dtmfReceivedId = env->GetMethodID(listenerClass,"dtmfReceived","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneCall;I)V");
-		env->ExceptionClear();
 		if (dtmfReceivedId) {
 			vTable->dtmf_received = dtmf_received;
 		}
 
 		infoReceivedId = env->GetMethodID(listenerClass,"infoReceived", "(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneCall;Lorg/linphone/core/LinphoneInfoMessage;)V");
-		env->ExceptionClear();
 		if (infoReceivedId) {
 			vTable->info_received = infoReceived;
 		}
@@ -376,7 +368,6 @@ public:
 		subscriptionStateClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/SubscriptionState"));
 		subscriptionStateFromIntId = env->GetStaticMethodID(subscriptionStateClass,"fromInt","(I)Lorg/linphone/core/SubscriptionState;");
 		subscriptionStateId = env->GetMethodID(listenerClass,"subscriptionStateChanged", "(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneEvent;Lorg/linphone/core/SubscriptionState;)V");
-		env->ExceptionClear();
 		if (subscriptionStateId) {
 			vTable->subscription_state_changed = subscriptionStateChanged;
 		}
@@ -384,13 +375,11 @@ public:
 		publishStateClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/PublishState"));
 		publishStateFromIntId = env->GetStaticMethodID(publishStateClass,"fromInt","(I)Lorg/linphone/core/PublishState;");
 		publishStateId = env->GetMethodID(listenerClass,"publishStateChanged", "(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneEvent;Lorg/linphone/core/PublishState;)V");
-		env->ExceptionClear();
 		if (publishStateId) {
 			vTable->publish_state_changed = publishStateChanged;
 		}
 
 		notifyRecvId = env->GetMethodID(listenerClass,"notifyReceived", "(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneEvent;Ljava/lang/String;Lorg/linphone/core/LinphoneContent;)V");
-		env->ExceptionClear();
 		if (notifyRecvId) {
 			vTable->notify_received = notifyReceived;
 		}
@@ -398,25 +387,21 @@ public:
 		configuringStateClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneCore$RemoteProvisioningState"));
 		configuringStateFromIntId = env->GetStaticMethodID(configuringStateClass,"fromInt","(I)Lorg/linphone/core/LinphoneCore$RemoteProvisioningState;");
 		configuringStateId = env->GetMethodID(listenerClass,"configuringStatus","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneCore$RemoteProvisioningState;Ljava/lang/String;)V");
-		env->ExceptionClear();
 		if (configuringStateId) {
 			vTable->configuring_status = configuringStatus;
 		}
 
 		fileTransferProgressIndicationId = env->GetMethodID(listenerClass, "fileTransferProgressIndication", "(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneChatMessage;Lorg/linphone/core/LinphoneContent;I)V");
-		env->ExceptionClear();
 		if (fileTransferProgressIndicationId) {
 			vTable->file_transfer_progress_indication = fileTransferProgressIndication;
 		}
 
 		fileTransferSendId = env->GetMethodID(listenerClass, "fileTransferSend", "(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneChatMessage;Lorg/linphone/core/LinphoneContent;Ljava/nio/ByteBuffer;I)I");
-		env->ExceptionClear();
 		if (fileTransferSendId) {
 			vTable->file_transfer_send = fileTransferSend;
 		}
 
 		fileTransferRecvId = env->GetMethodID(listenerClass, "fileTransferRecv", "(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneChatMessage;Lorg/linphone/core/LinphoneContent;[BI)V");
-		env->ExceptionClear();
 		if (fileTransferRecvId) {
 			vTable->file_transfer_recv = fileTransferRecv;
 		}
@@ -424,12 +409,10 @@ public:
 		logCollectionUploadStateClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneCore$LogCollectionUploadState"));
 		logCollectionUploadStateFromIntId = env->GetStaticMethodID(logCollectionUploadStateClass, "fromInt", "(I)Lorg/linphone/core/LinphoneCore$LogCollectionUploadState;");
 		logCollectionUploadProgressId = env->GetMethodID(listenerClass, "uploadProgressIndication", "(Lorg/linphone/core/LinphoneCore;II)V");
-		env->ExceptionClear();
 		if (logCollectionUploadProgressId) {
 			vTable->log_collection_upload_progress_indication = logCollectionUploadProgressIndication;
 		}
 		logCollectionUploadStateId = env->GetMethodID(listenerClass, "uploadStateChanged", "(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneCore$LogCollectionUploadState;Ljava/lang/String;)V");
-		env->ExceptionClear();
 		if (logCollectionUploadStateId) {
 			vTable->log_collection_upload_state_changed = logCollectionUploadStateChange;
 		}
@@ -1120,19 +1103,20 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_addListener(JNIEnv* env,
 extern "C" void Java_org_linphone_core_LinphoneCoreImpl_removeListener(JNIEnv* env, jobject thiz, jlong lc, jobject jlistener) {
 	MSList* iterator;
 	LinphoneCore *core = (LinphoneCore*)lc;
-	jobject listener = env->NewGlobalRef(jlistener);
-	for (iterator = core->vtables; iterator != NULL; iterator = iterator->next) {
+	//jobject listener = env->NewGlobalRef(jlistener);
+	for (iterator = core->vtables; iterator != NULL; ) {
 		LinphoneCoreVTable *vTable = (LinphoneCoreVTable*)(iterator->data);
+		iterator = iterator->next; //Because linphone_core_remove_listener may change the list
 		if (vTable) {
 			LinphoneCoreData *data = (LinphoneCoreData*) linphone_core_v_table_get_user_data(vTable);
-			if (data && env->IsSameObject(data->listener, listener)) {
+			if (data && env->IsSameObject(data->listener, jlistener)) {
 				linphone_core_remove_listener(core, vTable);
+				delete data;
 				linphone_core_v_table_destroy(vTable);
-				break;
 			}
 		}
 	}
-	env->DeleteGlobalRef(listener);
+	//env->DeleteGlobalRef(listener);
 }
 
 
diff --git a/java/common/org/linphone/core/LinphoneCore.java b/java/common/org/linphone/core/LinphoneCore.java
index 0a50f4f3d..3ff4a3865 100644
--- a/java/common/org/linphone/core/LinphoneCore.java
+++ b/java/common/org/linphone/core/LinphoneCore.java
@@ -20,7 +20,7 @@ package org.linphone.core;
 
 import java.util.Vector;
 
-import org.linphone.core.LinphoneCoreListener.LinphoneEchoCalibrationListener;
+import org.linphone.core.LinphoneCoreListener;
 import org.linphone.mediastream.video.AndroidVideoWindowImpl;
 import org.linphone.mediastream.video.capture.hwconf.AndroidCameraConfiguration;
 
@@ -1123,7 +1123,7 @@ public interface LinphoneCore {
 	 * @param listener the LinphoneEchoCalibrationListener to call when the calibration is done
 	 * @throws LinphoneCoreException if operation is still in progress;
 	**/
-	void startEchoCalibration(LinphoneEchoCalibrationListener listener) throws LinphoneCoreException;
+	void startEchoCalibration(LinphoneCoreListener listener) throws LinphoneCoreException;
 
 	/**
 	 * Returns true if echo calibration is recommended.
diff --git a/java/common/org/linphone/core/LinphoneCoreListener.java b/java/common/org/linphone/core/LinphoneCoreListener.java
index 42a59a4a7..4067380a0 100644
--- a/java/common/org/linphone/core/LinphoneCoreListener.java
+++ b/java/common/org/linphone/core/LinphoneCoreListener.java
@@ -26,238 +26,214 @@ import java.nio.ByteBuffer;
  *This interface holds all callbacks that the application should implement. None is mandatory.
  */
 public interface LinphoneCoreListener {
-	
-	public interface LinphoneListener extends LinphoneCoreListener, 
-			LinphoneRemoteProvisioningListener, LinphoneMessageListener, LinphoneCallStateListener, 
-			LinphoneCallEncryptionStateListener, LinphoneNotifyListener, LinphoneComposingListener,
-			LinphoneGlobalStateListener, LinphoneRegistrationStateListener, LinphoneLogCollectionUploadListener {
-		/**< Ask the application some authentication information 
-		 * @return */
-		void authInfoRequested(LinphoneCore lc, String realm, String username, String Domain); 
 
-		/**
-		 * Call stats notification
-		 */
-		void callStatsUpdated(LinphoneCore lc, LinphoneCall call, LinphoneCallStats stats);
+	/**< Ask the application some authentication information 
+	 * @return */
+	void authInfoRequested(LinphoneCore lc, String realm, String username, String Domain); 
 
-		/**
-		 * Reports that a new subscription request has been received and wait for a decision. 
-		 *Status on this subscription request is notified by changing policy for this friend
-		 *@param lc LinphoneCore 	
-		 *@param lf LinphoneFriend corresponding to the subscriber
-		 *@param url of the subscriber
-		 * 
-		 */
-		void newSubscriptionRequest(LinphoneCore lc, LinphoneFriend lf, String url);
+	/**
+	 * Call stats notification
+	 */
+	void callStatsUpdated(LinphoneCore lc, LinphoneCall call, LinphoneCallStats stats);
 
-		/**
-		 * Report status change for a friend previously added to LinphoneCore.
-		 * @param lc LinphoneCore
-		 * @param lf updated LinphoneFriend
-		 */
-		void notifyPresenceReceived(LinphoneCore lc, LinphoneFriend lf);
+	/**
+	 * Reports that a new subscription request has been received and wait for a decision. 
+	 *Status on this subscription request is notified by changing policy for this friend
+	 *@param lc LinphoneCore 	
+	 *@param lf LinphoneFriend corresponding to the subscriber
+	 *@param url of the subscriber
+	 * 
+	 */
+	void newSubscriptionRequest(LinphoneCore lc, LinphoneFriend lf, String url);
 
-		/**
-		 * invoked when a new text message is received
-		 * @param lc LinphoneCore
-		 * @param  room 	LinphoneChatRoom involved in this conversation. Can be be created by the framework in case the from is not present in any chat room.
-		 * @param from  	LinphoneAddress from
-		 * @param message 	incoming message
-		 */
-		void textReceived(LinphoneCore lc, LinphoneChatRoom cr, LinphoneAddress from, String message);
-		
-		/**
-		 * invoked when a new dtmf is received
-		 * @param lc 	LinphoneCore
-		 * @param call 	LinphoneCall involved in the dtmf sending
-		 * @param dtmf 	value of the dtmf sent
-		 */
-		void dtmfReceived(LinphoneCore lc, LinphoneCall call, int dtmf);
-		
-		/**
-		 *  Report Notified message received for this identity.
-		 *  @param lc LinphoneCore
-		 *  @param call LinphoneCall in case the notify is part of a dialog, may be null
-		 *  @param from LinphoneAddress the message comes from
-		 *  @param event String the raw body of the notify event.
-		 *  
-		 */
-		void notifyReceived(LinphoneCore lc, LinphoneCall call, LinphoneAddress from, byte[] event);
+	/**
+	 * Report status change for a friend previously added to LinphoneCore.
+	 * @param lc LinphoneCore
+	 * @param lf updated LinphoneFriend
+	 */
+	void notifyPresenceReceived(LinphoneCore lc, LinphoneFriend lf);
 
-		/** 
-		 * Notifies progress of a call transfer. 
-		 * @param lc the LinphoneCore
-		 * @param call the call through which the transfer was sent.
-		 * @param new_call_state the state of the call resulting of the transfer, at the other party. 
-		 **/
-		void transferState(LinphoneCore lc, LinphoneCall call, LinphoneCall.State new_call_state);
-		
-		/**
-		 * Notifies an incoming INFO message.
-		 * @param lc the LinphoneCore.
-		 * @param info the info message
-		 */
-		void infoReceived(LinphoneCore lc, LinphoneCall call, LinphoneInfoMessage info);
-		
-		/**
-		 * Notifies of subscription requests state changes, including new incoming subscriptions.
-		 * @param lc the LinphoneCore
-		 * @param ev LinphoneEvent object representing the subscription context.
-		 * @param state actual state of the subscription.
-		 */
-		void subscriptionStateChanged(LinphoneCore lc, LinphoneEvent ev, SubscriptionState state);
-		
-		/**
-		 * Notifies about outgoing generic publish states.
-		 * @param lc the LinphoneCore
-		 * @param ev a LinphoneEvent representing the publish, typically created by {@link LinphoneCore#publish}
-		 * @param state the publish state
-		 */
-		void publishStateChanged(LinphoneCore lc, LinphoneEvent ev, PublishState state);
-		
-		/**< @Deprecated Notifies the application that it should show up
-		 * @return */
-		void show(LinphoneCore lc);
-		
-		/**< @Deprecated Callback that notifies various events with human readable text.
-		 * @return */
-		void displayStatus(LinphoneCore lc,String message);
+	/**
+	 * invoked when a new text message is received
+	 * @param lc LinphoneCore
+	 * @param  room 	LinphoneChatRoom involved in this conversation. Can be be created by the framework in case the from is not present in any chat room.
+	 * @param from  	LinphoneAddress from
+	 * @param message 	incoming message
+	 */
+	void textReceived(LinphoneCore lc, LinphoneChatRoom cr, LinphoneAddress from, String message);
 
-		/**< @Deprecated Callback to display a message to the user 
-		 * @return */
-		void displayMessage(LinphoneCore lc,String message);
+	/**
+	 * invoked when a new dtmf is received
+	 * @param lc 	LinphoneCore
+	 * @param call 	LinphoneCall involved in the dtmf sending
+	 * @param dtmf 	value of the dtmf sent
+	 */
+	void dtmfReceived(LinphoneCore lc, LinphoneCall call, int dtmf);
 
-		/** @Deprecated Callback to display a warning to the user 
-		 * @return */
-		void displayWarning(LinphoneCore lc,String message);
-		
-		/**
-		 * Callback to be notified about the transfer progress.
-		 * @param lc the LinphoneCore
-		 * @param message the LinphoneChatMessage
-		 * @param content the LinphoneContent
-		 * @param progress percentage of the transfer done
-		 */
-		void fileTransferProgressIndication(LinphoneCore lc, LinphoneChatMessage message, LinphoneContent content, int progress);
-		
-		/**
-		 * Callback to be notified when new data has been received
-		 * @param lc the LinphoneCore
-		 * @param message the LinphoneChatMessage
-		 * @param content the LinphoneContent
-		 * @param buffer
-		 * @param size
-		 */
-		void fileTransferRecv(LinphoneCore lc, LinphoneChatMessage message, LinphoneContent content, byte[] buffer, int size);
-		
-		/**
-		 * Callback to be notified when new data needs to be sent
-		 * @param lc the LinphoneCore
-		 * @param message the LinphoneChatMessage
-		 * @param content the LinphoneContent
-		 * @param buffer
-		 * @param size
-		 * @return the number of bytes written into buffer
-		 */
-		int fileTransferSend(LinphoneCore lc, LinphoneChatMessage message, LinphoneContent content, ByteBuffer buffer, int size);
-	}
-	
-	public interface LinphoneGlobalStateListener extends LinphoneCoreListener {
-		/** General State notification  
-		 * @param state LinphoneCore.State
-		 * @return 
-		 * */		
-		void globalState(LinphoneCore lc,LinphoneCore.GlobalState state, String message);
-	}
-	
-	public interface LinphoneRegistrationStateListener extends LinphoneCoreListener {
-		/**
-		 * Registration state notification
-		 * */
-		void registrationState(LinphoneCore lc, LinphoneProxyConfig cfg, LinphoneCore.RegistrationState state, String smessage);
-	}
-	
-	public interface LinphoneRemoteProvisioningListener extends LinphoneCoreListener {
-		/**
-		 * Notifies the changes about the remote provisioning step
-		 * @param lc the LinphoneCore
-		 * @param state the RemoteProvisioningState
-		 * @param message the error message if state == Failed
-		 */
-		void configuringStatus(LinphoneCore lc, LinphoneCore.RemoteProvisioningState state, String message);
-	}
-	
-	public interface LinphoneMessageListener extends LinphoneCoreListener {
-		/**
-		 * invoked when a new linphone chat message is received
-		 * @param lc LinphoneCore
-		 * @param  room 	LinphoneChatRoom involved in this conversation. Can be be created by the framework in case the from is not present in any chat room.
-		 * @param message 	incoming linphone chat message message
-		 */
-		void messageReceived(LinphoneCore lc, LinphoneChatRoom cr, LinphoneChatMessage message);
-	}
-	
-	public interface LinphoneCallStateListener extends LinphoneCoreListener {
-		/** Call  State notification  
-		 * @param state LinphoneCall.State
-		 * @return 
-		 * */		
-		void callState(LinphoneCore lc, LinphoneCall call, LinphoneCall.State state, String message);
-	}
-	
-	public interface LinphoneCallEncryptionStateListener extends LinphoneCoreListener {
-		/**
-		 * Callback to display change in encryption state.
-		 * @param encrypted true if all streams of the call are encrypted
-		 * @param authenticationToken token like ZRTP SAS that may be displayed to user
-		 */
-		void callEncryptionChanged(LinphoneCore lc, LinphoneCall call, boolean encrypted, String authenticationToken);
-	}
-	
-	public interface LinphoneNotifyListener extends LinphoneCoreListener {
-		/**
-		 * Notifies of an incoming NOTIFY received.
-		 * @param lc the linphoneCore
-		 * @param ev a LinphoneEvent representing the subscription context for which this notify belongs, or null if it is a NOTIFY out of of any subscription. 
-		 * @param eventName the event name
-		 * @param content content of the NOTIFY request.
-		 */
-		void notifyReceived(LinphoneCore lc, LinphoneEvent ev, String eventName, LinphoneContent content);
-	}
+	/**
+	 *  Report Notified message received for this identity.
+	 *  @param lc LinphoneCore
+	 *  @param call LinphoneCall in case the notify is part of a dialog, may be null
+	 *  @param from LinphoneAddress the message comes from
+	 *  @param event String the raw body of the notify event.
+	 *  
+	 */
+	void notifyReceived(LinphoneCore lc, LinphoneCall call, LinphoneAddress from, byte[] event);
 
-	public interface LinphoneComposingListener extends LinphoneCoreListener {
-		/**
-		 * invoked when a composing notification is received
-		 * @param lc LinphoneCore
-		 * @param room LinphoneChatRoom involved in the conversation.
-		 */
-		void isComposingReceived(LinphoneCore lc, LinphoneChatRoom cr);
-	}
-	
-	public interface LinphoneEchoCalibrationListener extends LinphoneCoreListener {
-		/**
-		 * Invoked when echo cancalation calibration is completed
-		 * @param lc LinphoneCore
-		 * @param status 
-		 * @param delay_ms echo delay
-		 * @param data
-		 */
-		void ecCalibrationStatus(LinphoneCore lc, LinphoneCore.EcCalibratorStatus status, int delay_ms, Object data);
-	}
-	
-	public interface LinphoneLogCollectionUploadListener extends LinphoneCoreListener {
-		/**
-		 * Callback prototype for reporting log collection upload progress indication.
-		 */
-		void uploadProgressIndication(LinphoneCore lc, int offset, int total);
-		
-		/**
-		 * Callback prototype for reporting log collection upload state change.
-		 * @param lc LinphoneCore object
-		 * @param state The state of the log collection upload
-		 * @param info Additional information: error message in case of error state, URL of uploaded file in case of success.
-		 */
-		void uploadStateChanged(LinphoneCore lc, LinphoneCore.LogCollectionUploadState state, String info);
-	}
+	/** 
+	 * Notifies progress of a call transfer. 
+	 * @param lc the LinphoneCore
+	 * @param call the call through which the transfer was sent.
+	 * @param new_call_state the state of the call resulting of the transfer, at the other party. 
+	 **/
+	void transferState(LinphoneCore lc, LinphoneCall call, LinphoneCall.State new_call_state);
+
+	/**
+	 * Notifies an incoming INFO message.
+	 * @param lc the LinphoneCore.
+	 * @param info the info message
+	 */
+	void infoReceived(LinphoneCore lc, LinphoneCall call, LinphoneInfoMessage info);
+
+	/**
+	 * Notifies of subscription requests state changes, including new incoming subscriptions.
+	 * @param lc the LinphoneCore
+	 * @param ev LinphoneEvent object representing the subscription context.
+	 * @param state actual state of the subscription.
+	 */
+	void subscriptionStateChanged(LinphoneCore lc, LinphoneEvent ev, SubscriptionState state);
+
+	/**
+	 * Notifies about outgoing generic publish states.
+	 * @param lc the LinphoneCore
+	 * @param ev a LinphoneEvent representing the publish, typically created by {@link LinphoneCore#publish}
+	 * @param state the publish state
+	 */
+	void publishStateChanged(LinphoneCore lc, LinphoneEvent ev, PublishState state);
+
+	/**< @Deprecated Notifies the application that it should show up
+	 * @return */
+	void show(LinphoneCore lc);
+
+	/**< @Deprecated Callback that notifies various events with human readable text.
+	 * @return */
+	void displayStatus(LinphoneCore lc,String message);
+
+	/**< @Deprecated Callback to display a message to the user 
+	 * @return */
+	void displayMessage(LinphoneCore lc,String message);
+
+	/** @Deprecated Callback to display a warning to the user 
+	 * @return */
+	void displayWarning(LinphoneCore lc,String message);
+
+	/**
+	 * Callback to be notified about the transfer progress.
+	 * @param lc the LinphoneCore
+	 * @param message the LinphoneChatMessage
+	 * @param content the LinphoneContent
+	 * @param progress percentage of the transfer done
+	 */
+	void fileTransferProgressIndication(LinphoneCore lc, LinphoneChatMessage message, LinphoneContent content, int progress);
+
+	/**
+	 * Callback to be notified when new data has been received
+	 * @param lc the LinphoneCore
+	 * @param message the LinphoneChatMessage
+	 * @param content the LinphoneContent
+	 * @param buffer
+	 * @param size
+	 */
+	void fileTransferRecv(LinphoneCore lc, LinphoneChatMessage message, LinphoneContent content, byte[] buffer, int size);
+
+	/**
+	 * Callback to be notified when new data needs to be sent
+	 * @param lc the LinphoneCore
+	 * @param message the LinphoneChatMessage
+	 * @param content the LinphoneContent
+	 * @param buffer
+	 * @param size
+	 * @return the number of bytes written into buffer
+	 */
+	int fileTransferSend(LinphoneCore lc, LinphoneChatMessage message, LinphoneContent content, ByteBuffer buffer, int size);
+
+	/** General State notification  
+	 * @param state LinphoneCore.State
+	 * @return 
+	 * */		
+	void globalState(LinphoneCore lc,LinphoneCore.GlobalState state, String message);
+
+	/**
+	 * Registration state notification
+	 * */
+	void registrationState(LinphoneCore lc, LinphoneProxyConfig cfg, LinphoneCore.RegistrationState state, String smessage);
+
+	/**
+	 * Notifies the changes about the remote provisioning step
+	 * @param lc the LinphoneCore
+	 * @param state the RemoteProvisioningState
+	 * @param message the error message if state == Failed
+	 */
+	void configuringStatus(LinphoneCore lc, LinphoneCore.RemoteProvisioningState state, String message);
+
+	/**
+	 * invoked when a new linphone chat message is received
+	 * @param lc LinphoneCore
+	 * @param  room 	LinphoneChatRoom involved in this conversation. Can be be created by the framework in case the from is not present in any chat room.
+	 * @param message 	incoming linphone chat message message
+	 */
+	void messageReceived(LinphoneCore lc, LinphoneChatRoom cr, LinphoneChatMessage message);
+
+
+	/** Call  State notification  
+	 * @param state LinphoneCall.State
+	 * @return 
+	 * */		
+	void callState(LinphoneCore lc, LinphoneCall call, LinphoneCall.State state, String message);
+
+	/**
+	 * Callback to display change in encryption state.
+	 * @param encrypted true if all streams of the call are encrypted
+	 * @param authenticationToken token like ZRTP SAS that may be displayed to user
+	 */
+	void callEncryptionChanged(LinphoneCore lc, LinphoneCall call, boolean encrypted, String authenticationToken);
+
+	/**
+	 * Notifies of an incoming NOTIFY received.
+	 * @param lc the linphoneCore
+	 * @param ev a LinphoneEvent representing the subscription context for which this notify belongs, or null if it is a NOTIFY out of of any subscription. 
+	 * @param eventName the event name
+	 * @param content content of the NOTIFY request.
+	 */
+	void notifyReceived(LinphoneCore lc, LinphoneEvent ev, String eventName, LinphoneContent content);
+
+	/**
+	 * invoked when a composing notification is received
+	 * @param lc LinphoneCore
+	 * @param room LinphoneChatRoom involved in the conversation.
+	 */
+	void isComposingReceived(LinphoneCore lc, LinphoneChatRoom cr);
+
+	/**
+	 * Invoked when echo cancalation calibration is completed
+	 * @param lc LinphoneCore
+	 * @param status 
+	 * @param delay_ms echo delay
+	 * @param data
+	 */
+	void ecCalibrationStatus(LinphoneCore lc, LinphoneCore.EcCalibratorStatus status, int delay_ms, Object data);
+
+	/**
+	 * Callback prototype for reporting log collection upload progress indication.
+	 */
+	void uploadProgressIndication(LinphoneCore lc, int offset, int total);
+
+	/**
+	 * Callback prototype for reporting log collection upload state change.
+	 * @param lc LinphoneCore object
+	 * @param state The state of the log collection upload
+	 * @param info Additional information: error message in case of error state, URL of uploaded file in case of success.
+	 */
+	void uploadStateChanged(LinphoneCore lc, LinphoneCore.LogCollectionUploadState state, String info);
 }
 
diff --git a/java/common/org/linphone/core/LinphoneCoreListenerBase.java b/java/common/org/linphone/core/LinphoneCoreListenerBase.java
new file mode 100644
index 000000000..158a871af
--- /dev/null
+++ b/java/common/org/linphone/core/LinphoneCoreListenerBase.java
@@ -0,0 +1,208 @@
+package org.linphone.core;
+
+import java.nio.ByteBuffer;
+
+import org.linphone.core.LinphoneCall.State;
+import org.linphone.core.LinphoneCore.EcCalibratorStatus;
+import org.linphone.core.LinphoneCore.GlobalState;
+import org.linphone.core.LinphoneCore.LogCollectionUploadState;
+import org.linphone.core.LinphoneCore.RegistrationState;
+import org.linphone.core.LinphoneCore.RemoteProvisioningState;
+
+public class LinphoneCoreListenerBase implements LinphoneCoreListener {
+
+	@Override
+	public void authInfoRequested(LinphoneCore lc, String realm,
+			String username, String Domain) {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void callStatsUpdated(LinphoneCore lc, LinphoneCall call,
+			LinphoneCallStats stats) {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void newSubscriptionRequest(LinphoneCore lc, LinphoneFriend lf,
+			String url) {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void notifyPresenceReceived(LinphoneCore lc, LinphoneFriend lf) {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void textReceived(LinphoneCore lc, LinphoneChatRoom cr,
+			LinphoneAddress from, String message) {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void dtmfReceived(LinphoneCore lc, LinphoneCall call, int dtmf) {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void notifyReceived(LinphoneCore lc, LinphoneCall call,
+			LinphoneAddress from, byte[] event) {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void transferState(LinphoneCore lc, LinphoneCall call,
+			State new_call_state) {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void infoReceived(LinphoneCore lc, LinphoneCall call,
+			LinphoneInfoMessage info) {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void subscriptionStateChanged(LinphoneCore lc, LinphoneEvent ev,
+			SubscriptionState state) {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void publishStateChanged(LinphoneCore lc, LinphoneEvent ev,
+			PublishState state) {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void show(LinphoneCore lc) {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void displayStatus(LinphoneCore lc, String message) {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void displayMessage(LinphoneCore lc, String message) {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void displayWarning(LinphoneCore lc, String message) {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void fileTransferProgressIndication(LinphoneCore lc,
+			LinphoneChatMessage message, LinphoneContent content, int progress) {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void fileTransferRecv(LinphoneCore lc, LinphoneChatMessage message,
+			LinphoneContent content, byte[] buffer, int size) {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public int fileTransferSend(LinphoneCore lc, LinphoneChatMessage message,
+			LinphoneContent content, ByteBuffer buffer, int size) {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public void globalState(LinphoneCore lc, GlobalState state, String message) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void registrationState(LinphoneCore lc, LinphoneProxyConfig cfg,
+			RegistrationState state, String smessage) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void configuringStatus(LinphoneCore lc,
+			RemoteProvisioningState state, String message) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void messageReceived(LinphoneCore lc, LinphoneChatRoom cr,
+			LinphoneChatMessage message) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void callState(LinphoneCore lc, LinphoneCall call, State state,
+			String message) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void callEncryptionChanged(LinphoneCore lc, LinphoneCall call,
+			boolean encrypted, String authenticationToken) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void notifyReceived(LinphoneCore lc, LinphoneEvent ev,
+			String eventName, LinphoneContent content) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void isComposingReceived(LinphoneCore lc, LinphoneChatRoom cr) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void ecCalibrationStatus(LinphoneCore lc, EcCalibratorStatus status,
+			int delay_ms, Object data) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void uploadProgressIndication(LinphoneCore lc, int offset, int total) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void uploadStateChanged(LinphoneCore lc,
+			LogCollectionUploadState state, String info) {
+		// TODO Auto-generated method stub
+		
+	}
+
+}
diff --git a/java/impl/org/linphone/core/LinphoneCoreImpl.java b/java/impl/org/linphone/core/LinphoneCoreImpl.java
index 4823a2a2b..d69d53ef0 100644
--- a/java/impl/org/linphone/core/LinphoneCoreImpl.java
+++ b/java/impl/org/linphone/core/LinphoneCoreImpl.java
@@ -24,7 +24,7 @@ import java.io.File;
 import java.io.IOException;
 
 import org.linphone.core.LinphoneCall.State;
-import org.linphone.core.LinphoneCoreListener.LinphoneEchoCalibrationListener;
+import org.linphone.core.LinphoneCoreListener;
 import org.linphone.mediastream.Log;
 import org.linphone.mediastream.video.AndroidVideoWindowImpl;
 import org.linphone.mediastream.video.capture.hwconf.Hacks;
@@ -563,7 +563,7 @@ public class LinphoneCoreImpl implements LinphoneCore {
 	public synchronized boolean isKeepAliveEnabled() {
 		return isKeepAliveEnabled(nativePtr);
 	}
-	public synchronized void startEchoCalibration(LinphoneEchoCalibrationListener listener) throws LinphoneCoreException {
+	public synchronized void startEchoCalibration(LinphoneCoreListener listener) throws LinphoneCoreException {
 		startEchoCalibration(nativePtr, listener);
 	}
 

From 54f3cd52db49df0cb6a2a70eae2198db67707976 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Wed, 4 Feb 2015 10:38:00 +0100
Subject: [PATCH 329/496] Add video tester that creates its own GTK windows for
 video display.

---
 tester/CMakeLists.txt       |   8 ++
 tester/Makefile.am          |  10 +-
 tester/call_tester.c        |   2 +-
 tester/liblinphone_tester.c |  10 +-
 tester/liblinphone_tester.h |   2 +
 tester/tester.c             |  11 ++
 tester/video_tester.c       | 198 ++++++++++++++++++++++++++++++++++++
 7 files changed, 238 insertions(+), 3 deletions(-)
 create mode 100644 tester/video_tester.c

diff --git a/tester/CMakeLists.txt b/tester/CMakeLists.txt
index 015bd579c..34e5d122b 100644
--- a/tester/CMakeLists.txt
+++ b/tester/CMakeLists.txt
@@ -20,6 +20,8 @@
 #
 ############################################################################
 
+find_package(GTK2 2.18 COMPONENTS gtk)
+
 set(SOURCE_FILES
 	accountmanager.c
 	call_tester.c
@@ -40,8 +42,14 @@ set(SOURCE_FILES
 	tester.c
 	transport_tester.c
 	upnp_tester.c
+	video_tester.c
 )
 
 add_executable(liblinphone_tester ${SOURCE_FILES})
 target_include_directories(liblinphone_tester PUBLIC ${CUNIT_INCLUDE_DIRS})
 target_link_libraries(liblinphone_tester linphone ${CUNIT_LIBRARIES})
+if (GTK2_FOUND)
+	target_compile_definitions(liblinphone_tester PRIVATE HAVE_GTK)
+	target_include_directories(liblinphone_tester PUBLIC ${GTK2_INCLUDE_DIRS})
+	target_link_libraries(liblinphone_tester linphone ${GTK2_LIBRARIES})
+endif()
diff --git a/tester/Makefile.am b/tester/Makefile.am
index 6c5ba79bc..5b4328430 100644
--- a/tester/Makefile.am
+++ b/tester/Makefile.am
@@ -27,7 +27,8 @@ liblinphonetester_la_SOURCES = tester.c \
 				player_tester.c \
 				dtmf_tester.c \
 				accountmanager.c \
-				offeranswer_tester.c
+				offeranswer_tester.c \
+				video_tester.c
 
 liblinphonetester_la_LDFLAGS= -no-undefined
 liblinphonetester_la_LIBADD= ../coreapi/liblinphone.la $(CUNIT_LIBS)
@@ -35,6 +36,13 @@ liblinphonetester_la_LIBADD= ../coreapi/liblinphone.la $(CUNIT_LIBS)
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/coreapi
 AM_CFLAGS    = $(STRICT_OPTIONS) $(STRICT_OPTIONS_CC) -DIN_LINPHONE $(ORTP_CFLAGS) $(MEDIASTREAMER_CFLAGS) $(CUNIT_CFLAGS) $(BELLESIP_CFLAGS) $(LIBXML2_CFLAGS) $(SQLITE3_CFLAGS)
 
+if BUILD_GTK_UI
+
+liblinphone_tester_la_LIBADD += $(LIBGTK_LIBS) $(LIBGTKMAC_LIBS)
+AM_CFLAGS += $(LIBGTK_CFLAGS) $(LIBGTKMAC_CFLAGS) -DHAVE_GTK
+
+endif
+
 if !BUILD_IOS
 
 noinst_PROGRAMS = liblinphone_tester
diff --git a/tester/call_tester.c b/tester/call_tester.c
index 96b90f0e8..2d4a662d7 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -740,7 +740,7 @@ void disable_all_audio_codecs_except_one(LinphoneCore *lc, const char *mime, int
 }
 
 #ifdef VIDEO_ENABLED
-static void disable_all_video_codecs_except_one(LinphoneCore *lc, const char *mime) {
+void disable_all_video_codecs_except_one(LinphoneCore *lc, const char *mime) {
 	const MSList *codecs = linphone_core_get_video_codecs(lc);
 	const MSList *it = NULL;
 	PayloadType *pt = NULL;
diff --git a/tester/liblinphone_tester.c b/tester/liblinphone_tester.c
index f04a5c16d..fbba48218 100644
--- a/tester/liblinphone_tester.c
+++ b/tester/liblinphone_tester.c
@@ -24,6 +24,9 @@
 #if HAVE_CU_CURSES
 #include "CUnit/CUCurses.h"
 #endif
+#ifdef HAVE_GTK
+#include <gtk/gtk.h>
+#endif
 
 extern int liblinphone_tester_use_log_file;
 
@@ -167,6 +170,12 @@ int main (int argc, char *argv[])
 	char *xml_tmp_file=NULL;
 	int xml = 0;
 	FILE* log_file=NULL;
+
+#ifdef HAVE_GTK
+	gdk_threads_init();
+	gtk_init(&argc, &argv);
+#endif
+
 #if defined(ANDROID)
 	linphone_core_set_log_handler(linphone_android_ortp_log_handler);
 #elif defined(__QNX__)
@@ -246,7 +255,6 @@ int main (int argc, char *argv[])
 	}
 	liblinphone_tester_enable_xml(xml);
 
-
 	ret = liblinphone_tester_run_tests(suite_name, test_name);
 	liblinphone_tester_uninit();
 
diff --git a/tester/liblinphone_tester.h b/tester/liblinphone_tester.h
index 8111015f0..c8ca02436 100644
--- a/tester/liblinphone_tester.h
+++ b/tester/liblinphone_tester.h
@@ -63,6 +63,7 @@ extern test_suite_t transport_test_suite;
 extern test_suite_t player_test_suite;
 extern test_suite_t dtmf_test_suite;
 extern test_suite_t offeranswer_test_suite;
+extern test_suite_t video_test_suite;
 
 
 extern int liblinphone_tester_nb_test_suites(void);
@@ -295,6 +296,7 @@ bool_t call_with_test_params(LinphoneCoreManager* caller_mgr
 bool_t call(LinphoneCoreManager* caller_mgr,LinphoneCoreManager* callee_mgr);
 void end_call(LinphoneCoreManager *m1, LinphoneCoreManager *m2);
 void disable_all_audio_codecs_except_one(LinphoneCore *lc, const char *mime, int rate);
+void disable_all_video_codecs_except_one(LinphoneCore *lc, const char *mime);
 stats * get_stats(LinphoneCore *lc);
 LinphoneCoreManager *get_manager(LinphoneCore *lc);
 const char *liblinphone_tester_get_subscribe_content(void);
diff --git a/tester/tester.c b/tester/tester.c
index cbd1bfd44..c10dc0c79 100644
--- a/tester/tester.c
+++ b/tester/tester.c
@@ -25,6 +25,9 @@
 #if HAVE_CU_CURSES
 #include "CUnit/CUCurses.h"
 #endif
+#ifdef HAVE_GTK
+#include <gtk/gtk.h>
+#endif
 
 static test_suite_t **test_suite = NULL;
 static int nb_test_suites = 0;
@@ -201,6 +204,11 @@ bool_t wait_for_list(MSList* lcs,int* counter,int value,int timeout_ms) {
 	liblinphone_tester_clock_start(&start);
 	while ((counter==NULL || *counter<value) && !liblinphone_tester_clock_elapsed(&start,timeout_ms)) {
 		for (iterator=lcs;iterator!=NULL;iterator=iterator->next) {
+#ifdef HAVE_GTK
+			gdk_threads_enter();
+			gtk_main_iteration_do(FALSE);
+			gdk_threads_leave();
+#endif
 			linphone_core_iterate((LinphoneCore*)(iterator->data));
 		}
 		ms_usleep(20000);
@@ -442,6 +450,9 @@ void liblinphone_tester_init(void) {
 	add_test_suite(&transport_test_suite);
 	add_test_suite(&player_test_suite);
 	add_test_suite(&dtmf_test_suite);
+#if defined(VIDEO_ENABLED) && defined(HAVE_GTK)
+	add_test_suite(&video_test_suite);
+#endif
 }
 
 void liblinphone_tester_uninit(void) {
diff --git a/tester/video_tester.c b/tester/video_tester.c
new file mode 100644
index 000000000..88518aff9
--- /dev/null
+++ b/tester/video_tester.c
@@ -0,0 +1,198 @@
+/*
+	liblinphone_tester - liblinphone test suite
+	Copyright (C) 2013  Belledonne Communications SARL
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 2 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#if defined(VIDEO_ENABLED) && defined(HAVE_GTK)
+
+#include <stdio.h>
+#include "CUnit/Basic.h"
+#include "linphonecore.h"
+#include "liblinphone_tester.h"
+#include "lpconfig.h"
+#include "private.h"
+
+#include <gtk/gtk.h>
+#ifdef GDK_WINDOWING_X11
+#include <gdk/gdkx.h>
+#elif defined(WIN32)
+#include <gdk/gdkwin32.h>
+#elif defined(__APPLE__)
+extern void *gdk_quartz_window_get_nswindow(GdkWindow      *window);
+extern void *gdk_quartz_window_get_nsview(GdkWindow      *window);
+#endif
+
+#include <gdk/gdkkeysyms.h>
+
+
+static unsigned long get_native_handle(GdkWindow *gdkw) {
+#ifdef GDK_WINDOWING_X11
+	return (unsigned long)GDK_WINDOW_XID(gdkw);
+#elif defined(WIN32)
+	return (unsigned long)GDK_WINDOW_HWND(gdkw);
+#elif defined(__APPLE__)
+	return (unsigned long)gdk_quartz_window_get_nsview(gdkw);
+#endif
+	g_warning("No way to get the native handle from gdk window");
+	return 0;
+}
+
+static GtkWidget *create_video_window(LinphoneCall *call) {
+	GtkWidget *video_window;
+	GdkColor color;
+	MSVideoSize vsize = MS_VIDEO_SIZE_CIF;
+	
+	video_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+	gtk_window_resize(GTK_WINDOW(video_window), vsize.width, vsize.height);
+	gdk_color_parse("black", &color);
+	gtk_widget_modify_bg(video_window, GTK_STATE_NORMAL, &color);
+	gtk_widget_show(video_window);
+	g_object_set_data(G_OBJECT(video_window), "call", call);
+	gdk_display_flush(gdk_window_get_display(gtk_widget_get_window(video_window)));
+	return video_window;
+}
+
+static void show_video_window(LinphoneCall *call) {
+	GtkWidget *video_window = (GtkWidget *)linphone_call_get_user_data(call);
+	if (video_window == NULL) {
+		video_window = create_video_window(call);
+		linphone_call_set_user_data(call, video_window);
+		linphone_call_set_native_video_window_id(call, get_native_handle(gtk_widget_get_window(video_window)));
+	}
+}
+
+static void hide_video_video(LinphoneCall *call) {
+	GtkWidget *video_window = (GtkWidget *)linphone_call_get_user_data(call);
+	if (video_window != NULL) {
+		gtk_widget_destroy(video_window);
+		linphone_call_set_user_data(call, NULL);
+		linphone_call_set_native_video_window_id(call, 0);
+	}
+}
+
+static void video_call_state_changed(LinphoneCore *lc, LinphoneCall *call, LinphoneCallState cstate, const char *msg) {
+	switch (cstate) {
+		case LinphoneCallConnected:
+			show_video_window(call);
+			break;
+		case LinphoneCallEnd:
+			hide_video_video(call);
+			break;
+		default:
+			break;
+	}
+}
+
+static bool_t video_call_with_params(LinphoneCoreManager* caller_mgr, LinphoneCoreManager* callee_mgr, const LinphoneCallParams *caller_params, const LinphoneCallParams *callee_params) {
+	int retry = 0;
+	stats initial_caller = caller_mgr->stat;
+	stats initial_callee = callee_mgr->stat;
+	bool_t result = FALSE;
+	bool_t did_received_call;
+
+	CU_ASSERT_PTR_NOT_NULL(linphone_core_invite_address_with_params(caller_mgr->lc, callee_mgr->identity, caller_params));
+	did_received_call = wait_for(callee_mgr->lc, caller_mgr->lc, &callee_mgr->stat.number_of_LinphoneCallIncomingReceived, initial_callee.number_of_LinphoneCallIncomingReceived + 1);
+	if (!did_received_call) return 0;
+
+	CU_ASSERT_TRUE(linphone_core_inc_invite_pending(callee_mgr->lc));
+	CU_ASSERT_EQUAL(caller_mgr->stat.number_of_LinphoneCallOutgoingProgress, initial_caller.number_of_LinphoneCallOutgoingProgress + 1);
+
+	while (caller_mgr->stat.number_of_LinphoneCallOutgoingRinging != (initial_caller.number_of_LinphoneCallOutgoingRinging + 1)
+		&& caller_mgr->stat.number_of_LinphoneCallOutgoingEarlyMedia != (initial_caller.number_of_LinphoneCallOutgoingEarlyMedia + 1)
+		&& retry++ < 20) {
+		linphone_core_iterate(caller_mgr->lc);
+		linphone_core_iterate(callee_mgr->lc);
+		ms_usleep(100000);
+	}
+
+	CU_ASSERT_TRUE((caller_mgr->stat.number_of_LinphoneCallOutgoingRinging == initial_caller.number_of_LinphoneCallOutgoingRinging + 1)
+		|| (caller_mgr->stat.number_of_LinphoneCallOutgoingEarlyMedia == initial_caller.number_of_LinphoneCallOutgoingEarlyMedia + 1));
+
+	CU_ASSERT_PTR_NOT_NULL(linphone_core_get_current_call_remote_address(callee_mgr->lc));
+	if(!linphone_core_get_current_call(caller_mgr->lc) || !linphone_core_get_current_call(callee_mgr->lc) || !linphone_core_get_current_call_remote_address(callee_mgr->lc)) {
+		return 0;
+	}
+
+	linphone_core_accept_call_with_params(callee_mgr->lc, linphone_core_get_current_call(callee_mgr->lc), callee_params);
+
+	CU_ASSERT_TRUE(wait_for(callee_mgr->lc, caller_mgr->lc, &callee_mgr->stat.number_of_LinphoneCallConnected, initial_callee.number_of_LinphoneCallConnected + 1));
+	CU_ASSERT_TRUE(wait_for(callee_mgr->lc, caller_mgr->lc, &caller_mgr->stat.number_of_LinphoneCallConnected, initial_callee.number_of_LinphoneCallConnected + 1));
+	result = wait_for(callee_mgr->lc, caller_mgr->lc, &caller_mgr->stat.number_of_LinphoneCallStreamsRunning, initial_caller.number_of_LinphoneCallStreamsRunning + 1)
+		&& wait_for(callee_mgr->lc, caller_mgr->lc, &callee_mgr->stat.number_of_LinphoneCallStreamsRunning, initial_callee.number_of_LinphoneCallStreamsRunning + 1);
+	return result;
+}
+
+
+static void early_media_video_during_video_call_test(void) {
+	LinphoneCoreManager *marie;
+	LinphoneCoreManager *pauline;
+	LinphoneCallParams *marie_params;
+	LinphoneCallParams *pauline_params;
+	LinphoneCoreVTable *marie_vtable;
+	LinphoneCoreVTable *pauline_vtable;
+	int dummy = 0;
+
+	marie = linphone_core_manager_new( "marie_rc");
+	pauline = linphone_core_manager_new( "pauline_rc");
+	marie_vtable = linphone_core_v_table_new();
+	marie_vtable->call_state_changed = video_call_state_changed;
+	linphone_core_add_listener(marie->lc, marie_vtable);
+	linphone_core_set_video_device(marie->lc, "StaticImage: Static picture");
+	//linphone_core_set_video_device(marie->lc, "V4L2: /dev/video0");
+	linphone_core_enable_video_capture(marie->lc, TRUE);
+	linphone_core_enable_video_display(marie->lc, TRUE);
+	linphone_core_set_avpf_mode(marie->lc, LinphoneAVPFEnabled);
+	marie_params = linphone_core_create_default_call_parameters(marie->lc);
+	linphone_call_params_enable_video(marie_params, TRUE);
+	disable_all_video_codecs_except_one(marie->lc, "VP8");
+	pauline_vtable = linphone_core_v_table_new();
+	pauline_vtable->call_state_changed = video_call_state_changed;
+	linphone_core_add_listener(pauline->lc, pauline_vtable);
+	linphone_core_set_video_device(pauline->lc, "StaticImage: Static picture");
+	linphone_core_enable_video_capture(pauline->lc, TRUE);
+	linphone_core_enable_video_display(pauline->lc, TRUE);
+	pauline_params = linphone_core_create_default_call_parameters(pauline->lc);
+	linphone_call_params_enable_video(pauline_params, TRUE);
+	disable_all_video_codecs_except_one(pauline->lc, "VP8");
+
+	CU_ASSERT_TRUE(video_call_with_params(marie, pauline, marie_params, pauline_params));
+
+	/* Wait for 3s. */
+	wait_for_until(marie->lc, pauline->lc, &dummy, 1, 3000);
+
+	linphone_core_terminate_all_calls(marie->lc);
+	CU_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallEnd, 1));
+	CU_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallEnd, 1));
+	CU_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallReleased, 1));
+	CU_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallReleased, 1));
+
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+test_t video_tests[] = {
+	{ "Early-media video during video call", early_media_video_during_video_call_test }
+};
+
+test_suite_t video_test_suite = {
+	"Video",
+	NULL,
+	NULL,
+	sizeof(video_tests) / sizeof(video_tests[0]),
+	video_tests
+};
+
+#endif /* VIDEO_ENABLED */

From 3e1d142b5c87d6bb0c0d6d29ba62ff06044a9cab Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Wed, 4 Feb 2015 10:38:49 +0100
Subject: [PATCH 330/496] Update ms2 submodule.

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 31ec76f3e..93d48f997 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 31ec76f3e3955c2521fc770308c39f1de641de67
+Subproject commit 93d48f9970b0be6966f990792c72160bd4f4934b

From 8484642ce274afffc9b0a2007aac1644aa1d4394 Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Wed, 4 Feb 2015 10:57:08 +0100
Subject: [PATCH 331/496] Add video ifdef

---
 coreapi/linphonecall.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index e6dc3cb56..dab82bb9b 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -3615,7 +3615,9 @@ unsigned long linphone_call_get_native_video_window_id(const LinphoneCall *call)
 
 void linphone_call_set_native_video_window_id(LinphoneCall *call, unsigned long id) {
 	call->video_window_id = id;
+#ifdef VIDEO_ENABLED
 	if (call->videostream) {
 		video_stream_set_native_window_id(call->videostream, id);
 	}
+#endif
 }

From ef810b108bc93567193f5ac6849a9b5253d7efad Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Wed, 4 Feb 2015 11:05:09 +0100
Subject: [PATCH 332/496] fix compilation errors

---
 tester/Makefile.am    | 2 +-
 tester/video_tester.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/tester/Makefile.am b/tester/Makefile.am
index 5b4328430..2eebd36fa 100644
--- a/tester/Makefile.am
+++ b/tester/Makefile.am
@@ -38,7 +38,7 @@ AM_CFLAGS    = $(STRICT_OPTIONS) $(STRICT_OPTIONS_CC) -DIN_LINPHONE $(ORTP_CFLAG
 
 if BUILD_GTK_UI
 
-liblinphone_tester_la_LIBADD += $(LIBGTK_LIBS) $(LIBGTKMAC_LIBS)
+liblinphonetester_la_LIBADD += $(LIBGTK_LIBS) $(LIBGTKMAC_LIBS)
 AM_CFLAGS += $(LIBGTK_CFLAGS) $(LIBGTKMAC_CFLAGS) -DHAVE_GTK
 
 endif
diff --git a/tester/video_tester.c b/tester/video_tester.c
index 88518aff9..ac7e8575c 100644
--- a/tester/video_tester.c
+++ b/tester/video_tester.c
@@ -15,6 +15,7 @@
 	You should have received a copy of the GNU General Public License
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
+#include "private.h"
 
 #if defined(VIDEO_ENABLED) && defined(HAVE_GTK)
 
@@ -23,7 +24,7 @@
 #include "linphonecore.h"
 #include "liblinphone_tester.h"
 #include "lpconfig.h"
-#include "private.h"
+
 
 #include <gtk/gtk.h>
 #ifdef GDK_WINDOWING_X11
@@ -167,7 +168,7 @@ static void early_media_video_during_video_call_test(void) {
 	pauline_params = linphone_core_create_default_call_parameters(pauline->lc);
 	linphone_call_params_enable_video(pauline_params, TRUE);
 	disable_all_video_codecs_except_one(pauline->lc, "VP8");
-
+	
 	CU_ASSERT_TRUE(video_call_with_params(marie, pauline, marie_params, pauline_params));
 
 	/* Wait for 3s. */

From 06fc0526ec0519bbe3aba6331287bfda8db8c631 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Fri, 30 Jan 2015 22:34:24 +0100
Subject: [PATCH 333/496] multicast impl

---
 coreapi/bellesip_sal/sal_sdp.c |  11 +-
 coreapi/call_params.c          |  16 +++
 coreapi/call_params.h          |  42 +++++++
 coreapi/linphonecall.c         |  72 ++++++++++--
 coreapi/linphonecore.c         | 104 +++++++++++++++++
 coreapi/linphonecore.h         |  99 +++++++++++++++++
 coreapi/offeranswer.c          | 101 ++++++++++++++++-
 coreapi/presence.c             |   2 +
 coreapi/private.h              |  12 ++
 include/sal/sal.h              |  10 ++
 tester/Makefile.am             |   1 +
 tester/call_tester.c           |  21 ++--
 tester/liblinphone_tester.h    |   5 +-
 tester/multicast_call_tester.c | 198 +++++++++++++++++++++++++++++++++
 tester/presence_tester.c       |  79 +++++++++++--
 tester/tester.c                |   1 +
 16 files changed, 740 insertions(+), 34 deletions(-)
 create mode 100644 tester/multicast_call_tester.c

diff --git a/coreapi/bellesip_sal/sal_sdp.c b/coreapi/bellesip_sal/sal_sdp.c
index 8bade6e7f..ce780c1cf 100644
--- a/coreapi/bellesip_sal/sal_sdp.c
+++ b/coreapi/bellesip_sal/sal_sdp.c
@@ -210,10 +210,18 @@ static void stream_description_to_sdp ( belle_sdp_session_description_t *session
 	/*only add a c= line within the stream description if address are differents*/
 	if (rtp_addr[0]!='\0' && strcmp(rtp_addr,md->addr)!=0){
 		bool_t inet6;
+		belle_sdp_connection_t *connection;
 		if (strchr(rtp_addr,':')!=NULL){
 			inet6=TRUE;
 		}else inet6=FALSE;
-		belle_sdp_media_description_set_connection(media_desc,belle_sdp_connection_create("IN", inet6 ? "IP6" : "IP4", rtp_addr));
+		connection = belle_sdp_connection_create("IN", inet6 ? "IP6" : "IP4", rtp_addr);
+		if (ms_is_multicast(rtp_addr)) {
+			/*remove session cline in case of multicast*/
+			belle_sdp_session_description_set_connection(session_desc,NULL);
+			if (inet6 == FALSE)
+				belle_sdp_connection_set_ttl(connection,stream->ttl);
+		}
+		belle_sdp_media_description_set_connection(media_desc,connection);
 	}
 
 	if ( stream->bandwidth>0 )
@@ -706,6 +714,7 @@ static SalStreamDescription * sdp_to_stream_description(SalMediaDescription *md,
 	}
 	if ( ( cnx=belle_sdp_media_description_get_connection ( media_desc ) ) && belle_sdp_connection_get_address ( cnx ) ) {
 		strncpy ( stream->rtp_addr,belle_sdp_connection_get_address ( cnx ), sizeof ( stream->rtp_addr ) -1 );
+		stream->ttl=belle_sdp_connection_get_ttl(cnx);
 	}
 
 	stream->rtp_port=belle_sdp_media_get_media_port ( media );
diff --git a/coreapi/call_params.c b/coreapi/call_params.c
index 255103fb8..a2a378eef 100644
--- a/coreapi/call_params.c
+++ b/coreapi/call_params.c
@@ -51,6 +51,7 @@ LinphoneCallParams * linphone_call_params_copy(const LinphoneCallParams *cp){
 	 * The management of the custom headers is not optimal. We copy everything while ref counting would be more efficient.
 	 */
 	if (cp->custom_headers) ncp->custom_headers=sal_custom_header_clone(cp->custom_headers);
+
 	return ncp;
 }
 
@@ -158,6 +159,21 @@ bool_t linphone_call_params_video_enabled(const LinphoneCallParams *cp){
 	return cp->has_video;
 }
 
+LinphoneCallParamsMediaDirection linphone_call_params_get_audio_direction(const LinphoneCallParams *cp) {
+	return cp->audio_dir;
+}
+
+LinphoneCallParamsMediaDirection linphone_call_params_get_video_direction(const LinphoneCallParams *cp) {
+	return cp->video_dir;
+}
+
+void linphone_call_params_set_audio_direction(LinphoneCallParams *cp,LinphoneCallParamsMediaDirection dir) {
+	cp->audio_dir=dir;
+}
+
+void linphone_call_params_set_video_direction(LinphoneCallParams *cp,LinphoneCallParamsMediaDirection dir) {
+	cp->video_dir=dir;
+}
 
 
 /*******************************************************************************
diff --git a/coreapi/call_params.h b/coreapi/call_params.h
index 9c942826b..c3362534e 100644
--- a/coreapi/call_params.h
+++ b/coreapi/call_params.h
@@ -30,6 +30,20 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 /*******************************************************************************
  * Structures and enums                                                        *
  ******************************************************************************/
+/**
+ * Indicates for a given media the stream direction
+ * */
+enum _LinphoneCallParamsMediaDirection {
+	LinphoneCallParamsMediaDirectionInactive, /** No active media not supported yet*/
+	LinphoneCallParamsMediaDirectionSendOnly, /** Send only mode*/
+	LinphoneCallParamsMediaDirectionRecvOnly, /** recv only mode*/
+	LinphoneCallParamsMediaDirectionSendRecv, /*send receive mode not supported yet*/
+
+};
+/**
+ * Typedef for enum
+**/
+typedef enum _LinphoneCallParamsMediaDirection LinphoneCallParamsMediaDirection;
 
 /**
  * Private structure definition for LinphoneCallParams.
@@ -247,6 +261,34 @@ LINPHONE_PUBLIC void linphone_call_params_set_session_name(LinphoneCallParams *c
 **/
 LINPHONE_PUBLIC bool_t linphone_call_params_video_enabled(const LinphoneCallParams *cp);
 
+/**
+ * Get the audio stream direction.
+ * @param[in] cl LinphoneCallParams object
+ * @return The audio stream direction associated with the call params.
+**/
+LINPHONE_PUBLIC  LinphoneCallParamsMediaDirection linphone_call_params_get_audio_direction(const LinphoneCallParams *cp);
+
+/**
+ * Get the video stream direction.
+ * @param[in] cl LinphoneCallParams object
+ * @return The video stream direction associated with the call params.
+**/
+LINPHONE_PUBLIC  LinphoneCallParamsMediaDirection linphone_call_params_get_video_direction(const LinphoneCallParams *cp);
+
+/**
+ * Set the audio stream direction. Only relevant for multicast
+ * @param[in] cl LinphoneCallParams object
+ * @param[in] The audio stream direction associated with this call params.
+**/
+/*LINPHONE_PUBLIC void linphone_call_params_set_audio_direction(LinphoneCallParams *cp, LinphoneCallParamsMediaDirection dir);*/
+
+/**
+ * Set the video stream direction. Only relevant for multicast
+ * @param[in] cl LinphoneCallParams object
+ * @param[in] The video stream direction associated with this call params.
+**/
+/*LINPHONE_PUBLIC void linphone_call_params_set_video_direction(LinphoneCallParams *cp, LinphoneCallParamsMediaDirection dir);*/
+
 
 /*******************************************************************************
  * Reference and user data handling functions                                  *
diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index dab82bb9b..ea0676b6d 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -546,7 +546,24 @@ void linphone_call_make_local_media_description(LinphoneCore *lc, LinphoneCall *
 	const char *me;
 	SalMediaDescription *md=sal_media_description_new();
 	LinphoneAddress *addr;
-	char* local_ip=call->localip;
+	const char* local_audio_ip;
+	const char* local_video_ip;
+	/*multicast is only set in case of outgoing call*/
+	if (call->dir == LinphoneCallOutgoing && linphone_core_audio_multicast_enabled(lc)) {
+		local_audio_ip=linphone_core_get_audio_multicast_addr(lc);
+		md->streams[0].ttl=linphone_core_get_audio_multicast_ttl(lc);
+		md->streams[0].multicast_role = SalMulticastRoleSender;
+	} else
+		local_audio_ip=call->localip;
+
+	if (call->dir == LinphoneCallOutgoing && linphone_core_video_multicast_enabled(lc)) {
+		local_video_ip=linphone_core_get_video_multicast_addr(lc);
+		md->streams[1].ttl=linphone_core_get_video_multicast_ttl(lc);
+		md->streams[1].multicast_role = SalMulticastRoleSender;
+	}else
+		local_video_ip=call->localip;
+
+
 	const char *subject=linphone_call_params_get_session_name(call->params);
 	CodecConstraints codec_hints={0};
 
@@ -562,7 +579,7 @@ void linphone_call_make_local_media_description(LinphoneCore *lc, LinphoneCall *
 	md->session_ver=(old_md ? (old_md->session_ver+1) : (rand() & 0xfff));
 	md->nb_streams=(call->biggestdesc ? call->biggestdesc->nb_streams : 1);
 
-	strncpy(md->addr,local_ip,sizeof(md->addr));
+	strncpy(md->addr,call->localip,sizeof(md->addr));
 	strncpy(md->username,linphone_address_get_username(addr),sizeof(md->username));
 	if (subject) strncpy(md->name,subject,sizeof(md->name));
 
@@ -571,8 +588,8 @@ void linphone_call_make_local_media_description(LinphoneCore *lc, LinphoneCall *
 	else md->bandwidth=linphone_core_get_download_bandwidth(lc);
 
 	/*set audio capabilities */
-	strncpy(md->streams[0].rtp_addr,local_ip,sizeof(md->streams[0].rtp_addr));
-	strncpy(md->streams[0].rtcp_addr,local_ip,sizeof(md->streams[0].rtcp_addr));
+	strncpy(md->streams[0].rtp_addr,local_audio_ip,sizeof(md->streams[0].rtp_addr));
+	strncpy(md->streams[0].rtcp_addr,local_audio_ip,sizeof(md->streams[0].rtcp_addr));
 	strncpy(md->streams[0].name,"Audio",sizeof(md->streams[0].name)-1);
 	md->streams[0].rtp_port=call->media_ports[0].rtp_port;
 	md->streams[0].rtcp_port=call->media_ports[0].rtcp_port;
@@ -599,8 +616,8 @@ void linphone_call_make_local_media_description(LinphoneCore *lc, LinphoneCall *
 	nb_active_streams++;
 
 	if (call->params->has_video){
-		strncpy(md->streams[1].rtp_addr,local_ip,sizeof(md->streams[1].rtp_addr));
-		strncpy(md->streams[1].rtcp_addr,local_ip,sizeof(md->streams[1].rtcp_addr));
+		strncpy(md->streams[1].rtp_addr,local_video_ip,sizeof(md->streams[1].rtp_addr));
+		strncpy(md->streams[1].rtcp_addr,local_video_ip,sizeof(md->streams[1].rtcp_addr));
 		strncpy(md->streams[1].name,"Video",sizeof(md->streams[1].name)-1);
 		md->streams[1].rtp_port=call->media_ports[1].rtp_port;
 		md->streams[1].rtcp_port=call->media_ports[1].rtcp_port;
@@ -764,6 +781,9 @@ static void linphone_call_init_common(LinphoneCall *call, LinphoneAddress *from,
 
 	linphone_call_init_stats(&call->stats[LINPHONE_CALL_STATS_AUDIO], LINPHONE_CALL_STATS_AUDIO);
 	linphone_call_init_stats(&call->stats[LINPHONE_CALL_STATS_VIDEO], LINPHONE_CALL_STATS_VIDEO);
+	/*by default local_audio_ip=local_video_ip=local_ip*/
+	strncpy(call->local_audio_ip,call->localip,sizeof(call->local_audio_ip));
+	strncpy(call->local_video_ip,call->localip,sizeof(call->local_video_ip));
 }
 
 void linphone_call_init_stats(LinphoneCallStats *stats, int type) {
@@ -935,6 +955,20 @@ void linphone_call_set_compatible_incoming_call_parameters(LinphoneCall *call, c
 	if ((sal_media_description_has_srtp(md) == TRUE) && (ms_srtp_supported() == TRUE)) {
 		call->params->media_encryption = LinphoneMediaEncryptionSRTP;
 	}
+
+	//set both local audio & video
+	if (ms_is_multicast(md->streams[0].rtp_addr)) {
+		strncpy(call->local_audio_ip,md->streams[0].rtp_addr,sizeof(call->local_audio_ip));
+		ms_message("Disabling audio rtcp on call [%p] because of multicast",call);
+		call->media_ports[0].rtp_port=md->streams[0].rtp_port;
+		call->media_ports[0].rtcp_port=0;
+	}
+	if (ms_is_multicast(md->streams[1].rtp_addr)) {
+		strncpy(call->local_video_ip,md->streams[1].rtp_addr,sizeof(call->local_video_ip));
+		call->media_ports[1].rtp_port=md->streams[1].rtp_port;
+		call->media_ports[1].rtcp_port=0;
+		ms_message("Disabling video rtcp on call [%p] because of multicast",call);
+	}
 }
 
 LinphoneCall * linphone_call_new_incoming(LinphoneCore *lc, LinphoneAddress *from, LinphoneAddress *to, SalOp *op){
@@ -1767,11 +1801,12 @@ void linphone_call_init_audio_stream(LinphoneCall *call){
 	int dscp;
 	char rtcp_tool[128]={0};
 	char* cname;
+
 	snprintf(rtcp_tool,sizeof(rtcp_tool)-1,"%s-%s",linphone_core_get_user_agent_name(),linphone_core_get_user_agent_version());
 
 	if (call->audiostream != NULL) return;
 	if (call->sessions[0].rtp_session==NULL){
-		call->audiostream=audiostream=audio_stream_new(call->media_ports[0].rtp_port,call->media_ports[0].rtcp_port,call->af==AF_INET6);
+		call->audiostream=audiostream=audio_stream_new2(call->local_audio_ip,call->media_ports[0].rtp_port,call->media_ports[0].rtcp_port);
 		cname = linphone_address_as_string_uri_only(call->me);
 		audio_stream_set_rtcp_information(call->audiostream, cname, rtcp_tool);
 		ms_free(cname);
@@ -1876,7 +1911,7 @@ void linphone_call_init_video_stream(LinphoneCall *call){
 		const char *display_filter=linphone_core_get_video_display_filter(lc);
 
 		if (call->sessions[1].rtp_session==NULL){
-			call->videostream=video_stream_new(call->media_ports[1].rtp_port,call->media_ports[1].rtcp_port, call->af==AF_INET6);
+			call->videostream=video_stream_new2(call->local_video_ip,call->media_ports[1].rtp_port,call->media_ports[1].rtcp_port);
 			cname = linphone_address_as_string_uri_only(call->me);
 			video_stream_set_rtcp_information(call->videostream, cname, rtcp_tool);
 			ms_free(cname);
@@ -2259,7 +2294,9 @@ static void linphone_call_start_audio_stream(LinphoneCall *call, bool_t muted, b
 			}
 			/*Replace soundcard filters by inactive file players or recorders
 			 when placed in recvonly or sendonly mode*/
-			if (stream->rtp_port==0 || stream->dir==SalStreamRecvOnly){
+			if (stream->rtp_port==0
+					|| stream->dir==SalStreamRecvOnly
+					|| (stream->multicast_role == SalMulticastRoleReceiver && ms_is_multicast(stream->rtp_addr))){
 				captcard=NULL;
 				playfile=NULL;
 			}else if (stream->dir==SalStreamSendOnly){
@@ -2315,13 +2352,16 @@ static void linphone_call_start_audio_stream(LinphoneCall *call, bool_t muted, b
 				}
 			}
 			configure_rtp_session_for_rtcp_xr(lc, call, SalAudio);
+			if (ms_is_multicast(stream->rtp_addr))
+				rtp_session_set_multicast_ttl(call->audiostream->ms.sessions.rtp_session,stream->ttl);
+
 			audio_stream_start_full(
 				call->audiostream,
 				call->audio_profile,
 				stream->rtp_addr[0]!='\0' ? stream->rtp_addr : call->resultdesc->addr,
 				stream->rtp_port,
 				stream->rtcp_addr[0]!='\0' ? stream->rtcp_addr : call->resultdesc->addr,
-				linphone_core_rtcp_enabled(lc) ? (stream->rtcp_port ? stream->rtcp_port : stream->rtp_port+1) : 0,
+				(linphone_core_rtcp_enabled(lc) && !ms_is_multicast(stream->rtp_addr)) ? (stream->rtcp_port ? stream->rtcp_port : stream->rtp_port+1) : 0,
 				used_pt,
 				linphone_core_get_audio_jittcomp(lc),
 				playfile,
@@ -2402,7 +2442,12 @@ static void linphone_call_start_video_stream(LinphoneCall *call, bool_t all_inpu
 				video_stream_set_native_preview_window_id (call->videostream,lc->preview_window_id);
 			video_stream_use_preview_video_window (call->videostream,lc->use_preview_window);
 
-			if (vstream->dir==SalStreamSendOnly && lc->video_conf.capture ){
+			if (ms_is_multicast(vstream->rtp_addr)){
+				if (vstream->multicast_role == SalMulticastRoleReceiver)
+					dir=VideoStreamRecvOnly;
+				else
+					dir=VideoStreamSendOnly;
+			} else if (vstream->dir==SalStreamSendOnly && lc->video_conf.capture ){
 				if (local_st_desc->dir==SalStreamSendOnly){
 					/* localdesc stream dir to SendOnly is when we want to put on hold, so use nowebcam in this case*/
 					cam=get_nowebcam_device();
@@ -2440,6 +2485,9 @@ static void linphone_call_start_video_stream(LinphoneCall *call, bool_t all_inpu
 				ms_message("%s lc rotation:%d\n", __FUNCTION__, lc->device_rotation);
 				video_stream_set_device_rotation(call->videostream, lc->device_rotation);
 				video_stream_set_freeze_on_error(call->videostream, lp_config_get_int(lc->config, "video", "freeze_on_error", 0));
+				if (ms_is_multicast(vstream->rtp_addr))
+					rtp_session_set_multicast_ttl(call->videostream->ms.sessions.rtp_session,vstream->ttl);
+
 				if( lc->video_conf.reuse_preview_source && source ){
 					ms_message("video_stream_start_with_source kept: %p", source);
 					video_stream_start_with_source(call->videostream,
@@ -2452,7 +2500,7 @@ static void linphone_call_start_video_stream(LinphoneCall *call, bool_t all_inpu
 					video_stream_start(call->videostream,
 									   call->video_profile, rtp_addr, vstream->rtp_port,
 									   rtcp_addr,
-									   linphone_core_rtcp_enabled(lc) ? (vstream->rtcp_port ? vstream->rtcp_port : vstream->rtp_port+1) : 0,
+									   (linphone_core_rtcp_enabled(lc) && !ms_is_multicast(vstream->rtp_addr))  ? (vstream->rtcp_port ? vstream->rtcp_port : vstream->rtp_port+1) : 0,
 									   used_pt, linphone_core_get_video_jittcomp(lc), cam);
 				}
 			}
diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index d5a09b404..4a9b9bd1e 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -947,6 +947,8 @@ static void rtp_config_read(LinphoneCore *lc)
 	int nortp_timeout;
 	bool_t rtp_no_xmit_on_audio_mute;
 	bool_t adaptive_jitt_comp_enabled;
+	const char* tmp;
+	int tmp_int;
 
 	if (lp_config_get_range(lc->config, "rtp", "audio_rtp_port", &min_port, &max_port, 7078, 7078) == TRUE) {
 		if (min_port <= 0) min_port = 1;
@@ -981,6 +983,26 @@ static void rtp_config_read(LinphoneCore *lc)
 	linphone_core_enable_video_adaptive_jittcomp(lc, adaptive_jitt_comp_enabled);
 	lc->rtp_conf.disable_upnp = lp_config_get_int(lc->config, "rtp", "disable_upnp", FALSE);
 	linphone_core_set_avpf_mode(lc,lp_config_get_int(lc->config,"rtp","avpf",0));
+	if ((tmp=lp_config_get_string(lc->config,"rtp","audio_multicast_addr",NULL)))
+		linphone_core_set_audio_multicast_addr(lc,tmp);
+	else
+		lc->rtp_conf.audio_multicast_addr=ms_strdup("224.1.2.3");
+	if ((tmp_int=lp_config_get_int(lc->config,"rtp","audio_multicast_enabled",-1)) >-1)
+		linphone_core_enable_audio_multicast(lc,tmp_int);
+	if ((tmp_int=lp_config_get_int(lc->config,"rtp","audio_multicast_ttl",-1))>0)
+			linphone_core_set_audio_multicast_ttl(lc,tmp_int);
+	else
+		lc->rtp_conf.audio_multicast_ttl=1;/*local network*/
+	if ((tmp=lp_config_get_string(lc->config,"rtp","video_multicast_addr",NULL)))
+		linphone_core_set_video_multicast_addr(lc,tmp);
+	else
+		lc->rtp_conf.video_multicast_addr=ms_strdup("224.1.2.3");
+	if ((tmp_int=lp_config_get_int(lc->config,"rtp","video_multicast_ttl",-1))>-1)
+		linphone_core_set_video_multicast_ttl(lc,tmp_int);
+	else
+		lc->rtp_conf.video_multicast_ttl=1;/*local network*/
+	if ((tmp_int=lp_config_get_int(lc->config,"rtp","video_multicast_enabled",-1)) >0)
+		linphone_core_enable_video_multicast(lc,tmp_int);
 }
 
 static PayloadType * find_payload(const MSList *default_list, const char *mime_type, int clock_rate, int channels, const char *recv_fmtp){
@@ -6123,6 +6145,8 @@ void rtp_config_uninit(LinphoneCore *lc)
 	lp_config_set_int(lc->config,"rtp","nortp_timeout",config->nortp_timeout);
 	lp_config_set_int(lc->config,"rtp","audio_adaptive_jitt_comp_enabled",config->audio_adaptive_jitt_comp_enabled);
 	lp_config_set_int(lc->config,"rtp","video_adaptive_jitt_comp_enabled",config->video_adaptive_jitt_comp_enabled);
+	ms_free(lc->rtp_conf.audio_multicast_addr);
+	ms_free(lc->rtp_conf.video_multicast_addr);
 	ms_free(config->srtp_suites);
 }
 
@@ -6878,6 +6902,8 @@ void linphone_core_init_default_params(LinphoneCore*lc, LinphoneCallParams *para
 	params->in_conference=FALSE;
 	params->privacy=LinphonePrivacyDefault;
 	params->avpf_enabled=FALSE;
+	params->audio_dir=LinphoneCallParamsMediaDirectionSendRecv;
+	params->video_dir=LinphoneCallParamsMediaDirectionSendRecv;
 }
 
 void linphone_core_set_device_identifier(LinphoneCore *lc,const char* device_id) {
@@ -7216,3 +7242,81 @@ void linphone_core_remove_listener(LinphoneCore *lc, const LinphoneCoreVTable *v
 	ms_message("Vtable [%p] unregistered on core [%p]",lc,vtable);
 	lc->vtables=ms_list_remove(lc->vtables,(void*)vtable);
 }
+
+int linphone_core_set_audio_multicast_addr(LinphoneCore *lc, const char* ip) {
+	char* new_value;
+	if (ip && !ms_is_multicast(ip)) {
+		ms_error("Cannot set multicast audio addr to core [%p] because [%s] is not multicast",lc,ip);
+		return -1;
+	}
+	new_value = ip?ms_strdup(ip):NULL;
+	if (lc->rtp_conf.audio_multicast_addr) ms_free(lc->rtp_conf.audio_multicast_addr);
+	lp_config_set_string(lc->config,"rtp","audio_multicast_addr",lc->rtp_conf.audio_multicast_addr=new_value);
+	return 0;
+}
+
+int linphone_core_set_video_multicast_addr(LinphoneCore *lc, const char* ip) {
+	char* new_value;
+	if (ip && !ms_is_multicast(ip)) {
+		ms_error("Cannot set multicast video addr to core [%p] because [%s] is not multicast",lc,ip);
+		return -1;
+	}
+	new_value = ip?ms_strdup(ip):NULL;
+	if (lc->rtp_conf.video_multicast_addr) ms_free(lc->rtp_conf.video_multicast_addr);
+	lp_config_set_string(lc->config,"rtp","video_multicast_addr",lc->rtp_conf.video_multicast_addr=new_value);
+	return 0;
+}
+
+const char* linphone_core_get_audio_multicast_addr(const LinphoneCore *lc) {
+	return lc->rtp_conf.audio_multicast_addr;
+}
+
+
+const char* linphone_core_get_video_multicast_addr(const LinphoneCore *lc){
+	return lc->rtp_conf.video_multicast_addr;
+}
+
+int linphone_core_set_audio_multicast_ttl(LinphoneCore *lc, int ttl) {
+	if (ttl>255) {
+		ms_error("Cannot set multicast audio ttl to core [%p] to [%i] value must be <256",lc,ttl);
+		return -1;
+	}
+
+	lp_config_set_int(lc->config,"rtp","audio_multicast_ttl",lc->rtp_conf.audio_multicast_ttl=ttl);
+	return 0;
+}
+
+int linphone_core_set_video_multicast_ttl(LinphoneCore *lc, int ttl) {
+	if (ttl>255) {
+		ms_error("Cannot set multicast video ttl to core [%p] to [%i] value must be <256",lc,ttl);
+		return -1;
+	}
+
+	lp_config_set_int(lc->config,"rtp","video_multicast_ttl",lc->rtp_conf.video_multicast_ttl=ttl);
+	return 0;
+}
+
+int linphone_core_get_audio_multicast_ttl(const LinphoneCore *lc) {
+	return lc->rtp_conf.audio_multicast_ttl;
+}
+
+
+int linphone_core_get_video_multicast_ttl(const LinphoneCore *lc){
+	return lc->rtp_conf.video_multicast_ttl;
+}
+
+void linphone_core_enable_audio_multicast(LinphoneCore *lc, bool_t yesno) {
+	lp_config_set_int(lc->config,"rtp","audio_multicast_enabled",lc->rtp_conf.audio_multicast_enabled=yesno);
+}
+
+ bool_t linphone_core_audio_multicast_enabled(const LinphoneCore *lc) {
+	return lc->rtp_conf.audio_multicast_enabled;
+}
+
+void linphone_core_enable_video_multicast(LinphoneCore *lc, bool_t yesno) {
+	lp_config_set_int(lc->config,"rtp","video_multicast_enabled",lc->rtp_conf.video_multicast_enabled=yesno);
+}
+
+bool_t linphone_core_video_multicast_enabled(const LinphoneCore *lc) {
+	return lc->rtp_conf.video_multicast_enabled;
+}
diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h
index a17efa793..999bf4823 100644
--- a/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@ -3305,6 +3305,105 @@ LINPHONE_PUBLIC void linphone_core_set_avpf_rr_interval(LinphoneCore *lc, int in
 
 LINPHONE_PUBLIC int linphone_core_get_avpf_rr_interval(const LinphoneCore *lc);
 
+/**
+ * Use to set multicast address to be used for audio stream.
+ * @param core the core
+ * @param ip an ipv4/6 multicast address
+ * @return 0 in case of success
+ * @ingroup media_parameters
+**/
+LINPHONE_PUBLIC int linphone_core_set_audio_multicast_addr(LinphoneCore *core, const char* ip);
+/**
+ * Use to set multicast address to be used for video stream.
+ * @param core the core
+ * @param ip an ipv4/6 multicast address
+ * @return 0 in case of success
+ * @ingroup media_parameters
+**/
+LINPHONE_PUBLIC int linphone_core_set_video_multicast_addr(LinphoneCore *lc, const char *ip);
+
+/**
+ * Use to get multicast address to be used for audio stream.
+ * @param core the core
+ * @return an ipv4/6 multicast address or default value
+ * @ingroup media_parameters
+**/
+LINPHONE_PUBLIC const char* linphone_core_get_audio_multicast_addr(const LinphoneCore *core);
+
+/**
+ * Use to get multicast address to be used for video stream.
+ * @param core the core
+ * @return an ipv4/6 multicast address, or default value
+ * @ingroup media_parameters
+**/
+LINPHONE_PUBLIC const char* linphone_core_get_video_multicast_addr(const LinphoneCore *core);
+
+/**
+ * Use to set multicast ttl to be used for audio stream.
+ * @param core the core
+ * @param ip an ttl or -1 if not used [0..255] default value is 1
+ * @return 0 in case of success
+ * @ingroup media_parameters
+**/
+LINPHONE_PUBLIC int linphone_core_set_audio_multicast_ttl(LinphoneCore *core, int ttl);
+/**
+ * Use to set multicast ttl to be used for video stream.
+ * @param core the core
+ * @param ip an ttl or -1 if not used [0..255] default value is 1
+ * @return 0 in case of success
+ * @ingroup media_parameters
+**/
+LINPHONE_PUBLIC int linphone_core_set_video_multicast_ttl(LinphoneCore *lc, int ttl);
+
+/**
+ * Use to get multicast ttl to be used for audio stream.
+ * @param core the core
+ * @return an time to leave value or -1 if not set
+ * @ingroup media_parameters
+**/
+LINPHONE_PUBLIC int linphone_core_get_audio_multicast_ttl(const LinphoneCore *core);
+
+/**
+ * Use to get multicast ttl to be used for video stream.
+ * @param core the core
+ * @return an an time to leave value or -1 if not set
+ * @ingroup media_parameters
+**/
+LINPHONE_PUBLIC int linphone_core_get_video_multicast_ttl(const LinphoneCore *core);
+
+
+/**
+ * Use to enable multicast rtp for audio stream.
+ * @param core the core
+ * @param yesno if yes, subsequent calls propose multicast ip set by #linphone_core_set_audio_multicast_addr
+ * @return an ipv4/6 multicast address or null
+ * @ingroup media_parameters
+**/
+LINPHONE_PUBLIC void linphone_core_enable_audio_multicast(LinphoneCore *core, bool_t yesno);
+
+/**
+ * Use to get multicast state of audio stream.
+ * @param core the core
+ * @return true if  subsequent calls propose multicast ip set by #linphone_core_set_audio_multicast_addr
+ * @ingroup media_parameters
+**/
+LINPHONE_PUBLIC bool_t linphone_core_audio_multicast_enabled(const LinphoneCore *core);
+
+/**
+ * Use to enable multicast rtp for video stream.
+ * @param core the core
+ * @param yesno if yes, subsequent calls propose multicast ip set by #linphone_core_set_video_multicast_addr
+ * @ingroup media_parameters
+**/
+LINPHONE_PUBLIC void linphone_core_enable_video_multicast(LinphoneCore *core, bool_t yesno);
+/**
+ * Use to get multicast state of video stream.
+ * @param core the core
+ * @return true if  subsequent calls propose multicast ip set by #linphone_core_set_audio_multicast_addr
+ * @ingroup media_parameters
+**/
+LINPHONE_PUBLIC bool_t linphone_core_video_multicast_enabled(const LinphoneCore *core);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/coreapi/offeranswer.c b/coreapi/offeranswer.c
index ef14fad81..531965c86 100644
--- a/coreapi/offeranswer.c
+++ b/coreapi/offeranswer.c
@@ -296,9 +296,81 @@ static void initiate_outgoing(const SalStreamDescription *local_offer,
 						SalStreamDescription *result){
 	if (remote_answer->rtp_port!=0)
 		result->payloads=match_payloads(local_offer->payloads,remote_answer->payloads,TRUE,FALSE);
+	else {
+		ms_message("Local stream description [%p] rejected by peer",local_offer);
+		result->rtp_port=0;
+		return;
+	}
 	result->proto=remote_answer->proto;
 	result->type=local_offer->type;
-	result->dir=compute_dir_outgoing(local_offer->dir,remote_answer->dir);
+
+	if (ms_is_multicast(local_offer->rtp_addr)) {
+		/*6.2 Multicast Streams
+		...
+	   If a multicast stream is accepted, the address and port information
+	   in the answer MUST match that of the offer.  Similarly, the
+	   directionality information in the answer (sendonly, recvonly, or
+	   sendrecv) MUST equal that of the offer.  This is because all
+	   participants in a multicast session need to have equivalent views of
+	   the parameters of the session, an underlying assumption of the
+	   multicast bias of RFC 2327.*/
+	  if (strcmp(local_offer->rtp_addr,remote_answer->rtp_addr) !=0 ) {
+		  ms_message("Remote answered IP [%s] does not match offered [%s] for local stream description [%p]"
+				  	  	  	  	  	  	  	  	  	  	  	  ,remote_answer->rtp_addr
+				  	  	  	  	  	  	  	  	  	  	  	  ,local_offer->rtp_addr
+				  	  	  	  	  	  	  	  	  	  	  	  ,local_offer);
+		  result->rtp_port=0;
+		  return;
+	  }
+	  if (local_offer->rtp_port!=remote_answer->rtp_port) {
+		  ms_message("Remote answered rtp port [%i] does not match offered [%i] for local stream description [%p]"
+				  	  	  	  	  	  	  	  	  	  	  	  ,remote_answer->rtp_port
+				  	  	  	  	  	  	  	  	  	  	  	  ,local_offer->rtp_port
+				  	  	  	  	  	  	  	  	  	  	  	  ,local_offer);
+		  result->rtp_port=0;
+		  return;
+	  }
+	  if (local_offer->dir!=remote_answer->dir) {
+		  ms_message("Remote answered dir [%s] does not match offered [%s] for local stream description [%p]"
+				  	  	  	  	  	  	  	  	  	  	  	  ,sal_stream_dir_to_string(remote_answer->dir)
+				  	  	  	  	  	  	  	  	  	  	  	  ,sal_stream_dir_to_string(local_offer->dir)
+				  	  	  	  	  	  	  	  	  	  	  	  ,local_offer);
+		  result->rtp_port=0;
+		  return;
+	  }
+	  if (local_offer->bandwidth!=remote_answer->bandwidth) {
+		  ms_message("Remote answered bandwidth [%i] does not match offered [%i] for local stream description [%p]"
+				  	  	  	  	  	  	  	  	  	  	  	  ,remote_answer->bandwidth
+				  	  	  	  	  	  	  	  	  	  	  	  ,local_offer->bandwidth
+				  	  	  	  	  	  	  	  	  	  	  	  ,local_offer);
+		  result->rtp_port=0;
+		  return;
+	  }
+	  if (local_offer->ptime > 0 && local_offer->ptime!=remote_answer->ptime) {
+	  		  ms_message("Remote answered ptime [%i] does not match offered [%i] for local stream description [%p]"
+	  				  	  	  	  	  	  	  	  	  	  	  	  ,remote_answer->ptime
+	  				  	  	  	  	  	  	  	  	  	  	  	  ,local_offer->ptime
+	  				  	  	  	  	  	  	  	  	  	  	  	  ,local_offer);
+	  	  result->rtp_port=0;
+	  	  return;
+	  }
+	  if (local_offer->ttl > 0 && local_offer->ttl!=remote_answer->ttl) {
+	  	  ms_message("Remote answered ttl [%i] does not match offered [%i] for local stream description [%p]"
+	  	  				  	  	  	  	  	  	  	  	  	  	  	  ,remote_answer->ttl
+	  	  				  	  	  	  	  	  	  	  	  	  	  	  ,local_offer->ttl
+	  	  				  	  	  	  	  	  	  	  	  	  	  	  ,local_offer);
+	   	  result->rtp_port=0;
+	   	  return;
+	   }
+	  result->ttl=local_offer->ttl;
+	  result->dir=local_offer->dir;
+	  result->multicast_role = SalMulticastRoleSender;
+
+	} else {
+		result->dir=compute_dir_outgoing(local_offer->dir,remote_answer->dir);
+	}
+
+
 
 	if (result->payloads && !only_telephone_event(result->payloads)){
 		strcpy(result->rtp_addr,remote_answer->rtp_addr);
@@ -328,16 +400,34 @@ static void initiate_incoming(const SalStreamDescription *local_cap,
 	result->payloads=match_payloads(local_cap->payloads,remote_offer->payloads, FALSE, one_matching_codec);
 	result->proto=remote_offer->proto;
 	result->type=local_cap->type;
-	result->dir=compute_dir_incoming(local_cap->dir,remote_offer->dir);
-	if (result->payloads && !only_telephone_event(result->payloads) && (remote_offer->rtp_port!=0 || remote_offer->rtp_port==SalStreamSendOnly)){
+	if (!result->payloads || only_telephone_event(result->payloads) || remote_offer->rtp_port==0 || remote_offer->rtp_port==SalStreamSendOnly){
+		result->dir=compute_dir_incoming(local_cap->dir,remote_offer->dir);
+		result->rtp_port=0;
+		return;
+	}
+	if (ms_is_multicast(remote_offer->rtp_addr)) {
+		if (sal_stream_description_has_srtp(result) == TRUE) {
+			ms_message("SAVP not supported for multicast address for remote stream [%p]",remote_offer);
+			result->rtp_port=0;
+			return;
+		}
+		result->dir=remote_offer->dir;
+		strcpy(result->rtp_addr,remote_offer->rtp_addr);
+		strcpy(result->rtcp_addr,remote_offer->rtcp_addr);
+		result->rtp_port=remote_offer->rtp_port;
+		/*result->rtcp_port=remote_offer->rtcp_port;*/
+		result->rtcp_port=0; /* rtcp not supported yet*/
+		result->bandwidth=remote_offer->bandwidth;
+		result->ptime=remote_offer->ptime;
+		result->ttl=remote_offer->ttl;
+		result->multicast_role = SalMulticastRoleReceiver;
+	} else {
 		strcpy(result->rtp_addr,local_cap->rtp_addr);
 		strcpy(result->rtcp_addr,local_cap->rtcp_addr);
 		result->rtp_port=local_cap->rtp_port;
 		result->rtcp_port=local_cap->rtcp_port;
 		result->bandwidth=local_cap->bandwidth;
 		result->ptime=local_cap->ptime;
-	}else{
-		result->rtp_port=0;
 	}
 	if (sal_stream_description_has_srtp(result) == TRUE) {
 		/* select crypto algo */
@@ -358,6 +448,7 @@ static void initiate_incoming(const SalStreamDescription *local_cap,
 
 }
 
+
 /**
  * Returns a media description to run the streams with, based on a local offer
  * and the returned response (remote).
diff --git a/coreapi/presence.c b/coreapi/presence.c
index 53d206ea5..869f723ed 100644
--- a/coreapi/presence.c
+++ b/coreapi/presence.c
@@ -1796,6 +1796,8 @@ void linphone_notify_convert_presence_to_xml(SalOp *op, SalPresenceModel *presen
 		return;
 	}
 
+	xmlTextWriterSetIndent(writer,1);
+
 	err = xmlTextWriterStartDocument(writer, "1.0", "UTF-8", NULL);
 	if (err >= 0) {
 		err = xmlTextWriterStartElementNS(writer, NULL, (const xmlChar *)"presence", (const xmlChar *)"urn:ietf:params:xml:ns:pidf");
diff --git a/coreapi/private.h b/coreapi/private.h
index 13bc91456..18feea39f 100644
--- a/coreapi/private.h
+++ b/coreapi/private.h
@@ -79,6 +79,7 @@ extern "C" {
 #endif
 #endif
 
+
 struct _LinphoneCallParams{
 	belle_sip_object_t base;
 	void *user_data;
@@ -105,6 +106,9 @@ struct _LinphoneCallParams{
 	bool_t no_user_consent;/*when set to TRUE an UPDATE request will be used instead of reINVITE*/
 	uint16_t avpf_rr_interval; /*in milliseconds*/
 	LinphonePrivacyMask privacy;
+	LinphoneCallParamsMediaDirection audio_dir;
+	LinphoneCallParamsMediaDirection video_dir;
+
 };
 
 BELLE_SIP_DECLARE_VPTR(LinphoneCallParams);
@@ -217,6 +221,8 @@ struct _LinphoneCall{
 	SalOp *op;
 	SalOp *ping_op;
 	char localip[LINPHONE_IPADDR_SIZE]; /* our best guess for local ipaddress for this call */
+	char local_audio_ip[LINPHONE_IPADDR_SIZE]; /* our best guess for local ipaddress for this call or what proposed in sdp in case of multicast*/
+	char local_video_ip[LINPHONE_IPADDR_SIZE]; /* our best guess for local ipaddress for this call or what proposed in sdp in case of multicast*/
 	LinphoneCallState state;
 	LinphoneCallState prevstate;
 	LinphoneCallState transfer_state; /*idle if no transfer*/
@@ -589,6 +595,12 @@ typedef struct rtp_config
 	bool_t audio_adaptive_jitt_comp_enabled;
 	bool_t video_adaptive_jitt_comp_enabled;
 	bool_t pad;
+	char* audio_multicast_addr;
+	bool_t audio_multicast_enabled;
+	int audio_multicast_ttl;
+	char* video_multicast_addr;
+	int video_multicast_ttl;
+	bool_t video_multicast_enabled;
 }rtp_config_t;
 
 
diff --git a/include/sal/sal.h b/include/sal/sal.h
index 95037fe0e..75400d4de 100644
--- a/include/sal/sal.h
+++ b/include/sal/sal.h
@@ -196,6 +196,14 @@ typedef enum {
 	SalDtlsRoleUnset
 } SalDtlsRole;
 
+typedef enum {
+	SalMulticastInative=0,
+	SalMulticastRoleSender,
+	SalMulticastRoleReceiver,
+	SalMulticastSenderReceiver
+} SalMulticastRole;
+
+
 typedef struct SalStreamDescription{
 	char name[16]; /*unique name of stream, in order to ease offer/answer model algorithm*/
 	SalMediaProto proto;
@@ -226,6 +234,8 @@ typedef struct SalStreamDescription{
 	bool_t pad[2];
 	char dtls_fingerprint[256];
 	SalDtlsRole dtls_role;
+	int ttl; /*for multicast -1 to disable*/
+	SalMulticastRole multicast_role;
 } SalStreamDescription;
 
 const char *sal_stream_description_get_type_as_string(const SalStreamDescription *desc);
diff --git a/tester/Makefile.am b/tester/Makefile.am
index 2eebd36fa..c55c992e3 100644
--- a/tester/Makefile.am
+++ b/tester/Makefile.am
@@ -15,6 +15,7 @@ liblinphonetester_la_SOURCES = tester.c \
 				register_tester.c \
 				message_tester.c \
 				call_tester.c \
+				multicast_call_tester.c \
 				presence_tester.c \
 				upnp_tester.c \
 				eventapi_tester.c \
diff --git a/tester/call_tester.c b/tester/call_tester.c
index 2d4a662d7..6a134c728 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -127,8 +127,8 @@ void linphone_transfer_state_changed(LinphoneCore *lc, LinphoneCall *transfered,
 	}
 }
 
-#ifdef VIDEO_ENABLED
-static void linphone_call_cb(LinphoneCall *call,void * user_data) {
+
+void linphone_call_cb(LinphoneCall *call,void * user_data) {
 	char* to=linphone_address_as_string(linphone_call_get_call_log(call)->to);
 	char* from=linphone_address_as_string(linphone_call_get_call_log(call)->from);
 	stats* counters;
@@ -139,7 +139,6 @@ static void linphone_call_cb(LinphoneCall *call,void * user_data) {
 	counters = (stats*)get_stats(lc);
 	counters->number_of_IframeDecoded++;
 }
-#endif
 
 void liblinphone_tester_check_rtcp(LinphoneCoreManager* caller, LinphoneCoreManager* callee) {
 	LinphoneCall *c1,*c2;
@@ -314,7 +313,7 @@ void end_call(LinphoneCoreManager *m1, LinphoneCoreManager *m2){
 	CU_ASSERT_TRUE(wait_for(m1->lc,m2->lc,&m2->stat.number_of_LinphoneCallReleased,1));
 }
 
-static void simple_call(void) {
+void simple_call_base(bool_t enable_multicast_recv_side) {
 	int begin;
 	int leaked_objects;
 	LinphoneCoreManager* marie;
@@ -347,6 +346,8 @@ static void simple_call(void) {
 		linphone_address_unref(marie_addr);
 	}
 
+	linphone_core_enable_audio_multicast(pauline->lc,enable_multicast_recv_side);
+
 	CU_ASSERT_TRUE(call(marie,pauline));
 	pauline_call=linphone_core_get_current_call(pauline->lc);
 	CU_ASSERT_PTR_NOT_NULL(pauline_call);
@@ -375,7 +376,9 @@ static void simple_call(void) {
 		belle_sip_object_dump_active_objects();
 	}
 }
-
+static void simple_call() {
+	simple_call_base(FALSE);
+}
 static void call_with_timeouted_bye(void) {
 	int begin;
 	int leaked_objects;
@@ -1131,12 +1134,14 @@ static void call_with_custom_headers(void) {
 	linphone_core_manager_destroy(pauline);
 }
 
-static void call_paused_resumed(void) {
+void call_paused_resumed_base(bool_t multicast) {
 	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
 	LinphoneCall* call_pauline;
 	const rtp_stats_t * stats;
 
+	linphone_core_enable_audio_multicast(pauline->lc,multicast);
+
 	CU_ASSERT_TRUE(call(pauline,marie));
 	call_pauline = linphone_core_get_current_call(pauline->lc);
 
@@ -1170,7 +1175,9 @@ static void call_paused_resumed(void) {
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
 }
-
+static void call_paused_resumed(void) {
+	call_paused_resumed_base(FALSE);
+}
 #define CHECK_CURRENT_LOSS_RATE() \
 	rtcp_count_current = pauline->stat.number_of_rtcp_sent; \
 	/*wait for an RTCP packet to have an accurate cumulative lost value*/ \
diff --git a/tester/liblinphone_tester.h b/tester/liblinphone_tester.h
index c8ca02436..c20f29cc4 100644
--- a/tester/liblinphone_tester.h
+++ b/tester/liblinphone_tester.h
@@ -64,6 +64,7 @@ extern test_suite_t player_test_suite;
 extern test_suite_t dtmf_test_suite;
 extern test_suite_t offeranswer_test_suite;
 extern test_suite_t video_test_suite;
+extern test_suite_t multicast_call_test_suite;
 
 
 extern int liblinphone_tester_nb_test_suites(void);
@@ -314,7 +315,9 @@ void liblinphone_tester_enable_ipv6(bool_t enabled);
 void cunit_android_trace_handler(int level, const char *fmt, va_list args) ;
 #endif
 int  liblinphone_tester_fprintf(FILE * stream, const char * format, ...);
-
+void linphone_call_cb(LinphoneCall *call,void * user_data);
+void call_paused_resumed_base(bool_t multicast);
+void simple_call_base(bool_t enable_multicast_recv_side);
 void call_base(LinphoneMediaEncryption mode, bool_t enable_video,bool_t enable_relay,LinphoneFirewallPolicy policy,bool_t enable_tunnel);
 #endif /* LIBLINPHONE_TESTER_H_ */
 
diff --git a/tester/multicast_call_tester.c b/tester/multicast_call_tester.c
new file mode 100644
index 000000000..8fe459dba
--- /dev/null
+++ b/tester/multicast_call_tester.c
@@ -0,0 +1,198 @@
+/*
+	liblinphone_tester - liblinphone test suite
+	Copyright (C) 2014  Belledonne Communications SARL
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 2 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+
+#include "liblinphone_tester.h"
+#include "linphonecore.h"
+#include "belle-sip/belle-sip.h"
+
+static void call_multicast_base(bool_t video) {
+	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
+	int begin;
+	int leaked_objects;
+	LinphoneVideoPolicy marie_policy, pauline_policy;
+
+	belle_sip_object_enable_leak_detector(TRUE);
+	begin=belle_sip_object_get_object_count();
+
+	if (video) {
+		linphone_core_enable_video_capture(marie->lc, TRUE);
+		linphone_core_enable_video_display(marie->lc, TRUE);
+		linphone_core_enable_video_capture(pauline->lc, TRUE);
+		linphone_core_enable_video_display(pauline->lc, FALSE);
+
+		marie_policy.automatically_initiate=TRUE;
+		marie_policy.automatically_accept=TRUE;
+		pauline_policy.automatically_initiate=TRUE;
+		pauline_policy.automatically_accept=TRUE;
+
+		linphone_core_set_video_policy(marie->lc,&marie_policy);
+		linphone_core_set_video_policy(pauline->lc,&pauline_policy);
+		linphone_core_set_video_multicast_addr(pauline->lc,"224.1.2.3");
+		linphone_core_enable_video_multicast(pauline->lc,TRUE);
+	}
+	linphone_core_set_audio_multicast_addr(pauline->lc,"224.1.2.3");
+	linphone_core_enable_audio_multicast(pauline->lc,TRUE);
+
+	CU_ASSERT_TRUE(call(pauline,marie));
+	wait_for_until(marie->lc, pauline->lc, NULL, 1, 3000);
+	if (linphone_core_get_current_call(marie->lc)) {
+		CU_ASSERT_TRUE(linphone_call_get_audio_stats(linphone_core_get_current_call(marie->lc))->download_bandwidth>70);
+		if (video) {
+			/*check video path*/
+			linphone_call_set_next_video_frame_decoded_callback(linphone_core_get_current_call(marie->lc),linphone_call_cb,marie->lc);
+			linphone_call_send_vfu_request(linphone_core_get_current_call(marie->lc));
+			CU_ASSERT_TRUE( wait_for(marie->lc,pauline->lc,&marie->stat.number_of_IframeDecoded,1));
+		}
+
+		end_call(marie,pauline);
+	}
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+
+	leaked_objects=belle_sip_object_get_object_count()-begin;
+	CU_ASSERT_TRUE(leaked_objects==0);
+	if (leaked_objects>0){
+		belle_sip_object_dump_active_objects();
+	}
+
+}
+static void call_multicast(void)  {
+	call_multicast_base(FALSE);
+}
+static void multicast_audio_with_pause_resume() {
+	call_paused_resumed_base(TRUE);
+}
+#ifdef VIDEO_ENABLED
+static void call_multicast_video(void)  {
+	call_multicast_base(TRUE);
+}
+#endif
+static void early_media_with_multicast_base(bool_t video) {
+	LinphoneCoreManager* marie   = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new("pauline_rc");
+	MSList* lcs = NULL;
+	LinphoneCall* marie_call;
+	int dummy=0;
+	int leaked_objects;
+	int begin;
+	LinphoneVideoPolicy marie_policy, pauline_policy;
+
+	belle_sip_object_enable_leak_detector(TRUE);
+	begin=belle_sip_object_get_object_count();
+
+	if (video) {
+		linphone_core_enable_video_capture(pauline->lc, TRUE);
+		linphone_core_enable_video_display(pauline->lc, TRUE);
+		linphone_core_enable_video_capture(marie->lc, TRUE);
+		linphone_core_enable_video_display(marie->lc, FALSE);
+
+		marie_policy.automatically_initiate=TRUE;
+		marie_policy.automatically_accept=TRUE;
+		pauline_policy.automatically_initiate=TRUE;
+		pauline_policy.automatically_accept=TRUE;
+
+		linphone_core_set_video_policy(marie->lc,&marie_policy);
+		linphone_core_set_video_policy(pauline->lc,&pauline_policy);
+		linphone_core_set_video_multicast_addr(marie->lc,"224.1.2.3");
+		linphone_core_enable_video_multicast(marie->lc,TRUE);
+	}
+	linphone_core_set_audio_multicast_addr(marie->lc,"224.1.2.3");
+	linphone_core_enable_audio_multicast(marie->lc,TRUE);
+
+
+	lcs = ms_list_append(lcs,marie->lc);
+	lcs = ms_list_append(lcs,pauline->lc);
+	/*
+		Marie calls Pauline, and after the call has rung, transitions to an early_media session
+	*/
+
+	marie_call = linphone_core_invite_address(marie->lc, pauline->identity);
+
+	CU_ASSERT_TRUE(wait_for_list(lcs, &pauline->stat.number_of_LinphoneCallIncomingReceived,1,3000));
+	CU_ASSERT_TRUE(wait_for_list(lcs, &marie->stat.number_of_LinphoneCallOutgoingRinging,1,1000));
+
+
+	if (linphone_core_inc_invite_pending(pauline->lc)) {
+		/* send a 183 to initiate the early media */
+		if (video) {
+			/*check video path*/
+			linphone_call_set_next_video_frame_decoded_callback(linphone_core_get_current_call(pauline->lc),linphone_call_cb,pauline->lc);
+		}
+		linphone_core_accept_early_media(pauline->lc, linphone_core_get_current_call(pauline->lc));
+
+		CU_ASSERT_TRUE( wait_for_list(lcs, &pauline->stat.number_of_LinphoneCallIncomingEarlyMedia,1,2000) );
+		CU_ASSERT_TRUE( wait_for_list(lcs, &marie->stat.number_of_LinphoneCallOutgoingEarlyMedia,1,2000) );
+
+		wait_for_list(lcs, &dummy, 1, 3000);
+
+		CU_ASSERT_TRUE(linphone_call_get_audio_stats(linphone_core_get_current_call(pauline->lc))->download_bandwidth>70);
+
+		if (video) {
+			CU_ASSERT_TRUE( wait_for(marie->lc,pauline->lc,&pauline->stat.number_of_IframeDecoded,1));
+		}
+
+		linphone_core_accept_call(pauline->lc, linphone_core_get_current_call(pauline->lc));
+
+		CU_ASSERT_TRUE(wait_for_list(lcs, &marie->stat.number_of_LinphoneCallConnected, 1,1000));
+		CU_ASSERT_TRUE(wait_for_list(lcs, &marie->stat.number_of_LinphoneCallStreamsRunning, 1,1000));
+
+		end_call(marie,pauline);
+	}
+	ms_free(lcs);
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+
+	leaked_objects=belle_sip_object_get_object_count()-begin;
+	CU_ASSERT_TRUE(leaked_objects==2/*fixme jehan*/);
+	if ((leaked_objects)>0){
+		belle_sip_object_dump_active_objects();
+	}
+}
+
+static void early_media_with_multicast_audio() {
+	early_media_with_multicast_base(FALSE);
+}
+static void unicast_incoming_with_multicast_audio_on() {
+	simple_call_base(TRUE);
+}
+#ifdef VIDEO_ENABLED
+static void early_media_with_multicast_video() {
+	early_media_with_multicast_base(TRUE);
+}
+#endif
+
+test_t multicast_call_tests[] = {
+	{ "Multicast audio call",call_multicast},
+	{ "Multicast call with pause/resume",multicast_audio_with_pause_resume},
+	{ "Early media multicast audio call",early_media_with_multicast_audio},
+	{ "Unicast incoming call with multicast activated",unicast_incoming_with_multicast_audio_on},
+#ifdef VIDEO_ENABLED
+	{ "Multicast video call",call_multicast_video},
+	{ "Early media multicast video call",early_media_with_multicast_video},
+#endif
+};
+
+test_suite_t multicast_call_test_suite = {
+	"Multicast Call",
+	NULL,
+	NULL,
+	sizeof(multicast_call_tests) / sizeof(multicast_call_tests[0]),
+	multicast_call_tests
+};
diff --git a/tester/presence_tester.c b/tester/presence_tester.c
index ed39d1b74..6f29658ed 100644
--- a/tester/presence_tester.c
+++ b/tester/presence_tester.c
@@ -347,7 +347,7 @@ static void presence_information(void) {
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
 }
-#define USE_PRESENCE_SERVER 0
+#define USE_PRESENCE_SERVER 1
 
 #if USE_PRESENCE_SERVER
 static void test_subscribe_notify_publish(void) {
@@ -382,25 +382,87 @@ static void test_subscribe_notify_publish(void) {
 	wait_for_until(pauline->lc,marie->lc,&pauline->stat.number_of_NotifyReceived,2,2000);
 	CU_ASSERT_EQUAL(LinphoneStatusOnline,linphone_friend_get_status(lf));
 
-	presence =linphone_presence_model_new_with_activity(LinphonePresenceActivityOffline,NULL);
+	presence =linphone_presence_model_new_with_activity(LinphonePresenceActivityBusy,NULL);
 	linphone_core_set_presence_model(marie->lc,presence);
 
 	/*wait for new status*/
 	wait_for_until(pauline->lc,marie->lc,&pauline->stat.number_of_NotifyReceived,3,2000);
-	CU_ASSERT_EQUAL(LinphonePresenceActivityOffline,linphone_friend_get_status(lf));
+	CU_ASSERT_EQUAL(LinphoneStatusBusy,linphone_friend_get_status(lf));
 
 	/*wait for refresh*/
 	wait_for_until(pauline->lc,marie->lc,&pauline->stat.number_of_NotifyReceived,4,5000);
-	CU_ASSERT_EQUAL(LinphonePresenceActivityOffline,linphone_friend_get_status(lf));
+	CU_ASSERT_EQUAL(LinphoneStatusBusy,linphone_friend_get_status(lf));
 
-	//linphone_core_remove_friend(pauline->lc,lf);
+	/*linphone_core_remove_friend(pauline->lc,lf);*/
 	/*wait for final notify*/
-	//wait_for_until(pauline->lc,marie->lc,&pauline->stat.number_of_NotifyReceived,4,5000);
-	//CU_ASSERT_EQUAL(LinphonePresenceActivityOffline,linphone_friend_get_status(lf));
-
+	/*wait_for_until(pauline->lc,marie->lc,&pauline->stat.number_of_NotifyReceived,4,5000);
+	CU_ASSERT_EQUAL(LinphonePresenceActivityOffline,linphone_friend_get_status(lf));
+	 */
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
 }
+static void test_forked_subscribe_notify_publish(void) {
+
+	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+	LinphoneCoreManager* marie2 = linphone_core_manager_new( "marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
+	LinphoneProxyConfig* proxy;
+	LinphonePresenceModel* presence;
+	MSList* lcs=ms_list_append(NULL,pauline->lc);
+	lcs=ms_list_append(lcs,marie->lc);
+	lcs=ms_list_append(lcs,marie->lc);
+	lcs=ms_list_append(lcs,marie2->lc);
+
+	LpConfig *pauline_lp = linphone_core_get_config(pauline->lc);
+	char* lf_identity=linphone_address_as_string_uri_only(marie->identity);
+	LinphoneFriend *lf = linphone_core_create_friend_with_address(pauline->lc,lf_identity);
+
+	lp_config_set_int(pauline_lp,"sip","subscribe_expires",5);
+
+	linphone_core_add_friend(pauline->lc,lf);
+
+	/*wait for subscribe acknowledgment*/
+	wait_for_list(lcs,&pauline->stat.number_of_NotifyReceived,1,2000);
+	CU_ASSERT_EQUAL(LinphoneStatusOffline,linphone_friend_get_status(lf));
+
+	/*enable publish*/
+
+	linphone_core_get_default_proxy(marie->lc,&proxy);
+	linphone_proxy_config_edit(proxy);
+	linphone_proxy_config_enable_publish(proxy,TRUE);
+	linphone_proxy_config_set_publish_expires(proxy,3);
+	linphone_proxy_config_done(proxy);
+
+	linphone_core_get_default_proxy(marie2->lc,&proxy);
+	linphone_proxy_config_edit(proxy);
+	linphone_proxy_config_enable_publish(proxy,TRUE);
+	linphone_proxy_config_set_publish_expires(proxy,3);
+	linphone_proxy_config_done(proxy);
+
+
+	/*wait for marie status*/
+	wait_for_list(lcs,&pauline->stat.number_of_NotifyReceived,3,2000);
+	CU_ASSERT_EQUAL(LinphoneStatusOnline,linphone_friend_get_status(lf));
+
+	presence =linphone_presence_model_new_with_activity(LinphonePresenceActivityBusy,NULL);
+	linphone_core_set_presence_model(marie->lc,presence);
+
+	/*wait for new status*/
+	wait_for_list(lcs,&pauline->stat.number_of_NotifyReceived,4,2000);
+	CU_ASSERT_EQUAL(LinphoneStatusBusy,linphone_friend_get_status(lf));
+
+
+	presence =linphone_presence_model_new_with_activity(  LinphonePresenceActivityMeeting,NULL);
+	linphone_core_set_presence_model(marie2->lc,presence);
+	/*wait for new status*/
+	wait_for_list(lcs,&pauline->stat.number_of_NotifyReceived,5,2000);
+	CU_ASSERT_EQUAL(LinphoneStatusBusy,linphone_friend_get_status(lf)); /*because liblinphone compositor is very simple for now (I.E only take first occurence)*/
+
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(marie2);
+	linphone_core_manager_destroy(pauline);
+}
+
 
 #endif
 
@@ -414,6 +476,7 @@ test_t presence_tests[] = {
 	{ "App managed presence failure", subscribe_failure_handle_by_app },
 #if USE_PRESENCE_SERVER
 	{ "Subscribe with late publish", test_subscribe_notify_publish },
+	{ "Forked subscribe with late publish", test_forked_subscribe_notify_publish },
 #endif
 };
 
diff --git a/tester/tester.c b/tester/tester.c
index c10dc0c79..ce9bb4c7a 100644
--- a/tester/tester.c
+++ b/tester/tester.c
@@ -453,6 +453,7 @@ void liblinphone_tester_init(void) {
 #if defined(VIDEO_ENABLED) && defined(HAVE_GTK)
 	add_test_suite(&video_test_suite);
 #endif
+	add_test_suite(&multicast_call_test_suite);
 }
 
 void liblinphone_tester_uninit(void) {

From f6447b3c07060ae43c1bd2d35d353ff79c8746e9 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Mon, 2 Feb 2015 11:13:56 +0100
Subject: [PATCH 334/496] update ms2/ortp

---
 tester/transport_tester.c | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/tester/transport_tester.c b/tester/transport_tester.c
index c44f84547..a291ec0c0 100644
--- a/tester/transport_tester.c
+++ b/tester/transport_tester.c
@@ -156,26 +156,44 @@ static void call_with_tunnel_auto_without_sip_with_srtp(void) {
 
 #ifdef VIDEO_ENABLED
 static void tunnel_srtp_video_ice_call(void) {
-	call_base(LinphoneMediaEncryptionSRTP,TRUE,FALSE,LinphonePolicyUseIce,TRUE);
+	if (linphone_core_tunnel_available())
+		call_base(LinphoneMediaEncryptionSRTP,TRUE,FALSE,LinphonePolicyUseIce,TRUE);
+	else
+		ms_warning("Could not test %s because tunnel functionality is not available",__FUNCTION__);
 }
 static void tunnel_zrtp_video_ice_call(void) {
-	call_base(LinphoneMediaEncryptionZRTP,TRUE,FALSE,LinphonePolicyUseIce,TRUE);
+	if (linphone_core_tunnel_available())
+		call_base(LinphoneMediaEncryptionZRTP,TRUE,FALSE,LinphonePolicyUseIce,TRUE);
+	else
+		ms_warning("Could not test %s because tunnel functionality is not available",__FUNCTION__);
 }
 static void tunnel_video_ice_call(void) {
-	call_base(LinphoneMediaEncryptionNone,TRUE,FALSE,LinphonePolicyUseIce,TRUE);
+	if (linphone_core_tunnel_available())
+		call_base(LinphoneMediaEncryptionNone,TRUE,FALSE,LinphonePolicyUseIce,TRUE);
+	else
+		ms_warning("Could not test %s because tunnel functionality is not available",__FUNCTION__);
 }
 #endif
 
 static void tunnel_srtp_ice_call(void) {
-	call_base(LinphoneMediaEncryptionSRTP,FALSE,FALSE,LinphonePolicyUseIce,TRUE);
+	if (linphone_core_tunnel_available())
+		call_base(LinphoneMediaEncryptionSRTP,FALSE,FALSE,LinphonePolicyUseIce,TRUE);
+	else
+		ms_warning("Could not test %s because tunnel functionality is not available",__FUNCTION__);
 }
 
 static void tunnel_zrtp_ice_call(void) {
-	call_base(LinphoneMediaEncryptionZRTP,FALSE,FALSE,LinphonePolicyUseIce,TRUE);
+	if (linphone_core_tunnel_available())
+		call_base(LinphoneMediaEncryptionZRTP,FALSE,FALSE,LinphonePolicyUseIce,TRUE);
+	else
+		ms_warning("Could not test %s because tunnel functionality is not available",__FUNCTION__);
 }
 
 static void tunnel_ice_call(void) {
-	call_base(LinphoneMediaEncryptionNone,FALSE,FALSE,LinphonePolicyUseIce,TRUE);
+	if (linphone_core_tunnel_available())
+		call_base(LinphoneMediaEncryptionNone,FALSE,FALSE,LinphonePolicyUseIce,TRUE);
+	else
+		ms_warning("Could not test %s because tunnel functionality is not available",__FUNCTION__);
 }
 test_t transport_tests[] = {
 	{ "Tunnel only", call_with_tunnel },

From 98448654d3eed620a404ea90332d5a6adbce211a Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Mon, 2 Feb 2015 12:33:59 +0100
Subject: [PATCH 335/496] add lc default value for call param real_early_media

---
 coreapi/linphonecore.c | 2 ++
 coreapi/private.h      | 1 +
 2 files changed, 3 insertions(+)

diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 4a9b9bd1e..f39a1eb20 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -1482,6 +1482,7 @@ static void misc_config_read(LinphoneCore *lc) {
 		*//*JOHAN: USELESS? REMOVE IT*/
 		//const char *user_certificate_config_path = lp_config_get_string(config,"misc","uuid",);
 //	}*/
+	lc->real_early_media=lp_config_get_int(config,"misc","real_early_media",FALSE);
 }
 
 static void linphone_core_start(LinphoneCore * lc) {
@@ -6904,6 +6905,7 @@ void linphone_core_init_default_params(LinphoneCore*lc, LinphoneCallParams *para
 	params->avpf_enabled=FALSE;
 	params->audio_dir=LinphoneCallParamsMediaDirectionSendRecv;
 	params->video_dir=LinphoneCallParamsMediaDirectionSendRecv;
+	params->real_early_media=lc->real_early_media;
 }
 
 void linphone_core_set_device_identifier(LinphoneCore *lc,const char* device_id) {
diff --git a/coreapi/private.h b/coreapi/private.h
index 18feea39f..69b8f233e 100644
--- a/coreapi/private.h
+++ b/coreapi/private.h
@@ -796,6 +796,7 @@ struct _LinphoneCore
 	const char **supported_formats;
 	LinphoneContent *log_collection_upload_information;
 	LinphoneCoreVTable *current_vtable; // the latest vtable to call a callback, see linphone_core_get_current_vtable
+	bool_t real_early_media; /*default value for CallParams.real_early_media*/
 };
 
 

From 5dc7fa8d1a934b577dd5cc348a166b54a8a9b968 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Mon, 2 Feb 2015 17:33:49 +0100
Subject: [PATCH 336/496] make sure multicast and unicast eraly media call
 forking work

---
 coreapi/callbacks.c            | 14 ++++++++--
 coreapi/linphonecore.c         |  3 +--
 coreapi/private.h              |  1 -
 tester/liblinphone_tester.h    |  3 +++
 tester/multicast_call_tester.c | 49 ++++++++++++++++++++++++++++------
 tester/rcfiles/marie_early_rc  |  4 +--
 tester/rcfiles/pauline_rc      |  4 +--
 7 files changed, 61 insertions(+), 17 deletions(-)

diff --git a/coreapi/callbacks.c b/coreapi/callbacks.c
index ad425b21c..85217b576 100644
--- a/coreapi/callbacks.c
+++ b/coreapi/callbacks.c
@@ -380,7 +380,10 @@ static void try_early_media_forking(LinphoneCall *call, SalMediaDescription *md)
 					RtpSession *session=ms->sessions.rtp_session;
 					const char *rtp_addr=new_stream->rtp_addr[0]!='\0' ? new_stream->rtp_addr : md->addr;
 					const char *rtcp_addr=new_stream->rtcp_addr[0]!='\0' ? new_stream->rtcp_addr : md->addr;
-					rtp_session_add_aux_remote_addr_full(session,rtp_addr,new_stream->rtp_port,rtcp_addr,new_stream->rtcp_port);
+					if (ms_is_multicast(new_stream->rtp_addr))
+						ms_message("Multicast addr [%s/%i] does not need auxiliary rtp's destination for call [%p]",new_stream->rtp_addr,new_stream->rtp_port,call);
+					else
+						rtp_session_add_aux_remote_addr_full(session,rtp_addr,new_stream->rtp_port,rtcp_addr,new_stream->rtcp_port);
 				}
 			}
 		}
@@ -425,8 +428,15 @@ static void call_ringing(SalOp *h){
 		if (call->audiostream && audio_stream_started(call->audiostream)){
 			/*streams already started */
 			try_early_media_forking(call,md);
-			return;
+			#ifdef VIDEO_ENABLED
+			if (call->videostream){
+				/*just request for iframe*/
+				video_stream_send_vfu(call->videostream);
+			}
+			#endif
+		return;
 		}
+
 		linphone_core_notify_show_interface(lc);
 		linphone_core_notify_display_status(lc,_("Early media."));
 		linphone_call_set_state(call,LinphoneCallOutgoingEarlyMedia,"Early media");
diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index f39a1eb20..2a951a18c 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -1482,7 +1482,6 @@ static void misc_config_read(LinphoneCore *lc) {
 		*//*JOHAN: USELESS? REMOVE IT*/
 		//const char *user_certificate_config_path = lp_config_get_string(config,"misc","uuid",);
 //	}*/
-	lc->real_early_media=lp_config_get_int(config,"misc","real_early_media",FALSE);
 }
 
 static void linphone_core_start(LinphoneCore * lc) {
@@ -6905,7 +6904,7 @@ void linphone_core_init_default_params(LinphoneCore*lc, LinphoneCallParams *para
 	params->avpf_enabled=FALSE;
 	params->audio_dir=LinphoneCallParamsMediaDirectionSendRecv;
 	params->video_dir=LinphoneCallParamsMediaDirectionSendRecv;
-	params->real_early_media=lc->real_early_media;
+	params->real_early_media=lp_config_get_int(lc->config,"misc","real_early_media",FALSE);
 }
 
 void linphone_core_set_device_identifier(LinphoneCore *lc,const char* device_id) {
diff --git a/coreapi/private.h b/coreapi/private.h
index 69b8f233e..18feea39f 100644
--- a/coreapi/private.h
+++ b/coreapi/private.h
@@ -796,7 +796,6 @@ struct _LinphoneCore
 	const char **supported_formats;
 	LinphoneContent *log_collection_upload_information;
 	LinphoneCoreVTable *current_vtable; // the latest vtable to call a callback, see linphone_core_get_current_vtable
-	bool_t real_early_media; /*default value for CallParams.real_early_media*/
 };
 
 
diff --git a/tester/liblinphone_tester.h b/tester/liblinphone_tester.h
index c20f29cc4..9dbb63a9a 100644
--- a/tester/liblinphone_tester.h
+++ b/tester/liblinphone_tester.h
@@ -24,6 +24,9 @@
 
 #include "CUnit/Basic.h"
 #include "linphonecore.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 typedef void (*test_function_t)(void);
 typedef int (*test_suite_function_t)(const char *name);
diff --git a/tester/multicast_call_tester.c b/tester/multicast_call_tester.c
index 8fe459dba..963fbe62f 100644
--- a/tester/multicast_call_tester.c
+++ b/tester/multicast_call_tester.c
@@ -21,15 +21,17 @@
 #include "linphonecore.h"
 #include "belle-sip/belle-sip.h"
 
+
 static void call_multicast_base(bool_t video) {
-	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
-	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
+	LinphoneCoreManager *marie, *pauline;
 	int begin;
 	int leaked_objects;
 	LinphoneVideoPolicy marie_policy, pauline_policy;
 
 	belle_sip_object_enable_leak_detector(TRUE);
 	begin=belle_sip_object_get_object_count();
+	marie = linphone_core_manager_new( "marie_rc");
+	pauline = linphone_core_manager_new( "pauline_rc");
 
 	if (video) {
 		linphone_core_enable_video_capture(marie->lc, TRUE);
@@ -71,8 +73,10 @@ static void call_multicast_base(bool_t video) {
 	if (leaked_objects>0){
 		belle_sip_object_dump_active_objects();
 	}
+	belle_sip_object_enable_leak_detector(FALSE);
 
 }
+
 static void call_multicast(void)  {
 	call_multicast_base(FALSE);
 }
@@ -85,21 +89,29 @@ static void call_multicast_video(void)  {
 }
 #endif
 static void early_media_with_multicast_base(bool_t video) {
-	LinphoneCoreManager* marie   = linphone_core_manager_new("marie_rc");
-	LinphoneCoreManager* pauline = linphone_core_manager_new("pauline_rc");
+	LinphoneCoreManager *marie, *pauline, *pauline2;
 	MSList* lcs = NULL;
 	LinphoneCall* marie_call;
 	int dummy=0;
 	int leaked_objects;
 	int begin;
 	LinphoneVideoPolicy marie_policy, pauline_policy;
+	LpConfig *marie_lp;
 
 	belle_sip_object_enable_leak_detector(TRUE);
 	begin=belle_sip_object_get_object_count();
+	marie   = linphone_core_manager_new("marie_rc");
+	pauline = linphone_core_manager_new("pauline_rc");
+	pauline2 = linphone_core_manager_new("pauline_rc");
+
+	marie_lp=linphone_core_get_config(marie->lc);
+	lp_config_set_int(marie_lp,"misc","real_early_media",1);
 
 	if (video) {
-		linphone_core_enable_video_capture(pauline->lc, TRUE);
+		linphone_core_enable_video_capture(pauline->lc, FALSE);
 		linphone_core_enable_video_display(pauline->lc, TRUE);
+		linphone_core_enable_video_capture(pauline2->lc, FALSE);
+		linphone_core_enable_video_display(pauline2->lc, TRUE);
 		linphone_core_enable_video_capture(marie->lc, TRUE);
 		linphone_core_enable_video_display(marie->lc, FALSE);
 
@@ -110,6 +122,7 @@ static void early_media_with_multicast_base(bool_t video) {
 
 		linphone_core_set_video_policy(marie->lc,&marie_policy);
 		linphone_core_set_video_policy(pauline->lc,&pauline_policy);
+		linphone_core_set_video_policy(pauline2->lc,&pauline_policy);
 		linphone_core_set_video_multicast_addr(marie->lc,"224.1.2.3");
 		linphone_core_enable_video_multicast(marie->lc,TRUE);
 	}
@@ -119,6 +132,7 @@ static void early_media_with_multicast_base(bool_t video) {
 
 	lcs = ms_list_append(lcs,marie->lc);
 	lcs = ms_list_append(lcs,pauline->lc);
+	lcs = ms_list_append(lcs,pauline2->lc);
 	/*
 		Marie calls Pauline, and after the call has rung, transitions to an early_media session
 	*/
@@ -140,12 +154,29 @@ static void early_media_with_multicast_base(bool_t video) {
 		CU_ASSERT_TRUE( wait_for_list(lcs, &pauline->stat.number_of_LinphoneCallIncomingEarlyMedia,1,2000) );
 		CU_ASSERT_TRUE( wait_for_list(lcs, &marie->stat.number_of_LinphoneCallOutgoingEarlyMedia,1,2000) );
 
+		if (linphone_core_inc_invite_pending(pauline2->lc)) {
+				/* send a 183 to initiate the early media */
+				if (video) {
+					/*check video path*/
+					linphone_call_set_next_video_frame_decoded_callback(linphone_core_get_current_call(pauline2->lc),linphone_call_cb,pauline2->lc);
+				}
+				linphone_core_accept_early_media(pauline2->lc, linphone_core_get_current_call(pauline2->lc));
+
+				CU_ASSERT_TRUE( wait_for_list(lcs, &pauline2->stat.number_of_LinphoneCallIncomingEarlyMedia,1,2000) );
+		}
+
 		wait_for_list(lcs, &dummy, 1, 3000);
 
 		CU_ASSERT_TRUE(linphone_call_get_audio_stats(linphone_core_get_current_call(pauline->lc))->download_bandwidth>70);
+		CU_ASSERT_TRUE(linphone_call_get_audio_stats(linphone_core_get_current_call(pauline->lc))->download_bandwidth<90);
+
+		CU_ASSERT_TRUE(linphone_call_get_audio_stats(linphone_core_get_current_call(pauline2->lc))->download_bandwidth>70);
+		CU_ASSERT_TRUE(linphone_call_get_audio_stats(linphone_core_get_current_call(pauline2->lc))->download_bandwidth<90);
+
 
 		if (video) {
-			CU_ASSERT_TRUE( wait_for(marie->lc,pauline->lc,&pauline->stat.number_of_IframeDecoded,1));
+			CU_ASSERT_TRUE( wait_for_list(lcs,&pauline->stat.number_of_IframeDecoded,1,2000));
+			CU_ASSERT_TRUE( wait_for_list(lcs,&pauline2->stat.number_of_IframeDecoded,1,2000));
 		}
 
 		linphone_core_accept_call(pauline->lc, linphone_core_get_current_call(pauline->lc));
@@ -158,12 +189,14 @@ static void early_media_with_multicast_base(bool_t video) {
 	ms_free(lcs);
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
+	linphone_core_manager_destroy(pauline2);
 
 	leaked_objects=belle_sip_object_get_object_count()-begin;
-	CU_ASSERT_TRUE(leaked_objects==2/*fixme jehan*/);
-	if ((leaked_objects)>0){
+	CU_ASSERT_EQUAL(leaked_objects,0);
+	if (leaked_objects>0){
 		belle_sip_object_dump_active_objects();
 	}
+	belle_sip_object_enable_leak_detector(FALSE);
 }
 
 static void early_media_with_multicast_audio() {
diff --git a/tester/rcfiles/marie_early_rc b/tester/rcfiles/marie_early_rc
index 079a81879..f1866026b 100644
--- a/tester/rcfiles/marie_early_rc
+++ b/tester/rcfiles/marie_early_rc
@@ -30,8 +30,8 @@ subscribe=0
 
 
 [rtp]
-audio_rtp_port=18070
-video_rtp_port=19072
+audio_rtp_port=18070-28000
+video_rtp_port=39072-49000
 
 [video]
 display=0
diff --git a/tester/rcfiles/pauline_rc b/tester/rcfiles/pauline_rc
index 7322fd99a..35ad8c36f 100644
--- a/tester/rcfiles/pauline_rc
+++ b/tester/rcfiles/pauline_rc
@@ -29,8 +29,8 @@ dial_escape_plus=0
 #subscribe=0
 
 [rtp]
-audio_rtp_port=8090
-video_rtp_port=9092
+audio_rtp_port=18070-28000
+video_rtp_port=39072-49000
 
 [video]
 display=0

From 3e1a1430f40568ddc51434fa4d572203e6914dbf Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Tue, 3 Feb 2015 14:18:25 +0100
Subject: [PATCH 337/496] add Android wifi lock management at LinphoneCall
 level

---
 coreapi/linphonecall.c                           |  8 ++++++++
 coreapi/linphonecore.c                           | 14 ++++++++++++++
 coreapi/linphonecore.h                           |  6 +++++-
 coreapi/linphonecore_jni.cc                      | 16 ++++++++++++++++
 coreapi/private.h                                | 14 +++++++++++++-
 .../impl/org/linphone/core/LinphoneCoreImpl.java |  5 +++++
 6 files changed, 61 insertions(+), 2 deletions(-)

diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index ea0676b6d..eb6f3ed76 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -784,6 +784,10 @@ static void linphone_call_init_common(LinphoneCall *call, LinphoneAddress *from,
 	/*by default local_audio_ip=local_video_ip=local_ip*/
 	strncpy(call->local_audio_ip,call->localip,sizeof(call->local_audio_ip));
 	strncpy(call->local_video_ip,call->localip,sizeof(call->local_video_ip));
+#ifdef ANDROID
+	ms_message("Call [%p] aquires wifi lock");
+	linphone_core_wifi_lock_aquire(call->lc);
+#endif
 }
 
 void linphone_call_init_stats(LinphoneCallStats *stats, int type) {
@@ -1328,6 +1332,10 @@ static void linphone_call_destroy(LinphoneCall *obj){
 	}
 
 	sal_error_info_reset(&obj->non_op_error);
+	#ifdef ANDROID
+	ms_message("Call [%p] releases wifi lock");
+	linphone_core_wifi_lock_release(obj->lc);
+	#endif
 }
 
 /**
diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 2a951a18c..59209d868 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -7321,3 +7321,17 @@ void linphone_core_enable_video_multicast(LinphoneCore *lc, bool_t yesno) {
 bool_t linphone_core_video_multicast_enabled(const LinphoneCore *lc) {
 	return lc->rtp_conf.video_multicast_enabled;
 }
+#ifdef ANDROID
+void linphone_core_wifi_lock_acquire(LinphoneCore *lc) {
+	JNIEnv *env=ms_get_jni_env();
+	if (env && lc->wifi_lock)
+		env->CallVoidMethod(lc->wifi_lock,lc->wifi_lock_aquire_id);
+}
+void linphone_core_wifi_lock_release(LinphoneCore *lc) {
+	JNIEnv *env=ms_get_jni_env();
+	if (env && lc->wifi_lock)
+		env->CallVoidMethod(lc->wifi_lock,lc->wifi_lock_release_id);
+
+}
+#endif
+
diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h
index 999bf4823..e8ab365c6 100644
--- a/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@ -3374,6 +3374,8 @@ LINPHONE_PUBLIC int linphone_core_get_video_multicast_ttl(const LinphoneCore *co
 
 /**
  * Use to enable multicast rtp for audio stream.
+ * * If enable, outgoing calls put a multicast address from #linphone_core_get_video_multicast_addr into audio cline. In case of outgoing call audio stream is sent to this multicast address.
+ * <br> For incoming calls behavior is unchanged.
  * @param core the core
  * @param yesno if yes, subsequent calls propose multicast ip set by #linphone_core_set_audio_multicast_addr
  * @return an ipv4/6 multicast address or null
@@ -3391,8 +3393,10 @@ LINPHONE_PUBLIC bool_t linphone_core_audio_multicast_enabled(const LinphoneCore
 
 /**
  * Use to enable multicast rtp for video stream.
+ * If enable, outgoing calls put a multicast address from #linphone_core_get_video_multicast_addr into video cline. In case of outgoing call video stream is sent to this a multicast address.
+ * <br> For incoming calls behavior is unchanged.
  * @param core the core
- * @param yesno if yes, subsequent calls propose multicast ip set by #linphone_core_set_video_multicast_addr
+ * @param yesno if yes, subsequent outgoing calls propose multicast ip set by #linphone_core_set_video_multicast_addr
  * @ingroup media_parameters
 **/
 LINPHONE_PUBLIC void linphone_core_enable_video_multicast(LinphoneCore *core, bool_t yesno);
diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index b159050f0..80c105b37 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -3979,6 +3979,22 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setAndroidPowerManager(J
 #endif
 }
 
+extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setAndroidWifiLock(JNIEnv *env, jobject thiz, jlong lc, jobject wifi_lock) {
+#ifdef ANDROID
+	if (lc->wifi_lock)
+		env->DeleteGlobalRef(lc->wifi_lock);
+	if(wm != NULL) {
+		lc->wifi_lock=env->NewGlobalRef(wifi_lock);
+		jclass wifiLockClass = env->FindClass(env, "android/net/wifi/WifiManager/WifiLock");
+		lc->wifi_lock_aquire_id = env->GetMethodID(wifiLockClass, "acquire", "()V");
+		lc->wifi_lock_release_id = env->GetMethodID(wifiLockClass, "release", "()V");
+	} else {
+		lc->wifi_manager=NULL;
+	}
+
+#endif
+}
+
 extern "C" jint Java_org_linphone_core_LinphoneCoreImpl_getAudioDscp(JNIEnv* env,jobject thiz,jlong ptr){
 	return linphone_core_get_audio_dscp((LinphoneCore*)ptr);
 }
diff --git a/coreapi/private.h b/coreapi/private.h
index 18feea39f..83d41ae7f 100644
--- a/coreapi/private.h
+++ b/coreapi/private.h
@@ -78,7 +78,9 @@ extern "C" {
 #define ngettext(singular, plural, number)	(((number)==1)?(singular):(plural))
 #endif
 #endif
-
+#ifdef ANDROID
+#include <jni.h>
+#endif
 
 struct _LinphoneCallParams{
 	belle_sip_object_t base;
@@ -796,6 +798,11 @@ struct _LinphoneCore
 	const char **supported_formats;
 	LinphoneContent *log_collection_upload_information;
 	LinphoneCoreVTable *current_vtable; // the latest vtable to call a callback, see linphone_core_get_current_vtable
+#ifdef ANDROID
+	jobject wifi_lock;
+	jmethodID wifi_lock_acquire_id;
+	jmethodID wifi_lock_release_id;
+#endif
 };
 
 
@@ -1092,6 +1099,11 @@ void linphone_core_notify_log_collection_upload_progress_indication(LinphoneCore
 void set_mic_gain_db(AudioStream *st, float gain);
 void set_playback_gain_db(AudioStream *st, float gain);
 
+#ifdef ANDROID
+void linphone_core_wifi_lock_acquire(LinphoneCore *lc);
+void linphone_core_wifi_lock_release(LinphoneCore *lc);
+#endif
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/java/impl/org/linphone/core/LinphoneCoreImpl.java b/java/impl/org/linphone/core/LinphoneCoreImpl.java
index d69d53ef0..d210be6fa 100644
--- a/java/impl/org/linphone/core/LinphoneCoreImpl.java
+++ b/java/impl/org/linphone/core/LinphoneCoreImpl.java
@@ -157,6 +157,7 @@ public class LinphoneCoreImpl implements LinphoneCore {
 	private native boolean isSdp200AckEnabled(long nativePtr);
 	private native void stopRinging(long nativePtr);
 	private native static void setAndroidPowerManager(Object pm);
+	private native void setAndroidWifiLock(long nativePtr,Object pm);
 
 	LinphoneCoreImpl(LinphoneCoreListener listener, File userConfig, File factoryConfig, Object userdata) throws IOException {
 		mListener = listener;
@@ -184,6 +185,10 @@ public class LinphoneCoreImpl implements LinphoneCore {
 		mContext = (Context)context;
 		mAudioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
 		setAndroidPowerManager(mContext.getSystemService(Context.POWER_SERVICE));
+		if (Version.sdkAboveOrEqual(Version.API12_HONEYCOMB_MR1_31X)) {
+			WifiManager wifiManager=(WifiManager) getSystemService(Context.WIFI_SERVICE); 
+			setAndroidWifiLock(nativePtr,wifiManager.createWifiLock(WifiManager.WIFI_MODE_FULL_HIGH_PERF, this.getPackageName()+"-"+nativePtr+"-wifi-call-lock"));
+		}
 	}
 
 	public synchronized void addAuthInfo(LinphoneAuthInfo info) {

From a08aacea3f1dd21dc9fe00d8af995386fec33f26 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Wed, 4 Feb 2015 12:12:46 +0100
Subject: [PATCH 338/496] add android support for multicast rtp

---
 coreapi/linphonecall.c                        | 10 +++---
 coreapi/linphonecore.c                        | 34 ++++++++++++++-----
 coreapi/linphonecore_jni.cc                   | 27 +++++++++++----
 coreapi/private.h                             |  5 +++
 .../core/LinphoneCoreFactoryImpl.java         |  4 ++-
 .../org/linphone/core/LinphoneCoreImpl.java   | 19 +++++++++--
 6 files changed, 77 insertions(+), 22 deletions(-)

diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index eb6f3ed76..a7382b51b 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -785,8 +785,9 @@ static void linphone_call_init_common(LinphoneCall *call, LinphoneAddress *from,
 	strncpy(call->local_audio_ip,call->localip,sizeof(call->local_audio_ip));
 	strncpy(call->local_video_ip,call->localip,sizeof(call->local_video_ip));
 #ifdef ANDROID
-	ms_message("Call [%p] aquires wifi lock");
-	linphone_core_wifi_lock_aquire(call->lc);
+	ms_message("Call [%p] acquires both wifi and multicast lock",call);
+	linphone_core_wifi_lock_acquire(call->core);
+	linphone_core_multicast_lock_acquire(call->core); /*does no affect battery more than regular rtp traffic*/
 #endif
 }
 
@@ -1333,8 +1334,9 @@ static void linphone_call_destroy(LinphoneCall *obj){
 
 	sal_error_info_reset(&obj->non_op_error);
 	#ifdef ANDROID
-	ms_message("Call [%p] releases wifi lock");
-	linphone_core_wifi_lock_release(obj->lc);
+	ms_message("Call [%p] releases wifi/multicast lock",obj);
+	linphone_core_wifi_lock_release(obj->core);
+	linphone_core_multicast_lock_release(obj->core);
 	#endif
 }
 
diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 59209d868..5d567fdee 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -7321,17 +7321,35 @@ void linphone_core_enable_video_multicast(LinphoneCore *lc, bool_t yesno) {
 bool_t linphone_core_video_multicast_enabled(const LinphoneCore *lc) {
 	return lc->rtp_conf.video_multicast_enabled;
 }
+
 #ifdef ANDROID
-void linphone_core_wifi_lock_acquire(LinphoneCore *lc) {
+static int linphone_core_call_void_method(jobject obj, jmethodID id) {
 	JNIEnv *env=ms_get_jni_env();
-	if (env && lc->wifi_lock)
-		env->CallVoidMethod(lc->wifi_lock,lc->wifi_lock_aquire_id);
+		if (env && obj) {
+			(*env)->CallVoidMethod(env,obj,id);
+			if ((*env)->ExceptionCheck(env)) {
+				(*env)->ExceptionClear(env);
+				return -1;
+			} else
+				return 0;
+		} else
+			return -1;
+}
+
+void linphone_core_wifi_lock_acquire(LinphoneCore *lc) {
+	if (linphone_core_call_void_method(lc->wifi_lock,lc->wifi_lock_acquire_id))
+		ms_warning("No wifi lock configured or not usable for core [%p]",lc);
 }
 void linphone_core_wifi_lock_release(LinphoneCore *lc) {
-	JNIEnv *env=ms_get_jni_env();
-	if (env && lc->wifi_lock)
-		env->CallVoidMethod(lc->wifi_lock,lc->wifi_lock_release_id);
-
+	if (linphone_core_call_void_method(lc->wifi_lock,lc->wifi_lock_release_id))
+		ms_warning("No wifi lock configured or not usable for core [%p]",lc);
+}
+void linphone_core_multicast_lock_acquire(LinphoneCore *lc) {
+	if (linphone_core_call_void_method(lc->multicast_lock,lc->multicast_lock_acquire_id))
+			ms_warning("No multicast lock configured or not usable for core [%p]",lc);
+}
+void linphone_core_multicast_lock_release(LinphoneCore *lc) {
+	if (linphone_core_call_void_method(lc->multicast_lock,lc->multicast_lock_release_id))
+			ms_warning("No wifi lock configured or not usable for core [%p]",lc);
 }
 #endif
-
diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index 80c105b37..6bcc51ccc 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -3979,19 +3979,34 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setAndroidPowerManager(J
 #endif
 }
 
-extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setAndroidWifiLock(JNIEnv *env, jobject thiz, jlong lc, jobject wifi_lock) {
+extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setAndroidWifiLock(JNIEnv *env, jobject thiz, jlong ptr, jobject wifi_lock) {
 #ifdef ANDROID
+	LinphoneCore *lc=(LinphoneCore*)ptr;
 	if (lc->wifi_lock)
 		env->DeleteGlobalRef(lc->wifi_lock);
-	if(wm != NULL) {
+	if (wifi_lock != NULL) {
 		lc->wifi_lock=env->NewGlobalRef(wifi_lock);
-		jclass wifiLockClass = env->FindClass(env, "android/net/wifi/WifiManager/WifiLock");
-		lc->wifi_lock_aquire_id = env->GetMethodID(wifiLockClass, "acquire", "()V");
+		jclass wifiLockClass = env->FindClass("android/net/wifi/WifiManager$WifiLock");
+		lc->wifi_lock_acquire_id = env->GetMethodID(wifiLockClass, "acquire", "()V");
 		lc->wifi_lock_release_id = env->GetMethodID(wifiLockClass, "release", "()V");
 	} else {
-		lc->wifi_manager=NULL;
+		lc->wifi_lock=NULL;
+	}
+#endif
+}
+extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setAndroidMulticastLock(JNIEnv *env, jobject thiz, jlong ptr, jobject multicast_lock) {
+#ifdef ANDROID
+	LinphoneCore *lc=(LinphoneCore*)ptr;
+	if (lc->multicast_lock)
+		env->DeleteGlobalRef(lc->multicast_lock);
+	if (multicast_lock != NULL) {
+		lc->multicast_lock=env->NewGlobalRef(multicast_lock);
+		jclass multicastLockClass = env->FindClass("android/net/wifi/WifiManager$MulticastLock");
+		lc->multicast_lock_acquire_id = env->GetMethodID(multicastLockClass, "acquire", "()V");
+		lc->multicast_lock_release_id = env->GetMethodID(multicastLockClass, "release", "()V");
+	} else {
+		lc->multicast_lock=NULL;
 	}
-
 #endif
 }
 
diff --git a/coreapi/private.h b/coreapi/private.h
index 83d41ae7f..f5b378008 100644
--- a/coreapi/private.h
+++ b/coreapi/private.h
@@ -802,6 +802,9 @@ struct _LinphoneCore
 	jobject wifi_lock;
 	jmethodID wifi_lock_acquire_id;
 	jmethodID wifi_lock_release_id;
+	jobject multicast_lock;
+	jmethodID multicast_lock_acquire_id;
+	jmethodID multicast_lock_release_id;
 #endif
 };
 
@@ -1102,6 +1105,8 @@ void set_playback_gain_db(AudioStream *st, float gain);
 #ifdef ANDROID
 void linphone_core_wifi_lock_acquire(LinphoneCore *lc);
 void linphone_core_wifi_lock_release(LinphoneCore *lc);
+void linphone_core_multicast_lock_acquire(LinphoneCore *lc);
+void linphone_core_multicast_lock_release(LinphoneCore *lc);
 #endif
 
 #ifdef __cplusplus
diff --git a/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java b/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
index fb019db3d..03e8f7ef3 100644
--- a/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
+++ b/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
@@ -88,7 +88,9 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
 			MediastreamerAndroidContext.setContext(context);
 			File user = userConfig == null ? null : new File(userConfig);
 			File factory = factoryConfig == null ? null : new File(factoryConfig);
-			return new LinphoneCoreImpl(listener, user, factory, userdata);
+			LinphoneCore lc = new LinphoneCoreImpl(listener, user, factory, userdata);
+			if(context!=null) lc.setContext(context);
+			return lc;
 		} catch (IOException e) {
 			throw new LinphoneCoreException("Cannot create LinphoneCore",e);
 		}
diff --git a/java/impl/org/linphone/core/LinphoneCoreImpl.java b/java/impl/org/linphone/core/LinphoneCoreImpl.java
index d210be6fa..4b35f4780 100644
--- a/java/impl/org/linphone/core/LinphoneCoreImpl.java
+++ b/java/impl/org/linphone/core/LinphoneCoreImpl.java
@@ -26,11 +26,15 @@ import java.io.IOException;
 import org.linphone.core.LinphoneCall.State;
 import org.linphone.core.LinphoneCoreListener;
 import org.linphone.mediastream.Log;
+import org.linphone.mediastream.Version;
 import org.linphone.mediastream.video.AndroidVideoWindowImpl;
 import org.linphone.mediastream.video.capture.hwconf.Hacks;
 
 import android.content.Context;
 import android.media.AudioManager;
+import android.net.wifi.WifiManager;
+import android.net.wifi.WifiManager.MulticastLock;
+import android.net.wifi.WifiManager.WifiLock;
 
 public class LinphoneCoreImpl implements LinphoneCore {
 
@@ -157,7 +161,8 @@ public class LinphoneCoreImpl implements LinphoneCore {
 	private native boolean isSdp200AckEnabled(long nativePtr);
 	private native void stopRinging(long nativePtr);
 	private native static void setAndroidPowerManager(Object pm);
-	private native void setAndroidWifiLock(long nativePtr,Object pm);
+	private native void setAndroidWifiLock(long nativePtr,Object wifi_lock);
+	private native void setAndroidMulticastLock(long nativePtr,Object multicast_lock);
 
 	LinphoneCoreImpl(LinphoneCoreListener listener, File userConfig, File factoryConfig, Object userdata) throws IOException {
 		mListener = listener;
@@ -186,8 +191,16 @@ public class LinphoneCoreImpl implements LinphoneCore {
 		mAudioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
 		setAndroidPowerManager(mContext.getSystemService(Context.POWER_SERVICE));
 		if (Version.sdkAboveOrEqual(Version.API12_HONEYCOMB_MR1_31X)) {
-			WifiManager wifiManager=(WifiManager) getSystemService(Context.WIFI_SERVICE); 
-			setAndroidWifiLock(nativePtr,wifiManager.createWifiLock(WifiManager.WIFI_MODE_FULL_HIGH_PERF, this.getPackageName()+"-"+nativePtr+"-wifi-call-lock"));
+			WifiManager wifiManager=(WifiManager) mContext.getSystemService(Context.WIFI_SERVICE); 
+			WifiLock lock = wifiManager.createWifiLock(WifiManager.WIFI_MODE_FULL_HIGH_PERF, "linphonecore ["+ nativePtr+"] wifi-lock");
+			lock.setReferenceCounted(true);
+			setAndroidWifiLock(nativePtr,lock);
+		}
+		if (Version.sdkAboveOrEqual(Version.API14_ICE_CREAM_SANDWICH_40)) {
+			WifiManager wifiManager=(WifiManager) mContext.getSystemService(Context.WIFI_SERVICE); 
+			MulticastLock lock = wifiManager.createMulticastLock("linphonecore ["+ nativePtr+"] multicast-lock");
+			lock.setReferenceCounted(true);
+			setAndroidMulticastLock(nativePtr,lock);
 		}
 	}
 

From 8d45f23dfd278eac2462b5974ff57d1c8c977ab1 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Wed, 4 Feb 2015 15:31:51 +0100
Subject: [PATCH 339/496] fix regression  in offer/answer due to multicast

---
 coreapi/offeranswer.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/coreapi/offeranswer.c b/coreapi/offeranswer.c
index 531965c86..e0a012ceb 100644
--- a/coreapi/offeranswer.c
+++ b/coreapi/offeranswer.c
@@ -400,8 +400,8 @@ static void initiate_incoming(const SalStreamDescription *local_cap,
 	result->payloads=match_payloads(local_cap->payloads,remote_offer->payloads, FALSE, one_matching_codec);
 	result->proto=remote_offer->proto;
 	result->type=local_cap->type;
-	if (!result->payloads || only_telephone_event(result->payloads) || remote_offer->rtp_port==0 || remote_offer->rtp_port==SalStreamSendOnly){
-		result->dir=compute_dir_incoming(local_cap->dir,remote_offer->dir);
+	result->dir=compute_dir_incoming(local_cap->dir,remote_offer->dir);
+	if (!result->payloads || only_telephone_event(result->payloads) || remote_offer->rtp_port==0 || remote_offer->dir==SalStreamRecvOnly){
 		result->rtp_port=0;
 		return;
 	}

From 60c5f9dbbcf169890341a22bc20941cf58d6965b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
 <francois.grisez@belledonne-communications.com>
Date: Wed, 4 Feb 2015 16:18:30 +0100
Subject: [PATCH 340/496] Fix compiation. Backward compatibility with gtk<2.24

---
 tester/video_tester.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tester/video_tester.c b/tester/video_tester.c
index ac7e8575c..c9f3771ee 100644
--- a/tester/video_tester.c
+++ b/tester/video_tester.c
@@ -53,6 +53,7 @@ static unsigned long get_native_handle(GdkWindow *gdkw) {
 
 static GtkWidget *create_video_window(LinphoneCall *call) {
 	GtkWidget *video_window;
+	GdkDisplay *display;
 	GdkColor color;
 	MSVideoSize vsize = MS_VIDEO_SIZE_CIF;
 	
@@ -62,7 +63,12 @@ static GtkWidget *create_video_window(LinphoneCall *call) {
 	gtk_widget_modify_bg(video_window, GTK_STATE_NORMAL, &color);
 	gtk_widget_show(video_window);
 	g_object_set_data(G_OBJECT(video_window), "call", call);
-	gdk_display_flush(gdk_window_get_display(gtk_widget_get_window(video_window)));
+#if GTK_CHECK_VERSION(2,24,0)
+	display = gdk_window_get_display(gtk_widget_get_window(video_window));
+#else // backward compatibility with Debian 6 and Centos 6
+	display = gdk_drawable_get_display(gtk_widget_get_window(video_window));
+#endif
+	gdk_display_flush(display);
 	return video_window;
 }
 

From 2ef0e530b67a3064a059a2611e130005eccd7118 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
 <francois.grisez@belledonne-communications.com>
Date: Wed, 4 Feb 2015 16:19:33 +0100
Subject: [PATCH 341/496] Fix compilation. Compatibility with C99

---
 coreapi/linphonecall.c         | 6 ++++--
 tester/multicast_call_tester.c | 3 +--
 tester/presence_tester.c       | 9 ++++++---
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index a7382b51b..8491c7b12 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -548,6 +548,9 @@ void linphone_call_make_local_media_description(LinphoneCore *lc, LinphoneCall *
 	LinphoneAddress *addr;
 	const char* local_audio_ip;
 	const char* local_video_ip;
+	const char *subject;
+	CodecConstraints codec_hints={0};
+	
 	/*multicast is only set in case of outgoing call*/
 	if (call->dir == LinphoneCallOutgoing && linphone_core_audio_multicast_enabled(lc)) {
 		local_audio_ip=linphone_core_get_audio_multicast_addr(lc);
@@ -564,8 +567,7 @@ void linphone_call_make_local_media_description(LinphoneCore *lc, LinphoneCall *
 		local_video_ip=call->localip;
 
 
-	const char *subject=linphone_call_params_get_session_name(call->params);
-	CodecConstraints codec_hints={0};
+	subject=linphone_call_params_get_session_name(call->params);
 
 	linphone_core_adapt_to_network(lc,call->ping_time,call->params);
 
diff --git a/tester/multicast_call_tester.c b/tester/multicast_call_tester.c
index 963fbe62f..e5a05c11e 100644
--- a/tester/multicast_call_tester.c
+++ b/tester/multicast_call_tester.c
@@ -91,7 +91,6 @@ static void call_multicast_video(void)  {
 static void early_media_with_multicast_base(bool_t video) {
 	LinphoneCoreManager *marie, *pauline, *pauline2;
 	MSList* lcs = NULL;
-	LinphoneCall* marie_call;
 	int dummy=0;
 	int leaked_objects;
 	int begin;
@@ -137,7 +136,7 @@ static void early_media_with_multicast_base(bool_t video) {
 		Marie calls Pauline, and after the call has rung, transitions to an early_media session
 	*/
 
-	marie_call = linphone_core_invite_address(marie->lc, pauline->identity);
+	linphone_core_invite_address(marie->lc, pauline->identity);
 
 	CU_ASSERT_TRUE(wait_for_list(lcs, &pauline->stat.number_of_LinphoneCallIncomingReceived,1,3000));
 	CU_ASSERT_TRUE(wait_for_list(lcs, &marie->stat.number_of_LinphoneCallOutgoingRinging,1,1000));
diff --git a/tester/presence_tester.c b/tester/presence_tester.c
index 6f29658ed..871aacf4f 100644
--- a/tester/presence_tester.c
+++ b/tester/presence_tester.c
@@ -408,14 +408,17 @@ static void test_forked_subscribe_notify_publish(void) {
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
 	LinphoneProxyConfig* proxy;
 	LinphonePresenceModel* presence;
+	LpConfig *pauline_lp;
+	char* lf_identity;
+	LinphoneFriend *lf;
 	MSList* lcs=ms_list_append(NULL,pauline->lc);
 	lcs=ms_list_append(lcs,marie->lc);
 	lcs=ms_list_append(lcs,marie->lc);
 	lcs=ms_list_append(lcs,marie2->lc);
 
-	LpConfig *pauline_lp = linphone_core_get_config(pauline->lc);
-	char* lf_identity=linphone_address_as_string_uri_only(marie->identity);
-	LinphoneFriend *lf = linphone_core_create_friend_with_address(pauline->lc,lf_identity);
+	pauline_lp = linphone_core_get_config(pauline->lc);
+	lf_identity=linphone_address_as_string_uri_only(marie->identity);
+	lf = linphone_core_create_friend_with_address(pauline->lc,lf_identity);
 
 	lp_config_set_int(pauline_lp,"sip","subscribe_expires",5);
 

From c2551b2baa2f7e1b1cfd0f5f016bd7bef780ee20 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Wed, 4 Feb 2015 16:39:22 +0100
Subject: [PATCH 342/496] fix multicast documentation, add java api

---
 coreapi/help/doxygen.dox                      |  5 ++
 coreapi/linphonecore.h                        | 45 +++++-----
 .../org/linphone/core/LinphoneCore.java       | 84 +++++++++++++++++++
 mediastreamer2                                |  2 +-
 4 files changed, 112 insertions(+), 24 deletions(-)

diff --git a/coreapi/help/doxygen.dox b/coreapi/help/doxygen.dox
index 8831758d6..0f8e094f4 100644
--- a/coreapi/help/doxygen.dox
+++ b/coreapi/help/doxygen.dox
@@ -53,6 +53,11 @@
 
 /**
  * @defgroup media_parameters Controlling media parameters
+ *<b> Multicast </b>
+ *<br> Call using rtp multicast addresses are supported for both audio and video with some limitations. Limitations are, no stun, no ice, no encryption. 
+ *<br><li> Incoming call with multicast address are automatically accepted. The called party switches in a media receive only mode.
+ *<br><li> Outgoing call willing to send media to a multicast address can activate multicast using \link linphone_core_enable_video_multicast\endlink or
+ *\link linphone_core_enable_audio_multicast\endlink . The calling party switches in a media listen send only mode.
 **/
 
 /**
diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h
index e8ab365c6..8e1efa4cd 100644
--- a/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@ -3307,7 +3307,7 @@ LINPHONE_PUBLIC int linphone_core_get_avpf_rr_interval(const LinphoneCore *lc);
 
 /**
  * Use to set multicast address to be used for audio stream.
- * @param core the core
+ * @param core #LinphoneCore
  * @param ip an ipv4/6 multicast address
  * @return 0 in case of success
  * @ingroup media_parameters
@@ -3315,7 +3315,7 @@ LINPHONE_PUBLIC int linphone_core_get_avpf_rr_interval(const LinphoneCore *lc);
 LINPHONE_PUBLIC int linphone_core_set_audio_multicast_addr(LinphoneCore *core, const char* ip);
 /**
  * Use to set multicast address to be used for video stream.
- * @param core the core
+ * @param core #LinphoneCore
  * @param ip an ipv4/6 multicast address
  * @return 0 in case of success
  * @ingroup media_parameters
@@ -3324,7 +3324,7 @@ LINPHONE_PUBLIC int linphone_core_set_video_multicast_addr(LinphoneCore *lc, con
 
 /**
  * Use to get multicast address to be used for audio stream.
- * @param core the core
+ * @param core #LinphoneCore
  * @return an ipv4/6 multicast address or default value
  * @ingroup media_parameters
 **/
@@ -3332,7 +3332,7 @@ LINPHONE_PUBLIC const char* linphone_core_get_audio_multicast_addr(const Linphon
 
 /**
  * Use to get multicast address to be used for video stream.
- * @param core the core
+ * @param core #LinphoneCore
  * @return an ipv4/6 multicast address, or default value
  * @ingroup media_parameters
 **/
@@ -3340,16 +3340,16 @@ LINPHONE_PUBLIC const char* linphone_core_get_video_multicast_addr(const Linphon
 
 /**
  * Use to set multicast ttl to be used for audio stream.
- * @param core the core
- * @param ip an ttl or -1 if not used [0..255] default value is 1
+ * @param core #LinphoneCore
+ * @param ttl value or -1 if not used. [0..255] default value is 1
  * @return 0 in case of success
  * @ingroup media_parameters
 **/
 LINPHONE_PUBLIC int linphone_core_set_audio_multicast_ttl(LinphoneCore *core, int ttl);
 /**
  * Use to set multicast ttl to be used for video stream.
- * @param core the core
- * @param ip an ttl or -1 if not used [0..255] default value is 1
+ * @param core #LinphoneCore
+ * @param  ttl value or -1 if not used. [0..255] default value is 1
  * @return 0 in case of success
  * @ingroup media_parameters
 **/
@@ -3357,16 +3357,16 @@ LINPHONE_PUBLIC int linphone_core_set_video_multicast_ttl(LinphoneCore *lc, int
 
 /**
  * Use to get multicast ttl to be used for audio stream.
- * @param core the core
- * @return an time to leave value or -1 if not set
+ * @param core #LinphoneCore
+ * @return a time to leave value
  * @ingroup media_parameters
 **/
 LINPHONE_PUBLIC int linphone_core_get_audio_multicast_ttl(const LinphoneCore *core);
 
 /**
  * Use to get multicast ttl to be used for video stream.
- * @param core the core
- * @return an an time to leave value or -1 if not set
+ * @param core #LinphoneCore
+ * @return a time to leave value
  * @ingroup media_parameters
 **/
 LINPHONE_PUBLIC int linphone_core_get_video_multicast_ttl(const LinphoneCore *core);
@@ -3374,36 +3374,35 @@ LINPHONE_PUBLIC int linphone_core_get_video_multicast_ttl(const LinphoneCore *co
 
 /**
  * Use to enable multicast rtp for audio stream.
- * * If enable, outgoing calls put a multicast address from #linphone_core_get_video_multicast_addr into audio cline. In case of outgoing call audio stream is sent to this multicast address.
+ * * If enabled, outgoing calls put a multicast address from #linphone_core_get_video_multicast_addr into audio cline. In case of outgoing call audio stream is sent to this multicast address.
  * <br> For incoming calls behavior is unchanged.
- * @param core the core
- * @param yesno if yes, subsequent calls propose multicast ip set by #linphone_core_set_audio_multicast_addr
- * @return an ipv4/6 multicast address or null
+ * @param core #LinphoneCore
+ * @param yesno if yes, subsequent calls will propose multicast ip set by #linphone_core_set_audio_multicast_addr
  * @ingroup media_parameters
 **/
 LINPHONE_PUBLIC void linphone_core_enable_audio_multicast(LinphoneCore *core, bool_t yesno);
 
 /**
  * Use to get multicast state of audio stream.
- * @param core the core
- * @return true if  subsequent calls propose multicast ip set by #linphone_core_set_audio_multicast_addr
+ * @param core #LinphoneCore
+ * @return true if  subsequent calls will propose multicast ip set by #linphone_core_set_audio_multicast_addr
  * @ingroup media_parameters
 **/
 LINPHONE_PUBLIC bool_t linphone_core_audio_multicast_enabled(const LinphoneCore *core);
 
 /**
  * Use to enable multicast rtp for video stream.
- * If enable, outgoing calls put a multicast address from #linphone_core_get_video_multicast_addr into video cline. In case of outgoing call video stream is sent to this a multicast address.
+ * If enabled, outgoing calls put a multicast address from #linphone_core_get_video_multicast_addr into video cline. In case of outgoing call video stream is sent to this  multicast address.
  * <br> For incoming calls behavior is unchanged.
- * @param core the core
- * @param yesno if yes, subsequent outgoing calls propose multicast ip set by #linphone_core_set_video_multicast_addr
+ * @param core #LinphoneCore
+ * @param yesno if yes, subsequent outgoing calls will propose multicast ip set by #linphone_core_set_video_multicast_addr
  * @ingroup media_parameters
 **/
 LINPHONE_PUBLIC void linphone_core_enable_video_multicast(LinphoneCore *core, bool_t yesno);
 /**
  * Use to get multicast state of video stream.
- * @param core the core
- * @return true if  subsequent calls propose multicast ip set by #linphone_core_set_audio_multicast_addr
+ * @param core #LinphoneCore
+ * @return true if  subsequent calls will propose multicast ip set by #linphone_core_set_video_multicast_addr
  * @ingroup media_parameters
 **/
 LINPHONE_PUBLIC bool_t linphone_core_video_multicast_enabled(const LinphoneCore *core);
diff --git a/java/common/org/linphone/core/LinphoneCore.java b/java/common/org/linphone/core/LinphoneCore.java
index 3ff4a3865..9c2a0f34e 100644
--- a/java/common/org/linphone/core/LinphoneCore.java
+++ b/java/common/org/linphone/core/LinphoneCore.java
@@ -1879,4 +1879,88 @@ public interface LinphoneCore {
 	 * Upload the log collection to the configured server url.
 	 */
 	public void uploadLogCollection();
+	
+	
+	/**
+	 * Use to set multicast address to be used for audio stream.
+	 * @param ip an ipv4/6 multicast address
+	 * @thow LinphoneCoreException
+	**/
+	public setAudioMulticastAddr(String ip) throw LinphoneCoreException;
+	/**
+	 * Use to set multicast address to be used for video stream.
+	 * @param ip an ipv4/6 multicast address
+	 * @thow LinphoneCoreException
+	**/
+	public void setVideoMulticastAddr(String ip);
+
+	/**
+	 * Use to get multicast address to be used for audio stream.
+	 * @return an ipv4/6 multicast address or default value
+	**/
+	public String getAudioMulticastAddr();
+
+	/**
+	 * Use to get multicast address to be used for video stream.
+	 * @return an ipv4/6 multicast address, or default value
+	**/
+	public String getVideoMulticastAddr();
+
+	/**
+	 * Use to set multicast ttl to be used for audio stream.
+	 * @param ttl value or -1 if not used. [0..255] default value is 1
+	 * @thow LinphoneCoreException
+	**/
+	public void setAudioMulticastTtl(int ttl);
+	/**
+	 * Use to set multicast ttl to be used for video stream.
+	 * @param  ttl value or -1 if not used. [0..255] default value is 1
+	 * @thow LinphoneCoreException
+	**/
+	public void setVideoMulticastTtl(int ttl);
+
+	/**
+	 * Use to get multicast ttl to be used for audio stream.
+	 * @return a time to leave value
+	 * @thow LinphoneCoreException
+	 * 	**/
+	public void getAudioMulticastTtl();
+
+	/**
+	 * Use to get multicast ttl to be used for video stream.
+	 * @return a time to leave value
+	 * @thow LinphoneCoreException
+	**/
+	public void getVideoMulticastTtl(const LinphoneCore *core);
+
+
+	/**
+	 * Use to enable multicast rtp for audio stream.
+	 * * If enabled, outgoing calls put a multicast address from {@link linphone_core_get_video_multicast_addr} into audio cline. In case of outgoing call audio stream is sent to this multicast address.
+	 * <br> For incoming calls behavior is unchanged.
+	 * @param yesno if yes, subsequent calls will propose multicast ip set by {@link linphone_core_set_audio_multicast_addr}
+	**/
+	public void enableAudioMulticast(boolean yesno);
+
+	/**
+	 * Use to get multicast state of audio stream.
+	 * @return true if  subsequent calls will propose multicast ip set by {@link linphone_core_set_audio_multicast_addr}
+	**/
+	public  boolean audioMulticastEnabled();
+
+	/**
+	 * Use to enable multicast rtp for video stream.
+	 * If enabled, outgoing calls put a multicast address from {@link linphone_core_get_video_multicast_addr} into video cline. In case of outgoing call video stream is sent to this  multicast address.
+	 * <br> For incoming calls behavior is unchanged.
+	 * @param yesno if yes, subsequent outgoing calls will propose multicast ip set by {@link linphone_core_set_video_multicast_addr}
+	**/
+	public void enableVideoMulticast(boolean yesno);
+	/**
+	 * Use to get multicast state of video stream.
+	 * @return true if  subsequent calls will propose multicast ip set by {@link linphone_core_set_video_multicast_addr}
+	**/
+	public  boolean videoMulticastEnabled();
+	
+	
+	
 }
diff --git a/mediastreamer2 b/mediastreamer2
index 93d48f997..0ebccd5f6 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 93d48f9970b0be6966f990792c72160bd4f4934b
+Subproject commit 0ebccd5f6f844ecfae865c7d2ef1133405b4ecde

From eb82b8abc791274411d9875549e82cf9aa67908b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
 <francois.grisez@belledonne-communications.com>
Date: Wed, 4 Feb 2015 17:27:49 +0100
Subject: [PATCH 343/496] Initialize a tm structur

---
 tester/log_collection_tester.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tester/log_collection_tester.c b/tester/log_collection_tester.c
index 3b05a6346..3fbbd43c2 100644
--- a/tester/log_collection_tester.c
+++ b/tester/log_collection_tester.c
@@ -154,7 +154,7 @@ time_t check_file(LinphoneCoreManager* mgr)  {
 		char *line = NULL;
 		size_t line_size = 256;
 #ifndef WIN32
-		struct tm tm_curr;
+		struct tm tm_curr = {0};
 		time_t time_prev = -1;
 #endif
 

From ca9738f673d397e1e94f6d217881318ab84b30f7 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Wed, 4 Feb 2015 17:38:14 +0100
Subject: [PATCH 344/496] prepare multicast control api java binding

---
 coreapi/linphonecore_jni.cc                   | 139 ++++++++++++++++++
 .../org/linphone/core/LinphoneCore.java       |  13 +-
 .../org/linphone/core/LinphoneCoreImpl.java   |  68 +++++++++
 3 files changed, 214 insertions(+), 6 deletions(-)

diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index 6bcc51ccc..fb01e6dbe 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -5603,3 +5603,142 @@ extern "C" jlong Java_org_linphone_core_LinphoneCoreImpl_createLocalPlayer(JNIEn
 		return (jlong)player;
 	}
 }
+
+
+/*
+ * Class:     org_linphone_core_LinphoneCoreImpl
+ * Method:    setAudioMulticastAddr
+ * Signature: (JLjava/lang/String;)I
+ */
+extern "C" jint JNICALL Java_org_linphone_core_LinphoneCoreImpl_setAudioMulticastAddr
+  (JNIEnv * env , jobject, jlong ptr, jstring value) {
+	const char *char_value = value ? env->GetStringUTFChars(value, NULL) : NULL;
+	LinphoneCore *lc=(LinphoneCore*)ptr;
+	int result = linphone_core_set_audio_multicast_addr(lc,char_value);
+	if (char_value) env->ReleaseStringUTFChars(value, char_value);
+	return result;
+}
+
+/*
+ * Class:     org_linphone_core_LinphoneCoreImpl
+ * Method:    setVideoMulticastAddr
+ * Signature: (JLjava/lang/String;)I
+ */
+extern "C" jint JNICALL Java_org_linphone_core_LinphoneCoreImpl_setVideoMulticastAddr
+  (JNIEnv * env, jobject, jlong ptr, jstring value) {
+	const char *char_value = value ? env->GetStringUTFChars(value, NULL) : NULL;
+	LinphoneCore *lc=(LinphoneCore*)ptr;
+	int result = linphone_core_set_video_multicast_addr(lc,char_value);
+	if (char_value) env->ReleaseStringUTFChars(value, char_value);
+	return result;
+}
+
+/*
+ * Class:     org_linphone_core_LinphoneCoreImpl
+ * Method:    getAudioMulticastAddr
+ * Signature: (J)Ljava/lang/String;
+ */
+extern "C" jstring JNICALL Java_org_linphone_core_LinphoneCoreImpl_getAudioMulticastAddr
+  (JNIEnv *, jobject, jlong) {
+	ms_error("Java_org_linphone_core_LinphoneCoreImpl_getAudioMulticastAddr not implemented yet");
+	return NULL;
+}
+
+/*
+ * Class:     org_linphone_core_LinphoneCoreImpl
+ * Method:    getVideoMulticastAddr
+ * Signature: (J)Ljava/lang/String;
+ */
+extern "C" jstring JNICALL Java_org_linphone_core_LinphoneCoreImpl_getVideoMulticastAddr
+  (JNIEnv *, jobject, jlong) {
+	ms_error("Java_org_linphone_core_LinphoneCoreImpl_getVideoMulticastAddr not implemented yet");
+	return NULL;
+}
+
+/*
+ * Class:     org_linphone_core_LinphoneCoreImpl
+ * Method:    setAudioMulticastTtl
+ * Signature: (JI)I
+ */
+extern "C" jint JNICALL Java_org_linphone_core_LinphoneCoreImpl_setAudioMulticastTtl
+  (JNIEnv *, jobject, jlong, jint) {
+	ms_error("Java_org_linphone_core_LinphoneCoreImpl_setAudioMulticastTtl not implemented yet");
+	return -1;
+}
+
+/*
+ * Class:     org_linphone_core_LinphoneCoreImpl
+ * Method:    setVideoMulticastTtl
+ * Signature: (JI)I
+ */
+extern "C" jint JNICALL Java_org_linphone_core_LinphoneCoreImpl_setVideoMulticastTtl
+  (JNIEnv *, jobject, jlong, jint) {
+	ms_error("Java_org_linphone_core_LinphoneCoreImpl_setVideoMulticastTtl not implemented yet");
+	return -1;
+}
+
+/*
+ * Class:     org_linphone_core_LinphoneCoreImpl
+ * Method:    getAudioMulticastTtl
+ * Signature: (J)I
+ */
+extern "C" jint JNICALL Java_org_linphone_core_LinphoneCoreImpl_getAudioMulticastTtl
+  (JNIEnv *, jobject, jlong) {
+	ms_error("Java_org_linphone_core_LinphoneCoreImpl_getAudioMulticastTtl not implemented yet");
+	return -1;
+}
+
+/*
+ * Class:     org_linphone_core_LinphoneCoreImpl
+ * Method:    getVideoMulticastTtl
+ * Signature: (J)I
+ */
+extern "C" jint JNICALL Java_org_linphone_core_LinphoneCoreImpl_getVideoMulticastTtl
+  (JNIEnv *, jobject, jlong) {
+	ms_error("Java_org_linphone_core_LinphoneCoreImpl_getVideoMulticastTtl not implemented yet");
+	return -1;
+}
+
+/*
+ * Class:     org_linphone_core_LinphoneCoreImpl
+ * Method:    enableAudioMulticast
+ * Signature: (JZ)V
+ */
+extern "C" void JNICALL Java_org_linphone_core_LinphoneCoreImpl_enableAudioMulticast
+  (JNIEnv *, jobject, jlong, jboolean) {
+	ms_error("Java_org_linphone_core_LinphoneCoreImpl_enableAudioMulticast not implemented yet");
+}
+
+/*
+ * Class:     org_linphone_core_LinphoneCoreImpl
+ * Method:    audioMulticastEnabled
+ * Signature: (J)Z
+ */
+extern "C" jboolean JNICALL Java_org_linphone_core_LinphoneCoreImpl_audioMulticastEnabled
+  (JNIEnv *, jobject, jlong) {
+	ms_error("Java_org_linphone_core_LinphoneCoreImpl_audioMulticastEnabled not implemented yet");
+	return false;
+}
+
+/*
+ * Class:     org_linphone_core_LinphoneCoreImpl
+ * Method:    enableVideoMulticast
+ * Signature: (JZ)V
+ */
+extern "C" void JNICALL Java_org_linphone_core_LinphoneCoreImpl_enableVideoMulticast
+  (JNIEnv *, jobject, jlong, jboolean) {
+	ms_error("Java_org_linphone_core_LinphoneCoreImpl_enableVideoMulticast not implemented yet");
+}
+
+/*
+ * Class:     org_linphone_core_LinphoneCoreImpl
+ * Method:    videoMulticastEnabled
+ * Signature: (J)Z
+ */
+extern "C" jboolean JNICALL Java_org_linphone_core_LinphoneCoreImpl_videoMulticastEnabled
+  (JNIEnv *, jobject, jlong) {
+	ms_error("Java_org_linphone_core_LinphoneCoreImpl_videoMulticastEnabled not implemented yet");
+	return false;
+}
+
+
diff --git a/java/common/org/linphone/core/LinphoneCore.java b/java/common/org/linphone/core/LinphoneCore.java
index 9c2a0f34e..98e9226eb 100644
--- a/java/common/org/linphone/core/LinphoneCore.java
+++ b/java/common/org/linphone/core/LinphoneCore.java
@@ -1884,15 +1884,16 @@ public interface LinphoneCore {
 	/**
 	 * Use to set multicast address to be used for audio stream.
 	 * @param ip an ipv4/6 multicast address
+	 * @return 
 	 * @thow LinphoneCoreException
 	**/
-	public setAudioMulticastAddr(String ip) throw LinphoneCoreException;
+	public void setAudioMulticastAddr(String ip) throws LinphoneCoreException;
 	/**
 	 * Use to set multicast address to be used for video stream.
 	 * @param ip an ipv4/6 multicast address
 	 * @thow LinphoneCoreException
 	**/
-	public void setVideoMulticastAddr(String ip);
+	public void setVideoMulticastAddr(String ip) throws LinphoneCoreException;
 
 	/**
 	 * Use to get multicast address to be used for audio stream.
@@ -1911,27 +1912,27 @@ public interface LinphoneCore {
 	 * @param ttl value or -1 if not used. [0..255] default value is 1
 	 * @thow LinphoneCoreException
 	**/
-	public void setAudioMulticastTtl(int ttl);
+	public void setAudioMulticastTtl(int ttl)  throws LinphoneCoreException;
 	/**
 	 * Use to set multicast ttl to be used for video stream.
 	 * @param  ttl value or -1 if not used. [0..255] default value is 1
 	 * @thow LinphoneCoreException
 	**/
-	public void setVideoMulticastTtl(int ttl);
+	public void setVideoMulticastTtl(int ttl) throws LinphoneCoreException;
 
 	/**
 	 * Use to get multicast ttl to be used for audio stream.
 	 * @return a time to leave value
 	 * @thow LinphoneCoreException
 	 * 	**/
-	public void getAudioMulticastTtl();
+	public int getAudioMulticastTtl();
 
 	/**
 	 * Use to get multicast ttl to be used for video stream.
 	 * @return a time to leave value
 	 * @thow LinphoneCoreException
 	**/
-	public void getVideoMulticastTtl(const LinphoneCore *core);
+	public int getVideoMulticastTtl();
 
 
 	/**
diff --git a/java/impl/org/linphone/core/LinphoneCoreImpl.java b/java/impl/org/linphone/core/LinphoneCoreImpl.java
index 4b35f4780..11f62619c 100644
--- a/java/impl/org/linphone/core/LinphoneCoreImpl.java
+++ b/java/impl/org/linphone/core/LinphoneCoreImpl.java
@@ -1364,4 +1364,72 @@ public class LinphoneCoreImpl implements LinphoneCore {
 	public float getPreferredFramerate() {
 		return getPreferredFramerate(nativePtr);
 	}
+	
+	
+	private native int setAudioMulticastAddr(long nativePtr, String ip);
+	@Override
+	public void setAudioMulticastAddr(String ip) throws LinphoneCoreException {
+		if (setAudioMulticastAddr(nativePtr, ip)!=0)
+			throw new LinphoneCoreException("bad ip address ["+ip+"]");
+	}
+	private native int setVideoMulticastAddr(long nativePtr, String ip);
+	@Override
+	public void setVideoMulticastAddr(String ip) throws LinphoneCoreException {
+		if (setVideoMulticastAddr(nativePtr, ip)!=0)
+			throw new LinphoneCoreException("bad ip address ["+ip+"]");
+	}
+	private native String getAudioMulticastAddr(long ptr);
+	@Override
+	public String getAudioMulticastAddr() {
+		return getAudioMulticastAddr() ;
+	}
+	private native String getVideoMulticastAddr(long ptr);
+	@Override
+	public String getVideoMulticastAddr() {
+		return getVideoMulticastAddr();
+	}
+	private native int setAudioMulticastTtl(long ptr,int ttl);
+	@Override
+	public void setAudioMulticastTtl(int ttl) throws LinphoneCoreException {
+		if (setAudioMulticastTtl(nativePtr, ttl)!=0)
+			throw new LinphoneCoreException("bad ttl value ["+ttl+"]");
+		
+	}
+	private native int setVideoMulticastTtl(long ptr,int ttl);
+	@Override
+	public void setVideoMulticastTtl(int ttl) throws LinphoneCoreException {
+		if (setVideoMulticastTtl(nativePtr, ttl)!=0)
+			throw new LinphoneCoreException("bad ttl value ["+ttl+"]");	
+	}
+	private native int getAudioMulticastTtl(long ptr);
+	@Override
+	public int getAudioMulticastTtl() {
+		return getAudioMulticastTtl(nativePtr);	
+	}
+	private native int getVideoMulticastTtl(long ptr);
+	@Override
+	public int getVideoMulticastTtl() {
+		return getVideoMulticastTtl(nativePtr);
+	}
+	private native void enableAudioMulticast(long ptr,boolean yesno);
+	@Override
+	public void enableAudioMulticast(boolean yesno) {
+		enableAudioMulticast(nativePtr,yesno);
+	}
+	private native boolean audioMulticastEnabled(long ptr);
+	@Override
+	public boolean audioMulticastEnabled() {
+		return audioMulticastEnabled(nativePtr);
+	}
+	private native void enableVideoMulticast(long ptr,boolean yesno);
+	
+	@Override
+	public void enableVideoMulticast(boolean yesno) {
+		enableVideoMulticast(nativePtr,yesno);
+	}
+	private native boolean videoMulticastEnabled(long ptr);
+	@Override
+	public boolean videoMulticastEnabled() {
+		return videoMulticastEnabled(nativePtr);
+	}
 }

From c2116983d51eb3fa4ec0ada10b87077d36f25a3e Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Wed, 4 Feb 2015 18:17:36 +0100
Subject: [PATCH 345/496] Remove clear exceptions

---
 coreapi/linphonecore_jni.cc | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index fb01e6dbe..d093a3e30 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -264,7 +264,6 @@ public:
 
 		/*displayStatus(LinphoneCore lc,String message);*/
 		displayStatusId = env->GetMethodID(listenerClass,"displayStatus","(Lorg/linphone/core/LinphoneCore;Ljava/lang/String;)V");
-		env->ExceptionClear();
 		if (displayStatusId) {
 			vTable->display_status = displayStatusCb;
 		}
@@ -294,7 +293,6 @@ public:
 		}
 
 		transferStateId = env->GetMethodID(listenerClass,"transferState","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneCall;Lorg/linphone/core/LinphoneCall$State;)V");
-		env->ExceptionClear();
 		if (transferStateId) {
 			vTable->transfer_state_changed = transferStateChanged;
 		}
@@ -318,39 +316,33 @@ public:
 
 		/*void newSubscriptionRequest(LinphoneCore lc, LinphoneFriend lf, String url)*/
 		newSubscriptionRequestId = env->GetMethodID(listenerClass,"newSubscriptionRequest","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneFriend;Ljava/lang/String;)V");
-		env->ExceptionClear();
 		if (newSubscriptionRequestId) {
 			vTable->new_subscription_requested = new_subscription_requested;
 		}
 
 		authInfoRequestedId = env->GetMethodID(listenerClass,"authInfoRequested","(Lorg/linphone/core/LinphoneCore;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V");
-		env->ExceptionClear();
 		if (authInfoRequestedId) {
 			vTable->auth_info_requested = authInfoRequested;
 		}
 
 		/*void notifyPresenceReceived(LinphoneCore lc, LinphoneFriend lf);*/
 		notifyPresenceReceivedId = env->GetMethodID(listenerClass,"notifyPresenceReceived","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneFriend;)V");
-		env->ExceptionClear();
 		if (notifyPresenceReceivedId) {
 			vTable->notify_presence_received = notify_presence_received;
 		}
 
 		/*void textReceived(LinphoneCore lc, LinphoneChatRoom cr,LinphoneAddress from,String message);*/
 		textReceivedId = env->GetMethodID(listenerClass,"textReceived","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneChatRoom;Lorg/linphone/core/LinphoneAddress;Ljava/lang/String;)V");
-		env->ExceptionClear();
 		if (textReceivedId) {
 			vTable->text_received = text_received;
 		}
 
 		messageReceivedId = env->GetMethodID(listenerClass,"messageReceived","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneChatRoom;Lorg/linphone/core/LinphoneChatMessage;)V");
-		env->ExceptionClear();
 		if (messageReceivedId) {
 			vTable->message_received = message_received;
 		}
 
 		isComposingReceivedId = env->GetMethodID(listenerClass,"isComposingReceived","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneChatRoom;)V");
-		env->ExceptionClear();
 		if (isComposingReceivedId) {
 			vTable->is_composing_received = is_composing_received;
 		}

From 0009864a696425d4e1279ce06c7a877993179c25 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Wed, 4 Feb 2015 22:25:13 +0100
Subject: [PATCH 346/496] make remote offered fmtp appended to local ones,
 instead of replacing

---
 coreapi/offeranswer.c | 9 ++++++---
 mediastreamer2        | 2 +-
 oRTP                  | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/coreapi/offeranswer.c b/coreapi/offeranswer.c
index e0a012ceb..4c7147db4 100644
--- a/coreapi/offeranswer.c
+++ b/coreapi/offeranswer.c
@@ -127,7 +127,9 @@ static PayloadTypeMatcher matchers[]={
 };
 
 
-
+/*
+ * Returns a PayloadType from the local list that matches a PayloadType offered or answered in the remote list
+*/
 static PayloadType * find_payload_type_best_match(const MSList *l, const PayloadType *refpt){
 	PayloadTypeMatcher *m;
 	for(m=matchers;m->mime_type!=NULL;++m){
@@ -162,8 +164,9 @@ static MSList *match_payloads(const MSList *local, const MSList *remote, bool_t
 			}
 
 			newp=payload_type_clone(matched);
-			if (p2->send_fmtp)
-				payload_type_set_send_fmtp(newp,p2->send_fmtp);
+			if (p2->send_fmtp){
+				payload_type_append_send_fmtp(newp,p2->send_fmtp);
+			}
 			newp->flags|=PAYLOAD_TYPE_FLAG_CAN_RECV|PAYLOAD_TYPE_FLAG_CAN_SEND;
 			if (p2->flags & PAYLOAD_TYPE_RTCP_FEEDBACK_ENABLED) {
 				newp->flags |= PAYLOAD_TYPE_RTCP_FEEDBACK_ENABLED;
diff --git a/mediastreamer2 b/mediastreamer2
index 0ebccd5f6..bf2d8b08e 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 0ebccd5f6f844ecfae865c7d2ef1133405b4ecde
+Subproject commit bf2d8b08ec0200175580ce94404e52dae266bf69
diff --git a/oRTP b/oRTP
index 8cac6a399..327cec466 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 8cac6a399755001f5df7a933bc26c7b9629981fc
+Subproject commit 327cec466a5d39e716664325ae6d604e228b3fed

From 9b95f24fc31e17cb7e2bbcc8818fd46a61394aed Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Thu, 5 Feb 2015 00:09:46 +0100
Subject: [PATCH 347/496] avoid multiple warnings due to ms_is_multicast() not
 used correctly, make code stream type agnostic

---
 coreapi/callbacks.c    |  5 ++--
 coreapi/linphonecall.c | 63 ++++++++++++++++++++++++------------------
 coreapi/offeranswer.c  |  4 +--
 coreapi/private.h      |  3 +-
 4 files changed, 42 insertions(+), 33 deletions(-)

diff --git a/coreapi/callbacks.c b/coreapi/callbacks.c
index 85217b576..99e23f777 100644
--- a/coreapi/callbacks.c
+++ b/coreapi/callbacks.c
@@ -380,8 +380,9 @@ static void try_early_media_forking(LinphoneCall *call, SalMediaDescription *md)
 					RtpSession *session=ms->sessions.rtp_session;
 					const char *rtp_addr=new_stream->rtp_addr[0]!='\0' ? new_stream->rtp_addr : md->addr;
 					const char *rtcp_addr=new_stream->rtcp_addr[0]!='\0' ? new_stream->rtcp_addr : md->addr;
-					if (ms_is_multicast(new_stream->rtp_addr))
-						ms_message("Multicast addr [%s/%i] does not need auxiliary rtp's destination for call [%p]",new_stream->rtp_addr,new_stream->rtp_port,call);
+					if (ms_is_multicast(rtp_addr))
+						ms_message("Multicast addr [%s/%i] does not need auxiliary rtp's destination for call [%p]",
+							   rtp_addr,new_stream->rtp_port,call);
 					else
 						rtp_session_add_aux_remote_addr_full(session,rtp_addr,new_stream->rtp_port,rtcp_addr,new_stream->rtcp_port);
 				}
diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index 8491c7b12..713dd9f44 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -538,6 +538,14 @@ static void transfer_already_assigned_payload_types(SalMediaDescription *old, Sa
 	}
 }
 
+static const char *linphone_call_get_bind_ip_for_stream(LinphoneCall *call, int stream_index){
+	const char *bind_ip=call->af==AF_INET6 ? "::0" : "0.0.0.0";
+	
+	if (stream_index<2 && call->media_ports[stream_index].multicast_ip[0]!='\0') 
+		bind_ip=call->media_ports[stream_index].multicast_ip;
+	return bind_ip;
+}
+
 void linphone_call_make_local_media_description(LinphoneCore *lc, LinphoneCall *call){
 	MSList *l;
 	SalMediaDescription *old_md=call->localdesc;
@@ -783,9 +791,7 @@ static void linphone_call_init_common(LinphoneCall *call, LinphoneAddress *from,
 
 	linphone_call_init_stats(&call->stats[LINPHONE_CALL_STATS_AUDIO], LINPHONE_CALL_STATS_AUDIO);
 	linphone_call_init_stats(&call->stats[LINPHONE_CALL_STATS_VIDEO], LINPHONE_CALL_STATS_VIDEO);
-	/*by default local_audio_ip=local_video_ip=local_ip*/
-	strncpy(call->local_audio_ip,call->localip,sizeof(call->local_audio_ip));
-	strncpy(call->local_video_ip,call->localip,sizeof(call->local_video_ip));
+	
 #ifdef ANDROID
 	ms_message("Call [%p] acquires both wifi and multicast lock",call);
 	linphone_core_wifi_lock_acquire(call->core);
@@ -945,6 +951,7 @@ static void linphone_call_incoming_select_ip_version(LinphoneCall *call){
  * Fix call parameters on incoming call to eg. enable AVPF if the incoming call propose it and it is not enabled locally.
  */
 void linphone_call_set_compatible_incoming_call_parameters(LinphoneCall *call, const SalMediaDescription *md) {
+	int i;
 	call->params->has_video &= linphone_core_media_description_contains_video_stream(md);
 
 	/* Handle AVPF, SRTP and DTLS. */
@@ -963,18 +970,14 @@ void linphone_call_set_compatible_incoming_call_parameters(LinphoneCall *call, c
 		call->params->media_encryption = LinphoneMediaEncryptionSRTP;
 	}
 
-	//set both local audio & video
-	if (ms_is_multicast(md->streams[0].rtp_addr)) {
-		strncpy(call->local_audio_ip,md->streams[0].rtp_addr,sizeof(call->local_audio_ip));
-		ms_message("Disabling audio rtcp on call [%p] because of multicast",call);
-		call->media_ports[0].rtp_port=md->streams[0].rtp_port;
-		call->media_ports[0].rtcp_port=0;
-	}
-	if (ms_is_multicast(md->streams[1].rtp_addr)) {
-		strncpy(call->local_video_ip,md->streams[1].rtp_addr,sizeof(call->local_video_ip));
-		call->media_ports[1].rtp_port=md->streams[1].rtp_port;
-		call->media_ports[1].rtcp_port=0;
-		ms_message("Disabling video rtcp on call [%p] because of multicast",call);
+	/* set both local audio & video multicast ip address if any*/
+	for (i=0;i<2;++i){
+		if (md->streams[i].rtp_addr[i]!='\0' && ms_is_multicast(md->streams[i].rtp_addr)) {
+			strncpy(call->media_ports[i].multicast_ip,md->streams[i].rtp_addr,sizeof(call->media_ports[i].multicast_ip));
+			ms_message("Disabling rtcp on call [%p], stream [%i] because of multicast",call,i);
+			call->media_ports[i].rtp_port=md->streams[i].rtp_port;
+			call->media_ports[i].rtcp_port=0;
+		}
 	}
 }
 
@@ -1806,6 +1809,8 @@ int linphone_call_prepare_ice(LinphoneCall *call, bool_t incoming_offer){
 	return 0;
 }
 
+
+
 void linphone_call_init_audio_stream(LinphoneCall *call){
 	LinphoneCore *lc=call->core;
 	AudioStream *audiostream;
@@ -1818,7 +1823,8 @@ void linphone_call_init_audio_stream(LinphoneCall *call){
 
 	if (call->audiostream != NULL) return;
 	if (call->sessions[0].rtp_session==NULL){
-		call->audiostream=audiostream=audio_stream_new2(call->local_audio_ip,call->media_ports[0].rtp_port,call->media_ports[0].rtcp_port);
+		call->audiostream=audiostream=audio_stream_new2(linphone_call_get_bind_ip_for_stream(call,0),
+				call->media_ports[0].rtp_port, call->media_ports[0].rtcp_port);
 		cname = linphone_address_as_string_uri_only(call->me);
 		audio_stream_set_rtcp_information(call->audiostream, cname, rtcp_tool);
 		ms_free(cname);
@@ -1923,7 +1929,8 @@ void linphone_call_init_video_stream(LinphoneCall *call){
 		const char *display_filter=linphone_core_get_video_display_filter(lc);
 
 		if (call->sessions[1].rtp_session==NULL){
-			call->videostream=video_stream_new2(call->local_video_ip,call->media_ports[1].rtp_port,call->media_ports[1].rtcp_port);
+			call->videostream=video_stream_new2(linphone_call_get_bind_ip_for_stream(call,1),
+					call->media_ports[1].rtp_port,call->media_ports[1].rtcp_port);
 			cname = linphone_address_as_string_uri_only(call->me);
 			video_stream_set_rtcp_information(call->videostream, cname, rtcp_tool);
 			ms_free(cname);
@@ -2289,13 +2296,15 @@ static void linphone_call_start_audio_stream(LinphoneCall *call, bool_t muted, b
 
 	stream = sal_media_description_find_best_stream(call->resultdesc, SalAudio);
 	if (stream && stream->dir!=SalStreamInactive && stream->rtp_port!=0){
+		const char *rtp_addr=stream->rtp_addr[0]!='\0' ? stream->rtp_addr : call->resultdesc->addr;
+		bool_t is_multicast=ms_is_multicast(rtp_addr);
 		playcard=lc->sound_conf.lsd_card ?
 			lc->sound_conf.lsd_card : lc->sound_conf.play_sndcard;
 		captcard=lc->sound_conf.capt_sndcard;
 		playfile=lc->play_file;
 		recfile=lc->rec_file;
 		call->audio_profile=make_profile(call,call->resultdesc,stream,&used_pt);
-
+		
 		if (used_pt!=-1){
 			call->current_params->audio_codec = rtp_profile_get_payload(call->audio_profile, used_pt);
 			if (playcard==NULL) {
@@ -2308,7 +2317,7 @@ static void linphone_call_start_audio_stream(LinphoneCall *call, bool_t muted, b
 			 when placed in recvonly or sendonly mode*/
 			if (stream->rtp_port==0
 					|| stream->dir==SalStreamRecvOnly
-					|| (stream->multicast_role == SalMulticastRoleReceiver && ms_is_multicast(stream->rtp_addr))){
+					|| (stream->multicast_role == SalMulticastRoleReceiver && is_multicast)){
 				captcard=NULL;
 				playfile=NULL;
 			}else if (stream->dir==SalStreamSendOnly){
@@ -2364,16 +2373,16 @@ static void linphone_call_start_audio_stream(LinphoneCall *call, bool_t muted, b
 				}
 			}
 			configure_rtp_session_for_rtcp_xr(lc, call, SalAudio);
-			if (ms_is_multicast(stream->rtp_addr))
+			if (is_multicast)
 				rtp_session_set_multicast_ttl(call->audiostream->ms.sessions.rtp_session,stream->ttl);
-
+			
 			audio_stream_start_full(
 				call->audiostream,
 				call->audio_profile,
-				stream->rtp_addr[0]!='\0' ? stream->rtp_addr : call->resultdesc->addr,
+				rtp_addr,
 				stream->rtp_port,
 				stream->rtcp_addr[0]!='\0' ? stream->rtcp_addr : call->resultdesc->addr,
-				(linphone_core_rtcp_enabled(lc) && !ms_is_multicast(stream->rtp_addr)) ? (stream->rtcp_port ? stream->rtcp_port : stream->rtp_port+1) : 0,
+				(linphone_core_rtcp_enabled(lc) && !is_multicast) ? (stream->rtcp_port ? stream->rtcp_port : stream->rtp_port+1) : 0,
 				used_pt,
 				linphone_core_get_audio_jittcomp(lc),
 				playfile,
@@ -2425,7 +2434,7 @@ static void linphone_call_start_video_stream(LinphoneCall *call, bool_t all_inpu
 		const char *rtp_addr=vstream->rtp_addr[0]!='\0' ? vstream->rtp_addr : call->resultdesc->addr;
 		const char *rtcp_addr=vstream->rtcp_addr[0]!='\0' ? vstream->rtcp_addr : call->resultdesc->addr;
 		const SalStreamDescription *local_st_desc=sal_media_description_find_stream(call->localdesc,vstream->proto,SalVideo);
-
+		bool_t is_multicast=ms_is_multicast(rtp_addr);
 		call->video_profile=make_profile(call,call->resultdesc,vstream,&used_pt);
 
 		if (used_pt!=-1){
@@ -2454,7 +2463,7 @@ static void linphone_call_start_video_stream(LinphoneCall *call, bool_t all_inpu
 				video_stream_set_native_preview_window_id (call->videostream,lc->preview_window_id);
 			video_stream_use_preview_video_window (call->videostream,lc->use_preview_window);
 
-			if (ms_is_multicast(vstream->rtp_addr)){
+			if (is_multicast){
 				if (vstream->multicast_role == SalMulticastRoleReceiver)
 					dir=VideoStreamRecvOnly;
 				else
@@ -2497,7 +2506,7 @@ static void linphone_call_start_video_stream(LinphoneCall *call, bool_t all_inpu
 				ms_message("%s lc rotation:%d\n", __FUNCTION__, lc->device_rotation);
 				video_stream_set_device_rotation(call->videostream, lc->device_rotation);
 				video_stream_set_freeze_on_error(call->videostream, lp_config_get_int(lc->config, "video", "freeze_on_error", 0));
-				if (ms_is_multicast(vstream->rtp_addr))
+				if (is_multicast)
 					rtp_session_set_multicast_ttl(call->videostream->ms.sessions.rtp_session,vstream->ttl);
 
 				if( lc->video_conf.reuse_preview_source && source ){
@@ -2512,7 +2521,7 @@ static void linphone_call_start_video_stream(LinphoneCall *call, bool_t all_inpu
 					video_stream_start(call->videostream,
 									   call->video_profile, rtp_addr, vstream->rtp_port,
 									   rtcp_addr,
-									   (linphone_core_rtcp_enabled(lc) && !ms_is_multicast(vstream->rtp_addr))  ? (vstream->rtcp_port ? vstream->rtcp_port : vstream->rtp_port+1) : 0,
+									   (linphone_core_rtcp_enabled(lc) && !is_multicast)  ? (vstream->rtcp_port ? vstream->rtcp_port : vstream->rtp_port+1) : 0,
 									   used_pt, linphone_core_get_video_jittcomp(lc), cam);
 				}
 			}
diff --git a/coreapi/offeranswer.c b/coreapi/offeranswer.c
index 4c7147db4..b3fde6b3c 100644
--- a/coreapi/offeranswer.c
+++ b/coreapi/offeranswer.c
@@ -307,7 +307,7 @@ static void initiate_outgoing(const SalStreamDescription *local_offer,
 	result->proto=remote_answer->proto;
 	result->type=local_offer->type;
 
-	if (ms_is_multicast(local_offer->rtp_addr)) {
+	if (local_offer->rtp_addr[0]!='\0' && ms_is_multicast(local_offer->rtp_addr)) {
 		/*6.2 Multicast Streams
 		...
 	   If a multicast stream is accepted, the address and port information
@@ -408,7 +408,7 @@ static void initiate_incoming(const SalStreamDescription *local_cap,
 		result->rtp_port=0;
 		return;
 	}
-	if (ms_is_multicast(remote_offer->rtp_addr)) {
+	if (remote_offer->rtp_addr[0]!='\0' && ms_is_multicast(remote_offer->rtp_addr)) {
 		if (sal_stream_description_has_srtp(result) == TRUE) {
 			ms_message("SAVP not supported for multicast address for remote stream [%p]",remote_offer);
 			result->rtp_port=0;
diff --git a/coreapi/private.h b/coreapi/private.h
index f5b378008..9abdd9ee6 100644
--- a/coreapi/private.h
+++ b/coreapi/private.h
@@ -202,6 +202,7 @@ typedef struct StunCandidate{
 
 
 typedef struct _PortConfig{
+	char multicast_ip[LINPHONE_IPADDR_SIZE];
 	int rtp_port;
 	int rtcp_port;
 }PortConfig;
@@ -223,8 +224,6 @@ struct _LinphoneCall{
 	SalOp *op;
 	SalOp *ping_op;
 	char localip[LINPHONE_IPADDR_SIZE]; /* our best guess for local ipaddress for this call */
-	char local_audio_ip[LINPHONE_IPADDR_SIZE]; /* our best guess for local ipaddress for this call or what proposed in sdp in case of multicast*/
-	char local_video_ip[LINPHONE_IPADDR_SIZE]; /* our best guess for local ipaddress for this call or what proposed in sdp in case of multicast*/
 	LinphoneCallState state;
 	LinphoneCallState prevstate;
 	LinphoneCallState transfer_state; /*idle if no transfer*/

From 7798932b93a04fe0b190824a0120f463f8ff6344 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Thu, 5 Feb 2015 01:16:05 +0100
Subject: [PATCH 348/496] fix to previous commit: a real local interface must
 be decided and bound to to send multicast. For unicast calls, continue to
 bind to 0.0.0.0 as we need it for multi-homed environments.

---
 coreapi/linphonecall.c | 57 ++++++++++++++++++++++++++++--------------
 coreapi/offeranswer.c  |  4 +--
 include/sal/sal.h      |  6 ++---
 3 files changed, 43 insertions(+), 24 deletions(-)

diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index 713dd9f44..226b9e9b9 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -541,11 +541,26 @@ static void transfer_already_assigned_payload_types(SalMediaDescription *old, Sa
 static const char *linphone_call_get_bind_ip_for_stream(LinphoneCall *call, int stream_index){
 	const char *bind_ip=call->af==AF_INET6 ? "::0" : "0.0.0.0";
 	
-	if (stream_index<2 && call->media_ports[stream_index].multicast_ip[0]!='\0') 
-		bind_ip=call->media_ports[stream_index].multicast_ip;
+	if (stream_index<2 && call->media_ports[stream_index].multicast_ip[0]!='\0'){
+		if (call->dir==LinphoneCallOutgoing){
+			 /*as multicast sender, we must decide a local interface to use to send multicast, and bind to it*/
+			bind_ip=call->localip;
+		}else{
+			/*as receiver, just bind to the multicast address*/
+			bind_ip=call->media_ports[stream_index].multicast_ip;
+		}
+	}
 	return bind_ip;
 }
 
+static const char *linphone_call_get_public_ip_for_stream(LinphoneCall *call, int stream_index){
+	const char *public_ip=call->localip;
+	
+	if (stream_index<2 && call->media_ports[stream_index].multicast_ip[0]!='\0') 
+		public_ip=call->media_ports[stream_index].multicast_ip;
+	return public_ip;
+}
+
 void linphone_call_make_local_media_description(LinphoneCore *lc, LinphoneCall *call){
 	MSList *l;
 	SalMediaDescription *old_md=call->localdesc;
@@ -554,26 +569,19 @@ void linphone_call_make_local_media_description(LinphoneCore *lc, LinphoneCall *
 	const char *me;
 	SalMediaDescription *md=sal_media_description_new();
 	LinphoneAddress *addr;
-	const char* local_audio_ip;
-	const char* local_video_ip;
 	const char *subject;
 	CodecConstraints codec_hints={0};
 	
 	/*multicast is only set in case of outgoing call*/
 	if (call->dir == LinphoneCallOutgoing && linphone_core_audio_multicast_enabled(lc)) {
-		local_audio_ip=linphone_core_get_audio_multicast_addr(lc);
 		md->streams[0].ttl=linphone_core_get_audio_multicast_ttl(lc);
-		md->streams[0].multicast_role = SalMulticastRoleSender;
-	} else
-		local_audio_ip=call->localip;
+		md->streams[0].multicast_role = SalMulticastSender;
+	}
 
 	if (call->dir == LinphoneCallOutgoing && linphone_core_video_multicast_enabled(lc)) {
-		local_video_ip=linphone_core_get_video_multicast_addr(lc);
 		md->streams[1].ttl=linphone_core_get_video_multicast_ttl(lc);
-		md->streams[1].multicast_role = SalMulticastRoleSender;
-	}else
-		local_video_ip=call->localip;
-
+		md->streams[1].multicast_role = SalMulticastSender;
+	}
 
 	subject=linphone_call_params_get_session_name(call->params);
 
@@ -598,8 +606,8 @@ void linphone_call_make_local_media_description(LinphoneCore *lc, LinphoneCall *
 	else md->bandwidth=linphone_core_get_download_bandwidth(lc);
 
 	/*set audio capabilities */
-	strncpy(md->streams[0].rtp_addr,local_audio_ip,sizeof(md->streams[0].rtp_addr));
-	strncpy(md->streams[0].rtcp_addr,local_audio_ip,sizeof(md->streams[0].rtcp_addr));
+	strncpy(md->streams[0].rtp_addr,linphone_call_get_public_ip_for_stream(call,0),sizeof(md->streams[0].rtp_addr));
+	strncpy(md->streams[0].rtcp_addr,linphone_call_get_public_ip_for_stream(call,0),sizeof(md->streams[0].rtcp_addr));
 	strncpy(md->streams[0].name,"Audio",sizeof(md->streams[0].name)-1);
 	md->streams[0].rtp_port=call->media_ports[0].rtp_port;
 	md->streams[0].rtcp_port=call->media_ports[0].rtcp_port;
@@ -626,8 +634,8 @@ void linphone_call_make_local_media_description(LinphoneCore *lc, LinphoneCall *
 	nb_active_streams++;
 
 	if (call->params->has_video){
-		strncpy(md->streams[1].rtp_addr,local_video_ip,sizeof(md->streams[1].rtp_addr));
-		strncpy(md->streams[1].rtcp_addr,local_video_ip,sizeof(md->streams[1].rtcp_addr));
+		strncpy(md->streams[1].rtp_addr,linphone_call_get_public_ip_for_stream(call,1),sizeof(md->streams[1].rtp_addr));
+		strncpy(md->streams[1].rtcp_addr,linphone_call_get_public_ip_for_stream(call,1),sizeof(md->streams[1].rtcp_addr));
 		strncpy(md->streams[1].name,"Video",sizeof(md->streams[1].name)-1);
 		md->streams[1].rtp_port=call->media_ports[1].rtp_port;
 		md->streams[1].rtcp_port=call->media_ports[1].rtcp_port;
@@ -788,6 +796,17 @@ static void linphone_call_init_common(LinphoneCall *call, LinphoneAddress *from,
 
 	linphone_core_get_video_port_range(call->core, &min_port, &max_port);
 	port_config_set(call,1,min_port,max_port);
+	
+	if (call->dir==LinphoneCallOutgoing){
+		if ( linphone_core_audio_multicast_enabled(call->core)){
+			strncpy(call->media_ports[0].multicast_ip,
+				linphone_core_get_audio_multicast_addr(call->core), sizeof(call->media_ports[0].multicast_ip));
+		}
+		if ( linphone_core_video_multicast_enabled(call->core)){
+			strncpy(call->media_ports[1].multicast_ip,
+				linphone_core_get_video_multicast_addr(call->core), sizeof(call->media_ports[1].multicast_ip));
+		}
+	}
 
 	linphone_call_init_stats(&call->stats[LINPHONE_CALL_STATS_AUDIO], LINPHONE_CALL_STATS_AUDIO);
 	linphone_call_init_stats(&call->stats[LINPHONE_CALL_STATS_VIDEO], LINPHONE_CALL_STATS_VIDEO);
@@ -2317,7 +2336,7 @@ static void linphone_call_start_audio_stream(LinphoneCall *call, bool_t muted, b
 			 when placed in recvonly or sendonly mode*/
 			if (stream->rtp_port==0
 					|| stream->dir==SalStreamRecvOnly
-					|| (stream->multicast_role == SalMulticastRoleReceiver && is_multicast)){
+					|| (stream->multicast_role == SalMulticastReceiver && is_multicast)){
 				captcard=NULL;
 				playfile=NULL;
 			}else if (stream->dir==SalStreamSendOnly){
@@ -2464,7 +2483,7 @@ static void linphone_call_start_video_stream(LinphoneCall *call, bool_t all_inpu
 			video_stream_use_preview_video_window (call->videostream,lc->use_preview_window);
 
 			if (is_multicast){
-				if (vstream->multicast_role == SalMulticastRoleReceiver)
+				if (vstream->multicast_role == SalMulticastReceiver)
 					dir=VideoStreamRecvOnly;
 				else
 					dir=VideoStreamSendOnly;
diff --git a/coreapi/offeranswer.c b/coreapi/offeranswer.c
index b3fde6b3c..9baedd158 100644
--- a/coreapi/offeranswer.c
+++ b/coreapi/offeranswer.c
@@ -367,7 +367,7 @@ static void initiate_outgoing(const SalStreamDescription *local_offer,
 	   }
 	  result->ttl=local_offer->ttl;
 	  result->dir=local_offer->dir;
-	  result->multicast_role = SalMulticastRoleSender;
+	  result->multicast_role = SalMulticastSender;
 
 	} else {
 		result->dir=compute_dir_outgoing(local_offer->dir,remote_answer->dir);
@@ -423,7 +423,7 @@ static void initiate_incoming(const SalStreamDescription *local_cap,
 		result->bandwidth=remote_offer->bandwidth;
 		result->ptime=remote_offer->ptime;
 		result->ttl=remote_offer->ttl;
-		result->multicast_role = SalMulticastRoleReceiver;
+		result->multicast_role = SalMulticastReceiver;
 	} else {
 		strcpy(result->rtp_addr,local_cap->rtp_addr);
 		strcpy(result->rtcp_addr,local_cap->rtcp_addr);
diff --git a/include/sal/sal.h b/include/sal/sal.h
index 75400d4de..666671674 100644
--- a/include/sal/sal.h
+++ b/include/sal/sal.h
@@ -197,9 +197,9 @@ typedef enum {
 } SalDtlsRole;
 
 typedef enum {
-	SalMulticastInative=0,
-	SalMulticastRoleSender,
-	SalMulticastRoleReceiver,
+	SalMulticastInactive=0,
+	SalMulticastSender,
+	SalMulticastReceiver,
 	SalMulticastSenderReceiver
 } SalMulticastRole;
 

From cc5928e7bba273e479bf4311d1def1909c42f450 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Thu, 5 Feb 2015 01:20:14 +0100
Subject: [PATCH 349/496] update ms2

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index bf2d8b08e..034131e3b 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit bf2d8b08ec0200175580ce94404e52dae266bf69
+Subproject commit 034131e3b566438df8445ca7f97c19f3c3774f28

From ee1c644b5b3a73c43fc1b6470dfd1440d9b97366 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Thu, 5 Feb 2015 01:41:32 +0100
Subject: [PATCH 350/496] update ortp

---
 oRTP | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/oRTP b/oRTP
index 327cec466..d7b7f8af7 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 327cec466a5d39e716664325ae6d604e228b3fed
+Subproject commit d7b7f8af70c7a40c55f6b026833b21e177c88eea

From 8f3844b4b62f3c6af6f7471a01343e8056f8cc03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
 <francois.grisez@belledonne-communications.com>
Date: Thu, 5 Feb 2015 10:24:16 +0100
Subject: [PATCH 351/496] Fix an invalid read in the "Call/Call with custom
 header" test

---
 tester/call_tester.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tester/call_tester.c b/tester/call_tester.c
index 6a134c728..52dd68da1 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -1110,7 +1110,7 @@ static void call_with_custom_headers(void) {
 	pauline_remote_contact_header = ms_strdup(linphone_call_params_get_custom_header(linphone_call_get_remote_params(call_pauline), "Contact"));
 
 	marie_remote_contact        = ms_strdup(linphone_call_get_remote_contact(call_marie));
-	marie_remote_contact_header = ms_strdup(linphone_call_params_get_custom_header(marie_remote_params, "Contact"));
+	marie_remote_contact_header = ms_strdup(linphone_call_params_get_custom_header(linphone_call_get_remote_params(call_marie), "Contact"));
 
 	CU_ASSERT_PTR_NOT_NULL(pauline_remote_contact);
 	CU_ASSERT_PTR_NOT_NULL(pauline_remote_contact_header);

From 485c8678f6c2dabd569329cb0e946cff631769e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
 <francois.grisez@belledonne-communications.com>
Date: Thu, 5 Feb 2015 13:28:30 +0100
Subject: [PATCH 352/496] Fix bad initialization order of GTK+

---
 tester/liblinphone_tester.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tester/liblinphone_tester.c b/tester/liblinphone_tester.c
index fbba48218..23b5a8652 100644
--- a/tester/liblinphone_tester.c
+++ b/tester/liblinphone_tester.c
@@ -172,8 +172,8 @@ int main (int argc, char *argv[])
 	FILE* log_file=NULL;
 
 #ifdef HAVE_GTK
-	gdk_threads_init();
 	gtk_init(&argc, &argv);
+	gdk_threads_init();
 #endif
 
 #if defined(ANDROID)

From 10ebac867d4e6e811eab1bd66670da2932767193 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Thu, 5 Feb 2015 14:33:44 +0100
Subject: [PATCH 353/496] fix function that searches soundcard

---
 coreapi/linphonecore.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 5d567fdee..5f0a6b5e0 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -4411,15 +4411,13 @@ static MSSndCard *get_card_from_string_id(const char *devid, unsigned int cap){
 		}
 	}
 	if (sndcard==NULL) {
-		/* get a card that has read+write capabilities */
-		sndcard=ms_snd_card_manager_get_default_card(ms_snd_card_manager_get());
-		/* otherwise refine to the first card having the right capability*/
-		if (sndcard==NULL){
-			const MSList *elem=ms_snd_card_manager_get_list(ms_snd_card_manager_get());
-			for(;elem!=NULL;elem=elem->next){
-				sndcard=(MSSndCard*)elem->data;
-				if (ms_snd_card_get_capabilities(sndcard) & cap) break;
-			}
+		if ((cap & MS_SND_CARD_CAP_CAPTURE) && (cap & MS_SND_CARD_CAP_PLAYBACK)){
+			sndcard=ms_snd_card_manager_get_default_card(ms_snd_card_manager_get());
+		}else if (cap & MS_SND_CARD_CAP_CAPTURE){
+			sndcard=ms_snd_card_manager_get_default_capture_card(ms_snd_card_manager_get());
+		}
+		else if (cap & MS_SND_CARD_CAP_PLAYBACK){
+			sndcard=ms_snd_card_manager_get_default_playback_card(ms_snd_card_manager_get());
 		}
 		if (sndcard==NULL){/*looks like a bug! take the first one !*/
 			const MSList *elem=ms_snd_card_manager_get_list(ms_snd_card_manager_get());

From 2b7f2fd1cb82b2c36014f03914f02e3325990da4 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Thu, 5 Feb 2015 14:40:20 +0100
Subject: [PATCH 354/496] Finilize multicast api java binding

---
 build/android/liblinphone_tester.mk           |  3 +-
 coreapi/linphonecore_jni.cc                   | 50 ++++++++-----------
 .../org/linphone/core/LinphoneCoreImpl.java   |  4 +-
 3 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/build/android/liblinphone_tester.mk b/build/android/liblinphone_tester.mk
index d92bb60b5..9f1ab7408 100644
--- a/build/android/liblinphone_tester.mk
+++ b/build/android/liblinphone_tester.mk
@@ -19,7 +19,8 @@ common_SRC_FILES := \
 	player_tester.c \
 	dtmf_tester.c \
 	accountmanager.c \
-	offeranswer_tester.c
+	offeranswer_tester.c \
+ 	multicast_call_tester.c
 
 common_C_INCLUDES += \
         $(LOCAL_PATH) \
diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index d093a3e30..7c5736705 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -5631,9 +5631,9 @@ extern "C" jint JNICALL Java_org_linphone_core_LinphoneCoreImpl_setVideoMulticas
  * Signature: (J)Ljava/lang/String;
  */
 extern "C" jstring JNICALL Java_org_linphone_core_LinphoneCoreImpl_getAudioMulticastAddr
-  (JNIEnv *, jobject, jlong) {
-	ms_error("Java_org_linphone_core_LinphoneCoreImpl_getAudioMulticastAddr not implemented yet");
-	return NULL;
+  (JNIEnv *env , jobject, jlong ptr) {
+	const char *tmp=linphone_core_get_audio_multicast_addr((LinphoneCore*)ptr);
+	return tmp ? env->NewStringUTF(tmp) : NULL;
 }
 
 /*
@@ -5642,9 +5642,9 @@ extern "C" jstring JNICALL Java_org_linphone_core_LinphoneCoreImpl_getAudioMulti
  * Signature: (J)Ljava/lang/String;
  */
 extern "C" jstring JNICALL Java_org_linphone_core_LinphoneCoreImpl_getVideoMulticastAddr
-  (JNIEnv *, jobject, jlong) {
-	ms_error("Java_org_linphone_core_LinphoneCoreImpl_getVideoMulticastAddr not implemented yet");
-	return NULL;
+  (JNIEnv * env, jobject, jlong ptr) {
+	const char *tmp=linphone_core_get_video_multicast_addr((LinphoneCore*)ptr);
+	return tmp ? env->NewStringUTF(tmp) : NULL;
 }
 
 /*
@@ -5653,9 +5653,8 @@ extern "C" jstring JNICALL Java_org_linphone_core_LinphoneCoreImpl_getVideoMulti
  * Signature: (JI)I
  */
 extern "C" jint JNICALL Java_org_linphone_core_LinphoneCoreImpl_setAudioMulticastTtl
-  (JNIEnv *, jobject, jlong, jint) {
-	ms_error("Java_org_linphone_core_LinphoneCoreImpl_setAudioMulticastTtl not implemented yet");
-	return -1;
+  (JNIEnv *, jobject, jlong ptr, jint value) {
+	return linphone_core_set_audio_multicast_ttl((LinphoneCore*)ptr,value);
 }
 
 /*
@@ -5664,9 +5663,8 @@ extern "C" jint JNICALL Java_org_linphone_core_LinphoneCoreImpl_setAudioMulticas
  * Signature: (JI)I
  */
 extern "C" jint JNICALL Java_org_linphone_core_LinphoneCoreImpl_setVideoMulticastTtl
-  (JNIEnv *, jobject, jlong, jint) {
-	ms_error("Java_org_linphone_core_LinphoneCoreImpl_setVideoMulticastTtl not implemented yet");
-	return -1;
+  (JNIEnv *, jobject, jlong ptr, jint value) {
+	return linphone_core_set_video_multicast_ttl((LinphoneCore*)ptr,value);
 }
 
 /*
@@ -5675,9 +5673,8 @@ extern "C" jint JNICALL Java_org_linphone_core_LinphoneCoreImpl_setVideoMulticas
  * Signature: (J)I
  */
 extern "C" jint JNICALL Java_org_linphone_core_LinphoneCoreImpl_getAudioMulticastTtl
-  (JNIEnv *, jobject, jlong) {
-	ms_error("Java_org_linphone_core_LinphoneCoreImpl_getAudioMulticastTtl not implemented yet");
-	return -1;
+  (JNIEnv *, jobject, jlong ptr) {
+	return linphone_core_get_audio_multicast_ttl((LinphoneCore*)ptr);
 }
 
 /*
@@ -5686,9 +5683,8 @@ extern "C" jint JNICALL Java_org_linphone_core_LinphoneCoreImpl_getAudioMulticas
  * Signature: (J)I
  */
 extern "C" jint JNICALL Java_org_linphone_core_LinphoneCoreImpl_getVideoMulticastTtl
-  (JNIEnv *, jobject, jlong) {
-	ms_error("Java_org_linphone_core_LinphoneCoreImpl_getVideoMulticastTtl not implemented yet");
-	return -1;
+  (JNIEnv *, jobject, jlong ptr) {
+	return linphone_core_get_video_multicast_ttl((LinphoneCore*)ptr);
 }
 
 /*
@@ -5697,8 +5693,8 @@ extern "C" jint JNICALL Java_org_linphone_core_LinphoneCoreImpl_getVideoMulticas
  * Signature: (JZ)V
  */
 extern "C" void JNICALL Java_org_linphone_core_LinphoneCoreImpl_enableAudioMulticast
-  (JNIEnv *, jobject, jlong, jboolean) {
-	ms_error("Java_org_linphone_core_LinphoneCoreImpl_enableAudioMulticast not implemented yet");
+  (JNIEnv *, jobject, jlong ptr, jboolean yesno) {
+	return linphone_core_enable_audio_multicast((LinphoneCore*)ptr,yesno);
 }
 
 /*
@@ -5707,9 +5703,8 @@ extern "C" void JNICALL Java_org_linphone_core_LinphoneCoreImpl_enableAudioMulti
  * Signature: (J)Z
  */
 extern "C" jboolean JNICALL Java_org_linphone_core_LinphoneCoreImpl_audioMulticastEnabled
-  (JNIEnv *, jobject, jlong) {
-	ms_error("Java_org_linphone_core_LinphoneCoreImpl_audioMulticastEnabled not implemented yet");
-	return false;
+  (JNIEnv *, jobject, jlong ptr) {
+	return linphone_core_audio_multicast_enabled((LinphoneCore*)ptr);
 }
 
 /*
@@ -5718,8 +5713,8 @@ extern "C" jboolean JNICALL Java_org_linphone_core_LinphoneCoreImpl_audioMultica
  * Signature: (JZ)V
  */
 extern "C" void JNICALL Java_org_linphone_core_LinphoneCoreImpl_enableVideoMulticast
-  (JNIEnv *, jobject, jlong, jboolean) {
-	ms_error("Java_org_linphone_core_LinphoneCoreImpl_enableVideoMulticast not implemented yet");
+  (JNIEnv *, jobject, jlong ptr, jboolean yesno) {
+	return linphone_core_enable_video_multicast((LinphoneCore*)ptr,yesno);
 }
 
 /*
@@ -5728,9 +5723,8 @@ extern "C" void JNICALL Java_org_linphone_core_LinphoneCoreImpl_enableVideoMulti
  * Signature: (J)Z
  */
 extern "C" jboolean JNICALL Java_org_linphone_core_LinphoneCoreImpl_videoMulticastEnabled
-  (JNIEnv *, jobject, jlong) {
-	ms_error("Java_org_linphone_core_LinphoneCoreImpl_videoMulticastEnabled not implemented yet");
-	return false;
+  (JNIEnv *, jobject, jlong ptr) {
+	return linphone_core_video_multicast_enabled((LinphoneCore*)ptr);
 }
 
 
diff --git a/java/impl/org/linphone/core/LinphoneCoreImpl.java b/java/impl/org/linphone/core/LinphoneCoreImpl.java
index 11f62619c..fd1796102 100644
--- a/java/impl/org/linphone/core/LinphoneCoreImpl.java
+++ b/java/impl/org/linphone/core/LinphoneCoreImpl.java
@@ -1381,12 +1381,12 @@ public class LinphoneCoreImpl implements LinphoneCore {
 	private native String getAudioMulticastAddr(long ptr);
 	@Override
 	public String getAudioMulticastAddr() {
-		return getAudioMulticastAddr() ;
+		return getAudioMulticastAddr(nativePtr) ;
 	}
 	private native String getVideoMulticastAddr(long ptr);
 	@Override
 	public String getVideoMulticastAddr() {
-		return getVideoMulticastAddr();
+		return getVideoMulticastAddr(nativePtr);
 	}
 	private native int setAudioMulticastTtl(long ptr,int ttl);
 	@Override

From 1d080cb1f5ed4eceb311f5bbc33f0c16ebde9ea2 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Thu, 5 Feb 2015 17:54:03 +0100
Subject: [PATCH 355/496] Add default_max_bandwidth parameter and apply it to
 video when no bandwidth is specified in the signalling.

---
 coreapi/linphonecall.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index 226b9e9b9..ec0dd70b6 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -2175,6 +2175,8 @@ static int get_video_bw(LinphoneCall *call, const SalMediaDescription *md, const
 	else if (md->bandwidth>0) {
 		/*case where b=AS is given globally, not per stream*/
 		remote_bw=get_remaining_bandwidth_for_video(md->bandwidth,call->audio_bw);
+	} else {
+		remote_bw = lp_config_get_int(call->core->config, "net", "default_max_bandwidth", 1500);
 	}
 	bw=get_min_bandwidth(get_remaining_bandwidth_for_video(linphone_core_get_upload_bandwidth(call->core),call->audio_bw),remote_bw);
 	return bw;

From ad5e0316f677934ed6ef6111c98417cecfb52882 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Thu, 5 Feb 2015 19:11:26 +0100
Subject: [PATCH 356/496] Add early-media call to the video tester.

---
 tester/liblinphone_tester.h |   2 +
 tester/video_tester.c       | 151 ++++++++++++++++++++++++++----------
 2 files changed, 111 insertions(+), 42 deletions(-)

diff --git a/tester/liblinphone_tester.h b/tester/liblinphone_tester.h
index 9dbb63a9a..22dbcd6f6 100644
--- a/tester/liblinphone_tester.h
+++ b/tester/liblinphone_tester.h
@@ -239,6 +239,8 @@ typedef struct _stats {
 	int number_of_rtcp_sent;
 	int number_of_rtcp_received;
 
+	int number_of_video_windows_created;
+
 }stats;
 
 typedef struct _LinphoneCoreManager {
diff --git a/tester/video_tester.c b/tester/video_tester.c
index c9f3771ee..37848b542 100644
--- a/tester/video_tester.c
+++ b/tester/video_tester.c
@@ -51,13 +51,20 @@ static unsigned long get_native_handle(GdkWindow *gdkw) {
 	return 0;
 }
 
-static GtkWidget *create_video_window(LinphoneCall *call) {
+static GtkWidget *create_video_window(LinphoneCall *call, LinphoneCallState cstate) {
 	GtkWidget *video_window;
 	GdkDisplay *display;
 	GdkColor color;
 	MSVideoSize vsize = MS_VIDEO_SIZE_CIF;
-	
+	const char *cstate_str;
+	char *title;
+	stats* counters = get_stats(call->core);
+
+	cstate_str = linphone_call_state_to_string(cstate);
+	title = g_strdup_printf("%s", cstate_str);
 	video_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+	gtk_window_set_title(GTK_WINDOW(video_window), title);
+	g_free(title);
 	gtk_window_resize(GTK_WINDOW(video_window), vsize.width, vsize.height);
 	gdk_color_parse("black", &color);
 	gtk_widget_modify_bg(video_window, GTK_STATE_NORMAL, &color);
@@ -69,13 +76,14 @@ static GtkWidget *create_video_window(LinphoneCall *call) {
 	display = gdk_drawable_get_display(gtk_widget_get_window(video_window));
 #endif
 	gdk_display_flush(display);
+	counters->number_of_video_windows_created++;
 	return video_window;
 }
 
-static void show_video_window(LinphoneCall *call) {
+static void show_video_window(LinphoneCall *call, LinphoneCallState cstate) {
 	GtkWidget *video_window = (GtkWidget *)linphone_call_get_user_data(call);
 	if (video_window == NULL) {
-		video_window = create_video_window(call);
+		video_window = create_video_window(call, cstate);
 		linphone_call_set_user_data(call, video_window);
 		linphone_call_set_native_video_window_id(call, get_native_handle(gtk_widget_get_window(video_window)));
 	}
@@ -92,8 +100,10 @@ static void hide_video_video(LinphoneCall *call) {
 
 static void video_call_state_changed(LinphoneCore *lc, LinphoneCall *call, LinphoneCallState cstate, const char *msg) {
 	switch (cstate) {
+		case LinphoneCallIncomingEarlyMedia:
+		case LinphoneCallOutgoingEarlyMedia:
 		case LinphoneCallConnected:
-			show_video_window(call);
+			show_video_window(call, cstate);
 			break;
 		case LinphoneCallEnd:
 			hide_video_video(call);
@@ -103,18 +113,45 @@ static void video_call_state_changed(LinphoneCore *lc, LinphoneCall *call, Linph
 	}
 }
 
-static bool_t video_call_with_params(LinphoneCoreManager* caller_mgr, LinphoneCoreManager* callee_mgr, const LinphoneCallParams *caller_params, const LinphoneCallParams *callee_params) {
+static void early_media_video_call_state_changed(LinphoneCore *lc, LinphoneCall *call, LinphoneCallState cstate, const char *msg) {
+	LinphoneCallParams *params;
+
+	video_call_state_changed(lc, call, cstate, msg);
+	switch (cstate) {
+		case LinphoneCallIncomingReceived:
+			params = linphone_core_create_default_call_parameters(lc);
+			linphone_call_params_enable_video(params, TRUE);
+			linphone_core_accept_early_media_with_params(lc, call, params);
+			linphone_call_params_unref(params);
+			break;
+		default:
+			break;
+	}
+}
+
+bool_t wait_for_three_cores(LinphoneCore *lc1, LinphoneCore *lc2, LinphoneCore *lc3, int timeout) {
+	MSList *lcs = NULL;
+	bool_t result;
+	int dummy = 0;
+	if (lc1) lcs = ms_list_append(lcs, lc1);
+	if (lc2) lcs = ms_list_append(lcs, lc2);
+	if (lc3) lcs = ms_list_append(lcs, lc3);
+	result = wait_for_list(lcs, &dummy, 1, timeout);
+	ms_list_free(lcs);
+	return result;
+}
+
+static bool_t video_call_with_params(LinphoneCoreManager* caller_mgr, LinphoneCoreManager* callee_mgr, const LinphoneCallParams *caller_params, const LinphoneCallParams *callee_params, bool_t automatically_accept) {
 	int retry = 0;
 	stats initial_caller = caller_mgr->stat;
 	stats initial_callee = callee_mgr->stat;
-	bool_t result = FALSE;
+	bool_t result = TRUE;
 	bool_t did_received_call;
 
 	CU_ASSERT_PTR_NOT_NULL(linphone_core_invite_address_with_params(caller_mgr->lc, callee_mgr->identity, caller_params));
 	did_received_call = wait_for(callee_mgr->lc, caller_mgr->lc, &callee_mgr->stat.number_of_LinphoneCallIncomingReceived, initial_callee.number_of_LinphoneCallIncomingReceived + 1);
 	if (!did_received_call) return 0;
 
-	CU_ASSERT_TRUE(linphone_core_inc_invite_pending(callee_mgr->lc));
 	CU_ASSERT_EQUAL(caller_mgr->stat.number_of_LinphoneCallOutgoingProgress, initial_caller.number_of_LinphoneCallOutgoingProgress + 1);
 
 	while (caller_mgr->stat.number_of_LinphoneCallOutgoingRinging != (initial_caller.number_of_LinphoneCallOutgoingRinging + 1)
@@ -133,61 +170,91 @@ static bool_t video_call_with_params(LinphoneCoreManager* caller_mgr, LinphoneCo
 		return 0;
 	}
 
-	linphone_core_accept_call_with_params(callee_mgr->lc, linphone_core_get_current_call(callee_mgr->lc), callee_params);
+	if (automatically_accept == TRUE) {
+		linphone_core_accept_call_with_params(callee_mgr->lc, linphone_core_get_current_call(callee_mgr->lc), callee_params);
 
-	CU_ASSERT_TRUE(wait_for(callee_mgr->lc, caller_mgr->lc, &callee_mgr->stat.number_of_LinphoneCallConnected, initial_callee.number_of_LinphoneCallConnected + 1));
-	CU_ASSERT_TRUE(wait_for(callee_mgr->lc, caller_mgr->lc, &caller_mgr->stat.number_of_LinphoneCallConnected, initial_callee.number_of_LinphoneCallConnected + 1));
-	result = wait_for(callee_mgr->lc, caller_mgr->lc, &caller_mgr->stat.number_of_LinphoneCallStreamsRunning, initial_caller.number_of_LinphoneCallStreamsRunning + 1)
-		&& wait_for(callee_mgr->lc, caller_mgr->lc, &callee_mgr->stat.number_of_LinphoneCallStreamsRunning, initial_callee.number_of_LinphoneCallStreamsRunning + 1);
+		CU_ASSERT_TRUE(wait_for(callee_mgr->lc, caller_mgr->lc, &callee_mgr->stat.number_of_LinphoneCallConnected, initial_callee.number_of_LinphoneCallConnected + 1));
+		CU_ASSERT_TRUE(wait_for(callee_mgr->lc, caller_mgr->lc, &caller_mgr->stat.number_of_LinphoneCallConnected, initial_callee.number_of_LinphoneCallConnected + 1));
+		result = wait_for(callee_mgr->lc, caller_mgr->lc, &caller_mgr->stat.number_of_LinphoneCallStreamsRunning, initial_caller.number_of_LinphoneCallStreamsRunning + 1)
+			&& wait_for(callee_mgr->lc, caller_mgr->lc, &callee_mgr->stat.number_of_LinphoneCallStreamsRunning, initial_callee.number_of_LinphoneCallStreamsRunning + 1);
+	}
 	return result;
 }
 
+static LinphoneCallParams * _configure_for_video(LinphoneCoreManager *manager, LinphoneCoreCallStateChangedCb cb) {
+	LinphoneCallParams *params;
+	LinphoneCoreVTable *vtable = linphone_core_v_table_new();
+	vtable->call_state_changed = cb;
+	linphone_core_add_listener(manager->lc, vtable);
+	linphone_core_set_video_device(manager->lc, "StaticImage: Static picture");
+	linphone_core_enable_video_capture(manager->lc, TRUE);
+	linphone_core_enable_video_display(manager->lc, TRUE);
+	params = linphone_core_create_default_call_parameters(manager->lc);
+	linphone_call_params_enable_video(params, TRUE);
+	disable_all_video_codecs_except_one(manager->lc, "VP8");
+	return params;
+}
+
+static LinphoneCallParams * configure_for_video(LinphoneCoreManager *manager) {
+	return _configure_for_video(manager, video_call_state_changed);
+}
+
+static LinphoneCallParams * configure_for_early_media_video_sending(LinphoneCoreManager *manager) {
+	LinphoneCallParams *params = _configure_for_video(manager, video_call_state_changed);
+	linphone_call_params_enable_early_media_sending(params, TRUE);
+	return params;
+}
+
+static LinphoneCallParams * configure_for_early_media_video_receiving(LinphoneCoreManager *manager) {
+	return _configure_for_video(manager, early_media_video_call_state_changed);
+}
+
 
 static void early_media_video_during_video_call_test(void) {
 	LinphoneCoreManager *marie;
 	LinphoneCoreManager *pauline;
+	LinphoneCoreManager *laure;
 	LinphoneCallParams *marie_params;
 	LinphoneCallParams *pauline_params;
-	LinphoneCoreVTable *marie_vtable;
-	LinphoneCoreVTable *pauline_vtable;
-	int dummy = 0;
+	LinphoneCallParams *laure_params;
 
-	marie = linphone_core_manager_new( "marie_rc");
-	pauline = linphone_core_manager_new( "pauline_rc");
-	marie_vtable = linphone_core_v_table_new();
-	marie_vtable->call_state_changed = video_call_state_changed;
-	linphone_core_add_listener(marie->lc, marie_vtable);
-	linphone_core_set_video_device(marie->lc, "StaticImage: Static picture");
-	//linphone_core_set_video_device(marie->lc, "V4L2: /dev/video0");
-	linphone_core_enable_video_capture(marie->lc, TRUE);
-	linphone_core_enable_video_display(marie->lc, TRUE);
-	linphone_core_set_avpf_mode(marie->lc, LinphoneAVPFEnabled);
-	marie_params = linphone_core_create_default_call_parameters(marie->lc);
-	linphone_call_params_enable_video(marie_params, TRUE);
-	disable_all_video_codecs_except_one(marie->lc, "VP8");
-	pauline_vtable = linphone_core_v_table_new();
-	pauline_vtable->call_state_changed = video_call_state_changed;
-	linphone_core_add_listener(pauline->lc, pauline_vtable);
-	linphone_core_set_video_device(pauline->lc, "StaticImage: Static picture");
-	linphone_core_enable_video_capture(pauline->lc, TRUE);
-	linphone_core_enable_video_display(pauline->lc, TRUE);
-	pauline_params = linphone_core_create_default_call_parameters(pauline->lc);
-	linphone_call_params_enable_video(pauline_params, TRUE);
-	disable_all_video_codecs_except_one(pauline->lc, "VP8");
-	
-	CU_ASSERT_TRUE(video_call_with_params(marie, pauline, marie_params, pauline_params));
+	marie = linphone_core_manager_new("marie_rc");
+	pauline = linphone_core_manager_new("pauline_rc");
+	laure = linphone_core_manager_new("laure_rc");
+	marie_params = configure_for_early_media_video_receiving(marie);
+	pauline_params = configure_for_video(pauline);
+	laure_params = configure_for_early_media_video_sending(laure);
 
-	/* Wait for 3s. */
-	wait_for_until(marie->lc, pauline->lc, &dummy, 1, 3000);
+	/* Normal automatically accepted video call from marie to pauline. */
+	CU_ASSERT_TRUE(video_call_with_params(marie, pauline, marie_params, pauline_params, TRUE));
+
+	/* Wait for 2s. */
+	wait_for_three_cores(marie->lc, pauline->lc, NULL, 2000);
+
+	/* Early media video call from laure to marie. */
+	CU_ASSERT_TRUE(video_call_with_params(laure, marie, laure_params, NULL, FALSE));
+
+	/* Wait for 2s. */
+	wait_for_three_cores(marie->lc, pauline->lc, laure->lc, 2000);
 
 	linphone_core_terminate_all_calls(marie->lc);
 	CU_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallEnd, 1));
 	CU_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallEnd, 1));
 	CU_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallReleased, 1));
 	CU_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallReleased, 1));
+	CU_ASSERT_TRUE(wait_for(marie->lc, laure->lc, &marie->stat.number_of_LinphoneCallEnd, 1));
+	CU_ASSERT_TRUE(wait_for(marie->lc, laure->lc, &laure->stat.number_of_LinphoneCallEnd, 1));
 
+	CU_ASSERT_EQUAL(marie->stat.number_of_video_windows_created, 2);
+	CU_ASSERT_EQUAL(pauline->stat.number_of_video_windows_created, 1);
+	CU_ASSERT_EQUAL(laure->stat.number_of_video_windows_created, 1);
+
+	linphone_call_params_unref(marie_params);
+	linphone_call_params_unref(pauline_params);
+	linphone_call_params_unref(laure_params);
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
+	linphone_core_manager_destroy(laure);
 }
 
 test_t video_tests[] = {

From e6f1364782d56122959cb381891e5fa93a928e7b Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Thu, 5 Feb 2015 19:35:01 +0100
Subject: [PATCH 357/496] Add multicast call tester when building with CMake.

---
 tester/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tester/CMakeLists.txt b/tester/CMakeLists.txt
index 34e5d122b..3dfe85142 100644
--- a/tester/CMakeLists.txt
+++ b/tester/CMakeLists.txt
@@ -31,6 +31,7 @@ set(SOURCE_FILES
 	liblinphone_tester.c
 	log_collection_tester.c
 	message_tester.c
+	multicast_call_tester.c
 	offeranswer_tester.c
 	player_tester.c
 	presence_tester.c

From 59758df62d907d8b48b743cfdc5c50826cf1e07c Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Thu, 5 Feb 2015 20:34:12 +0100
Subject: [PATCH 358/496] add custom header API to proxy config

---
 coreapi/bellesip_sal/sal_op_registration.c |  3 +++
 coreapi/linphonecore.h                     | 15 +++++++++++++++
 coreapi/private.h                          |  1 +
 coreapi/proxy.c                            | 14 +++++++++++++-
 mediastreamer2                             |  2 +-
 tester/register_tester.c                   | 20 ++++++++++++++++++++
 6 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/coreapi/bellesip_sal/sal_op_registration.c b/coreapi/bellesip_sal/sal_op_registration.c
index b51435a4f..f6b6547a3 100644
--- a/coreapi/bellesip_sal/sal_op_registration.c
+++ b/coreapi/bellesip_sal/sal_op_registration.c
@@ -33,6 +33,9 @@ static void register_refresher_listener (belle_sip_refresher_t* refresher
 		op->auth_info=sal_auth_info_create((belle_sip_auth_event_t*)(belle_sip_refresher_get_auth_events(refresher)->data));
 	}
 	sal_error_info_set(&op->error_info,SalReasonUnknown,status_code,reason_phrase,NULL);
+	if (status_code>=200){
+		sal_op_assign_recv_headers(op,(belle_sip_message_t*)response);
+	}
 	if(status_code == 200) {
 		/*check service route rfc3608*/
 		belle_sip_header_service_route_t* service_route;
diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h
index 8e1efa4cd..bd83671e9 100644
--- a/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@ -1148,6 +1148,21 @@ LINPHONE_PUBLIC LinphoneAVPFMode linphone_proxy_config_get_avpf_mode(const Linph
 **/
 LINPHONE_PUBLIC void linphone_proxy_config_set_avpf_mode(LinphoneProxyConfig *cfg, LinphoneAVPFMode mode);
 
+/**
+ * Obtain the value of a header sent by the server in last answer to REGISTER.
+ * @param cfg the proxy config object
+ * @param header_name the header name for which to fetch corresponding value
+ * @return the value of the queried header.
+**/
+LINPHONE_PUBLIC const char *linphone_proxy_config_get_custom_header(LinphoneProxyConfig *cfg, const char *header_name);
+
+/**
+ * Set the value of a custom header sent to the server in REGISTERs request.
+ * @param cfg the proxy config object
+ * @param header_name the header name 
+ * @param header_value the header's value
+**/
+LINPHONE_PUBLIC void linphone_proxy_config_set_custom_header(LinphoneProxyConfig *cfg, const char *header_name, const char *header_value);
 /**
  * @}
 **/
diff --git a/coreapi/private.h b/coreapi/private.h
index 9abdd9ee6..166448fe8 100644
--- a/coreapi/private.h
+++ b/coreapi/private.h
@@ -476,6 +476,7 @@ struct _LinphoneProxyConfig
 	int expires;
 	int publish_expires;
 	SalOp *op;
+	SalCustomHeader *sent_headers;
 	char *type;
 	struct _SipSetupContext *ssctx;
 	int auth_failures;
diff --git a/coreapi/proxy.c b/coreapi/proxy.c
index beed88ce3..19b362b6e 100644
--- a/coreapi/proxy.c
+++ b/coreapi/proxy.c
@@ -182,6 +182,7 @@ void _linphone_proxy_config_destroy(LinphoneProxyConfig *obj){
 	if (obj->contact_uri_params) ms_free(obj->contact_uri_params);
 	if (obj->saved_proxy!=NULL) linphone_address_destroy(obj->saved_proxy);
 	if (obj->saved_identity!=NULL) linphone_address_destroy(obj->saved_identity);
+	if (obj->sent_headers!=NULL) sal_custom_header_free(obj->sent_headers);
 	_linphone_proxy_config_release_ops(obj);
 }
 
@@ -467,7 +468,7 @@ static void linphone_proxy_config_register(LinphoneProxyConfig *obj){
 			sal_op_release(obj->op);
 		obj->op=sal_op_new(obj->lc->sal);
 
-		linphone_configure_op(obj->lc, obj->op, to, NULL, FALSE);
+		linphone_configure_op(obj->lc, obj->op, to, obj->sent_headers, FALSE);
 		linphone_address_destroy(to);
 
 		if ((contact=guess_contact_for_register(obj))) {
@@ -1147,6 +1148,17 @@ struct _LinphoneCore * linphone_proxy_config_get_core(const LinphoneProxyConfig
 	return obj->lc;
 }
 
+const char *linphone_proxy_config_get_custom_header(LinphoneProxyConfig *cfg, const char *header_name){
+	const SalCustomHeader *ch;
+	if (!cfg->op) return NULL;
+	ch = sal_op_get_recv_custom_header(cfg->op);
+	return sal_custom_header_find(ch, header_name);
+}
+
+void linphone_proxy_config_set_custom_header(LinphoneProxyConfig *cfg, const char *header_name, const char *header_value){
+	cfg->sent_headers=sal_custom_header_append(cfg->sent_headers, header_name, header_value);
+}
+
 /**
  * Add a proxy configuration.
  * This will start registration on the proxy, if registration is enabled.
diff --git a/mediastreamer2 b/mediastreamer2
index 034131e3b..f6ed42c03 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 034131e3b566438df8445ca7f97c19f3c3774f28
+Subproject commit f6ed42c031d3df9d2ccb3b5ec7bfd8f8023c73f6
diff --git a/tester/register_tester.c b/tester/register_tester.c
index fc778d865..b0687352d 100644
--- a/tester/register_tester.c
+++ b/tester/register_tester.c
@@ -190,6 +190,25 @@ static void simple_register(){
 	linphone_core_manager_destroy(lcm);
 }
 
+static void register_with_custom_headers(void){
+	LinphoneCoreManager *marie=linphone_core_manager_new("marie_rc");
+	LinphoneProxyConfig *cfg=linphone_core_get_default_proxy_config(marie->lc);
+	int initial_register_ok=marie->stat.number_of_LinphoneRegistrationOk;
+	const char *value;
+	
+	linphone_core_set_network_reachable(marie->lc, FALSE);
+	linphone_proxy_config_set_custom_header(cfg, "ah-bah-ouais", "...mais bon.");
+	/*unfortunately it is difficult to programmatically check that sent custom headers are actually sent.
+	 * A server development would be required here.*/
+	
+	linphone_core_set_network_reachable(marie->lc, TRUE);
+	wait_for(marie->lc, NULL, &marie->stat.number_of_LinphoneRegistrationOk,initial_register_ok+1);
+	value=linphone_proxy_config_get_custom_header(cfg, "Server");
+	CU_ASSERT_PTR_NOT_NULL(value);
+	if (value) CU_ASSERT_TRUE(strstr(value, "Flexisip")!=NULL);
+	linphone_core_manager_destroy(marie);
+}
+
 static void simple_unregister(){
 	LinphoneCoreManager* lcm = create_lcm();
 	stats* counters = &lcm->stat;
@@ -814,6 +833,7 @@ test_t register_tests[] = {
 	{ "Simple register", simple_register },
 	{ "Simple register unregister", simple_unregister },
 	{ "TCP register", simple_tcp_register },
+	{ "Register with custom headers", register_with_custom_headers },
 	{ "TCP register compatibility mode", simple_tcp_register_compatibility_mode },
 	{ "TLS register", simple_tls_register },
 	{ "TLS register with alt. name certificate", tls_alt_name_register },

From 9357c20551c04c595f89c776a763f46d124f4ccd Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Fri, 6 Feb 2015 12:07:30 +0100
Subject: [PATCH 359/496] fix tests not passing when the entire suite is run.
 enhance ipv6 test

---
 tester/accountmanager.c  |  4 +++-
 tester/flexisip_tester.c | 16 ++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/tester/accountmanager.c b/tester/accountmanager.c
index 93c250135..80bc7942e 100644
--- a/tester/accountmanager.c
+++ b/tester/accountmanager.c
@@ -194,7 +194,9 @@ LinphoneAddress *account_manager_check_account(AccountManager *m, LinphoneProxyC
 		create_account=TRUE;
 		m->accounts=ms_list_append(m->accounts,account);
 	}
-	tmp=linphone_address_as_string(account->modified_identity);
+	/*modify the username of the identity of the proxy config*/
+	linphone_address_set_username(id_addr, linphone_address_get_username(account->modified_identity));
+	tmp=linphone_address_as_string(id_addr);
 	linphone_proxy_config_set_identity(cfg,tmp);
 	ms_free(tmp);
 	
diff --git a/tester/flexisip_tester.c b/tester/flexisip_tester.c
index dc0250eb8..0f8d5457c 100644
--- a/tester/flexisip_tester.c
+++ b/tester/flexisip_tester.c
@@ -680,6 +680,22 @@ static void call_with_ipv6(void) {
 	CU_ASSERT_TRUE(call(marie,pauline));
 	pauline_call=linphone_core_get_current_call(pauline->lc);
 	CU_ASSERT_PTR_NOT_NULL(pauline_call);
+	if (pauline_call){
+		/*check that the remote contact is IPv6*/
+		const char *contact=linphone_call_get_remote_contact(pauline_call);
+		LinphoneAddress *ct_addr;
+		
+		CU_ASSERT_PTR_NOT_NULL(contact);
+		if (contact){
+			ct_addr=linphone_address_new(contact);
+			CU_ASSERT_PTR_NOT_NULL(ct_addr);
+			if (ct_addr){
+				CU_ASSERT_TRUE(linphone_address_get_domain(ct_addr)[0]=='[');
+			}
+			linphone_address_destroy(ct_addr);
+		}
+		
+	}
 
 	liblinphone_tester_check_rtcp(marie,pauline);
 	end_call(marie,pauline);

From 1a9adcd1ca699fc21249bf127fc670267b40a966 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Fri, 6 Feb 2015 12:17:34 +0100
Subject: [PATCH 360/496] fix ipv6 test

---
 tester/flexisip_tester.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tester/flexisip_tester.c b/tester/flexisip_tester.c
index 0f8d5457c..06d8200cf 100644
--- a/tester/flexisip_tester.c
+++ b/tester/flexisip_tester.c
@@ -690,7 +690,7 @@ static void call_with_ipv6(void) {
 			ct_addr=linphone_address_new(contact);
 			CU_ASSERT_PTR_NOT_NULL(ct_addr);
 			if (ct_addr){
-				CU_ASSERT_TRUE(linphone_address_get_domain(ct_addr)[0]=='[');
+				CU_ASSERT_TRUE(strchr(linphone_address_get_domain(ct_addr),':')!=NULL);
 			}
 			linphone_address_destroy(ct_addr);
 		}

From 23a51c7e6d671631bf044831f6d8772bc5e62bd0 Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Fri, 6 Feb 2015 14:24:53 +0100
Subject: [PATCH 361/496] Update ms2

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index f6ed42c03..625547016 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit f6ed42c031d3df9d2ccb3b5ec7bfd8f8023c73f6
+Subproject commit 625547016a09f0bde3a1ff6b35e29d71506174d0

From 0f12a36b67d40e00260c0b663a5bdc92a241f2bb Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Fri, 6 Feb 2015 15:30:05 +0100
Subject: [PATCH 362/496] Allow queuing several incoming calls instead of
 declining all of them except the first.

---
 coreapi/callbacks.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/coreapi/callbacks.c b/coreapi/callbacks.c
index 99e23f777..f18976476 100644
--- a/coreapi/callbacks.c
+++ b/coreapi/callbacks.c
@@ -232,17 +232,13 @@ static bool_t already_a_call_with_remote_address(const LinphoneCore *lc, const L
 	return FALSE;
 }
 
-static bool_t already_a_call_pending(LinphoneCore *lc){
+static bool_t already_an_outgoing_call_pending(LinphoneCore *lc){
 	MSList *elem;
 	for(elem=lc->calls;elem!=NULL;elem=elem->next){
 		LinphoneCall *call=(LinphoneCall*)elem->data;
-		if (call->state==LinphoneCallIncomingReceived
-			|| call->state==LinphoneCallIncomingEarlyMedia
-			|| call->state==LinphoneCallOutgoingInit
+		if (call->state==LinphoneCallOutgoingInit
 			|| call->state==LinphoneCallOutgoingProgress
-			|| call->state==LinphoneCallOutgoingEarlyMedia
-			|| call->state==LinphoneCallOutgoingRinging
-			|| call->state==LinphoneCallIdle){ /*case of an incoming call for which ICE candidate gathering is pending.*/
+			|| call->state==LinphoneCallOutgoingRinging){
 			return TRUE;
 		}
 	}
@@ -312,8 +308,8 @@ static void call_received(SalOp *h){
 		from_addr=linphone_address_new(sal_op_get_from(h));
 	to_addr=linphone_address_new(sal_op_get_to(h));
 
-	if ((already_a_call_with_remote_address(lc,from_addr) && prevent_colliding_calls) || already_a_call_pending(lc)){
-		ms_warning("Receiving another call while one is ringing or initiated, refusing this one with busy message.");
+	if ((already_a_call_with_remote_address(lc,from_addr) && prevent_colliding_calls) || already_an_outgoing_call_pending(lc)){
+		ms_warning("Receiving a call while one is initiated, refusing this one with busy message.");
 		sal_call_decline(h,SalReasonBusy,NULL);
 		sal_op_release(h);
 		linphone_address_destroy(from_addr);

From bbb87a177171ebc5781fe4fca27578b4c70bdbb7 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Fri, 6 Feb 2015 15:31:07 +0100
Subject: [PATCH 363/496] Add test with several incoming early-media video
 calls.

---
 tester/video_tester.c | 50 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

diff --git a/tester/video_tester.c b/tester/video_tester.c
index 37848b542..cb4ea132f 100644
--- a/tester/video_tester.c
+++ b/tester/video_tester.c
@@ -257,8 +257,56 @@ static void early_media_video_during_video_call_test(void) {
 	linphone_core_manager_destroy(laure);
 }
 
+static void two_incoming_early_media_video_calls_test(void) {
+	LinphoneCoreManager *marie;
+	LinphoneCoreManager *pauline;
+	LinphoneCoreManager *laure;
+	LinphoneCallParams *marie_params;
+	LinphoneCallParams *pauline_params;
+	LinphoneCallParams *laure_params;
+
+	marie = linphone_core_manager_new("marie_rc");
+	pauline = linphone_core_manager_new("pauline_rc");
+	laure = linphone_core_manager_new("laure_rc");
+	marie_params = configure_for_early_media_video_receiving(marie);
+	pauline_params = configure_for_early_media_video_sending(pauline);
+	laure_params = configure_for_early_media_video_sending(laure);
+
+	/* Early media video call from pauline to marie. */
+	CU_ASSERT_TRUE(video_call_with_params(pauline, marie, pauline_params, NULL, FALSE));
+
+	/* Wait for 2s. */
+	wait_for_three_cores(marie->lc, pauline->lc, NULL, 2000);
+
+	/* Early media video call from laure to marie. */
+	CU_ASSERT_TRUE(video_call_with_params(laure, marie, laure_params, NULL, FALSE));
+
+	/* Wait for 2s. */
+	wait_for_three_cores(marie->lc, pauline->lc, laure->lc, 2000);
+
+	linphone_core_terminate_all_calls(marie->lc);
+	CU_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallEnd, 1));
+	CU_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallEnd, 1));
+	CU_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallReleased, 1));
+	CU_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallReleased, 1));
+	CU_ASSERT_TRUE(wait_for(marie->lc, laure->lc, &marie->stat.number_of_LinphoneCallEnd, 1));
+	CU_ASSERT_TRUE(wait_for(marie->lc, laure->lc, &laure->stat.number_of_LinphoneCallEnd, 1));
+
+	CU_ASSERT_EQUAL(marie->stat.number_of_video_windows_created, 2);
+	CU_ASSERT_EQUAL(pauline->stat.number_of_video_windows_created, 1);
+	CU_ASSERT_EQUAL(laure->stat.number_of_video_windows_created, 1);
+
+	linphone_call_params_unref(marie_params);
+	linphone_call_params_unref(pauline_params);
+	linphone_call_params_unref(laure_params);
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+	linphone_core_manager_destroy(laure);
+}
+
 test_t video_tests[] = {
-	{ "Early-media video during video call", early_media_video_during_video_call_test }
+	{ "Early-media video during video call", early_media_video_during_video_call_test },
+	{ "Two incoming early-media video calls", two_incoming_early_media_video_calls_test }
 };
 
 test_suite_t video_test_suite = {

From fae682d42a0dc9e49739d26c6adc72b2d5943634 Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Fri, 6 Feb 2015 14:29:06 +0100
Subject: [PATCH 364/496] Check exceptions on JNI listeners

---
 coreapi/linphonecore_jni.cc | 64 +++++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index 7c5736705..b4a929a07 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -620,6 +620,10 @@ public:
 							,lcData->core
 							,env->CallStaticObjectMethod(lcData->globalStateClass,lcData->globalStateFromIntId,(jint)gstate),
 							msg);
+		if (env->ExceptionCheck()) {
+			ms_error("Listener %p raised an exception",lcData->listener);
+			env->ExceptionClear();
+		}
 		if (msg) {
 			env->DeleteLocalRef(msg);
 		}
@@ -641,6 +645,10 @@ public:
 							,(jproxy=getProxy(env,proxy,lcData->core))
 							,env->CallStaticObjectMethod(lcData->registrationStateClass,lcData->registrationStateFromIntId,(jint)state),
 							msg);
+		if (env->ExceptionCheck()) {
+			ms_error("Listener %p raised an exception",lcData->listener);
+			env->ExceptionClear();
+		}
 		if (msg) {
 			env->DeleteLocalRef(msg);
 		}
@@ -663,6 +671,10 @@ public:
 							,(jcall=getCall(env,call))
 							,env->CallStaticObjectMethod(lcData->callStateClass,lcData->callStateFromIntId,(jint)state),
 							msg);
+		if (env->ExceptionCheck()) {
+			ms_error("Listener %p raised an exception",lcData->listener);
+			env->ExceptionClear();
+		}
 		if (state==LinphoneCallReleased) {
 			linphone_call_set_user_pointer(call,NULL);
 			env->DeleteGlobalRef(jcall);
@@ -686,6 +698,10 @@ public:
 							,getCall(env,call)
 							,encrypted
 							,authentication_token ? env->NewStringUTF(authentication_token) : NULL);
+		if (env->ExceptionCheck()) {
+			ms_error("Listener %p raised an exception",lcData->listener);
+			env->ExceptionClear();
+		}
 	}
 	static void notify_presence_received(LinphoneCore *lc,  LinphoneFriend *my_friend) {
 		JNIEnv *env = 0;
@@ -700,6 +716,10 @@ public:
 							,lcData->notifyPresenceReceivedId
 							,lcData->core
 							,env->NewObject(lcData->friendClass,lcData->friendCtrId,(jlong)my_friend));
+		if (env->ExceptionCheck()) {
+			ms_error("Listener %p raised an exception",lcData->listener);
+			env->ExceptionClear();
+		}
 	}
 	static void new_subscription_requested(LinphoneCore *lc,  LinphoneFriend *my_friend, const char* url) {
 		JNIEnv *env = 0;
@@ -715,6 +735,10 @@ public:
 							,lcData->core
 							,env->NewObject(lcData->friendClass,lcData->friendCtrId,(jlong)my_friend)
 							,url ? env->NewStringUTF(url) : NULL);
+		if (env->ExceptionCheck()) {
+			ms_error("Listener %p raised an exception",lcData->listener);
+			env->ExceptionClear();
+		}
 	}
 	static void dtmf_received(LinphoneCore *lc, LinphoneCall *call, int dtmf) {
 		JNIEnv *env = 0;
@@ -730,6 +754,10 @@ public:
 							,lcData->core
 							,getCall(env,call)
 							,dtmf);
+		if (env->ExceptionCheck()) {
+			ms_error("Listener %p raised an exception",lcData->listener);
+			env->ExceptionClear();
+		}
 	}
 	static void text_received(LinphoneCore *lc, LinphoneChatRoom *room, const LinphoneAddress *from, const char *message) {
 		JNIEnv *env = 0;
@@ -746,6 +774,10 @@ public:
 							,env->NewObject(lcData->chatRoomClass,lcData->chatRoomCtrId,(jlong)room)
 							,env->NewObject(lcData->addressClass,lcData->addressCtrId,(jlong)from)
 							,message ? env->NewStringUTF(message) : NULL);
+		if (env->ExceptionCheck()) {
+			ms_error("Listener %p raised an exception",lcData->listener);
+			env->ExceptionClear();
+		}
 	}
 	static void message_received(LinphoneCore *lc, LinphoneChatRoom *room, LinphoneChatMessage *msg) {
 		JNIEnv *env = 0;
@@ -763,6 +795,10 @@ public:
 							,lcData->core
 							,env->NewObject(lcData->chatRoomClass,lcData->chatRoomCtrId,(jlong)room)
 							,(jmsg = getChatMessage(env, msg)));
+		if (env->ExceptionCheck()) {
+			ms_error("Listener %p raised an exception",lcData->listener);
+			env->ExceptionClear();
+		}
 	}
 	static void is_composing_received(LinphoneCore *lc, LinphoneChatRoom *room) {
 		JNIEnv *env = 0;
@@ -777,6 +813,10 @@ public:
 							,lcData->isComposingReceivedId
 							,lcData->core
 							,env->NewObject(lcData->chatRoomClass,lcData->chatRoomCtrId,(jlong)room));
+		if (env->ExceptionCheck()) {
+			ms_error("Listener %p raised an exception",lcData->listener);
+			env->ExceptionClear();
+		}
 	}
 	static void ecCalibrationStatus(LinphoneCore *lc, LinphoneEcCalibratorStatus status, int delay_ms, void *data) {
 		JNIEnv *env = 0;
@@ -822,6 +862,10 @@ public:
 		else
 			env->CallVoidMethod(callobj, lcData->callSetVideoStatsId, statsobj);
 		env->CallVoidMethod(lcData->listener, lcData->callStatsUpdatedId, lcData->core, callobj, statsobj);
+		if (env->ExceptionCheck()) {
+			ms_error("Listener %p raised an exception",lcData->listener);
+			env->ExceptionClear();
+		}
 	}
 	static void transferStateChanged(LinphoneCore *lc, LinphoneCall *call, LinphoneCallState remote_call_state){
 		JNIEnv *env = 0;
@@ -839,6 +883,10 @@ public:
 							,(jcall=getCall(env,call))
 							,env->CallStaticObjectMethod(lcData->callStateClass,lcData->callStateFromIntId,(jint)remote_call_state)
 							);
+		if (env->ExceptionCheck()) {
+			ms_error("Listener %p raised an exception",lcData->listener);
+			env->ExceptionClear();
+		}
 	}
 	static void infoReceived(LinphoneCore *lc, LinphoneCall*call, const LinphoneInfoMessage *info){
 		JNIEnv *env = 0;
@@ -856,6 +904,10 @@ public:
 							,getCall(env,call)
 							,env->NewObject(lcData->infoMessageClass,lcData->infoMessageCtor,(jlong)copy_info)
 							);
+		if (env->ExceptionCheck()) {
+			ms_error("Listener %p raised an exception",lcData->listener);
+			env->ExceptionClear();
+		}
 	}
 	static void subscriptionStateChanged(LinphoneCore *lc, LinphoneEvent *ev, LinphoneSubscriptionState state){
 		JNIEnv *env = 0;
@@ -876,6 +928,10 @@ public:
 							,jevent
 							,jstate
 							);
+		if (env->ExceptionCheck()) {
+			ms_error("Listener %p raised an exception",lcData->listener);
+			env->ExceptionClear();
+		}
 		if (state==LinphoneSubscriptionTerminated){
 			/*loose the java reference */
 			linphone_event_set_user_data(ev,NULL);
@@ -901,6 +957,10 @@ public:
 							,jevent
 							,jstate
 							);
+		if (env->ExceptionCheck()) {
+			ms_error("Listener %p raised an exception",lcData->listener);
+			env->ExceptionClear();
+		}
 	}
 	static void notifyReceived(LinphoneCore *lc, LinphoneEvent *ev, const char *evname, const LinphoneContent *content){
 		JNIEnv *env = 0;
@@ -920,6 +980,10 @@ public:
 							,env->NewStringUTF(evname)
 							,content ? create_java_linphone_content(env,content) : NULL
 							);
+		if (env->ExceptionCheck()) {
+			ms_error("Listener %p raised an exception",lcData->listener);
+			env->ExceptionClear();
+		}
 	}
 
 	static void configuringStatus(LinphoneCore *lc, LinphoneConfiguringState status, const char *message) {

From 5d19161059c07a2bf116fd0c50525c6505e028ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
 <francois.grisez@belledonne-communications.com>
Date: Fri, 6 Feb 2015 10:47:07 +0100
Subject: [PATCH 365/496] Fix crash with CentOS 6

---
 tester/liblinphone_tester.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tester/liblinphone_tester.c b/tester/liblinphone_tester.c
index 23b5a8652..fc3f315e5 100644
--- a/tester/liblinphone_tester.c
+++ b/tester/liblinphone_tester.c
@@ -173,6 +173,9 @@ int main (int argc, char *argv[])
 
 #ifdef HAVE_GTK
 	gtk_init(&argc, &argv);
+#if !GLIB_CHECK_VERSION(2,32,0) // backward compatibility with Debian 6 and CentOS 6
+	g_thread_init(NULL);
+#endif
 	gdk_threads_init();
 #endif
 

From 083b34008df90db95f9e8eedc942c7657a2db902 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
 <francois.grisez@belledonne-communications.com>
Date: Fri, 6 Feb 2015 15:47:01 +0100
Subject: [PATCH 366/496] Makes linphonecsh to handle arguments passed to init

---
 console/shell.c | 48 +++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 43 insertions(+), 5 deletions(-)

diff --git a/console/shell.c b/console/shell.c
index 016992397..7a502ecd4 100644
--- a/console/shell.c
+++ b/console/shell.c
@@ -22,7 +22,8 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-
+#include <string.h>
+#include <assert.h>
 
 #ifdef WIN32
 #include <ws2tcpip.h>
@@ -125,11 +126,36 @@ static void print_usage(void){
 	exit(-1);
 }
 
+#ifdef WIN32
+static char *argv_to_line(int argc, char *argv[]) {
+	int i;
+	int line_length;
+	char *line;
+
+	assert( argc>=0 );
+
+	if(argc == 0) return NULL;
+
+	line_length = strlen(argv[0]);
+	for(i=1; i<argc; i++) {
+		line_length += strlen(argv[i]) + 1;
+	}
+
+	line = ortp_malloc0((line_length +1) * sizeof(char));
+	strcat(line, argv[0]);
+	for(i=1; i<argc; i++) {
+		strcat(line, " ");
+		strcat(line, argv[i]);
+	}
+	return line;
+}
+#endif
+
 #define MAX_ARGS 10
 
 #ifndef WIN32
 static void spawn_linphonec(int argc, char *argv[]){
-	char * args[10];
+	char * args[MAX_ARGS];
 	int i,j;
 	pid_t pid;
 	j=0;
@@ -178,13 +204,21 @@ static void spawn_linphonec(int argc, char *argv[]){
 	PROCESS_INFORMATION pinfo;
 	STARTUPINFO si;
 	BOOL ret;
+	const char *cmd = "linphoned.exe --pipe -c NUL";
+	char *args_in_line = argv_to_line(argc, argv);
+	char *cmd_with_args;
 	
 	ZeroMemory( &si, sizeof(si) );
 	si.cb = sizeof(si);
 	ZeroMemory( &pinfo, sizeof(pinfo) );
 
-
-	ret=CreateProcess(NULL,"linphoned.exe --pipe -c NUL",
+	if(args_in_line) {
+		cmd_with_args = ortp_strdup_printf("%s %s", cmd, args_in_line);
+	} else {
+		cmd_with_args = ortp_strdup(cmd);
+	}
+	
+	ret=CreateProcess(NULL, cmd_with_args,
 		NULL,
 		NULL,
 		FALSE,
@@ -193,8 +227,12 @@ static void spawn_linphonec(int argc, char *argv[]){
 		NULL,
 		&si,
 		&pinfo);
+
+	if(args_in_line) ortp_free(args_in_line);
+	ortp_free(cmd_with_args);
+
 	if (!ret){
-		fprintf(stderr,"Spawning of linphonec.exe failed.\n");
+		fprintf(stderr,"Spawning of linphoned.exe failed.\n");
 	}else{
 		WaitForInputIdle(pinfo.hProcess,1000);
 	}

From c9376cc2dd64c05a96bbafb36e6b8cfe19ea2db5 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Fri, 6 Feb 2015 19:03:03 +0100
Subject: [PATCH 367/496] Add parameter and API to allow ringing while in the
 incoming early media call state.

---
 coreapi/callbacks.c    |  4 +++-
 coreapi/linphonecore.c | 17 +++++++++--------
 coreapi/linphonecore.h | 29 ++++++++++++++++++++++++++++-
 3 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/coreapi/callbacks.c b/coreapi/callbacks.c
index f18976476..3eacb34ea 100644
--- a/coreapi/callbacks.c
+++ b/coreapi/callbacks.c
@@ -120,7 +120,9 @@ void linphone_core_update_streams(LinphoneCore *lc, LinphoneCall *call, SalMedia
 	bool_t all_muted=FALSE;
 	bool_t send_ringbacktone=FALSE;
 
-	linphone_core_stop_ringing(lc);
+	if (!((call->state == LinphoneCallIncomingEarlyMedia) && (linphone_core_get_ring_during_incoming_early_media(lc)))) {
+		linphone_core_stop_ringing(lc);
+	}
 	if (!new_md) {
 		ms_error("linphone_core_update_streams() called with null media description");
 		return;
diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 5f0a6b5e0..537ff51d9 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -3258,7 +3258,6 @@ void linphone_core_notify_incoming_call(LinphoneCore *lc, LinphoneCall *call){
 	char *tmp;
 	LinphoneAddress *from_parsed;
 	bool_t propose_early_media=lp_config_get_int(lc->config,"sip","incoming_calls_early_media",FALSE);
-	const char *ringback_tone=linphone_core_get_remote_ringback_tone (lc);
 
 	from_parsed=linphone_address_new(sal_op_get_from(call->op));
 	linphone_address_clean(from_parsed);
@@ -3298,7 +3297,7 @@ void linphone_core_notify_incoming_call(LinphoneCore *lc, LinphoneCall *call){
 		/*try to be best-effort in giving real local or routable contact address for 100Rel case*/
 		linphone_call_set_contact_op(call);
 
-		if (propose_early_media || ringback_tone!=NULL){
+		if (propose_early_media){
 			linphone_core_accept_early_media(lc,call);
 		}else sal_call_notify_ringing(call->op,FALSE);
 
@@ -6500,9 +6499,6 @@ int linphone_core_del_call( LinphoneCore *lc, LinphoneCall *call)
 	return 0;
 }
 
-/**
- * Specifies a ring back tone to be played to far end during incoming calls.
-**/
 void linphone_core_set_remote_ringback_tone(LinphoneCore *lc, const char *file){
 	if (lc->sound_conf.ringback_tone){
 		ms_free(lc->sound_conf.ringback_tone);
@@ -6512,13 +6508,18 @@ void linphone_core_set_remote_ringback_tone(LinphoneCore *lc, const char *file){
 		lc->sound_conf.ringback_tone=ms_strdup(file);
 }
 
-/**
- * Returns the ring back tone played to far end during incoming calls.
-**/
 const char *linphone_core_get_remote_ringback_tone(const LinphoneCore *lc){
 	return lc->sound_conf.ringback_tone;
 }
 
+void linphone_core_set_ring_during_incoming_early_media(LinphoneCore *lc, bool_t enable) {
+	lp_config_set_int(lc->config, "sound", "ring_during_incoming_early_media", (int)enable);
+}
+
+bool_t linphone_core_get_ring_during_incoming_early_media(const LinphoneCore *lc) {
+	return (bool_t)lp_config_get_int(lc->config, "sound", "ring_during_incoming_early_media", 0);
+}
+
 LinphonePayloadType* linphone_core_find_payload_type(LinphoneCore* lc, const char* type, int rate, int channels) {
 	LinphonePayloadType* result = find_payload_type_from_list(type, rate, channels, linphone_core_get_audio_codecs(lc));
 	if (result)  {
diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h
index bd83671e9..5a6b7f108 100644
--- a/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@ -2672,9 +2672,36 @@ LINPHONE_PUBLIC const char *linphone_core_get_root_ca(LinphoneCore *lc);
 LINPHONE_PUBLIC	void linphone_core_set_ringback(LinphoneCore *lc, const char *path);
 LINPHONE_PUBLIC const char * linphone_core_get_ringback(const LinphoneCore *lc);
 
-LINPHONE_PUBLIC void linphone_core_set_remote_ringback_tone(LinphoneCore *lc,const char *);
+/**
+ * Specify a ring back tone to be played to far end during incoming calls.
+ * @param[in] lc #LinphoneCore object
+ * @param[in] ring The path to the ring back tone to be played.
+ * @ingroup media_parameters
+**/
+LINPHONE_PUBLIC void linphone_core_set_remote_ringback_tone(LinphoneCore *lc, const char *ring);
+
+/**
+ * Get the ring back tone played to far end during incoming calls.
+ * @param[in] lc #LinphoneCore object
+ * @ingroup media_parameters
+**/
 LINPHONE_PUBLIC const char *linphone_core_get_remote_ringback_tone(const LinphoneCore *lc);
 
+/**
+ * Enable or disable the ring play during an incoming early media call.
+ * @param[in] lc #LinphoneCore object
+ * @param[in] enable A boolean value telling whether to enable ringing during an incoming early media call.
+ * @ingroup media_parameters
+ */
+LINPHONE_PUBLIC void linphone_core_set_ring_during_incoming_early_media(LinphoneCore *lc, bool_t enable);
+
+/**
+ * Tells whether the ring play is enabled during an incoming early media call.
+ * @param[in] lc #LinphoneCore object
+ * @ingroup media_paramaters
+ */
+LINPHONE_PUBLIC bool_t linphone_core_get_ring_during_incoming_early_media(const LinphoneCore *lc);
+
 LINPHONE_PUBLIC int linphone_core_preview_ring(LinphoneCore *lc, const char *ring,LinphoneCoreCbFunc func,void * userdata);
 LINPHONE_PUBLIC int linphone_core_play_local(LinphoneCore *lc, const char *audiofile);
 LINPHONE_PUBLIC	void linphone_core_enable_echo_cancellation(LinphoneCore *lc, bool_t val);

From 0d94ad277f6b2cb58e5f837f27656039c377cab4 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Fri, 6 Feb 2015 19:04:11 +0100
Subject: [PATCH 368/496] Handle media direction when creating the local media
 description according to the call params.

---
 coreapi/call_params.c  | 22 ++++++++++++++++++++++
 coreapi/call_params.h  |  4 ++--
 coreapi/linphonecall.c |  2 ++
 coreapi/private.h      |  2 ++
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/coreapi/call_params.c b/coreapi/call_params.c
index a2a378eef..b2eea131a 100644
--- a/coreapi/call_params.c
+++ b/coreapi/call_params.c
@@ -33,6 +33,28 @@ SalMediaProto get_proto_from_call_params(const LinphoneCallParams *params) {
 	return SalProtoRtpAvp;
 }
 
+static SalStreamDir sal_dir_from_call_params_dir(LinphoneCallParamsMediaDirection cpdir) {
+	switch (cpdir) {
+		default:
+		case LinphoneCallParamsMediaDirectionInactive:
+			return SalStreamInactive;
+		case LinphoneCallParamsMediaDirectionSendOnly:
+			return SalStreamSendOnly;
+		case LinphoneCallParamsMediaDirectionRecvOnly:
+			return SalStreamRecvOnly;
+		case LinphoneCallParamsMediaDirectionSendRecv:
+			return SalStreamSendRecv;
+	}
+}
+
+SalStreamDir get_audio_dir_from_call_params(const LinphoneCallParams *params) {
+	return sal_dir_from_call_params_dir(linphone_call_params_get_audio_direction(params));
+}
+
+SalStreamDir get_video_dir_from_call_params(const LinphoneCallParams *params) {
+	return sal_dir_from_call_params_dir(linphone_call_params_get_video_direction(params));
+}
+
 
 /*******************************************************************************
  * Public functions                                                            *
diff --git a/coreapi/call_params.h b/coreapi/call_params.h
index c3362534e..8d728c22c 100644
--- a/coreapi/call_params.h
+++ b/coreapi/call_params.h
@@ -280,14 +280,14 @@ LINPHONE_PUBLIC  LinphoneCallParamsMediaDirection linphone_call_params_get_video
  * @param[in] cl LinphoneCallParams object
  * @param[in] The audio stream direction associated with this call params.
 **/
-/*LINPHONE_PUBLIC void linphone_call_params_set_audio_direction(LinphoneCallParams *cp, LinphoneCallParamsMediaDirection dir);*/
+LINPHONE_PUBLIC void linphone_call_params_set_audio_direction(LinphoneCallParams *cp, LinphoneCallParamsMediaDirection dir);
 
 /**
  * Set the video stream direction. Only relevant for multicast
  * @param[in] cl LinphoneCallParams object
  * @param[in] The video stream direction associated with this call params.
 **/
-/*LINPHONE_PUBLIC void linphone_call_params_set_video_direction(LinphoneCallParams *cp, LinphoneCallParamsMediaDirection dir);*/
+LINPHONE_PUBLIC void linphone_call_params_set_video_direction(LinphoneCallParams *cp, LinphoneCallParamsMediaDirection dir);
 
 
 /*******************************************************************************
diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index ec0dd70b6..4f8b9d7e7 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -612,6 +612,7 @@ void linphone_call_make_local_media_description(LinphoneCore *lc, LinphoneCall *
 	md->streams[0].rtp_port=call->media_ports[0].rtp_port;
 	md->streams[0].rtcp_port=call->media_ports[0].rtcp_port;
 	md->streams[0].proto=get_proto_from_call_params(call->params);
+	md->streams[0].dir=get_audio_dir_from_call_params(call->params);
 	md->streams[0].type=SalAudio;
 	if (call->params->down_ptime)
 		md->streams[0].ptime=call->params->down_ptime;
@@ -640,6 +641,7 @@ void linphone_call_make_local_media_description(LinphoneCore *lc, LinphoneCall *
 		md->streams[1].rtp_port=call->media_ports[1].rtp_port;
 		md->streams[1].rtcp_port=call->media_ports[1].rtcp_port;
 		md->streams[1].proto=md->streams[0].proto;
+		md->streams[1].dir=get_video_dir_from_call_params(call->params);
 		md->streams[1].type=SalVideo;
 		codec_hints.bandwidth_limit=0;
 		codec_hints.max_codecs=-1;
diff --git a/coreapi/private.h b/coreapi/private.h
index 166448fe8..56ddf2dc8 100644
--- a/coreapi/private.h
+++ b/coreapi/private.h
@@ -298,6 +298,8 @@ LinphonePlayer *linphone_call_build_player(LinphoneCall*call);
 
 LinphoneCallParams * linphone_call_params_new(void);
 SalMediaProto get_proto_from_call_params(const LinphoneCallParams *params);
+SalStreamDir get_audio_dir_from_call_params(const LinphoneCallParams *params);
+SalStreamDir get_video_dir_from_call_params(const LinphoneCallParams *params);
 
 void linphone_auth_info_write_config(struct _LpConfig *config, LinphoneAuthInfo *obj, int pos);
 

From b20e1de36241a7904dd8282f45152c20a7dbf33f Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Fri, 6 Feb 2015 19:05:12 +0100
Subject: [PATCH 369/496] Improve "two incoming early-media video calls" test.

---
 tester/video_tester.c | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/tester/video_tester.c b/tester/video_tester.c
index cb4ea132f..bd034310c 100644
--- a/tester/video_tester.c
+++ b/tester/video_tester.c
@@ -121,6 +121,8 @@ static void early_media_video_call_state_changed(LinphoneCore *lc, LinphoneCall
 		case LinphoneCallIncomingReceived:
 			params = linphone_core_create_default_call_parameters(lc);
 			linphone_call_params_enable_video(params, TRUE);
+			linphone_call_params_set_audio_direction(params, LinphoneCallParamsMediaDirectionSendOnly);
+			linphone_call_params_set_video_direction(params, LinphoneCallParamsMediaDirectionRecvOnly);
 			linphone_core_accept_early_media_with_params(lc, call, params);
 			linphone_call_params_unref(params);
 			break;
@@ -258,12 +260,15 @@ static void early_media_video_during_video_call_test(void) {
 }
 
 static void two_incoming_early_media_video_calls_test(void) {
+	char *ringback_path;
 	LinphoneCoreManager *marie;
 	LinphoneCoreManager *pauline;
 	LinphoneCoreManager *laure;
 	LinphoneCallParams *marie_params;
 	LinphoneCallParams *pauline_params;
 	LinphoneCallParams *laure_params;
+	LinphoneCall *call;
+	const MSList *calls_list;
 
 	marie = linphone_core_manager_new("marie_rc");
 	pauline = linphone_core_manager_new("pauline_rc");
@@ -272,6 +277,12 @@ static void two_incoming_early_media_video_calls_test(void) {
 	pauline_params = configure_for_early_media_video_sending(pauline);
 	laure_params = configure_for_early_media_video_sending(laure);
 
+	/* Configure early media audio to play ring during early-media and send remote ring back tone. */
+	linphone_core_set_ring_during_incoming_early_media(marie->lc, TRUE);
+	ringback_path = ms_strdup_printf("%s/sounds/ringback.wav", liblinphone_tester_file_prefix);
+	linphone_core_set_remote_ringback_tone(marie->lc, ringback_path);
+	ms_free(ringback_path);
+
 	/* Early media video call from pauline to marie. */
 	CU_ASSERT_TRUE(video_call_with_params(pauline, marie, pauline_params, NULL, FALSE));
 
@@ -284,6 +295,22 @@ static void two_incoming_early_media_video_calls_test(void) {
 	/* Wait for 2s. */
 	wait_for_three_cores(marie->lc, pauline->lc, laure->lc, 2000);
 
+	CU_ASSERT_EQUAL(linphone_core_get_calls_nb(marie->lc), 2);
+	if (linphone_core_get_calls_nb(marie->lc) == 2) {
+		calls_list = linphone_core_get_calls(marie->lc);
+		call = (LinphoneCall *)ms_list_nth_data(calls_list, 0);
+		CU_ASSERT_PTR_NOT_NULL(call);
+		if (call != NULL) {
+			LinphoneCallParams *params = linphone_call_params_copy(linphone_call_get_current_params(call));
+			linphone_call_params_set_audio_direction(params, LinphoneCallParamsMediaDirectionSendRecv);
+			linphone_call_params_set_video_direction(params, LinphoneCallParamsMediaDirectionSendRecv);
+			linphone_core_accept_call_with_params(marie->lc, call, params);
+
+			/* Wait for 5s. */
+			wait_for_three_cores(marie->lc, pauline->lc, laure->lc, 5000);
+		}
+	}
+
 	linphone_core_terminate_all_calls(marie->lc);
 	CU_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallEnd, 1));
 	CU_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallEnd, 1));

From 589d3cd5402f0d9fdc8c59974683e8687319b688 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Fri, 6 Feb 2015 19:30:12 +0100
Subject: [PATCH 370/496] appnaping improvements - take a background task
 during the ice gatethering for incoming call - add timestamps to gtk debug
 window, which was required to investigate the issue.

Requires up to date belle-sip
---
 README.macos.md                 |  3 +--
 coreapi/bellesip_sal/sal_impl.c | 10 +++++++++
 coreapi/callbacks.c             |  2 ++
 coreapi/linphonecore.c          |  6 ++++++
 coreapi/private.h               |  1 +
 gtk/logging.c                   | 36 +++++++++++++++++----------------
 include/sal/sal.h               |  6 ++++++
 7 files changed, 45 insertions(+), 19 deletions(-)

diff --git a/README.macos.md b/README.macos.md
index 4028bb40a..20660a5a0 100644
--- a/README.macos.md
+++ b/README.macos.md
@@ -5,8 +5,7 @@
 * Xcode (download from apple or using appstore application)
 * [Java SE](http://www.oracle.com/technetwork/java/javase/downloads/index.html) or openJDK
  This is required to generate a C sourcefile from SIP grammar using [antlr3](http://www.antlr3.org/) generator.
- * [HomeBrew](http://brew.sh) or [Macports](http://www.macports.org/).
- * [XQuartz](https://xquartz.macosforge.org) for GTK version.
+* [HomeBrew](http://brew.sh) or [Macports](http://www.macports.org/).
 
 ### Dependencies
 
diff --git a/coreapi/bellesip_sal/sal_impl.c b/coreapi/bellesip_sal/sal_impl.c
index 84964ecf1..3b3c24955 100644
--- a/coreapi/bellesip_sal/sal_impl.c
+++ b/coreapi/bellesip_sal/sal_impl.c
@@ -1135,6 +1135,16 @@ void sal_cancel_timer(Sal *sal, belle_sip_source_t *timer) {
 	belle_sip_main_loop_t *ml = belle_sip_stack_get_main_loop(sal->stack);
 	belle_sip_main_loop_remove_source(ml, timer);
 }
+
+unsigned long sal_begin_background_task(const char *name, void (*max_time_reached)(void *), void *data){
+	return belle_sip_begin_background_task(name, max_time_reached, data);
+}
+
+void sal_end_background_task(unsigned long id){
+	belle_sip_end_background_task(id);
+}
+
+
 void sal_enable_sip_update_method(Sal *ctx,bool_t value) {
 	ctx->enable_sip_update=value;
 }
diff --git a/coreapi/callbacks.c b/coreapi/callbacks.c
index 3eacb34ea..47032e22e 100644
--- a/coreapi/callbacks.c
+++ b/coreapi/callbacks.c
@@ -336,6 +336,8 @@ static void call_received(SalOp *h){
 	linphone_core_add_call(lc,call);
 	linphone_call_ref(call); /*prevent the call from being destroyed while we are notifying, if the user declines within the state callback */
 
+	call->bg_task_id=sal_begin_background_task("liblinphone call notification", NULL, NULL);
+	
 	if ((linphone_core_get_firewall_policy(lc) == LinphonePolicyUseIce) && (call->ice_session != NULL)) {
 		/* Defer ringing until the end of the ICE candidates gathering process. */
 		ms_message("Defer ringing to gather ICE candidates");
diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 537ff51d9..923731619 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -3292,6 +3292,12 @@ void linphone_core_notify_incoming_call(LinphoneCore *lc, LinphoneCall *call){
 	}
 
 	linphone_call_set_state(call,LinphoneCallIncomingReceived,"Incoming call");
+	/*from now on, the application is aware of the call and supposed to take background task or already submitted notification to the user.
+	We can then drop our background task.*/
+	if (call->bg_task_id!=0) {
+		sal_end_background_task(call->bg_task_id);
+		call->bg_task_id=0;
+	}
 
 	if (call->state==LinphoneCallIncomingReceived){
 		/*try to be best-effort in giving real local or routable contact address for 100Rel case*/
diff --git a/coreapi/private.h b/coreapi/private.h
index 56ddf2dc8..36fc09b1b 100644
--- a/coreapi/private.h
+++ b/coreapi/private.h
@@ -257,6 +257,7 @@ struct _LinphoneCall{
 	LinphoneCall *transfer_target;/*if this call received a transfer request, then transfer_target points to the new call created to the refer target */
 	int localdesc_changed;/*not a boolean, contains a mask representing changes*/
 	LinphonePlayer *player;
+	unsigned long bg_task_id; /*used to prevent device to suspend app while a call is received in background*/
 
 	char *dtmf_sequence; /*DTMF sequence needed to be sent using #dtmfs_timer*/
 	belle_sip_source_t *dtmfs_timer; /*DTMF timer needed to send a DTMF sequence*/
diff --git a/gtk/logging.c b/gtk/logging.c
index 26027251f..c5eb883c0 100644
--- a/gtk/logging.c
+++ b/gtk/logging.c
@@ -164,7 +164,6 @@ static FILE *linphone_gtk_log_init()
 
 static void linphone_gtk_log_file(OrtpLogLevel lev, const char *msg)
 {
-	time_t now;
 	FILE *outlog;
 
 	outlog = linphone_gtk_log_init();
@@ -176,12 +175,11 @@ static void linphone_gtk_log_file(OrtpLogLevel lev, const char *msg)
 		 logfile_date_format in the GtkUi section of the config file,
 		 but it defaults to something compact, but yet readable. */
 		const char *lname="undef";
-		char date[256];
 
 		/* Convert level constant to text */
 		switch(lev){
 			case ORTP_DEBUG:
-				lname="debug";
+				lname="debug  ";
 				break;
 			case ORTP_MESSAGE:
 				lname="message";
@@ -190,23 +188,16 @@ static void linphone_gtk_log_file(OrtpLogLevel lev, const char *msg)
 				lname="warning";
 				break;
 			case ORTP_ERROR:
-				lname="error";
+				lname="error  ";
 				break;
 			case ORTP_FATAL:
-				lname="fatal";
+				lname="fatal  ";
 				break;
 			default:
-				lname="undef";
+				lname="undef  ";
 				break;
 		}
-		/* Get current time and format it properly */
-		now = time(NULL);
-		strftime(date, sizeof(date), dateformat, localtime(&now));
-		/* Now print out the message to the logfile.  We don't flush,
-		 maybe we should do to ensure that we have all the messages in
-		 case of a crash (which is one of the main reasons we have a
-		     log facility in the first place). */
-		fprintf(outlog, "[%s] [%s] %s\n", date, lname, msg);
+		fprintf(outlog, "[%s] %s\n", lname, msg);
 		fflush(outlog);
 	}
 }
@@ -335,13 +326,24 @@ gboolean linphone_gtk_check_logs(){
  * Called from any linphone thread.
  */
 void linphone_gtk_log_push(OrtpLogLevel lev, const char *fmt, va_list args){
-	gchar *msg=g_strdup_vprintf(fmt,args);
 	LinphoneGtkLog *lgl=g_new(LinphoneGtkLog,1);
+	gchar *msg=g_strdup_vprintf(fmt,args);
+	gchar *dated_msg;
+	struct timeval tp;
+	struct tm *lt;
+	time_t tt;
+	
+	ortp_gettimeofday(&tp, NULL);
+	tt = (time_t)tp.tv_sec;
+	lt = localtime((const time_t*)&tt);
+	dated_msg=g_strdup_printf("%i-%.2i-%.2i %.2i:%.2i:%.2i:%.3i %s",
+		1900 + lt->tm_year, lt->tm_mon + 1, lt->tm_mday, lt->tm_hour, lt->tm_min, lt->tm_sec, (int)(tp.tv_usec / 1000), msg);
+	g_free(msg);
 	lgl->lev=lev;
-	lgl->msg=msg;
+	lgl->msg=dated_msg;
+	linphone_gtk_log_file(lev, dated_msg);
 	g_static_mutex_lock(&log_mutex);
 	log_queue=g_list_append(log_queue,lgl);
-	linphone_gtk_log_file(lev, msg);
 	g_static_mutex_unlock(&log_mutex);
 }
 
diff --git a/include/sal/sal.h b/include/sal/sal.h
index 666671674..4eedb23ab 100644
--- a/include/sal/sal.h
+++ b/include/sal/sal.h
@@ -811,4 +811,10 @@ int sal_lines_get_value(const char *data, const char *key, char *value, size_t v
 
 belle_sip_stack_t *sal_get_belle_sip_stack(Sal *sal);
 char* sal_op_get_public_uri(SalOp *sal);
+
+unsigned long sal_begin_background_task(const char *name, void (*max_time_reached)(void *), void *data); 
+void sal_end_background_task(unsigned long id);
+
 #endif
+
+

From 72bf8d52897df82fda2039e935c80054a9eb65fe Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Sat, 7 Feb 2015 11:44:09 +0100
Subject: [PATCH 371/496] update ms2

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 625547016..0598ca6db 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 625547016a09f0bde3a1ff6b35e29d71506174d0
+Subproject commit 0598ca6db0c1e32bf11f6382a204c78460416ce7

From 7b62f3313d0e3a876a61689cfb6ec2e04c4b0cc5 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Sat, 7 Feb 2015 13:23:33 +0100
Subject: [PATCH 372/496] repair linphone, broken by previous commit
 implementing stream directions.

---
 coreapi/call_params.c  | 23 ++++++++++++++++++++---
 coreapi/linphonecall.c |  7 +++++++
 coreapi/private.h      |  3 +++
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/coreapi/call_params.c b/coreapi/call_params.c
index b2eea131a..39412b99e 100644
--- a/coreapi/call_params.c
+++ b/coreapi/call_params.c
@@ -33,9 +33,8 @@ SalMediaProto get_proto_from_call_params(const LinphoneCallParams *params) {
 	return SalProtoRtpAvp;
 }
 
-static SalStreamDir sal_dir_from_call_params_dir(LinphoneCallParamsMediaDirection cpdir) {
+SalStreamDir sal_dir_from_call_params_dir(LinphoneCallParamsMediaDirection cpdir) {
 	switch (cpdir) {
-		default:
 		case LinphoneCallParamsMediaDirectionInactive:
 			return SalStreamInactive;
 		case LinphoneCallParamsMediaDirectionSendOnly:
@@ -47,6 +46,19 @@ static SalStreamDir sal_dir_from_call_params_dir(LinphoneCallParamsMediaDirectio
 	}
 }
 
+LinphoneCallParamsMediaDirection media_direction_from_sal_stream_dir(SalStreamDir dir){
+	switch (dir) {
+		case SalStreamInactive:
+			return LinphoneCallParamsMediaDirectionInactive;
+		case SalStreamSendOnly:
+			return LinphoneCallParamsMediaDirectionSendOnly;
+		case SalStreamRecvOnly:
+			return LinphoneCallParamsMediaDirectionRecvOnly;
+		case SalStreamSendRecv:
+			return LinphoneCallParamsMediaDirectionSendRecv;
+	}
+}
+
 SalStreamDir get_audio_dir_from_call_params(const LinphoneCallParams *params) {
 	return sal_dir_from_call_params_dir(linphone_call_params_get_audio_direction(params));
 }
@@ -91,6 +103,8 @@ void linphone_call_params_enable_low_bandwidth(LinphoneCallParams *cp, bool_t en
 
 void linphone_call_params_enable_video(LinphoneCallParams *cp, bool_t enabled){
 	cp->has_video=enabled;
+	if (cp->video_dir==LinphoneCallParamsMediaDirectionInactive)
+		cp->video_dir=LinphoneCallParamsMediaDirectionSendRecv;
 }
 
 const char *linphone_call_params_get_custom_header(const LinphoneCallParams *params, const char *header_name){
@@ -229,7 +243,10 @@ static void _linphone_call_params_destroy(LinphoneCallParams *cp){
 }
 
 LinphoneCallParams * linphone_call_params_new(void) {
-	return belle_sip_object_new(LinphoneCallParams);
+	LinphoneCallParams *cp=belle_sip_object_new(LinphoneCallParams);
+	cp->audio_dir=LinphoneCallParamsMediaDirectionSendRecv;
+	cp->video_dir=LinphoneCallParamsMediaDirectionSendRecv;
+	return cp;
 }
 
 /* DEPRECATED */
diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index 4f8b9d7e7..8ff489c25 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -1384,6 +1384,7 @@ void linphone_call_unref(LinphoneCall *obj){
  * Returns current parameters associated to the call.
 **/
 const LinphoneCallParams * linphone_call_get_current_params(LinphoneCall *call){
+	SalMediaDescription *md=call->resultdesc;
 #ifdef VIDEO_ENABLED
 	VideoStream *vstream;
 #endif
@@ -1419,6 +1420,12 @@ const LinphoneCallParams * linphone_call_get_current_params(LinphoneCall *call){
 	} else {
 		call->current_params->avpf_rr_interval = 0;
 	}
+	if (md){
+		SalStreamDescription *sd=sal_media_description_find_best_stream(md,SalAudio);
+		call->current_params->audio_dir=sd ? media_direction_from_sal_stream_dir(sd->dir) : LinphoneCallParamsMediaDirectionInactive;
+		sd=sal_media_description_find_best_stream(md,SalVideo);
+		call->current_params->video_dir=sd ? media_direction_from_sal_stream_dir(sd->dir) : LinphoneCallParamsMediaDirectionInactive;
+	}
 
 	return call->current_params;
 }
diff --git a/coreapi/private.h b/coreapi/private.h
index 36fc09b1b..0cdc16dc7 100644
--- a/coreapi/private.h
+++ b/coreapi/private.h
@@ -1105,6 +1105,9 @@ void linphone_core_notify_log_collection_upload_progress_indication(LinphoneCore
 void set_mic_gain_db(AudioStream *st, float gain);
 void set_playback_gain_db(AudioStream *st, float gain);
 
+LinphoneCallParamsMediaDirection media_direction_from_sal_stream_dir(SalStreamDir dir);
+SalStreamDir sal_dir_from_call_params_dir(LinphoneCallParamsMediaDirection cpdir);
+
 #ifdef ANDROID
 void linphone_core_wifi_lock_acquire(LinphoneCore *lc);
 void linphone_core_wifi_lock_release(LinphoneCore *lc);

From 5dbc66938c2e4eb97fd1e5ca1576a1a241ae6378 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Sat, 7 Feb 2015 13:30:30 +0100
Subject: [PATCH 373/496] rename LinphoneCallParamsMediaDirection into
 LinphoneMediaDirection, as it has no reason to be attached to
 LinphoneCallParams and could be re-used in other contexts.

---
 coreapi/call_params.c  | 38 ++++++++++++++++++++------------------
 coreapi/call_params.h  | 20 ++++++++++----------
 coreapi/linphonecall.c |  4 ++--
 coreapi/linphonecore.c |  4 ++--
 coreapi/private.h      |  8 ++++----
 tester/video_tester.c  |  8 ++++----
 6 files changed, 42 insertions(+), 40 deletions(-)

diff --git a/coreapi/call_params.c b/coreapi/call_params.c
index 39412b99e..a6731f28b 100644
--- a/coreapi/call_params.c
+++ b/coreapi/call_params.c
@@ -33,30 +33,32 @@ SalMediaProto get_proto_from_call_params(const LinphoneCallParams *params) {
 	return SalProtoRtpAvp;
 }
 
-SalStreamDir sal_dir_from_call_params_dir(LinphoneCallParamsMediaDirection cpdir) {
+SalStreamDir sal_dir_from_call_params_dir(LinphoneMediaDirection cpdir) {
 	switch (cpdir) {
-		case LinphoneCallParamsMediaDirectionInactive:
+		case LinphoneMediaDirectionInactive:
 			return SalStreamInactive;
-		case LinphoneCallParamsMediaDirectionSendOnly:
+		case LinphoneMediaDirectionSendOnly:
 			return SalStreamSendOnly;
-		case LinphoneCallParamsMediaDirectionRecvOnly:
+		case LinphoneMediaDirectionRecvOnly:
 			return SalStreamRecvOnly;
-		case LinphoneCallParamsMediaDirectionSendRecv:
+		case LinphoneMediaDirectionSendRecv:
 			return SalStreamSendRecv;
 	}
+	return SalStreamSendRecv;
 }
 
-LinphoneCallParamsMediaDirection media_direction_from_sal_stream_dir(SalStreamDir dir){
+LinphoneMediaDirection media_direction_from_sal_stream_dir(SalStreamDir dir){
 	switch (dir) {
 		case SalStreamInactive:
-			return LinphoneCallParamsMediaDirectionInactive;
+			return LinphoneMediaDirectionInactive;
 		case SalStreamSendOnly:
-			return LinphoneCallParamsMediaDirectionSendOnly;
+			return LinphoneMediaDirectionSendOnly;
 		case SalStreamRecvOnly:
-			return LinphoneCallParamsMediaDirectionRecvOnly;
+			return LinphoneMediaDirectionRecvOnly;
 		case SalStreamSendRecv:
-			return LinphoneCallParamsMediaDirectionSendRecv;
+			return LinphoneMediaDirectionSendRecv;
 	}
+	return LinphoneMediaDirectionSendRecv;
 }
 
 SalStreamDir get_audio_dir_from_call_params(const LinphoneCallParams *params) {
@@ -103,8 +105,8 @@ void linphone_call_params_enable_low_bandwidth(LinphoneCallParams *cp, bool_t en
 
 void linphone_call_params_enable_video(LinphoneCallParams *cp, bool_t enabled){
 	cp->has_video=enabled;
-	if (cp->video_dir==LinphoneCallParamsMediaDirectionInactive)
-		cp->video_dir=LinphoneCallParamsMediaDirectionSendRecv;
+	if (cp->video_dir==LinphoneMediaDirectionInactive)
+		cp->video_dir=LinphoneMediaDirectionSendRecv;
 }
 
 const char *linphone_call_params_get_custom_header(const LinphoneCallParams *params, const char *header_name){
@@ -195,19 +197,19 @@ bool_t linphone_call_params_video_enabled(const LinphoneCallParams *cp){
 	return cp->has_video;
 }
 
-LinphoneCallParamsMediaDirection linphone_call_params_get_audio_direction(const LinphoneCallParams *cp) {
+LinphoneMediaDirection linphone_call_params_get_audio_direction(const LinphoneCallParams *cp) {
 	return cp->audio_dir;
 }
 
-LinphoneCallParamsMediaDirection linphone_call_params_get_video_direction(const LinphoneCallParams *cp) {
+LinphoneMediaDirection linphone_call_params_get_video_direction(const LinphoneCallParams *cp) {
 	return cp->video_dir;
 }
 
-void linphone_call_params_set_audio_direction(LinphoneCallParams *cp,LinphoneCallParamsMediaDirection dir) {
+void linphone_call_params_set_audio_direction(LinphoneCallParams *cp,LinphoneMediaDirection dir) {
 	cp->audio_dir=dir;
 }
 
-void linphone_call_params_set_video_direction(LinphoneCallParams *cp,LinphoneCallParamsMediaDirection dir) {
+void linphone_call_params_set_video_direction(LinphoneCallParams *cp,LinphoneMediaDirection dir) {
 	cp->video_dir=dir;
 }
 
@@ -244,8 +246,8 @@ static void _linphone_call_params_destroy(LinphoneCallParams *cp){
 
 LinphoneCallParams * linphone_call_params_new(void) {
 	LinphoneCallParams *cp=belle_sip_object_new(LinphoneCallParams);
-	cp->audio_dir=LinphoneCallParamsMediaDirectionSendRecv;
-	cp->video_dir=LinphoneCallParamsMediaDirectionSendRecv;
+	cp->audio_dir=LinphoneMediaDirectionSendRecv;
+	cp->video_dir=LinphoneMediaDirectionSendRecv;
 	return cp;
 }
 
diff --git a/coreapi/call_params.h b/coreapi/call_params.h
index 8d728c22c..beecc9791 100644
--- a/coreapi/call_params.h
+++ b/coreapi/call_params.h
@@ -33,17 +33,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 /**
  * Indicates for a given media the stream direction
  * */
-enum _LinphoneCallParamsMediaDirection {
-	LinphoneCallParamsMediaDirectionInactive, /** No active media not supported yet*/
-	LinphoneCallParamsMediaDirectionSendOnly, /** Send only mode*/
-	LinphoneCallParamsMediaDirectionRecvOnly, /** recv only mode*/
-	LinphoneCallParamsMediaDirectionSendRecv, /*send receive mode not supported yet*/
+enum _LinphoneMediaDirection {
+	LinphoneMediaDirectionInactive, /** No active media not supported yet*/
+	LinphoneMediaDirectionSendOnly, /** Send only mode*/
+	LinphoneMediaDirectionRecvOnly, /** recv only mode*/
+	LinphoneMediaDirectionSendRecv, /*send receive mode not supported yet*/
 
 };
 /**
  * Typedef for enum
 **/
-typedef enum _LinphoneCallParamsMediaDirection LinphoneCallParamsMediaDirection;
+typedef enum _LinphoneMediaDirection LinphoneMediaDirection;
 
 /**
  * Private structure definition for LinphoneCallParams.
@@ -266,28 +266,28 @@ LINPHONE_PUBLIC bool_t linphone_call_params_video_enabled(const LinphoneCallPara
  * @param[in] cl LinphoneCallParams object
  * @return The audio stream direction associated with the call params.
 **/
-LINPHONE_PUBLIC  LinphoneCallParamsMediaDirection linphone_call_params_get_audio_direction(const LinphoneCallParams *cp);
+LINPHONE_PUBLIC  LinphoneMediaDirection linphone_call_params_get_audio_direction(const LinphoneCallParams *cp);
 
 /**
  * Get the video stream direction.
  * @param[in] cl LinphoneCallParams object
  * @return The video stream direction associated with the call params.
 **/
-LINPHONE_PUBLIC  LinphoneCallParamsMediaDirection linphone_call_params_get_video_direction(const LinphoneCallParams *cp);
+LINPHONE_PUBLIC  LinphoneMediaDirection linphone_call_params_get_video_direction(const LinphoneCallParams *cp);
 
 /**
  * Set the audio stream direction. Only relevant for multicast
  * @param[in] cl LinphoneCallParams object
  * @param[in] The audio stream direction associated with this call params.
 **/
-LINPHONE_PUBLIC void linphone_call_params_set_audio_direction(LinphoneCallParams *cp, LinphoneCallParamsMediaDirection dir);
+LINPHONE_PUBLIC void linphone_call_params_set_audio_direction(LinphoneCallParams *cp, LinphoneMediaDirection dir);
 
 /**
  * Set the video stream direction. Only relevant for multicast
  * @param[in] cl LinphoneCallParams object
  * @param[in] The video stream direction associated with this call params.
 **/
-LINPHONE_PUBLIC void linphone_call_params_set_video_direction(LinphoneCallParams *cp, LinphoneCallParamsMediaDirection dir);
+LINPHONE_PUBLIC void linphone_call_params_set_video_direction(LinphoneCallParams *cp, LinphoneMediaDirection dir);
 
 
 /*******************************************************************************
diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index 8ff489c25..b6b6a3230 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -1422,9 +1422,9 @@ const LinphoneCallParams * linphone_call_get_current_params(LinphoneCall *call){
 	}
 	if (md){
 		SalStreamDescription *sd=sal_media_description_find_best_stream(md,SalAudio);
-		call->current_params->audio_dir=sd ? media_direction_from_sal_stream_dir(sd->dir) : LinphoneCallParamsMediaDirectionInactive;
+		call->current_params->audio_dir=sd ? media_direction_from_sal_stream_dir(sd->dir) : LinphoneMediaDirectionInactive;
 		sd=sal_media_description_find_best_stream(md,SalVideo);
-		call->current_params->video_dir=sd ? media_direction_from_sal_stream_dir(sd->dir) : LinphoneCallParamsMediaDirectionInactive;
+		call->current_params->video_dir=sd ? media_direction_from_sal_stream_dir(sd->dir) : LinphoneMediaDirectionInactive;
 	}
 
 	return call->current_params;
diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 923731619..bcf017da0 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -6907,8 +6907,8 @@ void linphone_core_init_default_params(LinphoneCore*lc, LinphoneCallParams *para
 	params->in_conference=FALSE;
 	params->privacy=LinphonePrivacyDefault;
 	params->avpf_enabled=FALSE;
-	params->audio_dir=LinphoneCallParamsMediaDirectionSendRecv;
-	params->video_dir=LinphoneCallParamsMediaDirectionSendRecv;
+	params->audio_dir=LinphoneMediaDirectionSendRecv;
+	params->video_dir=LinphoneMediaDirectionSendRecv;
 	params->real_early_media=lp_config_get_int(lc->config,"misc","real_early_media",FALSE);
 }
 
diff --git a/coreapi/private.h b/coreapi/private.h
index 0cdc16dc7..15083943e 100644
--- a/coreapi/private.h
+++ b/coreapi/private.h
@@ -108,8 +108,8 @@ struct _LinphoneCallParams{
 	bool_t no_user_consent;/*when set to TRUE an UPDATE request will be used instead of reINVITE*/
 	uint16_t avpf_rr_interval; /*in milliseconds*/
 	LinphonePrivacyMask privacy;
-	LinphoneCallParamsMediaDirection audio_dir;
-	LinphoneCallParamsMediaDirection video_dir;
+	LinphoneMediaDirection audio_dir;
+	LinphoneMediaDirection video_dir;
 
 };
 
@@ -1105,8 +1105,8 @@ void linphone_core_notify_log_collection_upload_progress_indication(LinphoneCore
 void set_mic_gain_db(AudioStream *st, float gain);
 void set_playback_gain_db(AudioStream *st, float gain);
 
-LinphoneCallParamsMediaDirection media_direction_from_sal_stream_dir(SalStreamDir dir);
-SalStreamDir sal_dir_from_call_params_dir(LinphoneCallParamsMediaDirection cpdir);
+LinphoneMediaDirection media_direction_from_sal_stream_dir(SalStreamDir dir);
+SalStreamDir sal_dir_from_call_params_dir(LinphoneMediaDirection cpdir);
 
 #ifdef ANDROID
 void linphone_core_wifi_lock_acquire(LinphoneCore *lc);
diff --git a/tester/video_tester.c b/tester/video_tester.c
index bd034310c..c1807f3fe 100644
--- a/tester/video_tester.c
+++ b/tester/video_tester.c
@@ -121,8 +121,8 @@ static void early_media_video_call_state_changed(LinphoneCore *lc, LinphoneCall
 		case LinphoneCallIncomingReceived:
 			params = linphone_core_create_default_call_parameters(lc);
 			linphone_call_params_enable_video(params, TRUE);
-			linphone_call_params_set_audio_direction(params, LinphoneCallParamsMediaDirectionSendOnly);
-			linphone_call_params_set_video_direction(params, LinphoneCallParamsMediaDirectionRecvOnly);
+			linphone_call_params_set_audio_direction(params, LinphoneMediaDirectionSendOnly);
+			linphone_call_params_set_video_direction(params, LinphoneMediaDirectionRecvOnly);
 			linphone_core_accept_early_media_with_params(lc, call, params);
 			linphone_call_params_unref(params);
 			break;
@@ -302,8 +302,8 @@ static void two_incoming_early_media_video_calls_test(void) {
 		CU_ASSERT_PTR_NOT_NULL(call);
 		if (call != NULL) {
 			LinphoneCallParams *params = linphone_call_params_copy(linphone_call_get_current_params(call));
-			linphone_call_params_set_audio_direction(params, LinphoneCallParamsMediaDirectionSendRecv);
-			linphone_call_params_set_video_direction(params, LinphoneCallParamsMediaDirectionSendRecv);
+			linphone_call_params_set_audio_direction(params, LinphoneMediaDirectionSendRecv);
+			linphone_call_params_set_video_direction(params, LinphoneMediaDirectionSendRecv);
 			linphone_core_accept_call_with_params(marie->lc, call, params);
 
 			/* Wait for 5s. */

From e4cd4380070e47a8e7caf63530bead5128ba2f88 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Sat, 7 Feb 2015 13:44:19 +0100
Subject: [PATCH 374/496] update ms2

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 0598ca6db..73338e9d9 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 0598ca6db0c1e32bf11f6382a204c78460416ce7
+Subproject commit 73338e9d908f105683f45f86a3003c9fee60da5c

From 70e66a5b433fbb62cfdc94ef6ed829cae0ad7ef6 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Sat, 7 Feb 2015 18:20:56 +0100
Subject: [PATCH 375/496] update ms2

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 73338e9d9..a92d90999 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 73338e9d908f105683f45f86a3003c9fee60da5c
+Subproject commit a92d909993d0f4fc3e8656e4f5ff4f51a4cfe8ca

From b97cb51e58a18a62d87629296ebe02d3abad7d18 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Sat, 7 Feb 2015 23:57:27 +0100
Subject: [PATCH 376/496] repair liblinphone again

---
 coreapi/call_params.c  | 2 +-
 coreapi/linphonecore.c | 2 +-
 mediastreamer2         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/coreapi/call_params.c b/coreapi/call_params.c
index a6731f28b..8acc33b19 100644
--- a/coreapi/call_params.c
+++ b/coreapi/call_params.c
@@ -105,7 +105,7 @@ void linphone_call_params_enable_low_bandwidth(LinphoneCallParams *cp, bool_t en
 
 void linphone_call_params_enable_video(LinphoneCallParams *cp, bool_t enabled){
 	cp->has_video=enabled;
-	if (cp->video_dir==LinphoneMediaDirectionInactive)
+	if (enabled && cp->video_dir==LinphoneMediaDirectionInactive)
 		cp->video_dir=LinphoneMediaDirectionSendRecv;
 }
 
diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index bcf017da0..848f25761 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -3587,7 +3587,7 @@ int _linphone_core_accept_call_update(LinphoneCore *lc, LinphoneCall *call, cons
 		return 0;
 	}
 	if (params==NULL){
-		call->params->has_video=lc->video_policy.automatically_accept || call->current_params->has_video;
+		linphone_call_params_enable_video(call->params, lc->video_policy.automatically_accept || call->current_params->has_video);
 	}else
 		linphone_call_set_new_params(call,params);
 
diff --git a/mediastreamer2 b/mediastreamer2
index a92d90999..ac4fc4a44 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit a92d909993d0f4fc3e8656e4f5ff4f51a4cfe8ca
+Subproject commit ac4fc4a447e73e50a044c2c9113ea00f72dd441a

From 5f7da2c9cad262b2f37d6027776f3fa9a647d0ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
 <francois.grisez@belledonne-communications.com>
Date: Mon, 9 Feb 2015 16:55:56 +0100
Subject: [PATCH 377/496] Fix bug #1987: crash when pulseaudio is down

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index ac4fc4a44..87329a0a0 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit ac4fc4a447e73e50a044c2c9113ea00f72dd441a
+Subproject commit 87329a0a0fc3dedd29885ff892b2c79ea66be833

From 5a79ebff2e211823ef3d9da2c1524efcee974e97 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Mon, 9 Feb 2015 17:35:23 +0100
Subject: [PATCH 378/496] disable advanced presence test for now

---
 tester/presence_tester.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tester/presence_tester.c b/tester/presence_tester.c
index 871aacf4f..3b711e52e 100644
--- a/tester/presence_tester.c
+++ b/tester/presence_tester.c
@@ -347,7 +347,7 @@ static void presence_information(void) {
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
 }
-#define USE_PRESENCE_SERVER 1
+#define USE_PRESENCE_SERVER 0
 
 #if USE_PRESENCE_SERVER
 static void test_subscribe_notify_publish(void) {

From cd00cc8355afcca86926c1b5beb68ea0cae121ff Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Mon, 9 Feb 2015 16:57:14 +0100
Subject: [PATCH 379/496] Add LinphoneCore.setPrimaryContact() with address

---
 coreapi/linphonecore_jni.cc                       | 12 ++++++++++++
 java/common/org/linphone/core/LinphoneCore.java   | 10 ++++++++++
 java/common/org/linphone/core/VideoSize.java      |  8 ++++++++
 java/impl/org/linphone/core/LinphoneCoreImpl.java | 10 ++++++++++
 4 files changed, 40 insertions(+)

diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index b4a929a07..8448e56fc 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -1220,6 +1220,18 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setChatDatabasePath(JNIE
 	env->ReleaseStringUTFChars(jpath, path);
 }
 
+extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setPrimaryContact2(JNIEnv* env, jobject  thiz, jlong lc, jstring jcontact) {
+	const char* contact = env->GetStringUTFChars(jcontact, NULL);
+	linphone_core_set_primary_contact((LinphoneCore*)lc, contact);
+	env->ReleaseStringUTFChars(jcontact, contact);
+}
+
+extern "C" jstring Java_org_linphone_core_LinphoneCoreImpl_getPrimaryContact(JNIEnv* env, jobject  thiz, jlong lc) {
+	LinphoneAddress* identity = linphone_core_get_primary_contact_parsed((LinphoneCore*)lc);
+	return identity ? env->NewStringUTF(linphone_address_as_string(identity)) : NULL;
+}
+
+
 extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setPrimaryContact(JNIEnv* env, jobject  thiz, jlong lc, jstring jdisplayname, jstring jusername) {
 	const char* displayname = jdisplayname ? env->GetStringUTFChars(jdisplayname, NULL) : NULL;
 	const char* username = jusername ? env->GetStringUTFChars(jusername, NULL) : NULL;
diff --git a/java/common/org/linphone/core/LinphoneCore.java b/java/common/org/linphone/core/LinphoneCore.java
index 98e9226eb..7c23cb9bb 100644
--- a/java/common/org/linphone/core/LinphoneCore.java
+++ b/java/common/org/linphone/core/LinphoneCore.java
@@ -1576,6 +1576,16 @@ public interface LinphoneCore {
 	**/
 	void setMicrophoneGain(float gain);
 
+	/**
+	 * Set address to use if no LinphoneProxyConfig configured
+	 */
+	void setPrimaryContact(String address);
+
+	/**
+	 * Returns the address used if no LinphoneProxyConfig configured
+	 */
+	String getPrimaryContact();
+
 	/**
 	 * Set username and display name to use if no LinphoneProxyConfig configured
 	 */
diff --git a/java/common/org/linphone/core/VideoSize.java b/java/common/org/linphone/core/VideoSize.java
index 6bba95e74..7685e20a0 100644
--- a/java/common/org/linphone/core/VideoSize.java
+++ b/java/common/org/linphone/core/VideoSize.java
@@ -26,6 +26,13 @@ public final class VideoSize {
 	public static final int CIF = 1;
 	public static final int HVGA = 2;
 	public static final int QVGA = 3;
+	public static final VideoSize VIDEO_SIZE_QCIF = new VideoSize(176,144);
+	public static final VideoSize VIDEO_SIZE_CIF = new VideoSize(352,288);
+	public static final VideoSize VIDEO_SIZE_QVGA = new VideoSize(320,240);
+	public static final VideoSize VIDEO_SIZE_HVGA = new VideoSize(320,480);
+	public static final VideoSize VIDEO_SIZE_VGA = new VideoSize(640,480);
+	public static final VideoSize VIDEO_SIZE_720P = new VideoSize(1280,720);
+	public static final VideoSize VIDEO_SIZE_1020P = new VideoSize(1920,1080);
 
 	public int width;
 	public int height;
@@ -36,6 +43,7 @@ public final class VideoSize {
 		this.height = height;
 	}
 
+	@Deprecated
 	public static final VideoSize createStandard(int code, boolean inverted) {
 		switch (code) {
 		case QCIF:
diff --git a/java/impl/org/linphone/core/LinphoneCoreImpl.java b/java/impl/org/linphone/core/LinphoneCoreImpl.java
index fd1796102..2773189e8 100644
--- a/java/impl/org/linphone/core/LinphoneCoreImpl.java
+++ b/java/impl/org/linphone/core/LinphoneCoreImpl.java
@@ -150,6 +150,8 @@ public class LinphoneCoreImpl implements LinphoneCore {
 	private native void setVideoPortRange(long nativePtr, int minPort, int maxPort);
 	private native void setIncomingTimeout(long nativePtr, int timeout);
 	private native void setInCallTimeout(long nativePtr, int timeout);
+	private native void setPrimaryContact2(long nativePtr, String contact);
+	private native String getPrimaryContact(long nativePtr);
 	private native void setPrimaryContact(long nativePtr, String displayName, String username);
 	private native String getPrimaryContactUsername(long nativePtr);
 	private native String getPrimaryContactDisplayName(long nativePtr);
@@ -977,6 +979,14 @@ public class LinphoneCoreImpl implements LinphoneCore {
 		setMicrophoneGain(nativePtr, gain);
 	}
 
+	public synchronized void setPrimaryContact(String address) {
+		setPrimaryContact2(nativePtr, address);
+	}
+
+	public synchronized String getPrimaryContact() {
+		return getPrimaryContact(nativePtr);
+	}
+
 	public synchronized void setPrimaryContact(String displayName, String username) {
 		setPrimaryContact(nativePtr, displayName, username);
 	}

From a27e9ecbbc756cc3a4604900d14effe2a22ba139 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Tue, 10 Feb 2015 12:15:03 +0100
Subject: [PATCH 380/496] Update ms2 submodule.

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 87329a0a0..b044ee467 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 87329a0a0fc3dedd29885ff892b2c79ea66be833
+Subproject commit b044ee4679348d68142ec0f753dce5f4caeaaf6d

From f248cde16a94b5d7ddf8019c7a5d2542932edaca Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Tue, 10 Feb 2015 14:04:20 +0100
Subject: [PATCH 381/496] Disable ms_audio_diff on ios simulator too because it
 locks the main loop

---
 tester/call_tester.c | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/tester/call_tester.c b/tester/call_tester.c
index 52dd68da1..1ec6d71f6 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -2096,8 +2096,6 @@ static void call_with_file_player(void) {
 	LinphonePlayer *player;
 	char hellopath[256];
 	char *recordpath = create_filepath(liblinphone_tester_writable_dir_prefix, "record", "wav");
-	double similar;
-	const double threshold = 0.9;
 
 	/*make sure the record file doesn't already exists, otherwise this test will append new samples to it*/
 	unlink(recordpath);
@@ -2129,16 +2127,22 @@ static void call_with_file_player(void) {
 	linphone_core_terminate_all_calls(marie->lc);
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,1));
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1));
-#ifndef __arm__
-	CU_ASSERT_TRUE(ms_audio_diff(hellopath,recordpath,&similar,NULL,NULL)==0);
-	CU_ASSERT_TRUE(similar>threshold);
-	CU_ASSERT_TRUE(similar<=1.0);
-	if(similar > threshold && similar <=1.0) {
-		remove(recordpath);
+	/*cannot run on iphone simulator because locks main loop beyond permitted time (should run
+	on another thread) */
+#if !defined(__arm__) && !defined(__arm64__) && TARGET_IPHONE_SIMULATOR
+	{
+		double similar;
+		const double threshold = 0.9;
+		CU_ASSERT_TRUE(ms_audio_diff(hellopath,recordpath,&similar,NULL,NULL)==0);
+		CU_ASSERT_TRUE(similar>threshold);
+		CU_ASSERT_TRUE(similar<=1.0);
+		if(similar > threshold && similar <=1.0) {
+			remove(recordpath);
+		}
 	}
 #else
 	remove(recordpath);
-#endif 
+#endif
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
 	ms_free(recordpath);
@@ -3447,9 +3451,9 @@ static void call_with_paused_no_sdp_on_resume() {
 	wait_for_until(pauline->lc, marie->lc, NULL, 5, 2000);
 
 	ms_message("== Call paused, marie call: %p ==", call_marie);
-	
+
 	linphone_core_enable_sdp_200_ack(marie->lc,TRUE);
-	
+
 	linphone_core_resume_call(marie->lc,call_marie);
 
 	CU_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&marie->stat.number_of_LinphoneCallStreamsRunning,2));
@@ -3478,13 +3482,13 @@ static void call_with_generic_cn(void) {
 	LinphoneCall *pauline_call;
 	char *audio_file_with_silence=ms_strdup_printf("%s/%s",liblinphone_tester_file_prefix,"sounds/ahbahouaismaisbon.wav");
 	char *recorded_file=ms_strdup_printf("%s/%s",liblinphone_tester_writable_dir_prefix,"result.wav");
-	
+
 	belle_sip_object_enable_leak_detector(TRUE);
 	begin=belle_sip_object_get_object_count();
 
 	marie = linphone_core_manager_new( "marie_rc");
 	pauline = linphone_core_manager_new( "pauline_rc");
-	
+
 	remove(recorded_file);
 
 	linphone_core_use_files(marie->lc,TRUE);
@@ -3501,7 +3505,7 @@ static void call_with_generic_cn(void) {
 		const rtp_stats_t *rtps;
 		struct stat stbuf;
 		int err;
-		
+
 		wait_for_until(marie->lc, pauline->lc, NULL, 0, 8000);
 		rtps=rtp_session_get_stats(pauline_call->audiostream->ms.sessions.rtp_session);
 		CU_ASSERT_TRUE(rtps->packet_recv<=300 && rtps->packet_recv>=200);

From e9f89d162ffd44c8e16e0b9f547db39885c6697e Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Tue, 10 Feb 2015 15:11:32 +0100
Subject: [PATCH 382/496] do not unregister event queue while msticker is still
 running with the RtpSession. The stream must be first stopped, then queue can
 be destroyed safely

---
 coreapi/linphonecall.c | 14 ++++++--------
 coreapi/linphonecore.c |  1 +
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index b6b6a3230..1535dc957 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -2763,10 +2763,6 @@ static void linphone_call_stop_audio_stream(LinphoneCall *call) {
 	if (call->audiostream!=NULL) {
 		linphone_reporting_update_media_info(call, LINPHONE_CALL_STATS_AUDIO);
 		media_stream_reclaim_sessions(&call->audiostream->ms,&call->sessions[0]);
-		rtp_session_unregister_event_queue(call->audiostream->ms.sessions.rtp_session,call->audiostream_app_evq);
-		ortp_ev_queue_flush(call->audiostream_app_evq);
-		ortp_ev_queue_destroy(call->audiostream_app_evq);
-		call->audiostream_app_evq=NULL;
 
 		if (call->audiostream->ec){
 			const char *state_str=NULL;
@@ -2782,6 +2778,9 @@ static void linphone_call_stop_audio_stream(LinphoneCall *call) {
 			linphone_call_remove_from_conf(call);
 		}
 		audio_stream_stop(call->audiostream);
+		ortp_ev_queue_flush(call->audiostream_app_evq);
+		ortp_ev_queue_destroy(call->audiostream_app_evq);
+		call->audiostream_app_evq=NULL;
 		call->audiostream=NULL;
 		call->current_params->audio_codec = NULL;
 	}
@@ -2792,13 +2791,12 @@ static void linphone_call_stop_video_stream(LinphoneCall *call) {
 	if (call->videostream!=NULL){
 		linphone_reporting_update_media_info(call, LINPHONE_CALL_STATS_VIDEO);
 		media_stream_reclaim_sessions(&call->videostream->ms,&call->sessions[1]);
-		rtp_session_unregister_event_queue(call->videostream->ms.sessions.rtp_session,call->videostream_app_evq);
-		ortp_ev_queue_flush(call->videostream_app_evq);
-		ortp_ev_queue_destroy(call->videostream_app_evq);
-		call->videostream_app_evq=NULL;
 		linphone_call_log_fill_stats(call->log,(MediaStream*)call->videostream);
 		video_stream_stop(call->videostream);
 		call->videostream=NULL;
+		ortp_ev_queue_flush(call->videostream_app_evq);
+		ortp_ev_queue_destroy(call->videostream_app_evq);
+		call->videostream_app_evq=NULL;
 		call->current_params->video_codec = NULL;
 	}
 #endif
diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 848f25761..ffa2a6b32 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -1075,6 +1075,7 @@ static bool_t get_codec(LinphoneCore *lc, SalStreamType type, int index, Payload
 		pt->mime_type=ortp_strdup(mime);
 		pt->clock_rate=rate;
 		pt->channels=channels;
+		payload_type_set_number(pt,-1); /*dynamic assignment*/
 		payload_type_set_recv_fmtp(pt,fmtp);
 		*default_list=ms_list_append(*default_list, pt);
 	}

From e04eaf9b2f3c8875605ce86fda12ed9ac7da6da1 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Tue, 10 Feb 2015 15:48:36 +0100
Subject: [PATCH 383/496] update ms2

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index b044ee467..0df389ab8 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit b044ee4679348d68142ec0f753dce5f4caeaaf6d
+Subproject commit 0df389ab84246c9b1135cf9f3379fca528e47983

From b305c8861301675d82d3e92743e20e1a0e102fb7 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Tue, 10 Feb 2015 16:09:02 +0100
Subject: [PATCH 384/496] Fix Python unit tests.

---
 tools/python/unittests/test_message.py  |  6 ++++++
 tools/python/unittests/test_register.py | 22 ++++++++++++++++++----
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/tools/python/unittests/test_message.py b/tools/python/unittests/test_message.py
index 8cfb05c87..1cc60c32d 100644
--- a/tools/python/unittests/test_message.py
+++ b/tools/python/unittests/test_message.py
@@ -147,6 +147,8 @@ class TestMessage:
         assert_equals(filecmp.cmp(send_filepath, receive_filepath, shallow=False), True)
         if os.path.exists(receive_filepath):
             os.remove(receive_filepath)
+        marie.stop()
+        pauline.stop()
 
     def test_small_file_transfer_message(self):
         send_buf = "small file"
@@ -183,6 +185,8 @@ class TestMessage:
         assert_equals(pauline.stats.number_of_LinphoneMessageDelivered, 1)
         assert_equals(marie.stats.number_of_LinphoneMessageExtBodyReceived, 1)
         assert_equals(send_buf, marie.stats.last_received_chat_message.user_data)
+        marie.stop()
+        pauline.stop()
 
     def test_file_transfer_message_upload_cancelled(self):
         send_buf = "big file"
@@ -214,3 +218,5 @@ class TestMessage:
         assert_equals(CoreManager.wait_for(pauline, marie, lambda pauline, marie: pauline.stats.number_of_LinphoneMessageNotDelivered == 1), True)
         assert_equals(pauline.stats.number_of_LinphoneMessageNotDelivered, 1)
         assert_equals(marie.stats.number_of_LinphoneMessageExtBodyReceived, 0)
+        marie.stop()
+        pauline.stop()
diff --git a/tools/python/unittests/test_register.py b/tools/python/unittests/test_register.py
index abfa6fa17..03a5d2e05 100644
--- a/tools/python/unittests/test_register.py
+++ b/tools/python/unittests/test_register.py
@@ -81,6 +81,7 @@ class TestRegister:
         cm = RegisterCoreManager()
         cm.register_with_refresh(False, None, None)
         assert_equals(cm.stats.number_of_auth_info_requested, 0)
+        cm.stop()
 
     def test_simple_unregister(self):
         cm = RegisterCoreManager()
@@ -93,18 +94,22 @@ class TestRegister:
         pc.register_enabled = False
         pc.done()
         assert_equals(CoreManager.wait_for(cm, cm, lambda cm1, cm2: cm1.stats.number_of_LinphoneRegistrationCleared == 1), True)
+        cm.stop()
 
     def test_simple_tcp_register(self):
         cm = RegisterCoreManager()
         cm.register_with_refresh(False, test_domain, "sip:{route};transport=tcp".format(route=test_route))
+        cm.stop()
 
     def test_simple_tcp_register_compatibility_mode(self):
         cm = RegisterCoreManager()
         cm.register_with_refresh(False, test_domain, "sip:{route}".format(route=test_route), transport=linphone.SipTransports(0, 5070, 0, 0))
+        cm.stop()
 
     def test_simple_tls_register(self):
         cm = RegisterCoreManager()
         cm.register_with_refresh(False, test_domain, "sip:{route};transport=tls".format(route=test_route))
+        cm.stop()
 
     def test_tls_register_with_alt_name(self):
         cm = CoreManager('pauline_alt_rc', False)
@@ -112,6 +117,7 @@ class TestRegister:
         cm.lc.refresh_registers()
         assert_equals(CoreManager.wait_for(cm, cm, lambda cm1, cm2: cm1.stats.number_of_LinphoneRegistrationOk == 1), True)
         assert_equals(cm.stats.number_of_LinphoneRegistrationFailed, 0)
+        cm.stop()
 
     def test_tls_wildcard_register(self):
         cm = CoreManager('pauline_wild_rc', False)
@@ -119,6 +125,7 @@ class TestRegister:
         cm.lc.refresh_registers()
         assert_equals(CoreManager.wait_for(cm, cm, lambda cm1, cm2: cm1.stats.number_of_LinphoneRegistrationOk == 2), True)
         assert_equals(cm.stats.number_of_LinphoneRegistrationFailed, 0)
+        cm.stop()
 
     def test_tls_certificate_failure(self):
         cm = CoreManager('pauline_rc', False)
@@ -132,6 +139,7 @@ class TestRegister:
         cm.lc.refresh_registers()
         assert_equals(CoreManager.wait_for(cm, cm, lambda cm1, cm2: cm1.stats.number_of_LinphoneRegistrationOk == 1), True)
         assert_equals(cm.stats.number_of_LinphoneRegistrationFailed, 2)
+        cm.stop()
 
     def test_tls_with_non_tls_server(self):
         cm = CoreManager('marie_rc', False)
@@ -145,6 +153,7 @@ class TestRegister:
         pc.server_addr = "sip:{domain}:{port};transport=tls".format(domain=addr.domain, port=port)
         pc.done()
         assert_equals(CoreManager.wait_for_until(cm, cm, lambda cm1, cm2: cm1.stats.number_of_LinphoneRegistrationFailed == 1, 5000), True)
+        cm.stop()
 
     def test_simple_authenticated_register(self):
         cm = RegisterCoreManager()
@@ -152,36 +161,40 @@ class TestRegister:
         cm.lc.add_auth_info(info)
         cm.register_with_refresh(False, auth_domain, "sip:{route}".format(route=test_route))
         assert_equals(cm.stats.number_of_auth_info_requested, 0)
+        cm.stop()
 
     def test_digest_auth_without_initial_credentials(self):
         cm = RegisterCoreManager(with_auth=True)
         cm.register_with_refresh(False, auth_domain, "sip:{route}".format(route=test_route))
         assert_equals(cm.stats.number_of_auth_info_requested, 1)
+        cm.stop()
 
     def test_authenticated_register_with_late_credentials(self):
         cm = RegisterCoreManager()
         cm.register_with_refresh(False, auth_domain, "sip:{route}".format(route=test_route), True, linphone.SipTransports(5070, 5070, 5071, 0))
         assert_equals(cm.stats.number_of_auth_info_requested, 1)
+        cm.stop()
 
     def test_simple_register_with_refresh(self):
         cm = RegisterCoreManager()
         cm.register_with_refresh(True, None, None)
         assert_equals(cm.stats.number_of_auth_info_requested, 0)
+        cm.stop()
 
     def test_simple_auth_register_with_refresh(self):
         cm = RegisterCoreManager(with_auth=True)
         cm.register_with_refresh(True, auth_domain, "sip:{route}".format(route=test_route))
         assert_equals(cm.stats.number_of_auth_info_requested, 1)
+        cm.stop()
 
     def test_multiple_accounts(self):
-        cm = CoreManager('multi_account_rc', False)
-        assert_equals(CoreManager.wait_for(cm, cm, lambda cm1, cm2: cm1.stats.number_of_LinphoneRegistrationOk == len(cm.lc.proxy_config_list)), True)
+        cm = CoreManager('multi_account_rc', True)
+        cm.stop()
 
     def test_transport_change(self):
-        cm = CoreManager('multi_account_rc', False)
+        cm = CoreManager('multi_account_rc', True)
         number_of_udp_proxies = reduce(lambda x, y: x + int(y.transport == "udp"), cm.lc.proxy_config_list, 0)
         total_number_of_proxies = len(cm.lc.proxy_config_list)
-        assert_equals(CoreManager.wait_for(cm, cm, lambda cm1, cm2: cm1.stats.number_of_LinphoneRegistrationOk == total_number_of_proxies), True)
         register_ok = cm.stats.number_of_LinphoneRegistrationOk
         # Keep only UDP
         tr = linphone.SipTransports(0, 0, 0, 0)
@@ -189,3 +202,4 @@ class TestRegister:
         cm.lc.sip_transports = tr
         assert_equals(CoreManager.wait_for(cm, cm, lambda cm1, cm2: cm1.stats.number_of_LinphoneRegistrationOk == (register_ok + number_of_udp_proxies)), True)
         assert_equals(CoreManager.wait_for(cm, cm, lambda cm1, cm2: cm1.stats.number_of_LinphoneRegistrationFailed == (total_number_of_proxies - number_of_udp_proxies)), True)
+        cm.stop()

From f06f93a76c7fb8e43fe99c16b00b80e393f69079 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Tue, 10 Feb 2015 17:07:20 +0100
Subject: [PATCH 385/496] update ms2

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 0df389ab8..ce80feec0 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 0df389ab84246c9b1135cf9f3379fca528e47983
+Subproject commit ce80feec091c75bcb69c4adf42fada7b7f0ffacc

From e797f7063fb77aae906d008791429c4798a22c36 Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Tue, 10 Feb 2015 18:12:07 +0100
Subject: [PATCH 386/496] Add logcollection methods in linphoneFactory

---
 coreapi/linphonecore_jni.cc                   | 34 +++++++++++++------
 .../linphone/core/LinphoneCoreFactory.java    | 13 ++++++-
 .../core/LinphoneCoreFactoryImpl.java         |  6 ++++
 .../org/linphone/core/LinphoneCoreImpl.java   | 13 +------
 4 files changed, 42 insertions(+), 24 deletions(-)

diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index 8448e56fc..6b6556116 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -161,6 +161,21 @@ extern "C" void Java_org_linphone_core_LinphoneCoreFactoryImpl_setDebugMode(JNIE
 		linphone_core_disable_logs();
 	}
 }
+
+extern "C" void Java_org_linphone_core_LinphoneCoreFactoryImpl_enableLogCollection(JNIEnv* env
+		,jobject  thiz
+		,jboolean enable) {
+	linphone_core_enable_log_collection(enable ? LinphoneLogCollectionEnabledWithoutPreviousLogHandler : LinphoneLogCollectionDisabled);
+}
+
+extern "C" void Java_org_linphone_core_LinphoneCoreFactoryImpl_setLogCollectionPath(JNIEnv* env
+		,jobject  thiz
+		,jstring jpath) {
+
+	const char* path = env->GetStringUTFChars(jpath, NULL);
+	linphone_core_set_log_collection_path(path);
+	env->ReleaseStringUTFChars(jpath, path);
+}
 // LinphoneCore
 
 /*
@@ -1073,6 +1088,10 @@ public:
 							,lcData->core
 							,(jlong)offset
 							,(jlong)total);
+		if (env->ExceptionCheck()) {
+			ms_error("Listener %p raised an exception",lcData->listener);
+			env->ExceptionClear();
+		}
 	}
 	static void logCollectionUploadStateChange(LinphoneCore *lc, LinphoneCoreLogCollectionUploadState state, const char *info) {
 		JNIEnv *env = 0;
@@ -1089,6 +1108,10 @@ public:
 							,lcData->core
 							,env->CallStaticObjectMethod(lcData->logCollectionUploadStateClass,lcData->logCollectionUploadStateFromIntId,(jint)state),
 							msg);
+		if (env->ExceptionCheck()) {
+			ms_error("Listener %p raised an exception",lcData->listener);
+			env->ExceptionClear();
+		}
 		if (msg) {
 			env->DeleteLocalRef(msg);
 		}
@@ -1175,22 +1198,11 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_removeListener(JNIEnv* e
 	//env->DeleteGlobalRef(listener);
 }
 
-
 extern "C" void Java_org_linphone_core_LinphoneCoreImpl_uploadLogCollection(JNIEnv* env, jobject thiz, jlong lc) {
 	LinphoneCore *core = (LinphoneCore*)lc;
 	linphone_core_upload_log_collection(core);
 }
 
-extern "C" void Java_org_linphone_core_LinphoneCoreImpl_enableLogCollection(JNIEnv* env, jclass cls, jboolean enable) {
-	linphone_core_enable_log_collection(enable ? LinphoneLogCollectionEnabledWithoutPreviousLogHandler : LinphoneLogCollectionDisabled);
-}
-
-extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setLogCollectionPath(JNIEnv* env, jclass cls, jstring jpath) {
-	const char* path = env->GetStringUTFChars(jpath, NULL);
-	linphone_core_set_log_collection_path(path);
-	env->ReleaseStringUTFChars(jpath, path);
-}
-
 extern "C" jint Java_org_linphone_core_LinphoneCoreImpl_migrateToMultiTransport(JNIEnv*  env
 		,jobject  thiz
 		,jlong lc) {
diff --git a/java/common/org/linphone/core/LinphoneCoreFactory.java b/java/common/org/linphone/core/LinphoneCoreFactory.java
index a26f95b9a..f7d5ccd66 100644
--- a/java/common/org/linphone/core/LinphoneCoreFactory.java
+++ b/java/common/org/linphone/core/LinphoneCoreFactory.java
@@ -109,7 +109,18 @@ abstract public class LinphoneCoreFactory {
 	 * @param enable true to enable debug mode, false to disable it
 	 * @param tag Tag which prefixes each log message.
 	 */
-	abstract public  void setDebugMode(boolean enable, String tag);
+	abstract public void setDebugMode(boolean enable, String tag);
+	
+	/**
+	 * Enable the linphone core log collection to upload logs on a server.
+	 */
+	abstract public void enableLogCollection(boolean enable);
+
+	/**
+	 * Set the path where the log files will be written for log collection.
+	 * @param path The path where the log files will be written.
+	 */
+	abstract public void setLogCollectionPath(String path);
 	
 	abstract public void setLogHandler(LinphoneLogHandler handler);
 	
diff --git a/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java b/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
index 03e8f7ef3..90fd5a0f6 100644
--- a/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
+++ b/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
@@ -127,6 +127,12 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
 	public LinphoneFriend createLinphoneFriend() {
 		return createLinphoneFriend(null);
 	}
+	
+	@Override
+	public native void enableLogCollection(boolean enable);
+
+	@Override
+	public native void setLogCollectionPath(String path);
 
 	public static boolean isArmv7()
 	{
diff --git a/java/impl/org/linphone/core/LinphoneCoreImpl.java b/java/impl/org/linphone/core/LinphoneCoreImpl.java
index 2773189e8..bd361daca 100644
--- a/java/impl/org/linphone/core/LinphoneCoreImpl.java
+++ b/java/impl/org/linphone/core/LinphoneCoreImpl.java
@@ -36,7 +36,7 @@ import android.net.wifi.WifiManager;
 import android.net.wifi.WifiManager.MulticastLock;
 import android.net.wifi.WifiManager.WifiLock;
 
-public class LinphoneCoreImpl implements LinphoneCore {
+class LinphoneCoreImpl implements LinphoneCore {
 
 	private final  LinphoneCoreListener mListener; //to make sure to keep a reference on this object
 	protected long nativePtr = 0;
@@ -1353,17 +1353,6 @@ public class LinphoneCoreImpl implements LinphoneCore {
 		uploadLogCollection(nativePtr);
 	}
 	
-	/**
-	 * Enable the linphone core log collection to upload logs on a server.
-	 */
-	public native static void enableLogCollection(boolean enable);
-
-	/**
-	 * Set the path where the log files will be written for log collection.
-	 * @param path The path where the log files will be written.
-	 */
-	public native static void setLogCollectionPath(String path);
-	
 	private native void setPreferredFramerate(long nativePtr, float fps);
 	@Override
 	public void setPreferredFramerate(float fps) {

From 90ee807c7e3470ada0a0ebbb62b73dfd64dd54d8 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Wed, 11 Feb 2015 09:30:30 +0100
Subject: [PATCH 387/496] event queue needs to be unregistered since RtpSession
 is kept

---
 coreapi/linphonecall.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index 1535dc957..164beb5ca 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -2778,6 +2778,7 @@ static void linphone_call_stop_audio_stream(LinphoneCall *call) {
 			linphone_call_remove_from_conf(call);
 		}
 		audio_stream_stop(call->audiostream);
+		rtp_session_unregister_event_queue(call->sessions[0].rtp_session, call->audiostream_app_evq);
 		ortp_ev_queue_flush(call->audiostream_app_evq);
 		ortp_ev_queue_destroy(call->audiostream_app_evq);
 		call->audiostream_app_evq=NULL;
@@ -2794,6 +2795,7 @@ static void linphone_call_stop_video_stream(LinphoneCall *call) {
 		linphone_call_log_fill_stats(call->log,(MediaStream*)call->videostream);
 		video_stream_stop(call->videostream);
 		call->videostream=NULL;
+		rtp_session_unregister_event_queue(call->sessions[1].rtp_session, call->videostream_app_evq);
 		ortp_ev_queue_flush(call->videostream_app_evq);
 		ortp_ev_queue_destroy(call->videostream_app_evq);
 		call->videostream_app_evq=NULL;

From 4157c07fdf7a564640cc192a464d48afab26c0c0 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Wed, 11 Feb 2015 10:36:14 +0100
Subject: [PATCH 388/496] Use weakref from Core to CoreManager in the Python
 module tester.

---
 tools/python/unittests/linphonetester.py | 30 +++++++++++-------------
 tools/python/unittests/test_call.py      | 14 -----------
 tools/python/unittests/test_message.py   | 18 ++++----------
 tools/python/unittests/test_presence.py  |  2 --
 tools/python/unittests/test_register.py  | 19 +--------------
 5 files changed, 19 insertions(+), 64 deletions(-)

diff --git a/tools/python/unittests/linphonetester.py b/tools/python/unittests/linphonetester.py
index bc7392832..366f22a82 100644
--- a/tools/python/unittests/linphonetester.py
+++ b/tools/python/unittests/linphonetester.py
@@ -6,6 +6,7 @@ import logging
 import os
 import sys
 import time
+import weakref
 
 
 test_domain = "sipopen.example.org"
@@ -93,13 +94,13 @@ class AccountManager:
     @classmethod
     def account_created_on_server_cb(cls, lc, cfg, state, message):
         if state == linphone.RegistrationState.Ok:
-            lc.user_data.created = True
+            lc.user_data().created = True
         elif state == linphone.RegistrationState.Cleared:
-            lc.user_data.done = True
+            lc.user_data().done = True
 
     @classmethod
     def account_created_auth_requested_cb(cls, lc, realm, username, domain):
-        lc.user_data.auth_requested = True
+        lc.user_data().auth_requested = True
 
     def check_account(self, cfg):
         create_account = False
@@ -142,7 +143,7 @@ class AccountManager:
         cfg.server_addr = server_addr.as_string()
         cfg.expires = 3600
         lc.add_proxy_config(cfg)
-        if AccountManager.wait_for_until(lc, None, lambda lc: lc.user_data.auth_requested == True, 10000) != True:
+        if AccountManager.wait_for_until(lc, None, lambda lc: lc.user_data().auth_requested == True, 10000) != True:
             linphonetester_logger.critical("[TESTER] Account for {identity} could not be created on server.".format(identity=refcfg.identity))
             sys.exit(-1)
         cfg.edit()
@@ -150,11 +151,11 @@ class AccountManager:
         cfg.done()
         ai = linphone.AuthInfo.new(account.modified_identity.username, None, account.password, None, None, account.modified_identity.domain)
         lc.add_auth_info(ai)
-        if AccountManager.wait_for_until(lc, None, lambda lc: lc.user_data.created == True, 3000) != True:
+        if AccountManager.wait_for_until(lc, None, lambda lc: lc.user_data().created == True, 3000) != True:
             linphonetester_logger.critical("[TESTER] Account for {identity} is not working on server.".format(identity=refcfg.identity))
             sys.exit(-1)
         lc.remove_proxy_config(cfg)
-        if AccountManager.wait_for_until(lc, None, lambda lc: lc.user_data.done == True, 3000) != True:
+        if AccountManager.wait_for_until(lc, None, lambda lc: lc.user_data().done == True, 3000) != True:
             linphonetester_logger.critical("[TESTER] Account creation could not clean the registration context.")
             sys.exit(-1)
 
@@ -287,7 +288,7 @@ class CoreManager:
         lc.ring = os.path.join(resources_path, 'sounds', 'oldphone.wav')
         lc.ringback = os.path.join(resources_path, 'sounds', 'ringback.wav')
         lc.static_picture = os.path.join(resources_path, 'images', 'nowebcamCIF.jpg')
-        lc.user_data = user_data
+        lc.user_data = weakref.ref(user_data)
         return lc
 
     @classmethod
@@ -389,7 +390,7 @@ class CoreManager:
 
     @classmethod
     def registration_state_changed(cls, lc, cfg, state, message):
-        manager = lc.user_data
+        manager = lc.user_data()
         linphonetester_logger.info("[TESTER] New registration state {state} for user id [{identity}] at proxy [{addr}]".format(
             state=linphone.RegistrationState.string(state), identity=cfg.identity, addr=cfg.server_addr))
         if state == linphone.RegistrationState.None:
@@ -407,14 +408,14 @@ class CoreManager:
 
     @classmethod
     def auth_info_requested(cls, lc, realm, username, domain):
-        manager = lc.user_data
+        manager = lc.user_data()
         linphonetester_logger.info("[TESTER] Auth info requested  for user id [{username}] at realm [{realm}]".format(
             username=username, realm=realm))
         manager.stats.number_of_auth_info_requested +=1
 
     @classmethod
     def call_state_changed(cls, lc, call, state, msg):
-        manager = lc.user_data
+        manager = lc.user_data()
         to_address = call.call_log.to_address.as_string()
         from_address = call.call_log.from_address.as_string()
         direction = "Outgoing"
@@ -463,7 +464,7 @@ class CoreManager:
 
     @classmethod
     def message_received(cls, lc, room, message):
-        manager = lc.user_data
+        manager = lc.user_data()
         from_str = message.from_address.as_string()
         text_str = message.text
         external_body_url = message.external_body_url
@@ -478,7 +479,7 @@ class CoreManager:
 
     @classmethod
     def new_subscription_requested(cls, lc, lf, url):
-        manager = lc.user_data
+        manager = lc.user_data()
         linphonetester_logger.info("[TESTER] New subscription request: from [{from_str}], url [{url}]".format(
             from_str=lf.address.as_string(), url=url))
         manager.stats.number_of_NewSubscriptionRequest += 1
@@ -486,7 +487,7 @@ class CoreManager:
 
     @classmethod
     def notify_presence_received(cls, lc, lf):
-        manager = lc.user_data
+        manager = lc.user_data()
         linphonetester_logger.info("[TESTER] New notify request: from [{from_str}]".format(
             from_str=lf.address.as_string()))
         manager.stats.number_of_NotifyReceived += 1
@@ -600,9 +601,6 @@ class CoreManager:
             self.identity = linphone.Address.new(self.lc.default_proxy_config.identity)
             self.identity.clean()
 
-    def stop(self):
-        self.lc = None
-
     def enable_audio_codec(self, mime, rate):
         codecs = self.lc.audio_codecs
         for codec in codecs:
diff --git a/tools/python/unittests/test_call.py b/tools/python/unittests/test_call.py
index 4357f245c..db8446b4a 100644
--- a/tools/python/unittests/test_call.py
+++ b/tools/python/unittests/test_call.py
@@ -22,8 +22,6 @@ class TestCall:
             out_call_log = pauline.lc.call_logs[0]
             assert out_call_log is not None
             assert_equals(out_call_log.status, linphone.CallStatus.Aborted)
-        marie.stop()
-        pauline.stop()
 
     def test_declined_call(self):
         marie = CoreManager('marie_rc')
@@ -40,8 +38,6 @@ class TestCall:
             assert_equals(pauline.stats.number_of_LinphoneCallEnd, 1)
             assert_equals(in_call.reason, linphone.Reason.Declined)
             assert_equals(out_call.reason, linphone.Reason.Declined)
-        marie.stop()
-        pauline.stop()
 
     def test_cancelled_call(self):
         marie = CoreManager('marie_rc')
@@ -53,8 +49,6 @@ class TestCall:
         assert_equals(pauline.stats.number_of_LinphoneCallEnd, 1)
         assert_equals(marie.stats.number_of_LinphoneCallIncomingReceived, 0)
         assert_equals(CoreManager.wait_for(pauline, marie, lambda pauline, marie: pauline.stats.number_of_LinphoneCallReleased == 1), True)
-        marie.stop()
-        pauline.stop()
 
     def test_early_cancelled_call(self):
         marie = CoreManager('marie_rc')
@@ -72,8 +66,6 @@ class TestCall:
         # Now the CANCEL should have been sent and the the call at marie's side should terminate
         assert_equals(CoreManager.wait_for(pauline, marie, lambda pauline, marie: marie.stats.number_of_LinphoneCallEnd == 1), True)
         assert_equals(CoreManager.wait_for(pauline, marie, lambda pauline, marie: pauline.stats.number_of_LinphoneCallReleased == 1), True)
-        marie.stop()
-        pauline.stop()
 
     def test_cancelled_ringing_call(self):
         marie = CoreManager('marie_rc')
@@ -84,8 +76,6 @@ class TestCall:
         assert_equals(CoreManager.wait_for(pauline, marie, lambda pauline, marie: (pauline.stats.number_of_LinphoneCallReleased == 1) and (marie.stats.number_of_LinphoneCallReleased == 1)), True)
         assert_equals(marie.stats.number_of_LinphoneCallEnd, 1)
         assert_equals(pauline.stats.number_of_LinphoneCallEnd, 1)
-        marie.stop()
-        pauline.stop()
 
     def test_call_failed_because_of_codecs(self):
         marie = CoreManager('marie_rc')
@@ -100,8 +90,6 @@ class TestCall:
         assert_equals(out_call.reason, linphone.Reason.NotAcceptable)
         assert_equals(marie.stats.number_of_LinphoneCallIncomingReceived, 0)
         assert_equals(marie.stats.number_of_LinphoneCallReleased, 0)
-        marie.stop()
-        pauline.stop()
 
     def test_simple_call(self):
         marie = CoreManager('marie_rc')
@@ -109,5 +97,3 @@ class TestCall:
         assert_equals(CoreManager.call(pauline, marie), True)
         #liblinphone_tester_check_rtcp(marie,pauline);
         CoreManager.end_call(marie, pauline)
-        marie.stop()
-        pauline.stop()
diff --git a/tools/python/unittests/test_message.py b/tools/python/unittests/test_message.py
index 1cc60c32d..12495cc84 100644
--- a/tools/python/unittests/test_message.py
+++ b/tools/python/unittests/test_message.py
@@ -12,7 +12,7 @@ class TestMessage:
 
     @classmethod
     def msg_state_changed(cls, msg, state):
-        stats = msg.chat_room.core.user_data.stats
+        stats = msg.chat_room.core.user_data().stats
         linphonetester_logger.info("[TESTER] Message [{text}] [{state}]".format(text=msg.text, state=linphone.ChatMessageState.string(state)))
         if state == linphone.ChatMessageState.Delivered:
             stats.number_of_LinphoneMessageDelivered += 1
@@ -27,7 +27,7 @@ class TestMessage:
 
     @classmethod
     def file_transfer_progress_indication(cls, msg, content, offset, total):
-        stats = msg.chat_room.core.user_data.stats
+        stats = msg.chat_room.core.user_data().stats
         progress = int((offset * 100) / total)
         direction = 'received'
         tofrom = 'from'
@@ -57,7 +57,7 @@ class TestMessage:
     @classmethod
     def file_transfer_recv(cls, msg, content, buf):
         receive_filepath = msg.user_data
-        stats = msg.chat_room.core.user_data.stats
+        stats = msg.chat_room.core.user_data().stats
         if buf.empty: # Transfer complete
             stats.number_of_LinphoneMessageExtBodyReceived += 1
         else: # Store content
@@ -77,7 +77,7 @@ class TestMessage:
 
     @classmethod
     def memory_file_transfer_recv(cls, msg, content, buf):
-        stats = msg.chat_room.core.user_data.stats
+        stats = msg.chat_room.core.user_data().stats
         if buf.empty: # Transfer complete
             stats.number_of_LinphoneMessageExtBodyReceived += 1
         else: # Store content
@@ -98,8 +98,6 @@ class TestMessage:
         chat_room.send_chat_message(msg)
         assert_equals(CoreManager.wait_for(pauline, marie, lambda pauline, marie: marie.stats.number_of_LinphoneMessageReceived == 1), True)
         assert marie.lc.get_chat_room(pauline.identity) is not None
-        marie.stop()
-        pauline.stop()
 
     def test_text_message_within_dialog(self):
         marie = CoreManager('marie_rc')
@@ -112,8 +110,6 @@ class TestMessage:
         chat_room.send_chat_message(msg)
         assert_equals(CoreManager.wait_for(pauline, marie, lambda pauline, marie: marie.stats.number_of_LinphoneMessageReceived == 1), True)
         assert marie.lc.get_chat_room(pauline.identity) is not None
-        marie.stop()
-        pauline.stop()
 
     def test_file_transfer_message(self):
         marie = CoreManager('marie_rc')
@@ -147,8 +143,6 @@ class TestMessage:
         assert_equals(filecmp.cmp(send_filepath, receive_filepath, shallow=False), True)
         if os.path.exists(receive_filepath):
             os.remove(receive_filepath)
-        marie.stop()
-        pauline.stop()
 
     def test_small_file_transfer_message(self):
         send_buf = "small file"
@@ -185,8 +179,6 @@ class TestMessage:
         assert_equals(pauline.stats.number_of_LinphoneMessageDelivered, 1)
         assert_equals(marie.stats.number_of_LinphoneMessageExtBodyReceived, 1)
         assert_equals(send_buf, marie.stats.last_received_chat_message.user_data)
-        marie.stop()
-        pauline.stop()
 
     def test_file_transfer_message_upload_cancelled(self):
         send_buf = "big file"
@@ -218,5 +210,3 @@ class TestMessage:
         assert_equals(CoreManager.wait_for(pauline, marie, lambda pauline, marie: pauline.stats.number_of_LinphoneMessageNotDelivered == 1), True)
         assert_equals(pauline.stats.number_of_LinphoneMessageNotDelivered, 1)
         assert_equals(marie.stats.number_of_LinphoneMessageExtBodyReceived, 0)
-        marie.stop()
-        pauline.stop()
diff --git a/tools/python/unittests/test_presence.py b/tools/python/unittests/test_presence.py
index 59ac3e1f9..c2db852dd 100644
--- a/tools/python/unittests/test_presence.py
+++ b/tools/python/unittests/test_presence.py
@@ -35,5 +35,3 @@ class TestPresence:
         marie = PresenceCoreManager('marie')
         pauline = PresenceCoreManager('pauline')
         assert_equals(self.subscribe_to_callee_presence(marie, pauline), True)
-        marie.stop()
-        pauline.stop()
diff --git a/tools/python/unittests/test_register.py b/tools/python/unittests/test_register.py
index 03a5d2e05..0ce9bdf2f 100644
--- a/tools/python/unittests/test_register.py
+++ b/tools/python/unittests/test_register.py
@@ -70,7 +70,6 @@ class RegisterCoreManager(CoreManager):
 
     def register_with_refresh(self, refresh, domain, route, late_auth_info = False, transport = linphone.SipTransports(5070, 5070, 5071, 0), expected_final_state = linphone.RegistrationState.Ok):
         self.register_with_refresh_base(refresh, domain, route, late_auth_info, expected_final_state = expected_final_state)
-        self.stop()
         # Not testable as the callbacks can not be called once the core destruction has started
         #assert_equals(self.stats.number_of_LinphoneRegistrationCleared, 1)
 
@@ -81,7 +80,6 @@ class TestRegister:
         cm = RegisterCoreManager()
         cm.register_with_refresh(False, None, None)
         assert_equals(cm.stats.number_of_auth_info_requested, 0)
-        cm.stop()
 
     def test_simple_unregister(self):
         cm = RegisterCoreManager()
@@ -94,22 +92,18 @@ class TestRegister:
         pc.register_enabled = False
         pc.done()
         assert_equals(CoreManager.wait_for(cm, cm, lambda cm1, cm2: cm1.stats.number_of_LinphoneRegistrationCleared == 1), True)
-        cm.stop()
 
     def test_simple_tcp_register(self):
         cm = RegisterCoreManager()
         cm.register_with_refresh(False, test_domain, "sip:{route};transport=tcp".format(route=test_route))
-        cm.stop()
 
     def test_simple_tcp_register_compatibility_mode(self):
         cm = RegisterCoreManager()
         cm.register_with_refresh(False, test_domain, "sip:{route}".format(route=test_route), transport=linphone.SipTransports(0, 5070, 0, 0))
-        cm.stop()
 
     def test_simple_tls_register(self):
         cm = RegisterCoreManager()
         cm.register_with_refresh(False, test_domain, "sip:{route};transport=tls".format(route=test_route))
-        cm.stop()
 
     def test_tls_register_with_alt_name(self):
         cm = CoreManager('pauline_alt_rc', False)
@@ -117,7 +111,6 @@ class TestRegister:
         cm.lc.refresh_registers()
         assert_equals(CoreManager.wait_for(cm, cm, lambda cm1, cm2: cm1.stats.number_of_LinphoneRegistrationOk == 1), True)
         assert_equals(cm.stats.number_of_LinphoneRegistrationFailed, 0)
-        cm.stop()
 
     def test_tls_wildcard_register(self):
         cm = CoreManager('pauline_wild_rc', False)
@@ -125,7 +118,6 @@ class TestRegister:
         cm.lc.refresh_registers()
         assert_equals(CoreManager.wait_for(cm, cm, lambda cm1, cm2: cm1.stats.number_of_LinphoneRegistrationOk == 2), True)
         assert_equals(cm.stats.number_of_LinphoneRegistrationFailed, 0)
-        cm.stop()
 
     def test_tls_certificate_failure(self):
         cm = CoreManager('pauline_rc', False)
@@ -139,7 +131,6 @@ class TestRegister:
         cm.lc.refresh_registers()
         assert_equals(CoreManager.wait_for(cm, cm, lambda cm1, cm2: cm1.stats.number_of_LinphoneRegistrationOk == 1), True)
         assert_equals(cm.stats.number_of_LinphoneRegistrationFailed, 2)
-        cm.stop()
 
     def test_tls_with_non_tls_server(self):
         cm = CoreManager('marie_rc', False)
@@ -153,7 +144,6 @@ class TestRegister:
         pc.server_addr = "sip:{domain}:{port};transport=tls".format(domain=addr.domain, port=port)
         pc.done()
         assert_equals(CoreManager.wait_for_until(cm, cm, lambda cm1, cm2: cm1.stats.number_of_LinphoneRegistrationFailed == 1, 5000), True)
-        cm.stop()
 
     def test_simple_authenticated_register(self):
         cm = RegisterCoreManager()
@@ -161,35 +151,29 @@ class TestRegister:
         cm.lc.add_auth_info(info)
         cm.register_with_refresh(False, auth_domain, "sip:{route}".format(route=test_route))
         assert_equals(cm.stats.number_of_auth_info_requested, 0)
-        cm.stop()
 
     def test_digest_auth_without_initial_credentials(self):
         cm = RegisterCoreManager(with_auth=True)
         cm.register_with_refresh(False, auth_domain, "sip:{route}".format(route=test_route))
         assert_equals(cm.stats.number_of_auth_info_requested, 1)
-        cm.stop()
 
     def test_authenticated_register_with_late_credentials(self):
         cm = RegisterCoreManager()
         cm.register_with_refresh(False, auth_domain, "sip:{route}".format(route=test_route), True, linphone.SipTransports(5070, 5070, 5071, 0))
         assert_equals(cm.stats.number_of_auth_info_requested, 1)
-        cm.stop()
 
     def test_simple_register_with_refresh(self):
         cm = RegisterCoreManager()
         cm.register_with_refresh(True, None, None)
         assert_equals(cm.stats.number_of_auth_info_requested, 0)
-        cm.stop()
 
     def test_simple_auth_register_with_refresh(self):
         cm = RegisterCoreManager(with_auth=True)
         cm.register_with_refresh(True, auth_domain, "sip:{route}".format(route=test_route))
         assert_equals(cm.stats.number_of_auth_info_requested, 1)
-        cm.stop()
 
     def test_multiple_accounts(self):
-        cm = CoreManager('multi_account_rc', True)
-        cm.stop()
+        CoreManager('multi_account_rc', True)
 
     def test_transport_change(self):
         cm = CoreManager('multi_account_rc', True)
@@ -202,4 +186,3 @@ class TestRegister:
         cm.lc.sip_transports = tr
         assert_equals(CoreManager.wait_for(cm, cm, lambda cm1, cm2: cm1.stats.number_of_LinphoneRegistrationOk == (register_ok + number_of_udp_proxies)), True)
         assert_equals(CoreManager.wait_for(cm, cm, lambda cm1, cm2: cm1.stats.number_of_LinphoneRegistrationFailed == (total_number_of_proxies - number_of_udp_proxies)), True)
-        cm.stop()

From 1f5fd52128e933907d5785dd268086cc4626409b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= <francois.grisez@grisezf.fr>
Date: Wed, 11 Feb 2015 15:08:04 +0100
Subject: [PATCH 389/496] Enable to build linphone with SRTP support by using
 the packages provided by GNU/Linux distributions

---
 NEWS           | 1 +
 README         | 7 +------
 TODO           | 2 +-
 mediastreamer2 | 2 +-
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/NEWS b/NEWS
index bb1d573a0..dce0e0824 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,7 @@ linphone-3.8.0 -- Date to be defined
 	* Support for RTP/AVPF (RFCxxxx) for video streams, allowing fast transmission error recovery with VP8 codec only.
 	* API enhancements, most objects can be ref-counted.
 	* Call video recording feature, in mkv format (H264 streams only for the moment)
+	* Support of SRTP by using packages from GNU/Linux distributions
 
 linphone-3.7.0 -- February 20th, 2014
 	Application level improvements:
diff --git a/README b/README
index 30666070a..0de3185c3 100644
--- a/README
+++ b/README
@@ -39,12 +39,7 @@ libglew1.6-dev libv4l-dev libxml2-dev
 
 	+ for optional library
 	$ sudo apt-get install libreadline-dev libgsm1-dev libtheora-dev \
-libsoup2.4-dev libsqlite3-dev libupnp4-dev
-
-	+ Install srtp (optional) for call encryption :
-		$ git clone git://git.linphone.org/srtp.git
-		$ cd srtp && autoconf && ./configure && make
-		$ sudo make install
+libsoup2.4-dev libsqlite3-dev libupnp4-dev libsrtp-dev
 
 	+ Install zrtp (optional), for unbreakable call encryption
 		$ git clone git://git.linphone.org:bzrtp
diff --git a/TODO b/TODO
index 1452a7c00..8e18e5491 100644
--- a/TODO
+++ b/TODO
@@ -3,7 +3,7 @@ hot stuff:
 
 * ice support
 * run a user given command upon incoming calls
-* SIP/TLS and SRTP
+* SIP/TLS
 
 low priority:
 -------------
diff --git a/mediastreamer2 b/mediastreamer2
index ce80feec0..44fe332ef 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit ce80feec091c75bcb69c4adf42fada7b7f0ffacc
+Subproject commit 44fe332ef7a4527397c4474f1f7d0d88491d31f1

From 43e9761452ce69370bc2d22c3023a966206ef5b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
 <francois.grisez@belledonne-communications.com>
Date: Wed, 11 Feb 2015 16:15:34 +0100
Subject: [PATCH 390/496] Update mediastreamer2

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 44fe332ef..0ff566694 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 44fe332ef7a4527397c4474f1f7d0d88491d31f1
+Subproject commit 0ff5666945399dd55739c17d7d72e6f1fe6ee128

From 533b80c1c5daa264bbea203477e2bf175cd7da31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
 <francois.grisez@belledonne-communications.com>
Date: Wed, 11 Feb 2015 16:18:26 +0100
Subject: [PATCH 391/496] Update mediastreamer2

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 0ff566694..210991b7e 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 0ff5666945399dd55739c17d7d72e6f1fe6ee128
+Subproject commit 210991b7e3b560ef58b322a4951b0d24bb500653

From 1f0d74ce26d6faeb9a3b6db13e2a602f9e6ed1b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
 <francois.grisez@belledonne-communications.com>
Date: Wed, 11 Feb 2015 16:22:24 +0100
Subject: [PATCH 392/496] Fix build issue

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 210991b7e..2b0343ba1 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 210991b7e3b560ef58b322a4951b0d24bb500653
+Subproject commit 2b0343ba1659a496b06c61240b5b68b1251de762

From fd86ba4138739847b953bd66ff713f043d6aa0bd Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Mon, 9 Feb 2015 16:51:48 +0100
Subject: [PATCH 393/496] Better use 2 lines instead of doing code within CU
 macros

---
 tester/call_tester.c   | 3 ++-
 tester/player_tester.c | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tester/call_tester.c b/tester/call_tester.c
index 1ec6d71f6..624a90fca 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -3509,7 +3509,8 @@ static void call_with_generic_cn(void) {
 		wait_for_until(marie->lc, pauline->lc, NULL, 0, 8000);
 		rtps=rtp_session_get_stats(pauline_call->audiostream->ms.sessions.rtp_session);
 		CU_ASSERT_TRUE(rtps->packet_recv<=300 && rtps->packet_recv>=200);
-		CU_ASSERT_EQUAL((err=stat(recorded_file,&stbuf)), 0);
+		err=stat(recorded_file,&stbuf);
+		CU_ASSERT_EQUAL(err, 0);
 		if (err==0){
 			CU_ASSERT_TRUE(stbuf.st_size>120000);
 		}
diff --git a/tester/player_tester.c b/tester/player_tester.c
index 8f0c5af43..beb6e9d19 100644
--- a/tester/player_tester.c
+++ b/tester/player_tester.c
@@ -57,7 +57,8 @@ static void play_file(const char *filename, bool_t unsupported_format, const cha
 	}
 	if(res == -1) goto fail;
 
-	CU_ASSERT_EQUAL((res = linphone_player_start(player)), 0);
+	res = linphone_player_start(player);
+	CU_ASSERT_EQUAL(res, 0);
 	if(res == -1) goto fail;
 
 	CU_ASSERT_TRUE(wait_for_eof(&eof, &time, 100, 13000));

From 807bcbbfa3da40cca5a042a9158570f372396bda Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Mon, 9 Feb 2015 17:01:48 +0100
Subject: [PATCH 394/496] Fix memory leak

---
 tester/tester.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tester/tester.c b/tester/tester.c
index ce9bb4c7a..52f01d304 100644
--- a/tester/tester.c
+++ b/tester/tester.c
@@ -491,8 +491,12 @@ static void test_complete_message_handler(const CU_pTest pTest,
 
 
 static void test_all_tests_complete_message_handler(const CU_pFailureRecord pFailure) {
-  if (liblinphone_tester_use_log_file) ms_warning("\n\n %s",CU_get_run_results_string());
-  liblinphone_tester_fprintf(stdout,"\n\n %s",CU_get_run_results_string());
+  	char * results = CU_get_run_results_string();
+  	if (liblinphone_tester_use_log_file) {
+  		ms_warning("\n\n %s", results);
+  	}
+	liblinphone_tester_fprintf(stdout,"\n\n %s",results);
+	ms_free(results);
 }
 
 static void test_suite_init_failure_message_handler(const CU_pSuite pSuite) {
@@ -556,7 +560,7 @@ int liblinphone_tester_run_tests(const char *suite_name, const char *test_name)
 				CU_pTest test=CU_get_test_by_name(test_name, suite);
 				if (!test) {
 					ms_error("Could not find test '%s' in suite '%s'. Available tests are:", test_name, suite_name);
-					// do not use suite_name here, since this method is case sentisitive
+					// do not use suite_name here, since this method is case sensitive
 					liblinphone_tester_list_suite_tests(suite->pName);
 					return -2;
 				} else {

From 5074658a6fe39c5616e83a23a922f0620035b988 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Wed, 11 Feb 2015 16:30:42 +0100
Subject: [PATCH 395/496] Fix testers

---
 mediastreamer2       | 2 +-
 tester/call_tester.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 2b0343ba1..13f6a7884 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 2b0343ba1659a496b06c61240b5b68b1251de762
+Subproject commit 13f6a78846b8cfe2e75e0298751e1ba57d66232c
diff --git a/tester/call_tester.c b/tester/call_tester.c
index 624a90fca..93ef7170a 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -2129,7 +2129,7 @@ static void call_with_file_player(void) {
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1));
 	/*cannot run on iphone simulator because locks main loop beyond permitted time (should run
 	on another thread) */
-#if !defined(__arm__) && !defined(__arm64__) && TARGET_IPHONE_SIMULATOR
+#if !defined(__arm__) && !defined(__arm64__) && !TARGET_IPHONE_SIMULATOR
 	{
 		double similar;
 		const double threshold = 0.9;

From ea80131389c23acd5c9e4bbcd57b74cc8355598e Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Wed, 11 Feb 2015 16:34:05 +0100
Subject: [PATCH 396/496] Update ms2

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 13f6a7884..813284328 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 13f6a78846b8cfe2e75e0298751e1ba57d66232c
+Subproject commit 813284328b2a7af01299c29d441ed0a34af82df7

From 7942e7e60ac68e1c2019f2c5d9156d63dae55efb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
 <francois.grisez@belledonne-communications.com>
Date: Wed, 11 Feb 2015 17:32:06 +0100
Subject: [PATCH 397/496] Fix distcheck

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 813284328..4ad81eb51 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 813284328b2a7af01299c29d441ed0a34af82df7
+Subproject commit 4ad81eb516a242bb7f236c2ba0cc8d60182b772f

From d107a069ede8c5c4d49ea75e2180af5911ae52bf Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Wed, 11 Feb 2015 17:50:08 +0100
Subject: [PATCH 398/496] avoid log handler removal in case of subsequence call
 to linphone_core_set_log_handler

---
 coreapi/linphonecore.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index ffa2a6b32..91b3d060b 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -154,7 +154,11 @@ const LinphoneAddress *linphone_core_get_current_call_remote_address(struct _Lin
 }
 
 void linphone_core_set_log_handler(OrtpLogFunc logfunc) {
-	ortp_set_log_handler(logfunc);
+	if (ortp_logv_out == linphone_core_log_collection_handler) {
+		ms_message("There is already a log collection handler, keep it");
+		liblinphone_log_func = logfunc;
+	} else
+		ortp_set_log_handler(logfunc);
 }
 
 void linphone_core_set_log_file(FILE *file) {
@@ -645,7 +649,7 @@ void linphone_core_enable_logs(FILE *file){
 **/
 void linphone_core_enable_logs_with_cb(OrtpLogFunc logfunc){
 	ortp_set_log_level_mask(ORTP_MESSAGE|ORTP_WARNING|ORTP_ERROR|ORTP_FATAL);
-	ortp_set_log_handler(logfunc);
+	linphone_core_set_log_handler(logfunc);
 	sal_enable_logs();
 }
 

From 358950e13502e12f8e0a82a39df3b6f80893af54 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Wed, 11 Feb 2015 18:01:36 +0100
Subject: [PATCH 399/496] fix compilation issue

---
 coreapi/linphonecore.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 91b3d060b..63899e9e0 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -153,6 +153,8 @@ const LinphoneAddress *linphone_core_get_current_call_remote_address(struct _Lin
 	return linphone_call_get_remote_address(call);
 }
 
+static void linphone_core_log_collection_handler(OrtpLogLevel level, const char *fmt, va_list args);
+
 void linphone_core_set_log_handler(OrtpLogFunc logfunc) {
 	if (ortp_logv_out == linphone_core_log_collection_handler) {
 		ms_message("There is already a log collection handler, keep it");

From 5adec0c55a43fc5ea1ab9beddd91489f510cfacf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
 <francois.grisez@belledonne-communications.com>
Date: Thu, 12 Feb 2015 09:16:42 +0100
Subject: [PATCH 400/496] Update mediastreamer2

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 4ad81eb51..fee844054 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 4ad81eb516a242bb7f236c2ba0cc8d60182b772f
+Subproject commit fee844054d5e9e537a51484132d121cc97d53891

From e60b9ab23dc8f59258a086f186141a0cace2157a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
 <francois.grisez@belledonne-communications.com>
Date: Thu, 12 Feb 2015 10:17:52 +0100
Subject: [PATCH 401/496] Fix bash mistake in the mediastreamer2's configure.ac

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index fee844054..0362ac7d1 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit fee844054d5e9e537a51484132d121cc97d53891
+Subproject commit 0362ac7d17269e5e9dc4187324b052d43933d82b

From 71204d66cded74d88b5831cc859fc250f19a00fc Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Thu, 12 Feb 2015 10:08:04 +0100
Subject: [PATCH 402/496] Fix compilation warnings on android

---
 coreapi/linphonecore.c      | 26 +++++++++++++-------------
 coreapi/linphonecore_jni.cc |  3 ---
 mediastreamer2              |  2 +-
 oRTP                        |  2 +-
 4 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 63899e9e0..ef108df18 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -1015,7 +1015,7 @@ static PayloadType * find_payload(const MSList *default_list, const char *mime_t
 	PayloadType *candidate=NULL;
 	PayloadType *it;
 	const MSList *elem;
-	
+
 	for(elem=default_list;elem!=NULL;elem=elem->next){
 		it=(PayloadType*)elem->data;
 		if (it!=NULL && strcasecmp(mime_type,it->mime_type)==0
@@ -1096,7 +1096,7 @@ static bool_t get_codec(LinphoneCore *lc, SalStreamType type, int index, Payload
 static MSList *add_missing_codecs(const MSList *default_list, MSList *l){
 	const MSList *elem;
 	MSList *newlist;
-	
+
 	for(elem=default_list; elem!=NULL; elem=elem->next){
 		MSList *elem2=ms_list_find(l,elem->data);
 		if (!elem2){
@@ -1134,10 +1134,10 @@ static void codecs_config_read(LinphoneCore *lc)
 	PayloadType *pt;
 	MSList *audio_codecs=NULL;
 	MSList *video_codecs=NULL;
-	
+
 	lc->codecs_conf.dyn_pt=96;
 	lc->codecs_conf.telephone_event_pt=lp_config_get_int(lc->config,"misc","telephone_event_pt",101);
-	
+
 	for (i=0;get_codec(lc,SalAudio,i,&pt);i++){
 		if (pt){
 			audio_codecs=codec_append_if_new(audio_codecs, pt);
@@ -1434,8 +1434,8 @@ static void linphone_core_register_payload_type(LinphoneCore *lc, const PayloadT
 		 and the payload type number will be determined dynamically later, at call time.*/
 		payload_type_set_number(pt,
 			(number=rtp_profile_find_payload_number(&av_profile, pt->mime_type, pt->clock_rate, pt->channels))
-		); 
-		ms_message("Codec %s/%i fmtp=[%s] number=%i, enabled=%i) added to default capabilities.", pt->mime_type, pt->clock_rate, 
+		);
+		ms_message("Codec %s/%i fmtp=[%s] number=%i, enabled=%i) added to default capabilities.", pt->mime_type, pt->clock_rate,
 			   pt->recv_fmtp ? pt->recv_fmtp : "", number, (int)payload_type_enabled(pt));
 		*codec_list=ms_list_append(*codec_list,pt);
 	}
@@ -1557,7 +1557,7 @@ static void linphone_core_register_default_codecs(LinphoneCore *lc){
 	linphone_core_register_payload_type(lc,&payload_type_speex_nb,"vbr=on",TRUE);
 	linphone_core_register_payload_type(lc,&payload_type_pcmu8000,NULL,TRUE);
 	linphone_core_register_payload_type(lc,&payload_type_pcma8000,NULL,TRUE);
-	
+
 	/*other audio codecs, not enabled by default, in order of preference*/
 	linphone_core_register_payload_type(lc,&payload_type_gsm,NULL,FALSE);
 	linphone_core_register_payload_type(lc,&payload_type_g722,NULL,FALSE);
@@ -1593,8 +1593,8 @@ static void linphone_core_register_default_codecs(LinphoneCore *lc){
 	linphone_core_register_payload_type(lc,&payload_type_aal2_g726_24,NULL,FALSE);
 	linphone_core_register_payload_type(lc,&payload_type_aal2_g726_32,NULL,FALSE);
 	linphone_core_register_payload_type(lc,&payload_type_aal2_g726_40,NULL,FALSE);
-	
-	
+
+
 
 #ifdef VIDEO_ENABLED
 	/*default enabled video codecs, in order of preference*/
@@ -1623,9 +1623,9 @@ static void linphone_core_init(LinphoneCore * lc, const LinphoneCoreVTable *vtab
 	linphone_core_set_state(lc,LinphoneGlobalStartup,"Starting up");
 	ortp_init();
 	linphone_core_activate_log_serialization_if_needed();
-	
+
 	ms_init();
-	
+
 	linphone_core_register_default_codecs(lc);
 	/* create a mediastreamer2 event queue and set it as global */
 	/* This allows to run event's callback in linphone_core_iterate() */
@@ -6100,7 +6100,7 @@ void sip_config_uninit(LinphoneCore *lc)
 		if (i>=20) ms_warning("Cannot complete unregistration, giving up");
 	}
 	config->proxies=ms_list_free_with_data(config->proxies,(void (*)(void*)) _linphone_proxy_config_release);
-	
+
 	config->deleted_proxies=ms_list_free_with_data(config->deleted_proxies,(void (*)(void*)) _linphone_proxy_config_release);
 
 	/*no longuer need to write proxy config if not changedlinphone_proxy_config_write_to_config_file(lc->config,NULL,i);*/	/*mark the end */
@@ -7137,7 +7137,7 @@ void linphone_core_v_table_destroy(LinphoneCoreVTable* table) {
 LinphoneCoreVTable *linphone_core_get_current_vtable(LinphoneCore *lc) {
 	return lc->current_vtable;
 }
- 
+
 #define NOTIFY_IF_EXIST(function_name) \
 	MSList* iterator; \
 	ms_message ("Linphone core [%p] notifying [%s]",lc,#function_name);\
diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index 6b6556116..b562cf31a 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -60,9 +60,6 @@ extern "C" void libmswebrtc_init();
 #include <belle-sip/wakelock.h>
 #endif /*ANDROID*/
 
-/*force linking of ms_audio_diff symbol because the tester requires it.*/
-static void *audiodiff=(void*)&ms_audio_diff;
-
 #define RETURN_USER_DATA_OBJECT(javaclass, funcprefix, cobj) \
 	{ \
 		jclass jUserDataObjectClass; \
diff --git a/mediastreamer2 b/mediastreamer2
index 0362ac7d1..804b927a0 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 0362ac7d17269e5e9dc4187324b052d43933d82b
+Subproject commit 804b927a08cfeec0840a0994f7e9bd71206c5f19
diff --git a/oRTP b/oRTP
index d7b7f8af7..7822737d9 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit d7b7f8af70c7a40c55f6b026833b21e177c88eea
+Subproject commit 7822737d9cce52a956594d9466cb6419595ed7a8

From 49e10b2ee34b7338071ac922d5256869ec7b72bd Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Thu, 12 Feb 2015 11:19:09 +0100
Subject: [PATCH 403/496] Update ms2

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 804b927a0..b36b27e44 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 804b927a08cfeec0840a0994f7e9bd71206c5f19
+Subproject commit b36b27e44806abb88454b3f82627994e503eee76

From 0e22f1b6ccef75089a8d015fe0fbe05226f8966f Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Fri, 13 Feb 2015 10:32:22 +0100
Subject: [PATCH 404/496] Fix Android liblinphone_tester compilation

---
 tester/call_tester.c        | 4 ++--
 tester/liblinphone_tester.c | 2 ++
 tester/tester.c             | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/tester/call_tester.c b/tester/call_tester.c
index 93ef7170a..be6e4a29c 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -2129,7 +2129,7 @@ static void call_with_file_player(void) {
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1));
 	/*cannot run on iphone simulator because locks main loop beyond permitted time (should run
 	on another thread) */
-#if !defined(__arm__) && !defined(__arm64__) && !TARGET_IPHONE_SIMULATOR
+#if !defined(__arm__) && !defined(__arm64__) && !TARGET_IPHONE_SIMULATOR && !defined(ANDROID)
 	{
 		double similar;
 		const double threshold = 0.9;
@@ -2205,7 +2205,7 @@ static void call_with_mkv_file_player(void) {
 	linphone_core_terminate_all_calls(marie->lc);
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,1));
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1));
-#ifndef __arm__
+#if !defined(__arm__) && !defined(__arm64__) && !TARGET_IPHONE_SIMULATOR && !defined(ANDROID)
 	CU_ASSERT_TRUE(ms_audio_diff(hellowav,recordpath,&similar,NULL,NULL)==0);
 	CU_ASSERT_TRUE(similar>threshold);
 	CU_ASSERT_TRUE(similar<=1.0);
diff --git a/tester/liblinphone_tester.c b/tester/liblinphone_tester.c
index fc3f315e5..11e31e13b 100644
--- a/tester/liblinphone_tester.c
+++ b/tester/liblinphone_tester.c
@@ -41,6 +41,8 @@ static JNIEnv *current_env = NULL;
 static jobject current_obj = 0;
 static const char* LogDomain = "liblinphone_tester";
 
+int main(int argc, char** argv);
+
 void linphone_android_log_handler(int prio, const char *fmt, va_list args) {
 	char str[4096];
 	char *current;
diff --git a/tester/tester.c b/tester/tester.c
index 52f01d304..741fc8938 100644
--- a/tester/tester.c
+++ b/tester/tester.c
@@ -614,7 +614,7 @@ int  liblinphone_tester_fprintf(FILE * stream, const char * format, ...) {
 #else
 	/*used by liblinphone tester to retrieve suite list*/
 	result = 0;
-	cunit_android_trace_handler(stream, format, args);
+	cunit_android_trace_handler(stream == stderr, format, args);
 #endif
 	va_end(args);
 	return result;

From abcadf9c9ab70c9a76d82ee947dda059c7be2def Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Fri, 13 Feb 2015 10:40:29 +0100
Subject: [PATCH 405/496] Update ms2

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index b36b27e44..394858138 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit b36b27e44806abb88454b3f82627994e503eee76
+Subproject commit 3948581385b9521c17a54c05c05d613add95e631

From fd0a7cfd739a29b69451609ef86cbce0c78eb6fc Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Fri, 13 Feb 2015 18:01:45 +0100
Subject: [PATCH 406/496] add more DTLS tests

---
 coreapi/callbacks.c    |   2 +-
 coreapi/linphonecall.c | 106 ++++++++++++++++++++++-------------------
 tester/call_tester.c   |  91 ++++++++++++++++++++++++++++++-----
 3 files changed, 138 insertions(+), 61 deletions(-)

diff --git a/coreapi/callbacks.c b/coreapi/callbacks.c
index 47032e22e..7e0254b99 100644
--- a/coreapi/callbacks.c
+++ b/coreapi/callbacks.c
@@ -221,7 +221,7 @@ static bool_t is_duplicate_call(LinphoneCore *lc, const LinphoneAddress *from, c
 
 static bool_t already_a_call_with_remote_address(const LinphoneCore *lc, const LinphoneAddress *remote) {
 	MSList *elem;
-	ms_warning(" searching for already_a_call_with_remote_address.");
+	ms_message("Searching for already_a_call_with_remote_address.");
 
 	for(elem=lc->calls;elem!=NULL;elem=elem->next){
 		const LinphoneCall *call=(LinphoneCall*)elem->data;
diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index 164beb5ca..f5aff970d 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -2430,6 +2430,30 @@ static void linphone_call_start_audio_stream(LinphoneCall *call, bool_t muted, b
 				setup_ring_player(lc,call);
 			}
 
+			if (sal_stream_description_has_dtls(stream) == TRUE) {
+				/* DTLS engine was already initialised during stream init. Before starting it we must be sure that the role(client or server) is set.
+				 * Role may have already been set to server if we initiate the call and already received a packet from peer, in that case do nothing */
+				SalDtlsRole salRole = stream->dtls_role;
+				if (salRole==SalDtlsRoleInvalid) { /* it's invalid in streams[0] but check also at session level */
+					salRole = call->resultdesc->dtls_role;
+				}
+
+				if (salRole!=SalDtlsRoleInvalid) { /* if DTLS is available at both end points */
+					/* give the peer certificate fingerprint to dtls context */
+					SalMediaDescription *remote_desc = sal_call_get_remote_media_description(call->op);
+					ms_dtls_srtp_set_peer_fingerprint(call->audiostream->ms.sessions.dtls_context, remote_desc->streams[0].dtls_fingerprint);
+				} else {
+					ms_warning("unable to start DTLS engine on audiostream, Dtls role in resulting media description is invalid\n");
+				}
+				if (salRole == SalDtlsRoleIsClient) { /* local endpoint is client */
+					ms_dtls_srtp_set_role(call->audiostream->ms.sessions.dtls_context, MSDtlsSrtpRoleIsClient); /* set the role to client */
+					ms_dtls_srtp_start(call->audiostream->ms.sessions.dtls_context);  /* then start the engine, it will send the DTLS client Hello */
+				} else if (salRole == SalDtlsRoleIsServer) { /* local endpoint is server */
+					ms_dtls_srtp_set_role(call->audiostream->ms.sessions.dtls_context, MSDtlsSrtpRoleIsServer); /* this may complete the server setup */
+					/* no need to start engine, we are waiting for DTLS Client Hello */
+				}
+			}
+
 			if (call->params->in_conference){
 				/*transform the graph to connect it to the conference filter */
 				mute=stream->dir==SalStreamRecvOnly;
@@ -2555,6 +2579,28 @@ static void linphone_call_start_video_stream(LinphoneCall *call, bool_t all_inpu
 									   used_pt, linphone_core_get_video_jittcomp(lc), cam);
 				}
 			}
+			if (sal_stream_description_has_dtls(vstream) == TRUE) {
+				/*DTLS*/
+				SalDtlsRole salRole = vstream->dtls_role;
+				if (salRole==SalDtlsRoleInvalid) { /* it's invalid in streams[0] but check also at session level */
+					salRole = call->resultdesc->dtls_role;
+				}
+
+				if (salRole!=SalDtlsRoleInvalid) { /* if DTLS is available at both end points */
+					/* give the peer certificate fingerprint to dtls context */
+					SalMediaDescription *remote_desc = sal_call_get_remote_media_description(call->op);
+					ms_dtls_srtp_set_peer_fingerprint(call->videostream->ms.sessions.dtls_context, remote_desc->streams[1].dtls_fingerprint);
+				} else {
+					ms_warning("unable to start DTLS engine on videostream, Dtls role in resulting media description is invalid\n");
+				}
+				if (salRole == SalDtlsRoleIsClient) { /* local endpoint is client */
+					ms_dtls_srtp_set_role(call->videostream->ms.sessions.dtls_context, MSDtlsSrtpRoleIsClient); /* set the role to client */
+					ms_dtls_srtp_start(call->videostream->ms.sessions.dtls_context);  /* then start the engine, it will send the DTLS client Hello */
+				} else if (salRole == SalDtlsRoleIsServer) { /* local endpoint is server */
+					ms_dtls_srtp_set_role(call->videostream->ms.sessions.dtls_context, MSDtlsSrtpRoleIsServer); /* this may complete the server setup */
+					/* no need to start engine, we are waiting for DTLS Client Hello */
+				}
+			}
 		}else ms_warning("No video stream accepted.");
 	}else{
 		ms_message("No valid video stream defined.");
@@ -2605,6 +2651,7 @@ void linphone_call_start_media_streams(LinphoneCall *call, bool_t all_inputs_mut
 	call->playing_ringbacktone=send_ringbacktone;
 	call->up_bw=linphone_core_get_upload_bandwidth(lc);
 
+	/*might be moved in audio/video stream_start*/
 	if (call->params->media_encryption==LinphoneMediaEncryptionZRTP) {
 		MSZrtpParams params;
 		memset(&params,0,sizeof(MSZrtpParams));
@@ -2618,52 +2665,7 @@ void linphone_call_start_media_streams(LinphoneCall *call, bool_t all_inputs_mut
 			video_stream_enable_zrtp(call->videostream,call->audiostream,&params);
 		}
 #endif
-	} else if (call->params->media_encryption==LinphoneMediaEncryptionDTLS) {
-		/* DTLS engine was already initialised during stream init. Before starting it we must be sure that the role(client or server) is set.
-		 * Role may have already been set to server if we initiate the call and already received a packet from peer, in that case do nothing */
-		SalDtlsRole salRole = call->resultdesc->streams[0].dtls_role; /* TODO: is streams[0] necessary the audiostream in the media description ? */
-		if (salRole==SalDtlsRoleInvalid) { /* it's invalid in streams[0] but check also at session level */
-			salRole = call->resultdesc->dtls_role;
-		}
-
-		if (salRole!=SalDtlsRoleInvalid) { /* if DTLS is available at both end points */
-			/* give the peer certificate fingerprint to dtls context */
-			SalMediaDescription *remote_desc = sal_call_get_remote_media_description(call->op);
-			ms_dtls_srtp_set_peer_fingerprint(call->audiostream->ms.sessions.dtls_context, remote_desc->streams[0].dtls_fingerprint);
-		} else {
-			ms_warning("unable to start DTLS engine on audiostream, Dtls role in resulting media description is invalid\n");
-		}
-		if (salRole == SalDtlsRoleIsClient) { /* local endpoint is client */
-			ms_dtls_srtp_set_role(call->audiostream->ms.sessions.dtls_context, MSDtlsSrtpRoleIsClient); /* set the role to client */
-			ms_dtls_srtp_start(call->audiostream->ms.sessions.dtls_context);  /* then start the engine, it will send the DTLS client Hello */
-		} else if (salRole == SalDtlsRoleIsServer) { /* local endpoint is server */
-			ms_dtls_srtp_set_role(call->audiostream->ms.sessions.dtls_context, MSDtlsSrtpRoleIsServer); /* this may complete the server setup */
-			/* no need to start engine, we are waiting for DTLS Client Hello */
-		}
-#ifdef VIDEO_ENABLED
-		salRole = call->resultdesc->streams[1].dtls_role; /* TODO: is streams[1] necessary the videostream in the media description ? */
-		if (salRole==SalDtlsRoleInvalid) { /* it's invalid in streams[0] but check also at session level */
-			salRole = call->resultdesc->dtls_role;
-		}
-
-		if (salRole!=SalDtlsRoleInvalid) { /* if DTLS is available at both end points */
-			/* give the peer certificate fingerprint to dtls context */
-			SalMediaDescription *remote_desc = sal_call_get_remote_media_description(call->op);
-			ms_dtls_srtp_set_peer_fingerprint(call->videostream->ms.sessions.dtls_context, remote_desc->streams[1].dtls_fingerprint);
-		} else {
-			ms_warning("unable to start DTLS engine on videostream, Dtls role in resulting media description is invalid\n");
-		}
-		if (salRole == SalDtlsRoleIsClient) { /* local endpoint is client */
-			ms_dtls_srtp_set_role(call->videostream->ms.sessions.dtls_context, MSDtlsSrtpRoleIsClient); /* set the role to client */
-			ms_dtls_srtp_start(call->videostream->ms.sessions.dtls_context);  /* then start the engine, it will send the DTLS client Hello */
-		} else if (salRole == SalDtlsRoleIsServer) { /* local endpoint is server */
-			ms_dtls_srtp_set_role(call->videostream->ms.sessions.dtls_context, MSDtlsSrtpRoleIsServer); /* this may complete the server setup */
-			/* no need to start engine, we are waiting for DTLS Client Hello */
-		}
-
-#endif
-
-	} else {
+	}else if (call->params->media_encryption==LinphoneMediaEncryptionSRTP){
 		call->current_params->media_encryption=linphone_call_all_streams_encrypted(call) ?
 		LinphoneMediaEncryptionSRTP : LinphoneMediaEncryptionNone;
 	}
@@ -3269,10 +3271,18 @@ static void handle_ice_events(LinphoneCall *call, OrtpEvent *ev){
 
 	if (evt == ORTP_EVENT_ICE_SESSION_PROCESSING_FINISHED) {
 		LinphoneCallParams *params = linphone_call_params_copy(call->current_params);
-		if (call->params->media_encryption == LinphoneMediaEncryptionZRTP) {
-			/* preserve media encryption param because at that time ZRTP negociation may still be ongoing*/
+		switch (call->params->media_encryption) {
+			case LinphoneMediaEncryptionZRTP:
+			case LinphoneMediaEncryptionDTLS:
+			/* preserve media encryption param because at that time ZRTP/SRTP-DTLS negociation may still be ongoing*/
 			params->media_encryption=call->params->media_encryption;
+			break;
+			case LinphoneMediaEncryptionSRTP:
+			case LinphoneMediaEncryptionNone:
+			/*keep all values to make sure a warning will be generated by compiler if new enum value is added*/
+				break;
 		}
+
 		switch (ice_session_state(call->ice_session)) {
 			case IS_Completed:
 				ice_session_select_candidates(call->ice_session);
diff --git a/tester/call_tester.c b/tester/call_tester.c
index be6e4a29c..3dcc2a270 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -1350,18 +1350,33 @@ static bool_t add_video(LinphoneCoreManager* caller,LinphoneCoreManager* callee)
 		CU_ASSERT_TRUE(linphone_call_params_video_enabled(linphone_call_get_current_params(linphone_core_get_current_call(caller->lc))));
 		if (linphone_core_get_media_encryption(caller->lc) != LinphoneMediaEncryptionNone
 				&& linphone_core_get_media_encryption(callee->lc) != LinphoneMediaEncryptionNone) {
-			/*wait for encryption to be on, in case of zrtp, it can take a few seconds*/
-			if (linphone_core_get_media_encryption(caller->lc) == LinphoneMediaEncryptionZRTP)
-					wait_for(callee->lc,caller->lc,&caller->stat.number_of_LinphoneCallEncryptedOn,initial_caller_stat.number_of_LinphoneCallEncryptedOn+1);
-			if (linphone_core_get_media_encryption(callee->lc) == LinphoneMediaEncryptionZRTP)
-				wait_for(callee->lc,caller->lc,&callee->stat.number_of_LinphoneCallEncryptedOn,initial_callee_stat.number_of_LinphoneCallEncryptedOn+1);
+			const LinphoneCallParams* call_param;
 
-			{
-			const LinphoneCallParams* call_param = linphone_call_get_current_params(linphone_core_get_current_call(callee->lc));
+			switch (linphone_core_get_media_encryption(caller->lc)) {
+			case LinphoneMediaEncryptionZRTP:
+			case LinphoneMediaEncryptionDTLS:
+				/*wait for encryption to be on, in case of zrtp/dtls, it can take a few seconds*/
+				wait_for(callee->lc,caller->lc,&caller->stat.number_of_LinphoneCallEncryptedOn,initial_caller_stat.number_of_LinphoneCallEncryptedOn+1);
+			break;
+			case LinphoneMediaEncryptionNone:
+			case LinphoneMediaEncryptionSRTP:
+				break;
+			}
+			switch (linphone_core_get_media_encryption(callee->lc)) {
+			case LinphoneMediaEncryptionZRTP:
+			case LinphoneMediaEncryptionDTLS:
+				wait_for(callee->lc,caller->lc,&callee->stat.number_of_LinphoneCallEncryptedOn,initial_callee_stat.number_of_LinphoneCallEncryptedOn+1);
+			break;
+			case LinphoneMediaEncryptionNone:
+			case LinphoneMediaEncryptionSRTP:
+				break;
+			}
+
+			call_param = linphone_call_get_current_params(linphone_core_get_current_call(callee->lc));
 			CU_ASSERT_EQUAL(linphone_call_params_get_media_encryption(call_param),linphone_core_get_media_encryption(caller->lc));
 			call_param = linphone_call_get_current_params(linphone_core_get_current_call(caller->lc));
 			CU_ASSERT_EQUAL(linphone_call_params_get_media_encryption(call_param),linphone_core_get_media_encryption(caller->lc));
-			}
+
 		}
 
 		linphone_call_set_next_video_frame_decoded_callback(call_obj,linphone_call_cb,callee->lc);
@@ -1548,7 +1563,7 @@ static void call_with_declined_video_using_policy(void) {
 	call_with_declined_video_base(TRUE);
 }
 
-static void video_call_base(LinphoneCoreManager* pauline,LinphoneCoreManager* marie, bool_t using_policy) {
+static void video_call_base(LinphoneCoreManager* pauline,LinphoneCoreManager* marie, bool_t using_policy,LinphoneMediaEncryption mode) {
 	LinphoneCallTestParams caller_test_params = {0}, callee_test_params = {0};
 	LinphoneCall* marie_call;
 	LinphoneCall* pauline_call;
@@ -1569,6 +1584,9 @@ static void video_call_base(LinphoneCoreManager* pauline,LinphoneCoreManager* ma
 		linphone_core_set_video_policy(pauline->lc,&pauline_policy);
 	}
 
+	linphone_core_set_media_encryption(marie->lc,mode);
+	linphone_core_set_media_encryption(pauline->lc,mode);
+
 	caller_test_params.base=linphone_core_create_default_call_parameters(pauline->lc);
 	if (!using_policy)
 		linphone_call_params_enable_video(caller_test_params.base,TRUE);
@@ -1605,15 +1623,38 @@ static void video_call_base(LinphoneCoreManager* pauline,LinphoneCoreManager* ma
 static void video_call(void) {
 	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
-	video_call_base(marie,pauline,FALSE);
+	video_call_base(marie,pauline,FALSE,LinphoneMediaEncryptionNone);
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
 }
 
+static void video_call_zrtp(void) {
+	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
+	if (linphone_core_media_encryption_supported(marie->lc,LinphoneMediaEncryptionDTLS)) {
+		video_call_base(marie,pauline,FALSE,LinphoneMediaEncryptionZRTP);
+	} else
+		ms_message("Skipping video_call_zrtp");
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+static void video_call_dtls(void) {
+	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
+	if (linphone_core_media_encryption_supported(pauline->lc,LinphoneMediaEncryptionDTLS)) {
+		video_call_base(marie,pauline,FALSE,LinphoneMediaEncryptionDTLS);
+	} else
+		ms_message("Skipping video_call_dtls");
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+
+}
+
 static void video_call_using_policy(void) {
 	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
-	video_call_base(marie,pauline,TRUE);
+	video_call_base(marie,pauline,TRUE,LinphoneMediaEncryptionNone);
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
 }
@@ -1622,7 +1663,7 @@ static void video_call_no_sdp(void) {
 	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
 	linphone_core_enable_sdp_200_ack(pauline->lc,TRUE);
-	video_call_base(pauline,marie,FALSE);
+	video_call_base(pauline,marie,FALSE,LinphoneMediaEncryptionNone);
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
 }
@@ -2066,6 +2107,21 @@ static void dtls_srtp_call() {
 	call_base(LinphoneMediaEncryptionDTLS,FALSE,FALSE,LinphonePolicyNoFirewall,FALSE);
 }
 
+static void dtls_srtp_ice_call() {
+	call_base(LinphoneMediaEncryptionDTLS,FALSE,FALSE,LinphonePolicyUseIce,FALSE);
+}
+#ifdef VIDEO_ENABLED
+static void dtls_srtp_video_call() {
+	call_base(LinphoneMediaEncryptionDTLS,TRUE,FALSE,LinphonePolicyNoFirewall,FALSE);
+}
+
+static void dtls_srtp_ice_video_call() {
+	call_base(LinphoneMediaEncryptionDTLS,TRUE,FALSE,LinphonePolicyUseIce,FALSE);
+}
+static void dtls_srtp_ice_video_call_with_relay() {
+	call_base(LinphoneMediaEncryptionDTLS,TRUE,TRUE,LinphonePolicyUseIce,FALSE);
+}
+#endif
 static void call_with_declined_srtp(void) {
 	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
@@ -2342,6 +2398,10 @@ static void zrtp_ice_call_with_relay(void) {
 	call_base(LinphoneMediaEncryptionZRTP,FALSE,TRUE,LinphonePolicyUseIce,FALSE);
 }
 
+static void dtls_ice_call_with_relay(void) {
+	call_base(LinphoneMediaEncryptionDTLS,FALSE,TRUE,LinphonePolicyUseIce,FALSE);
+}
+
 static void early_media_call(void) {
 	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_early_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
@@ -3568,6 +3628,8 @@ test_t call_tests[] = {
 	{ "Audio call with ICE no matching audio codecs", audio_call_with_ice_no_matching_audio_codecs },
 #ifdef VIDEO_ENABLED
 	{ "Simple video call",video_call},
+	{ "Simple ZRTP video call",video_call_zrtp},
+	{ "Simple DTLS video call",video_call_dtls},
 	{ "Simple video call using policy",video_call_using_policy},
 	{ "Video call without SDP",video_call_no_sdp},
 	{ "SRTP ice video call", srtp_video_ice_call },
@@ -3584,10 +3646,15 @@ test_t call_tests[] = {
 	{ "Video call recording", video_call_recording_test },
 	{ "Snapshot", video_call_snapshot },
 	{ "Video call with early media and no matching audio codecs", video_call_with_early_media_no_matching_audio_codecs },
+	{ "DTLS SRTP video call",dtls_srtp_video_call},
+	{ "DTLS SRTP ice video call",dtls_srtp_ice_video_call},
+	{ "DTLS SRTP ice video call with relay",dtls_srtp_ice_video_call_with_relay},
 #endif
 	{ "SRTP ice call", srtp_ice_call },
 	{ "ZRTP ice call", zrtp_ice_call },
 	{ "ZRTP ice call with relay", zrtp_ice_call_with_relay},
+	{ "DTLS SRTP ice call",dtls_srtp_ice_call},
+	{ "DTLS ice call with relay", dtls_ice_call_with_relay},
 	{ "Call with privacy", call_with_privacy },
 	{ "Call with privacy 2", call_with_privacy2 },
 	{ "Call rejected because of wrong credential", call_rejected_because_wrong_credentials},

From 9b364df8f4c371a349ac4303b1662886aeff803d Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Sat, 14 Feb 2015 10:21:33 +0100
Subject: [PATCH 407/496] fix mkv file player test (was broken due to hello8000
 changed) and fix assert not working on windows

---
 mediastreamer2                      |   2 +-
 oRTP                                |   2 +-
 tester/call_tester.c                |  13 +++++++++----
 tester/sounds/hello8000_mkv_ref.wav | Bin 0 -> 183200 bytes
 4 files changed, 11 insertions(+), 6 deletions(-)
 create mode 100644 tester/sounds/hello8000_mkv_ref.wav

diff --git a/mediastreamer2 b/mediastreamer2
index 394858138..a9e3a9844 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 3948581385b9521c17a54c05c05d613add95e631
+Subproject commit a9e3a984485ef8d22394d06fa75497296daa4c66
diff --git a/oRTP b/oRTP
index 7822737d9..22b81144d 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 7822737d9cce52a956594d9466cb6419595ed7a8
+Subproject commit 22b81144d313b58cfe53c1c9aa71dcf22e1f43c2
diff --git a/tester/call_tester.c b/tester/call_tester.c
index 3dcc2a270..bddffa0b1 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -2230,7 +2230,7 @@ static void call_with_mkv_file_player(void) {
 	/*make sure the record file doesn't already exists, otherwise this test will append new samples to it*/
 	unlink(recordpath);
 
-	snprintf(hellowav,sizeof(hellowav), "%s/sounds/hello8000.wav", liblinphone_tester_file_prefix);
+	snprintf(hellowav,sizeof(hellowav), "%s/sounds/hello8000_mkv_ref.wav", liblinphone_tester_file_prefix);
 	snprintf(hellomkv,sizeof(hellomkv), "%s/sounds/hello8000.mkv", liblinphone_tester_file_prefix);
 
 	/*caller uses files instead of soundcard in order to avoid mixing soundcard input with file played using call's player*/
@@ -3563,19 +3563,24 @@ static void call_with_generic_cn(void) {
 	CU_ASSERT_PTR_NOT_NULL(pauline_call);
 	if (pauline_call){
 		const rtp_stats_t *rtps;
-		struct stat stbuf;
-		int err;
 
 		wait_for_until(marie->lc, pauline->lc, NULL, 0, 8000);
 		rtps=rtp_session_get_stats(pauline_call->audiostream->ms.sessions.rtp_session);
 		CU_ASSERT_TRUE(rtps->packet_recv<=300 && rtps->packet_recv>=200);
+	}
+	end_call(marie,pauline);
+	
+	if (pauline_call){
+		struct stat stbuf;
+		int err;
+		
 		err=stat(recorded_file,&stbuf);
 		CU_ASSERT_EQUAL(err, 0);
 		if (err==0){
 			CU_ASSERT_TRUE(stbuf.st_size>120000);
 		}
 	}
-	end_call(marie,pauline);
+	
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
 
diff --git a/tester/sounds/hello8000_mkv_ref.wav b/tester/sounds/hello8000_mkv_ref.wav
new file mode 100644
index 0000000000000000000000000000000000000000..f91203cd8ebbc27ca270f148e6b8f1f7523196d2
GIT binary patch
literal 183200
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

literal 0
HcmV?d00001


From 4b2969559bce56289fd5b4cbe8e11f611cbf7fe6 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Sat, 14 Feb 2015 15:31:41 +0100
Subject: [PATCH 408/496] update ms2, add message processing loop for windows

---
 mediastreamer2  | 2 +-
 tester/tester.c | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index a9e3a9844..07a8b5693 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit a9e3a984485ef8d22394d06fa75497296daa4c66
+Subproject commit 07a8b569317d23e9442882be267d6640498a7b5e
diff --git a/tester/tester.c b/tester/tester.c
index 741fc8938..b046c065e 100644
--- a/tester/tester.c
+++ b/tester/tester.c
@@ -211,6 +211,15 @@ bool_t wait_for_list(MSList* lcs,int* counter,int value,int timeout_ms) {
 #endif
 			linphone_core_iterate((LinphoneCore*)(iterator->data));
 		}
+#ifdef WIN32
+		{
+			MSG msg;
+			while (PeekMessage(&msg, NULL, 0, 0,1)){
+				TranslateMessage(&msg);
+				DispatchMessage(&msg);
+			}
+		}
+#endif
 		ms_usleep(20000);
 	}
 	if(counter && *counter<value) return FALSE;

From 38b54b6c38832abaf8d239c8c1f1d5ff2558e021 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Sat, 14 Feb 2015 17:14:05 +0100
Subject: [PATCH 409/496] don't force using vp8

---
 tester/video_tester.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tester/video_tester.c b/tester/video_tester.c
index c1807f3fe..7e3809e31 100644
--- a/tester/video_tester.c
+++ b/tester/video_tester.c
@@ -193,7 +193,12 @@ static LinphoneCallParams * _configure_for_video(LinphoneCoreManager *manager, L
 	linphone_core_enable_video_display(manager->lc, TRUE);
 	params = linphone_core_create_default_call_parameters(manager->lc);
 	linphone_call_params_enable_video(params, TRUE);
-	disable_all_video_codecs_except_one(manager->lc, "VP8");
+	if (linphone_core_find_payload_type(manager->lc,"VP8", 90000, -1)!=NULL){
+		disable_all_video_codecs_except_one(manager->lc, "VP8");
+	}else{
+		ms_warning("VP8 codec not available, will use MP4V-ES instead");
+		disable_all_video_codecs_except_one(manager->lc, "MP4V-ES");
+	}
 	return params;
 }
 

From 52e9e229bea2d20053f349c1250966710af4cb0b Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Sat, 14 Feb 2015 17:38:04 +0100
Subject: [PATCH 410/496] relax tests

---
 tester/call_tester.c     | 16 ++++++++--------
 tester/flexisip_tester.c |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/tester/call_tester.c b/tester/call_tester.c
index bddffa0b1..44e1a54c8 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -226,7 +226,7 @@ bool_t call_with_params2(LinphoneCoreManager* caller_mgr
 
 
 	CU_ASSERT_TRUE((caller_mgr->stat.number_of_LinphoneCallOutgoingRinging==initial_caller.number_of_LinphoneCallOutgoingRinging+1)
-							|(caller_mgr->stat.number_of_LinphoneCallOutgoingEarlyMedia==initial_caller.number_of_LinphoneCallOutgoingEarlyMedia+1));
+							||(caller_mgr->stat.number_of_LinphoneCallOutgoingEarlyMedia==initial_caller.number_of_LinphoneCallOutgoingEarlyMedia+1));
 
 
 	CU_ASSERT_PTR_NOT_NULL(linphone_core_get_current_call_remote_address(callee_mgr->lc));
@@ -271,10 +271,10 @@ bool_t call_with_params2(LinphoneCoreManager* caller_mgr
 		if ((linphone_core_get_media_encryption(callee_mgr->lc) == LinphoneMediaEncryptionZRTP) || (linphone_core_get_media_encryption(callee_mgr->lc) == LinphoneMediaEncryptionDTLS))
 			wait_for(callee_mgr->lc,caller_mgr->lc,&callee_mgr->stat.number_of_LinphoneCallEncryptedOn,initial_callee.number_of_LinphoneCallEncryptedOn+1);
 		{
-		const LinphoneCallParams* call_param = linphone_call_get_current_params(linphone_core_get_current_call(callee_mgr->lc));
-		CU_ASSERT_EQUAL(linphone_call_params_get_media_encryption(call_param),linphone_core_get_media_encryption(caller_mgr->lc));
-		call_param = linphone_call_get_current_params(linphone_core_get_current_call(caller_mgr->lc));
-		CU_ASSERT_EQUAL(linphone_call_params_get_media_encryption(call_param),linphone_core_get_media_encryption(callee_mgr->lc));
+			const LinphoneCallParams* call_param = linphone_call_get_current_params(linphone_core_get_current_call(callee_mgr->lc));
+			CU_ASSERT_EQUAL(linphone_call_params_get_media_encryption(call_param),linphone_core_get_media_encryption(caller_mgr->lc));
+			call_param = linphone_call_get_current_params(linphone_core_get_current_call(caller_mgr->lc));
+			CU_ASSERT_EQUAL(linphone_call_params_get_media_encryption(call_param),linphone_core_get_media_encryption(callee_mgr->lc));
 		}
 	}
 	return result;
@@ -1983,9 +1983,9 @@ static void call_waiting_indication_with_param(bool_t enable_caller_privacy) {
 	wait_for_list(lcs,NULL,0,1000);
 	linphone_core_terminate_all_calls(pauline->lc);
 
-	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallEnd,1,2000));
-	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallEnd,1,2000));
-	CU_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallEnd,1,2000));
+	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallEnd,1,10000));
+	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallEnd,1,10000));
+	CU_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallEnd,1,10000));
 
 
 	linphone_core_manager_destroy(marie);
diff --git a/tester/flexisip_tester.c b/tester/flexisip_tester.c
index 06d8200cf..9f624572c 100644
--- a/tester/flexisip_tester.c
+++ b/tester/flexisip_tester.c
@@ -146,7 +146,7 @@ static void message_forking_with_all_recipients_unreachable(void) {
 	
 	linphone_chat_room_send_message2(chat_room,message,liblinphone_tester_chat_message_state_change,pauline->lc);
 	
-	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneMessageInProgress,1,1000));
+	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneMessageInProgress,1,5000));
 	/*flexisip will accept the message with 202 after 16 seconds*/
 	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneMessageDelivered,1,18000));
 	CU_ASSERT_TRUE( marie->stat.number_of_LinphoneMessageReceived==0);
@@ -195,9 +195,9 @@ static void call_forking(void){
 	/*pauline should hear ringback*/
 	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallOutgoingRinging,1,3000));
 	/*all devices from Marie should be ringing*/
-	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallIncomingReceived,1,1000));
-	CU_ASSERT_TRUE(wait_for_list(lcs,&marie2->stat.number_of_LinphoneCallIncomingReceived,1,1000));
-	CU_ASSERT_TRUE(wait_for_list(lcs,&marie3->stat.number_of_LinphoneCallIncomingReceived,1,1000));
+	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallIncomingReceived,1,3000));
+	CU_ASSERT_TRUE(wait_for_list(lcs,&marie2->stat.number_of_LinphoneCallIncomingReceived,1,3000));
+	CU_ASSERT_TRUE(wait_for_list(lcs,&marie3->stat.number_of_LinphoneCallIncomingReceived,1,3000));
 	
 	/*marie accepts the call on its first device*/
 	linphone_core_accept_call(marie->lc,linphone_core_get_current_call(marie->lc));

From 3b15ef89cf924719bc04bbc6e459d639d757d2ee Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Sat, 14 Feb 2015 19:10:09 +0100
Subject: [PATCH 411/496] relax tests again

---
 tester/call_tester.c     | 6 +++---
 tester/flexisip_tester.c | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tester/call_tester.c b/tester/call_tester.c
index 44e1a54c8..e0badd199 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -2056,9 +2056,9 @@ static void simple_conference_base(LinphoneCoreManager* marie, LinphoneCoreManag
 
 	linphone_core_terminate_conference(marie->lc);
 
-	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallEnd,1,2000));
-	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallEnd,1,2000));
-	CU_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallEnd,1,2000));
+	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallEnd,1,10000));
+	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallEnd,1,10000));
+	CU_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallEnd,1,10000));
 
 
 
diff --git a/tester/flexisip_tester.c b/tester/flexisip_tester.c
index 9f624572c..3a4069857 100644
--- a/tester/flexisip_tester.c
+++ b/tester/flexisip_tester.c
@@ -396,7 +396,7 @@ static void call_forking_with_push_notification_single(void){
 	
 	/*marie accepts the call*/
 	linphone_core_accept_call(marie->lc,linphone_core_get_current_call(marie->lc));
-	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallConnected,1,1000));
+	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallConnected,1,5000));
 	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallStreamsRunning,1,1000));
 	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallConnected,1,1000));
 	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallStreamsRunning,1,1000));
@@ -404,8 +404,8 @@ static void call_forking_with_push_notification_single(void){
 	liblinphone_tester_check_rtcp(pauline,marie);
 	
 	linphone_core_terminate_call(pauline->lc,linphone_core_get_current_call(pauline->lc));
-	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallEnd,1,1000));
-	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallEnd,1,1000));
+	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallEnd,1,5000));
+	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallEnd,1,5000));
 	
 	linphone_core_manager_destroy(pauline);
 	linphone_core_manager_destroy(marie);

From 97c2607ec7f17c8df2079ff9d97835e5f5549867 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Sat, 14 Feb 2015 22:05:12 +0100
Subject: [PATCH 412/496] relax tests, ms2 and ortp must appear first in the
 link command to make sure that they are taken for inner directories.

---
 coreapi/Makefile.am  |  4 ++--
 tester/call_tester.c | 38 ++++++++++++++++++++------------------
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/coreapi/Makefile.am b/coreapi/Makefile.am
index 85f65bcf1..40a26ccab 100644
--- a/coreapi/Makefile.am
+++ b/coreapi/Makefile.am
@@ -131,9 +131,9 @@ endif
 endif
 
 liblinphone_la_LIBADD= \
-		$(SIPSTACK_LIBS) \
 		$(MEDIASTREAMER_LIBS) \
-		$(ORTP_LIBS) $(OPENSSL_LIBS) \
+		$(ORTP_LIBS) \
+		$(SIPSTACK_LIBS) \
 		$(TUNNEL_LIBS) \
 		$(LIBSOUP_LIBS) \
 		$(SQLITE3_LIBS) \
diff --git a/tester/call_tester.c b/tester/call_tester.c
index e0badd199..d19161460 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -2900,32 +2900,34 @@ static void call_redirect(void){
 
 	marie_call = linphone_core_invite_address(marie->lc, pauline->identity);
 
-	CU_ASSERT_TRUE(wait_for_list(lcs, &pauline->stat.number_of_LinphoneCallIncomingReceived,1,1000));
+	CU_ASSERT_TRUE(wait_for_list(lcs, &pauline->stat.number_of_LinphoneCallIncomingReceived,1,6000));
 
-	margaux_url = linphone_address_as_string(laure->identity);
-	linphone_core_redirect_call(pauline->lc, linphone_core_get_current_call(pauline->lc), margaux_url);
-	ms_free(margaux_url);
+	if (linphone_core_get_current_call(pauline->lc)){
+		margaux_url = linphone_address_as_string(laure->identity);
+		linphone_core_redirect_call(pauline->lc, linphone_core_get_current_call(pauline->lc), margaux_url);
+		ms_free(margaux_url);
 
-	/* laure should be ringing now */
-	CU_ASSERT_TRUE(wait_for_list(lcs, &laure->stat.number_of_LinphoneCallIncomingReceived,1,6000));
-	/* pauline should have ended the call */
-	CU_ASSERT_TRUE(wait_for_list(lcs, &pauline->stat.number_of_LinphoneCallEnd,1,1000));
-	/* the call should still be ringing on marie's side */
-	CU_ASSERT_TRUE(wait_for_list(lcs, &marie->stat.number_of_LinphoneCallOutgoingRinging, 1,1000));
+		/* laure should be ringing now */
+		CU_ASSERT_TRUE(wait_for_list(lcs, &laure->stat.number_of_LinphoneCallIncomingReceived,1,6000));
+		/* pauline should have ended the call */
+		CU_ASSERT_TRUE(wait_for_list(lcs, &pauline->stat.number_of_LinphoneCallEnd,1,1000));
+		/* the call should still be ringing on marie's side */
+		CU_ASSERT_TRUE(wait_for_list(lcs, &marie->stat.number_of_LinphoneCallOutgoingRinging, 1,1000));
 
-	linphone_core_accept_call(laure->lc, linphone_core_get_current_call(laure->lc));
+		linphone_core_accept_call(laure->lc, linphone_core_get_current_call(laure->lc));
 
-	CU_ASSERT_TRUE(wait_for_list(lcs, &marie->stat.number_of_LinphoneCallStreamsRunning, 1,1000));
-	CU_ASSERT_TRUE(wait_for_list(lcs, &laure->stat.number_of_LinphoneCallStreamsRunning, 1,1000));
+		CU_ASSERT_TRUE(wait_for_list(lcs, &marie->stat.number_of_LinphoneCallStreamsRunning, 1,1000));
+		CU_ASSERT_TRUE(wait_for_list(lcs, &laure->stat.number_of_LinphoneCallStreamsRunning, 1,1000));
 
-	CU_ASSERT_EQUAL(marie_call, linphone_core_get_current_call(marie->lc));
+		CU_ASSERT_EQUAL(marie_call, linphone_core_get_current_call(marie->lc));
 
-	liblinphone_tester_check_rtcp(marie, laure);
+		liblinphone_tester_check_rtcp(marie, laure);
 
-	linphone_core_terminate_all_calls(laure->lc);
+		linphone_core_terminate_all_calls(laure->lc);
 
-	CU_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallEnd,1,1000));
-	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallEnd,1,1000));
+		CU_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallEnd,1,5000));
+		CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallEnd,1,5000));
+	}
 
 	ms_list_free(lcs);
 

From 847713bb82969a3c9890b7d90751778b5121f38f Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Sat, 14 Feb 2015 22:44:37 +0100
Subject: [PATCH 413/496] fix beautiful bug in getline() implementation,
 causing crash on windows

---
 tester/log_collection_tester.c | 44 ++++++++++++++++++++--------------
 1 file changed, 26 insertions(+), 18 deletions(-)

diff --git a/tester/log_collection_tester.c b/tester/log_collection_tester.c
index 3fbbd43c2..96531422a 100644
--- a/tester/log_collection_tester.c
+++ b/tester/log_collection_tester.c
@@ -35,7 +35,7 @@
 /*getline is POSIX 2008, not available on many systems.*/
 #if defined(ANDROID) || defined(WIN32)
 /* This code is public domain -- Will Hartung 4/9/09 */
-size_t getline(char **lineptr, size_t *n, FILE *stream) {
+static size_t getline(char **lineptr, size_t *n, FILE *stream) {
 	char *bufptr = NULL;
 	char *p = bufptr;
 	size_t size;
@@ -66,9 +66,12 @@ size_t getline(char **lineptr, size_t *n, FILE *stream) {
 	}
 	p = bufptr;
 	while(c != EOF) {
-		if ((p - bufptr) > (size - 1)) {
+		size_t curpos = p-bufptr;
+		
+		if (curpos > (size - 1)) {
 			size = size + 128;
 			bufptr = realloc(bufptr, size);
+			p = bufptr + curpos;
 			if (bufptr == NULL) {
 				return -1;
 			}
@@ -89,19 +92,19 @@ size_t getline(char **lineptr, size_t *n, FILE *stream) {
 #endif
 
 static LinphoneLogCollectionState old_collection_state;
-void collect_init()  {
+static void collect_init()  {
 	old_collection_state = linphone_core_log_collection_enabled();
 	linphone_core_set_log_collection_path(liblinphone_tester_writable_dir_prefix);
 }
 
-void collect_cleanup(LinphoneCoreManager *marie)  {
+static void collect_cleanup(LinphoneCoreManager *marie)  {
 	linphone_core_manager_destroy(marie);
 
 	linphone_core_enable_log_collection(old_collection_state);
 	linphone_core_reset_log_collection();
 }
 
-LinphoneCoreManager* setup(bool_t enable_logs)  {
+static LinphoneCoreManager* setup(bool_t enable_logs)  {
 	LinphoneCoreManager *marie;
 	int timeout = 300;
 
@@ -119,27 +122,28 @@ LinphoneCoreManager* setup(bool_t enable_logs)  {
 }
 
 #if HAVE_ZLIB
+
 /*returns uncompressed log file*/
-FILE* gzuncompress(const char* filepath) {
+static FILE* gzuncompress(const char* filepath) {
 		gzFile file = gzopen(filepath, "rb");
 		FILE *output = NULL;
+		FILE *ret;
 		char *newname = ms_strdup_printf("%s.txt", filepath);
-		char buffer[512];
-		output = fopen(newname, "w+");
+		char buffer[512]={0};
+		output = fopen(newname, "wb");
 		while (gzread(file, buffer, 511) > 0) {
 			fputs(buffer, output);
 			memset(buffer, 0, strlen(buffer));
 		}
-
+		fclose(output);
 		CU_ASSERT_EQUAL(gzclose(file), Z_OK);
+		ret=fopen(newname, "rb");
 		ms_free(newname);
-
-		fseek(output, 0, SEEK_SET);
-		return (FILE*)output;
+		return ret;
 }
 #endif
 
-time_t check_file(LinphoneCoreManager* mgr)  {
+static time_t check_file(LinphoneCoreManager* mgr)  {
 
 	time_t last_log = ms_time(NULL);
 	char*    filepath = linphone_core_compress_log_collection(mgr->lc);
@@ -162,9 +166,10 @@ time_t check_file(LinphoneCoreManager* mgr)  {
 		// 0) if zlib is enabled, we must decompress the file first
 		file = gzuncompress(filepath);
 #else
-		file = fopen(filepath, "r");
+		file = fopen(filepath, "rb");
 #endif
-
+		CU_ASSERT_PTR_NOT_NULL(file);
+		if (!file) return 0;
 		// 1) expect to find folder name in filename path
 		CU_ASSERT_PTR_NOT_NULL(strstr(filepath, liblinphone_tester_writable_dir_prefix));
 
@@ -183,8 +188,6 @@ time_t check_file(LinphoneCoreManager* mgr)  {
 					time_prev = time_curr;
 				}
 			}
-#else
-			ms_warning("strptime() not available for this platform, test is incomplete.");
 #endif
 		}
 		CU_ASSERT_TRUE(line_count > 25);
@@ -192,12 +195,17 @@ time_t check_file(LinphoneCoreManager* mgr)  {
 		fclose(file);
 		ms_free(filepath);
 
-		timediff = labs((long int)time_curr - (long int)last_log);
 
+		timediff = labs((long int)time_curr - (long int)last_log);
+		(void)timediff;
+#ifndef WIN32
 		CU_ASSERT_TRUE( timediff <= 1 );
 		if( !(timediff <= 1) ){
 			ms_error("time_curr: %ld, last_log: %ld timediff: %u", (long int)time_curr, (long int)last_log, timediff );
 		}
+#else
+		ms_warning("strptime() not available for this platform, test is incomplete.");
+#endif
 	}
 	// return latest time in file
 	return time_curr;

From 7a2ca89183fa9fbc3ffdc9ce272e8d827c30bbdf Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Sun, 15 Feb 2015 15:01:13 +0100
Subject: [PATCH 414/496] increase tester's timeouts

---
 tester/eventapi_tester.c | 12 ++++++------
 tester/flexisip_tester.c |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tester/eventapi_tester.c b/tester/eventapi_tester.c
index abd8c0a30..fbe48f9a4 100644
--- a/tester/eventapi_tester.c
+++ b/tester/eventapi_tester.c
@@ -247,11 +247,11 @@ static void subscribe_test_with_args2(bool_t terminated_by_subscriber, RefreshTe
 	CU_ASSERT_STRING_EQUAL(linphone_event_get_custom_header(pauline->lev,"My-Header"),"pouet");
 	CU_ASSERT_STRING_EQUAL(linphone_event_get_custom_header(pauline->lev,"My-Header2"),"pimpon");
 	
-	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneSubscriptionActive,1,1000));
-	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneSubscriptionActive,1,1000));
+	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneSubscriptionActive,1,5000));
+	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneSubscriptionActive,1,5000));
 
 	/*make sure marie receives first notification before terminating*/
-	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_NotifyReceived,1,1000));
+	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_NotifyReceived,1,5000));
 	
 	if (refresh_type==AutoRefresh){
 		wait_for_list(lcs,NULL,0,6000);
@@ -259,7 +259,7 @@ static void subscribe_test_with_args2(bool_t terminated_by_subscriber, RefreshTe
 	}else if (refresh_type==ManualRefresh){
 		CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneSubscriptionExpiring,1,4000));
 		linphone_event_update_subscribe(lev,NULL);
-		CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneSubscriptionActive,2,2000));
+		CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneSubscriptionActive,2,5000));
 	}
 
 	if (terminated_by_subscriber){
@@ -269,8 +269,8 @@ static void subscribe_test_with_args2(bool_t terminated_by_subscriber, RefreshTe
 		linphone_event_terminate(pauline->lev);
 	}
 
-	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneSubscriptionTerminated,1,1000));
-	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneSubscriptionTerminated,1,1000));
+	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneSubscriptionTerminated,1,5000));
+	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneSubscriptionTerminated,1,5000));
 
 	linphone_content_unref(content);
 	linphone_core_manager_destroy(marie);
diff --git a/tester/flexisip_tester.c b/tester/flexisip_tester.c
index 3a4069857..7f4680639 100644
--- a/tester/flexisip_tester.c
+++ b/tester/flexisip_tester.c
@@ -574,8 +574,8 @@ static void early_media_call_forking(void) {
 					&& linphone_call_get_audio_stats(marie1_call)->download_bandwidth<99 );
 	
 	linphone_core_terminate_all_calls(pauline->lc);
-	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallEnd,1,1000));
-	CU_ASSERT_TRUE(wait_for_list(lcs,&marie1->stat.number_of_LinphoneCallEnd,1,1000));
+	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallEnd,1,5000));
+	CU_ASSERT_TRUE(wait_for_list(lcs,&marie1->stat.number_of_LinphoneCallEnd,1,5000));
 
 	ms_list_free(lcs);
 	linphone_core_manager_destroy(marie1);
@@ -643,7 +643,7 @@ static void call_with_sips_not_achievable(void){
 	linphone_address_unref(dest);
 
 	/*Call should be rejected by server with 480*/
-	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallError,1,3000));
+	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallError,1,6000));
 	ei=linphone_call_get_error_info(call);
 	CU_ASSERT_PTR_NOT_NULL(ei);
 	if (ei){

From 009fe8afc943d2c9f457f2f34f0224ffd41c0045 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
 <francois.grisez@belledonne-communications.com>
Date: Mon, 16 Feb 2015 15:09:22 +0100
Subject: [PATCH 415/496] Add an appdata file for Linphone

---
 share/Makefile.am          |  3 +++
 share/linphone.appdata.xml | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 share/linphone.appdata.xml

diff --git a/share/Makefile.am b/share/Makefile.am
index f0df44261..ca8f2e233 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -32,6 +32,9 @@ pkgconfig_DATA=linphone.pc
 linphonedir=$(datadir)/linphone
 linphone_DATA=rootca.pem
 
+appdatadir=$(datadir)/appdata
+appdata_DATA=linphone.appdata.xml
+
 #download root ca from mozilla using script from curl (mk-ca-bundle.pl).
 #if that fails (no connection, no perl SSL...) , then a rootca bundle archived in the source tree is taken instead.
 rootca.pem:
diff --git a/share/linphone.appdata.xml b/share/linphone.appdata.xml
new file mode 100644
index 000000000..db660b614
--- /dev/null
+++ b/share/linphone.appdata.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2015 Belledonne Communications <contact@belledonne-communications.com> -->
+<component type="desktop">
+    <id>linphone.desktop</id>
+    <metadata_license>CC0-1.0</metadata_license>
+    <project_license>GPL-2.0</project_license>
+    <name>Linphone</name>
+    <summary>SIP video soft-phone</summary>
+    <description>
+        <ul>
+            <li>Make audio and video calls in HD</li>
+            <li>Create audio conferences</li>
+            <li>Record and store calls</li>
+            <li>View real-time presence status</li>
+            <li>Manage your address book</li>
+            <li>Communicate securely</li>
+            <li>Free subscription</li>
+        </ul>
+    </description>
+    <screenshots>
+        <screenshot type="default">
+            <image>http://www.linphone.org/uploads/images/desktop_main_window.png</image>
+            <caption>Main window</caption>
+        </screenshot>
+        <screenshot>
+            <image>http://www.linphone.org/uploads/images/desktop_call_view.png</image>
+            <caption>Call view</caption>
+        </screenshot>
+        <screenshot>
+            <image>http://www.linphone.org/uploads/images/desktop_chat_view.png</image>
+            <caption>Chat view</caption>
+        </screenshot>
+    </screenshots>
+    <url type="homepage">http://www.linphone.org</url>
+    <updatecontact>contact@belledonne-communications.com</updatecontact>
+</component>

From ccb890ad9431f62617d761c9b0bd601fe1340e02 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Mon, 16 Feb 2015 17:50:28 +0100
Subject: [PATCH 416/496] simplify dtls session/media description attributes
 mgt

---
 coreapi/bellesip_sal/sal_sdp.c | 59 +++++++++------------------
 coreapi/linphonecall.c         | 33 ++++++++-------
 coreapi/offeranswer.c          | 74 +++++++++++++---------------------
 include/sal/sal.h              |  2 -
 mediastreamer2                 |  2 +-
 5 files changed, 64 insertions(+), 106 deletions(-)

diff --git a/coreapi/bellesip_sal/sal_sdp.c b/coreapi/bellesip_sal/sal_sdp.c
index ce780c1cf..ed34c634a 100644
--- a/coreapi/bellesip_sal/sal_sdp.c
+++ b/coreapi/bellesip_sal/sal_sdp.c
@@ -389,23 +389,6 @@ belle_sdp_session_description_t * media_description_to_sdp ( const SalMediaDescr
 	if (desc->ice_pwd[0] != '\0') belle_sdp_session_description_add_attribute(session_desc, belle_sdp_attribute_create("ice-pwd",desc->ice_pwd));
 	if (desc->ice_ufrag[0] != '\0') belle_sdp_session_description_add_attribute(session_desc, belle_sdp_attribute_create("ice-ufrag",desc->ice_ufrag));
 
-	/* insert DTLS session attribute if needed */
-	if ((desc->dtls_role != SalDtlsRoleInvalid) && (strlen(desc->dtls_fingerprint)>0)) {
-		switch(desc->dtls_role) {
-			case SalDtlsRoleIsClient:
-				belle_sdp_session_description_add_attribute(session_desc, belle_sdp_attribute_create("setup","active"));
-				break;
-			case SalDtlsRoleIsServer:
-				belle_sdp_session_description_add_attribute(session_desc, belle_sdp_attribute_create("setup","passive"));
-				break;
-			case SalDtlsRoleUnset:
-			default:
-				belle_sdp_session_description_add_attribute(session_desc, belle_sdp_attribute_create("setup","actpass"));
-				break;
-		}
-		belle_sdp_session_description_add_attribute(session_desc, belle_sdp_attribute_create("fingerprint",desc->dtls_fingerprint));
-	}
-
 	if (desc->rtcp_xr.enabled == TRUE) {
 		belle_sdp_session_description_add_attribute(session_desc, create_rtcp_xr_attribute(&desc->rtcp_xr));
 	}
@@ -777,20 +760,10 @@ static SalStreamDescription * sdp_to_stream_description(SalMediaDescription *md,
 			} else if (strncmp(value, "passive", 7) == 0) {
 				stream->dtls_role = SalDtlsRoleIsServer;
 			}
-
-			if (stream->dtls_role != SalDtlsRoleInvalid || md->dtls_role != SalDtlsRoleInvalid) {
+			if (stream->dtls_role != SalDtlsRoleInvalid) {
 				attribute=belle_sdp_media_description_get_attribute(media_desc,"fingerprint");
-				if (attribute && (value=belle_sdp_attribute_get_value(attribute))!=NULL){
-					strncpy(stream->dtls_fingerprint, value, sizeof(stream->dtls_fingerprint)-1);
-				} else {
-					/* no valid stream attributes, get them from session */
-					if (stream->dtls_role == SalDtlsRoleInvalid) stream->dtls_role = md->dtls_role;
-					strncpy(stream->dtls_fingerprint, md->dtls_fingerprint, strlen(md->dtls_fingerprint)+1);
-				}
+				strncpy(stream->dtls_fingerprint, belle_sdp_attribute_get_value(attribute),sizeof(stream->dtls_fingerprint));
 			}
-		} else { /* no setup attribute found in the stream, get the one from the session */
-			stream->dtls_role = md->dtls_role;
-			strncpy(stream->dtls_fingerprint, md->dtls_fingerprint, strlen(md->dtls_fingerprint)+1);
 		}
 	}
 
@@ -849,26 +822,30 @@ int sdp_to_media_description ( belle_sdp_session_description_t  *session_desc, S
 		desc->dir=SalStreamInactive;
 	}
 
-	/* Read dtls specific session attributes if any (setup and fingerprint - rfc5763) */
-	/* Presence of a valid dtls offer(setup and fingerprint attribute) is set in media Description by a dtls_fingerprint string longer than 0
-	 * and a dtls_role != SalDtlsRoleInvalid */
-	desc->dtls_role = SalDtlsRoleInvalid;
-	desc->dtls_fingerprint[0] = '\0';
+	/*DTLS attributes can be defined at session level.*/
 	value=belle_sdp_session_description_get_attribute_value(session_desc,"setup");
 	if (value){
+		SalDtlsRole session_role;
 		if (strncmp(value, "actpass", 7) == 0) {
-			desc->dtls_role = SalDtlsRoleUnset;
+			session_role = SalDtlsRoleUnset;
 		} else if (strncmp(value, "active", 6) == 0) {
-			desc->dtls_role = SalDtlsRoleIsClient;
+			session_role = SalDtlsRoleIsClient;
 		} else if (strncmp(value, "passive", 7) == 0) {
-			desc->dtls_role = SalDtlsRoleIsServer;
+			session_role = SalDtlsRoleIsServer;
 		}
+		value=belle_sdp_session_description_get_attribute_value(session_desc,"fingerprint");
+		if (value){
+			int i;
+			/*copy dtls attributes to every streams, might be overwritten stream by stream*/
+			for (i=0;i<SAL_MEDIA_DESCRIPTION_MAX_STREAMS;i++) {
+				strncpy(desc->streams[i].dtls_fingerprint, value, sizeof(desc->streams[i].dtls_fingerprint));
+				desc->streams[i].dtls_role=session_role;
+			}
+		}
+
 	}
 
-	value=belle_sdp_session_description_get_attribute_value(session_desc,"fingerprint");
-	if (value){
-		strncpy(desc->dtls_fingerprint, value, sizeof(desc->dtls_fingerprint)-1);
-	}
+
 
 	/* Get ICE remote ufrag and remote pwd, and ice_lite flag */
 	value=belle_sdp_session_description_get_attribute_value(session_desc,"ice-ufrag");
diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index f5aff970d..8cd0c1352 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -438,7 +438,22 @@ static int setup_encryption_key(SalSrtpCryptoAlgo *crypto, MSCryptoSuite suite,
 	}
 	return 0;
 }
+static void setup_dtls_keys(LinphoneCall *call, SalMediaDescription *md){
+	int i;
+	for(i=0; i<md->nb_streams; i++) {
+		if (!sal_stream_description_active(&md->streams[i])) continue;
+		/* if media encryption is set to DTLS check presence of fingerprint in the call which shall have been set at stream init but it may have failed when retrieving certificate resulting in no fingerprint present and then DTLS not usable */
+		if (sal_stream_description_has_dtls(&md->streams[i]) == TRUE) {
+			strncpy(md->streams[i].dtls_fingerprint, call->dtls_certificate_fingerprint, sizeof(md->streams[i].dtls_fingerprint)); /* get the self fingerprint from call(it's computed at stream init) */
+			md->streams[i].dtls_role = SalDtlsRoleUnset; /* if we are offering, SDP will have actpass setup attribute when role is unset, if we are responding the result mediadescription will be set to SalDtlsRoleIsClient */
+		} else {
+			md->streams[i].dtls_fingerprint[0] = '\0';
+			md->streams[i].dtls_role = SalDtlsRoleInvalid;
 
+		}
+	}
+
+}
 static void setup_encryption_keys(LinphoneCall *call, SalMediaDescription *md){
 	LinphoneCore *lc=call->core;
 	int i,j;
@@ -675,16 +690,8 @@ void linphone_call_make_local_media_description(LinphoneCore *lc, LinphoneCall *
 		l = make_codec_list(lc, &codec_hints, lc->codecs_conf.video_codecs);
 		md->streams[i].payloads = l;
 	}
-
 	setup_encryption_keys(call,md);
-	/* if media encryption is set to DTLS check presence of fingerprint in the call which shall have been set at stream init but it may have failed when retrieving certificate resulting in no fingerprint present and then DTLS not usable */
-	if ((call->params->media_encryption==LinphoneMediaEncryptionDTLS) && (call->dtls_certificate_fingerprint!= NULL)) {
-		memcpy(md->dtls_fingerprint, call->dtls_certificate_fingerprint, strlen((const char *)(call->dtls_certificate_fingerprint))); /* get the self fingerprint from call(it's computed at stream init) */
-		md->dtls_role = SalDtlsRoleUnset; /* if we are offering, SDP will have actpass setup attribute when role is unset, if we are responding the result mediadescription will be set to SalDtlsRoleIsClient */
-	} else {
-		md->dtls_fingerprint[0] = '\0';
-		md->dtls_role = SalDtlsRoleInvalid;
-	}
+	setup_dtls_keys(call,md);
 	setup_rtcp_fb(call, md);
 	setup_rtcp_xr(call, md);
 
@@ -2434,10 +2441,6 @@ static void linphone_call_start_audio_stream(LinphoneCall *call, bool_t muted, b
 				/* DTLS engine was already initialised during stream init. Before starting it we must be sure that the role(client or server) is set.
 				 * Role may have already been set to server if we initiate the call and already received a packet from peer, in that case do nothing */
 				SalDtlsRole salRole = stream->dtls_role;
-				if (salRole==SalDtlsRoleInvalid) { /* it's invalid in streams[0] but check also at session level */
-					salRole = call->resultdesc->dtls_role;
-				}
-
 				if (salRole!=SalDtlsRoleInvalid) { /* if DTLS is available at both end points */
 					/* give the peer certificate fingerprint to dtls context */
 					SalMediaDescription *remote_desc = sal_call_get_remote_media_description(call->op);
@@ -2582,10 +2585,6 @@ static void linphone_call_start_video_stream(LinphoneCall *call, bool_t all_inpu
 			if (sal_stream_description_has_dtls(vstream) == TRUE) {
 				/*DTLS*/
 				SalDtlsRole salRole = vstream->dtls_role;
-				if (salRole==SalDtlsRoleInvalid) { /* it's invalid in streams[0] but check also at session level */
-					salRole = call->resultdesc->dtls_role;
-				}
-
 				if (salRole!=SalDtlsRoleInvalid) { /* if DTLS is available at both end points */
 					/* give the peer certificate fingerprint to dtls context */
 					SalMediaDescription *remote_desc = sal_call_get_remote_media_description(call->op);
diff --git a/coreapi/offeranswer.c b/coreapi/offeranswer.c
index 9baedd158..a74105963 100644
--- a/coreapi/offeranswer.c
+++ b/coreapi/offeranswer.c
@@ -394,6 +394,21 @@ static void initiate_outgoing(const SalStreamDescription *local_offer,
 	result->rtp_ssrc=local_offer->rtp_ssrc;
 	strncpy(result->rtcp_cname,local_offer->rtcp_cname,sizeof(result->rtcp_cname));
 
+	// Handle dtls session attribute: if both local and remote have a dtls fingerprint and a dtls setup, get the remote fingerprint into the result
+	if ((local_offer->dtls_role!=SalDtlsRoleInvalid) && (remote_answer->dtls_role!=SalDtlsRoleInvalid)
+			&&(strlen(local_offer->dtls_fingerprint)>0) && (strlen(remote_answer->dtls_fingerprint)>0)) {
+		strncpy(result->dtls_fingerprint, remote_answer->dtls_fingerprint,sizeof(result->dtls_fingerprint));
+		if (remote_answer->dtls_role==SalDtlsRoleIsClient) {
+			result->dtls_role = SalDtlsRoleIsServer;
+		} else {
+			result->dtls_role = SalDtlsRoleIsClient;
+		}
+	} else {
+		result->dtls_fingerprint[0] = '\0';
+		result->dtls_role = SalDtlsRoleInvalid;
+	}
+
+
 }
 
 
@@ -449,6 +464,20 @@ static void initiate_incoming(const SalStreamDescription *local_cap,
 	result->rtp_ssrc=local_cap->rtp_ssrc;
 	strncpy(result->rtcp_cname,local_cap->rtcp_cname,sizeof(result->rtcp_cname));
 
+	// Handle dtls stream attribute: if both local and remote have a dtls fingerprint and a dtls setup, add the local fingerprint to the answer
+	// Note: local description usually stores dtls config at session level which means it apply to all streams, check this too
+	if (((local_cap->dtls_role!=SalDtlsRoleInvalid)) && (remote_offer->dtls_role!=SalDtlsRoleInvalid)
+			&& (strlen(local_cap->dtls_fingerprint)>0) && (strlen(remote_offer->dtls_fingerprint)>0)) {
+		strncpy(result->dtls_fingerprint, local_cap->dtls_fingerprint,sizeof(result->dtls_fingerprint));
+		if (remote_offer->dtls_role==SalDtlsRoleUnset) {
+			result->dtls_role = SalDtlsRoleIsClient;
+		}
+	} else {
+		result->dtls_fingerprint[0] = '\0';
+		result->dtls_role = SalDtlsRoleInvalid;
+	}
+
+
 }
 
 
@@ -484,21 +513,6 @@ int offer_answer_initiate_outgoing(const SalMediaDescription *local_offer,
 		result->rtcp_xr.enabled = FALSE;
 	}
 
-	// Handle dtls session attribute: if both local and remote have a dtls fingerprint and a dtls setup, get the remote fingerprint into the result
-	if ((local_offer->dtls_role!=SalDtlsRoleInvalid) && (remote_answer->dtls_role!=SalDtlsRoleInvalid)
-			&&(strlen(local_offer->dtls_fingerprint)>0) && (strlen(remote_answer->dtls_fingerprint)>0)) {
-		strcpy(result->dtls_fingerprint, remote_answer->dtls_fingerprint);
-		if (remote_answer->dtls_role==SalDtlsRoleIsClient) {
-			result->dtls_role = SalDtlsRoleIsServer;
-		} else {
-			result->dtls_role = SalDtlsRoleIsClient;
-		}
-	} else {
-		result->dtls_fingerprint[0] = '\0';
-		result->dtls_role = SalDtlsRoleInvalid;
-	}
-
-
 	return 0;
 }
 
@@ -553,24 +567,6 @@ int offer_answer_initiate_incoming(const SalMediaDescription *local_capabilities
 		}else ms_warning("Unknown protocol for mline %i, declining",i);
 		if (ls){
 			initiate_incoming(ls,rs,&result->streams[i],one_matching_codec);
-
-			// Handle dtls stream attribute: if both local and remote have a dtls fingerprint and a dtls setup, add the local fingerprint to the answer
-			// Note: local description usually stores dtls config at session level which means it apply to all streams, check this too
-			if (((ls->dtls_role!=SalDtlsRoleInvalid) || (local_capabilities->dtls_role!=SalDtlsRoleInvalid)) && (rs->dtls_role!=SalDtlsRoleInvalid)
-					&& ((strlen(ls->dtls_fingerprint)>0) || (strlen(local_capabilities->dtls_fingerprint)>0)) && (strlen(rs->dtls_fingerprint)>0)) {
-				if (strlen(ls->dtls_fingerprint)>0) { /* get the fingerprint in stream description */
-					strcpy(result->streams[i].dtls_fingerprint, ls->dtls_fingerprint);
-				} else { /* get the fingerprint in session description */
-					strcpy(result->streams[i].dtls_fingerprint, local_capabilities->dtls_fingerprint);
-				}
-				if (rs->dtls_role==SalDtlsRoleUnset) {
-					result->streams[i].dtls_role = SalDtlsRoleIsClient;
-				}
-			} else {
-				result->streams[i].dtls_fingerprint[0] = '\0';
-				result->streams[i].dtls_role = SalDtlsRoleInvalid;
-			}
-
 			// Handle media RTCP XR attribute
 			memset(&result->streams[i].rtcp_xr, 0, sizeof(result->streams[i].rtcp_xr));
 			if (rs->rtcp_xr.enabled == TRUE) {
@@ -611,18 +607,6 @@ int offer_answer_initiate_incoming(const SalMediaDescription *local_capabilities
 
 	strcpy(result->name,local_capabilities->name);
 
-	// Handle dtls session attribute: if both local and remote have a dtls fingerprint and a dtls setup, add the local fingerprint to the answer
-	if ((local_capabilities->dtls_role!=SalDtlsRoleInvalid) && (remote_offer->dtls_role!=SalDtlsRoleInvalid)
-			&&(strlen(local_capabilities->dtls_fingerprint)>0) && (strlen(remote_offer->dtls_fingerprint)>0)) {
-		strcpy(result->dtls_fingerprint, local_capabilities->dtls_fingerprint);
-		if (remote_offer->dtls_role==SalDtlsRoleUnset) {
-			result->dtls_role = SalDtlsRoleIsClient;
-		}
-	} else {
-		result->dtls_fingerprint[0] = '\0';
-		result->dtls_role = SalDtlsRoleInvalid;
-	}
-
 	// Handle session RTCP XR attribute
 	memset(&result->rtcp_xr, 0, sizeof(result->rtcp_xr));
 	if (remote_offer->rtcp_xr.enabled == TRUE) {
diff --git a/include/sal/sal.h b/include/sal/sal.h
index 4eedb23ab..0b7775b9b 100644
--- a/include/sal/sal.h
+++ b/include/sal/sal.h
@@ -260,8 +260,6 @@ typedef struct SalMediaDescription{
 	bool_t ice_lite;
 	bool_t ice_completed;
 	bool_t pad[2];
-	char dtls_fingerprint[256];
-	SalDtlsRole dtls_role;
 } SalMediaDescription;
 
 typedef struct SalMessage{
diff --git a/mediastreamer2 b/mediastreamer2
index 07a8b5693..8d120b3c1 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 07a8b569317d23e9442882be267d6640498a7b5e
+Subproject commit 8d120b3c118625b827834d1e53b93185d335c3df

From d060f4bd650cfe88c8a423356bcc56ff3abf6469 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Mon, 16 Feb 2015 18:33:00 +0100
Subject: [PATCH 417/496] fix warning

---
 coreapi/bellesip_sal/sal_sdp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/coreapi/bellesip_sal/sal_sdp.c b/coreapi/bellesip_sal/sal_sdp.c
index ed34c634a..1504b25c6 100644
--- a/coreapi/bellesip_sal/sal_sdp.c
+++ b/coreapi/bellesip_sal/sal_sdp.c
@@ -825,7 +825,7 @@ int sdp_to_media_description ( belle_sdp_session_description_t  *session_desc, S
 	/*DTLS attributes can be defined at session level.*/
 	value=belle_sdp_session_description_get_attribute_value(session_desc,"setup");
 	if (value){
-		SalDtlsRole session_role;
+		SalDtlsRole session_role=SalDtlsRoleInvalid;
 		if (strncmp(value, "actpass", 7) == 0) {
 			session_role = SalDtlsRoleUnset;
 		} else if (strncmp(value, "active", 6) == 0) {

From 796f3f086b3123475ed62c7f819812907af41eec Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Mon, 16 Feb 2015 19:49:45 +0100
Subject: [PATCH 418/496] fix make distcheck

---
 share/Makefile.am | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/share/Makefile.am b/share/Makefile.am
index ca8f2e233..0b3fb0119 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -52,7 +52,8 @@ EXTRA_DIST =					$(LINPHONE_SOUNDS) \
 						audio-assistant.desktop.in   \
 						linphone.pc.in \
 						Makefile.inc \
-						archived-rootca.pem
+						archived-rootca.pem \
+						$(appdata_DATA)
 
 CLEANFILES=rootca.pem
 

From e142a42d6b85ccad6fa11222721c5cc66740124b Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Mon, 16 Feb 2015 22:30:53 +0100
Subject: [PATCH 419/496] add appdata to specfile

---
 linphone.spec.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/linphone.spec.in b/linphone.spec.in
index eb8c65b51..9e10c35c1 100644
--- a/linphone.spec.in
+++ b/linphone.spec.in
@@ -90,6 +90,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/linphone
 %{_datadir}/pixmaps/linphone.png
 %{_datadir}/sounds/linphone
+%{_datadir}/appdata/linphone.appdata.xml
 
 %files devel
 %defattr(-,root,root)

From f5e0bc58de8cdd124864798076f888632ca7863f Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Tue, 17 Feb 2015 09:04:43 +0100
Subject: [PATCH 420/496] configure cert path for dtls

---
 coreapi/linphonecore.c | 16 +++++++---------
 tester/call_tester.c   |  5 +++++
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index ef108df18..0fe68a0ae 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -1484,11 +1484,7 @@ static void misc_config_read(LinphoneCore *lc) {
 	}else if (strcmp(uuid,"0")!=0) /*to allow to disable sip.instance*/
 		sal_set_uuid(lc->sal, uuid);
 
-	/* DTLS: if media_encryption DTLS SRTP is available, get or create the certificate directory */
-	/*if (ms_dtls_srtp_available()){
-		*//*JOHAN: USELESS? REMOVE IT*/
-		//const char *user_certificate_config_path = lp_config_get_string(config,"misc","uuid",);
-//	}*/
+	lc->user_certificates_path=ms_strdup(lp_config_get_string(config,"misc","user_certificates_path","."));
 }
 
 static void linphone_core_start(LinphoneCore * lc) {
@@ -1617,6 +1613,7 @@ static void linphone_core_init(LinphoneCore * lc, const LinphoneCoreVTable *vtab
 	lc->data=userdata;
 	lc->ringstream_autorelease=TRUE;
 
+
 	memcpy(local_vtable,vtable,sizeof(LinphoneCoreVTable));
 	lc->vtables=ms_list_append(lc->vtables,local_vtable);
 
@@ -6760,10 +6757,11 @@ const char *linphone_core_get_zrtp_secrets_file(LinphoneCore *lc){
 }
 
 void linphone_core_set_user_certificates_path(LinphoneCore *lc, const char* path){
-	if (lc->user_certificates_path != NULL) {
-		ms_free(lc->user_certificates_path);
-	}
-	lc->user_certificates_path = path ? ms_strdup(path) : NULL;
+	char* new_value;
+	new_value = path?ms_strdup(path):NULL;
+	if (lc->user_certificates_path) ms_free(lc->user_certificates_path);
+	lp_config_set_string(lc->config,"misc","user_certificates_path",lc->user_certificates_path=new_value);
+	return ;
 }
 
 const char *linphone_core_get_user_certificates_path(LinphoneCore *lc){
diff --git a/tester/call_tester.c b/tester/call_tester.c
index d19161460..9fe4c5913 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -1584,6 +1584,11 @@ static void video_call_base(LinphoneCoreManager* pauline,LinphoneCoreManager* ma
 		linphone_core_set_video_policy(pauline->lc,&pauline_policy);
 	}
 
+	if (mode==LinphoneMediaEncryptionDTLS) { /* for DTLS we must access certificates or at least have a directory to store them */
+		marie->lc->user_certificates_path = ms_strdup_printf("%s/certificates/marie", liblinphone_tester_file_prefix);
+		pauline->lc->user_certificates_path = ms_strdup_printf("%s/certificates/pauline", liblinphone_tester_file_prefix);
+	}
+
 	linphone_core_set_media_encryption(marie->lc,mode);
 	linphone_core_set_media_encryption(pauline->lc,mode);
 

From e7d685e9b004a67e101d42f2e737c9428c8ac85a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
 <francois.grisez@belledonne-communications.com>
Date: Tue, 17 Feb 2015 11:33:08 +0100
Subject: [PATCH 421/496] Update mediastreamer2

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 8d120b3c1..b1acdb3a5 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 8d120b3c118625b827834d1e53b93185d335c3df
+Subproject commit b1acdb3a58f34e1b333ed1dbfaa6ae0aab09861f

From a149f36615d7c95b8207852ef90e4b985f1aacb3 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Tue, 17 Feb 2015 12:47:08 +0100
Subject: [PATCH 422/496] Add getter API for play_file and record_file.

---
 coreapi/linphonecore.c |  7 +++++++
 coreapi/linphonecore.h | 25 +++++++++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 0fe68a0ae..ae7a22222 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -5747,6 +5747,10 @@ void linphone_core_set_use_files(LinphoneCore *lc, bool_t yesno){
 	lc->use_files=yesno;
 }
 
+const char * linphone_core_get_play_file(const LinphoneCore *lc) {
+	return lc->play_file;
+}
+
 /**
  * Sets a wav file to be played when putting somebody on hold,
  * or when files are used instead of soundcards (see linphone_core_set_use_files()).
@@ -5769,6 +5773,9 @@ void linphone_core_set_play_file(LinphoneCore *lc, const char *file){
 	}
 }
 
+const char * linphone_core_get_record_file(const LinphoneCore *lc) {
+	return lc->rec_file;
+}
 
 /**
  * Sets a wav file where incoming stream is to be recorded,
diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h
index 5a6b7f108..a909bb644 100644
--- a/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@ -3006,7 +3006,32 @@ void linphone_core_show_video(LinphoneCore *lc, bool_t show);
 #define linphone_core_use_files(lc, yesno) linphone_core_set_use_files(lc, yesno)
 /*play/record support: use files instead of soundcard*/
 LINPHONE_PUBLIC void linphone_core_set_use_files(LinphoneCore *lc, bool_t yesno);
+
+/**
+ * Get the wav file that is played when putting somebody on hold,
+ * or when files are used instead of soundcards (see linphone_core_set_use_files()).
+ *
+ * The file is a 16 bit linear wav file.
+ * @ingroup media_parameters
+ * @param[in] lc LinphoneCore object
+ * @return The path to the file that is played when putting somebody on hold.
+ */
+LINPHONE_PUBLIC const char * linphone_core_get_play_file(const LinphoneCore *lc);
+
 LINPHONE_PUBLIC void linphone_core_set_play_file(LinphoneCore *lc, const char *file);
+
+/**
+ * Get the wav file where incoming stream is recorded,
+ * when files are used instead of soundcards (see linphone_core_set_use_files()).
+ *
+ * This feature is different from call recording (linphone_call_params_set_record_file())
+ * The file is a 16 bit linear wav file.
+ * @ingroup media_parameters
+ * @param[in] lc LinphoneCore object
+ * @return The path to the file where incoming stream is recorded.
+**/
+LINPHONE_PUBLIC const char * linphone_core_get_record_file(const LinphoneCore *lc);
+
 LINPHONE_PUBLIC void linphone_core_set_record_file(LinphoneCore *lc, const char *file);
 
 LINPHONE_PUBLIC void linphone_core_play_dtmf(LinphoneCore *lc, char dtmf, int duration_ms);

From c041745cf54cda7256da0224cde549ddc60a1181 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 17 Feb 2015 12:04:50 +0100
Subject: [PATCH 423/496] Added wp8 project without tunnel

---
 build/wp8/LibLinphone_no_tunnel.vcxproj | 216 ++++++++++++++++++++++++
 1 file changed, 216 insertions(+)
 create mode 100644 build/wp8/LibLinphone_no_tunnel.vcxproj

diff --git a/build/wp8/LibLinphone_no_tunnel.vcxproj b/build/wp8/LibLinphone_no_tunnel.vcxproj
new file mode 100644
index 000000000..1bc745f52
--- /dev/null
+++ b/build/wp8/LibLinphone_no_tunnel.vcxproj
@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM">
+      <Configuration>Release</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{08dd0d38-d9b5-4626-b60d-b4d76b571142}</ProjectGuid>
+    <RootNamespace>LibLinphone</RootNamespace>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v110_wp80</PlatformToolset>
+    <IgnoreImportLibrary>false</IgnoreImportLibrary>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v110_wp80</PlatformToolset>
+    <IgnoreImportLibrary>false</IgnoreImportLibrary>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)$(Platform)\$(Configuration)\$(TargetName)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup>
+    <GenerateManifest>false</GenerateManifest>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\belle-sip\include;$(ProjectDir)..\..\oRTP\include;$(ProjectDir)..\..\mediastreamer2\include;$(ProjectDir)..\..\..\tunnel\include;$(ProjectDir)..\..\coreapi;$(ProjectDir)..\..\include;$(SolutionDir)$(Platform)\$(Configuration)\include;$(ProjectDir)..\..\..\zlib;$(ProjectDir)..\..\..\sqlite\;$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>__STDC_CONSTANT_MACROS;_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;_USRDLL;WINDOW_NATIVE;_TRUE_TIME;IN_LINPHONE;USE_BELLESIP;VIDEO_ENABLED;LINPHONE_PACKAGE_NAME="linphone";LIBLINPHONE_EXPORTS;LINPHONE_PLUGINS_DIR=".";UNICODE;_XKEYCHECK_H;HAVE_ZLIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <CompileAsWinRT>false</CompileAsWinRT>
+      <AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
+      <AdditionalDependencies>belle-sip.lib;mediastreamer2.lib;ws2_32.lib;ortp.lib;gsm.lib;speex.lib;speexdsp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SolutionDir)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>
+    </Link>
+    <PreBuildEvent>
+      <Command>version.bat</Command>
+    </PreBuildEvent>
+    <PreBuildEvent>
+      <Message>Batch script to get the git version</Message>
+    </PreBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
+    <ClCompile>
+      <PreprocessorDefinitions>_DEBUG;MSG_STORAGE_ENABLED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
+    <ClCompile>
+      <PreprocessorDefinitions>NDEBUG;MSG_STORAGE_ENABLED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Optimization>MaxSpeed</Optimization>
+      <StringPooling>true</StringPooling>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\coreapi\address.c" />
+    <ClCompile Include="..\..\coreapi\authentication.c" />
+    <ClCompile Include="..\..\coreapi\bellesip_sal\sal_address_impl.c" />
+    <ClCompile Include="..\..\coreapi\bellesip_sal\sal_impl.c" />
+    <ClCompile Include="..\..\coreapi\bellesip_sal\sal_op_call.c" />
+    <ClCompile Include="..\..\coreapi\bellesip_sal\sal_op_call_transfer.c" />
+    <ClCompile Include="..\..\coreapi\bellesip_sal\sal_op_events.c" />
+    <ClCompile Include="..\..\coreapi\bellesip_sal\sal_op_impl.c" />
+    <ClCompile Include="..\..\coreapi\bellesip_sal\sal_op_info.c" />
+    <ClCompile Include="..\..\coreapi\bellesip_sal\sal_op_message.c" />
+    <ClCompile Include="..\..\coreapi\bellesip_sal\sal_op_presence.c" />
+    <ClCompile Include="..\..\coreapi\bellesip_sal\sal_op_publish.c" />
+    <ClCompile Include="..\..\coreapi\bellesip_sal\sal_op_registration.c" />
+    <ClCompile Include="..\..\coreapi\bellesip_sal\sal_sdp.c" />
+    <ClCompile Include="..\..\coreapi\buffer.c" />
+    <ClCompile Include="..\..\coreapi\call_log.c" />
+    <ClCompile Include="..\..\coreapi\call_params.c" />
+    <ClCompile Include="..\..\coreapi\callbacks.c" />
+    <ClCompile Include="..\..\coreapi\chat.c" />
+    <ClCompile Include="..\..\coreapi\conference.c" />
+    <ClCompile Include="..\..\coreapi\content.c" />
+    <ClCompile Include="..\..\coreapi\ec-calibrator.c" />
+    <ClCompile Include="..\..\coreapi\enum.c" />
+    <ClCompile Include="..\..\coreapi\event.c" />
+    <ClCompile Include="..\..\coreapi\friend.c" />
+    <ClCompile Include="..\..\coreapi\info.c" />
+    <ClCompile Include="..\..\coreapi\linphonecall.c" />
+    <ClCompile Include="..\..\coreapi\linphonecore.c" />
+    <ClCompile Include="..\..\coreapi\linphone_tunnel_config.c" />
+    <ClCompile Include="..\..\coreapi\linphone_tunnel_stubs.c" />
+    <ClCompile Include="..\..\coreapi\localplayer.c" />
+    <ClCompile Include="..\..\coreapi\lpconfig.c" />
+    <ClCompile Include="..\..\coreapi\lsd.c" />
+    <ClCompile Include="..\..\coreapi\message_storage.c" />
+    <ClCompile Include="..\..\coreapi\misc.c" />
+    <ClCompile Include="..\..\coreapi\offeranswer.c" />
+    <ClCompile Include="..\..\coreapi\player.c" />
+    <ClCompile Include="..\..\coreapi\presence.c" />
+    <ClCompile Include="..\..\coreapi\proxy.c" />
+    <ClCompile Include="..\..\coreapi\quality_reporting.c" />
+    <ClCompile Include="..\..\coreapi\remote_provisioning.c" />
+    <ClCompile Include="..\..\coreapi\sal.c" />
+    <ClCompile Include="..\..\coreapi\siplogin.c" />
+    <ClCompile Include="..\..\coreapi\sipsetup.c" />
+    <ClCompile Include="..\..\coreapi\xml.c" />
+    <ClCompile Include="..\..\coreapi\xml2lpc.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\coreapi\bellesip_sal\sal_impl.h" />
+    <ClInclude Include="..\..\coreapi\buffer.h" />
+    <ClInclude Include="..\..\coreapi\content.h" />
+    <ClInclude Include="..\..\coreapi\enum.h" />
+    <ClInclude Include="..\..\coreapi\event.h" />
+    <ClInclude Include="..\..\coreapi\linphonecore.h" />
+    <ClInclude Include="..\..\coreapi\linphonecore_utils.h" />
+    <ClInclude Include="..\..\coreapi\linphonefriend.h" />
+    <ClInclude Include="..\..\coreapi\linphone_tunnel.h" />
+    <ClInclude Include="..\..\coreapi\lpconfig.h" />
+    <ClInclude Include="..\..\coreapi\offeranswer.h" />
+    <ClInclude Include="..\..\coreapi\private.h" />
+    <ClInclude Include="..\..\coreapi\sipsetup.h" />
+    <ClInclude Include="..\..\coreapi\xml2lpc.h" />
+    <ClInclude Include="config.h" />
+    <ClInclude Include="liblinphone_gitversion.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Windows">
+      <IsWinMDFile>true</IsWinMDFile>
+    </Reference>
+    <Reference Include="platform.winmd">
+      <IsWinMDFile>true</IsWinMDFile>
+      <Private>false</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\bcg729\build\wp8\bcg729\bcg729.vcxproj">
+      <Project>{1db09afe-fc9b-472e-a746-0e33f8ef8883}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\belle-sip\build\wp8\belle-sip\belle-sip.vcxproj">
+      <Project>{4c225a82-800b-427b-ba7b-61686a9b347f}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\msamr\build\wp8\msamr\msamr.vcxproj">
+      <Project>{9924ac72-f96c-4e56-94d9-2b025da43c6b}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\msilbc\build\wp8\msilbc\msilbc.vcxproj">
+      <Project>{072fad20-7007-4da2-b2e7-16ce2b219f67}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\mssilk\build\wp8\mssilk\mssilk.vcxproj">
+      <Project>{36b528f9-fb79-4078-a16b-0a7442581bb7}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\mswasapi\mswasapi\mswasapi.vcxproj">
+      <Project>{d22bd217-d0f8-4274-9b3a-f3f35f46482c}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\mswebrtc\build\wp8\mswebrtc\mswebrtc.vcxproj">
+      <Project>{b16b81a9-bef2-44c9-b603-1065183ae844}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\mswp8vid\mswp8vid\mswp8vid.vcxproj">
+      <Project>{0565952a-ea62-46a2-8261-f5b4b490da42}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\sqlite\sqlite.vcxproj">
+      <Project>{a45d63b9-60de-476c-8836-f8eedbe139d0}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\mediastreamer2\build\wp8\mediastreamer2\mediastreamer2.vcxproj">
+      <Project>{027bad0e-9179-48c1-9733-7aa7e2c2ec70}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\oRTP\build\wp8\oRTP\oRTP.vcxproj">
+      <Project>{ffc7b532-0502-4d88-ac98-9e89071cbc97}</Project>
+    </ProjectReference>
+    <ProjectReference Include="libxml2\libxml2.vcxproj">
+      <Project>{5dfa07b4-0be9-46a9-ba32-fdf5a55c580b}</Project>
+    </ProjectReference>
+    <ProjectReference Include="zlib\zlib.vcxproj">
+      <Project>{7afac3bb-d97b-4578-b9fe-5e1d2b94ea2f}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsPhone\v$(TargetPlatformVersion)\Microsoft.Cpp.WindowsPhone.$(TargetPlatformVersion).targets" />
+</Project>
\ No newline at end of file

From 7c1934783983dbdda2e5aee787dd15ea0ad59f30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
 <francois.grisez@belledonne-communications.com>
Date: Tue, 17 Feb 2015 12:33:46 +0100
Subject: [PATCH 424/496] Update translations

---
 po/ar.po    | 186 +++++++++++++++++++++++++++------------------------
 po/cs.po    | 186 +++++++++++++++++++++++++++------------------------
 po/de.po    | 186 +++++++++++++++++++++++++++------------------------
 po/es.po    | 186 +++++++++++++++++++++++++++------------------------
 po/fr.po    | 187 +++++++++++++++++++++++++++------------------------
 po/he.po    | 186 +++++++++++++++++++++++++++------------------------
 po/hu.po    | 186 +++++++++++++++++++++++++++------------------------
 po/it.po    | 186 +++++++++++++++++++++++++++------------------------
 po/ja.po    | 188 ++++++++++++++++++++++++++++------------------------
 po/nb_NO.po | 186 +++++++++++++++++++++++++++------------------------
 po/nl.po    | 186 +++++++++++++++++++++++++++------------------------
 po/pl.po    | 186 +++++++++++++++++++++++++++------------------------
 po/pt_BR.po | 186 +++++++++++++++++++++++++++------------------------
 po/ru.po    | 186 +++++++++++++++++++++++++++------------------------
 po/sr.po    | 186 +++++++++++++++++++++++++++------------------------
 po/sv.po    | 186 +++++++++++++++++++++++++++------------------------
 po/zh_CN.po | 186 +++++++++++++++++++++++++++------------------------
 po/zh_TW.po | 186 +++++++++++++++++++++++++++------------------------
 18 files changed, 1767 insertions(+), 1584 deletions(-)

diff --git a/po/ar.po b/po/ar.po
index c93c03c58..97b57e7b5 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -9,9 +9,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-13 16:18+0100\n"
-"PO-Revision-Date: 2015-01-13 16:34+0000\n"
-"Last-Translator: محيي الدين <tx99h4@hotmail.com>\n"
+"POT-Creation-Date: 2015-02-17 12:28+0100\n"
+"PO-Revision-Date: 2015-02-17 11:28+0000\n"
+"Last-Translator: Belledonne Communications <support@belledonne-"
+"communications.com>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/ar/)\n"
 "Language: ar\n"
@@ -148,7 +149,7 @@ msgstr "ابدأ مرشد الصوت"
 msgid "Run self test and exit 0 if succeed"
 msgstr "شغِّل الاختبار الذاتي ثم اخرِجْ 0 إذا نجح"
 
-#: ../gtk/main.c:1083
+#: ../gtk/main.c:1088
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
@@ -160,7 +161,7 @@ msgstr ""
 "هل تريد السماح له برؤية معلومات حضورك وكذا إضافته إلى جهة اتصالك أيضا ؟ إذا "
 "أجبت ب لا، سيُحظَر هذا الشخص مؤقتا."
 
-#: ../gtk/main.c:1160
+#: ../gtk/main.c:1165
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
@@ -169,59 +170,59 @@ msgstr ""
 "ادخل كلمة السر ل  <i>%s</i>\n"
 " في نطاق <i>%s</i>:"
 
-#: ../gtk/main.c:1281
+#: ../gtk/main.c:1286
 msgid "Call error"
 msgstr "خطأ في المكالمة"
 
-#: ../gtk/main.c:1284 ../coreapi/linphonecore.c:3767
+#: ../gtk/main.c:1289 ../coreapi/linphonecore.c:3787
 msgid "Call ended"
 msgstr "إنتهت المكالمة"
 
-#: ../gtk/main.c:1287 ../coreapi/call_log.c:221
+#: ../gtk/main.c:1292 ../coreapi/call_log.c:221
 msgid "Incoming call"
 msgstr "مكالمة واردة"
 
-#: ../gtk/main.c:1289 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
+#: ../gtk/main.c:1294 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
 msgid "Answer"
 msgstr "أجِبْ"
 
-#: ../gtk/main.c:1291 ../gtk/main.ui.h:6
+#: ../gtk/main.c:1296 ../gtk/main.ui.h:6
 msgid "Decline"
 msgstr "ارفضْ"
 
-#: ../gtk/main.c:1297
+#: ../gtk/main.c:1302
 msgid "Call paused"
 msgstr "المكالمة متوقفة"
 
-#: ../gtk/main.c:1297
+#: ../gtk/main.c:1302
 #, c-format
 msgid "<b>by %s</b>"
 msgstr "<b>بواسطة %s</b>"
 
-#: ../gtk/main.c:1367
+#: ../gtk/main.c:1372
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr "يود %s تشغيل الفيديو. هل تقبل ذلك ؟"
 
-#: ../gtk/main.c:1529
+#: ../gtk/main.c:1534
 msgid "Website link"
 msgstr "وصلة إلى الموقع وِبْ"
 
-#: ../gtk/main.c:1578
+#: ../gtk/main.c:1583
 msgid "Linphone - a video internet phone"
 msgstr "لِنْفُونْ - الهاتف المرئي عبر الإنترنت"
 
-#: ../gtk/main.c:1670
+#: ../gtk/main.c:1675
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (افتراضي)"
 
-#: ../gtk/main.c:2002 ../coreapi/callbacks.c:986
+#: ../gtk/main.c:2007 ../coreapi/callbacks.c:1027
 #, c-format
 msgid "We are transferred to %s"
 msgstr "التحويل إلى %s"
 
-#: ../gtk/main.c:2012
+#: ../gtk/main.c:2017
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
@@ -229,7 +230,7 @@ msgstr ""
 "لا وجود للوحة الصوت على هذا الحاسوب.\n"
 "لن تتمكن من تلقي أو إجراء أي مكالمة."
 
-#: ../gtk/main.c:2156
+#: ../gtk/main.c:2161
 msgid "A free SIP video-phone"
 msgstr "هاتف SIP المرئي الحر"
 
@@ -383,15 +384,19 @@ msgid ""
 "You need to restart linphone for the new language selection to take effect."
 msgstr "يجب إعادة تشغيل لِنْفُونْ لكي تٌفعَّل اللغة المختارة."
 
-#: ../gtk/propertybox.c:1234
+#: ../gtk/propertybox.c:1236
 msgid "None"
 msgstr "بدون"
 
-#: ../gtk/propertybox.c:1238
+#: ../gtk/propertybox.c:1240
 msgid "SRTP"
 msgstr "SRTP"
 
-#: ../gtk/propertybox.c:1244
+#: ../gtk/propertybox.c:1246
+msgid "DTLS"
+msgstr ""
+
+#: ../gtk/propertybox.c:1253
 msgid "ZRTP"
 msgstr "ZRTP"
 
@@ -573,7 +578,7 @@ msgstr "تأكيد (المرحلة 2/2)"
 msgid "Error"
 msgstr "خطأ"
 
-#: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:527
+#: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:534
 msgid "Terminating"
 msgstr "في طور الإنهاء"
 
@@ -666,7 +671,7 @@ msgstr "ضع السماعة"
 msgid "<b>Calling...</b>"
 msgstr "<b>يجري الاتصال...</b>"
 
-#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:727
+#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:733
 msgid "00::00::00"
 msgstr "00::00::00"
 
@@ -703,55 +708,59 @@ msgid "Secured by SRTP"
 msgstr "آمن بواسطة SRTP"
 
 #: ../gtk/incall_view.c:685
+msgid "Secured by DTLS"
+msgstr ""
+
+#: ../gtk/incall_view.c:691
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
 msgstr "آمن بواسطة ZRTP - [شارة الهوية : %s]"
 
-#: ../gtk/incall_view.c:691
+#: ../gtk/incall_view.c:697
 msgid "Set unverified"
 msgstr "أكِّدْ عدم تحقُّقك"
 
-#: ../gtk/incall_view.c:691 ../gtk/main.ui.h:4
+#: ../gtk/incall_view.c:697 ../gtk/main.ui.h:4
 msgid "Set verified"
 msgstr "أكِّدْ تحقُّقَك"
 
-#: ../gtk/incall_view.c:722
+#: ../gtk/incall_view.c:728
 msgid "In conference"
 msgstr "في اجتماع"
 
-#: ../gtk/incall_view.c:722
+#: ../gtk/incall_view.c:728
 msgid "<b>In call</b>"
 msgstr "<b>المكالمة جارية</b>"
 
-#: ../gtk/incall_view.c:758
+#: ../gtk/incall_view.c:764
 msgid "<b>Paused call</b>"
 msgstr "<b>المكالمة متوقفة مؤقتا</b>"
 
-#: ../gtk/incall_view.c:794
+#: ../gtk/incall_view.c:800
 msgid "<b>Call ended.</b>"
 msgstr "<b>إنتهت المكالمة.</b>"
 
-#: ../gtk/incall_view.c:825
+#: ../gtk/incall_view.c:831
 msgid "Transfer in progress"
 msgstr "يجري الإرسال"
 
-#: ../gtk/incall_view.c:828
+#: ../gtk/incall_view.c:834
 msgid "Transfer done."
 msgstr "انتهى الإرسال."
 
-#: ../gtk/incall_view.c:831
+#: ../gtk/incall_view.c:837
 msgid "Transfer failed."
 msgstr "فَشِل الإرسال."
 
-#: ../gtk/incall_view.c:875
+#: ../gtk/incall_view.c:881
 msgid "Resume"
 msgstr "استأنِفْ"
 
-#: ../gtk/incall_view.c:882 ../gtk/main.ui.h:9
+#: ../gtk/incall_view.c:888 ../gtk/main.ui.h:9
 msgid "Pause"
 msgstr "إيقاف مؤقت"
 
-#: ../gtk/incall_view.c:948
+#: ../gtk/incall_view.c:954
 #, c-format
 msgid ""
 "<small><i>Recording into\n"
@@ -760,7 +769,7 @@ msgstr ""
 "<small><i>يسجل في\n"
 "%s %s</i></small>"
 
-#: ../gtk/incall_view.c:948
+#: ../gtk/incall_view.c:954
 msgid "(Paused)"
 msgstr "(متوقف)"
 
@@ -859,23 +868,23 @@ msgstr "تشغيل"
 msgid "Let's start Linphone now"
 msgstr "لنُشغِّل لِنْفُونْ الآن"
 
-#: ../gtk/audio_assistant.c:496
+#: ../gtk/audio_assistant.c:503
 msgid "Audio Assistant"
 msgstr "مرشد الصوت"
 
-#: ../gtk/audio_assistant.c:506 ../gtk/main.ui.h:31
+#: ../gtk/audio_assistant.c:513 ../gtk/main.ui.h:31
 msgid "Audio assistant"
 msgstr "مرشد الصوت"
 
-#: ../gtk/audio_assistant.c:511
+#: ../gtk/audio_assistant.c:518
 msgid "Mic Gain calibration"
 msgstr "معايرة كسب الميكروفون"
 
-#: ../gtk/audio_assistant.c:517
+#: ../gtk/audio_assistant.c:524
 msgid "Speaker volume calibration"
 msgstr "معايرة شدة مكبر الصوت"
 
-#: ../gtk/audio_assistant.c:522
+#: ../gtk/audio_assistant.c:529
 msgid "Record and Play"
 msgstr "سَجِّل واقرأ "
 
@@ -1742,68 +1751,68 @@ msgstr "تجري التهيئة..."
 msgid "Please wait while fetching configuration from server..."
 msgstr "رجاءً انتظر ريثما ينتهي من جلب الإعدادات من الخادم..."
 
-#: ../coreapi/linphonecore.c:1510
+#: ../coreapi/linphonecore.c:1508
 msgid "Ready"
 msgstr "جاهز"
 
-#: ../coreapi/linphonecore.c:2489
+#: ../coreapi/linphonecore.c:2495
 msgid "Configuring"
 msgstr "تجري التهيئة"
 
-#: ../coreapi/linphonecore.c:2654
+#: ../coreapi/linphonecore.c:2669
 msgid "Looking for telephone number destination..."
 msgstr "يجري البحث عن وجهة رقم الهاتف..."
 
-#: ../coreapi/linphonecore.c:2656
+#: ../coreapi/linphonecore.c:2671
 msgid "Could not resolve this number."
 msgstr "لم يتمكن من إيجاد هذا الرقم."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2942
+#: ../coreapi/linphonecore.c:2957
 msgid "Contacting"
 msgstr "يتصل ب"
 
-#: ../coreapi/linphonecore.c:2947
+#: ../coreapi/linphonecore.c:2962
 msgid "Could not call"
 msgstr "لم يتمكن من الاتصال"
 
-#: ../coreapi/linphonecore.c:3097
+#: ../coreapi/linphonecore.c:3112
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "آسف، وصل عدد المكالمات الآنية إلى حده الأقصى"
 
-#: ../coreapi/linphonecore.c:3256
+#: ../coreapi/linphonecore.c:3270
 msgid "is contacting you"
 msgstr "يتصل بك"
 
-#: ../coreapi/linphonecore.c:3257
+#: ../coreapi/linphonecore.c:3271
 msgid " and asked autoanswer."
 msgstr "ويطلب ردا تلقائيا."
 
-#: ../coreapi/linphonecore.c:3375
+#: ../coreapi/linphonecore.c:3395
 msgid "Modifying call parameters..."
 msgstr "يجري تعديل إعدادات المكالمة..."
 
-#: ../coreapi/linphonecore.c:3723
+#: ../coreapi/linphonecore.c:3743
 msgid "Connected."
 msgstr "متصل."
 
-#: ../coreapi/linphonecore.c:3748
+#: ../coreapi/linphonecore.c:3768
 msgid "Call aborted"
 msgstr "أُلغيت المكالمة"
 
-#: ../coreapi/linphonecore.c:3938
+#: ../coreapi/linphonecore.c:3958
 msgid "Could not pause the call"
 msgstr "لم يتمكن من توقيف المكالمة مؤقتا"
 
-#: ../coreapi/linphonecore.c:3941
+#: ../coreapi/linphonecore.c:3961
 msgid "Pausing the current call..."
 msgstr "وضع المكالمة قيد الانتظار..."
 
-#: ../coreapi/misc.c:438
+#: ../coreapi/misc.c:433
 msgid "Stun lookup in progress..."
 msgstr "يجري بحث STUN..."
 
-#: ../coreapi/misc.c:619
+#: ../coreapi/misc.c:614
 msgid "ICE local candidates gathering in progress..."
 msgstr "يجري جلب مرشَّحي ICE المحلين..."
 
@@ -1859,14 +1868,14 @@ msgstr "في عطلة"
 msgid "Unknown status"
 msgstr "حالة مجهولة"
 
-#: ../coreapi/proxy.c:327
+#: ../coreapi/proxy.c:328
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
 msgstr ""
 "عنوان SIP الذي أدخلت غير صالح، يجب أن يبدأ ب \"sip:\" متبوعا بإسم النطاق."
 
-#: ../coreapi/proxy.c:333
+#: ../coreapi/proxy.c:334
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
@@ -1874,126 +1883,127 @@ msgstr ""
 "هوية SIP التي أدخلت غير صحيحة.\n"
 "يجب أن تشبه هذا النمط sip:username@proxydomain، مثلا sip:alice@example.net"
 
-#: ../coreapi/proxy.c:1391
+#: ../coreapi/proxy.c:1403
 #, c-format
 msgid "Could not login as %s"
 msgstr "تعذر الولوج بالهوية %s"
 
-#: ../coreapi/callbacks.c:383
+#: ../coreapi/callbacks.c:404
 msgid "Remote ringing."
 msgstr "يرن الجرس عن بعد..."
 
-#: ../coreapi/callbacks.c:404
+#: ../coreapi/callbacks.c:425
 msgid "Remote ringing..."
 msgstr "يرن الجرس عن بعد..."
 
-#: ../coreapi/callbacks.c:414
+#: ../coreapi/callbacks.c:442
 msgid "Early media."
 msgstr "أخذ المكالمة مبكرا."
 
-#: ../coreapi/callbacks.c:475
+#: ../coreapi/callbacks.c:503
 #, c-format
 msgid "Call with %s is paused."
 msgstr "المكاملة مع %s متوقفة."
 
-#: ../coreapi/callbacks.c:488
+#: ../coreapi/callbacks.c:516
 #, c-format
 msgid "Call answered by %s - on hold."
 msgstr "يجيب %s عن المكالمة - في وضع الانتظار."
 
-#: ../coreapi/callbacks.c:498
+#: ../coreapi/callbacks.c:526
 msgid "Call resumed."
 msgstr "استُعيدت المكالمة."
 
-#: ../coreapi/callbacks.c:502
+#: ../coreapi/callbacks.c:530
 #, c-format
 msgid "Call answered by %s."
 msgstr "أجاب عن المكالمة %s."
 
-#: ../coreapi/callbacks.c:525
+#: ../coreapi/callbacks.c:553
 msgid "Incompatible, check codecs or security settings..."
 msgstr "غير موائم، تحقق من المراميز أو إعدادات الأمان..."
 
-#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:829
+#: ../coreapi/callbacks.c:558 ../coreapi/callbacks.c:870
 msgid "Incompatible media parameters."
 msgstr "إعدادات الوسائط غير موائمة."
 
-#: ../coreapi/callbacks.c:560
+#: ../coreapi/callbacks.c:588
 msgid "We have been resumed."
 msgstr "استُأنِفت المكالمة."
 
 #. we are being paused
-#: ../coreapi/callbacks.c:568
+#: ../coreapi/callbacks.c:596
 msgid "We are paused by other party."
 msgstr "وُقِّفت المكالمة مؤقتا من طرف آخر."
 
 #. reINVITE and in-dialogs UPDATE go here
-#: ../coreapi/callbacks.c:602
+#: ../coreapi/callbacks.c:630
 msgid "Call is updated by remote."
 msgstr "حُدِّث الاتصال من البعيد."
 
-#: ../coreapi/callbacks.c:705
+#: ../coreapi/callbacks.c:746
 msgid "Call terminated."
 msgstr "أُنهيت المكالمة."
 
-#: ../coreapi/callbacks.c:733
+#: ../coreapi/callbacks.c:774
 msgid "User is busy."
 msgstr "المستخدم مشغول."
 
-#: ../coreapi/callbacks.c:734
+#: ../coreapi/callbacks.c:775
 msgid "User is temporarily unavailable."
 msgstr "المستخدم غير متاح مؤقتا."
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:736
+#: ../coreapi/callbacks.c:777
 msgid "User does not want to be disturbed."
 msgstr "لا يريد المستخدم أي إزعاج."
 
-#: ../coreapi/callbacks.c:737
+#: ../coreapi/callbacks.c:778
 msgid "Call declined."
 msgstr "تم تجاهل المكالمة."
 
-#: ../coreapi/callbacks.c:752
+#: ../coreapi/callbacks.c:793
 msgid "Request timeout."
 msgstr "انتهت مهلة الطلب."
 
-#: ../coreapi/callbacks.c:783
+#: ../coreapi/callbacks.c:824
 msgid "Redirected"
 msgstr "مُوجَّه"
 
-#: ../coreapi/callbacks.c:838
+#: ../coreapi/callbacks.c:879
 msgid "Call failed."
 msgstr "فشل الاتصال."
 
-#: ../coreapi/callbacks.c:916
+#: ../coreapi/callbacks.c:957
 #, c-format
 msgid "Registration on %s successful."
 msgstr "تم التسجيل في %s بنجاح."
 
-#: ../coreapi/callbacks.c:917
+#: ../coreapi/callbacks.c:958
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "أُلغي التسجيل في %s ."
 
-#: ../coreapi/callbacks.c:935
+#: ../coreapi/callbacks.c:976
 msgid "no response timeout"
 msgstr "لا إجابة قبل انتهاء المهلة"
 
-#: ../coreapi/callbacks.c:938
+#: ../coreapi/callbacks.c:979
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "فَشِل التسجيل في %s: %s"
 
-#: ../coreapi/callbacks.c:945
+#: ../coreapi/callbacks.c:986
 msgid "Service unavailable, retrying"
 msgstr "خدمة غير متاحة، تجري الإعادة"
 
-#: ../coreapi/linphonecall.c:175
+#. if encryption is DTLS, no status to be displayed
+#: ../coreapi/linphonecall.c:180
 #, c-format
 msgid "Authentication token is %s"
 msgstr "شارة التحقق من الهوية هي %s"
 
-#: ../coreapi/linphonecall.c:3041
+#: ../coreapi/linphonecall.c:3492
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
diff --git a/po/cs.po b/po/cs.po
index 1df2c980c..79d5e0344 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -9,9 +9,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-13 16:18+0100\n"
-"PO-Revision-Date: 2015-01-06 11:29+0000\n"
-"Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
+"POT-Creation-Date: 2015-02-17 12:28+0100\n"
+"PO-Revision-Date: 2015-02-17 11:28+0000\n"
+"Last-Translator: Belledonne Communications <support@belledonne-"
+"communications.com>\n"
 "Language-Team: Czech (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/cs/)\n"
 "Language: cs\n"
@@ -142,7 +143,7 @@ msgstr ""
 msgid "Run self test and exit 0 if succeed"
 msgstr ""
 
-#: ../gtk/main.c:1083
+#: ../gtk/main.c:1088
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
@@ -155,66 +156,66 @@ msgstr ""
 "do svého adresáře?\n"
 "Odpovíte-li ne, tato osobo bude dočasně blokována."
 
-#: ../gtk/main.c:1160
+#: ../gtk/main.c:1165
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
 msgstr ""
 
-#: ../gtk/main.c:1281
+#: ../gtk/main.c:1286
 msgid "Call error"
 msgstr "Chyba hovoru"
 
-#: ../gtk/main.c:1284 ../coreapi/linphonecore.c:3767
+#: ../gtk/main.c:1289 ../coreapi/linphonecore.c:3787
 msgid "Call ended"
 msgstr "Hovor ukončen"
 
-#: ../gtk/main.c:1287 ../coreapi/call_log.c:221
+#: ../gtk/main.c:1292 ../coreapi/call_log.c:221
 msgid "Incoming call"
 msgstr "Příchozí hovor"
 
-#: ../gtk/main.c:1289 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
+#: ../gtk/main.c:1294 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
 msgid "Answer"
 msgstr "Odpovědět"
 
-#: ../gtk/main.c:1291 ../gtk/main.ui.h:6
+#: ../gtk/main.c:1296 ../gtk/main.ui.h:6
 msgid "Decline"
 msgstr "Odmítnout"
 
-#: ../gtk/main.c:1297
+#: ../gtk/main.c:1302
 msgid "Call paused"
 msgstr "Hovor odložen"
 
-#: ../gtk/main.c:1297
+#: ../gtk/main.c:1302
 #, c-format
 msgid "<b>by %s</b>"
 msgstr "<b>kým: %s</b>"
 
-#: ../gtk/main.c:1367
+#: ../gtk/main.c:1372
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr "%s navrhuje začít videohovor. Přijímáte?"
 
-#: ../gtk/main.c:1529
+#: ../gtk/main.c:1534
 msgid "Website link"
 msgstr "Odkaz na webovou stránku"
 
-#: ../gtk/main.c:1578
+#: ../gtk/main.c:1583
 msgid "Linphone - a video internet phone"
 msgstr "Lipnhone – internetový videofon"
 
-#: ../gtk/main.c:1670
+#: ../gtk/main.c:1675
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (Výchozí)"
 
-#: ../gtk/main.c:2002 ../coreapi/callbacks.c:986
+#: ../gtk/main.c:2007 ../coreapi/callbacks.c:1027
 #, c-format
 msgid "We are transferred to %s"
 msgstr "Byly jsme přepojeni na %s"
 
-#: ../gtk/main.c:2012
+#: ../gtk/main.c:2017
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
@@ -222,7 +223,7 @@ msgstr ""
 "Na tomto počítači nebyla objevena žádná zvuková karta.\n"
 "Nebudete moci vytáčet a přijímat a zvukové hovory."
 
-#: ../gtk/main.c:2156
+#: ../gtk/main.c:2161
 msgid "A free SIP video-phone"
 msgstr "Volný SIP videofon"
 
@@ -376,15 +377,19 @@ msgid ""
 "You need to restart linphone for the new language selection to take effect."
 msgstr "Aby se projevil výběr nového jazyka, je nutné znovu spustit linphone."
 
-#: ../gtk/propertybox.c:1234
+#: ../gtk/propertybox.c:1236
 msgid "None"
 msgstr "Žádné"
 
-#: ../gtk/propertybox.c:1238
+#: ../gtk/propertybox.c:1240
 msgid "SRTP"
 msgstr "SRTP"
 
-#: ../gtk/propertybox.c:1244
+#: ../gtk/propertybox.c:1246
+msgid "DTLS"
+msgstr ""
+
+#: ../gtk/propertybox.c:1253
 msgid "ZRTP"
 msgstr "ZRTP"
 
@@ -562,7 +567,7 @@ msgstr "Ověření (krok 2/2)"
 msgid "Error"
 msgstr "Chyba"
 
-#: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:527
+#: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:534
 msgid "Terminating"
 msgstr "Ukončuje se"
 
@@ -655,7 +660,7 @@ msgstr "Zavěsit"
 msgid "<b>Calling...</b>"
 msgstr "<b>Volá se…</b>"
 
-#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:727
+#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:733
 msgid "00::00::00"
 msgstr "00:00:00"
 
@@ -692,55 +697,59 @@ msgid "Secured by SRTP"
 msgstr "Zabezpečeno pomocí SRTP"
 
 #: ../gtk/incall_view.c:685
+msgid "Secured by DTLS"
+msgstr ""
+
+#: ../gtk/incall_view.c:691
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
 msgstr "Zabezpečeno pomocí ZRTP – [ověřovací klíč: %s]"
 
-#: ../gtk/incall_view.c:691
+#: ../gtk/incall_view.c:697
 msgid "Set unverified"
 msgstr "Nastavit na neověřeno"
 
-#: ../gtk/incall_view.c:691 ../gtk/main.ui.h:4
+#: ../gtk/incall_view.c:697 ../gtk/main.ui.h:4
 msgid "Set verified"
 msgstr "Nastavit na ověřeno"
 
-#: ../gtk/incall_view.c:722
+#: ../gtk/incall_view.c:728
 msgid "In conference"
 msgstr "Probíhá konference"
 
-#: ../gtk/incall_view.c:722
+#: ../gtk/incall_view.c:728
 msgid "<b>In call</b>"
 msgstr "<b>Probíhá hovor</b>"
 
-#: ../gtk/incall_view.c:758
+#: ../gtk/incall_view.c:764
 msgid "<b>Paused call</b>"
 msgstr "<b>Odložený hovor</b>"
 
-#: ../gtk/incall_view.c:794
+#: ../gtk/incall_view.c:800
 msgid "<b>Call ended.</b>"
 msgstr "<b>Hovor skončil.</b>"
 
-#: ../gtk/incall_view.c:825
+#: ../gtk/incall_view.c:831
 msgid "Transfer in progress"
 msgstr "Probíhá přepojení"
 
-#: ../gtk/incall_view.c:828
+#: ../gtk/incall_view.c:834
 msgid "Transfer done."
 msgstr "Přepojení dokončeno."
 
-#: ../gtk/incall_view.c:831
+#: ../gtk/incall_view.c:837
 msgid "Transfer failed."
 msgstr "Přepojení selhalo."
 
-#: ../gtk/incall_view.c:875
+#: ../gtk/incall_view.c:881
 msgid "Resume"
 msgstr "Obnovit"
 
-#: ../gtk/incall_view.c:882 ../gtk/main.ui.h:9
+#: ../gtk/incall_view.c:888 ../gtk/main.ui.h:9
 msgid "Pause"
 msgstr "Odložit"
 
-#: ../gtk/incall_view.c:948
+#: ../gtk/incall_view.c:954
 #, c-format
 msgid ""
 "<small><i>Recording into\n"
@@ -749,7 +758,7 @@ msgstr ""
 "<small><i>Nahrává se do\n"
 "%s %s</i></small>"
 
-#: ../gtk/incall_view.c:948
+#: ../gtk/incall_view.c:954
 msgid "(Paused)"
 msgstr "(Odloženo)"
 
@@ -846,23 +855,23 @@ msgstr ""
 msgid "Let's start Linphone now"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:496
+#: ../gtk/audio_assistant.c:503
 msgid "Audio Assistant"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:506 ../gtk/main.ui.h:31
+#: ../gtk/audio_assistant.c:513 ../gtk/main.ui.h:31
 msgid "Audio assistant"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:511
+#: ../gtk/audio_assistant.c:518
 msgid "Mic Gain calibration"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:517
+#: ../gtk/audio_assistant.c:524
 msgid "Speaker volume calibration"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:522
+#: ../gtk/audio_assistant.c:529
 msgid "Record and Play"
 msgstr ""
 
@@ -1712,68 +1721,68 @@ msgstr ""
 msgid "Please wait while fetching configuration from server..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1510
+#: ../coreapi/linphonecore.c:1508
 msgid "Ready"
 msgstr "Připraven."
 
-#: ../coreapi/linphonecore.c:2489
+#: ../coreapi/linphonecore.c:2495
 msgid "Configuring"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2654
+#: ../coreapi/linphonecore.c:2669
 msgid "Looking for telephone number destination..."
 msgstr "Vyhledává se umístění čísla…"
 
-#: ../coreapi/linphonecore.c:2656
+#: ../coreapi/linphonecore.c:2671
 msgid "Could not resolve this number."
 msgstr "Toto číslo nelze vyhledat."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2942
+#: ../coreapi/linphonecore.c:2957
 msgid "Contacting"
 msgstr "Navazuje se spojení"
 
-#: ../coreapi/linphonecore.c:2947
+#: ../coreapi/linphonecore.c:2962
 msgid "Could not call"
 msgstr "Nelze volat"
 
-#: ../coreapi/linphonecore.c:3097
+#: ../coreapi/linphonecore.c:3112
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "Je nám líto, ale byl dosažen maximální počet současných hovorů."
 
-#: ../coreapi/linphonecore.c:3256
+#: ../coreapi/linphonecore.c:3270
 msgid "is contacting you"
 msgstr "vás volá"
 
-#: ../coreapi/linphonecore.c:3257
+#: ../coreapi/linphonecore.c:3271
 msgid " and asked autoanswer."
 msgstr " a požaduje automatickou zvednutí."
 
-#: ../coreapi/linphonecore.c:3375
+#: ../coreapi/linphonecore.c:3395
 msgid "Modifying call parameters..."
 msgstr "Upravují se parametry hovoru…"
 
-#: ../coreapi/linphonecore.c:3723
+#: ../coreapi/linphonecore.c:3743
 msgid "Connected."
 msgstr "Připojeno."
 
-#: ../coreapi/linphonecore.c:3748
+#: ../coreapi/linphonecore.c:3768
 msgid "Call aborted"
 msgstr "Hovor přerušen"
 
-#: ../coreapi/linphonecore.c:3938
+#: ../coreapi/linphonecore.c:3958
 msgid "Could not pause the call"
 msgstr "Hovor nebylo možné odložit"
 
-#: ../coreapi/linphonecore.c:3941
+#: ../coreapi/linphonecore.c:3961
 msgid "Pausing the current call..."
 msgstr "Současný hovor se odkládá…"
 
-#: ../coreapi/misc.c:438
+#: ../coreapi/misc.c:433
 msgid "Stun lookup in progress..."
 msgstr "Hledá se adresa pomocí STUN…"
 
-#: ../coreapi/misc.c:619
+#: ../coreapi/misc.c:614
 msgid "ICE local candidates gathering in progress..."
 msgstr "Shromažďují se místní kandidáti ICE…"
 
@@ -1829,7 +1838,7 @@ msgstr ""
 msgid "Unknown status"
 msgstr ""
 
-#: ../coreapi/proxy.c:327
+#: ../coreapi/proxy.c:328
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
@@ -1837,7 +1846,7 @@ msgstr ""
 "Adresa SIP proxy, kterou jste zadali, není platná. Musí začínat na „sip:“ a "
 "pak musí následovat jméno stroje."
 
-#: ../coreapi/proxy.c:333
+#: ../coreapi/proxy.c:334
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
@@ -1845,126 +1854,127 @@ msgstr ""
 "SIP identita, kterou jste zadali, není platná.\n"
 "Měla by mít tvar sip:uživatel@proxydoména, například sip:alice@example.net"
 
-#: ../coreapi/proxy.c:1391
+#: ../coreapi/proxy.c:1403
 #, c-format
 msgid "Could not login as %s"
 msgstr "Nelze se přihlásit jako %s"
 
-#: ../coreapi/callbacks.c:383
+#: ../coreapi/callbacks.c:404
 msgid "Remote ringing."
 msgstr "Vyzvání na druhé straně."
 
-#: ../coreapi/callbacks.c:404
+#: ../coreapi/callbacks.c:425
 msgid "Remote ringing..."
 msgstr "Vyzvání na druhé straně…"
 
-#: ../coreapi/callbacks.c:414
+#: ../coreapi/callbacks.c:442
 msgid "Early media."
 msgstr "Časná média."
 
-#: ../coreapi/callbacks.c:475
+#: ../coreapi/callbacks.c:503
 #, c-format
 msgid "Call with %s is paused."
 msgstr "Hovor s %s je odložen."
 
-#: ../coreapi/callbacks.c:488
+#: ../coreapi/callbacks.c:516
 #, c-format
 msgid "Call answered by %s - on hold."
 msgstr "Hovor přijat kým: %s – odložen."
 
-#: ../coreapi/callbacks.c:498
+#: ../coreapi/callbacks.c:526
 msgid "Call resumed."
 msgstr "Hovor obnoven."
 
-#: ../coreapi/callbacks.c:502
+#: ../coreapi/callbacks.c:530
 #, c-format
 msgid "Call answered by %s."
 msgstr "Hovor přijat kým: %s."
 
-#: ../coreapi/callbacks.c:525
+#: ../coreapi/callbacks.c:553
 msgid "Incompatible, check codecs or security settings..."
 msgstr "Není slučitelné. Zkontrolujte nastavení kodeků a zabezpečení…"
 
-#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:829
+#: ../coreapi/callbacks.c:558 ../coreapi/callbacks.c:870
 msgid "Incompatible media parameters."
 msgstr "Neslučitelné parametry médií."
 
-#: ../coreapi/callbacks.c:560
+#: ../coreapi/callbacks.c:588
 msgid "We have been resumed."
 msgstr "Byli jsme obnoveni."
 
 #. we are being paused
-#: ../coreapi/callbacks.c:568
+#: ../coreapi/callbacks.c:596
 msgid "We are paused by other party."
 msgstr "Byli jsme odloženi protistranou."
 
 #. reINVITE and in-dialogs UPDATE go here
-#: ../coreapi/callbacks.c:602
+#: ../coreapi/callbacks.c:630
 msgid "Call is updated by remote."
 msgstr "Hovor byl aktualizován protistranou."
 
-#: ../coreapi/callbacks.c:705
+#: ../coreapi/callbacks.c:746
 msgid "Call terminated."
 msgstr "Hovor ukončen."
 
-#: ../coreapi/callbacks.c:733
+#: ../coreapi/callbacks.c:774
 msgid "User is busy."
 msgstr "Uživatel je zaneprázdněn."
 
-#: ../coreapi/callbacks.c:734
+#: ../coreapi/callbacks.c:775
 msgid "User is temporarily unavailable."
 msgstr "Uživatel je dočasně nedostupný."
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:736
+#: ../coreapi/callbacks.c:777
 msgid "User does not want to be disturbed."
 msgstr "Uživatel si nepřeje být rušen."
 
-#: ../coreapi/callbacks.c:737
+#: ../coreapi/callbacks.c:778
 msgid "Call declined."
 msgstr "Volání odmítnuto."
 
-#: ../coreapi/callbacks.c:752
+#: ../coreapi/callbacks.c:793
 msgid "Request timeout."
 msgstr ""
 
-#: ../coreapi/callbacks.c:783
+#: ../coreapi/callbacks.c:824
 msgid "Redirected"
 msgstr "Přesměrováno"
 
-#: ../coreapi/callbacks.c:838
+#: ../coreapi/callbacks.c:879
 msgid "Call failed."
 msgstr "Volání se nezdařilo."
 
-#: ../coreapi/callbacks.c:916
+#: ../coreapi/callbacks.c:957
 #, c-format
 msgid "Registration on %s successful."
 msgstr "Registrace na %s byla úspěšná."
 
-#: ../coreapi/callbacks.c:917
+#: ../coreapi/callbacks.c:958
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "Odregistrování z %s hotovo."
 
-#: ../coreapi/callbacks.c:935
+#: ../coreapi/callbacks.c:976
 msgid "no response timeout"
 msgstr "odpověď nedorazila včas"
 
-#: ../coreapi/callbacks.c:938
+#: ../coreapi/callbacks.c:979
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "Registrace na %s selhala: %s"
 
-#: ../coreapi/callbacks.c:945
+#: ../coreapi/callbacks.c:986
 msgid "Service unavailable, retrying"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:175
+#. if encryption is DTLS, no status to be displayed
+#: ../coreapi/linphonecall.c:180
 #, c-format
 msgid "Authentication token is %s"
 msgstr "Klíč k ověření totožnosti je %s"
 
-#: ../coreapi/linphonecall.c:3041
+#: ../coreapi/linphonecall.c:3492
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
diff --git a/po/de.po b/po/de.po
index 229f60c71..204117b52 100644
--- a/po/de.po
+++ b/po/de.po
@@ -11,9 +11,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-13 16:18+0100\n"
-"PO-Revision-Date: 2015-01-13 16:34+0000\n"
-"Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
+"POT-Creation-Date: 2015-02-17 12:28+0100\n"
+"PO-Revision-Date: 2015-02-17 11:28+0000\n"
+"Last-Translator: Belledonne Communications <support@belledonne-"
+"communications.com>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/de/)\n"
 "Language: de\n"
@@ -144,7 +145,7 @@ msgstr "Starte den Audio-Assistent"
 msgid "Run self test and exit 0 if succeed"
 msgstr ""
 
-#: ../gtk/main.c:1083
+#: ../gtk/main.c:1088
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
@@ -157,7 +158,7 @@ msgstr ""
 "Ihrer Kontaktliste hinzufügen?\n"
 "Wenn Sie mit Nein antworten, wird diese Person vorläufig blockiert."
 
-#: ../gtk/main.c:1160
+#: ../gtk/main.c:1165
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
@@ -166,59 +167,59 @@ msgstr ""
 "Bitte geben Sie Ihr Passwort für den Benutzernamen <i>%s</i>\n"
 " für  Bereich <i>%s</i> ein:"
 
-#: ../gtk/main.c:1281
+#: ../gtk/main.c:1286
 msgid "Call error"
 msgstr "Anruf fehlgeschlagen"
 
-#: ../gtk/main.c:1284 ../coreapi/linphonecore.c:3767
+#: ../gtk/main.c:1289 ../coreapi/linphonecore.c:3787
 msgid "Call ended"
 msgstr "Anruf beendet"
 
-#: ../gtk/main.c:1287 ../coreapi/call_log.c:221
+#: ../gtk/main.c:1292 ../coreapi/call_log.c:221
 msgid "Incoming call"
 msgstr "Eingehender Anruf"
 
-#: ../gtk/main.c:1289 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
+#: ../gtk/main.c:1294 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
 msgid "Answer"
 msgstr "Annehmen"
 
-#: ../gtk/main.c:1291 ../gtk/main.ui.h:6
+#: ../gtk/main.c:1296 ../gtk/main.ui.h:6
 msgid "Decline"
 msgstr "Abweisen"
 
-#: ../gtk/main.c:1297
+#: ../gtk/main.c:1302
 msgid "Call paused"
 msgstr "Anruf wird gehalten"
 
-#: ../gtk/main.c:1297
+#: ../gtk/main.c:1302
 #, c-format
 msgid "<b>by %s</b>"
 msgstr "<b>von %s</b>"
 
-#: ../gtk/main.c:1367
+#: ../gtk/main.c:1372
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr "%s schlägt vor, eine Videoübertragung zu starten. Nehmen Sie an?"
 
-#: ../gtk/main.c:1529
+#: ../gtk/main.c:1534
 msgid "Website link"
 msgstr "Website-Verknüpfung"
 
-#: ../gtk/main.c:1578
+#: ../gtk/main.c:1583
 msgid "Linphone - a video internet phone"
 msgstr "Linphone - ein Internet-Video-Telefon"
 
-#: ../gtk/main.c:1670
+#: ../gtk/main.c:1675
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (Vorgabe)"
 
-#: ../gtk/main.c:2002 ../coreapi/callbacks.c:986
+#: ../gtk/main.c:2007 ../coreapi/callbacks.c:1027
 #, c-format
 msgid "We are transferred to %s"
 msgstr "Vermittlung nach %s"
 
-#: ../gtk/main.c:2012
+#: ../gtk/main.c:2017
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
@@ -226,7 +227,7 @@ msgstr ""
 "Auf diesem Rechner können keine Soundkarten gefunden werden.\n"
 "Sie können keine Audio-Anrufe tätigen oder entgegennehmen."
 
-#: ../gtk/main.c:2156
+#: ../gtk/main.c:2161
 msgid "A free SIP video-phone"
 msgstr "Ein freies SIP-Video-Telefon"
 
@@ -382,15 +383,19 @@ msgstr ""
 "Linphone muss neu gestartet werden, damit die neue Spracheinstellung wirksam "
 "wird."
 
-#: ../gtk/propertybox.c:1234
+#: ../gtk/propertybox.c:1236
 msgid "None"
 msgstr "Keinen"
 
-#: ../gtk/propertybox.c:1238
+#: ../gtk/propertybox.c:1240
 msgid "SRTP"
 msgstr "SRTP"
 
-#: ../gtk/propertybox.c:1244
+#: ../gtk/propertybox.c:1246
+msgid "DTLS"
+msgstr ""
+
+#: ../gtk/propertybox.c:1253
 msgid "ZRTP"
 msgstr "ZRTP"
 
@@ -571,7 +576,7 @@ msgstr "Bestätigung (Schritt 2/2)"
 msgid "Error"
 msgstr "Fehler"
 
-#: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:527
+#: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:534
 msgid "Terminating"
 msgstr "Fertigstellen"
 
@@ -664,7 +669,7 @@ msgstr "Auflegen"
 msgid "<b>Calling...</b>"
 msgstr "<b>Verbindungsaufbau...</b>"
 
-#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:727
+#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:733
 msgid "00::00::00"
 msgstr "00::00::00"
 
@@ -701,55 +706,59 @@ msgid "Secured by SRTP"
 msgstr "Gesichert durch SRTP"
 
 #: ../gtk/incall_view.c:685
+msgid "Secured by DTLS"
+msgstr ""
+
+#: ../gtk/incall_view.c:691
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
 msgstr "Gesichert durch ZRTP - [Auth.-Token: %s]"
 
-#: ../gtk/incall_view.c:691
+#: ../gtk/incall_view.c:697
 msgid "Set unverified"
 msgstr "Auf „Ungeprüft“ setzen"
 
-#: ../gtk/incall_view.c:691 ../gtk/main.ui.h:4
+#: ../gtk/incall_view.c:697 ../gtk/main.ui.h:4
 msgid "Set verified"
 msgstr "Auf „Geprüft“ setzen"
 
-#: ../gtk/incall_view.c:722
+#: ../gtk/incall_view.c:728
 msgid "In conference"
 msgstr "In Konferenz"
 
-#: ../gtk/incall_view.c:722
+#: ../gtk/incall_view.c:728
 msgid "<b>In call</b>"
 msgstr "<b>Im Gespräch</b>"
 
-#: ../gtk/incall_view.c:758
+#: ../gtk/incall_view.c:764
 msgid "<b>Paused call</b>"
 msgstr "<b>Gehaltener Anruf</b>"
 
-#: ../gtk/incall_view.c:794
+#: ../gtk/incall_view.c:800
 msgid "<b>Call ended.</b>"
 msgstr "<b>Anruf beendet.</b>"
 
-#: ../gtk/incall_view.c:825
+#: ../gtk/incall_view.c:831
 msgid "Transfer in progress"
 msgstr "Vermittlung läuft"
 
-#: ../gtk/incall_view.c:828
+#: ../gtk/incall_view.c:834
 msgid "Transfer done."
 msgstr "Vermittlung abgeschlossen."
 
-#: ../gtk/incall_view.c:831
+#: ../gtk/incall_view.c:837
 msgid "Transfer failed."
 msgstr "Vermittlung fehlgeschlagen."
 
-#: ../gtk/incall_view.c:875
+#: ../gtk/incall_view.c:881
 msgid "Resume"
 msgstr "Fortsetzen"
 
-#: ../gtk/incall_view.c:882 ../gtk/main.ui.h:9
+#: ../gtk/incall_view.c:888 ../gtk/main.ui.h:9
 msgid "Pause"
 msgstr "Halten"
 
-#: ../gtk/incall_view.c:948
+#: ../gtk/incall_view.c:954
 #, c-format
 msgid ""
 "<small><i>Recording into\n"
@@ -758,7 +767,7 @@ msgstr ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
 
-#: ../gtk/incall_view.c:948
+#: ../gtk/incall_view.c:954
 msgid "(Paused)"
 msgstr "(pausiert)"
 
@@ -858,23 +867,23 @@ msgstr ""
 msgid "Let's start Linphone now"
 msgstr "Linphone jetzt starten"
 
-#: ../gtk/audio_assistant.c:496
+#: ../gtk/audio_assistant.c:503
 msgid "Audio Assistant"
 msgstr "Audio-Assistant"
 
-#: ../gtk/audio_assistant.c:506 ../gtk/main.ui.h:31
+#: ../gtk/audio_assistant.c:513 ../gtk/main.ui.h:31
 msgid "Audio assistant"
 msgstr "Audio-Assistant"
 
-#: ../gtk/audio_assistant.c:511
+#: ../gtk/audio_assistant.c:518
 msgid "Mic Gain calibration"
 msgstr "Einrichtung MIkrofonverstärker"
 
-#: ../gtk/audio_assistant.c:517
+#: ../gtk/audio_assistant.c:524
 msgid "Speaker volume calibration"
 msgstr "Einrichtung Lautstärke"
 
-#: ../gtk/audio_assistant.c:522
+#: ../gtk/audio_assistant.c:529
 msgid "Record and Play"
 msgstr "aufnehmen und abspielen"
 
@@ -1746,68 +1755,68 @@ msgid "Please wait while fetching configuration from server..."
 msgstr ""
 "Bitte warten Sie während die Einstellungen vom Server abgerufen werden..."
 
-#: ../coreapi/linphonecore.c:1510
+#: ../coreapi/linphonecore.c:1508
 msgid "Ready"
 msgstr "Bereit"
 
-#: ../coreapi/linphonecore.c:2489
+#: ../coreapi/linphonecore.c:2495
 msgid "Configuring"
 msgstr "Einstellen"
 
-#: ../coreapi/linphonecore.c:2654
+#: ../coreapi/linphonecore.c:2669
 msgid "Looking for telephone number destination..."
 msgstr "Telefonnummernziel wird gesucht..."
 
-#: ../coreapi/linphonecore.c:2656
+#: ../coreapi/linphonecore.c:2671
 msgid "Could not resolve this number."
 msgstr "Diese Nummer kann nicht aufgelöst werden."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2942
+#: ../coreapi/linphonecore.c:2957
 msgid "Contacting"
 msgstr "Verbindungsaufbau"
 
-#: ../coreapi/linphonecore.c:2947
+#: ../coreapi/linphonecore.c:2962
 msgid "Could not call"
 msgstr "Anruf kann nicht getätigt werden."
 
-#: ../coreapi/linphonecore.c:3097
+#: ../coreapi/linphonecore.c:3112
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "Die maximale Anzahl der gleichzeitigen Anrufe ist erreicht."
 
-#: ../coreapi/linphonecore.c:3256
+#: ../coreapi/linphonecore.c:3270
 msgid "is contacting you"
 msgstr "ruft Sie an"
 
-#: ../coreapi/linphonecore.c:3257
+#: ../coreapi/linphonecore.c:3271
 msgid " and asked autoanswer."
 msgstr " und fragt nach automatischer Antwort."
 
-#: ../coreapi/linphonecore.c:3375
+#: ../coreapi/linphonecore.c:3395
 msgid "Modifying call parameters..."
 msgstr "Die Anrufparameter werden verändert..."
 
-#: ../coreapi/linphonecore.c:3723
+#: ../coreapi/linphonecore.c:3743
 msgid "Connected."
 msgstr "Verbunden."
 
-#: ../coreapi/linphonecore.c:3748
+#: ../coreapi/linphonecore.c:3768
 msgid "Call aborted"
 msgstr "Anruf abgebrochen"
 
-#: ../coreapi/linphonecore.c:3938
+#: ../coreapi/linphonecore.c:3958
 msgid "Could not pause the call"
 msgstr "Anruf kann nicht gehalten werden"
 
-#: ../coreapi/linphonecore.c:3941
+#: ../coreapi/linphonecore.c:3961
 msgid "Pausing the current call..."
 msgstr "Aktueller Anruf wird gehalten..."
 
-#: ../coreapi/misc.c:438
+#: ../coreapi/misc.c:433
 msgid "Stun lookup in progress..."
 msgstr "STUN-Ermittlung läuft..."
 
-#: ../coreapi/misc.c:619
+#: ../coreapi/misc.c:614
 msgid "ICE local candidates gathering in progress..."
 msgstr "Lokale Kandidaten für ICE werden zusammengestellt..."
 
@@ -1863,7 +1872,7 @@ msgstr "Urlaub"
 msgid "Unknown status"
 msgstr "Unbekannter Status"
 
-#: ../coreapi/proxy.c:327
+#: ../coreapi/proxy.c:328
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
@@ -1871,7 +1880,7 @@ msgstr ""
 "Die von Ihnen eingegebene SIP-Proxy-Adresse ist ungültig, sie muss mit "
 "„sip:“ gefolgt vom Hostnamen beginnen."
 
-#: ../coreapi/proxy.c:333
+#: ../coreapi/proxy.c:334
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
@@ -1880,126 +1889,127 @@ msgstr ""
 "Sie sollte wie sip:benutzername@proxydomain aussehen, also z.B. sip:"
 "alice@beispiel.net"
 
-#: ../coreapi/proxy.c:1391
+#: ../coreapi/proxy.c:1403
 #, c-format
 msgid "Could not login as %s"
 msgstr "Anmeldung als %s fehlgeschlagen"
 
-#: ../coreapi/callbacks.c:383
+#: ../coreapi/callbacks.c:404
 msgid "Remote ringing."
 msgstr "Klingeln bei der Gegenseite."
 
-#: ../coreapi/callbacks.c:404
+#: ../coreapi/callbacks.c:425
 msgid "Remote ringing..."
 msgstr "Klingeln bei der Gegenseite..."
 
-#: ../coreapi/callbacks.c:414
+#: ../coreapi/callbacks.c:442
 msgid "Early media."
 msgstr "nicht kompatibel, prüfe Codecs oder Sicherheitseinstellungen..."
 
-#: ../coreapi/callbacks.c:475
+#: ../coreapi/callbacks.c:503
 #, c-format
 msgid "Call with %s is paused."
 msgstr "Anruf mit %s wird gehalten."
 
-#: ../coreapi/callbacks.c:488
+#: ../coreapi/callbacks.c:516
 #, c-format
 msgid "Call answered by %s - on hold."
 msgstr "Der von %s entgegengenommene Anruf wird gehalten."
 
-#: ../coreapi/callbacks.c:498
+#: ../coreapi/callbacks.c:526
 msgid "Call resumed."
 msgstr "Anruf fortgesetzt."
 
-#: ../coreapi/callbacks.c:502
+#: ../coreapi/callbacks.c:530
 #, c-format
 msgid "Call answered by %s."
 msgstr "Anruf wird von %s entgegengenommen."
 
-#: ../coreapi/callbacks.c:525
+#: ../coreapi/callbacks.c:553
 msgid "Incompatible, check codecs or security settings..."
 msgstr "Inkompatibel, prüfe Codecs oder Sicherheitseinstellungen..."
 
-#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:829
+#: ../coreapi/callbacks.c:558 ../coreapi/callbacks.c:870
 msgid "Incompatible media parameters."
 msgstr "Inkompatible Medienparameter."
 
-#: ../coreapi/callbacks.c:560
+#: ../coreapi/callbacks.c:588
 msgid "We have been resumed."
 msgstr "Anruf wird fortgesetzt."
 
 #. we are being paused
-#: ../coreapi/callbacks.c:568
+#: ../coreapi/callbacks.c:596
 msgid "We are paused by other party."
 msgstr "Anruf wird von der Gegenseite gehalten."
 
 #. reINVITE and in-dialogs UPDATE go here
-#: ../coreapi/callbacks.c:602
+#: ../coreapi/callbacks.c:630
 msgid "Call is updated by remote."
 msgstr "Anruf ist von der Gegenseite aktualisiert worden."
 
-#: ../coreapi/callbacks.c:705
+#: ../coreapi/callbacks.c:746
 msgid "Call terminated."
 msgstr "Anruf beendet."
 
-#: ../coreapi/callbacks.c:733
+#: ../coreapi/callbacks.c:774
 msgid "User is busy."
 msgstr "Teilnehmer ist besetzt."
 
-#: ../coreapi/callbacks.c:734
+#: ../coreapi/callbacks.c:775
 msgid "User is temporarily unavailable."
 msgstr "Teilnehmer zur Zeit nicht verfügbar."
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:736
+#: ../coreapi/callbacks.c:777
 msgid "User does not want to be disturbed."
 msgstr "Teilnehmer möchte nicht gestört werden."
 
-#: ../coreapi/callbacks.c:737
+#: ../coreapi/callbacks.c:778
 msgid "Call declined."
 msgstr "Anruf abgewiesen"
 
-#: ../coreapi/callbacks.c:752
+#: ../coreapi/callbacks.c:793
 msgid "Request timeout."
 msgstr "Zeitüberschreitung bei der Anfrage"
 
-#: ../coreapi/callbacks.c:783
+#: ../coreapi/callbacks.c:824
 msgid "Redirected"
 msgstr "Umgeleitet"
 
-#: ../coreapi/callbacks.c:838
+#: ../coreapi/callbacks.c:879
 msgid "Call failed."
 msgstr "Anruf fehlgeschlagen."
 
-#: ../coreapi/callbacks.c:916
+#: ../coreapi/callbacks.c:957
 #, c-format
 msgid "Registration on %s successful."
 msgstr "Registrierung auf %s erfolgreich."
 
-#: ../coreapi/callbacks.c:917
+#: ../coreapi/callbacks.c:958
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "Abmeldung von %s ist erfolgt."
 
-#: ../coreapi/callbacks.c:935
+#: ../coreapi/callbacks.c:976
 msgid "no response timeout"
 msgstr "Zeitüberschreitung bei der Antwort"
 
-#: ../coreapi/callbacks.c:938
+#: ../coreapi/callbacks.c:979
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "Registrierung auf %s fehlgeschlagen: %s"
 
-#: ../coreapi/callbacks.c:945
+#: ../coreapi/callbacks.c:986
 msgid "Service unavailable, retrying"
 msgstr "Service nicht verfügbar, versuche erneut"
 
-#: ../coreapi/linphonecall.c:175
+#. if encryption is DTLS, no status to be displayed
+#: ../coreapi/linphonecall.c:180
 #, c-format
 msgid "Authentication token is %s"
 msgstr "Authentifizierungs-Token ist %s"
 
-#: ../coreapi/linphonecall.c:3041
+#: ../coreapi/linphonecall.c:3492
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
diff --git a/po/es.po b/po/es.po
index 6a133760e..db3d1dd72 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,9 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-13 16:18+0100\n"
-"PO-Revision-Date: 2015-01-06 11:29+0000\n"
-"Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
+"POT-Creation-Date: 2015-02-17 12:28+0100\n"
+"PO-Revision-Date: 2015-02-17 11:28+0000\n"
+"Last-Translator: Belledonne Communications <support@belledonne-"
+"communications.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/es/)\n"
 "Language: es\n"
@@ -137,7 +138,7 @@ msgstr ""
 msgid "Run self test and exit 0 if succeed"
 msgstr ""
 
-#: ../gtk/main.c:1083
+#: ../gtk/main.c:1088
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
@@ -150,66 +151,66 @@ msgstr ""
 "contactos?\n"
 "Si responde no, esta persona será bloqueada temporalmente."
 
-#: ../gtk/main.c:1160
+#: ../gtk/main.c:1165
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
 msgstr ""
 
-#: ../gtk/main.c:1281
+#: ../gtk/main.c:1286
 msgid "Call error"
 msgstr ""
 
-#: ../gtk/main.c:1284 ../coreapi/linphonecore.c:3767
+#: ../gtk/main.c:1289 ../coreapi/linphonecore.c:3787
 msgid "Call ended"
 msgstr ""
 
-#: ../gtk/main.c:1287 ../coreapi/call_log.c:221
+#: ../gtk/main.c:1292 ../coreapi/call_log.c:221
 msgid "Incoming call"
 msgstr "Llamada entrante"
 
-#: ../gtk/main.c:1289 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
+#: ../gtk/main.c:1294 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
 msgid "Answer"
 msgstr "Contestar"
 
-#: ../gtk/main.c:1291 ../gtk/main.ui.h:6
+#: ../gtk/main.c:1296 ../gtk/main.ui.h:6
 msgid "Decline"
 msgstr ""
 
-#: ../gtk/main.c:1297
+#: ../gtk/main.c:1302
 msgid "Call paused"
 msgstr ""
 
-#: ../gtk/main.c:1297
+#: ../gtk/main.c:1302
 #, c-format
 msgid "<b>by %s</b>"
 msgstr ""
 
-#: ../gtk/main.c:1367
+#: ../gtk/main.c:1372
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr ""
 
-#: ../gtk/main.c:1529
+#: ../gtk/main.c:1534
 msgid "Website link"
 msgstr "Enlace a la Web"
 
-#: ../gtk/main.c:1578
+#: ../gtk/main.c:1583
 msgid "Linphone - a video internet phone"
 msgstr "Linphone - un video-teléfono a través de Internet"
 
-#: ../gtk/main.c:1670
+#: ../gtk/main.c:1675
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (Opción predeterminada)"
 
-#: ../gtk/main.c:2002 ../coreapi/callbacks.c:986
+#: ../gtk/main.c:2007 ../coreapi/callbacks.c:1027
 #, c-format
 msgid "We are transferred to %s"
 msgstr "Somos transferidos a %s"
 
-#: ../gtk/main.c:2012
+#: ../gtk/main.c:2017
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
@@ -217,7 +218,7 @@ msgstr ""
 "No se ha encontrado una tarjeta de sonido en este equipo.\n"
 "No será posible realizar o recibir llamadas de audio."
 
-#: ../gtk/main.c:2156
+#: ../gtk/main.c:2161
 msgid "A free SIP video-phone"
 msgstr "Un video-teléfono SIP gratuito"
 
@@ -371,15 +372,19 @@ msgid ""
 "You need to restart linphone for the new language selection to take effect."
 msgstr "Deberá reiniciar linphone para aplicar la nueva selección de lenguaje"
 
-#: ../gtk/propertybox.c:1234
+#: ../gtk/propertybox.c:1236
 msgid "None"
 msgstr ""
 
-#: ../gtk/propertybox.c:1238
+#: ../gtk/propertybox.c:1240
 msgid "SRTP"
 msgstr "SRTP"
 
-#: ../gtk/propertybox.c:1244
+#: ../gtk/propertybox.c:1246
+msgid "DTLS"
+msgstr ""
+
+#: ../gtk/propertybox.c:1253
 msgid "ZRTP"
 msgstr "ZRTP"
 
@@ -548,7 +553,7 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:527
+#: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:534
 msgid "Terminating"
 msgstr ""
 
@@ -639,7 +644,7 @@ msgstr ""
 msgid "<b>Calling...</b>"
 msgstr ""
 
-#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:727
+#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:733
 msgid "00::00::00"
 msgstr "00::00::00"
 
@@ -676,62 +681,66 @@ msgid "Secured by SRTP"
 msgstr "Cifrada con SRTP"
 
 #: ../gtk/incall_view.c:685
+msgid "Secured by DTLS"
+msgstr ""
+
+#: ../gtk/incall_view.c:691
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
 msgstr "Cifrada con ZRTP - [token de autenticación: %s]"
 
-#: ../gtk/incall_view.c:691
+#: ../gtk/incall_view.c:697
 msgid "Set unverified"
 msgstr "Set sin verificar"
 
-#: ../gtk/incall_view.c:691 ../gtk/main.ui.h:4
+#: ../gtk/incall_view.c:697 ../gtk/main.ui.h:4
 msgid "Set verified"
 msgstr "Set verificado"
 
-#: ../gtk/incall_view.c:722
+#: ../gtk/incall_view.c:728
 msgid "In conference"
 msgstr "En conferencia"
 
-#: ../gtk/incall_view.c:722
+#: ../gtk/incall_view.c:728
 msgid "<b>In call</b>"
 msgstr ""
 
-#: ../gtk/incall_view.c:758
+#: ../gtk/incall_view.c:764
 msgid "<b>Paused call</b>"
 msgstr ""
 
-#: ../gtk/incall_view.c:794
+#: ../gtk/incall_view.c:800
 msgid "<b>Call ended.</b>"
 msgstr ""
 
-#: ../gtk/incall_view.c:825
+#: ../gtk/incall_view.c:831
 msgid "Transfer in progress"
 msgstr ""
 
-#: ../gtk/incall_view.c:828
+#: ../gtk/incall_view.c:834
 msgid "Transfer done."
 msgstr ""
 
-#: ../gtk/incall_view.c:831
+#: ../gtk/incall_view.c:837
 msgid "Transfer failed."
 msgstr ""
 
-#: ../gtk/incall_view.c:875
+#: ../gtk/incall_view.c:881
 msgid "Resume"
 msgstr "Reanudar"
 
-#: ../gtk/incall_view.c:882 ../gtk/main.ui.h:9
+#: ../gtk/incall_view.c:888 ../gtk/main.ui.h:9
 msgid "Pause"
 msgstr "Pausar"
 
-#: ../gtk/incall_view.c:948
+#: ../gtk/incall_view.c:954
 #, c-format
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
 msgstr ""
 
-#: ../gtk/incall_view.c:948
+#: ../gtk/incall_view.c:954
 msgid "(Paused)"
 msgstr ""
 
@@ -828,23 +837,23 @@ msgstr ""
 msgid "Let's start Linphone now"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:496
+#: ../gtk/audio_assistant.c:503
 msgid "Audio Assistant"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:506 ../gtk/main.ui.h:31
+#: ../gtk/audio_assistant.c:513 ../gtk/main.ui.h:31
 msgid "Audio assistant"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:511
+#: ../gtk/audio_assistant.c:518
 msgid "Mic Gain calibration"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:517
+#: ../gtk/audio_assistant.c:524
 msgid "Speaker volume calibration"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:522
+#: ../gtk/audio_assistant.c:529
 msgid "Record and Play"
 msgstr ""
 
@@ -1696,68 +1705,68 @@ msgstr ""
 msgid "Please wait while fetching configuration from server..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1510
+#: ../coreapi/linphonecore.c:1508
 msgid "Ready"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2489
+#: ../coreapi/linphonecore.c:2495
 msgid "Configuring"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2654
+#: ../coreapi/linphonecore.c:2669
 msgid "Looking for telephone number destination..."
 msgstr "Buscando el número de teléfono del destinatario…"
 
-#: ../coreapi/linphonecore.c:2656
+#: ../coreapi/linphonecore.c:2671
 msgid "Could not resolve this number."
 msgstr "No se ha podido resolver este número."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2942
+#: ../coreapi/linphonecore.c:2957
 msgid "Contacting"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2947
+#: ../coreapi/linphonecore.c:2962
 msgid "Could not call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3097
+#: ../coreapi/linphonecore.c:3112
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "Disculpe, se ha alcanzado el máximo número de llamadas simultáneas"
 
-#: ../coreapi/linphonecore.c:3256
+#: ../coreapi/linphonecore.c:3270
 msgid "is contacting you"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3257
+#: ../coreapi/linphonecore.c:3271
 msgid " and asked autoanswer."
 msgstr "y ha solicitado auto respuesta."
 
-#: ../coreapi/linphonecore.c:3375
+#: ../coreapi/linphonecore.c:3395
 msgid "Modifying call parameters..."
 msgstr "Modificando parámetros de llamada…"
 
-#: ../coreapi/linphonecore.c:3723
+#: ../coreapi/linphonecore.c:3743
 msgid "Connected."
 msgstr "Conectado."
 
-#: ../coreapi/linphonecore.c:3748
+#: ../coreapi/linphonecore.c:3768
 msgid "Call aborted"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3938
+#: ../coreapi/linphonecore.c:3958
 msgid "Could not pause the call"
 msgstr "No se pudo pausar la llamada"
 
-#: ../coreapi/linphonecore.c:3941
+#: ../coreapi/linphonecore.c:3961
 msgid "Pausing the current call..."
 msgstr "Pausando la llamada actual..."
 
-#: ../coreapi/misc.c:438
+#: ../coreapi/misc.c:433
 msgid "Stun lookup in progress..."
 msgstr "Búsqueda STUN en proceso…"
 
-#: ../coreapi/misc.c:619
+#: ../coreapi/misc.c:614
 msgid "ICE local candidates gathering in progress..."
 msgstr ""
 
@@ -1813,7 +1822,7 @@ msgstr ""
 msgid "Unknown status"
 msgstr ""
 
-#: ../coreapi/proxy.c:327
+#: ../coreapi/proxy.c:328
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
@@ -1821,7 +1830,7 @@ msgstr ""
 "La dirección del Proxy SIP que ha introducido no es válida, debe empezar con "
 "\"sip:\" seguido del hostname."
 
-#: ../coreapi/proxy.c:333
+#: ../coreapi/proxy.c:334
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
@@ -1830,126 +1839,127 @@ msgstr ""
 "Debe ser del tipo sip:username@proxydomain, como por ejemplo sip:"
 "alice@example.net"
 
-#: ../coreapi/proxy.c:1391
+#: ../coreapi/proxy.c:1403
 #, c-format
 msgid "Could not login as %s"
 msgstr ""
 
-#: ../coreapi/callbacks.c:383
+#: ../coreapi/callbacks.c:404
 msgid "Remote ringing."
 msgstr ""
 
-#: ../coreapi/callbacks.c:404
+#: ../coreapi/callbacks.c:425
 msgid "Remote ringing..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:414
+#: ../coreapi/callbacks.c:442
 msgid "Early media."
 msgstr "Medios iniciales."
 
-#: ../coreapi/callbacks.c:475
+#: ../coreapi/callbacks.c:503
 #, c-format
 msgid "Call with %s is paused."
 msgstr "La llamada con %s está puesta en pausa."
 
-#: ../coreapi/callbacks.c:488
+#: ../coreapi/callbacks.c:516
 #, c-format
 msgid "Call answered by %s - on hold."
 msgstr "Llamada respondida por %s - en espera."
 
-#: ../coreapi/callbacks.c:498
+#: ../coreapi/callbacks.c:526
 msgid "Call resumed."
 msgstr ""
 
-#: ../coreapi/callbacks.c:502
+#: ../coreapi/callbacks.c:530
 #, c-format
 msgid "Call answered by %s."
 msgstr ""
 
-#: ../coreapi/callbacks.c:525
+#: ../coreapi/callbacks.c:553
 msgid "Incompatible, check codecs or security settings..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:829
+#: ../coreapi/callbacks.c:558 ../coreapi/callbacks.c:870
 msgid "Incompatible media parameters."
 msgstr ""
 
-#: ../coreapi/callbacks.c:560
+#: ../coreapi/callbacks.c:588
 msgid "We have been resumed."
 msgstr ""
 
 #. we are being paused
-#: ../coreapi/callbacks.c:568
+#: ../coreapi/callbacks.c:596
 msgid "We are paused by other party."
 msgstr ""
 
 #. reINVITE and in-dialogs UPDATE go here
-#: ../coreapi/callbacks.c:602
+#: ../coreapi/callbacks.c:630
 msgid "Call is updated by remote."
 msgstr ""
 
-#: ../coreapi/callbacks.c:705
+#: ../coreapi/callbacks.c:746
 msgid "Call terminated."
 msgstr ""
 
-#: ../coreapi/callbacks.c:733
+#: ../coreapi/callbacks.c:774
 msgid "User is busy."
 msgstr "El usuario está ocupado."
 
-#: ../coreapi/callbacks.c:734
+#: ../coreapi/callbacks.c:775
 msgid "User is temporarily unavailable."
 msgstr "El usuario no está disponible temporalmente."
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:736
+#: ../coreapi/callbacks.c:777
 msgid "User does not want to be disturbed."
 msgstr "El usuario no quiere que le molesten."
 
-#: ../coreapi/callbacks.c:737
+#: ../coreapi/callbacks.c:778
 msgid "Call declined."
 msgstr "Llamada rechazada."
 
-#: ../coreapi/callbacks.c:752
+#: ../coreapi/callbacks.c:793
 msgid "Request timeout."
 msgstr ""
 
-#: ../coreapi/callbacks.c:783
+#: ../coreapi/callbacks.c:824
 msgid "Redirected"
 msgstr "Redigirida"
 
-#: ../coreapi/callbacks.c:838
+#: ../coreapi/callbacks.c:879
 msgid "Call failed."
 msgstr ""
 
-#: ../coreapi/callbacks.c:916
+#: ../coreapi/callbacks.c:957
 #, c-format
 msgid "Registration on %s successful."
 msgstr ""
 
-#: ../coreapi/callbacks.c:917
+#: ../coreapi/callbacks.c:958
 #, c-format
 msgid "Unregistration on %s done."
 msgstr ""
 
-#: ../coreapi/callbacks.c:935
+#: ../coreapi/callbacks.c:976
 msgid "no response timeout"
 msgstr "timeout sin respuesta"
 
-#: ../coreapi/callbacks.c:938
+#: ../coreapi/callbacks.c:979
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr ""
 
-#: ../coreapi/callbacks.c:945
+#: ../coreapi/callbacks.c:986
 msgid "Service unavailable, retrying"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:175
+#. if encryption is DTLS, no status to be displayed
+#: ../coreapi/linphonecall.c:180
 #, c-format
 msgid "Authentication token is %s"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:3041
+#: ../coreapi/linphonecall.c:3492
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
diff --git a/po/fr.po b/po/fr.po
index aff7882d6..33fa26d57 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
+# Belledonne Communications <support@belledonne-communications.com>, 2015
 # Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>, 2014
 # Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>, 2014
 # Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>, 2014-2015
@@ -11,9 +12,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-13 16:18+0100\n"
-"PO-Revision-Date: 2015-01-13 16:34+0000\n"
-"Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
+"POT-Creation-Date: 2015-02-17 12:28+0100\n"
+"PO-Revision-Date: 2015-02-17 11:30+0000\n"
+"Last-Translator: Belledonne Communications <support@belledonne-"
+"communications.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/fr/)\n"
 "Language: fr\n"
@@ -142,7 +144,7 @@ msgstr "Démarre l'assistant audio"
 msgid "Run self test and exit 0 if succeed"
 msgstr "Exécuter le test local et retourner 0 en cas de succès"
 
-#: ../gtk/main.c:1083
+#: ../gtk/main.c:1088
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
@@ -156,7 +158,7 @@ msgstr ""
 "Si vous répondez non, cette personne sera mise temporairement sur liste "
 "noire."
 
-#: ../gtk/main.c:1160
+#: ../gtk/main.c:1165
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
@@ -165,59 +167,59 @@ msgstr ""
 "Entrez le mot de passe pour <i>%s</i>\n"
 " sur le domaine <i>%s</i>:"
 
-#: ../gtk/main.c:1281
+#: ../gtk/main.c:1286
 msgid "Call error"
 msgstr "Erreur lors de l'appel"
 
-#: ../gtk/main.c:1284 ../coreapi/linphonecore.c:3767
+#: ../gtk/main.c:1289 ../coreapi/linphonecore.c:3787
 msgid "Call ended"
 msgstr "Appel terminé."
 
-#: ../gtk/main.c:1287 ../coreapi/call_log.c:221
+#: ../gtk/main.c:1292 ../coreapi/call_log.c:221
 msgid "Incoming call"
 msgstr "Appel entrant"
 
-#: ../gtk/main.c:1289 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
+#: ../gtk/main.c:1294 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
 msgid "Answer"
 msgstr "Répondre"
 
-#: ../gtk/main.c:1291 ../gtk/main.ui.h:6
+#: ../gtk/main.c:1296 ../gtk/main.ui.h:6
 msgid "Decline"
 msgstr "Refuser"
 
-#: ../gtk/main.c:1297
+#: ../gtk/main.c:1302
 msgid "Call paused"
 msgstr "Appel en pause"
 
-#: ../gtk/main.c:1297
+#: ../gtk/main.c:1302
 #, c-format
 msgid "<b>by %s</b>"
 msgstr "b>par %s</b>"
 
-#: ../gtk/main.c:1367
+#: ../gtk/main.c:1372
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr "%s propose de démarrer la vidéo. Acceptez-vous ?"
 
-#: ../gtk/main.c:1529
+#: ../gtk/main.c:1534
 msgid "Website link"
 msgstr "Lien site web"
 
-#: ../gtk/main.c:1578
+#: ../gtk/main.c:1583
 msgid "Linphone - a video internet phone"
 msgstr "Linphone - un téléphone video pour l'internet"
 
-#: ../gtk/main.c:1670
+#: ../gtk/main.c:1675
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (par défaut)"
 
-#: ../gtk/main.c:2002 ../coreapi/callbacks.c:986
+#: ../gtk/main.c:2007 ../coreapi/callbacks.c:1027
 #, c-format
 msgid "We are transferred to %s"
 msgstr "Transfert vers %s"
 
-#: ../gtk/main.c:2012
+#: ../gtk/main.c:2017
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
@@ -225,7 +227,7 @@ msgstr ""
 "Aucune carte son n'a été détectée sur cet ordinateur.\n"
 "Vous ne pourrez pas effectuer d'appels audio."
 
-#: ../gtk/main.c:2156
+#: ../gtk/main.c:2161
 msgid "A free SIP video-phone"
 msgstr "Un visiophone libre"
 
@@ -381,15 +383,19 @@ msgstr ""
 "La nouvelle selection de langue prendra effet au prochain démarrage de "
 "linphone."
 
-#: ../gtk/propertybox.c:1234
+#: ../gtk/propertybox.c:1236
 msgid "None"
 msgstr "Aucun"
 
-#: ../gtk/propertybox.c:1238
+#: ../gtk/propertybox.c:1240
 msgid "SRTP"
 msgstr "SRTP"
 
-#: ../gtk/propertybox.c:1244
+#: ../gtk/propertybox.c:1246
+msgid "DTLS"
+msgstr "DTLS"
+
+#: ../gtk/propertybox.c:1253
 msgid "ZRTP"
 msgstr "ZRTP"
 
@@ -569,7 +575,7 @@ msgstr "Validation (étape 2/2)"
 msgid "Error"
 msgstr "Erreur"
 
-#: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:527
+#: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:534
 msgid "Terminating"
 msgstr "En cours d’arrêt."
 
@@ -662,7 +668,7 @@ msgstr "Raccrocher"
 msgid "<b>Calling...</b>"
 msgstr "<b>Tentative d'appel...</b>"
 
-#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:727
+#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:733
 msgid "00::00::00"
 msgstr "00::00::00"
 
@@ -699,55 +705,59 @@ msgid "Secured by SRTP"
 msgstr "Sécurisé par SRTP"
 
 #: ../gtk/incall_view.c:685
+msgid "Secured by DTLS"
+msgstr "Sécurisé par DTLS"
+
+#: ../gtk/incall_view.c:691
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
 msgstr "Sécurisé par ZRTP- [jeton: %s]"
 
-#: ../gtk/incall_view.c:691
+#: ../gtk/incall_view.c:697
 msgid "Set unverified"
 msgstr "Marquer comme non vérifié"
 
-#: ../gtk/incall_view.c:691 ../gtk/main.ui.h:4
+#: ../gtk/incall_view.c:697 ../gtk/main.ui.h:4
 msgid "Set verified"
 msgstr "Marquer comme vérifié"
 
-#: ../gtk/incall_view.c:722
+#: ../gtk/incall_view.c:728
 msgid "In conference"
 msgstr "En conférence"
 
-#: ../gtk/incall_view.c:722
+#: ../gtk/incall_view.c:728
 msgid "<b>In call</b>"
 msgstr "<b>Appel en cours</b>"
 
-#: ../gtk/incall_view.c:758
+#: ../gtk/incall_view.c:764
 msgid "<b>Paused call</b>"
 msgstr "<b>Appel en attente</b>"
 
-#: ../gtk/incall_view.c:794
+#: ../gtk/incall_view.c:800
 msgid "<b>Call ended.</b>"
 msgstr "<b>Appel terminé.</b>"
 
-#: ../gtk/incall_view.c:825
+#: ../gtk/incall_view.c:831
 msgid "Transfer in progress"
 msgstr "Transfert en cours"
 
-#: ../gtk/incall_view.c:828
+#: ../gtk/incall_view.c:834
 msgid "Transfer done."
 msgstr "Transfert terminé"
 
-#: ../gtk/incall_view.c:831
+#: ../gtk/incall_view.c:837
 msgid "Transfer failed."
 msgstr "Transfert échoué"
 
-#: ../gtk/incall_view.c:875
+#: ../gtk/incall_view.c:881
 msgid "Resume"
 msgstr "Reprendre"
 
-#: ../gtk/incall_view.c:882 ../gtk/main.ui.h:9
+#: ../gtk/incall_view.c:888 ../gtk/main.ui.h:9
 msgid "Pause"
 msgstr "Pause"
 
-#: ../gtk/incall_view.c:948
+#: ../gtk/incall_view.c:954
 #, c-format
 msgid ""
 "<small><i>Recording into\n"
@@ -756,7 +766,7 @@ msgstr ""
 "<small><i>Enregistrement dans\n"
 "%s %s</i></small>"
 
-#: ../gtk/incall_view.c:948
+#: ../gtk/incall_view.c:954
 msgid "(Paused)"
 msgstr "(en attente)"
 
@@ -856,23 +866,23 @@ msgstr "Jouer"
 msgid "Let's start Linphone now"
 msgstr "Démarrons Linphone maintenant"
 
-#: ../gtk/audio_assistant.c:496
+#: ../gtk/audio_assistant.c:503
 msgid "Audio Assistant"
 msgstr "Assistant audio"
 
-#: ../gtk/audio_assistant.c:506 ../gtk/main.ui.h:31
+#: ../gtk/audio_assistant.c:513 ../gtk/main.ui.h:31
 msgid "Audio assistant"
 msgstr "Assistant audio"
 
-#: ../gtk/audio_assistant.c:511
+#: ../gtk/audio_assistant.c:518
 msgid "Mic Gain calibration"
 msgstr "Calibration du gain du microphone"
 
-#: ../gtk/audio_assistant.c:517
+#: ../gtk/audio_assistant.c:524
 msgid "Speaker volume calibration"
 msgstr "Calibration du volume du haut parleur"
 
-#: ../gtk/audio_assistant.c:522
+#: ../gtk/audio_assistant.c:529
 msgid "Record and Play"
 msgstr "Enregistrer et joue"
 
@@ -1744,68 +1754,68 @@ msgstr ""
 "Veuillez patenter un instant pendant le chargement de la configuration "
 "distante..."
 
-#: ../coreapi/linphonecore.c:1510
+#: ../coreapi/linphonecore.c:1508
 msgid "Ready"
 msgstr "Prêt."
 
-#: ../coreapi/linphonecore.c:2489
+#: ../coreapi/linphonecore.c:2495
 msgid "Configuring"
 msgstr "Configuration en cours"
 
-#: ../coreapi/linphonecore.c:2654
+#: ../coreapi/linphonecore.c:2669
 msgid "Looking for telephone number destination..."
 msgstr "Recherche de la destination du numéro de téléphone..."
 
-#: ../coreapi/linphonecore.c:2656
+#: ../coreapi/linphonecore.c:2671
 msgid "Could not resolve this number."
 msgstr "La destination n'a pu être trouvée."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2942
+#: ../coreapi/linphonecore.c:2957
 msgid "Contacting"
 msgstr "Appel de"
 
-#: ../coreapi/linphonecore.c:2947
+#: ../coreapi/linphonecore.c:2962
 msgid "Could not call"
 msgstr "Echec de l'appel"
 
-#: ../coreapi/linphonecore.c:3097
+#: ../coreapi/linphonecore.c:3112
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "Désolé, le nombre maximum d'appels simultanés est atteint."
 
-#: ../coreapi/linphonecore.c:3256
+#: ../coreapi/linphonecore.c:3270
 msgid "is contacting you"
 msgstr "vous appelle"
 
-#: ../coreapi/linphonecore.c:3257
+#: ../coreapi/linphonecore.c:3271
 msgid " and asked autoanswer."
 msgstr "et sollicite un décrochage automatique."
 
-#: ../coreapi/linphonecore.c:3375
+#: ../coreapi/linphonecore.c:3395
 msgid "Modifying call parameters..."
 msgstr "Modifications des paramètres d'appels..."
 
-#: ../coreapi/linphonecore.c:3723
+#: ../coreapi/linphonecore.c:3743
 msgid "Connected."
 msgstr "En ligne."
 
-#: ../coreapi/linphonecore.c:3748
+#: ../coreapi/linphonecore.c:3768
 msgid "Call aborted"
 msgstr "Appel abandonné"
 
-#: ../coreapi/linphonecore.c:3938
+#: ../coreapi/linphonecore.c:3958
 msgid "Could not pause the call"
 msgstr "La mise en attente a échoué"
 
-#: ../coreapi/linphonecore.c:3941
+#: ../coreapi/linphonecore.c:3961
 msgid "Pausing the current call..."
 msgstr "Mise en attente de l'appel..."
 
-#: ../coreapi/misc.c:438
+#: ../coreapi/misc.c:433
 msgid "Stun lookup in progress..."
 msgstr "Découverte STUN en cours"
 
-#: ../coreapi/misc.c:619
+#: ../coreapi/misc.c:614
 msgid "ICE local candidates gathering in progress..."
 msgstr "Collection des candidats locaux ICE en cours..."
 
@@ -1861,7 +1871,7 @@ msgstr "En congé"
 msgid "Unknown status"
 msgstr "Status inconnu"
 
-#: ../coreapi/proxy.c:327
+#: ../coreapi/proxy.c:328
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
@@ -1869,7 +1879,7 @@ msgstr ""
 "L'adresse SIP du proxy est invalide. Elle doit commencer par \"sip:\" suivie "
 "par un nom de domaine."
 
-#: ../coreapi/proxy.c:333
+#: ../coreapi/proxy.c:334
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
@@ -1878,126 +1888,127 @@ msgstr ""
 "Elle doit être de la forme sip:username@domain, comme par example sip:"
 "alice@example.net"
 
-#: ../coreapi/proxy.c:1391
+#: ../coreapi/proxy.c:1403
 #, c-format
 msgid "Could not login as %s"
 msgstr "Echec de la connexion en tant que %s"
 
-#: ../coreapi/callbacks.c:383
+#: ../coreapi/callbacks.c:404
 msgid "Remote ringing."
 msgstr "Sonnerie distante."
 
-#: ../coreapi/callbacks.c:404
+#: ../coreapi/callbacks.c:425
 msgid "Remote ringing..."
 msgstr "Sonnerie distante..."
 
-#: ../coreapi/callbacks.c:414
+#: ../coreapi/callbacks.c:442
 msgid "Early media."
 msgstr "Prise d'appel anticipée."
 
-#: ../coreapi/callbacks.c:475
+#: ../coreapi/callbacks.c:503
 #, c-format
 msgid "Call with %s is paused."
 msgstr "%s est maintenant en attente."
 
-#: ../coreapi/callbacks.c:488
+#: ../coreapi/callbacks.c:516
 #, c-format
 msgid "Call answered by %s - on hold."
 msgstr "Appel répondu par %s - en attente"
 
-#: ../coreapi/callbacks.c:498
+#: ../coreapi/callbacks.c:526
 msgid "Call resumed."
 msgstr "Appel repris."
 
-#: ../coreapi/callbacks.c:502
+#: ../coreapi/callbacks.c:530
 #, c-format
 msgid "Call answered by %s."
 msgstr "Appel répondu par %s."
 
-#: ../coreapi/callbacks.c:525
+#: ../coreapi/callbacks.c:553
 msgid "Incompatible, check codecs or security settings..."
 msgstr "Incompatible, vérfiez les codecs ou les paramètres de sécurité..."
 
-#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:829
+#: ../coreapi/callbacks.c:558 ../coreapi/callbacks.c:870
 msgid "Incompatible media parameters."
 msgstr "Paramètres media incompatibles."
 
-#: ../coreapi/callbacks.c:560
+#: ../coreapi/callbacks.c:588
 msgid "We have been resumed."
 msgstr "Appel repris."
 
 #. we are being paused
-#: ../coreapi/callbacks.c:568
+#: ../coreapi/callbacks.c:596
 msgid "We are paused by other party."
 msgstr "L'appel a été mis en attente."
 
 #. reINVITE and in-dialogs UPDATE go here
-#: ../coreapi/callbacks.c:602
+#: ../coreapi/callbacks.c:630
 msgid "Call is updated by remote."
 msgstr "L'appel est modifié par la partie distante."
 
-#: ../coreapi/callbacks.c:705
+#: ../coreapi/callbacks.c:746
 msgid "Call terminated."
 msgstr "Appel terminé."
 
-#: ../coreapi/callbacks.c:733
+#: ../coreapi/callbacks.c:774
 msgid "User is busy."
 msgstr "Occupé..."
 
-#: ../coreapi/callbacks.c:734
+#: ../coreapi/callbacks.c:775
 msgid "User is temporarily unavailable."
 msgstr "L'usager est temporairement indisponible."
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:736
+#: ../coreapi/callbacks.c:777
 msgid "User does not want to be disturbed."
 msgstr "L'usager ne souhaite pas être dérangé"
 
-#: ../coreapi/callbacks.c:737
+#: ../coreapi/callbacks.c:778
 msgid "Call declined."
 msgstr "Appel décliné."
 
-#: ../coreapi/callbacks.c:752
+#: ../coreapi/callbacks.c:793
 msgid "Request timeout."
 msgstr "Délai d'attente de la requête dépassé."
 
-#: ../coreapi/callbacks.c:783
+#: ../coreapi/callbacks.c:824
 msgid "Redirected"
 msgstr "Redirection"
 
-#: ../coreapi/callbacks.c:838
+#: ../coreapi/callbacks.c:879
 msgid "Call failed."
 msgstr "L'appel a échoué."
 
-#: ../coreapi/callbacks.c:916
+#: ../coreapi/callbacks.c:957
 #, c-format
 msgid "Registration on %s successful."
 msgstr "Enregistrement sur %s effectué."
 
-#: ../coreapi/callbacks.c:917
+#: ../coreapi/callbacks.c:958
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "Désenregistrement sur %s effectué."
 
-#: ../coreapi/callbacks.c:935
+#: ../coreapi/callbacks.c:976
 msgid "no response timeout"
 msgstr "Pas de réponse"
 
-#: ../coreapi/callbacks.c:938
+#: ../coreapi/callbacks.c:979
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "Echec de l'enregistrement sur %s: %s"
 
-#: ../coreapi/callbacks.c:945
+#: ../coreapi/callbacks.c:986
 msgid "Service unavailable, retrying"
 msgstr "Service indisponible, nouvelle tentative"
 
-#: ../coreapi/linphonecall.c:175
+#. if encryption is DTLS, no status to be displayed
+#: ../coreapi/linphonecall.c:180
 #, c-format
 msgid "Authentication token is %s"
 msgstr "Le jeton d'authentification est %s"
 
-#: ../coreapi/linphonecall.c:3041
+#: ../coreapi/linphonecall.c:3492
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
diff --git a/po/he.po b/po/he.po
index 4feae78d6..553b97f58 100644
--- a/po/he.po
+++ b/po/he.po
@@ -11,9 +11,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-13 16:18+0100\n"
-"PO-Revision-Date: 2015-01-06 11:29+0000\n"
-"Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
+"POT-Creation-Date: 2015-02-17 12:28+0100\n"
+"PO-Revision-Date: 2015-02-17 11:28+0000\n"
+"Last-Translator: Belledonne Communications <support@belledonne-"
+"communications.com>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/he/)\n"
 "Language: he\n"
@@ -140,7 +141,7 @@ msgstr ""
 msgid "Run self test and exit 0 if succeed"
 msgstr ""
 
-#: ../gtk/main.c:1083
+#: ../gtk/main.c:1088
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
@@ -153,7 +154,7 @@ msgstr ""
 "שלך ?\n"
 "היה ותשובתך תהיה לא, אדם זה יהיה מסומן באופן זמני ברשימה השחורה."
 
-#: ../gtk/main.c:1160
+#: ../gtk/main.c:1165
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
@@ -162,59 +163,59 @@ msgstr ""
 "אנא הזן סיסמה עבור משתמש <i>%s</i>\n"
 "במתחם <i>%s</i>:"
 
-#: ../gtk/main.c:1281
+#: ../gtk/main.c:1286
 msgid "Call error"
 msgstr "שגיאת קריאה"
 
-#: ../gtk/main.c:1284 ../coreapi/linphonecore.c:3767
+#: ../gtk/main.c:1289 ../coreapi/linphonecore.c:3787
 msgid "Call ended"
 msgstr "שיחה הסתיימה"
 
-#: ../gtk/main.c:1287 ../coreapi/call_log.c:221
+#: ../gtk/main.c:1292 ../coreapi/call_log.c:221
 msgid "Incoming call"
 msgstr "קריאה נכנסת"
 
-#: ../gtk/main.c:1289 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
+#: ../gtk/main.c:1294 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
 msgid "Answer"
 msgstr "לענות"
 
-#: ../gtk/main.c:1291 ../gtk/main.ui.h:6
+#: ../gtk/main.c:1296 ../gtk/main.ui.h:6
 msgid "Decline"
 msgstr "לדחות"
 
-#: ../gtk/main.c:1297
+#: ../gtk/main.c:1302
 msgid "Call paused"
 msgstr "שיחה הושהתה"
 
-#: ../gtk/main.c:1297
+#: ../gtk/main.c:1302
 #, c-format
 msgid "<b>by %s</b>"
 msgstr "<b>על ידי %s</b>"
 
-#: ../gtk/main.c:1367
+#: ../gtk/main.c:1372
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr "‏%s רוצה להתחיל וידאו. האם אתה מסכים ?"
 
-#: ../gtk/main.c:1529
+#: ../gtk/main.c:1534
 msgid "Website link"
 msgstr "קישור אתר רשת"
 
-#: ../gtk/main.c:1578
+#: ../gtk/main.c:1583
 msgid "Linphone - a video internet phone"
 msgstr "‫Linphone - וידאופון אינטרנטי"
 
-#: ../gtk/main.c:1670
+#: ../gtk/main.c:1675
 #, c-format
 msgid "%s (Default)"
 msgstr "‫%s (ברירת מחדל)"
 
-#: ../gtk/main.c:2002 ../coreapi/callbacks.c:986
+#: ../gtk/main.c:2007 ../coreapi/callbacks.c:1027
 #, c-format
 msgid "We are transferred to %s"
 msgstr "אנחנו מועברים אל %s"
 
-#: ../gtk/main.c:2012
+#: ../gtk/main.c:2017
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
@@ -222,7 +223,7 @@ msgstr ""
 "לא אותרו כרטיסי קול במחשב זה.\n"
 "לא תהיה ביכולתך לשלוח או לקבל שיחות אודיו."
 
-#: ../gtk/main.c:2156
+#: ../gtk/main.c:2161
 msgid "A free SIP video-phone"
 msgstr "וידאופון SIP חופשי"
 
@@ -376,15 +377,19 @@ msgid ""
 "You need to restart linphone for the new language selection to take effect."
 msgstr "עליך לאתחל את לינפון כדי שהשפה החדשה תיכנס לתוקף."
 
-#: ../gtk/propertybox.c:1234
+#: ../gtk/propertybox.c:1236
 msgid "None"
 msgstr "ללא"
 
-#: ../gtk/propertybox.c:1238
+#: ../gtk/propertybox.c:1240
 msgid "SRTP"
 msgstr ""
 
-#: ../gtk/propertybox.c:1244
+#: ../gtk/propertybox.c:1246
+msgid "DTLS"
+msgstr ""
+
+#: ../gtk/propertybox.c:1253
 msgid "ZRTP"
 msgstr ""
 
@@ -559,7 +564,7 @@ msgstr "אימות (צעד 2/2)"
 msgid "Error"
 msgstr "שגיאה"
 
-#: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:527
+#: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:534
 msgid "Terminating"
 msgstr "מסיים כעת"
 
@@ -652,7 +657,7 @@ msgstr "נתק"
 msgid "<b>Calling...</b>"
 msgstr "<b>מתקשר כעת...</b>"
 
-#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:727
+#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:733
 msgid "00::00::00"
 msgstr "‭00::00::00"
 
@@ -689,55 +694,59 @@ msgid "Secured by SRTP"
 msgstr "מאובטחת על ידי SRTP"
 
 #: ../gtk/incall_view.c:685
+msgid "Secured by DTLS"
+msgstr ""
+
+#: ../gtk/incall_view.c:691
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
 msgstr "מאובטחת על ידי ZRTP - [אות אימות: %s]"
 
-#: ../gtk/incall_view.c:691
+#: ../gtk/incall_view.c:697
 msgid "Set unverified"
 msgstr "הגדר כלא מאומתת"
 
-#: ../gtk/incall_view.c:691 ../gtk/main.ui.h:4
+#: ../gtk/incall_view.c:697 ../gtk/main.ui.h:4
 msgid "Set verified"
 msgstr "הגדר כמאומתת"
 
-#: ../gtk/incall_view.c:722
+#: ../gtk/incall_view.c:728
 msgid "In conference"
 msgstr "בשיחת ועידה"
 
-#: ../gtk/incall_view.c:722
+#: ../gtk/incall_view.c:728
 msgid "<b>In call</b>"
 msgstr "<b>בשיחה כעת</b>"
 
-#: ../gtk/incall_view.c:758
+#: ../gtk/incall_view.c:764
 msgid "<b>Paused call</b>"
 msgstr "<b>שיחה מושהית</b>"
 
-#: ../gtk/incall_view.c:794
+#: ../gtk/incall_view.c:800
 msgid "<b>Call ended.</b>"
 msgstr "<b>שיחה הסתיימה.</b>"
 
-#: ../gtk/incall_view.c:825
+#: ../gtk/incall_view.c:831
 msgid "Transfer in progress"
 msgstr "העברה מצויה כעת בעיצומה"
 
-#: ../gtk/incall_view.c:828
+#: ../gtk/incall_view.c:834
 msgid "Transfer done."
 msgstr "העברה הסתיימה."
 
-#: ../gtk/incall_view.c:831
+#: ../gtk/incall_view.c:837
 msgid "Transfer failed."
 msgstr "העברה נכשלה."
 
-#: ../gtk/incall_view.c:875
+#: ../gtk/incall_view.c:881
 msgid "Resume"
 msgstr "חזור"
 
-#: ../gtk/incall_view.c:882 ../gtk/main.ui.h:9
+#: ../gtk/incall_view.c:888 ../gtk/main.ui.h:9
 msgid "Pause"
 msgstr "השהה"
 
-#: ../gtk/incall_view.c:948
+#: ../gtk/incall_view.c:954
 #, c-format
 msgid ""
 "<small><i>Recording into\n"
@@ -746,7 +755,7 @@ msgstr ""
 "<small><i>מקליט אל תוך\n"
 "%s %s</i></small>"
 
-#: ../gtk/incall_view.c:948
+#: ../gtk/incall_view.c:954
 msgid "(Paused)"
 msgstr "(מושהה)"
 
@@ -843,23 +852,23 @@ msgstr ""
 msgid "Let's start Linphone now"
 msgstr "הבא נתחיל את Linphone עכשיו"
 
-#: ../gtk/audio_assistant.c:496
+#: ../gtk/audio_assistant.c:503
 msgid "Audio Assistant"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:506 ../gtk/main.ui.h:31
+#: ../gtk/audio_assistant.c:513 ../gtk/main.ui.h:31
 msgid "Audio assistant"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:511
+#: ../gtk/audio_assistant.c:518
 msgid "Mic Gain calibration"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:517
+#: ../gtk/audio_assistant.c:524
 msgid "Speaker volume calibration"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:522
+#: ../gtk/audio_assistant.c:529
 msgid "Record and Play"
 msgstr ""
 
@@ -1709,68 +1718,68 @@ msgstr ""
 msgid "Please wait while fetching configuration from server..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1510
+#: ../coreapi/linphonecore.c:1508
 msgid "Ready"
 msgstr "מוכן"
 
-#: ../coreapi/linphonecore.c:2489
+#: ../coreapi/linphonecore.c:2495
 msgid "Configuring"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2654
+#: ../coreapi/linphonecore.c:2669
 msgid "Looking for telephone number destination..."
 msgstr "מחפש כעת עבור יעד מספר טלפון..."
 
-#: ../coreapi/linphonecore.c:2656
+#: ../coreapi/linphonecore.c:2671
 msgid "Could not resolve this number."
 msgstr "לא ניתן לפתור את מספר זה."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2942
+#: ../coreapi/linphonecore.c:2957
 msgid "Contacting"
 msgstr "מתקשר כעת"
 
-#: ../coreapi/linphonecore.c:2947
+#: ../coreapi/linphonecore.c:2962
 msgid "Could not call"
 msgstr "לא ניתן להתקשר"
 
-#: ../coreapi/linphonecore.c:3097
+#: ../coreapi/linphonecore.c:3112
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "הגענו אל המספר המרבי של שיחות מקבילות, עמך הסליחה"
 
-#: ../coreapi/linphonecore.c:3256
+#: ../coreapi/linphonecore.c:3270
 msgid "is contacting you"
 msgstr "מתקשר/ת אליך"
 
-#: ../coreapi/linphonecore.c:3257
+#: ../coreapi/linphonecore.c:3271
 msgid " and asked autoanswer."
 msgstr " ומבקש/ת מענה אוטומטי."
 
-#: ../coreapi/linphonecore.c:3375
+#: ../coreapi/linphonecore.c:3395
 msgid "Modifying call parameters..."
 msgstr "מתאים כעת פרמטרים של שיחה..."
 
-#: ../coreapi/linphonecore.c:3723
+#: ../coreapi/linphonecore.c:3743
 msgid "Connected."
 msgstr "מקושר."
 
-#: ../coreapi/linphonecore.c:3748
+#: ../coreapi/linphonecore.c:3768
 msgid "Call aborted"
 msgstr "קריאה בוטלה"
 
-#: ../coreapi/linphonecore.c:3938
+#: ../coreapi/linphonecore.c:3958
 msgid "Could not pause the call"
 msgstr "לא ניתן להשהות את השיחה"
 
-#: ../coreapi/linphonecore.c:3941
+#: ../coreapi/linphonecore.c:3961
 msgid "Pausing the current call..."
 msgstr "משהה כעת שיחה נוכחית..."
 
-#: ../coreapi/misc.c:438
+#: ../coreapi/misc.c:433
 msgid "Stun lookup in progress..."
 msgstr "בדיקת STUN מצויה כעת בעיצומה..."
 
-#: ../coreapi/misc.c:619
+#: ../coreapi/misc.c:614
 msgid "ICE local candidates gathering in progress..."
 msgstr "צבירת מועמדים מקומיים של ICE מצויה כעת בעיצומה..."
 
@@ -1826,14 +1835,14 @@ msgstr ""
 msgid "Unknown status"
 msgstr ""
 
-#: ../coreapi/proxy.c:327
+#: ../coreapi/proxy.c:328
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
 msgstr ""
 "כתובת sip proxy שהזנת הינה שגויה, זו צריכה להתחיל עם‭\"sip:\" ‬ לאחר שם מארח."
 
-#: ../coreapi/proxy.c:333
+#: ../coreapi/proxy.c:334
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
@@ -1841,126 +1850,127 @@ msgstr ""
 "זהות sip שהוזנה הינה שגויה.\n"
 "זו צריכה להיראות כמו sip:username@proxydomain, למשל sip:alice@example.net"
 
-#: ../coreapi/proxy.c:1391
+#: ../coreapi/proxy.c:1403
 #, c-format
 msgid "Could not login as %s"
 msgstr "לא ניתן להתחבר בזהות %s"
 
-#: ../coreapi/callbacks.c:383
+#: ../coreapi/callbacks.c:404
 msgid "Remote ringing."
 msgstr "צלצול מרוחק."
 
-#: ../coreapi/callbacks.c:404
+#: ../coreapi/callbacks.c:425
 msgid "Remote ringing..."
 msgstr "צלצול מרוחק..."
 
-#: ../coreapi/callbacks.c:414
+#: ../coreapi/callbacks.c:442
 msgid "Early media."
 msgstr "מדיה מוקדמת."
 
-#: ../coreapi/callbacks.c:475
+#: ../coreapi/callbacks.c:503
 #, c-format
 msgid "Call with %s is paused."
 msgstr "שיחה עם %s מושהית."
 
-#: ../coreapi/callbacks.c:488
+#: ../coreapi/callbacks.c:516
 #, c-format
 msgid "Call answered by %s - on hold."
 msgstr "קריאה נענתה על ידי %s - בהמתנה."
 
-#: ../coreapi/callbacks.c:498
+#: ../coreapi/callbacks.c:526
 msgid "Call resumed."
 msgstr "קריאה חודשה."
 
-#: ../coreapi/callbacks.c:502
+#: ../coreapi/callbacks.c:530
 #, c-format
 msgid "Call answered by %s."
 msgstr "קריאה נענתה על ידי %s."
 
-#: ../coreapi/callbacks.c:525
+#: ../coreapi/callbacks.c:553
 msgid "Incompatible, check codecs or security settings..."
 msgstr "חוסר תאימות, בדוק קודקים או הגדרות אבטחה..."
 
-#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:829
+#: ../coreapi/callbacks.c:558 ../coreapi/callbacks.c:870
 msgid "Incompatible media parameters."
 msgstr "פרמטריי מדיה חסרי תואמים."
 
-#: ../coreapi/callbacks.c:560
+#: ../coreapi/callbacks.c:588
 msgid "We have been resumed."
 msgstr "חזרנו."
 
 #. we are being paused
-#: ../coreapi/callbacks.c:568
+#: ../coreapi/callbacks.c:596
 msgid "We are paused by other party."
 msgstr "אנו מושהים על ידי צד אחר."
 
 #. reINVITE and in-dialogs UPDATE go here
-#: ../coreapi/callbacks.c:602
+#: ../coreapi/callbacks.c:630
 msgid "Call is updated by remote."
 msgstr "שיחה עודכנה מרחוק."
 
-#: ../coreapi/callbacks.c:705
+#: ../coreapi/callbacks.c:746
 msgid "Call terminated."
 msgstr "קריאה הסתיימה."
 
-#: ../coreapi/callbacks.c:733
+#: ../coreapi/callbacks.c:774
 msgid "User is busy."
 msgstr "משתמש עסוק כעת."
 
-#: ../coreapi/callbacks.c:734
+#: ../coreapi/callbacks.c:775
 msgid "User is temporarily unavailable."
 msgstr "משתמש לא זמין זמנית."
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:736
+#: ../coreapi/callbacks.c:777
 msgid "User does not want to be disturbed."
 msgstr "משתמש לא מעוניין שיפריעו לו."
 
-#: ../coreapi/callbacks.c:737
+#: ../coreapi/callbacks.c:778
 msgid "Call declined."
 msgstr "קריאה סורבה."
 
-#: ../coreapi/callbacks.c:752
+#: ../coreapi/callbacks.c:793
 msgid "Request timeout."
 msgstr ""
 
-#: ../coreapi/callbacks.c:783
+#: ../coreapi/callbacks.c:824
 msgid "Redirected"
 msgstr "מכוון מחדש"
 
-#: ../coreapi/callbacks.c:838
+#: ../coreapi/callbacks.c:879
 msgid "Call failed."
 msgstr "קריאה נכשלה."
 
-#: ../coreapi/callbacks.c:916
+#: ../coreapi/callbacks.c:957
 #, c-format
 msgid "Registration on %s successful."
 msgstr "רישום אצל %s הושלם בהצלחה."
 
-#: ../coreapi/callbacks.c:917
+#: ../coreapi/callbacks.c:958
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "אי רישום אצל %s סוים."
 
-#: ../coreapi/callbacks.c:935
+#: ../coreapi/callbacks.c:976
 msgid "no response timeout"
 msgstr "אין היענות תוך זמן מוגדר"
 
-#: ../coreapi/callbacks.c:938
+#: ../coreapi/callbacks.c:979
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "רישום אצל %s נכשל: %s"
 
-#: ../coreapi/callbacks.c:945
+#: ../coreapi/callbacks.c:986
 msgid "Service unavailable, retrying"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:175
+#. if encryption is DTLS, no status to be displayed
+#: ../coreapi/linphonecall.c:180
 #, c-format
 msgid "Authentication token is %s"
 msgstr "אות האימות הינה %s"
 
-#: ../coreapi/linphonecall.c:3041
+#: ../coreapi/linphonecall.c:3492
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
diff --git a/po/hu.po b/po/hu.po
index e9b61953f..1ff87b778 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,9 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-13 16:18+0100\n"
-"PO-Revision-Date: 2015-01-06 11:29+0000\n"
-"Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
+"POT-Creation-Date: 2015-02-17 12:28+0100\n"
+"PO-Revision-Date: 2015-02-17 11:28+0000\n"
+"Last-Translator: Belledonne Communications <support@belledonne-"
+"communications.com>\n"
 "Language-Team: Hungarian (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/hu/)\n"
 "Language: hu\n"
@@ -136,7 +137,7 @@ msgstr ""
 msgid "Run self test and exit 0 if succeed"
 msgstr ""
 
-#: ../gtk/main.c:1083
+#: ../gtk/main.c:1088
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
@@ -149,66 +150,66 @@ msgstr ""
 "szeretné adni a partnerlistához?\n"
 "Ha nemmel válaszol, ez a személy átmenetileg tiltólistára kerül."
 
-#: ../gtk/main.c:1160
+#: ../gtk/main.c:1165
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
 msgstr ""
 
-#: ../gtk/main.c:1281
+#: ../gtk/main.c:1286
 msgid "Call error"
 msgstr "Hiba a hívás közben"
 
-#: ../gtk/main.c:1284 ../coreapi/linphonecore.c:3767
+#: ../gtk/main.c:1289 ../coreapi/linphonecore.c:3787
 msgid "Call ended"
 msgstr "Hívás vége"
 
-#: ../gtk/main.c:1287 ../coreapi/call_log.c:221
+#: ../gtk/main.c:1292 ../coreapi/call_log.c:221
 msgid "Incoming call"
 msgstr "Beérkező hívás"
 
-#: ../gtk/main.c:1289 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
+#: ../gtk/main.c:1294 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
 msgid "Answer"
 msgstr "Hívás fogadása"
 
-#: ../gtk/main.c:1291 ../gtk/main.ui.h:6
+#: ../gtk/main.c:1296 ../gtk/main.ui.h:6
 msgid "Decline"
 msgstr "Elutasítás"
 
-#: ../gtk/main.c:1297
+#: ../gtk/main.c:1302
 msgid "Call paused"
 msgstr "Hívás várakoztatva"
 
-#: ../gtk/main.c:1297
+#: ../gtk/main.c:1302
 #, c-format
 msgid "<b>by %s</b>"
 msgstr "<b>a következő által: %s</b>"
 
-#: ../gtk/main.c:1367
+#: ../gtk/main.c:1372
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr "%s szerené elidítani a videót. Elfogadja?"
 
-#: ../gtk/main.c:1529
+#: ../gtk/main.c:1534
 msgid "Website link"
 msgstr "Internetes oldal"
 
-#: ../gtk/main.c:1578
+#: ../gtk/main.c:1583
 msgid "Linphone - a video internet phone"
 msgstr "Linphone - internetes videó telefon"
 
-#: ../gtk/main.c:1670
+#: ../gtk/main.c:1675
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (Alapértelmezett)"
 
-#: ../gtk/main.c:2002 ../coreapi/callbacks.c:986
+#: ../gtk/main.c:2007 ../coreapi/callbacks.c:1027
 #, c-format
 msgid "We are transferred to %s"
 msgstr "Át vagyunk irányítva ide: %s"
 
-#: ../gtk/main.c:2012
+#: ../gtk/main.c:2017
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
@@ -216,7 +217,7 @@ msgstr ""
 "Hangkártya nincs érzékelve ezen a számítógépen.\n"
 "Nem fog tudni hang hívásokat küldeni vagy fogadni."
 
-#: ../gtk/main.c:2156
+#: ../gtk/main.c:2161
 msgid "A free SIP video-phone"
 msgstr "Egy ingyenes SIP video-telefon"
 
@@ -372,15 +373,19 @@ msgstr ""
 "Újra kell indítania a linphone-t, hogy az új nyelv kiválasztása érvényre "
 "jusson. "
 
-#: ../gtk/propertybox.c:1234
+#: ../gtk/propertybox.c:1236
 msgid "None"
 msgstr "Nincs"
 
-#: ../gtk/propertybox.c:1238
+#: ../gtk/propertybox.c:1240
 msgid "SRTP"
 msgstr "SRTP"
 
-#: ../gtk/propertybox.c:1244
+#: ../gtk/propertybox.c:1246
+msgid "DTLS"
+msgstr ""
+
+#: ../gtk/propertybox.c:1253
 msgid "ZRTP"
 msgstr "ZRTP"
 
@@ -557,7 +562,7 @@ msgstr "Érvényesítés (2/2 lépés)"
 msgid "Error"
 msgstr "Hiba"
 
-#: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:527
+#: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:534
 msgid "Terminating"
 msgstr "Befejezés"
 
@@ -650,7 +655,7 @@ msgstr "Befejezés"
 msgid "<b>Calling...</b>"
 msgstr "<b>Hívás folyamatban...</b>"
 
-#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:727
+#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:733
 msgid "00::00::00"
 msgstr "00::00::00"
 
@@ -687,55 +692,59 @@ msgid "Secured by SRTP"
 msgstr "SRTP-vel titkosítva"
 
 #: ../gtk/incall_view.c:685
+msgid "Secured by DTLS"
+msgstr ""
+
+#: ../gtk/incall_view.c:691
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
 msgstr "ZRTP-vel titkosítva - [hitelesítési jel: %s]"
 
-#: ../gtk/incall_view.c:691
+#: ../gtk/incall_view.c:697
 msgid "Set unverified"
 msgstr "Beállítás ellenőrizetlenként"
 
-#: ../gtk/incall_view.c:691 ../gtk/main.ui.h:4
+#: ../gtk/incall_view.c:697 ../gtk/main.ui.h:4
 msgid "Set verified"
 msgstr "Beállítás ellenőrzöttként"
 
-#: ../gtk/incall_view.c:722
+#: ../gtk/incall_view.c:728
 msgid "In conference"
 msgstr "Konferencián"
 
-#: ../gtk/incall_view.c:722
+#: ../gtk/incall_view.c:728
 msgid "<b>In call</b>"
 msgstr "<b>vonalban</b>"
 
-#: ../gtk/incall_view.c:758
+#: ../gtk/incall_view.c:764
 msgid "<b>Paused call</b>"
 msgstr "<b>Várakoztatott hívás</b>"
 
-#: ../gtk/incall_view.c:794
+#: ../gtk/incall_view.c:800
 msgid "<b>Call ended.</b>"
 msgstr "<b>Hívás vége.</b>"
 
-#: ../gtk/incall_view.c:825
+#: ../gtk/incall_view.c:831
 msgid "Transfer in progress"
 msgstr "Átvitel folyamatban"
 
-#: ../gtk/incall_view.c:828
+#: ../gtk/incall_view.c:834
 msgid "Transfer done."
 msgstr "Átvitel befejezve."
 
-#: ../gtk/incall_view.c:831
+#: ../gtk/incall_view.c:837
 msgid "Transfer failed."
 msgstr "Az átvitel sikertelen."
 
-#: ../gtk/incall_view.c:875
+#: ../gtk/incall_view.c:881
 msgid "Resume"
 msgstr "Visszatérés"
 
-#: ../gtk/incall_view.c:882 ../gtk/main.ui.h:9
+#: ../gtk/incall_view.c:888 ../gtk/main.ui.h:9
 msgid "Pause"
 msgstr "Várakoztatás"
 
-#: ../gtk/incall_view.c:948
+#: ../gtk/incall_view.c:954
 #, c-format
 msgid ""
 "<small><i>Recording into\n"
@@ -744,7 +753,7 @@ msgstr ""
 "<small><i>Felvétel a következőbe\n"
 "%s %s</i></small>"
 
-#: ../gtk/incall_view.c:948
+#: ../gtk/incall_view.c:954
 msgid "(Paused)"
 msgstr "(Várakoztatva)"
 
@@ -841,23 +850,23 @@ msgstr ""
 msgid "Let's start Linphone now"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:496
+#: ../gtk/audio_assistant.c:503
 msgid "Audio Assistant"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:506 ../gtk/main.ui.h:31
+#: ../gtk/audio_assistant.c:513 ../gtk/main.ui.h:31
 msgid "Audio assistant"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:511
+#: ../gtk/audio_assistant.c:518
 msgid "Mic Gain calibration"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:517
+#: ../gtk/audio_assistant.c:524
 msgid "Speaker volume calibration"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:522
+#: ../gtk/audio_assistant.c:529
 msgid "Record and Play"
 msgstr ""
 
@@ -1709,68 +1718,68 @@ msgstr ""
 msgid "Please wait while fetching configuration from server..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1510
+#: ../coreapi/linphonecore.c:1508
 msgid "Ready"
 msgstr "Kész"
 
-#: ../coreapi/linphonecore.c:2489
+#: ../coreapi/linphonecore.c:2495
 msgid "Configuring"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2654
+#: ../coreapi/linphonecore.c:2669
 msgid "Looking for telephone number destination..."
 msgstr "Telefonszám-cél keresése..."
 
-#: ../coreapi/linphonecore.c:2656
+#: ../coreapi/linphonecore.c:2671
 msgid "Could not resolve this number."
 msgstr "Nem sikkerült értelmezni a számot."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2942
+#: ../coreapi/linphonecore.c:2957
 msgid "Contacting"
 msgstr "Kapcsolódás"
 
-#: ../coreapi/linphonecore.c:2947
+#: ../coreapi/linphonecore.c:2962
 msgid "Could not call"
 msgstr "Nem sikerült hívni"
 
-#: ../coreapi/linphonecore.c:3097
+#: ../coreapi/linphonecore.c:3112
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "Elnézést, elértük a egyidejű hívások maximális számát"
 
-#: ../coreapi/linphonecore.c:3256
+#: ../coreapi/linphonecore.c:3270
 msgid "is contacting you"
 msgstr "kapcsolatba lépett veled."
 
-#: ../coreapi/linphonecore.c:3257
+#: ../coreapi/linphonecore.c:3271
 msgid " and asked autoanswer."
 msgstr "és automatikus választ kért."
 
-#: ../coreapi/linphonecore.c:3375
+#: ../coreapi/linphonecore.c:3395
 msgid "Modifying call parameters..."
 msgstr "A hívási jellemzők módosítása..."
 
-#: ../coreapi/linphonecore.c:3723
+#: ../coreapi/linphonecore.c:3743
 msgid "Connected."
 msgstr "Kapcsolódva."
 
-#: ../coreapi/linphonecore.c:3748
+#: ../coreapi/linphonecore.c:3768
 msgid "Call aborted"
 msgstr "Hívás megszakítva"
 
-#: ../coreapi/linphonecore.c:3938
+#: ../coreapi/linphonecore.c:3958
 msgid "Could not pause the call"
 msgstr "Nem sikerült várakoztatni a hívást"
 
-#: ../coreapi/linphonecore.c:3941
+#: ../coreapi/linphonecore.c:3961
 msgid "Pausing the current call..."
 msgstr "Jelenlegi hívás várakoztatásának aktiválása..."
 
-#: ../coreapi/misc.c:438
+#: ../coreapi/misc.c:433
 msgid "Stun lookup in progress..."
 msgstr "Stun keresés folyamatban..."
 
-#: ../coreapi/misc.c:619
+#: ../coreapi/misc.c:614
 msgid "ICE local candidates gathering in progress..."
 msgstr "ICE helyi jelentkezők begyűjtése folyamatban..."
 
@@ -1826,7 +1835,7 @@ msgstr ""
 msgid "Unknown status"
 msgstr ""
 
-#: ../coreapi/proxy.c:327
+#: ../coreapi/proxy.c:328
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
@@ -1834,7 +1843,7 @@ msgstr ""
 "Az Ön által megadott SIP proxy cím érvénytelen. \"sip:\"-tal kell kezdődnie, "
 "ezt egy hosztnév követi."
 
-#: ../coreapi/proxy.c:333
+#: ../coreapi/proxy.c:334
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
@@ -1843,127 +1852,128 @@ msgstr ""
 "Így kéne kinéznie: sip:felhasznalonev@proxytartomany, például sip:"
 "aladar@pelda.hu"
 
-#: ../coreapi/proxy.c:1391
+#: ../coreapi/proxy.c:1403
 #, c-format
 msgid "Could not login as %s"
 msgstr "Nem sikerült belépni ezzel: %s"
 
-#: ../coreapi/callbacks.c:383
+#: ../coreapi/callbacks.c:404
 msgid "Remote ringing."
 msgstr "Távoli csengés."
 
-#: ../coreapi/callbacks.c:404
+#: ../coreapi/callbacks.c:425
 msgid "Remote ringing..."
 msgstr "Távoli csengés..."
 
-#: ../coreapi/callbacks.c:414
+#: ../coreapi/callbacks.c:442
 msgid "Early media."
 msgstr "Korai médiák."
 
-#: ../coreapi/callbacks.c:475
+#: ../coreapi/callbacks.c:503
 #, c-format
 msgid "Call with %s is paused."
 msgstr "A hívás a következővel: %s várakoztatva"
 
-#: ../coreapi/callbacks.c:488
+#: ../coreapi/callbacks.c:516
 #, c-format
 msgid "Call answered by %s - on hold."
 msgstr "%s fogadta a hívást - várakoztatva."
 
-#: ../coreapi/callbacks.c:498
+#: ../coreapi/callbacks.c:526
 msgid "Call resumed."
 msgstr "Hívás visszatért"
 
-#: ../coreapi/callbacks.c:502
+#: ../coreapi/callbacks.c:530
 #, c-format
 msgid "Call answered by %s."
 msgstr "%s válaszolt a hívásra."
 
-#: ../coreapi/callbacks.c:525
+#: ../coreapi/callbacks.c:553
 msgid "Incompatible, check codecs or security settings..."
 msgstr ""
 "Nem kompatibilis, ellenőrizze a kódek- vagy a biztonsági beállításokat..."
 
-#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:829
+#: ../coreapi/callbacks.c:558 ../coreapi/callbacks.c:870
 msgid "Incompatible media parameters."
 msgstr "Nem kompatibilis médiajellemzők."
 
-#: ../coreapi/callbacks.c:560
+#: ../coreapi/callbacks.c:588
 msgid "We have been resumed."
 msgstr "Visszatértünk."
 
 #. we are being paused
-#: ../coreapi/callbacks.c:568
+#: ../coreapi/callbacks.c:596
 msgid "We are paused by other party."
 msgstr "Megállítva a másik fél által."
 
 #. reINVITE and in-dialogs UPDATE go here
-#: ../coreapi/callbacks.c:602
+#: ../coreapi/callbacks.c:630
 msgid "Call is updated by remote."
 msgstr "A hívás távolról frissítve."
 
-#: ../coreapi/callbacks.c:705
+#: ../coreapi/callbacks.c:746
 msgid "Call terminated."
 msgstr "A hívás befejezve."
 
-#: ../coreapi/callbacks.c:733
+#: ../coreapi/callbacks.c:774
 msgid "User is busy."
 msgstr "A felhasználó foglalt."
 
-#: ../coreapi/callbacks.c:734
+#: ../coreapi/callbacks.c:775
 msgid "User is temporarily unavailable."
 msgstr "A felhasználó ideiglenesen nem elérhető"
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:736
+#: ../coreapi/callbacks.c:777
 msgid "User does not want to be disturbed."
 msgstr "A felhasználó nem akarja, hogy zavarják."
 
-#: ../coreapi/callbacks.c:737
+#: ../coreapi/callbacks.c:778
 msgid "Call declined."
 msgstr "Hívás elutasítva"
 
-#: ../coreapi/callbacks.c:752
+#: ../coreapi/callbacks.c:793
 msgid "Request timeout."
 msgstr ""
 
-#: ../coreapi/callbacks.c:783
+#: ../coreapi/callbacks.c:824
 msgid "Redirected"
 msgstr "Átirányítva"
 
-#: ../coreapi/callbacks.c:838
+#: ../coreapi/callbacks.c:879
 msgid "Call failed."
 msgstr "Nem sikerült a hívás."
 
-#: ../coreapi/callbacks.c:916
+#: ../coreapi/callbacks.c:957
 #, c-format
 msgid "Registration on %s successful."
 msgstr "A regisztáció a %s -n sikerült."
 
-#: ../coreapi/callbacks.c:917
+#: ../coreapi/callbacks.c:958
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "A kiregisztrálás kész a következőn: %s ."
 
-#: ../coreapi/callbacks.c:935
+#: ../coreapi/callbacks.c:976
 msgid "no response timeout"
 msgstr "időtúllépés után nincs válasz"
 
-#: ../coreapi/callbacks.c:938
+#: ../coreapi/callbacks.c:979
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "A regisztáció a %s -n nem sikerült: %s"
 
-#: ../coreapi/callbacks.c:945
+#: ../coreapi/callbacks.c:986
 msgid "Service unavailable, retrying"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:175
+#. if encryption is DTLS, no status to be displayed
+#: ../coreapi/linphonecall.c:180
 #, c-format
 msgid "Authentication token is %s"
 msgstr "Hitelesítési jel: %s"
 
-#: ../coreapi/linphonecall.c:3041
+#: ../coreapi/linphonecall.c:3492
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
diff --git a/po/it.po b/po/it.po
index 111737c48..7561f7f0d 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,9 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-13 16:18+0100\n"
-"PO-Revision-Date: 2015-01-06 11:29+0000\n"
-"Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
+"POT-Creation-Date: 2015-02-17 12:28+0100\n"
+"PO-Revision-Date: 2015-02-17 11:28+0000\n"
+"Last-Translator: Belledonne Communications <support@belledonne-"
+"communications.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/it/)\n"
 "Language: it\n"
@@ -134,7 +135,7 @@ msgstr ""
 msgid "Run self test and exit 0 if succeed"
 msgstr ""
 
-#: ../gtk/main.c:1083
+#: ../gtk/main.c:1088
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
@@ -146,72 +147,72 @@ msgstr ""
 "veda il tuo stato o aggiungerlo alla tua lista dei contatti Se rispondi no "
 "questo utente sarà momentaneamente bloccato."
 
-#: ../gtk/main.c:1160
+#: ../gtk/main.c:1165
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
 msgstr ""
 
-#: ../gtk/main.c:1281
+#: ../gtk/main.c:1286
 msgid "Call error"
 msgstr ""
 
-#: ../gtk/main.c:1284 ../coreapi/linphonecore.c:3767
+#: ../gtk/main.c:1289 ../coreapi/linphonecore.c:3787
 msgid "Call ended"
 msgstr "Chiamata terminata"
 
-#: ../gtk/main.c:1287 ../coreapi/call_log.c:221
+#: ../gtk/main.c:1292 ../coreapi/call_log.c:221
 msgid "Incoming call"
 msgstr "Chimata in entrata"
 
-#: ../gtk/main.c:1289 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
+#: ../gtk/main.c:1294 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
 msgid "Answer"
 msgstr ""
 
-#: ../gtk/main.c:1291 ../gtk/main.ui.h:6
+#: ../gtk/main.c:1296 ../gtk/main.ui.h:6
 msgid "Decline"
 msgstr "Rifiuta"
 
-#: ../gtk/main.c:1297
+#: ../gtk/main.c:1302
 msgid "Call paused"
 msgstr ""
 
-#: ../gtk/main.c:1297
+#: ../gtk/main.c:1302
 #, c-format
 msgid "<b>by %s</b>"
 msgstr ""
 
-#: ../gtk/main.c:1367
+#: ../gtk/main.c:1372
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr ""
 
-#: ../gtk/main.c:1529
+#: ../gtk/main.c:1534
 msgid "Website link"
 msgstr ""
 
-#: ../gtk/main.c:1578
+#: ../gtk/main.c:1583
 msgid "Linphone - a video internet phone"
 msgstr ""
 
-#: ../gtk/main.c:1670
+#: ../gtk/main.c:1675
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (Default)"
 
-#: ../gtk/main.c:2002 ../coreapi/callbacks.c:986
+#: ../gtk/main.c:2007 ../coreapi/callbacks.c:1027
 #, c-format
 msgid "We are transferred to %s"
 msgstr ""
 
-#: ../gtk/main.c:2012
+#: ../gtk/main.c:2017
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
 msgstr ""
 
-#: ../gtk/main.c:2156
+#: ../gtk/main.c:2161
 msgid "A free SIP video-phone"
 msgstr ""
 
@@ -365,15 +366,19 @@ msgid ""
 "You need to restart linphone for the new language selection to take effect."
 msgstr "Riavviare il software per utilizzare la nuova lingua selezionata"
 
-#: ../gtk/propertybox.c:1234
+#: ../gtk/propertybox.c:1236
 msgid "None"
 msgstr ""
 
-#: ../gtk/propertybox.c:1238
+#: ../gtk/propertybox.c:1240
 msgid "SRTP"
 msgstr ""
 
-#: ../gtk/propertybox.c:1244
+#: ../gtk/propertybox.c:1246
+msgid "DTLS"
+msgstr ""
+
+#: ../gtk/propertybox.c:1253
 msgid "ZRTP"
 msgstr ""
 
@@ -544,7 +549,7 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:527
+#: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:534
 msgid "Terminating"
 msgstr ""
 
@@ -635,7 +640,7 @@ msgstr ""
 msgid "<b>Calling...</b>"
 msgstr ""
 
-#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:727
+#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:733
 msgid "00::00::00"
 msgstr ""
 
@@ -672,62 +677,66 @@ msgid "Secured by SRTP"
 msgstr ""
 
 #: ../gtk/incall_view.c:685
+msgid "Secured by DTLS"
+msgstr ""
+
+#: ../gtk/incall_view.c:691
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
 msgstr ""
 
-#: ../gtk/incall_view.c:691
+#: ../gtk/incall_view.c:697
 msgid "Set unverified"
 msgstr ""
 
-#: ../gtk/incall_view.c:691 ../gtk/main.ui.h:4
+#: ../gtk/incall_view.c:697 ../gtk/main.ui.h:4
 msgid "Set verified"
 msgstr ""
 
-#: ../gtk/incall_view.c:722
+#: ../gtk/incall_view.c:728
 msgid "In conference"
 msgstr ""
 
-#: ../gtk/incall_view.c:722
+#: ../gtk/incall_view.c:728
 msgid "<b>In call</b>"
 msgstr ""
 
-#: ../gtk/incall_view.c:758
+#: ../gtk/incall_view.c:764
 msgid "<b>Paused call</b>"
 msgstr ""
 
-#: ../gtk/incall_view.c:794
+#: ../gtk/incall_view.c:800
 msgid "<b>Call ended.</b>"
 msgstr "<b>Chiamata terminata.</b>"
 
-#: ../gtk/incall_view.c:825
+#: ../gtk/incall_view.c:831
 msgid "Transfer in progress"
 msgstr ""
 
-#: ../gtk/incall_view.c:828
+#: ../gtk/incall_view.c:834
 msgid "Transfer done."
 msgstr ""
 
-#: ../gtk/incall_view.c:831
+#: ../gtk/incall_view.c:837
 msgid "Transfer failed."
 msgstr ""
 
-#: ../gtk/incall_view.c:875
+#: ../gtk/incall_view.c:881
 msgid "Resume"
 msgstr ""
 
-#: ../gtk/incall_view.c:882 ../gtk/main.ui.h:9
+#: ../gtk/incall_view.c:888 ../gtk/main.ui.h:9
 msgid "Pause"
 msgstr ""
 
-#: ../gtk/incall_view.c:948
+#: ../gtk/incall_view.c:954
 #, c-format
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
 msgstr ""
 
-#: ../gtk/incall_view.c:948
+#: ../gtk/incall_view.c:954
 msgid "(Paused)"
 msgstr ""
 
@@ -824,23 +833,23 @@ msgstr ""
 msgid "Let's start Linphone now"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:496
+#: ../gtk/audio_assistant.c:503
 msgid "Audio Assistant"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:506 ../gtk/main.ui.h:31
+#: ../gtk/audio_assistant.c:513 ../gtk/main.ui.h:31
 msgid "Audio assistant"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:511
+#: ../gtk/audio_assistant.c:518
 msgid "Mic Gain calibration"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:517
+#: ../gtk/audio_assistant.c:524
 msgid "Speaker volume calibration"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:522
+#: ../gtk/audio_assistant.c:529
 msgid "Record and Play"
 msgstr ""
 
@@ -1689,68 +1698,68 @@ msgstr ""
 msgid "Please wait while fetching configuration from server..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1510
+#: ../coreapi/linphonecore.c:1508
 msgid "Ready"
 msgstr "Pronto"
 
-#: ../coreapi/linphonecore.c:2489
+#: ../coreapi/linphonecore.c:2495
 msgid "Configuring"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2654
+#: ../coreapi/linphonecore.c:2669
 msgid "Looking for telephone number destination..."
 msgstr "Ricerca numero destinazione..."
 
-#: ../coreapi/linphonecore.c:2656
+#: ../coreapi/linphonecore.c:2671
 msgid "Could not resolve this number."
 msgstr "Impossibile risolvere il numero."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2942
+#: ../coreapi/linphonecore.c:2957
 msgid "Contacting"
 msgstr "In connessione"
 
-#: ../coreapi/linphonecore.c:2947
+#: ../coreapi/linphonecore.c:2962
 msgid "Could not call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3097
+#: ../coreapi/linphonecore.c:3112
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3256
+#: ../coreapi/linphonecore.c:3270
 msgid "is contacting you"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3257
+#: ../coreapi/linphonecore.c:3271
 msgid " and asked autoanswer."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3375
+#: ../coreapi/linphonecore.c:3395
 msgid "Modifying call parameters..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3723
+#: ../coreapi/linphonecore.c:3743
 msgid "Connected."
 msgstr "Connessione"
 
-#: ../coreapi/linphonecore.c:3748
+#: ../coreapi/linphonecore.c:3768
 msgid "Call aborted"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3938
+#: ../coreapi/linphonecore.c:3958
 msgid "Could not pause the call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3941
+#: ../coreapi/linphonecore.c:3961
 msgid "Pausing the current call..."
 msgstr ""
 
-#: ../coreapi/misc.c:438
+#: ../coreapi/misc.c:433
 msgid "Stun lookup in progress..."
 msgstr "Ricerca Stun in progresso ..."
 
-#: ../coreapi/misc.c:619
+#: ../coreapi/misc.c:614
 msgid "ICE local candidates gathering in progress..."
 msgstr ""
 
@@ -1806,7 +1815,7 @@ msgstr ""
 msgid "Unknown status"
 msgstr ""
 
-#: ../coreapi/proxy.c:327
+#: ../coreapi/proxy.c:328
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
@@ -1814,7 +1823,7 @@ msgstr ""
 "L'indirizzo sip proxy utilizzato è invalido, deve iniziare con  \"sip:\" "
 "seguito dall' hostaname."
 
-#: ../coreapi/proxy.c:333
+#: ../coreapi/proxy.c:334
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
@@ -1822,126 +1831,127 @@ msgstr ""
 "L'identità sip utilizza è invalida.\n"
 "Dovrebbre essere sip:username@proxydomain, esempio: sip:alice@example.net"
 
-#: ../coreapi/proxy.c:1391
+#: ../coreapi/proxy.c:1403
 #, c-format
 msgid "Could not login as %s"
 msgstr "impossibile login come %s"
 
-#: ../coreapi/callbacks.c:383
+#: ../coreapi/callbacks.c:404
 msgid "Remote ringing."
 msgstr ""
 
-#: ../coreapi/callbacks.c:404
+#: ../coreapi/callbacks.c:425
 msgid "Remote ringing..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:414
+#: ../coreapi/callbacks.c:442
 msgid "Early media."
 msgstr ""
 
-#: ../coreapi/callbacks.c:475
+#: ../coreapi/callbacks.c:503
 #, c-format
 msgid "Call with %s is paused."
 msgstr ""
 
-#: ../coreapi/callbacks.c:488
+#: ../coreapi/callbacks.c:516
 #, c-format
 msgid "Call answered by %s - on hold."
 msgstr ""
 
-#: ../coreapi/callbacks.c:498
+#: ../coreapi/callbacks.c:526
 msgid "Call resumed."
 msgstr ""
 
-#: ../coreapi/callbacks.c:502
+#: ../coreapi/callbacks.c:530
 #, c-format
 msgid "Call answered by %s."
 msgstr ""
 
-#: ../coreapi/callbacks.c:525
+#: ../coreapi/callbacks.c:553
 msgid "Incompatible, check codecs or security settings..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:829
+#: ../coreapi/callbacks.c:558 ../coreapi/callbacks.c:870
 msgid "Incompatible media parameters."
 msgstr ""
 
-#: ../coreapi/callbacks.c:560
+#: ../coreapi/callbacks.c:588
 msgid "We have been resumed."
 msgstr ""
 
 #. we are being paused
-#: ../coreapi/callbacks.c:568
+#: ../coreapi/callbacks.c:596
 msgid "We are paused by other party."
 msgstr ""
 
 #. reINVITE and in-dialogs UPDATE go here
-#: ../coreapi/callbacks.c:602
+#: ../coreapi/callbacks.c:630
 msgid "Call is updated by remote."
 msgstr ""
 
-#: ../coreapi/callbacks.c:705
+#: ../coreapi/callbacks.c:746
 msgid "Call terminated."
 msgstr "Chiamata terminata."
 
-#: ../coreapi/callbacks.c:733
+#: ../coreapi/callbacks.c:774
 msgid "User is busy."
 msgstr "Utente occupato"
 
-#: ../coreapi/callbacks.c:734
+#: ../coreapi/callbacks.c:775
 msgid "User is temporarily unavailable."
 msgstr "Utente non disponibile"
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:736
+#: ../coreapi/callbacks.c:777
 msgid "User does not want to be disturbed."
 msgstr "L'utente non vuole essere disturbato"
 
-#: ../coreapi/callbacks.c:737
+#: ../coreapi/callbacks.c:778
 msgid "Call declined."
 msgstr "Chiamata rifiutata"
 
-#: ../coreapi/callbacks.c:752
+#: ../coreapi/callbacks.c:793
 msgid "Request timeout."
 msgstr ""
 
-#: ../coreapi/callbacks.c:783
+#: ../coreapi/callbacks.c:824
 msgid "Redirected"
 msgstr ""
 
-#: ../coreapi/callbacks.c:838
+#: ../coreapi/callbacks.c:879
 msgid "Call failed."
 msgstr ""
 
-#: ../coreapi/callbacks.c:916
+#: ../coreapi/callbacks.c:957
 #, c-format
 msgid "Registration on %s successful."
 msgstr "Registrazione su %s attiva"
 
-#: ../coreapi/callbacks.c:917
+#: ../coreapi/callbacks.c:958
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "Unregistrazione su %s"
 
-#: ../coreapi/callbacks.c:935
+#: ../coreapi/callbacks.c:976
 msgid "no response timeout"
 msgstr "timeout no risposta"
 
-#: ../coreapi/callbacks.c:938
+#: ../coreapi/callbacks.c:979
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "Registrazione su %s fallita: %s"
 
-#: ../coreapi/callbacks.c:945
+#: ../coreapi/callbacks.c:986
 msgid "Service unavailable, retrying"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:175
+#. if encryption is DTLS, no status to be displayed
+#: ../coreapi/linphonecall.c:180
 #, c-format
 msgid "Authentication token is %s"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:3041
+#: ../coreapi/linphonecall.c:3492
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
diff --git a/po/ja.po b/po/ja.po
index e998ee25c..e4420706b 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,9 +9,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-13 16:18+0100\n"
-"PO-Revision-Date: 2015-01-13 16:34+0000\n"
-"Last-Translator: Alexander\n"
+"POT-Creation-Date: 2015-02-17 12:28+0100\n"
+"PO-Revision-Date: 2015-02-17 11:28+0000\n"
+"Last-Translator: Belledonne Communications <support@belledonne-"
+"communications.com>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/ja/)\n"
 "Language: ja\n"
@@ -138,7 +139,7 @@ msgstr "オーディオアシスタントを実行"
 msgid "Run self test and exit 0 if succeed"
 msgstr ""
 
-#: ../gtk/main.c:1083
+#: ../gtk/main.c:1088
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
@@ -151,72 +152,72 @@ msgstr ""
 "す。\n"
 "あなたが拒否すると、この人は一時的にブラックリストへ登録されます。"
 
-#: ../gtk/main.c:1160
+#: ../gtk/main.c:1165
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
 msgstr ""
 
-#: ../gtk/main.c:1281
+#: ../gtk/main.c:1286
 msgid "Call error"
 msgstr "呼出エラー"
 
-#: ../gtk/main.c:1284 ../coreapi/linphonecore.c:3767
+#: ../gtk/main.c:1289 ../coreapi/linphonecore.c:3787
 msgid "Call ended"
 msgstr "呼出終了"
 
-#: ../gtk/main.c:1287 ../coreapi/call_log.c:221
+#: ../gtk/main.c:1292 ../coreapi/call_log.c:221
 msgid "Incoming call"
 msgstr "着信"
 
-#: ../gtk/main.c:1289 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
+#: ../gtk/main.c:1294 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
 msgid "Answer"
 msgstr "応答"
 
-#: ../gtk/main.c:1291 ../gtk/main.ui.h:6
+#: ../gtk/main.c:1296 ../gtk/main.ui.h:6
 msgid "Decline"
 msgstr "拒否"
 
-#: ../gtk/main.c:1297
+#: ../gtk/main.c:1302
 msgid "Call paused"
 msgstr "呼び出しの一時停止"
 
-#: ../gtk/main.c:1297
+#: ../gtk/main.c:1302
 #, c-format
 msgid "<b>by %s</b>"
 msgstr "<b>%s</b>"
 
-#: ../gtk/main.c:1367
+#: ../gtk/main.c:1372
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr ""
 
-#: ../gtk/main.c:1529
+#: ../gtk/main.c:1534
 msgid "Website link"
 msgstr "ウェブサイトリンク"
 
-#: ../gtk/main.c:1578
+#: ../gtk/main.c:1583
 msgid "Linphone - a video internet phone"
 msgstr "Linphone - ビデオインターネット電話"
 
-#: ../gtk/main.c:1670
+#: ../gtk/main.c:1675
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (デフォルト)"
 
-#: ../gtk/main.c:2002 ../coreapi/callbacks.c:986
+#: ../gtk/main.c:2007 ../coreapi/callbacks.c:1027
 #, c-format
 msgid "We are transferred to %s"
 msgstr "%s に転送しました"
 
-#: ../gtk/main.c:2012
+#: ../gtk/main.c:2017
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
 msgstr ""
 
-#: ../gtk/main.c:2156
+#: ../gtk/main.c:2161
 msgid "A free SIP video-phone"
 msgstr "無料 SIP ビデオ-電話"
 
@@ -370,15 +371,19 @@ msgid ""
 "You need to restart linphone for the new language selection to take effect."
 msgstr "言語の選択を有効にするには、 Linphoneを再起動する必要があります。"
 
-#: ../gtk/propertybox.c:1234
+#: ../gtk/propertybox.c:1236
 msgid "None"
 msgstr "なし"
 
-#: ../gtk/propertybox.c:1238
+#: ../gtk/propertybox.c:1240
 msgid "SRTP"
 msgstr "SRTP"
 
-#: ../gtk/propertybox.c:1244
+#: ../gtk/propertybox.c:1246
+msgid "DTLS"
+msgstr ""
+
+#: ../gtk/propertybox.c:1253
 msgid "ZRTP"
 msgstr "ZRTP"
 
@@ -426,6 +431,8 @@ msgid ""
 "Welcome!\n"
 "This assistant will help you to use a SIP account for your calls."
 msgstr ""
+"ようこそ！\n"
+"あなたの通話のためのSIPアカウント設定をお手伝いします。"
 
 #: ../gtk/setupwizard.c:43
 msgid "Create an account on linphone.org"
@@ -552,7 +559,7 @@ msgstr "検証します (2/2)"
 msgid "Error"
 msgstr "エラー"
 
-#: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:527
+#: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:534
 msgid "Terminating"
 msgstr "終了"
 
@@ -645,7 +652,7 @@ msgstr ""
 msgid "<b>Calling...</b>"
 msgstr "<b>かけています…</b>"
 
-#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:727
+#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:733
 msgid "00::00::00"
 msgstr "00::00::00"
 
@@ -682,62 +689,66 @@ msgid "Secured by SRTP"
 msgstr "SRTPのセキュリティ"
 
 #: ../gtk/incall_view.c:685
+msgid "Secured by DTLS"
+msgstr ""
+
+#: ../gtk/incall_view.c:691
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
 msgstr "ZRTP によるセキュリティ - [auth token: %s]"
 
-#: ../gtk/incall_view.c:691
+#: ../gtk/incall_view.c:697
 msgid "Set unverified"
 msgstr "セット未検証"
 
-#: ../gtk/incall_view.c:691 ../gtk/main.ui.h:4
+#: ../gtk/incall_view.c:697 ../gtk/main.ui.h:4
 msgid "Set verified"
 msgstr "セット検証済"
 
-#: ../gtk/incall_view.c:722
+#: ../gtk/incall_view.c:728
 msgid "In conference"
 msgstr "会議で"
 
-#: ../gtk/incall_view.c:722
+#: ../gtk/incall_view.c:728
 msgid "<b>In call</b>"
 msgstr "<b>呼び出し中</b>"
 
-#: ../gtk/incall_view.c:758
+#: ../gtk/incall_view.c:764
 msgid "<b>Paused call</b>"
 msgstr "<b>呼び出し停止</b>"
 
-#: ../gtk/incall_view.c:794
+#: ../gtk/incall_view.c:800
 msgid "<b>Call ended.</b>"
 msgstr "<b>呼び出し終了</b>"
 
-#: ../gtk/incall_view.c:825
+#: ../gtk/incall_view.c:831
 msgid "Transfer in progress"
 msgstr "進行中の転送"
 
-#: ../gtk/incall_view.c:828
+#: ../gtk/incall_view.c:834
 msgid "Transfer done."
 msgstr "転送完了。"
 
-#: ../gtk/incall_view.c:831
+#: ../gtk/incall_view.c:837
 msgid "Transfer failed."
 msgstr "転送失敗。"
 
-#: ../gtk/incall_view.c:875
+#: ../gtk/incall_view.c:881
 msgid "Resume"
 msgstr "レジューム"
 
-#: ../gtk/incall_view.c:882 ../gtk/main.ui.h:9
+#: ../gtk/incall_view.c:888 ../gtk/main.ui.h:9
 msgid "Pause"
 msgstr "一時停止"
 
-#: ../gtk/incall_view.c:948
+#: ../gtk/incall_view.c:954
 #, c-format
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
 msgstr ""
 
-#: ../gtk/incall_view.c:948
+#: ../gtk/incall_view.c:954
 msgid "(Paused)"
 msgstr "(停止中)"
 
@@ -834,23 +845,23 @@ msgstr "再生"
 msgid "Let's start Linphone now"
 msgstr "Linphoneをはじめる"
 
-#: ../gtk/audio_assistant.c:496
+#: ../gtk/audio_assistant.c:503
 msgid "Audio Assistant"
 msgstr "音声アシスタント"
 
-#: ../gtk/audio_assistant.c:506 ../gtk/main.ui.h:31
+#: ../gtk/audio_assistant.c:513 ../gtk/main.ui.h:31
 msgid "Audio assistant"
 msgstr "音声アシスタント"
 
-#: ../gtk/audio_assistant.c:511
+#: ../gtk/audio_assistant.c:518
 msgid "Mic Gain calibration"
 msgstr "マイクのゲイン測定"
 
-#: ../gtk/audio_assistant.c:517
+#: ../gtk/audio_assistant.c:524
 msgid "Speaker volume calibration"
 msgstr "スピーカーの音量測定"
 
-#: ../gtk/audio_assistant.c:522
+#: ../gtk/audio_assistant.c:529
 msgid "Record and Play"
 msgstr "録音して再生"
 
@@ -1712,68 +1723,68 @@ msgstr ""
 msgid "Please wait while fetching configuration from server..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1510
+#: ../coreapi/linphonecore.c:1508
 msgid "Ready"
 msgstr "準備"
 
-#: ../coreapi/linphonecore.c:2489
+#: ../coreapi/linphonecore.c:2495
 msgid "Configuring"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2654
+#: ../coreapi/linphonecore.c:2669
 msgid "Looking for telephone number destination..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2656
+#: ../coreapi/linphonecore.c:2671
 msgid "Could not resolve this number."
 msgstr ""
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2942
+#: ../coreapi/linphonecore.c:2957
 msgid "Contacting"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2947
+#: ../coreapi/linphonecore.c:2962
 msgid "Could not call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3097
+#: ../coreapi/linphonecore.c:3112
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3256
+#: ../coreapi/linphonecore.c:3270
 msgid "is contacting you"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3257
+#: ../coreapi/linphonecore.c:3271
 msgid " and asked autoanswer."
 msgstr "と自動応答を尋ねる"
 
-#: ../coreapi/linphonecore.c:3375
+#: ../coreapi/linphonecore.c:3395
 msgid "Modifying call parameters..."
 msgstr "コールパラメーターの変更..."
 
-#: ../coreapi/linphonecore.c:3723
+#: ../coreapi/linphonecore.c:3743
 msgid "Connected."
 msgstr "接続しました。"
 
-#: ../coreapi/linphonecore.c:3748
+#: ../coreapi/linphonecore.c:3768
 msgid "Call aborted"
 msgstr "呼び出しを打ち切る"
 
-#: ../coreapi/linphonecore.c:3938
+#: ../coreapi/linphonecore.c:3958
 msgid "Could not pause the call"
 msgstr "呼び出しを一時停止できませんでした"
 
-#: ../coreapi/linphonecore.c:3941
+#: ../coreapi/linphonecore.c:3961
 msgid "Pausing the current call..."
 msgstr "現在の通話を一時停止..."
 
-#: ../coreapi/misc.c:438
+#: ../coreapi/misc.c:433
 msgid "Stun lookup in progress..."
 msgstr "Stunによるルックアップの進行中…"
 
-#: ../coreapi/misc.c:619
+#: ../coreapi/misc.c:614
 msgid "ICE local candidates gathering in progress..."
 msgstr ""
 
@@ -1829,138 +1840,139 @@ msgstr "休暇中"
 msgid "Unknown status"
 msgstr "不明なステータス"
 
-#: ../coreapi/proxy.c:327
+#: ../coreapi/proxy.c:328
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
 msgstr ""
 
-#: ../coreapi/proxy.c:333
+#: ../coreapi/proxy.c:334
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
 msgstr ""
 
-#: ../coreapi/proxy.c:1391
+#: ../coreapi/proxy.c:1403
 #, c-format
 msgid "Could not login as %s"
 msgstr ""
 
-#: ../coreapi/callbacks.c:383
+#: ../coreapi/callbacks.c:404
 msgid "Remote ringing."
 msgstr ""
 
-#: ../coreapi/callbacks.c:404
+#: ../coreapi/callbacks.c:425
 msgid "Remote ringing..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:414
+#: ../coreapi/callbacks.c:442
 msgid "Early media."
 msgstr "Early media."
 
-#: ../coreapi/callbacks.c:475
+#: ../coreapi/callbacks.c:503
 #, c-format
 msgid "Call with %s is paused."
 msgstr ""
 
-#: ../coreapi/callbacks.c:488
+#: ../coreapi/callbacks.c:516
 #, c-format
 msgid "Call answered by %s - on hold."
 msgstr ""
 
-#: ../coreapi/callbacks.c:498
+#: ../coreapi/callbacks.c:526
 msgid "Call resumed."
 msgstr ""
 
-#: ../coreapi/callbacks.c:502
+#: ../coreapi/callbacks.c:530
 #, c-format
 msgid "Call answered by %s."
 msgstr ""
 
-#: ../coreapi/callbacks.c:525
+#: ../coreapi/callbacks.c:553
 msgid "Incompatible, check codecs or security settings..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:829
+#: ../coreapi/callbacks.c:558 ../coreapi/callbacks.c:870
 msgid "Incompatible media parameters."
 msgstr ""
 
-#: ../coreapi/callbacks.c:560
+#: ../coreapi/callbacks.c:588
 msgid "We have been resumed."
 msgstr ""
 
 #. we are being paused
-#: ../coreapi/callbacks.c:568
+#: ../coreapi/callbacks.c:596
 msgid "We are paused by other party."
 msgstr ""
 
 #. reINVITE and in-dialogs UPDATE go here
-#: ../coreapi/callbacks.c:602
+#: ../coreapi/callbacks.c:630
 msgid "Call is updated by remote."
 msgstr ""
 
-#: ../coreapi/callbacks.c:705
+#: ../coreapi/callbacks.c:746
 msgid "Call terminated."
 msgstr "呼び出し終了。"
 
-#: ../coreapi/callbacks.c:733
+#: ../coreapi/callbacks.c:774
 msgid "User is busy."
 msgstr "相手はビジーです。"
 
-#: ../coreapi/callbacks.c:734
+#: ../coreapi/callbacks.c:775
 msgid "User is temporarily unavailable."
 msgstr "相手は、今出られません。"
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:736
+#: ../coreapi/callbacks.c:777
 msgid "User does not want to be disturbed."
 msgstr "相手は手が離せないようです。"
 
-#: ../coreapi/callbacks.c:737
+#: ../coreapi/callbacks.c:778
 msgid "Call declined."
 msgstr "通話は拒否されました。"
 
-#: ../coreapi/callbacks.c:752
+#: ../coreapi/callbacks.c:793
 msgid "Request timeout."
 msgstr "リクエストは時間切れです。"
 
-#: ../coreapi/callbacks.c:783
+#: ../coreapi/callbacks.c:824
 msgid "Redirected"
 msgstr ""
 
-#: ../coreapi/callbacks.c:838
+#: ../coreapi/callbacks.c:879
 msgid "Call failed."
 msgstr ""
 
-#: ../coreapi/callbacks.c:916
+#: ../coreapi/callbacks.c:957
 #, c-format
 msgid "Registration on %s successful."
 msgstr ""
 
-#: ../coreapi/callbacks.c:917
+#: ../coreapi/callbacks.c:958
 #, c-format
 msgid "Unregistration on %s done."
 msgstr ""
 
-#: ../coreapi/callbacks.c:935
+#: ../coreapi/callbacks.c:976
 msgid "no response timeout"
 msgstr ""
 
-#: ../coreapi/callbacks.c:938
+#: ../coreapi/callbacks.c:979
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr ""
 
-#: ../coreapi/callbacks.c:945
+#: ../coreapi/callbacks.c:986
 msgid "Service unavailable, retrying"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:175
+#. if encryption is DTLS, no status to be displayed
+#: ../coreapi/linphonecall.c:180
 #, c-format
 msgid "Authentication token is %s"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:3041
+#: ../coreapi/linphonecall.c:3492
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
diff --git a/po/nb_NO.po b/po/nb_NO.po
index fb7035231..e6bb13dc7 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -8,9 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-13 16:18+0100\n"
-"PO-Revision-Date: 2015-01-06 11:29+0000\n"
-"Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
+"POT-Creation-Date: 2015-02-17 12:28+0100\n"
+"PO-Revision-Date: 2015-02-17 11:28+0000\n"
+"Last-Translator: Belledonne Communications <support@belledonne-"
+"communications.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/"
 "p/linphone-gtk/language/nb_NO/)\n"
 "Language: nb_NO\n"
@@ -137,7 +138,7 @@ msgstr ""
 msgid "Run self test and exit 0 if succeed"
 msgstr ""
 
-#: ../gtk/main.c:1083
+#: ../gtk/main.c:1088
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
@@ -150,66 +151,66 @@ msgstr ""
 "din kontaktliste?\n"
 "Hvis du svarer nei vil personen bli svartelyst midlertidig."
 
-#: ../gtk/main.c:1160
+#: ../gtk/main.c:1165
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
 msgstr ""
 
-#: ../gtk/main.c:1281
+#: ../gtk/main.c:1286
 msgid "Call error"
 msgstr ""
 
-#: ../gtk/main.c:1284 ../coreapi/linphonecore.c:3767
+#: ../gtk/main.c:1289 ../coreapi/linphonecore.c:3787
 msgid "Call ended"
 msgstr "Samtale avsluttet"
 
-#: ../gtk/main.c:1287 ../coreapi/call_log.c:221
+#: ../gtk/main.c:1292 ../coreapi/call_log.c:221
 msgid "Incoming call"
 msgstr "Innkommende samtale"
 
-#: ../gtk/main.c:1289 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
+#: ../gtk/main.c:1294 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
 msgid "Answer"
 msgstr "Svarer"
 
-#: ../gtk/main.c:1291 ../gtk/main.ui.h:6
+#: ../gtk/main.c:1296 ../gtk/main.ui.h:6
 msgid "Decline"
 msgstr "Avvis"
 
-#: ../gtk/main.c:1297
+#: ../gtk/main.c:1302
 msgid "Call paused"
 msgstr ""
 
-#: ../gtk/main.c:1297
+#: ../gtk/main.c:1302
 #, c-format
 msgid "<b>by %s</b>"
 msgstr ""
 
-#: ../gtk/main.c:1367
+#: ../gtk/main.c:1372
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr ""
 
-#: ../gtk/main.c:1529
+#: ../gtk/main.c:1534
 msgid "Website link"
 msgstr "Peker til nettsted"
 
-#: ../gtk/main.c:1578
+#: ../gtk/main.c:1583
 msgid "Linphone - a video internet phone"
 msgstr "Linphone - en video Internet telefon"
 
-#: ../gtk/main.c:1670
+#: ../gtk/main.c:1675
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (Standard)"
 
-#: ../gtk/main.c:2002 ../coreapi/callbacks.c:986
+#: ../gtk/main.c:2007 ../coreapi/callbacks.c:1027
 #, c-format
 msgid "We are transferred to %s"
 msgstr "Vi er overført til %s"
 
-#: ../gtk/main.c:2012
+#: ../gtk/main.c:2017
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
@@ -217,7 +218,7 @@ msgstr ""
 "Klarte ikke å finne noe lydkort på denne datamaskinen.\n"
 "Du vil ikke kunne sende eller motta lydsamtaler."
 
-#: ../gtk/main.c:2156
+#: ../gtk/main.c:2161
 msgid "A free SIP video-phone"
 msgstr "En gratis SIP video-telefon"
 
@@ -371,15 +372,19 @@ msgid ""
 "You need to restart linphone for the new language selection to take effect."
 msgstr "Du må restarte linphone for at det nye språkvalget skal iverksettes."
 
-#: ../gtk/propertybox.c:1234
+#: ../gtk/propertybox.c:1236
 msgid "None"
 msgstr ""
 
-#: ../gtk/propertybox.c:1238
+#: ../gtk/propertybox.c:1240
 msgid "SRTP"
 msgstr ""
 
-#: ../gtk/propertybox.c:1244
+#: ../gtk/propertybox.c:1246
+msgid "DTLS"
+msgstr ""
+
+#: ../gtk/propertybox.c:1253
 msgid "ZRTP"
 msgstr ""
 
@@ -550,7 +555,7 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:527
+#: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:534
 msgid "Terminating"
 msgstr ""
 
@@ -641,7 +646,7 @@ msgstr ""
 msgid "<b>Calling...</b>"
 msgstr "<b>Ringer...</b>"
 
-#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:727
+#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:733
 msgid "00::00::00"
 msgstr "00:00:00"
 
@@ -678,62 +683,66 @@ msgid "Secured by SRTP"
 msgstr ""
 
 #: ../gtk/incall_view.c:685
+msgid "Secured by DTLS"
+msgstr ""
+
+#: ../gtk/incall_view.c:691
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
 msgstr ""
 
-#: ../gtk/incall_view.c:691
+#: ../gtk/incall_view.c:697
 msgid "Set unverified"
 msgstr ""
 
-#: ../gtk/incall_view.c:691 ../gtk/main.ui.h:4
+#: ../gtk/incall_view.c:697 ../gtk/main.ui.h:4
 msgid "Set verified"
 msgstr ""
 
-#: ../gtk/incall_view.c:722
+#: ../gtk/incall_view.c:728
 msgid "In conference"
 msgstr ""
 
-#: ../gtk/incall_view.c:722
+#: ../gtk/incall_view.c:728
 msgid "<b>In call</b>"
 msgstr "<b>I samtale med</b>"
 
-#: ../gtk/incall_view.c:758
+#: ../gtk/incall_view.c:764
 msgid "<b>Paused call</b>"
 msgstr "<b>Pauset samtale</b>"
 
-#: ../gtk/incall_view.c:794
+#: ../gtk/incall_view.c:800
 msgid "<b>Call ended.</b>"
 msgstr "<b>Samtale avsluttet.</b>"
 
-#: ../gtk/incall_view.c:825
+#: ../gtk/incall_view.c:831
 msgid "Transfer in progress"
 msgstr ""
 
-#: ../gtk/incall_view.c:828
+#: ../gtk/incall_view.c:834
 msgid "Transfer done."
 msgstr ""
 
-#: ../gtk/incall_view.c:831
+#: ../gtk/incall_view.c:837
 msgid "Transfer failed."
 msgstr ""
 
-#: ../gtk/incall_view.c:875
+#: ../gtk/incall_view.c:881
 msgid "Resume"
 msgstr "Fortsett"
 
-#: ../gtk/incall_view.c:882 ../gtk/main.ui.h:9
+#: ../gtk/incall_view.c:888 ../gtk/main.ui.h:9
 msgid "Pause"
 msgstr "Pause"
 
-#: ../gtk/incall_view.c:948
+#: ../gtk/incall_view.c:954
 #, c-format
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
 msgstr ""
 
-#: ../gtk/incall_view.c:948
+#: ../gtk/incall_view.c:954
 msgid "(Paused)"
 msgstr ""
 
@@ -830,23 +839,23 @@ msgstr ""
 msgid "Let's start Linphone now"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:496
+#: ../gtk/audio_assistant.c:503
 msgid "Audio Assistant"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:506 ../gtk/main.ui.h:31
+#: ../gtk/audio_assistant.c:513 ../gtk/main.ui.h:31
 msgid "Audio assistant"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:511
+#: ../gtk/audio_assistant.c:518
 msgid "Mic Gain calibration"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:517
+#: ../gtk/audio_assistant.c:524
 msgid "Speaker volume calibration"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:522
+#: ../gtk/audio_assistant.c:529
 msgid "Record and Play"
 msgstr ""
 
@@ -1696,68 +1705,68 @@ msgstr ""
 msgid "Please wait while fetching configuration from server..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1510
+#: ../coreapi/linphonecore.c:1508
 msgid "Ready"
 msgstr "Klar"
 
-#: ../coreapi/linphonecore.c:2489
+#: ../coreapi/linphonecore.c:2495
 msgid "Configuring"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2654
+#: ../coreapi/linphonecore.c:2669
 msgid "Looking for telephone number destination..."
 msgstr "Ser etter telefonnummer for destinasjonen..."
 
-#: ../coreapi/linphonecore.c:2656
+#: ../coreapi/linphonecore.c:2671
 msgid "Could not resolve this number."
 msgstr "Kan ikke tilkoble dette nummeret."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2942
+#: ../coreapi/linphonecore.c:2957
 msgid "Contacting"
 msgstr "Tilknytter"
 
-#: ../coreapi/linphonecore.c:2947
+#: ../coreapi/linphonecore.c:2962
 msgid "Could not call"
 msgstr "Kunne ikke ringe"
 
-#: ../coreapi/linphonecore.c:3097
+#: ../coreapi/linphonecore.c:3112
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "Beklager, du har nådd maksimalt antall samtidige samtaler"
 
-#: ../coreapi/linphonecore.c:3256
+#: ../coreapi/linphonecore.c:3270
 msgid "is contacting you"
 msgstr "Kontakter deg."
 
-#: ../coreapi/linphonecore.c:3257
+#: ../coreapi/linphonecore.c:3271
 msgid " and asked autoanswer."
 msgstr " og ba om autosvar."
 
-#: ../coreapi/linphonecore.c:3375
+#: ../coreapi/linphonecore.c:3395
 msgid "Modifying call parameters..."
 msgstr "Endrer ringeparametre..."
 
-#: ../coreapi/linphonecore.c:3723
+#: ../coreapi/linphonecore.c:3743
 msgid "Connected."
 msgstr "Tilkoblet"
 
-#: ../coreapi/linphonecore.c:3748
+#: ../coreapi/linphonecore.c:3768
 msgid "Call aborted"
 msgstr "Samtale avbrutt"
 
-#: ../coreapi/linphonecore.c:3938
+#: ../coreapi/linphonecore.c:3958
 msgid "Could not pause the call"
 msgstr "Kunne ikke pause samtalen"
 
-#: ../coreapi/linphonecore.c:3941
+#: ../coreapi/linphonecore.c:3961
 msgid "Pausing the current call..."
 msgstr "Pauser nåværende samtale"
 
-#: ../coreapi/misc.c:438
+#: ../coreapi/misc.c:433
 msgid "Stun lookup in progress..."
 msgstr "STUN oppslag pågår..."
 
-#: ../coreapi/misc.c:619
+#: ../coreapi/misc.c:614
 msgid "ICE local candidates gathering in progress..."
 msgstr ""
 
@@ -1813,7 +1822,7 @@ msgstr ""
 msgid "Unknown status"
 msgstr ""
 
-#: ../coreapi/proxy.c:327
+#: ../coreapi/proxy.c:328
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
@@ -1821,7 +1830,7 @@ msgstr ""
 "SIP proxy adressen du har angitt er ugyldig, den må begynne med \"sip:\" "
 "etterfult av vertsnavn."
 
-#: ../coreapi/proxy.c:333
+#: ../coreapi/proxy.c:334
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
@@ -1829,126 +1838,127 @@ msgstr ""
 "SIP adressen du har angitt er feil. Adressen bør se ut som sip: "
 "brukernavn@domenenavn, f.eks sip:ola@eksempel.no"
 
-#: ../coreapi/proxy.c:1391
+#: ../coreapi/proxy.c:1403
 #, c-format
 msgid "Could not login as %s"
 msgstr "Ikke ikke logge inn som %s"
 
-#: ../coreapi/callbacks.c:383
+#: ../coreapi/callbacks.c:404
 msgid "Remote ringing."
 msgstr "Ringer hos motparten."
 
-#: ../coreapi/callbacks.c:404
+#: ../coreapi/callbacks.c:425
 msgid "Remote ringing..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:414
+#: ../coreapi/callbacks.c:442
 msgid "Early media."
 msgstr "Tidlig media"
 
-#: ../coreapi/callbacks.c:475
+#: ../coreapi/callbacks.c:503
 #, c-format
 msgid "Call with %s is paused."
 msgstr "Samtalen med %s er pauset."
 
-#: ../coreapi/callbacks.c:488
+#: ../coreapi/callbacks.c:516
 #, c-format
 msgid "Call answered by %s - on hold."
 msgstr "Samtale besvart av %s - på vent."
 
-#: ../coreapi/callbacks.c:498
+#: ../coreapi/callbacks.c:526
 msgid "Call resumed."
 msgstr "Samtale gjenopptatt."
 
-#: ../coreapi/callbacks.c:502
+#: ../coreapi/callbacks.c:530
 #, c-format
 msgid "Call answered by %s."
 msgstr "Samtale besvart av %s."
 
-#: ../coreapi/callbacks.c:525
+#: ../coreapi/callbacks.c:553
 msgid "Incompatible, check codecs or security settings..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:829
+#: ../coreapi/callbacks.c:558 ../coreapi/callbacks.c:870
 msgid "Incompatible media parameters."
 msgstr ""
 
-#: ../coreapi/callbacks.c:560
+#: ../coreapi/callbacks.c:588
 msgid "We have been resumed."
 msgstr ""
 
 #. we are being paused
-#: ../coreapi/callbacks.c:568
+#: ../coreapi/callbacks.c:596
 msgid "We are paused by other party."
 msgstr ""
 
 #. reINVITE and in-dialogs UPDATE go here
-#: ../coreapi/callbacks.c:602
+#: ../coreapi/callbacks.c:630
 msgid "Call is updated by remote."
 msgstr ""
 
-#: ../coreapi/callbacks.c:705
+#: ../coreapi/callbacks.c:746
 msgid "Call terminated."
 msgstr "Samtale avsluttet."
 
-#: ../coreapi/callbacks.c:733
+#: ../coreapi/callbacks.c:774
 msgid "User is busy."
 msgstr "Brukeren er opptatt."
 
-#: ../coreapi/callbacks.c:734
+#: ../coreapi/callbacks.c:775
 msgid "User is temporarily unavailable."
 msgstr "Brukeren er midlertidig ikke tilgjengelig."
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:736
+#: ../coreapi/callbacks.c:777
 msgid "User does not want to be disturbed."
 msgstr "Brukeren vil ikke bli forstyrret."
 
-#: ../coreapi/callbacks.c:737
+#: ../coreapi/callbacks.c:778
 msgid "Call declined."
 msgstr "Samtale avvist."
 
-#: ../coreapi/callbacks.c:752
+#: ../coreapi/callbacks.c:793
 msgid "Request timeout."
 msgstr ""
 
-#: ../coreapi/callbacks.c:783
+#: ../coreapi/callbacks.c:824
 msgid "Redirected"
 msgstr "Omdirigert"
 
-#: ../coreapi/callbacks.c:838
+#: ../coreapi/callbacks.c:879
 msgid "Call failed."
 msgstr "Samtale feilet."
 
-#: ../coreapi/callbacks.c:916
+#: ../coreapi/callbacks.c:957
 #, c-format
 msgid "Registration on %s successful."
 msgstr "Registrering hos %s lykkes."
 
-#: ../coreapi/callbacks.c:917
+#: ../coreapi/callbacks.c:958
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "Avregistrering hos %s lykkes."
 
-#: ../coreapi/callbacks.c:935
+#: ../coreapi/callbacks.c:976
 msgid "no response timeout"
 msgstr "ingen svar innen angitt tid"
 
-#: ../coreapi/callbacks.c:938
+#: ../coreapi/callbacks.c:979
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "Registrering hos %s mislykkes: %s"
 
-#: ../coreapi/callbacks.c:945
+#: ../coreapi/callbacks.c:986
 msgid "Service unavailable, retrying"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:175
+#. if encryption is DTLS, no status to be displayed
+#: ../coreapi/linphonecall.c:180
 #, c-format
 msgid "Authentication token is %s"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:3041
+#: ../coreapi/linphonecall.c:3492
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
diff --git a/po/nl.po b/po/nl.po
index cfda5add0..9724098a7 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,9 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-13 16:18+0100\n"
-"PO-Revision-Date: 2015-01-06 11:29+0000\n"
-"Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
+"POT-Creation-Date: 2015-02-17 12:28+0100\n"
+"PO-Revision-Date: 2015-02-17 11:28+0000\n"
+"Last-Translator: Belledonne Communications <support@belledonne-"
+"communications.com>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/nl/)\n"
 "Language: nl\n"
@@ -134,7 +135,7 @@ msgstr ""
 msgid "Run self test and exit 0 if succeed"
 msgstr ""
 
-#: ../gtk/main.c:1083
+#: ../gtk/main.c:1088
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
@@ -143,72 +144,72 @@ msgid ""
 "If you answer no, this person will be temporarily blacklisted."
 msgstr ""
 
-#: ../gtk/main.c:1160
+#: ../gtk/main.c:1165
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
 msgstr ""
 
-#: ../gtk/main.c:1281
+#: ../gtk/main.c:1286
 msgid "Call error"
 msgstr ""
 
-#: ../gtk/main.c:1284 ../coreapi/linphonecore.c:3767
+#: ../gtk/main.c:1289 ../coreapi/linphonecore.c:3787
 msgid "Call ended"
 msgstr "Oproep beeindigd"
 
-#: ../gtk/main.c:1287 ../coreapi/call_log.c:221
+#: ../gtk/main.c:1292 ../coreapi/call_log.c:221
 msgid "Incoming call"
 msgstr "Inkomende oproep"
 
-#: ../gtk/main.c:1289 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
+#: ../gtk/main.c:1294 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
 msgid "Answer"
 msgstr ""
 
-#: ../gtk/main.c:1291 ../gtk/main.ui.h:6
+#: ../gtk/main.c:1296 ../gtk/main.ui.h:6
 msgid "Decline"
 msgstr ""
 
-#: ../gtk/main.c:1297
+#: ../gtk/main.c:1302
 msgid "Call paused"
 msgstr ""
 
-#: ../gtk/main.c:1297
+#: ../gtk/main.c:1302
 #, c-format
 msgid "<b>by %s</b>"
 msgstr ""
 
-#: ../gtk/main.c:1367
+#: ../gtk/main.c:1372
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr ""
 
-#: ../gtk/main.c:1529
+#: ../gtk/main.c:1534
 msgid "Website link"
 msgstr ""
 
-#: ../gtk/main.c:1578
+#: ../gtk/main.c:1583
 msgid "Linphone - a video internet phone"
 msgstr ""
 
-#: ../gtk/main.c:1670
+#: ../gtk/main.c:1675
 #, c-format
 msgid "%s (Default)"
 msgstr ""
 
-#: ../gtk/main.c:2002 ../coreapi/callbacks.c:986
+#: ../gtk/main.c:2007 ../coreapi/callbacks.c:1027
 #, c-format
 msgid "We are transferred to %s"
 msgstr ""
 
-#: ../gtk/main.c:2012
+#: ../gtk/main.c:2017
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
 msgstr ""
 
-#: ../gtk/main.c:2156
+#: ../gtk/main.c:2161
 msgid "A free SIP video-phone"
 msgstr "Een Vrije SIP video-telefoon"
 
@@ -362,15 +363,19 @@ msgid ""
 "You need to restart linphone for the new language selection to take effect."
 msgstr ""
 
-#: ../gtk/propertybox.c:1234
+#: ../gtk/propertybox.c:1236
 msgid "None"
 msgstr "Geen"
 
-#: ../gtk/propertybox.c:1238
+#: ../gtk/propertybox.c:1240
 msgid "SRTP"
 msgstr ""
 
-#: ../gtk/propertybox.c:1244
+#: ../gtk/propertybox.c:1246
+msgid "DTLS"
+msgstr ""
+
+#: ../gtk/propertybox.c:1253
 msgid "ZRTP"
 msgstr ""
 
@@ -539,7 +544,7 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:527
+#: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:534
 msgid "Terminating"
 msgstr ""
 
@@ -630,7 +635,7 @@ msgstr ""
 msgid "<b>Calling...</b>"
 msgstr ""
 
-#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:727
+#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:733
 msgid "00::00::00"
 msgstr ""
 
@@ -667,62 +672,66 @@ msgid "Secured by SRTP"
 msgstr ""
 
 #: ../gtk/incall_view.c:685
+msgid "Secured by DTLS"
+msgstr ""
+
+#: ../gtk/incall_view.c:691
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
 msgstr ""
 
-#: ../gtk/incall_view.c:691
+#: ../gtk/incall_view.c:697
 msgid "Set unverified"
 msgstr ""
 
-#: ../gtk/incall_view.c:691 ../gtk/main.ui.h:4
+#: ../gtk/incall_view.c:697 ../gtk/main.ui.h:4
 msgid "Set verified"
 msgstr ""
 
-#: ../gtk/incall_view.c:722
+#: ../gtk/incall_view.c:728
 msgid "In conference"
 msgstr ""
 
-#: ../gtk/incall_view.c:722
+#: ../gtk/incall_view.c:728
 msgid "<b>In call</b>"
 msgstr ""
 
-#: ../gtk/incall_view.c:758
+#: ../gtk/incall_view.c:764
 msgid "<b>Paused call</b>"
 msgstr ""
 
-#: ../gtk/incall_view.c:794
+#: ../gtk/incall_view.c:800
 msgid "<b>Call ended.</b>"
 msgstr ""
 
-#: ../gtk/incall_view.c:825
+#: ../gtk/incall_view.c:831
 msgid "Transfer in progress"
 msgstr ""
 
-#: ../gtk/incall_view.c:828
+#: ../gtk/incall_view.c:834
 msgid "Transfer done."
 msgstr ""
 
-#: ../gtk/incall_view.c:831
+#: ../gtk/incall_view.c:837
 msgid "Transfer failed."
 msgstr ""
 
-#: ../gtk/incall_view.c:875
+#: ../gtk/incall_view.c:881
 msgid "Resume"
 msgstr ""
 
-#: ../gtk/incall_view.c:882 ../gtk/main.ui.h:9
+#: ../gtk/incall_view.c:888 ../gtk/main.ui.h:9
 msgid "Pause"
 msgstr ""
 
-#: ../gtk/incall_view.c:948
+#: ../gtk/incall_view.c:954
 #, c-format
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
 msgstr ""
 
-#: ../gtk/incall_view.c:948
+#: ../gtk/incall_view.c:954
 msgid "(Paused)"
 msgstr ""
 
@@ -819,23 +828,23 @@ msgstr ""
 msgid "Let's start Linphone now"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:496
+#: ../gtk/audio_assistant.c:503
 msgid "Audio Assistant"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:506 ../gtk/main.ui.h:31
+#: ../gtk/audio_assistant.c:513 ../gtk/main.ui.h:31
 msgid "Audio assistant"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:511
+#: ../gtk/audio_assistant.c:518
 msgid "Mic Gain calibration"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:517
+#: ../gtk/audio_assistant.c:524
 msgid "Speaker volume calibration"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:522
+#: ../gtk/audio_assistant.c:529
 msgid "Record and Play"
 msgstr ""
 
@@ -1683,68 +1692,68 @@ msgstr ""
 msgid "Please wait while fetching configuration from server..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1510
+#: ../coreapi/linphonecore.c:1508
 msgid "Ready"
 msgstr "Gereed."
 
-#: ../coreapi/linphonecore.c:2489
+#: ../coreapi/linphonecore.c:2495
 msgid "Configuring"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2654
+#: ../coreapi/linphonecore.c:2669
 msgid "Looking for telephone number destination..."
 msgstr "Zoekt de lokatie van het telefoonnummer..."
 
-#: ../coreapi/linphonecore.c:2656
+#: ../coreapi/linphonecore.c:2671
 msgid "Could not resolve this number."
 msgstr "Kon dit nummer niet vinden."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2942
+#: ../coreapi/linphonecore.c:2957
 msgid "Contacting"
 msgstr "Verbinden"
 
-#: ../coreapi/linphonecore.c:2947
+#: ../coreapi/linphonecore.c:2962
 msgid "Could not call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3097
+#: ../coreapi/linphonecore.c:3112
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3256
+#: ../coreapi/linphonecore.c:3270
 msgid "is contacting you"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3257
+#: ../coreapi/linphonecore.c:3271
 msgid " and asked autoanswer."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3375
+#: ../coreapi/linphonecore.c:3395
 msgid "Modifying call parameters..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3723
+#: ../coreapi/linphonecore.c:3743
 msgid "Connected."
 msgstr "Verbonden."
 
-#: ../coreapi/linphonecore.c:3748
+#: ../coreapi/linphonecore.c:3768
 msgid "Call aborted"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3938
+#: ../coreapi/linphonecore.c:3958
 msgid "Could not pause the call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3941
+#: ../coreapi/linphonecore.c:3961
 msgid "Pausing the current call..."
 msgstr ""
 
-#: ../coreapi/misc.c:438
+#: ../coreapi/misc.c:433
 msgid "Stun lookup in progress..."
 msgstr "STUN adres wordt opgezocht..."
 
-#: ../coreapi/misc.c:619
+#: ../coreapi/misc.c:614
 msgid "ICE local candidates gathering in progress..."
 msgstr ""
 
@@ -1800,138 +1809,139 @@ msgstr ""
 msgid "Unknown status"
 msgstr ""
 
-#: ../coreapi/proxy.c:327
+#: ../coreapi/proxy.c:328
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
 msgstr ""
 
-#: ../coreapi/proxy.c:333
+#: ../coreapi/proxy.c:334
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
 msgstr ""
 
-#: ../coreapi/proxy.c:1391
+#: ../coreapi/proxy.c:1403
 #, c-format
 msgid "Could not login as %s"
 msgstr ""
 
-#: ../coreapi/callbacks.c:383
+#: ../coreapi/callbacks.c:404
 msgid "Remote ringing."
 msgstr ""
 
-#: ../coreapi/callbacks.c:404
+#: ../coreapi/callbacks.c:425
 msgid "Remote ringing..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:414
+#: ../coreapi/callbacks.c:442
 msgid "Early media."
 msgstr ""
 
-#: ../coreapi/callbacks.c:475
+#: ../coreapi/callbacks.c:503
 #, c-format
 msgid "Call with %s is paused."
 msgstr ""
 
-#: ../coreapi/callbacks.c:488
+#: ../coreapi/callbacks.c:516
 #, c-format
 msgid "Call answered by %s - on hold."
 msgstr ""
 
-#: ../coreapi/callbacks.c:498
+#: ../coreapi/callbacks.c:526
 msgid "Call resumed."
 msgstr ""
 
-#: ../coreapi/callbacks.c:502
+#: ../coreapi/callbacks.c:530
 #, c-format
 msgid "Call answered by %s."
 msgstr ""
 
-#: ../coreapi/callbacks.c:525
+#: ../coreapi/callbacks.c:553
 msgid "Incompatible, check codecs or security settings..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:829
+#: ../coreapi/callbacks.c:558 ../coreapi/callbacks.c:870
 msgid "Incompatible media parameters."
 msgstr ""
 
-#: ../coreapi/callbacks.c:560
+#: ../coreapi/callbacks.c:588
 msgid "We have been resumed."
 msgstr ""
 
 #. we are being paused
-#: ../coreapi/callbacks.c:568
+#: ../coreapi/callbacks.c:596
 msgid "We are paused by other party."
 msgstr ""
 
 #. reINVITE and in-dialogs UPDATE go here
-#: ../coreapi/callbacks.c:602
+#: ../coreapi/callbacks.c:630
 msgid "Call is updated by remote."
 msgstr ""
 
-#: ../coreapi/callbacks.c:705
+#: ../coreapi/callbacks.c:746
 msgid "Call terminated."
 msgstr "Oproep beeindigd."
 
-#: ../coreapi/callbacks.c:733
+#: ../coreapi/callbacks.c:774
 msgid "User is busy."
 msgstr "Gebruiker is bezet."
 
-#: ../coreapi/callbacks.c:734
+#: ../coreapi/callbacks.c:775
 msgid "User is temporarily unavailable."
 msgstr "Gebruiker is tijdelijk niet beschikbaar."
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:736
+#: ../coreapi/callbacks.c:777
 msgid "User does not want to be disturbed."
 msgstr "De gebruiker wenst niet gestoord te worden."
 
-#: ../coreapi/callbacks.c:737
+#: ../coreapi/callbacks.c:778
 msgid "Call declined."
 msgstr "Oproep geweigerd."
 
-#: ../coreapi/callbacks.c:752
+#: ../coreapi/callbacks.c:793
 msgid "Request timeout."
 msgstr ""
 
-#: ../coreapi/callbacks.c:783
+#: ../coreapi/callbacks.c:824
 msgid "Redirected"
 msgstr ""
 
-#: ../coreapi/callbacks.c:838
+#: ../coreapi/callbacks.c:879
 msgid "Call failed."
 msgstr ""
 
-#: ../coreapi/callbacks.c:916
+#: ../coreapi/callbacks.c:957
 #, c-format
 msgid "Registration on %s successful."
 msgstr "Registratie op %s gelukt."
 
-#: ../coreapi/callbacks.c:917
+#: ../coreapi/callbacks.c:958
 #, c-format
 msgid "Unregistration on %s done."
 msgstr ""
 
-#: ../coreapi/callbacks.c:935
+#: ../coreapi/callbacks.c:976
 msgid "no response timeout"
 msgstr ""
 
-#: ../coreapi/callbacks.c:938
+#: ../coreapi/callbacks.c:979
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr ""
 
-#: ../coreapi/callbacks.c:945
+#: ../coreapi/callbacks.c:986
 msgid "Service unavailable, retrying"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:175
+#. if encryption is DTLS, no status to be displayed
+#: ../coreapi/linphonecall.c:180
 #, c-format
 msgid "Authentication token is %s"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:3041
+#: ../coreapi/linphonecall.c:3492
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
diff --git a/po/pl.po b/po/pl.po
index f83b391c4..595a29b8d 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,9 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-13 16:18+0100\n"
-"PO-Revision-Date: 2015-01-06 11:29+0000\n"
-"Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
+"POT-Creation-Date: 2015-02-17 12:28+0100\n"
+"PO-Revision-Date: 2015-02-17 11:28+0000\n"
+"Last-Translator: Belledonne Communications <support@belledonne-"
+"communications.com>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/pl/)\n"
 "Language: pl\n"
@@ -137,7 +138,7 @@ msgstr ""
 msgid "Run self test and exit 0 if succeed"
 msgstr ""
 
-#: ../gtk/main.c:1083
+#: ../gtk/main.c:1088
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
@@ -146,72 +147,72 @@ msgid ""
 "If you answer no, this person will be temporarily blacklisted."
 msgstr ""
 
-#: ../gtk/main.c:1160
+#: ../gtk/main.c:1165
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
 msgstr ""
 
-#: ../gtk/main.c:1281
+#: ../gtk/main.c:1286
 msgid "Call error"
 msgstr ""
 
-#: ../gtk/main.c:1284 ../coreapi/linphonecore.c:3767
+#: ../gtk/main.c:1289 ../coreapi/linphonecore.c:3787
 msgid "Call ended"
 msgstr ""
 
-#: ../gtk/main.c:1287 ../coreapi/call_log.c:221
+#: ../gtk/main.c:1292 ../coreapi/call_log.c:221
 msgid "Incoming call"
 msgstr ""
 
-#: ../gtk/main.c:1289 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
+#: ../gtk/main.c:1294 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
 msgid "Answer"
 msgstr ""
 
-#: ../gtk/main.c:1291 ../gtk/main.ui.h:6
+#: ../gtk/main.c:1296 ../gtk/main.ui.h:6
 msgid "Decline"
 msgstr ""
 
-#: ../gtk/main.c:1297
+#: ../gtk/main.c:1302
 msgid "Call paused"
 msgstr ""
 
-#: ../gtk/main.c:1297
+#: ../gtk/main.c:1302
 #, c-format
 msgid "<b>by %s</b>"
 msgstr ""
 
-#: ../gtk/main.c:1367
+#: ../gtk/main.c:1372
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr ""
 
-#: ../gtk/main.c:1529
+#: ../gtk/main.c:1534
 msgid "Website link"
 msgstr ""
 
-#: ../gtk/main.c:1578
+#: ../gtk/main.c:1583
 msgid "Linphone - a video internet phone"
 msgstr ""
 
-#: ../gtk/main.c:1670
+#: ../gtk/main.c:1675
 #, c-format
 msgid "%s (Default)"
 msgstr ""
 
-#: ../gtk/main.c:2002 ../coreapi/callbacks.c:986
+#: ../gtk/main.c:2007 ../coreapi/callbacks.c:1027
 #, c-format
 msgid "We are transferred to %s"
 msgstr ""
 
-#: ../gtk/main.c:2012
+#: ../gtk/main.c:2017
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
 msgstr ""
 
-#: ../gtk/main.c:2156
+#: ../gtk/main.c:2161
 msgid "A free SIP video-phone"
 msgstr ""
 
@@ -365,15 +366,19 @@ msgid ""
 "You need to restart linphone for the new language selection to take effect."
 msgstr ""
 
-#: ../gtk/propertybox.c:1234
+#: ../gtk/propertybox.c:1236
 msgid "None"
 msgstr ""
 
-#: ../gtk/propertybox.c:1238
+#: ../gtk/propertybox.c:1240
 msgid "SRTP"
 msgstr ""
 
-#: ../gtk/propertybox.c:1244
+#: ../gtk/propertybox.c:1246
+msgid "DTLS"
+msgstr ""
+
+#: ../gtk/propertybox.c:1253
 msgid "ZRTP"
 msgstr ""
 
@@ -543,7 +548,7 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:527
+#: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:534
 msgid "Terminating"
 msgstr ""
 
@@ -634,7 +639,7 @@ msgstr ""
 msgid "<b>Calling...</b>"
 msgstr ""
 
-#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:727
+#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:733
 msgid "00::00::00"
 msgstr ""
 
@@ -671,62 +676,66 @@ msgid "Secured by SRTP"
 msgstr ""
 
 #: ../gtk/incall_view.c:685
+msgid "Secured by DTLS"
+msgstr ""
+
+#: ../gtk/incall_view.c:691
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
 msgstr ""
 
-#: ../gtk/incall_view.c:691
+#: ../gtk/incall_view.c:697
 msgid "Set unverified"
 msgstr ""
 
-#: ../gtk/incall_view.c:691 ../gtk/main.ui.h:4
+#: ../gtk/incall_view.c:697 ../gtk/main.ui.h:4
 msgid "Set verified"
 msgstr ""
 
-#: ../gtk/incall_view.c:722
+#: ../gtk/incall_view.c:728
 msgid "In conference"
 msgstr ""
 
-#: ../gtk/incall_view.c:722
+#: ../gtk/incall_view.c:728
 msgid "<b>In call</b>"
 msgstr ""
 
-#: ../gtk/incall_view.c:758
+#: ../gtk/incall_view.c:764
 msgid "<b>Paused call</b>"
 msgstr ""
 
-#: ../gtk/incall_view.c:794
+#: ../gtk/incall_view.c:800
 msgid "<b>Call ended.</b>"
 msgstr ""
 
-#: ../gtk/incall_view.c:825
+#: ../gtk/incall_view.c:831
 msgid "Transfer in progress"
 msgstr ""
 
-#: ../gtk/incall_view.c:828
+#: ../gtk/incall_view.c:834
 msgid "Transfer done."
 msgstr ""
 
-#: ../gtk/incall_view.c:831
+#: ../gtk/incall_view.c:837
 msgid "Transfer failed."
 msgstr ""
 
-#: ../gtk/incall_view.c:875
+#: ../gtk/incall_view.c:881
 msgid "Resume"
 msgstr ""
 
-#: ../gtk/incall_view.c:882 ../gtk/main.ui.h:9
+#: ../gtk/incall_view.c:888 ../gtk/main.ui.h:9
 msgid "Pause"
 msgstr ""
 
-#: ../gtk/incall_view.c:948
+#: ../gtk/incall_view.c:954
 #, c-format
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
 msgstr ""
 
-#: ../gtk/incall_view.c:948
+#: ../gtk/incall_view.c:954
 msgid "(Paused)"
 msgstr ""
 
@@ -823,23 +832,23 @@ msgstr ""
 msgid "Let's start Linphone now"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:496
+#: ../gtk/audio_assistant.c:503
 msgid "Audio Assistant"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:506 ../gtk/main.ui.h:31
+#: ../gtk/audio_assistant.c:513 ../gtk/main.ui.h:31
 msgid "Audio assistant"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:511
+#: ../gtk/audio_assistant.c:518
 msgid "Mic Gain calibration"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:517
+#: ../gtk/audio_assistant.c:524
 msgid "Speaker volume calibration"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:522
+#: ../gtk/audio_assistant.c:529
 msgid "Record and Play"
 msgstr ""
 
@@ -1687,68 +1696,68 @@ msgstr ""
 msgid "Please wait while fetching configuration from server..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1510
+#: ../coreapi/linphonecore.c:1508
 msgid "Ready"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2489
+#: ../coreapi/linphonecore.c:2495
 msgid "Configuring"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2654
+#: ../coreapi/linphonecore.c:2669
 msgid "Looking for telephone number destination..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2656
+#: ../coreapi/linphonecore.c:2671
 msgid "Could not resolve this number."
 msgstr ""
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2942
+#: ../coreapi/linphonecore.c:2957
 msgid "Contacting"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2947
+#: ../coreapi/linphonecore.c:2962
 msgid "Could not call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3097
+#: ../coreapi/linphonecore.c:3112
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3256
+#: ../coreapi/linphonecore.c:3270
 msgid "is contacting you"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3257
+#: ../coreapi/linphonecore.c:3271
 msgid " and asked autoanswer."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3375
+#: ../coreapi/linphonecore.c:3395
 msgid "Modifying call parameters..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3723
+#: ../coreapi/linphonecore.c:3743
 msgid "Connected."
 msgstr "Połączony"
 
-#: ../coreapi/linphonecore.c:3748
+#: ../coreapi/linphonecore.c:3768
 msgid "Call aborted"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3938
+#: ../coreapi/linphonecore.c:3958
 msgid "Could not pause the call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3941
+#: ../coreapi/linphonecore.c:3961
 msgid "Pausing the current call..."
 msgstr ""
 
-#: ../coreapi/misc.c:438
+#: ../coreapi/misc.c:433
 msgid "Stun lookup in progress..."
 msgstr ""
 
-#: ../coreapi/misc.c:619
+#: ../coreapi/misc.c:614
 msgid "ICE local candidates gathering in progress..."
 msgstr ""
 
@@ -1804,138 +1813,139 @@ msgstr ""
 msgid "Unknown status"
 msgstr ""
 
-#: ../coreapi/proxy.c:327
+#: ../coreapi/proxy.c:328
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
 msgstr ""
 
-#: ../coreapi/proxy.c:333
+#: ../coreapi/proxy.c:334
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
 msgstr ""
 
-#: ../coreapi/proxy.c:1391
+#: ../coreapi/proxy.c:1403
 #, c-format
 msgid "Could not login as %s"
 msgstr ""
 
-#: ../coreapi/callbacks.c:383
+#: ../coreapi/callbacks.c:404
 msgid "Remote ringing."
 msgstr ""
 
-#: ../coreapi/callbacks.c:404
+#: ../coreapi/callbacks.c:425
 msgid "Remote ringing..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:414
+#: ../coreapi/callbacks.c:442
 msgid "Early media."
 msgstr ""
 
-#: ../coreapi/callbacks.c:475
+#: ../coreapi/callbacks.c:503
 #, c-format
 msgid "Call with %s is paused."
 msgstr ""
 
-#: ../coreapi/callbacks.c:488
+#: ../coreapi/callbacks.c:516
 #, c-format
 msgid "Call answered by %s - on hold."
 msgstr ""
 
-#: ../coreapi/callbacks.c:498
+#: ../coreapi/callbacks.c:526
 msgid "Call resumed."
 msgstr ""
 
-#: ../coreapi/callbacks.c:502
+#: ../coreapi/callbacks.c:530
 #, c-format
 msgid "Call answered by %s."
 msgstr ""
 
-#: ../coreapi/callbacks.c:525
+#: ../coreapi/callbacks.c:553
 msgid "Incompatible, check codecs or security settings..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:829
+#: ../coreapi/callbacks.c:558 ../coreapi/callbacks.c:870
 msgid "Incompatible media parameters."
 msgstr ""
 
-#: ../coreapi/callbacks.c:560
+#: ../coreapi/callbacks.c:588
 msgid "We have been resumed."
 msgstr ""
 
 #. we are being paused
-#: ../coreapi/callbacks.c:568
+#: ../coreapi/callbacks.c:596
 msgid "We are paused by other party."
 msgstr ""
 
 #. reINVITE and in-dialogs UPDATE go here
-#: ../coreapi/callbacks.c:602
+#: ../coreapi/callbacks.c:630
 msgid "Call is updated by remote."
 msgstr ""
 
-#: ../coreapi/callbacks.c:705
+#: ../coreapi/callbacks.c:746
 msgid "Call terminated."
 msgstr ""
 
-#: ../coreapi/callbacks.c:733
+#: ../coreapi/callbacks.c:774
 msgid "User is busy."
 msgstr "Osoba jest zajęta."
 
-#: ../coreapi/callbacks.c:734
+#: ../coreapi/callbacks.c:775
 msgid "User is temporarily unavailable."
 msgstr "Osoba jest tymczasowo niedostępna."
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:736
+#: ../coreapi/callbacks.c:777
 msgid "User does not want to be disturbed."
 msgstr "Osoba nie chce, aby jej przeszkadzać."
 
-#: ../coreapi/callbacks.c:737
+#: ../coreapi/callbacks.c:778
 msgid "Call declined."
 msgstr "Rozmowa odrzucona."
 
-#: ../coreapi/callbacks.c:752
+#: ../coreapi/callbacks.c:793
 msgid "Request timeout."
 msgstr ""
 
-#: ../coreapi/callbacks.c:783
+#: ../coreapi/callbacks.c:824
 msgid "Redirected"
 msgstr ""
 
-#: ../coreapi/callbacks.c:838
+#: ../coreapi/callbacks.c:879
 msgid "Call failed."
 msgstr ""
 
-#: ../coreapi/callbacks.c:916
+#: ../coreapi/callbacks.c:957
 #, c-format
 msgid "Registration on %s successful."
 msgstr ""
 
-#: ../coreapi/callbacks.c:917
+#: ../coreapi/callbacks.c:958
 #, c-format
 msgid "Unregistration on %s done."
 msgstr ""
 
-#: ../coreapi/callbacks.c:935
+#: ../coreapi/callbacks.c:976
 msgid "no response timeout"
 msgstr ""
 
-#: ../coreapi/callbacks.c:938
+#: ../coreapi/callbacks.c:979
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr ""
 
-#: ../coreapi/callbacks.c:945
+#: ../coreapi/callbacks.c:986
 msgid "Service unavailable, retrying"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:175
+#. if encryption is DTLS, no status to be displayed
+#: ../coreapi/linphonecall.c:180
 #, c-format
 msgid "Authentication token is %s"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:3041
+#: ../coreapi/linphonecall.c:3492
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 8f7a8c319..3c74b566d 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,9 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-13 16:18+0100\n"
-"PO-Revision-Date: 2015-01-06 11:29+0000\n"
-"Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
+"POT-Creation-Date: 2015-02-17 12:28+0100\n"
+"PO-Revision-Date: 2015-02-17 11:28+0000\n"
+"Last-Translator: Belledonne Communications <support@belledonne-"
+"communications.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
 "linphone-gtk/language/pt_BR/)\n"
 "Language: pt_BR\n"
@@ -134,7 +135,7 @@ msgstr ""
 msgid "Run self test and exit 0 if succeed"
 msgstr ""
 
-#: ../gtk/main.c:1083
+#: ../gtk/main.c:1088
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
@@ -143,72 +144,72 @@ msgid ""
 "If you answer no, this person will be temporarily blacklisted."
 msgstr ""
 
-#: ../gtk/main.c:1160
+#: ../gtk/main.c:1165
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
 msgstr ""
 
-#: ../gtk/main.c:1281
+#: ../gtk/main.c:1286
 msgid "Call error"
 msgstr ""
 
-#: ../gtk/main.c:1284 ../coreapi/linphonecore.c:3767
+#: ../gtk/main.c:1289 ../coreapi/linphonecore.c:3787
 msgid "Call ended"
 msgstr ""
 
-#: ../gtk/main.c:1287 ../coreapi/call_log.c:221
+#: ../gtk/main.c:1292 ../coreapi/call_log.c:221
 msgid "Incoming call"
 msgstr "Camadas recebidas"
 
-#: ../gtk/main.c:1289 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
+#: ../gtk/main.c:1294 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
 msgid "Answer"
 msgstr ""
 
-#: ../gtk/main.c:1291 ../gtk/main.ui.h:6
+#: ../gtk/main.c:1296 ../gtk/main.ui.h:6
 msgid "Decline"
 msgstr ""
 
-#: ../gtk/main.c:1297
+#: ../gtk/main.c:1302
 msgid "Call paused"
 msgstr ""
 
-#: ../gtk/main.c:1297
+#: ../gtk/main.c:1302
 #, c-format
 msgid "<b>by %s</b>"
 msgstr ""
 
-#: ../gtk/main.c:1367
+#: ../gtk/main.c:1372
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr ""
 
-#: ../gtk/main.c:1529
+#: ../gtk/main.c:1534
 msgid "Website link"
 msgstr ""
 
-#: ../gtk/main.c:1578
+#: ../gtk/main.c:1583
 msgid "Linphone - a video internet phone"
 msgstr ""
 
-#: ../gtk/main.c:1670
+#: ../gtk/main.c:1675
 #, c-format
 msgid "%s (Default)"
 msgstr ""
 
-#: ../gtk/main.c:2002 ../coreapi/callbacks.c:986
+#: ../gtk/main.c:2007 ../coreapi/callbacks.c:1027
 #, c-format
 msgid "We are transferred to %s"
 msgstr ""
 
-#: ../gtk/main.c:2012
+#: ../gtk/main.c:2017
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
 msgstr ""
 
-#: ../gtk/main.c:2156
+#: ../gtk/main.c:2161
 msgid "A free SIP video-phone"
 msgstr ""
 
@@ -362,15 +363,19 @@ msgid ""
 "You need to restart linphone for the new language selection to take effect."
 msgstr ""
 
-#: ../gtk/propertybox.c:1234
+#: ../gtk/propertybox.c:1236
 msgid "None"
 msgstr "Nenhum"
 
-#: ../gtk/propertybox.c:1238
+#: ../gtk/propertybox.c:1240
 msgid "SRTP"
 msgstr ""
 
-#: ../gtk/propertybox.c:1244
+#: ../gtk/propertybox.c:1246
+msgid "DTLS"
+msgstr ""
+
+#: ../gtk/propertybox.c:1253
 msgid "ZRTP"
 msgstr ""
 
@@ -539,7 +544,7 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:527
+#: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:534
 msgid "Terminating"
 msgstr ""
 
@@ -630,7 +635,7 @@ msgstr ""
 msgid "<b>Calling...</b>"
 msgstr ""
 
-#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:727
+#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:733
 msgid "00::00::00"
 msgstr ""
 
@@ -667,62 +672,66 @@ msgid "Secured by SRTP"
 msgstr ""
 
 #: ../gtk/incall_view.c:685
+msgid "Secured by DTLS"
+msgstr ""
+
+#: ../gtk/incall_view.c:691
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
 msgstr ""
 
-#: ../gtk/incall_view.c:691
+#: ../gtk/incall_view.c:697
 msgid "Set unverified"
 msgstr ""
 
-#: ../gtk/incall_view.c:691 ../gtk/main.ui.h:4
+#: ../gtk/incall_view.c:697 ../gtk/main.ui.h:4
 msgid "Set verified"
 msgstr ""
 
-#: ../gtk/incall_view.c:722
+#: ../gtk/incall_view.c:728
 msgid "In conference"
 msgstr ""
 
-#: ../gtk/incall_view.c:722
+#: ../gtk/incall_view.c:728
 msgid "<b>In call</b>"
 msgstr ""
 
-#: ../gtk/incall_view.c:758
+#: ../gtk/incall_view.c:764
 msgid "<b>Paused call</b>"
 msgstr ""
 
-#: ../gtk/incall_view.c:794
+#: ../gtk/incall_view.c:800
 msgid "<b>Call ended.</b>"
 msgstr ""
 
-#: ../gtk/incall_view.c:825
+#: ../gtk/incall_view.c:831
 msgid "Transfer in progress"
 msgstr ""
 
-#: ../gtk/incall_view.c:828
+#: ../gtk/incall_view.c:834
 msgid "Transfer done."
 msgstr ""
 
-#: ../gtk/incall_view.c:831
+#: ../gtk/incall_view.c:837
 msgid "Transfer failed."
 msgstr ""
 
-#: ../gtk/incall_view.c:875
+#: ../gtk/incall_view.c:881
 msgid "Resume"
 msgstr ""
 
-#: ../gtk/incall_view.c:882 ../gtk/main.ui.h:9
+#: ../gtk/incall_view.c:888 ../gtk/main.ui.h:9
 msgid "Pause"
 msgstr ""
 
-#: ../gtk/incall_view.c:948
+#: ../gtk/incall_view.c:954
 #, c-format
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
 msgstr ""
 
-#: ../gtk/incall_view.c:948
+#: ../gtk/incall_view.c:954
 msgid "(Paused)"
 msgstr ""
 
@@ -819,23 +828,23 @@ msgstr ""
 msgid "Let's start Linphone now"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:496
+#: ../gtk/audio_assistant.c:503
 msgid "Audio Assistant"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:506 ../gtk/main.ui.h:31
+#: ../gtk/audio_assistant.c:513 ../gtk/main.ui.h:31
 msgid "Audio assistant"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:511
+#: ../gtk/audio_assistant.c:518
 msgid "Mic Gain calibration"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:517
+#: ../gtk/audio_assistant.c:524
 msgid "Speaker volume calibration"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:522
+#: ../gtk/audio_assistant.c:529
 msgid "Record and Play"
 msgstr ""
 
@@ -1683,68 +1692,68 @@ msgstr ""
 msgid "Please wait while fetching configuration from server..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1510
+#: ../coreapi/linphonecore.c:1508
 msgid "Ready"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2489
+#: ../coreapi/linphonecore.c:2495
 msgid "Configuring"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2654
+#: ../coreapi/linphonecore.c:2669
 msgid "Looking for telephone number destination..."
 msgstr "Procurando por telefone de destino..."
 
-#: ../coreapi/linphonecore.c:2656
+#: ../coreapi/linphonecore.c:2671
 msgid "Could not resolve this number."
 msgstr "Não foi possível encontrar este número."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2942
+#: ../coreapi/linphonecore.c:2957
 msgid "Contacting"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2947
+#: ../coreapi/linphonecore.c:2962
 msgid "Could not call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3097
+#: ../coreapi/linphonecore.c:3112
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3256
+#: ../coreapi/linphonecore.c:3270
 msgid "is contacting you"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3257
+#: ../coreapi/linphonecore.c:3271
 msgid " and asked autoanswer."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3375
+#: ../coreapi/linphonecore.c:3395
 msgid "Modifying call parameters..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3723
+#: ../coreapi/linphonecore.c:3743
 msgid "Connected."
 msgstr "Conectado."
 
-#: ../coreapi/linphonecore.c:3748
+#: ../coreapi/linphonecore.c:3768
 msgid "Call aborted"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3938
+#: ../coreapi/linphonecore.c:3958
 msgid "Could not pause the call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3941
+#: ../coreapi/linphonecore.c:3961
 msgid "Pausing the current call..."
 msgstr ""
 
-#: ../coreapi/misc.c:438
+#: ../coreapi/misc.c:433
 msgid "Stun lookup in progress..."
 msgstr ""
 
-#: ../coreapi/misc.c:619
+#: ../coreapi/misc.c:614
 msgid "ICE local candidates gathering in progress..."
 msgstr ""
 
@@ -1800,138 +1809,139 @@ msgstr ""
 msgid "Unknown status"
 msgstr ""
 
-#: ../coreapi/proxy.c:327
+#: ../coreapi/proxy.c:328
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
 msgstr ""
 
-#: ../coreapi/proxy.c:333
+#: ../coreapi/proxy.c:334
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
 msgstr ""
 
-#: ../coreapi/proxy.c:1391
+#: ../coreapi/proxy.c:1403
 #, c-format
 msgid "Could not login as %s"
 msgstr ""
 
-#: ../coreapi/callbacks.c:383
+#: ../coreapi/callbacks.c:404
 msgid "Remote ringing."
 msgstr ""
 
-#: ../coreapi/callbacks.c:404
+#: ../coreapi/callbacks.c:425
 msgid "Remote ringing..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:414
+#: ../coreapi/callbacks.c:442
 msgid "Early media."
 msgstr ""
 
-#: ../coreapi/callbacks.c:475
+#: ../coreapi/callbacks.c:503
 #, c-format
 msgid "Call with %s is paused."
 msgstr ""
 
-#: ../coreapi/callbacks.c:488
+#: ../coreapi/callbacks.c:516
 #, c-format
 msgid "Call answered by %s - on hold."
 msgstr ""
 
-#: ../coreapi/callbacks.c:498
+#: ../coreapi/callbacks.c:526
 msgid "Call resumed."
 msgstr ""
 
-#: ../coreapi/callbacks.c:502
+#: ../coreapi/callbacks.c:530
 #, c-format
 msgid "Call answered by %s."
 msgstr ""
 
-#: ../coreapi/callbacks.c:525
+#: ../coreapi/callbacks.c:553
 msgid "Incompatible, check codecs or security settings..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:829
+#: ../coreapi/callbacks.c:558 ../coreapi/callbacks.c:870
 msgid "Incompatible media parameters."
 msgstr ""
 
-#: ../coreapi/callbacks.c:560
+#: ../coreapi/callbacks.c:588
 msgid "We have been resumed."
 msgstr ""
 
 #. we are being paused
-#: ../coreapi/callbacks.c:568
+#: ../coreapi/callbacks.c:596
 msgid "We are paused by other party."
 msgstr ""
 
 #. reINVITE and in-dialogs UPDATE go here
-#: ../coreapi/callbacks.c:602
+#: ../coreapi/callbacks.c:630
 msgid "Call is updated by remote."
 msgstr ""
 
-#: ../coreapi/callbacks.c:705
+#: ../coreapi/callbacks.c:746
 msgid "Call terminated."
 msgstr ""
 
-#: ../coreapi/callbacks.c:733
+#: ../coreapi/callbacks.c:774
 msgid "User is busy."
 msgstr "Usuário está ocupado."
 
-#: ../coreapi/callbacks.c:734
+#: ../coreapi/callbacks.c:775
 msgid "User is temporarily unavailable."
 msgstr "Usuário está temporáriamente indisponível."
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:736
+#: ../coreapi/callbacks.c:777
 msgid "User does not want to be disturbed."
 msgstr ""
 
-#: ../coreapi/callbacks.c:737
+#: ../coreapi/callbacks.c:778
 msgid "Call declined."
 msgstr ""
 
-#: ../coreapi/callbacks.c:752
+#: ../coreapi/callbacks.c:793
 msgid "Request timeout."
 msgstr ""
 
-#: ../coreapi/callbacks.c:783
+#: ../coreapi/callbacks.c:824
 msgid "Redirected"
 msgstr ""
 
-#: ../coreapi/callbacks.c:838
+#: ../coreapi/callbacks.c:879
 msgid "Call failed."
 msgstr ""
 
-#: ../coreapi/callbacks.c:916
+#: ../coreapi/callbacks.c:957
 #, c-format
 msgid "Registration on %s successful."
 msgstr ""
 
-#: ../coreapi/callbacks.c:917
+#: ../coreapi/callbacks.c:958
 #, c-format
 msgid "Unregistration on %s done."
 msgstr ""
 
-#: ../coreapi/callbacks.c:935
+#: ../coreapi/callbacks.c:976
 msgid "no response timeout"
 msgstr ""
 
-#: ../coreapi/callbacks.c:938
+#: ../coreapi/callbacks.c:979
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr ""
 
-#: ../coreapi/callbacks.c:945
+#: ../coreapi/callbacks.c:986
 msgid "Service unavailable, retrying"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:175
+#. if encryption is DTLS, no status to be displayed
+#: ../coreapi/linphonecall.c:180
 #, c-format
 msgid "Authentication token is %s"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:3041
+#: ../coreapi/linphonecall.c:3492
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
diff --git a/po/ru.po b/po/ru.po
index b3e312070..aeb106fc5 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -12,9 +12,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-13 16:18+0100\n"
-"PO-Revision-Date: 2015-01-14 09:11+0000\n"
-"Last-Translator: AlexL <loginov.alex.valer@gmail.com>\n"
+"POT-Creation-Date: 2015-02-17 12:28+0100\n"
+"PO-Revision-Date: 2015-02-17 11:28+0000\n"
+"Last-Translator: Belledonne Communications <support@belledonne-"
+"communications.com>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/ru/)\n"
 "Language: ru\n"
@@ -148,7 +149,7 @@ msgstr "Запустить помощника аудио"
 msgid "Run self test and exit 0 if succeed"
 msgstr "Запустить самотест и выйти при успехе со статусом 0"
 
-#: ../gtk/main.c:1083
+#: ../gtk/main.c:1088
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
@@ -161,7 +162,7 @@ msgstr ""
 "контактный лист?\n"
 "Если вы ответите Нет, эта персона будет временно в чёрном списке."
 
-#: ../gtk/main.c:1160
+#: ../gtk/main.c:1165
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
@@ -170,59 +171,59 @@ msgstr ""
 "Пожалуйста, введите пароль для пользователя <i>%s</i>\n"
 " для реалм (рилм) <i>%s</i>:"
 
-#: ../gtk/main.c:1281
+#: ../gtk/main.c:1286
 msgid "Call error"
 msgstr "Ошибка звонка"
 
-#: ../gtk/main.c:1284 ../coreapi/linphonecore.c:3767
+#: ../gtk/main.c:1289 ../coreapi/linphonecore.c:3787
 msgid "Call ended"
 msgstr "Звонок окончен"
 
-#: ../gtk/main.c:1287 ../coreapi/call_log.c:221
+#: ../gtk/main.c:1292 ../coreapi/call_log.c:221
 msgid "Incoming call"
 msgstr "Входящий звонок"
 
-#: ../gtk/main.c:1289 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
+#: ../gtk/main.c:1294 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
 msgid "Answer"
 msgstr "Ответ"
 
-#: ../gtk/main.c:1291 ../gtk/main.ui.h:6
+#: ../gtk/main.c:1296 ../gtk/main.ui.h:6
 msgid "Decline"
 msgstr "Отклонить"
 
-#: ../gtk/main.c:1297
+#: ../gtk/main.c:1302
 msgid "Call paused"
 msgstr "Звонок приостановлен"
 
-#: ../gtk/main.c:1297
+#: ../gtk/main.c:1302
 #, c-format
 msgid "<b>by %s</b>"
 msgstr "<b>%s</b>"
 
-#: ../gtk/main.c:1367
+#: ../gtk/main.c:1372
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr "%s предложил запустить видео. Вы принимаете?"
 
-#: ../gtk/main.c:1529
+#: ../gtk/main.c:1534
 msgid "Website link"
 msgstr "Домашняя страница"
 
-#: ../gtk/main.c:1578
+#: ../gtk/main.c:1583
 msgid "Linphone - a video internet phone"
 msgstr "Linphone - интернет видео телефон"
 
-#: ../gtk/main.c:1670
+#: ../gtk/main.c:1675
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (по умолчанию)"
 
-#: ../gtk/main.c:2002 ../coreapi/callbacks.c:986
+#: ../gtk/main.c:2007 ../coreapi/callbacks.c:1027
 #, c-format
 msgid "We are transferred to %s"
 msgstr "Мы передали в %s"
 
-#: ../gtk/main.c:2012
+#: ../gtk/main.c:2017
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
@@ -230,7 +231,7 @@ msgstr ""
 "Звуковые карты не были обнаружены на этом компьютере.\n"
 "Вы не сможете отправлять или получать аудио звонки."
 
-#: ../gtk/main.c:2156
+#: ../gtk/main.c:2161
 msgid "A free SIP video-phone"
 msgstr "Свободный SIP видео-телефон"
 
@@ -386,15 +387,19 @@ msgstr ""
 "Вы должны перезагрузить linphone для того, чтобы языковые настройки вступили "
 "в силу."
 
-#: ../gtk/propertybox.c:1234
+#: ../gtk/propertybox.c:1236
 msgid "None"
 msgstr "Нет"
 
-#: ../gtk/propertybox.c:1238
+#: ../gtk/propertybox.c:1240
 msgid "SRTP"
 msgstr "SRTP"
 
-#: ../gtk/propertybox.c:1244
+#: ../gtk/propertybox.c:1246
+msgid "DTLS"
+msgstr ""
+
+#: ../gtk/propertybox.c:1253
 msgid "ZRTP"
 msgstr "ZRTP"
 
@@ -576,7 +581,7 @@ msgstr "Подтверждение (шаг 2/2)"
 msgid "Error"
 msgstr "Ошибка"
 
-#: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:527
+#: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:534
 msgid "Terminating"
 msgstr "Прерывание"
 
@@ -669,7 +674,7 @@ msgstr "Повесить трубку"
 msgid "<b>Calling...</b>"
 msgstr "<b>Звоним...</b>"
 
-#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:727
+#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:733
 msgid "00::00::00"
 msgstr "00::00::00"
 
@@ -706,55 +711,59 @@ msgid "Secured by SRTP"
 msgstr "Защищённые с помощью SRTP"
 
 #: ../gtk/incall_view.c:685
+msgid "Secured by DTLS"
+msgstr ""
+
+#: ../gtk/incall_view.c:691
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
 msgstr "Защищённые с помощью ZRTP - [знак аутентификации: %s]"
 
-#: ../gtk/incall_view.c:691
+#: ../gtk/incall_view.c:697
 msgid "Set unverified"
 msgstr "Установить непроверенный"
 
-#: ../gtk/incall_view.c:691 ../gtk/main.ui.h:4
+#: ../gtk/incall_view.c:697 ../gtk/main.ui.h:4
 msgid "Set verified"
 msgstr "Установить проверенный"
 
-#: ../gtk/incall_view.c:722
+#: ../gtk/incall_view.c:728
 msgid "In conference"
 msgstr "В конференции"
 
-#: ../gtk/incall_view.c:722
+#: ../gtk/incall_view.c:728
 msgid "<b>In call</b>"
 msgstr "<b>Звоним</b>"
 
-#: ../gtk/incall_view.c:758
+#: ../gtk/incall_view.c:764
 msgid "<b>Paused call</b>"
 msgstr "<b>Звонок приостановлен</b>"
 
-#: ../gtk/incall_view.c:794
+#: ../gtk/incall_view.c:800
 msgid "<b>Call ended.</b>"
 msgstr "<b>Звонок закончен.</b>"
 
-#: ../gtk/incall_view.c:825
+#: ../gtk/incall_view.c:831
 msgid "Transfer in progress"
 msgstr "Передача в прогрессе"
 
-#: ../gtk/incall_view.c:828
+#: ../gtk/incall_view.c:834
 msgid "Transfer done."
 msgstr "Передача завершена."
 
-#: ../gtk/incall_view.c:831
+#: ../gtk/incall_view.c:837
 msgid "Transfer failed."
 msgstr "Передача неудачна."
 
-#: ../gtk/incall_view.c:875
+#: ../gtk/incall_view.c:881
 msgid "Resume"
 msgstr "Продолжить"
 
-#: ../gtk/incall_view.c:882 ../gtk/main.ui.h:9
+#: ../gtk/incall_view.c:888 ../gtk/main.ui.h:9
 msgid "Pause"
 msgstr "Пауза"
 
-#: ../gtk/incall_view.c:948
+#: ../gtk/incall_view.c:954
 #, c-format
 msgid ""
 "<small><i>Recording into\n"
@@ -763,7 +772,7 @@ msgstr ""
 "<small><i>Записывается в\n"
 "%s %s</i></small>"
 
-#: ../gtk/incall_view.c:948
+#: ../gtk/incall_view.c:954
 msgid "(Paused)"
 msgstr "(Пауза)"
 
@@ -862,23 +871,23 @@ msgstr "Воспроизведение"
 msgid "Let's start Linphone now"
 msgstr "Давайте сейчас запустим linphone"
 
-#: ../gtk/audio_assistant.c:496
+#: ../gtk/audio_assistant.c:503
 msgid "Audio Assistant"
 msgstr "Помощник аудио"
 
-#: ../gtk/audio_assistant.c:506 ../gtk/main.ui.h:31
+#: ../gtk/audio_assistant.c:513 ../gtk/main.ui.h:31
 msgid "Audio assistant"
 msgstr "Помощник аудио"
 
-#: ../gtk/audio_assistant.c:511
+#: ../gtk/audio_assistant.c:518
 msgid "Mic Gain calibration"
 msgstr "Калибровка усиления микрофона"
 
-#: ../gtk/audio_assistant.c:517
+#: ../gtk/audio_assistant.c:524
 msgid "Speaker volume calibration"
 msgstr "Калибровка громкости динамика"
 
-#: ../gtk/audio_assistant.c:522
+#: ../gtk/audio_assistant.c:529
 msgid "Record and Play"
 msgstr "Записать и проиграть"
 
@@ -1747,69 +1756,69 @@ msgstr "Конфигурирование..."
 msgid "Please wait while fetching configuration from server..."
 msgstr "Пожалуйста, подождите пока получается конфигурация с сервера..."
 
-#: ../coreapi/linphonecore.c:1510
+#: ../coreapi/linphonecore.c:1508
 msgid "Ready"
 msgstr "Готов"
 
-#: ../coreapi/linphonecore.c:2489
+#: ../coreapi/linphonecore.c:2495
 msgid "Configuring"
 msgstr "Конфигурирование"
 
-#: ../coreapi/linphonecore.c:2654
+#: ../coreapi/linphonecore.c:2669
 msgid "Looking for telephone number destination..."
 msgstr "Поиск назначения для телефонного номера.."
 
-#: ../coreapi/linphonecore.c:2656
+#: ../coreapi/linphonecore.c:2671
 msgid "Could not resolve this number."
 msgstr "Не получилось принять решение по этому номеру."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2942
+#: ../coreapi/linphonecore.c:2957
 msgid "Contacting"
 msgstr "Соединение"
 
-#: ../coreapi/linphonecore.c:2947
+#: ../coreapi/linphonecore.c:2962
 msgid "Could not call"
 msgstr "Невозможно позвонить"
 
-#: ../coreapi/linphonecore.c:3097
+#: ../coreapi/linphonecore.c:3112
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr ""
 "К сожалению, мы достигли максимального количества одновременных звонков"
 
-#: ../coreapi/linphonecore.c:3256
+#: ../coreapi/linphonecore.c:3270
 msgid "is contacting you"
 msgstr "контактирует с вами"
 
-#: ../coreapi/linphonecore.c:3257
+#: ../coreapi/linphonecore.c:3271
 msgid " and asked autoanswer."
 msgstr "и спросил автоматический ответ."
 
-#: ../coreapi/linphonecore.c:3375
+#: ../coreapi/linphonecore.c:3395
 msgid "Modifying call parameters..."
 msgstr "Изменение параметров звонка..."
 
-#: ../coreapi/linphonecore.c:3723
+#: ../coreapi/linphonecore.c:3743
 msgid "Connected."
 msgstr "Соединён."
 
-#: ../coreapi/linphonecore.c:3748
+#: ../coreapi/linphonecore.c:3768
 msgid "Call aborted"
 msgstr "Звонок отменён"
 
-#: ../coreapi/linphonecore.c:3938
+#: ../coreapi/linphonecore.c:3958
 msgid "Could not pause the call"
 msgstr "Невозможно приостановить звонок"
 
-#: ../coreapi/linphonecore.c:3941
+#: ../coreapi/linphonecore.c:3961
 msgid "Pausing the current call..."
 msgstr "Приостановка текущего звонка..."
 
-#: ../coreapi/misc.c:438
+#: ../coreapi/misc.c:433
 msgid "Stun lookup in progress..."
 msgstr "Идет поиск STUN..."
 
-#: ../coreapi/misc.c:619
+#: ../coreapi/misc.c:614
 msgid "ICE local candidates gathering in progress..."
 msgstr "Сбор локальных кандидатов ICE в прогрессе..."
 
@@ -1865,7 +1874,7 @@ msgstr "Отдых"
 msgid "Unknown status"
 msgstr "Неизвестный статус"
 
-#: ../coreapi/proxy.c:327
+#: ../coreapi/proxy.c:328
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
@@ -1873,7 +1882,7 @@ msgstr ""
 "Введённый SIP-адрес прокси является недействительным, он должен начинаться с "
 "\"sip:имя_хоста\""
 
-#: ../coreapi/proxy.c:333
+#: ../coreapi/proxy.c:334
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
@@ -1882,126 +1891,127 @@ msgstr ""
 "Должно выглядеть как sip:имя_пользователя@домен_прокси, как например, sip:"
 "alice@example.net"
 
-#: ../coreapi/proxy.c:1391
+#: ../coreapi/proxy.c:1403
 #, c-format
 msgid "Could not login as %s"
 msgstr "Невозможно зайти как: %s"
 
-#: ../coreapi/callbacks.c:383
+#: ../coreapi/callbacks.c:404
 msgid "Remote ringing."
 msgstr "Дистанционный звонок."
 
-#: ../coreapi/callbacks.c:404
+#: ../coreapi/callbacks.c:425
 msgid "Remote ringing..."
 msgstr "Дистанционный звонок..."
 
-#: ../coreapi/callbacks.c:414
+#: ../coreapi/callbacks.c:442
 msgid "Early media."
 msgstr "Предответное проключение."
 
-#: ../coreapi/callbacks.c:475
+#: ../coreapi/callbacks.c:503
 #, c-format
 msgid "Call with %s is paused."
 msgstr "Звонок с %s приостановлен."
 
-#: ../coreapi/callbacks.c:488
+#: ../coreapi/callbacks.c:516
 #, c-format
 msgid "Call answered by %s - on hold."
 msgstr "На звонок ответил %s - на удержании."
 
-#: ../coreapi/callbacks.c:498
+#: ../coreapi/callbacks.c:526
 msgid "Call resumed."
 msgstr "Звонок возобновлён."
 
-#: ../coreapi/callbacks.c:502
+#: ../coreapi/callbacks.c:530
 #, c-format
 msgid "Call answered by %s."
 msgstr "На звонок ответил %s."
 
-#: ../coreapi/callbacks.c:525
+#: ../coreapi/callbacks.c:553
 msgid "Incompatible, check codecs or security settings..."
 msgstr "Несовместимость, проверьте кодеки или параметры безопасности..."
 
-#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:829
+#: ../coreapi/callbacks.c:558 ../coreapi/callbacks.c:870
 msgid "Incompatible media parameters."
 msgstr "Несовместимость медиа-параметров."
 
-#: ../coreapi/callbacks.c:560
+#: ../coreapi/callbacks.c:588
 msgid "We have been resumed."
 msgstr "Мы возобновили."
 
 #. we are being paused
-#: ../coreapi/callbacks.c:568
+#: ../coreapi/callbacks.c:596
 msgid "We are paused by other party."
 msgstr "Мы приостановлены другой стороной."
 
 #. reINVITE and in-dialogs UPDATE go here
-#: ../coreapi/callbacks.c:602
+#: ../coreapi/callbacks.c:630
 msgid "Call is updated by remote."
 msgstr "Звонок был дистанционно обновлён."
 
-#: ../coreapi/callbacks.c:705
+#: ../coreapi/callbacks.c:746
 msgid "Call terminated."
 msgstr "Звонок прерван."
 
-#: ../coreapi/callbacks.c:733
+#: ../coreapi/callbacks.c:774
 msgid "User is busy."
 msgstr "Пользователь занят."
 
-#: ../coreapi/callbacks.c:734
+#: ../coreapi/callbacks.c:775
 msgid "User is temporarily unavailable."
 msgstr "Пользователь временно недоступен."
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:736
+#: ../coreapi/callbacks.c:777
 msgid "User does not want to be disturbed."
 msgstr "Пользователь не хочет чтобы его беспокоили."
 
-#: ../coreapi/callbacks.c:737
+#: ../coreapi/callbacks.c:778
 msgid "Call declined."
 msgstr "Звонок отклонён."
 
-#: ../coreapi/callbacks.c:752
+#: ../coreapi/callbacks.c:793
 msgid "Request timeout."
 msgstr "Таймаут запроса."
 
-#: ../coreapi/callbacks.c:783
+#: ../coreapi/callbacks.c:824
 msgid "Redirected"
 msgstr "Переадресован"
 
-#: ../coreapi/callbacks.c:838
+#: ../coreapi/callbacks.c:879
 msgid "Call failed."
 msgstr "Звонок не удался."
 
-#: ../coreapi/callbacks.c:916
+#: ../coreapi/callbacks.c:957
 #, c-format
 msgid "Registration on %s successful."
 msgstr "Регистрация на %s прошла успешно."
 
-#: ../coreapi/callbacks.c:917
+#: ../coreapi/callbacks.c:958
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "Отмена регистрации на %s завершена."
 
-#: ../coreapi/callbacks.c:935
+#: ../coreapi/callbacks.c:976
 msgid "no response timeout"
 msgstr "время ожидания истекло"
 
-#: ../coreapi/callbacks.c:938
+#: ../coreapi/callbacks.c:979
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "Регистрация на %s не удалась: %s"
 
-#: ../coreapi/callbacks.c:945
+#: ../coreapi/callbacks.c:986
 msgid "Service unavailable, retrying"
 msgstr "Сервис недоступен, повтор"
 
-#: ../coreapi/linphonecall.c:175
+#. if encryption is DTLS, no status to be displayed
+#: ../coreapi/linphonecall.c:180
 #, c-format
 msgid "Authentication token is %s"
 msgstr "Маркер проверки подлинности: %s"
 
-#: ../coreapi/linphonecall.c:3041
+#: ../coreapi/linphonecall.c:3492
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
diff --git a/po/sr.po b/po/sr.po
index 56f9e5f19..c27c803ee 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -8,9 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-13 16:18+0100\n"
-"PO-Revision-Date: 2015-01-13 16:34+0000\n"
-"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
+"POT-Creation-Date: 2015-02-17 12:28+0100\n"
+"PO-Revision-Date: 2015-02-17 11:28+0000\n"
+"Last-Translator: Belledonne Communications <support@belledonne-"
+"communications.com>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/sr/)\n"
 "Language: sr\n"
@@ -142,7 +143,7 @@ msgstr "Покреће помоћника звука"
 msgid "Run self test and exit 0 if succeed"
 msgstr "Покреће самоиспробавање и излази 0 ако је успешно"
 
-#: ../gtk/main.c:1083
+#: ../gtk/main.c:1088
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
@@ -156,7 +157,7 @@ msgstr ""
 "Ако одговорите са не, ова особа ће привремено бити стављена на списак "
 "забрана."
 
-#: ../gtk/main.c:1160
+#: ../gtk/main.c:1165
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
@@ -165,59 +166,59 @@ msgstr ""
 "Унесите вашу лозинку за корисничко име <i>%s</i>\n"
 " на подручју <i>%s</i>:"
 
-#: ../gtk/main.c:1281
+#: ../gtk/main.c:1286
 msgid "Call error"
 msgstr "Грешка позива"
 
-#: ../gtk/main.c:1284 ../coreapi/linphonecore.c:3767
+#: ../gtk/main.c:1289 ../coreapi/linphonecore.c:3787
 msgid "Call ended"
 msgstr "Позив је завршен"
 
-#: ../gtk/main.c:1287 ../coreapi/call_log.c:221
+#: ../gtk/main.c:1292 ../coreapi/call_log.c:221
 msgid "Incoming call"
 msgstr "Долазни позив"
 
-#: ../gtk/main.c:1289 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
+#: ../gtk/main.c:1294 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
 msgid "Answer"
 msgstr "Јави се"
 
-#: ../gtk/main.c:1291 ../gtk/main.ui.h:6
+#: ../gtk/main.c:1296 ../gtk/main.ui.h:6
 msgid "Decline"
 msgstr "Одбиј"
 
-#: ../gtk/main.c:1297
+#: ../gtk/main.c:1302
 msgid "Call paused"
 msgstr "Позив је заустављен"
 
-#: ../gtk/main.c:1297
+#: ../gtk/main.c:1302
 #, c-format
 msgid "<b>by %s</b>"
 msgstr "<b>од %s</b>"
 
-#: ../gtk/main.c:1367
+#: ../gtk/main.c:1372
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr "%s предлаже да започнете видео. Да ли прихватате ?"
 
-#: ../gtk/main.c:1529
+#: ../gtk/main.c:1534
 msgid "Website link"
 msgstr "Веза веб сајта"
 
-#: ../gtk/main.c:1578
+#: ../gtk/main.c:1583
 msgid "Linphone - a video internet phone"
 msgstr "Линфон — интернет телефон са снимком"
 
-#: ../gtk/main.c:1670
+#: ../gtk/main.c:1675
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (основно)"
 
-#: ../gtk/main.c:2002 ../coreapi/callbacks.c:986
+#: ../gtk/main.c:2007 ../coreapi/callbacks.c:1027
 #, c-format
 msgid "We are transferred to %s"
 msgstr "Преселили смо се на %s"
 
-#: ../gtk/main.c:2012
+#: ../gtk/main.c:2017
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
@@ -225,7 +226,7 @@ msgstr ""
 "Ниједна звучна картица није откривена на овом рачунару.\n"
 "Нећете бити у могућности да шаљете или да примате звучне позиве."
 
-#: ../gtk/main.c:2156
+#: ../gtk/main.c:2161
 msgid "A free SIP video-phone"
 msgstr "Слободан СИП телефон са снимком"
 
@@ -380,15 +381,19 @@ msgid ""
 msgstr ""
 "Треба поново да покренете линфон да би нови изабрани језик ступио у дејство."
 
-#: ../gtk/propertybox.c:1234
+#: ../gtk/propertybox.c:1236
 msgid "None"
 msgstr "Ништа"
 
-#: ../gtk/propertybox.c:1238
+#: ../gtk/propertybox.c:1240
 msgid "SRTP"
 msgstr "СРТП"
 
-#: ../gtk/propertybox.c:1244
+#: ../gtk/propertybox.c:1246
+msgid "DTLS"
+msgstr ""
+
+#: ../gtk/propertybox.c:1253
 msgid "ZRTP"
 msgstr "ЗРТП"
 
@@ -568,7 +573,7 @@ msgstr "Потврђивање (корак 2/2)"
 msgid "Error"
 msgstr "Грешка"
 
-#: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:527
+#: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:534
 msgid "Terminating"
 msgstr "Завршавам"
 
@@ -661,7 +666,7 @@ msgstr "Прекини"
 msgid "<b>Calling...</b>"
 msgstr "<b>Позивам...</b>"
 
-#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:727
+#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:733
 msgid "00::00::00"
 msgstr "00::00::00"
 
@@ -698,55 +703,59 @@ msgid "Secured by SRTP"
 msgstr "Осигурано СРТП-ом"
 
 #: ../gtk/incall_view.c:685
+msgid "Secured by DTLS"
+msgstr ""
+
+#: ../gtk/incall_view.c:691
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
 msgstr "Осигурано ЗРТП-ом [потврђивање идентитета: %s]"
 
-#: ../gtk/incall_view.c:691
+#: ../gtk/incall_view.c:697
 msgid "Set unverified"
 msgstr "Непроверено подешавање"
 
-#: ../gtk/incall_view.c:691 ../gtk/main.ui.h:4
+#: ../gtk/incall_view.c:697 ../gtk/main.ui.h:4
 msgid "Set verified"
 msgstr "Проверено подешавање"
 
-#: ../gtk/incall_view.c:722
+#: ../gtk/incall_view.c:728
 msgid "In conference"
 msgstr "На конференцији"
 
-#: ../gtk/incall_view.c:722
+#: ../gtk/incall_view.c:728
 msgid "<b>In call</b>"
 msgstr "<b>У позиву</b>"
 
-#: ../gtk/incall_view.c:758
+#: ../gtk/incall_view.c:764
 msgid "<b>Paused call</b>"
 msgstr "<b>Заустављен позив</b>"
 
-#: ../gtk/incall_view.c:794
+#: ../gtk/incall_view.c:800
 msgid "<b>Call ended.</b>"
 msgstr "<b>Позив је завршен.</b>"
 
-#: ../gtk/incall_view.c:825
+#: ../gtk/incall_view.c:831
 msgid "Transfer in progress"
 msgstr "Пренос је у току"
 
-#: ../gtk/incall_view.c:828
+#: ../gtk/incall_view.c:834
 msgid "Transfer done."
 msgstr "Пренос је обављен."
 
-#: ../gtk/incall_view.c:831
+#: ../gtk/incall_view.c:837
 msgid "Transfer failed."
 msgstr "Пренос није успео."
 
-#: ../gtk/incall_view.c:875
+#: ../gtk/incall_view.c:881
 msgid "Resume"
 msgstr "Настави"
 
-#: ../gtk/incall_view.c:882 ../gtk/main.ui.h:9
+#: ../gtk/incall_view.c:888 ../gtk/main.ui.h:9
 msgid "Pause"
 msgstr "Застани"
 
-#: ../gtk/incall_view.c:948
+#: ../gtk/incall_view.c:954
 #, c-format
 msgid ""
 "<small><i>Recording into\n"
@@ -755,7 +764,7 @@ msgstr ""
 "<small><i>Снимам у\n"
 "%s %s</i></small>"
 
-#: ../gtk/incall_view.c:948
+#: ../gtk/incall_view.c:954
 msgid "(Paused)"
 msgstr "(Паузирано)"
 
@@ -854,23 +863,23 @@ msgstr "Пусти"
 msgid "Let's start Linphone now"
 msgstr "Хајде сада да покренемо Линфон"
 
-#: ../gtk/audio_assistant.c:496
+#: ../gtk/audio_assistant.c:503
 msgid "Audio Assistant"
 msgstr "Помоћник звука"
 
-#: ../gtk/audio_assistant.c:506 ../gtk/main.ui.h:31
+#: ../gtk/audio_assistant.c:513 ../gtk/main.ui.h:31
 msgid "Audio assistant"
 msgstr "Помоћник звука"
 
-#: ../gtk/audio_assistant.c:511
+#: ../gtk/audio_assistant.c:518
 msgid "Mic Gain calibration"
 msgstr "Дотеривање појачања микрофона"
 
-#: ../gtk/audio_assistant.c:517
+#: ../gtk/audio_assistant.c:524
 msgid "Speaker volume calibration"
 msgstr "Дотеривање јачине звука звучника"
 
-#: ../gtk/audio_assistant.c:522
+#: ../gtk/audio_assistant.c:529
 msgid "Record and Play"
 msgstr "Снимите и пустите"
 
@@ -1739,68 +1748,68 @@ msgstr "Подешавам..."
 msgid "Please wait while fetching configuration from server..."
 msgstr "Сачекајте док довучем подешавања са сервера..."
 
-#: ../coreapi/linphonecore.c:1510
+#: ../coreapi/linphonecore.c:1508
 msgid "Ready"
 msgstr "Спреман"
 
-#: ../coreapi/linphonecore.c:2489
+#: ../coreapi/linphonecore.c:2495
 msgid "Configuring"
 msgstr "Подешавам"
 
-#: ../coreapi/linphonecore.c:2654
+#: ../coreapi/linphonecore.c:2669
 msgid "Looking for telephone number destination..."
 msgstr "Тражим одредиште телефонског броја..."
 
-#: ../coreapi/linphonecore.c:2656
+#: ../coreapi/linphonecore.c:2671
 msgid "Could not resolve this number."
 msgstr "Не могу да решим овај број."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2942
+#: ../coreapi/linphonecore.c:2957
 msgid "Contacting"
 msgstr "Ступам у везу"
 
-#: ../coreapi/linphonecore.c:2947
+#: ../coreapi/linphonecore.c:2962
 msgid "Could not call"
 msgstr "Не могу да позовем"
 
-#: ../coreapi/linphonecore.c:3097
+#: ../coreapi/linphonecore.c:3112
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "Извините, достигли смо највећи број истовремених позива"
 
-#: ../coreapi/linphonecore.c:3256
+#: ../coreapi/linphonecore.c:3270
 msgid "is contacting you"
 msgstr "вам се обраћа"
 
-#: ../coreapi/linphonecore.c:3257
+#: ../coreapi/linphonecore.c:3271
 msgid " and asked autoanswer."
 msgstr " и затражени само-одговор."
 
-#: ../coreapi/linphonecore.c:3375
+#: ../coreapi/linphonecore.c:3395
 msgid "Modifying call parameters..."
 msgstr "Мењам параметре позива..."
 
-#: ../coreapi/linphonecore.c:3723
+#: ../coreapi/linphonecore.c:3743
 msgid "Connected."
 msgstr "Повезан сам."
 
-#: ../coreapi/linphonecore.c:3748
+#: ../coreapi/linphonecore.c:3768
 msgid "Call aborted"
 msgstr "Позив је прекинут"
 
-#: ../coreapi/linphonecore.c:3938
+#: ../coreapi/linphonecore.c:3958
 msgid "Could not pause the call"
 msgstr "Не могу да зауставим позив"
 
-#: ../coreapi/linphonecore.c:3941
+#: ../coreapi/linphonecore.c:3961
 msgid "Pausing the current call..."
 msgstr "Заустављам тренутни позив..."
 
-#: ../coreapi/misc.c:438
+#: ../coreapi/misc.c:433
 msgid "Stun lookup in progress..."
 msgstr "У току је тражење стуна..."
 
-#: ../coreapi/misc.c:619
+#: ../coreapi/misc.c:614
 msgid "ICE local candidates gathering in progress..."
 msgstr "Прикупљање месних ИЦЕ кандидата је у току..."
 
@@ -1856,7 +1865,7 @@ msgstr "На одмору"
 msgid "Unknown status"
 msgstr "Непознато стање"
 
-#: ../coreapi/proxy.c:327
+#: ../coreapi/proxy.c:328
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
@@ -1864,7 +1873,7 @@ msgstr ""
 "Адреса сип посредника коју сте унели је неисправна, мора почети на „sip:“ за "
 "којим следи назив домаћина."
 
-#: ../coreapi/proxy.c:333
+#: ../coreapi/proxy.c:334
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
@@ -1873,126 +1882,127 @@ msgstr ""
 "Треба да изгледа као „sip:корисник@домен-посредника, као што је „sip:"
 "alice@example.net“"
 
-#: ../coreapi/proxy.c:1391
+#: ../coreapi/proxy.c:1403
 #, c-format
 msgid "Could not login as %s"
 msgstr "Не могу да се пријавим као %s"
 
-#: ../coreapi/callbacks.c:383
+#: ../coreapi/callbacks.c:404
 msgid "Remote ringing."
 msgstr "Удаљено звоњење."
 
-#: ../coreapi/callbacks.c:404
+#: ../coreapi/callbacks.c:425
 msgid "Remote ringing..."
 msgstr "Удаљено звоњење..."
 
-#: ../coreapi/callbacks.c:414
+#: ../coreapi/callbacks.c:442
 msgid "Early media."
 msgstr "Ранији медиј."
 
-#: ../coreapi/callbacks.c:475
+#: ../coreapi/callbacks.c:503
 #, c-format
 msgid "Call with %s is paused."
 msgstr "Позив са „%s“ је заустављен."
 
-#: ../coreapi/callbacks.c:488
+#: ../coreapi/callbacks.c:516
 #, c-format
 msgid "Call answered by %s - on hold."
 msgstr "Позив на који је одговорио „%s“ — на чекању."
 
-#: ../coreapi/callbacks.c:498
+#: ../coreapi/callbacks.c:526
 msgid "Call resumed."
 msgstr "Позив је настављен."
 
-#: ../coreapi/callbacks.c:502
+#: ../coreapi/callbacks.c:530
 #, c-format
 msgid "Call answered by %s."
 msgstr "На позив је одговорио „%s“."
 
-#: ../coreapi/callbacks.c:525
+#: ../coreapi/callbacks.c:553
 msgid "Incompatible, check codecs or security settings..."
 msgstr "Несагласно, проверите кодеке или безбедносна подешавања..."
 
-#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:829
+#: ../coreapi/callbacks.c:558 ../coreapi/callbacks.c:870
 msgid "Incompatible media parameters."
 msgstr "Медијски параметри су несагласни."
 
-#: ../coreapi/callbacks.c:560
+#: ../coreapi/callbacks.c:588
 msgid "We have been resumed."
 msgstr "Наставили смо."
 
 #. we are being paused
-#: ../coreapi/callbacks.c:568
+#: ../coreapi/callbacks.c:596
 msgid "We are paused by other party."
 msgstr "Друга страна нас је паузирала."
 
 #. reINVITE and in-dialogs UPDATE go here
-#: ../coreapi/callbacks.c:602
+#: ../coreapi/callbacks.c:630
 msgid "Call is updated by remote."
 msgstr "Позив је освежен удаљеним."
 
-#: ../coreapi/callbacks.c:705
+#: ../coreapi/callbacks.c:746
 msgid "Call terminated."
 msgstr "Позив је завршен."
 
-#: ../coreapi/callbacks.c:733
+#: ../coreapi/callbacks.c:774
 msgid "User is busy."
 msgstr "Корисник је заузет."
 
-#: ../coreapi/callbacks.c:734
+#: ../coreapi/callbacks.c:775
 msgid "User is temporarily unavailable."
 msgstr "Корисник је привремено недоступан."
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:736
+#: ../coreapi/callbacks.c:777
 msgid "User does not want to be disturbed."
 msgstr "Корисник не жели да буде узнемираван."
 
-#: ../coreapi/callbacks.c:737
+#: ../coreapi/callbacks.c:778
 msgid "Call declined."
 msgstr "Позив је одбијен."
 
-#: ../coreapi/callbacks.c:752
+#: ../coreapi/callbacks.c:793
 msgid "Request timeout."
 msgstr "Истекло је време захтева."
 
-#: ../coreapi/callbacks.c:783
+#: ../coreapi/callbacks.c:824
 msgid "Redirected"
 msgstr "Преусмерен"
 
-#: ../coreapi/callbacks.c:838
+#: ../coreapi/callbacks.c:879
 msgid "Call failed."
 msgstr "Позив није успео."
 
-#: ../coreapi/callbacks.c:916
+#: ../coreapi/callbacks.c:957
 #, c-format
 msgid "Registration on %s successful."
 msgstr "Уписивање на „%s“ је успело."
 
-#: ../coreapi/callbacks.c:917
+#: ../coreapi/callbacks.c:958
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "Исписивање са „%s“ је обављено."
 
-#: ../coreapi/callbacks.c:935
+#: ../coreapi/callbacks.c:976
 msgid "no response timeout"
 msgstr "нема ограничења одговора"
 
-#: ../coreapi/callbacks.c:938
+#: ../coreapi/callbacks.c:979
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "Уписивање на „%s“ није успело: %s"
 
-#: ../coreapi/callbacks.c:945
+#: ../coreapi/callbacks.c:986
 msgid "Service unavailable, retrying"
 msgstr "Услуга није доступна, поново покушавам"
 
-#: ../coreapi/linphonecall.c:175
+#. if encryption is DTLS, no status to be displayed
+#: ../coreapi/linphonecall.c:180
 #, c-format
 msgid "Authentication token is %s"
 msgstr "Симбол потврђивања идентитета је „%s“"
 
-#: ../coreapi/linphonecall.c:3041
+#: ../coreapi/linphonecall.c:3492
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
diff --git a/po/sv.po b/po/sv.po
index b43407cf6..ddee3cf70 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,9 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-13 16:18+0100\n"
-"PO-Revision-Date: 2015-01-06 11:29+0000\n"
-"Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
+"POT-Creation-Date: 2015-02-17 12:28+0100\n"
+"PO-Revision-Date: 2015-02-17 11:28+0000\n"
+"Last-Translator: Belledonne Communications <support@belledonne-"
+"communications.com>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/linphone-gtk/"
 "language/sv/)\n"
 "Language: sv\n"
@@ -136,7 +137,7 @@ msgstr ""
 msgid "Run self test and exit 0 if succeed"
 msgstr ""
 
-#: ../gtk/main.c:1083
+#: ../gtk/main.c:1088
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
@@ -149,72 +150,72 @@ msgstr ""
 "henne till din kontaktlista?\n"
 "Om du svarar nej, personen kommer att vara bannlyst."
 
-#: ../gtk/main.c:1160
+#: ../gtk/main.c:1165
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
 msgstr ""
 
-#: ../gtk/main.c:1281
+#: ../gtk/main.c:1286
 msgid "Call error"
 msgstr ""
 
-#: ../gtk/main.c:1284 ../coreapi/linphonecore.c:3767
+#: ../gtk/main.c:1289 ../coreapi/linphonecore.c:3787
 msgid "Call ended"
 msgstr "Samtalet slut"
 
-#: ../gtk/main.c:1287 ../coreapi/call_log.c:221
+#: ../gtk/main.c:1292 ../coreapi/call_log.c:221
 msgid "Incoming call"
 msgstr "Inkommande samtal"
 
-#: ../gtk/main.c:1289 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
+#: ../gtk/main.c:1294 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
 msgid "Answer"
 msgstr ""
 
-#: ../gtk/main.c:1291 ../gtk/main.ui.h:6
+#: ../gtk/main.c:1296 ../gtk/main.ui.h:6
 msgid "Decline"
 msgstr "Avböj"
 
-#: ../gtk/main.c:1297
+#: ../gtk/main.c:1302
 msgid "Call paused"
 msgstr ""
 
-#: ../gtk/main.c:1297
+#: ../gtk/main.c:1302
 #, c-format
 msgid "<b>by %s</b>"
 msgstr ""
 
-#: ../gtk/main.c:1367
+#: ../gtk/main.c:1372
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr ""
 
-#: ../gtk/main.c:1529
+#: ../gtk/main.c:1534
 msgid "Website link"
 msgstr "Webbsajt"
 
-#: ../gtk/main.c:1578
+#: ../gtk/main.c:1583
 msgid "Linphone - a video internet phone"
 msgstr "Linphone - en video Internet telefon"
 
-#: ../gtk/main.c:1670
+#: ../gtk/main.c:1675
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (Default)"
 
-#: ../gtk/main.c:2002 ../coreapi/callbacks.c:986
+#: ../gtk/main.c:2007 ../coreapi/callbacks.c:1027
 #, c-format
 msgid "We are transferred to %s"
 msgstr ""
 
-#: ../gtk/main.c:2012
+#: ../gtk/main.c:2017
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
 msgstr ""
 
-#: ../gtk/main.c:2156
+#: ../gtk/main.c:2161
 msgid "A free SIP video-phone"
 msgstr "En gratis SIP video-telefon"
 
@@ -368,15 +369,19 @@ msgid ""
 "You need to restart linphone for the new language selection to take effect."
 msgstr "Du behöver starta om programmet för att det nya språket ska synas."
 
-#: ../gtk/propertybox.c:1234
+#: ../gtk/propertybox.c:1236
 msgid "None"
 msgstr ""
 
-#: ../gtk/propertybox.c:1238
+#: ../gtk/propertybox.c:1240
 msgid "SRTP"
 msgstr ""
 
-#: ../gtk/propertybox.c:1244
+#: ../gtk/propertybox.c:1246
+msgid "DTLS"
+msgstr ""
+
+#: ../gtk/propertybox.c:1253
 msgid "ZRTP"
 msgstr ""
 
@@ -547,7 +552,7 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:527
+#: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:534
 msgid "Terminating"
 msgstr ""
 
@@ -638,7 +643,7 @@ msgstr ""
 msgid "<b>Calling...</b>"
 msgstr "<b>Ringer...</b>"
 
-#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:727
+#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:733
 msgid "00::00::00"
 msgstr "00:00:00"
 
@@ -675,62 +680,66 @@ msgid "Secured by SRTP"
 msgstr ""
 
 #: ../gtk/incall_view.c:685
+msgid "Secured by DTLS"
+msgstr ""
+
+#: ../gtk/incall_view.c:691
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
 msgstr ""
 
-#: ../gtk/incall_view.c:691
+#: ../gtk/incall_view.c:697
 msgid "Set unverified"
 msgstr ""
 
-#: ../gtk/incall_view.c:691 ../gtk/main.ui.h:4
+#: ../gtk/incall_view.c:697 ../gtk/main.ui.h:4
 msgid "Set verified"
 msgstr ""
 
-#: ../gtk/incall_view.c:722
+#: ../gtk/incall_view.c:728
 msgid "In conference"
 msgstr ""
 
-#: ../gtk/incall_view.c:722
+#: ../gtk/incall_view.c:728
 msgid "<b>In call</b>"
 msgstr ""
 
-#: ../gtk/incall_view.c:758
+#: ../gtk/incall_view.c:764
 msgid "<b>Paused call</b>"
 msgstr ""
 
-#: ../gtk/incall_view.c:794
+#: ../gtk/incall_view.c:800
 msgid "<b>Call ended.</b>"
 msgstr "<b>Samtalet slut.</b>"
 
-#: ../gtk/incall_view.c:825
+#: ../gtk/incall_view.c:831
 msgid "Transfer in progress"
 msgstr ""
 
-#: ../gtk/incall_view.c:828
+#: ../gtk/incall_view.c:834
 msgid "Transfer done."
 msgstr ""
 
-#: ../gtk/incall_view.c:831
+#: ../gtk/incall_view.c:837
 msgid "Transfer failed."
 msgstr ""
 
-#: ../gtk/incall_view.c:875
+#: ../gtk/incall_view.c:881
 msgid "Resume"
 msgstr ""
 
-#: ../gtk/incall_view.c:882 ../gtk/main.ui.h:9
+#: ../gtk/incall_view.c:888 ../gtk/main.ui.h:9
 msgid "Pause"
 msgstr ""
 
-#: ../gtk/incall_view.c:948
+#: ../gtk/incall_view.c:954
 #, c-format
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
 msgstr ""
 
-#: ../gtk/incall_view.c:948
+#: ../gtk/incall_view.c:954
 msgid "(Paused)"
 msgstr ""
 
@@ -827,23 +836,23 @@ msgstr ""
 msgid "Let's start Linphone now"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:496
+#: ../gtk/audio_assistant.c:503
 msgid "Audio Assistant"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:506 ../gtk/main.ui.h:31
+#: ../gtk/audio_assistant.c:513 ../gtk/main.ui.h:31
 msgid "Audio assistant"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:511
+#: ../gtk/audio_assistant.c:518
 msgid "Mic Gain calibration"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:517
+#: ../gtk/audio_assistant.c:524
 msgid "Speaker volume calibration"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:522
+#: ../gtk/audio_assistant.c:529
 msgid "Record and Play"
 msgstr ""
 
@@ -1692,68 +1701,68 @@ msgstr ""
 msgid "Please wait while fetching configuration from server..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1510
+#: ../coreapi/linphonecore.c:1508
 msgid "Ready"
 msgstr "Redo"
 
-#: ../coreapi/linphonecore.c:2489
+#: ../coreapi/linphonecore.c:2495
 msgid "Configuring"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2654
+#: ../coreapi/linphonecore.c:2669
 msgid "Looking for telephone number destination..."
 msgstr "Leta efter telefonnummer för destinationen..."
 
-#: ../coreapi/linphonecore.c:2656
+#: ../coreapi/linphonecore.c:2671
 msgid "Could not resolve this number."
 msgstr "Kan inte nå dett nummer."
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2942
+#: ../coreapi/linphonecore.c:2957
 msgid "Contacting"
 msgstr "Kontaktar"
 
-#: ../coreapi/linphonecore.c:2947
+#: ../coreapi/linphonecore.c:2962
 msgid "Could not call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3097
+#: ../coreapi/linphonecore.c:3112
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3256
+#: ../coreapi/linphonecore.c:3270
 msgid "is contacting you"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3257
+#: ../coreapi/linphonecore.c:3271
 msgid " and asked autoanswer."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3375
+#: ../coreapi/linphonecore.c:3395
 msgid "Modifying call parameters..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3723
+#: ../coreapi/linphonecore.c:3743
 msgid "Connected."
 msgstr "Kopplad"
 
-#: ../coreapi/linphonecore.c:3748
+#: ../coreapi/linphonecore.c:3768
 msgid "Call aborted"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3938
+#: ../coreapi/linphonecore.c:3958
 msgid "Could not pause the call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3941
+#: ../coreapi/linphonecore.c:3961
 msgid "Pausing the current call..."
 msgstr ""
 
-#: ../coreapi/misc.c:438
+#: ../coreapi/misc.c:433
 msgid "Stun lookup in progress..."
 msgstr "STUN uppslagning pågår..."
 
-#: ../coreapi/misc.c:619
+#: ../coreapi/misc.c:614
 msgid "ICE local candidates gathering in progress..."
 msgstr ""
 
@@ -1809,7 +1818,7 @@ msgstr ""
 msgid "Unknown status"
 msgstr ""
 
-#: ../coreapi/proxy.c:327
+#: ../coreapi/proxy.c:328
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
@@ -1817,7 +1826,7 @@ msgstr ""
 "SIP proxy adressen som du matade in är inte rätt, adressen måste starta med "
 "\"sip:\", följd av ett hostnamn"
 
-#: ../coreapi/proxy.c:333
+#: ../coreapi/proxy.c:334
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
@@ -1825,126 +1834,127 @@ msgstr ""
 "SIP adressen som du matade in är inte rätt. Adressen borde se ut som sip:"
 "namn@domän, såsom sip:peter@exempel.se"
 
-#: ../coreapi/proxy.c:1391
+#: ../coreapi/proxy.c:1403
 #, c-format
 msgid "Could not login as %s"
 msgstr "Kunde inte logga in som %s"
 
-#: ../coreapi/callbacks.c:383
+#: ../coreapi/callbacks.c:404
 msgid "Remote ringing."
 msgstr "Ringer hos motparten."
 
-#: ../coreapi/callbacks.c:404
+#: ../coreapi/callbacks.c:425
 msgid "Remote ringing..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:414
+#: ../coreapi/callbacks.c:442
 msgid "Early media."
 msgstr "Tidig media"
 
-#: ../coreapi/callbacks.c:475
+#: ../coreapi/callbacks.c:503
 #, c-format
 msgid "Call with %s is paused."
 msgstr ""
 
-#: ../coreapi/callbacks.c:488
+#: ../coreapi/callbacks.c:516
 #, c-format
 msgid "Call answered by %s - on hold."
 msgstr ""
 
-#: ../coreapi/callbacks.c:498
+#: ../coreapi/callbacks.c:526
 msgid "Call resumed."
 msgstr ""
 
-#: ../coreapi/callbacks.c:502
+#: ../coreapi/callbacks.c:530
 #, c-format
 msgid "Call answered by %s."
 msgstr ""
 
-#: ../coreapi/callbacks.c:525
+#: ../coreapi/callbacks.c:553
 msgid "Incompatible, check codecs or security settings..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:829
+#: ../coreapi/callbacks.c:558 ../coreapi/callbacks.c:870
 msgid "Incompatible media parameters."
 msgstr ""
 
-#: ../coreapi/callbacks.c:560
+#: ../coreapi/callbacks.c:588
 msgid "We have been resumed."
 msgstr ""
 
 #. we are being paused
-#: ../coreapi/callbacks.c:568
+#: ../coreapi/callbacks.c:596
 msgid "We are paused by other party."
 msgstr ""
 
 #. reINVITE and in-dialogs UPDATE go here
-#: ../coreapi/callbacks.c:602
+#: ../coreapi/callbacks.c:630
 msgid "Call is updated by remote."
 msgstr ""
 
-#: ../coreapi/callbacks.c:705
+#: ../coreapi/callbacks.c:746
 msgid "Call terminated."
 msgstr "Samtalet slut."
 
-#: ../coreapi/callbacks.c:733
+#: ../coreapi/callbacks.c:774
 msgid "User is busy."
 msgstr "Användare upptagen."
 
-#: ../coreapi/callbacks.c:734
+#: ../coreapi/callbacks.c:775
 msgid "User is temporarily unavailable."
 msgstr "Användaren temporärt inte tillgänglig."
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:736
+#: ../coreapi/callbacks.c:777
 msgid "User does not want to be disturbed."
 msgstr "Användaren vill inte bli störd."
 
-#: ../coreapi/callbacks.c:737
+#: ../coreapi/callbacks.c:778
 msgid "Call declined."
 msgstr "Samtalet avböjdes."
 
-#: ../coreapi/callbacks.c:752
+#: ../coreapi/callbacks.c:793
 msgid "Request timeout."
 msgstr ""
 
-#: ../coreapi/callbacks.c:783
+#: ../coreapi/callbacks.c:824
 msgid "Redirected"
 msgstr ""
 
-#: ../coreapi/callbacks.c:838
+#: ../coreapi/callbacks.c:879
 msgid "Call failed."
 msgstr ""
 
-#: ../coreapi/callbacks.c:916
+#: ../coreapi/callbacks.c:957
 #, c-format
 msgid "Registration on %s successful."
 msgstr "Registrering hos %s lyckades."
 
-#: ../coreapi/callbacks.c:917
+#: ../coreapi/callbacks.c:958
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "Avregistrering hos %s lyckades."
 
-#: ../coreapi/callbacks.c:935
+#: ../coreapi/callbacks.c:976
 msgid "no response timeout"
 msgstr "Inget svar inom angiven tid"
 
-#: ../coreapi/callbacks.c:938
+#: ../coreapi/callbacks.c:979
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "Registrering hos %s mislyckades: %s"
 
-#: ../coreapi/callbacks.c:945
+#: ../coreapi/callbacks.c:986
 msgid "Service unavailable, retrying"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:175
+#. if encryption is DTLS, no status to be displayed
+#: ../coreapi/linphonecall.c:180
 #, c-format
 msgid "Authentication token is %s"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:3041
+#: ../coreapi/linphonecall.c:3492
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 44b01c13b..30e05bb15 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,9 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-13 16:18+0100\n"
-"PO-Revision-Date: 2015-01-06 11:29+0000\n"
-"Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
+"POT-Creation-Date: 2015-02-17 12:28+0100\n"
+"PO-Revision-Date: 2015-02-17 11:28+0000\n"
+"Last-Translator: Belledonne Communications <support@belledonne-"
+"communications.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/linphone-"
 "gtk/language/zh_CN/)\n"
 "Language: zh_CN\n"
@@ -132,7 +133,7 @@ msgstr ""
 msgid "Run self test and exit 0 if succeed"
 msgstr ""
 
-#: ../gtk/main.c:1083
+#: ../gtk/main.c:1088
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
@@ -144,66 +145,66 @@ msgstr ""
 "您是否允许他看到您的在线状态或者将它加为您的联系人允许?\n"
 "如果您回答否，则会将该人临时性的放入黑名单"
 
-#: ../gtk/main.c:1160
+#: ../gtk/main.c:1165
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
 msgstr ""
 
-#: ../gtk/main.c:1281
+#: ../gtk/main.c:1286
 msgid "Call error"
 msgstr ""
 
-#: ../gtk/main.c:1284 ../coreapi/linphonecore.c:3767
+#: ../gtk/main.c:1289 ../coreapi/linphonecore.c:3787
 msgid "Call ended"
 msgstr "呼叫结束"
 
-#: ../gtk/main.c:1287 ../coreapi/call_log.c:221
+#: ../gtk/main.c:1292 ../coreapi/call_log.c:221
 msgid "Incoming call"
 msgstr "呼入"
 
-#: ../gtk/main.c:1289 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
+#: ../gtk/main.c:1294 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
 msgid "Answer"
 msgstr ""
 
-#: ../gtk/main.c:1291 ../gtk/main.ui.h:6
+#: ../gtk/main.c:1296 ../gtk/main.ui.h:6
 msgid "Decline"
 msgstr "拒绝"
 
-#: ../gtk/main.c:1297
+#: ../gtk/main.c:1302
 msgid "Call paused"
 msgstr ""
 
-#: ../gtk/main.c:1297
+#: ../gtk/main.c:1302
 #, c-format
 msgid "<b>by %s</b>"
 msgstr ""
 
-#: ../gtk/main.c:1367
+#: ../gtk/main.c:1372
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr ""
 
-#: ../gtk/main.c:1529
+#: ../gtk/main.c:1534
 msgid "Website link"
 msgstr "网站"
 
-#: ../gtk/main.c:1578
+#: ../gtk/main.c:1583
 msgid "Linphone - a video internet phone"
 msgstr "Linphone - 互联网视频电话"
 
-#: ../gtk/main.c:1670
+#: ../gtk/main.c:1675
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (默认)"
 
-#: ../gtk/main.c:2002 ../coreapi/callbacks.c:986
+#: ../gtk/main.c:2007 ../coreapi/callbacks.c:1027
 #, c-format
 msgid "We are transferred to %s"
 msgstr ""
 
-#: ../gtk/main.c:2012
+#: ../gtk/main.c:2017
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
@@ -211,7 +212,7 @@ msgstr ""
 "未在此计算机上检测到声卡。\n"
 "您无法发送或接收音频呼叫。"
 
-#: ../gtk/main.c:2156
+#: ../gtk/main.c:2161
 msgid "A free SIP video-phone"
 msgstr "免费的 SIP 视频电话"
 
@@ -365,15 +366,19 @@ msgid ""
 "You need to restart linphone for the new language selection to take effect."
 msgstr "您需要重启 linphone 以使语言选择生效。"
 
-#: ../gtk/propertybox.c:1234
+#: ../gtk/propertybox.c:1236
 msgid "None"
 msgstr ""
 
-#: ../gtk/propertybox.c:1238
+#: ../gtk/propertybox.c:1240
 msgid "SRTP"
 msgstr ""
 
-#: ../gtk/propertybox.c:1244
+#: ../gtk/propertybox.c:1246
+msgid "DTLS"
+msgstr ""
+
+#: ../gtk/propertybox.c:1253
 msgid "ZRTP"
 msgstr ""
 
@@ -543,7 +548,7 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:527
+#: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:534
 msgid "Terminating"
 msgstr ""
 
@@ -634,7 +639,7 @@ msgstr ""
 msgid "<b>Calling...</b>"
 msgstr "<b>正在呼叫...</b>"
 
-#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:727
+#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:733
 msgid "00::00::00"
 msgstr "00::00::00"
 
@@ -671,62 +676,66 @@ msgid "Secured by SRTP"
 msgstr ""
 
 #: ../gtk/incall_view.c:685
+msgid "Secured by DTLS"
+msgstr ""
+
+#: ../gtk/incall_view.c:691
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
 msgstr ""
 
-#: ../gtk/incall_view.c:691
+#: ../gtk/incall_view.c:697
 msgid "Set unverified"
 msgstr ""
 
-#: ../gtk/incall_view.c:691 ../gtk/main.ui.h:4
+#: ../gtk/incall_view.c:697 ../gtk/main.ui.h:4
 msgid "Set verified"
 msgstr ""
 
-#: ../gtk/incall_view.c:722
+#: ../gtk/incall_view.c:728
 msgid "In conference"
 msgstr ""
 
-#: ../gtk/incall_view.c:722
+#: ../gtk/incall_view.c:728
 msgid "<b>In call</b>"
 msgstr ""
 
-#: ../gtk/incall_view.c:758
+#: ../gtk/incall_view.c:764
 msgid "<b>Paused call</b>"
 msgstr ""
 
-#: ../gtk/incall_view.c:794
+#: ../gtk/incall_view.c:800
 msgid "<b>Call ended.</b>"
 msgstr "<b>通话结束。</b>"
 
-#: ../gtk/incall_view.c:825
+#: ../gtk/incall_view.c:831
 msgid "Transfer in progress"
 msgstr ""
 
-#: ../gtk/incall_view.c:828
+#: ../gtk/incall_view.c:834
 msgid "Transfer done."
 msgstr ""
 
-#: ../gtk/incall_view.c:831
+#: ../gtk/incall_view.c:837
 msgid "Transfer failed."
 msgstr ""
 
-#: ../gtk/incall_view.c:875
+#: ../gtk/incall_view.c:881
 msgid "Resume"
 msgstr ""
 
-#: ../gtk/incall_view.c:882 ../gtk/main.ui.h:9
+#: ../gtk/incall_view.c:888 ../gtk/main.ui.h:9
 msgid "Pause"
 msgstr ""
 
-#: ../gtk/incall_view.c:948
+#: ../gtk/incall_view.c:954
 #, c-format
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
 msgstr ""
 
-#: ../gtk/incall_view.c:948
+#: ../gtk/incall_view.c:954
 msgid "(Paused)"
 msgstr ""
 
@@ -823,23 +832,23 @@ msgstr ""
 msgid "Let's start Linphone now"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:496
+#: ../gtk/audio_assistant.c:503
 msgid "Audio Assistant"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:506 ../gtk/main.ui.h:31
+#: ../gtk/audio_assistant.c:513 ../gtk/main.ui.h:31
 msgid "Audio assistant"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:511
+#: ../gtk/audio_assistant.c:518
 msgid "Mic Gain calibration"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:517
+#: ../gtk/audio_assistant.c:524
 msgid "Speaker volume calibration"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:522
+#: ../gtk/audio_assistant.c:529
 msgid "Record and Play"
 msgstr ""
 
@@ -1687,68 +1696,68 @@ msgstr ""
 msgid "Please wait while fetching configuration from server..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1510
+#: ../coreapi/linphonecore.c:1508
 msgid "Ready"
 msgstr "就绪"
 
-#: ../coreapi/linphonecore.c:2489
+#: ../coreapi/linphonecore.c:2495
 msgid "Configuring"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2654
+#: ../coreapi/linphonecore.c:2669
 msgid "Looking for telephone number destination..."
 msgstr "查询电话号码目的地..."
 
-#: ../coreapi/linphonecore.c:2656
+#: ../coreapi/linphonecore.c:2671
 msgid "Could not resolve this number."
 msgstr "该号码无法解析。"
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2942
+#: ../coreapi/linphonecore.c:2957
 msgid "Contacting"
 msgstr "联系中"
 
-#: ../coreapi/linphonecore.c:2947
+#: ../coreapi/linphonecore.c:2962
 msgid "Could not call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3097
+#: ../coreapi/linphonecore.c:3112
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3256
+#: ../coreapi/linphonecore.c:3270
 msgid "is contacting you"
 msgstr "正在联系您"
 
-#: ../coreapi/linphonecore.c:3257
+#: ../coreapi/linphonecore.c:3271
 msgid " and asked autoanswer."
 msgstr " 并询问了自动回答。"
 
-#: ../coreapi/linphonecore.c:3375
+#: ../coreapi/linphonecore.c:3395
 msgid "Modifying call parameters..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3723
+#: ../coreapi/linphonecore.c:3743
 msgid "Connected."
 msgstr "已连接。"
 
-#: ../coreapi/linphonecore.c:3748
+#: ../coreapi/linphonecore.c:3768
 msgid "Call aborted"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3938
+#: ../coreapi/linphonecore.c:3958
 msgid "Could not pause the call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3941
+#: ../coreapi/linphonecore.c:3961
 msgid "Pausing the current call..."
 msgstr ""
 
-#: ../coreapi/misc.c:438
+#: ../coreapi/misc.c:433
 msgid "Stun lookup in progress..."
 msgstr "正在进行 Stun 查找..."
 
-#: ../coreapi/misc.c:619
+#: ../coreapi/misc.c:614
 msgid "ICE local candidates gathering in progress..."
 msgstr ""
 
@@ -1804,13 +1813,13 @@ msgstr ""
 msgid "Unknown status"
 msgstr ""
 
-#: ../coreapi/proxy.c:327
+#: ../coreapi/proxy.c:328
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
 msgstr "您输入的 SIP 代理地址无效，它必须是以“sip:”开头，并紧随一个主机名。"
 
-#: ../coreapi/proxy.c:333
+#: ../coreapi/proxy.c:334
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
@@ -1818,126 +1827,127 @@ msgstr ""
 "您输入的地址无效。\n"
 "它应具有“sip:用户名@代理域”的形式，例如 sip:alice@example.net"
 
-#: ../coreapi/proxy.c:1391
+#: ../coreapi/proxy.c:1403
 #, c-format
 msgid "Could not login as %s"
 msgstr "无法登录为 %s"
 
-#: ../coreapi/callbacks.c:383
+#: ../coreapi/callbacks.c:404
 msgid "Remote ringing."
 msgstr "响铃。"
 
-#: ../coreapi/callbacks.c:404
+#: ../coreapi/callbacks.c:425
 msgid "Remote ringing..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:414
+#: ../coreapi/callbacks.c:442
 msgid "Early media."
 msgstr ""
 
-#: ../coreapi/callbacks.c:475
+#: ../coreapi/callbacks.c:503
 #, c-format
 msgid "Call with %s is paused."
 msgstr ""
 
-#: ../coreapi/callbacks.c:488
+#: ../coreapi/callbacks.c:516
 #, c-format
 msgid "Call answered by %s - on hold."
 msgstr ""
 
-#: ../coreapi/callbacks.c:498
+#: ../coreapi/callbacks.c:526
 msgid "Call resumed."
 msgstr ""
 
-#: ../coreapi/callbacks.c:502
+#: ../coreapi/callbacks.c:530
 #, c-format
 msgid "Call answered by %s."
 msgstr ""
 
-#: ../coreapi/callbacks.c:525
+#: ../coreapi/callbacks.c:553
 msgid "Incompatible, check codecs or security settings..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:829
+#: ../coreapi/callbacks.c:558 ../coreapi/callbacks.c:870
 msgid "Incompatible media parameters."
 msgstr ""
 
-#: ../coreapi/callbacks.c:560
+#: ../coreapi/callbacks.c:588
 msgid "We have been resumed."
 msgstr ""
 
 #. we are being paused
-#: ../coreapi/callbacks.c:568
+#: ../coreapi/callbacks.c:596
 msgid "We are paused by other party."
 msgstr ""
 
 #. reINVITE and in-dialogs UPDATE go here
-#: ../coreapi/callbacks.c:602
+#: ../coreapi/callbacks.c:630
 msgid "Call is updated by remote."
 msgstr ""
 
-#: ../coreapi/callbacks.c:705
+#: ../coreapi/callbacks.c:746
 msgid "Call terminated."
 msgstr "通话结束。"
 
-#: ../coreapi/callbacks.c:733
+#: ../coreapi/callbacks.c:774
 msgid "User is busy."
 msgstr "被叫正忙。"
 
-#: ../coreapi/callbacks.c:734
+#: ../coreapi/callbacks.c:775
 msgid "User is temporarily unavailable."
 msgstr "您呼叫的用户暂时无法接通。"
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:736
+#: ../coreapi/callbacks.c:777
 msgid "User does not want to be disturbed."
 msgstr "用户已开启免打扰功能。"
 
-#: ../coreapi/callbacks.c:737
+#: ../coreapi/callbacks.c:778
 msgid "Call declined."
 msgstr "呼叫被拒绝。"
 
-#: ../coreapi/callbacks.c:752
+#: ../coreapi/callbacks.c:793
 msgid "Request timeout."
 msgstr ""
 
-#: ../coreapi/callbacks.c:783
+#: ../coreapi/callbacks.c:824
 msgid "Redirected"
 msgstr "已重定向"
 
-#: ../coreapi/callbacks.c:838
+#: ../coreapi/callbacks.c:879
 msgid "Call failed."
 msgstr "呼叫失败。"
 
-#: ../coreapi/callbacks.c:916
+#: ../coreapi/callbacks.c:957
 #, c-format
 msgid "Registration on %s successful."
 msgstr "成功注册到 %s"
 
-#: ../coreapi/callbacks.c:917
+#: ../coreapi/callbacks.c:958
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "已在 %s 解除注册。"
 
-#: ../coreapi/callbacks.c:935
+#: ../coreapi/callbacks.c:976
 msgid "no response timeout"
 msgstr "没有响应，超时"
 
-#: ../coreapi/callbacks.c:938
+#: ../coreapi/callbacks.c:979
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "注册到 %s 失败: %s"
 
-#: ../coreapi/callbacks.c:945
+#: ../coreapi/callbacks.c:986
 msgid "Service unavailable, retrying"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:175
+#. if encryption is DTLS, no status to be displayed
+#: ../coreapi/linphonecall.c:180
 #, c-format
 msgid "Authentication token is %s"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:3041
+#: ../coreapi/linphonecall.c:3492
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
diff --git a/po/zh_TW.po b/po/zh_TW.po
index cf24e3fc7..598b7acf3 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,9 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-13 16:18+0100\n"
-"PO-Revision-Date: 2015-01-06 11:29+0000\n"
-"Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
+"POT-Creation-Date: 2015-02-17 12:28+0100\n"
+"PO-Revision-Date: 2015-02-17 11:28+0000\n"
+"Last-Translator: Belledonne Communications <support@belledonne-"
+"communications.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/"
 "linphone-gtk/language/zh_TW/)\n"
 "Language: zh_TW\n"
@@ -133,7 +134,7 @@ msgstr ""
 msgid "Run self test and exit 0 if succeed"
 msgstr ""
 
-#: ../gtk/main.c:1083
+#: ../gtk/main.c:1088
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
@@ -145,66 +146,66 @@ msgstr ""
 "您是否要允許他看見您的上線狀態或將他加入您的連絡人清單？\n"
 "如果您回答否，這個人會被暫時列入黑名單。"
 
-#: ../gtk/main.c:1160
+#: ../gtk/main.c:1165
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
 msgstr ""
 
-#: ../gtk/main.c:1281
+#: ../gtk/main.c:1286
 msgid "Call error"
 msgstr ""
 
-#: ../gtk/main.c:1284 ../coreapi/linphonecore.c:3767
+#: ../gtk/main.c:1289 ../coreapi/linphonecore.c:3787
 msgid "Call ended"
 msgstr "通話已結束"
 
-#: ../gtk/main.c:1287 ../coreapi/call_log.c:221
+#: ../gtk/main.c:1292 ../coreapi/call_log.c:221
 msgid "Incoming call"
 msgstr "來電"
 
-#: ../gtk/main.c:1289 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
+#: ../gtk/main.c:1294 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5
 msgid "Answer"
 msgstr "接聽"
 
-#: ../gtk/main.c:1291 ../gtk/main.ui.h:6
+#: ../gtk/main.c:1296 ../gtk/main.ui.h:6
 msgid "Decline"
 msgstr "拒接"
 
-#: ../gtk/main.c:1297
+#: ../gtk/main.c:1302
 msgid "Call paused"
 msgstr ""
 
-#: ../gtk/main.c:1297
+#: ../gtk/main.c:1302
 #, c-format
 msgid "<b>by %s</b>"
 msgstr ""
 
-#: ../gtk/main.c:1367
+#: ../gtk/main.c:1372
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr ""
 
-#: ../gtk/main.c:1529
+#: ../gtk/main.c:1534
 msgid "Website link"
 msgstr "網站連結"
 
-#: ../gtk/main.c:1578
+#: ../gtk/main.c:1583
 msgid "Linphone - a video internet phone"
 msgstr "Linphone - 網路視訊電話"
 
-#: ../gtk/main.c:1670
+#: ../gtk/main.c:1675
 #, c-format
 msgid "%s (Default)"
 msgstr "%s （預設值）"
 
-#: ../gtk/main.c:2002 ../coreapi/callbacks.c:986
+#: ../gtk/main.c:2007 ../coreapi/callbacks.c:1027
 #, c-format
 msgid "We are transferred to %s"
 msgstr "我們被轉接到 %s"
 
-#: ../gtk/main.c:2012
+#: ../gtk/main.c:2017
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
@@ -212,7 +213,7 @@ msgstr ""
 "在這臺電腦中偵測不到音效卡。\n"
 "您將無法傳送或接收語音電話。"
 
-#: ../gtk/main.c:2156
+#: ../gtk/main.c:2161
 msgid "A free SIP video-phone"
 msgstr "自由的 SIP 視訊電話"
 
@@ -366,15 +367,19 @@ msgid ""
 "You need to restart linphone for the new language selection to take effect."
 msgstr "您需要重新啟動 linphone 才能讓新選擇的語言生效。"
 
-#: ../gtk/propertybox.c:1234
+#: ../gtk/propertybox.c:1236
 msgid "None"
 msgstr ""
 
-#: ../gtk/propertybox.c:1238
+#: ../gtk/propertybox.c:1240
 msgid "SRTP"
 msgstr ""
 
-#: ../gtk/propertybox.c:1244
+#: ../gtk/propertybox.c:1246
+msgid "DTLS"
+msgstr ""
+
+#: ../gtk/propertybox.c:1253
 msgid "ZRTP"
 msgstr ""
 
@@ -544,7 +549,7 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:527
+#: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:534
 msgid "Terminating"
 msgstr ""
 
@@ -635,7 +640,7 @@ msgstr ""
 msgid "<b>Calling...</b>"
 msgstr "<b>播打...</b>"
 
-#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:727
+#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:733
 msgid "00::00::00"
 msgstr "00::00::00"
 
@@ -672,62 +677,66 @@ msgid "Secured by SRTP"
 msgstr ""
 
 #: ../gtk/incall_view.c:685
+msgid "Secured by DTLS"
+msgstr ""
+
+#: ../gtk/incall_view.c:691
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
 msgstr ""
 
-#: ../gtk/incall_view.c:691
+#: ../gtk/incall_view.c:697
 msgid "Set unverified"
 msgstr ""
 
-#: ../gtk/incall_view.c:691 ../gtk/main.ui.h:4
+#: ../gtk/incall_view.c:697 ../gtk/main.ui.h:4
 msgid "Set verified"
 msgstr ""
 
-#: ../gtk/incall_view.c:722
+#: ../gtk/incall_view.c:728
 msgid "In conference"
 msgstr ""
 
-#: ../gtk/incall_view.c:722
+#: ../gtk/incall_view.c:728
 msgid "<b>In call</b>"
 msgstr "<b>通話中</b>"
 
-#: ../gtk/incall_view.c:758
+#: ../gtk/incall_view.c:764
 msgid "<b>Paused call</b>"
 msgstr "<b>暫停通話</b>"
 
-#: ../gtk/incall_view.c:794
+#: ../gtk/incall_view.c:800
 msgid "<b>Call ended.</b>"
 msgstr "<b>通話結束。</b>"
 
-#: ../gtk/incall_view.c:825
+#: ../gtk/incall_view.c:831
 msgid "Transfer in progress"
 msgstr ""
 
-#: ../gtk/incall_view.c:828
+#: ../gtk/incall_view.c:834
 msgid "Transfer done."
 msgstr ""
 
-#: ../gtk/incall_view.c:831
+#: ../gtk/incall_view.c:837
 msgid "Transfer failed."
 msgstr ""
 
-#: ../gtk/incall_view.c:875
+#: ../gtk/incall_view.c:881
 msgid "Resume"
 msgstr "繼續"
 
-#: ../gtk/incall_view.c:882 ../gtk/main.ui.h:9
+#: ../gtk/incall_view.c:888 ../gtk/main.ui.h:9
 msgid "Pause"
 msgstr "暫停"
 
-#: ../gtk/incall_view.c:948
+#: ../gtk/incall_view.c:954
 #, c-format
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
 msgstr ""
 
-#: ../gtk/incall_view.c:948
+#: ../gtk/incall_view.c:954
 msgid "(Paused)"
 msgstr ""
 
@@ -824,23 +833,23 @@ msgstr ""
 msgid "Let's start Linphone now"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:496
+#: ../gtk/audio_assistant.c:503
 msgid "Audio Assistant"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:506 ../gtk/main.ui.h:31
+#: ../gtk/audio_assistant.c:513 ../gtk/main.ui.h:31
 msgid "Audio assistant"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:511
+#: ../gtk/audio_assistant.c:518
 msgid "Mic Gain calibration"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:517
+#: ../gtk/audio_assistant.c:524
 msgid "Speaker volume calibration"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:522
+#: ../gtk/audio_assistant.c:529
 msgid "Record and Play"
 msgstr ""
 
@@ -1688,68 +1697,68 @@ msgstr ""
 msgid "Please wait while fetching configuration from server..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1510
+#: ../coreapi/linphonecore.c:1508
 msgid "Ready"
 msgstr "準備就緒"
 
-#: ../coreapi/linphonecore.c:2489
+#: ../coreapi/linphonecore.c:2495
 msgid "Configuring"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2654
+#: ../coreapi/linphonecore.c:2669
 msgid "Looking for telephone number destination..."
 msgstr "尋找電話號碼目的端..."
 
-#: ../coreapi/linphonecore.c:2656
+#: ../coreapi/linphonecore.c:2671
 msgid "Could not resolve this number."
 msgstr "無法解析這個號碼。"
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2942
+#: ../coreapi/linphonecore.c:2957
 msgid "Contacting"
 msgstr "正在連絡"
 
-#: ../coreapi/linphonecore.c:2947
+#: ../coreapi/linphonecore.c:2962
 msgid "Could not call"
 msgstr "無法通話"
 
-#: ../coreapi/linphonecore.c:3097
+#: ../coreapi/linphonecore.c:3112
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "抱歉，我們已達瀏同步通話的最大數目"
 
-#: ../coreapi/linphonecore.c:3256
+#: ../coreapi/linphonecore.c:3270
 msgid "is contacting you"
 msgstr "正在連絡您"
 
-#: ../coreapi/linphonecore.c:3257
+#: ../coreapi/linphonecore.c:3271
 msgid " and asked autoanswer."
 msgstr "並要求自動接聽。"
 
-#: ../coreapi/linphonecore.c:3375
+#: ../coreapi/linphonecore.c:3395
 msgid "Modifying call parameters..."
 msgstr "修改通話參數..."
 
-#: ../coreapi/linphonecore.c:3723
+#: ../coreapi/linphonecore.c:3743
 msgid "Connected."
 msgstr "已連線。"
 
-#: ../coreapi/linphonecore.c:3748
+#: ../coreapi/linphonecore.c:3768
 msgid "Call aborted"
 msgstr "通話已放棄"
 
-#: ../coreapi/linphonecore.c:3938
+#: ../coreapi/linphonecore.c:3958
 msgid "Could not pause the call"
 msgstr "無法暫停通話"
 
-#: ../coreapi/linphonecore.c:3941
+#: ../coreapi/linphonecore.c:3961
 msgid "Pausing the current call..."
 msgstr "暫停目前的通話..."
 
-#: ../coreapi/misc.c:438
+#: ../coreapi/misc.c:433
 msgid "Stun lookup in progress..."
 msgstr "正在進行 Stun 搜尋..."
 
-#: ../coreapi/misc.c:619
+#: ../coreapi/misc.c:614
 msgid "ICE local candidates gathering in progress..."
 msgstr ""
 
@@ -1805,14 +1814,14 @@ msgstr ""
 msgid "Unknown status"
 msgstr ""
 
-#: ../coreapi/proxy.c:327
+#: ../coreapi/proxy.c:328
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
 msgstr ""
 "您輸入的 sip 代理位址是無效的，它必須要以「sip:」開頭，後面接主機名稱。"
 
-#: ../coreapi/proxy.c:333
+#: ../coreapi/proxy.c:334
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
@@ -1820,126 +1829,127 @@ msgstr ""
 "您輸入的 sip 身分是無效的。\n"
 "它應該看起來像 sip:使用者名稱@代理網域，像是 sip:alice@example.net"
 
-#: ../coreapi/proxy.c:1391
+#: ../coreapi/proxy.c:1403
 #, c-format
 msgid "Could not login as %s"
 msgstr "無法以 %s 登入"
 
-#: ../coreapi/callbacks.c:383
+#: ../coreapi/callbacks.c:404
 msgid "Remote ringing."
 msgstr "遠端響鈴。"
 
-#: ../coreapi/callbacks.c:404
+#: ../coreapi/callbacks.c:425
 msgid "Remote ringing..."
 msgstr "遠端響鈴..."
 
-#: ../coreapi/callbacks.c:414
+#: ../coreapi/callbacks.c:442
 msgid "Early media."
 msgstr "早期媒體。"
 
-#: ../coreapi/callbacks.c:475
+#: ../coreapi/callbacks.c:503
 #, c-format
 msgid "Call with %s is paused."
 msgstr "和 %s 的通話已暫停。"
 
-#: ../coreapi/callbacks.c:488
+#: ../coreapi/callbacks.c:516
 #, c-format
 msgid "Call answered by %s - on hold."
 msgstr "通話由 %s 接聽 - 保留中。"
 
-#: ../coreapi/callbacks.c:498
+#: ../coreapi/callbacks.c:526
 msgid "Call resumed."
 msgstr "通話已繼續。"
 
-#: ../coreapi/callbacks.c:502
+#: ../coreapi/callbacks.c:530
 #, c-format
 msgid "Call answered by %s."
 msgstr "通話由 %s 接聽。"
 
-#: ../coreapi/callbacks.c:525
+#: ../coreapi/callbacks.c:553
 msgid "Incompatible, check codecs or security settings..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:530 ../coreapi/callbacks.c:829
+#: ../coreapi/callbacks.c:558 ../coreapi/callbacks.c:870
 msgid "Incompatible media parameters."
 msgstr ""
 
-#: ../coreapi/callbacks.c:560
+#: ../coreapi/callbacks.c:588
 msgid "We have been resumed."
 msgstr ""
 
 #. we are being paused
-#: ../coreapi/callbacks.c:568
+#: ../coreapi/callbacks.c:596
 msgid "We are paused by other party."
 msgstr ""
 
 #. reINVITE and in-dialogs UPDATE go here
-#: ../coreapi/callbacks.c:602
+#: ../coreapi/callbacks.c:630
 msgid "Call is updated by remote."
 msgstr ""
 
-#: ../coreapi/callbacks.c:705
+#: ../coreapi/callbacks.c:746
 msgid "Call terminated."
 msgstr "通話已終止。"
 
-#: ../coreapi/callbacks.c:733
+#: ../coreapi/callbacks.c:774
 msgid "User is busy."
 msgstr "使用者現正忙碌。"
 
-#: ../coreapi/callbacks.c:734
+#: ../coreapi/callbacks.c:775
 msgid "User is temporarily unavailable."
 msgstr "使用者暫時無法聯繫。"
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:736
+#: ../coreapi/callbacks.c:777
 msgid "User does not want to be disturbed."
 msgstr "使用者不想要被打擾。"
 
-#: ../coreapi/callbacks.c:737
+#: ../coreapi/callbacks.c:778
 msgid "Call declined."
 msgstr "通話被拒接。"
 
-#: ../coreapi/callbacks.c:752
+#: ../coreapi/callbacks.c:793
 msgid "Request timeout."
 msgstr ""
 
-#: ../coreapi/callbacks.c:783
+#: ../coreapi/callbacks.c:824
 msgid "Redirected"
 msgstr "已重新導向"
 
-#: ../coreapi/callbacks.c:838
+#: ../coreapi/callbacks.c:879
 msgid "Call failed."
 msgstr "通話失敗。"
 
-#: ../coreapi/callbacks.c:916
+#: ../coreapi/callbacks.c:957
 #, c-format
 msgid "Registration on %s successful."
 msgstr "在 %s 註冊成功。"
 
-#: ../coreapi/callbacks.c:917
+#: ../coreapi/callbacks.c:958
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "在 %s 取消註冊完成。"
 
-#: ../coreapi/callbacks.c:935
+#: ../coreapi/callbacks.c:976
 msgid "no response timeout"
 msgstr "沒有回應逾時"
 
-#: ../coreapi/callbacks.c:938
+#: ../coreapi/callbacks.c:979
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "在 %s 註冊失敗：%s"
 
-#: ../coreapi/callbacks.c:945
+#: ../coreapi/callbacks.c:986
 msgid "Service unavailable, retrying"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:175
+#. if encryption is DTLS, no status to be displayed
+#: ../coreapi/linphonecall.c:180
 #, c-format
 msgid "Authentication token is %s"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:3041
+#: ../coreapi/linphonecall.c:3492
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."

From dda9ac6827416fd6e25189db0027c10c24ec3425 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 17 Feb 2015 13:06:21 +0100
Subject: [PATCH 425/496] Updated oRTP and ms2

---
 mediastreamer2 | 2 +-
 oRTP           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mediastreamer2 b/mediastreamer2
index b1acdb3a5..7c9ff4ca0 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit b1acdb3a58f34e1b333ed1dbfaa6ae0aab09861f
+Subproject commit 7c9ff4ca0e597cc36e1ddf14dacfb4bf7a239d74
diff --git a/oRTP b/oRTP
index 22b81144d..3413234be 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 22b81144d313b58cfe53c1c9aa71dcf22e1f43c2
+Subproject commit 3413234be817074e276eb9157b5e756f3e4d6fd0

From b4d95b057f0723c10b28ce4526d55fb6bbd4174d Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Tue, 17 Feb 2015 14:06:37 +0100
Subject: [PATCH 426/496] Add pull-transifex and push-transifex

---
 Makefile.am | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index 4f3f46860..b392c23e9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -168,6 +168,15 @@ filelist: zip
 		fi \
 	done
 
+### LOCALIZATION
+
+pull-transifex:
+	tx pull -af
+	$(MAKE) -C po update-po
+
+push-transifex:
+	tx push -s -t -f
+
 
 ### WINDOWS
 

From 3d99556b61936acc56bb797c0d5bf964c2c00fd3 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 17 Feb 2015 14:16:38 +0100
Subject: [PATCH 427/496] Fix WP8 no tunnel project

---
 build/wp8/LibLinphone_no_tunnel.vcxproj | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/build/wp8/LibLinphone_no_tunnel.vcxproj b/build/wp8/LibLinphone_no_tunnel.vcxproj
index 1bc745f52..f6e3ac7bd 100644
--- a/build/wp8/LibLinphone_no_tunnel.vcxproj
+++ b/build/wp8/LibLinphone_no_tunnel.vcxproj
@@ -1,3 +1,4 @@
+wbelle_sip
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
@@ -64,7 +65,7 @@
       <SubSystem>Console</SubSystem>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-      <AdditionalDependencies>belle-sip.lib;mediastreamer2.lib;ws2_32.lib;ortp.lib;gsm.lib;speex.lib;speexdsp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>belle-sip_no_tunnel.lib;mediastreamer2.lib;ws2_32.lib;ortp.lib;gsm.lib;speex.lib;speexdsp.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(SolutionDir)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>
     </Link>
@@ -213,4 +214,4 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsPhone\v$(TargetPlatformVersion)\Microsoft.Cpp.WindowsPhone.$(TargetPlatformVersion).targets" />
-</Project>
\ No newline at end of file
+</Project>

From cae4fe4e069755a4d2ab708017f8e4bc99a8dbfb Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 17 Feb 2015 14:19:19 +0100
Subject: [PATCH 428/496] Fix typo in WP8 project

---
 build/wp8/LibLinphone_no_tunnel.vcxproj | 1 -
 1 file changed, 1 deletion(-)

diff --git a/build/wp8/LibLinphone_no_tunnel.vcxproj b/build/wp8/LibLinphone_no_tunnel.vcxproj
index f6e3ac7bd..339b301f2 100644
--- a/build/wp8/LibLinphone_no_tunnel.vcxproj
+++ b/build/wp8/LibLinphone_no_tunnel.vcxproj
@@ -1,4 +1,3 @@
-wbelle_sip
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">

From 62a2dd1e84ba7c922dbb29baecffec8e29172dda Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 17 Feb 2015 15:31:43 +0100
Subject: [PATCH 429/496] Fix issue using _no_tunnel prefix

---
 build/wp8/LibLinphone_no_tunnel.vcxproj | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/build/wp8/LibLinphone_no_tunnel.vcxproj b/build/wp8/LibLinphone_no_tunnel.vcxproj
index 339b301f2..3c88f6b05 100644
--- a/build/wp8/LibLinphone_no_tunnel.vcxproj
+++ b/build/wp8/LibLinphone_no_tunnel.vcxproj
@@ -64,7 +64,7 @@
       <SubSystem>Console</SubSystem>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-      <AdditionalDependencies>belle-sip_no_tunnel.lib;mediastreamer2.lib;ws2_32.lib;ortp.lib;gsm.lib;speex.lib;speexdsp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>belle-sip_no_tunnel.lib;mediastreamer2.lib;ws2_32.lib;ortp.lib;gsm.lib;speex.lib;speexdsp.lib;libxml2.lib;sqlite.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(SolutionDir)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>
     </Link>
@@ -82,6 +82,9 @@
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
+    <ProjectReference>
+      <LinkLibraryDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</LinkLibraryDependencies>
+    </ProjectReference>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
     <ClCompile>
@@ -213,4 +216,4 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsPhone\v$(TargetPlatformVersion)\Microsoft.Cpp.WindowsPhone.$(TargetPlatformVersion).targets" />
-</Project>
+</Project>
\ No newline at end of file

From a29ccb43e2b226fd53475957b3b09ebf8e2025e2 Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Tue, 17 Feb 2015 15:44:18 +0100
Subject: [PATCH 430/496] Link android project with zlib

---
 build/android/Android.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/build/android/Android.mk b/build/android/Android.mk
index 9cf269871..fbdeff652 100755
--- a/build/android/Android.mk
+++ b/build/android/Android.mk
@@ -85,7 +85,8 @@ LOCAL_CFLAGS += \
 	-DHAVE_CONFIG_H \
 	-DLIBLINPHONE_VERSION=\"$(LIBLINPHONE_VERSION)\" \
 	-DLINPHONE_PLUGINS_DIR=\"\\tmp\" \
-	-DUSE_BELLESIP
+	-DUSE_BELLESIP \
+	-DHAVE_ZLIB
 
 LOCAL_CFLAGS += -DIN_LINPHONE
 
@@ -118,7 +119,7 @@ LOCAL_C_INCLUDES += \
 	$(LOCAL_PATH)/../../externals/libxml2/include \
 	$(LOCAL_PATH)/../../externals/build/libxml2
 
-LOCAL_LDLIBS += -llog -ldl
+LOCAL_LDLIBS += -llog -ldl -lz
 
 LOCAL_STATIC_LIBRARIES := \
 	cpufeatures \

From d4670976dfd6880949acfd8d03591fb722285831 Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Tue, 17 Feb 2015 15:44:56 +0100
Subject: [PATCH 431/496] Add JNI function mediaInProgress

---
 coreapi/linphonecore_jni.cc                       |  6 ++++++
 java/common/org/linphone/core/LinphoneCall.java   | 11 +++++++++++
 java/impl/org/linphone/core/LinphoneCallImpl.java |  4 ++++
 3 files changed, 21 insertions(+)

diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index b562cf31a..3e895a6ce 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -2747,6 +2747,12 @@ extern "C" jlong Java_org_linphone_core_LinphoneCallImpl_getPlayer(JNIEnv *env,
 	return (jlong)linphone_call_get_player((LinphoneCall *)callPtr);
 }
 
+extern "C" jboolean Java_org_linphone_core_LinphoneCallImpl_mediaInProgress(	JNIEnv*  env
+                                                                            ,jobject  thiz
+                                                                            ,jlong ptr) {
+	return (jboolean) linphone_call_media_in_progress((LinphoneCall*)ptr);
+}
+
 //LinphoneFriend
 extern "C" jlong Java_org_linphone_core_LinphoneFriendImpl_newLinphoneFriend(JNIEnv*  env
 																		,jobject  thiz
diff --git a/java/common/org/linphone/core/LinphoneCall.java b/java/common/org/linphone/core/LinphoneCall.java
index 404fdbcf0..cd74b6d07 100644
--- a/java/common/org/linphone/core/LinphoneCall.java
+++ b/java/common/org/linphone/core/LinphoneCall.java
@@ -268,6 +268,16 @@ public interface LinphoneCall {
 	void setAuthenticationTokenVerified(boolean verified);
 
 	boolean isInConference();
+
+	/**
+	 * Indicates whether an operation is in progress at the media side.
+	 * It can a bad idea to initiate signaling operations (adding video, pausing the call, removing video, changing video parameters) while
+	 * the media is busy in establishing the connection (typically ICE connectivity checks). It can result in failures generating loss of time
+	 * in future operations in the call.
+	 * Applications are invited to check this function after each call state change to decide whether certain operations are permitted or not.
+	 * @return TRUE if media is busy in establishing the connection, FALSE otherwise.
+	 **/
+	boolean mediaInProgress();
 	
 	float getPlayVolume();
 
@@ -349,4 +359,5 @@ public interface LinphoneCall {
 	 * @return A player
 	 */
 	public LinphonePlayer getPlayer();
+
 }
diff --git a/java/impl/org/linphone/core/LinphoneCallImpl.java b/java/impl/org/linphone/core/LinphoneCallImpl.java
index b2cad202c..de9e25364 100644
--- a/java/impl/org/linphone/core/LinphoneCallImpl.java
+++ b/java/impl/org/linphone/core/LinphoneCallImpl.java
@@ -43,6 +43,7 @@ class LinphoneCallImpl implements LinphoneCall {
 	private native int getDuration(long nativePtr);
 	private native float getCurrentQuality(long nativePtr);
 	private native float getAverageQuality(long nativePtr);
+	private native boolean mediaInProgress(long nativePtr);
 	
 	/*
 	 * This method must always be called from JNI, nothing else.
@@ -167,6 +168,8 @@ class LinphoneCallImpl implements LinphoneCall {
 		return params.localConferenceMode();
 	}
 
+	public boolean mediaInProgress() { return mediaInProgress(nativePtr);}
+
 	@Override
 	public String toString() {
 		return "Call " + nativePtr;
@@ -251,4 +254,5 @@ class LinphoneCallImpl implements LinphoneCall {
 	public LinphonePlayer getPlayer() {
 		return new LinphonePlayerImpl(getPlayer(nativePtr));
 	}
+
 }

From 835978a333b63f1e61c4b56fe495769e52095d27 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 17 Feb 2015 16:16:37 +0100
Subject: [PATCH 432/496] Removed yet another reference to belle_sip with
 tunnel in wp8 no tunnel project

---
 build/wp8/LibLinphone_no_tunnel.vcxproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/wp8/LibLinphone_no_tunnel.vcxproj b/build/wp8/LibLinphone_no_tunnel.vcxproj
index 3c88f6b05..447253440 100644
--- a/build/wp8/LibLinphone_no_tunnel.vcxproj
+++ b/build/wp8/LibLinphone_no_tunnel.vcxproj
@@ -177,7 +177,7 @@
     <ProjectReference Include="..\..\..\bcg729\build\wp8\bcg729\bcg729.vcxproj">
       <Project>{1db09afe-fc9b-472e-a746-0e33f8ef8883}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\belle-sip\build\wp8\belle-sip\belle-sip.vcxproj">
+    <ProjectReference Include="..\..\..\belle-sip\build\wp8\belle-sip\belle-sip_no_tunnel.vcxproj">
       <Project>{4c225a82-800b-427b-ba7b-61686a9b347f}</Project>
     </ProjectReference>
     <ProjectReference Include="..\..\..\msamr\build\wp8\msamr\msamr.vcxproj">

From db99a3b71cad85ff996cf642d959f083ff75a004 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Tue, 17 Feb 2015 16:48:15 +0100
Subject: [PATCH 433/496] update ortp

---
 oRTP | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/oRTP b/oRTP
index 3413234be..cd468445a 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 3413234be817074e276eb9157b5e756f3e4d6fd0
+Subproject commit cd468445a4f276f54ee9f9948712855f3cd1a0dc

From e1291ba3ea39d45ec565b3072242e4878ab441d8 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Tue, 17 Feb 2015 17:04:57 +0100
Subject: [PATCH 434/496] rework a bit dtls

---
 coreapi/linphonecall.c | 69 +++++++++++++++++++-----------------------
 coreapi/sal.c          |  5 +++
 2 files changed, 36 insertions(+), 38 deletions(-)

diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index 8cd0c1352..afcd516e5 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -2313,7 +2313,20 @@ static void configure_rtp_session_for_rtcp_xr(LinphoneCore *lc, LinphoneCall *ca
 	}
 	rtp_session_configure_rtcp_xr(session, &currentconfig);
 }
-
+void static start_dtls( MSMediaStreamSessions *sessions,  const SalStreamDescription *sd,const SalStreamDescription *remote) {
+	if (sal_stream_description_has_dtls(sd) == TRUE) {
+		/*DTLS*/
+		SalDtlsRole salRole = sd->dtls_role;
+		if (salRole!=SalDtlsRoleInvalid) { /* if DTLS is available at both end points */
+			/* give the peer certificate fingerprint to dtls context */
+			ms_dtls_srtp_set_peer_fingerprint(sessions->dtls_context, remote->dtls_fingerprint);
+			ms_dtls_srtp_set_role(sessions->dtls_context, (salRole == SalDtlsRoleIsClient)?MSDtlsSrtpRoleIsClient:MSDtlsSrtpRoleIsServer); /* set the role to client */
+			ms_dtls_srtp_start(sessions->dtls_context);  /* then start the engine, it will send the DTLS client Hello */
+		} else {
+			ms_warning("unable to start DTLS engine on stream session [%p], Dtls role in resulting media description is invalid",sessions);
+		}
+	}
+}
 static void linphone_call_start_audio_stream(LinphoneCall *call, bool_t muted, bool_t send_ringbacktone, bool_t use_arc){
 	LinphoneCore *lc=call->core;
 	LpConfig* conf;
@@ -2436,25 +2449,9 @@ static void linphone_call_start_audio_stream(LinphoneCall *call, bool_t muted, b
 			if (send_ringbacktone){
 				setup_ring_player(lc,call);
 			}
-
-			if (sal_stream_description_has_dtls(stream) == TRUE) {
-				/* DTLS engine was already initialised during stream init. Before starting it we must be sure that the role(client or server) is set.
-				 * Role may have already been set to server if we initiate the call and already received a packet from peer, in that case do nothing */
-				SalDtlsRole salRole = stream->dtls_role;
-				if (salRole!=SalDtlsRoleInvalid) { /* if DTLS is available at both end points */
-					/* give the peer certificate fingerprint to dtls context */
-					SalMediaDescription *remote_desc = sal_call_get_remote_media_description(call->op);
-					ms_dtls_srtp_set_peer_fingerprint(call->audiostream->ms.sessions.dtls_context, remote_desc->streams[0].dtls_fingerprint);
-				} else {
-					ms_warning("unable to start DTLS engine on audiostream, Dtls role in resulting media description is invalid\n");
-				}
-				if (salRole == SalDtlsRoleIsClient) { /* local endpoint is client */
-					ms_dtls_srtp_set_role(call->audiostream->ms.sessions.dtls_context, MSDtlsSrtpRoleIsClient); /* set the role to client */
-					ms_dtls_srtp_start(call->audiostream->ms.sessions.dtls_context);  /* then start the engine, it will send the DTLS client Hello */
-				} else if (salRole == SalDtlsRoleIsServer) { /* local endpoint is server */
-					ms_dtls_srtp_set_role(call->audiostream->ms.sessions.dtls_context, MSDtlsSrtpRoleIsServer); /* this may complete the server setup */
-					/* no need to start engine, we are waiting for DTLS Client Hello */
-				}
+			{
+				SalMediaDescription *remote_desc = sal_call_get_remote_media_description(call->op);
+				start_dtls(&call->audiostream->ms.sessions,stream,&remote_desc->streams[0]);
 			}
 
 			if (call->params->in_conference){
@@ -2582,24 +2579,11 @@ static void linphone_call_start_video_stream(LinphoneCall *call, bool_t all_inpu
 									   used_pt, linphone_core_get_video_jittcomp(lc), cam);
 				}
 			}
-			if (sal_stream_description_has_dtls(vstream) == TRUE) {
-				/*DTLS*/
-				SalDtlsRole salRole = vstream->dtls_role;
-				if (salRole!=SalDtlsRoleInvalid) { /* if DTLS is available at both end points */
-					/* give the peer certificate fingerprint to dtls context */
-					SalMediaDescription *remote_desc = sal_call_get_remote_media_description(call->op);
-					ms_dtls_srtp_set_peer_fingerprint(call->videostream->ms.sessions.dtls_context, remote_desc->streams[1].dtls_fingerprint);
-				} else {
-					ms_warning("unable to start DTLS engine on videostream, Dtls role in resulting media description is invalid\n");
-				}
-				if (salRole == SalDtlsRoleIsClient) { /* local endpoint is client */
-					ms_dtls_srtp_set_role(call->videostream->ms.sessions.dtls_context, MSDtlsSrtpRoleIsClient); /* set the role to client */
-					ms_dtls_srtp_start(call->videostream->ms.sessions.dtls_context);  /* then start the engine, it will send the DTLS client Hello */
-				} else if (salRole == SalDtlsRoleIsServer) { /* local endpoint is server */
-					ms_dtls_srtp_set_role(call->videostream->ms.sessions.dtls_context, MSDtlsSrtpRoleIsServer); /* this may complete the server setup */
-					/* no need to start engine, we are waiting for DTLS Client Hello */
-				}
+			{
+				SalMediaDescription *remote_desc = sal_call_get_remote_media_description(call->op);
+				start_dtls(&call->videostream->ms.sessions,vstream,&remote_desc->streams[1]);
 			}
+
 		}else ms_warning("No video stream accepted.");
 	}else{
 		ms_message("No valid video stream defined.");
@@ -2710,6 +2694,10 @@ void linphone_call_update_crypto_parameters(LinphoneCall *call, SalMediaDescript
 	if (call->audiostream && local_st_desc && old_stream && new_stream &&
 		update_stream_crypto_params(call,local_st_desc,old_stream,new_stream,&call->audiostream->ms)){
 	}
+	if (call->audiostream) {
+		SalMediaDescription *remote_desc = sal_call_get_remote_media_description(call->op);
+		start_dtls(&call->audiostream->ms.sessions,&new_md->streams[0],&remote_desc->streams[0]);
+	}
 
 #ifdef VIDEO_ENABLED
 	local_st_desc = sal_media_description_find_secure_stream_of_type(call->localdesc, SalVideo);
@@ -2718,6 +2706,10 @@ void linphone_call_update_crypto_parameters(LinphoneCall *call, SalMediaDescript
 	if (call->videostream && local_st_desc && old_stream && new_stream &&
 		update_stream_crypto_params(call,local_st_desc,old_stream,new_stream,&call->videostream->ms)){
 	}
+	if (call->videostream) {
+		SalMediaDescription *remote_desc = sal_call_get_remote_media_description(call->op);
+		start_dtls(&call->videostream->ms.sessions,&new_md->streams[1],&remote_desc->streams[1]);
+	}
 #endif
 }
 
@@ -3285,7 +3277,8 @@ static void handle_ice_events(LinphoneCall *call, OrtpEvent *ev){
 		switch (ice_session_state(call->ice_session)) {
 			case IS_Completed:
 				ice_session_select_candidates(call->ice_session);
-				if (ice_session_role(call->ice_session) == IR_Controlling) {
+				if (ice_session_role(call->ice_session) == IR_Controlling
+						&& lp_config_get_int(call->core->config, "sip", "update_call_when_ice_completed", TRUE)) {
 					linphone_core_update_call(call->core, call, params);
 				}
 				change_ice_media_destinations(call);
diff --git a/coreapi/sal.c b/coreapi/sal.c
index ea26b25d8..11934f572 100644
--- a/coreapi/sal.c
+++ b/coreapi/sal.c
@@ -318,6 +318,11 @@ int sal_stream_description_equals(const SalStreamDescription *sd1, const SalStre
 	if (sd1->ptime != sd2->ptime) result |= SAL_MEDIA_DESCRIPTION_CODEC_CHANGED;
 	if (sd1->dir != sd2->dir) result |= SAL_MEDIA_DESCRIPTION_CODEC_CHANGED;
 
+	/*DTLS*/
+	if (sd1->dtls_role != sd2->dtls_role) result |= SAL_MEDIA_DESCRIPTION_CRYPTO_KEYS_CHANGED;
+	if (strcmp(sd1->dtls_fingerprint, sd2->dtls_fingerprint) != 0) result |= SAL_MEDIA_DESCRIPTION_CRYPTO_KEYS_CHANGED;
+
+
 	return result;
 }
 

From 097cae673a4a8abd554d6ad58aa89999689b57b4 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Tue, 17 Feb 2015 17:23:27 +0100
Subject: [PATCH 435/496] robustize tests for windows

---
 coreapi/remote_provisioning.c |  4 ++--
 tester/call_tester.c          | 10 +++++-----
 tester/flexisip_tester.c      |  8 ++++++--
 tester/setup_tester.c         | 14 +++++++-------
 4 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/coreapi/remote_provisioning.c b/coreapi/remote_provisioning.c
index fd5d2eb92..901170eac 100644
--- a/coreapi/remote_provisioning.c
+++ b/coreapi/remote_provisioning.c
@@ -62,9 +62,9 @@ static void linphone_remote_provisioning_apply(LinphoneCore *lc, const char *xml
 
 int linphone_remote_provisioning_load_file( LinphoneCore* lc, const char* file_path){
 	int status = -1;
-	FILE* f = fopen(file_path, "r");
+	FILE* f = fopen(file_path, "rb");
 
-	if( f ){
+	if ( f ){
 		long fsize;
 		char* provisioning;
 
diff --git a/tester/call_tester.c b/tester/call_tester.c
index 9fe4c5913..237ec04ff 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -3072,7 +3072,7 @@ static void multiple_early_media(void) {
 	marie2_call=linphone_core_get_current_call(marie2->lc);
 
 	/*wait a bit that streams are established*/
-	wait_for_list(lcs,&dummy,1,3000);
+	wait_for_list(lcs,&dummy,1,6000);
 	CU_ASSERT_TRUE(linphone_call_get_audio_stats(pauline_call)->download_bandwidth>70);
 	CU_ASSERT_TRUE(linphone_call_get_audio_stats(marie1_call)->download_bandwidth>70);
 	CU_ASSERT_TRUE(linphone_call_get_audio_stats(marie2_call)->download_bandwidth>70);
@@ -3085,18 +3085,18 @@ static void multiple_early_media(void) {
 	CU_ASSERT_TRUE(wait_for_list(lcs,&marie2->stat.number_of_LinphoneCallEnd,1,1000));
 
 	/*wait a bit that streams are established*/
-	wait_for_list(lcs,&dummy,1,1000);
+	wait_for_list(lcs,&dummy,1,3000);
 	CU_ASSERT_TRUE(linphone_call_get_audio_stats(pauline_call)->download_bandwidth>71);
 	CU_ASSERT_TRUE(linphone_call_get_audio_stats(marie1_call)->download_bandwidth>71);
 
 	/*send an INFO in reverse side to check that dialogs are properly established*/
 	info=linphone_core_create_info_message(marie1->lc);
 	linphone_call_send_info_message(marie1_call,info);
-	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_inforeceived,1,2000));
+	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_inforeceived,1,3000));
 
 	linphone_core_terminate_all_calls(pauline->lc);
-	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallEnd,1,2000));
-	CU_ASSERT_TRUE(wait_for_list(lcs,&marie1->stat.number_of_LinphoneCallEnd,1,2000));
+	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallEnd,1,3000));
+	CU_ASSERT_TRUE(wait_for_list(lcs,&marie1->stat.number_of_LinphoneCallEnd,1,3000));
 
 	ms_list_free(lcs);
 	linphone_core_manager_destroy(marie1);
diff --git a/tester/flexisip_tester.c b/tester/flexisip_tester.c
index 7f4680639..948df8fba 100644
--- a/tester/flexisip_tester.c
+++ b/tester/flexisip_tester.c
@@ -464,7 +464,7 @@ static void call_forking_with_push_notification_multiple(void){
 	linphone_core_manager_destroy(marie2);
 }
 
-void call_forking_not_responded(void){
+static void call_forking_not_responded(void){
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
 	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
 	LinphoneCoreManager* marie2 = linphone_core_manager_new( "marie_rc");
@@ -551,7 +551,7 @@ static void early_media_call_forking(void) {
 	marie2_call=linphone_core_get_current_call(marie2->lc);
 	
 	/*wait a bit that streams are established*/
-	wait_for_list(lcs,&dummy,1,3000);
+	wait_for_list(lcs,&dummy,1,6000);
 	CU_ASSERT_TRUE(linphone_call_get_audio_stats(pauline_call)->download_bandwidth>60
 					&& linphone_call_get_audio_stats(pauline_call)->download_bandwidth<99);
 	CU_ASSERT_TRUE(linphone_call_get_audio_stats(marie1_call)->download_bandwidth>60
@@ -663,6 +663,9 @@ static void call_with_ipv6(void) {
 	LinphoneCoreManager* pauline;
 	LinphoneCall *pauline_call;
 
+	/*calling ortp_init() here is done to have WSAStartup() done, otherwise liblinphone_tester_ipv6_available() will not work.*/
+	ortp_init();
+	
 	if (!liblinphone_tester_ipv6_available()){
 		ms_warning("Call with ipv6 not tested, no ipv6 connectivity");
 		return;
@@ -708,6 +711,7 @@ static void call_with_ipv6(void) {
 	if (leaked_objects>0){
 		belle_sip_object_dump_active_objects();
 	}
+	ortp_exit();
 }
 
 test_t flexisip_tests[] = {
diff --git a/tester/setup_tester.c b/tester/setup_tester.c
index bab077623..06d734d6a 100644
--- a/tester/setup_tester.c
+++ b/tester/setup_tester.c
@@ -96,9 +96,8 @@ static void linphone_interpret_url_test()
 }
 
 static void linphone_lpconfig_from_buffer(){
-
-	static const char* buffer = "[buffer]\ntest=ok";
-	static const char* buffer_linebreaks = "[buffer_linebreaks]\n\n\n\r\n\n\r\ntest=ok";
+	const char* buffer = "[buffer]\ntest=ok";
+	const char* buffer_linebreaks = "[buffer_linebreaks]\n\n\n\r\n\n\r\ntest=ok";
 	LpConfig* conf;
 
 	conf = lp_config_new_from_buffer(buffer);
@@ -112,7 +111,7 @@ static void linphone_lpconfig_from_buffer(){
 
 static void linphone_lpconfig_from_buffer_zerolen_value(){
 	/* parameters that have no value should return NULL, not "". */
-	static const char* zerolen = "[test]\nzero_len=\nnon_zero_len=test";
+	const char* zerolen = "[test]\nzero_len=\nnon_zero_len=test";
 	LpConfig* conf;
 
 	conf = lp_config_new_from_buffer(zerolen);
@@ -128,7 +127,7 @@ static void linphone_lpconfig_from_buffer_zerolen_value(){
 
 static void linphone_lpconfig_from_file_zerolen_value(){
 	/* parameters that have no value should return NULL, not "". */
-	static const char* zero_rc_file = "zero_length_params_rc";
+	const char* zero_rc_file = "zero_length_params_rc";
 	char* rc_path = ms_strdup_printf("%s/rcfiles/%s", liblinphone_tester_file_prefix, zero_rc_file);
 	LpConfig* conf;
 
@@ -144,11 +143,12 @@ static void linphone_lpconfig_from_file_zerolen_value(){
 	lp_config_set_string(conf, "test", "non_zero_len", ""); /* should remove "non_zero_len" */
 	CU_ASSERT_STRING_EQUAL(lp_config_get_string(conf,"test","non_zero_len","LOL"), "LOL");
 
+	ms_free(rc_path);
 	lp_config_destroy(conf);
 }
 
 static void linphone_lpconfig_from_xml_zerolen_value(){
-	static const char* zero_xml_file = "remote_zero_length_params_rc";
+	const char* zero_xml_file = "remote_zero_length_params_rc";
 	char* xml_path = ms_strdup_printf("%s/rcfiles/%s", liblinphone_tester_file_prefix, zero_xml_file);
 	LpConfig* conf;
 
@@ -165,7 +165,7 @@ static void linphone_lpconfig_from_xml_zerolen_value(){
 	CU_ASSERT_STRING_EQUAL(lp_config_get_string(conf,"test","non_zero_len","LOL"), "LOL");
 
 	linphone_core_manager_destroy(mgr);
-
+	ms_free(xml_path);
 }
 
 void linphone_proxy_config_address_equal_test() {

From 006e1ead57498ef488b53eb0988fde8b8ef9dd3c Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Tue, 17 Feb 2015 17:44:02 +0100
Subject: [PATCH 436/496] Update ms2

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 7c9ff4ca0..ef83b7a28 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 7c9ff4ca0e597cc36e1ddf14dacfb4bf7a239d74
+Subproject commit ef83b7a2899bc838fe9a490afbb31ae017c7d810

From 5c30b4d6c091ae044b1e3b1e0b2d6d3270e548d1 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Tue, 17 Feb 2015 18:21:52 +0100
Subject: [PATCH 437/496] skip call forking with multicast tests on windows, as
 it is not possible on this platform

---
 tester/multicast_call_tester.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tester/multicast_call_tester.c b/tester/multicast_call_tester.c
index e5a05c11e..356cf3e74 100644
--- a/tester/multicast_call_tester.c
+++ b/tester/multicast_call_tester.c
@@ -96,6 +96,15 @@ static void early_media_with_multicast_base(bool_t video) {
 	int begin;
 	LinphoneVideoPolicy marie_policy, pauline_policy;
 	LpConfig *marie_lp;
+	
+#ifdef WIN32
+	/*
+	 * "Do not call IP_ADD_MEMBERSHIP with the same group more than once on the same network interface."
+	 * https://msdn.microsoft.com/en-us/library/windows/desktop/ms739174%28v=vs.85%29.aspx
+	*/
+	ms_warning("Call forking with multicast can't be tested on windows, test skipped");
+	return;
+#endif
 
 	belle_sip_object_enable_leak_detector(TRUE);
 	begin=belle_sip_object_get_object_count();

From 41a3e1e06db3268eeee713fc4a06b57c1b2b2a38 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Tue, 17 Feb 2015 23:43:20 +0100
Subject: [PATCH 438/496] rework multicast. It is not necessary to bind to the
 multicast address. 0.0.0.0 just works while the binding to the multicast
 address is rejected on windows fixes reading provisionning config file from
 disk on windows.

---
 coreapi/linphonecall.c        | 27 ++++++++++++-------
 coreapi/private.h             |  2 ++
 coreapi/remote_provisioning.c | 49 +++++++++++++++++++----------------
 mediastreamer2                |  2 +-
 oRTP                          |  2 +-
 tester/call_tester.c          |  2 +-
 6 files changed, 49 insertions(+), 35 deletions(-)

diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index afcd516e5..cbf2d4362 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -555,14 +555,11 @@ static void transfer_already_assigned_payload_types(SalMediaDescription *old, Sa
 
 static const char *linphone_call_get_bind_ip_for_stream(LinphoneCall *call, int stream_index){
 	const char *bind_ip=call->af==AF_INET6 ? "::0" : "0.0.0.0";
-	
+
 	if (stream_index<2 && call->media_ports[stream_index].multicast_ip[0]!='\0'){
 		if (call->dir==LinphoneCallOutgoing){
-			 /*as multicast sender, we must decide a local interface to use to send multicast, and bind to it*/
+			/*as multicast sender, we must decide a local interface to use to send multicast, and bind to it*/
 			bind_ip=call->localip;
-		}else{
-			/*as receiver, just bind to the multicast address*/
-			bind_ip=call->media_ports[stream_index].multicast_ip;
 		}
 	}
 	return bind_ip;
@@ -1003,8 +1000,8 @@ void linphone_call_set_compatible_incoming_call_parameters(LinphoneCall *call, c
 		if (md->streams[i].rtp_addr[i]!='\0' && ms_is_multicast(md->streams[i].rtp_addr)) {
 			strncpy(call->media_ports[i].multicast_ip,md->streams[i].rtp_addr,sizeof(call->media_ports[i].multicast_ip));
 			ms_message("Disabling rtcp on call [%p], stream [%i] because of multicast",call,i);
-			call->media_ports[i].rtp_port=md->streams[i].rtp_port;
-			call->media_ports[i].rtcp_port=0;
+			call->media_ports[i].mcast_rtp_port=md->streams[i].rtp_port;
+			call->media_ports[i].mcast_rtcp_port=0;
 		}
 	}
 }
@@ -1844,7 +1841,12 @@ int linphone_call_prepare_ice(LinphoneCall *call, bool_t incoming_offer){
 	return 0;
 }
 
-
+/*eventually join to a multicast group if told to do so*/
+static void linphone_call_join_multicast_group(LinphoneCall *call, int stream_index, MediaStream *ms){
+	if (call->media_ports[stream_index].multicast_ip[stream_index]!='\0' && call->media_ports[stream_index].mcast_rtp_port!=0){
+		media_stream_join_multicast_group(ms, call->media_ports[stream_index].multicast_ip);
+	}
+}
 
 void linphone_call_init_audio_stream(LinphoneCall *call){
 	LinphoneCore *lc=call->core;
@@ -1859,7 +1861,10 @@ void linphone_call_init_audio_stream(LinphoneCall *call){
 	if (call->audiostream != NULL) return;
 	if (call->sessions[0].rtp_session==NULL){
 		call->audiostream=audiostream=audio_stream_new2(linphone_call_get_bind_ip_for_stream(call,0),
-				call->media_ports[0].rtp_port, call->media_ports[0].rtcp_port);
+				call->media_ports[0].mcast_rtp_port ? call->media_ports[0].mcast_rtp_port : call->media_ports[0].rtp_port, 
+				call->media_ports[0].mcast_rtcp_port ? call->media_ports[0].mcast_rtcp_port : call->media_ports[0].rtcp_port);
+		linphone_call_join_multicast_group(call, 0, &audiostream->ms);
+		
 		cname = linphone_address_as_string_uri_only(call->me);
 		audio_stream_set_rtcp_information(call->audiostream, cname, rtcp_tool);
 		ms_free(cname);
@@ -1965,7 +1970,9 @@ void linphone_call_init_video_stream(LinphoneCall *call){
 
 		if (call->sessions[1].rtp_session==NULL){
 			call->videostream=video_stream_new2(linphone_call_get_bind_ip_for_stream(call,1),
-					call->media_ports[1].rtp_port,call->media_ports[1].rtcp_port);
+				call->media_ports[1].mcast_rtp_port>0 ?  call->media_ports[1].mcast_rtp_port : call->media_ports[1].rtp_port,
+				call->media_ports[1].mcast_rtcp_port>0 ? call->media_ports[1].mcast_rtcp_port : call->media_ports[1].rtcp_port);
+			linphone_call_join_multicast_group(call, 1, &call->videostream->ms);
 			cname = linphone_address_as_string_uri_only(call->me);
 			video_stream_set_rtcp_information(call->videostream, cname, rtcp_tool);
 			ms_free(cname);
diff --git a/coreapi/private.h b/coreapi/private.h
index 15083943e..d5a59d85f 100644
--- a/coreapi/private.h
+++ b/coreapi/private.h
@@ -203,6 +203,8 @@ typedef struct StunCandidate{
 
 typedef struct _PortConfig{
 	char multicast_ip[LINPHONE_IPADDR_SIZE];
+	int mcast_rtp_port;
+	int mcast_rtcp_port;
 	int rtp_port;
 	int rtcp_port;
 }PortConfig;
diff --git a/coreapi/remote_provisioning.c b/coreapi/remote_provisioning.c
index fd5d2eb92..5562f65db 100644
--- a/coreapi/remote_provisioning.c
+++ b/coreapi/remote_provisioning.c
@@ -60,33 +60,38 @@ static void linphone_remote_provisioning_apply(LinphoneCore *lc, const char *xml
 									, error_msg);
 }
 
+static char *load_file_content(const char *path){
+	FILE *f=fopen(path,"rb");
+	size_t bufsize=2048;
+	size_t step=bufsize;
+	size_t pos=0;
+	size_t count;
+	char *buffer=ms_malloc(bufsize+1);
+	if (!f) {
+		ms_error("load_file_content(): could not open [%s]",path);
+		return NULL;
+	}
+	while((count=fread(buffer+pos, 1, step, f))>0){
+		pos+=count;
+		if (pos+step>=bufsize){
+			bufsize*=2;
+			buffer=ms_realloc(buffer, bufsize+1);
+		}
+	}
+	buffer[pos]='\0';
+	fclose(f);
+	return buffer;
+}
+
 int linphone_remote_provisioning_load_file( LinphoneCore* lc, const char* file_path){
 	int status = -1;
-	FILE* f = fopen(file_path, "r");
+	char* provisioning=load_file_content(file_path);
 
-	if( f ){
-		long fsize;
-		char* provisioning;
-
-		fseek(f, 0, SEEK_END);
-		fsize = ftell(f);
-		fseek(f, 0, SEEK_SET);
-
-		provisioning = ms_malloc(fsize + 1);
-		provisioning[fsize]='\0';
-		if (fread(provisioning, fsize, 1, f)==0){
-			ms_error("Could not read xml provisioning file from %s",file_path);
-			status=-1;
-		}else{
-			linphone_remote_provisioning_apply(lc, provisioning);
-			status = 0;
-		}
+	if (provisioning){
+		linphone_remote_provisioning_apply(lc, provisioning);
+		status = 0;
 		ms_free(provisioning);
-		fclose(f);
-	} else {
-		ms_error("Couldn't open file %s for provisioning", file_path);
 	}
-
 	return status;
 }
 
diff --git a/mediastreamer2 b/mediastreamer2
index ef83b7a28..acca89ed2 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit ef83b7a2899bc838fe9a490afbb31ae017c7d810
+Subproject commit acca89ed2e726ac53eddce9ffbfd378ea0c9bf9f
diff --git a/oRTP b/oRTP
index cd468445a..cd3f64ec0 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit cd468445a4f276f54ee9f9948712855f3cd1a0dc
+Subproject commit cd3f64ec021534413f247b2f0185d9e934348529
diff --git a/tester/call_tester.c b/tester/call_tester.c
index 9fe4c5913..ced4de373 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -3272,7 +3272,7 @@ static void call_with_in_dialog_codec_change_base(bool_t no_sdp) {
 	CU_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&pauline->stat.number_of_LinphoneCallUpdatedByRemote,1));
 	CU_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&pauline->stat.number_of_LinphoneCallStreamsRunning,2));
 	CU_ASSERT_STRING_EQUAL("PCMA",linphone_payload_type_get_mime_type(linphone_call_params_get_used_audio_codec(linphone_call_get_current_params(linphone_core_get_current_call(marie->lc)))));
-	wait_for_until(marie->lc, pauline->lc, &dummy, 1, 3000);
+	wait_for_until(marie->lc, pauline->lc, &dummy, 1, 5000);
 	CU_ASSERT_TRUE(linphone_call_get_audio_stats(linphone_core_get_current_call(marie->lc))->download_bandwidth>70);
 	CU_ASSERT_TRUE(linphone_call_get_audio_stats(linphone_core_get_current_call(pauline->lc))->download_bandwidth>70);
 

From 338f0339b7554bb3b2e8a85472ea94f50f89cbc4 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Tue, 17 Feb 2015 23:48:10 +0100
Subject: [PATCH 439/496] restore correct version of ms2 and ortp after git bug

---
 mediastreamer2 | 2 +-
 oRTP           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 7c9ff4ca0..acca89ed2 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 7c9ff4ca0e597cc36e1ddf14dacfb4bf7a239d74
+Subproject commit acca89ed2e726ac53eddce9ffbfd378ea0c9bf9f
diff --git a/oRTP b/oRTP
index cd468445a..cd3f64ec0 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit cd468445a4f276f54ee9f9948712855f3cd1a0dc
+Subproject commit cd3f64ec021534413f247b2f0185d9e934348529

From 56f89bbbaa20d5f911c631a6151beb74ab670539 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Wed, 18 Feb 2015 00:16:46 +0100
Subject: [PATCH 440/496] update ms2 and ortp. All multicast tests are passed
 on windows

---
 mediastreamer2                 | 2 +-
 oRTP                           | 2 +-
 tester/multicast_call_tester.c | 9 ---------
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/mediastreamer2 b/mediastreamer2
index acca89ed2..d1684034e 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit acca89ed2e726ac53eddce9ffbfd378ea0c9bf9f
+Subproject commit d1684034e44781ca71a107d7d2b6db626a3ab993
diff --git a/oRTP b/oRTP
index cd3f64ec0..908c31ca7 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit cd3f64ec021534413f247b2f0185d9e934348529
+Subproject commit 908c31ca7f5f251e7d2d3db0318a41ef4d66e1fb
diff --git a/tester/multicast_call_tester.c b/tester/multicast_call_tester.c
index 356cf3e74..e5a05c11e 100644
--- a/tester/multicast_call_tester.c
+++ b/tester/multicast_call_tester.c
@@ -96,15 +96,6 @@ static void early_media_with_multicast_base(bool_t video) {
 	int begin;
 	LinphoneVideoPolicy marie_policy, pauline_policy;
 	LpConfig *marie_lp;
-	
-#ifdef WIN32
-	/*
-	 * "Do not call IP_ADD_MEMBERSHIP with the same group more than once on the same network interface."
-	 * https://msdn.microsoft.com/en-us/library/windows/desktop/ms739174%28v=vs.85%29.aspx
-	*/
-	ms_warning("Call forking with multicast can't be tested on windows, test skipped");
-	return;
-#endif
 
 	belle_sip_object_enable_leak_detector(TRUE);
 	begin=belle_sip_object_get_object_count();

From d69838771a0396c3b390e4768c8e5a717b9952af Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Wed, 18 Feb 2015 00:20:01 +0100
Subject: [PATCH 441/496] avoid unnecessary computations in call with file
 player

---
 tester/call_tester.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tester/call_tester.c b/tester/call_tester.c
index ce68337aa..42068f327 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -2182,7 +2182,7 @@ static void call_with_file_player(void) {
 	}
 
 	/* This assert should be modified to be at least as long as the hello8000.wav file */
-	CU_ASSERT_TRUE(wait_for_until(pauline->lc,marie->lc,&marie->stat.number_of_player_eof,1,30000));
+	CU_ASSERT_TRUE(wait_for_until(pauline->lc,marie->lc,&marie->stat.number_of_player_eof,1,23000));
 
 	/*just to sleep*/
 	linphone_core_terminate_all_calls(marie->lc);

From d80ed0f2a3f1dba5014f98a683e61a721424b50f Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Wed, 18 Feb 2015 10:51:05 +0100
Subject: [PATCH 442/496] Fix liblinphone tester

---
 build/android/liblinphone_tester.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/android/liblinphone_tester.mk b/build/android/liblinphone_tester.mk
index 9f1ab7408..d62f055d8 100644
--- a/build/android/liblinphone_tester.mk
+++ b/build/android/liblinphone_tester.mk
@@ -37,10 +37,10 @@ LOCAL_MODULE_FILENAME := liblinphone_tester-$(TARGET_ARCH_ABI)
 LOCAL_SRC_FILES += $(common_SRC_FILES)
 LOCAL_C_INCLUDES = $(common_C_INCLUDES)
 LOCAL_CFLAGS = -DIN_LINPHONE
-LOCAL_LDLIBS := -llog
+LOCAL_LDLIBS := -llog -lz
 
 ifeq ($(BUILD_MATROSKA), 1)
-LOCAL_CFLAGS += -DHAVE_MATROSKA
+LOCAL_CFLAGS += -DHAVE_MATROSKA -DHAVE_ZLIB
 endif
 
 LOCAL_SHARED_LIBRARIES := cunit liblinphone

From 35d9b8086c7915afd9308d103761bbc36cf94a02 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Wed, 18 Feb 2015 10:59:23 +0100
Subject: [PATCH 443/496] Updated oRTP and ms2 wp8 projects

---
 mediastreamer2 | 2 +-
 oRTP           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mediastreamer2 b/mediastreamer2
index d1684034e..7b759e6fc 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit d1684034e44781ca71a107d7d2b6db626a3ab993
+Subproject commit 7b759e6fcb38edb60b10aad3640cd933a2b9680e
diff --git a/oRTP b/oRTP
index 908c31ca7..fa091e035 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 908c31ca7f5f251e7d2d3db0318a41ef4d66e1fb
+Subproject commit fa091e0350afaa2a26348ed0ca678135184d628c

From 8a4b7272db11cd8fd0511b0cf3454d8beceecb0e Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Wed, 18 Feb 2015 11:44:05 +0100
Subject: [PATCH 444/496] Updated ms2 to fix crash on wp8

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 7b759e6fc..f029557ca 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 7b759e6fcb38edb60b10aad3640cd933a2b9680e
+Subproject commit f029557ca053bc3571131f9dd186d0f355d8f143

From b0ba3b1f1df06b817e182ea094c0c6eef044497d Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Wed, 18 Feb 2015 13:45:22 +0100
Subject: [PATCH 445/496] Updated ms2 with fix for loading wp8 plugins

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index f029557ca..6924f3396 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit f029557ca053bc3571131f9dd186d0f355d8f143
+Subproject commit 6924f33961f54aa8ddb58a5cc0a0c8aaa624cdce

From ec3e9365dd431725f80e4549bfa54eb869a0aeab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
 <francois.grisez@belledonne-communications.com>
Date: Wed, 18 Feb 2015 13:39:15 +0100
Subject: [PATCH 446/496] Update changelog for release 3.8.0

---
 NEWS | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index dce0e0824..acdbf2e45 100644
--- a/NEWS
+++ b/NEWS
@@ -2,12 +2,26 @@ linphone-3.8.0 -- Date to be defined
 	Application level improvements:
 	* The video window has now controls in order to switch fullscreen mode and terminate call.
 	* The out of call video preview feature (to test camera) is moved into the settings and is no longer linked to the in-call video preview feature.
-	* Lots of updated translations.
+	* Add an assistant to help users to set audio/video parameters
+	* Some ergonomics improvments (checkbox to set random port for UDP and TCP, ...)
+	* Lots of updated translations. Arabic translation has been added
+	* Experimental feature: play an MKV file by drag-and-dropping it on the video call window
 
 	Liblinphone level improvements:
-	* Support for RTP/AVPF (RFCxxxx) for video streams, allowing fast transmission error recovery with VP8 codec only.
+	* Support for RTP/AVPF (RFC4585) for video streams, allowing fast transmission error recovery with VP8 codec only.
 	* API enhancements, most objects can be ref-counted.
+	* Add some getter funtctions to the call information API
+	* Add a function in the API to accept early-media calls
+	* Add a function to set the SIP transport timeout
+	* Add a function to change adaptive rate algorithm at runtime
+	* Add support of file transfer
 	* Call video recording feature, in mkv format (H264 streams only for the moment)
+	* Call playing feature: play an MKV file and send the audio/video stream through a call
+	* Local player API. Play WAV and MKV file and display video on a specified window display
+	* A wrapper for Python has been made
+	* Support of Wake Locks on Android
+	* Support of multicast IP addresses
+	* Support of incoming UPDATEs within dialog (RFC3311)
 	* Support of SRTP by using packages from GNU/Linux distributions
 
 linphone-3.7.0 -- February 20th, 2014

From 209219b8cf06d82f49d48e3bb5924243e92bd71f Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Wed, 18 Feb 2015 14:21:30 +0100
Subject: [PATCH 447/496] Use false linphone_plugins_dir in wp8 to not load
 plugins twice

---
 build/wp8/LibLinphone.vcxproj           | 4 ++--
 build/wp8/LibLinphone_no_tunnel.vcxproj | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build/wp8/LibLinphone.vcxproj b/build/wp8/LibLinphone.vcxproj
index 7e692e325..93900b840 100644
--- a/build/wp8/LibLinphone.vcxproj
+++ b/build/wp8/LibLinphone.vcxproj
@@ -54,7 +54,7 @@
     <ClCompile>
       <WarningLevel>Level4</WarningLevel>
       <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\belle-sip\include;$(ProjectDir)..\..\oRTP\include;$(ProjectDir)..\..\mediastreamer2\include;$(ProjectDir)..\..\..\tunnel\include;$(ProjectDir)..\..\coreapi;$(ProjectDir)..\..\include;$(SolutionDir)$(Platform)\$(Configuration)\include;$(ProjectDir)..\..\..\zlib;$(ProjectDir)..\..\..\sqlite\;$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>__STDC_CONSTANT_MACROS;_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;_USRDLL;WINDOW_NATIVE;_TRUE_TIME;IN_LINPHONE;USE_BELLESIP;TUNNEL_ENABLED;VIDEO_ENABLED;LINPHONE_PACKAGE_NAME="linphone";LIBLINPHONE_EXPORTS;LINPHONE_PLUGINS_DIR=".";UNICODE;_XKEYCHECK_H;HAVE_ZLIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>__STDC_CONSTANT_MACROS;_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;_USRDLL;WINDOW_NATIVE;_TRUE_TIME;IN_LINPHONE;USE_BELLESIP;TUNNEL_ENABLED;VIDEO_ENABLED;LINPHONE_PACKAGE_NAME="linphone";LIBLINPHONE_EXPORTS;LINPHONE_PLUGINS_DIR="\\linphone\\plugins";UNICODE;_XKEYCHECK_H;HAVE_ZLIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
@@ -220,4 +220,4 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsPhone\v$(TargetPlatformVersion)\Microsoft.Cpp.WindowsPhone.$(TargetPlatformVersion).targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/wp8/LibLinphone_no_tunnel.vcxproj b/build/wp8/LibLinphone_no_tunnel.vcxproj
index 447253440..6d8167046 100644
--- a/build/wp8/LibLinphone_no_tunnel.vcxproj
+++ b/build/wp8/LibLinphone_no_tunnel.vcxproj
@@ -54,7 +54,7 @@
     <ClCompile>
       <WarningLevel>Level4</WarningLevel>
       <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\belle-sip\include;$(ProjectDir)..\..\oRTP\include;$(ProjectDir)..\..\mediastreamer2\include;$(ProjectDir)..\..\..\tunnel\include;$(ProjectDir)..\..\coreapi;$(ProjectDir)..\..\include;$(SolutionDir)$(Platform)\$(Configuration)\include;$(ProjectDir)..\..\..\zlib;$(ProjectDir)..\..\..\sqlite\;$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>__STDC_CONSTANT_MACROS;_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;_USRDLL;WINDOW_NATIVE;_TRUE_TIME;IN_LINPHONE;USE_BELLESIP;VIDEO_ENABLED;LINPHONE_PACKAGE_NAME="linphone";LIBLINPHONE_EXPORTS;LINPHONE_PLUGINS_DIR=".";UNICODE;_XKEYCHECK_H;HAVE_ZLIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>__STDC_CONSTANT_MACROS;_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;_USRDLL;WINDOW_NATIVE;_TRUE_TIME;IN_LINPHONE;USE_BELLESIP;VIDEO_ENABLED;LINPHONE_PACKAGE_NAME="linphone";LIBLINPHONE_EXPORTS;LINPHONE_PLUGINS_DIR="\\linphone\\plugins";UNICODE;_XKEYCHECK_H;HAVE_ZLIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
@@ -216,4 +216,4 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsPhone\v$(TargetPlatformVersion)\Microsoft.Cpp.WindowsPhone.$(TargetPlatformVersion).targets" />
-</Project>
\ No newline at end of file
+</Project>

From 56e58d0cee2e970822ba460dc6f8f8c3936f4552 Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Wed, 18 Feb 2015 14:52:34 +0100
Subject: [PATCH 448/496] Change the SDP removal mechanism for something a bit
 more tunable. There is now an "SDP handling mode": you can choose between
 normal, simulate removal of SDP or simulate SDP error. This allows for
 simulating 200 OK without SDP, for instance (a unit test is coming for this).

---
 coreapi/bellesip_sal/sal_impl.c    |  6 ++--
 coreapi/bellesip_sal/sal_impl.h    |  6 ++--
 coreapi/bellesip_sal/sal_op_call.c | 22 ++++++++++----
 coreapi/bellesip_sal/sal_op_impl.c |  8 ++---
 include/sal/sal.h                  | 22 +++++++++++---
 tester/call_tester.c               | 48 +++++++++++++++++-------------
 tester/liblinphone_tester.h        |  9 +++---
 7 files changed, 76 insertions(+), 45 deletions(-)

diff --git a/coreapi/bellesip_sal/sal_impl.c b/coreapi/bellesip_sal/sal_impl.c
index 3b3c24955..9829d22b3 100644
--- a/coreapi/bellesip_sal/sal_impl.c
+++ b/coreapi/bellesip_sal/sal_impl.c
@@ -1149,7 +1149,7 @@ void sal_enable_sip_update_method(Sal *ctx,bool_t value) {
 	ctx->enable_sip_update=value;
 }
 
-void sal_default_enable_sdp_removal(Sal *sal, bool_t enable)  {
-	if (enable) ms_message("Enabling SDP removal feature by default for all new SalOp in Sal[%p]!", sal);
-	sal->default_sdp_removal = enable;
+void sal_default_set_sdp_handling(Sal *sal, SalOpSDPHandling sdp_handling_method)  {
+	if (sdp_handling_method != SalOpSDPNormal ) ms_message("Enabling special SDP handling for all new SalOp in Sal[%p]!", sal);
+	sal->default_sdp_handling = sdp_handling_method;
 }
diff --git a/coreapi/bellesip_sal/sal_impl.h b/coreapi/bellesip_sal/sal_impl.h
index 21aeadc74..a2ec659f7 100644
--- a/coreapi/bellesip_sal/sal_impl.h
+++ b/coreapi/bellesip_sal/sal_impl.h
@@ -24,8 +24,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "belle-sip/belle-sip.h"
 #include "belle-sip/belle-sdp.h"
 
-
-
 struct Sal{
 	SalCallbacks callbacks;
 	MSList *pending_auths;/*MSList of SalOp */
@@ -52,7 +50,7 @@ struct Sal{
 	bool_t enable_test_features;
 	bool_t no_initial_route;
 	bool_t enable_sip_update; /*true by default*/
-	bool_t default_sdp_removal;
+	SalOpSDPHandling default_sdp_handling;
 };
 
 typedef enum SalOpState {
@@ -107,7 +105,7 @@ struct SalOp{
 	bool_t call_released;
 	bool_t manual_refresher;
 	bool_t has_auth_pending;
-	bool_t sdp_removal; /* do not add SDP in outgoing INVITE and remove it from incoming INVITE */
+	SalOpSDPHandling sdp_handling;
 	int auth_requests; /*number of auth requested for this op*/
 };
 
diff --git a/coreapi/bellesip_sal/sal_op_call.c b/coreapi/bellesip_sal/sal_op_call.c
index 7cf64947e..9b1bfeb5a 100644
--- a/coreapi/bellesip_sal/sal_op_call.c
+++ b/coreapi/bellesip_sal/sal_op_call.c
@@ -392,19 +392,23 @@ static int extract_sdp(SalOp *op, belle_sip_message_t* message,belle_sdp_session
 	const char *body;
 	belle_sip_header_content_type_t* content_type;
 
-	if (op&&op->sdp_removal){
-		ms_error("Removed willingly SDP because sal_call_enable_sdp_removal was set to TRUE.");
+	if (op&&op->sdp_handling == SalOpSDPSimulateError){
+		ms_error("Simulating SDP parsing error for op %p", op);
 		*session_desc=NULL;
 		*error=SalReasonNotAcceptable;
 		return -1;
+	} else if( op && op->sdp_handling == SalOpSDPSimulateRemove){
+		ms_error("Simulating no SDP for op %p", op);
+		*session_desc = NULL;
+		return 0;
 	}
-	
+
 	body = belle_sip_message_get_body(message);
 	if(body == NULL) {
 		*session_desc = NULL;
 		return 0;
 	}
-	
+
 	content_type = belle_sip_message_get_header_by_type(message,belle_sip_header_content_type_t);
 	if (content_type){
 		if (strcmp("application",belle_sip_header_content_type_get_type(content_type))==0
@@ -735,8 +739,14 @@ static void handle_offer_answer_response(SalOp* op, belle_sip_response_t* respon
 			set_sdp_from_desc(BELLE_SIP_MESSAGE(response),op->base.local_media);
 		}else{
 
-			if (op->sdp_answer==NULL)
-				sdp_process(op);
+			if ( op->sdp_answer==NULL )
+			{
+				if( op->sdp_handling == SalOpSDPSimulateRemove ){
+					ms_warning("Simulating SDP removal in answer for op %p", op);
+				} else {
+					sdp_process(op);
+				}
+			}
 
 			if (op->sdp_answer){
 				set_sdp(BELLE_SIP_MESSAGE(response),op->sdp_answer);
diff --git a/coreapi/bellesip_sal/sal_op_impl.c b/coreapi/bellesip_sal/sal_op_impl.c
index 5c953ffc5..bdd120ae9 100644
--- a/coreapi/bellesip_sal/sal_op_impl.c
+++ b/coreapi/bellesip_sal/sal_op_impl.c
@@ -25,7 +25,7 @@ SalOp * sal_op_new(Sal *sal){
 	op->type=SalOpUnknown;
 	op->privacy=SalPrivacyNone;
 	op->manual_refresher=FALSE;/*tells that requests with expiry (SUBSCRIBE, PUBLISH) will be automatically refreshed*/
-	op->sdp_removal=sal->default_sdp_removal;
+	op->sdp_handling=sal->default_sdp_handling;
 	sal_op_ref(op);
 	return op;
 }
@@ -799,7 +799,7 @@ void sal_op_stop_refreshing(SalOp *op){
 	}
 }
 
-void sal_call_enable_sdp_removal(SalOp *h, bool_t enable)  {
-	if (enable) ms_message("Enabling SDP removal feature for SalOp[%p]!", h);
-	h->sdp_removal = enable;
+void sal_call_set_sdp_handling(SalOp *h, SalOpSDPHandling handling)  {
+	if (handling != SalOpSDPNormal) ms_message("Enabling special SDP handling for SalOp[%p]!", h);
+	h->sdp_handling = handling;
 }
diff --git a/include/sal/sal.h b/include/sal/sal.h
index 0b7775b9b..e1a0c3e66 100644
--- a/include/sal/sal.h
+++ b/include/sal/sal.h
@@ -203,6 +203,11 @@ typedef enum {
 	SalMulticastSenderReceiver
 } SalMulticastRole;
 
+typedef enum {
+	SalOpSDPNormal = 0, /** No special handling for SDP */
+	SalOpSDPSimulateError, /** Will simulate an SDP parsing error */
+	SalOpSDPSimulateRemove /** Will simulate no SDP in the op */
+} SalOpSDPHandling;
 
 typedef struct SalStreamDescription{
 	char name[16]; /*unique name of stream, in order to ease offer/answer model algorithm*/
@@ -682,11 +687,20 @@ void sal_call_send_vfu_request(SalOp *h);
 int sal_call_is_offerer(const SalOp *h);
 int sal_call_notify_refer_state(SalOp *h, SalOp *newcall);
 /* Call test API */
-/*willingly fails to parse SDP from received packets (INVITE and/or ACK) if value=true */
-/* First version: for all new SalOp created (eg. each incoming or outgoing call). Do not forget to reset previous value when you are done!*/
-void sal_default_enable_sdp_removal(Sal* h, bool_t enable) ;
+
+
+/**
+ * @brief Invoking this on the SAL will modify every subsequent SalOp to have a special handling for SDP.
+ * @details This is especially useful while testing, to simulate some specific behaviors, like missing SDP or an error in parsing.
+ *
+ * @warning Don't forget to reset the handling method to SalOpSDPNormal afterwards.
+ *
+ * @param h the Sal instance
+ * @param handling_method Could be SalOpSDPNormal, SalOpSDPSimulateError, SalOpSDPSimulateRemoval (\ref SalOpSDPHandling)
+ */
+void sal_default_set_sdp_handling(Sal* h, SalOpSDPHandling handling_method) ;
 /* Second version: for a specific call*/
-void sal_call_enable_sdp_removal(SalOp *h, bool_t enable) ;
+void sal_call_set_sdp_handling(SalOp *h, SalOpSDPHandling handling) ;
 
 /*Registration*/
 int sal_register(SalOp *op, const char *proxy, const char *from, int expires);
diff --git a/tester/call_tester.c b/tester/call_tester.c
index 42068f327..2d1e93e1d 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -178,6 +178,14 @@ void liblinphone_tester_check_rtcp(LinphoneCoreManager* caller, LinphoneCoreMana
 	linphone_call_unref(c2);
 }
 
+static void setup_sdp_handling(const LinphoneCallTestParams* params, LinphoneCoreManager* mgr ){
+	if( params->sdp_removal ){
+		sal_default_set_sdp_handling(mgr->lc->sal, SalOpSDPSimulateRemove);
+	} else if( params->sdp_simulate_error ){
+		sal_default_set_sdp_handling(mgr->lc->sal, SalOpSDPSimulateError);
+	}
+}
+
 bool_t call_with_params2(LinphoneCoreManager* caller_mgr
 						,LinphoneCoreManager* callee_mgr
 						, const LinphoneCallTestParams *caller_test_params
@@ -189,10 +197,10 @@ bool_t call_with_params2(LinphoneCoreManager* caller_mgr
 	bool_t result=FALSE;
 	LinphoneCallParams *caller_params = caller_test_params->base;
 	LinphoneCallParams *callee_params = callee_test_params->base;
-	bool_t did_received_call;
+	bool_t did_receive_call;
 
-	sal_default_enable_sdp_removal(caller_mgr->lc->sal, caller_test_params->sdp_removal);
-	sal_default_enable_sdp_removal(callee_mgr->lc->sal, callee_test_params->sdp_removal);
+	setup_sdp_handling(caller_test_params, caller_mgr);
+	setup_sdp_handling(callee_test_params, callee_mgr);
 
 	if (!caller_params){
 		CU_ASSERT_PTR_NOT_NULL(linphone_core_invite_address(caller_mgr->lc,callee_mgr->identity));
@@ -200,16 +208,16 @@ bool_t call_with_params2(LinphoneCoreManager* caller_mgr
 		CU_ASSERT_PTR_NOT_NULL(linphone_core_invite_address_with_params(caller_mgr->lc,callee_mgr->identity,caller_params));
 	}
 
-	did_received_call = wait_for(callee_mgr->lc
+	did_receive_call = wait_for(callee_mgr->lc
 				,caller_mgr->lc
 				,&callee_mgr->stat.number_of_LinphoneCallIncomingReceived
 				,initial_callee.number_of_LinphoneCallIncomingReceived+1);
-	CU_ASSERT_EQUAL(did_received_call, !callee_test_params->sdp_removal);
+	CU_ASSERT_EQUAL(did_receive_call, !callee_test_params->sdp_simulate_error);
 
-	sal_default_enable_sdp_removal(caller_mgr->lc->sal, FALSE);
-	sal_default_enable_sdp_removal(callee_mgr->lc->sal, FALSE);
+	sal_default_set_sdp_handling(caller_mgr->lc->sal, SalOpSDPNormal);
+	sal_default_set_sdp_handling(callee_mgr->lc->sal, SalOpSDPNormal);
 
-	if (!did_received_call) return 0;
+	if (!did_receive_call) return 0;
 
 
 	CU_ASSERT_TRUE(linphone_core_inc_invite_pending(callee_mgr->lc));
@@ -913,7 +921,7 @@ static void call_with_no_sdp_ack_without_sdp(void){
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallIncomingReceived,1));
 	call=linphone_core_get_current_call(pauline->lc);
 	if (call){
-		sal_call_enable_sdp_removal(call->op, TRUE); /*this will have the effect that the SDP received in the ACK will be ignored*/
+		sal_call_set_sdp_handling(call->op, SalOpSDPSimulateRemove); /*this will have the effect that the SDP received in the ACK will be ignored*/
 		linphone_core_accept_call(pauline->lc, call);
 		CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallError,1));
 		CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1));
@@ -3371,7 +3379,7 @@ static void incoming_invite_without_sdp()  {
 	LinphoneCoreManager* callee = linphone_core_manager_new( "marie_rc");
 	LinphoneCallTestParams caller_test_params = {0}, callee_test_params = {0};
 
-	callee_test_params.sdp_removal = TRUE;
+	callee_test_params.sdp_simulate_error = TRUE;
 	CU_ASSERT_FALSE(call_with_params2(caller,callee,&caller_test_params, &callee_test_params, FALSE));
 
 	CU_ASSERT_PTR_NULL(linphone_core_get_current_call(callee->lc));
@@ -3388,7 +3396,7 @@ static void outgoing_invite_without_sdp()  {
 	LinphoneCoreManager* callee = linphone_core_manager_new( "marie_rc");
 	LinphoneCallTestParams caller_test_params = {0}, callee_test_params = {0};
 
-	caller_test_params.sdp_removal = TRUE;
+	caller_test_params.sdp_simulate_error = TRUE;
 	CU_ASSERT_FALSE(call_with_params2(caller,callee,&caller_test_params, &callee_test_params, FALSE));
 
 	CU_ASSERT_PTR_NULL(linphone_core_get_current_call(callee->lc));
@@ -3415,8 +3423,8 @@ static void incoming_reinvite_without_ack_sdp()  {
 		const LinphoneCallParams *caller_params;
 		stats initial_caller_stat=caller->stat;
 		stats initial_callee_stat=callee->stat;
-		sal_call_enable_sdp_removal(inc_call->op, TRUE);
- 		CU_ASSERT_PTR_NOT_NULL(setup_video(caller, callee));
+		sal_call_set_sdp_handling(inc_call->op, SalOpSDPSimulateRemove); /*this will have the effect that the SDP received in the ACK will be ignored*/
+		CU_ASSERT_PTR_NOT_NULL(setup_video(caller, callee));
 		CU_ASSERT_TRUE(wait_for(caller->lc,callee->lc,&callee->stat.number_of_LinphoneCallUpdating,initial_callee_stat.number_of_LinphoneCallUpdating+1));
 		CU_ASSERT_TRUE(wait_for(caller->lc,callee->lc,&callee->stat.number_of_LinphoneCallStreamsRunning,initial_callee_stat.number_of_LinphoneCallStreamsRunning+1));
 		CU_ASSERT_TRUE(wait_for(caller->lc,callee->lc,&caller->stat.number_of_LinphoneCallStreamsRunning,initial_caller_stat.number_of_LinphoneCallStreamsRunning));
@@ -3431,7 +3439,7 @@ static void incoming_reinvite_without_ack_sdp()  {
 		caller_params = linphone_call_get_current_params(linphone_core_get_current_call(caller->lc));
 		CU_ASSERT_TRUE(wait_for(caller->lc,callee->lc,(int*)&caller_params->has_video,FALSE));
 
-		sal_call_enable_sdp_removal(inc_call->op, FALSE);
+		sal_call_set_sdp_handling(inc_call->op, SalOpSDPNormal);
 	}
 	linphone_core_terminate_all_calls(caller->lc);
 	CU_ASSERT_TRUE(wait_for(caller->lc,callee->lc,&caller->stat.number_of_LinphoneCallEnd,1));
@@ -3456,8 +3464,8 @@ static void outgoing_reinvite_without_ack_sdp()  {
 	if (out_call) {
 		stats initial_caller_stat=caller->stat;
 		stats initial_callee_stat=callee->stat;
-		sal_call_enable_sdp_removal(out_call->op, TRUE);
- 		CU_ASSERT_PTR_NOT_NULL(setup_video(caller, callee));
+		sal_call_set_sdp_handling(out_call->op, SalOpSDPSimulateRemove); /*this will have the effect that the SDP received in the ACK will be ignored*/
+		CU_ASSERT_PTR_NOT_NULL(setup_video(caller, callee));
 		CU_ASSERT_TRUE(wait_for(caller->lc,callee->lc,&callee->stat.number_of_LinphoneCallUpdating,initial_callee_stat.number_of_LinphoneCallUpdating+1));
 		CU_ASSERT_TRUE(wait_for(caller->lc,callee->lc,&callee->stat.number_of_LinphoneCallStreamsRunning,initial_callee_stat.number_of_LinphoneCallStreamsRunning+1));
 		CU_ASSERT_TRUE(wait_for(caller->lc,callee->lc,&caller->stat.number_of_LinphoneCallStreamsRunning,initial_caller_stat.number_of_LinphoneCallStreamsRunning));
@@ -3470,7 +3478,7 @@ static void outgoing_reinvite_without_ack_sdp()  {
 		CU_ASSERT_FALSE(linphone_call_params_video_enabled(linphone_call_get_current_params(linphone_core_get_current_call(callee->lc))));
 		CU_ASSERT_FALSE(linphone_call_params_video_enabled(linphone_call_get_current_params(linphone_core_get_current_call(caller->lc))));
 
-		sal_call_enable_sdp_removal(out_call->op, FALSE);
+		sal_call_set_sdp_handling(out_call->op, SalOpSDPNormal);
 	}
 	linphone_core_terminate_all_calls(caller->lc);
 	CU_ASSERT_TRUE(wait_for(caller->lc,callee->lc,&caller->stat.number_of_LinphoneCallEnd,1));
@@ -3576,18 +3584,18 @@ static void call_with_generic_cn(void) {
 		CU_ASSERT_TRUE(rtps->packet_recv<=300 && rtps->packet_recv>=200);
 	}
 	end_call(marie,pauline);
-	
+
 	if (pauline_call){
 		struct stat stbuf;
 		int err;
-		
+
 		err=stat(recorded_file,&stbuf);
 		CU_ASSERT_EQUAL(err, 0);
 		if (err==0){
 			CU_ASSERT_TRUE(stbuf.st_size>120000);
 		}
 	}
-	
+
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
 
diff --git a/tester/liblinphone_tester.h b/tester/liblinphone_tester.h
index 22dbcd6f6..c25f61d6c 100644
--- a/tester/liblinphone_tester.h
+++ b/tester/liblinphone_tester.h
@@ -93,12 +93,12 @@ extern const char* liblinphone_tester_get_xml_output(void);
 /**
  * @brief Tells the tester whether or not to clean the accounts it has created between runs.
  * @details Setting this to 1 will not clear the list of created accounts between successive
- * calls to liblinphone_run_tests(). Some testing APIs call this function for *each* test, 
+ * calls to liblinphone_run_tests(). Some testing APIs call this function for *each* test,
  * in which case we should keep the accounts that were created for further testing.
- * 
- * You are supposed to manually call liblinphone_tester_clear_account when all the tests are 
+ *
+ * You are supposed to manually call liblinphone_tester_clear_account when all the tests are
  * finished.
- * 
+ *
  * @param keep 1 to keep the accounts in-between runs, 0 to clear them after each run.
  */
 extern void liblinphone_tester_keep_accounts( int keep );
@@ -255,6 +255,7 @@ typedef struct _LinphoneCoreManager {
 typedef struct _LinphoneCallTestParams {
 	LinphoneCallParams *base;
 	bool_t sdp_removal;
+	bool_t sdp_simulate_error;
 } LinphoneCallTestParams;
 
 LinphoneCoreManager* linphone_core_manager_new2(const char* rc_file, int check_for_proxies);

From 93486c97e019fc79699cd158a03f2092d65b7dc5 Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Wed, 18 Feb 2015 14:52:54 +0100
Subject: [PATCH 449/496] Cosmetics

---
 coreapi/bellesip_sal/sal_op_call.c | 2 +-
 include/sal/sal.h                  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/coreapi/bellesip_sal/sal_op_call.c b/coreapi/bellesip_sal/sal_op_call.c
index 9b1bfeb5a..428c27bff 100644
--- a/coreapi/bellesip_sal/sal_op_call.c
+++ b/coreapi/bellesip_sal/sal_op_call.c
@@ -94,7 +94,7 @@ static int set_sdp(belle_sip_message_t *msg,belle_sdp_session_description_t* ses
 
 		/* try to marshal the description. This could go higher than 2k so we iterate */
 		while( error != BELLE_SIP_OK && bufLen <= hardlimit && buff != NULL){
- 			error = belle_sip_object_marshal(BELLE_SIP_OBJECT(session_desc),buff,bufLen,&length);
+			error = belle_sip_object_marshal(BELLE_SIP_OBJECT(session_desc),buff,bufLen,&length);
 			if( error != BELLE_SIP_OK ){
 				bufLen *= 2;
 				length  = 0;
diff --git a/include/sal/sal.h b/include/sal/sal.h
index e1a0c3e66..7d0ae1eb7 100644
--- a/include/sal/sal.h
+++ b/include/sal/sal.h
@@ -556,7 +556,7 @@ void sal_signing_key_parse_file(SalAuthInfo* auth_info, const char* path, const
  * @param[in]	generate_certificate		if true, if matching certificate and key can't be found, generate it and store it into the given dir, filename will be subject.pem
  * @param[in]	generate_dtls_fingerprint	if true and we have a certificate, generate the dtls fingerprint as described in rfc4572
  */
-void sal_certificates_chain_parse_directory(char **certificate_pem, char **key_pem, char **fingerprint, const char* path, const char *subject, SalCertificateRawFormat format, bool_t generate_certificate, bool_t generate_dtls_fingerprint); 
+void sal_certificates_chain_parse_directory(char **certificate_pem, char **key_pem, char **fingerprint, const char* path, const char *subject, SalCertificateRawFormat format, bool_t generate_certificate, bool_t generate_dtls_fingerprint);
 
 void sal_certificates_chain_delete(SalCertificatesChain *chain);
 void sal_signing_key_delete(SalSigningKey *key);
@@ -824,7 +824,7 @@ int sal_lines_get_value(const char *data, const char *key, char *value, size_t v
 belle_sip_stack_t *sal_get_belle_sip_stack(Sal *sal);
 char* sal_op_get_public_uri(SalOp *sal);
 
-unsigned long sal_begin_background_task(const char *name, void (*max_time_reached)(void *), void *data); 
+unsigned long sal_begin_background_task(const char *name, void (*max_time_reached)(void *), void *data);
 void sal_end_background_task(unsigned long id);
 
 #endif

From a971445719530f649533c7091e62d0bdcf4b0c80 Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Wed, 18 Feb 2015 14:53:48 +0100
Subject: [PATCH 450/496] Fix problem with missing SDP in 200 OK when the call
 is in early-media. We should recover correctly, we were not. Also introduced
 the corresponding unit test.

---
 coreapi/callbacks.c  |  8 +++++
 tester/call_tester.c | 72 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 80 insertions(+)

diff --git a/coreapi/callbacks.c b/coreapi/callbacks.c
index 7e0254b99..7de84e19f 100644
--- a/coreapi/callbacks.c
+++ b/coreapi/callbacks.c
@@ -494,6 +494,14 @@ static void call_accepted(SalOp *op){
 		break;
 	}
 
+	if( (call->prevstate == LinphoneCallOutgoingEarlyMedia) && (md == NULL || sal_media_description_empty(md)) ){
+		/* media description is null or empty because no SDP was received in the 200 OK, we can possibly use the early-media SDP. */
+		if( call->resultdesc != NULL){
+			ms_message("Using early media SDP since none were received with the 200 OK");
+			md = call->resultdesc;
+		}
+	}
+
 	if (md && !sal_media_description_empty(md) && !linphone_core_incompatible_security(lc,md)){
 		linphone_call_update_remote_session_id_and_ver(call);
 		if (sal_media_description_has_dir(md,SalStreamSendOnly) ||
diff --git a/tester/call_tester.c b/tester/call_tester.c
index 2d1e93e1d..3fcf3da1a 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -3549,6 +3549,77 @@ static void call_with_paused_no_sdp_on_resume() {
 	}
 }
 
+
+static void call_with_183_and_no_sdp_in_200(){
+LinphoneCoreManager* marie   = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new("pauline_rc");
+	MSList* lcs = NULL;
+	LinphoneCall* marie_call;
+	LinphoneCallParams* params = NULL;
+	LinphoneCallLog *marie_call_log;
+	uint64_t connected_time=0;
+	uint64_t ended_time=0;
+	int dummy=0;
+
+	lcs = ms_list_append(lcs,marie->lc);
+	lcs = ms_list_append(lcs,pauline->lc);
+	/*
+		Marie calls Pauline, and after the call has rung, transitions to an early_media session
+	*/
+	params = linphone_core_create_default_call_parameters(marie->lc);
+	linphone_call_params_enable_video(params, TRUE);
+
+	linphone_core_enable_video_capture(pauline->lc, TRUE);
+	linphone_core_enable_video_display(pauline->lc, TRUE);
+	linphone_core_enable_video_capture(marie->lc, TRUE);
+	linphone_core_enable_video_display(marie->lc, FALSE);
+
+	marie_call = linphone_core_invite_address_with_params(marie->lc, pauline->identity, params);
+	marie_call_log = linphone_call_get_call_log(marie_call);
+
+	CU_ASSERT_TRUE(wait_for_list(lcs, &pauline->stat.number_of_LinphoneCallIncomingReceived,1,3000));
+	CU_ASSERT_TRUE(wait_for_list(lcs, &marie->stat.number_of_LinphoneCallOutgoingRinging,1,1000));
+
+	if (linphone_core_inc_invite_pending(pauline->lc)) {
+		LinphoneCall* pauline_call = linphone_core_get_current_call(pauline->lc);
+
+		/* send a 183 to initiate the early media */
+		linphone_core_accept_early_media(pauline->lc, pauline_call);
+
+		CU_ASSERT_TRUE( wait_for_list(lcs, &pauline->stat.number_of_LinphoneCallIncomingEarlyMedia,1,2000) );
+		CU_ASSERT_TRUE( wait_for_list(lcs, &marie->stat.number_of_LinphoneCallOutgoingEarlyMedia,1,2000) );
+
+		liblinphone_tester_check_rtcp(marie, pauline);
+
+		// will send the 200OK _without_ SDP
+		sal_call_set_sdp_handling(pauline_call->op, SalOpSDPSimulateRemove);
+		linphone_core_accept_call(pauline->lc, pauline_call);
+
+		CU_ASSERT_TRUE(wait_for_list(lcs, &marie->stat.number_of_LinphoneCallConnected, 1,1000));
+		connected_time=ms_get_cur_time_ms();
+		CU_ASSERT_TRUE(wait_for_list(lcs, &marie->stat.number_of_LinphoneCallStreamsRunning, 1,3000));
+
+		ms_error("Streams running= %d", marie->stat.number_of_LinphoneCallStreamsRunning);
+
+		CU_ASSERT_EQUAL(marie_call, linphone_core_get_current_call(marie->lc));
+
+		liblinphone_tester_check_rtcp(marie, pauline);
+		/*just to have a call duration !=0*/
+		wait_for_list(lcs,&dummy,1,2000);
+
+		linphone_core_terminate_all_calls(pauline->lc);
+
+		CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallEnd,1,1000));
+		CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallEnd,1,1000));
+		ended_time=ms_get_cur_time_ms();
+		CU_ASSERT_TRUE( labs((linphone_call_log_get_duration(marie_call_log)*1000) - (int64_t)(ended_time - connected_time)) <=1000 );
+		ms_list_free(lcs);
+	}
+
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
 static void call_with_generic_cn(void) {
 	int begin;
 	int leaked_objects;
@@ -3704,6 +3775,7 @@ test_t call_tests[] = {
 	{ "Call with in-dialog codec change", call_with_in_dialog_codec_change },
 	{ "Call with in-dialog codec change no sdp", call_with_in_dialog_codec_change_no_sdp },
 	{ "Call with pause no SDP on resume", call_with_paused_no_sdp_on_resume },
+	{ "Call with 183 and no SDP on 200", call_with_183_and_no_sdp_in_200 },
 	{ "Call with custom supported tags", call_with_custom_supported_tags },
 	{ "Call log from taken from asserted id",call_log_from_taken_from_p_asserted_id},
 	{ "Incoming INVITE without SDP",incoming_invite_without_sdp},

From 7fef3b08f75f132b0a9a225ca21b5944bd2106ce Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Wed, 18 Feb 2015 15:10:24 +0100
Subject: [PATCH 451/496] Rename and fix "no SDP" tests

---
 tester/call_tester.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/tester/call_tester.c b/tester/call_tester.c
index 3fcf3da1a..95aca9d45 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -921,7 +921,7 @@ static void call_with_no_sdp_ack_without_sdp(void){
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallIncomingReceived,1));
 	call=linphone_core_get_current_call(pauline->lc);
 	if (call){
-		sal_call_set_sdp_handling(call->op, SalOpSDPSimulateRemove); /*this will have the effect that the SDP received in the ACK will be ignored*/
+		sal_call_set_sdp_handling(call->op, SalOpSDPSimulateError); /*this will have the effect that the SDP received in the ACK will be ignored*/
 		linphone_core_accept_call(pauline->lc, call);
 		CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallError,1));
 		CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1));
@@ -3374,7 +3374,7 @@ static void call_log_from_taken_from_p_asserted_id(void) {
 	linphone_core_manager_destroy(pauline);
 }
 
-static void incoming_invite_without_sdp()  {
+static void incoming_invite_with_invalid_sdp() {
 	LinphoneCoreManager* caller = linphone_core_manager_new( "pauline_rc");
 	LinphoneCoreManager* callee = linphone_core_manager_new( "marie_rc");
 	LinphoneCallTestParams caller_test_params = {0}, callee_test_params = {0};
@@ -3391,7 +3391,7 @@ static void incoming_invite_without_sdp()  {
 	linphone_core_manager_destroy(caller);
 }
 
-static void outgoing_invite_without_sdp()  {
+static void outgoing_invite_with_invalid_sdp() {
 	LinphoneCoreManager* caller = linphone_core_manager_new( "pauline_rc");
 	LinphoneCoreManager* callee = linphone_core_manager_new( "marie_rc");
 	LinphoneCallTestParams caller_test_params = {0}, callee_test_params = {0};
@@ -3410,7 +3410,7 @@ static void outgoing_invite_without_sdp()  {
 	linphone_core_manager_destroy(caller);
 }
 
-static void incoming_reinvite_without_ack_sdp()  {
+static void incoming_reinvite_with_invalid_ack_sdp(){
 #ifdef VIDEO_ENABLED
 	LinphoneCoreManager* caller = linphone_core_manager_new( "pauline_rc");
 	LinphoneCoreManager* callee = linphone_core_manager_new( "marie_rc");
@@ -3423,7 +3423,7 @@ static void incoming_reinvite_without_ack_sdp()  {
 		const LinphoneCallParams *caller_params;
 		stats initial_caller_stat=caller->stat;
 		stats initial_callee_stat=callee->stat;
-		sal_call_set_sdp_handling(inc_call->op, SalOpSDPSimulateRemove); /*this will have the effect that the SDP received in the ACK will be ignored*/
+		sal_call_set_sdp_handling(inc_call->op, SalOpSDPSimulateError); /* will force a parse error for the ACK SDP*/
 		CU_ASSERT_PTR_NOT_NULL(setup_video(caller, callee));
 		CU_ASSERT_TRUE(wait_for(caller->lc,callee->lc,&callee->stat.number_of_LinphoneCallUpdating,initial_callee_stat.number_of_LinphoneCallUpdating+1));
 		CU_ASSERT_TRUE(wait_for(caller->lc,callee->lc,&callee->stat.number_of_LinphoneCallStreamsRunning,initial_callee_stat.number_of_LinphoneCallStreamsRunning+1));
@@ -3452,7 +3452,7 @@ static void incoming_reinvite_without_ack_sdp()  {
 #endif
 }
 
-static void outgoing_reinvite_without_ack_sdp()  {
+static void outgoing_reinvite_with_invalid_ack_sdp()  {
 #ifdef VIDEO_ENABLED
 	LinphoneCoreManager* caller = linphone_core_manager_new( "pauline_rc");
 	LinphoneCoreManager* callee = linphone_core_manager_new( "marie_rc");
@@ -3464,7 +3464,7 @@ static void outgoing_reinvite_without_ack_sdp()  {
 	if (out_call) {
 		stats initial_caller_stat=caller->stat;
 		stats initial_callee_stat=callee->stat;
-		sal_call_set_sdp_handling(out_call->op, SalOpSDPSimulateRemove); /*this will have the effect that the SDP received in the ACK will be ignored*/
+		sal_call_set_sdp_handling(out_call->op, SalOpSDPSimulateError); /* will force a parse error for the ACK SDP*/
 		CU_ASSERT_PTR_NOT_NULL(setup_video(caller, callee));
 		CU_ASSERT_TRUE(wait_for(caller->lc,callee->lc,&callee->stat.number_of_LinphoneCallUpdating,initial_callee_stat.number_of_LinphoneCallUpdating+1));
 		CU_ASSERT_TRUE(wait_for(caller->lc,callee->lc,&callee->stat.number_of_LinphoneCallStreamsRunning,initial_callee_stat.number_of_LinphoneCallStreamsRunning+1));
@@ -3778,10 +3778,10 @@ test_t call_tests[] = {
 	{ "Call with 183 and no SDP on 200", call_with_183_and_no_sdp_in_200 },
 	{ "Call with custom supported tags", call_with_custom_supported_tags },
 	{ "Call log from taken from asserted id",call_log_from_taken_from_p_asserted_id},
-	{ "Incoming INVITE without SDP",incoming_invite_without_sdp},
-	{ "Outgoing INVITE without ACK SDP",outgoing_invite_without_sdp},
-	{ "Incoming REINVITE without SDP",incoming_reinvite_without_ack_sdp},
-	{ "Outgoing REINVITE without ACK SDP",outgoing_reinvite_without_ack_sdp},
+	{ "Incoming INVITE with invalid SDP",incoming_invite_with_invalid_sdp},
+	{ "Outgoing INVITE with invalid ACK SDP",outgoing_invite_with_invalid_sdp},
+	{ "Incoming REINVITE with invalid SDP in ACK",incoming_reinvite_with_invalid_ack_sdp},
+	{ "Outgoing REINVITE with invalid SDP in ACK",outgoing_reinvite_with_invalid_ack_sdp},
 	{ "Call with generic CN", call_with_generic_cn }
 };
 

From 229f662b9f0404d2f5f6acf8fc572e9e4315cb08 Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Wed, 18 Feb 2015 15:10:43 +0100
Subject: [PATCH 452/496] Rename test for early media without SDP in 200 Ok

---
 tester/call_tester.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tester/call_tester.c b/tester/call_tester.c
index 95aca9d45..644727618 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -3550,7 +3550,7 @@ static void call_with_paused_no_sdp_on_resume() {
 }
 
 
-static void call_with_183_and_no_sdp_in_200(){
+static void call_with_early_media_and_no_sdp_in_200(){
 LinphoneCoreManager* marie   = linphone_core_manager_new("marie_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new("pauline_rc");
 	MSList* lcs = NULL;
@@ -3591,7 +3591,7 @@ LinphoneCoreManager* marie   = linphone_core_manager_new("marie_rc");
 
 		liblinphone_tester_check_rtcp(marie, pauline);
 
-		// will send the 200OK _without_ SDP
+		/* will send the 200OK _without_ SDP. We expect the early-media SDP to be used instead */
 		sal_call_set_sdp_handling(pauline_call->op, SalOpSDPSimulateRemove);
 		linphone_core_accept_call(pauline->lc, pauline_call);
 
@@ -3775,7 +3775,7 @@ test_t call_tests[] = {
 	{ "Call with in-dialog codec change", call_with_in_dialog_codec_change },
 	{ "Call with in-dialog codec change no sdp", call_with_in_dialog_codec_change_no_sdp },
 	{ "Call with pause no SDP on resume", call_with_paused_no_sdp_on_resume },
-	{ "Call with 183 and no SDP on 200", call_with_183_and_no_sdp_in_200 },
+	{ "Call with early media and no SDP on 200 Ok", call_with_early_media_and_no_sdp_in_200 },
 	{ "Call with custom supported tags", call_with_custom_supported_tags },
 	{ "Call log from taken from asserted id",call_log_from_taken_from_p_asserted_id},
 	{ "Incoming INVITE with invalid SDP",incoming_invite_with_invalid_sdp},

From 5c8e2ad4ca4caa5d242c4bf61a859b857b6e0f92 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Wed, 18 Feb 2015 15:36:10 +0100
Subject: [PATCH 453/496] Document linphone_call_get_core() function.

---
 coreapi/linphonecore.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h
index a909bb644..7e3994706 100644
--- a/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@ -676,7 +676,14 @@ LINPHONE_PUBLIC void *linphone_call_get_user_data(const LinphoneCall *call);
 **/
 LINPHONE_PUBLIC void linphone_call_set_user_data(LinphoneCall *call, void *ud);
 
+/**
+ * Get the core that has created the specified call.
+ * @param[in] call LinphoneCall object
+ * @return The LinphoneCore object that has created the specified call.
+ * @ingroup call_control
+ */
 LINPHONE_PUBLIC LinphoneCore *linphone_call_get_core(const LinphoneCall *call);
+
 LINPHONE_PUBLIC	LinphoneCallState linphone_call_get_state(const LinphoneCall *call);
 LINPHONE_PUBLIC bool_t linphone_call_asked_to_autoanswer(LinphoneCall *call);
 

From dad967eac82a72c0b180f2b2e190add5af69faab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
 <francois.grisez@belledonne-communications.com>
Date: Wed, 18 Feb 2015 15:47:19 +0100
Subject: [PATCH 454/496] Display the liblinphone core version instead of
 linphone version in the about dialog

---
 gtk/main.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gtk/main.c b/gtk/main.c
index 8162927fa..b59c3ea3b 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -49,6 +49,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <locale.h>
 #endif
 
+#include "coreapi/liblinphone_gitversion.h"
+
 
 const char *this_program_ident_string="linphone_ident_string=" LINPHONE_VERSION;
 
@@ -561,7 +563,7 @@ void linphone_gtk_show_about(){
 		}
 		g_free(license);
 	}
-	gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(about),LINPHONE_VERSION);
+	gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(about),LIBLINPHONE_GIT_VERSION);
 	gtk_about_dialog_set_program_name(GTK_ABOUT_DIALOG(about),linphone_gtk_get_ui_config("title","Linphone"));
 	gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(about),linphone_gtk_get_ui_config("home","http://www.linphone.org"));
 	if (logo)	gtk_about_dialog_set_logo(GTK_ABOUT_DIALOG(about),logo);

From 55d666da49c65b7afdce2b1a4917a783c28edb30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
 <francois.grisez@belledonne-communications.com>
Date: Wed, 18 Feb 2015 15:48:17 +0100
Subject: [PATCH 455/496] Transparent background for the linphone banner

---
 pixmaps/linphone-banner.png | Bin 9187 -> 8708 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/pixmaps/linphone-banner.png b/pixmaps/linphone-banner.png
index 0abff3ebfed30f2189dc1459c62c0785f950e565..6fe99ab776cc3efb84701439fd675e049a376cfe 100644
GIT binary patch
literal 8708
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

literal 9187
zcmcIq1ydYdvnIF%2<{HS-CY7K79_a42McaXvRDW#?(UF9gWDp(g1cLSyDu)^zQ5tt
zt*J9JeNN3(P4{&7)BT(%O?3b^COIYo0s^+OlKdwGgf|@UdmD6A_*vo&b~pU;#`6<E
z4xxIS@&GQNTB!o$5nlg0@}Xr(@EHtuB|}g6;|u?dH*zdle(*^&FXfL4Xv@gh*oaIR
z9^+OB2($>w^0GR9%O^ShK{|6wgI%}lOKCQBXYnZL7|sTu!mlX473Gb@72f`HdR1$)
z`YX+PRVqiHf>(^HeEv0ZwfyB`17Xp#fjHj$#z&;1SZY@0dmIgZP3IYk5BrRaFR?LU
zk3N*$I+76>a_gUamA$6~fk4oa5qnr<h)rqVp@&&uAR~Tz$MH>u7FqTGL5`Kq{07YT
z8LJR*eL}Y%a_zWLL`PQ4kRNeiDCD)<ewP#S{=(jrs~Yi}MKUeS7w<<~oO#*y!A8$e
zlU+Dt0&wQJkGoCH1RJquh}J*>_ceJJOcTnOlMT%WalVSHwH&c}D4-)VEXf`kSGpEB
z&M-6A7`#!MY&g*VLEWiff`{0HuIT9{d@h(N3<L@M?o-j#)#<{WJ3`SB(4$CHRPEjx
z*qBGGiz%L>XUzoCv?B|+JtQy3nG>8ASj_(Q6m?j8Vd7lr8qjJ(%Y$Nc6%j4jC=gio
zCMHDNt`gGQjRKsbBw9^>gEuCqw0JANE`$y^G2FyN|JoVrl>o9Wf8TdK>G<f~aK_!&
z>4^lU(A(nRRuoEqU^YvXfB9j$ss1j;&q><oTkxa)ej&kRKXU>2yTT{Jpje+(L0gfL
zTTAX$`R=9I;wgN=KssfTjjy8ox7!4j%Yrpu&NBi5-xY|uGjjmTbG}wNB1iy3yzyyz
z39#UuDGsBdtaW2SoJLP_ZYY<S)bZ8nvI=C~P;qSdRYtn9`a18)EQT6W9aE<!Yxjhr
z9QZ0~)a-^pYq#!87Wlm8Fgl+EsJ-EM=Dn%Pi;Gdeef&O}6<Oawx=;|RR0k@aLN=9F
zR@BuMIez~T%(9DKXva<O`j2VRjstx~{h*7c_;Af$>w3WKmLx$qFRCk8(c}b#7rn7n
zT=JLQ2&=POS2v=)319FpK!}v*y}bo#7TD!Mg2OOL?qY9V(wOD`5!!-7C6gx-ap5Z&
z#VUBU{jRb~c(ixLM7j`1=<gNkmR?;L7aNYDy*$kSVwnQHC0ogeGf|PGE+5ehm)sMX
zRTZc{t*}r4VM}EE$H8s4;8xRp=5XX8ZDdU8|7yg1irMoW{x*#{<B{@bKa@9VMH4p<
zeY}k3Ul@3?h#A;1Aq!(K%ps~<BsBS8b=q58?t(aF(q~ZP#icR>J*&XqEBd3ieOxW*
zE0y5}%)15Pn1l84qtf6F93#y6nOaw-*vnuRRPD(+%sZ{o1hqSuw!B&<Rl^^|H$G37
zh}pU&UY_r4GoJLZ`q$`4wPvgQ!PBo2$cbU_e`?e)iKkRU9uxUI(8TWqTjb`XxUn1|
z56XL7zl)(wc6$YwVlD<jK3(2!Xx$!U$#0KaZ3a)oW^#O8M>(p?Cg9R3ZSW{I^%vJF
z%O)bs#liY1Ey9kY`RmE!Z~;nz&($>|dwJ_>b?n`R;o^K0NAlOD^5o|JX~8F2T%Lzd
zj{c1_)9amNF67hZL?`Ia5|*YHG*SQ&DE-mALu0OeVpF7r`P%oR&D+*n>1aApg1Nnt
zb6@G-S{<R4<`OES2YXmO<WE}4R5^aKE$CEY-)mZP;Z9L0oF5$vpvhalN()+it`O<Y
zMXMgv4q+iZyL|kf3H^@odL;mXY&ttyTs4-_IycDGA~Pi3AcZ3bNmUY*hQI8(R`zHc
zM{VrLOi}PM#wk#c1#W+ofuT)kzdUV~OSw%d#Aw(~Te}tVraMU2M*rU6=n?Y}6YUC7
zN1y+i#|Zhs>Oz@B4a7Ed%MX54KV0Zkm?_n8PbNaSg4mG7gJf@H5M~i}FSMg_J%ujz
zIAlqvXzZe>UP7imG*4c`$Qczv4{r%VZgBs!+`mD9=)Xixhj7E)l+FNzN7V%}Ys`+A
zSnts`pF0Wu;6(fji#W;sW{0J898c!)hMP6u&K_BU3ju$;J@MBoOd8?%d5d$gIb>**
zM2Nw+^(EW__Mwvgi+#dXH`Z*>IenyAAi1v#N}~D(x3H$JE+QA2mghL*Rcgt;RZ^Rw
z@gsF>$^f==ybW2`it>2ygjJS5D#C_|AV0@<R%BJ4M2FSd%*3*@{tef&`l@+i)m=_p
z{0w34>*j|>H_yLA`AS1#NHedk#NZ*7Eq$6#Pj@b(CY>k>6(pcJbDN@!StjYSr&a)l
z-<nb#{;0!k0Qz0We&Ob%K@kE`4HU!NlPXb<X4FAiZW7Uz*>Pc2Vc1qUvhVPG0%SbV
zZ)!>|;SY{o;wC}RytpLLsrKV*;DjqFVH^L{G=KoFl|L$-56$|4anzcb_6Ym#7~DX!
zsPO!7>-e<!9Dfv9$#Z%$7&R`<-;g7TyZRL#6cJ+Dx47jeL<zbEmG3>{l7PK#;i@9E
zSnTf*X7e@gpIPkKG4@QAXO9&O+U`zGf1N#LM!?Rr+8>DGWfH~86j42!clj@JLn5P6
zn}5cREo>L<gUi1mSXVy_DwCK3j4yC})|*HT%Sb>>q$wgerzLmXuiy%+5Y76x?@Ohx
zSjm%^?tnwoKI`6O<!oE7f!X`o6J*|dB377p%5{|Z71uNyBb6jVNj^I+2Jh8QVEpsS
z_cp6u(w^&!s+T3w829@KiG>BWD*-oB?$&>t5*aZ}y(BR9Oz;SK4NG^Sd!a8Oo1{8j
z8YVE1Ry3<*)@sSfudxU9$r*RibDcEb&OF|P#qhMk#(t}uFT>>$gLp(<`lEWKFR)No
zf4$SpFHf!{Kc-@&xLOw`#MxCB{RjKY%{0ma_pcIx&uffkel9GzI~*&3o~ph4eeAm&
zmr<im?71ULxR-@}q74gYB5f>Z1Dn_M%owO{`s+vR82o%A4NT*=@y6&OX9T8&!s9{_
zsoJ9N=lqKbT*u`*-tl3i0tgm_96`4~F$eHuxWW9dqoNIr{%{Qb47HRh&rz;<QxmyV
zLrm|B@i!#cQ7Dlzd!C@(f_GrsYdGz-)tc}VdMX@i9F^mSTV#-GeDHR!&ew~UKPw7#
z>W-@vP7J=4j!I9axiP!iZ9Hy$4X~-=YB&k=3{iRj--a!FQ4#4N0cT}sIY^uZF!bh(
zUw<#mBg(9bs`B)e1XXY!?&PIR?&7rF?x}0osdd~JOH2f`Q=}kx;0?Hq`HFwBGDr;T
zszOn4lb=6~Wz&=4S>J(a-W`qn3<xw-N=Nw2KOr+u_PfdS`SkUlvzvmh?$fvrJbzoR
zi1B%N320sY8_|J6V<63G|6I!N=cU6pmUYHe^U}_z_n0W1ys~xnN+GrWAxO8K9blSg
zTS?Ta%c=)g!J=nmLTJLYt*RsY^6=d&uy6+Zx<!td7}-<fX8qNC`{f_gjpT#pcC0~)
z3=g@3ho50%3COqWXK@`J%Wr!%^=_wGxIMh>3iSY65rRRU{Q{fgW^$@M0malDrA?bu
zpIdm4mK>-(baf)-t{q9<?Ym<LHW_&M#_>e&Tez^dvl)qK&J7pXF@vk9k7F%5b;6XR
z#|jw+Dw)}rhLd@P2AGTzcK*Uz>l-qBg>}yzEd|ZY{dht3WlSMQ589q}+20wJkvpiJ
z)&se&12tTdwZz1}2n?9O*bCk=#0(GktgmVg*oQaHuB<_uDqMYhUg`wzdds!bvx$|1
zvmz5Sb5&^-GQ77nzT<%ejnMrhmB>FD)RoJ)7dpE7Ud7=?-@6+#eUsHA@eO$Tyu9Hz
zD`fvsLouN%c;TfSzj89D=SiVB=#|)K!<P#AY4BO($xQg9T{sdLmoDbJczfU}>Q3l#
zRG-7@Jp5I4qwSFGLMH|1AKSEr+OP}-k?*V>lVFuVlRqky0;)*IKNX|A@%kn)c&^H!
z5vlzbHhFj@BNpmfw`&}B;NjgCh4?RVXfIGQJ7*!p*WFkd>4h%2sh(88hDkAB3zb;W
z!$0V_#;JGbXhV|RaXvA{Lei<lP6u7DdryHkU8(JyJdt?g>j1v;R>WLS_X7s$+Euea
z-QG8f4_$jTq%T$>r^`QTgKreaktVEjM66|2Tpu=(hRvTg3LduQcgL7d0KV5oKDXiC
zOhI+f0HyXRC!6ui%sy;;FvIZlt<9P(4GFH3G-}Roh5DJ6UGa?c>)?&|HNpPz%+f4}
zH@*r9>4|pMUjhiX2srx;V0{Xt2{st*Gpbp=A8eCCC3mWhAr7U*rHvXR91J~jdUCHH
zD15sNWZDBA>P6^djJUGIQ`vV*inL;15FC8(?-nwx^jxa?cBs;2@kk2xmK6-M)6$l$
zKlb3U8$?$9{LWgI=yd^;&--%o&ljQGurWxdj6U0|oQ>01s;JSO0Uj?oDpOy6^&MfI
zzoe=N5ieZ*5#%5GPLrEnJhHVn$Bk3>vn3Z$lOY>3H|f0M+r@hJUhm+780a1#cICMh
zNYv5tJ^!!z$oJi+SbH_?tgN_Z{i~@Pwi~@0lZ=AO>Kt8TTo2dv3#_)49JAD5lhM*m
z)E7TpYP$~;dpc{!e`D>N!xZ_@RC3nFirh{M|H|<Dnu@Us+_{e;vm4m2g;vg3D~-v~
zq=Dv%qX)>N3Wf2{{V$rAE`%1gsw?^of6;Um2^s`KBUP{<8)$WMoA>$&UKikfD}3|`
zmz4AN9C)dK-0$!*zyGap>e{Gs($w60)Wmwp;?U!up~#8o@6QTkU8cW2pPm+7wz-1w
zv>*D`*WMPPMguKyDdQ$+zOWvhxSl>u*uB7JTIDkXHq?_9BF*?~O_(BANWL7YI4$3;
zT_WbTc=*Ke78SCIhZwdpj|M*+_%CHArSX+RdbNlp)5fSqY&{1*8O---SNvGiUB`F*
zho(afv}X3^<N|sPbQ33hZ#tY}Me<CbqUQDiOv<fjE%!aMH(gEY^0(#W4esrQm@N{&
z*CP%^jV=h;@HDN!>XP=Wso@d{8!Oz}^<;kgu@=WzDk52}a5r0dd$tvx<^U8+uhFY#
z4n^K)ddDkWh5lD%4J2o8=YLX5rxdHYGWzsvPIiLU75ye=s{=3$Ur&ZkQFs{b`A&v#
z17o#TgY4o^)=)ppj-JKCMgXX;_W}#rm!rV~Ay=$#;-W)eJM!RJFwiBW-;wOeU3TE>
zZGC%TMxgn+x@mNDKzo+G^!fxh*Rd(-nTbS{_WJ?sSp%ErQ=^yjWgHVT>2`J_gVvv*
ze$N3f=i9#FwSp`TaV8KNFrB0>J7Tz)S4-l4OEjpnB2^j+<!2-}U0YL1N{zmpd4P^R
za^(#qd#!vuyZ_h^TYVkISzeP8BA&Z4w8XYo!!hr$>VKG?EH5>z`8TfmMU<1db0ZYV
zg^QcLQ{<1Qv#OlyjX(b<r87Ql+0$29G)>)<?PxcP-4LO~+qlMJ^AO=C!ws@{gEuVi
zu@Yu9>_-KC`Cv6P@vj4BmoKfctRZH~qfgOoVG032`MIETIfwB)3!D7L{>1zGNI8sF
z7X=g%)my5o=k4O<mgnE&j@C4;6@4e7O-S5{$X8#sTI-_ot5;2ys@BG*?R-)j!%Vsd
zt8=_Z`ylM_)%!<{-FV^!$))?6volK#g^^ldb0TAcv{bA!iJkY&pfJ(eviC_*Ua)Z1
zeG)#JK%yhBL#ykQ-*|Q=>GitKox8JN*GTa41G0Xx^2_?iQU73EN9i^s(=^*}s99f^
zV4gpE!stYy6DL0*Kk9>|$A3KcSW{G|S!g<_rSb^ZR(bj9P38(py%%8WKe*7I+NMl>
z&d#0j&q<qYz!RY-?+h^B8}l06%r@H+8w71T@N2A#L}t&P@9aJUQv%Jnx=*NHrY>2n
z#X0MPBaZ<sQ|q<ab=vRyumhw$>%^1tqS=fexDA}TBU$;=GPpm}okVtFh9Ku4Fe(??
z&0(>;Ct!Iyp^E=Qu-L#j&1e(i?6-TtS{Ku(x;p%iGFQybw2CQ2rr$q|sTpQLfN;g!
z&+n)<TYFnISH6R*ug*-zCqemXVRIA4JreQyZI+4H&*o4ui@n2*{$pq!-}c$1g~)W0
z7{p@9F1KeJU<R;`qU05pUt1<p!tA}-WX!B%Ae9Pwkzr{G8p>|iYBJAKm@wTKIk~xA
z=;A6$`^{d2sT(e6EWY(i)bZc4rw)Z4Ns^zA@JC(UWAUzHmkD7wD*bJ$9ot@wZ|<xe
zNjdDmp|x+F1otNk@~lu>IqG@kG8_riIjv+hm|r}sH)TA(@IgG_BTu1n1DRY=2teIO
zsez2gkw`57MS(gOP186syx<SM_JEI({tgT$wMP7_UP6Yn=r=>dLEwX$nc~|kW~SQe
z+Il{KbwySc6L|CwC3MF7W})HYX&LFW)VtBk1t%M>^o-Sz9<fi^jLP(XuQYF`R0V*o
ziSy76WNiWgqy0}fioX=S?z2hsP06a;_%gBP3w?@Z(+58?JB_#Yao$lI8JlcG7pvg!
zRt`DP6Pz~-(;n?uP7+}#<9Jm)Gn3N7(V|Vx8)dD@%-+0MvR}mGISC-hbWQO@QJZsu
zVx^+XV6#v1ZE^v|{HmEEsj;c7umJBcDJDk+WH^+)NqZJ=!~Zr5)6PcTV<OS<!<U4B
z&BHUBa17$^rqD44#ab?thoSCO8QuN^9AEYt^JIm>F#)BX%Qn`K13IULj_<{Dbjp0>
z^|sxhuZ3t(YF`)-vi?AkQX>%~7$_7)@`Ah)qW~b{GX0Ft{{j;gKWibh-*F{O+D%6r
zdft$W)10UHr9KXr&zNG4qpJH@^RQYjg-)43v3q%6D-QD4>FnMIvLTD@w(Se#?5;&X
zVRXO5MpF~tyZS#kzuas+(M5ad*Wq()7c17akDyz6qy+a}Yh*b)c=XeZQjFlLpXJ_6
zb9Yq&PbxmQJEFpl%mKXQ34)l3^w{@I&Nc#e?BhQqk3%-~d{%*|H=xFXGF@K=_Lj@B
zZE5H?$59)^+-_dc*y<WLhQvZy-t>4Iq98NmU;;-BBQ?(0@t23T^6J5+$joesTgM?@
z>4=%S-m0z$Gl<+M8O_MC$5f0)9pAJwicOjP`T3mxs+W&X+?n&kj|0Njd&T4MqXh3>
zaco7chPxGbnrP1AwO41jnlGDF?7L<&N}@KC?cucl=c~`)_z2Mu`<kVns0lE14Rskn
zM64EiaurUbznqCx&C7zxXEro61fB;xJ2YZ)xt-}1O}QU;r5!UMPOEE7=z)dv3+Gt+
z6xb+h0GIs2xIwzPE$G2{diz=^6~Hx2FJ4r_=Zgxba);{{oRfm{YIsq0NtmEbeC_He
z`GS*GGX$VvFHoV(;<hGSKLY~Tf%@&530tGb9=t&f(9E2jv2ELd_#CU9UTRDyxEa2T
zkr_TO+u2%+pM8c{xGAs;j;V7fhC3c;nFvY~tl$aPpL};J61qCCUakDYLnjKle7JFC
zr3UcPiCX#nCIK`G36L`yiqUZ!R+MZH<!L@%)I*Kr>ejpa0@MCgyC~?zjsfuuu|dEu
zK4$K};;<F45wgV@N(R+#m$nM0Zi{XL+D8UIYJ`kc9I3L3EGl`|Cv8H6%w8ecX!^(d
z^PNk0W)NoHVV({Taa|@MISn&C0j#+6)X-ua)zsH+WK~3E29&F$<k(l|lF5yT#}ZO(
z9q2uJqw~vJg@eNO`1^p<l5#0QznBmHj>W(dODZ!ev1^4ks?Af$apX4S6TwUZYvPH~
znD?T?f5a(996x(n&pO^cCpzxOmUqD}NlK1I7FYLf$X8YyV2Q}a^B-WLYXG$&Q9<$3
zyX+RsYKCD!XWQ_LA-vI%kAJfdhM;X_&jtJOInvO^=>LZPeA?UYH;H1PDRMGHhJP;C
z46I~+6oM_zE1)xHo5?>)z1N>&P~m--s8pAVz*G1)Ud@;Ik!Sz;u$D&;WB1S@zynV+
zWi)x82^G)|CVargk)RS*lL;@jY~lzAb|1o*77wB4s>!q0L)rVdTfB7Fo8r%6is~-0
zjv#H`lpx*Nl(a?!#nM-4z;NN-q_CZ*@>uHyh>JN#lff{{)I>aBPemMJ0(D{1@ABt%
zN;-h&xEHw1I+yFanCmMhJ>L#*UIuI9#jXq*@U}9Z_StjZbk+qYcinX@V(D9}fse)G
zoLD;Rr{tHgn)!L383Yn8EFTjXF_bHqUH`>7tlaKS0v;ajFZO4~%lwbTM#%^q*W0K^
z?tZc;Mr$Tn4(wfB&6kclvJ43^;4!=Jq{Bgv$G|qS9tow@Knu%wM(*#?O41j<xwq6o
z-hq3B#DWHVw%$E-)0=A9nN$EfP<V_VyIxVMURqiT1$!H(fJgf3>^UY@-WjB{vZ;Rk
z(bjW@_fY+_fBQAEGfU$pbd0FDFJ@4poAGRIXRKq*)(Qq1x_Bnx`1zssNgeG#Seop;
zN<@Q)+TEBoys>RF@vLvDrW>K(Kqy%<;%c|*;&$y|%VhdRGTc`xQc4t55JPrzd#>Gi
zYyHFtMh<daohzaAdytCxnc)x<${om%MIUAE=eYNwpe{MJDwz52&)jhX#j8^9hLg2`
z*_(*ji^bABpd9xplAw>-vz3KyhN&415$vSFmyuMZ`@UY|sqj}b_qeS_c+TMZI(V$y
zTHS}Tez5<1l+)AiGL(M)41(=!Znl@-QT@8-I>~AR46t|1+7%Mk=;#u@4wNfSU@8NP
z{(E)@n&E5cG!_<qa`U|^6UI{3sJ&5D(nV}&cr0%gSB@6+tStqzS{I231|opG7nvHy
zI+0CvJ~!XteTCx=M~&ctSaXiPczRstMkI~iH%6FJv|pC}*J2fD(qg#8s0?Q$8m#xr
ztPTn{qr~ko1kWUKku@dNDbXVI*bJS)ATH33OJ$$g-PqTre=Hj-%_*DL+3r0M7Z2@~
zP3ljSJEI*ob@-LcPl}DC4HE7<0>H*&3gF|k5b%DDvQwNrMLsJEtvY=i4*&FmbcY|-
z8rRsQt`)u{C$w|t$$iq{*;+Zc@R%4``M`eRAjsGC_>%l)u9b!hzfg^1Tx09xqis2x
z-;-0b{PIigRr0R{6DV!P%E@9`c*!Q6-RTb0NTa8uzEZ7Y&-Mp3^quMPd8<NVVTs+G
z^&0XK&-{@6-%7Z{=HoP*y?G}pN&{Y!J3$+{pw5+MCG~kLhP^kTWMw!1$1v2x#0ohC
zN|z^|w>E0+cD5NU*|_R|!C1%<@IJ1Q*S``Bw~P64mGuWL$#B~-0azVvq->e{VVJ>q
zdUp3})I|aLVG8&J4$foa(Me&Lsx{f;#lM>HW^n5V2Q4OtJL-QT4$>l>IeOToj#8~~
zf{V<Fi6OW%i;lqpNj$M+k+#3RIyfIA8$Uc%qb}bB$NH}xSRz6oY`c{bl(ufPtRD<I
z1HW=ri87?cWYOf8xHDA$c)nZCM1wkmnVx=Y({J(Ge-zsdcA%ulB`DTVAN-7qGe(ib
zAJO2VJs?l0I(aw+`!r2PyIjc3^~Iw1ZvZ%=L4=^b&gyq*AEmOoiu}G^R1=O=X9)}6
z5-Xl%7Y#VZ59{^mfK}pho~v_Nd(b=N@dvxQ>fY}sLbU)+q3B#JyV5T`qZVBP4Q=I4
zUQ>&^^!X|dHc{IS4350-8%(EZDP6g1fLa6aCR7+I1^t*9b!&iP*JVy!Qq`TfU97wz
zT3*0A$JuZgz)ej#j$T|4#Q8|UTH*Wm@`lqSk<F6dF(cWMfqy+9*#|mXyy$0$v&_O7
zK`1SH3;TCi&ZdN~fSVUfPP#gaqnwJ~f^?T-7SCvt1G3Tq%_piD@T_JFrp=DD*IaJ0
zu$OKhs7@N7b-jgdeI;;9N`v<fv9xzduWAGpl4nr?!Ri_B2E*&MHI_Y}%kzJPR4xHb
zqp^zA|IJ2uaQp$=E9$9rIc1|E%KAEuHGQb$D#y&qYIaaT6wVP(Slo)g6`0=lOxBz~
zI2TARjHaGxhtVm|2GtUtqb6~qk;XW1yZ(+B!MeK3fVauJ&w6Jx!O(MO39xvr4Ir|=
zWI1{P_Jka(st9{T^LU%H$Bqv`83gf{G5w+y&TR~DtXwu4TBe#SU>e_~$F^ZK_}+ZT
zOV*I?%~wai<^JgC=<8WNHPm^iw;Y!)BO%V7$xdR!$I0+uyiyZ9P-_#Kn+jTpGWIjB
zIU%3#k{=lt78@RYD^IIKctTnFe1c~KrL(E}>4gfT+IeIFUSq}_EOU87bWG*~c^D(O
zrSeHb3H(ZWVoy~P%Qu)s?BIw8-T>RIJWy^Bll;8A@Fx`soIKl9S5cV(4%QK<B^BIe
z1n_v8y!B*$A5ZN3Fn{YPt%zZp+04QGkbD#mZlXpy>lDJ6W2d7i`PToHF=I6ES+IjI
zlrT5hLWM$O)7R~H=i^5HFxAHfKk^%20uBVjnzum2+OTpFHd5kBMJlYa_jR?_-%!xG
zoHtfai`EWG=63qGuB?R|cpV5oS;a`A=D=AC4<yweVT?yVO)dxqOs<^bio!AWxC&0U
z(ln8D_X``!fsN*!DOOPj@A8Y9=i~>Fy|>-P4HaSD=6>A^>k$JGst#2atTavcr`ily
zuaxDzP0?9v7?pQn&`F98^sz#-B&@m|GQ17g7!cS+6L9(5y|Sq=Pm}Ar$P1{6OzUba
zJY&$&W$dT95w#)epM~ysO#t5+mK}J91a}ht!^dH^3q`Fr>#5Y|IV75*16ey*4t?QC
zEmoo`V8F27S(vSS5X9J%BD8a)dJ)|{Tv2X6)YpMNhs;(1sZ-cutUvD;dMlCt<d;@K
zvBB^K6Zo2<JhaRfLF~Fsu`GXL0vno6cf?HQj1#;bWV4ieI_m$nV#P}8kB$)L(2`R3
zOe^-ia~DS8jMJnq1r<GcLiE;ErhQ-Mivn4O_=eI<G%lGIwjiu!j=g|})8)P_7C{6A
zB>n&P0)X1>Xx8Udbj-yQ-?pV+6m#4^PW3~Od{2b`sFcnBbd`K)xpqBS#tjOSNQUd{
zCy^u(4k4TZH>g!36BTfK;n)Xx|D0ng_*=cAejiN|?>@e@Z&e>S1`=j0PH4CjOC&ZI
zE)Uh#C2~_GJAKIcL;fL>Rs{|{PUpur^uT47By~RMs*5A|>+iXnGDJ6r-=QngLLa2G
z?xR7jdL>w~mHpL9<u5`wP)|Wv-r9%mHGKS7>u?Ap|KX?UvnL^x*C1Rr!CikP%GBL+
zu@hc{mspV1^$6S<o&E?rif8vb^&BVEkC5TXL}q`f97!O|n5U}xBi5Sbp!_4OP<XT4
z0MO6Ar`de!Dgg^OC9*%4LuqlwDmU@KgETWSvf#4~%+eG_$Kn`z!3jgp*_o!-HH*0^
z*&ivDSh*F&fBN$7gFS5F>WDWh+eMfKK9MtNtbuvwltw#P5IeiIelOueHo%|14`lmu
z4a}nKZ<U5&XoaXuh~QNBbUxZjfZG#@B)vE==!Wn)v%J*;?s_M6@_T11+o;{H-k@ri
z%A(kS)q3~9BJ3tMFJ7!3SY6E3Z@*bIU=Yhp_5Mc|GLsIHMrF{1AL>6=3YQduHllz0
zkh0@jPN(!r$Y4p;A+#1q96*Ptbgx8oLCM{;@v1XFwm3J_v5GM&V{8~997?-bUs~to
zr*l~TUZ}g;XgCcx{XTK6U#Y{WP-tmNFwV!U<w?x@ubR1Em+oDRUJqu}{D6k$HDA+`
zkXlA*z6;;GP(|!~)F<RL-P1b@o+&Kl>Fe|;+9CXLK9U<bPHk%QC@X<TW9t%j$K~sH
ziFRLyd_SGj48B1d%gVfHN0Q&c`h}0Kj@cu2Oidm1Kt0>bzCLg?nV#HZpK^<2o`tKQ
z5*_Br1;9rBE&mbL>d0*vE+O;l6B1jek92OE1t-07!cfb->}DI`H~~6xkx8xG@5Wu-
zOd()ckqxd{AW}>d)1WPxi~QTt7|Oy+61<T4olUlP=<0es_~^(W0z0?wT<_44;RG<^
nH<|yKqIV#s|C202b{`_Dml2Ft3{`{gz(G(}P?xWkvjF`M>BjBL


From 23ba230da6b2c84160b79aa3f4fc5e2dbdf2834e Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Wed, 18 Feb 2015 16:59:10 +0100
Subject: [PATCH 456/496] Implement cancellation of file transfer for chat
 messages.

---
 coreapi/chat.c | 62 ++++++++++++++++++++++----------------------------
 1 file changed, 27 insertions(+), 35 deletions(-)

diff --git a/coreapi/chat.c b/coreapi/chat.c
index 72660e011..8d987417c 100644
--- a/coreapi/chat.c
+++ b/coreapi/chat.c
@@ -281,7 +281,6 @@ static void linphone_chat_message_process_response_from_post_file(void *data, co
 			belle_http_request_listener_callbacks_t cbs={0};
 			belle_http_request_listener_t *l;
 			belle_generic_uri_t *uri;
-			belle_http_request_t *req;
 			belle_sip_multipart_body_handler_t *bh;
 			char* ua;
 			char *first_part_header;
@@ -311,26 +310,24 @@ static void linphone_chat_message_process_response_from_post_file(void *data, co
 			/* create the http request: do not include the message header at this point, it is done by bellesip when setting the multipart body handler in the message */
 			ua = ms_strdup_printf("%s/%s", linphone_core_get_user_agent_name(), linphone_core_get_user_agent_version());
 			uri=belle_generic_uri_parse(linphone_core_get_file_transfer_server(msg->chat_room->lc));
-			req=belle_http_request_create("POST",
+			if (msg->http_request) belle_sip_object_unref(msg->http_request);
+			msg->http_request=belle_http_request_create("POST",
 										  uri,
 										  belle_sip_header_create("User-Agent",ua),
 										  NULL);
+			belle_sip_object_ref(msg->http_request);	/* keep a reference to the http request to be able to cancel it during upload */
 			ms_free(ua);
-			belle_sip_message_set_body_handler(BELLE_SIP_MESSAGE(req),BELLE_SIP_BODY_HANDLER(bh));
+			belle_sip_message_set_body_handler(BELLE_SIP_MESSAGE(msg->http_request),BELLE_SIP_BODY_HANDLER(bh));
 			cbs.process_response=linphone_chat_message_process_response_from_post_file;
 			cbs.process_io_error=process_io_error_upload;
 			cbs.process_auth_requested=process_auth_requested_upload;
 			l=belle_http_request_listener_create_from_callbacks(&cbs,msg);
-			msg->http_request=req; /* update the reference to the http request to be able to cancel it during upload */
-			belle_http_provider_send_request(msg->chat_room->lc->http_provider,req,l);
+			belle_http_provider_send_request(msg->chat_room->lc->http_provider,msg->http_request,l);
 		}
 		if (code == 200 ) { /* file has been uploaded correctly, get server reply and send it */
-			const char *body;
-			/* TODO Check that the transfer has not been cancelled, note this shall be removed once the belle sip API will provide a cancel request as we shall never reach this part if the transfer is actually cancelled */
-			if (msg->http_request == NULL) {
-				return;
-			}
-			body = belle_sip_message_get_body((belle_sip_message_t *)event->response);
+			const char *body = belle_sip_message_get_body((belle_sip_message_t *)event->response);
+			belle_sip_object_unref(msg->http_request);
+			msg->http_request = NULL;
 			msg->message = ms_strdup(body);
 			msg->content_type = ms_strdup("application/vnd.gsma.rcs-ft-http+xml");
 			if (msg->cb) {
@@ -588,7 +585,6 @@ static void _linphone_chat_room_send_message(LinphoneChatRoom *cr, LinphoneChatM
 		belle_http_request_listener_callbacks_t cbs={0};
 		belle_http_request_listener_t *l;
 		belle_generic_uri_t *uri;
-		belle_http_request_t *req;
 		const char *transfer_server = linphone_core_get_file_transfer_server(cr->lc);
 
 		if (transfer_server == NULL) {
@@ -597,17 +593,17 @@ static void _linphone_chat_room_send_message(LinphoneChatRoom *cr, LinphoneChatM
 		}
 		uri=belle_generic_uri_parse(transfer_server);
 
-		req=belle_http_request_create("POST",
+		msg->http_request=belle_http_request_create("POST",
 				uri,
 				NULL,
 				NULL,
 				NULL);
+		belle_sip_object_ref(msg->http_request);	/* keep a reference on the request to be able to cancel it */
 		cbs.process_response=linphone_chat_message_process_response_from_post_file;
 		cbs.process_io_error=process_io_error_upload;
 		cbs.process_auth_requested=process_auth_requested_upload;
 		l=belle_http_request_listener_create_from_callbacks(&cbs,msg); /* give msg to listener to be able to start the actual file upload when server answer a 204 No content */
-		msg->http_request = req; /* keep a reference on the request to be able to cancel it */
-		belle_http_provider_send_request(cr->lc->http_provider,req,l);
+		belle_http_provider_send_request(cr->lc->http_provider,msg->http_request,l);
 		linphone_chat_message_unref(msg);
 		return;
 	}
@@ -1216,10 +1212,7 @@ const LinphoneContent *linphone_chat_message_get_file_transfer_information(const
 static void on_recv_body(belle_sip_user_body_handler_t *bh, belle_sip_message_t *msg, void *data, size_t offset, const uint8_t *buffer, size_t size){
 	LinphoneChatMessage* chatMsg=(LinphoneChatMessage *)data;
 	LinphoneCore *lc = chatMsg->chat_room->lc;
-	/* TODO: while belle sip doesn't implement the cancel http request method, test if a request is still linked to the message before forwarding the data to callback */
-	if (chatMsg->http_request == NULL) {
-		return;
-	}
+
 	if (linphone_chat_message_cbs_get_file_transfer_recv(chatMsg->callbacks)) {
 		LinphoneBuffer *lb = linphone_buffer_new_from_data(buffer, size);
 		linphone_chat_message_cbs_get_file_transfer_recv(chatMsg->callbacks)(chatMsg, chatMsg->file_transfer_information, lb);
@@ -1228,7 +1221,6 @@ static void on_recv_body(belle_sip_user_body_handler_t *bh, belle_sip_message_t
 		/* Legacy: call back given by application level */
 		linphone_core_notify_file_transfer_recv(lc, chatMsg, chatMsg->file_transfer_information, (char *)buffer, size);
 	}
-	return;
 }
 
 
@@ -1323,17 +1315,16 @@ void linphone_chat_message_download_file(LinphoneChatMessage *message) {
 	belle_http_request_listener_callbacks_t cbs={0};
 	belle_http_request_listener_t *l;
 	belle_generic_uri_t *uri;
-	belle_http_request_t *req;
 	const char *url=message->external_body_url;
 	char* ua = ms_strdup_printf("%s/%s", linphone_core_get_user_agent_name(), linphone_core_get_user_agent_version());
 
 	uri=belle_generic_uri_parse(url);
 
-	req=belle_http_request_create("GET",
+	message->http_request=belle_http_request_create("GET",
 				uri,
 				belle_sip_header_create("User-Agent",ua),
 				NULL);
-
+	belle_sip_object_ref(message->http_request);	/* keep a reference on the request to be able to cancel the download */
 	ms_free(ua);
 
 	cbs.process_response_headers=linphone_chat_process_response_headers_from_get_file;
@@ -1341,10 +1332,9 @@ void linphone_chat_message_download_file(LinphoneChatMessage *message) {
 	cbs.process_io_error=process_io_error_download;
 	cbs.process_auth_requested=process_auth_requested_download;
 	l=belle_http_request_listener_create_from_callbacks(&cbs, (void *)message);
-	belle_sip_object_data_set(BELLE_SIP_OBJECT(req),"message",(void *)message,NULL);
-	message->http_request = req; /* keep a reference on the request to be able to cancel the download */
+	belle_sip_object_data_set(BELLE_SIP_OBJECT(message->http_request),"message",(void *)message,NULL);
 	message->state = LinphoneChatMessageStateInProgress; /* start the download, status is In Progress */
-	belle_http_provider_send_request(message->chat_room->lc->http_provider,req,l);
+	belle_http_provider_send_request(message->chat_room->lc->http_provider,message->http_request,l);
 }
 
 /**
@@ -1365,15 +1355,17 @@ void linphone_chat_message_start_file_download(LinphoneChatMessage *message, Lin
  * @param msg	#LinphoneChatMessage
  */
 void linphone_chat_message_cancel_file_transfer(LinphoneChatMessage *msg) {
-	ms_message("Cancelled file transfer %s - msg [%p] chat room[%p]", (msg->external_body_url==NULL)?linphone_core_get_file_transfer_server(msg->chat_room->lc):msg->external_body_url, msg, msg->chat_room);
-	/* TODO: here we shall call the cancel http request from bellesip API when it is available passing msg->http_request */
-	/* waiting for this API, just set to NULL the reference to the request in the message and any request */
-	msg->http_request = NULL;
-	if (msg->cb) {
-		msg->cb(msg, LinphoneChatMessageStateNotDelivered, msg->cb_ud);
-	}
-	if (linphone_chat_message_cbs_get_msg_state_changed(msg->callbacks)) {
-		linphone_chat_message_cbs_get_msg_state_changed(msg->callbacks)(msg, LinphoneChatMessageStateNotDelivered);
+	if (!belle_http_request_is_cancelled(msg->http_request)) {
+		ms_message("Cancelled file transfer %s - msg [%p] chat room[%p]", (msg->external_body_url==NULL)?linphone_core_get_file_transfer_server(msg->chat_room->lc):msg->external_body_url, msg, msg->chat_room);
+		belle_http_provider_cancel_request(msg->chat_room->lc->http_provider, msg->http_request);
+		belle_sip_object_unref(msg->http_request);
+		msg->http_request = NULL;
+		if (msg->cb) {
+			msg->cb(msg, LinphoneChatMessageStateNotDelivered, msg->cb_ud);
+		}
+		if (linphone_chat_message_cbs_get_msg_state_changed(msg->callbacks)) {
+			linphone_chat_message_cbs_get_msg_state_changed(msg->callbacks)(msg, LinphoneChatMessageStateNotDelivered);
+		}
 	}
 }
 

From 20a5c21ee7649e5416fcb7a15cb2e9cc07ba5a3a Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Wed, 18 Feb 2015 17:49:33 +0100
Subject: [PATCH 457/496] Fix memory leak of some strings extracted from XML
 documents.

---
 coreapi/chat.c     |  4 ++++
 coreapi/presence.c | 14 +++++---------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/coreapi/chat.c b/coreapi/chat.c
index 8d987417c..269af03e6 100644
--- a/coreapi/chat.c
+++ b/coreapi/chat.c
@@ -845,6 +845,10 @@ static void process_im_is_composing_notification(LinphoneChatRoom *cr, xmlparsin
 
 		cr->remote_is_composing = state;
 		linphone_core_notify_is_composing_received(cr->lc, cr);
+		linphone_free_xml_text_content(state_str);
+	}
+	if (refresh_str != NULL) {
+		linphone_free_xml_text_content(refresh_str);
 	}
 }
 
diff --git a/coreapi/presence.c b/coreapi/presence.c
index 869f723ed..e944d3a45 100644
--- a/coreapi/presence.c
+++ b/coreapi/presence.c
@@ -1211,19 +1211,15 @@ static int process_pidf_xml_presence_services(xmlparsing_context_t *xml_ctx, Lin
 			service_id_str = linphone_get_xml_text_content(xml_ctx, xpath_str);
 			service = presence_service_new(service_id_str, basic_status);
 			if (service != NULL) {
-				if (timestamp_str != NULL) {
-					presence_service_set_timestamp(service, parse_timestamp(timestamp_str));
-					linphone_free_xml_text_content(timestamp_str);
-				}
-				if (contact_str != NULL) {
-					linphone_presence_service_set_contact(service, contact_str);
-					linphone_free_xml_text_content(contact_str);
-				}
+				if (timestamp_str != NULL) presence_service_set_timestamp(service, parse_timestamp(timestamp_str));
+				if (contact_str != NULL) linphone_presence_service_set_contact(service, contact_str);
 				process_pidf_xml_presence_service_notes(xml_ctx, service, i);
 				linphone_presence_model_add_service(model, service);
 			}
-			linphone_free_xml_text_content(basic_status_str);
+			if (timestamp_str != NULL) linphone_free_xml_text_content(timestamp_str);
+			if (contact_str != NULL) linphone_free_xml_text_content(contact_str);
 			if (service_id_str != NULL) linphone_free_xml_text_content(service_id_str);
+			linphone_free_xml_text_content(basic_status_str);
 		}
 	}
 	if (service_object != NULL) xmlXPathFreeObject(service_object);

From 213206027f078d2e0640ac4a80528f6e8b82b2e5 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Wed, 18 Feb 2015 17:56:41 +0100
Subject: [PATCH 458/496] rework dtls start

---
 coreapi/linphonecall.c    | 38 +++++++++++++++++++++-----------------
 coreapi/sal.c             |  1 -
 mediastreamer2            |  2 +-
 oRTP                      |  2 +-
 tester/transport_tester.c |  9 +++++++++
 5 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index cbf2d4362..ecd68f76f 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -2334,6 +2334,21 @@ void static start_dtls( MSMediaStreamSessions *sessions,  const SalStreamDescrip
 		}
 	}
 }
+void static start_dtls_on_all_streams(LinphoneCall *call) {
+	SalMediaDescription *remote_desc = sal_call_get_remote_media_description(call->op);
+	SalMediaDescription *result_desc = sal_call_get_final_media_description(call->op);
+	if (call->audiostream && (media_stream_get_state((const MediaStream *)call->audiostream) == MSStreamStarted))/*dtls must start at the end of ice*/
+			start_dtls(&call->audiostream->ms.sessions
+							,sal_media_description_find_best_stream(result_desc,SalAudio)
+							,sal_media_description_find_best_stream(remote_desc,SalAudio));
+#if VIDEO_ENABLED
+	if (call->videostream && (media_stream_get_state((const MediaStream *)call->videostream) == MSStreamStarted))/*dtls must start at the end of ice*/
+			start_dtls(&call->videostream->ms.sessions
+						,sal_media_description_find_best_stream(result_desc,SalVideo)
+						,sal_media_description_find_best_stream(remote_desc,SalVideo));
+#endif
+	return;
+}
 static void linphone_call_start_audio_stream(LinphoneCall *call, bool_t muted, bool_t send_ringbacktone, bool_t use_arc){
 	LinphoneCore *lc=call->core;
 	LpConfig* conf;
@@ -2456,10 +2471,6 @@ static void linphone_call_start_audio_stream(LinphoneCall *call, bool_t muted, b
 			if (send_ringbacktone){
 				setup_ring_player(lc,call);
 			}
-			{
-				SalMediaDescription *remote_desc = sal_call_get_remote_media_description(call->op);
-				start_dtls(&call->audiostream->ms.sessions,stream,&remote_desc->streams[0]);
-			}
 
 			if (call->params->in_conference){
 				/*transform the graph to connect it to the conference filter */
@@ -2586,11 +2597,6 @@ static void linphone_call_start_video_stream(LinphoneCall *call, bool_t all_inpu
 									   used_pt, linphone_core_get_video_jittcomp(lc), cam);
 				}
 			}
-			{
-				SalMediaDescription *remote_desc = sal_call_get_remote_media_description(call->op);
-				start_dtls(&call->videostream->ms.sessions,vstream,&remote_desc->streams[1]);
-			}
-
 		}else ms_warning("No video stream accepted.");
 	}else{
 		ms_message("No valid video stream defined.");
@@ -2662,6 +2668,9 @@ void linphone_call_start_media_streams(LinphoneCall *call, bool_t all_inputs_mut
 
 	if ((call->ice_session != NULL) && (ice_session_state(call->ice_session) != IS_Completed)) {
 		ice_session_start_connectivity_checks(call->ice_session);
+	} else {
+		/*should not start dtls until ice is completed*/
+		start_dtls_on_all_streams(call);
 	}
 
 }
@@ -2701,10 +2710,8 @@ void linphone_call_update_crypto_parameters(LinphoneCall *call, SalMediaDescript
 	if (call->audiostream && local_st_desc && old_stream && new_stream &&
 		update_stream_crypto_params(call,local_st_desc,old_stream,new_stream,&call->audiostream->ms)){
 	}
-	if (call->audiostream) {
-		SalMediaDescription *remote_desc = sal_call_get_remote_media_description(call->op);
-		start_dtls(&call->audiostream->ms.sessions,&new_md->streams[0],&remote_desc->streams[0]);
-	}
+
+	start_dtls_on_all_streams(call);
 
 #ifdef VIDEO_ENABLED
 	local_st_desc = sal_media_description_find_secure_stream_of_type(call->localdesc, SalVideo);
@@ -2713,10 +2720,6 @@ void linphone_call_update_crypto_parameters(LinphoneCall *call, SalMediaDescript
 	if (call->videostream && local_st_desc && old_stream && new_stream &&
 		update_stream_crypto_params(call,local_st_desc,old_stream,new_stream,&call->videostream->ms)){
 	}
-	if (call->videostream) {
-		SalMediaDescription *remote_desc = sal_call_get_remote_media_description(call->op);
-		start_dtls(&call->videostream->ms.sessions,&new_md->streams[1],&remote_desc->streams[1]);
-	}
 #endif
 }
 
@@ -3289,6 +3292,7 @@ static void handle_ice_events(LinphoneCall *call, OrtpEvent *ev){
 					linphone_core_update_call(call->core, call, params);
 				}
 				change_ice_media_destinations(call);
+				start_dtls_on_all_streams(call);
 				break;
 			case IS_Failed:
 				if (ice_session_has_completed_check_list(call->ice_session) == TRUE) {
diff --git a/coreapi/sal.c b/coreapi/sal.c
index 11934f572..a5a0755d1 100644
--- a/coreapi/sal.c
+++ b/coreapi/sal.c
@@ -322,7 +322,6 @@ int sal_stream_description_equals(const SalStreamDescription *sd1, const SalStre
 	if (sd1->dtls_role != sd2->dtls_role) result |= SAL_MEDIA_DESCRIPTION_CRYPTO_KEYS_CHANGED;
 	if (strcmp(sd1->dtls_fingerprint, sd2->dtls_fingerprint) != 0) result |= SAL_MEDIA_DESCRIPTION_CRYPTO_KEYS_CHANGED;
 
-
 	return result;
 }
 
diff --git a/mediastreamer2 b/mediastreamer2
index 6924f3396..4bb21da47 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 6924f33961f54aa8ddb58a5cc0a0c8aaa624cdce
+Subproject commit 4bb21da476acd45b6f12ef3149d45fbdd49e71d2
diff --git a/oRTP b/oRTP
index fa091e035..39a807584 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit fa091e0350afaa2a26348ed0ca678135184d628c
+Subproject commit 39a807584c9b176eb01c391aa43f6c49a8fe518c
diff --git a/tester/transport_tester.c b/tester/transport_tester.c
index a291ec0c0..e847e0fe8 100644
--- a/tester/transport_tester.c
+++ b/tester/transport_tester.c
@@ -167,6 +167,14 @@ static void tunnel_zrtp_video_ice_call(void) {
 	else
 		ms_warning("Could not test %s because tunnel functionality is not available",__FUNCTION__);
 }
+
+static void tunnel_dtls_video_ice_call(void) {
+	if (linphone_core_tunnel_available())
+		call_base(LinphoneMediaEncryptionDTLS,TRUE,FALSE,LinphonePolicyUseIce,TRUE);
+	else
+		ms_warning("Could not test %s because tunnel functionality is not available",__FUNCTION__);
+}
+
 static void tunnel_video_ice_call(void) {
 	if (linphone_core_tunnel_available())
 		call_base(LinphoneMediaEncryptionNone,TRUE,FALSE,LinphonePolicyUseIce,TRUE);
@@ -207,6 +215,7 @@ test_t transport_tests[] = {
 #ifdef VIDEO_ENABLED
 	{ "Tunnel ice video call", tunnel_video_ice_call },
 	{ "Tunnel SRTP ice video call", tunnel_srtp_video_ice_call },
+	{ "Tunnel DTLS ice video call", tunnel_dtls_video_ice_call },
 	{ "Tunnel ZRTP ice video call", tunnel_zrtp_video_ice_call },
 #endif
 };

From 8f3ff2dbd95873709c0a6024aca0805273c7465c Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Wed, 18 Feb 2015 17:59:57 +0100
Subject: [PATCH 459/496] fix bug about authentication When ha1 password
 storage is enabled (the default), the lookup of LinphoneAuthInfo must be done
 with realm, otherwise the password will not work.

---
 coreapi/authentication.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/coreapi/authentication.c b/coreapi/authentication.c
index de7248316..0306803f8 100644
--- a/coreapi/authentication.c
+++ b/coreapi/authentication.c
@@ -200,7 +200,7 @@ static char * remove_quotes(char * input){
 	return input;
 }
 
-static int realm_match(const char *realm1, const char *realm2){
+static bool_t realm_match(const char *realm1, const char *realm2){
 	if (realm1==NULL && realm2==NULL) return TRUE;
 	if (realm1!=NULL && realm2!=NULL){
 		if (strcmp(realm1,realm2)==0) return TRUE;
@@ -226,7 +226,7 @@ static const LinphoneAuthInfo *find_auth_info(LinphoneCore *lc, const char *user
 		LinphoneAuthInfo *pinfo = (LinphoneAuthInfo*)elem->data;
 		if (username && pinfo->username && strcmp(username,pinfo->username)==0) {
 			if (realm && domain){
-				if (pinfo->realm && strcmp(realm,pinfo->realm)==0
+				if (pinfo->realm && realm_match(realm,pinfo->realm)
 					&& pinfo->domain && strcmp(domain,pinfo->domain)==0) {
 					return pinfo;
 				}
@@ -238,9 +238,9 @@ static const LinphoneAuthInfo *find_auth_info(LinphoneCore *lc, const char *user
 					}
 					ret=pinfo;
 				}
-			} else if (domain && pinfo->domain && strcmp(domain,pinfo->domain)==0) {
+			} else if (domain && pinfo->domain && strcmp(domain,pinfo->domain)==0 && pinfo->ha1==NULL) {
 				return pinfo;
-			} else if (!domain) {
+			} else if (!domain && pinfo->ha1==NULL) {
 				return pinfo;
 			}
 		}
@@ -271,6 +271,7 @@ const LinphoneAuthInfo *linphone_core_find_auth_info(LinphoneCore *lc, const cha
 	if (ai==NULL){
 		ai=find_auth_info(lc,username,NULL,NULL);
 	}
+	/*if (ai) ms_message("linphone_core_find_auth_info(): returning auth info username=%s, realm=%s", ai->username, ai->realm);*/
 	return ai;
 }
 

From 0b086009e947deb016ec9aca610c1e6031070af1 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Wed, 18 Feb 2015 18:14:54 +0100
Subject: [PATCH 460/496] Fix memory leak when cloning LinphoneContent objects.

---
 coreapi/content.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/coreapi/content.c b/coreapi/content.c
index 332789d2a..36ebbb0a7 100644
--- a/coreapi/content.c
+++ b/coreapi/content.c
@@ -33,6 +33,7 @@ static void linphone_content_destroy(LinphoneContent *content) {
 }
 
 static void linphone_content_clone(LinphoneContent *obj, const LinphoneContent *ref) {
+	obj->owned_fields = TRUE;
 	linphone_content_set_type(obj, linphone_content_get_type(ref));
 	linphone_content_set_subtype(obj, linphone_content_get_subtype(ref));
 	linphone_content_set_encoding(obj, linphone_content_get_encoding(ref));

From 40ffaa6c432e7cf514004cd5e1779cd0df4f6274 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Wed, 18 Feb 2015 18:35:42 +0100
Subject: [PATCH 461/496] disable tunnel_dtls_video_ice_call until feature is
 available

---
 tester/transport_tester.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tester/transport_tester.c b/tester/transport_tester.c
index e847e0fe8..921e03467 100644
--- a/tester/transport_tester.c
+++ b/tester/transport_tester.c
@@ -169,9 +169,9 @@ static void tunnel_zrtp_video_ice_call(void) {
 }
 
 static void tunnel_dtls_video_ice_call(void) {
-	if (linphone_core_tunnel_available())
+/*	if (linphone_core_tunnel_available())
 		call_base(LinphoneMediaEncryptionDTLS,TRUE,FALSE,LinphonePolicyUseIce,TRUE);
-	else
+	else*/
 		ms_warning("Could not test %s because tunnel functionality is not available",__FUNCTION__);
 }
 

From 147d600cc824dd509becec454741d077614dc4a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
 <francois.grisez@belledonne-communications.com>
Date: Thu, 19 Feb 2015 11:19:10 +0100
Subject: [PATCH 462/496] Prevent liblinphone_gitversion.h from cleaning when
 building the distribution archive

---
 coreapi/Makefile.am | 16 +++++++---------
 gtk/main.c          |  2 +-
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/coreapi/Makefile.am b/coreapi/Makefile.am
index 40a26ccab..116530afa 100644
--- a/coreapi/Makefile.am
+++ b/coreapi/Makefile.am
@@ -207,15 +207,13 @@ make_gitversion_h:
 		else \
 			$(ECHO) -n "" > $(builddir)/$(GITVERSION_FILE_TMP) ; \
 		fi ; \
-	else \
-		$(ECHO) -n "" > $(builddir)/$(GITVERSION_FILE_TMP) ; \
+		if ! test -f $(builddir)/$(GITVERSION_FILE) ; then \
+			cp -f $(builddir)/$(GITVERSION_FILE_TMP) $(builddir)/$(GITVERSION_FILE) ; \
+		fi ; \
+		if test "`cat $(builddir)/$(GITVERSION_FILE_TMP)`" != "`cat $(builddir)/$(GITVERSION_FILE)`" ; then \
+			cp -f $(builddir)/$(GITVERSION_FILE_TMP) $(builddir)/$(GITVERSION_FILE) ; \
+		fi ; \
+		rm -f $(builddir)/$(GITVERSION_FILE_TMP) ; \
 	fi
-	if ! test -f $(builddir)/$(GITVERSION_FILE) ; then \
-		cp -f $(builddir)/$(GITVERSION_FILE_TMP) $(builddir)/$(GITVERSION_FILE) ; \
-	fi
-	if test "`cat $(builddir)/$(GITVERSION_FILE_TMP)`" != "`cat $(builddir)/$(GITVERSION_FILE)`" ; then \
-		cp -f $(builddir)/$(GITVERSION_FILE_TMP) $(builddir)/$(GITVERSION_FILE) ; \
-	fi
-	rm -f $(builddir)/$(GITVERSION_FILE_TMP) ;
 
 $(GITVERSION_FILE): make_gitversion_h
diff --git a/gtk/main.c b/gtk/main.c
index b59c3ea3b..f840435cc 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -22,6 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "linphone.h"
 #include "lpconfig.h"
+#include "liblinphone_gitversion.h"
 
 
 #include <sys/types.h>
@@ -49,7 +50,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <locale.h>
 #endif
 
-#include "coreapi/liblinphone_gitversion.h"
 
 
 const char *this_program_ident_string="linphone_ident_string=" LINPHONE_VERSION;

From 1066d925acf82ad56eed38cb15a3fc7a90917ecd Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Thu, 19 Feb 2015 11:44:38 +0100
Subject: [PATCH 463/496] update ortp, ms2 and set port ranges for all tester
 rc files to avoid port conflicts.

---
 mediastreamer2                    | 2 +-
 oRTP                              | 2 +-
 tester/rcfiles/laure_rc           | 6 +++---
 tester/rcfiles/marie_h264_rc      | 4 ++--
 tester/rcfiles/marie_rc           | 4 ++--
 tester/rcfiles/marie_rc_rtcp_xr   | 4 ++--
 tester/rcfiles/marie_sips_rc      | 4 ++--
 tester/rcfiles/pauline_h264_rc    | 4 ++--
 tester/rcfiles/pauline_rc_rtcp_xr | 4 ++--
 tester/rcfiles/pauline_sips_rc    | 4 ++--
 tester/rcfiles/pauline_tcp_rc     | 4 ++--
 11 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 4bb21da47..2aef0fddf 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 4bb21da476acd45b6f12ef3149d45fbdd49e71d2
+Subproject commit 2aef0fddfbb3d39690d562f0d12138a843f21bae
diff --git a/oRTP b/oRTP
index 39a807584..f64cfa994 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 39a807584c9b176eb01c391aa43f6c49a8fe518c
+Subproject commit f64cfa9944327ac707a1e9adade2a9c7d017e91e
diff --git a/tester/rcfiles/laure_rc b/tester/rcfiles/laure_rc
index 7f4d099f5..9156afc39 100644
--- a/tester/rcfiles/laure_rc
+++ b/tester/rcfiles/laure_rc
@@ -23,8 +23,8 @@ dial_escape_plus=0
 
 
 [rtp]
-audio_rtp_port=9010
-video_rtp_port=9012
+audio_rtp_port=9010-9390
+video_rtp_port=9410-9910
 
 [video]
 display=0
@@ -41,4 +41,4 @@ device=StaticImage: Static picture
 echocancellation=0 #to not overload cpu in case of VG
 
 [net]
-dns_srv_enabled=0 #no srv needed in general
\ No newline at end of file
+dns_srv_enabled=0 #no srv needed in general
diff --git a/tester/rcfiles/marie_h264_rc b/tester/rcfiles/marie_h264_rc
index f2ab26190..dc89fceb4 100644
--- a/tester/rcfiles/marie_h264_rc
+++ b/tester/rcfiles/marie_h264_rc
@@ -32,8 +32,8 @@ subscribe=0
 
 
 [rtp]
-audio_rtp_port=8070
-video_rtp_port=9072
+audio_rtp_port=18070-28000
+video_rtp_port=39072-49000
 
 [video]
 display=1
diff --git a/tester/rcfiles/marie_rc b/tester/rcfiles/marie_rc
index 367353d06..536725564 100644
--- a/tester/rcfiles/marie_rc
+++ b/tester/rcfiles/marie_rc
@@ -32,8 +32,8 @@ subscribe=0
 
 
 [rtp]
-audio_rtp_port=8070
-video_rtp_port=9072
+audio_rtp_port=18070-28000
+video_rtp_port=28070-38000
 
 [video]
 display=0
diff --git a/tester/rcfiles/marie_rc_rtcp_xr b/tester/rcfiles/marie_rc_rtcp_xr
index 93f8e5bd0..06f0b5b63 100644
--- a/tester/rcfiles/marie_rc_rtcp_xr
+++ b/tester/rcfiles/marie_rc_rtcp_xr
@@ -32,8 +32,8 @@ subscribe=0
 
 
 [rtp]
-audio_rtp_port=8070
-video_rtp_port=9072
+audio_rtp_port=20070-22070
+video_rtp_port=24000-25000
 rtcp_xr_enabled=1
 rtcp_xr_rcvr_rtt_mode=all
 rtcp_xr_rcvr_rtt_max_size=10000
diff --git a/tester/rcfiles/marie_sips_rc b/tester/rcfiles/marie_sips_rc
index 0723c13a0..7a935d4cb 100644
--- a/tester/rcfiles/marie_sips_rc
+++ b/tester/rcfiles/marie_sips_rc
@@ -32,8 +32,8 @@ subscribe=0
 
 
 [rtp]
-audio_rtp_port=8070
-video_rtp_port=9072
+audio_rtp_port=18070-28000
+video_rtp_port=28070-38000
 
 [video]
 display=0
diff --git a/tester/rcfiles/pauline_h264_rc b/tester/rcfiles/pauline_h264_rc
index d11c7d071..8f30cf020 100644
--- a/tester/rcfiles/pauline_h264_rc
+++ b/tester/rcfiles/pauline_h264_rc
@@ -29,8 +29,8 @@ dial_escape_plus=0
 #subscribe=0
 
 [rtp]
-audio_rtp_port=8090
-video_rtp_port=9092
+audio_rtp_port=18070-28000
+video_rtp_port=39072-49000
 
 [video]
 display=0
diff --git a/tester/rcfiles/pauline_rc_rtcp_xr b/tester/rcfiles/pauline_rc_rtcp_xr
index 331f942ef..94c0314ea 100644
--- a/tester/rcfiles/pauline_rc_rtcp_xr
+++ b/tester/rcfiles/pauline_rc_rtcp_xr
@@ -29,8 +29,8 @@ dial_escape_plus=0
 #subscribe=0
 
 [rtp]
-audio_rtp_port=8090
-video_rtp_port=9092
+audio_rtp_port=18070-28000
+video_rtp_port=39072-49000
 rtcp_xr_enabled=1
 rtcp_xr_rcvr_rtt_mode=all
 rtcp_xr_rcvr_rtt_max_size=10000
diff --git a/tester/rcfiles/pauline_sips_rc b/tester/rcfiles/pauline_sips_rc
index 5d9f3d5ed..f248cffc1 100644
--- a/tester/rcfiles/pauline_sips_rc
+++ b/tester/rcfiles/pauline_sips_rc
@@ -29,8 +29,8 @@ dial_escape_plus=0
 #subscribe=0
 
 [rtp]
-audio_rtp_port=8090
-video_rtp_port=9092
+audio_rtp_port=18070-28000
+video_rtp_port=39072-49000
 
 [video]
 display=0
diff --git a/tester/rcfiles/pauline_tcp_rc b/tester/rcfiles/pauline_tcp_rc
index 809c1ace6..73fd469d7 100644
--- a/tester/rcfiles/pauline_tcp_rc
+++ b/tester/rcfiles/pauline_tcp_rc
@@ -29,8 +29,8 @@ dial_escape_plus=0
 #subscribe=0
 
 [rtp]
-audio_rtp_port=8090
-video_rtp_port=9092
+audio_rtp_port=18070-28000
+video_rtp_port=39072-49000
 
 [video]
 display=0

From 6cbac7f1c2ed9031a97d9e683ddc1bc99d585f8f Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Thu, 19 Feb 2015 13:54:22 +0100
Subject: [PATCH 464/496] update ms2 and ortp

---
 mediastreamer2 | 2 +-
 oRTP           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 2aef0fddf..13476e604 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 2aef0fddfbb3d39690d562f0d12138a843f21bae
+Subproject commit 13476e604ce3e40a0caa525babdc5dbb88683685
diff --git a/oRTP b/oRTP
index f64cfa994..6cb41fa39 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit f64cfa9944327ac707a1e9adade2a9c7d017e91e
+Subproject commit 6cb41fa39470d23f8c028044e3a4ef2be28beae9

From 00ef85317014acd849fef65cf0b4cc9c1d406813 Mon Sep 17 00:00:00 2001
From: Johan Pascal <johan.pascal@belledonne-communications.com>
Date: Thu, 19 Feb 2015 14:02:13 +0100
Subject: [PATCH 465/496] Give DTLS fingerprint to context as soon as
 possible(do not wait for ice)

---
 coreapi/linphonecall.c | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index ecd68f76f..1b678fea3 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -2349,6 +2349,36 @@ void static start_dtls_on_all_streams(LinphoneCall *call) {
 #endif
 	return;
 }
+
+void static set_dtls_fingerprint( MSMediaStreamSessions *sessions,  const SalStreamDescription *sd,const SalStreamDescription *remote) {
+	if (sal_stream_description_has_dtls(sd) == TRUE) {
+		/*DTLS*/
+		SalDtlsRole salRole = sd->dtls_role;
+		if (salRole!=SalDtlsRoleInvalid) { /* if DTLS is available at both end points */
+			/* give the peer certificate fingerprint to dtls context */
+			ms_dtls_srtp_set_peer_fingerprint(sessions->dtls_context, remote->dtls_fingerprint);
+		} else {
+			ms_warning("unable to start DTLS engine on stream session [%p], Dtls role in resulting media description is invalid",sessions);
+		}
+	}
+}
+
+void static set_dtls_fingerprint_on_all_streams(LinphoneCall *call) {
+	SalMediaDescription *remote_desc = sal_call_get_remote_media_description(call->op);
+	SalMediaDescription *result_desc = sal_call_get_final_media_description(call->op);
+	if (call->audiostream && (media_stream_get_state((const MediaStream *)call->audiostream) == MSStreamStarted))/*dtls must start at the end of ice*/
+			set_dtls_fingerprint(&call->audiostream->ms.sessions
+							,sal_media_description_find_best_stream(result_desc,SalAudio)
+							,sal_media_description_find_best_stream(remote_desc,SalAudio));
+#if VIDEO_ENABLED
+	if (call->videostream && (media_stream_get_state((const MediaStream *)call->videostream) == MSStreamStarted))/*dtls must start at the end of ice*/
+			set_dtls_fingerprint(&call->videostream->ms.sessions
+						,sal_media_description_find_best_stream(result_desc,SalVideo)
+						,sal_media_description_find_best_stream(remote_desc,SalVideo));
+#endif
+	return;
+}
+
 static void linphone_call_start_audio_stream(LinphoneCall *call, bool_t muted, bool_t send_ringbacktone, bool_t use_arc){
 	LinphoneCore *lc=call->core;
 	LpConfig* conf;
@@ -2666,6 +2696,8 @@ void linphone_call_start_media_streams(LinphoneCall *call, bool_t all_inputs_mut
 		LinphoneMediaEncryptionSRTP : LinphoneMediaEncryptionNone;
 	}
 
+	set_dtls_fingerprint_on_all_streams(call);
+
 	if ((call->ice_session != NULL) && (ice_session_state(call->ice_session) != IS_Completed)) {
 		ice_session_start_connectivity_checks(call->ice_session);
 	} else {

From b3734e28a0896f792f422ade9be88970a25a8c46 Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Thu, 19 Feb 2015 15:58:48 +0100
Subject: [PATCH 466/496] JNI setPayloadTypeNumber and resetLogCollection

---
 coreapi/linphonecore_jni.cc                   | 20 +++++++++++++++
 .../org/linphone/core/LinphoneCore.java       | 25 +++++++++++++++++++
 .../org/linphone/core/LinphoneCoreImpl.java   | 15 +++++++++++
 3 files changed, 60 insertions(+)

diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index 3e895a6ce..eb7c47f83 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -1200,6 +1200,10 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_uploadLogCollection(JNIE
 	linphone_core_upload_log_collection(core);
 }
 
+extern "C" void Java_org_linphone_core_LinphoneCoreImpl_resetLogCollection(JNIEnv* env, jobject thiz) {
+	linphone_core_reset_log_collection();
+}
+
 extern "C" jint Java_org_linphone_core_LinphoneCoreImpl_migrateToMultiTransport(JNIEnv*  env
 		,jobject  thiz
 		,jlong lc) {
@@ -1603,6 +1607,7 @@ extern "C" jlong Java_org_linphone_core_LinphoneCoreImpl_findPayloadType(JNIEnv*
 	env->ReleaseStringUTFChars(jmime, mime);
 	return result;
 }
+
 extern "C" jlongArray Java_org_linphone_core_LinphoneCoreImpl_listVideoPayloadTypes(JNIEnv*  env
 																			,jobject  thiz
 																			,jlong lc) {
@@ -1675,6 +1680,21 @@ extern "C" jint Java_org_linphone_core_LinphoneCoreImpl_getPayloadTypeBitrate(JN
 	return (jint)linphone_core_get_payload_type_bitrate((LinphoneCore*)lc,(PayloadType*)pt);
 }
 
+extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setPayloadTypeNumber(JNIEnv*  env
+                                                                            ,jobject  thiz
+                                                                            ,jlong lc
+                                                                            ,jlong pt
+                                                                            ,jint number) {
+    linphone_core_set_payload_type_number((LinphoneCore*)lc,(PayloadType*)pt,number);
+}
+
+extern "C" jint Java_org_linphone_core_LinphoneCoreImpl_getPayloadTypeNumber(JNIEnv*  env
+                                                                            ,jobject  thiz
+                                                                            ,jlong lc
+                                                                            ,jlong pt) {
+    return (jint)linphone_core_get_payload_type_number((LinphoneCore*)lc,(PayloadType*)pt);
+}
+
 extern "C" void Java_org_linphone_core_LinphoneCoreImpl_enableAdaptiveRateControl(JNIEnv*  env
 																			,jobject  thiz
 																			,jlong lc
diff --git a/java/common/org/linphone/core/LinphoneCore.java b/java/common/org/linphone/core/LinphoneCore.java
index 7c23cb9bb..2b7ce9cde 100644
--- a/java/common/org/linphone/core/LinphoneCore.java
+++ b/java/common/org/linphone/core/LinphoneCore.java
@@ -786,6 +786,26 @@ public interface LinphoneCore {
 	 */
 	int getPayloadTypeBitrate(PayloadType pt);
 
+	/**
+	 * Set an explicit bitrate (IP bitrate, not codec bitrate) for a given codec, in kbit/s.
+	 * @param pt the payload type
+	 * @param number target IP bitrate in kbit/s
+	 */
+
+	/**
+	 * Force a number for a payload type. The LinphoneCore does payload type number assignment automatically. THis function is to be used mainly for tests, in order
+	 * to override the automatic assignment mechanism.
+	 * @param pt the payload type
+	 * @param number
+	 **/
+	void setPayloadTypeNumber(PayloadType pt, int number);
+
+	/**
+	 * @param pt the payload type
+	 * @return the payload type number assigned for this codec.
+	 */
+	int getPayloadTypeNumber(PayloadType pt);
+
 	/**
 	 * Enable adaptive rate control.
 	 * @param enable
@@ -1889,6 +1909,11 @@ public interface LinphoneCore {
 	 * Upload the log collection to the configured server url.
 	 */
 	public void uploadLogCollection();
+
+	/**
+	 * Reset the log collection by removing the log files.
+	 */
+	public void resetLogCollection();
 	
 	
 	/**
diff --git a/java/impl/org/linphone/core/LinphoneCoreImpl.java b/java/impl/org/linphone/core/LinphoneCoreImpl.java
index bd361daca..8595ff079 100644
--- a/java/impl/org/linphone/core/LinphoneCoreImpl.java
+++ b/java/impl/org/linphone/core/LinphoneCoreImpl.java
@@ -1274,6 +1274,18 @@ class LinphoneCoreImpl implements LinphoneCore {
 	public synchronized int getPayloadTypeBitrate(PayloadType pt) {
 		return getPayloadTypeBitrate(nativePtr, ((PayloadTypeImpl)pt).nativePtr);
 	}
+
+	private native void setPayloadTypeNumber(long coreptr, long payload_ptr, int number);
+	@Override
+	public synchronized void setPayloadTypeNumber(PayloadType pt, int number) {
+		setPayloadTypeNumber(nativePtr, ((PayloadTypeImpl)pt).nativePtr, number);
+	}
+	private native int getPayloadTypeNumber(long coreptr, long payload_ptr);
+	@Override
+	public synchronized int getPayloadTypeNumber(PayloadType pt) {
+		return getPayloadTypeNumber(nativePtr, ((PayloadTypeImpl)pt).nativePtr);
+	}
+
 	@Override
 	public synchronized void enableAdaptiveRateControl(boolean enable) {
 		enableAdaptiveRateControl(nativePtr,enable);
@@ -1352,6 +1364,9 @@ class LinphoneCoreImpl implements LinphoneCore {
 	public void uploadLogCollection() {
 		uploadLogCollection(nativePtr);
 	}
+
+	@Override
+	public native void resetLogCollection();
 	
 	private native void setPreferredFramerate(long nativePtr, float fps);
 	@Override

From e2d39cf097c2b14f4ee75f4a3df3ce49d1bbf462 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Thu, 19 Feb 2015 16:37:00 +0100
Subject: [PATCH 467/496] update ms2 and ortp

---
 mediastreamer2 | 2 +-
 oRTP           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 13476e604..38f53aaa2 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 13476e604ce3e40a0caa525babdc5dbb88683685
+Subproject commit 38f53aaa2e721384c280cee216565e6befd4f854
diff --git a/oRTP b/oRTP
index 6cb41fa39..60f6d0f90 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 6cb41fa39470d23f8c028044e3a4ef2be28beae9
+Subproject commit 60f6d0f909eddcefc83960f791ff30097c1e5c33

From 417a8f609672303a8a534ad4fb27c718fb8c3812 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Thu, 19 Feb 2015 18:10:30 +0100
Subject: [PATCH 468/496] Update ms2 submodule.

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 38f53aaa2..23e101f98 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 38f53aaa2e721384c280cee216565e6befd4f854
+Subproject commit 23e101f981d24dc8b2acf0e771ca7a58b750be0c

From cd73647339a8ea5f3f9f4d066260238d5f0f876c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
 <francois.grisez@belledonne-communications.com>
Date: Thu, 19 Feb 2015 17:12:02 +0100
Subject: [PATCH 469/496] Fix build issue

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 23e101f98..f735f9b81 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 23e101f981d24dc8b2acf0e771ca7a58b750be0c
+Subproject commit f735f9b811942e528aefb98221ff3704e5559fe5

From 587299ce03366dc142d5fa36fc71e1da11d9fcfd Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Thu, 19 Feb 2015 17:13:35 +0100
Subject: [PATCH 470/496] fix crash in case of transport change when call is on
 error

---
 coreapi/bellesip_sal/sal_op_call.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/coreapi/bellesip_sal/sal_op_call.c b/coreapi/bellesip_sal/sal_op_call.c
index 428c27bff..58b7e9290 100644
--- a/coreapi/bellesip_sal/sal_op_call.c
+++ b/coreapi/bellesip_sal/sal_op_call.c
@@ -217,7 +217,8 @@ static void call_process_response(void *op_base, const belle_sip_response_event_
 	dialog_state=dialog ? belle_sip_dialog_get_state(dialog) : BELLE_SIP_DIALOG_NULL;
 	method=belle_sip_request_get_method(req);
 	ms_message("Op [%p] receiving call response [%i], dialog is [%p] in state [%s]",op,code,dialog,belle_sip_dialog_state_to_string(dialog_state));
-
+	/*to make sure no cb will destroy op*/
+	sal_op_ref(op);
 	switch(dialog_state) {
 		case BELLE_SIP_DIALOG_NULL:
 		case BELLE_SIP_DIALOG_EARLY: {
@@ -316,6 +317,7 @@ static void call_process_response(void *op_base, const belle_sip_response_event_
 		}
 		break;
 	}
+	sal_op_unref(op);
 }
 
 static void call_process_timeout(void *user_ctx, const belle_sip_timeout_event_t *event) {

From 11ffe4f9436c1dac46a1bd05d9d6c300a913a852 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Thu, 19 Feb 2015 17:17:30 +0100
Subject: [PATCH 471/496] move rtp_session_set_symmetric_rtp for ice to the
 completion of ice

---
 coreapi/callbacks.c    |  2 +-
 coreapi/linphonecall.c |  3 +-
 tester/call_tester.c   | 66 ++++++++++++++++++++++++++++++++++++++++--
 3 files changed, 67 insertions(+), 4 deletions(-)

diff --git a/coreapi/callbacks.c b/coreapi/callbacks.c
index 7de84e19f..fa29096b7 100644
--- a/coreapi/callbacks.c
+++ b/coreapi/callbacks.c
@@ -76,7 +76,7 @@ void linphone_core_update_streams_destinations(LinphoneCore *lc, LinphoneCall *c
 static void _clear_early_media_destinations(LinphoneCall *call, MediaStream *ms){
 	RtpSession *session=ms->sessions.rtp_session;
 	rtp_session_clear_aux_remote_addr(session);
-	if (!call->ice_session) rtp_session_set_symmetric_rtp(session,TRUE);/*restore symmetric rtp if ICE is not used*/
+	if (!call->ice_session) rtp_session_set_symmetric_rtp(session,linphone_core_symmetric_rtp_enabled(call->core));/*restore symmetric rtp if ICE is not used*/
 }
 
 static void clear_early_media_destinations(LinphoneCall *call){
diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index 1b678fea3..b118b163f 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -1792,7 +1792,6 @@ static void _linphone_call_prepare_ice_for_stream(LinphoneCall *call, int stream
 	if ((linphone_core_get_firewall_policy(call->core) == LinphonePolicyUseIce) && (call->ice_session != NULL)){
 		IceCheckList *cl;
 		rtp_session_set_pktinfo(ms->sessions.rtp_session, TRUE);
-		rtp_session_set_symmetric_rtp(ms->sessions.rtp_session, FALSE);
 		cl=ice_session_check_list(call->ice_session, stream_index);
 		if (cl == NULL && create_checklist) {
 			cl=ice_check_list_new();
@@ -3283,6 +3282,7 @@ static void change_ice_media_destinations(LinphoneCall *call) {
         result = ice_check_list_selected_valid_remote_candidate(ice_session_check_list(call->ice_session, 0), &rtp_addr, &rtp_port, &rtcp_addr, &rtcp_port);
         if (result == TRUE) {
             ms_message("Change audio stream destination: RTP=%s:%d RTCP=%s:%d", rtp_addr, rtp_port, rtcp_addr, rtcp_port);
+            rtp_session_set_symmetric_rtp(call->audiostream->ms.sessions.rtp_session, FALSE);
             rtp_session_set_remote_addr_full(call->audiostream->ms.sessions.rtp_session, rtp_addr, rtp_port, rtcp_addr, rtcp_port);
         }
     }
@@ -3291,6 +3291,7 @@ static void change_ice_media_destinations(LinphoneCall *call) {
         result = ice_check_list_selected_valid_remote_candidate(ice_session_check_list(call->ice_session, 1), &rtp_addr, &rtp_port, &rtcp_addr, &rtcp_port);
         if (result == TRUE) {
             ms_message("Change video stream destination: RTP=%s:%d RTCP=%s:%d", rtp_addr, rtp_port, rtcp_addr, rtcp_port);
+            rtp_session_set_symmetric_rtp(call->videostream->ms.sessions.rtp_session, FALSE);
             rtp_session_set_remote_addr_full(call->videostream->ms.sessions.rtp_session, rtp_addr, rtp_port, rtcp_addr, rtcp_port);
         }
     }
diff --git a/tester/call_tester.c b/tester/call_tester.c
index 644727618..5442364d7 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -240,7 +240,7 @@ bool_t call_with_params2(LinphoneCoreManager* caller_mgr
 	CU_ASSERT_PTR_NOT_NULL(linphone_core_get_current_call_remote_address(callee_mgr->lc));
 	if(!linphone_core_get_current_call(caller_mgr->lc) || !linphone_core_get_current_call(callee_mgr->lc) || !linphone_core_get_current_call_remote_address(callee_mgr->lc)) {
 		return 0;
-	} else {
+	} else if (caller_mgr->identity){
 		LinphoneAddress* callee_from=linphone_address_clone(caller_mgr->identity);
 		linphone_address_set_port(callee_from,0); /*remove port because port is never present in from header*/
 
@@ -3678,7 +3678,67 @@ static void call_with_generic_cn(void) {
 	ms_free(audio_file_with_silence);
 	ms_free(recorded_file);
 }
+void static call_state_changed_2(LinphoneCore *lc, LinphoneCall *call, LinphoneCallState cstate, const char *msg){
+	LCSipTransports sip_tr;
+	if (cstate==LinphoneCallReleased) {
+		/*to make sure transport is changed*/
+		sip_tr.udp_port = 0;
+		sip_tr.tcp_port = 45876;
+		sip_tr.tls_port = 0;
 
+		linphone_core_set_sip_transports(lc,&sip_tr);
+	}
+}
+
+static void call_with_transport_change_base(bool_t succesfull_call) {
+	int begin;
+	int leaked_objects;
+	LCSipTransports sip_tr;
+	LinphoneCoreManager* marie;
+	LinphoneCoreManager* pauline;
+	LinphoneCoreVTable * v_table;
+	belle_sip_object_enable_leak_detector(TRUE);
+	begin=belle_sip_object_get_object_count();
+	v_table = linphone_core_v_table_new();
+	v_table->call_state_changed=call_state_changed_2;
+	marie = linphone_core_manager_new("marie_rc");
+	pauline = linphone_core_manager_new( "pauline_rc");
+	linphone_core_add_listener(marie->lc,v_table);
+
+	sip_tr.udp_port = 0;
+	sip_tr.tcp_port = 45875;
+	sip_tr.tls_port = 0;
+	linphone_core_set_sip_transports(marie->lc,&sip_tr);
+	if (succesfull_call) {
+		CU_ASSERT_TRUE(call(marie,pauline));
+		linphone_core_terminate_all_calls(marie->lc);
+	}
+	else
+		linphone_core_invite(marie->lc,"nexiste_pas");
+
+	if (succesfull_call)
+		CU_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&marie->stat.number_of_LinphoneCallEnd,1));
+	CU_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&marie->stat.number_of_LinphoneCallReleased,1));
+	if (succesfull_call) {
+		CU_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&pauline->stat.number_of_LinphoneCallEnd,1));
+		CU_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&pauline->stat.number_of_LinphoneCallReleased,1));
+	}
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+
+	leaked_objects=belle_sip_object_get_object_count()-begin;
+	CU_ASSERT_TRUE(leaked_objects==0);
+	if (leaked_objects>0){
+		belle_sip_object_dump_active_objects();
+	}
+
+}
+static void call_with_transport_change_after_released(void) {
+	call_with_transport_change_base(TRUE);
+}
+static void unsucessfull_call_with_transport_change_after_released(void) {
+	call_with_transport_change_base(FALSE);
+}
 
 test_t call_tests[] = {
 	{ "Early declined call", early_declined_call },
@@ -3782,7 +3842,9 @@ test_t call_tests[] = {
 	{ "Outgoing INVITE with invalid ACK SDP",outgoing_invite_with_invalid_sdp},
 	{ "Incoming REINVITE with invalid SDP in ACK",incoming_reinvite_with_invalid_ack_sdp},
 	{ "Outgoing REINVITE with invalid SDP in ACK",outgoing_reinvite_with_invalid_ack_sdp},
-	{ "Call with generic CN", call_with_generic_cn }
+	{ "Call with generic CN", call_with_generic_cn },
+	{ "Call with transport change after released", call_with_transport_change_after_released },
+	{ "Unsuccessful call with transport change after released",unsucessfull_call_with_transport_change_after_released}
 };
 
 test_suite_t call_test_suite = {

From 216d7afd41244534c820910cde31f21696db0481 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Thu, 19 Feb 2015 17:46:35 +0100
Subject: [PATCH 472/496] active DTLS + video + ice +tunnel test

---
 tester/transport_tester.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tester/transport_tester.c b/tester/transport_tester.c
index 921e03467..e847e0fe8 100644
--- a/tester/transport_tester.c
+++ b/tester/transport_tester.c
@@ -169,9 +169,9 @@ static void tunnel_zrtp_video_ice_call(void) {
 }
 
 static void tunnel_dtls_video_ice_call(void) {
-/*	if (linphone_core_tunnel_available())
+	if (linphone_core_tunnel_available())
 		call_base(LinphoneMediaEncryptionDTLS,TRUE,FALSE,LinphonePolicyUseIce,TRUE);
-	else*/
+	else
 		ms_warning("Could not test %s because tunnel functionality is not available",__FUNCTION__);
 }
 

From c48b39467e5eed00bf9e5adebaeb4da487c38fa8 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Thu, 19 Feb 2015 19:09:36 +0100
Subject: [PATCH 473/496] update ms2 (build broken)

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index f735f9b81..ed0c1f307 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit f735f9b811942e528aefb98221ff3704e5559fe5
+Subproject commit ed0c1f30701c6a3bb0607243834f5b58a2720381

From 948ae319a4642eb7cdd26018dccca439a1fb2355 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
 <francois.grisez@belledonne-communications.com>
Date: Thu, 19 Feb 2015 22:41:43 +0100
Subject: [PATCH 474/496] Fix color issues in the chat room when a dark GTK
 theme is used

---
 gtk/chat.c | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/gtk/chat.c b/gtk/chat.c
index daa5fd95a..1f2234d72 100644
--- a/gtk/chat.c
+++ b/gtk/chat.c
@@ -161,16 +161,19 @@ void linphone_gtk_push_text(GtkWidget *w, const LinphoneAddress *from,
 	if(g_strcmp0(from_message,from_str)!=0){
 		gtk_text_buffer_get_iter_at_offset(buffer,&iter,off);
 		gtk_text_buffer_get_end_iter(buffer,&iter);
-		gtk_text_buffer_insert_with_tags_by_name(buffer,&iter,get_display_name(from),-1,"bold",me ? "bg":NULL,NULL);
+		gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, get_display_name(from), -1,
+		                                         "bold", me ? "bg" : NULL, me ? "font_black" : NULL, NULL);
 		gtk_text_buffer_get_end_iter(buffer,&iter);
-		gtk_text_buffer_insert_with_tags_by_name(buffer,&iter," : ",-1,"bold",me ? "bg":NULL,NULL);
+		gtk_text_buffer_insert_with_tags_by_name(buffer,&iter, " : ", -1,
+		                                         "bold", me ? "bg" : NULL, me ? "font_black" : NULL, NULL);
 		gtk_text_buffer_get_end_iter(buffer,&iter);
 		gtk_text_buffer_insert(buffer,&iter,"\n",-1);
 		g_free(from_message);
 		g_object_set_data(G_OBJECT(w),"from_message",g_strdup(from_str));
 	}
 	gtk_text_buffer_get_end_iter(buffer,&iter);
-	gtk_text_buffer_insert_with_tags_by_name(buffer,&iter,linphone_chat_message_get_text(msg),-1,"margin",me ? "bg":NULL,NULL);
+	gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, linphone_chat_message_get_text(msg), -1,
+	                                         "margin", me ? "bg" : NULL, me ? "font_black" : NULL, NULL);
 	gtk_text_buffer_get_end_iter(buffer,&iter);
 	gtk_text_buffer_insert(buffer,&iter,"\n",-1);
 	gtk_text_buffer_get_end_iter(buffer,&iter);
@@ -378,8 +381,9 @@ GtkWidget* linphone_gtk_init_chatroom(LinphoneChatRoom *cr, const LinphoneAddres
 	GtkWidget *main_window=linphone_gtk_get_main_window();
 	GtkNotebook *notebook=(GtkNotebook *)linphone_gtk_get_widget(main_window,"viewswitch");
 	GtkWidget *text=linphone_gtk_get_widget(chat_view,"textview");
-	GdkColor color;
-	GdkColor colorb;
+	GdkColor color_grey = {0, 32512, 32512, 32512};
+	GdkColor color_light_grey = {0, 56832, 60928, 61952};
+	GdkColor color_black = {0};
 	int idx;
 	GtkWidget *button;
 	GtkWidget *entry = linphone_gtk_get_widget(chat_view,"text_entry");
@@ -387,13 +391,6 @@ GtkWidget* linphone_gtk_init_chatroom(LinphoneChatRoom *cr, const LinphoneAddres
 	GHashTable *table;
 	char *with_str;
 
-	color.red = 32512;
-  	color.green = 32512;
-  	color.blue = 32512;
-	colorb.red = 56832;
-  	colorb.green = 60928;
-  	colorb.blue = 61952;
-
 	with_str=linphone_address_as_string_uri_only(with);
 	gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(text),GTK_WRAP_WORD_CHAR);
 	gtk_text_view_set_editable(GTK_TEXT_VIEW(text),FALSE);
@@ -417,11 +414,13 @@ GtkWidget* linphone_gtk_init_chatroom(LinphoneChatRoom *cr, const LinphoneAddres
 	gtk_text_buffer_create_tag(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)),
 	                           	"small","size",9*PANGO_SCALE,NULL);
 	gtk_text_buffer_create_tag(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)),
-	                           	"font_grey","foreground-gdk",&color,NULL);
+	                           	"font_grey","foreground-gdk",&color_grey,NULL);
+	gtk_text_buffer_create_tag(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)),
+	                           	"font_black","foreground-gdk",&color_black,NULL);
 	gtk_text_buffer_create_tag(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)),
 	                           	"margin","indent",10,NULL);
 	gtk_text_buffer_create_tag(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)),
-	                           	"bg","paragraph-background-gdk",&colorb,NULL);
+	                           	"bg","paragraph-background-gdk",&color_light_grey,NULL);
 	messages = linphone_chat_room_get_history(cr,NB_MSG_HIST);
 	display_history_message(chat_view,messages,with);
 	button = linphone_gtk_get_widget(chat_view,"send");

From 2e9036f3656d510c3283b74ec41a3e4494a71183 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
 <francois.grisez@belledonne-communications.com>
Date: Fri, 20 Feb 2015 15:17:02 +0100
Subject: [PATCH 475/496] Fix crach on windows: avoid creating message storage
 database when the SQLite file cannot be opened

---
 coreapi/message_storage.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/coreapi/message_storage.c b/coreapi/message_storage.c
index 2684ba0b5..91fd8e333 100644
--- a/coreapi/message_storage.c
+++ b/coreapi/message_storage.c
@@ -591,6 +591,7 @@ void linphone_core_message_storage_init(LinphoneCore *lc){
 		errmsg=sqlite3_errmsg(db);
 		ms_error("Error in the opening: %s.\n", errmsg);
 		sqlite3_close(db);
+		return;
 	}
 
 	linphone_message_storage_activate_debug(db, lc->debug_storage);

From ea0aecc8a7cabf3bf7da1cd92039c4e8259bf02f Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Fri, 20 Feb 2015 16:14:09 +0100
Subject: [PATCH 476/496] keep tester recorded files in case of test failure

---
 tester/tester.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tester/tester.c b/tester/tester.c
index b046c065e..382155656 100644
--- a/tester/tester.c
+++ b/tester/tester.c
@@ -296,10 +296,13 @@ LinphoneCoreManager* linphone_core_manager_new2(const char* rc_file, int check_f
 
 	if( manager_count >= 2){
 		char hellopath[512];
+		char *recordpath = ms_strdup_printf("%s/record_for_lc_%p.wav",liblinphone_tester_writable_dir_prefix,mgr->lc);
 		ms_message("Manager for '%s' using files", rc_file ? rc_file : "--");
 		linphone_core_use_files(mgr->lc, TRUE);
 		snprintf(hellopath,sizeof(hellopath), "%s/sounds/hello8000.wav", liblinphone_tester_file_prefix);
 		linphone_core_set_play_file(mgr->lc,hellopath);
+		linphone_core_set_record_file(mgr->lc,recordpath);
+		ms_free(recordpath);
 	}
 
 	if (proxy_count){
@@ -334,10 +337,18 @@ void linphone_core_manager_stop(LinphoneCoreManager *mgr){
 }
 
 void linphone_core_manager_destroy(LinphoneCoreManager* mgr) {
+	if (linphone_core_get_record_file(mgr->lc)){
+		if (CU_get_number_of_failures()>0) {
+			ms_message ("Test has failed, keeping recorded file [%s]",linphone_core_get_record_file(mgr->lc));
+		} else {
+			unlink(linphone_core_get_record_file(mgr->lc));
+		}
+	}
 	if (mgr->lc) linphone_core_destroy(mgr->lc);
 	if (mgr->identity) linphone_address_destroy(mgr->identity);
 	if (mgr->stat.last_received_chat_message) linphone_chat_message_unref(mgr->stat.last_received_chat_message);
 	manager_count--;
+
 	ms_free(mgr);
 }
 

From f98d1f4fca5ac0ca5dae23fd123549dec2baea75 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Fri, 20 Feb 2015 19:35:40 +0100
Subject: [PATCH 477/496] fix crash

---
 tester/tester.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/tester/tester.c b/tester/tester.c
index 382155656..9fdedb0ec 100644
--- a/tester/tester.c
+++ b/tester/tester.c
@@ -337,14 +337,17 @@ void linphone_core_manager_stop(LinphoneCoreManager *mgr){
 }
 
 void linphone_core_manager_destroy(LinphoneCoreManager* mgr) {
-	if (linphone_core_get_record_file(mgr->lc)){
-		if (CU_get_number_of_failures()>0) {
-			ms_message ("Test has failed, keeping recorded file [%s]",linphone_core_get_record_file(mgr->lc));
-		} else {
-			unlink(linphone_core_get_record_file(mgr->lc));
+	if (mgr->lc){
+		const char *record_file=linphone_core_get_record_file(mgr->lc);
+		if (record_file){
+			if (CU_get_number_of_failures()>0) {
+				ms_message ("Test has failed, keeping recorded file [%s]",record_file);
+			} else {
+				unlink(record_file);
+			}
 		}
+		linphone_core_destroy(mgr->lc);
 	}
-	if (mgr->lc) linphone_core_destroy(mgr->lc);
 	if (mgr->identity) linphone_address_destroy(mgr->identity);
 	if (mgr->stat.last_received_chat_message) linphone_chat_message_unref(mgr->stat.last_received_chat_message);
 	manager_count--;

From 2d30e846d8c8f09f71794866cd8261b65aa8937c Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Mon, 23 Feb 2015 13:39:44 +0100
Subject: [PATCH 478/496] fix multicast lock crash + enable dtls for android

---
 coreapi/linphonecore_jni.cc | 45 ++++++++++++++++++++++++++++---------
 coreapi/private.h           |  2 ++
 mediastreamer2              |  2 +-
 3 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index eb7c47f83..e9fc0b787 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -1160,10 +1160,23 @@ extern "C" jlong Java_org_linphone_core_LinphoneCoreImpl_newLinphoneCore(JNIEnv*
 	if (factoryConfig) env->ReleaseStringUTFChars(jfactoryConfig, factoryConfig);
 	return nativePtr;
 }
-extern "C" void Java_org_linphone_core_LinphoneCoreImpl_delete(JNIEnv* env, jobject thiz, jlong lc) {
-	jobject core = (jobject)linphone_core_get_user_data((LinphoneCore*)lc);
-	linphone_core_destroy((LinphoneCore*)lc);
+extern "C" void Java_org_linphone_core_LinphoneCoreImpl_delete(JNIEnv* env, jobject thiz, jlong native_ptr) {
+	LinphoneCore *lc=(LinphoneCore*)native_ptr;
+	jobject core = (jobject)linphone_core_get_user_data(lc);
+
+	jobject multicast_lock = lc->multicast_lock;
+	jobject multicast_lock_class = lc->multicast_lock_class;
+	jobject wifi_lock = lc->wifi_lock;
+	jobject wifi_lock_class = lc->wifi_lock_class;
+
+	linphone_core_destroy(lc);
 	ms_exit();
+
+	if (wifi_lock) env->DeleteGlobalRef(wifi_lock);
+	if (wifi_lock_class) env->DeleteGlobalRef(wifi_lock_class);
+	if (multicast_lock) env->DeleteGlobalRef(multicast_lock);
+	if (multicast_lock_class) env->DeleteGlobalRef(multicast_lock_class);
+
 	if (core) {
 		env->DeleteGlobalRef(core);
 	}
@@ -4082,33 +4095,43 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setAndroidPowerManager(J
 #endif
 }
 
+/*released in Java_org_linphone_core_LinphoneCoreImpl_delete*/
 extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setAndroidWifiLock(JNIEnv *env, jobject thiz, jlong ptr, jobject wifi_lock) {
 #ifdef ANDROID
 	LinphoneCore *lc=(LinphoneCore*)ptr;
-	if (lc->wifi_lock)
+	if (lc->wifi_lock) {
 		env->DeleteGlobalRef(lc->wifi_lock);
+		env->DeleteGlobalRef(lc->wifi_lock_class);
+	}
 	if (wifi_lock != NULL) {
 		lc->wifi_lock=env->NewGlobalRef(wifi_lock);
-		jclass wifiLockClass = env->FindClass("android/net/wifi/WifiManager$WifiLock");
-		lc->wifi_lock_acquire_id = env->GetMethodID(wifiLockClass, "acquire", "()V");
-		lc->wifi_lock_release_id = env->GetMethodID(wifiLockClass, "release", "()V");
+		lc->wifi_lock_class = env->FindClass("android/net/wifi/WifiManager$WifiLock");
+		lc->wifi_lock_class = (jclass)env->NewGlobalRef(lc->wifi_lock_class); /*to make sure methodid are preserved*/
+		lc->wifi_lock_acquire_id = env->GetMethodID(lc->wifi_lock_class, "acquire", "()V");
+		lc->wifi_lock_release_id = env->GetMethodID(lc->wifi_lock_class, "release", "()V");
 	} else {
 		lc->wifi_lock=NULL;
+		lc->wifi_lock_class=NULL;
 	}
 #endif
 }
+/*released in Java_org_linphone_core_LinphoneCoreImpl_delete*/
 extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setAndroidMulticastLock(JNIEnv *env, jobject thiz, jlong ptr, jobject multicast_lock) {
 #ifdef ANDROID
 	LinphoneCore *lc=(LinphoneCore*)ptr;
-	if (lc->multicast_lock)
+	if (lc->multicast_lock) {
 		env->DeleteGlobalRef(lc->multicast_lock);
+		env->DeleteGlobalRef(lc->multicast_lock_class);
+	}
 	if (multicast_lock != NULL) {
 		lc->multicast_lock=env->NewGlobalRef(multicast_lock);
-		jclass multicastLockClass = env->FindClass("android/net/wifi/WifiManager$MulticastLock");
-		lc->multicast_lock_acquire_id = env->GetMethodID(multicastLockClass, "acquire", "()V");
-		lc->multicast_lock_release_id = env->GetMethodID(multicastLockClass, "release", "()V");
+		lc->multicast_lock_class = env->FindClass("android/net/wifi/WifiManager$MulticastLock");
+		lc->multicast_lock_class = (jclass)env->NewGlobalRef(lc->multicast_lock_class);/*to make sure methodid are preserved*/
+		lc->multicast_lock_acquire_id = env->GetMethodID(lc->multicast_lock_class, "acquire", "()V");
+		lc->multicast_lock_release_id = env->GetMethodID(lc->multicast_lock_class, "release", "()V");
 	} else {
 		lc->multicast_lock=NULL;
+		lc->multicast_lock_class=NULL;
 	}
 #endif
 }
diff --git a/coreapi/private.h b/coreapi/private.h
index d5a59d85f..4414f50ec 100644
--- a/coreapi/private.h
+++ b/coreapi/private.h
@@ -805,9 +805,11 @@ struct _LinphoneCore
 	LinphoneCoreVTable *current_vtable; // the latest vtable to call a callback, see linphone_core_get_current_vtable
 #ifdef ANDROID
 	jobject wifi_lock;
+	jclass wifi_lock_class;
 	jmethodID wifi_lock_acquire_id;
 	jmethodID wifi_lock_release_id;
 	jobject multicast_lock;
+	jclass multicast_lock_class;
 	jmethodID multicast_lock_acquire_id;
 	jmethodID multicast_lock_release_id;
 #endif
diff --git a/mediastreamer2 b/mediastreamer2
index ed0c1f307..ca8ad4af2 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit ed0c1f30701c6a3bb0607243834f5b58a2720381
+Subproject commit ca8ad4af235b8131d43687343577e98ba0142c72

From a03fd63d7bc025cd0f8b51b5f3b24d5fe4625874 Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Mon, 23 Feb 2015 14:47:49 +0100
Subject: [PATCH 479/496] Add DTLS

---
 java/common/org/linphone/core/LinphoneCore.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/java/common/org/linphone/core/LinphoneCore.java b/java/common/org/linphone/core/LinphoneCore.java
index 2b7ce9cde..495f6642a 100644
--- a/java/common/org/linphone/core/LinphoneCore.java
+++ b/java/common/org/linphone/core/LinphoneCore.java
@@ -269,6 +269,10 @@ public interface LinphoneCore {
 		 * ZRTP
 		 */
 		static public final MediaEncryption ZRTP = new MediaEncryption(2,"ZRTP");
+		/**
+		 * DTLS
+		 */
+		static public final MediaEncryption DTLS = new MediaEncryption(3,"DTLS");
 		protected final int mValue;
 		private final String mStringValue;
 

From 5253675b40d02ebd362dd6fa74040b1edea4c863 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Tue, 24 Feb 2015 10:26:11 +0100
Subject: [PATCH 480/496] i18n: use --non-interactive mode in push_transifex,
 even if this is dangerous this is the best way to handle stdin within
 Makefile

---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index b392c23e9..74467b7c9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -175,7 +175,7 @@ pull-transifex:
 	$(MAKE) -C po update-po
 
 push-transifex:
-	tx push -s -t -f
+	tx push -s -t -f --no-interactive
 
 
 ### WINDOWS

From ccc31f0b50f2f4c3e1d52c2729507d97d1377b1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
 <francois.grisez@belledonne-communications.com>
Date: Mon, 23 Feb 2015 14:52:03 +0100
Subject: [PATCH 481/496] Rewrite README.mingw to match with 80-columned
 terminals

---
 README.mingw | 81 +++++++++++++++++++++++++++++++++-------------------
 1 file changed, 51 insertions(+), 30 deletions(-)

diff --git a/README.mingw b/README.mingw
index 5e859680b..6f5414753 100644
--- a/README.mingw
+++ b/README.mingw
@@ -29,7 +29,8 @@ Download lastest linphone-deps-win32 zip from
 http://download.savannah.gnu.org/releases-noredirect/linphone/misc
 using your browser. 
 
-Download gtk+-2.24.10 win32 _bundle_ from http://www.gtk.org, direct link: http://ftp.gnome.org/pub/gnome/binaries/win32/gtk+/2.24/gtk+-bundle_2.24.10-20120208_win32.zip 
+Download gtk+-2.24.10 win32 _bundle_ from http://www.gtk.org, direct link:
+http://ftp.gnome.org/pub/gnome/binaries/win32/gtk+/2.24/gtk+-bundle_2.24.10-20120208_win32.zip 
 
 Install all these three package in /:
 
@@ -46,26 +47,35 @@ tar -xvzf GTK2-Outcrop.tar.gz
 #To get the translations working, remove from C:/MinGW/lib :
 libintl.a libintl.la libintl.dll.a
 
-* Download and install Inno Setup Compiler (required only if you run 'make setup.exe'). Add it to your windows Path environment variable.
+* Download and install Inno Setup Compiler (required only if you run
+'make setup.exe'). Add it to your windows Path environment variable.
 
-* Install msys-git from (http://msysgit.github.io/). During installation you are asked to make a choice about how line endings are treated by git. Choose "Checkout line endings as they are, commit as they are". THIS CHOICE IS VERY IMPORTANT. OTHERS BREAK AUTOMAKE.
+* Install msys-git from (http://msysgit.github.io/). During installation you
+are asked to make a choice about how line endings are treated by git. Choose
+"Checkout line endings as they are, commit as they are". THIS CHOICE IS VERY
+IMPORTANT. OTHERS BREAK AUTOMAKE.
 
 
 General rules for compilation
 *****************************
 
-- It is recommended that you create a directory somewhere with a path without any spaces or ~ characters, for example c:\sources\.
-  This is the place where source code must be compiled.
-- git commands (to retrieve source code) must be performed within msys-git terminal.
-- all other commands (configure, autogen.sh, make) must be done within the mingw shell (msys).
-In both msys and msys-git windows, change into the directory you created for sources:
-cd /c/sources
-- make sure pkg-config works by adding this env variable to your terminal:
-   export PKG_CONFIG_PATH=/usr/lib/pkgconfig
+* It is recommended that you create a directory somewhere with a path without
+  any spaces or ~ characters, for example c:\sources\. This is the place where
+  source code must be compiled.
+* git commands (to retrieve source code) must be performed within msys-git
+  terminal.
+* all other commands (configure, autogen.sh, make) must be done within the
+  mingw shell (msys). In both msys and msys-git windows, change into the
+  directory you created for sources:
+	cd /c/sources
+
+* make sure pkg-config works by adding this env variable to your terminal:
+	export PKG_CONFIG_PATH=/usr/lib/pkgconfig
 
 Building belle-sip
 ******************
-  * make sure that java version 1.6 is available in the PATH. java-1.7 will not work with antlr generator.
+  * make sure that java version 1.6 is available in the PATH. java-1.7 will
+    not work with antlr generator.
   * download the sources with msys-git shell using the following command:
     $ git clone git://git.linphone.org/belle-sip.git
   * compile and install 
@@ -80,11 +90,12 @@ Building Linphone
     $ git clone git://git.linphone.org/linphone.git --recursive
 
   * compile  
-  #always run autogen.sh after a git checkout or update
+    #always run autogen.sh after a git checkout or update
     $ ./autogen.sh
 
     $ ./configure --prefix=/usr --enable-shared --disable-static
-      #note: in order to use the tunnel (commercial extension), append --enable-tunnel to the configure line above.
+    #note: in order to use the tunnel (commercial extension), append
+    #--enable-tunnel to the configure line above.
 
     $ make
     $ make install
@@ -92,15 +103,18 @@ Building Linphone
     #Option: make a portable binary zip of linphone
     $ make zip
 
-    #additionally you can make binary installer if you have Inno Setup 5 installed in its default path
+    #additionally you can make binary installer if you have Inno Setup 5
+    installed in its default path
 
     $ make setup.exe
-    #now you're done, you have a fresh linphone windows installer in the current directory.
+    #now you're done, you have a fresh linphone windows installer in the
+    current directory.
 
 Building plugins (optional)
 ***************************
 
-  This the example for msx264 (H264 plugin), the same applies for other linphone plugins.
+  This the example for msx264 (H264 plugin), the same applies for other
+  linphone plugins.
   $ git clone git://git.linphone.org/msx264.git
   $ cd msx264
   $ ./autogen.sh
@@ -115,17 +129,17 @@ Building plugins (optional)
 *      Notes about linphone-deps generation          *
 ******************************************************
 
-Linphone-deps is a collection of linphone dependencies, that are for some of them difficult
-to find as windows binaries.
-These notes are useful if you want to upgrade part of the software that is included in the
-linphone-deps packages.
+Linphone-deps is a collection of linphone dependencies, that are for some of
+them difficult to find as windows binaries. These notes are useful if you want
+to upgrade part of the software that is included in the linphone-deps packages.
 
 List of software included in linphone-deps:
 antlr3c (compiled)
 bzrtp (compiled)
 polarssl (compiled
 libsrtp (compiled)
-libavcodec, libavutil, libavformat, libavdevice, libswscale (compiled, all these from ffmpeg)
+libavcodec, libavutil, libavformat, libavdevice, libswscale (compiled, all
+these from ffmpeg)
 libtheora (from the web)
 libx264 (compiled from the version distributed from linphone's web site)
 libogg (from the web)
@@ -137,8 +151,10 @@ libsoup (compiled)
 libsqlite3 (compiled)
 
 Remarks:
-For every package compiled that goes into linphone-deps, .la files (libtool files) must be removed to avoid libtool errors.
-When running "make install DESTDIR=<somepath>", somepath must be absolute and should not contain any ~ or space.
+For every package compiled that goes into linphone-deps, .la files (libtool
+files) must be removed to avoid libtool errors. When running "make install
+DESTDIR=<somepath>", somepath must be absolute and should not contain any ~ or
+space.
 
 - building antlr3c
   * download the sources with:
@@ -192,9 +208,12 @@ When running "make install DESTDIR=<somepath>", somepath must be absolute and sh
   ./configure --enable-shared --disable-static --enable-memalign-hack --extra-cflags="-fno-common" --enable-gpl && make
   make install DESTDIR=/home/<myuser>/ffmpeg-install
   Copy to ~/ffmpeg-install/usr/local/* to linphone-deps/.
-  Copy also all *.dll.a files from the build tree to lib/ directort of linphone-deps. These are the implibs necessary to link a program against the dlls.
+  Copy also all *.dll.a files from the build tree to lib/ directort of
+  linphone-deps. These are the implibs necessary to link a program against the
+  dlls.
 
-- building libxml2: the binaries found on the internet are generated with MSVC++, and for obscure reason they are not suitable for building libsoup 
+- building libxml2: the binaries found on the internet are generated with
+  MSVC++, and for obscure reason they are not suitable for building libsoup 
   (that requires libxml2).
   ./configure --enable-shared --disable-static && make && make install DESTDIR=/home/<myuser>/libxml2-install
   copy ~/libxml2-install/usr/local/* into linphone-deps/.
@@ -217,12 +236,14 @@ When running "make install DESTDIR=<somepath>", somepath must be absolute and sh
 	- add to linphone-deps
 
 - building libsoup (only required for buddylookup plugin)
-	- download source from gnome ftp (warning: at the time of the writing only version 2.26.x can compile with the 
-		glib version supplied in the gtk-bundle, 2.27 requires a new version of glib)
+	- download source from gnome ftp (warning: at the time of the writing
+	  only version 2.26.x can compile with the glib version supplied in the
+	  gtk-bundle, 2.27 requires a new version of glib)
 	- uncompress libgnutls zip in /
 	- make sure you have libxml2 installed in /
-	- apply a bugfix patch (fix gnutls support on windows, completely broken otherwise). The patch
-		is in linphone-deps/src, apply it this way:
+	- apply a bugfix patch (fix gnutls support on windows, completely
+	  broken otherwise). The patch is in linphone-deps/src, apply it this
+	  way:
 		cd libsoup-2.26.*
 		cd libsoup
 		patch -p0 < libsoup-gnutls-bugfix.patch

From 46b84df670b2ba12dffb11359077e08a74deda77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
 <francois.grisez@belledonne-communications.com>
Date: Tue, 24 Feb 2015 10:27:13 +0100
Subject: [PATCH 482/496] Fix build issue on Windows

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index ca8ad4af2..3d23e9d8a 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit ca8ad4af235b8131d43687343577e98ba0142c72
+Subproject commit 3d23e9d8aee73fae6fc6bf68f432d43c00828c96

From 2c7b9f2cf256baaa7905eb2825c5db5fd19bb149 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Tue, 24 Feb 2015 11:41:28 +0100
Subject: [PATCH 483/496] configure.ac: only set AC_CONFIG_MACOS_FLAGS when
 using MacPorts, not HomeBrew

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index dd0c323f5..bde0a2872 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,7 +79,7 @@ case $target in
 	x86_64-apple-darwin*|i686-apple-darwin*)
 		MSPLUGINS_CFLAGS=""
 		dnl use macport installation
-		ACLOCAL_MACOS_FLAGS="-I /opt/local/share/aclocal"
+		AS_IF([test -d "/opt/local/share/aclocal"], [ACLOCAL_MACOS_FLAGS="-I /opt/local/share/aclocal"])
 		build_macos=yes
 	;;
 

From 119c596b9e48b17c09ed6e3c6a43d483502f9799 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 24 Feb 2015 11:52:38 +0100
Subject: [PATCH 484/496] Added test for file transfer using old way: setting
 file's url in message's external body

---
 tester/message_tester.c | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/tester/message_tester.c b/tester/message_tester.c
index dd6cf4700..e2491048f 100644
--- a/tester/message_tester.c
+++ b/tester/message_tester.c
@@ -827,6 +827,41 @@ static void file_transfer_message_download_cancelled(void) {
 	ms_error("Test skipped");
 }
 
+static void file_transfer_using_external_body_url(void) {
+	char *to;
+	LinphoneChatMessageCbs *cbs;
+	LinphoneChatRoom *chat_room;
+	LinphoneChatMessage *message;
+	LinphoneCoreManager *marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager *pauline = linphone_core_manager_new("pauline_rc");
+	reset_counters(&marie->stat);
+	reset_counters(&pauline->stat);
+
+	/* create a chatroom on pauline's side */
+	to = linphone_address_as_string(marie->identity);
+	chat_room = linphone_core_create_chat_room(pauline->lc,to);
+	
+	message = linphone_chat_room_create_message(chat_room, NULL);
+	
+	cbs = linphone_chat_message_get_callbacks(message);
+	linphone_chat_message_cbs_set_msg_state_changed(cbs, liblinphone_tester_chat_message_msg_state_changed);
+	
+	linphone_chat_message_set_external_body_url(message, "https://www.linphone.org:444//tmp/54ec58280ace9_c30709218df8eaba61d1.jpg");
+	linphone_chat_room_send_chat_message(chat_room, message);
+	
+	CU_ASSERT_TRUE(wait_for(pauline->lc, marie->lc, &marie->stat.number_of_LinphoneMessageReceived, 1));
+	if (marie->stat.last_received_chat_message) {
+		linphone_chat_message_download_file(marie->stat.last_received_chat_message);
+	}
+	CU_ASSERT_TRUE(wait_for(pauline->lc, marie->lc, &marie->stat.number_of_LinphoneMessageExtBodyReceived, 1));
+
+	CU_ASSERT_EQUAL(pauline->stat.number_of_LinphoneMessageInProgress, 1);
+	CU_ASSERT_EQUAL(marie->stat.number_of_LinphoneMessageExtBodyReceived, 1);
+
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
 static void text_message_with_send_error(void) {
 	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
@@ -1203,6 +1238,7 @@ test_t message_tests[] = {
 /*	{ "File transfer message with io error at download", file_transfer_message_io_error_download },*/
 	{ "File transfer message upload cancelled", file_transfer_message_upload_cancelled },
 	{ "File transfer message download cancelled", file_transfer_message_download_cancelled },
+	{ "File transfer message using external body url", file_transfer_using_external_body_url },
 	{ "Text message denied", text_message_denied },
 	{ "Info message", info_message },
 	{ "Info message with body", info_message_with_body },

From 80fe123e62dad8317e724640e4ad81bd53beca66 Mon Sep 17 00:00:00 2001
From: Johan Pascal <johan.pascal@belledonne-communications.com>
Date: Tue, 24 Feb 2015 12:58:19 +0100
Subject: [PATCH 485/496] Add configure switch to enable usage of g729 Annex B
 in RFC3389 Comfort Noise payload

---
 configure.ac   | 10 ++++++++++
 mediastreamer2 |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index bde0a2872..d696bf31b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -638,6 +638,16 @@ AC_ARG_ENABLE(dtls,
 	[dtls=false]
 )
 
+AC_ARG_ENABLE(g729bCN,
+	[AS_HELP_STRING([--enable-g729bCN], [Turn on or off usage of G729AnnexB in RFC3389 implementation of Comfort Noise Payload (default=no)])],
+	[case "${enableval}" in
+		yes)	g729bCN=true ;;
+		no)	g729bCN=false ;;
+		*)	AC_MSG_ERROR(bad value ${enableval} for --enable-g729bCN) ;;
+	esac],
+	[g729bCN=false]
+)
+
 dnl build console if required
 AM_CONDITIONAL(BUILD_CONSOLE, test x$console_ui = xtrue)
 
diff --git a/mediastreamer2 b/mediastreamer2
index 3d23e9d8a..680421e38 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 3d23e9d8aee73fae6fc6bf68f432d43c00828c96
+Subproject commit 680421e382ac666d58866f00e1ac5693d939fc07

From 21f9d22b0a48171d09fe2980952b8981cc3c2274 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 24 Feb 2015 15:55:07 +0100
Subject: [PATCH 486/496] Added accept header in register

---
 coreapi/bellesip_sal/sal_op_registration.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/coreapi/bellesip_sal/sal_op_registration.c b/coreapi/bellesip_sal/sal_op_registration.c
index f6b6547a3..d56587db2 100644
--- a/coreapi/bellesip_sal/sal_op_registration.c
+++ b/coreapi/bellesip_sal/sal_op_registration.c
@@ -74,6 +74,7 @@ static void register_refresher_listener (belle_sip_refresher_t* refresher
 int sal_register(SalOp *op, const char *proxy, const char *from, int expires){
 	belle_sip_request_t *req;
 	belle_sip_uri_t* req_uri;
+	belle_sip_header_t* accept_header;
 	
 	if (op->refresher){
 		belle_sip_refresher_stop(op->refresher);
@@ -92,6 +93,8 @@ int sal_register(SalOp *op, const char *proxy, const char *from, int expires){
 		time_t curtime=time(NULL);
 		belle_sip_message_add_header(BELLE_SIP_MESSAGE(req),BELLE_SIP_HEADER(belle_sip_header_date_create_from_time(&curtime)));
 	}
+	accept_header = belle_sip_header_create("Accept", "application/sdp, text/plain, application/vnd.gsma.rcs-ft-http+xml");
+	belle_sip_message_add_header(BELLE_SIP_MESSAGE(req), accept_header);
 	belle_sip_message_set_header(BELLE_SIP_MESSAGE(req),(belle_sip_header_t*)sal_op_create_contact(op));
 	return sal_op_send_and_create_refresher(op,req,expires,register_refresher_listener);
 }

From 49a91becb72b3cc1e750e49773188a8f4e3c3016 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Tue, 24 Feb 2015 18:10:49 +0100
Subject: [PATCH 487/496] cleanups, add network simulation api to liblinphone

---
 coreapi/dict.c             |  2 +-
 coreapi/event.h            |  2 +-
 coreapi/help/doxygen.dox   |  6 ++++++
 coreapi/linphone_tunnel.cc | 24 ++---------------------
 coreapi/linphone_tunnel.h  |  4 ++--
 coreapi/linphonecall.c     |  3 ++-
 coreapi/linphonecore.h     | 21 ++++++++++++++++++++
 coreapi/misc.c             | 40 ++++++++++++++++++++++++++++++++++++++
 coreapi/private.h          |  1 +
 mediastreamer2             |  2 +-
 oRTP                       |  2 +-
 tester/call_tester.c       | 17 ++++++++--------
 12 files changed, 86 insertions(+), 38 deletions(-)

diff --git a/coreapi/dict.c b/coreapi/dict.c
index 4535e1a27..417bb33f0 100644
--- a/coreapi/dict.c
+++ b/coreapi/dict.c
@@ -27,7 +27,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 
 /**
- * @addtogroup linphone_dict
+ * @addtogroup misc
  * @{
 **/
 
diff --git a/coreapi/event.h b/coreapi/event.h
index 894f3e32a..fe3f984de 100644
--- a/coreapi/event.h
+++ b/coreapi/event.h
@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define LINPHONEEVENT_H
 
 /**
- * @addtogroup subscriptions
+ * @addtogroup event_api
  * @{
 **/
 
diff --git a/coreapi/help/doxygen.dox b/coreapi/help/doxygen.dox
index 0f8e094f4..a8baa5138 100644
--- a/coreapi/help/doxygen.dox
+++ b/coreapi/help/doxygen.dox
@@ -221,6 +221,12 @@ void text_received(LinphoneCore *lc, LinphoneChatRoom *room, const LinphoneAddre
  * 
 **/
 
+
+/**
+ * @defgroup event_api Managing generic subscriptions and publishes
+ * The LinphoneEvent api allows application to control subscriptions, receive notifications and make publish to peers, in a generic manner.
+ */
+
 /**
  * @defgroup misc Miscenalleous: logs, version strings, config storage
 **/
diff --git a/coreapi/linphone_tunnel.cc b/coreapi/linphone_tunnel.cc
index 9dd4e8adf..7dd27d890 100644
--- a/coreapi/linphone_tunnel.cc
+++ b/coreapi/linphone_tunnel.cc
@@ -29,8 +29,6 @@
 #include "private.h"
 #include "lpconfig.h"
 
-static const char *_tunnel_mode_str[3] = { "disable", "enable", "auto" };
-
 LinphoneTunnel* linphone_core_get_tunnel(const LinphoneCore *lc){
 	return lc->tunnel;
 }
@@ -234,7 +232,7 @@ void linphone_tunnel_clean_servers(LinphoneTunnel *tunnel){
 }
 
 void linphone_tunnel_set_mode(LinphoneTunnel *tunnel, LinphoneTunnelMode mode){
-	lp_config_set_string(config(tunnel),"tunnel","mode", tunnel_mode_to_string(mode));
+	lp_config_set_string(config(tunnel),"tunnel","mode", linphone_tunnel_mode_to_string(mode));
 	bcTunnel(tunnel)->setMode(mode);
 }
 
@@ -336,31 +334,13 @@ static void my_ortp_logv(OrtpLogLevel level, const char *fmt, va_list args){
 	ortp_logv(level,fmt,args);
 }
 
-LinphoneTunnelMode string_to_tunnel_mode(const char *string) {
-	if(string != NULL) {
-		int i;
-		for(i=0; i<3 && strcmp(string, _tunnel_mode_str[i]) != 0; i++);
-		if(i<3) {
-			return (LinphoneTunnelMode)i;
-		} else {
-			ms_error("Invalid tunnel mode '%s'", string);
-			return LinphoneTunnelModeDisable;
-		}
-	} else {
-		return LinphoneTunnelModeDisable;
-	}
-}
-
-const char *tunnel_mode_to_string(LinphoneTunnelMode mode) {
-	return _tunnel_mode_str[mode];
-}
 
 /**
  * Startup tunnel using configuration.
  * Called internally from linphonecore at startup.
  */
 void linphone_tunnel_configure(LinphoneTunnel *tunnel){
-	LinphoneTunnelMode mode = string_to_tunnel_mode(lp_config_get_string(config(tunnel), "tunnel", "mode", NULL));
+	LinphoneTunnelMode mode = linphone_tunnel_mode_from_string(lp_config_get_string(config(tunnel), "tunnel", "mode", NULL));
 	bool_t tunnelizeSIPPackets = (bool_t)lp_config_get_int(config(tunnel), "tunnel", "sip", TRUE);
 	linphone_tunnel_enable_logs_with_handler(tunnel,TRUE,my_ortp_logv);
 	linphone_tunnel_load_config(tunnel);
diff --git a/coreapi/linphone_tunnel.h b/coreapi/linphone_tunnel.h
index f071f3c37..c1c378ed3 100644
--- a/coreapi/linphone_tunnel.h
+++ b/coreapi/linphone_tunnel.h
@@ -65,14 +65,14 @@ typedef enum _LinphoneTunnelMode {
  * @return An LinphoneTunnelMode enum. If the passed string is NULL or
  * does not match with any mode, the LinphoneTunnelModeDisable is returned.
  */
-LINPHONE_PUBLIC LinphoneTunnelMode string_to_tunnel_mode(const char *string);
+LINPHONE_PUBLIC LinphoneTunnelMode linphone_tunnel_mode_from_string(const char *string);
 
 /**
  * Convert a tunnel mode enum into string
  * @param mode Enum to convert
  * @return "disable", "enable" or "auto"
  */
-LINPHONE_PUBLIC const char *tunnel_mode_to_string(LinphoneTunnelMode mode);
+LINPHONE_PUBLIC const char *linphone_tunnel_mode_to_string(LinphoneTunnelMode mode);
 
 /**
  * Create a new tunnel configuration
diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index b118b163f..94573cad1 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -1863,7 +1863,7 @@ void linphone_call_init_audio_stream(LinphoneCall *call){
 				call->media_ports[0].mcast_rtp_port ? call->media_ports[0].mcast_rtp_port : call->media_ports[0].rtp_port, 
 				call->media_ports[0].mcast_rtcp_port ? call->media_ports[0].mcast_rtcp_port : call->media_ports[0].rtcp_port);
 		linphone_call_join_multicast_group(call, 0, &audiostream->ms);
-		
+		rtp_session_enable_network_simulation(call->audiostream->ms.sessions.rtp_session, &lc->net_conf.netsim_params);
 		cname = linphone_address_as_string_uri_only(call->me);
 		audio_stream_set_rtcp_information(call->audiostream, cname, rtcp_tool);
 		ms_free(cname);
@@ -1972,6 +1972,7 @@ void linphone_call_init_video_stream(LinphoneCall *call){
 				call->media_ports[1].mcast_rtp_port>0 ?  call->media_ports[1].mcast_rtp_port : call->media_ports[1].rtp_port,
 				call->media_ports[1].mcast_rtcp_port>0 ? call->media_ports[1].mcast_rtcp_port : call->media_ports[1].rtcp_port);
 			linphone_call_join_multicast_group(call, 1, &call->videostream->ms);
+			rtp_session_enable_network_simulation(call->videostream->ms.sessions.rtp_session, &lc->net_conf.netsim_params);
 			cname = linphone_address_as_string_uri_only(call->me);
 			video_stream_set_rtcp_information(call->videostream, cname, rtcp_tool);
 			ms_free(cname);
diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h
index 7e3994706..5f1e4f5c2 100644
--- a/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@ -3481,6 +3481,27 @@ LINPHONE_PUBLIC void linphone_core_enable_video_multicast(LinphoneCore *core, bo
 **/
 LINPHONE_PUBLIC bool_t linphone_core_video_multicast_enabled(const LinphoneCore *core);
 
+/**
+ * Set the network simulator parameters.
+ * Liblinphone has the capabability of simulating the effects of a network (latency, lost packets, jitter, max bandwidth).
+ * Please refer to the oRTP documentation for the meaning of the parameters of the OrtpNetworkSimulatorParams structure.
+ * This function has effect for future calls, but not for currently running calls, though this behavior may be changed in future versions.
+ * @warning Due to design of network simulation in oRTP, simulation is applied independently for audio and video stream. This means for example that a bandwidth
+ * limit of 250kbit/s will have no effect on an audio stream running at 40kbit/s while a videostream targetting 400kbit/s will be highly affected.
+ * @param lc the LinphoneCore
+ * @param params the parameters used for the network simulation.
+ * @return 0 if successful, -1 otherwise.
+**/
+LINPHONE_PUBLIC int linphone_core_set_network_simulator_params(LinphoneCore *lc, const OrtpNetworkSimulatorParams *params);
+
+
+/**
+ * Get the previously set network simulation parameters.
+ * @see linphone_core_set_network_simulator_params
+ * @return a OrtpNetworkSimulatorParams structure.
+**/
+LINPHONE_PUBLIC const OrtpNetworkSimulatorParams *linphone_core_get_network_simulator_params(const LinphoneCore *lc);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/coreapi/misc.c b/coreapi/misc.c
index 5912acc8f..666ac8919 100644
--- a/coreapi/misc.c
+++ b/coreapi/misc.c
@@ -1600,3 +1600,43 @@ bool_t linphone_core_symmetric_rtp_enabled(LinphoneCore*lc){
 	return lp_config_get_int(lc->config,"rtp","symmetric",1);
 }
 
+int linphone_core_set_network_simulator_params(LinphoneCore *lc, const OrtpNetworkSimulatorParams *params){
+	if (params!=&lc->net_conf.netsim_params)
+		lc->net_conf.netsim_params=*params;
+	/*TODO: should we make some sanity checks on the parameters here*/
+	return 0;
+}
+
+const OrtpNetworkSimulatorParams *linphone_core_get_network_simulator_params(const LinphoneCore *lc){
+	return &lc->net_conf.netsim_params;
+}
+
+static const char *_tunnel_mode_str[3] = { "disable", "enable", "auto" };
+
+LinphoneTunnelMode linphone_tunnel_mode_from_string(const char *string) {
+	if(string != NULL) {
+		int i;
+		for(i=0; i<3 && strcmp(string, _tunnel_mode_str[i]) != 0; i++);
+		if(i<3) {
+			return (LinphoneTunnelMode)i;
+		} else {
+			ms_error("Invalid tunnel mode '%s'", string);
+			return LinphoneTunnelModeDisable;
+		}
+	} else {
+		return LinphoneTunnelModeDisable;
+	}
+}
+
+const char *linphone_tunnel_mode_to_string(LinphoneTunnelMode mode) {
+	switch(mode){
+		case LinphoneTunnelModeAuto:
+			return "auto";
+		case LinphoneTunnelModeDisable:
+			return "disable";
+		case LinphoneTunnelModeEnable:
+			return "enable";
+	}
+	return "invalid";
+}
+
diff --git a/coreapi/private.h b/coreapi/private.h
index 4414f50ec..d08c569ff 100644
--- a/coreapi/private.h
+++ b/coreapi/private.h
@@ -622,6 +622,7 @@ typedef struct net_config
 	int download_bw;
 	int upload_bw;
 	int mtu;
+	OrtpNetworkSimulatorParams netsim_params;
 	bool_t nat_sdp_only;
 }net_config_t;
 
diff --git a/mediastreamer2 b/mediastreamer2
index 680421e38..0765d7dc4 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 680421e382ac666d58866f00e1ac5693d939fc07
+Subproject commit 0765d7dc442b85e3ecb27c7e1678dde2adecb3f1
diff --git a/oRTP b/oRTP
index 60f6d0f90..d515df047 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 60f6d0f909eddcefc83960f791ff30097c1e5c33
+Subproject commit d515df047678da3777b5e4691dc069c6837f77bf
diff --git a/tester/call_tester.c b/tester/call_tester.c
index 5442364d7..326a2a29e 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -2354,18 +2354,18 @@ void call_base(LinphoneMediaEncryption mode, bool_t enable_video,bool_t enable_r
 
 		}
 
-		if (policy == LinphonePolicyUseIce)
+		if (policy == LinphonePolicyUseIce){
+			int i=0;
 			CU_ASSERT_TRUE(check_ice(pauline,marie,enable_tunnel?LinphoneIceStateReflexiveConnection:LinphoneIceStateHostConnection));
+			for (i=0;i<100;i++) { /*fixme to workaround a crash*/
+				ms_usleep(20000);
+				linphone_core_iterate(marie->lc);
+				linphone_core_iterate(pauline->lc);
+			}
+		}
 #ifdef VIDEO_ENABLED
 		if (enable_video) {
-			int i=0;
 			if (linphone_core_video_supported(marie->lc)) {
-				for (i=0;i<100;i++) { /*fixme to workaround a crash*/
-					ms_usleep(20000);
-					linphone_core_iterate(marie->lc);
-					linphone_core_iterate(pauline->lc);
-				}
-
 				add_video(pauline,marie);
 				if (policy == LinphonePolicyUseIce)
 					CU_ASSERT_TRUE(check_ice(pauline,marie,enable_tunnel?LinphoneIceStateReflexiveConnection:LinphoneIceStateHostConnection));
@@ -2376,7 +2376,6 @@ void call_base(LinphoneMediaEncryption mode, bool_t enable_video,bool_t enable_r
 			} else {
 				ms_warning ("not tested because video not available");
 			}
-
 		}
 #endif
 

From 2a2ef0f94d8afe8218605fc0a61bdc533b88f736 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Tue, 24 Feb 2015 18:22:41 +0100
Subject: [PATCH 488/496] fix compile issue

---
 coreapi/TunnelManager.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/coreapi/TunnelManager.cc b/coreapi/TunnelManager.cc
index bbce579a3..128707a12 100644
--- a/coreapi/TunnelManager.cc
+++ b/coreapi/TunnelManager.cc
@@ -202,8 +202,8 @@ void TunnelManager::setMode(LinphoneTunnelMode mode) {
 		return;
 	}
 	ms_message("TunnelManager: switching mode from %s to %s",
-			   tunnel_mode_to_string(mMode),
-			   tunnel_mode_to_string(mode));
+			   linphone_tunnel_mode_to_string(mMode),
+			   linphone_tunnel_mode_to_string(mode));
 	switch(mode) {
 	case LinphoneTunnelModeEnable:
 		if(mState == disabled) {

From 6057309befaf9fc60452483d41addd9411f752e4 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Tue, 24 Feb 2015 19:21:36 +0100
Subject: [PATCH 489/496] update ms2

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 0765d7dc4..785d2e628 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 0765d7dc442b85e3ecb27c7e1678dde2adecb3f1
+Subproject commit 785d2e6282b9f6fb6579ce221d6d8d67f58d5b43

From 32c226da910fbe6c202707ed25f41c90082d17a8 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Tue, 24 Feb 2015 21:31:35 +0100
Subject: [PATCH 490/496] avoid crash in a failed test

---
 tester/dtmf_tester.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tester/dtmf_tester.c b/tester/dtmf_tester.c
index 1c80c21c6..c4c2e3bfe 100644
--- a/tester/dtmf_tester.c
+++ b/tester/dtmf_tester.c
@@ -46,6 +46,10 @@ void send_dtmf_base(bool_t use_rfc2833, bool_t use_sipinfo, char dtmf, char* dtm
 	CU_ASSERT_TRUE(call(pauline,marie));
 
 	marie_call = linphone_core_get_current_call(marie->lc);
+	
+	CU_ASSERT_PTR_NOT_NULL(marie_call);
+	
+	if (!marie_call) return;
 
 	if (dtmf != '\0') {
 		dtmf_count_prev = pauline->stat.dtmf_count;

From c7aa499ddb1ca9c0f330ba4c0e39eecdd11564bd Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Tue, 24 Feb 2015 22:12:15 +0100
Subject: [PATCH 491/496] telephone-event and confort noise are not so
 necessary in video streams, actually.

---
 coreapi/linphonecall.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index 94573cad1..f877feae6 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -356,9 +356,8 @@ typedef struct _CodecConstraints{
 	MSList *previously_used;
 }CodecConstraints;
 
-static MSList *make_codec_list(LinphoneCore *lc, CodecConstraints * hints, const MSList *codecs){
+static MSList *make_codec_list(LinphoneCore *lc, CodecConstraints * hints, SalStreamType stype, const MSList *codecs){
 	MSList *l=NULL;
-	MSList *specials=NULL;
 	const MSList *it;
 	int nb = 0;
 
@@ -389,8 +388,10 @@ static MSList *make_codec_list(LinphoneCore *lc, CodecConstraints * hints, const
 		nb++;
 		if ((hints->max_codecs > 0) && (nb >= hints->max_codecs)) break;
 	}
-	specials=create_special_payload_types(lc,l);
-	l=ms_list_concat(l,specials);
+	if (stype==SalAudio){
+		MSList *specials=create_special_payload_types(lc,l);
+		l=ms_list_concat(l,specials);
+	}
 	linphone_core_assign_payload_type_numbers(lc, l);
 	return l;
 }
@@ -633,7 +634,7 @@ void linphone_call_make_local_media_description(LinphoneCore *lc, LinphoneCall *
 	codec_hints.bandwidth_limit=call->params->audio_bw;
 	codec_hints.max_codecs=-1;
 	codec_hints.previously_used=old_md ? old_md->streams[0].already_assigned_payloads : NULL;
-	l=make_codec_list(lc, &codec_hints, lc->codecs_conf.audio_codecs);
+	l=make_codec_list(lc, &codec_hints, SalAudio, lc->codecs_conf.audio_codecs);
 	md->streams[0].max_rate=get_max_codec_sample_rate(l);
 	md->streams[0].payloads=l;
 	if (call->audiostream && call->audiostream->ms.sessions.rtp_session) {
@@ -658,7 +659,7 @@ void linphone_call_make_local_media_description(LinphoneCore *lc, LinphoneCall *
 		codec_hints.bandwidth_limit=0;
 		codec_hints.max_codecs=-1;
 		codec_hints.previously_used=old_md ? old_md->streams[1].already_assigned_payloads : NULL;
-		l=make_codec_list(lc, &codec_hints, lc->codecs_conf.video_codecs);
+		l=make_codec_list(lc, &codec_hints, SalVideo, lc->codecs_conf.video_codecs);
 		md->streams[1].payloads=l;
 		if (call->videostream && call->videostream->ms.sessions.rtp_session) {
 			char* me = linphone_address_as_string_uri_only(call->me);
@@ -684,7 +685,7 @@ void linphone_call_make_local_media_description(LinphoneCore *lc, LinphoneCall *
 		codec_hints.bandwidth_limit=0;
 		codec_hints.max_codecs=1;
 		codec_hints.previously_used=NULL;
-		l = make_codec_list(lc, &codec_hints, lc->codecs_conf.video_codecs);
+		l = make_codec_list(lc, &codec_hints, SalVideo, lc->codecs_conf.video_codecs);
 		md->streams[i].payloads = l;
 	}
 	setup_encryption_keys(call,md);

From 8906700884487b91bfdc12c40abbc2f2dc9f0173 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Wed, 25 Feb 2015 09:05:08 +0100
Subject: [PATCH 492/496] robustize tests

---
 tester/call_tester.c | 43 +++++++++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/tester/call_tester.c b/tester/call_tester.c
index 326a2a29e..aa01fb48f 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -3078,28 +3078,35 @@ static void multiple_early_media(void) {
 	marie1_call=linphone_core_get_current_call(marie1->lc);
 	marie2_call=linphone_core_get_current_call(marie2->lc);
 
-	/*wait a bit that streams are established*/
-	wait_for_list(lcs,&dummy,1,6000);
-	CU_ASSERT_TRUE(linphone_call_get_audio_stats(pauline_call)->download_bandwidth>70);
-	CU_ASSERT_TRUE(linphone_call_get_audio_stats(marie1_call)->download_bandwidth>70);
-	CU_ASSERT_TRUE(linphone_call_get_audio_stats(marie2_call)->download_bandwidth>70);
+	CU_ASSERT_PTR_NOT_NULL(pauline_call);
+	CU_ASSERT_PTR_NOT_NULL(marie1_call);
+	CU_ASSERT_PTR_NOT_NULL(marie2_call);
+	
+	if (pauline_call && marie1_call && marie2_call){
+	
+		/*wait a bit that streams are established*/
+		wait_for_list(lcs,&dummy,1,6000);
+		CU_ASSERT_TRUE(linphone_call_get_audio_stats(pauline_call)->download_bandwidth>70);
+		CU_ASSERT_TRUE(linphone_call_get_audio_stats(marie1_call)->download_bandwidth>70);
+		CU_ASSERT_TRUE(linphone_call_get_audio_stats(marie2_call)->download_bandwidth>70);
 
-	linphone_core_accept_call(marie1->lc,linphone_core_get_current_call(marie1->lc));
-	CU_ASSERT_TRUE(wait_for_list(lcs,&marie1->stat.number_of_LinphoneCallStreamsRunning,1,3000));
-	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallStreamsRunning,1,3000));
+		linphone_core_accept_call(marie1->lc,linphone_core_get_current_call(marie1->lc));
+		CU_ASSERT_TRUE(wait_for_list(lcs,&marie1->stat.number_of_LinphoneCallStreamsRunning,1,3000));
+		CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallStreamsRunning,1,3000));
 
-	/*marie2 should get her call terminated*/
-	CU_ASSERT_TRUE(wait_for_list(lcs,&marie2->stat.number_of_LinphoneCallEnd,1,1000));
+		/*marie2 should get her call terminated*/
+		CU_ASSERT_TRUE(wait_for_list(lcs,&marie2->stat.number_of_LinphoneCallEnd,1,1000));
 
-	/*wait a bit that streams are established*/
-	wait_for_list(lcs,&dummy,1,3000);
-	CU_ASSERT_TRUE(linphone_call_get_audio_stats(pauline_call)->download_bandwidth>71);
-	CU_ASSERT_TRUE(linphone_call_get_audio_stats(marie1_call)->download_bandwidth>71);
+		/*wait a bit that streams are established*/
+		wait_for_list(lcs,&dummy,1,3000);
+		CU_ASSERT_TRUE(linphone_call_get_audio_stats(pauline_call)->download_bandwidth>71);
+		CU_ASSERT_TRUE(linphone_call_get_audio_stats(marie1_call)->download_bandwidth>71);
 
-	/*send an INFO in reverse side to check that dialogs are properly established*/
-	info=linphone_core_create_info_message(marie1->lc);
-	linphone_call_send_info_message(marie1_call,info);
-	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_inforeceived,1,3000));
+		/*send an INFO in reverse side to check that dialogs are properly established*/
+		info=linphone_core_create_info_message(marie1->lc);
+		linphone_call_send_info_message(marie1_call,info);
+		CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_inforeceived,1,3000));
+	}
 
 	linphone_core_terminate_all_calls(pauline->lc);
 	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallEnd,1,3000));

From f940c5098bb72fddea574528ac1f560cc2756fb7 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Wed, 25 Feb 2015 09:12:34 +0100
Subject: [PATCH 493/496] update ms2

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 785d2e628..73cd58c02 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 785d2e6282b9f6fb6579ce221d6d8d67f58d5b43
+Subproject commit 73cd58c02e540ac0017c36729510cba97088c42f

From 084e21cbde56fb71f1cf5de1b243c8f9c9016b05 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Tue, 24 Feb 2015 18:17:34 +0100
Subject: [PATCH 494/496] fix dtls sdp path when dtls attribute are in sdp
 session

---
 coreapi/bellesip_sal/sal_sdp.c | 33 ++++++++++++---------------------
 1 file changed, 12 insertions(+), 21 deletions(-)

diff --git a/coreapi/bellesip_sal/sal_sdp.c b/coreapi/bellesip_sal/sal_sdp.c
index 1504b25c6..806b50e10 100644
--- a/coreapi/bellesip_sal/sal_sdp.c
+++ b/coreapi/bellesip_sal/sal_sdp.c
@@ -674,8 +674,6 @@ static SalStreamDescription * sdp_to_stream_description(SalMediaDescription *md,
 	stream=&md->streams[md->nb_streams];
 	media=belle_sdp_media_description_get_media ( media_desc );
 
-	memset ( stream,0,sizeof ( *stream ) );
-
 	proto = belle_sdp_media_get_protocol ( media );
 	stream->proto=SalProtoOther;
 	if ( proto ) {
@@ -748,8 +746,6 @@ static SalStreamDescription * sdp_to_stream_description(SalMediaDescription *md,
 	}
 
 	/* Read DTLS specific attributes : check is some are found in the stream description otherwise copy the session description one(which are at least set to Invalid) */
-	stream->dtls_role = SalDtlsRoleInvalid;
-	stream->dtls_fingerprint[0] = '\0';
 	if (((stream->proto == SalProtoUdpTlsRtpSavpf) || (stream->proto == SalProtoUdpTlsRtpSavp))) {
 		attribute=belle_sdp_media_description_get_attribute(media_desc,"setup");
 		if (attribute && (value=belle_sdp_attribute_get_value(attribute))!=NULL){
@@ -760,10 +756,9 @@ static SalStreamDescription * sdp_to_stream_description(SalMediaDescription *md,
 			} else if (strncmp(value, "passive", 7) == 0) {
 				stream->dtls_role = SalDtlsRoleIsServer;
 			}
-			if (stream->dtls_role != SalDtlsRoleInvalid) {
-				attribute=belle_sdp_media_description_get_attribute(media_desc,"fingerprint");
-				strncpy(stream->dtls_fingerprint, belle_sdp_attribute_get_value(attribute),sizeof(stream->dtls_fingerprint));
-			}
+		}
+		if (stream->dtls_role != SalDtlsRoleInvalid && (attribute=belle_sdp_media_description_get_attribute(media_desc,"fingerprint"))) {
+			strncpy(stream->dtls_fingerprint, belle_sdp_attribute_get_value(attribute),sizeof(stream->dtls_fingerprint));
 		}
 	}
 
@@ -796,6 +791,8 @@ int sdp_to_media_description ( belle_sdp_session_description_t  *session_desc, S
 	belle_sdp_media_description_t* media_desc;
 	belle_sdp_session_name_t *sname;
 	const char* value;
+	SalDtlsRole session_role=SalDtlsRoleInvalid;
+	int i;
 	
 	desc->nb_streams = 0;
 	desc->dir = SalStreamSendRecv;
@@ -825,7 +822,6 @@ int sdp_to_media_description ( belle_sdp_session_description_t  *session_desc, S
 	/*DTLS attributes can be defined at session level.*/
 	value=belle_sdp_session_description_get_attribute_value(session_desc,"setup");
 	if (value){
-		SalDtlsRole session_role=SalDtlsRoleInvalid;
 		if (strncmp(value, "actpass", 7) == 0) {
 			session_role = SalDtlsRoleUnset;
 		} else if (strncmp(value, "active", 6) == 0) {
@@ -833,19 +829,14 @@ int sdp_to_media_description ( belle_sdp_session_description_t  *session_desc, S
 		} else if (strncmp(value, "passive", 7) == 0) {
 			session_role = SalDtlsRoleIsServer;
 		}
-		value=belle_sdp_session_description_get_attribute_value(session_desc,"fingerprint");
-		if (value){
-			int i;
-			/*copy dtls attributes to every streams, might be overwritten stream by stream*/
-			for (i=0;i<SAL_MEDIA_DESCRIPTION_MAX_STREAMS;i++) {
-				strncpy(desc->streams[i].dtls_fingerprint, value, sizeof(desc->streams[i].dtls_fingerprint));
-				desc->streams[i].dtls_role=session_role;
-			}
-		}
-
 	}
-
-
+	value=belle_sdp_session_description_get_attribute_value(session_desc,"fingerprint");
+	/*copy dtls attributes to every streams, might be overwritten stream by stream*/
+	for (i=0;i<SAL_MEDIA_DESCRIPTION_MAX_STREAMS;i++) {
+		if (value)
+			strncpy(desc->streams[i].dtls_fingerprint, value, sizeof(desc->streams[i].dtls_fingerprint));
+		desc->streams[i].dtls_role=session_role; /*set or reset value*/
+	}
 
 	/* Get ICE remote ufrag and remote pwd, and ice_lite flag */
 	value=belle_sdp_session_description_get_attribute_value(session_desc,"ice-ufrag");

From ccf541c8e7fad78c6ffba1c206ed55012687aebf Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Wed, 25 Feb 2015 10:31:25 +0100
Subject: [PATCH 495/496] robustize tests

---
 mediastreamer2       |   2 +-
 tester/call_tester.c | 236 +++++++++++++++++++++++--------------------
 2 files changed, 126 insertions(+), 112 deletions(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 73cd58c02..938c6e4ca 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 73cd58c02e540ac0017c36729510cba97088c42f
+Subproject commit 938c6e4cade5c09e6cfa5a5e9189007f8323f3d0
diff --git a/tester/call_tester.c b/tester/call_tester.c
index aa01fb48f..7171e22b9 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -2684,32 +2684,35 @@ static void unattended_call_transfer_with_error(void) {
 	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
 	LinphoneCall* pauline_called_by_marie;
-
+	bool_t call_ok=TRUE;
 	MSList* lcs=ms_list_append(NULL,marie->lc);
+	
 	lcs=ms_list_append(lcs,pauline->lc);
 
-	CU_ASSERT_TRUE(call(marie,pauline));
-	pauline_called_by_marie=linphone_core_get_current_call(marie->lc);
+	CU_ASSERT_TRUE((call_ok=call(marie,pauline)));
+	if (call_ok){
+		pauline_called_by_marie=linphone_core_get_current_call(marie->lc);
 
-	reset_counters(&marie->stat);
-	reset_counters(&pauline->stat);
+		reset_counters(&marie->stat);
+		reset_counters(&pauline->stat);
 
-	linphone_core_transfer_call(marie->lc,pauline_called_by_marie,"unknown_user");
-	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallRefered,1,2000));
+		linphone_core_transfer_call(marie->lc,pauline_called_by_marie,"unknown_user");
+		CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallRefered,1,2000));
 
-	/*Pauline starts the transfer*/
-	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallOutgoingInit,1,2000));
-	/* and immediately get an error*/
-	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallError,1,2000));
+		/*Pauline starts the transfer*/
+		CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallOutgoingInit,1,2000));
+		/* and immediately get an error*/
+		CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallError,1,2000));
 
-	/*the error must be reported back to marie*/
-	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneTransferCallError,1,2000));
+		/*the error must be reported back to marie*/
+		CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneTransferCallError,1,2000));
 
-	/*and pauline should resume the call automatically*/
-	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallResuming,1,2000));
+		/*and pauline should resume the call automatically*/
+		CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallResuming,1,2000));
 
-	/*and call should be resumed*/
-	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallStreamsRunning,1,2000));
+		/*and call should be resumed*/
+		CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallStreamsRunning,1,2000));
+	}
 
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
@@ -2721,70 +2724,71 @@ static void call_transfer_existing_call_outgoing_call(void) {
 	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
 	LinphoneCoreManager* laure = linphone_core_manager_new( "laure_rc");
-
 	LinphoneCall* marie_call_pauline;
 	LinphoneCall* pauline_called_by_marie;
 	LinphoneCall* marie_call_laure;
 	LinphoneCall* laure_called_by_marie;
 	LinphoneCall* lcall;
-
-	MSList* lcs=ms_list_append(NULL,marie->lc);
+	bool_t call_ok=TRUE;
 	const MSList* calls;
-
+	MSList* lcs=ms_list_append(NULL,marie->lc);
+	
 	lcs=ms_list_append(lcs,pauline->lc);
 	lcs=ms_list_append(lcs,laure->lc);
 
 	/*marie call pauline*/
-	CU_ASSERT_TRUE(call(marie,pauline));
-	marie_call_pauline=linphone_core_get_current_call(marie->lc);
-	pauline_called_by_marie=linphone_core_get_current_call(pauline->lc);
-	/*marie pause pauline*/
-	CU_ASSERT_TRUE(pause_call_1(marie,marie_call_pauline,pauline,pauline_called_by_marie));
+	CU_ASSERT_TRUE((call_ok=call(marie,pauline)));
+	if (call_ok){
+		marie_call_pauline=linphone_core_get_current_call(marie->lc);
+		pauline_called_by_marie=linphone_core_get_current_call(pauline->lc);
+		/*marie pause pauline*/
+		CU_ASSERT_TRUE(pause_call_1(marie,marie_call_pauline,pauline,pauline_called_by_marie));
 
-	/*marie call laure*/
-	CU_ASSERT_TRUE(call(marie,laure));
-	marie_call_laure=linphone_core_get_current_call(marie->lc);
-	laure_called_by_marie=linphone_core_get_current_call(laure->lc);
-	/*marie pause laure*/
-	CU_ASSERT_TRUE(pause_call_1(marie,marie_call_laure,laure,laure_called_by_marie));
+		/*marie call laure*/
+		CU_ASSERT_TRUE(call(marie,laure));
+		marie_call_laure=linphone_core_get_current_call(marie->lc);
+		laure_called_by_marie=linphone_core_get_current_call(laure->lc);
+		/*marie pause laure*/
+		CU_ASSERT_TRUE(pause_call_1(marie,marie_call_laure,laure,laure_called_by_marie));
 
-	reset_counters(&marie->stat);
-	reset_counters(&pauline->stat);
-	reset_counters(&laure->stat);
+		reset_counters(&marie->stat);
+		reset_counters(&pauline->stat);
+		reset_counters(&laure->stat);
 
 
-	linphone_core_transfer_call_to_another(marie->lc,marie_call_pauline,marie_call_laure);
-	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallRefered,1,2000));
+		linphone_core_transfer_call_to_another(marie->lc,marie_call_pauline,marie_call_laure);
+		CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallRefered,1,2000));
 
-	/*pauline pausing marie*/
-	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallPausing,1,4000));
-	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallPaused,1,4000));
-	/*pauline calling laure*/
-	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallOutgoingProgress,1,2000));
-	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneTransferCallOutgoingInit,1,2000));
-	CU_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallIncomingReceived,1,2000));
-	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallOutgoingRinging,1,2000));
-	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneTransferCallOutgoingProgress,1,2000));
+		/*pauline pausing marie*/
+		CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallPausing,1,4000));
+		CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallPaused,1,4000));
+		/*pauline calling laure*/
+		CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallOutgoingProgress,1,2000));
+		CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneTransferCallOutgoingInit,1,2000));
+		CU_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallIncomingReceived,1,2000));
+		CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallOutgoingRinging,1,2000));
+		CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneTransferCallOutgoingProgress,1,2000));
 
-	/*laure accept call*/
-	for(calls=linphone_core_get_calls(laure->lc);calls!=NULL;calls=calls->next) {
-		lcall = (LinphoneCall*)calls->data;
-		if (linphone_call_get_state(lcall) == LinphoneCallIncomingReceived) {
-			CU_ASSERT_EQUAL(linphone_call_get_replaced_call(lcall),laure_called_by_marie);
-			linphone_core_accept_call(laure->lc,lcall);
-			break;
+		/*laure accept call*/
+		for(calls=linphone_core_get_calls(laure->lc);calls!=NULL;calls=calls->next) {
+			lcall = (LinphoneCall*)calls->data;
+			if (linphone_call_get_state(lcall) == LinphoneCallIncomingReceived) {
+				CU_ASSERT_EQUAL(linphone_call_get_replaced_call(lcall),laure_called_by_marie);
+				linphone_core_accept_call(laure->lc,lcall);
+				break;
+			}
 		}
-	}
-	CU_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallConnected,1,2000));
-	CU_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallStreamsRunning,1,2000));
-	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallConnected,1,2000));
-	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallStreamsRunning,1,2000));
-	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneTransferCallConnected,1,2000));
+		CU_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallConnected,1,2000));
+		CU_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallStreamsRunning,1,2000));
+		CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallConnected,1,2000));
+		CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallStreamsRunning,1,2000));
+		CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneTransferCallConnected,1,2000));
 
-	/*terminate marie to pauline/laure call*/
-	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallEnd,1,2000));
-	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallEnd,2,2000));
-	CU_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallEnd,1,2000));
+		/*terminate marie to pauline/laure call*/
+		CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallEnd,1,2000));
+		CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallEnd,2,2000));
+		CU_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallEnd,1,2000));
+	}
 
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
@@ -2797,31 +2801,35 @@ static void check_call_state(LinphoneCoreManager* mgr,LinphoneCallState state) {
 	if (linphone_core_get_current_call(mgr->lc))
 		CU_ASSERT_EQUAL(linphone_call_get_state(linphone_core_get_current_call(mgr->lc)),state);
 }
+
 static void call_established_with_rejected_info(void) {
 	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
 	int dummy=0;
+	bool_t call_ok=FALSE;
 
-	CU_ASSERT_TRUE(call(pauline,marie));
+	CU_ASSERT_TRUE((call_ok=call(pauline,marie)));
+	if (call_ok){
 
-	sal_enable_unconditional_answer(marie->lc->sal,TRUE);
-	linphone_call_send_info_message(linphone_core_get_current_call(pauline->lc),linphone_core_create_info_message(pauline->lc));
+		sal_enable_unconditional_answer(marie->lc->sal,TRUE);
+		linphone_call_send_info_message(linphone_core_get_current_call(pauline->lc),linphone_core_create_info_message(pauline->lc));
 
-	wait_for_until(marie->lc,pauline->lc,&dummy,1,1000); /*just to sleep while iterating 1s*/
+		wait_for_until(marie->lc,pauline->lc,&dummy,1,1000); /*just to sleep while iterating 1s*/
 
-	sal_enable_unconditional_answer(marie->lc->sal,FALSE);
+		sal_enable_unconditional_answer(marie->lc->sal,FALSE);
 
-	linphone_call_send_info_message(linphone_core_get_current_call(pauline->lc),linphone_core_create_info_message(pauline->lc));
-	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_inforeceived,1));
-	CU_ASSERT_EQUAL(marie->stat.number_of_inforeceived,1);
+		linphone_call_send_info_message(linphone_core_get_current_call(pauline->lc),linphone_core_create_info_message(pauline->lc));
+		CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_inforeceived,1));
+		CU_ASSERT_EQUAL(marie->stat.number_of_inforeceived,1);
 
-	check_call_state(pauline,LinphoneCallStreamsRunning);
-	check_call_state(marie,LinphoneCallStreamsRunning);
+		check_call_state(pauline,LinphoneCallStreamsRunning);
+		check_call_state(marie,LinphoneCallStreamsRunning);
 
-	/*just to sleep*/
-	linphone_core_terminate_all_calls(pauline->lc);
-	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,1));
-	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1));
+		/*just to sleep*/
+		linphone_core_terminate_all_calls(pauline->lc);
+		CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,1));
+		CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1));
+	}
 
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
@@ -2831,30 +2839,32 @@ static void call_established_with_rejected_info(void) {
 static void call_established_with_rejected_reinvite(void) {
 	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
+	bool_t call_ok=FALSE;
 
-	CU_ASSERT_TRUE(call(pauline,marie));
-
-	linphone_core_enable_payload_type(pauline->lc,linphone_core_find_payload_type(pauline->lc,"PCMU",8000,1),FALSE); /*disable PCMU*/
-	linphone_core_enable_payload_type(pauline->lc,linphone_core_find_payload_type(pauline->lc,"PCMA",8000,1),TRUE); /*enable PCMA*/
+	CU_ASSERT_TRUE(call_ok=call(pauline,marie));
+	if (call_ok){
+		linphone_core_enable_payload_type(pauline->lc,linphone_core_find_payload_type(pauline->lc,"PCMU",8000,1),FALSE); /*disable PCMU*/
+		linphone_core_enable_payload_type(pauline->lc,linphone_core_find_payload_type(pauline->lc,"PCMA",8000,1),TRUE); /*enable PCMA*/
 
 
-	linphone_core_update_call(	pauline->lc
-								,linphone_core_get_current_call(pauline->lc)
-								,linphone_call_get_current_params(linphone_core_get_current_call(pauline->lc)));
+		linphone_core_update_call(	pauline->lc
+									,linphone_core_get_current_call(pauline->lc)
+									,linphone_call_get_current_params(linphone_core_get_current_call(pauline->lc)));
 
 
-	CU_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&pauline->stat.number_of_LinphoneCallStreamsRunning,2));
+		CU_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&pauline->stat.number_of_LinphoneCallStreamsRunning,2));
 
-	CU_ASSERT_EQUAL(linphone_call_get_reason(linphone_core_get_current_call(pauline->lc)),LinphoneReasonNotAcceptable);
+		CU_ASSERT_EQUAL(linphone_call_get_reason(linphone_core_get_current_call(pauline->lc)),LinphoneReasonNotAcceptable);
 
-	CU_ASSERT_EQUAL(marie->stat.number_of_LinphoneCallStreamsRunning,1);
-	check_call_state(pauline,LinphoneCallStreamsRunning);
-	check_call_state(marie,LinphoneCallStreamsRunning);
+		CU_ASSERT_EQUAL(marie->stat.number_of_LinphoneCallStreamsRunning,1);
+		check_call_state(pauline,LinphoneCallStreamsRunning);
+		check_call_state(marie,LinphoneCallStreamsRunning);
 
-	/*just to sleep*/
-	linphone_core_terminate_all_calls(pauline->lc);
-	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,1));
-	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1));
+		/*just to sleep*/
+		linphone_core_terminate_all_calls(pauline->lc);
+		CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,1));
+		CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1));
+	}
 
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
@@ -2863,33 +2873,37 @@ static void call_established_with_rejected_reinvite(void) {
 static void call_established_with_rejected_incoming_reinvite(void) {
 	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
+	bool_t call_ok=FALSE;
 
-	CU_ASSERT_TRUE(call(pauline,marie));
+	CU_ASSERT_TRUE((call_ok=call(pauline,marie)));
+	
+	if (call_ok){
 
-	/*wait for ACK to be transmitted before going to reINVITE*/
-	wait_for_until(marie->lc,pauline->lc,NULL,0,1000);
+		/*wait for ACK to be transmitted before going to reINVITE*/
+		wait_for_until(marie->lc,pauline->lc,NULL,0,1000);
 
-	linphone_core_enable_payload_type(pauline->lc,linphone_core_find_payload_type(pauline->lc,"PCMU",8000,1),FALSE); /*disable PCMU*/
-	linphone_core_enable_payload_type(pauline->lc,linphone_core_find_payload_type(pauline->lc,"PCMA",8000,1),TRUE); /*enable PCMA*/
+		linphone_core_enable_payload_type(pauline->lc,linphone_core_find_payload_type(pauline->lc,"PCMU",8000,1),FALSE); /*disable PCMU*/
+		linphone_core_enable_payload_type(pauline->lc,linphone_core_find_payload_type(pauline->lc,"PCMA",8000,1),TRUE); /*enable PCMA*/
 
-	linphone_core_update_call(marie->lc
-				,linphone_core_get_current_call(marie->lc)
-				,linphone_call_get_current_params(linphone_core_get_current_call(marie->lc)));
+		linphone_core_update_call(marie->lc
+					,linphone_core_get_current_call(marie->lc)
+					,linphone_call_get_current_params(linphone_core_get_current_call(marie->lc)));
 
 
-	CU_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&marie->stat.number_of_LinphoneCallUpdating,1));
-	CU_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&marie->stat.number_of_LinphoneCallStreamsRunning,2));
+		CU_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&marie->stat.number_of_LinphoneCallUpdating,1));
+		CU_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&marie->stat.number_of_LinphoneCallStreamsRunning,2));
 
-	CU_ASSERT_EQUAL(linphone_call_get_reason(linphone_core_get_current_call(marie->lc)),LinphoneReasonNotAcceptable);
+		CU_ASSERT_EQUAL(linphone_call_get_reason(linphone_core_get_current_call(marie->lc)),LinphoneReasonNotAcceptable);
 
-	CU_ASSERT_EQUAL(pauline->stat.number_of_LinphoneCallStreamsRunning,1);
-	check_call_state(pauline,LinphoneCallStreamsRunning);
-	check_call_state(marie,LinphoneCallStreamsRunning);
+		CU_ASSERT_EQUAL(pauline->stat.number_of_LinphoneCallStreamsRunning,1);
+		check_call_state(pauline,LinphoneCallStreamsRunning);
+		check_call_state(marie,LinphoneCallStreamsRunning);
 
-	/*just to sleep*/
-	linphone_core_terminate_all_calls(pauline->lc);
-	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,1));
-	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1));
+		/*just to sleep*/
+		linphone_core_terminate_all_calls(pauline->lc);
+		CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,1));
+		CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1));
+	}
 
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);

From 65734e818d60700b9f76ffb772e1d736afa30da2 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Wed, 25 Feb 2015 12:22:47 +0100
Subject: [PATCH 496/496] move android lock mgt to call state cb

---
 coreapi/linphonecall.c      | 72 +++++++++++++++++++++----------------
 tester/liblinphone_tester.h |  1 +
 tester/tester.c             |  4 +--
 3 files changed, 45 insertions(+), 32 deletions(-)

diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index f877feae6..3f0be84cd 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -818,11 +818,6 @@ static void linphone_call_init_common(LinphoneCall *call, LinphoneAddress *from,
 	linphone_call_init_stats(&call->stats[LINPHONE_CALL_STATS_AUDIO], LINPHONE_CALL_STATS_AUDIO);
 	linphone_call_init_stats(&call->stats[LINPHONE_CALL_STATS_VIDEO], LINPHONE_CALL_STATS_VIDEO);
 	
-#ifdef ANDROID
-	ms_message("Call [%p] acquires both wifi and multicast lock",call);
-	linphone_core_wifi_lock_acquire(call->core);
-	linphone_core_multicast_lock_acquire(call->core); /*does no affect battery more than regular rtp traffic*/
-#endif
 }
 
 void linphone_call_init_stats(LinphoneCallStats *stats, int type) {
@@ -1248,13 +1243,14 @@ void linphone_call_set_state(LinphoneCall *call, LinphoneCallState cstate, const
 		call->prevstate=call->state;
 		if (call->state==LinphoneCallEnd || call->state==LinphoneCallError){
 			if (cstate!=LinphoneCallReleased){
-				ms_warning("Spurious call state change from %s to %s, ignored.",linphone_call_state_to_string(call->state),
-				   linphone_call_state_to_string(cstate));
+				ms_warning("Spurious call state change from %s to %s, ignored."	,linphone_call_state_to_string(call->state)
+																				,linphone_call_state_to_string(cstate));
 				return;
 			}
 		}
-		ms_message("Call %p: moving from state %s to %s",call,linphone_call_state_to_string(call->state),
-							   linphone_call_state_to_string(cstate));
+		ms_message("Call %p: moving from state %s to %s",call
+														,linphone_call_state_to_string(call->state)
+														,linphone_call_state_to_string(cstate));
 
 		if (cstate!=LinphoneCallRefered){
 			/*LinphoneCallRefered is rather an event, not a state.
@@ -1262,32 +1258,53 @@ void linphone_call_set_state(LinphoneCall *call, LinphoneCallState cstate, const
 			call->state=cstate;
 		}
 
-		if (cstate==LinphoneCallEnd || cstate==LinphoneCallError){
+		switch (cstate) {
+		case LinphoneCallOutgoingInit:
+		case LinphoneCallIncomingReceived:
+#ifdef ANDROID
+			ms_message("Call [%p] acquires both wifi and multicast lock",call);
+			linphone_core_wifi_lock_acquire(call->core);
+			linphone_core_multicast_lock_acquire(call->core); /*does no affect battery more than regular rtp traffic*/
+#endif
+			break;
+		case LinphoneCallEnd:
+		case LinphoneCallError:
 			switch(call->non_op_error.reason){
-				case SalReasonDeclined:
-					call->log->status=LinphoneCallDeclined;
-					break;
-				case SalReasonRequestTimeout:
-					call->log->status=LinphoneCallMissed;
+			case SalReasonDeclined:
+				call->log->status=LinphoneCallDeclined;
 				break;
-				default:
+			case SalReasonRequestTimeout:
+				call->log->status=LinphoneCallMissed;
+				break;
+			default:
 				break;
 			}
 			linphone_call_set_terminated(call);
-		}
-		if (cstate == LinphoneCallConnected) {
+			break;
+		case LinphoneCallConnected:
 			call->log->status=LinphoneCallSuccess;
 			call->log->connected_date_time=time(NULL);
-		}
+			break;
+		case LinphoneCallStreamsRunning:
+			if (call->dtmfs_timer!=NULL){
+				/*cancelling DTMF sequence, if any*/
+				linphone_call_cancel_dtmfs(call);
+			}
+			break;
+		case LinphoneCallReleased:
+#ifdef ANDROID
+			ms_message("Call [%p] releases wifi/multicast lock",call);
+			linphone_core_wifi_lock_release(call->core);
+			linphone_core_multicast_lock_release(call->core);
+#endif
+			break;
+		default:
+			break;
 
+		}
 		linphone_core_notify_call_state_changed(lc,call,cstate,message);
 		linphone_reporting_call_state_updated(call);
-		
-		/*cancelling DTMF sequence, if any*/
-		if (cstate!=LinphoneCallStreamsRunning && call->dtmfs_timer!=NULL){
-			linphone_call_cancel_dtmfs(call);
-		}
-		if (cstate==LinphoneCallReleased){
+		if (cstate==LinphoneCallReleased) {/*shall be performed after  app notification*/
 			linphone_call_set_released(call);
 		}
 		linphone_core_soundcard_hint_check(lc);
@@ -1364,11 +1381,6 @@ static void linphone_call_destroy(LinphoneCall *obj){
 	}
 
 	sal_error_info_reset(&obj->non_op_error);
-	#ifdef ANDROID
-	ms_message("Call [%p] releases wifi/multicast lock",obj);
-	linphone_core_wifi_lock_release(obj->core);
-	linphone_core_multicast_lock_release(obj->core);
-	#endif
 }
 
 /**
diff --git a/tester/liblinphone_tester.h b/tester/liblinphone_tester.h
index c25f61d6c..c140a6453 100644
--- a/tester/liblinphone_tester.h
+++ b/tester/liblinphone_tester.h
@@ -250,6 +250,7 @@ typedef struct _LinphoneCoreManager {
 	LinphoneAddress* identity;
 	LinphoneEvent *lev;
 	bool_t decline_subscribe;
+	int number_of_cunit_error_at_creation;
 } LinphoneCoreManager;
 
 typedef struct _LinphoneCallTestParams {
diff --git a/tester/tester.c b/tester/tester.c
index 9fdedb0ec..aadfbee83 100644
--- a/tester/tester.c
+++ b/tester/tester.c
@@ -257,7 +257,7 @@ LinphoneCoreManager* linphone_core_manager_new2(const char* rc_file, int check_f
 	LinphoneProxyConfig* proxy;
 	char *rc_path = NULL;
 	int proxy_count;
-
+	mgr->number_of_cunit_error_at_creation = CU_get_number_of_failures();
 	mgr->v_table.registration_state_changed=registration_state_changed;
 	mgr->v_table.auth_info_requested=auth_info_requested;
 	mgr->v_table.call_state_changed=call_state_changed;
@@ -340,7 +340,7 @@ void linphone_core_manager_destroy(LinphoneCoreManager* mgr) {
 	if (mgr->lc){
 		const char *record_file=linphone_core_get_record_file(mgr->lc);
 		if (record_file){
-			if (CU_get_number_of_failures()>0) {
+			if ((CU_get_number_of_failures()-mgr->number_of_cunit_error_at_creation)>0) {
 				ms_message ("Test has failed, keeping recorded file [%s]",record_file);
 			} else {
 				unlink(record_file);