diff --git a/linphone/NEWS b/linphone/NEWS
index 3ecee9123..4f3e49ea4 100644
--- a/linphone/NEWS
+++ b/linphone/NEWS
@@ -1,3 +1,8 @@
+linphone-3.1.1 -- April 7, 2009
+	* fix crash when opening property box, in some rare case
+	* windows version uses the new libmsdscap plugin (video capture using directshow)
+	* improved translations
+
 linphone-3.1.0 -- March 16, 2009
 	* linphone can now send large video pictures: up to SVGA, configurable via the user interface
 	* automatic rescaling of the video windows to the video size of incoming stream
diff --git a/linphone/configure.in b/linphone/configure.in
index 1c9e05683..5602ed183 100644
--- a/linphone/configure.in
+++ b/linphone/configure.in
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([linphone],[3.1.0.1],[linphone-developers@nongnu.org])
+AC_INIT([linphone],[3.1.1],[linphone-developers@nongnu.org])
 
 dnl Source packaging numbers
 
diff --git a/linphone/gtk-glade/Makefile.am b/linphone/gtk-glade/Makefile.am
index 1bcafbac6..6482d8316 100644
--- a/linphone/gtk-glade/Makefile.am
+++ b/linphone/gtk-glade/Makefile.am
@@ -24,7 +24,7 @@ if BUILD_GLADE_UI
 
 bin_PROGRAMS=linphone-3
 
-linphone_3_SOURCES=	main.c\
+linphone_3_SOURCES=	main.c \
 			propertybox.c \
 			friendlist.c \
 			support.c \
@@ -34,6 +34,7 @@ linphone_3_SOURCES=	main.c\
 			update.c \
 			buddylookup.c \
 			utils.c \
+			setupwizard.c\
 			linphone.h
 
 linphone_3_LDADD=$(top_builddir)/oRTP/src/libortp.la \
diff --git a/linphone/mediastreamer2/src/msv4l2.c b/linphone/mediastreamer2/src/msv4l2.c
index c86b3fcbd..3487d8c88 100644
--- a/linphone/mediastreamer2/src/msv4l2.c
+++ b/linphone/mediastreamer2/src/msv4l2.c
@@ -181,9 +181,11 @@ static int v4l2_configure(V4l2State *s){
         if (ioctl (s->fd, VIDIOC_G_FMT, &fmt)<0){
 		ms_error("VIDIOC_G_FMT failed: %s",strerror(errno));
 	}else{
-		ms_message("Size of picture is %ix%i",fmt.fmt.pix.width,fmt.fmt.pix.height);
+		ms_message("Size of webcam delivered pictures is %ix%i",fmt.fmt.pix.width,fmt.fmt.pix.height);
+		s->vsize.width=fmt.fmt.pix.width;
+		s->vsize.height=fmt.fmt.pix.height;
 	}
-	s->picture_size=get_picture_buffer_size(s->pix_fmt,fmt.fmt.pix.width,fmt.fmt.pix.height);
+	s->picture_size=get_picture_buffer_size(s->pix_fmt,s->vsize.width,s->vsize.height);
 	s->configured=TRUE;
 	return 0;
 }
diff --git a/linphone/mediastreamer2/src/msvideo.c b/linphone/mediastreamer2/src/msvideo.c
index 0d57b7d96..3c998e265 100644
--- a/linphone/mediastreamer2/src/msvideo.c
+++ b/linphone/mediastreamer2/src/msvideo.c
@@ -69,6 +69,9 @@ int yuv_buf_init_from_mblk(YuvBuf *buf, mblk_t *m){
 	}else if (size==(160*112*3)/2){/*format used by econf*/
 		w=160;
 		h=112;
+	}else if (size==(320*200*3)/2){/*format used by gTalk */
+		w=320;
+		h=200;
 	}else {
 		ms_error("Unsupported image size: size=%i (bug somewhere !)",size);
 		return -1;
diff --git a/linphone/po/POTFILES.in b/linphone/po/POTFILES.in
index 967b3b6af..e132503c5 100644
--- a/linphone/po/POTFILES.in
+++ b/linphone/po/POTFILES.in
@@ -8,6 +8,7 @@ gtk-glade/friendlist.c
 gtk-glade/propertybox.c
 gtk-glade/update.c
 gtk-glade/buddylookup.c
+gtk-glade/setupwizard.c
 gtk-glade/main.glade
 gtk-glade/about.glade
 gtk-glade/contact.glade
@@ -20,6 +21,7 @@ gtk-glade/chatroom.glade
 gtk-glade/incoming_call.glade
 gtk-glade/parameters.glade
 gtk-glade/buddylookup.glade
+gtk-glade/waiting.glade
 coreapi/linphonecore.c
 coreapi/misc.c
 coreapi/exevents.c
diff --git a/linphone/po/fr.po b/linphone/po/fr.po
index ebe59c000..59f25d03a 100644
--- a/linphone/po/fr.po
+++ b/linphone/po/fr.po
@@ -67,7 +67,7 @@ msgstr "Info de présence"
 
 #: ../gtk-glade/friendlist.c:380
 msgid "Invalid sip contact !"
-msgstr ""
+msgstr "Contact sip invalide !"
 
 #: ../gtk-glade/friendlist.c:411
 #, c-format
@@ -218,11 +218,11 @@ msgstr ""
 
 #: ../gtk-glade/main.glade.h:27
 msgid "Homepage"
-msgstr ""
+msgstr "Page d'accueil"
 
 #: ../gtk-glade/main.glade.h:28
 msgid "Lookup:"
-msgstr ""
+msgstr "Rechercher:"
 
 #: ../gtk-glade/main.glade.h:29
 msgid "My current identity:"
@@ -411,7 +411,6 @@ msgid "0 stands for \"unlimited\""
 msgstr "Indiquez 0 pour ne pas mettre de limite"
 
 #: ../gtk-glade/parameters.glade.h:2
-#, fuzzy
 msgid "<b>Audio</b>"
 msgstr "<b>Son</b>"
 
@@ -537,7 +536,7 @@ msgstr "Périphérique d'écoute:"
 
 #: ../gtk-glade/parameters.glade.h:33
 msgid "Prefered video resolution:"
-msgstr ""
+msgstr "Résolution video préférée:"
 
 #: ../gtk-glade/parameters.glade.h:34
 msgid "Public IP address:"
@@ -596,7 +595,6 @@ msgid "Video RTP/UDP:"
 msgstr ""
 
 #: ../gtk-glade/parameters.glade.h:48
-#, fuzzy
 msgid "Video input device:"
 msgstr "Périphérique d'entrée video"
 
@@ -892,17 +890,14 @@ msgid "Unknown"
 msgstr ""
 
 #: ../coreapi/friend.c:44
-#, fuzzy
 msgid "Be right back"
 msgstr "De retour"
 
 #: ../coreapi/friend.c:50
-#, fuzzy
 msgid "On the phone"
 msgstr "Au téléphone"
 
 #: ../coreapi/friend.c:53
-#, fuzzy
 msgid "Out to lunch"
 msgstr "A table"
 
@@ -919,17 +914,16 @@ msgid "Using another messaging service"
 msgstr ""
 
 #: ../coreapi/friend.c:65
-#, fuzzy
 msgid "Offline"
-msgstr "Disponible"
+msgstr "Non connecté"
 
 #: ../coreapi/friend.c:68
 msgid "Pending"
-msgstr ""
+msgstr "En attente"
 
 #: ../coreapi/friend.c:74
 msgid "Unknown-bug"
-msgstr ""
+msgstr "Bug inconnu"
 
 #: ../mediastreamer2/src/alaw.c:144 ../mediastreamer2/src/alaw.c:162
 msgid "ITU-G.711 alaw encoder"
@@ -940,13 +934,12 @@ msgid "ITU-G.711 alaw decoder"
 msgstr ""
 
 #: ../mediastreamer2/src/alsa.c:890
-#, fuzzy
 msgid "Alsa sound source"
-msgstr "une carte son\n"
+msgstr "Source alsa"
 
 #: ../mediastreamer2/src/alsa.c:987
 msgid "Alsa sound output"
-msgstr ""
+msgstr "Sortie alsa"
 
 #: ../mediastreamer2/src/aqsnd.c:603
 msgid "Sound capture filter for MacOS X Audio Queue Service"
@@ -962,7 +955,7 @@ msgstr ""
 
 #: ../mediastreamer2/src/gsm.c:70 ../mediastreamer2/src/gsm.c:88
 msgid "The GSM full-rate codec"
-msgstr ""
+msgstr "Le codec GSM full-rate"
 
 #: ../mediastreamer2/src/gsm.c:134 ../mediastreamer2/src/gsm.c:152
 msgid "The GSM codec"