diff --git a/AUTHORS b/AUTHORS
index 386427a4f743786380ae263a7334d254f0b1dcd7..5ecb467226315261751452032bb71c0de0d2c911 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,57 +1,13 @@
-Simon MORLAT (simon dot morlat at linphone dot org) wrotes:
-	- main graphical program (gnome)
-	- RTP library (oRTP)
-	- SIP user-agent library (osipua)
-	- audio library (mediastreamer), for codec and i/o handling.
-	- sipomatic, the automatic sip replier, which is often used for testing.
+Main authors:
 
-Florian Wintertein < f-win at gmx dot net > wrotes the console version of linphone (linphonec)
-in console/ directory.
+Belledonne Communications SARL team:
+	Simon Morlat, Jehan Monnier, Guillaume Beraudo
 
-Aymeric Moizard (jack at atosc dot org) wrotes:
-	- the oSIP SIP transactionnal stack (not part of linphone)
-	- some piece of code of the osip distribution have been reused in osipua
-	- presence information support in osipua
-	- and contributes to some parts of osipua (digest authentification)
-For more information about oSIP, see http://osip.atosc.org
+Contributors:
 
-Sharath Udupa is developing the media_api, a usefull library to manage audio and video streams 
-for basic calls as well as conference.
+Florian Wintertein < f-win at gmx dot net > originaly wrotes the console version of linphone (linphonec)
+in console/ directory.
 
 Sandro Santilli < strk at keybit dot net > wrote enhancements in the
-console interface (readline, new commands) and some bug fixes for
-the core api.
-
-Bryan Ogawa ( bko at cisco dot com ) sent a patch that made the linphone-0.7.1 release. 
-This patch fixed several issues in the SIP part while working with proxies.
-
-Koichi KUNITAKE < kunitake at linux-ipv6 dot org > has contributed a patch bringing 
-full IPv6 support.
-
-The Speex codec is a project from Jean Marc Valin. See http://speex.sourceforge.net for more 
-information.
-	
-The GSM library was written by :
-	 Jutta Degener and Carsten Bormann,Technische Universitaet Berlin.
-	
-The LPC10-1.5 library was written by:
-	Andy Fingerhut
-	Applied Research Laboratory                     <-- this line is optional if
-	Washington University, Campus Box 1045/Bryan 509      you have limited space
-	One Brookings Drive
-	Saint Louis, MO 63130-4899
-	jaf@arl.wustl.edu
-	http://www.arl.wustl.edu/~jaf/
-
-	See text files in gsmlib and lpc10-1.5 directories for further information.
-	
-G711 library has some code from the alsa-lib on http://www.alsa-project.org
-
-Icons by Pablo Marcelo Moia.
+console interface (readline, new commands).
 
-Translations:
-fr: Simon Morlat
-en: Simon Morlat and Delphine Perreau
-it: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>
-de: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>
-es: Jesús Benítez <gnelson at inMail dot sk>
diff --git a/Makefile.am b/Makefile.am
index 84c1e019ffbed7901184147d479d002969208232..66d01711dd89c2b2cee09cfff096700dbeab99e2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,7 +39,7 @@ ZIP_EXCLUDED=include lib \
 
 SDK_ZIPFILE=$(shell cd $(top_builddir) && pwd)/lib$(PACKAGE)-win32-$(VERSION).zip
 SDK_EXCLUDED= \
-	bin/linphone-3.exe \
+	bin/linphone.exe \
 	lib/*.la \
 	share/linphone \
 	share/pixmaps \
diff --git a/NEWS b/NEWS
index 2f74239aa4cf1759f90457dc7348e849725629b8..a684b44afedbfd88efdaf880969379e10ff1d394 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,9 @@
-linphone-3.4.0 -- XXXXX
+linphone-3.4.1 -- February 17th, 2011
+	* bugfixes
+	* gtk executable is renamed "linphone" (was linphone-3 before)
+	Requires mediastreamer-2.7.1
+
+linphone-3.4.0 -- February 7th, 2011
 	* implement multiple calls feature: 
 		- call hold (with possibility to play a music file)
 		- call resume 
@@ -6,8 +11,10 @@ linphone-3.4.0 -- XXXXX
 		- creation of another outgoing call while already in call
 		- blind call transfer
 		- attended call transfer
+			**CAUTION**: LinphoneCoreVTable has changed: pay attention to this when upgrading an old application to a newer liblinphone.
 	* improve bandwidth management (one b=AS line is used for audio+video)
-	* improvements in the echo limiter
+	* improvements in the echo limiter performance
+	* implement a echo calibration feature (see linphone_core_start_echo_calibration()).
 	* stun support bugfixes
 	* possibility to use two video windows, one for local preview, one for remote video (linphonec only)
 	* optimize by not re-creating streams when SDP is unchanged during a reinvite
diff --git a/README b/README
index c92edbc24faf73fabd7736fa3095d5a60b90c69b..7e68bb1996fd378fe4271ce3d58c85a1073902ac 100644
--- a/README
+++ b/README
@@ -5,16 +5,16 @@ This is Linphone, a free (GPL) video softphone based on the SIP protocol.
 - you need at least:
 		- libosip2>=3.0.3
 		- libeXosip2>=3.0.3
-		- speex>=1.1.6
-		- libreadline
+		- speex>=1.2.0 (including libspeexdsp part)
+		- libreadline (optional: for convenient command line in linphonec)
 	+ gsm codec (gsm source package or libgsm-dev or gsm-devel) (optional)
 	+ if you want to gtk/glade interface:
 		- gtk>=2.16.0
-		- libglade>=2.2
 	+ if you want video support:
 		- SDL>=1.2.10
-		- libavcodec (ffmpeg) from a year 2007 or later cvs/svn
+		- libavcodec (ffmpeg) 
 		- libswscale (part of ffmpeg too) for better scaling performance
+		- theora (optional)
 
 with their corresponding -dev or -devel package if you don't use source packages.
 
@@ -38,7 +38,7 @@ Here is a short description of the content of the source tree.
 - coreapi/ is the central point of linphone, which handles relationship between sip signalisation and media
   streaming. It contains an easy to use api to create a sip phone.
 
-- gtk-glade/	is the directory that contains the gui frontend of linphone. It uses all libraries descibed above.
+- gtk/	is the directory that contains the gui frontend of linphone. It uses all libraries descibed above.
 
 - console/
 	* linphonec.c is the main file for the console version of linphone.
diff --git a/README.mingw b/README.mingw
index 557a8e64203cc733b3bddbd72b0dd8d75f651b06..5fa56c8445a15a6628dbe458bf4aff55f0612070 100644
--- a/README.mingw
+++ b/README.mingw
@@ -49,6 +49,8 @@ rm /lib/libgcc.a /lib/libmingw32.a /lib/libmingwex.a
 
 #Remove libintl from gtk, we don't need it and it conflicts with the one supplied by mingw.
 rm /lib/libintl.dll.a
+rm /lib/libintl.la
+rm /lib/libintl.a
 rm /include/intl.h
 
 * Download and install Inno Setup Compiler (required only if you run 'make setup.exe'). Add it to your windows Path environment variable.
@@ -56,7 +58,8 @@ rm /include/intl.h
 Get Linphone source code
 ************************
 
-Install msys-git from (http://code.google.com/p/msysgit/)
+Install msys-git from (http://code.google.com/p/msysgit/). 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.
 
 It is recommended that you create a directory somewhere with a path without any spaces or ~ characters, for example
 c:\sources\
diff --git a/build/android/Android.mk b/build/android/Android.mk
index 05e13ded30f293da2fd0828cbc9b317336d71e1d..48a4c75be6cbef0ab1f3553737d2d45af2a95e9e 100755
--- a/build/android/Android.mk
+++ b/build/android/Android.mk
@@ -46,13 +46,14 @@ LOCAL_SRC_FILES = \
 	sal_eXosip2_sdp.c \
 	offeranswer.c \
 	callbacks.c \
-	linphonecall.c
+	linphonecall.c \
+	ec-calibrator.c
 
 LOCAL_CFLAGS += \
 	-D_BYTE_ORDER=_LITTLE_ENDIAN \
 	-DORTP_INET6 \
 	-DENABLE_TRACE \
-	-DLINPHONE_VERSION=\"Linphone-3.3.x\" \
+	-DLINPHONE_VERSION=\"3.4.0\" \
 	-DLINPHONE_PLUGINS_DIR=\"\\tmp\" \
 	-DLOG_DOMAIN=\"Linphone\"
 
diff --git a/configure.ac b/configure.ac
index 8db4ab8a36d64614dab0a9e3a516d25f5f0ac102..0615cc48f2f47898bc00ff96f3c892aedd674d53 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([linphone],[3.3.99.10],[linphone-developers@nongnu.org])
+AC_INIT([linphone],[3.4.1],[linphone-developers@nongnu.org])
 AC_CANONICAL_SYSTEM
 AC_CONFIG_SRCDIR([coreapi/linphonecore.c])
 
@@ -298,7 +298,9 @@ AC_ARG_ENABLE(x11,
 if test "$video" = "true"; then
 	
 	if test "$enable_x11" = "true"; then
-	   AC_CHECK_HEADERS(X11/Xlib.h)
+	  	AC_CHECK_HEADERS(X11/Xlib.h)
+		AC_CHECK_LIB(X11,XUnmapWindow, X11_LIBS="-lX11")
+		AC_SUBST(X11_LIBS)
 	fi
 	AC_DEFINE(VIDEO_ENABLED,1,[defined if video support is available])
 fi
diff --git a/console/Makefile.am b/console/Makefile.am
index cf6a336ed70e95bdc48cd18a7ed9075056dee6d0..bbc310967e43b6b0090968975514ad26ef20de48 100644
--- a/console/Makefile.am
+++ b/console/Makefile.am
@@ -23,7 +23,8 @@ linphonec_LDADD = $(top_builddir)/coreapi/liblinphone.la $(READLINE_LIBS)  \
 		$(MEDIASTREAMER_LIBS) \
 		$(ORTP_LIBS) \
 		$(SPEEX_LIBS) \
-		$(OSIP_LIBS)
+		$(OSIP_LIBS) \
+		$(X11_LIBS)
 
 if BUILD_WIN32
 #special build of linphonec to detach from the windows console
@@ -33,17 +34,6 @@ linphoned_LDADD=$(linphonec_LDADD)
 endif
 
 
-sipomatic_SOURCES=\
-	sipomatic.c sipomatic.h
-sipomatic_CFLAGS= $(COMMON_CFLAGS) $(CONSOLE_FLAGS)
-
-sipomatic_LDADD= 	$(INTLLIBS)  \
-			$(top_builddir)/coreapi/liblinphone.la \
-			$(MEDIASTREAMER_LIBS) \
-			$(ORTP_LIBS) \
-			$(SPEEX_LIBS) \
-			$(OSIP_LIBS)
-
 linphonecsh_SOURCES = shell.c
 linphonecsh_CFLAGS = $(CONSOLE_FLAGS)
 linphonecsh_LDADD = $(ORTP_LIBS)
diff --git a/console/commands.c b/console/commands.c
index 21067c641eba2cc7ff4b92627f9819154736253c..c110d3731577b9aedf4fba2751eb9183eb1b3187 100644
--- a/console/commands.c
+++ b/console/commands.c
@@ -78,6 +78,7 @@ static int lpc_cmd_unregister(LinphoneCore *, char *);
 static int lpc_cmd_duration(LinphoneCore *lc, char *args);
 static int lpc_cmd_status(LinphoneCore *lc, char *args);
 static int lpc_cmd_ports(LinphoneCore *lc, char *args);
+static int lpc_cmd_param(LinphoneCore *lc, char *args);
 static int lpc_cmd_speak(LinphoneCore *lc, char *args);
 static int lpc_cmd_acodec(LinphoneCore *lc, char *args);
 static int lpc_cmd_vcodec(LinphoneCore *lc, char *args);
@@ -315,6 +316,10 @@ static LPC_COMMAND advanced_commands[] = {
 	{ "ports", lpc_cmd_ports, "Network ports configuration", 
 			"'ports'  \t: prints current used ports.\n"
 			"'ports sip <port number>'\t: Sets the sip port.\n" },
+	{ "param", lpc_cmd_param, "parameter set or read as normally given in .linphonerc",
+			"'param <section> <parameter> [<value>]'  \t: reads [sets] given parameter.\n"
+			"NOTES: - changes may become effective after (re)establishing a sip connection.\n"
+			"       - upon exit, .linphonerc will reflect the updated state.\n" },
 	{ "speak", lpc_cmd_speak, "Speak a sentence using espeak TTS engine",
 			"This feature is available only in file mode. (see 'help soundcard')\n"
 			"'speak <voice name> <sentence>'	: speak a text using the specified espeak voice.\n"
@@ -473,7 +478,8 @@ lpc_cmd_help(LinphoneCore *lc, char *arg)
 		}
 		
 		linphonec_out("---------------------------\n");
-		linphonec_out("Type 'help <command>' for more details or 'help advanced' to list additional commands.\n");
+		linphonec_out("Type 'help <command>' for more details or\n");
+		linphonec_out("     'help advanced' to list additional commands.\n");
 
 		return 1;
 	}
@@ -2014,6 +2020,35 @@ static int lpc_cmd_ports(LinphoneCore *lc, char *args)
 	return 1;
 }
 
+static int lpc_cmd_param(LinphoneCore *lc, char *args)
+{
+	char section[20], param[20], value[50];
+	const char *string;
+
+	if (args == NULL) {
+		return 0;
+	}
+	switch (sscanf(args,"%s %s %s",section,param,value)) {
+		// case 1 might show all current settings under a section
+		case 2:
+			string = lp_config_get_string(linphone_core_get_config(lc), section, param, "(undef)");
+			linphonec_out("current value: %s\n", string);
+			break;
+		case 3:
+			if (lp_config_get_string(linphone_core_get_config(lc), section, param, NULL) != NULL) {
+				lp_config_set_string(linphone_core_get_config(lc), section, param, value);
+			// no indication of existence
+				linphonec_out("updated value: %s\n", value);
+			} else {
+				linphonec_out("only update of existing variables are allowed\n");
+			}
+			break;
+		default:
+			return 0;
+    }
+	return 1;
+}
+
 static int lpc_cmd_speak(LinphoneCore *lc, char *args){
 #ifndef WIN32
 	char voice[64];
diff --git a/console/linphonec.c b/console/linphonec.c
index d3bba84a6ced515d1b7de17831fd064db3dc1715..c3eb8ace26d2871c91dfac38fc0ce615e5b7668f 100644
--- a/console/linphonec.c
+++ b/console/linphonec.c
@@ -80,7 +80,6 @@
 
 #ifdef HAVE_X11_XLIB_H
 #include <X11/Xlib.h>
-#include <SDL/SDL_syswm.h>
 #endif
 
 /***************************************************************************
diff --git a/coreapi/Makefile.am b/coreapi/Makefile.am
index 4835dc74cc30391fc2b9ae104aa97be6f361d243..8f88045f568a2c3993ffa01b6b705e5f03c1d3b8 100644
--- a/coreapi/Makefile.am
+++ b/coreapi/Makefile.am
@@ -35,7 +35,8 @@ liblinphone_la_SOURCES=\
 	linphonecall.c \
 	sipsetup.c sipsetup.h \
 	siplogin.c \
-	lsd.c linphonecore_utils.h
+	lsd.c linphonecore_utils.h \
+	ec-calibrator.c
 
 
 liblinphone_la_LDFLAGS= -version-info $(LIBLINPHONE_SO_VERSION) -no-undefined
@@ -49,7 +50,7 @@ if BUILD_WIN32
 liblinphone_la_LIBADD+=$(top_builddir)/oRTP/src/libortp.la
 endif
 
-noinst_PROGRAMS=test_lsd
+noinst_PROGRAMS=test_lsd test_ecc
 
 test_lsd_SOURCES=test_lsd.c
 
@@ -57,6 +58,14 @@ test_lsd_LDADD=liblinphone.la \
 							$(MEDIASTREAMER_LIBS) \
 							$(ORTP_LIBS)
 
+test_ecc_SOURCES=test_ecc.c
+
+test_ecc_LDADD=liblinphone.la \
+							$(MEDIASTREAMER_LIBS) \
+							$(ORTP_LIBS)
+
+
+
 AM_CFLAGS=$(STRICT_OPTIONS)  -DIN_LINPHONE \
 	$(ORTP_CFLAGS) \
 	$(OSIP_CFLAGS) \
diff --git a/coreapi/callbacks.c b/coreapi/callbacks.c
index bf60f4c0d0f609a4e7807d8a5014081e1bf92173..c3751ada4fb5617c9a51f7938354de54fd0b27a2 100644
--- a/coreapi/callbacks.c
+++ b/coreapi/callbacks.c
@@ -235,10 +235,12 @@ static void call_ringing(SalOp *h){
 		if (lc->ringstream!=NULL) return;	/*already ringing !*/
 		if (lc->sound_conf.play_sndcard!=NULL){
 			MSSndCard *ringcard=lc->sound_conf.lsd_card ? lc->sound_conf.lsd_card : lc->sound_conf.play_sndcard;
-			ms_message("Remote ringing...");
 			lc->ringstream=ring_start(lc->sound_conf.remote_ring,2000,ringcard);
-			linphone_call_set_state(call,LinphoneCallOutgoingRinging,"Remote ringing");		
 		}
+		ms_message("Remote ringing...");
+		if (lc->vtable.display_status) 
+			lc->vtable.display_status(lc,_("Remote ringing..."));
+		linphone_call_set_state(call,LinphoneCallOutgoingRinging,"Remote ringing");
 	}else{
 		/*accept early media */
 		if (call->audiostream && call->audiostream->ticker!=NULL){
@@ -303,18 +305,30 @@ static void call_accepted(SalOp *op){
 				ms_free(msg);
 			}
 			linphone_core_update_streams (lc,call,md);
-			linphone_call_set_state(call,LinphoneCallPaused,"Call paused");
+			linphone_call_set_state(call,LinphoneCallPausedByRemote,"Call paused by remote");
 		}else{
-			if (lc->vtable.display_status){
-				lc->vtable.display_status(lc,_("Call answered - connected."));
-			}
 			if (call->state==LinphoneCallStreamsRunning){
 				/*media was running before, the remote as acceted a call modification (that is
 					a reinvite made by us. We must notify the application this reinvite was accepted*/
 				linphone_call_set_state(call, LinphoneCallUpdated, "Call updated");
+			}else{
+				if (call->state==LinphoneCallResuming){
+					if (lc->vtable.display_status){
+						lc->vtable.display_status(lc,_("Call resumed."));
+					}
+				}else{
+					if (lc->vtable.display_status){
+						char *tmp=linphone_call_get_remote_address_as_string (call);
+						char *msg=ms_strdup_printf(_("Call answered by %s."),tmp);
+						lc->vtable.display_status(lc,msg);
+						ms_free(tmp);
+						ms_free(msg);
+					}
+				}
 			}
 			linphone_core_update_streams (lc,call,md);
 			linphone_call_set_state(call, LinphoneCallStreamsRunning, "Streams running");
+			lc->current_call=call;
 		}
 	}else{
 		/*send a bye*/
@@ -349,6 +363,7 @@ static void call_ack(SalOp *op){
 	}
 }
 
+
 /* this callback is called when an incoming re-INVITE modifies the session*/
 static void call_updating(SalOp *op){
 	LinphoneCore *lc=(LinphoneCore *)sal_get_user_pointer(sal_op_get_sal(op));
@@ -360,32 +375,22 @@ static void call_updating(SalOp *op){
 	
 	if (md && !sal_media_description_empty(md))
 	{
-		if ((call->state==LinphoneCallPausedByRemote || call->state==LinphoneCallPaused) &&
-		    sal_media_description_has_dir(md,SalStreamSendRecv) && strcmp(md->addr,"0.0.0.0")!=0){
-			/*make sure we can be resumed */
-			if (lc->current_call!=NULL && lc->current_call!=call){
-				ms_warning("Attempt to be resumed but already in call with somebody else!");
-				/*we are actively running another call, reject with a busy*/
-				sal_call_decline (op,SalReasonBusy,NULL);
-				return;
-			}
-			if(lc->vtable.display_status)
-				lc->vtable.display_status(lc,_("We have been resumed..."));
-			linphone_call_set_state (call,LinphoneCallStreamsRunning,"Connected (streams running)");
-		}
-		else if(call->state==LinphoneCallStreamsRunning &&
-		        ( sal_media_description_has_dir(md,SalStreamRecvOnly) 
-		         || sal_media_description_has_dir(md,SalStreamInactive)
-		         || strcmp(md->addr,"0.0.0.0")==0)){
-			if(lc->vtable.display_status)
-				lc->vtable.display_status(lc,_("We are being paused..."));
-			linphone_call_set_state (call,LinphoneCallPausedByRemote,"Call paused by remote");
-			if (lc->current_call!=call){
-				ms_error("Inconsitency detected: current call is %p but call %p is being paused !",lc->current_call,call);
+		if (sal_media_description_has_dir(call->localdesc,SalStreamSendRecv)){
+			ms_message("Our local status is SalStreamSendRecv");
+			if (sal_media_description_has_dir (md,SalStreamRecvOnly) || sal_media_description_has_dir(md,SalStreamInactive)){
+				/* we are being paused */
+				if(lc->vtable.display_status)
+					lc->vtable.display_status(lc,_("We are being paused..."));
+				linphone_call_set_state (call,LinphoneCallPausedByRemote,"Call paused by remote");
+			}else if (!sal_media_description_has_dir(call->resultdesc,SalStreamSendRecv) && sal_media_description_has_dir(md,SalStreamSendRecv)){
+				if(lc->vtable.display_status)
+					lc->vtable.display_status(lc,_("We have been resumed..."));
+				linphone_call_set_state (call,LinphoneCallStreamsRunning,"Connected (streams running)");
+				lc->current_call=call;
+			}else{
+				prevstate=call->state;
+				linphone_call_set_state(call, LinphoneCallUpdatedByRemote,"Call updated by remote");
 			}
-		}else{
-			prevstate=call->state;
-			linphone_call_set_state(call, LinphoneCallUpdatedByRemote,"Call updated by remote");
 		}
 		/*accept the modification (sends a 200Ok)*/
 		sal_call_accept(op);
@@ -501,6 +506,13 @@ static void call_failure(SalOp *op, SalError error, SalReason sr, const char *de
 	}
 }
 
+static void call_released(SalOp *op){
+	LinphoneCall *call=(LinphoneCall*)sal_op_get_user_pointer(op);
+	if (call!=NULL){
+		linphone_call_set_state(call,LinphoneCallReleased,"Call released");
+	}else ms_error("call_released() for already destroyed call ?");
+}
+
 static void auth_requested(SalOp *h, const char *realm, const char *username){
 	LinphoneCore *lc=(LinphoneCore *)sal_get_user_pointer(sal_op_get_sal(h));
 	LinphoneAuthInfo *ai=(LinphoneAuthInfo*)linphone_core_find_auth_info(lc,realm,username);
@@ -516,7 +528,7 @@ static void auth_requested(SalOp *h, const char *realm, const char *username){
 		ai->usecount++;
 	}else{
 		if (ai && ai->works==FALSE) {
-			register_failure(h, SalErrorFailure, SalReasonForbidden, _("Authentication failure"));
+			sal_op_cancel_authentication(h);
 		} 
 		if (lc->vtable.auth_info_requested)
 			lc->vtable.auth_info_requested(lc,realm,username);
@@ -676,6 +688,7 @@ SalCallbacks linphone_sal_callbacks={
 	call_updating,
 	call_terminated,
 	call_failure,
+	call_released,
 	auth_requested,
 	auth_success,
 	register_success,
diff --git a/coreapi/ec-calibrator.c b/coreapi/ec-calibrator.c
new file mode 100644
index 0000000000000000000000000000000000000000..4c8a37586ebf538f580915bdd39424a3321d4dab
--- /dev/null
+++ b/coreapi/ec-calibrator.c
@@ -0,0 +1,179 @@
+/*
+linphone
+Copyright (C) 2011 Belledonne Communications SARL
+Author: Simon MORLAT (simon.morlat@linphone.org)
+
+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 "private.h"
+
+#include "mediastreamer2/mstonedetector.h"
+#include "mediastreamer2/dtmfgen.h"
+
+
+
+
+
+static void ecc_init_filters(EcCalibrator *ecc){
+	ecc->ticker=ms_ticker_new();
+
+	ecc->sndread=ms_snd_card_create_reader(ecc->play_card);
+	ecc->det=ms_filter_new(MS_TONE_DETECTOR_ID);
+	ecc->rec=ms_filter_new(MS_FILE_REC_ID);
+
+	ms_filter_link(ecc->sndread,0,ecc->det,0);
+	ms_filter_link(ecc->det,0,ecc->rec,0);
+
+	ecc->play=ms_filter_new(MS_FILE_PLAYER_ID);
+	ecc->gen=ms_filter_new(MS_DTMF_GEN_ID);
+	ecc->resampler=ms_filter_new(MS_RESAMPLE_ID);
+	ecc->sndwrite=ms_snd_card_create_writer(ecc->capt_card);
+
+	ms_filter_link(ecc->play,0,ecc->gen,0);
+	ms_filter_link(ecc->gen,0,ecc->resampler,0);
+	ms_filter_link(ecc->resampler,0,ecc->sndwrite,0);
+	unsigned int rate;
+	ms_filter_call_method(ecc->sndwrite,MS_FILTER_GET_SAMPLE_RATE,&rate);
+	ms_filter_call_method(ecc->resampler,MS_FILTER_SET_OUTPUT_SAMPLE_RATE,&rate);
+
+	ms_ticker_attach(ecc->ticker,ecc->play);
+	ms_ticker_attach(ecc->ticker,ecc->sndread);
+}
+
+static void ecc_deinit_filters(EcCalibrator *ecc){
+	ms_ticker_detach(ecc->ticker,ecc->play);
+	ms_ticker_detach(ecc->ticker,ecc->sndread);
+
+	ms_filter_unlink(ecc->play,0,ecc->gen,0);
+	ms_filter_unlink(ecc->gen,0,ecc->resampler,0);
+	ms_filter_unlink(ecc->resampler,0,ecc->sndwrite,0);
+
+	ms_filter_unlink(ecc->sndread,0,ecc->det,0);
+	ms_filter_unlink(ecc->det,0,ecc->rec,0);
+
+	ms_filter_destroy(ecc->sndread);
+	ms_filter_destroy(ecc->det);
+	ms_filter_destroy(ecc->rec);
+	ms_filter_destroy(ecc->play);
+	ms_filter_destroy(ecc->gen);
+	ms_filter_destroy(ecc->resampler);
+	ms_filter_destroy(ecc->sndwrite);
+
+	ms_ticker_destroy(ecc->ticker);
+}
+
+static void on_tone_sent(void *data, MSFilter *f, unsigned int event_id, void *arg){
+	MSDtmfGenEvent *ev=(MSDtmfGenEvent*)arg;
+	EcCalibrator *ecc=(EcCalibrator*)data;
+	ecc->sent_count++;
+	ecc->acc-=ev->tone_start_time;
+	ms_message("Sent tone at %u",(unsigned int)ev->tone_start_time);
+}
+
+static void on_tone_received(void *data, MSFilter *f, unsigned int event_id, void *arg){
+	MSToneDetectorEvent *ev=(MSToneDetectorEvent*)arg;
+	EcCalibrator *ecc=(EcCalibrator*)data;
+	ecc->recv_count++;
+	ecc->acc+=ev->tone_start_time;
+	ms_message("Received tone at %u",(unsigned int)ev->tone_start_time);
+}
+
+static void ecc_play_tones(EcCalibrator *ecc){
+	MSDtmfGenCustomTone tone;
+	MSToneDetectorDef expected_tone;
+
+	
+	ms_filter_set_notify_callback(ecc->det,on_tone_received,ecc);
+
+	expected_tone.frequency=2000;
+	expected_tone.min_duration=40;
+	expected_tone.min_amplitude=0.02;
+
+	ms_filter_call_method (ecc->det,MS_TONE_DETECTOR_ADD_SCAN,&expected_tone);
+	
+	tone.frequency=1000;
+	tone.duration=1000;
+	tone.amplitude=1.0;
+
+	/*play an initial tone to startup the audio playback/capture*/
+	ms_filter_call_method(ecc->gen,MS_DTMF_GEN_PLAY_CUSTOM,&tone);
+	ms_sleep(2);
+
+	ms_filter_set_notify_callback(ecc->gen,on_tone_sent,ecc);
+	tone.frequency=2000;
+	tone.duration=100;
+
+	ms_filter_call_method(ecc->gen,MS_DTMF_GEN_PLAY_CUSTOM,&tone);
+	ms_sleep(1);
+	ms_filter_call_method(ecc->gen,MS_DTMF_GEN_PLAY_CUSTOM,&tone);
+	ms_sleep(1);
+	ms_filter_call_method(ecc->gen,MS_DTMF_GEN_PLAY_CUSTOM,&tone);
+	ms_sleep(1);
+
+	if (ecc->sent_count==3 && ecc->recv_count==3){
+		int delay=ecc->acc/3;
+		if (delay<0){
+			ms_error("Quite surprising calibration result, delay=%i",delay);
+			ecc->status=LinphoneEcCalibratorFailed;
+		}else{ms_message("Echo calibration estimated delay to be %i ms",delay);
+			ecc->delay=delay;
+			ecc->status=LinphoneEcCalibratorDone;
+		}
+	}else{
+		ms_error("Echo calibration failed, tones received = %i",ecc->recv_count);
+		ecc->status=LinphoneEcCalibratorFailed;
+	}
+	
+}
+
+static void  * ecc_thread(void *p){
+	EcCalibrator *ecc=(EcCalibrator*)p;
+	
+	ecc_init_filters(ecc);
+	ecc_play_tones(ecc);
+	ecc_deinit_filters(ecc);
+	ms_thread_exit(NULL);
+	return NULL;
+}
+
+EcCalibrator * ec_calibrator_new(MSSndCard *play_card, MSSndCard *capt_card, LinphoneEcCalibrationCallback cb, void *cb_data ){
+	EcCalibrator *ecc=ms_new0(EcCalibrator,1);
+
+	ecc->cb=cb;
+	ecc->cb_data=cb_data;
+	ecc->capt_card=capt_card;
+	ecc->play_card=play_card;
+	ms_thread_create(&ecc->thread,NULL,ecc_thread,ecc);
+	return ecc;
+}
+
+LinphoneEcCalibratorStatus ec_calibrator_get_status(EcCalibrator *ecc){
+	return ecc->status;
+}
+
+void ec_calibrator_destroy(EcCalibrator *ecc){
+	ms_thread_join(ecc->thread,NULL);
+	ms_free(ecc);
+}
+
+int linphone_core_start_echo_calibration(LinphoneCore *lc, LinphoneEcCalibrationCallback cb, void *cb_data){
+	if (lc->ecc!=NULL){
+		ms_error("Echo calibration is still on going !");
+		return -1;
+	}
+	lc->ecc=ec_calibrator_new(lc->sound_conf.play_sndcard,lc->sound_conf.capt_sndcard,cb,cb_data);
+	return 0;
+}
diff --git a/coreapi/friend.c b/coreapi/friend.c
index ee70139460ae9810b7297a8b9d27ec21f2fc3b95..527e29bd593a4bc2e5e1e6088f3e10059f508cbd 100644
--- a/coreapi/friend.c
+++ b/coreapi/friend.c
@@ -277,7 +277,9 @@ SalPresenceStatus linphone_online_status_to_sal(LinphoneOnlineStatus os){
 }
 
 void linphone_friend_notify(LinphoneFriend *lf, LinphoneOnlineStatus os){
-	//printf("Wish to notify %p, lf->nid=%i\n",lf,lf->nid);
+	char *addr=linphone_address_as_string(linphone_friend_get_address(lf));
+	ms_message("Want to notify %s, insub=%p",addr,lf->insub);
+	ms_free(addr);
 	if (lf->insub!=NULL){
 		sal_notify_presence(lf->insub,linphone_online_status_to_sal(os),NULL);
 	}
@@ -286,8 +288,6 @@ void linphone_friend_notify(LinphoneFriend *lf, LinphoneOnlineStatus os){
 static void linphone_friend_unsubscribe(LinphoneFriend *lf){
 	if (lf->outsub!=NULL) {
 		sal_unsubscribe(lf->outsub);
-		sal_op_release(lf->outsub);
-		lf->outsub=NULL;
 		lf->subscribe_active=FALSE;
 	}
 }
@@ -296,13 +296,19 @@ void linphone_friend_close_subscriptions(LinphoneFriend *lf){
 	linphone_friend_unsubscribe(lf);
 	if (lf->insub){
 		sal_notify_close(lf->insub);
-		sal_op_release(lf->insub);
-		lf->insub=NULL;
+		
 	}
 }
 
 void linphone_friend_destroy(LinphoneFriend *lf){
-	
+	if (lf->insub) {
+		sal_op_release(lf->insub);
+		lf->insub=NULL;
+	}
+	if (lf->outsub){
+		sal_op_release(lf->outsub);
+		lf->outsub=NULL;
+	}
 	if (lf->uri!=NULL) linphone_address_destroy(lf->uri);
 	if (lf->info!=NULL) buddy_info_free(lf->info);
 	ms_free(lf);
diff --git a/coreapi/help/doxygen.dox b/coreapi/help/doxygen.dox
index 8707785b21a8e9481a36ad02891335ffcb787e5c..32ed3da1af9e009d71548af61d6252cfc8b7c121 100644
--- a/coreapi/help/doxygen.dox
+++ b/coreapi/help/doxygen.dox
@@ -34,6 +34,13 @@
 
 /**
  * @defgroup call_control Placing and receiving calls
+ *
+ * The #LinphoneCall object represents an incoming or outgoing call managed by the #LinphoneCore.
+ * Outgoing calls can be created using linphone_core_invite() or linphone_core_invite_address(), while incoming calls are notified to the application
+ * through the LinphoneCoreVTable::call_state_changed callback.
+ *
+ * See the basic call \ref basic_call_tutorials "tutorial".
+ *
 **/
 
 /**
diff --git a/coreapi/help/java/org/linphone/core/tutorials/TutorialBuddyStatus.java b/coreapi/help/java/org/linphone/core/tutorials/TutorialBuddyStatus.java
index 79f541ac5eddc52a387bef8f8c4f8de1041f0ecb..d5351d99c4e0a2e37046ccbf69b1ba0b7dd7fed9 100644
--- a/coreapi/help/java/org/linphone/core/tutorials/TutorialBuddyStatus.java
+++ b/coreapi/help/java/org/linphone/core/tutorials/TutorialBuddyStatus.java
@@ -22,6 +22,7 @@ import org.linphone.core.LinphoneAddress;
 import org.linphone.core.LinphoneCall;
 import org.linphone.core.LinphoneChatRoom;
 import org.linphone.core.LinphoneCore;
+import org.linphone.core.LinphoneCore.EcCalibratorStatus;
 import org.linphone.core.LinphoneCoreException;
 import org.linphone.core.LinphoneCoreFactory;
 import org.linphone.core.LinphoneCoreListener;
@@ -95,7 +96,7 @@ public class TutorialBuddyStatus implements LinphoneCoreListener {
 	public void globalState(LinphoneCore lc, GlobalState state, String message) {}
 	public void textReceived(LinphoneCore lc, LinphoneChatRoom cr,LinphoneAddress from, String message) {}
 	public void callState(LinphoneCore lc, LinphoneCall call, State cstate, String msg) {}
-
+	public void ecCalibrationStatus(LinphoneCore lc, EcCalibratorStatus status,int delay_ms, Object data) {}
 
 
 
@@ -229,4 +230,6 @@ public class TutorialBuddyStatus implements LinphoneCoreListener {
 		TutorialNotifier.notify(s);
 	}
 
+
+
 }
diff --git a/coreapi/help/java/org/linphone/core/tutorials/TutorialChatRoom.java b/coreapi/help/java/org/linphone/core/tutorials/TutorialChatRoom.java
index 8b8fd341bd7d990956fb3a976864267e3e4cfdf1..9309779bfd7eb3943fd56c861c8bec9f4616a38d 100644
--- a/coreapi/help/java/org/linphone/core/tutorials/TutorialChatRoom.java
+++ b/coreapi/help/java/org/linphone/core/tutorials/TutorialChatRoom.java
@@ -22,6 +22,7 @@ import org.linphone.core.LinphoneAddress;
 import org.linphone.core.LinphoneCall;
 import org.linphone.core.LinphoneChatRoom;
 import org.linphone.core.LinphoneCore;
+import org.linphone.core.LinphoneCore.EcCalibratorStatus;
 import org.linphone.core.LinphoneCoreException;
 import org.linphone.core.LinphoneCoreFactory;
 import org.linphone.core.LinphoneCoreListener;
@@ -73,7 +74,7 @@ public class TutorialChatRoom implements LinphoneCoreListener {
 	public void newSubscriptionRequest(LinphoneCore lc, LinphoneFriend lf,String url) {}
 	public void notifyPresenceReceived(LinphoneCore lc, LinphoneFriend lf) {}
 	public void callState(LinphoneCore lc, LinphoneCall call, State cstate, String msg){}
-
+	public void ecCalibrationStatus(LinphoneCore lc, EcCalibratorStatus status,int delay_ms, Object data) {}
 	
 	
 	public void textReceived(LinphoneCore lc, LinphoneChatRoom cr,LinphoneAddress from, String message) {
@@ -144,4 +145,5 @@ public class TutorialChatRoom implements LinphoneCoreListener {
 		TutorialNotifier.notify(s);
 	}
 
+
 }
diff --git a/coreapi/help/java/org/linphone/core/tutorials/TutorialHelloWorld.java b/coreapi/help/java/org/linphone/core/tutorials/TutorialHelloWorld.java
index 12451c940ace3ff750c5312eb120ec686ef1a08d..d9fdd4f41e22ed722183b9c9689db4d49248815f 100644
--- a/coreapi/help/java/org/linphone/core/tutorials/TutorialHelloWorld.java
+++ b/coreapi/help/java/org/linphone/core/tutorials/TutorialHelloWorld.java
@@ -22,6 +22,7 @@ import org.linphone.core.LinphoneAddress;
 import org.linphone.core.LinphoneCall;
 import org.linphone.core.LinphoneChatRoom;
 import org.linphone.core.LinphoneCore;
+import org.linphone.core.LinphoneCore.EcCalibratorStatus;
 import org.linphone.core.LinphoneCoreException;
 import org.linphone.core.LinphoneCoreFactory;
 import org.linphone.core.LinphoneCoreListener;
@@ -67,7 +68,7 @@ public class TutorialHelloWorld implements LinphoneCoreListener {
 	public void newSubscriptionRequest(LinphoneCore lc, LinphoneFriend lf,String url) {}
 	public void notifyPresenceReceived(LinphoneCore lc, LinphoneFriend lf) {}
 	public void textReceived(LinphoneCore lc, LinphoneChatRoom cr,LinphoneAddress from, String message) {}
-
+	public void ecCalibrationStatus(LinphoneCore lc, EcCalibratorStatus status,int delay_ms, Object data) {}
 	/*
 	 * Call state notification listener
 	 */
@@ -153,4 +154,5 @@ public class TutorialHelloWorld implements LinphoneCoreListener {
 		TutorialNotifier.notify(s);
 	}
 
+
 }
diff --git a/coreapi/help/java/org/linphone/core/tutorials/TutorialRegistration.java b/coreapi/help/java/org/linphone/core/tutorials/TutorialRegistration.java
index 9fbcb25c7aa4646b7992e13d54ef1c2eefd37460..c00ff9b73729613763f98f932becb892a784de07 100644
--- a/coreapi/help/java/org/linphone/core/tutorials/TutorialRegistration.java
+++ b/coreapi/help/java/org/linphone/core/tutorials/TutorialRegistration.java
@@ -22,6 +22,7 @@ import org.linphone.core.LinphoneAddress;
 import org.linphone.core.LinphoneCall;
 import org.linphone.core.LinphoneChatRoom;
 import org.linphone.core.LinphoneCore;
+import org.linphone.core.LinphoneCore.EcCalibratorStatus;
 import org.linphone.core.LinphoneCoreException;
 import org.linphone.core.LinphoneCoreFactory;
 import org.linphone.core.LinphoneCoreListener;
@@ -78,7 +79,7 @@ public class TutorialRegistration implements LinphoneCoreListener {
 	public void notifyPresenceReceived(LinphoneCore lc, LinphoneFriend lf) {}
 	public void textReceived(LinphoneCore lc, LinphoneChatRoom cr,LinphoneAddress from, String message) {}
 	public void callState(LinphoneCore lc, LinphoneCall call, State cstate, String msg) {}
-
+	public void ecCalibrationStatus(LinphoneCore lc, EcCalibratorStatus status,int delay_ms, Object data) {}
 
 	public static void main(String[] args) {
 		// Check tutorial was called with the right number of arguments
@@ -184,4 +185,6 @@ public class TutorialRegistration implements LinphoneCoreListener {
 		TutorialNotifier.notify(s);
 	}
 
+
+
 }
diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index cea826a25aacfdb285ce3f6e9418d5125679cb5b..d3935700d73fb3d66fcdddf03e9b227ce40d11c7 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -32,6 +32,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "mediastreamer2/msequalizer.h"
 #include "mediastreamer2/msfileplayer.h"
 #include "mediastreamer2/msjpegwriter.h"
+#include "mediastreamer2/mseventqueue.h"
 
 #ifdef VIDEO_ENABLED
 static MSWebCam *get_nowebcam_device(){
@@ -58,7 +59,7 @@ static MSList *make_codec_list(LinphoneCore *lc, const MSList *codecs, int bandw
 	return l;
 }
 
-SalMediaDescription *create_local_media_description(LinphoneCore *lc, LinphoneCall *call){
+static SalMediaDescription *_create_local_media_description(LinphoneCore *lc, LinphoneCall *call, unsigned int session_id, unsigned int session_ver){
 	MSList *l;
 	PayloadType *pt;
 	const char *me=linphone_core_get_identity(lc);
@@ -66,6 +67,8 @@ SalMediaDescription *create_local_media_description(LinphoneCore *lc, LinphoneCa
 	const char *username=linphone_address_get_username (addr);
 	SalMediaDescription *md=sal_media_description_new();
 	
+	md->session_id=session_id;
+	md->session_ver=session_ver;
 	md->nstreams=1;
 	strncpy(md->addr,call->localip,sizeof(md->addr));
 	strncpy(md->username,username,sizeof(md->username));
@@ -95,6 +98,22 @@ SalMediaDescription *create_local_media_description(LinphoneCore *lc, LinphoneCa
 	return md;
 }
 
+void update_local_media_description(LinphoneCore *lc, LinphoneCall *call, SalMediaDescription **md){
+	if (*md == NULL) {
+		*md = _create_local_media_description(lc,call,0,0);
+	} else {
+		unsigned int id = (*md)->session_id;
+		unsigned int ver = (*md)->session_ver+1;
+		sal_media_description_unref(*md);
+		*md = _create_local_media_description(lc,call,id,ver);
+	}
+}
+
+SalMediaDescription *create_local_media_description(LinphoneCore *lc, LinphoneCall *call){
+	unsigned int id=rand();
+	return _create_local_media_description(lc,call,id,id);
+}
+
 static int find_port_offset(LinphoneCore *lc){
 	int offset;
 	MSList *elem;
@@ -126,6 +145,7 @@ static void linphone_call_init_common(LinphoneCall *call, LinphoneAddress *from,
 	call->start_time=time(NULL);
 	call->media_start_time=0;
 	call->log=linphone_call_log_new(call, from, to);
+	call->owns_call_log=TRUE;
 	linphone_core_notify_all_friends(call->core,LinphoneStatusOnThePhone);
 	port_offset=find_port_offset (call->core);
 	if (port_offset==-1) return;
@@ -222,8 +242,10 @@ static void linphone_call_set_terminated(LinphoneCall *call){
 		else status=LinphoneCallSuccess;
 		
 	}
+	call->owns_call_log=FALSE;
 	linphone_call_log_completed(call->log,call, status);
 	
+	
 	if (call == lc->current_call){
 		ms_message("Resetting the current call");
 		lc->current_call=NULL;
@@ -236,13 +258,6 @@ static void linphone_call_set_terminated(LinphoneCall *call){
 	if (ms_list_size(lc->calls)==0)
 		linphone_core_notify_all_friends(lc,lc->presence_mode);
 	
-	if (call->op!=NULL) {
-		/* so that we cannot have anymore upcalls for SAL
-		 concerning this call*/
-		sal_op_release(call->op);
-		call->op=NULL;
-	}
-	linphone_call_unref(call);
 }
 
 const char *linphone_call_state_to_string(LinphoneCallState cs){
@@ -283,14 +298,23 @@ const char *linphone_call_state_to_string(LinphoneCallState cs){
 			return "LinphoneCallIncomingEarlyMedia";
 		case LinphoneCallUpdated:
 			return "LinphoneCallUpdated";
+		case LinphoneCallReleased:
+			return "LinphoneCallReleased";
 	}
 	return "undefined state";
 }
 
 void linphone_call_set_state(LinphoneCall *call, LinphoneCallState cstate, const char *message){
 	LinphoneCore *lc=call->core;
-	bool_t finalize_call=FALSE;
+
 	if (call->state!=cstate){
+		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));
+				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));
 		if (cstate!=LinphoneCallRefered){
@@ -299,14 +323,20 @@ void linphone_call_set_state(LinphoneCall *call, LinphoneCallState cstate, const
 			call->state=cstate;
 		}
 		if (cstate==LinphoneCallEnd || cstate==LinphoneCallError){
-			finalize_call=TRUE;
-			linphone_call_ref(call);
 			linphone_call_set_terminated (call);
 		}
+		
 		if (lc->vtable.call_state_changed)
 			lc->vtable.call_state_changed(lc,call,cstate,message);
-		if (finalize_call)
+		if (cstate==LinphoneCallReleased){
+			if (call->op!=NULL) {
+				/* so that we cannot have anymore upcalls for SAL
+				 concerning this call*/
+				sal_op_release(call->op);
+				call->op=NULL;
+			}
 			linphone_call_unref(call);
+		}
 	}
 }
 
@@ -330,6 +360,8 @@ static void linphone_call_destroy(LinphoneCall *obj)
 	if (obj->refer_to){
 		ms_free(obj->refer_to);
 	}
+	if (obj->owns_call_log)
+		linphone_call_log_destroy(obj->log);
 	ms_free(obj);
 }
 
@@ -473,6 +505,20 @@ int linphone_call_get_duration(const LinphoneCall *call){
 	return time(NULL)-call->media_start_time;
 }
 
+/**
+ * Returns the call object this call is replacing, if any.
+ * Call replacement can occur during call transfers.
+ * By default, the core automatically terminates the replaced call and accept the new one.
+ * This function allows the application to know whether a new incoming call is a one that replaces another one.
+**/
+LinphoneCall *linphone_call_get_replaced_call(LinphoneCall *call){
+	SalOp *op=sal_call_get_replaces(call->op);
+	if (op){
+		return (LinphoneCall*)sal_op_get_user_pointer(op);
+	}
+	return NULL;
+}
+
 /**
  * Indicate whether camera input should be sent to remote end.
 **/
@@ -505,21 +551,21 @@ int linphone_call_take_video_snapshot(LinphoneCall *call, const char *file){
 }
 
 /**
- *
+ * Returns TRUE if camera pictures are sent to the remote party.
 **/
 bool_t linphone_call_camera_enabled (const LinphoneCall *call){
 	return call->camera_active;
 }
 
 /**
- * 
+ * Enable video stream.
 **/
 void linphone_call_params_enable_video(LinphoneCallParams *cp, bool_t enabled){
 	cp->has_video=enabled;
 }
 
 /**
- *
+ * Returns whether video is enabled.
 **/
 bool_t linphone_call_params_video_enabled(const LinphoneCallParams *cp){
 	return cp->has_video;
@@ -969,6 +1015,7 @@ void linphone_call_stop_media_streams(LinphoneCall *call){
 		video_stream_stop(call->videostream);
 		call->videostream=NULL;
 	}
+	ms_event_queue_skip(call->core->msevq);
 	
 #endif
 	if (call->audio_profile){
diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 6af2fbfc9d5d5a1140c5ac663b92460a2036a2d8..167630e1a8e241895f9beed8c35e3c04e7b48193 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -49,6 +49,8 @@ static void toggle_video_preview(LinphoneCore *lc, bool_t val);
 #define LOCAL_RING "rings/oldphone.wav"
 /* same for remote ring (ringback)*/
 #define REMOTE_RING "ringback.wav"
+#define HOLD_MUSIC "rings/toy-mono.wav"
+
 
 extern SalCallbacks linphone_sal_callbacks;
 
@@ -452,6 +454,8 @@ static void sound_config_read(LinphoneCore *lc)
 		tmpbuf=PACKAGE_SOUND_DIR "/" REMOTE_RING;
 	}
 	linphone_core_set_ringback(lc,tmpbuf);
+
+	linphone_core_set_play_file(lc,lp_config_get_string(lc->config,"sound","hold_music",PACKAGE_SOUND_DIR "/" HOLD_MUSIC));
 	check_sound_device(lc);
 	lc->sound_conf.latency=0;
 
@@ -571,6 +575,7 @@ static void sip_config_read(LinphoneCore *lc)
 	lc->sip_conf.keepalive_period=lp_config_get_int(lc->config,"sip","keepalive_period",10000);
 	sal_set_keepalive_period(lc->sal,lc->sip_conf.keepalive_period);
 	sal_use_one_matching_codec_policy(lc->sal,lp_config_get_int(lc->config,"sip","only_one_codec",0));
+	sal_use_double_registrations(lc->sal,lp_config_get_int(lc->config,"sip","use_double_registrations",1));
 }
 
 static void rtp_config_read(LinphoneCore *lc)
@@ -590,6 +595,8 @@ static void rtp_config_read(LinphoneCore *lc)
 	jitt_comp=lp_config_get_int(lc->config,"rtp","audio_jitt_comp",60);
 	linphone_core_set_audio_jittcomp(lc,jitt_comp);
 	jitt_comp=lp_config_get_int(lc->config,"rtp","video_jitt_comp",60);
+	if (jitt_comp==0) jitt_comp=60;
+	lc->rtp_conf.video_jitt_comp=jitt_comp;
 	nortp_timeout=lp_config_get_int(lc->config,"rtp","nortp_timeout",30);
 	linphone_core_set_nortp_timeout(lc,nortp_timeout);
 	rtp_no_xmit_on_audio_mute=lp_config_get_int(lc->config,"rtp","rtp_no_xmit_on_audio_mute",FALSE);
@@ -910,7 +917,8 @@ static void linphone_core_init (LinphoneCore * lc, const LinphoneCoreVTable *vta
 {
 	memset (lc, 0, sizeof (LinphoneCore));
 	lc->data=userdata;
-
+	lc->ringstream_autorelease=TRUE;
+	
 	memcpy(&lc->vtable,vtable,sizeof(LinphoneCoreVTable));
 
 	linphone_core_set_state(lc,LinphoneGlobalStartup,"Starting up");
@@ -1635,6 +1643,19 @@ void linphone_core_iterate(LinphoneCore *lc){
 		one_second_elapsed=TRUE;
 	}
 
+	if (lc->ecc!=NULL){
+		LinphoneEcCalibratorStatus ecs=ec_calibrator_get_status(lc->ecc);
+		if (ecs!=LinphoneEcCalibratorInProgress){
+			if (lc->ecc->cb)
+				lc->ecc->cb(lc,ecs,lc->ecc->delay,lc->ecc->cb_data);
+			if (ecs==LinphoneEcCalibratorDone){
+				lp_config_set_int(lc->config, "sound", "ec_delay",MAX(lc->ecc->delay-10,0));
+			}
+			ec_calibrator_destroy(lc->ecc);
+			lc->ecc=NULL;
+		}
+	}
+
 	if (lc->preview_finished){
 		lc->preview_finished=0;
 		ring_stop(lc->ringstream);
@@ -1642,7 +1663,7 @@ void linphone_core_iterate(LinphoneCore *lc){
 		lc_callback_obj_invoke(&lc->preview_finished_cb,lc);
 	}
 
-	if (lc->ringstream && lc->dmfs_playing_start_time!=0 
+	if (lc->ringstream && lc->ringstream_autorelease && lc->dmfs_playing_start_time!=0 
 	    && (curtime-lc->dmfs_playing_start_time)>5){
 		ring_stop(lc->ringstream);
 		lc->ringstream=NULL;
@@ -2176,15 +2197,13 @@ bool_t linphone_core_inc_invite_pending(LinphoneCore*lc){
 int linphone_core_update_call(LinphoneCore *lc, LinphoneCall *call, const LinphoneCallParams *params){
 	int err=0;
 	if (params!=NULL){
-		if (call->localdesc)
-			sal_media_description_unref(call->localdesc);
 		call->params=*params;
-		call->localdesc=create_local_media_description (lc,call);
+		update_local_media_description(lc,call,&call->localdesc);
 		call->camera_active=params->has_video;
 		if (lc->vtable.display_status)
 			lc->vtable.display_status(lc,_("Modifying call parameters..."));
 		sal_call_set_local_media_description (call->op,call->localdesc);
-		err=sal_call_update(call->op);
+		err=sal_call_update(call->op,"Media parameters update");
 	}else{
 #ifdef VIDEO_ENABLED
 		if (call->videostream!=NULL){
@@ -2411,13 +2430,23 @@ LinphoneCall *linphone_core_get_current_call(const LinphoneCore *lc)
 int linphone_core_pause_call(LinphoneCore *lc, LinphoneCall *the_call)
 {
 	LinphoneCall *call = the_call;
+	const char *subject=NULL;
 
 	if (call->state!=LinphoneCallStreamsRunning && call->state!=LinphoneCallPausedByRemote){
 		ms_warning("Cannot pause this call, it is not active.");
 		return -1;
 	}
-	
-	if (sal_call_hold(call->op,TRUE) != 0)
+	if (sal_media_description_has_dir(call->resultdesc,SalStreamSendRecv)){
+		sal_media_description_set_dir(call->localdesc,SalStreamSendOnly);
+		subject="Call on hold";
+	}else if (sal_media_description_has_dir(call->resultdesc,SalStreamRecvOnly)){
+		sal_media_description_set_dir(call->localdesc,SalStreamSendOnly);
+		subject="Call on hold for me too";
+	}else{
+		ms_error("No reason to pause this call, it is already paused or inactive.");
+		return -1;
+	}
+	if (sal_call_update(call->op,subject) != 0)
 	{
 		if (lc->vtable.display_warning)
 			lc->vtable.display_warning(lc,_("Could not pause the call"));
@@ -2467,14 +2496,14 @@ int linphone_core_resume_call(LinphoneCore *lc, LinphoneCall *the_call)
 		return -1;
 	}
 	ms_message("Resuming call %p",call);
-	if(sal_call_hold(call->op,FALSE) != 0){
+	sal_media_description_set_dir(call->localdesc,SalStreamSendRecv);
+	if(sal_call_update(call->op,"Call resuming") != 0){
 		return -1;
 	}
 	linphone_call_set_state (call,LinphoneCallResuming,"Resuming");
 	snprintf(temp,sizeof(temp)-1,"Resuming the call with %s",linphone_call_get_remote_address_as_string(call));
 	if (lc->vtable.display_status) 
 		lc->vtable.display_status(lc,temp);
-	lc->current_call=call;
 	return 0;
 }
 
@@ -2687,6 +2716,7 @@ static MSSndCard *get_card_from_string_id(const char *devid, unsigned int cap){
  * Returns true if the specified sound device can capture sound.
  *
  * @ingroup media_parameters
+ * @param lc The LinphoneCore object
  * @param devid the device name as returned by linphone_core_get_sound_devices()
 **/
 bool_t linphone_core_sound_device_can_capture(LinphoneCore *lc, const char *devid){
@@ -2700,6 +2730,7 @@ bool_t linphone_core_sound_device_can_capture(LinphoneCore *lc, const char *devi
  * Returns true if the specified sound device can play sound.
  *
  * @ingroup media_parameters
+ * @param lc The LinphoneCore object
  * @param devid the device name as returned by linphone_core_get_sound_devices()
 **/
 bool_t linphone_core_sound_device_can_playback(LinphoneCore *lc, const char *devid){
@@ -2713,6 +2744,7 @@ bool_t linphone_core_sound_device_can_playback(LinphoneCore *lc, const char *dev
  * Sets the sound device used for ringing.
  *
  * @ingroup media_parameters
+ * @param lc The LinphoneCore object
  * @param devid the device name as returned by linphone_core_get_sound_devices()
 **/
 int linphone_core_set_ringer_device(LinphoneCore *lc, const char * devid){
@@ -2727,6 +2759,7 @@ int linphone_core_set_ringer_device(LinphoneCore *lc, const char * devid){
  * Sets the sound device used for playback.
  *
  * @ingroup media_parameters
+ * @param lc The LinphoneCore object
  * @param devid the device name as returned by linphone_core_get_sound_devices()
 **/
 int linphone_core_set_playback_device(LinphoneCore *lc, const char * devid){
@@ -2741,6 +2774,7 @@ int linphone_core_set_playback_device(LinphoneCore *lc, const char * devid){
  * Sets the sound device used for capture.
  *
  * @ingroup media_parameters
+ * @param lc The LinphoneCore object
  * @param devid the device name as returned by linphone_core_get_sound_devices()
 **/
 int linphone_core_set_capture_device(LinphoneCore *lc, const char * devid){
@@ -2755,6 +2789,7 @@ int linphone_core_set_capture_device(LinphoneCore *lc, const char * devid){
  * Returns the name of the currently assigned sound device for ringing.
  *
  * @ingroup media_parameters
+ * @param lc The LinphoneCore object
 **/
 const char * linphone_core_get_ringer_device(LinphoneCore *lc)
 {
@@ -2766,6 +2801,7 @@ const char * linphone_core_get_ringer_device(LinphoneCore *lc)
  * Returns the name of the currently assigned sound device for playback.
  *
  * @ingroup media_parameters
+ * @param lc The LinphoneCore object
 **/
 const char * linphone_core_get_playback_device(LinphoneCore *lc)
 {
@@ -2776,6 +2812,7 @@ const char * linphone_core_get_playback_device(LinphoneCore *lc)
  * Returns the name of the currently assigned sound device for capture.
  *
  * @ingroup media_parameters
+ * @param lc The LinphoneCore object
 **/
 const char * linphone_core_get_capture_device(LinphoneCore *lc)
 {
@@ -2785,8 +2822,10 @@ const char * linphone_core_get_capture_device(LinphoneCore *lc)
 /**
  * Returns an unmodifiable array of available sound devices.
  *
- * @ingroup media_parameters
  * The array is NULL terminated.
+ *
+ * @ingroup media_parameters
+ * @param lc The LinphoneCore object
 **/
 const char**  linphone_core_get_sound_devices(LinphoneCore *lc){
 	build_sound_devices_table(lc);
@@ -2829,14 +2868,17 @@ void linphone_core_set_sound_source(LinphoneCore *lc, char source)
  * Sets the path to a wav file used for ringing.
  *
  * @param path The file must be a wav 16bit linear. Local ring is disabled if null
+ * @param lc The LinphoneCore object
  *
  * @ingroup media_parameters
 **/
 void linphone_core_set_ring(LinphoneCore *lc,const char *path){
 	if (lc->sound_conf.local_ring!=0){
 		ms_free(lc->sound_conf.local_ring);
+		lc->sound_conf.local_ring=NULL;
 	}
-	lc->sound_conf.local_ring=ms_strdup(path);
+	if (path)
+		lc->sound_conf.local_ring=ms_strdup(path);
 	if ( linphone_core_ready(lc) && lc->sound_conf.local_ring)
 		lp_config_set_string(lc->config,"sound","local_ring",lc->sound_conf.local_ring);
 }
@@ -2844,6 +2886,7 @@ void linphone_core_set_ring(LinphoneCore *lc,const char *path){
 /**
  * Returns the path to the wav file used for ringing.
  *
+ * @param lc The LinphoneCore object
  * @ingroup media_parameters
 **/
 const char *linphone_core_get_ring(const LinphoneCore *lc){
@@ -3112,6 +3155,7 @@ static void toggle_video_preview(LinphoneCore *lc, bool_t val){
  * initiate future calls with video or not. The two boolean parameters indicate in which
  * direction video is enabled. Setting both to false disables video entirely.
  *
+ * @param lc The LinphoneCore object
  * @param vcap_enabled indicates whether video capture is enabled
  * @param display_enabled indicates whether video display should be shown
  *
@@ -3191,6 +3235,7 @@ bool_t linphone_core_self_view_enabled(const LinphoneCore *lc){
  * Sets the active video device.
  *
  * @ingroup media_parameters
+ * @param lc The LinphoneCore object
  * @param id the name of the video device as returned by linphone_core_get_video_devices()
 **/
 int linphone_core_set_video_device(LinphoneCore *lc, const char *id){
@@ -3220,6 +3265,7 @@ int linphone_core_set_video_device(LinphoneCore *lc, const char *id){
 /**
  * Returns the name of the currently active video device.
  *
+ * @param lc The LinphoneCore object
  * @ingroup media_parameters
 **/
 const char *linphone_core_get_video_device(const LinphoneCore *lc){
@@ -3371,6 +3417,10 @@ void linphone_core_use_preview_window(LinphoneCore *lc, bool_t yesno){
 }
 
 static MSVideoSizeDef supported_resolutions[]={
+#ifdef ENABLE_HD
+	{	{MS_VIDEO_SIZE_1080P_W,MS_VIDEO_SIZE_1080P_H}	,	"1080p"	},
+	{	{MS_VIDEO_SIZE_720P_W,MS_VIDEO_SIZE_720P_H}	,	"1080p"	},
+#endif
 	{	{MS_VIDEO_SIZE_SVGA_W,MS_VIDEO_SIZE_SVGA_H}	,	"svga"	},
 	{	{MS_VIDEO_SIZE_4CIF_W,MS_VIDEO_SIZE_4CIF_H}	,	"4cif"	},
 	{	{MS_VIDEO_SIZE_VGA_W,MS_VIDEO_SIZE_VGA_H}	,	"vga"	},
@@ -3519,8 +3569,10 @@ static MSFilter *get_dtmf_gen(LinphoneCore *lc){
 		}
 	}
 	if (lc->ringstream==NULL){
+		float amp=0.1;
 		MSSndCard *ringcard=lc->sound_conf.lsd_card ?lc->sound_conf.lsd_card : lc->sound_conf.ring_sndcard;
 		lc->ringstream=ring_start(NULL,0,ringcard);
+		ms_filter_call_method(lc->ringstream->gendtmf,MS_DTMF_GEN_SET_DEFAULT_AMPLITUDE,&amp);
 		lc->dmfs_playing_start_time=time(NULL);
 	}else{
 		if (lc->dmfs_playing_start_time!=0)
@@ -3688,7 +3740,7 @@ void sip_config_uninit(LinphoneCore *lc)
 	linphone_proxy_config_write_to_config_file(lc->config,NULL,i);
 
 	for (i=0;i<20;i++){
-		linphone_core_iterate(lc);
+		sal_iterate(lc->sal);
 #ifndef WIN32
 		usleep(100000);
 #else
@@ -3825,7 +3877,6 @@ static void linphone_core_uninit(LinphoneCore *lc)
 		usleep(50000);
 #endif
 	}
-
 	if (lc->friends)
 		ms_list_for_each(lc->friends,(void (*)(void *))linphone_friend_close_subscriptions);
 	linphone_core_set_state(lc,LinphoneGlobalShutdown,"Shutting down");
@@ -3839,12 +3890,13 @@ static void linphone_core_uninit(LinphoneCore *lc)
 	lc->msevq=NULL;
 	/* save all config */
 	net_config_uninit(lc);
-	sip_config_uninit(lc);
 	rtp_config_uninit(lc);
+	if (lc->ringstream) ring_stop(lc->ringstream);
 	sound_config_uninit(lc);
 	video_config_uninit(lc);
 	codecs_config_uninit(lc);
 	ui_config_uninit(lc);
+	sip_config_uninit(lc);
 	if (lp_config_needs_commit(lc->config)) lp_config_sync(lc->config);
 	lp_config_destroy(lc->config);
 	lc->config = NULL; /* Mark the config as NULL to block further calls */
@@ -3854,7 +3906,6 @@ static void linphone_core_uninit(LinphoneCore *lc)
 	lc->call_logs=ms_list_free(lc->call_logs);
 
 	linphone_core_free_payload_types();
-
 	ortp_exit();
 	linphone_core_set_state(lc,LinphoneGlobalOff,"Off");
 }
@@ -3875,8 +3926,24 @@ static void set_network_reachable(LinphoneCore* lc,bool_t isReachable, time_t cu
 	}
 	lc->netup_time=curtime;
 	lc->network_reachable=isReachable;
-}
+	if(!isReachable) {
+		sal_unlisten_ports (lc->sal);
+	} else {
+		apply_transports(lc);
+	}
 
+}
+void linphone_core_refresh_registers(LinphoneCore* lc) {
+	const MSList *elem=linphone_core_get_proxy_config_list(lc);
+	for(;elem!=NULL;elem=elem->next){
+		LinphoneProxyConfig *cfg=(LinphoneProxyConfig*)elem->data;
+		if (linphone_proxy_config_register_enabled(cfg) ) {
+			cfg->registered=0;
+			cfg->commit=TRUE;
+		}
+	}
+	
+}
 void linphone_core_set_network_reachable(LinphoneCore* lc,bool_t isReachable) {
 	//first disable automatic mode
 	if (lc->auto_net_state_mon) {
@@ -4044,4 +4111,31 @@ const char *linphone_error_to_string(LinphoneReason err){
 	}
 	return "unknown error";
 }
+/**
+ * enable signaling keep alive
+ */
+void linphone_core_enable_keep_alive(LinphoneCore* lc,bool_t enable) {
+	if (enable > 0) {
+		sal_set_keepalive_period(lc->sal,lc->sip_conf.keepalive_period);
+	} else {
+		sal_set_keepalive_period(lc->sal,0);
+	}
+}
+/**
+ * Is signaling keep alive
+ */
+bool_t linphone_core_keep_alive_enabled(LinphoneCore* lc) {
+	return sal_get_keepalive_period(lc->sal) > 0;
+}
+	
+void linphone_core_start_dtmf_stream(LinphoneCore* lc) {
+	get_dtmf_gen(lc); /*make sure ring stream is started*/
+	lc->ringstream_autorelease=FALSE; /*disable autorelease mode*/
+}
+
+void linphone_core_stop_dtmf_stream(LinphoneCore* lc) {
+	if (lc->ringstream) ring_stop(lc->ringstream);
+	lc->ringstream=NULL;
+}
+
 
diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h
index a2f86f429fe4380193c4dff76c049d12ae79c5e8..5e83ba462b8b6ffd7691343611d905ec3bd071ca 100644
--- a/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@ -185,6 +185,7 @@ void linphone_call_params_destroy(LinphoneCallParams *cp);
 
 /**
  * Enum describing failure reasons.
+ * @ingroup initializing
 **/
 enum _LinphoneReason{
 	LinphoneReasonNone,
@@ -203,8 +204,13 @@ const char *linphone_reason_to_string(LinphoneReason err);
 struct _LinphoneCall;
 typedef struct _LinphoneCall LinphoneCall;
 
+/**
+ * LinphoneCallState enum represents the different state a call can reach into.
+ * The application is notified of state changes through the LinphoneCoreVTable::call_state_changed callback.
+ * @ingroup call_control
+**/
 typedef enum _LinphoneCallState{
-	LinphoneCallIdle,
+	LinphoneCallIdle,					/**<Initial call state */
 	LinphoneCallIncomingReceived, /**<This is a new incoming call */
 	LinphoneCallOutgoingInit, /**<An outgoing call is started */
 	LinphoneCallOutgoingProgress, /**<An outgoing call is in progress */
@@ -221,7 +227,8 @@ typedef enum _LinphoneCallState{
 	LinphoneCallPausedByRemote, /**<The call is paused by remote end*/
 	LinphoneCallUpdatedByRemote, /**<The call's parameters are updated, used for example when video is asked by remote */
 	LinphoneCallIncomingEarlyMedia, /**<We are proposing early media to an incoming call */
-	LinphoneCallUpdated /**<The remote accepted the call update initiated by us */
+	LinphoneCallUpdated, /**<The remote accepted the call update initiated by us */
+	LinphoneCallReleased /**< The call object is no more retained by the core */
 } LinphoneCallState;
 
 const char *linphone_call_state_to_string(LinphoneCallState cs);
@@ -238,6 +245,7 @@ void linphone_call_unref(LinphoneCall *call);
 LinphoneCallLog *linphone_call_get_call_log(const LinphoneCall *call);
 const char *linphone_call_get_refer_to(const LinphoneCall *call);
 bool_t linphone_call_has_transfer_pending(const LinphoneCall *call);
+LinphoneCall *linphone_call_get_replaced_call(LinphoneCall *call);
 int linphone_call_get_duration(const LinphoneCall *call);
 const LinphoneCallParams * linphone_call_get_current_params(const LinphoneCall *call);
 void linphone_call_enable_camera(LinphoneCall *lc, bool_t enabled);
@@ -301,11 +309,11 @@ typedef struct _LinphoneProxyConfig LinphoneProxyConfig;
  * LinphoneRegistrationState describes proxy registration states.
 **/
 typedef enum _LinphoneRegistrationState{
-	LinphoneRegistrationNone,
-	LinphoneRegistrationProgress,
-	LinphoneRegistrationOk,
-	LinphoneRegistrationCleared,
-	LinphoneRegistrationFailed
+	LinphoneRegistrationNone, /**<Initial state for registrations */
+	LinphoneRegistrationProgress, /**<Registration is in progress */
+	LinphoneRegistrationOk,	/**< Registration is successful */
+	LinphoneRegistrationCleared, /**< Unregistration succeeded */
+	LinphoneRegistrationFailed	/**<Registration failed */
 }LinphoneRegistrationState;
 
 /**
@@ -484,6 +492,17 @@ void * linphone_chat_room_get_user_data(LinphoneChatRoom *cr);
 /**
  * @}
  */
+
+
+/**
+ * @addtogroup initializing
+ * @{
+**/
+
+/**
+ * LinphoneGlobalState describes the global state of the LinphoneCore object.
+ * It is notified via the LinphoneCoreVTable::global_state_changed
+**/
 typedef enum _LinphoneGlobalState{
 	LinphoneGlobalOff,
 	LinphoneGlobalStartup,
@@ -493,11 +512,6 @@ typedef enum _LinphoneGlobalState{
 
 const char *linphone_global_state_to_string(LinphoneGlobalState gs);
 
-/**
- * @addtogroup initializing
- * @{
-**/
-
 
 /**Call state notification callback prototype*/
 typedef void (*LinphoneGlobalStateCb)(struct _LinphoneCore *lc, LinphoneGlobalState gstate, const char *message);
@@ -919,6 +933,14 @@ void linphone_core_set_network_reachable(LinphoneCore* lc,bool_t value);
  */
 bool_t linphone_core_is_network_reachabled(LinphoneCore* lc);
 
+/**
+ *  enable signaling keep alive. small udp packet sent periodically to keep udp NAT association
+ */
+void linphone_core_enable_keep_alive(LinphoneCore* lc,bool_t enable);
+/**
+ * Is signaling keep alive
+ */
+bool_t linphone_core_keep_alive_enabled(LinphoneCore* lc);
 
 void *linphone_core_get_user_data(LinphoneCore *lc);
 
@@ -950,7 +972,11 @@ int linphone_core_get_current_call_stats(LinphoneCore *lc, rtp_stats_t *local, r
 const MSList *linphone_core_get_calls(LinphoneCore *lc);
 
 LinphoneGlobalState linphone_core_get_global_state(const LinphoneCore *lc);
-
+/**
+ * force registration refresh to be initiated upon next iterate
+ * @ingroup proxies
+ */
+void linphone_core_refresh_registers(LinphoneCore* lc);	
 #ifdef __cplusplus
 }
 #endif
diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index 7eca2c823ae3c6ae617b6a1bd21be8d995374596..1876fb9ee8223715f168362f09b3e50b160e8a8c 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -17,7 +17,8 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 #include <jni.h>
-#include "linphonecore.h"
+#include "linphonecore_utils.h"
+
 #include "mediastreamer2/msjava.h"
 
 #ifdef ANDROID
@@ -100,7 +101,10 @@ public:
 		callStateId = env->GetMethodID(listernerClass,"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;");
-
+		/*void ecCalibrationStatus(LinphoneCore.EcCalibratorStatus status, int delay_ms, Object data);*/
+		ecCalibrationStatusId = env->GetMethodID(listernerClass,"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;");
 		/*void newSubscriptionRequest(LinphoneCore lc, LinphoneFriend lf, String url)*/
 		newSubscriptionRequestId = env->GetMethodID(listernerClass,"newSubscriptionRequest","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneFriend;Ljava/lang/String;)V");
 
@@ -165,6 +169,10 @@ public:
 	jmethodID callStateId;
 	jmethodID callStateFromIntId;
 
+	jclass ecCalibratorStatusClass;
+	jmethodID ecCalibrationStatusId;
+	jmethodID ecCalibratorStatusFromIntId;
+
 	jclass proxyClass;
 	jmethodID proxyCtrId;
 
@@ -290,6 +298,26 @@ public:
 							,env->NewObject(lcData->addressClass,lcData->addressCtrId,(jlong)from)
 							,message ? env->NewStringUTF(message) : NULL);
 	}
+	static void ecCalibrationStatus(LinphoneCore *lc, LinphoneEcCalibratorStatus status, int delay_ms, void *data) {
+		JNIEnv *env = 0;
+		jint result = jvm->AttachCurrentThread(&env,NULL);
+		if (result != 0) {
+			ms_error("cannot attach VM\n");
+			return;
+		}
+		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_get_user_data(lc);
+		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);
+		}
+
+	}
 
 
 };
@@ -615,6 +643,29 @@ extern "C" jstring Java_org_linphone_core_LinphoneCoreImpl_getRing(JNIEnv*  env
 		return NULL;
 	}
 }
+extern "C" void Java_org_linphone_core_LinphoneCoreImpl_enableKeepAlive(JNIEnv*  env
+																,jobject  thiz
+																,jlong lc
+																,jboolean enable) {
+	linphone_core_enable_keep_alive((LinphoneCore*)lc,enable);
+
+}
+extern "C" jboolean Java_org_linphone_core_LinphoneCoreImpl_isKeepAliveEnabled(JNIEnv*  env
+																,jobject  thiz
+																,jlong lc) {
+	return linphone_core_keep_alive_enabled((LinphoneCore*)lc);
+
+}
+extern "C" jint Java_org_linphone_core_LinphoneCoreImpl_startEchoCalibration(JNIEnv*  env
+																				,jobject  thiz
+																				,jlong lc
+																				,jobject data) {
+	return linphone_core_start_echo_calibration((LinphoneCore*)lc
+													, LinphoneCoreData::ecCalibrationStatus
+													, data?env->NewGlobalRef(data):NULL);
+
+}
+
 
 
 //ProxyConfig
@@ -939,6 +990,12 @@ extern "C" jboolean Java_org_linphone_core_LinphoneCallImpl_isEchoLimiterEnabled
 	return linphone_call_echo_limiter_enabled((LinphoneCall*)ptr);
 }
 
+extern "C" jlong Java_org_linphone_core_LinphoneCallImpl_getReplacedCall(	JNIEnv*  env
+																		,jobject  thiz
+																		,jlong ptr) {
+	return (jlong)linphone_call_get_replaced_call((LinphoneCall*)ptr);
+}
+
 
 //LinphoneFriend
 extern "C" long Java_org_linphone_core_LinphoneFriendImpl_newLinphoneFriend(JNIEnv*  env
diff --git a/coreapi/linphonecore_utils.h b/coreapi/linphonecore_utils.h
index 8c29ef1afe5883f7c7d6e434d6cda5e63ed43d88..a6845da9e62e83c4f75f75a4b139ed4c8fe584ea 100644
--- a/coreapi/linphonecore_utils.h
+++ b/coreapi/linphonecore_utils.h
@@ -25,6 +25,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #else
 #include "linphone/linphonecore.h"
 #endif
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 typedef struct _LsdPlayer LsdPlayer;
 typedef struct _LinphoneSoundDaemon LinphoneSoundDaemon;
@@ -49,4 +52,35 @@ void linphone_sound_daemon_release_all_players(LinphoneSoundDaemon *obj);
 void linphone_core_use_sound_daemon(LinphoneCore *lc, LinphoneSoundDaemon *lsd);
 void linphone_sound_daemon_destroy(LinphoneSoundDaemon *obj);
 
+/**
+ * Enum describing the result of the echo canceller calibration process.
+**/
+typedef enum {
+	LinphoneEcCalibratorInProgress,
+	LinphoneEcCalibratorDone,
+	LinphoneEcCalibratorFailed
+}LinphoneEcCalibratorStatus;
+
+
+typedef void (*LinphoneEcCalibrationCallback)(LinphoneCore *lc, LinphoneEcCalibratorStatus status, int delay_ms, void *data);
+
+/**
+ * Start an echo calibration of the sound devices, in order to find adequate settings for the echo canceller automatically.
+**/
+int linphone_core_start_echo_calibration(LinphoneCore *lc, LinphoneEcCalibrationCallback cb, void *cb_data);
+#if TARGET_OS_IPHONE	
+/**
+ * IOS special function to warm up  dtmf feeback stream. #linphone_core_stop_dtmf_stream must be called before entering BG mode
+ */
+void linphone_core_start_dtmf_stream(const LinphoneCore* lc);
+/**
+ * IOS special function to stop dtmf feed back function. Must be called before entering BG mode
+ */
+void linphone_core_stop_dtmf_stream(const LinphoneCore* lc);
+#endif
+
+	
+#ifdef __cplusplus
+}
+#endif
 #endif
diff --git a/coreapi/offeranswer.c b/coreapi/offeranswer.c
index 91de86e2933b77ce8e0490b80ac4d5f9fee985d6..cbc88c2c14c5a79b35ac3b18442b0e7d366d1fbe 100644
--- a/coreapi/offeranswer.c
+++ b/coreapi/offeranswer.c
@@ -109,7 +109,7 @@ static MSList *match_payloads(const MSList *local, const MSList *remote, bool_t
 
 
 
-static SalStreamDir compute_dir(SalStreamDir local, SalStreamDir answered){
+static SalStreamDir compute_dir_outgoing(SalStreamDir local, SalStreamDir answered){
 	SalStreamDir res=local;
 	if (local==SalStreamSendRecv){
 		if (answered==SalStreamRecvOnly){
@@ -124,6 +124,30 @@ static SalStreamDir compute_dir(SalStreamDir local, SalStreamDir answered){
 	return res;
 }
 
+static SalStreamDir compute_dir_incoming(SalStreamDir local, SalStreamDir offered){
+	SalStreamDir res=SalStreamSendRecv;
+	if (local==SalStreamSendRecv){
+		if (offered==SalStreamSendOnly)
+			res=SalStreamRecvOnly;
+		else if (offered==SalStreamRecvOnly)
+			res=SalStreamSendOnly;
+		else if (offered==SalStreamInactive)
+			res=SalStreamInactive;
+		else
+			res=SalStreamSendRecv;
+	}else if (local==SalStreamSendOnly){
+		if (offered==SalStreamRecvOnly || offered==SalStreamSendRecv)
+			res=SalStreamSendOnly;
+		else res=SalStreamInactive;
+	}else if (local==SalStreamRecvOnly){
+		if (offered==SalStreamSendOnly || offered==SalStreamSendRecv)
+			res=SalStreamRecvOnly;
+		else
+			res=SalStreamInactive;
+	}else res=SalStreamInactive;
+	return res;
+}
+
 static void initiate_outgoing(const SalStreamDescription *local_offer,
     					const SalStreamDescription *remote_answer,
     					SalStreamDescription *result){
@@ -131,7 +155,7 @@ static void initiate_outgoing(const SalStreamDescription *local_offer,
 		result->payloads=match_payloads(local_offer->payloads,remote_answer->payloads,TRUE,FALSE);
 	result->proto=local_offer->proto;
 	result->type=local_offer->type;
-	result->dir=compute_dir(local_offer->dir,remote_answer->dir);
+	result->dir=compute_dir_outgoing(local_offer->dir,remote_answer->dir);
 
 	if (result->payloads && !only_telephone_event(result->payloads)){
 		strcpy(result->addr,remote_answer->addr);
@@ -150,13 +174,7 @@ static void initiate_incoming(const SalStreamDescription *local_cap,
 	result->payloads=match_payloads(local_cap->payloads,remote_offer->payloads, FALSE, one_matching_codec);
 	result->proto=local_cap->proto;
 	result->type=local_cap->type;
-	if (remote_offer->dir==SalStreamSendOnly)
-		result->dir=SalStreamRecvOnly;
-	else if (remote_offer->dir==SalStreamRecvOnly){
-		result->dir=SalStreamSendOnly;
-	}else if (remote_offer->dir==SalStreamInactive){
-		result->dir=SalStreamInactive;
-	}else result->dir=SalStreamSendRecv;
+	result->dir=compute_dir_incoming(local_cap->dir,remote_offer->dir);
 	if (result->payloads && !only_telephone_event(result->payloads)){
 		strcpy(result->addr,local_cap->addr);
 		result->port=local_cap->port;
@@ -200,22 +218,30 @@ int offer_answer_initiate_outgoing(const SalMediaDescription *local_offer,
 int offer_answer_initiate_incoming(const SalMediaDescription *local_capabilities,
 						const SalMediaDescription *remote_offer,
     					SalMediaDescription *result, bool_t one_matching_codec){
-    int i,j;
+    int i;
 	const SalStreamDescription *ls,*rs;
 							
-    for(i=0,j=0;i<remote_offer->nstreams;++i){
+    for(i=0;i<remote_offer->nstreams;++i){
 		rs=&remote_offer->streams[i];
 		ms_message("Processing for stream %i",i);
 		ls=sal_media_description_find_stream((SalMediaDescription*)local_capabilities,rs->proto,rs->type);
 		if (ls){
-    		initiate_incoming(ls,rs,&result->streams[j],one_matching_codec);
-			++j;
+    		initiate_incoming(ls,rs,&result->streams[i],one_matching_codec);
+		} else {
+			/* create an inactive stream for the answer, as there where no matching stream a local capability */
+			result->streams[i].dir=SalStreamInactive;
+			result->streams[i].port=0;
+			result->streams[i].type=rs->type;
+			if (rs->type==SalOther){
+				strncpy(result->streams[i].typeother,rs->typeother,sizeof(rs->typeother)-1);
+			}
 		}
     }
-	result->nstreams=j;
+	result->nstreams=i;
 	strcpy(result->username, local_capabilities->username);
 	strcpy(result->addr,local_capabilities->addr);
 	result->bandwidth=local_capabilities->bandwidth;
+	result->session_ver=local_capabilities->session_ver;
+	result->session_id=local_capabilities->session_id;
 	return 0;
 }
-    					
diff --git a/coreapi/private.h b/coreapi/private.h
index 5759bbc19a67778a2e65a94516965f06a8ffec35..2c3966a3bc28d318476ef1655c311cd4318fe2b7 100644
--- a/coreapi/private.h
+++ b/coreapi/private.h
@@ -26,6 +26,7 @@
 #define _PRIVATE_H
 
 #include "linphonecore.h"
+#include "linphonecore_utils.h"
 #include "sal.h"
 
 #ifdef HAVE_CONFIG_H
@@ -97,6 +98,7 @@ struct _LinphoneCall
 	bool_t camera_active;
 	bool_t all_muted; /*this flag is set during early medias*/
 	bool_t playing_ringbacktone;
+	bool_t owns_call_log;
 };
 
 
@@ -424,6 +426,7 @@ struct _LinphoneCore
 	unsigned long video_window_id;
 	unsigned long preview_window_id;
 	time_t netup_time; /*time when network went reachable */
+	struct _EcCalibrator *ecc;
 	bool_t use_files;
 	bool_t apply_nat_settings;
 	bool_t initial_subscribes_sent;
@@ -432,6 +435,7 @@ struct _LinphoneCore
 	bool_t auto_net_state_mon;
 	bool_t network_reachable;
 	bool_t use_preview_window;
+	bool_t ringstream_autorelease;
 };
 
 bool_t linphone_core_can_we_add_call(LinphoneCore *lc);
@@ -443,6 +447,7 @@ int linphone_core_get_calls_nb(const LinphoneCore *lc);
 void linphone_core_set_state(LinphoneCore *lc, LinphoneGlobalState gstate, const char *message);
 
 SalMediaDescription *create_local_media_description(LinphoneCore *lc, LinphoneCall *call);
+void update_local_media_description(LinphoneCore *lc, LinphoneCall *call, SalMediaDescription **md);
 
 void linphone_core_update_streams(LinphoneCore *lc, LinphoneCall *call, SalMediaDescription *new_md);
 
@@ -451,6 +456,27 @@ bool_t linphone_core_is_payload_type_usable_for_bandwidth(LinphoneCore *lc, Payl
 #define linphone_core_ready(lc) ((lc)->state!=LinphoneGlobalStartup)
 void _linphone_core_configure_resolver();
 
+struct _EcCalibrator{
+	ms_thread_t thread;
+	MSSndCard *play_card,*capt_card;
+	MSFilter *sndread,*det,*rec;
+	MSFilter *play, *gen, *sndwrite,*resampler;
+	MSTicker *ticker;
+	LinphoneEcCalibrationCallback cb;
+	void *cb_data;
+	int recv_count;
+	int sent_count;
+	int64_t acc;
+	int delay;
+	LinphoneEcCalibratorStatus status;
+};
+
+typedef struct _EcCalibrator EcCalibrator;
+
+LinphoneEcCalibratorStatus ec_calibrator_get_status(EcCalibrator *ecc);
+
+void ec_calibrator_destroy(EcCalibrator *ecc);
+
 #define HOLD_OFF	(0)
 #define HOLD_ON		(1)
 
diff --git a/coreapi/proxy.c b/coreapi/proxy.c
index f49c59f12e3f0d948f5ea73a3a078022bdb3d602..674422be94f6eff437c2834759aa0f89033c42bf 100644
--- a/coreapi/proxy.c
+++ b/coreapi/proxy.c
@@ -249,13 +249,14 @@ static char *guess_contact_for_register(LinphoneProxyConfig *obj){
 	if (host!=NULL){
 		LinphoneAddress *contact;
 		char localip[LINPHONE_IPADDR_SIZE];
+		LCSipTransports tr;
 		
 		linphone_core_get_local_ip(obj->lc,host,localip);
 		contact=linphone_address_new(obj->reg_identity);
 		linphone_address_set_domain (contact,localip);
 		linphone_address_set_port_int(contact,linphone_core_get_sip_port(obj->lc));
 		linphone_address_set_display_name(contact,NULL);
-		LCSipTransports tr;
+		
 		linphone_core_get_sip_transports(obj->lc,&tr);
 		if (tr.udp_port <= 0 && tr.tcp_port>0) {
 			sal_address_add_param(contact,"transport","tcp");
diff --git a/coreapi/sal.c b/coreapi/sal.c
index 6f80436c624787096261898bc183cb6959da4637..b25f3945130230a8fdc487d701bdb8e8cfe82c3c 100644
--- a/coreapi/sal.c
+++ b/coreapi/sal.c
@@ -79,19 +79,41 @@ void sal_media_description_set_dir(SalMediaDescription *md, SalStreamDir stream_
 	}
 }
 
-bool_t sal_media_description_has_dir(const SalMediaDescription *md, SalStreamDir stream_dir){
+
+static bool_t is_null_address(const char *addr){
+	return strcmp(addr,"0.0.0.0")==0 || strcmp(addr,"::0")==0;
+}
+
+/*check for the presence of at least one stream with requested direction */
+static bool_t has_dir(const SalMediaDescription *md, SalStreamDir stream_dir){
 	int i;
-	bool_t found=FALSE;
 
 	/* we are looking for at least one stream with requested direction, inactive streams are ignored*/
 	for(i=0;i<md->nstreams;++i){
 		const SalStreamDescription *ss=&md->streams[i];
-		if (ss->dir==stream_dir) found=TRUE;
-		else{
-			if (ss->dir!=SalStreamInactive) return FALSE;
-		}
+		if (ss->dir==stream_dir) return TRUE;
+		if (stream_dir==SalStreamSendOnly && (is_null_address(md->addr) || is_null_address(ss->addr)))
+			return TRUE;
 	}
-	return found;
+	return FALSE;
+}
+
+bool_t sal_media_description_has_dir(const SalMediaDescription *md, SalStreamDir stream_dir){
+	if (stream_dir==SalStreamRecvOnly){
+		if (has_dir(md,SalStreamSendOnly) || has_dir(md,SalStreamSendRecv)) return FALSE;
+		else return TRUE;
+	}else if (stream_dir==SalStreamSendOnly){
+		if (has_dir(md,SalStreamRecvOnly) || has_dir(md,SalStreamSendRecv)) return FALSE;
+		else return TRUE;
+	}else if (stream_dir==SalStreamSendRecv){
+		return has_dir(md,SalStreamSendRecv);
+	}else{
+		/*SalStreamInactive*/
+		if (has_dir(md,SalStreamSendOnly) || has_dir(md,SalStreamSendRecv)  || has_dir(md,SalStreamRecvOnly))
+			return FALSE;
+		else return TRUE;
+	}
+	return FALSE;
 }
 
 /*
@@ -128,7 +150,6 @@ static bool_t payload_list_equals(const MSList *l1, const MSList *l2){
 	}
 	if (e1!=NULL || e2!=NULL){
 		/*means one list is longer than the other*/
-		abort();
 		return FALSE;
 	}
 	return TRUE;
diff --git a/coreapi/sal.h b/coreapi/sal.h
index 359d81883a3ea9f56132c13c8ca67eb44cbaf554..5794427e4252e4c4c21913c0361d3d708a95b35b 100644
--- a/coreapi/sal.h
+++ b/coreapi/sal.h
@@ -103,6 +103,7 @@ typedef struct SalEndpointCandidate{
 typedef struct SalStreamDescription{
 	SalMediaProto proto;
 	SalStreamType type;
+	char typeother[32];
 	char addr[64];
 	int port;
 	MSList *payloads; //<list of PayloadType
@@ -120,6 +121,8 @@ typedef struct SalMediaDescription{
 	char username[64];
 	int nstreams;
 	int bandwidth;
+	unsigned int session_ver;
+	unsigned int session_id;
 	SalStreamDescription streams[SAL_MEDIA_DESCRIPTION_MAX_STREAMS];
 } SalMediaDescription;
 
@@ -192,6 +195,7 @@ typedef void (*SalOnCallAck)(SalOp *op);
 typedef void (*SalOnCallUpdating)(SalOp *op);/*< Called when a reINVITE is received*/
 typedef void (*SalOnCallTerminated)(SalOp *op, const char *from);
 typedef void (*SalOnCallFailure)(SalOp *op, SalError error, SalReason reason, const char *details, int code);
+typedef void (*SalOnCallReleased)(SalOp *salop);
 typedef void (*SalOnAuthRequested)(SalOp *op, const char *realm, const char *username);
 typedef void (*SalOnAuthSuccess)(SalOp *op, const char *realm, const char *username);
 typedef void (*SalOnRegisterSuccess)(SalOp *op, bool_t registered);
@@ -215,6 +219,7 @@ typedef struct SalCallbacks{
 	SalOnCallUpdating call_updating;
 	SalOnCallTerminated call_terminated;
 	SalOnCallFailure call_failure;
+	SalOnCallReleased call_released;
 	SalOnAuthRequested auth_requested;
 	SalOnAuthSuccess auth_success;
 	SalOnRegisterSuccess register_success;
@@ -249,7 +254,13 @@ ortp_socket_t sal_get_socket(Sal *ctx);
 void sal_set_user_agent(Sal *ctx, const char *user_agent);
 /*keepalive period in ms*/
 void sal_set_keepalive_period(Sal *ctx,unsigned int value);
+/**
+ * returns keepalive period in ms
+ * 0 desactiaved
+ * */
+unsigned int sal_get_keepalive_period(Sal *ctx);
 void sal_use_session_timers(Sal *ctx, int expires);
+void sal_use_double_registrations(Sal *ctx, bool_t enabled);
 void sal_use_one_matching_codec_policy(Sal *ctx, bool_t one_matching_codec);
 int sal_iterate(Sal *sal);
 MSList * sal_get_pending_auths(Sal *sal);
@@ -265,6 +276,7 @@ void sal_op_set_from(SalOp *op, const char *from);
 void sal_op_set_to(SalOp *op, const char *to);
 void sal_op_release(SalOp *h);
 void sal_op_authenticate(SalOp *h, const SalAuthInfo *info);
+void sal_op_cancel_authentication(SalOp *h);
 void sal_op_set_user_pointer(SalOp *h, void *up);
 int sal_op_get_auth_requested(SalOp *h, const char **realm, const char **username);
 const char *sal_op_get_from(const SalOp *op);
@@ -285,8 +297,7 @@ int sal_call_notify_ringing(SalOp *h, bool_t early_media);
 /*accept an incoming call or, during a call accept a reINVITE*/
 int sal_call_accept(SalOp*h);
 int sal_call_decline(SalOp *h, SalReason reason, const char *redirection /*optional*/);
-int sal_call_hold(SalOp *h, bool_t holdon);
-int sal_call_update(SalOp *h);
+int sal_call_update(SalOp *h, const char *subject);
 SalMediaDescription * sal_call_get_final_media_description(SalOp *h);
 int sal_call_refer(SalOp *h, const char *refer_to);
 int sal_call_refer_with_replaces(SalOp *h, SalOp *other_call_h);
diff --git a/coreapi/sal_eXosip2.c b/coreapi/sal_eXosip2.c
index 4203cb85e900990dc139309991277a7430f33275..6f2fd8bb12e489945262a149887257528fbe63f9 100644
--- a/coreapi/sal_eXosip2.c
+++ b/coreapi/sal_eXosip2.c
@@ -21,9 +21,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #endif
 
 #include "sal_eXosip2.h"
-
+#include "private.h"
 #include "offeranswer.h"
 
+static bool_t call_failure(Sal *sal, eXosip_event_t *ev);
+
 static void text_received(Sal *sal, eXosip_event_t *ev);
 
 void _osip_list_set_empty(osip_list_t *l, void (*freefunc)(void*)){
@@ -264,6 +266,7 @@ Sal * sal_init(){
 	eXosip_init();
 	sal=ms_new0(Sal,1);
 	sal->keepalive_period=30;
+	sal->double_reg=TRUE;
 	return sal;
 }
 
@@ -296,6 +299,8 @@ void sal_set_callbacks(Sal *ctx, const SalCallbacks *cbs){
 		ctx->callbacks.call_failure=(SalOnCallFailure)unimplemented_stub;
 	if (ctx->callbacks.call_terminated==NULL) 
 		ctx->callbacks.call_terminated=(SalOnCallTerminated)unimplemented_stub;
+	if (ctx->callbacks.call_released==NULL)
+		ctx->callbacks.call_released=(SalOnCallReleased)unimplemented_stub;
 	if (ctx->callbacks.call_updating==NULL) 
 		ctx->callbacks.call_updating=(SalOnCallUpdating)unimplemented_stub;
 	if (ctx->callbacks.auth_requested==NULL) 
@@ -326,6 +331,7 @@ int sal_unlisten_ports(Sal *ctx){
 	if (ctx->running){
 		eXosip_quit();
 		eXosip_init();
+		ctx->running=FALSE;
 	}
 	return 0;
 }
@@ -334,13 +340,17 @@ int sal_listen_port(Sal *ctx, const char *addr, int port, SalTransport tr, int i
 	int err;
 	bool_t ipv6;
 	int proto=IPPROTO_UDP;
+	int keepalive = ctx->keepalive_period;
 	
 	switch (tr) {
 	case SalTransportDatagram:
 		proto=IPPROTO_UDP;
+		eXosip_set_option (EXOSIP_OPT_UDP_KEEP_ALIVE, &keepalive);	
 		break;
 	case SalTransportStream:
 		proto= IPPROTO_TCP;
+			keepalive=-1;	
+		eXosip_set_option (EXOSIP_OPT_UDP_KEEP_ALIVE,&keepalive);	
 		break;
 	default:
 		ms_warning("unexpected proto, using datagram");
@@ -361,7 +371,7 @@ int sal_listen_port(Sal *ctx, const char *addr, int port, SalTransport tr, int i
 #ifdef HAVE_EXOSIP_GET_SOCKET
 	ms_message("Exosip has socket number %i",eXosip_get_socket(proto));
 #endif
-	eXosip_set_option (EXOSIP_OPT_UDP_KEEP_ALIVE, &ctx->keepalive_period);
+	
 	ctx->running=TRUE;
 	return err;
 }
@@ -391,6 +401,10 @@ MSList *sal_get_pending_auths(Sal *sal){
 	return ms_list_copy(sal->pending_auths);
 }
 
+void sal_use_double_registrations(Sal *ctx, bool_t enabled){
+	ctx->double_reg=enabled;
+}
+
 static int extract_received_rport(osip_message_t *msg, const char **received, int *rportval){
 	osip_via_t *via=NULL;
 	osip_generic_param_t *param=NULL;
@@ -764,8 +778,6 @@ int sal_call_terminate(SalOp *h){
 	if (err!=0){
 		ms_warning("Exosip could not terminate the call: cid=%i did=%i", h->cid,h->did);
 	}
-	sal_remove_call(h->base.root,h);
-	h->cid=-1;
 	return 0;
 }
 
@@ -784,7 +796,16 @@ void sal_op_authenticate(SalOp *h, const SalAuthInfo *info){
 		h->auth_info=sal_auth_info_clone(info); /*store auth info for subsequent request*/
 	}
 }
+void sal_op_cancel_authentication(SalOp *h) {
+	if (h->rid >0) {
+		sal_op_get_sal(h)->callbacks.register_failure(h,SalErrorFailure, SalReasonForbidden,_("Authentication failure"));
+	} else if (h->cid >0) {
+		sal_op_get_sal(h)->callbacks.call_failure(h,SalErrorFailure, SalReasonForbidden,_("Authentication failure"),0);
+	} else {
+		ms_warning("Auth failure not handled");
+	}
 
+}
 static void set_network_origin(SalOp *op, osip_message_t *req){
 	const char *received=NULL;
 	int rport=5060;
@@ -836,6 +857,9 @@ static SalOp *find_op(Sal *sal, eXosip_event_t *ev){
 	if (ev->sid>0){
 		return sal_find_out_subscribe(sal,ev->sid);
 	}
+	if (ev->nid>0){
+		return sal_find_in_subscribe(sal,ev->nid);
+	}
 	if (ev->response) return sal_find_other(sal,ev->response);
 	return NULL;
 }
@@ -1054,8 +1078,6 @@ static void call_terminated(Sal *sal, eXosip_event_t *ev){
 	if (ev->request){
 		osip_from_to_str(ev->request->from,&from);
 	}
-	sal_remove_call(sal,op);
-	op->cid=-1;
 	sal->callbacks.call_terminated(op,from!=NULL ? from : sal_op_get_from(op));
 	if (from) osip_free(from);
 }
@@ -1066,9 +1088,11 @@ static void call_released(Sal *sal, eXosip_event_t *ev){
 		ms_warning("No op associated to this call_released()");
 		return;
 	}
-	op->cid=-1;
-	if (op->did==-1) 
-		sal->callbacks.call_failure(op,SalErrorNoResponse,SalReasonUnknown,NULL, 487);
+	if (ev->response==NULL){
+		/* no response received so far */
+		call_failure(sal,ev);
+	}
+	sal->callbacks.call_released(op);
 }
 
 static int get_auth_data_from_response(osip_message_t *resp, const char **realm, const char **username){
@@ -1323,9 +1347,11 @@ static void process_dtmf_relay(Sal *sal, eXosip_event_t *ev){
 					sal->callbacks.dtmf_received(op, tmp[0]);
 			}
 		}
+		eXosip_lock();
 		eXosip_call_build_answer(ev->tid,200,&ans);
 		if (ans)
 			eXosip_call_send_answer(ev->tid,200,ans);
+		eXosip_unlock();
 	}
 }
 
@@ -1553,6 +1579,9 @@ static bool_t register_again_with_updated_contact(SalOp *op, osip_message_t *ori
 	char *tmp;
 	char port[20];
 	SalAddress *addr;
+	Sal *sal=op->base.root;
+
+	if (sal->double_reg==FALSE) return FALSE;
 	
 	if (extract_received_rport(last_answer,&received,&rport)==-1) return FALSE;
 	osip_message_get_contact(orig_request,0,&ctt);
@@ -1784,6 +1813,7 @@ static bool_t process_event(Sal *sal, eXosip_event_t *ev){
 			other_request_reply(sal,ev);
 			break;
 		case EXOSIP_MESSAGE_REQUESTFAILURE:
+		case EXOSIP_NOTIFICATION_REQUESTFAILURE:
 			if (ev->response) {
 				switch (ev->response->status_code) {
 					case 407:
@@ -1982,6 +2012,9 @@ void sal_set_keepalive_period(Sal *ctx,unsigned int value) {
 	ctx->keepalive_period=value;
 	eXosip_set_option (EXOSIP_OPT_UDP_KEEP_ALIVE, &value);
 }
+unsigned int sal_get_keepalive_period(Sal *ctx) {
+	return ctx->keepalive_period;
+}
 
 const char * sal_address_get_port(const SalAddress *addr) {
 	const osip_from_t *u=(const osip_from_t*)addr;
@@ -1997,47 +2030,18 @@ int sal_address_get_port_int(const SalAddress *uri) {
 	}
 }
 
-/*
- * Send a re-Invite used to hold the current call
-*/
-int sal_call_hold(SalOp *h, bool_t holdon)
-{
-	int err=0;
-
-	osip_message_t *reinvite=NULL;
-	if(eXosip_call_build_request(h->did,"INVITE",&reinvite) != OSIP_SUCCESS || reinvite==NULL)
-		return -1;
-	osip_message_set_subject(reinvite,holdon ? "Phone call hold" : "Phone call resume" );	
-	osip_message_set_allow(reinvite, "INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, NOTIFY, MESSAGE, SUBSCRIBE, INFO");
-	if (h->base.root->session_expires!=0){
-		osip_message_set_header(reinvite, "Session-expires", "200");
-		osip_message_set_supported(reinvite, "timer");
-	}
-	//add something to say that the distant sip phone will be in sendonly/sendrecv mode
-	if (h->base.local_media){
-		h->sdp_offering=TRUE;
-		sal_media_description_set_dir(h->base.local_media, holdon ? SalStreamSendOnly : SalStreamSendRecv);
-		set_sdp_from_desc(reinvite,h->base.local_media);
-	}else h->sdp_offering=FALSE;
-	eXosip_lock();
-	err = eXosip_call_send_request(h->did, reinvite);
-	eXosip_unlock();
-	
-	return err;
-}
-
 /* sends a reinvite. Local media description may have changed by application since call establishment*/
-int sal_call_update(SalOp *h){
+int sal_call_update(SalOp *h, const char *subject){
 	int err=0;
 	osip_message_t *reinvite=NULL;
 
 	eXosip_lock();
-	if(eXosip_call_build_request(h->did,"INVITE",&reinvite) != OSIP_SUCCESS || reinvite==NULL){
+	if(eXosip_call_build_request(h->did,"INVITE",&reinvite) != 0 || reinvite==NULL){
 		eXosip_unlock();
 		return -1;
 	}
 	eXosip_unlock();
-	osip_message_set_subject(reinvite,osip_strdup("Phone call parameters updated"));
+	osip_message_set_subject(reinvite,subject);
 	osip_message_set_allow(reinvite, "INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, NOTIFY, MESSAGE, SUBSCRIBE, INFO");
 	if (h->base.root->session_expires!=0){
 		osip_message_set_header(reinvite, "Session-expires", "200");
diff --git a/coreapi/sal_eXosip2.h b/coreapi/sal_eXosip2.h
index 7d50ae823e3b5668f1a324e830435101264db4f7..4db203362f589ee021ad3da7f76add64e0a8702d 100644
--- a/coreapi/sal_eXosip2.h
+++ b/coreapi/sal_eXosip2.h
@@ -41,6 +41,7 @@ struct Sal{
 	int keepalive_period;
 	void *up;
 	bool_t one_matching_codec;
+	bool_t double_reg;
 };
 
 struct SalOp{
@@ -78,6 +79,7 @@ void sal_exosip_subscription_closed(Sal *sal,eXosip_event_t *ev);
 
 void sal_exosip_in_subscription_closed(Sal *sal, eXosip_event_t *ev);
 SalOp * sal_find_out_subscribe(Sal *sal, int sid);
+SalOp * sal_find_in_subscribe(Sal *sal, int nid);
 void sal_exosip_fix_route(SalOp *op);
 
 void _osip_list_set_empty(osip_list_t *l, void (*freefunc)(void*));
diff --git a/coreapi/sal_eXosip2_presence.c b/coreapi/sal_eXosip2_presence.c
index 154c8d07eae3b3e4b0a8ab9369f760eeb5477f51..33034ed1c47c493d018db23f33051f519152d1b5 100644
--- a/coreapi/sal_eXosip2_presence.c
+++ b/coreapi/sal_eXosip2_presence.c
@@ -39,6 +39,7 @@ SalOp * sal_find_out_subscribe(Sal *sal, int sid){
 		op=(SalOp*)elem->data;
 		if (op->sid==sid) return op;
 	}
+	ms_message("No op for sid %i",sid);
 	return NULL;
 }
 
@@ -50,7 +51,7 @@ void sal_remove_out_subscribe(Sal *sal, SalOp *op){
 	sal->out_subscribes=ms_list_remove(sal->out_subscribes,op);
 }
 
-static SalOp * sal_find_in_subscribe(Sal *sal, int nid){
+SalOp * sal_find_in_subscribe(Sal *sal, int nid){
 	const MSList *elem;
 	SalOp *op;
 	for(elem=sal->in_subscribes;elem!=NULL;elem=elem->next){
@@ -569,6 +570,7 @@ int sal_notify_presence(SalOp *op, SalPresenceStatus status, const char *status_
 	if (msg!=NULL){
 		const char *identity=sal_op_get_contact(op);
 		if (identity==NULL) identity=sal_op_get_to(op);
+		_osip_list_set_empty(&msg->contacts,(void (*)(void*))osip_contact_free);
 		osip_message_set_contact(msg,identity);
 		add_presence_body(msg,status);
 		eXosip_insubscription_send_request(op->did,msg);
diff --git a/coreapi/sal_eXosip2_sdp.c b/coreapi/sal_eXosip2_sdp.c
index a9f098ed24b99f9d3ad94aa5351d6dc727e99775..70443c722ac8e0c35acd3d40b0c022da27b20b0c 100644
--- a/coreapi/sal_eXosip2_sdp.c
+++ b/coreapi/sal_eXosip2_sdp.c
@@ -127,14 +127,18 @@ static sdp_message_t *create_generic_sdp(const SalMediaDescription *desc)
 {
 	sdp_message_t *local;
 	int inet6;
-
+	char sessid[16];
+	char sessver[16];
+	
+	snprintf(sessid,16,"%i",desc->session_id);
+	snprintf(sessver,16,"%i",desc->session_ver);
 	sdp_message_init (&local);
 	if (strchr(desc->addr,':')!=NULL){
 		inet6=1;
 	}else inet6=0;
 	sdp_message_v_version_set (local, osip_strdup ("0"));
 	sdp_message_o_origin_set (local, osip_strdup (desc->username),
-			  osip_strdup ("123456"), osip_strdup ("654321"),
+			  osip_strdup (sessid), osip_strdup (sessver),
 			  osip_strdup ("IN"), inet6 ? osip_strdup("IP6") : osip_strdup ("IP4"),
 			  osip_strdup (desc->addr));
 	sdp_message_s_name_set (local, osip_strdup ("A conversation"));
@@ -181,11 +185,23 @@ static void add_payload(sdp_message_t *msg, int line, const PayloadType *pt)
 
 
 static void add_line(sdp_message_t *msg, int lineno, const SalStreamDescription *desc){
-	const char *mt=desc->type==SalAudio ? "audio" : "video";
+	const char *mt=NULL;
 	const MSList *elem;
 	const char *addr;
 	const char *dir="sendrecv";
 	int port;
+	
+	switch (desc->type) {
+	case SalAudio:
+		mt="audio";
+		break;
+	case SalVideo:
+		mt="video";
+		break;
+	case SalOther:
+		mt=desc->typeother;
+		break;
+	}
 	if (desc->candidates[0].addr[0]!='\0'){
 		addr=desc->candidates[0].addr;
 		port=desc->candidates[0].port;
@@ -310,7 +326,10 @@ int sdp_to_media_description(sdp_message_t *msg, SalMediaDescription *desc){
 			stream->type=SalAudio;
 		}else if (strcasecmp("video", mtype) == 0){
 			stream->type=SalVideo;
-		}else stream->type=SalOther;
+		}else {
+			stream->type=SalOther;
+			strncpy(stream->typeother,mtype,sizeof(stream->typeother)-1);
+		}
 		for(j=0;(sbw=sdp_message_bandwidth_get(msg,i,j))!=NULL;++j){
 			if (strcasecmp(sbw->b_bwtype,"AS")==0) stream->bandwidth=atoi(sbw->b_bandwidth);
 		}
diff --git a/coreapi/test_ecc.c b/coreapi/test_ecc.c
new file mode 100644
index 0000000000000000000000000000000000000000..7553c20189ad021056aaea880d0821176b11d68b
--- /dev/null
+++ b/coreapi/test_ecc.c
@@ -0,0 +1,46 @@
+/*
+linphone
+Copyright (C) 2011 Belledonne Communications SARL
+Author: Simon MORLAT (simon.morlat@linphone.org)
+
+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 "linphonecore_utils.h"
+
+static void calibration_finished(LinphoneCore *lc, LinphoneEcCalibratorStatus status, int delay, void *data){
+	ms_message("echo calibration finished %s.",status==LinphoneEcCalibratorDone ? "successfully" : "with faillure");
+	if (status==LinphoneEcCalibratorDone) ms_message("Measured delay is %i",delay);
+}
+
+int main(int argc, char *argv[]){
+	int count=0;
+	LinphoneCoreVTable vtable={0};
+	LinphoneCore *lc=linphone_core_new(&vtable,NULL,NULL,NULL);
+	
+	linphone_core_enable_logs(NULL);
+
+	linphone_core_start_echo_calibration(lc,calibration_finished,NULL);
+	
+	while(count++<1000){
+		linphone_core_iterate(lc);
+		ms_usleep(10000);
+	}
+	linphone_core_destroy(lc);
+	return 0;
+}
+
diff --git a/gtk/.gitignore b/gtk/.gitignore
index 398d60f0292e25e0d683a8a59fdd15ef828e2fbf..b1b1529c6bb6c5037d1cd92f6898f6cb7fa236fb 100644
--- a/gtk/.gitignore
+++ b/gtk/.gitignore
@@ -1,4 +1,4 @@
-linphone-3
+linphone
 .libs
 .deps
 linphone.res
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index a2c38b342abe92aa482aa0c952f1943359676bcd..58f5306596b972c31ac4c72e8dd6f45268d7ba25 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -27,9 +27,9 @@ if BUILD_GTK_UI
 
 BUILT_SOURCES=version_date.h
 
-bin_PROGRAMS=linphone-3
+bin_PROGRAMS=linphone
 
-linphone_3_SOURCES=	\
+linphone_SOURCES=	\
 			main.c \
 			propertybox.c \
 			friendlist.c \
@@ -45,7 +45,7 @@ linphone_3_SOURCES=	\
 			loginframe.c \
 			linphone.h 
 
-linphone_3_LDADD=$(ORTP_LIBS) \
+linphone_LDADD=$(ORTP_LIBS) \
 		$(MEDIASTREAMER_LIBS) \
 		$(top_builddir)/coreapi/liblinphone.la \
 			$(LIBGTK_LIBS) $(INTLLIBS) 
@@ -56,10 +56,10 @@ if BUILD_WIN32
 linphone.res:	$(LINPHONE_ICO_RC_FILE) $(LINPHONE_ICO_FILE)
 	windres $(LINPHONE_ICO_RC_FILE) -O coff -o linphone.res
 
-linphone_3_LDADD+=linphone.res -lwininet
-linphone_3_LDFLAGS=-Wl,--export-all-symbols -mwindows
+linphone_LDADD+=linphone.res -lwininet
+linphone_LDFLAGS=-Wl,--export-all-symbols -mwindows
 else
-linphone_3_LDFLAGS=-export-dynamic
+linphone_LDFLAGS=-export-dynamic
 endif
 
 uidir=$(datadir)/linphone
diff --git a/gtk/incall_view.c b/gtk/incall_view.c
index 3941bfe727055bd9ec5ec2327ceacde24cfba582..9a4861a5d5b66cb53ab385b2396218dbe0bcc211 100644
--- a/gtk/incall_view.c
+++ b/gtk/incall_view.c
@@ -201,6 +201,7 @@ void linphone_gtk_in_call_view_set_incoming(LinphoneCall *call, bool_t with_paus
 	GtkWidget *animation=linphone_gtk_get_widget(callview,"in_call_animation");
 	GdkPixbufAnimation *pbuf=create_pixbuf_animation("calling_anim.gif");
 	GtkWidget *answer_button;
+	GtkWidget *image;
 
 	gtk_label_set_markup(GTK_LABEL(status),_("<b>Incoming call</b>"));
 	gtk_widget_show_all(linphone_gtk_get_widget(callview,"answer_decline_panel"));
@@ -209,14 +210,17 @@ void linphone_gtk_in_call_view_set_incoming(LinphoneCall *call, bool_t with_paus
 	display_peer_name_in_label(callee,linphone_call_get_remote_address (call));
 
 	answer_button=linphone_gtk_get_widget(callview,"accept_call");
-	gtk_button_set_image(GTK_BUTTON(answer_button),
-	                 create_pixmap (linphone_gtk_get_ui_config("start_call_icon","startcall-green.png")));
+	image=create_pixmap (linphone_gtk_get_ui_config("start_call_icon","startcall-green.png"));
 	if (with_pause){
 		gtk_button_set_label(GTK_BUTTON(answer_button),
 		                     _("Pause all calls\nand answer"));
 	}else gtk_button_set_label(GTK_BUTTON(answer_button),_("Answer"));
-	gtk_button_set_image(GTK_BUTTON(linphone_gtk_get_widget(callview,"decline_call")),
-	                 create_pixmap (linphone_gtk_get_ui_config("stop_call_icon","stopcall-red.png")));
+	gtk_button_set_image(GTK_BUTTON(answer_button),image);
+	gtk_widget_show(image);
+	
+	image=create_pixmap (linphone_gtk_get_ui_config("stop_call_icon","stopcall-red.png"));
+	gtk_button_set_image(GTK_BUTTON(linphone_gtk_get_widget(callview,"decline_call")),image);
+	gtk_widget_show(image);
 	
 	if (pbuf!=NULL){
 		gtk_image_set_from_animation(GTK_IMAGE(animation),pbuf);
diff --git a/gtk/incoming_call.ui b/gtk/incoming_call.ui
deleted file mode 100644
index 00a6e0efc041b235a18e6ed7344b6a322d891a6c..0000000000000000000000000000000000000000
--- a/gtk/incoming_call.ui
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0"?>
-<interface>
-  <!-- interface-requires gtk+ 2.16 -->
-  <!-- interface-naming-policy toplevel-contextual -->
-  <object class="GtkDialog" id="incoming_call">
-    <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="type">popup</property>
-    <property name="title" translatable="yes">Linphone - Incoming call</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="icon">linphone2.png</property>
-    <property name="type_hint">notification</property>
-    <property name="urgency_hint">True</property>
-    <property name="deletable">False</property>
-    <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox8">
-        <property name="visible">True</property>
-        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-        <property name="spacing">2</property>
-        <child>
-          <object class="GtkFrame" id="frame16">
-            <property name="visible">True</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_xalign">0</property>
-            <child>
-              <object class="GtkAlignment" id="alignment16">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="left_padding">12</property>
-                <child>
-                  <object class="GtkLabel" id="message">
-                    <property name="visible">True</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">Incoming call from</property>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child type="label">
-              <object class="GtkLabel" id="label43">
-                <property name="visible">True</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">Incoming call</property>
-                <property name="use_markup">True</property>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area7">
-            <property name="visible">True</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="layout_style">spread</property>
-            <child>
-              <object class="GtkButton" id="accept_call">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <signal handler="linphone_gtk_accept_call" name="clicked"/>
-                <child>
-                  <object class="GtkHBox" id="hbox17">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <child>
-                      <object class="GtkImage" id="image12">
-                        <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="stock">gtk-yes</property>
-                      </object>
-                      <packing>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label44">
-                        <property name="visible">True</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">Accept</property>
-                      </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="decline_cal">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <signal handler="linphone_gtk_decline_call" name="clicked"/>
-                <child>
-                  <object class="GtkHBox" id="hbox20">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <child>
-                      <object class="GtkImage" id="image13">
-                        <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="stock">gtk-no</property>
-                      </object>
-                      <packing>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="decline_call">
-                        <property name="visible">True</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">Decline</property>
-                      </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>
diff --git a/gtk/main.c b/gtk/main.c
index 643f948d9adb2e11e2e0a52067c96181e3e3e5f3..77689b39778150bb6463bffc94112b165ee7ab85 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -1446,6 +1446,7 @@ int main(int argc, char *argv[]){
 	
 	settings=gtk_settings_get_default();
 	g_type_class_unref (g_type_class_ref (GTK_TYPE_IMAGE_MENU_ITEM));
+	g_type_class_unref (g_type_class_ref (GTK_TYPE_BUTTON));
 	g_object_set(settings, "gtk-menu-images", TRUE, NULL);
 	g_object_set(settings, "gtk-button-images", TRUE, NULL);
 #ifdef WIN32
diff --git a/java/common/org/linphone/core/LinphoneCall.java b/java/common/org/linphone/core/LinphoneCall.java
index 66418a930e7bd15bf202e07e74d70d83cabcb718..171e2e6b485240d26be4df0656b9d2e450f4a4cd 100644
--- a/java/common/org/linphone/core/LinphoneCall.java
+++ b/java/common/org/linphone/core/LinphoneCall.java
@@ -24,7 +24,7 @@ import java.util.Vector;
  * Object representing a Call. calls are created using {@link LinphoneCore#invite(LinphoneAddress)} or passed to the application by listener {@link LinphoneCoreListener#callState(LinphoneCore, LinphoneCall, State, String)}
  * 
  */
-@SuppressWarnings("unchecked")
+
 public interface LinphoneCall {
 	/**
 	 * Linphone call states
@@ -110,7 +110,11 @@ public interface LinphoneCall {
 		 * The remote accepted the call update initiated by us
 		 */
 		public static final State CallUpdated = new State(17, "CallUpdated");
-
+		
+		/**
+		 * The call object is now released.
+		 */
+		public static final State CallReleased = new State(18,"CallReleased");
 
 		private State(int value,String stringValue) {
 			mValue = value;
@@ -174,5 +178,9 @@ public interface LinphoneCall {
 	 * @return true if echo limiter is enabled.
 	 */
 	public boolean isEchoLimiterEnabled();
-
+	/**
+	 * Returns the object associated to a call this one is replacing.
+	 * Call replacement can occur during transfer scenarios.
+	 */
+	public LinphoneCall getReplacedCall();
 }
diff --git a/java/common/org/linphone/core/LinphoneCallLog.java b/java/common/org/linphone/core/LinphoneCallLog.java
index 1a1ffefb05f11b602c9683085bfd745fe7711992..ccfdc76322cf2e74380019bdf4eb502f256d7a7d 100644
--- a/java/common/org/linphone/core/LinphoneCallLog.java
+++ b/java/common/org/linphone/core/LinphoneCallLog.java
@@ -24,7 +24,7 @@ package org.linphone.core;
 import java.util.Vector;
 
 
-@SuppressWarnings("unchecked")
+
 public interface LinphoneCallLog {
 	/**
 	 * Represents call status
diff --git a/java/common/org/linphone/core/LinphoneCore.java b/java/common/org/linphone/core/LinphoneCore.java
index 2d5daff6d560744cfac767d3483ecd0cd59336c6..3b63d0a148e8bc19eb1c1b09e98312bacef87063 100644
--- a/java/common/org/linphone/core/LinphoneCore.java
+++ b/java/common/org/linphone/core/LinphoneCore.java
@@ -25,7 +25,7 @@ import java.util.Vector;
  * Linphone core main object created by method {@link LinphoneCoreFactory#createLinphoneCore(LinphoneCoreListener, String, String, Object)}.	
  *
  */
-@SuppressWarnings("unchecked")
+
 public interface LinphoneCore {
 	/**
 	 * linphone core states
@@ -179,6 +179,50 @@ public interface LinphoneCore {
 			return mStringValue;
 		}		
 	}
+	/**
+	 * 	EC Calibrator Status
+.
+	 *
+	 */
+	static public class EcCalibratorStatus {
+
+		static private Vector values = new Vector();
+		/**
+		 * Calibration in progress
+		 */
+		static public EcCalibratorStatus InProgress = new EcCalibratorStatus(0,"InProgress");       
+		/**
+		 * Calibration done
+		 */
+		static public EcCalibratorStatus Done  = new EcCalibratorStatus(1,"Done");
+		/**
+		 * Calibration in progress
+		 */
+		static public EcCalibratorStatus Failed = new EcCalibratorStatus(2,"Failed");
+
+		private final int mValue;
+		private final String mStringValue;
+
+		private EcCalibratorStatus(int value,String stringValue) {
+			mValue = value;
+			values.addElement(this);
+			mStringValue=stringValue;
+		}
+		public static EcCalibratorStatus fromInt(int value) {
+
+			for (int i=0; i<values.size();i++) {
+				EcCalibratorStatus status = (EcCalibratorStatus) values.elementAt(i);
+				if (status.mValue == value) return status;
+			}
+			throw new RuntimeException("status not found ["+value+"]");
+		}
+		public String toString() {
+			return mStringValue;
+		}
+		public int value(){
+			return mValue;
+		}
+	}
 	/**
 	 * clear all added proxy configs
 	 */
@@ -386,10 +430,17 @@ public interface LinphoneCore {
 	 */
 	public boolean isEchoCancellationEnabled();
 	/**
-	 * not implemented yet
+	 * set transport used for signaling (TCP or UDP)
+	 * 
 	 * @param aTransport
 	 */
 	public void setSignalingTransport(Transport aTransport);
+	/**
+	 * get transport used for signaling (TCP or UDP)
+	 * 
+	 * @return  Transport;
+	 */
+	public Transport getSignalingTransport();
 	/**
 	 * not implemented
 	 * @param value
@@ -489,5 +540,20 @@ public interface LinphoneCore {
 	public VideoSize getPreferredVideoSize();
 	
 	public PayloadType[] listVideoCodecs();
-
+	/**
+	 * enable signaling keep alive. small udp packet sent periodically to keep udp NAT association
+	 */
+	void enableKeepAlive(boolean enable);
+	/**
+	 * get keep elive mode
+	 * @return true if enable
+ 	 */
+	boolean isKeepAliveEnabled();
+	/**
+	 * 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
+	 * @throws LinphoneCoreException if operation is still in progress;
+	**/
+	void startEchoCalibration(Object data) throws LinphoneCoreException;
 }
diff --git a/java/common/org/linphone/core/LinphoneCoreFactory.java b/java/common/org/linphone/core/LinphoneCoreFactory.java
index 5cbd5ac5eb96016d7514352caa427e7ee59d4824..836f86caafae945b443515fce163a53f1de11bf6 100644
--- a/java/common/org/linphone/core/LinphoneCoreFactory.java
+++ b/java/common/org/linphone/core/LinphoneCoreFactory.java
@@ -21,7 +21,7 @@ package org.linphone.core;
 
 
 
-@SuppressWarnings("unchecked")
+
 abstract public class LinphoneCoreFactory {
 	
 	private static String factoryName = "org.linphone.core.LinphoneCoreFactoryImpl";
diff --git a/java/common/org/linphone/core/LinphoneCoreListener.java b/java/common/org/linphone/core/LinphoneCoreListener.java
index daf256662dd562c8801b15e9b97f93e96f100544..ddd58a3ac3de8266da21d5740a14cc5756d199af 100644
--- a/java/common/org/linphone/core/LinphoneCoreListener.java
+++ b/java/common/org/linphone/core/LinphoneCoreListener.java
@@ -78,5 +78,14 @@ public interface LinphoneCoreListener {
 		 * @param message 	incoming message
 		 */
 		public void textReceived(LinphoneCore lc, LinphoneChatRoom cr,LinphoneAddress from,String message);
+		/**
+		 * 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/common/org/linphone/core/LinphoneFriend.java b/java/common/org/linphone/core/LinphoneFriend.java
index 6e7d4007abfe451f8f84fcec0850502ea148bd99..9d2f97fa6bd66b953715dd26b5cc78048ff8eae7 100644
--- a/java/common/org/linphone/core/LinphoneFriend.java
+++ b/java/common/org/linphone/core/LinphoneFriend.java
@@ -27,7 +27,7 @@ import java.util.Vector;
  * 
  *
  */
-@SuppressWarnings("unchecked")
+
 public interface LinphoneFriend {
 	/**
 	 * Enum controlling behavior for incoming subscription request. 
diff --git a/java/common/org/linphone/core/OnlineStatus.java b/java/common/org/linphone/core/OnlineStatus.java
index 4c2d8110bd07e26e1839d08b0ea1a548694feac5..0653d1a967ebb1979d238c0d210205ffeb1daab5 100644
--- a/java/common/org/linphone/core/OnlineStatus.java
+++ b/java/common/org/linphone/core/OnlineStatus.java
@@ -25,7 +25,7 @@ import java.util.Vector;
  * Enum describing remote friend status
  *
  */
-@SuppressWarnings("unchecked")
+
 public class OnlineStatus {
 
 		static private Vector values = new Vector();
diff --git a/java/common/org/linphone/core/VideoSize.java b/java/common/org/linphone/core/VideoSize.java
index 8e5c079c7a692acf532c46ab502915be96336a6e..b9b3e07101d678fa6d12958c7b41cbbf31fe26c6 100644
--- a/java/common/org/linphone/core/VideoSize.java
+++ b/java/common/org/linphone/core/VideoSize.java
@@ -78,7 +78,7 @@ public final class VideoSize {
 		return true;
 	}
 	
-	@Override
+	
 	public String toString() {
 		return "width = "+width + " height = " + height;
 	}
diff --git a/linphone-deps.filelist b/linphone-deps.filelist
index 1cfc61b073c152de8c3f6bc3ff75d0bf245bc9a7..19ea6ecdee377bdb44bd3e2899819bd20eb3e856 100755
--- a/linphone-deps.filelist
+++ b/linphone-deps.filelist
@@ -1,10 +1,10 @@
 ./bin/avcodec-52.dll
 ./bin/avutil-50.dll
-./bin/libeXosip2-4.dll
+./bin/libeXosip2-6.dll
 ./bin/libogg.dll
 ./bin/libtheora.dll
 ./bin/libxml2-2.dll
-./bin/libosip2-4.dll
-./bin/libosipparser2-4.dll
+./bin/libosip2-6.dll
+./bin/libosipparser2-6.dll
 ./bin/swscale-0.dll
 
diff --git a/linphone.iss.in b/linphone.iss.in
index b7726f542e7d807e1272053c9c7dc4c22271ad34..b0cbd08f048121c5d815db0f04a39429c7727fa6 100644
--- a/linphone.iss.in
+++ b/linphone.iss.in
@@ -30,19 +30,19 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
 #include "linphone-win32.filelist"
 
 [Icons]
-Name: "{group}\Linphone"; Filename: "{app}\bin\linphone-3.exe" ; WorkingDir: "{app}"
-Name: "{userdesktop}\Linphone"; Filename: "{app}\bin\linphone-3.exe"; WorkingDir: "{app}" ; Tasks: desktopicon
+Name: "{group}\Linphone"; Filename: "{app}\bin\linphone.exe" ; WorkingDir: "{app}"
+Name: "{userdesktop}\Linphone"; Filename: "{app}\bin\linphone.exe"; WorkingDir: "{app}" ; Tasks: desktopicon
 
 [Registry]
 Root: HKCR; Subkey: "sip";
 Root: HKCR; Subkey: "sip"; ValueData: "URL: SIP protocol" ; ValueType:string
 Root: HKCR; Subkey: "sip"; ValueName: "EditFlags"; ValueData: "02 00 00 00" ; ValueType:binary
 Root: HKCR; Subkey: "sip"; ValueName: "URL Protocol" ;  ValueType:string
-Root: HKCR; Subkey: "sip\DefaultIcon"; ValueData: "{app}\bin\linphone-3.exe"; ValueType:string ; Flags:uninsdeletekey
+Root: HKCR; Subkey: "sip\DefaultIcon"; ValueData: "{app}\bin\linphone.exe"; ValueType:string ; Flags:uninsdeletekey
 Root: HKCR; Subkey: "sip\shell"
 Root: HKCR; Subkey: "sip\shell\open"
-Root: HKCR; Subkey: "sip\shell\open\command"; ValueType:string ; ValueData: "{app}\bin\linphone-3.exe --workdir {app} --call %1"; Flags:uninsdeletekey
+Root: HKCR; Subkey: "sip\shell\open\command"; ValueType:string ; ValueData: "{app}\bin\linphone.exe --workdir {app} --call %1"; Flags:uninsdeletekey
 
 [Run]
-Filename: "{app}\bin\linphone-3.exe"; Description: "{cm:LaunchProgram,Linphone}"; WorkingDir: "{app}" ; Flags: nowait postinstall skipifsilent
+Filename: "{app}\bin\linphone.exe"; Description: "{cm:LaunchProgram,Linphone}"; WorkingDir: "{app}" ; Flags: nowait postinstall skipifsilent
 
diff --git a/linphone.kdevelop b/linphone.kdevelop
index 27eac222671a9610f08fa5a8a7aa5dcfe87bba0d..2cb0437f5a571e3d97bdda68bda0f7b3c56bff29 100644
--- a/linphone.kdevelop
+++ b/linphone.kdevelop
@@ -16,7 +16,7 @@
   <kdevcustomproject>
     <run>
       <directoryradio>executable</directoryradio>
-      <mainprogram>gtk-glade/linphone-3</mainprogram>
+      <mainprogram>gtk-glade/linphone</mainprogram>
       <programargs/>
       <globaldebugarguments/>
       <globalcwd/>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0efc5f6cf948d8737592f4cce64eb87f42d2e63a..c099ec55f8519fc71ea0c8eb10432b9f0c21afb5 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -29,6 +29,7 @@ coreapi/presence.c
 coreapi/friend.c
 coreapi/proxy.c
 coreapi/callbacks.c
+coreapi/sal_eXosip2.c
 mediastreamer2/src/alaw.c
 mediastreamer2/src/alsa.c
 mediastreamer2/src/aqsnd.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 8b137891791fe96927ad78e64b0aad7bded08bdc..b981d1481a8e34cc7ffa175d207e019d856efcb8 100755
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1 +1,2 @@
 
+gtk/p2pwizard.ui
diff --git a/po/cs.po b/po/cs.po
index df52dff714b60eea8560b90806c2f868f3928b63..4382093b1a415f9227b9f87233c8cf84bd0a714b 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -2,52 +2,58 @@
 # 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.
+# Petr Pisar <petr.pisar@atlas.cz>, 2006, 2007, 2008, 2009, 2010, 2011.
 #
 # XXX: Don't translate gtk-* messages. They will be replaced from GTK+
 # catalogue.
+#
+# On hold → odložen
+# Pause call → odložit hovor
+# Resume call → obnovit hovor
+# Transfer → přepojit
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: linphone-3.2.99.1-"
-"a4be9bcfe5ebee60493f7c439b5c6616a5c8b6e6\n"
+"Project-Id-Version: linphone-3.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 17:16+0200\n"
-"PO-Revision-Date: 2010-04-01 21:26+0200\n"
+"POT-Creation-Date: 2011-02-03 20:45+0100\n"
+"PO-Revision-Date: 2011-02-07 18:00+0100\n"
 "Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"a4be9bcfe5ebee60493f7c439b5c6616a5c8b6e6\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ../gtk-glade/support.c:49 ../gtk-glade/support.c:73
-#: ../gtk-glade/support.c:102
+#: ../gtk/support.c:49 ../gtk/support.c:73 ../gtk/support.c:102
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "Nelze najít soubor s obråzkem: %s"
 
-#: ../gtk-glade/chat.c:27
+#: ../gtk/chat.c:27
 #, c-format
 msgid "Chat with %s"
 msgstr "Diskuze s %s"
 
-#: ../gtk-glade/main.c:94
+#: ../gtk/main.c:74
 msgid "log to stdout some debug information while running."
 msgstr "za běhu vypisovat některé ladicí informace na standardní výstup."
 
-#: ../gtk-glade/main.c:101
+#: ../gtk/main.c:81
 msgid "Start only in the system tray, do not show the main interface."
 msgstr "Spouštět se pouze do systémové oblasti, nezobrazovat hlavní okno."
 
-#: ../gtk-glade/main.c:108
+#: ../gtk/main.c:88
 msgid "address to call right now"
 msgstr "zavolat právě teď na tuto adresu"
 
-#: ../gtk-glade/main.c:115
+#: ../gtk/main.c:95
 msgid "if set automatically answer incoming calls"
 msgstr "je-li nastaveno, automaticky zvedne příchozí hovor"
 
-#: ../gtk-glade/main.c:123
+#: ../gtk/main.c:103
 msgid ""
 "Specifiy a working directory (should be the base of the installation, eg: c:"
 "\\Program Files\\Linphone)"
@@ -55,17 +61,12 @@ msgstr ""
 "Zadejte pracovní adresář (měl by být základní instalační adresář, například "
 "c:\\Program Files\\Linphone)"
 
-#: ../gtk-glade/main.c:402
+#: ../gtk/main.c:479
 #, c-format
 msgid "Call with %s"
 msgstr "Hovor s %s"
 
-#: ../gtk-glade/main.c:720
-#, c-format
-msgid "Incoming call from %s"
-msgstr "Příchozí hovor od %s"
-
-#: ../gtk-glade/main.c:759
+#: ../gtk/main.c:862
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
@@ -78,7 +79,7 @@ msgstr ""
 "do svého adresáře?\n"
 "Odpovíte-li ne, tato osobo bude dočasně blokována."
 
-#: ../gtk-glade/main.c:837
+#: ../gtk/main.c:940
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
@@ -87,162 +88,163 @@ msgstr ""
 "ProsĂ­m, zadejte heslo pro uĹživatele <i>%s</i>\n"
 "v doméně <i>%s</i>:"
 
-#: ../gtk-glade/main.c:934
+#: ../gtk/main.c:1076
 msgid "Website link"
 msgstr "Odkaz na webovou strĂĄnku"
 
-#: ../gtk-glade/main.c:970
+#: ../gtk/main.c:1112
 msgid "Linphone - a video internet phone"
 msgstr "Lipnhone – internetový videofon"
 
-#: ../gtk-glade/main.c:989
+#: ../gtk/main.c:1131
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (Výchozí)"
 
-#: ../gtk-glade/main.c:1221
+#: ../gtk/main.c:1382
 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."
 
-#: ../gtk-glade/main.c:1275
+#: ../gtk/main.c:1441
 msgid "A free SIP video-phone"
 msgstr "VolnĂ˝ SIP videofon"
 
-#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:258
-#: ../gtk-glade/contact.glade.h:3
+#: ../gtk/friendlist.c:192 ../gtk/propertybox.c:271
 msgid "Name"
 msgstr "JmĂŠno"
 
-#: ../gtk-glade/friendlist.c:205
+#: ../gtk/friendlist.c:205
 msgid "Presence status"
 msgstr "Stav"
 
-#: ../gtk-glade/friendlist.c:242
+#: ../gtk/friendlist.c:242
 #, c-format
 msgid "Search in %s directory"
 msgstr "Hledat v adresáři %s"
 
-#: ../gtk-glade/friendlist.c:450
+#: ../gtk/friendlist.c:450
 msgid "Invalid sip contact !"
 msgstr "NeplatnĂ˝ sipovĂ˝ kontakt!"
 
-#: ../gtk-glade/friendlist.c:492
+#: ../gtk/friendlist.c:495
 #, c-format
 msgid "Call %s"
 msgstr "Volat komu: %s"
 
-#: ../gtk-glade/friendlist.c:493
+#: ../gtk/friendlist.c:496
 #, c-format
 msgid "Send text to %s"
 msgstr "Poslat text komu: %s"
 
-#: ../gtk-glade/friendlist.c:494
+#: ../gtk/friendlist.c:497
 #, c-format
 msgid "Edit contact '%s'"
 msgstr "Upravit kontakt „%s“"
 
-#: ../gtk-glade/friendlist.c:495
+#: ../gtk/friendlist.c:498
 #, c-format
 msgid "Delete contact '%s'"
 msgstr "Odstranit kontakt „%s“"
 
-#: ../gtk-glade/friendlist.c:537
+#: ../gtk/friendlist.c:540
 #, c-format
 msgid "Add new contact from %s directory"
 msgstr "Přidat nový kontakt z adresáře %s"
 
-#: ../gtk-glade/propertybox.c:264
+#: ../gtk/propertybox.c:277
 msgid "Rate (Hz)"
 msgstr "Rychlost (Hz)"
 
-#: ../gtk-glade/propertybox.c:270
+#: ../gtk/propertybox.c:283
 msgid "Status"
 msgstr "Stav"
 
-#: ../gtk-glade/propertybox.c:276
+#: ../gtk/propertybox.c:289
 msgid "Min bitrate (kbit/s)"
 msgstr "Min. rychlost (kbit/s)"
 
-#: ../gtk-glade/propertybox.c:283
+#: ../gtk/propertybox.c:296
 msgid "Parameters"
 msgstr "Parametry"
 
-#: ../gtk-glade/propertybox.c:312 ../gtk-glade/propertybox.c:451
+#: ../gtk/propertybox.c:325 ../gtk/propertybox.c:464
 msgid "Enabled"
 msgstr "Povoleno"
 
-#: ../gtk-glade/propertybox.c:313 ../gtk-glade/propertybox.c:451
+#: ../gtk/propertybox.c:326 ../gtk/propertybox.c:464
 msgid "Disabled"
 msgstr "ZakĂĄzĂĄno"
 
-#: ../gtk-glade/propertybox.c:496
+#: ../gtk/propertybox.c:509
 msgid "Account"
 msgstr "Účet"
 
-#: ../gtk-glade/propertybox.c:636
+#: ../gtk/propertybox.c:649
 msgid "English"
 msgstr "angličtina"
 
-#: ../gtk-glade/propertybox.c:637
+#: ../gtk/propertybox.c:650
 msgid "French"
 msgstr "francouzĹĄtina"
 
-#: ../gtk-glade/propertybox.c:638
+#: ../gtk/propertybox.c:651
 msgid "Swedish"
 msgstr "ĹĄvĂŠdĹĄtina"
 
-#: ../gtk-glade/propertybox.c:639
+#: ../gtk/propertybox.c:652
 msgid "Italian"
 msgstr "italĹĄtina"
 
-#: ../gtk-glade/propertybox.c:640
+#: ../gtk/propertybox.c:653
 msgid "Spanish"
 msgstr "španělština"
 
-#: ../gtk-glade/propertybox.c:641
+#: ../gtk/propertybox.c:654
 msgid "Brazilian Portugese"
 msgstr "brazilskĂĄ portugalĹĄtina"
 
-#: ../gtk-glade/propertybox.c:642
+#: ../gtk/propertybox.c:655
 msgid "Polish"
 msgstr "polĹĄtina"
 
-#: ../gtk-glade/propertybox.c:643
+#: ../gtk/propertybox.c:656
 msgid "German"
 msgstr "němčina"
 
-#: ../gtk-glade/propertybox.c:644
+#: ../gtk/propertybox.c:657
 msgid "Russian"
 msgstr "ruĹĄtina"
 
-#: ../gtk-glade/propertybox.c:645
+#: ../gtk/propertybox.c:658
 msgid "Japanese"
 msgstr "japonĹĄtina"
 
-#: ../gtk-glade/propertybox.c:646
+#: ../gtk/propertybox.c:659
 msgid "Dutch"
 msgstr "dĂĄnĹĄtina"
 
-#: ../gtk-glade/propertybox.c:647
+#: ../gtk/propertybox.c:660
 msgid "Hungarian"
 msgstr "maďarština"
 
-#: ../gtk-glade/propertybox.c:648
+#: ../gtk/propertybox.c:661
 msgid "Czech"
 msgstr "čeština"
 
-#: ../gtk-glade/propertybox.c:649
+#: ../gtk/propertybox.c:662
 msgid "Chinese"
 msgstr "čínština"
 
-#: ../gtk-glade/propertybox.c:706
+#: ../gtk/propertybox.c:719
 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-glade/update.c:80
+#: ../gtk/update.c:80
 #, c-format
 msgid ""
 "A more recent version is availalble from %s.\n"
@@ -251,31 +253,31 @@ msgstr ""
 "Na %s je dostupná novější verze.\n"
 "Přejete si otevřít prohlížeč, abyste si ji mohli stáhnout?"
 
-#: ../gtk-glade/update.c:91
+#: ../gtk/update.c:91
 msgid "You are running the lastest version."
 msgstr "Máte spuštěnou poslední verzi."
 
-#: ../gtk-glade/buddylookup.c:85
+#: ../gtk/buddylookup.c:85
 msgid "Firstname, Lastname"
 msgstr "PrvnĂ­ jmĂŠno, PoslednĂ­ jmĂŠno"
 
-#: ../gtk-glade/buddylookup.c:160
+#: ../gtk/buddylookup.c:160
 msgid "Error communicating with server."
 msgstr "Chyba komunikace se serverem."
 
-#: ../gtk-glade/buddylookup.c:164
+#: ../gtk/buddylookup.c:164
 msgid "Connecting..."
 msgstr "Připojuje se…"
 
-#: ../gtk-glade/buddylookup.c:168
+#: ../gtk/buddylookup.c:168
 msgid "Connected"
 msgstr "Připojeno"
 
-#: ../gtk-glade/buddylookup.c:172
+#: ../gtk/buddylookup.c:172
 msgid "Receiving data..."
 msgstr "Přijímají se data…"
 
-#: ../gtk-glade/buddylookup.c:180
+#: ../gtk/buddylookup.c:180
 #, c-format
 msgid "Found %i contact"
 msgid_plural "Found %i contacts"
@@ -283,7 +285,7 @@ msgstr[0] "Nalezen %i kontakt"
 msgstr[1] "Nalezeny %i kontakty"
 msgstr[2] "Nalezeno %i kontaktĹŻ"
 
-#: ../gtk-glade/setupwizard.c:25
+#: ../gtk/setupwizard.c:25
 msgid ""
 "Welcome !\n"
 "This assistant will help you to use a SIP account for your calls."
@@ -291,744 +293,142 @@ msgstr ""
 "VĂ­tejte!\n"
 "Tento průvodce vám pomůže používat sipový účet při vašich hovorech."
 
-#: ../gtk-glade/setupwizard.c:34
+#: ../gtk/setupwizard.c:34
 msgid "Create an account by choosing a username"
 msgstr "Vytvořit účet vybráním uživatelského jména"
 
-#: ../gtk-glade/setupwizard.c:35
+#: ../gtk/setupwizard.c:35
 msgid "I have already an account and just want to use it"
 msgstr "Účet již mám a chci jej použít"
 
-#: ../gtk-glade/setupwizard.c:53
+#: ../gtk/setupwizard.c:53
 msgid "Please choose a username:"
 msgstr "ProsĂ­m, vyberte si uĹživatelskĂŠ jmĂŠno:"
 
-#: ../gtk-glade/setupwizard.c:54
+#: ../gtk/setupwizard.c:54
 msgid "Username:"
 msgstr "UĹživatelskĂŠ jmĂŠno:"
 
-#: ../gtk-glade/setupwizard.c:92
+#: ../gtk/setupwizard.c:92
 #, c-format
 msgid "Checking if '%s' is available..."
 msgstr "Zjišťuji, zda-li je „%s“ přípustné…"
 
-#: ../gtk-glade/setupwizard.c:97 ../gtk-glade/setupwizard.c:164
+#: ../gtk/setupwizard.c:97 ../gtk/setupwizard.c:164
 msgid "Please wait..."
 msgstr "Prosím, čekejte…"
 
-#: ../gtk-glade/setupwizard.c:101
+#: ../gtk/setupwizard.c:101
 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ĂŠ."
 
-#: ../gtk-glade/setupwizard.c:103 ../gtk-glade/setupwizard.c:168
+#: ../gtk/setupwizard.c:103 ../gtk/setupwizard.c:168
 msgid "Ok !"
 msgstr "V pořádku!"
 
-#: ../gtk-glade/setupwizard.c:106 ../gtk-glade/setupwizard.c:171
+#: ../gtk/setupwizard.c:106 ../gtk/setupwizard.c:171
 msgid "Communication problem, please try again later."
 msgstr "Chyba při komunikaci. Prosím, zkuste to později."
 
-#: ../gtk-glade/setupwizard.c:134
+#: ../gtk/setupwizard.c:134
 msgid "Thank you. Your account is now configured and ready for use."
 msgstr "Děkujeme vám. Váš účet je nyní nastaven a připraven k použití."
 
-#: ../gtk-glade/setupwizard.c:228
+#: ../gtk/setupwizard.c:228
 msgid "Welcome to the account setup assistant"
 msgstr "Vítejte v průvodci nastavení účtu"
 
-#: ../gtk-glade/setupwizard.c:232
+#: ../gtk/setupwizard.c:232
 msgid "Account setup assistant"
 msgstr "Průvodce nastavením účtu"
 
-#: ../gtk-glade/setupwizard.c:236
+#: ../gtk/setupwizard.c:236
 msgid "Choosing a username"
 msgstr "Výběr uživatelského jména"
 
-#: ../gtk-glade/setupwizard.c:240
+#: ../gtk/setupwizard.c:240
 msgid "Verifying"
 msgstr "Ověřování"
 
-#: ../gtk-glade/setupwizard.c:244
+#: ../gtk/setupwizard.c:244
 msgid "Confirmation"
 msgstr "PotvrzenĂ­"
 
-#: ../gtk-glade/setupwizard.c:249
+#: ../gtk/setupwizard.c:249
 msgid "Creating your account"
 msgstr "Vytváření účtu"
 
-#: ../gtk-glade/setupwizard.c:253
+#: ../gtk/setupwizard.c:253
 msgid "Now ready !"
 msgstr "Připraveno!"
 
-#: ../gtk-glade/incall_view.c:113
+#: ../gtk/incall_view.c:113
+msgid "Transfer"
+msgstr "Přepojit"
+
+#: ../gtk/incall_view.c:187
 msgid "<b>Calling...</b>"
 msgstr "<b>Volá se…</b>"
 
-#: ../gtk-glade/incall_view.c:116 ../gtk-glade/incall_view.c:138
+#: ../gtk/incall_view.c:190 ../gtk/incall_view.c:246
 msgid "00::00::00"
 msgstr "00:00:00"
 
-#: ../gtk-glade/incall_view.c:136
-msgid "<b>In call with</b>"
-msgstr "<b>Hovor s</b>"
+#: ../gtk/incall_view.c:206
+msgid "<b>Incoming call</b>"
+msgstr "<b>Příchozí hovor</b>"
+
+#: ../gtk/incall_view.c:216
+msgid ""
+"Pause all calls\n"
+"and answer"
+msgstr ""
+"OdloĹžit vĹĄechny hovory\n"
+"a odpovědět"
+
+#: ../gtk/incall_view.c:217
+msgid "Answer"
+msgstr "Odpovědět"
+
+#: ../gtk/incall_view.c:244
+msgid "<b>In call</b>"
+msgstr "<b>ProbĂ­hĂĄ hovor</b>"
 
-#: ../gtk-glade/incall_view.c:154
+#: ../gtk/incall_view.c:260
+msgid "<b>Paused call</b>"
+msgstr "<b>OdloĹženĂ˝ hovor</b>"
+
+#: ../gtk/incall_view.c:272
 #, c-format
 msgid "%02i::%02i::%02i"
 msgstr "%02i:%02i:%02i"
 
-#: ../gtk-glade/incall_view.c:170
+#: ../gtk/incall_view.c:288
 msgid "<b>Call ended.</b>"
 msgstr "<b>Hovor skončil.</b>"
 
-#: ../gtk-glade/incall_view.c:188
+#: ../gtk/incall_view.c:309
 msgid "Unmute"
 msgstr "Nahlas"
 
-#: ../gtk-glade/incall_view.c:195 ../gtk-glade/main.glade.h:43
+#: ../gtk/incall_view.c:316
 msgid "Mute"
 msgstr "Ztlumit"
 
-#: ../gtk-glade/loginframe.c:83
+#: ../gtk/incall_view.c:340
+msgid "Resume"
+msgstr "Obnovit"
+
+#: ../gtk/incall_view.c:347
+msgid "Pause"
+msgstr "OdloĹžit"
+
+#: ../gtk/loginframe.c:93
 #, c-format
 msgid "Please enter login information for %s"
 msgstr "Prosím, zadejte své přihlašovací jméno pro %s:"
 
-#: ../gtk-glade/main.glade.h:1
-msgid "#"
-msgstr "#"
-
-#: ../gtk-glade/main.glade.h:2
-msgid "*"
-msgstr "*"
-
-#: ../gtk-glade/main.glade.h:3
-msgid "0"
-msgstr "0"
-
-#: ../gtk-glade/main.glade.h:4
-msgid "1"
-msgstr "1"
-
-#: ../gtk-glade/main.glade.h:5
-msgid "2"
-msgstr "2"
-
-#: ../gtk-glade/main.glade.h:6
-msgid "3"
-msgstr "3"
-
-#: ../gtk-glade/main.glade.h:7
-msgid "4"
-msgstr "4"
-
-#: ../gtk-glade/main.glade.h:8
-msgid "5"
-msgstr "5"
-
-#: ../gtk-glade/main.glade.h:9
-msgid "6"
-msgstr "6"
-
-#: ../gtk-glade/main.glade.h:10
-msgid "7"
-msgstr "7"
-
-#: ../gtk-glade/main.glade.h:11
-msgid "8"
-msgstr "8"
-
-#: ../gtk-glade/main.glade.h:12
-msgid "9"
-msgstr "9"
-
-#: ../gtk-glade/main.glade.h:13
-msgid "<b>Add contacts from directory</b>"
-msgstr "<b>Přidat kontakty z adresáře</b>"
-
-#: ../gtk-glade/main.glade.h:14
-msgid "<b>Contact list</b>"
-msgstr "<b>Seznam kontaktĹŻ</b>"
-
-#: ../gtk-glade/main.glade.h:15
-msgid "<b>Welcome !</b>"
-msgstr "<b>VĂ­tejte!</b>"
-
-#: ../gtk-glade/main.glade.h:16
-msgid "A"
-msgstr "A"
-
-#: ../gtk-glade/main.glade.h:17
-msgid ""
-"ADSL\n"
-"Fiber Channel"
-msgstr ""
-"ADSL\n"
-"Fiber Channel"
-
-#: ../gtk-glade/main.glade.h:19
-msgid ""
-"All users\n"
-"Online users"
-msgstr ""
-"vĹĄech uĹživatelĂ­ch\n"
-"připojených uživatelích"
-
-#: ../gtk-glade/main.glade.h:21
-msgid "Assistant"
-msgstr "PrĹŻvodce"
-
-#: ../gtk-glade/main.glade.h:22
-msgid "Audio & Video"
-msgstr "Zvuk i obraz"
-
-#: ../gtk-glade/main.glade.h:23
-msgid "Audio only"
-msgstr "Pouze zvuk"
-
-#: ../gtk-glade/main.glade.h:24
-msgid "Automatically log me in"
-msgstr "Přihlašovat mě automaticky"
-
-#: ../gtk-glade/main.glade.h:25
-msgid "B"
-msgstr "B"
-
-#: ../gtk-glade/main.glade.h:26 ../gtk-glade/parameters.glade.h:21
-msgid "C"
-msgstr "C"
-
-#: ../gtk-glade/main.glade.h:27
-msgid "Call Details"
-msgstr "Informace o hovoru"
-
-#: ../gtk-glade/main.glade.h:28 ../gtk-glade/call_logs.glade.h:1
-msgid "Call history"
-msgstr "Historie volĂĄnĂ­"
-
-#: ../gtk-glade/main.glade.h:29
-msgid "Check for updates"
-msgstr "Vyhledat aktualizace"
-
-#: ../gtk-glade/main.glade.h:30
-msgid "Contacts"
-msgstr "Kontakty"
-
-#: ../gtk-glade/main.glade.h:31
-msgid "D"
-msgstr "D"
-
-#: ../gtk-glade/main.glade.h:32
-msgid "Default"
-msgstr "Výchozí"
-
-#: ../gtk-glade/main.glade.h:33
-msgid "Duration"
-msgstr "DĂŠlka"
-
-#: ../gtk-glade/main.glade.h:34
-msgid "Duration:"
-msgstr "DĂŠlka:"
-
-#: ../gtk-glade/main.glade.h:35
-msgid "Enable self-view"
-msgstr "Zobrazovat sĂĄm sebe"
-
-#: ../gtk-glade/main.glade.h:36
-msgid "Enter username, phone number, or full sip address"
-msgstr "Zadejte uživatelské jméno, telefonní číslo nebo plnou sipovou adresu"
-
-#: ../gtk-glade/main.glade.h:37
-msgid "Homepage"
-msgstr "DomovskĂĄ strĂĄnka"
-
-#: ../gtk-glade/main.glade.h:38
-msgid "In call"
-msgstr "Telefonuje se"
-
-#: ../gtk-glade/main.glade.h:39
-msgid "Internet connection:"
-msgstr "Připojení k Internetu:"
-
-#: ../gtk-glade/main.glade.h:40
-msgid "Keypad"
-msgstr "KlĂĄvesnice"
-
-#: ../gtk-glade/main.glade.h:41
-msgid "Login information"
-msgstr "Informace o přihlášení"
-
-#: ../gtk-glade/main.glade.h:42
-msgid "Lookup:"
-msgstr "Hledat:"
-
-#: ../gtk-glade/main.glade.h:44
-msgid "My current identity:"
-msgstr "Moje současná totožnost:"
-
-#: ../gtk-glade/main.glade.h:45
-msgid "Password"
-msgstr "Heslo"
-
-#: ../gtk-glade/main.glade.h:46
-msgid "SIP address or phone number:"
-msgstr "SIP adresa nebo telefonní číslo:"
-
-#: ../gtk-glade/main.glade.h:47
-msgid "Search"
-msgstr "Hledat"
-
-#: ../gtk-glade/main.glade.h:48
-msgid "Show debug messages"
-msgstr "Zobrazit ladicĂ­ zprĂĄvy"
-
-#: ../gtk-glade/main.glade.h:49
-msgid "Start call"
-msgstr "ZahĂĄjit hovor"
-
-#: ../gtk-glade/main.glade.h:50
-msgid "Terminate call"
-msgstr "Ukončit hovor"
-
-#: ../gtk-glade/main.glade.h:51
-msgid "Username"
-msgstr "UĹživatelskĂŠ jmĂŠno"
-
-#: ../gtk-glade/main.glade.h:52
-msgid "_Linphone"
-msgstr "_Linphone"
-
-#: ../gtk-glade/main.glade.h:53
-msgid "_Modes"
-msgstr "ReĹži_my"
-
-#: ../gtk-glade/main.glade.h:54
-msgid "in"
-msgstr "ve"
-
-# XXX: Dummy string. Make it not translatable or use real message
-#: ../gtk-glade/main.glade.h:55
-msgid "label"
-msgstr ""
-
-#: ../gtk-glade/about.glade.h:1
-msgid "About linphone"
-msgstr "O Linphonu"
-
-# FIXME: standart
-#: ../gtk-glade/about.glade.h:2
-msgid "An internet video phone using the standard SIP (rfc3261) protocol."
-msgstr "Internetový videofon používající standardní protokol SIP (RFC 3261)."
-
-#: ../gtk-glade/about.glade.h:3
-msgid "Created by Simon Morlat\n"
-msgstr "Vytvořil Simon Morlat\n"
-
-#: ../gtk-glade/about.glade.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"
-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-glade/contact.glade.h:1
-msgid "<b>Contact information</b>"
-msgstr "<b>Informace o kontaktu</b>"
-
-#: ../gtk-glade/contact.glade.h:2
-msgid "Allow this contact to see my presence status"
-msgstr "Dovolit tomuto kontaktu, aby viděl můj stav přítomnosti"
-
-#: ../gtk-glade/contact.glade.h:4
-msgid "SIP Address"
-msgstr "SIP adresa"
-
-#: ../gtk-glade/contact.glade.h:5
-msgid "Show this contact presence status"
-msgstr "U tohoto kontaktu zobrazovat stav přítomnosti"
-
-# XXX: Dummy string. Make it not translatable or use real message
-#: ../gtk-glade/contact.glade.h:6 ../gtk-glade/password.glade.h:5
-#: ../gtk-glade/sip_account.glade.h:9
-msgid "gtk-cancel"
-msgstr ""
-
-# XXX: Dummy string. Make it not translatable or use real message
-#: ../gtk-glade/contact.glade.h:7 ../gtk-glade/password.glade.h:6
-#: ../gtk-glade/sip_account.glade.h:10
-msgid "gtk-ok"
-msgstr ""
-
-#: ../gtk-glade/log.glade.h:1
-msgid "Linphone debug window"
-msgstr "LadicĂ­ okno Linphonu"
-
-# XXX: Dummy string. Make it not translatable or use real message
-#: ../gtk-glade/log.glade.h:2 ../gtk-glade/call_logs.glade.h:2
-#: ../gtk-glade/chatroom.glade.h:2
-msgid "gtk-close"
-msgstr ""
-
-#: ../gtk-glade/password.glade.h:1
-msgid "Linphone - Authentication required"
-msgstr "Linphone – Ověření totožnosti vyžadováno"
-
-#: ../gtk-glade/password.glade.h:2
-msgid "Password:"
-msgstr "Heslo:"
-
-#: ../gtk-glade/password.glade.h:3
-msgid "Please enter the domain password"
-msgstr "ProsĂ­m, zadejte heslo pro domĂŠnu"
-
-#: ../gtk-glade/password.glade.h:4
-msgid "UserID"
-msgstr "IdentifikĂĄtor uĹživatele"
-
-#: ../gtk-glade/sip_account.glade.h:1
-msgid "Configure a SIP account"
-msgstr "Nastavit SIP účet"
-
-#: ../gtk-glade/sip_account.glade.h:2
-msgid "Linphone - Configure a SIP account"
-msgstr "Linphone – Nastav SIP účet"
-
-#: ../gtk-glade/sip_account.glade.h:3
-msgid "Publish presence information"
-msgstr "Zveřejnit stav přítomnosti"
-
-#: ../gtk-glade/sip_account.glade.h:4
-msgid "Register at startup"
-msgstr "Zaregistrovat při spuštění"
-
-#: ../gtk-glade/sip_account.glade.h:5
-msgid "Registration duration (sec):"
-msgstr "Registrační období (s):"
-
-#: ../gtk-glade/sip_account.glade.h:6
-msgid "Route (optional):"
-msgstr "Směrování (volitelné):"
-
-#: ../gtk-glade/sip_account.glade.h:7
-msgid "SIP Proxy address:"
-msgstr "Adresa SIP proxy:"
-
-#: ../gtk-glade/sip_account.glade.h:8
-msgid "Your SIP identity:"
-msgstr "VaĹĄe SIP totoĹžnost:"
-
-#: ../gtk-glade/sip_account.glade.h:11
-msgid "sip:"
-msgstr "sip:"
-
-#: ../gtk-glade/chatroom.glade.h:1
-msgid "Send"
-msgstr "Odeslat"
-
-#: ../gtk-glade/incoming_call.glade.h:1
-msgid "Accept"
-msgstr "Přijmout"
-
-#: ../gtk-glade/incoming_call.glade.h:2
-msgid "Decline"
-msgstr "OdmĂ­tnout"
-
-#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:369
-msgid "Incoming call"
-msgstr "Příchozí hovor"
-
-#: ../gtk-glade/incoming_call.glade.h:4
-msgid "Incoming call from"
-msgstr "Příchozí hovor od"
-
-#: ../gtk-glade/incoming_call.glade.h:5
-msgid "Linphone - Incoming call"
-msgstr "Linphone – Příchozí hovor"
-
-#: ../gtk-glade/parameters.glade.h:1
-msgid "0 stands for \"unlimited\""
-msgstr "0 znamená „neomezeno“"
-
-#: ../gtk-glade/parameters.glade.h:2
-msgid "<b>Audio</b>"
-msgstr "<b>Zvuk</b>"
-
-#: ../gtk-glade/parameters.glade.h:3
-msgid "<b>Bandwidth control</b>"
-msgstr "<b>Využití šířky pásma</b>"
-
-#: ../gtk-glade/parameters.glade.h:4
-msgid "<b>Codecs</b>"
-msgstr "<b>Kodeky</b>"
-
-#: ../gtk-glade/parameters.glade.h:5
-msgid "<b>Default identity</b>"
-msgstr "<b>ImplicitnĂ­ totoĹžnost</b>"
-
-#: ../gtk-glade/parameters.glade.h:6
-msgid "<b>Language</b>"
-msgstr "<b>Jazyk</b>"
-
-#: ../gtk-glade/parameters.glade.h:7
-msgid "<b>Level</b>"
-msgstr "<b>Úroveň</b>"
-
-#: ../gtk-glade/parameters.glade.h:8
-msgid "<b>NAT and Firewall</b>"
-msgstr "<b>NAT a firewall</b>"
-
-#: ../gtk-glade/parameters.glade.h:9
-msgid "<b>Ports</b>"
-msgstr "<b>Porty</b>"
-
-#: ../gtk-glade/parameters.glade.h:10
-msgid "<b>Privacy</b>"
-msgstr "<b>SoukromĂ­</b>"
-
-#: ../gtk-glade/parameters.glade.h:11
-msgid "<b>Proxy accounts</b>"
-msgstr "<b>Proxy účty</b>"
-
-#: ../gtk-glade/parameters.glade.h:12
-msgid "<b>Transport</b>"
-msgstr "<b>Přenos</b>"
-
-#: ../gtk-glade/parameters.glade.h:13
-msgid "<b>Video</b>"
-msgstr "<b>Obraz</b>"
-
-#: ../gtk-glade/parameters.glade.h:14
-msgid "ALSA special device (optional):"
-msgstr "Zvláštní ALSA zařízení (volitelné):"
-
-#: ../gtk-glade/parameters.glade.h:15
-msgid "Add"
-msgstr "Přidat"
-
-#: ../gtk-glade/parameters.glade.h:16
-msgid "Audio RTP/UDP:"
-msgstr "ZvukovĂ˝ RTP/UDP:"
-
-#: ../gtk-glade/parameters.glade.h:17
-msgid ""
-"Audio codecs\n"
-"Video codecs"
-msgstr ""
-"Kodeky zvuku\n"
-"Kodeky obrazu"
-
-#: ../gtk-glade/parameters.glade.h:19
-msgid "Behind NAT / Firewall (specify gateway IP below)"
-msgstr "Za NAT/firewallem (adresu brĂĄny zadejte nĂ­Ĺže)"
-
-#: ../gtk-glade/parameters.glade.h:20
-msgid "Behind NAT / Firewall (use STUN to resolve)"
-msgstr "Za NAT/firewallem (adresu určí STUN)"
-
-#: ../gtk-glade/parameters.glade.h:22
-msgid "CIF"
-msgstr "CIF"
-
-#: ../gtk-glade/parameters.glade.h:23
-msgid "Capture device:"
-msgstr "Zařízení pro nahrávání:"
-
-#: ../gtk-glade/parameters.glade.h:24
-msgid "Codecs"
-msgstr "Kodeky"
-
-#: ../gtk-glade/parameters.glade.h:25
-msgid "Direct connection to the Internet"
-msgstr "Přímé připojení do Internetu"
-
-#: ../gtk-glade/parameters.glade.h:26
-msgid "Disable"
-msgstr "ZakĂĄzat"
-
-#: ../gtk-glade/parameters.glade.h:27
-msgid "Done"
-msgstr "Hotovo"
-
-#: ../gtk-glade/parameters.glade.h:28
-msgid "Download speed limit in Kbit/sec:"
-msgstr "Omezení příchozí rychlosti (kb/s):"
-
-#: ../gtk-glade/parameters.glade.h:29
-msgid "Edit"
-msgstr "Upravit"
-
-#: ../gtk-glade/parameters.glade.h:30
-msgid "Enable"
-msgstr "Povolit"
-
-#: ../gtk-glade/parameters.glade.h:31
-msgid "Enable echo cancellation"
-msgstr "Zapnout potlačení ozvěny"
-
-#: ../gtk-glade/parameters.glade.h:32
-msgid "Erase all passwords"
-msgstr "Vymazat vĹĄechna hesla"
-
-#: ../gtk-glade/parameters.glade.h:33
-msgid "Manage SIP Accounts"
-msgstr "Nastavení SIP účtů"
-
-#: ../gtk-glade/parameters.glade.h:34
-msgid "Multimedia settings"
-msgstr "NastavenĂ­ multimĂŠdiĂ­"
-
-#: ../gtk-glade/parameters.glade.h:35
-msgid "Network settings"
-msgstr "Nastavení sítě"
-
-#: ../gtk-glade/parameters.glade.h:36
-msgid "Playback device:"
-msgstr "Zařízení pro přehrávání:"
-
-#: ../gtk-glade/parameters.glade.h:37
-msgid "Prefered video resolution:"
-msgstr "Upřednostňované rozlišení obrazu:"
-
-#: ../gtk-glade/parameters.glade.h:38
-msgid "Public IP address:"
-msgstr "Veřejná IP adresa:"
-
-#: ../gtk-glade/parameters.glade.h:39
-msgid ""
-"Register to FONICS\n"
-"virtual network !"
-msgstr ""
-"Zaregistrovat se do\n"
-"virtuální sítě FONICS!"
-
-#: ../gtk-glade/parameters.glade.h:41
-msgid "Remove"
-msgstr "Odstranit"
-
-#: ../gtk-glade/parameters.glade.h:42
-msgid "Ring device:"
-msgstr "Zařízení pro vyzvánění:"
-
-#: ../gtk-glade/parameters.glade.h:43
-msgid "Ring sound:"
-msgstr "Vyzvánění:"
-
-#: ../gtk-glade/parameters.glade.h:44
-msgid "SIP (UDP):"
-msgstr "SIP (UDP):"
-
-#: ../gtk-glade/parameters.glade.h:45
-msgid "Send DTMFs as SIP info"
-msgstr "Odesílat tóny DTMF jako SIP INFO zprávy"
-
-#: ../gtk-glade/parameters.glade.h:46
-msgid "Set Maximum Transmission Unit:"
-msgstr "Nastavit MTU (největší přenositelná zpráva):"
-
-#: ../gtk-glade/parameters.glade.h:47
-msgid "Settings"
-msgstr "NastavenĂ­"
-
-#: ../gtk-glade/parameters.glade.h:48
-msgid "Show advanced settings"
-msgstr "Zobrazit podrobnější nastavení"
-
-#: ../gtk-glade/parameters.glade.h:49
-msgid "Stun server:"
-msgstr "STUN server:"
-
-#: ../gtk-glade/parameters.glade.h:50
-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-glade/parameters.glade.h:51
-msgid "Upload speed limit in Kbit/sec:"
-msgstr "OmezenĂ­ odchozĂ­ rychlosti (kb/s):"
-
-#: ../gtk-glade/parameters.glade.h:52
-msgid "Use IPv6 instead of IPv4"
-msgstr "PouŞívat IPv6 místo IPv4"
-
-#: ../gtk-glade/parameters.glade.h:53
-msgid "User interface"
-msgstr "UĹživatelskĂŠ rozhranĂ­"
-
-#: ../gtk-glade/parameters.glade.h:54
-msgid "Video RTP/UDP:"
-msgstr "ObrazovĂ˝ RTP/UDP:"
-
-#: ../gtk-glade/parameters.glade.h:55
-msgid "Video input device:"
-msgstr "Vstupní zařízení obrazu:"
-
-#: ../gtk-glade/parameters.glade.h:56
-msgid "Your display name (eg: John Doe):"
-msgstr "Vaše zobrazované jméno (např. Jan Novák):"
-
-#: ../gtk-glade/parameters.glade.h:57
-msgid "Your resulting SIP address:"
-msgstr "Vaťe výslednå SIP adresa:"
-
-#: ../gtk-glade/parameters.glade.h:58
-msgid "Your username:"
-msgstr "VaĹĄe uĹživatelskĂŠ jmĂŠno:"
-
-#: ../gtk-glade/parameters.glade.h:59
-msgid "a sound card\n"
-msgstr "zvukovĂĄ karta\n"
-
-#: ../gtk-glade/parameters.glade.h:61
-msgid "default camera"
-msgstr "implicitnĂ­ kamera"
-
-#: ../gtk-glade/parameters.glade.h:62
-msgid "default soundcard"
-msgstr "implicitnĂ­ zvukovĂĄ karta"
-
-#: ../gtk-glade/parameters.glade.h:63
-msgid "default soundcard\n"
-msgstr "implicitnĂ­ zvukovĂĄ karta\n"
-
-#: ../gtk-glade/buddylookup.glade.h:1
-msgid "<b>Search somebody</b>"
-msgstr "<b>Hledat někoho</b>"
-
-#: ../gtk-glade/buddylookup.glade.h:2
-msgid "Add to my list"
-msgstr "Přidat na svůj seznam"
-
-#: ../gtk-glade/buddylookup.glade.h:3
-msgid "Search contacts in directory"
-msgstr "Hledat kontakty v adresáři"
-
-#: ../gtk-glade/waiting.glade.h:1
-msgid "Linphone"
-msgstr "Linphone"
-
-#: ../gtk-glade/waiting.glade.h:2
-msgid "Please wait"
-msgstr "Prosím, čekejte"
-
-#: ../coreapi/linphonecore.c:311
+#: ../coreapi/linphonecore.c:166
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
@@ -1036,19 +436,19 @@ 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ů."
 
-#: ../coreapi/linphonecore.c:357
+#: ../coreapi/linphonecore.c:207
 msgid "aborted"
 msgstr "přerušen"
 
-#: ../coreapi/linphonecore.c:360
+#: ../coreapi/linphonecore.c:210
 msgid "completed"
 msgstr "dokončen"
 
-#: ../coreapi/linphonecore.c:363
+#: ../coreapi/linphonecore.c:213
 msgid "missed"
 msgstr "promeĹĄkĂĄn"
 
-#: ../coreapi/linphonecore.c:368
+#: ../coreapi/linphonecore.c:218
 #, c-format
 msgid ""
 "%s at %s\n"
@@ -1063,11 +463,15 @@ msgstr ""
 "Stav: %s\n"
 "Délka: %i min %i s\n"
 
-#: ../coreapi/linphonecore.c:369
+#: ../coreapi/linphonecore.c:219
+msgid "Incoming call"
+msgstr "Příchozí hovor"
+
+#: ../coreapi/linphonecore.c:219
 msgid "Outgoing call"
 msgstr "OdchozĂ­ hovor"
 
-#: ../coreapi/linphonecore.c:626
+#: ../coreapi/linphonecore.c:501
 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"
@@ -1075,48 +479,68 @@ 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."
 
-#: ../coreapi/linphonecore.c:1083
+#: ../coreapi/linphonecore.c:994
 msgid "Ready"
 msgstr "Připraven."
 
-#: ../coreapi/linphonecore.c:1513
-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."
-
-#: ../coreapi/linphonecore.c:1725
+#: ../coreapi/linphonecore.c:1768
 msgid "Looking for telephone number destination..."
 msgstr "Vyhledává se umístění čísla…"
 
-#: ../coreapi/linphonecore.c:1727
+#: ../coreapi/linphonecore.c:1771
 msgid "Could not resolve this number."
 msgstr "Toto číslo nelze vyhledat."
 
-#: ../coreapi/linphonecore.c:1771
+#: ../coreapi/linphonecore.c:1815
 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>"
 
-#: ../coreapi/linphonecore.c:1912
+#: ../coreapi/linphonecore.c:1962
 msgid "Contacting"
 msgstr "Kontaktuji"
 
-#: ../coreapi/linphonecore.c:1918
-msgid "could not call"
-msgstr "Nelze volat."
+#: ../coreapi/linphonecore.c:1969
+msgid "Could not call"
+msgstr "Nelze volat"
+
+#: ../coreapi/linphonecore.c:2076
+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!"
+
+#: ../coreapi/linphonecore.c:2081
+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:1965
-msgid "Sorry, having multiple simultaneous calls is not supported yet !"
-msgstr "Promiňte, vedení více současných hovorů není podporováno!"
+#: ../coreapi/linphonecore.c:2205
+msgid "Modifying call parameters..."
+msgstr "Upravují se parametry hovoru…"
 
-#: ../coreapi/linphonecore.c:2370 ../coreapi/callbacks.c:32
+#: ../coreapi/linphonecore.c:2308
 msgid "Connected."
 msgstr "Připojeno."
 
-#: ../coreapi/linphonecore.c:2404
+#: ../coreapi/linphonecore.c:2331
+msgid "Call aborted"
+msgstr "Hovor přerušen"
+
+#: ../coreapi/linphonecore.c:2371
 msgid "Call ended"
-msgstr "Hovor skončil."
+msgstr "Hovor ukončen"
+
+#: ../coreapi/linphonecore.c:2453
+msgid "Could not pause the call"
+msgstr "Hovor nebylo moĹžnĂŠ odloĹžit"
+
+#: ../coreapi/linphonecore.c:2457
+msgid "Pausing the current call..."
+msgstr "Současný hovor se odkládá…"
+
+#: ../coreapi/linphonecore.c:2496
+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."
 
 #: ../coreapi/misc.c:147
 msgid ""
@@ -1142,7 +566,7 @@ msgstr ""
 "oss, který chybí. Prosím zadejte jako uživatel root příkaz\n"
 "'modprobe snd-mixer-oss', kterým modul zavede."
 
-#: ../coreapi/misc.c:497
+#: ../coreapi/misc.c:520
 msgid "Stun lookup in progress..."
 msgstr "Hledá se adresa pomocí STUN…"
 
@@ -1194,7 +618,7 @@ msgstr "Čeká"
 msgid "Unknown-bug"
 msgstr "NeznĂĄmĂĄ chyba"
 
-#: ../coreapi/proxy.c:176
+#: ../coreapi/proxy.c:187
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
@@ -1202,7 +626,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:182
+#: ../coreapi/proxy.c:193
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
@@ -1210,94 +634,130 @@ 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:621
+#: ../coreapi/proxy.c:670
 #, c-format
 msgid "Could not login as %s"
 msgstr "Nelze se přihlásit jako %s"
 
-#: ../coreapi/callbacks.c:95
+#: ../coreapi/callbacks.c:170
 msgid "is contacting you"
 msgstr "vĂĄs volĂĄ"
 
-#: ../coreapi/callbacks.c:96
+#: ../coreapi/callbacks.c:171
 msgid " and asked autoanswer."
 msgstr " a poĹžaduje automatickou zvednutĂ­."
 
-#: ../coreapi/callbacks.c:96
+#: ../coreapi/callbacks.c:171
 msgid "."
 msgstr "."
 
-#: ../coreapi/callbacks.c:120
+#: ../coreapi/callbacks.c:226
 msgid "Remote ringing."
 msgstr "Vyzvání na druhé straně."
 
-#: ../coreapi/callbacks.c:139
+#: ../coreapi/callbacks.c:251
 msgid "Early media."
 msgstr "Časná média."
 
-#: ../coreapi/callbacks.c:248
+#: ../coreapi/callbacks.c:289
+#, c-format
+msgid "Call with %s is paused."
+msgstr "Hovor s %s je odloŞen."
+
+#: ../coreapi/callbacks.c:300
+#, c-format
+msgid "Call answered by %s - on hold."
+msgstr "Hovor přijat kým: %s – odložen."
+
+#: ../coreapi/callbacks.c:315
+msgid "Call resumed."
+msgstr "Hovor obnoven."
+
+#: ../coreapi/callbacks.c:320
+#, c-format
+msgid "Call answered by %s."
+msgstr "Hovor přijat kým: %s."
+
+#: ../coreapi/callbacks.c:381
+msgid "We are being paused..."
+msgstr "Jsme odkládáni…"
+
+#: ../coreapi/callbacks.c:385
+msgid "We have been resumed..."
+msgstr "Byli jsme obnoveni…"
+
+#: ../coreapi/callbacks.c:422
 msgid "Call terminated."
 msgstr "Hovor ukončen."
 
-#: ../coreapi/callbacks.c:265
+#: ../coreapi/callbacks.c:429
 msgid "User is busy."
 msgstr "Uživatel je zaneprázdněn."
 
-#: ../coreapi/callbacks.c:266
+#: ../coreapi/callbacks.c:430
 msgid "User is temporarily unavailable."
 msgstr "Uživatel je dočasně nedostupný."
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:268
+#: ../coreapi/callbacks.c:432
 msgid "User does not want to be disturbed."
 msgstr "Uživatel si nepřeje být rušen."
 
-#: ../coreapi/callbacks.c:269
+#: ../coreapi/callbacks.c:433
 msgid "Call declined."
 msgstr "VolĂĄnĂ­ odmĂ­tnuto."
 
-#: ../coreapi/callbacks.c:281
+#: ../coreapi/callbacks.c:445
 msgid "No response."
 msgstr "Žádná odpověď."
 
-#: ../coreapi/callbacks.c:284
+#: ../coreapi/callbacks.c:449
 msgid "Protocol error."
-msgstr ""
+msgstr "Chyba protokolu."
 
-#: ../coreapi/callbacks.c:298
+#: ../coreapi/callbacks.c:465
 msgid "Redirected"
 msgstr "Přesměrováno"
 
-#: ../coreapi/callbacks.c:308
+#: ../coreapi/callbacks.c:475
 msgid "Not found"
 msgstr "Nenalezeno"
 
-#: ../coreapi/callbacks.c:318
+#: ../coreapi/callbacks.c:485
 msgid "No common codecs"
 msgstr "Žádný společný formát"
 
-#: ../coreapi/callbacks.c:324
+#: ../coreapi/callbacks.c:491
 msgid "Call failed."
 msgstr "Volání se nezdařilo."
 
-#: ../coreapi/callbacks.c:374
+#: ../coreapi/callbacks.c:527
+msgid "Authentication failure"
+msgstr "Selhání ověření"
+
+#: ../coreapi/callbacks.c:553
 #, c-format
 msgid "Registration on %s successful."
 msgstr "Registrace na %s byla úspěšná."
 
-#: ../coreapi/callbacks.c:375
+#: ../coreapi/callbacks.c:554
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "OdregistrovĂĄnĂ­ z %s hotovo."
 
-#: ../coreapi/callbacks.c:383
+#: ../coreapi/callbacks.c:570
+msgid "no response timeout"
+msgstr "odpověď nedorazila včas"
+
+#: ../coreapi/callbacks.c:573
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "Registrace na %s selhala: %s"
 
-#: ../coreapi/callbacks.c:383
-msgid "no response timeout"
-msgstr "odpověď nedorazila včas"
+#: ../coreapi/callbacks.c:615
+#, c-format
+msgid "We are transferred to %s"
+msgstr "Byly jsme přepojeni na %s"
 
 #: ../mediastreamer2/src/alaw.c:144 ../mediastreamer2/src/alaw.c:162
 msgid "ITU-G.711 alaw encoder"
@@ -1315,11 +775,11 @@ msgstr "Zdroj zvuku ALSA"
 msgid "Alsa sound output"
 msgstr "Zvukový výstup ALSA"
 
-#: ../mediastreamer2/src/aqsnd.c:1008
+#: ../mediastreamer2/src/aqsnd.c:1005
 msgid "Sound capture filter for MacOS X Audio Queue Service"
 msgstr "Filtr zachytávání zvuku přes MacOS X službu zvukové fronty"
 
-#: ../mediastreamer2/src/aqsnd.c:1032
+#: ../mediastreamer2/src/aqsnd.c:1029
 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"
 
@@ -1335,11 +795,11 @@ msgstr "Kodek plnopĂĄsmovĂŠho GSM"
 msgid "The GSM codec"
 msgstr "GSM kodek"
 
-#: ../mediastreamer2/src/macsnd.c:1083
+#: ../mediastreamer2/src/macsnd.c:670
 msgid "Sound capture filter for MacOS X Core Audio drivers"
 msgstr "Filtr zachytávání zvuku přes MacOS X ovladače Core Audio"
 
-#: ../mediastreamer2/src/macsnd.c:1098
+#: ../mediastreamer2/src/macsnd.c:684
 msgid "Sound playback filter for MacOS X Core Audio drivers"
 msgstr "Filtr přehrávání zvuku přes MacOS X ovladače Core Audio"
 
@@ -1408,6 +868,10 @@ msgstr "Zvukový přehrávací filtr pro ovladače OSS"
 msgid "A pixel format converter"
 msgstr "Převodník formátu pixelů"
 
+#: ../mediastreamer2/src/sdlout.c:345 ../mediastreamer2/src/sdlout.c:363
+msgid "A video display window using SDL"
+msgstr "Zobrazovaní videa v SDL okně"
+
 #: ../mediastreamer2/src/sizeconv.c:204
 msgid "A video size converter"
 msgstr "Převaděč velikosti videa"
@@ -1550,21 +1014,495 @@ msgstr "ParametrickĂ˝ ekvalizĂŠr zvuku."
 msgid "A webcam grabber based on directshow."
 msgstr "Snímač kamer postavený na directshow."
 
+#~ msgid "Call answered - connected."
+#~ msgstr "Hovoř přijat – spojen."
+
+#~ msgid "Incoming call from %s"
+#~ msgstr "Příchozí hovor od %s"
+
+#~ msgid "#"
+#~ msgstr "#"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "0"
+#~ msgstr "0"
+
+#~ msgid "1"
+#~ msgstr "1"
+
+#~ msgid "2"
+#~ msgstr "2"
+
+#~ msgid "3"
+#~ msgstr "3"
+
+#~ msgid "4"
+#~ msgstr "4"
+
+#~ msgid "5"
+#~ msgstr "5"
+
+#~ msgid "6"
+#~ msgstr "6"
+
+#~ msgid "7"
+#~ msgstr "7"
+
+#~ msgid "8"
+#~ msgstr "8"
+
+#~ msgid "9"
+#~ msgstr "9"
+
+#~ msgid "<b>Add contacts from directory</b>"
+#~ msgstr "<b>Přidat kontakty z adresáře</b>"
+
+#~ msgid "<b>Contact list</b>"
+#~ msgstr "<b>Seznam kontaktĹŻ</b>"
+
+#~ msgid "<b>Welcome !</b>"
+#~ msgstr "<b>VĂ­tejte!</b>"
+
+#~ msgid "A"
+#~ msgstr "A"
+
+#~ msgid ""
+#~ "ADSL\n"
+#~ "Fiber Channel"
+#~ msgstr ""
+#~ "ADSL\n"
+#~ "Fiber Channel"
+
+#~ msgid ""
+#~ "All users\n"
+#~ "Online users"
+#~ msgstr ""
+#~ "vĹĄech uĹživatelĂ­ch\n"
+#~ "připojených uživatelích"
+
+#~ msgid "Assistant"
+#~ msgstr "PrĹŻvodce"
+
+#~ msgid "Audio & Video"
+#~ msgstr "Zvuk i obraz"
+
+#~ msgid "Audio only"
+#~ msgstr "Pouze zvuk"
+
+#~ msgid "Automatically log me in"
+#~ msgstr "Přihlašovat mě automaticky"
+
+#~ msgid "B"
+#~ msgstr "B"
+
+#~ msgid "C"
+#~ msgstr "C"
+
+#~ msgid "Call Details"
+#~ msgstr "Informace o hovoru"
+
+#~ msgid "Call history"
+#~ msgstr "Historie volĂĄnĂ­"
+
+#~ msgid "Check for updates"
+#~ msgstr "Vyhledat aktualizace"
+
+#~ msgid "Contacts"
+#~ msgstr "Kontakty"
+
+#~ msgid "D"
+#~ msgstr "D"
+
+#~ msgid "Default"
+#~ msgstr "Výchozí"
+
+#~ msgid "Duration"
+#~ msgstr "DĂŠlka"
+
+#~ msgid "Duration:"
+#~ msgstr "DĂŠlka:"
+
+#~ msgid "Enable self-view"
+#~ msgstr "Zobrazovat sĂĄm sebe"
+
+#~ msgid "Enter username, phone number, or full sip address"
+#~ msgstr ""
+#~ "Zadejte uživatelské jméno, telefonní číslo nebo plnou sipovou adresu"
+
+#~ msgid "Homepage"
+#~ msgstr "DomovskĂĄ strĂĄnka"
+
+#~ msgid "In call"
+#~ msgstr "Telefonuje se"
+
+#~ msgid "Internet connection:"
+#~ msgstr "Připojení k Internetu:"
+
+#~ msgid "Keypad"
+#~ msgstr "KlĂĄvesnice"
+
+#~ msgid "Login information"
+#~ msgstr "Informace o přihlášení"
+
+#~ msgid "Lookup:"
+#~ msgstr "Hledat:"
+
+#~ msgid "My current identity:"
+#~ msgstr "Moje současná totožnost:"
+
+#~ msgid "Password"
+#~ msgstr "Heslo"
+
+#~ msgid "SIP address or phone number:"
+#~ msgstr "SIP adresa nebo telefonní číslo:"
+
+#~ msgid "Search"
+#~ msgstr "Hledat"
+
+#~ msgid "Show debug messages"
+#~ msgstr "Zobrazit ladicĂ­ zprĂĄvy"
+
+#~ msgid "Start call"
+#~ msgstr "ZahĂĄjit hovor"
+
+#~ msgid "Terminate call"
+#~ msgstr "Ukončit hovor"
+
+#~ msgid "Username"
+#~ msgstr "UĹživatelskĂŠ jmĂŠno"
+
+#~ msgid "_Linphone"
+#~ msgstr "_Linphone"
+
+#~ msgid "_Modes"
+#~ msgstr "ReĹži_my"
+
+#~ msgid "in"
+#~ msgstr "ve"
+
+#~ msgid "About linphone"
+#~ msgstr "O Linphonu"
+
+# FIXME: standart
+#~ msgid "An internet video phone using the standard SIP (rfc3261) protocol."
+#~ msgstr ""
+#~ "Internetový videofon používající standardní protokol SIP (RFC 3261)."
+
+#~ msgid "Created by Simon Morlat\n"
+#~ msgstr "Vytvořil Simon Morlat\n"
+
+#~ 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 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"
+
+#~ msgid "<b>Contact information</b>"
+#~ msgstr "<b>Informace o kontaktu</b>"
+
+#~ msgid "Allow this contact to see my presence status"
+#~ msgstr "Dovolit tomuto kontaktu, aby viděl můj stav přítomnosti"
+
+#~ msgid "SIP Address"
+#~ msgstr "SIP adresa"
+
+#~ msgid "Show this contact presence status"
+#~ msgstr "U tohoto kontaktu zobrazovat stav přítomnosti"
+
+#~ msgid "Linphone debug window"
+#~ msgstr "LadicĂ­ okno Linphonu"
+
+#~ msgid "Linphone - Authentication required"
+#~ msgstr "Linphone – Ověření totožnosti vyžadováno"
+
+#~ msgid "Password:"
+#~ msgstr "Heslo:"
+
+#~ msgid "Please enter the domain password"
+#~ msgstr "ProsĂ­m, zadejte heslo pro domĂŠnu"
+
+#~ msgid "UserID"
+#~ msgstr "IdentifikĂĄtor uĹživatele"
+
+#~ msgid "Configure a SIP account"
+#~ msgstr "Nastavit SIP účet"
+
+#~ msgid "Linphone - Configure a SIP account"
+#~ msgstr "Linphone – Nastav SIP účet"
+
+#~ msgid "Publish presence information"
+#~ msgstr "Zveřejnit stav přítomnosti"
+
+#~ msgid "Register at startup"
+#~ msgstr "Zaregistrovat při spuštění"
+
+#~ msgid "Registration duration (sec):"
+#~ msgstr "Registrační období (s):"
+
+#~ msgid "Route (optional):"
+#~ msgstr "Směrování (volitelné):"
+
+#~ msgid "SIP Proxy address:"
+#~ msgstr "Adresa SIP proxy:"
+
+#~ msgid "Your SIP identity:"
+#~ msgstr "VaĹĄe SIP totoĹžnost:"
+
+#~ msgid "sip:"
+#~ msgstr "sip:"
+
+#~ msgid "Send"
+#~ msgstr "Odeslat"
+
+#~ msgid "Accept"
+#~ msgstr "Přijmout"
+
+#~ msgid "Decline"
+#~ msgstr "OdmĂ­tnout"
+
+#~ msgid "Incoming call from"
+#~ msgstr "Příchozí hovor od"
+
+#~ msgid "Linphone - Incoming call"
+#~ msgstr "Linphone – Příchozí hovor"
+
+#~ msgid "0 stands for \"unlimited\""
+#~ msgstr "0 znamená „neomezeno“"
+
+#~ msgid "<b>Audio</b>"
+#~ msgstr "<b>Zvuk</b>"
+
+#~ msgid "<b>Bandwidth control</b>"
+#~ msgstr "<b>Využití šířky pásma</b>"
+
+#~ msgid "<b>Codecs</b>"
+#~ msgstr "<b>Kodeky</b>"
+
+#~ msgid "<b>Default identity</b>"
+#~ msgstr "<b>ImplicitnĂ­ totoĹžnost</b>"
+
+#~ msgid "<b>Language</b>"
+#~ msgstr "<b>Jazyk</b>"
+
+#~ msgid "<b>Level</b>"
+#~ msgstr "<b>Úroveň</b>"
+
+#~ msgid "<b>NAT and Firewall</b>"
+#~ msgstr "<b>NAT a firewall</b>"
+
+#~ msgid "<b>Ports</b>"
+#~ msgstr "<b>Porty</b>"
+
+#~ msgid "<b>Privacy</b>"
+#~ msgstr "<b>SoukromĂ­</b>"
+
+#~ msgid "<b>Proxy accounts</b>"
+#~ msgstr "<b>Proxy účty</b>"
+
+#~ msgid "<b>Transport</b>"
+#~ msgstr "<b>Přenos</b>"
+
+#~ msgid "<b>Video</b>"
+#~ msgstr "<b>Obraz</b>"
+
+#~ msgid "ALSA special device (optional):"
+#~ msgstr "Zvláštní ALSA zařízení (volitelné):"
+
+#~ msgid "Add"
+#~ msgstr "Přidat"
+
+#~ msgid "Audio RTP/UDP:"
+#~ msgstr "ZvukovĂ˝ RTP/UDP:"
+
+#~ msgid ""
+#~ "Audio codecs\n"
+#~ "Video codecs"
+#~ msgstr ""
+#~ "Kodeky zvuku\n"
+#~ "Kodeky obrazu"
+
+#~ msgid "Behind NAT / Firewall (specify gateway IP below)"
+#~ msgstr "Za NAT/firewallem (adresu brĂĄny zadejte nĂ­Ĺže)"
+
+#~ msgid "Behind NAT / Firewall (use STUN to resolve)"
+#~ msgstr "Za NAT/firewallem (adresu určí STUN)"
+
+#~ msgid "CIF"
+#~ msgstr "CIF"
+
+#~ msgid "Capture device:"
+#~ msgstr "Zařízení pro nahrávání:"
+
+#~ msgid "Codecs"
+#~ msgstr "Kodeky"
+
+#~ msgid "Direct connection to the Internet"
+#~ msgstr "Přímé připojení do Internetu"
+
+#~ msgid "Disable"
+#~ msgstr "ZakĂĄzat"
+
+#~ msgid "Done"
+#~ msgstr "Hotovo"
+
+#~ msgid "Download speed limit in Kbit/sec:"
+#~ msgstr "Omezení příchozí rychlosti (kb/s):"
+
+#~ msgid "Edit"
+#~ msgstr "Upravit"
+
+#~ msgid "Enable"
+#~ msgstr "Povolit"
+
+#~ msgid "Enable echo cancellation"
+#~ msgstr "Zapnout potlačení ozvěny"
+
+#~ msgid "Erase all passwords"
+#~ msgstr "Vymazat vĹĄechna hesla"
+
+#~ msgid "Manage SIP Accounts"
+#~ msgstr "Nastavení SIP účtů"
+
+#~ msgid "Multimedia settings"
+#~ msgstr "NastavenĂ­ multimĂŠdiĂ­"
+
+#~ msgid "Network settings"
+#~ msgstr "Nastavení sítě"
+
+#~ msgid "Playback device:"
+#~ msgstr "Zařízení pro přehrávání:"
+
+#~ msgid "Prefered video resolution:"
+#~ msgstr "Upřednostňované rozlišení obrazu:"
+
+#~ msgid "Public IP address:"
+#~ msgstr "Veřejná IP adresa:"
+
+#~ msgid ""
+#~ "Register to FONICS\n"
+#~ "virtual network !"
+#~ msgstr ""
+#~ "Zaregistrovat se do\n"
+#~ "virtuální sítě FONICS!"
+
+#~ msgid "Remove"
+#~ msgstr "Odstranit"
+
+#~ msgid "Ring device:"
+#~ msgstr "Zařízení pro vyzvánění:"
+
+#~ msgid "Ring sound:"
+#~ msgstr "Vyzvánění:"
+
+#~ msgid "SIP (UDP):"
+#~ msgstr "SIP (UDP):"
+
+#~ msgid "Send DTMFs as SIP info"
+#~ msgstr "Odesílat tóny DTMF jako SIP INFO zprávy"
+
+#~ msgid "Set Maximum Transmission Unit:"
+#~ msgstr "Nastavit MTU (největší přenositelná zpráva):"
+
+#~ msgid "Settings"
+#~ msgstr "NastavenĂ­"
+
+#~ msgid "Show advanced settings"
+#~ msgstr "Zobrazit podrobnější nastavení"
+
+#~ msgid "Stun server:"
+#~ msgstr "STUN server:"
+
+#~ 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"
+
+#~ msgid "Upload speed limit in Kbit/sec:"
+#~ msgstr "OmezenĂ­ odchozĂ­ rychlosti (kb/s):"
+
+#~ msgid "Use IPv6 instead of IPv4"
+#~ msgstr "PouŞívat IPv6 místo IPv4"
+
+#~ msgid "User interface"
+#~ msgstr "UĹživatelskĂŠ rozhranĂ­"
+
+#~ msgid "Video RTP/UDP:"
+#~ msgstr "ObrazovĂ˝ RTP/UDP:"
+
+#~ msgid "Video input device:"
+#~ msgstr "Vstupní zařízení obrazu:"
+
+#~ msgid "Your display name (eg: John Doe):"
+#~ msgstr "Vaše zobrazované jméno (např. Jan Novák):"
+
+#~ msgid "Your resulting SIP address:"
+#~ msgstr "Vaťe výslednå SIP adresa:"
+
+#~ msgid "Your username:"
+#~ msgstr "VaĹĄe uĹživatelskĂŠ jmĂŠno:"
+
+#~ msgid "a sound card\n"
+#~ msgstr "zvukovĂĄ karta\n"
+
+#~ msgid "default camera"
+#~ msgstr "implicitnĂ­ kamera"
+
+#~ msgid "default soundcard"
+#~ msgstr "implicitnĂ­ zvukovĂĄ karta"
+
+#~ msgid "default soundcard\n"
+#~ msgstr "implicitnĂ­ zvukovĂĄ karta\n"
+
+#~ msgid "<b>Search somebody</b>"
+#~ msgstr "<b>Hledat někoho</b>"
+
+#~ msgid "Add to my list"
+#~ msgstr "Přidat na svůj seznam"
+
+#~ msgid "Search contacts in directory"
+#~ msgstr "Hledat kontakty v adresáři"
+
+#~ msgid "Linphone"
+#~ msgstr "Linphone"
+
+#~ msgid "Please wait"
+#~ msgstr "Prosím, čekejte"
+
+#~ 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 "Error."
 #~ msgstr "Chyba."
 
-#~ msgid "<b>Terminate call</b>"
-#~ msgstr "<b>Ukončit hovor</b>"
-
 #~ msgid "Digits"
 #~ msgstr "Číslice"
 
 #~ msgid "Main view"
 #~ msgstr "HlavnĂ­ zobrazenĂ­"
 
-#~ msgid "Show current call"
-#~ msgstr "Zobrazit současný hovor"
-
 #~ msgid "No nat/firewall address supplied !"
 #~ msgstr "Žådnå adresa NATu/firewallu nebyla zadåna!"
 
@@ -1635,9 +1573,6 @@ msgstr "Snímač kamer postavený na directshow."
 #~ msgid "A video for macosx compatible source filter to stream pictures."
 #~ msgstr "Zdrojový filtr kompatibilní s MacOS X videem proudující obrázky."
 
-#~ msgid "A video display window using SDL"
-#~ msgstr "Zobrazovaní videa v SDL okně"
-
 #~ msgid ""
 #~ "Show All\n"
 #~ "Show Online"
@@ -1910,9 +1845,6 @@ msgstr "Snímač kamer postavený na directshow."
 #~ msgid "Clear all stored authentication information (username,password...)"
 #~ msgstr "Vyprázdnit všechny ověřovací informace (uživatelské jméno, heslo…)"
 
-#~ msgid "Authentication information"
-#~ msgstr "Ověřovací informace"
-
 #~ msgid "SIP"
 #~ msgstr "SIP"
 
diff --git a/po/de.po b/po/de.po
index 909e478e8b39a6e0d21c0eb33852dd94c87dee9a..a8bf9d1d2cb619146cdcb546cb381edf097a5da9 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,59 +6,54 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone 0.7.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 17:16+0200\n"
+"POT-Creation-Date: 2011-02-07 10:59+0100\n"
 "PO-Revision-Date: 2003-05-23 17:51-0400\n"
 "Last-Translator: Jean-Jacques Sarton <jj.sarton@t-online.de>, Ursula Herles-"
 "Hartz <UAHartz@t-online.de>\n"
 "Language-Team: Deutsch <de@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: ../gtk-glade/support.c:49 ../gtk-glade/support.c:73
-#: ../gtk-glade/support.c:102
+#: ../gtk/support.c:49 ../gtk/support.c:73 ../gtk/support.c:102
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "Pixmapdatei %s nicht gefunden"
 
-#: ../gtk-glade/chat.c:27
+#: ../gtk/chat.c:27
 #, c-format
 msgid "Chat with %s"
 msgstr "Chat mit %s"
 
-#: ../gtk-glade/main.c:94
+#: ../gtk/main.c:74
 msgid "log to stdout some debug information while running."
 msgstr ""
 
-#: ../gtk-glade/main.c:101
+#: ../gtk/main.c:81
 msgid "Start only in the system tray, do not show the main interface."
 msgstr ""
 
-#: ../gtk-glade/main.c:108
+#: ../gtk/main.c:88
 msgid "address to call right now"
 msgstr ""
 
-#: ../gtk-glade/main.c:115
+#: ../gtk/main.c:95
 msgid "if set automatically answer incoming calls"
 msgstr ""
 
-#: ../gtk-glade/main.c:123
+#: ../gtk/main.c:103
 msgid ""
 "Specifiy a working directory (should be the base of the installation, eg: c:"
 "\\Program Files\\Linphone)"
 msgstr ""
 
-#: ../gtk-glade/main.c:402
+#: ../gtk/main.c:479
 #, fuzzy, c-format
 msgid "Call with %s"
 msgstr "Chat mit %s"
 
-#: ../gtk-glade/main.c:720
-#, fuzzy, c-format
-msgid "Incoming call from %s"
-msgstr "Eingehendes Gespr�h"
-
-#: ../gtk-glade/main.c:759
+#: ../gtk/main.c:862
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
@@ -67,1011 +62,375 @@ msgid ""
 "If you answer no, this person will be temporarily blacklisted."
 msgstr ""
 
-#: ../gtk-glade/main.c:837
+#: ../gtk/main.c:940
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at domain <i>%s</i>:"
 msgstr ""
 
-#: ../gtk-glade/main.c:934
+#: ../gtk/main.c:1076
 msgid "Website link"
 msgstr ""
 
-#: ../gtk-glade/main.c:970
+#: ../gtk/main.c:1112
 msgid "Linphone - a video internet phone"
 msgstr ""
 
-#: ../gtk-glade/main.c:989
+#: ../gtk/main.c:1131
 #, c-format
 msgid "%s (Default)"
 msgstr ""
 
-#: ../gtk-glade/main.c:1221
+#: ../gtk/main.c:1382
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
 msgstr ""
 
-#: ../gtk-glade/main.c:1275
+#: ../gtk/main.c:1441
 msgid "A free SIP video-phone"
 msgstr "Ein freies SIP Video-Fone"
 
-#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:258
-#: ../gtk-glade/contact.glade.h:3
+#: ../gtk/friendlist.c:192 ../gtk/propertybox.c:271
 msgid "Name"
 msgstr "Name"
 
-#: ../gtk-glade/friendlist.c:205
+#: ../gtk/friendlist.c:205
 msgid "Presence status"
 msgstr "Anwesenheitsstatus"
 
-#: ../gtk-glade/friendlist.c:242
+#: ../gtk/friendlist.c:242
 #, c-format
 msgid "Search in %s directory"
 msgstr ""
 
-#: ../gtk-glade/friendlist.c:450
+#: ../gtk/friendlist.c:450
 msgid "Invalid sip contact !"
 msgstr ""
 
-#: ../gtk-glade/friendlist.c:492
+#: ../gtk/friendlist.c:495
 #, fuzzy, c-format
 msgid "Call %s"
 msgstr "Gesprächsverlauf"
 
-#: ../gtk-glade/friendlist.c:493
+#: ../gtk/friendlist.c:496
 #, c-format
 msgid "Send text to %s"
 msgstr ""
 
-#: ../gtk-glade/friendlist.c:494
+#: ../gtk/friendlist.c:497
 #, fuzzy, c-format
 msgid "Edit contact '%s'"
 msgstr "Bearbeite Kontaktinformationen"
 
-#: ../gtk-glade/friendlist.c:495
+#: ../gtk/friendlist.c:498
 #, c-format
 msgid "Delete contact '%s'"
 msgstr ""
 
-#: ../gtk-glade/friendlist.c:537
+#: ../gtk/friendlist.c:540
 #, c-format
 msgid "Add new contact from %s directory"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:264
+#: ../gtk/propertybox.c:277
 msgid "Rate (Hz)"
 msgstr "Rate (Hz)"
 
-#: ../gtk-glade/propertybox.c:270
+#: ../gtk/propertybox.c:283
 msgid "Status"
 msgstr "Status"
 
-#: ../gtk-glade/propertybox.c:276
+#: ../gtk/propertybox.c:289
 msgid "Min bitrate (kbit/s)"
 msgstr "Min Bitrate (kbit/s)"
 
-#: ../gtk-glade/propertybox.c:283
+#: ../gtk/propertybox.c:296
 msgid "Parameters"
 msgstr "Parameter"
 
-#: ../gtk-glade/propertybox.c:312 ../gtk-glade/propertybox.c:451
+#: ../gtk/propertybox.c:325 ../gtk/propertybox.c:464
 msgid "Enabled"
 msgstr "Freigegeben"
 
-#: ../gtk-glade/propertybox.c:313 ../gtk-glade/propertybox.c:451
+#: ../gtk/propertybox.c:326 ../gtk/propertybox.c:464
 msgid "Disabled"
 msgstr "Gesperrt"
 
-#: ../gtk-glade/propertybox.c:496
+#: ../gtk/propertybox.c:509
 msgid "Account"
 msgstr "Konto"
 
-#: ../gtk-glade/propertybox.c:636
+#: ../gtk/propertybox.c:649
 msgid "English"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:637
+#: ../gtk/propertybox.c:650
 msgid "French"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:638
+#: ../gtk/propertybox.c:651
 msgid "Swedish"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:639
+#: ../gtk/propertybox.c:652
 msgid "Italian"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:640
+#: ../gtk/propertybox.c:653
 msgid "Spanish"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:641
+#: ../gtk/propertybox.c:654
 msgid "Brazilian Portugese"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:642
+#: ../gtk/propertybox.c:655
 msgid "Polish"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:643
+#: ../gtk/propertybox.c:656
 msgid "German"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:644
+#: ../gtk/propertybox.c:657
 msgid "Russian"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:645
+#: ../gtk/propertybox.c:658
 msgid "Japanese"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:646
+#: ../gtk/propertybox.c:659
 msgid "Dutch"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:647
+#: ../gtk/propertybox.c:660
 msgid "Hungarian"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:648
+#: ../gtk/propertybox.c:661
 msgid "Czech"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:649
+#: ../gtk/propertybox.c:662
 msgid "Chinese"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:706
+#: ../gtk/propertybox.c:719
 msgid ""
 "You need to restart linphone for the new language selection to take effect."
 msgstr ""
 
-#: ../gtk-glade/update.c:80
+#: ../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-glade/update.c:91
+#: ../gtk/update.c:91
 msgid "You are running the lastest version."
 msgstr ""
 
-#: ../gtk-glade/buddylookup.c:85
+#: ../gtk/buddylookup.c:85
 msgid "Firstname, Lastname"
 msgstr ""
 
-#: ../gtk-glade/buddylookup.c:160
+#: ../gtk/buddylookup.c:160
 msgid "Error communicating with server."
 msgstr ""
 
-#: ../gtk-glade/buddylookup.c:164
+#: ../gtk/buddylookup.c:164
 #, fuzzy
 msgid "Connecting..."
 msgstr "Verbindung"
 
-#: ../gtk-glade/buddylookup.c:168
+#: ../gtk/buddylookup.c:168
 #, fuzzy
 msgid "Connected"
 msgstr "Verbunden."
 
-#: ../gtk-glade/buddylookup.c:172
+#: ../gtk/buddylookup.c:172
 msgid "Receiving data..."
 msgstr ""
 
-#: ../gtk-glade/buddylookup.c:180
+#: ../gtk/buddylookup.c:180
 #, c-format
 msgid "Found %i contact"
 msgid_plural "Found %i contacts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gtk-glade/setupwizard.c:25
+#: ../gtk/setupwizard.c:25
 msgid ""
 "Welcome !\n"
 "This assistant will help you to use a SIP account for your calls."
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:34
+#: ../gtk/setupwizard.c:34
 msgid "Create an account by choosing a username"
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:35
+#: ../gtk/setupwizard.c:35
 msgid "I have already an account and just want to use it"
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:53
+#: ../gtk/setupwizard.c:53
 msgid "Please choose a username:"
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:54
+#: ../gtk/setupwizard.c:54
 #, fuzzy
 msgid "Username:"
 msgstr "Benutzername:"
 
-#: ../gtk-glade/setupwizard.c:92
+#: ../gtk/setupwizard.c:92
 #, c-format
 msgid "Checking if '%s' is available..."
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:97 ../gtk-glade/setupwizard.c:164
+#: ../gtk/setupwizard.c:97 ../gtk/setupwizard.c:164
 msgid "Please wait..."
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:101
+#: ../gtk/setupwizard.c:101
 msgid "Sorry this username already exists. Please try a new one."
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:103 ../gtk-glade/setupwizard.c:168
+#: ../gtk/setupwizard.c:103 ../gtk/setupwizard.c:168
 msgid "Ok !"
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:106 ../gtk-glade/setupwizard.c:171
+#: ../gtk/setupwizard.c:106 ../gtk/setupwizard.c:171
 msgid "Communication problem, please try again later."
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:134
+#: ../gtk/setupwizard.c:134
 msgid "Thank you. Your account is now configured and ready for use."
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:228
+#: ../gtk/setupwizard.c:228
 msgid "Welcome to the account setup assistant"
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:232
+#: ../gtk/setupwizard.c:232
 msgid "Account setup assistant"
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:236
+#: ../gtk/setupwizard.c:236
 #, fuzzy
 msgid "Choosing a username"
 msgstr "Benutzername:"
 
-#: ../gtk-glade/setupwizard.c:240
+#: ../gtk/setupwizard.c:240
 msgid "Verifying"
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:244
+#: ../gtk/setupwizard.c:244
 #, fuzzy
 msgid "Confirmation"
-msgstr "Information"
-
-#: ../gtk-glade/setupwizard.c:249
-msgid "Creating your account"
-msgstr ""
-
-#: ../gtk-glade/setupwizard.c:253
-msgid "Now ready !"
-msgstr ""
-
-#: ../gtk-glade/incall_view.c:113
-#, fuzzy
-msgid "<b>Calling...</b>"
-msgstr "Kontaktliste"
-
-#: ../gtk-glade/incall_view.c:116 ../gtk-glade/incall_view.c:138
-msgid "00::00::00"
-msgstr ""
-
-#: ../gtk-glade/incall_view.c:136
-#, fuzzy
-msgid "<b>In call with</b>"
-msgstr "Kontaktliste"
-
-#: ../gtk-glade/incall_view.c:154
-#, c-format
-msgid "%02i::%02i::%02i"
-msgstr ""
-
-#: ../gtk-glade/incall_view.c:170
-#, fuzzy
-msgid "<b>Call ended.</b>"
-msgstr "Anruf beendet"
-
-#: ../gtk-glade/incall_view.c:188
-#, fuzzy
-msgid "Unmute"
-msgstr "Unbegrenzt"
-
-#: ../gtk-glade/incall_view.c:195 ../gtk-glade/main.glade.h:43
-msgid "Mute"
-msgstr ""
-
-#: ../gtk-glade/loginframe.c:83
-#, c-format
-msgid "Please enter login information for %s"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:1
-msgid "#"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:2
-msgid "*"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:3
-msgid "0"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:4
-msgid "1"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:5
-msgid "2"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:6
-msgid "3"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:7
-msgid "4"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:8
-msgid "5"
-msgstr "5"
-
-#: ../gtk-glade/main.glade.h:9
-msgid "6"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:10
-msgid "7"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:11
-msgid "8"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:12
-msgid "9"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:13
-#, fuzzy
-msgid "<b>Add contacts from directory</b>"
-msgstr "Kontaktinformationen"
-
-#: ../gtk-glade/main.glade.h:14
-#, fuzzy
-msgid "<b>Contact list</b>"
-msgstr "Kontaktliste"
-
-#: ../gtk-glade/main.glade.h:15
-#, fuzzy
-msgid "<b>Welcome !</b>"
-msgstr "Kontaktliste"
-
-#: ../gtk-glade/main.glade.h:16
-msgid "A"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:17
-msgid ""
-"ADSL\n"
-"Fiber Channel"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:19
-msgid ""
-"All users\n"
-"Online users"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:21
-msgid "Assistant"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:22
-#, fuzzy
-msgid "Audio & Video"
-msgstr "Eigenschaften des Audiocodecs"
-
-#: ../gtk-glade/main.glade.h:23
-#, fuzzy
-msgid "Audio only"
-msgstr "Audio"
-
-#: ../gtk-glade/main.glade.h:24
-#, fuzzy
-msgid "Automatically log me in"
-msgstr "Automatisch einen gĂźltigen Hostnamen erraten"
-
-#: ../gtk-glade/main.glade.h:25
-msgid "B"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:26 ../gtk-glade/parameters.glade.h:21
-msgid "C"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:27
-#, fuzzy
-msgid "Call Details"
-msgstr "Gesprächsverlauf"
-
-#: ../gtk-glade/main.glade.h:28 ../gtk-glade/call_logs.glade.h:1
-#, fuzzy
-msgid "Call history"
-msgstr "Linphone - Gesprächsverlauf"
-
-#: ../gtk-glade/main.glade.h:29
-msgid "Check for updates"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:30
-#, fuzzy
-msgid "Contacts"
-msgstr "Rufe an"
-
-#: ../gtk-glade/main.glade.h:31
-msgid "D"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:32
-msgid "Default"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:33
-#, fuzzy
-msgid "Duration"
-msgstr "Information"
-
-#: ../gtk-glade/main.glade.h:34
-#, fuzzy
-msgid "Duration:"
-msgstr "Information"
-
-#: ../gtk-glade/main.glade.h:35
-#, fuzzy
-msgid "Enable self-view"
-msgstr "Video einschalten"
-
-#: ../gtk-glade/main.glade.h:36
-msgid "Enter username, phone number, or full sip address"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:37
-msgid "Homepage"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:38
-#, fuzzy
-msgid "In call"
-msgstr "Eingehendes Gespr�h"
-
-#: ../gtk-glade/main.glade.h:39
-msgid "Internet connection:"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:40
-msgid "Keypad"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:41
-#, fuzzy
-msgid "Login information"
-msgstr "Kontaktinformationen"
-
-#: ../gtk-glade/main.glade.h:42
-msgid "Lookup:"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:44
-#, fuzzy
-msgid "My current identity:"
-msgstr "SIP Identität"
-
-#: ../gtk-glade/main.glade.h:45
-#, fuzzy
-msgid "Password"
-msgstr "Passwort"
-
-#: ../gtk-glade/main.glade.h:46
-#, fuzzy
-msgid "SIP address or phone number:"
-msgstr "Sip-Adresse oder Telefonnummer eingeben."
-
-#: ../gtk-glade/main.glade.h:47
-msgid "Search"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:48
-msgid "Show debug messages"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:49
-msgid "Start call"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:50
-msgid "Terminate call"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:51
-#, fuzzy
-msgid "Username"
-msgstr "Benutzername:"
-
-#: ../gtk-glade/main.glade.h:52
-#, fuzzy
-msgid "_Linphone"
-msgstr "Linphone"
-
-#: ../gtk-glade/main.glade.h:53
-#, fuzzy
-msgid "_Modes"
-msgstr "Codecs"
-
-#: ../gtk-glade/main.glade.h:54
-msgid "in"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:55
-#, fuzzy
-msgid "label"
-msgstr "label37"
-
-#: ../gtk-glade/about.glade.h:1
-#, fuzzy
-msgid "About linphone"
-msgstr "linphone"
-
-#: ../gtk-glade/about.glade.h:2
-msgid "An internet video phone using the standard SIP (rfc3261) protocol."
-msgstr ""
-
-#: ../gtk-glade/about.glade.h:3
-msgid "Created by Simon Morlat\n"
-msgstr ""
-
-#: ../gtk-glade/about.glade.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"
-msgstr ""
-
-#: ../gtk-glade/contact.glade.h:1
-#, fuzzy
-msgid "<b>Contact information</b>"
-msgstr "Kontaktinformationen"
-
-#: ../gtk-glade/contact.glade.h:2
-msgid "Allow this contact to see my presence status"
-msgstr ""
-
-#: ../gtk-glade/contact.glade.h:4
-#, fuzzy
-msgid "SIP Address"
-msgstr "Adresse"
-
-#: ../gtk-glade/contact.glade.h:5
-msgid "Show this contact presence status"
-msgstr ""
-
-#: ../gtk-glade/contact.glade.h:6 ../gtk-glade/password.glade.h:5
-#: ../gtk-glade/sip_account.glade.h:9
-msgid "gtk-cancel"
-msgstr ""
-
-#: ../gtk-glade/contact.glade.h:7 ../gtk-glade/password.glade.h:6
-#: ../gtk-glade/sip_account.glade.h:10
-msgid "gtk-ok"
-msgstr ""
-
-#: ../gtk-glade/log.glade.h:1
-#, fuzzy
-msgid "Linphone debug window"
-msgstr "Linphone Ende"
-
-#: ../gtk-glade/log.glade.h:2 ../gtk-glade/call_logs.glade.h:2
-#: ../gtk-glade/chatroom.glade.h:2
-msgid "gtk-close"
-msgstr ""
-
-#: ../gtk-glade/password.glade.h:1
-#, fuzzy
-msgid "Linphone - Authentication required"
-msgstr "Authentifikation erfordert"
-
-#: ../gtk-glade/password.glade.h:2
-#, fuzzy
-msgid "Password:"
-msgstr "Passwort"
-
-#: ../gtk-glade/password.glade.h:3
-msgid "Please enter the domain password"
-msgstr ""
-
-#: ../gtk-glade/password.glade.h:4
-msgid "UserID"
-msgstr ""
-
-#: ../gtk-glade/sip_account.glade.h:1
-msgid "Configure a SIP account"
-msgstr ""
-
-#: ../gtk-glade/sip_account.glade.h:2
-msgid "Linphone - Configure a SIP account"
-msgstr ""
-
-#: ../gtk-glade/sip_account.glade.h:3
-#, fuzzy
-msgid "Publish presence information"
-msgstr "Anwesenheit Information publzieren"
-
-#: ../gtk-glade/sip_account.glade.h:4
-msgid "Register at startup"
-msgstr ""
-
-#: ../gtk-glade/sip_account.glade.h:5
-#, fuzzy
-msgid "Registration duration (sec):"
-msgstr "Registrierungsdauer."
-
-#: ../gtk-glade/sip_account.glade.h:6
-msgid "Route (optional):"
-msgstr "Route (optional):"
-
-#: ../gtk-glade/sip_account.glade.h:7
-#, fuzzy
-msgid "SIP Proxy address:"
-msgstr "SIP Proxy:"
-
-#: ../gtk-glade/sip_account.glade.h:8
-#, fuzzy
-msgid "Your SIP identity:"
-msgstr "SIP Identität"
-
-#: ../gtk-glade/sip_account.glade.h:11
-msgid "sip:"
-msgstr "sip:"
-
-#: ../gtk-glade/chatroom.glade.h:1
-#, fuzzy
-msgid "Send"
-msgstr "Ton"
-
-#: ../gtk-glade/incoming_call.glade.h:1
-msgid "Accept"
-msgstr "Annehmen"
-
-#: ../gtk-glade/incoming_call.glade.h:2
-#, fuzzy
-msgid "Decline"
-msgstr "Leitung"
-
-#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:369
-msgid "Incoming call"
-msgstr "Eingehendes Gespr�h"
-
-#: ../gtk-glade/incoming_call.glade.h:4
-#, fuzzy
-msgid "Incoming call from"
-msgstr "Eingehendes Gespr�h"
-
-#: ../gtk-glade/incoming_call.glade.h:5
-#, fuzzy
-msgid "Linphone - Incoming call"
-msgstr "Eingehendes Gespr�h"
-
-#: ../gtk-glade/parameters.glade.h:1
-msgid "0 stands for \"unlimited\""
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:2
-#, fuzzy
-msgid "<b>Audio</b>"
-msgstr "Kontaktliste"
-
-#: ../gtk-glade/parameters.glade.h:3
-msgid "<b>Bandwidth control</b>"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:4
-#, fuzzy
-msgid "<b>Codecs</b>"
-msgstr "Kontaktliste"
-
-#: ../gtk-glade/parameters.glade.h:5
-msgid "<b>Default identity</b>"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:6
-msgid "<b>Language</b>"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:7
-#, fuzzy
-msgid "<b>Level</b>"
-msgstr "Kontaktliste"
-
-#: ../gtk-glade/parameters.glade.h:8
-msgid "<b>NAT and Firewall</b>"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:9
-#, fuzzy
-msgid "<b>Ports</b>"
-msgstr "Kontaktliste"
-
-#: ../gtk-glade/parameters.glade.h:10
-msgid "<b>Privacy</b>"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:11
-#, fuzzy
-msgid "<b>Proxy accounts</b>"
-msgstr "Kontaktliste"
-
-#: ../gtk-glade/parameters.glade.h:12
-#, fuzzy
-msgid "<b>Transport</b>"
-msgstr "Kontaktliste"
-
-#: ../gtk-glade/parameters.glade.h:13
-msgid "<b>Video</b>"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:14
-msgid "ALSA special device (optional):"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:15
-msgid "Add"
-msgstr "Hinzufgen"
-
-#: ../gtk-glade/parameters.glade.h:16
-msgid "Audio RTP/UDP:"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:17
-#, fuzzy
-msgid ""
-"Audio codecs\n"
-"Video codecs"
-msgstr "Audio und Video Codecs"
-
-#: ../gtk-glade/parameters.glade.h:19
-msgid "Behind NAT / Firewall (specify gateway IP below)"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:20
-msgid "Behind NAT / Firewall (use STUN to resolve)"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:22
-msgid "CIF"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:23
-#, fuzzy
-msgid "Capture device:"
-msgstr "Audio Aufnahmegerät:"
-
-#: ../gtk-glade/parameters.glade.h:24
-#, fuzzy
-msgid "Codecs"
-msgstr "Codecs"
-
-#: ../gtk-glade/parameters.glade.h:25
-msgid "Direct connection to the Internet"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:26
-msgid "Disable"
-msgstr "Sperren"
-
-#: ../gtk-glade/parameters.glade.h:27
-#, fuzzy
-msgid "Done"
-msgstr "Gegangen"
-
-#: ../gtk-glade/parameters.glade.h:28
-#, fuzzy
-msgid "Download speed limit in Kbit/sec:"
-msgstr "Download-Bandbreite (kbit/sec):"
-
-#: ../gtk-glade/parameters.glade.h:29
-msgid "Edit"
-msgstr "Bearbeiten"
-
-#: ../gtk-glade/parameters.glade.h:30
-msgid "Enable"
-msgstr "Freigeben"
-
-#: ../gtk-glade/parameters.glade.h:31
-msgid "Enable echo cancellation"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:32
-msgid "Erase all passwords"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:33
-msgid "Manage SIP Accounts"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:34
-msgid "Multimedia settings"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:35
-#, fuzzy
-msgid "Network settings"
-msgstr "Netzwerk"
-
-#: ../gtk-glade/parameters.glade.h:36
-#, fuzzy
-msgid "Playback device:"
-msgstr "Ton Wiedergabegerät:"
-
-#: ../gtk-glade/parameters.glade.h:37
-msgid "Prefered video resolution:"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:38
-#, fuzzy
-msgid "Public IP address:"
-msgstr "Sip-Adresse:"
-
-#: ../gtk-glade/parameters.glade.h:39
-msgid ""
-"Register to FONICS\n"
-"virtual network !"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:41
-msgid "Remove"
-msgstr "Entfernen"
-
-#: ../gtk-glade/parameters.glade.h:42
-#, fuzzy
-msgid "Ring device:"
-msgstr "Klingel Wiedergabegerät:"
-
-#: ../gtk-glade/parameters.glade.h:43
-#, fuzzy
-msgid "Ring sound:"
-msgstr "Klingelton:"
-
-#: ../gtk-glade/parameters.glade.h:44
-msgid "SIP (UDP):"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:45
-msgid "Send DTMFs as SIP info"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:46
-msgid "Set Maximum Transmission Unit:"
-msgstr ""
+msgstr "Information"
 
-#: ../gtk-glade/parameters.glade.h:47
-msgid "Settings"
+#: ../gtk/setupwizard.c:249
+msgid "Creating your account"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:48
-msgid "Show advanced settings"
+#: ../gtk/setupwizard.c:253
+msgid "Now ready !"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:49
-#, fuzzy
-msgid "Stun server:"
-msgstr "Umleitungs-Server"
-
-#: ../gtk-glade/parameters.glade.h:50
-msgid "This section defines your SIP address when not using a SIP account"
+#: ../gtk/incall_view.c:113
+msgid "Transfer"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:51
+#: ../gtk/incall_view.c:187
 #, fuzzy
-msgid "Upload speed limit in Kbit/sec:"
-msgstr "Upload-Bandbreite (kbit/sec):"
+msgid "<b>Calling...</b>"
+msgstr "Kontaktliste"
 
-#: ../gtk-glade/parameters.glade.h:52
-msgid "Use IPv6 instead of IPv4"
+#: ../gtk/incall_view.c:190 ../gtk/incall_view.c:246
+msgid "00::00::00"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:53
+#: ../gtk/incall_view.c:206
 #, fuzzy
-msgid "User interface"
-msgstr "Benutzername:"
+msgid "<b>Incoming call</b>"
+msgstr "Eingehendes Gespr�h"
 
-#: ../gtk-glade/parameters.glade.h:54
-msgid "Video RTP/UDP:"
+#: ../gtk/incall_view.c:216
+msgid ""
+"Pause all calls\n"
+"and answer"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:55
-#, fuzzy
-msgid "Video input device:"
-msgstr "Audiogerät"
-
-#: ../gtk-glade/parameters.glade.h:56
-msgid "Your display name (eg: John Doe):"
+#: ../gtk/incall_view.c:217
+msgid "Answer"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:57
+#: ../gtk/incall_view.c:244
 #, fuzzy
-msgid "Your resulting SIP address:"
-msgstr "Ihre Sip-Adresse:"
+msgid "<b>In call</b>"
+msgstr "Kontaktliste"
 
-#: ../gtk-glade/parameters.glade.h:58
+#: ../gtk/incall_view.c:260
 #, fuzzy
-msgid "Your username:"
-msgstr "Benutzername:"
-
-#: ../gtk-glade/parameters.glade.h:59
-msgid "a sound card\n"
-msgstr ""
+msgid "<b>Paused call</b>"
+msgstr "Kontaktliste"
 
-#: ../gtk-glade/parameters.glade.h:61
-msgid "default camera"
+#: ../gtk/incall_view.c:272
+#, c-format
+msgid "%02i::%02i::%02i"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:62
-msgid "default soundcard"
-msgstr ""
+#: ../gtk/incall_view.c:288
+#, fuzzy
+msgid "<b>Call ended.</b>"
+msgstr "Anruf beendet"
 
-#: ../gtk-glade/parameters.glade.h:63
-msgid "default soundcard\n"
-msgstr ""
+#: ../gtk/incall_view.c:309
+#, fuzzy
+msgid "Unmute"
+msgstr "Unbegrenzt"
 
-#: ../gtk-glade/buddylookup.glade.h:1
-msgid "<b>Search somebody</b>"
+#: ../gtk/incall_view.c:316
+msgid "Mute"
 msgstr ""
 
-#: ../gtk-glade/buddylookup.glade.h:2
-msgid "Add to my list"
+#: ../gtk/incall_view.c:340
+msgid "Resume"
 msgstr ""
 
-#: ../gtk-glade/buddylookup.glade.h:3
-msgid "Search contacts in directory"
+#: ../gtk/incall_view.c:347
+msgid "Pause"
 msgstr ""
 
-#: ../gtk-glade/waiting.glade.h:1
-msgid "Linphone"
-msgstr "Linphone"
-
-#: ../gtk-glade/waiting.glade.h:2
-msgid "Please wait"
+#: ../gtk/loginframe.c:93
+#, c-format
+msgid "Please enter login information for %s"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:311
+#: ../coreapi/linphonecore.c:166
 #, fuzzy, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
 msgstr[0] "Sie haben %i Anruf(e) in Abwesenheit."
 msgstr[1] "Sie haben %i Anruf(e) in Abwesenheit."
 
-#: ../coreapi/linphonecore.c:357
+#: ../coreapi/linphonecore.c:207
 msgid "aborted"
 msgstr "abgebrochen"
 
-#: ../coreapi/linphonecore.c:360
+#: ../coreapi/linphonecore.c:210
 msgid "completed"
 msgstr "beendet"
 
-#: ../coreapi/linphonecore.c:363
+#: ../coreapi/linphonecore.c:213
 msgid "missed"
 msgstr "verpasst"
 
-#: ../coreapi/linphonecore.c:368
+#: ../coreapi/linphonecore.c:218
 #, c-format
 msgid ""
 "%s at %s\n"
@@ -1085,11 +444,15 @@ msgstr ""
 "Status: %s\n"
 "Dauer: %i mn %i sec\n"
 
-#: ../coreapi/linphonecore.c:369
+#: ../coreapi/linphonecore.c:219
+msgid "Incoming call"
+msgstr "Eingehendes Gespr�h"
+
+#: ../coreapi/linphonecore.c:219
 msgid "Outgoing call"
 msgstr "Abgehendes Gespräch"
 
-#: ../coreapi/linphonecore.c:626
+#: ../coreapi/linphonecore.c:501
 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"
@@ -1098,23 +461,19 @@ msgstr ""
 "Linphoneverwendet normalerweise IPv4. Bitte Konfiguration anpassen wenn sie "
 "IPv6 verwenden wollen"
 
-#: ../coreapi/linphonecore.c:1083
+#: ../coreapi/linphonecore.c:994
 msgid "Ready"
 msgstr "Bereit"
 
-#: ../coreapi/linphonecore.c:1513
-msgid "Remote end seems to have disconnected, the call is going to be closed."
-msgstr ""
-
-#: ../coreapi/linphonecore.c:1725
+#: ../coreapi/linphonecore.c:1768
 msgid "Looking for telephone number destination..."
 msgstr "Suche Telefonnummernziel.."
 
-#: ../coreapi/linphonecore.c:1727
+#: ../coreapi/linphonecore.c:1771
 msgid "Could not resolve this number."
 msgstr "Konnte dies Nummer nicht auflĂśsen."
 
-#: ../coreapi/linphonecore.c:1771
+#: ../coreapi/linphonecore.c:1815
 msgid ""
 "Could not parse given sip address. A sip url usually looks like sip:"
 "user@domain"
@@ -1122,26 +481,54 @@ msgstr ""
 "Sip-Adresse kann nicht bestimmt werden. Eine Sip-Adresse hat folgenden "
 "Aufbau <sip:anwendername@domainname>"
 
-#: ../coreapi/linphonecore.c:1912
+#: ../coreapi/linphonecore.c:1962
 msgid "Contacting"
 msgstr "Rufe an"
 
-#: ../coreapi/linphonecore.c:1918
-msgid "could not call"
+#: ../coreapi/linphonecore.c:1969
+#, fuzzy
+msgid "Could not call"
 msgstr "Konnte kein Anruf vornehmen"
 
-#: ../coreapi/linphonecore.c:1965
-msgid "Sorry, having multiple simultaneous calls is not supported yet !"
-msgstr "Mehrfachen gleichzeitigen Anrufen nicht unterstĂźtzt !"
+#: ../coreapi/linphonecore.c:2076
+msgid "Sorry, you have to pause or stop the current call first !"
+msgstr ""
+
+#: ../coreapi/linphonecore.c:2081
+msgid "Sorry, we have reached the maximum number of simultaneous calls"
+msgstr ""
+
+#: ../coreapi/linphonecore.c:2205
+msgid "Modifying call parameters..."
+msgstr ""
 
-#: ../coreapi/linphonecore.c:2370 ../coreapi/callbacks.c:32
+#: ../coreapi/linphonecore.c:2308
 msgid "Connected."
 msgstr "Verbunden."
 
-#: ../coreapi/linphonecore.c:2404
+#: ../coreapi/linphonecore.c:2331
+#, fuzzy
+msgid "Call aborted"
+msgstr "abgebrochen"
+
+#: ../coreapi/linphonecore.c:2371
 msgid "Call ended"
 msgstr "Anruf beendet"
 
+#: ../coreapi/linphonecore.c:2453
+#, fuzzy
+msgid "Could not pause the call"
+msgstr "Konnte kein Anruf vornehmen"
+
+#: ../coreapi/linphonecore.c:2457
+#, fuzzy
+msgid "Pausing the current call..."
+msgstr "Konnte kein Anruf vornehmen"
+
+#: ../coreapi/linphonecore.c:2496
+msgid "There is already a call in process, pause or stop it first."
+msgstr ""
+
 #: ../coreapi/misc.c:147
 msgid ""
 "Your computer appears to be using ALSA sound drivers.\n"
@@ -1168,7 +555,7 @@ msgstr ""
 "nicht vorhanden. Fr die Einbindung des Moduls\n"
 "bitte den Befehl 'modprobe snd-pcm-oss' als Anwender-Root verwenden."
 
-#: ../coreapi/misc.c:497
+#: ../coreapi/misc.c:520
 msgid "Stun lookup in progress..."
 msgstr "Stun Ermittlung läuft..."
 
@@ -1225,109 +612,149 @@ msgstr ""
 msgid "Unknown-bug"
 msgstr ""
 
-#: ../coreapi/proxy.c:176
+#: ../coreapi/proxy.c:187
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
 msgstr ""
 
-#: ../coreapi/proxy.c:182
+#: ../coreapi/proxy.c:193
 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:621
+#: ../coreapi/proxy.c:670
 #, fuzzy, c-format
 msgid "Could not login as %s"
 msgstr "Pixmapdatei %s nicht gefunden"
 
-#: ../coreapi/callbacks.c:95
+#: ../coreapi/callbacks.c:170
 #, fuzzy
 msgid "is contacting you"
 msgstr "ruft Sie an"
 
-#: ../coreapi/callbacks.c:96
+#: ../coreapi/callbacks.c:171
 msgid " and asked autoanswer."
 msgstr ""
 
-#: ../coreapi/callbacks.c:96
+#: ../coreapi/callbacks.c:171
 msgid "."
 msgstr ""
 
-#: ../coreapi/callbacks.c:120
+#: ../coreapi/callbacks.c:226
 #, fuzzy
 msgid "Remote ringing."
 msgstr "Registrierung"
 
-#: ../coreapi/callbacks.c:139
+#: ../coreapi/callbacks.c:251
 msgid "Early media."
 msgstr ""
 
-#: ../coreapi/callbacks.c:248
+#: ../coreapi/callbacks.c:289
+#, fuzzy, c-format
+msgid "Call with %s is paused."
+msgstr "Chat mit %s"
+
+#: ../coreapi/callbacks.c:300
+#, c-format
+msgid "Call answered by %s - on hold."
+msgstr ""
+
+#: ../coreapi/callbacks.c:315
+#, fuzzy
+msgid "Call resumed."
+msgstr "Anruf beendet"
+
+#: ../coreapi/callbacks.c:320
+#, fuzzy, c-format
+msgid "Call answered by %s."
+msgstr ""
+"Anrufen oder\n"
+"Entgegennehmen"
+
+#: ../coreapi/callbacks.c:381
+msgid "We are being paused..."
+msgstr ""
+
+#: ../coreapi/callbacks.c:385
+msgid "We have been resumed..."
+msgstr ""
+
+#: ../coreapi/callbacks.c:422
 msgid "Call terminated."
 msgstr "Anruf beendet"
 
-#: ../coreapi/callbacks.c:265
+#: ../coreapi/callbacks.c:429
 msgid "User is busy."
 msgstr "Besetzt."
 
-#: ../coreapi/callbacks.c:266
+#: ../coreapi/callbacks.c:430
 msgid "User is temporarily unavailable."
 msgstr "Teilnehmer zur Zeit nicht ansprechbar."
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:268
+#: ../coreapi/callbacks.c:432
 msgid "User does not want to be disturbed."
 msgstr "Teilnehmer mĂśchte nicht gestĂśrt werden."
 
-#: ../coreapi/callbacks.c:269
+#: ../coreapi/callbacks.c:433
 msgid "Call declined."
 msgstr "Anruf abgewiesen"
 
-#: ../coreapi/callbacks.c:281
+#: ../coreapi/callbacks.c:445
 msgid "No response."
 msgstr ""
 
-#: ../coreapi/callbacks.c:284
+#: ../coreapi/callbacks.c:449
 msgid "Protocol error."
 msgstr ""
 
-#: ../coreapi/callbacks.c:298
+#: ../coreapi/callbacks.c:465
 #, fuzzy
 msgid "Redirected"
 msgstr "Nach %s umgeleitet..."
 
-#: ../coreapi/callbacks.c:308
+#: ../coreapi/callbacks.c:475
 msgid "Not found"
 msgstr ""
 
-#: ../coreapi/callbacks.c:318
+#: ../coreapi/callbacks.c:485
 msgid "No common codecs"
 msgstr ""
 
-#: ../coreapi/callbacks.c:324
+#: ../coreapi/callbacks.c:491
 #, fuzzy
 msgid "Call failed."
 msgstr "Anruf annulliert"
 
-#: ../coreapi/callbacks.c:374
+#: ../coreapi/callbacks.c:527
+#, fuzzy
+msgid "Authentication failure"
+msgstr "Authentifikationsinformation"
+
+#: ../coreapi/callbacks.c:553
 #, c-format
 msgid "Registration on %s successful."
 msgstr "Registrierung auf %s erfolgreich."
 
-#: ../coreapi/callbacks.c:375
+#: ../coreapi/callbacks.c:554
 #, fuzzy, c-format
 msgid "Unregistration on %s done."
 msgstr "Registrierung auf %s erfolgreich."
 
-#: ../coreapi/callbacks.c:383
+#: ../coreapi/callbacks.c:570
+msgid "no response timeout"
+msgstr ""
+
+#: ../coreapi/callbacks.c:573
 #, fuzzy, c-format
 msgid "Registration on %s failed: %s"
 msgstr "Registrierung auf %s schlug fehl (Zeitberschreitung)."
 
-#: ../coreapi/callbacks.c:383
-msgid "no response timeout"
+#: ../coreapi/callbacks.c:615
+#, c-format
+msgid "We are transferred to %s"
 msgstr ""
 
 #: ../mediastreamer2/src/alaw.c:144 ../mediastreamer2/src/alaw.c:162
@@ -1338,11 +765,11 @@ msgstr ""
 msgid "ITU-G.711 alaw decoder"
 msgstr ""
 
-#: ../mediastreamer2/src/alsa.c:935
+#: ../mediastreamer2/src/alsa.c:950
 msgid "Alsa sound source"
 msgstr ""
 
-#: ../mediastreamer2/src/alsa.c:1039
+#: ../mediastreamer2/src/alsa.c:1054
 msgid "Alsa sound output"
 msgstr ""
 
@@ -1354,15 +781,15 @@ msgstr ""
 msgid "Sound playback filter for MacOS X Audio Queue Service"
 msgstr ""
 
-#: ../mediastreamer2/src/dtmfgen.c:173 ../mediastreamer2/src/dtmfgen.c:191
+#: ../mediastreamer2/src/dtmfgen.c:274 ../mediastreamer2/src/dtmfgen.c:293
 msgid "DTMF generator"
 msgstr ""
 
-#: ../mediastreamer2/src/gsm.c:111 ../mediastreamer2/src/gsm.c:129
+#: ../mediastreamer2/src/gsm.c:120 ../mediastreamer2/src/gsm.c:138
 msgid "The GSM full-rate codec"
 msgstr ""
 
-#: ../mediastreamer2/src/gsm.c:178 ../mediastreamer2/src/gsm.c:196
+#: ../mediastreamer2/src/gsm.c:187 ../mediastreamer2/src/gsm.c:205
 msgid "The GSM codec"
 msgstr ""
 
@@ -1378,8 +805,8 @@ msgstr ""
 msgid "A filter to make conferencing"
 msgstr ""
 
-#: ../mediastreamer2/src/msfileplayer.c:295
-#: ../mediastreamer2/src/msfileplayer.c:313
+#: ../mediastreamer2/src/msfileplayer.c:311
+#: ../mediastreamer2/src/msfileplayer.c:329
 msgid "Raw files and wav reader"
 msgstr ""
 
@@ -1393,61 +820,53 @@ msgstr ""
 msgid "A filter that send several inputs to one output."
 msgstr ""
 
-#: ../mediastreamer2/src/msresample.c:221
-#: ../mediastreamer2/src/msresample.c:239
-msgid "frequency resampler"
+#: ../mediastreamer2/src/msresample.c:159
+#: ../mediastreamer2/src/msresample.c:177
+msgid "Audio resampler"
 msgstr ""
 
-#: ../mediastreamer2/src/msrtp.c:358 ../mediastreamer2/src/msrtp.c:376
+#: ../mediastreamer2/src/msrtp.c:369 ../mediastreamer2/src/msrtp.c:387
 msgid "RTP output filter"
 msgstr ""
 
-#: ../mediastreamer2/src/msrtp.c:493 ../mediastreamer2/src/msrtp.c:511
+#: ../mediastreamer2/src/msrtp.c:505 ../mediastreamer2/src/msrtp.c:523
 msgid "RTP input filter"
 msgstr ""
 
-#: ../mediastreamer2/src/msspeex.c:359 ../mediastreamer2/src/msspeex.c:377
-#: ../mediastreamer2/src/msspeex.c:504 ../mediastreamer2/src/msspeex.c:522
+#: ../mediastreamer2/src/msspeex.c:360 ../mediastreamer2/src/msspeex.c:378
+#: ../mediastreamer2/src/msspeex.c:548 ../mediastreamer2/src/msspeex.c:567
 msgid "The free and wonderful speex codec"
 msgstr ""
 
-#: ../mediastreamer2/src/msvolume.c:415 ../mediastreamer2/src/msvolume.c:430
+#: ../mediastreamer2/src/msvolume.c:527 ../mediastreamer2/src/msvolume.c:542
 msgid "A filter that controls and measure sound volume"
 msgstr ""
 
-#: ../mediastreamer2/src/msv4l.c:1011
+#: ../mediastreamer2/src/msv4l.c:1012
 msgid "A video4linux compatible source filter to stream pictures."
 msgstr ""
 
-#: ../mediastreamer2/src/msv4l2.c:470
+#: ../mediastreamer2/src/msv4l2.c:554
 msgid "A filter to grab pictures from Video4Linux2-powered cameras"
 msgstr ""
 
-#: ../mediastreamer2/src/nowebcam.c:1836
+#: ../mediastreamer2/src/nowebcam.c:1854
 msgid "A filter that outputs a static image."
 msgstr ""
 
-#: ../mediastreamer2/src/oss.c:567
-msgid "Sound capture filter for OSS drivers"
-msgstr ""
-
-#: ../mediastreamer2/src/oss.c:581
-msgid "Sound playback filter for OSS drivers"
-msgstr ""
-
-#: ../mediastreamer2/src/pixconv.c:177 ../mediastreamer2/src/pixconv.c:195
+#: ../mediastreamer2/src/pixconv.c:129 ../mediastreamer2/src/pixconv.c:147
 msgid "A pixel format converter"
 msgstr ""
 
-#: ../mediastreamer2/src/sizeconv.c:204
+#: ../mediastreamer2/src/sizeconv.c:202
 msgid "A video size converter"
 msgstr ""
 
-#: ../mediastreamer2/src/sizeconv.c:222
+#: ../mediastreamer2/src/sizeconv.c:220
 msgid "a small video size converter"
 msgstr ""
 
-#: ../mediastreamer2/src/speexec.c:349 ../mediastreamer2/src/speexec.c:367
+#: ../mediastreamer2/src/speexec.c:276 ../mediastreamer2/src/speexec.c:294
 msgid "Echo canceller using speex library"
 msgstr ""
 
@@ -1475,55 +894,55 @@ msgstr ""
 msgid "ITU-G.711 ulaw decoder"
 msgstr ""
 
-#: ../mediastreamer2/src/videodec.c:669 ../mediastreamer2/src/videodec.c:685
-#: ../mediastreamer2/src/videodec.c:768 ../mediastreamer2/src/videodec.c:784
+#: ../mediastreamer2/src/videodec.c:713 ../mediastreamer2/src/videodec.c:729
+#: ../mediastreamer2/src/videodec.c:812 ../mediastreamer2/src/videodec.c:828
 msgid "A H.263 decoder using ffmpeg library"
 msgstr ""
 
-#: ../mediastreamer2/src/videodec.c:702
+#: ../mediastreamer2/src/videodec.c:746
 msgid "A MPEG4 decoder using ffmpeg library"
 msgstr ""
 
-#: ../mediastreamer2/src/videodec.c:718
+#: ../mediastreamer2/src/videodec.c:762
 msgid "A RTP/JPEG decoder using ffmpeg library"
 msgstr ""
 
-#: ../mediastreamer2/src/videodec.c:734
+#: ../mediastreamer2/src/videodec.c:778
 msgid "A MJPEG decoder using ffmpeg library"
 msgstr ""
 
-#: ../mediastreamer2/src/videodec.c:750
+#: ../mediastreamer2/src/videodec.c:794
 msgid "A snow decoder using ffmpeg library"
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:861 ../mediastreamer2/src/videoenc.c:943
+#: ../mediastreamer2/src/videoenc.c:908 ../mediastreamer2/src/videoenc.c:990
 msgid "A video H.263 encoder using ffmpeg library."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:877
+#: ../mediastreamer2/src/videoenc.c:924
 msgid ""
 "A video H.263 encoder using ffmpeg library. It is compliant with old RFC2190 "
 "spec."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:893 ../mediastreamer2/src/videoenc.c:975
+#: ../mediastreamer2/src/videoenc.c:940 ../mediastreamer2/src/videoenc.c:1022
 msgid "A video MPEG4 encoder using ffmpeg library."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:909
+#: ../mediastreamer2/src/videoenc.c:956
 msgid "A video snow encoder using ffmpeg library."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:925
+#: ../mediastreamer2/src/videoenc.c:972
 msgid "A RTP/MJPEG encoder using ffmpeg library."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:959
+#: ../mediastreamer2/src/videoenc.c:1006
 msgid ""
 "A video H.263 encoder using ffmpeg library, compliant with old RFC2190 spec."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:991
+#: ../mediastreamer2/src/videoenc.c:1038
 msgid ""
 "The snow codec is royalty-free and is open-source. \n"
 "It uses innovative techniques that makes it one of most promising video "
@@ -1532,12 +951,12 @@ msgid ""
 "versions cannot be guaranteed."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:1011
+#: ../mediastreamer2/src/videoenc.c:1058
 msgid "A MJPEG encoder using ffmpeg library."
 msgstr ""
 
-#: ../mediastreamer2/src/videoout.c:1812 ../mediastreamer2/src/videoout.c:1830
-msgid "A generic video display"
+#: ../mediastreamer2/src/videoout.c:933
+msgid "A SDL-based video display"
 msgstr ""
 
 #: ../mediastreamer2/src/wincevideods.c:969
@@ -1564,10 +983,330 @@ msgstr ""
 msgid "Parametric sound equalizer."
 msgstr ""
 
-#: ../mediastreamer2/src/msdscap-mingw.cc:1003
+#: ../mediastreamer2/src/msdscap-mingw.cc:1038
 msgid "A webcam grabber based on directshow."
 msgstr ""
 
+#: ../mediastreamer2/src/drawdib-display.c:552
+#: ../mediastreamer2/src/drawdib-display.c:570
+msgid "A video display based on windows DrawDib api"
+msgstr ""
+
+#: ../mediastreamer2/src/audiomixer.c:192
+#: ../mediastreamer2/src/audiomixer.c:211
+msgid "A filter that mixes down 16 bit sample audio streams"
+msgstr ""
+
+#: ../mediastreamer2/src/chanadapt.c:110 ../mediastreamer2/src/chanadapt.c:128
+msgid "A filter that converts from mono to stereo and vice versa."
+msgstr ""
+
+#: ../mediastreamer2/src/itc.c:97 ../mediastreamer2/src/itc.c:115
+#: ../mediastreamer2/src/itc.c:197 ../mediastreamer2/src/itc.c:215
+msgid "Inter ticker communication filter."
+msgstr ""
+
+#: ../mediastreamer2/src/extdisplay.c:62 ../mediastreamer2/src/extdisplay.c:79
+msgid "A display filter sending the buffers to draw to the upper layer"
+msgstr ""
+
+#: ../mediastreamer2/src/msiounit.c:619
+msgid "Sound capture filter for MacOS X Audio Unit Service"
+msgstr ""
+
+#: ../mediastreamer2/src/msiounit.c:633
+msgid "Sound playback filter for MacOS X Audio Unit Service"
+msgstr ""
+
+#: ../mediastreamer2/src/x11video.c:562
+msgid "A video display using X11+Xv"
+msgstr ""
+
+#. .id=
+#. .name=
+#. .text=
+#: ../mediastreamer2/src/msandroid.cpp:370
+msgid "Sound capture filter for Android"
+msgstr ""
+
+#. .id=
+#. .name=
+#. .text=
+#: ../mediastreamer2/src/msandroid.cpp:667
+msgid "Sound playback filter for Android"
+msgstr ""
+
+#: ../mediastreamer2/src/msandroidvideo.cpp:134
+msgid "A filter that captures Android video."
+msgstr ""
+
+#, fuzzy
+#~ msgid "Incoming call from %s"
+#~ msgstr "Eingehendes Gespr�h"
+
+#~ msgid "5"
+#~ msgstr "5"
+
+#, fuzzy
+#~ msgid "<b>Add contacts from directory</b>"
+#~ msgstr "Kontaktinformationen"
+
+#, fuzzy
+#~ msgid "<b>Contact list</b>"
+#~ msgstr "Kontaktliste"
+
+#, fuzzy
+#~ msgid "<b>Welcome !</b>"
+#~ msgstr "Kontaktliste"
+
+#, fuzzy
+#~ msgid "Audio & Video"
+#~ msgstr "Eigenschaften des Audiocodecs"
+
+#, fuzzy
+#~ msgid "Audio only"
+#~ msgstr "Audio"
+
+#, fuzzy
+#~ msgid "Automatically log me in"
+#~ msgstr "Automatisch einen gĂźltigen Hostnamen erraten"
+
+#, fuzzy
+#~ msgid "Call Details"
+#~ msgstr "Gesprächsverlauf"
+
+#, fuzzy
+#~ msgid "Call history"
+#~ msgstr "Linphone - Gesprächsverlauf"
+
+#, fuzzy
+#~ msgid "Contacts"
+#~ msgstr "Rufe an"
+
+#, fuzzy
+#~ msgid "Duration"
+#~ msgstr "Information"
+
+#, fuzzy
+#~ msgid "Duration:"
+#~ msgstr "Information"
+
+#, fuzzy
+#~ msgid "Enable self-view"
+#~ msgstr "Video einschalten"
+
+#, fuzzy
+#~ msgid "In call"
+#~ msgstr "Eingehendes Gespr�h"
+
+#, fuzzy
+#~ msgid "Login information"
+#~ msgstr "Kontaktinformationen"
+
+#, fuzzy
+#~ msgid "My current identity:"
+#~ msgstr "SIP Identität"
+
+#, fuzzy
+#~ msgid "Password"
+#~ msgstr "Passwort"
+
+#, fuzzy
+#~ msgid "SIP address or phone number:"
+#~ msgstr "Sip-Adresse oder Telefonnummer eingeben."
+
+#, fuzzy
+#~ msgid "Username"
+#~ msgstr "Benutzername:"
+
+#, fuzzy
+#~ msgid "_Linphone"
+#~ msgstr "Linphone"
+
+#, fuzzy
+#~ msgid "_Modes"
+#~ msgstr "Codecs"
+
+#, fuzzy
+#~ msgid "label"
+#~ msgstr "label37"
+
+#, fuzzy
+#~ msgid "About linphone"
+#~ msgstr "linphone"
+
+#, fuzzy
+#~ msgid "<b>Contact information</b>"
+#~ msgstr "Kontaktinformationen"
+
+#, fuzzy
+#~ msgid "SIP Address"
+#~ msgstr "Adresse"
+
+#, fuzzy
+#~ msgid "Linphone debug window"
+#~ msgstr "Linphone Ende"
+
+#, fuzzy
+#~ msgid "Linphone - Authentication required"
+#~ msgstr "Authentifikation erfordert"
+
+#, fuzzy
+#~ msgid "Password:"
+#~ msgstr "Passwort"
+
+#, fuzzy
+#~ msgid "Publish presence information"
+#~ msgstr "Anwesenheit Information publzieren"
+
+#, fuzzy
+#~ msgid "Registration duration (sec):"
+#~ msgstr "Registrierungsdauer."
+
+#~ msgid "Route (optional):"
+#~ msgstr "Route (optional):"
+
+#, fuzzy
+#~ msgid "SIP Proxy address:"
+#~ msgstr "SIP Proxy:"
+
+#, fuzzy
+#~ msgid "Your SIP identity:"
+#~ msgstr "SIP Identität"
+
+#~ msgid "sip:"
+#~ msgstr "sip:"
+
+#, fuzzy
+#~ msgid "Send"
+#~ msgstr "Ton"
+
+#~ msgid "Accept"
+#~ msgstr "Annehmen"
+
+#, fuzzy
+#~ msgid "Decline"
+#~ msgstr "Leitung"
+
+#, fuzzy
+#~ msgid "Incoming call from"
+#~ msgstr "Eingehendes Gespr�h"
+
+#, fuzzy
+#~ msgid "Linphone - Incoming call"
+#~ msgstr "Eingehendes Gespr�h"
+
+#, fuzzy
+#~ msgid "<b>Audio</b>"
+#~ msgstr "Kontaktliste"
+
+#, fuzzy
+#~ msgid "<b>Codecs</b>"
+#~ msgstr "Kontaktliste"
+
+#, fuzzy
+#~ msgid "<b>Level</b>"
+#~ msgstr "Kontaktliste"
+
+#, fuzzy
+#~ msgid "<b>Ports</b>"
+#~ msgstr "Kontaktliste"
+
+#, fuzzy
+#~ msgid "<b>Proxy accounts</b>"
+#~ msgstr "Kontaktliste"
+
+#, fuzzy
+#~ msgid "<b>Transport</b>"
+#~ msgstr "Kontaktliste"
+
+#~ msgid "Add"
+#~ msgstr "Hinzufgen"
+
+#, fuzzy
+#~ msgid ""
+#~ "Audio codecs\n"
+#~ "Video codecs"
+#~ msgstr "Audio und Video Codecs"
+
+#, fuzzy
+#~ msgid "Capture device:"
+#~ msgstr "Audio Aufnahmegerät:"
+
+#, fuzzy
+#~ msgid "Codecs"
+#~ msgstr "Codecs"
+
+#~ msgid "Disable"
+#~ msgstr "Sperren"
+
+#, fuzzy
+#~ msgid "Done"
+#~ msgstr "Gegangen"
+
+#, fuzzy
+#~ msgid "Download speed limit in Kbit/sec:"
+#~ msgstr "Download-Bandbreite (kbit/sec):"
+
+#~ msgid "Edit"
+#~ msgstr "Bearbeiten"
+
+#~ msgid "Enable"
+#~ msgstr "Freigeben"
+
+#, fuzzy
+#~ msgid "Network settings"
+#~ msgstr "Netzwerk"
+
+#, fuzzy
+#~ msgid "Playback device:"
+#~ msgstr "Ton Wiedergabegerät:"
+
+#, fuzzy
+#~ msgid "Public IP address:"
+#~ msgstr "Sip-Adresse:"
+
+#~ msgid "Remove"
+#~ msgstr "Entfernen"
+
+#, fuzzy
+#~ msgid "Ring device:"
+#~ msgstr "Klingel Wiedergabegerät:"
+
+#, fuzzy
+#~ msgid "Ring sound:"
+#~ msgstr "Klingelton:"
+
+#, fuzzy
+#~ msgid "Stun server:"
+#~ msgstr "Umleitungs-Server"
+
+#, fuzzy
+#~ msgid "Upload speed limit in Kbit/sec:"
+#~ msgstr "Upload-Bandbreite (kbit/sec):"
+
+#, fuzzy
+#~ msgid "User interface"
+#~ msgstr "Benutzername:"
+
+#, fuzzy
+#~ msgid "Video input device:"
+#~ msgstr "Audiogerät"
+
+#, fuzzy
+#~ msgid "Your resulting SIP address:"
+#~ msgstr "Ihre Sip-Adresse:"
+
+#, fuzzy
+#~ msgid "Your username:"
+#~ msgstr "Benutzername:"
+
+#~ msgid "Linphone"
+#~ msgstr "Linphone"
+
+#~ 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"
 
@@ -1596,14 +1335,6 @@ msgstr ""
 #~ "Teilnehmer nicht erreichbar. Bitte versuchen Sie es unter nachstehender "
 #~ "Ressource:"
 
-#, fuzzy
-#~ msgid "<b>Terminate call</b>"
-#~ msgstr "Kontaktliste"
-
-#, fuzzy
-#~ msgid "Show current call"
-#~ msgstr "Konnte kein Anruf vornehmen"
-
 #~ msgid "No nat/firewall address supplied !"
 #~ msgstr "Keine Nat/Firewall Adresse vorgegeben !"
 
@@ -1690,13 +1421,6 @@ msgstr ""
 #~ msgid "..."
 #~ msgstr "..."
 
-#~ msgid ""
-#~ "Call or\n"
-#~ "answer"
-#~ msgstr ""
-#~ "Anrufen oder\n"
-#~ "Entgegennehmen"
-
 #~ msgid ""
 #~ "Hangup\n"
 #~ "or refuse"
@@ -1859,9 +1583,6 @@ msgstr ""
 #~ "Alle gespeicherten Authentifikationsinformationen lĂśschen (Benutzername, "
 #~ "Passwort,...)"
 
-#~ msgid "Authentication information"
-#~ msgstr "Authentifikationsinformation"
-
 #~ msgid "SIP"
 #~ msgstr "SIP"
 
diff --git a/po/es.po b/po/es.po
index 0b2201bcfc5164a3dbb340e51f01c2db7859c6b1..0d3822b54df3a81e630a536116b97a04497230fe 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,58 +7,53 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Linphone 0.9.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 17:16+0200\n"
+"POT-Creation-Date: 2011-02-07 10:59+0100\n"
 "PO-Revision-Date: 2002-10-15 HO:MI+ZONE\n"
 "Last-Translator: Nelson Benitez <gnelson@inMail.sk>\n"
 "Language-Team: es <es@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../gtk-glade/support.c:49 ../gtk-glade/support.c:73
-#: ../gtk-glade/support.c:102
+#: ../gtk/support.c:49 ../gtk/support.c:73 ../gtk/support.c:102
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "No se pudo encontrar el archivo pixmap: %s"
 
-#: ../gtk-glade/chat.c:27
+#: ../gtk/chat.c:27
 #, c-format
 msgid "Chat with %s"
 msgstr ""
 
-#: ../gtk-glade/main.c:94
+#: ../gtk/main.c:74
 msgid "log to stdout some debug information while running."
 msgstr ""
 
-#: ../gtk-glade/main.c:101
+#: ../gtk/main.c:81
 msgid "Start only in the system tray, do not show the main interface."
 msgstr ""
 
-#: ../gtk-glade/main.c:108
+#: ../gtk/main.c:88
 msgid "address to call right now"
 msgstr ""
 
-#: ../gtk-glade/main.c:115
+#: ../gtk/main.c:95
 msgid "if set automatically answer incoming calls"
 msgstr ""
 
-#: ../gtk-glade/main.c:123
+#: ../gtk/main.c:103
 msgid ""
 "Specifiy a working directory (should be the base of the installation, eg: c:"
 "\\Program Files\\Linphone)"
 msgstr ""
 
-#: ../gtk-glade/main.c:402
+#: ../gtk/main.c:479
 #, c-format
 msgid "Call with %s"
 msgstr ""
 
-#: ../gtk-glade/main.c:720
-#, c-format
-msgid "Incoming call from %s"
-msgstr ""
-
-#: ../gtk-glade/main.c:759
+#: ../gtk/main.c:862
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
@@ -67,1000 +62,374 @@ msgid ""
 "If you answer no, this person will be temporarily blacklisted."
 msgstr ""
 
-#: ../gtk-glade/main.c:837
+#: ../gtk/main.c:940
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at domain <i>%s</i>:"
 msgstr ""
 
-#: ../gtk-glade/main.c:934
+#: ../gtk/main.c:1076
 msgid "Website link"
 msgstr ""
 
-#: ../gtk-glade/main.c:970
+#: ../gtk/main.c:1112
 msgid "Linphone - a video internet phone"
 msgstr ""
 
-#: ../gtk-glade/main.c:989
+#: ../gtk/main.c:1131
 #, c-format
 msgid "%s (Default)"
 msgstr ""
 
-#: ../gtk-glade/main.c:1221
+#: ../gtk/main.c:1382
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
 msgstr ""
 
-#: ../gtk-glade/main.c:1275
+#: ../gtk/main.c:1441
 msgid "A free SIP video-phone"
 msgstr ""
 
-#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:258
-#: ../gtk-glade/contact.glade.h:3
+#: ../gtk/friendlist.c:192 ../gtk/propertybox.c:271
 msgid "Name"
 msgstr "Nombre"
 
-#: ../gtk-glade/friendlist.c:205
+#: ../gtk/friendlist.c:205
 #, fuzzy
 msgid "Presence status"
 msgstr "Estado"
 
-#: ../gtk-glade/friendlist.c:242
+#: ../gtk/friendlist.c:242
 #, c-format
 msgid "Search in %s directory"
 msgstr ""
 
-#: ../gtk-glade/friendlist.c:450
+#: ../gtk/friendlist.c:450
 msgid "Invalid sip contact !"
 msgstr ""
 
-#: ../gtk-glade/friendlist.c:492
+#: ../gtk/friendlist.c:495
 #, c-format
 msgid "Call %s"
 msgstr ""
 
-#: ../gtk-glade/friendlist.c:493
+#: ../gtk/friendlist.c:496
 #, c-format
 msgid "Send text to %s"
 msgstr ""
 
-#: ../gtk-glade/friendlist.c:494
+#: ../gtk/friendlist.c:497
 #, fuzzy, c-format
 msgid "Edit contact '%s'"
 msgstr "(Ninguna informacion de contacto !)"
 
-#: ../gtk-glade/friendlist.c:495
+#: ../gtk/friendlist.c:498
 #, c-format
 msgid "Delete contact '%s'"
 msgstr ""
 
-#: ../gtk-glade/friendlist.c:537
+#: ../gtk/friendlist.c:540
 #, c-format
 msgid "Add new contact from %s directory"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:264
+#: ../gtk/propertybox.c:277
 msgid "Rate (Hz)"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:270
+#: ../gtk/propertybox.c:283
 msgid "Status"
 msgstr "Estado"
 
-#: ../gtk-glade/propertybox.c:276
+#: ../gtk/propertybox.c:289
 msgid "Min bitrate (kbit/s)"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:283
+#: ../gtk/propertybox.c:296
 msgid "Parameters"
 msgstr "Parametros"
 
-#: ../gtk-glade/propertybox.c:312 ../gtk-glade/propertybox.c:451
+#: ../gtk/propertybox.c:325 ../gtk/propertybox.c:464
 msgid "Enabled"
 msgstr "Activado"
 
-#: ../gtk-glade/propertybox.c:313 ../gtk-glade/propertybox.c:451
+#: ../gtk/propertybox.c:326 ../gtk/propertybox.c:464
 msgid "Disabled"
 msgstr "Desactivado"
 
-#: ../gtk-glade/propertybox.c:496
+#: ../gtk/propertybox.c:509
 msgid "Account"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:636
+#: ../gtk/propertybox.c:649
 msgid "English"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:637
+#: ../gtk/propertybox.c:650
 msgid "French"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:638
+#: ../gtk/propertybox.c:651
 msgid "Swedish"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:639
+#: ../gtk/propertybox.c:652
 msgid "Italian"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:640
+#: ../gtk/propertybox.c:653
 msgid "Spanish"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:641
+#: ../gtk/propertybox.c:654
 msgid "Brazilian Portugese"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:642
+#: ../gtk/propertybox.c:655
 msgid "Polish"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:643
+#: ../gtk/propertybox.c:656
 msgid "German"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:644
+#: ../gtk/propertybox.c:657
 msgid "Russian"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:645
+#: ../gtk/propertybox.c:658
 msgid "Japanese"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:646
+#: ../gtk/propertybox.c:659
 msgid "Dutch"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:647
+#: ../gtk/propertybox.c:660
 msgid "Hungarian"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:648
+#: ../gtk/propertybox.c:661
 msgid "Czech"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:649
+#: ../gtk/propertybox.c:662
 msgid "Chinese"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:706
+#: ../gtk/propertybox.c:719
 msgid ""
 "You need to restart linphone for the new language selection to take effect."
 msgstr ""
 
-#: ../gtk-glade/update.c:80
+#: ../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-glade/update.c:91
+#: ../gtk/update.c:91
 msgid "You are running the lastest version."
 msgstr ""
 
-#: ../gtk-glade/buddylookup.c:85
+#: ../gtk/buddylookup.c:85
 msgid "Firstname, Lastname"
 msgstr ""
 
-#: ../gtk-glade/buddylookup.c:160
+#: ../gtk/buddylookup.c:160
 msgid "Error communicating with server."
 msgstr ""
 
-#: ../gtk-glade/buddylookup.c:164
+#: ../gtk/buddylookup.c:164
 #, fuzzy
 msgid "Connecting..."
 msgstr "Conexion"
 
-#: ../gtk-glade/buddylookup.c:168
+#: ../gtk/buddylookup.c:168
 #, fuzzy
 msgid "Connected"
 msgstr "Conectado."
 
-#: ../gtk-glade/buddylookup.c:172
+#: ../gtk/buddylookup.c:172
 msgid "Receiving data..."
 msgstr ""
 
-#: ../gtk-glade/buddylookup.c:180
+#: ../gtk/buddylookup.c:180
 #, c-format
 msgid "Found %i contact"
 msgid_plural "Found %i contacts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gtk-glade/setupwizard.c:25
+#: ../gtk/setupwizard.c:25
 msgid ""
 "Welcome !\n"
 "This assistant will help you to use a SIP account for your calls."
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:34
+#: ../gtk/setupwizard.c:34
 msgid "Create an account by choosing a username"
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:35
+#: ../gtk/setupwizard.c:35
 msgid "I have already an account and just want to use it"
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:53
+#: ../gtk/setupwizard.c:53
 msgid "Please choose a username:"
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:54
+#: ../gtk/setupwizard.c:54
 #, fuzzy
 msgid "Username:"
 msgstr "Manual de Usuario"
 
-#: ../gtk-glade/setupwizard.c:92
+#: ../gtk/setupwizard.c:92
 #, c-format
 msgid "Checking if '%s' is available..."
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:97 ../gtk-glade/setupwizard.c:164
+#: ../gtk/setupwizard.c:97 ../gtk/setupwizard.c:164
 msgid "Please wait..."
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:101
+#: ../gtk/setupwizard.c:101
 msgid "Sorry this username already exists. Please try a new one."
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:103 ../gtk-glade/setupwizard.c:168
+#: ../gtk/setupwizard.c:103 ../gtk/setupwizard.c:168
 msgid "Ok !"
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:106 ../gtk-glade/setupwizard.c:171
-msgid "Communication problem, please try again later."
-msgstr ""
-
-#: ../gtk-glade/setupwizard.c:134
-msgid "Thank you. Your account is now configured and ready for use."
-msgstr ""
-
-#: ../gtk-glade/setupwizard.c:228
-msgid "Welcome to the account setup assistant"
-msgstr ""
-
-#: ../gtk-glade/setupwizard.c:232
-msgid "Account setup assistant"
-msgstr ""
-
-#: ../gtk-glade/setupwizard.c:236
-msgid "Choosing a username"
-msgstr ""
-
-#: ../gtk-glade/setupwizard.c:240
-msgid "Verifying"
-msgstr ""
-
-#: ../gtk-glade/setupwizard.c:244
-#, fuzzy
-msgid "Confirmation"
-msgstr "Informacion"
-
-#: ../gtk-glade/setupwizard.c:249
-msgid "Creating your account"
-msgstr ""
-
-#: ../gtk-glade/setupwizard.c:253
-msgid "Now ready !"
-msgstr ""
-
-#: ../gtk-glade/incall_view.c:113
-#, fuzzy
-msgid "<b>Calling...</b>"
-msgstr "Contactando "
-
-#: ../gtk-glade/incall_view.c:116 ../gtk-glade/incall_view.c:138
-msgid "00::00::00"
-msgstr ""
-
-#: ../gtk-glade/incall_view.c:136
-#, fuzzy
-msgid "<b>In call with</b>"
-msgstr "Contactando "
-
-#: ../gtk-glade/incall_view.c:154
-#, c-format
-msgid "%02i::%02i::%02i"
-msgstr ""
-
-#: ../gtk-glade/incall_view.c:170
-#, fuzzy
-msgid "<b>Call ended.</b>"
-msgstr "Llamada cancelada."
-
-#: ../gtk-glade/incall_view.c:188
-msgid "Unmute"
-msgstr ""
-
-#: ../gtk-glade/incall_view.c:195 ../gtk-glade/main.glade.h:43
-msgid "Mute"
-msgstr ""
-
-#: ../gtk-glade/loginframe.c:83
-#, c-format
-msgid "Please enter login information for %s"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:1
-msgid "#"
-msgstr "#"
-
-#: ../gtk-glade/main.glade.h:2
-msgid "*"
-msgstr "*"
-
-#: ../gtk-glade/main.glade.h:3
-msgid "0"
-msgstr "0"
-
-#: ../gtk-glade/main.glade.h:4
-msgid "1"
-msgstr "1"
-
-#: ../gtk-glade/main.glade.h:5
-msgid "2"
-msgstr "2"
-
-#: ../gtk-glade/main.glade.h:6
-msgid "3"
-msgstr "3"
-
-#: ../gtk-glade/main.glade.h:7
-msgid "4"
-msgstr "4"
-
-#: ../gtk-glade/main.glade.h:8
-msgid "5"
-msgstr "10"
-
-#: ../gtk-glade/main.glade.h:9
-msgid "6"
-msgstr "6"
-
-#: ../gtk-glade/main.glade.h:10
-msgid "7"
-msgstr "7"
-
-#: ../gtk-glade/main.glade.h:11
-msgid "8"
-msgstr "8"
-
-#: ../gtk-glade/main.glade.h:12
-msgid "9"
-msgstr "9"
-
-#: ../gtk-glade/main.glade.h:13
-#, fuzzy
-msgid "<b>Add contacts from directory</b>"
-msgstr "Informacion de codec"
-
-#: ../gtk-glade/main.glade.h:14
-#, fuzzy
-msgid "<b>Contact list</b>"
-msgstr "Contactando "
-
-#: ../gtk-glade/main.glade.h:15
-#, fuzzy
-msgid "<b>Welcome !</b>"
-msgstr "Contactando "
-
-#: ../gtk-glade/main.glade.h:16
-msgid "A"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:17
-msgid ""
-"ADSL\n"
-"Fiber Channel"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:19
-msgid ""
-"All users\n"
-"Online users"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:21
-msgid "Assistant"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:22
-#, fuzzy
-msgid "Audio & Video"
-msgstr "Propiedades del codec de Audio"
-
-#: ../gtk-glade/main.glade.h:23
-#, fuzzy
-msgid "Audio only"
-msgstr "Propiedades del codec de Audio"
-
-#: ../gtk-glade/main.glade.h:24
-msgid "Automatically log me in"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:25
-msgid "B"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:26 ../gtk-glade/parameters.glade.h:21
-msgid "C"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:27
-msgid "Call Details"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:28 ../gtk-glade/call_logs.glade.h:1
-msgid "Call history"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:29
-msgid "Check for updates"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:30
-#, fuzzy
-msgid "Contacts"
-msgstr "Contactando "
-
-#: ../gtk-glade/main.glade.h:31
-msgid "D"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:32
-msgid "Default"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:33
-#, fuzzy
-msgid "Duration"
-msgstr "Informacion"
-
-#: ../gtk-glade/main.glade.h:34
-#, fuzzy
-msgid "Duration:"
-msgstr "Informacion"
-
-#: ../gtk-glade/main.glade.h:35
-#, fuzzy
-msgid "Enable self-view"
-msgstr "Activado"
-
-#: ../gtk-glade/main.glade.h:36
-msgid "Enter username, phone number, or full sip address"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:37
-msgid "Homepage"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:38
-msgid "In call"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:39
-msgid "Internet connection:"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:40
-msgid "Keypad"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:41
-#, fuzzy
-msgid "Login information"
-msgstr "Informacion de codec"
-
-#: ../gtk-glade/main.glade.h:42
-msgid "Lookup:"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:44
-#, fuzzy
-msgid "My current identity:"
-msgstr "Identidad"
-
-#: ../gtk-glade/main.glade.h:45
-#, fuzzy
-msgid "Password"
-msgstr "Tu ContraseĂąa:"
-
-#: ../gtk-glade/main.glade.h:46
-#, fuzzy
-msgid "SIP address or phone number:"
-msgstr "La direccion SIP del servidor de registro."
-
-#: ../gtk-glade/main.glade.h:47
-msgid "Search"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:48
-msgid "Show debug messages"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:49
-msgid "Start call"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:50
-msgid "Terminate call"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:51
-#, fuzzy
-msgid "Username"
-msgstr "Manual de Usuario"
-
-#: ../gtk-glade/main.glade.h:52
-#, fuzzy
-msgid "_Linphone"
-msgstr "linphone"
-
-#: ../gtk-glade/main.glade.h:53
-#, fuzzy
-msgid "_Modes"
-msgstr "Codecs"
-
-#: ../gtk-glade/main.glade.h:54
-msgid "in"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:55
-msgid "label"
-msgstr ""
-
-#: ../gtk-glade/about.glade.h:1
-#, fuzzy
-msgid "About linphone"
-msgstr "linphone"
-
-#: ../gtk-glade/about.glade.h:2
-msgid "An internet video phone using the standard SIP (rfc3261) protocol."
-msgstr ""
-
-#: ../gtk-glade/about.glade.h:3
-msgid "Created by Simon Morlat\n"
-msgstr ""
-
-#: ../gtk-glade/about.glade.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"
-msgstr ""
-
-#: ../gtk-glade/contact.glade.h:1
-#, fuzzy
-msgid "<b>Contact information</b>"
-msgstr "Informacion de codec"
-
-#: ../gtk-glade/contact.glade.h:2
-msgid "Allow this contact to see my presence status"
-msgstr ""
-
-#: ../gtk-glade/contact.glade.h:4
-#, fuzzy
-msgid "SIP Address"
-msgstr "Direccion"
-
-#: ../gtk-glade/contact.glade.h:5
-msgid "Show this contact presence status"
-msgstr ""
-
-#: ../gtk-glade/contact.glade.h:6 ../gtk-glade/password.glade.h:5
-#: ../gtk-glade/sip_account.glade.h:9
-msgid "gtk-cancel"
-msgstr ""
-
-#: ../gtk-glade/contact.glade.h:7 ../gtk-glade/password.glade.h:6
-#: ../gtk-glade/sip_account.glade.h:10
-msgid "gtk-ok"
-msgstr ""
-
-#: ../gtk-glade/log.glade.h:1
-#, fuzzy
-msgid "Linphone debug window"
-msgstr "Linphone esta terminando..."
-
-#: ../gtk-glade/log.glade.h:2 ../gtk-glade/call_logs.glade.h:2
-#: ../gtk-glade/chatroom.glade.h:2
-msgid "gtk-close"
-msgstr ""
-
-#: ../gtk-glade/password.glade.h:1
-msgid "Linphone - Authentication required"
-msgstr ""
-
-#: ../gtk-glade/password.glade.h:2
-#, fuzzy
-msgid "Password:"
-msgstr "Tu ContraseĂąa:"
-
-#: ../gtk-glade/password.glade.h:3
-msgid "Please enter the domain password"
-msgstr ""
-
-#: ../gtk-glade/password.glade.h:4
-msgid "UserID"
-msgstr ""
-
-#: ../gtk-glade/sip_account.glade.h:1
-msgid "Configure a SIP account"
-msgstr ""
-
-#: ../gtk-glade/sip_account.glade.h:2
-msgid "Linphone - Configure a SIP account"
-msgstr ""
-
-#: ../gtk-glade/sip_account.glade.h:3
-#, fuzzy
-msgid "Publish presence information"
-msgstr "Informacion de codec"
-
-#: ../gtk-glade/sip_account.glade.h:4
-msgid "Register at startup"
-msgstr ""
-
-#: ../gtk-glade/sip_account.glade.h:5
-#, fuzzy
-msgid "Registration duration (sec):"
-msgstr "Se ha registrado con exito."
-
-#: ../gtk-glade/sip_account.glade.h:6
-msgid "Route (optional):"
-msgstr ""
-
-#: ../gtk-glade/sip_account.glade.h:7
-#, fuzzy
-msgid "SIP Proxy address:"
-msgstr "Direccion SIP"
-
-#: ../gtk-glade/sip_account.glade.h:8
-#, fuzzy
-msgid "Your SIP identity:"
-msgstr "Identidad"
-
-#: ../gtk-glade/sip_account.glade.h:11
-msgid "sip:"
-msgstr "SIP:"
-
-#: ../gtk-glade/chatroom.glade.h:1
-#, fuzzy
-msgid "Send"
-msgstr "Sonido"
-
-#: ../gtk-glade/incoming_call.glade.h:1
-msgid "Accept"
-msgstr ""
-
-#: ../gtk-glade/incoming_call.glade.h:2
-#, fuzzy
-msgid "Decline"
-msgstr "linea"
-
-#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:369
-msgid "Incoming call"
-msgstr ""
-
-#: ../gtk-glade/incoming_call.glade.h:4
-msgid "Incoming call from"
-msgstr ""
-
-#: ../gtk-glade/incoming_call.glade.h:5
-msgid "Linphone - Incoming call"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:1
-msgid "0 stands for \"unlimited\""
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:2
-#, fuzzy
-msgid "<b>Audio</b>"
-msgstr "Contactando "
-
-#: ../gtk-glade/parameters.glade.h:3
-msgid "<b>Bandwidth control</b>"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:4
-#, fuzzy
-msgid "<b>Codecs</b>"
-msgstr "Contactando "
-
-#: ../gtk-glade/parameters.glade.h:5
-msgid "<b>Default identity</b>"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:6
-msgid "<b>Language</b>"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:7
-#, fuzzy
-msgid "<b>Level</b>"
-msgstr "Contactando "
-
-#: ../gtk-glade/parameters.glade.h:8
-msgid "<b>NAT and Firewall</b>"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:9
-#, fuzzy
-msgid "<b>Ports</b>"
-msgstr "Contactando "
-
-#: ../gtk-glade/parameters.glade.h:10
-msgid "<b>Privacy</b>"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:11
-#, fuzzy
-msgid "<b>Proxy accounts</b>"
-msgstr "Contactando "
-
-#: ../gtk-glade/parameters.glade.h:12
-#, fuzzy
-msgid "<b>Transport</b>"
-msgstr "Contactando "
-
-#: ../gtk-glade/parameters.glade.h:13
-msgid "<b>Video</b>"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:14
-msgid "ALSA special device (optional):"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:15
-msgid "Add"
-msgstr "AĂąadir"
-
-#: ../gtk-glade/parameters.glade.h:16
-msgid "Audio RTP/UDP:"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:17
-#, fuzzy
-msgid ""
-"Audio codecs\n"
-"Video codecs"
-msgstr "Propiedades del codec de Audio"
-
-#: ../gtk-glade/parameters.glade.h:19
-msgid "Behind NAT / Firewall (specify gateway IP below)"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:20
-msgid "Behind NAT / Firewall (use STUN to resolve)"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:22
-msgid "CIF"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:23
-#, fuzzy
-msgid "Capture device:"
-msgstr "Usar dispositivo de sonido:"
-
-#: ../gtk-glade/parameters.glade.h:24
-#, fuzzy
-msgid "Codecs"
-msgstr "Codecs"
-
-#: ../gtk-glade/parameters.glade.h:25
-msgid "Direct connection to the Internet"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:26
-msgid "Disable"
-msgstr "Desactivado"
-
-#: ../gtk-glade/parameters.glade.h:27
-#, fuzzy
-msgid "Done"
-msgstr "Ninguno."
-
-#: ../gtk-glade/parameters.glade.h:28
-msgid "Download speed limit in Kbit/sec:"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:29
-msgid "Edit"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:30
-msgid "Enable"
-msgstr "Activado"
-
-#: ../gtk-glade/parameters.glade.h:31
-msgid "Enable echo cancellation"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:32
-msgid "Erase all passwords"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:33
-msgid "Manage SIP Accounts"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:34
-msgid "Multimedia settings"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:35
-#, fuzzy
-msgid "Network settings"
-msgstr "Red"
-
-#: ../gtk-glade/parameters.glade.h:36
-#, fuzzy
-msgid "Playback device:"
-msgstr "Usar dispositivo de sonido:"
-
-#: ../gtk-glade/parameters.glade.h:37
-msgid "Prefered video resolution:"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:38
-#, fuzzy
-msgid "Public IP address:"
-msgstr "Direccion SIP"
-
-#: ../gtk-glade/parameters.glade.h:39
-msgid ""
-"Register to FONICS\n"
-"virtual network !"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:41
-msgid "Remove"
-msgstr "Borrar"
-
-#: ../gtk-glade/parameters.glade.h:42
-#, fuzzy
-msgid "Ring device:"
-msgstr "Usar dispositivo de sonido:"
-
-#: ../gtk-glade/parameters.glade.h:43
-#, fuzzy
-msgid "Ring sound:"
-msgstr "Fuente de grabacion:"
+#: ../gtk/setupwizard.c:106 ../gtk/setupwizard.c:171
+msgid "Communication problem, please try again later."
+msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:44
-msgid "SIP (UDP):"
+#: ../gtk/setupwizard.c:134
+msgid "Thank you. Your account is now configured and ready for use."
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:45
-msgid "Send DTMFs as SIP info"
+#: ../gtk/setupwizard.c:228
+msgid "Welcome to the account setup assistant"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:46
-msgid "Set Maximum Transmission Unit:"
+#: ../gtk/setupwizard.c:232
+msgid "Account setup assistant"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:47
-msgid "Settings"
+#: ../gtk/setupwizard.c:236
+msgid "Choosing a username"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:48
-msgid "Show advanced settings"
+#: ../gtk/setupwizard.c:240
+msgid "Verifying"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:49
+#: ../gtk/setupwizard.c:244
 #, fuzzy
-msgid "Stun server:"
-msgstr "Servidor de Redireccionamiento"
+msgid "Confirmation"
+msgstr "Informacion"
 
-#: ../gtk-glade/parameters.glade.h:50
-msgid "This section defines your SIP address when not using a SIP account"
+#: ../gtk/setupwizard.c:249
+msgid "Creating your account"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:51
-msgid "Upload speed limit in Kbit/sec:"
+#: ../gtk/setupwizard.c:253
+msgid "Now ready !"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:52
-msgid "Use IPv6 instead of IPv4"
+#: ../gtk/incall_view.c:113
+msgid "Transfer"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:53
+#: ../gtk/incall_view.c:187
 #, fuzzy
-msgid "User interface"
-msgstr "Manual de Usuario"
+msgid "<b>Calling...</b>"
+msgstr "Contactando "
 
-#: ../gtk-glade/parameters.glade.h:54
-msgid "Video RTP/UDP:"
+#: ../gtk/incall_view.c:190 ../gtk/incall_view.c:246
+msgid "00::00::00"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:55
+#: ../gtk/incall_view.c:206
 #, fuzzy
-msgid "Video input device:"
-msgstr "Usar dispositivo de sonido:"
+msgid "<b>Incoming call</b>"
+msgstr "Contactando "
 
-#: ../gtk-glade/parameters.glade.h:56
-msgid "Your display name (eg: John Doe):"
+#: ../gtk/incall_view.c:216
+msgid ""
+"Pause all calls\n"
+"and answer"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:57
-#, fuzzy
-msgid "Your resulting SIP address:"
-msgstr "Tu direccion SIP:"
-
-#: ../gtk-glade/parameters.glade.h:58
-msgid "Your username:"
+#: ../gtk/incall_view.c:217
+msgid "Answer"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:59
-msgid "a sound card\n"
-msgstr ""
+#: ../gtk/incall_view.c:244
+#, fuzzy
+msgid "<b>In call</b>"
+msgstr "Contactando "
 
-#: ../gtk-glade/parameters.glade.h:61
-msgid "default camera"
-msgstr ""
+#: ../gtk/incall_view.c:260
+#, fuzzy
+msgid "<b>Paused call</b>"
+msgstr "Contactando "
 
-#: ../gtk-glade/parameters.glade.h:62
-msgid "default soundcard"
+#: ../gtk/incall_view.c:272
+#, c-format
+msgid "%02i::%02i::%02i"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:63
-msgid "default soundcard\n"
-msgstr ""
+#: ../gtk/incall_view.c:288
+#, fuzzy
+msgid "<b>Call ended.</b>"
+msgstr "Llamada cancelada."
 
-#: ../gtk-glade/buddylookup.glade.h:1
-msgid "<b>Search somebody</b>"
+#: ../gtk/incall_view.c:309
+msgid "Unmute"
 msgstr ""
 
-#: ../gtk-glade/buddylookup.glade.h:2
-msgid "Add to my list"
+#: ../gtk/incall_view.c:316
+msgid "Mute"
 msgstr ""
 
-#: ../gtk-glade/buddylookup.glade.h:3
-msgid "Search contacts in directory"
+#: ../gtk/incall_view.c:340
+msgid "Resume"
 msgstr ""
 
-#: ../gtk-glade/waiting.glade.h:1
-#, fuzzy
-msgid "Linphone"
-msgstr "linphone"
+#: ../gtk/incall_view.c:347
+msgid "Pause"
+msgstr ""
 
-#: ../gtk-glade/waiting.glade.h:2
-msgid "Please wait"
+#: ../gtk/loginframe.c:93
+#, c-format
+msgid "Please enter login information for %s"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:311
+#: ../coreapi/linphonecore.c:166
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../coreapi/linphonecore.c:357
+#: ../coreapi/linphonecore.c:207
 msgid "aborted"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:360
+#: ../coreapi/linphonecore.c:210
 msgid "completed"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:363
+#: ../coreapi/linphonecore.c:213
 msgid "missed"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:368
+#: ../coreapi/linphonecore.c:218
 #, c-format
 msgid ""
 "%s at %s\n"
@@ -1070,34 +439,34 @@ msgid ""
 "Duration: %i mn %i sec\n"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:369
+#: ../coreapi/linphonecore.c:219
+msgid "Incoming call"
+msgstr ""
+
+#: ../coreapi/linphonecore.c:219
 msgid "Outgoing call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:626
+#: ../coreapi/linphonecore.c:501
 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 ""
 
-#: ../coreapi/linphonecore.c:1083
+#: ../coreapi/linphonecore.c:994
 #, fuzzy
 msgid "Ready"
 msgstr "Preparado."
 
-#: ../coreapi/linphonecore.c:1513
-msgid "Remote end seems to have disconnected, the call is going to be closed."
-msgstr ""
-
-#: ../coreapi/linphonecore.c:1725
+#: ../coreapi/linphonecore.c:1768
 msgid "Looking for telephone number destination..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1727
+#: ../coreapi/linphonecore.c:1771
 msgid "Could not resolve this number."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1771
+#: ../coreapi/linphonecore.c:1815
 #, fuzzy
 msgid ""
 "Could not parse given sip address. A sip url usually looks like sip:"
@@ -1105,28 +474,54 @@ msgid ""
 msgstr ""
 "Direccion SIP mal escrita. Una direccion SIP es <sip:username@domainname>"
 
-#: ../coreapi/linphonecore.c:1912
+#: ../coreapi/linphonecore.c:1962
 #, fuzzy
 msgid "Contacting"
 msgstr "Contactando "
 
-#: ../coreapi/linphonecore.c:1918
-msgid "could not call"
+#: ../coreapi/linphonecore.c:1969
+#, fuzzy
+msgid "Could not call"
+msgstr "No se pudo encontrar el archivo pixmap: %s"
+
+#: ../coreapi/linphonecore.c:2076
+msgid "Sorry, you have to pause or stop the current call first !"
+msgstr ""
+
+#: ../coreapi/linphonecore.c:2081
+msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1965
-msgid "Sorry, having multiple simultaneous calls is not supported yet !"
+#: ../coreapi/linphonecore.c:2205
+msgid "Modifying call parameters..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2370 ../coreapi/callbacks.c:32
+#: ../coreapi/linphonecore.c:2308
 msgid "Connected."
 msgstr "Conectado."
 
-#: ../coreapi/linphonecore.c:2404
+#: ../coreapi/linphonecore.c:2331
+#, fuzzy
+msgid "Call aborted"
+msgstr "Llamada cancelada."
+
+#: ../coreapi/linphonecore.c:2371
 #, fuzzy
 msgid "Call ended"
 msgstr "Llamada cancelada."
 
+#: ../coreapi/linphonecore.c:2453
+msgid "Could not pause the call"
+msgstr ""
+
+#: ../coreapi/linphonecore.c:2457
+msgid "Pausing the current call..."
+msgstr ""
+
+#: ../coreapi/linphonecore.c:2496
+msgid "There is already a call in process, pause or stop it first."
+msgstr ""
+
 #: ../coreapi/misc.c:147
 msgid ""
 "Your computer appears to be using ALSA sound drivers.\n"
@@ -1151,7 +546,7 @@ msgstr ""
 "no se encuentra y linphone lo necesita. Por favor ejecute\n"
 " 'modprobe snd-mixer-oss' como root para cargarlo."
 
-#: ../coreapi/misc.c:497
+#: ../coreapi/misc.c:520
 msgid "Stun lookup in progress..."
 msgstr ""
 
@@ -1207,109 +602,149 @@ msgstr ""
 msgid "Unknown-bug"
 msgstr ""
 
-#: ../coreapi/proxy.c:176
+#: ../coreapi/proxy.c:187
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
 msgstr ""
 
-#: ../coreapi/proxy.c:182
+#: ../coreapi/proxy.c:193
 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:621
+#: ../coreapi/proxy.c:670
 #, fuzzy, c-format
 msgid "Could not login as %s"
 msgstr "No se pudo encontrar el archivo pixmap: %s"
 
-#: ../coreapi/callbacks.c:95
+#: ../coreapi/callbacks.c:170
 #, fuzzy
 msgid "is contacting you"
 msgstr "le esta llamando."
 
-#: ../coreapi/callbacks.c:96
+#: ../coreapi/callbacks.c:171
 msgid " and asked autoanswer."
 msgstr ""
 
-#: ../coreapi/callbacks.c:96
+#: ../coreapi/callbacks.c:171
 msgid "."
 msgstr ""
 
-#: ../coreapi/callbacks.c:120
+#: ../coreapi/callbacks.c:226
 #, fuzzy
 msgid "Remote ringing."
 msgstr "Registrando..."
 
-#: ../coreapi/callbacks.c:139
+#: ../coreapi/callbacks.c:251
 msgid "Early media."
 msgstr ""
 
-#: ../coreapi/callbacks.c:248
+#: ../coreapi/callbacks.c:289
+#, c-format
+msgid "Call with %s is paused."
+msgstr ""
+
+#: ../coreapi/callbacks.c:300
+#, c-format
+msgid "Call answered by %s - on hold."
+msgstr ""
+
+#: ../coreapi/callbacks.c:315
+#, fuzzy
+msgid "Call resumed."
+msgstr "Llamada cancelada."
+
+#: ../coreapi/callbacks.c:320
+#, fuzzy, c-format
+msgid "Call answered by %s."
+msgstr ""
+"Llamar o\n"
+"Responder"
+
+#: ../coreapi/callbacks.c:381
+msgid "We are being paused..."
+msgstr ""
+
+#: ../coreapi/callbacks.c:385
+msgid "We have been resumed..."
+msgstr ""
+
+#: ../coreapi/callbacks.c:422
 #, fuzzy
 msgid "Call terminated."
 msgstr "Llamada cancelada."
 
-#: ../coreapi/callbacks.c:265
+#: ../coreapi/callbacks.c:429
 msgid "User is busy."
 msgstr "El usuario esta ocupado."
 
-#: ../coreapi/callbacks.c:266
+#: ../coreapi/callbacks.c:430
 msgid "User is temporarily unavailable."
 msgstr "El usuario le dice que volvera enseguida."
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:268
+#: ../coreapi/callbacks.c:432
 msgid "User does not want to be disturbed."
 msgstr "El usuario no quiere que lo molesten."
 
-#: ../coreapi/callbacks.c:269
+#: ../coreapi/callbacks.c:433
 msgid "Call declined."
 msgstr "Llamada cancelada."
 
-#: ../coreapi/callbacks.c:281
+#: ../coreapi/callbacks.c:445
 msgid "No response."
 msgstr ""
 
-#: ../coreapi/callbacks.c:284
+#: ../coreapi/callbacks.c:449
 msgid "Protocol error."
 msgstr ""
 
-#: ../coreapi/callbacks.c:298
+#: ../coreapi/callbacks.c:465
 msgid "Redirected"
 msgstr ""
 
-#: ../coreapi/callbacks.c:308
+#: ../coreapi/callbacks.c:475
 msgid "Not found"
 msgstr ""
 
-#: ../coreapi/callbacks.c:318
+#: ../coreapi/callbacks.c:485
 msgid "No common codecs"
 msgstr ""
 
-#: ../coreapi/callbacks.c:324
+#: ../coreapi/callbacks.c:491
 #, fuzzy
 msgid "Call failed."
 msgstr "Llamada cancelada."
 
-#: ../coreapi/callbacks.c:374
+#: ../coreapi/callbacks.c:527
+#, fuzzy
+msgid "Authentication failure"
+msgstr "Informacion de codec"
+
+#: ../coreapi/callbacks.c:553
 #, fuzzy, c-format
 msgid "Registration on %s successful."
 msgstr "Se ha registrado con exito."
 
-#: ../coreapi/callbacks.c:375
+#: ../coreapi/callbacks.c:554
 #, fuzzy, c-format
 msgid "Unregistration on %s done."
 msgstr "Se ha registrado con exito."
 
-#: ../coreapi/callbacks.c:383
+#: ../coreapi/callbacks.c:570
+msgid "no response timeout"
+msgstr ""
+
+#: ../coreapi/callbacks.c:573
 #, fuzzy, c-format
 msgid "Registration on %s failed: %s"
 msgstr "Se ha registrado con exito."
 
-#: ../coreapi/callbacks.c:383
-msgid "no response timeout"
+#: ../coreapi/callbacks.c:615
+#, c-format
+msgid "We are transferred to %s"
 msgstr ""
 
 #: ../mediastreamer2/src/alaw.c:144 ../mediastreamer2/src/alaw.c:162
@@ -1320,11 +755,11 @@ msgstr ""
 msgid "ITU-G.711 alaw decoder"
 msgstr ""
 
-#: ../mediastreamer2/src/alsa.c:935
+#: ../mediastreamer2/src/alsa.c:950
 msgid "Alsa sound source"
 msgstr ""
 
-#: ../mediastreamer2/src/alsa.c:1039
+#: ../mediastreamer2/src/alsa.c:1054
 msgid "Alsa sound output"
 msgstr ""
 
@@ -1336,15 +771,15 @@ msgstr ""
 msgid "Sound playback filter for MacOS X Audio Queue Service"
 msgstr ""
 
-#: ../mediastreamer2/src/dtmfgen.c:173 ../mediastreamer2/src/dtmfgen.c:191
+#: ../mediastreamer2/src/dtmfgen.c:274 ../mediastreamer2/src/dtmfgen.c:293
 msgid "DTMF generator"
 msgstr ""
 
-#: ../mediastreamer2/src/gsm.c:111 ../mediastreamer2/src/gsm.c:129
+#: ../mediastreamer2/src/gsm.c:120 ../mediastreamer2/src/gsm.c:138
 msgid "The GSM full-rate codec"
 msgstr ""
 
-#: ../mediastreamer2/src/gsm.c:178 ../mediastreamer2/src/gsm.c:196
+#: ../mediastreamer2/src/gsm.c:187 ../mediastreamer2/src/gsm.c:205
 msgid "The GSM codec"
 msgstr ""
 
@@ -1360,8 +795,8 @@ msgstr ""
 msgid "A filter to make conferencing"
 msgstr ""
 
-#: ../mediastreamer2/src/msfileplayer.c:295
-#: ../mediastreamer2/src/msfileplayer.c:313
+#: ../mediastreamer2/src/msfileplayer.c:311
+#: ../mediastreamer2/src/msfileplayer.c:329
 msgid "Raw files and wav reader"
 msgstr ""
 
@@ -1375,61 +810,53 @@ msgstr ""
 msgid "A filter that send several inputs to one output."
 msgstr ""
 
-#: ../mediastreamer2/src/msresample.c:221
-#: ../mediastreamer2/src/msresample.c:239
-msgid "frequency resampler"
+#: ../mediastreamer2/src/msresample.c:159
+#: ../mediastreamer2/src/msresample.c:177
+msgid "Audio resampler"
 msgstr ""
 
-#: ../mediastreamer2/src/msrtp.c:358 ../mediastreamer2/src/msrtp.c:376
+#: ../mediastreamer2/src/msrtp.c:369 ../mediastreamer2/src/msrtp.c:387
 msgid "RTP output filter"
 msgstr ""
 
-#: ../mediastreamer2/src/msrtp.c:493 ../mediastreamer2/src/msrtp.c:511
+#: ../mediastreamer2/src/msrtp.c:505 ../mediastreamer2/src/msrtp.c:523
 msgid "RTP input filter"
 msgstr ""
 
-#: ../mediastreamer2/src/msspeex.c:359 ../mediastreamer2/src/msspeex.c:377
-#: ../mediastreamer2/src/msspeex.c:504 ../mediastreamer2/src/msspeex.c:522
+#: ../mediastreamer2/src/msspeex.c:360 ../mediastreamer2/src/msspeex.c:378
+#: ../mediastreamer2/src/msspeex.c:548 ../mediastreamer2/src/msspeex.c:567
 msgid "The free and wonderful speex codec"
 msgstr ""
 
-#: ../mediastreamer2/src/msvolume.c:415 ../mediastreamer2/src/msvolume.c:430
+#: ../mediastreamer2/src/msvolume.c:527 ../mediastreamer2/src/msvolume.c:542
 msgid "A filter that controls and measure sound volume"
 msgstr ""
 
-#: ../mediastreamer2/src/msv4l.c:1011
+#: ../mediastreamer2/src/msv4l.c:1012
 msgid "A video4linux compatible source filter to stream pictures."
 msgstr ""
 
-#: ../mediastreamer2/src/msv4l2.c:470
+#: ../mediastreamer2/src/msv4l2.c:554
 msgid "A filter to grab pictures from Video4Linux2-powered cameras"
 msgstr ""
 
-#: ../mediastreamer2/src/nowebcam.c:1836
+#: ../mediastreamer2/src/nowebcam.c:1854
 msgid "A filter that outputs a static image."
 msgstr ""
 
-#: ../mediastreamer2/src/oss.c:567
-msgid "Sound capture filter for OSS drivers"
-msgstr ""
-
-#: ../mediastreamer2/src/oss.c:581
-msgid "Sound playback filter for OSS drivers"
-msgstr ""
-
-#: ../mediastreamer2/src/pixconv.c:177 ../mediastreamer2/src/pixconv.c:195
+#: ../mediastreamer2/src/pixconv.c:129 ../mediastreamer2/src/pixconv.c:147
 msgid "A pixel format converter"
 msgstr ""
 
-#: ../mediastreamer2/src/sizeconv.c:204
+#: ../mediastreamer2/src/sizeconv.c:202
 msgid "A video size converter"
 msgstr ""
 
-#: ../mediastreamer2/src/sizeconv.c:222
+#: ../mediastreamer2/src/sizeconv.c:220
 msgid "a small video size converter"
 msgstr ""
 
-#: ../mediastreamer2/src/speexec.c:349 ../mediastreamer2/src/speexec.c:367
+#: ../mediastreamer2/src/speexec.c:276 ../mediastreamer2/src/speexec.c:294
 msgid "Echo canceller using speex library"
 msgstr ""
 
@@ -1457,55 +884,55 @@ msgstr ""
 msgid "ITU-G.711 ulaw decoder"
 msgstr ""
 
-#: ../mediastreamer2/src/videodec.c:669 ../mediastreamer2/src/videodec.c:685
-#: ../mediastreamer2/src/videodec.c:768 ../mediastreamer2/src/videodec.c:784
+#: ../mediastreamer2/src/videodec.c:713 ../mediastreamer2/src/videodec.c:729
+#: ../mediastreamer2/src/videodec.c:812 ../mediastreamer2/src/videodec.c:828
 msgid "A H.263 decoder using ffmpeg library"
 msgstr ""
 
-#: ../mediastreamer2/src/videodec.c:702
+#: ../mediastreamer2/src/videodec.c:746
 msgid "A MPEG4 decoder using ffmpeg library"
 msgstr ""
 
-#: ../mediastreamer2/src/videodec.c:718
+#: ../mediastreamer2/src/videodec.c:762
 msgid "A RTP/JPEG decoder using ffmpeg library"
 msgstr ""
 
-#: ../mediastreamer2/src/videodec.c:734
+#: ../mediastreamer2/src/videodec.c:778
 msgid "A MJPEG decoder using ffmpeg library"
 msgstr ""
 
-#: ../mediastreamer2/src/videodec.c:750
+#: ../mediastreamer2/src/videodec.c:794
 msgid "A snow decoder using ffmpeg library"
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:861 ../mediastreamer2/src/videoenc.c:943
+#: ../mediastreamer2/src/videoenc.c:908 ../mediastreamer2/src/videoenc.c:990
 msgid "A video H.263 encoder using ffmpeg library."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:877
+#: ../mediastreamer2/src/videoenc.c:924
 msgid ""
 "A video H.263 encoder using ffmpeg library. It is compliant with old RFC2190 "
 "spec."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:893 ../mediastreamer2/src/videoenc.c:975
+#: ../mediastreamer2/src/videoenc.c:940 ../mediastreamer2/src/videoenc.c:1022
 msgid "A video MPEG4 encoder using ffmpeg library."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:909
+#: ../mediastreamer2/src/videoenc.c:956
 msgid "A video snow encoder using ffmpeg library."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:925
+#: ../mediastreamer2/src/videoenc.c:972
 msgid "A RTP/MJPEG encoder using ffmpeg library."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:959
+#: ../mediastreamer2/src/videoenc.c:1006
 msgid ""
 "A video H.263 encoder using ffmpeg library, compliant with old RFC2190 spec."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:991
+#: ../mediastreamer2/src/videoenc.c:1038
 msgid ""
 "The snow codec is royalty-free and is open-source. \n"
 "It uses innovative techniques that makes it one of most promising video "
@@ -1514,12 +941,12 @@ msgid ""
 "versions cannot be guaranteed."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:1011
+#: ../mediastreamer2/src/videoenc.c:1058
 msgid "A MJPEG encoder using ffmpeg library."
 msgstr ""
 
-#: ../mediastreamer2/src/videoout.c:1812 ../mediastreamer2/src/videoout.c:1830
-msgid "A generic video display"
+#: ../mediastreamer2/src/videoout.c:933
+msgid "A SDL-based video display"
 msgstr ""
 
 #: ../mediastreamer2/src/wincevideods.c:969
@@ -1546,10 +973,304 @@ msgstr ""
 msgid "Parametric sound equalizer."
 msgstr ""
 
-#: ../mediastreamer2/src/msdscap-mingw.cc:1003
+#: ../mediastreamer2/src/msdscap-mingw.cc:1038
 msgid "A webcam grabber based on directshow."
 msgstr ""
 
+#: ../mediastreamer2/src/drawdib-display.c:552
+#: ../mediastreamer2/src/drawdib-display.c:570
+msgid "A video display based on windows DrawDib api"
+msgstr ""
+
+#: ../mediastreamer2/src/audiomixer.c:192
+#: ../mediastreamer2/src/audiomixer.c:211
+msgid "A filter that mixes down 16 bit sample audio streams"
+msgstr ""
+
+#: ../mediastreamer2/src/chanadapt.c:110 ../mediastreamer2/src/chanadapt.c:128
+msgid "A filter that converts from mono to stereo and vice versa."
+msgstr ""
+
+#: ../mediastreamer2/src/itc.c:97 ../mediastreamer2/src/itc.c:115
+#: ../mediastreamer2/src/itc.c:197 ../mediastreamer2/src/itc.c:215
+msgid "Inter ticker communication filter."
+msgstr ""
+
+#: ../mediastreamer2/src/extdisplay.c:62 ../mediastreamer2/src/extdisplay.c:79
+msgid "A display filter sending the buffers to draw to the upper layer"
+msgstr ""
+
+#: ../mediastreamer2/src/msiounit.c:619
+msgid "Sound capture filter for MacOS X Audio Unit Service"
+msgstr ""
+
+#: ../mediastreamer2/src/msiounit.c:633
+msgid "Sound playback filter for MacOS X Audio Unit Service"
+msgstr ""
+
+#: ../mediastreamer2/src/x11video.c:562
+msgid "A video display using X11+Xv"
+msgstr ""
+
+#. .id=
+#. .name=
+#. .text=
+#: ../mediastreamer2/src/msandroid.cpp:370
+msgid "Sound capture filter for Android"
+msgstr ""
+
+#. .id=
+#. .name=
+#. .text=
+#: ../mediastreamer2/src/msandroid.cpp:667
+msgid "Sound playback filter for Android"
+msgstr ""
+
+#: ../mediastreamer2/src/msandroidvideo.cpp:134
+msgid "A filter that captures Android video."
+msgstr ""
+
+#~ msgid "#"
+#~ msgstr "#"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "0"
+#~ msgstr "0"
+
+#~ msgid "1"
+#~ msgstr "1"
+
+#~ msgid "2"
+#~ msgstr "2"
+
+#~ msgid "3"
+#~ msgstr "3"
+
+#~ msgid "4"
+#~ msgstr "4"
+
+#~ msgid "5"
+#~ msgstr "10"
+
+#~ msgid "6"
+#~ msgstr "6"
+
+#~ msgid "7"
+#~ msgstr "7"
+
+#~ msgid "8"
+#~ msgstr "8"
+
+#~ msgid "9"
+#~ msgstr "9"
+
+#, fuzzy
+#~ msgid "<b>Add contacts from directory</b>"
+#~ msgstr "Informacion de codec"
+
+#, fuzzy
+#~ msgid "<b>Contact list</b>"
+#~ msgstr "Contactando "
+
+#, fuzzy
+#~ msgid "<b>Welcome !</b>"
+#~ msgstr "Contactando "
+
+#, fuzzy
+#~ msgid "Audio & Video"
+#~ msgstr "Propiedades del codec de Audio"
+
+#, fuzzy
+#~ msgid "Audio only"
+#~ msgstr "Propiedades del codec de Audio"
+
+#, fuzzy
+#~ msgid "Contacts"
+#~ msgstr "Contactando "
+
+#, fuzzy
+#~ msgid "Duration"
+#~ msgstr "Informacion"
+
+#, fuzzy
+#~ msgid "Duration:"
+#~ msgstr "Informacion"
+
+#, fuzzy
+#~ msgid "Enable self-view"
+#~ msgstr "Activado"
+
+#, fuzzy
+#~ msgid "Login information"
+#~ msgstr "Informacion de codec"
+
+#, fuzzy
+#~ msgid "My current identity:"
+#~ msgstr "Identidad"
+
+#, fuzzy
+#~ msgid "Password"
+#~ msgstr "Tu ContraseĂąa:"
+
+#, fuzzy
+#~ msgid "SIP address or phone number:"
+#~ msgstr "La direccion SIP del servidor de registro."
+
+#, fuzzy
+#~ msgid "Username"
+#~ msgstr "Manual de Usuario"
+
+#, fuzzy
+#~ msgid "_Linphone"
+#~ msgstr "linphone"
+
+#, fuzzy
+#~ msgid "_Modes"
+#~ msgstr "Codecs"
+
+#, fuzzy
+#~ msgid "About linphone"
+#~ msgstr "linphone"
+
+#, fuzzy
+#~ msgid "<b>Contact information</b>"
+#~ msgstr "Informacion de codec"
+
+#, fuzzy
+#~ msgid "SIP Address"
+#~ msgstr "Direccion"
+
+#, fuzzy
+#~ msgid "Linphone debug window"
+#~ msgstr "Linphone esta terminando..."
+
+#, fuzzy
+#~ msgid "Password:"
+#~ msgstr "Tu ContraseĂąa:"
+
+#, fuzzy
+#~ msgid "Publish presence information"
+#~ msgstr "Informacion de codec"
+
+#, fuzzy
+#~ msgid "Registration duration (sec):"
+#~ msgstr "Se ha registrado con exito."
+
+#, fuzzy
+#~ msgid "SIP Proxy address:"
+#~ msgstr "Direccion SIP"
+
+#, fuzzy
+#~ msgid "Your SIP identity:"
+#~ msgstr "Identidad"
+
+#~ msgid "sip:"
+#~ msgstr "SIP:"
+
+#, fuzzy
+#~ msgid "Send"
+#~ msgstr "Sonido"
+
+#, fuzzy
+#~ msgid "Decline"
+#~ msgstr "linea"
+
+#, fuzzy
+#~ msgid "<b>Audio</b>"
+#~ msgstr "Contactando "
+
+#, fuzzy
+#~ msgid "<b>Codecs</b>"
+#~ msgstr "Contactando "
+
+#, fuzzy
+#~ msgid "<b>Level</b>"
+#~ msgstr "Contactando "
+
+#, fuzzy
+#~ msgid "<b>Ports</b>"
+#~ msgstr "Contactando "
+
+#, fuzzy
+#~ msgid "<b>Proxy accounts</b>"
+#~ msgstr "Contactando "
+
+#, fuzzy
+#~ msgid "<b>Transport</b>"
+#~ msgstr "Contactando "
+
+#~ msgid "Add"
+#~ msgstr "AĂąadir"
+
+#, fuzzy
+#~ msgid ""
+#~ "Audio codecs\n"
+#~ "Video codecs"
+#~ msgstr "Propiedades del codec de Audio"
+
+#, fuzzy
+#~ msgid "Capture device:"
+#~ msgstr "Usar dispositivo de sonido:"
+
+#, fuzzy
+#~ msgid "Codecs"
+#~ msgstr "Codecs"
+
+#~ msgid "Disable"
+#~ msgstr "Desactivado"
+
+#, fuzzy
+#~ msgid "Done"
+#~ msgstr "Ninguno."
+
+#~ msgid "Enable"
+#~ msgstr "Activado"
+
+#, fuzzy
+#~ msgid "Network settings"
+#~ msgstr "Red"
+
+#, fuzzy
+#~ msgid "Playback device:"
+#~ msgstr "Usar dispositivo de sonido:"
+
+#, fuzzy
+#~ msgid "Public IP address:"
+#~ msgstr "Direccion SIP"
+
+#~ msgid "Remove"
+#~ msgstr "Borrar"
+
+#, fuzzy
+#~ msgid "Ring device:"
+#~ msgstr "Usar dispositivo de sonido:"
+
+#, fuzzy
+#~ msgid "Ring sound:"
+#~ msgstr "Fuente de grabacion:"
+
+#, fuzzy
+#~ msgid "Stun server:"
+#~ msgstr "Servidor de Redireccionamiento"
+
+#, fuzzy
+#~ msgid "User interface"
+#~ msgstr "Manual de Usuario"
+
+#, fuzzy
+#~ msgid "Video input device:"
+#~ msgstr "Usar dispositivo de sonido:"
+
+#, fuzzy
+#~ msgid "Your resulting SIP address:"
+#~ msgstr "Tu direccion SIP:"
+
+#, fuzzy
+#~ msgid "Linphone"
+#~ msgstr "linphone"
+
 #, fuzzy
 #~ msgid "Request Cancelled."
 #~ msgstr "Llamada cancelada."
@@ -1573,10 +1294,6 @@ msgstr ""
 #~ "Usuario no disponible en este momento pero le invita\n"
 #~ "a contactarle usando el siguiente recurso alternativo:"
 
-#, fuzzy
-#~ msgid "<b>Terminate call</b>"
-#~ msgstr "Contactando "
-
 #, fuzzy
 #~ msgid "Gone"
 #~ msgstr "Ninguno."
@@ -1623,14 +1340,6 @@ msgstr ""
 #~ msgid "Shows the address book"
 #~ msgstr "Muestra la Agenda"
 
-#, fuzzy
-#~ msgid ""
-#~ "Call or\n"
-#~ "answer"
-#~ msgstr ""
-#~ "Llamar o\n"
-#~ "Responder"
-
 #~ msgid "Show more..."
 #~ msgstr "Mostrar mas..."
 
@@ -1736,10 +1445,6 @@ msgstr ""
 #~ msgid "Remote services"
 #~ msgstr "Servicios Remotos:"
 
-#, fuzzy
-#~ msgid "Authentication information"
-#~ msgstr "Informacion de codec"
-
 #~ msgid "SIP"
 #~ msgstr "SIP"
 
diff --git a/po/fr.po b/po/fr.po
index b7fc236efa7e7c975180fe751d3439ba224abf0d..ea76a3e5add53a5dc24185326b294eb91e14a549 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,58 +6,53 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Linphone 0.9.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 17:16+0200\n"
+"POT-Creation-Date: 2011-02-07 10:59+0100\n"
 "PO-Revision-Date: 2002-12-06 17:33+0100\n"
 "Last-Translator: Simon Morlat <simon.morlat@linphone.org>\n"
 "Language-Team: french <fr@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../gtk-glade/support.c:49 ../gtk-glade/support.c:73
-#: ../gtk-glade/support.c:102
+#: ../gtk/support.c:49 ../gtk/support.c:73 ../gtk/support.c:102
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "Icone non trouvĂŠe: %s"
 
-#: ../gtk-glade/chat.c:27
+#: ../gtk/chat.c:27
 #, c-format
 msgid "Chat with %s"
 msgstr "Chat avec %s"
 
-#: ../gtk-glade/main.c:94
+#: ../gtk/main.c:74
 msgid "log to stdout some debug information while running."
 msgstr ""
 
-#: ../gtk-glade/main.c:101
+#: ../gtk/main.c:81
 msgid "Start only in the system tray, do not show the main interface."
 msgstr ""
 
-#: ../gtk-glade/main.c:108
+#: ../gtk/main.c:88
 msgid "address to call right now"
 msgstr ""
 
-#: ../gtk-glade/main.c:115
+#: ../gtk/main.c:95
 msgid "if set automatically answer incoming calls"
 msgstr ""
 
-#: ../gtk-glade/main.c:123
+#: ../gtk/main.c:103
 msgid ""
 "Specifiy a working directory (should be the base of the installation, eg: c:"
 "\\Program Files\\Linphone)"
 msgstr ""
 
-#: ../gtk-glade/main.c:402
+#: ../gtk/main.c:479
 #, c-format
 msgid "Call with %s"
 msgstr "Appel avec %s"
 
-#: ../gtk-glade/main.c:720
-#, c-format
-msgid "Incoming call from %s"
-msgstr "Appel entrant de %s"
-
-#: ../gtk-glade/main.c:759
+#: ../gtk/main.c:862
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
@@ -66,7 +61,7 @@ msgid ""
 "If you answer no, this person will be temporarily blacklisted."
 msgstr ""
 
-#: ../gtk-glade/main.c:837
+#: ../gtk/main.c:940
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
@@ -75,952 +70,366 @@ msgstr ""
 "Entrez le mot de passe pour <i>%s</i>\n"
 " sur le domaine <i>%s</i>:"
 
-#: ../gtk-glade/main.c:934
+#: ../gtk/main.c:1076
 msgid "Website link"
 msgstr "Lien site web"
 
-#: ../gtk-glade/main.c:970
+#: ../gtk/main.c:1112
 msgid "Linphone - a video internet phone"
 msgstr "Linphone - un tĂŠlĂŠphone video pour l'internet"
 
-#: ../gtk-glade/main.c:989
+#: ../gtk/main.c:1131
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (par dĂŠfaut)"
 
-#: ../gtk-glade/main.c:1221
+#: ../gtk/main.c:1382
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
 msgstr ""
 
-#: ../gtk-glade/main.c:1275
+#: ../gtk/main.c:1441
 msgid "A free SIP video-phone"
 msgstr "Un visiophone libre"
 
-#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:258
-#: ../gtk-glade/contact.glade.h:3
+#: ../gtk/friendlist.c:192 ../gtk/propertybox.c:271
 msgid "Name"
 msgstr "Nom"
 
-#: ../gtk-glade/friendlist.c:205
+#: ../gtk/friendlist.c:205
 msgid "Presence status"
 msgstr "Info de prĂŠsence"
 
-#: ../gtk-glade/friendlist.c:242
+#: ../gtk/friendlist.c:242
 #, c-format
 msgid "Search in %s directory"
 msgstr "Rechercher dans l'annuaire de %s"
 
-#: ../gtk-glade/friendlist.c:450
+#: ../gtk/friendlist.c:450
 msgid "Invalid sip contact !"
 msgstr "Contact sip invalide !"
 
-#: ../gtk-glade/friendlist.c:492
+#: ../gtk/friendlist.c:495
 #, c-format
 msgid "Call %s"
 msgstr "Appeler %s"
 
-#: ../gtk-glade/friendlist.c:493
+#: ../gtk/friendlist.c:496
 #, c-format
 msgid "Send text to %s"
 msgstr "Chatter avec %s"
 
-#: ../gtk-glade/friendlist.c:494
+#: ../gtk/friendlist.c:497
 #, c-format
 msgid "Edit contact '%s'"
 msgstr "Editer le contact '%s'"
 
-#: ../gtk-glade/friendlist.c:495
+#: ../gtk/friendlist.c:498
 #, c-format
 msgid "Delete contact '%s'"
 msgstr "Supprimer le contact '%s'"
 
-#: ../gtk-glade/friendlist.c:537
+#: ../gtk/friendlist.c:540
 #, c-format
 msgid "Add new contact from %s directory"
 msgstr "Ajouter un contact depuis l'annuaire %s"
 
-#: ../gtk-glade/propertybox.c:264
+#: ../gtk/propertybox.c:277
 msgid "Rate (Hz)"
 msgstr "FrĂŠquence (Hz)"
 
-#: ../gtk-glade/propertybox.c:270
+#: ../gtk/propertybox.c:283
 msgid "Status"
 msgstr "Etat"
 
-#: ../gtk-glade/propertybox.c:276
+#: ../gtk/propertybox.c:289
 msgid "Min bitrate (kbit/s)"
 msgstr "DĂŠbit min. (kbit/s)"
 
-#: ../gtk-glade/propertybox.c:283
+#: ../gtk/propertybox.c:296
 msgid "Parameters"
 msgstr "Paramètres"
 
-#: ../gtk-glade/propertybox.c:312 ../gtk-glade/propertybox.c:451
+#: ../gtk/propertybox.c:325 ../gtk/propertybox.c:464
 msgid "Enabled"
 msgstr "ActivĂŠ"
 
-#: ../gtk-glade/propertybox.c:313 ../gtk-glade/propertybox.c:451
+#: ../gtk/propertybox.c:326 ../gtk/propertybox.c:464
 msgid "Disabled"
 msgstr "DĂŠsactivĂŠ"
 
-#: ../gtk-glade/propertybox.c:496
+#: ../gtk/propertybox.c:509
 msgid "Account"
 msgstr "Compte"
 
-#: ../gtk-glade/propertybox.c:636
+#: ../gtk/propertybox.c:649
 msgid "English"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:637
+#: ../gtk/propertybox.c:650
 msgid "French"
 msgstr "Français"
 
-#: ../gtk-glade/propertybox.c:638
+#: ../gtk/propertybox.c:651
 msgid "Swedish"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:639
+#: ../gtk/propertybox.c:652
 msgid "Italian"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:640
+#: ../gtk/propertybox.c:653
 msgid "Spanish"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:641
+#: ../gtk/propertybox.c:654
 msgid "Brazilian Portugese"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:642
+#: ../gtk/propertybox.c:655
 msgid "Polish"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:643
+#: ../gtk/propertybox.c:656
 msgid "German"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:644
+#: ../gtk/propertybox.c:657
 msgid "Russian"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:645
+#: ../gtk/propertybox.c:658
 msgid "Japanese"
 msgstr "日本語"
 
-#: ../gtk-glade/propertybox.c:646
+#: ../gtk/propertybox.c:659
 msgid "Dutch"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:647
+#: ../gtk/propertybox.c:660
 msgid "Hungarian"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:648
+#: ../gtk/propertybox.c:661
 msgid "Czech"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:649
+#: ../gtk/propertybox.c:662
 msgid "Chinese"
 msgstr "简体中文"
 
-#: ../gtk-glade/propertybox.c:706
+#: ../gtk/propertybox.c:719
 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."
 
-#: ../gtk-glade/update.c:80
+#: ../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-glade/update.c:91
+#: ../gtk/update.c:91
 msgid "You are running the lastest version."
 msgstr ""
 
-#: ../gtk-glade/buddylookup.c:85
+#: ../gtk/buddylookup.c:85
 msgid "Firstname, Lastname"
 msgstr "PrĂŠnom, Nom"
 
-#: ../gtk-glade/buddylookup.c:160
+#: ../gtk/buddylookup.c:160
 msgid "Error communicating with server."
 msgstr ""
 
-#: ../gtk-glade/buddylookup.c:164
+#: ../gtk/buddylookup.c:164
 msgid "Connecting..."
 msgstr "Connexion..."
 
-#: ../gtk-glade/buddylookup.c:168
+#: ../gtk/buddylookup.c:168
 msgid "Connected"
 msgstr "ConnectĂŠ"
 
-#: ../gtk-glade/buddylookup.c:172
+#: ../gtk/buddylookup.c:172
 msgid "Receiving data..."
 msgstr "Reception des donnĂŠes"
 
-#: ../gtk-glade/buddylookup.c:180
+#: ../gtk/buddylookup.c:180
 #, c-format
 msgid "Found %i contact"
 msgid_plural "Found %i contacts"
 msgstr[0] "%i contact trouvĂŠ."
 msgstr[1] "%i contacts trouvĂŠs."
 
-#: ../gtk-glade/setupwizard.c:25
+#: ../gtk/setupwizard.c:25
 msgid ""
 "Welcome !\n"
 "This assistant will help you to use a SIP account for your calls."
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:34
+#: ../gtk/setupwizard.c:34
 msgid "Create an account by choosing a username"
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:35
+#: ../gtk/setupwizard.c:35
 msgid "I have already an account and just want to use it"
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:53
+#: ../gtk/setupwizard.c:53
 msgid "Please choose a username:"
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:54
+#: ../gtk/setupwizard.c:54
 msgid "Username:"
 msgstr "Nom d'utilisateur:"
 
-#: ../gtk-glade/setupwizard.c:92
+#: ../gtk/setupwizard.c:92
 #, c-format
 msgid "Checking if '%s' is available..."
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:97 ../gtk-glade/setupwizard.c:164
+#: ../gtk/setupwizard.c:97 ../gtk/setupwizard.c:164
 msgid "Please wait..."
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:101
+#: ../gtk/setupwizard.c:101
 msgid "Sorry this username already exists. Please try a new one."
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:103 ../gtk-glade/setupwizard.c:168
+#: ../gtk/setupwizard.c:103 ../gtk/setupwizard.c:168
 msgid "Ok !"
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:106 ../gtk-glade/setupwizard.c:171
+#: ../gtk/setupwizard.c:106 ../gtk/setupwizard.c:171
 msgid "Communication problem, please try again later."
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:134
+#: ../gtk/setupwizard.c:134
 msgid "Thank you. Your account is now configured and ready for use."
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:228
+#: ../gtk/setupwizard.c:228
 msgid "Welcome to the account setup assistant"
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:232
+#: ../gtk/setupwizard.c:232
 msgid "Account setup assistant"
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:236
+#: ../gtk/setupwizard.c:236
 #, fuzzy
 msgid "Choosing a username"
 msgstr "Votre nom d'utilisateur"
 
-#: ../gtk-glade/setupwizard.c:240
+#: ../gtk/setupwizard.c:240
 msgid "Verifying"
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:244
+#: ../gtk/setupwizard.c:244
 #, fuzzy
 msgid "Confirmation"
 msgstr "Information sur le contact"
 
-#: ../gtk-glade/setupwizard.c:249
+#: ../gtk/setupwizard.c:249
 msgid "Creating your account"
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:253
+#: ../gtk/setupwizard.c:253
 msgid "Now ready !"
 msgstr ""
 
-#: ../gtk-glade/incall_view.c:113
+#: ../gtk/incall_view.c:113
+msgid "Transfer"
+msgstr ""
+
+#: ../gtk/incall_view.c:187
 #, fuzzy
 msgid "<b>Calling...</b>"
 msgstr "<b>Usage de l'IPv6</b>"
 
-#: ../gtk-glade/incall_view.c:116 ../gtk-glade/incall_view.c:138
+#: ../gtk/incall_view.c:190 ../gtk/incall_view.c:246
 msgid "00::00::00"
 msgstr ""
 
-#: ../gtk-glade/incall_view.c:136
+#: ../gtk/incall_view.c:206
 #, fuzzy
-msgid "<b>In call with</b>"
-msgstr "Raccrocher"
-
-#: ../gtk-glade/incall_view.c:154
-#, c-format
-msgid "%02i::%02i::%02i"
-msgstr ""
-
-#: ../gtk-glade/incall_view.c:170
-#, fuzzy
-msgid "<b>Call ended.</b>"
-msgstr "Appel terminĂŠ."
-
-#: ../gtk-glade/incall_view.c:188
-msgid "Unmute"
-msgstr ""
-
-#: ../gtk-glade/incall_view.c:195 ../gtk-glade/main.glade.h:43
-msgid "Mute"
-msgstr ""
-
-#: ../gtk-glade/loginframe.c:83
-#, fuzzy, c-format
-msgid "Please enter login information for %s"
-msgstr "Entrez votre mot de passe pour le domaine %s"
-
-#: ../gtk-glade/main.glade.h:1
-msgid "#"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:2
-msgid "*"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:3
-msgid "0"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:4
-msgid "1"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:5
-msgid "2"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:6
-msgid "3"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:7
-msgid "4"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:8
-msgid "5"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:9
-msgid "6"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:10
-msgid "7"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:11
-msgid "8"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:12
-msgid "9"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:13
-msgid "<b>Add contacts from directory</b>"
-msgstr "<b>Ajouter un contact depuis l'annuaire</b>"
-
-#: ../gtk-glade/main.glade.h:14
-msgid "<b>Contact list</b>"
-msgstr "<b>List de contacts</b>"
-
-#: ../gtk-glade/main.glade.h:15
-msgid "<b>Welcome !</b>"
-msgstr "<b>Bienvenue !</b>"
-
-#: ../gtk-glade/main.glade.h:16
-msgid "A"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:17
-msgid ""
-"ADSL\n"
-"Fiber Channel"
-msgstr ""
+msgid "<b>Incoming call</b>"
+msgstr "Appel entrant"
 
-#: ../gtk-glade/main.glade.h:19
+#: ../gtk/incall_view.c:216
 msgid ""
-"All users\n"
-"Online users"
-msgstr ""
-"Tous\n"
-"En ligne"
-
-#: ../gtk-glade/main.glade.h:21
-msgid "Assistant"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:22
-msgid "Audio & Video"
-msgstr "Audio et video"
-
-#: ../gtk-glade/main.glade.h:23
-msgid "Audio only"
-msgstr "Audio seul"
-
-#: ../gtk-glade/main.glade.h:24
-msgid "Automatically log me in"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:25
-msgid "B"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:26 ../gtk-glade/parameters.glade.h:21
-msgid "C"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:27
-msgid "Call Details"
-msgstr "Appel en cours"
-
-#: ../gtk-glade/main.glade.h:28 ../gtk-glade/call_logs.glade.h:1
-msgid "Call history"
-msgstr "Historique des appels"
-
-#: ../gtk-glade/main.glade.h:29
-msgid "Check for updates"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:30
-msgid "Contacts"
-msgstr "Contacts"
-
-#: ../gtk-glade/main.glade.h:31
-msgid "D"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:32
-msgid "Default"
-msgstr "Par dĂŠfaut"
-
-#: ../gtk-glade/main.glade.h:33
-msgid "Duration"
-msgstr "DurĂŠe"
-
-#: ../gtk-glade/main.glade.h:34
-msgid "Duration:"
-msgstr "DurĂŠe:"
-
-#: ../gtk-glade/main.glade.h:35
-msgid "Enable self-view"
-msgstr "Se voir"
-
-#: ../gtk-glade/main.glade.h:36
-msgid "Enter username, phone number, or full sip address"
+"Pause all calls\n"
+"and answer"
 msgstr ""
-"Entrez un nom d'utilisateur, un numĂŠro de tĂŠlĂŠphone, ou une addresse SIP"
-
-#: ../gtk-glade/main.glade.h:37
-msgid "Homepage"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:38
-msgid "In call"
-msgstr "Appel en cours"
 
-#: ../gtk-glade/main.glade.h:39
-msgid "Internet connection:"
+#: ../gtk/incall_view.c:217
+msgid "Answer"
 msgstr ""
 
-#: ../gtk-glade/main.glade.h:40
-msgid "Keypad"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:41
-msgid "Login information"
-msgstr "Info de login"
-
-#: ../gtk-glade/main.glade.h:42
-msgid "Lookup:"
-msgstr "Rechercher:"
-
-#: ../gtk-glade/main.glade.h:44
-msgid "My current identity:"
-msgstr "Mon identitĂŠ sip :"
-
-#: ../gtk-glade/main.glade.h:45
-msgid "Password"
-msgstr "Mot de passe"
-
-#: ../gtk-glade/main.glade.h:46
-msgid "SIP address or phone number:"
-msgstr "Addresse SIP ou numĂŠro"
-
-#: ../gtk-glade/main.glade.h:47
-msgid "Search"
-msgstr "Rechercher"
-
-#: ../gtk-glade/main.glade.h:48
-msgid "Show debug messages"
-msgstr "Montrer les messages de debug"
-
-#: ../gtk-glade/main.glade.h:49
-msgid "Start call"
-msgstr "DĂŠmarrer l'appel"
-
-#: ../gtk-glade/main.glade.h:50
-msgid "Terminate call"
+#: ../gtk/incall_view.c:244
+#, fuzzy
+msgid "<b>In call</b>"
 msgstr "Raccrocher"
 
-#: ../gtk-glade/main.glade.h:51
-msgid "Username"
-msgstr "Nom d'utilisateur"
-
-#: ../gtk-glade/main.glade.h:52
-msgid "_Linphone"
-msgstr "_Linphone"
-
-#: ../gtk-glade/main.glade.h:53
-msgid "_Modes"
-msgstr "_Modes"
-
-#: ../gtk-glade/main.glade.h:54
-msgid "in"
-msgstr "dans"
-
-#: ../gtk-glade/main.glade.h:55
-msgid "label"
-msgstr ""
-
-#: ../gtk-glade/about.glade.h:1
-msgid "About linphone"
-msgstr "A propos de linphone"
-
-#: ../gtk-glade/about.glade.h:2
-msgid "An internet video phone using the standard SIP (rfc3261) protocol."
-msgstr "Un visiophone pour l'internet, compatible SIP (rfc3261)"
-
-#: ../gtk-glade/about.glade.h:3
-msgid "Created by Simon Morlat\n"
-msgstr "CrĂŠĂŠ par Simon Morlat\n"
-
-#: ../gtk-glade/about.glade.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"
-msgstr ""
-
-#: ../gtk-glade/contact.glade.h:1
-msgid "<b>Contact information</b>"
-msgstr "<b>Information sur le contact</b>"
-
-#: ../gtk-glade/contact.glade.h:2
-msgid "Allow this contact to see my presence status"
-msgstr "Autoriser ce contact Ă  voir ma prĂŠsence"
-
-#: ../gtk-glade/contact.glade.h:4
-msgid "SIP Address"
-msgstr "Adresse SIP"
-
-#: ../gtk-glade/contact.glade.h:5
-msgid "Show this contact presence status"
-msgstr "Voir l'ĂŠtat de prĂŠsence de ce contact"
-
-#: ../gtk-glade/contact.glade.h:6 ../gtk-glade/password.glade.h:5
-#: ../gtk-glade/sip_account.glade.h:9
-msgid "gtk-cancel"
-msgstr ""
-
-#: ../gtk-glade/contact.glade.h:7 ../gtk-glade/password.glade.h:6
-#: ../gtk-glade/sip_account.glade.h:10
-msgid "gtk-ok"
-msgstr ""
-
-#: ../gtk-glade/log.glade.h:1
-msgid "Linphone debug window"
-msgstr "FenĂŞtre de dĂŠbogage de linphone"
-
-#: ../gtk-glade/log.glade.h:2 ../gtk-glade/call_logs.glade.h:2
-#: ../gtk-glade/chatroom.glade.h:2
-msgid "gtk-close"
-msgstr ""
-
-#: ../gtk-glade/password.glade.h:1
-msgid "Linphone - Authentication required"
-msgstr "Linphone - Autentification requise"
-
-#: ../gtk-glade/password.glade.h:2
-msgid "Password:"
-msgstr "Mot de passe:"
-
-#: ../gtk-glade/password.glade.h:3
-msgid "Please enter the domain password"
-msgstr "Entrez votre mot de passe pour le domaine"
-
-#: ../gtk-glade/password.glade.h:4
-msgid "UserID"
-msgstr ""
-
-#: ../gtk-glade/sip_account.glade.h:1
-msgid "Configure a SIP account"
-msgstr "Configuer un compte SIP"
-
-#: ../gtk-glade/sip_account.glade.h:2
-msgid "Linphone - Configure a SIP account"
-msgstr "Linphone - Configurer un compte SIP"
-
-#: ../gtk-glade/sip_account.glade.h:3
-msgid "Publish presence information"
-msgstr "Publier la prĂŠsence"
-
-#: ../gtk-glade/sip_account.glade.h:4
-msgid "Register at startup"
-msgstr "S'enregistrer au dĂŠmarrage"
-
-#: ../gtk-glade/sip_account.glade.h:5
-msgid "Registration duration (sec):"
-msgstr "PĂŠriode d'enregistrement (secondes):"
-
-#: ../gtk-glade/sip_account.glade.h:6
-msgid "Route (optional):"
-msgstr "Route (optionnel):"
-
-#: ../gtk-glade/sip_account.glade.h:7
-msgid "SIP Proxy address:"
-msgstr "Addresse du proxy SIP:"
-
-#: ../gtk-glade/sip_account.glade.h:8
-msgid "Your SIP identity:"
-msgstr "Votre identitĂŠ SIP:"
-
-#: ../gtk-glade/sip_account.glade.h:11
-msgid "sip:"
-msgstr ""
-
-#: ../gtk-glade/chatroom.glade.h:1
-msgid "Send"
-msgstr "Envoyer"
-
-#: ../gtk-glade/incoming_call.glade.h:1
-msgid "Accept"
-msgstr "Accepter"
-
-#: ../gtk-glade/incoming_call.glade.h:2
-msgid "Decline"
-msgstr "Refuser"
-
-#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:369
-msgid "Incoming call"
-msgstr "Appel entrant"
-
-#: ../gtk-glade/incoming_call.glade.h:4
-msgid "Incoming call from"
-msgstr "Appel entrant de"
-
-#: ../gtk-glade/incoming_call.glade.h:5
-msgid "Linphone - Incoming call"
-msgstr "Linphone - Appel entrant"
-
-#: ../gtk-glade/parameters.glade.h:1
-msgid "0 stands for \"unlimited\""
-msgstr "Indiquez 0 pour ne pas mettre de limite"
-
-#: ../gtk-glade/parameters.glade.h:2
-msgid "<b>Audio</b>"
-msgstr "<b>Son</b>"
-
-#: ../gtk-glade/parameters.glade.h:3
-msgid "<b>Bandwidth control</b>"
-msgstr "<b>Gestion de la bande passante</b>"
-
-#: ../gtk-glade/parameters.glade.h:4
-msgid "<b>Codecs</b>"
-msgstr "<b>Codecs</b>"
-
-#: ../gtk-glade/parameters.glade.h:5
-msgid "<b>Default identity</b>"
-msgstr "<b>IdentitĂŠ par dĂŠfaut</b>"
-
-#: ../gtk-glade/parameters.glade.h:6
-msgid "<b>Language</b>"
-msgstr "<b>Langue</b>"
-
-#: ../gtk-glade/parameters.glade.h:7
-msgid "<b>Level</b>"
-msgstr "<b>Niveau</b>"
-
-#: ../gtk-glade/parameters.glade.h:8
-msgid "<b>NAT and Firewall</b>"
-msgstr "<b>Paramètres liÊs au pare-feu</b>"
-
-#: ../gtk-glade/parameters.glade.h:9
-msgid "<b>Ports</b>"
-msgstr "<b>Ports utilisĂŠs</b>"
-
-#: ../gtk-glade/parameters.glade.h:10
-msgid "<b>Privacy</b>"
-msgstr "<b>SĂŠcuritĂŠ</b>"
-
-#: ../gtk-glade/parameters.glade.h:11
-msgid "<b>Proxy accounts</b>"
-msgstr "<b>Comptes SIP via des proxy</b>"
-
-#: ../gtk-glade/parameters.glade.h:12
-msgid "<b>Transport</b>"
-msgstr "<b>Transport</b>"
-
-#: ../gtk-glade/parameters.glade.h:13
-msgid "<b>Video</b>"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:14
-msgid "ALSA special device (optional):"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:15
-msgid "Add"
-msgstr "Ajouter"
-
-#: ../gtk-glade/parameters.glade.h:16
-msgid "Audio RTP/UDP:"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:17
-msgid ""
-"Audio codecs\n"
-"Video codecs"
-msgstr ""
-"Codecs audio\n"
-"Codecs video"
-
-#: ../gtk-glade/parameters.glade.h:19
-msgid "Behind NAT / Firewall (specify gateway IP below)"
-msgstr "Derrière un pare-feu (spÊcifier la passerelle ci dessous)"
-
-#: ../gtk-glade/parameters.glade.h:20
-msgid "Behind NAT / Firewall (use STUN to resolve)"
-msgstr "Derrière un pare-feu (utiliser STUN)"
-
-#: ../gtk-glade/parameters.glade.h:22
-msgid "CIF"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:23
-msgid "Capture device:"
-msgstr "PĂŠriphĂŠrique de capture:"
+#: ../gtk/incall_view.c:260
+#, fuzzy
+msgid "<b>Paused call</b>"
+msgstr "Raccrocher"
 
-#: ../gtk-glade/parameters.glade.h:24
-msgid "Codecs"
+#: ../gtk/incall_view.c:272
+#, c-format
+msgid "%02i::%02i::%02i"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:25
-msgid "Direct connection to the Internet"
-msgstr "Connection directe Ă  l'Internet"
-
-#: ../gtk-glade/parameters.glade.h:26
-msgid "Disable"
-msgstr "DĂŠsactive"
-
-#: ../gtk-glade/parameters.glade.h:27
-msgid "Done"
-msgstr "Fermer"
-
-#: ../gtk-glade/parameters.glade.h:28
-msgid "Download speed limit in Kbit/sec:"
-msgstr "Limite de dĂŠbit descendant en kbits/sec:"
-
-#: ../gtk-glade/parameters.glade.h:29
-msgid "Edit"
-msgstr "Editer"
-
-#: ../gtk-glade/parameters.glade.h:30
-msgid "Enable"
-msgstr "Active"
-
-#: ../gtk-glade/parameters.glade.h:31
-msgid "Enable echo cancellation"
-msgstr "Activer l'annulation d'ĂŠcho"
-
-#: ../gtk-glade/parameters.glade.h:32
-msgid "Erase all passwords"
-msgstr "Effacer tous les mots de passe"
-
-#: ../gtk-glade/parameters.glade.h:33
-msgid "Manage SIP Accounts"
-msgstr "GĂŠrer mes comptes SIP"
-
-#: ../gtk-glade/parameters.glade.h:34
-msgid "Multimedia settings"
-msgstr "Paramètres multimedia"
-
-#: ../gtk-glade/parameters.glade.h:35
-msgid "Network settings"
-msgstr "Paramètres rÊseau"
-
-#: ../gtk-glade/parameters.glade.h:36
-msgid "Playback device:"
-msgstr "PĂŠriphĂŠrique d'ĂŠcoute:"
-
-#: ../gtk-glade/parameters.glade.h:37
-msgid "Prefered video resolution:"
-msgstr "RĂŠsolution video prĂŠfĂŠrĂŠe:"
-
-#: ../gtk-glade/parameters.glade.h:38
-msgid "Public IP address:"
-msgstr "Addresse IP publique:"
+#: ../gtk/incall_view.c:288
+#, fuzzy
+msgid "<b>Call ended.</b>"
+msgstr "Appel terminĂŠ."
 
-#: ../gtk-glade/parameters.glade.h:39
-msgid ""
-"Register to FONICS\n"
-"virtual network !"
+#: ../gtk/incall_view.c:309
+msgid "Unmute"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:41
-msgid "Remove"
-msgstr "Enlever"
-
-#: ../gtk-glade/parameters.glade.h:42
-msgid "Ring device:"
-msgstr "PĂŠriphĂŠrique de sonnerie:"
-
-#: ../gtk-glade/parameters.glade.h:43
-msgid "Ring sound:"
-msgstr "Sonnerie:"
-
-#: ../gtk-glade/parameters.glade.h:44
-msgid "SIP (UDP):"
+#: ../gtk/incall_view.c:316
+msgid "Mute"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:45
-msgid "Send DTMFs as SIP info"
-msgstr "Envoyer les digits en tant que SIP INFO"
-
-#: ../gtk-glade/parameters.glade.h:46
-msgid "Set Maximum Transmission Unit:"
-msgstr "SpĂŠcifier la Maximum Transmission Unit"
-
-#: ../gtk-glade/parameters.glade.h:47
-msgid "Settings"
-msgstr "RĂŠglages"
-
-#: ../gtk-glade/parameters.glade.h:48
-msgid "Show advanced settings"
-msgstr "Montrer les rĂŠglages avancĂŠs"
-
-#: ../gtk-glade/parameters.glade.h:49
-msgid "Stun server:"
-msgstr "Serveur STUN:"
-
-#: ../gtk-glade/parameters.glade.h:50
-msgid "This section defines your SIP address when not using a SIP account"
+#: ../gtk/incall_view.c:340
+msgid "Resume"
 msgstr ""
-"Cette rubrique permet de dÊfinir son addresse SIP lorsqu'on ne possède pas "
-"de compte SIP"
-
-#: ../gtk-glade/parameters.glade.h:51
-msgid "Upload speed limit in Kbit/sec:"
-msgstr "Limite de dĂŠbit montant en kbits/sec:"
-
-#: ../gtk-glade/parameters.glade.h:52
-msgid "Use IPv6 instead of IPv4"
-msgstr "Utiliser l'IPv6 au lieu d'IPv4"
-
-#: ../gtk-glade/parameters.glade.h:53
-msgid "User interface"
-msgstr "Interface utilisateur"
 
-#: ../gtk-glade/parameters.glade.h:54
-msgid "Video RTP/UDP:"
+#: ../gtk/incall_view.c:347
+msgid "Pause"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:55
-msgid "Video input device:"
-msgstr "PĂŠriphĂŠrique d'entrĂŠe video"
-
-#: ../gtk-glade/parameters.glade.h:56
-msgid "Your display name (eg: John Doe):"
-msgstr "Votre nom d'affichage (ex: John Doe)"
-
-#: ../gtk-glade/parameters.glade.h:57
-msgid "Your resulting SIP address:"
-msgstr "Votre addresse SIP:"
-
-#: ../gtk-glade/parameters.glade.h:58
-msgid "Your username:"
-msgstr "Votre nom d'utilisateur:"
-
-#: ../gtk-glade/parameters.glade.h:59
-msgid "a sound card\n"
-msgstr "une carte son\n"
-
-#: ../gtk-glade/parameters.glade.h:61
-msgid "default camera"
-msgstr "camera par dĂŠfaut"
-
-#: ../gtk-glade/parameters.glade.h:62
-msgid "default soundcard"
-msgstr "Carte son par dĂŠfaut"
-
-#: ../gtk-glade/parameters.glade.h:63
-msgid "default soundcard\n"
-msgstr "Carte son par dĂŠfaut\n"
-
-#: ../gtk-glade/buddylookup.glade.h:1
-msgid "<b>Search somebody</b>"
-msgstr "<b>Rechercher une personne</b>"
-
-#: ../gtk-glade/buddylookup.glade.h:2
-msgid "Add to my list"
-msgstr "Ajouter Ă  ma liste"
-
-#: ../gtk-glade/buddylookup.glade.h:3
-msgid "Search contacts in directory"
-msgstr "Rechercher dans l'annuaire"
-
-#: ../gtk-glade/waiting.glade.h:1
-msgid "Linphone"
-msgstr "Linphone"
-
-#: ../gtk-glade/waiting.glade.h:2
-msgid "Please wait"
-msgstr "En attente"
+#: ../gtk/loginframe.c:93
+#, fuzzy, c-format
+msgid "Please enter login information for %s"
+msgstr "Entrez votre mot de passe pour le domaine %s"
 
-#: ../coreapi/linphonecore.c:311
+#: ../coreapi/linphonecore.c:166
 #, 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"
 
-#: ../coreapi/linphonecore.c:357
+#: ../coreapi/linphonecore.c:207
 msgid "aborted"
 msgstr "abandonnĂŠ"
 
-#: ../coreapi/linphonecore.c:360
+#: ../coreapi/linphonecore.c:210
 msgid "completed"
 msgstr "terminĂŠ"
 
-#: ../coreapi/linphonecore.c:363
+#: ../coreapi/linphonecore.c:213
 msgid "missed"
 msgstr "manquĂŠ"
 
-#: ../coreapi/linphonecore.c:368
+#: ../coreapi/linphonecore.c:218
 #, c-format
 msgid ""
 "%s at %s\n"
@@ -1035,11 +444,15 @@ msgstr ""
 "Etat: %s\n"
 "DurĂŠe: %i mn %i sec\n"
 
-#: ../coreapi/linphonecore.c:369
+#: ../coreapi/linphonecore.c:219
+msgid "Incoming call"
+msgstr "Appel entrant"
+
+#: ../coreapi/linphonecore.c:219
 msgid "Outgoing call"
 msgstr "Appel sortant"
 
-#: ../coreapi/linphonecore.c:626
+#: ../coreapi/linphonecore.c:501
 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"
@@ -1048,49 +461,72 @@ msgstr ""
 "utilise toujours de l'IPv4. Merci de mettre Ă  jour votre configuration si "
 "vous souhaitez utilisez un rĂŠseau IPv6."
 
-#: ../coreapi/linphonecore.c:1083
+#: ../coreapi/linphonecore.c:994
 msgid "Ready"
 msgstr "PrĂŞt."
 
-#: ../coreapi/linphonecore.c:1513
-msgid "Remote end seems to have disconnected, the call is going to be closed."
-msgstr "Votre correspondant a du se dĂŠconnecter, l'appel va ĂŞtre raccrochĂŠ."
-
-#: ../coreapi/linphonecore.c:1725
+#: ../coreapi/linphonecore.c:1768
 msgid "Looking for telephone number destination..."
 msgstr "Recherche de la destination du numĂŠro de tĂŠlĂŠphone..."
 
-#: ../coreapi/linphonecore.c:1727
+#: ../coreapi/linphonecore.c:1771
 msgid "Could not resolve this number."
 msgstr "La destination n'a pu ĂŞtre trouvĂŠe."
 
-#: ../coreapi/linphonecore.c:1771
+#: ../coreapi/linphonecore.c:1815
 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>"
 
-#: ../coreapi/linphonecore.c:1912
+#: ../coreapi/linphonecore.c:1962
 msgid "Contacting"
 msgstr "Appel de"
 
-#: ../coreapi/linphonecore.c:1918
-msgid "could not call"
+#: ../coreapi/linphonecore.c:1969
+#, fuzzy
+msgid "Could not call"
 msgstr "Echec"
 
-#: ../coreapi/linphonecore.c:1965
-msgid "Sorry, having multiple simultaneous calls is not supported yet !"
-msgstr "DĂŠsolĂŠ, vous ne pouvez appeler plusieurs personnes simultanĂŠment !"
+#: ../coreapi/linphonecore.c:2076
+msgid "Sorry, you have to pause or stop the current call first !"
+msgstr ""
+
+#: ../coreapi/linphonecore.c:2081
+msgid "Sorry, we have reached the maximum number of simultaneous calls"
+msgstr ""
+
+#: ../coreapi/linphonecore.c:2205
+msgid "Modifying call parameters..."
+msgstr ""
 
-#: ../coreapi/linphonecore.c:2370 ../coreapi/callbacks.c:32
+#: ../coreapi/linphonecore.c:2308
 msgid "Connected."
 msgstr "En ligne."
 
-#: ../coreapi/linphonecore.c:2404
+#: ../coreapi/linphonecore.c:2331
+#, fuzzy
+msgid "Call aborted"
+msgstr "abandonnĂŠ"
+
+#: ../coreapi/linphonecore.c:2371
 msgid "Call ended"
 msgstr "Appel terminĂŠ."
 
+#: ../coreapi/linphonecore.c:2453
+#, fuzzy
+msgid "Could not pause the call"
+msgstr "Echec"
+
+#: ../coreapi/linphonecore.c:2457
+msgid "Pausing the current call..."
+msgstr ""
+
+#: ../coreapi/linphonecore.c:2496
+msgid "There is already a call in process, pause or stop it first."
+msgstr ""
+
 #: ../coreapi/misc.c:147
 msgid ""
 "Your computer appears to be using ALSA sound drivers.\n"
@@ -1116,7 +552,7 @@ msgstr ""
 "a besoin. Veuillez s'il vous plait executer la commande\n"
 "'modprobe snd-mixer-oss' en tant que root afin de le charger."
 
-#: ../coreapi/misc.c:497
+#: ../coreapi/misc.c:520
 msgid "Stun lookup in progress..."
 msgstr "DĂŠcouverte STUN en cours"
 
@@ -1168,7 +604,7 @@ msgstr "En attente"
 msgid "Unknown-bug"
 msgstr "Bug inconnu"
 
-#: ../coreapi/proxy.c:176
+#: ../coreapi/proxy.c:187
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
@@ -1176,7 +612,7 @@ msgstr ""
 "L'addresse SIP du proxy est invalide. Elle doit commencer par \"sip:\" "
 "suivie par un nom de domaine."
 
-#: ../coreapi/proxy.c:182
+#: ../coreapi/proxy.c:193
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
@@ -1185,94 +621,132 @@ msgstr ""
 "Elle doit ĂŞtre de la forme sip:username@domain, comme par example sip:"
 "alice@example.net"
 
-#: ../coreapi/proxy.c:621
+#: ../coreapi/proxy.c:670
 #, c-format
 msgid "Could not login as %s"
 msgstr "Echec de la connexion en tant que %s"
 
-#: ../coreapi/callbacks.c:95
+#: ../coreapi/callbacks.c:170
 msgid "is contacting you"
 msgstr "vous appelle"
 
-#: ../coreapi/callbacks.c:96
+#: ../coreapi/callbacks.c:171
 msgid " and asked autoanswer."
 msgstr "et sollicite un dĂŠcrochage automatique."
 
-#: ../coreapi/callbacks.c:96
+#: ../coreapi/callbacks.c:171
 msgid "."
 msgstr ""
 
-#: ../coreapi/callbacks.c:120
+#: ../coreapi/callbacks.c:226
 msgid "Remote ringing."
 msgstr "Sonnerie distante."
 
-#: ../coreapi/callbacks.c:139
+#: ../coreapi/callbacks.c:251
 msgid "Early media."
 msgstr "Prise d'appel anticipĂŠe"
 
-#: ../coreapi/callbacks.c:248
+#: ../coreapi/callbacks.c:289
+#, fuzzy, c-format
+msgid "Call with %s is paused."
+msgstr "Appel avec %s"
+
+#: ../coreapi/callbacks.c:300
+#, c-format
+msgid "Call answered by %s - on hold."
+msgstr ""
+
+#: ../coreapi/callbacks.c:315
+#, fuzzy
+msgid "Call resumed."
+msgstr "Appel terminĂŠ."
+
+#: ../coreapi/callbacks.c:320
+#, c-format
+msgid "Call answered by %s."
+msgstr ""
+
+#: ../coreapi/callbacks.c:381
+msgid "We are being paused..."
+msgstr ""
+
+#: ../coreapi/callbacks.c:385
+msgid "We have been resumed..."
+msgstr ""
+
+#: ../coreapi/callbacks.c:422
 msgid "Call terminated."
 msgstr "Appel terminĂŠ."
 
-#: ../coreapi/callbacks.c:265
+#: ../coreapi/callbacks.c:429
 msgid "User is busy."
 msgstr "OccupĂŠ..."
 
-#: ../coreapi/callbacks.c:266
+#: ../coreapi/callbacks.c:430
 msgid "User is temporarily unavailable."
 msgstr "L'usager est temporairement indisponible."
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:268
+#: ../coreapi/callbacks.c:432
 msgid "User does not want to be disturbed."
 msgstr "L'usager ne souhaite pas ĂŞtre dĂŠrangĂŠ"
 
-#: ../coreapi/callbacks.c:269
+#: ../coreapi/callbacks.c:433
 msgid "Call declined."
 msgstr "Appel dĂŠclinĂŠ."
 
-#: ../coreapi/callbacks.c:281
+#: ../coreapi/callbacks.c:445
 msgid "No response."
 msgstr "Pas de rĂŠponse."
 
-#: ../coreapi/callbacks.c:284
+#: ../coreapi/callbacks.c:449
 msgid "Protocol error."
 msgstr ""
 
-#: ../coreapi/callbacks.c:298
+#: ../coreapi/callbacks.c:465
 msgid "Redirected"
 msgstr "Redirection"
 
-#: ../coreapi/callbacks.c:308
+#: ../coreapi/callbacks.c:475
 msgid "Not found"
 msgstr "Non trouvĂŠ"
 
-#: ../coreapi/callbacks.c:318
+#: ../coreapi/callbacks.c:485
 msgid "No common codecs"
 msgstr "Pas de codecs commun"
 
-#: ../coreapi/callbacks.c:324
+#: ../coreapi/callbacks.c:491
 msgid "Call failed."
 msgstr "L'appel a ĂŠchouĂŠ."
 
-#: ../coreapi/callbacks.c:374
+#: ../coreapi/callbacks.c:527
+#, fuzzy
+msgid "Authentication failure"
+msgstr "Linphone - Autentification requise"
+
+#: ../coreapi/callbacks.c:553
 #, c-format
 msgid "Registration on %s successful."
 msgstr "Enregistrement sur %s effectuĂŠ."
 
-#: ../coreapi/callbacks.c:375
+#: ../coreapi/callbacks.c:554
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "DĂŠsenregistrement sur %s effectuĂŠ."
 
-#: ../coreapi/callbacks.c:383
+#: ../coreapi/callbacks.c:570
+msgid "no response timeout"
+msgstr "Pas de rĂŠponse"
+
+#: ../coreapi/callbacks.c:573
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "Echec de l'enregistrement sur %s: %s"
 
-#: ../coreapi/callbacks.c:383
-msgid "no response timeout"
-msgstr "Pas de rĂŠponse"
+#: ../coreapi/callbacks.c:615
+#, c-format
+msgid "We are transferred to %s"
+msgstr ""
 
 #: ../mediastreamer2/src/alaw.c:144 ../mediastreamer2/src/alaw.c:162
 msgid "ITU-G.711 alaw encoder"
@@ -1282,11 +756,11 @@ msgstr ""
 msgid "ITU-G.711 alaw decoder"
 msgstr ""
 
-#: ../mediastreamer2/src/alsa.c:935
+#: ../mediastreamer2/src/alsa.c:950
 msgid "Alsa sound source"
 msgstr "Source alsa"
 
-#: ../mediastreamer2/src/alsa.c:1039
+#: ../mediastreamer2/src/alsa.c:1054
 msgid "Alsa sound output"
 msgstr "Sortie alsa"
 
@@ -1298,15 +772,15 @@ msgstr ""
 msgid "Sound playback filter for MacOS X Audio Queue Service"
 msgstr ""
 
-#: ../mediastreamer2/src/dtmfgen.c:173 ../mediastreamer2/src/dtmfgen.c:191
+#: ../mediastreamer2/src/dtmfgen.c:274 ../mediastreamer2/src/dtmfgen.c:293
 msgid "DTMF generator"
 msgstr ""
 
-#: ../mediastreamer2/src/gsm.c:111 ../mediastreamer2/src/gsm.c:129
+#: ../mediastreamer2/src/gsm.c:120 ../mediastreamer2/src/gsm.c:138
 msgid "The GSM full-rate codec"
 msgstr "Le codec GSM full-rate"
 
-#: ../mediastreamer2/src/gsm.c:178 ../mediastreamer2/src/gsm.c:196
+#: ../mediastreamer2/src/gsm.c:187 ../mediastreamer2/src/gsm.c:205
 msgid "The GSM codec"
 msgstr "Le codec GSM"
 
@@ -1322,8 +796,8 @@ msgstr ""
 msgid "A filter to make conferencing"
 msgstr ""
 
-#: ../mediastreamer2/src/msfileplayer.c:295
-#: ../mediastreamer2/src/msfileplayer.c:313
+#: ../mediastreamer2/src/msfileplayer.c:311
+#: ../mediastreamer2/src/msfileplayer.c:329
 msgid "Raw files and wav reader"
 msgstr ""
 
@@ -1337,61 +811,53 @@ msgstr ""
 msgid "A filter that send several inputs to one output."
 msgstr ""
 
-#: ../mediastreamer2/src/msresample.c:221
-#: ../mediastreamer2/src/msresample.c:239
-msgid "frequency resampler"
+#: ../mediastreamer2/src/msresample.c:159
+#: ../mediastreamer2/src/msresample.c:177
+msgid "Audio resampler"
 msgstr ""
 
-#: ../mediastreamer2/src/msrtp.c:358 ../mediastreamer2/src/msrtp.c:376
+#: ../mediastreamer2/src/msrtp.c:369 ../mediastreamer2/src/msrtp.c:387
 msgid "RTP output filter"
 msgstr ""
 
-#: ../mediastreamer2/src/msrtp.c:493 ../mediastreamer2/src/msrtp.c:511
+#: ../mediastreamer2/src/msrtp.c:505 ../mediastreamer2/src/msrtp.c:523
 msgid "RTP input filter"
 msgstr ""
 
-#: ../mediastreamer2/src/msspeex.c:359 ../mediastreamer2/src/msspeex.c:377
-#: ../mediastreamer2/src/msspeex.c:504 ../mediastreamer2/src/msspeex.c:522
+#: ../mediastreamer2/src/msspeex.c:360 ../mediastreamer2/src/msspeex.c:378
+#: ../mediastreamer2/src/msspeex.c:548 ../mediastreamer2/src/msspeex.c:567
 msgid "The free and wonderful speex codec"
 msgstr "Le codec speex, libre et performant"
 
-#: ../mediastreamer2/src/msvolume.c:415 ../mediastreamer2/src/msvolume.c:430
+#: ../mediastreamer2/src/msvolume.c:527 ../mediastreamer2/src/msvolume.c:542
 msgid "A filter that controls and measure sound volume"
 msgstr ""
 
-#: ../mediastreamer2/src/msv4l.c:1011
+#: ../mediastreamer2/src/msv4l.c:1012
 msgid "A video4linux compatible source filter to stream pictures."
 msgstr ""
 
-#: ../mediastreamer2/src/msv4l2.c:470
+#: ../mediastreamer2/src/msv4l2.c:554
 msgid "A filter to grab pictures from Video4Linux2-powered cameras"
 msgstr ""
 
-#: ../mediastreamer2/src/nowebcam.c:1836
+#: ../mediastreamer2/src/nowebcam.c:1854
 msgid "A filter that outputs a static image."
 msgstr ""
 
-#: ../mediastreamer2/src/oss.c:567
-msgid "Sound capture filter for OSS drivers"
-msgstr ""
-
-#: ../mediastreamer2/src/oss.c:581
-msgid "Sound playback filter for OSS drivers"
-msgstr ""
-
-#: ../mediastreamer2/src/pixconv.c:177 ../mediastreamer2/src/pixconv.c:195
+#: ../mediastreamer2/src/pixconv.c:129 ../mediastreamer2/src/pixconv.c:147
 msgid "A pixel format converter"
 msgstr ""
 
-#: ../mediastreamer2/src/sizeconv.c:204
+#: ../mediastreamer2/src/sizeconv.c:202
 msgid "A video size converter"
 msgstr ""
 
-#: ../mediastreamer2/src/sizeconv.c:222
+#: ../mediastreamer2/src/sizeconv.c:220
 msgid "a small video size converter"
 msgstr ""
 
-#: ../mediastreamer2/src/speexec.c:349 ../mediastreamer2/src/speexec.c:367
+#: ../mediastreamer2/src/speexec.c:276 ../mediastreamer2/src/speexec.c:294
 msgid "Echo canceller using speex library"
 msgstr ""
 
@@ -1419,55 +885,55 @@ msgstr ""
 msgid "ITU-G.711 ulaw decoder"
 msgstr ""
 
-#: ../mediastreamer2/src/videodec.c:669 ../mediastreamer2/src/videodec.c:685
-#: ../mediastreamer2/src/videodec.c:768 ../mediastreamer2/src/videodec.c:784
+#: ../mediastreamer2/src/videodec.c:713 ../mediastreamer2/src/videodec.c:729
+#: ../mediastreamer2/src/videodec.c:812 ../mediastreamer2/src/videodec.c:828
 msgid "A H.263 decoder using ffmpeg library"
 msgstr ""
 
-#: ../mediastreamer2/src/videodec.c:702
+#: ../mediastreamer2/src/videodec.c:746
 msgid "A MPEG4 decoder using ffmpeg library"
 msgstr ""
 
-#: ../mediastreamer2/src/videodec.c:718
+#: ../mediastreamer2/src/videodec.c:762
 msgid "A RTP/JPEG decoder using ffmpeg library"
 msgstr ""
 
-#: ../mediastreamer2/src/videodec.c:734
+#: ../mediastreamer2/src/videodec.c:778
 msgid "A MJPEG decoder using ffmpeg library"
 msgstr ""
 
-#: ../mediastreamer2/src/videodec.c:750
+#: ../mediastreamer2/src/videodec.c:794
 msgid "A snow decoder using ffmpeg library"
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:861 ../mediastreamer2/src/videoenc.c:943
+#: ../mediastreamer2/src/videoenc.c:908 ../mediastreamer2/src/videoenc.c:990
 msgid "A video H.263 encoder using ffmpeg library."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:877
+#: ../mediastreamer2/src/videoenc.c:924
 msgid ""
 "A video H.263 encoder using ffmpeg library. It is compliant with old RFC2190 "
 "spec."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:893 ../mediastreamer2/src/videoenc.c:975
+#: ../mediastreamer2/src/videoenc.c:940 ../mediastreamer2/src/videoenc.c:1022
 msgid "A video MPEG4 encoder using ffmpeg library."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:909
+#: ../mediastreamer2/src/videoenc.c:956
 msgid "A video snow encoder using ffmpeg library."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:925
+#: ../mediastreamer2/src/videoenc.c:972
 msgid "A RTP/MJPEG encoder using ffmpeg library."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:959
+#: ../mediastreamer2/src/videoenc.c:1006
 msgid ""
 "A video H.263 encoder using ffmpeg library, compliant with old RFC2190 spec."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:991
+#: ../mediastreamer2/src/videoenc.c:1038
 msgid ""
 "The snow codec is royalty-free and is open-source. \n"
 "It uses innovative techniques that makes it one of most promising video "
@@ -1476,12 +942,12 @@ msgid ""
 "versions cannot be guaranteed."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:1011
+#: ../mediastreamer2/src/videoenc.c:1058
 msgid "A MJPEG encoder using ffmpeg library."
 msgstr ""
 
-#: ../mediastreamer2/src/videoout.c:1812 ../mediastreamer2/src/videoout.c:1830
-msgid "A generic video display"
+#: ../mediastreamer2/src/videoout.c:933
+msgid "A SDL-based video display"
 msgstr ""
 
 #: ../mediastreamer2/src/wincevideods.c:969
@@ -1508,9 +974,404 @@ msgstr ""
 msgid "Parametric sound equalizer."
 msgstr ""
 
-#: ../mediastreamer2/src/msdscap-mingw.cc:1003
+#: ../mediastreamer2/src/msdscap-mingw.cc:1038
 msgid "A webcam grabber based on directshow."
 msgstr ""
 
+#: ../mediastreamer2/src/drawdib-display.c:552
+#: ../mediastreamer2/src/drawdib-display.c:570
+msgid "A video display based on windows DrawDib api"
+msgstr ""
+
+#: ../mediastreamer2/src/audiomixer.c:192
+#: ../mediastreamer2/src/audiomixer.c:211
+msgid "A filter that mixes down 16 bit sample audio streams"
+msgstr ""
+
+#: ../mediastreamer2/src/chanadapt.c:110 ../mediastreamer2/src/chanadapt.c:128
+msgid "A filter that converts from mono to stereo and vice versa."
+msgstr ""
+
+#: ../mediastreamer2/src/itc.c:97 ../mediastreamer2/src/itc.c:115
+#: ../mediastreamer2/src/itc.c:197 ../mediastreamer2/src/itc.c:215
+msgid "Inter ticker communication filter."
+msgstr ""
+
+#: ../mediastreamer2/src/extdisplay.c:62 ../mediastreamer2/src/extdisplay.c:79
+msgid "A display filter sending the buffers to draw to the upper layer"
+msgstr ""
+
+#: ../mediastreamer2/src/msiounit.c:619
+msgid "Sound capture filter for MacOS X Audio Unit Service"
+msgstr ""
+
+#: ../mediastreamer2/src/msiounit.c:633
+msgid "Sound playback filter for MacOS X Audio Unit Service"
+msgstr ""
+
+#: ../mediastreamer2/src/x11video.c:562
+msgid "A video display using X11+Xv"
+msgstr ""
+
+#. .id=
+#. .name=
+#. .text=
+#: ../mediastreamer2/src/msandroid.cpp:370
+msgid "Sound capture filter for Android"
+msgstr ""
+
+#. .id=
+#. .name=
+#. .text=
+#: ../mediastreamer2/src/msandroid.cpp:667
+msgid "Sound playback filter for Android"
+msgstr ""
+
+#: ../mediastreamer2/src/msandroidvideo.cpp:134
+msgid "A filter that captures Android video."
+msgstr ""
+
+#~ msgid "Incoming call from %s"
+#~ msgstr "Appel entrant de %s"
+
+#~ msgid "<b>Add contacts from directory</b>"
+#~ msgstr "<b>Ajouter un contact depuis l'annuaire</b>"
+
+#~ msgid "<b>Contact list</b>"
+#~ msgstr "<b>List de contacts</b>"
+
+#~ msgid "<b>Welcome !</b>"
+#~ msgstr "<b>Bienvenue !</b>"
+
+#~ msgid ""
+#~ "All users\n"
+#~ "Online users"
+#~ msgstr ""
+#~ "Tous\n"
+#~ "En ligne"
+
+#~ msgid "Audio & Video"
+#~ msgstr "Audio et video"
+
+#~ msgid "Audio only"
+#~ msgstr "Audio seul"
+
+#~ msgid "Call Details"
+#~ msgstr "Appel en cours"
+
+#~ msgid "Call history"
+#~ msgstr "Historique des appels"
+
+#~ msgid "Contacts"
+#~ msgstr "Contacts"
+
+#~ msgid "Default"
+#~ msgstr "Par dĂŠfaut"
+
+#~ msgid "Duration"
+#~ msgstr "DurĂŠe"
+
+#~ msgid "Duration:"
+#~ msgstr "DurĂŠe:"
+
+#~ msgid "Enable self-view"
+#~ msgstr "Se voir"
+
+#~ msgid "Enter username, phone number, or full sip address"
+#~ msgstr ""
+#~ "Entrez un nom d'utilisateur, un numĂŠro de tĂŠlĂŠphone, ou une addresse SIP"
+
+#~ msgid "In call"
+#~ msgstr "Appel en cours"
+
+#~ msgid "Login information"
+#~ msgstr "Info de login"
+
+#~ msgid "Lookup:"
+#~ msgstr "Rechercher:"
+
+#~ msgid "My current identity:"
+#~ msgstr "Mon identitĂŠ sip :"
+
+#~ msgid "Password"
+#~ msgstr "Mot de passe"
+
+#~ msgid "SIP address or phone number:"
+#~ msgstr "Addresse SIP ou numĂŠro"
+
+#~ msgid "Search"
+#~ msgstr "Rechercher"
+
+#~ msgid "Show debug messages"
+#~ msgstr "Montrer les messages de debug"
+
+#~ msgid "Start call"
+#~ msgstr "DĂŠmarrer l'appel"
+
+#~ msgid "Terminate call"
+#~ msgstr "Raccrocher"
+
+#~ msgid "Username"
+#~ msgstr "Nom d'utilisateur"
+
+#~ msgid "_Linphone"
+#~ msgstr "_Linphone"
+
+#~ msgid "_Modes"
+#~ msgstr "_Modes"
+
+#~ msgid "in"
+#~ msgstr "dans"
+
+#~ msgid "About linphone"
+#~ msgstr "A propos de linphone"
+
+#~ msgid "An internet video phone using the standard SIP (rfc3261) protocol."
+#~ msgstr "Un visiophone pour l'internet, compatible SIP (rfc3261)"
+
+#~ msgid "Created by Simon Morlat\n"
+#~ msgstr "CrĂŠĂŠ par Simon Morlat\n"
+
+#~ msgid "<b>Contact information</b>"
+#~ msgstr "<b>Information sur le contact</b>"
+
+#~ msgid "Allow this contact to see my presence status"
+#~ msgstr "Autoriser ce contact Ă  voir ma prĂŠsence"
+
+#~ msgid "SIP Address"
+#~ msgstr "Adresse SIP"
+
+#~ msgid "Show this contact presence status"
+#~ msgstr "Voir l'ĂŠtat de prĂŠsence de ce contact"
+
+#~ msgid "Linphone debug window"
+#~ msgstr "FenĂŞtre de dĂŠbogage de linphone"
+
+#~ msgid "Password:"
+#~ msgstr "Mot de passe:"
+
+#~ msgid "Please enter the domain password"
+#~ msgstr "Entrez votre mot de passe pour le domaine"
+
+#~ msgid "Configure a SIP account"
+#~ msgstr "Configuer un compte SIP"
+
+#~ msgid "Linphone - Configure a SIP account"
+#~ msgstr "Linphone - Configurer un compte SIP"
+
+#~ msgid "Publish presence information"
+#~ msgstr "Publier la prĂŠsence"
+
+#~ msgid "Register at startup"
+#~ msgstr "S'enregistrer au dĂŠmarrage"
+
+#~ msgid "Registration duration (sec):"
+#~ msgstr "PĂŠriode d'enregistrement (secondes):"
+
+#~ msgid "Route (optional):"
+#~ msgstr "Route (optionnel):"
+
+#~ msgid "SIP Proxy address:"
+#~ msgstr "Addresse du proxy SIP:"
+
+#~ msgid "Your SIP identity:"
+#~ msgstr "Votre identitĂŠ SIP:"
+
+#~ msgid "Send"
+#~ msgstr "Envoyer"
+
+#~ msgid "Accept"
+#~ msgstr "Accepter"
+
+#~ msgid "Decline"
+#~ msgstr "Refuser"
+
+#~ msgid "Incoming call from"
+#~ msgstr "Appel entrant de"
+
+#~ msgid "Linphone - Incoming call"
+#~ msgstr "Linphone - Appel entrant"
+
+#~ msgid "0 stands for \"unlimited\""
+#~ msgstr "Indiquez 0 pour ne pas mettre de limite"
+
+#~ msgid "<b>Audio</b>"
+#~ msgstr "<b>Son</b>"
+
+#~ msgid "<b>Bandwidth control</b>"
+#~ msgstr "<b>Gestion de la bande passante</b>"
+
+#~ msgid "<b>Codecs</b>"
+#~ msgstr "<b>Codecs</b>"
+
+#~ msgid "<b>Default identity</b>"
+#~ msgstr "<b>IdentitĂŠ par dĂŠfaut</b>"
+
+#~ msgid "<b>Language</b>"
+#~ msgstr "<b>Langue</b>"
+
+#~ msgid "<b>Level</b>"
+#~ msgstr "<b>Niveau</b>"
+
+#~ msgid "<b>NAT and Firewall</b>"
+#~ msgstr "<b>Paramètres liÊs au pare-feu</b>"
+
+#~ msgid "<b>Ports</b>"
+#~ msgstr "<b>Ports utilisĂŠs</b>"
+
+#~ msgid "<b>Privacy</b>"
+#~ msgstr "<b>SĂŠcuritĂŠ</b>"
+
+#~ msgid "<b>Proxy accounts</b>"
+#~ msgstr "<b>Comptes SIP via des proxy</b>"
+
+#~ msgid "<b>Transport</b>"
+#~ msgstr "<b>Transport</b>"
+
+#~ msgid "Add"
+#~ msgstr "Ajouter"
+
+#~ msgid ""
+#~ "Audio codecs\n"
+#~ "Video codecs"
+#~ msgstr ""
+#~ "Codecs audio\n"
+#~ "Codecs video"
+
+#~ msgid "Behind NAT / Firewall (specify gateway IP below)"
+#~ msgstr "Derrière un pare-feu (spÊcifier la passerelle ci dessous)"
+
+#~ msgid "Behind NAT / Firewall (use STUN to resolve)"
+#~ msgstr "Derrière un pare-feu (utiliser STUN)"
+
+#~ msgid "Capture device:"
+#~ msgstr "PĂŠriphĂŠrique de capture:"
+
+#~ msgid "Direct connection to the Internet"
+#~ msgstr "Connection directe Ă  l'Internet"
+
+#~ msgid "Disable"
+#~ msgstr "DĂŠsactive"
+
+#~ msgid "Done"
+#~ msgstr "Fermer"
+
+#~ msgid "Download speed limit in Kbit/sec:"
+#~ msgstr "Limite de dĂŠbit descendant en kbits/sec:"
+
+#~ msgid "Edit"
+#~ msgstr "Editer"
+
+#~ msgid "Enable"
+#~ msgstr "Active"
+
+#~ msgid "Enable echo cancellation"
+#~ msgstr "Activer l'annulation d'ĂŠcho"
+
+#~ msgid "Erase all passwords"
+#~ msgstr "Effacer tous les mots de passe"
+
+#~ msgid "Manage SIP Accounts"
+#~ msgstr "GĂŠrer mes comptes SIP"
+
+#~ msgid "Multimedia settings"
+#~ msgstr "Paramètres multimedia"
+
+#~ msgid "Network settings"
+#~ msgstr "Paramètres rÊseau"
+
+#~ msgid "Playback device:"
+#~ msgstr "PĂŠriphĂŠrique d'ĂŠcoute:"
+
+#~ msgid "Prefered video resolution:"
+#~ msgstr "RĂŠsolution video prĂŠfĂŠrĂŠe:"
+
+#~ msgid "Public IP address:"
+#~ msgstr "Addresse IP publique:"
+
+#~ msgid "Remove"
+#~ msgstr "Enlever"
+
+#~ msgid "Ring device:"
+#~ msgstr "PĂŠriphĂŠrique de sonnerie:"
+
+#~ msgid "Ring sound:"
+#~ msgstr "Sonnerie:"
+
+#~ msgid "Send DTMFs as SIP info"
+#~ msgstr "Envoyer les digits en tant que SIP INFO"
+
+#~ msgid "Set Maximum Transmission Unit:"
+#~ msgstr "SpĂŠcifier la Maximum Transmission Unit"
+
+#~ msgid "Settings"
+#~ msgstr "RĂŠglages"
+
+#~ msgid "Show advanced settings"
+#~ msgstr "Montrer les rĂŠglages avancĂŠs"
+
+#~ msgid "Stun server:"
+#~ msgstr "Serveur STUN:"
+
+#~ msgid "This section defines your SIP address when not using a SIP account"
+#~ msgstr ""
+#~ "Cette rubrique permet de dÊfinir son addresse SIP lorsqu'on ne possède "
+#~ "pas de compte SIP"
+
+#~ msgid "Upload speed limit in Kbit/sec:"
+#~ msgstr "Limite de dĂŠbit montant en kbits/sec:"
+
+#~ msgid "Use IPv6 instead of IPv4"
+#~ msgstr "Utiliser l'IPv6 au lieu d'IPv4"
+
+#~ msgid "User interface"
+#~ msgstr "Interface utilisateur"
+
+#~ msgid "Video input device:"
+#~ msgstr "PĂŠriphĂŠrique d'entrĂŠe video"
+
+#~ msgid "Your display name (eg: John Doe):"
+#~ msgstr "Votre nom d'affichage (ex: John Doe)"
+
+#~ msgid "Your resulting SIP address:"
+#~ msgstr "Votre addresse SIP:"
+
+#~ msgid "Your username:"
+#~ msgstr "Votre nom d'utilisateur:"
+
+#~ msgid "a sound card\n"
+#~ msgstr "une carte son\n"
+
+#~ msgid "default camera"
+#~ msgstr "camera par dĂŠfaut"
+
+#~ msgid "default soundcard"
+#~ msgstr "Carte son par dĂŠfaut"
+
+#~ msgid "default soundcard\n"
+#~ msgstr "Carte son par dĂŠfaut\n"
+
+#~ msgid "<b>Search somebody</b>"
+#~ msgstr "<b>Rechercher une personne</b>"
+
+#~ msgid "Add to my list"
+#~ msgstr "Ajouter Ă  ma liste"
+
+#~ msgid "Search contacts in directory"
+#~ msgstr "Rechercher dans l'annuaire"
+
+#~ msgid "Linphone"
+#~ msgstr "Linphone"
+
+#~ msgid "Please wait"
+#~ msgstr "En attente"
+
+#~ msgid ""
+#~ "Remote end seems to have disconnected, the call is going to be closed."
+#~ msgstr "Votre correspondant a du se dĂŠconnecter, l'appel va ĂŞtre raccrochĂŠ."
+
+#~ msgid "Sorry, having multiple simultaneous calls is not supported yet !"
+#~ msgstr "DĂŠsolĂŠ, vous ne pouvez appeler plusieurs personnes simultanĂŠment !"
+
 #~ msgid "Error."
 #~ msgstr "Erreur."
diff --git a/po/hu.po b/po/hu.po
index 8e2e1c15290ac16a158bfa0ffe1ad7c65b4deb25..5519a9b191b8c1a2cb73102289f4731d80c44d47 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,58 +7,53 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 17:16+0200\n"
+"POT-Creation-Date: 2011-02-07 10:59+0100\n"
 "PO-Revision-Date: 2007-12-14 11:12+0100\n"
 "Last-Translator: \n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../gtk-glade/support.c:49 ../gtk-glade/support.c:73
-#: ../gtk-glade/support.c:102
+#: ../gtk/support.c:49 ../gtk/support.c:73 ../gtk/support.c:102
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "NemtalĂĄlhatĂł a pixmap fĂĄjl: %s"
 
-#: ../gtk-glade/chat.c:27
+#: ../gtk/chat.c:27
 #, c-format
 msgid "Chat with %s"
 msgstr "Chat-elĂŠs %s -el"
 
-#: ../gtk-glade/main.c:94
+#: ../gtk/main.c:74
 msgid "log to stdout some debug information while running."
 msgstr ""
 
-#: ../gtk-glade/main.c:101
+#: ../gtk/main.c:81
 msgid "Start only in the system tray, do not show the main interface."
 msgstr ""
 
-#: ../gtk-glade/main.c:108
+#: ../gtk/main.c:88
 msgid "address to call right now"
 msgstr ""
 
-#: ../gtk-glade/main.c:115
+#: ../gtk/main.c:95
 msgid "if set automatically answer incoming calls"
 msgstr ""
 
-#: ../gtk-glade/main.c:123
+#: ../gtk/main.c:103
 msgid ""
 "Specifiy a working directory (should be the base of the installation, eg: c:"
 "\\Program Files\\Linphone)"
 msgstr ""
 
-#: ../gtk-glade/main.c:402
+#: ../gtk/main.c:479
 #, fuzzy, c-format
 msgid "Call with %s"
 msgstr "Chat-elĂŠs %s -el"
 
-#: ../gtk-glade/main.c:720
-#, fuzzy, c-format
-msgid "Incoming call from %s"
-msgstr "Beérkező hívás"
-
-#: ../gtk-glade/main.c:759
+#: ../gtk/main.c:862
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
@@ -67,1009 +62,375 @@ msgid ""
 "If you answer no, this person will be temporarily blacklisted."
 msgstr ""
 
-#: ../gtk-glade/main.c:837
+#: ../gtk/main.c:940
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at domain <i>%s</i>:"
 msgstr ""
 
-#: ../gtk-glade/main.c:934
+#: ../gtk/main.c:1076
 msgid "Website link"
 msgstr ""
 
-#: ../gtk-glade/main.c:970
+#: ../gtk/main.c:1112
 msgid "Linphone - a video internet phone"
 msgstr ""
 
-#: ../gtk-glade/main.c:989
+#: ../gtk/main.c:1131
 #, c-format
 msgid "%s (Default)"
 msgstr ""
 
-#: ../gtk-glade/main.c:1221
+#: ../gtk/main.c:1382
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
 msgstr ""
 
-#: ../gtk-glade/main.c:1275
+#: ../gtk/main.c:1441
 msgid "A free SIP video-phone"
 msgstr "Egy ingyenes SIP video-telefon"
 
-#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:258
-#: ../gtk-glade/contact.glade.h:3
+#: ../gtk/friendlist.c:192 ../gtk/propertybox.c:271
 msgid "Name"
 msgstr "NĂŠv"
 
-#: ../gtk-glade/friendlist.c:205
+#: ../gtk/friendlist.c:205
 msgid "Presence status"
 msgstr "JelenlĂŠt stĂĄtusz"
 
-#: ../gtk-glade/friendlist.c:242
+#: ../gtk/friendlist.c:242
 #, c-format
 msgid "Search in %s directory"
 msgstr ""
 
-#: ../gtk-glade/friendlist.c:450
+#: ../gtk/friendlist.c:450
 msgid "Invalid sip contact !"
 msgstr ""
 
-#: ../gtk-glade/friendlist.c:492
+#: ../gtk/friendlist.c:495
 #, fuzzy, c-format
 msgid "Call %s"
 msgstr "Hivás előzmények"
 
-#: ../gtk-glade/friendlist.c:493
+#: ../gtk/friendlist.c:496
 #, c-format
 msgid "Send text to %s"
 msgstr ""
 
-#: ../gtk-glade/friendlist.c:494
+#: ../gtk/friendlist.c:497
 #, fuzzy, c-format
 msgid "Edit contact '%s'"
 msgstr "KapcsolatinformĂĄciĂłk szerkesztĂŠse"
 
-#: ../gtk-glade/friendlist.c:495
+#: ../gtk/friendlist.c:498
 #, c-format
 msgid "Delete contact '%s'"
 msgstr ""
 
-#: ../gtk-glade/friendlist.c:537
+#: ../gtk/friendlist.c:540
 #, c-format
 msgid "Add new contact from %s directory"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:264
+#: ../gtk/propertybox.c:277
 msgid "Rate (Hz)"
 msgstr "Érték (Hz)"
 
-#: ../gtk-glade/propertybox.c:270
+#: ../gtk/propertybox.c:283
 msgid "Status"
 msgstr "Állapot"
 
-#: ../gtk-glade/propertybox.c:276
+#: ../gtk/propertybox.c:289
 msgid "Min bitrate (kbit/s)"
 msgstr "Min bitrate (kbit/s)"
 
-#: ../gtk-glade/propertybox.c:283
+#: ../gtk/propertybox.c:296
 msgid "Parameters"
 msgstr "ParamĂŠterek"
 
-#: ../gtk-glade/propertybox.c:312 ../gtk-glade/propertybox.c:451
+#: ../gtk/propertybox.c:325 ../gtk/propertybox.c:464
 msgid "Enabled"
 msgstr "EngedĂŠlyezve"
 
-#: ../gtk-glade/propertybox.c:313 ../gtk-glade/propertybox.c:451
+#: ../gtk/propertybox.c:326 ../gtk/propertybox.c:464
 msgid "Disabled"
 msgstr "Tiltva"
 
-#: ../gtk-glade/propertybox.c:496
+#: ../gtk/propertybox.c:509
 msgid "Account"
 msgstr "HozzĂĄfĂŠrĂŠs"
 
-#: ../gtk-glade/propertybox.c:636
+#: ../gtk/propertybox.c:649
 msgid "English"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:637
+#: ../gtk/propertybox.c:650
 msgid "French"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:638
+#: ../gtk/propertybox.c:651
 msgid "Swedish"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:639
+#: ../gtk/propertybox.c:652
 msgid "Italian"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:640
+#: ../gtk/propertybox.c:653
 msgid "Spanish"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:641
+#: ../gtk/propertybox.c:654
 msgid "Brazilian Portugese"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:642
+#: ../gtk/propertybox.c:655
 msgid "Polish"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:643
+#: ../gtk/propertybox.c:656
 msgid "German"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:644
+#: ../gtk/propertybox.c:657
 msgid "Russian"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:645
+#: ../gtk/propertybox.c:658
 msgid "Japanese"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:646
+#: ../gtk/propertybox.c:659
 msgid "Dutch"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:647
+#: ../gtk/propertybox.c:660
 msgid "Hungarian"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:648
+#: ../gtk/propertybox.c:661
 msgid "Czech"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:649
+#: ../gtk/propertybox.c:662
 msgid "Chinese"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:706
+#: ../gtk/propertybox.c:719
 msgid ""
 "You need to restart linphone for the new language selection to take effect."
 msgstr ""
 
-#: ../gtk-glade/update.c:80
+#: ../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-glade/update.c:91
+#: ../gtk/update.c:91
 msgid "You are running the lastest version."
 msgstr ""
 
-#: ../gtk-glade/buddylookup.c:85
+#: ../gtk/buddylookup.c:85
 msgid "Firstname, Lastname"
 msgstr ""
 
-#: ../gtk-glade/buddylookup.c:160
+#: ../gtk/buddylookup.c:160
 msgid "Error communicating with server."
 msgstr ""
 
-#: ../gtk-glade/buddylookup.c:164
+#: ../gtk/buddylookup.c:164
 #, fuzzy
 msgid "Connecting..."
 msgstr "KapcsolĂłdĂĄs"
 
-#: ../gtk-glade/buddylookup.c:168
+#: ../gtk/buddylookup.c:168
 #, fuzzy
 msgid "Connected"
 msgstr "KapcsolĂłdva."
 
-#: ../gtk-glade/buddylookup.c:172
+#: ../gtk/buddylookup.c:172
 msgid "Receiving data..."
 msgstr ""
 
-#: ../gtk-glade/buddylookup.c:180
+#: ../gtk/buddylookup.c:180
 #, c-format
 msgid "Found %i contact"
 msgid_plural "Found %i contacts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gtk-glade/setupwizard.c:25
+#: ../gtk/setupwizard.c:25
 msgid ""
 "Welcome !\n"
 "This assistant will help you to use a SIP account for your calls."
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:34
+#: ../gtk/setupwizard.c:34
 msgid "Create an account by choosing a username"
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:35
+#: ../gtk/setupwizard.c:35
 msgid "I have already an account and just want to use it"
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:53
+#: ../gtk/setupwizard.c:53
 msgid "Please choose a username:"
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:54
+#: ../gtk/setupwizard.c:54
 #, fuzzy
 msgid "Username:"
 msgstr "felhasznĂĄlĂłnĂŠv:"
 
-#: ../gtk-glade/setupwizard.c:92
+#: ../gtk/setupwizard.c:92
 #, c-format
 msgid "Checking if '%s' is available..."
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:97 ../gtk-glade/setupwizard.c:164
+#: ../gtk/setupwizard.c:97 ../gtk/setupwizard.c:164
 msgid "Please wait..."
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:101
+#: ../gtk/setupwizard.c:101
 msgid "Sorry this username already exists. Please try a new one."
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:103 ../gtk-glade/setupwizard.c:168
+#: ../gtk/setupwizard.c:103 ../gtk/setupwizard.c:168
 msgid "Ok !"
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:106 ../gtk-glade/setupwizard.c:171
+#: ../gtk/setupwizard.c:106 ../gtk/setupwizard.c:171
 msgid "Communication problem, please try again later."
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:134
+#: ../gtk/setupwizard.c:134
 msgid "Thank you. Your account is now configured and ready for use."
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:228
+#: ../gtk/setupwizard.c:228
 msgid "Welcome to the account setup assistant"
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:232
+#: ../gtk/setupwizard.c:232
 msgid "Account setup assistant"
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:236
+#: ../gtk/setupwizard.c:236
 #, fuzzy
 msgid "Choosing a username"
 msgstr "felhasznĂĄlĂłnĂŠv:"
 
-#: ../gtk-glade/setupwizard.c:240
+#: ../gtk/setupwizard.c:240
 msgid "Verifying"
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:244
+#: ../gtk/setupwizard.c:244
 #, fuzzy
 msgid "Confirmation"
 msgstr "InformĂĄciĂłk"
 
-#: ../gtk-glade/setupwizard.c:249
+#: ../gtk/setupwizard.c:249
 msgid "Creating your account"
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:253
+#: ../gtk/setupwizard.c:253
 msgid "Now ready !"
 msgstr ""
 
-#: ../gtk-glade/incall_view.c:113
-#, fuzzy
-msgid "<b>Calling...</b>"
-msgstr "Kapcsolatilista"
-
-#: ../gtk-glade/incall_view.c:116 ../gtk-glade/incall_view.c:138
-msgid "00::00::00"
-msgstr ""
-
-#: ../gtk-glade/incall_view.c:136
-#, fuzzy
-msgid "<b>In call with</b>"
-msgstr "Kapcsolatilista"
-
-#: ../gtk-glade/incall_view.c:154
-#, c-format
-msgid "%02i::%02i::%02i"
-msgstr ""
-
-#: ../gtk-glade/incall_view.c:170
-#, fuzzy
-msgid "<b>Call ended.</b>"
-msgstr "HĂ­vĂĄs vĂŠge"
-
-#: ../gtk-glade/incall_view.c:188
-#, fuzzy
-msgid "Unmute"
-msgstr "KorlĂĄtlan"
-
-#: ../gtk-glade/incall_view.c:195 ../gtk-glade/main.glade.h:43
-msgid "Mute"
-msgstr ""
-
-#: ../gtk-glade/loginframe.c:83
-#, c-format
-msgid "Please enter login information for %s"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:1
-msgid "#"
-msgstr "#"
-
-#: ../gtk-glade/main.glade.h:2
-msgid "*"
-msgstr "*"
-
-#: ../gtk-glade/main.glade.h:3
-msgid "0"
-msgstr "0"
-
-#: ../gtk-glade/main.glade.h:4
-msgid "1"
-msgstr "1"
-
-#: ../gtk-glade/main.glade.h:5
-msgid "2"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:6
-msgid "3"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:7
-msgid "4"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:8
-msgid "5"
-msgstr "5"
-
-#: ../gtk-glade/main.glade.h:9
-msgid "6"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:10
-msgid "7"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:11
-msgid "8"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:12
-msgid "9"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:13
-#, fuzzy
-msgid "<b>Add contacts from directory</b>"
-msgstr "KapcsolatiinformĂĄciĂł"
-
-#: ../gtk-glade/main.glade.h:14
-#, fuzzy
-msgid "<b>Contact list</b>"
-msgstr "Kapcsolatilista"
-
-#: ../gtk-glade/main.glade.h:15
-#, fuzzy
-msgid "<b>Welcome !</b>"
-msgstr "Kapcsolatilista"
-
-#: ../gtk-glade/main.glade.h:16
-msgid "A"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:17
-msgid ""
-"ADSL\n"
-"Fiber Channel"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:19
-msgid ""
-"All users\n"
-"Online users"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:21
-msgid "Assistant"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:22
-#, fuzzy
-msgid "Audio & Video"
-msgstr "Audio kodekek"
-
-#: ../gtk-glade/main.glade.h:23
-#, fuzzy
-msgid "Audio only"
-msgstr "Audio kodekek"
-
-#: ../gtk-glade/main.glade.h:24
-#, fuzzy
-msgid "Automatically log me in"
-msgstr "Automatikus valĂłs hostnĂŠv megĂĄllapĂ­tĂĄsa"
-
-#: ../gtk-glade/main.glade.h:25
-msgid "B"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:26 ../gtk-glade/parameters.glade.h:21
-msgid "C"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:27
-#, fuzzy
-msgid "Call Details"
-msgstr "Hivás előzmények"
-
-#: ../gtk-glade/main.glade.h:28 ../gtk-glade/call_logs.glade.h:1
-#, fuzzy
-msgid "Call history"
-msgstr "Linphone - Híváselőzmények"
-
-#: ../gtk-glade/main.glade.h:29
-msgid "Check for updates"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:30
-#, fuzzy
-msgid "Contacts"
-msgstr "KapcsolĂłdĂĄs"
-
-#: ../gtk-glade/main.glade.h:31
-msgid "D"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:32
-msgid "Default"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:33
-#, fuzzy
-msgid "Duration"
-msgstr "InformĂĄciĂłk"
-
-#: ../gtk-glade/main.glade.h:34
-#, fuzzy
-msgid "Duration:"
-msgstr "InformĂĄciĂłk"
-
-#: ../gtk-glade/main.glade.h:35
-#, fuzzy
-msgid "Enable self-view"
-msgstr "Video engedĂŠlyezĂŠs"
-
-#: ../gtk-glade/main.glade.h:36
-msgid "Enter username, phone number, or full sip address"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:37
-msgid "Homepage"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:38
-#, fuzzy
-msgid "In call"
-msgstr "Beérkező hívás"
-
-#: ../gtk-glade/main.glade.h:39
-msgid "Internet connection:"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:40
-msgid "Keypad"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:41
-#, fuzzy
-msgid "Login information"
-msgstr "KapcsolatiinformĂĄciĂł"
-
-#: ../gtk-glade/main.glade.h:42
-msgid "Lookup:"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:44
-#, fuzzy
-msgid "My current identity:"
-msgstr "SIP azonosĂ­tĂł:"
-
-#: ../gtk-glade/main.glade.h:45
-#, fuzzy
-msgid "Password"
-msgstr "jelszĂł:"
-
-#: ../gtk-glade/main.glade.h:46
-#, fuzzy
-msgid "SIP address or phone number:"
-msgstr "GĂŠpeld ide a sip cĂ­met vagy a telefonszĂĄmot"
-
-#: ../gtk-glade/main.glade.h:47
-msgid "Search"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:48
-msgid "Show debug messages"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:49
-msgid "Start call"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:50
-msgid "Terminate call"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:51
-#, fuzzy
-msgid "Username"
-msgstr "felhasznĂĄlĂłnĂŠv:"
-
-#: ../gtk-glade/main.glade.h:52
-#, fuzzy
-msgid "_Linphone"
-msgstr "Linphone"
-
-#: ../gtk-glade/main.glade.h:53
-#, fuzzy
-msgid "_Modes"
-msgstr "Kodekek"
-
-#: ../gtk-glade/main.glade.h:54
-msgid "in"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:55
-msgid "label"
-msgstr ""
-
-#: ../gtk-glade/about.glade.h:1
-#, fuzzy
-msgid "About linphone"
-msgstr "linphone"
-
-#: ../gtk-glade/about.glade.h:2
-msgid "An internet video phone using the standard SIP (rfc3261) protocol."
-msgstr ""
-
-#: ../gtk-glade/about.glade.h:3
-msgid "Created by Simon Morlat\n"
-msgstr ""
-
-#: ../gtk-glade/about.glade.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"
-msgstr ""
-
-#: ../gtk-glade/contact.glade.h:1
-#, fuzzy
-msgid "<b>Contact information</b>"
-msgstr "KapcsolatiinformĂĄciĂł"
-
-#: ../gtk-glade/contact.glade.h:2
-msgid "Allow this contact to see my presence status"
-msgstr ""
-
-#: ../gtk-glade/contact.glade.h:4
-#, fuzzy
-msgid "SIP Address"
-msgstr "Sip cĂ­m:"
-
-#: ../gtk-glade/contact.glade.h:5
-msgid "Show this contact presence status"
-msgstr ""
-
-#: ../gtk-glade/contact.glade.h:6 ../gtk-glade/password.glade.h:5
-#: ../gtk-glade/sip_account.glade.h:9
-msgid "gtk-cancel"
-msgstr ""
-
-#: ../gtk-glade/contact.glade.h:7 ../gtk-glade/password.glade.h:6
-#: ../gtk-glade/sip_account.glade.h:10
-msgid "gtk-ok"
-msgstr ""
-
-#: ../gtk-glade/log.glade.h:1
-msgid "Linphone debug window"
-msgstr ""
-
-#: ../gtk-glade/log.glade.h:2 ../gtk-glade/call_logs.glade.h:2
-#: ../gtk-glade/chatroom.glade.h:2
-msgid "gtk-close"
-msgstr ""
-
-#: ../gtk-glade/password.glade.h:1
-#, fuzzy
-msgid "Linphone - Authentication required"
-msgstr "HitelesĂ­tĂŠst kĂŠrtek"
-
-#: ../gtk-glade/password.glade.h:2
-#, fuzzy
-msgid "Password:"
-msgstr "jelszĂł:"
-
-#: ../gtk-glade/password.glade.h:3
-msgid "Please enter the domain password"
-msgstr ""
-
-#: ../gtk-glade/password.glade.h:4
-msgid "UserID"
-msgstr ""
-
-#: ../gtk-glade/sip_account.glade.h:1
-msgid "Configure a SIP account"
-msgstr ""
-
-#: ../gtk-glade/sip_account.glade.h:2
-msgid "Linphone - Configure a SIP account"
-msgstr ""
-
-#: ../gtk-glade/sip_account.glade.h:3
-#, fuzzy
-msgid "Publish presence information"
-msgstr "JelenlĂŠti informĂĄciĂł kĂśzlĂŠse:"
-
-#: ../gtk-glade/sip_account.glade.h:4
-msgid "Register at startup"
-msgstr ""
-
-#: ../gtk-glade/sip_account.glade.h:5
-#, fuzzy
-msgid "Registration duration (sec):"
-msgstr "Regisztrálási Időköz:"
-
-#: ../gtk-glade/sip_account.glade.h:6
-msgid "Route (optional):"
-msgstr "Út (nem kötelező):"
-
-#: ../gtk-glade/sip_account.glade.h:7
-#, fuzzy
-msgid "SIP Proxy address:"
-msgstr "SIP Proxy:"
-
-#: ../gtk-glade/sip_account.glade.h:8
-#, fuzzy
-msgid "Your SIP identity:"
-msgstr "SIP azonosĂ­tĂł:"
-
-#: ../gtk-glade/sip_account.glade.h:11
-msgid "sip:"
-msgstr "sip:"
-
-#: ../gtk-glade/chatroom.glade.h:1
-#, fuzzy
-msgid "Send"
-msgstr "Hang"
-
-#: ../gtk-glade/incoming_call.glade.h:1
-msgid "Accept"
-msgstr "Elfogad"
-
-#: ../gtk-glade/incoming_call.glade.h:2
-#, fuzzy
-msgid "Decline"
-msgstr "line"
-
-#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:369
-msgid "Incoming call"
-msgstr "Beérkező hívás"
-
-#: ../gtk-glade/incoming_call.glade.h:4
-#, fuzzy
-msgid "Incoming call from"
-msgstr "Beérkező hívás"
-
-#: ../gtk-glade/incoming_call.glade.h:5
-#, fuzzy
-msgid "Linphone - Incoming call"
-msgstr "Beérkező hívás"
-
-#: ../gtk-glade/parameters.glade.h:1
-msgid "0 stands for \"unlimited\""
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:2
-#, fuzzy
-msgid "<b>Audio</b>"
-msgstr "Kapcsolatilista"
-
-#: ../gtk-glade/parameters.glade.h:3
-msgid "<b>Bandwidth control</b>"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:4
-#, fuzzy
-msgid "<b>Codecs</b>"
-msgstr "Kapcsolatilista"
-
-#: ../gtk-glade/parameters.glade.h:5
-msgid "<b>Default identity</b>"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:6
-msgid "<b>Language</b>"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:7
-#, fuzzy
-msgid "<b>Level</b>"
-msgstr "Kapcsolatilista"
-
-#: ../gtk-glade/parameters.glade.h:8
-msgid "<b>NAT and Firewall</b>"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:9
-#, fuzzy
-msgid "<b>Ports</b>"
-msgstr "Kapcsolatilista"
-
-#: ../gtk-glade/parameters.glade.h:10
-msgid "<b>Privacy</b>"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:11
-#, fuzzy
-msgid "<b>Proxy accounts</b>"
-msgstr "Kapcsolatilista"
-
-#: ../gtk-glade/parameters.glade.h:12
-#, fuzzy
-msgid "<b>Transport</b>"
-msgstr "Kapcsolatilista"
-
-#: ../gtk-glade/parameters.glade.h:13
-msgid "<b>Video</b>"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:14
-msgid "ALSA special device (optional):"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:15
-msgid "Add"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:16
-msgid "Audio RTP/UDP:"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:17
-#, fuzzy
-msgid ""
-"Audio codecs\n"
-"Video codecs"
-msgstr "Audio ĂŠs video kodekek"
-
-#: ../gtk-glade/parameters.glade.h:19
-msgid "Behind NAT / Firewall (specify gateway IP below)"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:20
-msgid "Behind NAT / Firewall (use STUN to resolve)"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:22
-msgid "CIF"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:23
-#, fuzzy
-msgid "Capture device:"
-msgstr "Felvevő hang eszköz:"
-
-#: ../gtk-glade/parameters.glade.h:24
-#, fuzzy
-msgid "Codecs"
-msgstr "Kodekek"
-
-#: ../gtk-glade/parameters.glade.h:25
-msgid "Direct connection to the Internet"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:26
-msgid "Disable"
-msgstr "TiltĂĄs"
-
-#: ../gtk-glade/parameters.glade.h:27
-#, fuzzy
-msgid "Done"
-msgstr "ElveszĂ­tve"
-
-#: ../gtk-glade/parameters.glade.h:28
-#, fuzzy
-msgid "Download speed limit in Kbit/sec:"
-msgstr "LetĂśltĂŠsi sĂĄvszĂŠlessĂŠg (kbit/sec):"
-
-#: ../gtk-glade/parameters.glade.h:29
-msgid "Edit"
-msgstr "SzerkesztĂŠs"
-
-#: ../gtk-glade/parameters.glade.h:30
-msgid "Enable"
-msgstr "EngedĂŠlyezĂŠs"
-
-#: ../gtk-glade/parameters.glade.h:31
-msgid "Enable echo cancellation"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:32
-msgid "Erase all passwords"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:33
-msgid "Manage SIP Accounts"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:34
-msgid "Multimedia settings"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:35
-#, fuzzy
-msgid "Network settings"
-msgstr "HĂĄlĂłzat"
-
-#: ../gtk-glade/parameters.glade.h:36
-#, fuzzy
-msgid "Playback device:"
-msgstr "LejĂĄtszĂł hang eszkĂśz:"
-
-#: ../gtk-glade/parameters.glade.h:37
-msgid "Prefered video resolution:"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:38
-#, fuzzy
-msgid "Public IP address:"
-msgstr "Sip cĂ­m:"
-
-#: ../gtk-glade/parameters.glade.h:39
-msgid ""
-"Register to FONICS\n"
-"virtual network !"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:41
-msgid "Remove"
-msgstr "EltĂĄvolĂ­tĂĄs"
-
-#: ../gtk-glade/parameters.glade.h:42
-#, fuzzy
-msgid "Ring device:"
-msgstr "Csengőhang forrás:"
-
-#: ../gtk-glade/parameters.glade.h:43
-#, fuzzy
-msgid "Ring sound:"
-msgstr "Csengőhang:"
-
-#: ../gtk-glade/parameters.glade.h:44
-msgid "SIP (UDP):"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:45
-msgid "Send DTMFs as SIP info"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:46
-msgid "Set Maximum Transmission Unit:"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:47
-msgid "Settings"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:48
-msgid "Show advanced settings"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:49
-#, fuzzy
-msgid "Stun server:"
-msgstr "Hang eszkĂśz"
-
-#: ../gtk-glade/parameters.glade.h:50
-msgid "This section defines your SIP address when not using a SIP account"
+#: ../gtk/incall_view.c:113
+msgid "Transfer"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:51
+#: ../gtk/incall_view.c:187
 #, fuzzy
-msgid "Upload speed limit in Kbit/sec:"
-msgstr "FeltĂśltĂŠsi sĂĄvszĂŠlessĂŠg (kbit/sec):"
+msgid "<b>Calling...</b>"
+msgstr "Kapcsolatilista"
 
-#: ../gtk-glade/parameters.glade.h:52
-msgid "Use IPv6 instead of IPv4"
+#: ../gtk/incall_view.c:190 ../gtk/incall_view.c:246
+msgid "00::00::00"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:53
+#: ../gtk/incall_view.c:206
 #, fuzzy
-msgid "User interface"
-msgstr "felhasznĂĄlĂłnĂŠv:"
+msgid "<b>Incoming call</b>"
+msgstr "Beérkező hívás"
 
-#: ../gtk-glade/parameters.glade.h:54
-msgid "Video RTP/UDP:"
+#: ../gtk/incall_view.c:216
+msgid ""
+"Pause all calls\n"
+"and answer"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:55
-#, fuzzy
-msgid "Video input device:"
-msgstr "Hang eszkĂśz"
-
-#: ../gtk-glade/parameters.glade.h:56
-msgid "Your display name (eg: John Doe):"
+#: ../gtk/incall_view.c:217
+msgid "Answer"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:57
+#: ../gtk/incall_view.c:244
 #, fuzzy
-msgid "Your resulting SIP address:"
-msgstr "SajĂĄt sip cĂ­m:"
+msgid "<b>In call</b>"
+msgstr "Kapcsolatilista"
 
-#: ../gtk-glade/parameters.glade.h:58
+#: ../gtk/incall_view.c:260
 #, fuzzy
-msgid "Your username:"
-msgstr "felhasznĂĄlĂłnĂŠv:"
-
-#: ../gtk-glade/parameters.glade.h:59
-msgid "a sound card\n"
-msgstr ""
+msgid "<b>Paused call</b>"
+msgstr "Kapcsolatilista"
 
-#: ../gtk-glade/parameters.glade.h:61
-msgid "default camera"
+#: ../gtk/incall_view.c:272
+#, c-format
+msgid "%02i::%02i::%02i"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:62
-msgid "default soundcard"
-msgstr ""
+#: ../gtk/incall_view.c:288
+#, fuzzy
+msgid "<b>Call ended.</b>"
+msgstr "HĂ­vĂĄs vĂŠge"
 
-#: ../gtk-glade/parameters.glade.h:63
-msgid "default soundcard\n"
-msgstr ""
+#: ../gtk/incall_view.c:309
+#, fuzzy
+msgid "Unmute"
+msgstr "KorlĂĄtlan"
 
-#: ../gtk-glade/buddylookup.glade.h:1
-msgid "<b>Search somebody</b>"
+#: ../gtk/incall_view.c:316
+msgid "Mute"
 msgstr ""
 
-#: ../gtk-glade/buddylookup.glade.h:2
-msgid "Add to my list"
+#: ../gtk/incall_view.c:340
+msgid "Resume"
 msgstr ""
 
-#: ../gtk-glade/buddylookup.glade.h:3
-msgid "Search contacts in directory"
+#: ../gtk/incall_view.c:347
+msgid "Pause"
 msgstr ""
 
-#: ../gtk-glade/waiting.glade.h:1
-msgid "Linphone"
-msgstr "Linphone"
-
-#: ../gtk-glade/waiting.glade.h:2
-msgid "Please wait"
+#: ../gtk/loginframe.c:93
+#, c-format
+msgid "Please enter login information for %s"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:311
+#: ../coreapi/linphonecore.c:166
 #, fuzzy, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
 msgstr[0] "Van %i elhibĂĄzott hivĂĄs."
 msgstr[1] "Van %i elhibĂĄzott hivĂĄs."
 
-#: ../coreapi/linphonecore.c:357
+#: ../coreapi/linphonecore.c:207
 msgid "aborted"
 msgstr "megszakĂ­tva"
 
-#: ../coreapi/linphonecore.c:360
+#: ../coreapi/linphonecore.c:210
 msgid "completed"
 msgstr "befejezve"
 
-#: ../coreapi/linphonecore.c:363
+#: ../coreapi/linphonecore.c:213
 msgid "missed"
 msgstr "elhibĂĄzva"
 
-#: ../coreapi/linphonecore.c:368
+#: ../coreapi/linphonecore.c:218
 #, c-format
 msgid ""
 "%s at %s\n"
@@ -1084,11 +445,15 @@ msgstr ""
 "Állapot: %s\n"
 "Időtartam: %i perc %i másodperc\n"
 
-#: ../coreapi/linphonecore.c:369
+#: ../coreapi/linphonecore.c:219
+msgid "Incoming call"
+msgstr "Beérkező hívás"
+
+#: ../coreapi/linphonecore.c:219
 msgid "Outgoing call"
 msgstr "Kimenő hívás"
 
-#: ../coreapi/linphonecore.c:626
+#: ../coreapi/linphonecore.c:501
 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"
@@ -1097,49 +462,73 @@ msgstr ""
 "mindig az IPv4-et hasznĂĄlja. FrissĂ­tsd a konfigurĂĄciĂłdat, ha hasznĂĄlni "
 "akarod az IPv6-ot"
 
-#: ../coreapi/linphonecore.c:1083
+#: ../coreapi/linphonecore.c:994
 msgid "Ready"
 msgstr "KĂŠsz"
 
-#: ../coreapi/linphonecore.c:1513
-msgid "Remote end seems to have disconnected, the call is going to be closed."
-msgstr ""
-
-#: ../coreapi/linphonecore.c:1725
+#: ../coreapi/linphonecore.c:1768
 msgid "Looking for telephone number destination..."
 msgstr "TelefonszĂĄm-cĂŠl keresĂŠse..."
 
-#: ../coreapi/linphonecore.c:1727
+#: ../coreapi/linphonecore.c:1771
 msgid "Could not resolve this number."
 msgstr "Nem sikkerĂźlt ĂŠrtelmezni a szĂĄmot."
 
-#: ../coreapi/linphonecore.c:1771
+#: ../coreapi/linphonecore.c:1815
 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"
 
-#: ../coreapi/linphonecore.c:1912
+#: ../coreapi/linphonecore.c:1962
 msgid "Contacting"
 msgstr "KapcsolĂłdĂĄs"
 
-#: ../coreapi/linphonecore.c:1918
-msgid "could not call"
+#: ../coreapi/linphonecore.c:1969
+#, fuzzy
+msgid "Could not call"
 msgstr "nem sikerĂźlt hĂ­vni"
 
-#: ../coreapi/linphonecore.c:1965
-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!"
+#: ../coreapi/linphonecore.c:2076
+msgid "Sorry, you have to pause or stop the current call first !"
+msgstr ""
+
+#: ../coreapi/linphonecore.c:2081
+msgid "Sorry, we have reached the maximum number of simultaneous calls"
+msgstr ""
+
+#: ../coreapi/linphonecore.c:2205
+msgid "Modifying call parameters..."
+msgstr ""
 
-#: ../coreapi/linphonecore.c:2370 ../coreapi/callbacks.c:32
+#: ../coreapi/linphonecore.c:2308
 msgid "Connected."
 msgstr "KapcsolĂłdva."
 
-#: ../coreapi/linphonecore.c:2404
+#: ../coreapi/linphonecore.c:2331
+#, fuzzy
+msgid "Call aborted"
+msgstr "megszakĂ­tva"
+
+#: ../coreapi/linphonecore.c:2371
 msgid "Call ended"
 msgstr "HĂ­vĂĄs vĂŠge"
 
+#: ../coreapi/linphonecore.c:2453
+#, fuzzy
+msgid "Could not pause the call"
+msgstr "nem sikerĂźlt hĂ­vni"
+
+#: ../coreapi/linphonecore.c:2457
+#, fuzzy
+msgid "Pausing the current call..."
+msgstr "nem sikerĂźlt hĂ­vni"
+
+#: ../coreapi/linphonecore.c:2496
+msgid "There is already a call in process, pause or stop it first."
+msgstr ""
+
 #: ../coreapi/misc.c:147
 msgid ""
 "Your computer appears to be using ALSA sound drivers.\n"
@@ -1164,7 +553,7 @@ msgstr ""
 " a linphone-nak szĂźksĂŠge van ĂŠs ez hiĂĄnyzik. KĂŠrem futassa le a\n"
 "'modprobe snd-pcm-oss' parancsot rendszergazdakĂŠnt."
 
-#: ../coreapi/misc.c:497
+#: ../coreapi/misc.c:520
 msgid "Stun lookup in progress..."
 msgstr "Stun keresĂŠs folyamatban..."
 
@@ -1221,111 +610,151 @@ msgstr ""
 msgid "Unknown-bug"
 msgstr ""
 
-#: ../coreapi/proxy.c:176
+#: ../coreapi/proxy.c:187
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
 msgstr ""
 
-#: ../coreapi/proxy.c:182
+#: ../coreapi/proxy.c:193
 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:621
+#: ../coreapi/proxy.c:670
 #, fuzzy, c-format
 msgid "Could not login as %s"
 msgstr "NemtalĂĄlhatĂł a pixmap fĂĄjl: %s"
 
-#: ../coreapi/callbacks.c:95
+#: ../coreapi/callbacks.c:170
 #, fuzzy
 msgid "is contacting you"
 msgstr "kapcsolatba lĂŠp veled."
 
-#: ../coreapi/callbacks.c:96
+#: ../coreapi/callbacks.c:171
 msgid " and asked autoanswer."
 msgstr ""
 
-#: ../coreapi/callbacks.c:96
+#: ../coreapi/callbacks.c:171
 msgid "."
 msgstr ""
 
-#: ../coreapi/callbacks.c:120
+#: ../coreapi/callbacks.c:226
 #, fuzzy
 msgid "Remote ringing."
 msgstr "TĂĄvoli szolgĂĄltatĂĄsok"
 
-#: ../coreapi/callbacks.c:139
+#: ../coreapi/callbacks.c:251
 msgid "Early media."
 msgstr "Korai mĂŠdiĂĄk."
 
-#: ../coreapi/callbacks.c:248
+#: ../coreapi/callbacks.c:289
+#, fuzzy, c-format
+msgid "Call with %s is paused."
+msgstr "Chat-elĂŠs %s -el"
+
+#: ../coreapi/callbacks.c:300
+#, c-format
+msgid "Call answered by %s - on hold."
+msgstr ""
+
+#: ../coreapi/callbacks.c:315
+#, fuzzy
+msgid "Call resumed."
+msgstr "HĂ­vĂĄs vĂŠge"
+
+#: ../coreapi/callbacks.c:320
+#, fuzzy, c-format
+msgid "Call answered by %s."
+msgstr ""
+"HĂ­vĂĄs vagy\n"
+"VĂĄlasz"
+
+#: ../coreapi/callbacks.c:381
+msgid "We are being paused..."
+msgstr ""
+
+#: ../coreapi/callbacks.c:385
+msgid "We have been resumed..."
+msgstr ""
+
+#: ../coreapi/callbacks.c:422
 msgid "Call terminated."
 msgstr "A hĂ­vĂĄs befejezve."
 
-#: ../coreapi/callbacks.c:265
+#: ../coreapi/callbacks.c:429
 msgid "User is busy."
 msgstr "A felhasznĂĄlĂł foglalt."
 
-#: ../coreapi/callbacks.c:266
+#: ../coreapi/callbacks.c:430
 msgid "User is temporarily unavailable."
 msgstr "A felhasználó ideiglenesen nem elérhető"
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:268
+#: ../coreapi/callbacks.c:432
 msgid "User does not want to be disturbed."
 msgstr "A felhasznĂĄlĂł nem akarja, hogy zavarjĂĄk."
 
-#: ../coreapi/callbacks.c:269
+#: ../coreapi/callbacks.c:433
 msgid "Call declined."
 msgstr "HĂ­vĂĄs elutasĂ­tva"
 
-#: ../coreapi/callbacks.c:281
+#: ../coreapi/callbacks.c:445
 #, fuzzy
 msgid "No response."
 msgstr "időtúllépés után nincs válasz"
 
-#: ../coreapi/callbacks.c:284
+#: ../coreapi/callbacks.c:449
 msgid "Protocol error."
 msgstr ""
 
-#: ../coreapi/callbacks.c:298
+#: ../coreapi/callbacks.c:465
 #, fuzzy
 msgid "Redirected"
 msgstr "Átirånyítva idw %s..."
 
-#: ../coreapi/callbacks.c:308
+#: ../coreapi/callbacks.c:475
 msgid "Not found"
 msgstr ""
 
-#: ../coreapi/callbacks.c:318
+#: ../coreapi/callbacks.c:485
 msgid "No common codecs"
 msgstr ""
 
-#: ../coreapi/callbacks.c:324
+#: ../coreapi/callbacks.c:491
 #, fuzzy
 msgid "Call failed."
 msgstr "HĂ­vĂĄs elutasĂ­tva"
 
-#: ../coreapi/callbacks.c:374
+#: ../coreapi/callbacks.c:527
+#, fuzzy
+msgid "Authentication failure"
+msgstr "HitelesĂ­tĂŠsi informĂĄciĂł"
+
+#: ../coreapi/callbacks.c:553
 #, c-format
 msgid "Registration on %s successful."
 msgstr "A regisztĂĄciĂł a %s -n sikerĂźlt."
 
-#: ../coreapi/callbacks.c:375
+#: ../coreapi/callbacks.c:554
 #, fuzzy, c-format
 msgid "Unregistration on %s done."
 msgstr "A regisztĂĄciĂł a %s -n sikerĂźlt."
 
-#: ../coreapi/callbacks.c:383
+#: ../coreapi/callbacks.c:570
+msgid "no response timeout"
+msgstr "időtúllépés után nincs válasz"
+
+#: ../coreapi/callbacks.c:573
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "A regisztĂĄciĂł a %s -n nem sikerĂźlt: %s"
 
-#: ../coreapi/callbacks.c:383
-msgid "no response timeout"
-msgstr "időtúllépés után nincs válasz"
+#: ../coreapi/callbacks.c:615
+#, c-format
+msgid "We are transferred to %s"
+msgstr ""
 
 #: ../mediastreamer2/src/alaw.c:144 ../mediastreamer2/src/alaw.c:162
 msgid "ITU-G.711 alaw encoder"
@@ -1335,11 +764,11 @@ msgstr ""
 msgid "ITU-G.711 alaw decoder"
 msgstr ""
 
-#: ../mediastreamer2/src/alsa.c:935
+#: ../mediastreamer2/src/alsa.c:950
 msgid "Alsa sound source"
 msgstr ""
 
-#: ../mediastreamer2/src/alsa.c:1039
+#: ../mediastreamer2/src/alsa.c:1054
 msgid "Alsa sound output"
 msgstr ""
 
@@ -1351,15 +780,15 @@ msgstr ""
 msgid "Sound playback filter for MacOS X Audio Queue Service"
 msgstr ""
 
-#: ../mediastreamer2/src/dtmfgen.c:173 ../mediastreamer2/src/dtmfgen.c:191
+#: ../mediastreamer2/src/dtmfgen.c:274 ../mediastreamer2/src/dtmfgen.c:293
 msgid "DTMF generator"
 msgstr ""
 
-#: ../mediastreamer2/src/gsm.c:111 ../mediastreamer2/src/gsm.c:129
+#: ../mediastreamer2/src/gsm.c:120 ../mediastreamer2/src/gsm.c:138
 msgid "The GSM full-rate codec"
 msgstr ""
 
-#: ../mediastreamer2/src/gsm.c:178 ../mediastreamer2/src/gsm.c:196
+#: ../mediastreamer2/src/gsm.c:187 ../mediastreamer2/src/gsm.c:205
 msgid "The GSM codec"
 msgstr ""
 
@@ -1375,8 +804,8 @@ msgstr ""
 msgid "A filter to make conferencing"
 msgstr ""
 
-#: ../mediastreamer2/src/msfileplayer.c:295
-#: ../mediastreamer2/src/msfileplayer.c:313
+#: ../mediastreamer2/src/msfileplayer.c:311
+#: ../mediastreamer2/src/msfileplayer.c:329
 msgid "Raw files and wav reader"
 msgstr ""
 
@@ -1390,61 +819,53 @@ msgstr ""
 msgid "A filter that send several inputs to one output."
 msgstr ""
 
-#: ../mediastreamer2/src/msresample.c:221
-#: ../mediastreamer2/src/msresample.c:239
-msgid "frequency resampler"
+#: ../mediastreamer2/src/msresample.c:159
+#: ../mediastreamer2/src/msresample.c:177
+msgid "Audio resampler"
 msgstr ""
 
-#: ../mediastreamer2/src/msrtp.c:358 ../mediastreamer2/src/msrtp.c:376
+#: ../mediastreamer2/src/msrtp.c:369 ../mediastreamer2/src/msrtp.c:387
 msgid "RTP output filter"
 msgstr ""
 
-#: ../mediastreamer2/src/msrtp.c:493 ../mediastreamer2/src/msrtp.c:511
+#: ../mediastreamer2/src/msrtp.c:505 ../mediastreamer2/src/msrtp.c:523
 msgid "RTP input filter"
 msgstr ""
 
-#: ../mediastreamer2/src/msspeex.c:359 ../mediastreamer2/src/msspeex.c:377
-#: ../mediastreamer2/src/msspeex.c:504 ../mediastreamer2/src/msspeex.c:522
+#: ../mediastreamer2/src/msspeex.c:360 ../mediastreamer2/src/msspeex.c:378
+#: ../mediastreamer2/src/msspeex.c:548 ../mediastreamer2/src/msspeex.c:567
 msgid "The free and wonderful speex codec"
 msgstr ""
 
-#: ../mediastreamer2/src/msvolume.c:415 ../mediastreamer2/src/msvolume.c:430
+#: ../mediastreamer2/src/msvolume.c:527 ../mediastreamer2/src/msvolume.c:542
 msgid "A filter that controls and measure sound volume"
 msgstr ""
 
-#: ../mediastreamer2/src/msv4l.c:1011
+#: ../mediastreamer2/src/msv4l.c:1012
 msgid "A video4linux compatible source filter to stream pictures."
 msgstr ""
 
-#: ../mediastreamer2/src/msv4l2.c:470
+#: ../mediastreamer2/src/msv4l2.c:554
 msgid "A filter to grab pictures from Video4Linux2-powered cameras"
 msgstr ""
 
-#: ../mediastreamer2/src/nowebcam.c:1836
+#: ../mediastreamer2/src/nowebcam.c:1854
 msgid "A filter that outputs a static image."
 msgstr ""
 
-#: ../mediastreamer2/src/oss.c:567
-msgid "Sound capture filter for OSS drivers"
-msgstr ""
-
-#: ../mediastreamer2/src/oss.c:581
-msgid "Sound playback filter for OSS drivers"
-msgstr ""
-
-#: ../mediastreamer2/src/pixconv.c:177 ../mediastreamer2/src/pixconv.c:195
+#: ../mediastreamer2/src/pixconv.c:129 ../mediastreamer2/src/pixconv.c:147
 msgid "A pixel format converter"
 msgstr ""
 
-#: ../mediastreamer2/src/sizeconv.c:204
+#: ../mediastreamer2/src/sizeconv.c:202
 msgid "A video size converter"
 msgstr ""
 
-#: ../mediastreamer2/src/sizeconv.c:222
+#: ../mediastreamer2/src/sizeconv.c:220
 msgid "a small video size converter"
 msgstr ""
 
-#: ../mediastreamer2/src/speexec.c:349 ../mediastreamer2/src/speexec.c:367
+#: ../mediastreamer2/src/speexec.c:276 ../mediastreamer2/src/speexec.c:294
 msgid "Echo canceller using speex library"
 msgstr ""
 
@@ -1472,55 +893,55 @@ msgstr ""
 msgid "ITU-G.711 ulaw decoder"
 msgstr ""
 
-#: ../mediastreamer2/src/videodec.c:669 ../mediastreamer2/src/videodec.c:685
-#: ../mediastreamer2/src/videodec.c:768 ../mediastreamer2/src/videodec.c:784
+#: ../mediastreamer2/src/videodec.c:713 ../mediastreamer2/src/videodec.c:729
+#: ../mediastreamer2/src/videodec.c:812 ../mediastreamer2/src/videodec.c:828
 msgid "A H.263 decoder using ffmpeg library"
 msgstr ""
 
-#: ../mediastreamer2/src/videodec.c:702
+#: ../mediastreamer2/src/videodec.c:746
 msgid "A MPEG4 decoder using ffmpeg library"
 msgstr ""
 
-#: ../mediastreamer2/src/videodec.c:718
+#: ../mediastreamer2/src/videodec.c:762
 msgid "A RTP/JPEG decoder using ffmpeg library"
 msgstr ""
 
-#: ../mediastreamer2/src/videodec.c:734
+#: ../mediastreamer2/src/videodec.c:778
 msgid "A MJPEG decoder using ffmpeg library"
 msgstr ""
 
-#: ../mediastreamer2/src/videodec.c:750
+#: ../mediastreamer2/src/videodec.c:794
 msgid "A snow decoder using ffmpeg library"
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:861 ../mediastreamer2/src/videoenc.c:943
+#: ../mediastreamer2/src/videoenc.c:908 ../mediastreamer2/src/videoenc.c:990
 msgid "A video H.263 encoder using ffmpeg library."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:877
+#: ../mediastreamer2/src/videoenc.c:924
 msgid ""
 "A video H.263 encoder using ffmpeg library. It is compliant with old RFC2190 "
 "spec."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:893 ../mediastreamer2/src/videoenc.c:975
+#: ../mediastreamer2/src/videoenc.c:940 ../mediastreamer2/src/videoenc.c:1022
 msgid "A video MPEG4 encoder using ffmpeg library."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:909
+#: ../mediastreamer2/src/videoenc.c:956
 msgid "A video snow encoder using ffmpeg library."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:925
+#: ../mediastreamer2/src/videoenc.c:972
 msgid "A RTP/MJPEG encoder using ffmpeg library."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:959
+#: ../mediastreamer2/src/videoenc.c:1006
 msgid ""
 "A video H.263 encoder using ffmpeg library, compliant with old RFC2190 spec."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:991
+#: ../mediastreamer2/src/videoenc.c:1038
 msgid ""
 "The snow codec is royalty-free and is open-source. \n"
 "It uses innovative techniques that makes it one of most promising video "
@@ -1529,12 +950,12 @@ msgid ""
 "versions cannot be guaranteed."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:1011
+#: ../mediastreamer2/src/videoenc.c:1058
 msgid "A MJPEG encoder using ffmpeg library."
 msgstr ""
 
-#: ../mediastreamer2/src/videoout.c:1812 ../mediastreamer2/src/videoout.c:1830
-msgid "A generic video display"
+#: ../mediastreamer2/src/videoout.c:933
+msgid "A SDL-based video display"
 msgstr ""
 
 #: ../mediastreamer2/src/wincevideods.c:969
@@ -1561,10 +982,331 @@ msgstr ""
 msgid "Parametric sound equalizer."
 msgstr ""
 
-#: ../mediastreamer2/src/msdscap-mingw.cc:1003
+#: ../mediastreamer2/src/msdscap-mingw.cc:1038
 msgid "A webcam grabber based on directshow."
 msgstr ""
 
+#: ../mediastreamer2/src/drawdib-display.c:552
+#: ../mediastreamer2/src/drawdib-display.c:570
+msgid "A video display based on windows DrawDib api"
+msgstr ""
+
+#: ../mediastreamer2/src/audiomixer.c:192
+#: ../mediastreamer2/src/audiomixer.c:211
+msgid "A filter that mixes down 16 bit sample audio streams"
+msgstr ""
+
+#: ../mediastreamer2/src/chanadapt.c:110 ../mediastreamer2/src/chanadapt.c:128
+msgid "A filter that converts from mono to stereo and vice versa."
+msgstr ""
+
+#: ../mediastreamer2/src/itc.c:97 ../mediastreamer2/src/itc.c:115
+#: ../mediastreamer2/src/itc.c:197 ../mediastreamer2/src/itc.c:215
+msgid "Inter ticker communication filter."
+msgstr ""
+
+#: ../mediastreamer2/src/extdisplay.c:62 ../mediastreamer2/src/extdisplay.c:79
+msgid "A display filter sending the buffers to draw to the upper layer"
+msgstr ""
+
+#: ../mediastreamer2/src/msiounit.c:619
+msgid "Sound capture filter for MacOS X Audio Unit Service"
+msgstr ""
+
+#: ../mediastreamer2/src/msiounit.c:633
+msgid "Sound playback filter for MacOS X Audio Unit Service"
+msgstr ""
+
+#: ../mediastreamer2/src/x11video.c:562
+msgid "A video display using X11+Xv"
+msgstr ""
+
+#. .id=
+#. .name=
+#. .text=
+#: ../mediastreamer2/src/msandroid.cpp:370
+msgid "Sound capture filter for Android"
+msgstr ""
+
+#. .id=
+#. .name=
+#. .text=
+#: ../mediastreamer2/src/msandroid.cpp:667
+msgid "Sound playback filter for Android"
+msgstr ""
+
+#: ../mediastreamer2/src/msandroidvideo.cpp:134
+msgid "A filter that captures Android video."
+msgstr ""
+
+#, fuzzy
+#~ msgid "Incoming call from %s"
+#~ msgstr "Beérkező hívás"
+
+#~ msgid "#"
+#~ msgstr "#"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "0"
+#~ msgstr "0"
+
+#~ msgid "1"
+#~ msgstr "1"
+
+#~ msgid "5"
+#~ msgstr "5"
+
+#, fuzzy
+#~ msgid "<b>Add contacts from directory</b>"
+#~ msgstr "KapcsolatiinformĂĄciĂł"
+
+#, fuzzy
+#~ msgid "<b>Contact list</b>"
+#~ msgstr "Kapcsolatilista"
+
+#, fuzzy
+#~ msgid "<b>Welcome !</b>"
+#~ msgstr "Kapcsolatilista"
+
+#, fuzzy
+#~ msgid "Audio & Video"
+#~ msgstr "Audio kodekek"
+
+#, fuzzy
+#~ msgid "Audio only"
+#~ msgstr "Audio kodekek"
+
+#, fuzzy
+#~ msgid "Automatically log me in"
+#~ msgstr "Automatikus valĂłs hostnĂŠv megĂĄllapĂ­tĂĄsa"
+
+#, fuzzy
+#~ msgid "Call Details"
+#~ msgstr "Hivás előzmények"
+
+#, fuzzy
+#~ msgid "Call history"
+#~ msgstr "Linphone - Híváselőzmények"
+
+#, fuzzy
+#~ msgid "Contacts"
+#~ msgstr "KapcsolĂłdĂĄs"
+
+#, fuzzy
+#~ msgid "Duration"
+#~ msgstr "InformĂĄciĂłk"
+
+#, fuzzy
+#~ msgid "Duration:"
+#~ msgstr "InformĂĄciĂłk"
+
+#, fuzzy
+#~ msgid "Enable self-view"
+#~ msgstr "Video engedĂŠlyezĂŠs"
+
+#, fuzzy
+#~ msgid "In call"
+#~ msgstr "Beérkező hívás"
+
+#, fuzzy
+#~ msgid "Login information"
+#~ msgstr "KapcsolatiinformĂĄciĂł"
+
+#, fuzzy
+#~ msgid "My current identity:"
+#~ msgstr "SIP azonosĂ­tĂł:"
+
+#, fuzzy
+#~ msgid "Password"
+#~ msgstr "jelszĂł:"
+
+#, fuzzy
+#~ msgid "SIP address or phone number:"
+#~ msgstr "GĂŠpeld ide a sip cĂ­met vagy a telefonszĂĄmot"
+
+#, fuzzy
+#~ msgid "Username"
+#~ msgstr "felhasznĂĄlĂłnĂŠv:"
+
+#, fuzzy
+#~ msgid "_Linphone"
+#~ msgstr "Linphone"
+
+#, fuzzy
+#~ msgid "_Modes"
+#~ msgstr "Kodekek"
+
+#, fuzzy
+#~ msgid "About linphone"
+#~ msgstr "linphone"
+
+#, fuzzy
+#~ msgid "<b>Contact information</b>"
+#~ msgstr "KapcsolatiinformĂĄciĂł"
+
+#, fuzzy
+#~ msgid "SIP Address"
+#~ msgstr "Sip cĂ­m:"
+
+#, fuzzy
+#~ msgid "Linphone - Authentication required"
+#~ msgstr "HitelesĂ­tĂŠst kĂŠrtek"
+
+#, fuzzy
+#~ msgid "Password:"
+#~ msgstr "jelszĂł:"
+
+#, fuzzy
+#~ msgid "Publish presence information"
+#~ msgstr "JelenlĂŠti informĂĄciĂł kĂśzlĂŠse:"
+
+#, fuzzy
+#~ msgid "Registration duration (sec):"
+#~ msgstr "Regisztrálási Időköz:"
+
+#~ msgid "Route (optional):"
+#~ msgstr "Út (nem kötelező):"
+
+#, fuzzy
+#~ msgid "SIP Proxy address:"
+#~ msgstr "SIP Proxy:"
+
+#, fuzzy
+#~ msgid "Your SIP identity:"
+#~ msgstr "SIP azonosĂ­tĂł:"
+
+#~ msgid "sip:"
+#~ msgstr "sip:"
+
+#, fuzzy
+#~ msgid "Send"
+#~ msgstr "Hang"
+
+#~ msgid "Accept"
+#~ msgstr "Elfogad"
+
+#, fuzzy
+#~ msgid "Decline"
+#~ msgstr "line"
+
+#, fuzzy
+#~ msgid "Incoming call from"
+#~ msgstr "Beérkező hívás"
+
+#, fuzzy
+#~ msgid "Linphone - Incoming call"
+#~ msgstr "Beérkező hívás"
+
+#, fuzzy
+#~ msgid "<b>Audio</b>"
+#~ msgstr "Kapcsolatilista"
+
+#, fuzzy
+#~ msgid "<b>Codecs</b>"
+#~ msgstr "Kapcsolatilista"
+
+#, fuzzy
+#~ msgid "<b>Level</b>"
+#~ msgstr "Kapcsolatilista"
+
+#, fuzzy
+#~ msgid "<b>Ports</b>"
+#~ msgstr "Kapcsolatilista"
+
+#, fuzzy
+#~ msgid "<b>Proxy accounts</b>"
+#~ msgstr "Kapcsolatilista"
+
+#, fuzzy
+#~ msgid "<b>Transport</b>"
+#~ msgstr "Kapcsolatilista"
+
+#, fuzzy
+#~ msgid ""
+#~ "Audio codecs\n"
+#~ "Video codecs"
+#~ msgstr "Audio ĂŠs video kodekek"
+
+#, fuzzy
+#~ msgid "Capture device:"
+#~ msgstr "Felvevő hang eszköz:"
+
+#, fuzzy
+#~ msgid "Codecs"
+#~ msgstr "Kodekek"
+
+#~ msgid "Disable"
+#~ msgstr "TiltĂĄs"
+
+#, fuzzy
+#~ msgid "Done"
+#~ msgstr "ElveszĂ­tve"
+
+#, fuzzy
+#~ msgid "Download speed limit in Kbit/sec:"
+#~ msgstr "LetĂśltĂŠsi sĂĄvszĂŠlessĂŠg (kbit/sec):"
+
+#~ msgid "Edit"
+#~ msgstr "SzerkesztĂŠs"
+
+#~ msgid "Enable"
+#~ msgstr "EngedĂŠlyezĂŠs"
+
+#, fuzzy
+#~ msgid "Network settings"
+#~ msgstr "HĂĄlĂłzat"
+
+#, fuzzy
+#~ msgid "Playback device:"
+#~ msgstr "LejĂĄtszĂł hang eszkĂśz:"
+
+#, fuzzy
+#~ msgid "Public IP address:"
+#~ msgstr "Sip cĂ­m:"
+
+#~ msgid "Remove"
+#~ msgstr "EltĂĄvolĂ­tĂĄs"
+
+#, fuzzy
+#~ msgid "Ring device:"
+#~ msgstr "Csengőhang forrás:"
+
+#, fuzzy
+#~ msgid "Ring sound:"
+#~ msgstr "Csengőhang:"
+
+#, fuzzy
+#~ msgid "Stun server:"
+#~ msgstr "Hang eszkĂśz"
+
+#, fuzzy
+#~ msgid "Upload speed limit in Kbit/sec:"
+#~ msgstr "FeltĂśltĂŠsi sĂĄvszĂŠlessĂŠg (kbit/sec):"
+
+#, fuzzy
+#~ msgid "User interface"
+#~ msgstr "felhasznĂĄlĂłnĂŠv:"
+
+#, fuzzy
+#~ msgid "Video input device:"
+#~ msgstr "Hang eszkĂśz"
+
+#, fuzzy
+#~ msgid "Your resulting SIP address:"
+#~ msgstr "SajĂĄt sip cĂ­m:"
+
+#, fuzzy
+#~ msgid "Your username:"
+#~ msgstr "felhasznĂĄlĂłnĂŠv:"
+
+#~ msgid "Linphone"
+#~ msgstr "Linphone"
+
+#~ 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."
 
@@ -1596,14 +1338,6 @@ msgstr ""
 #~ "thogy lépjen kapcsolatba vele miközben használja a következő alternatív "
 #~ "erőforrást:"
 
-#, fuzzy
-#~ msgid "<b>Terminate call</b>"
-#~ msgstr "Kapcsolatilista"
-
-#, fuzzy
-#~ msgid "Show current call"
-#~ msgstr "nem sikerĂźlt hĂ­vni"
-
 #~ msgid "No nat/firewall address supplied !"
 #~ msgstr "Nincs nat/tĹązfal cĂ­m megadva!"
 
@@ -1689,13 +1423,6 @@ msgstr ""
 #~ msgid "..."
 #~ msgstr "..."
 
-#~ msgid ""
-#~ "Call or\n"
-#~ "answer"
-#~ msgstr ""
-#~ "HĂ­vĂĄs vagy\n"
-#~ "VĂĄlasz"
-
 #~ msgid ""
 #~ "Hangup\n"
 #~ "or refuse"
@@ -1914,9 +1641,6 @@ msgstr ""
 #~ "Az Ăśsszes tĂĄrolt hitelesĂ­tĂŠsi informĂĄciĂł tĂśrlĂŠse (felhasznĂĄlĂłnĂŠv, "
 #~ "jelszĂł...)"
 
-#~ msgid "Authentication information"
-#~ msgstr "HitelesĂ­tĂŠsi informĂĄciĂł"
-
 #~ msgid "SIP"
 #~ msgstr "SIP"
 
diff --git a/po/it.po b/po/it.po
index 9fd95ae77d573e7999e73f02e9d2d6b7ed90d5ff..3a673e30c105bc9345f9a37977a03359c694ebc8 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,58 +6,53 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Linphone 3.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 17:16+0200\n"
+"POT-Creation-Date: 2011-02-07 10:59+0100\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../gtk-glade/support.c:49 ../gtk-glade/support.c:73
-#: ../gtk-glade/support.c:102
+#: ../gtk/support.c:49 ../gtk/support.c:73 ../gtk/support.c:102
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr ""
 
-#: ../gtk-glade/chat.c:27
+#: ../gtk/chat.c:27
 #, c-format
 msgid "Chat with %s"
 msgstr "Chat con %s"
 
-#: ../gtk-glade/main.c:94
+#: ../gtk/main.c:74
 msgid "log to stdout some debug information while running."
 msgstr ""
 
-#: ../gtk-glade/main.c:101
+#: ../gtk/main.c:81
 msgid "Start only in the system tray, do not show the main interface."
 msgstr ""
 
-#: ../gtk-glade/main.c:108
+#: ../gtk/main.c:88
 msgid "address to call right now"
 msgstr ""
 
-#: ../gtk-glade/main.c:115
+#: ../gtk/main.c:95
 msgid "if set automatically answer incoming calls"
 msgstr ""
 
-#: ../gtk-glade/main.c:123
+#: ../gtk/main.c:103
 msgid ""
 "Specifiy a working directory (should be the base of the installation, eg: c:"
 "\\Program Files\\Linphone)"
 msgstr ""
 
-#: ../gtk-glade/main.c:402
+#: ../gtk/main.c:479
 #, fuzzy, c-format
 msgid "Call with %s"
 msgstr "Chat con %s"
 
-#: ../gtk-glade/main.c:720
-#, c-format
-msgid "Incoming call from %s"
-msgstr "Chiamata proveniente da %s"
-
-#: ../gtk-glade/main.c:759
+#: ../gtk/main.c:862
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
@@ -69,169 +64,168 @@ msgstr ""
 "veda il tuo stato o aggiungerlo alla tua lista dei contatti Se rispondi no "
 "questo utente sarĂ  momentaneamente bloccato."
 
-#: ../gtk-glade/main.c:837
+#: ../gtk/main.c:940
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at domain <i>%s</i>:"
 msgstr "Prego inserire la password per username <i>%s</i> e dominio <i>%s<i>"
 
-#: ../gtk-glade/main.c:934
+#: ../gtk/main.c:1076
 msgid "Website link"
 msgstr ""
 
-#: ../gtk-glade/main.c:970
+#: ../gtk/main.c:1112
 msgid "Linphone - a video internet phone"
 msgstr ""
 
-#: ../gtk-glade/main.c:989
+#: ../gtk/main.c:1131
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (Default)"
 
-#: ../gtk-glade/main.c:1221
+#: ../gtk/main.c:1382
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
 msgstr ""
 
-#: ../gtk-glade/main.c:1275
+#: ../gtk/main.c:1441
 msgid "A free SIP video-phone"
 msgstr ""
 
-#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:258
-#: ../gtk-glade/contact.glade.h:3
+#: ../gtk/friendlist.c:192 ../gtk/propertybox.c:271
 msgid "Name"
 msgstr "Nome"
 
-#: ../gtk-glade/friendlist.c:205
+#: ../gtk/friendlist.c:205
 msgid "Presence status"
 msgstr "Presenza"
 
-#: ../gtk-glade/friendlist.c:242
+#: ../gtk/friendlist.c:242
 #, c-format
 msgid "Search in %s directory"
 msgstr "Cerca contatti nella directory %s"
 
-#: ../gtk-glade/friendlist.c:450
+#: ../gtk/friendlist.c:450
 msgid "Invalid sip contact !"
 msgstr "Contatto SIP non valido"
 
-#: ../gtk-glade/friendlist.c:492
+#: ../gtk/friendlist.c:495
 #, c-format
 msgid "Call %s"
 msgstr "Chiamata %s"
 
-#: ../gtk-glade/friendlist.c:493
+#: ../gtk/friendlist.c:496
 #, c-format
 msgid "Send text to %s"
 msgstr "Invia testo a %s"
 
-#: ../gtk-glade/friendlist.c:494
+#: ../gtk/friendlist.c:497
 #, c-format
 msgid "Edit contact '%s'"
 msgstr "Modifica contatto %s"
 
-#: ../gtk-glade/friendlist.c:495
+#: ../gtk/friendlist.c:498
 #, c-format
 msgid "Delete contact '%s'"
 msgstr "Elimina contatto %s"
 
-#: ../gtk-glade/friendlist.c:537
+#: ../gtk/friendlist.c:540
 #, c-format
 msgid "Add new contact from %s directory"
 msgstr "Aggiungi nuovo contatto dalla directory %s"
 
-#: ../gtk-glade/propertybox.c:264
+#: ../gtk/propertybox.c:277
 msgid "Rate (Hz)"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:270
+#: ../gtk/propertybox.c:283
 msgid "Status"
 msgstr "Stato"
 
-#: ../gtk-glade/propertybox.c:276
+#: ../gtk/propertybox.c:289
 msgid "Min bitrate (kbit/s)"
 msgstr "Bitrate Min (kbit/s)"
 
-#: ../gtk-glade/propertybox.c:283
+#: ../gtk/propertybox.c:296
 msgid "Parameters"
 msgstr "Parametri"
 
-#: ../gtk-glade/propertybox.c:312 ../gtk-glade/propertybox.c:451
+#: ../gtk/propertybox.c:325 ../gtk/propertybox.c:464
 msgid "Enabled"
 msgstr "Attivato"
 
-#: ../gtk-glade/propertybox.c:313 ../gtk-glade/propertybox.c:451
+#: ../gtk/propertybox.c:326 ../gtk/propertybox.c:464
 msgid "Disabled"
 msgstr "Disattivato"
 
-#: ../gtk-glade/propertybox.c:496
+#: ../gtk/propertybox.c:509
 msgid "Account"
 msgstr "Account"
 
-#: ../gtk-glade/propertybox.c:636
+#: ../gtk/propertybox.c:649
 msgid "English"
 msgstr "Inglese"
 
-#: ../gtk-glade/propertybox.c:637
+#: ../gtk/propertybox.c:650
 msgid "French"
 msgstr "Francese"
 
-#: ../gtk-glade/propertybox.c:638
+#: ../gtk/propertybox.c:651
 msgid "Swedish"
 msgstr "Svedese"
 
-#: ../gtk-glade/propertybox.c:639
+#: ../gtk/propertybox.c:652
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../gtk-glade/propertybox.c:640
+#: ../gtk/propertybox.c:653
 msgid "Spanish"
 msgstr "Spagnolo"
 
-#: ../gtk-glade/propertybox.c:641
+#: ../gtk/propertybox.c:654
 msgid "Brazilian Portugese"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:642
+#: ../gtk/propertybox.c:655
 msgid "Polish"
 msgstr "Polacco"
 
-#: ../gtk-glade/propertybox.c:643
+#: ../gtk/propertybox.c:656
 msgid "German"
 msgstr "Tedesco"
 
-#: ../gtk-glade/propertybox.c:644
+#: ../gtk/propertybox.c:657
 msgid "Russian"
 msgstr "Russo"
 
-#: ../gtk-glade/propertybox.c:645
+#: ../gtk/propertybox.c:658
 msgid "Japanese"
 msgstr "Giapponese"
 
-#: ../gtk-glade/propertybox.c:646
+#: ../gtk/propertybox.c:659
 msgid "Dutch"
 msgstr "Olandese"
 
-#: ../gtk-glade/propertybox.c:647
+#: ../gtk/propertybox.c:660
 msgid "Hungarian"
 msgstr "Ungherese"
 
-#: ../gtk-glade/propertybox.c:648
+#: ../gtk/propertybox.c:661
 msgid "Czech"
 msgstr "Ceco"
 
-#: ../gtk-glade/propertybox.c:649
+#: ../gtk/propertybox.c:662
 msgid "Chinese"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:706
+#: ../gtk/propertybox.c:719
 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-glade/update.c:80
+#: ../gtk/update.c:80
 #, c-format
 msgid ""
 "A more recent version is availalble from %s.\n"
@@ -240,38 +234,38 @@ msgstr ""
 "Una versione piÚ recente è disponibile da %s.\n"
 "Vuoi aprire un browser per eseguire il download ?"
 
-#: ../gtk-glade/update.c:91
+#: ../gtk/update.c:91
 msgid "You are running the lastest version."
 msgstr "Non è stato trovato alcun aggiornamento"
 
-#: ../gtk-glade/buddylookup.c:85
+#: ../gtk/buddylookup.c:85
 msgid "Firstname, Lastname"
 msgstr "Nome, Cognome"
 
-#: ../gtk-glade/buddylookup.c:160
+#: ../gtk/buddylookup.c:160
 msgid "Error communicating with server."
 msgstr "Errore di comunicazione"
 
-#: ../gtk-glade/buddylookup.c:164
+#: ../gtk/buddylookup.c:164
 msgid "Connecting..."
 msgstr "In connessione..."
 
-#: ../gtk-glade/buddylookup.c:168
+#: ../gtk/buddylookup.c:168
 msgid "Connected"
 msgstr "Connessione"
 
-#: ../gtk-glade/buddylookup.c:172
+#: ../gtk/buddylookup.c:172
 msgid "Receiving data..."
 msgstr "Ricezione data..."
 
-#: ../gtk-glade/buddylookup.c:180
+#: ../gtk/buddylookup.c:180
 #, c-format
 msgid "Found %i contact"
 msgid_plural "Found %i contacts"
 msgstr[0] "Trovato %i contatto"
 msgstr[1] "Trovato %i contatti"
 
-#: ../gtk-glade/setupwizard.c:25
+#: ../gtk/setupwizard.c:25
 msgid ""
 "Welcome !\n"
 "This assistant will help you to use a SIP account for your calls."
@@ -279,758 +273,167 @@ msgstr ""
 "Benvenuti !\n"
 "La procedura vi aiutera a configurare un account SIP."
 
-#: ../gtk-glade/setupwizard.c:34
+#: ../gtk/setupwizard.c:34
 msgid "Create an account by choosing a username"
 msgstr "Creare un account scegliendo l'username"
 
-#: ../gtk-glade/setupwizard.c:35
+#: ../gtk/setupwizard.c:35
 msgid "I have already an account and just want to use it"
 msgstr "Ho gia un account e voglio usarlo"
 
-#: ../gtk-glade/setupwizard.c:53
+#: ../gtk/setupwizard.c:53
 msgid "Please choose a username:"
 msgstr "Prego scegliere un username"
 
-#: ../gtk-glade/setupwizard.c:54
+#: ../gtk/setupwizard.c:54
 msgid "Username:"
 msgstr "Manuale utente"
 
-#: ../gtk-glade/setupwizard.c:92
+#: ../gtk/setupwizard.c:92
 #, c-format
 msgid "Checking if '%s' is available..."
 msgstr "Controllo se '%s' è disponibile..."
 
-#: ../gtk-glade/setupwizard.c:97 ../gtk-glade/setupwizard.c:164
+#: ../gtk/setupwizard.c:97 ../gtk/setupwizard.c:164
 msgid "Please wait..."
 msgstr "Prego attendere ..."
 
-#: ../gtk-glade/setupwizard.c:101
+#: ../gtk/setupwizard.c:101
 msgid "Sorry this username already exists. Please try a new one."
 msgstr "Spiacenti, questo usernsame è gia utilizzato. Prego riprovare"
 
-#: ../gtk-glade/setupwizard.c:103 ../gtk-glade/setupwizard.c:168
+#: ../gtk/setupwizard.c:103 ../gtk/setupwizard.c:168
 msgid "Ok !"
 msgstr "Ok !"
 
-#: ../gtk-glade/setupwizard.c:106 ../gtk-glade/setupwizard.c:171
+#: ../gtk/setupwizard.c:106 ../gtk/setupwizard.c:171
 msgid "Communication problem, please try again later."
 msgstr "Errore di comunicazione, prego riprovare."
 
-#: ../gtk-glade/setupwizard.c:134
+#: ../gtk/setupwizard.c:134
 msgid "Thank you. Your account is now configured and ready for use."
 msgstr "Grazie. Il tuo account è configurato e pronto all'uso"
 
-#: ../gtk-glade/setupwizard.c:228
+#: ../gtk/setupwizard.c:228
 msgid "Welcome to the account setup assistant"
 msgstr "Benvenuto nel configuratore di account"
 
-#: ../gtk-glade/setupwizard.c:232
+#: ../gtk/setupwizard.c:232
 msgid "Account setup assistant"
 msgstr "Configuratore di account"
 
-#: ../gtk-glade/setupwizard.c:236
+#: ../gtk/setupwizard.c:236
 msgid "Choosing a username"
 msgstr "Scegli un username"
 
-#: ../gtk-glade/setupwizard.c:240
+#: ../gtk/setupwizard.c:240
 msgid "Verifying"
 msgstr "Verifica"
 
-#: ../gtk-glade/setupwizard.c:244
+#: ../gtk/setupwizard.c:244
 msgid "Confirmation"
 msgstr "Informazioni"
 
-#: ../gtk-glade/setupwizard.c:249
+#: ../gtk/setupwizard.c:249
 msgid "Creating your account"
 msgstr "Creazione account"
 
-#: ../gtk-glade/setupwizard.c:253
+#: ../gtk/setupwizard.c:253
 msgid "Now ready !"
 msgstr "Pronto !"
 
-#: ../gtk-glade/incall_view.c:113
+#: ../gtk/incall_view.c:113
+msgid "Transfer"
+msgstr ""
+
+#: ../gtk/incall_view.c:187
 #, fuzzy
 msgid "<b>Calling...</b>"
 msgstr "<b>Linguaggio</b>"
 
-#: ../gtk-glade/incall_view.c:116 ../gtk-glade/incall_view.c:138
+#: ../gtk/incall_view.c:190 ../gtk/incall_view.c:246
 msgid "00::00::00"
 msgstr ""
 
-#: ../gtk-glade/incall_view.c:136
-msgid "<b>In call with</b>"
+#: ../gtk/incall_view.c:206
+#, fuzzy
+msgid "<b>Incoming call</b>"
+msgstr "Chimata in entrata"
+
+#: ../gtk/incall_view.c:216
+msgid ""
+"Pause all calls\n"
+"and answer"
+msgstr ""
+
+#: ../gtk/incall_view.c:217
+msgid "Answer"
+msgstr ""
+
+#: ../gtk/incall_view.c:244
+#, fuzzy
+msgid "<b>In call</b>"
 msgstr "<b>In chiamata con</b>"
 
-#: ../gtk-glade/incall_view.c:154
+#: ../gtk/incall_view.c:260
+#, fuzzy
+msgid "<b>Paused call</b>"
+msgstr "<b>Termina chiamata</b>"
+
+#: ../gtk/incall_view.c:272
 #, c-format
 msgid "%02i::%02i::%02i"
 msgstr ""
 
-#: ../gtk-glade/incall_view.c:170
+#: ../gtk/incall_view.c:288
 msgid "<b>Call ended.</b>"
 msgstr "<b>Chiamata terminata.</b>"
 
-#: ../gtk-glade/incall_view.c:188
+#: ../gtk/incall_view.c:309
 msgid "Unmute"
 msgstr ""
 "Attiva\n"
 "microfono"
 
-#: ../gtk-glade/incall_view.c:195 ../gtk-glade/main.glade.h:43
+#: ../gtk/incall_view.c:316
 msgid "Mute"
 msgstr ""
 "Chiudi\n"
 "microfono"
 
-#: ../gtk-glade/loginframe.c:83
-#, c-format
-msgid "Please enter login information for %s"
-msgstr "Prego inserire le proprie credenziali di accesso per %s"
-
-#: ../gtk-glade/main.glade.h:1
-msgid "#"
-msgstr "#"
-
-#: ../gtk-glade/main.glade.h:2
-msgid "*"
-msgstr "*"
-
-#: ../gtk-glade/main.glade.h:3
-msgid "0"
-msgstr "0"
-
-#: ../gtk-glade/main.glade.h:4
-msgid "1"
-msgstr "1"
-
-#: ../gtk-glade/main.glade.h:5
-msgid "2"
-msgstr "2"
-
-#: ../gtk-glade/main.glade.h:6
-msgid "3"
-msgstr "3"
-
-#: ../gtk-glade/main.glade.h:7
-msgid "4"
-msgstr "4"
-
-#: ../gtk-glade/main.glade.h:8
-msgid "5"
-msgstr "5"
-
-#: ../gtk-glade/main.glade.h:9
-msgid "6"
-msgstr "6"
-
-#: ../gtk-glade/main.glade.h:10
-msgid "7"
-msgstr "7"
-
-#: ../gtk-glade/main.glade.h:11
-msgid "8"
-msgstr "8"
-
-#: ../gtk-glade/main.glade.h:12
-msgid "9"
-msgstr "9"
-
-#: ../gtk-glade/main.glade.h:13
-#, fuzzy
-msgid "<b>Add contacts from directory</b>"
-msgstr "Aggiungi nuovo contatto dalla directory %s"
-
-#: ../gtk-glade/main.glade.h:14
-msgid "<b>Contact list</b>"
-msgstr "<b>Lista contatti</b>"
-
-#: ../gtk-glade/main.glade.h:15
-msgid "<b>Welcome !</b>"
-msgstr "<b>Benvenuto !</b>"
-
-#: ../gtk-glade/main.glade.h:16
-msgid "A"
-msgstr "A"
-
-#: ../gtk-glade/main.glade.h:17
-msgid ""
-"ADSL\n"
-"Fiber Channel"
-msgstr ""
-"ADSL\n"
-"Fibra Ottica"
-
-#: ../gtk-glade/main.glade.h:19
-msgid ""
-"All users\n"
-"Online users"
-msgstr ""
-"Tutti gli utenti\n"
-"Utenti Online"
-
-#: ../gtk-glade/main.glade.h:21
-msgid "Assistant"
-msgstr "Configuratore"
-
-#: ../gtk-glade/main.glade.h:22
-msgid "Audio & Video"
-msgstr "Audio & Video"
-
-#: ../gtk-glade/main.glade.h:23
-msgid "Audio only"
-msgstr "Solo Audio"
-
-#: ../gtk-glade/main.glade.h:24
-msgid "Automatically log me in"
-msgstr "Login Automatico"
-
-#: ../gtk-glade/main.glade.h:25
-msgid "B"
-msgstr "B"
-
-#: ../gtk-glade/main.glade.h:26 ../gtk-glade/parameters.glade.h:21
-msgid "C"
-msgstr "C"
-
-#: ../gtk-glade/main.glade.h:27
-#, fuzzy
-msgid "Call Details"
-msgstr "Chiamata %s"
-
-#: ../gtk-glade/main.glade.h:28 ../gtk-glade/call_logs.glade.h:1
-msgid "Call history"
-msgstr "Cronologia"
-
-#: ../gtk-glade/main.glade.h:29
-msgid "Check for updates"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:30
-#, fuzzy
-msgid "Contacts"
-msgstr "In connessione"
-
-#: ../gtk-glade/main.glade.h:31
-msgid "D"
-msgstr "D"
-
-#: ../gtk-glade/main.glade.h:32
-msgid "Default"
-msgstr "Default"
-
-#: ../gtk-glade/main.glade.h:33
-msgid "Duration"
-msgstr "Durata"
-
-#: ../gtk-glade/main.glade.h:34
-msgid "Duration:"
-msgstr "Durata:"
-
-#: ../gtk-glade/main.glade.h:35
-msgid "Enable self-view"
-msgstr "Self-view abilitato"
-
-#: ../gtk-glade/main.glade.h:36
-msgid "Enter username, phone number, or full sip address"
-msgstr "Inserisci username, numero o indirizzo sip"
-
-#: ../gtk-glade/main.glade.h:37
-msgid "Homepage"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:38
-msgid "In call"
-msgstr "In chiamata"
-
-#: ../gtk-glade/main.glade.h:39
-msgid "Internet connection:"
-msgstr "Connessione Internet:"
-
-#: ../gtk-glade/main.glade.h:40
-msgid "Keypad"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:41
-msgid "Login information"
-msgstr "Credenziali di accesso"
-
-#: ../gtk-glade/main.glade.h:42
-msgid "Lookup:"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:44
-msgid "My current identity:"
-msgstr "IdentitĂ  corrente"
-
-#: ../gtk-glade/main.glade.h:45
-msgid "Password"
-msgstr "Password"
-
-#: ../gtk-glade/main.glade.h:46
-msgid "SIP address or phone number:"
-msgstr "Indirizzo sip o numero."
-
-#: ../gtk-glade/main.glade.h:47
-msgid "Search"
+#: ../gtk/incall_view.c:340
+msgid "Resume"
 msgstr ""
 
-#: ../gtk-glade/main.glade.h:48
-msgid "Show debug messages"
+#: ../gtk/incall_view.c:347
+msgid "Pause"
 msgstr ""
 
-#: ../gtk-glade/main.glade.h:49
-msgid "Start call"
-msgstr "Inizia chiamata"
-
-#: ../gtk-glade/main.glade.h:50
-msgid "Terminate call"
-msgstr "Termina chiamata"
-
-#: ../gtk-glade/main.glade.h:51
-msgid "Username"
-msgstr "Username"
-
-#: ../gtk-glade/main.glade.h:52
-msgid "_Linphone"
-msgstr "_Linphone"
-
-#: ../gtk-glade/main.glade.h:53
-msgid "_Modes"
-msgstr "_Modi"
-
-#: ../gtk-glade/main.glade.h:54
-msgid "in"
-msgstr "in"
-
-#: ../gtk-glade/main.glade.h:55
-msgid "label"
-msgstr "etichetta"
-
-#: ../gtk-glade/about.glade.h:1
-msgid "About linphone"
-msgstr "Info Linphone"
-
-#: ../gtk-glade/about.glade.h:2
-#, fuzzy
-msgid "An internet video phone using the standard SIP (rfc3261) protocol."
-msgstr "Un internet video telefono basato sullo standard SIP (rfc3261)"
-
-#: ../gtk-glade/about.glade.h:3
-msgid "Created by Simon Morlat\n"
-msgstr "Creato da Simon Morlat\n"
-
-#: ../gtk-glade/about.glade.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"
-msgstr ""
-
-#: ../gtk-glade/contact.glade.h:1
-msgid "<b>Contact information</b>"
-msgstr "<b>Contact informazioni</b>"
-
-#: ../gtk-glade/contact.glade.h:2
-msgid "Allow this contact to see my presence status"
-msgstr "Permitti al contatto di vedere il mio stato di presenza"
-
-#: ../gtk-glade/contact.glade.h:4
-msgid "SIP Address"
-msgstr "Rubrica"
-
-#: ../gtk-glade/contact.glade.h:5
-msgid "Show this contact presence status"
-msgstr "Mostra lo stato di presenza del contatto"
-
-#: ../gtk-glade/contact.glade.h:6 ../gtk-glade/password.glade.h:5
-#: ../gtk-glade/sip_account.glade.h:9
-msgid "gtk-cancel"
-msgstr ""
-
-#: ../gtk-glade/contact.glade.h:7 ../gtk-glade/password.glade.h:6
-#: ../gtk-glade/sip_account.glade.h:10
-msgid "gtk-ok"
-msgstr ""
-
-#: ../gtk-glade/log.glade.h:1
-msgid "Linphone debug window"
-msgstr "Linphone debug window"
-
-#: ../gtk-glade/log.glade.h:2 ../gtk-glade/call_logs.glade.h:2
-#: ../gtk-glade/chatroom.glade.h:2
-msgid "gtk-close"
-msgstr ""
-
-#: ../gtk-glade/password.glade.h:1
-msgid "Linphone - Authentication required"
-msgstr "Linphone - Autenticazione richiesta"
-
-#: ../gtk-glade/password.glade.h:2
-msgid "Password:"
-msgstr "Password:"
-
-#: ../gtk-glade/password.glade.h:3
-msgid "Please enter the domain password"
-msgstr "Prego inserire la password di dominio"
-
-#: ../gtk-glade/password.glade.h:4
-msgid "UserID"
-msgstr ""
-
-#: ../gtk-glade/sip_account.glade.h:1
-msgid "Configure a SIP account"
-msgstr "Configurazione SIP account"
-
-#: ../gtk-glade/sip_account.glade.h:2
-msgid "Linphone - Configure a SIP account"
-msgstr "Linphone - Configurazione SIP account"
-
-#: ../gtk-glade/sip_account.glade.h:3
-msgid "Publish presence information"
-msgstr "Pubblica stato della presenza"
-
-#: ../gtk-glade/sip_account.glade.h:4
-msgid "Register at startup"
-msgstr "Registra all'avvio"
-
-#: ../gtk-glade/sip_account.glade.h:5
-msgid "Registration duration (sec):"
-msgstr "Durata registrazione (sec)"
-
-#: ../gtk-glade/sip_account.glade.h:6
-msgid "Route (optional):"
-msgstr "Rotta (opzionale)"
-
-#: ../gtk-glade/sip_account.glade.h:7
-msgid "SIP Proxy address:"
-msgstr "Indirizzo sip proxy:"
-
-#: ../gtk-glade/sip_account.glade.h:8
-msgid "Your SIP identity:"
-msgstr "IdentitĂ  SIP"
-
-#: ../gtk-glade/sip_account.glade.h:11
-msgid "sip:"
-msgstr "sip:"
-
-#: ../gtk-glade/chatroom.glade.h:1
-msgid "Send"
-msgstr "Invia"
-
-#: ../gtk-glade/incoming_call.glade.h:1
-msgid "Accept"
-msgstr "Accetta"
-
-#: ../gtk-glade/incoming_call.glade.h:2
-msgid "Decline"
-msgstr "Rifiuta"
-
-#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:369
-msgid "Incoming call"
-msgstr "Chimata in entrata"
-
-#: ../gtk-glade/incoming_call.glade.h:4
-msgid "Incoming call from"
-msgstr "Chiama in entrata da"
-
-#: ../gtk-glade/incoming_call.glade.h:5
-msgid "Linphone - Incoming call"
-msgstr "Linphone - Chiamata in entrata"
-
-#: ../gtk-glade/parameters.glade.h:1
-msgid "0 stands for \"unlimited\""
-msgstr "0 sta per illimitato"
-
-#: ../gtk-glade/parameters.glade.h:2
-msgid "<b>Audio</b>"
-msgstr "<b>Audio</b>"
-
-#: ../gtk-glade/parameters.glade.h:3
-msgid "<b>Bandwidth control</b>"
-msgstr "<b>Gestione banda</b>"
-
-#: ../gtk-glade/parameters.glade.h:4
-msgid "<b>Codecs</b>"
-msgstr "<b>Codecs</b>"
-
-#: ../gtk-glade/parameters.glade.h:5
-msgid "<b>Default identity</b>"
-msgstr "<b>IdentitĂ  di default</b>"
-
-#: ../gtk-glade/parameters.glade.h:6
-msgid "<b>Language</b>"
-msgstr "<b>Linguaggio</b>"
-
-#: ../gtk-glade/parameters.glade.h:7
-#, fuzzy
-msgid "<b>Level</b>"
-msgstr "<b>Linguaggio</b>"
-
-#: ../gtk-glade/parameters.glade.h:8
-msgid "<b>NAT and Firewall</b>"
-msgstr "<b>NAT and Firewall</b>"
-
-#: ../gtk-glade/parameters.glade.h:9
-msgid "<b>Ports</b>"
-msgstr "<b>Porte</b>"
-
-#: ../gtk-glade/parameters.glade.h:10
-msgid "<b>Privacy</b>"
-msgstr "<b>Privacy</b>"
-
-#: ../gtk-glade/parameters.glade.h:11
-msgid "<b>Proxy accounts</b>"
-msgstr "<b>Account proxy</b>"
-
-#: ../gtk-glade/parameters.glade.h:12
-msgid "<b>Transport</b>"
-msgstr "<b>Transporto</b>"
-
-#: ../gtk-glade/parameters.glade.h:13
-msgid "<b>Video</b>"
-msgstr "<b>Video</b>"
-
-#: ../gtk-glade/parameters.glade.h:14
-msgid "ALSA special device (optional):"
-msgstr "Dispositivo ALSA (optional):"
-
-#: ../gtk-glade/parameters.glade.h:15
-msgid "Add"
-msgstr "Aggiungi"
-
-#: ../gtk-glade/parameters.glade.h:16
-msgid "Audio RTP/UDP:"
-msgstr "Audio RTP/UDP:"
-
-#: ../gtk-glade/parameters.glade.h:17
-msgid ""
-"Audio codecs\n"
-"Video codecs"
-msgstr ""
-"Audio codecs\n"
-"Video codecs"
-
-#: ../gtk-glade/parameters.glade.h:19
-msgid "Behind NAT / Firewall (specify gateway IP below)"
-msgstr "Dietro NAT / Firewall (IP del gateway)"
-
-#: ../gtk-glade/parameters.glade.h:20
-msgid "Behind NAT / Firewall (use STUN to resolve)"
-msgstr "Dietro NAT / Firewall (utilizza STUN)"
-
-#: ../gtk-glade/parameters.glade.h:22
-msgid "CIF"
-msgstr "CIF"
-
-#: ../gtk-glade/parameters.glade.h:23
-msgid "Capture device:"
-msgstr "Dispositivo microfono:"
-
-#: ../gtk-glade/parameters.glade.h:24
-msgid "Codecs"
-msgstr "Codec"
-
-#: ../gtk-glade/parameters.glade.h:25
-msgid "Direct connection to the Internet"
-msgstr "Connessione diretta a internet"
-
-#: ../gtk-glade/parameters.glade.h:26
-msgid "Disable"
-msgstr "Disattivato"
-
-#: ../gtk-glade/parameters.glade.h:27
-msgid "Done"
-msgstr "Fatto"
-
-#: ../gtk-glade/parameters.glade.h:28
-msgid "Download speed limit in Kbit/sec:"
-msgstr "Velocita massima in Dowload Kbit/sec"
-
-#: ../gtk-glade/parameters.glade.h:29
-msgid "Edit"
-msgstr "Edita"
-
-#: ../gtk-glade/parameters.glade.h:30
-msgid "Enable"
-msgstr "Attivato"
-
-#: ../gtk-glade/parameters.glade.h:31
-msgid "Enable echo cancellation"
-msgstr "Attiva cancellazione eco"
-
-#: ../gtk-glade/parameters.glade.h:32
-msgid "Erase all passwords"
-msgstr "Cancella tutte le password"
-
-#: ../gtk-glade/parameters.glade.h:33
-msgid "Manage SIP Accounts"
-msgstr "Gestici SIP Account"
-
-#: ../gtk-glade/parameters.glade.h:34
-msgid "Multimedia settings"
-msgstr "Impostazioni multimediali"
-
-#: ../gtk-glade/parameters.glade.h:35
-msgid "Network settings"
-msgstr "Impostazioni di rete"
-
-#: ../gtk-glade/parameters.glade.h:36
-msgid "Playback device:"
-msgstr "Dispositivo uscita audio:"
-
-#: ../gtk-glade/parameters.glade.h:37
-msgid "Prefered video resolution:"
-msgstr "Risoluzione video preferita"
-
-#: ../gtk-glade/parameters.glade.h:38
-msgid "Public IP address:"
-msgstr "Indirizzo ip pubblico:"
-
-#: ../gtk-glade/parameters.glade.h:39
-msgid ""
-"Register to FONICS\n"
-"virtual network !"
-msgstr ""
-"Registrati a  FONICS\n"
-"virtual network !"
-
-#: ../gtk-glade/parameters.glade.h:41
-msgid "Remove"
-msgstr "Rimuovi"
-
-#: ../gtk-glade/parameters.glade.h:42
-msgid "Ring device:"
-msgstr "Dispositivo squillo:"
-
-#: ../gtk-glade/parameters.glade.h:43
-msgid "Ring sound:"
-msgstr "Suoneria:"
-
-#: ../gtk-glade/parameters.glade.h:44
-msgid "SIP (UDP):"
-msgstr "SIP (UDP)"
-
-#: ../gtk-glade/parameters.glade.h:45
-msgid "Send DTMFs as SIP info"
-msgstr "Invia DTMF come SIP info"
-
-#: ../gtk-glade/parameters.glade.h:46
-msgid "Set Maximum Transmission Unit:"
-msgstr "Imposta Maximum Transmission Unit:"
-
-#: ../gtk-glade/parameters.glade.h:47
-msgid "Settings"
-msgstr "Preferenze"
-
-#: ../gtk-glade/parameters.glade.h:48
-msgid "Show advanced settings"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:49
-msgid "Stun server:"
-msgstr "Stun server:"
-
-#: ../gtk-glade/parameters.glade.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"
-
-#: ../gtk-glade/parameters.glade.h:51
-msgid "Upload speed limit in Kbit/sec:"
-msgstr "VelocitĂ  massima in upload Kbit/sec:"
-
-#: ../gtk-glade/parameters.glade.h:52
-msgid "Use IPv6 instead of IPv4"
-msgstr "Usa IPv6 invece che IPv4"
-
-#: ../gtk-glade/parameters.glade.h:53
-msgid "User interface"
-msgstr "Interfaccia utente"
-
-#: ../gtk-glade/parameters.glade.h:54
-msgid "Video RTP/UDP:"
-msgstr "Video RTP/UDP"
-
-#: ../gtk-glade/parameters.glade.h:55
-msgid "Video input device:"
-msgstr "Dispositivo Video:"
-
-#: ../gtk-glade/parameters.glade.h:56
-msgid "Your display name (eg: John Doe):"
-msgstr "Nome visualizzato (es: Mario Rossi):"
-
-#: ../gtk-glade/parameters.glade.h:57
-msgid "Your resulting SIP address:"
-msgstr "Il tuo indirizzo sip:"
-
-#: ../gtk-glade/parameters.glade.h:58
-msgid "Your username:"
-msgstr "Username"
-
-#: ../gtk-glade/parameters.glade.h:59
-msgid "a sound card\n"
-msgstr "una scheda audio\n"
-
-#: ../gtk-glade/parameters.glade.h:61
-msgid "default camera"
-msgstr "default videocamera"
-
-#: ../gtk-glade/parameters.glade.h:62
-msgid "default soundcard"
-msgstr "default scheda audio"
-
-#: ../gtk-glade/parameters.glade.h:63
-msgid "default soundcard\n"
-msgstr "default scheda audio\n"
-
-#: ../gtk-glade/buddylookup.glade.h:1
-msgid "<b>Search somebody</b>"
-msgstr "<b>Cerca</b>"
-
-#: ../gtk-glade/buddylookup.glade.h:2
-msgid "Add to my list"
-msgstr "Aggiungi alla mia lista"
-
-#: ../gtk-glade/buddylookup.glade.h:3
-msgid "Search contacts in directory"
-msgstr "Cerca contatti nella directory"
-
-#: ../gtk-glade/waiting.glade.h:1
-msgid "Linphone"
-msgstr "Linphone"
-
-#: ../gtk-glade/waiting.glade.h:2
-msgid "Please wait"
-msgstr "Prego attendere"
+#: ../gtk/loginframe.c:93
+#, c-format
+msgid "Please enter login information for %s"
+msgstr "Prego inserire le proprie credenziali di accesso per %s"
 
-#: ../coreapi/linphonecore.c:311
+#: ../coreapi/linphonecore.c:166
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../coreapi/linphonecore.c:357
+#: ../coreapi/linphonecore.c:207
 msgid "aborted"
 msgstr "annullato"
 
-#: ../coreapi/linphonecore.c:360
+#: ../coreapi/linphonecore.c:210
 msgid "completed"
 msgstr "comletato"
 
-#: ../coreapi/linphonecore.c:363
+#: ../coreapi/linphonecore.c:213
 msgid "missed"
 msgstr "mancante"
 
-#: ../coreapi/linphonecore.c:368
+#: ../coreapi/linphonecore.c:218
 #, c-format
 msgid ""
 "%s at %s\n"
@@ -1045,11 +448,15 @@ msgstr ""
 "Stato: %s\n"
 "Durata: %i mn %i sec\n"
 
-#: ../coreapi/linphonecore.c:369
+#: ../coreapi/linphonecore.c:219
+msgid "Incoming call"
+msgstr "Chimata in entrata"
+
+#: ../coreapi/linphonecore.c:219
 msgid "Outgoing call"
 msgstr "Chiamata in uscita"
 
-#: ../coreapi/linphonecore.c:626
+#: ../coreapi/linphonecore.c:501
 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"
@@ -1057,23 +464,19 @@ msgstr ""
 "La tua macchina sembra connessa ad una rete IPv6. Di default linphone "
 "utilizza IPv4. Prego aggiorna la tua configurazione se vuoi usare IPv6"
 
-#: ../coreapi/linphonecore.c:1083
+#: ../coreapi/linphonecore.c:994
 msgid "Ready"
 msgstr "Pronto"
 
-#: ../coreapi/linphonecore.c:1513
-msgid "Remote end seems to have disconnected, the call is going to be closed."
-msgstr "L'utente remoto sembra disconesso, la chiamata verrĂ  terminata"
-
-#: ../coreapi/linphonecore.c:1725
+#: ../coreapi/linphonecore.c:1768
 msgid "Looking for telephone number destination..."
 msgstr "Ricerca numero destinazione..."
 
-#: ../coreapi/linphonecore.c:1727
+#: ../coreapi/linphonecore.c:1771
 msgid "Could not resolve this number."
 msgstr "Impossibile risolvere il numero."
 
-#: ../coreapi/linphonecore.c:1771
+#: ../coreapi/linphonecore.c:1815
 msgid ""
 "Could not parse given sip address. A sip url usually looks like sip:"
 "user@domain"
@@ -1081,26 +484,54 @@ msgstr ""
 "Errore nel formato del contatto sip. Usualmente un indirizzo appare sip:"
 "user@domain"
 
-#: ../coreapi/linphonecore.c:1912
+#: ../coreapi/linphonecore.c:1962
 msgid "Contacting"
 msgstr "In connessione"
 
-#: ../coreapi/linphonecore.c:1918
-msgid "could not call"
+#: ../coreapi/linphonecore.c:1969
+#, fuzzy
+msgid "Could not call"
 msgstr "chiamata fallita"
 
-#: ../coreapi/linphonecore.c:1965
-msgid "Sorry, having multiple simultaneous calls is not supported yet !"
-msgstr "Spiacenti, le chiamate multiple non sono supportate"
+#: ../coreapi/linphonecore.c:2076
+msgid "Sorry, you have to pause or stop the current call first !"
+msgstr ""
+
+#: ../coreapi/linphonecore.c:2081
+msgid "Sorry, we have reached the maximum number of simultaneous calls"
+msgstr ""
+
+#: ../coreapi/linphonecore.c:2205
+msgid "Modifying call parameters..."
+msgstr ""
 
-#: ../coreapi/linphonecore.c:2370 ../coreapi/callbacks.c:32
+#: ../coreapi/linphonecore.c:2308
 msgid "Connected."
 msgstr "Connessione"
 
-#: ../coreapi/linphonecore.c:2404
+#: ../coreapi/linphonecore.c:2331
+#, fuzzy
+msgid "Call aborted"
+msgstr "annullato"
+
+#: ../coreapi/linphonecore.c:2371
 msgid "Call ended"
 msgstr "Chiamata terminata"
 
+#: ../coreapi/linphonecore.c:2453
+#, fuzzy
+msgid "Could not pause the call"
+msgstr "chiamata fallita"
+
+#: ../coreapi/linphonecore.c:2457
+#, fuzzy
+msgid "Pausing the current call..."
+msgstr "Mostra chiamata corrente"
+
+#: ../coreapi/linphonecore.c:2496
+msgid "There is already a call in process, pause or stop it first."
+msgstr ""
+
 #: ../coreapi/misc.c:147
 msgid ""
 "Your computer appears to be using ALSA sound drivers.\n"
@@ -1125,7 +556,7 @@ msgstr ""
 "è assente e linphone lo richede. Prego eseguire\n"
 "'modprobe snd-mixer-oss' da utente root per caricarlo."
 
-#: ../coreapi/misc.c:497
+#: ../coreapi/misc.c:520
 msgid "Stun lookup in progress..."
 msgstr "Ricerca Stun in progresso ..."
 
@@ -1177,7 +608,7 @@ msgstr "Pendente"
 msgid "Unknown-bug"
 msgstr "Bug-sconosciuto"
 
-#: ../coreapi/proxy.c:176
+#: ../coreapi/proxy.c:187
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
@@ -1185,7 +616,7 @@ msgstr ""
 "L'indirizzo sip proxy utilizzato è invalido, deve iniziare con  \"sip:\" "
 "seguito dall' hostaname."
 
-#: ../coreapi/proxy.c:182
+#: ../coreapi/proxy.c:193
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
@@ -1193,98 +624,136 @@ msgstr ""
 "L'identità sip utilizza è invalida.\n"
 "Dovrebbre essere sip:username@proxydomain, esempio: sip:alice@example.net"
 
-#: ../coreapi/proxy.c:621
+#: ../coreapi/proxy.c:670
 #, c-format
 msgid "Could not login as %s"
 msgstr "impossibile login come %s"
 
-#: ../coreapi/callbacks.c:95
+#: ../coreapi/callbacks.c:170
 #, fuzzy
 msgid "is contacting you"
 msgstr "ti sta conttatando."
 
-#: ../coreapi/callbacks.c:96
+#: ../coreapi/callbacks.c:171
 msgid " and asked autoanswer."
 msgstr ""
 
-#: ../coreapi/callbacks.c:96
+#: ../coreapi/callbacks.c:171
 msgid "."
 msgstr ""
 
-#: ../coreapi/callbacks.c:120
+#: ../coreapi/callbacks.c:226
 msgid "Remote ringing."
 msgstr ""
 
-#: ../coreapi/callbacks.c:139
+#: ../coreapi/callbacks.c:251
 msgid "Early media."
 msgstr ""
 
-#: ../coreapi/callbacks.c:248
+#: ../coreapi/callbacks.c:289
+#, fuzzy, c-format
+msgid "Call with %s is paused."
+msgstr "Chat con %s"
+
+#: ../coreapi/callbacks.c:300
+#, c-format
+msgid "Call answered by %s - on hold."
+msgstr ""
+
+#: ../coreapi/callbacks.c:315
+#, fuzzy
+msgid "Call resumed."
+msgstr "Chiamata terminata"
+
+#: ../coreapi/callbacks.c:320
+#, c-format
+msgid "Call answered by %s."
+msgstr ""
+
+#: ../coreapi/callbacks.c:381
+msgid "We are being paused..."
+msgstr ""
+
+#: ../coreapi/callbacks.c:385
+msgid "We have been resumed..."
+msgstr ""
+
+#: ../coreapi/callbacks.c:422
 msgid "Call terminated."
 msgstr "Chiamata terminata."
 
-#: ../coreapi/callbacks.c:265
+#: ../coreapi/callbacks.c:429
 msgid "User is busy."
 msgstr "Utente occupato"
 
-#: ../coreapi/callbacks.c:266
+#: ../coreapi/callbacks.c:430
 msgid "User is temporarily unavailable."
 msgstr "Utente non disponibile"
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:268
+#: ../coreapi/callbacks.c:432
 msgid "User does not want to be disturbed."
 msgstr "L'utente non vuole essere disturbato"
 
-#: ../coreapi/callbacks.c:269
+#: ../coreapi/callbacks.c:433
 msgid "Call declined."
 msgstr "Chiamata rifiutata"
 
-#: ../coreapi/callbacks.c:281
+#: ../coreapi/callbacks.c:445
 #, fuzzy
 msgid "No response."
 msgstr "timeout no risposta"
 
-#: ../coreapi/callbacks.c:284
+#: ../coreapi/callbacks.c:449
 msgid "Protocol error."
 msgstr ""
 
-#: ../coreapi/callbacks.c:298
+#: ../coreapi/callbacks.c:465
 #, fuzzy
 msgid "Redirected"
 msgstr "Rediretto verso %s..."
 
-#: ../coreapi/callbacks.c:308
+#: ../coreapi/callbacks.c:475
 msgid "Not found"
 msgstr ""
 
-#: ../coreapi/callbacks.c:318
+#: ../coreapi/callbacks.c:485
 msgid "No common codecs"
 msgstr ""
 
-#: ../coreapi/callbacks.c:324
+#: ../coreapi/callbacks.c:491
 #, fuzzy
 msgid "Call failed."
 msgstr "Chiamata rifiutata"
 
-#: ../coreapi/callbacks.c:374
+#: ../coreapi/callbacks.c:527
+#, fuzzy
+msgid "Authentication failure"
+msgstr "Linphone - Autenticazione richiesta"
+
+#: ../coreapi/callbacks.c:553
 #, c-format
 msgid "Registration on %s successful."
 msgstr "Registrazione su %s attiva"
 
-#: ../coreapi/callbacks.c:375
+#: ../coreapi/callbacks.c:554
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "Unregistrazione su %s"
 
-#: ../coreapi/callbacks.c:383
+#: ../coreapi/callbacks.c:570
+msgid "no response timeout"
+msgstr "timeout no risposta"
+
+#: ../coreapi/callbacks.c:573
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "Registrazione su %s fallita: %s"
 
-#: ../coreapi/callbacks.c:383
-msgid "no response timeout"
-msgstr "timeout no risposta"
+#: ../coreapi/callbacks.c:615
+#, c-format
+msgid "We are transferred to %s"
+msgstr ""
 
 #: ../mediastreamer2/src/alaw.c:144 ../mediastreamer2/src/alaw.c:162
 msgid "ITU-G.711 alaw encoder"
@@ -1294,11 +763,11 @@ msgstr "ITU-G.711 alaw encoder"
 msgid "ITU-G.711 alaw decoder"
 msgstr "ITU-G.711 alaw decoder"
 
-#: ../mediastreamer2/src/alsa.c:935
+#: ../mediastreamer2/src/alsa.c:950
 msgid "Alsa sound source"
 msgstr "Alsa sound sorgente"
 
-#: ../mediastreamer2/src/alsa.c:1039
+#: ../mediastreamer2/src/alsa.c:1054
 msgid "Alsa sound output"
 msgstr "Alsa sound riproduzione"
 
@@ -1310,15 +779,15 @@ 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"
 
-#: ../mediastreamer2/src/dtmfgen.c:173 ../mediastreamer2/src/dtmfgen.c:191
+#: ../mediastreamer2/src/dtmfgen.c:274 ../mediastreamer2/src/dtmfgen.c:293
 msgid "DTMF generator"
 msgstr "Generatore DTMF"
 
-#: ../mediastreamer2/src/gsm.c:111 ../mediastreamer2/src/gsm.c:129
+#: ../mediastreamer2/src/gsm.c:120 ../mediastreamer2/src/gsm.c:138
 msgid "The GSM full-rate codec"
 msgstr "GSM full-rate codec"
 
-#: ../mediastreamer2/src/gsm.c:178 ../mediastreamer2/src/gsm.c:196
+#: ../mediastreamer2/src/gsm.c:187 ../mediastreamer2/src/gsm.c:205
 msgid "The GSM codec"
 msgstr "GSM codec"
 
@@ -1334,8 +803,8 @@ msgstr "Sound playback filter for MacOS X Core Audio drivers"
 msgid "A filter to make conferencing"
 msgstr "Un filtro per fare conferenze"
 
-#: ../mediastreamer2/src/msfileplayer.c:295
-#: ../mediastreamer2/src/msfileplayer.c:313
+#: ../mediastreamer2/src/msfileplayer.c:311
+#: ../mediastreamer2/src/msfileplayer.c:329
 msgid "Raw files and wav reader"
 msgstr "Raw files and wav reader"
 
@@ -1349,61 +818,54 @@ 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"
 
-#: ../mediastreamer2/src/msresample.c:221
-#: ../mediastreamer2/src/msresample.c:239
-msgid "frequency resampler"
+#: ../mediastreamer2/src/msresample.c:159
+#: ../mediastreamer2/src/msresample.c:177
+#, fuzzy
+msgid "Audio resampler"
 msgstr "campionatore di frequenza"
 
-#: ../mediastreamer2/src/msrtp.c:358 ../mediastreamer2/src/msrtp.c:376
+#: ../mediastreamer2/src/msrtp.c:369 ../mediastreamer2/src/msrtp.c:387
 msgid "RTP output filter"
 msgstr "RTP output filter"
 
-#: ../mediastreamer2/src/msrtp.c:493 ../mediastreamer2/src/msrtp.c:511
+#: ../mediastreamer2/src/msrtp.c:505 ../mediastreamer2/src/msrtp.c:523
 msgid "RTP input filter"
 msgstr "RTP imput filter"
 
-#: ../mediastreamer2/src/msspeex.c:359 ../mediastreamer2/src/msspeex.c:377
-#: ../mediastreamer2/src/msspeex.c:504 ../mediastreamer2/src/msspeex.c:522
+#: ../mediastreamer2/src/msspeex.c:360 ../mediastreamer2/src/msspeex.c:378
+#: ../mediastreamer2/src/msspeex.c:548 ../mediastreamer2/src/msspeex.c:567
 msgid "The free and wonderful speex codec"
 msgstr "The free and wonderful speex codec"
 
-#: ../mediastreamer2/src/msvolume.c:415 ../mediastreamer2/src/msvolume.c:430
+#: ../mediastreamer2/src/msvolume.c:527 ../mediastreamer2/src/msvolume.c:542
 msgid "A filter that controls and measure sound volume"
 msgstr "Un filtro che controlla e misura il volume"
 
-#: ../mediastreamer2/src/msv4l.c:1011
+#: ../mediastreamer2/src/msv4l.c:1012
 msgid "A video4linux compatible source filter to stream pictures."
 msgstr "Un video4linux filtro per inviare immagini"
 
-#: ../mediastreamer2/src/msv4l2.c:470
+#: ../mediastreamer2/src/msv4l2.c:554
 msgid "A filter to grab pictures from Video4Linux2-powered cameras"
 msgstr "un filtro per catturare immagini da video4linux2 videocamere"
 
-#: ../mediastreamer2/src/nowebcam.c:1836
+#: ../mediastreamer2/src/nowebcam.c:1854
 msgid "A filter that outputs a static image."
 msgstr "Un filtro che invia una immagine statica"
 
-#: ../mediastreamer2/src/oss.c:567
-msgid "Sound capture filter for OSS drivers"
-msgstr "Filtro per la cattura audio per i driver OSS"
-
-#: ../mediastreamer2/src/oss.c:581
-msgid "Sound playback filter for OSS drivers"
-msgstr "Filtro per la riproduzione audio per i driver OSS"
-
-#: ../mediastreamer2/src/pixconv.c:177 ../mediastreamer2/src/pixconv.c:195
+#: ../mediastreamer2/src/pixconv.c:129 ../mediastreamer2/src/pixconv.c:147
 msgid "A pixel format converter"
 msgstr "Un convertitore di formati pixel"
 
-#: ../mediastreamer2/src/sizeconv.c:204
+#: ../mediastreamer2/src/sizeconv.c:202
 msgid "A video size converter"
 msgstr "Un convertitore dimesione video "
 
-#: ../mediastreamer2/src/sizeconv.c:222
+#: ../mediastreamer2/src/sizeconv.c:220
 msgid "a small video size converter"
 msgstr "un piccolo convertitore dimesione video"
 
-#: ../mediastreamer2/src/speexec.c:349 ../mediastreamer2/src/speexec.c:367
+#: ../mediastreamer2/src/speexec.c:276 ../mediastreamer2/src/speexec.c:294
 #, fuzzy
 msgid "Echo canceller using speex library"
 msgstr "Cancellazione eco utilizzando la libreria speex"
@@ -1432,32 +894,32 @@ msgstr "ITU-G.711 ulaw encoder"
 msgid "ITU-G.711 ulaw decoder"
 msgstr "ITU-G.711 ulaw decoder"
 
-#: ../mediastreamer2/src/videodec.c:669 ../mediastreamer2/src/videodec.c:685
-#: ../mediastreamer2/src/videodec.c:768 ../mediastreamer2/src/videodec.c:784
+#: ../mediastreamer2/src/videodec.c:713 ../mediastreamer2/src/videodec.c:729
+#: ../mediastreamer2/src/videodec.c:812 ../mediastreamer2/src/videodec.c:828
 msgid "A H.263 decoder using ffmpeg library"
 msgstr "Un H.263 decoder che utilizza le librerie ffmpeg"
 
-#: ../mediastreamer2/src/videodec.c:702
+#: ../mediastreamer2/src/videodec.c:746
 msgid "A MPEG4 decoder using ffmpeg library"
 msgstr "Un MPEG4 decoder che utilizza le librerie ffmpeg"
 
-#: ../mediastreamer2/src/videodec.c:718
+#: ../mediastreamer2/src/videodec.c:762
 msgid "A RTP/JPEG decoder using ffmpeg library"
 msgstr "Un RTP/JPEG decoder che utilizza le librerie ffmpeg"
 
-#: ../mediastreamer2/src/videodec.c:734
+#: ../mediastreamer2/src/videodec.c:778
 msgid "A MJPEG decoder using ffmpeg library"
 msgstr "Un MJPEG decoder che utilizza le librerie ffmpeg"
 
-#: ../mediastreamer2/src/videodec.c:750
+#: ../mediastreamer2/src/videodec.c:794
 msgid "A snow decoder using ffmpeg library"
 msgstr "Un snow decoder che utilizza le librerie ffmpeg"
 
-#: ../mediastreamer2/src/videoenc.c:861 ../mediastreamer2/src/videoenc.c:943
+#: ../mediastreamer2/src/videoenc.c:908 ../mediastreamer2/src/videoenc.c:990
 msgid "A video H.263 encoder using ffmpeg library."
 msgstr "Un H.263 encoder che utilizza le librerie ffmpeg"
 
-#: ../mediastreamer2/src/videoenc.c:877
+#: ../mediastreamer2/src/videoenc.c:924
 msgid ""
 "A video H.263 encoder using ffmpeg library. It is compliant with old RFC2190 "
 "spec."
@@ -1465,26 +927,26 @@ msgstr ""
 "Un H.263 encoder che utilizza le librerie ffmpeg. Compliante con RFC2190 "
 "spec."
 
-#: ../mediastreamer2/src/videoenc.c:893 ../mediastreamer2/src/videoenc.c:975
+#: ../mediastreamer2/src/videoenc.c:940 ../mediastreamer2/src/videoenc.c:1022
 msgid "A video MPEG4 encoder using ffmpeg library."
 msgstr "Un MPEG4 encoder che utilizza le librerie ffmpeg"
 
-#: ../mediastreamer2/src/videoenc.c:909
+#: ../mediastreamer2/src/videoenc.c:956
 msgid "A video snow encoder using ffmpeg library."
 msgstr "Un snow encoder che utilizza le librerie ffmpeg"
 
-#: ../mediastreamer2/src/videoenc.c:925
+#: ../mediastreamer2/src/videoenc.c:972
 msgid "A RTP/MJPEG encoder using ffmpeg library."
 msgstr "Un RTP/JPEG decoder che utilizza le librerie ffmpeg"
 
-#: ../mediastreamer2/src/videoenc.c:959
+#: ../mediastreamer2/src/videoenc.c:1006
 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."
 
-#: ../mediastreamer2/src/videoenc.c:991
+#: ../mediastreamer2/src/videoenc.c:1038
 msgid ""
 "The snow codec is royalty-free and is open-source. \n"
 "It uses innovative techniques that makes it one of most promising video "
@@ -1493,12 +955,13 @@ msgid ""
 "versions cannot be guaranteed."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:1011
+#: ../mediastreamer2/src/videoenc.c:1058
 msgid "A MJPEG encoder using ffmpeg library."
 msgstr "Un MJPEG encoder che utilizza le librerie ffmpeg"
 
-#: ../mediastreamer2/src/videoout.c:1812 ../mediastreamer2/src/videoout.c:1830
-msgid "A generic video display"
+#: ../mediastreamer2/src/videoout.c:933
+#, fuzzy
+msgid "A SDL-based video display"
 msgstr "Un generico video display"
 
 #: ../mediastreamer2/src/wincevideods.c:969
@@ -1525,10 +988,501 @@ msgstr ""
 msgid "Parametric sound equalizer."
 msgstr "Equalizzatore di suono."
 
-#: ../mediastreamer2/src/msdscap-mingw.cc:1003
+#: ../mediastreamer2/src/msdscap-mingw.cc:1038
 msgid "A webcam grabber based on directshow."
 msgstr "Un webcam grabber basato su directshow."
 
+#: ../mediastreamer2/src/drawdib-display.c:552
+#: ../mediastreamer2/src/drawdib-display.c:570
+msgid "A video display based on windows DrawDib api"
+msgstr ""
+
+#: ../mediastreamer2/src/audiomixer.c:192
+#: ../mediastreamer2/src/audiomixer.c:211
+msgid "A filter that mixes down 16 bit sample audio streams"
+msgstr ""
+
+#: ../mediastreamer2/src/chanadapt.c:110 ../mediastreamer2/src/chanadapt.c:128
+#, fuzzy
+msgid "A filter that converts from mono to stereo and vice versa."
+msgstr "Un filtro che controlla e misura il volume"
+
+#: ../mediastreamer2/src/itc.c:97 ../mediastreamer2/src/itc.c:115
+#: ../mediastreamer2/src/itc.c:197 ../mediastreamer2/src/itc.c:215
+#, fuzzy
+msgid "Inter ticker communication filter."
+msgstr "Errore di comunicazione"
+
+#: ../mediastreamer2/src/extdisplay.c:62 ../mediastreamer2/src/extdisplay.c:79
+msgid "A display filter sending the buffers to draw to the upper layer"
+msgstr ""
+
+#: ../mediastreamer2/src/msiounit.c:619
+#, fuzzy
+msgid "Sound capture filter for MacOS X Audio Unit Service"
+msgstr "Sound capture filter for MacOS X Audio Queue Service"
+
+#: ../mediastreamer2/src/msiounit.c:633
+#, fuzzy
+msgid "Sound playback filter for MacOS X Audio Unit Service"
+msgstr "Sound playback filter for MacOS X Audio Queue Service"
+
+#: ../mediastreamer2/src/x11video.c:562
+msgid "A video display using X11+Xv"
+msgstr ""
+
+#. .id=
+#. .name=
+#. .text=
+#: ../mediastreamer2/src/msandroid.cpp:370
+#, fuzzy
+msgid "Sound capture filter for Android"
+msgstr "Filtro per la cattura audio per i driver OSS"
+
+#. .id=
+#. .name=
+#. .text=
+#: ../mediastreamer2/src/msandroid.cpp:667
+#, fuzzy
+msgid "Sound playback filter for Android"
+msgstr "Filtro per la riproduzione audio per i driver OSS"
+
+#: ../mediastreamer2/src/msandroidvideo.cpp:134
+#, fuzzy
+msgid "A filter that captures Android video."
+msgstr "Un filtro che controlla e misura il volume"
+
+#~ msgid "Incoming call from %s"
+#~ msgstr "Chiamata proveniente da %s"
+
+#~ msgid "#"
+#~ msgstr "#"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "0"
+#~ msgstr "0"
+
+#~ msgid "1"
+#~ msgstr "1"
+
+#~ msgid "2"
+#~ msgstr "2"
+
+#~ msgid "3"
+#~ msgstr "3"
+
+#~ msgid "4"
+#~ msgstr "4"
+
+#~ msgid "5"
+#~ msgstr "5"
+
+#~ msgid "6"
+#~ msgstr "6"
+
+#~ msgid "7"
+#~ msgstr "7"
+
+#~ msgid "8"
+#~ msgstr "8"
+
+#~ msgid "9"
+#~ msgstr "9"
+
+#, fuzzy
+#~ msgid "<b>Add contacts from directory</b>"
+#~ msgstr "Aggiungi nuovo contatto dalla directory %s"
+
+#~ msgid "<b>Contact list</b>"
+#~ msgstr "<b>Lista contatti</b>"
+
+#~ msgid "<b>Welcome !</b>"
+#~ msgstr "<b>Benvenuto !</b>"
+
+#~ msgid "A"
+#~ msgstr "A"
+
+#~ msgid ""
+#~ "ADSL\n"
+#~ "Fiber Channel"
+#~ msgstr ""
+#~ "ADSL\n"
+#~ "Fibra Ottica"
+
+#~ msgid ""
+#~ "All users\n"
+#~ "Online users"
+#~ msgstr ""
+#~ "Tutti gli utenti\n"
+#~ "Utenti Online"
+
+#~ msgid "Assistant"
+#~ msgstr "Configuratore"
+
+#~ msgid "Audio & Video"
+#~ msgstr "Audio & Video"
+
+#~ msgid "Audio only"
+#~ msgstr "Solo Audio"
+
+#~ msgid "Automatically log me in"
+#~ msgstr "Login Automatico"
+
+#~ msgid "B"
+#~ msgstr "B"
+
+#~ msgid "C"
+#~ msgstr "C"
+
+#, fuzzy
+#~ msgid "Call Details"
+#~ msgstr "Chiamata %s"
+
+#~ msgid "Call history"
+#~ msgstr "Cronologia"
+
+#, fuzzy
+#~ msgid "Contacts"
+#~ msgstr "In connessione"
+
+#~ msgid "D"
+#~ msgstr "D"
+
+#~ msgid "Default"
+#~ msgstr "Default"
+
+#~ msgid "Duration"
+#~ msgstr "Durata"
+
+#~ msgid "Duration:"
+#~ msgstr "Durata:"
+
+#~ msgid "Enable self-view"
+#~ msgstr "Self-view abilitato"
+
+#~ msgid "Enter username, phone number, or full sip address"
+#~ msgstr "Inserisci username, numero o indirizzo sip"
+
+#~ msgid "In call"
+#~ msgstr "In chiamata"
+
+#~ msgid "Internet connection:"
+#~ msgstr "Connessione Internet:"
+
+#~ msgid "Login information"
+#~ msgstr "Credenziali di accesso"
+
+#~ msgid "My current identity:"
+#~ msgstr "IdentitĂ  corrente"
+
+#~ msgid "Password"
+#~ msgstr "Password"
+
+#~ msgid "SIP address or phone number:"
+#~ msgstr "Indirizzo sip o numero."
+
+#~ msgid "Start call"
+#~ msgstr "Inizia chiamata"
+
+#~ msgid "Terminate call"
+#~ msgstr "Termina chiamata"
+
+#~ msgid "Username"
+#~ msgstr "Username"
+
+#~ msgid "_Linphone"
+#~ msgstr "_Linphone"
+
+#~ msgid "_Modes"
+#~ msgstr "_Modi"
+
+#~ msgid "in"
+#~ msgstr "in"
+
+#~ msgid "label"
+#~ msgstr "etichetta"
+
+#~ msgid "About linphone"
+#~ msgstr "Info Linphone"
+
+#, fuzzy
+#~ msgid "An internet video phone using the standard SIP (rfc3261) protocol."
+#~ msgstr "Un internet video telefono basato sullo standard SIP (rfc3261)"
+
+#~ msgid "Created by Simon Morlat\n"
+#~ msgstr "Creato da Simon Morlat\n"
+
+#~ msgid "<b>Contact information</b>"
+#~ msgstr "<b>Contact informazioni</b>"
+
+#~ msgid "Allow this contact to see my presence status"
+#~ msgstr "Permitti al contatto di vedere il mio stato di presenza"
+
+#~ msgid "SIP Address"
+#~ msgstr "Rubrica"
+
+#~ msgid "Show this contact presence status"
+#~ msgstr "Mostra lo stato di presenza del contatto"
+
+#~ msgid "Linphone debug window"
+#~ msgstr "Linphone debug window"
+
+#~ msgid "Password:"
+#~ msgstr "Password:"
+
+#~ msgid "Please enter the domain password"
+#~ msgstr "Prego inserire la password di dominio"
+
+#~ msgid "Configure a SIP account"
+#~ msgstr "Configurazione SIP account"
+
+#~ msgid "Linphone - Configure a SIP account"
+#~ msgstr "Linphone - Configurazione SIP account"
+
+#~ msgid "Publish presence information"
+#~ msgstr "Pubblica stato della presenza"
+
+#~ msgid "Register at startup"
+#~ msgstr "Registra all'avvio"
+
+#~ msgid "Registration duration (sec):"
+#~ msgstr "Durata registrazione (sec)"
+
+#~ msgid "Route (optional):"
+#~ msgstr "Rotta (opzionale)"
+
+#~ msgid "SIP Proxy address:"
+#~ msgstr "Indirizzo sip proxy:"
+
+#~ msgid "Your SIP identity:"
+#~ msgstr "IdentitĂ  SIP"
+
+#~ msgid "sip:"
+#~ msgstr "sip:"
+
+#~ msgid "Send"
+#~ msgstr "Invia"
+
+#~ msgid "Accept"
+#~ msgstr "Accetta"
+
+#~ msgid "Decline"
+#~ msgstr "Rifiuta"
+
+#~ msgid "Incoming call from"
+#~ msgstr "Chiama in entrata da"
+
+#~ msgid "Linphone - Incoming call"
+#~ msgstr "Linphone - Chiamata in entrata"
+
+#~ msgid "0 stands for \"unlimited\""
+#~ msgstr "0 sta per illimitato"
+
+#~ msgid "<b>Audio</b>"
+#~ msgstr "<b>Audio</b>"
+
+#~ msgid "<b>Bandwidth control</b>"
+#~ msgstr "<b>Gestione banda</b>"
+
+#~ msgid "<b>Codecs</b>"
+#~ msgstr "<b>Codecs</b>"
+
+#~ msgid "<b>Default identity</b>"
+#~ msgstr "<b>IdentitĂ  di default</b>"
+
+#~ msgid "<b>Language</b>"
+#~ msgstr "<b>Linguaggio</b>"
+
+#, fuzzy
+#~ msgid "<b>Level</b>"
+#~ msgstr "<b>Linguaggio</b>"
+
+#~ msgid "<b>NAT and Firewall</b>"
+#~ msgstr "<b>NAT and Firewall</b>"
+
+#~ msgid "<b>Ports</b>"
+#~ msgstr "<b>Porte</b>"
+
+#~ msgid "<b>Privacy</b>"
+#~ msgstr "<b>Privacy</b>"
+
+#~ msgid "<b>Proxy accounts</b>"
+#~ msgstr "<b>Account proxy</b>"
+
+#~ msgid "<b>Transport</b>"
+#~ msgstr "<b>Transporto</b>"
+
+#~ msgid "<b>Video</b>"
+#~ msgstr "<b>Video</b>"
+
+#~ msgid "ALSA special device (optional):"
+#~ msgstr "Dispositivo ALSA (optional):"
+
+#~ msgid "Add"
+#~ msgstr "Aggiungi"
+
+#~ msgid "Audio RTP/UDP:"
+#~ msgstr "Audio RTP/UDP:"
+
+#~ msgid ""
+#~ "Audio codecs\n"
+#~ "Video codecs"
+#~ msgstr ""
+#~ "Audio codecs\n"
+#~ "Video codecs"
+
+#~ msgid "Behind NAT / Firewall (specify gateway IP below)"
+#~ msgstr "Dietro NAT / Firewall (IP del gateway)"
+
+#~ msgid "Behind NAT / Firewall (use STUN to resolve)"
+#~ msgstr "Dietro NAT / Firewall (utilizza STUN)"
+
+#~ msgid "CIF"
+#~ msgstr "CIF"
+
+#~ msgid "Capture device:"
+#~ msgstr "Dispositivo microfono:"
+
+#~ msgid "Codecs"
+#~ msgstr "Codec"
+
+#~ msgid "Direct connection to the Internet"
+#~ msgstr "Connessione diretta a internet"
+
+#~ msgid "Disable"
+#~ msgstr "Disattivato"
+
+#~ msgid "Done"
+#~ msgstr "Fatto"
+
+#~ msgid "Download speed limit in Kbit/sec:"
+#~ msgstr "Velocita massima in Dowload Kbit/sec"
+
+#~ msgid "Edit"
+#~ msgstr "Edita"
+
+#~ msgid "Enable"
+#~ msgstr "Attivato"
+
+#~ msgid "Enable echo cancellation"
+#~ msgstr "Attiva cancellazione eco"
+
+#~ msgid "Erase all passwords"
+#~ msgstr "Cancella tutte le password"
+
+#~ msgid "Manage SIP Accounts"
+#~ msgstr "Gestici SIP Account"
+
+#~ msgid "Multimedia settings"
+#~ msgstr "Impostazioni multimediali"
+
+#~ msgid "Network settings"
+#~ msgstr "Impostazioni di rete"
+
+#~ msgid "Playback device:"
+#~ msgstr "Dispositivo uscita audio:"
+
+#~ msgid "Prefered video resolution:"
+#~ msgstr "Risoluzione video preferita"
+
+#~ msgid "Public IP address:"
+#~ msgstr "Indirizzo ip pubblico:"
+
+#~ msgid ""
+#~ "Register to FONICS\n"
+#~ "virtual network !"
+#~ msgstr ""
+#~ "Registrati a  FONICS\n"
+#~ "virtual network !"
+
+#~ msgid "Remove"
+#~ msgstr "Rimuovi"
+
+#~ msgid "Ring device:"
+#~ msgstr "Dispositivo squillo:"
+
+#~ msgid "Ring sound:"
+#~ msgstr "Suoneria:"
+
+#~ msgid "SIP (UDP):"
+#~ msgstr "SIP (UDP)"
+
+#~ msgid "Send DTMFs as SIP info"
+#~ msgstr "Invia DTMF come SIP info"
+
+#~ msgid "Set Maximum Transmission Unit:"
+#~ msgstr "Imposta Maximum Transmission Unit:"
+
+#~ msgid "Settings"
+#~ msgstr "Preferenze"
+
+#~ msgid "Stun server:"
+#~ msgstr "Stun server:"
+
+#~ 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"
+
+#~ msgid "Upload speed limit in Kbit/sec:"
+#~ msgstr "VelocitĂ  massima in upload Kbit/sec:"
+
+#~ msgid "Use IPv6 instead of IPv4"
+#~ msgstr "Usa IPv6 invece che IPv4"
+
+#~ msgid "User interface"
+#~ msgstr "Interfaccia utente"
+
+#~ msgid "Video RTP/UDP:"
+#~ msgstr "Video RTP/UDP"
+
+#~ msgid "Video input device:"
+#~ msgstr "Dispositivo Video:"
+
+#~ msgid "Your display name (eg: John Doe):"
+#~ msgstr "Nome visualizzato (es: Mario Rossi):"
+
+#~ msgid "Your resulting SIP address:"
+#~ msgstr "Il tuo indirizzo sip:"
+
+#~ msgid "Your username:"
+#~ msgstr "Username"
+
+#~ msgid "a sound card\n"
+#~ msgstr "una scheda audio\n"
+
+#~ msgid "default camera"
+#~ msgstr "default videocamera"
+
+#~ msgid "default soundcard"
+#~ msgstr "default scheda audio"
+
+#~ msgid "default soundcard\n"
+#~ msgstr "default scheda audio\n"
+
+#~ msgid "<b>Search somebody</b>"
+#~ msgstr "<b>Cerca</b>"
+
+#~ msgid "Add to my list"
+#~ msgstr "Aggiungi alla mia lista"
+
+#~ msgid "Search contacts in directory"
+#~ msgstr "Cerca contatti nella directory"
+
+#~ msgid "Linphone"
+#~ msgstr "Linphone"
+
+#~ msgid "Please wait"
+#~ msgstr "Prego attendere"
+
+#~ 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"
 
@@ -1557,18 +1511,12 @@ msgstr "Un webcam grabber basato su directshow."
 #~ "L'utente non è raggiungibile ma ti ha invitato\n"
 #~ "per contattarlo usare l'indirizzo alternativo:"
 
-#~ msgid "<b>Terminate call</b>"
-#~ msgstr "<b>Termina chiamata</b>"
-
 #~ msgid "Digits"
 #~ msgstr "Caratteri"
 
 #~ msgid "Main view"
 #~ msgstr "Vista principale"
 
-#~ msgid "Show current call"
-#~ msgstr "Mostra chiamata corrente"
-
 #~ msgid "No nat/firewall address supplied !"
 #~ msgstr "Non è stato fornito un indirizzo nat/firewall!"
 
diff --git a/po/ja.po b/po/ja.po
index f312c7afa1c2513de74e5eeff08e560d4c7a6473..6a5c20efacc73c71f3ae2291c10014b385f22812 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,58 +8,53 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone 0.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 17:16+0200\n"
+"POT-Creation-Date: 2011-02-07 10:59+0100\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../gtk-glade/support.c:49 ../gtk-glade/support.c:73
-#: ../gtk-glade/support.c:102
+#: ../gtk/support.c:49 ../gtk/support.c:73 ../gtk/support.c:102
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "pixmapファイルが見つかりません %s"
 
-#: ../gtk-glade/chat.c:27
+#: ../gtk/chat.c:27
 #, c-format
 msgid "Chat with %s"
 msgstr ""
 
-#: ../gtk-glade/main.c:94
+#: ../gtk/main.c:74
 msgid "log to stdout some debug information while running."
 msgstr ""
 
-#: ../gtk-glade/main.c:101
+#: ../gtk/main.c:81
 msgid "Start only in the system tray, do not show the main interface."
 msgstr ""
 
-#: ../gtk-glade/main.c:108
+#: ../gtk/main.c:88
 msgid "address to call right now"
 msgstr ""
 
-#: ../gtk-glade/main.c:115
+#: ../gtk/main.c:95
 msgid "if set automatically answer incoming calls"
 msgstr ""
 
-#: ../gtk-glade/main.c:123
+#: ../gtk/main.c:103
 msgid ""
 "Specifiy a working directory (should be the base of the installation, eg: c:"
 "\\Program Files\\Linphone)"
 msgstr ""
 
-#: ../gtk-glade/main.c:402
+#: ../gtk/main.c:479
 #, c-format
 msgid "Call with %s"
 msgstr ""
 
-#: ../gtk-glade/main.c:720
-#, c-format
-msgid "Incoming call from %s"
-msgstr ""
-
-#: ../gtk-glade/main.c:759
+#: ../gtk/main.c:862
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
@@ -68,999 +63,374 @@ msgid ""
 "If you answer no, this person will be temporarily blacklisted."
 msgstr ""
 
-#: ../gtk-glade/main.c:837
+#: ../gtk/main.c:940
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at domain <i>%s</i>:"
 msgstr ""
 
-#: ../gtk-glade/main.c:934
+#: ../gtk/main.c:1076
 msgid "Website link"
 msgstr ""
 
-#: ../gtk-glade/main.c:970
+#: ../gtk/main.c:1112
 msgid "Linphone - a video internet phone"
 msgstr ""
 
-#: ../gtk-glade/main.c:989
+#: ../gtk/main.c:1131
 #, c-format
 msgid "%s (Default)"
 msgstr ""
 
-#: ../gtk-glade/main.c:1221
+#: ../gtk/main.c:1382
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
 msgstr ""
 
-#: ../gtk-glade/main.c:1275
+#: ../gtk/main.c:1441
 msgid "A free SIP video-phone"
 msgstr ""
 
-#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:258
-#: ../gtk-glade/contact.glade.h:3
+#: ../gtk/friendlist.c:192 ../gtk/propertybox.c:271
 msgid "Name"
 msgstr "名前"
 
-#: ../gtk-glade/friendlist.c:205
+#: ../gtk/friendlist.c:205
 #, fuzzy
 msgid "Presence status"
 msgstr "状態"
 
-#: ../gtk-glade/friendlist.c:242
+#: ../gtk/friendlist.c:242
 #, c-format
 msgid "Search in %s directory"
 msgstr ""
 
-#: ../gtk-glade/friendlist.c:450
+#: ../gtk/friendlist.c:450
 msgid "Invalid sip contact !"
 msgstr ""
 
-#: ../gtk-glade/friendlist.c:492
+#: ../gtk/friendlist.c:495
 #, c-format
 msgid "Call %s"
 msgstr ""
 
-#: ../gtk-glade/friendlist.c:493
+#: ../gtk/friendlist.c:496
 #, c-format
 msgid "Send text to %s"
 msgstr ""
 
-#: ../gtk-glade/friendlist.c:494
+#: ../gtk/friendlist.c:497
 #, fuzzy, c-format
 msgid "Edit contact '%s'"
 msgstr "(接続するための情報がありません!)"
 
-#: ../gtk-glade/friendlist.c:495
+#: ../gtk/friendlist.c:498
 #, c-format
 msgid "Delete contact '%s'"
 msgstr ""
 
-#: ../gtk-glade/friendlist.c:537
+#: ../gtk/friendlist.c:540
 #, c-format
 msgid "Add new contact from %s directory"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:264
+#: ../gtk/propertybox.c:277
 msgid "Rate (Hz)"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:270
+#: ../gtk/propertybox.c:283
 msgid "Status"
 msgstr "状態"
 
-#: ../gtk-glade/propertybox.c:276
+#: ../gtk/propertybox.c:289
 msgid "Min bitrate (kbit/s)"
 msgstr "最低限のビットレート (kbit/s)"
 
-#: ../gtk-glade/propertybox.c:283
+#: ../gtk/propertybox.c:296
 msgid "Parameters"
 msgstr "パラメーター"
 
-#: ../gtk-glade/propertybox.c:312 ../gtk-glade/propertybox.c:451
+#: ../gtk/propertybox.c:325 ../gtk/propertybox.c:464
 msgid "Enabled"
 msgstr "使用する"
 
-#: ../gtk-glade/propertybox.c:313 ../gtk-glade/propertybox.c:451
+#: ../gtk/propertybox.c:326 ../gtk/propertybox.c:464
 msgid "Disabled"
 msgstr "使用しない"
 
-#: ../gtk-glade/propertybox.c:496
+#: ../gtk/propertybox.c:509
 msgid "Account"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:636
+#: ../gtk/propertybox.c:649
 msgid "English"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:637
+#: ../gtk/propertybox.c:650
 msgid "French"
 msgstr "Français"
 
-#: ../gtk-glade/propertybox.c:638
+#: ../gtk/propertybox.c:651
 msgid "Swedish"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:639
+#: ../gtk/propertybox.c:652
 msgid "Italian"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:640
+#: ../gtk/propertybox.c:653
 msgid "Spanish"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:641
+#: ../gtk/propertybox.c:654
 msgid "Brazilian Portugese"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:642
+#: ../gtk/propertybox.c:655
 msgid "Polish"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:643
+#: ../gtk/propertybox.c:656
 msgid "German"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:644
+#: ../gtk/propertybox.c:657
 msgid "Russian"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:645
+#: ../gtk/propertybox.c:658
 msgid "Japanese"
 msgstr "日本語"
 
-#: ../gtk-glade/propertybox.c:646
+#: ../gtk/propertybox.c:659
 msgid "Dutch"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:647
+#: ../gtk/propertybox.c:660
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ../gtk-glade/propertybox.c:648
+#: ../gtk/propertybox.c:661
 msgid "Czech"
 msgstr "čeština"
 
-#: ../gtk-glade/propertybox.c:649
+#: ../gtk/propertybox.c:662
 msgid "Chinese"
 msgstr "简体中文"
 
-#: ../gtk-glade/propertybox.c:706
+#: ../gtk/propertybox.c:719
 msgid ""
 "You need to restart linphone for the new language selection to take effect."
 msgstr ""
 
-#: ../gtk-glade/update.c:80
+#: ../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-glade/update.c:91
+#: ../gtk/update.c:91
 msgid "You are running the lastest version."
 msgstr ""
 
-#: ../gtk-glade/buddylookup.c:85
+#: ../gtk/buddylookup.c:85
 msgid "Firstname, Lastname"
 msgstr ""
 
-#: ../gtk-glade/buddylookup.c:160
+#: ../gtk/buddylookup.c:160
 msgid "Error communicating with server."
 msgstr ""
 
-#: ../gtk-glade/buddylookup.c:164
+#: ../gtk/buddylookup.c:164
 #, fuzzy
 msgid "Connecting..."
 msgstr "コネクション"
 
-#: ../gtk-glade/buddylookup.c:168
+#: ../gtk/buddylookup.c:168
 #, fuzzy
 msgid "Connected"
 msgstr "接続しました。"
 
-#: ../gtk-glade/buddylookup.c:172
+#: ../gtk/buddylookup.c:172
 msgid "Receiving data..."
 msgstr ""
 
-#: ../gtk-glade/buddylookup.c:180
+#: ../gtk/buddylookup.c:180
 #, c-format
 msgid "Found %i contact"
 msgid_plural "Found %i contacts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gtk-glade/setupwizard.c:25
+#: ../gtk/setupwizard.c:25
 msgid ""
 "Welcome !\n"
 "This assistant will help you to use a SIP account for your calls."
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:34
+#: ../gtk/setupwizard.c:34
 msgid "Create an account by choosing a username"
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:35
+#: ../gtk/setupwizard.c:35
 msgid "I have already an account and just want to use it"
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:53
+#: ../gtk/setupwizard.c:53
 msgid "Please choose a username:"
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:54
+#: ../gtk/setupwizard.c:54
 #, fuzzy
 msgid "Username:"
 msgstr "ユーザーマニュアル"
 
-#: ../gtk-glade/setupwizard.c:92
+#: ../gtk/setupwizard.c:92
 #, c-format
 msgid "Checking if '%s' is available..."
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:97 ../gtk-glade/setupwizard.c:164
+#: ../gtk/setupwizard.c:97 ../gtk/setupwizard.c:164
 msgid "Please wait..."
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:101
+#: ../gtk/setupwizard.c:101
 msgid "Sorry this username already exists. Please try a new one."
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:103 ../gtk-glade/setupwizard.c:168
-msgid "Ok !"
-msgstr ""
-
-#: ../gtk-glade/setupwizard.c:106 ../gtk-glade/setupwizard.c:171
-msgid "Communication problem, please try again later."
-msgstr ""
-
-#: ../gtk-glade/setupwizard.c:134
-msgid "Thank you. Your account is now configured and ready for use."
-msgstr ""
-
-#: ../gtk-glade/setupwizard.c:228
-msgid "Welcome to the account setup assistant"
-msgstr ""
-
-#: ../gtk-glade/setupwizard.c:232
-msgid "Account setup assistant"
-msgstr ""
-
-#: ../gtk-glade/setupwizard.c:236
-msgid "Choosing a username"
-msgstr ""
-
-#: ../gtk-glade/setupwizard.c:240
-msgid "Verifying"
-msgstr ""
-
-#: ../gtk-glade/setupwizard.c:244
-#, fuzzy
-msgid "Confirmation"
-msgstr "情報"
-
-#: ../gtk-glade/setupwizard.c:249
-msgid "Creating your account"
-msgstr ""
-
-#: ../gtk-glade/setupwizard.c:253
-msgid "Now ready !"
-msgstr ""
-
-#: ../gtk-glade/incall_view.c:113
-#, fuzzy
-msgid "<b>Calling...</b>"
-msgstr "接続中"
-
-#: ../gtk-glade/incall_view.c:116 ../gtk-glade/incall_view.c:138
-msgid "00::00::00"
-msgstr ""
-
-#: ../gtk-glade/incall_view.c:136
-#, fuzzy
-msgid "<b>In call with</b>"
-msgstr "接続中"
-
-#: ../gtk-glade/incall_view.c:154
-#, c-format
-msgid "%02i::%02i::%02i"
-msgstr ""
-
-#: ../gtk-glade/incall_view.c:170
-#, fuzzy
-msgid "<b>Call ended.</b>"
-msgstr "通話は拒否されました。"
-
-#: ../gtk-glade/incall_view.c:188
-msgid "Unmute"
-msgstr ""
-
-#: ../gtk-glade/incall_view.c:195 ../gtk-glade/main.glade.h:43
-msgid "Mute"
-msgstr ""
-
-#: ../gtk-glade/loginframe.c:83
-#, c-format
-msgid "Please enter login information for %s"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:1
-msgid "#"
-msgstr "#"
-
-#: ../gtk-glade/main.glade.h:2
-msgid "*"
-msgstr "*"
-
-#: ../gtk-glade/main.glade.h:3
-msgid "0"
-msgstr "0"
-
-#: ../gtk-glade/main.glade.h:4
-msgid "1"
-msgstr "1"
-
-#: ../gtk-glade/main.glade.h:5
-msgid "2"
-msgstr "2"
-
-#: ../gtk-glade/main.glade.h:6
-msgid "3"
-msgstr "3"
-
-#: ../gtk-glade/main.glade.h:7
-msgid "4"
-msgstr "4"
-
-#: ../gtk-glade/main.glade.h:8
-msgid "5"
-msgstr "5"
-
-#: ../gtk-glade/main.glade.h:9
-msgid "6"
-msgstr "6"
-
-#: ../gtk-glade/main.glade.h:10
-msgid "7"
-msgstr "7"
-
-#: ../gtk-glade/main.glade.h:11
-msgid "8"
-msgstr "8"
-
-#: ../gtk-glade/main.glade.h:12
-msgid "9"
-msgstr "9"
-
-#: ../gtk-glade/main.glade.h:13
-#, fuzzy
-msgid "<b>Add contacts from directory</b>"
-msgstr "コーデックの情報"
-
-#: ../gtk-glade/main.glade.h:14
-#, fuzzy
-msgid "<b>Contact list</b>"
-msgstr "接続中"
-
-#: ../gtk-glade/main.glade.h:15
-#, fuzzy
-msgid "<b>Welcome !</b>"
-msgstr "接続中"
-
-#: ../gtk-glade/main.glade.h:16
-msgid "A"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:17
-msgid ""
-"ADSL\n"
-"Fiber Channel"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:19
-msgid ""
-"All users\n"
-"Online users"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:21
-msgid "Assistant"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:22
-#, fuzzy
-msgid "Audio & Video"
-msgstr "オーディオコーデックのプロパティー"
-
-#: ../gtk-glade/main.glade.h:23
-#, fuzzy
-msgid "Audio only"
-msgstr "オーディオ"
-
-#: ../gtk-glade/main.glade.h:24
-msgid "Automatically log me in"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:25
-msgid "B"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:26 ../gtk-glade/parameters.glade.h:21
-msgid "C"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:27
-msgid "Call Details"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:28 ../gtk-glade/call_logs.glade.h:1
-msgid "Call history"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:29
-msgid "Check for updates"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:30
-#, fuzzy
-msgid "Contacts"
-msgstr "接続中"
-
-#: ../gtk-glade/main.glade.h:31
-msgid "D"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:32
-msgid "Default"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:33
-#, fuzzy
-msgid "Duration"
-msgstr "情報"
-
-#: ../gtk-glade/main.glade.h:34
-#, fuzzy
-msgid "Duration:"
-msgstr "情報"
-
-#: ../gtk-glade/main.glade.h:35
-#, fuzzy
-msgid "Enable self-view"
-msgstr "使用する"
-
-#: ../gtk-glade/main.glade.h:36
-msgid "Enter username, phone number, or full sip address"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:37
-msgid "Homepage"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:38
-msgid "In call"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:39
-msgid "Internet connection:"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:40
-msgid "Keypad"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:41
-#, fuzzy
-msgid "Login information"
-msgstr "コーデックの情報"
-
-#: ../gtk-glade/main.glade.h:42
-msgid "Lookup:"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:44
-#, fuzzy
-msgid "My current identity:"
-msgstr "個人情報"
-
-#: ../gtk-glade/main.glade.h:45
-#, fuzzy
-msgid "Password"
-msgstr "パスワード"
-
-#: ../gtk-glade/main.glade.h:46
-#, fuzzy
-msgid "SIP address or phone number:"
-msgstr "レジストラサーバーのSIPアドレス"
-
-#: ../gtk-glade/main.glade.h:47
-msgid "Search"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:48
-msgid "Show debug messages"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:49
-msgid "Start call"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:50
-msgid "Terminate call"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:51
-#, fuzzy
-msgid "Username"
-msgstr "ユーザーマニュアル"
-
-#: ../gtk-glade/main.glade.h:52
-#, fuzzy
-msgid "_Linphone"
-msgstr "Linphone"
-
-#: ../gtk-glade/main.glade.h:53
-#, fuzzy
-msgid "_Modes"
-msgstr "コーデック"
-
-#: ../gtk-glade/main.glade.h:54
-msgid "in"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:55
-msgid "label"
-msgstr ""
-
-#: ../gtk-glade/about.glade.h:1
-#, fuzzy
-msgid "About linphone"
-msgstr "Linphone"
-
-#: ../gtk-glade/about.glade.h:2
-msgid "An internet video phone using the standard SIP (rfc3261) protocol."
-msgstr ""
-
-#: ../gtk-glade/about.glade.h:3
-msgid "Created by Simon Morlat\n"
-msgstr ""
-
-#: ../gtk-glade/about.glade.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"
-msgstr ""
-
-#: ../gtk-glade/contact.glade.h:1
-#, fuzzy
-msgid "<b>Contact information</b>"
-msgstr "コーデックの情報"
-
-#: ../gtk-glade/contact.glade.h:2
-msgid "Allow this contact to see my presence status"
-msgstr ""
-
-#: ../gtk-glade/contact.glade.h:4
-#, fuzzy
-msgid "SIP Address"
-msgstr "アドレス"
-
-#: ../gtk-glade/contact.glade.h:5
-msgid "Show this contact presence status"
-msgstr ""
-
-#: ../gtk-glade/contact.glade.h:6 ../gtk-glade/password.glade.h:5
-#: ../gtk-glade/sip_account.glade.h:9
-msgid "gtk-cancel"
-msgstr ""
-
-#: ../gtk-glade/contact.glade.h:7 ../gtk-glade/password.glade.h:6
-#: ../gtk-glade/sip_account.glade.h:10
-msgid "gtk-ok"
-msgstr ""
-
-#: ../gtk-glade/log.glade.h:1
-msgid "Linphone debug window"
-msgstr ""
-
-#: ../gtk-glade/log.glade.h:2 ../gtk-glade/call_logs.glade.h:2
-#: ../gtk-glade/chatroom.glade.h:2
-msgid "gtk-close"
-msgstr ""
-
-#: ../gtk-glade/password.glade.h:1
-msgid "Linphone - Authentication required"
-msgstr ""
-
-#: ../gtk-glade/password.glade.h:2
-#, fuzzy
-msgid "Password:"
-msgstr "パスワード"
-
-#: ../gtk-glade/password.glade.h:3
-msgid "Please enter the domain password"
-msgstr ""
-
-#: ../gtk-glade/password.glade.h:4
-msgid "UserID"
-msgstr ""
-
-#: ../gtk-glade/sip_account.glade.h:1
-msgid "Configure a SIP account"
-msgstr ""
-
-#: ../gtk-glade/sip_account.glade.h:2
-msgid "Linphone - Configure a SIP account"
-msgstr ""
-
-#: ../gtk-glade/sip_account.glade.h:3
-#, fuzzy
-msgid "Publish presence information"
-msgstr "コーデックの情報"
-
-#: ../gtk-glade/sip_account.glade.h:4
-msgid "Register at startup"
-msgstr ""
-
-#: ../gtk-glade/sip_account.glade.h:5
-#, fuzzy
-msgid "Registration duration (sec):"
-msgstr "登録しました。"
-
-#: ../gtk-glade/sip_account.glade.h:6
-msgid "Route (optional):"
-msgstr ""
-
-#: ../gtk-glade/sip_account.glade.h:7
-#, fuzzy
-msgid "SIP Proxy address:"
-msgstr "Sipアドレス:"
-
-#: ../gtk-glade/sip_account.glade.h:8
-#, fuzzy
-msgid "Your SIP identity:"
-msgstr "個人情報"
-
-#: ../gtk-glade/sip_account.glade.h:11
-msgid "sip:"
-msgstr "sip:"
-
-#: ../gtk-glade/chatroom.glade.h:1
-#, fuzzy
-msgid "Send"
-msgstr "サウンド"
-
-#: ../gtk-glade/incoming_call.glade.h:1
-msgid "Accept"
-msgstr ""
-
-#: ../gtk-glade/incoming_call.glade.h:2
-#, fuzzy
-msgid "Decline"
-msgstr "ライン入力"
-
-#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:369
-msgid "Incoming call"
-msgstr ""
-
-#: ../gtk-glade/incoming_call.glade.h:4
-msgid "Incoming call from"
-msgstr ""
-
-#: ../gtk-glade/incoming_call.glade.h:5
-msgid "Linphone - Incoming call"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:1
-msgid "0 stands for \"unlimited\""
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:2
-#, fuzzy
-msgid "<b>Audio</b>"
-msgstr "接続中"
-
-#: ../gtk-glade/parameters.glade.h:3
-msgid "<b>Bandwidth control</b>"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:4
-#, fuzzy
-msgid "<b>Codecs</b>"
-msgstr "接続中"
-
-#: ../gtk-glade/parameters.glade.h:5
-msgid "<b>Default identity</b>"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:6
-msgid "<b>Language</b>"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:7
-#, fuzzy
-msgid "<b>Level</b>"
-msgstr "接続中"
-
-#: ../gtk-glade/parameters.glade.h:8
-msgid "<b>NAT and Firewall</b>"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:9
-#, fuzzy
-msgid "<b>Ports</b>"
-msgstr "接続中"
-
-#: ../gtk-glade/parameters.glade.h:10
-msgid "<b>Privacy</b>"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:11
-#, fuzzy
-msgid "<b>Proxy accounts</b>"
-msgstr "接続中"
-
-#: ../gtk-glade/parameters.glade.h:12
-#, fuzzy
-msgid "<b>Transport</b>"
-msgstr "接続中"
-
-#: ../gtk-glade/parameters.glade.h:13
-msgid "<b>Video</b>"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:14
-msgid "ALSA special device (optional):"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:15
-msgid "Add"
-msgstr "追加する"
-
-#: ../gtk-glade/parameters.glade.h:16
-msgid "Audio RTP/UDP:"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:17
-#, fuzzy
-msgid ""
-"Audio codecs\n"
-"Video codecs"
-msgstr "オーディオコーデックのプロパティー"
-
-#: ../gtk-glade/parameters.glade.h:19
-msgid "Behind NAT / Firewall (specify gateway IP below)"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:20
-msgid "Behind NAT / Firewall (use STUN to resolve)"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:22
-msgid "CIF"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:23
-#, fuzzy
-msgid "Capture device:"
-msgstr "使用するサウンドデバイス"
-
-#: ../gtk-glade/parameters.glade.h:24
-#, fuzzy
-msgid "Codecs"
-msgstr "コーデック"
-
-#: ../gtk-glade/parameters.glade.h:25
-msgid "Direct connection to the Internet"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:26
-msgid "Disable"
-msgstr "使用しない"
-
-#: ../gtk-glade/parameters.glade.h:27
-#, fuzzy
-msgid "Done"
-msgstr "ありません。"
-
-#: ../gtk-glade/parameters.glade.h:28
-msgid "Download speed limit in Kbit/sec:"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:29
-msgid "Edit"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:30
-msgid "Enable"
-msgstr "使用する"
-
-#: ../gtk-glade/parameters.glade.h:31
-msgid "Enable echo cancellation"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:32
-msgid "Erase all passwords"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:33
-msgid "Manage SIP Accounts"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:34
-msgid "Multimedia settings"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:35
-#, fuzzy
-msgid "Network settings"
-msgstr "ネットワーク"
-
-#: ../gtk-glade/parameters.glade.h:36
-#, fuzzy
-msgid "Playback device:"
-msgstr "使用するサウンドデバイス"
-
-#: ../gtk-glade/parameters.glade.h:37
-msgid "Prefered video resolution:"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:38
-#, fuzzy
-msgid "Public IP address:"
-msgstr "Sipアドレス:"
-
-#: ../gtk-glade/parameters.glade.h:39
-msgid ""
-"Register to FONICS\n"
-"virtual network !"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:41
-msgid "Remove"
-msgstr "削除する"
-
-#: ../gtk-glade/parameters.glade.h:42
-#, fuzzy
-msgid "Ring device:"
-msgstr "使用するサウンドデバイス"
+#: ../gtk/setupwizard.c:103 ../gtk/setupwizard.c:168
+msgid "Ok !"
+msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:43
-#, fuzzy
-msgid "Ring sound:"
-msgstr "録音する音源"
+#: ../gtk/setupwizard.c:106 ../gtk/setupwizard.c:171
+msgid "Communication problem, please try again later."
+msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:44
-msgid "SIP (UDP):"
+#: ../gtk/setupwizard.c:134
+msgid "Thank you. Your account is now configured and ready for use."
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:45
-msgid "Send DTMFs as SIP info"
+#: ../gtk/setupwizard.c:228
+msgid "Welcome to the account setup assistant"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:46
-msgid "Set Maximum Transmission Unit:"
+#: ../gtk/setupwizard.c:232
+msgid "Account setup assistant"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:47
-msgid "Settings"
+#: ../gtk/setupwizard.c:236
+msgid "Choosing a username"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:48
-msgid "Show advanced settings"
+#: ../gtk/setupwizard.c:240
+msgid "Verifying"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:49
+#: ../gtk/setupwizard.c:244
 #, fuzzy
-msgid "Stun server:"
-msgstr "使用するサウンドデバイス"
+msgid "Confirmation"
+msgstr "情報"
 
-#: ../gtk-glade/parameters.glade.h:50
-msgid "This section defines your SIP address when not using a SIP account"
+#: ../gtk/setupwizard.c:249
+msgid "Creating your account"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:51
-msgid "Upload speed limit in Kbit/sec:"
+#: ../gtk/setupwizard.c:253
+msgid "Now ready !"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:52
-msgid "Use IPv6 instead of IPv4"
+#: ../gtk/incall_view.c:113
+msgid "Transfer"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:53
+#: ../gtk/incall_view.c:187
 #, fuzzy
-msgid "User interface"
-msgstr "ユーザーマニュアル"
+msgid "<b>Calling...</b>"
+msgstr "接続中"
 
-#: ../gtk-glade/parameters.glade.h:54
-msgid "Video RTP/UDP:"
+#: ../gtk/incall_view.c:190 ../gtk/incall_view.c:246
+msgid "00::00::00"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:55
+#: ../gtk/incall_view.c:206
 #, fuzzy
-msgid "Video input device:"
-msgstr "使用するサウンドデバイス"
+msgid "<b>Incoming call</b>"
+msgstr "接続中"
 
-#: ../gtk-glade/parameters.glade.h:56
-msgid "Your display name (eg: John Doe):"
+#: ../gtk/incall_view.c:216
+msgid ""
+"Pause all calls\n"
+"and answer"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:57
-#, fuzzy
-msgid "Your resulting SIP address:"
-msgstr "あなたのSIPアドレス"
-
-#: ../gtk-glade/parameters.glade.h:58
-msgid "Your username:"
+#: ../gtk/incall_view.c:217
+msgid "Answer"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:59
-msgid "a sound card\n"
-msgstr ""
+#: ../gtk/incall_view.c:244
+#, fuzzy
+msgid "<b>In call</b>"
+msgstr "接続中"
 
-#: ../gtk-glade/parameters.glade.h:61
-msgid "default camera"
-msgstr ""
+#: ../gtk/incall_view.c:260
+#, fuzzy
+msgid "<b>Paused call</b>"
+msgstr "接続中"
 
-#: ../gtk-glade/parameters.glade.h:62
-msgid "default soundcard"
+#: ../gtk/incall_view.c:272
+#, c-format
+msgid "%02i::%02i::%02i"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:63
-msgid "default soundcard\n"
-msgstr ""
+#: ../gtk/incall_view.c:288
+#, fuzzy
+msgid "<b>Call ended.</b>"
+msgstr "通話は拒否されました。"
 
-#: ../gtk-glade/buddylookup.glade.h:1
-msgid "<b>Search somebody</b>"
+#: ../gtk/incall_view.c:309
+msgid "Unmute"
 msgstr ""
 
-#: ../gtk-glade/buddylookup.glade.h:2
-msgid "Add to my list"
+#: ../gtk/incall_view.c:316
+msgid "Mute"
 msgstr ""
 
-#: ../gtk-glade/buddylookup.glade.h:3
-msgid "Search contacts in directory"
+#: ../gtk/incall_view.c:340
+msgid "Resume"
 msgstr ""
 
-#: ../gtk-glade/waiting.glade.h:1
-#, fuzzy
-msgid "Linphone"
-msgstr "Linphone"
+#: ../gtk/incall_view.c:347
+msgid "Pause"
+msgstr ""
 
-#: ../gtk-glade/waiting.glade.h:2
-msgid "Please wait"
+#: ../gtk/loginframe.c:93
+#, c-format
+msgid "Please enter login information for %s"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:311
+#: ../coreapi/linphonecore.c:166
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../coreapi/linphonecore.c:357
+#: ../coreapi/linphonecore.c:207
 msgid "aborted"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:360
+#: ../coreapi/linphonecore.c:210
 msgid "completed"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:363
+#: ../coreapi/linphonecore.c:213
 msgid "missed"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:368
+#: ../coreapi/linphonecore.c:218
 #, c-format
 msgid ""
 "%s at %s\n"
@@ -1070,34 +440,34 @@ msgid ""
 "Duration: %i mn %i sec\n"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:369
+#: ../coreapi/linphonecore.c:219
+msgid "Incoming call"
+msgstr ""
+
+#: ../coreapi/linphonecore.c:219
 msgid "Outgoing call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:626
+#: ../coreapi/linphonecore.c:501
 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 ""
 
-#: ../coreapi/linphonecore.c:1083
+#: ../coreapi/linphonecore.c:994
 #, fuzzy
 msgid "Ready"
 msgstr "準備完了。"
 
-#: ../coreapi/linphonecore.c:1513
-msgid "Remote end seems to have disconnected, the call is going to be closed."
-msgstr ""
-
-#: ../coreapi/linphonecore.c:1725
+#: ../coreapi/linphonecore.c:1768
 msgid "Looking for telephone number destination..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1727
+#: ../coreapi/linphonecore.c:1771
 msgid "Could not resolve this number."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1771
+#: ../coreapi/linphonecore.c:1815
 #, fuzzy
 msgid ""
 "Could not parse given sip address. A sip url usually looks like sip:"
@@ -1106,28 +476,54 @@ msgstr ""
 "SIPアドレスの形式エラーです。SIPアドレスは、<sip:username@domainname>のような"
 "形式です。"
 
-#: ../coreapi/linphonecore.c:1912
+#: ../coreapi/linphonecore.c:1962
 #, fuzzy
 msgid "Contacting"
 msgstr "接続中"
 
-#: ../coreapi/linphonecore.c:1918
-msgid "could not call"
+#: ../coreapi/linphonecore.c:1969
+#, fuzzy
+msgid "Could not call"
+msgstr "pixmapファイルが見つかりません %s"
+
+#: ../coreapi/linphonecore.c:2076
+msgid "Sorry, you have to pause or stop the current call first !"
+msgstr ""
+
+#: ../coreapi/linphonecore.c:2081
+msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1965
-msgid "Sorry, having multiple simultaneous calls is not supported yet !"
+#: ../coreapi/linphonecore.c:2205
+msgid "Modifying call parameters..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2370 ../coreapi/callbacks.c:32
+#: ../coreapi/linphonecore.c:2308
 msgid "Connected."
 msgstr "接続しました。"
 
-#: ../coreapi/linphonecore.c:2404
+#: ../coreapi/linphonecore.c:2331
+#, fuzzy
+msgid "Call aborted"
+msgstr "通話はキャンセルされました。"
+
+#: ../coreapi/linphonecore.c:2371
 #, fuzzy
 msgid "Call ended"
 msgstr "通話は拒否されました。"
 
+#: ../coreapi/linphonecore.c:2453
+msgid "Could not pause the call"
+msgstr ""
+
+#: ../coreapi/linphonecore.c:2457
+msgid "Pausing the current call..."
+msgstr ""
+
+#: ../coreapi/linphonecore.c:2496
+msgid "There is already a call in process, pause or stop it first."
+msgstr ""
+
 #: ../coreapi/misc.c:147
 msgid ""
 "Your computer appears to be using ALSA sound drivers.\n"
@@ -1152,7 +548,7 @@ msgstr ""
 "mixer ossエミュレーションモジュールが見つかりません。\n"
 "ロードするために、ルート権限で'modprobe snd-mixer-oss'を実行してください。"
 
-#: ../coreapi/misc.c:497
+#: ../coreapi/misc.c:520
 msgid "Stun lookup in progress..."
 msgstr ""
 
@@ -1208,109 +604,149 @@ msgstr ""
 msgid "Unknown-bug"
 msgstr ""
 
-#: ../coreapi/proxy.c:176
+#: ../coreapi/proxy.c:187
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
 msgstr ""
 
-#: ../coreapi/proxy.c:182
+#: ../coreapi/proxy.c:193
 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:621
+#: ../coreapi/proxy.c:670
 #, fuzzy, c-format
 msgid "Could not login as %s"
 msgstr "pixmapファイルが見つかりません %s"
 
-#: ../coreapi/callbacks.c:95
+#: ../coreapi/callbacks.c:170
 #, fuzzy
 msgid "is contacting you"
 msgstr "から電話です。"
 
-#: ../coreapi/callbacks.c:96
+#: ../coreapi/callbacks.c:171
 msgid " and asked autoanswer."
 msgstr ""
 
-#: ../coreapi/callbacks.c:96
+#: ../coreapi/callbacks.c:171
 msgid "."
 msgstr ""
 
-#: ../coreapi/callbacks.c:120
+#: ../coreapi/callbacks.c:226
 #, fuzzy
 msgid "Remote ringing."
 msgstr "登録中……"
 
-#: ../coreapi/callbacks.c:139
+#: ../coreapi/callbacks.c:251
 msgid "Early media."
 msgstr ""
 
-#: ../coreapi/callbacks.c:248
+#: ../coreapi/callbacks.c:289
+#, c-format
+msgid "Call with %s is paused."
+msgstr ""
+
+#: ../coreapi/callbacks.c:300
+#, c-format
+msgid "Call answered by %s - on hold."
+msgstr ""
+
+#: ../coreapi/callbacks.c:315
+#, fuzzy
+msgid "Call resumed."
+msgstr "通話は拒否されました。"
+
+#: ../coreapi/callbacks.c:320
+#, fuzzy, c-format
+msgid "Call answered by %s."
+msgstr ""
+"電話をかける\n"
+"電話に出る"
+
+#: ../coreapi/callbacks.c:381
+msgid "We are being paused..."
+msgstr ""
+
+#: ../coreapi/callbacks.c:385
+msgid "We have been resumed..."
+msgstr ""
+
+#: ../coreapi/callbacks.c:422
 #, fuzzy
 msgid "Call terminated."
 msgstr "通話は拒否されました。"
 
-#: ../coreapi/callbacks.c:265
+#: ../coreapi/callbacks.c:429
 msgid "User is busy."
 msgstr "ユーザーはビジーです"
 
-#: ../coreapi/callbacks.c:266
+#: ../coreapi/callbacks.c:430
 msgid "User is temporarily unavailable."
 msgstr "ユーザーは、今出られません。"
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:268
+#: ../coreapi/callbacks.c:432
 msgid "User does not want to be disturbed."
 msgstr "ユーザーは手が離せないようです。"
 
-#: ../coreapi/callbacks.c:269
+#: ../coreapi/callbacks.c:433
 msgid "Call declined."
 msgstr "通話は拒否されました。"
 
-#: ../coreapi/callbacks.c:281
+#: ../coreapi/callbacks.c:445
 msgid "No response."
 msgstr ""
 
-#: ../coreapi/callbacks.c:284
+#: ../coreapi/callbacks.c:449
 msgid "Protocol error."
 msgstr ""
 
-#: ../coreapi/callbacks.c:298
+#: ../coreapi/callbacks.c:465
 msgid "Redirected"
 msgstr ""
 
-#: ../coreapi/callbacks.c:308
+#: ../coreapi/callbacks.c:475
 msgid "Not found"
 msgstr ""
 
-#: ../coreapi/callbacks.c:318
+#: ../coreapi/callbacks.c:485
 msgid "No common codecs"
 msgstr ""
 
-#: ../coreapi/callbacks.c:324
+#: ../coreapi/callbacks.c:491
 #, fuzzy
 msgid "Call failed."
 msgstr "通話はキャンセルされました。"
 
-#: ../coreapi/callbacks.c:374
+#: ../coreapi/callbacks.c:527
+#, fuzzy
+msgid "Authentication failure"
+msgstr "コーデックの情報"
+
+#: ../coreapi/callbacks.c:553
 #, fuzzy, c-format
 msgid "Registration on %s successful."
 msgstr "登録しました。"
 
-#: ../coreapi/callbacks.c:375
+#: ../coreapi/callbacks.c:554
 #, fuzzy, c-format
 msgid "Unregistration on %s done."
 msgstr "登録しました。"
 
-#: ../coreapi/callbacks.c:383
+#: ../coreapi/callbacks.c:570
+msgid "no response timeout"
+msgstr ""
+
+#: ../coreapi/callbacks.c:573
 #, fuzzy, c-format
 msgid "Registration on %s failed: %s"
 msgstr "登録しました。"
 
-#: ../coreapi/callbacks.c:383
-msgid "no response timeout"
+#: ../coreapi/callbacks.c:615
+#, c-format
+msgid "We are transferred to %s"
 msgstr ""
 
 #: ../mediastreamer2/src/alaw.c:144 ../mediastreamer2/src/alaw.c:162
@@ -1321,11 +757,11 @@ msgstr ""
 msgid "ITU-G.711 alaw decoder"
 msgstr ""
 
-#: ../mediastreamer2/src/alsa.c:935
+#: ../mediastreamer2/src/alsa.c:950
 msgid "Alsa sound source"
 msgstr ""
 
-#: ../mediastreamer2/src/alsa.c:1039
+#: ../mediastreamer2/src/alsa.c:1054
 msgid "Alsa sound output"
 msgstr ""
 
@@ -1337,15 +773,15 @@ msgstr ""
 msgid "Sound playback filter for MacOS X Audio Queue Service"
 msgstr ""
 
-#: ../mediastreamer2/src/dtmfgen.c:173 ../mediastreamer2/src/dtmfgen.c:191
+#: ../mediastreamer2/src/dtmfgen.c:274 ../mediastreamer2/src/dtmfgen.c:293
 msgid "DTMF generator"
 msgstr ""
 
-#: ../mediastreamer2/src/gsm.c:111 ../mediastreamer2/src/gsm.c:129
+#: ../mediastreamer2/src/gsm.c:120 ../mediastreamer2/src/gsm.c:138
 msgid "The GSM full-rate codec"
 msgstr ""
 
-#: ../mediastreamer2/src/gsm.c:178 ../mediastreamer2/src/gsm.c:196
+#: ../mediastreamer2/src/gsm.c:187 ../mediastreamer2/src/gsm.c:205
 msgid "The GSM codec"
 msgstr ""
 
@@ -1361,8 +797,8 @@ msgstr ""
 msgid "A filter to make conferencing"
 msgstr ""
 
-#: ../mediastreamer2/src/msfileplayer.c:295
-#: ../mediastreamer2/src/msfileplayer.c:313
+#: ../mediastreamer2/src/msfileplayer.c:311
+#: ../mediastreamer2/src/msfileplayer.c:329
 msgid "Raw files and wav reader"
 msgstr ""
 
@@ -1376,61 +812,53 @@ msgstr ""
 msgid "A filter that send several inputs to one output."
 msgstr ""
 
-#: ../mediastreamer2/src/msresample.c:221
-#: ../mediastreamer2/src/msresample.c:239
-msgid "frequency resampler"
+#: ../mediastreamer2/src/msresample.c:159
+#: ../mediastreamer2/src/msresample.c:177
+msgid "Audio resampler"
 msgstr ""
 
-#: ../mediastreamer2/src/msrtp.c:358 ../mediastreamer2/src/msrtp.c:376
+#: ../mediastreamer2/src/msrtp.c:369 ../mediastreamer2/src/msrtp.c:387
 msgid "RTP output filter"
 msgstr ""
 
-#: ../mediastreamer2/src/msrtp.c:493 ../mediastreamer2/src/msrtp.c:511
+#: ../mediastreamer2/src/msrtp.c:505 ../mediastreamer2/src/msrtp.c:523
 msgid "RTP input filter"
 msgstr ""
 
-#: ../mediastreamer2/src/msspeex.c:359 ../mediastreamer2/src/msspeex.c:377
-#: ../mediastreamer2/src/msspeex.c:504 ../mediastreamer2/src/msspeex.c:522
+#: ../mediastreamer2/src/msspeex.c:360 ../mediastreamer2/src/msspeex.c:378
+#: ../mediastreamer2/src/msspeex.c:548 ../mediastreamer2/src/msspeex.c:567
 msgid "The free and wonderful speex codec"
 msgstr ""
 
-#: ../mediastreamer2/src/msvolume.c:415 ../mediastreamer2/src/msvolume.c:430
+#: ../mediastreamer2/src/msvolume.c:527 ../mediastreamer2/src/msvolume.c:542
 msgid "A filter that controls and measure sound volume"
 msgstr ""
 
-#: ../mediastreamer2/src/msv4l.c:1011
+#: ../mediastreamer2/src/msv4l.c:1012
 msgid "A video4linux compatible source filter to stream pictures."
 msgstr ""
 
-#: ../mediastreamer2/src/msv4l2.c:470
+#: ../mediastreamer2/src/msv4l2.c:554
 msgid "A filter to grab pictures from Video4Linux2-powered cameras"
 msgstr ""
 
-#: ../mediastreamer2/src/nowebcam.c:1836
+#: ../mediastreamer2/src/nowebcam.c:1854
 msgid "A filter that outputs a static image."
 msgstr ""
 
-#: ../mediastreamer2/src/oss.c:567
-msgid "Sound capture filter for OSS drivers"
-msgstr ""
-
-#: ../mediastreamer2/src/oss.c:581
-msgid "Sound playback filter for OSS drivers"
-msgstr ""
-
-#: ../mediastreamer2/src/pixconv.c:177 ../mediastreamer2/src/pixconv.c:195
+#: ../mediastreamer2/src/pixconv.c:129 ../mediastreamer2/src/pixconv.c:147
 msgid "A pixel format converter"
 msgstr ""
 
-#: ../mediastreamer2/src/sizeconv.c:204
+#: ../mediastreamer2/src/sizeconv.c:202
 msgid "A video size converter"
 msgstr ""
 
-#: ../mediastreamer2/src/sizeconv.c:222
+#: ../mediastreamer2/src/sizeconv.c:220
 msgid "a small video size converter"
 msgstr ""
 
-#: ../mediastreamer2/src/speexec.c:349 ../mediastreamer2/src/speexec.c:367
+#: ../mediastreamer2/src/speexec.c:276 ../mediastreamer2/src/speexec.c:294
 msgid "Echo canceller using speex library"
 msgstr ""
 
@@ -1458,55 +886,55 @@ msgstr ""
 msgid "ITU-G.711 ulaw decoder"
 msgstr ""
 
-#: ../mediastreamer2/src/videodec.c:669 ../mediastreamer2/src/videodec.c:685
-#: ../mediastreamer2/src/videodec.c:768 ../mediastreamer2/src/videodec.c:784
+#: ../mediastreamer2/src/videodec.c:713 ../mediastreamer2/src/videodec.c:729
+#: ../mediastreamer2/src/videodec.c:812 ../mediastreamer2/src/videodec.c:828
 msgid "A H.263 decoder using ffmpeg library"
 msgstr ""
 
-#: ../mediastreamer2/src/videodec.c:702
+#: ../mediastreamer2/src/videodec.c:746
 msgid "A MPEG4 decoder using ffmpeg library"
 msgstr ""
 
-#: ../mediastreamer2/src/videodec.c:718
+#: ../mediastreamer2/src/videodec.c:762
 msgid "A RTP/JPEG decoder using ffmpeg library"
 msgstr ""
 
-#: ../mediastreamer2/src/videodec.c:734
+#: ../mediastreamer2/src/videodec.c:778
 msgid "A MJPEG decoder using ffmpeg library"
 msgstr ""
 
-#: ../mediastreamer2/src/videodec.c:750
+#: ../mediastreamer2/src/videodec.c:794
 msgid "A snow decoder using ffmpeg library"
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:861 ../mediastreamer2/src/videoenc.c:943
+#: ../mediastreamer2/src/videoenc.c:908 ../mediastreamer2/src/videoenc.c:990
 msgid "A video H.263 encoder using ffmpeg library."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:877
+#: ../mediastreamer2/src/videoenc.c:924
 msgid ""
 "A video H.263 encoder using ffmpeg library. It is compliant with old RFC2190 "
 "spec."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:893 ../mediastreamer2/src/videoenc.c:975
+#: ../mediastreamer2/src/videoenc.c:940 ../mediastreamer2/src/videoenc.c:1022
 msgid "A video MPEG4 encoder using ffmpeg library."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:909
+#: ../mediastreamer2/src/videoenc.c:956
 msgid "A video snow encoder using ffmpeg library."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:925
+#: ../mediastreamer2/src/videoenc.c:972
 msgid "A RTP/MJPEG encoder using ffmpeg library."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:959
+#: ../mediastreamer2/src/videoenc.c:1006
 msgid ""
 "A video H.263 encoder using ffmpeg library, compliant with old RFC2190 spec."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:991
+#: ../mediastreamer2/src/videoenc.c:1038
 msgid ""
 "The snow codec is royalty-free and is open-source. \n"
 "It uses innovative techniques that makes it one of most promising video "
@@ -1515,12 +943,12 @@ msgid ""
 "versions cannot be guaranteed."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:1011
+#: ../mediastreamer2/src/videoenc.c:1058
 msgid "A MJPEG encoder using ffmpeg library."
 msgstr ""
 
-#: ../mediastreamer2/src/videoout.c:1812 ../mediastreamer2/src/videoout.c:1830
-msgid "A generic video display"
+#: ../mediastreamer2/src/videoout.c:933
+msgid "A SDL-based video display"
 msgstr ""
 
 #: ../mediastreamer2/src/wincevideods.c:969
@@ -1547,10 +975,300 @@ msgstr ""
 msgid "Parametric sound equalizer."
 msgstr ""
 
-#: ../mediastreamer2/src/msdscap-mingw.cc:1003
+#: ../mediastreamer2/src/msdscap-mingw.cc:1038
 msgid "A webcam grabber based on directshow."
 msgstr ""
 
+#: ../mediastreamer2/src/drawdib-display.c:552
+#: ../mediastreamer2/src/drawdib-display.c:570
+msgid "A video display based on windows DrawDib api"
+msgstr ""
+
+#: ../mediastreamer2/src/audiomixer.c:192
+#: ../mediastreamer2/src/audiomixer.c:211
+msgid "A filter that mixes down 16 bit sample audio streams"
+msgstr ""
+
+#: ../mediastreamer2/src/chanadapt.c:110 ../mediastreamer2/src/chanadapt.c:128
+msgid "A filter that converts from mono to stereo and vice versa."
+msgstr ""
+
+#: ../mediastreamer2/src/itc.c:97 ../mediastreamer2/src/itc.c:115
+#: ../mediastreamer2/src/itc.c:197 ../mediastreamer2/src/itc.c:215
+msgid "Inter ticker communication filter."
+msgstr ""
+
+#: ../mediastreamer2/src/extdisplay.c:62 ../mediastreamer2/src/extdisplay.c:79
+msgid "A display filter sending the buffers to draw to the upper layer"
+msgstr ""
+
+#: ../mediastreamer2/src/msiounit.c:619
+msgid "Sound capture filter for MacOS X Audio Unit Service"
+msgstr ""
+
+#: ../mediastreamer2/src/msiounit.c:633
+msgid "Sound playback filter for MacOS X Audio Unit Service"
+msgstr ""
+
+#: ../mediastreamer2/src/x11video.c:562
+msgid "A video display using X11+Xv"
+msgstr ""
+
+#. .id=
+#. .name=
+#. .text=
+#: ../mediastreamer2/src/msandroid.cpp:370
+msgid "Sound capture filter for Android"
+msgstr ""
+
+#. .id=
+#. .name=
+#. .text=
+#: ../mediastreamer2/src/msandroid.cpp:667
+msgid "Sound playback filter for Android"
+msgstr ""
+
+#: ../mediastreamer2/src/msandroidvideo.cpp:134
+msgid "A filter that captures Android video."
+msgstr ""
+
+#~ msgid "#"
+#~ msgstr "#"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "0"
+#~ msgstr "0"
+
+#~ msgid "1"
+#~ msgstr "1"
+
+#~ msgid "2"
+#~ msgstr "2"
+
+#~ msgid "3"
+#~ msgstr "3"
+
+#~ msgid "4"
+#~ msgstr "4"
+
+#~ msgid "5"
+#~ msgstr "5"
+
+#~ msgid "6"
+#~ msgstr "6"
+
+#~ msgid "7"
+#~ msgstr "7"
+
+#~ msgid "8"
+#~ msgstr "8"
+
+#~ msgid "9"
+#~ msgstr "9"
+
+#, fuzzy
+#~ msgid "<b>Add contacts from directory</b>"
+#~ msgstr "コーデックの情報"
+
+#, fuzzy
+#~ msgid "<b>Contact list</b>"
+#~ msgstr "接続中"
+
+#, fuzzy
+#~ msgid "<b>Welcome !</b>"
+#~ msgstr "接続中"
+
+#, fuzzy
+#~ msgid "Audio & Video"
+#~ msgstr "オーディオコーデックのプロパティー"
+
+#, fuzzy
+#~ msgid "Audio only"
+#~ msgstr "オーディオ"
+
+#, fuzzy
+#~ msgid "Contacts"
+#~ msgstr "接続中"
+
+#, fuzzy
+#~ msgid "Duration"
+#~ msgstr "情報"
+
+#, fuzzy
+#~ msgid "Duration:"
+#~ msgstr "情報"
+
+#, fuzzy
+#~ msgid "Enable self-view"
+#~ msgstr "使用する"
+
+#, fuzzy
+#~ msgid "Login information"
+#~ msgstr "コーデックの情報"
+
+#, fuzzy
+#~ msgid "My current identity:"
+#~ msgstr "個人情報"
+
+#, fuzzy
+#~ msgid "Password"
+#~ msgstr "パスワード"
+
+#, fuzzy
+#~ msgid "SIP address or phone number:"
+#~ msgstr "レジストラサーバーのSIPアドレス"
+
+#, fuzzy
+#~ msgid "Username"
+#~ msgstr "ユーザーマニュアル"
+
+#, fuzzy
+#~ msgid "_Linphone"
+#~ msgstr "Linphone"
+
+#, fuzzy
+#~ msgid "_Modes"
+#~ msgstr "コーデック"
+
+#, fuzzy
+#~ msgid "About linphone"
+#~ msgstr "Linphone"
+
+#, fuzzy
+#~ msgid "<b>Contact information</b>"
+#~ msgstr "コーデックの情報"
+
+#, fuzzy
+#~ msgid "SIP Address"
+#~ msgstr "アドレス"
+
+#, fuzzy
+#~ msgid "Password:"
+#~ msgstr "パスワード"
+
+#, fuzzy
+#~ msgid "Publish presence information"
+#~ msgstr "コーデックの情報"
+
+#, fuzzy
+#~ msgid "Registration duration (sec):"
+#~ msgstr "登録しました。"
+
+#, fuzzy
+#~ msgid "SIP Proxy address:"
+#~ msgstr "Sipアドレス:"
+
+#, fuzzy
+#~ msgid "Your SIP identity:"
+#~ msgstr "個人情報"
+
+#~ msgid "sip:"
+#~ msgstr "sip:"
+
+#, fuzzy
+#~ msgid "Send"
+#~ msgstr "サウンド"
+
+#, fuzzy
+#~ msgid "Decline"
+#~ msgstr "ライン入力"
+
+#, fuzzy
+#~ msgid "<b>Audio</b>"
+#~ msgstr "接続中"
+
+#, fuzzy
+#~ msgid "<b>Codecs</b>"
+#~ msgstr "接続中"
+
+#, fuzzy
+#~ msgid "<b>Level</b>"
+#~ msgstr "接続中"
+
+#, fuzzy
+#~ msgid "<b>Ports</b>"
+#~ msgstr "接続中"
+
+#, fuzzy
+#~ msgid "<b>Proxy accounts</b>"
+#~ msgstr "接続中"
+
+#, fuzzy
+#~ msgid "<b>Transport</b>"
+#~ msgstr "接続中"
+
+#~ msgid "Add"
+#~ msgstr "追加する"
+
+#, fuzzy
+#~ msgid ""
+#~ "Audio codecs\n"
+#~ "Video codecs"
+#~ msgstr "オーディオコーデックのプロパティー"
+
+#, fuzzy
+#~ msgid "Capture device:"
+#~ msgstr "使用するサウンドデバイス"
+
+#, fuzzy
+#~ msgid "Codecs"
+#~ msgstr "コーデック"
+
+#~ msgid "Disable"
+#~ msgstr "使用しない"
+
+#, fuzzy
+#~ msgid "Done"
+#~ msgstr "ありません。"
+
+#~ msgid "Enable"
+#~ msgstr "使用する"
+
+#, fuzzy
+#~ msgid "Network settings"
+#~ msgstr "ネットワーク"
+
+#, fuzzy
+#~ msgid "Playback device:"
+#~ msgstr "使用するサウンドデバイス"
+
+#, fuzzy
+#~ msgid "Public IP address:"
+#~ msgstr "Sipアドレス:"
+
+#~ msgid "Remove"
+#~ msgstr "削除する"
+
+#, fuzzy
+#~ msgid "Ring device:"
+#~ msgstr "使用するサウンドデバイス"
+
+#, fuzzy
+#~ msgid "Ring sound:"
+#~ msgstr "録音する音源"
+
+#, fuzzy
+#~ msgid "Stun server:"
+#~ msgstr "使用するサウンドデバイス"
+
+#, fuzzy
+#~ msgid "User interface"
+#~ msgstr "ユーザーマニュアル"
+
+#, fuzzy
+#~ msgid "Video input device:"
+#~ msgstr "使用するサウンドデバイス"
+
+#, fuzzy
+#~ msgid "Your resulting SIP address:"
+#~ msgstr "あなたのSIPアドレス"
+
+#, fuzzy
+#~ msgid "Linphone"
+#~ msgstr "Linphone"
+
 #, fuzzy
 #~ msgid "Request Cancelled."
 #~ msgstr "通話はキャンセルされました。"
@@ -1575,10 +1293,6 @@ msgstr ""
 #~ "す。\n"
 #~ "他の手段で連絡をとってください。"
 
-#, fuzzy
-#~ msgid "<b>Terminate call</b>"
-#~ msgstr "接続中"
-
 #, fuzzy
 #~ msgid "Gone"
 #~ msgstr "ありません。"
@@ -1617,14 +1331,6 @@ msgstr ""
 #~ msgid "Shows the address book"
 #~ msgstr "電話帳"
 
-#, fuzzy
-#~ msgid ""
-#~ "Call or\n"
-#~ "answer"
-#~ msgstr ""
-#~ "電話をかける\n"
-#~ "電話に出る"
-
 #~ msgid "Show more..."
 #~ msgstr "芳細"
 
@@ -1719,10 +1425,6 @@ msgstr ""
 #~ msgid "Remote services"
 #~ msgstr "リモートのサービス"
 
-#, fuzzy
-#~ msgid "Authentication information"
-#~ msgstr "コーデックの情報"
-
 #~ msgid "SIP"
 #~ msgstr "SIP"
 
diff --git a/po/nl.po b/po/nl.po
index caa543b004b189b78252c6b1c8f92ef655aa063f..c8b2f3def4030b34f7bd3193232a9e875e888350 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -10,58 +10,53 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 17:16+0200\n"
+"POT-Creation-Date: 2011-02-07 10:59+0100\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../gtk-glade/support.c:49 ../gtk-glade/support.c:73
-#: ../gtk-glade/support.c:102
+#: ../gtk/support.c:49 ../gtk/support.c:73 ../gtk/support.c:102
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "Kon pixmap bestand %s niet vinden"
 
-#: ../gtk-glade/chat.c:27
+#: ../gtk/chat.c:27
 #, c-format
 msgid "Chat with %s"
 msgstr "Chat met %s"
 
-#: ../gtk-glade/main.c:94
+#: ../gtk/main.c:74
 msgid "log to stdout some debug information while running."
 msgstr ""
 
-#: ../gtk-glade/main.c:101
+#: ../gtk/main.c:81
 msgid "Start only in the system tray, do not show the main interface."
 msgstr ""
 
-#: ../gtk-glade/main.c:108
+#: ../gtk/main.c:88
 msgid "address to call right now"
 msgstr ""
 
-#: ../gtk-glade/main.c:115
+#: ../gtk/main.c:95
 msgid "if set automatically answer incoming calls"
 msgstr ""
 
-#: ../gtk-glade/main.c:123
+#: ../gtk/main.c:103
 msgid ""
 "Specifiy a working directory (should be the base of the installation, eg: c:"
 "\\Program Files\\Linphone)"
 msgstr ""
 
-#: ../gtk-glade/main.c:402
+#: ../gtk/main.c:479
 #, fuzzy, c-format
 msgid "Call with %s"
 msgstr "Chat met %s"
 
-#: ../gtk-glade/main.c:720
-#, fuzzy, c-format
-msgid "Incoming call from %s"
-msgstr "Inkomende oproep"
-
-#: ../gtk-glade/main.c:759
+#: ../gtk/main.c:862
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
@@ -70,1011 +65,375 @@ msgid ""
 "If you answer no, this person will be temporarily blacklisted."
 msgstr ""
 
-#: ../gtk-glade/main.c:837
+#: ../gtk/main.c:940
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at domain <i>%s</i>:"
 msgstr ""
 
-#: ../gtk-glade/main.c:934
+#: ../gtk/main.c:1076
 msgid "Website link"
 msgstr ""
 
-#: ../gtk-glade/main.c:970
+#: ../gtk/main.c:1112
 msgid "Linphone - a video internet phone"
 msgstr ""
 
-#: ../gtk-glade/main.c:989
+#: ../gtk/main.c:1131
 #, c-format
 msgid "%s (Default)"
 msgstr ""
 
-#: ../gtk-glade/main.c:1221
+#: ../gtk/main.c:1382
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
 msgstr ""
 
-#: ../gtk-glade/main.c:1275
+#: ../gtk/main.c:1441
 msgid "A free SIP video-phone"
 msgstr "Een Vrije SIP video-telefoon"
 
-#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:258
-#: ../gtk-glade/contact.glade.h:3
+#: ../gtk/friendlist.c:192 ../gtk/propertybox.c:271
 msgid "Name"
 msgstr "Naam"
 
-#: ../gtk-glade/friendlist.c:205
+#: ../gtk/friendlist.c:205
 msgid "Presence status"
 msgstr "Aanwezigheidsstatus"
 
-#: ../gtk-glade/friendlist.c:242
+#: ../gtk/friendlist.c:242
 #, c-format
 msgid "Search in %s directory"
 msgstr ""
 
-#: ../gtk-glade/friendlist.c:450
+#: ../gtk/friendlist.c:450
 msgid "Invalid sip contact !"
 msgstr ""
 
-#: ../gtk-glade/friendlist.c:492
+#: ../gtk/friendlist.c:495
 #, fuzzy, c-format
 msgid "Call %s"
 msgstr "Oproepgeschiedenis"
 
-#: ../gtk-glade/friendlist.c:493
+#: ../gtk/friendlist.c:496
 #, c-format
 msgid "Send text to %s"
 msgstr ""
 
-#: ../gtk-glade/friendlist.c:494
+#: ../gtk/friendlist.c:497
 #, fuzzy, c-format
 msgid "Edit contact '%s'"
 msgstr "Bewerk contactgegevens"
 
-#: ../gtk-glade/friendlist.c:495
+#: ../gtk/friendlist.c:498
 #, c-format
 msgid "Delete contact '%s'"
 msgstr ""
 
-#: ../gtk-glade/friendlist.c:537
+#: ../gtk/friendlist.c:540
 #, c-format
 msgid "Add new contact from %s directory"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:264
+#: ../gtk/propertybox.c:277
 msgid "Rate (Hz)"
 msgstr "Frequentie (Hz)"
 
-#: ../gtk-glade/propertybox.c:270
+#: ../gtk/propertybox.c:283
 msgid "Status"
 msgstr "Status"
 
-#: ../gtk-glade/propertybox.c:276
+#: ../gtk/propertybox.c:289
 msgid "Min bitrate (kbit/s)"
 msgstr "Minimale bitrate (kbit/s)"
 
-#: ../gtk-glade/propertybox.c:283
+#: ../gtk/propertybox.c:296
 msgid "Parameters"
 msgstr "Parameters"
 
-#: ../gtk-glade/propertybox.c:312 ../gtk-glade/propertybox.c:451
+#: ../gtk/propertybox.c:325 ../gtk/propertybox.c:464
 msgid "Enabled"
 msgstr "Aan"
 
-#: ../gtk-glade/propertybox.c:313 ../gtk-glade/propertybox.c:451
+#: ../gtk/propertybox.c:326 ../gtk/propertybox.c:464
 msgid "Disabled"
 msgstr "Uit"
 
-#: ../gtk-glade/propertybox.c:496
+#: ../gtk/propertybox.c:509
 msgid "Account"
 msgstr "Account"
 
-#: ../gtk-glade/propertybox.c:636
+#: ../gtk/propertybox.c:649
 msgid "English"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:637
+#: ../gtk/propertybox.c:650
 msgid "French"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:638
+#: ../gtk/propertybox.c:651
 msgid "Swedish"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:639
+#: ../gtk/propertybox.c:652
 msgid "Italian"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:640
+#: ../gtk/propertybox.c:653
 msgid "Spanish"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:641
+#: ../gtk/propertybox.c:654
 msgid "Brazilian Portugese"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:642
+#: ../gtk/propertybox.c:655
 msgid "Polish"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:643
+#: ../gtk/propertybox.c:656
 msgid "German"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:644
+#: ../gtk/propertybox.c:657
 msgid "Russian"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:645
+#: ../gtk/propertybox.c:658
 msgid "Japanese"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:646
+#: ../gtk/propertybox.c:659
 msgid "Dutch"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:647
+#: ../gtk/propertybox.c:660
 msgid "Hungarian"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:648
+#: ../gtk/propertybox.c:661
 msgid "Czech"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:649
+#: ../gtk/propertybox.c:662
 msgid "Chinese"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:706
+#: ../gtk/propertybox.c:719
 msgid ""
 "You need to restart linphone for the new language selection to take effect."
 msgstr ""
 
-#: ../gtk-glade/update.c:80
+#: ../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-glade/update.c:91
+#: ../gtk/update.c:91
 msgid "You are running the lastest version."
 msgstr ""
 
-#: ../gtk-glade/buddylookup.c:85
+#: ../gtk/buddylookup.c:85
 msgid "Firstname, Lastname"
 msgstr ""
 
-#: ../gtk-glade/buddylookup.c:160
+#: ../gtk/buddylookup.c:160
 msgid "Error communicating with server."
 msgstr ""
 
-#: ../gtk-glade/buddylookup.c:164
+#: ../gtk/buddylookup.c:164
 #, fuzzy
 msgid "Connecting..."
 msgstr "Verbinden"
 
-#: ../gtk-glade/buddylookup.c:168
+#: ../gtk/buddylookup.c:168
 #, fuzzy
 msgid "Connected"
 msgstr "Verbonden."
 
-#: ../gtk-glade/buddylookup.c:172
+#: ../gtk/buddylookup.c:172
 msgid "Receiving data..."
 msgstr ""
 
-#: ../gtk-glade/buddylookup.c:180
+#: ../gtk/buddylookup.c:180
 #, c-format
 msgid "Found %i contact"
 msgid_plural "Found %i contacts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gtk-glade/setupwizard.c:25
+#: ../gtk/setupwizard.c:25
 msgid ""
 "Welcome !\n"
 "This assistant will help you to use a SIP account for your calls."
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:34
+#: ../gtk/setupwizard.c:34
 msgid "Create an account by choosing a username"
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:35
+#: ../gtk/setupwizard.c:35
 msgid "I have already an account and just want to use it"
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:53
+#: ../gtk/setupwizard.c:53
 msgid "Please choose a username:"
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:54
+#: ../gtk/setupwizard.c:54
 #, fuzzy
 msgid "Username:"
 msgstr "gebruikersnaam:"
 
-#: ../gtk-glade/setupwizard.c:92
+#: ../gtk/setupwizard.c:92
 #, c-format
 msgid "Checking if '%s' is available..."
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:97 ../gtk-glade/setupwizard.c:164
+#: ../gtk/setupwizard.c:97 ../gtk/setupwizard.c:164
 msgid "Please wait..."
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:101
+#: ../gtk/setupwizard.c:101
 msgid "Sorry this username already exists. Please try a new one."
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:103 ../gtk-glade/setupwizard.c:168
+#: ../gtk/setupwizard.c:103 ../gtk/setupwizard.c:168
 msgid "Ok !"
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:106 ../gtk-glade/setupwizard.c:171
+#: ../gtk/setupwizard.c:106 ../gtk/setupwizard.c:171
 msgid "Communication problem, please try again later."
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:134
+#: ../gtk/setupwizard.c:134
 msgid "Thank you. Your account is now configured and ready for use."
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:228
+#: ../gtk/setupwizard.c:228
 msgid "Welcome to the account setup assistant"
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:232
+#: ../gtk/setupwizard.c:232
 msgid "Account setup assistant"
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:236
+#: ../gtk/setupwizard.c:236
 #, fuzzy
 msgid "Choosing a username"
 msgstr "gebruikersnaam:"
 
-#: ../gtk-glade/setupwizard.c:240
+#: ../gtk/setupwizard.c:240
 msgid "Verifying"
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:244
+#: ../gtk/setupwizard.c:244
 #, fuzzy
 msgid "Confirmation"
 msgstr "Informatie"
 
-#: ../gtk-glade/setupwizard.c:249
+#: ../gtk/setupwizard.c:249
 msgid "Creating your account"
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:253
+#: ../gtk/setupwizard.c:253
 msgid "Now ready !"
 msgstr ""
 
-#: ../gtk-glade/incall_view.c:113
-#, fuzzy
-msgid "<b>Calling...</b>"
-msgstr "Contactlijst"
-
-#: ../gtk-glade/incall_view.c:116 ../gtk-glade/incall_view.c:138
-msgid "00::00::00"
-msgstr ""
-
-#: ../gtk-glade/incall_view.c:136
-#, fuzzy
-msgid "<b>In call with</b>"
-msgstr "Contactlijst"
-
-#: ../gtk-glade/incall_view.c:154
-#, c-format
-msgid "%02i::%02i::%02i"
-msgstr ""
-
-#: ../gtk-glade/incall_view.c:170
-#, fuzzy
-msgid "<b>Call ended.</b>"
-msgstr "Oproep beeindigd"
-
-#: ../gtk-glade/incall_view.c:188
-#, fuzzy
-msgid "Unmute"
-msgstr "Ongelimiteerd"
-
-#: ../gtk-glade/incall_view.c:195 ../gtk-glade/main.glade.h:43
-msgid "Mute"
-msgstr ""
-
-#: ../gtk-glade/loginframe.c:83
-#, c-format
-msgid "Please enter login information for %s"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:1
-msgid "#"
-msgstr "#"
-
-#: ../gtk-glade/main.glade.h:2
-msgid "*"
-msgstr "*"
-
-#: ../gtk-glade/main.glade.h:3
-msgid "0"
-msgstr "0"
-
-#: ../gtk-glade/main.glade.h:4
-msgid "1"
-msgstr "1"
-
-#: ../gtk-glade/main.glade.h:5
-msgid "2"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:6
-msgid "3"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:7
-msgid "4"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:8
-msgid "5"
-msgstr "5"
-
-#: ../gtk-glade/main.glade.h:9
-msgid "6"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:10
-msgid "7"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:11
-msgid "8"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:12
-msgid "9"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:13
-#, fuzzy
-msgid "<b>Add contacts from directory</b>"
-msgstr "Contact informatie"
-
-#: ../gtk-glade/main.glade.h:14
-#, fuzzy
-msgid "<b>Contact list</b>"
-msgstr "Contactlijst"
-
-#: ../gtk-glade/main.glade.h:15
-#, fuzzy
-msgid "<b>Welcome !</b>"
-msgstr "Contactlijst"
-
-#: ../gtk-glade/main.glade.h:16
-msgid "A"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:17
-msgid ""
-"ADSL\n"
-"Fiber Channel"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:19
-msgid ""
-"All users\n"
-"Online users"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:21
-msgid "Assistant"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:22
-#, fuzzy
-msgid "Audio & Video"
-msgstr "Audio codecs"
-
-#: ../gtk-glade/main.glade.h:23
-#, fuzzy
-msgid "Audio only"
-msgstr "Audio codecs"
-
-#: ../gtk-glade/main.glade.h:24
-#, fuzzy
-msgid "Automatically log me in"
-msgstr "Automatisch een geldige hostnaam raden"
-
-#: ../gtk-glade/main.glade.h:25
-msgid "B"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:26 ../gtk-glade/parameters.glade.h:21
-msgid "C"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:27
-#, fuzzy
-msgid "Call Details"
-msgstr "Oproepgeschiedenis"
-
-#: ../gtk-glade/main.glade.h:28 ../gtk-glade/call_logs.glade.h:1
-#, fuzzy
-msgid "Call history"
-msgstr "Linphone - Oproepgeschiedenis"
-
-#: ../gtk-glade/main.glade.h:29
-msgid "Check for updates"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:30
-#, fuzzy
-msgid "Contacts"
-msgstr "Verbinden"
-
-#: ../gtk-glade/main.glade.h:31
-msgid "D"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:32
-msgid "Default"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:33
-#, fuzzy
-msgid "Duration"
-msgstr "Informatie"
-
-#: ../gtk-glade/main.glade.h:34
-#, fuzzy
-msgid "Duration:"
-msgstr "Informatie"
-
-#: ../gtk-glade/main.glade.h:35
-#, fuzzy
-msgid "Enable self-view"
-msgstr "Video aan"
-
-#: ../gtk-glade/main.glade.h:36
-msgid "Enter username, phone number, or full sip address"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:37
-msgid "Homepage"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:38
-#, fuzzy
-msgid "In call"
-msgstr "Inkomende oproep"
-
-#: ../gtk-glade/main.glade.h:39
-msgid "Internet connection:"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:40
-msgid "Keypad"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:41
-#, fuzzy
-msgid "Login information"
-msgstr "Contact informatie"
-
-#: ../gtk-glade/main.glade.h:42
-msgid "Lookup:"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:44
-#, fuzzy
-msgid "My current identity:"
-msgstr "SIP-identiteit:"
-
-#: ../gtk-glade/main.glade.h:45
-#, fuzzy
-msgid "Password"
-msgstr "wachtwoord:"
-
-#: ../gtk-glade/main.glade.h:46
-#, fuzzy
-msgid "SIP address or phone number:"
-msgstr "Geef het SIP adres of telefoonnummer in"
-
-#: ../gtk-glade/main.glade.h:47
-msgid "Search"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:48
-msgid "Show debug messages"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:49
-msgid "Start call"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:50
-msgid "Terminate call"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:51
-#, fuzzy
-msgid "Username"
-msgstr "gebruikersnaam:"
-
-#: ../gtk-glade/main.glade.h:52
-#, fuzzy
-msgid "_Linphone"
-msgstr "linphone"
-
-#: ../gtk-glade/main.glade.h:53
-#, fuzzy
-msgid "_Modes"
-msgstr "Codecs"
-
-#: ../gtk-glade/main.glade.h:54
-msgid "in"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:55
-msgid "label"
-msgstr ""
-
-#: ../gtk-glade/about.glade.h:1
-#, fuzzy
-msgid "About linphone"
-msgstr "linphone"
-
-#: ../gtk-glade/about.glade.h:2
-msgid "An internet video phone using the standard SIP (rfc3261) protocol."
-msgstr ""
-
-#: ../gtk-glade/about.glade.h:3
-msgid "Created by Simon Morlat\n"
-msgstr ""
-
-#: ../gtk-glade/about.glade.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"
-msgstr ""
-
-#: ../gtk-glade/contact.glade.h:1
-#, fuzzy
-msgid "<b>Contact information</b>"
-msgstr "Contact informatie"
-
-#: ../gtk-glade/contact.glade.h:2
-msgid "Allow this contact to see my presence status"
-msgstr ""
-
-#: ../gtk-glade/contact.glade.h:4
-#, fuzzy
-msgid "SIP Address"
-msgstr "Adres"
-
-#: ../gtk-glade/contact.glade.h:5
-msgid "Show this contact presence status"
-msgstr ""
-
-#: ../gtk-glade/contact.glade.h:6 ../gtk-glade/password.glade.h:5
-#: ../gtk-glade/sip_account.glade.h:9
-msgid "gtk-cancel"
-msgstr ""
-
-#: ../gtk-glade/contact.glade.h:7 ../gtk-glade/password.glade.h:6
-#: ../gtk-glade/sip_account.glade.h:10
-msgid "gtk-ok"
-msgstr ""
-
-#: ../gtk-glade/log.glade.h:1
-msgid "Linphone debug window"
-msgstr ""
-
-#: ../gtk-glade/log.glade.h:2 ../gtk-glade/call_logs.glade.h:2
-#: ../gtk-glade/chatroom.glade.h:2
-msgid "gtk-close"
-msgstr ""
-
-#: ../gtk-glade/password.glade.h:1
-#, fuzzy
-msgid "Linphone - Authentication required"
-msgstr "Authorisatie gevraagd"
-
-#: ../gtk-glade/password.glade.h:2
-#, fuzzy
-msgid "Password:"
-msgstr "wachtwoord:"
-
-#: ../gtk-glade/password.glade.h:3
-msgid "Please enter the domain password"
-msgstr ""
-
-#: ../gtk-glade/password.glade.h:4
-msgid "UserID"
-msgstr ""
-
-#: ../gtk-glade/sip_account.glade.h:1
-msgid "Configure a SIP account"
-msgstr ""
-
-#: ../gtk-glade/sip_account.glade.h:2
-msgid "Linphone - Configure a SIP account"
-msgstr ""
-
-#: ../gtk-glade/sip_account.glade.h:3
-#, fuzzy
-msgid "Publish presence information"
-msgstr "Toon informatie over aanwezigheid:"
-
-#: ../gtk-glade/sip_account.glade.h:4
-msgid "Register at startup"
-msgstr ""
-
-#: ../gtk-glade/sip_account.glade.h:5
-#, fuzzy
-msgid "Registration duration (sec):"
-msgstr "Registratieperiode:"
-
-#: ../gtk-glade/sip_account.glade.h:6
-msgid "Route (optional):"
-msgstr "Route (optioneel):"
-
-#: ../gtk-glade/sip_account.glade.h:7
-#, fuzzy
-msgid "SIP Proxy address:"
-msgstr "SIP-proxy:"
-
-#: ../gtk-glade/sip_account.glade.h:8
-#, fuzzy
-msgid "Your SIP identity:"
-msgstr "SIP-identiteit:"
-
-#: ../gtk-glade/sip_account.glade.h:11
-msgid "sip:"
-msgstr "sip:"
-
-#: ../gtk-glade/chatroom.glade.h:1
-#, fuzzy
-msgid "Send"
-msgstr "Geluid"
-
-#: ../gtk-glade/incoming_call.glade.h:1
-msgid "Accept"
-msgstr "Accepteren"
-
-#: ../gtk-glade/incoming_call.glade.h:2
-#, fuzzy
-msgid "Decline"
-msgstr "lijn"
-
-#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:369
-msgid "Incoming call"
-msgstr "Inkomende oproep"
-
-#: ../gtk-glade/incoming_call.glade.h:4
-#, fuzzy
-msgid "Incoming call from"
-msgstr "Inkomende oproep"
-
-#: ../gtk-glade/incoming_call.glade.h:5
-#, fuzzy
-msgid "Linphone - Incoming call"
-msgstr "Inkomende oproep"
-
-#: ../gtk-glade/parameters.glade.h:1
-msgid "0 stands for \"unlimited\""
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:2
-#, fuzzy
-msgid "<b>Audio</b>"
-msgstr "Contactlijst"
-
-#: ../gtk-glade/parameters.glade.h:3
-msgid "<b>Bandwidth control</b>"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:4
-#, fuzzy
-msgid "<b>Codecs</b>"
-msgstr "Contactlijst"
-
-#: ../gtk-glade/parameters.glade.h:5
-msgid "<b>Default identity</b>"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:6
-msgid "<b>Language</b>"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:7
-#, fuzzy
-msgid "<b>Level</b>"
-msgstr "Contactlijst"
-
-#: ../gtk-glade/parameters.glade.h:8
-msgid "<b>NAT and Firewall</b>"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:9
-#, fuzzy
-msgid "<b>Ports</b>"
-msgstr "Contactlijst"
-
-#: ../gtk-glade/parameters.glade.h:10
-msgid "<b>Privacy</b>"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:11
-#, fuzzy
-msgid "<b>Proxy accounts</b>"
-msgstr "Contactlijst"
-
-#: ../gtk-glade/parameters.glade.h:12
-#, fuzzy
-msgid "<b>Transport</b>"
-msgstr "Contactlijst"
-
-#: ../gtk-glade/parameters.glade.h:13
-msgid "<b>Video</b>"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:14
-msgid "ALSA special device (optional):"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:15
-#, fuzzy
-msgid "Add"
-msgstr "Adres"
-
-#: ../gtk-glade/parameters.glade.h:16
-msgid "Audio RTP/UDP:"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:17
-#, fuzzy
-msgid ""
-"Audio codecs\n"
-"Video codecs"
-msgstr "Audio en video codecs"
-
-#: ../gtk-glade/parameters.glade.h:19
-msgid "Behind NAT / Firewall (specify gateway IP below)"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:20
-msgid "Behind NAT / Firewall (use STUN to resolve)"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:22
-msgid "CIF"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:23
-#, fuzzy
-msgid "Capture device:"
-msgstr "Geluidsapparaat gebruiken:"
-
-#: ../gtk-glade/parameters.glade.h:24
-#, fuzzy
-msgid "Codecs"
-msgstr "Codecs"
-
-#: ../gtk-glade/parameters.glade.h:25
-msgid "Direct connection to the Internet"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:26
-msgid "Disable"
-msgstr "Uit"
-
-#: ../gtk-glade/parameters.glade.h:27
-#, fuzzy
-msgid "Done"
-msgstr "Weg"
-
-#: ../gtk-glade/parameters.glade.h:28
-#, fuzzy
-msgid "Download speed limit in Kbit/sec:"
-msgstr "Download bandbreedte (kbit/sec):"
-
-#: ../gtk-glade/parameters.glade.h:29
-msgid "Edit"
-msgstr "Bewerken"
-
-#: ../gtk-glade/parameters.glade.h:30
-msgid "Enable"
-msgstr "Aan"
-
-#: ../gtk-glade/parameters.glade.h:31
-msgid "Enable echo cancellation"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:32
-msgid "Erase all passwords"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:33
-msgid "Manage SIP Accounts"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:34
-msgid "Multimedia settings"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:35
-#, fuzzy
-msgid "Network settings"
-msgstr "Netwerk"
-
-#: ../gtk-glade/parameters.glade.h:36
-#, fuzzy
-msgid "Playback device:"
-msgstr "Geluidsapparaat gebruiken:"
-
-#: ../gtk-glade/parameters.glade.h:37
-msgid "Prefered video resolution:"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:38
-#, fuzzy
-msgid "Public IP address:"
-msgstr "SIP-adres:"
-
-#: ../gtk-glade/parameters.glade.h:39
-msgid ""
-"Register to FONICS\n"
-"virtual network !"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:41
-msgid "Remove"
-msgstr "Verwijderen"
-
-#: ../gtk-glade/parameters.glade.h:42
-#, fuzzy
-msgid "Ring device:"
-msgstr "Geluidsapparaat gebruiken:"
-
-#: ../gtk-glade/parameters.glade.h:43
-#, fuzzy
-msgid "Ring sound:"
-msgstr "Belgeluid:"
-
-#: ../gtk-glade/parameters.glade.h:44
-msgid "SIP (UDP):"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:45
-msgid "Send DTMFs as SIP info"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:46
-msgid "Set Maximum Transmission Unit:"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:47
-msgid "Settings"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:48
-msgid "Show advanced settings"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:49
-#, fuzzy
-msgid "Stun server:"
-msgstr "Geluidsapparaat"
-
-#: ../gtk-glade/parameters.glade.h:50
-msgid "This section defines your SIP address when not using a SIP account"
+#: ../gtk/incall_view.c:113
+msgid "Transfer"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:51
+#: ../gtk/incall_view.c:187
 #, fuzzy
-msgid "Upload speed limit in Kbit/sec:"
-msgstr "Upload bandbreedte (kbit/sec):"
+msgid "<b>Calling...</b>"
+msgstr "Contactlijst"
 
-#: ../gtk-glade/parameters.glade.h:52
-msgid "Use IPv6 instead of IPv4"
+#: ../gtk/incall_view.c:190 ../gtk/incall_view.c:246
+msgid "00::00::00"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:53
+#: ../gtk/incall_view.c:206
 #, fuzzy
-msgid "User interface"
-msgstr "gebruikersnaam:"
+msgid "<b>Incoming call</b>"
+msgstr "Inkomende oproep"
 
-#: ../gtk-glade/parameters.glade.h:54
-msgid "Video RTP/UDP:"
+#: ../gtk/incall_view.c:216
+msgid ""
+"Pause all calls\n"
+"and answer"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:55
-#, fuzzy
-msgid "Video input device:"
-msgstr "Geluidsapparaat"
-
-#: ../gtk-glade/parameters.glade.h:56
-msgid "Your display name (eg: John Doe):"
+#: ../gtk/incall_view.c:217
+msgid "Answer"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:57
+#: ../gtk/incall_view.c:244
 #, fuzzy
-msgid "Your resulting SIP address:"
-msgstr "Uw SIP-adres:"
+msgid "<b>In call</b>"
+msgstr "Contactlijst"
 
-#: ../gtk-glade/parameters.glade.h:58
+#: ../gtk/incall_view.c:260
 #, fuzzy
-msgid "Your username:"
-msgstr "gebruikersnaam:"
-
-#: ../gtk-glade/parameters.glade.h:59
-msgid "a sound card\n"
-msgstr ""
+msgid "<b>Paused call</b>"
+msgstr "Contactlijst"
 
-#: ../gtk-glade/parameters.glade.h:61
-msgid "default camera"
+#: ../gtk/incall_view.c:272
+#, c-format
+msgid "%02i::%02i::%02i"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:62
-msgid "default soundcard"
-msgstr ""
+#: ../gtk/incall_view.c:288
+#, fuzzy
+msgid "<b>Call ended.</b>"
+msgstr "Oproep beeindigd"
 
-#: ../gtk-glade/parameters.glade.h:63
-msgid "default soundcard\n"
-msgstr ""
+#: ../gtk/incall_view.c:309
+#, fuzzy
+msgid "Unmute"
+msgstr "Ongelimiteerd"
 
-#: ../gtk-glade/buddylookup.glade.h:1
-msgid "<b>Search somebody</b>"
+#: ../gtk/incall_view.c:316
+msgid "Mute"
 msgstr ""
 
-#: ../gtk-glade/buddylookup.glade.h:2
-msgid "Add to my list"
+#: ../gtk/incall_view.c:340
+msgid "Resume"
 msgstr ""
 
-#: ../gtk-glade/buddylookup.glade.h:3
-msgid "Search contacts in directory"
+#: ../gtk/incall_view.c:347
+msgid "Pause"
 msgstr ""
 
-#: ../gtk-glade/waiting.glade.h:1
-#, fuzzy
-msgid "Linphone"
-msgstr "linphone"
-
-#: ../gtk-glade/waiting.glade.h:2
-msgid "Please wait"
+#: ../gtk/loginframe.c:93
+#, c-format
+msgid "Please enter login information for %s"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:311
+#: ../coreapi/linphonecore.c:166
 #, fuzzy, 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."
 
-#: ../coreapi/linphonecore.c:357
+#: ../coreapi/linphonecore.c:207
 msgid "aborted"
 msgstr "afgebroken"
 
-#: ../coreapi/linphonecore.c:360
+#: ../coreapi/linphonecore.c:210
 msgid "completed"
 msgstr "voltooid"
 
-#: ../coreapi/linphonecore.c:363
+#: ../coreapi/linphonecore.c:213
 msgid "missed"
 msgstr "gemist"
 
-#: ../coreapi/linphonecore.c:368
+#: ../coreapi/linphonecore.c:218
 #, c-format
 msgid ""
 "%s at %s\n"
@@ -1089,11 +448,15 @@ msgstr ""
 "Status: %s\n"
 "Tijdsduur: %i mins %i secs\n"
 
-#: ../coreapi/linphonecore.c:369
+#: ../coreapi/linphonecore.c:219
+msgid "Incoming call"
+msgstr "Inkomende oproep"
+
+#: ../coreapi/linphonecore.c:219
 msgid "Outgoing call"
 msgstr "Uitgaande oproep"
 
-#: ../coreapi/linphonecore.c:626
+#: ../coreapi/linphonecore.c:501
 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"
@@ -1101,23 +464,19 @@ msgstr ""
 "Uw machine lijkt verbonden te zijn met een IPv6 netwerk. Standaard gebruikt "
 "linphone altijd IPv4. Wijzig uw configuratie wanneer u IPv6 wilt gebruiken."
 
-#: ../coreapi/linphonecore.c:1083
+#: ../coreapi/linphonecore.c:994
 msgid "Ready"
 msgstr "Gereed."
 
-#: ../coreapi/linphonecore.c:1513
-msgid "Remote end seems to have disconnected, the call is going to be closed."
-msgstr ""
-
-#: ../coreapi/linphonecore.c:1725
+#: ../coreapi/linphonecore.c:1768
 msgid "Looking for telephone number destination..."
 msgstr "Zoekt de lokatie van het telefoonnummer..."
 
-#: ../coreapi/linphonecore.c:1727
+#: ../coreapi/linphonecore.c:1771
 msgid "Could not resolve this number."
 msgstr "Kon dit nummer niet vinden."
 
-#: ../coreapi/linphonecore.c:1771
+#: ../coreapi/linphonecore.c:1815
 msgid ""
 "Could not parse given sip address. A sip url usually looks like sip:"
 "user@domain"
@@ -1125,26 +484,54 @@ msgstr ""
 "Slecht geformuleerd SIP-adres. Een SIP-adres ziet er uit als sip:"
 "gebruikersnaam@domeinnaam"
 
-#: ../coreapi/linphonecore.c:1912
+#: ../coreapi/linphonecore.c:1962
 msgid "Contacting"
 msgstr "Verbinden"
 
-#: ../coreapi/linphonecore.c:1918
-msgid "could not call"
+#: ../coreapi/linphonecore.c:1969
+#, fuzzy
+msgid "Could not call"
 msgstr "Kon niet oproepen"
 
-#: ../coreapi/linphonecore.c:1965
-msgid "Sorry, having multiple simultaneous calls is not supported yet !"
-msgstr "Helaas, meerdere gelijktijdige gesprekken wordt nog niet ondersteund!"
+#: ../coreapi/linphonecore.c:2076
+msgid "Sorry, you have to pause or stop the current call first !"
+msgstr ""
+
+#: ../coreapi/linphonecore.c:2081
+msgid "Sorry, we have reached the maximum number of simultaneous calls"
+msgstr ""
+
+#: ../coreapi/linphonecore.c:2205
+msgid "Modifying call parameters..."
+msgstr ""
 
-#: ../coreapi/linphonecore.c:2370 ../coreapi/callbacks.c:32
+#: ../coreapi/linphonecore.c:2308
 msgid "Connected."
 msgstr "Verbonden."
 
-#: ../coreapi/linphonecore.c:2404
+#: ../coreapi/linphonecore.c:2331
+#, fuzzy
+msgid "Call aborted"
+msgstr "afgebroken"
+
+#: ../coreapi/linphonecore.c:2371
 msgid "Call ended"
 msgstr "Oproep beeindigd"
 
+#: ../coreapi/linphonecore.c:2453
+#, fuzzy
+msgid "Could not pause the call"
+msgstr "Kon niet oproepen"
+
+#: ../coreapi/linphonecore.c:2457
+#, fuzzy
+msgid "Pausing the current call..."
+msgstr "Kon niet oproepen"
+
+#: ../coreapi/linphonecore.c:2496
+msgid "There is already a call in process, pause or stop it first."
+msgstr ""
+
 #: ../coreapi/misc.c:147
 msgid ""
 "Your computer appears to be using ALSA sound drivers.\n"
@@ -1169,7 +556,7 @@ msgstr ""
 "en linphone heeft deze nodig. Geeft u alstublieft het commando\n"
 "'modprobe snd-mixer-oss' als root om de module te laden."
 
-#: ../coreapi/misc.c:497
+#: ../coreapi/misc.c:520
 msgid "Stun lookup in progress..."
 msgstr "STUN adres wordt opgezocht..."
 
@@ -1226,109 +613,149 @@ msgstr ""
 msgid "Unknown-bug"
 msgstr ""
 
-#: ../coreapi/proxy.c:176
+#: ../coreapi/proxy.c:187
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
 msgstr ""
 
-#: ../coreapi/proxy.c:182
+#: ../coreapi/proxy.c:193
 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:621
+#: ../coreapi/proxy.c:670
 #, fuzzy, c-format
 msgid "Could not login as %s"
 msgstr "Kon pixmap bestand %s niet vinden"
 
-#: ../coreapi/callbacks.c:95
+#: ../coreapi/callbacks.c:170
 #, fuzzy
 msgid "is contacting you"
 msgstr "belt u."
 
-#: ../coreapi/callbacks.c:96
+#: ../coreapi/callbacks.c:171
 msgid " and asked autoanswer."
 msgstr ""
 
-#: ../coreapi/callbacks.c:96
+#: ../coreapi/callbacks.c:171
 msgid "."
 msgstr ""
 
-#: ../coreapi/callbacks.c:120
+#: ../coreapi/callbacks.c:226
 #, fuzzy
 msgid "Remote ringing."
 msgstr "Externe diensten"
 
-#: ../coreapi/callbacks.c:139
+#: ../coreapi/callbacks.c:251
 msgid "Early media."
 msgstr ""
 
-#: ../coreapi/callbacks.c:248
+#: ../coreapi/callbacks.c:289
+#, fuzzy, c-format
+msgid "Call with %s is paused."
+msgstr "Chat met %s"
+
+#: ../coreapi/callbacks.c:300
+#, c-format
+msgid "Call answered by %s - on hold."
+msgstr ""
+
+#: ../coreapi/callbacks.c:315
+#, fuzzy
+msgid "Call resumed."
+msgstr "Oproep beeindigd"
+
+#: ../coreapi/callbacks.c:320
+#, fuzzy, c-format
+msgid "Call answered by %s."
+msgstr ""
+"Oproepen of\n"
+"beantwoorden"
+
+#: ../coreapi/callbacks.c:381
+msgid "We are being paused..."
+msgstr ""
+
+#: ../coreapi/callbacks.c:385
+msgid "We have been resumed..."
+msgstr ""
+
+#: ../coreapi/callbacks.c:422
 msgid "Call terminated."
 msgstr "Oproep beeindigd."
 
-#: ../coreapi/callbacks.c:265
+#: ../coreapi/callbacks.c:429
 msgid "User is busy."
 msgstr "Gebruiker is bezet."
 
-#: ../coreapi/callbacks.c:266
+#: ../coreapi/callbacks.c:430
 msgid "User is temporarily unavailable."
 msgstr "Gebruiker is tijdelijk niet beschikbaar."
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:268
+#: ../coreapi/callbacks.c:432
 msgid "User does not want to be disturbed."
 msgstr "De gebruiker wenst niet gestoord te worden."
 
-#: ../coreapi/callbacks.c:269
+#: ../coreapi/callbacks.c:433
 msgid "Call declined."
 msgstr "Oproep geweigerd."
 
-#: ../coreapi/callbacks.c:281
+#: ../coreapi/callbacks.c:445
 msgid "No response."
 msgstr ""
 
-#: ../coreapi/callbacks.c:284
+#: ../coreapi/callbacks.c:449
 msgid "Protocol error."
 msgstr ""
 
-#: ../coreapi/callbacks.c:298
+#: ../coreapi/callbacks.c:465
 #, fuzzy
 msgid "Redirected"
 msgstr "Doorgeschakeld naar %s..."
 
-#: ../coreapi/callbacks.c:308
+#: ../coreapi/callbacks.c:475
 msgid "Not found"
 msgstr ""
 
-#: ../coreapi/callbacks.c:318
+#: ../coreapi/callbacks.c:485
 msgid "No common codecs"
 msgstr ""
 
-#: ../coreapi/callbacks.c:324
+#: ../coreapi/callbacks.c:491
 #, fuzzy
 msgid "Call failed."
 msgstr "Oproep geannuleerd."
 
-#: ../coreapi/callbacks.c:374
+#: ../coreapi/callbacks.c:527
+#, fuzzy
+msgid "Authentication failure"
+msgstr "Authorisatie gegevens"
+
+#: ../coreapi/callbacks.c:553
 #, c-format
 msgid "Registration on %s successful."
 msgstr "Registratie op %s gelukt."
 
-#: ../coreapi/callbacks.c:375
+#: ../coreapi/callbacks.c:554
 #, fuzzy, c-format
 msgid "Unregistration on %s done."
 msgstr "Registratie op %s gelukt."
 
-#: ../coreapi/callbacks.c:383
+#: ../coreapi/callbacks.c:570
+msgid "no response timeout"
+msgstr ""
+
+#: ../coreapi/callbacks.c:573
 #, fuzzy, c-format
 msgid "Registration on %s failed: %s"
 msgstr "Registratie op %s mislukt (time-out)."
 
-#: ../coreapi/callbacks.c:383
-msgid "no response timeout"
+#: ../coreapi/callbacks.c:615
+#, c-format
+msgid "We are transferred to %s"
 msgstr ""
 
 #: ../mediastreamer2/src/alaw.c:144 ../mediastreamer2/src/alaw.c:162
@@ -1339,11 +766,11 @@ msgstr ""
 msgid "ITU-G.711 alaw decoder"
 msgstr ""
 
-#: ../mediastreamer2/src/alsa.c:935
+#: ../mediastreamer2/src/alsa.c:950
 msgid "Alsa sound source"
 msgstr ""
 
-#: ../mediastreamer2/src/alsa.c:1039
+#: ../mediastreamer2/src/alsa.c:1054
 msgid "Alsa sound output"
 msgstr ""
 
@@ -1355,15 +782,15 @@ msgstr ""
 msgid "Sound playback filter for MacOS X Audio Queue Service"
 msgstr ""
 
-#: ../mediastreamer2/src/dtmfgen.c:173 ../mediastreamer2/src/dtmfgen.c:191
+#: ../mediastreamer2/src/dtmfgen.c:274 ../mediastreamer2/src/dtmfgen.c:293
 msgid "DTMF generator"
 msgstr ""
 
-#: ../mediastreamer2/src/gsm.c:111 ../mediastreamer2/src/gsm.c:129
+#: ../mediastreamer2/src/gsm.c:120 ../mediastreamer2/src/gsm.c:138
 msgid "The GSM full-rate codec"
 msgstr ""
 
-#: ../mediastreamer2/src/gsm.c:178 ../mediastreamer2/src/gsm.c:196
+#: ../mediastreamer2/src/gsm.c:187 ../mediastreamer2/src/gsm.c:205
 msgid "The GSM codec"
 msgstr ""
 
@@ -1379,8 +806,8 @@ msgstr ""
 msgid "A filter to make conferencing"
 msgstr ""
 
-#: ../mediastreamer2/src/msfileplayer.c:295
-#: ../mediastreamer2/src/msfileplayer.c:313
+#: ../mediastreamer2/src/msfileplayer.c:311
+#: ../mediastreamer2/src/msfileplayer.c:329
 msgid "Raw files and wav reader"
 msgstr ""
 
@@ -1394,61 +821,53 @@ msgstr ""
 msgid "A filter that send several inputs to one output."
 msgstr ""
 
-#: ../mediastreamer2/src/msresample.c:221
-#: ../mediastreamer2/src/msresample.c:239
-msgid "frequency resampler"
+#: ../mediastreamer2/src/msresample.c:159
+#: ../mediastreamer2/src/msresample.c:177
+msgid "Audio resampler"
 msgstr ""
 
-#: ../mediastreamer2/src/msrtp.c:358 ../mediastreamer2/src/msrtp.c:376
+#: ../mediastreamer2/src/msrtp.c:369 ../mediastreamer2/src/msrtp.c:387
 msgid "RTP output filter"
 msgstr ""
 
-#: ../mediastreamer2/src/msrtp.c:493 ../mediastreamer2/src/msrtp.c:511
+#: ../mediastreamer2/src/msrtp.c:505 ../mediastreamer2/src/msrtp.c:523
 msgid "RTP input filter"
 msgstr ""
 
-#: ../mediastreamer2/src/msspeex.c:359 ../mediastreamer2/src/msspeex.c:377
-#: ../mediastreamer2/src/msspeex.c:504 ../mediastreamer2/src/msspeex.c:522
+#: ../mediastreamer2/src/msspeex.c:360 ../mediastreamer2/src/msspeex.c:378
+#: ../mediastreamer2/src/msspeex.c:548 ../mediastreamer2/src/msspeex.c:567
 msgid "The free and wonderful speex codec"
 msgstr ""
 
-#: ../mediastreamer2/src/msvolume.c:415 ../mediastreamer2/src/msvolume.c:430
+#: ../mediastreamer2/src/msvolume.c:527 ../mediastreamer2/src/msvolume.c:542
 msgid "A filter that controls and measure sound volume"
 msgstr ""
 
-#: ../mediastreamer2/src/msv4l.c:1011
+#: ../mediastreamer2/src/msv4l.c:1012
 msgid "A video4linux compatible source filter to stream pictures."
 msgstr ""
 
-#: ../mediastreamer2/src/msv4l2.c:470
+#: ../mediastreamer2/src/msv4l2.c:554
 msgid "A filter to grab pictures from Video4Linux2-powered cameras"
 msgstr ""
 
-#: ../mediastreamer2/src/nowebcam.c:1836
+#: ../mediastreamer2/src/nowebcam.c:1854
 msgid "A filter that outputs a static image."
 msgstr ""
 
-#: ../mediastreamer2/src/oss.c:567
-msgid "Sound capture filter for OSS drivers"
-msgstr ""
-
-#: ../mediastreamer2/src/oss.c:581
-msgid "Sound playback filter for OSS drivers"
-msgstr ""
-
-#: ../mediastreamer2/src/pixconv.c:177 ../mediastreamer2/src/pixconv.c:195
+#: ../mediastreamer2/src/pixconv.c:129 ../mediastreamer2/src/pixconv.c:147
 msgid "A pixel format converter"
 msgstr ""
 
-#: ../mediastreamer2/src/sizeconv.c:204
+#: ../mediastreamer2/src/sizeconv.c:202
 msgid "A video size converter"
 msgstr ""
 
-#: ../mediastreamer2/src/sizeconv.c:222
+#: ../mediastreamer2/src/sizeconv.c:220
 msgid "a small video size converter"
 msgstr ""
 
-#: ../mediastreamer2/src/speexec.c:349 ../mediastreamer2/src/speexec.c:367
+#: ../mediastreamer2/src/speexec.c:276 ../mediastreamer2/src/speexec.c:294
 msgid "Echo canceller using speex library"
 msgstr ""
 
@@ -1476,55 +895,55 @@ msgstr ""
 msgid "ITU-G.711 ulaw decoder"
 msgstr ""
 
-#: ../mediastreamer2/src/videodec.c:669 ../mediastreamer2/src/videodec.c:685
-#: ../mediastreamer2/src/videodec.c:768 ../mediastreamer2/src/videodec.c:784
+#: ../mediastreamer2/src/videodec.c:713 ../mediastreamer2/src/videodec.c:729
+#: ../mediastreamer2/src/videodec.c:812 ../mediastreamer2/src/videodec.c:828
 msgid "A H.263 decoder using ffmpeg library"
 msgstr ""
 
-#: ../mediastreamer2/src/videodec.c:702
+#: ../mediastreamer2/src/videodec.c:746
 msgid "A MPEG4 decoder using ffmpeg library"
 msgstr ""
 
-#: ../mediastreamer2/src/videodec.c:718
+#: ../mediastreamer2/src/videodec.c:762
 msgid "A RTP/JPEG decoder using ffmpeg library"
 msgstr ""
 
-#: ../mediastreamer2/src/videodec.c:734
+#: ../mediastreamer2/src/videodec.c:778
 msgid "A MJPEG decoder using ffmpeg library"
 msgstr ""
 
-#: ../mediastreamer2/src/videodec.c:750
+#: ../mediastreamer2/src/videodec.c:794
 msgid "A snow decoder using ffmpeg library"
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:861 ../mediastreamer2/src/videoenc.c:943
+#: ../mediastreamer2/src/videoenc.c:908 ../mediastreamer2/src/videoenc.c:990
 msgid "A video H.263 encoder using ffmpeg library."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:877
+#: ../mediastreamer2/src/videoenc.c:924
 msgid ""
 "A video H.263 encoder using ffmpeg library. It is compliant with old RFC2190 "
 "spec."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:893 ../mediastreamer2/src/videoenc.c:975
+#: ../mediastreamer2/src/videoenc.c:940 ../mediastreamer2/src/videoenc.c:1022
 msgid "A video MPEG4 encoder using ffmpeg library."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:909
+#: ../mediastreamer2/src/videoenc.c:956
 msgid "A video snow encoder using ffmpeg library."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:925
+#: ../mediastreamer2/src/videoenc.c:972
 msgid "A RTP/MJPEG encoder using ffmpeg library."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:959
+#: ../mediastreamer2/src/videoenc.c:1006
 msgid ""
 "A video H.263 encoder using ffmpeg library, compliant with old RFC2190 spec."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:991
+#: ../mediastreamer2/src/videoenc.c:1038
 msgid ""
 "The snow codec is royalty-free and is open-source. \n"
 "It uses innovative techniques that makes it one of most promising video "
@@ -1533,12 +952,12 @@ msgid ""
 "versions cannot be guaranteed."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:1011
+#: ../mediastreamer2/src/videoenc.c:1058
 msgid "A MJPEG encoder using ffmpeg library."
 msgstr ""
 
-#: ../mediastreamer2/src/videoout.c:1812 ../mediastreamer2/src/videoout.c:1830
-msgid "A generic video display"
+#: ../mediastreamer2/src/videoout.c:933
+msgid "A SDL-based video display"
 msgstr ""
 
 #: ../mediastreamer2/src/wincevideods.c:969
@@ -1565,10 +984,337 @@ msgstr ""
 msgid "Parametric sound equalizer."
 msgstr ""
 
-#: ../mediastreamer2/src/msdscap-mingw.cc:1003
+#: ../mediastreamer2/src/msdscap-mingw.cc:1038
 msgid "A webcam grabber based on directshow."
 msgstr ""
 
+#: ../mediastreamer2/src/drawdib-display.c:552
+#: ../mediastreamer2/src/drawdib-display.c:570
+msgid "A video display based on windows DrawDib api"
+msgstr ""
+
+#: ../mediastreamer2/src/audiomixer.c:192
+#: ../mediastreamer2/src/audiomixer.c:211
+msgid "A filter that mixes down 16 bit sample audio streams"
+msgstr ""
+
+#: ../mediastreamer2/src/chanadapt.c:110 ../mediastreamer2/src/chanadapt.c:128
+msgid "A filter that converts from mono to stereo and vice versa."
+msgstr ""
+
+#: ../mediastreamer2/src/itc.c:97 ../mediastreamer2/src/itc.c:115
+#: ../mediastreamer2/src/itc.c:197 ../mediastreamer2/src/itc.c:215
+msgid "Inter ticker communication filter."
+msgstr ""
+
+#: ../mediastreamer2/src/extdisplay.c:62 ../mediastreamer2/src/extdisplay.c:79
+msgid "A display filter sending the buffers to draw to the upper layer"
+msgstr ""
+
+#: ../mediastreamer2/src/msiounit.c:619
+msgid "Sound capture filter for MacOS X Audio Unit Service"
+msgstr ""
+
+#: ../mediastreamer2/src/msiounit.c:633
+msgid "Sound playback filter for MacOS X Audio Unit Service"
+msgstr ""
+
+#: ../mediastreamer2/src/x11video.c:562
+msgid "A video display using X11+Xv"
+msgstr ""
+
+#. .id=
+#. .name=
+#. .text=
+#: ../mediastreamer2/src/msandroid.cpp:370
+msgid "Sound capture filter for Android"
+msgstr ""
+
+#. .id=
+#. .name=
+#. .text=
+#: ../mediastreamer2/src/msandroid.cpp:667
+msgid "Sound playback filter for Android"
+msgstr ""
+
+#: ../mediastreamer2/src/msandroidvideo.cpp:134
+msgid "A filter that captures Android video."
+msgstr ""
+
+#, fuzzy
+#~ msgid "Incoming call from %s"
+#~ msgstr "Inkomende oproep"
+
+#~ msgid "#"
+#~ msgstr "#"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "0"
+#~ msgstr "0"
+
+#~ msgid "1"
+#~ msgstr "1"
+
+#~ msgid "5"
+#~ msgstr "5"
+
+#, fuzzy
+#~ msgid "<b>Add contacts from directory</b>"
+#~ msgstr "Contact informatie"
+
+#, fuzzy
+#~ msgid "<b>Contact list</b>"
+#~ msgstr "Contactlijst"
+
+#, fuzzy
+#~ msgid "<b>Welcome !</b>"
+#~ msgstr "Contactlijst"
+
+#, fuzzy
+#~ msgid "Audio & Video"
+#~ msgstr "Audio codecs"
+
+#, fuzzy
+#~ msgid "Audio only"
+#~ msgstr "Audio codecs"
+
+#, fuzzy
+#~ msgid "Automatically log me in"
+#~ msgstr "Automatisch een geldige hostnaam raden"
+
+#, fuzzy
+#~ msgid "Call Details"
+#~ msgstr "Oproepgeschiedenis"
+
+#, fuzzy
+#~ msgid "Call history"
+#~ msgstr "Linphone - Oproepgeschiedenis"
+
+#, fuzzy
+#~ msgid "Contacts"
+#~ msgstr "Verbinden"
+
+#, fuzzy
+#~ msgid "Duration"
+#~ msgstr "Informatie"
+
+#, fuzzy
+#~ msgid "Duration:"
+#~ msgstr "Informatie"
+
+#, fuzzy
+#~ msgid "Enable self-view"
+#~ msgstr "Video aan"
+
+#, fuzzy
+#~ msgid "In call"
+#~ msgstr "Inkomende oproep"
+
+#, fuzzy
+#~ msgid "Login information"
+#~ msgstr "Contact informatie"
+
+#, fuzzy
+#~ msgid "My current identity:"
+#~ msgstr "SIP-identiteit:"
+
+#, fuzzy
+#~ msgid "Password"
+#~ msgstr "wachtwoord:"
+
+#, fuzzy
+#~ msgid "SIP address or phone number:"
+#~ msgstr "Geef het SIP adres of telefoonnummer in"
+
+#, fuzzy
+#~ msgid "Username"
+#~ msgstr "gebruikersnaam:"
+
+#, fuzzy
+#~ msgid "_Linphone"
+#~ msgstr "linphone"
+
+#, fuzzy
+#~ msgid "_Modes"
+#~ msgstr "Codecs"
+
+#, fuzzy
+#~ msgid "About linphone"
+#~ msgstr "linphone"
+
+#, fuzzy
+#~ msgid "<b>Contact information</b>"
+#~ msgstr "Contact informatie"
+
+#, fuzzy
+#~ msgid "SIP Address"
+#~ msgstr "Adres"
+
+#, fuzzy
+#~ msgid "Linphone - Authentication required"
+#~ msgstr "Authorisatie gevraagd"
+
+#, fuzzy
+#~ msgid "Password:"
+#~ msgstr "wachtwoord:"
+
+#, fuzzy
+#~ msgid "Publish presence information"
+#~ msgstr "Toon informatie over aanwezigheid:"
+
+#, fuzzy
+#~ msgid "Registration duration (sec):"
+#~ msgstr "Registratieperiode:"
+
+#~ msgid "Route (optional):"
+#~ msgstr "Route (optioneel):"
+
+#, fuzzy
+#~ msgid "SIP Proxy address:"
+#~ msgstr "SIP-proxy:"
+
+#, fuzzy
+#~ msgid "Your SIP identity:"
+#~ msgstr "SIP-identiteit:"
+
+#~ msgid "sip:"
+#~ msgstr "sip:"
+
+#, fuzzy
+#~ msgid "Send"
+#~ msgstr "Geluid"
+
+#~ msgid "Accept"
+#~ msgstr "Accepteren"
+
+#, fuzzy
+#~ msgid "Decline"
+#~ msgstr "lijn"
+
+#, fuzzy
+#~ msgid "Incoming call from"
+#~ msgstr "Inkomende oproep"
+
+#, fuzzy
+#~ msgid "Linphone - Incoming call"
+#~ msgstr "Inkomende oproep"
+
+#, fuzzy
+#~ msgid "<b>Audio</b>"
+#~ msgstr "Contactlijst"
+
+#, fuzzy
+#~ msgid "<b>Codecs</b>"
+#~ msgstr "Contactlijst"
+
+#, fuzzy
+#~ msgid "<b>Level</b>"
+#~ msgstr "Contactlijst"
+
+#, fuzzy
+#~ msgid "<b>Ports</b>"
+#~ msgstr "Contactlijst"
+
+#, fuzzy
+#~ msgid "<b>Proxy accounts</b>"
+#~ msgstr "Contactlijst"
+
+#, fuzzy
+#~ msgid "<b>Transport</b>"
+#~ msgstr "Contactlijst"
+
+#, fuzzy
+#~ msgid "Add"
+#~ msgstr "Adres"
+
+#, fuzzy
+#~ msgid ""
+#~ "Audio codecs\n"
+#~ "Video codecs"
+#~ msgstr "Audio en video codecs"
+
+#, fuzzy
+#~ msgid "Capture device:"
+#~ msgstr "Geluidsapparaat gebruiken:"
+
+#, fuzzy
+#~ msgid "Codecs"
+#~ msgstr "Codecs"
+
+#~ msgid "Disable"
+#~ msgstr "Uit"
+
+#, fuzzy
+#~ msgid "Done"
+#~ msgstr "Weg"
+
+#, fuzzy
+#~ msgid "Download speed limit in Kbit/sec:"
+#~ msgstr "Download bandbreedte (kbit/sec):"
+
+#~ msgid "Edit"
+#~ msgstr "Bewerken"
+
+#~ msgid "Enable"
+#~ msgstr "Aan"
+
+#, fuzzy
+#~ msgid "Network settings"
+#~ msgstr "Netwerk"
+
+#, fuzzy
+#~ msgid "Playback device:"
+#~ msgstr "Geluidsapparaat gebruiken:"
+
+#, fuzzy
+#~ msgid "Public IP address:"
+#~ msgstr "SIP-adres:"
+
+#~ msgid "Remove"
+#~ msgstr "Verwijderen"
+
+#, fuzzy
+#~ msgid "Ring device:"
+#~ msgstr "Geluidsapparaat gebruiken:"
+
+#, fuzzy
+#~ msgid "Ring sound:"
+#~ msgstr "Belgeluid:"
+
+#, fuzzy
+#~ msgid "Stun server:"
+#~ msgstr "Geluidsapparaat"
+
+#, fuzzy
+#~ msgid "Upload speed limit in Kbit/sec:"
+#~ msgstr "Upload bandbreedte (kbit/sec):"
+
+#, fuzzy
+#~ msgid "User interface"
+#~ msgstr "gebruikersnaam:"
+
+#, fuzzy
+#~ msgid "Video input device:"
+#~ msgstr "Geluidsapparaat"
+
+#, fuzzy
+#~ msgid "Your resulting SIP address:"
+#~ msgstr "Uw SIP-adres:"
+
+#, fuzzy
+#~ msgid "Your username:"
+#~ msgstr "gebruikersnaam:"
+
+#, fuzzy
+#~ msgid "Linphone"
+#~ msgstr "linphone"
+
+#~ 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."
 
@@ -1597,14 +1343,6 @@ 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:"
 
-#, fuzzy
-#~ msgid "<b>Terminate call</b>"
-#~ msgstr "Contactlijst"
-
-#, fuzzy
-#~ msgid "Show current call"
-#~ msgstr "Kon niet oproepen"
-
 #~ msgid "No nat/firewall address supplied !"
 #~ msgstr "Geen NAT/firewall adres opgegeven"
 
@@ -1690,13 +1428,6 @@ msgstr ""
 #~ msgid "..."
 #~ msgstr "..."
 
-#~ msgid ""
-#~ "Call or\n"
-#~ "answer"
-#~ msgstr ""
-#~ "Oproepen of\n"
-#~ "beantwoorden"
-
 #~ msgid ""
 #~ "Hangup\n"
 #~ "or refuse"
@@ -1920,9 +1651,6 @@ msgstr ""
 #~ "Schoon alle opgeslagen authorisatie gegevens op (gebruikersnaam, "
 #~ "wachtwoord...)"
 
-#~ msgid "Authentication information"
-#~ msgstr "Authorisatie gegevens"
-
 #~ msgid "SIP"
 #~ msgstr "SIP"
 
diff --git a/po/pl.po b/po/pl.po
index dc9e5cf4d7dd21d2519c78e20f71b13b71bf2800..a8130dd5b217c94ad5e97c406aeeea25e50a4420 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,58 +6,53 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone 0.7.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 17:16+0200\n"
+"POT-Creation-Date: 2011-02-07 10:59+0100\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: ../gtk-glade/support.c:49 ../gtk-glade/support.c:73
-#: ../gtk-glade/support.c:102
+#: ../gtk/support.c:49 ../gtk/support.c:73 ../gtk/support.c:102
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "Nie można znaleźć pixmapy: %s"
 
-#: ../gtk-glade/chat.c:27
+#: ../gtk/chat.c:27
 #, c-format
 msgid "Chat with %s"
 msgstr ""
 
-#: ../gtk-glade/main.c:94
+#: ../gtk/main.c:74
 msgid "log to stdout some debug information while running."
 msgstr ""
 
-#: ../gtk-glade/main.c:101
+#: ../gtk/main.c:81
 msgid "Start only in the system tray, do not show the main interface."
 msgstr ""
 
-#: ../gtk-glade/main.c:108
+#: ../gtk/main.c:88
 msgid "address to call right now"
 msgstr ""
 
-#: ../gtk-glade/main.c:115
+#: ../gtk/main.c:95
 msgid "if set automatically answer incoming calls"
 msgstr ""
 
-#: ../gtk-glade/main.c:123
+#: ../gtk/main.c:103
 msgid ""
 "Specifiy a working directory (should be the base of the installation, eg: c:"
 "\\Program Files\\Linphone)"
 msgstr ""
 
-#: ../gtk-glade/main.c:402
+#: ../gtk/main.c:479
 #, c-format
 msgid "Call with %s"
 msgstr ""
 
-#: ../gtk-glade/main.c:720
-#, c-format
-msgid "Incoming call from %s"
-msgstr ""
-
-#: ../gtk-glade/main.c:759
+#: ../gtk/main.c:862
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
@@ -66,1000 +61,374 @@ msgid ""
 "If you answer no, this person will be temporarily blacklisted."
 msgstr ""
 
-#: ../gtk-glade/main.c:837
+#: ../gtk/main.c:940
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at domain <i>%s</i>:"
 msgstr ""
 
-#: ../gtk-glade/main.c:934
+#: ../gtk/main.c:1076
 msgid "Website link"
 msgstr ""
 
-#: ../gtk-glade/main.c:970
+#: ../gtk/main.c:1112
 msgid "Linphone - a video internet phone"
 msgstr ""
 
-#: ../gtk-glade/main.c:989
+#: ../gtk/main.c:1131
 #, c-format
 msgid "%s (Default)"
 msgstr ""
 
-#: ../gtk-glade/main.c:1221
+#: ../gtk/main.c:1382
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
 msgstr ""
 
-#: ../gtk-glade/main.c:1275
+#: ../gtk/main.c:1441
 msgid "A free SIP video-phone"
 msgstr ""
 
-#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:258
-#: ../gtk-glade/contact.glade.h:3
+#: ../gtk/friendlist.c:192 ../gtk/propertybox.c:271
 msgid "Name"
 msgstr "Nazwa"
 
-#: ../gtk-glade/friendlist.c:205
+#: ../gtk/friendlist.c:205
 #, fuzzy
 msgid "Presence status"
 msgstr "Obecność"
 
-#: ../gtk-glade/friendlist.c:242
+#: ../gtk/friendlist.c:242
 #, c-format
 msgid "Search in %s directory"
 msgstr ""
 
-#: ../gtk-glade/friendlist.c:450
+#: ../gtk/friendlist.c:450
 msgid "Invalid sip contact !"
 msgstr ""
 
-#: ../gtk-glade/friendlist.c:492
+#: ../gtk/friendlist.c:495
 #, c-format
 msgid "Call %s"
 msgstr ""
 
-#: ../gtk-glade/friendlist.c:493
+#: ../gtk/friendlist.c:496
 #, c-format
 msgid "Send text to %s"
 msgstr ""
 
-#: ../gtk-glade/friendlist.c:494
+#: ../gtk/friendlist.c:497
 #, fuzzy, c-format
 msgid "Edit contact '%s'"
 msgstr "(Brak informacji kontaktowych !)"
 
-#: ../gtk-glade/friendlist.c:495
+#: ../gtk/friendlist.c:498
 #, c-format
 msgid "Delete contact '%s'"
 msgstr ""
 
-#: ../gtk-glade/friendlist.c:537
+#: ../gtk/friendlist.c:540
 #, c-format
 msgid "Add new contact from %s directory"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:264
+#: ../gtk/propertybox.c:277
 msgid "Rate (Hz)"
 msgstr "Jakość (Hz)"
 
-#: ../gtk-glade/propertybox.c:270
+#: ../gtk/propertybox.c:283
 msgid "Status"
 msgstr "Status"
 
-#: ../gtk-glade/propertybox.c:276
+#: ../gtk/propertybox.c:289
 msgid "Min bitrate (kbit/s)"
 msgstr "Min przepustowość (kbit/s)"
 
-#: ../gtk-glade/propertybox.c:283
+#: ../gtk/propertybox.c:296
 msgid "Parameters"
 msgstr "Parametr"
 
-#: ../gtk-glade/propertybox.c:312 ../gtk-glade/propertybox.c:451
+#: ../gtk/propertybox.c:325 ../gtk/propertybox.c:464
 msgid "Enabled"
 msgstr "Włączone"
 
-#: ../gtk-glade/propertybox.c:313 ../gtk-glade/propertybox.c:451
+#: ../gtk/propertybox.c:326 ../gtk/propertybox.c:464
 msgid "Disabled"
 msgstr "Wyłączone"
 
-#: ../gtk-glade/propertybox.c:496
+#: ../gtk/propertybox.c:509
 msgid "Account"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:636
+#: ../gtk/propertybox.c:649
 msgid "English"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:637
+#: ../gtk/propertybox.c:650
 msgid "French"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:638
+#: ../gtk/propertybox.c:651
 msgid "Swedish"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:639
+#: ../gtk/propertybox.c:652
 msgid "Italian"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:640
+#: ../gtk/propertybox.c:653
 msgid "Spanish"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:641
+#: ../gtk/propertybox.c:654
 msgid "Brazilian Portugese"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:642
+#: ../gtk/propertybox.c:655
 msgid "Polish"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:643
+#: ../gtk/propertybox.c:656
 msgid "German"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:644
+#: ../gtk/propertybox.c:657
 msgid "Russian"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:645
+#: ../gtk/propertybox.c:658
 msgid "Japanese"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:646
+#: ../gtk/propertybox.c:659
 msgid "Dutch"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:647
+#: ../gtk/propertybox.c:660
 msgid "Hungarian"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:648
+#: ../gtk/propertybox.c:661
 msgid "Czech"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:649
+#: ../gtk/propertybox.c:662
 msgid "Chinese"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:706
+#: ../gtk/propertybox.c:719
 msgid ""
 "You need to restart linphone for the new language selection to take effect."
 msgstr ""
 
-#: ../gtk-glade/update.c:80
+#: ../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-glade/update.c:91
+#: ../gtk/update.c:91
 msgid "You are running the lastest version."
 msgstr ""
 
-#: ../gtk-glade/buddylookup.c:85
+#: ../gtk/buddylookup.c:85
 msgid "Firstname, Lastname"
 msgstr ""
 
-#: ../gtk-glade/buddylookup.c:160
+#: ../gtk/buddylookup.c:160
 msgid "Error communicating with server."
 msgstr ""
 
-#: ../gtk-glade/buddylookup.c:164
+#: ../gtk/buddylookup.c:164
 #, fuzzy
 msgid "Connecting..."
 msgstr "Lącze"
 
-#: ../gtk-glade/buddylookup.c:168
+#: ../gtk/buddylookup.c:168
 #, fuzzy
 msgid "Connected"
 msgstr "Połączony"
 
-#: ../gtk-glade/buddylookup.c:172
+#: ../gtk/buddylookup.c:172
 msgid "Receiving data..."
 msgstr ""
 
-#: ../gtk-glade/buddylookup.c:180
+#: ../gtk/buddylookup.c:180
 #, c-format
 msgid "Found %i contact"
 msgid_plural "Found %i contacts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gtk-glade/setupwizard.c:25
+#: ../gtk/setupwizard.c:25
 msgid ""
 "Welcome !\n"
 "This assistant will help you to use a SIP account for your calls."
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:34
+#: ../gtk/setupwizard.c:34
 msgid "Create an account by choosing a username"
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:35
+#: ../gtk/setupwizard.c:35
 msgid "I have already an account and just want to use it"
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:53
+#: ../gtk/setupwizard.c:53
 msgid "Please choose a username:"
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:54
+#: ../gtk/setupwizard.c:54
 #, fuzzy
 msgid "Username:"
 msgstr "Podręcznik"
 
-#: ../gtk-glade/setupwizard.c:92
+#: ../gtk/setupwizard.c:92
 #, c-format
 msgid "Checking if '%s' is available..."
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:97 ../gtk-glade/setupwizard.c:164
+#: ../gtk/setupwizard.c:97 ../gtk/setupwizard.c:164
 msgid "Please wait..."
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:101
+#: ../gtk/setupwizard.c:101
 msgid "Sorry this username already exists. Please try a new one."
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:103 ../gtk-glade/setupwizard.c:168
+#: ../gtk/setupwizard.c:103 ../gtk/setupwizard.c:168
 msgid "Ok !"
-msgstr ""
-
-#: ../gtk-glade/setupwizard.c:106 ../gtk-glade/setupwizard.c:171
-msgid "Communication problem, please try again later."
-msgstr ""
-
-#: ../gtk-glade/setupwizard.c:134
-msgid "Thank you. Your account is now configured and ready for use."
-msgstr ""
-
-#: ../gtk-glade/setupwizard.c:228
-msgid "Welcome to the account setup assistant"
-msgstr ""
-
-#: ../gtk-glade/setupwizard.c:232
-msgid "Account setup assistant"
-msgstr ""
-
-#: ../gtk-glade/setupwizard.c:236
-msgid "Choosing a username"
-msgstr ""
-
-#: ../gtk-glade/setupwizard.c:240
-msgid "Verifying"
-msgstr ""
-
-#: ../gtk-glade/setupwizard.c:244
-#, fuzzy
-msgid "Confirmation"
-msgstr "Informacja"
-
-#: ../gtk-glade/setupwizard.c:249
-msgid "Creating your account"
-msgstr ""
-
-#: ../gtk-glade/setupwizard.c:253
-msgid "Now ready !"
-msgstr ""
-
-#: ../gtk-glade/incall_view.c:113
-#, fuzzy
-msgid "<b>Calling...</b>"
-msgstr "Dzwonie do "
-
-#: ../gtk-glade/incall_view.c:116 ../gtk-glade/incall_view.c:138
-msgid "00::00::00"
-msgstr ""
-
-#: ../gtk-glade/incall_view.c:136
-#, fuzzy
-msgid "<b>In call with</b>"
-msgstr "Dzwonie do "
-
-#: ../gtk-glade/incall_view.c:154
-#, c-format
-msgid "%02i::%02i::%02i"
-msgstr ""
-
-#: ../gtk-glade/incall_view.c:170
-#, fuzzy
-msgid "<b>Call ended.</b>"
-msgstr "Rozmowa odrzucona."
-
-#: ../gtk-glade/incall_view.c:188
-msgid "Unmute"
-msgstr ""
-
-#: ../gtk-glade/incall_view.c:195 ../gtk-glade/main.glade.h:43
-msgid "Mute"
-msgstr ""
-
-#: ../gtk-glade/loginframe.c:83
-#, c-format
-msgid "Please enter login information for %s"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:1
-msgid "#"
-msgstr "#"
-
-#: ../gtk-glade/main.glade.h:2
-msgid "*"
-msgstr "*"
-
-#: ../gtk-glade/main.glade.h:3
-msgid "0"
-msgstr "0"
-
-#: ../gtk-glade/main.glade.h:4
-msgid "1"
-msgstr "1"
-
-#: ../gtk-glade/main.glade.h:5
-msgid "2"
-msgstr "2"
-
-#: ../gtk-glade/main.glade.h:6
-msgid "3"
-msgstr "3"
-
-#: ../gtk-glade/main.glade.h:7
-msgid "4"
-msgstr "4"
-
-#: ../gtk-glade/main.glade.h:8
-msgid "5"
-msgstr "5"
-
-#: ../gtk-glade/main.glade.h:9
-msgid "6"
-msgstr "6"
-
-#: ../gtk-glade/main.glade.h:10
-msgid "7"
-msgstr "7"
-
-#: ../gtk-glade/main.glade.h:11
-msgid "8"
-msgstr "8"
-
-#: ../gtk-glade/main.glade.h:12
-msgid "9"
-msgstr "9"
-
-#: ../gtk-glade/main.glade.h:13
-#, fuzzy
-msgid "<b>Add contacts from directory</b>"
-msgstr "Informacje o kodeku"
-
-#: ../gtk-glade/main.glade.h:14
-#, fuzzy
-msgid "<b>Contact list</b>"
-msgstr "Dzwonie do "
-
-#: ../gtk-glade/main.glade.h:15
-#, fuzzy
-msgid "<b>Welcome !</b>"
-msgstr "Dzwonie do "
-
-#: ../gtk-glade/main.glade.h:16
-msgid "A"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:17
-msgid ""
-"ADSL\n"
-"Fiber Channel"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:19
-msgid ""
-"All users\n"
-"Online users"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:21
-msgid "Assistant"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:22
-#, fuzzy
-msgid "Audio & Video"
-msgstr "Kodeki audio"
-
-#: ../gtk-glade/main.glade.h:23
-#, fuzzy
-msgid "Audio only"
-msgstr "Kodeki audio"
-
-#: ../gtk-glade/main.glade.h:24
-msgid "Automatically log me in"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:25
-msgid "B"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:26 ../gtk-glade/parameters.glade.h:21
-msgid "C"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:27
-msgid "Call Details"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:28 ../gtk-glade/call_logs.glade.h:1
-msgid "Call history"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:29
-msgid "Check for updates"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:30
-#, fuzzy
-msgid "Contacts"
-msgstr "Dzwonie do "
-
-#: ../gtk-glade/main.glade.h:31
-msgid "D"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:32
-msgid "Default"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:33
-#, fuzzy
-msgid "Duration"
-msgstr "Informacja"
-
-#: ../gtk-glade/main.glade.h:34
-#, fuzzy
-msgid "Duration:"
-msgstr "Informacja"
-
-#: ../gtk-glade/main.glade.h:35
-#, fuzzy
-msgid "Enable self-view"
-msgstr "Włączone"
-
-#: ../gtk-glade/main.glade.h:36
-msgid "Enter username, phone number, or full sip address"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:37
-msgid "Homepage"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:38
-msgid "In call"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:39
-msgid "Internet connection:"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:40
-msgid "Keypad"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:41
-#, fuzzy
-msgid "Login information"
-msgstr "Informacje o kodeku"
-
-#: ../gtk-glade/main.glade.h:42
-msgid "Lookup:"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:44
-#, fuzzy
-msgid "My current identity:"
-msgstr "Tożsamość"
-
-#: ../gtk-glade/main.glade.h:45
-#, fuzzy
-msgid "Password"
-msgstr "Twoje hasło:"
-
-#: ../gtk-glade/main.glade.h:46
-#, fuzzy
-msgid "SIP address or phone number:"
-msgstr "Adres serwera rejestracji sip"
-
-#: ../gtk-glade/main.glade.h:47
-msgid "Search"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:48
-msgid "Show debug messages"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:49
-msgid "Start call"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:50
-msgid "Terminate call"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:51
-#, fuzzy
-msgid "Username"
-msgstr "Podręcznik"
-
-#: ../gtk-glade/main.glade.h:52
-#, fuzzy
-msgid "_Linphone"
-msgstr "linphone"
-
-#: ../gtk-glade/main.glade.h:53
-#, fuzzy
-msgid "_Modes"
-msgstr "Kodeki"
-
-#: ../gtk-glade/main.glade.h:54
-msgid "in"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:55
-msgid "label"
-msgstr ""
-
-#: ../gtk-glade/about.glade.h:1
-#, fuzzy
-msgid "About linphone"
-msgstr "linphone"
-
-#: ../gtk-glade/about.glade.h:2
-msgid "An internet video phone using the standard SIP (rfc3261) protocol."
-msgstr ""
-
-#: ../gtk-glade/about.glade.h:3
-msgid "Created by Simon Morlat\n"
-msgstr ""
-
-#: ../gtk-glade/about.glade.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"
-msgstr ""
-
-#: ../gtk-glade/contact.glade.h:1
-#, fuzzy
-msgid "<b>Contact information</b>"
-msgstr "Informacje o kodeku"
-
-#: ../gtk-glade/contact.glade.h:2
-msgid "Allow this contact to see my presence status"
-msgstr ""
-
-#: ../gtk-glade/contact.glade.h:4
-#, fuzzy
-msgid "SIP Address"
-msgstr "Adres"
-
-#: ../gtk-glade/contact.glade.h:5
-msgid "Show this contact presence status"
-msgstr ""
-
-#: ../gtk-glade/contact.glade.h:6 ../gtk-glade/password.glade.h:5
-#: ../gtk-glade/sip_account.glade.h:9
-msgid "gtk-cancel"
-msgstr ""
-
-#: ../gtk-glade/contact.glade.h:7 ../gtk-glade/password.glade.h:6
-#: ../gtk-glade/sip_account.glade.h:10
-msgid "gtk-ok"
-msgstr ""
-
-#: ../gtk-glade/log.glade.h:1
-msgid "Linphone debug window"
-msgstr ""
-
-#: ../gtk-glade/log.glade.h:2 ../gtk-glade/call_logs.glade.h:2
-#: ../gtk-glade/chatroom.glade.h:2
-msgid "gtk-close"
-msgstr ""
-
-#: ../gtk-glade/password.glade.h:1
-msgid "Linphone - Authentication required"
-msgstr ""
-
-#: ../gtk-glade/password.glade.h:2
-#, fuzzy
-msgid "Password:"
-msgstr "Twoje hasło:"
-
-#: ../gtk-glade/password.glade.h:3
-msgid "Please enter the domain password"
-msgstr ""
-
-#: ../gtk-glade/password.glade.h:4
-msgid "UserID"
-msgstr ""
-
-#: ../gtk-glade/sip_account.glade.h:1
-msgid "Configure a SIP account"
-msgstr ""
-
-#: ../gtk-glade/sip_account.glade.h:2
-msgid "Linphone - Configure a SIP account"
-msgstr ""
-
-#: ../gtk-glade/sip_account.glade.h:3
-#, fuzzy
-msgid "Publish presence information"
-msgstr "Informacje o kodeku"
-
-#: ../gtk-glade/sip_account.glade.h:4
-msgid "Register at startup"
-msgstr ""
-
-#: ../gtk-glade/sip_account.glade.h:5
-#, fuzzy
-msgid "Registration duration (sec):"
-msgstr "Rejestracja powiodła się."
-
-#: ../gtk-glade/sip_account.glade.h:6
-msgid "Route (optional):"
-msgstr ""
-
-#: ../gtk-glade/sip_account.glade.h:7
-#, fuzzy
-msgid "SIP Proxy address:"
-msgstr "Adres sip:"
-
-#: ../gtk-glade/sip_account.glade.h:8
-#, fuzzy
-msgid "Your SIP identity:"
-msgstr "Tożsamość"
-
-#: ../gtk-glade/sip_account.glade.h:11
-msgid "sip:"
-msgstr "sip:"
-
-#: ../gtk-glade/chatroom.glade.h:1
-#, fuzzy
-msgid "Send"
-msgstr "Dźwięk"
-
-#: ../gtk-glade/incoming_call.glade.h:1
-msgid "Accept"
-msgstr ""
-
-#: ../gtk-glade/incoming_call.glade.h:2
-#, fuzzy
-msgid "Decline"
-msgstr "linia"
-
-#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:369
-msgid "Incoming call"
-msgstr ""
-
-#: ../gtk-glade/incoming_call.glade.h:4
-msgid "Incoming call from"
-msgstr ""
-
-#: ../gtk-glade/incoming_call.glade.h:5
-msgid "Linphone - Incoming call"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:1
-msgid "0 stands for \"unlimited\""
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:2
-#, fuzzy
-msgid "<b>Audio</b>"
-msgstr "Dzwonie do "
-
-#: ../gtk-glade/parameters.glade.h:3
-msgid "<b>Bandwidth control</b>"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:4
-#, fuzzy
-msgid "<b>Codecs</b>"
-msgstr "Dzwonie do "
-
-#: ../gtk-glade/parameters.glade.h:5
-msgid "<b>Default identity</b>"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:6
-msgid "<b>Language</b>"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:7
-#, fuzzy
-msgid "<b>Level</b>"
-msgstr "Dzwonie do "
-
-#: ../gtk-glade/parameters.glade.h:8
-msgid "<b>NAT and Firewall</b>"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:9
-#, fuzzy
-msgid "<b>Ports</b>"
-msgstr "Dzwonie do "
-
-#: ../gtk-glade/parameters.glade.h:10
-msgid "<b>Privacy</b>"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:11
-#, fuzzy
-msgid "<b>Proxy accounts</b>"
-msgstr "Dzwonie do "
-
-#: ../gtk-glade/parameters.glade.h:12
-#, fuzzy
-msgid "<b>Transport</b>"
-msgstr "Dzwonie do "
-
-#: ../gtk-glade/parameters.glade.h:13
-msgid "<b>Video</b>"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:14
-msgid "ALSA special device (optional):"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:15
-#, fuzzy
-msgid "Add"
-msgstr "Adres"
-
-#: ../gtk-glade/parameters.glade.h:16
-msgid "Audio RTP/UDP:"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:17
-#, fuzzy
-msgid ""
-"Audio codecs\n"
-"Video codecs"
-msgstr "Kodeki audio"
-
-#: ../gtk-glade/parameters.glade.h:19
-msgid "Behind NAT / Firewall (specify gateway IP below)"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:20
-msgid "Behind NAT / Firewall (use STUN to resolve)"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:22
-msgid "CIF"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:23
-#, fuzzy
-msgid "Capture device:"
-msgstr "Użyj tego urządzenia dźwięku:"
-
-#: ../gtk-glade/parameters.glade.h:24
-#, fuzzy
-msgid "Codecs"
-msgstr "Kodeki"
-
-#: ../gtk-glade/parameters.glade.h:25
-msgid "Direct connection to the Internet"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:26
-msgid "Disable"
-msgstr "Wyłącz"
-
-#: ../gtk-glade/parameters.glade.h:27
-#, fuzzy
-msgid "Done"
-msgstr "Brak."
-
-#: ../gtk-glade/parameters.glade.h:28
-msgid "Download speed limit in Kbit/sec:"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:29
-msgid "Edit"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:30
-msgid "Enable"
-msgstr "Włączony"
-
-#: ../gtk-glade/parameters.glade.h:31
-msgid "Enable echo cancellation"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:32
-msgid "Erase all passwords"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:33
-msgid "Manage SIP Accounts"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:34
-msgid "Multimedia settings"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:35
-#, fuzzy
-msgid "Network settings"
-msgstr "Sieć"
-
-#: ../gtk-glade/parameters.glade.h:36
-#, fuzzy
-msgid "Playback device:"
-msgstr "Użyj tego urządzenia dźwięku:"
-
-#: ../gtk-glade/parameters.glade.h:37
-msgid "Prefered video resolution:"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:38
-#, fuzzy
-msgid "Public IP address:"
-msgstr "Adres sip:"
-
-#: ../gtk-glade/parameters.glade.h:39
-msgid ""
-"Register to FONICS\n"
-"virtual network !"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:41
-msgid "Remove"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:42
-#, fuzzy
-msgid "Ring device:"
-msgstr "Użyj tego urządzenia dźwięku:"
+msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:43
-#, fuzzy
-msgid "Ring sound:"
-msgstr "Źródło nagrywania:"
+#: ../gtk/setupwizard.c:106 ../gtk/setupwizard.c:171
+msgid "Communication problem, please try again later."
+msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:44
-msgid "SIP (UDP):"
+#: ../gtk/setupwizard.c:134
+msgid "Thank you. Your account is now configured and ready for use."
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:45
-msgid "Send DTMFs as SIP info"
+#: ../gtk/setupwizard.c:228
+msgid "Welcome to the account setup assistant"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:46
-msgid "Set Maximum Transmission Unit:"
+#: ../gtk/setupwizard.c:232
+msgid "Account setup assistant"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:47
-msgid "Settings"
+#: ../gtk/setupwizard.c:236
+msgid "Choosing a username"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:48
-msgid "Show advanced settings"
+#: ../gtk/setupwizard.c:240
+msgid "Verifying"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:49
+#: ../gtk/setupwizard.c:244
 #, fuzzy
-msgid "Stun server:"
-msgstr "Dźwięk"
+msgid "Confirmation"
+msgstr "Informacja"
 
-#: ../gtk-glade/parameters.glade.h:50
-msgid "This section defines your SIP address when not using a SIP account"
+#: ../gtk/setupwizard.c:249
+msgid "Creating your account"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:51
-msgid "Upload speed limit in Kbit/sec:"
+#: ../gtk/setupwizard.c:253
+msgid "Now ready !"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:52
-msgid "Use IPv6 instead of IPv4"
+#: ../gtk/incall_view.c:113
+msgid "Transfer"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:53
+#: ../gtk/incall_view.c:187
 #, fuzzy
-msgid "User interface"
-msgstr "Podręcznik"
+msgid "<b>Calling...</b>"
+msgstr "Dzwonie do "
 
-#: ../gtk-glade/parameters.glade.h:54
-msgid "Video RTP/UDP:"
+#: ../gtk/incall_view.c:190 ../gtk/incall_view.c:246
+msgid "00::00::00"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:55
+#: ../gtk/incall_view.c:206
 #, fuzzy
-msgid "Video input device:"
-msgstr "Dźwięk"
+msgid "<b>Incoming call</b>"
+msgstr "Dzwonie do "
 
-#: ../gtk-glade/parameters.glade.h:56
-msgid "Your display name (eg: John Doe):"
+#: ../gtk/incall_view.c:216
+msgid ""
+"Pause all calls\n"
+"and answer"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:57
-#, fuzzy
-msgid "Your resulting SIP address:"
-msgstr "TwĂłj adres sip:"
-
-#: ../gtk-glade/parameters.glade.h:58
-msgid "Your username:"
+#: ../gtk/incall_view.c:217
+msgid "Answer"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:59
-msgid "a sound card\n"
-msgstr ""
+#: ../gtk/incall_view.c:244
+#, fuzzy
+msgid "<b>In call</b>"
+msgstr "Dzwonie do "
 
-#: ../gtk-glade/parameters.glade.h:61
-msgid "default camera"
-msgstr ""
+#: ../gtk/incall_view.c:260
+#, fuzzy
+msgid "<b>Paused call</b>"
+msgstr "Dzwonie do "
 
-#: ../gtk-glade/parameters.glade.h:62
-msgid "default soundcard"
+#: ../gtk/incall_view.c:272
+#, c-format
+msgid "%02i::%02i::%02i"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:63
-msgid "default soundcard\n"
-msgstr ""
+#: ../gtk/incall_view.c:288
+#, fuzzy
+msgid "<b>Call ended.</b>"
+msgstr "Rozmowa odrzucona."
 
-#: ../gtk-glade/buddylookup.glade.h:1
-msgid "<b>Search somebody</b>"
+#: ../gtk/incall_view.c:309
+msgid "Unmute"
 msgstr ""
 
-#: ../gtk-glade/buddylookup.glade.h:2
-msgid "Add to my list"
+#: ../gtk/incall_view.c:316
+msgid "Mute"
 msgstr ""
 
-#: ../gtk-glade/buddylookup.glade.h:3
-msgid "Search contacts in directory"
+#: ../gtk/incall_view.c:340
+msgid "Resume"
 msgstr ""
 
-#: ../gtk-glade/waiting.glade.h:1
-#, fuzzy
-msgid "Linphone"
-msgstr "linphone"
+#: ../gtk/incall_view.c:347
+msgid "Pause"
+msgstr ""
 
-#: ../gtk-glade/waiting.glade.h:2
-msgid "Please wait"
+#: ../gtk/loginframe.c:93
+#, c-format
+msgid "Please enter login information for %s"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:311
+#: ../coreapi/linphonecore.c:166
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../coreapi/linphonecore.c:357
+#: ../coreapi/linphonecore.c:207
 msgid "aborted"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:360
+#: ../coreapi/linphonecore.c:210
 msgid "completed"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:363
+#: ../coreapi/linphonecore.c:213
 msgid "missed"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:368
+#: ../coreapi/linphonecore.c:218
 #, c-format
 msgid ""
 "%s at %s\n"
@@ -1069,62 +438,88 @@ msgid ""
 "Duration: %i mn %i sec\n"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:369
+#: ../coreapi/linphonecore.c:219
+msgid "Incoming call"
+msgstr ""
+
+#: ../coreapi/linphonecore.c:219
 msgid "Outgoing call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:626
+#: ../coreapi/linphonecore.c:501
 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 ""
 
-#: ../coreapi/linphonecore.c:1083
+#: ../coreapi/linphonecore.c:994
 #, fuzzy
 msgid "Ready"
 msgstr "Gotowy."
 
-#: ../coreapi/linphonecore.c:1513
-msgid "Remote end seems to have disconnected, the call is going to be closed."
-msgstr ""
-
-#: ../coreapi/linphonecore.c:1725
+#: ../coreapi/linphonecore.c:1768
 msgid "Looking for telephone number destination..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1727
+#: ../coreapi/linphonecore.c:1771
 msgid "Could not resolve this number."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1771
+#: ../coreapi/linphonecore.c:1815
 #, 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>"
 
-#: ../coreapi/linphonecore.c:1912
+#: ../coreapi/linphonecore.c:1962
 #, fuzzy
 msgid "Contacting"
 msgstr "Dzwonie do "
 
-#: ../coreapi/linphonecore.c:1918
-msgid "could not call"
+#: ../coreapi/linphonecore.c:1969
+#, fuzzy
+msgid "Could not call"
+msgstr "Nie można znaleźć pixmapy: %s"
+
+#: ../coreapi/linphonecore.c:2076
+msgid "Sorry, you have to pause or stop the current call first !"
+msgstr ""
+
+#: ../coreapi/linphonecore.c:2081
+msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1965
-msgid "Sorry, having multiple simultaneous calls is not supported yet !"
+#: ../coreapi/linphonecore.c:2205
+msgid "Modifying call parameters..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2370 ../coreapi/callbacks.c:32
+#: ../coreapi/linphonecore.c:2308
 msgid "Connected."
 msgstr "Połączony"
 
-#: ../coreapi/linphonecore.c:2404
+#: ../coreapi/linphonecore.c:2331
+#, fuzzy
+msgid "Call aborted"
+msgstr "Połączenie odwołane."
+
+#: ../coreapi/linphonecore.c:2371
 #, fuzzy
 msgid "Call ended"
 msgstr "Rozmowa odrzucona."
 
+#: ../coreapi/linphonecore.c:2453
+msgid "Could not pause the call"
+msgstr ""
+
+#: ../coreapi/linphonecore.c:2457
+msgid "Pausing the current call..."
+msgstr ""
+
+#: ../coreapi/linphonecore.c:2496
+msgid "There is already a call in process, pause or stop it first."
+msgstr ""
+
 #: ../coreapi/misc.c:147
 msgid ""
 "Your computer appears to be using ALSA sound drivers.\n"
@@ -1149,7 +544,7 @@ msgstr ""
 "a Linphone go wymaga. Uruchom 'modprobe snd-mixer-oss' jako root,\n"
 "aby go załadować"
 
-#: ../coreapi/misc.c:497
+#: ../coreapi/misc.c:520
 msgid "Stun lookup in progress..."
 msgstr ""
 
@@ -1205,109 +600,149 @@ msgstr ""
 msgid "Unknown-bug"
 msgstr ""
 
-#: ../coreapi/proxy.c:176
+#: ../coreapi/proxy.c:187
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
 msgstr ""
 
-#: ../coreapi/proxy.c:182
+#: ../coreapi/proxy.c:193
 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:621
+#: ../coreapi/proxy.c:670
 #, fuzzy, c-format
 msgid "Could not login as %s"
 msgstr "Nie można znaleźć pixmapy: %s"
 
-#: ../coreapi/callbacks.c:95
+#: ../coreapi/callbacks.c:170
 #, fuzzy
 msgid "is contacting you"
 msgstr "dzwoni do Ciebie."
 
-#: ../coreapi/callbacks.c:96
+#: ../coreapi/callbacks.c:171
 msgid " and asked autoanswer."
 msgstr ""
 
-#: ../coreapi/callbacks.c:96
+#: ../coreapi/callbacks.c:171
 msgid "."
 msgstr ""
 
-#: ../coreapi/callbacks.c:120
+#: ../coreapi/callbacks.c:226
 #, fuzzy
 msgid "Remote ringing."
 msgstr "Rejestruje..."
 
-#: ../coreapi/callbacks.c:139
+#: ../coreapi/callbacks.c:251
 msgid "Early media."
 msgstr ""
 
-#: ../coreapi/callbacks.c:248
+#: ../coreapi/callbacks.c:289
+#, c-format
+msgid "Call with %s is paused."
+msgstr ""
+
+#: ../coreapi/callbacks.c:300
+#, c-format
+msgid "Call answered by %s - on hold."
+msgstr ""
+
+#: ../coreapi/callbacks.c:315
+#, fuzzy
+msgid "Call resumed."
+msgstr "Rozmowa odrzucona."
+
+#: ../coreapi/callbacks.c:320
+#, fuzzy, c-format
+msgid "Call answered by %s."
+msgstr ""
+"Zadzwoń lub\n"
+"Odpowiedz"
+
+#: ../coreapi/callbacks.c:381
+msgid "We are being paused..."
+msgstr ""
+
+#: ../coreapi/callbacks.c:385
+msgid "We have been resumed..."
+msgstr ""
+
+#: ../coreapi/callbacks.c:422
 #, fuzzy
 msgid "Call terminated."
 msgstr "Rozmowa odrzucona."
 
-#: ../coreapi/callbacks.c:265
+#: ../coreapi/callbacks.c:429
 msgid "User is busy."
 msgstr "Osoba jest zajęta."
 
-#: ../coreapi/callbacks.c:266
+#: ../coreapi/callbacks.c:430
 msgid "User is temporarily unavailable."
 msgstr "Osoba jest tymczasowo niedostępna."
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:268
+#: ../coreapi/callbacks.c:432
 msgid "User does not want to be disturbed."
 msgstr "Osoba nie chce, aby jej przeszkadzać."
 
-#: ../coreapi/callbacks.c:269
+#: ../coreapi/callbacks.c:433
 msgid "Call declined."
 msgstr "Rozmowa odrzucona."
 
-#: ../coreapi/callbacks.c:281
+#: ../coreapi/callbacks.c:445
 msgid "No response."
 msgstr ""
 
-#: ../coreapi/callbacks.c:284
+#: ../coreapi/callbacks.c:449
 msgid "Protocol error."
 msgstr ""
 
-#: ../coreapi/callbacks.c:298
+#: ../coreapi/callbacks.c:465
 msgid "Redirected"
 msgstr ""
 
-#: ../coreapi/callbacks.c:308
+#: ../coreapi/callbacks.c:475
 msgid "Not found"
 msgstr ""
 
-#: ../coreapi/callbacks.c:318
+#: ../coreapi/callbacks.c:485
 msgid "No common codecs"
 msgstr ""
 
-#: ../coreapi/callbacks.c:324
+#: ../coreapi/callbacks.c:491
 #, fuzzy
 msgid "Call failed."
 msgstr "Połączenie odwołane."
 
-#: ../coreapi/callbacks.c:374
+#: ../coreapi/callbacks.c:527
+#, fuzzy
+msgid "Authentication failure"
+msgstr "Informacje o kodeku"
+
+#: ../coreapi/callbacks.c:553
 #, fuzzy, c-format
 msgid "Registration on %s successful."
 msgstr "Rejestracja powiodła się."
 
-#: ../coreapi/callbacks.c:375
+#: ../coreapi/callbacks.c:554
 #, fuzzy, c-format
 msgid "Unregistration on %s done."
 msgstr "Rejestracja powiodła się."
 
-#: ../coreapi/callbacks.c:383
+#: ../coreapi/callbacks.c:570
+msgid "no response timeout"
+msgstr ""
+
+#: ../coreapi/callbacks.c:573
 #, fuzzy, c-format
 msgid "Registration on %s failed: %s"
 msgstr "Rejestracja powiodła się."
 
-#: ../coreapi/callbacks.c:383
-msgid "no response timeout"
+#: ../coreapi/callbacks.c:615
+#, c-format
+msgid "We are transferred to %s"
 msgstr ""
 
 #: ../mediastreamer2/src/alaw.c:144 ../mediastreamer2/src/alaw.c:162
@@ -1318,11 +753,11 @@ msgstr ""
 msgid "ITU-G.711 alaw decoder"
 msgstr ""
 
-#: ../mediastreamer2/src/alsa.c:935
+#: ../mediastreamer2/src/alsa.c:950
 msgid "Alsa sound source"
 msgstr ""
 
-#: ../mediastreamer2/src/alsa.c:1039
+#: ../mediastreamer2/src/alsa.c:1054
 msgid "Alsa sound output"
 msgstr ""
 
@@ -1334,15 +769,15 @@ msgstr ""
 msgid "Sound playback filter for MacOS X Audio Queue Service"
 msgstr ""
 
-#: ../mediastreamer2/src/dtmfgen.c:173 ../mediastreamer2/src/dtmfgen.c:191
+#: ../mediastreamer2/src/dtmfgen.c:274 ../mediastreamer2/src/dtmfgen.c:293
 msgid "DTMF generator"
 msgstr ""
 
-#: ../mediastreamer2/src/gsm.c:111 ../mediastreamer2/src/gsm.c:129
+#: ../mediastreamer2/src/gsm.c:120 ../mediastreamer2/src/gsm.c:138
 msgid "The GSM full-rate codec"
 msgstr ""
 
-#: ../mediastreamer2/src/gsm.c:178 ../mediastreamer2/src/gsm.c:196
+#: ../mediastreamer2/src/gsm.c:187 ../mediastreamer2/src/gsm.c:205
 msgid "The GSM codec"
 msgstr ""
 
@@ -1358,8 +793,8 @@ msgstr ""
 msgid "A filter to make conferencing"
 msgstr ""
 
-#: ../mediastreamer2/src/msfileplayer.c:295
-#: ../mediastreamer2/src/msfileplayer.c:313
+#: ../mediastreamer2/src/msfileplayer.c:311
+#: ../mediastreamer2/src/msfileplayer.c:329
 msgid "Raw files and wav reader"
 msgstr ""
 
@@ -1373,61 +808,53 @@ msgstr ""
 msgid "A filter that send several inputs to one output."
 msgstr ""
 
-#: ../mediastreamer2/src/msresample.c:221
-#: ../mediastreamer2/src/msresample.c:239
-msgid "frequency resampler"
+#: ../mediastreamer2/src/msresample.c:159
+#: ../mediastreamer2/src/msresample.c:177
+msgid "Audio resampler"
 msgstr ""
 
-#: ../mediastreamer2/src/msrtp.c:358 ../mediastreamer2/src/msrtp.c:376
+#: ../mediastreamer2/src/msrtp.c:369 ../mediastreamer2/src/msrtp.c:387
 msgid "RTP output filter"
 msgstr ""
 
-#: ../mediastreamer2/src/msrtp.c:493 ../mediastreamer2/src/msrtp.c:511
+#: ../mediastreamer2/src/msrtp.c:505 ../mediastreamer2/src/msrtp.c:523
 msgid "RTP input filter"
 msgstr ""
 
-#: ../mediastreamer2/src/msspeex.c:359 ../mediastreamer2/src/msspeex.c:377
-#: ../mediastreamer2/src/msspeex.c:504 ../mediastreamer2/src/msspeex.c:522
+#: ../mediastreamer2/src/msspeex.c:360 ../mediastreamer2/src/msspeex.c:378
+#: ../mediastreamer2/src/msspeex.c:548 ../mediastreamer2/src/msspeex.c:567
 msgid "The free and wonderful speex codec"
 msgstr ""
 
-#: ../mediastreamer2/src/msvolume.c:415 ../mediastreamer2/src/msvolume.c:430
+#: ../mediastreamer2/src/msvolume.c:527 ../mediastreamer2/src/msvolume.c:542
 msgid "A filter that controls and measure sound volume"
 msgstr ""
 
-#: ../mediastreamer2/src/msv4l.c:1011
+#: ../mediastreamer2/src/msv4l.c:1012
 msgid "A video4linux compatible source filter to stream pictures."
 msgstr ""
 
-#: ../mediastreamer2/src/msv4l2.c:470
+#: ../mediastreamer2/src/msv4l2.c:554
 msgid "A filter to grab pictures from Video4Linux2-powered cameras"
 msgstr ""
 
-#: ../mediastreamer2/src/nowebcam.c:1836
+#: ../mediastreamer2/src/nowebcam.c:1854
 msgid "A filter that outputs a static image."
 msgstr ""
 
-#: ../mediastreamer2/src/oss.c:567
-msgid "Sound capture filter for OSS drivers"
-msgstr ""
-
-#: ../mediastreamer2/src/oss.c:581
-msgid "Sound playback filter for OSS drivers"
-msgstr ""
-
-#: ../mediastreamer2/src/pixconv.c:177 ../mediastreamer2/src/pixconv.c:195
+#: ../mediastreamer2/src/pixconv.c:129 ../mediastreamer2/src/pixconv.c:147
 msgid "A pixel format converter"
 msgstr ""
 
-#: ../mediastreamer2/src/sizeconv.c:204
+#: ../mediastreamer2/src/sizeconv.c:202
 msgid "A video size converter"
 msgstr ""
 
-#: ../mediastreamer2/src/sizeconv.c:222
+#: ../mediastreamer2/src/sizeconv.c:220
 msgid "a small video size converter"
 msgstr ""
 
-#: ../mediastreamer2/src/speexec.c:349 ../mediastreamer2/src/speexec.c:367
+#: ../mediastreamer2/src/speexec.c:276 ../mediastreamer2/src/speexec.c:294
 msgid "Echo canceller using speex library"
 msgstr ""
 
@@ -1455,55 +882,55 @@ msgstr ""
 msgid "ITU-G.711 ulaw decoder"
 msgstr ""
 
-#: ../mediastreamer2/src/videodec.c:669 ../mediastreamer2/src/videodec.c:685
-#: ../mediastreamer2/src/videodec.c:768 ../mediastreamer2/src/videodec.c:784
+#: ../mediastreamer2/src/videodec.c:713 ../mediastreamer2/src/videodec.c:729
+#: ../mediastreamer2/src/videodec.c:812 ../mediastreamer2/src/videodec.c:828
 msgid "A H.263 decoder using ffmpeg library"
 msgstr ""
 
-#: ../mediastreamer2/src/videodec.c:702
+#: ../mediastreamer2/src/videodec.c:746
 msgid "A MPEG4 decoder using ffmpeg library"
 msgstr ""
 
-#: ../mediastreamer2/src/videodec.c:718
+#: ../mediastreamer2/src/videodec.c:762
 msgid "A RTP/JPEG decoder using ffmpeg library"
 msgstr ""
 
-#: ../mediastreamer2/src/videodec.c:734
+#: ../mediastreamer2/src/videodec.c:778
 msgid "A MJPEG decoder using ffmpeg library"
 msgstr ""
 
-#: ../mediastreamer2/src/videodec.c:750
+#: ../mediastreamer2/src/videodec.c:794
 msgid "A snow decoder using ffmpeg library"
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:861 ../mediastreamer2/src/videoenc.c:943
+#: ../mediastreamer2/src/videoenc.c:908 ../mediastreamer2/src/videoenc.c:990
 msgid "A video H.263 encoder using ffmpeg library."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:877
+#: ../mediastreamer2/src/videoenc.c:924
 msgid ""
 "A video H.263 encoder using ffmpeg library. It is compliant with old RFC2190 "
 "spec."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:893 ../mediastreamer2/src/videoenc.c:975
+#: ../mediastreamer2/src/videoenc.c:940 ../mediastreamer2/src/videoenc.c:1022
 msgid "A video MPEG4 encoder using ffmpeg library."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:909
+#: ../mediastreamer2/src/videoenc.c:956
 msgid "A video snow encoder using ffmpeg library."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:925
+#: ../mediastreamer2/src/videoenc.c:972
 msgid "A RTP/MJPEG encoder using ffmpeg library."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:959
+#: ../mediastreamer2/src/videoenc.c:1006
 msgid ""
 "A video H.263 encoder using ffmpeg library, compliant with old RFC2190 spec."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:991
+#: ../mediastreamer2/src/videoenc.c:1038
 msgid ""
 "The snow codec is royalty-free and is open-source. \n"
 "It uses innovative techniques that makes it one of most promising video "
@@ -1512,12 +939,12 @@ msgid ""
 "versions cannot be guaranteed."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:1011
+#: ../mediastreamer2/src/videoenc.c:1058
 msgid "A MJPEG encoder using ffmpeg library."
 msgstr ""
 
-#: ../mediastreamer2/src/videoout.c:1812 ../mediastreamer2/src/videoout.c:1830
-msgid "A generic video display"
+#: ../mediastreamer2/src/videoout.c:933
+msgid "A SDL-based video display"
 msgstr ""
 
 #: ../mediastreamer2/src/wincevideods.c:969
@@ -1544,10 +971,298 @@ msgstr ""
 msgid "Parametric sound equalizer."
 msgstr ""
 
-#: ../mediastreamer2/src/msdscap-mingw.cc:1003
+#: ../mediastreamer2/src/msdscap-mingw.cc:1038
 msgid "A webcam grabber based on directshow."
 msgstr ""
 
+#: ../mediastreamer2/src/drawdib-display.c:552
+#: ../mediastreamer2/src/drawdib-display.c:570
+msgid "A video display based on windows DrawDib api"
+msgstr ""
+
+#: ../mediastreamer2/src/audiomixer.c:192
+#: ../mediastreamer2/src/audiomixer.c:211
+msgid "A filter that mixes down 16 bit sample audio streams"
+msgstr ""
+
+#: ../mediastreamer2/src/chanadapt.c:110 ../mediastreamer2/src/chanadapt.c:128
+msgid "A filter that converts from mono to stereo and vice versa."
+msgstr ""
+
+#: ../mediastreamer2/src/itc.c:97 ../mediastreamer2/src/itc.c:115
+#: ../mediastreamer2/src/itc.c:197 ../mediastreamer2/src/itc.c:215
+msgid "Inter ticker communication filter."
+msgstr ""
+
+#: ../mediastreamer2/src/extdisplay.c:62 ../mediastreamer2/src/extdisplay.c:79
+msgid "A display filter sending the buffers to draw to the upper layer"
+msgstr ""
+
+#: ../mediastreamer2/src/msiounit.c:619
+msgid "Sound capture filter for MacOS X Audio Unit Service"
+msgstr ""
+
+#: ../mediastreamer2/src/msiounit.c:633
+msgid "Sound playback filter for MacOS X Audio Unit Service"
+msgstr ""
+
+#: ../mediastreamer2/src/x11video.c:562
+msgid "A video display using X11+Xv"
+msgstr ""
+
+#. .id=
+#. .name=
+#. .text=
+#: ../mediastreamer2/src/msandroid.cpp:370
+msgid "Sound capture filter for Android"
+msgstr ""
+
+#. .id=
+#. .name=
+#. .text=
+#: ../mediastreamer2/src/msandroid.cpp:667
+msgid "Sound playback filter for Android"
+msgstr ""
+
+#: ../mediastreamer2/src/msandroidvideo.cpp:134
+msgid "A filter that captures Android video."
+msgstr ""
+
+#~ msgid "#"
+#~ msgstr "#"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "0"
+#~ msgstr "0"
+
+#~ msgid "1"
+#~ msgstr "1"
+
+#~ msgid "2"
+#~ msgstr "2"
+
+#~ msgid "3"
+#~ msgstr "3"
+
+#~ msgid "4"
+#~ msgstr "4"
+
+#~ msgid "5"
+#~ msgstr "5"
+
+#~ msgid "6"
+#~ msgstr "6"
+
+#~ msgid "7"
+#~ msgstr "7"
+
+#~ msgid "8"
+#~ msgstr "8"
+
+#~ msgid "9"
+#~ msgstr "9"
+
+#, fuzzy
+#~ msgid "<b>Add contacts from directory</b>"
+#~ msgstr "Informacje o kodeku"
+
+#, fuzzy
+#~ msgid "<b>Contact list</b>"
+#~ msgstr "Dzwonie do "
+
+#, fuzzy
+#~ msgid "<b>Welcome !</b>"
+#~ msgstr "Dzwonie do "
+
+#, fuzzy
+#~ msgid "Audio & Video"
+#~ msgstr "Kodeki audio"
+
+#, fuzzy
+#~ msgid "Audio only"
+#~ msgstr "Kodeki audio"
+
+#, fuzzy
+#~ msgid "Contacts"
+#~ msgstr "Dzwonie do "
+
+#, fuzzy
+#~ msgid "Duration"
+#~ msgstr "Informacja"
+
+#, fuzzy
+#~ msgid "Duration:"
+#~ msgstr "Informacja"
+
+#, fuzzy
+#~ msgid "Enable self-view"
+#~ msgstr "Włączone"
+
+#, fuzzy
+#~ msgid "Login information"
+#~ msgstr "Informacje o kodeku"
+
+#, fuzzy
+#~ msgid "My current identity:"
+#~ msgstr "Tożsamość"
+
+#, fuzzy
+#~ msgid "Password"
+#~ msgstr "Twoje hasło:"
+
+#, fuzzy
+#~ msgid "SIP address or phone number:"
+#~ msgstr "Adres serwera rejestracji sip"
+
+#, fuzzy
+#~ msgid "Username"
+#~ msgstr "Podręcznik"
+
+#, fuzzy
+#~ msgid "_Linphone"
+#~ msgstr "linphone"
+
+#, fuzzy
+#~ msgid "_Modes"
+#~ msgstr "Kodeki"
+
+#, fuzzy
+#~ msgid "About linphone"
+#~ msgstr "linphone"
+
+#, fuzzy
+#~ msgid "<b>Contact information</b>"
+#~ msgstr "Informacje o kodeku"
+
+#, fuzzy
+#~ msgid "SIP Address"
+#~ msgstr "Adres"
+
+#, fuzzy
+#~ msgid "Password:"
+#~ msgstr "Twoje hasło:"
+
+#, fuzzy
+#~ msgid "Publish presence information"
+#~ msgstr "Informacje o kodeku"
+
+#, fuzzy
+#~ msgid "Registration duration (sec):"
+#~ msgstr "Rejestracja powiodła się."
+
+#, fuzzy
+#~ msgid "SIP Proxy address:"
+#~ msgstr "Adres sip:"
+
+#, fuzzy
+#~ msgid "Your SIP identity:"
+#~ msgstr "Tożsamość"
+
+#~ msgid "sip:"
+#~ msgstr "sip:"
+
+#, fuzzy
+#~ msgid "Send"
+#~ msgstr "Dźwięk"
+
+#, fuzzy
+#~ msgid "Decline"
+#~ msgstr "linia"
+
+#, fuzzy
+#~ msgid "<b>Audio</b>"
+#~ msgstr "Dzwonie do "
+
+#, fuzzy
+#~ msgid "<b>Codecs</b>"
+#~ msgstr "Dzwonie do "
+
+#, fuzzy
+#~ msgid "<b>Level</b>"
+#~ msgstr "Dzwonie do "
+
+#, fuzzy
+#~ msgid "<b>Ports</b>"
+#~ msgstr "Dzwonie do "
+
+#, fuzzy
+#~ msgid "<b>Proxy accounts</b>"
+#~ msgstr "Dzwonie do "
+
+#, fuzzy
+#~ msgid "<b>Transport</b>"
+#~ msgstr "Dzwonie do "
+
+#, fuzzy
+#~ msgid "Add"
+#~ msgstr "Adres"
+
+#, fuzzy
+#~ msgid ""
+#~ "Audio codecs\n"
+#~ "Video codecs"
+#~ msgstr "Kodeki audio"
+
+#, fuzzy
+#~ msgid "Capture device:"
+#~ msgstr "Użyj tego urządzenia dźwięku:"
+
+#, fuzzy
+#~ msgid "Codecs"
+#~ msgstr "Kodeki"
+
+#~ msgid "Disable"
+#~ msgstr "Wyłącz"
+
+#, fuzzy
+#~ msgid "Done"
+#~ msgstr "Brak."
+
+#~ msgid "Enable"
+#~ msgstr "Włączony"
+
+#, fuzzy
+#~ msgid "Network settings"
+#~ msgstr "Sieć"
+
+#, fuzzy
+#~ msgid "Playback device:"
+#~ msgstr "Użyj tego urządzenia dźwięku:"
+
+#, fuzzy
+#~ msgid "Public IP address:"
+#~ msgstr "Adres sip:"
+
+#, fuzzy
+#~ msgid "Ring device:"
+#~ msgstr "Użyj tego urządzenia dźwięku:"
+
+#, fuzzy
+#~ msgid "Ring sound:"
+#~ msgstr "Źródło nagrywania:"
+
+#, fuzzy
+#~ msgid "Stun server:"
+#~ msgstr "Dźwięk"
+
+#, fuzzy
+#~ msgid "User interface"
+#~ msgstr "Podręcznik"
+
+#, fuzzy
+#~ msgid "Video input device:"
+#~ msgstr "Dźwięk"
+
+#, fuzzy
+#~ msgid "Your resulting SIP address:"
+#~ msgstr "TwĂłj adres sip:"
+
+#, fuzzy
+#~ msgid "Linphone"
+#~ msgstr "linphone"
+
 #, fuzzy
 #~ msgid "Request Cancelled."
 #~ msgstr "Połączenie odwołane."
@@ -1571,10 +1286,6 @@ msgstr ""
 #~ "Użytkownik nie jest dostępny, ale proponuje kontakt poprzez alternatywny "
 #~ "adres:"
 
-#, fuzzy
-#~ msgid "<b>Terminate call</b>"
-#~ msgstr "Dzwonie do "
-
 #, fuzzy
 #~ msgid "Gone"
 #~ msgstr "Brak."
@@ -1611,14 +1322,6 @@ msgstr ""
 #~ msgid "..."
 #~ msgstr "..."
 
-#, fuzzy
-#~ msgid ""
-#~ "Call or\n"
-#~ "answer"
-#~ msgstr ""
-#~ "Zadzwoń lub\n"
-#~ "Odpowiedz"
-
 #~ msgid "Show more..."
 #~ msgstr "Pokaż więcej"
 
@@ -1722,10 +1425,6 @@ msgstr ""
 #~ msgid "Remote services"
 #~ msgstr "Zdalne usługi"
 
-#, fuzzy
-#~ msgid "Authentication information"
-#~ msgstr "Informacje o kodeku"
-
 #~ msgid "SIP"
 #~ msgstr "SIP"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 9da079f6049ea60cc72d61f11ab3a402f1b32bde..98f138165759dc4dc298c5caa07503a8c8536f6d 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,58 +8,53 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-1.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 17:16+0200\n"
+"POT-Creation-Date: 2011-02-07 10:59+0100\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../gtk-glade/support.c:49 ../gtk-glade/support.c:73
-#: ../gtk-glade/support.c:102
+#: ../gtk/support.c:49 ../gtk/support.c:73 ../gtk/support.c:102
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "NĂŁo ĂŠ possĂ­vel achar arquivo pixmap: %s"
 
-#: ../gtk-glade/chat.c:27
+#: ../gtk/chat.c:27
 #, c-format
 msgid "Chat with %s"
 msgstr "Bate-papo com %s"
 
-#: ../gtk-glade/main.c:94
+#: ../gtk/main.c:74
 msgid "log to stdout some debug information while running."
 msgstr ""
 
-#: ../gtk-glade/main.c:101
+#: ../gtk/main.c:81
 msgid "Start only in the system tray, do not show the main interface."
 msgstr ""
 
-#: ../gtk-glade/main.c:108
+#: ../gtk/main.c:88
 msgid "address to call right now"
 msgstr ""
 
-#: ../gtk-glade/main.c:115
+#: ../gtk/main.c:95
 msgid "if set automatically answer incoming calls"
 msgstr ""
 
-#: ../gtk-glade/main.c:123
+#: ../gtk/main.c:103
 msgid ""
 "Specifiy a working directory (should be the base of the installation, eg: c:"
 "\\Program Files\\Linphone)"
 msgstr ""
 
-#: ../gtk-glade/main.c:402
+#: ../gtk/main.c:479
 #, fuzzy, c-format
 msgid "Call with %s"
 msgstr "Bate-papo com %s"
 
-#: ../gtk-glade/main.c:720
-#, fuzzy, c-format
-msgid "Incoming call from %s"
-msgstr "Camadas recebidas"
-
-#: ../gtk-glade/main.c:759
+#: ../gtk/main.c:862
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
@@ -68,1004 +63,375 @@ msgid ""
 "If you answer no, this person will be temporarily blacklisted."
 msgstr ""
 
-#: ../gtk-glade/main.c:837
+#: ../gtk/main.c:940
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at domain <i>%s</i>:"
 msgstr ""
 
-#: ../gtk-glade/main.c:934
+#: ../gtk/main.c:1076
 msgid "Website link"
 msgstr ""
 
-#: ../gtk-glade/main.c:970
+#: ../gtk/main.c:1112
 msgid "Linphone - a video internet phone"
 msgstr ""
 
-#: ../gtk-glade/main.c:989
+#: ../gtk/main.c:1131
 #, c-format
 msgid "%s (Default)"
 msgstr ""
 
-#: ../gtk-glade/main.c:1221
+#: ../gtk/main.c:1382
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
 msgstr ""
 
-#: ../gtk-glade/main.c:1275
+#: ../gtk/main.c:1441
 msgid "A free SIP video-phone"
 msgstr ""
 
-#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:258
-#: ../gtk-glade/contact.glade.h:3
+#: ../gtk/friendlist.c:192 ../gtk/propertybox.c:271
 msgid "Name"
 msgstr "Nome"
 
-#: ../gtk-glade/friendlist.c:205
+#: ../gtk/friendlist.c:205
 msgid "Presence status"
 msgstr "Status de presença"
 
-#: ../gtk-glade/friendlist.c:242
+#: ../gtk/friendlist.c:242
 #, c-format
 msgid "Search in %s directory"
 msgstr ""
 
-#: ../gtk-glade/friendlist.c:450
+#: ../gtk/friendlist.c:450
 msgid "Invalid sip contact !"
 msgstr ""
 
-#: ../gtk-glade/friendlist.c:492
+#: ../gtk/friendlist.c:495
 #, fuzzy, c-format
 msgid "Call %s"
 msgstr "HistĂłrico de chamadas"
 
-#: ../gtk-glade/friendlist.c:493
+#: ../gtk/friendlist.c:496
 #, c-format
 msgid "Send text to %s"
 msgstr ""
 
-#: ../gtk-glade/friendlist.c:494
+#: ../gtk/friendlist.c:497
 #, fuzzy, c-format
 msgid "Edit contact '%s'"
 msgstr "Edicar informação de contato"
 
-#: ../gtk-glade/friendlist.c:495
+#: ../gtk/friendlist.c:498
 #, c-format
 msgid "Delete contact '%s'"
 msgstr ""
 
-#: ../gtk-glade/friendlist.c:537
+#: ../gtk/friendlist.c:540
 #, c-format
 msgid "Add new contact from %s directory"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:264
+#: ../gtk/propertybox.c:277
 msgid "Rate (Hz)"
 msgstr "Taxa (Hz)"
 
-#: ../gtk-glade/propertybox.c:270
+#: ../gtk/propertybox.c:283
 msgid "Status"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:276
+#: ../gtk/propertybox.c:289
 msgid "Min bitrate (kbit/s)"
 msgstr "Bitrate mĂ­nimo (kbits/s)"
 
-#: ../gtk-glade/propertybox.c:283
+#: ../gtk/propertybox.c:296
 msgid "Parameters"
 msgstr "Parâmetros"
 
-#: ../gtk-glade/propertybox.c:312 ../gtk-glade/propertybox.c:451
+#: ../gtk/propertybox.c:325 ../gtk/propertybox.c:464
 msgid "Enabled"
 msgstr "Ativado"
 
-#: ../gtk-glade/propertybox.c:313 ../gtk-glade/propertybox.c:451
+#: ../gtk/propertybox.c:326 ../gtk/propertybox.c:464
 msgid "Disabled"
 msgstr "Desativado"
 
-#: ../gtk-glade/propertybox.c:496
+#: ../gtk/propertybox.c:509
 #, fuzzy
 msgid "Account"
 msgstr "Aceitar"
 
-#: ../gtk-glade/propertybox.c:636
+#: ../gtk/propertybox.c:649
 msgid "English"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:637
+#: ../gtk/propertybox.c:650
 msgid "French"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:638
+#: ../gtk/propertybox.c:651
 msgid "Swedish"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:639
+#: ../gtk/propertybox.c:652
 msgid "Italian"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:640
+#: ../gtk/propertybox.c:653
 msgid "Spanish"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:641
+#: ../gtk/propertybox.c:654
 msgid "Brazilian Portugese"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:642
+#: ../gtk/propertybox.c:655
 msgid "Polish"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:643
+#: ../gtk/propertybox.c:656
 msgid "German"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:644
+#: ../gtk/propertybox.c:657
 msgid "Russian"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:645
+#: ../gtk/propertybox.c:658
 msgid "Japanese"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:646
+#: ../gtk/propertybox.c:659
 msgid "Dutch"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:647
+#: ../gtk/propertybox.c:660
 msgid "Hungarian"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:648
+#: ../gtk/propertybox.c:661
 msgid "Czech"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:649
+#: ../gtk/propertybox.c:662
 msgid "Chinese"
 msgstr ""
 
-#: ../gtk-glade/propertybox.c:706
+#: ../gtk/propertybox.c:719
 msgid ""
 "You need to restart linphone for the new language selection to take effect."
 msgstr ""
 
-#: ../gtk-glade/update.c:80
+#: ../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-glade/update.c:91
+#: ../gtk/update.c:91
 msgid "You are running the lastest version."
 msgstr ""
 
-#: ../gtk-glade/buddylookup.c:85
+#: ../gtk/buddylookup.c:85
 msgid "Firstname, Lastname"
 msgstr ""
 
-#: ../gtk-glade/buddylookup.c:160
+#: ../gtk/buddylookup.c:160
 msgid "Error communicating with server."
 msgstr ""
 
-#: ../gtk-glade/buddylookup.c:164
+#: ../gtk/buddylookup.c:164
 #, fuzzy
 msgid "Connecting..."
 msgstr "Contatando "
 
-#: ../gtk-glade/buddylookup.c:168
+#: ../gtk/buddylookup.c:168
 #, fuzzy
 msgid "Connected"
 msgstr "Conectado."
 
-#: ../gtk-glade/buddylookup.c:172
+#: ../gtk/buddylookup.c:172
 msgid "Receiving data..."
 msgstr ""
 
-#: ../gtk-glade/buddylookup.c:180
+#: ../gtk/buddylookup.c:180
 #, c-format
 msgid "Found %i contact"
 msgid_plural "Found %i contacts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gtk-glade/setupwizard.c:25
+#: ../gtk/setupwizard.c:25
 msgid ""
 "Welcome !\n"
 "This assistant will help you to use a SIP account for your calls."
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:34
+#: ../gtk/setupwizard.c:34
 msgid "Create an account by choosing a username"
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:35
+#: ../gtk/setupwizard.c:35
 msgid "I have already an account and just want to use it"
 msgstr ""
 
-#: ../gtk-glade/setupwizard.c:53
-msgid "Please choose a username:"
-msgstr ""
-
-#: ../gtk-glade/setupwizard.c:54
-#, fuzzy
-msgid "Username:"
-msgstr "UsuĂĄrio"
-
-#: ../gtk-glade/setupwizard.c:92
-#, c-format
-msgid "Checking if '%s' is available..."
-msgstr ""
-
-#: ../gtk-glade/setupwizard.c:97 ../gtk-glade/setupwizard.c:164
-msgid "Please wait..."
-msgstr ""
-
-#: ../gtk-glade/setupwizard.c:101
-msgid "Sorry this username already exists. Please try a new one."
-msgstr ""
-
-#: ../gtk-glade/setupwizard.c:103 ../gtk-glade/setupwizard.c:168
-msgid "Ok !"
-msgstr ""
-
-#: ../gtk-glade/setupwizard.c:106 ../gtk-glade/setupwizard.c:171
-msgid "Communication problem, please try again later."
-msgstr ""
-
-#: ../gtk-glade/setupwizard.c:134
-msgid "Thank you. Your account is now configured and ready for use."
-msgstr ""
-
-#: ../gtk-glade/setupwizard.c:228
-msgid "Welcome to the account setup assistant"
-msgstr ""
-
-#: ../gtk-glade/setupwizard.c:232
-msgid "Account setup assistant"
-msgstr ""
-
-#: ../gtk-glade/setupwizard.c:236
-#, fuzzy
-msgid "Choosing a username"
-msgstr "UsuĂĄrio"
-
-#: ../gtk-glade/setupwizard.c:240
-msgid "Verifying"
-msgstr ""
-
-#: ../gtk-glade/setupwizard.c:244
-#, fuzzy
-msgid "Confirmation"
-msgstr "Informaçþes"
-
-#: ../gtk-glade/setupwizard.c:249
-msgid "Creating your account"
-msgstr ""
-
-#: ../gtk-glade/setupwizard.c:253
-msgid "Now ready !"
-msgstr ""
-
-#: ../gtk-glade/incall_view.c:113
-#, fuzzy
-msgid "<b>Calling...</b>"
-msgstr "Contatando "
-
-#: ../gtk-glade/incall_view.c:116 ../gtk-glade/incall_view.c:138
-msgid "00::00::00"
-msgstr ""
-
-#: ../gtk-glade/incall_view.c:136
-#, fuzzy
-msgid "<b>In call with</b>"
-msgstr "Contatando "
-
-#: ../gtk-glade/incall_view.c:154
-#, c-format
-msgid "%02i::%02i::%02i"
-msgstr ""
-
-#: ../gtk-glade/incall_view.c:170
-#, fuzzy
-msgid "<b>Call ended.</b>"
-msgstr "Chamada cancelada."
-
-#: ../gtk-glade/incall_view.c:188
-msgid "Unmute"
-msgstr ""
-
-#: ../gtk-glade/incall_view.c:195 ../gtk-glade/main.glade.h:43
-msgid "Mute"
-msgstr ""
-
-#: ../gtk-glade/loginframe.c:83
-#, c-format
-msgid "Please enter login information for %s"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:1
-msgid "#"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:2
-msgid "*"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:3
-msgid "0"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:4
-msgid "1"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:5
-msgid "2"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:6
-msgid "3"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:7
-msgid "4"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:8
-msgid "5"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:9
-msgid "6"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:10
-msgid "7"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:11
-msgid "8"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:12
-msgid "9"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:13
-#, fuzzy
-msgid "<b>Add contacts from directory</b>"
-msgstr "Informação de contato"
-
-#: ../gtk-glade/main.glade.h:14
-#, fuzzy
-msgid "<b>Contact list</b>"
-msgstr "Contatando "
-
-#: ../gtk-glade/main.glade.h:15
-#, fuzzy
-msgid "<b>Welcome !</b>"
-msgstr "Contatando "
-
-#: ../gtk-glade/main.glade.h:16
-msgid "A"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:17
-msgid ""
-"ADSL\n"
-"Fiber Channel"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:19
-msgid ""
-"All users\n"
-"Online users"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:21
-msgid "Assistant"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:22
-#, fuzzy
-msgid "Audio & Video"
-msgstr "Codec's de ĂĄudio"
-
-#: ../gtk-glade/main.glade.h:23
-#, fuzzy
-msgid "Audio only"
-msgstr "Codec's de ĂĄudio"
-
-#: ../gtk-glade/main.glade.h:24
-#, fuzzy
-msgid "Automatically log me in"
-msgstr "Adquirir automaticamente um nome de servidor vĂĄlido."
-
-#: ../gtk-glade/main.glade.h:25
-msgid "B"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:26 ../gtk-glade/parameters.glade.h:21
-msgid "C"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:27
-#, fuzzy
-msgid "Call Details"
-msgstr "HistĂłrico de chamadas"
-
-#: ../gtk-glade/main.glade.h:28 ../gtk-glade/call_logs.glade.h:1
-#, fuzzy
-msgid "Call history"
-msgstr "Linphone - HistĂłrico de chamadas"
-
-#: ../gtk-glade/main.glade.h:29
-msgid "Check for updates"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:30
-#, fuzzy
-msgid "Contacts"
-msgstr "Contatando "
-
-#: ../gtk-glade/main.glade.h:31
-msgid "D"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:32
-msgid "Default"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:33
-#, fuzzy
-msgid "Duration"
-msgstr "Informaçþes"
-
-#: ../gtk-glade/main.glade.h:34
-#, fuzzy
-msgid "Duration:"
-msgstr "Informaçþes"
-
-#: ../gtk-glade/main.glade.h:35
-#, fuzzy
-msgid "Enable self-view"
-msgstr "Ativado"
-
-#: ../gtk-glade/main.glade.h:36
-msgid "Enter username, phone number, or full sip address"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:37
-msgid "Homepage"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:38
-#, fuzzy
-msgid "In call"
-msgstr "Camadas recebidas"
-
-#: ../gtk-glade/main.glade.h:39
-msgid "Internet connection:"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:40
-msgid "Keypad"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:41
-#, fuzzy
-msgid "Login information"
-msgstr "Informação de contato"
-
-#: ../gtk-glade/main.glade.h:42
-msgid "Lookup:"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:44
-#, fuzzy
-msgid "My current identity:"
-msgstr "Identificação SIP:"
-
-#: ../gtk-glade/main.glade.h:45
-#, fuzzy
-msgid "Password"
-msgstr "Senha:"
-
-#: ../gtk-glade/main.glade.h:46
-msgid "SIP address or phone number:"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:47
-msgid "Search"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:48
-msgid "Show debug messages"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:49
-msgid "Start call"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:50
-msgid "Terminate call"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:51
-#, fuzzy
-msgid "Username"
-msgstr "UsuĂĄrio"
-
-#: ../gtk-glade/main.glade.h:52
-msgid "_Linphone"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:53
-msgid "_Modes"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:54
-msgid "in"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:55
-msgid "label"
-msgstr ""
-
-#: ../gtk-glade/about.glade.h:1
-msgid "About linphone"
-msgstr ""
-
-#: ../gtk-glade/about.glade.h:2
-msgid "An internet video phone using the standard SIP (rfc3261) protocol."
-msgstr ""
-
-#: ../gtk-glade/about.glade.h:3
-msgid "Created by Simon Morlat\n"
-msgstr ""
-
-#: ../gtk-glade/about.glade.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"
-msgstr ""
-
-#: ../gtk-glade/contact.glade.h:1
-#, fuzzy
-msgid "<b>Contact information</b>"
-msgstr "Informação de contato"
-
-#: ../gtk-glade/contact.glade.h:2
-msgid "Allow this contact to see my presence status"
-msgstr ""
-
-#: ../gtk-glade/contact.glade.h:4
-#, fuzzy
-msgid "SIP Address"
-msgstr "Endereço"
-
-#: ../gtk-glade/contact.glade.h:5
-msgid "Show this contact presence status"
-msgstr ""
-
-#: ../gtk-glade/contact.glade.h:6 ../gtk-glade/password.glade.h:5
-#: ../gtk-glade/sip_account.glade.h:9
-msgid "gtk-cancel"
-msgstr ""
-
-#: ../gtk-glade/contact.glade.h:7 ../gtk-glade/password.glade.h:6
-#: ../gtk-glade/sip_account.glade.h:10
-msgid "gtk-ok"
-msgstr ""
-
-#: ../gtk-glade/log.glade.h:1
-msgid "Linphone debug window"
-msgstr ""
-
-#: ../gtk-glade/log.glade.h:2 ../gtk-glade/call_logs.glade.h:2
-#: ../gtk-glade/chatroom.glade.h:2
-msgid "gtk-close"
-msgstr ""
-
-#: ../gtk-glade/password.glade.h:1
-#, fuzzy
-msgid "Linphone - Authentication required"
-msgstr "Autenticação requerida"
-
-#: ../gtk-glade/password.glade.h:2
-#, fuzzy
-msgid "Password:"
-msgstr "Senha:"
-
-#: ../gtk-glade/password.glade.h:3
-msgid "Please enter the domain password"
-msgstr ""
-
-#: ../gtk-glade/password.glade.h:4
-msgid "UserID"
-msgstr ""
-
-#: ../gtk-glade/sip_account.glade.h:1
-msgid "Configure a SIP account"
-msgstr ""
-
-#: ../gtk-glade/sip_account.glade.h:2
-msgid "Linphone - Configure a SIP account"
-msgstr ""
-
-#: ../gtk-glade/sip_account.glade.h:3
-#, fuzzy
-msgid "Publish presence information"
-msgstr "Informar informação de presença"
-
-#: ../gtk-glade/sip_account.glade.h:4
-msgid "Register at startup"
-msgstr ""
-
-#: ../gtk-glade/sip_account.glade.h:5
-#, fuzzy
-msgid "Registration duration (sec):"
-msgstr "PerĂ­odo do registo:"
-
-#: ../gtk-glade/sip_account.glade.h:6
-msgid "Route (optional):"
-msgstr "Rota (opcional):"
-
-#: ../gtk-glade/sip_account.glade.h:7
-#, fuzzy
-msgid "SIP Proxy address:"
-msgstr "Proxy SIP:"
-
-#: ../gtk-glade/sip_account.glade.h:8
-#, fuzzy
-msgid "Your SIP identity:"
-msgstr "Identificação SIP:"
-
-#: ../gtk-glade/sip_account.glade.h:11
-msgid "sip:"
-msgstr ""
-
-#: ../gtk-glade/chatroom.glade.h:1
-#, fuzzy
-msgid "Send"
-msgstr "Som"
-
-#: ../gtk-glade/incoming_call.glade.h:1
-msgid "Accept"
-msgstr "Aceitar"
-
-#: ../gtk-glade/incoming_call.glade.h:2
-#, fuzzy
-msgid "Decline"
-msgstr "linha"
-
-#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:369
-msgid "Incoming call"
-msgstr "Camadas recebidas"
-
-#: ../gtk-glade/incoming_call.glade.h:4
-#, fuzzy
-msgid "Incoming call from"
-msgstr "Camadas recebidas"
-
-#: ../gtk-glade/incoming_call.glade.h:5
-#, fuzzy
-msgid "Linphone - Incoming call"
-msgstr "Camadas recebidas"
-
-#: ../gtk-glade/parameters.glade.h:1
-msgid "0 stands for \"unlimited\""
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:2
-#, fuzzy
-msgid "<b>Audio</b>"
-msgstr "Contatando "
-
-#: ../gtk-glade/parameters.glade.h:3
-msgid "<b>Bandwidth control</b>"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:4
-#, fuzzy
-msgid "<b>Codecs</b>"
-msgstr "Contatando "
-
-#: ../gtk-glade/parameters.glade.h:5
-msgid "<b>Default identity</b>"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:6
-msgid "<b>Language</b>"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:7
-#, fuzzy
-msgid "<b>Level</b>"
-msgstr "Contatando "
-
-#: ../gtk-glade/parameters.glade.h:8
-msgid "<b>NAT and Firewall</b>"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:9
-#, fuzzy
-msgid "<b>Ports</b>"
-msgstr "Contatando "
-
-#: ../gtk-glade/parameters.glade.h:10
-msgid "<b>Privacy</b>"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:11
-#, fuzzy
-msgid "<b>Proxy accounts</b>"
-msgstr "Contatando "
-
-#: ../gtk-glade/parameters.glade.h:12
-#, fuzzy
-msgid "<b>Transport</b>"
-msgstr "Contatando "
-
-#: ../gtk-glade/parameters.glade.h:13
-msgid "<b>Video</b>"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:14
-msgid "ALSA special device (optional):"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:15
-#, fuzzy
-msgid "Add"
-msgstr "Endereço"
-
-#: ../gtk-glade/parameters.glade.h:16
-msgid "Audio RTP/UDP:"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:17
-#, fuzzy
-msgid ""
-"Audio codecs\n"
-"Video codecs"
-msgstr "Codec's de ĂĄudio"
-
-#: ../gtk-glade/parameters.glade.h:19
-msgid "Behind NAT / Firewall (specify gateway IP below)"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:20
-msgid "Behind NAT / Firewall (use STUN to resolve)"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:22
-msgid "CIF"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:23
-#, fuzzy
-msgid "Capture device:"
-msgstr "Dispositivo de captura de som:"
-
-#: ../gtk-glade/parameters.glade.h:24
-#, fuzzy
-msgid "Codecs"
-msgstr "Codec's de ĂĄudio"
-
-#: ../gtk-glade/parameters.glade.h:25
-msgid "Direct connection to the Internet"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:26
-msgid "Disable"
-msgstr "Desativar"
-
-#: ../gtk-glade/parameters.glade.h:27
-#, fuzzy
-msgid "Done"
-msgstr "Nenhum"
-
-#: ../gtk-glade/parameters.glade.h:28
-msgid "Download speed limit in Kbit/sec:"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:29
-msgid "Edit"
-msgstr "Editar"
-
-#: ../gtk-glade/parameters.glade.h:30
-msgid "Enable"
-msgstr "Ativado"
-
-#: ../gtk-glade/parameters.glade.h:31
-msgid "Enable echo cancellation"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:32
-msgid "Erase all passwords"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:33
-msgid "Manage SIP Accounts"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:34
-msgid "Multimedia settings"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:35
-#, fuzzy
-msgid "Network settings"
-msgstr "Rede"
-
-#: ../gtk-glade/parameters.glade.h:36
-#, fuzzy
-msgid "Playback device:"
-msgstr "Dispositivo de som:"
-
-#: ../gtk-glade/parameters.glade.h:37
-msgid "Prefered video resolution:"
+#: ../gtk/setupwizard.c:53
+msgid "Please choose a username:"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:38
+#: ../gtk/setupwizard.c:54
 #, fuzzy
-msgid "Public IP address:"
-msgstr "Endereço sip:"
+msgid "Username:"
+msgstr "UsuĂĄrio"
 
-#: ../gtk-glade/parameters.glade.h:39
-msgid ""
-"Register to FONICS\n"
-"virtual network !"
+#: ../gtk/setupwizard.c:92
+#, c-format
+msgid "Checking if '%s' is available..."
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:41
-msgid "Remove"
-msgstr "Remover"
+#: ../gtk/setupwizard.c:97 ../gtk/setupwizard.c:164
+msgid "Please wait..."
+msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:42
-#, fuzzy
-msgid "Ring device:"
-msgstr "Dispositivo de som"
+#: ../gtk/setupwizard.c:101
+msgid "Sorry this username already exists. Please try a new one."
+msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:43
-#, fuzzy
-msgid "Ring sound:"
-msgstr "Som do toque:"
+#: ../gtk/setupwizard.c:103 ../gtk/setupwizard.c:168
+msgid "Ok !"
+msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:44
-msgid "SIP (UDP):"
+#: ../gtk/setupwizard.c:106 ../gtk/setupwizard.c:171
+msgid "Communication problem, please try again later."
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:45
-msgid "Send DTMFs as SIP info"
+#: ../gtk/setupwizard.c:134
+msgid "Thank you. Your account is now configured and ready for use."
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:46
-msgid "Set Maximum Transmission Unit:"
+#: ../gtk/setupwizard.c:228
+msgid "Welcome to the account setup assistant"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:47
-msgid "Settings"
+#: ../gtk/setupwizard.c:232
+msgid "Account setup assistant"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:48
-msgid "Show advanced settings"
+#: ../gtk/setupwizard.c:236
+#, fuzzy
+msgid "Choosing a username"
+msgstr "UsuĂĄrio"
+
+#: ../gtk/setupwizard.c:240
+msgid "Verifying"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:49
+#: ../gtk/setupwizard.c:244
 #, fuzzy
-msgid "Stun server:"
-msgstr "Dispositivo de som"
+msgid "Confirmation"
+msgstr "Informaçþes"
 
-#: ../gtk-glade/parameters.glade.h:50
-msgid "This section defines your SIP address when not using a SIP account"
+#: ../gtk/setupwizard.c:249
+msgid "Creating your account"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:51
-msgid "Upload speed limit in Kbit/sec:"
+#: ../gtk/setupwizard.c:253
+msgid "Now ready !"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:52
-msgid "Use IPv6 instead of IPv4"
+#: ../gtk/incall_view.c:113
+msgid "Transfer"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:53
+#: ../gtk/incall_view.c:187
 #, fuzzy
-msgid "User interface"
-msgstr "UsuĂĄrio"
+msgid "<b>Calling...</b>"
+msgstr "Contatando "
 
-#: ../gtk-glade/parameters.glade.h:54
-msgid "Video RTP/UDP:"
+#: ../gtk/incall_view.c:190 ../gtk/incall_view.c:246
+msgid "00::00::00"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:55
+#: ../gtk/incall_view.c:206
 #, fuzzy
-msgid "Video input device:"
-msgstr "Dispositivo de som"
+msgid "<b>Incoming call</b>"
+msgstr "Camadas recebidas"
 
-#: ../gtk-glade/parameters.glade.h:56
-msgid "Your display name (eg: John Doe):"
+#: ../gtk/incall_view.c:216
+msgid ""
+"Pause all calls\n"
+"and answer"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:57
-#, fuzzy
-msgid "Your resulting SIP address:"
-msgstr "Seu endereço SIP:"
+#: ../gtk/incall_view.c:217
+msgid "Answer"
+msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:58
+#: ../gtk/incall_view.c:244
 #, fuzzy
-msgid "Your username:"
-msgstr "UsuĂĄrio"
-
-#: ../gtk-glade/parameters.glade.h:59
-msgid "a sound card\n"
-msgstr ""
+msgid "<b>In call</b>"
+msgstr "Contatando "
 
-#: ../gtk-glade/parameters.glade.h:61
-msgid "default camera"
-msgstr ""
+#: ../gtk/incall_view.c:260
+#, fuzzy
+msgid "<b>Paused call</b>"
+msgstr "Contatando "
 
-#: ../gtk-glade/parameters.glade.h:62
-msgid "default soundcard"
+#: ../gtk/incall_view.c:272
+#, c-format
+msgid "%02i::%02i::%02i"
 msgstr ""
 
-#: ../gtk-glade/parameters.glade.h:63
-msgid "default soundcard\n"
-msgstr ""
+#: ../gtk/incall_view.c:288
+#, fuzzy
+msgid "<b>Call ended.</b>"
+msgstr "Chamada cancelada."
 
-#: ../gtk-glade/buddylookup.glade.h:1
-msgid "<b>Search somebody</b>"
+#: ../gtk/incall_view.c:309
+msgid "Unmute"
 msgstr ""
 
-#: ../gtk-glade/buddylookup.glade.h:2
-msgid "Add to my list"
+#: ../gtk/incall_view.c:316
+msgid "Mute"
 msgstr ""
 
-#: ../gtk-glade/buddylookup.glade.h:3
-msgid "Search contacts in directory"
+#: ../gtk/incall_view.c:340
+msgid "Resume"
 msgstr ""
 
-#: ../gtk-glade/waiting.glade.h:1
-msgid "Linphone"
+#: ../gtk/incall_view.c:347
+msgid "Pause"
 msgstr ""
 
-#: ../gtk-glade/waiting.glade.h:2
-msgid "Please wait"
+#: ../gtk/loginframe.c:93
+#, c-format
+msgid "Please enter login information for %s"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:311
+#: ../coreapi/linphonecore.c:166
 #, fuzzy, 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)."
 
-#: ../coreapi/linphonecore.c:357
+#: ../coreapi/linphonecore.c:207
 msgid "aborted"
 msgstr "Abortado"
 
-#: ../coreapi/linphonecore.c:360
+#: ../coreapi/linphonecore.c:210
 msgid "completed"
 msgstr "Competado"
 
-#: ../coreapi/linphonecore.c:363
+#: ../coreapi/linphonecore.c:213
 msgid "missed"
 msgstr "Perdido"
 
-#: ../coreapi/linphonecore.c:368
+#: ../coreapi/linphonecore.c:218
 #, fuzzy, c-format
 msgid ""
 "%s at %s\n"
@@ -1079,11 +445,15 @@ msgstr ""
 "Status: %s\n"
 "Duração: %i min %i seg\n"
 
-#: ../coreapi/linphonecore.c:369
+#: ../coreapi/linphonecore.c:219
+msgid "Incoming call"
+msgstr "Camadas recebidas"
+
+#: ../coreapi/linphonecore.c:219
 msgid "Outgoing call"
 msgstr "Chamadas efetuadas"
 
-#: ../coreapi/linphonecore.c:626
+#: ../coreapi/linphonecore.c:501
 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"
@@ -1092,51 +462,73 @@ msgstr ""
 "linphone sempre usa IPv4. Por favor atualize sua configuração se deseja usar "
 "IPv6"
 
-#: ../coreapi/linphonecore.c:1083
+#: ../coreapi/linphonecore.c:994
 #, fuzzy
 msgid "Ready"
 msgstr "Pronto."
 
-#: ../coreapi/linphonecore.c:1513
-msgid "Remote end seems to have disconnected, the call is going to be closed."
-msgstr ""
-
-#: ../coreapi/linphonecore.c:1725
+#: ../coreapi/linphonecore.c:1768
 msgid "Looking for telephone number destination..."
 msgstr "Procurando por telefone de destino..."
 
-#: ../coreapi/linphonecore.c:1727
+#: ../coreapi/linphonecore.c:1771
 msgid "Could not resolve this number."
 msgstr "NĂŁo foi possĂ­vel encontrar este nĂşmero."
 
-#: ../coreapi/linphonecore.c:1771
+#: ../coreapi/linphonecore.c:1815
 msgid ""
 "Could not parse given sip address. A sip url usually looks like sip:"
 "user@domain"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1912
+#: ../coreapi/linphonecore.c:1962
 #, fuzzy
 msgid "Contacting"
 msgstr "Contatando "
 
-#: ../coreapi/linphonecore.c:1918
-msgid "could not call"
+#: ../coreapi/linphonecore.c:1969
+#, fuzzy
+msgid "Could not call"
+msgstr "NĂŁo ĂŠ possĂ­vel achar arquivo pixmap: %s"
+
+#: ../coreapi/linphonecore.c:2076
+msgid "Sorry, you have to pause or stop the current call first !"
+msgstr ""
+
+#: ../coreapi/linphonecore.c:2081
+msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1965
-msgid "Sorry, having multiple simultaneous calls is not supported yet !"
+#: ../coreapi/linphonecore.c:2205
+msgid "Modifying call parameters..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2370 ../coreapi/callbacks.c:32
+#: ../coreapi/linphonecore.c:2308
 msgid "Connected."
 msgstr "Conectado."
 
-#: ../coreapi/linphonecore.c:2404
+#: ../coreapi/linphonecore.c:2331
+#, fuzzy
+msgid "Call aborted"
+msgstr "Abortado"
+
+#: ../coreapi/linphonecore.c:2371
 #, fuzzy
 msgid "Call ended"
 msgstr "Chamada cancelada."
 
+#: ../coreapi/linphonecore.c:2453
+msgid "Could not pause the call"
+msgstr ""
+
+#: ../coreapi/linphonecore.c:2457
+msgid "Pausing the current call..."
+msgstr ""
+
+#: ../coreapi/linphonecore.c:2496
+msgid "There is already a call in process, pause or stop it first."
+msgstr ""
+
 #: ../coreapi/misc.c:147
 msgid ""
 "Your computer appears to be using ALSA sound drivers.\n"
@@ -1153,7 +545,7 @@ msgid ""
 " 'modprobe snd-mixer-oss' as root to load it."
 msgstr ""
 
-#: ../coreapi/misc.c:497
+#: ../coreapi/misc.c:520
 msgid "Stun lookup in progress..."
 msgstr ""
 
@@ -1207,109 +599,149 @@ msgstr ""
 msgid "Unknown-bug"
 msgstr ""
 
-#: ../coreapi/proxy.c:176
+#: ../coreapi/proxy.c:187
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
 msgstr ""
 
-#: ../coreapi/proxy.c:182
+#: ../coreapi/proxy.c:193
 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:621
+#: ../coreapi/proxy.c:670
 #, fuzzy, c-format
 msgid "Could not login as %s"
 msgstr "NĂŁo ĂŠ possĂ­vel achar arquivo pixmap: %s"
 
-#: ../coreapi/callbacks.c:95
+#: ../coreapi/callbacks.c:170
 #, fuzzy
 msgid "is contacting you"
 msgstr "estĂĄ chamado vocĂŞ."
 
-#: ../coreapi/callbacks.c:96
+#: ../coreapi/callbacks.c:171
 msgid " and asked autoanswer."
 msgstr ""
 
-#: ../coreapi/callbacks.c:96
+#: ../coreapi/callbacks.c:171
 msgid "."
 msgstr ""
 
-#: ../coreapi/callbacks.c:120
+#: ../coreapi/callbacks.c:226
 #, fuzzy
 msgid "Remote ringing."
 msgstr "Serviços remotos"
 
-#: ../coreapi/callbacks.c:139
+#: ../coreapi/callbacks.c:251
 msgid "Early media."
 msgstr ""
 
-#: ../coreapi/callbacks.c:248
+#: ../coreapi/callbacks.c:289
+#, fuzzy, c-format
+msgid "Call with %s is paused."
+msgstr "Bate-papo com %s"
+
+#: ../coreapi/callbacks.c:300
+#, c-format
+msgid "Call answered by %s - on hold."
+msgstr ""
+
+#: ../coreapi/callbacks.c:315
+#, fuzzy
+msgid "Call resumed."
+msgstr "Chamada cancelada."
+
+#: ../coreapi/callbacks.c:320
+#, fuzzy, c-format
+msgid "Call answered by %s."
+msgstr ""
+"Ligar ou\n"
+"atender"
+
+#: ../coreapi/callbacks.c:381
+msgid "We are being paused..."
+msgstr ""
+
+#: ../coreapi/callbacks.c:385
+msgid "We have been resumed..."
+msgstr ""
+
+#: ../coreapi/callbacks.c:422
 msgid "Call terminated."
 msgstr ""
 
-#: ../coreapi/callbacks.c:265
+#: ../coreapi/callbacks.c:429
 msgid "User is busy."
 msgstr "UsuĂĄrio estĂĄ ocupado."
 
-#: ../coreapi/callbacks.c:266
+#: ../coreapi/callbacks.c:430
 msgid "User is temporarily unavailable."
 msgstr "UsuĂĄrio estĂĄ temporĂĄriamente indisponĂ­vel."
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:268
+#: ../coreapi/callbacks.c:432
 msgid "User does not want to be disturbed."
 msgstr ""
 
-#: ../coreapi/callbacks.c:269
+#: ../coreapi/callbacks.c:433
 msgid "Call declined."
 msgstr ""
 
-#: ../coreapi/callbacks.c:281
+#: ../coreapi/callbacks.c:445
 msgid "No response."
 msgstr ""
 
-#: ../coreapi/callbacks.c:284
+#: ../coreapi/callbacks.c:449
 msgid "Protocol error."
 msgstr ""
 
-#: ../coreapi/callbacks.c:298
+#: ../coreapi/callbacks.c:465
 #, fuzzy
 msgid "Redirected"
 msgstr "Redirecionado para %s..."
 
-#: ../coreapi/callbacks.c:308
+#: ../coreapi/callbacks.c:475
 msgid "Not found"
 msgstr ""
 
-#: ../coreapi/callbacks.c:318
+#: ../coreapi/callbacks.c:485
 msgid "No common codecs"
 msgstr ""
 
-#: ../coreapi/callbacks.c:324
+#: ../coreapi/callbacks.c:491
 #, fuzzy
 msgid "Call failed."
 msgstr "HistĂłrico de chamadas"
 
-#: ../coreapi/callbacks.c:374
+#: ../coreapi/callbacks.c:527
+#, fuzzy
+msgid "Authentication failure"
+msgstr "Informaçþes de autenticação"
+
+#: ../coreapi/callbacks.c:553
 #, fuzzy, c-format
 msgid "Registration on %s successful."
 msgstr "Registro em %s efetuado."
 
-#: ../coreapi/callbacks.c:375
+#: ../coreapi/callbacks.c:554
 #, fuzzy, c-format
 msgid "Unregistration on %s done."
 msgstr "Registro em %s efetuado."
 
-#: ../coreapi/callbacks.c:383
+#: ../coreapi/callbacks.c:570
+msgid "no response timeout"
+msgstr ""
+
+#: ../coreapi/callbacks.c:573
 #, fuzzy, c-format
 msgid "Registration on %s failed: %s"
 msgstr "Registro falhou (tempo esgotado)."
 
-#: ../coreapi/callbacks.c:383
-msgid "no response timeout"
+#: ../coreapi/callbacks.c:615
+#, c-format
+msgid "We are transferred to %s"
 msgstr ""
 
 #: ../mediastreamer2/src/alaw.c:144 ../mediastreamer2/src/alaw.c:162
@@ -1320,11 +752,11 @@ msgstr ""
 msgid "ITU-G.711 alaw decoder"
 msgstr ""
 
-#: ../mediastreamer2/src/alsa.c:935
+#: ../mediastreamer2/src/alsa.c:950
 msgid "Alsa sound source"
 msgstr ""
 
-#: ../mediastreamer2/src/alsa.c:1039
+#: ../mediastreamer2/src/alsa.c:1054
 msgid "Alsa sound output"
 msgstr ""
 
@@ -1336,15 +768,15 @@ msgstr ""
 msgid "Sound playback filter for MacOS X Audio Queue Service"
 msgstr ""
 
-#: ../mediastreamer2/src/dtmfgen.c:173 ../mediastreamer2/src/dtmfgen.c:191
+#: ../mediastreamer2/src/dtmfgen.c:274 ../mediastreamer2/src/dtmfgen.c:293
 msgid "DTMF generator"
 msgstr ""
 
-#: ../mediastreamer2/src/gsm.c:111 ../mediastreamer2/src/gsm.c:129
+#: ../mediastreamer2/src/gsm.c:120 ../mediastreamer2/src/gsm.c:138
 msgid "The GSM full-rate codec"
 msgstr ""
 
-#: ../mediastreamer2/src/gsm.c:178 ../mediastreamer2/src/gsm.c:196
+#: ../mediastreamer2/src/gsm.c:187 ../mediastreamer2/src/gsm.c:205
 msgid "The GSM codec"
 msgstr ""
 
@@ -1360,8 +792,8 @@ msgstr ""
 msgid "A filter to make conferencing"
 msgstr ""
 
-#: ../mediastreamer2/src/msfileplayer.c:295
-#: ../mediastreamer2/src/msfileplayer.c:313
+#: ../mediastreamer2/src/msfileplayer.c:311
+#: ../mediastreamer2/src/msfileplayer.c:329
 msgid "Raw files and wav reader"
 msgstr ""
 
@@ -1375,61 +807,53 @@ msgstr ""
 msgid "A filter that send several inputs to one output."
 msgstr ""
 
-#: ../mediastreamer2/src/msresample.c:221
-#: ../mediastreamer2/src/msresample.c:239
-msgid "frequency resampler"
+#: ../mediastreamer2/src/msresample.c:159
+#: ../mediastreamer2/src/msresample.c:177
+msgid "Audio resampler"
 msgstr ""
 
-#: ../mediastreamer2/src/msrtp.c:358 ../mediastreamer2/src/msrtp.c:376
+#: ../mediastreamer2/src/msrtp.c:369 ../mediastreamer2/src/msrtp.c:387
 msgid "RTP output filter"
 msgstr ""
 
-#: ../mediastreamer2/src/msrtp.c:493 ../mediastreamer2/src/msrtp.c:511
+#: ../mediastreamer2/src/msrtp.c:505 ../mediastreamer2/src/msrtp.c:523
 msgid "RTP input filter"
 msgstr ""
 
-#: ../mediastreamer2/src/msspeex.c:359 ../mediastreamer2/src/msspeex.c:377
-#: ../mediastreamer2/src/msspeex.c:504 ../mediastreamer2/src/msspeex.c:522
+#: ../mediastreamer2/src/msspeex.c:360 ../mediastreamer2/src/msspeex.c:378
+#: ../mediastreamer2/src/msspeex.c:548 ../mediastreamer2/src/msspeex.c:567
 msgid "The free and wonderful speex codec"
 msgstr ""
 
-#: ../mediastreamer2/src/msvolume.c:415 ../mediastreamer2/src/msvolume.c:430
+#: ../mediastreamer2/src/msvolume.c:527 ../mediastreamer2/src/msvolume.c:542
 msgid "A filter that controls and measure sound volume"
 msgstr ""
 
-#: ../mediastreamer2/src/msv4l.c:1011
+#: ../mediastreamer2/src/msv4l.c:1012
 msgid "A video4linux compatible source filter to stream pictures."
 msgstr ""
 
-#: ../mediastreamer2/src/msv4l2.c:470
+#: ../mediastreamer2/src/msv4l2.c:554
 msgid "A filter to grab pictures from Video4Linux2-powered cameras"
 msgstr ""
 
-#: ../mediastreamer2/src/nowebcam.c:1836
+#: ../mediastreamer2/src/nowebcam.c:1854
 msgid "A filter that outputs a static image."
 msgstr ""
 
-#: ../mediastreamer2/src/oss.c:567
-msgid "Sound capture filter for OSS drivers"
-msgstr ""
-
-#: ../mediastreamer2/src/oss.c:581
-msgid "Sound playback filter for OSS drivers"
-msgstr ""
-
-#: ../mediastreamer2/src/pixconv.c:177 ../mediastreamer2/src/pixconv.c:195
+#: ../mediastreamer2/src/pixconv.c:129 ../mediastreamer2/src/pixconv.c:147
 msgid "A pixel format converter"
 msgstr ""
 
-#: ../mediastreamer2/src/sizeconv.c:204
+#: ../mediastreamer2/src/sizeconv.c:202
 msgid "A video size converter"
 msgstr ""
 
-#: ../mediastreamer2/src/sizeconv.c:222
+#: ../mediastreamer2/src/sizeconv.c:220
 msgid "a small video size converter"
 msgstr ""
 
-#: ../mediastreamer2/src/speexec.c:349 ../mediastreamer2/src/speexec.c:367
+#: ../mediastreamer2/src/speexec.c:276 ../mediastreamer2/src/speexec.c:294
 msgid "Echo canceller using speex library"
 msgstr ""
 
@@ -1457,55 +881,55 @@ msgstr ""
 msgid "ITU-G.711 ulaw decoder"
 msgstr ""
 
-#: ../mediastreamer2/src/videodec.c:669 ../mediastreamer2/src/videodec.c:685
-#: ../mediastreamer2/src/videodec.c:768 ../mediastreamer2/src/videodec.c:784
+#: ../mediastreamer2/src/videodec.c:713 ../mediastreamer2/src/videodec.c:729
+#: ../mediastreamer2/src/videodec.c:812 ../mediastreamer2/src/videodec.c:828
 msgid "A H.263 decoder using ffmpeg library"
 msgstr ""
 
-#: ../mediastreamer2/src/videodec.c:702
+#: ../mediastreamer2/src/videodec.c:746
 msgid "A MPEG4 decoder using ffmpeg library"
 msgstr ""
 
-#: ../mediastreamer2/src/videodec.c:718
+#: ../mediastreamer2/src/videodec.c:762
 msgid "A RTP/JPEG decoder using ffmpeg library"
 msgstr ""
 
-#: ../mediastreamer2/src/videodec.c:734
+#: ../mediastreamer2/src/videodec.c:778
 msgid "A MJPEG decoder using ffmpeg library"
 msgstr ""
 
-#: ../mediastreamer2/src/videodec.c:750
+#: ../mediastreamer2/src/videodec.c:794
 msgid "A snow decoder using ffmpeg library"
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:861 ../mediastreamer2/src/videoenc.c:943
+#: ../mediastreamer2/src/videoenc.c:908 ../mediastreamer2/src/videoenc.c:990
 msgid "A video H.263 encoder using ffmpeg library."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:877
+#: ../mediastreamer2/src/videoenc.c:924
 msgid ""
 "A video H.263 encoder using ffmpeg library. It is compliant with old RFC2190 "
 "spec."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:893 ../mediastreamer2/src/videoenc.c:975
+#: ../mediastreamer2/src/videoenc.c:940 ../mediastreamer2/src/videoenc.c:1022
 msgid "A video MPEG4 encoder using ffmpeg library."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:909
+#: ../mediastreamer2/src/videoenc.c:956
 msgid "A video snow encoder using ffmpeg library."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:925
+#: ../mediastreamer2/src/videoenc.c:972
 msgid "A RTP/MJPEG encoder using ffmpeg library."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:959
+#: ../mediastreamer2/src/videoenc.c:1006
 msgid ""
 "A video H.263 encoder using ffmpeg library, compliant with old RFC2190 spec."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:991
+#: ../mediastreamer2/src/videoenc.c:1038
 msgid ""
 "The snow codec is royalty-free and is open-source. \n"
 "It uses innovative techniques that makes it one of most promising video "
@@ -1514,12 +938,12 @@ msgid ""
 "versions cannot be guaranteed."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:1011
+#: ../mediastreamer2/src/videoenc.c:1058
 msgid "A MJPEG encoder using ffmpeg library."
 msgstr ""
 
-#: ../mediastreamer2/src/videoout.c:1812 ../mediastreamer2/src/videoout.c:1830
-msgid "A generic video display"
+#: ../mediastreamer2/src/videoout.c:933
+msgid "A SDL-based video display"
 msgstr ""
 
 #: ../mediastreamer2/src/wincevideods.c:969
@@ -1546,10 +970,287 @@ msgstr ""
 msgid "Parametric sound equalizer."
 msgstr ""
 
-#: ../mediastreamer2/src/msdscap-mingw.cc:1003
+#: ../mediastreamer2/src/msdscap-mingw.cc:1038
 msgid "A webcam grabber based on directshow."
 msgstr ""
 
+#: ../mediastreamer2/src/drawdib-display.c:552
+#: ../mediastreamer2/src/drawdib-display.c:570
+msgid "A video display based on windows DrawDib api"
+msgstr ""
+
+#: ../mediastreamer2/src/audiomixer.c:192
+#: ../mediastreamer2/src/audiomixer.c:211
+msgid "A filter that mixes down 16 bit sample audio streams"
+msgstr ""
+
+#: ../mediastreamer2/src/chanadapt.c:110 ../mediastreamer2/src/chanadapt.c:128
+msgid "A filter that converts from mono to stereo and vice versa."
+msgstr ""
+
+#: ../mediastreamer2/src/itc.c:97 ../mediastreamer2/src/itc.c:115
+#: ../mediastreamer2/src/itc.c:197 ../mediastreamer2/src/itc.c:215
+msgid "Inter ticker communication filter."
+msgstr ""
+
+#: ../mediastreamer2/src/extdisplay.c:62 ../mediastreamer2/src/extdisplay.c:79
+msgid "A display filter sending the buffers to draw to the upper layer"
+msgstr ""
+
+#: ../mediastreamer2/src/msiounit.c:619
+msgid "Sound capture filter for MacOS X Audio Unit Service"
+msgstr ""
+
+#: ../mediastreamer2/src/msiounit.c:633
+msgid "Sound playback filter for MacOS X Audio Unit Service"
+msgstr ""
+
+#: ../mediastreamer2/src/x11video.c:562
+msgid "A video display using X11+Xv"
+msgstr ""
+
+#. .id=
+#. .name=
+#. .text=
+#: ../mediastreamer2/src/msandroid.cpp:370
+msgid "Sound capture filter for Android"
+msgstr ""
+
+#. .id=
+#. .name=
+#. .text=
+#: ../mediastreamer2/src/msandroid.cpp:667
+msgid "Sound playback filter for Android"
+msgstr ""
+
+#: ../mediastreamer2/src/msandroidvideo.cpp:134
+msgid "A filter that captures Android video."
+msgstr ""
+
+#, fuzzy
+#~ msgid "Incoming call from %s"
+#~ msgstr "Camadas recebidas"
+
+#, fuzzy
+#~ msgid "<b>Add contacts from directory</b>"
+#~ msgstr "Informação de contato"
+
+#, fuzzy
+#~ msgid "<b>Contact list</b>"
+#~ msgstr "Contatando "
+
+#, fuzzy
+#~ msgid "<b>Welcome !</b>"
+#~ msgstr "Contatando "
+
+#, fuzzy
+#~ msgid "Audio & Video"
+#~ msgstr "Codec's de ĂĄudio"
+
+#, fuzzy
+#~ msgid "Audio only"
+#~ msgstr "Codec's de ĂĄudio"
+
+#, fuzzy
+#~ msgid "Automatically log me in"
+#~ msgstr "Adquirir automaticamente um nome de servidor vĂĄlido."
+
+#, fuzzy
+#~ msgid "Call Details"
+#~ msgstr "HistĂłrico de chamadas"
+
+#, fuzzy
+#~ msgid "Call history"
+#~ msgstr "Linphone - HistĂłrico de chamadas"
+
+#, fuzzy
+#~ msgid "Contacts"
+#~ msgstr "Contatando "
+
+#, fuzzy
+#~ msgid "Duration"
+#~ msgstr "Informaçþes"
+
+#, fuzzy
+#~ msgid "Duration:"
+#~ msgstr "Informaçþes"
+
+#, fuzzy
+#~ msgid "Enable self-view"
+#~ msgstr "Ativado"
+
+#, fuzzy
+#~ msgid "In call"
+#~ msgstr "Camadas recebidas"
+
+#, fuzzy
+#~ msgid "Login information"
+#~ msgstr "Informação de contato"
+
+#, fuzzy
+#~ msgid "My current identity:"
+#~ msgstr "Identificação SIP:"
+
+#, fuzzy
+#~ msgid "Password"
+#~ msgstr "Senha:"
+
+#, fuzzy
+#~ msgid "Username"
+#~ msgstr "UsuĂĄrio"
+
+#, fuzzy
+#~ msgid "<b>Contact information</b>"
+#~ msgstr "Informação de contato"
+
+#, fuzzy
+#~ msgid "SIP Address"
+#~ msgstr "Endereço"
+
+#, fuzzy
+#~ msgid "Linphone - Authentication required"
+#~ msgstr "Autenticação requerida"
+
+#, fuzzy
+#~ msgid "Password:"
+#~ msgstr "Senha:"
+
+#, fuzzy
+#~ msgid "Publish presence information"
+#~ msgstr "Informar informação de presença"
+
+#, fuzzy
+#~ msgid "Registration duration (sec):"
+#~ msgstr "PerĂ­odo do registo:"
+
+#~ msgid "Route (optional):"
+#~ msgstr "Rota (opcional):"
+
+#, fuzzy
+#~ msgid "SIP Proxy address:"
+#~ msgstr "Proxy SIP:"
+
+#, fuzzy
+#~ msgid "Your SIP identity:"
+#~ msgstr "Identificação SIP:"
+
+#, fuzzy
+#~ msgid "Send"
+#~ msgstr "Som"
+
+#~ msgid "Accept"
+#~ msgstr "Aceitar"
+
+#, fuzzy
+#~ msgid "Decline"
+#~ msgstr "linha"
+
+#, fuzzy
+#~ msgid "Incoming call from"
+#~ msgstr "Camadas recebidas"
+
+#, fuzzy
+#~ msgid "Linphone - Incoming call"
+#~ msgstr "Camadas recebidas"
+
+#, fuzzy
+#~ msgid "<b>Audio</b>"
+#~ msgstr "Contatando "
+
+#, fuzzy
+#~ msgid "<b>Codecs</b>"
+#~ msgstr "Contatando "
+
+#, fuzzy
+#~ msgid "<b>Level</b>"
+#~ msgstr "Contatando "
+
+#, fuzzy
+#~ msgid "<b>Ports</b>"
+#~ msgstr "Contatando "
+
+#, fuzzy
+#~ msgid "<b>Proxy accounts</b>"
+#~ msgstr "Contatando "
+
+#, fuzzy
+#~ msgid "<b>Transport</b>"
+#~ msgstr "Contatando "
+
+#, fuzzy
+#~ msgid "Add"
+#~ msgstr "Endereço"
+
+#, fuzzy
+#~ msgid ""
+#~ "Audio codecs\n"
+#~ "Video codecs"
+#~ msgstr "Codec's de ĂĄudio"
+
+#, fuzzy
+#~ msgid "Capture device:"
+#~ msgstr "Dispositivo de captura de som:"
+
+#, fuzzy
+#~ msgid "Codecs"
+#~ msgstr "Codec's de ĂĄudio"
+
+#~ msgid "Disable"
+#~ msgstr "Desativar"
+
+#, fuzzy
+#~ msgid "Done"
+#~ msgstr "Nenhum"
+
+#~ msgid "Edit"
+#~ msgstr "Editar"
+
+#~ msgid "Enable"
+#~ msgstr "Ativado"
+
+#, fuzzy
+#~ msgid "Network settings"
+#~ msgstr "Rede"
+
+#, fuzzy
+#~ msgid "Playback device:"
+#~ msgstr "Dispositivo de som:"
+
+#, fuzzy
+#~ msgid "Public IP address:"
+#~ msgstr "Endereço sip:"
+
+#~ msgid "Remove"
+#~ msgstr "Remover"
+
+#, fuzzy
+#~ msgid "Ring device:"
+#~ msgstr "Dispositivo de som"
+
+#, fuzzy
+#~ msgid "Ring sound:"
+#~ msgstr "Som do toque:"
+
+#, fuzzy
+#~ msgid "Stun server:"
+#~ msgstr "Dispositivo de som"
+
+#, fuzzy
+#~ msgid "User interface"
+#~ msgstr "UsuĂĄrio"
+
+#, fuzzy
+#~ msgid "Video input device:"
+#~ msgstr "Dispositivo de som"
+
+#, fuzzy
+#~ msgid "Your resulting SIP address:"
+#~ msgstr "Seu endereço SIP:"
+
+#, fuzzy
+#~ msgid "Your username:"
+#~ msgstr "UsuĂĄrio"
+
 #~ msgid "Could not reach destination."
 #~ msgstr "Não foi possível alcançar o detino."
 
@@ -1565,10 +1266,6 @@ msgstr ""
 #~ msgid "Remote host was found but refused connection."
 #~ msgstr "Servidor de destino encontrado, porĂŠm recusou a conexĂŁo."
 
-#, fuzzy
-#~ msgid "<b>Terminate call</b>"
-#~ msgstr "Contatando "
-
 #, fuzzy
 #~ msgid "Gone"
 #~ msgstr "Nenhum"
@@ -1625,13 +1322,6 @@ msgstr ""
 #~ msgid "Shows the address book"
 #~ msgstr "Exibe o catålogo de endereços"
 
-#~ msgid ""
-#~ "Call or\n"
-#~ "answer"
-#~ msgstr ""
-#~ "Ligar ou\n"
-#~ "atender"
-
 #~ msgid ""
 #~ "Hangup\n"
 #~ "or refuse"
@@ -1747,9 +1437,6 @@ msgstr ""
 #~ msgstr ""
 #~ "Limpar todas as informaçþes de autenticação (nomes de usuårio, senha...)"
 
-#~ msgid "Authentication information"
-#~ msgstr "Informaçþes de autenticação"
-
 #~ msgid "List of audio codecs, in order of preference:"
 #~ msgstr "Lista de codecs de audio, em ordem de preferĂŞncia:"
 
diff --git a/po/ru.po b/po/ru.po
index 3eb04e36af43939960d17b1ff28a5b7a76913ee2..9b10327b320233a6a912f43ff2903986ce3cb64f 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,44 +6,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone 0.7.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 17:16+0200\n"
+"POT-Creation-Date: 2011-02-07 10:59+0100\n"
 "PO-Revision-Date: 2010-01-22 18:43+0300\n"
 "Last-Translator: Maxim Prokopyev <jazzelastic@gmail.com>\n"
 "Language-Team: Russian <greg@dial.com.ru>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../gtk-glade/support.c:49 ../gtk-glade/support.c:73
-#: ../gtk-glade/support.c:102
+#: ../gtk/support.c:49 ../gtk/support.c:73 ../gtk/support.c:102
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "Невозможно найти графический файл: %s"
 
-#: ../gtk-glade/chat.c:27
+#: ../gtk/chat.c:27
 #, c-format
 msgid "Chat with %s"
 msgstr "Обмен сообщениями с %s"
 
-#: ../gtk-glade/main.c:94
+#: ../gtk/main.c:74
 msgid "log to stdout some debug information while running."
 msgstr ""
 "Вывод некоторой отладочной информации на устройство стандартного вывода во "
 "время работы "
 
-#: ../gtk-glade/main.c:101
+#: ../gtk/main.c:81
 msgid "Start only in the system tray, do not show the main interface."
 msgstr "Показывать только в системном лотке, не запуская главное окно"
 
-#: ../gtk-glade/main.c:108
+#: ../gtk/main.c:88
 msgid "address to call right now"
 msgstr "адрес для звонка"
 
-#: ../gtk-glade/main.c:115
+#: ../gtk/main.c:95
 msgid "if set automatically answer incoming calls"
 msgstr "если установлен автоматический прием входящих вызовов"
 
-#: ../gtk-glade/main.c:123
+#: ../gtk/main.c:103
 msgid ""
 "Specifiy a working directory (should be the base of the installation, eg: c:"
 "\\Program Files\\Linphone)"
@@ -51,17 +51,12 @@ msgstr ""
 "Определить рабочий каталог (относительно каталога установки, например: c:"
 "\\Program Files\\Linphone)"
 
-#: ../gtk-glade/main.c:402
+#: ../gtk/main.c:479
 #, fuzzy, c-format
 msgid "Call with %s"
 msgstr "Обмен сообщениями с %s"
 
-#: ../gtk-glade/main.c:720
-#, c-format
-msgid "Incoming call from %s"
-msgstr "Входящий звонок от %s"
-
-#: ../gtk-glade/main.c:759
+#: ../gtk/main.c:862
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
@@ -74,7 +69,7 @@ msgstr ""
 "контактный лист?\n"
 "Если вы ответите Нет, эта персона будет временно заблокирована."
 
-#: ../gtk-glade/main.c:837
+#: ../gtk/main.c:940
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
@@ -83,165 +78,164 @@ msgstr ""
 "Пожалуйста, введите пароль для пользователя <i>%s</i>\n"
 " в дОПоно <i>%s</i>:"
 
-#: ../gtk-glade/main.c:934
+#: ../gtk/main.c:1076
 msgid "Website link"
 msgstr "Домашняя страница"
 
-#: ../gtk-glade/main.c:970
+#: ../gtk/main.c:1112
 msgid "Linphone - a video internet phone"
 msgstr "Linphone - Интернет видео телефон"
 
-#: ../gtk-glade/main.c:989
+#: ../gtk/main.c:1131
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (По умолчанию)"
 
-#: ../gtk-glade/main.c:1221
+#: ../gtk/main.c:1382
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
 msgstr ""
 
-#: ../gtk-glade/main.c:1275
+#: ../gtk/main.c:1441
 msgid "A free SIP video-phone"
 msgstr "Свободный SIP видео-телефон"
 
-#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:258
-#: ../gtk-glade/contact.glade.h:3
+#: ../gtk/friendlist.c:192 ../gtk/propertybox.c:271
 msgid "Name"
 msgstr "Имя"
 
-#: ../gtk-glade/friendlist.c:205
+#: ../gtk/friendlist.c:205
 msgid "Presence status"
 msgstr "Статус присутствия"
 
-#: ../gtk-glade/friendlist.c:242
+#: ../gtk/friendlist.c:242
 #, c-format
 msgid "Search in %s directory"
 msgstr "Поиск в директории %s"
 
-#: ../gtk-glade/friendlist.c:450
+#: ../gtk/friendlist.c:450
 msgid "Invalid sip contact !"
 msgstr "Неверный sip контакт"
 
-#: ../gtk-glade/friendlist.c:492
+#: ../gtk/friendlist.c:495
 #, c-format
 msgid "Call %s"
 msgstr "Звонк %s"
 
-#: ../gtk-glade/friendlist.c:493
+#: ../gtk/friendlist.c:496
 #, c-format
 msgid "Send text to %s"
 msgstr "Послать текст %s"
 
-#: ../gtk-glade/friendlist.c:494
+#: ../gtk/friendlist.c:497
 #, c-format
 msgid "Edit contact '%s'"
 msgstr "Редактировать контакт '%s'"
 
-#: ../gtk-glade/friendlist.c:495
+#: ../gtk/friendlist.c:498
 #, c-format
 msgid "Delete contact '%s'"
 msgstr "Удалить контакт '%s'"
 
-#: ../gtk-glade/friendlist.c:537
+#: ../gtk/friendlist.c:540
 #, c-format
 msgid "Add new contact from %s directory"
 msgstr "Добавить новый контакт из директории '%s'"
 
-#: ../gtk-glade/propertybox.c:264
+#: ../gtk/propertybox.c:277
 msgid "Rate (Hz)"
 msgstr "Частота (Hz)"
 
-#: ../gtk-glade/propertybox.c:270
+#: ../gtk/propertybox.c:283
 msgid "Status"
 msgstr "Статус"
 
-#: ../gtk-glade/propertybox.c:276
+#: ../gtk/propertybox.c:289
 msgid "Min bitrate (kbit/s)"
 msgstr "Минимальный битрейт (kbit/s)"
 
-#: ../gtk-glade/propertybox.c:283
+#: ../gtk/propertybox.c:296
 msgid "Parameters"
 msgstr "Параметры"
 
-#: ../gtk-glade/propertybox.c:312 ../gtk-glade/propertybox.c:451
+#: ../gtk/propertybox.c:325 ../gtk/propertybox.c:464
 msgid "Enabled"
 msgstr "Включен"
 
-#: ../gtk-glade/propertybox.c:313 ../gtk-glade/propertybox.c:451
+#: ../gtk/propertybox.c:326 ../gtk/propertybox.c:464
 msgid "Disabled"
 msgstr "Отключен"
 
-#: ../gtk-glade/propertybox.c:496
+#: ../gtk/propertybox.c:509
 msgid "Account"
 msgstr "Учетная запись"
 
-#: ../gtk-glade/propertybox.c:636
+#: ../gtk/propertybox.c:649
 msgid "English"
 msgstr "АнгНиКскиК"
 
-#: ../gtk-glade/propertybox.c:637
+#: ../gtk/propertybox.c:650
 msgid "French"
 msgstr "Французский"
 
-#: ../gtk-glade/propertybox.c:638
+#: ../gtk/propertybox.c:651
 msgid "Swedish"
 msgstr "ШводскиК"
 
-#: ../gtk-glade/propertybox.c:639
+#: ../gtk/propertybox.c:652
 msgid "Italian"
 msgstr "Итальянский"
 
-#: ../gtk-glade/propertybox.c:640
+#: ../gtk/propertybox.c:653
 msgid "Spanish"
 msgstr "ИспанскиК"
 
-#: ../gtk-glade/propertybox.c:641
+#: ../gtk/propertybox.c:654
 #, fuzzy
 msgid "Brazilian Portugese"
 msgstr "Португальский"
 
-#: ../gtk-glade/propertybox.c:642
+#: ../gtk/propertybox.c:655
 msgid "Polish"
 msgstr "Польский"
 
-#: ../gtk-glade/propertybox.c:643
+#: ../gtk/propertybox.c:656
 msgid "German"
 msgstr "Немецкий"
 
-#: ../gtk-glade/propertybox.c:644
+#: ../gtk/propertybox.c:657
 msgid "Russian"
 msgstr "РусскиК"
 
-#: ../gtk-glade/propertybox.c:645
+#: ../gtk/propertybox.c:658
 msgid "Japanese"
 msgstr "ЯпОнскиК"
 
-#: ../gtk-glade/propertybox.c:646
+#: ../gtk/propertybox.c:659
 msgid "Dutch"
 msgstr "Датский"
 
-#: ../gtk-glade/propertybox.c:647
+#: ../gtk/propertybox.c:660
 msgid "Hungarian"
 msgstr "Венгерский"
 
-#: ../gtk-glade/propertybox.c:648
+#: ../gtk/propertybox.c:661
 msgid "Czech"
 msgstr "ЧошскиК"
 
-#: ../gtk-glade/propertybox.c:649
+#: ../gtk/propertybox.c:662
 msgid "Chinese"
 msgstr "Китайский"
 
-#: ../gtk-glade/propertybox.c:706
+#: ../gtk/propertybox.c:719
 msgid ""
 "You need to restart linphone for the new language selection to take effect."
 msgstr ""
 "Вы должны перезагрузить Linphone для того чтобы языковые настройки вступили "
 "в сиНу."
 
-#: ../gtk-glade/update.c:80
+#: ../gtk/update.c:80
 #, c-format
 msgid ""
 "A more recent version is availalble from %s.\n"
@@ -250,38 +244,38 @@ msgstr ""
 "Доступна новая версия с %s\n"
 "Открыть браузер для загрузки?"
 
-#: ../gtk-glade/update.c:91
+#: ../gtk/update.c:91
 msgid "You are running the lastest version."
 msgstr ""
 
-#: ../gtk-glade/buddylookup.c:85
+#: ../gtk/buddylookup.c:85
 msgid "Firstname, Lastname"
 msgstr "Имя, Фамилия"
 
-#: ../gtk-glade/buddylookup.c:160
+#: ../gtk/buddylookup.c:160
 msgid "Error communicating with server."
 msgstr "Ошибка связи с сервером"
 
-#: ../gtk-glade/buddylookup.c:164
+#: ../gtk/buddylookup.c:164
 msgid "Connecting..."
 msgstr "Подключение..."
 
-#: ../gtk-glade/buddylookup.c:168
+#: ../gtk/buddylookup.c:168
 msgid "Connected"
 msgstr "ХОодинонО"
 
-#: ../gtk-glade/buddylookup.c:172
+#: ../gtk/buddylookup.c:172
 msgid "Receiving data..."
 msgstr "Получение данных..."
 
-#: ../gtk-glade/buddylookup.c:180
+#: ../gtk/buddylookup.c:180
 #, c-format
 msgid "Found %i contact"
 msgid_plural "Found %i contacts"
 msgstr[0] "Найден %i контакт"
 msgstr[1] ""
 
-#: ../gtk-glade/setupwizard.c:25
+#: ../gtk/setupwizard.c:25
 msgid ""
 "Welcome !\n"
 "This assistant will help you to use a SIP account for your calls."
@@ -289,767 +283,163 @@ msgstr ""
 "Добро пожаловать\n"
 "Помощник настройки учетной записи для SIP"
 
-#: ../gtk-glade/setupwizard.c:34
+#: ../gtk/setupwizard.c:34
 msgid "Create an account by choosing a username"
 msgstr "Создать учетную запись"
 
-#: ../gtk-glade/setupwizard.c:35
+#: ../gtk/setupwizard.c:35
 msgid "I have already an account and just want to use it"
 msgstr "Использовать существующую учетную запись"
 
-#: ../gtk-glade/setupwizard.c:53
+#: ../gtk/setupwizard.c:53
 msgid "Please choose a username:"
 msgstr "Выберите имя пользователя:"
 
-#: ../gtk-glade/setupwizard.c:54
+#: ../gtk/setupwizard.c:54
 msgid "Username:"
 msgstr "Имя пользователя:"
 
-#: ../gtk-glade/setupwizard.c:92
+#: ../gtk/setupwizard.c:92
 #, c-format
 msgid "Checking if '%s' is available..."
 msgstr "Проверка доступности '%s'"
 
-#: ../gtk-glade/setupwizard.c:97 ../gtk-glade/setupwizard.c:164
+#: ../gtk/setupwizard.c:97 ../gtk/setupwizard.c:164
 msgid "Please wait..."
 msgstr "Ждите..."
 
-#: ../gtk-glade/setupwizard.c:101
+#: ../gtk/setupwizard.c:101
 msgid "Sorry this username already exists. Please try a new one."
 msgstr "Такое имя пользователя уже существует. "
 
-#: ../gtk-glade/setupwizard.c:103 ../gtk-glade/setupwizard.c:168
+#: ../gtk/setupwizard.c:103 ../gtk/setupwizard.c:168
 msgid "Ok !"
 msgstr "Ok !"
 
-#: ../gtk-glade/setupwizard.c:106 ../gtk-glade/setupwizard.c:171
+#: ../gtk/setupwizard.c:106 ../gtk/setupwizard.c:171
 msgid "Communication problem, please try again later."
 msgstr "Проблемы со связью, повторите попытку позже."
 
-#: ../gtk-glade/setupwizard.c:134
+#: ../gtk/setupwizard.c:134
 msgid "Thank you. Your account is now configured and ready for use."
 msgstr "Спасибо! Учетная запись успешно настроена."
 
-#: ../gtk-glade/setupwizard.c:228
+#: ../gtk/setupwizard.c:228
 msgid "Welcome to the account setup assistant"
 msgstr "Добро пожаловат"
 
-#: ../gtk-glade/setupwizard.c:232
+#: ../gtk/setupwizard.c:232
 msgid "Account setup assistant"
 msgstr "Помощник настройки учетной записи"
 
-#: ../gtk-glade/setupwizard.c:236
+#: ../gtk/setupwizard.c:236
 msgid "Choosing a username"
 msgstr "Имя пользователя:"
 
-#: ../gtk-glade/setupwizard.c:240
+#: ../gtk/setupwizard.c:240
 msgid "Verifying"
 msgstr "Проверка"
 
-#: ../gtk-glade/setupwizard.c:244
+#: ../gtk/setupwizard.c:244
 msgid "Confirmation"
 msgstr "Подтверждение"
 
-#: ../gtk-glade/setupwizard.c:249
+#: ../gtk/setupwizard.c:249
 msgid "Creating your account"
 msgstr "Создание аккаунта"
 
-#: ../gtk-glade/setupwizard.c:253
+#: ../gtk/setupwizard.c:253
 msgid "Now ready !"
 msgstr "Готово !"
 
-#: ../gtk-glade/incall_view.c:113
+#: ../gtk/incall_view.c:113
+msgid "Transfer"
+msgstr ""
+
+#: ../gtk/incall_view.c:187
 msgid "<b>Calling...</b>"
 msgstr "<b>Вызов...</b>"
 
-#: ../gtk-glade/incall_view.c:116 ../gtk-glade/incall_view.c:138
+#: ../gtk/incall_view.c:190 ../gtk/incall_view.c:246
 msgid "00::00::00"
 msgstr "00::00::00"
 
-#: ../gtk-glade/incall_view.c:136
-msgid "<b>In call with</b>"
-msgstr "<b>ХОодинон с</b>"
-
-#: ../gtk-glade/incall_view.c:154
-#, c-format
-msgid "%02i::%02i::%02i"
-msgstr "%02i::%02i::%02i"
-
-#: ../gtk-glade/incall_view.c:170
-msgid "<b>Call ended.</b>"
-msgstr "<b>Звонок закончен.</b>"
-
-#: ../gtk-glade/incall_view.c:188
+#: ../gtk/incall_view.c:206
 #, fuzzy
-msgid "Unmute"
-msgstr "Безлимитный"
-
-#: ../gtk-glade/incall_view.c:195 ../gtk-glade/main.glade.h:43
-msgid "Mute"
-msgstr "Приглушить"
-
-#: ../gtk-glade/loginframe.c:83
-#, c-format
-msgid "Please enter login information for %s"
-msgstr "Введите информацию для входа %s:"
-
-#: ../gtk-glade/main.glade.h:1
-msgid "#"
-msgstr "#"
-
-#: ../gtk-glade/main.glade.h:2
-msgid "*"
-msgstr "*"
-
-#: ../gtk-glade/main.glade.h:3
-msgid "0"
-msgstr "0"
-
-#: ../gtk-glade/main.glade.h:4
-msgid "1"
-msgstr "1"
-
-#: ../gtk-glade/main.glade.h:5
-msgid "2"
-msgstr "2"
-
-#: ../gtk-glade/main.glade.h:6
-msgid "3"
-msgstr "3"
-
-#: ../gtk-glade/main.glade.h:7
-msgid "4"
-msgstr "4"
-
-#: ../gtk-glade/main.glade.h:8
-msgid "5"
-msgstr "5"
-
-#: ../gtk-glade/main.glade.h:9
-msgid "6"
-msgstr "6"
-
-#: ../gtk-glade/main.glade.h:10
-msgid "7"
-msgstr "7"
-
-#: ../gtk-glade/main.glade.h:11
-msgid "8"
-msgstr "8"
-
-#: ../gtk-glade/main.glade.h:12
-msgid "9"
-msgstr "9"
-
-#: ../gtk-glade/main.glade.h:13
-#, fuzzy
-msgid "<b>Add contacts from directory</b>"
-msgstr "Добавить новый контакт из директории '%s'"
-
-#: ../gtk-glade/main.glade.h:14
-msgid "<b>Contact list</b>"
-msgstr "<b>Список контактов</b>"
-
-#: ../gtk-glade/main.glade.h:15
-msgid "<b>Welcome !</b>"
-msgstr "<b>Добро пожаловать!</b>"
-
-#: ../gtk-glade/main.glade.h:16
-msgid "A"
-msgstr "A"
-
-#: ../gtk-glade/main.glade.h:17
-msgid ""
-"ADSL\n"
-"Fiber Channel"
-msgstr ""
-"ADSL\n"
-"Выделенный канал"
+msgid "<b>Incoming call</b>"
+msgstr "Входящий вызов"
 
-#: ../gtk-glade/main.glade.h:19
+#: ../gtk/incall_view.c:216
 msgid ""
-"All users\n"
-"Online users"
+"Pause all calls\n"
+"and answer"
 msgstr ""
-"Все пользователи\n"
-"Пользователи в сети"
-
-#: ../gtk-glade/main.glade.h:21
-msgid "Assistant"
-msgstr "Помощник"
-
-#: ../gtk-glade/main.glade.h:22
-msgid "Audio & Video"
-msgstr "Аудио и Видео"
-
-#: ../gtk-glade/main.glade.h:23
-msgid "Audio only"
-msgstr "Только Аудио"
-
-#: ../gtk-glade/main.glade.h:24
-msgid "Automatically log me in"
-msgstr "Входить автоматически"
-
-#: ../gtk-glade/main.glade.h:25
-msgid "B"
-msgstr "B"
 
-#: ../gtk-glade/main.glade.h:26 ../gtk-glade/parameters.glade.h:21
-msgid "C"
-msgstr "C"
-
-#: ../gtk-glade/main.glade.h:27
-#, fuzzy
-msgid "Call Details"
-msgstr "Звонк %s"
-
-#: ../gtk-glade/main.glade.h:28 ../gtk-glade/call_logs.glade.h:1
-msgid "Call history"
-msgstr "История звонков"
-
-#: ../gtk-glade/main.glade.h:29
-msgid "Check for updates"
+#: ../gtk/incall_view.c:217
+msgid "Answer"
 msgstr ""
 
-#: ../gtk-glade/main.glade.h:30
+#: ../gtk/incall_view.c:244
 #, fuzzy
-msgid "Contacts"
-msgstr "ХОодинонио"
-
-#: ../gtk-glade/main.glade.h:31
-msgid "D"
-msgstr "D"
-
-#: ../gtk-glade/main.glade.h:32
-msgid "Default"
-msgstr "По умолчанию"
-
-#: ../gtk-glade/main.glade.h:33
-msgid "Duration"
-msgstr "Продолжительность"
-
-#: ../gtk-glade/main.glade.h:34
-msgid "Duration:"
-msgstr "Продолжительность:"
-
-#: ../gtk-glade/main.glade.h:35
-msgid "Enable self-view"
-msgstr "Включить видео "
-
-#: ../gtk-glade/main.glade.h:36
-msgid "Enter username, phone number, or full sip address"
-msgstr "Введите имя пользователя, "
-
-#: ../gtk-glade/main.glade.h:37
-msgid "Homepage"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:38
-msgid "In call"
-msgstr "Входящий звонок"
-
-#: ../gtk-glade/main.glade.h:39
-msgid "Internet connection:"
-msgstr "Интернет-соединение:"
-
-#: ../gtk-glade/main.glade.h:40
-msgid "Keypad"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:41
-msgid "Login information"
-msgstr "Информация "
-
-#: ../gtk-glade/main.glade.h:42
-msgid "Lookup:"
-msgstr "Поиск:"
-
-#: ../gtk-glade/main.glade.h:44
-msgid "My current identity:"
-msgstr "Текущий идентификатор:"
-
-#: ../gtk-glade/main.glade.h:45
-msgid "Password"
-msgstr "Пароль"
-
-#: ../gtk-glade/main.glade.h:46
-msgid "SIP address or phone number:"
-msgstr "SIP-адрес или номер телефона."
-
-#: ../gtk-glade/main.glade.h:47
-#, fuzzy
-msgid "Search"
-msgstr "Поиск:"
-
-#: ../gtk-glade/main.glade.h:48
-#, fuzzy
-msgid "Show debug messages"
-msgstr "Показать окно ошибок"
-
-#: ../gtk-glade/main.glade.h:49
-msgid "Start call"
-msgstr "Вызов"
-
-#: ../gtk-glade/main.glade.h:50
-msgid "Terminate call"
-msgstr "Прервать вызов"
-
-#: ../gtk-glade/main.glade.h:51
-msgid "Username"
-msgstr "Имя пользователя"
-
-#: ../gtk-glade/main.glade.h:52
-msgid "_Linphone"
-msgstr "_Linphone"
-
-#: ../gtk-glade/main.glade.h:53
-msgid "_Modes"
-msgstr "_Режимы"
-
-#: ../gtk-glade/main.glade.h:54
-msgid "in"
-msgstr "в"
-
-#: ../gtk-glade/main.glade.h:55
-msgid "label"
-msgstr "метка"
-
-#: ../gtk-glade/about.glade.h:1
-msgid "About linphone"
-msgstr "Про linphone"
-
-#: ../gtk-glade/about.glade.h:2
-#, fuzzy
-msgid "An internet video phone using the standard SIP (rfc3261) protocol."
-msgstr "Интернет видео телефон использующий стандарт SIP (rfc3261) протокола."
-
-#: ../gtk-glade/about.glade.h:3
-msgid "Created by Simon Morlat\n"
-msgstr "ХОСдан Simon Morlat\n"
+msgid "<b>In call</b>"
+msgstr "<b>ХОодинон с</b>"
 
-#: ../gtk-glade/about.glade.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"
-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-glade/contact.glade.h:1
+#: ../gtk/incall_view.c:260
 #, fuzzy
-msgid "<b>Contact information</b>"
-msgstr "Контактная информация"
-
-#: ../gtk-glade/contact.glade.h:2
-msgid "Allow this contact to see my presence status"
-msgstr "Разрешить этому контакту видеть мой статус присутствия"
-
-#: ../gtk-glade/contact.glade.h:4
-msgid "SIP Address"
-msgstr "SIP Адрес"
-
-#: ../gtk-glade/contact.glade.h:5
-msgid "Show this contact presence status"
-msgstr "Показывать этому контакту статус присутствия"
-
-#: ../gtk-glade/contact.glade.h:6 ../gtk-glade/password.glade.h:5
-#: ../gtk-glade/sip_account.glade.h:9
-msgid "gtk-cancel"
-msgstr "Отмена"
-
-#: ../gtk-glade/contact.glade.h:7 ../gtk-glade/password.glade.h:6
-#: ../gtk-glade/sip_account.glade.h:10
-msgid "gtk-ok"
-msgstr "Ок"
-
-#: ../gtk-glade/log.glade.h:1
-msgid "Linphone debug window"
-msgstr "Linphone окно отладки"
-
-#: ../gtk-glade/log.glade.h:2 ../gtk-glade/call_logs.glade.h:2
-#: ../gtk-glade/chatroom.glade.h:2
-msgid "gtk-close"
-msgstr "Закрыть"
-
-#: ../gtk-glade/password.glade.h:1
-msgid "Linphone - Authentication required"
-msgstr "Linphone - Регистрация необходима"
-
-#: ../gtk-glade/password.glade.h:2
-msgid "Password:"
-msgstr "Пароль:"
-
-#: ../gtk-glade/password.glade.h:3
-msgid "Please enter the domain password"
-msgstr "Введите пароль"
-
-#: ../gtk-glade/password.glade.h:4
-msgid "UserID"
-msgstr "UserID"
-
-#: ../gtk-glade/sip_account.glade.h:1
-msgid "Configure a SIP account"
-msgstr "Настроить учетную запись SIP"
-
-#: ../gtk-glade/sip_account.glade.h:2
-msgid "Linphone - Configure a SIP account"
-msgstr "Linphone - Настроить учетную запись SIP"
-
-#: ../gtk-glade/sip_account.glade.h:3
-msgid "Publish presence information"
-msgstr "Показывать статус присутствия"
-
-#: ../gtk-glade/sip_account.glade.h:4
-msgid "Register at startup"
-msgstr "Регистрация при запуске"
-
-#: ../gtk-glade/sip_account.glade.h:5
-msgid "Registration duration (sec):"
-msgstr "Продолжительность регистрации (сек):"
-
-#: ../gtk-glade/sip_account.glade.h:6
-msgid "Route (optional):"
-msgstr "Маршрут (необязательно):"
-
-#: ../gtk-glade/sip_account.glade.h:7
-msgid "SIP Proxy address:"
-msgstr "Адрес SIP прокси:"
-
-#: ../gtk-glade/sip_account.glade.h:8
-msgid "Your SIP identity:"
-msgstr "Идентификатор SIP:"
-
-#: ../gtk-glade/sip_account.glade.h:11
-msgid "sip:"
-msgstr "sip:"
+msgid "<b>Paused call</b>"
+msgstr "<b>Завершить вызов</b>"
 
-#: ../gtk-glade/chatroom.glade.h:1
-msgid "Send"
-msgstr "Отправить"
-
-#: ../gtk-glade/incoming_call.glade.h:1
-msgid "Accept"
-msgstr "Принять"
-
-#: ../gtk-glade/incoming_call.glade.h:2
-msgid "Decline"
-msgstr "Отклонить"
-
-#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:369
-msgid "Incoming call"
-msgstr "Входящий вызов"
-
-#: ../gtk-glade/incoming_call.glade.h:4
-msgid "Incoming call from"
-msgstr "Входящий вызов от"
-
-#: ../gtk-glade/incoming_call.glade.h:5
-msgid "Linphone - Incoming call"
-msgstr "Linphone - Входящий вызов"
-
-#: ../gtk-glade/parameters.glade.h:1
-msgid "0 stands for \"unlimited\""
-msgstr "0 означает \"безлимитный\""
-
-#: ../gtk-glade/parameters.glade.h:2
-msgid "<b>Audio</b>"
-msgstr "<b>Звук</b>"
-
-#: ../gtk-glade/parameters.glade.h:3
-msgid "<b>Bandwidth control</b>"
-msgstr "<b>Пропускная способность</b>"
-
-#: ../gtk-glade/parameters.glade.h:4
-msgid "<b>Codecs</b>"
-msgstr "<b>Кодеки</b>"
-
-#: ../gtk-glade/parameters.glade.h:5
-msgid "<b>Default identity</b>"
-msgstr "<b>Идентификатор по умолчанию</b>"
+#: ../gtk/incall_view.c:272
+#, c-format
+msgid "%02i::%02i::%02i"
+msgstr "%02i::%02i::%02i"
 
-#: ../gtk-glade/parameters.glade.h:6
-msgid "<b>Language</b>"
-msgstr "<b>Язык</b>"
+#: ../gtk/incall_view.c:288
+msgid "<b>Call ended.</b>"
+msgstr "<b>Звонок закончен.</b>"
 
-#: ../gtk-glade/parameters.glade.h:7
+#: ../gtk/incall_view.c:309
 #, fuzzy
-msgid "<b>Level</b>"
-msgstr "<b>Язык</b>"
-
-#: ../gtk-glade/parameters.glade.h:8
-msgid "<b>NAT and Firewall</b>"
-msgstr "<b>NAT и брандмауэр</b>"
-
-#: ../gtk-glade/parameters.glade.h:9
-msgid "<b>Ports</b>"
-msgstr "<b>Порты</b>"
-
-#: ../gtk-glade/parameters.glade.h:10
-msgid "<b>Privacy</b>"
-msgstr "<b>Секретность</b>"
-
-#: ../gtk-glade/parameters.glade.h:11
-msgid "<b>Proxy accounts</b>"
-msgstr "<b>Учетные записи Proxy</b>"
-
-#: ../gtk-glade/parameters.glade.h:12
-msgid "<b>Transport</b>"
-msgstr "<b>Транспорт</b>"
-
-#: ../gtk-glade/parameters.glade.h:13
-msgid "<b>Video</b>"
-msgstr "<b>Видео</b>"
-
-#: ../gtk-glade/parameters.glade.h:14
-msgid "ALSA special device (optional):"
-msgstr "Специальное устройство ALSA (необязательно)"
-
-#: ../gtk-glade/parameters.glade.h:15
-msgid "Add"
-msgstr "Добавить"
+msgid "Unmute"
+msgstr "Безлимитный"
 
-#: ../gtk-glade/parameters.glade.h:16
-msgid "Audio RTP/UDP:"
-msgstr "АудиО RTP/UDP"
+#: ../gtk/incall_view.c:316
+msgid "Mute"
+msgstr "Приглушить"
 
-#: ../gtk-glade/parameters.glade.h:17
-msgid ""
-"Audio codecs\n"
-"Video codecs"
+#: ../gtk/incall_view.c:340
+msgid "Resume"
 msgstr ""
-"АудиО кОдоки\n"
-"Видео кодеки"
-
-#: ../gtk-glade/parameters.glade.h:19
-msgid "Behind NAT / Firewall (specify gateway IP below)"
-msgstr "За NAT / брандмауэр (указать IP-адрес шлюза ниже)"
-
-#: ../gtk-glade/parameters.glade.h:20
-msgid "Behind NAT / Firewall (use STUN to resolve)"
-msgstr "За NAT / брандмауэр (исползовать STUN)"
-
-#: ../gtk-glade/parameters.glade.h:22
-msgid "CIF"
-msgstr "CIF"
-
-#: ../gtk-glade/parameters.glade.h:23
-msgid "Capture device:"
-msgstr "Устройство захвата:"
-
-#: ../gtk-glade/parameters.glade.h:24
-msgid "Codecs"
-msgstr "Кодеки"
-
-#: ../gtk-glade/parameters.glade.h:25
-msgid "Direct connection to the Internet"
-msgstr "Прямое подключение к Интернет"
-
-#: ../gtk-glade/parameters.glade.h:26
-msgid "Disable"
-msgstr "Выключить"
-
-#: ../gtk-glade/parameters.glade.h:27
-msgid "Done"
-msgstr "Готово"
-
-#: ../gtk-glade/parameters.glade.h:28
-msgid "Download speed limit in Kbit/sec:"
-msgstr "Ограничение скорости входящего потока kbit/sec"
-
-#: ../gtk-glade/parameters.glade.h:29
-msgid "Edit"
-msgstr "Редактировать"
-
-#: ../gtk-glade/parameters.glade.h:30
-msgid "Enable"
-msgstr "Включить"
-
-#: ../gtk-glade/parameters.glade.h:31
-msgid "Enable echo cancellation"
-msgstr "Включить подавление эхо"
 
-#: ../gtk-glade/parameters.glade.h:32
-msgid "Erase all passwords"
-msgstr "Стереть все пароли"
-
-#: ../gtk-glade/parameters.glade.h:33
-msgid "Manage SIP Accounts"
-msgstr "Управление учетными записями SIP"
-
-#: ../gtk-glade/parameters.glade.h:34
-msgid "Multimedia settings"
-msgstr "Настройка мультимедиа"
-
-#: ../gtk-glade/parameters.glade.h:35
-msgid "Network settings"
-msgstr "Настройки сети"
-
-#: ../gtk-glade/parameters.glade.h:36
-msgid "Playback device:"
-msgstr "Устройство воспроизведения"
-
-#: ../gtk-glade/parameters.glade.h:37
-msgid "Prefered video resolution:"
-msgstr "Предпочтительное разрешение видео:"
-
-#: ../gtk-glade/parameters.glade.h:38
-msgid "Public IP address:"
-msgstr "Выделенный IP-адрес"
-
-#: ../gtk-glade/parameters.glade.h:39
-msgid ""
-"Register to FONICS\n"
-"virtual network !"
+#: ../gtk/incall_view.c:347
+msgid "Pause"
 msgstr ""
-"Регистрация в \n"
-"виртуальной сети FONICS!"
-
-#: ../gtk-glade/parameters.glade.h:41
-msgid "Remove"
-msgstr "Удалить"
-
-#: ../gtk-glade/parameters.glade.h:42
-msgid "Ring device:"
-msgstr "Устройство звонка:"
-
-#: ../gtk-glade/parameters.glade.h:43
-msgid "Ring sound:"
-msgstr "Звук звонка:"
-
-#: ../gtk-glade/parameters.glade.h:44
-msgid "SIP (UDP):"
-msgstr "SIP (UDP):"
-
-#: ../gtk-glade/parameters.glade.h:45
-msgid "Send DTMFs as SIP info"
-msgstr "Отправить DTFM как SIP-инфо"
 
-#: ../gtk-glade/parameters.glade.h:46
-msgid "Set Maximum Transmission Unit:"
-msgstr "Установка MTU (Максимально Передаваемый Блок)"
-
-#: ../gtk-glade/parameters.glade.h:47
-msgid "Settings"
-msgstr "Настройки:"
-
-#: ../gtk-glade/parameters.glade.h:48
-msgid "Show advanced settings"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:49
-msgid "Stun server:"
-msgstr "Stun сервер:"
-
-#: ../gtk-glade/parameters.glade.h:50
-msgid "This section defines your SIP address when not using a SIP account"
-msgstr "Поле определяет ваш SIP адрес когда вы не используете SIP аккаунт"
-
-#: ../gtk-glade/parameters.glade.h:51
-msgid "Upload speed limit in Kbit/sec:"
-msgstr "Ограничение исходящего потока kbit/sec:"
-
-#: ../gtk-glade/parameters.glade.h:52
-msgid "Use IPv6 instead of IPv4"
-msgstr "Использовать IPv6 вместо IPv4"
-
-#: ../gtk-glade/parameters.glade.h:53
-msgid "User interface"
-msgstr "Интерфейс:"
-
-#: ../gtk-glade/parameters.glade.h:54
-msgid "Video RTP/UDP:"
-msgstr "Видео RTP/UDP:"
-
-#: ../gtk-glade/parameters.glade.h:55
-msgid "Video input device:"
-msgstr "Видео устройство вывода:"
-
-#: ../gtk-glade/parameters.glade.h:56
-msgid "Your display name (eg: John Doe):"
-msgstr "Отображаемое имя (Иван Сидоров):"
-
-#: ../gtk-glade/parameters.glade.h:57
-msgid "Your resulting SIP address:"
-msgstr "Результирующий sip адрес:"
-
-#: ../gtk-glade/parameters.glade.h:58
-msgid "Your username:"
-msgstr "Имя пользователя:"
-
-#: ../gtk-glade/parameters.glade.h:59
-msgid "a sound card\n"
-msgstr "звуковая карта\n"
-
-#: ../gtk-glade/parameters.glade.h:61
-msgid "default camera"
-msgstr "камера по умолчаию"
-
-#: ../gtk-glade/parameters.glade.h:62
-msgid "default soundcard"
-msgstr "звуковая карта по умолчанию"
-
-#: ../gtk-glade/parameters.glade.h:63
-msgid "default soundcard\n"
-msgstr "звуковая карта по умолчанию\n"
-
-#: ../gtk-glade/buddylookup.glade.h:1
-msgid "<b>Search somebody</b>"
-msgstr "<b>Поиск</b>"
-
-#: ../gtk-glade/buddylookup.glade.h:2
-msgid "Add to my list"
-msgstr "Добавить в список"
-
-#: ../gtk-glade/buddylookup.glade.h:3
-msgid "Search contacts in directory"
-msgstr "Поиск контактов в директории"
-
-#: ../gtk-glade/waiting.glade.h:1
-msgid "Linphone"
-msgstr "Linphone"
-
-#: ../gtk-glade/waiting.glade.h:2
-msgid "Please wait"
-msgstr "Подождите"
+#: ../gtk/loginframe.c:93
+#, c-format
+msgid "Please enter login information for %s"
+msgstr "Введите информацию для входа %s:"
 
-#: ../coreapi/linphonecore.c:311
+#: ../coreapi/linphonecore.c:166
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
 msgstr[0] "У вас пропущено %i звонков."
 msgstr[1] "У вас пропущено %i звонков."
 
-#: ../coreapi/linphonecore.c:357
+#: ../coreapi/linphonecore.c:207
 msgid "aborted"
 msgstr "отмененный"
 
-#: ../coreapi/linphonecore.c:360
+#: ../coreapi/linphonecore.c:210
 msgid "completed"
 msgstr "заверщённый"
 
-#: ../coreapi/linphonecore.c:363
+#: ../coreapi/linphonecore.c:213
 msgid "missed"
 msgstr "пропущенный"
 
-#: ../coreapi/linphonecore.c:368
+#: ../coreapi/linphonecore.c:218
 #, c-format
 msgid ""
 "%s at %s\n"
@@ -1064,11 +454,15 @@ msgstr ""
 "Статус: %s\n"
 "Длительность: %i мн %i сек\n"
 
-#: ../coreapi/linphonecore.c:369
+#: ../coreapi/linphonecore.c:219
+msgid "Incoming call"
+msgstr "Входящий вызов"
+
+#: ../coreapi/linphonecore.c:219
 msgid "Outgoing call"
 msgstr "Исходящий звонок"
 
-#: ../coreapi/linphonecore.c:626
+#: ../coreapi/linphonecore.c:501
 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"
@@ -1076,23 +470,19 @@ msgstr ""
 "Ваш компьютер подключен по IPv6. Linphone по умолчанию использует IPv4. "
 "Пожалуйста, обновите настройки если хотите использовать IPv6."
 
-#: ../coreapi/linphonecore.c:1083
+#: ../coreapi/linphonecore.c:994
 msgid "Ready"
 msgstr "Готов"
 
-#: ../coreapi/linphonecore.c:1513
-msgid "Remote end seems to have disconnected, the call is going to be closed."
-msgstr "Удалённый узел отключился, звонок завершён."
-
-#: ../coreapi/linphonecore.c:1725
+#: ../coreapi/linphonecore.c:1768
 msgid "Looking for telephone number destination..."
 msgstr "Поиск назначения для телефонного номера.."
 
-#: ../coreapi/linphonecore.c:1727
+#: ../coreapi/linphonecore.c:1771
 msgid "Could not resolve this number."
 msgstr "Не может принять решение по этому номеру."
 
-#: ../coreapi/linphonecore.c:1771
+#: ../coreapi/linphonecore.c:1815
 msgid ""
 "Could not parse given sip address. A sip url usually looks like sip:"
 "user@domain"
@@ -1100,26 +490,54 @@ msgstr ""
 "Не могу опознать sip адрес. SIP url обычно выглядит как: <sip:"
 "username@domainname>"
 
-#: ../coreapi/linphonecore.c:1912
+#: ../coreapi/linphonecore.c:1962
 msgid "Contacting"
 msgstr "ХОодинонио"
 
-#: ../coreapi/linphonecore.c:1918
-msgid "could not call"
+#: ../coreapi/linphonecore.c:1969
+#, fuzzy
+msgid "Could not call"
 msgstr "невозможно позвонить"
 
-#: ../coreapi/linphonecore.c:1965
-msgid "Sorry, having multiple simultaneous calls is not supported yet !"
-msgstr "Одновременные вызовы пока не поддерживается!"
+#: ../coreapi/linphonecore.c:2076
+msgid "Sorry, you have to pause or stop the current call first !"
+msgstr ""
+
+#: ../coreapi/linphonecore.c:2081
+msgid "Sorry, we have reached the maximum number of simultaneous calls"
+msgstr ""
+
+#: ../coreapi/linphonecore.c:2205
+msgid "Modifying call parameters..."
+msgstr ""
 
-#: ../coreapi/linphonecore.c:2370 ../coreapi/callbacks.c:32
+#: ../coreapi/linphonecore.c:2308
 msgid "Connected."
 msgstr "Соединён."
 
-#: ../coreapi/linphonecore.c:2404
+#: ../coreapi/linphonecore.c:2331
+#, fuzzy
+msgid "Call aborted"
+msgstr "отмененный"
+
+#: ../coreapi/linphonecore.c:2371
 msgid "Call ended"
 msgstr "Разговор окончен"
 
+#: ../coreapi/linphonecore.c:2453
+#, fuzzy
+msgid "Could not pause the call"
+msgstr "невозможно позвонить"
+
+#: ../coreapi/linphonecore.c:2457
+#, fuzzy
+msgid "Pausing the current call..."
+msgstr "Показать текущий звонок"
+
+#: ../coreapi/linphonecore.c:2496
+msgid "There is already a call in process, pause or stop it first."
+msgstr ""
+
 #: ../coreapi/misc.c:147
 msgid ""
 "Your computer appears to be using ALSA sound drivers.\n"
@@ -1146,7 +564,7 @@ msgstr ""
 "Пожалуйста, выполните от пользователя root 'modprobe snd-pcm-oss' чтоб "
 "загрузить его."
 
-#: ../coreapi/misc.c:497
+#: ../coreapi/misc.c:520
 msgid "Stun lookup in progress..."
 msgstr "Идет поиск Stun..."
 
@@ -1198,7 +616,7 @@ msgstr "В ожидании"
 msgid "Unknown-bug"
 msgstr "Неизвестная ошибка"
 
-#: ../coreapi/proxy.c:176
+#: ../coreapi/proxy.c:187
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
@@ -1206,7 +624,7 @@ msgstr ""
 "Введеный SIP-адрес прокси является недействительным, он должен начинаться с "
 "\"sip:имя_хоста\""
 
-#: ../coreapi/proxy.c:182
+#: ../coreapi/proxy.c:193
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
@@ -1214,99 +632,139 @@ msgstr ""
 "Неверные параметры идентификации\n"
 "Должно выглядеть как sip:username@proxydomain"
 
-#: ../coreapi/proxy.c:621
+#: ../coreapi/proxy.c:670
 #, c-format
 msgid "Could not login as %s"
 msgstr "Невозможно зайти как: %s"
 
-#: ../coreapi/callbacks.c:95
+#: ../coreapi/callbacks.c:170
 #, fuzzy
 msgid "is contacting you"
 msgstr "контактирует с вами."
 
-#: ../coreapi/callbacks.c:96
+#: ../coreapi/callbacks.c:171
 msgid " and asked autoanswer."
 msgstr ""
 
-#: ../coreapi/callbacks.c:96
+#: ../coreapi/callbacks.c:171
 msgid "."
 msgstr ""
 
-#: ../coreapi/callbacks.c:120
+#: ../coreapi/callbacks.c:226
 #, fuzzy
 msgid "Remote ringing."
 msgstr "Registrierung"
 
-#: ../coreapi/callbacks.c:139
+#: ../coreapi/callbacks.c:251
 msgid "Early media."
 msgstr "Early media"
 
-#: ../coreapi/callbacks.c:248
+#: ../coreapi/callbacks.c:289
+#, fuzzy, c-format
+msgid "Call with %s is paused."
+msgstr "Обмен сообщениями с %s"
+
+#: ../coreapi/callbacks.c:300
+#, c-format
+msgid "Call answered by %s - on hold."
+msgstr ""
+
+#: ../coreapi/callbacks.c:315
+#, fuzzy
+msgid "Call resumed."
+msgstr "Разговор окончен"
+
+#: ../coreapi/callbacks.c:320
+#, fuzzy, c-format
+msgid "Call answered by %s."
+msgstr ""
+"Позвонить\n"
+"или ответить"
+
+#: ../coreapi/callbacks.c:381
+msgid "We are being paused..."
+msgstr ""
+
+#: ../coreapi/callbacks.c:385
+msgid "We have been resumed..."
+msgstr ""
+
+#: ../coreapi/callbacks.c:422
 msgid "Call terminated."
 msgstr "Звонок прерван."
 
-#: ../coreapi/callbacks.c:265
+#: ../coreapi/callbacks.c:429
 msgid "User is busy."
 msgstr "Пользователь занят."
 
-#: ../coreapi/callbacks.c:266
+#: ../coreapi/callbacks.c:430
 msgid "User is temporarily unavailable."
 msgstr "Пользователь временно недоступен."
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:268
+#: ../coreapi/callbacks.c:432
 msgid "User does not want to be disturbed."
 msgstr "Пользователь не хочет чтоб его беспокоили."
 
-#: ../coreapi/callbacks.c:269
+#: ../coreapi/callbacks.c:433
 msgid "Call declined."
 msgstr "Звонок отклонён."
 
-#: ../coreapi/callbacks.c:281
+#: ../coreapi/callbacks.c:445
 #, fuzzy
 msgid "No response."
 msgstr "время ожидания истекло"
 
-#: ../coreapi/callbacks.c:284
+#: ../coreapi/callbacks.c:449
 msgid "Protocol error."
 msgstr ""
 
-#: ../coreapi/callbacks.c:298
+#: ../coreapi/callbacks.c:465
 #, fuzzy
 msgid "Redirected"
 msgstr "Переадресован на %s..."
 
-#: ../coreapi/callbacks.c:308
+#: ../coreapi/callbacks.c:475
 msgid "Not found"
 msgstr ""
 
-#: ../coreapi/callbacks.c:318
+#: ../coreapi/callbacks.c:485
 msgid "No common codecs"
 msgstr ""
 
-#: ../coreapi/callbacks.c:324
+#: ../coreapi/callbacks.c:491
 #, fuzzy
 msgid "Call failed."
 msgstr "Anruf annulliert"
 
-#: ../coreapi/callbacks.c:374
+#: ../coreapi/callbacks.c:527
+#, fuzzy
+msgid "Authentication failure"
+msgstr "Информация аунтефикации"
+
+#: ../coreapi/callbacks.c:553
 #, c-format
 msgid "Registration on %s successful."
 msgstr "Регистрация на %s прошла успешно."
 
-#: ../coreapi/callbacks.c:375
+#: ../coreapi/callbacks.c:554
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "Отмена регистрации на %s завершена."
 
-#: ../coreapi/callbacks.c:383
+#: ../coreapi/callbacks.c:570
+msgid "no response timeout"
+msgstr "время ожидания истекло"
+
+#: ../coreapi/callbacks.c:573
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "Регистрация на %s не удалась: %s"
 
-#: ../coreapi/callbacks.c:383
-msgid "no response timeout"
-msgstr "время ожидания истекло"
+#: ../coreapi/callbacks.c:615
+#, c-format
+msgid "We are transferred to %s"
+msgstr ""
 
 #: ../mediastreamer2/src/alaw.c:144 ../mediastreamer2/src/alaw.c:162
 msgid "ITU-G.711 alaw encoder"
@@ -1316,11 +774,11 @@ msgstr "ITU-G.711 alaw кодировщик"
 msgid "ITU-G.711 alaw decoder"
 msgstr "ITU-G.711 alaw декодер"
 
-#: ../mediastreamer2/src/alsa.c:935
+#: ../mediastreamer2/src/alsa.c:950
 msgid "Alsa sound source"
 msgstr "Источник ALSA"
 
-#: ../mediastreamer2/src/alsa.c:1039
+#: ../mediastreamer2/src/alsa.c:1054
 msgid "Alsa sound output"
 msgstr ""
 
@@ -1332,15 +790,15 @@ msgstr ""
 msgid "Sound playback filter for MacOS X Audio Queue Service"
 msgstr ""
 
-#: ../mediastreamer2/src/dtmfgen.c:173 ../mediastreamer2/src/dtmfgen.c:191
+#: ../mediastreamer2/src/dtmfgen.c:274 ../mediastreamer2/src/dtmfgen.c:293
 msgid "DTMF generator"
 msgstr "Генератор DTMF"
 
-#: ../mediastreamer2/src/gsm.c:111 ../mediastreamer2/src/gsm.c:129
+#: ../mediastreamer2/src/gsm.c:120 ../mediastreamer2/src/gsm.c:138
 msgid "The GSM full-rate codec"
 msgstr "Кодек  GSM full-rate"
 
-#: ../mediastreamer2/src/gsm.c:178 ../mediastreamer2/src/gsm.c:196
+#: ../mediastreamer2/src/gsm.c:187 ../mediastreamer2/src/gsm.c:205
 msgid "The GSM codec"
 msgstr "Кодек GSM"
 
@@ -1356,8 +814,8 @@ msgstr ""
 msgid "A filter to make conferencing"
 msgstr "Фильтр конференций"
 
-#: ../mediastreamer2/src/msfileplayer.c:295
-#: ../mediastreamer2/src/msfileplayer.c:313
+#: ../mediastreamer2/src/msfileplayer.c:311
+#: ../mediastreamer2/src/msfileplayer.c:329
 msgid "Raw files and wav reader"
 msgstr ""
 
@@ -1371,61 +829,53 @@ msgstr ""
 msgid "A filter that send several inputs to one output."
 msgstr ""
 
-#: ../mediastreamer2/src/msresample.c:221
-#: ../mediastreamer2/src/msresample.c:239
-msgid "frequency resampler"
+#: ../mediastreamer2/src/msresample.c:159
+#: ../mediastreamer2/src/msresample.c:177
+msgid "Audio resampler"
 msgstr ""
 
-#: ../mediastreamer2/src/msrtp.c:358 ../mediastreamer2/src/msrtp.c:376
+#: ../mediastreamer2/src/msrtp.c:369 ../mediastreamer2/src/msrtp.c:387
 msgid "RTP output filter"
 msgstr ""
 
-#: ../mediastreamer2/src/msrtp.c:493 ../mediastreamer2/src/msrtp.c:511
+#: ../mediastreamer2/src/msrtp.c:505 ../mediastreamer2/src/msrtp.c:523
 msgid "RTP input filter"
 msgstr ""
 
-#: ../mediastreamer2/src/msspeex.c:359 ../mediastreamer2/src/msspeex.c:377
-#: ../mediastreamer2/src/msspeex.c:504 ../mediastreamer2/src/msspeex.c:522
+#: ../mediastreamer2/src/msspeex.c:360 ../mediastreamer2/src/msspeex.c:378
+#: ../mediastreamer2/src/msspeex.c:548 ../mediastreamer2/src/msspeex.c:567
 msgid "The free and wonderful speex codec"
 msgstr ""
 
-#: ../mediastreamer2/src/msvolume.c:415 ../mediastreamer2/src/msvolume.c:430
+#: ../mediastreamer2/src/msvolume.c:527 ../mediastreamer2/src/msvolume.c:542
 msgid "A filter that controls and measure sound volume"
 msgstr ""
 
-#: ../mediastreamer2/src/msv4l.c:1011
+#: ../mediastreamer2/src/msv4l.c:1012
 msgid "A video4linux compatible source filter to stream pictures."
 msgstr ""
 
-#: ../mediastreamer2/src/msv4l2.c:470
+#: ../mediastreamer2/src/msv4l2.c:554
 msgid "A filter to grab pictures from Video4Linux2-powered cameras"
 msgstr ""
 
-#: ../mediastreamer2/src/nowebcam.c:1836
+#: ../mediastreamer2/src/nowebcam.c:1854
 msgid "A filter that outputs a static image."
 msgstr ""
 
-#: ../mediastreamer2/src/oss.c:567
-msgid "Sound capture filter for OSS drivers"
-msgstr ""
-
-#: ../mediastreamer2/src/oss.c:581
-msgid "Sound playback filter for OSS drivers"
-msgstr ""
-
-#: ../mediastreamer2/src/pixconv.c:177 ../mediastreamer2/src/pixconv.c:195
+#: ../mediastreamer2/src/pixconv.c:129 ../mediastreamer2/src/pixconv.c:147
 msgid "A pixel format converter"
 msgstr ""
 
-#: ../mediastreamer2/src/sizeconv.c:204
+#: ../mediastreamer2/src/sizeconv.c:202
 msgid "A video size converter"
 msgstr ""
 
-#: ../mediastreamer2/src/sizeconv.c:222
+#: ../mediastreamer2/src/sizeconv.c:220
 msgid "a small video size converter"
 msgstr ""
 
-#: ../mediastreamer2/src/speexec.c:349 ../mediastreamer2/src/speexec.c:367
+#: ../mediastreamer2/src/speexec.c:276 ../mediastreamer2/src/speexec.c:294
 #, fuzzy
 msgid "Echo canceller using speex library"
 msgstr "Подавление эхо с использование библиотеки speex"
@@ -1454,57 +904,57 @@ msgstr "ITU-G.711 ulaw кодировщик"
 msgid "ITU-G.711 ulaw decoder"
 msgstr "ITU-G.711 ulaw декодер"
 
-#: ../mediastreamer2/src/videodec.c:669 ../mediastreamer2/src/videodec.c:685
-#: ../mediastreamer2/src/videodec.c:768 ../mediastreamer2/src/videodec.c:784
+#: ../mediastreamer2/src/videodec.c:713 ../mediastreamer2/src/videodec.c:729
+#: ../mediastreamer2/src/videodec.c:812 ../mediastreamer2/src/videodec.c:828
 msgid "A H.263 decoder using ffmpeg library"
 msgstr "H.263 декодер ( использует ffmpeg )"
 
-#: ../mediastreamer2/src/videodec.c:702
+#: ../mediastreamer2/src/videodec.c:746
 msgid "A MPEG4 decoder using ffmpeg library"
 msgstr "MPEG4 декодер ( использует ffmpeg )"
 
-#: ../mediastreamer2/src/videodec.c:718
+#: ../mediastreamer2/src/videodec.c:762
 #, fuzzy
 msgid "A RTP/JPEG decoder using ffmpeg library"
 msgstr "MJPEG декодер ( использует ffmpeg )"
 
-#: ../mediastreamer2/src/videodec.c:734
+#: ../mediastreamer2/src/videodec.c:778
 msgid "A MJPEG decoder using ffmpeg library"
 msgstr "MJPEG декодер ( использует ffmpeg )"
 
-#: ../mediastreamer2/src/videodec.c:750
+#: ../mediastreamer2/src/videodec.c:794
 msgid "A snow decoder using ffmpeg library"
 msgstr "snow декодер ( использует ffmpeg )"
 
-#: ../mediastreamer2/src/videoenc.c:861 ../mediastreamer2/src/videoenc.c:943
+#: ../mediastreamer2/src/videoenc.c:908 ../mediastreamer2/src/videoenc.c:990
 msgid "A video H.263 encoder using ffmpeg library."
 msgstr "H.263 видео-кодировщик ( использует ffmpeg )"
 
-#: ../mediastreamer2/src/videoenc.c:877
+#: ../mediastreamer2/src/videoenc.c:924
 msgid ""
 "A video H.263 encoder using ffmpeg library. It is compliant with old RFC2190 "
 "spec."
 msgstr "H.263 видео-кодировщик ( использует ffmpeg ). Совместим с RFC2190"
 
-#: ../mediastreamer2/src/videoenc.c:893 ../mediastreamer2/src/videoenc.c:975
+#: ../mediastreamer2/src/videoenc.c:940 ../mediastreamer2/src/videoenc.c:1022
 msgid "A video MPEG4 encoder using ffmpeg library."
 msgstr "MPEG4 видео-кодировщик ( использует ffmpeg )."
 
-#: ../mediastreamer2/src/videoenc.c:909
+#: ../mediastreamer2/src/videoenc.c:956
 msgid "A video snow encoder using ffmpeg library."
 msgstr "snow видео-кодировщик ( использует ffmpeg )."
 
-#: ../mediastreamer2/src/videoenc.c:925
+#: ../mediastreamer2/src/videoenc.c:972
 #, fuzzy
 msgid "A RTP/MJPEG encoder using ffmpeg library."
 msgstr "MJPEG декодер ( использует ffmpeg )"
 
-#: ../mediastreamer2/src/videoenc.c:959
+#: ../mediastreamer2/src/videoenc.c:1006
 msgid ""
 "A video H.263 encoder using ffmpeg library, compliant with old RFC2190 spec."
 msgstr "H.263 видео-кодировщик ( использует ffmpeg ). Совместим с RFC2190"
 
-#: ../mediastreamer2/src/videoenc.c:991
+#: ../mediastreamer2/src/videoenc.c:1038
 msgid ""
 "The snow codec is royalty-free and is open-source. \n"
 "It uses innovative techniques that makes it one of most promising video "
@@ -1513,13 +963,13 @@ msgid ""
 "versions cannot be guaranteed."
 msgstr ""
 
-#: ../mediastreamer2/src/videoenc.c:1011
+#: ../mediastreamer2/src/videoenc.c:1058
 #, fuzzy
 msgid "A MJPEG encoder using ffmpeg library."
 msgstr "MJPEG декодер ( использует ffmpeg )"
 
-#: ../mediastreamer2/src/videoout.c:1812 ../mediastreamer2/src/videoout.c:1830
-msgid "A generic video display"
+#: ../mediastreamer2/src/videoout.c:933
+msgid "A SDL-based video display"
 msgstr ""
 
 #: ../mediastreamer2/src/wincevideods.c:969
@@ -1546,10 +996,547 @@ msgstr ""
 msgid "Parametric sound equalizer."
 msgstr ""
 
-#: ../mediastreamer2/src/msdscap-mingw.cc:1003
+#: ../mediastreamer2/src/msdscap-mingw.cc:1038
 msgid "A webcam grabber based on directshow."
 msgstr ""
 
+#: ../mediastreamer2/src/drawdib-display.c:552
+#: ../mediastreamer2/src/drawdib-display.c:570
+msgid "A video display based on windows DrawDib api"
+msgstr ""
+
+#: ../mediastreamer2/src/audiomixer.c:192
+#: ../mediastreamer2/src/audiomixer.c:211
+msgid "A filter that mixes down 16 bit sample audio streams"
+msgstr ""
+
+#: ../mediastreamer2/src/chanadapt.c:110 ../mediastreamer2/src/chanadapt.c:128
+msgid "A filter that converts from mono to stereo and vice versa."
+msgstr ""
+
+#: ../mediastreamer2/src/itc.c:97 ../mediastreamer2/src/itc.c:115
+#: ../mediastreamer2/src/itc.c:197 ../mediastreamer2/src/itc.c:215
+#, fuzzy
+msgid "Inter ticker communication filter."
+msgstr "Ошибка связи с сервером"
+
+#: ../mediastreamer2/src/extdisplay.c:62 ../mediastreamer2/src/extdisplay.c:79
+msgid "A display filter sending the buffers to draw to the upper layer"
+msgstr ""
+
+#: ../mediastreamer2/src/msiounit.c:619
+msgid "Sound capture filter for MacOS X Audio Unit Service"
+msgstr ""
+
+#: ../mediastreamer2/src/msiounit.c:633
+msgid "Sound playback filter for MacOS X Audio Unit Service"
+msgstr ""
+
+#: ../mediastreamer2/src/x11video.c:562
+msgid "A video display using X11+Xv"
+msgstr ""
+
+#. .id=
+#. .name=
+#. .text=
+#: ../mediastreamer2/src/msandroid.cpp:370
+msgid "Sound capture filter for Android"
+msgstr ""
+
+#. .id=
+#. .name=
+#. .text=
+#: ../mediastreamer2/src/msandroid.cpp:667
+msgid "Sound playback filter for Android"
+msgstr ""
+
+#: ../mediastreamer2/src/msandroidvideo.cpp:134
+msgid "A filter that captures Android video."
+msgstr ""
+
+#~ msgid "Incoming call from %s"
+#~ msgstr "Входящий звонок от %s"
+
+#~ msgid "#"
+#~ msgstr "#"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "0"
+#~ msgstr "0"
+
+#~ msgid "1"
+#~ msgstr "1"
+
+#~ msgid "2"
+#~ msgstr "2"
+
+#~ msgid "3"
+#~ msgstr "3"
+
+#~ msgid "4"
+#~ msgstr "4"
+
+#~ msgid "5"
+#~ msgstr "5"
+
+#~ msgid "6"
+#~ msgstr "6"
+
+#~ msgid "7"
+#~ msgstr "7"
+
+#~ msgid "8"
+#~ msgstr "8"
+
+#~ msgid "9"
+#~ msgstr "9"
+
+#, fuzzy
+#~ msgid "<b>Add contacts from directory</b>"
+#~ msgstr "Добавить новый контакт из директории '%s'"
+
+#~ msgid "<b>Contact list</b>"
+#~ msgstr "<b>Список контактов</b>"
+
+#~ msgid "<b>Welcome !</b>"
+#~ msgstr "<b>Добро пожаловать!</b>"
+
+#~ msgid "A"
+#~ msgstr "A"
+
+#~ msgid ""
+#~ "ADSL\n"
+#~ "Fiber Channel"
+#~ msgstr ""
+#~ "ADSL\n"
+#~ "Выделенный канал"
+
+#~ msgid ""
+#~ "All users\n"
+#~ "Online users"
+#~ msgstr ""
+#~ "Все пользователи\n"
+#~ "Пользователи в сети"
+
+#~ msgid "Assistant"
+#~ msgstr "Помощник"
+
+#~ msgid "Audio & Video"
+#~ msgstr "Аудио и Видео"
+
+#~ msgid "Audio only"
+#~ msgstr "Только Аудио"
+
+#~ msgid "Automatically log me in"
+#~ msgstr "Входить автоматически"
+
+#~ msgid "B"
+#~ msgstr "B"
+
+#~ msgid "C"
+#~ msgstr "C"
+
+#, fuzzy
+#~ msgid "Call Details"
+#~ msgstr "Звонк %s"
+
+#~ msgid "Call history"
+#~ msgstr "История звонков"
+
+#, fuzzy
+#~ msgid "Contacts"
+#~ msgstr "ХОодинонио"
+
+#~ msgid "D"
+#~ msgstr "D"
+
+#~ msgid "Default"
+#~ msgstr "По умолчанию"
+
+#~ msgid "Duration"
+#~ msgstr "Продолжительность"
+
+#~ msgid "Duration:"
+#~ msgstr "Продолжительность:"
+
+#~ msgid "Enable self-view"
+#~ msgstr "Включить видео "
+
+#~ msgid "Enter username, phone number, or full sip address"
+#~ msgstr "Введите имя пользователя, "
+
+#~ msgid "In call"
+#~ msgstr "Входящий звонок"
+
+#~ msgid "Internet connection:"
+#~ msgstr "Интернет-соединение:"
+
+#~ msgid "Login information"
+#~ msgstr "Информация "
+
+#~ msgid "Lookup:"
+#~ msgstr "Поиск:"
+
+#~ msgid "My current identity:"
+#~ msgstr "Текущий идентификатор:"
+
+#~ msgid "Password"
+#~ msgstr "Пароль"
+
+#~ msgid "SIP address or phone number:"
+#~ msgstr "SIP-адрес или номер телефона."
+
+#, fuzzy
+#~ msgid "Search"
+#~ msgstr "Поиск:"
+
+#, fuzzy
+#~ msgid "Show debug messages"
+#~ msgstr "Показать окно ошибок"
+
+#~ msgid "Start call"
+#~ msgstr "Вызов"
+
+#~ msgid "Terminate call"
+#~ msgstr "Прервать вызов"
+
+#~ msgid "Username"
+#~ msgstr "Имя пользователя"
+
+#~ msgid "_Linphone"
+#~ msgstr "_Linphone"
+
+#~ msgid "_Modes"
+#~ msgstr "_Режимы"
+
+#~ msgid "in"
+#~ msgstr "в"
+
+#~ msgid "label"
+#~ msgstr "метка"
+
+#~ msgid "About linphone"
+#~ msgstr "Про linphone"
+
+#, fuzzy
+#~ msgid "An internet video phone using the standard SIP (rfc3261) protocol."
+#~ msgstr ""
+#~ "Интернет видео телефон использующий стандарт SIP (rfc3261) протокола."
+
+#~ msgid "Created by Simon Morlat\n"
+#~ msgstr "ХОСдан Simon Morlat\n"
+
+#~ 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"
+
+#, fuzzy
+#~ msgid "<b>Contact information</b>"
+#~ msgstr "Контактная информация"
+
+#~ msgid "Allow this contact to see my presence status"
+#~ msgstr "Разрешить этому контакту видеть мой статус присутствия"
+
+#~ msgid "SIP Address"
+#~ msgstr "SIP Адрес"
+
+#~ msgid "Show this contact presence status"
+#~ msgstr "Показывать этому контакту статус присутствия"
+
+#~ msgid "gtk-cancel"
+#~ msgstr "Отмена"
+
+#~ msgid "gtk-ok"
+#~ msgstr "Ок"
+
+#~ msgid "Linphone debug window"
+#~ msgstr "Linphone окно отладки"
+
+#~ msgid "gtk-close"
+#~ msgstr "Закрыть"
+
+#~ msgid "Linphone - Authentication required"
+#~ msgstr "Linphone - Регистрация необходима"
+
+#~ msgid "Password:"
+#~ msgstr "Пароль:"
+
+#~ msgid "Please enter the domain password"
+#~ msgstr "Введите пароль"
+
+#~ msgid "UserID"
+#~ msgstr "UserID"
+
+#~ msgid "Configure a SIP account"
+#~ msgstr "Настроить учетную запись SIP"
+
+#~ msgid "Linphone - Configure a SIP account"
+#~ msgstr "Linphone - Настроить учетную запись SIP"
+
+#~ msgid "Publish presence information"
+#~ msgstr "Показывать статус присутствия"
+
+#~ msgid "Register at startup"
+#~ msgstr "Регистрация при запуске"
+
+#~ msgid "Registration duration (sec):"
+#~ msgstr "Продолжительность регистрации (сек):"
+
+#~ msgid "Route (optional):"
+#~ msgstr "Маршрут (необязательно):"
+
+#~ msgid "SIP Proxy address:"
+#~ msgstr "Адрес SIP прокси:"
+
+#~ msgid "Your SIP identity:"
+#~ msgstr "Идентификатор SIP:"
+
+#~ msgid "sip:"
+#~ msgstr "sip:"
+
+#~ msgid "Send"
+#~ msgstr "Отправить"
+
+#~ msgid "Accept"
+#~ msgstr "Принять"
+
+#~ msgid "Decline"
+#~ msgstr "Отклонить"
+
+#~ msgid "Incoming call from"
+#~ msgstr "Входящий вызов от"
+
+#~ msgid "Linphone - Incoming call"
+#~ msgstr "Linphone - Входящий вызов"
+
+#~ msgid "0 stands for \"unlimited\""
+#~ msgstr "0 означает \"безлимитный\""
+
+#~ msgid "<b>Audio</b>"
+#~ msgstr "<b>Звук</b>"
+
+#~ msgid "<b>Bandwidth control</b>"
+#~ msgstr "<b>Пропускная способность</b>"
+
+#~ msgid "<b>Codecs</b>"
+#~ msgstr "<b>Кодеки</b>"
+
+#~ msgid "<b>Default identity</b>"
+#~ msgstr "<b>Идентификатор по умолчанию</b>"
+
+#~ msgid "<b>Language</b>"
+#~ msgstr "<b>Язык</b>"
+
+#, fuzzy
+#~ msgid "<b>Level</b>"
+#~ msgstr "<b>Язык</b>"
+
+#~ msgid "<b>NAT and Firewall</b>"
+#~ msgstr "<b>NAT и брандмауэр</b>"
+
+#~ msgid "<b>Ports</b>"
+#~ msgstr "<b>Порты</b>"
+
+#~ msgid "<b>Privacy</b>"
+#~ msgstr "<b>Секретность</b>"
+
+#~ msgid "<b>Proxy accounts</b>"
+#~ msgstr "<b>Учетные записи Proxy</b>"
+
+#~ msgid "<b>Transport</b>"
+#~ msgstr "<b>Транспорт</b>"
+
+#~ msgid "<b>Video</b>"
+#~ msgstr "<b>Видео</b>"
+
+#~ msgid "ALSA special device (optional):"
+#~ msgstr "Специальное устройство ALSA (необязательно)"
+
+#~ msgid "Add"
+#~ msgstr "Добавить"
+
+#~ msgid "Audio RTP/UDP:"
+#~ msgstr "АудиО RTP/UDP"
+
+#~ msgid ""
+#~ "Audio codecs\n"
+#~ "Video codecs"
+#~ msgstr ""
+#~ "АудиО кОдоки\n"
+#~ "Видео кодеки"
+
+#~ msgid "Behind NAT / Firewall (specify gateway IP below)"
+#~ msgstr "За NAT / брандмауэр (указать IP-адрес шлюза ниже)"
+
+#~ msgid "Behind NAT / Firewall (use STUN to resolve)"
+#~ msgstr "За NAT / брандмауэр (исползовать STUN)"
+
+#~ msgid "CIF"
+#~ msgstr "CIF"
+
+#~ msgid "Capture device:"
+#~ msgstr "Устройство захвата:"
+
+#~ msgid "Codecs"
+#~ msgstr "Кодеки"
+
+#~ msgid "Direct connection to the Internet"
+#~ msgstr "Прямое подключение к Интернет"
+
+#~ msgid "Disable"
+#~ msgstr "Выключить"
+
+#~ msgid "Done"
+#~ msgstr "Готово"
+
+#~ msgid "Download speed limit in Kbit/sec:"
+#~ msgstr "Ограничение скорости входящего потока kbit/sec"
+
+#~ msgid "Edit"
+#~ msgstr "Редактировать"
+
+#~ msgid "Enable"
+#~ msgstr "Включить"
+
+#~ msgid "Enable echo cancellation"
+#~ msgstr "Включить подавление эхо"
+
+#~ msgid "Erase all passwords"
+#~ msgstr "Стереть все пароли"
+
+#~ msgid "Manage SIP Accounts"
+#~ msgstr "Управление учетными записями SIP"
+
+#~ msgid "Multimedia settings"
+#~ msgstr "Настройка мультимедиа"
+
+#~ msgid "Network settings"
+#~ msgstr "Настройки сети"
+
+#~ msgid "Playback device:"
+#~ msgstr "Устройство воспроизведения"
+
+#~ msgid "Prefered video resolution:"
+#~ msgstr "Предпочтительное разрешение видео:"
+
+#~ msgid "Public IP address:"
+#~ msgstr "Выделенный IP-адрес"
+
+#~ msgid ""
+#~ "Register to FONICS\n"
+#~ "virtual network !"
+#~ msgstr ""
+#~ "Регистрация в \n"
+#~ "виртуальной сети FONICS!"
+
+#~ msgid "Remove"
+#~ msgstr "Удалить"
+
+#~ msgid "Ring device:"
+#~ msgstr "Устройство звонка:"
+
+#~ msgid "Ring sound:"
+#~ msgstr "Звук звонка:"
+
+#~ msgid "SIP (UDP):"
+#~ msgstr "SIP (UDP):"
+
+#~ msgid "Send DTMFs as SIP info"
+#~ msgstr "Отправить DTFM как SIP-инфо"
+
+#~ msgid "Set Maximum Transmission Unit:"
+#~ msgstr "Установка MTU (Максимально Передаваемый Блок)"
+
+#~ msgid "Settings"
+#~ msgstr "Настройки:"
+
+#~ msgid "Stun server:"
+#~ msgstr "Stun сервер:"
+
+#~ msgid "This section defines your SIP address when not using a SIP account"
+#~ msgstr "Поле определяет ваш SIP адрес когда вы не используете SIP аккаунт"
+
+#~ msgid "Upload speed limit in Kbit/sec:"
+#~ msgstr "Ограничение исходящего потока kbit/sec:"
+
+#~ msgid "Use IPv6 instead of IPv4"
+#~ msgstr "Использовать IPv6 вместо IPv4"
+
+#~ msgid "User interface"
+#~ msgstr "Интерфейс:"
+
+#~ msgid "Video RTP/UDP:"
+#~ msgstr "Видео RTP/UDP:"
+
+#~ msgid "Video input device:"
+#~ msgstr "Видео устройство вывода:"
+
+#~ msgid "Your display name (eg: John Doe):"
+#~ msgstr "Отображаемое имя (Иван Сидоров):"
+
+#~ msgid "Your resulting SIP address:"
+#~ msgstr "Результирующий sip адрес:"
+
+#~ msgid "Your username:"
+#~ msgstr "Имя пользователя:"
+
+#~ msgid "a sound card\n"
+#~ msgstr "звуковая карта\n"
+
+#~ msgid "default camera"
+#~ msgstr "камера по умолчаию"
+
+#~ msgid "default soundcard"
+#~ msgstr "звуковая карта по умолчанию"
+
+#~ msgid "default soundcard\n"
+#~ msgstr "звуковая карта по умолчанию\n"
+
+#~ msgid "<b>Search somebody</b>"
+#~ msgstr "<b>Поиск</b>"
+
+#~ msgid "Add to my list"
+#~ msgstr "Добавить в список"
+
+#~ msgid "Search contacts in directory"
+#~ msgstr "Поиск контактов в директории"
+
+#~ msgid "Linphone"
+#~ msgstr "Linphone"
+
+#~ msgid "Please wait"
+#~ msgstr "Подождите"
+
+#~ 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 "Одновременные вызовы пока не поддерживается!"
+
 #~ msgid "gtk-go-down"
 #~ msgstr "Вниз"
 
@@ -1588,18 +1575,12 @@ msgstr ""
 #~ "Пользователь не доступен в данный момент, но\n"
 #~ "приглашает Вас пообщаться на альтернативном ресурсе:"
 
-#~ msgid "<b>Terminate call</b>"
-#~ msgstr "<b>Завершить вызов</b>"
-
 #~ msgid "Digits"
 #~ msgstr "Цифры"
 
 #~ msgid "Main view"
 #~ msgstr "Главное окно"
 
-#~ msgid "Show current call"
-#~ msgstr "Показать текущий звонок"
-
 #~ msgid "No nat/firewall address supplied !"
 #~ msgstr "NAT/firewall адрес не установлен !"
 
@@ -1694,13 +1675,6 @@ msgstr ""
 #~ msgid "Proxy to use:"
 #~ msgstr "Какой узел использовать:"
 
-#~ msgid ""
-#~ "Call or\n"
-#~ "answer"
-#~ msgstr ""
-#~ "Позвонить\n"
-#~ "или ответить"
-
 #~ msgid ""
 #~ "Hangup\n"
 #~ "or refuse"
@@ -1927,9 +1901,6 @@ msgstr ""
 #~ msgid "Clear all stored authentication information (username,password...)"
 #~ msgstr "Удалить всю информацию аунтефикации (логин, пароль...)"
 
-#~ msgid "Authentication information"
-#~ msgstr "Информация аунтефикации"
-
 #~ msgid "SIP"
 #~ msgstr "SIP"
 
diff --git a/po/sv.po b/po/sv.po
index cb09753005aa85dd4f31080866ba045fafe85122..d91ce8c7736628c94cd3a470efcf064659140c90 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,42 +7,42 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 17:16+0200\n"
+"POT-Creation-Date: 2011-02-07 10:59+0100\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../gtk-glade/support.c:49 ../gtk-glade/support.c:73
-#: ../gtk-glade/support.c:102
+#: ../gtk/support.c:49 ../gtk/support.c:73 ../gtk/support.c:102
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "Kunde inte hitta pixmap filen: %s"
 
-#: ../gtk-glade/chat.c:27
+#: ../gtk/chat.c:27
 #, c-format
 msgid "Chat with %s"
 msgstr "Chatta med %s"
 
-#: ../gtk-glade/main.c:94
+#: ../gtk/main.c:74
 msgid "log to stdout some debug information while running."
 msgstr "skriv loggning information under kĂśrning"
 
-#: ../gtk-glade/main.c:101
+#: ../gtk/main.c:81
 msgid "Start only in the system tray, do not show the main interface."
 msgstr "Starta ikonifierat, visa inte huvudfĂśnstret"
 
-#: ../gtk-glade/main.c:108
+#: ../gtk/main.c:88
 msgid "address to call right now"
 msgstr "Samtalsmottagare"
 
-#: ../gtk-glade/main.c:115
+#: ../gtk/main.c:95
 msgid "if set automatically answer incoming calls"
 msgstr "Om pĂĽ, besvara automatisk alla inkommande samtal"
 
-#: ../gtk-glade/main.c:123
+#: ../gtk/main.c:103
 msgid ""
 "Specifiy a working directory (should be the base of the installation, eg: c:"
 "\\Program Files\\Linphone)"
@@ -50,17 +50,12 @@ msgstr ""
 "Välj en arbetskatalog som ska vara basen fÜr installationen, süsom C:"
 "\\Program\\Linphone"
 
-#: ../gtk-glade/main.c:402
+#: ../gtk/main.c:479
 #, c-format
 msgid "Call with %s"
 msgstr "Samtal med %s"
 
-#: ../gtk-glade/main.c:720
-#, c-format
-msgid "Incoming call from %s"
-msgstr "Inkommande samtal frĂĽn %s"
-
-#: ../gtk-glade/main.c:759
+#: ../gtk/main.c:862
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
@@ -73,7 +68,7 @@ msgstr ""
 "henne till din kontaktlista?\n"
 "Om du svarar nej, personen kommer att vara bannlyst."
 
-#: ../gtk-glade/main.c:837
+#: ../gtk/main.c:940
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
@@ -82,162 +77,161 @@ msgstr ""
 "Mata in ditt lÜsenord fÜr användaren <i>%s</i>\n"
 "vid domänen <i>%s</i>:"
 
-#: ../gtk-glade/main.c:934
+#: ../gtk/main.c:1076
 msgid "Website link"
 msgstr "Webbsajt"
 
-#: ../gtk-glade/main.c:970
+#: ../gtk/main.c:1112
 msgid "Linphone - a video internet phone"
 msgstr "Linphone - en video Internet telefon"
 
-#: ../gtk-glade/main.c:989
+#: ../gtk/main.c:1131
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (Default)"
 
-#: ../gtk-glade/main.c:1221
+#: ../gtk/main.c:1382
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
 msgstr ""
 
-#: ../gtk-glade/main.c:1275
+#: ../gtk/main.c:1441
 msgid "A free SIP video-phone"
 msgstr "En gratis SIP video-telefon"
 
-#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:258
-#: ../gtk-glade/contact.glade.h:3
+#: ../gtk/friendlist.c:192 ../gtk/propertybox.c:271
 msgid "Name"
 msgstr "Namn"
 
-#: ../gtk-glade/friendlist.c:205
+#: ../gtk/friendlist.c:205
 msgid "Presence status"
 msgstr "Närvarostatus"
 
-#: ../gtk-glade/friendlist.c:242
+#: ../gtk/friendlist.c:242
 #, c-format
 msgid "Search in %s directory"
 msgstr "SĂśk i %s katalogen"
 
-#: ../gtk-glade/friendlist.c:450
+#: ../gtk/friendlist.c:450
 msgid "Invalid sip contact !"
 msgstr "ogiltig SIP kontakt!"
 
-#: ../gtk-glade/friendlist.c:492
+#: ../gtk/friendlist.c:495
 #, c-format
 msgid "Call %s"
 msgstr "Ringer %s"
 
-#: ../gtk-glade/friendlist.c:493
+#: ../gtk/friendlist.c:496
 #, c-format
 msgid "Send text to %s"
 msgstr "Skicka text till %s"
 
-#: ../gtk-glade/friendlist.c:494
+#: ../gtk/friendlist.c:497
 #, c-format
 msgid "Edit contact '%s'"
 msgstr "Ändra kontakt '%s'"
 
-#: ../gtk-glade/friendlist.c:495
+#: ../gtk/friendlist.c:498
 #, c-format
 msgid "Delete contact '%s'"
 msgstr "Ta bort kontakt '%s'"
 
-#: ../gtk-glade/friendlist.c:537
+#: ../gtk/friendlist.c:540
 #, c-format
 msgid "Add new contact from %s directory"
 msgstr "Lägg till kontakt ifrün %s katalogen"
 
-#: ../gtk-glade/propertybox.c:264
+#: ../gtk/propertybox.c:277
 msgid "Rate (Hz)"
 msgstr "Frekvens (Hz)"
 
-#: ../gtk-glade/propertybox.c:270
+#: ../gtk/propertybox.c:283
 msgid "Status"
 msgstr "Status"
 
-#: ../gtk-glade/propertybox.c:276
+#: ../gtk/propertybox.c:289
 msgid "Min bitrate (kbit/s)"
 msgstr "Min. datahastighet (kbit/s)"
 
-#: ../gtk-glade/propertybox.c:283
+#: ../gtk/propertybox.c:296
 msgid "Parameters"
 msgstr "Parametrar"
 
-#: ../gtk-glade/propertybox.c:312 ../gtk-glade/propertybox.c:451
+#: ../gtk/propertybox.c:325 ../gtk/propertybox.c:464
 msgid "Enabled"
 msgstr "PĂĽ"
 
-#: ../gtk-glade/propertybox.c:313 ../gtk-glade/propertybox.c:451
+#: ../gtk/propertybox.c:326 ../gtk/propertybox.c:464
 msgid "Disabled"
 msgstr "Av"
 
-#: ../gtk-glade/propertybox.c:496
+#: ../gtk/propertybox.c:509
 msgid "Account"
 msgstr "Konto"
 
-#: ../gtk-glade/propertybox.c:636
+#: ../gtk/propertybox.c:649
 msgid "English"
 msgstr "Engelska"
 
-#: ../gtk-glade/propertybox.c:637
+#: ../gtk/propertybox.c:650
 msgid "French"
 msgstr "Fransk"
 
-#: ../gtk-glade/propertybox.c:638
+#: ../gtk/propertybox.c:651
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ../gtk-glade/propertybox.c:639
+#: ../gtk/propertybox.c:652
 msgid "Italian"
 msgstr "Italiensk"
 
-#: ../gtk-glade/propertybox.c:640
+#: ../gtk/propertybox.c:653
 msgid "Spanish"
 msgstr "Spanska"
 
-#: ../gtk-glade/propertybox.c:641
+#: ../gtk/propertybox.c:654
 msgid "Brazilian Portugese"
 msgstr "Portugisiska"
 
-#: ../gtk-glade/propertybox.c:642
+#: ../gtk/propertybox.c:655
 msgid "Polish"
 msgstr "Polska"
 
-#: ../gtk-glade/propertybox.c:643
+#: ../gtk/propertybox.c:656
 msgid "German"
 msgstr "Tyska"
 
-#: ../gtk-glade/propertybox.c:644
+#: ../gtk/propertybox.c:657
 msgid "Russian"
 msgstr "Ryska"
 
-#: ../gtk-glade/propertybox.c:645
+#: ../gtk/propertybox.c:658
 msgid "Japanese"
 msgstr "Japanska"
 
-#: ../gtk-glade/propertybox.c:646
+#: ../gtk/propertybox.c:659
 msgid "Dutch"
 msgstr "Nederländksa"
 
-#: ../gtk-glade/propertybox.c:647
+#: ../gtk/propertybox.c:660
 msgid "Hungarian"
 msgstr "Hungerska"
 
-#: ../gtk-glade/propertybox.c:648
+#: ../gtk/propertybox.c:661
 msgid "Czech"
 msgstr "Tjekiska"
 
-#: ../gtk-glade/propertybox.c:649
+#: ../gtk/propertybox.c:662
 msgid "Chinese"
 msgstr "Kinesiska"
 
-#: ../gtk-glade/propertybox.c:706
+#: ../gtk/propertybox.c:719
 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-glade/update.c:80
+#: ../gtk/update.c:80
 #, c-format
 msgid ""
 "A more recent version is availalble from %s.\n"
@@ -246,38 +240,38 @@ msgstr ""
 "En nyare version är tillgänglig pü %s.\n"
 "Vill du Ăśppna en browser fĂśr att ladda ner den?"
 
-#: ../gtk-glade/update.c:91
+#: ../gtk/update.c:91
 msgid "You are running the lastest version."
 msgstr "Du kĂśr den sensaste versionen."
 
-#: ../gtk-glade/buddylookup.c:85
+#: ../gtk/buddylookup.c:85
 msgid "Firstname, Lastname"
 msgstr "FĂśrnamn, Efternamn"
 
-#: ../gtk-glade/buddylookup.c:160
+#: ../gtk/buddylookup.c:160
 msgid "Error communicating with server."
 msgstr "Error med fĂśrbindelsen till servern."
 
-#: ../gtk-glade/buddylookup.c:164
+#: ../gtk/buddylookup.c:164
 msgid "Connecting..."
 msgstr "Kontaktar"
 
-#: ../gtk-glade/buddylookup.c:168
+#: ../gtk/buddylookup.c:168
 msgid "Connected"
 msgstr "Kopplad"
 
-#: ../gtk-glade/buddylookup.c:172
+#: ../gtk/buddylookup.c:172
 msgid "Receiving data..."
 msgstr "Tar emot data..."
 
-#: ../gtk-glade/buddylookup.c:180
+#: ../gtk/buddylookup.c:180
 #, c-format
 msgid "Found %i contact"
 msgid_plural "Found %i contacts"
 msgstr[0] "Hittat kontakt %i"
 msgstr[1] "Hittat kontakt %i"
 
-#: ../gtk-glade/setupwizard.c:25
+#: ../gtk/setupwizard.c:25
 msgid ""
 "Welcome !\n"
 "This assistant will help you to use a SIP account for your calls."
@@ -285,750 +279,162 @@ msgstr ""
 "Välkommen!\n"
 "Assistenten kommer att hjälpa dig använda ett SIP konto fÜr dina samtal:"
 
-#: ../gtk-glade/setupwizard.c:34
+#: ../gtk/setupwizard.c:34
 msgid "Create an account by choosing a username"
 msgstr "Skapa ett konto genom att välja ett användarnamn"
 
-#: ../gtk-glade/setupwizard.c:35
+#: ../gtk/setupwizard.c:35
 msgid "I have already an account and just want to use it"
 msgstr "Jag har redan ett konto och vill bara använda det."
 
-#: ../gtk-glade/setupwizard.c:53
+#: ../gtk/setupwizard.c:53
 msgid "Please choose a username:"
 msgstr "Välj ett användarnamn:"
 
-#: ../gtk-glade/setupwizard.c:54
+#: ../gtk/setupwizard.c:54
 msgid "Username:"
 msgstr "Användarnamn:"
 
-#: ../gtk-glade/setupwizard.c:92
+#: ../gtk/setupwizard.c:92
 #, c-format
 msgid "Checking if '%s' is available..."
 msgstr "Verifierar om '%s' är tillgänglig..."
 
-#: ../gtk-glade/setupwizard.c:97 ../gtk-glade/setupwizard.c:164
+#: ../gtk/setupwizard.c:97 ../gtk/setupwizard.c:164
 msgid "Please wait..."
 msgstr "Var god drĂśj..."
 
-#: ../gtk-glade/setupwizard.c:101
+#: ../gtk/setupwizard.c:101
 msgid "Sorry this username already exists. Please try a new one."
 msgstr "Användarnamnet finns redan, fÜrsÜk med ett nytt namn."
 
-#: ../gtk-glade/setupwizard.c:103 ../gtk-glade/setupwizard.c:168
+#: ../gtk/setupwizard.c:103 ../gtk/setupwizard.c:168
 msgid "Ok !"
 msgstr "Ok !"
 
-#: ../gtk-glade/setupwizard.c:106 ../gtk-glade/setupwizard.c:171
+#: ../gtk/setupwizard.c:106 ../gtk/setupwizard.c:171
 msgid "Communication problem, please try again later."
 msgstr "Kommunikationsproblem, prova igen senare."
 
-#: ../gtk-glade/setupwizard.c:134
+#: ../gtk/setupwizard.c:134
 msgid "Thank you. Your account is now configured and ready for use."
 msgstr "Tack. Ditt konto är nu konfigurerad och färdig att användas."
 
-#: ../gtk-glade/setupwizard.c:228
+#: ../gtk/setupwizard.c:228
 msgid "Welcome to the account setup assistant"
 msgstr "Välkommen till kontoinstallationsassistenten"
 
-#: ../gtk-glade/setupwizard.c:232
+#: ../gtk/setupwizard.c:232
 msgid "Account setup assistant"
 msgstr "Kontoinstallationsassistenten"
 
-#: ../gtk-glade/setupwizard.c:236
+#: ../gtk/setupwizard.c:236
 msgid "Choosing a username"
 msgstr "Välj ditt användarnamn"
 
-#: ../gtk-glade/setupwizard.c:240
+#: ../gtk/setupwizard.c:240
 msgid "Verifying"
 msgstr "Verifierar"
 
-#: ../gtk-glade/setupwizard.c:244
+#: ../gtk/setupwizard.c:244
 msgid "Confirmation"
 msgstr "Bekräftelse"
 
-#: ../gtk-glade/setupwizard.c:249
+#: ../gtk/setupwizard.c:249
 msgid "Creating your account"
 msgstr "Skapar ditt konto"
 
-#: ../gtk-glade/setupwizard.c:253
+#: ../gtk/setupwizard.c:253
 msgid "Now ready !"
 msgstr "Klar nu!"
 
-#: ../gtk-glade/incall_view.c:113
+#: ../gtk/incall_view.c:113
+msgid "Transfer"
+msgstr ""
+
+#: ../gtk/incall_view.c:187
 msgid "<b>Calling...</b>"
 msgstr "<b>Ringer...</b>"
 
-#: ../gtk-glade/incall_view.c:116 ../gtk-glade/incall_view.c:138
+#: ../gtk/incall_view.c:190 ../gtk/incall_view.c:246
 msgid "00::00::00"
 msgstr "00:00:00"
 
-#: ../gtk-glade/incall_view.c:136
-msgid "<b>In call with</b>"
+#: ../gtk/incall_view.c:206
+#, fuzzy
+msgid "<b>Incoming call</b>"
+msgstr "Inkommande samtal"
+
+#: ../gtk/incall_view.c:216
+msgid ""
+"Pause all calls\n"
+"and answer"
+msgstr ""
+
+#: ../gtk/incall_view.c:217
+msgid "Answer"
+msgstr ""
+
+#: ../gtk/incall_view.c:244
+#, fuzzy
+msgid "<b>In call</b>"
 msgstr "<b>I samtal med</b>"
 
-#: ../gtk-glade/incall_view.c:154
+#: ../gtk/incall_view.c:260
+#, fuzzy
+msgid "<b>Paused call</b>"
+msgstr "<b>Lägg pü</b>"
+
+#: ../gtk/incall_view.c:272
 #, c-format
 msgid "%02i::%02i::%02i"
 msgstr "%02i:%02i:%02i"
 
-#: ../gtk-glade/incall_view.c:170
+#: ../gtk/incall_view.c:288
 msgid "<b>Call ended.</b>"
 msgstr "<b>Samtalet slut.</b>"
 
-#: ../gtk-glade/incall_view.c:188
+#: ../gtk/incall_view.c:309
 msgid "Unmute"
 msgstr "Mikrofon pĂĽ"
 
-#: ../gtk-glade/incall_view.c:195 ../gtk-glade/main.glade.h:43
+#: ../gtk/incall_view.c:316
 msgid "Mute"
 msgstr "Mikrofon av"
 
-#: ../gtk-glade/loginframe.c:83
-#, c-format
-msgid "Please enter login information for %s"
-msgstr "Mata in ditt lÜsenord fÜr domänen %s:"
-
-#: ../gtk-glade/main.glade.h:1
-msgid "#"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:2
-msgid "*"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:3
-msgid "0"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:4
-msgid "1"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:5
-msgid "2"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:6
-msgid "3"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:7
-msgid "4"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:8
-msgid "5"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:9
-msgid "6"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:10
-msgid "7"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:11
-msgid "8"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:12
-msgid "9"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:13
-msgid "<b>Add contacts from directory</b>"
-msgstr "<b>Lägg till kontakt ifrün katalogen</b>"
-
-#: ../gtk-glade/main.glade.h:14
-msgid "<b>Contact list</b>"
-msgstr "<b>Kontaktlista</b>"
-
-#: ../gtk-glade/main.glade.h:15
-msgid "<b>Welcome !</b>"
-msgstr "<b>Välkommen!</b>"
-
-#: ../gtk-glade/main.glade.h:16
-msgid "A"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:17
-msgid ""
-"ADSL\n"
-"Fiber Channel"
-msgstr ""
-"ADSL\n"
-"Fiber"
-
-#: ../gtk-glade/main.glade.h:19
-msgid ""
-"All users\n"
-"Online users"
-msgstr ""
-"Alla användare\n"
-"Online användare"
-
-#: ../gtk-glade/main.glade.h:21
-msgid "Assistant"
-msgstr "Assistent"
-
-#: ../gtk-glade/main.glade.h:22
-msgid "Audio & Video"
-msgstr "Audio & Video"
-
-#: ../gtk-glade/main.glade.h:23
-msgid "Audio only"
-msgstr "Enbart audio"
-
-#: ../gtk-glade/main.glade.h:24
-msgid "Automatically log me in"
-msgstr "Logga mig automatiskt"
-
-#: ../gtk-glade/main.glade.h:25
-msgid "B"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:26 ../gtk-glade/parameters.glade.h:21
-msgid "C"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:27
-#, fuzzy
-msgid "Call Details"
-msgstr "Ringer %s"
-
-#: ../gtk-glade/main.glade.h:28 ../gtk-glade/call_logs.glade.h:1
-msgid "Call history"
-msgstr "Samtalshistorik"
-
-#: ../gtk-glade/main.glade.h:29
-msgid "Check for updates"
-msgstr "Letar efter uppdateringar"
-
-#: ../gtk-glade/main.glade.h:30
-#, fuzzy
-msgid "Contacts"
-msgstr "Kontaktar"
-
-#: ../gtk-glade/main.glade.h:31
-msgid "D"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:32
-msgid "Default"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:33
-msgid "Duration"
-msgstr "FĂśrlopp"
-
-#: ../gtk-glade/main.glade.h:34
-msgid "Duration:"
-msgstr "FĂśrlopp:"
-
-#: ../gtk-glade/main.glade.h:35
-msgid "Enable self-view"
-msgstr "Själv bild"
-
-#: ../gtk-glade/main.glade.h:36
-msgid "Enter username, phone number, or full sip address"
-msgstr "Mata in användarnamn, telefonnummer eller SIP adress"
-
-#: ../gtk-glade/main.glade.h:37
-msgid "Homepage"
-msgstr "Hemsidan"
-
-#: ../gtk-glade/main.glade.h:38
-msgid "In call"
-msgstr "I samtal"
-
-#: ../gtk-glade/main.glade.h:39
-msgid "Internet connection:"
-msgstr "Internet fĂśrbindelse:"
-
-#: ../gtk-glade/main.glade.h:40
-msgid "Keypad"
-msgstr ""
-
-#: ../gtk-glade/main.glade.h:41
-msgid "Login information"
-msgstr "Login information"
-
-#: ../gtk-glade/main.glade.h:42
-msgid "Lookup:"
-msgstr "SĂśk:"
-
-#: ../gtk-glade/main.glade.h:44
-msgid "My current identity:"
-msgstr "Min nuvarande identitet"
-
-#: ../gtk-glade/main.glade.h:45
-msgid "Password"
-msgstr "LĂśsenord"
-
-#: ../gtk-glade/main.glade.h:46
-msgid "SIP address or phone number:"
-msgstr "Användarnamn"
-
-#: ../gtk-glade/main.glade.h:47
-msgid "Search"
-msgstr "SĂśk"
-
-#: ../gtk-glade/main.glade.h:48
-msgid "Show debug messages"
-msgstr "Visa debugfĂśnstret"
-
-#: ../gtk-glade/main.glade.h:49
-msgid "Start call"
-msgstr "Ring"
-
-#: ../gtk-glade/main.glade.h:50
-msgid "Terminate call"
-msgstr "Lägg pü"
-
-#: ../gtk-glade/main.glade.h:51
-msgid "Username"
-msgstr "Användarnamn"
-
-#: ../gtk-glade/main.glade.h:52
-msgid "_Linphone"
-msgstr "_inphone"
-
-#: ../gtk-glade/main.glade.h:53
-msgid "_Modes"
-msgstr "_Media"
-
-#: ../gtk-glade/main.glade.h:54
-msgid "in"
-msgstr "i"
-
-#: ../gtk-glade/main.glade.h:55
-msgid "label"
-msgstr "etikett"
-
-#: ../gtk-glade/about.glade.h:1
-msgid "About linphone"
-msgstr "ApropĂĽ linphone"
-
-#: ../gtk-glade/about.glade.h:2
-msgid "An internet video phone using the standard SIP (rfc3261) protocol."
-msgstr "En Internet video telefon baserat pĂĽ SIP protokoll."
-
-#: ../gtk-glade/about.glade.h:3
-msgid "Created by Simon Morlat\n"
-msgstr "Skapad av Simon Morlat\n"
-
-#: ../gtk-glade/about.glade.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"
-msgstr ""
-
-#: ../gtk-glade/contact.glade.h:1
-msgid "<b>Contact information</b>"
-msgstr "<b>Kontakt information</b>"
-
-#: ../gtk-glade/contact.glade.h:2
-msgid "Allow this contact to see my presence status"
-msgstr "Tillüt den här kontakten att se min närvarostatus"
-
-#: ../gtk-glade/contact.glade.h:4
-msgid "SIP Address"
-msgstr "SIP Adress"
-
-#: ../gtk-glade/contact.glade.h:5
-msgid "Show this contact presence status"
-msgstr "Visa kontaktens närvarostatus"
-
-#: ../gtk-glade/contact.glade.h:6 ../gtk-glade/password.glade.h:5
-#: ../gtk-glade/sip_account.glade.h:9
-msgid "gtk-cancel"
+#: ../gtk/incall_view.c:340
+msgid "Resume"
 msgstr ""
 
-#: ../gtk-glade/contact.glade.h:7 ../gtk-glade/password.glade.h:6
-#: ../gtk-glade/sip_account.glade.h:10
-msgid "gtk-ok"
+#: ../gtk/incall_view.c:347
+msgid "Pause"
 msgstr ""
 
-#: ../gtk-glade/log.glade.h:1
-msgid "Linphone debug window"
-msgstr "Linphone debug fĂśnster"
-
-#: ../gtk-glade/log.glade.h:2 ../gtk-glade/call_logs.glade.h:2
-#: ../gtk-glade/chatroom.glade.h:2
-msgid "gtk-close"
-msgstr ""
-
-#: ../gtk-glade/password.glade.h:1
-msgid "Linphone - Authentication required"
-msgstr "Linphone - Autentisering krävs"
-
-#: ../gtk-glade/password.glade.h:2
-msgid "Password:"
-msgstr "LĂśsenord:"
-
-#: ../gtk-glade/password.glade.h:3
-msgid "Please enter the domain password"
-msgstr "Mata in lÜsenordet fÜr domänen"
-
-#: ../gtk-glade/password.glade.h:4
-msgid "UserID"
-msgstr "AnvändarID"
-
-#: ../gtk-glade/sip_account.glade.h:1
-msgid "Configure a SIP account"
-msgstr "Konfigurera ett SIP konto"
-
-#: ../gtk-glade/sip_account.glade.h:2
-msgid "Linphone - Configure a SIP account"
-msgstr "Linphone - Konfigurera ett SIP konto"
-
-#: ../gtk-glade/sip_account.glade.h:3
-msgid "Publish presence information"
-msgstr "Publicera närvaro information"
-
-#: ../gtk-glade/sip_account.glade.h:4
-msgid "Register at startup"
-msgstr "Registrera vid start"
-
-#: ../gtk-glade/sip_account.glade.h:5
-msgid "Registration duration (sec):"
-msgstr "Registreringsfrekvens (sek.):"
-
-#: ../gtk-glade/sip_account.glade.h:6
-msgid "Route (optional):"
-msgstr "Route (tillval):"
-
-#: ../gtk-glade/sip_account.glade.h:7
-msgid "SIP Proxy address:"
-msgstr "SIP Proxy adress:"
-
-#: ../gtk-glade/sip_account.glade.h:8
-msgid "Your SIP identity:"
-msgstr "Din SIP identitet:"
-
-#: ../gtk-glade/sip_account.glade.h:11
-msgid "sip:"
-msgstr "sip:"
-
-#: ../gtk-glade/chatroom.glade.h:1
-msgid "Send"
-msgstr "Skicka"
-
-#: ../gtk-glade/incoming_call.glade.h:1
-msgid "Accept"
-msgstr "Godkänn"
-
-#: ../gtk-glade/incoming_call.glade.h:2
-msgid "Decline"
-msgstr "AvbĂśj"
-
-#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:369
-msgid "Incoming call"
-msgstr "Inkommande samtal"
-
-#: ../gtk-glade/incoming_call.glade.h:4
-msgid "Incoming call from"
-msgstr "Inkommande samtal frĂĽn"
-
-#: ../gtk-glade/incoming_call.glade.h:5
-msgid "Linphone - Incoming call"
-msgstr "Linphone - Inkommande samtal"
-
-#: ../gtk-glade/parameters.glade.h:1
-msgid "0 stands for \"unlimited\""
-msgstr "0 stür fÜr \"utan begränsning\""
-
-#: ../gtk-glade/parameters.glade.h:2
-msgid "<b>Audio</b>"
-msgstr "<b>Audio</b>"
-
-#: ../gtk-glade/parameters.glade.h:3
-msgid "<b>Bandwidth control</b>"
-msgstr "<b>Bandbreddskontroll</b>"
-
-#: ../gtk-glade/parameters.glade.h:4
-msgid "<b>Codecs</b>"
-msgstr "<b>Codecs</b>"
-
-#: ../gtk-glade/parameters.glade.h:5
-msgid "<b>Default identity</b>"
-msgstr "<b>Default identitet</b>"
-
-#: ../gtk-glade/parameters.glade.h:6
-msgid "<b>Language</b>"
-msgstr "<b>SprĂĽk</b>"
-
-#: ../gtk-glade/parameters.glade.h:7
-msgid "<b>Level</b>"
-msgstr "<b>NivĂĽ</b>"
-
-#: ../gtk-glade/parameters.glade.h:8
-msgid "<b>NAT and Firewall</b>"
-msgstr "<b>NAT och Brandvägg</b>"
-
-#: ../gtk-glade/parameters.glade.h:9
-msgid "<b>Ports</b>"
-msgstr "<b>Portar</b>"
-
-#: ../gtk-glade/parameters.glade.h:10
-msgid "<b>Privacy</b>"
-msgstr "<b>Integritet</b>"
-
-#: ../gtk-glade/parameters.glade.h:11
-msgid "<b>Proxy accounts</b>"
-msgstr "<b>Proxy konton</b>"
-
-#: ../gtk-glade/parameters.glade.h:12
-msgid "<b>Transport</b>"
-msgstr "<b>Transport</b>"
-
-#: ../gtk-glade/parameters.glade.h:13
-msgid "<b>Video</b>"
-msgstr "<b>Video</b>"
-
-#: ../gtk-glade/parameters.glade.h:14
-msgid "ALSA special device (optional):"
-msgstr "ALSA speciell enhet (tillval):"
-
-#: ../gtk-glade/parameters.glade.h:15
-msgid "Add"
-msgstr "Lägg till"
-
-#: ../gtk-glade/parameters.glade.h:16
-msgid "Audio RTP/UDP:"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:17
-msgid ""
-"Audio codecs\n"
-"Video codecs"
-msgstr ""
-"Audio codecs\n"
-"Video codecs"
-
-#: ../gtk-glade/parameters.glade.h:19
-msgid "Behind NAT / Firewall (specify gateway IP below)"
-msgstr "Bakom en NAT / brandvägg (specificera gatewap IP adress nedan)"
-
-#: ../gtk-glade/parameters.glade.h:20
-msgid "Behind NAT / Firewall (use STUN to resolve)"
-msgstr "Bakom en NAT / brandvägg (använd STUN fÜr att avgÜra adressen)"
-
-#: ../gtk-glade/parameters.glade.h:22
-msgid "CIF"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:23
-msgid "Capture device:"
-msgstr "Mikrofon enhet:"
-
-#: ../gtk-glade/parameters.glade.h:24
-msgid "Codecs"
-msgstr "Codecs"
-
-#: ../gtk-glade/parameters.glade.h:25
-msgid "Direct connection to the Internet"
-msgstr "Direkt fĂśrbindelse till Internet"
-
-#: ../gtk-glade/parameters.glade.h:26
-msgid "Disable"
-msgstr "Inaktivera"
-
-#: ../gtk-glade/parameters.glade.h:27
-msgid "Done"
-msgstr "Klar"
-
-#: ../gtk-glade/parameters.glade.h:28
-msgid "Download speed limit in Kbit/sec:"
-msgstr "Max downstream bandbreddshastighet i kbit/sek:"
-
-#: ../gtk-glade/parameters.glade.h:29
-msgid "Edit"
-msgstr "Editera"
-
-#: ../gtk-glade/parameters.glade.h:30
-msgid "Enable"
-msgstr "MĂśjliggĂśr"
-
-#: ../gtk-glade/parameters.glade.h:31
-msgid "Enable echo cancellation"
-msgstr "TillĂĽta ekokancellering"
-
-#: ../gtk-glade/parameters.glade.h:32
-msgid "Erase all passwords"
-msgstr "GlĂśm alla lĂśsenord"
-
-#: ../gtk-glade/parameters.glade.h:33
-msgid "Manage SIP Accounts"
-msgstr "Hantera SIP konton"
-
-#: ../gtk-glade/parameters.glade.h:34
-msgid "Multimedia settings"
-msgstr "Multimedia inställningar"
-
-#: ../gtk-glade/parameters.glade.h:35
-msgid "Network settings"
-msgstr "Nätverksinställningar"
-
-#: ../gtk-glade/parameters.glade.h:36
-msgid "Playback device:"
-msgstr "Uppspelningsenhet:"
-
-#: ../gtk-glade/parameters.glade.h:37
-msgid "Prefered video resolution:"
-msgstr "Video upplĂśsning:"
-
-#: ../gtk-glade/parameters.glade.h:38
-msgid "Public IP address:"
-msgstr "Publik IP adress:"
-
-#: ../gtk-glade/parameters.glade.h:39
-msgid ""
-"Register to FONICS\n"
-"virtual network !"
-msgstr ""
-"Registrera hos FONICS\n"
-"virtuella nätverk!"
-
-#: ../gtk-glade/parameters.glade.h:41
-msgid "Remove"
-msgstr "Ta bort"
-
-#: ../gtk-glade/parameters.glade.h:42
-msgid "Ring device:"
-msgstr "Ringning enhet:"
-
-#: ../gtk-glade/parameters.glade.h:43
-msgid "Ring sound:"
-msgstr "Ring signal:"
-
-#: ../gtk-glade/parameters.glade.h:44
-msgid "SIP (UDP):"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:45
-msgid "Send DTMFs as SIP info"
-msgstr "Kicka DTMF koder som SIP info"
-
-#: ../gtk-glade/parameters.glade.h:46
-msgid "Set Maximum Transmission Unit:"
-msgstr "Välj MTU (Maximum Transmission Unit):"
-
-#: ../gtk-glade/parameters.glade.h:47
-msgid "Settings"
-msgstr "Inställningar"
-
-#: ../gtk-glade/parameters.glade.h:48
-msgid "Show advanced settings"
-msgstr "Visa avancerade inställningar"
-
-#: ../gtk-glade/parameters.glade.h:49
-msgid "Stun server:"
-msgstr "STUN server:"
-
-#: ../gtk-glade/parameters.glade.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"
-
-#: ../gtk-glade/parameters.glade.h:51
-msgid "Upload speed limit in Kbit/sec:"
-msgstr "Max upstream bandbreddshastighet i kbit/sek:"
-
-#: ../gtk-glade/parameters.glade.h:52
-msgid "Use IPv6 instead of IPv4"
-msgstr "Använd IPv6 istället av IPv4"
-
-#: ../gtk-glade/parameters.glade.h:53
-msgid "User interface"
-msgstr "Användarinterface"
-
-#: ../gtk-glade/parameters.glade.h:54
-msgid "Video RTP/UDP:"
-msgstr ""
-
-#: ../gtk-glade/parameters.glade.h:55
-msgid "Video input device:"
-msgstr "Video ingĂĽngsenhet:"
-
-#: ../gtk-glade/parameters.glade.h:56
-msgid "Your display name (eg: John Doe):"
-msgstr "Ditt synliga namn, e.g. Kalle Karlsson:"
-
-#: ../gtk-glade/parameters.glade.h:57
-msgid "Your resulting SIP address:"
-msgstr "Din SIP adress:"
-
-#: ../gtk-glade/parameters.glade.h:58
-msgid "Your username:"
-msgstr "Ditt användarnamn:"
-
-#: ../gtk-glade/parameters.glade.h:59
-msgid "a sound card\n"
-msgstr "ett ljud kort\n"
-
-#: ../gtk-glade/parameters.glade.h:61
-msgid "default camera"
-msgstr "default kamera"
-
-#: ../gtk-glade/parameters.glade.h:62
-msgid "default soundcard"
-msgstr "default ljudkort"
-
-#: ../gtk-glade/parameters.glade.h:63
-msgid "default soundcard\n"
-msgstr "default ljudkort\n"
-
-#: ../gtk-glade/buddylookup.glade.h:1
-msgid "<b>Search somebody</b>"
-msgstr "<b>SĂśk efter kontakter</b>"
-
-#: ../gtk-glade/buddylookup.glade.h:2
-msgid "Add to my list"
-msgstr "Lägg till min lista"
-
-#: ../gtk-glade/buddylookup.glade.h:3
-msgid "Search contacts in directory"
-msgstr "SĂśk fĂśr kontakter i katalogen"
-
-#: ../gtk-glade/waiting.glade.h:1
-msgid "Linphone"
-msgstr "Linphone"
-
-#: ../gtk-glade/waiting.glade.h:2
-msgid "Please wait"
-msgstr "Vänta"
+#: ../gtk/loginframe.c:93
+#, c-format
+msgid "Please enter login information for %s"
+msgstr "Mata in ditt lÜsenord fÜr domänen %s:"
 
-#: ../coreapi/linphonecore.c:311
+#: ../coreapi/linphonecore.c:166
 #, 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"
 
-#: ../coreapi/linphonecore.c:357
+#: ../coreapi/linphonecore.c:207
 msgid "aborted"
 msgstr "avbrytade"
 
-#: ../coreapi/linphonecore.c:360
+#: ../coreapi/linphonecore.c:210
 msgid "completed"
 msgstr "avslutade"
 
-#: ../coreapi/linphonecore.c:363
+#: ../coreapi/linphonecore.c:213
 msgid "missed"
 msgstr "missade"
 
-#: ../coreapi/linphonecore.c:368
+#: ../coreapi/linphonecore.c:218
 #, c-format
 msgid ""
 "%s at %s\n"
@@ -1043,11 +449,15 @@ msgstr ""
 "Status: %s\n"
 "Längd: %i min %i sek\n"
 
-#: ../coreapi/linphonecore.c:369
+#: ../coreapi/linphonecore.c:219
+msgid "Incoming call"
+msgstr "Inkommande samtal"
+
+#: ../coreapi/linphonecore.c:219
 msgid "Outgoing call"
 msgstr "UtgĂĽende samtal"
 
-#: ../coreapi/linphonecore.c:626
+#: ../coreapi/linphonecore.c:501
 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"
@@ -1055,23 +465,19 @@ 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."
 
-#: ../coreapi/linphonecore.c:1083
+#: ../coreapi/linphonecore.c:994
 msgid "Ready"
 msgstr "Redo"
 
-#: ../coreapi/linphonecore.c:1513
-msgid "Remote end seems to have disconnected, the call is going to be closed."
-msgstr "Motparten verkar ha avbrutit samtalet, samtalet kommer att avslutas."
-
-#: ../coreapi/linphonecore.c:1725
+#: ../coreapi/linphonecore.c:1768
 msgid "Looking for telephone number destination..."
 msgstr "Leta efter telefonnummer fĂśr destinationen..."
 
-#: ../coreapi/linphonecore.c:1727
+#: ../coreapi/linphonecore.c:1771
 msgid "Could not resolve this number."
 msgstr "Kan inte nĂĽ dett nummer."
 
-#: ../coreapi/linphonecore.c:1771
+#: ../coreapi/linphonecore.c:1815
 msgid ""
 "Could not parse given sip address. A sip url usually looks like sip:"
 "user@domain"
@@ -1079,26 +485,54 @@ msgstr ""
 "Kan inte fĂśrstĂĽ angiven SIP adress. En SIP adress vanligen ser ut som sip:"
 "användare@domänen"
 
-#: ../coreapi/linphonecore.c:1912
+#: ../coreapi/linphonecore.c:1962
 msgid "Contacting"
 msgstr "Kontaktar"
 
-#: ../coreapi/linphonecore.c:1918
-msgid "could not call"
+#: ../coreapi/linphonecore.c:1969
+#, fuzzy
+msgid "Could not call"
 msgstr "Kunde inte ringa"
 
-#: ../coreapi/linphonecore.c:1965
-msgid "Sorry, having multiple simultaneous calls is not supported yet !"
-msgstr "FÜrlüt, men linphone stÜdjer inte flera samtliga samtal än!"
+#: ../coreapi/linphonecore.c:2076
+msgid "Sorry, you have to pause or stop the current call first !"
+msgstr ""
+
+#: ../coreapi/linphonecore.c:2081
+msgid "Sorry, we have reached the maximum number of simultaneous calls"
+msgstr ""
 
-#: ../coreapi/linphonecore.c:2370 ../coreapi/callbacks.c:32
+#: ../coreapi/linphonecore.c:2205
+msgid "Modifying call parameters..."
+msgstr ""
+
+#: ../coreapi/linphonecore.c:2308
 msgid "Connected."
 msgstr "Kopplad"
 
-#: ../coreapi/linphonecore.c:2404
+#: ../coreapi/linphonecore.c:2331
+#, fuzzy
+msgid "Call aborted"
+msgstr "avbrytade"
+
+#: ../coreapi/linphonecore.c:2371
 msgid "Call ended"
 msgstr "Samtalet slut"
 
+#: ../coreapi/linphonecore.c:2453
+#, fuzzy
+msgid "Could not pause the call"
+msgstr "Kunde inte ringa"
+
+#: ../coreapi/linphonecore.c:2457
+#, fuzzy
+msgid "Pausing the current call..."
+msgstr "Nuvarande samtal"
+
+#: ../coreapi/linphonecore.c:2496
+msgid "There is already a call in process, pause or stop it first."
+msgstr ""
+
 #: ../coreapi/misc.c:147
 msgid ""
 "Your computer appears to be using ALSA sound drivers.\n"
@@ -1123,7 +557,7 @@ msgstr ""
 "saknas och linphone behĂśver ha det. Var god exekvera\n"
 "'modprobe snd-mixer-oss' som root fĂśr att ladda in den."
 
-#: ../coreapi/misc.c:497
+#: ../coreapi/misc.c:520
 msgid "Stun lookup in progress..."
 msgstr "STUN uppslagning pĂĽgĂĽr..."
 
@@ -1175,7 +609,7 @@ msgstr "PĂĽgĂĽende"
 msgid "Unknown-bug"
 msgstr "Okänd bug"
 
-#: ../coreapi/proxy.c:176
+#: ../coreapi/proxy.c:187
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
@@ -1183,7 +617,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:182
+#: ../coreapi/proxy.c:193
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
@@ -1191,98 +625,136 @@ 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:621
+#: ../coreapi/proxy.c:670
 #, c-format
 msgid "Could not login as %s"
 msgstr "Kunde inte logga in som %s"
 
-#: ../coreapi/callbacks.c:95
+#: ../coreapi/callbacks.c:170
 #, fuzzy
 msgid "is contacting you"
 msgstr "kontaktar dig."
 
-#: ../coreapi/callbacks.c:96
+#: ../coreapi/callbacks.c:171
 msgid " and asked autoanswer."
 msgstr ""
 
-#: ../coreapi/callbacks.c:96
+#: ../coreapi/callbacks.c:171
 msgid "."
 msgstr ""
 
-#: ../coreapi/callbacks.c:120
+#: ../coreapi/callbacks.c:226
 msgid "Remote ringing."
 msgstr "Ringer hos motparten."
 
-#: ../coreapi/callbacks.c:139
+#: ../coreapi/callbacks.c:251
 msgid "Early media."
 msgstr "Tidig media"
 
-#: ../coreapi/callbacks.c:248
+#: ../coreapi/callbacks.c:289
+#, fuzzy, c-format
+msgid "Call with %s is paused."
+msgstr "Samtal med %s"
+
+#: ../coreapi/callbacks.c:300
+#, c-format
+msgid "Call answered by %s - on hold."
+msgstr ""
+
+#: ../coreapi/callbacks.c:315
+#, fuzzy
+msgid "Call resumed."
+msgstr "Samtalet slut"
+
+#: ../coreapi/callbacks.c:320
+#, c-format
+msgid "Call answered by %s."
+msgstr ""
+
+#: ../coreapi/callbacks.c:381
+msgid "We are being paused..."
+msgstr ""
+
+#: ../coreapi/callbacks.c:385
+msgid "We have been resumed..."
+msgstr ""
+
+#: ../coreapi/callbacks.c:422
 msgid "Call terminated."
 msgstr "Samtalet slut."
 
-#: ../coreapi/callbacks.c:265
+#: ../coreapi/callbacks.c:429
 msgid "User is busy."
 msgstr "Användare upptagen."
 
-#: ../coreapi/callbacks.c:266
+#: ../coreapi/callbacks.c:430
 msgid "User is temporarily unavailable."
 msgstr "Användaren temporärt inte tillgänglig."
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:268
+#: ../coreapi/callbacks.c:432
 msgid "User does not want to be disturbed."
 msgstr "Användaren vill inte bli stÜrd."
 
-#: ../coreapi/callbacks.c:269
+#: ../coreapi/callbacks.c:433
 msgid "Call declined."
 msgstr "Samtalet avbĂśjdes."
 
-#: ../coreapi/callbacks.c:281
+#: ../coreapi/callbacks.c:445
 #, fuzzy
 msgid "No response."
 msgstr "Inget svar inom angiven tid"
 
-#: ../coreapi/callbacks.c:284
+#: ../coreapi/callbacks.c:449
 msgid "Protocol error."
 msgstr ""
 
-#: ../coreapi/callbacks.c:298
+#: ../coreapi/callbacks.c:465
 #, fuzzy
 msgid "Redirected"
 msgstr "Omdirigerat till %s..."
 
-#: ../coreapi/callbacks.c:308
+#: ../coreapi/callbacks.c:475
 msgid "Not found"
 msgstr ""
 
-#: ../coreapi/callbacks.c:318
+#: ../coreapi/callbacks.c:485
 msgid "No common codecs"
 msgstr ""
 
-#: ../coreapi/callbacks.c:324
+#: ../coreapi/callbacks.c:491
 #, fuzzy
 msgid "Call failed."
 msgstr "Samtalet avbĂśjdes."
 
-#: ../coreapi/callbacks.c:374
+#: ../coreapi/callbacks.c:527
+#, fuzzy
+msgid "Authentication failure"
+msgstr "Linphone - Autentisering krävs"
+
+#: ../coreapi/callbacks.c:553
 #, c-format
 msgid "Registration on %s successful."
 msgstr "Registrering hos %s lyckades."
 
-#: ../coreapi/callbacks.c:375
+#: ../coreapi/callbacks.c:554
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "Avregistrering hos %s lyckades."
 
-#: ../coreapi/callbacks.c:383
+#: ../coreapi/callbacks.c:570
+msgid "no response timeout"
+msgstr "Inget svar inom angiven tid"
+
+#: ../coreapi/callbacks.c:573
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "Registrering hos %s mislyckades: %s"
 
-#: ../coreapi/callbacks.c:383
-msgid "no response timeout"
-msgstr "Inget svar inom angiven tid"
+#: ../coreapi/callbacks.c:615
+#, c-format
+msgid "We are transferred to %s"
+msgstr ""
 
 #: ../mediastreamer2/src/alaw.c:144 ../mediastreamer2/src/alaw.c:162
 msgid "ITU-G.711 alaw encoder"
@@ -1292,11 +764,11 @@ msgstr ""
 msgid "ITU-G.711 alaw decoder"
 msgstr ""
 
-#: ../mediastreamer2/src/alsa.c:935
+#: ../mediastreamer2/src/alsa.c:950
 msgid "Alsa sound source"
 msgstr "Alsa ljud ingĂĽng"
 
-#: ../mediastreamer2/src/alsa.c:1039
+#: ../mediastreamer2/src/alsa.c:1054
 msgid "Alsa sound output"
 msgstr "Also ljud utgĂĽng"
 
@@ -1308,15 +780,15 @@ msgstr ""
 msgid "Sound playback filter for MacOS X Audio Queue Service"
 msgstr ""
 
-#: ../mediastreamer2/src/dtmfgen.c:173 ../mediastreamer2/src/dtmfgen.c:191
+#: ../mediastreamer2/src/dtmfgen.c:274 ../mediastreamer2/src/dtmfgen.c:293
 msgid "DTMF generator"
 msgstr "DTMF generare"
 
-#: ../mediastreamer2/src/gsm.c:111 ../mediastreamer2/src/gsm.c:129
+#: ../mediastreamer2/src/gsm.c:120 ../mediastreamer2/src/gsm.c:138
 msgid "The GSM full-rate codec"
 msgstr "HĂśg hastighet GSM codec"
 
-#: ../mediastreamer2/src/gsm.c:178 ../mediastreamer2/src/gsm.c:196
+#: ../mediastreamer2/src/gsm.c:187 ../mediastreamer2/src/gsm.c:205
 msgid "The GSM codec"
 msgstr "GSM codec"
 
@@ -1332,8 +804,8 @@ msgstr ""
 msgid "A filter to make conferencing"
 msgstr "Ett filter fĂśr konferens"
 
-#: ../mediastreamer2/src/msfileplayer.c:295
-#: ../mediastreamer2/src/msfileplayer.c:313
+#: ../mediastreamer2/src/msfileplayer.c:311
+#: ../mediastreamer2/src/msfileplayer.c:329
 msgid "Raw files and wav reader"
 msgstr "Raw filer och WAV läsare"
 
@@ -1347,61 +819,53 @@ 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"
 
-#: ../mediastreamer2/src/msresample.c:221
-#: ../mediastreamer2/src/msresample.c:239
-msgid "frequency resampler"
+#: ../mediastreamer2/src/msresample.c:159
+#: ../mediastreamer2/src/msresample.c:177
+msgid "Audio resampler"
 msgstr ""
 
-#: ../mediastreamer2/src/msrtp.c:358 ../mediastreamer2/src/msrtp.c:376
+#: ../mediastreamer2/src/msrtp.c:369 ../mediastreamer2/src/msrtp.c:387
 msgid "RTP output filter"
 msgstr ""
 
-#: ../mediastreamer2/src/msrtp.c:493 ../mediastreamer2/src/msrtp.c:511
+#: ../mediastreamer2/src/msrtp.c:505 ../mediastreamer2/src/msrtp.c:523
 msgid "RTP input filter"
 msgstr ""
 
-#: ../mediastreamer2/src/msspeex.c:359 ../mediastreamer2/src/msspeex.c:377
-#: ../mediastreamer2/src/msspeex.c:504 ../mediastreamer2/src/msspeex.c:522
+#: ../mediastreamer2/src/msspeex.c:360 ../mediastreamer2/src/msspeex.c:378
+#: ../mediastreamer2/src/msspeex.c:548 ../mediastreamer2/src/msspeex.c:567
 msgid "The free and wonderful speex codec"
 msgstr "Den fria speex codec"
 
-#: ../mediastreamer2/src/msvolume.c:415 ../mediastreamer2/src/msvolume.c:430
+#: ../mediastreamer2/src/msvolume.c:527 ../mediastreamer2/src/msvolume.c:542
 msgid "A filter that controls and measure sound volume"
 msgstr "Ett filter som kontrollerar och mäter ljudvolym"
 
-#: ../mediastreamer2/src/msv4l.c:1011
+#: ../mediastreamer2/src/msv4l.c:1012
 msgid "A video4linux compatible source filter to stream pictures."
 msgstr "En video4linux kompatibel ingĂĽngsfilter fĂśr att strĂśmma bilder"
 
-#: ../mediastreamer2/src/msv4l2.c:470
+#: ../mediastreamer2/src/msv4l2.c:554
 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"
 
-#: ../mediastreamer2/src/nowebcam.c:1836
+#: ../mediastreamer2/src/nowebcam.c:1854
 msgid "A filter that outputs a static image."
 msgstr "En filter med statisk bild"
 
-#: ../mediastreamer2/src/oss.c:567
-msgid "Sound capture filter for OSS drivers"
-msgstr "FĂĽnga ljud med OSS drivrutiner"
-
-#: ../mediastreamer2/src/oss.c:581
-msgid "Sound playback filter for OSS drivers"
-msgstr "Ljud utgĂĽng med OSS drivrutiner"
-
-#: ../mediastreamer2/src/pixconv.c:177 ../mediastreamer2/src/pixconv.c:195
+#: ../mediastreamer2/src/pixconv.c:129 ../mediastreamer2/src/pixconv.c:147
 msgid "A pixel format converter"
 msgstr "En pixel format konverterare"
 
-#: ../mediastreamer2/src/sizeconv.c:204
+#: ../mediastreamer2/src/sizeconv.c:202
 msgid "A video size converter"
 msgstr "En video storlek konverterare"
 
-#: ../mediastreamer2/src/sizeconv.c:222
+#: ../mediastreamer2/src/sizeconv.c:220
 msgid "a small video size converter"
 msgstr "En liten video storlek konverterare"
 
-#: ../mediastreamer2/src/speexec.c:349 ../mediastreamer2/src/speexec.c:367
+#: ../mediastreamer2/src/speexec.c:276 ../mediastreamer2/src/speexec.c:294
 msgid "Echo canceller using speex library"
 msgstr "Echo cancellering med hjälp av speex"
 
@@ -1430,32 +894,32 @@ msgstr ""
 msgid "ITU-G.711 ulaw decoder"
 msgstr ""
 
-#: ../mediastreamer2/src/videodec.c:669 ../mediastreamer2/src/videodec.c:685
-#: ../mediastreamer2/src/videodec.c:768 ../mediastreamer2/src/videodec.c:784
+#: ../mediastreamer2/src/videodec.c:713 ../mediastreamer2/src/videodec.c:729
+#: ../mediastreamer2/src/videodec.c:812 ../mediastreamer2/src/videodec.c:828
 msgid "A H.263 decoder using ffmpeg library"
 msgstr "En h.263 decoder via ffmpeg"
 
-#: ../mediastreamer2/src/videodec.c:702
+#: ../mediastreamer2/src/videodec.c:746
 msgid "A MPEG4 decoder using ffmpeg library"
 msgstr "En MPEG4 decoder via ffmpeg"
 
-#: ../mediastreamer2/src/videodec.c:718
+#: ../mediastreamer2/src/videodec.c:762
 msgid "A RTP/JPEG decoder using ffmpeg library"
 msgstr "En RTP/JPEG decoder via ffmpeg"
 
-#: ../mediastreamer2/src/videodec.c:734
+#: ../mediastreamer2/src/videodec.c:778
 msgid "A MJPEG decoder using ffmpeg library"
 msgstr "En MJPEG decode via ffmpeg"
 
-#: ../mediastreamer2/src/videodec.c:750
+#: ../mediastreamer2/src/videodec.c:794
 msgid "A snow decoder using ffmpeg library"
 msgstr "En snow decoder via ffmpeg"
 
-#: ../mediastreamer2/src/videoenc.c:861 ../mediastreamer2/src/videoenc.c:943
+#: ../mediastreamer2/src/videoenc.c:908 ../mediastreamer2/src/videoenc.c:990
 msgid "A video H.263 encoder using ffmpeg library."
 msgstr "En video h.263 encoder via ffmpeg"
 
-#: ../mediastreamer2/src/videoenc.c:877
+#: ../mediastreamer2/src/videoenc.c:924
 msgid ""
 "A video H.263 encoder using ffmpeg library. It is compliant with old RFC2190 "
 "spec."
@@ -1463,26 +927,26 @@ msgstr ""
 "En video h.263 encoder via ffmpeg, kompatibel med den gamla RFC2190 "
 "specificationen."
 
-#: ../mediastreamer2/src/videoenc.c:893 ../mediastreamer2/src/videoenc.c:975
+#: ../mediastreamer2/src/videoenc.c:940 ../mediastreamer2/src/videoenc.c:1022
 msgid "A video MPEG4 encoder using ffmpeg library."
 msgstr "En video MPEG4 encoder via ffmpeg"
 
-#: ../mediastreamer2/src/videoenc.c:909
+#: ../mediastreamer2/src/videoenc.c:956
 msgid "A video snow encoder using ffmpeg library."
 msgstr "En video snow encoder via ffmpeg"
 
-#: ../mediastreamer2/src/videoenc.c:925
+#: ../mediastreamer2/src/videoenc.c:972
 msgid "A RTP/MJPEG encoder using ffmpeg library."
 msgstr "En RTP/MJPEG encoder via ffmpeg"
 
-#: ../mediastreamer2/src/videoenc.c:959
+#: ../mediastreamer2/src/videoenc.c:1006
 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."
 
-#: ../mediastreamer2/src/videoenc.c:991
+#: ../mediastreamer2/src/videoenc.c:1038
 msgid ""
 "The snow codec is royalty-free and is open-source. \n"
 "It uses innovative techniques that makes it one of most promising video "
@@ -1496,12 +960,13 @@ msgstr ""
 "Dock, den är under utveckling och kompatibiliteten mellan versioner kan inte "
 "garanteras."
 
-#: ../mediastreamer2/src/videoenc.c:1011
+#: ../mediastreamer2/src/videoenc.c:1058
 msgid "A MJPEG encoder using ffmpeg library."
 msgstr "En MJPEG encoder via ffmpeg"
 
-#: ../mediastreamer2/src/videoout.c:1812 ../mediastreamer2/src/videoout.c:1830
-msgid "A generic video display"
+#: ../mediastreamer2/src/videoout.c:933
+#, fuzzy
+msgid "A SDL-based video display"
 msgstr "En generisk video utgĂĽng"
 
 #: ../mediastreamer2/src/wincevideods.c:969
@@ -1528,10 +993,461 @@ msgstr ""
 msgid "Parametric sound equalizer."
 msgstr ""
 
-#: ../mediastreamer2/src/msdscap-mingw.cc:1003
+#: ../mediastreamer2/src/msdscap-mingw.cc:1038
 msgid "A webcam grabber based on directshow."
 msgstr ""
 
+#: ../mediastreamer2/src/drawdib-display.c:552
+#: ../mediastreamer2/src/drawdib-display.c:570
+#, fuzzy
+msgid "A video display based on windows DrawDib api"
+msgstr "En video utgĂĽngsfĂśnster med SDL"
+
+#: ../mediastreamer2/src/audiomixer.c:192
+#: ../mediastreamer2/src/audiomixer.c:211
+#, 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"
+
+#: ../mediastreamer2/src/chanadapt.c:110 ../mediastreamer2/src/chanadapt.c:128
+#, fuzzy
+msgid "A filter that converts from mono to stereo and vice versa."
+msgstr "Ett filter som kontrollerar och mäter ljudvolym"
+
+#: ../mediastreamer2/src/itc.c:97 ../mediastreamer2/src/itc.c:115
+#: ../mediastreamer2/src/itc.c:197 ../mediastreamer2/src/itc.c:215
+#, fuzzy
+msgid "Inter ticker communication filter."
+msgstr "Error med fĂśrbindelsen till servern."
+
+#: ../mediastreamer2/src/extdisplay.c:62 ../mediastreamer2/src/extdisplay.c:79
+msgid "A display filter sending the buffers to draw to the upper layer"
+msgstr ""
+
+#: ../mediastreamer2/src/msiounit.c:619
+#, fuzzy
+msgid "Sound capture filter for MacOS X Audio Unit Service"
+msgstr "FĂĽnga ljud med OSS drivrutiner"
+
+#: ../mediastreamer2/src/msiounit.c:633
+#, fuzzy
+msgid "Sound playback filter for MacOS X Audio Unit Service"
+msgstr "Ljud utgĂĽng med OSS drivrutiner"
+
+#: ../mediastreamer2/src/x11video.c:562
+#, fuzzy
+msgid "A video display using X11+Xv"
+msgstr "En video utgĂĽngsfĂśnster med SDL"
+
+#. .id=
+#. .name=
+#. .text=
+#: ../mediastreamer2/src/msandroid.cpp:370
+#, fuzzy
+msgid "Sound capture filter for Android"
+msgstr "FĂĽnga ljud med OSS drivrutiner"
+
+#. .id=
+#. .name=
+#. .text=
+#: ../mediastreamer2/src/msandroid.cpp:667
+#, fuzzy
+msgid "Sound playback filter for Android"
+msgstr "Ljud utgĂĽng med OSS drivrutiner"
+
+#: ../mediastreamer2/src/msandroidvideo.cpp:134
+#, fuzzy
+msgid "A filter that captures Android video."
+msgstr "Ett filter som kontrollerar och mäter ljudvolym"
+
+#~ msgid "Incoming call from %s"
+#~ msgstr "Inkommande samtal frĂĽn %s"
+
+#~ msgid "<b>Add contacts from directory</b>"
+#~ msgstr "<b>Lägg till kontakt ifrün katalogen</b>"
+
+#~ msgid "<b>Contact list</b>"
+#~ msgstr "<b>Kontaktlista</b>"
+
+#~ msgid "<b>Welcome !</b>"
+#~ msgstr "<b>Välkommen!</b>"
+
+#~ msgid ""
+#~ "ADSL\n"
+#~ "Fiber Channel"
+#~ msgstr ""
+#~ "ADSL\n"
+#~ "Fiber"
+
+#~ msgid ""
+#~ "All users\n"
+#~ "Online users"
+#~ msgstr ""
+#~ "Alla användare\n"
+#~ "Online användare"
+
+#~ msgid "Assistant"
+#~ msgstr "Assistent"
+
+#~ msgid "Audio & Video"
+#~ msgstr "Audio & Video"
+
+#~ msgid "Audio only"
+#~ msgstr "Enbart audio"
+
+#~ msgid "Automatically log me in"
+#~ msgstr "Logga mig automatiskt"
+
+#, fuzzy
+#~ msgid "Call Details"
+#~ msgstr "Ringer %s"
+
+#~ msgid "Call history"
+#~ msgstr "Samtalshistorik"
+
+#~ msgid "Check for updates"
+#~ msgstr "Letar efter uppdateringar"
+
+#, fuzzy
+#~ msgid "Contacts"
+#~ msgstr "Kontaktar"
+
+#~ msgid "Duration"
+#~ msgstr "FĂśrlopp"
+
+#~ msgid "Duration:"
+#~ msgstr "FĂśrlopp:"
+
+#~ msgid "Enable self-view"
+#~ msgstr "Själv bild"
+
+#~ msgid "Enter username, phone number, or full sip address"
+#~ msgstr "Mata in användarnamn, telefonnummer eller SIP adress"
+
+#~ msgid "Homepage"
+#~ msgstr "Hemsidan"
+
+#~ msgid "In call"
+#~ msgstr "I samtal"
+
+#~ msgid "Internet connection:"
+#~ msgstr "Internet fĂśrbindelse:"
+
+#~ msgid "Login information"
+#~ msgstr "Login information"
+
+#~ msgid "Lookup:"
+#~ msgstr "SĂśk:"
+
+#~ msgid "My current identity:"
+#~ msgstr "Min nuvarande identitet"
+
+#~ msgid "Password"
+#~ msgstr "LĂśsenord"
+
+#~ msgid "SIP address or phone number:"
+#~ msgstr "Användarnamn"
+
+#~ msgid "Search"
+#~ msgstr "SĂśk"
+
+#~ msgid "Show debug messages"
+#~ msgstr "Visa debugfĂśnstret"
+
+#~ msgid "Start call"
+#~ msgstr "Ring"
+
+#~ msgid "Terminate call"
+#~ msgstr "Lägg pü"
+
+#~ msgid "Username"
+#~ msgstr "Användarnamn"
+
+#~ msgid "_Linphone"
+#~ msgstr "_inphone"
+
+#~ msgid "_Modes"
+#~ msgstr "_Media"
+
+#~ msgid "in"
+#~ msgstr "i"
+
+#~ msgid "label"
+#~ msgstr "etikett"
+
+#~ msgid "About linphone"
+#~ msgstr "ApropĂĽ linphone"
+
+#~ msgid "An internet video phone using the standard SIP (rfc3261) protocol."
+#~ msgstr "En Internet video telefon baserat pĂĽ SIP protokoll."
+
+#~ msgid "Created by Simon Morlat\n"
+#~ msgstr "Skapad av Simon Morlat\n"
+
+#~ msgid "<b>Contact information</b>"
+#~ msgstr "<b>Kontakt information</b>"
+
+#~ msgid "Allow this contact to see my presence status"
+#~ msgstr "Tillüt den här kontakten att se min närvarostatus"
+
+#~ msgid "SIP Address"
+#~ msgstr "SIP Adress"
+
+#~ msgid "Show this contact presence status"
+#~ msgstr "Visa kontaktens närvarostatus"
+
+#~ msgid "Linphone debug window"
+#~ msgstr "Linphone debug fĂśnster"
+
+#~ msgid "Password:"
+#~ msgstr "LĂśsenord:"
+
+#~ msgid "Please enter the domain password"
+#~ msgstr "Mata in lÜsenordet fÜr domänen"
+
+#~ msgid "UserID"
+#~ msgstr "AnvändarID"
+
+#~ msgid "Configure a SIP account"
+#~ msgstr "Konfigurera ett SIP konto"
+
+#~ msgid "Linphone - Configure a SIP account"
+#~ msgstr "Linphone - Konfigurera ett SIP konto"
+
+#~ msgid "Publish presence information"
+#~ msgstr "Publicera närvaro information"
+
+#~ msgid "Register at startup"
+#~ msgstr "Registrera vid start"
+
+#~ msgid "Registration duration (sec):"
+#~ msgstr "Registreringsfrekvens (sek.):"
+
+#~ msgid "Route (optional):"
+#~ msgstr "Route (tillval):"
+
+#~ msgid "SIP Proxy address:"
+#~ msgstr "SIP Proxy adress:"
+
+#~ msgid "Your SIP identity:"
+#~ msgstr "Din SIP identitet:"
+
+#~ msgid "sip:"
+#~ msgstr "sip:"
+
+#~ msgid "Send"
+#~ msgstr "Skicka"
+
+#~ msgid "Accept"
+#~ msgstr "Godkänn"
+
+#~ msgid "Decline"
+#~ msgstr "AvbĂśj"
+
+#~ msgid "Incoming call from"
+#~ msgstr "Inkommande samtal frĂĽn"
+
+#~ msgid "Linphone - Incoming call"
+#~ msgstr "Linphone - Inkommande samtal"
+
+#~ msgid "0 stands for \"unlimited\""
+#~ msgstr "0 stür fÜr \"utan begränsning\""
+
+#~ msgid "<b>Audio</b>"
+#~ msgstr "<b>Audio</b>"
+
+#~ msgid "<b>Bandwidth control</b>"
+#~ msgstr "<b>Bandbreddskontroll</b>"
+
+#~ msgid "<b>Codecs</b>"
+#~ msgstr "<b>Codecs</b>"
+
+#~ msgid "<b>Default identity</b>"
+#~ msgstr "<b>Default identitet</b>"
+
+#~ msgid "<b>Language</b>"
+#~ msgstr "<b>SprĂĽk</b>"
+
+#~ msgid "<b>Level</b>"
+#~ msgstr "<b>NivĂĽ</b>"
+
+#~ msgid "<b>NAT and Firewall</b>"
+#~ msgstr "<b>NAT och Brandvägg</b>"
+
+#~ msgid "<b>Ports</b>"
+#~ msgstr "<b>Portar</b>"
+
+#~ msgid "<b>Privacy</b>"
+#~ msgstr "<b>Integritet</b>"
+
+#~ msgid "<b>Proxy accounts</b>"
+#~ msgstr "<b>Proxy konton</b>"
+
+#~ msgid "<b>Transport</b>"
+#~ msgstr "<b>Transport</b>"
+
+#~ msgid "<b>Video</b>"
+#~ msgstr "<b>Video</b>"
+
+#~ msgid "ALSA special device (optional):"
+#~ msgstr "ALSA speciell enhet (tillval):"
+
+#~ msgid "Add"
+#~ msgstr "Lägg till"
+
+#~ msgid ""
+#~ "Audio codecs\n"
+#~ "Video codecs"
+#~ msgstr ""
+#~ "Audio codecs\n"
+#~ "Video codecs"
+
+#~ msgid "Behind NAT / Firewall (specify gateway IP below)"
+#~ msgstr "Bakom en NAT / brandvägg (specificera gatewap IP adress nedan)"
+
+#~ msgid "Behind NAT / Firewall (use STUN to resolve)"
+#~ msgstr "Bakom en NAT / brandvägg (använd STUN fÜr att avgÜra adressen)"
+
+#~ msgid "Capture device:"
+#~ msgstr "Mikrofon enhet:"
+
+#~ msgid "Codecs"
+#~ msgstr "Codecs"
+
+#~ msgid "Direct connection to the Internet"
+#~ msgstr "Direkt fĂśrbindelse till Internet"
+
+#~ msgid "Disable"
+#~ msgstr "Inaktivera"
+
+#~ msgid "Done"
+#~ msgstr "Klar"
+
+#~ msgid "Download speed limit in Kbit/sec:"
+#~ msgstr "Max downstream bandbreddshastighet i kbit/sek:"
+
+#~ msgid "Edit"
+#~ msgstr "Editera"
+
+#~ msgid "Enable"
+#~ msgstr "MĂśjliggĂśr"
+
+#~ msgid "Enable echo cancellation"
+#~ msgstr "TillĂĽta ekokancellering"
+
+#~ msgid "Erase all passwords"
+#~ msgstr "GlĂśm alla lĂśsenord"
+
+#~ msgid "Manage SIP Accounts"
+#~ msgstr "Hantera SIP konton"
+
+#~ msgid "Multimedia settings"
+#~ msgstr "Multimedia inställningar"
+
+#~ msgid "Network settings"
+#~ msgstr "Nätverksinställningar"
+
+#~ msgid "Playback device:"
+#~ msgstr "Uppspelningsenhet:"
+
+#~ msgid "Prefered video resolution:"
+#~ msgstr "Video upplĂśsning:"
+
+#~ msgid "Public IP address:"
+#~ msgstr "Publik IP adress:"
+
+#~ msgid ""
+#~ "Register to FONICS\n"
+#~ "virtual network !"
+#~ msgstr ""
+#~ "Registrera hos FONICS\n"
+#~ "virtuella nätverk!"
+
+#~ msgid "Remove"
+#~ msgstr "Ta bort"
+
+#~ msgid "Ring device:"
+#~ msgstr "Ringning enhet:"
+
+#~ msgid "Ring sound:"
+#~ msgstr "Ring signal:"
+
+#~ msgid "Send DTMFs as SIP info"
+#~ msgstr "Kicka DTMF koder som SIP info"
+
+#~ msgid "Set Maximum Transmission Unit:"
+#~ msgstr "Välj MTU (Maximum Transmission Unit):"
+
+#~ msgid "Settings"
+#~ msgstr "Inställningar"
+
+#~ msgid "Show advanced settings"
+#~ msgstr "Visa avancerade inställningar"
+
+#~ msgid "Stun server:"
+#~ msgstr "STUN server:"
+
+#~ 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"
+
+#~ msgid "Upload speed limit in Kbit/sec:"
+#~ msgstr "Max upstream bandbreddshastighet i kbit/sek:"
+
+#~ msgid "Use IPv6 instead of IPv4"
+#~ msgstr "Använd IPv6 istället av IPv4"
+
+#~ msgid "User interface"
+#~ msgstr "Användarinterface"
+
+#~ msgid "Video input device:"
+#~ msgstr "Video ingĂĽngsenhet:"
+
+#~ msgid "Your display name (eg: John Doe):"
+#~ msgstr "Ditt synliga namn, e.g. Kalle Karlsson:"
+
+#~ msgid "Your resulting SIP address:"
+#~ msgstr "Din SIP adress:"
+
+#~ msgid "Your username:"
+#~ msgstr "Ditt användarnamn:"
+
+#~ msgid "a sound card\n"
+#~ msgstr "ett ljud kort\n"
+
+#~ msgid "default camera"
+#~ msgstr "default kamera"
+
+#~ msgid "default soundcard"
+#~ msgstr "default ljudkort"
+
+#~ msgid "default soundcard\n"
+#~ msgstr "default ljudkort\n"
+
+#~ msgid "<b>Search somebody</b>"
+#~ msgstr "<b>SĂśk efter kontakter</b>"
+
+#~ msgid "Add to my list"
+#~ msgstr "Lägg till min lista"
+
+#~ msgid "Search contacts in directory"
+#~ msgstr "SĂśk fĂśr kontakter i katalogen"
+
+#~ msgid "Linphone"
+#~ msgstr "Linphone"
+
+#~ msgid "Please wait"
+#~ msgstr "Vänta"
+
+#~ 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."
 
@@ -1557,21 +1473,15 @@ msgstr ""
 #~ "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 dig\att kontakta "
+#~ "Användaren kan inte nüs fÜr tillfället men han/hon ber digatt kontakta "
 #~ "honom/henna vid fĂśljande resurs:"
 
-#~ msgid "<b>Terminate call</b>"
-#~ msgstr "<b>Lägg pü</b>"
-
 #~ msgid "Digits"
 #~ msgstr "Tangenter"
 
 #~ msgid "Main view"
 #~ msgstr "Huvud vy"
 
-#~ msgid "Show current call"
-#~ msgstr "Nuvarande samtal"
-
 #~ msgid "No nat/firewall address supplied !"
 #~ msgstr "Ingen NAT / brandväggs adress angiven!"
 
@@ -1611,9 +1521,3 @@ msgstr ""
 
 #~ msgid "_View"
 #~ msgstr "_Vy"
-
-#~ msgid "A filter to make level measurements on 16 bits pcm audio stream"
-#~ msgstr "En filter fÜr att mäta nivüer pü 16 bitars PCM audio strÜmmar"
-
-#~ msgid "A video display window using SDL"
-#~ msgstr "En video utgĂĽngsfĂśnster med SDL"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a18bf0d0686550e6ed0800b96a3a773a100a2393..ca31bf98c0bc4fc884ebad76d94c7dfc8a0c440a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone 3.3.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-08 16:31+0800\n"
+"POT-Creation-Date: 2011-02-07 10:59+0100\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"
@@ -18,51 +18,44 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../gtk-glade/support.c:49 ../gtk-glade/support.c:73
-#: ../gtk-glade/support.c:102
+#: ../gtk/support.c:49 ../gtk/support.c:73 ../gtk/support.c:102
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "无法打开位图文件:%s"
 
-#: ../gtk-glade/chat.c:27
+#: ../gtk/chat.c:27
 #, c-format
 msgid "Chat with %s"
 msgstr "与 %s 通话"
 
-#: ../gtk-glade/main.c:94
+#: ../gtk/main.c:74
 msgid "log to stdout some debug information while running."
 msgstr "运行时向标准输出记录调试信息。"
 
-#: ../gtk-glade/main.c:101
+#: ../gtk/main.c:81
 msgid "Start only in the system tray, do not show the main interface."
 msgstr "启动到系统托盘,不显示主界面。"
 
-#: ../gtk-glade/main.c:108
+#: ../gtk/main.c:88
 msgid "address to call right now"
 msgstr "现在呼叫的地址"
 
-#: ../gtk-glade/main.c:115
+#: ../gtk/main.c:95
 msgid "if set automatically answer incoming calls"
 msgstr "是否设置呼叫自动应答"
 
-#: ../gtk-glade/main.c:123
+#: ../gtk/main.c:103
 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-glade/main.c:402
+#: ../gtk/main.c:479
 #, c-format
 msgid "Call with %s"
 msgstr "与 %s 通话"
 
-#: ../gtk-glade/main.c:720
-#, c-format
-msgid "Incoming call from %s"
-msgstr "来自 %s 的呼叫"
-
-#: ../gtk-glade/main.c:759
+#: ../gtk/main.c:862
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
@@ -74,27 +67,27 @@ msgstr ""
 "您是否允许他看到您的在线状态或者将它加为您的联系人允许?\n"
 "如果您回答否,则会将该人临时性的放入黑名单"
 
-#: ../gtk-glade/main.c:837
+#: ../gtk/main.c:940
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at domain <i>%s</i>:"
 msgstr "请输入 %s@%s 的密码:"
 
-#: ../gtk-glade/main.c:934
+#: ../gtk/main.c:1076
 msgid "Website link"
 msgstr "网站"
 
-#: ../gtk-glade/main.c:970
+#: ../gtk/main.c:1112
 msgid "Linphone - a video internet phone"
 msgstr "Linphone - 互联网视频电话"
 
-#: ../gtk-glade/main.c:989
+#: ../gtk/main.c:1131
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (靘莤)"
 
-#: ../gtk-glade/main.c:1221
+#: ../gtk/main.c:1382
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
@@ -102,143 +95,142 @@ msgstr ""
 "未在此计算机上检测到声卡。\n"
 "您无法发送或接收音频呼叫。"
 
-#: ../gtk-glade/main.c:1280
+#: ../gtk/main.c:1441
 msgid "A free SIP video-phone"
 msgstr "免费的 SIP 视频电话"
 
-#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:258
-#: ../gtk-glade/contact.glade.h:3
+#: ../gtk/friendlist.c:192 ../gtk/propertybox.c:271
 msgid "Name"
 msgstr "名称"
 
-#: ../gtk-glade/friendlist.c:205
+#: ../gtk/friendlist.c:205
 msgid "Presence status"
 msgstr "在线状态"
 
-#: ../gtk-glade/friendlist.c:242
+#: ../gtk/friendlist.c:242
 #, c-format
 msgid "Search in %s directory"
 msgstr "在 %s 目录中查找 "
 
-#: ../gtk-glade/friendlist.c:450
+#: ../gtk/friendlist.c:450
 msgid "Invalid sip contact !"
 msgstr "无效的 SIP 联系人!"
 
-#: ../gtk-glade/friendlist.c:492
+#: ../gtk/friendlist.c:495
 #, c-format
 msgid "Call %s"
 msgstr "呼叫 %s"
 
-#: ../gtk-glade/friendlist.c:493
+#: ../gtk/friendlist.c:496
 #, c-format
 msgid "Send text to %s"
 msgstr "发送消息给 %s"
 
-#: ../gtk-glade/friendlist.c:494
+#: ../gtk/friendlist.c:497
 #, c-format
 msgid "Edit contact '%s'"
 msgstr "编辑联系人 %s"
 
-#: ../gtk-glade/friendlist.c:495
+#: ../gtk/friendlist.c:498
 #, c-format
 msgid "Delete contact '%s'"
 msgstr "删除联系人 %s"
 
-#: ../gtk-glade/friendlist.c:537
+#: ../gtk/friendlist.c:540
 #, c-format
 msgid "Add new contact from %s directory"
 msgstr "从 %s 目录增加联系人 "
 
-#: ../gtk-glade/propertybox.c:264
+#: ../gtk/propertybox.c:277
 msgid "Rate (Hz)"
 msgstr "采样率(Hz)"
 
-#: ../gtk-glade/propertybox.c:270
+#: ../gtk/propertybox.c:283
 msgid "Status"
 msgstr "状态"
 
-#: ../gtk-glade/propertybox.c:276
+#: ../gtk/propertybox.c:289
 msgid "Min bitrate (kbit/s)"
 msgstr "最小比特率(kbit/s)"
 
-#: ../gtk-glade/propertybox.c:283
+#: ../gtk/propertybox.c:296
 msgid "Parameters"
 msgstr "参数"
 
-#: ../gtk-glade/propertybox.c:312 ../gtk-glade/propertybox.c:451
+#: ../gtk/propertybox.c:325 ../gtk/propertybox.c:464
 msgid "Enabled"
 msgstr "启用"
 
-#: ../gtk-glade/propertybox.c:313 ../gtk-glade/propertybox.c:451
+#: ../gtk/propertybox.c:326 ../gtk/propertybox.c:464
 msgid "Disabled"
 msgstr "禁用"
 
-#: ../gtk-glade/propertybox.c:496
+#: ../gtk/propertybox.c:509
 msgid "Account"
 msgstr "帐戡"
 
-#: ../gtk-glade/propertybox.c:636
+#: ../gtk/propertybox.c:649
 msgid "English"
 msgstr "英语"
 
-#: ../gtk-glade/propertybox.c:637
+#: ../gtk/propertybox.c:650
 msgid "French"
 msgstr "法语"
 
-#: ../gtk-glade/propertybox.c:638
+#: ../gtk/propertybox.c:651
 msgid "Swedish"
 msgstr "瑞典语"
 
-#: ../gtk-glade/propertybox.c:639
+#: ../gtk/propertybox.c:652
 msgid "Italian"
 msgstr "意大利语"
 
-#: ../gtk-glade/propertybox.c:640
+#: ../gtk/propertybox.c:653
 msgid "Spanish"
 msgstr "西班牙语"
 
-#: ../gtk-glade/propertybox.c:641
+#: ../gtk/propertybox.c:654
 msgid "Brazilian Portugese"
 msgstr "巴西葡萄牙语"
 
-#: ../gtk-glade/propertybox.c:642
+#: ../gtk/propertybox.c:655
 msgid "Polish"
 msgstr "波兰语"
 
-#: ../gtk-glade/propertybox.c:643
+#: ../gtk/propertybox.c:656
 msgid "German"
 msgstr "垡语"
 
-#: ../gtk-glade/propertybox.c:644
+#: ../gtk/propertybox.c:657
 msgid "Russian"
 msgstr "俄语"
 
-#: ../gtk-glade/propertybox.c:645
+#: ../gtk/propertybox.c:658
 msgid "Japanese"
 msgstr "日语"
 
-#: ../gtk-glade/propertybox.c:646
+#: ../gtk/propertybox.c:659
 msgid "Dutch"
 msgstr "荷兰语"
 
-#: ../gtk-glade/propertybox.c:647
+#: ../gtk/propertybox.c:660
 msgid "Hungarian"
 msgstr "匈牙利语"
 
-#: ../gtk-glade/propertybox.c:648
+#: ../gtk/propertybox.c:661
 msgid "Czech"
 msgstr "捷克语"
 
-#: ../gtk-glade/propertybox.c:649
+#: ../gtk/propertybox.c:662
 msgid "Chinese"
 msgstr "中文"
 
-#: ../gtk-glade/propertybox.c:706
+#: ../gtk/propertybox.c:719
 msgid ""
 "You need to restart linphone for the new language selection to take effect."
 msgstr "您需要重启 linphone 以使语言选择生效。"
 
-#: ../gtk-glade/update.c:80
+#: ../gtk/update.c:80
 #, c-format
 msgid ""
 "A more recent version is availalble from %s.\n"
@@ -247,37 +239,37 @@ msgstr ""
 "%s 有新版本。\n"
 "您是否要打开浏览器下载它?"
 
-#: ../gtk-glade/update.c:91
+#: ../gtk/update.c:91
 msgid "You are running the lastest version."
 msgstr "您正在运行最新版。"
 
-#: ../gtk-glade/buddylookup.c:85
+#: ../gtk/buddylookup.c:85
 msgid "Firstname, Lastname"
 msgstr "姓名"
 
-#: ../gtk-glade/buddylookup.c:160
+#: ../gtk/buddylookup.c:160
 msgid "Error communicating with server."
 msgstr "与服务器通讯失败"
 
-#: ../gtk-glade/buddylookup.c:164
+#: ../gtk/buddylookup.c:164
 msgid "Connecting..."
 msgstr "正在连接..."
 
-#: ../gtk-glade/buddylookup.c:168
+#: ../gtk/buddylookup.c:168
 msgid "Connected"
 msgstr "已连接"
 
-#: ../gtk-glade/buddylookup.c:172
+#: ../gtk/buddylookup.c:172
 msgid "Receiving data..."
 msgstr "正在接收数据..."
 
-#: ../gtk-glade/buddylookup.c:180
+#: ../gtk/buddylookup.c:180
 #, c-format
 msgid "Found %i contact"
 msgid_plural "Found %i contacts"
 msgstr[0] "找到 %i 联系方式"
 
-#: ../gtk-glade/setupwizard.c:25
+#: ../gtk/setupwizard.c:25
 msgid ""
 "Welcome !\n"
 "This assistant will help you to use a SIP account for your calls."
@@ -285,764 +277,161 @@ msgstr ""
 "欢迎使用 Linphone!\n"
 "设置向导将帮助您配置打网络电话的 SIP 帐户。"
 
-#: ../gtk-glade/setupwizard.c:34
+#: ../gtk/setupwizard.c:34
 msgid "Create an account by choosing a username"
 msgstr "通过选择一个用户名创建一个新的帐户"
 
-#: ../gtk-glade/setupwizard.c:35
+#: ../gtk/setupwizard.c:35
 msgid "I have already an account and just want to use it"
 msgstr "我已经有一个帐户,并想使用原来的帐户"
 
-#: ../gtk-glade/setupwizard.c:53
+#: ../gtk/setupwizard.c:53
 msgid "Please choose a username:"
 msgstr "请选择用户名:"
 
-#: ../gtk-glade/setupwizard.c:54
+#: ../gtk/setupwizard.c:54
 msgid "Username:"
 msgstr "用户名:"
 
-#: ../gtk-glade/setupwizard.c:92
+#: ../gtk/setupwizard.c:92
 #, c-format
 msgid "Checking if '%s' is available..."
 msgstr "检查 %s 是否可用..."
 
-#: ../gtk-glade/setupwizard.c:97 ../gtk-glade/setupwizard.c:164
+#: ../gtk/setupwizard.c:97 ../gtk/setupwizard.c:164
 msgid "Please wait..."
 msgstr "请稍候..."
 
-#: ../gtk-glade/setupwizard.c:101
+#: ../gtk/setupwizard.c:101
 msgid "Sorry this username already exists. Please try a new one."
 msgstr "对不起,该用户已经存在,请换一个尝试。"
 
-#: ../gtk-glade/setupwizard.c:103 ../gtk-glade/setupwizard.c:168
+#: ../gtk/setupwizard.c:103 ../gtk/setupwizard.c:168
 msgid "Ok !"
 msgstr "成功!"
 
-#: ../gtk-glade/setupwizard.c:106 ../gtk-glade/setupwizard.c:171
+#: ../gtk/setupwizard.c:106 ../gtk/setupwizard.c:171
 msgid "Communication problem, please try again later."
 msgstr "连接错误,请稍后重试。"
 
-#: ../gtk-glade/setupwizard.c:134
+#: ../gtk/setupwizard.c:134
 msgid "Thank you. Your account is now configured and ready for use."
 msgstr "谢谢,您的帐户已经配置完毕,可以使用。"
 
-#: ../gtk-glade/setupwizard.c:228
+#: ../gtk/setupwizard.c:228
 msgid "Welcome to the account setup assistant"
 msgstr "欢迎使用帐户设置向导"
 
-#: ../gtk-glade/setupwizard.c:232
+#: ../gtk/setupwizard.c:232
 msgid "Account setup assistant"
 msgstr "帐户设置向导"
 
-#: ../gtk-glade/setupwizard.c:236
+#: ../gtk/setupwizard.c:236
 msgid "Choosing a username"
 msgstr "选择用户名:"
 
-#: ../gtk-glade/setupwizard.c:240
+#: ../gtk/setupwizard.c:240
 msgid "Verifying"
 msgstr "验证中"
 
-#: ../gtk-glade/setupwizard.c:244
+#: ../gtk/setupwizard.c:244
 msgid "Confirmation"
 msgstr "祎莤"
 
-#: ../gtk-glade/setupwizard.c:249
+#: ../gtk/setupwizard.c:249
 msgid "Creating your account"
 msgstr "正在创建您的帐户"
 
-#: ../gtk-glade/setupwizard.c:253
+#: ../gtk/setupwizard.c:253
 msgid "Now ready !"
 msgstr "尹睪"
 
-#: ../gtk-glade/incall_view.c:109
+#: ../gtk/incall_view.c:113
+msgid "Transfer"
+msgstr ""
+
+#: ../gtk/incall_view.c:187
 msgid "<b>Calling...</b>"
 msgstr "<b>正在呼叫...</b>"
 
-#: ../gtk-glade/incall_view.c:112 ../gtk-glade/incall_view.c:134
+#: ../gtk/incall_view.c:190 ../gtk/incall_view.c:246
 msgid "00::00::00"
 msgstr "00::00::00"
 
-#: ../gtk-glade/incall_view.c:132
-msgid "<b>In call with</b>"
+#: ../gtk/incall_view.c:206
+#, fuzzy
+msgid "<b>Incoming call</b>"
+msgstr "呼入"
+
+#: ../gtk/incall_view.c:216
+msgid ""
+"Pause all calls\n"
+"and answer"
+msgstr ""
+
+#: ../gtk/incall_view.c:217
+msgid "Answer"
+msgstr ""
+
+#: ../gtk/incall_view.c:244
+#, fuzzy
+msgid "<b>In call</b>"
 msgstr "<b>正在呼叫</b>"
 
-#: ../gtk-glade/incall_view.c:150
+#: ../gtk/incall_view.c:260
+#, fuzzy
+msgid "<b>Paused call</b>"
+msgstr "<b>正在呼叫</b>"
+
+#: ../gtk/incall_view.c:272
 #, c-format
 msgid "%02i::%02i::%02i"
 msgstr "%02i::%02i::%02i"
 
-#: ../gtk-glade/incall_view.c:166
+#: ../gtk/incall_view.c:288
 msgid "<b>Call ended.</b>"
 msgstr "<b>通话结束。</b>"
 
-#: ../gtk-glade/incall_view.c:184
+#: ../gtk/incall_view.c:309
 msgid "Unmute"
 msgstr "取消静音"
 
-#: ../gtk-glade/incall_view.c:191 ../gtk-glade/main.glade.h:43
+#: ../gtk/incall_view.c:316
 msgid "Mute"
 msgstr "静音"
 
-#: ../gtk-glade/loginframe.c:83
-#, c-format
-msgid "Please enter login information for %s"
-msgstr "请输入 %s 的登录信息"
-
-#: ../gtk-glade/main.glade.h:1
-msgid "#"
-msgstr "#"
-
-#: ../gtk-glade/main.glade.h:2
-msgid "*"
-msgstr "*"
-
-#: ../gtk-glade/main.glade.h:3
-msgid "0"
-msgstr "0"
-
-#: ../gtk-glade/main.glade.h:4
-msgid "1"
-msgstr "1"
-
-#: ../gtk-glade/main.glade.h:5
-msgid "2"
-msgstr "2"
-
-#: ../gtk-glade/main.glade.h:6
-msgid "3"
-msgstr "3"
-
-#: ../gtk-glade/main.glade.h:7
-msgid "4"
-msgstr "4"
-
-#: ../gtk-glade/main.glade.h:8
-msgid "5"
-msgstr "5"
-
-#: ../gtk-glade/main.glade.h:9
-msgid "6"
-msgstr "6"
-
-#: ../gtk-glade/main.glade.h:10
-msgid "7"
-msgstr "7"
-
-#: ../gtk-glade/main.glade.h:11
-msgid "8"
-msgstr "8"
-
-#: ../gtk-glade/main.glade.h:12
-msgid "9"
-msgstr "9"
-
-#: ../gtk-glade/main.glade.h:13
-msgid "<b>Add contacts from directory</b>"
-msgstr "<b>从目录增加联系人</b>"
-
-#: ../gtk-glade/main.glade.h:14
-msgid "<b>Contact list</b>"
-msgstr "<b>联系人列表</b>"
-
-#: ../gtk-glade/main.glade.h:15
-msgid "<b>Welcome !</b>"
-msgstr "<b>欢迎!</b>"
-
-#: ../gtk-glade/main.glade.h:16
-msgid "A"
-msgstr "A"
-
-#: ../gtk-glade/main.glade.h:17
-msgid ""
-"ADSL\n"
-"Fiber Channel"
-msgstr ""
-"ADSL\n"
-"光纤"
-
-#: ../gtk-glade/main.glade.h:19
-msgid ""
-"All users\n"
-"Online users"
-msgstr ""
-"全部用户\n"
-"在线用户"
-
-#: ../gtk-glade/main.glade.h:21
-msgid "Assistant"
-msgstr "配置向导"
-
-#: ../gtk-glade/main.glade.h:22
-msgid "Audio & Video"
-msgstr "音频和视频"
-
-#: ../gtk-glade/main.glade.h:23
-msgid "Audio only"
-msgstr "音频"
-
-#: ../gtk-glade/main.glade.h:24
-msgid "Automatically log me in"
-msgstr "自动登录"
-
-#: ../gtk-glade/main.glade.h:25
-msgid "B"
-msgstr "B"
-
-#: ../gtk-glade/main.glade.h:26 ../gtk-glade/parameters.glade.h:21
-msgid "C"
-msgstr "C"
-
-#: ../gtk-glade/main.glade.h:27
-msgid "Call Details"
-msgstr "呼叫详情"
-
-#: ../gtk-glade/main.glade.h:28 ../gtk-glade/call_logs.glade.h:1
-msgid "Call history"
-msgstr "呼叫历史"
-
-#: ../gtk-glade/main.glade.h:29
-msgid "Check for updates"
-msgstr "检查更新"
-
-#: ../gtk-glade/main.glade.h:30
-msgid "Contacts"
-msgstr "联系人"
-
-#: ../gtk-glade/main.glade.h:31
-msgid "D"
-msgstr "D"
-
-#: ../gtk-glade/main.glade.h:32
-msgid "Default"
-msgstr "靘莤"
-
-#: ../gtk-glade/main.glade.h:33
-msgid "Duration"
-msgstr "通话时间"
-
-#: ../gtk-glade/main.glade.h:34
-msgid "Duration:"
-msgstr "通话计时:"
-
-#: ../gtk-glade/main.glade.h:35
-msgid "Enable self-view"
-msgstr "启用自视"
-
-#: ../gtk-glade/main.glade.h:36
-msgid "Enter username, phone number, or full sip address"
-msgstr "请输入用户名、电话号码或完整的 SIP 地址"
-
-#: ../gtk-glade/main.glade.h:37
-msgid "Homepage"
-msgstr "丝饾"
-
-#: ../gtk-glade/main.glade.h:38
-msgid "In call"
-msgstr "呼入"
-
-#: ../gtk-glade/main.glade.h:39
-msgid "Internet connection:"
-msgstr "网络连接:"
-
-#: ../gtk-glade/main.glade.h:40
-msgid "Keypad"
-msgstr "数字键盘"
-
-#: ../gtk-glade/main.glade.h:41
-msgid "Login information"
-msgstr "登录信息"
-
-#: ../gtk-glade/main.glade.h:42
-msgid "Lookup:"
-msgstr "查找:"
-
-#: ../gtk-glade/main.glade.h:44
-msgid "My current identity:"
-msgstr "当前地址:"
-
-#: ../gtk-glade/main.glade.h:45
-msgid "Password"
-msgstr "密码"
-
-#: ../gtk-glade/main.glade.h:46
-msgid "SIP address or phone number:"
-msgstr "SIP 地址或电话号码:"
-
-#: ../gtk-glade/main.glade.h:47
-msgid "Search"
-msgstr "搜索"
-
-#: ../gtk-glade/main.glade.h:48
-msgid "Show debug messages"
-msgstr "显示调试信息"
-
-#: ../gtk-glade/main.glade.h:49
-msgid "Start call"
-msgstr "开始呼叫"
-
-#: ../gtk-glade/main.glade.h:50
-msgid "Terminate call"
-msgstr "终止呼叫"
-
-#: ../gtk-glade/main.glade.h:51
-msgid "Username"
-msgstr "用户名"
-
-#: ../gtk-glade/main.glade.h:52
-msgid "_Linphone"
-msgstr "_Linphone"
-
-#: ../gtk-glade/main.glade.h:53
-msgid "_Modes"
-msgstr "模式(_M)"
-
-#: ../gtk-glade/main.glade.h:54
-msgid "in"
-msgstr "于"
-
-#: ../gtk-glade/main.glade.h:55
-msgid "label"
-msgstr "标签"
-
-#: ../gtk-glade/about.glade.h:1
-msgid "About linphone"
-msgstr "关于 Linphone"
-
-#: ../gtk-glade/about.glade.h:2
-msgid "An internet video phone using the standard SIP (rfc3261) protocol."
-msgstr "一个采用标准 SIP (rfc3261) 协议的互联网视频电话"
-
-#: ../gtk-glade/about.glade.h:3
-msgid "Created by Simon Morlat\n"
-msgstr "由 Simon Morlat 创建\n"
-
-#: ../gtk-glade/about.glade.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"
-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-glade/contact.glade.h:1
-msgid "<b>Contact information</b>"
-msgstr "<b>联系人信息</b>"
-
-#: ../gtk-glade/contact.glade.h:2
-msgid "Allow this contact to see my presence status"
-msgstr "允许此人看到我的在线状态"
-
-#: ../gtk-glade/contact.glade.h:4
-msgid "SIP Address"
-msgstr "SIP 地址"
-
-#: ../gtk-glade/contact.glade.h:5
-msgid "Show this contact presence status"
-msgstr "显示该联系人的在线状态"
-
-#: ../gtk-glade/contact.glade.h:6 ../gtk-glade/password.glade.h:5
-msgid "gtk-cancel"
-msgstr ""
-
-#: ../gtk-glade/contact.glade.h:7 ../gtk-glade/password.glade.h:6
-msgid "gtk-ok"
-msgstr ""
-
-#: ../gtk-glade/log.glade.h:1
-msgid "Linphone debug window"
-msgstr "Linphone 调试窗口"
-
-#: ../gtk-glade/log.glade.h:2 ../gtk-glade/call_logs.glade.h:2
-#: ../gtk-glade/chatroom.glade.h:2
-msgid "gtk-close"
-msgstr ""
-
-#: ../gtk-glade/password.glade.h:1
-msgid "Linphone - Authentication required"
-msgstr "Linphone - 需要认证"
-
-#: ../gtk-glade/password.glade.h:2
-msgid "Password:"
-msgstr "密码:"
-
-#: ../gtk-glade/password.glade.h:3
-msgid "Please enter the domain password"
-msgstr "请输入密码"
-
-#: ../gtk-glade/password.glade.h:4
-msgid "UserID"
-msgstr "用户 ID"
-
-#: ../gtk-glade/sip_account.glade.h:1
-msgid "Configure a SIP account"
-msgstr "配置 SIP 帐户"
-
-#: ../gtk-glade/sip_account.glade.h:2
-msgid "Linphone - Configure a SIP account"
-msgstr "Linphone - 配置 SIP 帐户"
-
-#: ../gtk-glade/sip_account.glade.h:3
-msgid "Looks like sip:<proxy hostname>"
-msgstr "类似于 sip:<代理主机名>"
-
-#: ../gtk-glade/sip_account.glade.h:4
-msgid "Looks like sip:<username>@<domain>"
-msgstr "类似于 sip:<用户名>@<域>"
-
-#: ../gtk-glade/sip_account.glade.h:5
-msgid "Publish presence information"
-msgstr "发布在线状态"
-
-#: ../gtk-glade/sip_account.glade.h:6
-msgid "Register at startup"
-msgstr "在启动时注册"
-
-#: ../gtk-glade/sip_account.glade.h:7
-msgid "Registration duration (sec):"
-msgstr "注册间隔(秒):"
-
-#: ../gtk-glade/sip_account.glade.h:8
-msgid "Route (optional):"
-msgstr "路由(可选):"
-
-#: ../gtk-glade/sip_account.glade.h:9
-msgid "SIP Proxy address:"
-msgstr "SIP 代理地址:"
-
-#: ../gtk-glade/sip_account.glade.h:10
-msgid "Your SIP identity:"
-msgstr "您的 SIP 地址:"
-
-#: ../gtk-glade/sip_account.glade.h:11
-msgid "sip:"
-msgstr "sip:"
-
-#: ../gtk-glade/chatroom.glade.h:1
-msgid "Send"
-msgstr "发送"
-
-#: ../gtk-glade/incoming_call.glade.h:1
-msgid "Accept"
-msgstr "接受"
-
-#: ../gtk-glade/incoming_call.glade.h:2
-msgid "Decline"
-msgstr "拒绝"
-
-#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:370
-msgid "Incoming call"
-msgstr "呼入"
-
-#: ../gtk-glade/incoming_call.glade.h:4
-msgid "Incoming call from"
-msgstr "来自"
-
-#: ../gtk-glade/incoming_call.glade.h:5
-msgid "Linphone - Incoming call"
-msgstr "Linphone - 呼入"
-
-#: ../gtk-glade/parameters.glade.h:1
-msgid "0 stands for \"unlimited\""
-msgstr "0 表示 “没有限制”"
-
-#: ../gtk-glade/parameters.glade.h:2
-msgid "<b>Audio</b>"
-msgstr "<b>音频</b>"
-
-#: ../gtk-glade/parameters.glade.h:3
-msgid "<b>Bandwidth control</b>"
-msgstr "<b>带宽控制</b>"
-
-#: ../gtk-glade/parameters.glade.h:4
-msgid "<b>Codecs</b>"
-msgstr "<b>编解码器</b>"
-
-#: ../gtk-glade/parameters.glade.h:5
-msgid "<b>Default identity</b>"
-msgstr "<b>靘莤帐戡</b>"
-
-#: ../gtk-glade/parameters.glade.h:6
-msgid "<b>Language</b>"
-msgstr "<b>语言</b>"
-
-#: ../gtk-glade/parameters.glade.h:7
-msgid "<b>Level</b>"
-msgstr "<b>级刍</b>"
-	
-#: ../gtk-glade/parameters.glade.h:8
-msgid "<b>NAT and Firewall</b>"
-msgstr "<b>NAT 及防火墙</b>"
-
-#: ../gtk-glade/parameters.glade.h:9
-msgid "<b>Ports</b>"
-msgstr "<b>端口</b>"
-
-#: ../gtk-glade/parameters.glade.h:10
-msgid "<b>Privacy</b>"
-msgstr "<b>隐私</b>"
-
-#: ../gtk-glade/parameters.glade.h:11
-msgid "<b>Proxy accounts</b>"
-msgstr "<b>代理帐户</b>"
-
-#: ../gtk-glade/parameters.glade.h:12
-msgid "<b>Transport</b>"
-msgstr "<b>传输协议</b>"
-
-#: ../gtk-glade/parameters.glade.h:13
-msgid "<b>Video</b>"
-msgstr "<b>视频</b>"
-
-#: ../gtk-glade/parameters.glade.h:14
-msgid "ALSA special device (optional):"
-msgstr "ALSA 特殊设备(可选):"
-
-#: ../gtk-glade/parameters.glade.h:15
-msgid "Add"
-msgstr "添加"
-
-#: ../gtk-glade/parameters.glade.h:16
-msgid "Audio RTP/UDP:"
-msgstr "音频 RTP/UDP:"
-
-#: ../gtk-glade/parameters.glade.h:17
-msgid ""
-"Audio codecs\n"
-"Video codecs"
+#: ../gtk/incall_view.c:340
+msgid "Resume"
 msgstr ""
-"音频编解码器\n"
-"视频编解码器"
-
-#: ../gtk-glade/parameters.glade.h:19
-msgid "Behind NAT / Firewall (specify gateway IP below)"
-msgstr "在 NAT 或防火墙后(填写网关 IP)"
-
-#: ../gtk-glade/parameters.glade.h:20
-msgid "Behind NAT / Firewall (use STUN to resolve)"
-msgstr "在 NAT 或防火墙后(使用 STUN 解决)"
-
-#: ../gtk-glade/parameters.glade.h:22
-msgid "CIF"
-msgstr "CIF"
-
-#: ../gtk-glade/parameters.glade.h:23
-msgid "Capture device:"
-msgstr "录音设备:"
-
-#: ../gtk-glade/parameters.glade.h:24
-msgid "Codecs"
-msgstr "编解码器"
-
-#: ../gtk-glade/parameters.glade.h:25
-msgid "Direct connection to the Internet"
-msgstr "直接连接到互联网"
-
-#: ../gtk-glade/parameters.glade.h:26
-msgid "Disable"
-msgstr "禁用"
-
-#: ../gtk-glade/parameters.glade.h:27
-msgid "Done"
-msgstr "完成"
-
-#: ../gtk-glade/parameters.glade.h:28
-msgid "Download speed limit in Kbit/sec:"
-msgstr "下载速率限制 kbit/s:"
-
-#: ../gtk-glade/parameters.glade.h:29
-msgid "Edit"
-msgstr "编辑"
-
-#: ../gtk-glade/parameters.glade.h:30
-msgid "Enable"
-msgstr "启用"
-
-#: ../gtk-glade/parameters.glade.h:31
-msgid "Enable echo cancellation"
-msgstr "启用回声抑制"
-
-#: ../gtk-glade/parameters.glade.h:32
-msgid "Erase all passwords"
-msgstr "清除所有密码"
-
-#: ../gtk-glade/parameters.glade.h:33
-msgid "Manage SIP Accounts"
-msgstr "SIP 帐户管理"
 
-#: ../gtk-glade/parameters.glade.h:34
-msgid "Multimedia settings"
-msgstr "音视频设置"
-
-#: ../gtk-glade/parameters.glade.h:35
-msgid "Network settings"
-msgstr "网络设置"
-
-#: ../gtk-glade/parameters.glade.h:36
-msgid "Playback device:"
-msgstr "回放设备:"
-
-#: ../gtk-glade/parameters.glade.h:37
-msgid "Prefered video resolution:"
-msgstr "视频分辨率:"
-
-#: ../gtk-glade/parameters.glade.h:38
-msgid "Public IP address:"
-msgstr "公网 IP 地址:"
-
-#: ../gtk-glade/parameters.glade.h:39
-msgid ""
-"Register to FONICS\n"
-"virtual network !"
+#: ../gtk/incall_view.c:347
+msgid "Pause"
 msgstr ""
-"注册到 FONICS\n"
-"虚拟网络!"
-
-#: ../gtk-glade/parameters.glade.h:41
-msgid "Remove"
-msgstr "移除"
-
-#: ../gtk-glade/parameters.glade.h:42
-msgid "Ring device:"
-msgstr "响铃设备:"
-
-#: ../gtk-glade/parameters.glade.h:43
-msgid "Ring sound:"
-msgstr "铃声文件:"
-
-#: ../gtk-glade/parameters.glade.h:44
-msgid "SIP (UDP):"
-msgstr "SIP (UDP):"
-
-#: ../gtk-glade/parameters.glade.h:45
-msgid "Send DTMFs as SIP info"
-msgstr "以 SIP 消息发送 DTMF"
-
-#: ../gtk-glade/parameters.glade.h:46
-msgid "Set Maximum Transmission Unit:"
-msgstr "设置最大传输单元(MTU):"
-
-#: ../gtk-glade/parameters.glade.h:47
-msgid "Settings"
-msgstr "莞罎"
-
-#: ../gtk-glade/parameters.glade.h:48
-msgid "Show advanced settings"
-msgstr "昞示鍘级莞罎"
-
-#: ../gtk-glade/parameters.glade.h:49
-msgid "Stun server:"
-msgstr "Stun 服务器:"
-
-#: ../gtk-glade/parameters.glade.h:50
-msgid "This section defines your SIP address when not using a SIP account"
-msgstr "该段在您不使用SIP帐户时的SIP地址"
-
-#: ../gtk-glade/parameters.glade.h:51
-msgid "Upload speed limit in Kbit/sec:"
-msgstr "上传速率限制 kbit/s:"
-
-#: ../gtk-glade/parameters.glade.h:52
-msgid "Use IPv6 instead of IPv4"
-msgstr "使用 IPv6 而非 IPv4"
-
-#: ../gtk-glade/parameters.glade.h:53
-msgid "User interface"
-msgstr "用户界面"
-
-#: ../gtk-glade/parameters.glade.h:54
-msgid "Video RTP/UDP:"
-msgstr "视频 RTP/UDP:"
-
-#: ../gtk-glade/parameters.glade.h:55
-msgid "Video input device:"
-msgstr "视频输入设备:"
-
-#: ../gtk-glade/parameters.glade.h:56
-msgid "Your display name (eg: John Doe):"
-msgstr "您的显示名:"
-
-#: ../gtk-glade/parameters.glade.h:57
-msgid "Your resulting SIP address:"
-msgstr "您的 SIP 地址结果:"
-
-#: ../gtk-glade/parameters.glade.h:58
-msgid "Your username:"
-msgstr "您的用户名:"
 
-#: ../gtk-glade/parameters.glade.h:59
-msgid "a sound card\n"
-msgstr "声卡\n"
-
-#: ../gtk-glade/parameters.glade.h:61
-msgid "default camera"
-msgstr "默认摄像头"
-
-#: ../gtk-glade/parameters.glade.h:62
-msgid "default soundcard"
-msgstr "默认声卡"
-
-#: ../gtk-glade/parameters.glade.h:63
-msgid "default soundcard\n"
-msgstr "默认声卡\n"
-
-#: ../gtk-glade/buddylookup.glade.h:1
-msgid "<b>Search somebody</b>"
-msgstr "<b>找人</b>"
-
-#: ../gtk-glade/buddylookup.glade.h:2
-msgid "Add to my list"
-msgstr "添加为联系人"
-
-#: ../gtk-glade/buddylookup.glade.h:3
-msgid "Search contacts in directory"
-msgstr "查找联系人"
-
-#: ../gtk-glade/waiting.glade.h:1
-msgid "Linphone"
-msgstr "Linphone"
-
-#: ../gtk-glade/waiting.glade.h:2
-msgid "Please wait"
-msgstr "请稍候"
+#: ../gtk/loginframe.c:93
+#, c-format
+msgid "Please enter login information for %s"
+msgstr "请输入 %s 的登录信息"
 
-#: ../coreapi/linphonecore.c:312
+#: ../coreapi/linphonecore.c:166
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
 msgstr[0] "您错过了 %i 个呼叫。"
 
-#: ../coreapi/linphonecore.c:358
+#: ../coreapi/linphonecore.c:207
 msgid "aborted"
 msgstr "中断"
 
-#: ../coreapi/linphonecore.c:361
+#: ../coreapi/linphonecore.c:210
 msgid "completed"
 msgstr "完成"
 
-#: ../coreapi/linphonecore.c:364
+#: ../coreapi/linphonecore.c:213
 msgid "missed"
 msgstr "丢夹"
 
-#: ../coreapi/linphonecore.c:369
+#: ../coreapi/linphonecore.c:218
 #, c-format
 msgid ""
 "%s at %s\n"
@@ -1057,61 +446,89 @@ msgstr ""
 "状态:%s\n"
 "状态:%i 分 %i 秒\n"
 
-#: ../coreapi/linphonecore.c:370
+#: ../coreapi/linphonecore.c:219
+msgid "Incoming call"
+msgstr "呼入"
+
+#: ../coreapi/linphonecore.c:219
 msgid "Outgoing call"
 msgstr "呼出"
 
-#: ../coreapi/linphonecore.c:644
+#: ../coreapi/linphonecore.c:501
 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 请"
-"更该配置。"
+"您的机器有 IPv6 网络连接。Linphone 默认使用IPv4,如果您希望使用 IPv6 请更该配"
+"置。"
 
-#: ../coreapi/linphonecore.c:1124
+#: ../coreapi/linphonecore.c:994
 msgid "Ready"
 msgstr "尹睪"
 
-#: ../coreapi/linphonecore.c:1621
-msgid "Remote end seems to have disconnected, the call is going to be closed."
-msgstr "对方断开连接,通话终止。"
-
-#: ../coreapi/linphonecore.c:1843
+#: ../coreapi/linphonecore.c:1768
 msgid "Looking for telephone number destination..."
 msgstr "查询电话号码目的地..."
 
-#: ../coreapi/linphonecore.c:1845
+#: ../coreapi/linphonecore.c:1771
 msgid "Could not resolve this number."
 msgstr "该号码无法解析。"
 
-#: ../coreapi/linphonecore.c:1889
+#: ../coreapi/linphonecore.c:1815
 msgid ""
 "Could not parse given sip address. A sip url usually looks like sip:"
 "user@domain"
-msgstr "无法解析给定的 SIP 地址,SIP 地址应有如下格式:\n"
+msgstr ""
+"无法解析给定的 SIP 地址,SIP 地址应有如下格式:\n"
 "sip:用户名@域名"
 
-#: ../coreapi/linphonecore.c:2032
+#: ../coreapi/linphonecore.c:1962
 msgid "Contacting"
 msgstr "联系中"
 
-#: ../coreapi/linphonecore.c:2038
-msgid "could not call"
+#: ../coreapi/linphonecore.c:1969
+#, fuzzy
+msgid "Could not call"
 msgstr "无法呼叫"
 
-#: ../coreapi/linphonecore.c:2085
-msgid "Sorry, having multiple simultaneous calls is not supported yet !"
-msgstr "抱歉, 还不支持并发多路呼叫!"
+#: ../coreapi/linphonecore.c:2076
+msgid "Sorry, you have to pause or stop the current call first !"
+msgstr ""
+
+#: ../coreapi/linphonecore.c:2081
+msgid "Sorry, we have reached the maximum number of simultaneous calls"
+msgstr ""
+
+#: ../coreapi/linphonecore.c:2205
+msgid "Modifying call parameters..."
+msgstr ""
 
-#: ../coreapi/linphonecore.c:2520 ../coreapi/callbacks.c:32
+#: ../coreapi/linphonecore.c:2308
 msgid "Connected."
 msgstr "已连接。"
 
-#: ../coreapi/linphonecore.c:2554
+#: ../coreapi/linphonecore.c:2331
+#, fuzzy
+msgid "Call aborted"
+msgstr "中断"
+
+#: ../coreapi/linphonecore.c:2371
 msgid "Call ended"
 msgstr "呼叫结束"
 
+#: ../coreapi/linphonecore.c:2453
+#, fuzzy
+msgid "Could not pause the call"
+msgstr "无法呼叫"
+
+#: ../coreapi/linphonecore.c:2457
+msgid "Pausing the current call..."
+msgstr ""
+
+#: ../coreapi/linphonecore.c:2496
+msgid "There is already a call in process, pause or stop it first."
+msgstr ""
+
 #: ../coreapi/misc.c:147
 msgid ""
 "Your computer appears to be using ALSA sound drivers.\n"
@@ -1134,7 +551,7 @@ msgstr ""
 "ALSA 是最佳选择,然而 Linphone 必须的 Mixer OSS 模拟模块缺失。\n"
 "请以 root 用户运行 modprobe snd-mixer-oss 载入它。"
 
-#: ../coreapi/misc.c:497
+#: ../coreapi/misc.c:520
 msgid "Stun lookup in progress..."
 msgstr "正在进行 Stun 查找..."
 
@@ -1186,14 +603,13 @@ msgstr "挂起"
 msgid "Unknown-bug"
 msgstr "未知错误"
 
-#: ../coreapi/proxy.c:182
+#: ../coreapi/proxy.c:187
 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:188
+#: ../coreapi/proxy.c:193
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
@@ -1201,94 +617,132 @@ msgstr ""
 "您输入的地址无效。\n"
 "它应具有“sip:用户名@代理域”的形式,例如 sip:alice@example.net"
 
-#: ../coreapi/proxy.c:663
+#: ../coreapi/proxy.c:670
 #, c-format
 msgid "Could not login as %s"
 msgstr "无法登录为 %s"
 
-#: ../coreapi/callbacks.c:95
+#: ../coreapi/callbacks.c:170
 msgid "is contacting you"
 msgstr "正在联系您"
 
-#: ../coreapi/callbacks.c:96
+#: ../coreapi/callbacks.c:171
 msgid " and asked autoanswer."
 msgstr " 并询问了自动回答。"
 
-#: ../coreapi/callbacks.c:96
+#: ../coreapi/callbacks.c:171
 msgid "."
 msgstr "."
 
-#: ../coreapi/callbacks.c:120
+#: ../coreapi/callbacks.c:226
 msgid "Remote ringing."
 msgstr "响铃。"
 
-#: ../coreapi/callbacks.c:140
+#: ../coreapi/callbacks.c:251
 msgid "Early media."
 msgstr ""
 
-#: ../coreapi/callbacks.c:252
+#: ../coreapi/callbacks.c:289
+#, fuzzy, c-format
+msgid "Call with %s is paused."
+msgstr "与 %s 通话"
+
+#: ../coreapi/callbacks.c:300
+#, c-format
+msgid "Call answered by %s - on hold."
+msgstr ""
+
+#: ../coreapi/callbacks.c:315
+#, fuzzy
+msgid "Call resumed."
+msgstr "呼叫结束"
+
+#: ../coreapi/callbacks.c:320
+#, c-format
+msgid "Call answered by %s."
+msgstr ""
+
+#: ../coreapi/callbacks.c:381
+msgid "We are being paused..."
+msgstr ""
+
+#: ../coreapi/callbacks.c:385
+msgid "We have been resumed..."
+msgstr ""
+
+#: ../coreapi/callbacks.c:422
 msgid "Call terminated."
 msgstr "通话结束。"
 
-#: ../coreapi/callbacks.c:269
+#: ../coreapi/callbacks.c:429
 msgid "User is busy."
 msgstr "被叫正忙。"
 
-#: ../coreapi/callbacks.c:270
+#: ../coreapi/callbacks.c:430
 msgid "User is temporarily unavailable."
 msgstr "您呼叫的用户暂时无法接通。"
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:272
+#: ../coreapi/callbacks.c:432
 msgid "User does not want to be disturbed."
 msgstr "用户已开启免打扰功能。"
 
-#: ../coreapi/callbacks.c:273
+#: ../coreapi/callbacks.c:433
 msgid "Call declined."
 msgstr "呼叫被拒绝。"
 
-#: ../coreapi/callbacks.c:285
+#: ../coreapi/callbacks.c:445
 msgid "No response."
 msgstr "没有响应。"
 
-#: ../coreapi/callbacks.c:288
+#: ../coreapi/callbacks.c:449
 msgid "Protocol error."
 msgstr "协议错误。"
 
-#: ../coreapi/callbacks.c:302
+#: ../coreapi/callbacks.c:465
 msgid "Redirected"
 msgstr "已重定向"
 
-#: ../coreapi/callbacks.c:312
+#: ../coreapi/callbacks.c:475
 msgid "Not found"
 msgstr "未找到"
 
-#: ../coreapi/callbacks.c:322
+#: ../coreapi/callbacks.c:485
 msgid "No common codecs"
 msgstr "未找到常用编解码器"
 
-#: ../coreapi/callbacks.c:328
+#: ../coreapi/callbacks.c:491
 msgid "Call failed."
 msgstr "呼叫失败。"
 
-#: ../coreapi/callbacks.c:378
+#: ../coreapi/callbacks.c:527
+#, fuzzy
+msgid "Authentication failure"
+msgstr "Linphone - 需要认证"
+
+#: ../coreapi/callbacks.c:553
 #, c-format
 msgid "Registration on %s successful."
 msgstr "成功注册到 %s"
 
-#: ../coreapi/callbacks.c:379
+#: ../coreapi/callbacks.c:554
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "已在 %s 解除注册。"
 
-#: ../coreapi/callbacks.c:387
+#: ../coreapi/callbacks.c:570
+msgid "no response timeout"
+msgstr "没有响应,超时"
+
+#: ../coreapi/callbacks.c:573
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "注册到 %s 失败: %s"
 
-#: ../coreapi/callbacks.c:387
-msgid "no response timeout"
-msgstr "没有响应,超时"
+#: ../coreapi/callbacks.c:615
+#, c-format
+msgid "We are transferred to %s"
+msgstr ""
 
 #: ../mediastreamer2/src/alaw.c:144 ../mediastreamer2/src/alaw.c:162
 msgid "ITU-G.711 alaw encoder"
@@ -1314,15 +768,15 @@ msgstr "MacOS X 音频队列服务音频输入过滤器"
 msgid "Sound playback filter for MacOS X Audio Queue Service"
 msgstr "MacOS X 音频队列服务音频回放过滤器"
 
-#: ../mediastreamer2/src/dtmfgen.c:173 ../mediastreamer2/src/dtmfgen.c:191
+#: ../mediastreamer2/src/dtmfgen.c:274 ../mediastreamer2/src/dtmfgen.c:293
 msgid "DTMF generator"
 msgstr "DTMF 生成器"
 
-#: ../mediastreamer2/src/gsm.c:114 ../mediastreamer2/src/gsm.c:132
+#: ../mediastreamer2/src/gsm.c:120 ../mediastreamer2/src/gsm.c:138
 msgid "The GSM full-rate codec"
 msgstr "GSM 全速编解码器"
 
-#: ../mediastreamer2/src/gsm.c:181 ../mediastreamer2/src/gsm.c:199
+#: ../mediastreamer2/src/gsm.c:187 ../mediastreamer2/src/gsm.c:205
 msgid "The GSM codec"
 msgstr "GSM 编解码器"
 
@@ -1358,56 +812,48 @@ msgstr "将多个输入发送至单个输出。"
 msgid "Audio resampler"
 msgstr "音频重采样"
 
-#: ../mediastreamer2/src/msrtp.c:358 ../mediastreamer2/src/msrtp.c:376
+#: ../mediastreamer2/src/msrtp.c:369 ../mediastreamer2/src/msrtp.c:387
 msgid "RTP output filter"
 msgstr "RTP 输出过滤器"
 
-#: ../mediastreamer2/src/msrtp.c:493 ../mediastreamer2/src/msrtp.c:511
+#: ../mediastreamer2/src/msrtp.c:505 ../mediastreamer2/src/msrtp.c:523
 msgid "RTP input filter"
 msgstr "RTP 输入过滤器"
 
-#: ../mediastreamer2/src/msspeex.c:359 ../mediastreamer2/src/msspeex.c:377
-#: ../mediastreamer2/src/msspeex.c:519 ../mediastreamer2/src/msspeex.c:537
+#: ../mediastreamer2/src/msspeex.c:360 ../mediastreamer2/src/msspeex.c:378
+#: ../mediastreamer2/src/msspeex.c:548 ../mediastreamer2/src/msspeex.c:567
 msgid "The free and wonderful speex codec"
 msgstr "优秀的自由软件编解码器 Speex"
 
-#: ../mediastreamer2/src/msvolume.c:499 ../mediastreamer2/src/msvolume.c:514
+#: ../mediastreamer2/src/msvolume.c:527 ../mediastreamer2/src/msvolume.c:542
 msgid "A filter that controls and measure sound volume"
 msgstr "控制和调节音量的过滤器"
 
-#: ../mediastreamer2/src/msv4l.c:1011
+#: ../mediastreamer2/src/msv4l.c:1012
 msgid "A video4linux compatible source filter to stream pictures."
 msgstr "用于图像流的 video4linux 兼容源过滤器"
 
-#: ../mediastreamer2/src/msv4l2.c:580
+#: ../mediastreamer2/src/msv4l2.c:554
 msgid "A filter to grab pictures from Video4Linux2-powered cameras"
 msgstr "用于从 Video4Linux2 驱动的摄像头获取图像的过滤器"
 
-#: ../mediastreamer2/src/nowebcam.c:1838
+#: ../mediastreamer2/src/nowebcam.c:1854
 msgid "A filter that outputs a static image."
 msgstr "输出静态图像的过滤器"
 
-#: ../mediastreamer2/src/oss.c:567
-msgid "Sound capture filter for OSS drivers"
-msgstr "OSS 驱动的音频输入过滤器"
-
-#: ../mediastreamer2/src/oss.c:581
-msgid "Sound playback filter for OSS drivers"
-msgstr "OSS 驱动的音频回放过滤器"
-
-#: ../mediastreamer2/src/pixconv.c:177 ../mediastreamer2/src/pixconv.c:195
+#: ../mediastreamer2/src/pixconv.c:129 ../mediastreamer2/src/pixconv.c:147
 msgid "A pixel format converter"
 msgstr "像素格式转换器"
 
-#: ../mediastreamer2/src/sizeconv.c:204
+#: ../mediastreamer2/src/sizeconv.c:202
 msgid "A video size converter"
 msgstr "视频尺寸转换器"
 
-#: ../mediastreamer2/src/sizeconv.c:222
+#: ../mediastreamer2/src/sizeconv.c:220
 msgid "a small video size converter"
 msgstr "小的视频尺寸转换器"
 
-#: ../mediastreamer2/src/speexec.c:267 ../mediastreamer2/src/speexec.c:285
+#: ../mediastreamer2/src/speexec.c:276 ../mediastreamer2/src/speexec.c:294
 msgid "Echo canceller using speex library"
 msgstr "使用 Speex 库的回声抑制器"
 
@@ -1435,55 +881,55 @@ msgstr "ITU-G.711 ulaw 编码器"
 msgid "ITU-G.711 ulaw decoder"
 msgstr "ITU-G.711 ulaw 解码器"
 
-#: ../mediastreamer2/src/videodec.c:701 ../mediastreamer2/src/videodec.c:717
-#: ../mediastreamer2/src/videodec.c:800 ../mediastreamer2/src/videodec.c:816
+#: ../mediastreamer2/src/videodec.c:713 ../mediastreamer2/src/videodec.c:729
+#: ../mediastreamer2/src/videodec.c:812 ../mediastreamer2/src/videodec.c:828
 msgid "A H.263 decoder using ffmpeg library"
 msgstr "使用 ffmpeg 库的 H.263 解码器"
 
-#: ../mediastreamer2/src/videodec.c:734
+#: ../mediastreamer2/src/videodec.c:746
 msgid "A MPEG4 decoder using ffmpeg library"
 msgstr "使用 ffmpeg 库的 MPEG4 解码器"
 
-#: ../mediastreamer2/src/videodec.c:750
+#: ../mediastreamer2/src/videodec.c:762
 msgid "A RTP/JPEG decoder using ffmpeg library"
 msgstr "使用 ffmpeg 库的 RTP/JPEG 解码器"
 
-#: ../mediastreamer2/src/videodec.c:766
+#: ../mediastreamer2/src/videodec.c:778
 msgid "A MJPEG decoder using ffmpeg library"
 msgstr "使用 ffmpeg 库的 MJPEG 解码器"
 
-#: ../mediastreamer2/src/videodec.c:782
+#: ../mediastreamer2/src/videodec.c:794
 msgid "A snow decoder using ffmpeg library"
 msgstr "使用 ffmpeg 库的 snow 解码器"
 
-#: ../mediastreamer2/src/videoenc.c:861 ../mediastreamer2/src/videoenc.c:943
+#: ../mediastreamer2/src/videoenc.c:908 ../mediastreamer2/src/videoenc.c:990
 msgid "A video H.263 encoder using ffmpeg library."
 msgstr "使用 ffmpeg 库的 H.263 编码器"
 
-#: ../mediastreamer2/src/videoenc.c:877
+#: ../mediastreamer2/src/videoenc.c:924
 msgid ""
 "A video H.263 encoder using ffmpeg library. It is compliant with old RFC2190 "
 "spec."
 msgstr "使用 ffmpeg 库的 H.263 视频编码器,符合旧的 RFC2190"
 
-#: ../mediastreamer2/src/videoenc.c:893 ../mediastreamer2/src/videoenc.c:975
+#: ../mediastreamer2/src/videoenc.c:940 ../mediastreamer2/src/videoenc.c:1022
 msgid "A video MPEG4 encoder using ffmpeg library."
 msgstr "使用 ffmpeg 库的 MPEG4 视频编码器"
 
-#: ../mediastreamer2/src/videoenc.c:909
+#: ../mediastreamer2/src/videoenc.c:956
 msgid "A video snow encoder using ffmpeg library."
 msgstr "使用 ffmpeg 库的 snow 编码器"
 
-#: ../mediastreamer2/src/videoenc.c:925
+#: ../mediastreamer2/src/videoenc.c:972
 msgid "A RTP/MJPEG encoder using ffmpeg library."
 msgstr "使用 ffmpeg 库的 RTP/MJPEG 编码器"
 
-#: ../mediastreamer2/src/videoenc.c:959
+#: ../mediastreamer2/src/videoenc.c:1006
 msgid ""
 "A video H.263 encoder using ffmpeg library, compliant with old RFC2190 spec."
 msgstr "使用 ffmpeg 库的 H.263 编码器,符合旧的 RFC2190"
 
-#: ../mediastreamer2/src/videoenc.c:991
+#: ../mediastreamer2/src/videoenc.c:1038
 msgid ""
 "The snow codec is royalty-free and is open-source. \n"
 "It uses innovative techniques that makes it one of most promising video "
@@ -1495,12 +941,13 @@ msgstr ""
 "创新科技使 Snow 成为当今最有希望的视频编解码器。它在 ffmpeg 项目内实现。\n"
 "然而它仍处于开发中,稳定性和与其他版本的兼容性尚无法保证。"
 
-#: ../mediastreamer2/src/videoenc.c:1011
+#: ../mediastreamer2/src/videoenc.c:1058
 msgid "A MJPEG encoder using ffmpeg library."
 msgstr "使用 ffmpeg 库的 MJPEG 编码器"
 
-#: ../mediastreamer2/src/videoout.c:1821 ../mediastreamer2/src/videoout.c:1839
-msgid "A generic video display"
+#: ../mediastreamer2/src/videoout.c:933
+#, fuzzy
+msgid "A SDL-based video display"
 msgstr "通用视频显示"
 
 #: ../mediastreamer2/src/wincevideods.c:969
@@ -1527,12 +974,12 @@ msgstr ""
 msgid "Parametric sound equalizer."
 msgstr ""
 
-#: ../mediastreamer2/src/msdscap-mingw.cc:1003
+#: ../mediastreamer2/src/msdscap-mingw.cc:1038
 msgid "A webcam grabber based on directshow."
 msgstr "使用 DirectShow 的摄像头抓取器"
 
-#: ../mediastreamer2/src/drawdib-display.c:679
-#: ../mediastreamer2/src/drawdib-display.c:697
+#: ../mediastreamer2/src/drawdib-display.c:552
+#: ../mediastreamer2/src/drawdib-display.c:570
 msgid "A video display based on windows DrawDib api"
 msgstr ""
 
@@ -1553,3 +1000,520 @@ msgstr ""
 #: ../mediastreamer2/src/extdisplay.c:62 ../mediastreamer2/src/extdisplay.c:79
 msgid "A display filter sending the buffers to draw to the upper layer"
 msgstr ""
+
+#: ../mediastreamer2/src/msiounit.c:619
+#, fuzzy
+msgid "Sound capture filter for MacOS X Audio Unit Service"
+msgstr "MacOS X 音频队列服务音频输入过滤器"
+
+#: ../mediastreamer2/src/msiounit.c:633
+#, fuzzy
+msgid "Sound playback filter for MacOS X Audio Unit Service"
+msgstr "MacOS X 音频队列服务音频回放过滤器"
+
+#: ../mediastreamer2/src/x11video.c:562
+msgid "A video display using X11+Xv"
+msgstr ""
+
+#. .id=
+#. .name=
+#. .text=
+#: ../mediastreamer2/src/msandroid.cpp:370
+#, fuzzy
+msgid "Sound capture filter for Android"
+msgstr "OSS 驱动的音频输入过滤器"
+
+#. .id=
+#. .name=
+#. .text=
+#: ../mediastreamer2/src/msandroid.cpp:667
+#, fuzzy
+msgid "Sound playback filter for Android"
+msgstr "OSS 驱动的音频回放过滤器"
+
+#: ../mediastreamer2/src/msandroidvideo.cpp:134
+#, fuzzy
+msgid "A filter that captures Android video."
+msgstr "控制和调节音量的过滤器"
+
+#~ msgid "Incoming call from %s"
+#~ msgstr "来自 %s 的呼叫"
+
+#~ msgid "#"
+#~ msgstr "#"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "0"
+#~ msgstr "0"
+
+#~ msgid "1"
+#~ msgstr "1"
+
+#~ msgid "2"
+#~ msgstr "2"
+
+#~ msgid "3"
+#~ msgstr "3"
+
+#~ msgid "4"
+#~ msgstr "4"
+
+#~ msgid "5"
+#~ msgstr "5"
+
+#~ msgid "6"
+#~ msgstr "6"
+
+#~ msgid "7"
+#~ msgstr "7"
+
+#~ msgid "8"
+#~ msgstr "8"
+
+#~ msgid "9"
+#~ msgstr "9"
+
+#~ msgid "<b>Add contacts from directory</b>"
+#~ msgstr "<b>从目录增加联系人</b>"
+
+#~ msgid "<b>Contact list</b>"
+#~ msgstr "<b>联系人列表</b>"
+
+#~ msgid "<b>Welcome !</b>"
+#~ msgstr "<b>欢迎!</b>"
+
+#~ msgid "A"
+#~ msgstr "A"
+
+#~ msgid ""
+#~ "ADSL\n"
+#~ "Fiber Channel"
+#~ msgstr ""
+#~ "ADSL\n"
+#~ "光纤"
+
+#~ msgid ""
+#~ "All users\n"
+#~ "Online users"
+#~ msgstr ""
+#~ "全部用户\n"
+#~ "在线用户"
+
+#~ msgid "Assistant"
+#~ msgstr "配置向导"
+
+#~ msgid "Audio & Video"
+#~ msgstr "音频和视频"
+
+#~ msgid "Audio only"
+#~ msgstr "音频"
+
+#~ msgid "Automatically log me in"
+#~ msgstr "自动登录"
+
+#~ msgid "B"
+#~ msgstr "B"
+
+#~ msgid "C"
+#~ msgstr "C"
+
+#~ msgid "Call Details"
+#~ msgstr "呼叫详情"
+
+#~ msgid "Call history"
+#~ msgstr "呼叫历史"
+
+#~ msgid "Check for updates"
+#~ msgstr "检查更新"
+
+#~ msgid "Contacts"
+#~ msgstr "联系人"
+
+#~ msgid "D"
+#~ msgstr "D"
+
+#~ msgid "Default"
+#~ msgstr "靘莤"
+
+#~ msgid "Duration"
+#~ msgstr "通话时间"
+
+#~ msgid "Duration:"
+#~ msgstr "通话计时:"
+
+#~ msgid "Enable self-view"
+#~ msgstr "启用自视"
+
+#~ msgid "Enter username, phone number, or full sip address"
+#~ msgstr "请输入用户名、电话号码或完整的 SIP 地址"
+
+#~ msgid "Homepage"
+#~ msgstr "丝饾"
+
+#~ msgid "In call"
+#~ msgstr "呼入"
+
+#~ msgid "Internet connection:"
+#~ msgstr "网络连接:"
+
+#~ msgid "Keypad"
+#~ msgstr "数字键盘"
+
+#~ msgid "Login information"
+#~ msgstr "登录信息"
+
+#~ msgid "Lookup:"
+#~ msgstr "查找:"
+
+#~ msgid "My current identity:"
+#~ msgstr "当前地址:"
+
+#~ msgid "Password"
+#~ msgstr "密码"
+
+#~ msgid "SIP address or phone number:"
+#~ msgstr "SIP 地址或电话号码:"
+
+#~ msgid "Search"
+#~ msgstr "搜索"
+
+#~ msgid "Show debug messages"
+#~ msgstr "显示调试信息"
+
+#~ msgid "Start call"
+#~ msgstr "开始呼叫"
+
+#~ msgid "Terminate call"
+#~ msgstr "终止呼叫"
+
+#~ msgid "Username"
+#~ msgstr "用户名"
+
+#~ msgid "_Linphone"
+#~ msgstr "_Linphone"
+
+#~ msgid "_Modes"
+#~ msgstr "模式(_M)"
+
+#~ msgid "in"
+#~ msgstr "于"
+
+#~ msgid "label"
+#~ msgstr "标签"
+
+#~ msgid "About linphone"
+#~ msgstr "关于 Linphone"
+
+#~ msgid "An internet video phone using the standard SIP (rfc3261) protocol."
+#~ msgstr "一个采用标准 SIP (rfc3261) 协议的互联网视频电话"
+
+#~ msgid "Created by Simon Morlat\n"
+#~ msgstr "由 Simon Morlat 创建\n"
+
+#~ 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"
+#~ "zh_CN: Jiang Honglei <hongleij@126.com> 和 Aron Xu <happyaron.xu@gmail."
+#~ "com>\n"
+
+#~ msgid "<b>Contact information</b>"
+#~ msgstr "<b>联系人信息</b>"
+
+#~ msgid "Allow this contact to see my presence status"
+#~ msgstr "允许此人看到我的在线状态"
+
+#~ msgid "SIP Address"
+#~ msgstr "SIP 地址"
+
+#~ msgid "Show this contact presence status"
+#~ msgstr "显示该联系人的在线状态"
+
+#~ msgid "Linphone debug window"
+#~ msgstr "Linphone 调试窗口"
+
+#~ msgid "Password:"
+#~ msgstr "密码:"
+
+#~ msgid "Please enter the domain password"
+#~ msgstr "请输入密码"
+
+#~ msgid "UserID"
+#~ msgstr "用户 ID"
+
+#~ msgid "Configure a SIP account"
+#~ msgstr "配置 SIP 帐户"
+
+#~ msgid "Linphone - Configure a SIP account"
+#~ msgstr "Linphone - 配置 SIP 帐户"
+
+#~ msgid "Looks like sip:<proxy hostname>"
+#~ msgstr "类似于 sip:<代理主机名>"
+
+#~ msgid "Looks like sip:<username>@<domain>"
+#~ msgstr "类似于 sip:<用户名>@<域>"
+
+#~ msgid "Publish presence information"
+#~ msgstr "发布在线状态"
+
+#~ msgid "Register at startup"
+#~ msgstr "在启动时注册"
+
+#~ msgid "Registration duration (sec):"
+#~ msgstr "注册间隔(秒):"
+
+#~ msgid "Route (optional):"
+#~ msgstr "路由(可选):"
+
+#~ msgid "SIP Proxy address:"
+#~ msgstr "SIP 代理地址:"
+
+#~ msgid "Your SIP identity:"
+#~ msgstr "您的 SIP 地址:"
+
+#~ msgid "sip:"
+#~ msgstr "sip:"
+
+#~ msgid "Send"
+#~ msgstr "发送"
+
+#~ msgid "Accept"
+#~ msgstr "接受"
+
+#~ msgid "Decline"
+#~ msgstr "拒绝"
+
+#~ msgid "Incoming call from"
+#~ msgstr "来自"
+
+#~ msgid "Linphone - Incoming call"
+#~ msgstr "Linphone - 呼入"
+
+#~ msgid "0 stands for \"unlimited\""
+#~ msgstr "0 表示 “没有限制”"
+
+#~ msgid "<b>Audio</b>"
+#~ msgstr "<b>音频</b>"
+
+#~ msgid "<b>Bandwidth control</b>"
+#~ msgstr "<b>带宽控制</b>"
+
+#~ msgid "<b>Codecs</b>"
+#~ msgstr "<b>编解码器</b>"
+
+#~ msgid "<b>Default identity</b>"
+#~ msgstr "<b>靘莤帐戡</b>"
+
+#~ msgid "<b>Language</b>"
+#~ msgstr "<b>语言</b>"
+
+#~ msgid "<b>Level</b>"
+#~ msgstr "<b>级刍</b>"
+
+#~ msgid "<b>NAT and Firewall</b>"
+#~ msgstr "<b>NAT 及防火墙</b>"
+
+#~ msgid "<b>Ports</b>"
+#~ msgstr "<b>端口</b>"
+
+#~ msgid "<b>Privacy</b>"
+#~ msgstr "<b>隐私</b>"
+
+#~ msgid "<b>Proxy accounts</b>"
+#~ msgstr "<b>代理帐户</b>"
+
+#~ msgid "<b>Transport</b>"
+#~ msgstr "<b>传输协议</b>"
+
+#~ msgid "<b>Video</b>"
+#~ msgstr "<b>视频</b>"
+
+#~ msgid "ALSA special device (optional):"
+#~ msgstr "ALSA 特殊设备(可选):"
+
+#~ msgid "Add"
+#~ msgstr "添加"
+
+#~ msgid "Audio RTP/UDP:"
+#~ msgstr "音频 RTP/UDP:"
+
+#~ msgid ""
+#~ "Audio codecs\n"
+#~ "Video codecs"
+#~ msgstr ""
+#~ "音频编解码器\n"
+#~ "视频编解码器"
+
+#~ msgid "Behind NAT / Firewall (specify gateway IP below)"
+#~ msgstr "在 NAT 或防火墙后(填写网关 IP)"
+
+#~ msgid "Behind NAT / Firewall (use STUN to resolve)"
+#~ msgstr "在 NAT 或防火墙后(使用 STUN 解决)"
+
+#~ msgid "CIF"
+#~ msgstr "CIF"
+
+#~ msgid "Capture device:"
+#~ msgstr "录音设备:"
+
+#~ msgid "Codecs"
+#~ msgstr "编解码器"
+
+#~ msgid "Direct connection to the Internet"
+#~ msgstr "直接连接到互联网"
+
+#~ msgid "Disable"
+#~ msgstr "禁用"
+
+#~ msgid "Done"
+#~ msgstr "完成"
+
+#~ msgid "Download speed limit in Kbit/sec:"
+#~ msgstr "下载速率限制 kbit/s:"
+
+#~ msgid "Edit"
+#~ msgstr "编辑"
+
+#~ msgid "Enable"
+#~ msgstr "启用"
+
+#~ msgid "Enable echo cancellation"
+#~ msgstr "启用回声抑制"
+
+#~ msgid "Erase all passwords"
+#~ msgstr "清除所有密码"
+
+#~ msgid "Manage SIP Accounts"
+#~ msgstr "SIP 帐户管理"
+
+#~ msgid "Multimedia settings"
+#~ msgstr "音视频设置"
+
+#~ msgid "Network settings"
+#~ msgstr "网络设置"
+
+#~ msgid "Playback device:"
+#~ msgstr "回放设备:"
+
+#~ msgid "Prefered video resolution:"
+#~ msgstr "视频分辨率:"
+
+#~ msgid "Public IP address:"
+#~ msgstr "公网 IP 地址:"
+
+#~ msgid ""
+#~ "Register to FONICS\n"
+#~ "virtual network !"
+#~ msgstr ""
+#~ "注册到 FONICS\n"
+#~ "虚拟网络!"
+
+#~ msgid "Remove"
+#~ msgstr "移除"
+
+#~ msgid "Ring device:"
+#~ msgstr "响铃设备:"
+
+#~ msgid "Ring sound:"
+#~ msgstr "铃声文件:"
+
+#~ msgid "SIP (UDP):"
+#~ msgstr "SIP (UDP):"
+
+#~ msgid "Send DTMFs as SIP info"
+#~ msgstr "以 SIP 消息发送 DTMF"
+
+#~ msgid "Set Maximum Transmission Unit:"
+#~ msgstr "设置最大传输单元(MTU):"
+
+#~ msgid "Settings"
+#~ msgstr "莞罎"
+
+#~ msgid "Show advanced settings"
+#~ msgstr "昞示鍘级莞罎"
+
+#~ msgid "Stun server:"
+#~ msgstr "Stun 服务器:"
+
+#~ msgid "This section defines your SIP address when not using a SIP account"
+#~ msgstr "该段在您不使用SIP帐户时的SIP地址"
+
+#~ msgid "Upload speed limit in Kbit/sec:"
+#~ msgstr "上传速率限制 kbit/s:"
+
+#~ msgid "Use IPv6 instead of IPv4"
+#~ msgstr "使用 IPv6 而非 IPv4"
+
+#~ msgid "User interface"
+#~ msgstr "用户界面"
+
+#~ msgid "Video RTP/UDP:"
+#~ msgstr "视频 RTP/UDP:"
+
+#~ msgid "Video input device:"
+#~ msgstr "视频输入设备:"
+
+#~ msgid "Your display name (eg: John Doe):"
+#~ msgstr "您的显示名:"
+
+#~ msgid "Your resulting SIP address:"
+#~ msgstr "您的 SIP 地址结果:"
+
+#~ msgid "Your username:"
+#~ msgstr "您的用户名:"
+
+#~ msgid "a sound card\n"
+#~ msgstr "声卡\n"
+
+#~ msgid "default camera"
+#~ msgstr "默认摄像头"
+
+#~ msgid "default soundcard"
+#~ msgstr "默认声卡"
+
+#~ msgid "default soundcard\n"
+#~ msgstr "默认声卡\n"
+
+#~ msgid "<b>Search somebody</b>"
+#~ msgstr "<b>找人</b>"
+
+#~ msgid "Add to my list"
+#~ msgstr "添加为联系人"
+
+#~ msgid "Search contacts in directory"
+#~ msgstr "查找联系人"
+
+#~ msgid "Linphone"
+#~ msgstr "Linphone"
+
+#~ msgid "Please wait"
+#~ msgstr "请稍候"
+
+#~ 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/scripts/builder-mingw.mk b/scripts/builder-mingw.mk
index 7363218af95bebf6cf4d39c603a68d41f6d107b8..0a9937cc3e41a17054bdf16f33deacab3d1eee89 100644
--- a/scripts/builder-mingw.mk
+++ b/scripts/builder-mingw.mk
@@ -11,7 +11,7 @@ MSX264_ZIP=$(WORKDIR)/msx264.zip
 INSTALL_ROOT=$(WORKDIR)/root
 FILELIST=$(WORKDIR)/linphone-bundle.filelist
 
-LINPHONE_VERSION=strings $(INSTALL_ROOT)/bin/linphone-3.exe |grep linphone_ident | sed 's/linphone_ident_string=//'
+LINPHONE_VERSION=strings $(INSTALL_ROOT)/bin/linphone.exe |grep linphone_ident | sed 's/linphone_ident_string=//'
 
 $(WORKDIR):
 	mkdir -p $(WORKDIR)
diff --git a/share/Makefile.am b/share/Makefile.am
index 6def02724e4903ed74404323f3af58977c4992d5..a96607b711a00ae4d186eb156f72bbcaa7a3c777 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -8,7 +8,7 @@ LINPHONE_RINGS=rings/orig.wav \
 				rings/oldphone-mono-30s.caf \
 				rings/rock.wav \
 				rings/bigben.wav \
-				rings/toy.wav \
+				rings/toy-mono.wav \
 				rings/sweet.wav \
 				rings/synth.wav \
 				rings/tapping.wav
diff --git a/share/linphone.desktop.in b/share/linphone.desktop.in
index 7a490a74d038a4b0bcd0f0330254dfc29c568ba6..d8ab62a5b246ea23ef3aa667e200bb4a1266ce83 100644
--- a/share/linphone.desktop.in
+++ b/share/linphone.desktop.in
@@ -4,7 +4,7 @@ Comment=Linphone is a web-phone
 Comment[fr]=Linphone est un web-phone.
 Comment[de]=Linphone ist ein web-phone.
 Type=Application
-Exec=linphone-3
+Exec=linphone
 Icon=@prefix@/share/pixmaps/linphone/linphone.png
 Terminal=false
-Categories=Network;Telephony;
\ No newline at end of file
+Categories=Network;Telephony;
diff --git a/share/rings/toy-mono.wav b/share/rings/toy-mono.wav
new file mode 100644
index 0000000000000000000000000000000000000000..a6e0093a589c29973a04ddbff2ff2c65c874eff5
Binary files /dev/null and b/share/rings/toy-mono.wav differ
diff --git a/share/rings/toy.wav b/share/rings/toy.wav
deleted file mode 100644
index 7a51984929908a2ad0dd3825c119cab915b9c5a8..0000000000000000000000000000000000000000
Binary files a/share/rings/toy.wav and /dev/null differ