From bffaeae923a54d024fc58f8ffc04cddc06fd78b5 Mon Sep 17 00:00:00 2001 From: smorlat Date: Tue, 29 Sep 2009 20:04:04 +0000 Subject: [PATCH] implement mute button logic. git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@688 3f6dc0c8-ddfe-455d-9043-3cd528dc4637 --- linphone/gtk-glade/incall_view.c | 29 ++++++++++++-- linphone/gtk-glade/linphone.h | 4 ++ linphone/gtk-glade/main.c | 11 ++++++ linphone/gtk-glade/main.glade | 66 ++++++++++++++++++++------------ linphone/gtk-glade/propertybox.c | 4 +- linphone/gtk-glade/support.c | 3 +- linphone/linphone.kdevelop | 36 ++++++++--------- linphone/po/cs.po | 11 ++++-- linphone/po/de.po | 6 +-- linphone/po/es.po | 6 +-- linphone/po/fr.po | 10 ++--- linphone/po/hu.po | 6 +-- linphone/po/it.po | 11 ++++-- linphone/po/ja.po | 16 ++++---- linphone/po/nl.po | 6 +-- linphone/po/pl.po | 6 +-- linphone/po/pt_BR.po | 6 +-- linphone/po/ru.po | 6 +-- linphone/po/sv.po | 28 ++++++++++---- linphone/po/zh_CN.po | 19 +++++---- 20 files changed, 181 insertions(+), 109 deletions(-) diff --git a/linphone/gtk-glade/incall_view.c b/linphone/gtk-glade/incall_view.c index 4e857e574..fe97da732 100644 --- a/linphone/gtk-glade/incall_view.c +++ b/linphone/gtk-glade/incall_view.c @@ -29,6 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "linphone.h" + gboolean linphone_gtk_use_in_call_view(){ static int val=-1; if (val==-1) val=linphone_gtk_get_ui_config_int("use_incall_view",1); @@ -125,6 +126,8 @@ void linphone_gtk_in_call_view_set_in_call(){ gtk_image_set_from_animation(GTK_IMAGE(animation),pbuf); g_object_unref(G_OBJECT(pbuf)); }else gtk_image_set_from_stock(GTK_IMAGE(animation),GTK_STOCK_INFO,GTK_ICON_SIZE_DIALOG); + linphone_gtk_enable_mute_button( + GTK_TOGGLE_BUTTON(linphone_gtk_get_widget(main_window,"incall_mute")),TRUE); } void linphone_gtk_in_call_view_update_duration(int duration){ @@ -162,10 +165,30 @@ void linphone_gtk_in_call_view_terminate(const char *error_msg){ gtk_image_set_from_pixbuf(GTK_IMAGE(animation),pbuf); g_object_unref(G_OBJECT(pbuf)); } + linphone_gtk_enable_mute_button( + GTK_TOGGLE_BUTTON(linphone_gtk_get_widget(main_window,"incall_mute")),FALSE); g_timeout_add_seconds(2,(GSourceFunc)in_call_view_terminated,NULL); } -void linphone_gtk_mute_toggled(GtkToggleButton *button){ - linphone_core_mute_mic(linphone_gtk_get_core(), - gtk_toggle_button_get_active(button)); +void linphone_gtk_draw_mute_button(GtkToggleButton *button, gboolean active){ + if (active){ + GtkWidget *image=create_pixmap("mic_muted.png"); + gtk_button_set_label(GTK_BUTTON(button),_("Unmute")); + if (image!=NULL) gtk_button_set_image(GTK_BUTTON(button),image); + }else{ + GtkWidget *image=create_pixmap("mic_active.png"); + gtk_button_set_label(GTK_BUTTON(button),_("Mute")); + if (image!=NULL) gtk_button_set_image(GTK_BUTTON(button),image); + } +} + +void linphone_gtk_mute_toggled(GtkToggleButton *button){ + gboolean active=gtk_toggle_button_get_active(button); + linphone_core_mute_mic(linphone_gtk_get_core(),active); + linphone_gtk_draw_mute_button(button,active); +} + +void linphone_gtk_enable_mute_button(GtkToggleButton *button, gboolean sensitive){ + gtk_widget_set_sensitive(GTK_WIDGET(button),sensitive); + linphone_gtk_draw_mute_button(button,FALSE); } diff --git a/linphone/gtk-glade/linphone.h b/linphone/gtk-glade/linphone.h index 6b1f5b902..83e4c1da6 100644 --- a/linphone/gtk-glade/linphone.h +++ b/linphone/gtk-glade/linphone.h @@ -42,6 +42,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. GdkPixbuf * create_pixbuf(const gchar *filename); GdkPixbufAnimation *create_pixbuf_animation(const gchar *filename); void add_pixmap_directory(const gchar *directory); +GtkWidget*create_pixmap(const gchar *filename); GtkWidget *linphone_gtk_create_window(const char *window_name); GtkWidget *linphone_gtk_get_widget(GtkWidget *window, const char *name); LinphoneCore *linphone_gtk_get_core(void); @@ -86,4 +87,7 @@ void linphone_gtk_in_call_view_set_calling(const char *uri); void linphone_gtk_in_call_view_set_in_call(void); void linphone_gtk_in_call_view_update_duration(int duration); void linphone_gtk_in_call_view_terminate(const char *error_msg); +void linphone_gtk_enable_mute_button(GtkToggleButton *button, gboolean sensitive); + void linphone_gtk_show_login_frame(LinphoneProxyConfig *cfg); + diff --git a/linphone/gtk-glade/main.c b/linphone/gtk-glade/main.c index dd84d84b4..b611c261b 100644 --- a/linphone/gtk-glade/main.c +++ b/linphone/gtk-glade/main.c @@ -521,6 +521,7 @@ void linphone_gtk_call_terminated(const char *error){ gtk_widget_set_sensitive(linphone_gtk_get_widget(mw,"terminate_call"),FALSE); gtk_widget_set_sensitive(linphone_gtk_get_widget(mw,"start_call"),TRUE); gtk_widget_hide_all(linphone_gtk_get_widget(mw,"go_to_call_view_box")); + linphone_gtk_enable_mute_button(GTK_TOGGLE_BUTTON(linphone_gtk_get_widget(mw,"main_mute")),FALSE); if (linphone_gtk_use_in_call_view()) linphone_gtk_in_call_view_terminate(error); update_video_title(); @@ -603,6 +604,9 @@ void linphone_gtk_accept_call(GtkWidget *button){ linphone_gtk_in_call_view_set_in_call(); linphone_gtk_show_in_call_view(); } + linphone_gtk_enable_mute_button( + GTK_TOGGLE_BUTTON(linphone_gtk_get_widget(linphone_gtk_get_main_window(),"main_mute")) + ,TRUE); } static gboolean linphone_gtk_auto_answer(GtkWidget *incall_window){ @@ -810,6 +814,9 @@ static void linphone_gtk_general_state(LinphoneCore *lc, LinphoneGeneralState *g case GSTATE_CALL_IN_CONNECTED: if (linphone_gtk_use_in_call_view()) linphone_gtk_in_call_view_set_in_call(); + linphone_gtk_enable_mute_button( + GTK_TOGGLE_BUTTON(linphone_gtk_get_widget(linphone_gtk_get_main_window(),"main_mute")), + TRUE); break; case GSTATE_CALL_ERROR: linphone_gtk_call_terminated(gstate->message); @@ -1025,6 +1032,10 @@ static void linphone_gtk_init_main_window(){ linphone_gtk_show_friends(); linphone_gtk_connect_digits(); linphone_gtk_check_menu_items(); + linphone_gtk_enable_mute_button(GTK_TOGGLE_BUTTON(linphone_gtk_get_widget(linphone_gtk_get_main_window(), + "main_mute")),FALSE); + linphone_gtk_enable_mute_button(GTK_TOGGLE_BUTTON(linphone_gtk_get_widget(linphone_gtk_get_main_window(), + "incall_mute")),FALSE); if (linphone_core_in_call(linphone_gtk_get_core())) linphone_gtk_call_started( linphone_gtk_get_main_window());/*hide the call button, show terminate button*/ } diff --git a/linphone/gtk-glade/main.glade b/linphone/gtk-glade/main.glade index a1e198764..bdc48f305 100644 --- a/linphone/gtk-glade/main.glade +++ b/linphone/gtk-glade/main.glade @@ -514,14 +514,24 @@ Online users - - Mute - True - False - True - + + True + + + Mute + False + True + True + + + False + 0 + + + False + False 1 @@ -1052,22 +1062,6 @@ Fiber Channel 0 - - - Mute - True - True - False - True - - - - 1 - - - - - @@ -1086,6 +1080,30 @@ Fiber Channel 2 + + + True + + + Mute + True + False + True + True + + + False + False + 0 + + + + + False + False + 3 + + True @@ -1131,7 +1149,7 @@ Fiber Channel 8 - 3 + 4 @@ -1180,7 +1198,7 @@ Fiber Channel False False - 4 + 5 diff --git a/linphone/gtk-glade/propertybox.c b/linphone/gtk-glade/propertybox.c index b2ca8f11c..91c403fc0 100644 --- a/linphone/gtk-glade/propertybox.c +++ b/linphone/gtk-glade/propertybox.c @@ -622,7 +622,7 @@ static LangCodes supported_langs[]={ { "sv" , N_("Swedish") }, { "it" , N_("Italian") }, { "es" , N_("Spanish") }, - { "pt_BR" , N_("Bresilian") }, + { "pt_BR" , N_("Brazilian Portugese") }, { "pl" , N_("Polish") }, { "de" , N_("German") }, { "ru" , N_("Russian") }, @@ -630,7 +630,7 @@ static LangCodes supported_langs[]={ { "nl" , N_("Dutch") }, { "hu" , N_("Hungarian") }, { "cs" , N_("Czech") }, - { "zh_CN" , N_("Chineese") }, + { "zh_CN" , N_("Chinese") }, { NULL , NULL } }; diff --git a/linphone/gtk-glade/support.c b/linphone/gtk-glade/support.c index 689faf5a2..3600205a8 100644 --- a/linphone/gtk-glade/support.c +++ b/linphone/gtk-glade/support.c @@ -34,8 +34,7 @@ find_pixmap_file (const gchar *filename) /* This is an internally used function to create pixmaps. */ GtkWidget* -create_pixmap (GtkWidget *widget, - const gchar *filename) +create_pixmap (const gchar *filename) { gchar *pathname = NULL; GtkWidget *pixmap; diff --git a/linphone/linphone.kdevelop b/linphone/linphone.kdevelop index eeb6999f2..27eac2226 100644 --- a/linphone/linphone.kdevelop +++ b/linphone/linphone.kdevelop @@ -10,16 +10,16 @@ linphone . false - - + + executable gtk-glade/linphone-3 - - - + + + false false false @@ -391,13 +391,13 @@ make - + 0 - - - + + + default @@ -408,9 +408,9 @@ 0 0 false - - - + + + default @@ -419,11 +419,11 @@ - - - - - + + + + + true false false @@ -526,7 +526,7 @@ .; - + set m_,_ theValue diff --git a/linphone/po/cs.po b/linphone/po/cs.po index 9108d0930..31bbd94d6 100644 --- a/linphone/po/cs.po +++ b/linphone/po/cs.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: linphone-3.2.0-r659\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-28 15:30+0200\n" +"POT-Creation-Date: 2009-09-29 11:24+0200\n" "PO-Revision-Date: 2009-09-21 21:44+0200\n" "Last-Translator: Petr Pisar \n" "Language-Team: Czech \n" @@ -186,8 +186,8 @@ msgid "Spanish" msgstr "španělština" #: ../gtk-glade/propertybox.c:625 -msgid "Bresilian" -msgstr "brazilská portugalština" +msgid "Brasilian Portugese" +msgstr "" #: ../gtk-glade/propertybox.c:626 msgid "Polish" @@ -218,7 +218,7 @@ msgid "Czech" msgstr "čeština" #: ../gtk-glade/propertybox.c:633 -msgid "Chineese" +msgid "Chinese" msgstr "" #: ../gtk-glade/propertybox.c:690 @@ -1556,6 +1556,9 @@ msgstr "Parametrický ekvalizér zvuku." msgid "A webcam grabber based on directshow." msgstr "Snímač kamer postavený na directshow." +#~ msgid "Bresilian" +#~ msgstr "brazilská portugalština" + #~ msgid "Homepage" #~ msgstr "Domovská stránka" diff --git a/linphone/po/de.po b/linphone/po/de.po index dc4349e67..8f53c8017 100644 --- a/linphone/po/de.po +++ b/linphone/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: 2009-09-28 15:30+0200\n" +"POT-Creation-Date: 2009-09-29 11:24+0200\n" "PO-Revision-Date: 2003-05-23 17:51-0400\n" "Last-Translator: Jean-Jacques Sarton , Ursula Herles-" "Hartz \n" @@ -178,7 +178,7 @@ msgid "Spanish" msgstr "" #: ../gtk-glade/propertybox.c:625 -msgid "Bresilian" +msgid "Brasilian Portugese" msgstr "" #: ../gtk-glade/propertybox.c:626 @@ -210,7 +210,7 @@ msgid "Czech" msgstr "" #: ../gtk-glade/propertybox.c:633 -msgid "Chineese" +msgid "Chinese" msgstr "" #: ../gtk-glade/propertybox.c:690 diff --git a/linphone/po/es.po b/linphone/po/es.po index 73e18db81..8c199ed47 100644 --- a/linphone/po/es.po +++ b/linphone/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: 2009-09-28 15:30+0200\n" +"POT-Creation-Date: 2009-09-29 11:24+0200\n" "PO-Revision-Date: 2002-10-15 HO:MI+ZONE\n" "Last-Translator: Nelson Benitez \n" "Language-Team: es \n" @@ -179,7 +179,7 @@ msgid "Spanish" msgstr "" #: ../gtk-glade/propertybox.c:625 -msgid "Bresilian" +msgid "Brasilian Portugese" msgstr "" #: ../gtk-glade/propertybox.c:626 @@ -211,7 +211,7 @@ msgid "Czech" msgstr "" #: ../gtk-glade/propertybox.c:633 -msgid "Chineese" +msgid "Chinese" msgstr "" #: ../gtk-glade/propertybox.c:690 diff --git a/linphone/po/fr.po b/linphone/po/fr.po index 774491692..1f05e1092 100644 --- a/linphone/po/fr.po +++ b/linphone/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: 2009-09-28 15:30+0200\n" +"POT-Creation-Date: 2009-09-29 11:24+0200\n" "PO-Revision-Date: 2002-12-06 17:33+0100\n" "Last-Translator: Simon Morlat \n" "Language-Team: french \n" @@ -177,7 +177,7 @@ msgid "Spanish" msgstr "" #: ../gtk-glade/propertybox.c:625 -msgid "Bresilian" +msgid "Brasilian Portugese" msgstr "" #: ../gtk-glade/propertybox.c:626 @@ -194,7 +194,7 @@ msgstr "" #: ../gtk-glade/propertybox.c:629 msgid "Japanese" -msgstr "" +msgstr "日本語" #: ../gtk-glade/propertybox.c:630 msgid "Dutch" @@ -209,8 +209,8 @@ msgid "Czech" msgstr "" #: ../gtk-glade/propertybox.c:633 -msgid "Chineese" -msgstr "" +msgid "Chinese" +msgstr "简体中文" #: ../gtk-glade/propertybox.c:690 msgid "" diff --git a/linphone/po/hu.po b/linphone/po/hu.po index 8833a45c7..65b7d6f45 100644 --- a/linphone/po/hu.po +++ b/linphone/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-28 15:30+0200\n" +"POT-Creation-Date: 2009-09-29 11:24+0200\n" "PO-Revision-Date: 2007-12-14 11:12+0100\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" @@ -178,7 +178,7 @@ msgid "Spanish" msgstr "" #: ../gtk-glade/propertybox.c:625 -msgid "Bresilian" +msgid "Brasilian Portugese" msgstr "" #: ../gtk-glade/propertybox.c:626 @@ -210,7 +210,7 @@ msgid "Czech" msgstr "" #: ../gtk-glade/propertybox.c:633 -msgid "Chineese" +msgid "Chinese" msgstr "" #: ../gtk-glade/propertybox.c:690 diff --git a/linphone/po/it.po b/linphone/po/it.po index 95c8d7be8..ce81177a6 100644 --- a/linphone/po/it.po +++ b/linphone/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: 2009-09-28 15:30+0200\n" +"POT-Creation-Date: 2009-09-29 11:24+0200\n" "PO-Revision-Date: 2002-10-15 HO:MI+ZONE\n" "Last-Translator: Matteo Piazza \n" "Language-Team: it \n" @@ -180,8 +180,8 @@ msgid "Spanish" msgstr "Spagnolo" #: ../gtk-glade/propertybox.c:625 -msgid "Bresilian" -msgstr "Brasiliano" +msgid "Brasilian Portugese" +msgstr "" #: ../gtk-glade/propertybox.c:626 msgid "Polish" @@ -212,7 +212,7 @@ msgid "Czech" msgstr "Ceco" #: ../gtk-glade/propertybox.c:633 -msgid "Chineese" +msgid "Chinese" msgstr "" #: ../gtk-glade/propertybox.c:690 @@ -1528,3 +1528,6 @@ msgstr "Equalizzatore di suono." #: ../mediastreamer2/src/msdscap-mingw.cc:1003 msgid "A webcam grabber based on directshow." msgstr "Un webcam grabber basato su directshow." + +#~ msgid "Bresilian" +#~ msgstr "Brasiliano" diff --git a/linphone/po/ja.po b/linphone/po/ja.po index 79a8c03d7..f917f3cf5 100644 --- a/linphone/po/ja.po +++ b/linphone/po/ja.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: linphone 0.10\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-28 15:30+0200\n" +"POT-Creation-Date: 2009-09-29 11:24+0200\n" "PO-Revision-Date: 2003-01-21 00:05+9000\n" "Last-Translator: YAMAGUCHI YOSHIYA \n" "Language-Team: \n" @@ -165,7 +165,7 @@ msgstr "" #: ../gtk-glade/propertybox.c:621 msgid "French" -msgstr "" +msgstr "Français" #: ../gtk-glade/propertybox.c:622 msgid "Swedish" @@ -180,7 +180,7 @@ msgid "Spanish" msgstr "" #: ../gtk-glade/propertybox.c:625 -msgid "Bresilian" +msgid "Brasilian Portugese" msgstr "" #: ../gtk-glade/propertybox.c:626 @@ -197,7 +197,7 @@ msgstr "" #: ../gtk-glade/propertybox.c:629 msgid "Japanese" -msgstr "" +msgstr "日本語" #: ../gtk-glade/propertybox.c:630 msgid "Dutch" @@ -205,15 +205,15 @@ msgstr "" #: ../gtk-glade/propertybox.c:631 msgid "Hungarian" -msgstr "" +msgstr "Magyar" #: ../gtk-glade/propertybox.c:632 msgid "Czech" -msgstr "" +msgstr "čeština" #: ../gtk-glade/propertybox.c:633 -msgid "Chineese" -msgstr "" +msgid "Chinese" +msgstr "简体中文" #: ../gtk-glade/propertybox.c:690 msgid "" diff --git a/linphone/po/nl.po b/linphone/po/nl.po index d4806c37e..642b0be38 100644 --- a/linphone/po/nl.po +++ b/linphone/po/nl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: nl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-28 15:30+0200\n" +"POT-Creation-Date: 2009-09-29 11:24+0200\n" "PO-Revision-Date: 2007-09-05 10:40+0200\n" "Last-Translator: Hendrik-Jan Heins \n" "Language-Team: Nederlands \n" @@ -181,7 +181,7 @@ msgid "Spanish" msgstr "" #: ../gtk-glade/propertybox.c:625 -msgid "Bresilian" +msgid "Brasilian Portugese" msgstr "" #: ../gtk-glade/propertybox.c:626 @@ -213,7 +213,7 @@ msgid "Czech" msgstr "" #: ../gtk-glade/propertybox.c:633 -msgid "Chineese" +msgid "Chinese" msgstr "" #: ../gtk-glade/propertybox.c:690 diff --git a/linphone/po/pl.po b/linphone/po/pl.po index 2896aef1b..126f51cda 100644 --- a/linphone/po/pl.po +++ b/linphone/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: 2009-09-28 15:30+0200\n" +"POT-Creation-Date: 2009-09-29 11:24+0200\n" "PO-Revision-Date: 2003-08-22 12:50+0200\n" "Last-Translator: Robert Nasiadek \n" "Language-Team: Polski \n" @@ -178,7 +178,7 @@ msgid "Spanish" msgstr "" #: ../gtk-glade/propertybox.c:625 -msgid "Bresilian" +msgid "Brasilian Portugese" msgstr "" #: ../gtk-glade/propertybox.c:626 @@ -210,7 +210,7 @@ msgid "Czech" msgstr "" #: ../gtk-glade/propertybox.c:633 -msgid "Chineese" +msgid "Chinese" msgstr "" #: ../gtk-glade/propertybox.c:690 diff --git a/linphone/po/pt_BR.po b/linphone/po/pt_BR.po index b8c2b3752..1dc7271a7 100644 --- a/linphone/po/pt_BR.po +++ b/linphone/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: 2009-09-28 15:30+0200\n" +"POT-Creation-Date: 2009-09-29 11:24+0200\n" "PO-Revision-Date: 2006-07-11 23:30+0200\n" "Last-Translator: Rafael Caesar Lenzi \n" "Language-Team: pt_BR \n" @@ -180,7 +180,7 @@ msgid "Spanish" msgstr "" #: ../gtk-glade/propertybox.c:625 -msgid "Bresilian" +msgid "Brasilian Portugese" msgstr "" #: ../gtk-glade/propertybox.c:626 @@ -212,7 +212,7 @@ msgid "Czech" msgstr "" #: ../gtk-glade/propertybox.c:633 -msgid "Chineese" +msgid "Chinese" msgstr "" #: ../gtk-glade/propertybox.c:690 diff --git a/linphone/po/ru.po b/linphone/po/ru.po index bd03c3062..b0e362173 100644 --- a/linphone/po/ru.po +++ b/linphone/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: 2009-09-28 15:30+0200\n" +"POT-Creation-Date: 2009-09-29 11:24+0200\n" "PO-Revision-Date: 2008-11-25 18:39+0300\n" "Last-Translator: Grigory Fateyev \n" "Language-Team: Russian \n" @@ -181,7 +181,7 @@ msgid "Spanish" msgstr "" #: ../gtk-glade/propertybox.c:625 -msgid "Bresilian" +msgid "Brasilian Portugese" msgstr "" #: ../gtk-glade/propertybox.c:626 @@ -213,7 +213,7 @@ msgid "Czech" msgstr "" #: ../gtk-glade/propertybox.c:633 -msgid "Chineese" +msgid "Chinese" msgstr "" #: ../gtk-glade/propertybox.c:690 diff --git a/linphone/po/sv.po b/linphone/po/sv.po index 103315993..cfe43d28e 100644 --- a/linphone/po/sv.po +++ b/linphone/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-28 15:30+0200\n" +"POT-Creation-Date: 2009-09-29 11:24+0200\n" "PO-Revision-Date: 2009-02-17 15:22+0100\n" "Last-Translator: Emmanuel Frécon \n" "Language-Team: SWEDISH \n" @@ -71,7 +71,9 @@ msgstr "" msgid "" "Please enter your password for username %s\n" " at domain %s:" -msgstr "Mata in ditt lösenord för användaren %s\nvid domänen %s:" +msgstr "" +"Mata in ditt lösenord för användaren %s\n" +"vid domänen %s:" #: ../gtk-glade/main.c:855 msgid "Website link" @@ -182,8 +184,8 @@ msgid "Spanish" msgstr "Spansk" #: ../gtk-glade/propertybox.c:625 -msgid "Bresilian" -msgstr "Brasiliansk" +msgid "Brasilian Portugese" +msgstr "" #: ../gtk-glade/propertybox.c:626 msgid "Polish" @@ -214,7 +216,8 @@ msgid "Czech" msgstr "Tjekiska" #: ../gtk-glade/propertybox.c:633 -msgid "Chineese" +#, fuzzy +msgid "Chinese" msgstr "Kinesiska" #: ../gtk-glade/propertybox.c:690 @@ -432,7 +435,9 @@ msgstr "" msgid "" "ADSL\n" "Fiber Channel" -msgstr "ADSL\nFiber" +msgstr "" +"ADSL\n" +"Fiber" #: ../gtk-glade/main.glade.h:19 msgid "" @@ -1284,13 +1289,17 @@ msgstr "" msgid "" "The sip proxy address you entered is invalid, it must start with \"sip:\" " "followed by a hostname." -msgstr "SIP proxy adressen som du matade in är inte rätt, adressen måste starta med \"sip:\", följd av ett hostnamn" +msgstr "" +"SIP proxy adressen som du matade in är inte rätt, adressen måste starta med " +"\"sip:\", följd av ett hostnamn" #: ../coreapi/proxy.c:227 msgid "" "The sip identity you entered is invalid.\n" "It should look like sip:username@proxydomain, such as sip:alice@example.net" -msgstr "SIP adressen som du matade in är inte rätt. Adressen borde se ut som sip:namn@domän, såsom sip:peter@exempel.se" +msgstr "" +"SIP adressen som du matade in är inte rätt. Adressen borde se ut som sip:" +"namn@domän, såsom sip:peter@exempel.se" #: ../coreapi/proxy.c:634 #, c-format @@ -1533,6 +1542,9 @@ msgstr "" msgid "A webcam grabber based on directshow." msgstr "" +#~ msgid "Bresilian" +#~ msgstr "Brasiliansk" + #~ msgid "Homepage" #~ msgstr "Hemsidan" diff --git a/linphone/po/zh_CN.po b/linphone/po/zh_CN.po index 6e76d5774..834db5be1 100644 --- a/linphone/po/zh_CN.po +++ b/linphone/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: 2009-09-28 15:30+0200\n" +"POT-Creation-Date: 2009-09-29 11:24+0200\n" "PO-Revision-Date: 2009-09-24 18:39+0300\n" "Last-Translator: Jiang Honglei\n" "Language-Team: Jiang Honglei\n" @@ -165,7 +165,7 @@ msgstr "" #: ../gtk-glade/propertybox.c:621 msgid "French" -msgstr "" +msgstr "Français" #: ../gtk-glade/propertybox.c:622 msgid "Swedish" @@ -180,7 +180,7 @@ msgid "Spanish" msgstr "" #: ../gtk-glade/propertybox.c:625 -msgid "Bresilian" +msgid "Brasilian Portugese" msgstr "" #: ../gtk-glade/propertybox.c:626 @@ -193,27 +193,26 @@ msgstr "" #: ../gtk-glade/propertybox.c:628 msgid "Russian" -msgstr "" +msgstr "русский язык" #: ../gtk-glade/propertybox.c:629 msgid "Japanese" -msgstr "" +msgstr "日本語" #: ../gtk-glade/propertybox.c:630 msgid "Dutch" -msgstr "" +msgstr "Nederlands" #: ../gtk-glade/propertybox.c:631 msgid "Hungarian" -msgstr "" +msgstr "Magyar" #: ../gtk-glade/propertybox.c:632 msgid "Czech" -msgstr "" +msgstr "čeština" #: ../gtk-glade/propertybox.c:633 -#, fuzzy -msgid "Chineese" +msgid "Chinese" msgstr "简体中文" #: ../gtk-glade/propertybox.c:690