From ffbb08ddfb74d291ea77bfa676656c148744dea0 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Thu, 15 Apr 2010 17:40:05 +0200 Subject: [PATCH 01/25] dont force people to use automake1.10 --- autogen.sh | 2 +- mediastreamer2 | 2 +- oRTP | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/autogen.sh b/autogen.sh index a8bd1ca1e..f32cf85f3 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,6 +1,6 @@ #!/bin/sh -AM_VERSION="1.10" +#AM_VERSION="1.10" if ! type aclocal-$AM_VERSION 1>/dev/null 2>&1; then # automake-1.10 (recommended) is not available on Fedora 8 AUTOMAKE=automake diff --git a/mediastreamer2 b/mediastreamer2 index a4d247cb5..166db20a4 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit a4d247cb5e8fc2cf04e615d5a7b90251d349b7a8 +Subproject commit 166db20a49a308e161d7b5c74fdc5aff000db9a2 diff --git a/oRTP b/oRTP index 6600413b7..92c452dcd 160000 --- a/oRTP +++ b/oRTP @@ -1 +1 @@ -Subproject commit 6600413b76e49b33976ea4459e5ceffe345655d6 +Subproject commit 92c452dcd38b26a0ce41d10be9a32d37f72a7d27 From efcf145867c49c13e832ae363ccf43616ad50e4a Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Thu, 15 Apr 2010 21:05:09 +0200 Subject: [PATCH 02/25] archive svg sources of icons. --- pixmaps/svg/callkeybackground.svg | 16 ++++++ pixmaps/svg/contact.svg | 16 ++++++ pixmaps/svg/dialer.svg | 42 ++++++++++++++ pixmaps/svg/history.svg | 28 +++++++++ pixmaps/svg/linphone-logo.svg | 96 +++++++++++++++++++++++++++++++ pixmaps/svg/linphone.svg | 83 ++++++++++++++++++++++++++ pixmaps/svg/more.svg | 16 ++++++ pixmaps/svg/startcall-green.svg | 40 +++++++++++++ pixmaps/svg/status-green.svg | 40 +++++++++++++ pixmaps/svg/status-offline.svg | 42 ++++++++++++++ pixmaps/svg/status-orange.svg | 41 +++++++++++++ pixmaps/svg/status-red.svg | 44 ++++++++++++++ pixmaps/svg/stopcall-red.svg | 38 ++++++++++++ 13 files changed, 542 insertions(+) create mode 100644 pixmaps/svg/callkeybackground.svg create mode 100644 pixmaps/svg/contact.svg create mode 100644 pixmaps/svg/dialer.svg create mode 100644 pixmaps/svg/history.svg create mode 100644 pixmaps/svg/linphone-logo.svg create mode 100644 pixmaps/svg/linphone.svg create mode 100644 pixmaps/svg/more.svg create mode 100644 pixmaps/svg/startcall-green.svg create mode 100644 pixmaps/svg/status-green.svg create mode 100644 pixmaps/svg/status-offline.svg create mode 100644 pixmaps/svg/status-orange.svg create mode 100644 pixmaps/svg/status-red.svg create mode 100644 pixmaps/svg/stopcall-red.svg diff --git a/pixmaps/svg/callkeybackground.svg b/pixmaps/svg/callkeybackground.svg new file mode 100644 index 000000000..4d86f7fd4 --- /dev/null +++ b/pixmaps/svg/callkeybackground.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + diff --git a/pixmaps/svg/contact.svg b/pixmaps/svg/contact.svg new file mode 100644 index 000000000..f094b7a0a --- /dev/null +++ b/pixmaps/svg/contact.svg @@ -0,0 +1,16 @@ + + + + + + + diff --git a/pixmaps/svg/dialer.svg b/pixmaps/svg/dialer.svg new file mode 100644 index 000000000..fef344bc3 --- /dev/null +++ b/pixmaps/svg/dialer.svg @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/pixmaps/svg/history.svg b/pixmaps/svg/history.svg new file mode 100644 index 000000000..11ba3a203 --- /dev/null +++ b/pixmaps/svg/history.svg @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/pixmaps/svg/linphone-logo.svg b/pixmaps/svg/linphone-logo.svg new file mode 100644 index 000000000..6861fef41 --- /dev/null +++ b/pixmaps/svg/linphone-logo.svg @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pixmaps/svg/linphone.svg b/pixmaps/svg/linphone.svg new file mode 100644 index 000000000..528247c89 --- /dev/null +++ b/pixmaps/svg/linphone.svg @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pixmaps/svg/more.svg b/pixmaps/svg/more.svg new file mode 100644 index 000000000..a9d1c50c3 --- /dev/null +++ b/pixmaps/svg/more.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + diff --git a/pixmaps/svg/startcall-green.svg b/pixmaps/svg/startcall-green.svg new file mode 100644 index 000000000..5af5140cc --- /dev/null +++ b/pixmaps/svg/startcall-green.svg @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/pixmaps/svg/status-green.svg b/pixmaps/svg/status-green.svg new file mode 100644 index 000000000..144adcf66 --- /dev/null +++ b/pixmaps/svg/status-green.svg @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/pixmaps/svg/status-offline.svg b/pixmaps/svg/status-offline.svg new file mode 100644 index 000000000..1576f034c --- /dev/null +++ b/pixmaps/svg/status-offline.svg @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pixmaps/svg/status-orange.svg b/pixmaps/svg/status-orange.svg new file mode 100644 index 000000000..9fbd47226 --- /dev/null +++ b/pixmaps/svg/status-orange.svg @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pixmaps/svg/status-red.svg b/pixmaps/svg/status-red.svg new file mode 100644 index 000000000..eb47308a2 --- /dev/null +++ b/pixmaps/svg/status-red.svg @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pixmaps/svg/stopcall-red.svg b/pixmaps/svg/stopcall-red.svg new file mode 100644 index 000000000..c3616ae7c --- /dev/null +++ b/pixmaps/svg/stopcall-red.svg @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + From 8fcbb3ebe8e4d59dd67e8c119efbf387ec650e27 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Thu, 15 Apr 2010 22:16:28 +0200 Subject: [PATCH 03/25] add new icons --- gtk-glade/incall_view.c | 2 +- gtk-glade/main.c | 24 +- gtk-glade/main.glade | 597 ++++++++++++++++++++---------------- pixmaps/Makefile.am | 3 +- pixmaps/contact-orange.png | Bin 0 -> 734 bytes pixmaps/dialer-orange.png | Bin 0 -> 1318 bytes pixmaps/startcall-green.png | Bin 0 -> 3103 bytes pixmaps/stopcall-red.png | Bin 0 -> 2960 bytes 8 files changed, 359 insertions(+), 267 deletions(-) create mode 100644 pixmaps/contact-orange.png create mode 100644 pixmaps/dialer-orange.png create mode 100644 pixmaps/startcall-green.png create mode 100644 pixmaps/stopcall-red.png diff --git a/gtk-glade/incall_view.c b/gtk-glade/incall_view.c index 1167c5ccd..1cf772b05 100644 --- a/gtk-glade/incall_view.c +++ b/gtk-glade/incall_view.c @@ -164,7 +164,7 @@ void linphone_gtk_in_call_view_terminate(const char *error_msg){ GtkWidget *main_window=linphone_gtk_get_main_window(); GtkWidget *status=linphone_gtk_get_widget(main_window,"in_call_status"); GtkWidget *animation=linphone_gtk_get_widget(main_window,"in_call_animation"); - GdkPixbuf *pbuf=create_pixbuf(linphone_gtk_get_ui_config("stop_call_icon","red.png")); + GdkPixbuf *pbuf=create_pixbuf(linphone_gtk_get_ui_config("stop_call_icon","stopcall-red.png")); if (error_msg==NULL) gtk_label_set_markup(GTK_LABEL(status),_("Call ended.")); diff --git a/gtk-glade/main.c b/gtk-glade/main.c index 85a354d40..c87352f4a 100644 --- a/gtk-glade/main.c +++ b/gtk-glade/main.c @@ -1048,14 +1048,16 @@ static void linphone_gtk_configure_main_window(){ static const char *stop_call_icon; static const char *search_icon; static gboolean update_check_menu; + static gboolean buttons_have_borders; GtkWidget *w=linphone_gtk_get_main_window(); if (!config_loaded){ title=linphone_gtk_get_ui_config("title","Linphone"); home=linphone_gtk_get_ui_config("home","http://www.linphone.org"); - start_call_icon=linphone_gtk_get_ui_config("start_call_icon","green.png"); - stop_call_icon=linphone_gtk_get_ui_config("stop_call_icon","red.png"); + start_call_icon=linphone_gtk_get_ui_config("start_call_icon","startcall-green.png"); + stop_call_icon=linphone_gtk_get_ui_config("stop_call_icon","stopcall-red.png"); search_icon=linphone_gtk_get_ui_config("directory_search_icon",NULL); update_check_menu=linphone_gtk_get_ui_config_int("update_check_menu",0); + buttons_have_borders=linphone_gtk_get_ui_config_int("buttons_border",1); config_loaded=TRUE; } linphone_gtk_configure_window(w,"main_window"); @@ -1068,11 +1070,15 @@ static void linphone_gtk_configure_main_window(){ if (start_call_icon){ GdkPixbuf *pbuf=create_pixbuf(start_call_icon); gtk_image_set_from_pixbuf(GTK_IMAGE(linphone_gtk_get_widget(w,"start_call_icon")),pbuf); + if (buttons_have_borders) + gtk_button_set_relief(GTK_BUTTON(linphone_gtk_get_widget(w,"start_call")),GTK_RELIEF_NORMAL); g_object_unref(G_OBJECT(pbuf)); } if (stop_call_icon){ GdkPixbuf *pbuf=create_pixbuf(stop_call_icon); gtk_image_set_from_pixbuf(GTK_IMAGE(linphone_gtk_get_widget(w,"terminate_call_icon")),pbuf); + if (buttons_have_borders) + gtk_button_set_relief(GTK_BUTTON(linphone_gtk_get_widget(w,"terminate_call")),GTK_RELIEF_NORMAL); g_object_unref(G_OBJECT(pbuf)); } if (search_icon){ @@ -1086,6 +1092,20 @@ static void linphone_gtk_configure_main_window(){ tmp=g_strdup(home); g_object_set_data(G_OBJECT(menu_item),"home",tmp); } + { + GdkPixbuf *pbuf=create_pixbuf("contact-orange.png"); + if (pbuf) { + gtk_image_set_from_pixbuf(GTK_IMAGE(linphone_gtk_get_widget(w,"contact_tab_icon")),pbuf); + g_object_unref(G_OBJECT(pbuf)); + } + } + { + GdkPixbuf *pbuf=create_pixbuf("dialer-orange.png"); + if (pbuf) { + gtk_image_set_from_pixbuf(GTK_IMAGE(linphone_gtk_get_widget(w,"keypad_tab_icon")),pbuf); + g_object_unref(G_OBJECT(pbuf)); + } + } if (!linphone_gtk_can_manage_accounts()) gtk_widget_hide(linphone_gtk_get_widget(w,"run_assistant")); if (update_check_menu){ diff --git a/gtk-glade/main.glade b/gtk-glade/main.glade index ee3183636..b858892fb 100644 --- a/gtk-glade/main.glade +++ b/gtk-glade/main.glade @@ -285,6 +285,7 @@ True True + True Enter username, phone number, or full sip address ● @@ -709,9 +710,26 @@ Fiber Channel - + True - Contacts + + + True + gtk-missing-image + + + 0 + + + + + True + Contacts + + + 1 + + False @@ -733,270 +751,306 @@ Fiber Channel 0 0 - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 4 - 4 - 4 - 20 - 10 - True + 0 - - D + True - True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 4 + 4 + 4 + True + + + D + 50 + 50 + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 3 + 4 + 3 + 4 + GTK_FILL + + + + + + # + 50 + 50 + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 2 + 3 + 3 + 4 + GTK_FILL + + + + + + 0 + 50 + 50 + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 1 + 2 + 3 + 4 + GTK_FILL + + + + + + * + 50 + 50 + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 3 + 4 + GTK_FILL + + + + + + C + 50 + 50 + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 3 + 4 + 2 + 3 + GTK_FILL + + + + + + 9 + 50 + 50 + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 2 + 3 + 2 + 3 + GTK_FILL + + + + + + 8 + 50 + 50 + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 1 + 2 + 2 + 3 + GTK_FILL + + + + + + 7 + 50 + 50 + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 2 + 3 + GTK_FILL + + + + + + B + 50 + 50 + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 3 + 4 + 1 + 2 + GTK_FILL + + + + + + 6 + 50 + 50 + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 2 + 3 + 1 + 2 + GTK_FILL + + + + + + 5 + 50 + 50 + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + + 4 + 50 + 50 + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 1 + 2 + GTK_FILL + + + + + + A + 50 + 50 + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 3 + 4 + GTK_FILL + + + + + + 3 + 50 + 50 + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 2 + 3 + GTK_FILL + + + + + + 2 + 50 + 50 + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 1 + 2 + GTK_FILL + + + + + + 1 + 50 + 50 + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + GTK_FILL + + + - - 3 - 4 - 3 - 4 - GTK_FILL - - - - - - # - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 2 - 3 - 3 - 4 - GTK_FILL - - - - - - 0 - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 1 - 2 - 3 - 4 - GTK_FILL - - - - - - * - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 3 - 4 - GTK_FILL - - - - - - C - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 3 - 4 - 2 - 3 - GTK_FILL - - - - - - 9 - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 2 - 3 - 2 - 3 - GTK_FILL - - - - - - 8 - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 1 - 2 - 2 - 3 - GTK_FILL - - - - - - 7 - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 2 - 3 - GTK_FILL - - - - - - B - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 3 - 4 - 1 - 2 - GTK_FILL - - - - - - 6 - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 2 - 3 - 1 - 2 - GTK_FILL - - - - - - 5 - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - - 4 - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 1 - 2 - GTK_FILL - - - - - - A - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 3 - 4 - GTK_FILL - - - - - - 3 - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 2 - 3 - GTK_FILL - - - - - - 2 - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 1 - 2 - GTK_FILL - - - - - - 1 - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - GTK_FILL - - @@ -1022,9 +1076,26 @@ Fiber Channel - + True - Keypad + + + True + gtk-missing-image + + + 0 + + + + + True + Keypad + + + 1 + + 1 diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am index e94ac7eef..15c7ec138 100644 --- a/pixmaps/Makefile.am +++ b/pixmaps/Makefile.am @@ -10,6 +10,7 @@ sip-otp.png sip-wfa.png \ green.png red.png \ mic_muted.png mic_active.png \ linphone-3-250x130.png linphone-3.png linphone2-57x57.png \ -linphone.png linphone-banner.png +linphone.png linphone-banner.png \ +contact-orange.png dialer-orange.png EXTRA_DIST=$(pixmap_DATA) diff --git a/pixmaps/contact-orange.png b/pixmaps/contact-orange.png new file mode 100644 index 0000000000000000000000000000000000000000..53ba07ed861eedef61d2ecae613cb69075dcc5df GIT binary patch literal 734 zcmV<40wMj0P)P000*V1^@s6{^R5m00001b5ch_0Itp) z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2igP= z6bBM@MbBIS00Le~L_t(Y$F-HcYZOrw#eXlEWJMQ5lr$DLlE%VzEri(Ueu3WC}xq9pM%nR)ZRX0FA|?9OaVHe}<4VIFUI=iGbFyLVt0 zAtD_SS(0WfiAab22oaf)og&XW`$4j_4Y-K6B6>rHVW?e@Yz4^!I0wOicM#lpHFaWf zJB(-u!Hp((4xt9_9eB&Vg=cmroUvVM2El_(AdNw5NXxZ}8I%0no=KEaSIGic4Q3Ne z3^oQ^u1x}Ig0;526HYX=3Y+v~`PXA}IC;1=Ga8AGA=u*SkyUTQT4?e1yS_V;C$j!| z8KVmybW%zb7xJZ=FTWEGjH_=Wk*vtEi=>;S7jZ$9CSWwA8+=&(g;Hu|B$6|yra!Jb zdDAnxM;7xbI)c`Ed3JVobtF%u`)~%me!B3%G`wlsfFEz&8HO>uPn@}qNy_V+l)e=G zadhJ=SEBcq_B2-H`GXF*ze(^NyxDrI8XaG)O&9Ox)V2HFZAs+SVu#=^kcW9(O%`Ws zGF5vHG7HX>q^{XZR?m}%1$FCX7eLADCmpgXYg>Q@(;t9?0A+vFXIKB+mMXhAH>c#q zV`)la`!YBOS(&Z({RFBC!vH~5m9^zL51A*zBm>#mfvzqATq#d*CE%b}ruoh?Q1Em5 ztd2-GYr596bj>WQy(;5+w!L!(GG9z>RoMOG(A2@Al3>8r&8?a0O=tAbRIom!JM=-v-tHKA~W;cKMX5&;RDdR6~BQ-V!aZg-1$d$N7)(7p~lNiD-Fb QV*mgE07*qoM6N<$g52{*w*UYD literal 0 HcmV?d00001 diff --git a/pixmaps/dialer-orange.png b/pixmaps/dialer-orange.png new file mode 100644 index 0000000000000000000000000000000000000000..2d715eac0c2c061fe1cb1075462d8497437444ad GIT binary patch literal 1318 zcmV+>1=;$EP)P000;W1^@s654Bdt00001b5ch_0Itp) z=>Px#32;bRa{vGh*8l(w*8xH(n|J^K00(qQO+^RV1P>GoBo;~)$p8QZxJg7oR7l6I zmR(F#M-<2Zb3bP8+`TK{N<>ivK`Yj;q_$lWTbFK$rKYwCNhM9w#@YuU8;GfiM$-a5 zSks5LQE{7A+Zat7qphvJNIwX+1{O`#3JR@AUKQ~`CrL*tgQso0j7t+Y~lW=@~_a& z^Z7}3+e%Pg09E&aYMaQ*8+?->VjU_W0CE!5Qv#|B1ys!k%1(gW++a306b-i=SvYq$ z>H5G>@J8WWo@UeeJSZ%WIA8aXSaK(T&miE0ECWmjD9a+B$L+k!Q# zo1-c7{eC}5O-UYhJEF@o#`=|EW!k{Oj?v!rxv5KLrc47_Q9$Al0Rcct0052Gll@)! z6CfWK?Sjg-fN6k20j449n0KRYke+J^MpwSDBq#kDIRI$(#y#hI{Tp6fw%$s#z6K2B^9P;YQ{Ccaki^`#H>48O$OcxixSsV3-j{ z20*nukH_BrRKYcvvyI&UW^#gi3#DxX^M+GSe4twg5a!Ut}iac ziGFo^Fc{pqZQC|H?venYb#?hykmZDAb2}UG9=$f}NdOX%vvswH+T5E56Bn-;;9}Gx z4t(Hz5)d*@$BN?U<>F;h~_M+!^wCPBKIMFJ4tvf=}D<4$qrs1Qvj6Y>fF6_@2NelJc|0Kf^LQ3&Ch@;&i-y}8`5|5@a?%?&b!#7W~5 zf$BbR+bK}p1_IqmbTsw1@pe`kwe}396)9Frh(PsPAIGj zl({S^xiyjRJMZ!1$IS=I6<=j#Wq+BG(cB*|b@}Uq8ccg?48p9<;u10IOC|z3Iy%tX z+xyBxAu&*o-EPmi+}U&Zz?l}b4UPh~Bx^#)C$`Eb0m9)hPM|}u zLf3WZx()ycg+ee*6Ots25JH|UD=TY#tiKhn*PAJXSOZ|G5Mmx7!~if1ph1$P-6bU@ c;qmeR0$RVA-Hr6DdH?_b07*qoM6N<$f_VvE%K!iX literal 0 HcmV?d00001 diff --git a/pixmaps/startcall-green.png b/pixmaps/startcall-green.png new file mode 100644 index 0000000000000000000000000000000000000000..2156d24e177c7413ac15c7d63c5dcd4760bb8071 GIT binary patch literal 3103 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 literal 0 HcmV?d00001 diff --git a/pixmaps/stopcall-red.png b/pixmaps/stopcall-red.png new file mode 100644 index 0000000000000000000000000000000000000000..1004b8a01a532795d80d19697d52e241c6b19b9b GIT binary patch literal 2960 zcmV;B3vcv^P)Px#32;bRa{vGh*8l(w*8xH(n|J^K00(qQO+^RV1P>DqDv8S44gdfPB1uF+RA}Di zntO0m^%ciI=kC25-pP_(3=fk9g9!D7SfD(zNfoMSskS3ZMYK+Gg_*4WUMXY zwA!kpP-ZANJ`fb8O2>kayueljMHJ8)LpIO>&4yhe94Xo^RBSuhX8EZGkEZCsk6k!N%DO z>bAZBjjp4)4aCq9w}I##ccaJMErx!RE64SI_;7G*!^a<%_PWVT72jpdz$mWYEBHkg z!cwiJ==kKpV09iNQhFA!^OUw95~_ z_13G=Q0Sh*8*ccb&w*DlcB+Zd%764Hi84)`cJo@I_V@Px>8bnt%?(e=(xpzHtnn)Rw;hkyePa!}!XoP)D-1_xU+wtzi*+=uoDAFx8<`>asJWrn)XycG%`wL;<2 znGL&kWdyvMapyYNJAk1H)T<4wYm%+wa{L8?vsjR8fT@5hi%B(s-3qFJ*S{iIwE*mN zh3Zy4Q)Yb?e!&Vw3ak_08#ltK(-`=eTUr9*H`qOh|P{}xblGTM6J&QgL;r_);xuCpi#2rN=?Lk3HzO+#Hb zoBB;X`lp|>3Cp@F?)B3Ff_HY#xQ1Gkq{D9}kG0i=%#VPQ5s|O}>;S=cN(kO+V2=SF z2AWe88Q>rrDk!?LN1K*;7d`vFa0gS2E~YMX6PuK(PSI$lW{yHl$#yZ%;NXz}!QVQ_ zcm*3%sJaCq0?hDJbsn!j6JkP}Ms6##z+Xe|?I2Ofm3cX5i%~z_u=f z@ks{>dP2NAm}2OH9ZGhVa8NUWHOU&8#b?KWl^xe96Ajl|z?ZRK>~7kJ;)9T5H0Eo9 zE0iKoxSW2Lj!^T`EQ)yIEa0mij4ryZ4Z<6Wab*d`U&Yv|{Rv#hX(B=7m?Ex=qn%Wb zKQnG<*E&4rN6FWWeQSRLpG|!&$P-xxw1aa`0vnhX_xyP$@G|P!6zY{!hXEaDwK~0L z?}QQ{_)37_g@Rl`jPHLtcBIwj1~~Y6SKW@unjE)NRm7a;$&LO|L2gPx5SCR@bTR9;;iGO1sCDVU0~@RG|MJW;@v#?as26);lZU!;hY7v(4n_@X!FY#Q z4off&o6q$)i zc6gJO0qSl~5(}i49ZWG=XnYRTf~l#t3%gShB&{=wrzB-(pX+*T4ZP@vqAkct_G6y0IxuvddL`yh)mJ^ALw!RFHw2nkBv_eO| zZG|EiTcPm4j^DqXmvg)=5va8`!NsZaZ!${$six55pni~bXzA{rtt4(^Ai6$V41Kof zF0>psq6yJKIp{;&G&eV3sVJIlVz)<8wuy>HV_6TT*(K@6>b&B_26mU{5@E49+nHD-`lr8NtI@&rAAX-&veRea8fzb5P~DU9-fkUoN^nDLzB7`%K5) zIVa3F*-Xdo$DOFT8Oz>ix3<4lMljNQ5;OIFsZ~KHz;_AqSDTjSI&)1TyhH>(D40J= z3|ByM+?R-9Oh(ryirW||hAv%~LRW{?0rIFa%{pb7`<$q?U2OZkqZ0a{Y)?g7AD!uw zO9h2<1W88nwSlZxs1>CI|CQCAynemgJ7mb&E}t)7&(FA(0Sd@UQTWMgg?(6i;)6C)|b7~WY+O!?+ID(qMYl2!noBDSo zD}w*bl%#9irfmVJMv!F!t4atS;{QRa8F%jb>@pL-QSv{G?+J0u2kyQA0000 Date: Thu, 15 Apr 2010 22:45:22 +0200 Subject: [PATCH 04/25] improve gui and add presence icons --- gtk-glade/friendlist.c | 24 ++++++++++++------------ gtk-glade/incall_view.c | 1 - gtk-glade/main.c | 4 ++++ pixmaps/status-green.png | Bin 0 -> 1261 bytes pixmaps/status-offline.png | Bin 0 -> 1179 bytes pixmaps/status-orange.png | Bin 0 -> 1252 bytes pixmaps/status-red.png | Bin 0 -> 1202 bytes 7 files changed, 16 insertions(+), 13 deletions(-) create mode 100644 pixmaps/status-green.png create mode 100644 pixmaps/status-offline.png create mode 100644 pixmaps/status-orange.png create mode 100644 pixmaps/status-red.png diff --git a/gtk-glade/friendlist.c b/gtk-glade/friendlist.c index 25173488d..d4fddf871 100644 --- a/gtk-glade/friendlist.c +++ b/gtk-glade/friendlist.c @@ -39,17 +39,17 @@ typedef struct _status_picture_tab_t{ } status_picture_tab_t; status_picture_tab_t status_picture_tab[]={ - { LINPHONE_STATUS_ONLINE, "sip-online.png" }, - { LINPHONE_STATUS_BUSY, "sip-busy.png" }, - { LINPHONE_STATUS_BERIGHTBACK, "sip-bifm.png" }, - { LINPHONE_STATUS_AWAY, "sip-away.png" }, - { LINPHONE_STATUS_ONTHEPHONE, "sip-otp.png" }, - { LINPHONE_STATUS_OUTTOLUNCH, "sip-otl.png" }, - { LINPHONE_STATUS_NOT_DISTURB, "sip-closed.png" }, - { LINPHONE_STATUS_MOVED, "sip-closed.png" }, - { LINPHONE_STATUS_ALT_SERVICE, "sip-closed.png" }, - { LINPHONE_STATUS_OFFLINE, "sip-away.png" }, - { LINPHONE_STATUS_PENDING, "sip-wfa.png" }, + { LINPHONE_STATUS_ONLINE, "status-green.png" }, + { LINPHONE_STATUS_BUSY, "status-orange.png" }, + { LINPHONE_STATUS_BERIGHTBACK, "status-orange.png" }, + { LINPHONE_STATUS_AWAY, "status-orange.png" }, + { LINPHONE_STATUS_ONTHEPHONE, "status-orange.png" }, + { LINPHONE_STATUS_OUTTOLUNCH, "status-orange.png" }, + { LINPHONE_STATUS_NOT_DISTURB, "status-red.png" }, + { LINPHONE_STATUS_MOVED, "status-orange.png" }, + { LINPHONE_STATUS_ALT_SERVICE, "status-orange.png" }, + { LINPHONE_STATUS_OFFLINE, "status-offline.png" }, + { LINPHONE_STATUS_PENDING, "status-offline.png" }, { LINPHONE_STATUS_END, NULL }, }; @@ -153,7 +153,7 @@ void linphone_gtk_set_my_presence(LinphoneOnlineStatus ss){ GtkWidget *image=gtk_image_new_from_pixbuf(pbuf); GtkWidget *menu; g_object_unref(G_OBJECT(pbuf)); - gtk_button_set_label(GTK_BUTTON(button),linphone_online_status_to_string(ss)); + gtk_widget_set_tooltip_text(button,linphone_online_status_to_string(ss)); gtk_button_set_image(GTK_BUTTON(button),image); /*prepare menu*/ menu=(GtkWidget*)g_object_get_data(G_OBJECT(button),"presence_menu"); diff --git a/gtk-glade/incall_view.c b/gtk-glade/incall_view.c index 1cf772b05..c3c95eabe 100644 --- a/gtk-glade/incall_view.c +++ b/gtk-glade/incall_view.c @@ -208,6 +208,5 @@ void linphone_gtk_mute_toggled(GtkToggleButton *button){ void linphone_gtk_enable_mute_button(GtkToggleButton *button, gboolean sensitive){ gtk_widget_set_sensitive(GTK_WIDGET(button),sensitive); - gtk_object_set(GTK_OBJECT(button),"gtk-button-images",TRUE,NULL); linphone_gtk_draw_mute_button(button,FALSE); } diff --git a/gtk-glade/main.c b/gtk-glade/main.c index c87352f4a..770e12414 100644 --- a/gtk-glade/main.c +++ b/gtk-glade/main.c @@ -1226,6 +1226,7 @@ int main(int argc, char *argv[]){ const char *config_file; const char *factory_config_file; const char *lang; + GtkSettings *settings; g_thread_init(NULL); gdk_threads_init(); @@ -1272,6 +1273,9 @@ int main(int argc, char *argv[]){ gdk_threads_leave(); return -1; } + settings=gtk_settings_get_default(); + g_object_set(settings, "gtk-menu-images", TRUE, NULL); + g_object_set(settings, "gtk-button-images", TRUE, NULL); #ifdef WIN32 if (workingdir!=NULL) _chdir(workingdir); diff --git a/pixmaps/status-green.png b/pixmaps/status-green.png new file mode 100644 index 0000000000000000000000000000000000000000..67eb9a972d5a1471f993628f983c0f2ac1f9da7f GIT binary patch literal 1261 zcmVP000*V1^@s6{^R5m00001b5ch_0Itp) z=>Px#32;bRa{vGh*8l(w*8xH(n|J^K00(qQO+^RV1P>Gy9s~#TqyPW}e@R3^R7l6Q zm49qgRTRg+=k~Q-JG#O)pqqaPbU-u_k-7EZk7R04h?O@=gxB! z%$_;Jl^qOq+zN)eg270~ZxM6c`RnDWHs4gHQSL;N0CUz5Z9uJCu6vM>*k10kvlcUBLK)?A|}~wkXB( zO-Dr&1D*`Y2CHO;#qfkWY~-0PF=|PJ`@}QC#mmbw~J`Ju(AjAiDCe0ApL_hBfCthEA&hjHYHE z8sXS}01yDJ2LNXM{WQSW?2&7mnbA&GKR2S5G>o1zLOlAQ2r;b99|H3V`we^fqod9~pBmZ%HW#BCMmh-ZFjfX}b)A z5&<9=K$bz}0pkLldDguQ)_-3j)hSQUHqPzz{&W(I?$ppNz~}>zS)&v>Q-1VMEG({^ z3gGk0`=bM~VU5)RpI;uX@yp)vgcEczU5kPU?EoZ(v;qL4D(?bt>2C^E)hi`4rr@jr zkdf-oV8-)?&CN`8djyDDQn|iWQOZq?8_q{eWL^Qn<&=^)%CSFve)%Jx-}6jeYjF+$ z)HN3`0>BeaP3QxFcaE*H67X2c?zh4=Vr>P`MPypqJJY@m0Csp!587?&asayl!~x_0 zs08Swriz9*uK3x-A#;ZOQQT}O%vUTVKr8do>V%LL&)23Duy z&>_s)%AI9D2QcxW8IvVphY zh(u$9_w2QQ-T?QJV;y^~y?tGe_J;#YBGLZ&02~aMiFts9=pkMEB_JMbKk7ZIO=aUR X+!)WS!rg8B00000NkvXXu0mjfBTzp+ literal 0 HcmV?d00001 diff --git a/pixmaps/status-offline.png b/pixmaps/status-offline.png new file mode 100644 index 0000000000000000000000000000000000000000..243c5c069f0d359cb1d984bd6b2a03b53904beaf GIT binary patch literal 1179 zcmV;M1Z4Y(P)Px#32;bRa{vGh*8l(w*8xH(n|J^K00(qQO+^RV1P>G!9N0hb3IG5EElET{R7l6Q zm0fHURTRhn=YDKkTDIM;R%(e&#h^qX0#&2D6%DZ(9!%UA*syGO>6TZG_@FTxZ z69dyOrEOXhs)(jZQ66ecYJ5-=8YK|*!6uYag_+r{rR>h^Jw9|xKWtHXpPTzT z_ssbK{wM40?F}{ zs2Z&`l$Ia@{DKe9_uzXzdKUn`>T z$^$%^gNM8+*5*BLbFo-_qUiap0GgLm81&6@?dD~>GTj3J_5qlN5N|YWsIyvITl4?) z^DXPdLqhQpFk%2iNxs3v(e^~*)DlqV@#7IsDT?Ehs7LOk~bnu7UO>N7v?h-#|z9he+--Mx1SLKX`sl>)i(7w@9LawzjrE0HCw8dk+yBtE;PeB9TY|0D{5F z{%mgMZGh_mY^bkq+$@L?1^{71#gcR+^&tcA3Smw!h~^70y;n4Nr{qi%2@Hc^xzp2a z^V=ekNP)ov^J^)Kn*hJFl&fX|Y0nlXu_2_{E2Yyd0Z3h5-ZwNfwC>JF zMWzwJOLKwZW9f9-2mlBu`4$MjYbm!^R8@R>@#5(E+l34c4oW6r0Vo4#QcC&&^Svn+ zi(Qji?bTZ60$T6!idE+(CdPN&MrWvZb2FcVu?IjAjAT3>cb7C(02m$~-X029pALm; z8bh_!Mk#&Dw(U&Tp82Y|x!GF{aP(+jol;&3L`MKr0mu`mEt!me^tbLkZ)0O)m6gGY zH)}(|mkXY+9NUHCWOI(~o^$N%h1q=GVTLPU>I`r0fe)}=2#+;7$zcKbspWyMn*;+yym*wvbMX0 t2|)nsVJHh>E(>4`!1swnV)|BR`~|8|uDc}G)KLHc002ovPDHLkV1ioW3y1&! literal 0 HcmV?d00001 diff --git a/pixmaps/status-orange.png b/pixmaps/status-orange.png new file mode 100644 index 0000000000000000000000000000000000000000..f2e66d34d04c7152d884a82fa5ad5e8cc1be6f57 GIT binary patch literal 1252 zcmVP000*V1^@s6{^R5m00001b5ch_0Itp) z=>Px#32;bRa{vGh*8l(w*8xH(n|J^K00(qQO+^RV1P>Gz4@H`Ql>h()c1c7*R7l6Q zm2GTORT#&A=d``uTDtKzR%jP9#@lwsJBk`VAjYU6ktmWFqXZHY_<%-YA|h^H=G34@ zB1`Zk!4cnx2$*PsMiN7SL=r(!*0pnEW~19$wh654rMK-leppAk0ZxpbFZZ6e=Xam~ z|GDSD|J0hS8B<5zo&ROv3tNKui3xhG7GhIcu^*@#7ZTa~u+KZa@*ZbVd0C#nyvR8* zFnK7}*qe$s#geh6UwV5_{=97CnN-*c%u$++eVX+kCIhySO0T|YCK^PjI{2uw(7(kn z3YH6}*XeM35r!9K_k%rvw)??O;2SXd8>@rom0~_1a)KP0{YI?&hLFh1x0N=^%zgpO zrOS&nCLrBjq~S#x9x{WMQT6~T*^jdOQOSOBLm*tBX`>;BIXXJOcQ~ATlcLJT;055Z)G;qFkaO zyWyPhOxj%W;<@AF8Liji2%EtNv=Xm^UXn8t78&(W#cN${*C3(l;6Y#wa0prWglUCr zfUp&qlTq9S!Y^PzNEOC*g(_Ze>l*80V^v@yLhJ@yBOs)GhiP?R6^&NlPOZd`KnPj5 z#I!B$*SBY3}{j~7aIMF)pfDcJz}qmd+~mbXhZOM#4A<{cfT z>vdxQ#|LA@Gt8Q3S%r-HlyX!6JAf|0iDq-3j}zy&&MX8lYcA9a&G#doE2-8?(9?m= z*;Y$mc4G3_f?W3DnG}GqQ1ffs!e&j>Do9X<=DX~gr9*D}tB_?H0NSB<<`}j@f|v>v z0GO`2Ou?RXj9f_jgapNfQIVe8b_Y*pix||-TsQ_gR5$H z{o6YwWCdrTI0Z}rJ~3;e>m)#BP4tj7CTtUiS73PFx%k`R!-=luqFV)=vw|y79LoY) zkUYnzI{;|=V$-uOfB9QR@jS!um;b2-E`2c69sb zVdLrCd}O!Vaq0BJR99p{I?+{%);@%Afxaj-?Mmy@W~8G*d`aeJG5!MDxX9kPx#32;bRa{vGh*8l(w*8xH(n|J^K00(qQO+^RV1P>G$2wY|f`2YX}L`g(JR7l6Q zm2GU3RTRg6_de~qJ#Dus?~b%(5+DIFyaZvvb^D-+5C|fuiI}KB&@aZoV$_gGG$iVL zOEg47(BQ%cW5gE(C5W_hiU??@PCK2lZe=hA0k)?d^yN8zSYf4XL!zEf_uPBW`Q86L zC-=htWCy^pkIJ%3zT>|KR7})3*MO{caB%@}{vUyUSiaitnK8A>oIP#4IdjScCED5l z({HD&A6wfmv_uch{P3N>1ayeNoeEi}UxsrQ=Pqg_aAg+tUcPq~s1g4?0&l4j*J$l^qrGm7 zQa6UjjW&zP_9e*nCa|ppww1*0OH3Hzti4XM9}No%;d@fx1wa{IGi7)@`y5^~?C`pq zRJkjbx^ULYSc$SsvTtJcd~#m4FIgk0^j(0f0CaQ#@e5bz8&nclCP?lSvfVYga^w8A zQ2g4(50qD0oVh;ITy~C@)K#~qDD0+^r1!qj}|DHmL+>wqjoFQSOvBMsitE+uxGF|x?Vu* z5ET``1mNI&+IsVoEu^ExK-Yl81=$k9w{`$Bak57C16~EogS5Y&S9DQ09|HPwQ&YYs zaJyFMTzg9EP3MmeJ$hh}eHp+gH8&ou zT{&k^iT`;))&k$8Fc!_FD+w^2mXwWJF7TPaZ3=m}P??Q-Iyd|!NM}>t_4s!j3{*+; z-H)95qJCf58w!M zoFV+rDCCXY)Rr1Lc3lCQOIOl8s{9V+HFxP!w@Z14<{OfT5tFo7m%5z25m2-|@l9l37z Date: Fri, 16 Apr 2010 16:21:01 +0200 Subject: [PATCH 05/25] improve call error handling --- coreapi/callbacks.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/coreapi/callbacks.c b/coreapi/callbacks.c index 03941be15..cdb180428 100644 --- a/coreapi/callbacks.c +++ b/coreapi/callbacks.c @@ -267,6 +267,7 @@ static void call_failure(SalOp *op, SalError error, SalReason sr, const char *de /*char *retrymsg=_("%s. Retry after %i minute(s).");*/ char *msg600=_("User does not want to be disturbed."); char *msg603=_("Call declined."); + char *msg=NULL; LinphoneCall *call=lc->call; if (sal_op_get_user_pointer(op)!=lc->call){ @@ -280,36 +281,43 @@ static void call_failure(SalOp *op, SalError error, SalReason sr, const char *de lc->vtable.display_status(lc,_("No response.")); }else if (error==SalErrorProtocol){ if (lc->vtable.display_status) - lc->vtable.display_status(lc, details ? details : _("Error.")); + lc->vtable.display_status(lc, details ? details : _("Protocol error.")); }else if (error==SalErrorFailure){ switch(sr){ case SalReasonDeclined: + msg=msg603; if (lc->vtable.display_status) lc->vtable.display_status(lc,msg603); break; case SalReasonBusy: + msg=msg486; if (lc->vtable.display_status) lc->vtable.display_status(lc,msg486); break; case SalReasonRedirect: + msg=_("Redirected"); if (lc->vtable.display_status) - lc->vtable.display_status(lc,_("Redirected")); + lc->vtable.display_status(lc,msg); break; case SalReasonTemporarilyUnavailable: + msg=msg480; if (lc->vtable.display_status) lc->vtable.display_status(lc,msg480); break; case SalReasonNotFound: + msg=_("Not found"); if (lc->vtable.display_status) - lc->vtable.display_status(lc,_("Not found")); + lc->vtable.display_status(lc,msg); break; case SalReasonDoNotDisturb: + msg=msg600; if (lc->vtable.display_status) lc->vtable.display_status(lc,msg600); break; case SalReasonMedia: + msg=_("No common codecs"); if (lc->vtable.display_status) - lc->vtable.display_status(lc,_("No common codecs")); + lc->vtable.display_status(lc,msg); break; default: if (lc->vtable.display_status) @@ -323,7 +331,8 @@ static void call_failure(SalOp *op, SalError error, SalReason sr, const char *de linphone_core_stop_media_streams(lc,call); if (call!=NULL) { linphone_call_destroy(call); - gstate_new_state(lc, GSTATE_CALL_ERROR, NULL); + if (sr!=SalReasonDeclined) gstate_new_state(lc, GSTATE_CALL_ERROR, msg); + else gstate_new_state(lc, GSTATE_CALL_END, NULL); lc->call=NULL; } } From 8a5c00ac823547102bb44d489eb88be976bffa02 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 19 Apr 2010 22:18:04 +0200 Subject: [PATCH 06/25] implements global b=AS in sending and receiving side fix a few bugs with selfview in gui implements linphone_core_get_sip_socket() --- coreapi/linphonecore.c | 25 ++++++++++++--- coreapi/linphonecore.h | 2 ++ coreapi/sal.h | 2 ++ coreapi/sal_eXosip2.c | 67 ++++++++++++++++++++++++++++++++++++--- coreapi/sal_eXosip2.h | 1 + coreapi/sal_eXosip2_sdp.c | 6 ++++ gtk-glade/main.c | 8 +++-- 7 files changed, 100 insertions(+), 11 deletions(-) diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index e6df7ee17..c9266b7de 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -84,6 +84,7 @@ static SalMediaDescription *create_local_media_description(LinphoneCore *lc, md->nstreams=1; strncpy(md->addr,localip,sizeof(md->addr)); strncpy(md->username,username,sizeof(md->username)); + md->bandwidth=linphone_core_get_download_bandwidth(lc); /*set audio capabilities */ strncpy(md->streams[0].addr,localip,sizeof(md->streams[0].addr)); md->streams[0].port=linphone_core_get_audio_port(lc); @@ -2147,11 +2148,12 @@ static void post_configure_audio_streams(LinphoneCore *lc){ } } -static RtpProfile *make_profile(LinphoneCore *lc, const SalStreamDescription *desc, int *used_pt){ +static RtpProfile *make_profile(LinphoneCore *lc, const SalMediaDescription *md, const SalStreamDescription *desc, int *used_pt){ int bw; const MSList *elem; RtpProfile *prof=rtp_profile_new("Call profile"); bool_t first=TRUE; + int remote_bw=0; for(elem=desc->payloads;elem!=NULL;elem=elem->next){ PayloadType *pt=(PayloadType*)elem->data; @@ -2163,9 +2165,18 @@ static RtpProfile *make_profile(LinphoneCore *lc, const SalStreamDescription *de *used_pt=payload_type_get_number(pt); first=FALSE; } + if (desc->bandwidth>0) remote_bw=desc->bandwidth; + else if (md->bandwidth>0) { + /*case where b=AS is given globally, not per stream*/ + remote_bw=md->bandwidth; + if (desc->type==SalVideo){ + remote_bw-=lc->audio_bw; + } + } + if (desc->type==SalAudio){ - bw=get_min_bandwidth(lc->up_audio_bw,desc->bandwidth); - }else bw=get_min_bandwidth(lc->up_video_bw,desc->bandwidth); + bw=get_min_bandwidth(lc->up_audio_bw,remote_bw); + }else bw=get_min_bandwidth(lc->up_video_bw,remote_bw); if (bw>0) pt->normal_bitrate=bw*1000; else if (desc->type==SalAudio){ pt->normal_bitrate=-1; @@ -2195,7 +2206,7 @@ void linphone_core_start_media_streams(LinphoneCore *lc, LinphoneCall *call){ const SalStreamDescription *stream=sal_media_description_find_stream(call->resultdesc, SalProtoRtpAvp,SalAudio); if (stream){ - call->audio_profile=make_profile(lc,stream,&used_pt); + call->audio_profile=make_profile(lc,call->resultdesc,stream,&used_pt); if (!lc->use_files){ MSSndCard *playcard=lc->sound_conf.play_sndcard; MSSndCard *captcard=lc->sound_conf.capt_sndcard; @@ -2245,7 +2256,7 @@ void linphone_core_start_media_streams(LinphoneCore *lc, LinphoneCall *call){ } if (stream && (lc->video_conf.display || lc->video_conf.capture)) { const char *addr=stream->addr[0]!='\0' ? stream->addr : call->resultdesc->addr; - call->video_profile=make_profile(lc,stream,&used_pt); + call->video_profile=make_profile(lc,call->resultdesc,stream,&used_pt); video_stream_set_sent_video_size(lc->videostream,linphone_core_get_preferred_video_size(lc)); video_stream_enable_self_view(lc->videostream,lc->video_conf.selfview); if (lc->video_conf.display && lc->video_conf.capture) @@ -3559,6 +3570,10 @@ void linphone_core_set_network_reachable(LinphoneCore* lc,bool_t isReachable) { } set_network_reachable(lc,isReachable); } + +ortp_socket_t linphone_core_get_sip_socket(LinphoneCore *lc){ + return sal_get_socket(lc->sal); +} /** * Destroys a LinphoneCore * diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h index 46d9e2944..8ef28f9ed 100644 --- a/coreapi/linphonecore.h +++ b/coreapi/linphonecore.h @@ -607,6 +607,8 @@ int linphone_core_get_sip_port(LinphoneCore *lc); void linphone_core_set_sip_port(LinphoneCore *lc,int port); +ortp_socket_t linphone_core_get_sip_socket(LinphoneCore *lc); + void linphone_core_set_inc_timeout(LinphoneCore *lc, int seconds); int linphone_core_get_inc_timeout(LinphoneCore *lc); diff --git a/coreapi/sal.h b/coreapi/sal.h index 23780f6b3..882761ffb 100644 --- a/coreapi/sal.h +++ b/coreapi/sal.h @@ -107,6 +107,7 @@ typedef struct SalMediaDescription{ char addr[64]; char username[64]; int nstreams; + int bandwidth; SalStreamDescription streams[SAL_MEDIA_DESCRIPTION_MAX_STREAMS]; } SalMediaDescription; @@ -223,6 +224,7 @@ typedef struct SalAuthInfo{ void sal_set_callbacks(Sal *ctx, const SalCallbacks *cbs); int sal_listen_port(Sal *ctx, const char *addr, int port, SalTransport tr, int is_secure); +ortp_socket_t sal_get_socket(Sal *ctx); void sal_set_user_agent(Sal *ctx, const char *user_agent); void sal_use_session_timers(Sal *ctx, int expires); int sal_iterate(Sal *sal); diff --git a/coreapi/sal_eXosip2.c b/coreapi/sal_eXosip2.c index 4e0f6a05a..c85079fc1 100644 --- a/coreapi/sal_eXosip2.c +++ b/coreapi/sal_eXosip2.c @@ -227,12 +227,15 @@ static void _osip_trace_func(char *fi, int li, osip_trace_level_t level, char *c Sal * sal_init(){ static bool_t firsttime=TRUE; + Sal *sal; if (firsttime){ osip_trace_initialize_func (OSIP_INFO4,&_osip_trace_func); firsttime=FALSE; } eXosip_init(); - return ms_new0(Sal,1); + sal=ms_new0(Sal,1); + sal->sock=-1; + return sal; } void sal_uninit(Sal* sal){ @@ -290,13 +293,58 @@ void sal_set_callbacks(Sal *ctx, const SalCallbacks *cbs){ ctx->callbacks.ping_reply=(SalOnPingReply)unimplemented_stub; } + +static ortp_socket_t create_socket(int pf, int proto, const char *addr, int local_port){ + struct addrinfo hints; + struct addrinfo *res=NULL; + ortp_socket_t sock; + int optval; + char tmp[20]; + int err; + + sock=socket(pf,(proto==IPPROTO_UDP) ? SOCK_DGRAM : SOCK_STREAM,0); + if (sock<0) { + ms_error("Fail to create socket"); + return -1; + } + snprintf(tmp,sizeof(tmp)-1,"%i",local_port); + memset (&hints,0,sizeof(hints)); + hints.ai_family=(pf==PF_INET) ? AF_INET : AF_INET6; + hints.ai_socktype=(proto==IPPROTO_UDP) ? SOCK_DGRAM : SOCK_STREAM; + + if ((err=getaddrinfo(addr, + tmp, + &hints,&res))<0) { + ms_error("create_socket: getaddrinfo() failed: %s",gai_strerror(err)); + close_socket(sock); + return -1; + } + if (bind(sock,(struct sockaddr*)res->ai_addr,res->ai_addrlen)<0){ + ms_error("Bind socket to localhost:%i failed: %s",local_port,getSocketError()); + freeaddrinfo(res); + close_socket(sock); + return -1; + } + freeaddrinfo(res); + optval=1; + if (setsockopt (sock, SOL_SOCKET, SO_REUSEADDR, + (SOCKET_OPTION_VALUE)&optval, sizeof (optval))<0){ + ms_warning("Fail to set SO_REUSEADDR"); + } + /*set_non_blocking_socket(sock);*/ + return sock; +} + + int sal_listen_port(Sal *ctx, const char *addr, int port, SalTransport tr, int is_secure){ int err; bool_t ipv6; int proto=IPPROTO_UDP; - if (ctx->running) eXosip_quit(); - eXosip_init(); + if (ctx->running){ + eXosip_quit(); + eXosip_init(); + } err=0; eXosip_set_option(13,&err); /*13=EXOSIP_OPT_SRV_WITH_NAPTR, as it is an enum value, we can't use it unless we are sure of the version of eXosip, which is not the case*/ @@ -308,11 +356,21 @@ int sal_listen_port(Sal *ctx, const char *addr, int port, SalTransport tr, int i ms_fatal("SIP over TCP or TLS or DTLS is not supported yet."); return -1; } - + ctx->sock=create_socket(ipv6 ? PF_INET6 : PF_INET, proto, addr, port); + if (ctx->sock==-1) return -1; + ms_message("Exosip is given socket %i",ctx->sock); + eXosip_set_socket(proto,ctx->sock,port); + /* err=eXosip_listen_addr(proto, addr, port, ipv6 ? PF_INET6 : PF_INET, 0); + */ + ctx->running=TRUE; return err; } +ortp_socket_t sal_get_socket(Sal *ctx){ + return ctx->sock; +} + void sal_set_user_agent(Sal *ctx, const char *user_agent){ eXosip_set_user_agent(user_agent); } @@ -381,6 +439,7 @@ static void sdp_process(SalOp *h){ offer_answer_initiate_incoming(h->base.local_media,h->base.remote_media,h->result); h->sdp_answer=media_description_to_sdp(h->result); strcpy(h->result->addr,h->base.remote_media->addr); + h->result->bandwidth=h->base.remote_media->bandwidth; for(i=0;iresult->nstreams;++i){ if (h->result->streams[i].port>0){ strcpy(h->result->streams[i].addr,h->base.remote_media->streams[i].addr); diff --git a/coreapi/sal_eXosip2.h b/coreapi/sal_eXosip2.h index 1dd11e6ae..cc9b5b14b 100644 --- a/coreapi/sal_eXosip2.h +++ b/coreapi/sal_eXosip2.h @@ -37,6 +37,7 @@ struct Sal{ MSList *other_transactions; /*MSList of SalOp */ int running; int session_expires; + ortp_socket_t sock; void *up; }; diff --git a/coreapi/sal_eXosip2_sdp.c b/coreapi/sal_eXosip2_sdp.c index 580428765..2165708b1 100644 --- a/coreapi/sal_eXosip2_sdp.c +++ b/coreapi/sal_eXosip2_sdp.c @@ -125,6 +125,8 @@ static sdp_message_t *create_generic_sdp(const SalMediaDescription *desc) osip_strdup ("IN"), inet6 ? osip_strdup ("IP6") : osip_strdup ("IP4"), osip_strdup (desc->addr), NULL, NULL); sdp_message_t_time_descr_add (local, osip_strdup ("0"), osip_strdup ("0")); + if (desc->bandwidth>0) sdp_message_b_bandwidth_add (local, -1, osip_strdup ("AS"), + int_2char(desc->bandwidth)); return local; } @@ -234,6 +236,10 @@ int sdp_to_media_description(sdp_message_t *msg, SalMediaDescription *desc){ addr=sdp_message_c_addr_get (msg, -1, 0); if (addr) strncpy(desc->addr,addr,sizeof(desc->addr)); + for(j=0;(sbw=sdp_message_bandwidth_get(msg,-1,j))!=NULL;++j){ + if (strcasecmp(sbw->b_bwtype,"AS")==0) desc->bandwidth=atoi(sbw->b_bandwidth); + } + /* for each m= line */ for (i=0; !sdp_message_endof_media (msg, i) && i Date: Tue, 20 Apr 2010 12:20:06 +0200 Subject: [PATCH 07/25] enhance network monitoring (workaround this stupid avahi eth0 interface) report call faillure because of no network at all. --- coreapi/linphonecore.c | 10 +++---- coreapi/misc.c | 64 +++++++++++++++++++++++++++++++++++++++++- coreapi/private.h | 2 +- coreapi/sal_eXosip2.c | 46 +++++++++++++++++++----------- coreapi/sal_eXosip2.h | 1 + 5 files changed, 100 insertions(+), 23 deletions(-) diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index c9266b7de..2ada417af 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -1162,8 +1162,7 @@ void linphone_core_get_local_ip(LinphoneCore *lc, const char *dest, char *result strncpy(result,linphone_core_get_nat_address(lc),LINPHONE_IPADDR_SIZE); return; } - if (dest==NULL) dest="87.98.157.38"; /*a public IP address*/ - if (linphone_core_get_local_ip_for(dest,result)==0) + if (linphone_core_get_local_ip_for(lc->sip_conf.ipv6_enabled ? AF_INET6 : AF_INET,dest,result)==0) return; /*else fallback to SAL routine that will attempt to find the most realistic interface */ sal_get_default_local_ip(lc->sal,lc->sip_conf.ipv6_enabled ? AF_INET6 : AF_INET,result,LINPHONE_IPADDR_SIZE); @@ -1515,14 +1514,15 @@ static void monitor_network_state(LinphoneCore *lc, time_t curtime){ /* only do the network up checking every five seconds */ if (last_check==0 || (curtime-last_check)>=5){ - sal_get_default_local_ip(lc->sal, - lc->sip_conf.ipv6_enabled ? AF_INET6 : AF_INET, - result,LINPHONE_IPADDR_SIZE); + linphone_core_get_local_ip_for(lc->sip_conf.ipv6_enabled ? AF_INET6 : AF_INET,NULL,result); if (strcmp(result,"::1")!=0 && strcmp(result,"127.0.0.1")!=0){ new_status=TRUE; }else new_status=FALSE; last_check=curtime; if (new_status!=last_status) { + if (new_status){ + ms_message("New local ip address is %s",result); + } set_network_reachable(lc,new_status); last_status=new_status; } diff --git a/coreapi/misc.c b/coreapi/misc.c index c6e673547..41ca8d0bc 100644 --- a/coreapi/misc.c +++ b/coreapi/misc.c @@ -38,6 +38,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #undef snprintf #include +#ifdef HAVE_GETIFADDRS +#include +#include +#endif + #if !defined(WIN32) @@ -646,7 +651,40 @@ int linphone_core_wake_up_possible_already_running_instance( return -1; } -int linphone_core_get_local_ip_for(const char *dest, char *result){ +#ifdef HAVE_GETIFADDRS + +#include +static int get_local_ip_with_getifaddrs(int type, char *address, int size) +{ + struct ifaddrs *ifp; + struct ifaddrs *ifpstart; + int ret = 0; + + if (getifaddrs(&ifpstart) < 0) { + return -1; + } + + for (ifp = ifpstart; ifp != NULL; ifp = ifp->ifa_next) { + if (ifp->ifa_addr && ifp->ifa_addr->sa_family == type + && (ifp->ifa_flags & IFF_RUNNING) && !(ifp->ifa_flags & IFF_LOOPBACK)) + { + getnameinfo(ifp->ifa_addr, + (type == AF_INET6) ? + sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in), + address, size, NULL, 0, NI_NUMERICHOST); + if (strchr(address, '%') == NULL) { /*avoid ipv6 link-local addresses */ + /*ms_message("getifaddrs() found %s",address);*/ + ret++; + } + } + } + freeifaddrs(ifpstart); + return ret; +} +#endif + + +static int get_local_ip_for_with_connect(const char *dest, char *result){ int err,tmp; struct addrinfo hints; struct addrinfo *res=NULL; @@ -705,3 +743,27 @@ int linphone_core_get_local_ip_for(const char *dest, char *result){ ms_message("Local interface to reach %s is %s.",dest,result); return 0; } + +int linphone_core_get_local_ip_for(int type, const char *dest, char *result){ + if (dest==NULL) { + if (type==AF_INET) + dest="87.98.157.38"; /*a public IP address*/ + else dest="2a00:1450:8002::68"; + } +#ifdef HAVE_GETIFADDRS + { + int found_ifs; + + found_ifs=get_local_ip_with_getifaddrs(type,result,LINPHONE_IPADDR_SIZE); + if (found_ifs==1){ + return 0; + }else if (found_ifs<=0){ + /*absolutely no network on this machine */ + strcpy(result,type==AF_INET ? "127.0.0.1" : "::1"); + return -1; + } + } +#endif + /*else use connect to find the best local ip address */ + return get_local_ip_for_with_connect(dest,result); +} diff --git a/coreapi/private.h b/coreapi/private.h index 18ed34c74..4a3c1dbaa 100644 --- a/coreapi/private.h +++ b/coreapi/private.h @@ -164,7 +164,7 @@ LinphoneFriend * linphone_friend_new_from_config_file(struct _LinphoneCore *lc, void linphone_proxy_config_update(LinphoneProxyConfig *cfg); void linphone_proxy_config_get_contact(LinphoneProxyConfig *cfg, const char **ip, int *port); LinphoneProxyConfig * linphone_core_lookup_known_proxy(LinphoneCore *lc, const LinphoneAddress *uri); -int linphone_core_get_local_ip_for(const char *dest, char *result); +int linphone_core_get_local_ip_for(int type, const char *dest, char *result); LinphoneProxyConfig *linphone_proxy_config_new_from_config_file(struct _LpConfig *config, int index); void linphone_proxy_config_write_to_config_file(struct _LpConfig* config,LinphoneProxyConfig *obj, int index); diff --git a/coreapi/sal_eXosip2.c b/coreapi/sal_eXosip2.c index c85079fc1..de227b317 100644 --- a/coreapi/sal_eXosip2.c +++ b/coreapi/sal_eXosip2.c @@ -23,8 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "sal_eXosip2.h" #include "offeranswer.h" -/*this function is not declared in some versions of eXosip*/ -extern void *eXosip_call_get_reference(int cid); static void text_received(Sal *sal, eXosip_event_t *ev); @@ -44,6 +42,25 @@ void sal_get_default_local_ip(Sal *sal, int address_family,char *ip, size_t iple } } + +static SalOp * sal_find_call(Sal *sal, int cid){ + const MSList *elem; + SalOp *op; + for(elem=sal->calls;elem!=NULL;elem=elem->next){ + op=(SalOp*)elem->data; + if (op->cid==cid) return op; + } + return NULL; +} + +static void sal_add_call(Sal *sal, SalOp *op){ + sal->calls=ms_list_append(sal->calls,op); +} + +static void sal_remove_call(Sal *sal, SalOp *op){ + sal->calls=ms_list_remove(sal->calls, op); +} + static SalOp * sal_find_register(Sal *sal, int rid){ const MSList *elem; SalOp *op; @@ -164,7 +181,7 @@ void sal_op_release(SalOp *op){ } if (op->cid!=-1){ ms_message("Cleaning cid %i",op->cid); - eXosip_call_set_reference(op->cid,NULL); + sal_remove_call(op->base.root,op); } if (op->sid!=-1){ sal_remove_out_subscribe(op->base.root,op); @@ -492,7 +509,7 @@ int sal_call(SalOp *h, const char *from, const char *to){ ms_error("Fail to send invite !"); return -1; }else{ - eXosip_call_set_reference(h->cid,h); + sal_add_call(h->base.root,h); } return 0; } @@ -647,8 +664,8 @@ int sal_call_send_dtmf(SalOp *h, char dtmf){ int sal_call_terminate(SalOp *h){ eXosip_lock(); eXosip_call_terminate(h->cid,h->did); - eXosip_call_set_reference(h->cid,NULL); eXosip_unlock(); + sal_remove_call(h->base.root,h); return 0; } @@ -689,11 +706,7 @@ static void set_network_origin(SalOp *op, osip_message_t *req){ static SalOp *find_op(Sal *sal, eXosip_event_t *ev){ if (ev->cid>0){ -#ifdef HAVE_EXOSIP_GET_REF - return (SalOp*)eXosip_call_get_ref(ev->cid); -#else - return (SalOp*)eXosip_call_get_reference(ev->cid); -#endif + return sal_find_call(sal,ev->cid); } if (ev->rid>0){ return sal_find_register(sal,ev->rid); @@ -743,7 +756,7 @@ static void inc_new_call(Sal *sal, eXosip_event_t *ev){ op->cid=ev->cid; op->did=ev->did; - eXosip_call_set_reference(op->cid,op); + sal_add_call(op->base.root,op); sal->callbacks.call_received(op); } @@ -906,7 +919,7 @@ static void call_terminated(Sal *sal, eXosip_event_t *ev){ return; } osip_from_to_str(ev->request->from,&from); - eXosip_call_set_reference(ev->cid,NULL); + sal_remove_call(sal,op); op->cid=-1; sal->callbacks.call_terminated(op,from); osip_free(from); @@ -915,6 +928,7 @@ static void call_terminated(Sal *sal, eXosip_event_t *ev){ static void call_released(Sal *sal, eXosip_event_t *ev){ SalOp *op=find_op(sal,ev); if (op==NULL){ + ms_warning("No op associated to this call_released()"); return; } op->cid=-1; @@ -1453,6 +1467,10 @@ static bool_t process_event(Sal *sal, eXosip_event_t *ev){ ms_message("CALL_REQUESTFAILURE or GLOBALFAILURE or SERVERFAILURE\n"); return call_failure(sal,ev); break; + case EXOSIP_CALL_RELEASED: + ms_message("CALL_RELEASED\n"); + call_released(sal, ev); + break; case EXOSIP_CALL_INVITE: ms_message("CALL_NEW\n"); inc_new_call(sal,ev); @@ -1517,10 +1535,6 @@ static bool_t process_event(Sal *sal, eXosip_event_t *ev){ case EXOSIP_SUBSCRIPTION_GLOBALFAILURE: sal_exosip_subscription_closed(sal,ev); break; - case EXOSIP_CALL_RELEASED: - ms_message("CALL_RELEASED\n"); - call_released(sal, ev); - break; case EXOSIP_REGISTRATION_FAILURE: ms_message("REGISTRATION_FAILURE\n"); return registration_failure(sal,ev); diff --git a/coreapi/sal_eXosip2.h b/coreapi/sal_eXosip2.h index cc9b5b14b..97ed01423 100644 --- a/coreapi/sal_eXosip2.h +++ b/coreapi/sal_eXosip2.h @@ -30,6 +30,7 @@ int sdp_to_media_description(sdp_message_t *sdp, SalMediaDescription *desc); struct Sal{ SalCallbacks callbacks; + MSList *calls; /*MSList of SalOp */ MSList *registers;/*MSList of SalOp */ MSList *out_subscribes;/*MSList of SalOp */ MSList *in_subscribes;/*MSList of SalOp */ From d9667dcfbe563bbb7c5b993c54b5d93457c1b0e1 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 20 Apr 2010 13:37:17 +0200 Subject: [PATCH 08/25] install new icons --- pixmaps/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am index 15c7ec138..a0436e744 100644 --- a/pixmaps/Makefile.am +++ b/pixmaps/Makefile.am @@ -7,10 +7,10 @@ sip-away.png sip-bifm.png \ sip-busy.png sip-closed.png \ sip-online.png sip-otl.png \ sip-otp.png sip-wfa.png \ -green.png red.png \ mic_muted.png mic_active.png \ linphone-3-250x130.png linphone-3.png linphone2-57x57.png \ linphone.png linphone-banner.png \ -contact-orange.png dialer-orange.png +contact-orange.png dialer-orange.png \ +startcall-green.png stopcall-red.png EXTRA_DIST=$(pixmap_DATA) From e28d061d5923789618de4f9514576b9cbd0821cb Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 20 Apr 2010 13:38:09 +0200 Subject: [PATCH 09/25] update version number --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in index fb1ce96c7..88998a90e 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([linphone],[3.2.99.1],[linphone-developers@nongnu.org]) +AC_INIT([linphone],[3.2.99.2],[linphone-developers@nongnu.org]) AC_CANONICAL_SYSTEM dnl Source packaging numbers From e4030f398d69b400a26ac751283470e6bb6be2a2 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 20 Apr 2010 14:08:07 +0200 Subject: [PATCH 10/25] fix sigsegv --- coreapi/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coreapi/misc.c b/coreapi/misc.c index 41ca8d0bc..ae5414de6 100644 --- a/coreapi/misc.c +++ b/coreapi/misc.c @@ -750,6 +750,7 @@ int linphone_core_get_local_ip_for(int type, const char *dest, char *result){ dest="87.98.157.38"; /*a public IP address*/ else dest="2a00:1450:8002::68"; } + strcpy(result,type==AF_INET ? "127.0.0.1" : "::1"); #ifdef HAVE_GETIFADDRS { int found_ifs; @@ -759,7 +760,6 @@ int linphone_core_get_local_ip_for(int type, const char *dest, char *result){ return 0; }else if (found_ifs<=0){ /*absolutely no network on this machine */ - strcpy(result,type==AF_INET ? "127.0.0.1" : "::1"); return -1; } } From 902ebea50a5a6254cedfbfefcb614ae737926564 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 20 Apr 2010 14:46:51 +0200 Subject: [PATCH 11/25] fix crash --- coreapi/sal_eXosip2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coreapi/sal_eXosip2.c b/coreapi/sal_eXosip2.c index de227b317..7b9d3581b 100644 --- a/coreapi/sal_eXosip2.c +++ b/coreapi/sal_eXosip2.c @@ -869,9 +869,9 @@ static int call_proceeding(Sal *sal, eXosip_event_t *ev){ static void call_ringing(Sal *sal, eXosip_event_t *ev){ sdp_message_t *sdp; - SalOp *op; + SalOp *op=find_op(sal,ev); if (call_proceeding(sal, ev)==-1) return; - op=(SalOp*)ev->external_reference; + sdp=eXosip_get_sdp_info(ev->response); if (sdp){ op->base.remote_media=sal_media_description_new(); From 64ef3596756f7e0642568f262929554ec3290fe0 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 20 Apr 2010 15:17:48 +0200 Subject: [PATCH 12/25] fix small warning --- coreapi/sal_eXosip2.c | 1 + pixmaps/svg/startcall-green.svg | 38 +++++++++++++++---------------- pixmaps/svg/status-green.svg | 40 ++++++++++++++++----------------- 3 files changed, 40 insertions(+), 39 deletions(-) diff --git a/coreapi/sal_eXosip2.c b/coreapi/sal_eXosip2.c index 7b9d3581b..629b7f37f 100644 --- a/coreapi/sal_eXosip2.c +++ b/coreapi/sal_eXosip2.c @@ -666,6 +666,7 @@ int sal_call_terminate(SalOp *h){ eXosip_call_terminate(h->cid,h->did); eXosip_unlock(); sal_remove_call(h->base.root,h); + h->cid=-1; return 0; } diff --git a/pixmaps/svg/startcall-green.svg b/pixmaps/svg/startcall-green.svg index 5af5140cc..dac2c713b 100644 --- a/pixmaps/svg/startcall-green.svg +++ b/pixmaps/svg/startcall-green.svg @@ -8,33 +8,33 @@ - - + + - + - - diff --git a/pixmaps/svg/status-green.svg b/pixmaps/svg/status-green.svg index 144adcf66..d875488b8 100644 --- a/pixmaps/svg/status-green.svg +++ b/pixmaps/svg/status-green.svg @@ -8,33 +8,33 @@ - - + + - + - - + c-2.137-1.266-2.672-0.217-2.672-0.217c-1.333,2.049-0.999,3.354,1.181,5.404c1.16,1.092,2.872,1.865,4.641,2.332L158.761,433.871z + "/> From e1fb3d59addbc768e0c736512acb5fb81bcafd48 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 20 Apr 2010 22:21:13 +0200 Subject: [PATCH 13/25] implement modifying of codecs fmtp within property box --- coreapi/linphonecore.c | 12 ++++++++++-- gtk-glade/parameters.glade | 19 +++++++++++++++---- gtk-glade/propertybox.c | 14 ++++++++++++++ 3 files changed, 39 insertions(+), 6 deletions(-) diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index 2ada417af..3ada9e8c9 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -716,13 +716,21 @@ static PayloadType * find_payload(RtpProfile *prof, const char *mime_type, int c it=rtp_profile_get_payload(prof,i); if (it!=NULL && strcasecmp(mime_type,it->mime_type)==0 && (clock_rate==it->clock_rate || clock_rate<=0) ){ - if ( (recv_fmtp && it->recv_fmtp && strcasecmp(recv_fmtp,it->recv_fmtp)==0) || + if ( (recv_fmtp && it->recv_fmtp && strstr(recv_fmtp,it->recv_fmtp)!=NULL) || (recv_fmtp==NULL && it->recv_fmtp==NULL) ){ /*exact match*/ + if (recv_fmtp) payload_type_set_recv_fmtp(it,recv_fmtp); return it; - }else candidate=it; + }else { + if (candidate){ + if (it->recv_fmtp==NULL) candidate=it; + }else candidate=it; + } } } + if (candidate && recv_fmtp){ + payload_type_set_recv_fmtp(candidate,recv_fmtp); + } return candidate; } diff --git a/gtk-glade/parameters.glade b/gtk-glade/parameters.glade index 14e07514f..3f3671330 100644 --- a/gtk-glade/parameters.glade +++ b/gtk-glade/parameters.glade @@ -10,6 +10,7 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + vertical True @@ -19,6 +20,7 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + vertical True @@ -32,6 +34,7 @@ True + vertical True @@ -232,6 +235,7 @@ True + vertical Direct connection to the Internet @@ -251,6 +255,7 @@ True + vertical Behind NAT / Firewall (specify gateway IP below) @@ -307,6 +312,7 @@ True + vertical Behind NAT / Firewall (use STUN to resolve) @@ -415,6 +421,7 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + vertical True @@ -447,7 +454,7 @@ - gtk-media-play + gtk-media-play True True True @@ -749,6 +756,7 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + vertical True @@ -892,6 +900,7 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + vertical True @@ -1189,6 +1198,7 @@ virtual network ! True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + vertical True @@ -1203,6 +1213,7 @@ virtual network ! True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + vertical True @@ -1246,9 +1257,10 @@ Video codecs True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + vertical - gtk-go-up + gtk-go-up True True True @@ -1264,7 +1276,7 @@ Video codecs - gtk-go-down + gtk-go-down True True True @@ -1642,7 +1654,6 @@ Video codecs True gtk-apply - 4 0 diff --git a/gtk-glade/propertybox.c b/gtk-glade/propertybox.c index 4ed3f2f0e..85ebdbb8d 100644 --- a/gtk-glade/propertybox.c +++ b/gtk-glade/propertybox.c @@ -227,6 +227,17 @@ enum { CODEC_NCOLUMNS }; +static void fmtp_edited(GtkCellRendererText *renderer, gchar *path, gchar *new_text, gpointer userdata){ + GtkListStore *store=(GtkListStore*)userdata; + GtkTreeIter iter; + if (gtk_tree_model_get_iter_from_string(GTK_TREE_MODEL(store),&iter,path)){ + PayloadType *pt; + gtk_list_store_set(store,&iter,CODEC_PARAMS,new_text,-1); + gtk_tree_model_get(GTK_TREE_MODEL(store),&iter,CODEC_PRIVDATA,&pt,-1); + payload_type_set_recv_fmtp(pt,new_text); + } +} + static void linphone_gtk_init_codec_list(GtkTreeView *listview){ GtkCellRenderer *renderer; GtkTreeViewColumn *column; @@ -268,11 +279,14 @@ static void linphone_gtk_init_codec_list(GtkTreeView *listview){ "foreground",CODEC_COLOR, NULL); gtk_tree_view_append_column (listview, column); + renderer = gtk_cell_renderer_text_new (); column = gtk_tree_view_column_new_with_attributes (_("Parameters"), renderer, "text", CODEC_PARAMS, "foreground",CODEC_COLOR, + "editable",TRUE, NULL); + g_signal_connect(G_OBJECT(renderer),"edited",G_CALLBACK(fmtp_edited),store); gtk_tree_view_append_column (listview, column); /* Setup the selection handler */ select = gtk_tree_view_get_selection (listview); From 7c54c3cb3e547a54790aef6e24708752bf98ba13 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 21 Apr 2010 09:31:52 +0200 Subject: [PATCH 14/25] update version number and NEWS. --- NEWS | 6 ++++-- configure.in | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index ceab2b179..c34031a76 100644 --- a/NEWS +++ b/NEWS @@ -3,8 +3,10 @@ linphone-3.3.0 -- ????????? * Internal refactoring of liblinphone (code factorisation, encapsulation of signaling) * enhancements made to presence support (SIP/SIMPLE) - -linphone-3.2.2 -- ????????? + * new icons + * new tabbed ui + * be nat friendly using OPTIONS request and using received,rport from + responses. * improve bitrate usage of speex codec * allow speex to run with vbr (variable bit rate) mode * add speex/32000 (ultra wide band speex codec) diff --git a/configure.in b/configure.in index 88998a90e..46d71ee13 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([linphone],[3.2.99.2],[linphone-developers@nongnu.org]) +AC_INIT([linphone],[3.2.99.3],[linphone-developers@nongnu.org]) AC_CANONICAL_SYSTEM dnl Source packaging numbers From ef75b9a0b7d95b1174ca0ab0188303253b3ab736 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Wed, 21 Apr 2010 14:52:29 +0200 Subject: [PATCH 15/25] fix bug with invalid contacts in registers. --- coreapi/sal_eXosip2.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/coreapi/sal_eXosip2.c b/coreapi/sal_eXosip2.c index 629b7f37f..8dad1518c 100644 --- a/coreapi/sal_eXosip2.c +++ b/coreapi/sal_eXosip2.c @@ -377,6 +377,9 @@ int sal_listen_port(Sal *ctx, const char *addr, int port, SalTransport tr, int i if (ctx->sock==-1) return -1; ms_message("Exosip is given socket %i",ctx->sock); eXosip_set_socket(proto,ctx->sock,port); + /* this is to properly initialize the udp transport layer of eXosip, as we don't use eXosip_listen_addr() */ + /* otherwise we have a bug with improper contacts in registers: */ + eXosip_masquerade_contact(NULL,0); /* err=eXosip_listen_addr(proto, addr, port, ipv6 ? PF_INET6 : PF_INET, 0); */ From 934211a74dd35c438b9f79a2a25812ddfd468366 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Wed, 21 Apr 2010 17:20:09 +0200 Subject: [PATCH 16/25] update icons --- pixmaps/Makefile.am | 12 ++++++------ pixmaps/startcall-green.png | Bin 3103 -> 3089 bytes pixmaps/status-green.png | Bin 1261 -> 1242 bytes 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am index a0436e744..6247f4d27 100644 --- a/pixmaps/Makefile.am +++ b/pixmaps/Makefile.am @@ -2,15 +2,15 @@ pixmapdir=$(datadir)/pixmaps/linphone -pixmap_DATA= linphone2.png linphone2.xpm \ -sip-away.png sip-bifm.png \ -sip-busy.png sip-closed.png \ -sip-online.png sip-otl.png \ -sip-otp.png sip-wfa.png \ +pixmap_DATA= \ mic_muted.png mic_active.png \ linphone-3-250x130.png linphone-3.png linphone2-57x57.png \ linphone.png linphone-banner.png \ +status-green.png \ +status-orange.png \ +status-red.png \ +status-offline.png \ contact-orange.png dialer-orange.png \ -startcall-green.png stopcall-red.png +startcall-green.png stopcall-red.png EXTRA_DIST=$(pixmap_DATA) diff --git a/pixmaps/startcall-green.png b/pixmaps/startcall-green.png index 2156d24e177c7413ac15c7d63c5dcd4760bb8071..940802a0c78c6279cf8396d4d98325006a79ca58 100644 GIT binary patch delta 3041 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 j0&2Lkv3d^VP><<J?+<*DqJD2c(RLae<#}Kp| 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 diff --git a/pixmaps/status-green.png b/pixmaps/status-green.png index 67eb9a972d5a1471f993628f983c0f2ac1f9da7f..1a39a42427823dbb36531709ed9ba198ffddaed8 100644 GIT binary patch delta 1180 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 Date: Thu, 22 Apr 2010 15:29:17 +0200 Subject: [PATCH 17/25] implement linphone_core_get_sip_socket() through an eXosip extension --- coreapi/sal_eXosip2.c | 63 +++++++------------------------------------ coreapi/sal_eXosip2.h | 1 - m4/exosip.m4 | 6 ++--- 3 files changed, 12 insertions(+), 58 deletions(-) diff --git a/coreapi/sal_eXosip2.c b/coreapi/sal_eXosip2.c index 8dad1518c..d72cd0d43 100644 --- a/coreapi/sal_eXosip2.c +++ b/coreapi/sal_eXosip2.c @@ -251,7 +251,6 @@ Sal * sal_init(){ } eXosip_init(); sal=ms_new0(Sal,1); - sal->sock=-1; return sal; } @@ -310,49 +309,6 @@ void sal_set_callbacks(Sal *ctx, const SalCallbacks *cbs){ ctx->callbacks.ping_reply=(SalOnPingReply)unimplemented_stub; } - -static ortp_socket_t create_socket(int pf, int proto, const char *addr, int local_port){ - struct addrinfo hints; - struct addrinfo *res=NULL; - ortp_socket_t sock; - int optval; - char tmp[20]; - int err; - - sock=socket(pf,(proto==IPPROTO_UDP) ? SOCK_DGRAM : SOCK_STREAM,0); - if (sock<0) { - ms_error("Fail to create socket"); - return -1; - } - snprintf(tmp,sizeof(tmp)-1,"%i",local_port); - memset (&hints,0,sizeof(hints)); - hints.ai_family=(pf==PF_INET) ? AF_INET : AF_INET6; - hints.ai_socktype=(proto==IPPROTO_UDP) ? SOCK_DGRAM : SOCK_STREAM; - - if ((err=getaddrinfo(addr, - tmp, - &hints,&res))<0) { - ms_error("create_socket: getaddrinfo() failed: %s",gai_strerror(err)); - close_socket(sock); - return -1; - } - if (bind(sock,(struct sockaddr*)res->ai_addr,res->ai_addrlen)<0){ - ms_error("Bind socket to localhost:%i failed: %s",local_port,getSocketError()); - freeaddrinfo(res); - close_socket(sock); - return -1; - } - freeaddrinfo(res); - optval=1; - if (setsockopt (sock, SOL_SOCKET, SO_REUSEADDR, - (SOCKET_OPTION_VALUE)&optval, sizeof (optval))<0){ - ms_warning("Fail to set SO_REUSEADDR"); - } - /*set_non_blocking_socket(sock);*/ - return sock; -} - - int sal_listen_port(Sal *ctx, const char *addr, int port, SalTransport tr, int is_secure){ int err; bool_t ipv6; @@ -373,22 +329,21 @@ int sal_listen_port(Sal *ctx, const char *addr, int port, SalTransport tr, int i ms_fatal("SIP over TCP or TLS or DTLS is not supported yet."); return -1; } - ctx->sock=create_socket(ipv6 ? PF_INET6 : PF_INET, proto, addr, port); - if (ctx->sock==-1) return -1; - ms_message("Exosip is given socket %i",ctx->sock); - eXosip_set_socket(proto,ctx->sock,port); - /* this is to properly initialize the udp transport layer of eXosip, as we don't use eXosip_listen_addr() */ - /* otherwise we have a bug with improper contacts in registers: */ - eXosip_masquerade_contact(NULL,0); - /* err=eXosip_listen_addr(proto, addr, port, ipv6 ? PF_INET6 : PF_INET, 0); - */ +#ifdef HAVE_EXOSIP_GET_SOCKET + ms_message("Exosip has socket number %i",eXosip_get_socket(proto)); +#endif ctx->running=TRUE; return err; } ortp_socket_t sal_get_socket(Sal *ctx){ - return ctx->sock; +#ifdef HAVE_EXOSIP_GET_SOCKET + return eXosip_get_socket(IPPROTO_UDP); +#else + ms_warning("Sorry, eXosip does not have eXosip_get_socket() method"); + return -1; +#endif } void sal_set_user_agent(Sal *ctx, const char *user_agent){ diff --git a/coreapi/sal_eXosip2.h b/coreapi/sal_eXosip2.h index 97ed01423..0df6023a6 100644 --- a/coreapi/sal_eXosip2.h +++ b/coreapi/sal_eXosip2.h @@ -38,7 +38,6 @@ struct Sal{ MSList *other_transactions; /*MSList of SalOp */ int running; int session_expires; - ortp_socket_t sock; void *up; }; diff --git a/m4/exosip.m4 b/m4/exosip.m4 index ae89236c8..fc1775a42 100644 --- a/m4/exosip.m4 +++ b/m4/exosip.m4 @@ -24,9 +24,9 @@ AC_CHECK_LIB([eXosip2],[eXosip_get_version], [AC_DEFINE([HAVE_EXOSIP_GET_VERSION],[1],[Defined when eXosip_get_version is available])], [], [-losipparser2 -losip2 ]) -AC_CHECK_LIB([eXosip2],[eXosip_call_get_reference], - [], - [AC_MSG_ERROR([Could not find eXosip_call_get_reference() in eXosip2 !])], +AC_CHECK_LIB([eXosip2],[eXosip_get_socket], + [AC_DEFINE([HAVE_EXOSIP_GET_SOCKET],[1],[Defined when eXosip_get_socket is available])], + [AC_MSG_WARN([Could not find eXosip_get_socket in eXosip2 !])], [-losipparser2 -losip2 ]) dnl AC_CHECK_LIB([eXosip2],[eXosip_get_naptr], dnl [AC_DEFINE([HAVE_EXOSIP_NAPTR_SUPPORT],[1],[Defined when eXosip_get_naptr is available])], From b289e74dd12ae162f24665eb81e0ebade8e7170b Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Thu, 22 Apr 2010 17:20:10 +0200 Subject: [PATCH 18/25] improve SIP messages, update po and version number --- configure.in | 2 +- coreapi/sal_eXosip2.c | 1 + coreapi/sal_eXosip2_presence.c | 4 +- po/cs.po | 174 +++++++++++++++---------------- po/de.po | 166 +++++++++++++++--------------- po/es.po | 166 +++++++++++++++--------------- po/fr.po | 181 +++++++++++++++++---------------- po/hu.po | 166 +++++++++++++++--------------- po/it.po | 166 +++++++++++++++--------------- po/ja.po | 166 +++++++++++++++--------------- po/nl.po | 166 +++++++++++++++--------------- po/pl.po | 166 +++++++++++++++--------------- po/pt_BR.po | 166 +++++++++++++++--------------- po/ru.po | 175 +++++++++++++++---------------- po/sv.po | 166 +++++++++++++++--------------- po/zh_CN.po | 166 +++++++++++++++--------------- 16 files changed, 1069 insertions(+), 1128 deletions(-) diff --git a/configure.in b/configure.in index 46d71ee13..b96111c88 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([linphone],[3.2.99.3],[linphone-developers@nongnu.org]) +AC_INIT([linphone],[3.2.99.4],[linphone-developers@nongnu.org]) AC_CANONICAL_SYSTEM dnl Source packaging numbers diff --git a/coreapi/sal_eXosip2.c b/coreapi/sal_eXosip2.c index d72cd0d43..78d2df7de 100644 --- a/coreapi/sal_eXosip2.c +++ b/coreapi/sal_eXosip2.c @@ -447,6 +447,7 @@ int sal_call(SalOp *h, const char *from, const char *to){ ms_error("Could not create call."); return -1; } + osip_message_set_allow(invite, "INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, NOTIFY, MESSAGE, SUBSCRIBE, INFO"); if (h->base.contact){ _osip_list_set_empty(&invite->contacts,(void (*)(void*))osip_contact_free); osip_message_set_contact(invite,h->base.contact); diff --git a/coreapi/sal_eXosip2_presence.c b/coreapi/sal_eXosip2_presence.c index 355590710..9be8a698f 100644 --- a/coreapi/sal_eXosip2_presence.c +++ b/coreapi/sal_eXosip2_presence.c @@ -101,9 +101,11 @@ int sal_text_send(SalOp *op, const char *from, const char *to, const char *msg){ eXosip_unlock(); return -1; } - osip_free(sip->sip_method); //change the sip_message to be a MESSAGE ... + osip_free(osip_message_get_method(sip)); osip_message_set_method(sip,osip_strdup("MESSAGE")); + osip_free(osip_cseq_get_method(osip_message_get_cseq(sip))); + osip_cseq_set_method(osip_message_get_cseq(sip),osip_strdup("MESSAGE")); osip_message_set_content_type(sip,"text/plain"); osip_message_set_body(sip,msg,strlen(msg)); eXosip_message_send_request(sip); diff --git a/po/cs.po b/po/cs.po index 60fb413c5..df52dff71 100644 --- a/po/cs.po +++ b/po/cs.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: linphone-3.2.99.1-" "a4be9bcfe5ebee60493f7c439b5c6616a5c8b6e6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-02 10:28+0200\n" +"POT-Creation-Date: 2010-04-22 17:16+0200\n" "PO-Revision-Date: 2010-04-01 21:26+0200\n" "Last-Translator: Petr Pisar \n" "Language-Team: Czech \n" @@ -31,23 +31,23 @@ msgstr "Nelze najít soubor s obrázkem: %s" msgid "Chat with %s" msgstr "Diskuze s %s" -#: ../gtk-glade/main.c:92 +#: ../gtk-glade/main.c:94 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:99 +#: ../gtk-glade/main.c:101 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:106 +#: ../gtk-glade/main.c:108 msgid "address to call right now" msgstr "zavolat právě teď na tuto adresu" -#: ../gtk-glade/main.c:113 +#: ../gtk-glade/main.c:115 msgid "if set automatically answer incoming calls" msgstr "je-li nastaveno, automaticky zvedne příchozí hovor" -#: ../gtk-glade/main.c:121 +#: ../gtk-glade/main.c:123 msgid "" "Specifiy a working directory (should be the base of the installation, eg: c:" "\\Program Files\\Linphone)" @@ -55,17 +55,17 @@ msgstr "" "Zadejte pracovní adresář (měl by být základní instalační adresář, například " "c:\\Program Files\\Linphone)" -#: ../gtk-glade/main.c:396 +#: ../gtk-glade/main.c:402 #, c-format msgid "Call with %s" msgstr "Hovor s %s" -#: ../gtk-glade/main.c:707 +#: ../gtk-glade/main.c:720 #, c-format msgid "Incoming call from %s" msgstr "Příchozí hovor od %s" -#: ../gtk-glade/main.c:746 +#: ../gtk-glade/main.c:759 #, c-format msgid "" "%s would like to add you to his contact list.\n" @@ -78,7 +78,7 @@ msgstr "" "do svého adresáře?\n" "Odpovíte-li ne, tato osobo bude dočasně blokována." -#: ../gtk-glade/main.c:824 +#: ../gtk-glade/main.c:837 #, c-format msgid "" "Please enter your password for username %s\n" @@ -87,24 +87,30 @@ msgstr "" "Prosím, zadejte heslo pro uživatele %s\n" "v doméně %s:" -#: ../gtk-glade/main.c:921 +#: ../gtk-glade/main.c:934 msgid "Website link" msgstr "Odkaz na webovou stránku" -#: ../gtk-glade/main.c:957 +#: ../gtk-glade/main.c:970 msgid "Linphone - a video internet phone" msgstr "Lipnhone – internetový videofon" -#: ../gtk-glade/main.c:976 +#: ../gtk-glade/main.c:989 #, c-format msgid "%s (Default)" msgstr "%s (Výchozí)" -#: ../gtk-glade/main.c:1229 +#: ../gtk-glade/main.c:1221 +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 msgid "A free SIP video-phone" msgstr "Volný SIP videofon" -#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:247 +#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:258 #: ../gtk-glade/contact.glade.h:3 msgid "Name" msgstr "Jméno" @@ -147,91 +153,91 @@ msgstr "Odstranit kontakt „%s“" msgid "Add new contact from %s directory" msgstr "Přidat nový kontakt z adresáře %s" -#: ../gtk-glade/propertybox.c:253 +#: ../gtk-glade/propertybox.c:264 msgid "Rate (Hz)" msgstr "Rychlost (Hz)" -#: ../gtk-glade/propertybox.c:259 +#: ../gtk-glade/propertybox.c:270 msgid "Status" msgstr "Stav" -#: ../gtk-glade/propertybox.c:265 +#: ../gtk-glade/propertybox.c:276 msgid "Min bitrate (kbit/s)" msgstr "Min. rychlost (kbit/s)" -#: ../gtk-glade/propertybox.c:271 +#: ../gtk-glade/propertybox.c:283 msgid "Parameters" msgstr "Parametry" -#: ../gtk-glade/propertybox.c:298 ../gtk-glade/propertybox.c:437 +#: ../gtk-glade/propertybox.c:312 ../gtk-glade/propertybox.c:451 msgid "Enabled" msgstr "Povoleno" -#: ../gtk-glade/propertybox.c:299 ../gtk-glade/propertybox.c:437 +#: ../gtk-glade/propertybox.c:313 ../gtk-glade/propertybox.c:451 msgid "Disabled" msgstr "Zakázáno" -#: ../gtk-glade/propertybox.c:482 +#: ../gtk-glade/propertybox.c:496 msgid "Account" msgstr "Účet" -#: ../gtk-glade/propertybox.c:622 +#: ../gtk-glade/propertybox.c:636 msgid "English" msgstr "angličtina" -#: ../gtk-glade/propertybox.c:623 +#: ../gtk-glade/propertybox.c:637 msgid "French" msgstr "francouzština" -#: ../gtk-glade/propertybox.c:624 +#: ../gtk-glade/propertybox.c:638 msgid "Swedish" msgstr "švédština" -#: ../gtk-glade/propertybox.c:625 +#: ../gtk-glade/propertybox.c:639 msgid "Italian" msgstr "italština" -#: ../gtk-glade/propertybox.c:626 +#: ../gtk-glade/propertybox.c:640 msgid "Spanish" msgstr "španělština" -#: ../gtk-glade/propertybox.c:627 +#: ../gtk-glade/propertybox.c:641 msgid "Brazilian Portugese" msgstr "brazilská portugalština" -#: ../gtk-glade/propertybox.c:628 +#: ../gtk-glade/propertybox.c:642 msgid "Polish" msgstr "polština" -#: ../gtk-glade/propertybox.c:629 +#: ../gtk-glade/propertybox.c:643 msgid "German" msgstr "němčina" -#: ../gtk-glade/propertybox.c:630 +#: ../gtk-glade/propertybox.c:644 msgid "Russian" msgstr "ruština" -#: ../gtk-glade/propertybox.c:631 +#: ../gtk-glade/propertybox.c:645 msgid "Japanese" msgstr "japonština" -#: ../gtk-glade/propertybox.c:632 +#: ../gtk-glade/propertybox.c:646 msgid "Dutch" msgstr "dánština" -#: ../gtk-glade/propertybox.c:633 +#: ../gtk-glade/propertybox.c:647 msgid "Hungarian" msgstr "maďarština" -#: ../gtk-glade/propertybox.c:634 +#: ../gtk-glade/propertybox.c:648 msgid "Czech" msgstr "čeština" -#: ../gtk-glade/propertybox.c:635 +#: ../gtk-glade/propertybox.c:649 msgid "Chinese" msgstr "čínština" -#: ../gtk-glade/propertybox.c:692 +#: ../gtk-glade/propertybox.c:706 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." @@ -746,7 +752,7 @@ msgstr "Přijmout" msgid "Decline" msgstr "Odmítnout" -#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:368 +#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:369 msgid "Incoming call" msgstr "Příchozí hovor" @@ -1002,21 +1008,6 @@ msgstr "implicitní zvuková karta" msgid "default soundcard\n" msgstr "implicitní zvuková karta\n" -# XXX: Dummy string. Make it not translatable or use real message -#: ../gtk-glade/parameters.glade.h:65 -msgid "gtk-go-down" -msgstr "" - -# XXX: Dummy string. Make it not translatable or use real message -#: ../gtk-glade/parameters.glade.h:66 -msgid "gtk-go-up" -msgstr "" - -# XXX: Dummy string. Make it not translatable or use real message -#: ../gtk-glade/parameters.glade.h:67 -msgid "gtk-media-play" -msgstr "" - #: ../gtk-glade/buddylookup.glade.h:1 msgid "Search somebody" msgstr "Hledat někoho" @@ -1037,7 +1028,7 @@ msgstr "Linphone" msgid "Please wait" msgstr "Prosím, čekejte" -#: ../coreapi/linphonecore.c:310 +#: ../coreapi/linphonecore.c:311 #, c-format msgid "You have missed %i call." msgid_plural "You have missed %i calls." @@ -1045,19 +1036,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:356 +#: ../coreapi/linphonecore.c:357 msgid "aborted" msgstr "přerušen" -#: ../coreapi/linphonecore.c:359 +#: ../coreapi/linphonecore.c:360 msgid "completed" msgstr "dokončen" -#: ../coreapi/linphonecore.c:362 +#: ../coreapi/linphonecore.c:363 msgid "missed" msgstr "promeškán" -#: ../coreapi/linphonecore.c:367 +#: ../coreapi/linphonecore.c:368 #, c-format msgid "" "%s at %s\n" @@ -1072,11 +1063,11 @@ msgstr "" "Stav: %s\n" "Délka: %i min %i s\n" -#: ../coreapi/linphonecore.c:368 +#: ../coreapi/linphonecore.c:369 msgid "Outgoing call" msgstr "Odchozí hovor" -#: ../coreapi/linphonecore.c:625 +#: ../coreapi/linphonecore.c:626 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" @@ -1084,50 +1075,50 @@ 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:1074 +#: ../coreapi/linphonecore.c:1083 msgid "Ready" msgstr "Připraven." -#: ../coreapi/linphonecore.c:1505 +#: ../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:1703 +#: ../coreapi/linphonecore.c:1725 msgid "Looking for telephone number destination..." msgstr "Vyhledává se umístění čísla…" -#: ../coreapi/linphonecore.c:1705 +#: ../coreapi/linphonecore.c:1727 msgid "Could not resolve this number." msgstr "Toto číslo nelze vyhledat." -#: ../coreapi/linphonecore.c:1749 +#: ../coreapi/linphonecore.c:1771 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 " -#: ../coreapi/linphonecore.c:1890 +#: ../coreapi/linphonecore.c:1912 msgid "Contacting" msgstr "Kontaktuji" -#: ../coreapi/linphonecore.c:1896 +#: ../coreapi/linphonecore.c:1918 msgid "could not call" msgstr "Nelze volat." -#: ../coreapi/linphonecore.c:1942 +#: ../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:2337 ../coreapi/callbacks.c:32 +#: ../coreapi/linphonecore.c:2370 ../coreapi/callbacks.c:32 msgid "Connected." msgstr "Připojeno." -#: ../coreapi/linphonecore.c:2371 +#: ../coreapi/linphonecore.c:2404 msgid "Call ended" msgstr "Hovor skončil." -#: ../coreapi/misc.c:142 +#: ../coreapi/misc.c:147 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the pcm oss emulation module\n" @@ -1139,7 +1130,7 @@ msgstr "" "oss, který chybí. Prosím zadejte jako uživatel root příkaz\n" "'modprobe snd-pcm-oss', kterým modul zavede." -#: ../coreapi/misc.c:145 +#: ../coreapi/misc.c:150 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the mixer oss emulation module\n" @@ -1151,7 +1142,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:492 +#: ../coreapi/misc.c:497 msgid "Stun lookup in progress..." msgstr "Hledá se adresa pomocí STUN…" @@ -1265,46 +1256,46 @@ msgstr "Uživatel si nepřeje být rušen." msgid "Call declined." msgstr "Volání odmítnuto." -#: ../coreapi/callbacks.c:280 +#: ../coreapi/callbacks.c:281 msgid "No response." msgstr "Žádná odpověď." -#: ../coreapi/callbacks.c:283 -msgid "Error." -msgstr "Chyba." +#: ../coreapi/callbacks.c:284 +msgid "Protocol error." +msgstr "" -#: ../coreapi/callbacks.c:296 +#: ../coreapi/callbacks.c:298 msgid "Redirected" msgstr "Přesměrováno" -#: ../coreapi/callbacks.c:304 +#: ../coreapi/callbacks.c:308 msgid "Not found" msgstr "Nenalezeno" -#: ../coreapi/callbacks.c:312 +#: ../coreapi/callbacks.c:318 msgid "No common codecs" msgstr "Žádný společný formát" -#: ../coreapi/callbacks.c:316 +#: ../coreapi/callbacks.c:324 msgid "Call failed." msgstr "Volání se nezdařilo." -#: ../coreapi/callbacks.c:365 +#: ../coreapi/callbacks.c:374 #, c-format msgid "Registration on %s successful." msgstr "Registrace na %s byla úspěšná." -#: ../coreapi/callbacks.c:366 +#: ../coreapi/callbacks.c:375 #, c-format msgid "Unregistration on %s done." msgstr "Odregistrování z %s hotovo." -#: ../coreapi/callbacks.c:374 +#: ../coreapi/callbacks.c:383 #, c-format msgid "Registration on %s failed: %s" msgstr "Registrace na %s selhala: %s" -#: ../coreapi/callbacks.c:374 +#: ../coreapi/callbacks.c:383 msgid "no response timeout" msgstr "odpověď nedorazila včas" @@ -1324,11 +1315,11 @@ msgstr "Zdroj zvuku ALSA" msgid "Alsa sound output" msgstr "Zvukový výstup ALSA" -#: ../mediastreamer2/src/aqsnd.c:1005 +#: ../mediastreamer2/src/aqsnd.c:1008 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:1029 +#: ../mediastreamer2/src/aqsnd.c:1032 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" @@ -1344,11 +1335,11 @@ msgstr "Kodek plnopásmového GSM" msgid "The GSM codec" msgstr "GSM kodek" -#: ../mediastreamer2/src/macsnd.c:670 +#: ../mediastreamer2/src/macsnd.c:1083 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:684 +#: ../mediastreamer2/src/macsnd.c:1098 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" @@ -1393,7 +1384,7 @@ msgstr "Svobodný a úžasný kodek speex" msgid "A filter that controls and measure sound volume" msgstr "Filtr, který měří a řídí hlasitost zvuku" -#: ../mediastreamer2/src/msv4l.c:1009 +#: ../mediastreamer2/src/msv4l.c:1011 msgid "A video4linux compatible source filter to stream pictures." msgstr "Zdrojový filtr kompatibilní s Video4Linux proudující obrázky." @@ -1559,6 +1550,9 @@ msgstr "Parametrický ekvalizér zvuku." msgid "A webcam grabber based on directshow." msgstr "Snímač kamer postavený na directshow." +#~ msgid "Error." +#~ msgstr "Chyba." + #~ msgid "Terminate call" #~ msgstr "Ukončit hovor" diff --git a/po/de.po b/po/de.po index c0d4b43c4..909e478e8 100644 --- a/po/de.po +++ b/po/de.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: linphone 0.7.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-02 10:28+0200\n" +"POT-Creation-Date: 2010-04-22 17:16+0200\n" "PO-Revision-Date: 2003-05-23 17:51-0400\n" "Last-Translator: Jean-Jacques Sarton , Ursula Herles-" "Hartz \n" @@ -26,39 +26,39 @@ msgstr "Pixmapdatei %s nicht gefunden" msgid "Chat with %s" msgstr "Chat mit %s" -#: ../gtk-glade/main.c:92 +#: ../gtk-glade/main.c:94 msgid "log to stdout some debug information while running." msgstr "" -#: ../gtk-glade/main.c:99 +#: ../gtk-glade/main.c:101 msgid "Start only in the system tray, do not show the main interface." msgstr "" -#: ../gtk-glade/main.c:106 +#: ../gtk-glade/main.c:108 msgid "address to call right now" msgstr "" -#: ../gtk-glade/main.c:113 +#: ../gtk-glade/main.c:115 msgid "if set automatically answer incoming calls" msgstr "" -#: ../gtk-glade/main.c:121 +#: ../gtk-glade/main.c:123 msgid "" "Specifiy a working directory (should be the base of the installation, eg: c:" "\\Program Files\\Linphone)" msgstr "" -#: ../gtk-glade/main.c:396 +#: ../gtk-glade/main.c:402 #, fuzzy, c-format msgid "Call with %s" msgstr "Chat mit %s" -#: ../gtk-glade/main.c:707 +#: ../gtk-glade/main.c:720 #, fuzzy, c-format msgid "Incoming call from %s" msgstr "Eingehendes Gespr�h" -#: ../gtk-glade/main.c:746 +#: ../gtk-glade/main.c:759 #, c-format msgid "" "%s would like to add you to his contact list.\n" @@ -67,31 +67,37 @@ msgid "" "If you answer no, this person will be temporarily blacklisted." msgstr "" -#: ../gtk-glade/main.c:824 +#: ../gtk-glade/main.c:837 #, c-format msgid "" "Please enter your password for username %s\n" " at domain %s:" msgstr "" -#: ../gtk-glade/main.c:921 +#: ../gtk-glade/main.c:934 msgid "Website link" msgstr "" -#: ../gtk-glade/main.c:957 +#: ../gtk-glade/main.c:970 msgid "Linphone - a video internet phone" msgstr "" -#: ../gtk-glade/main.c:976 +#: ../gtk-glade/main.c:989 #, c-format msgid "%s (Default)" msgstr "" -#: ../gtk-glade/main.c:1229 +#: ../gtk-glade/main.c:1221 +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 msgid "A free SIP video-phone" msgstr "Ein freies SIP Video-Fone" -#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:247 +#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:258 #: ../gtk-glade/contact.glade.h:3 msgid "Name" msgstr "Name" @@ -134,91 +140,91 @@ msgstr "" msgid "Add new contact from %s directory" msgstr "" -#: ../gtk-glade/propertybox.c:253 +#: ../gtk-glade/propertybox.c:264 msgid "Rate (Hz)" msgstr "Rate (Hz)" -#: ../gtk-glade/propertybox.c:259 +#: ../gtk-glade/propertybox.c:270 msgid "Status" msgstr "Status" -#: ../gtk-glade/propertybox.c:265 +#: ../gtk-glade/propertybox.c:276 msgid "Min bitrate (kbit/s)" msgstr "Min Bitrate (kbit/s)" -#: ../gtk-glade/propertybox.c:271 +#: ../gtk-glade/propertybox.c:283 msgid "Parameters" msgstr "Parameter" -#: ../gtk-glade/propertybox.c:298 ../gtk-glade/propertybox.c:437 +#: ../gtk-glade/propertybox.c:312 ../gtk-glade/propertybox.c:451 msgid "Enabled" msgstr "Freigegeben" -#: ../gtk-glade/propertybox.c:299 ../gtk-glade/propertybox.c:437 +#: ../gtk-glade/propertybox.c:313 ../gtk-glade/propertybox.c:451 msgid "Disabled" msgstr "Gesperrt" -#: ../gtk-glade/propertybox.c:482 +#: ../gtk-glade/propertybox.c:496 msgid "Account" msgstr "Konto" -#: ../gtk-glade/propertybox.c:622 +#: ../gtk-glade/propertybox.c:636 msgid "English" msgstr "" -#: ../gtk-glade/propertybox.c:623 +#: ../gtk-glade/propertybox.c:637 msgid "French" msgstr "" -#: ../gtk-glade/propertybox.c:624 +#: ../gtk-glade/propertybox.c:638 msgid "Swedish" msgstr "" -#: ../gtk-glade/propertybox.c:625 +#: ../gtk-glade/propertybox.c:639 msgid "Italian" msgstr "" -#: ../gtk-glade/propertybox.c:626 +#: ../gtk-glade/propertybox.c:640 msgid "Spanish" msgstr "" -#: ../gtk-glade/propertybox.c:627 +#: ../gtk-glade/propertybox.c:641 msgid "Brazilian Portugese" msgstr "" -#: ../gtk-glade/propertybox.c:628 +#: ../gtk-glade/propertybox.c:642 msgid "Polish" msgstr "" -#: ../gtk-glade/propertybox.c:629 +#: ../gtk-glade/propertybox.c:643 msgid "German" msgstr "" -#: ../gtk-glade/propertybox.c:630 +#: ../gtk-glade/propertybox.c:644 msgid "Russian" msgstr "" -#: ../gtk-glade/propertybox.c:631 +#: ../gtk-glade/propertybox.c:645 msgid "Japanese" msgstr "" -#: ../gtk-glade/propertybox.c:632 +#: ../gtk-glade/propertybox.c:646 msgid "Dutch" msgstr "" -#: ../gtk-glade/propertybox.c:633 +#: ../gtk-glade/propertybox.c:647 msgid "Hungarian" msgstr "" -#: ../gtk-glade/propertybox.c:634 +#: ../gtk-glade/propertybox.c:648 msgid "Czech" msgstr "" -#: ../gtk-glade/propertybox.c:635 +#: ../gtk-glade/propertybox.c:649 msgid "Chinese" msgstr "" -#: ../gtk-glade/propertybox.c:692 +#: ../gtk-glade/propertybox.c:706 msgid "" "You need to restart linphone for the new language selection to take effect." msgstr "" @@ -750,7 +756,7 @@ msgstr "Annehmen" msgid "Decline" msgstr "Leitung" -#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:368 +#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:369 msgid "Incoming call" msgstr "Eingehendes Gespr�h" @@ -1026,18 +1032,6 @@ msgstr "" msgid "default soundcard\n" msgstr "" -#: ../gtk-glade/parameters.glade.h:65 -msgid "gtk-go-down" -msgstr "" - -#: ../gtk-glade/parameters.glade.h:66 -msgid "gtk-go-up" -msgstr "" - -#: ../gtk-glade/parameters.glade.h:67 -msgid "gtk-media-play" -msgstr "" - #: ../gtk-glade/buddylookup.glade.h:1 msgid "Search somebody" msgstr "" @@ -1058,26 +1052,26 @@ msgstr "Linphone" msgid "Please wait" msgstr "" -#: ../coreapi/linphonecore.c:310 +#: ../coreapi/linphonecore.c:311 #, 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:356 +#: ../coreapi/linphonecore.c:357 msgid "aborted" msgstr "abgebrochen" -#: ../coreapi/linphonecore.c:359 +#: ../coreapi/linphonecore.c:360 msgid "completed" msgstr "beendet" -#: ../coreapi/linphonecore.c:362 +#: ../coreapi/linphonecore.c:363 msgid "missed" msgstr "verpasst" -#: ../coreapi/linphonecore.c:367 +#: ../coreapi/linphonecore.c:368 #, c-format msgid "" "%s at %s\n" @@ -1091,11 +1085,11 @@ msgstr "" "Status: %s\n" "Dauer: %i mn %i sec\n" -#: ../coreapi/linphonecore.c:368 +#: ../coreapi/linphonecore.c:369 msgid "Outgoing call" msgstr "Abgehendes Gespräch" -#: ../coreapi/linphonecore.c:625 +#: ../coreapi/linphonecore.c:626 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" @@ -1104,23 +1098,23 @@ msgstr "" "Linphoneverwendet normalerweise IPv4. Bitte Konfiguration anpassen wenn sie " "IPv6 verwenden wollen" -#: ../coreapi/linphonecore.c:1074 +#: ../coreapi/linphonecore.c:1083 msgid "Ready" msgstr "Bereit" -#: ../coreapi/linphonecore.c:1505 +#: ../coreapi/linphonecore.c:1513 msgid "Remote end seems to have disconnected, the call is going to be closed." msgstr "" -#: ../coreapi/linphonecore.c:1703 +#: ../coreapi/linphonecore.c:1725 msgid "Looking for telephone number destination..." msgstr "Suche Telefonnummernziel.." -#: ../coreapi/linphonecore.c:1705 +#: ../coreapi/linphonecore.c:1727 msgid "Could not resolve this number." msgstr "Konnte dies Nummer nicht auflösen." -#: ../coreapi/linphonecore.c:1749 +#: ../coreapi/linphonecore.c:1771 msgid "" "Could not parse given sip address. A sip url usually looks like sip:" "user@domain" @@ -1128,27 +1122,27 @@ msgstr "" "Sip-Adresse kann nicht bestimmt werden. Eine Sip-Adresse hat folgenden " "Aufbau " -#: ../coreapi/linphonecore.c:1890 +#: ../coreapi/linphonecore.c:1912 msgid "Contacting" msgstr "Rufe an" -#: ../coreapi/linphonecore.c:1896 +#: ../coreapi/linphonecore.c:1918 msgid "could not call" msgstr "Konnte kein Anruf vornehmen" -#: ../coreapi/linphonecore.c:1942 +#: ../coreapi/linphonecore.c:1965 msgid "Sorry, having multiple simultaneous calls is not supported yet !" msgstr "Mehrfachen gleichzeitigen Anrufen nicht unterstützt !" -#: ../coreapi/linphonecore.c:2337 ../coreapi/callbacks.c:32 +#: ../coreapi/linphonecore.c:2370 ../coreapi/callbacks.c:32 msgid "Connected." msgstr "Verbunden." -#: ../coreapi/linphonecore.c:2371 +#: ../coreapi/linphonecore.c:2404 msgid "Call ended" msgstr "Anruf beendet" -#: ../coreapi/misc.c:142 +#: ../coreapi/misc.c:147 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the pcm oss emulation module\n" @@ -1161,7 +1155,7 @@ msgstr "" "nicht vorhanden. Für die Einbindung des Moduls\n" "bitte den Befehl 'modprobe snd-pcm-oss' als Anwender-Root verwenden." -#: ../coreapi/misc.c:145 +#: ../coreapi/misc.c:150 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the mixer oss emulation module\n" @@ -1174,7 +1168,7 @@ msgstr "" "nicht vorhanden. Fr die Einbindung des Moduls\n" "bitte den Befehl 'modprobe snd-pcm-oss' als Anwender-Root verwenden." -#: ../coreapi/misc.c:492 +#: ../coreapi/misc.c:497 msgid "Stun lookup in progress..." msgstr "Stun Ermittlung läuft..." @@ -1291,48 +1285,48 @@ msgstr "Teilnehmer möchte nicht gestört werden." msgid "Call declined." msgstr "Anruf abgewiesen" -#: ../coreapi/callbacks.c:280 +#: ../coreapi/callbacks.c:281 msgid "No response." msgstr "" -#: ../coreapi/callbacks.c:283 -msgid "Error." +#: ../coreapi/callbacks.c:284 +msgid "Protocol error." msgstr "" -#: ../coreapi/callbacks.c:296 +#: ../coreapi/callbacks.c:298 #, fuzzy msgid "Redirected" msgstr "Nach %s umgeleitet..." -#: ../coreapi/callbacks.c:304 +#: ../coreapi/callbacks.c:308 msgid "Not found" msgstr "" -#: ../coreapi/callbacks.c:312 +#: ../coreapi/callbacks.c:318 msgid "No common codecs" msgstr "" -#: ../coreapi/callbacks.c:316 +#: ../coreapi/callbacks.c:324 #, fuzzy msgid "Call failed." msgstr "Anruf annulliert" -#: ../coreapi/callbacks.c:365 +#: ../coreapi/callbacks.c:374 #, c-format msgid "Registration on %s successful." msgstr "Registrierung auf %s erfolgreich." -#: ../coreapi/callbacks.c:366 +#: ../coreapi/callbacks.c:375 #, fuzzy, c-format msgid "Unregistration on %s done." msgstr "Registrierung auf %s erfolgreich." -#: ../coreapi/callbacks.c:374 +#: ../coreapi/callbacks.c:383 #, fuzzy, c-format msgid "Registration on %s failed: %s" msgstr "Registrierung auf %s schlug fehl (Zeitberschreitung)." -#: ../coreapi/callbacks.c:374 +#: ../coreapi/callbacks.c:383 msgid "no response timeout" msgstr "" @@ -1352,11 +1346,11 @@ msgstr "" msgid "Alsa sound output" msgstr "" -#: ../mediastreamer2/src/aqsnd.c:1005 +#: ../mediastreamer2/src/aqsnd.c:1008 msgid "Sound capture filter for MacOS X Audio Queue Service" msgstr "" -#: ../mediastreamer2/src/aqsnd.c:1029 +#: ../mediastreamer2/src/aqsnd.c:1032 msgid "Sound playback filter for MacOS X Audio Queue Service" msgstr "" @@ -1372,11 +1366,11 @@ msgstr "" msgid "The GSM codec" msgstr "" -#: ../mediastreamer2/src/macsnd.c:670 +#: ../mediastreamer2/src/macsnd.c:1083 msgid "Sound capture filter for MacOS X Core Audio drivers" msgstr "" -#: ../mediastreamer2/src/macsnd.c:684 +#: ../mediastreamer2/src/macsnd.c:1098 msgid "Sound playback filter for MacOS X Core Audio drivers" msgstr "" @@ -1421,7 +1415,7 @@ msgstr "" msgid "A filter that controls and measure sound volume" msgstr "" -#: ../mediastreamer2/src/msv4l.c:1009 +#: ../mediastreamer2/src/msv4l.c:1011 msgid "A video4linux compatible source filter to stream pictures." msgstr "" diff --git a/po/es.po b/po/es.po index 6d6e039bf..0b2201bcf 100644 --- a/po/es.po +++ b/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Linphone 0.9.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-02 10:28+0200\n" +"POT-Creation-Date: 2010-04-22 17:16+0200\n" "PO-Revision-Date: 2002-10-15 HO:MI+ZONE\n" "Last-Translator: Nelson Benitez \n" "Language-Team: es \n" @@ -26,39 +26,39 @@ msgstr "No se pudo encontrar el archivo pixmap: %s" msgid "Chat with %s" msgstr "" -#: ../gtk-glade/main.c:92 +#: ../gtk-glade/main.c:94 msgid "log to stdout some debug information while running." msgstr "" -#: ../gtk-glade/main.c:99 +#: ../gtk-glade/main.c:101 msgid "Start only in the system tray, do not show the main interface." msgstr "" -#: ../gtk-glade/main.c:106 +#: ../gtk-glade/main.c:108 msgid "address to call right now" msgstr "" -#: ../gtk-glade/main.c:113 +#: ../gtk-glade/main.c:115 msgid "if set automatically answer incoming calls" msgstr "" -#: ../gtk-glade/main.c:121 +#: ../gtk-glade/main.c:123 msgid "" "Specifiy a working directory (should be the base of the installation, eg: c:" "\\Program Files\\Linphone)" msgstr "" -#: ../gtk-glade/main.c:396 +#: ../gtk-glade/main.c:402 #, c-format msgid "Call with %s" msgstr "" -#: ../gtk-glade/main.c:707 +#: ../gtk-glade/main.c:720 #, c-format msgid "Incoming call from %s" msgstr "" -#: ../gtk-glade/main.c:746 +#: ../gtk-glade/main.c:759 #, c-format msgid "" "%s would like to add you to his contact list.\n" @@ -67,31 +67,37 @@ msgid "" "If you answer no, this person will be temporarily blacklisted." msgstr "" -#: ../gtk-glade/main.c:824 +#: ../gtk-glade/main.c:837 #, c-format msgid "" "Please enter your password for username %s\n" " at domain %s:" msgstr "" -#: ../gtk-glade/main.c:921 +#: ../gtk-glade/main.c:934 msgid "Website link" msgstr "" -#: ../gtk-glade/main.c:957 +#: ../gtk-glade/main.c:970 msgid "Linphone - a video internet phone" msgstr "" -#: ../gtk-glade/main.c:976 +#: ../gtk-glade/main.c:989 #, c-format msgid "%s (Default)" msgstr "" -#: ../gtk-glade/main.c:1229 +#: ../gtk-glade/main.c:1221 +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 msgid "A free SIP video-phone" msgstr "" -#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:247 +#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:258 #: ../gtk-glade/contact.glade.h:3 msgid "Name" msgstr "Nombre" @@ -135,91 +141,91 @@ msgstr "" msgid "Add new contact from %s directory" msgstr "" -#: ../gtk-glade/propertybox.c:253 +#: ../gtk-glade/propertybox.c:264 msgid "Rate (Hz)" msgstr "" -#: ../gtk-glade/propertybox.c:259 +#: ../gtk-glade/propertybox.c:270 msgid "Status" msgstr "Estado" -#: ../gtk-glade/propertybox.c:265 +#: ../gtk-glade/propertybox.c:276 msgid "Min bitrate (kbit/s)" msgstr "" -#: ../gtk-glade/propertybox.c:271 +#: ../gtk-glade/propertybox.c:283 msgid "Parameters" msgstr "Parametros" -#: ../gtk-glade/propertybox.c:298 ../gtk-glade/propertybox.c:437 +#: ../gtk-glade/propertybox.c:312 ../gtk-glade/propertybox.c:451 msgid "Enabled" msgstr "Activado" -#: ../gtk-glade/propertybox.c:299 ../gtk-glade/propertybox.c:437 +#: ../gtk-glade/propertybox.c:313 ../gtk-glade/propertybox.c:451 msgid "Disabled" msgstr "Desactivado" -#: ../gtk-glade/propertybox.c:482 +#: ../gtk-glade/propertybox.c:496 msgid "Account" msgstr "" -#: ../gtk-glade/propertybox.c:622 +#: ../gtk-glade/propertybox.c:636 msgid "English" msgstr "" -#: ../gtk-glade/propertybox.c:623 +#: ../gtk-glade/propertybox.c:637 msgid "French" msgstr "" -#: ../gtk-glade/propertybox.c:624 +#: ../gtk-glade/propertybox.c:638 msgid "Swedish" msgstr "" -#: ../gtk-glade/propertybox.c:625 +#: ../gtk-glade/propertybox.c:639 msgid "Italian" msgstr "" -#: ../gtk-glade/propertybox.c:626 +#: ../gtk-glade/propertybox.c:640 msgid "Spanish" msgstr "" -#: ../gtk-glade/propertybox.c:627 +#: ../gtk-glade/propertybox.c:641 msgid "Brazilian Portugese" msgstr "" -#: ../gtk-glade/propertybox.c:628 +#: ../gtk-glade/propertybox.c:642 msgid "Polish" msgstr "" -#: ../gtk-glade/propertybox.c:629 +#: ../gtk-glade/propertybox.c:643 msgid "German" msgstr "" -#: ../gtk-glade/propertybox.c:630 +#: ../gtk-glade/propertybox.c:644 msgid "Russian" msgstr "" -#: ../gtk-glade/propertybox.c:631 +#: ../gtk-glade/propertybox.c:645 msgid "Japanese" msgstr "" -#: ../gtk-glade/propertybox.c:632 +#: ../gtk-glade/propertybox.c:646 msgid "Dutch" msgstr "" -#: ../gtk-glade/propertybox.c:633 +#: ../gtk-glade/propertybox.c:647 msgid "Hungarian" msgstr "" -#: ../gtk-glade/propertybox.c:634 +#: ../gtk-glade/propertybox.c:648 msgid "Czech" msgstr "" -#: ../gtk-glade/propertybox.c:635 +#: ../gtk-glade/propertybox.c:649 msgid "Chinese" msgstr "" -#: ../gtk-glade/propertybox.c:692 +#: ../gtk-glade/propertybox.c:706 msgid "" "You need to restart linphone for the new language selection to take effect." msgstr "" @@ -743,7 +749,7 @@ msgstr "" msgid "Decline" msgstr "linea" -#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:368 +#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:369 msgid "Incoming call" msgstr "" @@ -1014,18 +1020,6 @@ msgstr "" msgid "default soundcard\n" msgstr "" -#: ../gtk-glade/parameters.glade.h:65 -msgid "gtk-go-down" -msgstr "" - -#: ../gtk-glade/parameters.glade.h:66 -msgid "gtk-go-up" -msgstr "" - -#: ../gtk-glade/parameters.glade.h:67 -msgid "gtk-media-play" -msgstr "" - #: ../gtk-glade/buddylookup.glade.h:1 msgid "Search somebody" msgstr "" @@ -1047,26 +1041,26 @@ msgstr "linphone" msgid "Please wait" msgstr "" -#: ../coreapi/linphonecore.c:310 +#: ../coreapi/linphonecore.c:311 #, c-format msgid "You have missed %i call." msgid_plural "You have missed %i calls." msgstr[0] "" msgstr[1] "" -#: ../coreapi/linphonecore.c:356 +#: ../coreapi/linphonecore.c:357 msgid "aborted" msgstr "" -#: ../coreapi/linphonecore.c:359 +#: ../coreapi/linphonecore.c:360 msgid "completed" msgstr "" -#: ../coreapi/linphonecore.c:362 +#: ../coreapi/linphonecore.c:363 msgid "missed" msgstr "" -#: ../coreapi/linphonecore.c:367 +#: ../coreapi/linphonecore.c:368 #, c-format msgid "" "%s at %s\n" @@ -1076,34 +1070,34 @@ msgid "" "Duration: %i mn %i sec\n" msgstr "" -#: ../coreapi/linphonecore.c:368 +#: ../coreapi/linphonecore.c:369 msgid "Outgoing call" msgstr "" -#: ../coreapi/linphonecore.c:625 +#: ../coreapi/linphonecore.c:626 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:1074 +#: ../coreapi/linphonecore.c:1083 #, fuzzy msgid "Ready" msgstr "Preparado." -#: ../coreapi/linphonecore.c:1505 +#: ../coreapi/linphonecore.c:1513 msgid "Remote end seems to have disconnected, the call is going to be closed." msgstr "" -#: ../coreapi/linphonecore.c:1703 +#: ../coreapi/linphonecore.c:1725 msgid "Looking for telephone number destination..." msgstr "" -#: ../coreapi/linphonecore.c:1705 +#: ../coreapi/linphonecore.c:1727 msgid "Could not resolve this number." msgstr "" -#: ../coreapi/linphonecore.c:1749 +#: ../coreapi/linphonecore.c:1771 #, fuzzy msgid "" "Could not parse given sip address. A sip url usually looks like sip:" @@ -1111,29 +1105,29 @@ msgid "" msgstr "" "Direccion SIP mal escrita. Una direccion SIP es " -#: ../coreapi/linphonecore.c:1890 +#: ../coreapi/linphonecore.c:1912 #, fuzzy msgid "Contacting" msgstr "Contactando " -#: ../coreapi/linphonecore.c:1896 +#: ../coreapi/linphonecore.c:1918 msgid "could not call" msgstr "" -#: ../coreapi/linphonecore.c:1942 +#: ../coreapi/linphonecore.c:1965 msgid "Sorry, having multiple simultaneous calls is not supported yet !" msgstr "" -#: ../coreapi/linphonecore.c:2337 ../coreapi/callbacks.c:32 +#: ../coreapi/linphonecore.c:2370 ../coreapi/callbacks.c:32 msgid "Connected." msgstr "Conectado." -#: ../coreapi/linphonecore.c:2371 +#: ../coreapi/linphonecore.c:2404 #, fuzzy msgid "Call ended" msgstr "Llamada cancelada." -#: ../coreapi/misc.c:142 +#: ../coreapi/misc.c:147 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the pcm oss emulation module\n" @@ -1145,7 +1139,7 @@ msgstr "" "no se encuentra y linphone lo necesita. Por favor ejecute\n" "'modprobe snd-pcm-oss' como root para cargarlo." -#: ../coreapi/misc.c:145 +#: ../coreapi/misc.c:150 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the mixer oss emulation module\n" @@ -1157,7 +1151,7 @@ msgstr "" "no se encuentra y linphone lo necesita. Por favor ejecute\n" " 'modprobe snd-mixer-oss' como root para cargarlo." -#: ../coreapi/misc.c:492 +#: ../coreapi/misc.c:497 msgid "Stun lookup in progress..." msgstr "" @@ -1274,47 +1268,47 @@ msgstr "El usuario no quiere que lo molesten." msgid "Call declined." msgstr "Llamada cancelada." -#: ../coreapi/callbacks.c:280 +#: ../coreapi/callbacks.c:281 msgid "No response." msgstr "" -#: ../coreapi/callbacks.c:283 -msgid "Error." +#: ../coreapi/callbacks.c:284 +msgid "Protocol error." msgstr "" -#: ../coreapi/callbacks.c:296 +#: ../coreapi/callbacks.c:298 msgid "Redirected" msgstr "" -#: ../coreapi/callbacks.c:304 +#: ../coreapi/callbacks.c:308 msgid "Not found" msgstr "" -#: ../coreapi/callbacks.c:312 +#: ../coreapi/callbacks.c:318 msgid "No common codecs" msgstr "" -#: ../coreapi/callbacks.c:316 +#: ../coreapi/callbacks.c:324 #, fuzzy msgid "Call failed." msgstr "Llamada cancelada." -#: ../coreapi/callbacks.c:365 +#: ../coreapi/callbacks.c:374 #, fuzzy, c-format msgid "Registration on %s successful." msgstr "Se ha registrado con exito." -#: ../coreapi/callbacks.c:366 +#: ../coreapi/callbacks.c:375 #, fuzzy, c-format msgid "Unregistration on %s done." msgstr "Se ha registrado con exito." -#: ../coreapi/callbacks.c:374 +#: ../coreapi/callbacks.c:383 #, fuzzy, c-format msgid "Registration on %s failed: %s" msgstr "Se ha registrado con exito." -#: ../coreapi/callbacks.c:374 +#: ../coreapi/callbacks.c:383 msgid "no response timeout" msgstr "" @@ -1334,11 +1328,11 @@ msgstr "" msgid "Alsa sound output" msgstr "" -#: ../mediastreamer2/src/aqsnd.c:1005 +#: ../mediastreamer2/src/aqsnd.c:1008 msgid "Sound capture filter for MacOS X Audio Queue Service" msgstr "" -#: ../mediastreamer2/src/aqsnd.c:1029 +#: ../mediastreamer2/src/aqsnd.c:1032 msgid "Sound playback filter for MacOS X Audio Queue Service" msgstr "" @@ -1354,11 +1348,11 @@ msgstr "" msgid "The GSM codec" msgstr "" -#: ../mediastreamer2/src/macsnd.c:670 +#: ../mediastreamer2/src/macsnd.c:1083 msgid "Sound capture filter for MacOS X Core Audio drivers" msgstr "" -#: ../mediastreamer2/src/macsnd.c:684 +#: ../mediastreamer2/src/macsnd.c:1098 msgid "Sound playback filter for MacOS X Core Audio drivers" msgstr "" @@ -1403,7 +1397,7 @@ msgstr "" msgid "A filter that controls and measure sound volume" msgstr "" -#: ../mediastreamer2/src/msv4l.c:1009 +#: ../mediastreamer2/src/msv4l.c:1011 msgid "A video4linux compatible source filter to stream pictures." msgstr "" diff --git a/po/fr.po b/po/fr.po index 89108273e..b7fc236ef 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Linphone 0.9.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-02 10:28+0200\n" +"POT-Creation-Date: 2010-04-22 17:16+0200\n" "PO-Revision-Date: 2002-12-06 17:33+0100\n" "Last-Translator: Simon Morlat \n" "Language-Team: french \n" @@ -25,38 +25,39 @@ msgstr "Icone non trouvée: %s" msgid "Chat with %s" msgstr "Chat avec %s" -#: ../gtk-glade/main.c:92 +#: ../gtk-glade/main.c:94 msgid "log to stdout some debug information while running." msgstr "" -#: ../gtk-glade/main.c:99 +#: ../gtk-glade/main.c:101 msgid "Start only in the system tray, do not show the main interface." msgstr "" -#: ../gtk-glade/main.c:106 +#: ../gtk-glade/main.c:108 msgid "address to call right now" msgstr "" -#: ../gtk-glade/main.c:113 +#: ../gtk-glade/main.c:115 msgid "if set automatically answer incoming calls" msgstr "" -#: ../gtk-glade/main.c:121 +#: ../gtk-glade/main.c:123 msgid "" "Specifiy a working directory (should be the base of the installation, eg: c:" "\\Program Files\\Linphone)" msgstr "" -#: ../gtk-glade/main.c:396 +#: ../gtk-glade/main.c:402 +#, c-format msgid "Call with %s" msgstr "Appel avec %s" -#: ../gtk-glade/main.c:707 +#: ../gtk-glade/main.c:720 #, c-format msgid "Incoming call from %s" msgstr "Appel entrant de %s" -#: ../gtk-glade/main.c:746 +#: ../gtk-glade/main.c:759 #, c-format msgid "" "%s would like to add you to his contact list.\n" @@ -65,31 +66,39 @@ msgid "" "If you answer no, this person will be temporarily blacklisted." msgstr "" -#: ../gtk-glade/main.c:824 +#: ../gtk-glade/main.c:837 #, c-format msgid "" "Please enter your password for username %s\n" " at domain %s:" -msgstr "Entrez le mot de passe pour %s\n sur le domaine %s:" +msgstr "" +"Entrez le mot de passe pour %s\n" +" sur le domaine %s:" -#: ../gtk-glade/main.c:921 +#: ../gtk-glade/main.c:934 msgid "Website link" msgstr "Lien site web" -#: ../gtk-glade/main.c:957 +#: ../gtk-glade/main.c:970 msgid "Linphone - a video internet phone" msgstr "Linphone - un téléphone video pour l'internet" -#: ../gtk-glade/main.c:976 +#: ../gtk-glade/main.c:989 #, c-format msgid "%s (Default)" msgstr "%s (par défaut)" -#: ../gtk-glade/main.c:1229 +#: ../gtk-glade/main.c:1221 +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 msgid "A free SIP video-phone" msgstr "Un visiophone libre" -#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:247 +#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:258 #: ../gtk-glade/contact.glade.h:3 msgid "Name" msgstr "Nom" @@ -132,91 +141,91 @@ msgstr "Supprimer le contact '%s'" msgid "Add new contact from %s directory" msgstr "Ajouter un contact depuis l'annuaire %s" -#: ../gtk-glade/propertybox.c:253 +#: ../gtk-glade/propertybox.c:264 msgid "Rate (Hz)" msgstr "Fréquence (Hz)" -#: ../gtk-glade/propertybox.c:259 +#: ../gtk-glade/propertybox.c:270 msgid "Status" msgstr "Etat" -#: ../gtk-glade/propertybox.c:265 +#: ../gtk-glade/propertybox.c:276 msgid "Min bitrate (kbit/s)" msgstr "Débit min. (kbit/s)" -#: ../gtk-glade/propertybox.c:271 +#: ../gtk-glade/propertybox.c:283 msgid "Parameters" msgstr "Paramètres" -#: ../gtk-glade/propertybox.c:298 ../gtk-glade/propertybox.c:437 +#: ../gtk-glade/propertybox.c:312 ../gtk-glade/propertybox.c:451 msgid "Enabled" msgstr "Activé" -#: ../gtk-glade/propertybox.c:299 ../gtk-glade/propertybox.c:437 +#: ../gtk-glade/propertybox.c:313 ../gtk-glade/propertybox.c:451 msgid "Disabled" msgstr "Désactivé" -#: ../gtk-glade/propertybox.c:482 +#: ../gtk-glade/propertybox.c:496 msgid "Account" msgstr "Compte" -#: ../gtk-glade/propertybox.c:622 +#: ../gtk-glade/propertybox.c:636 msgid "English" msgstr "" -#: ../gtk-glade/propertybox.c:623 +#: ../gtk-glade/propertybox.c:637 msgid "French" msgstr "Français" -#: ../gtk-glade/propertybox.c:624 +#: ../gtk-glade/propertybox.c:638 msgid "Swedish" msgstr "" -#: ../gtk-glade/propertybox.c:625 +#: ../gtk-glade/propertybox.c:639 msgid "Italian" msgstr "" -#: ../gtk-glade/propertybox.c:626 +#: ../gtk-glade/propertybox.c:640 msgid "Spanish" msgstr "" -#: ../gtk-glade/propertybox.c:627 +#: ../gtk-glade/propertybox.c:641 msgid "Brazilian Portugese" msgstr "" -#: ../gtk-glade/propertybox.c:628 +#: ../gtk-glade/propertybox.c:642 msgid "Polish" msgstr "" -#: ../gtk-glade/propertybox.c:629 +#: ../gtk-glade/propertybox.c:643 msgid "German" msgstr "" -#: ../gtk-glade/propertybox.c:630 +#: ../gtk-glade/propertybox.c:644 msgid "Russian" msgstr "" -#: ../gtk-glade/propertybox.c:631 +#: ../gtk-glade/propertybox.c:645 msgid "Japanese" msgstr "日本語" -#: ../gtk-glade/propertybox.c:632 +#: ../gtk-glade/propertybox.c:646 msgid "Dutch" msgstr "" -#: ../gtk-glade/propertybox.c:633 +#: ../gtk-glade/propertybox.c:647 msgid "Hungarian" msgstr "" -#: ../gtk-glade/propertybox.c:634 +#: ../gtk-glade/propertybox.c:648 msgid "Czech" msgstr "" -#: ../gtk-glade/propertybox.c:635 +#: ../gtk-glade/propertybox.c:649 msgid "Chinese" msgstr "简体中文" -#: ../gtk-glade/propertybox.c:692 +#: ../gtk-glade/propertybox.c:706 msgid "" "You need to restart linphone for the new language selection to take effect." msgstr "" @@ -716,7 +725,7 @@ msgstr "Accepter" msgid "Decline" msgstr "Refuser" -#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:368 +#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:369 msgid "Incoming call" msgstr "Appel entrant" @@ -972,18 +981,6 @@ msgstr "Carte son par défaut" msgid "default soundcard\n" msgstr "Carte son par défaut\n" -#: ../gtk-glade/parameters.glade.h:65 -msgid "gtk-go-down" -msgstr "" - -#: ../gtk-glade/parameters.glade.h:66 -msgid "gtk-go-up" -msgstr "" - -#: ../gtk-glade/parameters.glade.h:67 -msgid "gtk-media-play" -msgstr "" - #: ../gtk-glade/buddylookup.glade.h:1 msgid "Search somebody" msgstr "Rechercher une personne" @@ -1004,26 +1001,26 @@ msgstr "Linphone" msgid "Please wait" msgstr "En attente" -#: ../coreapi/linphonecore.c:310 +#: ../coreapi/linphonecore.c:311 #, 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:356 +#: ../coreapi/linphonecore.c:357 msgid "aborted" msgstr "abandonné" -#: ../coreapi/linphonecore.c:359 +#: ../coreapi/linphonecore.c:360 msgid "completed" msgstr "terminé" -#: ../coreapi/linphonecore.c:362 +#: ../coreapi/linphonecore.c:363 msgid "missed" msgstr "manqué" -#: ../coreapi/linphonecore.c:367 +#: ../coreapi/linphonecore.c:368 #, c-format msgid "" "%s at %s\n" @@ -1038,11 +1035,11 @@ msgstr "" "Etat: %s\n" "Durée: %i mn %i sec\n" -#: ../coreapi/linphonecore.c:368 +#: ../coreapi/linphonecore.c:369 msgid "Outgoing call" msgstr "Appel sortant" -#: ../coreapi/linphonecore.c:625 +#: ../coreapi/linphonecore.c:626 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" @@ -1051,50 +1048,50 @@ msgstr "" "utilise toujours de l'IPv4. Merci de mettre à jour votre configuration si " "vous souhaitez utilisez un réseau IPv6." -#: ../coreapi/linphonecore.c:1074 +#: ../coreapi/linphonecore.c:1083 msgid "Ready" msgstr "Prêt." -#: ../coreapi/linphonecore.c:1505 +#: ../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:1703 +#: ../coreapi/linphonecore.c:1725 msgid "Looking for telephone number destination..." msgstr "Recherche de la destination du numéro de téléphone..." -#: ../coreapi/linphonecore.c:1705 +#: ../coreapi/linphonecore.c:1727 msgid "Could not resolve this number." msgstr "La destination n'a pu être trouvée." -#: ../coreapi/linphonecore.c:1749 +#: ../coreapi/linphonecore.c:1771 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 à " -#: ../coreapi/linphonecore.c:1890 +#: ../coreapi/linphonecore.c:1912 msgid "Contacting" msgstr "Appel de" -#: ../coreapi/linphonecore.c:1896 +#: ../coreapi/linphonecore.c:1918 msgid "could not call" msgstr "Echec" -#: ../coreapi/linphonecore.c:1942 +#: ../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:2337 ../coreapi/callbacks.c:32 +#: ../coreapi/linphonecore.c:2370 ../coreapi/callbacks.c:32 msgid "Connected." msgstr "En ligne." -#: ../coreapi/linphonecore.c:2371 +#: ../coreapi/linphonecore.c:2404 msgid "Call ended" msgstr "Appel terminé." -#: ../coreapi/misc.c:142 +#: ../coreapi/misc.c:147 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the pcm oss emulation module\n" @@ -1107,7 +1104,7 @@ msgstr "" "Veuillez s'il vous plait executer la commande\n" "'modprobe snd-pcm-oss' en tant que root afin de le charger." -#: ../coreapi/misc.c:145 +#: ../coreapi/misc.c:150 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the mixer oss emulation module\n" @@ -1119,7 +1116,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:492 +#: ../coreapi/misc.c:497 msgid "Stun lookup in progress..." msgstr "Découverte STUN en cours" @@ -1175,7 +1172,8 @@ msgstr "Bug inconnu" msgid "" "The sip proxy address you entered is invalid, it must start with \"sip:\" " "followed by a hostname." -msgstr "L'addresse SIP du proxy est invalide. Elle doit commencer par \"sip:\" " +msgstr "" +"L'addresse SIP du proxy est invalide. Elle doit commencer par \"sip:\" " "suivie par un nom de domaine." #: ../coreapi/proxy.c:182 @@ -1184,7 +1182,8 @@ msgid "" "It should look like sip:username@proxydomain, such as sip:alice@example.net" msgstr "" "L'identité SIP que vous avez fourni est invalide.\n" -"Elle doit être de la forme sip:username@domain, comme par example sip:alice@example.net" +"Elle doit être de la forme sip:username@domain, comme par example sip:" +"alice@example.net" #: ../coreapi/proxy.c:621 #, c-format @@ -1232,46 +1231,46 @@ msgstr "L'usager ne souhaite pas être dérangé" msgid "Call declined." msgstr "Appel décliné." -#: ../coreapi/callbacks.c:280 +#: ../coreapi/callbacks.c:281 msgid "No response." msgstr "Pas de réponse." -#: ../coreapi/callbacks.c:283 -msgid "Error." -msgstr "Erreur." +#: ../coreapi/callbacks.c:284 +msgid "Protocol error." +msgstr "" -#: ../coreapi/callbacks.c:296 +#: ../coreapi/callbacks.c:298 msgid "Redirected" msgstr "Redirection" -#: ../coreapi/callbacks.c:304 +#: ../coreapi/callbacks.c:308 msgid "Not found" msgstr "Non trouvé" -#: ../coreapi/callbacks.c:312 +#: ../coreapi/callbacks.c:318 msgid "No common codecs" msgstr "Pas de codecs commun" -#: ../coreapi/callbacks.c:316 +#: ../coreapi/callbacks.c:324 msgid "Call failed." msgstr "L'appel a échoué." -#: ../coreapi/callbacks.c:365 +#: ../coreapi/callbacks.c:374 #, c-format msgid "Registration on %s successful." msgstr "Enregistrement sur %s effectué." -#: ../coreapi/callbacks.c:366 +#: ../coreapi/callbacks.c:375 #, c-format msgid "Unregistration on %s done." msgstr "Désenregistrement sur %s effectué." -#: ../coreapi/callbacks.c:374 +#: ../coreapi/callbacks.c:383 #, c-format msgid "Registration on %s failed: %s" msgstr "Echec de l'enregistrement sur %s: %s" -#: ../coreapi/callbacks.c:374 +#: ../coreapi/callbacks.c:383 msgid "no response timeout" msgstr "Pas de réponse" @@ -1291,11 +1290,11 @@ msgstr "Source alsa" msgid "Alsa sound output" msgstr "Sortie alsa" -#: ../mediastreamer2/src/aqsnd.c:1005 +#: ../mediastreamer2/src/aqsnd.c:1008 msgid "Sound capture filter for MacOS X Audio Queue Service" msgstr "" -#: ../mediastreamer2/src/aqsnd.c:1029 +#: ../mediastreamer2/src/aqsnd.c:1032 msgid "Sound playback filter for MacOS X Audio Queue Service" msgstr "" @@ -1311,11 +1310,11 @@ msgstr "Le codec GSM full-rate" msgid "The GSM codec" msgstr "Le codec GSM" -#: ../mediastreamer2/src/macsnd.c:670 +#: ../mediastreamer2/src/macsnd.c:1083 msgid "Sound capture filter for MacOS X Core Audio drivers" msgstr "" -#: ../mediastreamer2/src/macsnd.c:684 +#: ../mediastreamer2/src/macsnd.c:1098 msgid "Sound playback filter for MacOS X Core Audio drivers" msgstr "" @@ -1360,7 +1359,7 @@ msgstr "Le codec speex, libre et performant" msgid "A filter that controls and measure sound volume" msgstr "" -#: ../mediastreamer2/src/msv4l.c:1009 +#: ../mediastreamer2/src/msv4l.c:1011 msgid "A video4linux compatible source filter to stream pictures." msgstr "" @@ -1513,3 +1512,5 @@ msgstr "" msgid "A webcam grabber based on directshow." msgstr "" +#~ msgid "Error." +#~ msgstr "Erreur." diff --git a/po/hu.po b/po/hu.po index eb5385b5f..8e2e1c152 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-02 10:28+0200\n" +"POT-Creation-Date: 2010-04-22 17:16+0200\n" "PO-Revision-Date: 2007-12-14 11:12+0100\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" @@ -26,39 +26,39 @@ msgstr "Nemtalálható a pixmap fájl: %s" msgid "Chat with %s" msgstr "Chat-elés %s -el" -#: ../gtk-glade/main.c:92 +#: ../gtk-glade/main.c:94 msgid "log to stdout some debug information while running." msgstr "" -#: ../gtk-glade/main.c:99 +#: ../gtk-glade/main.c:101 msgid "Start only in the system tray, do not show the main interface." msgstr "" -#: ../gtk-glade/main.c:106 +#: ../gtk-glade/main.c:108 msgid "address to call right now" msgstr "" -#: ../gtk-glade/main.c:113 +#: ../gtk-glade/main.c:115 msgid "if set automatically answer incoming calls" msgstr "" -#: ../gtk-glade/main.c:121 +#: ../gtk-glade/main.c:123 msgid "" "Specifiy a working directory (should be the base of the installation, eg: c:" "\\Program Files\\Linphone)" msgstr "" -#: ../gtk-glade/main.c:396 +#: ../gtk-glade/main.c:402 #, fuzzy, c-format msgid "Call with %s" msgstr "Chat-elés %s -el" -#: ../gtk-glade/main.c:707 +#: ../gtk-glade/main.c:720 #, fuzzy, c-format msgid "Incoming call from %s" msgstr "Beérkező hívás" -#: ../gtk-glade/main.c:746 +#: ../gtk-glade/main.c:759 #, c-format msgid "" "%s would like to add you to his contact list.\n" @@ -67,31 +67,37 @@ msgid "" "If you answer no, this person will be temporarily blacklisted." msgstr "" -#: ../gtk-glade/main.c:824 +#: ../gtk-glade/main.c:837 #, c-format msgid "" "Please enter your password for username %s\n" " at domain %s:" msgstr "" -#: ../gtk-glade/main.c:921 +#: ../gtk-glade/main.c:934 msgid "Website link" msgstr "" -#: ../gtk-glade/main.c:957 +#: ../gtk-glade/main.c:970 msgid "Linphone - a video internet phone" msgstr "" -#: ../gtk-glade/main.c:976 +#: ../gtk-glade/main.c:989 #, c-format msgid "%s (Default)" msgstr "" -#: ../gtk-glade/main.c:1229 +#: ../gtk-glade/main.c:1221 +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 msgid "A free SIP video-phone" msgstr "Egy ingyenes SIP video-telefon" -#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:247 +#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:258 #: ../gtk-glade/contact.glade.h:3 msgid "Name" msgstr "Név" @@ -134,91 +140,91 @@ msgstr "" msgid "Add new contact from %s directory" msgstr "" -#: ../gtk-glade/propertybox.c:253 +#: ../gtk-glade/propertybox.c:264 msgid "Rate (Hz)" msgstr "Érték (Hz)" -#: ../gtk-glade/propertybox.c:259 +#: ../gtk-glade/propertybox.c:270 msgid "Status" msgstr "Állapot" -#: ../gtk-glade/propertybox.c:265 +#: ../gtk-glade/propertybox.c:276 msgid "Min bitrate (kbit/s)" msgstr "Min bitrate (kbit/s)" -#: ../gtk-glade/propertybox.c:271 +#: ../gtk-glade/propertybox.c:283 msgid "Parameters" msgstr "Paraméterek" -#: ../gtk-glade/propertybox.c:298 ../gtk-glade/propertybox.c:437 +#: ../gtk-glade/propertybox.c:312 ../gtk-glade/propertybox.c:451 msgid "Enabled" msgstr "Engedélyezve" -#: ../gtk-glade/propertybox.c:299 ../gtk-glade/propertybox.c:437 +#: ../gtk-glade/propertybox.c:313 ../gtk-glade/propertybox.c:451 msgid "Disabled" msgstr "Tiltva" -#: ../gtk-glade/propertybox.c:482 +#: ../gtk-glade/propertybox.c:496 msgid "Account" msgstr "Hozzáférés" -#: ../gtk-glade/propertybox.c:622 +#: ../gtk-glade/propertybox.c:636 msgid "English" msgstr "" -#: ../gtk-glade/propertybox.c:623 +#: ../gtk-glade/propertybox.c:637 msgid "French" msgstr "" -#: ../gtk-glade/propertybox.c:624 +#: ../gtk-glade/propertybox.c:638 msgid "Swedish" msgstr "" -#: ../gtk-glade/propertybox.c:625 +#: ../gtk-glade/propertybox.c:639 msgid "Italian" msgstr "" -#: ../gtk-glade/propertybox.c:626 +#: ../gtk-glade/propertybox.c:640 msgid "Spanish" msgstr "" -#: ../gtk-glade/propertybox.c:627 +#: ../gtk-glade/propertybox.c:641 msgid "Brazilian Portugese" msgstr "" -#: ../gtk-glade/propertybox.c:628 +#: ../gtk-glade/propertybox.c:642 msgid "Polish" msgstr "" -#: ../gtk-glade/propertybox.c:629 +#: ../gtk-glade/propertybox.c:643 msgid "German" msgstr "" -#: ../gtk-glade/propertybox.c:630 +#: ../gtk-glade/propertybox.c:644 msgid "Russian" msgstr "" -#: ../gtk-glade/propertybox.c:631 +#: ../gtk-glade/propertybox.c:645 msgid "Japanese" msgstr "" -#: ../gtk-glade/propertybox.c:632 +#: ../gtk-glade/propertybox.c:646 msgid "Dutch" msgstr "" -#: ../gtk-glade/propertybox.c:633 +#: ../gtk-glade/propertybox.c:647 msgid "Hungarian" msgstr "" -#: ../gtk-glade/propertybox.c:634 +#: ../gtk-glade/propertybox.c:648 msgid "Czech" msgstr "" -#: ../gtk-glade/propertybox.c:635 +#: ../gtk-glade/propertybox.c:649 msgid "Chinese" msgstr "" -#: ../gtk-glade/propertybox.c:692 +#: ../gtk-glade/propertybox.c:706 msgid "" "You need to restart linphone for the new language selection to take effect." msgstr "" @@ -748,7 +754,7 @@ msgstr "Elfogad" msgid "Decline" msgstr "line" -#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:368 +#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:369 msgid "Incoming call" msgstr "Beérkező hívás" @@ -1024,18 +1030,6 @@ msgstr "" msgid "default soundcard\n" msgstr "" -#: ../gtk-glade/parameters.glade.h:65 -msgid "gtk-go-down" -msgstr "" - -#: ../gtk-glade/parameters.glade.h:66 -msgid "gtk-go-up" -msgstr "" - -#: ../gtk-glade/parameters.glade.h:67 -msgid "gtk-media-play" -msgstr "" - #: ../gtk-glade/buddylookup.glade.h:1 msgid "Search somebody" msgstr "" @@ -1056,26 +1050,26 @@ msgstr "Linphone" msgid "Please wait" msgstr "" -#: ../coreapi/linphonecore.c:310 +#: ../coreapi/linphonecore.c:311 #, 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:356 +#: ../coreapi/linphonecore.c:357 msgid "aborted" msgstr "megszakítva" -#: ../coreapi/linphonecore.c:359 +#: ../coreapi/linphonecore.c:360 msgid "completed" msgstr "befejezve" -#: ../coreapi/linphonecore.c:362 +#: ../coreapi/linphonecore.c:363 msgid "missed" msgstr "elhibázva" -#: ../coreapi/linphonecore.c:367 +#: ../coreapi/linphonecore.c:368 #, c-format msgid "" "%s at %s\n" @@ -1090,11 +1084,11 @@ msgstr "" "Állapot: %s\n" "Időtartam: %i perc %i másodperc\n" -#: ../coreapi/linphonecore.c:368 +#: ../coreapi/linphonecore.c:369 msgid "Outgoing call" msgstr "Kimenő hívás" -#: ../coreapi/linphonecore.c:625 +#: ../coreapi/linphonecore.c:626 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" @@ -1103,50 +1097,50 @@ msgstr "" "mindig az IPv4-et használja. Frissítsd a konfigurációdat, ha használni " "akarod az IPv6-ot" -#: ../coreapi/linphonecore.c:1074 +#: ../coreapi/linphonecore.c:1083 msgid "Ready" msgstr "Kész" -#: ../coreapi/linphonecore.c:1505 +#: ../coreapi/linphonecore.c:1513 msgid "Remote end seems to have disconnected, the call is going to be closed." msgstr "" -#: ../coreapi/linphonecore.c:1703 +#: ../coreapi/linphonecore.c:1725 msgid "Looking for telephone number destination..." msgstr "Telefonszám-cél keresése..." -#: ../coreapi/linphonecore.c:1705 +#: ../coreapi/linphonecore.c:1727 msgid "Could not resolve this number." msgstr "Nem sikkerült értelmezni a számot." -#: ../coreapi/linphonecore.c:1749 +#: ../coreapi/linphonecore.c:1771 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:1890 +#: ../coreapi/linphonecore.c:1912 msgid "Contacting" msgstr "Kapcsolódás" -#: ../coreapi/linphonecore.c:1896 +#: ../coreapi/linphonecore.c:1918 msgid "could not call" msgstr "nem sikerült hívni" -#: ../coreapi/linphonecore.c:1942 +#: ../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:2337 ../coreapi/callbacks.c:32 +#: ../coreapi/linphonecore.c:2370 ../coreapi/callbacks.c:32 msgid "Connected." msgstr "Kapcsolódva." -#: ../coreapi/linphonecore.c:2371 +#: ../coreapi/linphonecore.c:2404 msgid "Call ended" msgstr "Hívás vége" -#: ../coreapi/misc.c:142 +#: ../coreapi/misc.c:147 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the pcm oss emulation module\n" @@ -1158,7 +1152,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:145 +#: ../coreapi/misc.c:150 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the mixer oss emulation module\n" @@ -1170,7 +1164,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:492 +#: ../coreapi/misc.c:497 msgid "Stun lookup in progress..." msgstr "Stun keresés folyamatban..." @@ -1287,49 +1281,49 @@ msgstr "A felhasználó nem akarja, hogy zavarják." msgid "Call declined." msgstr "Hívás elutasítva" -#: ../coreapi/callbacks.c:280 +#: ../coreapi/callbacks.c:281 #, fuzzy msgid "No response." msgstr "időtúllépés után nincs válasz" -#: ../coreapi/callbacks.c:283 -msgid "Error." +#: ../coreapi/callbacks.c:284 +msgid "Protocol error." msgstr "" -#: ../coreapi/callbacks.c:296 +#: ../coreapi/callbacks.c:298 #, fuzzy msgid "Redirected" msgstr "Átirányítva idw %s..." -#: ../coreapi/callbacks.c:304 +#: ../coreapi/callbacks.c:308 msgid "Not found" msgstr "" -#: ../coreapi/callbacks.c:312 +#: ../coreapi/callbacks.c:318 msgid "No common codecs" msgstr "" -#: ../coreapi/callbacks.c:316 +#: ../coreapi/callbacks.c:324 #, fuzzy msgid "Call failed." msgstr "Hívás elutasítva" -#: ../coreapi/callbacks.c:365 +#: ../coreapi/callbacks.c:374 #, c-format msgid "Registration on %s successful." msgstr "A regisztáció a %s -n sikerült." -#: ../coreapi/callbacks.c:366 +#: ../coreapi/callbacks.c:375 #, fuzzy, c-format msgid "Unregistration on %s done." msgstr "A regisztáció a %s -n sikerült." -#: ../coreapi/callbacks.c:374 +#: ../coreapi/callbacks.c:383 #, c-format msgid "Registration on %s failed: %s" msgstr "A regisztáció a %s -n nem sikerült: %s" -#: ../coreapi/callbacks.c:374 +#: ../coreapi/callbacks.c:383 msgid "no response timeout" msgstr "időtúllépés után nincs válasz" @@ -1349,11 +1343,11 @@ msgstr "" msgid "Alsa sound output" msgstr "" -#: ../mediastreamer2/src/aqsnd.c:1005 +#: ../mediastreamer2/src/aqsnd.c:1008 msgid "Sound capture filter for MacOS X Audio Queue Service" msgstr "" -#: ../mediastreamer2/src/aqsnd.c:1029 +#: ../mediastreamer2/src/aqsnd.c:1032 msgid "Sound playback filter for MacOS X Audio Queue Service" msgstr "" @@ -1369,11 +1363,11 @@ msgstr "" msgid "The GSM codec" msgstr "" -#: ../mediastreamer2/src/macsnd.c:670 +#: ../mediastreamer2/src/macsnd.c:1083 msgid "Sound capture filter for MacOS X Core Audio drivers" msgstr "" -#: ../mediastreamer2/src/macsnd.c:684 +#: ../mediastreamer2/src/macsnd.c:1098 msgid "Sound playback filter for MacOS X Core Audio drivers" msgstr "" @@ -1418,7 +1412,7 @@ msgstr "" msgid "A filter that controls and measure sound volume" msgstr "" -#: ../mediastreamer2/src/msv4l.c:1009 +#: ../mediastreamer2/src/msv4l.c:1011 msgid "A video4linux compatible source filter to stream pictures." msgstr "" diff --git a/po/it.po b/po/it.po index c9fbafb23..9fd95ae77 100644 --- a/po/it.po +++ b/po/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Linphone 3.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-02 10:28+0200\n" +"POT-Creation-Date: 2010-04-22 17:16+0200\n" "PO-Revision-Date: 2002-10-15 HO:MI+ZONE\n" "Last-Translator: Matteo Piazza \n" "Language-Team: it \n" @@ -25,39 +25,39 @@ msgstr "" msgid "Chat with %s" msgstr "Chat con %s" -#: ../gtk-glade/main.c:92 +#: ../gtk-glade/main.c:94 msgid "log to stdout some debug information while running." msgstr "" -#: ../gtk-glade/main.c:99 +#: ../gtk-glade/main.c:101 msgid "Start only in the system tray, do not show the main interface." msgstr "" -#: ../gtk-glade/main.c:106 +#: ../gtk-glade/main.c:108 msgid "address to call right now" msgstr "" -#: ../gtk-glade/main.c:113 +#: ../gtk-glade/main.c:115 msgid "if set automatically answer incoming calls" msgstr "" -#: ../gtk-glade/main.c:121 +#: ../gtk-glade/main.c:123 msgid "" "Specifiy a working directory (should be the base of the installation, eg: c:" "\\Program Files\\Linphone)" msgstr "" -#: ../gtk-glade/main.c:396 +#: ../gtk-glade/main.c:402 #, fuzzy, c-format msgid "Call with %s" msgstr "Chat con %s" -#: ../gtk-glade/main.c:707 +#: ../gtk-glade/main.c:720 #, c-format msgid "Incoming call from %s" msgstr "Chiamata proveniente da %s" -#: ../gtk-glade/main.c:746 +#: ../gtk-glade/main.c:759 #, c-format msgid "" "%s would like to add you to his contact list.\n" @@ -69,31 +69,37 @@ msgstr "" "veda il tuo stato o aggiungerlo alla tua lista dei contatti Se rispondi no " "questo utente sarà momentaneamente bloccato." -#: ../gtk-glade/main.c:824 +#: ../gtk-glade/main.c:837 #, c-format msgid "" "Please enter your password for username %s\n" " at domain %s:" msgstr "Prego inserire la password per username %s e dominio %s" -#: ../gtk-glade/main.c:921 +#: ../gtk-glade/main.c:934 msgid "Website link" msgstr "" -#: ../gtk-glade/main.c:957 +#: ../gtk-glade/main.c:970 msgid "Linphone - a video internet phone" msgstr "" -#: ../gtk-glade/main.c:976 +#: ../gtk-glade/main.c:989 #, c-format msgid "%s (Default)" msgstr "%s (Default)" -#: ../gtk-glade/main.c:1229 +#: ../gtk-glade/main.c:1221 +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 msgid "A free SIP video-phone" msgstr "" -#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:247 +#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:258 #: ../gtk-glade/contact.glade.h:3 msgid "Name" msgstr "Nome" @@ -136,91 +142,91 @@ msgstr "Elimina contatto %s" msgid "Add new contact from %s directory" msgstr "Aggiungi nuovo contatto dalla directory %s" -#: ../gtk-glade/propertybox.c:253 +#: ../gtk-glade/propertybox.c:264 msgid "Rate (Hz)" msgstr "" -#: ../gtk-glade/propertybox.c:259 +#: ../gtk-glade/propertybox.c:270 msgid "Status" msgstr "Stato" -#: ../gtk-glade/propertybox.c:265 +#: ../gtk-glade/propertybox.c:276 msgid "Min bitrate (kbit/s)" msgstr "Bitrate Min (kbit/s)" -#: ../gtk-glade/propertybox.c:271 +#: ../gtk-glade/propertybox.c:283 msgid "Parameters" msgstr "Parametri" -#: ../gtk-glade/propertybox.c:298 ../gtk-glade/propertybox.c:437 +#: ../gtk-glade/propertybox.c:312 ../gtk-glade/propertybox.c:451 msgid "Enabled" msgstr "Attivato" -#: ../gtk-glade/propertybox.c:299 ../gtk-glade/propertybox.c:437 +#: ../gtk-glade/propertybox.c:313 ../gtk-glade/propertybox.c:451 msgid "Disabled" msgstr "Disattivato" -#: ../gtk-glade/propertybox.c:482 +#: ../gtk-glade/propertybox.c:496 msgid "Account" msgstr "Account" -#: ../gtk-glade/propertybox.c:622 +#: ../gtk-glade/propertybox.c:636 msgid "English" msgstr "Inglese" -#: ../gtk-glade/propertybox.c:623 +#: ../gtk-glade/propertybox.c:637 msgid "French" msgstr "Francese" -#: ../gtk-glade/propertybox.c:624 +#: ../gtk-glade/propertybox.c:638 msgid "Swedish" msgstr "Svedese" -#: ../gtk-glade/propertybox.c:625 +#: ../gtk-glade/propertybox.c:639 msgid "Italian" msgstr "Italiano" -#: ../gtk-glade/propertybox.c:626 +#: ../gtk-glade/propertybox.c:640 msgid "Spanish" msgstr "Spagnolo" -#: ../gtk-glade/propertybox.c:627 +#: ../gtk-glade/propertybox.c:641 msgid "Brazilian Portugese" msgstr "" -#: ../gtk-glade/propertybox.c:628 +#: ../gtk-glade/propertybox.c:642 msgid "Polish" msgstr "Polacco" -#: ../gtk-glade/propertybox.c:629 +#: ../gtk-glade/propertybox.c:643 msgid "German" msgstr "Tedesco" -#: ../gtk-glade/propertybox.c:630 +#: ../gtk-glade/propertybox.c:644 msgid "Russian" msgstr "Russo" -#: ../gtk-glade/propertybox.c:631 +#: ../gtk-glade/propertybox.c:645 msgid "Japanese" msgstr "Giapponese" -#: ../gtk-glade/propertybox.c:632 +#: ../gtk-glade/propertybox.c:646 msgid "Dutch" msgstr "Olandese" -#: ../gtk-glade/propertybox.c:633 +#: ../gtk-glade/propertybox.c:647 msgid "Hungarian" msgstr "Ungherese" -#: ../gtk-glade/propertybox.c:634 +#: ../gtk-glade/propertybox.c:648 msgid "Czech" msgstr "Ceco" -#: ../gtk-glade/propertybox.c:635 +#: ../gtk-glade/propertybox.c:649 msgid "Chinese" msgstr "" -#: ../gtk-glade/propertybox.c:692 +#: ../gtk-glade/propertybox.c:706 msgid "" "You need to restart linphone for the new language selection to take effect." msgstr "Riavviare il software per utilizzare la nuova lingua selezionata" @@ -727,7 +733,7 @@ msgstr "Accetta" msgid "Decline" msgstr "Rifiuta" -#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:368 +#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:369 msgid "Incoming call" msgstr "Chimata in entrata" @@ -985,18 +991,6 @@ msgstr "default scheda audio" msgid "default soundcard\n" msgstr "default scheda audio\n" -#: ../gtk-glade/parameters.glade.h:65 -msgid "gtk-go-down" -msgstr "" - -#: ../gtk-glade/parameters.glade.h:66 -msgid "gtk-go-up" -msgstr "" - -#: ../gtk-glade/parameters.glade.h:67 -msgid "gtk-media-play" -msgstr "" - #: ../gtk-glade/buddylookup.glade.h:1 msgid "Search somebody" msgstr "Cerca" @@ -1017,26 +1011,26 @@ msgstr "Linphone" msgid "Please wait" msgstr "Prego attendere" -#: ../coreapi/linphonecore.c:310 +#: ../coreapi/linphonecore.c:311 #, c-format msgid "You have missed %i call." msgid_plural "You have missed %i calls." msgstr[0] "" msgstr[1] "" -#: ../coreapi/linphonecore.c:356 +#: ../coreapi/linphonecore.c:357 msgid "aborted" msgstr "annullato" -#: ../coreapi/linphonecore.c:359 +#: ../coreapi/linphonecore.c:360 msgid "completed" msgstr "comletato" -#: ../coreapi/linphonecore.c:362 +#: ../coreapi/linphonecore.c:363 msgid "missed" msgstr "mancante" -#: ../coreapi/linphonecore.c:367 +#: ../coreapi/linphonecore.c:368 #, c-format msgid "" "%s at %s\n" @@ -1051,11 +1045,11 @@ msgstr "" "Stato: %s\n" "Durata: %i mn %i sec\n" -#: ../coreapi/linphonecore.c:368 +#: ../coreapi/linphonecore.c:369 msgid "Outgoing call" msgstr "Chiamata in uscita" -#: ../coreapi/linphonecore.c:625 +#: ../coreapi/linphonecore.c:626 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" @@ -1063,23 +1057,23 @@ 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:1074 +#: ../coreapi/linphonecore.c:1083 msgid "Ready" msgstr "Pronto" -#: ../coreapi/linphonecore.c:1505 +#: ../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:1703 +#: ../coreapi/linphonecore.c:1725 msgid "Looking for telephone number destination..." msgstr "Ricerca numero destinazione..." -#: ../coreapi/linphonecore.c:1705 +#: ../coreapi/linphonecore.c:1727 msgid "Could not resolve this number." msgstr "Impossibile risolvere il numero." -#: ../coreapi/linphonecore.c:1749 +#: ../coreapi/linphonecore.c:1771 msgid "" "Could not parse given sip address. A sip url usually looks like sip:" "user@domain" @@ -1087,27 +1081,27 @@ msgstr "" "Errore nel formato del contatto sip. Usualmente un indirizzo appare sip:" "user@domain" -#: ../coreapi/linphonecore.c:1890 +#: ../coreapi/linphonecore.c:1912 msgid "Contacting" msgstr "In connessione" -#: ../coreapi/linphonecore.c:1896 +#: ../coreapi/linphonecore.c:1918 msgid "could not call" msgstr "chiamata fallita" -#: ../coreapi/linphonecore.c:1942 +#: ../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:2337 ../coreapi/callbacks.c:32 +#: ../coreapi/linphonecore.c:2370 ../coreapi/callbacks.c:32 msgid "Connected." msgstr "Connessione" -#: ../coreapi/linphonecore.c:2371 +#: ../coreapi/linphonecore.c:2404 msgid "Call ended" msgstr "Chiamata terminata" -#: ../coreapi/misc.c:142 +#: ../coreapi/misc.c:147 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the pcm oss emulation module\n" @@ -1119,7 +1113,7 @@ msgstr "" "è assente e linphone lo richede. Prego eseguire\n" "'modprobe snd-pcm-oss' da utente root per caricarlo." -#: ../coreapi/misc.c:145 +#: ../coreapi/misc.c:150 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the mixer oss emulation module\n" @@ -1131,7 +1125,7 @@ msgstr "" "è assente e linphone lo richede. Prego eseguire\n" "'modprobe snd-mixer-oss' da utente root per caricarlo." -#: ../coreapi/misc.c:492 +#: ../coreapi/misc.c:497 msgid "Stun lookup in progress..." msgstr "Ricerca Stun in progresso ..." @@ -1246,49 +1240,49 @@ msgstr "L'utente non vuole essere disturbato" msgid "Call declined." msgstr "Chiamata rifiutata" -#: ../coreapi/callbacks.c:280 +#: ../coreapi/callbacks.c:281 #, fuzzy msgid "No response." msgstr "timeout no risposta" -#: ../coreapi/callbacks.c:283 -msgid "Error." +#: ../coreapi/callbacks.c:284 +msgid "Protocol error." msgstr "" -#: ../coreapi/callbacks.c:296 +#: ../coreapi/callbacks.c:298 #, fuzzy msgid "Redirected" msgstr "Rediretto verso %s..." -#: ../coreapi/callbacks.c:304 +#: ../coreapi/callbacks.c:308 msgid "Not found" msgstr "" -#: ../coreapi/callbacks.c:312 +#: ../coreapi/callbacks.c:318 msgid "No common codecs" msgstr "" -#: ../coreapi/callbacks.c:316 +#: ../coreapi/callbacks.c:324 #, fuzzy msgid "Call failed." msgstr "Chiamata rifiutata" -#: ../coreapi/callbacks.c:365 +#: ../coreapi/callbacks.c:374 #, c-format msgid "Registration on %s successful." msgstr "Registrazione su %s attiva" -#: ../coreapi/callbacks.c:366 +#: ../coreapi/callbacks.c:375 #, c-format msgid "Unregistration on %s done." msgstr "Unregistrazione su %s" -#: ../coreapi/callbacks.c:374 +#: ../coreapi/callbacks.c:383 #, c-format msgid "Registration on %s failed: %s" msgstr "Registrazione su %s fallita: %s" -#: ../coreapi/callbacks.c:374 +#: ../coreapi/callbacks.c:383 msgid "no response timeout" msgstr "timeout no risposta" @@ -1308,11 +1302,11 @@ msgstr "Alsa sound sorgente" msgid "Alsa sound output" msgstr "Alsa sound riproduzione" -#: ../mediastreamer2/src/aqsnd.c:1005 +#: ../mediastreamer2/src/aqsnd.c:1008 msgid "Sound capture filter for MacOS X Audio Queue Service" msgstr "Sound capture filter for MacOS X Audio Queue Service" -#: ../mediastreamer2/src/aqsnd.c:1029 +#: ../mediastreamer2/src/aqsnd.c:1032 msgid "Sound playback filter for MacOS X Audio Queue Service" msgstr "Sound playback filter for MacOS X Audio Queue Service" @@ -1328,11 +1322,11 @@ msgstr "GSM full-rate codec" msgid "The GSM codec" msgstr "GSM codec" -#: ../mediastreamer2/src/macsnd.c:670 +#: ../mediastreamer2/src/macsnd.c:1083 msgid "Sound capture filter for MacOS X Core Audio drivers" msgstr "Sound capture filter for MacOS X Core Audio drivers" -#: ../mediastreamer2/src/macsnd.c:684 +#: ../mediastreamer2/src/macsnd.c:1098 msgid "Sound playback filter for MacOS X Core Audio drivers" msgstr "Sound playback filter for MacOS X Core Audio drivers" @@ -1377,7 +1371,7 @@ msgstr "The free and wonderful speex codec" msgid "A filter that controls and measure sound volume" msgstr "Un filtro che controlla e misura il volume" -#: ../mediastreamer2/src/msv4l.c:1009 +#: ../mediastreamer2/src/msv4l.c:1011 msgid "A video4linux compatible source filter to stream pictures." msgstr "Un video4linux filtro per inviare immagini" diff --git a/po/ja.po b/po/ja.po index fb4eb9c27..f312c7afa 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: linphone 0.10\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-02 10:28+0200\n" +"POT-Creation-Date: 2010-04-22 17:16+0200\n" "PO-Revision-Date: 2003-01-21 00:05+9000\n" "Last-Translator: YAMAGUCHI YOSHIYA \n" "Language-Team: \n" @@ -27,39 +27,39 @@ msgstr "pixmapファイルが見つかりません %s" msgid "Chat with %s" msgstr "" -#: ../gtk-glade/main.c:92 +#: ../gtk-glade/main.c:94 msgid "log to stdout some debug information while running." msgstr "" -#: ../gtk-glade/main.c:99 +#: ../gtk-glade/main.c:101 msgid "Start only in the system tray, do not show the main interface." msgstr "" -#: ../gtk-glade/main.c:106 +#: ../gtk-glade/main.c:108 msgid "address to call right now" msgstr "" -#: ../gtk-glade/main.c:113 +#: ../gtk-glade/main.c:115 msgid "if set automatically answer incoming calls" msgstr "" -#: ../gtk-glade/main.c:121 +#: ../gtk-glade/main.c:123 msgid "" "Specifiy a working directory (should be the base of the installation, eg: c:" "\\Program Files\\Linphone)" msgstr "" -#: ../gtk-glade/main.c:396 +#: ../gtk-glade/main.c:402 #, c-format msgid "Call with %s" msgstr "" -#: ../gtk-glade/main.c:707 +#: ../gtk-glade/main.c:720 #, c-format msgid "Incoming call from %s" msgstr "" -#: ../gtk-glade/main.c:746 +#: ../gtk-glade/main.c:759 #, c-format msgid "" "%s would like to add you to his contact list.\n" @@ -68,31 +68,37 @@ msgid "" "If you answer no, this person will be temporarily blacklisted." msgstr "" -#: ../gtk-glade/main.c:824 +#: ../gtk-glade/main.c:837 #, c-format msgid "" "Please enter your password for username %s\n" " at domain %s:" msgstr "" -#: ../gtk-glade/main.c:921 +#: ../gtk-glade/main.c:934 msgid "Website link" msgstr "" -#: ../gtk-glade/main.c:957 +#: ../gtk-glade/main.c:970 msgid "Linphone - a video internet phone" msgstr "" -#: ../gtk-glade/main.c:976 +#: ../gtk-glade/main.c:989 #, c-format msgid "%s (Default)" msgstr "" -#: ../gtk-glade/main.c:1229 +#: ../gtk-glade/main.c:1221 +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 msgid "A free SIP video-phone" msgstr "" -#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:247 +#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:258 #: ../gtk-glade/contact.glade.h:3 msgid "Name" msgstr "名前" @@ -136,91 +142,91 @@ msgstr "" msgid "Add new contact from %s directory" msgstr "" -#: ../gtk-glade/propertybox.c:253 +#: ../gtk-glade/propertybox.c:264 msgid "Rate (Hz)" msgstr "" -#: ../gtk-glade/propertybox.c:259 +#: ../gtk-glade/propertybox.c:270 msgid "Status" msgstr "状態" -#: ../gtk-glade/propertybox.c:265 +#: ../gtk-glade/propertybox.c:276 msgid "Min bitrate (kbit/s)" msgstr "最低限のビットレート (kbit/s)" -#: ../gtk-glade/propertybox.c:271 +#: ../gtk-glade/propertybox.c:283 msgid "Parameters" msgstr "パラメーター" -#: ../gtk-glade/propertybox.c:298 ../gtk-glade/propertybox.c:437 +#: ../gtk-glade/propertybox.c:312 ../gtk-glade/propertybox.c:451 msgid "Enabled" msgstr "使用する" -#: ../gtk-glade/propertybox.c:299 ../gtk-glade/propertybox.c:437 +#: ../gtk-glade/propertybox.c:313 ../gtk-glade/propertybox.c:451 msgid "Disabled" msgstr "使用しない" -#: ../gtk-glade/propertybox.c:482 +#: ../gtk-glade/propertybox.c:496 msgid "Account" msgstr "" -#: ../gtk-glade/propertybox.c:622 +#: ../gtk-glade/propertybox.c:636 msgid "English" msgstr "" -#: ../gtk-glade/propertybox.c:623 +#: ../gtk-glade/propertybox.c:637 msgid "French" msgstr "Français" -#: ../gtk-glade/propertybox.c:624 +#: ../gtk-glade/propertybox.c:638 msgid "Swedish" msgstr "" -#: ../gtk-glade/propertybox.c:625 +#: ../gtk-glade/propertybox.c:639 msgid "Italian" msgstr "" -#: ../gtk-glade/propertybox.c:626 +#: ../gtk-glade/propertybox.c:640 msgid "Spanish" msgstr "" -#: ../gtk-glade/propertybox.c:627 +#: ../gtk-glade/propertybox.c:641 msgid "Brazilian Portugese" msgstr "" -#: ../gtk-glade/propertybox.c:628 +#: ../gtk-glade/propertybox.c:642 msgid "Polish" msgstr "" -#: ../gtk-glade/propertybox.c:629 +#: ../gtk-glade/propertybox.c:643 msgid "German" msgstr "" -#: ../gtk-glade/propertybox.c:630 +#: ../gtk-glade/propertybox.c:644 msgid "Russian" msgstr "" -#: ../gtk-glade/propertybox.c:631 +#: ../gtk-glade/propertybox.c:645 msgid "Japanese" msgstr "日本語" -#: ../gtk-glade/propertybox.c:632 +#: ../gtk-glade/propertybox.c:646 msgid "Dutch" msgstr "" -#: ../gtk-glade/propertybox.c:633 +#: ../gtk-glade/propertybox.c:647 msgid "Hungarian" msgstr "Magyar" -#: ../gtk-glade/propertybox.c:634 +#: ../gtk-glade/propertybox.c:648 msgid "Czech" msgstr "čeština" -#: ../gtk-glade/propertybox.c:635 +#: ../gtk-glade/propertybox.c:649 msgid "Chinese" msgstr "简体中文" -#: ../gtk-glade/propertybox.c:692 +#: ../gtk-glade/propertybox.c:706 msgid "" "You need to restart linphone for the new language selection to take effect." msgstr "" @@ -743,7 +749,7 @@ msgstr "" msgid "Decline" msgstr "ライン入力" -#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:368 +#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:369 msgid "Incoming call" msgstr "" @@ -1014,18 +1020,6 @@ msgstr "" msgid "default soundcard\n" msgstr "" -#: ../gtk-glade/parameters.glade.h:65 -msgid "gtk-go-down" -msgstr "" - -#: ../gtk-glade/parameters.glade.h:66 -msgid "gtk-go-up" -msgstr "" - -#: ../gtk-glade/parameters.glade.h:67 -msgid "gtk-media-play" -msgstr "" - #: ../gtk-glade/buddylookup.glade.h:1 msgid "Search somebody" msgstr "" @@ -1047,26 +1041,26 @@ msgstr "Linphone" msgid "Please wait" msgstr "" -#: ../coreapi/linphonecore.c:310 +#: ../coreapi/linphonecore.c:311 #, c-format msgid "You have missed %i call." msgid_plural "You have missed %i calls." msgstr[0] "" msgstr[1] "" -#: ../coreapi/linphonecore.c:356 +#: ../coreapi/linphonecore.c:357 msgid "aborted" msgstr "" -#: ../coreapi/linphonecore.c:359 +#: ../coreapi/linphonecore.c:360 msgid "completed" msgstr "" -#: ../coreapi/linphonecore.c:362 +#: ../coreapi/linphonecore.c:363 msgid "missed" msgstr "" -#: ../coreapi/linphonecore.c:367 +#: ../coreapi/linphonecore.c:368 #, c-format msgid "" "%s at %s\n" @@ -1076,34 +1070,34 @@ msgid "" "Duration: %i mn %i sec\n" msgstr "" -#: ../coreapi/linphonecore.c:368 +#: ../coreapi/linphonecore.c:369 msgid "Outgoing call" msgstr "" -#: ../coreapi/linphonecore.c:625 +#: ../coreapi/linphonecore.c:626 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:1074 +#: ../coreapi/linphonecore.c:1083 #, fuzzy msgid "Ready" msgstr "準備完了。" -#: ../coreapi/linphonecore.c:1505 +#: ../coreapi/linphonecore.c:1513 msgid "Remote end seems to have disconnected, the call is going to be closed." msgstr "" -#: ../coreapi/linphonecore.c:1703 +#: ../coreapi/linphonecore.c:1725 msgid "Looking for telephone number destination..." msgstr "" -#: ../coreapi/linphonecore.c:1705 +#: ../coreapi/linphonecore.c:1727 msgid "Could not resolve this number." msgstr "" -#: ../coreapi/linphonecore.c:1749 +#: ../coreapi/linphonecore.c:1771 #, fuzzy msgid "" "Could not parse given sip address. A sip url usually looks like sip:" @@ -1112,29 +1106,29 @@ msgstr "" "SIPアドレスの形式エラーです。SIPアドレスは、のような" "形式です。" -#: ../coreapi/linphonecore.c:1890 +#: ../coreapi/linphonecore.c:1912 #, fuzzy msgid "Contacting" msgstr "接続中" -#: ../coreapi/linphonecore.c:1896 +#: ../coreapi/linphonecore.c:1918 msgid "could not call" msgstr "" -#: ../coreapi/linphonecore.c:1942 +#: ../coreapi/linphonecore.c:1965 msgid "Sorry, having multiple simultaneous calls is not supported yet !" msgstr "" -#: ../coreapi/linphonecore.c:2337 ../coreapi/callbacks.c:32 +#: ../coreapi/linphonecore.c:2370 ../coreapi/callbacks.c:32 msgid "Connected." msgstr "接続しました。" -#: ../coreapi/linphonecore.c:2371 +#: ../coreapi/linphonecore.c:2404 #, fuzzy msgid "Call ended" msgstr "通話は拒否されました。" -#: ../coreapi/misc.c:142 +#: ../coreapi/misc.c:147 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the pcm oss emulation module\n" @@ -1146,7 +1140,7 @@ msgstr "" "pcm ossエミュレーションモジュールが見つかりません。\n" "ロードするために、ルート権限で'modprobe snd-pcm-oss'を実行してください。" -#: ../coreapi/misc.c:145 +#: ../coreapi/misc.c:150 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the mixer oss emulation module\n" @@ -1158,7 +1152,7 @@ msgstr "" "mixer ossエミュレーションモジュールが見つかりません。\n" "ロードするために、ルート権限で'modprobe snd-mixer-oss'を実行してください。" -#: ../coreapi/misc.c:492 +#: ../coreapi/misc.c:497 msgid "Stun lookup in progress..." msgstr "" @@ -1275,47 +1269,47 @@ msgstr "ユーザーは手が離せないようです。" msgid "Call declined." msgstr "通話は拒否されました。" -#: ../coreapi/callbacks.c:280 +#: ../coreapi/callbacks.c:281 msgid "No response." msgstr "" -#: ../coreapi/callbacks.c:283 -msgid "Error." +#: ../coreapi/callbacks.c:284 +msgid "Protocol error." msgstr "" -#: ../coreapi/callbacks.c:296 +#: ../coreapi/callbacks.c:298 msgid "Redirected" msgstr "" -#: ../coreapi/callbacks.c:304 +#: ../coreapi/callbacks.c:308 msgid "Not found" msgstr "" -#: ../coreapi/callbacks.c:312 +#: ../coreapi/callbacks.c:318 msgid "No common codecs" msgstr "" -#: ../coreapi/callbacks.c:316 +#: ../coreapi/callbacks.c:324 #, fuzzy msgid "Call failed." msgstr "通話はキャンセルされました。" -#: ../coreapi/callbacks.c:365 +#: ../coreapi/callbacks.c:374 #, fuzzy, c-format msgid "Registration on %s successful." msgstr "登録しました。" -#: ../coreapi/callbacks.c:366 +#: ../coreapi/callbacks.c:375 #, fuzzy, c-format msgid "Unregistration on %s done." msgstr "登録しました。" -#: ../coreapi/callbacks.c:374 +#: ../coreapi/callbacks.c:383 #, fuzzy, c-format msgid "Registration on %s failed: %s" msgstr "登録しました。" -#: ../coreapi/callbacks.c:374 +#: ../coreapi/callbacks.c:383 msgid "no response timeout" msgstr "" @@ -1335,11 +1329,11 @@ msgstr "" msgid "Alsa sound output" msgstr "" -#: ../mediastreamer2/src/aqsnd.c:1005 +#: ../mediastreamer2/src/aqsnd.c:1008 msgid "Sound capture filter for MacOS X Audio Queue Service" msgstr "" -#: ../mediastreamer2/src/aqsnd.c:1029 +#: ../mediastreamer2/src/aqsnd.c:1032 msgid "Sound playback filter for MacOS X Audio Queue Service" msgstr "" @@ -1355,11 +1349,11 @@ msgstr "" msgid "The GSM codec" msgstr "" -#: ../mediastreamer2/src/macsnd.c:670 +#: ../mediastreamer2/src/macsnd.c:1083 msgid "Sound capture filter for MacOS X Core Audio drivers" msgstr "" -#: ../mediastreamer2/src/macsnd.c:684 +#: ../mediastreamer2/src/macsnd.c:1098 msgid "Sound playback filter for MacOS X Core Audio drivers" msgstr "" @@ -1404,7 +1398,7 @@ msgstr "" msgid "A filter that controls and measure sound volume" msgstr "" -#: ../mediastreamer2/src/msv4l.c:1009 +#: ../mediastreamer2/src/msv4l.c:1011 msgid "A video4linux compatible source filter to stream pictures." msgstr "" diff --git a/po/nl.po b/po/nl.po index 8ff903eb6..caa543b00 100644 --- a/po/nl.po +++ b/po/nl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: nl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-02 10:28+0200\n" +"POT-Creation-Date: 2010-04-22 17:16+0200\n" "PO-Revision-Date: 2007-09-05 10:40+0200\n" "Last-Translator: Hendrik-Jan Heins \n" "Language-Team: Nederlands \n" @@ -29,39 +29,39 @@ msgstr "Kon pixmap bestand %s niet vinden" msgid "Chat with %s" msgstr "Chat met %s" -#: ../gtk-glade/main.c:92 +#: ../gtk-glade/main.c:94 msgid "log to stdout some debug information while running." msgstr "" -#: ../gtk-glade/main.c:99 +#: ../gtk-glade/main.c:101 msgid "Start only in the system tray, do not show the main interface." msgstr "" -#: ../gtk-glade/main.c:106 +#: ../gtk-glade/main.c:108 msgid "address to call right now" msgstr "" -#: ../gtk-glade/main.c:113 +#: ../gtk-glade/main.c:115 msgid "if set automatically answer incoming calls" msgstr "" -#: ../gtk-glade/main.c:121 +#: ../gtk-glade/main.c:123 msgid "" "Specifiy a working directory (should be the base of the installation, eg: c:" "\\Program Files\\Linphone)" msgstr "" -#: ../gtk-glade/main.c:396 +#: ../gtk-glade/main.c:402 #, fuzzy, c-format msgid "Call with %s" msgstr "Chat met %s" -#: ../gtk-glade/main.c:707 +#: ../gtk-glade/main.c:720 #, fuzzy, c-format msgid "Incoming call from %s" msgstr "Inkomende oproep" -#: ../gtk-glade/main.c:746 +#: ../gtk-glade/main.c:759 #, c-format msgid "" "%s would like to add you to his contact list.\n" @@ -70,31 +70,37 @@ msgid "" "If you answer no, this person will be temporarily blacklisted." msgstr "" -#: ../gtk-glade/main.c:824 +#: ../gtk-glade/main.c:837 #, c-format msgid "" "Please enter your password for username %s\n" " at domain %s:" msgstr "" -#: ../gtk-glade/main.c:921 +#: ../gtk-glade/main.c:934 msgid "Website link" msgstr "" -#: ../gtk-glade/main.c:957 +#: ../gtk-glade/main.c:970 msgid "Linphone - a video internet phone" msgstr "" -#: ../gtk-glade/main.c:976 +#: ../gtk-glade/main.c:989 #, c-format msgid "%s (Default)" msgstr "" -#: ../gtk-glade/main.c:1229 +#: ../gtk-glade/main.c:1221 +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 msgid "A free SIP video-phone" msgstr "Een Vrije SIP video-telefoon" -#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:247 +#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:258 #: ../gtk-glade/contact.glade.h:3 msgid "Name" msgstr "Naam" @@ -137,91 +143,91 @@ msgstr "" msgid "Add new contact from %s directory" msgstr "" -#: ../gtk-glade/propertybox.c:253 +#: ../gtk-glade/propertybox.c:264 msgid "Rate (Hz)" msgstr "Frequentie (Hz)" -#: ../gtk-glade/propertybox.c:259 +#: ../gtk-glade/propertybox.c:270 msgid "Status" msgstr "Status" -#: ../gtk-glade/propertybox.c:265 +#: ../gtk-glade/propertybox.c:276 msgid "Min bitrate (kbit/s)" msgstr "Minimale bitrate (kbit/s)" -#: ../gtk-glade/propertybox.c:271 +#: ../gtk-glade/propertybox.c:283 msgid "Parameters" msgstr "Parameters" -#: ../gtk-glade/propertybox.c:298 ../gtk-glade/propertybox.c:437 +#: ../gtk-glade/propertybox.c:312 ../gtk-glade/propertybox.c:451 msgid "Enabled" msgstr "Aan" -#: ../gtk-glade/propertybox.c:299 ../gtk-glade/propertybox.c:437 +#: ../gtk-glade/propertybox.c:313 ../gtk-glade/propertybox.c:451 msgid "Disabled" msgstr "Uit" -#: ../gtk-glade/propertybox.c:482 +#: ../gtk-glade/propertybox.c:496 msgid "Account" msgstr "Account" -#: ../gtk-glade/propertybox.c:622 +#: ../gtk-glade/propertybox.c:636 msgid "English" msgstr "" -#: ../gtk-glade/propertybox.c:623 +#: ../gtk-glade/propertybox.c:637 msgid "French" msgstr "" -#: ../gtk-glade/propertybox.c:624 +#: ../gtk-glade/propertybox.c:638 msgid "Swedish" msgstr "" -#: ../gtk-glade/propertybox.c:625 +#: ../gtk-glade/propertybox.c:639 msgid "Italian" msgstr "" -#: ../gtk-glade/propertybox.c:626 +#: ../gtk-glade/propertybox.c:640 msgid "Spanish" msgstr "" -#: ../gtk-glade/propertybox.c:627 +#: ../gtk-glade/propertybox.c:641 msgid "Brazilian Portugese" msgstr "" -#: ../gtk-glade/propertybox.c:628 +#: ../gtk-glade/propertybox.c:642 msgid "Polish" msgstr "" -#: ../gtk-glade/propertybox.c:629 +#: ../gtk-glade/propertybox.c:643 msgid "German" msgstr "" -#: ../gtk-glade/propertybox.c:630 +#: ../gtk-glade/propertybox.c:644 msgid "Russian" msgstr "" -#: ../gtk-glade/propertybox.c:631 +#: ../gtk-glade/propertybox.c:645 msgid "Japanese" msgstr "" -#: ../gtk-glade/propertybox.c:632 +#: ../gtk-glade/propertybox.c:646 msgid "Dutch" msgstr "" -#: ../gtk-glade/propertybox.c:633 +#: ../gtk-glade/propertybox.c:647 msgid "Hungarian" msgstr "" -#: ../gtk-glade/propertybox.c:634 +#: ../gtk-glade/propertybox.c:648 msgid "Czech" msgstr "" -#: ../gtk-glade/propertybox.c:635 +#: ../gtk-glade/propertybox.c:649 msgid "Chinese" msgstr "" -#: ../gtk-glade/propertybox.c:692 +#: ../gtk-glade/propertybox.c:706 msgid "" "You need to restart linphone for the new language selection to take effect." msgstr "" @@ -751,7 +757,7 @@ msgstr "Accepteren" msgid "Decline" msgstr "lijn" -#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:368 +#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:369 msgid "Incoming call" msgstr "Inkomende oproep" @@ -1028,18 +1034,6 @@ msgstr "" msgid "default soundcard\n" msgstr "" -#: ../gtk-glade/parameters.glade.h:65 -msgid "gtk-go-down" -msgstr "" - -#: ../gtk-glade/parameters.glade.h:66 -msgid "gtk-go-up" -msgstr "" - -#: ../gtk-glade/parameters.glade.h:67 -msgid "gtk-media-play" -msgstr "" - #: ../gtk-glade/buddylookup.glade.h:1 msgid "Search somebody" msgstr "" @@ -1061,26 +1055,26 @@ msgstr "linphone" msgid "Please wait" msgstr "" -#: ../coreapi/linphonecore.c:310 +#: ../coreapi/linphonecore.c:311 #, 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:356 +#: ../coreapi/linphonecore.c:357 msgid "aborted" msgstr "afgebroken" -#: ../coreapi/linphonecore.c:359 +#: ../coreapi/linphonecore.c:360 msgid "completed" msgstr "voltooid" -#: ../coreapi/linphonecore.c:362 +#: ../coreapi/linphonecore.c:363 msgid "missed" msgstr "gemist" -#: ../coreapi/linphonecore.c:367 +#: ../coreapi/linphonecore.c:368 #, c-format msgid "" "%s at %s\n" @@ -1095,11 +1089,11 @@ msgstr "" "Status: %s\n" "Tijdsduur: %i mins %i secs\n" -#: ../coreapi/linphonecore.c:368 +#: ../coreapi/linphonecore.c:369 msgid "Outgoing call" msgstr "Uitgaande oproep" -#: ../coreapi/linphonecore.c:625 +#: ../coreapi/linphonecore.c:626 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" @@ -1107,23 +1101,23 @@ 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:1074 +#: ../coreapi/linphonecore.c:1083 msgid "Ready" msgstr "Gereed." -#: ../coreapi/linphonecore.c:1505 +#: ../coreapi/linphonecore.c:1513 msgid "Remote end seems to have disconnected, the call is going to be closed." msgstr "" -#: ../coreapi/linphonecore.c:1703 +#: ../coreapi/linphonecore.c:1725 msgid "Looking for telephone number destination..." msgstr "Zoekt de lokatie van het telefoonnummer..." -#: ../coreapi/linphonecore.c:1705 +#: ../coreapi/linphonecore.c:1727 msgid "Could not resolve this number." msgstr "Kon dit nummer niet vinden." -#: ../coreapi/linphonecore.c:1749 +#: ../coreapi/linphonecore.c:1771 msgid "" "Could not parse given sip address. A sip url usually looks like sip:" "user@domain" @@ -1131,27 +1125,27 @@ msgstr "" "Slecht geformuleerd SIP-adres. Een SIP-adres ziet er uit als sip:" "gebruikersnaam@domeinnaam" -#: ../coreapi/linphonecore.c:1890 +#: ../coreapi/linphonecore.c:1912 msgid "Contacting" msgstr "Verbinden" -#: ../coreapi/linphonecore.c:1896 +#: ../coreapi/linphonecore.c:1918 msgid "could not call" msgstr "Kon niet oproepen" -#: ../coreapi/linphonecore.c:1942 +#: ../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:2337 ../coreapi/callbacks.c:32 +#: ../coreapi/linphonecore.c:2370 ../coreapi/callbacks.c:32 msgid "Connected." msgstr "Verbonden." -#: ../coreapi/linphonecore.c:2371 +#: ../coreapi/linphonecore.c:2404 msgid "Call ended" msgstr "Oproep beeindigd" -#: ../coreapi/misc.c:142 +#: ../coreapi/misc.c:147 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the pcm oss emulation module\n" @@ -1163,7 +1157,7 @@ msgstr "" "en linphone heeft deze nodig. Geeft u alstublieft het commando\n" "'modprobe snd-pcm-oss' als root om de module te laden." -#: ../coreapi/misc.c:145 +#: ../coreapi/misc.c:150 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the mixer oss emulation module\n" @@ -1175,7 +1169,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:492 +#: ../coreapi/misc.c:497 msgid "Stun lookup in progress..." msgstr "STUN adres wordt opgezocht..." @@ -1292,48 +1286,48 @@ msgstr "De gebruiker wenst niet gestoord te worden." msgid "Call declined." msgstr "Oproep geweigerd." -#: ../coreapi/callbacks.c:280 +#: ../coreapi/callbacks.c:281 msgid "No response." msgstr "" -#: ../coreapi/callbacks.c:283 -msgid "Error." +#: ../coreapi/callbacks.c:284 +msgid "Protocol error." msgstr "" -#: ../coreapi/callbacks.c:296 +#: ../coreapi/callbacks.c:298 #, fuzzy msgid "Redirected" msgstr "Doorgeschakeld naar %s..." -#: ../coreapi/callbacks.c:304 +#: ../coreapi/callbacks.c:308 msgid "Not found" msgstr "" -#: ../coreapi/callbacks.c:312 +#: ../coreapi/callbacks.c:318 msgid "No common codecs" msgstr "" -#: ../coreapi/callbacks.c:316 +#: ../coreapi/callbacks.c:324 #, fuzzy msgid "Call failed." msgstr "Oproep geannuleerd." -#: ../coreapi/callbacks.c:365 +#: ../coreapi/callbacks.c:374 #, c-format msgid "Registration on %s successful." msgstr "Registratie op %s gelukt." -#: ../coreapi/callbacks.c:366 +#: ../coreapi/callbacks.c:375 #, fuzzy, c-format msgid "Unregistration on %s done." msgstr "Registratie op %s gelukt." -#: ../coreapi/callbacks.c:374 +#: ../coreapi/callbacks.c:383 #, fuzzy, c-format msgid "Registration on %s failed: %s" msgstr "Registratie op %s mislukt (time-out)." -#: ../coreapi/callbacks.c:374 +#: ../coreapi/callbacks.c:383 msgid "no response timeout" msgstr "" @@ -1353,11 +1347,11 @@ msgstr "" msgid "Alsa sound output" msgstr "" -#: ../mediastreamer2/src/aqsnd.c:1005 +#: ../mediastreamer2/src/aqsnd.c:1008 msgid "Sound capture filter for MacOS X Audio Queue Service" msgstr "" -#: ../mediastreamer2/src/aqsnd.c:1029 +#: ../mediastreamer2/src/aqsnd.c:1032 msgid "Sound playback filter for MacOS X Audio Queue Service" msgstr "" @@ -1373,11 +1367,11 @@ msgstr "" msgid "The GSM codec" msgstr "" -#: ../mediastreamer2/src/macsnd.c:670 +#: ../mediastreamer2/src/macsnd.c:1083 msgid "Sound capture filter for MacOS X Core Audio drivers" msgstr "" -#: ../mediastreamer2/src/macsnd.c:684 +#: ../mediastreamer2/src/macsnd.c:1098 msgid "Sound playback filter for MacOS X Core Audio drivers" msgstr "" @@ -1422,7 +1416,7 @@ msgstr "" msgid "A filter that controls and measure sound volume" msgstr "" -#: ../mediastreamer2/src/msv4l.c:1009 +#: ../mediastreamer2/src/msv4l.c:1011 msgid "A video4linux compatible source filter to stream pictures." msgstr "" diff --git a/po/pl.po b/po/pl.po index 8f1f4e9b8..dc9e5cf4d 100644 --- a/po/pl.po +++ b/po/pl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: linphone 0.7.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-02 10:28+0200\n" +"POT-Creation-Date: 2010-04-22 17:16+0200\n" "PO-Revision-Date: 2003-08-22 12:50+0200\n" "Last-Translator: Robert Nasiadek \n" "Language-Team: Polski \n" @@ -25,39 +25,39 @@ msgstr "Nie można znaleźć pixmapy: %s" msgid "Chat with %s" msgstr "" -#: ../gtk-glade/main.c:92 +#: ../gtk-glade/main.c:94 msgid "log to stdout some debug information while running." msgstr "" -#: ../gtk-glade/main.c:99 +#: ../gtk-glade/main.c:101 msgid "Start only in the system tray, do not show the main interface." msgstr "" -#: ../gtk-glade/main.c:106 +#: ../gtk-glade/main.c:108 msgid "address to call right now" msgstr "" -#: ../gtk-glade/main.c:113 +#: ../gtk-glade/main.c:115 msgid "if set automatically answer incoming calls" msgstr "" -#: ../gtk-glade/main.c:121 +#: ../gtk-glade/main.c:123 msgid "" "Specifiy a working directory (should be the base of the installation, eg: c:" "\\Program Files\\Linphone)" msgstr "" -#: ../gtk-glade/main.c:396 +#: ../gtk-glade/main.c:402 #, c-format msgid "Call with %s" msgstr "" -#: ../gtk-glade/main.c:707 +#: ../gtk-glade/main.c:720 #, c-format msgid "Incoming call from %s" msgstr "" -#: ../gtk-glade/main.c:746 +#: ../gtk-glade/main.c:759 #, c-format msgid "" "%s would like to add you to his contact list.\n" @@ -66,31 +66,37 @@ msgid "" "If you answer no, this person will be temporarily blacklisted." msgstr "" -#: ../gtk-glade/main.c:824 +#: ../gtk-glade/main.c:837 #, c-format msgid "" "Please enter your password for username %s\n" " at domain %s:" msgstr "" -#: ../gtk-glade/main.c:921 +#: ../gtk-glade/main.c:934 msgid "Website link" msgstr "" -#: ../gtk-glade/main.c:957 +#: ../gtk-glade/main.c:970 msgid "Linphone - a video internet phone" msgstr "" -#: ../gtk-glade/main.c:976 +#: ../gtk-glade/main.c:989 #, c-format msgid "%s (Default)" msgstr "" -#: ../gtk-glade/main.c:1229 +#: ../gtk-glade/main.c:1221 +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 msgid "A free SIP video-phone" msgstr "" -#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:247 +#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:258 #: ../gtk-glade/contact.glade.h:3 msgid "Name" msgstr "Nazwa" @@ -134,91 +140,91 @@ msgstr "" msgid "Add new contact from %s directory" msgstr "" -#: ../gtk-glade/propertybox.c:253 +#: ../gtk-glade/propertybox.c:264 msgid "Rate (Hz)" msgstr "Jakość (Hz)" -#: ../gtk-glade/propertybox.c:259 +#: ../gtk-glade/propertybox.c:270 msgid "Status" msgstr "Status" -#: ../gtk-glade/propertybox.c:265 +#: ../gtk-glade/propertybox.c:276 msgid "Min bitrate (kbit/s)" msgstr "Min przepustowość (kbit/s)" -#: ../gtk-glade/propertybox.c:271 +#: ../gtk-glade/propertybox.c:283 msgid "Parameters" msgstr "Parametr" -#: ../gtk-glade/propertybox.c:298 ../gtk-glade/propertybox.c:437 +#: ../gtk-glade/propertybox.c:312 ../gtk-glade/propertybox.c:451 msgid "Enabled" msgstr "Włączone" -#: ../gtk-glade/propertybox.c:299 ../gtk-glade/propertybox.c:437 +#: ../gtk-glade/propertybox.c:313 ../gtk-glade/propertybox.c:451 msgid "Disabled" msgstr "Wyłączone" -#: ../gtk-glade/propertybox.c:482 +#: ../gtk-glade/propertybox.c:496 msgid "Account" msgstr "" -#: ../gtk-glade/propertybox.c:622 +#: ../gtk-glade/propertybox.c:636 msgid "English" msgstr "" -#: ../gtk-glade/propertybox.c:623 +#: ../gtk-glade/propertybox.c:637 msgid "French" msgstr "" -#: ../gtk-glade/propertybox.c:624 +#: ../gtk-glade/propertybox.c:638 msgid "Swedish" msgstr "" -#: ../gtk-glade/propertybox.c:625 +#: ../gtk-glade/propertybox.c:639 msgid "Italian" msgstr "" -#: ../gtk-glade/propertybox.c:626 +#: ../gtk-glade/propertybox.c:640 msgid "Spanish" msgstr "" -#: ../gtk-glade/propertybox.c:627 +#: ../gtk-glade/propertybox.c:641 msgid "Brazilian Portugese" msgstr "" -#: ../gtk-glade/propertybox.c:628 +#: ../gtk-glade/propertybox.c:642 msgid "Polish" msgstr "" -#: ../gtk-glade/propertybox.c:629 +#: ../gtk-glade/propertybox.c:643 msgid "German" msgstr "" -#: ../gtk-glade/propertybox.c:630 +#: ../gtk-glade/propertybox.c:644 msgid "Russian" msgstr "" -#: ../gtk-glade/propertybox.c:631 +#: ../gtk-glade/propertybox.c:645 msgid "Japanese" msgstr "" -#: ../gtk-glade/propertybox.c:632 +#: ../gtk-glade/propertybox.c:646 msgid "Dutch" msgstr "" -#: ../gtk-glade/propertybox.c:633 +#: ../gtk-glade/propertybox.c:647 msgid "Hungarian" msgstr "" -#: ../gtk-glade/propertybox.c:634 +#: ../gtk-glade/propertybox.c:648 msgid "Czech" msgstr "" -#: ../gtk-glade/propertybox.c:635 +#: ../gtk-glade/propertybox.c:649 msgid "Chinese" msgstr "" -#: ../gtk-glade/propertybox.c:692 +#: ../gtk-glade/propertybox.c:706 msgid "" "You need to restart linphone for the new language selection to take effect." msgstr "" @@ -741,7 +747,7 @@ msgstr "" msgid "Decline" msgstr "linia" -#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:368 +#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:369 msgid "Incoming call" msgstr "" @@ -1013,18 +1019,6 @@ msgstr "" msgid "default soundcard\n" msgstr "" -#: ../gtk-glade/parameters.glade.h:65 -msgid "gtk-go-down" -msgstr "" - -#: ../gtk-glade/parameters.glade.h:66 -msgid "gtk-go-up" -msgstr "" - -#: ../gtk-glade/parameters.glade.h:67 -msgid "gtk-media-play" -msgstr "" - #: ../gtk-glade/buddylookup.glade.h:1 msgid "Search somebody" msgstr "" @@ -1046,26 +1040,26 @@ msgstr "linphone" msgid "Please wait" msgstr "" -#: ../coreapi/linphonecore.c:310 +#: ../coreapi/linphonecore.c:311 #, c-format msgid "You have missed %i call." msgid_plural "You have missed %i calls." msgstr[0] "" msgstr[1] "" -#: ../coreapi/linphonecore.c:356 +#: ../coreapi/linphonecore.c:357 msgid "aborted" msgstr "" -#: ../coreapi/linphonecore.c:359 +#: ../coreapi/linphonecore.c:360 msgid "completed" msgstr "" -#: ../coreapi/linphonecore.c:362 +#: ../coreapi/linphonecore.c:363 msgid "missed" msgstr "" -#: ../coreapi/linphonecore.c:367 +#: ../coreapi/linphonecore.c:368 #, c-format msgid "" "%s at %s\n" @@ -1075,63 +1069,63 @@ msgid "" "Duration: %i mn %i sec\n" msgstr "" -#: ../coreapi/linphonecore.c:368 +#: ../coreapi/linphonecore.c:369 msgid "Outgoing call" msgstr "" -#: ../coreapi/linphonecore.c:625 +#: ../coreapi/linphonecore.c:626 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:1074 +#: ../coreapi/linphonecore.c:1083 #, fuzzy msgid "Ready" msgstr "Gotowy." -#: ../coreapi/linphonecore.c:1505 +#: ../coreapi/linphonecore.c:1513 msgid "Remote end seems to have disconnected, the call is going to be closed." msgstr "" -#: ../coreapi/linphonecore.c:1703 +#: ../coreapi/linphonecore.c:1725 msgid "Looking for telephone number destination..." msgstr "" -#: ../coreapi/linphonecore.c:1705 +#: ../coreapi/linphonecore.c:1727 msgid "Could not resolve this number." msgstr "" -#: ../coreapi/linphonecore.c:1749 +#: ../coreapi/linphonecore.c:1771 #, 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 " -#: ../coreapi/linphonecore.c:1890 +#: ../coreapi/linphonecore.c:1912 #, fuzzy msgid "Contacting" msgstr "Dzwonie do " -#: ../coreapi/linphonecore.c:1896 +#: ../coreapi/linphonecore.c:1918 msgid "could not call" msgstr "" -#: ../coreapi/linphonecore.c:1942 +#: ../coreapi/linphonecore.c:1965 msgid "Sorry, having multiple simultaneous calls is not supported yet !" msgstr "" -#: ../coreapi/linphonecore.c:2337 ../coreapi/callbacks.c:32 +#: ../coreapi/linphonecore.c:2370 ../coreapi/callbacks.c:32 msgid "Connected." msgstr "Połączony" -#: ../coreapi/linphonecore.c:2371 +#: ../coreapi/linphonecore.c:2404 #, fuzzy msgid "Call ended" msgstr "Rozmowa odrzucona." -#: ../coreapi/misc.c:142 +#: ../coreapi/misc.c:147 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the pcm oss emulation module\n" @@ -1143,7 +1137,7 @@ msgstr "" "a Linphone go wymaga. Uruchom 'modprobe snd-pcm-oss' jako root,\n" "aby go załadować" -#: ../coreapi/misc.c:145 +#: ../coreapi/misc.c:150 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the mixer oss emulation module\n" @@ -1155,7 +1149,7 @@ msgstr "" "a Linphone go wymaga. Uruchom 'modprobe snd-mixer-oss' jako root,\n" "aby go załadować" -#: ../coreapi/misc.c:492 +#: ../coreapi/misc.c:497 msgid "Stun lookup in progress..." msgstr "" @@ -1272,47 +1266,47 @@ msgstr "Osoba nie chce, aby jej przeszkadzać." msgid "Call declined." msgstr "Rozmowa odrzucona." -#: ../coreapi/callbacks.c:280 +#: ../coreapi/callbacks.c:281 msgid "No response." msgstr "" -#: ../coreapi/callbacks.c:283 -msgid "Error." +#: ../coreapi/callbacks.c:284 +msgid "Protocol error." msgstr "" -#: ../coreapi/callbacks.c:296 +#: ../coreapi/callbacks.c:298 msgid "Redirected" msgstr "" -#: ../coreapi/callbacks.c:304 +#: ../coreapi/callbacks.c:308 msgid "Not found" msgstr "" -#: ../coreapi/callbacks.c:312 +#: ../coreapi/callbacks.c:318 msgid "No common codecs" msgstr "" -#: ../coreapi/callbacks.c:316 +#: ../coreapi/callbacks.c:324 #, fuzzy msgid "Call failed." msgstr "Połączenie odwołane." -#: ../coreapi/callbacks.c:365 +#: ../coreapi/callbacks.c:374 #, fuzzy, c-format msgid "Registration on %s successful." msgstr "Rejestracja powiodła się." -#: ../coreapi/callbacks.c:366 +#: ../coreapi/callbacks.c:375 #, fuzzy, c-format msgid "Unregistration on %s done." msgstr "Rejestracja powiodła się." -#: ../coreapi/callbacks.c:374 +#: ../coreapi/callbacks.c:383 #, fuzzy, c-format msgid "Registration on %s failed: %s" msgstr "Rejestracja powiodła się." -#: ../coreapi/callbacks.c:374 +#: ../coreapi/callbacks.c:383 msgid "no response timeout" msgstr "" @@ -1332,11 +1326,11 @@ msgstr "" msgid "Alsa sound output" msgstr "" -#: ../mediastreamer2/src/aqsnd.c:1005 +#: ../mediastreamer2/src/aqsnd.c:1008 msgid "Sound capture filter for MacOS X Audio Queue Service" msgstr "" -#: ../mediastreamer2/src/aqsnd.c:1029 +#: ../mediastreamer2/src/aqsnd.c:1032 msgid "Sound playback filter for MacOS X Audio Queue Service" msgstr "" @@ -1352,11 +1346,11 @@ msgstr "" msgid "The GSM codec" msgstr "" -#: ../mediastreamer2/src/macsnd.c:670 +#: ../mediastreamer2/src/macsnd.c:1083 msgid "Sound capture filter for MacOS X Core Audio drivers" msgstr "" -#: ../mediastreamer2/src/macsnd.c:684 +#: ../mediastreamer2/src/macsnd.c:1098 msgid "Sound playback filter for MacOS X Core Audio drivers" msgstr "" @@ -1401,7 +1395,7 @@ msgstr "" msgid "A filter that controls and measure sound volume" msgstr "" -#: ../mediastreamer2/src/msv4l.c:1009 +#: ../mediastreamer2/src/msv4l.c:1011 msgid "A video4linux compatible source filter to stream pictures." msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index d15f40700..9da079f60 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: linphone-1.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-02 10:28+0200\n" +"POT-Creation-Date: 2010-04-22 17:16+0200\n" "PO-Revision-Date: 2006-07-11 23:30+0200\n" "Last-Translator: Rafael Caesar Lenzi \n" "Language-Team: pt_BR \n" @@ -27,39 +27,39 @@ msgstr "Não é possível achar arquivo pixmap: %s" msgid "Chat with %s" msgstr "Bate-papo com %s" -#: ../gtk-glade/main.c:92 +#: ../gtk-glade/main.c:94 msgid "log to stdout some debug information while running." msgstr "" -#: ../gtk-glade/main.c:99 +#: ../gtk-glade/main.c:101 msgid "Start only in the system tray, do not show the main interface." msgstr "" -#: ../gtk-glade/main.c:106 +#: ../gtk-glade/main.c:108 msgid "address to call right now" msgstr "" -#: ../gtk-glade/main.c:113 +#: ../gtk-glade/main.c:115 msgid "if set automatically answer incoming calls" msgstr "" -#: ../gtk-glade/main.c:121 +#: ../gtk-glade/main.c:123 msgid "" "Specifiy a working directory (should be the base of the installation, eg: c:" "\\Program Files\\Linphone)" msgstr "" -#: ../gtk-glade/main.c:396 +#: ../gtk-glade/main.c:402 #, fuzzy, c-format msgid "Call with %s" msgstr "Bate-papo com %s" -#: ../gtk-glade/main.c:707 +#: ../gtk-glade/main.c:720 #, fuzzy, c-format msgid "Incoming call from %s" msgstr "Camadas recebidas" -#: ../gtk-glade/main.c:746 +#: ../gtk-glade/main.c:759 #, c-format msgid "" "%s would like to add you to his contact list.\n" @@ -68,31 +68,37 @@ msgid "" "If you answer no, this person will be temporarily blacklisted." msgstr "" -#: ../gtk-glade/main.c:824 +#: ../gtk-glade/main.c:837 #, c-format msgid "" "Please enter your password for username %s\n" " at domain %s:" msgstr "" -#: ../gtk-glade/main.c:921 +#: ../gtk-glade/main.c:934 msgid "Website link" msgstr "" -#: ../gtk-glade/main.c:957 +#: ../gtk-glade/main.c:970 msgid "Linphone - a video internet phone" msgstr "" -#: ../gtk-glade/main.c:976 +#: ../gtk-glade/main.c:989 #, c-format msgid "%s (Default)" msgstr "" -#: ../gtk-glade/main.c:1229 +#: ../gtk-glade/main.c:1221 +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 msgid "A free SIP video-phone" msgstr "" -#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:247 +#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:258 #: ../gtk-glade/contact.glade.h:3 msgid "Name" msgstr "Nome" @@ -135,92 +141,92 @@ msgstr "" msgid "Add new contact from %s directory" msgstr "" -#: ../gtk-glade/propertybox.c:253 +#: ../gtk-glade/propertybox.c:264 msgid "Rate (Hz)" msgstr "Taxa (Hz)" -#: ../gtk-glade/propertybox.c:259 +#: ../gtk-glade/propertybox.c:270 msgid "Status" msgstr "" -#: ../gtk-glade/propertybox.c:265 +#: ../gtk-glade/propertybox.c:276 msgid "Min bitrate (kbit/s)" msgstr "Bitrate mínimo (kbits/s)" -#: ../gtk-glade/propertybox.c:271 +#: ../gtk-glade/propertybox.c:283 msgid "Parameters" msgstr "Parâmetros" -#: ../gtk-glade/propertybox.c:298 ../gtk-glade/propertybox.c:437 +#: ../gtk-glade/propertybox.c:312 ../gtk-glade/propertybox.c:451 msgid "Enabled" msgstr "Ativado" -#: ../gtk-glade/propertybox.c:299 ../gtk-glade/propertybox.c:437 +#: ../gtk-glade/propertybox.c:313 ../gtk-glade/propertybox.c:451 msgid "Disabled" msgstr "Desativado" -#: ../gtk-glade/propertybox.c:482 +#: ../gtk-glade/propertybox.c:496 #, fuzzy msgid "Account" msgstr "Aceitar" -#: ../gtk-glade/propertybox.c:622 +#: ../gtk-glade/propertybox.c:636 msgid "English" msgstr "" -#: ../gtk-glade/propertybox.c:623 +#: ../gtk-glade/propertybox.c:637 msgid "French" msgstr "" -#: ../gtk-glade/propertybox.c:624 +#: ../gtk-glade/propertybox.c:638 msgid "Swedish" msgstr "" -#: ../gtk-glade/propertybox.c:625 +#: ../gtk-glade/propertybox.c:639 msgid "Italian" msgstr "" -#: ../gtk-glade/propertybox.c:626 +#: ../gtk-glade/propertybox.c:640 msgid "Spanish" msgstr "" -#: ../gtk-glade/propertybox.c:627 +#: ../gtk-glade/propertybox.c:641 msgid "Brazilian Portugese" msgstr "" -#: ../gtk-glade/propertybox.c:628 +#: ../gtk-glade/propertybox.c:642 msgid "Polish" msgstr "" -#: ../gtk-glade/propertybox.c:629 +#: ../gtk-glade/propertybox.c:643 msgid "German" msgstr "" -#: ../gtk-glade/propertybox.c:630 +#: ../gtk-glade/propertybox.c:644 msgid "Russian" msgstr "" -#: ../gtk-glade/propertybox.c:631 +#: ../gtk-glade/propertybox.c:645 msgid "Japanese" msgstr "" -#: ../gtk-glade/propertybox.c:632 +#: ../gtk-glade/propertybox.c:646 msgid "Dutch" msgstr "" -#: ../gtk-glade/propertybox.c:633 +#: ../gtk-glade/propertybox.c:647 msgid "Hungarian" msgstr "" -#: ../gtk-glade/propertybox.c:634 +#: ../gtk-glade/propertybox.c:648 msgid "Czech" msgstr "" -#: ../gtk-glade/propertybox.c:635 +#: ../gtk-glade/propertybox.c:649 msgid "Chinese" msgstr "" -#: ../gtk-glade/propertybox.c:692 +#: ../gtk-glade/propertybox.c:706 msgid "" "You need to restart linphone for the new language selection to take effect." msgstr "" @@ -745,7 +751,7 @@ msgstr "Aceitar" msgid "Decline" msgstr "linha" -#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:368 +#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:369 msgid "Incoming call" msgstr "Camadas recebidas" @@ -1020,18 +1026,6 @@ msgstr "" msgid "default soundcard\n" msgstr "" -#: ../gtk-glade/parameters.glade.h:65 -msgid "gtk-go-down" -msgstr "" - -#: ../gtk-glade/parameters.glade.h:66 -msgid "gtk-go-up" -msgstr "" - -#: ../gtk-glade/parameters.glade.h:67 -msgid "gtk-media-play" -msgstr "" - #: ../gtk-glade/buddylookup.glade.h:1 msgid "Search somebody" msgstr "" @@ -1052,26 +1046,26 @@ msgstr "" msgid "Please wait" msgstr "" -#: ../coreapi/linphonecore.c:310 +#: ../coreapi/linphonecore.c:311 #, 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:356 +#: ../coreapi/linphonecore.c:357 msgid "aborted" msgstr "Abortado" -#: ../coreapi/linphonecore.c:359 +#: ../coreapi/linphonecore.c:360 msgid "completed" msgstr "Competado" -#: ../coreapi/linphonecore.c:362 +#: ../coreapi/linphonecore.c:363 msgid "missed" msgstr "Perdido" -#: ../coreapi/linphonecore.c:367 +#: ../coreapi/linphonecore.c:368 #, fuzzy, c-format msgid "" "%s at %s\n" @@ -1085,11 +1079,11 @@ msgstr "" "Status: %s\n" "Duração: %i min %i seg\n" -#: ../coreapi/linphonecore.c:368 +#: ../coreapi/linphonecore.c:369 msgid "Outgoing call" msgstr "Chamadas efetuadas" -#: ../coreapi/linphonecore.c:625 +#: ../coreapi/linphonecore.c:626 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,52 +1092,52 @@ msgstr "" "linphone sempre usa IPv4. Por favor atualize sua configuração se deseja usar " "IPv6" -#: ../coreapi/linphonecore.c:1074 +#: ../coreapi/linphonecore.c:1083 #, fuzzy msgid "Ready" msgstr "Pronto." -#: ../coreapi/linphonecore.c:1505 +#: ../coreapi/linphonecore.c:1513 msgid "Remote end seems to have disconnected, the call is going to be closed." msgstr "" -#: ../coreapi/linphonecore.c:1703 +#: ../coreapi/linphonecore.c:1725 msgid "Looking for telephone number destination..." msgstr "Procurando por telefone de destino..." -#: ../coreapi/linphonecore.c:1705 +#: ../coreapi/linphonecore.c:1727 msgid "Could not resolve this number." msgstr "Não foi possível encontrar este número." -#: ../coreapi/linphonecore.c:1749 +#: ../coreapi/linphonecore.c:1771 msgid "" "Could not parse given sip address. A sip url usually looks like sip:" "user@domain" msgstr "" -#: ../coreapi/linphonecore.c:1890 +#: ../coreapi/linphonecore.c:1912 #, fuzzy msgid "Contacting" msgstr "Contatando " -#: ../coreapi/linphonecore.c:1896 +#: ../coreapi/linphonecore.c:1918 msgid "could not call" msgstr "" -#: ../coreapi/linphonecore.c:1942 +#: ../coreapi/linphonecore.c:1965 msgid "Sorry, having multiple simultaneous calls is not supported yet !" msgstr "" -#: ../coreapi/linphonecore.c:2337 ../coreapi/callbacks.c:32 +#: ../coreapi/linphonecore.c:2370 ../coreapi/callbacks.c:32 msgid "Connected." msgstr "Conectado." -#: ../coreapi/linphonecore.c:2371 +#: ../coreapi/linphonecore.c:2404 #, fuzzy msgid "Call ended" msgstr "Chamada cancelada." -#: ../coreapi/misc.c:142 +#: ../coreapi/misc.c:147 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the pcm oss emulation module\n" @@ -1151,7 +1145,7 @@ msgid "" "'modprobe snd-pcm-oss' as root to load it." msgstr "" -#: ../coreapi/misc.c:145 +#: ../coreapi/misc.c:150 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the mixer oss emulation module\n" @@ -1159,7 +1153,7 @@ msgid "" " 'modprobe snd-mixer-oss' as root to load it." msgstr "" -#: ../coreapi/misc.c:492 +#: ../coreapi/misc.c:497 msgid "Stun lookup in progress..." msgstr "" @@ -1273,48 +1267,48 @@ msgstr "" msgid "Call declined." msgstr "" -#: ../coreapi/callbacks.c:280 +#: ../coreapi/callbacks.c:281 msgid "No response." msgstr "" -#: ../coreapi/callbacks.c:283 -msgid "Error." +#: ../coreapi/callbacks.c:284 +msgid "Protocol error." msgstr "" -#: ../coreapi/callbacks.c:296 +#: ../coreapi/callbacks.c:298 #, fuzzy msgid "Redirected" msgstr "Redirecionado para %s..." -#: ../coreapi/callbacks.c:304 +#: ../coreapi/callbacks.c:308 msgid "Not found" msgstr "" -#: ../coreapi/callbacks.c:312 +#: ../coreapi/callbacks.c:318 msgid "No common codecs" msgstr "" -#: ../coreapi/callbacks.c:316 +#: ../coreapi/callbacks.c:324 #, fuzzy msgid "Call failed." msgstr "Histórico de chamadas" -#: ../coreapi/callbacks.c:365 +#: ../coreapi/callbacks.c:374 #, fuzzy, c-format msgid "Registration on %s successful." msgstr "Registro em %s efetuado." -#: ../coreapi/callbacks.c:366 +#: ../coreapi/callbacks.c:375 #, fuzzy, c-format msgid "Unregistration on %s done." msgstr "Registro em %s efetuado." -#: ../coreapi/callbacks.c:374 +#: ../coreapi/callbacks.c:383 #, fuzzy, c-format msgid "Registration on %s failed: %s" msgstr "Registro falhou (tempo esgotado)." -#: ../coreapi/callbacks.c:374 +#: ../coreapi/callbacks.c:383 msgid "no response timeout" msgstr "" @@ -1334,11 +1328,11 @@ msgstr "" msgid "Alsa sound output" msgstr "" -#: ../mediastreamer2/src/aqsnd.c:1005 +#: ../mediastreamer2/src/aqsnd.c:1008 msgid "Sound capture filter for MacOS X Audio Queue Service" msgstr "" -#: ../mediastreamer2/src/aqsnd.c:1029 +#: ../mediastreamer2/src/aqsnd.c:1032 msgid "Sound playback filter for MacOS X Audio Queue Service" msgstr "" @@ -1354,11 +1348,11 @@ msgstr "" msgid "The GSM codec" msgstr "" -#: ../mediastreamer2/src/macsnd.c:670 +#: ../mediastreamer2/src/macsnd.c:1083 msgid "Sound capture filter for MacOS X Core Audio drivers" msgstr "" -#: ../mediastreamer2/src/macsnd.c:684 +#: ../mediastreamer2/src/macsnd.c:1098 msgid "Sound playback filter for MacOS X Core Audio drivers" msgstr "" @@ -1403,7 +1397,7 @@ msgstr "" msgid "A filter that controls and measure sound volume" msgstr "" -#: ../mediastreamer2/src/msv4l.c:1009 +#: ../mediastreamer2/src/msv4l.c:1011 msgid "A video4linux compatible source filter to stream pictures." msgstr "" diff --git a/po/ru.po b/po/ru.po index 14f188c4a..3eb04e36a 100644 --- a/po/ru.po +++ b/po/ru.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: linphone 0.7.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-02 10:28+0200\n" +"POT-Creation-Date: 2010-04-22 17:16+0200\n" "PO-Revision-Date: 2010-01-22 18:43+0300\n" "Last-Translator: Maxim Prokopyev \n" "Language-Team: Russian \n" @@ -25,25 +25,25 @@ msgstr "Невозможно найти графический файл: %s" msgid "Chat with %s" msgstr "Обмен сообщениями с %s" -#: ../gtk-glade/main.c:92 +#: ../gtk-glade/main.c:94 msgid "log to stdout some debug information while running." msgstr "" "Вывод некоторой отладочной информации на устройство стандартного вывода во " "время работы " -#: ../gtk-glade/main.c:99 +#: ../gtk-glade/main.c:101 msgid "Start only in the system tray, do not show the main interface." msgstr "Показывать только в системном лотке, не запуская главное окно" -#: ../gtk-glade/main.c:106 +#: ../gtk-glade/main.c:108 msgid "address to call right now" msgstr "адрес для звонка" -#: ../gtk-glade/main.c:113 +#: ../gtk-glade/main.c:115 msgid "if set automatically answer incoming calls" msgstr "если установлен автоматический прием входящих вызовов" -#: ../gtk-glade/main.c:121 +#: ../gtk-glade/main.c:123 msgid "" "Specifiy a working directory (should be the base of the installation, eg: c:" "\\Program Files\\Linphone)" @@ -51,17 +51,17 @@ msgstr "" "Определить рабочий каталог (относительно каталога установки, например: c:" "\\Program Files\\Linphone)" -#: ../gtk-glade/main.c:396 +#: ../gtk-glade/main.c:402 #, fuzzy, c-format msgid "Call with %s" msgstr "Обмен сообщениями с %s" -#: ../gtk-glade/main.c:707 +#: ../gtk-glade/main.c:720 #, c-format msgid "Incoming call from %s" msgstr "Входящий звонок от %s" -#: ../gtk-glade/main.c:746 +#: ../gtk-glade/main.c:759 #, c-format msgid "" "%s would like to add you to his contact list.\n" @@ -74,7 +74,7 @@ msgstr "" "контактный лист?\n" "Если вы ответите Нет, эта персона будет временно заблокирована." -#: ../gtk-glade/main.c:824 +#: ../gtk-glade/main.c:837 #, c-format msgid "" "Please enter your password for username %s\n" @@ -83,24 +83,30 @@ msgstr "" "Пожалуйста, введите пароль для пользователя %s\n" " в домене %s:" -#: ../gtk-glade/main.c:921 +#: ../gtk-glade/main.c:934 msgid "Website link" msgstr "Домашняя страница" -#: ../gtk-glade/main.c:957 +#: ../gtk-glade/main.c:970 msgid "Linphone - a video internet phone" msgstr "Linphone - Интернет видео телефон" -#: ../gtk-glade/main.c:976 +#: ../gtk-glade/main.c:989 #, c-format msgid "%s (Default)" msgstr "%s (По умолчанию)" -#: ../gtk-glade/main.c:1229 +#: ../gtk-glade/main.c:1221 +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 msgid "A free SIP video-phone" msgstr "Свободный SIP видео-телефон" -#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:247 +#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:258 #: ../gtk-glade/contact.glade.h:3 msgid "Name" msgstr "Имя" @@ -143,92 +149,92 @@ msgstr "Удалить контакт '%s'" msgid "Add new contact from %s directory" msgstr "Добавить новый контакт из директории '%s'" -#: ../gtk-glade/propertybox.c:253 +#: ../gtk-glade/propertybox.c:264 msgid "Rate (Hz)" msgstr "Частота (Hz)" -#: ../gtk-glade/propertybox.c:259 +#: ../gtk-glade/propertybox.c:270 msgid "Status" msgstr "Статус" -#: ../gtk-glade/propertybox.c:265 +#: ../gtk-glade/propertybox.c:276 msgid "Min bitrate (kbit/s)" msgstr "Минимальный битрейт (kbit/s)" -#: ../gtk-glade/propertybox.c:271 +#: ../gtk-glade/propertybox.c:283 msgid "Parameters" msgstr "Параметры" -#: ../gtk-glade/propertybox.c:298 ../gtk-glade/propertybox.c:437 +#: ../gtk-glade/propertybox.c:312 ../gtk-glade/propertybox.c:451 msgid "Enabled" msgstr "Включен" -#: ../gtk-glade/propertybox.c:299 ../gtk-glade/propertybox.c:437 +#: ../gtk-glade/propertybox.c:313 ../gtk-glade/propertybox.c:451 msgid "Disabled" msgstr "Отключен" -#: ../gtk-glade/propertybox.c:482 +#: ../gtk-glade/propertybox.c:496 msgid "Account" msgstr "Учетная запись" -#: ../gtk-glade/propertybox.c:622 +#: ../gtk-glade/propertybox.c:636 msgid "English" msgstr "Английский" -#: ../gtk-glade/propertybox.c:623 +#: ../gtk-glade/propertybox.c:637 msgid "French" msgstr "Французский" -#: ../gtk-glade/propertybox.c:624 +#: ../gtk-glade/propertybox.c:638 msgid "Swedish" msgstr "Шведский" -#: ../gtk-glade/propertybox.c:625 +#: ../gtk-glade/propertybox.c:639 msgid "Italian" msgstr "Итальянский" -#: ../gtk-glade/propertybox.c:626 +#: ../gtk-glade/propertybox.c:640 msgid "Spanish" msgstr "Испанский" -#: ../gtk-glade/propertybox.c:627 +#: ../gtk-glade/propertybox.c:641 #, fuzzy msgid "Brazilian Portugese" msgstr "Португальский" -#: ../gtk-glade/propertybox.c:628 +#: ../gtk-glade/propertybox.c:642 msgid "Polish" msgstr "Польский" -#: ../gtk-glade/propertybox.c:629 +#: ../gtk-glade/propertybox.c:643 msgid "German" msgstr "Немецкий" -#: ../gtk-glade/propertybox.c:630 +#: ../gtk-glade/propertybox.c:644 msgid "Russian" msgstr "Русский" -#: ../gtk-glade/propertybox.c:631 +#: ../gtk-glade/propertybox.c:645 msgid "Japanese" msgstr "Японский" -#: ../gtk-glade/propertybox.c:632 +#: ../gtk-glade/propertybox.c:646 msgid "Dutch" msgstr "Датский" -#: ../gtk-glade/propertybox.c:633 +#: ../gtk-glade/propertybox.c:647 msgid "Hungarian" msgstr "Венгерский" -#: ../gtk-glade/propertybox.c:634 +#: ../gtk-glade/propertybox.c:648 msgid "Czech" msgstr "Чешский" -#: ../gtk-glade/propertybox.c:635 +#: ../gtk-glade/propertybox.c:649 msgid "Chinese" msgstr "Китайский" -#: ../gtk-glade/propertybox.c:692 +#: ../gtk-glade/propertybox.c:706 msgid "" "You need to restart linphone for the new language selection to take effect." msgstr "" @@ -747,7 +753,7 @@ msgstr "Принять" msgid "Decline" msgstr "Отклонить" -#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:368 +#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:369 msgid "Incoming call" msgstr "Входящий вызов" @@ -1004,18 +1010,6 @@ msgstr "звуковая карта по умолчанию" msgid "default soundcard\n" msgstr "звуковая карта по умолчанию\n" -#: ../gtk-glade/parameters.glade.h:65 -msgid "gtk-go-down" -msgstr "Вниз" - -#: ../gtk-glade/parameters.glade.h:66 -msgid "gtk-go-up" -msgstr "Вверх" - -#: ../gtk-glade/parameters.glade.h:67 -msgid "gtk-media-play" -msgstr "Проиграть" - #: ../gtk-glade/buddylookup.glade.h:1 msgid "Search somebody" msgstr "Поиск" @@ -1036,26 +1030,26 @@ msgstr "Linphone" msgid "Please wait" msgstr "Подождите" -#: ../coreapi/linphonecore.c:310 +#: ../coreapi/linphonecore.c:311 #, c-format msgid "You have missed %i call." msgid_plural "You have missed %i calls." msgstr[0] "У вас пропущено %i звонков." msgstr[1] "У вас пропущено %i звонков." -#: ../coreapi/linphonecore.c:356 +#: ../coreapi/linphonecore.c:357 msgid "aborted" msgstr "отмененный" -#: ../coreapi/linphonecore.c:359 +#: ../coreapi/linphonecore.c:360 msgid "completed" msgstr "заверщённый" -#: ../coreapi/linphonecore.c:362 +#: ../coreapi/linphonecore.c:363 msgid "missed" msgstr "пропущенный" -#: ../coreapi/linphonecore.c:367 +#: ../coreapi/linphonecore.c:368 #, c-format msgid "" "%s at %s\n" @@ -1070,11 +1064,11 @@ msgstr "" "Статус: %s\n" "Длительность: %i мн %i сек\n" -#: ../coreapi/linphonecore.c:368 +#: ../coreapi/linphonecore.c:369 msgid "Outgoing call" msgstr "Исходящий звонок" -#: ../coreapi/linphonecore.c:625 +#: ../coreapi/linphonecore.c:626 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" @@ -1082,23 +1076,23 @@ msgstr "" "Ваш компьютер подключен по IPv6. Linphone по умолчанию использует IPv4. " "Пожалуйста, обновите настройки если хотите использовать IPv6." -#: ../coreapi/linphonecore.c:1074 +#: ../coreapi/linphonecore.c:1083 msgid "Ready" msgstr "Готов" -#: ../coreapi/linphonecore.c:1505 +#: ../coreapi/linphonecore.c:1513 msgid "Remote end seems to have disconnected, the call is going to be closed." msgstr "Удалённый узел отключился, звонок завершён." -#: ../coreapi/linphonecore.c:1703 +#: ../coreapi/linphonecore.c:1725 msgid "Looking for telephone number destination..." msgstr "Поиск назначения для телефонного номера.." -#: ../coreapi/linphonecore.c:1705 +#: ../coreapi/linphonecore.c:1727 msgid "Could not resolve this number." msgstr "Не может принять решение по этому номеру." -#: ../coreapi/linphonecore.c:1749 +#: ../coreapi/linphonecore.c:1771 msgid "" "Could not parse given sip address. A sip url usually looks like sip:" "user@domain" @@ -1106,27 +1100,27 @@ msgstr "" "Не могу опознать sip адрес. SIP url обычно выглядит как: " -#: ../coreapi/linphonecore.c:1890 +#: ../coreapi/linphonecore.c:1912 msgid "Contacting" msgstr "Соединение" -#: ../coreapi/linphonecore.c:1896 +#: ../coreapi/linphonecore.c:1918 msgid "could not call" msgstr "невозможно позвонить" -#: ../coreapi/linphonecore.c:1942 +#: ../coreapi/linphonecore.c:1965 msgid "Sorry, having multiple simultaneous calls is not supported yet !" msgstr "Одновременные вызовы пока не поддерживается!" -#: ../coreapi/linphonecore.c:2337 ../coreapi/callbacks.c:32 +#: ../coreapi/linphonecore.c:2370 ../coreapi/callbacks.c:32 msgid "Connected." msgstr "Соединён." -#: ../coreapi/linphonecore.c:2371 +#: ../coreapi/linphonecore.c:2404 msgid "Call ended" msgstr "Разговор окончен" -#: ../coreapi/misc.c:142 +#: ../coreapi/misc.c:147 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the pcm oss emulation module\n" @@ -1139,7 +1133,7 @@ msgstr "" "Пожалуйста, выполните от пользователя root 'modprobe snd-pcm-oss' чтоб " "загрузить его." -#: ../coreapi/misc.c:145 +#: ../coreapi/misc.c:150 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the mixer oss emulation module\n" @@ -1152,7 +1146,7 @@ msgstr "" "Пожалуйста, выполните от пользователя root 'modprobe snd-pcm-oss' чтоб " "загрузить его." -#: ../coreapi/misc.c:492 +#: ../coreapi/misc.c:497 msgid "Stun lookup in progress..." msgstr "Идет поиск Stun..." @@ -1268,49 +1262,49 @@ msgstr "Пользователь не хочет чтоб его беспоко msgid "Call declined." msgstr "Звонок отклонён." -#: ../coreapi/callbacks.c:280 +#: ../coreapi/callbacks.c:281 #, fuzzy msgid "No response." msgstr "время ожидания истекло" -#: ../coreapi/callbacks.c:283 -msgid "Error." +#: ../coreapi/callbacks.c:284 +msgid "Protocol error." msgstr "" -#: ../coreapi/callbacks.c:296 +#: ../coreapi/callbacks.c:298 #, fuzzy msgid "Redirected" msgstr "Переадресован на %s..." -#: ../coreapi/callbacks.c:304 +#: ../coreapi/callbacks.c:308 msgid "Not found" msgstr "" -#: ../coreapi/callbacks.c:312 +#: ../coreapi/callbacks.c:318 msgid "No common codecs" msgstr "" -#: ../coreapi/callbacks.c:316 +#: ../coreapi/callbacks.c:324 #, fuzzy msgid "Call failed." msgstr "Anruf annulliert" -#: ../coreapi/callbacks.c:365 +#: ../coreapi/callbacks.c:374 #, c-format msgid "Registration on %s successful." msgstr "Регистрация на %s прошла успешно." -#: ../coreapi/callbacks.c:366 +#: ../coreapi/callbacks.c:375 #, c-format msgid "Unregistration on %s done." msgstr "Отмена регистрации на %s завершена." -#: ../coreapi/callbacks.c:374 +#: ../coreapi/callbacks.c:383 #, c-format msgid "Registration on %s failed: %s" msgstr "Регистрация на %s не удалась: %s" -#: ../coreapi/callbacks.c:374 +#: ../coreapi/callbacks.c:383 msgid "no response timeout" msgstr "время ожидания истекло" @@ -1330,11 +1324,11 @@ msgstr "Источник ALSA" msgid "Alsa sound output" msgstr "" -#: ../mediastreamer2/src/aqsnd.c:1005 +#: ../mediastreamer2/src/aqsnd.c:1008 msgid "Sound capture filter for MacOS X Audio Queue Service" msgstr "" -#: ../mediastreamer2/src/aqsnd.c:1029 +#: ../mediastreamer2/src/aqsnd.c:1032 msgid "Sound playback filter for MacOS X Audio Queue Service" msgstr "" @@ -1350,11 +1344,11 @@ msgstr "Кодек GSM full-rate" msgid "The GSM codec" msgstr "Кодек GSM" -#: ../mediastreamer2/src/macsnd.c:670 +#: ../mediastreamer2/src/macsnd.c:1083 msgid "Sound capture filter for MacOS X Core Audio drivers" msgstr "" -#: ../mediastreamer2/src/macsnd.c:684 +#: ../mediastreamer2/src/macsnd.c:1098 msgid "Sound playback filter for MacOS X Core Audio drivers" msgstr "" @@ -1399,7 +1393,7 @@ msgstr "" msgid "A filter that controls and measure sound volume" msgstr "" -#: ../mediastreamer2/src/msv4l.c:1009 +#: ../mediastreamer2/src/msv4l.c:1011 msgid "A video4linux compatible source filter to stream pictures." msgstr "" @@ -1556,6 +1550,15 @@ msgstr "" msgid "A webcam grabber based on directshow." msgstr "" +#~ msgid "gtk-go-down" +#~ msgstr "Вниз" + +#~ msgid "gtk-go-up" +#~ msgstr "Вверх" + +#~ msgid "gtk-media-play" +#~ msgstr "Проиграть" + #~ msgid "Could not reach destination." #~ msgstr "Невозможно соединиться." diff --git a/po/sv.po b/po/sv.po index f8779bdea..cb0975300 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-02 10:28+0200\n" +"POT-Creation-Date: 2010-04-22 17:16+0200\n" "PO-Revision-Date: 2009-02-17 15:22+0100\n" "Last-Translator: Emmanuel Frécon \n" "Language-Team: SWEDISH \n" @@ -26,23 +26,23 @@ msgstr "Kunde inte hitta pixmap filen: %s" msgid "Chat with %s" msgstr "Chatta med %s" -#: ../gtk-glade/main.c:92 +#: ../gtk-glade/main.c:94 msgid "log to stdout some debug information while running." msgstr "skriv loggning information under körning" -#: ../gtk-glade/main.c:99 +#: ../gtk-glade/main.c:101 msgid "Start only in the system tray, do not show the main interface." msgstr "Starta ikonifierat, visa inte huvudfönstret" -#: ../gtk-glade/main.c:106 +#: ../gtk-glade/main.c:108 msgid "address to call right now" msgstr "Samtalsmottagare" -#: ../gtk-glade/main.c:113 +#: ../gtk-glade/main.c:115 msgid "if set automatically answer incoming calls" msgstr "Om på, besvara automatisk alla inkommande samtal" -#: ../gtk-glade/main.c:121 +#: ../gtk-glade/main.c:123 msgid "" "Specifiy a working directory (should be the base of the installation, eg: c:" "\\Program Files\\Linphone)" @@ -50,17 +50,17 @@ msgstr "" "Välj en arbetskatalog som ska vara basen för installationen, såsom C:" "\\Program\\Linphone" -#: ../gtk-glade/main.c:396 +#: ../gtk-glade/main.c:402 #, c-format msgid "Call with %s" msgstr "Samtal med %s" -#: ../gtk-glade/main.c:707 +#: ../gtk-glade/main.c:720 #, c-format msgid "Incoming call from %s" msgstr "Inkommande samtal från %s" -#: ../gtk-glade/main.c:746 +#: ../gtk-glade/main.c:759 #, c-format msgid "" "%s would like to add you to his contact list.\n" @@ -73,7 +73,7 @@ msgstr "" "henne till din kontaktlista?\n" "Om du svarar nej, personen kommer att vara bannlyst." -#: ../gtk-glade/main.c:824 +#: ../gtk-glade/main.c:837 #, c-format msgid "" "Please enter your password for username %s\n" @@ -82,24 +82,30 @@ msgstr "" "Mata in ditt lösenord för användaren %s\n" "vid domänen %s:" -#: ../gtk-glade/main.c:921 +#: ../gtk-glade/main.c:934 msgid "Website link" msgstr "Webbsajt" -#: ../gtk-glade/main.c:957 +#: ../gtk-glade/main.c:970 msgid "Linphone - a video internet phone" msgstr "Linphone - en video Internet telefon" -#: ../gtk-glade/main.c:976 +#: ../gtk-glade/main.c:989 #, c-format msgid "%s (Default)" msgstr "%s (Default)" -#: ../gtk-glade/main.c:1229 +#: ../gtk-glade/main.c:1221 +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 msgid "A free SIP video-phone" msgstr "En gratis SIP video-telefon" -#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:247 +#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:258 #: ../gtk-glade/contact.glade.h:3 msgid "Name" msgstr "Namn" @@ -142,91 +148,91 @@ msgstr "Ta bort kontakt '%s'" msgid "Add new contact from %s directory" msgstr "Lägg till kontakt ifrån %s katalogen" -#: ../gtk-glade/propertybox.c:253 +#: ../gtk-glade/propertybox.c:264 msgid "Rate (Hz)" msgstr "Frekvens (Hz)" -#: ../gtk-glade/propertybox.c:259 +#: ../gtk-glade/propertybox.c:270 msgid "Status" msgstr "Status" -#: ../gtk-glade/propertybox.c:265 +#: ../gtk-glade/propertybox.c:276 msgid "Min bitrate (kbit/s)" msgstr "Min. datahastighet (kbit/s)" -#: ../gtk-glade/propertybox.c:271 +#: ../gtk-glade/propertybox.c:283 msgid "Parameters" msgstr "Parametrar" -#: ../gtk-glade/propertybox.c:298 ../gtk-glade/propertybox.c:437 +#: ../gtk-glade/propertybox.c:312 ../gtk-glade/propertybox.c:451 msgid "Enabled" msgstr "På" -#: ../gtk-glade/propertybox.c:299 ../gtk-glade/propertybox.c:437 +#: ../gtk-glade/propertybox.c:313 ../gtk-glade/propertybox.c:451 msgid "Disabled" msgstr "Av" -#: ../gtk-glade/propertybox.c:482 +#: ../gtk-glade/propertybox.c:496 msgid "Account" msgstr "Konto" -#: ../gtk-glade/propertybox.c:622 +#: ../gtk-glade/propertybox.c:636 msgid "English" msgstr "Engelska" -#: ../gtk-glade/propertybox.c:623 +#: ../gtk-glade/propertybox.c:637 msgid "French" msgstr "Fransk" -#: ../gtk-glade/propertybox.c:624 +#: ../gtk-glade/propertybox.c:638 msgid "Swedish" msgstr "Svenska" -#: ../gtk-glade/propertybox.c:625 +#: ../gtk-glade/propertybox.c:639 msgid "Italian" msgstr "Italiensk" -#: ../gtk-glade/propertybox.c:626 +#: ../gtk-glade/propertybox.c:640 msgid "Spanish" msgstr "Spanska" -#: ../gtk-glade/propertybox.c:627 +#: ../gtk-glade/propertybox.c:641 msgid "Brazilian Portugese" msgstr "Portugisiska" -#: ../gtk-glade/propertybox.c:628 +#: ../gtk-glade/propertybox.c:642 msgid "Polish" msgstr "Polska" -#: ../gtk-glade/propertybox.c:629 +#: ../gtk-glade/propertybox.c:643 msgid "German" msgstr "Tyska" -#: ../gtk-glade/propertybox.c:630 +#: ../gtk-glade/propertybox.c:644 msgid "Russian" msgstr "Ryska" -#: ../gtk-glade/propertybox.c:631 +#: ../gtk-glade/propertybox.c:645 msgid "Japanese" msgstr "Japanska" -#: ../gtk-glade/propertybox.c:632 +#: ../gtk-glade/propertybox.c:646 msgid "Dutch" msgstr "Nederländksa" -#: ../gtk-glade/propertybox.c:633 +#: ../gtk-glade/propertybox.c:647 msgid "Hungarian" msgstr "Hungerska" -#: ../gtk-glade/propertybox.c:634 +#: ../gtk-glade/propertybox.c:648 msgid "Czech" msgstr "Tjekiska" -#: ../gtk-glade/propertybox.c:635 +#: ../gtk-glade/propertybox.c:649 msgid "Chinese" msgstr "Kinesiska" -#: ../gtk-glade/propertybox.c:692 +#: ../gtk-glade/propertybox.c:706 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." @@ -726,7 +732,7 @@ msgstr "Godkänn" msgid "Decline" msgstr "Avböj" -#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:368 +#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:369 msgid "Incoming call" msgstr "Inkommande samtal" @@ -983,18 +989,6 @@ msgstr "default ljudkort" msgid "default soundcard\n" msgstr "default ljudkort\n" -#: ../gtk-glade/parameters.glade.h:65 -msgid "gtk-go-down" -msgstr "" - -#: ../gtk-glade/parameters.glade.h:66 -msgid "gtk-go-up" -msgstr "" - -#: ../gtk-glade/parameters.glade.h:67 -msgid "gtk-media-play" -msgstr "" - #: ../gtk-glade/buddylookup.glade.h:1 msgid "Search somebody" msgstr "Sök efter kontakter" @@ -1015,26 +1009,26 @@ msgstr "Linphone" msgid "Please wait" msgstr "Vänta" -#: ../coreapi/linphonecore.c:310 +#: ../coreapi/linphonecore.c:311 #, 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:356 +#: ../coreapi/linphonecore.c:357 msgid "aborted" msgstr "avbrytade" -#: ../coreapi/linphonecore.c:359 +#: ../coreapi/linphonecore.c:360 msgid "completed" msgstr "avslutade" -#: ../coreapi/linphonecore.c:362 +#: ../coreapi/linphonecore.c:363 msgid "missed" msgstr "missade" -#: ../coreapi/linphonecore.c:367 +#: ../coreapi/linphonecore.c:368 #, c-format msgid "" "%s at %s\n" @@ -1049,11 +1043,11 @@ msgstr "" "Status: %s\n" "Längd: %i min %i sek\n" -#: ../coreapi/linphonecore.c:368 +#: ../coreapi/linphonecore.c:369 msgid "Outgoing call" msgstr "Utgående samtal" -#: ../coreapi/linphonecore.c:625 +#: ../coreapi/linphonecore.c:626 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" @@ -1061,23 +1055,23 @@ 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:1074 +#: ../coreapi/linphonecore.c:1083 msgid "Ready" msgstr "Redo" -#: ../coreapi/linphonecore.c:1505 +#: ../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:1703 +#: ../coreapi/linphonecore.c:1725 msgid "Looking for telephone number destination..." msgstr "Leta efter telefonnummer för destinationen..." -#: ../coreapi/linphonecore.c:1705 +#: ../coreapi/linphonecore.c:1727 msgid "Could not resolve this number." msgstr "Kan inte nå dett nummer." -#: ../coreapi/linphonecore.c:1749 +#: ../coreapi/linphonecore.c:1771 msgid "" "Could not parse given sip address. A sip url usually looks like sip:" "user@domain" @@ -1085,27 +1079,27 @@ msgstr "" "Kan inte förstå angiven SIP adress. En SIP adress vanligen ser ut som sip:" "användare@domänen" -#: ../coreapi/linphonecore.c:1890 +#: ../coreapi/linphonecore.c:1912 msgid "Contacting" msgstr "Kontaktar" -#: ../coreapi/linphonecore.c:1896 +#: ../coreapi/linphonecore.c:1918 msgid "could not call" msgstr "Kunde inte ringa" -#: ../coreapi/linphonecore.c:1942 +#: ../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:2337 ../coreapi/callbacks.c:32 +#: ../coreapi/linphonecore.c:2370 ../coreapi/callbacks.c:32 msgid "Connected." msgstr "Kopplad" -#: ../coreapi/linphonecore.c:2371 +#: ../coreapi/linphonecore.c:2404 msgid "Call ended" msgstr "Samtalet slut" -#: ../coreapi/misc.c:142 +#: ../coreapi/misc.c:147 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the pcm oss emulation module\n" @@ -1117,7 +1111,7 @@ msgstr "" "saknas och linphone behöver ha det. Var god exekvera\n" "'modprobe snd-pcm-oss' som root för att ladda in den." -#: ../coreapi/misc.c:145 +#: ../coreapi/misc.c:150 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the mixer oss emulation module\n" @@ -1129,7 +1123,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:492 +#: ../coreapi/misc.c:497 msgid "Stun lookup in progress..." msgstr "STUN uppslagning pågår..." @@ -1244,49 +1238,49 @@ msgstr "Användaren vill inte bli störd." msgid "Call declined." msgstr "Samtalet avböjdes." -#: ../coreapi/callbacks.c:280 +#: ../coreapi/callbacks.c:281 #, fuzzy msgid "No response." msgstr "Inget svar inom angiven tid" -#: ../coreapi/callbacks.c:283 -msgid "Error." +#: ../coreapi/callbacks.c:284 +msgid "Protocol error." msgstr "" -#: ../coreapi/callbacks.c:296 +#: ../coreapi/callbacks.c:298 #, fuzzy msgid "Redirected" msgstr "Omdirigerat till %s..." -#: ../coreapi/callbacks.c:304 +#: ../coreapi/callbacks.c:308 msgid "Not found" msgstr "" -#: ../coreapi/callbacks.c:312 +#: ../coreapi/callbacks.c:318 msgid "No common codecs" msgstr "" -#: ../coreapi/callbacks.c:316 +#: ../coreapi/callbacks.c:324 #, fuzzy msgid "Call failed." msgstr "Samtalet avböjdes." -#: ../coreapi/callbacks.c:365 +#: ../coreapi/callbacks.c:374 #, c-format msgid "Registration on %s successful." msgstr "Registrering hos %s lyckades." -#: ../coreapi/callbacks.c:366 +#: ../coreapi/callbacks.c:375 #, c-format msgid "Unregistration on %s done." msgstr "Avregistrering hos %s lyckades." -#: ../coreapi/callbacks.c:374 +#: ../coreapi/callbacks.c:383 #, c-format msgid "Registration on %s failed: %s" msgstr "Registrering hos %s mislyckades: %s" -#: ../coreapi/callbacks.c:374 +#: ../coreapi/callbacks.c:383 msgid "no response timeout" msgstr "Inget svar inom angiven tid" @@ -1306,11 +1300,11 @@ msgstr "Alsa ljud ingång" msgid "Alsa sound output" msgstr "Also ljud utgång" -#: ../mediastreamer2/src/aqsnd.c:1005 +#: ../mediastreamer2/src/aqsnd.c:1008 msgid "Sound capture filter for MacOS X Audio Queue Service" msgstr "" -#: ../mediastreamer2/src/aqsnd.c:1029 +#: ../mediastreamer2/src/aqsnd.c:1032 msgid "Sound playback filter for MacOS X Audio Queue Service" msgstr "" @@ -1326,11 +1320,11 @@ msgstr "Hög hastighet GSM codec" msgid "The GSM codec" msgstr "GSM codec" -#: ../mediastreamer2/src/macsnd.c:670 +#: ../mediastreamer2/src/macsnd.c:1083 msgid "Sound capture filter for MacOS X Core Audio drivers" msgstr "" -#: ../mediastreamer2/src/macsnd.c:684 +#: ../mediastreamer2/src/macsnd.c:1098 msgid "Sound playback filter for MacOS X Core Audio drivers" msgstr "" @@ -1375,7 +1369,7 @@ msgstr "Den fria speex codec" msgid "A filter that controls and measure sound volume" msgstr "Ett filter som kontrollerar och mäter ljudvolym" -#: ../mediastreamer2/src/msv4l.c:1009 +#: ../mediastreamer2/src/msv4l.c:1011 msgid "A video4linux compatible source filter to stream pictures." msgstr "En video4linux kompatibel ingångsfilter för att strömma bilder" diff --git a/po/zh_CN.po b/po/zh_CN.po index e33fa8ab9..92b458054 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: linphone 0.7.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-02 10:28+0200\n" +"POT-Creation-Date: 2010-04-22 17:16+0200\n" "PO-Revision-Date: 2009-09-24 18:39+0300\n" "Last-Translator: Jiang Honglei\n" "Language-Team: Jiang Honglei\n" @@ -25,39 +25,39 @@ msgstr "无法打开图像文件: %s" msgid "Chat with %s" msgstr "与 %s 聊天" -#: ../gtk-glade/main.c:92 +#: ../gtk-glade/main.c:94 msgid "log to stdout some debug information while running." msgstr "" -#: ../gtk-glade/main.c:99 +#: ../gtk-glade/main.c:101 msgid "Start only in the system tray, do not show the main interface." msgstr "" -#: ../gtk-glade/main.c:106 +#: ../gtk-glade/main.c:108 msgid "address to call right now" msgstr "" -#: ../gtk-glade/main.c:113 +#: ../gtk-glade/main.c:115 msgid "if set automatically answer incoming calls" msgstr "是否设置呼叫自动应答" -#: ../gtk-glade/main.c:121 +#: ../gtk-glade/main.c:123 msgid "" "Specifiy a working directory (should be the base of the installation, eg: c:" "\\Program Files\\Linphone)" msgstr "" -#: ../gtk-glade/main.c:396 +#: ../gtk-glade/main.c:402 #, fuzzy, c-format msgid "Call with %s" msgstr "与 %s 聊天" -#: ../gtk-glade/main.c:707 +#: ../gtk-glade/main.c:720 #, c-format msgid "Incoming call from %s" msgstr "来自 %s 的呼叫" -#: ../gtk-glade/main.c:746 +#: ../gtk-glade/main.c:759 #, c-format msgid "" "%s would like to add you to his contact list.\n" @@ -69,31 +69,37 @@ msgstr "" "你是否允许他看到你的在线状态或者将它加为你的好友允许?\n" "如果你回答否，则会将该人临时性的放入黑名单" -#: ../gtk-glade/main.c:824 +#: ../gtk-glade/main.c:837 #, fuzzy, c-format msgid "" "Please enter your password for username %s\n" " at domain %s:" msgstr "请输入你的密码 %s:" -#: ../gtk-glade/main.c:921 +#: ../gtk-glade/main.c:934 msgid "Website link" msgstr "" -#: ../gtk-glade/main.c:957 +#: ../gtk-glade/main.c:970 msgid "Linphone - a video internet phone" msgstr "Linphone - 互联网视频电话" -#: ../gtk-glade/main.c:976 +#: ../gtk-glade/main.c:989 #, c-format msgid "%s (Default)" msgstr "%s (缺省)" -#: ../gtk-glade/main.c:1229 +#: ../gtk-glade/main.c:1221 +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 msgid "A free SIP video-phone" msgstr "免费的 SIP 视频电话" -#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:247 +#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:258 #: ../gtk-glade/contact.glade.h:3 msgid "Name" msgstr "名字" @@ -136,91 +142,91 @@ msgstr "删除好友 '%s'" msgid "Add new contact from %s directory" msgstr "从 %s 目录增加好友 " -#: ../gtk-glade/propertybox.c:253 +#: ../gtk-glade/propertybox.c:264 msgid "Rate (Hz)" msgstr "采样率 (Hz)" -#: ../gtk-glade/propertybox.c:259 +#: ../gtk-glade/propertybox.c:270 msgid "Status" msgstr "状态" -#: ../gtk-glade/propertybox.c:265 +#: ../gtk-glade/propertybox.c:276 msgid "Min bitrate (kbit/s)" msgstr "最小速率 (kbit/s)" -#: ../gtk-glade/propertybox.c:271 +#: ../gtk-glade/propertybox.c:283 msgid "Parameters" msgstr "参数设置" -#: ../gtk-glade/propertybox.c:298 ../gtk-glade/propertybox.c:437 +#: ../gtk-glade/propertybox.c:312 ../gtk-glade/propertybox.c:451 msgid "Enabled" msgstr "启用" -#: ../gtk-glade/propertybox.c:299 ../gtk-glade/propertybox.c:437 +#: ../gtk-glade/propertybox.c:313 ../gtk-glade/propertybox.c:451 msgid "Disabled" msgstr "禁用" -#: ../gtk-glade/propertybox.c:482 +#: ../gtk-glade/propertybox.c:496 msgid "Account" msgstr "账号" -#: ../gtk-glade/propertybox.c:622 +#: ../gtk-glade/propertybox.c:636 msgid "English" msgstr "" -#: ../gtk-glade/propertybox.c:623 +#: ../gtk-glade/propertybox.c:637 msgid "French" msgstr "Français" -#: ../gtk-glade/propertybox.c:624 +#: ../gtk-glade/propertybox.c:638 msgid "Swedish" msgstr "" -#: ../gtk-glade/propertybox.c:625 +#: ../gtk-glade/propertybox.c:639 msgid "Italian" msgstr "" -#: ../gtk-glade/propertybox.c:626 +#: ../gtk-glade/propertybox.c:640 msgid "Spanish" msgstr "" -#: ../gtk-glade/propertybox.c:627 +#: ../gtk-glade/propertybox.c:641 msgid "Brazilian Portugese" msgstr "" -#: ../gtk-glade/propertybox.c:628 +#: ../gtk-glade/propertybox.c:642 msgid "Polish" msgstr "" -#: ../gtk-glade/propertybox.c:629 +#: ../gtk-glade/propertybox.c:643 msgid "German" msgstr "" -#: ../gtk-glade/propertybox.c:630 +#: ../gtk-glade/propertybox.c:644 msgid "Russian" msgstr "русский язык" -#: ../gtk-glade/propertybox.c:631 +#: ../gtk-glade/propertybox.c:645 msgid "Japanese" msgstr "日本語" -#: ../gtk-glade/propertybox.c:632 +#: ../gtk-glade/propertybox.c:646 msgid "Dutch" msgstr "Nederlands" -#: ../gtk-glade/propertybox.c:633 +#: ../gtk-glade/propertybox.c:647 msgid "Hungarian" msgstr "Magyar" -#: ../gtk-glade/propertybox.c:634 +#: ../gtk-glade/propertybox.c:648 msgid "Czech" msgstr "čeština" -#: ../gtk-glade/propertybox.c:635 +#: ../gtk-glade/propertybox.c:649 msgid "Chinese" msgstr "简体中文" -#: ../gtk-glade/propertybox.c:692 +#: ../gtk-glade/propertybox.c:706 msgid "" "You need to restart linphone for the new language selection to take effect." msgstr "你需要重新启动linphone以使你的语言选择生效" @@ -744,7 +750,7 @@ msgstr "接受" msgid "Decline" msgstr "拒绝" -#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:368 +#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:369 msgid "Incoming call" msgstr "呼入" @@ -1014,18 +1020,6 @@ msgstr "缺省声卡" msgid "default soundcard\n" msgstr "缺省声卡\n" -#: ../gtk-glade/parameters.glade.h:65 -msgid "gtk-go-down" -msgstr "" - -#: ../gtk-glade/parameters.glade.h:66 -msgid "gtk-go-up" -msgstr "" - -#: ../gtk-glade/parameters.glade.h:67 -msgid "gtk-media-play" -msgstr "" - #: ../gtk-glade/buddylookup.glade.h:1 msgid "Search somebody" msgstr "查找用户" @@ -1046,26 +1040,26 @@ msgstr "Linphone" msgid "Please wait" msgstr "请等待" -#: ../coreapi/linphonecore.c:310 +#: ../coreapi/linphonecore.c:311 #, fuzzy, c-format msgid "You have missed %i call." msgid_plural "You have missed %i calls." msgstr[0] "你丢失 %i 呼叫." msgstr[1] "你共丢失 %i 次呼叫." -#: ../coreapi/linphonecore.c:356 +#: ../coreapi/linphonecore.c:357 msgid "aborted" msgstr "中断" -#: ../coreapi/linphonecore.c:359 +#: ../coreapi/linphonecore.c:360 msgid "completed" msgstr "完成" -#: ../coreapi/linphonecore.c:362 +#: ../coreapi/linphonecore.c:363 msgid "missed" msgstr "丢失" -#: ../coreapi/linphonecore.c:367 +#: ../coreapi/linphonecore.c:368 #, c-format msgid "" "%s at %s\n" @@ -1080,60 +1074,60 @@ msgstr "" "Status: %s\n" "Status: %i min %i sec\n" -#: ../coreapi/linphonecore.c:368 +#: ../coreapi/linphonecore.c:369 msgid "Outgoing call" msgstr "呼出" -#: ../coreapi/linphonecore.c:625 +#: ../coreapi/linphonecore.c:626 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. " -#: ../coreapi/linphonecore.c:1074 +#: ../coreapi/linphonecore.c:1083 msgid "Ready" msgstr "就绪" -#: ../coreapi/linphonecore.c:1505 +#: ../coreapi/linphonecore.c:1513 msgid "Remote end seems to have disconnected, the call is going to be closed." msgstr "对方断开连接, 通话终止." -#: ../coreapi/linphonecore.c:1703 +#: ../coreapi/linphonecore.c:1725 msgid "Looking for telephone number destination..." msgstr "查询对方电话号码.." -#: ../coreapi/linphonecore.c:1705 +#: ../coreapi/linphonecore.c:1727 msgid "Could not resolve this number." msgstr "该号码无法解析." -#: ../coreapi/linphonecore.c:1749 +#: ../coreapi/linphonecore.c:1771 msgid "" "Could not parse given sip address. A sip url usually looks like sip:" "user@domain" msgstr "无法解析给定的SIP地址. SIP url 应有如下格式: " -#: ../coreapi/linphonecore.c:1890 +#: ../coreapi/linphonecore.c:1912 msgid "Contacting" msgstr "联系中" -#: ../coreapi/linphonecore.c:1896 +#: ../coreapi/linphonecore.c:1918 msgid "could not call" msgstr "无法呼叫" -#: ../coreapi/linphonecore.c:1942 +#: ../coreapi/linphonecore.c:1965 msgid "Sorry, having multiple simultaneous calls is not supported yet !" msgstr "抱歉, 还不支持并发多路呼叫!" -#: ../coreapi/linphonecore.c:2337 ../coreapi/callbacks.c:32 +#: ../coreapi/linphonecore.c:2370 ../coreapi/callbacks.c:32 msgid "Connected." msgstr "连接建立." -#: ../coreapi/linphonecore.c:2371 +#: ../coreapi/linphonecore.c:2404 msgid "Call ended" msgstr "呼叫结束" -#: ../coreapi/misc.c:142 +#: ../coreapi/misc.c:147 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the pcm oss emulation module\n" @@ -1145,7 +1139,7 @@ msgstr "" "is missing and linphone needs it. Please execute\n" "'modprobe snd-pcm-oss' as root to load it." -#: ../coreapi/misc.c:145 +#: ../coreapi/misc.c:150 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the mixer oss emulation module\n" @@ -1157,7 +1151,7 @@ msgstr "" "is missing and linphone needs it. Please execute\n" " 'modprobe snd-mixer-oss' as root to load it." -#: ../coreapi/misc.c:492 +#: ../coreapi/misc.c:497 msgid "Stun lookup in progress..." msgstr "正在进行Stun查找..." @@ -1272,49 +1266,49 @@ msgstr "用户开启免打扰功能." msgid "Call declined." msgstr "呼叫被拒绝." -#: ../coreapi/callbacks.c:280 +#: ../coreapi/callbacks.c:281 #, fuzzy msgid "No response." msgstr "没有响应，超时" -#: ../coreapi/callbacks.c:283 -msgid "Error." +#: ../coreapi/callbacks.c:284 +msgid "Protocol error." msgstr "" -#: ../coreapi/callbacks.c:296 +#: ../coreapi/callbacks.c:298 #, fuzzy msgid "Redirected" msgstr "重定向到 %s..." -#: ../coreapi/callbacks.c:304 +#: ../coreapi/callbacks.c:308 msgid "Not found" msgstr "" -#: ../coreapi/callbacks.c:312 +#: ../coreapi/callbacks.c:318 msgid "No common codecs" msgstr "" -#: ../coreapi/callbacks.c:316 +#: ../coreapi/callbacks.c:324 #, fuzzy msgid "Call failed." msgstr "呼叫被拒绝." -#: ../coreapi/callbacks.c:365 +#: ../coreapi/callbacks.c:374 #, c-format msgid "Registration on %s successful." msgstr "成功注册到 %s " -#: ../coreapi/callbacks.c:366 +#: ../coreapi/callbacks.c:375 #, fuzzy, c-format msgid "Unregistration on %s done." msgstr "成功注册到 %s " -#: ../coreapi/callbacks.c:374 +#: ../coreapi/callbacks.c:383 #, c-format msgid "Registration on %s failed: %s" msgstr "注册到 %s 失败: %s" -#: ../coreapi/callbacks.c:374 +#: ../coreapi/callbacks.c:383 msgid "no response timeout" msgstr "没有响应，超时" @@ -1335,11 +1329,11 @@ msgstr "ALSA音频源" msgid "Alsa sound output" msgstr "ALSA音频输出" -#: ../mediastreamer2/src/aqsnd.c:1005 +#: ../mediastreamer2/src/aqsnd.c:1008 msgid "Sound capture filter for MacOS X Audio Queue Service" msgstr "" -#: ../mediastreamer2/src/aqsnd.c:1029 +#: ../mediastreamer2/src/aqsnd.c:1032 msgid "Sound playback filter for MacOS X Audio Queue Service" msgstr "" @@ -1355,11 +1349,11 @@ msgstr "" msgid "The GSM codec" msgstr "" -#: ../mediastreamer2/src/macsnd.c:670 +#: ../mediastreamer2/src/macsnd.c:1083 msgid "Sound capture filter for MacOS X Core Audio drivers" msgstr "" -#: ../mediastreamer2/src/macsnd.c:684 +#: ../mediastreamer2/src/macsnd.c:1098 msgid "Sound playback filter for MacOS X Core Audio drivers" msgstr "" @@ -1404,7 +1398,7 @@ msgstr "" msgid "A filter that controls and measure sound volume" msgstr "" -#: ../mediastreamer2/src/msv4l.c:1009 +#: ../mediastreamer2/src/msv4l.c:1011 msgid "A video4linux compatible source filter to stream pictures." msgstr "" From b382cb6ea00c3c707f3edb6d5c54247883c7605c Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Thu, 22 Apr 2010 22:14:34 +0200 Subject: [PATCH 19/25] improve NAT friendlyness (use received/rport from 4xx answers to OPTIONS), and in last resort, default proxy fixed contact address. --- coreapi/linphonecore.c | 24 ++++++++++++++---------- coreapi/sal_eXosip2.c | 14 +++++++++----- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index 3ada9e8c9..3307ee74c 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -1851,14 +1851,7 @@ static char *get_fixed_contact(LinphoneCore *lc, LinphoneCall *call , LinphonePr if (call->op && sal_op_get_contact(call->op)!=NULL){ return NULL; } - /*if using a proxy, use the contact address as guessed with the REGISTERs*/ - if (dest_proxy && dest_proxy->op){ - const char *fixed_contact=sal_op_get_contact(dest_proxy->op); - if (fixed_contact) { - ms_message("Contact has been fixed using proxy to %s",fixed_contact); - return ms_strdup(fixed_contact); - } - } + /* if the ping OPTIONS request succeeded use the contact guessed from the received, rport*/ if (call->ping_op){ @@ -1868,6 +1861,15 @@ static char *get_fixed_contact(LinphoneCore *lc, LinphoneCall *call , LinphonePr return ms_strdup(guessed); } } + + /*if using a proxy, use the contact address as guessed with the REGISTERs*/ + if (dest_proxy && dest_proxy->op){ + const char *fixed_contact=sal_op_get_contact(dest_proxy->op); + if (fixed_contact) { + ms_message("Contact has been fixed using proxy to %s",fixed_contact); + return ms_strdup(fixed_contact); + } + } ctt=linphone_core_get_primary_contact_parsed(lc); @@ -2342,6 +2344,7 @@ void linphone_core_stop_media_streams(LinphoneCore *lc, LinphoneCall *call){ int linphone_core_accept_call(LinphoneCore *lc, const char *url) { LinphoneCall *call=lc->call; + LinphoneProxyConfig *cfg=NULL; const char *contact=NULL; if (call==NULL){ @@ -2360,9 +2363,10 @@ int linphone_core_accept_call(LinphoneCore *lc, const char *url) ms_message("ring stopped"); lc->ringstream=NULL; } - + + linphone_core_get_default_proxy(lc,&cfg); /*try to be best-effort in giving real local or routable contact address*/ - contact=get_fixed_contact(lc,call,NULL); + contact=get_fixed_contact(lc,call,cfg); if (contact) sal_op_set_contact(call->op,contact); diff --git a/coreapi/sal_eXosip2.c b/coreapi/sal_eXosip2.c index 78d2df7de..8bb9e8939 100644 --- a/coreapi/sal_eXosip2.c +++ b/coreapi/sal_eXosip2.c @@ -872,17 +872,19 @@ static void call_accepted(Sal *sal, eXosip_event_t *ev){ } static void call_terminated(Sal *sal, eXosip_event_t *ev){ - char *from; + char *from=NULL; SalOp *op=find_op(sal,ev); if (op==NULL){ ms_warning("Call terminated for already closed call ?"); return; } - osip_from_to_str(ev->request->from,&from); + 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); - osip_free(from); + sal->callbacks.call_terminated(op,from!=NULL ? from : sal_op_get_from(op)); + if (from) osip_free(from); } static void call_released(Sal *sal, eXosip_event_t *ev){ @@ -1399,7 +1401,8 @@ static void other_request_reply(Sal *sal,eXosip_event_t *ev){ } if (ev->response){ update_contact_from_response(op,ev->response); - sal->callbacks.ping_reply(op); + if (ev->request && strcmp(osip_message_get_method(ev->request),"OPTIONS")==0) + sal->callbacks.ping_reply(op); } } @@ -1517,6 +1520,7 @@ static bool_t process_event(Sal *sal, eXosip_event_t *ev){ if (ev->response && (ev->response->status_code == 407 || ev->response->status_code == 401)){ return process_authentication(sal,ev); } + other_request_reply(sal,ev); break; default: ms_message("Unhandled exosip event ! %i",ev->type); From 1cb2b66ca1ae52de69f2e4cf34c47d131a531944 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Fri, 23 Apr 2010 11:09:39 +0200 Subject: [PATCH 20/25] add history png --- pixmaps/history-orange.png | Bin 0 -> 1695 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 pixmaps/history-orange.png diff --git a/pixmaps/history-orange.png b/pixmaps/history-orange.png new file mode 100644 index 0000000000000000000000000000000000000000..dc9bbf60a49ca2e39ba627d780a0c8122139913a GIT binary patch literal 1695 zcmV;Q24MM#P)P000*V1^@s6{^R5m00001b5ch_0Itp) z=>Px#32;bRa{vGh*8l(w*8xH(n|J^K00(qQO+^RV1Q!ViAiG)3KmY&+F-b&0R7l62 zlz&W>*BQsZ&pGG)bzk6m1epi7=>|`^Ml;=ZJ+( zFwv%j|9I5Me9Z`CU(r|8h5?)8NW!l*fNrNkm|F0P5(A zAOM*9s>H&!0pQk$jY$;ju{YGc$!k5f@^GavXH7I5s)bk(7LwU^*1Ar-PtX?1L#o7GL zxHdS7MDFALN5m3KjSZXvfQE*KNk#Sb^&juw-La+TsnuU!-Ey73GM<(T()7%jF>3){ zAuzSkw_GtZAoEI`_uM=ZBR#Lb?G!cjMi_)lya@ooU~p2&M8|ys_Zur7U3V>!@&Pmx zj^maC0E1>OCYeCr{m=8^-iz`18EW0X`l9D#Y-m-*)6X<*-@YBCrKR|P)YR0VwY3!h zFlx_!M(Td(v5-qLZMrmD{Z;Nb#QJV z#nhGwXg0uHB@D}nUT*1`NZ7S&*Bw36q%Z>zCYWv^5s&3ErCB3T#HMAYkH5L&fK;b$ z#eEim8n|$4HEdl814{Q{c=)D|K{H-J$}~0`SM5mIUY))Kr~}Wk&s2eLDhB}4d~3Mw z!$8DCEIKyC=tkQc&g_RVW#D~wxOT-d0HDXVN_BKAzoXknZa|LqLyZk+WCuMpawT7q zcmiqZ>dd(gXo8<%v@vphaQY)ZCkA9+eCKCs-_s=kK*i5`^5pM?Jl*)eEz)JAX`E6r z902g3ZDUp%Vq*#S{P_=IS-yP)0HF>Q_~G?eZ)UMUl9EQ0lUys7{b)A;sO}>SiE*Jc zpG(4o5+)!F5I2|-I%odu#Dvco`RHX~rG%iFa{vBj*4x{gShud+6#boNk(EQkB?k^} zE(!)WW+X27A<>vP{&LW`82UBcLlQu8vKj!m;d94?kva2oLbtvpQv4w>fm5eWv-bA3 z*peknb^!n#I&=t2mo5cxnEv{==;4B3^ecCZFuJx0Ve z^z@C&2aAgXN!R5WcV(AxUrHHt`yS~^oI2f(mX;P+rnz_R+O?~QNYd>=N0pV8s<5;w zt77@0ru^B#MRQmm>{J`D{U1R}f-vi#r5NBQpy>&4^C1|%c@SnmI?@`8Cvl?XBrbJc z!bmvWxM9PF-9m`HU0q!yZVx(jNGU8O>KE3JS3X(n)n87t9?MDR#x!o zNN9F&N{T%-5J=T!93(V&%s_P9iQgC)l%tVIG9Hh|W6@|QXKdS-7cbsZP*9)%Kq*B; z^xu+(h6YqrRD66se{9cpYu-9}bzaVlZyG|}&y+J0L{N&9=XuFQV!X?BocD>)WZU-P pP$)DE0CjbB&~+W<<>df?{{W7qr0wkM0FVFx002ovPDHLkV1k$%HaY+R literal 0 HcmV?d00001 From e420bcdd54b65f1af0ca4a76ddd5e1792f2c703b Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 26 Apr 2010 11:16:26 +0200 Subject: [PATCH 21/25] use ip address from via if received is not there. --- coreapi/sal_eXosip2.c | 1 + 1 file changed, 1 insertion(+) diff --git a/coreapi/sal_eXosip2.c b/coreapi/sal_eXosip2.c index 8bb9e8939..afbc4f85f 100644 --- a/coreapi/sal_eXosip2.c +++ b/coreapi/sal_eXosip2.c @@ -370,6 +370,7 @@ static int extract_received_rport(osip_message_t *msg, const char **received, in rport=param->gvalue; if (rport && rport[0]!='\0') *rportval=atoi(rport); else *rportval=5060; + *received=via->host; } param=NULL; osip_via_param_get_byname(via,"received",¶m); From 3f8bb1163a9a0743fe5761a37bc8d07d24cbe39f Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 26 Apr 2010 16:57:22 +0200 Subject: [PATCH 22/25] fix deprecated category --- share/linphone.desktop.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/linphone.desktop.in b/share/linphone.desktop.in index cde170df2..7a490a74d 100644 --- a/share/linphone.desktop.in +++ b/share/linphone.desktop.in @@ -7,4 +7,4 @@ Type=Application Exec=linphone-3 Icon=@prefix@/share/pixmaps/linphone/linphone.png Terminal=false -Categories=Application;Network; \ No newline at end of file +Categories=Network;Telephony; \ No newline at end of file From 5b2b734421b32d8ab0ff57306c2704476d624dba Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Mon, 26 Apr 2010 17:22:20 +0200 Subject: [PATCH 23/25] add linphone_core_is_network_reachabled function --- coreapi/linphonecore.c | 3 +++ coreapi/linphonecore.h | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index 3307ee74c..eb2a58f93 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -3583,6 +3583,9 @@ void linphone_core_set_network_reachable(LinphoneCore* lc,bool_t isReachable) { set_network_reachable(lc,isReachable); } +bool_t linphone_core_is_network_reachabled(LinphoneCore* lc) { + return lc->network_reachable; +} ortp_socket_t linphone_core_get_sip_socket(LinphoneCore *lc){ return sal_get_socket(lc->sal); } diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h index 8ef28f9ed..945ea25ea 100644 --- a/coreapi/linphonecore.h +++ b/coreapi/linphonecore.h @@ -754,6 +754,10 @@ void linphone_core_set_mtu(LinphoneCore *lc, int mtu); * */ void linphone_core_set_network_reachable(LinphoneCore* lc,bool_t value); +/** + * return network state either as positioned by the application or by linphone + */ +bool_t linphone_core_is_network_reachabled(LinphoneCore* lc); void *linphone_core_get_user_data(LinphoneCore *lc); From 8a33bd70ef7a24a76190d7a2e84c33f8a341ab01 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 26 Apr 2010 21:59:32 +0200 Subject: [PATCH 24/25] archive new ico file (with multiple resolutions) --- gtk-glade/linphone.ico | Bin 16958 -> 97566 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gtk-glade/linphone.ico b/gtk-glade/linphone.ico index 7232763bbdc0d7a47bc886c48d75595429e75364..2633d58f3abe625df023391acf491cbe6beafa6b 100755 GIT binary patch literal 97566 zcmeHQ2V4|K`yS%wrz!pu5@Y;K(^MNB5wZ6cyI7-9Q7o~=5;aC*7n4|Gi@h6L)YxM; z8XF?T0*Yeq1+3U_{?9XadoJhQaUdcp^SiyB-JPACdEeQYw>&c|gp4n7&hFF`?HERnT7Dl#`}%OJ8^C5 z+q~a+JTI#df&b(ErsMw;;{QI;?$0gS{6~mYxMsXRw+Mb!h>r?s_vaS#@SHzNX!qmz zb0MnN5Tb8i=9gRK&FUl)x(SgNbwE;_;dx|=&{zFG{+GATE^+tX15spnj99$=lK5_7 ztjO!XOVq{j=q0B``5ya3m*7>RV2e=U-Z4UW{;*FRK7C7Eyn0u>v9EB~@pXzf3mE>% zC&6EO72AKaPMI5dy^3}D(yQBm&%BC_x*Z#P@blOst0#ws{`4?(cdyXUow9f6y8h>f zU(XvD*!#NW6ld|K}jqR|9|O>Pq=tgM+iICw~a?~u5j!NIrc4)NI& z8{4MOx!~YI^9IMZ&KnywY+rD2@ZTMxgM(wEhDQYl4_qF5K5t&1fa+0|`Xe4)4q;eS zxpI}~#(FYdoM&eDV6@_umN+jN?)EwACglXzpYYf(_MBWZVZu7ssMcLO?ul)_ZsFRc zZ+D1gI014xJAdpG=(ViFF%>tS@O%_^c79)X5ajG(JbJtE_fhXfx~YSYZ+KmE{kDZM z?&hPRzuqz_H=k_p$t-%9!AojzSP!+aR3a-jXNZ$6W%_#5Sfom9bMc;9fYVZLd3aE%c~-?{mYhbcvYPrW>yeFtZ6ZaQA!>HI;3XS1ENFKdQPYv+B9-9OGG4s7QhUH6J2BMuAKmU~2viRj0EJRs_K zSts(LA3J^Nw)kc7X|XyiPW5H^8-=KTO|^58CAgnP8`D0x2lCJISpXWk3ZCuOE)Vnx z2=vL@S%^x7&|Li&tXnq+t$f;U9{AVk&^b$aFE6h~li6cUtW#)-T#iF8uezOIY31*~ za2ij`2NV4p%8AAszU=1Z)flJaAINya-8zj7msEPMFZ&nr50`THoH7k@$I3eLflBZ1 z+uv)xe6SX8pkKJbu-t2E{48~YZ~sD*We84t`Ni}6#`xvxe22G-NI8m8KV-MuYm=!! z9o}9dOkk4{;;PUn+bhQDD2iB_>P$({b*`xEao<@mwQvRXhF4>nzLr9BH zJU_+nQ_qHm_D0p zGJ$)w)1S1BGmJ4FRLlMu#{pv~ze(PmX^iIiu#7qNCvBy?Z@M`$S6wZ2xpq_IFRw5i zm41IxOH;Jn1kkmb=^!$f++CLg$Nt8kkKDj0L*)A)!@32H7EAzN4Dqv#XEF5W0J9#2 zG1_@&=UlvB3uARHDgT;jIQ?M4x{U^TF{g7s;|~ccG+MB3?VKi&t=7o9y7Z5tZ~rN4 zJvw?6%b9)QQe8feE;yU}2i-Z_QI;gff}GBQh*+j-8yflHn#3m~ahPk`UFTe~bfODu z*7`SEFIVMkdpYLz-$>l>T~(F1>U1^$#YkiI;b0mXJ^sl(G$!}@5c_MN3fPk+aJW~JM79n7VK})=WvWifLz{}d-S~8o`)I1aSHS` zB~^RSaWjuW*W=uS&Wi4DTIv^BdDZ5K$8pB}yGSJ;dqIAtY@8qZMd6``1h3_57$Qo{ zJRy7sMT^2i4vF~N_eH^ayF|?n>xJi!`-MwDsBnYqbr14%nKt2K`2172wn6wd3l*M? zcZ=}7(W3rZ*)Tl9+-{UM+4*nd?Nn|4f`I)7W-x%W`a z|M!ykVayTH`PUe+WYY!V6MRtI!gFIz+!7b!?g~F#Tf5`3=sf+nXfi%l4BBvB)P){Y zxND@Sg)wsy^rFh64~u5gkBJpqFNxy69ulW7+!nje+!9xB+!xbVoE6QWKXn}uBPRTF zQQW@!K*U04x&ocaZ)~hszw5H-vhKWS-Y-gwT6I=bfnGIw-bqmlG^pQiizxKNURAFG z(79OmyZ0Z8Qj|4k9Tzp)ZxAkR!bHBtAtF37T8-8D8tf8YefEoj7{~J>UTo+=rHhpM zB}OzDuvIi27%j$tZeMkZ6qA;dE>WT%#`|p%@uE27+soJQi4*4%K${0*^6o35`^dwh z(=Ug_ER^kL!hLb@_)T#t?v5xi?2uRq+Et%_QZ)KKR{V^5*6O+s^6y?zGw6UA3R*Uu za#Zx5dqOPR6Q^Y7OV{p-Bd2bOTcCkY@FCF;^!RRAjOc^==iym*P`6W{T?x=K^2iO* zf6fWf68xBfauyzPP<(}YjazV9)W);(`R^1Fdk>02O+tlNyKqqtv>FAvRY3gVLxYmh z3xEa~LX2%PlCS%B-!^p8hjByR(;p(9Gmldx^QpjqQDr-~EIP4HR^zEEopKlISg`7d?Ef_$ z|KH#WZQM%vv>xMcO5o)6W!(>YWqtF1IZP>-?!Rv~==%g(0Pjs~pD^~brR?afdF$*% z-w-am`$j1})uknD66j;u=X(9HU$}RP6r~rQ7DcJgBAyR2eTi8oMB$$gi6XxpG1@Kg z9(f||J-nAZpAYvZ+6 zL{!B48H)a6&Z={&FCIO8gV==r_&fByJ<#`Ti@7eUciSaKFFzwzp>JV7M14Acqut`0 zpeXeJdql|&k)q@uCq)s&Ph7d9`u;lI_d_o+2)9lVq7?dT+N^w<>=q@_@A{!{iG%IM zv(YY50QdAn-yeGDx|jx?K49&6^c4@qrrmL(8R+!wXp{l{V9VZX#BX@UF!WpHVc#i+ zJ~Kb^V;$~;78Mtr76n^}i4rqTppQr1z4i;g0S82T_FJgKv}I>S7u4~{(UW3HWV{-C znq%zQwf~xE9K?R=l$aSFCyrno;P~g(AVhehAFkRlQiNk%TD=nM~uiY`0ay+eu zamTeogtA{O-F#7uLD_3{2@$&wToY|39~GTI`{@U+ia!?rD}LH?QA|R=eIWLRs5JAq zDqDqbBgFMv_r-10yFTh!q}d*E5j^(BIL>jWNgwb9b`W2TTP0?n5PsnO=?iy6(H`NV z?)Uq|eT>yUXgjnkvR`(=*i{_ks4vdlMq8qt%nkSY_m4t(cMEUWQds`#pgZ~I)?lY7 zfM@;)`t3CFtG-Ul!6jqSSb_xsV#LH8?n zMKRn{0b`~c=H z&)yD;&5`4+IR^^;AZ6A-_S_72v&wbccbvE6`**V*Gran0cK*C0<=hR3z1n2Z_L8S+ zEPCy=Z0Z+UUhbXvTDEMj-8<+vmHoR4H!6*lGwP~nql&k-Tr8Yfg~gRi$e)%?QSm;L zI(^;X+t#bP2cMa6Q_8nJ2mIgveT?7X(oP?3%xcs&-+4#M+4h^cD5XQ)SjGS)7bNiv&&`EKeAZtLJ{tDc_?ZhWYsX{j1Aw3#&QpiMsaD zc->uP?woI4`{@5B-`-Kb+T<)*%vV0&wbjX~Z;zZiPUqj<{tM%IRh~{eoBjOTjPHKm zwPVcXq3@g1J30NY`;RX9hwR9A)oI1>php=wIrVRKyzP&FIXPviwYEUW7r4b(FH@yP zS2z)nw)R((zF@~L#WBnc{UXOP4~#LixoTq=$26b82Zb-*2aaXMr=ib6|B)9uL&-TO z1;;3kZ|rwCrX47w>WO{9sC8lNr@T9 z#dOG{?Bm&A1VF#IbsJ+M`Yw)+nFD1YJ7+JuDZZ4z`pMx^&VXFMP1lG z24Z~ag>h>UF#)>E1<1{(FWnK77M~Go_r5qMn;Bijm0o+~qqW4r9i6 z^hY!d@9=7b%*CSoCjQ_fzs?UE>saj-q=)etmphkn)#V+!>qH}p*$ciXK*8K9R` z0goy{FY*K35-{#_jA?`ZtTgK7fqu9S=;e-nxB_Gicj!&|zeb;oagXDvFUFwy9Ah!g zQ@-H61)$TF!MR#p(8qqWTXaIbI35o{-@O%mbr8lv>SxroM*evkI@%QxarlN9H08MJ zv)z$b&tcm|9QtkA?K!@BVoc$9wgBUP^s$>_Ew&)Y0sU5=6X!tRE1<==zt3ST+$si4 zJ|^}=UlWnYe>C)^IWCs?HXQN~bi!{!MNO3bDrF>$ zjpd-%7QsgO$pvk)0NR8n>R%P~ARWt~&5}0tp)+>)IY!j!wp)#fMbXDs!+25&*C_9N zv*tY7&;wDrb-3DlwAv#|gAQ(>kq2a+Bk)bM`TM*Yi`nK}LDvFkyY6U{&3=j!^}rWb z$Y7Mmc�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 literal 16958 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 Date: Mon, 26 Apr 2010 22:18:54 +0200 Subject: [PATCH 25/25] fix debian-reported bug around resolution of local interface for host that have both ipv4 and ipv6 addresses. --- coreapi/misc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/coreapi/misc.c b/coreapi/misc.c index ae5414de6..86b527e94 100644 --- a/coreapi/misc.c +++ b/coreapi/misc.c @@ -684,7 +684,7 @@ static int get_local_ip_with_getifaddrs(int type, char *address, int size) #endif -static int get_local_ip_for_with_connect(const char *dest, char *result){ +static int get_local_ip_for_with_connect(int type, const char *dest, char *result){ int err,tmp; struct addrinfo hints; struct addrinfo *res=NULL; @@ -694,7 +694,7 @@ static int get_local_ip_for_with_connect(const char *dest, char *result){ socklen_t s; memset(&hints,0,sizeof(hints)); - hints.ai_family=PF_UNSPEC; + hints.ai_family=(type==AF_INET6) ? PF_INET6 : PF_INET; hints.ai_socktype=SOCK_DGRAM; /*hints.ai_flags=AI_NUMERICHOST|AI_CANONNAME;*/ err=getaddrinfo(dest,"5060",&hints,&res); @@ -765,5 +765,5 @@ int linphone_core_get_local_ip_for(int type, const char *dest, char *result){ } #endif /*else use connect to find the best local ip address */ - return get_local_ip_for_with_connect(dest,result); + return get_local_ip_for_with_connect(type,dest,result); }