From e4012594465aa583a9d9dd0c09bdb3572a1eed48 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Tue, 8 Jan 2013 10:20:25 +0100 Subject: [PATCH 01/50] Update ms2 submodule. --- mediastreamer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediastreamer2 b/mediastreamer2 index 256e4eca8..8cb156754 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 256e4eca87c06865d0ff186d05b4ca03f9394701 +Subproject commit 8cb156754fb5fa67365ecc36c0523e5914fd7ce7 From 7cddd40cd151acf19dcf56022c635c096d96ef0a Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Tue, 8 Jan 2013 10:43:48 +0100 Subject: [PATCH 02/50] Add JNI to get lowBandwidthMode value --- coreapi/linphonecore_jni.cc | 3 +++ java/common/org/linphone/core/LinphoneCallParams.java | 7 +++++++ java/impl/org/linphone/core/LinphoneCallParamsImpl.java | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc index 5ed0b907f..a6a561c86 100644 --- a/coreapi/linphonecore_jni.cc +++ b/coreapi/linphonecore_jni.cc @@ -1792,6 +1792,9 @@ extern "C" jstring Java_org_linphone_core_LinphoneCoreImpl_getStunServer(JNIEnv } //CallParams +extern "C" jboolean Java_org_linphone_core_LinphoneCallParamsImpl_isLowBandwidthEnabled(JNIEnv *env, jobject thiz, jlong cp) { + return (jboolean) linphone_call_params_low_bandwidth_enabled((LinphoneCallParams *)cp); +} extern "C" void Java_org_linphone_core_LinphoneCallParamsImpl_enableLowBandwidth(JNIEnv *env, jobject thiz, jlong cp, jboolean enable) { linphone_call_params_enable_low_bandwidth((LinphoneCallParams *)cp, enable); diff --git a/java/common/org/linphone/core/LinphoneCallParams.java b/java/common/org/linphone/core/LinphoneCallParams.java index 730a99dc2..f8c7c097f 100644 --- a/java/common/org/linphone/core/LinphoneCallParams.java +++ b/java/common/org/linphone/core/LinphoneCallParams.java @@ -65,4 +65,11 @@ public interface LinphoneCallParams { * that it is achievable by the codec selected after SDP handshake. Video is automatically disabled. **/ void enableLowBandwidth(boolean enable); + + /** + * Use to know if this call has been configured in low bandwidth mode. + *
When enabled, this param may transform a call request with video in audio only mode. + * @return true if low bandwidth has been configured/detected + */ + boolean isLowBandwidthEnabled(); } diff --git a/java/impl/org/linphone/core/LinphoneCallParamsImpl.java b/java/impl/org/linphone/core/LinphoneCallParamsImpl.java index be3495a8d..b2ae4fe66 100644 --- a/java/impl/org/linphone/core/LinphoneCallParamsImpl.java +++ b/java/impl/org/linphone/core/LinphoneCallParamsImpl.java @@ -36,6 +36,7 @@ public class LinphoneCallParamsImpl implements LinphoneCallParams { private native long getUsedVideoCodec(long nativePtr); private native void destroy(long nativePtr); private native void enableLowBandwidth(long nativePtr, boolean enable); + private native void isLowBandwidthEnabled(long nativePtr); public boolean getVideoEnabled() { return getVideoEnabled(nativePtr); @@ -83,4 +84,8 @@ public class LinphoneCallParamsImpl implements LinphoneCallParams { public void enableLowBandwidth(boolean enable) { enableLowBandwidth(nativePtr, enable); } + + public boolean isLowBandwidthEnabled() { + return isLowBandwidthEnabled(nativePtr); + } } From 7c956f5c61a282b886016c36c98b49bd14079717 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Tue, 8 Jan 2013 10:45:44 +0100 Subject: [PATCH 03/50] Fix typo mistake in previous java impl --- java/impl/org/linphone/core/LinphoneCallParamsImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/impl/org/linphone/core/LinphoneCallParamsImpl.java b/java/impl/org/linphone/core/LinphoneCallParamsImpl.java index b2ae4fe66..ca41f6ecb 100644 --- a/java/impl/org/linphone/core/LinphoneCallParamsImpl.java +++ b/java/impl/org/linphone/core/LinphoneCallParamsImpl.java @@ -36,7 +36,7 @@ public class LinphoneCallParamsImpl implements LinphoneCallParams { private native long getUsedVideoCodec(long nativePtr); private native void destroy(long nativePtr); private native void enableLowBandwidth(long nativePtr, boolean enable); - private native void isLowBandwidthEnabled(long nativePtr); + private native boolean isLowBandwidthEnabled(long nativePtr); public boolean getVideoEnabled() { return getVideoEnabled(nativePtr); From 77ff807ee7f2c2a88cf12b8bfc49b3e51edc3cec Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Tue, 8 Jan 2013 10:59:55 +0100 Subject: [PATCH 04/50] update ms2 --- mediastreamer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediastreamer2 b/mediastreamer2 index 8cb156754..ec5b03696 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 8cb156754fb5fa67365ecc36c0523e5914fd7ce7 +Subproject commit ec5b036960d03242af4e4a63909f1adc17e13eed From d32446b2896542cb67f28194759a1ce083156eec Mon Sep 17 00:00:00 2001 From: Margaux Clerc Date: Tue, 8 Jan 2013 11:25:13 +0100 Subject: [PATCH 05/50] update translation files and dtmf table --- gtk/chat.c | 13 +- gtk/main.c | 27 +- gtk/propertybox.c | 1 + po/cs.po | 1620 ++++++++++------- po/de.po | 461 ++--- po/es.po | 4287 ++++++++++++++++++++++++--------------------- po/fr.po | 1538 +++++++++------- po/he.po | 1618 +++++++++-------- po/hu.po | 1642 +++++++++-------- po/it.po | 1681 ++++++++++-------- po/ja.po | 1573 ++++++++++------- po/nb_NO.po | 1618 ++++++++++------- po/nl.po | 1644 +++++++++-------- po/pl.po | 1569 ++++++++++------- po/pt_BR.po | 1583 ++++++++++------- po/ru.po | 865 +++++---- po/sv.po | 1659 ++++++++++-------- po/zh_CN.po | 1682 ++++++++++-------- po/zh_TW.po | 1609 ++++++++++------- 19 files changed, 15284 insertions(+), 11406 deletions(-) diff --git a/gtk/chat.c b/gtk/chat.c index 4363dcbac..8b165f1fa 100644 --- a/gtk/chat.c +++ b/gtk/chat.c @@ -68,17 +68,14 @@ void linphone_gtk_push_text(GtkWidget *w, const LinphoneAddress *from, const cha const char *display=linphone_address_get_display_name(from); if (display==NULL || display[0]=='\0') { display=linphone_address_get_username(from); - } - gtk_text_buffer_insert(buffer,&iter,display,-1); - //gtk_text_buffer_apply_tag_by_name(b,"bold",&begin,&iter); + } + gtk_text_buffer_insert_with_tags_by_name(buffer,&iter,display,-1,"bold",NULL); gtk_text_buffer_get_end_iter(buffer,&iter); gtk_text_buffer_insert(buffer,&iter,":",-1); gtk_text_buffer_get_end_iter(buffer,&iter); gtk_text_buffer_insert(buffer,&iter,"\n",-1); g_object_set_data(G_OBJECT(w),"from_message",linphone_address_as_string(from)); } - - //gtk_text_buffer_apply_tag_by_name(b,me ? "green" : "blue" ,&begin,&iter); gtk_text_buffer_get_end_iter(buffer,&iter); gtk_text_buffer_get_iter_at_offset(buffer,&begin,off); if(me){ @@ -218,6 +215,12 @@ GtkWidget* linphone_gtk_init_chatroom(LinphoneChatRoom *cr, const LinphoneAddres gtk_text_buffer_delete (text_buffer, &start, &end); gtk_text_buffer_insert(text_buffer,&start,buf,-1); } + + gtk_text_buffer_create_tag(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)), + "right","justification", GTK_JUSTIFY_RIGHT,NULL); + + gtk_text_buffer_create_tag(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)), + "bold","weight", PANGO_WEIGHT_BOLD,NULL); GtkWidget *button = linphone_gtk_get_widget(chat_view,"send"); g_signal_connect_swapped(G_OBJECT(button),"clicked",(GCallback)linphone_gtk_send_text,cr); diff --git a/gtk/main.c b/gtk/main.c index 2f5728491..734079c16 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -1427,7 +1427,7 @@ void linphone_gtk_load_identities(void){ } static void linphone_gtk_dtmf_pressed(GtkButton *button){ - const char *label=gtk_button_get_label(button); + const char *label=(char *)g_object_get_data(G_OBJECT(button),"label"); GtkWidget *uri_bar=linphone_gtk_get_widget(gtk_widget_get_toplevel(GTK_WIDGET(button)),"uribar"); int pos=-1; gtk_editable_insert_text(GTK_EDITABLE(uri_bar),label,1,&pos); @@ -1611,6 +1611,28 @@ static gboolean on_window_state_event(GtkWidget *w, GdkEventWindowState *event){ } #endif +void linphone_gtk_init_dtmf_table(GtkWidget *mw){ + GtkWidget *dtmf_table=linphone_gtk_get_widget(mw,"dtmf_table"); + gtk_widget_set_direction(dtmf_table, GTK_TEXT_DIR_LTR); + + g_object_set_data(G_OBJECT(linphone_gtk_get_widget(mw,"dtmf_A")),"label","A"); + g_object_set_data(G_OBJECT(linphone_gtk_get_widget(mw,"dtmf_B")),"label","B"); + g_object_set_data(G_OBJECT(linphone_gtk_get_widget(mw,"dtmf_C")),"label","C"); + g_object_set_data(G_OBJECT(linphone_gtk_get_widget(mw,"dtmf_D")),"label","D"); + g_object_set_data(G_OBJECT(linphone_gtk_get_widget(mw,"dtmf_1")),"label","1"); + g_object_set_data(G_OBJECT(linphone_gtk_get_widget(mw,"dtmf_2")),"label","2"); + g_object_set_data(G_OBJECT(linphone_gtk_get_widget(mw,"dtmf_3")),"label","3"); + g_object_set_data(G_OBJECT(linphone_gtk_get_widget(mw,"dtmf_4")),"label","4"); + g_object_set_data(G_OBJECT(linphone_gtk_get_widget(mw,"dtmf_5")),"label","5"); + g_object_set_data(G_OBJECT(linphone_gtk_get_widget(mw,"dtmf_6")),"label","6"); + g_object_set_data(G_OBJECT(linphone_gtk_get_widget(mw,"dtmf_7")),"label","7"); + g_object_set_data(G_OBJECT(linphone_gtk_get_widget(mw,"dtmf_8")),"label","8"); + g_object_set_data(G_OBJECT(linphone_gtk_get_widget(mw,"dtmf_9")),"label","9"); + g_object_set_data(G_OBJECT(linphone_gtk_get_widget(mw,"dtmf_0")),"label","0"); + g_object_set_data(G_OBJECT(linphone_gtk_get_widget(mw,"dtmf_#")),"label","#"); + g_object_set_data(G_OBJECT(linphone_gtk_get_widget(mw,"dtmf_*")),"label","*"); + +} static void linphone_gtk_init_main_window(){ GtkWidget *main_window; @@ -1624,7 +1646,8 @@ static void linphone_gtk_init_main_window(){ linphone_gtk_connect_digits(); main_window=linphone_gtk_get_main_window(); linphone_gtk_call_log_update(main_window); - + + linphone_gtk_init_dtmf_table(main_window); linphone_gtk_update_call_buttons (NULL); g_object_set_data(G_OBJECT(main_window),"is_conf",GINT_TO_POINTER(FALSE)); /*prevent the main window from being destroyed by a user click on WM controls, instead we hide it*/ diff --git a/gtk/propertybox.c b/gtk/propertybox.c index a6d9d96f8..90b2bf947 100644 --- a/gtk/propertybox.c +++ b/gtk/propertybox.c @@ -772,6 +772,7 @@ static LangCodes supported_langs[]={ { "zh_CN" , N_("Chinese") }, { "zh_TW" , N_("Traditional Chinese") }, { "nb_NO" , N_("Norwegian") }, + { "he" , N_("Hebrew") }, { NULL , NULL } }; diff --git a/po/cs.po b/po/cs.po index c9c2885de..4f499ac9b 100644 --- a/po/cs.po +++ b/po/cs.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: linphone-3.4.99.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-12-05 12:41+0100\n" +"POT-Creation-Date: 2013-01-08 10:35+0100\n" "PO-Revision-Date: 2011-11-04 22:30+0100\n" "Last-Translator: Petr Pisar \n" "Language-Team: Czech \n" @@ -27,7 +27,22 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: ../gtk/calllogs.c:71 +#: ../gtk/calllogs.c:82 +#, fuzzy +msgid "Aborted" +msgstr "přerušen" + +#: ../gtk/calllogs.c:85 +#, fuzzy +msgid "Missed" +msgstr "promeškán" + +#: ../gtk/calllogs.c:88 +#, fuzzy +msgid "Declined" +msgstr "Odmítnout" + +#: ../gtk/calllogs.c:94 #, c-format msgid "%i minute" msgid_plural "%i minutes" @@ -35,7 +50,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../gtk/calllogs.c:74 +#: ../gtk/calllogs.c:97 #, c-format msgid "%i second" msgid_plural "%i seconds" @@ -43,18 +58,25 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../gtk/calllogs.c:77 +#: ../gtk/calllogs.c:100 #, c-format msgid "" "%s\t%s\tQuality: %s\n" "%s\t%s %s\t" msgstr "" -#: ../gtk/calllogs.c:79 +#: ../gtk/calllogs.c:102 msgid "n/a" msgstr "–" -#: ../gtk/conference.c:33 ../gtk/incall_view.c:183 +#: ../gtk/calllogs.c:105 +#, c-format +msgid "" +"%s\t%s\t\n" +"%s\t%s" +msgstr "" + +#: ../gtk/conference.c:33 ../gtk/main.ui.h:13 msgid "Conference" msgstr "Konference" @@ -67,32 +89,31 @@ msgstr "Já" msgid "Couldn't find pixmap file: %s" msgstr "Nelze najít soubor s obrázkem: %s" -#: ../gtk/chat.c:27 -#, c-format -msgid "Chat with %s" -msgstr "Diskuze s %s" - -#: ../gtk/main.c:83 +#: ../gtk/main.c:89 msgid "log to stdout some debug information while running." msgstr "Za běhu vypisuje některé ladicí informace na standardní výstup." -#: ../gtk/main.c:90 +#: ../gtk/main.c:96 msgid "path to a file to write logs into." msgstr "Soubor, kam zapisovat protokol." -#: ../gtk/main.c:97 +#: ../gtk/main.c:103 +msgid "Start linphone with video disabled." +msgstr "" + +#: ../gtk/main.c:110 msgid "Start only in the system tray, do not show the main interface." msgstr "Spustí se pouze do systémové oblasti, nezobrazí hlavní okno." -#: ../gtk/main.c:104 +#: ../gtk/main.c:117 msgid "address to call right now" msgstr "Zavolá právě teď na tuto adresu" -#: ../gtk/main.c:111 +#: ../gtk/main.c:124 msgid "if set automatically answer incoming calls" msgstr "je-li nastaveno, automaticky zvedne příchozí hovor" -#: ../gtk/main.c:118 +#: ../gtk/main.c:131 msgid "" "Specifiy a working directory (should be the base of the installation, eg: c:" "\\Program Files\\Linphone)" @@ -100,12 +121,12 @@ msgstr "" "Zadejte pracovní adresář (měl by být základní instalační adresář, například " "c:\\Program Files\\Linphone)" -#: ../gtk/main.c:464 +#: ../gtk/main.c:498 #, c-format msgid "Call with %s" msgstr "Hovor s %s" -#: ../gtk/main.c:815 +#: ../gtk/main.c:871 #, c-format msgid "" "%s would like to add you to his contact list.\n" @@ -118,7 +139,7 @@ msgstr "" "do svého adresáře?\n" "Odpovíte-li ne, tato osobo bude dočasně blokována." -#: ../gtk/main.c:893 +#: ../gtk/main.c:948 #, c-format msgid "" "Please enter your password for username %s\n" @@ -127,54 +148,59 @@ msgstr "" "Prosím, zadejte heslo pro uživatele %s\n" "v doméně %s:" -#: ../gtk/main.c:993 +#: ../gtk/main.c:1051 msgid "Call error" msgstr "Chyba hovoru" -#: ../gtk/main.c:996 ../coreapi/linphonecore.c:2406 +#: ../gtk/main.c:1054 ../coreapi/linphonecore.c:2949 msgid "Call ended" msgstr "Hovor ukončen" -#: ../gtk/main.c:999 ../coreapi/linphonecore.c:199 +#: ../gtk/main.c:1057 ../coreapi/linphonecore.c:244 msgid "Incoming call" msgstr "Příchozí hovor" -#: ../gtk/main.c:1001 ../gtk/incall_view.c:292 ../gtk/main.ui.h:20 +#: ../gtk/main.c:1059 ../gtk/incall_view.c:451 ../gtk/main.ui.h:6 msgid "Answer" msgstr "Odpovědět" -#: ../gtk/main.c:1003 ../gtk/main.ui.h:29 +#: ../gtk/main.c:1061 ../gtk/main.ui.h:7 msgid "Decline" msgstr "Odmítnout" -#: ../gtk/main.c:1009 +#: ../gtk/main.c:1067 msgid "Call paused" msgstr "Hovor odložen" -#: ../gtk/main.c:1009 +#: ../gtk/main.c:1067 #, c-format msgid "by %s" msgstr "kým: %s" -#: ../gtk/main.c:1165 +#: ../gtk/main.c:1116 +#, c-format +msgid "%s proposed to start video. Do you accept ?" +msgstr "" + +#: ../gtk/main.c:1278 msgid "Website link" msgstr "Odkaz na webovou stránku" -#: ../gtk/main.c:1205 +#: ../gtk/main.c:1318 msgid "Linphone - a video internet phone" msgstr "Lipnhone – internetový videofon" -#: ../gtk/main.c:1295 +#: ../gtk/main.c:1410 #, c-format msgid "%s (Default)" msgstr "%s (Výchozí)" -#: ../gtk/main.c:1566 ../coreapi/callbacks.c:700 +#: ../gtk/main.c:1714 ../coreapi/callbacks.c:774 #, c-format msgid "We are transferred to %s" msgstr "Byly jsme přepojeni na %s" -#: ../gtk/main.c:1576 +#: ../gtk/main.c:1724 msgid "" "No sound cards have been detected on this computer.\n" "You won't be able to send or receive audio calls." @@ -182,163 +208,177 @@ msgstr "" "Na tomto počítači nebyla objevena žádná zvuková karta.\n" "Nebudete moci vytáčet a přijímat a zvukové hovory." -#: ../gtk/main.c:1663 +#: ../gtk/main.c:1833 msgid "A free SIP video-phone" msgstr "Volný SIP videofon" -#: ../gtk/friendlist.c:203 +#: ../gtk/friendlist.c:335 #, fuzzy msgid "Add to addressbook" msgstr "Zobrazit adresář" -#: ../gtk/friendlist.c:258 ../gtk/propertybox.c:296 ../gtk/contact.ui.h:3 -msgid "Name" -msgstr "Jméno" - -#: ../gtk/friendlist.c:271 +#: ../gtk/friendlist.c:509 msgid "Presence status" msgstr "Stav" -#: ../gtk/friendlist.c:308 +#: ../gtk/friendlist.c:526 ../gtk/propertybox.c:362 ../gtk/contact.ui.h:1 +msgid "Name" +msgstr "Jméno" + +#: ../gtk/friendlist.c:538 +#, fuzzy +msgid "Call" +msgstr "Volat komu: %s" + +#: ../gtk/friendlist.c:543 +#, fuzzy +msgid "Chat" +msgstr "Diskuzní skupina" + +#: ../gtk/friendlist.c:573 #, c-format msgid "Search in %s directory" msgstr "Hledat v adresáři %s" -#: ../gtk/friendlist.c:568 +#: ../gtk/friendlist.c:730 msgid "Invalid sip contact !" msgstr "Neplatný sipový kontakt!" -#: ../gtk/friendlist.c:613 +#: ../gtk/friendlist.c:775 #, c-format msgid "Call %s" msgstr "Volat komu: %s" -#: ../gtk/friendlist.c:614 +#: ../gtk/friendlist.c:776 #, c-format msgid "Send text to %s" msgstr "Poslat text komu: %s" -#: ../gtk/friendlist.c:615 +#: ../gtk/friendlist.c:777 #, c-format msgid "Edit contact '%s'" msgstr "Upravit kontakt „%s“" -#: ../gtk/friendlist.c:616 +#: ../gtk/friendlist.c:778 #, c-format msgid "Delete contact '%s'" msgstr "Odstranit kontakt „%s“" -#: ../gtk/friendlist.c:658 +#: ../gtk/friendlist.c:820 #, c-format msgid "Add new contact from %s directory" msgstr "Přidat nový kontakt z adresáře %s" -#: ../gtk/propertybox.c:302 +#: ../gtk/propertybox.c:368 msgid "Rate (Hz)" msgstr "Kmitočet (Hz)" -#: ../gtk/propertybox.c:308 +#: ../gtk/propertybox.c:374 msgid "Status" msgstr "Stav" -#: ../gtk/propertybox.c:314 +#: ../gtk/propertybox.c:380 msgid "Min bitrate (kbit/s)" msgstr "Min. rychlost (kb/s)" -#: ../gtk/propertybox.c:321 +#: ../gtk/propertybox.c:387 msgid "Parameters" msgstr "Parametry" -#: ../gtk/propertybox.c:364 ../gtk/propertybox.c:507 +#: ../gtk/propertybox.c:430 ../gtk/propertybox.c:573 msgid "Enabled" msgstr "Povoleno" -#: ../gtk/propertybox.c:366 ../gtk/propertybox.c:507 +#: ../gtk/propertybox.c:432 ../gtk/propertybox.c:573 msgid "Disabled" msgstr "Zakázáno" -#: ../gtk/propertybox.c:553 +#: ../gtk/propertybox.c:619 msgid "Account" msgstr "Účet" -#: ../gtk/propertybox.c:693 +#: ../gtk/propertybox.c:759 msgid "English" msgstr "angličtina" -#: ../gtk/propertybox.c:694 +#: ../gtk/propertybox.c:760 msgid "French" msgstr "francouzština" -#: ../gtk/propertybox.c:695 +#: ../gtk/propertybox.c:761 msgid "Swedish" msgstr "švédština" -#: ../gtk/propertybox.c:696 +#: ../gtk/propertybox.c:762 msgid "Italian" msgstr "italština" -#: ../gtk/propertybox.c:697 +#: ../gtk/propertybox.c:763 msgid "Spanish" msgstr "španělština" -#: ../gtk/propertybox.c:698 +#: ../gtk/propertybox.c:764 msgid "Brazilian Portugese" msgstr "brazilská portugalština" -#: ../gtk/propertybox.c:699 +#: ../gtk/propertybox.c:765 msgid "Polish" msgstr "polština" -#: ../gtk/propertybox.c:700 +#: ../gtk/propertybox.c:766 msgid "German" msgstr "němčina" -#: ../gtk/propertybox.c:701 +#: ../gtk/propertybox.c:767 msgid "Russian" msgstr "ruština" -#: ../gtk/propertybox.c:702 +#: ../gtk/propertybox.c:768 msgid "Japanese" msgstr "japonština" -#: ../gtk/propertybox.c:703 +#: ../gtk/propertybox.c:769 msgid "Dutch" msgstr "dánština" -#: ../gtk/propertybox.c:704 +#: ../gtk/propertybox.c:770 msgid "Hungarian" msgstr "maďarština" -#: ../gtk/propertybox.c:705 +#: ../gtk/propertybox.c:771 msgid "Czech" msgstr "čeština" -#: ../gtk/propertybox.c:706 +#: ../gtk/propertybox.c:772 msgid "Chinese" msgstr "čínština" -#: ../gtk/propertybox.c:707 +#: ../gtk/propertybox.c:773 msgid "Traditional Chinese" msgstr "tradiční čínština" -#: ../gtk/propertybox.c:708 +#: ../gtk/propertybox.c:774 msgid "Norwegian" msgstr "norština" -#: ../gtk/propertybox.c:765 +#: ../gtk/propertybox.c:775 +msgid "Hebrew" +msgstr "" + +#: ../gtk/propertybox.c:842 msgid "" "You need to restart linphone for the new language selection to take effect." msgstr "Aby se projevil výběr nového jazyka, je nutné znovu spustit linphone." -#: ../gtk/propertybox.c:835 +#: ../gtk/propertybox.c:912 msgid "None" msgstr "Žádná" -#: ../gtk/propertybox.c:839 +#: ../gtk/propertybox.c:916 msgid "SRTP" msgstr "SRTP" -#: ../gtk/propertybox.c:845 +#: ../gtk/propertybox.c:922 msgid "ZRTP" msgstr "ZRTP" @@ -383,7 +423,7 @@ msgstr[0] "Nalezen %i kontakt" msgstr[1] "Nalezeny %i kontakty" msgstr[2] "Nalezeno %i kontaktů" -#: ../gtk/setupwizard.c:25 +#: ../gtk/setupwizard.c:33 msgid "" "Welcome !\n" "This assistant will help you to use a SIP account for your calls." @@ -391,168 +431,274 @@ msgstr "" "Vítejte!\n" "Tento průvodce vám pomůže používat sipový účet při vašich hovorech." -#: ../gtk/setupwizard.c:34 -msgid "Create an account by choosing a username" +#: ../gtk/setupwizard.c:42 +#, fuzzy +msgid "Create an account on linphone.org" msgstr "Vytvořit účet vybráním uživatelského jména" -#: ../gtk/setupwizard.c:35 -msgid "I have already an account and just want to use it" +#: ../gtk/setupwizard.c:43 +#, fuzzy +msgid "I have already a linphone.org account and I just want to use it" msgstr "Účet již mám a chci jej použít" -#: ../gtk/setupwizard.c:53 -msgid "Please choose a username:" -msgstr "Prosím, vyberte si uživatelské jméno:" +#: ../gtk/setupwizard.c:44 +#, fuzzy +msgid "I have already a sip account and I just want to use it" +msgstr "Účet již mám a chci jej použít" -#: ../gtk/setupwizard.c:54 +#: ../gtk/setupwizard.c:84 +msgid "Enter your linphone.org username" +msgstr "" + +#: ../gtk/setupwizard.c:91 msgid "Username:" msgstr "Uživatelské jméno:" -#: ../gtk/setupwizard.c:92 -#, c-format -msgid "Checking if '%s' is available..." -msgstr "Zjišťuji, zda-li je „%s“ přípustné…" +#: ../gtk/setupwizard.c:93 ../gtk/password.ui.h:4 +msgid "Password:" +msgstr "Heslo:" -#: ../gtk/setupwizard.c:97 ../gtk/setupwizard.c:164 -msgid "Please wait..." -msgstr "Prosím, čekejte…" +#: ../gtk/setupwizard.c:113 +msgid "Enter your account informations" +msgstr "" -#: ../gtk/setupwizard.c:101 -msgid "Sorry this username already exists. Please try a new one." -msgstr "Je nám líto, ale toto jméno již existuje. Prosím, zvolte jiné." +#: ../gtk/setupwizard.c:120 +#, fuzzy +msgid "Username*" +msgstr "Uživatelské jméno" -#: ../gtk/setupwizard.c:103 ../gtk/setupwizard.c:168 -msgid "Ok !" -msgstr "V pořádku!" +#: ../gtk/setupwizard.c:121 +#, fuzzy +msgid "Password*" +msgstr "Heslo" -#: ../gtk/setupwizard.c:106 ../gtk/setupwizard.c:171 -msgid "Communication problem, please try again later." -msgstr "Chyba při komunikaci. Prosím, zkuste to později." +#: ../gtk/setupwizard.c:124 +msgid "Domain*" +msgstr "" -#: ../gtk/setupwizard.c:134 +#: ../gtk/setupwizard.c:125 +msgid "Proxy" +msgstr "" + +#: ../gtk/setupwizard.c:297 +msgid "(*) Required fields" +msgstr "" + +#: ../gtk/setupwizard.c:298 +#, fuzzy +msgid "Username: (*)" +msgstr "Uživatelské jméno:" + +#: ../gtk/setupwizard.c:300 +#, fuzzy +msgid "Password: (*)" +msgstr "Heslo:" + +#: ../gtk/setupwizard.c:302 +msgid "Email: (*)" +msgstr "" + +#: ../gtk/setupwizard.c:304 +msgid "Confirm your password: (*)" +msgstr "" + +#: ../gtk/setupwizard.c:368 +msgid "" +"Error, account not validated, username already used or server unreachable.\n" +"Please go back and try again." +msgstr "" + +#: ../gtk/setupwizard.c:379 msgid "Thank you. Your account is now configured and ready for use." msgstr "Děkujeme vám. Váš účet je nyní nastaven a připraven k použití." -#: ../gtk/setupwizard.c:228 +#: ../gtk/setupwizard.c:387 +msgid "" +"Please validate your account by clicking on the link we just sent you by " +"email.\n" +"Then come back here and press Next button." +msgstr "" + +#: ../gtk/setupwizard.c:554 msgid "Welcome to the account setup assistant" msgstr "Vítejte v průvodci nastavení účtu" -#: ../gtk/setupwizard.c:232 +#: ../gtk/setupwizard.c:559 msgid "Account setup assistant" msgstr "Průvodce nastavením účtu" -#: ../gtk/setupwizard.c:236 -msgid "Choosing a username" -msgstr "Výběr uživatelského jména" +#: ../gtk/setupwizard.c:565 +#, fuzzy +msgid "Configure your account (step 1/1)" +msgstr "Nastavit SIP účet" -#: ../gtk/setupwizard.c:240 -msgid "Verifying" -msgstr "Ověřování" +#: ../gtk/setupwizard.c:570 +msgid "Enter your sip username (step 1/1)" +msgstr "" -#: ../gtk/setupwizard.c:244 -msgid "Confirmation" -msgstr "Potvrzení" +#: ../gtk/setupwizard.c:574 +msgid "Enter account information (step 1/2)" +msgstr "" -#: ../gtk/setupwizard.c:249 -msgid "Creating your account" -msgstr "Vytváření účtu" +#: ../gtk/setupwizard.c:583 +msgid "Validation (step 2/2)" +msgstr "" -#: ../gtk/setupwizard.c:253 -msgid "Now ready !" -msgstr "Připraveno!" +#: ../gtk/setupwizard.c:588 +#, fuzzy +msgid "Error" +msgstr "Chyba." -#: ../gtk/incall_view.c:69 +#: ../gtk/setupwizard.c:592 +#, fuzzy +msgid "Terminating" +msgstr "Ukončit hovor" + +#: ../gtk/incall_view.c:69 ../gtk/incall_view.c:90 #, c-format msgid "Call #%i" msgstr "Hovor č. %i" -#: ../gtk/incall_view.c:127 +#: ../gtk/incall_view.c:150 #, c-format msgid "Transfer to call #%i with %s" msgstr "Přepojit hovor č. %i s %s" -#: ../gtk/incall_view.c:155 -msgid "Transfer" -msgstr "Přepojit" +#: ../gtk/incall_view.c:209 ../gtk/incall_view.c:212 +#, fuzzy +msgid "Not used" +msgstr "Nenalezeno" -#: ../gtk/incall_view.c:271 +#: ../gtk/incall_view.c:219 +msgid "ICE not activated" +msgstr "" + +#: ../gtk/incall_view.c:221 +#, fuzzy +msgid "ICE failed" +msgstr "Filtr ICE" + +#: ../gtk/incall_view.c:223 +msgid "ICE in progress" +msgstr "" + +#: ../gtk/incall_view.c:225 +msgid "Going through one or more NATs" +msgstr "" + +#: ../gtk/incall_view.c:227 +#, fuzzy +msgid "Direct" +msgstr "Přesměrováno" + +#: ../gtk/incall_view.c:229 +msgid "Through a relay server" +msgstr "" + +#: ../gtk/incall_view.c:238 ../gtk/incall_view.c:242 +#, c-format +msgid "" +"download: %f\n" +"upload: %f (kbit/s)" +msgstr "" + +#: ../gtk/incall_view.c:341 ../gtk/main.ui.h:12 +msgid "Hang up" +msgstr "" + +#: ../gtk/incall_view.c:430 msgid "Calling..." msgstr "Volá se…" -#: ../gtk/incall_view.c:274 ../gtk/incall_view.c:482 +#: ../gtk/incall_view.c:433 ../gtk/incall_view.c:646 msgid "00::00::00" msgstr "00:00:00" -#: ../gtk/incall_view.c:285 +#: ../gtk/incall_view.c:444 msgid "Incoming call" msgstr "Příchozí hovor" -#: ../gtk/incall_view.c:322 +#: ../gtk/incall_view.c:481 msgid "good" msgstr "dobrá" -#: ../gtk/incall_view.c:324 +#: ../gtk/incall_view.c:483 msgid "average" msgstr "průměrná" -#: ../gtk/incall_view.c:326 +#: ../gtk/incall_view.c:485 msgid "poor" msgstr "slabá" -#: ../gtk/incall_view.c:328 +#: ../gtk/incall_view.c:487 msgid "very poor" msgstr "velmi slabá" -#: ../gtk/incall_view.c:330 +#: ../gtk/incall_view.c:489 msgid "too bad" msgstr "příliš špatná" -#: ../gtk/incall_view.c:331 ../gtk/incall_view.c:347 +#: ../gtk/incall_view.c:490 ../gtk/incall_view.c:506 msgid "unavailable" msgstr "nedostupná" -#: ../gtk/incall_view.c:447 +#: ../gtk/incall_view.c:605 msgid "Secured by SRTP" msgstr "" -#: ../gtk/incall_view.c:453 +#: ../gtk/incall_view.c:611 #, c-format msgid "Secured by ZRTP - [auth token: %s]" msgstr "" -#: ../gtk/incall_view.c:459 +#: ../gtk/incall_view.c:617 msgid "Set unverified" msgstr "" -#: ../gtk/incall_view.c:459 ../gtk/main.ui.h:49 +#: ../gtk/incall_view.c:617 ../gtk/main.ui.h:5 msgid "Set verified" msgstr "" -#: ../gtk/incall_view.c:480 +#: ../gtk/incall_view.c:641 msgid "In conference" msgstr "Probíhá konference" -#: ../gtk/incall_view.c:480 +#: ../gtk/incall_view.c:641 msgid "In call" msgstr "Probíhá hovor" -#: ../gtk/incall_view.c:499 +#: ../gtk/incall_view.c:669 msgid "Paused call" msgstr "Odložený hovor" -#: ../gtk/incall_view.c:511 +#: ../gtk/incall_view.c:682 #, c-format msgid "%02i::%02i::%02i" msgstr "%02i:%02i:%02i" -#: ../gtk/incall_view.c:527 +#: ../gtk/incall_view.c:699 msgid "Call ended." msgstr "Hovor skončil." -#: ../gtk/incall_view.c:584 +#: ../gtk/incall_view.c:731 +msgid "Transfer in progress" +msgstr "" + +#: ../gtk/incall_view.c:734 +#, fuzzy +msgid "Transfer done." +msgstr "Přepojit" + +#: ../gtk/incall_view.c:737 +#, fuzzy +msgid "Transfer failed." +msgstr "Přepojit" + +#: ../gtk/incall_view.c:781 msgid "Resume" msgstr "Obnovit" -#: ../gtk/incall_view.c:591 ../gtk/main.ui.h:45 +#: ../gtk/incall_view.c:788 ../gtk/main.ui.h:9 msgid "Pause" msgstr "Odložit" @@ -562,223 +708,240 @@ msgid "Please enter login information for %s" msgstr "Prosím, zadejte své přihlašovací jméno pro %s:" #: ../gtk/main.ui.h:1 -msgid "#" -msgstr "#" - -#: ../gtk/main.ui.h:2 -msgid "*" -msgstr "*" - -#: ../gtk/main.ui.h:3 -msgid "0" -msgstr "0" - -#: ../gtk/main.ui.h:4 -msgid "1" -msgstr "1" - -#: ../gtk/main.ui.h:5 -msgid "2" -msgstr "2" - -#: ../gtk/main.ui.h:6 -msgid "3" -msgstr "3" - -#: ../gtk/main.ui.h:7 -msgid "4" -msgstr "4" - -#: ../gtk/main.ui.h:8 -msgid "5" -msgstr "5" - -#: ../gtk/main.ui.h:9 -msgid "6" -msgstr "6" - -#: ../gtk/main.ui.h:10 -msgid "7" -msgstr "7" - -#: ../gtk/main.ui.h:11 -msgid "8" -msgstr "8" - -#: ../gtk/main.ui.h:12 -msgid "9" -msgstr "9" - -#: ../gtk/main.ui.h:13 -msgid "Add contacts from directory" -msgstr "Přidat kontakty z adresáře" - -#: ../gtk/main.ui.h:14 msgid "Callee name" msgstr "Jméno volaného" +#: ../gtk/main.ui.h:2 +msgid "Send" +msgstr "Odeslat" + +#: ../gtk/main.ui.h:3 +#, fuzzy +msgid "End conference" +msgstr "Probíhá konference" + +# XXX: Do not translate, this is GTK identifier +#: ../gtk/main.ui.h:4 +msgid "label" +msgstr "" + +#: ../gtk/main.ui.h:8 +msgid "Video" +msgstr "" + +#: ../gtk/main.ui.h:10 +msgid "Mute" +msgstr "" + +#: ../gtk/main.ui.h:11 +msgid "Transfer" +msgstr "Přepojit" + +#: ../gtk/main.ui.h:14 +msgid "In call" +msgstr "Telefonuje se" + #: ../gtk/main.ui.h:15 -msgid "Welcome !" -msgstr "Vítejte!" +msgid "Duration" +msgstr "Délka" #: ../gtk/main.ui.h:16 -msgid "A" -msgstr "A" - -#: ../gtk/main.ui.h:17 -msgid "ADSL" -msgstr "ADSL" - -#: ../gtk/main.ui.h:18 -msgid "Add contact" -msgstr "Přidat kontakt" - -#: ../gtk/main.ui.h:19 -msgid "All users" -msgstr "všech uživatelích" - -#: ../gtk/main.ui.h:21 -msgid "Automatically log me in" -msgstr "Přihlašovat mě automaticky" - -#: ../gtk/main.ui.h:22 -msgid "B" -msgstr "B" - -#: ../gtk/main.ui.h:23 ../gtk/parameters.ui.h:21 -msgid "C" -msgstr "C" - -#: ../gtk/main.ui.h:24 -#, fuzzy -msgid "Call" -msgstr "Volat komu: %s" - -#: ../gtk/main.ui.h:25 msgid "Call quality rating" msgstr "Hodnocení kvality hovoru" -#: ../gtk/main.ui.h:26 +#: ../gtk/main.ui.h:17 +msgid "_Options" +msgstr "V_olby" + +#: ../gtk/main.ui.h:18 +msgid "Always start video" +msgstr "" + +#: ../gtk/main.ui.h:19 +msgid "Enable self-view" +msgstr "Zobrazovat sám sebe" + +#: ../gtk/main.ui.h:20 +msgid "_Help" +msgstr "Nápo_věda" + +#: ../gtk/main.ui.h:21 +msgid "Show debug window" +msgstr "Zobrazit ladicí okno" + +#: ../gtk/main.ui.h:22 +msgid "_Homepage" +msgstr "_Domovská stránka" + +#: ../gtk/main.ui.h:23 msgid "Check _Updates" msgstr "Vyhledat akt_ualizace" -#: ../gtk/main.ui.h:27 -msgid "Contacts" -msgstr "Kontakty" +#: ../gtk/main.ui.h:24 +#, fuzzy +msgid "Account assistant" +msgstr "Průvodce nastavením účtu" -#: ../gtk/main.ui.h:28 +#: ../gtk/main.ui.h:25 +msgid "SIP address or phone number:" +msgstr "SIP adresa nebo telefonní číslo:" + +#: ../gtk/main.ui.h:26 +msgid "Initiate a new call" +msgstr "Zahájit nový hovor" + +#: ../gtk/main.ui.h:27 ../gtk/parameters.ui.h:48 +msgid "Add" +msgstr "Přidat" + +#: ../gtk/main.ui.h:28 ../gtk/parameters.ui.h:49 +msgid "Edit" +msgstr "Upravit" + +#: ../gtk/main.ui.h:29 msgid "D" msgstr "D" #: ../gtk/main.ui.h:30 -msgid "Default" -msgstr "Výchozí" +msgid "#" +msgstr "#" #: ../gtk/main.ui.h:31 -msgid "Duration" -msgstr "Délka" +msgid "0" +msgstr "0" #: ../gtk/main.ui.h:32 -msgid "Enable self-view" -msgstr "Zobrazovat sám sebe" +msgid "*" +msgstr "*" -#: ../gtk/main.ui.h:33 -msgid "Enable video" -msgstr "Zapnout video" +#: ../gtk/main.ui.h:33 ../gtk/parameters.ui.h:7 +msgid "C" +msgstr "C" #: ../gtk/main.ui.h:34 -msgid "Enter username, phone number, or full sip address" -msgstr "Zadejte uživatelské jméno, telefonní číslo nebo plnou sipovou adresu" +msgid "9" +msgstr "9" #: ../gtk/main.ui.h:35 -msgid "Fiber Channel" -msgstr "Fiber Channel" +msgid "8" +msgstr "8" #: ../gtk/main.ui.h:36 -msgid "In call" -msgstr "Telefonuje se" +msgid "7" +msgstr "7" #: ../gtk/main.ui.h:37 -msgid "Initiate a new call" -msgstr "Zahájit nový hovor" +msgid "B" +msgstr "B" #: ../gtk/main.ui.h:38 -msgid "Internet connection:" -msgstr "Připojení k Internetu:" +msgid "6" +msgstr "6" #: ../gtk/main.ui.h:39 -msgid "Keypad" -msgstr "Klávesnice" +msgid "5" +msgstr "5" #: ../gtk/main.ui.h:40 -msgid "Login information" -msgstr "Informace o přihlášení" +msgid "4" +msgstr "4" #: ../gtk/main.ui.h:41 -msgid "Lookup:" -msgstr "Hledat:" +msgid "A" +msgstr "A" #: ../gtk/main.ui.h:42 -msgid "My current identity:" -msgstr "Moje současná totožnost:" +msgid "3" +msgstr "3" #: ../gtk/main.ui.h:43 -msgid "Online users" -msgstr "připojených uživatelích" +msgid "2" +msgstr "2" #: ../gtk/main.ui.h:44 -msgid "Password" -msgstr "Heslo" +msgid "1" +msgstr "1" -#: ../gtk/main.ui.h:46 -msgid "Recent calls" -msgstr "Nedávné hovory" - -#: ../gtk/main.ui.h:47 -msgid "SIP address or phone number:" -msgstr "SIP adresa nebo telefonní číslo:" - -#: ../gtk/main.ui.h:48 +#: ../gtk/main.ui.h:45 msgid "Search" msgstr "Hledat" -#: ../gtk/main.ui.h:50 -msgid "Show debug window" -msgstr "Zobrazit ladicí okno" +#: ../gtk/main.ui.h:46 +msgid "Add contacts from directory" +msgstr "Přidat kontakty z adresáře" -#: ../gtk/main.ui.h:51 +#: ../gtk/main.ui.h:47 +msgid "Add contact" +msgstr "Přidat kontakt" + +#: ../gtk/main.ui.h:48 +msgid "Keypad" +msgstr "Klávesnice" + +#: ../gtk/main.ui.h:49 +msgid "Recent calls" +msgstr "Nedávné hovory" + +#: ../gtk/main.ui.h:50 +msgid "My current identity:" +msgstr "Moje současná totožnost:" + +#: ../gtk/main.ui.h:51 ../gtk/tunnel_config.ui.h:7 msgid "Username" msgstr "Uživatelské jméno" -#: ../gtk/main.ui.h:52 -msgid "_Help" -msgstr "Nápo_věda" +#: ../gtk/main.ui.h:52 ../gtk/tunnel_config.ui.h:8 +msgid "Password" +msgstr "Heslo" #: ../gtk/main.ui.h:53 -msgid "_Homepage" -msgstr "_Domovská stránka" +msgid "Internet connection:" +msgstr "Připojení k Internetu:" #: ../gtk/main.ui.h:54 -msgid "_Options" -msgstr "V_olby" +msgid "Automatically log me in" +msgstr "Přihlašovat mě automaticky" #: ../gtk/main.ui.h:55 -msgid "in" -msgstr "ve" +msgid "Login information" +msgstr "Informace o přihlášení" -# XXX: Do not translate, this is GTK identifier #: ../gtk/main.ui.h:56 -msgid "label" +msgid "Welcome !" +msgstr "Vítejte!" + +#: ../gtk/main.ui.h:57 +msgid "All users" +msgstr "všech uživatelích" + +#: ../gtk/main.ui.h:58 +msgid "Online users" +msgstr "připojených uživatelích" + +#: ../gtk/main.ui.h:59 +msgid "ADSL" +msgstr "ADSL" + +#: ../gtk/main.ui.h:60 +msgid "Fiber Channel" +msgstr "Fiber Channel" + +#: ../gtk/main.ui.h:61 +msgid "Default" +msgstr "Výchozí" + +#: ../gtk/main.ui.h:62 +msgid "Delete" msgstr "" #: ../gtk/about.ui.h:1 -msgid "(C) Belledonne Communications,2010\n" -msgstr "© Belledonne Communications, 2010\n" - -#: ../gtk/about.ui.h:3 msgid "About linphone" msgstr "O Linphonu" +#: ../gtk/about.ui.h:2 +msgid "(C) Belledonne Communications,2010\n" +msgstr "© Belledonne Communications, 2010\n" + #: ../gtk/about.ui.h:4 msgid "An internet video phone using the standard SIP (rfc3261) protocol." msgstr "Internetový videofon používající standardní protokol SIP (RFC 3261)." @@ -809,155 +972,332 @@ msgstr "" "cs: Petr Písař \n" "hu: anonym\n" -#: ../gtk/contact.ui.h:1 -msgid "Contact information" -msgstr "Informace o kontaktu" - #: ../gtk/contact.ui.h:2 -msgid "Allow this contact to see my presence status" -msgstr "Dovolit tomuto kontaktu, aby viděl můj stav přítomnosti" - -#: ../gtk/contact.ui.h:4 msgid "SIP Address" msgstr "SIP adresa" -#: ../gtk/contact.ui.h:5 +#: ../gtk/contact.ui.h:3 msgid "Show this contact presence status" msgstr "U tohoto kontaktu zobrazovat stav přítomnosti" +#: ../gtk/contact.ui.h:4 +msgid "Allow this contact to see my presence status" +msgstr "Dovolit tomuto kontaktu, aby viděl můj stav přítomnosti" + +#: ../gtk/contact.ui.h:5 +msgid "Contact information" +msgstr "Informace o kontaktu" + #: ../gtk/log.ui.h:1 msgid "Linphone debug window" msgstr "Ladicí okno Linphonu" +#: ../gtk/log.ui.h:2 +msgid "Scroll to end" +msgstr "" + #: ../gtk/password.ui.h:1 msgid "Linphone - Authentication required" msgstr "Linphone – Ověření totožnosti vyžadováno" #: ../gtk/password.ui.h:2 -msgid "Password:" -msgstr "Heslo:" - -#: ../gtk/password.ui.h:3 msgid "Please enter the domain password" msgstr "Prosím, zadejte heslo pro doménu" -#: ../gtk/password.ui.h:4 +#: ../gtk/password.ui.h:3 msgid "UserID" msgstr "Identifikátor uživatele" #: ../gtk/call_logs.ui.h:1 -msgid "Call back" -msgstr "Zavolat zpátky" - -#: ../gtk/call_logs.ui.h:2 msgid "Call history" msgstr "Historie volání" -#: ../gtk/call_logs.ui.h:3 +#: ../gtk/call_logs.ui.h:2 msgid "Clear all" msgstr "Vše smazat" -#: ../gtk/sip_account.ui.h:1 -msgid "Configure a SIP account" -msgstr "Nastavit SIP účet" +#: ../gtk/call_logs.ui.h:3 +msgid "Call back" +msgstr "Zavolat zpátky" -#: ../gtk/sip_account.ui.h:2 +#: ../gtk/sip_account.ui.h:1 msgid "Linphone - Configure a SIP account" msgstr "Linphone – Nastav SIP účet" -#: ../gtk/sip_account.ui.h:3 -msgid "Looks like sip:" -msgstr "Vypadá jako sip:" - -#: ../gtk/sip_account.ui.h:4 -msgid "Looks like sip:@" -msgstr "Vypadá jako sip:@" - -#: ../gtk/sip_account.ui.h:5 -msgid "Publish presence information" -msgstr "Zveřejnit stav přítomnosti" - -#: ../gtk/sip_account.ui.h:6 -msgid "Register" -msgstr "" - -#: ../gtk/sip_account.ui.h:7 -msgid "Registration duration (sec):" -msgstr "Registrační období (s):" - -#: ../gtk/sip_account.ui.h:8 -msgid "Route (optional):" -msgstr "Směrování (volitelné):" - -#: ../gtk/sip_account.ui.h:9 -msgid "SIP Proxy address:" -msgstr "Adresa SIP proxy:" - -#: ../gtk/sip_account.ui.h:10 +#: ../gtk/sip_account.ui.h:2 msgid "Your SIP identity:" msgstr "Vaše SIP totožnost:" -#: ../gtk/sip_account.ui.h:11 +#: ../gtk/sip_account.ui.h:3 +msgid "Looks like sip:@" +msgstr "Vypadá jako sip:@" + +#: ../gtk/sip_account.ui.h:4 msgid "sip:" msgstr "sip:" -#: ../gtk/chatroom.ui.h:1 -msgid "Send" -msgstr "Odeslat" +#: ../gtk/sip_account.ui.h:5 +msgid "SIP Proxy address:" +msgstr "Adresa SIP proxy:" + +#: ../gtk/sip_account.ui.h:6 +msgid "Looks like sip:" +msgstr "Vypadá jako sip:" + +#: ../gtk/sip_account.ui.h:7 +msgid "Route (optional):" +msgstr "Směrování (volitelné):" + +#: ../gtk/sip_account.ui.h:8 +msgid "Registration duration (sec):" +msgstr "Registrační období (s):" + +#: ../gtk/sip_account.ui.h:9 +msgid "Register" +msgstr "" + +#: ../gtk/sip_account.ui.h:10 +msgid "Publish presence information" +msgstr "Zveřejnit stav přítomnosti" + +#: ../gtk/sip_account.ui.h:11 +msgid "Configure a SIP account" +msgstr "Nastavit SIP účet" #: ../gtk/parameters.ui.h:1 -msgid "0 stands for \"unlimited\"" -msgstr "0 znamená „neomezeno“" +msgid "default soundcard" +msgstr "implicitní zvuková karta" #: ../gtk/parameters.ui.h:2 -msgid "Audio" -msgstr "Zvuk" +msgid "a sound card" +msgstr "zvuková karta" #: ../gtk/parameters.ui.h:3 -msgid "Bandwidth control" -msgstr "Využití šířky pásma" +msgid "default camera" +msgstr "implicitní kamera" #: ../gtk/parameters.ui.h:4 -msgid "Codecs" -msgstr "Kodeky" +msgid "CIF" +msgstr "CIF" #: ../gtk/parameters.ui.h:5 -msgid "Default identity" -msgstr "Implicitní totožnost" +msgid "Audio codecs" +msgstr "Kodeky zvuku" #: ../gtk/parameters.ui.h:6 -msgid "Language" -msgstr "Jazyk" - -#: ../gtk/parameters.ui.h:7 -msgid "Level" -msgstr "Úroveň" +msgid "Video codecs" +msgstr "Kodeky obrazu" #: ../gtk/parameters.ui.h:8 -msgid "NAT and Firewall" -msgstr "NAT a firewall" +msgid "SIP (UDP)" +msgstr "SIP (UDP)" #: ../gtk/parameters.ui.h:9 -msgid "Network protocol and ports" -msgstr "Síťové protokoly a porty" +msgid "SIP (TCP)" +msgstr "SIP (TCP)" #: ../gtk/parameters.ui.h:10 -msgid "Privacy" -msgstr "Soukromí" +msgid "SIP (TLS)" +msgstr "SIP (TLS)" #: ../gtk/parameters.ui.h:11 -msgid "Proxy accounts" -msgstr "Proxy účty" +msgid "Settings" +msgstr "Nastavení" #: ../gtk/parameters.ui.h:12 +msgid "Set Maximum Transmission Unit:" +msgstr "Nastavit MTU (největší přenositelná zpráva):" + +#: ../gtk/parameters.ui.h:13 +msgid "Send DTMFs as SIP info" +msgstr "Odesílat tóny DTMF jako SIP INFO zprávy" + +#: ../gtk/parameters.ui.h:14 +msgid "Use IPv6 instead of IPv4" +msgstr "Používat IPv6 místo IPv4" + +#: ../gtk/parameters.ui.h:15 msgid "Transport" msgstr "Přenos" -#: ../gtk/parameters.ui.h:13 +#: ../gtk/parameters.ui.h:16 +msgid "Media encryption type" +msgstr "Druh šifrování médií" + +#: ../gtk/parameters.ui.h:17 +msgid "Tunnel" +msgstr "" + +#: ../gtk/parameters.ui.h:18 +msgid "Video RTP/UDP:" +msgstr "Obrazový RTP/UDP:" + +#: ../gtk/parameters.ui.h:19 +msgid "Audio RTP/UDP:" +msgstr "Zvukový RTP/UDP:" + +#: ../gtk/parameters.ui.h:20 +msgid "DSCP fields" +msgstr "" + +#: ../gtk/parameters.ui.h:21 +msgid "Fixed" +msgstr "" + +#: ../gtk/parameters.ui.h:22 +msgid "Network protocol and ports" +msgstr "Síťové protokoly a porty" + +#: ../gtk/parameters.ui.h:23 +msgid "Direct connection to the Internet" +msgstr "Přímé připojení do Internetu" + +#: ../gtk/parameters.ui.h:24 +msgid "Behind NAT / Firewall (specify gateway IP below)" +msgstr "Za NAT/firewallem (adresu brány zadejte níže)" + +#: ../gtk/parameters.ui.h:25 +msgid "Public IP address:" +msgstr "Veřejná IP adresa:" + +#: ../gtk/parameters.ui.h:26 +msgid "Behind NAT / Firewall (use STUN to resolve)" +msgstr "Za NAT/firewallem (adresu určí STUN)" + +#: ../gtk/parameters.ui.h:27 +#, fuzzy +msgid "Behind NAT / Firewall (use ICE)" +msgstr "Za NAT/firewallem (adresu určí STUN)" + +#: ../gtk/parameters.ui.h:28 +msgid "Stun server:" +msgstr "STUN server:" + +#: ../gtk/parameters.ui.h:29 +msgid "NAT and Firewall" +msgstr "NAT a firewall" + +#: ../gtk/parameters.ui.h:30 +msgid "Network settings" +msgstr "Nastavení sítě" + +#: ../gtk/parameters.ui.h:31 +msgid "Ring sound:" +msgstr "Vyzvánění:" + +#: ../gtk/parameters.ui.h:32 +msgid "ALSA special device (optional):" +msgstr "Zvláštní ALSA zařízení (volitelné):" + +#: ../gtk/parameters.ui.h:33 +msgid "Capture device:" +msgstr "Zařízení pro nahrávání:" + +#: ../gtk/parameters.ui.h:34 +msgid "Ring device:" +msgstr "Zařízení pro vyzvánění:" + +#: ../gtk/parameters.ui.h:35 +msgid "Playback device:" +msgstr "Zařízení pro přehrávání:" + +#: ../gtk/parameters.ui.h:36 +msgid "Enable echo cancellation" +msgstr "Zapnout potlačení ozvěny" + +#: ../gtk/parameters.ui.h:37 +msgid "Audio" +msgstr "Zvuk" + +#: ../gtk/parameters.ui.h:38 +msgid "Video input device:" +msgstr "Vstupní zařízení obrazu:" + +#: ../gtk/parameters.ui.h:39 +msgid "Prefered video resolution:" +msgstr "Upřednostňované rozlišení obrazu:" + +#: ../gtk/parameters.ui.h:40 msgid "Video" msgstr "Obraz" -#: ../gtk/parameters.ui.h:14 +#: ../gtk/parameters.ui.h:41 +msgid "Multimedia settings" +msgstr "Nastavení multimédií" + +#: ../gtk/parameters.ui.h:42 +msgid "This section defines your SIP address when not using a SIP account" +msgstr "Tento oddíl určuje vaši SIP adresu, když se nepoužívá žádný účet" + +#: ../gtk/parameters.ui.h:43 +msgid "Your display name (eg: John Doe):" +msgstr "Vaše zobrazované jméno (např. Jan Novák):" + +#: ../gtk/parameters.ui.h:44 +msgid "Your username:" +msgstr "Vaše uživatelské jméno:" + +#: ../gtk/parameters.ui.h:45 +msgid "Your resulting SIP address:" +msgstr "Vaše výsledná SIP adresa:" + +#: ../gtk/parameters.ui.h:46 +msgid "Default identity" +msgstr "Implicitní totožnost" + +#: ../gtk/parameters.ui.h:47 +msgid "Wizard" +msgstr "" + +#: ../gtk/parameters.ui.h:50 +msgid "Remove" +msgstr "Odstranit" + +#: ../gtk/parameters.ui.h:51 +msgid "Proxy accounts" +msgstr "Proxy účty" + +#: ../gtk/parameters.ui.h:52 +msgid "Erase all passwords" +msgstr "Vymazat všechna hesla" + +#: ../gtk/parameters.ui.h:53 +msgid "Privacy" +msgstr "Soukromí" + +#: ../gtk/parameters.ui.h:54 +msgid "Manage SIP Accounts" +msgstr "Nastavení SIP účtů" + +#: ../gtk/parameters.ui.h:55 ../gtk/tunnel_config.ui.h:4 +msgid "Enable" +msgstr "Povolit" + +#: ../gtk/parameters.ui.h:56 ../gtk/tunnel_config.ui.h:5 +msgid "Disable" +msgstr "Zakázat" + +#: ../gtk/parameters.ui.h:57 +msgid "Codecs" +msgstr "Kodeky" + +#: ../gtk/parameters.ui.h:58 +msgid "0 stands for \"unlimited\"" +msgstr "0 znamená „neomezeno“" + +#: ../gtk/parameters.ui.h:59 +msgid "Upload speed limit in Kbit/sec:" +msgstr "Omezení odchozí rychlosti (kb/s):" + +#: ../gtk/parameters.ui.h:60 +msgid "Download speed limit in Kbit/sec:" +msgstr "Omezení příchozí rychlosti (kb/s):" + +#: ../gtk/parameters.ui.h:61 +msgid "Enable adaptive rate control" +msgstr "Zapnout přizpůsobující řízení rychlosti" + +#: ../gtk/parameters.ui.h:62 msgid "" "Adaptive rate control is a technique to dynamically guess the available " "bandwidth during a call." @@ -965,221 +1305,45 @@ msgstr "" "Přizpůsobující se řízení rychlosti je technika dynamického odhadu " "dostupného pásma během hovoru." -#: ../gtk/parameters.ui.h:15 -msgid "ALSA special device (optional):" -msgstr "Zvláštní ALSA zařízení (volitelné):" +#: ../gtk/parameters.ui.h:63 +msgid "Bandwidth control" +msgstr "Využití šířky pásma" -#: ../gtk/parameters.ui.h:16 -msgid "Add" -msgstr "Přidat" - -#: ../gtk/parameters.ui.h:17 -msgid "Audio RTP/UDP:" -msgstr "Zvukový RTP/UDP:" - -#: ../gtk/parameters.ui.h:18 -msgid "Audio codecs" -msgstr "Kodeky zvuku" - -#: ../gtk/parameters.ui.h:19 -msgid "Behind NAT / Firewall (specify gateway IP below)" -msgstr "Za NAT/firewallem (adresu brány zadejte níže)" - -#: ../gtk/parameters.ui.h:20 -msgid "Behind NAT / Firewall (use STUN to resolve)" -msgstr "Za NAT/firewallem (adresu určí STUN)" - -#: ../gtk/parameters.ui.h:22 -msgid "CIF" -msgstr "CIF" - -#: ../gtk/parameters.ui.h:23 -msgid "Capture device:" -msgstr "Zařízení pro nahrávání:" - -#: ../gtk/parameters.ui.h:24 +#: ../gtk/parameters.ui.h:64 msgid "Codecs" msgstr "Kodeky" -#: ../gtk/parameters.ui.h:25 -msgid "Direct connection to the Internet" -msgstr "Přímé připojení do Internetu" +#: ../gtk/parameters.ui.h:65 +msgid "Language" +msgstr "Jazyk" -#: ../gtk/parameters.ui.h:26 -msgid "Disable" -msgstr "Zakázat" - -#: ../gtk/parameters.ui.h:27 -msgid "Done" -msgstr "Hotovo" - -#: ../gtk/parameters.ui.h:28 -msgid "Download speed limit in Kbit/sec:" -msgstr "Omezení příchozí rychlosti (kb/s):" - -#: ../gtk/parameters.ui.h:29 -msgid "Edit" -msgstr "Upravit" - -#: ../gtk/parameters.ui.h:30 -msgid "Enable" -msgstr "Povolit" - -#: ../gtk/parameters.ui.h:31 -msgid "Enable adaptive rate control" -msgstr "Zapnout přizpůsobující řízení rychlosti" - -#: ../gtk/parameters.ui.h:32 -msgid "Enable echo cancellation" -msgstr "Zapnout potlačení ozvěny" - -#: ../gtk/parameters.ui.h:33 -msgid "Erase all passwords" -msgstr "Vymazat všechna hesla" - -#: ../gtk/parameters.ui.h:34 -msgid "Manage SIP Accounts" -msgstr "Nastavení SIP účtů" - -#: ../gtk/parameters.ui.h:35 -msgid "Media encryption type" -msgstr "Druh šifrování médií" - -#: ../gtk/parameters.ui.h:36 -msgid "Multimedia settings" -msgstr "Nastavení multimédií" - -#: ../gtk/parameters.ui.h:37 -msgid "Network settings" -msgstr "Nastavení sítě" - -#: ../gtk/parameters.ui.h:38 -msgid "Playback device:" -msgstr "Zařízení pro přehrávání:" - -#: ../gtk/parameters.ui.h:39 -msgid "Prefered video resolution:" -msgstr "Upřednostňované rozlišení obrazu:" - -#: ../gtk/parameters.ui.h:40 -msgid "Public IP address:" -msgstr "Veřejná IP adresa:" - -#: ../gtk/parameters.ui.h:41 -msgid "" -"Register to FONICS\n" -"virtual network !" -msgstr "" -"Zaregistrovat se do\n" -"virtuální sítě FONICS!" - -#: ../gtk/parameters.ui.h:43 -msgid "Remove" -msgstr "Odstranit" - -#: ../gtk/parameters.ui.h:44 -msgid "Ring device:" -msgstr "Zařízení pro vyzvánění:" - -#: ../gtk/parameters.ui.h:45 -msgid "Ring sound:" -msgstr "Vyzvánění:" - -#: ../gtk/parameters.ui.h:46 -msgid "SIP (TCP)" -msgstr "SIP (TCP)" - -#: ../gtk/parameters.ui.h:47 -msgid "SIP (TLS)" -msgstr "SIP (TLS)" - -#: ../gtk/parameters.ui.h:48 -msgid "SIP (UDP)" -msgstr "SIP (UDP)" - -#: ../gtk/parameters.ui.h:49 -msgid "Send DTMFs as SIP info" -msgstr "Odesílat tóny DTMF jako SIP INFO zprávy" - -#: ../gtk/parameters.ui.h:50 -msgid "Set Maximum Transmission Unit:" -msgstr "Nastavit MTU (největší přenositelná zpráva):" - -#: ../gtk/parameters.ui.h:51 -msgid "Settings" -msgstr "Nastavení" - -#: ../gtk/parameters.ui.h:52 +#: ../gtk/parameters.ui.h:66 msgid "Show advanced settings" msgstr "Zobrazit podrobnější nastavení" -#: ../gtk/parameters.ui.h:53 -msgid "Stun server:" -msgstr "STUN server:" +#: ../gtk/parameters.ui.h:67 +msgid "Level" +msgstr "Úroveň" -#: ../gtk/parameters.ui.h:54 -msgid "This section defines your SIP address when not using a SIP account" -msgstr "Tento oddíl určuje vaši SIP adresu, když se nepoužívá žádný účet" - -#: ../gtk/parameters.ui.h:55 -msgid "Upload speed limit in Kbit/sec:" -msgstr "Omezení odchozí rychlosti (kb/s):" - -#: ../gtk/parameters.ui.h:56 -msgid "Use IPv6 instead of IPv4" -msgstr "Používat IPv6 místo IPv4" - -#: ../gtk/parameters.ui.h:57 +#: ../gtk/parameters.ui.h:68 msgid "User interface" msgstr "Uživatelské rozhraní" -#: ../gtk/parameters.ui.h:58 -msgid "Video RTP/UDP:" -msgstr "Obrazový RTP/UDP:" - -#: ../gtk/parameters.ui.h:59 -msgid "Video codecs" -msgstr "Kodeky obrazu" - -#: ../gtk/parameters.ui.h:60 -msgid "Video input device:" -msgstr "Vstupní zařízení obrazu:" - -#: ../gtk/parameters.ui.h:61 -msgid "Your display name (eg: John Doe):" -msgstr "Vaše zobrazované jméno (např. Jan Novák):" - -#: ../gtk/parameters.ui.h:62 -msgid "Your resulting SIP address:" -msgstr "Vaše výsledná SIP adresa:" - -#: ../gtk/parameters.ui.h:63 -msgid "Your username:" -msgstr "Vaše uživatelské jméno:" - -#: ../gtk/parameters.ui.h:64 -msgid "a sound card" -msgstr "zvuková karta" - -#: ../gtk/parameters.ui.h:65 -msgid "default camera" -msgstr "implicitní kamera" - -#: ../gtk/parameters.ui.h:66 -msgid "default soundcard" -msgstr "implicitní zvuková karta" +#: ../gtk/parameters.ui.h:69 +msgid "Done" +msgstr "Hotovo" #: ../gtk/buddylookup.ui.h:1 -msgid "Search somebody" -msgstr "Hledat někoho" +msgid "Search contacts in directory" +msgstr "Hledat kontakty v adresáři" #: ../gtk/buddylookup.ui.h:2 msgid "Add to my list" msgstr "Přidat na svůj seznam" #: ../gtk/buddylookup.ui.h:3 -msgid "Search contacts in directory" -msgstr "Hledat kontakty v adresáři" +msgid "Search somebody" +msgstr "Hledat někoho" #: ../gtk/waiting.ui.h:1 msgid "Linphone" @@ -1189,19 +1353,96 @@ msgstr "Linphone" msgid "Please wait" msgstr "Prosím, čekejte" -#: ../coreapi/linphonecore.c:187 +#: ../gtk/dscp_settings.ui.h:1 +#, fuzzy +msgid "Dscp settings" +msgstr "Nastavení" + +#: ../gtk/dscp_settings.ui.h:2 +msgid "SIP" +msgstr "SIP" + +#: ../gtk/dscp_settings.ui.h:3 +#, fuzzy +msgid "Audio RTP stream" +msgstr "Převzorkování zvuku" + +#: ../gtk/dscp_settings.ui.h:4 +#, fuzzy +msgid "Video RTP stream" +msgstr "Obrazový RTP/UDP:" + +#: ../gtk/dscp_settings.ui.h:5 +msgid "Set DSCP values (in hexadecimal)" +msgstr "" + +#: ../gtk/call_statistics.ui.h:1 +#, fuzzy +msgid "Call statistics" +msgstr "Informace o hovoru" + +#: ../gtk/call_statistics.ui.h:2 +#, fuzzy +msgid "Audio codec" +msgstr "Kodeky zvuku" + +#: ../gtk/call_statistics.ui.h:3 +#, fuzzy +msgid "Video codec" +msgstr "Kodeky obrazu" + +#: ../gtk/call_statistics.ui.h:4 +msgid "Audio IP bandwidth usage" +msgstr "" + +#: ../gtk/call_statistics.ui.h:5 +#, fuzzy +msgid "Media connectivity" +msgstr "Druh šifrování médií" + +#: ../gtk/call_statistics.ui.h:6 +msgid "Video IP bandwidth usage" +msgstr "" + +#: ../gtk/call_statistics.ui.h:7 +#, fuzzy +msgid "Call statistics and information" +msgstr "Informace o kontaktu" + +#: ../gtk/tunnel_config.ui.h:1 +#, fuzzy +msgid "Configure VoIP tunnel" +msgstr "Nastavit SIP účet" + +#: ../gtk/tunnel_config.ui.h:2 +msgid "Host" +msgstr "" + +#: ../gtk/tunnel_config.ui.h:3 +msgid "Port" +msgstr "" + +#: ../gtk/tunnel_config.ui.h:6 +msgid "Configure tunnel" +msgstr "" + +#: ../gtk/tunnel_config.ui.h:9 +msgid "Configure http proxy (optional)" +msgstr "" + +#: ../coreapi/linphonecore.c:232 msgid "aborted" msgstr "přerušen" -#: ../coreapi/linphonecore.c:190 +#: ../coreapi/linphonecore.c:235 msgid "completed" msgstr "dokončen" -#: ../coreapi/linphonecore.c:193 +#: ../coreapi/linphonecore.c:238 msgid "missed" msgstr "promeškán" -#: ../coreapi/linphonecore.c:198 +#: ../coreapi/linphonecore.c:243 #, c-format msgid "" "%s at %s\n" @@ -1216,62 +1457,74 @@ msgstr "" "Stav: %s\n" "Délka: %i min %i s\n" -#: ../coreapi/linphonecore.c:199 +#: ../coreapi/linphonecore.c:244 msgid "Outgoing call" msgstr "Odchozí hovor" -#: ../coreapi/linphonecore.c:1088 +#: ../coreapi/linphonecore.c:1226 msgid "Ready" msgstr "Připraven." -#: ../coreapi/linphonecore.c:1831 +#: ../coreapi/linphonecore.c:2074 msgid "Looking for telephone number destination..." msgstr "Vyhledává se umístění čísla…" -#: ../coreapi/linphonecore.c:1834 +#: ../coreapi/linphonecore.c:2077 msgid "Could not resolve this number." msgstr "Toto číslo nelze vyhledat." -#: ../coreapi/linphonecore.c:1878 +#: ../coreapi/linphonecore.c:2121 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:2025 +#: ../coreapi/linphonecore.c:2312 msgid "Contacting" msgstr "Kontaktuji" -#: ../coreapi/linphonecore.c:2032 +#: ../coreapi/linphonecore.c:2319 msgid "Could not call" msgstr "Nelze volat" -#: ../coreapi/linphonecore.c:2140 +#: ../coreapi/linphonecore.c:2429 msgid "Sorry, we have reached the maximum number of simultaneous calls" msgstr "Je nám líto, ale byl dosažen maximální počet současných hovorů." -#: ../coreapi/linphonecore.c:2270 +#: ../coreapi/linphonecore.c:2573 +msgid "is contacting you" +msgstr "vás volá" + +#: ../coreapi/linphonecore.c:2574 +msgid " and asked autoanswer." +msgstr " a požaduje automatickou zvednutí." + +#: ../coreapi/linphonecore.c:2574 +msgid "." +msgstr "." + +#: ../coreapi/linphonecore.c:2636 msgid "Modifying call parameters..." msgstr "Upravují se parametry hovoru…" -#: ../coreapi/linphonecore.c:2366 +#: ../coreapi/linphonecore.c:2908 msgid "Connected." msgstr "Připojeno." -#: ../coreapi/linphonecore.c:2389 +#: ../coreapi/linphonecore.c:2931 msgid "Call aborted" msgstr "Hovor přerušen" -#: ../coreapi/linphonecore.c:2530 +#: ../coreapi/linphonecore.c:3102 msgid "Could not pause the call" msgstr "Hovor nebylo možné odložit" -#: ../coreapi/linphonecore.c:2535 +#: ../coreapi/linphonecore.c:3107 msgid "Pausing the current call..." msgstr "Současný hovor se odkládá…" -#: ../coreapi/misc.c:147 +#: ../coreapi/misc.c:148 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the pcm oss emulation module\n" @@ -1283,7 +1536,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:150 +#: ../coreapi/misc.c:151 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the mixer oss emulation module\n" @@ -1295,10 +1548,14 @@ 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:478 +#: ../coreapi/misc.c:496 msgid "Stun lookup in progress..." msgstr "Hledá se adresa pomocí STUN…" +#: ../coreapi/misc.c:630 +msgid "ICE local candidates gathering in progress..." +msgstr "" + #: ../coreapi/friend.c:33 msgid "Online" msgstr "Připojeno" @@ -1347,7 +1604,7 @@ msgstr "Čeká" msgid "Unknown-bug" msgstr "Neznámá chyba" -#: ../coreapi/proxy.c:192 +#: ../coreapi/proxy.c:204 msgid "" "The sip proxy address you entered is invalid, it must start with \"sip:\" " "followed by a hostname." @@ -1355,7 +1612,7 @@ msgstr "" "Adresa SIP proxy, kterou jste zadali, není platná. Musí začínat na „sip:“ a " "pak musí následovat jméno stroje." -#: ../coreapi/proxy.c:198 +#: ../coreapi/proxy.c:210 msgid "" "The sip identity you entered is invalid.\n" "It should look like sip:username@proxydomain, such as sip:alice@example.net" @@ -1363,140 +1620,126 @@ msgstr "" "SIP identita, kterou jste zadali, není platná.\n" "Měla by mít tvar sip:uživatel@proxydoména, například sip:alice@example.net" -#: ../coreapi/proxy.c:690 +#: ../coreapi/proxy.c:1053 #, c-format msgid "Could not login as %s" msgstr "Nelze se přihlásit jako %s" -#: ../coreapi/callbacks.c:206 -msgid "is contacting you" -msgstr "vás volá" - -#: ../coreapi/callbacks.c:207 -msgid " and asked autoanswer." -msgstr " a požaduje automatickou zvednutí." - -#: ../coreapi/callbacks.c:207 -msgid "." -msgstr "." - -#: ../coreapi/callbacks.c:266 +#: ../coreapi/callbacks.c:276 msgid "Remote ringing." msgstr "Vyzvání na druhé straně." -#: ../coreapi/callbacks.c:282 +#: ../coreapi/callbacks.c:296 msgid "Remote ringing..." msgstr "Vyzvání na druhé straně…" -#: ../coreapi/callbacks.c:293 +#: ../coreapi/callbacks.c:307 msgid "Early media." msgstr "Časná média." -#: ../coreapi/callbacks.c:331 +#: ../coreapi/callbacks.c:352 #, c-format msgid "Call with %s is paused." msgstr "Hovor s %s je odložen." -#: ../coreapi/callbacks.c:342 +#: ../coreapi/callbacks.c:365 #, c-format msgid "Call answered by %s - on hold." msgstr "Hovor přijat kým: %s – odložen." -#: ../coreapi/callbacks.c:357 +#: ../coreapi/callbacks.c:376 msgid "Call resumed." msgstr "Hovor obnoven." -#: ../coreapi/callbacks.c:362 +#: ../coreapi/callbacks.c:381 #, c-format msgid "Call answered by %s." msgstr "Hovor přijat kým: %s." -#: ../coreapi/callbacks.c:432 -msgid "We are being paused..." -msgstr "Jsme odkládáni…" +#: ../coreapi/callbacks.c:396 +msgid "Incompatible, check codecs..." +msgstr "" -#: ../coreapi/callbacks.c:436 -msgid "We have been resumed..." +#: ../coreapi/callbacks.c:437 +#, fuzzy +msgid "We have been resumed." msgstr "Byli jsme obnoveni…" -#: ../coreapi/callbacks.c:441 -msgid "Call has been updated by remote..." +#: ../coreapi/callbacks.c:446 +msgid "We are paused by other party." +msgstr "" + +#: ../coreapi/callbacks.c:452 +#, fuzzy +msgid "Call is updated by remote." msgstr "Hovor byl aktualizován protistranou…" -#: ../coreapi/callbacks.c:473 +#: ../coreapi/callbacks.c:521 msgid "Call terminated." msgstr "Hovor ukončen." -#: ../coreapi/callbacks.c:480 +#: ../coreapi/callbacks.c:528 msgid "User is busy." msgstr "Uživatel je zaneprázdněn." -#: ../coreapi/callbacks.c:481 +#: ../coreapi/callbacks.c:529 msgid "User is temporarily unavailable." msgstr "Uživatel je dočasně nedostupný." #. char *retrymsg=_("%s. Retry after %i minute(s)."); -#: ../coreapi/callbacks.c:483 +#: ../coreapi/callbacks.c:531 msgid "User does not want to be disturbed." msgstr "Uživatel si nepřeje být rušen." -#: ../coreapi/callbacks.c:484 +#: ../coreapi/callbacks.c:532 msgid "Call declined." msgstr "Volání odmítnuto." -#: ../coreapi/callbacks.c:496 +#: ../coreapi/callbacks.c:544 msgid "No response." msgstr "Žádná odpověď." -#: ../coreapi/callbacks.c:500 +#: ../coreapi/callbacks.c:548 msgid "Protocol error." msgstr "Chyba protokolu." -#: ../coreapi/callbacks.c:516 +#: ../coreapi/callbacks.c:564 msgid "Redirected" msgstr "Přesměrováno" -#: ../coreapi/callbacks.c:526 -msgid "Not found" -msgstr "Nenalezeno" +#: ../coreapi/callbacks.c:600 +msgid "Incompatible media parameters." +msgstr "" -#: ../coreapi/callbacks.c:551 -msgid "No common codecs" -msgstr "Žádný společný formát" - -#: ../coreapi/callbacks.c:557 +#: ../coreapi/callbacks.c:606 msgid "Call failed." msgstr "Volání se nezdařilo." -#: ../coreapi/callbacks.c:631 +#: ../coreapi/callbacks.c:701 #, c-format msgid "Registration on %s successful." msgstr "Registrace na %s byla úspěšná." -#: ../coreapi/callbacks.c:632 +#: ../coreapi/callbacks.c:702 #, c-format msgid "Unregistration on %s done." msgstr "Odregistrování z %s hotovo." -#: ../coreapi/callbacks.c:648 +#: ../coreapi/callbacks.c:722 msgid "no response timeout" msgstr "odpověď nedorazila včas" -#: ../coreapi/callbacks.c:651 +#: ../coreapi/callbacks.c:725 #, c-format msgid "Registration on %s failed: %s" msgstr "Registrace na %s selhala: %s" -#: ../coreapi/sal_eXosip2.c:873 ../coreapi/sal_eXosip2.c:875 -msgid "Authentication failure" -msgstr "Selhání ověření totožnosti" - -#: ../coreapi/linphonecall.c:128 +#: ../coreapi/linphonecall.c:129 #, c-format msgid "Authentication token is %s" msgstr "Klíč k ověření totožnosti je %s" -#: ../coreapi/linphonecall.c:1560 +#: ../coreapi/linphonecall.c:2124 #, c-format msgid "You have missed %i call." msgid_plural "You have missed %i calls." @@ -1504,6 +1747,74 @@ msgstr[0] "Máte %i zmeškaný hovor." msgstr[1] "Máte %i zmeškané hovory." msgstr[2] "Máte %i zmeškaných hovorů." +#~ msgid "Chat with %s" +#~ msgstr "Diskuze s %s" + +#~ msgid "Please choose a username:" +#~ msgstr "Prosím, vyberte si uživatelské jméno:" + +#~ msgid "Checking if '%s' is available..." +#~ msgstr "Zjišťuji, zda-li je „%s“ přípustné…" + +#~ msgid "Please wait..." +#~ msgstr "Prosím, čekejte…" + +#~ msgid "Sorry this username already exists. Please try a new one." +#~ msgstr "Je nám líto, ale toto jméno již existuje. Prosím, zvolte jiné." + +#~ msgid "Ok !" +#~ msgstr "V pořádku!" + +#~ msgid "Communication problem, please try again later." +#~ msgstr "Chyba při komunikaci. Prosím, zkuste to později." + +#~ msgid "Choosing a username" +#~ msgstr "Výběr uživatelského jména" + +#~ msgid "Verifying" +#~ msgstr "Ověřování" + +#~ msgid "Confirmation" +#~ msgstr "Potvrzení" + +#~ msgid "Creating your account" +#~ msgstr "Vytváření účtu" + +#~ msgid "Now ready !" +#~ msgstr "Připraveno!" + +#~ msgid "Contacts" +#~ msgstr "Kontakty" + +#~ msgid "Enable video" +#~ msgstr "Zapnout video" + +#~ msgid "Enter username, phone number, or full sip address" +#~ msgstr "" +#~ "Zadejte uživatelské jméno, telefonní číslo nebo plnou sipovou adresu" + +#~ msgid "Lookup:" +#~ msgstr "Hledat:" + +#~ msgid "in" +#~ msgstr "ve" + +#~ msgid "" +#~ "Register to FONICS\n" +#~ "virtual network !" +#~ msgstr "" +#~ "Zaregistrovat se do\n" +#~ "virtuální sítě FONICS!" + +#~ msgid "We are being paused..." +#~ msgstr "Jsme odkládáni…" + +#~ msgid "No common codecs" +#~ msgstr "Žádný společný formát" + +#~ msgid "Authentication failure" +#~ msgstr "Selhání ověření totožnosti" + #~ msgid "Register at startup" #~ msgstr "Zaregistrovat při spuštění" @@ -1592,9 +1903,6 @@ msgstr[2] "Máte %i zmeškaných hovorů." #~ msgid "A filter that send several inputs to one output." #~ msgstr "Filtr, který směšuje několik vstupů do jednoho výstupu." -#~ msgid "Audio resampler" -#~ msgstr "Převzorkování zvuku" - #~ msgid "RTP output filter" #~ msgstr "Filtr RTP výstupu" @@ -1716,9 +2024,6 @@ msgstr[2] "Máte %i zmeškaných hovorů." #~ "Zdrojový filtr založený na videu pro windows (vwf.h) pro zachytávání " #~ "obrázků." -#~ msgid "ICE filter" -#~ msgstr "Filtr ICE" - #~ msgid "" #~ "A filter that trashes its input (useful for terminating some graphs)." #~ msgstr "" @@ -1781,18 +2086,12 @@ msgstr[2] "Máte %i zmeškaných hovorů." #~ msgid "Assistant" #~ msgstr "Průvodce" -#~ msgid "Call Details" -#~ msgstr "Informace o hovoru" - #~ msgid "Show debug messages" #~ msgstr "Zobrazit ladicí zprávy" #~ msgid "Start call" #~ msgstr "Zahájit hovor" -#~ msgid "Terminate call" -#~ msgstr "Ukončit hovor" - #~ msgid "_Modes" #~ msgstr "Reži_my" @@ -1825,9 +2124,6 @@ msgstr[2] "Máte %i zmeškaných hovorů." #~ msgid "Sorry, having multiple simultaneous calls is not supported yet !" #~ msgstr "Promiňte, vedení více současných hovorů není podporováno!" -#~ msgid "Error." -#~ msgstr "Chyba." - #~ msgid "Digits" #~ msgstr "Číslice" @@ -2164,9 +2460,6 @@ msgstr[2] "Máte %i zmeškaných hovorů." #~ msgid "Clear all stored authentication information (username,password...)" #~ msgstr "Vyprázdnit všechny ověřovací informace (uživatelské jméno, heslo…)" -#~ msgid "SIP" -#~ msgstr "SIP" - #~ msgid "List of audio codecs, in order of preference:" #~ msgstr "Seznam audio kodeků podle preference:" @@ -2231,9 +2524,6 @@ msgstr[2] "Máte %i zmeškaných hovorů." #~ msgid "realm:" #~ msgstr "doména:" -#~ msgid "Chat Room" -#~ msgstr "Diskuzní skupina" - #~ msgid "Text:" #~ msgstr "Text:" diff --git a/po/de.po b/po/de.po index 5429c1b01..6a0b322f7 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: 2012-11-07 17:24+0100\n" +"POT-Creation-Date: 2013-01-08 10:35+0100\n" "PO-Revision-Date: 2012-11-07 19:27+0100\n" "Last-Translator: Gerhard Stengel \n" "Language-Team: German \n" @@ -63,7 +63,7 @@ msgid "" "%s\t%s" msgstr "" -#: ../gtk/conference.c:33 ../gtk/incall_view.c:185 +#: ../gtk/conference.c:33 ../gtk/main.ui.h:13 msgid "Conference" msgstr "Konferenz" @@ -76,11 +76,6 @@ msgstr "Eigenes Telefon" msgid "Couldn't find pixmap file: %s" msgstr "Pixmapdatei %s kann nicht gefunden werden." -#: ../gtk/chat.c:32 -#, c-format -msgid "Chat with %s" -msgstr "Chat mit %s" - #: ../gtk/main.c:89 msgid "log to stdout some debug information while running." msgstr "Ausgabe von Debug-Informationen auf stdout während der Laufzeit" @@ -115,12 +110,12 @@ msgstr "" "Geben Sie einen Arbeitsordner an (sollte der Installationsordner sein, z. B. " "C:\\Programme\\Linphone)" -#: ../gtk/main.c:501 +#: ../gtk/main.c:498 #, c-format msgid "Call with %s" msgstr "Im Gespräch mit %s" -#: ../gtk/main.c:879 +#: ../gtk/main.c:871 #, c-format msgid "" "%s would like to add you to his contact list.\n" @@ -133,7 +128,7 @@ msgstr "" "Ihrer Kontaktliste hinzufügen?\n" "Wenn Sie mit Nein antworten, wird diese Person vorläufig blockiert." -#: ../gtk/main.c:957 +#: ../gtk/main.c:948 #, c-format msgid "" "Please enter your password for username %s\n" @@ -142,59 +137,59 @@ msgstr "" "Geben Sie bitte Ihr Passwort für den Benutzernamen %s\n" " auf der Domäne %s ein:" -#: ../gtk/main.c:1059 +#: ../gtk/main.c:1051 msgid "Call error" msgstr "Anruf fehlgeschlagen" -#: ../gtk/main.c:1062 ../coreapi/linphonecore.c:2940 +#: ../gtk/main.c:1054 ../coreapi/linphonecore.c:2949 msgid "Call ended" msgstr "Anruf beendet" -#: ../gtk/main.c:1065 ../coreapi/linphonecore.c:244 +#: ../gtk/main.c:1057 ../coreapi/linphonecore.c:244 msgid "Incoming call" msgstr "Eingehender Anruf" -#: ../gtk/main.c:1067 ../gtk/incall_view.c:423 ../gtk/main.ui.h:4 +#: ../gtk/main.c:1059 ../gtk/incall_view.c:451 ../gtk/main.ui.h:6 msgid "Answer" msgstr "Annehmen" -#: ../gtk/main.c:1069 ../gtk/main.ui.h:5 +#: ../gtk/main.c:1061 ../gtk/main.ui.h:7 msgid "Decline" msgstr "Abweisen" -#: ../gtk/main.c:1075 +#: ../gtk/main.c:1067 msgid "Call paused" msgstr "Anruf wird gehalten" -#: ../gtk/main.c:1075 +#: ../gtk/main.c:1067 #, c-format msgid "by %s" msgstr "von %s" -#: ../gtk/main.c:1124 +#: ../gtk/main.c:1116 #, c-format msgid "%s proposed to start video. Do you accept ?" msgstr "%s schlägt vor, eine Videoübertragung zu starten. Nehmen Sie an?" -#: ../gtk/main.c:1284 +#: ../gtk/main.c:1278 msgid "Website link" msgstr "Website-Verknüpfung" -#: ../gtk/main.c:1324 +#: ../gtk/main.c:1318 msgid "Linphone - a video internet phone" msgstr "Linphone - ein Internet-Video-Telefon" -#: ../gtk/main.c:1416 +#: ../gtk/main.c:1410 #, c-format msgid "%s (Default)" msgstr "%s (Vorgabe)" -#: ../gtk/main.c:1696 ../coreapi/callbacks.c:765 +#: ../gtk/main.c:1714 ../coreapi/callbacks.c:774 #, c-format msgid "We are transferred to %s" msgstr "Vermittlung nach %s" -#: ../gtk/main.c:1706 +#: ../gtk/main.c:1724 msgid "" "No sound cards have been detected on this computer.\n" "You won't be able to send or receive audio calls." @@ -202,52 +197,61 @@ msgstr "" "Auf diesem Rechner können keine Soundkarten gefunden werden.\n" "Sie können keine Audio-Anrufe tätigen oder entgegennehmen." -#: ../gtk/main.c:1813 +#: ../gtk/main.c:1833 msgid "A free SIP video-phone" msgstr "Ein freies SIP-Video-Telefon" -#: ../gtk/friendlist.c:203 +#: ../gtk/friendlist.c:335 msgid "Add to addressbook" msgstr "Zum Adressbuch hinzufügen" -#: ../gtk/friendlist.c:377 ../gtk/propertybox.c:362 ../gtk/contact.ui.h:1 -msgid "Name" -msgstr "Name" - -#: ../gtk/friendlist.c:393 +#: ../gtk/friendlist.c:509 msgid "Presence status" msgstr "Anwesenheitsstatus" -#: ../gtk/friendlist.c:432 +#: ../gtk/friendlist.c:526 ../gtk/propertybox.c:362 ../gtk/contact.ui.h:1 +msgid "Name" +msgstr "Name" + +#: ../gtk/friendlist.c:538 +msgid "Call" +msgstr "Anrufen" + +#: ../gtk/friendlist.c:543 +#, fuzzy +msgid "Chat" +msgstr "Chat Raum" + +#: ../gtk/friendlist.c:573 #, c-format msgid "Search in %s directory" msgstr "Im %s-Verzeichnis suchen" -#: ../gtk/friendlist.c:646 +#: ../gtk/friendlist.c:730 msgid "Invalid sip contact !" msgstr "Ungültiger SIP-Kontakt!" -#: ../gtk/friendlist.c:691 +#: ../gtk/friendlist.c:775 #, c-format msgid "Call %s" msgstr "„%s“ anrufen" -#: ../gtk/friendlist.c:692 +#: ../gtk/friendlist.c:776 #, c-format msgid "Send text to %s" msgstr "Text zu „%s“ schicken" -#: ../gtk/friendlist.c:693 +#: ../gtk/friendlist.c:777 #, c-format msgid "Edit contact '%s'" msgstr "Kontakt „%s“ bearbeiten" -#: ../gtk/friendlist.c:694 +#: ../gtk/friendlist.c:778 #, c-format msgid "Delete contact '%s'" msgstr "Kontakt „%s“ löschen" -#: ../gtk/friendlist.c:736 +#: ../gtk/friendlist.c:820 #, c-format msgid "Add new contact from %s directory" msgstr "Einen neuen Kontakt aus dem %s-Verzeichnis hinzufügen" @@ -344,22 +348,26 @@ msgstr "Traditionelles Chinesisch" msgid "Norwegian" msgstr "Norwegisch" -#: ../gtk/propertybox.c:831 +#: ../gtk/propertybox.c:775 +msgid "Hebrew" +msgstr "" + +#: ../gtk/propertybox.c:842 msgid "" "You need to restart linphone for the new language selection to take effect." msgstr "" "Linphone muss neu gestartet werden, damit die neue Spracheinstellung wirksam " "wird." -#: ../gtk/propertybox.c:901 +#: ../gtk/propertybox.c:912 msgid "None" msgstr "Keinen" -#: ../gtk/propertybox.c:905 +#: ../gtk/propertybox.c:916 msgid "SRTP" msgstr "" -#: ../gtk/propertybox.c:911 +#: ../gtk/propertybox.c:922 msgid "ZRTP" msgstr "" @@ -533,49 +541,45 @@ msgstr "Fehler" msgid "Terminating" msgstr "Fertigstellen" -#: ../gtk/incall_view.c:69 +#: ../gtk/incall_view.c:69 ../gtk/incall_view.c:90 #, c-format msgid "Call #%i" msgstr "Anruf #%i" -#: ../gtk/incall_view.c:129 +#: ../gtk/incall_view.c:150 #, c-format msgid "Transfer to call #%i with %s" msgstr "Vermittlung zum Anruf #%i mit %s" -#: ../gtk/incall_view.c:157 -msgid "Transfer" -msgstr "Vermittlung" - -#: ../gtk/incall_view.c:208 ../gtk/incall_view.c:211 +#: ../gtk/incall_view.c:209 ../gtk/incall_view.c:212 msgid "Not used" msgstr "Nicht verwendet" -#: ../gtk/incall_view.c:218 +#: ../gtk/incall_view.c:219 msgid "ICE not activated" msgstr "ICE nicht aktiviert" -#: ../gtk/incall_view.c:220 +#: ../gtk/incall_view.c:221 msgid "ICE failed" msgstr "ICE fehlgeschlagen" -#: ../gtk/incall_view.c:222 +#: ../gtk/incall_view.c:223 msgid "ICE in progress" msgstr "ICE läuft" -#: ../gtk/incall_view.c:224 +#: ../gtk/incall_view.c:225 msgid "Going through one or more NATs" msgstr "Ein oder mehrere NATs werden durchquert" -#: ../gtk/incall_view.c:226 +#: ../gtk/incall_view.c:227 msgid "Direct" msgstr "Direkt" -#: ../gtk/incall_view.c:228 +#: ../gtk/incall_view.c:229 msgid "Through a relay server" msgstr "Über einen Relay-Server" -#: ../gtk/incall_view.c:237 ../gtk/incall_view.c:241 +#: ../gtk/incall_view.c:238 ../gtk/incall_view.c:242 #, c-format msgid "" "download: %f\n" @@ -584,97 +588,101 @@ msgstr "" "Herunterladen: %f\n" "Hochladen: %f (kbit/s)" -#: ../gtk/incall_view.c:402 +#: ../gtk/incall_view.c:341 ../gtk/main.ui.h:12 +msgid "Hang up" +msgstr "" + +#: ../gtk/incall_view.c:430 msgid "Calling..." msgstr "Verbindungsaufbau..." -#: ../gtk/incall_view.c:405 ../gtk/incall_view.c:614 +#: ../gtk/incall_view.c:433 ../gtk/incall_view.c:646 msgid "00::00::00" msgstr "" -#: ../gtk/incall_view.c:416 +#: ../gtk/incall_view.c:444 msgid "Incoming call" msgstr "Eingehender Anruf" -#: ../gtk/incall_view.c:453 +#: ../gtk/incall_view.c:481 msgid "good" msgstr "gut" -#: ../gtk/incall_view.c:455 +#: ../gtk/incall_view.c:483 msgid "average" msgstr "durchschnittlich" -#: ../gtk/incall_view.c:457 +#: ../gtk/incall_view.c:485 msgid "poor" msgstr "schlecht" -#: ../gtk/incall_view.c:459 +#: ../gtk/incall_view.c:487 msgid "very poor" msgstr "sehr schlecht" -#: ../gtk/incall_view.c:461 +#: ../gtk/incall_view.c:489 msgid "too bad" msgstr "zu schlecht" -#: ../gtk/incall_view.c:462 ../gtk/incall_view.c:478 +#: ../gtk/incall_view.c:490 ../gtk/incall_view.c:506 msgid "unavailable" msgstr "nicht verfügbar" -#: ../gtk/incall_view.c:578 +#: ../gtk/incall_view.c:605 msgid "Secured by SRTP" msgstr "Gesichert durch SRTP" -#: ../gtk/incall_view.c:584 +#: ../gtk/incall_view.c:611 #, c-format msgid "Secured by ZRTP - [auth token: %s]" msgstr "Gesichert durch ZRTP - [Auth.-Token: %s]" -#: ../gtk/incall_view.c:590 +#: ../gtk/incall_view.c:617 msgid "Set unverified" msgstr "Auf „Ungeprüft“ setzen" -#: ../gtk/incall_view.c:590 ../gtk/main.ui.h:3 +#: ../gtk/incall_view.c:617 ../gtk/main.ui.h:5 msgid "Set verified" msgstr "Auf „Geprüft“ setzen" -#: ../gtk/incall_view.c:612 +#: ../gtk/incall_view.c:641 msgid "In conference" msgstr "In Konferenz" -#: ../gtk/incall_view.c:612 +#: ../gtk/incall_view.c:641 msgid "In call" msgstr "Im Gespräch" -#: ../gtk/incall_view.c:632 +#: ../gtk/incall_view.c:669 msgid "Paused call" msgstr "Gehaltener Anruf" -#: ../gtk/incall_view.c:644 +#: ../gtk/incall_view.c:682 #, c-format msgid "%02i::%02i::%02i" msgstr "" -#: ../gtk/incall_view.c:661 +#: ../gtk/incall_view.c:699 msgid "Call ended." msgstr "Anruf beendet." -#: ../gtk/incall_view.c:689 +#: ../gtk/incall_view.c:731 msgid "Transfer in progress" msgstr "Vermittlung läuft" -#: ../gtk/incall_view.c:692 +#: ../gtk/incall_view.c:734 msgid "Transfer done." msgstr "Vermittlung abgeschlossen." -#: ../gtk/incall_view.c:695 +#: ../gtk/incall_view.c:737 msgid "Transfer failed." msgstr "Vermittlung fehlgeschlagen." -#: ../gtk/incall_view.c:740 +#: ../gtk/incall_view.c:781 msgid "Resume" msgstr "Fortsetzen" -#: ../gtk/incall_view.c:747 ../gtk/main.ui.h:6 +#: ../gtk/incall_view.c:788 ../gtk/main.ui.h:9 msgid "Pause" msgstr "Halten" @@ -688,96 +696,89 @@ msgid "Callee name" msgstr "Name des Angerufenen" #: ../gtk/main.ui.h:2 +msgid "Send" +msgstr "Senden" + +#: ../gtk/main.ui.h:3 +#, fuzzy +msgid "End conference" +msgstr "In Konferenz" + +#: ../gtk/main.ui.h:4 msgid "label" msgstr "" -#: ../gtk/main.ui.h:7 +#: ../gtk/main.ui.h:8 msgid "Video" msgstr "" -#: ../gtk/main.ui.h:8 +#: ../gtk/main.ui.h:10 +msgid "Mute" +msgstr "" + +#: ../gtk/main.ui.h:11 +msgid "Transfer" +msgstr "Vermittlung" + +#: ../gtk/main.ui.h:14 msgid "In call" msgstr "Im Gespräch" -#: ../gtk/main.ui.h:9 +#: ../gtk/main.ui.h:15 msgid "Duration" msgstr "Dauer" -#: ../gtk/main.ui.h:10 +#: ../gtk/main.ui.h:16 msgid "Call quality rating" msgstr "Bewertung der Verbindungsqualität" -#: ../gtk/main.ui.h:11 +#: ../gtk/main.ui.h:17 msgid "_Options" msgstr "_Optionen" -#: ../gtk/main.ui.h:12 +#: ../gtk/main.ui.h:18 msgid "Always start video" msgstr "Video immer starten" -#: ../gtk/main.ui.h:13 +#: ../gtk/main.ui.h:19 msgid "Enable self-view" msgstr "Selbstansicht ein" -#: ../gtk/main.ui.h:14 +#: ../gtk/main.ui.h:20 msgid "_Help" msgstr "_Hilfe" -#: ../gtk/main.ui.h:15 +#: ../gtk/main.ui.h:21 msgid "Show debug window" msgstr "Debug-Fenster anzeigen" -#: ../gtk/main.ui.h:16 +#: ../gtk/main.ui.h:22 msgid "_Homepage" msgstr "" -#: ../gtk/main.ui.h:17 +#: ../gtk/main.ui.h:23 msgid "Check _Updates" msgstr "Auf _Aktualisierungen überprüfen" -#: ../gtk/main.ui.h:18 +#: ../gtk/main.ui.h:24 msgid "Account assistant" msgstr "Konto-Einrichtungsassistent" -#: ../gtk/main.ui.h:19 -msgid "Initiate a new call" -msgstr "Einen neuen Anruf beginnen" - -#: ../gtk/main.ui.h:20 -msgid "Enter username, phone number, or full sip address" -msgstr "Teilnehmer, Telefonnummer oder vollständige SIP-Adresse eingeben" - -#: ../gtk/main.ui.h:21 +#: ../gtk/main.ui.h:25 msgid "SIP address or phone number:" msgstr "SIP-Adresse oder Telefonnummer:" -#: ../gtk/main.ui.h:22 -msgid "Lookup:" -msgstr "Suchen:" - -#: ../gtk/main.ui.h:23 -msgid "in" -msgstr "in" - -#: ../gtk/main.ui.h:24 -msgid "Search" -msgstr "Suchen" - -#: ../gtk/main.ui.h:25 -msgid "Add contacts from directory" -msgstr "Kontakte aus einem Verzeichnis hinzufügen" - #: ../gtk/main.ui.h:26 -msgid "Add contact" -msgstr "Kontakt hinzufügen" +msgid "Initiate a new call" +msgstr "Einen neuen Anruf beginnen" -#: ../gtk/main.ui.h:27 -msgid "Contacts" -msgstr "Kontakte" +#: ../gtk/main.ui.h:27 ../gtk/parameters.ui.h:48 +msgid "Add" +msgstr "Hinzufügen" -#: ../gtk/main.ui.h:28 -msgid "Recent calls" -msgstr "Letzte Gespräche" +#: ../gtk/main.ui.h:28 ../gtk/parameters.ui.h:49 +msgid "Edit" +msgstr "Bearbeiten" #: ../gtk/main.ui.h:29 msgid "D" @@ -844,57 +845,77 @@ msgid "1" msgstr "" #: ../gtk/main.ui.h:45 +msgid "Search" +msgstr "Suchen" + +#: ../gtk/main.ui.h:46 +msgid "Add contacts from directory" +msgstr "Kontakte aus einem Verzeichnis hinzufügen" + +#: ../gtk/main.ui.h:47 +msgid "Add contact" +msgstr "Kontakt hinzufügen" + +#: ../gtk/main.ui.h:48 msgid "Keypad" msgstr "Wähltastatur" -#: ../gtk/main.ui.h:46 +#: ../gtk/main.ui.h:49 +msgid "Recent calls" +msgstr "Letzte Gespräche" + +#: ../gtk/main.ui.h:50 msgid "My current identity:" msgstr "Aktuelle Identität:" -#: ../gtk/main.ui.h:47 ../gtk/tunnel_config.ui.h:7 +#: ../gtk/main.ui.h:51 ../gtk/tunnel_config.ui.h:7 msgid "Username" msgstr "Benutzername" -#: ../gtk/main.ui.h:48 ../gtk/tunnel_config.ui.h:8 +#: ../gtk/main.ui.h:52 ../gtk/tunnel_config.ui.h:8 msgid "Password" msgstr "Passwort" -#: ../gtk/main.ui.h:49 +#: ../gtk/main.ui.h:53 msgid "Internet connection:" msgstr "Internetverbindung:" -#: ../gtk/main.ui.h:50 +#: ../gtk/main.ui.h:54 msgid "Automatically log me in" msgstr "Automatisch anmelden" -#: ../gtk/main.ui.h:51 +#: ../gtk/main.ui.h:55 msgid "Login information" msgstr "Anmeldeinformationen" -#: ../gtk/main.ui.h:52 +#: ../gtk/main.ui.h:56 msgid "Welcome !" msgstr "Willkommen !" -#: ../gtk/main.ui.h:53 +#: ../gtk/main.ui.h:57 msgid "All users" msgstr "Alle Teilnehmer" -#: ../gtk/main.ui.h:54 +#: ../gtk/main.ui.h:58 msgid "Online users" msgstr "Angemeldete Teilnehmer" -#: ../gtk/main.ui.h:55 +#: ../gtk/main.ui.h:59 msgid "ADSL" msgstr "" -#: ../gtk/main.ui.h:56 +#: ../gtk/main.ui.h:60 msgid "Fiber Channel" msgstr "Glasfaserkabel" -#: ../gtk/main.ui.h:57 +#: ../gtk/main.ui.h:61 msgid "Default" msgstr "Vorgabe" +#: ../gtk/main.ui.h:62 +msgid "Delete" +msgstr "" + #: ../gtk/about.ui.h:1 msgid "About linphone" msgstr "Über Linphone" @@ -1028,10 +1049,6 @@ msgstr "Anwesenheitsstatus veröffentlichen" msgid "Configure a SIP account" msgstr "SIP-Konto einrichten" -#: ../gtk/chatroom.ui.h:1 -msgid "Send" -msgstr "Senden" - #: ../gtk/parameters.ui.h:1 msgid "default soundcard" msgstr "Standard-Soundkarte" @@ -1218,71 +1235,55 @@ msgstr "Standard-Identität" msgid "Wizard" msgstr "Assistent" -#: ../gtk/parameters.ui.h:48 -msgid "Add" -msgstr "Hinzufügen" - -#: ../gtk/parameters.ui.h:49 -msgid "Edit" -msgstr "Bearbeiten" - #: ../gtk/parameters.ui.h:50 msgid "Remove" msgstr "Entfernen" #: ../gtk/parameters.ui.h:51 -msgid "" -"Register to FONICS\n" -"virtual network !" -msgstr "" -"Am virtuellen FONICS\n" -"Netzwerk anmelden!" - -#: ../gtk/parameters.ui.h:53 msgid "Proxy accounts" msgstr "Proxy-Konten" -#: ../gtk/parameters.ui.h:54 +#: ../gtk/parameters.ui.h:52 msgid "Erase all passwords" msgstr "Alle Passwörter löschen" -#: ../gtk/parameters.ui.h:55 +#: ../gtk/parameters.ui.h:53 msgid "Privacy" msgstr "Privatsphäre" -#: ../gtk/parameters.ui.h:56 +#: ../gtk/parameters.ui.h:54 msgid "Manage SIP Accounts" msgstr "SIP-Konten verwalten" -#: ../gtk/parameters.ui.h:57 ../gtk/tunnel_config.ui.h:4 +#: ../gtk/parameters.ui.h:55 ../gtk/tunnel_config.ui.h:4 msgid "Enable" msgstr "Freigeben" -#: ../gtk/parameters.ui.h:58 ../gtk/tunnel_config.ui.h:5 +#: ../gtk/parameters.ui.h:56 ../gtk/tunnel_config.ui.h:5 msgid "Disable" msgstr "Sperren" -#: ../gtk/parameters.ui.h:59 +#: ../gtk/parameters.ui.h:57 msgid "Codecs" msgstr "Codecs" -#: ../gtk/parameters.ui.h:60 +#: ../gtk/parameters.ui.h:58 msgid "0 stands for \"unlimited\"" msgstr "0 bedeutet „unbegrenzt“" -#: ../gtk/parameters.ui.h:61 +#: ../gtk/parameters.ui.h:59 msgid "Upload speed limit in Kbit/sec:" msgstr "Upload-Bandbreite (kbit/sec):" -#: ../gtk/parameters.ui.h:62 +#: ../gtk/parameters.ui.h:60 msgid "Download speed limit in Kbit/sec:" msgstr "Download-Bandbreite (kbit/sec):" -#: ../gtk/parameters.ui.h:63 +#: ../gtk/parameters.ui.h:61 msgid "Enable adaptive rate control" msgstr "Adaptive Ratenregelung ein" -#: ../gtk/parameters.ui.h:64 +#: ../gtk/parameters.ui.h:62 msgid "" "Adaptive rate control is a technique to dynamically guess the available " "bandwidth during a call." @@ -1290,31 +1291,31 @@ msgstr "" "Adaptive Ratenregelung ist eine Technik zur dynamischen Abschätzung der " "zur Verfügung stehenden Bandbreite während eines Anrufs." -#: ../gtk/parameters.ui.h:65 +#: ../gtk/parameters.ui.h:63 msgid "Bandwidth control" msgstr "Bandbreiten-Einstellungen" -#: ../gtk/parameters.ui.h:66 +#: ../gtk/parameters.ui.h:64 msgid "Codecs" msgstr "Codecs" -#: ../gtk/parameters.ui.h:67 +#: ../gtk/parameters.ui.h:65 msgid "Language" msgstr "Sprache" -#: ../gtk/parameters.ui.h:68 +#: ../gtk/parameters.ui.h:66 msgid "Show advanced settings" msgstr "Fortgeschrittene Einstellungen anzeigen" -#: ../gtk/parameters.ui.h:69 +#: ../gtk/parameters.ui.h:67 msgid "Level" msgstr "Detaillierung" -#: ../gtk/parameters.ui.h:70 +#: ../gtk/parameters.ui.h:68 msgid "User interface" msgstr "Benutzeroberfläche" -#: ../gtk/parameters.ui.h:71 +#: ../gtk/parameters.ui.h:69 msgid "Done" msgstr "Fertig" @@ -1437,19 +1438,19 @@ msgstr "" msgid "Outgoing call" msgstr "Abgehender Anruf" -#: ../coreapi/linphonecore.c:1221 +#: ../coreapi/linphonecore.c:1226 msgid "Ready" msgstr "Bereit" -#: ../coreapi/linphonecore.c:2068 +#: ../coreapi/linphonecore.c:2074 msgid "Looking for telephone number destination..." msgstr "Telefonnummernziel wird gesucht..." -#: ../coreapi/linphonecore.c:2071 +#: ../coreapi/linphonecore.c:2077 msgid "Could not resolve this number." msgstr "Diese Nummer kann nicht aufgelöst werden." -#: ../coreapi/linphonecore.c:2115 +#: ../coreapi/linphonecore.c:2121 msgid "" "Could not parse given sip address. A sip url usually looks like sip:" "user@domain" @@ -1457,47 +1458,47 @@ msgstr "" "SIP-Adresse kann nicht eingelesen werden. Eine SIP-Adresse hat folgenden " "Aufbau " -#: ../coreapi/linphonecore.c:2306 +#: ../coreapi/linphonecore.c:2312 msgid "Contacting" msgstr "Verbindungsaufbau" -#: ../coreapi/linphonecore.c:2313 +#: ../coreapi/linphonecore.c:2319 msgid "Could not call" msgstr "Anruf kann nicht getätigt werden." -#: ../coreapi/linphonecore.c:2423 +#: ../coreapi/linphonecore.c:2429 msgid "Sorry, we have reached the maximum number of simultaneous calls" msgstr "Die maximale Anzahl der gleichzeitigen Anrufe ist erreicht." -#: ../coreapi/linphonecore.c:2567 +#: ../coreapi/linphonecore.c:2573 msgid "is contacting you" msgstr "ruft Sie an" -#: ../coreapi/linphonecore.c:2568 +#: ../coreapi/linphonecore.c:2574 msgid " and asked autoanswer." msgstr " und fragt nach automatischer Antwort." -#: ../coreapi/linphonecore.c:2568 +#: ../coreapi/linphonecore.c:2574 msgid "." msgstr "" -#: ../coreapi/linphonecore.c:2630 +#: ../coreapi/linphonecore.c:2636 msgid "Modifying call parameters..." msgstr "Die Anrufparameter werden verändert..." -#: ../coreapi/linphonecore.c:2899 +#: ../coreapi/linphonecore.c:2908 msgid "Connected." msgstr "Verbunden." -#: ../coreapi/linphonecore.c:2922 +#: ../coreapi/linphonecore.c:2931 msgid "Call aborted" msgstr "Anruf abgebrochen" -#: ../coreapi/linphonecore.c:3093 +#: ../coreapi/linphonecore.c:3102 msgid "Could not pause the call" msgstr "Anruf kann nicht gehalten werden" -#: ../coreapi/linphonecore.c:3098 +#: ../coreapi/linphonecore.c:3107 msgid "Pausing the current call..." msgstr "Aktueller Anruf wird gehalten..." @@ -1529,7 +1530,7 @@ msgstr "" msgid "Stun lookup in progress..." msgstr "STUN-Ermittlung läuft..." -#: ../coreapi/misc.c:620 +#: ../coreapi/misc.c:630 msgid "ICE local candidates gathering in progress..." msgstr "Lokale Kandidaten für ICE werden zusammengestellt..." @@ -1598,114 +1599,114 @@ msgstr "" "Sie sollte wie sip:benutzername@proxydomain aussehen, also z.B. sip:" "alice@beispiel.net" -#: ../coreapi/proxy.c:808 +#: ../coreapi/proxy.c:1053 #, c-format msgid "Could not login as %s" msgstr "Anmeldung als %s fehlgeschlagen" -#: ../coreapi/callbacks.c:267 +#: ../coreapi/callbacks.c:276 msgid "Remote ringing." msgstr "Klingeln bei der Gegenseite." -#: ../coreapi/callbacks.c:287 +#: ../coreapi/callbacks.c:296 msgid "Remote ringing..." msgstr "Klingeln bei der Gegenseite..." -#: ../coreapi/callbacks.c:298 +#: ../coreapi/callbacks.c:307 msgid "Early media." msgstr "" -#: ../coreapi/callbacks.c:343 +#: ../coreapi/callbacks.c:352 #, c-format msgid "Call with %s is paused." msgstr "Anruf mit %s wird gehalten." -#: ../coreapi/callbacks.c:356 +#: ../coreapi/callbacks.c:365 #, c-format msgid "Call answered by %s - on hold." msgstr "Der von %s entgegengenommene Anruf wird gehalten." -#: ../coreapi/callbacks.c:367 +#: ../coreapi/callbacks.c:376 msgid "Call resumed." msgstr "Anruf fortgesetzt." -#: ../coreapi/callbacks.c:372 +#: ../coreapi/callbacks.c:381 #, c-format msgid "Call answered by %s." msgstr "Anruf wird von %s entgegengenommen." -#: ../coreapi/callbacks.c:387 +#: ../coreapi/callbacks.c:396 msgid "Incompatible, check codecs..." msgstr "Inkompatibel, überprüfen Sie die Codecs..." -#: ../coreapi/callbacks.c:428 +#: ../coreapi/callbacks.c:437 msgid "We have been resumed." msgstr "Anruf wird fortgesetzt." -#: ../coreapi/callbacks.c:437 +#: ../coreapi/callbacks.c:446 msgid "We are paused by other party." msgstr "Anruf wird von der Gegenseite gehalten." -#: ../coreapi/callbacks.c:443 +#: ../coreapi/callbacks.c:452 msgid "Call is updated by remote." msgstr "Anruf ist von der Gegenseite aktualisiert worden." -#: ../coreapi/callbacks.c:512 +#: ../coreapi/callbacks.c:521 msgid "Call terminated." msgstr "Anruf beendet." -#: ../coreapi/callbacks.c:519 +#: ../coreapi/callbacks.c:528 msgid "User is busy." msgstr "Teilnehmer ist besetzt." -#: ../coreapi/callbacks.c:520 +#: ../coreapi/callbacks.c:529 msgid "User is temporarily unavailable." msgstr "Teilnehmer zur Zeit nicht verfügbar." #. char *retrymsg=_("%s. Retry after %i minute(s)."); -#: ../coreapi/callbacks.c:522 +#: ../coreapi/callbacks.c:531 msgid "User does not want to be disturbed." msgstr "Teilnehmer möchte nicht gestört werden." -#: ../coreapi/callbacks.c:523 +#: ../coreapi/callbacks.c:532 msgid "Call declined." msgstr "Anruf abgewiesen" -#: ../coreapi/callbacks.c:535 +#: ../coreapi/callbacks.c:544 msgid "No response." msgstr "Keine Antwort." -#: ../coreapi/callbacks.c:539 +#: ../coreapi/callbacks.c:548 msgid "Protocol error." msgstr "Protokollfehler" -#: ../coreapi/callbacks.c:555 +#: ../coreapi/callbacks.c:564 msgid "Redirected" msgstr "Umgeleitet" -#: ../coreapi/callbacks.c:591 +#: ../coreapi/callbacks.c:600 msgid "Incompatible media parameters." msgstr "Inkompatible Medienparameter." -#: ../coreapi/callbacks.c:597 +#: ../coreapi/callbacks.c:606 msgid "Call failed." msgstr "Anruf fehlgeschlagen." -#: ../coreapi/callbacks.c:692 +#: ../coreapi/callbacks.c:701 #, c-format msgid "Registration on %s successful." msgstr "Registrierung auf %s erfolgreich." -#: ../coreapi/callbacks.c:693 +#: ../coreapi/callbacks.c:702 #, c-format msgid "Unregistration on %s done." msgstr "Abmeldung von %s ist erfolgt." -#: ../coreapi/callbacks.c:713 +#: ../coreapi/callbacks.c:722 msgid "no response timeout" msgstr "Zeitüberschreitung bei der Antwort" -#: ../coreapi/callbacks.c:716 +#: ../coreapi/callbacks.c:725 #, c-format msgid "Registration on %s failed: %s" msgstr "Registrierung auf %s fehlgeschlagen: %s" @@ -1715,13 +1716,35 @@ msgstr "Registrierung auf %s fehlgeschlagen: %s" msgid "Authentication token is %s" msgstr "Authentifizierungs-Token ist %s" -#: ../coreapi/linphonecall.c:2055 +#: ../coreapi/linphonecall.c:2124 #, c-format msgid "You have missed %i call." msgid_plural "You have missed %i calls." msgstr[0] "Sie haben %i Anruf in Abwesenheit." msgstr[1] "Sie haben %i Anrufe in Abwesenheit." +#~ msgid "Chat with %s" +#~ msgstr "Chat mit %s" + +#~ msgid "Enter username, phone number, or full sip address" +#~ msgstr "Teilnehmer, Telefonnummer oder vollständige SIP-Adresse eingeben" + +#~ msgid "Lookup:" +#~ msgstr "Suchen:" + +#~ msgid "in" +#~ msgstr "in" + +#~ msgid "Contacts" +#~ msgstr "Kontakte" + +#~ msgid "" +#~ "Register to FONICS\n" +#~ "virtual network !" +#~ msgstr "" +#~ "Am virtuellen FONICS\n" +#~ "Netzwerk anmelden!" + #~ msgid "Enable video" #~ msgstr "Video ein" @@ -1772,9 +1795,6 @@ msgstr[1] "Sie haben %i Anrufe in Abwesenheit." #~ msgid "Now ready !" #~ msgstr "Fertig!" -#~ msgid "Call" -#~ msgstr "Anrufen" - #~ msgid "Register at startup" #~ msgstr "Beim Starten registrieren" @@ -2391,9 +2411,6 @@ msgstr[1] "Sie haben %i Anrufe in Abwesenheit." #~ msgid "realm:" #~ msgstr "Bereich:" -#~ msgid "Chat Room" -#~ msgstr "Chat Raum" - #~ msgid "Text:" #~ msgstr "Text" diff --git a/po/es.po b/po/es.po index 04d7a3c3b..999a16446 100644 --- a/po/es.po +++ b/po/es.po @@ -2,2030 +2,2263 @@ # Copyright (C) YEAR Free Software Foundation, Inc. # FIRST AUTHOR , YEAR. # -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: Linphone 0.9.1\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-12-05 12:41+0100\n" -"PO-Revision-Date: 2002-10-15 HO:MI+ZONE\n" -"Last-Translator: Nelson Benitez \n" -"Language-Team: es \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../gtk/calllogs.c:71 -#, c-format -msgid "%i minute" -msgid_plural "%i minutes" -msgstr[0] "" -msgstr[1] "" - -#: ../gtk/calllogs.c:74 -#, c-format -msgid "%i second" -msgid_plural "%i seconds" -msgstr[0] "" -msgstr[1] "" - -#: ../gtk/calllogs.c:77 -#, c-format -msgid "" -"%s\t%s\tQuality: %s\n" -"%s\t%s %s\t" -msgstr "" - -#: ../gtk/calllogs.c:79 -msgid "n/a" -msgstr "" - -#: ../gtk/conference.c:33 ../gtk/incall_view.c:183 -msgid "Conference" -msgstr "" - -#: ../gtk/conference.c:41 -msgid "Me" -msgstr "" - -#: ../gtk/support.c:49 ../gtk/support.c:73 ../gtk/support.c:102 -#, c-format -msgid "Couldn't find pixmap file: %s" -msgstr "No se pudo encontrar el archivo pixmap: %s" - -#: ../gtk/chat.c:27 -#, c-format -msgid "Chat with %s" -msgstr "" - -#: ../gtk/main.c:83 -msgid "log to stdout some debug information while running." -msgstr "" - -#: ../gtk/main.c:90 -msgid "path to a file to write logs into." -msgstr "" - -#: ../gtk/main.c:97 -msgid "Start only in the system tray, do not show the main interface." -msgstr "" - -#: ../gtk/main.c:104 -msgid "address to call right now" -msgstr "" - -#: ../gtk/main.c:111 -msgid "if set automatically answer incoming calls" -msgstr "" - -#: ../gtk/main.c:118 -msgid "" -"Specifiy a working directory (should be the base of the installation, eg: c:" -"\\Program Files\\Linphone)" -msgstr "" - -#: ../gtk/main.c:464 -#, c-format -msgid "Call with %s" -msgstr "" - -#: ../gtk/main.c:815 -#, c-format -msgid "" -"%s would like to add you to his contact list.\n" -"Would you allow him to see your presence status or add him to your contact " -"list ?\n" -"If you answer no, this person will be temporarily blacklisted." -msgstr "" - -#: ../gtk/main.c:893 -#, c-format -msgid "" -"Please enter your password for username %s\n" -" at domain %s:" -msgstr "" - -#: ../gtk/main.c:993 -#, fuzzy -msgid "Call error" -msgstr "Llamada cancelada." - -#: ../gtk/main.c:996 ../coreapi/linphonecore.c:2406 -#, fuzzy -msgid "Call ended" -msgstr "Llamada cancelada." - -#: ../gtk/main.c:999 ../coreapi/linphonecore.c:199 -msgid "Incoming call" -msgstr "" - -#: ../gtk/main.c:1001 ../gtk/incall_view.c:292 ../gtk/main.ui.h:20 -msgid "Answer" -msgstr "" - -#: ../gtk/main.c:1003 ../gtk/main.ui.h:29 -#, fuzzy -msgid "Decline" -msgstr "linea" - -#: ../gtk/main.c:1009 -#, fuzzy -msgid "Call paused" -msgstr "Llamada cancelada." - -#: ../gtk/main.c:1009 -#, c-format -msgid "by %s" -msgstr "" - -#: ../gtk/main.c:1165 -msgid "Website link" -msgstr "" - -#: ../gtk/main.c:1205 -msgid "Linphone - a video internet phone" -msgstr "" - -#: ../gtk/main.c:1295 -#, c-format -msgid "%s (Default)" -msgstr "" - -#: ../gtk/main.c:1566 ../coreapi/callbacks.c:700 -#, c-format -msgid "We are transferred to %s" -msgstr "" - -#: ../gtk/main.c:1576 -msgid "" -"No sound cards have been detected on this computer.\n" -"You won't be able to send or receive audio calls." -msgstr "" - -#: ../gtk/main.c:1663 -msgid "A free SIP video-phone" -msgstr "" - -#: ../gtk/friendlist.c:203 -#, fuzzy -msgid "Add to addressbook" -msgstr "Agenda" - -#: ../gtk/friendlist.c:258 ../gtk/propertybox.c:296 ../gtk/contact.ui.h:3 -msgid "Name" -msgstr "Nombre" - -#: ../gtk/friendlist.c:271 -#, fuzzy -msgid "Presence status" -msgstr "Estado" - -#: ../gtk/friendlist.c:308 -#, c-format -msgid "Search in %s directory" -msgstr "" - -#: ../gtk/friendlist.c:568 -msgid "Invalid sip contact !" -msgstr "" - -#: ../gtk/friendlist.c:613 -#, c-format -msgid "Call %s" -msgstr "" - -#: ../gtk/friendlist.c:614 -#, c-format -msgid "Send text to %s" -msgstr "" - -#: ../gtk/friendlist.c:615 -#, fuzzy, c-format -msgid "Edit contact '%s'" -msgstr "(Ninguna informacion de contacto !)" - -#: ../gtk/friendlist.c:616 -#, c-format -msgid "Delete contact '%s'" -msgstr "" - -#: ../gtk/friendlist.c:658 -#, c-format -msgid "Add new contact from %s directory" -msgstr "" - -#: ../gtk/propertybox.c:302 -msgid "Rate (Hz)" -msgstr "" - -#: ../gtk/propertybox.c:308 -msgid "Status" -msgstr "Estado" - -#: ../gtk/propertybox.c:314 -msgid "Min bitrate (kbit/s)" -msgstr "" - -#: ../gtk/propertybox.c:321 -msgid "Parameters" -msgstr "Parametros" - -#: ../gtk/propertybox.c:364 ../gtk/propertybox.c:507 -msgid "Enabled" -msgstr "Activado" - -#: ../gtk/propertybox.c:366 ../gtk/propertybox.c:507 -msgid "Disabled" -msgstr "Desactivado" - -#: ../gtk/propertybox.c:553 -msgid "Account" -msgstr "" - -#: ../gtk/propertybox.c:693 -msgid "English" -msgstr "" - -#: ../gtk/propertybox.c:694 -msgid "French" -msgstr "" - -#: ../gtk/propertybox.c:695 -msgid "Swedish" -msgstr "" - -#: ../gtk/propertybox.c:696 -msgid "Italian" -msgstr "" - -#: ../gtk/propertybox.c:697 -msgid "Spanish" -msgstr "" - -#: ../gtk/propertybox.c:698 -msgid "Brazilian Portugese" -msgstr "" - -#: ../gtk/propertybox.c:699 -msgid "Polish" -msgstr "" - -#: ../gtk/propertybox.c:700 -msgid "German" -msgstr "" - -#: ../gtk/propertybox.c:701 -msgid "Russian" -msgstr "" - -#: ../gtk/propertybox.c:702 -msgid "Japanese" -msgstr "" - -#: ../gtk/propertybox.c:703 -msgid "Dutch" -msgstr "" - -#: ../gtk/propertybox.c:704 -msgid "Hungarian" -msgstr "" - -#: ../gtk/propertybox.c:705 -msgid "Czech" -msgstr "" - -#: ../gtk/propertybox.c:706 -msgid "Chinese" -msgstr "" - -#: ../gtk/propertybox.c:707 -msgid "Traditional Chinese" -msgstr "" - -#: ../gtk/propertybox.c:708 -msgid "Norwegian" -msgstr "" - -#: ../gtk/propertybox.c:765 -msgid "" -"You need to restart linphone for the new language selection to take effect." -msgstr "" - -#: ../gtk/propertybox.c:835 -#, fuzzy -msgid "None" -msgstr "Ninguno." - -#: ../gtk/propertybox.c:839 -msgid "SRTP" -msgstr "" - -#: ../gtk/propertybox.c:845 -msgid "ZRTP" -msgstr "" - -#: ../gtk/update.c:80 -#, c-format -msgid "" -"A more recent version is availalble from %s.\n" -"Would you like to open a browser to download it ?" -msgstr "" - -#: ../gtk/update.c:91 -msgid "You are running the lastest version." -msgstr "" - -#: ../gtk/buddylookup.c:85 -msgid "Firstname, Lastname" -msgstr "" - -#: ../gtk/buddylookup.c:160 -msgid "Error communicating with server." -msgstr "" - -#: ../gtk/buddylookup.c:164 -#, fuzzy -msgid "Connecting..." -msgstr "Conexion" - -#: ../gtk/buddylookup.c:168 -#, fuzzy -msgid "Connected" -msgstr "Conectado." - -#: ../gtk/buddylookup.c:172 -msgid "Receiving data..." -msgstr "" - -#: ../gtk/buddylookup.c:180 -#, c-format -msgid "Found %i contact" -msgid_plural "Found %i contacts" -msgstr[0] "" -msgstr[1] "" - -#: ../gtk/setupwizard.c:25 -msgid "" -"Welcome !\n" -"This assistant will help you to use a SIP account for your calls." -msgstr "" - -#: ../gtk/setupwizard.c:34 -msgid "Create an account by choosing a username" -msgstr "" - -#: ../gtk/setupwizard.c:35 -msgid "I have already an account and just want to use it" -msgstr "" - -#: ../gtk/setupwizard.c:53 -msgid "Please choose a username:" -msgstr "" - -#: ../gtk/setupwizard.c:54 -#, fuzzy -msgid "Username:" -msgstr "Manual de Usuario" - -#: ../gtk/setupwizard.c:92 -#, c-format -msgid "Checking if '%s' is available..." -msgstr "" - -#: ../gtk/setupwizard.c:97 ../gtk/setupwizard.c:164 -msgid "Please wait..." -msgstr "" - -#: ../gtk/setupwizard.c:101 -msgid "Sorry this username already exists. Please try a new one." -msgstr "" - -#: ../gtk/setupwizard.c:103 ../gtk/setupwizard.c:168 -msgid "Ok !" -msgstr "" - -#: ../gtk/setupwizard.c:106 ../gtk/setupwizard.c:171 -msgid "Communication problem, please try again later." -msgstr "" - -#: ../gtk/setupwizard.c:134 -msgid "Thank you. Your account is now configured and ready for use." -msgstr "" - -#: ../gtk/setupwizard.c:228 -msgid "Welcome to the account setup assistant" -msgstr "" - -#: ../gtk/setupwizard.c:232 -msgid "Account setup assistant" -msgstr "" - -#: ../gtk/setupwizard.c:236 -msgid "Choosing a username" -msgstr "" - -#: ../gtk/setupwizard.c:240 -msgid "Verifying" -msgstr "" - -#: ../gtk/setupwizard.c:244 -#, fuzzy -msgid "Confirmation" -msgstr "Informacion" - -#: ../gtk/setupwizard.c:249 -msgid "Creating your account" -msgstr "" - -#: ../gtk/setupwizard.c:253 -msgid "Now ready !" -msgstr "" - -#: ../gtk/incall_view.c:69 -#, fuzzy, c-format -msgid "Call #%i" -msgstr "Llamada cancelada." - -#: ../gtk/incall_view.c:127 -#, c-format -msgid "Transfer to call #%i with %s" -msgstr "" - -#: ../gtk/incall_view.c:155 -msgid "Transfer" -msgstr "" - -#: ../gtk/incall_view.c:271 -#, fuzzy -msgid "Calling..." -msgstr "Contactando " - -#: ../gtk/incall_view.c:274 ../gtk/incall_view.c:482 -msgid "00::00::00" -msgstr "" - -#: ../gtk/incall_view.c:285 -#, fuzzy -msgid "Incoming call" -msgstr "Contactando " - -#: ../gtk/incall_view.c:322 -msgid "good" -msgstr "" - -#: ../gtk/incall_view.c:324 -msgid "average" -msgstr "" - -#: ../gtk/incall_view.c:326 -msgid "poor" -msgstr "" - -#: ../gtk/incall_view.c:328 -msgid "very poor" -msgstr "" - -#: ../gtk/incall_view.c:330 -msgid "too bad" -msgstr "" - -#: ../gtk/incall_view.c:331 ../gtk/incall_view.c:347 -msgid "unavailable" -msgstr "" - -#: ../gtk/incall_view.c:447 -msgid "Secured by SRTP" -msgstr "" - -#: ../gtk/incall_view.c:453 -#, c-format -msgid "Secured by ZRTP - [auth token: %s]" -msgstr "" - -#: ../gtk/incall_view.c:459 -msgid "Set unverified" -msgstr "" - -#: ../gtk/incall_view.c:459 ../gtk/main.ui.h:49 -msgid "Set verified" -msgstr "" - -#: ../gtk/incall_view.c:480 -msgid "In conference" -msgstr "" - -#: ../gtk/incall_view.c:480 -#, fuzzy -msgid "In call" -msgstr "Contactando " - -#: ../gtk/incall_view.c:499 -#, fuzzy -msgid "Paused call" -msgstr "Contactando " - -#: ../gtk/incall_view.c:511 -#, c-format -msgid "%02i::%02i::%02i" -msgstr "" - -#: ../gtk/incall_view.c:527 -#, fuzzy -msgid "Call ended." -msgstr "Llamada cancelada." - -#: ../gtk/incall_view.c:584 -msgid "Resume" -msgstr "" - -#: ../gtk/incall_view.c:591 ../gtk/main.ui.h:45 -msgid "Pause" -msgstr "" - -#: ../gtk/loginframe.c:93 -#, c-format -msgid "Please enter login information for %s" -msgstr "" - -#: ../gtk/main.ui.h:1 -msgid "#" -msgstr "#" - -#: ../gtk/main.ui.h:2 -msgid "*" -msgstr "*" - -#: ../gtk/main.ui.h:3 -msgid "0" -msgstr "0" - -#: ../gtk/main.ui.h:4 -msgid "1" -msgstr "1" - -#: ../gtk/main.ui.h:5 -msgid "2" -msgstr "2" - -#: ../gtk/main.ui.h:6 -msgid "3" -msgstr "3" - -#: ../gtk/main.ui.h:7 -msgid "4" -msgstr "4" - -#: ../gtk/main.ui.h:8 -msgid "5" -msgstr "5" - -#: ../gtk/main.ui.h:9 -msgid "6" -msgstr "6" - -#: ../gtk/main.ui.h:10 -msgid "7" -msgstr "7" - -#: ../gtk/main.ui.h:11 -msgid "8" -msgstr "8" - -#: ../gtk/main.ui.h:12 -msgid "9" -msgstr "9" - -#: ../gtk/main.ui.h:13 -#, fuzzy -msgid "Add contacts from directory" -msgstr "Informacion de codec" - -#: ../gtk/main.ui.h:14 -#, fuzzy -msgid "Callee name" -msgstr "Llamada cancelada." - -#: ../gtk/main.ui.h:15 -#, fuzzy -msgid "Welcome !" -msgstr "Contactando " - -#: ../gtk/main.ui.h:16 -msgid "A" -msgstr "" - -#: ../gtk/main.ui.h:17 -msgid "ADSL" -msgstr "" - -#: ../gtk/main.ui.h:18 -#, fuzzy -msgid "Add contact" -msgstr "(Ninguna informacion de contacto !)" - -#: ../gtk/main.ui.h:19 -msgid "All users" -msgstr "" - -#: ../gtk/main.ui.h:21 -msgid "Automatically log me in" -msgstr "" - -#: ../gtk/main.ui.h:22 -msgid "B" -msgstr "" - -#: ../gtk/main.ui.h:23 ../gtk/parameters.ui.h:21 -msgid "C" -msgstr "" - -#: ../gtk/main.ui.h:24 -#, fuzzy -msgid "Call" -msgstr "Llamada cancelada." - -#: ../gtk/main.ui.h:25 -msgid "Call quality rating" -msgstr "" - -#: ../gtk/main.ui.h:26 -msgid "Check _Updates" -msgstr "" - -#: ../gtk/main.ui.h:27 -#, fuzzy -msgid "Contacts" -msgstr "Contactando " - -#: ../gtk/main.ui.h:28 -msgid "D" -msgstr "" - -#: ../gtk/main.ui.h:30 -#, fuzzy -msgid "Default" -msgstr "Identidad" - -#: ../gtk/main.ui.h:31 -#, fuzzy -msgid "Duration" -msgstr "Informacion" - -#: ../gtk/main.ui.h:32 -#, fuzzy -msgid "Enable self-view" -msgstr "Activado" - -#: ../gtk/main.ui.h:33 -#, fuzzy -msgid "Enable video" -msgstr "Activado" - -#: ../gtk/main.ui.h:34 -msgid "Enter username, phone number, or full sip address" -msgstr "" - -#: ../gtk/main.ui.h:35 -msgid "Fiber Channel" -msgstr "" - -#: ../gtk/main.ui.h:36 -#, fuzzy -msgid "In call" -msgstr "Contactando " - -#: ../gtk/main.ui.h:37 -msgid "Initiate a new call" -msgstr "" - -#: ../gtk/main.ui.h:38 -msgid "Internet connection:" -msgstr "" - -#: ../gtk/main.ui.h:39 -msgid "Keypad" -msgstr "" - -#: ../gtk/main.ui.h:40 -#, fuzzy -msgid "Login information" -msgstr "Informacion de codec" - -#: ../gtk/main.ui.h:41 -msgid "Lookup:" -msgstr "" - -#: ../gtk/main.ui.h:42 -#, fuzzy -msgid "My current identity:" -msgstr "Identidad" - -#: ../gtk/main.ui.h:43 -#, fuzzy -msgid "Online users" -msgstr "linea" - -#: ../gtk/main.ui.h:44 -#, fuzzy -msgid "Password" -msgstr "Tu Contraseña:" - -#: ../gtk/main.ui.h:46 -#, fuzzy -msgid "Recent calls" -msgstr "Contactando " - -#: ../gtk/main.ui.h:47 -#, fuzzy -msgid "SIP address or phone number:" -msgstr "La direccion SIP del servidor de registro." - -#: ../gtk/main.ui.h:48 -msgid "Search" -msgstr "" - -#: ../gtk/main.ui.h:50 -#, fuzzy -msgid "Show debug window" -msgstr "Linphone esta terminando..." - -#: ../gtk/main.ui.h:51 -#, fuzzy -msgid "Username" -msgstr "Manual de Usuario" - -#: ../gtk/main.ui.h:52 -msgid "_Help" -msgstr "" - -#: ../gtk/main.ui.h:53 -msgid "_Homepage" -msgstr "" - -#: ../gtk/main.ui.h:54 -msgid "_Options" -msgstr "" - -#: ../gtk/main.ui.h:55 -msgid "in" -msgstr "" - -#: ../gtk/main.ui.h:56 -msgid "label" -msgstr "" - -#: ../gtk/about.ui.h:1 -msgid "(C) Belledonne Communications,2010\n" -msgstr "" - -#: ../gtk/about.ui.h:3 -#, fuzzy -msgid "About linphone" -msgstr "linphone" - -#: ../gtk/about.ui.h:4 -msgid "An internet video phone using the standard SIP (rfc3261) protocol." -msgstr "" - -#: ../gtk/about.ui.h:5 -msgid "" -"fr: Simon Morlat\n" -"en: Simon Morlat and Delphine Perreau\n" -"it: Alberto Zanoni \n" -"de: Jean-Jacques Sarton \n" -"sv: Daniel Nylander \n" -"es: Jesus Benitez \n" -"ja: YAMAGUCHI YOSHIYA \n" -"pt_BR: Rafael Caesar Lenzi \n" -"pl: Robert Nasiadek \n" -"cs: Petr Pisar \n" -"hu: anonymous\n" -msgstr "" - -#: ../gtk/contact.ui.h:1 -#, fuzzy -msgid "Contact information" -msgstr "Informacion de codec" - -#: ../gtk/contact.ui.h:2 -msgid "Allow this contact to see my presence status" -msgstr "" - -#: ../gtk/contact.ui.h:4 -#, fuzzy -msgid "SIP Address" -msgstr "Direccion" - -#: ../gtk/contact.ui.h:5 -msgid "Show this contact presence status" -msgstr "" - -#: ../gtk/log.ui.h:1 -#, fuzzy -msgid "Linphone debug window" -msgstr "Linphone esta terminando..." - -#: ../gtk/password.ui.h:1 -#, fuzzy -msgid "Linphone - Authentication required" -msgstr "Informacion de codec" - -#: ../gtk/password.ui.h:2 -#, fuzzy -msgid "Password:" -msgstr "Tu Contraseña:" - -#: ../gtk/password.ui.h:3 -msgid "Please enter the domain password" -msgstr "" - -#: ../gtk/password.ui.h:4 -msgid "UserID" -msgstr "" - -#: ../gtk/call_logs.ui.h:1 -msgid "Call back" -msgstr "" - -#: ../gtk/call_logs.ui.h:2 -msgid "Call history" -msgstr "" - -#: ../gtk/call_logs.ui.h:3 -msgid "Clear all" -msgstr "" - -#: ../gtk/sip_account.ui.h:1 -msgid "Configure a SIP account" -msgstr "" - -#: ../gtk/sip_account.ui.h:2 -msgid "Linphone - Configure a SIP account" -msgstr "" - -#: ../gtk/sip_account.ui.h:3 -msgid "Looks like sip:" -msgstr "" - -#: ../gtk/sip_account.ui.h:4 -msgid "Looks like sip:@" -msgstr "" - -#: ../gtk/sip_account.ui.h:5 -#, fuzzy -msgid "Publish presence information" -msgstr "Informacion de codec" - -#: ../gtk/sip_account.ui.h:6 -msgid "Register" -msgstr "" - -#: ../gtk/sip_account.ui.h:7 -#, fuzzy -msgid "Registration duration (sec):" -msgstr "Se ha registrado con exito." - -#: ../gtk/sip_account.ui.h:8 -msgid "Route (optional):" -msgstr "" - -#: ../gtk/sip_account.ui.h:9 -#, fuzzy -msgid "SIP Proxy address:" -msgstr "Direccion SIP" - -#: ../gtk/sip_account.ui.h:10 -#, fuzzy -msgid "Your SIP identity:" -msgstr "Identidad" - -#: ../gtk/sip_account.ui.h:11 -msgid "sip:" -msgstr "SIP:" - -#: ../gtk/chatroom.ui.h:1 -#, fuzzy -msgid "Send" -msgstr "Sonido" - -#: ../gtk/parameters.ui.h:1 -msgid "0 stands for \"unlimited\"" -msgstr "" - -#: ../gtk/parameters.ui.h:2 -#, fuzzy -msgid "Audio" -msgstr "Contactando " - -#: ../gtk/parameters.ui.h:3 -msgid "Bandwidth control" -msgstr "" - -#: ../gtk/parameters.ui.h:4 -#, fuzzy -msgid "Codecs" -msgstr "Contactando " - -#: ../gtk/parameters.ui.h:5 -#, fuzzy -msgid "Default identity" -msgstr "Identidad" - -#: ../gtk/parameters.ui.h:6 -#, fuzzy -msgid "Language" -msgstr "Contactando " - -#: ../gtk/parameters.ui.h:7 -#, fuzzy -msgid "Level" -msgstr "Contactando " - -#: ../gtk/parameters.ui.h:8 -#, fuzzy -msgid "NAT and Firewall" -msgstr "Contactando " - -#: ../gtk/parameters.ui.h:9 -msgid "Network protocol and ports" -msgstr "" - -#: ../gtk/parameters.ui.h:10 -#, fuzzy -msgid "Privacy" -msgstr "Contactando " - -#: ../gtk/parameters.ui.h:11 -#, fuzzy -msgid "Proxy accounts" -msgstr "Contactando " - -#: ../gtk/parameters.ui.h:12 -#, fuzzy -msgid "Transport" -msgstr "Contactando " - -#: ../gtk/parameters.ui.h:13 -#, fuzzy -msgid "Video" -msgstr "Contactando " - -#: ../gtk/parameters.ui.h:14 -msgid "" -"Adaptive rate control is a technique to dynamically guess the available " -"bandwidth during a call." -msgstr "" - -#: ../gtk/parameters.ui.h:15 -msgid "ALSA special device (optional):" -msgstr "" - -#: ../gtk/parameters.ui.h:16 -msgid "Add" -msgstr "Añadir" - -#: ../gtk/parameters.ui.h:17 -msgid "Audio RTP/UDP:" -msgstr "" - -#: ../gtk/parameters.ui.h:18 -#, fuzzy -msgid "Audio codecs" -msgstr "Propiedades del codec de Audio" - -#: ../gtk/parameters.ui.h:19 -msgid "Behind NAT / Firewall (specify gateway IP below)" -msgstr "" - -#: ../gtk/parameters.ui.h:20 -msgid "Behind NAT / Firewall (use STUN to resolve)" -msgstr "" - -#: ../gtk/parameters.ui.h:22 -msgid "CIF" -msgstr "" - -#: ../gtk/parameters.ui.h:23 -#, fuzzy -msgid "Capture device:" -msgstr "Usar dispositivo de sonido:" - -#: ../gtk/parameters.ui.h:24 -#, fuzzy -msgid "Codecs" -msgstr "Codecs" - -#: ../gtk/parameters.ui.h:25 -msgid "Direct connection to the Internet" -msgstr "" - -#: ../gtk/parameters.ui.h:26 -msgid "Disable" -msgstr "Desactivado" - -#: ../gtk/parameters.ui.h:27 -#, fuzzy -msgid "Done" -msgstr "Ninguno." - -#: ../gtk/parameters.ui.h:28 -msgid "Download speed limit in Kbit/sec:" -msgstr "" - -#: ../gtk/parameters.ui.h:29 -msgid "Edit" -msgstr "" - -#: ../gtk/parameters.ui.h:30 -msgid "Enable" -msgstr "Activado" - -#: ../gtk/parameters.ui.h:31 -msgid "Enable adaptive rate control" -msgstr "" - -#: ../gtk/parameters.ui.h:32 -msgid "Enable echo cancellation" -msgstr "" - -#: ../gtk/parameters.ui.h:33 -msgid "Erase all passwords" -msgstr "" - -#: ../gtk/parameters.ui.h:34 -msgid "Manage SIP Accounts" -msgstr "" - -#: ../gtk/parameters.ui.h:35 -msgid "Media encryption type" -msgstr "" - -#: ../gtk/parameters.ui.h:36 -msgid "Multimedia settings" -msgstr "" - -#: ../gtk/parameters.ui.h:37 -#, fuzzy -msgid "Network settings" -msgstr "Red" - -#: ../gtk/parameters.ui.h:38 -#, fuzzy -msgid "Playback device:" -msgstr "Usar dispositivo de sonido:" - -#: ../gtk/parameters.ui.h:39 -msgid "Prefered video resolution:" -msgstr "" - -#: ../gtk/parameters.ui.h:40 -#, fuzzy -msgid "Public IP address:" -msgstr "Direccion SIP" - -#: ../gtk/parameters.ui.h:41 -msgid "" -"Register to FONICS\n" -"virtual network !" -msgstr "" - -#: ../gtk/parameters.ui.h:43 -msgid "Remove" -msgstr "Borrar" - -#: ../gtk/parameters.ui.h:44 -#, fuzzy -msgid "Ring device:" -msgstr "Usar dispositivo de sonido:" - -#: ../gtk/parameters.ui.h:45 -#, fuzzy -msgid "Ring sound:" -msgstr "Fuente de grabacion:" - -#: ../gtk/parameters.ui.h:46 -msgid "SIP (TCP)" -msgstr "" - -#: ../gtk/parameters.ui.h:47 -msgid "SIP (TLS)" -msgstr "" - -#: ../gtk/parameters.ui.h:48 -msgid "SIP (UDP)" -msgstr "" - -#: ../gtk/parameters.ui.h:49 -msgid "Send DTMFs as SIP info" -msgstr "" - -#: ../gtk/parameters.ui.h:50 -msgid "Set Maximum Transmission Unit:" -msgstr "" - -#: ../gtk/parameters.ui.h:51 -msgid "Settings" -msgstr "" - -#: ../gtk/parameters.ui.h:52 -msgid "Show advanced settings" -msgstr "" - -#: ../gtk/parameters.ui.h:53 -#, fuzzy -msgid "Stun server:" -msgstr "Servidor de Redireccionamiento" - -#: ../gtk/parameters.ui.h:54 -msgid "This section defines your SIP address when not using a SIP account" -msgstr "" - -#: ../gtk/parameters.ui.h:55 -msgid "Upload speed limit in Kbit/sec:" -msgstr "" - -#: ../gtk/parameters.ui.h:56 -msgid "Use IPv6 instead of IPv4" -msgstr "" - -#: ../gtk/parameters.ui.h:57 -#, fuzzy -msgid "User interface" -msgstr "Manual de Usuario" - -#: ../gtk/parameters.ui.h:58 -msgid "Video RTP/UDP:" -msgstr "" - -#: ../gtk/parameters.ui.h:59 -#, fuzzy -msgid "Video codecs" -msgstr "Propiedades del codec de Audio" - -#: ../gtk/parameters.ui.h:60 -#, fuzzy -msgid "Video input device:" -msgstr "Usar dispositivo de sonido:" - -#: ../gtk/parameters.ui.h:61 -msgid "Your display name (eg: John Doe):" -msgstr "" - -#: ../gtk/parameters.ui.h:62 -#, fuzzy -msgid "Your resulting SIP address:" -msgstr "Tu direccion SIP:" - -#: ../gtk/parameters.ui.h:63 -#, fuzzy -msgid "Your username:" -msgstr "Manual de Usuario" - -#: ../gtk/parameters.ui.h:64 -msgid "a sound card" -msgstr "" - -#: ../gtk/parameters.ui.h:65 -msgid "default camera" -msgstr "" - -#: ../gtk/parameters.ui.h:66 -msgid "default soundcard" -msgstr "" - -#: ../gtk/buddylookup.ui.h:1 -#, fuzzy -msgid "Search somebody" -msgstr "Contactando " - -#: ../gtk/buddylookup.ui.h:2 -msgid "Add to my list" -msgstr "" - -#: ../gtk/buddylookup.ui.h:3 -#, fuzzy -msgid "Search contacts in directory" -msgstr "Informacion de codec" - -#: ../gtk/waiting.ui.h:1 -#, fuzzy -msgid "Linphone" -msgstr "linphone" - -#: ../gtk/waiting.ui.h:2 -msgid "Please wait" -msgstr "" - -#: ../coreapi/linphonecore.c:187 -msgid "aborted" -msgstr "" - -#: ../coreapi/linphonecore.c:190 -msgid "completed" -msgstr "" - -#: ../coreapi/linphonecore.c:193 -msgid "missed" -msgstr "" - -#: ../coreapi/linphonecore.c:198 -#, c-format -msgid "" -"%s at %s\n" -"From: %s\n" -"To: %s\n" -"Status: %s\n" -"Duration: %i mn %i sec\n" -msgstr "" - -#: ../coreapi/linphonecore.c:199 -msgid "Outgoing call" -msgstr "" - -#: ../coreapi/linphonecore.c:1088 -#, fuzzy -msgid "Ready" -msgstr "Preparado." - -#: ../coreapi/linphonecore.c:1831 -msgid "Looking for telephone number destination..." -msgstr "" - -#: ../coreapi/linphonecore.c:1834 -msgid "Could not resolve this number." -msgstr "" - -#: ../coreapi/linphonecore.c:1878 -#, fuzzy -msgid "" -"Could not parse given sip address. A sip url usually looks like sip:" -"user@domain" -msgstr "" -"Direccion SIP mal escrita. Una direccion SIP es " - -#: ../coreapi/linphonecore.c:2025 -#, fuzzy -msgid "Contacting" -msgstr "Contactando " - -#: ../coreapi/linphonecore.c:2032 -#, fuzzy -msgid "Could not call" -msgstr "No se pudo encontrar el archivo pixmap: %s" - -#: ../coreapi/linphonecore.c:2140 -msgid "Sorry, we have reached the maximum number of simultaneous calls" -msgstr "" - -#: ../coreapi/linphonecore.c:2270 -msgid "Modifying call parameters..." -msgstr "" - -#: ../coreapi/linphonecore.c:2366 -msgid "Connected." -msgstr "Conectado." - -#: ../coreapi/linphonecore.c:2389 -#, fuzzy -msgid "Call aborted" -msgstr "Llamada cancelada." - -#: ../coreapi/linphonecore.c:2530 -msgid "Could not pause the call" -msgstr "" - -#: ../coreapi/linphonecore.c:2535 -msgid "Pausing the current call..." -msgstr "" - -#: ../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" -"is missing and linphone needs it. Please execute\n" -"'modprobe snd-pcm-oss' as root to load it." -msgstr "" -"Tu ordenador parece estar usando los controladores de ALSA.\n" -"Esa es la mejor eleccion. Sin embargo el modulo de emulacion pcm de OSS\n" -"no se encuentra y linphone lo necesita. Por favor ejecute\n" -"'modprobe snd-pcm-oss' como root para cargarlo." - -#: ../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" -"is missing and linphone needs it. Please execute\n" -" 'modprobe snd-mixer-oss' as root to load it." -msgstr "" -"Tu ordenador parece estar usando los controladores de ALSA.\n" -"Esa es la mejor eleccion. Sin embargo el modulo de emulacion mixer de OSS\n" -"no se encuentra y linphone lo necesita. Por favor ejecute\n" -" 'modprobe snd-mixer-oss' como root para cargarlo." - -#: ../coreapi/misc.c:478 -msgid "Stun lookup in progress..." -msgstr "" - -#: ../coreapi/friend.c:33 -#, fuzzy -msgid "Online" -msgstr "linea" - -#: ../coreapi/friend.c:36 -msgid "Busy" -msgstr "" - -#: ../coreapi/friend.c:39 -msgid "Be right back" -msgstr "" - -#: ../coreapi/friend.c:42 -msgid "Away" -msgstr "Ausente" - -#: ../coreapi/friend.c:45 -#, fuzzy -msgid "On the phone" -msgstr "linphone" - -#: ../coreapi/friend.c:48 -msgid "Out to lunch" -msgstr "" - -#: ../coreapi/friend.c:51 -msgid "Do not disturb" -msgstr "No molestar" - -#: ../coreapi/friend.c:54 -#, fuzzy -msgid "Moved" -msgstr "Codecs" - -#: ../coreapi/friend.c:57 -msgid "Using another messaging service" -msgstr "" - -#: ../coreapi/friend.c:60 -#, fuzzy -msgid "Offline" -msgstr "linea" - -#: ../coreapi/friend.c:63 -msgid "Pending" -msgstr "" - -#: ../coreapi/friend.c:66 -msgid "Unknown-bug" -msgstr "" - -#: ../coreapi/proxy.c:192 -msgid "" -"The sip proxy address you entered is invalid, it must start with \"sip:\" " -"followed by a hostname." -msgstr "" - -#: ../coreapi/proxy.c:198 -msgid "" -"The sip identity you entered is invalid.\n" -"It should look like sip:username@proxydomain, such as sip:alice@example.net" -msgstr "" - -#: ../coreapi/proxy.c:690 -#, fuzzy, c-format -msgid "Could not login as %s" -msgstr "No se pudo encontrar el archivo pixmap: %s" - -#: ../coreapi/callbacks.c:206 -#, fuzzy -msgid "is contacting you" -msgstr "le esta llamando." - -#: ../coreapi/callbacks.c:207 -msgid " and asked autoanswer." -msgstr "" - -#: ../coreapi/callbacks.c:207 -msgid "." -msgstr "" - -#: ../coreapi/callbacks.c:266 -#, fuzzy -msgid "Remote ringing." -msgstr "Registrando..." - -#: ../coreapi/callbacks.c:282 -#, fuzzy -msgid "Remote ringing..." -msgstr "Registrando..." - -#: ../coreapi/callbacks.c:293 -msgid "Early media." -msgstr "" - -#: ../coreapi/callbacks.c:331 -#, c-format -msgid "Call with %s is paused." -msgstr "" - -#: ../coreapi/callbacks.c:342 -#, c-format -msgid "Call answered by %s - on hold." -msgstr "" - -#: ../coreapi/callbacks.c:357 -#, fuzzy -msgid "Call resumed." -msgstr "Llamada cancelada." - -#: ../coreapi/callbacks.c:362 -#, fuzzy, c-format -msgid "Call answered by %s." -msgstr "" -"Llamar o\n" -"Responder" - -#: ../coreapi/callbacks.c:432 -msgid "We are being paused..." -msgstr "" - -#: ../coreapi/callbacks.c:436 -msgid "We have been resumed..." -msgstr "" - -#: ../coreapi/callbacks.c:441 -msgid "Call has been updated by remote..." -msgstr "" - -#: ../coreapi/callbacks.c:473 -#, fuzzy -msgid "Call terminated." -msgstr "Llamada cancelada." - -#: ../coreapi/callbacks.c:480 -msgid "User is busy." -msgstr "El usuario esta ocupado." - -#: ../coreapi/callbacks.c:481 -msgid "User is temporarily unavailable." -msgstr "El usuario le dice que volvera enseguida." - -#. char *retrymsg=_("%s. Retry after %i minute(s)."); -#: ../coreapi/callbacks.c:483 -msgid "User does not want to be disturbed." -msgstr "El usuario no quiere que lo molesten." - -#: ../coreapi/callbacks.c:484 -msgid "Call declined." -msgstr "Llamada cancelada." - -#: ../coreapi/callbacks.c:496 -msgid "No response." -msgstr "" - -#: ../coreapi/callbacks.c:500 -msgid "Protocol error." -msgstr "" - -#: ../coreapi/callbacks.c:516 -msgid "Redirected" -msgstr "" - -#: ../coreapi/callbacks.c:526 -msgid "Not found" -msgstr "" - -#: ../coreapi/callbacks.c:551 -msgid "No common codecs" -msgstr "" - -#: ../coreapi/callbacks.c:557 -#, fuzzy -msgid "Call failed." -msgstr "Llamada cancelada." - -#: ../coreapi/callbacks.c:631 -#, fuzzy, c-format -msgid "Registration on %s successful." -msgstr "Se ha registrado con exito." - -#: ../coreapi/callbacks.c:632 -#, fuzzy, c-format -msgid "Unregistration on %s done." -msgstr "Se ha registrado con exito." - -#: ../coreapi/callbacks.c:648 -msgid "no response timeout" -msgstr "" - -#: ../coreapi/callbacks.c:651 -#, fuzzy, c-format -msgid "Registration on %s failed: %s" -msgstr "Se ha registrado con exito." - -#: ../coreapi/sal_eXosip2.c:873 ../coreapi/sal_eXosip2.c:875 -#, fuzzy -msgid "Authentication failure" -msgstr "Informacion de codec" - -#: ../coreapi/linphonecall.c:128 -#, fuzzy, c-format -msgid "Authentication token is %s" -msgstr "Informacion de codec" - -#: ../coreapi/linphonecall.c:1560 -#, c-format -msgid "You have missed %i call." -msgid_plural "You have missed %i calls." -msgstr[0] "" -msgstr[1] "" - -#, fuzzy -#~ msgid "Contact list" -#~ msgstr "Contactando " - -#, fuzzy -#~ msgid "Audio & video" -#~ msgstr "Propiedades del codec de Audio" - -#, fuzzy -#~ msgid "Audio only" -#~ msgstr "Propiedades del codec de Audio" - -#, fuzzy -#~ msgid "Duration:" -#~ msgstr "Informacion" - -#, fuzzy -#~ msgid "_Linphone" -#~ msgstr "linphone" - -#, fuzzy -#~ msgid "gtk-cancel" -#~ msgstr "Conectado." - -#, fuzzy -#~ msgid "gtk-ok" -#~ msgstr "Borrar" - -#, fuzzy -#~ msgid "gtk-close" -#~ msgstr "Conectado." - -#, fuzzy -#~ msgid "Ports" -#~ msgstr "Contactando " - -#, fuzzy -#~ msgid "_Modes" -#~ msgstr "Codecs" - -#, fuzzy -#~ msgid "" -#~ "Audio codecs\n" -#~ "Video codecs" -#~ msgstr "Propiedades del codec de Audio" - -#, fuzzy -#~ msgid "Request Cancelled." -#~ msgstr "Llamada cancelada." - -#~ msgid "User cannot be found at given address." -#~ msgstr "No se encontro ningun usuario en la direccion indicada." - -#~ msgid "Remote user cannot support any of proposed codecs." -#~ msgstr "El usuario remoto no soporta ninguno de los codecs propuestos." - -#~ msgid "Timeout." -#~ msgstr "Tiempo agotado." - -#~ msgid "Remote host was found but refused connection." -#~ msgstr "Se encontro host remoto pero rechazo la conexion." - -#~ msgid "" -#~ "User is not reachable at the moment but he invites you\n" -#~ "to contact him using the following alternate resource:" -#~ msgstr "" -#~ "Usuario no disponible en este momento pero le invita\n" -#~ "a contactarle usando el siguiente recurso alternativo:" - -#, fuzzy -#~ msgid "Gone" -#~ msgstr "Ninguno." - -#, fuzzy -#~ msgid "SIP address" -#~ msgstr "Direccion" - -#, fuzzy -#~ msgid "Display filters" -#~ msgstr "Nombre a mostrar:" - -#, fuzzy -#~ msgid "_Properties" -#~ msgstr "Propiedades de RTP" - -#, fuzzy -#~ msgid "Proxy in use" -#~ msgstr "Servidor Proxy" - -#~ msgid "Sound" -#~ msgstr "Sonido" - -#, fuzzy -#~ msgid "Proxy accounts" -#~ msgstr "Servidor Proxy" - -#~ msgid "Address book" -#~ msgstr "Agenda" - -#, fuzzy -#~ msgid "Shows the address book" -#~ msgstr "Muestra la Agenda" - -#~ msgid "Show more..." -#~ msgstr "Mostrar mas..." - -#~ msgid "Playback level:" -#~ msgstr "Nivel de reproduccion:" - -#~ msgid "Recording level:" -#~ msgstr "Nivel de Grabacion:" - -#, fuzzy -#~ msgid "Ring level:" -#~ msgstr "Nivel de Grabacion:" - -#~ msgid "Reachable" -#~ msgstr "Disponible" - -#~ msgid "Busy, I'll be back in " -#~ msgstr "Ocupado, estare de vuelta en " - -#~ msgid "The other party will be informed that you'll be back in X minutes" -#~ msgstr "" -#~ "Se le comunicara a la otra persona que estaras de vuelta en X minutos" - -#~ msgid "mn" -#~ msgstr "min" - -#~ msgid "Moved temporarily" -#~ msgstr "Vengo enseguida" - -#~ msgid "Alternative service" -#~ msgstr "Servicio alternativo" - -#~ msgid "URL:" -#~ msgstr "URL:" - -#~ msgid "Presence" -#~ msgstr "Estado" - -#~ msgid "Press digits to send DTMFs." -#~ msgstr "Pulsa los digitos para mandar DTMFs." - -#~ msgid "DTMF" -#~ msgstr "DTMF" - -#~ msgid "" -#~ "Linphone is a web-phone.\n" -#~ "It is compatible with SIP and RTP protocols." -#~ msgstr "" -#~ "Linphone es un telefono para Internet.\n" -#~ "Es compatible con los protocolos SIP y RTP." - -#, fuzzy -#~ msgid "Use IPv6 network (if available)" -#~ msgstr "El usuario le dice que volvera enseguida." - -#, fuzzy -#~ msgid "" -#~ "These options is only for users in a private network, behind a gateway. " -#~ "If you are not in this situation, then leave this empty." -#~ msgstr "" -#~ "Esta opcion es solo para usuarios en una red privada, detras de un " -#~ "cortafuegos. Siese no es tu caso, deja esto vacio." - -#, fuzzy -#~ msgid "NAT traversal options (experimental)" -#~ msgstr "Opciones para NAT transversal (experimental)" - -#, fuzzy -#~ msgid "Number of buffered miliseconds (jitter compensation):" -#~ msgstr "Numero de milisegundos en el buffer(compensacion jitter):" - -#~ msgid "RTP port used for audio:" -#~ msgstr "Puerto RTP usado para audio:" - -#~ msgid "micro" -#~ msgstr "microfono" - -#~ msgid "Recording source:" -#~ msgstr "Fuente de grabacion:" - -#~ msgid "Sound properties" -#~ msgstr "Propiedades de sonido" - -#~ msgid "Run sip user agent on port:" -#~ msgstr "Ejecutar SIP user agent en el puerto:" - -#~ msgid "It is strongly recommended to use port 5060." -#~ msgstr "Se recomienda encarecidamente usar el puerto 5060." - -#~ msgid "SIP port" -#~ msgstr "Puerto SIP" - -#~ msgid "@" -#~ msgstr "@" - -#~ msgid "Identity" -#~ msgstr "Identidad" - -#, fuzzy -#~ msgid "Add proxy/registrar" -#~ msgstr "Usar el registro SIP" - -#~ msgid "Remote services" -#~ msgstr "Servicios Remotos:" - -#~ msgid "SIP" -#~ msgstr "SIP" - -#~ msgid "List of audio codecs, in order of preference:" -#~ msgstr "Lista de codecs de audio, en orden de preferencia:" - -#~ msgid "" -#~ "Note: Codecs in red are not usable regarding to your connection type to " -#~ "the internet." -#~ msgstr "" -#~ "Nota: Los codecs en ROJO no son adecuados para tu conexion a internet." - -#, fuzzy -#~ msgid "No information availlable" -#~ msgstr "Informacion no disponible" - -#, fuzzy -#~ msgid "Codec information" -#~ msgstr "Informacion de codec" - -#~ msgid "Address Book" -#~ msgstr "Agenda" - -#~ msgid "Select" -#~ msgstr "Seleccionar" - -#~ msgid "" -#~ "User is not reachable at the moment but he invites you to contact him " -#~ "using the following alternate ressource:" -#~ msgstr "" -#~ "Usuario no disponible en este momento pero le invita a contactarle usando " -#~ "el siguiente recurso alternativo:" - -#~ msgid "None." -#~ msgstr "Ninguno." - -#, fuzzy -#~ msgid "Name:" -#~ msgstr "Nombre" - -#, fuzzy -#~ msgid "Bad sip address: a sip address looks like sip:user@domain" -#~ msgstr "" -#~ "Direccion SIP mal escrita. Una direccion SIP es " - -#~ msgid "Communication ended." -#~ msgstr "Comunicacion finalizada." - -#, fuzzy -#~ msgid "Firewall 's external ip address (in dot notations):" -#~ msgstr "Direccion IP del cortafuegos (en notacion con puntos):" - -#~ msgid "Index" -#~ msgstr "Indice" - -#, fuzzy -#~ msgid "Server address" -#~ msgstr "Direccion del Servidor:" - -#~ msgid "28k modem" -#~ msgstr "modem 28k" - -#~ msgid "56k modem" -#~ msgstr "modem 56k" - -#~ msgid "64k modem (numeris)" -#~ msgstr "modem 64k (numeris)" - -#~ msgid "ADSL or Cable modem" -#~ msgstr "ADSL o Cable" - -#~ msgid "Ethernet or equivalent" -#~ msgstr "Ethernet o equivalente" - -#~ msgid "Connection type:" -#~ msgstr "Tipo de conexion:" - -#, fuzzy -#~ msgid "" -#~ "Linphone could not open audio device %s. Check if your sound card is " -#~ "fully configured and working." -#~ msgstr "" -#~ "Linphone no pudo abrir el dispositivo de audio. Asegurese que su tarjeta " -#~ "de sonido esta completamente configurada y operativa." - -#~ msgid "Type here the sip address of the person you want to call." -#~ msgstr "Escribe aqui la direccion SIP de la persona que quieres llamar." - -#~ msgid "" -#~ "Release or\n" -#~ "Refuse" -#~ msgstr "" -#~ "Descolgar o\n" -#~ "Rechazar" - -#~ msgid "%s. Retry after %i minute(s)." -#~ msgstr "%s. Reintentar tras %i minutos." - -#, fuzzy -#~ msgid "Timeout..." -#~ msgstr "Tiempo agotado." - -#~ msgid "Toggle this if you want to be registered on a remote server." -#~ msgstr "Marcar opcion si desea registrarse en un servidor remoto." - -#~ msgid "Address of record:" -#~ msgstr "Nombre de registro:" - -#~ msgid "" -#~ "The password used for registration. On some servers it is not necessary" -#~ msgstr "" -#~ "La contraseña usada para registrarse. En algunos servidores no es " -#~ "necesaria" - -#~ msgid "Use this registrar server as outbound proxy." -#~ msgstr "Usar el servidor de registro como outbound proxy." - -#~ msgid "sip address:" -#~ msgstr "Direccion SIP:" - -#~ msgid "Modify" -#~ msgstr "Modificar" - -#~ msgid "" -#~ "You are currently using the i810_audio driver.\n" -#~ "This driver is buggy and so does not work with Linphone.\n" -#~ "We suggest that you replace it by its equivalent ALSA driver,\n" -#~ "either with packages from your distribution, or by downloading\n" -#~ "ALSA drivers at http://www.alsa-project.org." -#~ msgstr "" -#~ "Estas usando actualmente el controlador i810_audio.\n" -#~ "Ese controlador tiene errores y por tanto no funciona con Linphone.\n" -#~ "Le recomendamos que lo sustituya por su controlador equivalente de ALSA,\n" -#~ "ya sea mediante paquetes de su distribucion, o descargando\n" -#~ "controladores ALSA de http://www.alsa-project.org." - -#~ msgid "Unregistration successfull." -#~ msgstr "Cancelacion del registro completada." - -#~ msgid "C: 2001" -#~ msgstr "Abril 2001" - -#~ msgid "Select network interface to use:" -#~ msgstr "Selecciona la interfaz de red para usar:" - -#~ msgid "Network interface properties" -#~ msgstr "Propiedades de Interfaz de Red:" - -#~ msgid "RTP" -#~ msgstr "RTP" - -#~ msgid "Threads not supported by glib. Upgrade your glib.\n" -#~ msgstr "Threads no soportados por glib. Actualize su glib.\n" - -#~ msgid "Run linphone as a gnome-applet." -#~ msgstr "Lanzar linphone como un gnome-applet." - -#~ msgid "Run linphone as a daemon (for use without gnome)." -#~ msgstr "Ejecutar linphone como demonio (para uso sin gnome)." - -#~ msgid "" -#~ "Cannot find network previously used interface %s.\n" -#~ "If your computer is temporary connected to the internet, please connect " -#~ "and then run linphone.\n" -#~ "If you want to change your default network interface, go to the " -#~ "parameters 'box." -#~ msgstr "" -#~ "No se puede encontrar la interfaz de red usada previamente %s.\n" -#~ "Si tu ordenador esta conectado temporalmente a Internet, por favor " -#~ "conecta y entonces ejecuta linphone.\n" -#~ "Si quieres cambiar tu interfaz de red predeterminada, ve a la opcion " -#~ "Parametros." - -#, fuzzy -#~ msgid "" -#~ "Linphone cannot open the audio device.\n" -#~ "It may be caused by other programs using it.\n" -#~ "Do you want linphone to kill these programs (esd or artsd) ?" -#~ msgstr "" -#~ "Linphone no puede abrir el dispositivo de audio.\n" -#~ " Puede deberse a que otros programas lo esten usando.\n" -#~ "¿ Quiere que Linphone cierre esos programas (esd o artsd) ?" - -#~ msgid "Use it as a:" -#~ msgstr "Usarlo como un:" - -#~ msgid "Outbound proxy" -#~ msgstr "Outbound proxy" - -#~ msgid "" -#~ "Togle this button if the registrar must be used to proxy calls through a " -#~ "firewall." -#~ msgstr "" -#~ "Marcar esta opcion si el servidor de registro debe ser usado para " -#~ "llamadas a proxy a traves de un cortafuegos." - -#~ msgid "OSS" -#~ msgstr "OSS" - -#~ msgid "ALSA" -#~ msgstr "ALSA" - -#~ msgid "Automatically kill applications using soundcard when needed" -#~ msgstr "" -#~ "Cerrar aplicaciones que usen la tarjeta de sonido cuando se necesite." - -#~ msgid "" -#~ "Your computer is connected to several networks. Check in the global " -#~ "parameters if Linphone uses the one that you want." -#~ msgstr "" -#~ "Tu ordenador esta conectado a varias redes. Revisa en los Parametros " -#~ "globales si Linphone usa la que necesitas." - -#~ msgid "" -#~ "Linphone failed to open the sound device. See the README file included in " -#~ "the distribution for details." -#~ msgstr "" -#~ "Linphone fallo al abrir el dispositivo de sonido. Vea el archivo README " -#~ "incluido en la distribucion para mas detalles." - -#~ msgid "Interface not found." -#~ msgstr "Interfaz no encontrada." - -#~ msgid "Warning" -#~ msgstr "Atencion" - -#~ msgid "" -#~ "Linphone cannot open the sound device. It may be caused by other programs " -#~ "using it. Do you want linphone to kill these programs (esd or artsd) ?" -#~ msgstr "" -#~ "Linphone no puede abrir el dispositivo de sonido. Puede deberse a que " -#~ "otros programaslo esten usando. ¿ Quiere que Linphone cierre esos " -#~ "programas (esd o artsd) ?" - -#~ msgid "Linphone shutdowns..." -#~ msgstr "Linphone esta terminando..." - -#~ msgid "" -#~ "Please, wait a few seconds untils linphone unregisters your sip addess " -#~ "from registrar server..." -#~ msgstr "" -#~ "Por favor, espere unos segundos hasta que Linphone cancele el registro de " -#~ "su direccion SIP en el servidor de registros..." - -#~ msgid "Bad formuled sip address." -#~ msgstr "Direccion SIP mal escrita." - -#~ msgid "Couldn't create pixmap from file: %s" -#~ msgstr "No se pudo crear pixmap desde el archivo: %s" - -#~ msgid "" -#~ "Linphone did not detect any valid network interface. If you use a " -#~ "temporary internet connection, please connect and then run linphone again." -#~ msgstr "" -#~ "Linphone no detecto ninguna interfaz de red valida. Si usas una conexion " -#~ "temporal a Internet, por favor conecta y vuelve a ejecutar Linphone." - -#~ msgid "List of network interfaces on your system." -#~ msgstr "Lista de interfaces de red en tu sistema." - -#~ msgid "" -#~ "RTP est le mode de transport de la voix. Modifier ces paramètres pour " -#~ "tenter d'améliorer la qualité de la communication si celle-ci est " -#~ "dégradée." -#~ msgstr "" -#~ "RTP es el modelo de transporte de la voz. Modifica estos parametros para " -#~ "intentar mejorar la calidad de la comunicacion, si es que.es mala." - -#~ msgid "Use rtp port:" -#~ msgstr "Puerto RTP:" - -#~ msgid "" -#~ "Les codecs ou vocodeurs sont les algorithmes utilisés pour compresser la " -#~ "voix." -#~ msgstr "" -#~ "Los codecs o codificadores/decodificadores son los algoritmos usados para " -#~ "comprimir la voz." - -#~ msgid "" -#~ "Vous pouvez ajuster avec cet onglet des paramètre liés à votre carte son." -#~ msgstr "Puede modificar estos parametros a su gusto." +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: Linphone 0.9.1\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-01-08 10:35+0100\n" +"PO-Revision-Date: 2002-10-15 HO:MI+ZONE\n" +"Last-Translator: Nelson Benitez \n" +"Language-Team: es \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../gtk/calllogs.c:82 +#, fuzzy +msgid "Aborted" +msgstr "Llamada cancelada." + +#: ../gtk/calllogs.c:85 +msgid "Missed" +msgstr "" + +#: ../gtk/calllogs.c:88 +#, fuzzy +msgid "Declined" +msgstr "linea" + +#: ../gtk/calllogs.c:94 +#, c-format +msgid "%i minute" +msgid_plural "%i minutes" +msgstr[0] "" +msgstr[1] "" + +#: ../gtk/calllogs.c:97 +#, c-format +msgid "%i second" +msgid_plural "%i seconds" +msgstr[0] "" +msgstr[1] "" + +#: ../gtk/calllogs.c:100 +#, c-format +msgid "" +"%s\t%s\tQuality: %s\n" +"%s\t%s %s\t" +msgstr "" + +#: ../gtk/calllogs.c:102 +msgid "n/a" +msgstr "" + +#: ../gtk/calllogs.c:105 +#, c-format +msgid "" +"%s\t%s\t\n" +"%s\t%s" +msgstr "" + +#: ../gtk/conference.c:33 ../gtk/main.ui.h:13 +msgid "Conference" +msgstr "" + +#: ../gtk/conference.c:41 +msgid "Me" +msgstr "" + +#: ../gtk/support.c:49 ../gtk/support.c:73 ../gtk/support.c:102 +#, c-format +msgid "Couldn't find pixmap file: %s" +msgstr "No se pudo encontrar el archivo pixmap: %s" + +#: ../gtk/main.c:89 +msgid "log to stdout some debug information while running." +msgstr "" + +#: ../gtk/main.c:96 +msgid "path to a file to write logs into." +msgstr "" + +#: ../gtk/main.c:103 +msgid "Start linphone with video disabled." +msgstr "" + +#: ../gtk/main.c:110 +msgid "Start only in the system tray, do not show the main interface." +msgstr "" + +#: ../gtk/main.c:117 +msgid "address to call right now" +msgstr "" + +#: ../gtk/main.c:124 +msgid "if set automatically answer incoming calls" +msgstr "" + +#: ../gtk/main.c:131 +msgid "" +"Specifiy a working directory (should be the base of the installation, eg: c:" +"\\Program Files\\Linphone)" +msgstr "" + +#: ../gtk/main.c:498 +#, c-format +msgid "Call with %s" +msgstr "" + +#: ../gtk/main.c:871 +#, c-format +msgid "" +"%s would like to add you to his contact list.\n" +"Would you allow him to see your presence status or add him to your contact " +"list ?\n" +"If you answer no, this person will be temporarily blacklisted." +msgstr "" + +#: ../gtk/main.c:948 +#, c-format +msgid "" +"Please enter your password for username %s\n" +" at domain %s:" +msgstr "" + +#: ../gtk/main.c:1051 +#, fuzzy +msgid "Call error" +msgstr "Llamada cancelada." + +#: ../gtk/main.c:1054 ../coreapi/linphonecore.c:2949 +#, fuzzy +msgid "Call ended" +msgstr "Llamada cancelada." + +#: ../gtk/main.c:1057 ../coreapi/linphonecore.c:244 +msgid "Incoming call" +msgstr "" + +#: ../gtk/main.c:1059 ../gtk/incall_view.c:451 ../gtk/main.ui.h:6 +msgid "Answer" +msgstr "" + +#: ../gtk/main.c:1061 ../gtk/main.ui.h:7 +#, fuzzy +msgid "Decline" +msgstr "linea" + +#: ../gtk/main.c:1067 +#, fuzzy +msgid "Call paused" +msgstr "Llamada cancelada." + +#: ../gtk/main.c:1067 +#, c-format +msgid "by %s" +msgstr "" + +#: ../gtk/main.c:1116 +#, c-format +msgid "%s proposed to start video. Do you accept ?" +msgstr "" + +#: ../gtk/main.c:1278 +msgid "Website link" +msgstr "" + +#: ../gtk/main.c:1318 +msgid "Linphone - a video internet phone" +msgstr "" + +#: ../gtk/main.c:1410 +#, c-format +msgid "%s (Default)" +msgstr "" + +#: ../gtk/main.c:1714 ../coreapi/callbacks.c:774 +#, c-format +msgid "We are transferred to %s" +msgstr "" + +#: ../gtk/main.c:1724 +msgid "" +"No sound cards have been detected on this computer.\n" +"You won't be able to send or receive audio calls." +msgstr "" + +#: ../gtk/main.c:1833 +msgid "A free SIP video-phone" +msgstr "" + +#: ../gtk/friendlist.c:335 +#, fuzzy +msgid "Add to addressbook" +msgstr "Agenda" + +#: ../gtk/friendlist.c:509 +#, fuzzy +msgid "Presence status" +msgstr "Estado" + +#: ../gtk/friendlist.c:526 ../gtk/propertybox.c:362 ../gtk/contact.ui.h:1 +msgid "Name" +msgstr "Nombre" + +#: ../gtk/friendlist.c:538 +#, fuzzy +msgid "Call" +msgstr "Llamada cancelada." + +#: ../gtk/friendlist.c:543 +msgid "Chat" +msgstr "" + +#: ../gtk/friendlist.c:573 +#, c-format +msgid "Search in %s directory" +msgstr "" + +#: ../gtk/friendlist.c:730 +msgid "Invalid sip contact !" +msgstr "" + +#: ../gtk/friendlist.c:775 +#, c-format +msgid "Call %s" +msgstr "" + +#: ../gtk/friendlist.c:776 +#, c-format +msgid "Send text to %s" +msgstr "" + +#: ../gtk/friendlist.c:777 +#, fuzzy, c-format +msgid "Edit contact '%s'" +msgstr "(Ninguna informacion de contacto !)" + +#: ../gtk/friendlist.c:778 +#, c-format +msgid "Delete contact '%s'" +msgstr "" + +#: ../gtk/friendlist.c:820 +#, c-format +msgid "Add new contact from %s directory" +msgstr "" + +#: ../gtk/propertybox.c:368 +msgid "Rate (Hz)" +msgstr "" + +#: ../gtk/propertybox.c:374 +msgid "Status" +msgstr "Estado" + +#: ../gtk/propertybox.c:380 +msgid "Min bitrate (kbit/s)" +msgstr "" + +#: ../gtk/propertybox.c:387 +msgid "Parameters" +msgstr "Parametros" + +#: ../gtk/propertybox.c:430 ../gtk/propertybox.c:573 +msgid "Enabled" +msgstr "Activado" + +#: ../gtk/propertybox.c:432 ../gtk/propertybox.c:573 +msgid "Disabled" +msgstr "Desactivado" + +#: ../gtk/propertybox.c:619 +msgid "Account" +msgstr "" + +#: ../gtk/propertybox.c:759 +msgid "English" +msgstr "" + +#: ../gtk/propertybox.c:760 +msgid "French" +msgstr "" + +#: ../gtk/propertybox.c:761 +msgid "Swedish" +msgstr "" + +#: ../gtk/propertybox.c:762 +msgid "Italian" +msgstr "" + +#: ../gtk/propertybox.c:763 +msgid "Spanish" +msgstr "" + +#: ../gtk/propertybox.c:764 +msgid "Brazilian Portugese" +msgstr "" + +#: ../gtk/propertybox.c:765 +msgid "Polish" +msgstr "" + +#: ../gtk/propertybox.c:766 +msgid "German" +msgstr "" + +#: ../gtk/propertybox.c:767 +msgid "Russian" +msgstr "" + +#: ../gtk/propertybox.c:768 +msgid "Japanese" +msgstr "" + +#: ../gtk/propertybox.c:769 +msgid "Dutch" +msgstr "" + +#: ../gtk/propertybox.c:770 +msgid "Hungarian" +msgstr "" + +#: ../gtk/propertybox.c:771 +msgid "Czech" +msgstr "" + +#: ../gtk/propertybox.c:772 +msgid "Chinese" +msgstr "" + +#: ../gtk/propertybox.c:773 +msgid "Traditional Chinese" +msgstr "" + +#: ../gtk/propertybox.c:774 +msgid "Norwegian" +msgstr "" + +#: ../gtk/propertybox.c:775 +msgid "Hebrew" +msgstr "" + +#: ../gtk/propertybox.c:842 +msgid "" +"You need to restart linphone for the new language selection to take effect." +msgstr "" + +#: ../gtk/propertybox.c:912 +#, fuzzy +msgid "None" +msgstr "Ninguno." + +#: ../gtk/propertybox.c:916 +msgid "SRTP" +msgstr "" + +#: ../gtk/propertybox.c:922 +msgid "ZRTP" +msgstr "" + +#: ../gtk/update.c:80 +#, c-format +msgid "" +"A more recent version is availalble from %s.\n" +"Would you like to open a browser to download it ?" +msgstr "" + +#: ../gtk/update.c:91 +msgid "You are running the lastest version." +msgstr "" + +#: ../gtk/buddylookup.c:85 +msgid "Firstname, Lastname" +msgstr "" + +#: ../gtk/buddylookup.c:160 +msgid "Error communicating with server." +msgstr "" + +#: ../gtk/buddylookup.c:164 +#, fuzzy +msgid "Connecting..." +msgstr "Conexion" + +#: ../gtk/buddylookup.c:168 +#, fuzzy +msgid "Connected" +msgstr "Conectado." + +#: ../gtk/buddylookup.c:172 +msgid "Receiving data..." +msgstr "" + +#: ../gtk/buddylookup.c:180 +#, c-format +msgid "Found %i contact" +msgid_plural "Found %i contacts" +msgstr[0] "" +msgstr[1] "" + +#: ../gtk/setupwizard.c:33 +msgid "" +"Welcome !\n" +"This assistant will help you to use a SIP account for your calls." +msgstr "" + +#: ../gtk/setupwizard.c:42 +msgid "Create an account on linphone.org" +msgstr "" + +#: ../gtk/setupwizard.c:43 +msgid "I have already a linphone.org account and I just want to use it" +msgstr "" + +#: ../gtk/setupwizard.c:44 +msgid "I have already a sip account and I just want to use it" +msgstr "" + +#: ../gtk/setupwizard.c:84 +msgid "Enter your linphone.org username" +msgstr "" + +#: ../gtk/setupwizard.c:91 +#, fuzzy +msgid "Username:" +msgstr "Manual de Usuario" + +#: ../gtk/setupwizard.c:93 ../gtk/password.ui.h:4 +#, fuzzy +msgid "Password:" +msgstr "Tu Contraseña:" + +#: ../gtk/setupwizard.c:113 +msgid "Enter your account informations" +msgstr "" + +#: ../gtk/setupwizard.c:120 +#, fuzzy +msgid "Username*" +msgstr "Manual de Usuario" + +#: ../gtk/setupwizard.c:121 +#, fuzzy +msgid "Password*" +msgstr "Tu Contraseña:" + +#: ../gtk/setupwizard.c:124 +msgid "Domain*" +msgstr "" + +#: ../gtk/setupwizard.c:125 +msgid "Proxy" +msgstr "" + +#: ../gtk/setupwizard.c:297 +msgid "(*) Required fields" +msgstr "" + +#: ../gtk/setupwizard.c:298 +#, fuzzy +msgid "Username: (*)" +msgstr "Manual de Usuario" + +#: ../gtk/setupwizard.c:300 +#, fuzzy +msgid "Password: (*)" +msgstr "Tu Contraseña:" + +#: ../gtk/setupwizard.c:302 +msgid "Email: (*)" +msgstr "" + +#: ../gtk/setupwizard.c:304 +msgid "Confirm your password: (*)" +msgstr "" + +#: ../gtk/setupwizard.c:368 +msgid "" +"Error, account not validated, username already used or server unreachable.\n" +"Please go back and try again." +msgstr "" + +#: ../gtk/setupwizard.c:379 +msgid "Thank you. Your account is now configured and ready for use." +msgstr "" + +#: ../gtk/setupwizard.c:387 +msgid "" +"Please validate your account by clicking on the link we just sent you by " +"email.\n" +"Then come back here and press Next button." +msgstr "" + +#: ../gtk/setupwizard.c:554 +msgid "Welcome to the account setup assistant" +msgstr "" + +#: ../gtk/setupwizard.c:559 +msgid "Account setup assistant" +msgstr "" + +#: ../gtk/setupwizard.c:565 +msgid "Configure your account (step 1/1)" +msgstr "" + +#: ../gtk/setupwizard.c:570 +msgid "Enter your sip username (step 1/1)" +msgstr "" + +#: ../gtk/setupwizard.c:574 +msgid "Enter account information (step 1/2)" +msgstr "" + +#: ../gtk/setupwizard.c:583 +msgid "Validation (step 2/2)" +msgstr "" + +#: ../gtk/setupwizard.c:588 +msgid "Error" +msgstr "" + +#: ../gtk/setupwizard.c:592 +msgid "Terminating" +msgstr "" + +#: ../gtk/incall_view.c:69 ../gtk/incall_view.c:90 +#, fuzzy, c-format +msgid "Call #%i" +msgstr "Llamada cancelada." + +#: ../gtk/incall_view.c:150 +#, c-format +msgid "Transfer to call #%i with %s" +msgstr "" + +#: ../gtk/incall_view.c:209 ../gtk/incall_view.c:212 +msgid "Not used" +msgstr "" + +#: ../gtk/incall_view.c:219 +msgid "ICE not activated" +msgstr "" + +#: ../gtk/incall_view.c:221 +#, fuzzy +msgid "ICE failed" +msgstr "Llamada cancelada." + +#: ../gtk/incall_view.c:223 +msgid "ICE in progress" +msgstr "" + +#: ../gtk/incall_view.c:225 +msgid "Going through one or more NATs" +msgstr "" + +#: ../gtk/incall_view.c:227 +msgid "Direct" +msgstr "" + +#: ../gtk/incall_view.c:229 +msgid "Through a relay server" +msgstr "" + +#: ../gtk/incall_view.c:238 ../gtk/incall_view.c:242 +#, c-format +msgid "" +"download: %f\n" +"upload: %f (kbit/s)" +msgstr "" + +#: ../gtk/incall_view.c:341 ../gtk/main.ui.h:12 +msgid "Hang up" +msgstr "" + +#: ../gtk/incall_view.c:430 +#, fuzzy +msgid "Calling..." +msgstr "Contactando " + +#: ../gtk/incall_view.c:433 ../gtk/incall_view.c:646 +msgid "00::00::00" +msgstr "" + +#: ../gtk/incall_view.c:444 +#, fuzzy +msgid "Incoming call" +msgstr "Contactando " + +#: ../gtk/incall_view.c:481 +msgid "good" +msgstr "" + +#: ../gtk/incall_view.c:483 +msgid "average" +msgstr "" + +#: ../gtk/incall_view.c:485 +msgid "poor" +msgstr "" + +#: ../gtk/incall_view.c:487 +msgid "very poor" +msgstr "" + +#: ../gtk/incall_view.c:489 +msgid "too bad" +msgstr "" + +#: ../gtk/incall_view.c:490 ../gtk/incall_view.c:506 +msgid "unavailable" +msgstr "" + +#: ../gtk/incall_view.c:605 +msgid "Secured by SRTP" +msgstr "" + +#: ../gtk/incall_view.c:611 +#, c-format +msgid "Secured by ZRTP - [auth token: %s]" +msgstr "" + +#: ../gtk/incall_view.c:617 +msgid "Set unverified" +msgstr "" + +#: ../gtk/incall_view.c:617 ../gtk/main.ui.h:5 +msgid "Set verified" +msgstr "" + +#: ../gtk/incall_view.c:641 +msgid "In conference" +msgstr "" + +#: ../gtk/incall_view.c:641 +#, fuzzy +msgid "In call" +msgstr "Contactando " + +#: ../gtk/incall_view.c:669 +#, fuzzy +msgid "Paused call" +msgstr "Contactando " + +#: ../gtk/incall_view.c:682 +#, c-format +msgid "%02i::%02i::%02i" +msgstr "" + +#: ../gtk/incall_view.c:699 +#, fuzzy +msgid "Call ended." +msgstr "Llamada cancelada." + +#: ../gtk/incall_view.c:731 +msgid "Transfer in progress" +msgstr "" + +#: ../gtk/incall_view.c:734 +msgid "Transfer done." +msgstr "" + +#: ../gtk/incall_view.c:737 +#, fuzzy +msgid "Transfer failed." +msgstr "Llamada cancelada." + +#: ../gtk/incall_view.c:781 +msgid "Resume" +msgstr "" + +#: ../gtk/incall_view.c:788 ../gtk/main.ui.h:9 +msgid "Pause" +msgstr "" + +#: ../gtk/loginframe.c:93 +#, c-format +msgid "Please enter login information for %s" +msgstr "" + +#: ../gtk/main.ui.h:1 +#, fuzzy +msgid "Callee name" +msgstr "Llamada cancelada." + +#: ../gtk/main.ui.h:2 +#, fuzzy +msgid "Send" +msgstr "Sonido" + +#: ../gtk/main.ui.h:3 +msgid "End conference" +msgstr "" + +#: ../gtk/main.ui.h:4 +msgid "label" +msgstr "" + +#: ../gtk/main.ui.h:8 +msgid "Video" +msgstr "" + +#: ../gtk/main.ui.h:10 +msgid "Mute" +msgstr "" + +#: ../gtk/main.ui.h:11 +msgid "Transfer" +msgstr "" + +#: ../gtk/main.ui.h:14 +#, fuzzy +msgid "In call" +msgstr "Contactando " + +#: ../gtk/main.ui.h:15 +#, fuzzy +msgid "Duration" +msgstr "Informacion" + +#: ../gtk/main.ui.h:16 +msgid "Call quality rating" +msgstr "" + +#: ../gtk/main.ui.h:17 +msgid "_Options" +msgstr "" + +#: ../gtk/main.ui.h:18 +msgid "Always start video" +msgstr "" + +#: ../gtk/main.ui.h:19 +#, fuzzy +msgid "Enable self-view" +msgstr "Activado" + +#: ../gtk/main.ui.h:20 +msgid "_Help" +msgstr "" + +#: ../gtk/main.ui.h:21 +#, fuzzy +msgid "Show debug window" +msgstr "Linphone esta terminando..." + +#: ../gtk/main.ui.h:22 +msgid "_Homepage" +msgstr "" + +#: ../gtk/main.ui.h:23 +msgid "Check _Updates" +msgstr "" + +#: ../gtk/main.ui.h:24 +msgid "Account assistant" +msgstr "" + +#: ../gtk/main.ui.h:25 +#, fuzzy +msgid "SIP address or phone number:" +msgstr "La direccion SIP del servidor de registro." + +#: ../gtk/main.ui.h:26 +msgid "Initiate a new call" +msgstr "" + +#: ../gtk/main.ui.h:27 ../gtk/parameters.ui.h:48 +msgid "Add" +msgstr "Añadir" + +#: ../gtk/main.ui.h:28 ../gtk/parameters.ui.h:49 +msgid "Edit" +msgstr "" + +#: ../gtk/main.ui.h:29 +msgid "D" +msgstr "" + +#: ../gtk/main.ui.h:30 +msgid "#" +msgstr "#" + +#: ../gtk/main.ui.h:31 +msgid "0" +msgstr "0" + +#: ../gtk/main.ui.h:32 +msgid "*" +msgstr "*" + +#: ../gtk/main.ui.h:33 ../gtk/parameters.ui.h:7 +msgid "C" +msgstr "" + +#: ../gtk/main.ui.h:34 +msgid "9" +msgstr "9" + +#: ../gtk/main.ui.h:35 +msgid "8" +msgstr "8" + +#: ../gtk/main.ui.h:36 +msgid "7" +msgstr "7" + +#: ../gtk/main.ui.h:37 +msgid "B" +msgstr "" + +#: ../gtk/main.ui.h:38 +msgid "6" +msgstr "6" + +#: ../gtk/main.ui.h:39 +msgid "5" +msgstr "5" + +#: ../gtk/main.ui.h:40 +msgid "4" +msgstr "4" + +#: ../gtk/main.ui.h:41 +msgid "A" +msgstr "" + +#: ../gtk/main.ui.h:42 +msgid "3" +msgstr "3" + +#: ../gtk/main.ui.h:43 +msgid "2" +msgstr "2" + +#: ../gtk/main.ui.h:44 +msgid "1" +msgstr "1" + +#: ../gtk/main.ui.h:45 +msgid "Search" +msgstr "" + +#: ../gtk/main.ui.h:46 +#, fuzzy +msgid "Add contacts from directory" +msgstr "Informacion de codec" + +#: ../gtk/main.ui.h:47 +#, fuzzy +msgid "Add contact" +msgstr "(Ninguna informacion de contacto !)" + +#: ../gtk/main.ui.h:48 +msgid "Keypad" +msgstr "" + +#: ../gtk/main.ui.h:49 +#, fuzzy +msgid "Recent calls" +msgstr "Contactando " + +#: ../gtk/main.ui.h:50 +#, fuzzy +msgid "My current identity:" +msgstr "Identidad" + +#: ../gtk/main.ui.h:51 ../gtk/tunnel_config.ui.h:7 +#, fuzzy +msgid "Username" +msgstr "Manual de Usuario" + +#: ../gtk/main.ui.h:52 ../gtk/tunnel_config.ui.h:8 +#, fuzzy +msgid "Password" +msgstr "Tu Contraseña:" + +#: ../gtk/main.ui.h:53 +msgid "Internet connection:" +msgstr "" + +#: ../gtk/main.ui.h:54 +msgid "Automatically log me in" +msgstr "" + +#: ../gtk/main.ui.h:55 +#, fuzzy +msgid "Login information" +msgstr "Informacion de codec" + +#: ../gtk/main.ui.h:56 +#, fuzzy +msgid "Welcome !" +msgstr "Contactando " + +#: ../gtk/main.ui.h:57 +msgid "All users" +msgstr "" + +#: ../gtk/main.ui.h:58 +#, fuzzy +msgid "Online users" +msgstr "linea" + +#: ../gtk/main.ui.h:59 +msgid "ADSL" +msgstr "" + +#: ../gtk/main.ui.h:60 +msgid "Fiber Channel" +msgstr "" + +#: ../gtk/main.ui.h:61 +#, fuzzy +msgid "Default" +msgstr "Identidad" + +#: ../gtk/main.ui.h:62 +msgid "Delete" +msgstr "" + +#: ../gtk/about.ui.h:1 +#, fuzzy +msgid "About linphone" +msgstr "linphone" + +#: ../gtk/about.ui.h:2 +msgid "(C) Belledonne Communications,2010\n" +msgstr "" + +#: ../gtk/about.ui.h:4 +msgid "An internet video phone using the standard SIP (rfc3261) protocol." +msgstr "" + +#: ../gtk/about.ui.h:5 +msgid "" +"fr: Simon Morlat\n" +"en: Simon Morlat and Delphine Perreau\n" +"it: Alberto Zanoni \n" +"de: Jean-Jacques Sarton \n" +"sv: Daniel Nylander \n" +"es: Jesus Benitez \n" +"ja: YAMAGUCHI YOSHIYA \n" +"pt_BR: Rafael Caesar Lenzi \n" +"pl: Robert Nasiadek \n" +"cs: Petr Pisar \n" +"hu: anonymous\n" +msgstr "" + +#: ../gtk/contact.ui.h:2 +#, fuzzy +msgid "SIP Address" +msgstr "Direccion" + +#: ../gtk/contact.ui.h:3 +msgid "Show this contact presence status" +msgstr "" + +#: ../gtk/contact.ui.h:4 +msgid "Allow this contact to see my presence status" +msgstr "" + +#: ../gtk/contact.ui.h:5 +#, fuzzy +msgid "Contact information" +msgstr "Informacion de codec" + +#: ../gtk/log.ui.h:1 +#, fuzzy +msgid "Linphone debug window" +msgstr "Linphone esta terminando..." + +#: ../gtk/log.ui.h:2 +msgid "Scroll to end" +msgstr "" + +#: ../gtk/password.ui.h:1 +#, fuzzy +msgid "Linphone - Authentication required" +msgstr "Informacion de codec" + +#: ../gtk/password.ui.h:2 +msgid "Please enter the domain password" +msgstr "" + +#: ../gtk/password.ui.h:3 +msgid "UserID" +msgstr "" + +#: ../gtk/call_logs.ui.h:1 +msgid "Call history" +msgstr "" + +#: ../gtk/call_logs.ui.h:2 +msgid "Clear all" +msgstr "" + +#: ../gtk/call_logs.ui.h:3 +msgid "Call back" +msgstr "" + +#: ../gtk/sip_account.ui.h:1 +msgid "Linphone - Configure a SIP account" +msgstr "" + +#: ../gtk/sip_account.ui.h:2 +#, fuzzy +msgid "Your SIP identity:" +msgstr "Identidad" + +#: ../gtk/sip_account.ui.h:3 +msgid "Looks like sip:@" +msgstr "" + +#: ../gtk/sip_account.ui.h:4 +msgid "sip:" +msgstr "SIP:" + +#: ../gtk/sip_account.ui.h:5 +#, fuzzy +msgid "SIP Proxy address:" +msgstr "Direccion SIP" + +#: ../gtk/sip_account.ui.h:6 +msgid "Looks like sip:" +msgstr "" + +#: ../gtk/sip_account.ui.h:7 +msgid "Route (optional):" +msgstr "" + +#: ../gtk/sip_account.ui.h:8 +#, fuzzy +msgid "Registration duration (sec):" +msgstr "Se ha registrado con exito." + +#: ../gtk/sip_account.ui.h:9 +msgid "Register" +msgstr "" + +#: ../gtk/sip_account.ui.h:10 +#, fuzzy +msgid "Publish presence information" +msgstr "Informacion de codec" + +#: ../gtk/sip_account.ui.h:11 +msgid "Configure a SIP account" +msgstr "" + +#: ../gtk/parameters.ui.h:1 +msgid "default soundcard" +msgstr "" + +#: ../gtk/parameters.ui.h:2 +msgid "a sound card" +msgstr "" + +#: ../gtk/parameters.ui.h:3 +msgid "default camera" +msgstr "" + +#: ../gtk/parameters.ui.h:4 +msgid "CIF" +msgstr "" + +#: ../gtk/parameters.ui.h:5 +#, fuzzy +msgid "Audio codecs" +msgstr "Propiedades del codec de Audio" + +#: ../gtk/parameters.ui.h:6 +#, fuzzy +msgid "Video codecs" +msgstr "Propiedades del codec de Audio" + +#: ../gtk/parameters.ui.h:8 +msgid "SIP (UDP)" +msgstr "" + +#: ../gtk/parameters.ui.h:9 +msgid "SIP (TCP)" +msgstr "" + +#: ../gtk/parameters.ui.h:10 +msgid "SIP (TLS)" +msgstr "" + +#: ../gtk/parameters.ui.h:11 +msgid "Settings" +msgstr "" + +#: ../gtk/parameters.ui.h:12 +msgid "Set Maximum Transmission Unit:" +msgstr "" + +#: ../gtk/parameters.ui.h:13 +msgid "Send DTMFs as SIP info" +msgstr "" + +#: ../gtk/parameters.ui.h:14 +msgid "Use IPv6 instead of IPv4" +msgstr "" + +#: ../gtk/parameters.ui.h:15 +#, fuzzy +msgid "Transport" +msgstr "Contactando " + +#: ../gtk/parameters.ui.h:16 +msgid "Media encryption type" +msgstr "" + +#: ../gtk/parameters.ui.h:17 +msgid "Tunnel" +msgstr "" + +#: ../gtk/parameters.ui.h:18 +msgid "Video RTP/UDP:" +msgstr "" + +#: ../gtk/parameters.ui.h:19 +msgid "Audio RTP/UDP:" +msgstr "" + +#: ../gtk/parameters.ui.h:20 +msgid "DSCP fields" +msgstr "" + +#: ../gtk/parameters.ui.h:21 +msgid "Fixed" +msgstr "" + +#: ../gtk/parameters.ui.h:22 +msgid "Network protocol and ports" +msgstr "" + +#: ../gtk/parameters.ui.h:23 +msgid "Direct connection to the Internet" +msgstr "" + +#: ../gtk/parameters.ui.h:24 +msgid "Behind NAT / Firewall (specify gateway IP below)" +msgstr "" + +#: ../gtk/parameters.ui.h:25 +#, fuzzy +msgid "Public IP address:" +msgstr "Direccion SIP" + +#: ../gtk/parameters.ui.h:26 +msgid "Behind NAT / Firewall (use STUN to resolve)" +msgstr "" + +#: ../gtk/parameters.ui.h:27 +msgid "Behind NAT / Firewall (use ICE)" +msgstr "" + +#: ../gtk/parameters.ui.h:28 +#, fuzzy +msgid "Stun server:" +msgstr "Servidor de Redireccionamiento" + +#: ../gtk/parameters.ui.h:29 +#, fuzzy +msgid "NAT and Firewall" +msgstr "Contactando " + +#: ../gtk/parameters.ui.h:30 +#, fuzzy +msgid "Network settings" +msgstr "Red" + +#: ../gtk/parameters.ui.h:31 +#, fuzzy +msgid "Ring sound:" +msgstr "Fuente de grabacion:" + +#: ../gtk/parameters.ui.h:32 +msgid "ALSA special device (optional):" +msgstr "" + +#: ../gtk/parameters.ui.h:33 +#, fuzzy +msgid "Capture device:" +msgstr "Usar dispositivo de sonido:" + +#: ../gtk/parameters.ui.h:34 +#, fuzzy +msgid "Ring device:" +msgstr "Usar dispositivo de sonido:" + +#: ../gtk/parameters.ui.h:35 +#, fuzzy +msgid "Playback device:" +msgstr "Usar dispositivo de sonido:" + +#: ../gtk/parameters.ui.h:36 +msgid "Enable echo cancellation" +msgstr "" + +#: ../gtk/parameters.ui.h:37 +#, fuzzy +msgid "Audio" +msgstr "Contactando " + +#: ../gtk/parameters.ui.h:38 +#, fuzzy +msgid "Video input device:" +msgstr "Usar dispositivo de sonido:" + +#: ../gtk/parameters.ui.h:39 +msgid "Prefered video resolution:" +msgstr "" + +#: ../gtk/parameters.ui.h:40 +#, fuzzy +msgid "Video" +msgstr "Contactando " + +#: ../gtk/parameters.ui.h:41 +msgid "Multimedia settings" +msgstr "" + +#: ../gtk/parameters.ui.h:42 +msgid "This section defines your SIP address when not using a SIP account" +msgstr "" + +#: ../gtk/parameters.ui.h:43 +msgid "Your display name (eg: John Doe):" +msgstr "" + +#: ../gtk/parameters.ui.h:44 +#, fuzzy +msgid "Your username:" +msgstr "Manual de Usuario" + +#: ../gtk/parameters.ui.h:45 +#, fuzzy +msgid "Your resulting SIP address:" +msgstr "Tu direccion SIP:" + +#: ../gtk/parameters.ui.h:46 +#, fuzzy +msgid "Default identity" +msgstr "Identidad" + +#: ../gtk/parameters.ui.h:47 +msgid "Wizard" +msgstr "" + +#: ../gtk/parameters.ui.h:50 +msgid "Remove" +msgstr "Borrar" + +#: ../gtk/parameters.ui.h:51 +#, fuzzy +msgid "Proxy accounts" +msgstr "Contactando " + +#: ../gtk/parameters.ui.h:52 +msgid "Erase all passwords" +msgstr "" + +#: ../gtk/parameters.ui.h:53 +#, fuzzy +msgid "Privacy" +msgstr "Contactando " + +#: ../gtk/parameters.ui.h:54 +msgid "Manage SIP Accounts" +msgstr "" + +#: ../gtk/parameters.ui.h:55 ../gtk/tunnel_config.ui.h:4 +msgid "Enable" +msgstr "Activado" + +#: ../gtk/parameters.ui.h:56 ../gtk/tunnel_config.ui.h:5 +msgid "Disable" +msgstr "Desactivado" + +#: ../gtk/parameters.ui.h:57 +#, fuzzy +msgid "Codecs" +msgstr "Contactando " + +#: ../gtk/parameters.ui.h:58 +msgid "0 stands for \"unlimited\"" +msgstr "" + +#: ../gtk/parameters.ui.h:59 +msgid "Upload speed limit in Kbit/sec:" +msgstr "" + +#: ../gtk/parameters.ui.h:60 +msgid "Download speed limit in Kbit/sec:" +msgstr "" + +#: ../gtk/parameters.ui.h:61 +msgid "Enable adaptive rate control" +msgstr "" + +#: ../gtk/parameters.ui.h:62 +msgid "" +"Adaptive rate control is a technique to dynamically guess the available " +"bandwidth during a call." +msgstr "" + +#: ../gtk/parameters.ui.h:63 +msgid "Bandwidth control" +msgstr "" + +#: ../gtk/parameters.ui.h:64 +#, fuzzy +msgid "Codecs" +msgstr "Codecs" + +#: ../gtk/parameters.ui.h:65 +#, fuzzy +msgid "Language" +msgstr "Contactando " + +#: ../gtk/parameters.ui.h:66 +msgid "Show advanced settings" +msgstr "" + +#: ../gtk/parameters.ui.h:67 +#, fuzzy +msgid "Level" +msgstr "Contactando " + +#: ../gtk/parameters.ui.h:68 +#, fuzzy +msgid "User interface" +msgstr "Manual de Usuario" + +#: ../gtk/parameters.ui.h:69 +#, fuzzy +msgid "Done" +msgstr "Ninguno." + +#: ../gtk/buddylookup.ui.h:1 +#, fuzzy +msgid "Search contacts in directory" +msgstr "Informacion de codec" + +#: ../gtk/buddylookup.ui.h:2 +msgid "Add to my list" +msgstr "" + +#: ../gtk/buddylookup.ui.h:3 +#, fuzzy +msgid "Search somebody" +msgstr "Contactando " + +#: ../gtk/waiting.ui.h:1 +#, fuzzy +msgid "Linphone" +msgstr "linphone" + +#: ../gtk/waiting.ui.h:2 +msgid "Please wait" +msgstr "" + +#: ../gtk/dscp_settings.ui.h:1 +#, fuzzy +msgid "Dscp settings" +msgstr "Red" + +#: ../gtk/dscp_settings.ui.h:2 +msgid "SIP" +msgstr "SIP" + +#: ../gtk/dscp_settings.ui.h:3 +msgid "Audio RTP stream" +msgstr "" + +#: ../gtk/dscp_settings.ui.h:4 +msgid "Video RTP stream" +msgstr "" + +#: ../gtk/dscp_settings.ui.h:5 +msgid "Set DSCP values (in hexadecimal)" +msgstr "" + +#: ../gtk/call_statistics.ui.h:1 +msgid "Call statistics" +msgstr "" + +#: ../gtk/call_statistics.ui.h:2 +#, fuzzy +msgid "Audio codec" +msgstr "Propiedades del codec de Audio" + +#: ../gtk/call_statistics.ui.h:3 +#, fuzzy +msgid "Video codec" +msgstr "Propiedades del codec de Audio" + +#: ../gtk/call_statistics.ui.h:4 +msgid "Audio IP bandwidth usage" +msgstr "" + +#: ../gtk/call_statistics.ui.h:5 +msgid "Media connectivity" +msgstr "" + +#: ../gtk/call_statistics.ui.h:6 +msgid "Video IP bandwidth usage" +msgstr "" + +#: ../gtk/call_statistics.ui.h:7 +#, fuzzy +msgid "Call statistics and information" +msgstr "Informacion de codec" + +#: ../gtk/tunnel_config.ui.h:1 +msgid "Configure VoIP tunnel" +msgstr "" + +#: ../gtk/tunnel_config.ui.h:2 +msgid "Host" +msgstr "" + +#: ../gtk/tunnel_config.ui.h:3 +msgid "Port" +msgstr "" + +#: ../gtk/tunnel_config.ui.h:6 +msgid "Configure tunnel" +msgstr "" + +#: ../gtk/tunnel_config.ui.h:9 +msgid "Configure http proxy (optional)" +msgstr "" + +#: ../coreapi/linphonecore.c:232 +msgid "aborted" +msgstr "" + +#: ../coreapi/linphonecore.c:235 +msgid "completed" +msgstr "" + +#: ../coreapi/linphonecore.c:238 +msgid "missed" +msgstr "" + +#: ../coreapi/linphonecore.c:243 +#, c-format +msgid "" +"%s at %s\n" +"From: %s\n" +"To: %s\n" +"Status: %s\n" +"Duration: %i mn %i sec\n" +msgstr "" + +#: ../coreapi/linphonecore.c:244 +msgid "Outgoing call" +msgstr "" + +#: ../coreapi/linphonecore.c:1226 +#, fuzzy +msgid "Ready" +msgstr "Preparado." + +#: ../coreapi/linphonecore.c:2074 +msgid "Looking for telephone number destination..." +msgstr "" + +#: ../coreapi/linphonecore.c:2077 +msgid "Could not resolve this number." +msgstr "" + +#: ../coreapi/linphonecore.c:2121 +#, fuzzy +msgid "" +"Could not parse given sip address. A sip url usually looks like sip:" +"user@domain" +msgstr "" +"Direccion SIP mal escrita. Una direccion SIP es " + +#: ../coreapi/linphonecore.c:2312 +#, fuzzy +msgid "Contacting" +msgstr "Contactando " + +#: ../coreapi/linphonecore.c:2319 +#, fuzzy +msgid "Could not call" +msgstr "No se pudo encontrar el archivo pixmap: %s" + +#: ../coreapi/linphonecore.c:2429 +msgid "Sorry, we have reached the maximum number of simultaneous calls" +msgstr "" + +#: ../coreapi/linphonecore.c:2573 +#, fuzzy +msgid "is contacting you" +msgstr "le esta llamando." + +#: ../coreapi/linphonecore.c:2574 +msgid " and asked autoanswer." +msgstr "" + +#: ../coreapi/linphonecore.c:2574 +msgid "." +msgstr "" + +#: ../coreapi/linphonecore.c:2636 +msgid "Modifying call parameters..." +msgstr "" + +#: ../coreapi/linphonecore.c:2908 +msgid "Connected." +msgstr "Conectado." + +#: ../coreapi/linphonecore.c:2931 +#, fuzzy +msgid "Call aborted" +msgstr "Llamada cancelada." + +#: ../coreapi/linphonecore.c:3102 +msgid "Could not pause the call" +msgstr "" + +#: ../coreapi/linphonecore.c:3107 +msgid "Pausing the current call..." +msgstr "" + +#: ../coreapi/misc.c:148 +msgid "" +"Your computer appears to be using ALSA sound drivers.\n" +"This is the best choice. However the pcm oss emulation module\n" +"is missing and linphone needs it. Please execute\n" +"'modprobe snd-pcm-oss' as root to load it." +msgstr "" +"Tu ordenador parece estar usando los controladores de ALSA.\n" +"Esa es la mejor eleccion. Sin embargo el modulo de emulacion pcm de OSS\n" +"no se encuentra y linphone lo necesita. Por favor ejecute\n" +"'modprobe snd-pcm-oss' como root para cargarlo." + +#: ../coreapi/misc.c:151 +msgid "" +"Your computer appears to be using ALSA sound drivers.\n" +"This is the best choice. However the mixer oss emulation module\n" +"is missing and linphone needs it. Please execute\n" +" 'modprobe snd-mixer-oss' as root to load it." +msgstr "" +"Tu ordenador parece estar usando los controladores de ALSA.\n" +"Esa es la mejor eleccion. Sin embargo el modulo de emulacion mixer de OSS\n" +"no se encuentra y linphone lo necesita. Por favor ejecute\n" +" 'modprobe snd-mixer-oss' como root para cargarlo." + +#: ../coreapi/misc.c:496 +msgid "Stun lookup in progress..." +msgstr "" + +#: ../coreapi/misc.c:630 +msgid "ICE local candidates gathering in progress..." +msgstr "" + +#: ../coreapi/friend.c:33 +#, fuzzy +msgid "Online" +msgstr "linea" + +#: ../coreapi/friend.c:36 +msgid "Busy" +msgstr "" + +#: ../coreapi/friend.c:39 +msgid "Be right back" +msgstr "" + +#: ../coreapi/friend.c:42 +msgid "Away" +msgstr "Ausente" + +#: ../coreapi/friend.c:45 +#, fuzzy +msgid "On the phone" +msgstr "linphone" + +#: ../coreapi/friend.c:48 +msgid "Out to lunch" +msgstr "" + +#: ../coreapi/friend.c:51 +msgid "Do not disturb" +msgstr "No molestar" + +#: ../coreapi/friend.c:54 +#, fuzzy +msgid "Moved" +msgstr "Codecs" + +#: ../coreapi/friend.c:57 +msgid "Using another messaging service" +msgstr "" + +#: ../coreapi/friend.c:60 +#, fuzzy +msgid "Offline" +msgstr "linea" + +#: ../coreapi/friend.c:63 +msgid "Pending" +msgstr "" + +#: ../coreapi/friend.c:66 +msgid "Unknown-bug" +msgstr "" + +#: ../coreapi/proxy.c:204 +msgid "" +"The sip proxy address you entered is invalid, it must start with \"sip:\" " +"followed by a hostname." +msgstr "" + +#: ../coreapi/proxy.c:210 +msgid "" +"The sip identity you entered is invalid.\n" +"It should look like sip:username@proxydomain, such as sip:alice@example.net" +msgstr "" + +#: ../coreapi/proxy.c:1053 +#, fuzzy, c-format +msgid "Could not login as %s" +msgstr "No se pudo encontrar el archivo pixmap: %s" + +#: ../coreapi/callbacks.c:276 +#, fuzzy +msgid "Remote ringing." +msgstr "Registrando..." + +#: ../coreapi/callbacks.c:296 +#, fuzzy +msgid "Remote ringing..." +msgstr "Registrando..." + +#: ../coreapi/callbacks.c:307 +msgid "Early media." +msgstr "" + +#: ../coreapi/callbacks.c:352 +#, c-format +msgid "Call with %s is paused." +msgstr "" + +#: ../coreapi/callbacks.c:365 +#, c-format +msgid "Call answered by %s - on hold." +msgstr "" + +#: ../coreapi/callbacks.c:376 +#, fuzzy +msgid "Call resumed." +msgstr "Llamada cancelada." + +#: ../coreapi/callbacks.c:381 +#, fuzzy, c-format +msgid "Call answered by %s." +msgstr "" +"Llamar o\n" +"Responder" + +#: ../coreapi/callbacks.c:396 +msgid "Incompatible, check codecs..." +msgstr "" + +#: ../coreapi/callbacks.c:437 +msgid "We have been resumed." +msgstr "" + +#: ../coreapi/callbacks.c:446 +msgid "We are paused by other party." +msgstr "" + +#: ../coreapi/callbacks.c:452 +msgid "Call is updated by remote." +msgstr "" + +#: ../coreapi/callbacks.c:521 +#, fuzzy +msgid "Call terminated." +msgstr "Llamada cancelada." + +#: ../coreapi/callbacks.c:528 +msgid "User is busy." +msgstr "El usuario esta ocupado." + +#: ../coreapi/callbacks.c:529 +msgid "User is temporarily unavailable." +msgstr "El usuario le dice que volvera enseguida." + +#. char *retrymsg=_("%s. Retry after %i minute(s)."); +#: ../coreapi/callbacks.c:531 +msgid "User does not want to be disturbed." +msgstr "El usuario no quiere que lo molesten." + +#: ../coreapi/callbacks.c:532 +msgid "Call declined." +msgstr "Llamada cancelada." + +#: ../coreapi/callbacks.c:544 +msgid "No response." +msgstr "" + +#: ../coreapi/callbacks.c:548 +msgid "Protocol error." +msgstr "" + +#: ../coreapi/callbacks.c:564 +msgid "Redirected" +msgstr "" + +#: ../coreapi/callbacks.c:600 +msgid "Incompatible media parameters." +msgstr "" + +#: ../coreapi/callbacks.c:606 +#, fuzzy +msgid "Call failed." +msgstr "Llamada cancelada." + +#: ../coreapi/callbacks.c:701 +#, fuzzy, c-format +msgid "Registration on %s successful." +msgstr "Se ha registrado con exito." + +#: ../coreapi/callbacks.c:702 +#, fuzzy, c-format +msgid "Unregistration on %s done." +msgstr "Se ha registrado con exito." + +#: ../coreapi/callbacks.c:722 +msgid "no response timeout" +msgstr "" + +#: ../coreapi/callbacks.c:725 +#, fuzzy, c-format +msgid "Registration on %s failed: %s" +msgstr "Se ha registrado con exito." + +#: ../coreapi/linphonecall.c:129 +#, fuzzy, c-format +msgid "Authentication token is %s" +msgstr "Informacion de codec" + +#: ../coreapi/linphonecall.c:2124 +#, c-format +msgid "You have missed %i call." +msgid_plural "You have missed %i calls." +msgstr[0] "" +msgstr[1] "" + +#, fuzzy +#~ msgid "Confirmation" +#~ msgstr "Informacion" + +#, fuzzy +#~ msgid "Contacts" +#~ msgstr "Contactando " + +#, fuzzy +#~ msgid "Enable video" +#~ msgstr "Activado" + +#, fuzzy +#~ msgid "Authentication failure" +#~ msgstr "Informacion de codec" + +#, fuzzy +#~ msgid "Contact list" +#~ msgstr "Contactando " + +#, fuzzy +#~ msgid "Audio & video" +#~ msgstr "Propiedades del codec de Audio" + +#, fuzzy +#~ msgid "Audio only" +#~ msgstr "Propiedades del codec de Audio" + +#, fuzzy +#~ msgid "Duration:" +#~ msgstr "Informacion" + +#, fuzzy +#~ msgid "_Linphone" +#~ msgstr "linphone" + +#, fuzzy +#~ msgid "gtk-cancel" +#~ msgstr "Conectado." + +#, fuzzy +#~ msgid "gtk-ok" +#~ msgstr "Borrar" + +#, fuzzy +#~ msgid "gtk-close" +#~ msgstr "Conectado." + +#, fuzzy +#~ msgid "Ports" +#~ msgstr "Contactando " + +#, fuzzy +#~ msgid "_Modes" +#~ msgstr "Codecs" + +#, fuzzy +#~ msgid "" +#~ "Audio codecs\n" +#~ "Video codecs" +#~ msgstr "Propiedades del codec de Audio" + +#, fuzzy +#~ msgid "Request Cancelled." +#~ msgstr "Llamada cancelada." + +#~ msgid "User cannot be found at given address." +#~ msgstr "No se encontro ningun usuario en la direccion indicada." + +#~ msgid "Remote user cannot support any of proposed codecs." +#~ msgstr "El usuario remoto no soporta ninguno de los codecs propuestos." + +#~ msgid "Timeout." +#~ msgstr "Tiempo agotado." + +#~ msgid "Remote host was found but refused connection." +#~ msgstr "Se encontro host remoto pero rechazo la conexion." + +#~ msgid "" +#~ "User is not reachable at the moment but he invites you\n" +#~ "to contact him using the following alternate resource:" +#~ msgstr "" +#~ "Usuario no disponible en este momento pero le invita\n" +#~ "a contactarle usando el siguiente recurso alternativo:" + +#, fuzzy +#~ msgid "Gone" +#~ msgstr "Ninguno." + +#, fuzzy +#~ msgid "SIP address" +#~ msgstr "Direccion" + +#, fuzzy +#~ msgid "Display filters" +#~ msgstr "Nombre a mostrar:" + +#, fuzzy +#~ msgid "_Properties" +#~ msgstr "Propiedades de RTP" + +#, fuzzy +#~ msgid "Proxy in use" +#~ msgstr "Servidor Proxy" + +#~ msgid "Sound" +#~ msgstr "Sonido" + +#, fuzzy +#~ msgid "Proxy accounts" +#~ msgstr "Servidor Proxy" + +#~ msgid "Address book" +#~ msgstr "Agenda" + +#, fuzzy +#~ msgid "Shows the address book" +#~ msgstr "Muestra la Agenda" + +#~ msgid "Show more..." +#~ msgstr "Mostrar mas..." + +#~ msgid "Playback level:" +#~ msgstr "Nivel de reproduccion:" + +#~ msgid "Recording level:" +#~ msgstr "Nivel de Grabacion:" + +#, fuzzy +#~ msgid "Ring level:" +#~ msgstr "Nivel de Grabacion:" + +#~ msgid "Reachable" +#~ msgstr "Disponible" + +#~ msgid "Busy, I'll be back in " +#~ msgstr "Ocupado, estare de vuelta en " + +#~ msgid "The other party will be informed that you'll be back in X minutes" +#~ msgstr "" +#~ "Se le comunicara a la otra persona que estaras de vuelta en X minutos" + +#~ msgid "mn" +#~ msgstr "min" + +#~ msgid "Moved temporarily" +#~ msgstr "Vengo enseguida" + +#~ msgid "Alternative service" +#~ msgstr "Servicio alternativo" + +#~ msgid "URL:" +#~ msgstr "URL:" + +#~ msgid "Presence" +#~ msgstr "Estado" + +#~ msgid "Press digits to send DTMFs." +#~ msgstr "Pulsa los digitos para mandar DTMFs." + +#~ msgid "DTMF" +#~ msgstr "DTMF" + +#~ msgid "" +#~ "Linphone is a web-phone.\n" +#~ "It is compatible with SIP and RTP protocols." +#~ msgstr "" +#~ "Linphone es un telefono para Internet.\n" +#~ "Es compatible con los protocolos SIP y RTP." + +#, fuzzy +#~ msgid "Use IPv6 network (if available)" +#~ msgstr "El usuario le dice que volvera enseguida." + +#, fuzzy +#~ msgid "" +#~ "These options is only for users in a private network, behind a gateway. " +#~ "If you are not in this situation, then leave this empty." +#~ msgstr "" +#~ "Esta opcion es solo para usuarios en una red privada, detras de un " +#~ "cortafuegos. Siese no es tu caso, deja esto vacio." + +#, fuzzy +#~ msgid "NAT traversal options (experimental)" +#~ msgstr "Opciones para NAT transversal (experimental)" + +#, fuzzy +#~ msgid "Number of buffered miliseconds (jitter compensation):" +#~ msgstr "Numero de milisegundos en el buffer(compensacion jitter):" + +#~ msgid "RTP port used for audio:" +#~ msgstr "Puerto RTP usado para audio:" + +#~ msgid "micro" +#~ msgstr "microfono" + +#~ msgid "Recording source:" +#~ msgstr "Fuente de grabacion:" + +#~ msgid "Sound properties" +#~ msgstr "Propiedades de sonido" + +#~ msgid "Run sip user agent on port:" +#~ msgstr "Ejecutar SIP user agent en el puerto:" + +#~ msgid "It is strongly recommended to use port 5060." +#~ msgstr "Se recomienda encarecidamente usar el puerto 5060." + +#~ msgid "SIP port" +#~ msgstr "Puerto SIP" + +#~ msgid "@" +#~ msgstr "@" + +#~ msgid "Identity" +#~ msgstr "Identidad" + +#, fuzzy +#~ msgid "Add proxy/registrar" +#~ msgstr "Usar el registro SIP" + +#~ msgid "Remote services" +#~ msgstr "Servicios Remotos:" + +#~ msgid "List of audio codecs, in order of preference:" +#~ msgstr "Lista de codecs de audio, en orden de preferencia:" + +#~ msgid "" +#~ "Note: Codecs in red are not usable regarding to your connection type to " +#~ "the internet." +#~ msgstr "" +#~ "Nota: Los codecs en ROJO no son adecuados para tu conexion a internet." + +#, fuzzy +#~ msgid "No information availlable" +#~ msgstr "Informacion no disponible" + +#, fuzzy +#~ msgid "Codec information" +#~ msgstr "Informacion de codec" + +#~ msgid "Address Book" +#~ msgstr "Agenda" + +#~ msgid "Select" +#~ msgstr "Seleccionar" + +#~ msgid "" +#~ "User is not reachable at the moment but he invites you to contact him " +#~ "using the following alternate ressource:" +#~ msgstr "" +#~ "Usuario no disponible en este momento pero le invita a contactarle usando " +#~ "el siguiente recurso alternativo:" + +#~ msgid "None." +#~ msgstr "Ninguno." + +#, fuzzy +#~ msgid "Name:" +#~ msgstr "Nombre" + +#, fuzzy +#~ msgid "Bad sip address: a sip address looks like sip:user@domain" +#~ msgstr "" +#~ "Direccion SIP mal escrita. Una direccion SIP es " + +#~ msgid "Communication ended." +#~ msgstr "Comunicacion finalizada." + +#, fuzzy +#~ msgid "Firewall 's external ip address (in dot notations):" +#~ msgstr "Direccion IP del cortafuegos (en notacion con puntos):" + +#~ msgid "Index" +#~ msgstr "Indice" + +#, fuzzy +#~ msgid "Server address" +#~ msgstr "Direccion del Servidor:" + +#~ msgid "28k modem" +#~ msgstr "modem 28k" + +#~ msgid "56k modem" +#~ msgstr "modem 56k" + +#~ msgid "64k modem (numeris)" +#~ msgstr "modem 64k (numeris)" + +#~ msgid "ADSL or Cable modem" +#~ msgstr "ADSL o Cable" + +#~ msgid "Ethernet or equivalent" +#~ msgstr "Ethernet o equivalente" + +#~ msgid "Connection type:" +#~ msgstr "Tipo de conexion:" + +#, fuzzy +#~ msgid "" +#~ "Linphone could not open audio device %s. Check if your sound card is " +#~ "fully configured and working." +#~ msgstr "" +#~ "Linphone no pudo abrir el dispositivo de audio. Asegurese que su tarjeta " +#~ "de sonido esta completamente configurada y operativa." + +#~ msgid "Type here the sip address of the person you want to call." +#~ msgstr "Escribe aqui la direccion SIP de la persona que quieres llamar." + +#~ msgid "" +#~ "Release or\n" +#~ "Refuse" +#~ msgstr "" +#~ "Descolgar o\n" +#~ "Rechazar" + +#~ msgid "%s. Retry after %i minute(s)." +#~ msgstr "%s. Reintentar tras %i minutos." + +#, fuzzy +#~ msgid "Timeout..." +#~ msgstr "Tiempo agotado." + +#~ msgid "Toggle this if you want to be registered on a remote server." +#~ msgstr "Marcar opcion si desea registrarse en un servidor remoto." + +#~ msgid "Address of record:" +#~ msgstr "Nombre de registro:" + +#~ msgid "" +#~ "The password used for registration. On some servers it is not necessary" +#~ msgstr "" +#~ "La contraseña usada para registrarse. En algunos servidores no es " +#~ "necesaria" + +#~ msgid "Use this registrar server as outbound proxy." +#~ msgstr "Usar el servidor de registro como outbound proxy." + +#~ msgid "sip address:" +#~ msgstr "Direccion SIP:" + +#~ msgid "Modify" +#~ msgstr "Modificar" + +#~ msgid "" +#~ "You are currently using the i810_audio driver.\n" +#~ "This driver is buggy and so does not work with Linphone.\n" +#~ "We suggest that you replace it by its equivalent ALSA driver,\n" +#~ "either with packages from your distribution, or by downloading\n" +#~ "ALSA drivers at http://www.alsa-project.org." +#~ msgstr "" +#~ "Estas usando actualmente el controlador i810_audio.\n" +#~ "Ese controlador tiene errores y por tanto no funciona con Linphone.\n" +#~ "Le recomendamos que lo sustituya por su controlador equivalente de ALSA,\n" +#~ "ya sea mediante paquetes de su distribucion, o descargando\n" +#~ "controladores ALSA de http://www.alsa-project.org." + +#~ msgid "Unregistration successfull." +#~ msgstr "Cancelacion del registro completada." + +#~ msgid "C: 2001" +#~ msgstr "Abril 2001" + +#~ msgid "Select network interface to use:" +#~ msgstr "Selecciona la interfaz de red para usar:" + +#~ msgid "Network interface properties" +#~ msgstr "Propiedades de Interfaz de Red:" + +#~ msgid "RTP" +#~ msgstr "RTP" + +#~ msgid "Threads not supported by glib. Upgrade your glib.\n" +#~ msgstr "Threads no soportados por glib. Actualize su glib.\n" + +#~ msgid "Run linphone as a gnome-applet." +#~ msgstr "Lanzar linphone como un gnome-applet." + +#~ msgid "Run linphone as a daemon (for use without gnome)." +#~ msgstr "Ejecutar linphone como demonio (para uso sin gnome)." + +#~ msgid "" +#~ "Cannot find network previously used interface %s.\n" +#~ "If your computer is temporary connected to the internet, please connect " +#~ "and then run linphone.\n" +#~ "If you want to change your default network interface, go to the " +#~ "parameters 'box." +#~ msgstr "" +#~ "No se puede encontrar la interfaz de red usada previamente %s.\n" +#~ "Si tu ordenador esta conectado temporalmente a Internet, por favor " +#~ "conecta y entonces ejecuta linphone.\n" +#~ "Si quieres cambiar tu interfaz de red predeterminada, ve a la opcion " +#~ "Parametros." + +#, fuzzy +#~ msgid "" +#~ "Linphone cannot open the audio device.\n" +#~ "It may be caused by other programs using it.\n" +#~ "Do you want linphone to kill these programs (esd or artsd) ?" +#~ msgstr "" +#~ "Linphone no puede abrir el dispositivo de audio.\n" +#~ " Puede deberse a que otros programas lo esten usando.\n" +#~ "¿ Quiere que Linphone cierre esos programas (esd o artsd) ?" + +#~ msgid "Use it as a:" +#~ msgstr "Usarlo como un:" + +#~ msgid "Outbound proxy" +#~ msgstr "Outbound proxy" + +#~ msgid "" +#~ "Togle this button if the registrar must be used to proxy calls through a " +#~ "firewall." +#~ msgstr "" +#~ "Marcar esta opcion si el servidor de registro debe ser usado para " +#~ "llamadas a proxy a traves de un cortafuegos." + +#~ msgid "OSS" +#~ msgstr "OSS" + +#~ msgid "ALSA" +#~ msgstr "ALSA" + +#~ msgid "Automatically kill applications using soundcard when needed" +#~ msgstr "" +#~ "Cerrar aplicaciones que usen la tarjeta de sonido cuando se necesite." + +#~ msgid "" +#~ "Your computer is connected to several networks. Check in the global " +#~ "parameters if Linphone uses the one that you want." +#~ msgstr "" +#~ "Tu ordenador esta conectado a varias redes. Revisa en los Parametros " +#~ "globales si Linphone usa la que necesitas." + +#~ msgid "" +#~ "Linphone failed to open the sound device. See the README file included in " +#~ "the distribution for details." +#~ msgstr "" +#~ "Linphone fallo al abrir el dispositivo de sonido. Vea el archivo README " +#~ "incluido en la distribucion para mas detalles." + +#~ msgid "Interface not found." +#~ msgstr "Interfaz no encontrada." + +#~ msgid "Warning" +#~ msgstr "Atencion" + +#~ msgid "" +#~ "Linphone cannot open the sound device. It may be caused by other programs " +#~ "using it. Do you want linphone to kill these programs (esd or artsd) ?" +#~ msgstr "" +#~ "Linphone no puede abrir el dispositivo de sonido. Puede deberse a que " +#~ "otros programaslo esten usando. ¿ Quiere que Linphone cierre esos " +#~ "programas (esd o artsd) ?" + +#~ msgid "Linphone shutdowns..." +#~ msgstr "Linphone esta terminando..." + +#~ msgid "" +#~ "Please, wait a few seconds untils linphone unregisters your sip addess " +#~ "from registrar server..." +#~ msgstr "" +#~ "Por favor, espere unos segundos hasta que Linphone cancele el registro de " +#~ "su direccion SIP en el servidor de registros..." + +#~ msgid "Bad formuled sip address." +#~ msgstr "Direccion SIP mal escrita." + +#~ msgid "Couldn't create pixmap from file: %s" +#~ msgstr "No se pudo crear pixmap desde el archivo: %s" + +#~ msgid "" +#~ "Linphone did not detect any valid network interface. If you use a " +#~ "temporary internet connection, please connect and then run linphone again." +#~ msgstr "" +#~ "Linphone no detecto ninguna interfaz de red valida. Si usas una conexion " +#~ "temporal a Internet, por favor conecta y vuelve a ejecutar Linphone." + +#~ msgid "List of network interfaces on your system." +#~ msgstr "Lista de interfaces de red en tu sistema." + +#~ msgid "" +#~ "RTP est le mode de transport de la voix. Modifier ces paramètres pour " +#~ "tenter d'améliorer la qualité de la communication si celle-ci est " +#~ "dégradée." +#~ msgstr "" +#~ "RTP es el modelo de transporte de la voz. Modifica estos parametros para " +#~ "intentar mejorar la calidad de la comunicacion, si es que.es mala." + +#~ msgid "Use rtp port:" +#~ msgstr "Puerto RTP:" + +#~ msgid "" +#~ "Les codecs ou vocodeurs sont les algorithmes utilisés pour compresser la " +#~ "voix." +#~ msgstr "" +#~ "Los codecs o codificadores/decodificadores son los algoritmos usados para " +#~ "comprimir la voz." + +#~ msgid "" +#~ "Vous pouvez ajuster avec cet onglet des paramètre liés à votre carte son." +#~ msgstr "Puede modificar estos parametros a su gusto." diff --git a/po/fr.po b/po/fr.po index 44a3b46e9..5062fc074 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: 2011-12-05 12:41+0100\n" +"POT-Creation-Date: 2013-01-08 10:35+0100\n" "PO-Revision-Date: 2002-12-06 17:33+0100\n" "Last-Translator: Simon Morlat \n" "Language-Team: french \n" @@ -15,32 +15,54 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../gtk/calllogs.c:71 +#: ../gtk/calllogs.c:82 +#, fuzzy +msgid "Aborted" +msgstr "abandonné" + +#: ../gtk/calllogs.c:85 +#, fuzzy +msgid "Missed" +msgstr "manqué" + +#: ../gtk/calllogs.c:88 +#, fuzzy +msgid "Declined" +msgstr "Refuser" + +#: ../gtk/calllogs.c:94 #, c-format msgid "%i minute" msgid_plural "%i minutes" msgstr[0] "" msgstr[1] "" -#: ../gtk/calllogs.c:74 +#: ../gtk/calllogs.c:97 #, c-format msgid "%i second" msgid_plural "%i seconds" msgstr[0] "" msgstr[1] "" -#: ../gtk/calllogs.c:77 +#: ../gtk/calllogs.c:100 #, c-format msgid "" "%s\t%s\tQuality: %s\n" "%s\t%s %s\t" msgstr "" -#: ../gtk/calllogs.c:79 +#: ../gtk/calllogs.c:102 msgid "n/a" msgstr "inconnu" -#: ../gtk/conference.c:33 ../gtk/incall_view.c:183 +#: ../gtk/calllogs.c:105 +#, c-format +msgid "" +"%s\t%s\t\n" +"%s\t%s" +msgstr "" + +#: ../gtk/conference.c:33 ../gtk/main.ui.h:13 msgid "Conference" msgstr "Conférence" @@ -53,32 +75,31 @@ msgstr "Moi" msgid "Couldn't find pixmap file: %s" msgstr "Icone non trouvée: %s" -#: ../gtk/chat.c:27 -#, c-format -msgid "Chat with %s" -msgstr "Chat avec %s" - -#: ../gtk/main.c:83 +#: ../gtk/main.c:89 msgid "log to stdout some debug information while running." msgstr "affiche des informations de debogage" -#: ../gtk/main.c:90 +#: ../gtk/main.c:96 msgid "path to a file to write logs into." msgstr "" -#: ../gtk/main.c:97 +#: ../gtk/main.c:103 +msgid "Start linphone with video disabled." +msgstr "" + +#: ../gtk/main.c:110 msgid "Start only in the system tray, do not show the main interface." msgstr "Démarre iconifié, sans interface principale." -#: ../gtk/main.c:104 +#: ../gtk/main.c:117 msgid "address to call right now" msgstr "addresse à appeler maintenant" -#: ../gtk/main.c:111 +#: ../gtk/main.c:124 msgid "if set automatically answer incoming calls" msgstr "si positionné, répond automatiquement aux appels entrants" -#: ../gtk/main.c:118 +#: ../gtk/main.c:131 msgid "" "Specifiy a working directory (should be the base of the installation, eg: c:" "\\Program Files\\Linphone)" @@ -86,12 +107,12 @@ msgstr "" "Spécifie un répertoire de travail (qui devrait être le répertoire " "d'installation, par exemple c:\\Program Files\\Linphone)" -#: ../gtk/main.c:464 +#: ../gtk/main.c:498 #, c-format msgid "Call with %s" msgstr "Appel avec %s" -#: ../gtk/main.c:815 +#: ../gtk/main.c:871 #, c-format msgid "" "%s would like to add you to his contact list.\n" @@ -105,7 +126,7 @@ msgstr "" "Si vous répondez non, cette personne sera mise temporairement sur liste " "noire." -#: ../gtk/main.c:893 +#: ../gtk/main.c:948 #, c-format msgid "" "Please enter your password for username %s\n" @@ -114,54 +135,59 @@ msgstr "" "Entrez le mot de passe pour %s\n" " sur le domaine %s:" -#: ../gtk/main.c:993 +#: ../gtk/main.c:1051 msgid "Call error" msgstr "Erreur lors de l'appel" -#: ../gtk/main.c:996 ../coreapi/linphonecore.c:2406 +#: ../gtk/main.c:1054 ../coreapi/linphonecore.c:2949 msgid "Call ended" msgstr "Appel terminé." -#: ../gtk/main.c:999 ../coreapi/linphonecore.c:199 +#: ../gtk/main.c:1057 ../coreapi/linphonecore.c:244 msgid "Incoming call" msgstr "Appel entrant" -#: ../gtk/main.c:1001 ../gtk/incall_view.c:292 ../gtk/main.ui.h:20 +#: ../gtk/main.c:1059 ../gtk/incall_view.c:451 ../gtk/main.ui.h:6 msgid "Answer" msgstr "Répondre" -#: ../gtk/main.c:1003 ../gtk/main.ui.h:29 +#: ../gtk/main.c:1061 ../gtk/main.ui.h:7 msgid "Decline" msgstr "Refuser" -#: ../gtk/main.c:1009 +#: ../gtk/main.c:1067 msgid "Call paused" msgstr "Appel en pause" -#: ../gtk/main.c:1009 +#: ../gtk/main.c:1067 #, c-format msgid "by %s" msgstr "" -#: ../gtk/main.c:1165 +#: ../gtk/main.c:1116 +#, c-format +msgid "%s proposed to start video. Do you accept ?" +msgstr "" + +#: ../gtk/main.c:1278 msgid "Website link" msgstr "Lien site web" -#: ../gtk/main.c:1205 +#: ../gtk/main.c:1318 msgid "Linphone - a video internet phone" msgstr "Linphone - un téléphone video pour l'internet" -#: ../gtk/main.c:1295 +#: ../gtk/main.c:1410 #, c-format msgid "%s (Default)" msgstr "%s (par défaut)" -#: ../gtk/main.c:1566 ../coreapi/callbacks.c:700 +#: ../gtk/main.c:1714 ../coreapi/callbacks.c:774 #, c-format msgid "We are transferred to %s" msgstr "Transfert vers %s" -#: ../gtk/main.c:1576 +#: ../gtk/main.c:1724 msgid "" "No sound cards have been detected on this computer.\n" "You won't be able to send or receive audio calls." @@ -169,164 +195,176 @@ msgstr "" "Aucune carte son n'a été détectée sur cet ordinateur.\n" "Vous ne pourrez pas effectuer d'appels audio." -#: ../gtk/main.c:1663 +#: ../gtk/main.c:1833 msgid "A free SIP video-phone" msgstr "Un visiophone libre" -#: ../gtk/friendlist.c:203 +#: ../gtk/friendlist.c:335 msgid "Add to addressbook" msgstr "" -#: ../gtk/friendlist.c:258 ../gtk/propertybox.c:296 ../gtk/contact.ui.h:3 -msgid "Name" -msgstr "Nom" - -#: ../gtk/friendlist.c:271 +#: ../gtk/friendlist.c:509 msgid "Presence status" msgstr "Info de présence" -#: ../gtk/friendlist.c:308 +#: ../gtk/friendlist.c:526 ../gtk/propertybox.c:362 ../gtk/contact.ui.h:1 +msgid "Name" +msgstr "Nom" + +#: ../gtk/friendlist.c:538 +msgid "Call" +msgstr "Appeler" + +#: ../gtk/friendlist.c:543 +msgid "Chat" +msgstr "" + +#: ../gtk/friendlist.c:573 #, c-format msgid "Search in %s directory" msgstr "Rechercher dans l'annuaire de %s" -#: ../gtk/friendlist.c:568 +#: ../gtk/friendlist.c:730 msgid "Invalid sip contact !" msgstr "Contact sip invalide !" -#: ../gtk/friendlist.c:613 +#: ../gtk/friendlist.c:775 #, c-format msgid "Call %s" msgstr "Appeler %s" -#: ../gtk/friendlist.c:614 +#: ../gtk/friendlist.c:776 #, c-format msgid "Send text to %s" msgstr "Chatter avec %s" -#: ../gtk/friendlist.c:615 +#: ../gtk/friendlist.c:777 #, c-format msgid "Edit contact '%s'" msgstr "Editer le contact '%s'" -#: ../gtk/friendlist.c:616 +#: ../gtk/friendlist.c:778 #, c-format msgid "Delete contact '%s'" msgstr "Supprimer le contact '%s'" -#: ../gtk/friendlist.c:658 +#: ../gtk/friendlist.c:820 #, c-format msgid "Add new contact from %s directory" msgstr "Ajouter un contact depuis l'annuaire %s" -#: ../gtk/propertybox.c:302 +#: ../gtk/propertybox.c:368 msgid "Rate (Hz)" msgstr "Fréquence (Hz)" -#: ../gtk/propertybox.c:308 +#: ../gtk/propertybox.c:374 msgid "Status" msgstr "Etat" -#: ../gtk/propertybox.c:314 +#: ../gtk/propertybox.c:380 msgid "Min bitrate (kbit/s)" msgstr "Débit min. (kbit/s)" -#: ../gtk/propertybox.c:321 +#: ../gtk/propertybox.c:387 msgid "Parameters" msgstr "Paramètres" -#: ../gtk/propertybox.c:364 ../gtk/propertybox.c:507 +#: ../gtk/propertybox.c:430 ../gtk/propertybox.c:573 msgid "Enabled" msgstr "Activé" -#: ../gtk/propertybox.c:366 ../gtk/propertybox.c:507 +#: ../gtk/propertybox.c:432 ../gtk/propertybox.c:573 msgid "Disabled" msgstr "Désactivé" -#: ../gtk/propertybox.c:553 +#: ../gtk/propertybox.c:619 msgid "Account" msgstr "Compte" -#: ../gtk/propertybox.c:693 +#: ../gtk/propertybox.c:759 msgid "English" msgstr "" -#: ../gtk/propertybox.c:694 +#: ../gtk/propertybox.c:760 msgid "French" msgstr "Français" -#: ../gtk/propertybox.c:695 +#: ../gtk/propertybox.c:761 msgid "Swedish" msgstr "" -#: ../gtk/propertybox.c:696 +#: ../gtk/propertybox.c:762 msgid "Italian" msgstr "" -#: ../gtk/propertybox.c:697 +#: ../gtk/propertybox.c:763 msgid "Spanish" msgstr "" -#: ../gtk/propertybox.c:698 +#: ../gtk/propertybox.c:764 msgid "Brazilian Portugese" msgstr "" -#: ../gtk/propertybox.c:699 +#: ../gtk/propertybox.c:765 msgid "Polish" msgstr "" -#: ../gtk/propertybox.c:700 +#: ../gtk/propertybox.c:766 msgid "German" msgstr "" -#: ../gtk/propertybox.c:701 +#: ../gtk/propertybox.c:767 msgid "Russian" msgstr "" -#: ../gtk/propertybox.c:702 +#: ../gtk/propertybox.c:768 msgid "Japanese" msgstr "日本語" -#: ../gtk/propertybox.c:703 +#: ../gtk/propertybox.c:769 msgid "Dutch" msgstr "" -#: ../gtk/propertybox.c:704 +#: ../gtk/propertybox.c:770 msgid "Hungarian" msgstr "" -#: ../gtk/propertybox.c:705 +#: ../gtk/propertybox.c:771 msgid "Czech" msgstr "" -#: ../gtk/propertybox.c:706 +#: ../gtk/propertybox.c:772 msgid "Chinese" msgstr "简体中文" -#: ../gtk/propertybox.c:707 +#: ../gtk/propertybox.c:773 msgid "Traditional Chinese" msgstr "" -#: ../gtk/propertybox.c:708 +#: ../gtk/propertybox.c:774 msgid "Norwegian" msgstr "" -#: ../gtk/propertybox.c:765 +#: ../gtk/propertybox.c:775 +msgid "Hebrew" +msgstr "" + +#: ../gtk/propertybox.c:842 msgid "" "You need to restart linphone for the new language selection to take effect." msgstr "" "La nouvelle selection de langue prendra effet au prochain démarrage de " "linphone." -#: ../gtk/propertybox.c:835 +#: ../gtk/propertybox.c:912 msgid "None" msgstr "" -#: ../gtk/propertybox.c:839 +#: ../gtk/propertybox.c:916 msgid "SRTP" msgstr "" -#: ../gtk/propertybox.c:845 +#: ../gtk/propertybox.c:922 msgid "ZRTP" msgstr "" @@ -368,175 +406,275 @@ msgid_plural "Found %i contacts" msgstr[0] "%i contact trouvé." msgstr[1] "%i contacts trouvés." -#: ../gtk/setupwizard.c:25 +#: ../gtk/setupwizard.c:33 msgid "" "Welcome !\n" "This assistant will help you to use a SIP account for your calls." msgstr "" -#: ../gtk/setupwizard.c:34 -msgid "Create an account by choosing a username" +#: ../gtk/setupwizard.c:42 +msgid "Create an account on linphone.org" msgstr "" -#: ../gtk/setupwizard.c:35 -msgid "I have already an account and just want to use it" +#: ../gtk/setupwizard.c:43 +msgid "I have already a linphone.org account and I just want to use it" msgstr "" -#: ../gtk/setupwizard.c:53 -msgid "Please choose a username:" +#: ../gtk/setupwizard.c:44 +msgid "I have already a sip account and I just want to use it" msgstr "" -#: ../gtk/setupwizard.c:54 +#: ../gtk/setupwizard.c:84 +msgid "Enter your linphone.org username" +msgstr "" + +#: ../gtk/setupwizard.c:91 msgid "Username:" msgstr "Nom d'utilisateur:" -#: ../gtk/setupwizard.c:92 -#, c-format -msgid "Checking if '%s' is available..." +#: ../gtk/setupwizard.c:93 ../gtk/password.ui.h:4 +msgid "Password:" +msgstr "Mot de passe:" + +#: ../gtk/setupwizard.c:113 +msgid "Enter your account informations" msgstr "" -#: ../gtk/setupwizard.c:97 ../gtk/setupwizard.c:164 -msgid "Please wait..." +#: ../gtk/setupwizard.c:120 +#, fuzzy +msgid "Username*" +msgstr "Nom d'utilisateur" + +#: ../gtk/setupwizard.c:121 +#, fuzzy +msgid "Password*" +msgstr "Mot de passe" + +#: ../gtk/setupwizard.c:124 +msgid "Domain*" msgstr "" -#: ../gtk/setupwizard.c:101 -msgid "Sorry this username already exists. Please try a new one." +#: ../gtk/setupwizard.c:125 +msgid "Proxy" msgstr "" -#: ../gtk/setupwizard.c:103 ../gtk/setupwizard.c:168 -msgid "Ok !" +#: ../gtk/setupwizard.c:297 +msgid "(*) Required fields" msgstr "" -#: ../gtk/setupwizard.c:106 ../gtk/setupwizard.c:171 -msgid "Communication problem, please try again later." +#: ../gtk/setupwizard.c:298 +#, fuzzy +msgid "Username: (*)" +msgstr "Nom d'utilisateur:" + +#: ../gtk/setupwizard.c:300 +#, fuzzy +msgid "Password: (*)" +msgstr "Mot de passe:" + +#: ../gtk/setupwizard.c:302 +msgid "Email: (*)" msgstr "" -#: ../gtk/setupwizard.c:134 +#: ../gtk/setupwizard.c:304 +msgid "Confirm your password: (*)" +msgstr "" + +#: ../gtk/setupwizard.c:368 +msgid "" +"Error, account not validated, username already used or server unreachable.\n" +"Please go back and try again." +msgstr "" + +#: ../gtk/setupwizard.c:379 msgid "Thank you. Your account is now configured and ready for use." msgstr "" -#: ../gtk/setupwizard.c:228 +#: ../gtk/setupwizard.c:387 +msgid "" +"Please validate your account by clicking on the link we just sent you by " +"email.\n" +"Then come back here and press Next button." +msgstr "" + +#: ../gtk/setupwizard.c:554 msgid "Welcome to the account setup assistant" msgstr "" -#: ../gtk/setupwizard.c:232 +#: ../gtk/setupwizard.c:559 msgid "Account setup assistant" msgstr "" -#: ../gtk/setupwizard.c:236 -msgid "Choosing a username" -msgstr "Choix du nom d'utilisateur" - -#: ../gtk/setupwizard.c:240 -msgid "Verifying" -msgstr "" - -#: ../gtk/setupwizard.c:244 +#: ../gtk/setupwizard.c:565 #, fuzzy -msgid "Confirmation" -msgstr "Information sur le contact" +msgid "Configure your account (step 1/1)" +msgstr "Configuer un compte SIP" -#: ../gtk/setupwizard.c:249 -msgid "Creating your account" +#: ../gtk/setupwizard.c:570 +msgid "Enter your sip username (step 1/1)" msgstr "" -#: ../gtk/setupwizard.c:253 -msgid "Now ready !" +#: ../gtk/setupwizard.c:574 +msgid "Enter account information (step 1/2)" msgstr "" -#: ../gtk/incall_view.c:69 +#: ../gtk/setupwizard.c:583 +msgid "Validation (step 2/2)" +msgstr "" + +#: ../gtk/setupwizard.c:588 +msgid "Error" +msgstr "" + +#: ../gtk/setupwizard.c:592 +msgid "Terminating" +msgstr "" + +#: ../gtk/incall_view.c:69 ../gtk/incall_view.c:90 #, c-format msgid "Call #%i" msgstr "Appel #%i" -#: ../gtk/incall_view.c:127 +#: ../gtk/incall_view.c:150 #, c-format msgid "Transfer to call #%i with %s" msgstr "Transférer vers l'appel #%i avec %s" -#: ../gtk/incall_view.c:155 -msgid "Transfer" -msgstr "Transfert" +#: ../gtk/incall_view.c:209 ../gtk/incall_view.c:212 +#, fuzzy +msgid "Not used" +msgstr "Non trouvé" -#: ../gtk/incall_view.c:271 +#: ../gtk/incall_view.c:219 +msgid "ICE not activated" +msgstr "" + +#: ../gtk/incall_view.c:221 +#, fuzzy +msgid "ICE failed" +msgstr "L'appel a échoué." + +#: ../gtk/incall_view.c:223 +msgid "ICE in progress" +msgstr "" + +#: ../gtk/incall_view.c:225 +msgid "Going through one or more NATs" +msgstr "" + +#: ../gtk/incall_view.c:227 +#, fuzzy +msgid "Direct" +msgstr "Redirection" + +#: ../gtk/incall_view.c:229 +msgid "Through a relay server" +msgstr "" + +#: ../gtk/incall_view.c:238 ../gtk/incall_view.c:242 +#, c-format +msgid "" +"download: %f\n" +"upload: %f (kbit/s)" +msgstr "" + +#: ../gtk/incall_view.c:341 ../gtk/main.ui.h:12 +msgid "Hang up" +msgstr "" + +#: ../gtk/incall_view.c:430 msgid "Calling..." msgstr "Tentative d'appel..." -#: ../gtk/incall_view.c:274 ../gtk/incall_view.c:482 +#: ../gtk/incall_view.c:433 ../gtk/incall_view.c:646 msgid "00::00::00" msgstr "" -#: ../gtk/incall_view.c:285 +#: ../gtk/incall_view.c:444 msgid "Incoming call" msgstr "Appel entrant" -#: ../gtk/incall_view.c:322 +#: ../gtk/incall_view.c:481 msgid "good" msgstr "bon" -#: ../gtk/incall_view.c:324 +#: ../gtk/incall_view.c:483 msgid "average" msgstr "moyen" -#: ../gtk/incall_view.c:326 +#: ../gtk/incall_view.c:485 msgid "poor" msgstr "faible" -#: ../gtk/incall_view.c:328 +#: ../gtk/incall_view.c:487 msgid "very poor" msgstr "très faible" -#: ../gtk/incall_view.c:330 +#: ../gtk/incall_view.c:489 msgid "too bad" msgstr "nulle" -#: ../gtk/incall_view.c:331 ../gtk/incall_view.c:347 +#: ../gtk/incall_view.c:490 ../gtk/incall_view.c:506 msgid "unavailable" msgstr "indisponible" -#: ../gtk/incall_view.c:447 +#: ../gtk/incall_view.c:605 msgid "Secured by SRTP" msgstr "Sécurisé par SRTP" -#: ../gtk/incall_view.c:453 +#: ../gtk/incall_view.c:611 #, c-format msgid "Secured by ZRTP - [auth token: %s]" msgstr "Sécurisé par ZRTP- [jeton: %s]" -#: ../gtk/incall_view.c:459 +#: ../gtk/incall_view.c:617 msgid "Set unverified" msgstr "Marquer comme non vérifié" -#: ../gtk/incall_view.c:459 ../gtk/main.ui.h:49 +#: ../gtk/incall_view.c:617 ../gtk/main.ui.h:5 msgid "Set verified" msgstr "Marquer comme vérifié" -#: ../gtk/incall_view.c:480 +#: ../gtk/incall_view.c:641 msgid "In conference" msgstr "En conférence" -#: ../gtk/incall_view.c:480 +#: ../gtk/incall_view.c:641 msgid "In call" msgstr "Appel en cours" -#: ../gtk/incall_view.c:499 +#: ../gtk/incall_view.c:669 msgid "Paused call" msgstr "Appel en attente" -#: ../gtk/incall_view.c:511 +#: ../gtk/incall_view.c:682 #, c-format msgid "%02i::%02i::%02i" msgstr "" -#: ../gtk/incall_view.c:527 +#: ../gtk/incall_view.c:699 msgid "Call ended." msgstr "Appel terminé." -#: ../gtk/incall_view.c:584 +#: ../gtk/incall_view.c:731 +msgid "Transfer in progress" +msgstr "" + +#: ../gtk/incall_view.c:734 +#, fuzzy +msgid "Transfer done." +msgstr "Transfert" + +#: ../gtk/incall_view.c:737 +#, fuzzy +msgid "Transfer failed." +msgstr "Transfert" + +#: ../gtk/incall_view.c:781 msgid "Resume" msgstr "Reprendre" -#: ../gtk/incall_view.c:591 ../gtk/main.ui.h:45 +#: ../gtk/incall_view.c:788 ../gtk/main.ui.h:9 msgid "Pause" msgstr "Pause" @@ -546,222 +684,238 @@ msgid "Please enter login information for %s" msgstr "Entrez vos identifiants pour %s" #: ../gtk/main.ui.h:1 -msgid "#" -msgstr "" - -#: ../gtk/main.ui.h:2 -msgid "*" -msgstr "" - -#: ../gtk/main.ui.h:3 -msgid "0" -msgstr "" - -#: ../gtk/main.ui.h:4 -msgid "1" -msgstr "" - -#: ../gtk/main.ui.h:5 -msgid "2" -msgstr "" - -#: ../gtk/main.ui.h:6 -msgid "3" -msgstr "" - -#: ../gtk/main.ui.h:7 -msgid "4" -msgstr "" - -#: ../gtk/main.ui.h:8 -msgid "5" -msgstr "" - -#: ../gtk/main.ui.h:9 -msgid "6" -msgstr "" - -#: ../gtk/main.ui.h:10 -msgid "7" -msgstr "" - -#: ../gtk/main.ui.h:11 -msgid "8" -msgstr "" - -#: ../gtk/main.ui.h:12 -msgid "9" -msgstr "" - -#: ../gtk/main.ui.h:13 -msgid "Add contacts from directory" -msgstr "Ajouter un contact depuis l'annuaire" - -#: ../gtk/main.ui.h:14 msgid "Callee name" msgstr "Nom du correspondant" +#: ../gtk/main.ui.h:2 +msgid "Send" +msgstr "Envoyer" + +#: ../gtk/main.ui.h:3 +#, fuzzy +msgid "End conference" +msgstr "En conférence" + +#: ../gtk/main.ui.h:4 +msgid "label" +msgstr "" + +#: ../gtk/main.ui.h:8 +msgid "Video" +msgstr "" + +#: ../gtk/main.ui.h:10 +msgid "Mute" +msgstr "" + +#: ../gtk/main.ui.h:11 +msgid "Transfer" +msgstr "Transfert" + +#: ../gtk/main.ui.h:14 +msgid "In call" +msgstr "Appel en cours" + #: ../gtk/main.ui.h:15 -msgid "Welcome !" -msgstr "Bienvenue !" +msgid "Duration" +msgstr "Durée" #: ../gtk/main.ui.h:16 -msgid "A" -msgstr "" - -#: ../gtk/main.ui.h:17 -msgid "ADSL" -msgstr "" - -#: ../gtk/main.ui.h:18 -msgid "Add contact" -msgstr "Ajouter un contact." - -#: ../gtk/main.ui.h:19 -msgid "All users" -msgstr "Tous" - -#: ../gtk/main.ui.h:21 -msgid "Automatically log me in" -msgstr "Me connecter automatiquement" - -#: ../gtk/main.ui.h:22 -msgid "B" -msgstr "" - -#: ../gtk/main.ui.h:23 ../gtk/parameters.ui.h:21 -msgid "C" -msgstr "" - -#: ../gtk/main.ui.h:24 -msgid "Call" -msgstr "Appeler" - -#: ../gtk/main.ui.h:25 msgid "Call quality rating" msgstr "Qualité de l'appel" -#: ../gtk/main.ui.h:26 +#: ../gtk/main.ui.h:17 +msgid "_Options" +msgstr "" + +#: ../gtk/main.ui.h:18 +msgid "Always start video" +msgstr "" + +#: ../gtk/main.ui.h:19 +msgid "Enable self-view" +msgstr "Se voir" + +#: ../gtk/main.ui.h:20 +msgid "_Help" +msgstr "_Aide" + +#: ../gtk/main.ui.h:21 +msgid "Show debug window" +msgstr "Fenêtre de débogage" + +#: ../gtk/main.ui.h:22 +msgid "_Homepage" +msgstr "_Site web" + +#: ../gtk/main.ui.h:23 msgid "Check _Updates" msgstr "" -#: ../gtk/main.ui.h:27 -msgid "Contacts" -msgstr "Contacts" +#: ../gtk/main.ui.h:24 +msgid "Account assistant" +msgstr "" -#: ../gtk/main.ui.h:28 +#: ../gtk/main.ui.h:25 +msgid "SIP address or phone number:" +msgstr "Addresse SIP ou numéro" + +#: ../gtk/main.ui.h:26 +msgid "Initiate a new call" +msgstr "Démarrer un nouvel appel" + +#: ../gtk/main.ui.h:27 ../gtk/parameters.ui.h:48 +msgid "Add" +msgstr "Ajouter" + +#: ../gtk/main.ui.h:28 ../gtk/parameters.ui.h:49 +msgid "Edit" +msgstr "Editer" + +#: ../gtk/main.ui.h:29 msgid "D" msgstr "" #: ../gtk/main.ui.h:30 -msgid "Default" -msgstr "Par défaut" +msgid "#" +msgstr "" #: ../gtk/main.ui.h:31 -msgid "Duration" -msgstr "Durée" +msgid "0" +msgstr "" #: ../gtk/main.ui.h:32 -msgid "Enable self-view" -msgstr "Se voir" +msgid "*" +msgstr "" -#: ../gtk/main.ui.h:33 -msgid "Enable video" -msgstr "Activer la video" +#: ../gtk/main.ui.h:33 ../gtk/parameters.ui.h:7 +msgid "C" +msgstr "" #: ../gtk/main.ui.h:34 -msgid "Enter username, phone number, or full sip address" +msgid "9" msgstr "" -"Entrez un nom d'utilisateur, un numéro de téléphone, ou une addresse SIP" #: ../gtk/main.ui.h:35 -msgid "Fiber Channel" +msgid "8" msgstr "" #: ../gtk/main.ui.h:36 -msgid "In call" -msgstr "Appel en cours" +msgid "7" +msgstr "" #: ../gtk/main.ui.h:37 -msgid "Initiate a new call" -msgstr "Démarrer un nouvel appel" +msgid "B" +msgstr "" #: ../gtk/main.ui.h:38 -msgid "Internet connection:" +msgid "6" msgstr "" #: ../gtk/main.ui.h:39 -msgid "Keypad" -msgstr "Clavier" +msgid "5" +msgstr "" #: ../gtk/main.ui.h:40 -msgid "Login information" -msgstr "Information de login" +msgid "4" +msgstr "" #: ../gtk/main.ui.h:41 -msgid "Lookup:" -msgstr "Rechercher:" +msgid "A" +msgstr "" #: ../gtk/main.ui.h:42 -msgid "My current identity:" -msgstr "Mon identité sip:" +msgid "3" +msgstr "" #: ../gtk/main.ui.h:43 -msgid "Online users" -msgstr "En ligne" +msgid "2" +msgstr "" #: ../gtk/main.ui.h:44 -msgid "Password" -msgstr "Mot de passe" +msgid "1" +msgstr "" -#: ../gtk/main.ui.h:46 -msgid "Recent calls" -msgstr "Appels récents" - -#: ../gtk/main.ui.h:47 -msgid "SIP address or phone number:" -msgstr "Addresse SIP ou numéro" - -#: ../gtk/main.ui.h:48 +#: ../gtk/main.ui.h:45 msgid "Search" msgstr "Rechercher" -#: ../gtk/main.ui.h:50 -msgid "Show debug window" -msgstr "Fenêtre de débogage" +#: ../gtk/main.ui.h:46 +msgid "Add contacts from directory" +msgstr "Ajouter un contact depuis l'annuaire" -#: ../gtk/main.ui.h:51 +#: ../gtk/main.ui.h:47 +msgid "Add contact" +msgstr "Ajouter un contact." + +#: ../gtk/main.ui.h:48 +msgid "Keypad" +msgstr "Clavier" + +#: ../gtk/main.ui.h:49 +msgid "Recent calls" +msgstr "Appels récents" + +#: ../gtk/main.ui.h:50 +msgid "My current identity:" +msgstr "Mon identité sip:" + +#: ../gtk/main.ui.h:51 ../gtk/tunnel_config.ui.h:7 msgid "Username" msgstr "Nom d'utilisateur" -#: ../gtk/main.ui.h:52 -msgid "_Help" -msgstr "_Aide" +#: ../gtk/main.ui.h:52 ../gtk/tunnel_config.ui.h:8 +msgid "Password" +msgstr "Mot de passe" #: ../gtk/main.ui.h:53 -msgid "_Homepage" -msgstr "_Site web" - -#: ../gtk/main.ui.h:54 -msgid "_Options" +msgid "Internet connection:" msgstr "" +#: ../gtk/main.ui.h:54 +msgid "Automatically log me in" +msgstr "Me connecter automatiquement" + #: ../gtk/main.ui.h:55 -msgid "in" -msgstr "dans" +msgid "Login information" +msgstr "Information de login" #: ../gtk/main.ui.h:56 -msgid "label" +msgid "Welcome !" +msgstr "Bienvenue !" + +#: ../gtk/main.ui.h:57 +msgid "All users" +msgstr "Tous" + +#: ../gtk/main.ui.h:58 +msgid "Online users" +msgstr "En ligne" + +#: ../gtk/main.ui.h:59 +msgid "ADSL" +msgstr "" + +#: ../gtk/main.ui.h:60 +msgid "Fiber Channel" +msgstr "" + +#: ../gtk/main.ui.h:61 +msgid "Default" +msgstr "Par défaut" + +#: ../gtk/main.ui.h:62 +msgid "Delete" msgstr "" #: ../gtk/about.ui.h:1 -msgid "(C) Belledonne Communications,2010\n" -msgstr "" - -#: ../gtk/about.ui.h:3 msgid "About linphone" msgstr "A propos de linphone" +#: ../gtk/about.ui.h:2 +msgid "(C) Belledonne Communications,2010\n" +msgstr "" + #: ../gtk/about.ui.h:4 msgid "An internet video phone using the standard SIP (rfc3261) protocol." msgstr "Un visiophone pour l'internet, compatible SIP (rfc3261)" @@ -781,155 +935,334 @@ msgid "" "hu: anonymous\n" msgstr "" -#: ../gtk/contact.ui.h:1 -msgid "Contact information" -msgstr "Information sur le contact" - #: ../gtk/contact.ui.h:2 -msgid "Allow this contact to see my presence status" -msgstr "Autoriser ce contact à voir ma présence" - -#: ../gtk/contact.ui.h:4 msgid "SIP Address" msgstr "Adresse SIP" -#: ../gtk/contact.ui.h:5 +#: ../gtk/contact.ui.h:3 msgid "Show this contact presence status" msgstr "Voir l'état de présence de ce contact" +#: ../gtk/contact.ui.h:4 +msgid "Allow this contact to see my presence status" +msgstr "Autoriser ce contact à voir ma présence" + +#: ../gtk/contact.ui.h:5 +msgid "Contact information" +msgstr "Information sur le contact" + #: ../gtk/log.ui.h:1 msgid "Linphone debug window" msgstr "Fenêtre de débogage de linphone" +#: ../gtk/log.ui.h:2 +msgid "Scroll to end" +msgstr "" + #: ../gtk/password.ui.h:1 msgid "Linphone - Authentication required" msgstr "Linphone - Autentification demandée" #: ../gtk/password.ui.h:2 -msgid "Password:" -msgstr "Mot de passe:" - -#: ../gtk/password.ui.h:3 msgid "Please enter the domain password" msgstr "Entrez votre mot de passe pour le domaine" -#: ../gtk/password.ui.h:4 +#: ../gtk/password.ui.h:3 msgid "UserID" msgstr "" #: ../gtk/call_logs.ui.h:1 -msgid "Call back" -msgstr "Rappeler" - -#: ../gtk/call_logs.ui.h:2 msgid "Call history" msgstr "Historique des appels" -#: ../gtk/call_logs.ui.h:3 +#: ../gtk/call_logs.ui.h:2 msgid "Clear all" msgstr "Tout vider" -#: ../gtk/sip_account.ui.h:1 -msgid "Configure a SIP account" -msgstr "Configuer un compte SIP" +#: ../gtk/call_logs.ui.h:3 +msgid "Call back" +msgstr "Rappeler" -#: ../gtk/sip_account.ui.h:2 +#: ../gtk/sip_account.ui.h:1 msgid "Linphone - Configure a SIP account" msgstr "Linphone - Configurer un compte SIP" -#: ../gtk/sip_account.ui.h:3 -msgid "Looks like sip:" -msgstr "De la forme sip:" - -#: ../gtk/sip_account.ui.h:4 -msgid "Looks like sip:@" -msgstr "De la forme sip:@" - -#: ../gtk/sip_account.ui.h:5 -msgid "Publish presence information" -msgstr "Publier la présence" - -#: ../gtk/sip_account.ui.h:6 -msgid "Register" -msgstr "S'enregistrer" - -#: ../gtk/sip_account.ui.h:7 -msgid "Registration duration (sec):" -msgstr "Période d'enregistrement (secondes):" - -#: ../gtk/sip_account.ui.h:8 -msgid "Route (optional):" -msgstr "Route (optionnel):" - -#: ../gtk/sip_account.ui.h:9 -msgid "SIP Proxy address:" -msgstr "Addresse du proxy SIP:" - -#: ../gtk/sip_account.ui.h:10 +#: ../gtk/sip_account.ui.h:2 msgid "Your SIP identity:" msgstr "Votre identité SIP:" -#: ../gtk/sip_account.ui.h:11 +#: ../gtk/sip_account.ui.h:3 +msgid "Looks like sip:@" +msgstr "De la forme sip:@" + +#: ../gtk/sip_account.ui.h:4 msgid "sip:" msgstr "" -#: ../gtk/chatroom.ui.h:1 -msgid "Send" -msgstr "Envoyer" +#: ../gtk/sip_account.ui.h:5 +msgid "SIP Proxy address:" +msgstr "Addresse du proxy SIP:" + +#: ../gtk/sip_account.ui.h:6 +msgid "Looks like sip:" +msgstr "De la forme sip:" + +#: ../gtk/sip_account.ui.h:7 +msgid "Route (optional):" +msgstr "Route (optionnel):" + +#: ../gtk/sip_account.ui.h:8 +msgid "Registration duration (sec):" +msgstr "Période d'enregistrement (secondes):" + +#: ../gtk/sip_account.ui.h:9 +msgid "Register" +msgstr "S'enregistrer" + +#: ../gtk/sip_account.ui.h:10 +msgid "Publish presence information" +msgstr "Publier la présence" + +#: ../gtk/sip_account.ui.h:11 +msgid "Configure a SIP account" +msgstr "Configuer un compte SIP" #: ../gtk/parameters.ui.h:1 -msgid "0 stands for \"unlimited\"" -msgstr "Indiquez 0 pour ne pas mettre de limite" +msgid "default soundcard" +msgstr "Carte son par défaut" #: ../gtk/parameters.ui.h:2 -msgid "Audio" -msgstr "Son" +msgid "a sound card" +msgstr "une carte son" #: ../gtk/parameters.ui.h:3 -msgid "Bandwidth control" -msgstr "Gestion de la bande passante" +msgid "default camera" +msgstr "camera par défaut" #: ../gtk/parameters.ui.h:4 -msgid "Codecs" -msgstr "Codecs" +msgid "CIF" +msgstr "" #: ../gtk/parameters.ui.h:5 -msgid "Default identity" -msgstr "Identité par défaut" +msgid "Audio codecs" +msgstr "Codecs audio" #: ../gtk/parameters.ui.h:6 -msgid "Language" -msgstr "Langue" - -#: ../gtk/parameters.ui.h:7 -msgid "Level" -msgstr "Niveau" +msgid "Video codecs" +msgstr "Codecs video" #: ../gtk/parameters.ui.h:8 -msgid "NAT and Firewall" -msgstr "Paramètres liés au pare-feu" +msgid "SIP (UDP)" +msgstr "" #: ../gtk/parameters.ui.h:9 -msgid "Network protocol and ports" -msgstr "Protocoles réseaux et ports" +msgid "SIP (TCP)" +msgstr "" #: ../gtk/parameters.ui.h:10 -msgid "Privacy" -msgstr "Sécurité" +msgid "SIP (TLS)" +msgstr "" #: ../gtk/parameters.ui.h:11 -msgid "Proxy accounts" -msgstr "Comptes SIP via des proxy" +msgid "Settings" +msgstr "Réglages" #: ../gtk/parameters.ui.h:12 +msgid "Set Maximum Transmission Unit:" +msgstr "Spécifier la Maximum Transmission Unit" + +#: ../gtk/parameters.ui.h:13 +msgid "Send DTMFs as SIP info" +msgstr "Envoyer les digits en tant que SIP INFO" + +#: ../gtk/parameters.ui.h:14 +msgid "Use IPv6 instead of IPv4" +msgstr "Utiliser l'IPv6 au lieu d'IPv4" + +#: ../gtk/parameters.ui.h:15 msgid "Transport" msgstr "Transport" -#: ../gtk/parameters.ui.h:13 +#: ../gtk/parameters.ui.h:16 +msgid "Media encryption type" +msgstr "Type d'encryption media" + +#: ../gtk/parameters.ui.h:17 +msgid "Tunnel" +msgstr "" + +#: ../gtk/parameters.ui.h:18 +msgid "Video RTP/UDP:" +msgstr "" + +#: ../gtk/parameters.ui.h:19 +msgid "Audio RTP/UDP:" +msgstr "" + +#: ../gtk/parameters.ui.h:20 +msgid "DSCP fields" +msgstr "" + +#: ../gtk/parameters.ui.h:21 +msgid "Fixed" +msgstr "" + +#: ../gtk/parameters.ui.h:22 +msgid "Network protocol and ports" +msgstr "Protocoles réseaux et ports" + +#: ../gtk/parameters.ui.h:23 +msgid "Direct connection to the Internet" +msgstr "Connection directe à l'Internet" + +#: ../gtk/parameters.ui.h:24 +msgid "Behind NAT / Firewall (specify gateway IP below)" +msgstr "Derrière un pare-feu (spécifier la passerelle ci dessous)" + +#: ../gtk/parameters.ui.h:25 +msgid "Public IP address:" +msgstr "Addresse IP publique:" + +#: ../gtk/parameters.ui.h:26 +msgid "Behind NAT / Firewall (use STUN to resolve)" +msgstr "Derrière un pare-feu (utiliser STUN)" + +#: ../gtk/parameters.ui.h:27 +#, fuzzy +msgid "Behind NAT / Firewall (use ICE)" +msgstr "Derrière un pare-feu (utiliser STUN)" + +#: ../gtk/parameters.ui.h:28 +msgid "Stun server:" +msgstr "Serveur STUN:" + +#: ../gtk/parameters.ui.h:29 +msgid "NAT and Firewall" +msgstr "Paramètres liés au pare-feu" + +#: ../gtk/parameters.ui.h:30 +msgid "Network settings" +msgstr "Paramètres réseau" + +#: ../gtk/parameters.ui.h:31 +msgid "Ring sound:" +msgstr "Sonnerie:" + +#: ../gtk/parameters.ui.h:32 +msgid "ALSA special device (optional):" +msgstr "" + +#: ../gtk/parameters.ui.h:33 +msgid "Capture device:" +msgstr "Périphérique de capture:" + +#: ../gtk/parameters.ui.h:34 +msgid "Ring device:" +msgstr "Périphérique de sonnerie:" + +#: ../gtk/parameters.ui.h:35 +msgid "Playback device:" +msgstr "Périphérique d'écoute:" + +#: ../gtk/parameters.ui.h:36 +msgid "Enable echo cancellation" +msgstr "Activer l'annulation d'écho" + +#: ../gtk/parameters.ui.h:37 +msgid "Audio" +msgstr "Son" + +#: ../gtk/parameters.ui.h:38 +msgid "Video input device:" +msgstr "Périphérique d'entrée video" + +#: ../gtk/parameters.ui.h:39 +msgid "Prefered video resolution:" +msgstr "Résolution video préférée:" + +#: ../gtk/parameters.ui.h:40 msgid "Video" msgstr "Video" -#: ../gtk/parameters.ui.h:14 +#: ../gtk/parameters.ui.h:41 +msgid "Multimedia settings" +msgstr "Paramètres multimedia" + +#: ../gtk/parameters.ui.h:42 +msgid "This section defines your SIP address when not using a SIP account" +msgstr "" +"Cette rubrique permet de définir son addresse SIP lorsqu'on ne possède pas " +"de compte SIP" + +#: ../gtk/parameters.ui.h:43 +msgid "Your display name (eg: John Doe):" +msgstr "Votre nom d'affichage (ex: John Doe)" + +#: ../gtk/parameters.ui.h:44 +msgid "Your username:" +msgstr "Votre nom d'utilisateur:" + +#: ../gtk/parameters.ui.h:45 +msgid "Your resulting SIP address:" +msgstr "Votre addresse SIP:" + +#: ../gtk/parameters.ui.h:46 +msgid "Default identity" +msgstr "Identité par défaut" + +#: ../gtk/parameters.ui.h:47 +msgid "Wizard" +msgstr "" + +#: ../gtk/parameters.ui.h:50 +msgid "Remove" +msgstr "Enlever" + +#: ../gtk/parameters.ui.h:51 +msgid "Proxy accounts" +msgstr "Comptes SIP via des proxy" + +#: ../gtk/parameters.ui.h:52 +msgid "Erase all passwords" +msgstr "Effacer tous les mots de passe" + +#: ../gtk/parameters.ui.h:53 +msgid "Privacy" +msgstr "Sécurité" + +#: ../gtk/parameters.ui.h:54 +msgid "Manage SIP Accounts" +msgstr "Gérer mes comptes SIP" + +#: ../gtk/parameters.ui.h:55 ../gtk/tunnel_config.ui.h:4 +msgid "Enable" +msgstr "Activer" + +#: ../gtk/parameters.ui.h:56 ../gtk/tunnel_config.ui.h:5 +msgid "Disable" +msgstr "Désactiver" + +#: ../gtk/parameters.ui.h:57 +msgid "Codecs" +msgstr "Codecs" + +#: ../gtk/parameters.ui.h:58 +msgid "0 stands for \"unlimited\"" +msgstr "Indiquez 0 pour ne pas mettre de limite" + +#: ../gtk/parameters.ui.h:59 +msgid "Upload speed limit in Kbit/sec:" +msgstr "Limite de débit montant en kbits/sec:" + +#: ../gtk/parameters.ui.h:60 +msgid "Download speed limit in Kbit/sec:" +msgstr "Limite de débit descendant en kbits/sec:" + +#: ../gtk/parameters.ui.h:61 +msgid "Enable adaptive rate control" +msgstr "Activer le control de débit adaptatif." + +#: ../gtk/parameters.ui.h:62 msgid "" "Adaptive rate control is a technique to dynamically guess the available " "bandwidth during a call." @@ -938,221 +1271,45 @@ msgstr "" "de l'audio et de la video en fonction de la bande passante disponible, " "durant l'appel." -#: ../gtk/parameters.ui.h:15 -msgid "ALSA special device (optional):" -msgstr "" +#: ../gtk/parameters.ui.h:63 +msgid "Bandwidth control" +msgstr "Gestion de la bande passante" -#: ../gtk/parameters.ui.h:16 -msgid "Add" -msgstr "Ajouter" - -#: ../gtk/parameters.ui.h:17 -msgid "Audio RTP/UDP:" -msgstr "" - -#: ../gtk/parameters.ui.h:18 -msgid "Audio codecs" -msgstr "Codecs audio" - -#: ../gtk/parameters.ui.h:19 -msgid "Behind NAT / Firewall (specify gateway IP below)" -msgstr "Derrière un pare-feu (spécifier la passerelle ci dessous)" - -#: ../gtk/parameters.ui.h:20 -msgid "Behind NAT / Firewall (use STUN to resolve)" -msgstr "Derrière un pare-feu (utiliser STUN)" - -#: ../gtk/parameters.ui.h:22 -msgid "CIF" -msgstr "" - -#: ../gtk/parameters.ui.h:23 -msgid "Capture device:" -msgstr "Périphérique de capture:" - -#: ../gtk/parameters.ui.h:24 +#: ../gtk/parameters.ui.h:64 msgid "Codecs" msgstr "" -#: ../gtk/parameters.ui.h:25 -msgid "Direct connection to the Internet" -msgstr "Connection directe à l'Internet" +#: ../gtk/parameters.ui.h:65 +msgid "Language" +msgstr "Langue" -#: ../gtk/parameters.ui.h:26 -msgid "Disable" -msgstr "Désactiver" - -#: ../gtk/parameters.ui.h:27 -msgid "Done" -msgstr "Fermer" - -#: ../gtk/parameters.ui.h:28 -msgid "Download speed limit in Kbit/sec:" -msgstr "Limite de débit descendant en kbits/sec:" - -#: ../gtk/parameters.ui.h:29 -msgid "Edit" -msgstr "Editer" - -#: ../gtk/parameters.ui.h:30 -msgid "Enable" -msgstr "Activer" - -#: ../gtk/parameters.ui.h:31 -msgid "Enable adaptive rate control" -msgstr "Activer le control de débit adaptatif." - -#: ../gtk/parameters.ui.h:32 -msgid "Enable echo cancellation" -msgstr "Activer l'annulation d'écho" - -#: ../gtk/parameters.ui.h:33 -msgid "Erase all passwords" -msgstr "Effacer tous les mots de passe" - -#: ../gtk/parameters.ui.h:34 -msgid "Manage SIP Accounts" -msgstr "Gérer mes comptes SIP" - -#: ../gtk/parameters.ui.h:35 -msgid "Media encryption type" -msgstr "Type d'encryption media" - -#: ../gtk/parameters.ui.h:36 -msgid "Multimedia settings" -msgstr "Paramètres multimedia" - -#: ../gtk/parameters.ui.h:37 -msgid "Network settings" -msgstr "Paramètres réseau" - -#: ../gtk/parameters.ui.h:38 -msgid "Playback device:" -msgstr "Périphérique d'écoute:" - -#: ../gtk/parameters.ui.h:39 -msgid "Prefered video resolution:" -msgstr "Résolution video préférée:" - -#: ../gtk/parameters.ui.h:40 -msgid "Public IP address:" -msgstr "Addresse IP publique:" - -#: ../gtk/parameters.ui.h:41 -msgid "" -"Register to FONICS\n" -"virtual network !" -msgstr "" - -#: ../gtk/parameters.ui.h:43 -msgid "Remove" -msgstr "Enlever" - -#: ../gtk/parameters.ui.h:44 -msgid "Ring device:" -msgstr "Périphérique de sonnerie:" - -#: ../gtk/parameters.ui.h:45 -msgid "Ring sound:" -msgstr "Sonnerie:" - -#: ../gtk/parameters.ui.h:46 -msgid "SIP (TCP)" -msgstr "" - -#: ../gtk/parameters.ui.h:47 -msgid "SIP (TLS)" -msgstr "" - -#: ../gtk/parameters.ui.h:48 -msgid "SIP (UDP)" -msgstr "" - -#: ../gtk/parameters.ui.h:49 -msgid "Send DTMFs as SIP info" -msgstr "Envoyer les digits en tant que SIP INFO" - -#: ../gtk/parameters.ui.h:50 -msgid "Set Maximum Transmission Unit:" -msgstr "Spécifier la Maximum Transmission Unit" - -#: ../gtk/parameters.ui.h:51 -msgid "Settings" -msgstr "Réglages" - -#: ../gtk/parameters.ui.h:52 +#: ../gtk/parameters.ui.h:66 msgid "Show advanced settings" msgstr "Montrer les réglages avancés" -#: ../gtk/parameters.ui.h:53 -msgid "Stun server:" -msgstr "Serveur STUN:" +#: ../gtk/parameters.ui.h:67 +msgid "Level" +msgstr "Niveau" -#: ../gtk/parameters.ui.h:54 -msgid "This section defines your SIP address when not using a SIP account" -msgstr "" -"Cette rubrique permet de définir son addresse SIP lorsqu'on ne possède pas " -"de compte SIP" - -#: ../gtk/parameters.ui.h:55 -msgid "Upload speed limit in Kbit/sec:" -msgstr "Limite de débit montant en kbits/sec:" - -#: ../gtk/parameters.ui.h:56 -msgid "Use IPv6 instead of IPv4" -msgstr "Utiliser l'IPv6 au lieu d'IPv4" - -#: ../gtk/parameters.ui.h:57 +#: ../gtk/parameters.ui.h:68 msgid "User interface" msgstr "Interface utilisateur" -#: ../gtk/parameters.ui.h:58 -msgid "Video RTP/UDP:" -msgstr "" - -#: ../gtk/parameters.ui.h:59 -msgid "Video codecs" -msgstr "Codecs video" - -#: ../gtk/parameters.ui.h:60 -msgid "Video input device:" -msgstr "Périphérique d'entrée video" - -#: ../gtk/parameters.ui.h:61 -msgid "Your display name (eg: John Doe):" -msgstr "Votre nom d'affichage (ex: John Doe)" - -#: ../gtk/parameters.ui.h:62 -msgid "Your resulting SIP address:" -msgstr "Votre addresse SIP:" - -#: ../gtk/parameters.ui.h:63 -msgid "Your username:" -msgstr "Votre nom d'utilisateur:" - -#: ../gtk/parameters.ui.h:64 -msgid "a sound card" -msgstr "une carte son" - -#: ../gtk/parameters.ui.h:65 -msgid "default camera" -msgstr "camera par défaut" - -#: ../gtk/parameters.ui.h:66 -msgid "default soundcard" -msgstr "Carte son par défaut" +#: ../gtk/parameters.ui.h:69 +msgid "Done" +msgstr "Fermer" #: ../gtk/buddylookup.ui.h:1 -msgid "Search somebody" -msgstr "Rechercher une personne" +msgid "Search contacts in directory" +msgstr "Rechercher dans l'annuaire" #: ../gtk/buddylookup.ui.h:2 msgid "Add to my list" msgstr "Ajouter à ma liste" #: ../gtk/buddylookup.ui.h:3 -msgid "Search contacts in directory" -msgstr "Rechercher dans l'annuaire" +msgid "Search somebody" +msgstr "Rechercher une personne" #: ../gtk/waiting.ui.h:1 msgid "Linphone" @@ -1162,19 +1319,93 @@ msgstr "Linphone" msgid "Please wait" msgstr "En attente" -#: ../coreapi/linphonecore.c:187 +#: ../gtk/dscp_settings.ui.h:1 +#, fuzzy +msgid "Dscp settings" +msgstr "Réglages" + +#: ../gtk/dscp_settings.ui.h:2 +msgid "SIP" +msgstr "" + +#: ../gtk/dscp_settings.ui.h:3 +msgid "Audio RTP stream" +msgstr "" + +#: ../gtk/dscp_settings.ui.h:4 +msgid "Video RTP stream" +msgstr "" + +#: ../gtk/dscp_settings.ui.h:5 +msgid "Set DSCP values (in hexadecimal)" +msgstr "" + +#: ../gtk/call_statistics.ui.h:1 +msgid "Call statistics" +msgstr "" + +#: ../gtk/call_statistics.ui.h:2 +#, fuzzy +msgid "Audio codec" +msgstr "Codecs audio" + +#: ../gtk/call_statistics.ui.h:3 +#, fuzzy +msgid "Video codec" +msgstr "Codecs video" + +#: ../gtk/call_statistics.ui.h:4 +msgid "Audio IP bandwidth usage" +msgstr "" + +#: ../gtk/call_statistics.ui.h:5 +#, fuzzy +msgid "Media connectivity" +msgstr "Type d'encryption media" + +#: ../gtk/call_statistics.ui.h:6 +msgid "Video IP bandwidth usage" +msgstr "" + +#: ../gtk/call_statistics.ui.h:7 +#, fuzzy +msgid "Call statistics and information" +msgstr "Information sur le contact" + +#: ../gtk/tunnel_config.ui.h:1 +#, fuzzy +msgid "Configure VoIP tunnel" +msgstr "Configuer un compte SIP" + +#: ../gtk/tunnel_config.ui.h:2 +msgid "Host" +msgstr "" + +#: ../gtk/tunnel_config.ui.h:3 +msgid "Port" +msgstr "" + +#: ../gtk/tunnel_config.ui.h:6 +msgid "Configure tunnel" +msgstr "" + +#: ../gtk/tunnel_config.ui.h:9 +msgid "Configure http proxy (optional)" +msgstr "" + +#: ../coreapi/linphonecore.c:232 msgid "aborted" msgstr "abandonné" -#: ../coreapi/linphonecore.c:190 +#: ../coreapi/linphonecore.c:235 msgid "completed" msgstr "terminé" -#: ../coreapi/linphonecore.c:193 +#: ../coreapi/linphonecore.c:238 msgid "missed" msgstr "manqué" -#: ../coreapi/linphonecore.c:198 +#: ../coreapi/linphonecore.c:243 #, c-format msgid "" "%s at %s\n" @@ -1189,62 +1420,74 @@ msgstr "" "Etat: %s\n" "Durée: %i mn %i sec\n" -#: ../coreapi/linphonecore.c:199 +#: ../coreapi/linphonecore.c:244 msgid "Outgoing call" msgstr "Appel sortant" -#: ../coreapi/linphonecore.c:1088 +#: ../coreapi/linphonecore.c:1226 msgid "Ready" msgstr "Prêt." -#: ../coreapi/linphonecore.c:1831 +#: ../coreapi/linphonecore.c:2074 msgid "Looking for telephone number destination..." msgstr "Recherche de la destination du numéro de téléphone..." -#: ../coreapi/linphonecore.c:1834 +#: ../coreapi/linphonecore.c:2077 msgid "Could not resolve this number." msgstr "La destination n'a pu être trouvée." -#: ../coreapi/linphonecore.c:1878 +#: ../coreapi/linphonecore.c:2121 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:2025 +#: ../coreapi/linphonecore.c:2312 msgid "Contacting" msgstr "Appel de" -#: ../coreapi/linphonecore.c:2032 +#: ../coreapi/linphonecore.c:2319 msgid "Could not call" msgstr "Echec de l'appel" -#: ../coreapi/linphonecore.c:2140 +#: ../coreapi/linphonecore.c:2429 msgid "Sorry, we have reached the maximum number of simultaneous calls" msgstr "Désolé, le nombre maximum d'appels simultanés est atteint." -#: ../coreapi/linphonecore.c:2270 +#: ../coreapi/linphonecore.c:2573 +msgid "is contacting you" +msgstr "vous appelle" + +#: ../coreapi/linphonecore.c:2574 +msgid " and asked autoanswer." +msgstr "et sollicite un décrochage automatique." + +#: ../coreapi/linphonecore.c:2574 +msgid "." +msgstr "" + +#: ../coreapi/linphonecore.c:2636 msgid "Modifying call parameters..." msgstr "Modifications des paramètres d'appels..." -#: ../coreapi/linphonecore.c:2366 +#: ../coreapi/linphonecore.c:2908 msgid "Connected." msgstr "En ligne." -#: ../coreapi/linphonecore.c:2389 +#: ../coreapi/linphonecore.c:2931 msgid "Call aborted" msgstr "Appel abandonné" -#: ../coreapi/linphonecore.c:2530 +#: ../coreapi/linphonecore.c:3102 msgid "Could not pause the call" msgstr "La mise en attente a échoué" -#: ../coreapi/linphonecore.c:2535 +#: ../coreapi/linphonecore.c:3107 msgid "Pausing the current call..." msgstr "Mise en attente de l'appel..." -#: ../coreapi/misc.c:147 +#: ../coreapi/misc.c:148 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the pcm oss emulation module\n" @@ -1257,7 +1500,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:150 +#: ../coreapi/misc.c:151 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the mixer oss emulation module\n" @@ -1269,10 +1512,14 @@ 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:478 +#: ../coreapi/misc.c:496 msgid "Stun lookup in progress..." msgstr "Découverte STUN en cours" +#: ../coreapi/misc.c:630 +msgid "ICE local candidates gathering in progress..." +msgstr "" + #: ../coreapi/friend.c:33 msgid "Online" msgstr "Disponible" @@ -1321,7 +1568,7 @@ msgstr "En attente" msgid "Unknown-bug" msgstr "Bug inconnu" -#: ../coreapi/proxy.c:192 +#: ../coreapi/proxy.c:204 msgid "" "The sip proxy address you entered is invalid, it must start with \"sip:\" " "followed by a hostname." @@ -1329,7 +1576,7 @@ msgstr "" "L'addresse SIP du proxy est invalide. Elle doit commencer par \"sip:\" " "suivie par un nom de domaine." -#: ../coreapi/proxy.c:198 +#: ../coreapi/proxy.c:210 msgid "" "The sip identity you entered is invalid.\n" "It should look like sip:username@proxydomain, such as sip:alice@example.net" @@ -1338,146 +1585,167 @@ msgstr "" "Elle doit être de la forme sip:username@domain, comme par example sip:" "alice@example.net" -#: ../coreapi/proxy.c:690 +#: ../coreapi/proxy.c:1053 #, c-format msgid "Could not login as %s" msgstr "Echec de la connexion en tant que %s" -#: ../coreapi/callbacks.c:206 -msgid "is contacting you" -msgstr "vous appelle" - -#: ../coreapi/callbacks.c:207 -msgid " and asked autoanswer." -msgstr "et sollicite un décrochage automatique." - -#: ../coreapi/callbacks.c:207 -msgid "." -msgstr "" - -#: ../coreapi/callbacks.c:266 +#: ../coreapi/callbacks.c:276 msgid "Remote ringing." msgstr "Sonnerie distante." -#: ../coreapi/callbacks.c:282 +#: ../coreapi/callbacks.c:296 msgid "Remote ringing..." msgstr "Sonnerie distante..." -#: ../coreapi/callbacks.c:293 +#: ../coreapi/callbacks.c:307 msgid "Early media." msgstr "Prise d'appel anticipée" -#: ../coreapi/callbacks.c:331 +#: ../coreapi/callbacks.c:352 #, c-format msgid "Call with %s is paused." msgstr "%s est maintenant en attente." -#: ../coreapi/callbacks.c:342 +#: ../coreapi/callbacks.c:365 #, c-format msgid "Call answered by %s - on hold." msgstr "Appel répondu par %s - en attente" -#: ../coreapi/callbacks.c:357 +#: ../coreapi/callbacks.c:376 msgid "Call resumed." msgstr "Appel repris." -#: ../coreapi/callbacks.c:362 +#: ../coreapi/callbacks.c:381 #, c-format msgid "Call answered by %s." msgstr "Appel répondu par %s." -#: ../coreapi/callbacks.c:432 -msgid "We are being paused..." -msgstr "Mise en attente..." +#: ../coreapi/callbacks.c:396 +msgid "Incompatible, check codecs..." +msgstr "" -#: ../coreapi/callbacks.c:436 -msgid "We have been resumed..." +#: ../coreapi/callbacks.c:437 +#, fuzzy +msgid "We have been resumed." msgstr "Reprise..." -#: ../coreapi/callbacks.c:441 -msgid "Call has been updated by remote..." +#: ../coreapi/callbacks.c:446 +msgid "We are paused by other party." +msgstr "" + +#: ../coreapi/callbacks.c:452 +#, fuzzy +msgid "Call is updated by remote." msgstr "L'appel a été repris par le correspondant." -#: ../coreapi/callbacks.c:473 +#: ../coreapi/callbacks.c:521 msgid "Call terminated." msgstr "Appel terminé." -#: ../coreapi/callbacks.c:480 +#: ../coreapi/callbacks.c:528 msgid "User is busy." msgstr "Occupé..." -#: ../coreapi/callbacks.c:481 +#: ../coreapi/callbacks.c:529 msgid "User is temporarily unavailable." msgstr "L'usager est temporairement indisponible." #. char *retrymsg=_("%s. Retry after %i minute(s)."); -#: ../coreapi/callbacks.c:483 +#: ../coreapi/callbacks.c:531 msgid "User does not want to be disturbed." msgstr "L'usager ne souhaite pas être dérangé" -#: ../coreapi/callbacks.c:484 +#: ../coreapi/callbacks.c:532 msgid "Call declined." msgstr "Appel décliné." -#: ../coreapi/callbacks.c:496 +#: ../coreapi/callbacks.c:544 msgid "No response." msgstr "Pas de réponse." -#: ../coreapi/callbacks.c:500 +#: ../coreapi/callbacks.c:548 msgid "Protocol error." msgstr "Erreur de protocole" -#: ../coreapi/callbacks.c:516 +#: ../coreapi/callbacks.c:564 msgid "Redirected" msgstr "Redirection" -#: ../coreapi/callbacks.c:526 -msgid "Not found" -msgstr "Non trouvé" +#: ../coreapi/callbacks.c:600 +msgid "Incompatible media parameters." +msgstr "" -#: ../coreapi/callbacks.c:551 -msgid "No common codecs" -msgstr "Pas de codecs commun" - -#: ../coreapi/callbacks.c:557 +#: ../coreapi/callbacks.c:606 msgid "Call failed." msgstr "L'appel a échoué." -#: ../coreapi/callbacks.c:631 +#: ../coreapi/callbacks.c:701 #, c-format msgid "Registration on %s successful." msgstr "Enregistrement sur %s effectué." -#: ../coreapi/callbacks.c:632 +#: ../coreapi/callbacks.c:702 #, c-format msgid "Unregistration on %s done." msgstr "Désenregistrement sur %s effectué." -#: ../coreapi/callbacks.c:648 +#: ../coreapi/callbacks.c:722 msgid "no response timeout" msgstr "Pas de réponse" -#: ../coreapi/callbacks.c:651 +#: ../coreapi/callbacks.c:725 #, c-format msgid "Registration on %s failed: %s" msgstr "Echec de l'enregistrement sur %s: %s" -#: ../coreapi/sal_eXosip2.c:873 ../coreapi/sal_eXosip2.c:875 -msgid "Authentication failure" -msgstr "Echec d'authentification" - -#: ../coreapi/linphonecall.c:128 +#: ../coreapi/linphonecall.c:129 #, c-format msgid "Authentication token is %s" msgstr "Le jeton d'authentification est %s" -#: ../coreapi/linphonecall.c:1560 +#: ../coreapi/linphonecall.c:2124 #, c-format msgid "You have missed %i call." msgid_plural "You have missed %i calls." msgstr[0] "Vous avez manqué %i appel" msgstr[1] "Vous avez manqué %i appels" +#~ msgid "Chat with %s" +#~ msgstr "Chat avec %s" + +#~ msgid "Choosing a username" +#~ msgstr "Choix du nom d'utilisateur" + +#, fuzzy +#~ msgid "Confirmation" +#~ msgstr "Information sur le contact" + +#~ msgid "Contacts" +#~ msgstr "Contacts" + +#~ msgid "Enable video" +#~ msgstr "Activer la video" + +#~ msgid "Enter username, phone number, or full sip address" +#~ msgstr "" +#~ "Entrez un nom d'utilisateur, un numéro de téléphone, ou une addresse SIP" + +#~ msgid "Lookup:" +#~ msgstr "Rechercher:" + +#~ msgid "in" +#~ msgstr "dans" + +#~ msgid "We are being paused..." +#~ msgstr "Mise en attente..." + +#~ msgid "No common codecs" +#~ msgstr "Pas de codecs commun" + +#~ msgid "Authentication failure" +#~ msgstr "Echec d'authentification" + #~ msgid "" #~ "Pause all calls\n" #~ "and answer" diff --git a/po/he.po b/po/he.po index 77307f3db..bba94e8ca 100644 --- a/po/he.po +++ b/po/he.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Linphone 3.5.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-26 18:38+0200\n" +"POT-Creation-Date: 2013-01-08 10:35+0100\n" "PO-Revision-Date: 2012-12-27 10:14+0200\n" "Last-Translator: Isratine Citizen \n" "Language-Team: Rahut \n" @@ -19,21 +19,37 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 1.5.4\n" -#: ../gtk/calllogs.c:71 +#: ../gtk/calllogs.c:82 +#, fuzzy +msgid "Aborted" +msgstr "ננטשה" + +#: ../gtk/calllogs.c:85 +#, fuzzy +msgid "Missed" +msgstr "הוחמצה" + +# דחיה +#: ../gtk/calllogs.c:88 +#, fuzzy +msgid "Declined" +msgstr "לדחות" + +#: ../gtk/calllogs.c:94 #, c-format msgid "%i minute" msgid_plural "%i minutes" msgstr[0] "דקה %i" msgstr[1] "%i דקות" -#: ../gtk/calllogs.c:74 +#: ../gtk/calllogs.c:97 #, c-format msgid "%i second" msgid_plural "%i seconds" msgstr[0] "שניה %i" msgstr[1] "%i שניות" -#: ../gtk/calllogs.c:77 +#: ../gtk/calllogs.c:100 #, c-format msgid "" "%s\t%s\tQuality: %s\n" @@ -42,11 +58,20 @@ msgstr "" "%s\t%s\tאיכות: %s\n" "%s\t%s %s\t" -#: ../gtk/calllogs.c:79 +#: ../gtk/calllogs.c:102 msgid "n/a" msgstr "לא זמין (n/a)" -#: ../gtk/conference.c:33 ../gtk/incall_view.c:185 +#: ../gtk/calllogs.c:105 +#, fuzzy, c-format +msgid "" +"%s\t%s\t\n" +"%s\t%s" +msgstr "" +"%s\t%s\tאיכות: %s\n" +"%s\t%s %s\t" + +#: ../gtk/conference.c:33 ../gtk/main.ui.h:13 msgid "Conference" msgstr "ועידה" @@ -59,44 +84,42 @@ msgstr "אני" msgid "Couldn't find pixmap file: %s" msgstr "לא ניתן למצוא קובץ ‫pixmap: ‫%s" -# שוחחו -#: ../gtk/chat.c:27 -#, c-format -msgid "Chat with %s" -msgstr "שיחה עם %s" - # cli -#: ../gtk/main.c:84 +#: ../gtk/main.c:89 #, fuzzy msgid "log to stdout some debug information while running." msgstr "רשום אל stdout מידע ניפוי שגיאות מסוים בזמן ביצוע." # cli -#: ../gtk/main.c:91 +#: ../gtk/main.c:96 #, fuzzy msgid "path to a file to write logs into." msgstr "נתיב אל קובץ שברצונך לרשום אליו את הרשומות." +#: ../gtk/main.c:103 +msgid "Start linphone with video disabled." +msgstr "" + # cli -#: ../gtk/main.c:98 +#: ../gtk/main.c:110 #, fuzzy msgid "Start only in the system tray, do not show the main interface." msgstr "התחל במגש המערכת בלבד, אל תציג את הממשק הראשי." # cli -#: ../gtk/main.c:105 +#: ../gtk/main.c:117 #, fuzzy msgid "address to call right now" msgstr "כתובת להתקשרות ברגע זה" # cli -#: ../gtk/main.c:112 +#: ../gtk/main.c:124 #, fuzzy msgid "if set automatically answer incoming calls" msgstr "באם אפשרות זו נקבעת ענה אוטומטית לקריאות נכנסות" # cli -#: ../gtk/main.c:119 +#: ../gtk/main.c:131 #, fuzzy msgid "" "Specifiy a working directory (should be the base of the installation, eg: c:" @@ -105,14 +128,14 @@ msgstr "" "ציין מדור העבודה (אמור להיות מבוסס על ההתקנה, למשל: c:\\Program Files" "\\Linphone)" -#: ../gtk/main.c:465 +#: ../gtk/main.c:498 #, c-format msgid "Call with %s" msgstr "התקשרות באמצעות %s" # הקשר שלהם # אם התשובה -#: ../gtk/main.c:820 +#: ../gtk/main.c:871 #, c-format msgid "" "%s would like to add you to his contact list.\n" @@ -125,7 +148,7 @@ msgstr "" "שלך ?\n" "היה ותשובתך תהיה לא, אדם זה יהיה מסומן באופן זמני ברשימה השחורה." -#: ../gtk/main.c:898 +#: ../gtk/main.c:948 #, c-format msgid "" "Please enter your password for username %s\n" @@ -135,59 +158,64 @@ msgstr "" " בתחום %s:" # שיחה -#: ../gtk/main.c:998 +#: ../gtk/main.c:1051 msgid "Call error" msgstr "שגיאת קריאה" # Conversation ended -#: ../gtk/main.c:1001 ../coreapi/linphonecore.c:2433 +#: ../gtk/main.c:1054 ../coreapi/linphonecore.c:2949 msgid "Call ended" msgstr "שיחה הסתיימה" -#: ../gtk/main.c:1004 ../coreapi/linphonecore.c:199 +#: ../gtk/main.c:1057 ../coreapi/linphonecore.c:244 msgid "Incoming call" msgstr "קריאה נכנסת" -#: ../gtk/main.c:1006 ../gtk/incall_view.c:294 ../gtk/main.ui.h:21 +#: ../gtk/main.c:1059 ../gtk/incall_view.c:451 ../gtk/main.ui.h:6 msgid "Answer" msgstr "לענות" # דחיה -#: ../gtk/main.c:1008 ../gtk/main.ui.h:29 +#: ../gtk/main.c:1061 ../gtk/main.ui.h:7 msgid "Decline" msgstr "לדחות" # Conversation paused -#: ../gtk/main.c:1014 +#: ../gtk/main.c:1067 msgid "Call paused" msgstr "שיחה הושהתה" -#: ../gtk/main.c:1014 +#: ../gtk/main.c:1067 #, c-format msgid "by %s" msgstr "מאת %s" -#: ../gtk/main.c:1170 +#: ../gtk/main.c:1116 +#, c-format +msgid "%s proposed to start video. Do you accept ?" +msgstr "" + +#: ../gtk/main.c:1278 msgid "Website link" msgstr "קישור אתר רשת" # ‫Linphone - וידאופון במרשתת -#: ../gtk/main.c:1210 +#: ../gtk/main.c:1318 msgid "Linphone - a video internet phone" msgstr "‫Linphone - וידאופון אינטרנטי" -#: ../gtk/main.c:1302 +#: ../gtk/main.c:1410 #, c-format msgid "%s (Default)" msgstr "‫%s (משתמטת)" -#: ../gtk/main.c:1580 ../coreapi/callbacks.c:702 +#: ../gtk/main.c:1714 ../coreapi/callbacks.c:774 #, c-format msgid "We are transferred to %s" msgstr "אנחנו מועברים אל %s" # קריאות שמע -#: ../gtk/main.c:1590 +#: ../gtk/main.c:1724 msgid "" "No sound cards have been detected on this computer.\n" "You won't be able to send or receive audio calls." @@ -195,170 +223,182 @@ msgstr "" "לא אותרו כרטיסי קול במחשב זה.\n" "לא תהיה ביכולתך לשלוח או לקבל שיחות שמע." -#: ../gtk/main.c:1691 +#: ../gtk/main.c:1833 msgid "A free SIP video-phone" msgstr "וידאופון SIP חופשי" -#: ../gtk/friendlist.c:203 +#: ../gtk/friendlist.c:335 msgid "Add to addressbook" msgstr "הוסף אל ספר כתובות" -#: ../gtk/friendlist.c:377 ../gtk/propertybox.c:297 ../gtk/contact.ui.h:3 -msgid "Name" -msgstr "שם" - -#: ../gtk/friendlist.c:393 +#: ../gtk/friendlist.c:509 msgid "Presence status" msgstr "מצב נוכחות" +#: ../gtk/friendlist.c:526 ../gtk/propertybox.c:362 ../gtk/contact.ui.h:1 +msgid "Name" +msgstr "שם" + +#: ../gtk/friendlist.c:538 +msgid "Call" +msgstr "קריאה" + +#: ../gtk/friendlist.c:543 +msgid "Chat" +msgstr "" + # a name or a number -#: ../gtk/friendlist.c:432 +#: ../gtk/friendlist.c:573 #, c-format msgid "Search in %s directory" msgstr "חיפוש במדור %s" # איש־קשר -#: ../gtk/friendlist.c:646 +#: ../gtk/friendlist.c:730 msgid "Invalid sip contact !" msgstr "כתובת sip לא תקפה !" # צור קשר עם -#: ../gtk/friendlist.c:691 +#: ../gtk/friendlist.c:775 #, c-format msgid "Call %s" msgstr "התקשר אל %s" -#: ../gtk/friendlist.c:692 +#: ../gtk/friendlist.c:776 #, c-format msgid "Send text to %s" msgstr "שלח טקסט אל %s" -#: ../gtk/friendlist.c:693 +#: ../gtk/friendlist.c:777 #, c-format msgid "Edit contact '%s'" msgstr "ערוך איש קשר '%s'" -#: ../gtk/friendlist.c:694 +#: ../gtk/friendlist.c:778 #, c-format msgid "Delete contact '%s'" msgstr "מחק איש קשר '%s'" -#: ../gtk/friendlist.c:736 +#: ../gtk/friendlist.c:820 #, c-format msgid "Add new contact from %s directory" msgstr "הוסף איש קשר חדש מן מדור %s" # קצב תדר תדירות מהירות -#: ../gtk/propertybox.c:303 +#: ../gtk/propertybox.c:368 msgid "Rate (Hz)" msgstr "שיעור (הרץ)" -#: ../gtk/propertybox.c:309 +#: ../gtk/propertybox.c:374 msgid "Status" msgstr "מצב" # שיעור סיביות מינימלי -#: ../gtk/propertybox.c:315 +#: ../gtk/propertybox.c:380 msgid "Min bitrate (kbit/s)" msgstr "קצב נתונים מינימלי (קי״ב/שנ׳)" -#: ../gtk/propertybox.c:322 +#: ../gtk/propertybox.c:387 msgid "Parameters" msgstr "פרמטרים" -#: ../gtk/propertybox.c:365 ../gtk/propertybox.c:508 +#: ../gtk/propertybox.c:430 ../gtk/propertybox.c:573 msgid "Enabled" msgstr "מופעל" -#: ../gtk/propertybox.c:367 ../gtk/propertybox.c:508 +#: ../gtk/propertybox.c:432 ../gtk/propertybox.c:573 msgid "Disabled" msgstr "לא מופעל" -#: ../gtk/propertybox.c:554 +#: ../gtk/propertybox.c:619 msgid "Account" msgstr "חשבון" -#: ../gtk/propertybox.c:694 +#: ../gtk/propertybox.c:759 msgid "English" msgstr "English" -#: ../gtk/propertybox.c:695 +#: ../gtk/propertybox.c:760 msgid "French" msgstr "Français" -#: ../gtk/propertybox.c:696 +#: ../gtk/propertybox.c:761 msgid "Swedish" msgstr "Svenska" -#: ../gtk/propertybox.c:697 +#: ../gtk/propertybox.c:762 msgid "Italian" msgstr "Italiano" -#: ../gtk/propertybox.c:698 +#: ../gtk/propertybox.c:763 msgid "Spanish" msgstr "Español" # português do Brasil -#: ../gtk/propertybox.c:699 +#: ../gtk/propertybox.c:764 msgid "Brazilian Portugese" msgstr "português brasileiro" -#: ../gtk/propertybox.c:700 +#: ../gtk/propertybox.c:765 msgid "Polish" msgstr "Polski" -#: ../gtk/propertybox.c:701 +#: ../gtk/propertybox.c:766 msgid "German" msgstr "Deutsch" -#: ../gtk/propertybox.c:702 +#: ../gtk/propertybox.c:767 msgid "Russian" msgstr "Русский" -#: ../gtk/propertybox.c:703 +#: ../gtk/propertybox.c:768 msgid "Japanese" msgstr "日本語" -#: ../gtk/propertybox.c:704 +#: ../gtk/propertybox.c:769 msgid "Dutch" msgstr "Nederlands" -#: ../gtk/propertybox.c:705 +#: ../gtk/propertybox.c:770 msgid "Hungarian" msgstr "Magyar" -#: ../gtk/propertybox.c:706 +#: ../gtk/propertybox.c:771 msgid "Czech" msgstr "Česky" -#: ../gtk/propertybox.c:707 +#: ../gtk/propertybox.c:772 msgid "Chinese" msgstr "中文" # 繁体字 -#: ../gtk/propertybox.c:708 +#: ../gtk/propertybox.c:773 msgid "Traditional Chinese" msgstr "繁體字" -#: ../gtk/propertybox.c:709 +#: ../gtk/propertybox.c:774 msgid "Norwegian" msgstr "norsk" +#: ../gtk/propertybox.c:775 +msgid "Hebrew" +msgstr "" + # selected הנבחרת -#: ../gtk/propertybox.c:766 +#: ../gtk/propertybox.c:842 msgid "" "You need to restart linphone for the new language selection to take effect." msgstr "עליך לאתחל את לינפון כדי שהשפה החדשה תיכנס לתוקף." -#: ../gtk/propertybox.c:836 +#: ../gtk/propertybox.c:912 msgid "None" msgstr "ללא" -#: ../gtk/propertybox.c:840 +#: ../gtk/propertybox.c:916 msgid "SRTP" msgstr "" -#: ../gtk/propertybox.c:846 +#: ../gtk/propertybox.c:922 msgid "ZRTP" msgstr "" @@ -432,7 +472,7 @@ msgstr "הזן את שם משתמשך אצל linphone.org" msgid "Username:" msgstr "שם משתמש:" -#: ../gtk/setupwizard.c:93 ../gtk/password.ui.h:2 +#: ../gtk/setupwizard.c:93 ../gtk/password.ui.h:4 msgid "Password:" msgstr "סיסמה:" @@ -457,29 +497,29 @@ msgid "Proxy" msgstr "פרוקסי" # נדרשים -#: ../gtk/setupwizard.c:293 +#: ../gtk/setupwizard.c:297 msgid "(*) Required fields" msgstr "(*) שדות חובה" -#: ../gtk/setupwizard.c:294 +#: ../gtk/setupwizard.c:298 msgid "Username: (*)" msgstr "שם משתמש: (*)" -#: ../gtk/setupwizard.c:296 +#: ../gtk/setupwizard.c:300 msgid "Password: (*)" msgstr "סיסמה: (*)" -#: ../gtk/setupwizard.c:298 +#: ../gtk/setupwizard.c:302 msgid "Email: (*)" msgstr "דוא״ל: (*)" -#: ../gtk/setupwizard.c:300 +#: ../gtk/setupwizard.c:304 msgid "Confirm your password: (*)" msgstr "אימות סיסמתך: (*)" # אינו בר־השגה # לשוב אחורה -#: ../gtk/setupwizard.c:364 +#: ../gtk/setupwizard.c:368 msgid "" "Error, account not validated, username already used or server unreachable.\n" "Please go back and try again." @@ -488,12 +528,12 @@ msgstr "" "נא לחזור ולנסות שוב." # תודה רבה -#: ../gtk/setupwizard.c:375 +#: ../gtk/setupwizard.c:379 msgid "Thank you. Your account is now configured and ready for use." msgstr "תודה לך. חשבונך מוגדר ומוכן לשימוש כעת." # לאחר מכן -#: ../gtk/setupwizard.c:383 +#: ../gtk/setupwizard.c:387 msgid "" "Please validate your account by clicking on the link we just sent you by " "email.\n" @@ -504,140 +544,192 @@ msgstr "" # Wizard אשף # סייע -#: ../gtk/setupwizard.c:553 +#: ../gtk/setupwizard.c:554 msgid "Welcome to the account setup assistant" msgstr "ברוך בואך אל אשף הגדרת החשבון" -#: ../gtk/setupwizard.c:558 +#: ../gtk/setupwizard.c:559 msgid "Account setup assistant" msgstr "אשף הגדרת חשבון" # שלב -#: ../gtk/setupwizard.c:564 +#: ../gtk/setupwizard.c:565 msgid "Configure your account (step 1/1)" msgstr "הגדרת חשבונך (צעד 1/1)" -#: ../gtk/setupwizard.c:569 +#: ../gtk/setupwizard.c:570 msgid "Enter your sip username (step 1/1)" msgstr "הזנת שם משתמש sip (צעד 1/1)" -#: ../gtk/setupwizard.c:573 +#: ../gtk/setupwizard.c:574 msgid "Enter account information (step 1/2)" msgstr "הזנת מידע חשבון (צעד 1/2)" # תקפות -#: ../gtk/setupwizard.c:582 +#: ../gtk/setupwizard.c:583 msgid "Validation (step 2/2)" msgstr "אימות (צעד 2/2)" -#: ../gtk/setupwizard.c:587 +#: ../gtk/setupwizard.c:588 msgid "Error" msgstr "שגיאה" -#: ../gtk/setupwizard.c:591 +#: ../gtk/setupwizard.c:592 msgid "Terminating" msgstr "מסיים כעת" -#: ../gtk/incall_view.c:69 +#: ../gtk/incall_view.c:69 ../gtk/incall_view.c:90 #, c-format msgid "Call #%i" msgstr "שיחה מס׳ %i" -#: ../gtk/incall_view.c:129 +#: ../gtk/incall_view.c:150 #, c-format msgid "Transfer to call #%i with %s" msgstr "העברה אל שיחה מס׳ %i עם %s" -#: ../gtk/incall_view.c:157 -msgid "Transfer" -msgstr "העברה" +#: ../gtk/incall_view.c:209 ../gtk/incall_view.c:212 +#, fuzzy +msgid "Not used" +msgstr "לא נמצא" -#: ../gtk/incall_view.c:273 +#: ../gtk/incall_view.c:219 +msgid "ICE not activated" +msgstr "" + +#: ../gtk/incall_view.c:221 +#, fuzzy +msgid "ICE failed" +msgstr "קריאה נכשלה." + +#: ../gtk/incall_view.c:223 +msgid "ICE in progress" +msgstr "" + +#: ../gtk/incall_view.c:225 +msgid "Going through one or more NATs" +msgstr "" + +#: ../gtk/incall_view.c:227 +#, fuzzy +msgid "Direct" +msgstr "מכוון מחדש" + +#: ../gtk/incall_view.c:229 +msgid "Through a relay server" +msgstr "" + +#: ../gtk/incall_view.c:238 ../gtk/incall_view.c:242 +#, c-format +msgid "" +"download: %f\n" +"upload: %f (kbit/s)" +msgstr "" + +#: ../gtk/incall_view.c:341 ../gtk/main.ui.h:12 +msgid "Hang up" +msgstr "" + +#: ../gtk/incall_view.c:430 msgid "Calling..." msgstr "מתקשר כעת..." -#: ../gtk/incall_view.c:276 ../gtk/incall_view.c:484 +#: ../gtk/incall_view.c:433 ../gtk/incall_view.c:646 msgid "00::00::00" msgstr "‭00::00::00" -#: ../gtk/incall_view.c:287 +#: ../gtk/incall_view.c:444 msgid "Incoming call" msgstr "קריאה נכנסת" -#: ../gtk/incall_view.c:324 +#: ../gtk/incall_view.c:481 msgid "good" msgstr "טובה" # רגילה -#: ../gtk/incall_view.c:326 +#: ../gtk/incall_view.c:483 msgid "average" msgstr "ממוצעת" # weak חלשה חלושה רפויה רופפת -#: ../gtk/incall_view.c:328 +#: ../gtk/incall_view.c:485 msgid "poor" msgstr "דלה" -#: ../gtk/incall_view.c:330 +#: ../gtk/incall_view.c:487 msgid "very poor" msgstr "דלה מאוד" # רעה -#: ../gtk/incall_view.c:332 +#: ../gtk/incall_view.c:489 msgid "too bad" msgstr "גרועה מדי" -#: ../gtk/incall_view.c:333 ../gtk/incall_view.c:349 +#: ../gtk/incall_view.c:490 ../gtk/incall_view.c:506 msgid "unavailable" msgstr "לא זמינה" # באמצעות -#: ../gtk/incall_view.c:449 +#: ../gtk/incall_view.c:605 msgid "Secured by SRTP" msgstr "מאובטחת על ידי SRTP" -#: ../gtk/incall_view.c:455 +#: ../gtk/incall_view.c:611 #, c-format msgid "Secured by ZRTP - [auth token: %s]" msgstr "מאובטחת על ידי ZRTP - [אות אימות: %s]" # set or unset verification state of ZRTP SAS. -#: ../gtk/incall_view.c:461 +#: ../gtk/incall_view.c:617 msgid "Set unverified" msgstr "הגדר כלא מאומתת" -#: ../gtk/incall_view.c:461 ../gtk/main.ui.h:49 +#: ../gtk/incall_view.c:617 ../gtk/main.ui.h:5 msgid "Set verified" msgstr "הגדר כמאומתת" -#: ../gtk/incall_view.c:482 +#: ../gtk/incall_view.c:641 msgid "In conference" msgstr "בשיחת ועידה" -#: ../gtk/incall_view.c:482 +#: ../gtk/incall_view.c:641 msgid "In call" msgstr "בשיחה כעת" -#: ../gtk/incall_view.c:501 +#: ../gtk/incall_view.c:669 msgid "Paused call" msgstr "שיחה מושהית" # שעות %02i דקות %02i שניות %02i # Force LTR time format (hours::minutes::seconds) with LRO chatacter (U+202D) -#: ../gtk/incall_view.c:513 +#: ../gtk/incall_view.c:682 #, c-format msgid "%02i::%02i::%02i" msgstr "‭%02i::%02i::%02i" -#: ../gtk/incall_view.c:529 +#: ../gtk/incall_view.c:699 msgid "Call ended." msgstr "שיחה הסתיימה." -#: ../gtk/incall_view.c:586 +#: ../gtk/incall_view.c:731 +msgid "Transfer in progress" +msgstr "" + +#: ../gtk/incall_view.c:734 +#, fuzzy +msgid "Transfer done." +msgstr "העברה" + +#: ../gtk/incall_view.c:737 +#, fuzzy +msgid "Transfer failed." +msgstr "העברה" + +#: ../gtk/incall_view.c:781 msgid "Resume" msgstr "חזרה" -#: ../gtk/incall_view.c:593 ../gtk/main.ui.h:45 +#: ../gtk/incall_view.c:788 ../gtk/main.ui.h:9 msgid "Pause" msgstr "השהיה" @@ -646,233 +738,247 @@ msgstr "השהיה" msgid "Please enter login information for %s" msgstr "נא להזין מידע התחברות עבור %s" -#: ../gtk/main.ui.h:1 -msgid "#" -msgstr "" - -#: ../gtk/main.ui.h:2 -msgid "*" -msgstr "" - -#: ../gtk/main.ui.h:3 -msgid "0" -msgstr "" - -#: ../gtk/main.ui.h:4 -msgid "1" -msgstr "" - -#: ../gtk/main.ui.h:5 -msgid "2" -msgstr "2 (דהו)" - -#: ../gtk/main.ui.h:6 -msgid "3" -msgstr "3 (אבג)" - -#: ../gtk/main.ui.h:7 -msgid "4" -msgstr "4 (מנ)" - -#: ../gtk/main.ui.h:8 -msgid "5" -msgstr "5 (יכל)" - -#: ../gtk/main.ui.h:9 -msgid "6" -msgstr "6 (זחט)" - -#: ../gtk/main.ui.h:10 -msgid "7" -msgstr "7 (רשת)" - -#: ../gtk/main.ui.h:11 -msgid "8" -msgstr "8 (צק)" - -#: ../gtk/main.ui.h:12 -msgid "9" -msgstr "9 (סעפ)" - -#: ../gtk/main.ui.h:13 -msgid "Add contacts from directory" -msgstr "הוסף אנשי קשר מן מדור" - # מתקשר Caller # זה ש: נתקשר או מתוקשר או הותקשר? -#: ../gtk/main.ui.h:14 +#: ../gtk/main.ui.h:1 msgid "Callee name" msgstr "שם המקבל" -#: ../gtk/main.ui.h:15 -msgid "Welcome !" -msgstr "ברוך בואך !" +#: ../gtk/main.ui.h:2 +msgid "Send" +msgstr "שיגור" -#: ../gtk/main.ui.h:16 -msgid "A" -msgstr "" +#: ../gtk/main.ui.h:3 +#, fuzzy +msgid "End conference" +msgstr "בשיחת ועידה" -#: ../gtk/main.ui.h:17 -msgid "ADSL" -msgstr "‫ADSL" - -#: ../gtk/main.ui.h:18 -msgid "Account assistant" -msgstr "אשף חשבון" - -#: ../gtk/main.ui.h:19 -msgid "Add contact" -msgstr "הוספת איש קשר" - -#: ../gtk/main.ui.h:20 -msgid "All users" -msgstr "כל המשתמשים" - -#: ../gtk/main.ui.h:22 -msgid "Automatically log me in" -msgstr "חבר אותי אוטומטית" - -#: ../gtk/main.ui.h:23 -msgid "B" -msgstr "" - -#: ../gtk/main.ui.h:24 ../gtk/parameters.ui.h:21 -msgid "C" -msgstr "" - -#: ../gtk/main.ui.h:25 -msgid "Call quality rating" -msgstr "אומדן איכות שיחה" - -#: ../gtk/main.ui.h:26 -msgid "Check _Updates" -msgstr "בדיקת _עדכונים" - -#: ../gtk/main.ui.h:27 -msgid "Contacts" -msgstr "אנשי קשר" - -#: ../gtk/main.ui.h:28 -msgid "D" -msgstr "" - -# משתמט -#: ../gtk/main.ui.h:30 -msgid "Default" -msgstr "ברירת מחדל" - -#: ../gtk/main.ui.h:31 -msgid "Duration" -msgstr "משך זמן" - -#: ../gtk/main.ui.h:32 -msgid "Enable self-view" -msgstr "אפשר ראות-עצמית" - -#: ../gtk/main.ui.h:33 -msgid "Enable video" -msgstr "הפעל וידאו" - -# הזנת -#: ../gtk/main.ui.h:34 -msgid "Enter username, phone number, or full sip address" -msgstr "נא להזין שם משתמש, מספר טלפון, או כתובת sip מלאה" - -#: ../gtk/main.ui.h:35 -msgid "Fiber Channel" -msgstr "ערוץ סיב" - -#: ../gtk/main.ui.h:36 -msgid "In call" -msgstr "בשיחה כעת" - -#: ../gtk/main.ui.h:37 -msgid "Initiate a new call" -msgstr "התחלת שיחה חדשה" - -# מרשתת -#: ../gtk/main.ui.h:38 -msgid "Internet connection:" -msgstr "חיבור אינטרנט:" - -#: ../gtk/main.ui.h:39 -msgid "Keypad" -msgstr "לוח מקשים" - -#: ../gtk/main.ui.h:40 -msgid "Login information" -msgstr "מידע התחברות" - -# עיון -#: ../gtk/main.ui.h:41 -msgid "Lookup:" -msgstr "חיפוש:" - -# הזהות הנוכחית שלי -#: ../gtk/main.ui.h:42 -msgid "My current identity:" -msgstr "זהותי הנוכחית:" - -#: ../gtk/main.ui.h:43 -msgid "Online users" -msgstr "משתמשים מקוונים" - -#: ../gtk/main.ui.h:44 -msgid "Password" -msgstr "סיסמה" - -# קריאות אחרונות -#: ../gtk/main.ui.h:46 -msgid "Recent calls" -msgstr "שיחות אחרונות" - -#: ../gtk/main.ui.h:47 -msgid "SIP address or phone number:" -msgstr "כתובת SIP או מספר טלפון" - -#: ../gtk/main.ui.h:48 -msgid "Search" -msgstr "חיפוש" - -#: ../gtk/main.ui.h:50 -msgid "Show debug window" -msgstr "הצג חלון ניפוי שגיאות" - -#: ../gtk/main.ui.h:51 -msgid "Username" -msgstr "שם משתמש" - -#: ../gtk/main.ui.h:52 -msgid "_Help" -msgstr "_עזרה" - -#: ../gtk/main.ui.h:53 -msgid "_Homepage" -msgstr "_עמוד הבית" - -#: ../gtk/main.ui.h:54 -msgid "_Options" -msgstr "_אפשרויות" - -# במסגרת -#: ../gtk/main.ui.h:55 -msgid "in" -msgstr "בקרב" - -#: ../gtk/main.ui.h:56 +#: ../gtk/main.ui.h:4 msgid "label" msgstr "תוויות" -# Should be updated to 2012 2013 -# כל הזכויות שמורות (C) ‫Belledonne Communications, ‫2010\n -#: ../gtk/about.ui.h:1 -msgid "(C) Belledonne Communications,2010\n" -msgstr "‫(C) ‫Belledonne Communications,‫2010\n" +#: ../gtk/main.ui.h:8 +msgid "Video" +msgstr "" -#: ../gtk/about.ui.h:3 +#: ../gtk/main.ui.h:10 +msgid "Mute" +msgstr "" + +#: ../gtk/main.ui.h:11 +msgid "Transfer" +msgstr "העברה" + +#: ../gtk/main.ui.h:14 +msgid "In call" +msgstr "בשיחה כעת" + +#: ../gtk/main.ui.h:15 +msgid "Duration" +msgstr "משך זמן" + +#: ../gtk/main.ui.h:16 +msgid "Call quality rating" +msgstr "אומדן איכות שיחה" + +#: ../gtk/main.ui.h:17 +msgid "_Options" +msgstr "_אפשרויות" + +#: ../gtk/main.ui.h:18 +msgid "Always start video" +msgstr "" + +#: ../gtk/main.ui.h:19 +msgid "Enable self-view" +msgstr "אפשר ראות-עצמית" + +#: ../gtk/main.ui.h:20 +msgid "_Help" +msgstr "_עזרה" + +#: ../gtk/main.ui.h:21 +msgid "Show debug window" +msgstr "הצג חלון ניפוי שגיאות" + +#: ../gtk/main.ui.h:22 +msgid "_Homepage" +msgstr "_עמוד הבית" + +#: ../gtk/main.ui.h:23 +msgid "Check _Updates" +msgstr "בדיקת _עדכונים" + +#: ../gtk/main.ui.h:24 +msgid "Account assistant" +msgstr "אשף חשבון" + +#: ../gtk/main.ui.h:25 +msgid "SIP address or phone number:" +msgstr "כתובת SIP או מספר טלפון" + +#: ../gtk/main.ui.h:26 +msgid "Initiate a new call" +msgstr "התחלת שיחה חדשה" + +#: ../gtk/main.ui.h:27 ../gtk/parameters.ui.h:48 +msgid "Add" +msgstr "הוסף" + +#: ../gtk/main.ui.h:28 ../gtk/parameters.ui.h:49 +msgid "Edit" +msgstr "ערוך" + +#: ../gtk/main.ui.h:29 +msgid "D" +msgstr "" + +#: ../gtk/main.ui.h:30 +msgid "#" +msgstr "" + +#: ../gtk/main.ui.h:31 +msgid "0" +msgstr "" + +#: ../gtk/main.ui.h:32 +msgid "*" +msgstr "" + +#: ../gtk/main.ui.h:33 ../gtk/parameters.ui.h:7 +msgid "C" +msgstr "" + +#: ../gtk/main.ui.h:34 +msgid "9" +msgstr "9 (סעפ)" + +#: ../gtk/main.ui.h:35 +msgid "8" +msgstr "8 (צק)" + +#: ../gtk/main.ui.h:36 +msgid "7" +msgstr "7 (רשת)" + +#: ../gtk/main.ui.h:37 +msgid "B" +msgstr "" + +#: ../gtk/main.ui.h:38 +msgid "6" +msgstr "6 (זחט)" + +#: ../gtk/main.ui.h:39 +msgid "5" +msgstr "5 (יכל)" + +#: ../gtk/main.ui.h:40 +msgid "4" +msgstr "4 (מנ)" + +#: ../gtk/main.ui.h:41 +msgid "A" +msgstr "" + +#: ../gtk/main.ui.h:42 +msgid "3" +msgstr "3 (אבג)" + +#: ../gtk/main.ui.h:43 +msgid "2" +msgstr "2 (דהו)" + +#: ../gtk/main.ui.h:44 +msgid "1" +msgstr "" + +#: ../gtk/main.ui.h:45 +msgid "Search" +msgstr "חיפוש" + +#: ../gtk/main.ui.h:46 +msgid "Add contacts from directory" +msgstr "הוסף אנשי קשר מן מדור" + +#: ../gtk/main.ui.h:47 +msgid "Add contact" +msgstr "הוספת איש קשר" + +#: ../gtk/main.ui.h:48 +msgid "Keypad" +msgstr "לוח מקשים" + +# קריאות אחרונות +#: ../gtk/main.ui.h:49 +msgid "Recent calls" +msgstr "שיחות אחרונות" + +# הזהות הנוכחית שלי +#: ../gtk/main.ui.h:50 +msgid "My current identity:" +msgstr "זהותי הנוכחית:" + +#: ../gtk/main.ui.h:51 ../gtk/tunnel_config.ui.h:7 +msgid "Username" +msgstr "שם משתמש" + +#: ../gtk/main.ui.h:52 ../gtk/tunnel_config.ui.h:8 +msgid "Password" +msgstr "סיסמה" + +# מרשתת +#: ../gtk/main.ui.h:53 +msgid "Internet connection:" +msgstr "חיבור אינטרנט:" + +#: ../gtk/main.ui.h:54 +msgid "Automatically log me in" +msgstr "חבר אותי אוטומטית" + +#: ../gtk/main.ui.h:55 +msgid "Login information" +msgstr "מידע התחברות" + +#: ../gtk/main.ui.h:56 +msgid "Welcome !" +msgstr "ברוך בואך !" + +#: ../gtk/main.ui.h:57 +msgid "All users" +msgstr "כל המשתמשים" + +#: ../gtk/main.ui.h:58 +msgid "Online users" +msgstr "משתמשים מקוונים" + +#: ../gtk/main.ui.h:59 +msgid "ADSL" +msgstr "‫ADSL" + +#: ../gtk/main.ui.h:60 +msgid "Fiber Channel" +msgstr "ערוץ סיב" + +# משתמט +#: ../gtk/main.ui.h:61 +msgid "Default" +msgstr "ברירת מחדל" + +#: ../gtk/main.ui.h:62 +msgid "Delete" +msgstr "" + +#: ../gtk/about.ui.h:1 msgid "About linphone" msgstr "אודות לינפון" +# Should be updated to 2012 2013 +# כל הזכויות שמורות (C) ‫Belledonne Communications, ‫2010\n +#: ../gtk/about.ui.h:2 +msgid "(C) Belledonne Communications,2010\n" +msgstr "‫(C) ‫Belledonne Communications,‫2010\n" + #: ../gtk/about.ui.h:4 msgid "An internet video phone using the standard SIP (rfc3261) protocol." msgstr "וידאופון אינטרנטי באמצעות תקן הפרוטוקול SIP (‫rfc3261)." @@ -892,22 +998,22 @@ msgid "" "hu: anonymous\n" msgstr "" -#: ../gtk/contact.ui.h:1 -msgid "Contact information" -msgstr "מידע איש קשר" - #: ../gtk/contact.ui.h:2 -msgid "Allow this contact to see my presence status" -msgstr "הרשה לאיש קשר זה לראות את מצב הנוכחות שלי" - -#: ../gtk/contact.ui.h:4 msgid "SIP Address" msgstr "כתובת ‫SIP" -#: ../gtk/contact.ui.h:5 +#: ../gtk/contact.ui.h:3 msgid "Show this contact presence status" msgstr "הצג את מצב נוכחותו של איש קשר זה" +#: ../gtk/contact.ui.h:4 +msgid "Allow this contact to see my presence status" +msgstr "הרשה לאיש קשר זה לראות את מצב הנוכחות שלי" + +#: ../gtk/contact.ui.h:5 +msgid "Contact information" +msgstr "מידע איש קשר" + #: ../gtk/log.ui.h:1 msgid "Linphone debug window" msgstr "חלון ניפוי שגיאות ‫Linphone" @@ -921,378 +1027,369 @@ msgid "Linphone - Authentication required" msgstr "‫Linphone - נדרש אימות" # תחום -#: ../gtk/password.ui.h:3 +#: ../gtk/password.ui.h:2 msgid "Please enter the domain password" msgstr "נא להזין את סיסמת המתחם" -#: ../gtk/password.ui.h:4 +#: ../gtk/password.ui.h:3 msgid "UserID" msgstr "זהות משתמש (‫UID)" -# קריאה חוזרת -#: ../gtk/call_logs.ui.h:1 -msgid "Call back" -msgstr "חיוג חוזר" - # קריאות -#: ../gtk/call_logs.ui.h:2 +#: ../gtk/call_logs.ui.h:1 msgid "Call history" msgstr "היסטוריית שיחות" -#: ../gtk/call_logs.ui.h:3 +#: ../gtk/call_logs.ui.h:2 msgid "Clear all" msgstr "טיהור מוחלט" -#: ../gtk/sip_account.ui.h:1 -msgid "Configure a SIP account" -msgstr "הגדרת חשבון ‫SIP" +# קריאה חוזרת +#: ../gtk/call_logs.ui.h:3 +msgid "Call back" +msgstr "חיוג חוזר" -#: ../gtk/sip_account.ui.h:2 +#: ../gtk/sip_account.ui.h:1 msgid "Linphone - Configure a SIP account" msgstr "‫Linphone - הגדרת חשבון ‫SIP" -#: ../gtk/sip_account.ui.h:3 -msgid "Looks like sip:" -msgstr "נראה כמו ‪sip:" - -#: ../gtk/sip_account.ui.h:4 -msgid "Looks like sip:@" -msgstr "נראה כמו ‪sip:@" - -#: ../gtk/sip_account.ui.h:5 -msgid "Publish presence information" -msgstr "פרסם מידע נוכחות" - -#: ../gtk/sip_account.ui.h:6 -msgid "Register" -msgstr "רישום" - -#: ../gtk/sip_account.ui.h:7 -msgid "Registration duration (sec):" -msgstr "משך רישום (בשניות):" - -#: ../gtk/sip_account.ui.h:8 -msgid "Route (optional):" -msgstr "ניתוב (רשות):" - -#: ../gtk/sip_account.ui.h:9 -msgid "SIP Proxy address:" -msgstr "כתובת SIP Proxy:" - -#: ../gtk/sip_account.ui.h:10 +#: ../gtk/sip_account.ui.h:2 msgid "Your SIP identity:" msgstr "זהות ה־SIP שלך:" -#: ../gtk/sip_account.ui.h:11 +#: ../gtk/sip_account.ui.h:3 +msgid "Looks like sip:@" +msgstr "נראה כמו ‪sip:@" + +#: ../gtk/sip_account.ui.h:4 msgid "sip:" msgstr "" -#: ../gtk/chatroom.ui.h:1 -msgid "Send" -msgstr "שיגור" +#: ../gtk/sip_account.ui.h:5 +msgid "SIP Proxy address:" +msgstr "כתובת SIP Proxy:" + +#: ../gtk/sip_account.ui.h:6 +msgid "Looks like sip:" +msgstr "נראה כמו ‪sip:" + +#: ../gtk/sip_account.ui.h:7 +msgid "Route (optional):" +msgstr "ניתוב (רשות):" + +#: ../gtk/sip_account.ui.h:8 +msgid "Registration duration (sec):" +msgstr "משך רישום (בשניות):" + +#: ../gtk/sip_account.ui.h:9 +msgid "Register" +msgstr "רישום" + +#: ../gtk/sip_account.ui.h:10 +msgid "Publish presence information" +msgstr "פרסם מידע נוכחות" + +#: ../gtk/sip_account.ui.h:11 +msgid "Configure a SIP account" +msgstr "הגדרת חשבון ‫SIP" -# ללא הגבלה #: ../gtk/parameters.ui.h:1 -msgid "0 stands for \"unlimited\"" -msgstr "0 מסמל \"בלי הגבלה\"" +msgid "default soundcard" +msgstr "כרטיס קול משתמט" #: ../gtk/parameters.ui.h:2 -msgid "Audio" -msgstr "שמע" +msgid "a sound card" +msgstr "כרטיס קול" -# פס רוחב -# טווח תדרים #: ../gtk/parameters.ui.h:3 -msgid "Bandwidth control" -msgstr "בקרת רוחב פס" +msgid "default camera" +msgstr "מצלמה משתמטת" #: ../gtk/parameters.ui.h:4 -msgid "Codecs" -msgstr "קודקים" - -#: ../gtk/parameters.ui.h:5 -msgid "Default identity" -msgstr "זהות משתמטת" - -#: ../gtk/parameters.ui.h:6 -msgid "Language" -msgstr "שפה" - -#: ../gtk/parameters.ui.h:7 -msgid "Level" -msgstr "רמה" - -#: ../gtk/parameters.ui.h:8 -msgid "NAT and Firewall" -msgstr "‫NAT וחומת אש" - -#: ../gtk/parameters.ui.h:9 -msgid "Network protocol and ports" -msgstr "פרוטוקולי רשת עבודה ופורטים" - -#: ../gtk/parameters.ui.h:10 -msgid "Privacy" -msgstr "פרטיות" - -# חשבונות מתווכים -#: ../gtk/parameters.ui.h:11 -msgid "Proxy accounts" -msgstr "חשבונות Proxy" - -# מוביל -#: ../gtk/parameters.ui.h:12 -msgid "Transport" -msgstr "טרנספורט" - -#: ../gtk/parameters.ui.h:13 -msgid "Video" -msgstr "וידאו" - -# שיטה ניחוש -#: ../gtk/parameters.ui.h:14 -msgid "" -"Adaptive rate control is a technique to dynamically guess the available " -"bandwidth during a call." -msgstr "" -"בקרת קצב מסתגלת הינה טכניקה להשערה דינמית של רוחב הפס הזמין במהלך שיחה." - -#: ../gtk/parameters.ui.h:15 -msgid "ALSA special device (optional):" -msgstr "התקן ALSA מיוחד (רשות):" - -#: ../gtk/parameters.ui.h:16 -msgid "Add" -msgstr "הוסף" - -#: ../gtk/parameters.ui.h:17 -msgid "Audio RTP/UDP:" -msgstr "שמע RTP/UDP:" - -#: ../gtk/parameters.ui.h:18 -msgid "Audio codecs" -msgstr "קודקים של שמע" - -#: ../gtk/parameters.ui.h:19 -msgid "Behind NAT / Firewall (specify gateway IP below)" -msgstr "מאחורי NAT \\ חומת־אש (ציון כתובת שער (Gateway IP) למטה)" - -# שימוש ב־STUN -# utilize -#: ../gtk/parameters.ui.h:20 -msgid "Behind NAT / Firewall (use STUN to resolve)" -msgstr "מאחורי NAT \\ חומת־אש (ניצול STUN)" - -#: ../gtk/parameters.ui.h:22 msgid "CIF" msgstr "" -#: ../gtk/parameters.ui.h:23 -msgid "Capture device:" -msgstr "התקן לכידה:" +#: ../gtk/parameters.ui.h:5 +msgid "Audio codecs" +msgstr "קודקים של שמע" -#: ../gtk/parameters.ui.h:24 -msgid "Codecs" -msgstr "קודקים" +#: ../gtk/parameters.ui.h:6 +msgid "Video codecs" +msgstr "קודקים של וידאו" -#: ../gtk/parameters.ui.h:25 -msgid "Direct connection to the Internet" -msgstr "חיבור ישיר אל האינטרנט" +#: ../gtk/parameters.ui.h:8 +msgid "SIP (UDP)" +msgstr "" -#: ../gtk/parameters.ui.h:26 -msgid "Disable" -msgstr "נטרל" +#: ../gtk/parameters.ui.h:9 +msgid "SIP (TCP)" +msgstr "" -#: ../gtk/parameters.ui.h:27 -msgid "Done" -msgstr "סיום" +#: ../gtk/parameters.ui.h:10 +msgid "SIP (TLS)" +msgstr "" -# האם KiB means kibibyte? -# קי״ב (1024) אל מול ק״ב (1000) -#: ../gtk/parameters.ui.h:28 -msgid "Download speed limit in Kbit/sec:" -msgstr "מגבלת מהירות הורדה בקי״ב/שנ׳:" +#: ../gtk/parameters.ui.h:11 +msgid "Settings" +msgstr "הגדרות" -#: ../gtk/parameters.ui.h:29 -msgid "Edit" -msgstr "ערוך" +# שידור +#: ../gtk/parameters.ui.h:12 +msgid "Set Maximum Transmission Unit:" +msgstr "הגדר יחידת תמסורת מרבית:" -#: ../gtk/parameters.ui.h:30 -msgid "Enable" -msgstr "אפשר" +#: ../gtk/parameters.ui.h:13 +msgid "Send DTMFs as SIP info" +msgstr "שלח טזמ״תים (DTMFs) כמידע SIP" -#: ../gtk/parameters.ui.h:31 -msgid "Enable adaptive rate control" -msgstr "אפשר בקרת קצב מסתגלת" +#: ../gtk/parameters.ui.h:14 +msgid "Use IPv6 instead of IPv4" +msgstr "השתמש בפרוטוקול IPv6 במקום בפרוטוקול IPv4" -#: ../gtk/parameters.ui.h:32 -msgid "Enable echo cancellation" -msgstr "אפשר ביטול הד" +# מוביל +#: ../gtk/parameters.ui.h:15 +msgid "Transport" +msgstr "טרנספורט" -#: ../gtk/parameters.ui.h:33 -msgid "Erase all passwords" -msgstr "מחק סיסמאות" - -#: ../gtk/parameters.ui.h:34 -msgid "Manage SIP Accounts" -msgstr "ניהול חשבונות ‫SIP" - -#: ../gtk/parameters.ui.h:35 +#: ../gtk/parameters.ui.h:16 msgid "Media encryption type" msgstr "סוג הצפנת מדיה" -#: ../gtk/parameters.ui.h:36 -msgid "Multimedia settings" -msgstr "הגדרות מולטימדיה" +# מנהרה +#: ../gtk/parameters.ui.h:17 +msgid "Tunnel" +msgstr "" -#: ../gtk/parameters.ui.h:37 +#: ../gtk/parameters.ui.h:18 +msgid "Video RTP/UDP:" +msgstr "וידאו RTP/UDP:" + +#: ../gtk/parameters.ui.h:19 +msgid "Audio RTP/UDP:" +msgstr "שמע RTP/UDP:" + +#: ../gtk/parameters.ui.h:20 +msgid "DSCP fields" +msgstr "" + +#: ../gtk/parameters.ui.h:21 +msgid "Fixed" +msgstr "" + +#: ../gtk/parameters.ui.h:22 +msgid "Network protocol and ports" +msgstr "פרוטוקולי רשת עבודה ופורטים" + +#: ../gtk/parameters.ui.h:23 +msgid "Direct connection to the Internet" +msgstr "חיבור ישיר אל האינטרנט" + +#: ../gtk/parameters.ui.h:24 +msgid "Behind NAT / Firewall (specify gateway IP below)" +msgstr "מאחורי NAT \\ חומת־אש (ציון כתובת שער (Gateway IP) למטה)" + +#: ../gtk/parameters.ui.h:25 +msgid "Public IP address:" +msgstr "כתובת IP פומבית:" + +# שימוש ב־STUN +# utilize +#: ../gtk/parameters.ui.h:26 +msgid "Behind NAT / Firewall (use STUN to resolve)" +msgstr "מאחורי NAT \\ חומת־אש (ניצול STUN)" + +# שימוש ב־STUN +# utilize +#: ../gtk/parameters.ui.h:27 +#, fuzzy +msgid "Behind NAT / Firewall (use ICE)" +msgstr "מאחורי NAT \\ חומת־אש (ניצול STUN)" + +#: ../gtk/parameters.ui.h:28 +msgid "Stun server:" +msgstr "שרת STUN:" + +#: ../gtk/parameters.ui.h:29 +msgid "NAT and Firewall" +msgstr "‫NAT וחומת אש" + +#: ../gtk/parameters.ui.h:30 msgid "Network settings" msgstr "הגדרות רשת עבודה" -#: ../gtk/parameters.ui.h:38 +#: ../gtk/parameters.ui.h:31 +msgid "Ring sound:" +msgstr "צליל צלצול:" + +#: ../gtk/parameters.ui.h:32 +msgid "ALSA special device (optional):" +msgstr "התקן ALSA מיוחד (רשות):" + +#: ../gtk/parameters.ui.h:33 +msgid "Capture device:" +msgstr "התקן לכידה:" + +#: ../gtk/parameters.ui.h:34 +msgid "Ring device:" +msgstr "התקן צלצול:" + +#: ../gtk/parameters.ui.h:35 msgid "Playback device:" msgstr "התקן פס קול:" +#: ../gtk/parameters.ui.h:36 +msgid "Enable echo cancellation" +msgstr "אפשר ביטול הד" + +#: ../gtk/parameters.ui.h:37 +msgid "Audio" +msgstr "שמע" + +#: ../gtk/parameters.ui.h:38 +msgid "Video input device:" +msgstr "התקן קלט וידאו:" + # רצויה #: ../gtk/parameters.ui.h:39 msgid "Prefered video resolution:" msgstr "רזולוציית וידאו מועדפת:" #: ../gtk/parameters.ui.h:40 -msgid "Public IP address:" -msgstr "כתובת IP פומבית:" +msgid "Video" +msgstr "וידאו" #: ../gtk/parameters.ui.h:41 -msgid "" -"Register to FONICS\n" -"virtual network !" -msgstr "" -"רישום אל FONICS\n" -"רשת עבודה וירטואלית !" +msgid "Multimedia settings" +msgstr "הגדרות מולטימדיה" -#: ../gtk/parameters.ui.h:43 -msgid "Remove" -msgstr "הסר" - -#: ../gtk/parameters.ui.h:44 -msgid "Ring device:" -msgstr "התקן צלצול:" - -#: ../gtk/parameters.ui.h:45 -msgid "Ring sound:" -msgstr "צליל צלצול:" - -#: ../gtk/parameters.ui.h:46 -msgid "SIP (TCP)" -msgstr "" - -#: ../gtk/parameters.ui.h:47 -msgid "SIP (TLS)" -msgstr "" - -#: ../gtk/parameters.ui.h:48 -msgid "SIP (UDP)" -msgstr "" - -#: ../gtk/parameters.ui.h:49 -msgid "Send DTMFs as SIP info" -msgstr "שלח טזמ״תים (DTMFs) כמידע SIP" - -# שידור -#: ../gtk/parameters.ui.h:50 -msgid "Set Maximum Transmission Unit:" -msgstr "הגדר יחידת תמסורת מרבית:" - -#: ../gtk/parameters.ui.h:51 -msgid "Settings" -msgstr "הגדרות" - -#: ../gtk/parameters.ui.h:52 -msgid "Show advanced settings" -msgstr "הצג הגדרות מתקדמות" - -#: ../gtk/parameters.ui.h:53 -msgid "Stun server:" -msgstr "שרת STUN:" - -#: ../gtk/parameters.ui.h:54 +#: ../gtk/parameters.ui.h:42 msgid "This section defines your SIP address when not using a SIP account" msgstr "חלק זה מגדיר את כתובת ה־SIP כאשר אינך עושה שימוש בחשבון SIP" -# מנהרה -#: ../gtk/parameters.ui.h:55 -msgid "Tunnel" -msgstr "" - -# האם KiB means kibibyte? -#: ../gtk/parameters.ui.h:56 -msgid "Upload speed limit in Kbit/sec:" -msgstr "מגבלת מהירות העלאה בקי״ב/שנ׳:" - -#: ../gtk/parameters.ui.h:57 -msgid "Use IPv6 instead of IPv4" -msgstr "השתמש בפרוטוקול IPv6 במקום בפרוטוקול IPv4" - -#: ../gtk/parameters.ui.h:58 -msgid "User interface" -msgstr "ממשק משתמש" - -#: ../gtk/parameters.ui.h:59 -msgid "Video RTP/UDP:" -msgstr "וידאו RTP/UDP:" - -#: ../gtk/parameters.ui.h:60 -msgid "Video codecs" -msgstr "קודקים של וידאו" - -#: ../gtk/parameters.ui.h:61 -msgid "Video input device:" -msgstr "התקן קלט וידאו:" - -#: ../gtk/parameters.ui.h:62 -msgid "Wizard" -msgstr "אשף" - -#: ../gtk/parameters.ui.h:63 +#: ../gtk/parameters.ui.h:43 msgid "Your display name (eg: John Doe):" msgstr "שם התצוגה שלך (למשל: יורם יהודה):" -#: ../gtk/parameters.ui.h:64 -msgid "Your resulting SIP address:" -msgstr "כתובת SIP נובעת:" - -#: ../gtk/parameters.ui.h:65 +#: ../gtk/parameters.ui.h:44 msgid "Your username:" msgstr "שם המשתמש שלך:" +#: ../gtk/parameters.ui.h:45 +msgid "Your resulting SIP address:" +msgstr "כתובת SIP נובעת:" + +#: ../gtk/parameters.ui.h:46 +msgid "Default identity" +msgstr "זהות משתמטת" + +#: ../gtk/parameters.ui.h:47 +msgid "Wizard" +msgstr "אשף" + +#: ../gtk/parameters.ui.h:50 +msgid "Remove" +msgstr "הסר" + +# חשבונות מתווכים +#: ../gtk/parameters.ui.h:51 +msgid "Proxy accounts" +msgstr "חשבונות Proxy" + +#: ../gtk/parameters.ui.h:52 +msgid "Erase all passwords" +msgstr "מחק סיסמאות" + +#: ../gtk/parameters.ui.h:53 +msgid "Privacy" +msgstr "פרטיות" + +#: ../gtk/parameters.ui.h:54 +msgid "Manage SIP Accounts" +msgstr "ניהול חשבונות ‫SIP" + +#: ../gtk/parameters.ui.h:55 ../gtk/tunnel_config.ui.h:4 +msgid "Enable" +msgstr "אפשר" + +#: ../gtk/parameters.ui.h:56 ../gtk/tunnel_config.ui.h:5 +msgid "Disable" +msgstr "נטרל" + +#: ../gtk/parameters.ui.h:57 +msgid "Codecs" +msgstr "קודקים" + +# ללא הגבלה +#: ../gtk/parameters.ui.h:58 +msgid "0 stands for \"unlimited\"" +msgstr "0 מסמל \"בלי הגבלה\"" + +# האם KiB means kibibyte? +#: ../gtk/parameters.ui.h:59 +msgid "Upload speed limit in Kbit/sec:" +msgstr "מגבלת מהירות העלאה בקי״ב/שנ׳:" + +# האם KiB means kibibyte? +# קי״ב (1024) אל מול ק״ב (1000) +#: ../gtk/parameters.ui.h:60 +msgid "Download speed limit in Kbit/sec:" +msgstr "מגבלת מהירות הורדה בקי״ב/שנ׳:" + +#: ../gtk/parameters.ui.h:61 +msgid "Enable adaptive rate control" +msgstr "אפשר בקרת קצב מסתגלת" + +# שיטה ניחוש +#: ../gtk/parameters.ui.h:62 +msgid "" +"Adaptive rate control is a technique to dynamically guess the available " +"bandwidth during a call." +msgstr "" +"בקרת קצב מסתגלת הינה טכניקה להשערה דינמית של רוחב הפס הזמין במהלך שיחה." + +# פס רוחב +# טווח תדרים +#: ../gtk/parameters.ui.h:63 +msgid "Bandwidth control" +msgstr "בקרת רוחב פס" + +#: ../gtk/parameters.ui.h:64 +msgid "Codecs" +msgstr "קודקים" + +#: ../gtk/parameters.ui.h:65 +msgid "Language" +msgstr "שפה" + #: ../gtk/parameters.ui.h:66 -msgid "a sound card" -msgstr "כרטיס קול" +msgid "Show advanced settings" +msgstr "הצג הגדרות מתקדמות" #: ../gtk/parameters.ui.h:67 -msgid "default camera" -msgstr "מצלמה משתמטת" +msgid "Level" +msgstr "רמה" #: ../gtk/parameters.ui.h:68 -msgid "default soundcard" -msgstr "כרטיס קול משתמט" +msgid "User interface" +msgstr "ממשק משתמש" #: ../gtk/parameters.ui.h:69 -msgid "edit" -msgstr "עריכה" +msgid "Done" +msgstr "סיום" -# חיפוש מאן דהו #: ../gtk/buddylookup.ui.h:1 -msgid "Search somebody" -msgstr "חיפוש אחר מישהו" +msgid "Search contacts in directory" +msgstr "חיפוש אנשי קשר בתוך מדור" #: ../gtk/buddylookup.ui.h:2 msgid "Add to my list" msgstr "הוסף אל הרשימה שלי" +# חיפוש מאן דהו #: ../gtk/buddylookup.ui.h:3 -msgid "Search contacts in directory" -msgstr "חיפוש אנשי קשר בתוך מדור" +msgid "Search somebody" +msgstr "חיפוש אחר מישהו" #: ../gtk/waiting.ui.h:1 msgid "Linphone" @@ -1302,20 +1399,96 @@ msgstr "Linphone" msgid "Please wait" msgstr "נא להמתין" -#: ../coreapi/linphonecore.c:187 +#: ../gtk/dscp_settings.ui.h:1 +#, fuzzy +msgid "Dscp settings" +msgstr "הגדרות" + +#: ../gtk/dscp_settings.ui.h:2 +msgid "SIP" +msgstr "" + +#: ../gtk/dscp_settings.ui.h:3 +#, fuzzy +msgid "Audio RTP stream" +msgstr "שמע RTP/UDP:" + +#: ../gtk/dscp_settings.ui.h:4 +#, fuzzy +msgid "Video RTP stream" +msgstr "וידאו RTP/UDP:" + +#: ../gtk/dscp_settings.ui.h:5 +msgid "Set DSCP values (in hexadecimal)" +msgstr "" + +#: ../gtk/call_statistics.ui.h:1 +msgid "Call statistics" +msgstr "" + +#: ../gtk/call_statistics.ui.h:2 +#, fuzzy +msgid "Audio codec" +msgstr "קודקים של שמע" + +#: ../gtk/call_statistics.ui.h:3 +#, fuzzy +msgid "Video codec" +msgstr "קודקים של וידאו" + +#: ../gtk/call_statistics.ui.h:4 +msgid "Audio IP bandwidth usage" +msgstr "" + +#: ../gtk/call_statistics.ui.h:5 +#, fuzzy +msgid "Media connectivity" +msgstr "סוג הצפנת מדיה" + +#: ../gtk/call_statistics.ui.h:6 +msgid "Video IP bandwidth usage" +msgstr "" + +#: ../gtk/call_statistics.ui.h:7 +#, fuzzy +msgid "Call statistics and information" +msgstr "מידע איש קשר" + +#: ../gtk/tunnel_config.ui.h:1 +#, fuzzy +msgid "Configure VoIP tunnel" +msgstr "הגדרת חשבון ‫SIP" + +#: ../gtk/tunnel_config.ui.h:2 +msgid "Host" +msgstr "" + +#: ../gtk/tunnel_config.ui.h:3 +msgid "Port" +msgstr "" + +#: ../gtk/tunnel_config.ui.h:6 +msgid "Configure tunnel" +msgstr "" + +#: ../gtk/tunnel_config.ui.h:9 +msgid "Configure http proxy (optional)" +msgstr "" + +#: ../coreapi/linphonecore.c:232 msgid "aborted" msgstr "ננטשה" -#: ../coreapi/linphonecore.c:190 +#: ../coreapi/linphonecore.c:235 msgid "completed" msgstr "הסתיימה" -#: ../coreapi/linphonecore.c:193 +#: ../coreapi/linphonecore.c:238 msgid "missed" msgstr "הוחמצה" # needs to be tested -#: ../coreapi/linphonecore.c:198 +#: ../coreapi/linphonecore.c:243 #, c-format msgid "" "%s at %s\n" @@ -1330,24 +1503,24 @@ msgstr "" "מצב: %s\n" "משך: %i mn %i sec\n" -#: ../coreapi/linphonecore.c:199 +#: ../coreapi/linphonecore.c:244 msgid "Outgoing call" msgstr "קריאה יוצאת" -#: ../coreapi/linphonecore.c:1105 +#: ../coreapi/linphonecore.c:1226 msgid "Ready" msgstr "מוכן" -#: ../coreapi/linphonecore.c:1848 +#: ../coreapi/linphonecore.c:2074 msgid "Looking for telephone number destination..." msgstr "מחפש כעת עבור יעד מספר טלפון..." -#: ../coreapi/linphonecore.c:1851 +#: ../coreapi/linphonecore.c:2077 msgid "Could not resolve this number." msgstr "לא ניתן לפתור את מספר זה." # לרוב -#: ../coreapi/linphonecore.c:1895 +#: ../coreapi/linphonecore.c:2121 msgid "" "Could not parse given sip address. A sip url usually looks like sip:" "user@domain" @@ -1355,41 +1528,53 @@ msgstr "" "לא ניתן היה לפענח את הכתובת שניתנה. כתובת sip בדרך כלל נראית כך: sip:" "user@domain" -#: ../coreapi/linphonecore.c:2052 +#: ../coreapi/linphonecore.c:2312 msgid "Contacting" msgstr "מתקשר כעת" -#: ../coreapi/linphonecore.c:2059 +#: ../coreapi/linphonecore.c:2319 msgid "Could not call" msgstr "לא ניתן להתקשר" # מספר השיחות המקבילות המרבי -#: ../coreapi/linphonecore.c:2167 +#: ../coreapi/linphonecore.c:2429 msgid "Sorry, we have reached the maximum number of simultaneous calls" msgstr "הגענו אל המספר המרבי של שיחות מקבילות, עמך הסליחה" +#: ../coreapi/linphonecore.c:2573 +msgid "is contacting you" +msgstr "מתקשר/ת אליך" + +#: ../coreapi/linphonecore.c:2574 +msgid " and asked autoanswer." +msgstr " ומבקש/ת מענה אוטומטי." + +#: ../coreapi/linphonecore.c:2574 +msgid "." +msgstr "" + # פרמטרי קריאה -#: ../coreapi/linphonecore.c:2297 +#: ../coreapi/linphonecore.c:2636 msgid "Modifying call parameters..." msgstr "מתאים כעת פרמטרים של שיחה..." -#: ../coreapi/linphonecore.c:2393 +#: ../coreapi/linphonecore.c:2908 msgid "Connected." msgstr "מקושר." -#: ../coreapi/linphonecore.c:2416 +#: ../coreapi/linphonecore.c:2931 msgid "Call aborted" msgstr "קריאה בוטלה" -#: ../coreapi/linphonecore.c:2557 +#: ../coreapi/linphonecore.c:3102 msgid "Could not pause the call" msgstr "לא ניתן להשהות את השיחה" -#: ../coreapi/linphonecore.c:2562 +#: ../coreapi/linphonecore.c:3107 msgid "Pausing the current call..." msgstr "משהה כעת שיחה נוכחית..." -#: ../coreapi/misc.c:147 +#: ../coreapi/misc.c:148 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the pcm oss emulation module\n" @@ -1401,7 +1586,7 @@ msgstr "" "נעדר ולינפון זקוק לו. נא להריץ את הפקודה\n" "‫'modprobe snd-pcm-oss' כמשתמש שורש (משתמש על) כדי להטעינו." -#: ../coreapi/misc.c:150 +#: ../coreapi/misc.c:151 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the mixer oss emulation module\n" @@ -1414,10 +1599,14 @@ msgstr "" "‫'modprobe snd-mixer-oss' כמשתמש שורש (משתמש על) כדי להטעינו." # במהלך (או) באמצע חיפוש... -#: ../coreapi/misc.c:479 +#: ../coreapi/misc.c:496 msgid "Stun lookup in progress..." msgstr "בדיקת STUN מצויה כעת בעיצומה..." +#: ../coreapi/misc.c:630 +msgid "ICE local candidates gathering in progress..." +msgstr "" + #: ../coreapi/friend.c:33 msgid "Online" msgstr "מקוון" @@ -1471,7 +1660,7 @@ msgstr "בהמתנה" msgid "Unknown-bug" msgstr "תקלה לא ידועה" -#: ../coreapi/proxy.c:196 +#: ../coreapi/proxy.c:204 msgid "" "The sip proxy address you entered is invalid, it must start with \"sip:\" " "followed by a hostname." @@ -1479,7 +1668,7 @@ msgstr "" "כתובת sip proxy שהוזנה הינה שגויה, זו צריכה להתחיל עם‭\"sip:\" ‬ לאחר שם מארח." # כמו למשל -#: ../coreapi/proxy.c:202 +#: ../coreapi/proxy.c:210 msgid "" "The sip identity you entered is invalid.\n" "It should look like sip:username@proxydomain, such as sip:alice@example.net" @@ -1488,52 +1677,40 @@ msgstr "" "זו צריכה להיראות כמו sip:username@proxydomain, למשל sip:alice@example.net" # בשם כ־ -#: ../coreapi/proxy.c:702 +#: ../coreapi/proxy.c:1053 #, c-format msgid "Could not login as %s" msgstr "לא ניתן להתחבר בזהות %s" -#: ../coreapi/callbacks.c:206 -msgid "is contacting you" -msgstr "מתקשר/ת אליך" - -#: ../coreapi/callbacks.c:207 -msgid " and asked autoanswer." -msgstr " ומבקש/ת מענה אוטומטי." - -#: ../coreapi/callbacks.c:207 -msgid "." -msgstr "" - -#: ../coreapi/callbacks.c:266 +#: ../coreapi/callbacks.c:276 msgid "Remote ringing." msgstr "צלצול מרוחק." -#: ../coreapi/callbacks.c:282 +#: ../coreapi/callbacks.c:296 msgid "Remote ringing..." msgstr "צלצול מרוחק..." # A SIP state -#: ../coreapi/callbacks.c:293 +#: ../coreapi/callbacks.c:307 msgid "Early media." msgstr "מדיה מוקדמת." -#: ../coreapi/callbacks.c:331 +#: ../coreapi/callbacks.c:352 #, c-format msgid "Call with %s is paused." msgstr "שיחה עם %s מושהית." -#: ../coreapi/callbacks.c:342 +#: ../coreapi/callbacks.c:365 #, c-format msgid "Call answered by %s - on hold." msgstr "קריאה נענתה על ידי %s - בהמתנה." # renewed -#: ../coreapi/callbacks.c:357 +#: ../coreapi/callbacks.c:376 msgid "Call resumed." msgstr "קריאה חודשה." -#: ../coreapi/callbacks.c:362 +#: ../coreapi/callbacks.c:381 #, c-format msgid "Call answered by %s." msgstr "קריאה נענתה על ידי %s." @@ -1541,103 +1718,146 @@ msgstr "קריאה נענתה על ידי %s." # לא תואם # אי תאימות # אי התאמה -#: ../coreapi/callbacks.c:377 +#: ../coreapi/callbacks.c:396 msgid "Incompatible, check codecs..." msgstr "חוסר תאימות, נא לבדוק קודקים..." -#: ../coreapi/callbacks.c:432 -msgid "We are being paused..." -msgstr "אנחנו כעת מושהים..." - -#: ../coreapi/callbacks.c:436 -msgid "We have been resumed..." +#: ../coreapi/callbacks.c:437 +#, fuzzy +msgid "We have been resumed." msgstr "חזרנו..." +#: ../coreapi/callbacks.c:446 +msgid "We are paused by other party." +msgstr "" + # באופן מרוחק -#: ../coreapi/callbacks.c:441 -msgid "Call has been updated by remote..." +#: ../coreapi/callbacks.c:452 +#, fuzzy +msgid "Call is updated by remote." msgstr "שיחה עודכנה מרחוק..." -#: ../coreapi/callbacks.c:473 +#: ../coreapi/callbacks.c:521 msgid "Call terminated." msgstr "קריאה הסתיימה." -#: ../coreapi/callbacks.c:480 +#: ../coreapi/callbacks.c:528 msgid "User is busy." msgstr "משתמש עסוק כעת." -#: ../coreapi/callbacks.c:481 +#: ../coreapi/callbacks.c:529 msgid "User is temporarily unavailable." msgstr "משתמש לא זמין זמנית." #. char *retrymsg=_("%s. Retry after %i minute(s)."); -#: ../coreapi/callbacks.c:483 +#: ../coreapi/callbacks.c:531 msgid "User does not want to be disturbed." msgstr "משתמש לא מעוניין שיפריעו לו." -#: ../coreapi/callbacks.c:484 +#: ../coreapi/callbacks.c:532 msgid "Call declined." msgstr "קריאה סורבה." -#: ../coreapi/callbacks.c:496 +#: ../coreapi/callbacks.c:544 msgid "No response." msgstr "אין תגובה." -#: ../coreapi/callbacks.c:500 +#: ../coreapi/callbacks.c:548 msgid "Protocol error." msgstr "שגיאת פרוטוקול." -#: ../coreapi/callbacks.c:516 +#: ../coreapi/callbacks.c:564 msgid "Redirected" msgstr "מכוון מחדש" -#: ../coreapi/callbacks.c:550 -msgid "No common codecs" -msgstr "אין קודקים משותפים" +# לא תואם +# אי תאימות +# אי התאמה +#: ../coreapi/callbacks.c:600 +#, fuzzy +msgid "Incompatible media parameters." +msgstr "חוסר תאימות, נא לבדוק קודקים..." -#: ../coreapi/callbacks.c:556 +#: ../coreapi/callbacks.c:606 msgid "Call failed." msgstr "קריאה נכשלה." # הרשמה אצל %s הושלמה בהצלחה. -#: ../coreapi/callbacks.c:633 +#: ../coreapi/callbacks.c:701 #, c-format msgid "Registration on %s successful." msgstr "רישום אצל %s הושלם בהצלחה." -#: ../coreapi/callbacks.c:634 +#: ../coreapi/callbacks.c:702 #, c-format msgid "Unregistration on %s done." msgstr "אי רישום אצל %s סוים." # Pas de réponse # no response in defined time -#: ../coreapi/callbacks.c:650 +#: ../coreapi/callbacks.c:722 msgid "no response timeout" msgstr "אין היענות תוך זמן מוגדר" -#: ../coreapi/callbacks.c:653 +#: ../coreapi/callbacks.c:725 #, c-format msgid "Registration on %s failed: %s" msgstr "רישום אצל %s נכשל: %s" -#: ../coreapi/sal_eXosip2.c:870 ../coreapi/sal_eXosip2.c:872 -msgid "Authentication failure" -msgstr "כשל באימות" - -#: ../coreapi/linphonecall.c:128 +#: ../coreapi/linphonecall.c:129 #, c-format msgid "Authentication token is %s" msgstr "אות האימות הינה %s" # האם כדאי לחקות את הטלפונים הניידים? שיחות של נענו -#: ../coreapi/linphonecall.c:1573 +#: ../coreapi/linphonecall.c:2124 #, c-format msgid "You have missed %i call." msgid_plural "You have missed %i calls." msgstr[0] "החמצת שיחה %i." msgstr[1] "החמצת %i שיחות." +# שוחחו +#~ msgid "Chat with %s" +#~ msgstr "שיחה עם %s" + +#~ msgid "Contacts" +#~ msgstr "אנשי קשר" + +#~ msgid "Enable video" +#~ msgstr "הפעל וידאו" + +# הזנת +#~ msgid "Enter username, phone number, or full sip address" +#~ msgstr "נא להזין שם משתמש, מספר טלפון, או כתובת sip מלאה" + +# עיון +#~ msgid "Lookup:" +#~ msgstr "חיפוש:" + +# במסגרת +#~ msgid "in" +#~ msgstr "בקרב" + +#~ msgid "" +#~ "Register to FONICS\n" +#~ "virtual network !" +#~ msgstr "" +#~ "רישום אל FONICS\n" +#~ "רשת עבודה וירטואלית !" + +#~ msgid "edit" +#~ msgstr "עריכה" + +#~ msgid "We are being paused..." +#~ msgstr "אנחנו כעת מושהים..." + +#~ msgid "No common codecs" +#~ msgstr "אין קודקים משותפים" + +#~ msgid "Authentication failure" +#~ msgstr "כשל באימות" + #~ msgid "Please choose a username:" #~ msgstr "נא לבחור שם משתמש:" @@ -1675,12 +1895,6 @@ msgstr[1] "החמצת %i שיחות." #~ msgid "Now ready !" #~ msgstr "מוכן כעת !" -#~ msgid "Call" -#~ msgstr "קריאה" - -#~ msgid "Not found" -#~ msgstr "לא נמצא" - #~ msgid "" #~ "Pause all calls\n" #~ "and answer" diff --git a/po/hu.po b/po/hu.po index c654c370d..0367b7d16 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: 2011-12-05 12:41+0100\n" +"POT-Creation-Date: 2013-01-08 10:35+0100\n" "PO-Revision-Date: 2007-12-14 11:12+0100\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" @@ -16,32 +16,54 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../gtk/calllogs.c:71 +#: ../gtk/calllogs.c:82 +#, fuzzy +msgid "Aborted" +msgstr "megszakítva" + +#: ../gtk/calllogs.c:85 +#, fuzzy +msgid "Missed" +msgstr "elhibázva" + +#: ../gtk/calllogs.c:88 +#, fuzzy +msgid "Declined" +msgstr "line" + +#: ../gtk/calllogs.c:94 #, c-format msgid "%i minute" msgid_plural "%i minutes" msgstr[0] "" msgstr[1] "" -#: ../gtk/calllogs.c:74 +#: ../gtk/calllogs.c:97 #, c-format msgid "%i second" msgid_plural "%i seconds" msgstr[0] "" msgstr[1] "" -#: ../gtk/calllogs.c:77 +#: ../gtk/calllogs.c:100 #, c-format msgid "" "%s\t%s\tQuality: %s\n" "%s\t%s %s\t" msgstr "" -#: ../gtk/calllogs.c:79 +#: ../gtk/calllogs.c:102 msgid "n/a" msgstr "" -#: ../gtk/conference.c:33 ../gtk/incall_view.c:183 +#: ../gtk/calllogs.c:105 +#, c-format +msgid "" +"%s\t%s\t\n" +"%s\t%s" +msgstr "" + +#: ../gtk/conference.c:33 ../gtk/main.ui.h:13 msgid "Conference" msgstr "" @@ -54,43 +76,42 @@ msgstr "" msgid "Couldn't find pixmap file: %s" msgstr "Nemtalálható a pixmap fájl: %s" -#: ../gtk/chat.c:27 -#, c-format -msgid "Chat with %s" -msgstr "Chat-elés %s -el" - -#: ../gtk/main.c:83 +#: ../gtk/main.c:89 msgid "log to stdout some debug information while running." msgstr "" -#: ../gtk/main.c:90 +#: ../gtk/main.c:96 msgid "path to a file to write logs into." msgstr "" -#: ../gtk/main.c:97 +#: ../gtk/main.c:103 +msgid "Start linphone with video disabled." +msgstr "" + +#: ../gtk/main.c:110 msgid "Start only in the system tray, do not show the main interface." msgstr "" -#: ../gtk/main.c:104 +#: ../gtk/main.c:117 msgid "address to call right now" msgstr "" -#: ../gtk/main.c:111 +#: ../gtk/main.c:124 msgid "if set automatically answer incoming calls" msgstr "" -#: ../gtk/main.c:118 +#: ../gtk/main.c:131 msgid "" "Specifiy a working directory (should be the base of the installation, eg: c:" "\\Program Files\\Linphone)" msgstr "" -#: ../gtk/main.c:464 +#: ../gtk/main.c:498 #, fuzzy, c-format msgid "Call with %s" msgstr "Chat-elés %s -el" -#: ../gtk/main.c:815 +#: ../gtk/main.c:871 #, c-format msgid "" "%s would like to add you to his contact list.\n" @@ -99,226 +120,245 @@ msgid "" "If you answer no, this person will be temporarily blacklisted." msgstr "" -#: ../gtk/main.c:893 +#: ../gtk/main.c:948 #, c-format msgid "" "Please enter your password for username %s\n" " at domain %s:" msgstr "" -#: ../gtk/main.c:993 +#: ../gtk/main.c:1051 #, fuzzy msgid "Call error" msgstr "Linphone - Híváselőzmények" -#: ../gtk/main.c:996 ../coreapi/linphonecore.c:2406 +#: ../gtk/main.c:1054 ../coreapi/linphonecore.c:2949 msgid "Call ended" msgstr "Hívás vége" -#: ../gtk/main.c:999 ../coreapi/linphonecore.c:199 +#: ../gtk/main.c:1057 ../coreapi/linphonecore.c:244 msgid "Incoming call" msgstr "Beérkező hívás" -#: ../gtk/main.c:1001 ../gtk/incall_view.c:292 ../gtk/main.ui.h:20 +#: ../gtk/main.c:1059 ../gtk/incall_view.c:451 ../gtk/main.ui.h:6 msgid "Answer" msgstr "" -#: ../gtk/main.c:1003 ../gtk/main.ui.h:29 +#: ../gtk/main.c:1061 ../gtk/main.ui.h:7 #, fuzzy msgid "Decline" msgstr "line" -#: ../gtk/main.c:1009 +#: ../gtk/main.c:1067 #, fuzzy msgid "Call paused" msgstr "megszakítva" -#: ../gtk/main.c:1009 +#: ../gtk/main.c:1067 #, c-format msgid "by %s" msgstr "" -#: ../gtk/main.c:1165 +#: ../gtk/main.c:1116 +#, c-format +msgid "%s proposed to start video. Do you accept ?" +msgstr "" + +#: ../gtk/main.c:1278 msgid "Website link" msgstr "" -#: ../gtk/main.c:1205 +#: ../gtk/main.c:1318 msgid "Linphone - a video internet phone" msgstr "" -#: ../gtk/main.c:1295 +#: ../gtk/main.c:1410 #, c-format msgid "%s (Default)" msgstr "" -#: ../gtk/main.c:1566 ../coreapi/callbacks.c:700 +#: ../gtk/main.c:1714 ../coreapi/callbacks.c:774 #, c-format msgid "We are transferred to %s" msgstr "" -#: ../gtk/main.c:1576 +#: ../gtk/main.c:1724 msgid "" "No sound cards have been detected on this computer.\n" "You won't be able to send or receive audio calls." msgstr "" -#: ../gtk/main.c:1663 +#: ../gtk/main.c:1833 msgid "A free SIP video-phone" msgstr "Egy ingyenes SIP video-telefon" -#: ../gtk/friendlist.c:203 +#: ../gtk/friendlist.c:335 #, fuzzy msgid "Add to addressbook" msgstr "Címjegyzék" -#: ../gtk/friendlist.c:258 ../gtk/propertybox.c:296 ../gtk/contact.ui.h:3 -msgid "Name" -msgstr "Név" - -#: ../gtk/friendlist.c:271 +#: ../gtk/friendlist.c:509 msgid "Presence status" msgstr "Jelenlét státusz" -#: ../gtk/friendlist.c:308 +#: ../gtk/friendlist.c:526 ../gtk/propertybox.c:362 ../gtk/contact.ui.h:1 +msgid "Name" +msgstr "Név" + +#: ../gtk/friendlist.c:538 +#, fuzzy +msgid "Call" +msgstr "Hivás előzmények" + +#: ../gtk/friendlist.c:543 +#, fuzzy +msgid "Chat" +msgstr "Chat szoba" + +#: ../gtk/friendlist.c:573 #, c-format msgid "Search in %s directory" msgstr "" -#: ../gtk/friendlist.c:568 +#: ../gtk/friendlist.c:730 msgid "Invalid sip contact !" msgstr "" -#: ../gtk/friendlist.c:613 +#: ../gtk/friendlist.c:775 #, fuzzy, c-format msgid "Call %s" msgstr "Hivás előzmények" -#: ../gtk/friendlist.c:614 +#: ../gtk/friendlist.c:776 #, c-format msgid "Send text to %s" msgstr "" -#: ../gtk/friendlist.c:615 +#: ../gtk/friendlist.c:777 #, fuzzy, c-format msgid "Edit contact '%s'" msgstr "Kapcsolatinformációk szerkesztése" -#: ../gtk/friendlist.c:616 +#: ../gtk/friendlist.c:778 #, c-format msgid "Delete contact '%s'" msgstr "" -#: ../gtk/friendlist.c:658 +#: ../gtk/friendlist.c:820 #, c-format msgid "Add new contact from %s directory" msgstr "" -#: ../gtk/propertybox.c:302 +#: ../gtk/propertybox.c:368 msgid "Rate (Hz)" msgstr "Érték (Hz)" -#: ../gtk/propertybox.c:308 +#: ../gtk/propertybox.c:374 msgid "Status" msgstr "Állapot" -#: ../gtk/propertybox.c:314 +#: ../gtk/propertybox.c:380 msgid "Min bitrate (kbit/s)" msgstr "Min bitrate (kbit/s)" -#: ../gtk/propertybox.c:321 +#: ../gtk/propertybox.c:387 msgid "Parameters" msgstr "Paraméterek" -#: ../gtk/propertybox.c:364 ../gtk/propertybox.c:507 +#: ../gtk/propertybox.c:430 ../gtk/propertybox.c:573 msgid "Enabled" msgstr "Engedélyezve" -#: ../gtk/propertybox.c:366 ../gtk/propertybox.c:507 +#: ../gtk/propertybox.c:432 ../gtk/propertybox.c:573 msgid "Disabled" msgstr "Tiltva" -#: ../gtk/propertybox.c:553 +#: ../gtk/propertybox.c:619 msgid "Account" msgstr "Hozzáférés" -#: ../gtk/propertybox.c:693 +#: ../gtk/propertybox.c:759 msgid "English" msgstr "" -#: ../gtk/propertybox.c:694 +#: ../gtk/propertybox.c:760 msgid "French" msgstr "" -#: ../gtk/propertybox.c:695 +#: ../gtk/propertybox.c:761 msgid "Swedish" msgstr "" -#: ../gtk/propertybox.c:696 +#: ../gtk/propertybox.c:762 msgid "Italian" msgstr "" -#: ../gtk/propertybox.c:697 +#: ../gtk/propertybox.c:763 msgid "Spanish" msgstr "" -#: ../gtk/propertybox.c:698 +#: ../gtk/propertybox.c:764 msgid "Brazilian Portugese" msgstr "" -#: ../gtk/propertybox.c:699 +#: ../gtk/propertybox.c:765 msgid "Polish" msgstr "" -#: ../gtk/propertybox.c:700 +#: ../gtk/propertybox.c:766 msgid "German" msgstr "" -#: ../gtk/propertybox.c:701 +#: ../gtk/propertybox.c:767 msgid "Russian" msgstr "" -#: ../gtk/propertybox.c:702 +#: ../gtk/propertybox.c:768 msgid "Japanese" msgstr "" -#: ../gtk/propertybox.c:703 +#: ../gtk/propertybox.c:769 msgid "Dutch" msgstr "" -#: ../gtk/propertybox.c:704 +#: ../gtk/propertybox.c:770 msgid "Hungarian" msgstr "" -#: ../gtk/propertybox.c:705 +#: ../gtk/propertybox.c:771 msgid "Czech" msgstr "" -#: ../gtk/propertybox.c:706 +#: ../gtk/propertybox.c:772 msgid "Chinese" msgstr "" -#: ../gtk/propertybox.c:707 +#: ../gtk/propertybox.c:773 msgid "Traditional Chinese" msgstr "" -#: ../gtk/propertybox.c:708 +#: ../gtk/propertybox.c:774 msgid "Norwegian" msgstr "" -#: ../gtk/propertybox.c:765 +#: ../gtk/propertybox.c:775 +msgid "Hebrew" +msgstr "" + +#: ../gtk/propertybox.c:842 msgid "" "You need to restart linphone for the new language selection to take effect." msgstr "" -#: ../gtk/propertybox.c:835 +#: ../gtk/propertybox.c:912 msgid "None" msgstr "Nincs" -#: ../gtk/propertybox.c:839 +#: ../gtk/propertybox.c:916 msgid "SRTP" msgstr "" -#: ../gtk/propertybox.c:845 +#: ../gtk/propertybox.c:922 msgid "ZRTP" msgstr "" @@ -362,182 +402,279 @@ msgid_plural "Found %i contacts" msgstr[0] "" msgstr[1] "" -#: ../gtk/setupwizard.c:25 +#: ../gtk/setupwizard.c:33 msgid "" "Welcome !\n" "This assistant will help you to use a SIP account for your calls." msgstr "" -#: ../gtk/setupwizard.c:34 -msgid "Create an account by choosing a username" +#: ../gtk/setupwizard.c:42 +msgid "Create an account on linphone.org" msgstr "" -#: ../gtk/setupwizard.c:35 -msgid "I have already an account and just want to use it" +#: ../gtk/setupwizard.c:43 +msgid "I have already a linphone.org account and I just want to use it" msgstr "" -#: ../gtk/setupwizard.c:53 -msgid "Please choose a username:" +#: ../gtk/setupwizard.c:44 +msgid "I have already a sip account and I just want to use it" msgstr "" -#: ../gtk/setupwizard.c:54 +#: ../gtk/setupwizard.c:84 +msgid "Enter your linphone.org username" +msgstr "" + +#: ../gtk/setupwizard.c:91 #, fuzzy msgid "Username:" msgstr "felhasználónév:" -#: ../gtk/setupwizard.c:92 -#, c-format -msgid "Checking if '%s' is available..." +#: ../gtk/setupwizard.c:93 ../gtk/password.ui.h:4 +#, fuzzy +msgid "Password:" +msgstr "jelszó:" + +#: ../gtk/setupwizard.c:113 +msgid "Enter your account informations" msgstr "" -#: ../gtk/setupwizard.c:97 ../gtk/setupwizard.c:164 -msgid "Please wait..." +#: ../gtk/setupwizard.c:120 +#, fuzzy +msgid "Username*" +msgstr "felhasználónév:" + +#: ../gtk/setupwizard.c:121 +#, fuzzy +msgid "Password*" +msgstr "jelszó:" + +#: ../gtk/setupwizard.c:124 +msgid "Domain*" msgstr "" -#: ../gtk/setupwizard.c:101 -msgid "Sorry this username already exists. Please try a new one." +#: ../gtk/setupwizard.c:125 +msgid "Proxy" msgstr "" -#: ../gtk/setupwizard.c:103 ../gtk/setupwizard.c:168 -msgid "Ok !" +#: ../gtk/setupwizard.c:297 +msgid "(*) Required fields" msgstr "" -#: ../gtk/setupwizard.c:106 ../gtk/setupwizard.c:171 -msgid "Communication problem, please try again later." +#: ../gtk/setupwizard.c:298 +#, fuzzy +msgid "Username: (*)" +msgstr "felhasználónév:" + +#: ../gtk/setupwizard.c:300 +#, fuzzy +msgid "Password: (*)" +msgstr "jelszó:" + +#: ../gtk/setupwizard.c:302 +msgid "Email: (*)" msgstr "" -#: ../gtk/setupwizard.c:134 +#: ../gtk/setupwizard.c:304 +msgid "Confirm your password: (*)" +msgstr "" + +#: ../gtk/setupwizard.c:368 +msgid "" +"Error, account not validated, username already used or server unreachable.\n" +"Please go back and try again." +msgstr "" + +#: ../gtk/setupwizard.c:379 msgid "Thank you. Your account is now configured and ready for use." msgstr "" -#: ../gtk/setupwizard.c:228 +#: ../gtk/setupwizard.c:387 +msgid "" +"Please validate your account by clicking on the link we just sent you by " +"email.\n" +"Then come back here and press Next button." +msgstr "" + +#: ../gtk/setupwizard.c:554 msgid "Welcome to the account setup assistant" msgstr "" -#: ../gtk/setupwizard.c:232 +#: ../gtk/setupwizard.c:559 msgid "Account setup assistant" msgstr "" -#: ../gtk/setupwizard.c:236 -#, fuzzy -msgid "Choosing a username" -msgstr "felhasználónév:" - -#: ../gtk/setupwizard.c:240 -msgid "Verifying" +#: ../gtk/setupwizard.c:565 +msgid "Configure your account (step 1/1)" msgstr "" -#: ../gtk/setupwizard.c:244 -#, fuzzy -msgid "Confirmation" -msgstr "Információk" - -#: ../gtk/setupwizard.c:249 -msgid "Creating your account" +#: ../gtk/setupwizard.c:570 +msgid "Enter your sip username (step 1/1)" msgstr "" -#: ../gtk/setupwizard.c:253 -msgid "Now ready !" +#: ../gtk/setupwizard.c:574 +msgid "Enter account information (step 1/2)" msgstr "" -#: ../gtk/incall_view.c:69 +#: ../gtk/setupwizard.c:583 +msgid "Validation (step 2/2)" +msgstr "" + +#: ../gtk/setupwizard.c:588 +msgid "Error" +msgstr "" + +#: ../gtk/setupwizard.c:592 +msgid "Terminating" +msgstr "" + +#: ../gtk/incall_view.c:69 ../gtk/incall_view.c:90 #, fuzzy, c-format msgid "Call #%i" msgstr "Hivás előzmények" -#: ../gtk/incall_view.c:127 +#: ../gtk/incall_view.c:150 #, c-format msgid "Transfer to call #%i with %s" msgstr "" -#: ../gtk/incall_view.c:155 -msgid "Transfer" +#: ../gtk/incall_view.c:209 ../gtk/incall_view.c:212 +msgid "Not used" msgstr "" -#: ../gtk/incall_view.c:271 +#: ../gtk/incall_view.c:219 +msgid "ICE not activated" +msgstr "" + +#: ../gtk/incall_view.c:221 +#, fuzzy +msgid "ICE failed" +msgstr "Hívás elutasítva" + +#: ../gtk/incall_view.c:223 +msgid "ICE in progress" +msgstr "" + +#: ../gtk/incall_view.c:225 +msgid "Going through one or more NATs" +msgstr "" + +#: ../gtk/incall_view.c:227 +#, fuzzy +msgid "Direct" +msgstr "Átirányítva idw %s..." + +#: ../gtk/incall_view.c:229 +msgid "Through a relay server" +msgstr "" + +#: ../gtk/incall_view.c:238 ../gtk/incall_view.c:242 +#, c-format +msgid "" +"download: %f\n" +"upload: %f (kbit/s)" +msgstr "" + +#: ../gtk/incall_view.c:341 ../gtk/main.ui.h:12 +msgid "Hang up" +msgstr "" + +#: ../gtk/incall_view.c:430 #, fuzzy msgid "Calling..." msgstr "Kapcsolatilista" -#: ../gtk/incall_view.c:274 ../gtk/incall_view.c:482 +#: ../gtk/incall_view.c:433 ../gtk/incall_view.c:646 msgid "00::00::00" msgstr "" -#: ../gtk/incall_view.c:285 +#: ../gtk/incall_view.c:444 #, fuzzy msgid "Incoming call" msgstr "Beérkező hívás" -#: ../gtk/incall_view.c:322 +#: ../gtk/incall_view.c:481 msgid "good" msgstr "" -#: ../gtk/incall_view.c:324 +#: ../gtk/incall_view.c:483 msgid "average" msgstr "" -#: ../gtk/incall_view.c:326 +#: ../gtk/incall_view.c:485 msgid "poor" msgstr "" -#: ../gtk/incall_view.c:328 +#: ../gtk/incall_view.c:487 msgid "very poor" msgstr "" -#: ../gtk/incall_view.c:330 +#: ../gtk/incall_view.c:489 msgid "too bad" msgstr "" -#: ../gtk/incall_view.c:331 ../gtk/incall_view.c:347 +#: ../gtk/incall_view.c:490 ../gtk/incall_view.c:506 msgid "unavailable" msgstr "" -#: ../gtk/incall_view.c:447 +#: ../gtk/incall_view.c:605 msgid "Secured by SRTP" msgstr "" -#: ../gtk/incall_view.c:453 +#: ../gtk/incall_view.c:611 #, c-format msgid "Secured by ZRTP - [auth token: %s]" msgstr "" -#: ../gtk/incall_view.c:459 +#: ../gtk/incall_view.c:617 msgid "Set unverified" msgstr "" -#: ../gtk/incall_view.c:459 ../gtk/main.ui.h:49 +#: ../gtk/incall_view.c:617 ../gtk/main.ui.h:5 msgid "Set verified" msgstr "" -#: ../gtk/incall_view.c:480 +#: ../gtk/incall_view.c:641 msgid "In conference" msgstr "" -#: ../gtk/incall_view.c:480 +#: ../gtk/incall_view.c:641 #, fuzzy msgid "In call" msgstr "Kapcsolatilista" -#: ../gtk/incall_view.c:499 +#: ../gtk/incall_view.c:669 #, fuzzy msgid "Paused call" msgstr "Kapcsolatilista" -#: ../gtk/incall_view.c:511 +#: ../gtk/incall_view.c:682 #, c-format msgid "%02i::%02i::%02i" msgstr "" -#: ../gtk/incall_view.c:527 +#: ../gtk/incall_view.c:699 #, fuzzy msgid "Call ended." msgstr "Hívás vége" -#: ../gtk/incall_view.c:584 +#: ../gtk/incall_view.c:731 +msgid "Transfer in progress" +msgstr "" + +#: ../gtk/incall_view.c:734 +msgid "Transfer done." +msgstr "" + +#: ../gtk/incall_view.c:737 +#, fuzzy +msgid "Transfer failed." +msgstr "Hívás elutasítva" + +#: ../gtk/incall_view.c:781 msgid "Resume" msgstr "" -#: ../gtk/incall_view.c:591 ../gtk/main.ui.h:45 +#: ../gtk/incall_view.c:788 ../gtk/main.ui.h:9 msgid "Pause" msgstr "" @@ -547,242 +684,256 @@ msgid "Please enter login information for %s" msgstr "" #: ../gtk/main.ui.h:1 -msgid "#" -msgstr "#" - -#: ../gtk/main.ui.h:2 -msgid "*" -msgstr "*" - -#: ../gtk/main.ui.h:3 -msgid "0" -msgstr "0" - -#: ../gtk/main.ui.h:4 -msgid "1" -msgstr "1" - -#: ../gtk/main.ui.h:5 -msgid "2" -msgstr "" - -#: ../gtk/main.ui.h:6 -msgid "3" -msgstr "" - -#: ../gtk/main.ui.h:7 -msgid "4" -msgstr "" - -#: ../gtk/main.ui.h:8 -msgid "5" -msgstr "5" - -#: ../gtk/main.ui.h:9 -msgid "6" -msgstr "" - -#: ../gtk/main.ui.h:10 -msgid "7" -msgstr "" - -#: ../gtk/main.ui.h:11 -msgid "8" -msgstr "" - -#: ../gtk/main.ui.h:12 -msgid "9" -msgstr "" - -#: ../gtk/main.ui.h:13 -#, fuzzy -msgid "Add contacts from directory" -msgstr "Kapcsolatiinformáció" - -#: ../gtk/main.ui.h:14 #, fuzzy msgid "Callee name" msgstr "Hívás vége" -#: ../gtk/main.ui.h:15 +#: ../gtk/main.ui.h:2 #, fuzzy -msgid "Welcome !" -msgstr "Kapcsolatilista" +msgid "Send" +msgstr "Hang" -#: ../gtk/main.ui.h:16 -msgid "A" +#: ../gtk/main.ui.h:3 +msgid "End conference" msgstr "" -#: ../gtk/main.ui.h:17 -msgid "ADSL" +#: ../gtk/main.ui.h:4 +msgid "label" msgstr "" -#: ../gtk/main.ui.h:18 -#, fuzzy -msgid "Add contact" -msgstr "Kapcsolatinformációk szerkesztése" - -#: ../gtk/main.ui.h:19 -msgid "All users" +#: ../gtk/main.ui.h:8 +msgid "Video" msgstr "" -#: ../gtk/main.ui.h:21 -#, fuzzy -msgid "Automatically log me in" -msgstr "Automatikus valós hostnév megállapítása" - -#: ../gtk/main.ui.h:22 -msgid "B" +#: ../gtk/main.ui.h:10 +msgid "Mute" msgstr "" -#: ../gtk/main.ui.h:23 ../gtk/parameters.ui.h:21 -msgid "C" +#: ../gtk/main.ui.h:11 +msgid "Transfer" msgstr "" -#: ../gtk/main.ui.h:24 -#, fuzzy -msgid "Call" -msgstr "Hivás előzmények" - -#: ../gtk/main.ui.h:25 -msgid "Call quality rating" -msgstr "" - -#: ../gtk/main.ui.h:26 -msgid "Check _Updates" -msgstr "" - -#: ../gtk/main.ui.h:27 -#, fuzzy -msgid "Contacts" -msgstr "Kapcsolódás" - -#: ../gtk/main.ui.h:28 -msgid "D" -msgstr "" - -#: ../gtk/main.ui.h:30 -#, fuzzy -msgid "Default" -msgstr "SIP azonosító:" - -#: ../gtk/main.ui.h:31 -#, fuzzy -msgid "Duration" -msgstr "Információk" - -#: ../gtk/main.ui.h:32 -#, fuzzy -msgid "Enable self-view" -msgstr "Video engedélyezés" - -#: ../gtk/main.ui.h:33 -#, fuzzy -msgid "Enable video" -msgstr "Engedélyezve" - -#: ../gtk/main.ui.h:34 -msgid "Enter username, phone number, or full sip address" -msgstr "" - -#: ../gtk/main.ui.h:35 -msgid "Fiber Channel" -msgstr "" - -#: ../gtk/main.ui.h:36 +#: ../gtk/main.ui.h:14 #, fuzzy msgid "In call" msgstr "Beérkező hívás" -#: ../gtk/main.ui.h:37 -msgid "Initiate a new call" +#: ../gtk/main.ui.h:15 +#, fuzzy +msgid "Duration" +msgstr "Információk" + +#: ../gtk/main.ui.h:16 +msgid "Call quality rating" msgstr "" -#: ../gtk/main.ui.h:38 -msgid "Internet connection:" +#: ../gtk/main.ui.h:17 +msgid "_Options" msgstr "" -#: ../gtk/main.ui.h:39 -msgid "Keypad" +#: ../gtk/main.ui.h:18 +msgid "Always start video" msgstr "" -#: ../gtk/main.ui.h:40 +#: ../gtk/main.ui.h:19 #, fuzzy -msgid "Login information" -msgstr "Kapcsolatiinformáció" +msgid "Enable self-view" +msgstr "Video engedélyezés" -#: ../gtk/main.ui.h:41 -msgid "Lookup:" -msgstr "" - -#: ../gtk/main.ui.h:42 -#, fuzzy -msgid "My current identity:" -msgstr "SIP azonosító:" - -#: ../gtk/main.ui.h:43 -#, fuzzy -msgid "Online users" -msgstr "Elérhető" - -#: ../gtk/main.ui.h:44 -#, fuzzy -msgid "Password" -msgstr "jelszó:" - -#: ../gtk/main.ui.h:46 -#, fuzzy -msgid "Recent calls" -msgstr "Beérkező hívás" - -#: ../gtk/main.ui.h:47 -#, fuzzy -msgid "SIP address or phone number:" -msgstr "Gépeld ide a sip címet vagy a telefonszámot" - -#: ../gtk/main.ui.h:48 -msgid "Search" -msgstr "" - -#: ../gtk/main.ui.h:50 -msgid "Show debug window" -msgstr "" - -#: ../gtk/main.ui.h:51 -#, fuzzy -msgid "Username" -msgstr "felhasználónév:" - -#: ../gtk/main.ui.h:52 +#: ../gtk/main.ui.h:20 #, fuzzy msgid "_Help" msgstr "Help" -#: ../gtk/main.ui.h:53 +#: ../gtk/main.ui.h:21 +msgid "Show debug window" +msgstr "" + +#: ../gtk/main.ui.h:22 msgid "_Homepage" msgstr "" -#: ../gtk/main.ui.h:54 -msgid "_Options" +#: ../gtk/main.ui.h:23 +msgid "Check _Updates" msgstr "" +#: ../gtk/main.ui.h:24 +msgid "Account assistant" +msgstr "" + +#: ../gtk/main.ui.h:25 +#, fuzzy +msgid "SIP address or phone number:" +msgstr "Gépeld ide a sip címet vagy a telefonszámot" + +#: ../gtk/main.ui.h:26 +msgid "Initiate a new call" +msgstr "" + +#: ../gtk/main.ui.h:27 ../gtk/parameters.ui.h:48 +msgid "Add" +msgstr "" + +#: ../gtk/main.ui.h:28 ../gtk/parameters.ui.h:49 +msgid "Edit" +msgstr "Szerkesztés" + +#: ../gtk/main.ui.h:29 +msgid "D" +msgstr "" + +#: ../gtk/main.ui.h:30 +msgid "#" +msgstr "#" + +#: ../gtk/main.ui.h:31 +msgid "0" +msgstr "0" + +#: ../gtk/main.ui.h:32 +msgid "*" +msgstr "*" + +#: ../gtk/main.ui.h:33 ../gtk/parameters.ui.h:7 +msgid "C" +msgstr "" + +#: ../gtk/main.ui.h:34 +msgid "9" +msgstr "" + +#: ../gtk/main.ui.h:35 +msgid "8" +msgstr "" + +#: ../gtk/main.ui.h:36 +msgid "7" +msgstr "" + +#: ../gtk/main.ui.h:37 +msgid "B" +msgstr "" + +#: ../gtk/main.ui.h:38 +msgid "6" +msgstr "" + +#: ../gtk/main.ui.h:39 +msgid "5" +msgstr "5" + +#: ../gtk/main.ui.h:40 +msgid "4" +msgstr "" + +#: ../gtk/main.ui.h:41 +msgid "A" +msgstr "" + +#: ../gtk/main.ui.h:42 +msgid "3" +msgstr "" + +#: ../gtk/main.ui.h:43 +msgid "2" +msgstr "" + +#: ../gtk/main.ui.h:44 +msgid "1" +msgstr "1" + +#: ../gtk/main.ui.h:45 +msgid "Search" +msgstr "" + +#: ../gtk/main.ui.h:46 +#, fuzzy +msgid "Add contacts from directory" +msgstr "Kapcsolatiinformáció" + +#: ../gtk/main.ui.h:47 +#, fuzzy +msgid "Add contact" +msgstr "Kapcsolatinformációk szerkesztése" + +#: ../gtk/main.ui.h:48 +msgid "Keypad" +msgstr "" + +#: ../gtk/main.ui.h:49 +#, fuzzy +msgid "Recent calls" +msgstr "Beérkező hívás" + +#: ../gtk/main.ui.h:50 +#, fuzzy +msgid "My current identity:" +msgstr "SIP azonosító:" + +#: ../gtk/main.ui.h:51 ../gtk/tunnel_config.ui.h:7 +#, fuzzy +msgid "Username" +msgstr "felhasználónév:" + +#: ../gtk/main.ui.h:52 ../gtk/tunnel_config.ui.h:8 +#, fuzzy +msgid "Password" +msgstr "jelszó:" + +#: ../gtk/main.ui.h:53 +msgid "Internet connection:" +msgstr "" + +#: ../gtk/main.ui.h:54 +#, fuzzy +msgid "Automatically log me in" +msgstr "Automatikus valós hostnév megállapítása" + #: ../gtk/main.ui.h:55 -msgid "in" -msgstr "" +#, fuzzy +msgid "Login information" +msgstr "Kapcsolatiinformáció" #: ../gtk/main.ui.h:56 -msgid "label" +#, fuzzy +msgid "Welcome !" +msgstr "Kapcsolatilista" + +#: ../gtk/main.ui.h:57 +msgid "All users" +msgstr "" + +#: ../gtk/main.ui.h:58 +#, fuzzy +msgid "Online users" +msgstr "Elérhető" + +#: ../gtk/main.ui.h:59 +msgid "ADSL" +msgstr "" + +#: ../gtk/main.ui.h:60 +msgid "Fiber Channel" +msgstr "" + +#: ../gtk/main.ui.h:61 +#, fuzzy +msgid "Default" +msgstr "SIP azonosító:" + +#: ../gtk/main.ui.h:62 +msgid "Delete" msgstr "" #: ../gtk/about.ui.h:1 -msgid "(C) Belledonne Communications,2010\n" -msgstr "" - -#: ../gtk/about.ui.h:3 #, fuzzy msgid "About linphone" msgstr "linphone" +#: ../gtk/about.ui.h:2 +msgid "(C) Belledonne Communications,2010\n" +msgstr "" + #: ../gtk/about.ui.h:4 msgid "An internet video phone using the standard SIP (rfc3261) protocol." msgstr "" @@ -802,404 +953,404 @@ msgid "" "hu: anonymous\n" msgstr "" -#: ../gtk/contact.ui.h:1 -#, fuzzy -msgid "Contact information" -msgstr "Kapcsolatiinformáció" - #: ../gtk/contact.ui.h:2 -msgid "Allow this contact to see my presence status" -msgstr "" - -#: ../gtk/contact.ui.h:4 #, fuzzy msgid "SIP Address" msgstr "Sip cím:" -#: ../gtk/contact.ui.h:5 +#: ../gtk/contact.ui.h:3 msgid "Show this contact presence status" msgstr "" +#: ../gtk/contact.ui.h:4 +msgid "Allow this contact to see my presence status" +msgstr "" + +#: ../gtk/contact.ui.h:5 +#, fuzzy +msgid "Contact information" +msgstr "Kapcsolatiinformáció" + #: ../gtk/log.ui.h:1 msgid "Linphone debug window" msgstr "" +#: ../gtk/log.ui.h:2 +msgid "Scroll to end" +msgstr "" + #: ../gtk/password.ui.h:1 #, fuzzy msgid "Linphone - Authentication required" msgstr "Hitelesítést kértek" #: ../gtk/password.ui.h:2 -#, fuzzy -msgid "Password:" -msgstr "jelszó:" - -#: ../gtk/password.ui.h:3 msgid "Please enter the domain password" msgstr "" -#: ../gtk/password.ui.h:4 +#: ../gtk/password.ui.h:3 msgid "UserID" msgstr "" #: ../gtk/call_logs.ui.h:1 #, fuzzy -msgid "Call back" -msgstr "Hivás előzmények" - -#: ../gtk/call_logs.ui.h:2 -#, fuzzy msgid "Call history" msgstr "Linphone - Híváselőzmények" -#: ../gtk/call_logs.ui.h:3 +#: ../gtk/call_logs.ui.h:2 msgid "Clear all" msgstr "" -#: ../gtk/sip_account.ui.h:1 -msgid "Configure a SIP account" -msgstr "" +#: ../gtk/call_logs.ui.h:3 +#, fuzzy +msgid "Call back" +msgstr "Hivás előzmények" -#: ../gtk/sip_account.ui.h:2 +#: ../gtk/sip_account.ui.h:1 msgid "Linphone - Configure a SIP account" msgstr "" -#: ../gtk/sip_account.ui.h:3 -msgid "Looks like sip:" -msgstr "" - -#: ../gtk/sip_account.ui.h:4 -msgid "Looks like sip:@" -msgstr "" - -#: ../gtk/sip_account.ui.h:5 -#, fuzzy -msgid "Publish presence information" -msgstr "Jelenléti információ közlése:" - -#: ../gtk/sip_account.ui.h:6 -msgid "Register" -msgstr "" - -#: ../gtk/sip_account.ui.h:7 -#, fuzzy -msgid "Registration duration (sec):" -msgstr "Regisztrálási Időköz:" - -#: ../gtk/sip_account.ui.h:8 -msgid "Route (optional):" -msgstr "Út (nem kötelező):" - -#: ../gtk/sip_account.ui.h:9 -#, fuzzy -msgid "SIP Proxy address:" -msgstr "SIP Proxy:" - -#: ../gtk/sip_account.ui.h:10 +#: ../gtk/sip_account.ui.h:2 #, fuzzy msgid "Your SIP identity:" msgstr "SIP azonosító:" -#: ../gtk/sip_account.ui.h:11 +#: ../gtk/sip_account.ui.h:3 +msgid "Looks like sip:@" +msgstr "" + +#: ../gtk/sip_account.ui.h:4 msgid "sip:" msgstr "sip:" -#: ../gtk/chatroom.ui.h:1 +#: ../gtk/sip_account.ui.h:5 #, fuzzy -msgid "Send" -msgstr "Hang" +msgid "SIP Proxy address:" +msgstr "SIP Proxy:" + +#: ../gtk/sip_account.ui.h:6 +msgid "Looks like sip:" +msgstr "" + +#: ../gtk/sip_account.ui.h:7 +msgid "Route (optional):" +msgstr "Út (nem kötelező):" + +#: ../gtk/sip_account.ui.h:8 +#, fuzzy +msgid "Registration duration (sec):" +msgstr "Regisztrálási Időköz:" + +#: ../gtk/sip_account.ui.h:9 +msgid "Register" +msgstr "" + +#: ../gtk/sip_account.ui.h:10 +#, fuzzy +msgid "Publish presence information" +msgstr "Jelenléti információ közlése:" + +#: ../gtk/sip_account.ui.h:11 +msgid "Configure a SIP account" +msgstr "" #: ../gtk/parameters.ui.h:1 -msgid "0 stands for \"unlimited\"" +msgid "default soundcard" msgstr "" #: ../gtk/parameters.ui.h:2 -#, fuzzy -msgid "Audio" -msgstr "Kapcsolatilista" +msgid "a sound card" +msgstr "" #: ../gtk/parameters.ui.h:3 -msgid "Bandwidth control" +msgid "default camera" msgstr "" #: ../gtk/parameters.ui.h:4 -#, fuzzy -msgid "Codecs" -msgstr "Kapcsolatilista" +msgid "CIF" +msgstr "" #: ../gtk/parameters.ui.h:5 #, fuzzy -msgid "Default identity" -msgstr "SIP azonosító:" - -#: ../gtk/parameters.ui.h:6 -#, fuzzy -msgid "Language" -msgstr "Kapcsolatilista" - -#: ../gtk/parameters.ui.h:7 -#, fuzzy -msgid "Level" -msgstr "Kapcsolatilista" - -#: ../gtk/parameters.ui.h:8 -#, fuzzy -msgid "NAT and Firewall" -msgstr "Kapcsolatilista" - -#: ../gtk/parameters.ui.h:9 -msgid "Network protocol and ports" -msgstr "" - -#: ../gtk/parameters.ui.h:10 -#, fuzzy -msgid "Privacy" -msgstr "Kapcsolatilista" - -#: ../gtk/parameters.ui.h:11 -#, fuzzy -msgid "Proxy accounts" -msgstr "Kapcsolatilista" - -#: ../gtk/parameters.ui.h:12 -#, fuzzy -msgid "Transport" -msgstr "Kapcsolatilista" - -#: ../gtk/parameters.ui.h:13 -#, fuzzy -msgid "Video" -msgstr "Kapcsolatilista" - -#: ../gtk/parameters.ui.h:14 -msgid "" -"Adaptive rate control is a technique to dynamically guess the available " -"bandwidth during a call." -msgstr "" - -#: ../gtk/parameters.ui.h:15 -msgid "ALSA special device (optional):" -msgstr "" - -#: ../gtk/parameters.ui.h:16 -msgid "Add" -msgstr "" - -#: ../gtk/parameters.ui.h:17 -msgid "Audio RTP/UDP:" -msgstr "" - -#: ../gtk/parameters.ui.h:18 -#, fuzzy msgid "Audio codecs" msgstr "Audio kodekek" -#: ../gtk/parameters.ui.h:19 -msgid "Behind NAT / Firewall (specify gateway IP below)" -msgstr "" - -#: ../gtk/parameters.ui.h:20 -msgid "Behind NAT / Firewall (use STUN to resolve)" -msgstr "" - -#: ../gtk/parameters.ui.h:22 -msgid "CIF" -msgstr "" - -#: ../gtk/parameters.ui.h:23 +#: ../gtk/parameters.ui.h:6 #, fuzzy -msgid "Capture device:" -msgstr "Felvevő hang eszköz:" +msgid "Video codecs" +msgstr "Audio kodekek" -#: ../gtk/parameters.ui.h:24 +#: ../gtk/parameters.ui.h:8 +msgid "SIP (UDP)" +msgstr "" + +#: ../gtk/parameters.ui.h:9 +msgid "SIP (TCP)" +msgstr "" + +#: ../gtk/parameters.ui.h:10 +msgid "SIP (TLS)" +msgstr "" + +#: ../gtk/parameters.ui.h:11 +msgid "Settings" +msgstr "" + +#: ../gtk/parameters.ui.h:12 +msgid "Set Maximum Transmission Unit:" +msgstr "" + +#: ../gtk/parameters.ui.h:13 +msgid "Send DTMFs as SIP info" +msgstr "" + +#: ../gtk/parameters.ui.h:14 +msgid "Use IPv6 instead of IPv4" +msgstr "" + +#: ../gtk/parameters.ui.h:15 #, fuzzy -msgid "Codecs" -msgstr "Kodekek" +msgid "Transport" +msgstr "Kapcsolatilista" -#: ../gtk/parameters.ui.h:25 -msgid "Direct connection to the Internet" -msgstr "" - -#: ../gtk/parameters.ui.h:26 -msgid "Disable" -msgstr "Tiltás" - -#: ../gtk/parameters.ui.h:27 -#, fuzzy -msgid "Done" -msgstr "Elveszítve" - -#: ../gtk/parameters.ui.h:28 -#, fuzzy -msgid "Download speed limit in Kbit/sec:" -msgstr "Letöltési sávszélesség (kbit/sec):" - -#: ../gtk/parameters.ui.h:29 -msgid "Edit" -msgstr "Szerkesztés" - -#: ../gtk/parameters.ui.h:30 -msgid "Enable" -msgstr "Engedélyezés" - -#: ../gtk/parameters.ui.h:31 -msgid "Enable adaptive rate control" -msgstr "" - -#: ../gtk/parameters.ui.h:32 -msgid "Enable echo cancellation" -msgstr "" - -#: ../gtk/parameters.ui.h:33 -msgid "Erase all passwords" -msgstr "" - -#: ../gtk/parameters.ui.h:34 -msgid "Manage SIP Accounts" -msgstr "" - -#: ../gtk/parameters.ui.h:35 +#: ../gtk/parameters.ui.h:16 msgid "Media encryption type" msgstr "" -#: ../gtk/parameters.ui.h:36 -msgid "Multimedia settings" +#: ../gtk/parameters.ui.h:17 +msgid "Tunnel" msgstr "" -#: ../gtk/parameters.ui.h:37 +#: ../gtk/parameters.ui.h:18 +msgid "Video RTP/UDP:" +msgstr "" + +#: ../gtk/parameters.ui.h:19 +msgid "Audio RTP/UDP:" +msgstr "" + +#: ../gtk/parameters.ui.h:20 +msgid "DSCP fields" +msgstr "" + +#: ../gtk/parameters.ui.h:21 +msgid "Fixed" +msgstr "" + +#: ../gtk/parameters.ui.h:22 +msgid "Network protocol and ports" +msgstr "" + +#: ../gtk/parameters.ui.h:23 +msgid "Direct connection to the Internet" +msgstr "" + +#: ../gtk/parameters.ui.h:24 +msgid "Behind NAT / Firewall (specify gateway IP below)" +msgstr "" + +#: ../gtk/parameters.ui.h:25 +#, fuzzy +msgid "Public IP address:" +msgstr "Sip cím:" + +#: ../gtk/parameters.ui.h:26 +msgid "Behind NAT / Firewall (use STUN to resolve)" +msgstr "" + +#: ../gtk/parameters.ui.h:27 +msgid "Behind NAT / Firewall (use ICE)" +msgstr "" + +#: ../gtk/parameters.ui.h:28 +#, fuzzy +msgid "Stun server:" +msgstr "Hang eszköz" + +#: ../gtk/parameters.ui.h:29 +#, fuzzy +msgid "NAT and Firewall" +msgstr "Kapcsolatilista" + +#: ../gtk/parameters.ui.h:30 #, fuzzy msgid "Network settings" msgstr "Hálózat" -#: ../gtk/parameters.ui.h:38 +#: ../gtk/parameters.ui.h:31 +#, fuzzy +msgid "Ring sound:" +msgstr "Csengőhang:" + +#: ../gtk/parameters.ui.h:32 +msgid "ALSA special device (optional):" +msgstr "" + +#: ../gtk/parameters.ui.h:33 +#, fuzzy +msgid "Capture device:" +msgstr "Felvevő hang eszköz:" + +#: ../gtk/parameters.ui.h:34 +#, fuzzy +msgid "Ring device:" +msgstr "Csengőhang forrás:" + +#: ../gtk/parameters.ui.h:35 #, fuzzy msgid "Playback device:" msgstr "Lejátszó hang eszköz:" +#: ../gtk/parameters.ui.h:36 +msgid "Enable echo cancellation" +msgstr "" + +#: ../gtk/parameters.ui.h:37 +#, fuzzy +msgid "Audio" +msgstr "Kapcsolatilista" + +#: ../gtk/parameters.ui.h:38 +#, fuzzy +msgid "Video input device:" +msgstr "Hang eszköz" + #: ../gtk/parameters.ui.h:39 msgid "Prefered video resolution:" msgstr "" #: ../gtk/parameters.ui.h:40 #, fuzzy -msgid "Public IP address:" -msgstr "Sip cím:" +msgid "Video" +msgstr "Kapcsolatilista" #: ../gtk/parameters.ui.h:41 -msgid "" -"Register to FONICS\n" -"virtual network !" +msgid "Multimedia settings" msgstr "" -#: ../gtk/parameters.ui.h:43 -msgid "Remove" -msgstr "Eltávolítás" - -#: ../gtk/parameters.ui.h:44 -#, fuzzy -msgid "Ring device:" -msgstr "Csengőhang forrás:" - -#: ../gtk/parameters.ui.h:45 -#, fuzzy -msgid "Ring sound:" -msgstr "Csengőhang:" - -#: ../gtk/parameters.ui.h:46 -msgid "SIP (TCP)" -msgstr "" - -#: ../gtk/parameters.ui.h:47 -msgid "SIP (TLS)" -msgstr "" - -#: ../gtk/parameters.ui.h:48 -msgid "SIP (UDP)" -msgstr "" - -#: ../gtk/parameters.ui.h:49 -msgid "Send DTMFs as SIP info" -msgstr "" - -#: ../gtk/parameters.ui.h:50 -msgid "Set Maximum Transmission Unit:" -msgstr "" - -#: ../gtk/parameters.ui.h:51 -msgid "Settings" -msgstr "" - -#: ../gtk/parameters.ui.h:52 -msgid "Show advanced settings" -msgstr "" - -#: ../gtk/parameters.ui.h:53 -#, fuzzy -msgid "Stun server:" -msgstr "Hang eszköz" - -#: ../gtk/parameters.ui.h:54 +#: ../gtk/parameters.ui.h:42 msgid "This section defines your SIP address when not using a SIP account" msgstr "" -#: ../gtk/parameters.ui.h:55 -#, fuzzy -msgid "Upload speed limit in Kbit/sec:" -msgstr "Feltöltési sávszélesség (kbit/sec):" - -#: ../gtk/parameters.ui.h:56 -msgid "Use IPv6 instead of IPv4" -msgstr "" - -#: ../gtk/parameters.ui.h:57 -#, fuzzy -msgid "User interface" -msgstr "felhasználónév:" - -#: ../gtk/parameters.ui.h:58 -msgid "Video RTP/UDP:" -msgstr "" - -#: ../gtk/parameters.ui.h:59 -#, fuzzy -msgid "Video codecs" -msgstr "Audio kodekek" - -#: ../gtk/parameters.ui.h:60 -#, fuzzy -msgid "Video input device:" -msgstr "Hang eszköz" - -#: ../gtk/parameters.ui.h:61 +#: ../gtk/parameters.ui.h:43 msgid "Your display name (eg: John Doe):" msgstr "" -#: ../gtk/parameters.ui.h:62 -#, fuzzy -msgid "Your resulting SIP address:" -msgstr "Saját sip cím:" - -#: ../gtk/parameters.ui.h:63 +#: ../gtk/parameters.ui.h:44 #, fuzzy msgid "Your username:" msgstr "felhasználónév:" -#: ../gtk/parameters.ui.h:64 -msgid "a sound card" +#: ../gtk/parameters.ui.h:45 +#, fuzzy +msgid "Your resulting SIP address:" +msgstr "Saját sip cím:" + +#: ../gtk/parameters.ui.h:46 +#, fuzzy +msgid "Default identity" +msgstr "SIP azonosító:" + +#: ../gtk/parameters.ui.h:47 +msgid "Wizard" msgstr "" +#: ../gtk/parameters.ui.h:50 +msgid "Remove" +msgstr "Eltávolítás" + +#: ../gtk/parameters.ui.h:51 +#, fuzzy +msgid "Proxy accounts" +msgstr "Kapcsolatilista" + +#: ../gtk/parameters.ui.h:52 +msgid "Erase all passwords" +msgstr "" + +#: ../gtk/parameters.ui.h:53 +#, fuzzy +msgid "Privacy" +msgstr "Kapcsolatilista" + +#: ../gtk/parameters.ui.h:54 +msgid "Manage SIP Accounts" +msgstr "" + +#: ../gtk/parameters.ui.h:55 ../gtk/tunnel_config.ui.h:4 +msgid "Enable" +msgstr "Engedélyezés" + +#: ../gtk/parameters.ui.h:56 ../gtk/tunnel_config.ui.h:5 +msgid "Disable" +msgstr "Tiltás" + +#: ../gtk/parameters.ui.h:57 +#, fuzzy +msgid "Codecs" +msgstr "Kapcsolatilista" + +#: ../gtk/parameters.ui.h:58 +msgid "0 stands for \"unlimited\"" +msgstr "" + +#: ../gtk/parameters.ui.h:59 +#, fuzzy +msgid "Upload speed limit in Kbit/sec:" +msgstr "Feltöltési sávszélesség (kbit/sec):" + +#: ../gtk/parameters.ui.h:60 +#, fuzzy +msgid "Download speed limit in Kbit/sec:" +msgstr "Letöltési sávszélesség (kbit/sec):" + +#: ../gtk/parameters.ui.h:61 +msgid "Enable adaptive rate control" +msgstr "" + +#: ../gtk/parameters.ui.h:62 +msgid "" +"Adaptive rate control is a technique to dynamically guess the available " +"bandwidth during a call." +msgstr "" + +#: ../gtk/parameters.ui.h:63 +msgid "Bandwidth control" +msgstr "" + +#: ../gtk/parameters.ui.h:64 +#, fuzzy +msgid "Codecs" +msgstr "Kodekek" + #: ../gtk/parameters.ui.h:65 -msgid "default camera" -msgstr "" +#, fuzzy +msgid "Language" +msgstr "Kapcsolatilista" #: ../gtk/parameters.ui.h:66 -msgid "default soundcard" +msgid "Show advanced settings" msgstr "" +#: ../gtk/parameters.ui.h:67 +#, fuzzy +msgid "Level" +msgstr "Kapcsolatilista" + +#: ../gtk/parameters.ui.h:68 +#, fuzzy +msgid "User interface" +msgstr "felhasználónév:" + +#: ../gtk/parameters.ui.h:69 +#, fuzzy +msgid "Done" +msgstr "Elveszítve" + #: ../gtk/buddylookup.ui.h:1 #, fuzzy -msgid "Search somebody" -msgstr "Kapcsolatilista" +msgid "Search contacts in directory" +msgstr "Kapcsolatiinformáció" #: ../gtk/buddylookup.ui.h:2 msgid "Add to my list" @@ -1207,8 +1358,8 @@ msgstr "" #: ../gtk/buddylookup.ui.h:3 #, fuzzy -msgid "Search contacts in directory" -msgstr "Kapcsolatiinformáció" +msgid "Search somebody" +msgstr "Kapcsolatilista" #: ../gtk/waiting.ui.h:1 msgid "Linphone" @@ -1218,19 +1369,92 @@ msgstr "Linphone" msgid "Please wait" msgstr "" -#: ../coreapi/linphonecore.c:187 +#: ../gtk/dscp_settings.ui.h:1 +#, fuzzy +msgid "Dscp settings" +msgstr "Hálózat" + +#: ../gtk/dscp_settings.ui.h:2 +msgid "SIP" +msgstr "SIP" + +#: ../gtk/dscp_settings.ui.h:3 +msgid "Audio RTP stream" +msgstr "" + +#: ../gtk/dscp_settings.ui.h:4 +msgid "Video RTP stream" +msgstr "" + +#: ../gtk/dscp_settings.ui.h:5 +msgid "Set DSCP values (in hexadecimal)" +msgstr "" + +#: ../gtk/call_statistics.ui.h:1 +#, fuzzy +msgid "Call statistics" +msgstr "Hivás előzmények" + +#: ../gtk/call_statistics.ui.h:2 +#, fuzzy +msgid "Audio codec" +msgstr "Audio kodekek" + +#: ../gtk/call_statistics.ui.h:3 +#, fuzzy +msgid "Video codec" +msgstr "Audio kodekek" + +#: ../gtk/call_statistics.ui.h:4 +msgid "Audio IP bandwidth usage" +msgstr "" + +#: ../gtk/call_statistics.ui.h:5 +msgid "Media connectivity" +msgstr "" + +#: ../gtk/call_statistics.ui.h:6 +msgid "Video IP bandwidth usage" +msgstr "" + +#: ../gtk/call_statistics.ui.h:7 +#, fuzzy +msgid "Call statistics and information" +msgstr "Kapcsolatiinformáció" + +#: ../gtk/tunnel_config.ui.h:1 +msgid "Configure VoIP tunnel" +msgstr "" + +#: ../gtk/tunnel_config.ui.h:2 +msgid "Host" +msgstr "" + +#: ../gtk/tunnel_config.ui.h:3 +msgid "Port" +msgstr "" + +#: ../gtk/tunnel_config.ui.h:6 +msgid "Configure tunnel" +msgstr "" + +#: ../gtk/tunnel_config.ui.h:9 +msgid "Configure http proxy (optional)" +msgstr "" + +#: ../coreapi/linphonecore.c:232 msgid "aborted" msgstr "megszakítva" -#: ../coreapi/linphonecore.c:190 +#: ../coreapi/linphonecore.c:235 msgid "completed" msgstr "befejezve" -#: ../coreapi/linphonecore.c:193 +#: ../coreapi/linphonecore.c:238 msgid "missed" msgstr "elhibázva" -#: ../coreapi/linphonecore.c:198 +#: ../coreapi/linphonecore.c:243 #, c-format msgid "" "%s at %s\n" @@ -1245,66 +1469,79 @@ msgstr "" "Állapot: %s\n" "Időtartam: %i perc %i másodperc\n" -#: ../coreapi/linphonecore.c:199 +#: ../coreapi/linphonecore.c:244 msgid "Outgoing call" msgstr "Kimenő hívás" -#: ../coreapi/linphonecore.c:1088 +#: ../coreapi/linphonecore.c:1226 msgid "Ready" msgstr "Kész" -#: ../coreapi/linphonecore.c:1831 +#: ../coreapi/linphonecore.c:2074 msgid "Looking for telephone number destination..." msgstr "Telefonszám-cél keresése..." -#: ../coreapi/linphonecore.c:1834 +#: ../coreapi/linphonecore.c:2077 msgid "Could not resolve this number." msgstr "Nem sikkerült értelmezni a számot." -#: ../coreapi/linphonecore.c:1878 +#: ../coreapi/linphonecore.c:2121 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:2025 +#: ../coreapi/linphonecore.c:2312 msgid "Contacting" msgstr "Kapcsolódás" -#: ../coreapi/linphonecore.c:2032 +#: ../coreapi/linphonecore.c:2319 #, fuzzy msgid "Could not call" msgstr "nem sikerült hívni" -#: ../coreapi/linphonecore.c:2140 +#: ../coreapi/linphonecore.c:2429 msgid "Sorry, we have reached the maximum number of simultaneous calls" msgstr "" -#: ../coreapi/linphonecore.c:2270 +#: ../coreapi/linphonecore.c:2573 +#, fuzzy +msgid "is contacting you" +msgstr "kapcsolatba lép veled." + +#: ../coreapi/linphonecore.c:2574 +msgid " and asked autoanswer." +msgstr "" + +#: ../coreapi/linphonecore.c:2574 +msgid "." +msgstr "" + +#: ../coreapi/linphonecore.c:2636 msgid "Modifying call parameters..." msgstr "" -#: ../coreapi/linphonecore.c:2366 +#: ../coreapi/linphonecore.c:2908 msgid "Connected." msgstr "Kapcsolódva." -#: ../coreapi/linphonecore.c:2389 +#: ../coreapi/linphonecore.c:2931 #, fuzzy msgid "Call aborted" msgstr "megszakítva" -#: ../coreapi/linphonecore.c:2530 +#: ../coreapi/linphonecore.c:3102 #, fuzzy msgid "Could not pause the call" msgstr "nem sikerült hívni" -#: ../coreapi/linphonecore.c:2535 +#: ../coreapi/linphonecore.c:3107 #, fuzzy msgid "Pausing the current call..." msgstr "nem sikerült hívni" -#: ../coreapi/misc.c:147 +#: ../coreapi/misc.c:148 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the pcm oss emulation module\n" @@ -1316,7 +1553,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:150 +#: ../coreapi/misc.c:151 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the mixer oss emulation module\n" @@ -1328,10 +1565,14 @@ 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:478 +#: ../coreapi/misc.c:496 msgid "Stun lookup in progress..." msgstr "Stun keresés folyamatban..." +#: ../coreapi/misc.c:630 +msgid "ICE local candidates gathering in progress..." +msgstr "" + #: ../coreapi/friend.c:33 msgid "Online" msgstr "Elérhető" @@ -1385,168 +1626,173 @@ msgstr "" msgid "Unknown-bug" msgstr "" -#: ../coreapi/proxy.c:192 +#: ../coreapi/proxy.c:204 msgid "" "The sip proxy address you entered is invalid, it must start with \"sip:\" " "followed by a hostname." msgstr "" -#: ../coreapi/proxy.c:198 +#: ../coreapi/proxy.c:210 msgid "" "The sip identity you entered is invalid.\n" "It should look like sip:username@proxydomain, such as sip:alice@example.net" msgstr "" -#: ../coreapi/proxy.c:690 +#: ../coreapi/proxy.c:1053 #, fuzzy, c-format msgid "Could not login as %s" msgstr "Nemtalálható a pixmap fájl: %s" -#: ../coreapi/callbacks.c:206 -#, fuzzy -msgid "is contacting you" -msgstr "kapcsolatba lép veled." - -#: ../coreapi/callbacks.c:207 -msgid " and asked autoanswer." -msgstr "" - -#: ../coreapi/callbacks.c:207 -msgid "." -msgstr "" - -#: ../coreapi/callbacks.c:266 +#: ../coreapi/callbacks.c:276 #, fuzzy msgid "Remote ringing." msgstr "Távoli szolgáltatások" -#: ../coreapi/callbacks.c:282 +#: ../coreapi/callbacks.c:296 #, fuzzy msgid "Remote ringing..." msgstr "Távoli szolgáltatások" -#: ../coreapi/callbacks.c:293 +#: ../coreapi/callbacks.c:307 msgid "Early media." msgstr "Korai médiák." -#: ../coreapi/callbacks.c:331 +#: ../coreapi/callbacks.c:352 #, fuzzy, c-format msgid "Call with %s is paused." msgstr "Chat-elés %s -el" -#: ../coreapi/callbacks.c:342 +#: ../coreapi/callbacks.c:365 #, c-format msgid "Call answered by %s - on hold." msgstr "" -#: ../coreapi/callbacks.c:357 +#: ../coreapi/callbacks.c:376 #, fuzzy msgid "Call resumed." msgstr "Hívás vége" -#: ../coreapi/callbacks.c:362 +#: ../coreapi/callbacks.c:381 #, fuzzy, c-format msgid "Call answered by %s." msgstr "" "Hívás vagy\n" "Válasz" -#: ../coreapi/callbacks.c:432 -msgid "We are being paused..." +#: ../coreapi/callbacks.c:396 +msgid "Incompatible, check codecs..." msgstr "" -#: ../coreapi/callbacks.c:436 -msgid "We have been resumed..." +#: ../coreapi/callbacks.c:437 +msgid "We have been resumed." msgstr "" -#: ../coreapi/callbacks.c:441 -msgid "Call has been updated by remote..." +#: ../coreapi/callbacks.c:446 +msgid "We are paused by other party." msgstr "" -#: ../coreapi/callbacks.c:473 +#: ../coreapi/callbacks.c:452 +msgid "Call is updated by remote." +msgstr "" + +#: ../coreapi/callbacks.c:521 msgid "Call terminated." msgstr "A hívás befejezve." -#: ../coreapi/callbacks.c:480 +#: ../coreapi/callbacks.c:528 msgid "User is busy." msgstr "A felhasználó foglalt." -#: ../coreapi/callbacks.c:481 +#: ../coreapi/callbacks.c:529 msgid "User is temporarily unavailable." msgstr "A felhasználó ideiglenesen nem elérhető" #. char *retrymsg=_("%s. Retry after %i minute(s)."); -#: ../coreapi/callbacks.c:483 +#: ../coreapi/callbacks.c:531 msgid "User does not want to be disturbed." msgstr "A felhasználó nem akarja, hogy zavarják." -#: ../coreapi/callbacks.c:484 +#: ../coreapi/callbacks.c:532 msgid "Call declined." msgstr "Hívás elutasítva" -#: ../coreapi/callbacks.c:496 +#: ../coreapi/callbacks.c:544 #, fuzzy msgid "No response." msgstr "időtúllépés után nincs válasz" -#: ../coreapi/callbacks.c:500 +#: ../coreapi/callbacks.c:548 msgid "Protocol error." msgstr "" -#: ../coreapi/callbacks.c:516 +#: ../coreapi/callbacks.c:564 #, fuzzy msgid "Redirected" msgstr "Átirányítva idw %s..." -#: ../coreapi/callbacks.c:526 -msgid "Not found" +#: ../coreapi/callbacks.c:600 +msgid "Incompatible media parameters." msgstr "" -#: ../coreapi/callbacks.c:551 -msgid "No common codecs" -msgstr "" - -#: ../coreapi/callbacks.c:557 +#: ../coreapi/callbacks.c:606 #, fuzzy msgid "Call failed." msgstr "Hívás elutasítva" -#: ../coreapi/callbacks.c:631 +#: ../coreapi/callbacks.c:701 #, c-format msgid "Registration on %s successful." msgstr "A regisztáció a %s -n sikerült." -#: ../coreapi/callbacks.c:632 +#: ../coreapi/callbacks.c:702 #, fuzzy, c-format msgid "Unregistration on %s done." msgstr "A regisztáció a %s -n sikerült." -#: ../coreapi/callbacks.c:648 +#: ../coreapi/callbacks.c:722 msgid "no response timeout" msgstr "időtúllépés után nincs válasz" -#: ../coreapi/callbacks.c:651 +#: ../coreapi/callbacks.c:725 #, c-format msgid "Registration on %s failed: %s" msgstr "A regisztáció a %s -n nem sikerült: %s" -#: ../coreapi/sal_eXosip2.c:873 ../coreapi/sal_eXosip2.c:875 -#, fuzzy -msgid "Authentication failure" -msgstr "Hitelesítési információ" - -#: ../coreapi/linphonecall.c:128 +#: ../coreapi/linphonecall.c:129 #, fuzzy, c-format msgid "Authentication token is %s" msgstr "Hitelesítési információ" -#: ../coreapi/linphonecall.c:1560 +#: ../coreapi/linphonecall.c:2124 #, 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." +#~ msgid "Chat with %s" +#~ msgstr "Chat-elés %s -el" + +#, fuzzy +#~ msgid "Choosing a username" +#~ msgstr "felhasználónév:" + +#, fuzzy +#~ msgid "Confirmation" +#~ msgstr "Információk" + +#, fuzzy +#~ msgid "Contacts" +#~ msgstr "Kapcsolódás" + +#, fuzzy +#~ msgid "Enable video" +#~ msgstr "Engedélyezve" + +#, fuzzy +#~ msgid "Authentication failure" +#~ msgstr "Hitelesítési információ" + #, fuzzy #~ msgid "Unmute" #~ msgstr "Korlátlan" @@ -1604,10 +1850,6 @@ msgstr[1] "Van %i elhibázott hivás." #~ msgid "Incoming call from %s" #~ msgstr "Beérkező hívás" -#, fuzzy -#~ msgid "Call Details" -#~ msgstr "Hivás előzmények" - #, fuzzy #~ msgid "_Modes" #~ msgstr "Kodekek" @@ -1948,9 +2190,6 @@ msgstr[1] "Van %i elhibázott hivás." #~ "Az összes tárolt hitelesítési információ törlése (felhasználónév, " #~ "jelszó...)" -#~ msgid "SIP" -#~ msgstr "SIP" - #~ msgid "List of audio codecs, in order of preference:" #~ msgstr "Az audió kódoló-dekódolók listája, a preferencia rendjében:" @@ -2016,9 +2255,6 @@ msgstr[1] "Van %i elhibázott hivás." #~ msgid "realm:" #~ msgstr "tartomány:" -#~ msgid "Chat Room" -#~ msgstr "Chat szoba" - #~ msgid "Text:" #~ msgstr "Szöveg:" diff --git a/po/it.po b/po/it.po index e1c1b3e31..135faa6cc 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: 2011-12-05 12:41+0100\n" +"POT-Creation-Date: 2013-01-08 10:35+0100\n" "PO-Revision-Date: 2002-10-15 HO:MI+ZONE\n" "Last-Translator: Matteo Piazza \n" "Language-Team: it \n" @@ -15,32 +15,54 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../gtk/calllogs.c:71 +#: ../gtk/calllogs.c:82 +#, fuzzy +msgid "Aborted" +msgstr "annullato" + +#: ../gtk/calllogs.c:85 +#, fuzzy +msgid "Missed" +msgstr "mancante" + +#: ../gtk/calllogs.c:88 +#, fuzzy +msgid "Declined" +msgstr "Rifiuta" + +#: ../gtk/calllogs.c:94 #, c-format msgid "%i minute" msgid_plural "%i minutes" msgstr[0] "" msgstr[1] "" -#: ../gtk/calllogs.c:74 +#: ../gtk/calllogs.c:97 #, c-format msgid "%i second" msgid_plural "%i seconds" msgstr[0] "" msgstr[1] "" -#: ../gtk/calllogs.c:77 +#: ../gtk/calllogs.c:100 #, c-format msgid "" "%s\t%s\tQuality: %s\n" "%s\t%s %s\t" msgstr "" -#: ../gtk/calllogs.c:79 +#: ../gtk/calllogs.c:102 msgid "n/a" msgstr "" -#: ../gtk/conference.c:33 ../gtk/incall_view.c:183 +#: ../gtk/calllogs.c:105 +#, c-format +msgid "" +"%s\t%s\t\n" +"%s\t%s" +msgstr "" + +#: ../gtk/conference.c:33 ../gtk/main.ui.h:13 msgid "Conference" msgstr "" @@ -56,43 +78,42 @@ msgstr "" msgid "Couldn't find pixmap file: %s" msgstr "" -#: ../gtk/chat.c:27 -#, c-format -msgid "Chat with %s" -msgstr "Chat con %s" - -#: ../gtk/main.c:83 +#: ../gtk/main.c:89 msgid "log to stdout some debug information while running." msgstr "" -#: ../gtk/main.c:90 +#: ../gtk/main.c:96 msgid "path to a file to write logs into." msgstr "" -#: ../gtk/main.c:97 +#: ../gtk/main.c:103 +msgid "Start linphone with video disabled." +msgstr "" + +#: ../gtk/main.c:110 msgid "Start only in the system tray, do not show the main interface." msgstr "" -#: ../gtk/main.c:104 +#: ../gtk/main.c:117 msgid "address to call right now" msgstr "" -#: ../gtk/main.c:111 +#: ../gtk/main.c:124 msgid "if set automatically answer incoming calls" msgstr "" -#: ../gtk/main.c:118 +#: ../gtk/main.c:131 msgid "" "Specifiy a working directory (should be the base of the installation, eg: c:" "\\Program Files\\Linphone)" msgstr "" -#: ../gtk/main.c:464 +#: ../gtk/main.c:498 #, fuzzy, c-format msgid "Call with %s" msgstr "Chat con %s" -#: ../gtk/main.c:815 +#: ../gtk/main.c:871 #, c-format msgid "" "%s would like to add you to his contact list.\n" @@ -104,224 +125,242 @@ msgstr "" "veda il tuo stato o aggiungerlo alla tua lista dei contatti Se rispondi no " "questo utente sarà momentaneamente bloccato." -#: ../gtk/main.c:893 +#: ../gtk/main.c:948 #, 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/main.c:993 +#: ../gtk/main.c:1051 #, fuzzy msgid "Call error" msgstr "Cronologia" -#: ../gtk/main.c:996 ../coreapi/linphonecore.c:2406 +#: ../gtk/main.c:1054 ../coreapi/linphonecore.c:2949 msgid "Call ended" msgstr "Chiamata terminata" -#: ../gtk/main.c:999 ../coreapi/linphonecore.c:199 +#: ../gtk/main.c:1057 ../coreapi/linphonecore.c:244 msgid "Incoming call" msgstr "Chimata in entrata" -#: ../gtk/main.c:1001 ../gtk/incall_view.c:292 ../gtk/main.ui.h:20 +#: ../gtk/main.c:1059 ../gtk/incall_view.c:451 ../gtk/main.ui.h:6 msgid "Answer" msgstr "" -#: ../gtk/main.c:1003 ../gtk/main.ui.h:29 +#: ../gtk/main.c:1061 ../gtk/main.ui.h:7 msgid "Decline" msgstr "Rifiuta" -#: ../gtk/main.c:1009 +#: ../gtk/main.c:1067 #, fuzzy msgid "Call paused" msgstr "annullato" -#: ../gtk/main.c:1009 +#: ../gtk/main.c:1067 #, c-format msgid "by %s" msgstr "" -#: ../gtk/main.c:1165 +#: ../gtk/main.c:1116 +#, c-format +msgid "%s proposed to start video. Do you accept ?" +msgstr "" + +#: ../gtk/main.c:1278 msgid "Website link" msgstr "" -#: ../gtk/main.c:1205 +#: ../gtk/main.c:1318 msgid "Linphone - a video internet phone" msgstr "" -#: ../gtk/main.c:1295 +#: ../gtk/main.c:1410 #, c-format msgid "%s (Default)" msgstr "%s (Default)" -#: ../gtk/main.c:1566 ../coreapi/callbacks.c:700 +#: ../gtk/main.c:1714 ../coreapi/callbacks.c:774 #, c-format msgid "We are transferred to %s" msgstr "" -#: ../gtk/main.c:1576 +#: ../gtk/main.c:1724 msgid "" "No sound cards have been detected on this computer.\n" "You won't be able to send or receive audio calls." msgstr "" -#: ../gtk/main.c:1663 +#: ../gtk/main.c:1833 msgid "A free SIP video-phone" msgstr "" -#: ../gtk/friendlist.c:203 +#: ../gtk/friendlist.c:335 msgid "Add to addressbook" msgstr "" -#: ../gtk/friendlist.c:258 ../gtk/propertybox.c:296 ../gtk/contact.ui.h:3 -msgid "Name" -msgstr "Nome" - -#: ../gtk/friendlist.c:271 +#: ../gtk/friendlist.c:509 msgid "Presence status" msgstr "Presenza" -#: ../gtk/friendlist.c:308 +#: ../gtk/friendlist.c:526 ../gtk/propertybox.c:362 ../gtk/contact.ui.h:1 +msgid "Name" +msgstr "Nome" + +#: ../gtk/friendlist.c:538 +#, fuzzy +msgid "Call" +msgstr "Chiamata %s" + +#: ../gtk/friendlist.c:543 +msgid "Chat" +msgstr "" + +#: ../gtk/friendlist.c:573 #, c-format msgid "Search in %s directory" msgstr "Cerca contatti nella directory %s" -#: ../gtk/friendlist.c:568 +#: ../gtk/friendlist.c:730 msgid "Invalid sip contact !" msgstr "Contatto SIP non valido" -#: ../gtk/friendlist.c:613 +#: ../gtk/friendlist.c:775 #, c-format msgid "Call %s" msgstr "Chiamata %s" -#: ../gtk/friendlist.c:614 +#: ../gtk/friendlist.c:776 #, c-format msgid "Send text to %s" msgstr "Invia testo a %s" -#: ../gtk/friendlist.c:615 +#: ../gtk/friendlist.c:777 #, c-format msgid "Edit contact '%s'" msgstr "Modifica contatto %s" -#: ../gtk/friendlist.c:616 +#: ../gtk/friendlist.c:778 #, c-format msgid "Delete contact '%s'" msgstr "Elimina contatto %s" -#: ../gtk/friendlist.c:658 +#: ../gtk/friendlist.c:820 #, c-format msgid "Add new contact from %s directory" msgstr "Aggiungi nuovo contatto dalla directory %s" -#: ../gtk/propertybox.c:302 +#: ../gtk/propertybox.c:368 msgid "Rate (Hz)" msgstr "" -#: ../gtk/propertybox.c:308 +#: ../gtk/propertybox.c:374 msgid "Status" msgstr "Stato" -#: ../gtk/propertybox.c:314 +#: ../gtk/propertybox.c:380 msgid "Min bitrate (kbit/s)" msgstr "Bitrate Min (kbit/s)" -#: ../gtk/propertybox.c:321 +#: ../gtk/propertybox.c:387 msgid "Parameters" msgstr "Parametri" -#: ../gtk/propertybox.c:364 ../gtk/propertybox.c:507 +#: ../gtk/propertybox.c:430 ../gtk/propertybox.c:573 msgid "Enabled" msgstr "Attivato" -#: ../gtk/propertybox.c:366 ../gtk/propertybox.c:507 +#: ../gtk/propertybox.c:432 ../gtk/propertybox.c:573 msgid "Disabled" msgstr "Disattivato" -#: ../gtk/propertybox.c:553 +#: ../gtk/propertybox.c:619 msgid "Account" msgstr "Account" -#: ../gtk/propertybox.c:693 +#: ../gtk/propertybox.c:759 msgid "English" msgstr "Inglese" -#: ../gtk/propertybox.c:694 +#: ../gtk/propertybox.c:760 msgid "French" msgstr "Francese" -#: ../gtk/propertybox.c:695 +#: ../gtk/propertybox.c:761 msgid "Swedish" msgstr "Svedese" -#: ../gtk/propertybox.c:696 +#: ../gtk/propertybox.c:762 msgid "Italian" msgstr "Italiano" -#: ../gtk/propertybox.c:697 +#: ../gtk/propertybox.c:763 msgid "Spanish" msgstr "Spagnolo" -#: ../gtk/propertybox.c:698 +#: ../gtk/propertybox.c:764 msgid "Brazilian Portugese" msgstr "" -#: ../gtk/propertybox.c:699 +#: ../gtk/propertybox.c:765 msgid "Polish" msgstr "Polacco" -#: ../gtk/propertybox.c:700 +#: ../gtk/propertybox.c:766 msgid "German" msgstr "Tedesco" -#: ../gtk/propertybox.c:701 +#: ../gtk/propertybox.c:767 msgid "Russian" msgstr "Russo" -#: ../gtk/propertybox.c:702 +#: ../gtk/propertybox.c:768 msgid "Japanese" msgstr "Giapponese" -#: ../gtk/propertybox.c:703 +#: ../gtk/propertybox.c:769 msgid "Dutch" msgstr "Olandese" -#: ../gtk/propertybox.c:704 +#: ../gtk/propertybox.c:770 msgid "Hungarian" msgstr "Ungherese" -#: ../gtk/propertybox.c:705 +#: ../gtk/propertybox.c:771 msgid "Czech" msgstr "Ceco" -#: ../gtk/propertybox.c:706 +#: ../gtk/propertybox.c:772 msgid "Chinese" msgstr "" -#: ../gtk/propertybox.c:707 +#: ../gtk/propertybox.c:773 msgid "Traditional Chinese" msgstr "" -#: ../gtk/propertybox.c:708 +#: ../gtk/propertybox.c:774 msgid "Norwegian" msgstr "" -#: ../gtk/propertybox.c:765 +#: ../gtk/propertybox.c:775 +msgid "Hebrew" +msgstr "" + +#: ../gtk/propertybox.c:842 msgid "" "You need to restart linphone for the new language selection to take effect." msgstr "Riavviare il software per utilizzare la nuova lingua selezionata" -#: ../gtk/propertybox.c:835 +#: ../gtk/propertybox.c:912 msgid "None" msgstr "" -#: ../gtk/propertybox.c:839 +#: ../gtk/propertybox.c:916 msgid "SRTP" msgstr "" -#: ../gtk/propertybox.c:845 +#: ../gtk/propertybox.c:922 msgid "ZRTP" msgstr "" @@ -365,7 +404,7 @@ msgid_plural "Found %i contacts" msgstr[0] "Trovato %i contatto" msgstr[1] "Trovato %i contatti" -#: ../gtk/setupwizard.c:25 +#: ../gtk/setupwizard.c:33 msgid "" "Welcome !\n" "This assistant will help you to use a SIP account for your calls." @@ -373,172 +412,275 @@ msgstr "" "Benvenuti !\n" "La procedura vi aiutera a configurare un account SIP." -#: ../gtk/setupwizard.c:34 -msgid "Create an account by choosing a username" +#: ../gtk/setupwizard.c:42 +#, fuzzy +msgid "Create an account on linphone.org" msgstr "Creare un account scegliendo l'username" -#: ../gtk/setupwizard.c:35 -msgid "I have already an account and just want to use it" +#: ../gtk/setupwizard.c:43 +#, fuzzy +msgid "I have already a linphone.org account and I just want to use it" msgstr "Ho gia un account e voglio usarlo" -#: ../gtk/setupwizard.c:53 -msgid "Please choose a username:" -msgstr "Prego scegliere un username" +#: ../gtk/setupwizard.c:44 +#, fuzzy +msgid "I have already a sip account and I just want to use it" +msgstr "Ho gia un account e voglio usarlo" -#: ../gtk/setupwizard.c:54 +#: ../gtk/setupwizard.c:84 +msgid "Enter your linphone.org username" +msgstr "" + +#: ../gtk/setupwizard.c:91 msgid "Username:" msgstr "Manuale utente" -#: ../gtk/setupwizard.c:92 -#, c-format -msgid "Checking if '%s' is available..." -msgstr "Controllo se '%s' è disponibile..." +#: ../gtk/setupwizard.c:93 ../gtk/password.ui.h:4 +msgid "Password:" +msgstr "Password:" -#: ../gtk/setupwizard.c:97 ../gtk/setupwizard.c:164 -msgid "Please wait..." -msgstr "Prego attendere ..." +#: ../gtk/setupwizard.c:113 +msgid "Enter your account informations" +msgstr "" -#: ../gtk/setupwizard.c:101 -msgid "Sorry this username already exists. Please try a new one." -msgstr "Spiacenti, questo usernsame è gia utilizzato. Prego riprovare" +#: ../gtk/setupwizard.c:120 +#, fuzzy +msgid "Username*" +msgstr "Username" -#: ../gtk/setupwizard.c:103 ../gtk/setupwizard.c:168 -msgid "Ok !" -msgstr "Ok !" +#: ../gtk/setupwizard.c:121 +#, fuzzy +msgid "Password*" +msgstr "Password" -#: ../gtk/setupwizard.c:106 ../gtk/setupwizard.c:171 -msgid "Communication problem, please try again later." -msgstr "Errore di comunicazione, prego riprovare." +#: ../gtk/setupwizard.c:124 +msgid "Domain*" +msgstr "" -#: ../gtk/setupwizard.c:134 +#: ../gtk/setupwizard.c:125 +msgid "Proxy" +msgstr "" + +#: ../gtk/setupwizard.c:297 +msgid "(*) Required fields" +msgstr "" + +#: ../gtk/setupwizard.c:298 +#, fuzzy +msgid "Username: (*)" +msgstr "Manuale utente" + +#: ../gtk/setupwizard.c:300 +#, fuzzy +msgid "Password: (*)" +msgstr "Password:" + +#: ../gtk/setupwizard.c:302 +msgid "Email: (*)" +msgstr "" + +#: ../gtk/setupwizard.c:304 +msgid "Confirm your password: (*)" +msgstr "" + +#: ../gtk/setupwizard.c:368 +msgid "" +"Error, account not validated, username already used or server unreachable.\n" +"Please go back and try again." +msgstr "" + +#: ../gtk/setupwizard.c:379 msgid "Thank you. Your account is now configured and ready for use." msgstr "Grazie. Il tuo account è configurato e pronto all'uso" -#: ../gtk/setupwizard.c:228 +#: ../gtk/setupwizard.c:387 +msgid "" +"Please validate your account by clicking on the link we just sent you by " +"email.\n" +"Then come back here and press Next button." +msgstr "" + +#: ../gtk/setupwizard.c:554 msgid "Welcome to the account setup assistant" msgstr "Benvenuto nel configuratore di account" -#: ../gtk/setupwizard.c:232 +#: ../gtk/setupwizard.c:559 msgid "Account setup assistant" msgstr "Configuratore di account" -#: ../gtk/setupwizard.c:236 -msgid "Choosing a username" -msgstr "Scegli un username" +#: ../gtk/setupwizard.c:565 +#, fuzzy +msgid "Configure your account (step 1/1)" +msgstr "Configurazione SIP account" -#: ../gtk/setupwizard.c:240 -msgid "Verifying" -msgstr "Verifica" +#: ../gtk/setupwizard.c:570 +msgid "Enter your sip username (step 1/1)" +msgstr "" -#: ../gtk/setupwizard.c:244 -msgid "Confirmation" -msgstr "Informazioni" +#: ../gtk/setupwizard.c:574 +msgid "Enter account information (step 1/2)" +msgstr "" -#: ../gtk/setupwizard.c:249 -msgid "Creating your account" -msgstr "Creazione account" +#: ../gtk/setupwizard.c:583 +msgid "Validation (step 2/2)" +msgstr "" -#: ../gtk/setupwizard.c:253 -msgid "Now ready !" -msgstr "Pronto !" +#: ../gtk/setupwizard.c:588 +msgid "Error" +msgstr "" -#: ../gtk/incall_view.c:69 +#: ../gtk/setupwizard.c:592 +#, fuzzy +msgid "Terminating" +msgstr "Termina chiamata" + +#: ../gtk/incall_view.c:69 ../gtk/incall_view.c:90 #, fuzzy, c-format msgid "Call #%i" msgstr "Chiamata %s" -#: ../gtk/incall_view.c:127 +#: ../gtk/incall_view.c:150 #, c-format msgid "Transfer to call #%i with %s" msgstr "" -#: ../gtk/incall_view.c:155 -msgid "Transfer" +#: ../gtk/incall_view.c:209 ../gtk/incall_view.c:212 +msgid "Not used" msgstr "" -#: ../gtk/incall_view.c:271 +#: ../gtk/incall_view.c:219 +msgid "ICE not activated" +msgstr "" + +#: ../gtk/incall_view.c:221 +#, fuzzy +msgid "ICE failed" +msgstr "Filtro ICE" + +#: ../gtk/incall_view.c:223 +msgid "ICE in progress" +msgstr "" + +#: ../gtk/incall_view.c:225 +msgid "Going through one or more NATs" +msgstr "" + +#: ../gtk/incall_view.c:227 +#, fuzzy +msgid "Direct" +msgstr "Rediretto verso %s..." + +#: ../gtk/incall_view.c:229 +msgid "Through a relay server" +msgstr "" + +#: ../gtk/incall_view.c:238 ../gtk/incall_view.c:242 +#, c-format +msgid "" +"download: %f\n" +"upload: %f (kbit/s)" +msgstr "" + +#: ../gtk/incall_view.c:341 ../gtk/main.ui.h:12 +msgid "Hang up" +msgstr "" + +#: ../gtk/incall_view.c:430 #, fuzzy msgid "Calling..." msgstr "Linguaggio" -#: ../gtk/incall_view.c:274 ../gtk/incall_view.c:482 +#: ../gtk/incall_view.c:433 ../gtk/incall_view.c:646 msgid "00::00::00" msgstr "" -#: ../gtk/incall_view.c:285 +#: ../gtk/incall_view.c:444 #, fuzzy msgid "Incoming call" msgstr "Chimata in entrata" -#: ../gtk/incall_view.c:322 +#: ../gtk/incall_view.c:481 msgid "good" msgstr "" -#: ../gtk/incall_view.c:324 +#: ../gtk/incall_view.c:483 msgid "average" msgstr "" -#: ../gtk/incall_view.c:326 +#: ../gtk/incall_view.c:485 msgid "poor" msgstr "" -#: ../gtk/incall_view.c:328 +#: ../gtk/incall_view.c:487 msgid "very poor" msgstr "" -#: ../gtk/incall_view.c:330 +#: ../gtk/incall_view.c:489 msgid "too bad" msgstr "" -#: ../gtk/incall_view.c:331 ../gtk/incall_view.c:347 +#: ../gtk/incall_view.c:490 ../gtk/incall_view.c:506 msgid "unavailable" msgstr "" -#: ../gtk/incall_view.c:447 +#: ../gtk/incall_view.c:605 msgid "Secured by SRTP" msgstr "" -#: ../gtk/incall_view.c:453 +#: ../gtk/incall_view.c:611 #, c-format msgid "Secured by ZRTP - [auth token: %s]" msgstr "" -#: ../gtk/incall_view.c:459 +#: ../gtk/incall_view.c:617 msgid "Set unverified" msgstr "" -#: ../gtk/incall_view.c:459 ../gtk/main.ui.h:49 +#: ../gtk/incall_view.c:617 ../gtk/main.ui.h:5 msgid "Set verified" msgstr "" -#: ../gtk/incall_view.c:480 +#: ../gtk/incall_view.c:641 msgid "In conference" msgstr "" -#: ../gtk/incall_view.c:480 +#: ../gtk/incall_view.c:641 #, fuzzy msgid "In call" msgstr "In chiamata con" -#: ../gtk/incall_view.c:499 +#: ../gtk/incall_view.c:669 #, fuzzy msgid "Paused call" msgstr "Termina chiamata" -#: ../gtk/incall_view.c:511 +#: ../gtk/incall_view.c:682 #, c-format msgid "%02i::%02i::%02i" msgstr "" -#: ../gtk/incall_view.c:527 +#: ../gtk/incall_view.c:699 msgid "Call ended." msgstr "Chiamata terminata." -#: ../gtk/incall_view.c:584 +#: ../gtk/incall_view.c:731 +msgid "Transfer in progress" +msgstr "" + +#: ../gtk/incall_view.c:734 +msgid "Transfer done." +msgstr "" + +#: ../gtk/incall_view.c:737 +#, fuzzy +msgid "Transfer failed." +msgstr "Chiamata rifiutata" + +#: ../gtk/incall_view.c:781 msgid "Resume" msgstr "" -#: ../gtk/incall_view.c:591 ../gtk/main.ui.h:45 +#: ../gtk/incall_view.c:788 ../gtk/main.ui.h:9 msgid "Pause" msgstr "" @@ -548,235 +690,249 @@ msgid "Please enter login information for %s" msgstr "Prego inserire le proprie credenziali di accesso per %s" #: ../gtk/main.ui.h:1 -msgid "#" -msgstr "#" - -#: ../gtk/main.ui.h:2 -msgid "*" -msgstr "*" - -#: ../gtk/main.ui.h:3 -msgid "0" -msgstr "0" - -#: ../gtk/main.ui.h:4 -msgid "1" -msgstr "1" - -#: ../gtk/main.ui.h:5 -msgid "2" -msgstr "2" - -#: ../gtk/main.ui.h:6 -msgid "3" -msgstr "3" - -#: ../gtk/main.ui.h:7 -msgid "4" -msgstr "4" - -#: ../gtk/main.ui.h:8 -msgid "5" -msgstr "5" - -#: ../gtk/main.ui.h:9 -msgid "6" -msgstr "6" - -#: ../gtk/main.ui.h:10 -msgid "7" -msgstr "7" - -#: ../gtk/main.ui.h:11 -msgid "8" -msgstr "8" - -#: ../gtk/main.ui.h:12 -msgid "9" -msgstr "9" - -#: ../gtk/main.ui.h:13 -#, fuzzy -msgid "Add contacts from directory" -msgstr "Aggiungi nuovo contatto dalla directory %s" - -#: ../gtk/main.ui.h:14 #, fuzzy msgid "Callee name" msgstr "Chiamata terminata." +#: ../gtk/main.ui.h:2 +msgid "Send" +msgstr "Invia" + +#: ../gtk/main.ui.h:3 +msgid "End conference" +msgstr "" + +#: ../gtk/main.ui.h:4 +msgid "label" +msgstr "etichetta" + +#: ../gtk/main.ui.h:8 +msgid "Video" +msgstr "" + +#: ../gtk/main.ui.h:10 +msgid "Mute" +msgstr "" + +#: ../gtk/main.ui.h:11 +msgid "Transfer" +msgstr "" + +#: ../gtk/main.ui.h:14 +msgid "In call" +msgstr "In chiamata" + #: ../gtk/main.ui.h:15 -msgid "Welcome !" -msgstr "Benvenuto !" +msgid "Duration" +msgstr "Durata" #: ../gtk/main.ui.h:16 -msgid "A" -msgstr "A" - -#: ../gtk/main.ui.h:17 -msgid "ADSL" -msgstr "" - -#: ../gtk/main.ui.h:18 -#, fuzzy -msgid "Add contact" -msgstr "Trovato %i contatto" - -#: ../gtk/main.ui.h:19 -msgid "All users" -msgstr "" - -#: ../gtk/main.ui.h:21 -msgid "Automatically log me in" -msgstr "Login Automatico" - -#: ../gtk/main.ui.h:22 -msgid "B" -msgstr "B" - -#: ../gtk/main.ui.h:23 ../gtk/parameters.ui.h:21 -msgid "C" -msgstr "C" - -#: ../gtk/main.ui.h:24 -#, fuzzy -msgid "Call" -msgstr "Chiamata %s" - -#: ../gtk/main.ui.h:25 msgid "Call quality rating" msgstr "" -#: ../gtk/main.ui.h:26 +#: ../gtk/main.ui.h:17 +msgid "_Options" +msgstr "" + +#: ../gtk/main.ui.h:18 +msgid "Always start video" +msgstr "" + +#: ../gtk/main.ui.h:19 +msgid "Enable self-view" +msgstr "Self-view abilitato" + +#: ../gtk/main.ui.h:20 +msgid "_Help" +msgstr "" + +#: ../gtk/main.ui.h:21 +#, fuzzy +msgid "Show debug window" +msgstr "Linphone debug window" + +#: ../gtk/main.ui.h:22 +msgid "_Homepage" +msgstr "" + +#: ../gtk/main.ui.h:23 msgid "Check _Updates" msgstr "" -#: ../gtk/main.ui.h:27 +#: ../gtk/main.ui.h:24 #, fuzzy -msgid "Contacts" -msgstr "In connessione" +msgid "Account assistant" +msgstr "Configuratore di account" -#: ../gtk/main.ui.h:28 +#: ../gtk/main.ui.h:25 +msgid "SIP address or phone number:" +msgstr "Indirizzo sip o numero." + +#: ../gtk/main.ui.h:26 +msgid "Initiate a new call" +msgstr "" + +#: ../gtk/main.ui.h:27 ../gtk/parameters.ui.h:48 +msgid "Add" +msgstr "Aggiungi" + +#: ../gtk/main.ui.h:28 ../gtk/parameters.ui.h:49 +msgid "Edit" +msgstr "Edita" + +#: ../gtk/main.ui.h:29 msgid "D" msgstr "D" #: ../gtk/main.ui.h:30 -msgid "Default" -msgstr "Default" +msgid "#" +msgstr "#" #: ../gtk/main.ui.h:31 -msgid "Duration" -msgstr "Durata" +msgid "0" +msgstr "0" #: ../gtk/main.ui.h:32 -msgid "Enable self-view" -msgstr "Self-view abilitato" +msgid "*" +msgstr "*" -#: ../gtk/main.ui.h:33 -#, fuzzy -msgid "Enable video" -msgstr "Attivato" +#: ../gtk/main.ui.h:33 ../gtk/parameters.ui.h:7 +msgid "C" +msgstr "C" #: ../gtk/main.ui.h:34 -msgid "Enter username, phone number, or full sip address" -msgstr "Inserisci username, numero o indirizzo sip" +msgid "9" +msgstr "9" #: ../gtk/main.ui.h:35 -#, fuzzy -msgid "Fiber Channel" -msgstr "" -"ADSL\n" -"Fibra Ottica" +msgid "8" +msgstr "8" #: ../gtk/main.ui.h:36 -msgid "In call" -msgstr "In chiamata" +msgid "7" +msgstr "7" #: ../gtk/main.ui.h:37 -msgid "Initiate a new call" -msgstr "" +msgid "B" +msgstr "B" #: ../gtk/main.ui.h:38 -msgid "Internet connection:" -msgstr "Connessione Internet:" +msgid "6" +msgstr "6" #: ../gtk/main.ui.h:39 +msgid "5" +msgstr "5" + +#: ../gtk/main.ui.h:40 +msgid "4" +msgstr "4" + +#: ../gtk/main.ui.h:41 +msgid "A" +msgstr "A" + +#: ../gtk/main.ui.h:42 +msgid "3" +msgstr "3" + +#: ../gtk/main.ui.h:43 +msgid "2" +msgstr "2" + +#: ../gtk/main.ui.h:44 +msgid "1" +msgstr "1" + +#: ../gtk/main.ui.h:45 +msgid "Search" +msgstr "" + +#: ../gtk/main.ui.h:46 +#, fuzzy +msgid "Add contacts from directory" +msgstr "Aggiungi nuovo contatto dalla directory %s" + +#: ../gtk/main.ui.h:47 +#, fuzzy +msgid "Add contact" +msgstr "Trovato %i contatto" + +#: ../gtk/main.ui.h:48 msgid "Keypad" msgstr "" -#: ../gtk/main.ui.h:40 -msgid "Login information" -msgstr "Credenziali di accesso" +#: ../gtk/main.ui.h:49 +#, fuzzy +msgid "Recent calls" +msgstr "In chiamata" -#: ../gtk/main.ui.h:41 -msgid "Lookup:" -msgstr "" - -#: ../gtk/main.ui.h:42 +#: ../gtk/main.ui.h:50 msgid "My current identity:" msgstr "Identità corrente" -#: ../gtk/main.ui.h:43 +#: ../gtk/main.ui.h:51 ../gtk/tunnel_config.ui.h:7 +msgid "Username" +msgstr "Username" + +#: ../gtk/main.ui.h:52 ../gtk/tunnel_config.ui.h:8 +msgid "Password" +msgstr "Password" + +#: ../gtk/main.ui.h:53 +msgid "Internet connection:" +msgstr "Connessione Internet:" + +#: ../gtk/main.ui.h:54 +msgid "Automatically log me in" +msgstr "Login Automatico" + +#: ../gtk/main.ui.h:55 +msgid "Login information" +msgstr "Credenziali di accesso" + +#: ../gtk/main.ui.h:56 +msgid "Welcome !" +msgstr "Benvenuto !" + +#: ../gtk/main.ui.h:57 +msgid "All users" +msgstr "" + +#: ../gtk/main.ui.h:58 #, fuzzy msgid "Online users" msgstr "" "Tutti gli utenti\n" "Utenti Online" -#: ../gtk/main.ui.h:44 -msgid "Password" -msgstr "Password" +#: ../gtk/main.ui.h:59 +msgid "ADSL" +msgstr "" -#: ../gtk/main.ui.h:46 +#: ../gtk/main.ui.h:60 #, fuzzy -msgid "Recent calls" -msgstr "In chiamata" - -#: ../gtk/main.ui.h:47 -msgid "SIP address or phone number:" -msgstr "Indirizzo sip o numero." - -#: ../gtk/main.ui.h:48 -msgid "Search" +msgid "Fiber Channel" msgstr "" +"ADSL\n" +"Fibra Ottica" -#: ../gtk/main.ui.h:50 -#, fuzzy -msgid "Show debug window" -msgstr "Linphone debug window" +#: ../gtk/main.ui.h:61 +msgid "Default" +msgstr "Default" -#: ../gtk/main.ui.h:51 -msgid "Username" -msgstr "Username" - -#: ../gtk/main.ui.h:52 -msgid "_Help" +#: ../gtk/main.ui.h:62 +msgid "Delete" msgstr "" -#: ../gtk/main.ui.h:53 -msgid "_Homepage" -msgstr "" - -#: ../gtk/main.ui.h:54 -msgid "_Options" -msgstr "" - -#: ../gtk/main.ui.h:55 -msgid "in" -msgstr "in" - -#: ../gtk/main.ui.h:56 -msgid "label" -msgstr "etichetta" - #: ../gtk/about.ui.h:1 -msgid "(C) Belledonne Communications,2010\n" -msgstr "" - -#: ../gtk/about.ui.h:3 msgid "About linphone" msgstr "Info Linphone" +#: ../gtk/about.ui.h:2 +msgid "(C) Belledonne Communications,2010\n" +msgstr "" + #: ../gtk/about.ui.h:4 #, fuzzy msgid "An internet video phone using the standard SIP (rfc3261) protocol." @@ -797,389 +953,390 @@ msgid "" "hu: anonymous\n" msgstr "" -#: ../gtk/contact.ui.h:1 -msgid "Contact information" -msgstr "Contact informazioni" - #: ../gtk/contact.ui.h:2 -msgid "Allow this contact to see my presence status" -msgstr "Permitti al contatto di vedere il mio stato di presenza" - -#: ../gtk/contact.ui.h:4 msgid "SIP Address" msgstr "Rubrica" -#: ../gtk/contact.ui.h:5 +#: ../gtk/contact.ui.h:3 msgid "Show this contact presence status" msgstr "Mostra lo stato di presenza del contatto" +#: ../gtk/contact.ui.h:4 +msgid "Allow this contact to see my presence status" +msgstr "Permitti al contatto di vedere il mio stato di presenza" + +#: ../gtk/contact.ui.h:5 +msgid "Contact information" +msgstr "Contact informazioni" + #: ../gtk/log.ui.h:1 msgid "Linphone debug window" msgstr "Linphone debug window" +#: ../gtk/log.ui.h:2 +msgid "Scroll to end" +msgstr "" + #: ../gtk/password.ui.h:1 #, fuzzy msgid "Linphone - Authentication required" msgstr "Linphone - Autenticazione richiesta" #: ../gtk/password.ui.h:2 -msgid "Password:" -msgstr "Password:" - -#: ../gtk/password.ui.h:3 msgid "Please enter the domain password" msgstr "Prego inserire la password di dominio" -#: ../gtk/password.ui.h:4 +#: ../gtk/password.ui.h:3 msgid "UserID" msgstr "" #: ../gtk/call_logs.ui.h:1 +msgid "Call history" +msgstr "Cronologia" + +#: ../gtk/call_logs.ui.h:2 +msgid "Clear all" +msgstr "" + +#: ../gtk/call_logs.ui.h:3 #, fuzzy msgid "Call back" msgstr "Chiamata %s" -#: ../gtk/call_logs.ui.h:2 -msgid "Call history" -msgstr "Cronologia" - -#: ../gtk/call_logs.ui.h:3 -msgid "Clear all" -msgstr "" - #: ../gtk/sip_account.ui.h:1 -msgid "Configure a SIP account" -msgstr "Configurazione SIP account" - -#: ../gtk/sip_account.ui.h:2 msgid "Linphone - Configure a SIP account" msgstr "Linphone - Configurazione SIP account" -#: ../gtk/sip_account.ui.h:3 -msgid "Looks like sip:" -msgstr "" - -#: ../gtk/sip_account.ui.h:4 -msgid "Looks like sip:@" -msgstr "" - -#: ../gtk/sip_account.ui.h:5 -msgid "Publish presence information" -msgstr "Pubblica stato della presenza" - -#: ../gtk/sip_account.ui.h:6 -msgid "Register" -msgstr "" - -#: ../gtk/sip_account.ui.h:7 -msgid "Registration duration (sec):" -msgstr "Durata registrazione (sec)" - -#: ../gtk/sip_account.ui.h:8 -msgid "Route (optional):" -msgstr "Rotta (opzionale)" - -#: ../gtk/sip_account.ui.h:9 -msgid "SIP Proxy address:" -msgstr "Indirizzo sip proxy:" - -#: ../gtk/sip_account.ui.h:10 +#: ../gtk/sip_account.ui.h:2 msgid "Your SIP identity:" msgstr "Identità SIP" -#: ../gtk/sip_account.ui.h:11 +#: ../gtk/sip_account.ui.h:3 +msgid "Looks like sip:@" +msgstr "" + +#: ../gtk/sip_account.ui.h:4 msgid "sip:" msgstr "sip:" -#: ../gtk/chatroom.ui.h:1 -msgid "Send" -msgstr "Invia" +#: ../gtk/sip_account.ui.h:5 +msgid "SIP Proxy address:" +msgstr "Indirizzo sip proxy:" + +#: ../gtk/sip_account.ui.h:6 +msgid "Looks like sip:" +msgstr "" + +#: ../gtk/sip_account.ui.h:7 +msgid "Route (optional):" +msgstr "Rotta (opzionale)" + +#: ../gtk/sip_account.ui.h:8 +msgid "Registration duration (sec):" +msgstr "Durata registrazione (sec)" + +#: ../gtk/sip_account.ui.h:9 +msgid "Register" +msgstr "" + +#: ../gtk/sip_account.ui.h:10 +msgid "Publish presence information" +msgstr "Pubblica stato della presenza" + +#: ../gtk/sip_account.ui.h:11 +msgid "Configure a SIP account" +msgstr "Configurazione SIP account" #: ../gtk/parameters.ui.h:1 -msgid "0 stands for \"unlimited\"" -msgstr "0 sta per illimitato" +msgid "default soundcard" +msgstr "default scheda audio" #: ../gtk/parameters.ui.h:2 -msgid "Audio" -msgstr "Audio" +#, fuzzy +msgid "a sound card" +msgstr "una scheda audio\n" #: ../gtk/parameters.ui.h:3 -msgid "Bandwidth control" -msgstr "Gestione banda" +msgid "default camera" +msgstr "default videocamera" #: ../gtk/parameters.ui.h:4 -msgid "Codecs" -msgstr "Codecs" +msgid "CIF" +msgstr "CIF" #: ../gtk/parameters.ui.h:5 -msgid "Default identity" -msgstr "Identità di default" - -#: ../gtk/parameters.ui.h:6 -msgid "Language" -msgstr "Linguaggio" - -#: ../gtk/parameters.ui.h:7 -#, fuzzy -msgid "Level" -msgstr "Linguaggio" - -#: ../gtk/parameters.ui.h:8 -msgid "NAT and Firewall" -msgstr "NAT and Firewall" - -#: ../gtk/parameters.ui.h:9 -msgid "Network protocol and ports" -msgstr "" - -#: ../gtk/parameters.ui.h:10 -msgid "Privacy" -msgstr "Privacy" - -#: ../gtk/parameters.ui.h:11 -msgid "Proxy accounts" -msgstr "Account proxy" - -#: ../gtk/parameters.ui.h:12 -msgid "Transport" -msgstr "Transporto" - -#: ../gtk/parameters.ui.h:13 -msgid "Video" -msgstr "Video" - -#: ../gtk/parameters.ui.h:14 -msgid "" -"Adaptive rate control is a technique to dynamically guess the available " -"bandwidth during a call." -msgstr "" - -#: ../gtk/parameters.ui.h:15 -msgid "ALSA special device (optional):" -msgstr "Dispositivo ALSA (optional):" - -#: ../gtk/parameters.ui.h:16 -msgid "Add" -msgstr "Aggiungi" - -#: ../gtk/parameters.ui.h:17 -msgid "Audio RTP/UDP:" -msgstr "Audio RTP/UDP:" - -#: ../gtk/parameters.ui.h:18 #, fuzzy msgid "Audio codecs" msgstr "" "Audio codecs\n" "Video codecs" -#: ../gtk/parameters.ui.h:19 -msgid "Behind NAT / Firewall (specify gateway IP below)" -msgstr "Dietro NAT / Firewall (IP del gateway)" - -#: ../gtk/parameters.ui.h:20 -msgid "Behind NAT / Firewall (use STUN to resolve)" -msgstr "Dietro NAT / Firewall (utilizza STUN)" - -#: ../gtk/parameters.ui.h:22 -msgid "CIF" -msgstr "CIF" - -#: ../gtk/parameters.ui.h:23 -msgid "Capture device:" -msgstr "Dispositivo microfono:" - -#: ../gtk/parameters.ui.h:24 -msgid "Codecs" -msgstr "Codec" - -#: ../gtk/parameters.ui.h:25 -msgid "Direct connection to the Internet" -msgstr "Connessione diretta a internet" - -#: ../gtk/parameters.ui.h:26 -msgid "Disable" -msgstr "Disattivato" - -#: ../gtk/parameters.ui.h:27 -msgid "Done" -msgstr "Fatto" - -#: ../gtk/parameters.ui.h:28 -msgid "Download speed limit in Kbit/sec:" -msgstr "Velocita massima in Dowload Kbit/sec" - -#: ../gtk/parameters.ui.h:29 -msgid "Edit" -msgstr "Edita" - -#: ../gtk/parameters.ui.h:30 -msgid "Enable" -msgstr "Attivato" - -#: ../gtk/parameters.ui.h:31 -msgid "Enable adaptive rate control" -msgstr "" - -#: ../gtk/parameters.ui.h:32 -msgid "Enable echo cancellation" -msgstr "Attiva cancellazione eco" - -#: ../gtk/parameters.ui.h:33 -msgid "Erase all passwords" -msgstr "Cancella tutte le password" - -#: ../gtk/parameters.ui.h:34 -msgid "Manage SIP Accounts" -msgstr "Gestici SIP Account" - -#: ../gtk/parameters.ui.h:35 -msgid "Media encryption type" -msgstr "" - -#: ../gtk/parameters.ui.h:36 -msgid "Multimedia settings" -msgstr "Impostazioni multimediali" - -#: ../gtk/parameters.ui.h:37 -msgid "Network settings" -msgstr "Impostazioni di rete" - -#: ../gtk/parameters.ui.h:38 -msgid "Playback device:" -msgstr "Dispositivo uscita audio:" - -#: ../gtk/parameters.ui.h:39 -msgid "Prefered video resolution:" -msgstr "Risoluzione video preferita" - -#: ../gtk/parameters.ui.h:40 -msgid "Public IP address:" -msgstr "Indirizzo ip pubblico:" - -#: ../gtk/parameters.ui.h:41 -msgid "" -"Register to FONICS\n" -"virtual network !" -msgstr "" -"Registrati a FONICS\n" -"virtual network !" - -#: ../gtk/parameters.ui.h:43 -msgid "Remove" -msgstr "Rimuovi" - -#: ../gtk/parameters.ui.h:44 -msgid "Ring device:" -msgstr "Dispositivo squillo:" - -#: ../gtk/parameters.ui.h:45 -msgid "Ring sound:" -msgstr "Suoneria:" - -#: ../gtk/parameters.ui.h:46 -#, fuzzy -msgid "SIP (TCP)" -msgstr "SIP (UDP)" - -#: ../gtk/parameters.ui.h:47 -#, fuzzy -msgid "SIP (TLS)" -msgstr "SIP (UDP)" - -#: ../gtk/parameters.ui.h:48 -#, fuzzy -msgid "SIP (UDP)" -msgstr "SIP (UDP)" - -#: ../gtk/parameters.ui.h:49 -msgid "Send DTMFs as SIP info" -msgstr "Invia DTMF come SIP info" - -#: ../gtk/parameters.ui.h:50 -msgid "Set Maximum Transmission Unit:" -msgstr "Imposta Maximum Transmission Unit:" - -#: ../gtk/parameters.ui.h:51 -msgid "Settings" -msgstr "Preferenze" - -#: ../gtk/parameters.ui.h:52 -msgid "Show advanced settings" -msgstr "" - -#: ../gtk/parameters.ui.h:53 -msgid "Stun server:" -msgstr "Stun server:" - -#: ../gtk/parameters.ui.h:54 -msgid "This section defines your SIP address when not using a SIP account" -msgstr "" -"questa sezione definisce il tuo indirizzo SIP se non hai account attivi" - -#: ../gtk/parameters.ui.h:55 -msgid "Upload speed limit in Kbit/sec:" -msgstr "Velocità massima in upload Kbit/sec:" - -#: ../gtk/parameters.ui.h:56 -msgid "Use IPv6 instead of IPv4" -msgstr "Usa IPv6 invece che IPv4" - -#: ../gtk/parameters.ui.h:57 -msgid "User interface" -msgstr "Interfaccia utente" - -#: ../gtk/parameters.ui.h:58 -msgid "Video RTP/UDP:" -msgstr "Video RTP/UDP" - -#: ../gtk/parameters.ui.h:59 +#: ../gtk/parameters.ui.h:6 #, fuzzy msgid "Video codecs" msgstr "" "Audio codecs\n" "Video codecs" -#: ../gtk/parameters.ui.h:60 +#: ../gtk/parameters.ui.h:8 +#, fuzzy +msgid "SIP (UDP)" +msgstr "SIP (UDP)" + +#: ../gtk/parameters.ui.h:9 +#, fuzzy +msgid "SIP (TCP)" +msgstr "SIP (UDP)" + +#: ../gtk/parameters.ui.h:10 +#, fuzzy +msgid "SIP (TLS)" +msgstr "SIP (UDP)" + +#: ../gtk/parameters.ui.h:11 +msgid "Settings" +msgstr "Preferenze" + +#: ../gtk/parameters.ui.h:12 +msgid "Set Maximum Transmission Unit:" +msgstr "Imposta Maximum Transmission Unit:" + +#: ../gtk/parameters.ui.h:13 +msgid "Send DTMFs as SIP info" +msgstr "Invia DTMF come SIP info" + +#: ../gtk/parameters.ui.h:14 +msgid "Use IPv6 instead of IPv4" +msgstr "Usa IPv6 invece che IPv4" + +#: ../gtk/parameters.ui.h:15 +msgid "Transport" +msgstr "Transporto" + +#: ../gtk/parameters.ui.h:16 +msgid "Media encryption type" +msgstr "" + +#: ../gtk/parameters.ui.h:17 +msgid "Tunnel" +msgstr "" + +#: ../gtk/parameters.ui.h:18 +msgid "Video RTP/UDP:" +msgstr "Video RTP/UDP" + +#: ../gtk/parameters.ui.h:19 +msgid "Audio RTP/UDP:" +msgstr "Audio RTP/UDP:" + +#: ../gtk/parameters.ui.h:20 +msgid "DSCP fields" +msgstr "" + +#: ../gtk/parameters.ui.h:21 +msgid "Fixed" +msgstr "" + +#: ../gtk/parameters.ui.h:22 +msgid "Network protocol and ports" +msgstr "" + +#: ../gtk/parameters.ui.h:23 +msgid "Direct connection to the Internet" +msgstr "Connessione diretta a internet" + +#: ../gtk/parameters.ui.h:24 +msgid "Behind NAT / Firewall (specify gateway IP below)" +msgstr "Dietro NAT / Firewall (IP del gateway)" + +#: ../gtk/parameters.ui.h:25 +msgid "Public IP address:" +msgstr "Indirizzo ip pubblico:" + +#: ../gtk/parameters.ui.h:26 +msgid "Behind NAT / Firewall (use STUN to resolve)" +msgstr "Dietro NAT / Firewall (utilizza STUN)" + +#: ../gtk/parameters.ui.h:27 +#, fuzzy +msgid "Behind NAT / Firewall (use ICE)" +msgstr "Dietro NAT / Firewall (utilizza STUN)" + +#: ../gtk/parameters.ui.h:28 +msgid "Stun server:" +msgstr "Stun server:" + +#: ../gtk/parameters.ui.h:29 +msgid "NAT and Firewall" +msgstr "NAT and Firewall" + +#: ../gtk/parameters.ui.h:30 +msgid "Network settings" +msgstr "Impostazioni di rete" + +#: ../gtk/parameters.ui.h:31 +msgid "Ring sound:" +msgstr "Suoneria:" + +#: ../gtk/parameters.ui.h:32 +msgid "ALSA special device (optional):" +msgstr "Dispositivo ALSA (optional):" + +#: ../gtk/parameters.ui.h:33 +msgid "Capture device:" +msgstr "Dispositivo microfono:" + +#: ../gtk/parameters.ui.h:34 +msgid "Ring device:" +msgstr "Dispositivo squillo:" + +#: ../gtk/parameters.ui.h:35 +msgid "Playback device:" +msgstr "Dispositivo uscita audio:" + +#: ../gtk/parameters.ui.h:36 +msgid "Enable echo cancellation" +msgstr "Attiva cancellazione eco" + +#: ../gtk/parameters.ui.h:37 +msgid "Audio" +msgstr "Audio" + +#: ../gtk/parameters.ui.h:38 msgid "Video input device:" msgstr "Dispositivo Video:" -#: ../gtk/parameters.ui.h:61 +#: ../gtk/parameters.ui.h:39 +msgid "Prefered video resolution:" +msgstr "Risoluzione video preferita" + +#: ../gtk/parameters.ui.h:40 +msgid "Video" +msgstr "Video" + +#: ../gtk/parameters.ui.h:41 +msgid "Multimedia settings" +msgstr "Impostazioni multimediali" + +#: ../gtk/parameters.ui.h:42 +msgid "This section defines your SIP address when not using a SIP account" +msgstr "" +"questa sezione definisce il tuo indirizzo SIP se non hai account attivi" + +#: ../gtk/parameters.ui.h:43 msgid "Your display name (eg: John Doe):" msgstr "Nome visualizzato (es: Mario Rossi):" -#: ../gtk/parameters.ui.h:62 -msgid "Your resulting SIP address:" -msgstr "Il tuo indirizzo sip:" - -#: ../gtk/parameters.ui.h:63 +#: ../gtk/parameters.ui.h:44 msgid "Your username:" msgstr "Username" +#: ../gtk/parameters.ui.h:45 +msgid "Your resulting SIP address:" +msgstr "Il tuo indirizzo sip:" + +#: ../gtk/parameters.ui.h:46 +msgid "Default identity" +msgstr "Identità di default" + +#: ../gtk/parameters.ui.h:47 +msgid "Wizard" +msgstr "" + +#: ../gtk/parameters.ui.h:50 +msgid "Remove" +msgstr "Rimuovi" + +#: ../gtk/parameters.ui.h:51 +msgid "Proxy accounts" +msgstr "Account proxy" + +#: ../gtk/parameters.ui.h:52 +msgid "Erase all passwords" +msgstr "Cancella tutte le password" + +#: ../gtk/parameters.ui.h:53 +msgid "Privacy" +msgstr "Privacy" + +#: ../gtk/parameters.ui.h:54 +msgid "Manage SIP Accounts" +msgstr "Gestici SIP Account" + +#: ../gtk/parameters.ui.h:55 ../gtk/tunnel_config.ui.h:4 +msgid "Enable" +msgstr "Attivato" + +#: ../gtk/parameters.ui.h:56 ../gtk/tunnel_config.ui.h:5 +msgid "Disable" +msgstr "Disattivato" + +#: ../gtk/parameters.ui.h:57 +msgid "Codecs" +msgstr "Codecs" + +#: ../gtk/parameters.ui.h:58 +msgid "0 stands for \"unlimited\"" +msgstr "0 sta per illimitato" + +#: ../gtk/parameters.ui.h:59 +msgid "Upload speed limit in Kbit/sec:" +msgstr "Velocità massima in upload Kbit/sec:" + +#: ../gtk/parameters.ui.h:60 +msgid "Download speed limit in Kbit/sec:" +msgstr "Velocita massima in Dowload Kbit/sec" + +#: ../gtk/parameters.ui.h:61 +msgid "Enable adaptive rate control" +msgstr "" + +#: ../gtk/parameters.ui.h:62 +msgid "" +"Adaptive rate control is a technique to dynamically guess the available " +"bandwidth during a call." +msgstr "" + +#: ../gtk/parameters.ui.h:63 +msgid "Bandwidth control" +msgstr "Gestione banda" + #: ../gtk/parameters.ui.h:64 -#, fuzzy -msgid "a sound card" -msgstr "una scheda audio\n" +msgid "Codecs" +msgstr "Codec" #: ../gtk/parameters.ui.h:65 -msgid "default camera" -msgstr "default videocamera" +msgid "Language" +msgstr "Linguaggio" #: ../gtk/parameters.ui.h:66 -msgid "default soundcard" -msgstr "default scheda audio" +msgid "Show advanced settings" +msgstr "" + +#: ../gtk/parameters.ui.h:67 +#, fuzzy +msgid "Level" +msgstr "Linguaggio" + +#: ../gtk/parameters.ui.h:68 +msgid "User interface" +msgstr "Interfaccia utente" + +#: ../gtk/parameters.ui.h:69 +msgid "Done" +msgstr "Fatto" #: ../gtk/buddylookup.ui.h:1 -msgid "Search somebody" -msgstr "Cerca" +msgid "Search contacts in directory" +msgstr "Cerca contatti nella directory" #: ../gtk/buddylookup.ui.h:2 msgid "Add to my list" msgstr "Aggiungi alla mia lista" #: ../gtk/buddylookup.ui.h:3 -msgid "Search contacts in directory" -msgstr "Cerca contatti nella directory" +msgid "Search somebody" +msgstr "Cerca" #: ../gtk/waiting.ui.h:1 msgid "Linphone" @@ -1189,19 +1346,99 @@ msgstr "Linphone" msgid "Please wait" msgstr "Prego attendere" -#: ../coreapi/linphonecore.c:187 +#: ../gtk/dscp_settings.ui.h:1 +#, fuzzy +msgid "Dscp settings" +msgstr "Preferenze" + +#: ../gtk/dscp_settings.ui.h:2 +msgid "SIP" +msgstr "" + +#: ../gtk/dscp_settings.ui.h:3 +#, fuzzy +msgid "Audio RTP stream" +msgstr "campionatore di frequenza" + +#: ../gtk/dscp_settings.ui.h:4 +#, fuzzy +msgid "Video RTP stream" +msgstr "Video RTP/UDP" + +#: ../gtk/dscp_settings.ui.h:5 +msgid "Set DSCP values (in hexadecimal)" +msgstr "" + +#: ../gtk/call_statistics.ui.h:1 +#, fuzzy +msgid "Call statistics" +msgstr "Chiamata %s" + +#: ../gtk/call_statistics.ui.h:2 +#, fuzzy +msgid "Audio codec" +msgstr "" +"Audio codecs\n" +"Video codecs" + +#: ../gtk/call_statistics.ui.h:3 +#, fuzzy +msgid "Video codec" +msgstr "" +"Audio codecs\n" +"Video codecs" + +#: ../gtk/call_statistics.ui.h:4 +msgid "Audio IP bandwidth usage" +msgstr "" + +#: ../gtk/call_statistics.ui.h:5 +msgid "Media connectivity" +msgstr "" + +#: ../gtk/call_statistics.ui.h:6 +msgid "Video IP bandwidth usage" +msgstr "" + +#: ../gtk/call_statistics.ui.h:7 +#, fuzzy +msgid "Call statistics and information" +msgstr "Contact informazioni" + +#: ../gtk/tunnel_config.ui.h:1 +#, fuzzy +msgid "Configure VoIP tunnel" +msgstr "Configurazione SIP account" + +#: ../gtk/tunnel_config.ui.h:2 +msgid "Host" +msgstr "" + +#: ../gtk/tunnel_config.ui.h:3 +msgid "Port" +msgstr "" + +#: ../gtk/tunnel_config.ui.h:6 +msgid "Configure tunnel" +msgstr "" + +#: ../gtk/tunnel_config.ui.h:9 +msgid "Configure http proxy (optional)" +msgstr "" + +#: ../coreapi/linphonecore.c:232 msgid "aborted" msgstr "annullato" -#: ../coreapi/linphonecore.c:190 +#: ../coreapi/linphonecore.c:235 msgid "completed" msgstr "comletato" -#: ../coreapi/linphonecore.c:193 +#: ../coreapi/linphonecore.c:238 msgid "missed" msgstr "mancante" -#: ../coreapi/linphonecore.c:198 +#: ../coreapi/linphonecore.c:243 #, c-format msgid "" "%s at %s\n" @@ -1216,23 +1453,23 @@ msgstr "" "Stato: %s\n" "Durata: %i mn %i sec\n" -#: ../coreapi/linphonecore.c:199 +#: ../coreapi/linphonecore.c:244 msgid "Outgoing call" msgstr "Chiamata in uscita" -#: ../coreapi/linphonecore.c:1088 +#: ../coreapi/linphonecore.c:1226 msgid "Ready" msgstr "Pronto" -#: ../coreapi/linphonecore.c:1831 +#: ../coreapi/linphonecore.c:2074 msgid "Looking for telephone number destination..." msgstr "Ricerca numero destinazione..." -#: ../coreapi/linphonecore.c:1834 +#: ../coreapi/linphonecore.c:2077 msgid "Could not resolve this number." msgstr "Impossibile risolvere il numero." -#: ../coreapi/linphonecore.c:1878 +#: ../coreapi/linphonecore.c:2121 msgid "" "Could not parse given sip address. A sip url usually looks like sip:" "user@domain" @@ -1240,43 +1477,56 @@ msgstr "" "Errore nel formato del contatto sip. Usualmente un indirizzo appare sip:" "user@domain" -#: ../coreapi/linphonecore.c:2025 +#: ../coreapi/linphonecore.c:2312 msgid "Contacting" msgstr "In connessione" -#: ../coreapi/linphonecore.c:2032 +#: ../coreapi/linphonecore.c:2319 #, fuzzy msgid "Could not call" msgstr "chiamata fallita" -#: ../coreapi/linphonecore.c:2140 +#: ../coreapi/linphonecore.c:2429 msgid "Sorry, we have reached the maximum number of simultaneous calls" msgstr "" -#: ../coreapi/linphonecore.c:2270 +#: ../coreapi/linphonecore.c:2573 +#, fuzzy +msgid "is contacting you" +msgstr "ti sta conttatando." + +#: ../coreapi/linphonecore.c:2574 +msgid " and asked autoanswer." +msgstr "" + +#: ../coreapi/linphonecore.c:2574 +msgid "." +msgstr "" + +#: ../coreapi/linphonecore.c:2636 msgid "Modifying call parameters..." msgstr "" -#: ../coreapi/linphonecore.c:2366 +#: ../coreapi/linphonecore.c:2908 msgid "Connected." msgstr "Connessione" -#: ../coreapi/linphonecore.c:2389 +#: ../coreapi/linphonecore.c:2931 #, fuzzy msgid "Call aborted" msgstr "annullato" -#: ../coreapi/linphonecore.c:2530 +#: ../coreapi/linphonecore.c:3102 #, fuzzy msgid "Could not pause the call" msgstr "chiamata fallita" -#: ../coreapi/linphonecore.c:2535 +#: ../coreapi/linphonecore.c:3107 #, fuzzy msgid "Pausing the current call..." msgstr "Mostra chiamata corrente" -#: ../coreapi/misc.c:147 +#: ../coreapi/misc.c:148 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the pcm oss emulation module\n" @@ -1288,7 +1538,7 @@ msgstr "" "è assente e linphone lo richede. Prego eseguire\n" "'modprobe snd-pcm-oss' da utente root per caricarlo." -#: ../coreapi/misc.c:150 +#: ../coreapi/misc.c:151 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the mixer oss emulation module\n" @@ -1300,10 +1550,14 @@ msgstr "" "è assente e linphone lo richede. Prego eseguire\n" "'modprobe snd-mixer-oss' da utente root per caricarlo." -#: ../coreapi/misc.c:478 +#: ../coreapi/misc.c:496 msgid "Stun lookup in progress..." msgstr "Ricerca Stun in progresso ..." +#: ../coreapi/misc.c:630 +msgid "ICE local candidates gathering in progress..." +msgstr "" + #: ../coreapi/friend.c:33 msgid "Online" msgstr "Onlinea" @@ -1352,7 +1606,7 @@ msgstr "Pendente" msgid "Unknown-bug" msgstr "Bug-sconosciuto" -#: ../coreapi/proxy.c:192 +#: ../coreapi/proxy.c:204 msgid "" "The sip proxy address you entered is invalid, it must start with \"sip:\" " "followed by a hostname." @@ -1360,7 +1614,7 @@ msgstr "" "L'indirizzo sip proxy utilizzato è invalido, deve iniziare con \"sip:\" " "seguito dall' hostaname." -#: ../coreapi/proxy.c:198 +#: ../coreapi/proxy.c:210 msgid "" "The sip identity you entered is invalid.\n" "It should look like sip:username@proxydomain, such as sip:alice@example.net" @@ -1368,152 +1622,195 @@ msgstr "" "L'identità sip utilizza è invalida.\n" "Dovrebbre essere sip:username@proxydomain, esempio: sip:alice@example.net" -#: ../coreapi/proxy.c:690 +#: ../coreapi/proxy.c:1053 #, c-format msgid "Could not login as %s" msgstr "impossibile login come %s" -#: ../coreapi/callbacks.c:206 -#, fuzzy -msgid "is contacting you" -msgstr "ti sta conttatando." - -#: ../coreapi/callbacks.c:207 -msgid " and asked autoanswer." -msgstr "" - -#: ../coreapi/callbacks.c:207 -msgid "." -msgstr "" - -#: ../coreapi/callbacks.c:266 +#: ../coreapi/callbacks.c:276 msgid "Remote ringing." msgstr "" -#: ../coreapi/callbacks.c:282 +#: ../coreapi/callbacks.c:296 msgid "Remote ringing..." msgstr "" -#: ../coreapi/callbacks.c:293 +#: ../coreapi/callbacks.c:307 msgid "Early media." msgstr "" -#: ../coreapi/callbacks.c:331 +#: ../coreapi/callbacks.c:352 #, fuzzy, c-format msgid "Call with %s is paused." msgstr "Chat con %s" -#: ../coreapi/callbacks.c:342 +#: ../coreapi/callbacks.c:365 #, c-format msgid "Call answered by %s - on hold." msgstr "" -#: ../coreapi/callbacks.c:357 +#: ../coreapi/callbacks.c:376 #, fuzzy msgid "Call resumed." msgstr "Chiamata terminata" -#: ../coreapi/callbacks.c:362 +#: ../coreapi/callbacks.c:381 #, c-format msgid "Call answered by %s." msgstr "" -#: ../coreapi/callbacks.c:432 -msgid "We are being paused..." +#: ../coreapi/callbacks.c:396 +msgid "Incompatible, check codecs..." msgstr "" -#: ../coreapi/callbacks.c:436 -msgid "We have been resumed..." +#: ../coreapi/callbacks.c:437 +msgid "We have been resumed." msgstr "" -#: ../coreapi/callbacks.c:441 -msgid "Call has been updated by remote..." +#: ../coreapi/callbacks.c:446 +msgid "We are paused by other party." msgstr "" -#: ../coreapi/callbacks.c:473 +#: ../coreapi/callbacks.c:452 +msgid "Call is updated by remote." +msgstr "" + +#: ../coreapi/callbacks.c:521 msgid "Call terminated." msgstr "Chiamata terminata." -#: ../coreapi/callbacks.c:480 +#: ../coreapi/callbacks.c:528 msgid "User is busy." msgstr "Utente occupato" -#: ../coreapi/callbacks.c:481 +#: ../coreapi/callbacks.c:529 msgid "User is temporarily unavailable." msgstr "Utente non disponibile" #. char *retrymsg=_("%s. Retry after %i minute(s)."); -#: ../coreapi/callbacks.c:483 +#: ../coreapi/callbacks.c:531 msgid "User does not want to be disturbed." msgstr "L'utente non vuole essere disturbato" -#: ../coreapi/callbacks.c:484 +#: ../coreapi/callbacks.c:532 msgid "Call declined." msgstr "Chiamata rifiutata" -#: ../coreapi/callbacks.c:496 +#: ../coreapi/callbacks.c:544 #, fuzzy msgid "No response." msgstr "timeout no risposta" -#: ../coreapi/callbacks.c:500 +#: ../coreapi/callbacks.c:548 msgid "Protocol error." msgstr "" -#: ../coreapi/callbacks.c:516 +#: ../coreapi/callbacks.c:564 #, fuzzy msgid "Redirected" msgstr "Rediretto verso %s..." -#: ../coreapi/callbacks.c:526 -msgid "Not found" +#: ../coreapi/callbacks.c:600 +msgid "Incompatible media parameters." msgstr "" -#: ../coreapi/callbacks.c:551 -msgid "No common codecs" -msgstr "" - -#: ../coreapi/callbacks.c:557 +#: ../coreapi/callbacks.c:606 #, fuzzy msgid "Call failed." msgstr "Chiamata rifiutata" -#: ../coreapi/callbacks.c:631 +#: ../coreapi/callbacks.c:701 #, c-format msgid "Registration on %s successful." msgstr "Registrazione su %s attiva" -#: ../coreapi/callbacks.c:632 +#: ../coreapi/callbacks.c:702 #, c-format msgid "Unregistration on %s done." msgstr "Unregistrazione su %s" -#: ../coreapi/callbacks.c:648 +#: ../coreapi/callbacks.c:722 msgid "no response timeout" msgstr "timeout no risposta" -#: ../coreapi/callbacks.c:651 +#: ../coreapi/callbacks.c:725 #, c-format msgid "Registration on %s failed: %s" msgstr "Registrazione su %s fallita: %s" -#: ../coreapi/sal_eXosip2.c:873 ../coreapi/sal_eXosip2.c:875 -#, fuzzy -msgid "Authentication failure" -msgstr "Linphone - Autenticazione richiesta" - -#: ../coreapi/linphonecall.c:128 +#: ../coreapi/linphonecall.c:129 #, fuzzy, c-format msgid "Authentication token is %s" msgstr "Linphone - Autenticazione richiesta" -#: ../coreapi/linphonecall.c:1560 +#: ../coreapi/linphonecall.c:2124 #, c-format msgid "You have missed %i call." msgid_plural "You have missed %i calls." msgstr[0] "" msgstr[1] "" +#~ msgid "Chat with %s" +#~ msgstr "Chat con %s" + +#~ msgid "Please choose a username:" +#~ msgstr "Prego scegliere un username" + +#~ msgid "Checking if '%s' is available..." +#~ msgstr "Controllo se '%s' è disponibile..." + +#~ msgid "Please wait..." +#~ msgstr "Prego attendere ..." + +#~ msgid "Sorry this username already exists. Please try a new one." +#~ msgstr "Spiacenti, questo usernsame è gia utilizzato. Prego riprovare" + +#~ msgid "Ok !" +#~ msgstr "Ok !" + +#~ msgid "Communication problem, please try again later." +#~ msgstr "Errore di comunicazione, prego riprovare." + +#~ msgid "Choosing a username" +#~ msgstr "Scegli un username" + +#~ msgid "Verifying" +#~ msgstr "Verifica" + +#~ msgid "Confirmation" +#~ msgstr "Informazioni" + +#~ msgid "Creating your account" +#~ msgstr "Creazione account" + +#~ msgid "Now ready !" +#~ msgstr "Pronto !" + +#, fuzzy +#~ msgid "Contacts" +#~ msgstr "In connessione" + +#, fuzzy +#~ msgid "Enable video" +#~ msgstr "Attivato" + +#~ msgid "Enter username, phone number, or full sip address" +#~ msgstr "Inserisci username, numero o indirizzo sip" + +#~ msgid "in" +#~ msgstr "in" + +#~ msgid "" +#~ "Register to FONICS\n" +#~ "virtual network !" +#~ msgstr "" +#~ "Registrati a FONICS\n" +#~ "virtual network !" + +#, fuzzy +#~ msgid "Authentication failure" +#~ msgstr "Linphone - Autenticazione richiesta" + #~ msgid "Unmute" #~ msgstr "" #~ "Attiva\n" @@ -1592,10 +1889,6 @@ msgstr[1] "" #~ msgid "A filter that send several inputs to one output." #~ msgstr "Un filtro che invia alcuni inputs in un unico output" -#, fuzzy -#~ msgid "Audio resampler" -#~ msgstr "campionatore di frequenza" - #~ msgid "RTP output filter" #~ msgstr "RTP output filter" @@ -1702,9 +1995,6 @@ msgstr[1] "" #~ msgid "A video for windows (vfw.h) based source filter to grab pictures." #~ msgstr "Un filtro (vfw.h) per catturare immagini." -#~ msgid "ICE filter" -#~ msgstr "Filtro ICE" - #~ msgid "Parametric sound equalizer." #~ msgstr "Equalizzatore di suono." @@ -1759,16 +2049,9 @@ msgstr[1] "" #~ msgid "Assistant" #~ msgstr "Configuratore" -#, fuzzy -#~ msgid "Call Details" -#~ msgstr "Chiamata %s" - #~ msgid "Start call" #~ msgstr "Inizia chiamata" -#~ msgid "Terminate call" -#~ msgstr "Termina chiamata" - #~ msgid "_Modes" #~ msgstr "_Modi" diff --git a/po/ja.po b/po/ja.po index 7d95f6087..c2ed8c87d 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: 2011-12-05 12:41+0100\n" +"POT-Creation-Date: 2013-01-08 10:35+0100\n" "PO-Revision-Date: 2003-01-21 00:05+9000\n" "Last-Translator: YAMAGUCHI YOSHIYA \n" "Language-Team: \n" @@ -17,32 +17,53 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../gtk/calllogs.c:71 +#: ../gtk/calllogs.c:82 +#, fuzzy +msgid "Aborted" +msgstr "通話はキャンセルされました。" + +#: ../gtk/calllogs.c:85 +msgid "Missed" +msgstr "" + +#: ../gtk/calllogs.c:88 +#, fuzzy +msgid "Declined" +msgstr "ライン入力" + +#: ../gtk/calllogs.c:94 #, c-format msgid "%i minute" msgid_plural "%i minutes" msgstr[0] "" msgstr[1] "" -#: ../gtk/calllogs.c:74 +#: ../gtk/calllogs.c:97 #, c-format msgid "%i second" msgid_plural "%i seconds" msgstr[0] "" msgstr[1] "" -#: ../gtk/calllogs.c:77 +#: ../gtk/calllogs.c:100 #, c-format msgid "" "%s\t%s\tQuality: %s\n" "%s\t%s %s\t" msgstr "" -#: ../gtk/calllogs.c:79 +#: ../gtk/calllogs.c:102 msgid "n/a" msgstr "" -#: ../gtk/conference.c:33 ../gtk/incall_view.c:183 +#: ../gtk/calllogs.c:105 +#, c-format +msgid "" +"%s\t%s\t\n" +"%s\t%s" +msgstr "" + +#: ../gtk/conference.c:33 ../gtk/main.ui.h:13 msgid "Conference" msgstr "" @@ -55,43 +76,42 @@ msgstr "" msgid "Couldn't find pixmap file: %s" msgstr "pixmapファイルが見つかりません %s" -#: ../gtk/chat.c:27 -#, c-format -msgid "Chat with %s" -msgstr "" - -#: ../gtk/main.c:83 +#: ../gtk/main.c:89 msgid "log to stdout some debug information while running." msgstr "" -#: ../gtk/main.c:90 +#: ../gtk/main.c:96 msgid "path to a file to write logs into." msgstr "" -#: ../gtk/main.c:97 +#: ../gtk/main.c:103 +msgid "Start linphone with video disabled." +msgstr "" + +#: ../gtk/main.c:110 msgid "Start only in the system tray, do not show the main interface." msgstr "" -#: ../gtk/main.c:104 +#: ../gtk/main.c:117 msgid "address to call right now" msgstr "" -#: ../gtk/main.c:111 +#: ../gtk/main.c:124 msgid "if set automatically answer incoming calls" msgstr "" -#: ../gtk/main.c:118 +#: ../gtk/main.c:131 msgid "" "Specifiy a working directory (should be the base of the installation, eg: c:" "\\Program Files\\Linphone)" msgstr "" -#: ../gtk/main.c:464 +#: ../gtk/main.c:498 #, c-format msgid "Call with %s" msgstr "" -#: ../gtk/main.c:815 +#: ../gtk/main.c:871 #, c-format msgid "" "%s would like to add you to his contact list.\n" @@ -100,229 +120,247 @@ msgid "" "If you answer no, this person will be temporarily blacklisted." msgstr "" -#: ../gtk/main.c:893 +#: ../gtk/main.c:948 #, c-format msgid "" "Please enter your password for username %s\n" " at domain %s:" msgstr "" -#: ../gtk/main.c:993 +#: ../gtk/main.c:1051 #, fuzzy msgid "Call error" msgstr "通話はキャンセルされました。" -#: ../gtk/main.c:996 ../coreapi/linphonecore.c:2406 +#: ../gtk/main.c:1054 ../coreapi/linphonecore.c:2949 #, fuzzy msgid "Call ended" msgstr "通話は拒否されました。" -#: ../gtk/main.c:999 ../coreapi/linphonecore.c:199 +#: ../gtk/main.c:1057 ../coreapi/linphonecore.c:244 msgid "Incoming call" msgstr "" -#: ../gtk/main.c:1001 ../gtk/incall_view.c:292 ../gtk/main.ui.h:20 +#: ../gtk/main.c:1059 ../gtk/incall_view.c:451 ../gtk/main.ui.h:6 msgid "Answer" msgstr "" -#: ../gtk/main.c:1003 ../gtk/main.ui.h:29 +#: ../gtk/main.c:1061 ../gtk/main.ui.h:7 #, fuzzy msgid "Decline" msgstr "ライン入力" -#: ../gtk/main.c:1009 +#: ../gtk/main.c:1067 #, fuzzy msgid "Call paused" msgstr "通話はキャンセルされました。" -#: ../gtk/main.c:1009 +#: ../gtk/main.c:1067 #, c-format msgid "by %s" msgstr "" -#: ../gtk/main.c:1165 +#: ../gtk/main.c:1116 +#, c-format +msgid "%s proposed to start video. Do you accept ?" +msgstr "" + +#: ../gtk/main.c:1278 msgid "Website link" msgstr "" -#: ../gtk/main.c:1205 +#: ../gtk/main.c:1318 msgid "Linphone - a video internet phone" msgstr "" -#: ../gtk/main.c:1295 +#: ../gtk/main.c:1410 #, c-format msgid "%s (Default)" msgstr "" -#: ../gtk/main.c:1566 ../coreapi/callbacks.c:700 +#: ../gtk/main.c:1714 ../coreapi/callbacks.c:774 #, c-format msgid "We are transferred to %s" msgstr "" -#: ../gtk/main.c:1576 +#: ../gtk/main.c:1724 msgid "" "No sound cards have been detected on this computer.\n" "You won't be able to send or receive audio calls." msgstr "" -#: ../gtk/main.c:1663 +#: ../gtk/main.c:1833 msgid "A free SIP video-phone" msgstr "" -#: ../gtk/friendlist.c:203 +#: ../gtk/friendlist.c:335 #, fuzzy msgid "Add to addressbook" msgstr "電話帳" -#: ../gtk/friendlist.c:258 ../gtk/propertybox.c:296 ../gtk/contact.ui.h:3 -msgid "Name" -msgstr "名前" - -#: ../gtk/friendlist.c:271 +#: ../gtk/friendlist.c:509 #, fuzzy msgid "Presence status" msgstr "状態" -#: ../gtk/friendlist.c:308 +#: ../gtk/friendlist.c:526 ../gtk/propertybox.c:362 ../gtk/contact.ui.h:1 +msgid "Name" +msgstr "名前" + +#: ../gtk/friendlist.c:538 +#, fuzzy +msgid "Call" +msgstr "通話はキャンセルされました。" + +#: ../gtk/friendlist.c:543 +msgid "Chat" +msgstr "" + +#: ../gtk/friendlist.c:573 #, c-format msgid "Search in %s directory" msgstr "" -#: ../gtk/friendlist.c:568 +#: ../gtk/friendlist.c:730 msgid "Invalid sip contact !" msgstr "" -#: ../gtk/friendlist.c:613 +#: ../gtk/friendlist.c:775 #, c-format msgid "Call %s" msgstr "" -#: ../gtk/friendlist.c:614 +#: ../gtk/friendlist.c:776 #, c-format msgid "Send text to %s" msgstr "" -#: ../gtk/friendlist.c:615 +#: ../gtk/friendlist.c:777 #, fuzzy, c-format msgid "Edit contact '%s'" msgstr "(接続するための情報がありません!)" -#: ../gtk/friendlist.c:616 +#: ../gtk/friendlist.c:778 #, c-format msgid "Delete contact '%s'" msgstr "" -#: ../gtk/friendlist.c:658 +#: ../gtk/friendlist.c:820 #, c-format msgid "Add new contact from %s directory" msgstr "" -#: ../gtk/propertybox.c:302 +#: ../gtk/propertybox.c:368 msgid "Rate (Hz)" msgstr "" -#: ../gtk/propertybox.c:308 +#: ../gtk/propertybox.c:374 msgid "Status" msgstr "状態" -#: ../gtk/propertybox.c:314 +#: ../gtk/propertybox.c:380 msgid "Min bitrate (kbit/s)" msgstr "最低限のビットレート (kbit/s)" -#: ../gtk/propertybox.c:321 +#: ../gtk/propertybox.c:387 msgid "Parameters" msgstr "パラメーター" -#: ../gtk/propertybox.c:364 ../gtk/propertybox.c:507 +#: ../gtk/propertybox.c:430 ../gtk/propertybox.c:573 msgid "Enabled" msgstr "使用する" -#: ../gtk/propertybox.c:366 ../gtk/propertybox.c:507 +#: ../gtk/propertybox.c:432 ../gtk/propertybox.c:573 msgid "Disabled" msgstr "使用しない" -#: ../gtk/propertybox.c:553 +#: ../gtk/propertybox.c:619 msgid "Account" msgstr "" -#: ../gtk/propertybox.c:693 +#: ../gtk/propertybox.c:759 msgid "English" msgstr "" -#: ../gtk/propertybox.c:694 +#: ../gtk/propertybox.c:760 msgid "French" msgstr "Français" -#: ../gtk/propertybox.c:695 +#: ../gtk/propertybox.c:761 msgid "Swedish" msgstr "" -#: ../gtk/propertybox.c:696 +#: ../gtk/propertybox.c:762 msgid "Italian" msgstr "" -#: ../gtk/propertybox.c:697 +#: ../gtk/propertybox.c:763 msgid "Spanish" msgstr "" -#: ../gtk/propertybox.c:698 +#: ../gtk/propertybox.c:764 msgid "Brazilian Portugese" msgstr "" -#: ../gtk/propertybox.c:699 +#: ../gtk/propertybox.c:765 msgid "Polish" msgstr "" -#: ../gtk/propertybox.c:700 +#: ../gtk/propertybox.c:766 msgid "German" msgstr "" -#: ../gtk/propertybox.c:701 +#: ../gtk/propertybox.c:767 msgid "Russian" msgstr "" -#: ../gtk/propertybox.c:702 +#: ../gtk/propertybox.c:768 msgid "Japanese" msgstr "日本語" -#: ../gtk/propertybox.c:703 +#: ../gtk/propertybox.c:769 msgid "Dutch" msgstr "" -#: ../gtk/propertybox.c:704 +#: ../gtk/propertybox.c:770 msgid "Hungarian" msgstr "Magyar" -#: ../gtk/propertybox.c:705 +#: ../gtk/propertybox.c:771 msgid "Czech" msgstr "čeština" -#: ../gtk/propertybox.c:706 +#: ../gtk/propertybox.c:772 msgid "Chinese" msgstr "简体中文" -#: ../gtk/propertybox.c:707 +#: ../gtk/propertybox.c:773 msgid "Traditional Chinese" msgstr "" -#: ../gtk/propertybox.c:708 +#: ../gtk/propertybox.c:774 msgid "Norwegian" msgstr "" -#: ../gtk/propertybox.c:765 +#: ../gtk/propertybox.c:775 +msgid "Hebrew" +msgstr "" + +#: ../gtk/propertybox.c:842 msgid "" "You need to restart linphone for the new language selection to take effect." msgstr "" -#: ../gtk/propertybox.c:835 +#: ../gtk/propertybox.c:912 #, fuzzy msgid "None" msgstr "ありません。" -#: ../gtk/propertybox.c:839 +#: ../gtk/propertybox.c:916 msgid "SRTP" msgstr "" -#: ../gtk/propertybox.c:845 +#: ../gtk/propertybox.c:922 msgid "ZRTP" msgstr "" @@ -366,181 +404,278 @@ msgid_plural "Found %i contacts" msgstr[0] "" msgstr[1] "" -#: ../gtk/setupwizard.c:25 +#: ../gtk/setupwizard.c:33 msgid "" "Welcome !\n" "This assistant will help you to use a SIP account for your calls." msgstr "" -#: ../gtk/setupwizard.c:34 -msgid "Create an account by choosing a username" +#: ../gtk/setupwizard.c:42 +msgid "Create an account on linphone.org" msgstr "" -#: ../gtk/setupwizard.c:35 -msgid "I have already an account and just want to use it" +#: ../gtk/setupwizard.c:43 +msgid "I have already a linphone.org account and I just want to use it" msgstr "" -#: ../gtk/setupwizard.c:53 -msgid "Please choose a username:" +#: ../gtk/setupwizard.c:44 +msgid "I have already a sip account and I just want to use it" msgstr "" -#: ../gtk/setupwizard.c:54 +#: ../gtk/setupwizard.c:84 +msgid "Enter your linphone.org username" +msgstr "" + +#: ../gtk/setupwizard.c:91 #, fuzzy msgid "Username:" msgstr "ユーザーマニュアル" -#: ../gtk/setupwizard.c:92 -#, c-format -msgid "Checking if '%s' is available..." +#: ../gtk/setupwizard.c:93 ../gtk/password.ui.h:4 +#, fuzzy +msgid "Password:" +msgstr "パスワード" + +#: ../gtk/setupwizard.c:113 +msgid "Enter your account informations" msgstr "" -#: ../gtk/setupwizard.c:97 ../gtk/setupwizard.c:164 -msgid "Please wait..." +#: ../gtk/setupwizard.c:120 +#, fuzzy +msgid "Username*" +msgstr "ユーザーマニュアル" + +#: ../gtk/setupwizard.c:121 +#, fuzzy +msgid "Password*" +msgstr "パスワード" + +#: ../gtk/setupwizard.c:124 +msgid "Domain*" msgstr "" -#: ../gtk/setupwizard.c:101 -msgid "Sorry this username already exists. Please try a new one." +#: ../gtk/setupwizard.c:125 +msgid "Proxy" msgstr "" -#: ../gtk/setupwizard.c:103 ../gtk/setupwizard.c:168 -msgid "Ok !" +#: ../gtk/setupwizard.c:297 +msgid "(*) Required fields" msgstr "" -#: ../gtk/setupwizard.c:106 ../gtk/setupwizard.c:171 -msgid "Communication problem, please try again later." +#: ../gtk/setupwizard.c:298 +#, fuzzy +msgid "Username: (*)" +msgstr "ユーザーマニュアル" + +#: ../gtk/setupwizard.c:300 +#, fuzzy +msgid "Password: (*)" +msgstr "パスワード" + +#: ../gtk/setupwizard.c:302 +msgid "Email: (*)" msgstr "" -#: ../gtk/setupwizard.c:134 +#: ../gtk/setupwizard.c:304 +msgid "Confirm your password: (*)" +msgstr "" + +#: ../gtk/setupwizard.c:368 +msgid "" +"Error, account not validated, username already used or server unreachable.\n" +"Please go back and try again." +msgstr "" + +#: ../gtk/setupwizard.c:379 msgid "Thank you. Your account is now configured and ready for use." msgstr "" -#: ../gtk/setupwizard.c:228 +#: ../gtk/setupwizard.c:387 +msgid "" +"Please validate your account by clicking on the link we just sent you by " +"email.\n" +"Then come back here and press Next button." +msgstr "" + +#: ../gtk/setupwizard.c:554 msgid "Welcome to the account setup assistant" msgstr "" -#: ../gtk/setupwizard.c:232 +#: ../gtk/setupwizard.c:559 msgid "Account setup assistant" msgstr "" -#: ../gtk/setupwizard.c:236 -msgid "Choosing a username" +#: ../gtk/setupwizard.c:565 +msgid "Configure your account (step 1/1)" msgstr "" -#: ../gtk/setupwizard.c:240 -msgid "Verifying" +#: ../gtk/setupwizard.c:570 +msgid "Enter your sip username (step 1/1)" msgstr "" -#: ../gtk/setupwizard.c:244 -#, fuzzy -msgid "Confirmation" -msgstr "情報" - -#: ../gtk/setupwizard.c:249 -msgid "Creating your account" +#: ../gtk/setupwizard.c:574 +msgid "Enter account information (step 1/2)" msgstr "" -#: ../gtk/setupwizard.c:253 -msgid "Now ready !" +#: ../gtk/setupwizard.c:583 +msgid "Validation (step 2/2)" msgstr "" -#: ../gtk/incall_view.c:69 +#: ../gtk/setupwizard.c:588 +msgid "Error" +msgstr "" + +#: ../gtk/setupwizard.c:592 +msgid "Terminating" +msgstr "" + +#: ../gtk/incall_view.c:69 ../gtk/incall_view.c:90 #, fuzzy, c-format msgid "Call #%i" msgstr "通話はキャンセルされました。" -#: ../gtk/incall_view.c:127 +#: ../gtk/incall_view.c:150 #, c-format msgid "Transfer to call #%i with %s" msgstr "" -#: ../gtk/incall_view.c:155 -msgid "Transfer" +#: ../gtk/incall_view.c:209 ../gtk/incall_view.c:212 +msgid "Not used" msgstr "" -#: ../gtk/incall_view.c:271 +#: ../gtk/incall_view.c:219 +msgid "ICE not activated" +msgstr "" + +#: ../gtk/incall_view.c:221 +#, fuzzy +msgid "ICE failed" +msgstr "通話はキャンセルされました。" + +#: ../gtk/incall_view.c:223 +msgid "ICE in progress" +msgstr "" + +#: ../gtk/incall_view.c:225 +msgid "Going through one or more NATs" +msgstr "" + +#: ../gtk/incall_view.c:227 +msgid "Direct" +msgstr "" + +#: ../gtk/incall_view.c:229 +msgid "Through a relay server" +msgstr "" + +#: ../gtk/incall_view.c:238 ../gtk/incall_view.c:242 +#, c-format +msgid "" +"download: %f\n" +"upload: %f (kbit/s)" +msgstr "" + +#: ../gtk/incall_view.c:341 ../gtk/main.ui.h:12 +msgid "Hang up" +msgstr "" + +#: ../gtk/incall_view.c:430 #, fuzzy msgid "Calling..." msgstr "接続中" -#: ../gtk/incall_view.c:274 ../gtk/incall_view.c:482 +#: ../gtk/incall_view.c:433 ../gtk/incall_view.c:646 msgid "00::00::00" msgstr "" -#: ../gtk/incall_view.c:285 +#: ../gtk/incall_view.c:444 #, fuzzy msgid "Incoming call" msgstr "接続中" -#: ../gtk/incall_view.c:322 +#: ../gtk/incall_view.c:481 msgid "good" msgstr "" -#: ../gtk/incall_view.c:324 +#: ../gtk/incall_view.c:483 msgid "average" msgstr "" -#: ../gtk/incall_view.c:326 +#: ../gtk/incall_view.c:485 msgid "poor" msgstr "" -#: ../gtk/incall_view.c:328 +#: ../gtk/incall_view.c:487 msgid "very poor" msgstr "" -#: ../gtk/incall_view.c:330 +#: ../gtk/incall_view.c:489 msgid "too bad" msgstr "" -#: ../gtk/incall_view.c:331 ../gtk/incall_view.c:347 +#: ../gtk/incall_view.c:490 ../gtk/incall_view.c:506 msgid "unavailable" msgstr "" -#: ../gtk/incall_view.c:447 +#: ../gtk/incall_view.c:605 msgid "Secured by SRTP" msgstr "" -#: ../gtk/incall_view.c:453 +#: ../gtk/incall_view.c:611 #, c-format msgid "Secured by ZRTP - [auth token: %s]" msgstr "" -#: ../gtk/incall_view.c:459 +#: ../gtk/incall_view.c:617 msgid "Set unverified" msgstr "" -#: ../gtk/incall_view.c:459 ../gtk/main.ui.h:49 +#: ../gtk/incall_view.c:617 ../gtk/main.ui.h:5 msgid "Set verified" msgstr "" -#: ../gtk/incall_view.c:480 +#: ../gtk/incall_view.c:641 msgid "In conference" msgstr "" -#: ../gtk/incall_view.c:480 +#: ../gtk/incall_view.c:641 #, fuzzy msgid "In call" msgstr "接続中" -#: ../gtk/incall_view.c:499 +#: ../gtk/incall_view.c:669 #, fuzzy msgid "Paused call" msgstr "接続中" -#: ../gtk/incall_view.c:511 +#: ../gtk/incall_view.c:682 #, c-format msgid "%02i::%02i::%02i" msgstr "" -#: ../gtk/incall_view.c:527 +#: ../gtk/incall_view.c:699 #, fuzzy msgid "Call ended." msgstr "通話は拒否されました。" -#: ../gtk/incall_view.c:584 +#: ../gtk/incall_view.c:731 +msgid "Transfer in progress" +msgstr "" + +#: ../gtk/incall_view.c:734 +msgid "Transfer done." +msgstr "" + +#: ../gtk/incall_view.c:737 +#, fuzzy +msgid "Transfer failed." +msgstr "通話はキャンセルされました。" + +#: ../gtk/incall_view.c:781 msgid "Resume" msgstr "" -#: ../gtk/incall_view.c:591 ../gtk/main.ui.h:45 +#: ../gtk/incall_view.c:788 ../gtk/main.ui.h:9 msgid "Pause" msgstr "" @@ -550,240 +685,254 @@ msgid "Please enter login information for %s" msgstr "" #: ../gtk/main.ui.h:1 -msgid "#" -msgstr "#" - -#: ../gtk/main.ui.h:2 -msgid "*" -msgstr "*" - -#: ../gtk/main.ui.h:3 -msgid "0" -msgstr "0" - -#: ../gtk/main.ui.h:4 -msgid "1" -msgstr "1" - -#: ../gtk/main.ui.h:5 -msgid "2" -msgstr "2" - -#: ../gtk/main.ui.h:6 -msgid "3" -msgstr "3" - -#: ../gtk/main.ui.h:7 -msgid "4" -msgstr "4" - -#: ../gtk/main.ui.h:8 -msgid "5" -msgstr "5" - -#: ../gtk/main.ui.h:9 -msgid "6" -msgstr "6" - -#: ../gtk/main.ui.h:10 -msgid "7" -msgstr "7" - -#: ../gtk/main.ui.h:11 -msgid "8" -msgstr "8" - -#: ../gtk/main.ui.h:12 -msgid "9" -msgstr "9" - -#: ../gtk/main.ui.h:13 -#, fuzzy -msgid "Add contacts from directory" -msgstr "コーデックの情報" - -#: ../gtk/main.ui.h:14 #, fuzzy msgid "Callee name" msgstr "通話は拒否されました。" -#: ../gtk/main.ui.h:15 +#: ../gtk/main.ui.h:2 #, fuzzy -msgid "Welcome !" -msgstr "接続中" +msgid "Send" +msgstr "サウンド" -#: ../gtk/main.ui.h:16 -msgid "A" +#: ../gtk/main.ui.h:3 +msgid "End conference" msgstr "" -#: ../gtk/main.ui.h:17 -msgid "ADSL" +#: ../gtk/main.ui.h:4 +msgid "label" msgstr "" -#: ../gtk/main.ui.h:18 -#, fuzzy -msgid "Add contact" -msgstr "(接続するための情報がありません!)" - -#: ../gtk/main.ui.h:19 -msgid "All users" +#: ../gtk/main.ui.h:8 +msgid "Video" msgstr "" -#: ../gtk/main.ui.h:21 -msgid "Automatically log me in" +#: ../gtk/main.ui.h:10 +msgid "Mute" msgstr "" -#: ../gtk/main.ui.h:22 -msgid "B" +#: ../gtk/main.ui.h:11 +msgid "Transfer" msgstr "" -#: ../gtk/main.ui.h:23 ../gtk/parameters.ui.h:21 -msgid "C" -msgstr "" - -#: ../gtk/main.ui.h:24 -#, fuzzy -msgid "Call" -msgstr "通話はキャンセルされました。" - -#: ../gtk/main.ui.h:25 -msgid "Call quality rating" -msgstr "" - -#: ../gtk/main.ui.h:26 -msgid "Check _Updates" -msgstr "" - -#: ../gtk/main.ui.h:27 -#, fuzzy -msgid "Contacts" -msgstr "接続中" - -#: ../gtk/main.ui.h:28 -msgid "D" -msgstr "" - -#: ../gtk/main.ui.h:30 -#, fuzzy -msgid "Default" -msgstr "個人情報" - -#: ../gtk/main.ui.h:31 -#, fuzzy -msgid "Duration" -msgstr "情報" - -#: ../gtk/main.ui.h:32 -#, fuzzy -msgid "Enable self-view" -msgstr "使用する" - -#: ../gtk/main.ui.h:33 -#, fuzzy -msgid "Enable video" -msgstr "使用する" - -#: ../gtk/main.ui.h:34 -msgid "Enter username, phone number, or full sip address" -msgstr "" - -#: ../gtk/main.ui.h:35 -msgid "Fiber Channel" -msgstr "" - -#: ../gtk/main.ui.h:36 +#: ../gtk/main.ui.h:14 #, fuzzy msgid "In call" msgstr "接続中" -#: ../gtk/main.ui.h:37 -msgid "Initiate a new call" +#: ../gtk/main.ui.h:15 +#, fuzzy +msgid "Duration" +msgstr "情報" + +#: ../gtk/main.ui.h:16 +msgid "Call quality rating" msgstr "" -#: ../gtk/main.ui.h:38 -msgid "Internet connection:" +#: ../gtk/main.ui.h:17 +msgid "_Options" msgstr "" -#: ../gtk/main.ui.h:39 -msgid "Keypad" +#: ../gtk/main.ui.h:18 +msgid "Always start video" msgstr "" -#: ../gtk/main.ui.h:40 +#: ../gtk/main.ui.h:19 #, fuzzy -msgid "Login information" -msgstr "コーデックの情報" +msgid "Enable self-view" +msgstr "使用する" -#: ../gtk/main.ui.h:41 -msgid "Lookup:" +#: ../gtk/main.ui.h:20 +msgid "_Help" msgstr "" -#: ../gtk/main.ui.h:42 -#, fuzzy -msgid "My current identity:" -msgstr "個人情報" +#: ../gtk/main.ui.h:21 +msgid "Show debug window" +msgstr "" -#: ../gtk/main.ui.h:43 -#, fuzzy -msgid "Online users" -msgstr "ライン入力" +#: ../gtk/main.ui.h:22 +msgid "_Homepage" +msgstr "" -#: ../gtk/main.ui.h:44 -#, fuzzy -msgid "Password" -msgstr "パスワード" +#: ../gtk/main.ui.h:23 +msgid "Check _Updates" +msgstr "" -#: ../gtk/main.ui.h:46 -#, fuzzy -msgid "Recent calls" -msgstr "接続中" +#: ../gtk/main.ui.h:24 +msgid "Account assistant" +msgstr "" -#: ../gtk/main.ui.h:47 +#: ../gtk/main.ui.h:25 #, fuzzy msgid "SIP address or phone number:" msgstr "レジストラサーバーのSIPアドレス" -#: ../gtk/main.ui.h:48 +#: ../gtk/main.ui.h:26 +msgid "Initiate a new call" +msgstr "" + +#: ../gtk/main.ui.h:27 ../gtk/parameters.ui.h:48 +msgid "Add" +msgstr "追加する" + +#: ../gtk/main.ui.h:28 ../gtk/parameters.ui.h:49 +msgid "Edit" +msgstr "" + +#: ../gtk/main.ui.h:29 +msgid "D" +msgstr "" + +#: ../gtk/main.ui.h:30 +msgid "#" +msgstr "#" + +#: ../gtk/main.ui.h:31 +msgid "0" +msgstr "0" + +#: ../gtk/main.ui.h:32 +msgid "*" +msgstr "*" + +#: ../gtk/main.ui.h:33 ../gtk/parameters.ui.h:7 +msgid "C" +msgstr "" + +#: ../gtk/main.ui.h:34 +msgid "9" +msgstr "9" + +#: ../gtk/main.ui.h:35 +msgid "8" +msgstr "8" + +#: ../gtk/main.ui.h:36 +msgid "7" +msgstr "7" + +#: ../gtk/main.ui.h:37 +msgid "B" +msgstr "" + +#: ../gtk/main.ui.h:38 +msgid "6" +msgstr "6" + +#: ../gtk/main.ui.h:39 +msgid "5" +msgstr "5" + +#: ../gtk/main.ui.h:40 +msgid "4" +msgstr "4" + +#: ../gtk/main.ui.h:41 +msgid "A" +msgstr "" + +#: ../gtk/main.ui.h:42 +msgid "3" +msgstr "3" + +#: ../gtk/main.ui.h:43 +msgid "2" +msgstr "2" + +#: ../gtk/main.ui.h:44 +msgid "1" +msgstr "1" + +#: ../gtk/main.ui.h:45 msgid "Search" msgstr "" -#: ../gtk/main.ui.h:50 -msgid "Show debug window" +#: ../gtk/main.ui.h:46 +#, fuzzy +msgid "Add contacts from directory" +msgstr "コーデックの情報" + +#: ../gtk/main.ui.h:47 +#, fuzzy +msgid "Add contact" +msgstr "(接続するための情報がありません!)" + +#: ../gtk/main.ui.h:48 +msgid "Keypad" msgstr "" -#: ../gtk/main.ui.h:51 +#: ../gtk/main.ui.h:49 +#, fuzzy +msgid "Recent calls" +msgstr "接続中" + +#: ../gtk/main.ui.h:50 +#, fuzzy +msgid "My current identity:" +msgstr "個人情報" + +#: ../gtk/main.ui.h:51 ../gtk/tunnel_config.ui.h:7 #, fuzzy msgid "Username" msgstr "ユーザーマニュアル" -#: ../gtk/main.ui.h:52 -msgid "_Help" -msgstr "" +#: ../gtk/main.ui.h:52 ../gtk/tunnel_config.ui.h:8 +#, fuzzy +msgid "Password" +msgstr "パスワード" #: ../gtk/main.ui.h:53 -msgid "_Homepage" +msgid "Internet connection:" msgstr "" #: ../gtk/main.ui.h:54 -msgid "_Options" +msgid "Automatically log me in" msgstr "" #: ../gtk/main.ui.h:55 -msgid "in" -msgstr "" +#, fuzzy +msgid "Login information" +msgstr "コーデックの情報" #: ../gtk/main.ui.h:56 -msgid "label" +#, fuzzy +msgid "Welcome !" +msgstr "接続中" + +#: ../gtk/main.ui.h:57 +msgid "All users" +msgstr "" + +#: ../gtk/main.ui.h:58 +#, fuzzy +msgid "Online users" +msgstr "ライン入力" + +#: ../gtk/main.ui.h:59 +msgid "ADSL" +msgstr "" + +#: ../gtk/main.ui.h:60 +msgid "Fiber Channel" +msgstr "" + +#: ../gtk/main.ui.h:61 +#, fuzzy +msgid "Default" +msgstr "個人情報" + +#: ../gtk/main.ui.h:62 +msgid "Delete" msgstr "" #: ../gtk/about.ui.h:1 -msgid "(C) Belledonne Communications,2010\n" -msgstr "" - -#: ../gtk/about.ui.h:3 #, fuzzy msgid "About linphone" msgstr "Linphone" +#: ../gtk/about.ui.h:2 +msgid "(C) Belledonne Communications,2010\n" +msgstr "" + #: ../gtk/about.ui.h:4 msgid "An internet video phone using the standard SIP (rfc3261) protocol." msgstr "" @@ -803,400 +952,400 @@ msgid "" "hu: anonymous\n" msgstr "" -#: ../gtk/contact.ui.h:1 -#, fuzzy -msgid "Contact information" -msgstr "コーデックの情報" - #: ../gtk/contact.ui.h:2 -msgid "Allow this contact to see my presence status" -msgstr "" - -#: ../gtk/contact.ui.h:4 #, fuzzy msgid "SIP Address" msgstr "アドレス" -#: ../gtk/contact.ui.h:5 +#: ../gtk/contact.ui.h:3 msgid "Show this contact presence status" msgstr "" +#: ../gtk/contact.ui.h:4 +msgid "Allow this contact to see my presence status" +msgstr "" + +#: ../gtk/contact.ui.h:5 +#, fuzzy +msgid "Contact information" +msgstr "コーデックの情報" + #: ../gtk/log.ui.h:1 msgid "Linphone debug window" msgstr "" +#: ../gtk/log.ui.h:2 +msgid "Scroll to end" +msgstr "" + #: ../gtk/password.ui.h:1 #, fuzzy msgid "Linphone - Authentication required" msgstr "コーデックの情報" #: ../gtk/password.ui.h:2 -#, fuzzy -msgid "Password:" -msgstr "パスワード" - -#: ../gtk/password.ui.h:3 msgid "Please enter the domain password" msgstr "" -#: ../gtk/password.ui.h:4 +#: ../gtk/password.ui.h:3 msgid "UserID" msgstr "" #: ../gtk/call_logs.ui.h:1 -msgid "Call back" -msgstr "" - -#: ../gtk/call_logs.ui.h:2 msgid "Call history" msgstr "" -#: ../gtk/call_logs.ui.h:3 +#: ../gtk/call_logs.ui.h:2 msgid "Clear all" msgstr "" -#: ../gtk/sip_account.ui.h:1 -msgid "Configure a SIP account" +#: ../gtk/call_logs.ui.h:3 +msgid "Call back" msgstr "" -#: ../gtk/sip_account.ui.h:2 +#: ../gtk/sip_account.ui.h:1 msgid "Linphone - Configure a SIP account" msgstr "" -#: ../gtk/sip_account.ui.h:3 -msgid "Looks like sip:" -msgstr "" - -#: ../gtk/sip_account.ui.h:4 -msgid "Looks like sip:@" -msgstr "" - -#: ../gtk/sip_account.ui.h:5 -#, fuzzy -msgid "Publish presence information" -msgstr "コーデックの情報" - -#: ../gtk/sip_account.ui.h:6 -msgid "Register" -msgstr "" - -#: ../gtk/sip_account.ui.h:7 -#, fuzzy -msgid "Registration duration (sec):" -msgstr "登録しました。" - -#: ../gtk/sip_account.ui.h:8 -msgid "Route (optional):" -msgstr "" - -#: ../gtk/sip_account.ui.h:9 -#, fuzzy -msgid "SIP Proxy address:" -msgstr "Sipアドレス:" - -#: ../gtk/sip_account.ui.h:10 +#: ../gtk/sip_account.ui.h:2 #, fuzzy msgid "Your SIP identity:" msgstr "個人情報" -#: ../gtk/sip_account.ui.h:11 +#: ../gtk/sip_account.ui.h:3 +msgid "Looks like sip:@" +msgstr "" + +#: ../gtk/sip_account.ui.h:4 msgid "sip:" msgstr "sip:" -#: ../gtk/chatroom.ui.h:1 +#: ../gtk/sip_account.ui.h:5 #, fuzzy -msgid "Send" -msgstr "サウンド" +msgid "SIP Proxy address:" +msgstr "Sipアドレス:" + +#: ../gtk/sip_account.ui.h:6 +msgid "Looks like sip:" +msgstr "" + +#: ../gtk/sip_account.ui.h:7 +msgid "Route (optional):" +msgstr "" + +#: ../gtk/sip_account.ui.h:8 +#, fuzzy +msgid "Registration duration (sec):" +msgstr "登録しました。" + +#: ../gtk/sip_account.ui.h:9 +msgid "Register" +msgstr "" + +#: ../gtk/sip_account.ui.h:10 +#, fuzzy +msgid "Publish presence information" +msgstr "コーデックの情報" + +#: ../gtk/sip_account.ui.h:11 +msgid "Configure a SIP account" +msgstr "" #: ../gtk/parameters.ui.h:1 -msgid "0 stands for \"unlimited\"" +msgid "default soundcard" msgstr "" #: ../gtk/parameters.ui.h:2 -#, fuzzy -msgid "Audio" -msgstr "接続中" +msgid "a sound card" +msgstr "" #: ../gtk/parameters.ui.h:3 -msgid "Bandwidth control" +msgid "default camera" msgstr "" #: ../gtk/parameters.ui.h:4 -#, fuzzy -msgid "Codecs" -msgstr "接続中" +msgid "CIF" +msgstr "" #: ../gtk/parameters.ui.h:5 #, fuzzy -msgid "Default identity" -msgstr "個人情報" - -#: ../gtk/parameters.ui.h:6 -#, fuzzy -msgid "Language" -msgstr "接続中" - -#: ../gtk/parameters.ui.h:7 -#, fuzzy -msgid "Level" -msgstr "接続中" - -#: ../gtk/parameters.ui.h:8 -#, fuzzy -msgid "NAT and Firewall" -msgstr "接続中" - -#: ../gtk/parameters.ui.h:9 -msgid "Network protocol and ports" -msgstr "" - -#: ../gtk/parameters.ui.h:10 -#, fuzzy -msgid "Privacy" -msgstr "接続中" - -#: ../gtk/parameters.ui.h:11 -#, fuzzy -msgid "Proxy accounts" -msgstr "接続中" - -#: ../gtk/parameters.ui.h:12 -#, fuzzy -msgid "Transport" -msgstr "接続中" - -#: ../gtk/parameters.ui.h:13 -#, fuzzy -msgid "Video" -msgstr "接続中" - -#: ../gtk/parameters.ui.h:14 -msgid "" -"Adaptive rate control is a technique to dynamically guess the available " -"bandwidth during a call." -msgstr "" - -#: ../gtk/parameters.ui.h:15 -msgid "ALSA special device (optional):" -msgstr "" - -#: ../gtk/parameters.ui.h:16 -msgid "Add" -msgstr "追加する" - -#: ../gtk/parameters.ui.h:17 -msgid "Audio RTP/UDP:" -msgstr "" - -#: ../gtk/parameters.ui.h:18 -#, fuzzy msgid "Audio codecs" msgstr "オーディオコーデックのプロパティー" -#: ../gtk/parameters.ui.h:19 -msgid "Behind NAT / Firewall (specify gateway IP below)" -msgstr "" - -#: ../gtk/parameters.ui.h:20 -msgid "Behind NAT / Firewall (use STUN to resolve)" -msgstr "" - -#: ../gtk/parameters.ui.h:22 -msgid "CIF" -msgstr "" - -#: ../gtk/parameters.ui.h:23 +#: ../gtk/parameters.ui.h:6 #, fuzzy -msgid "Capture device:" -msgstr "使用するサウンドデバイス" +msgid "Video codecs" +msgstr "オーディオコーデックのプロパティー" -#: ../gtk/parameters.ui.h:24 +#: ../gtk/parameters.ui.h:8 +msgid "SIP (UDP)" +msgstr "" + +#: ../gtk/parameters.ui.h:9 +msgid "SIP (TCP)" +msgstr "" + +#: ../gtk/parameters.ui.h:10 +msgid "SIP (TLS)" +msgstr "" + +#: ../gtk/parameters.ui.h:11 +msgid "Settings" +msgstr "" + +#: ../gtk/parameters.ui.h:12 +msgid "Set Maximum Transmission Unit:" +msgstr "" + +#: ../gtk/parameters.ui.h:13 +msgid "Send DTMFs as SIP info" +msgstr "" + +#: ../gtk/parameters.ui.h:14 +msgid "Use IPv6 instead of IPv4" +msgstr "" + +#: ../gtk/parameters.ui.h:15 #, fuzzy -msgid "Codecs" -msgstr "コーデック" +msgid "Transport" +msgstr "接続中" -#: ../gtk/parameters.ui.h:25 -msgid "Direct connection to the Internet" -msgstr "" - -#: ../gtk/parameters.ui.h:26 -msgid "Disable" -msgstr "使用しない" - -#: ../gtk/parameters.ui.h:27 -#, fuzzy -msgid "Done" -msgstr "ありません。" - -#: ../gtk/parameters.ui.h:28 -msgid "Download speed limit in Kbit/sec:" -msgstr "" - -#: ../gtk/parameters.ui.h:29 -msgid "Edit" -msgstr "" - -#: ../gtk/parameters.ui.h:30 -msgid "Enable" -msgstr "使用する" - -#: ../gtk/parameters.ui.h:31 -msgid "Enable adaptive rate control" -msgstr "" - -#: ../gtk/parameters.ui.h:32 -msgid "Enable echo cancellation" -msgstr "" - -#: ../gtk/parameters.ui.h:33 -msgid "Erase all passwords" -msgstr "" - -#: ../gtk/parameters.ui.h:34 -msgid "Manage SIP Accounts" -msgstr "" - -#: ../gtk/parameters.ui.h:35 +#: ../gtk/parameters.ui.h:16 msgid "Media encryption type" msgstr "" -#: ../gtk/parameters.ui.h:36 -msgid "Multimedia settings" +#: ../gtk/parameters.ui.h:17 +msgid "Tunnel" msgstr "" -#: ../gtk/parameters.ui.h:37 +#: ../gtk/parameters.ui.h:18 +msgid "Video RTP/UDP:" +msgstr "" + +#: ../gtk/parameters.ui.h:19 +msgid "Audio RTP/UDP:" +msgstr "" + +#: ../gtk/parameters.ui.h:20 +msgid "DSCP fields" +msgstr "" + +#: ../gtk/parameters.ui.h:21 +msgid "Fixed" +msgstr "" + +#: ../gtk/parameters.ui.h:22 +msgid "Network protocol and ports" +msgstr "" + +#: ../gtk/parameters.ui.h:23 +msgid "Direct connection to the Internet" +msgstr "" + +#: ../gtk/parameters.ui.h:24 +msgid "Behind NAT / Firewall (specify gateway IP below)" +msgstr "" + +#: ../gtk/parameters.ui.h:25 +#, fuzzy +msgid "Public IP address:" +msgstr "Sipアドレス:" + +#: ../gtk/parameters.ui.h:26 +msgid "Behind NAT / Firewall (use STUN to resolve)" +msgstr "" + +#: ../gtk/parameters.ui.h:27 +msgid "Behind NAT / Firewall (use ICE)" +msgstr "" + +#: ../gtk/parameters.ui.h:28 +#, fuzzy +msgid "Stun server:" +msgstr "使用するサウンドデバイス" + +#: ../gtk/parameters.ui.h:29 +#, fuzzy +msgid "NAT and Firewall" +msgstr "接続中" + +#: ../gtk/parameters.ui.h:30 #, fuzzy msgid "Network settings" msgstr "ネットワーク" -#: ../gtk/parameters.ui.h:38 +#: ../gtk/parameters.ui.h:31 +#, fuzzy +msgid "Ring sound:" +msgstr "録音する音源" + +#: ../gtk/parameters.ui.h:32 +msgid "ALSA special device (optional):" +msgstr "" + +#: ../gtk/parameters.ui.h:33 +#, fuzzy +msgid "Capture device:" +msgstr "使用するサウンドデバイス" + +#: ../gtk/parameters.ui.h:34 +#, fuzzy +msgid "Ring device:" +msgstr "使用するサウンドデバイス" + +#: ../gtk/parameters.ui.h:35 #, fuzzy msgid "Playback device:" msgstr "使用するサウンドデバイス" +#: ../gtk/parameters.ui.h:36 +msgid "Enable echo cancellation" +msgstr "" + +#: ../gtk/parameters.ui.h:37 +#, fuzzy +msgid "Audio" +msgstr "接続中" + +#: ../gtk/parameters.ui.h:38 +#, fuzzy +msgid "Video input device:" +msgstr "使用するサウンドデバイス" + #: ../gtk/parameters.ui.h:39 msgid "Prefered video resolution:" msgstr "" #: ../gtk/parameters.ui.h:40 #, fuzzy -msgid "Public IP address:" -msgstr "Sipアドレス:" +msgid "Video" +msgstr "接続中" #: ../gtk/parameters.ui.h:41 -msgid "" -"Register to FONICS\n" -"virtual network !" +msgid "Multimedia settings" msgstr "" -#: ../gtk/parameters.ui.h:43 -msgid "Remove" -msgstr "削除する" - -#: ../gtk/parameters.ui.h:44 -#, fuzzy -msgid "Ring device:" -msgstr "使用するサウンドデバイス" - -#: ../gtk/parameters.ui.h:45 -#, fuzzy -msgid "Ring sound:" -msgstr "録音する音源" - -#: ../gtk/parameters.ui.h:46 -msgid "SIP (TCP)" -msgstr "" - -#: ../gtk/parameters.ui.h:47 -msgid "SIP (TLS)" -msgstr "" - -#: ../gtk/parameters.ui.h:48 -msgid "SIP (UDP)" -msgstr "" - -#: ../gtk/parameters.ui.h:49 -msgid "Send DTMFs as SIP info" -msgstr "" - -#: ../gtk/parameters.ui.h:50 -msgid "Set Maximum Transmission Unit:" -msgstr "" - -#: ../gtk/parameters.ui.h:51 -msgid "Settings" -msgstr "" - -#: ../gtk/parameters.ui.h:52 -msgid "Show advanced settings" -msgstr "" - -#: ../gtk/parameters.ui.h:53 -#, fuzzy -msgid "Stun server:" -msgstr "使用するサウンドデバイス" - -#: ../gtk/parameters.ui.h:54 +#: ../gtk/parameters.ui.h:42 msgid "This section defines your SIP address when not using a SIP account" msgstr "" -#: ../gtk/parameters.ui.h:55 -msgid "Upload speed limit in Kbit/sec:" -msgstr "" - -#: ../gtk/parameters.ui.h:56 -msgid "Use IPv6 instead of IPv4" -msgstr "" - -#: ../gtk/parameters.ui.h:57 -#, fuzzy -msgid "User interface" -msgstr "ユーザーマニュアル" - -#: ../gtk/parameters.ui.h:58 -msgid "Video RTP/UDP:" -msgstr "" - -#: ../gtk/parameters.ui.h:59 -#, fuzzy -msgid "Video codecs" -msgstr "オーディオコーデックのプロパティー" - -#: ../gtk/parameters.ui.h:60 -#, fuzzy -msgid "Video input device:" -msgstr "使用するサウンドデバイス" - -#: ../gtk/parameters.ui.h:61 +#: ../gtk/parameters.ui.h:43 msgid "Your display name (eg: John Doe):" msgstr "" -#: ../gtk/parameters.ui.h:62 -#, fuzzy -msgid "Your resulting SIP address:" -msgstr "あなたのSIPアドレス" - -#: ../gtk/parameters.ui.h:63 +#: ../gtk/parameters.ui.h:44 #, fuzzy msgid "Your username:" msgstr "ユーザーマニュアル" -#: ../gtk/parameters.ui.h:64 -msgid "a sound card" +#: ../gtk/parameters.ui.h:45 +#, fuzzy +msgid "Your resulting SIP address:" +msgstr "あなたのSIPアドレス" + +#: ../gtk/parameters.ui.h:46 +#, fuzzy +msgid "Default identity" +msgstr "個人情報" + +#: ../gtk/parameters.ui.h:47 +msgid "Wizard" msgstr "" +#: ../gtk/parameters.ui.h:50 +msgid "Remove" +msgstr "削除する" + +#: ../gtk/parameters.ui.h:51 +#, fuzzy +msgid "Proxy accounts" +msgstr "接続中" + +#: ../gtk/parameters.ui.h:52 +msgid "Erase all passwords" +msgstr "" + +#: ../gtk/parameters.ui.h:53 +#, fuzzy +msgid "Privacy" +msgstr "接続中" + +#: ../gtk/parameters.ui.h:54 +msgid "Manage SIP Accounts" +msgstr "" + +#: ../gtk/parameters.ui.h:55 ../gtk/tunnel_config.ui.h:4 +msgid "Enable" +msgstr "使用する" + +#: ../gtk/parameters.ui.h:56 ../gtk/tunnel_config.ui.h:5 +msgid "Disable" +msgstr "使用しない" + +#: ../gtk/parameters.ui.h:57 +#, fuzzy +msgid "Codecs" +msgstr "接続中" + +#: ../gtk/parameters.ui.h:58 +msgid "0 stands for \"unlimited\"" +msgstr "" + +#: ../gtk/parameters.ui.h:59 +msgid "Upload speed limit in Kbit/sec:" +msgstr "" + +#: ../gtk/parameters.ui.h:60 +msgid "Download speed limit in Kbit/sec:" +msgstr "" + +#: ../gtk/parameters.ui.h:61 +msgid "Enable adaptive rate control" +msgstr "" + +#: ../gtk/parameters.ui.h:62 +msgid "" +"Adaptive rate control is a technique to dynamically guess the available " +"bandwidth during a call." +msgstr "" + +#: ../gtk/parameters.ui.h:63 +msgid "Bandwidth control" +msgstr "" + +#: ../gtk/parameters.ui.h:64 +#, fuzzy +msgid "Codecs" +msgstr "コーデック" + #: ../gtk/parameters.ui.h:65 -msgid "default camera" -msgstr "" +#, fuzzy +msgid "Language" +msgstr "接続中" #: ../gtk/parameters.ui.h:66 -msgid "default soundcard" +msgid "Show advanced settings" msgstr "" +#: ../gtk/parameters.ui.h:67 +#, fuzzy +msgid "Level" +msgstr "接続中" + +#: ../gtk/parameters.ui.h:68 +#, fuzzy +msgid "User interface" +msgstr "ユーザーマニュアル" + +#: ../gtk/parameters.ui.h:69 +#, fuzzy +msgid "Done" +msgstr "ありません。" + #: ../gtk/buddylookup.ui.h:1 #, fuzzy -msgid "Search somebody" -msgstr "接続中" +msgid "Search contacts in directory" +msgstr "コーデックの情報" #: ../gtk/buddylookup.ui.h:2 msgid "Add to my list" @@ -1204,8 +1353,8 @@ msgstr "" #: ../gtk/buddylookup.ui.h:3 #, fuzzy -msgid "Search contacts in directory" -msgstr "コーデックの情報" +msgid "Search somebody" +msgstr "接続中" #: ../gtk/waiting.ui.h:1 #, fuzzy @@ -1216,19 +1365,91 @@ msgstr "Linphone" msgid "Please wait" msgstr "" -#: ../coreapi/linphonecore.c:187 +#: ../gtk/dscp_settings.ui.h:1 +#, fuzzy +msgid "Dscp settings" +msgstr "ネットワーク" + +#: ../gtk/dscp_settings.ui.h:2 +msgid "SIP" +msgstr "SIP" + +#: ../gtk/dscp_settings.ui.h:3 +msgid "Audio RTP stream" +msgstr "" + +#: ../gtk/dscp_settings.ui.h:4 +msgid "Video RTP stream" +msgstr "" + +#: ../gtk/dscp_settings.ui.h:5 +msgid "Set DSCP values (in hexadecimal)" +msgstr "" + +#: ../gtk/call_statistics.ui.h:1 +msgid "Call statistics" +msgstr "" + +#: ../gtk/call_statistics.ui.h:2 +#, fuzzy +msgid "Audio codec" +msgstr "オーディオコーデックのプロパティー" + +#: ../gtk/call_statistics.ui.h:3 +#, fuzzy +msgid "Video codec" +msgstr "オーディオコーデックのプロパティー" + +#: ../gtk/call_statistics.ui.h:4 +msgid "Audio IP bandwidth usage" +msgstr "" + +#: ../gtk/call_statistics.ui.h:5 +msgid "Media connectivity" +msgstr "" + +#: ../gtk/call_statistics.ui.h:6 +msgid "Video IP bandwidth usage" +msgstr "" + +#: ../gtk/call_statistics.ui.h:7 +#, fuzzy +msgid "Call statistics and information" +msgstr "コーデックの情報" + +#: ../gtk/tunnel_config.ui.h:1 +msgid "Configure VoIP tunnel" +msgstr "" + +#: ../gtk/tunnel_config.ui.h:2 +msgid "Host" +msgstr "" + +#: ../gtk/tunnel_config.ui.h:3 +msgid "Port" +msgstr "" + +#: ../gtk/tunnel_config.ui.h:6 +msgid "Configure tunnel" +msgstr "" + +#: ../gtk/tunnel_config.ui.h:9 +msgid "Configure http proxy (optional)" +msgstr "" + +#: ../coreapi/linphonecore.c:232 msgid "aborted" msgstr "" -#: ../coreapi/linphonecore.c:190 +#: ../coreapi/linphonecore.c:235 msgid "completed" msgstr "" -#: ../coreapi/linphonecore.c:193 +#: ../coreapi/linphonecore.c:238 msgid "missed" msgstr "" -#: ../coreapi/linphonecore.c:198 +#: ../coreapi/linphonecore.c:243 #, c-format msgid "" "%s at %s\n" @@ -1238,24 +1459,24 @@ msgid "" "Duration: %i mn %i sec\n" msgstr "" -#: ../coreapi/linphonecore.c:199 +#: ../coreapi/linphonecore.c:244 msgid "Outgoing call" msgstr "" -#: ../coreapi/linphonecore.c:1088 +#: ../coreapi/linphonecore.c:1226 #, fuzzy msgid "Ready" msgstr "準備完了。" -#: ../coreapi/linphonecore.c:1831 +#: ../coreapi/linphonecore.c:2074 msgid "Looking for telephone number destination..." msgstr "" -#: ../coreapi/linphonecore.c:1834 +#: ../coreapi/linphonecore.c:2077 msgid "Could not resolve this number." msgstr "" -#: ../coreapi/linphonecore.c:1878 +#: ../coreapi/linphonecore.c:2121 #, fuzzy msgid "" "Could not parse given sip address. A sip url usually looks like sip:" @@ -1264,42 +1485,55 @@ msgstr "" "SIPアドレスの形式エラーです。SIPアドレスは、のような" "形式です。" -#: ../coreapi/linphonecore.c:2025 +#: ../coreapi/linphonecore.c:2312 #, fuzzy msgid "Contacting" msgstr "接続中" -#: ../coreapi/linphonecore.c:2032 +#: ../coreapi/linphonecore.c:2319 #, fuzzy msgid "Could not call" msgstr "pixmapファイルが見つかりません %s" -#: ../coreapi/linphonecore.c:2140 +#: ../coreapi/linphonecore.c:2429 msgid "Sorry, we have reached the maximum number of simultaneous calls" msgstr "" -#: ../coreapi/linphonecore.c:2270 +#: ../coreapi/linphonecore.c:2573 +#, fuzzy +msgid "is contacting you" +msgstr "から電話です。" + +#: ../coreapi/linphonecore.c:2574 +msgid " and asked autoanswer." +msgstr "" + +#: ../coreapi/linphonecore.c:2574 +msgid "." +msgstr "" + +#: ../coreapi/linphonecore.c:2636 msgid "Modifying call parameters..." msgstr "" -#: ../coreapi/linphonecore.c:2366 +#: ../coreapi/linphonecore.c:2908 msgid "Connected." msgstr "接続しました。" -#: ../coreapi/linphonecore.c:2389 +#: ../coreapi/linphonecore.c:2931 #, fuzzy msgid "Call aborted" msgstr "通話はキャンセルされました。" -#: ../coreapi/linphonecore.c:2530 +#: ../coreapi/linphonecore.c:3102 msgid "Could not pause the call" msgstr "" -#: ../coreapi/linphonecore.c:2535 +#: ../coreapi/linphonecore.c:3107 msgid "Pausing the current call..." msgstr "" -#: ../coreapi/misc.c:147 +#: ../coreapi/misc.c:148 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the pcm oss emulation module\n" @@ -1311,7 +1545,7 @@ msgstr "" "pcm ossエミュレーションモジュールが見つかりません。\n" "ロードするために、ルート権限で'modprobe snd-pcm-oss'を実行してください。" -#: ../coreapi/misc.c:150 +#: ../coreapi/misc.c:151 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the mixer oss emulation module\n" @@ -1323,10 +1557,14 @@ msgstr "" "mixer ossエミュレーションモジュールが見つかりません。\n" "ロードするために、ルート権限で'modprobe snd-mixer-oss'を実行してください。" -#: ../coreapi/misc.c:478 +#: ../coreapi/misc.c:496 msgid "Stun lookup in progress..." msgstr "" +#: ../coreapi/misc.c:630 +msgid "ICE local candidates gathering in progress..." +msgstr "" + #: ../coreapi/friend.c:33 #, fuzzy msgid "Online" @@ -1379,167 +1617,165 @@ msgstr "" msgid "Unknown-bug" msgstr "" -#: ../coreapi/proxy.c:192 +#: ../coreapi/proxy.c:204 msgid "" "The sip proxy address you entered is invalid, it must start with \"sip:\" " "followed by a hostname." msgstr "" -#: ../coreapi/proxy.c:198 +#: ../coreapi/proxy.c:210 msgid "" "The sip identity you entered is invalid.\n" "It should look like sip:username@proxydomain, such as sip:alice@example.net" msgstr "" -#: ../coreapi/proxy.c:690 +#: ../coreapi/proxy.c:1053 #, fuzzy, c-format msgid "Could not login as %s" msgstr "pixmapファイルが見つかりません %s" -#: ../coreapi/callbacks.c:206 -#, fuzzy -msgid "is contacting you" -msgstr "から電話です。" - -#: ../coreapi/callbacks.c:207 -msgid " and asked autoanswer." -msgstr "" - -#: ../coreapi/callbacks.c:207 -msgid "." -msgstr "" - -#: ../coreapi/callbacks.c:266 +#: ../coreapi/callbacks.c:276 #, fuzzy msgid "Remote ringing." msgstr "登録中……" -#: ../coreapi/callbacks.c:282 +#: ../coreapi/callbacks.c:296 #, fuzzy msgid "Remote ringing..." msgstr "登録中……" -#: ../coreapi/callbacks.c:293 +#: ../coreapi/callbacks.c:307 msgid "Early media." msgstr "" -#: ../coreapi/callbacks.c:331 +#: ../coreapi/callbacks.c:352 #, c-format msgid "Call with %s is paused." msgstr "" -#: ../coreapi/callbacks.c:342 +#: ../coreapi/callbacks.c:365 #, c-format msgid "Call answered by %s - on hold." msgstr "" -#: ../coreapi/callbacks.c:357 +#: ../coreapi/callbacks.c:376 #, fuzzy msgid "Call resumed." msgstr "通話は拒否されました。" -#: ../coreapi/callbacks.c:362 +#: ../coreapi/callbacks.c:381 #, fuzzy, c-format msgid "Call answered by %s." msgstr "" "電話をかける\n" "電話に出る" -#: ../coreapi/callbacks.c:432 -msgid "We are being paused..." +#: ../coreapi/callbacks.c:396 +msgid "Incompatible, check codecs..." msgstr "" -#: ../coreapi/callbacks.c:436 -msgid "We have been resumed..." +#: ../coreapi/callbacks.c:437 +msgid "We have been resumed." msgstr "" -#: ../coreapi/callbacks.c:441 -msgid "Call has been updated by remote..." +#: ../coreapi/callbacks.c:446 +msgid "We are paused by other party." msgstr "" -#: ../coreapi/callbacks.c:473 +#: ../coreapi/callbacks.c:452 +msgid "Call is updated by remote." +msgstr "" + +#: ../coreapi/callbacks.c:521 #, fuzzy msgid "Call terminated." msgstr "通話は拒否されました。" -#: ../coreapi/callbacks.c:480 +#: ../coreapi/callbacks.c:528 msgid "User is busy." msgstr "ユーザーはビジーです" -#: ../coreapi/callbacks.c:481 +#: ../coreapi/callbacks.c:529 msgid "User is temporarily unavailable." msgstr "ユーザーは、今出られません。" #. char *retrymsg=_("%s. Retry after %i minute(s)."); -#: ../coreapi/callbacks.c:483 +#: ../coreapi/callbacks.c:531 msgid "User does not want to be disturbed." msgstr "ユーザーは手が離せないようです。" -#: ../coreapi/callbacks.c:484 +#: ../coreapi/callbacks.c:532 msgid "Call declined." msgstr "通話は拒否されました。" -#: ../coreapi/callbacks.c:496 +#: ../coreapi/callbacks.c:544 msgid "No response." msgstr "" -#: ../coreapi/callbacks.c:500 +#: ../coreapi/callbacks.c:548 msgid "Protocol error." msgstr "" -#: ../coreapi/callbacks.c:516 +#: ../coreapi/callbacks.c:564 msgid "Redirected" msgstr "" -#: ../coreapi/callbacks.c:526 -msgid "Not found" +#: ../coreapi/callbacks.c:600 +msgid "Incompatible media parameters." msgstr "" -#: ../coreapi/callbacks.c:551 -msgid "No common codecs" -msgstr "" - -#: ../coreapi/callbacks.c:557 +#: ../coreapi/callbacks.c:606 #, fuzzy msgid "Call failed." msgstr "通話はキャンセルされました。" -#: ../coreapi/callbacks.c:631 +#: ../coreapi/callbacks.c:701 #, fuzzy, c-format msgid "Registration on %s successful." msgstr "登録しました。" -#: ../coreapi/callbacks.c:632 +#: ../coreapi/callbacks.c:702 #, fuzzy, c-format msgid "Unregistration on %s done." msgstr "登録しました。" -#: ../coreapi/callbacks.c:648 +#: ../coreapi/callbacks.c:722 msgid "no response timeout" msgstr "" -#: ../coreapi/callbacks.c:651 +#: ../coreapi/callbacks.c:725 #, fuzzy, c-format msgid "Registration on %s failed: %s" msgstr "登録しました。" -#: ../coreapi/sal_eXosip2.c:873 ../coreapi/sal_eXosip2.c:875 -#, fuzzy -msgid "Authentication failure" -msgstr "コーデックの情報" - -#: ../coreapi/linphonecall.c:128 +#: ../coreapi/linphonecall.c:129 #, fuzzy, c-format msgid "Authentication token is %s" msgstr "コーデックの情報" -#: ../coreapi/linphonecall.c:1560 +#: ../coreapi/linphonecall.c:2124 #, c-format msgid "You have missed %i call." msgid_plural "You have missed %i calls." msgstr[0] "" msgstr[1] "" +#, fuzzy +#~ msgid "Confirmation" +#~ msgstr "情報" + +#, fuzzy +#~ msgid "Contacts" +#~ msgstr "接続中" + +#, fuzzy +#~ msgid "Enable video" +#~ msgstr "使用する" + +#, fuzzy +#~ msgid "Authentication failure" +#~ msgstr "コーデックの情報" + #, fuzzy #~ msgid "Contact list" #~ msgstr "接続中" @@ -1730,9 +1966,6 @@ msgstr[1] "" #~ msgid "Remote services" #~ msgstr "リモートのサービス" -#~ msgid "SIP" -#~ msgstr "SIP" - #~ msgid "List of audio codecs, in order of preference:" #~ msgstr "コーデックのリストです。使いたい順に並べてください。" diff --git a/po/nb_NO.po b/po/nb_NO.po index 906742cb2..7ae0827eb 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-12-05 12:41+0100\n" +"POT-Creation-Date: 2013-01-08 10:35+0100\n" "PO-Revision-Date: 2011-04-05 01:56+0200\n" "Last-Translator: Øyvind Sæther \n" "Language-Team: Norwegian Bokmål \n" @@ -17,32 +17,54 @@ msgstr "" "X-Generator: Lokalize 1.2\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: ../gtk/calllogs.c:71 +#: ../gtk/calllogs.c:82 +#, fuzzy +msgid "Aborted" +msgstr "avbrutt" + +#: ../gtk/calllogs.c:85 +#, fuzzy +msgid "Missed" +msgstr "ubesvart" + +#: ../gtk/calllogs.c:88 +#, fuzzy +msgid "Declined" +msgstr "Avvis" + +#: ../gtk/calllogs.c:94 #, c-format msgid "%i minute" msgid_plural "%i minutes" msgstr[0] "" msgstr[1] "" -#: ../gtk/calllogs.c:74 +#: ../gtk/calllogs.c:97 #, c-format msgid "%i second" msgid_plural "%i seconds" msgstr[0] "" msgstr[1] "" -#: ../gtk/calllogs.c:77 +#: ../gtk/calllogs.c:100 #, c-format msgid "" "%s\t%s\tQuality: %s\n" "%s\t%s %s\t" msgstr "" -#: ../gtk/calllogs.c:79 +#: ../gtk/calllogs.c:102 msgid "n/a" msgstr "" -#: ../gtk/conference.c:33 ../gtk/incall_view.c:183 +#: ../gtk/calllogs.c:105 +#, c-format +msgid "" +"%s\t%s\t\n" +"%s\t%s" +msgstr "" + +#: ../gtk/conference.c:33 ../gtk/main.ui.h:13 msgid "Conference" msgstr "" @@ -56,32 +78,31 @@ msgstr "Skru mikrofonen av" msgid "Couldn't find pixmap file: %s" msgstr "Fant ikke pixmap fli: %s" -#: ../gtk/chat.c:27 -#, c-format -msgid "Chat with %s" -msgstr "Chat med %s" - -#: ../gtk/main.c:83 +#: ../gtk/main.c:89 msgid "log to stdout some debug information while running." msgstr "skriv logg-informasjon under kjøring" -#: ../gtk/main.c:90 +#: ../gtk/main.c:96 msgid "path to a file to write logs into." msgstr "" -#: ../gtk/main.c:97 +#: ../gtk/main.c:103 +msgid "Start linphone with video disabled." +msgstr "" + +#: ../gtk/main.c:110 msgid "Start only in the system tray, do not show the main interface." msgstr "Start skjult i systemkurven, ikke vis programbildet." -#: ../gtk/main.c:104 +#: ../gtk/main.c:117 msgid "address to call right now" msgstr "address som skal ringes nå" -#: ../gtk/main.c:111 +#: ../gtk/main.c:124 msgid "if set automatically answer incoming calls" msgstr "besvarer innkommende samtaler automatisk om valgt" -#: ../gtk/main.c:118 +#: ../gtk/main.c:131 msgid "" "Specifiy a working directory (should be the base of the installation, eg: c:" "\\Program Files\\Linphone)" @@ -89,12 +110,12 @@ msgstr "" "Spesifiser arbeidsmappe (bør være base for installasjonen, f.eks: c:" "\\Programfiler\\Linphone)" -#: ../gtk/main.c:464 +#: ../gtk/main.c:498 #, c-format msgid "Call with %s" msgstr "Ring med %s" -#: ../gtk/main.c:815 +#: ../gtk/main.c:871 #, c-format msgid "" "%s would like to add you to his contact list.\n" @@ -107,7 +128,7 @@ msgstr "" "din kontaktliste?\n" "Hvis du svarer nei vil personen bli svartelyst midlertidig." -#: ../gtk/main.c:893 +#: ../gtk/main.c:948 #, c-format msgid "" "Please enter your password for username %s\n" @@ -116,56 +137,61 @@ msgstr "" "Skriv inn ditt passord for brukernavn %s\n" " på domene %s:i>:" -#: ../gtk/main.c:993 +#: ../gtk/main.c:1051 #, fuzzy msgid "Call error" msgstr "Samtalehistorikk" -#: ../gtk/main.c:996 ../coreapi/linphonecore.c:2406 +#: ../gtk/main.c:1054 ../coreapi/linphonecore.c:2949 msgid "Call ended" msgstr "Samtale avsluttet" -#: ../gtk/main.c:999 ../coreapi/linphonecore.c:199 +#: ../gtk/main.c:1057 ../coreapi/linphonecore.c:244 msgid "Incoming call" msgstr "Innkommende samtale" -#: ../gtk/main.c:1001 ../gtk/incall_view.c:292 ../gtk/main.ui.h:20 +#: ../gtk/main.c:1059 ../gtk/incall_view.c:451 ../gtk/main.ui.h:6 msgid "Answer" msgstr "Svarer" -#: ../gtk/main.c:1003 ../gtk/main.ui.h:29 +#: ../gtk/main.c:1061 ../gtk/main.ui.h:7 msgid "Decline" msgstr "Avvis" -#: ../gtk/main.c:1009 +#: ../gtk/main.c:1067 #, fuzzy msgid "Call paused" msgstr "Samtale avbrutt" -#: ../gtk/main.c:1009 +#: ../gtk/main.c:1067 #, c-format msgid "by %s" msgstr "" -#: ../gtk/main.c:1165 +#: ../gtk/main.c:1116 +#, c-format +msgid "%s proposed to start video. Do you accept ?" +msgstr "" + +#: ../gtk/main.c:1278 msgid "Website link" msgstr "Peker til nettsted" -#: ../gtk/main.c:1205 +#: ../gtk/main.c:1318 msgid "Linphone - a video internet phone" msgstr "Linphone - en video Internet telefon" -#: ../gtk/main.c:1295 +#: ../gtk/main.c:1410 #, c-format msgid "%s (Default)" msgstr "%s (Standard)" -#: ../gtk/main.c:1566 ../coreapi/callbacks.c:700 +#: ../gtk/main.c:1714 ../coreapi/callbacks.c:774 #, c-format msgid "We are transferred to %s" msgstr "Vi er overført til %s" -#: ../gtk/main.c:1576 +#: ../gtk/main.c:1724 msgid "" "No sound cards have been detected on this computer.\n" "You won't be able to send or receive audio calls." @@ -173,162 +199,175 @@ msgstr "" "Klarte ikke å finne noe lydkort på denne datamaskinen.\n" "Du vil ikke kunne sende eller motta lydsamtaler." -#: ../gtk/main.c:1663 +#: ../gtk/main.c:1833 msgid "A free SIP video-phone" msgstr "En gratis SIP video-telefon" -#: ../gtk/friendlist.c:203 +#: ../gtk/friendlist.c:335 msgid "Add to addressbook" msgstr "" -#: ../gtk/friendlist.c:258 ../gtk/propertybox.c:296 ../gtk/contact.ui.h:3 -msgid "Name" -msgstr "Navn" - -#: ../gtk/friendlist.c:271 +#: ../gtk/friendlist.c:509 msgid "Presence status" msgstr "Tilstedestatus" -#: ../gtk/friendlist.c:308 +#: ../gtk/friendlist.c:526 ../gtk/propertybox.c:362 ../gtk/contact.ui.h:1 +msgid "Name" +msgstr "Navn" + +#: ../gtk/friendlist.c:538 +#, fuzzy +msgid "Call" +msgstr "Ring %s" + +#: ../gtk/friendlist.c:543 +msgid "Chat" +msgstr "" + +#: ../gtk/friendlist.c:573 #, c-format msgid "Search in %s directory" msgstr "Søk i %s katalogen" -#: ../gtk/friendlist.c:568 +#: ../gtk/friendlist.c:730 msgid "Invalid sip contact !" msgstr "Ugyldig SIP kontakt !" -#: ../gtk/friendlist.c:613 +#: ../gtk/friendlist.c:775 #, c-format msgid "Call %s" msgstr "Ring %s" -#: ../gtk/friendlist.c:614 +#: ../gtk/friendlist.c:776 #, c-format msgid "Send text to %s" msgstr "Send tekst til %s" -#: ../gtk/friendlist.c:615 +#: ../gtk/friendlist.c:777 #, c-format msgid "Edit contact '%s'" msgstr "Rediger kontakt '%s'" -#: ../gtk/friendlist.c:616 +#: ../gtk/friendlist.c:778 #, c-format msgid "Delete contact '%s'" msgstr "Slett kontakt '%s'" -#: ../gtk/friendlist.c:658 +#: ../gtk/friendlist.c:820 #, c-format msgid "Add new contact from %s directory" msgstr "Legg til kontakt fra %s katalogen" -#: ../gtk/propertybox.c:302 +#: ../gtk/propertybox.c:368 msgid "Rate (Hz)" msgstr "Frekvens (Hz)" -#: ../gtk/propertybox.c:308 +#: ../gtk/propertybox.c:374 msgid "Status" msgstr "Status" -#: ../gtk/propertybox.c:314 +#: ../gtk/propertybox.c:380 msgid "Min bitrate (kbit/s)" msgstr "Min. datahastighet (kbit/s)" -#: ../gtk/propertybox.c:321 +#: ../gtk/propertybox.c:387 msgid "Parameters" msgstr "Parametere" -#: ../gtk/propertybox.c:364 ../gtk/propertybox.c:507 +#: ../gtk/propertybox.c:430 ../gtk/propertybox.c:573 msgid "Enabled" msgstr "På" -#: ../gtk/propertybox.c:366 ../gtk/propertybox.c:507 +#: ../gtk/propertybox.c:432 ../gtk/propertybox.c:573 msgid "Disabled" msgstr "Av" -#: ../gtk/propertybox.c:553 +#: ../gtk/propertybox.c:619 msgid "Account" msgstr "Konto" -#: ../gtk/propertybox.c:693 +#: ../gtk/propertybox.c:759 msgid "English" msgstr "Engelsk" -#: ../gtk/propertybox.c:694 +#: ../gtk/propertybox.c:760 msgid "French" msgstr "Fransk" -#: ../gtk/propertybox.c:695 +#: ../gtk/propertybox.c:761 msgid "Swedish" msgstr "Svensk" -#: ../gtk/propertybox.c:696 +#: ../gtk/propertybox.c:762 msgid "Italian" msgstr "Italisensk" -#: ../gtk/propertybox.c:697 +#: ../gtk/propertybox.c:763 msgid "Spanish" msgstr "Spansk" -#: ../gtk/propertybox.c:698 +#: ../gtk/propertybox.c:764 msgid "Brazilian Portugese" msgstr "Portugisisk" -#: ../gtk/propertybox.c:699 +#: ../gtk/propertybox.c:765 msgid "Polish" msgstr "Polsk" -#: ../gtk/propertybox.c:700 +#: ../gtk/propertybox.c:766 msgid "German" msgstr "Tysk" -#: ../gtk/propertybox.c:701 +#: ../gtk/propertybox.c:767 msgid "Russian" msgstr "Russisk" -#: ../gtk/propertybox.c:702 +#: ../gtk/propertybox.c:768 msgid "Japanese" msgstr "Japansk" -#: ../gtk/propertybox.c:703 +#: ../gtk/propertybox.c:769 msgid "Dutch" msgstr "Nederlandsk" -#: ../gtk/propertybox.c:704 +#: ../gtk/propertybox.c:770 msgid "Hungarian" msgstr "Ungarsk" -#: ../gtk/propertybox.c:705 +#: ../gtk/propertybox.c:771 msgid "Czech" msgstr "Tjekkisk" -#: ../gtk/propertybox.c:706 +#: ../gtk/propertybox.c:772 msgid "Chinese" msgstr "Kinesisk" -#: ../gtk/propertybox.c:707 +#: ../gtk/propertybox.c:773 msgid "Traditional Chinese" msgstr "" -#: ../gtk/propertybox.c:708 +#: ../gtk/propertybox.c:774 msgid "Norwegian" msgstr "" -#: ../gtk/propertybox.c:765 +#: ../gtk/propertybox.c:775 +msgid "Hebrew" +msgstr "" + +#: ../gtk/propertybox.c:842 msgid "" "You need to restart linphone for the new language selection to take effect." msgstr "Du må restarte linphone for at det nye språkvalget skal iverksettes." -#: ../gtk/propertybox.c:835 +#: ../gtk/propertybox.c:912 msgid "None" msgstr "" -#: ../gtk/propertybox.c:839 +#: ../gtk/propertybox.c:916 msgid "SRTP" msgstr "" -#: ../gtk/propertybox.c:845 +#: ../gtk/propertybox.c:922 msgid "ZRTP" msgstr "" @@ -372,7 +411,7 @@ msgid_plural "Found %i contacts" msgstr[0] "Fant kontakt %i" msgstr[1] "Hittat kontakt %i" -#: ../gtk/setupwizard.c:25 +#: ../gtk/setupwizard.c:33 msgid "" "Welcome !\n" "This assistant will help you to use a SIP account for your calls." @@ -380,168 +419,273 @@ msgstr "" "Velkommen\n" "Denne veiviseren vil hjelpe deg sette opp en SIP-konto for dine samtaler." -#: ../gtk/setupwizard.c:34 -msgid "Create an account by choosing a username" +#: ../gtk/setupwizard.c:42 +#, fuzzy +msgid "Create an account on linphone.org" msgstr "Lag en konto ved å velge ett brukernavn" -#: ../gtk/setupwizard.c:35 -msgid "I have already an account and just want to use it" +#: ../gtk/setupwizard.c:43 +#, fuzzy +msgid "I have already a linphone.org account and I just want to use it" msgstr "Jeg har allerede en brukerkonto og vil bruke den." -#: ../gtk/setupwizard.c:53 -msgid "Please choose a username:" -msgstr "Velg ett brukernavn:" +#: ../gtk/setupwizard.c:44 +#, fuzzy +msgid "I have already a sip account and I just want to use it" +msgstr "Jeg har allerede en brukerkonto og vil bruke den." -#: ../gtk/setupwizard.c:54 +#: ../gtk/setupwizard.c:84 +msgid "Enter your linphone.org username" +msgstr "" + +#: ../gtk/setupwizard.c:91 msgid "Username:" msgstr "Brukernavn:" -#: ../gtk/setupwizard.c:92 -#, c-format -msgid "Checking if '%s' is available..." -msgstr "Sjekker om %s' er tilgjengelig..." +#: ../gtk/setupwizard.c:93 ../gtk/password.ui.h:4 +msgid "Password:" +msgstr "Passord:" -#: ../gtk/setupwizard.c:97 ../gtk/setupwizard.c:164 -msgid "Please wait..." -msgstr "Vennligst vent..." +#: ../gtk/setupwizard.c:113 +msgid "Enter your account informations" +msgstr "" -#: ../gtk/setupwizard.c:101 -msgid "Sorry this username already exists. Please try a new one." -msgstr "Beklager, brukernavnet er allerede tatt. Forsøk ett annet." +#: ../gtk/setupwizard.c:120 +#, fuzzy +msgid "Username*" +msgstr "Brukernavn" -#: ../gtk/setupwizard.c:103 ../gtk/setupwizard.c:168 -msgid "Ok !" -msgstr "Ok !" +#: ../gtk/setupwizard.c:121 +#, fuzzy +msgid "Password*" +msgstr "Passord" -#: ../gtk/setupwizard.c:106 ../gtk/setupwizard.c:171 -msgid "Communication problem, please try again later." -msgstr "Kommunikasjonsproblem, forsøk igjen senere." +#: ../gtk/setupwizard.c:124 +msgid "Domain*" +msgstr "" -#: ../gtk/setupwizard.c:134 +#: ../gtk/setupwizard.c:125 +msgid "Proxy" +msgstr "" + +#: ../gtk/setupwizard.c:297 +msgid "(*) Required fields" +msgstr "" + +#: ../gtk/setupwizard.c:298 +#, fuzzy +msgid "Username: (*)" +msgstr "Brukernavn:" + +#: ../gtk/setupwizard.c:300 +#, fuzzy +msgid "Password: (*)" +msgstr "Passord:" + +#: ../gtk/setupwizard.c:302 +msgid "Email: (*)" +msgstr "" + +#: ../gtk/setupwizard.c:304 +msgid "Confirm your password: (*)" +msgstr "" + +#: ../gtk/setupwizard.c:368 +msgid "" +"Error, account not validated, username already used or server unreachable.\n" +"Please go back and try again." +msgstr "" + +#: ../gtk/setupwizard.c:379 msgid "Thank you. Your account is now configured and ready for use." msgstr "Takk. Ditt konto er nå satt opp og klart til bruk." -#: ../gtk/setupwizard.c:228 +#: ../gtk/setupwizard.c:387 +msgid "" +"Please validate your account by clicking on the link we just sent you by " +"email.\n" +"Then come back here and press Next button." +msgstr "" + +#: ../gtk/setupwizard.c:554 msgid "Welcome to the account setup assistant" msgstr "Velkommen til brukerkontoveiviseren" -#: ../gtk/setupwizard.c:232 +#: ../gtk/setupwizard.c:559 msgid "Account setup assistant" msgstr "Brukerkontoveiviser" -#: ../gtk/setupwizard.c:236 -msgid "Choosing a username" -msgstr "Velg ett brukernavn" +#: ../gtk/setupwizard.c:565 +#, fuzzy +msgid "Configure your account (step 1/1)" +msgstr "Konfigurer en SIP konto" -#: ../gtk/setupwizard.c:240 -msgid "Verifying" -msgstr "Verifiserer" +#: ../gtk/setupwizard.c:570 +msgid "Enter your sip username (step 1/1)" +msgstr "" -#: ../gtk/setupwizard.c:244 -msgid "Confirmation" -msgstr "Bekreftelse" +#: ../gtk/setupwizard.c:574 +msgid "Enter account information (step 1/2)" +msgstr "" -#: ../gtk/setupwizard.c:249 -msgid "Creating your account" -msgstr "Lager brukerkontoen din" +#: ../gtk/setupwizard.c:583 +msgid "Validation (step 2/2)" +msgstr "" -#: ../gtk/setupwizard.c:253 -msgid "Now ready !" -msgstr "Klar nå!" +#: ../gtk/setupwizard.c:588 +msgid "Error" +msgstr "" -#: ../gtk/incall_view.c:69 +#: ../gtk/setupwizard.c:592 +#, fuzzy +msgid "Terminating" +msgstr "Lägg på" + +#: ../gtk/incall_view.c:69 ../gtk/incall_view.c:90 #, fuzzy, c-format msgid "Call #%i" msgstr "Ring %s" -#: ../gtk/incall_view.c:127 +#: ../gtk/incall_view.c:150 #, c-format msgid "Transfer to call #%i with %s" msgstr "" -#: ../gtk/incall_view.c:155 -msgid "Transfer" -msgstr "Overfører" +#: ../gtk/incall_view.c:209 ../gtk/incall_view.c:212 +#, fuzzy +msgid "Not used" +msgstr "Ikke funnet" -#: ../gtk/incall_view.c:271 +#: ../gtk/incall_view.c:219 +msgid "ICE not activated" +msgstr "" + +#: ../gtk/incall_view.c:221 +#, fuzzy +msgid "ICE failed" +msgstr "ICE filter" + +#: ../gtk/incall_view.c:223 +msgid "ICE in progress" +msgstr "" + +#: ../gtk/incall_view.c:225 +msgid "Going through one or more NATs" +msgstr "" + +#: ../gtk/incall_view.c:227 +#, fuzzy +msgid "Direct" +msgstr "Omdirigert" + +#: ../gtk/incall_view.c:229 +msgid "Through a relay server" +msgstr "" + +#: ../gtk/incall_view.c:238 ../gtk/incall_view.c:242 +#, c-format +msgid "" +"download: %f\n" +"upload: %f (kbit/s)" +msgstr "" + +#: ../gtk/incall_view.c:341 ../gtk/main.ui.h:12 +msgid "Hang up" +msgstr "" + +#: ../gtk/incall_view.c:430 msgid "Calling..." msgstr "Ringer..." -#: ../gtk/incall_view.c:274 ../gtk/incall_view.c:482 +#: ../gtk/incall_view.c:433 ../gtk/incall_view.c:646 msgid "00::00::00" msgstr "00:00:00" -#: ../gtk/incall_view.c:285 +#: ../gtk/incall_view.c:444 msgid "Incoming call" msgstr "Innkommende samtale" -#: ../gtk/incall_view.c:322 +#: ../gtk/incall_view.c:481 msgid "good" msgstr "" -#: ../gtk/incall_view.c:324 +#: ../gtk/incall_view.c:483 msgid "average" msgstr "" -#: ../gtk/incall_view.c:326 +#: ../gtk/incall_view.c:485 msgid "poor" msgstr "" -#: ../gtk/incall_view.c:328 +#: ../gtk/incall_view.c:487 msgid "very poor" msgstr "" -#: ../gtk/incall_view.c:330 +#: ../gtk/incall_view.c:489 msgid "too bad" msgstr "" -#: ../gtk/incall_view.c:331 ../gtk/incall_view.c:347 +#: ../gtk/incall_view.c:490 ../gtk/incall_view.c:506 msgid "unavailable" msgstr "" -#: ../gtk/incall_view.c:447 +#: ../gtk/incall_view.c:605 msgid "Secured by SRTP" msgstr "" -#: ../gtk/incall_view.c:453 +#: ../gtk/incall_view.c:611 #, c-format msgid "Secured by ZRTP - [auth token: %s]" msgstr "" -#: ../gtk/incall_view.c:459 +#: ../gtk/incall_view.c:617 msgid "Set unverified" msgstr "" -#: ../gtk/incall_view.c:459 ../gtk/main.ui.h:49 +#: ../gtk/incall_view.c:617 ../gtk/main.ui.h:5 msgid "Set verified" msgstr "" -#: ../gtk/incall_view.c:480 +#: ../gtk/incall_view.c:641 msgid "In conference" msgstr "" -#: ../gtk/incall_view.c:480 +#: ../gtk/incall_view.c:641 msgid "In call" msgstr "I samtale med" -#: ../gtk/incall_view.c:499 +#: ../gtk/incall_view.c:669 msgid "Paused call" msgstr "Pauset samtale" -#: ../gtk/incall_view.c:511 +#: ../gtk/incall_view.c:682 #, c-format msgid "%02i::%02i::%02i" msgstr "%02i:%02i:%02i" -#: ../gtk/incall_view.c:527 +#: ../gtk/incall_view.c:699 msgid "Call ended." msgstr "Samtale avsluttet." -#: ../gtk/incall_view.c:584 +#: ../gtk/incall_view.c:731 +msgid "Transfer in progress" +msgstr "" + +#: ../gtk/incall_view.c:734 +#, fuzzy +msgid "Transfer done." +msgstr "Overfører" + +#: ../gtk/incall_view.c:737 +#, fuzzy +msgid "Transfer failed." +msgstr "Overfører" + +#: ../gtk/incall_view.c:781 msgid "Resume" msgstr "Fortsett" -#: ../gtk/incall_view.c:591 ../gtk/main.ui.h:45 +#: ../gtk/incall_view.c:788 ../gtk/main.ui.h:9 msgid "Pause" msgstr "Pause" @@ -551,225 +695,240 @@ msgid "Please enter login information for %s" msgstr "Skriv inn påloggingsinformasjon for %s:" #: ../gtk/main.ui.h:1 -msgid "#" -msgstr "#" - -#: ../gtk/main.ui.h:2 -msgid "*" -msgstr "*" - -#: ../gtk/main.ui.h:3 -msgid "0" -msgstr "0" - -#: ../gtk/main.ui.h:4 -msgid "1" -msgstr "1" - -#: ../gtk/main.ui.h:5 -msgid "2" -msgstr "2" - -#: ../gtk/main.ui.h:6 -msgid "3" -msgstr "3" - -#: ../gtk/main.ui.h:7 -msgid "4" -msgstr "4" - -#: ../gtk/main.ui.h:8 -msgid "5" -msgstr "5" - -#: ../gtk/main.ui.h:9 -msgid "6" -msgstr "6" - -#: ../gtk/main.ui.h:10 -msgid "7" -msgstr "7" - -#: ../gtk/main.ui.h:11 -msgid "8" -msgstr "8" - -#: ../gtk/main.ui.h:12 -msgid "9" -msgstr "9" - -#: ../gtk/main.ui.h:13 -msgid "Add contacts from directory" -msgstr "Legg til kontakter fra katalogen" - -#: ../gtk/main.ui.h:14 #, fuzzy msgid "Callee name" msgstr "Samtale avsluttet." +#: ../gtk/main.ui.h:2 +msgid "Send" +msgstr "Send" + +#: ../gtk/main.ui.h:3 +msgid "End conference" +msgstr "" + +#: ../gtk/main.ui.h:4 +msgid "label" +msgstr "etikett" + +#: ../gtk/main.ui.h:8 +msgid "Video" +msgstr "" + +#: ../gtk/main.ui.h:10 +msgid "Mute" +msgstr "" + +#: ../gtk/main.ui.h:11 +msgid "Transfer" +msgstr "Overfører" + +#: ../gtk/main.ui.h:14 +msgid "In call" +msgstr "I samtale" + #: ../gtk/main.ui.h:15 -msgid "Welcome !" -msgstr "Velkommen!" +msgid "Duration" +msgstr "Varighet" #: ../gtk/main.ui.h:16 -msgid "A" -msgstr "A" - -#: ../gtk/main.ui.h:17 -msgid "ADSL" -msgstr "ADSL" - -#: ../gtk/main.ui.h:18 -msgid "Add contact" -msgstr "Legg til kontakt" - -#: ../gtk/main.ui.h:19 -msgid "All users" -msgstr "Alle brukere" - -#: ../gtk/main.ui.h:21 -msgid "Automatically log me in" -msgstr "Logg meg på automatisk" - -#: ../gtk/main.ui.h:22 -msgid "B" -msgstr "B" - -#: ../gtk/main.ui.h:23 ../gtk/parameters.ui.h:21 -msgid "C" -msgstr "C" - -#: ../gtk/main.ui.h:24 -#, fuzzy -msgid "Call" -msgstr "Ring %s" - -#: ../gtk/main.ui.h:25 msgid "Call quality rating" msgstr "" -#: ../gtk/main.ui.h:26 +#: ../gtk/main.ui.h:17 +msgid "_Options" +msgstr "_Alternativer" + +#: ../gtk/main.ui.h:18 +msgid "Always start video" +msgstr "" + +#: ../gtk/main.ui.h:19 +msgid "Enable self-view" +msgstr "Vis video av deg selv" + +#: ../gtk/main.ui.h:20 +msgid "_Help" +msgstr "_Hjelp" + +#: ../gtk/main.ui.h:21 +msgid "Show debug window" +msgstr "Vis avlusningsvindu" + +#: ../gtk/main.ui.h:22 +msgid "_Homepage" +msgstr "H_jemmeside" + +#: ../gtk/main.ui.h:23 msgid "Check _Updates" msgstr "Sjekk _Oppdateringer" -#: ../gtk/main.ui.h:27 -msgid "Contacts" -msgstr "Kontakter" +#: ../gtk/main.ui.h:24 +#, fuzzy +msgid "Account assistant" +msgstr "Brukerkontoveiviser" -#: ../gtk/main.ui.h:28 +#: ../gtk/main.ui.h:25 +msgid "SIP address or phone number:" +msgstr "Sip adresse eller telefonnummer:" + +#: ../gtk/main.ui.h:26 +msgid "Initiate a new call" +msgstr "Start en ny samtale" + +#: ../gtk/main.ui.h:27 ../gtk/parameters.ui.h:48 +msgid "Add" +msgstr "Legg til" + +#: ../gtk/main.ui.h:28 ../gtk/parameters.ui.h:49 +msgid "Edit" +msgstr "Rediger" + +#: ../gtk/main.ui.h:29 msgid "D" msgstr "D" #: ../gtk/main.ui.h:30 -msgid "Default" -msgstr "Standard" +msgid "#" +msgstr "#" #: ../gtk/main.ui.h:31 -msgid "Duration" -msgstr "Varighet" +msgid "0" +msgstr "0" #: ../gtk/main.ui.h:32 -msgid "Enable self-view" -msgstr "Vis video av deg selv" +msgid "*" +msgstr "*" -#: ../gtk/main.ui.h:33 -#, fuzzy -msgid "Enable video" -msgstr "På" +#: ../gtk/main.ui.h:33 ../gtk/parameters.ui.h:7 +msgid "C" +msgstr "C" #: ../gtk/main.ui.h:34 -msgid "Enter username, phone number, or full sip address" -msgstr "Skriv inn brukernavn, telefonnummer eller full SIP-addresse" +msgid "9" +msgstr "9" #: ../gtk/main.ui.h:35 -msgid "Fiber Channel" -msgstr "Fiber Kanal" +msgid "8" +msgstr "8" #: ../gtk/main.ui.h:36 -msgid "In call" -msgstr "I samtale" +msgid "7" +msgstr "7" #: ../gtk/main.ui.h:37 -msgid "Initiate a new call" -msgstr "Start en ny samtale" +msgid "B" +msgstr "B" #: ../gtk/main.ui.h:38 -msgid "Internet connection:" -msgstr "Internet forbindelse:" +msgid "6" +msgstr "6" #: ../gtk/main.ui.h:39 +msgid "5" +msgstr "5" + +#: ../gtk/main.ui.h:40 +msgid "4" +msgstr "4" + +#: ../gtk/main.ui.h:41 +msgid "A" +msgstr "A" + +#: ../gtk/main.ui.h:42 +msgid "3" +msgstr "3" + +#: ../gtk/main.ui.h:43 +msgid "2" +msgstr "2" + +#: ../gtk/main.ui.h:44 +msgid "1" +msgstr "1" + +#: ../gtk/main.ui.h:45 +msgid "Search" +msgstr "Søk" + +#: ../gtk/main.ui.h:46 +msgid "Add contacts from directory" +msgstr "Legg til kontakter fra katalogen" + +#: ../gtk/main.ui.h:47 +msgid "Add contact" +msgstr "Legg til kontakt" + +#: ../gtk/main.ui.h:48 msgid "Keypad" msgstr "Tastatur" -#: ../gtk/main.ui.h:40 -msgid "Login information" -msgstr "Innlogginsinformasjon" - -#: ../gtk/main.ui.h:41 -msgid "Lookup:" -msgstr "Slå opp:" - -#: ../gtk/main.ui.h:42 -msgid "My current identity:" -msgstr "Min nåværende identitet:" - -#: ../gtk/main.ui.h:43 -msgid "Online users" -msgstr "Tilkoblede brukere" - -#: ../gtk/main.ui.h:44 -msgid "Password" -msgstr "Passord" - -#: ../gtk/main.ui.h:46 +#: ../gtk/main.ui.h:49 #, fuzzy msgid "Recent calls" msgstr "I samtale" -#: ../gtk/main.ui.h:47 -msgid "SIP address or phone number:" -msgstr "Sip adresse eller telefonnummer:" - -#: ../gtk/main.ui.h:48 -msgid "Search" -msgstr "Søk" - #: ../gtk/main.ui.h:50 -msgid "Show debug window" -msgstr "Vis avlusningsvindu" +msgid "My current identity:" +msgstr "Min nåværende identitet:" -#: ../gtk/main.ui.h:51 +#: ../gtk/main.ui.h:51 ../gtk/tunnel_config.ui.h:7 msgid "Username" msgstr "Brukernavn" -#: ../gtk/main.ui.h:52 -msgid "_Help" -msgstr "_Hjelp" +#: ../gtk/main.ui.h:52 ../gtk/tunnel_config.ui.h:8 +msgid "Password" +msgstr "Passord" #: ../gtk/main.ui.h:53 -msgid "_Homepage" -msgstr "H_jemmeside" +msgid "Internet connection:" +msgstr "Internet forbindelse:" #: ../gtk/main.ui.h:54 -msgid "_Options" -msgstr "_Alternativer" +msgid "Automatically log me in" +msgstr "Logg meg på automatisk" #: ../gtk/main.ui.h:55 -msgid "in" -msgstr "i" +msgid "Login information" +msgstr "Innlogginsinformasjon" #: ../gtk/main.ui.h:56 -msgid "label" -msgstr "etikett" +msgid "Welcome !" +msgstr "Velkommen!" + +#: ../gtk/main.ui.h:57 +msgid "All users" +msgstr "Alle brukere" + +#: ../gtk/main.ui.h:58 +msgid "Online users" +msgstr "Tilkoblede brukere" + +#: ../gtk/main.ui.h:59 +msgid "ADSL" +msgstr "ADSL" + +#: ../gtk/main.ui.h:60 +msgid "Fiber Channel" +msgstr "Fiber Kanal" + +#: ../gtk/main.ui.h:61 +msgid "Default" +msgstr "Standard" + +#: ../gtk/main.ui.h:62 +msgid "Delete" +msgstr "" #: ../gtk/about.ui.h:1 -msgid "(C) Belledonne Communications,2010\n" -msgstr "(C) Belledonne Communications,2011\n" - -#: ../gtk/about.ui.h:3 msgid "About linphone" msgstr "Om Linphone" +#: ../gtk/about.ui.h:2 +msgid "(C) Belledonne Communications,2010\n" +msgstr "(C) Belledonne Communications,2011\n" + #: ../gtk/about.ui.h:4 msgid "An internet video phone using the standard SIP (rfc3261) protocol." msgstr "" @@ -802,378 +961,379 @@ msgstr "" "cs: Petr Pisar \n" "hu: anonym\n" -#: ../gtk/contact.ui.h:1 -msgid "Contact information" -msgstr "Kontaktinformasjon" - #: ../gtk/contact.ui.h:2 -msgid "Allow this contact to see my presence status" -msgstr "La denne kontakten se min tilstedestatus" - -#: ../gtk/contact.ui.h:4 msgid "SIP Address" msgstr "SIP Addresse" -#: ../gtk/contact.ui.h:5 +#: ../gtk/contact.ui.h:3 msgid "Show this contact presence status" msgstr "Vis kontaktens tilstedestatus" +#: ../gtk/contact.ui.h:4 +msgid "Allow this contact to see my presence status" +msgstr "La denne kontakten se min tilstedestatus" + +#: ../gtk/contact.ui.h:5 +msgid "Contact information" +msgstr "Kontaktinformasjon" + #: ../gtk/log.ui.h:1 msgid "Linphone debug window" msgstr "Linphone avlusningsvindu" +#: ../gtk/log.ui.h:2 +msgid "Scroll to end" +msgstr "" + #: ../gtk/password.ui.h:1 msgid "Linphone - Authentication required" msgstr "Linphone - Autorisering kreves" #: ../gtk/password.ui.h:2 -msgid "Password:" -msgstr "Passord:" - -#: ../gtk/password.ui.h:3 msgid "Please enter the domain password" msgstr "Skriv inn passordet for domenet" -#: ../gtk/password.ui.h:4 +#: ../gtk/password.ui.h:3 msgid "UserID" msgstr "BrukerID" #: ../gtk/call_logs.ui.h:1 -msgid "Call back" -msgstr "Ring tilbake" - -#: ../gtk/call_logs.ui.h:2 msgid "Call history" msgstr "Samtalehistorikk" -#: ../gtk/call_logs.ui.h:3 +#: ../gtk/call_logs.ui.h:2 msgid "Clear all" msgstr "Fjern alle" -#: ../gtk/sip_account.ui.h:1 -msgid "Configure a SIP account" -msgstr "Konfigurer en SIP konto" +#: ../gtk/call_logs.ui.h:3 +msgid "Call back" +msgstr "Ring tilbake" -#: ../gtk/sip_account.ui.h:2 +#: ../gtk/sip_account.ui.h:1 msgid "Linphone - Configure a SIP account" msgstr "Linphone - Konfigurer en SIP konto" -#: ../gtk/sip_account.ui.h:3 -msgid "Looks like sip:" -msgstr "Ser ut som sip:" - -#: ../gtk/sip_account.ui.h:4 -msgid "Looks like sip:@" -msgstr "Ser ut som sip:@" - -#: ../gtk/sip_account.ui.h:5 -msgid "Publish presence information" -msgstr "Publiser tilstedestatus" - -#: ../gtk/sip_account.ui.h:6 -msgid "Register" -msgstr "" - -#: ../gtk/sip_account.ui.h:7 -msgid "Registration duration (sec):" -msgstr "Registreringsfrekvens (sek.):" - -#: ../gtk/sip_account.ui.h:8 -msgid "Route (optional):" -msgstr "Route (valgfritt):" - -#: ../gtk/sip_account.ui.h:9 -msgid "SIP Proxy address:" -msgstr "SIP Proxy addresse:" - -#: ../gtk/sip_account.ui.h:10 +#: ../gtk/sip_account.ui.h:2 msgid "Your SIP identity:" msgstr "Din SIP identitet:" -#: ../gtk/sip_account.ui.h:11 +#: ../gtk/sip_account.ui.h:3 +msgid "Looks like sip:@" +msgstr "Ser ut som sip:@" + +#: ../gtk/sip_account.ui.h:4 msgid "sip:" msgstr "sip:" -#: ../gtk/chatroom.ui.h:1 -msgid "Send" -msgstr "Send" +#: ../gtk/sip_account.ui.h:5 +msgid "SIP Proxy address:" +msgstr "SIP Proxy addresse:" + +#: ../gtk/sip_account.ui.h:6 +msgid "Looks like sip:" +msgstr "Ser ut som sip:" + +#: ../gtk/sip_account.ui.h:7 +msgid "Route (optional):" +msgstr "Route (valgfritt):" + +#: ../gtk/sip_account.ui.h:8 +msgid "Registration duration (sec):" +msgstr "Registreringsfrekvens (sek.):" + +#: ../gtk/sip_account.ui.h:9 +msgid "Register" +msgstr "" + +#: ../gtk/sip_account.ui.h:10 +msgid "Publish presence information" +msgstr "Publiser tilstedestatus" + +#: ../gtk/sip_account.ui.h:11 +msgid "Configure a SIP account" +msgstr "Konfigurer en SIP konto" #: ../gtk/parameters.ui.h:1 -msgid "0 stands for \"unlimited\"" -msgstr "0 betyr \"ubegrenset\"" +msgid "default soundcard" +msgstr "standard lydkort" #: ../gtk/parameters.ui.h:2 -msgid "Audio" -msgstr "Lyd" +msgid "a sound card" +msgstr "ett lydkort" #: ../gtk/parameters.ui.h:3 -msgid "Bandwidth control" -msgstr "Båndbreddekontrol" +msgid "default camera" +msgstr "standard kamera" #: ../gtk/parameters.ui.h:4 -msgid "Codecs" -msgstr "Kodeker" - -#: ../gtk/parameters.ui.h:5 -msgid "Default identity" -msgstr "Standard identitet" - -#: ../gtk/parameters.ui.h:6 -msgid "Language" -msgstr "Språk" - -#: ../gtk/parameters.ui.h:7 -msgid "Level" -msgstr "Nivå" - -#: ../gtk/parameters.ui.h:8 -msgid "NAT and Firewall" -msgstr "NAT og Brannvegg" - -#: ../gtk/parameters.ui.h:9 -msgid "Network protocol and ports" -msgstr "" - -#: ../gtk/parameters.ui.h:10 -msgid "Privacy" -msgstr "Personvern" - -#: ../gtk/parameters.ui.h:11 -msgid "Proxy accounts" -msgstr "Proxy kontoer" - -#: ../gtk/parameters.ui.h:12 -msgid "Transport" -msgstr "Transport" - -#: ../gtk/parameters.ui.h:13 -msgid "Video" -msgstr "Video" - -#: ../gtk/parameters.ui.h:14 -msgid "" -"Adaptive rate control is a technique to dynamically guess the available " -"bandwidth during a call." -msgstr "" - -#: ../gtk/parameters.ui.h:15 -msgid "ALSA special device (optional):" -msgstr "Spesiell ALSA enhet (valgfritt):" - -#: ../gtk/parameters.ui.h:16 -msgid "Add" -msgstr "Legg til" - -#: ../gtk/parameters.ui.h:17 -msgid "Audio RTP/UDP:" -msgstr "Lyd RTP/UDP:" - -#: ../gtk/parameters.ui.h:18 -msgid "Audio codecs" -msgstr "Lyd kodek" - -#: ../gtk/parameters.ui.h:19 -msgid "Behind NAT / Firewall (specify gateway IP below)" -msgstr "Bak NAT / Brannmur (spesifiser gateway IP under)" - -#: ../gtk/parameters.ui.h:20 -msgid "Behind NAT / Firewall (use STUN to resolve)" -msgstr "Bak NAT / Brannmur (bruk STUN for å avgjøre)" - -#: ../gtk/parameters.ui.h:22 msgid "CIF" msgstr "CIF" -#: ../gtk/parameters.ui.h:23 -msgid "Capture device:" -msgstr "Mikrofonenhet:" +#: ../gtk/parameters.ui.h:5 +msgid "Audio codecs" +msgstr "Lyd kodek" -#: ../gtk/parameters.ui.h:24 -msgid "Codecs" -msgstr "Kodek" +#: ../gtk/parameters.ui.h:6 +msgid "Video codecs" +msgstr "Video kodek" -#: ../gtk/parameters.ui.h:25 -msgid "Direct connection to the Internet" -msgstr "Tilkoblet Internett direkte" +#: ../gtk/parameters.ui.h:8 +#, fuzzy +msgid "SIP (UDP)" +msgstr "SIP (UDP):" -#: ../gtk/parameters.ui.h:26 -msgid "Disable" -msgstr "Deaktiver" +#: ../gtk/parameters.ui.h:9 +#, fuzzy +msgid "SIP (TCP)" +msgstr "SIP (TCP):" -#: ../gtk/parameters.ui.h:27 -msgid "Done" -msgstr "Ferdig" +#: ../gtk/parameters.ui.h:10 +#, fuzzy +msgid "SIP (TLS)" +msgstr "SIP (TCP):" -#: ../gtk/parameters.ui.h:28 -msgid "Download speed limit in Kbit/sec:" -msgstr "Nedlastningsbegrensning i Kbit/sek:" +#: ../gtk/parameters.ui.h:11 +msgid "Settings" +msgstr "Innstillinger" -#: ../gtk/parameters.ui.h:29 -msgid "Edit" -msgstr "Rediger" +#: ../gtk/parameters.ui.h:12 +msgid "Set Maximum Transmission Unit:" +msgstr "Velg MTU (Maximum Transmission Unit):" -#: ../gtk/parameters.ui.h:30 -msgid "Enable" -msgstr "Aktiver" +#: ../gtk/parameters.ui.h:13 +msgid "Send DTMFs as SIP info" +msgstr "Send DTMF som SIP-info" -#: ../gtk/parameters.ui.h:31 -msgid "Enable adaptive rate control" -msgstr "" +#: ../gtk/parameters.ui.h:14 +msgid "Use IPv6 instead of IPv4" +msgstr "Bruk IPv6 istedet for IPv4" -#: ../gtk/parameters.ui.h:32 -msgid "Enable echo cancellation" -msgstr "Bruk ekko-kansellering" +#: ../gtk/parameters.ui.h:15 +msgid "Transport" +msgstr "Transport" -#: ../gtk/parameters.ui.h:33 -msgid "Erase all passwords" -msgstr "Slett alle passord" - -#: ../gtk/parameters.ui.h:34 -msgid "Manage SIP Accounts" -msgstr "Behandle SIP-kontoer" - -#: ../gtk/parameters.ui.h:35 +#: ../gtk/parameters.ui.h:16 msgid "Media encryption type" msgstr "" -#: ../gtk/parameters.ui.h:36 -msgid "Multimedia settings" -msgstr "Multimediainnstillinger" +#: ../gtk/parameters.ui.h:17 +msgid "Tunnel" +msgstr "" -#: ../gtk/parameters.ui.h:37 +#: ../gtk/parameters.ui.h:18 +msgid "Video RTP/UDP:" +msgstr "Video RTP/UDP:" + +#: ../gtk/parameters.ui.h:19 +msgid "Audio RTP/UDP:" +msgstr "Lyd RTP/UDP:" + +#: ../gtk/parameters.ui.h:20 +msgid "DSCP fields" +msgstr "" + +#: ../gtk/parameters.ui.h:21 +msgid "Fixed" +msgstr "" + +#: ../gtk/parameters.ui.h:22 +msgid "Network protocol and ports" +msgstr "" + +#: ../gtk/parameters.ui.h:23 +msgid "Direct connection to the Internet" +msgstr "Tilkoblet Internett direkte" + +#: ../gtk/parameters.ui.h:24 +msgid "Behind NAT / Firewall (specify gateway IP below)" +msgstr "Bak NAT / Brannmur (spesifiser gateway IP under)" + +#: ../gtk/parameters.ui.h:25 +msgid "Public IP address:" +msgstr "Offentlig IP-addresse:" + +#: ../gtk/parameters.ui.h:26 +msgid "Behind NAT / Firewall (use STUN to resolve)" +msgstr "Bak NAT / Brannmur (bruk STUN for å avgjøre)" + +#: ../gtk/parameters.ui.h:27 +#, fuzzy +msgid "Behind NAT / Firewall (use ICE)" +msgstr "Bak NAT / Brannmur (bruk STUN for å avgjøre)" + +#: ../gtk/parameters.ui.h:28 +msgid "Stun server:" +msgstr "STUN tjener:" + +#: ../gtk/parameters.ui.h:29 +msgid "NAT and Firewall" +msgstr "NAT og Brannvegg" + +#: ../gtk/parameters.ui.h:30 msgid "Network settings" msgstr "Nettverksinnstillinger" -#: ../gtk/parameters.ui.h:38 +#: ../gtk/parameters.ui.h:31 +msgid "Ring sound:" +msgstr "Ringelyd:" + +#: ../gtk/parameters.ui.h:32 +msgid "ALSA special device (optional):" +msgstr "Spesiell ALSA enhet (valgfritt):" + +#: ../gtk/parameters.ui.h:33 +msgid "Capture device:" +msgstr "Mikrofonenhet:" + +#: ../gtk/parameters.ui.h:34 +msgid "Ring device:" +msgstr "Ringe-enhet:" + +#: ../gtk/parameters.ui.h:35 msgid "Playback device:" msgstr "Avspillingsenhet:" +#: ../gtk/parameters.ui.h:36 +msgid "Enable echo cancellation" +msgstr "Bruk ekko-kansellering" + +#: ../gtk/parameters.ui.h:37 +msgid "Audio" +msgstr "Lyd" + +#: ../gtk/parameters.ui.h:38 +msgid "Video input device:" +msgstr "Videoenhet:" + #: ../gtk/parameters.ui.h:39 msgid "Prefered video resolution:" msgstr "Foretrukke video-oppløsning:" #: ../gtk/parameters.ui.h:40 -msgid "Public IP address:" -msgstr "Offentlig IP-addresse:" +msgid "Video" +msgstr "Video" #: ../gtk/parameters.ui.h:41 -msgid "" -"Register to FONICS\n" -"virtual network !" -msgstr "" -"Registrer hos FONICS\n" -"virtuelle nettverk !" +msgid "Multimedia settings" +msgstr "Multimediainnstillinger" -#: ../gtk/parameters.ui.h:43 -msgid "Remove" -msgstr "Fjern" - -#: ../gtk/parameters.ui.h:44 -msgid "Ring device:" -msgstr "Ringe-enhet:" - -#: ../gtk/parameters.ui.h:45 -msgid "Ring sound:" -msgstr "Ringelyd:" - -#: ../gtk/parameters.ui.h:46 -#, fuzzy -msgid "SIP (TCP)" -msgstr "SIP (TCP):" - -#: ../gtk/parameters.ui.h:47 -#, fuzzy -msgid "SIP (TLS)" -msgstr "SIP (TCP):" - -#: ../gtk/parameters.ui.h:48 -#, fuzzy -msgid "SIP (UDP)" -msgstr "SIP (UDP):" - -#: ../gtk/parameters.ui.h:49 -msgid "Send DTMFs as SIP info" -msgstr "Send DTMF som SIP-info" - -#: ../gtk/parameters.ui.h:50 -msgid "Set Maximum Transmission Unit:" -msgstr "Velg MTU (Maximum Transmission Unit):" - -#: ../gtk/parameters.ui.h:51 -msgid "Settings" -msgstr "Innstillinger" - -#: ../gtk/parameters.ui.h:52 -msgid "Show advanced settings" -msgstr "Vis avanserte innstillinger" - -#: ../gtk/parameters.ui.h:53 -msgid "Stun server:" -msgstr "STUN tjener:" - -#: ../gtk/parameters.ui.h:54 +#: ../gtk/parameters.ui.h:42 msgid "This section defines your SIP address when not using a SIP account" msgstr "Denne seksjonen velger SIP-addresse når du ikke bruker en SIP-konto" -#: ../gtk/parameters.ui.h:55 -msgid "Upload speed limit in Kbit/sec:" -msgstr "Maks opplastningshastighet i Kbit/sek:" - -#: ../gtk/parameters.ui.h:56 -msgid "Use IPv6 instead of IPv4" -msgstr "Bruk IPv6 istedet for IPv4" - -#: ../gtk/parameters.ui.h:57 -msgid "User interface" -msgstr "Brukergrensesnitt" - -#: ../gtk/parameters.ui.h:58 -msgid "Video RTP/UDP:" -msgstr "Video RTP/UDP:" - -#: ../gtk/parameters.ui.h:59 -msgid "Video codecs" -msgstr "Video kodek" - -#: ../gtk/parameters.ui.h:60 -msgid "Video input device:" -msgstr "Videoenhet:" - -#: ../gtk/parameters.ui.h:61 +#: ../gtk/parameters.ui.h:43 msgid "Your display name (eg: John Doe):" msgstr "Vist navn (eks: Ola Nordmann):" -#: ../gtk/parameters.ui.h:62 -msgid "Your resulting SIP address:" -msgstr "Din resulterende SIP addresse:" - -#: ../gtk/parameters.ui.h:63 +#: ../gtk/parameters.ui.h:44 msgid "Your username:" msgstr "Ditt brukernavn:" +#: ../gtk/parameters.ui.h:45 +msgid "Your resulting SIP address:" +msgstr "Din resulterende SIP addresse:" + +#: ../gtk/parameters.ui.h:46 +msgid "Default identity" +msgstr "Standard identitet" + +#: ../gtk/parameters.ui.h:47 +msgid "Wizard" +msgstr "" + +#: ../gtk/parameters.ui.h:50 +msgid "Remove" +msgstr "Fjern" + +#: ../gtk/parameters.ui.h:51 +msgid "Proxy accounts" +msgstr "Proxy kontoer" + +#: ../gtk/parameters.ui.h:52 +msgid "Erase all passwords" +msgstr "Slett alle passord" + +#: ../gtk/parameters.ui.h:53 +msgid "Privacy" +msgstr "Personvern" + +#: ../gtk/parameters.ui.h:54 +msgid "Manage SIP Accounts" +msgstr "Behandle SIP-kontoer" + +#: ../gtk/parameters.ui.h:55 ../gtk/tunnel_config.ui.h:4 +msgid "Enable" +msgstr "Aktiver" + +#: ../gtk/parameters.ui.h:56 ../gtk/tunnel_config.ui.h:5 +msgid "Disable" +msgstr "Deaktiver" + +#: ../gtk/parameters.ui.h:57 +msgid "Codecs" +msgstr "Kodeker" + +#: ../gtk/parameters.ui.h:58 +msgid "0 stands for \"unlimited\"" +msgstr "0 betyr \"ubegrenset\"" + +#: ../gtk/parameters.ui.h:59 +msgid "Upload speed limit in Kbit/sec:" +msgstr "Maks opplastningshastighet i Kbit/sek:" + +#: ../gtk/parameters.ui.h:60 +msgid "Download speed limit in Kbit/sec:" +msgstr "Nedlastningsbegrensning i Kbit/sek:" + +#: ../gtk/parameters.ui.h:61 +msgid "Enable adaptive rate control" +msgstr "" + +#: ../gtk/parameters.ui.h:62 +msgid "" +"Adaptive rate control is a technique to dynamically guess the available " +"bandwidth during a call." +msgstr "" + +#: ../gtk/parameters.ui.h:63 +msgid "Bandwidth control" +msgstr "Båndbreddekontrol" + #: ../gtk/parameters.ui.h:64 -msgid "a sound card" -msgstr "ett lydkort" +msgid "Codecs" +msgstr "Kodek" #: ../gtk/parameters.ui.h:65 -msgid "default camera" -msgstr "standard kamera" +msgid "Language" +msgstr "Språk" #: ../gtk/parameters.ui.h:66 -msgid "default soundcard" -msgstr "standard lydkort" +msgid "Show advanced settings" +msgstr "Vis avanserte innstillinger" + +#: ../gtk/parameters.ui.h:67 +msgid "Level" +msgstr "Nivå" + +#: ../gtk/parameters.ui.h:68 +msgid "User interface" +msgstr "Brukergrensesnitt" + +#: ../gtk/parameters.ui.h:69 +msgid "Done" +msgstr "Ferdig" #: ../gtk/buddylookup.ui.h:1 -msgid "Search somebody" -msgstr "Søk noen" +msgid "Search contacts in directory" +msgstr "Søk kontakter i katalogen" #: ../gtk/buddylookup.ui.h:2 msgid "Add to my list" msgstr "Legg til listen min" #: ../gtk/buddylookup.ui.h:3 -msgid "Search contacts in directory" -msgstr "Søk kontakter i katalogen" +msgid "Search somebody" +msgstr "Søk noen" #: ../gtk/waiting.ui.h:1 msgid "Linphone" @@ -1183,19 +1343,95 @@ msgstr "Linphone" msgid "Please wait" msgstr "Vennligst vent" -#: ../coreapi/linphonecore.c:187 +#: ../gtk/dscp_settings.ui.h:1 +#, fuzzy +msgid "Dscp settings" +msgstr "Innstillinger" + +#: ../gtk/dscp_settings.ui.h:2 +msgid "SIP" +msgstr "" + +#: ../gtk/dscp_settings.ui.h:3 +#, fuzzy +msgid "Audio RTP stream" +msgstr "Lydomformer" + +#: ../gtk/dscp_settings.ui.h:4 +#, fuzzy +msgid "Video RTP stream" +msgstr "Video RTP/UDP:" + +#: ../gtk/dscp_settings.ui.h:5 +msgid "Set DSCP values (in hexadecimal)" +msgstr "" + +#: ../gtk/call_statistics.ui.h:1 +#, fuzzy +msgid "Call statistics" +msgstr "Ringer %s" + +#: ../gtk/call_statistics.ui.h:2 +#, fuzzy +msgid "Audio codec" +msgstr "Lyd kodek" + +#: ../gtk/call_statistics.ui.h:3 +#, fuzzy +msgid "Video codec" +msgstr "Video kodek" + +#: ../gtk/call_statistics.ui.h:4 +msgid "Audio IP bandwidth usage" +msgstr "" + +#: ../gtk/call_statistics.ui.h:5 +msgid "Media connectivity" +msgstr "" + +#: ../gtk/call_statistics.ui.h:6 +msgid "Video IP bandwidth usage" +msgstr "" + +#: ../gtk/call_statistics.ui.h:7 +#, fuzzy +msgid "Call statistics and information" +msgstr "Kontaktinformasjon" + +#: ../gtk/tunnel_config.ui.h:1 +#, fuzzy +msgid "Configure VoIP tunnel" +msgstr "Konfigurer en SIP konto" + +#: ../gtk/tunnel_config.ui.h:2 +msgid "Host" +msgstr "" + +#: ../gtk/tunnel_config.ui.h:3 +msgid "Port" +msgstr "" + +#: ../gtk/tunnel_config.ui.h:6 +msgid "Configure tunnel" +msgstr "" + +#: ../gtk/tunnel_config.ui.h:9 +msgid "Configure http proxy (optional)" +msgstr "" + +#: ../coreapi/linphonecore.c:232 msgid "aborted" msgstr "avbrutt" -#: ../coreapi/linphonecore.c:190 +#: ../coreapi/linphonecore.c:235 msgid "completed" msgstr "Fullført" -#: ../coreapi/linphonecore.c:193 +#: ../coreapi/linphonecore.c:238 msgid "missed" msgstr "ubesvart" -#: ../coreapi/linphonecore.c:198 +#: ../coreapi/linphonecore.c:243 #, c-format msgid "" "%s at %s\n" @@ -1210,23 +1446,23 @@ msgstr "" "Status: %s\n" "Lengde: %i min %i sek\n" -#: ../coreapi/linphonecore.c:199 +#: ../coreapi/linphonecore.c:244 msgid "Outgoing call" msgstr "Utgående samtale" -#: ../coreapi/linphonecore.c:1088 +#: ../coreapi/linphonecore.c:1226 msgid "Ready" msgstr "Klar" -#: ../coreapi/linphonecore.c:1831 +#: ../coreapi/linphonecore.c:2074 msgid "Looking for telephone number destination..." msgstr "Ser etter telefonnummer for destinasjonen..." -#: ../coreapi/linphonecore.c:1834 +#: ../coreapi/linphonecore.c:2077 msgid "Could not resolve this number." msgstr "Kan ikke tilkoble dette nummeret." -#: ../coreapi/linphonecore.c:1878 +#: ../coreapi/linphonecore.c:2121 msgid "" "Could not parse given sip address. A sip url usually looks like sip:" "user@domain" @@ -1234,39 +1470,51 @@ msgstr "" "Klarer ikke å tolke angitt SIP-adresse. En SIP-adresse er vanligvis ut som " "sip: brukernavn@domenenavn" -#: ../coreapi/linphonecore.c:2025 +#: ../coreapi/linphonecore.c:2312 msgid "Contacting" msgstr "Tilknytter" -#: ../coreapi/linphonecore.c:2032 +#: ../coreapi/linphonecore.c:2319 msgid "Could not call" msgstr "Kunne ikke ringe" -#: ../coreapi/linphonecore.c:2140 +#: ../coreapi/linphonecore.c:2429 msgid "Sorry, we have reached the maximum number of simultaneous calls" msgstr "Beklager, du har nådd maksimalt antall samtidige samtaler" -#: ../coreapi/linphonecore.c:2270 +#: ../coreapi/linphonecore.c:2573 +msgid "is contacting you" +msgstr "Kontakter deg." + +#: ../coreapi/linphonecore.c:2574 +msgid " and asked autoanswer." +msgstr " og ba om autosvar." + +#: ../coreapi/linphonecore.c:2574 +msgid "." +msgstr "." + +#: ../coreapi/linphonecore.c:2636 msgid "Modifying call parameters..." msgstr "Endrer ringeparametre..." -#: ../coreapi/linphonecore.c:2366 +#: ../coreapi/linphonecore.c:2908 msgid "Connected." msgstr "Tilkoblet" -#: ../coreapi/linphonecore.c:2389 +#: ../coreapi/linphonecore.c:2931 msgid "Call aborted" msgstr "Samtale avbrutt" -#: ../coreapi/linphonecore.c:2530 +#: ../coreapi/linphonecore.c:3102 msgid "Could not pause the call" msgstr "Kunne ikke pause samtalen" -#: ../coreapi/linphonecore.c:2535 +#: ../coreapi/linphonecore.c:3107 msgid "Pausing the current call..." msgstr "Pauser nåværende samtale" -#: ../coreapi/misc.c:147 +#: ../coreapi/misc.c:148 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the pcm oss emulation module\n" @@ -1279,7 +1527,7 @@ msgstr "" "mangler og linphone trenger den. Vennligst kjør\n" "'modprobe snd-pcm-oss' som root for å laste den." -#: ../coreapi/misc.c:150 +#: ../coreapi/misc.c:151 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the mixer oss emulation module\n" @@ -1292,10 +1540,14 @@ msgstr "" "mangler og linphone trenger den. Vennligst kjør\n" "'modprobe snd-mixer-oss' som root for å laste den." -#: ../coreapi/misc.c:478 +#: ../coreapi/misc.c:496 msgid "Stun lookup in progress..." msgstr "STUN oppslag pågår..." +#: ../coreapi/misc.c:630 +msgid "ICE local candidates gathering in progress..." +msgstr "" + #: ../coreapi/friend.c:33 msgid "Online" msgstr "Tilknyttet" @@ -1344,7 +1596,7 @@ msgstr "Pågående" msgid "Unknown-bug" msgstr "Ukjent feil" -#: ../coreapi/proxy.c:192 +#: ../coreapi/proxy.c:204 msgid "" "The sip proxy address you entered is invalid, it must start with \"sip:\" " "followed by a hostname." @@ -1352,7 +1604,7 @@ msgstr "" "SIP proxy adressen du har angitt er ugyldig, den må begynne med \"sip:\" " "etterfult av vertsnavn." -#: ../coreapi/proxy.c:198 +#: ../coreapi/proxy.c:210 msgid "" "The sip identity you entered is invalid.\n" "It should look like sip:username@proxydomain, such as sip:alice@example.net" @@ -1360,147 +1612,200 @@ msgstr "" "SIP adressen du har angitt er feil. Adressen bør se ut som sip: " "brukernavn@domenenavn, f.eks sip:ola@eksempel.no" -#: ../coreapi/proxy.c:690 +#: ../coreapi/proxy.c:1053 #, c-format msgid "Could not login as %s" msgstr "Ikke ikke logge inn som %s" -#: ../coreapi/callbacks.c:206 -msgid "is contacting you" -msgstr "Kontakter deg." - -#: ../coreapi/callbacks.c:207 -msgid " and asked autoanswer." -msgstr " og ba om autosvar." - -#: ../coreapi/callbacks.c:207 -msgid "." -msgstr "." - -#: ../coreapi/callbacks.c:266 +#: ../coreapi/callbacks.c:276 msgid "Remote ringing." msgstr "Ringer hos motparten." -#: ../coreapi/callbacks.c:282 +#: ../coreapi/callbacks.c:296 #, fuzzy msgid "Remote ringing..." msgstr "Ringer hos motparten." -#: ../coreapi/callbacks.c:293 +#: ../coreapi/callbacks.c:307 msgid "Early media." msgstr "Tidlig media" -#: ../coreapi/callbacks.c:331 +#: ../coreapi/callbacks.c:352 #, c-format msgid "Call with %s is paused." msgstr "Samtalen med %s er pauset." -#: ../coreapi/callbacks.c:342 +#: ../coreapi/callbacks.c:365 #, c-format msgid "Call answered by %s - on hold." msgstr "Samtale besvart av %s - på vent." -#: ../coreapi/callbacks.c:357 +#: ../coreapi/callbacks.c:376 msgid "Call resumed." msgstr "Samtale gjenopptatt." -#: ../coreapi/callbacks.c:362 +#: ../coreapi/callbacks.c:381 #, c-format msgid "Call answered by %s." msgstr "Samtale besvart av %s." -#: ../coreapi/callbacks.c:432 -msgid "We are being paused..." -msgstr "Vi er satt på vent..." - -#: ../coreapi/callbacks.c:436 -msgid "We have been resumed..." -msgstr "Vi har blitt gjenopptatt..." - -#: ../coreapi/callbacks.c:441 -msgid "Call has been updated by remote..." +#: ../coreapi/callbacks.c:396 +msgid "Incompatible, check codecs..." msgstr "" -#: ../coreapi/callbacks.c:473 +#: ../coreapi/callbacks.c:437 +#, fuzzy +msgid "We have been resumed." +msgstr "Vi har blitt gjenopptatt..." + +#: ../coreapi/callbacks.c:446 +msgid "We are paused by other party." +msgstr "" + +#: ../coreapi/callbacks.c:452 +msgid "Call is updated by remote." +msgstr "" + +#: ../coreapi/callbacks.c:521 msgid "Call terminated." msgstr "Samtale avsluttet." -#: ../coreapi/callbacks.c:480 +#: ../coreapi/callbacks.c:528 msgid "User is busy." msgstr "Brukeren er opptatt." -#: ../coreapi/callbacks.c:481 +#: ../coreapi/callbacks.c:529 msgid "User is temporarily unavailable." msgstr "Brukeren er midlertidig ikke tilgjengelig." #. char *retrymsg=_("%s. Retry after %i minute(s)."); -#: ../coreapi/callbacks.c:483 +#: ../coreapi/callbacks.c:531 msgid "User does not want to be disturbed." msgstr "Brukeren vil ikke bli forstyrret." -#: ../coreapi/callbacks.c:484 +#: ../coreapi/callbacks.c:532 msgid "Call declined." msgstr "Samtale avvist." -#: ../coreapi/callbacks.c:496 +#: ../coreapi/callbacks.c:544 msgid "No response." msgstr "Ikke noe svar." -#: ../coreapi/callbacks.c:500 +#: ../coreapi/callbacks.c:548 msgid "Protocol error." msgstr "Protokollfeil." -#: ../coreapi/callbacks.c:516 +#: ../coreapi/callbacks.c:564 msgid "Redirected" msgstr "Omdirigert" -#: ../coreapi/callbacks.c:526 -msgid "Not found" -msgstr "Ikke funnet" +#: ../coreapi/callbacks.c:600 +msgid "Incompatible media parameters." +msgstr "" -#: ../coreapi/callbacks.c:551 -msgid "No common codecs" -msgstr "Ingen felles kodek" - -#: ../coreapi/callbacks.c:557 +#: ../coreapi/callbacks.c:606 msgid "Call failed." msgstr "Samtale feilet." -#: ../coreapi/callbacks.c:631 +#: ../coreapi/callbacks.c:701 #, c-format msgid "Registration on %s successful." msgstr "Registrering hos %s lykkes." -#: ../coreapi/callbacks.c:632 +#: ../coreapi/callbacks.c:702 #, c-format msgid "Unregistration on %s done." msgstr "Avregistrering hos %s lykkes." -#: ../coreapi/callbacks.c:648 +#: ../coreapi/callbacks.c:722 msgid "no response timeout" msgstr "ingen svar innen angitt tid" -#: ../coreapi/callbacks.c:651 +#: ../coreapi/callbacks.c:725 #, c-format msgid "Registration on %s failed: %s" msgstr "Registrering hos %s mislykkes: %s" -#: ../coreapi/sal_eXosip2.c:873 ../coreapi/sal_eXosip2.c:875 -msgid "Authentication failure" -msgstr "Autorisering kreves" - -#: ../coreapi/linphonecall.c:128 +#: ../coreapi/linphonecall.c:129 #, fuzzy, c-format msgid "Authentication token is %s" msgstr "Autorisering kreves" -#: ../coreapi/linphonecall.c:1560 +#: ../coreapi/linphonecall.c:2124 #, c-format msgid "You have missed %i call." msgid_plural "You have missed %i calls." msgstr[0] "Du har %i ubesvarte anrop." msgstr[1] "Du har %i missade samtal" +#~ msgid "Chat with %s" +#~ msgstr "Chat med %s" + +#~ msgid "Please choose a username:" +#~ msgstr "Velg ett brukernavn:" + +#~ msgid "Checking if '%s' is available..." +#~ msgstr "Sjekker om %s' er tilgjengelig..." + +#~ msgid "Please wait..." +#~ msgstr "Vennligst vent..." + +#~ msgid "Sorry this username already exists. Please try a new one." +#~ msgstr "Beklager, brukernavnet er allerede tatt. Forsøk ett annet." + +#~ msgid "Ok !" +#~ msgstr "Ok !" + +#~ msgid "Communication problem, please try again later." +#~ msgstr "Kommunikasjonsproblem, forsøk igjen senere." + +#~ msgid "Choosing a username" +#~ msgstr "Velg ett brukernavn" + +#~ msgid "Verifying" +#~ msgstr "Verifiserer" + +#~ msgid "Confirmation" +#~ msgstr "Bekreftelse" + +#~ msgid "Creating your account" +#~ msgstr "Lager brukerkontoen din" + +#~ msgid "Now ready !" +#~ msgstr "Klar nå!" + +#~ msgid "Contacts" +#~ msgstr "Kontakter" + +#, fuzzy +#~ msgid "Enable video" +#~ msgstr "På" + +#~ msgid "Enter username, phone number, or full sip address" +#~ msgstr "Skriv inn brukernavn, telefonnummer eller full SIP-addresse" + +#~ msgid "Lookup:" +#~ msgstr "Slå opp:" + +#~ msgid "in" +#~ msgstr "i" + +#~ msgid "" +#~ "Register to FONICS\n" +#~ "virtual network !" +#~ msgstr "" +#~ "Registrer hos FONICS\n" +#~ "virtuelle nettverk !" + +#~ msgid "We are being paused..." +#~ msgstr "Vi er satt på vent..." + +#~ msgid "No common codecs" +#~ msgstr "Ingen felles kodek" + +#~ msgid "Authentication failure" +#~ msgstr "Autorisering kreves" + #~ msgid "Windows" #~ msgstr "Vinduer" @@ -1601,9 +1906,6 @@ msgstr[1] "Du har %i missade samtal" #~ msgid "A filter that send several inputs to one output." #~ msgstr "Ett filer for å sende flere inn-kilder til en utgang" -#~ msgid "Audio resampler" -#~ msgstr "Lydomformer" - #~ msgid "RTP output filter" #~ msgstr "RTP ut-filter" @@ -1723,9 +2025,6 @@ msgstr[1] "Du har %i missade samtal" #~ msgstr "" #~ "Ett video for vinduer (vfw.h) baserte kildefilter for å fange bilder" -#~ msgid "ICE filter" -#~ msgstr "ICE filter" - #~ msgid "" #~ "A filter that trashes its input (useful for terminating some graphs)." #~ msgstr "" @@ -1785,19 +2084,12 @@ msgstr[1] "Du har %i missade samtal" #~ msgid "Assistant" #~ msgstr "Assistent" -#, fuzzy -#~ msgid "Call Details" -#~ msgstr "Ringer %s" - #~ msgid "Show debug messages" #~ msgstr "Visa debugfönstret" #~ msgid "Start call" #~ msgstr "Ring" -#~ msgid "Terminate call" -#~ msgstr "Lägg på" - #~ msgid "_Modes" #~ msgstr "_Media" diff --git a/po/nl.po b/po/nl.po index 9926ab14b..84f297c20 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: 2011-12-05 12:41+0100\n" +"POT-Creation-Date: 2013-01-08 10:35+0100\n" "PO-Revision-Date: 2007-09-05 10:40+0200\n" "Last-Translator: Hendrik-Jan Heins \n" "Language-Team: Nederlands \n" @@ -19,32 +19,54 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../gtk/calllogs.c:71 +#: ../gtk/calllogs.c:82 +#, fuzzy +msgid "Aborted" +msgstr "afgebroken" + +#: ../gtk/calllogs.c:85 +#, fuzzy +msgid "Missed" +msgstr "gemist" + +#: ../gtk/calllogs.c:88 +#, fuzzy +msgid "Declined" +msgstr "lijn" + +#: ../gtk/calllogs.c:94 #, c-format msgid "%i minute" msgid_plural "%i minutes" msgstr[0] "" msgstr[1] "" -#: ../gtk/calllogs.c:74 +#: ../gtk/calllogs.c:97 #, c-format msgid "%i second" msgid_plural "%i seconds" msgstr[0] "" msgstr[1] "" -#: ../gtk/calllogs.c:77 +#: ../gtk/calllogs.c:100 #, c-format msgid "" "%s\t%s\tQuality: %s\n" "%s\t%s %s\t" msgstr "" -#: ../gtk/calllogs.c:79 +#: ../gtk/calllogs.c:102 msgid "n/a" msgstr "" -#: ../gtk/conference.c:33 ../gtk/incall_view.c:183 +#: ../gtk/calllogs.c:105 +#, c-format +msgid "" +"%s\t%s\t\n" +"%s\t%s" +msgstr "" + +#: ../gtk/conference.c:33 ../gtk/main.ui.h:13 msgid "Conference" msgstr "" @@ -57,43 +79,42 @@ msgstr "" msgid "Couldn't find pixmap file: %s" msgstr "Kon pixmap bestand %s niet vinden" -#: ../gtk/chat.c:27 -#, c-format -msgid "Chat with %s" -msgstr "Chat met %s" - -#: ../gtk/main.c:83 +#: ../gtk/main.c:89 msgid "log to stdout some debug information while running." msgstr "" -#: ../gtk/main.c:90 +#: ../gtk/main.c:96 msgid "path to a file to write logs into." msgstr "" -#: ../gtk/main.c:97 +#: ../gtk/main.c:103 +msgid "Start linphone with video disabled." +msgstr "" + +#: ../gtk/main.c:110 msgid "Start only in the system tray, do not show the main interface." msgstr "" -#: ../gtk/main.c:104 +#: ../gtk/main.c:117 msgid "address to call right now" msgstr "" -#: ../gtk/main.c:111 +#: ../gtk/main.c:124 msgid "if set automatically answer incoming calls" msgstr "" -#: ../gtk/main.c:118 +#: ../gtk/main.c:131 msgid "" "Specifiy a working directory (should be the base of the installation, eg: c:" "\\Program Files\\Linphone)" msgstr "" -#: ../gtk/main.c:464 +#: ../gtk/main.c:498 #, fuzzy, c-format msgid "Call with %s" msgstr "Chat met %s" -#: ../gtk/main.c:815 +#: ../gtk/main.c:871 #, c-format msgid "" "%s would like to add you to his contact list.\n" @@ -102,226 +123,245 @@ msgid "" "If you answer no, this person will be temporarily blacklisted." msgstr "" -#: ../gtk/main.c:893 +#: ../gtk/main.c:948 #, c-format msgid "" "Please enter your password for username %s\n" " at domain %s:" msgstr "" -#: ../gtk/main.c:993 +#: ../gtk/main.c:1051 #, fuzzy msgid "Call error" msgstr "Linphone - Oproepgeschiedenis" -#: ../gtk/main.c:996 ../coreapi/linphonecore.c:2406 +#: ../gtk/main.c:1054 ../coreapi/linphonecore.c:2949 msgid "Call ended" msgstr "Oproep beeindigd" -#: ../gtk/main.c:999 ../coreapi/linphonecore.c:199 +#: ../gtk/main.c:1057 ../coreapi/linphonecore.c:244 msgid "Incoming call" msgstr "Inkomende oproep" -#: ../gtk/main.c:1001 ../gtk/incall_view.c:292 ../gtk/main.ui.h:20 +#: ../gtk/main.c:1059 ../gtk/incall_view.c:451 ../gtk/main.ui.h:6 msgid "Answer" msgstr "" -#: ../gtk/main.c:1003 ../gtk/main.ui.h:29 +#: ../gtk/main.c:1061 ../gtk/main.ui.h:7 #, fuzzy msgid "Decline" msgstr "lijn" -#: ../gtk/main.c:1009 +#: ../gtk/main.c:1067 #, fuzzy msgid "Call paused" msgstr "afgebroken" -#: ../gtk/main.c:1009 +#: ../gtk/main.c:1067 #, c-format msgid "by %s" msgstr "" -#: ../gtk/main.c:1165 +#: ../gtk/main.c:1116 +#, c-format +msgid "%s proposed to start video. Do you accept ?" +msgstr "" + +#: ../gtk/main.c:1278 msgid "Website link" msgstr "" -#: ../gtk/main.c:1205 +#: ../gtk/main.c:1318 msgid "Linphone - a video internet phone" msgstr "" -#: ../gtk/main.c:1295 +#: ../gtk/main.c:1410 #, c-format msgid "%s (Default)" msgstr "" -#: ../gtk/main.c:1566 ../coreapi/callbacks.c:700 +#: ../gtk/main.c:1714 ../coreapi/callbacks.c:774 #, c-format msgid "We are transferred to %s" msgstr "" -#: ../gtk/main.c:1576 +#: ../gtk/main.c:1724 msgid "" "No sound cards have been detected on this computer.\n" "You won't be able to send or receive audio calls." msgstr "" -#: ../gtk/main.c:1663 +#: ../gtk/main.c:1833 msgid "A free SIP video-phone" msgstr "Een Vrije SIP video-telefoon" -#: ../gtk/friendlist.c:203 +#: ../gtk/friendlist.c:335 #, fuzzy msgid "Add to addressbook" msgstr "Adresboek" -#: ../gtk/friendlist.c:258 ../gtk/propertybox.c:296 ../gtk/contact.ui.h:3 -msgid "Name" -msgstr "Naam" - -#: ../gtk/friendlist.c:271 +#: ../gtk/friendlist.c:509 msgid "Presence status" msgstr "Aanwezigheidsstatus" -#: ../gtk/friendlist.c:308 +#: ../gtk/friendlist.c:526 ../gtk/propertybox.c:362 ../gtk/contact.ui.h:1 +msgid "Name" +msgstr "Naam" + +#: ../gtk/friendlist.c:538 +#, fuzzy +msgid "Call" +msgstr "Oproepgeschiedenis" + +#: ../gtk/friendlist.c:543 +#, fuzzy +msgid "Chat" +msgstr "Chat box" + +#: ../gtk/friendlist.c:573 #, c-format msgid "Search in %s directory" msgstr "" -#: ../gtk/friendlist.c:568 +#: ../gtk/friendlist.c:730 msgid "Invalid sip contact !" msgstr "" -#: ../gtk/friendlist.c:613 +#: ../gtk/friendlist.c:775 #, fuzzy, c-format msgid "Call %s" msgstr "Oproepgeschiedenis" -#: ../gtk/friendlist.c:614 +#: ../gtk/friendlist.c:776 #, c-format msgid "Send text to %s" msgstr "" -#: ../gtk/friendlist.c:615 +#: ../gtk/friendlist.c:777 #, fuzzy, c-format msgid "Edit contact '%s'" msgstr "Bewerk contactgegevens" -#: ../gtk/friendlist.c:616 +#: ../gtk/friendlist.c:778 #, c-format msgid "Delete contact '%s'" msgstr "" -#: ../gtk/friendlist.c:658 +#: ../gtk/friendlist.c:820 #, c-format msgid "Add new contact from %s directory" msgstr "" -#: ../gtk/propertybox.c:302 +#: ../gtk/propertybox.c:368 msgid "Rate (Hz)" msgstr "Frequentie (Hz)" -#: ../gtk/propertybox.c:308 +#: ../gtk/propertybox.c:374 msgid "Status" msgstr "Status" -#: ../gtk/propertybox.c:314 +#: ../gtk/propertybox.c:380 msgid "Min bitrate (kbit/s)" msgstr "Minimale bitrate (kbit/s)" -#: ../gtk/propertybox.c:321 +#: ../gtk/propertybox.c:387 msgid "Parameters" msgstr "Parameters" -#: ../gtk/propertybox.c:364 ../gtk/propertybox.c:507 +#: ../gtk/propertybox.c:430 ../gtk/propertybox.c:573 msgid "Enabled" msgstr "Aan" -#: ../gtk/propertybox.c:366 ../gtk/propertybox.c:507 +#: ../gtk/propertybox.c:432 ../gtk/propertybox.c:573 msgid "Disabled" msgstr "Uit" -#: ../gtk/propertybox.c:553 +#: ../gtk/propertybox.c:619 msgid "Account" msgstr "Account" -#: ../gtk/propertybox.c:693 +#: ../gtk/propertybox.c:759 msgid "English" msgstr "" -#: ../gtk/propertybox.c:694 +#: ../gtk/propertybox.c:760 msgid "French" msgstr "" -#: ../gtk/propertybox.c:695 +#: ../gtk/propertybox.c:761 msgid "Swedish" msgstr "" -#: ../gtk/propertybox.c:696 +#: ../gtk/propertybox.c:762 msgid "Italian" msgstr "" -#: ../gtk/propertybox.c:697 +#: ../gtk/propertybox.c:763 msgid "Spanish" msgstr "" -#: ../gtk/propertybox.c:698 +#: ../gtk/propertybox.c:764 msgid "Brazilian Portugese" msgstr "" -#: ../gtk/propertybox.c:699 +#: ../gtk/propertybox.c:765 msgid "Polish" msgstr "" -#: ../gtk/propertybox.c:700 +#: ../gtk/propertybox.c:766 msgid "German" msgstr "" -#: ../gtk/propertybox.c:701 +#: ../gtk/propertybox.c:767 msgid "Russian" msgstr "" -#: ../gtk/propertybox.c:702 +#: ../gtk/propertybox.c:768 msgid "Japanese" msgstr "" -#: ../gtk/propertybox.c:703 +#: ../gtk/propertybox.c:769 msgid "Dutch" msgstr "" -#: ../gtk/propertybox.c:704 +#: ../gtk/propertybox.c:770 msgid "Hungarian" msgstr "" -#: ../gtk/propertybox.c:705 +#: ../gtk/propertybox.c:771 msgid "Czech" msgstr "" -#: ../gtk/propertybox.c:706 +#: ../gtk/propertybox.c:772 msgid "Chinese" msgstr "" -#: ../gtk/propertybox.c:707 +#: ../gtk/propertybox.c:773 msgid "Traditional Chinese" msgstr "" -#: ../gtk/propertybox.c:708 +#: ../gtk/propertybox.c:774 msgid "Norwegian" msgstr "" -#: ../gtk/propertybox.c:765 +#: ../gtk/propertybox.c:775 +msgid "Hebrew" +msgstr "" + +#: ../gtk/propertybox.c:842 msgid "" "You need to restart linphone for the new language selection to take effect." msgstr "" -#: ../gtk/propertybox.c:835 +#: ../gtk/propertybox.c:912 msgid "None" msgstr "Geen" -#: ../gtk/propertybox.c:839 +#: ../gtk/propertybox.c:916 msgid "SRTP" msgstr "" -#: ../gtk/propertybox.c:845 +#: ../gtk/propertybox.c:922 msgid "ZRTP" msgstr "" @@ -365,182 +405,279 @@ msgid_plural "Found %i contacts" msgstr[0] "" msgstr[1] "" -#: ../gtk/setupwizard.c:25 +#: ../gtk/setupwizard.c:33 msgid "" "Welcome !\n" "This assistant will help you to use a SIP account for your calls." msgstr "" -#: ../gtk/setupwizard.c:34 -msgid "Create an account by choosing a username" +#: ../gtk/setupwizard.c:42 +msgid "Create an account on linphone.org" msgstr "" -#: ../gtk/setupwizard.c:35 -msgid "I have already an account and just want to use it" +#: ../gtk/setupwizard.c:43 +msgid "I have already a linphone.org account and I just want to use it" msgstr "" -#: ../gtk/setupwizard.c:53 -msgid "Please choose a username:" +#: ../gtk/setupwizard.c:44 +msgid "I have already a sip account and I just want to use it" msgstr "" -#: ../gtk/setupwizard.c:54 +#: ../gtk/setupwizard.c:84 +msgid "Enter your linphone.org username" +msgstr "" + +#: ../gtk/setupwizard.c:91 #, fuzzy msgid "Username:" msgstr "gebruikersnaam:" -#: ../gtk/setupwizard.c:92 -#, c-format -msgid "Checking if '%s' is available..." +#: ../gtk/setupwizard.c:93 ../gtk/password.ui.h:4 +#, fuzzy +msgid "Password:" +msgstr "wachtwoord:" + +#: ../gtk/setupwizard.c:113 +msgid "Enter your account informations" msgstr "" -#: ../gtk/setupwizard.c:97 ../gtk/setupwizard.c:164 -msgid "Please wait..." +#: ../gtk/setupwizard.c:120 +#, fuzzy +msgid "Username*" +msgstr "gebruikersnaam:" + +#: ../gtk/setupwizard.c:121 +#, fuzzy +msgid "Password*" +msgstr "wachtwoord:" + +#: ../gtk/setupwizard.c:124 +msgid "Domain*" msgstr "" -#: ../gtk/setupwizard.c:101 -msgid "Sorry this username already exists. Please try a new one." +#: ../gtk/setupwizard.c:125 +msgid "Proxy" msgstr "" -#: ../gtk/setupwizard.c:103 ../gtk/setupwizard.c:168 -msgid "Ok !" +#: ../gtk/setupwizard.c:297 +msgid "(*) Required fields" msgstr "" -#: ../gtk/setupwizard.c:106 ../gtk/setupwizard.c:171 -msgid "Communication problem, please try again later." +#: ../gtk/setupwizard.c:298 +#, fuzzy +msgid "Username: (*)" +msgstr "gebruikersnaam:" + +#: ../gtk/setupwizard.c:300 +#, fuzzy +msgid "Password: (*)" +msgstr "wachtwoord:" + +#: ../gtk/setupwizard.c:302 +msgid "Email: (*)" msgstr "" -#: ../gtk/setupwizard.c:134 +#: ../gtk/setupwizard.c:304 +msgid "Confirm your password: (*)" +msgstr "" + +#: ../gtk/setupwizard.c:368 +msgid "" +"Error, account not validated, username already used or server unreachable.\n" +"Please go back and try again." +msgstr "" + +#: ../gtk/setupwizard.c:379 msgid "Thank you. Your account is now configured and ready for use." msgstr "" -#: ../gtk/setupwizard.c:228 +#: ../gtk/setupwizard.c:387 +msgid "" +"Please validate your account by clicking on the link we just sent you by " +"email.\n" +"Then come back here and press Next button." +msgstr "" + +#: ../gtk/setupwizard.c:554 msgid "Welcome to the account setup assistant" msgstr "" -#: ../gtk/setupwizard.c:232 +#: ../gtk/setupwizard.c:559 msgid "Account setup assistant" msgstr "" -#: ../gtk/setupwizard.c:236 -#, fuzzy -msgid "Choosing a username" -msgstr "gebruikersnaam:" - -#: ../gtk/setupwizard.c:240 -msgid "Verifying" +#: ../gtk/setupwizard.c:565 +msgid "Configure your account (step 1/1)" msgstr "" -#: ../gtk/setupwizard.c:244 -#, fuzzy -msgid "Confirmation" -msgstr "Informatie" - -#: ../gtk/setupwizard.c:249 -msgid "Creating your account" +#: ../gtk/setupwizard.c:570 +msgid "Enter your sip username (step 1/1)" msgstr "" -#: ../gtk/setupwizard.c:253 -msgid "Now ready !" +#: ../gtk/setupwizard.c:574 +msgid "Enter account information (step 1/2)" msgstr "" -#: ../gtk/incall_view.c:69 +#: ../gtk/setupwizard.c:583 +msgid "Validation (step 2/2)" +msgstr "" + +#: ../gtk/setupwizard.c:588 +msgid "Error" +msgstr "" + +#: ../gtk/setupwizard.c:592 +msgid "Terminating" +msgstr "" + +#: ../gtk/incall_view.c:69 ../gtk/incall_view.c:90 #, fuzzy, c-format msgid "Call #%i" msgstr "Oproepgeschiedenis" -#: ../gtk/incall_view.c:127 +#: ../gtk/incall_view.c:150 #, c-format msgid "Transfer to call #%i with %s" msgstr "" -#: ../gtk/incall_view.c:155 -msgid "Transfer" +#: ../gtk/incall_view.c:209 ../gtk/incall_view.c:212 +msgid "Not used" msgstr "" -#: ../gtk/incall_view.c:271 +#: ../gtk/incall_view.c:219 +msgid "ICE not activated" +msgstr "" + +#: ../gtk/incall_view.c:221 +#, fuzzy +msgid "ICE failed" +msgstr "Oproep geannuleerd." + +#: ../gtk/incall_view.c:223 +msgid "ICE in progress" +msgstr "" + +#: ../gtk/incall_view.c:225 +msgid "Going through one or more NATs" +msgstr "" + +#: ../gtk/incall_view.c:227 +#, fuzzy +msgid "Direct" +msgstr "Doorgeschakeld naar %s..." + +#: ../gtk/incall_view.c:229 +msgid "Through a relay server" +msgstr "" + +#: ../gtk/incall_view.c:238 ../gtk/incall_view.c:242 +#, c-format +msgid "" +"download: %f\n" +"upload: %f (kbit/s)" +msgstr "" + +#: ../gtk/incall_view.c:341 ../gtk/main.ui.h:12 +msgid "Hang up" +msgstr "" + +#: ../gtk/incall_view.c:430 #, fuzzy msgid "Calling..." msgstr "Contactlijst" -#: ../gtk/incall_view.c:274 ../gtk/incall_view.c:482 +#: ../gtk/incall_view.c:433 ../gtk/incall_view.c:646 msgid "00::00::00" msgstr "" -#: ../gtk/incall_view.c:285 +#: ../gtk/incall_view.c:444 #, fuzzy msgid "Incoming call" msgstr "Inkomende oproep" -#: ../gtk/incall_view.c:322 +#: ../gtk/incall_view.c:481 msgid "good" msgstr "" -#: ../gtk/incall_view.c:324 +#: ../gtk/incall_view.c:483 msgid "average" msgstr "" -#: ../gtk/incall_view.c:326 +#: ../gtk/incall_view.c:485 msgid "poor" msgstr "" -#: ../gtk/incall_view.c:328 +#: ../gtk/incall_view.c:487 msgid "very poor" msgstr "" -#: ../gtk/incall_view.c:330 +#: ../gtk/incall_view.c:489 msgid "too bad" msgstr "" -#: ../gtk/incall_view.c:331 ../gtk/incall_view.c:347 +#: ../gtk/incall_view.c:490 ../gtk/incall_view.c:506 msgid "unavailable" msgstr "" -#: ../gtk/incall_view.c:447 +#: ../gtk/incall_view.c:605 msgid "Secured by SRTP" msgstr "" -#: ../gtk/incall_view.c:453 +#: ../gtk/incall_view.c:611 #, c-format msgid "Secured by ZRTP - [auth token: %s]" msgstr "" -#: ../gtk/incall_view.c:459 +#: ../gtk/incall_view.c:617 msgid "Set unverified" msgstr "" -#: ../gtk/incall_view.c:459 ../gtk/main.ui.h:49 +#: ../gtk/incall_view.c:617 ../gtk/main.ui.h:5 msgid "Set verified" msgstr "" -#: ../gtk/incall_view.c:480 +#: ../gtk/incall_view.c:641 msgid "In conference" msgstr "" -#: ../gtk/incall_view.c:480 +#: ../gtk/incall_view.c:641 #, fuzzy msgid "In call" msgstr "Contactlijst" -#: ../gtk/incall_view.c:499 +#: ../gtk/incall_view.c:669 #, fuzzy msgid "Paused call" msgstr "Contactlijst" -#: ../gtk/incall_view.c:511 +#: ../gtk/incall_view.c:682 #, c-format msgid "%02i::%02i::%02i" msgstr "" -#: ../gtk/incall_view.c:527 +#: ../gtk/incall_view.c:699 #, fuzzy msgid "Call ended." msgstr "Oproep beeindigd" -#: ../gtk/incall_view.c:584 +#: ../gtk/incall_view.c:731 +msgid "Transfer in progress" +msgstr "" + +#: ../gtk/incall_view.c:734 +msgid "Transfer done." +msgstr "" + +#: ../gtk/incall_view.c:737 +#, fuzzy +msgid "Transfer failed." +msgstr "Oproep geannuleerd." + +#: ../gtk/incall_view.c:781 msgid "Resume" msgstr "" -#: ../gtk/incall_view.c:591 ../gtk/main.ui.h:45 +#: ../gtk/incall_view.c:788 ../gtk/main.ui.h:9 msgid "Pause" msgstr "" @@ -550,242 +687,257 @@ msgid "Please enter login information for %s" msgstr "" #: ../gtk/main.ui.h:1 -msgid "#" -msgstr "#" - -#: ../gtk/main.ui.h:2 -msgid "*" -msgstr "*" - -#: ../gtk/main.ui.h:3 -msgid "0" -msgstr "0" - -#: ../gtk/main.ui.h:4 -msgid "1" -msgstr "1" - -#: ../gtk/main.ui.h:5 -msgid "2" -msgstr "" - -#: ../gtk/main.ui.h:6 -msgid "3" -msgstr "" - -#: ../gtk/main.ui.h:7 -msgid "4" -msgstr "" - -#: ../gtk/main.ui.h:8 -msgid "5" -msgstr "5" - -#: ../gtk/main.ui.h:9 -msgid "6" -msgstr "" - -#: ../gtk/main.ui.h:10 -msgid "7" -msgstr "" - -#: ../gtk/main.ui.h:11 -msgid "8" -msgstr "" - -#: ../gtk/main.ui.h:12 -msgid "9" -msgstr "" - -#: ../gtk/main.ui.h:13 -#, fuzzy -msgid "Add contacts from directory" -msgstr "Contact informatie" - -#: ../gtk/main.ui.h:14 #, fuzzy msgid "Callee name" msgstr "Oproep beeindigd" -#: ../gtk/main.ui.h:15 +#: ../gtk/main.ui.h:2 #, fuzzy -msgid "Welcome !" -msgstr "Contactlijst" +msgid "Send" +msgstr "Geluid" -#: ../gtk/main.ui.h:16 -msgid "A" +#: ../gtk/main.ui.h:3 +msgid "End conference" msgstr "" -#: ../gtk/main.ui.h:17 -msgid "ADSL" +#: ../gtk/main.ui.h:4 +msgid "label" msgstr "" -#: ../gtk/main.ui.h:18 -#, fuzzy -msgid "Add contact" -msgstr "Bewerk contactgegevens" - -#: ../gtk/main.ui.h:19 -msgid "All users" +#: ../gtk/main.ui.h:8 +msgid "Video" msgstr "" -#: ../gtk/main.ui.h:21 -#, fuzzy -msgid "Automatically log me in" -msgstr "Automatisch een geldige hostnaam raden" - -#: ../gtk/main.ui.h:22 -msgid "B" +#: ../gtk/main.ui.h:10 +msgid "Mute" msgstr "" -#: ../gtk/main.ui.h:23 ../gtk/parameters.ui.h:21 -msgid "C" +#: ../gtk/main.ui.h:11 +msgid "Transfer" msgstr "" -#: ../gtk/main.ui.h:24 -#, fuzzy -msgid "Call" -msgstr "Oproepgeschiedenis" - -#: ../gtk/main.ui.h:25 -msgid "Call quality rating" -msgstr "" - -#: ../gtk/main.ui.h:26 -msgid "Check _Updates" -msgstr "" - -#: ../gtk/main.ui.h:27 -#, fuzzy -msgid "Contacts" -msgstr "Verbinden" - -#: ../gtk/main.ui.h:28 -msgid "D" -msgstr "" - -#: ../gtk/main.ui.h:30 -#, fuzzy -msgid "Default" -msgstr "SIP-identiteit:" - -#: ../gtk/main.ui.h:31 -#, fuzzy -msgid "Duration" -msgstr "Informatie" - -#: ../gtk/main.ui.h:32 -#, fuzzy -msgid "Enable self-view" -msgstr "Video aan" - -#: ../gtk/main.ui.h:33 -#, fuzzy -msgid "Enable video" -msgstr "Aan" - -#: ../gtk/main.ui.h:34 -msgid "Enter username, phone number, or full sip address" -msgstr "" - -#: ../gtk/main.ui.h:35 -msgid "Fiber Channel" -msgstr "" - -#: ../gtk/main.ui.h:36 +#: ../gtk/main.ui.h:14 #, fuzzy msgid "In call" msgstr "Inkomende oproep" -#: ../gtk/main.ui.h:37 -msgid "Initiate a new call" +#: ../gtk/main.ui.h:15 +#, fuzzy +msgid "Duration" +msgstr "Informatie" + +#: ../gtk/main.ui.h:16 +msgid "Call quality rating" msgstr "" -#: ../gtk/main.ui.h:38 -msgid "Internet connection:" +#: ../gtk/main.ui.h:17 +msgid "_Options" msgstr "" -#: ../gtk/main.ui.h:39 -msgid "Keypad" +#: ../gtk/main.ui.h:18 +msgid "Always start video" msgstr "" -#: ../gtk/main.ui.h:40 +#: ../gtk/main.ui.h:19 #, fuzzy -msgid "Login information" -msgstr "Contact informatie" +msgid "Enable self-view" +msgstr "Video aan" -#: ../gtk/main.ui.h:41 -msgid "Lookup:" -msgstr "" - -#: ../gtk/main.ui.h:42 -#, fuzzy -msgid "My current identity:" -msgstr "SIP-identiteit:" - -#: ../gtk/main.ui.h:43 -#, fuzzy -msgid "Online users" -msgstr "Aanwezig" - -#: ../gtk/main.ui.h:44 -#, fuzzy -msgid "Password" -msgstr "wachtwoord:" - -#: ../gtk/main.ui.h:46 -#, fuzzy -msgid "Recent calls" -msgstr "Inkomende oproep" - -#: ../gtk/main.ui.h:47 -#, fuzzy -msgid "SIP address or phone number:" -msgstr "Geef het SIP adres of telefoonnummer in" - -#: ../gtk/main.ui.h:48 -msgid "Search" -msgstr "" - -#: ../gtk/main.ui.h:50 -msgid "Show debug window" -msgstr "" - -#: ../gtk/main.ui.h:51 -#, fuzzy -msgid "Username" -msgstr "gebruikersnaam:" - -#: ../gtk/main.ui.h:52 +#: ../gtk/main.ui.h:20 #, fuzzy msgid "_Help" msgstr "Help" -#: ../gtk/main.ui.h:53 +#: ../gtk/main.ui.h:21 +msgid "Show debug window" +msgstr "" + +#: ../gtk/main.ui.h:22 msgid "_Homepage" msgstr "" -#: ../gtk/main.ui.h:54 -msgid "_Options" +#: ../gtk/main.ui.h:23 +msgid "Check _Updates" msgstr "" +#: ../gtk/main.ui.h:24 +msgid "Account assistant" +msgstr "" + +#: ../gtk/main.ui.h:25 +#, fuzzy +msgid "SIP address or phone number:" +msgstr "Geef het SIP adres of telefoonnummer in" + +#: ../gtk/main.ui.h:26 +msgid "Initiate a new call" +msgstr "" + +#: ../gtk/main.ui.h:27 ../gtk/parameters.ui.h:48 +#, fuzzy +msgid "Add" +msgstr "Adres" + +#: ../gtk/main.ui.h:28 ../gtk/parameters.ui.h:49 +msgid "Edit" +msgstr "Bewerken" + +#: ../gtk/main.ui.h:29 +msgid "D" +msgstr "" + +#: ../gtk/main.ui.h:30 +msgid "#" +msgstr "#" + +#: ../gtk/main.ui.h:31 +msgid "0" +msgstr "0" + +#: ../gtk/main.ui.h:32 +msgid "*" +msgstr "*" + +#: ../gtk/main.ui.h:33 ../gtk/parameters.ui.h:7 +msgid "C" +msgstr "" + +#: ../gtk/main.ui.h:34 +msgid "9" +msgstr "" + +#: ../gtk/main.ui.h:35 +msgid "8" +msgstr "" + +#: ../gtk/main.ui.h:36 +msgid "7" +msgstr "" + +#: ../gtk/main.ui.h:37 +msgid "B" +msgstr "" + +#: ../gtk/main.ui.h:38 +msgid "6" +msgstr "" + +#: ../gtk/main.ui.h:39 +msgid "5" +msgstr "5" + +#: ../gtk/main.ui.h:40 +msgid "4" +msgstr "" + +#: ../gtk/main.ui.h:41 +msgid "A" +msgstr "" + +#: ../gtk/main.ui.h:42 +msgid "3" +msgstr "" + +#: ../gtk/main.ui.h:43 +msgid "2" +msgstr "" + +#: ../gtk/main.ui.h:44 +msgid "1" +msgstr "1" + +#: ../gtk/main.ui.h:45 +msgid "Search" +msgstr "" + +#: ../gtk/main.ui.h:46 +#, fuzzy +msgid "Add contacts from directory" +msgstr "Contact informatie" + +#: ../gtk/main.ui.h:47 +#, fuzzy +msgid "Add contact" +msgstr "Bewerk contactgegevens" + +#: ../gtk/main.ui.h:48 +msgid "Keypad" +msgstr "" + +#: ../gtk/main.ui.h:49 +#, fuzzy +msgid "Recent calls" +msgstr "Inkomende oproep" + +#: ../gtk/main.ui.h:50 +#, fuzzy +msgid "My current identity:" +msgstr "SIP-identiteit:" + +#: ../gtk/main.ui.h:51 ../gtk/tunnel_config.ui.h:7 +#, fuzzy +msgid "Username" +msgstr "gebruikersnaam:" + +#: ../gtk/main.ui.h:52 ../gtk/tunnel_config.ui.h:8 +#, fuzzy +msgid "Password" +msgstr "wachtwoord:" + +#: ../gtk/main.ui.h:53 +msgid "Internet connection:" +msgstr "" + +#: ../gtk/main.ui.h:54 +#, fuzzy +msgid "Automatically log me in" +msgstr "Automatisch een geldige hostnaam raden" + #: ../gtk/main.ui.h:55 -msgid "in" -msgstr "" +#, fuzzy +msgid "Login information" +msgstr "Contact informatie" #: ../gtk/main.ui.h:56 -msgid "label" +#, fuzzy +msgid "Welcome !" +msgstr "Contactlijst" + +#: ../gtk/main.ui.h:57 +msgid "All users" +msgstr "" + +#: ../gtk/main.ui.h:58 +#, fuzzy +msgid "Online users" +msgstr "Aanwezig" + +#: ../gtk/main.ui.h:59 +msgid "ADSL" +msgstr "" + +#: ../gtk/main.ui.h:60 +msgid "Fiber Channel" +msgstr "" + +#: ../gtk/main.ui.h:61 +#, fuzzy +msgid "Default" +msgstr "SIP-identiteit:" + +#: ../gtk/main.ui.h:62 +msgid "Delete" msgstr "" #: ../gtk/about.ui.h:1 -msgid "(C) Belledonne Communications,2010\n" -msgstr "" - -#: ../gtk/about.ui.h:3 #, fuzzy msgid "About linphone" msgstr "linphone" +#: ../gtk/about.ui.h:2 +msgid "(C) Belledonne Communications,2010\n" +msgstr "" + #: ../gtk/about.ui.h:4 msgid "An internet video phone using the standard SIP (rfc3261) protocol." msgstr "" @@ -805,405 +957,404 @@ msgid "" "hu: anonymous\n" msgstr "" -#: ../gtk/contact.ui.h:1 -#, fuzzy -msgid "Contact information" -msgstr "Contact informatie" - #: ../gtk/contact.ui.h:2 -msgid "Allow this contact to see my presence status" -msgstr "" - -#: ../gtk/contact.ui.h:4 #, fuzzy msgid "SIP Address" msgstr "Adres" -#: ../gtk/contact.ui.h:5 +#: ../gtk/contact.ui.h:3 msgid "Show this contact presence status" msgstr "" +#: ../gtk/contact.ui.h:4 +msgid "Allow this contact to see my presence status" +msgstr "" + +#: ../gtk/contact.ui.h:5 +#, fuzzy +msgid "Contact information" +msgstr "Contact informatie" + #: ../gtk/log.ui.h:1 msgid "Linphone debug window" msgstr "" +#: ../gtk/log.ui.h:2 +msgid "Scroll to end" +msgstr "" + #: ../gtk/password.ui.h:1 #, fuzzy msgid "Linphone - Authentication required" msgstr "Authorisatie gevraagd" #: ../gtk/password.ui.h:2 -#, fuzzy -msgid "Password:" -msgstr "wachtwoord:" - -#: ../gtk/password.ui.h:3 msgid "Please enter the domain password" msgstr "" -#: ../gtk/password.ui.h:4 +#: ../gtk/password.ui.h:3 msgid "UserID" msgstr "" #: ../gtk/call_logs.ui.h:1 #, fuzzy -msgid "Call back" -msgstr "Oproepgeschiedenis" - -#: ../gtk/call_logs.ui.h:2 -#, fuzzy msgid "Call history" msgstr "Linphone - Oproepgeschiedenis" -#: ../gtk/call_logs.ui.h:3 +#: ../gtk/call_logs.ui.h:2 msgid "Clear all" msgstr "" -#: ../gtk/sip_account.ui.h:1 -msgid "Configure a SIP account" -msgstr "" +#: ../gtk/call_logs.ui.h:3 +#, fuzzy +msgid "Call back" +msgstr "Oproepgeschiedenis" -#: ../gtk/sip_account.ui.h:2 +#: ../gtk/sip_account.ui.h:1 msgid "Linphone - Configure a SIP account" msgstr "" -#: ../gtk/sip_account.ui.h:3 -msgid "Looks like sip:" -msgstr "" - -#: ../gtk/sip_account.ui.h:4 -msgid "Looks like sip:@" -msgstr "" - -#: ../gtk/sip_account.ui.h:5 -#, fuzzy -msgid "Publish presence information" -msgstr "Toon informatie over aanwezigheid:" - -#: ../gtk/sip_account.ui.h:6 -msgid "Register" -msgstr "" - -#: ../gtk/sip_account.ui.h:7 -#, fuzzy -msgid "Registration duration (sec):" -msgstr "Registratieperiode:" - -#: ../gtk/sip_account.ui.h:8 -msgid "Route (optional):" -msgstr "Route (optioneel):" - -#: ../gtk/sip_account.ui.h:9 -#, fuzzy -msgid "SIP Proxy address:" -msgstr "SIP-proxy:" - -#: ../gtk/sip_account.ui.h:10 +#: ../gtk/sip_account.ui.h:2 #, fuzzy msgid "Your SIP identity:" msgstr "SIP-identiteit:" -#: ../gtk/sip_account.ui.h:11 +#: ../gtk/sip_account.ui.h:3 +msgid "Looks like sip:@" +msgstr "" + +#: ../gtk/sip_account.ui.h:4 msgid "sip:" msgstr "sip:" -#: ../gtk/chatroom.ui.h:1 +#: ../gtk/sip_account.ui.h:5 #, fuzzy -msgid "Send" -msgstr "Geluid" +msgid "SIP Proxy address:" +msgstr "SIP-proxy:" + +#: ../gtk/sip_account.ui.h:6 +msgid "Looks like sip:" +msgstr "" + +#: ../gtk/sip_account.ui.h:7 +msgid "Route (optional):" +msgstr "Route (optioneel):" + +#: ../gtk/sip_account.ui.h:8 +#, fuzzy +msgid "Registration duration (sec):" +msgstr "Registratieperiode:" + +#: ../gtk/sip_account.ui.h:9 +msgid "Register" +msgstr "" + +#: ../gtk/sip_account.ui.h:10 +#, fuzzy +msgid "Publish presence information" +msgstr "Toon informatie over aanwezigheid:" + +#: ../gtk/sip_account.ui.h:11 +msgid "Configure a SIP account" +msgstr "" #: ../gtk/parameters.ui.h:1 -msgid "0 stands for \"unlimited\"" +msgid "default soundcard" msgstr "" #: ../gtk/parameters.ui.h:2 -#, fuzzy -msgid "Audio" -msgstr "Contactlijst" +msgid "a sound card" +msgstr "" #: ../gtk/parameters.ui.h:3 -msgid "Bandwidth control" +msgid "default camera" msgstr "" #: ../gtk/parameters.ui.h:4 -#, fuzzy -msgid "Codecs" -msgstr "Contactlijst" +msgid "CIF" +msgstr "" #: ../gtk/parameters.ui.h:5 #, fuzzy -msgid "Default identity" -msgstr "SIP-identiteit:" - -#: ../gtk/parameters.ui.h:6 -#, fuzzy -msgid "Language" -msgstr "Contactlijst" - -#: ../gtk/parameters.ui.h:7 -#, fuzzy -msgid "Level" -msgstr "Contactlijst" - -#: ../gtk/parameters.ui.h:8 -#, fuzzy -msgid "NAT and Firewall" -msgstr "Contactlijst" - -#: ../gtk/parameters.ui.h:9 -msgid "Network protocol and ports" -msgstr "" - -#: ../gtk/parameters.ui.h:10 -#, fuzzy -msgid "Privacy" -msgstr "Contactlijst" - -#: ../gtk/parameters.ui.h:11 -#, fuzzy -msgid "Proxy accounts" -msgstr "Contactlijst" - -#: ../gtk/parameters.ui.h:12 -#, fuzzy -msgid "Transport" -msgstr "Contactlijst" - -#: ../gtk/parameters.ui.h:13 -#, fuzzy -msgid "Video" -msgstr "Contactlijst" - -#: ../gtk/parameters.ui.h:14 -msgid "" -"Adaptive rate control is a technique to dynamically guess the available " -"bandwidth during a call." -msgstr "" - -#: ../gtk/parameters.ui.h:15 -msgid "ALSA special device (optional):" -msgstr "" - -#: ../gtk/parameters.ui.h:16 -#, fuzzy -msgid "Add" -msgstr "Adres" - -#: ../gtk/parameters.ui.h:17 -msgid "Audio RTP/UDP:" -msgstr "" - -#: ../gtk/parameters.ui.h:18 -#, fuzzy msgid "Audio codecs" msgstr "Video codecs" -#: ../gtk/parameters.ui.h:19 -msgid "Behind NAT / Firewall (specify gateway IP below)" -msgstr "" - -#: ../gtk/parameters.ui.h:20 -msgid "Behind NAT / Firewall (use STUN to resolve)" -msgstr "" - -#: ../gtk/parameters.ui.h:22 -msgid "CIF" -msgstr "" - -#: ../gtk/parameters.ui.h:23 +#: ../gtk/parameters.ui.h:6 #, fuzzy -msgid "Capture device:" -msgstr "Geluidsapparaat gebruiken:" +msgid "Video codecs" +msgstr "Video codecs" -#: ../gtk/parameters.ui.h:24 +#: ../gtk/parameters.ui.h:8 +msgid "SIP (UDP)" +msgstr "" + +#: ../gtk/parameters.ui.h:9 +msgid "SIP (TCP)" +msgstr "" + +#: ../gtk/parameters.ui.h:10 +msgid "SIP (TLS)" +msgstr "" + +#: ../gtk/parameters.ui.h:11 +msgid "Settings" +msgstr "" + +#: ../gtk/parameters.ui.h:12 +msgid "Set Maximum Transmission Unit:" +msgstr "" + +#: ../gtk/parameters.ui.h:13 +msgid "Send DTMFs as SIP info" +msgstr "" + +#: ../gtk/parameters.ui.h:14 +msgid "Use IPv6 instead of IPv4" +msgstr "" + +#: ../gtk/parameters.ui.h:15 #, fuzzy -msgid "Codecs" -msgstr "Codecs" +msgid "Transport" +msgstr "Contactlijst" -#: ../gtk/parameters.ui.h:25 -msgid "Direct connection to the Internet" -msgstr "" - -#: ../gtk/parameters.ui.h:26 -msgid "Disable" -msgstr "Uit" - -#: ../gtk/parameters.ui.h:27 -#, fuzzy -msgid "Done" -msgstr "Weg" - -#: ../gtk/parameters.ui.h:28 -#, fuzzy -msgid "Download speed limit in Kbit/sec:" -msgstr "Download bandbreedte (kbit/sec):" - -#: ../gtk/parameters.ui.h:29 -msgid "Edit" -msgstr "Bewerken" - -#: ../gtk/parameters.ui.h:30 -msgid "Enable" -msgstr "Aan" - -#: ../gtk/parameters.ui.h:31 -msgid "Enable adaptive rate control" -msgstr "" - -#: ../gtk/parameters.ui.h:32 -msgid "Enable echo cancellation" -msgstr "" - -#: ../gtk/parameters.ui.h:33 -msgid "Erase all passwords" -msgstr "" - -#: ../gtk/parameters.ui.h:34 -msgid "Manage SIP Accounts" -msgstr "" - -#: ../gtk/parameters.ui.h:35 +#: ../gtk/parameters.ui.h:16 msgid "Media encryption type" msgstr "" -#: ../gtk/parameters.ui.h:36 -msgid "Multimedia settings" +#: ../gtk/parameters.ui.h:17 +msgid "Tunnel" msgstr "" -#: ../gtk/parameters.ui.h:37 +#: ../gtk/parameters.ui.h:18 +msgid "Video RTP/UDP:" +msgstr "" + +#: ../gtk/parameters.ui.h:19 +msgid "Audio RTP/UDP:" +msgstr "" + +#: ../gtk/parameters.ui.h:20 +msgid "DSCP fields" +msgstr "" + +#: ../gtk/parameters.ui.h:21 +msgid "Fixed" +msgstr "" + +#: ../gtk/parameters.ui.h:22 +msgid "Network protocol and ports" +msgstr "" + +#: ../gtk/parameters.ui.h:23 +msgid "Direct connection to the Internet" +msgstr "" + +#: ../gtk/parameters.ui.h:24 +msgid "Behind NAT / Firewall (specify gateway IP below)" +msgstr "" + +#: ../gtk/parameters.ui.h:25 +#, fuzzy +msgid "Public IP address:" +msgstr "SIP-adres:" + +#: ../gtk/parameters.ui.h:26 +msgid "Behind NAT / Firewall (use STUN to resolve)" +msgstr "" + +#: ../gtk/parameters.ui.h:27 +msgid "Behind NAT / Firewall (use ICE)" +msgstr "" + +#: ../gtk/parameters.ui.h:28 +#, fuzzy +msgid "Stun server:" +msgstr "Geluidsapparaat" + +#: ../gtk/parameters.ui.h:29 +#, fuzzy +msgid "NAT and Firewall" +msgstr "Contactlijst" + +#: ../gtk/parameters.ui.h:30 #, fuzzy msgid "Network settings" msgstr "Netwerk" -#: ../gtk/parameters.ui.h:38 +#: ../gtk/parameters.ui.h:31 +#, fuzzy +msgid "Ring sound:" +msgstr "Belgeluid:" + +#: ../gtk/parameters.ui.h:32 +msgid "ALSA special device (optional):" +msgstr "" + +#: ../gtk/parameters.ui.h:33 +#, fuzzy +msgid "Capture device:" +msgstr "Geluidsapparaat gebruiken:" + +#: ../gtk/parameters.ui.h:34 +#, fuzzy +msgid "Ring device:" +msgstr "Geluidsapparaat gebruiken:" + +#: ../gtk/parameters.ui.h:35 #, fuzzy msgid "Playback device:" msgstr "Geluidsapparaat gebruiken:" +#: ../gtk/parameters.ui.h:36 +msgid "Enable echo cancellation" +msgstr "" + +#: ../gtk/parameters.ui.h:37 +#, fuzzy +msgid "Audio" +msgstr "Contactlijst" + +#: ../gtk/parameters.ui.h:38 +#, fuzzy +msgid "Video input device:" +msgstr "Geluidsapparaat" + #: ../gtk/parameters.ui.h:39 msgid "Prefered video resolution:" msgstr "" #: ../gtk/parameters.ui.h:40 #, fuzzy -msgid "Public IP address:" -msgstr "SIP-adres:" +msgid "Video" +msgstr "Contactlijst" #: ../gtk/parameters.ui.h:41 -msgid "" -"Register to FONICS\n" -"virtual network !" +msgid "Multimedia settings" msgstr "" -#: ../gtk/parameters.ui.h:43 -msgid "Remove" -msgstr "Verwijderen" - -#: ../gtk/parameters.ui.h:44 -#, fuzzy -msgid "Ring device:" -msgstr "Geluidsapparaat gebruiken:" - -#: ../gtk/parameters.ui.h:45 -#, fuzzy -msgid "Ring sound:" -msgstr "Belgeluid:" - -#: ../gtk/parameters.ui.h:46 -msgid "SIP (TCP)" -msgstr "" - -#: ../gtk/parameters.ui.h:47 -msgid "SIP (TLS)" -msgstr "" - -#: ../gtk/parameters.ui.h:48 -msgid "SIP (UDP)" -msgstr "" - -#: ../gtk/parameters.ui.h:49 -msgid "Send DTMFs as SIP info" -msgstr "" - -#: ../gtk/parameters.ui.h:50 -msgid "Set Maximum Transmission Unit:" -msgstr "" - -#: ../gtk/parameters.ui.h:51 -msgid "Settings" -msgstr "" - -#: ../gtk/parameters.ui.h:52 -msgid "Show advanced settings" -msgstr "" - -#: ../gtk/parameters.ui.h:53 -#, fuzzy -msgid "Stun server:" -msgstr "Geluidsapparaat" - -#: ../gtk/parameters.ui.h:54 +#: ../gtk/parameters.ui.h:42 msgid "This section defines your SIP address when not using a SIP account" msgstr "" -#: ../gtk/parameters.ui.h:55 -#, fuzzy -msgid "Upload speed limit in Kbit/sec:" -msgstr "Upload bandbreedte (kbit/sec):" - -#: ../gtk/parameters.ui.h:56 -msgid "Use IPv6 instead of IPv4" -msgstr "" - -#: ../gtk/parameters.ui.h:57 -#, fuzzy -msgid "User interface" -msgstr "gebruikersnaam:" - -#: ../gtk/parameters.ui.h:58 -msgid "Video RTP/UDP:" -msgstr "" - -#: ../gtk/parameters.ui.h:59 -#, fuzzy -msgid "Video codecs" -msgstr "Video codecs" - -#: ../gtk/parameters.ui.h:60 -#, fuzzy -msgid "Video input device:" -msgstr "Geluidsapparaat" - -#: ../gtk/parameters.ui.h:61 +#: ../gtk/parameters.ui.h:43 msgid "Your display name (eg: John Doe):" msgstr "" -#: ../gtk/parameters.ui.h:62 -#, fuzzy -msgid "Your resulting SIP address:" -msgstr "Uw SIP-adres:" - -#: ../gtk/parameters.ui.h:63 +#: ../gtk/parameters.ui.h:44 #, fuzzy msgid "Your username:" msgstr "gebruikersnaam:" -#: ../gtk/parameters.ui.h:64 -msgid "a sound card" +#: ../gtk/parameters.ui.h:45 +#, fuzzy +msgid "Your resulting SIP address:" +msgstr "Uw SIP-adres:" + +#: ../gtk/parameters.ui.h:46 +#, fuzzy +msgid "Default identity" +msgstr "SIP-identiteit:" + +#: ../gtk/parameters.ui.h:47 +msgid "Wizard" msgstr "" +#: ../gtk/parameters.ui.h:50 +msgid "Remove" +msgstr "Verwijderen" + +#: ../gtk/parameters.ui.h:51 +#, fuzzy +msgid "Proxy accounts" +msgstr "Contactlijst" + +#: ../gtk/parameters.ui.h:52 +msgid "Erase all passwords" +msgstr "" + +#: ../gtk/parameters.ui.h:53 +#, fuzzy +msgid "Privacy" +msgstr "Contactlijst" + +#: ../gtk/parameters.ui.h:54 +msgid "Manage SIP Accounts" +msgstr "" + +#: ../gtk/parameters.ui.h:55 ../gtk/tunnel_config.ui.h:4 +msgid "Enable" +msgstr "Aan" + +#: ../gtk/parameters.ui.h:56 ../gtk/tunnel_config.ui.h:5 +msgid "Disable" +msgstr "Uit" + +#: ../gtk/parameters.ui.h:57 +#, fuzzy +msgid "Codecs" +msgstr "Contactlijst" + +#: ../gtk/parameters.ui.h:58 +msgid "0 stands for \"unlimited\"" +msgstr "" + +#: ../gtk/parameters.ui.h:59 +#, fuzzy +msgid "Upload speed limit in Kbit/sec:" +msgstr "Upload bandbreedte (kbit/sec):" + +#: ../gtk/parameters.ui.h:60 +#, fuzzy +msgid "Download speed limit in Kbit/sec:" +msgstr "Download bandbreedte (kbit/sec):" + +#: ../gtk/parameters.ui.h:61 +msgid "Enable adaptive rate control" +msgstr "" + +#: ../gtk/parameters.ui.h:62 +msgid "" +"Adaptive rate control is a technique to dynamically guess the available " +"bandwidth during a call." +msgstr "" + +#: ../gtk/parameters.ui.h:63 +msgid "Bandwidth control" +msgstr "" + +#: ../gtk/parameters.ui.h:64 +#, fuzzy +msgid "Codecs" +msgstr "Codecs" + #: ../gtk/parameters.ui.h:65 -msgid "default camera" -msgstr "" +#, fuzzy +msgid "Language" +msgstr "Contactlijst" #: ../gtk/parameters.ui.h:66 -msgid "default soundcard" +msgid "Show advanced settings" msgstr "" +#: ../gtk/parameters.ui.h:67 +#, fuzzy +msgid "Level" +msgstr "Contactlijst" + +#: ../gtk/parameters.ui.h:68 +#, fuzzy +msgid "User interface" +msgstr "gebruikersnaam:" + +#: ../gtk/parameters.ui.h:69 +#, fuzzy +msgid "Done" +msgstr "Weg" + #: ../gtk/buddylookup.ui.h:1 #, fuzzy -msgid "Search somebody" -msgstr "Contactlijst" +msgid "Search contacts in directory" +msgstr "Contact informatie" #: ../gtk/buddylookup.ui.h:2 msgid "Add to my list" @@ -1211,8 +1362,8 @@ msgstr "" #: ../gtk/buddylookup.ui.h:3 #, fuzzy -msgid "Search contacts in directory" -msgstr "Contact informatie" +msgid "Search somebody" +msgstr "Contactlijst" #: ../gtk/waiting.ui.h:1 #, fuzzy @@ -1223,19 +1374,92 @@ msgstr "linphone" msgid "Please wait" msgstr "" -#: ../coreapi/linphonecore.c:187 +#: ../gtk/dscp_settings.ui.h:1 +#, fuzzy +msgid "Dscp settings" +msgstr "Netwerk" + +#: ../gtk/dscp_settings.ui.h:2 +msgid "SIP" +msgstr "SIP" + +#: ../gtk/dscp_settings.ui.h:3 +msgid "Audio RTP stream" +msgstr "" + +#: ../gtk/dscp_settings.ui.h:4 +msgid "Video RTP stream" +msgstr "" + +#: ../gtk/dscp_settings.ui.h:5 +msgid "Set DSCP values (in hexadecimal)" +msgstr "" + +#: ../gtk/call_statistics.ui.h:1 +#, fuzzy +msgid "Call statistics" +msgstr "Oproepgeschiedenis" + +#: ../gtk/call_statistics.ui.h:2 +#, fuzzy +msgid "Audio codec" +msgstr "Video codecs" + +#: ../gtk/call_statistics.ui.h:3 +#, fuzzy +msgid "Video codec" +msgstr "Video codecs" + +#: ../gtk/call_statistics.ui.h:4 +msgid "Audio IP bandwidth usage" +msgstr "" + +#: ../gtk/call_statistics.ui.h:5 +msgid "Media connectivity" +msgstr "" + +#: ../gtk/call_statistics.ui.h:6 +msgid "Video IP bandwidth usage" +msgstr "" + +#: ../gtk/call_statistics.ui.h:7 +#, fuzzy +msgid "Call statistics and information" +msgstr "Contact informatie" + +#: ../gtk/tunnel_config.ui.h:1 +msgid "Configure VoIP tunnel" +msgstr "" + +#: ../gtk/tunnel_config.ui.h:2 +msgid "Host" +msgstr "" + +#: ../gtk/tunnel_config.ui.h:3 +msgid "Port" +msgstr "" + +#: ../gtk/tunnel_config.ui.h:6 +msgid "Configure tunnel" +msgstr "" + +#: ../gtk/tunnel_config.ui.h:9 +msgid "Configure http proxy (optional)" +msgstr "" + +#: ../coreapi/linphonecore.c:232 msgid "aborted" msgstr "afgebroken" -#: ../coreapi/linphonecore.c:190 +#: ../coreapi/linphonecore.c:235 msgid "completed" msgstr "voltooid" -#: ../coreapi/linphonecore.c:193 +#: ../coreapi/linphonecore.c:238 msgid "missed" msgstr "gemist" -#: ../coreapi/linphonecore.c:198 +#: ../coreapi/linphonecore.c:243 #, c-format msgid "" "%s at %s\n" @@ -1250,23 +1474,23 @@ msgstr "" "Status: %s\n" "Tijdsduur: %i mins %i secs\n" -#: ../coreapi/linphonecore.c:199 +#: ../coreapi/linphonecore.c:244 msgid "Outgoing call" msgstr "Uitgaande oproep" -#: ../coreapi/linphonecore.c:1088 +#: ../coreapi/linphonecore.c:1226 msgid "Ready" msgstr "Gereed." -#: ../coreapi/linphonecore.c:1831 +#: ../coreapi/linphonecore.c:2074 msgid "Looking for telephone number destination..." msgstr "Zoekt de lokatie van het telefoonnummer..." -#: ../coreapi/linphonecore.c:1834 +#: ../coreapi/linphonecore.c:2077 msgid "Could not resolve this number." msgstr "Kon dit nummer niet vinden." -#: ../coreapi/linphonecore.c:1878 +#: ../coreapi/linphonecore.c:2121 msgid "" "Could not parse given sip address. A sip url usually looks like sip:" "user@domain" @@ -1274,43 +1498,56 @@ msgstr "" "Slecht geformuleerd SIP-adres. Een SIP-adres ziet er uit als sip:" "gebruikersnaam@domeinnaam" -#: ../coreapi/linphonecore.c:2025 +#: ../coreapi/linphonecore.c:2312 msgid "Contacting" msgstr "Verbinden" -#: ../coreapi/linphonecore.c:2032 +#: ../coreapi/linphonecore.c:2319 #, fuzzy msgid "Could not call" msgstr "Kon niet oproepen" -#: ../coreapi/linphonecore.c:2140 +#: ../coreapi/linphonecore.c:2429 msgid "Sorry, we have reached the maximum number of simultaneous calls" msgstr "" -#: ../coreapi/linphonecore.c:2270 +#: ../coreapi/linphonecore.c:2573 +#, fuzzy +msgid "is contacting you" +msgstr "belt u." + +#: ../coreapi/linphonecore.c:2574 +msgid " and asked autoanswer." +msgstr "" + +#: ../coreapi/linphonecore.c:2574 +msgid "." +msgstr "" + +#: ../coreapi/linphonecore.c:2636 msgid "Modifying call parameters..." msgstr "" -#: ../coreapi/linphonecore.c:2366 +#: ../coreapi/linphonecore.c:2908 msgid "Connected." msgstr "Verbonden." -#: ../coreapi/linphonecore.c:2389 +#: ../coreapi/linphonecore.c:2931 #, fuzzy msgid "Call aborted" msgstr "afgebroken" -#: ../coreapi/linphonecore.c:2530 +#: ../coreapi/linphonecore.c:3102 #, fuzzy msgid "Could not pause the call" msgstr "Kon niet oproepen" -#: ../coreapi/linphonecore.c:2535 +#: ../coreapi/linphonecore.c:3107 #, fuzzy msgid "Pausing the current call..." msgstr "Kon niet oproepen" -#: ../coreapi/misc.c:147 +#: ../coreapi/misc.c:148 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the pcm oss emulation module\n" @@ -1322,7 +1559,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:150 +#: ../coreapi/misc.c:151 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the mixer oss emulation module\n" @@ -1334,10 +1571,14 @@ 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:478 +#: ../coreapi/misc.c:496 msgid "Stun lookup in progress..." msgstr "STUN adres wordt opgezocht..." +#: ../coreapi/misc.c:630 +msgid "ICE local candidates gathering in progress..." +msgstr "" + #: ../coreapi/friend.c:33 msgid "Online" msgstr "Aanwezig" @@ -1391,167 +1632,172 @@ msgstr "" msgid "Unknown-bug" msgstr "" -#: ../coreapi/proxy.c:192 +#: ../coreapi/proxy.c:204 msgid "" "The sip proxy address you entered is invalid, it must start with \"sip:\" " "followed by a hostname." msgstr "" -#: ../coreapi/proxy.c:198 +#: ../coreapi/proxy.c:210 msgid "" "The sip identity you entered is invalid.\n" "It should look like sip:username@proxydomain, such as sip:alice@example.net" msgstr "" -#: ../coreapi/proxy.c:690 +#: ../coreapi/proxy.c:1053 #, fuzzy, c-format msgid "Could not login as %s" msgstr "Kon pixmap bestand %s niet vinden" -#: ../coreapi/callbacks.c:206 -#, fuzzy -msgid "is contacting you" -msgstr "belt u." - -#: ../coreapi/callbacks.c:207 -msgid " and asked autoanswer." -msgstr "" - -#: ../coreapi/callbacks.c:207 -msgid "." -msgstr "" - -#: ../coreapi/callbacks.c:266 +#: ../coreapi/callbacks.c:276 #, fuzzy msgid "Remote ringing." msgstr "Externe diensten" -#: ../coreapi/callbacks.c:282 +#: ../coreapi/callbacks.c:296 #, fuzzy msgid "Remote ringing..." msgstr "Externe diensten" -#: ../coreapi/callbacks.c:293 +#: ../coreapi/callbacks.c:307 msgid "Early media." msgstr "" -#: ../coreapi/callbacks.c:331 +#: ../coreapi/callbacks.c:352 #, fuzzy, c-format msgid "Call with %s is paused." msgstr "Chat met %s" -#: ../coreapi/callbacks.c:342 +#: ../coreapi/callbacks.c:365 #, c-format msgid "Call answered by %s - on hold." msgstr "" -#: ../coreapi/callbacks.c:357 +#: ../coreapi/callbacks.c:376 #, fuzzy msgid "Call resumed." msgstr "Oproep beeindigd" -#: ../coreapi/callbacks.c:362 +#: ../coreapi/callbacks.c:381 #, fuzzy, c-format msgid "Call answered by %s." msgstr "" "Oproepen of\n" "beantwoorden" -#: ../coreapi/callbacks.c:432 -msgid "We are being paused..." +#: ../coreapi/callbacks.c:396 +msgid "Incompatible, check codecs..." msgstr "" -#: ../coreapi/callbacks.c:436 -msgid "We have been resumed..." +#: ../coreapi/callbacks.c:437 +msgid "We have been resumed." msgstr "" -#: ../coreapi/callbacks.c:441 -msgid "Call has been updated by remote..." +#: ../coreapi/callbacks.c:446 +msgid "We are paused by other party." msgstr "" -#: ../coreapi/callbacks.c:473 +#: ../coreapi/callbacks.c:452 +msgid "Call is updated by remote." +msgstr "" + +#: ../coreapi/callbacks.c:521 msgid "Call terminated." msgstr "Oproep beeindigd." -#: ../coreapi/callbacks.c:480 +#: ../coreapi/callbacks.c:528 msgid "User is busy." msgstr "Gebruiker is bezet." -#: ../coreapi/callbacks.c:481 +#: ../coreapi/callbacks.c:529 msgid "User is temporarily unavailable." msgstr "Gebruiker is tijdelijk niet beschikbaar." #. char *retrymsg=_("%s. Retry after %i minute(s)."); -#: ../coreapi/callbacks.c:483 +#: ../coreapi/callbacks.c:531 msgid "User does not want to be disturbed." msgstr "De gebruiker wenst niet gestoord te worden." -#: ../coreapi/callbacks.c:484 +#: ../coreapi/callbacks.c:532 msgid "Call declined." msgstr "Oproep geweigerd." -#: ../coreapi/callbacks.c:496 +#: ../coreapi/callbacks.c:544 msgid "No response." msgstr "" -#: ../coreapi/callbacks.c:500 +#: ../coreapi/callbacks.c:548 msgid "Protocol error." msgstr "" -#: ../coreapi/callbacks.c:516 +#: ../coreapi/callbacks.c:564 #, fuzzy msgid "Redirected" msgstr "Doorgeschakeld naar %s..." -#: ../coreapi/callbacks.c:526 -msgid "Not found" +#: ../coreapi/callbacks.c:600 +msgid "Incompatible media parameters." msgstr "" -#: ../coreapi/callbacks.c:551 -msgid "No common codecs" -msgstr "" - -#: ../coreapi/callbacks.c:557 +#: ../coreapi/callbacks.c:606 #, fuzzy msgid "Call failed." msgstr "Oproep geannuleerd." -#: ../coreapi/callbacks.c:631 +#: ../coreapi/callbacks.c:701 #, c-format msgid "Registration on %s successful." msgstr "Registratie op %s gelukt." -#: ../coreapi/callbacks.c:632 +#: ../coreapi/callbacks.c:702 #, fuzzy, c-format msgid "Unregistration on %s done." msgstr "Registratie op %s gelukt." -#: ../coreapi/callbacks.c:648 +#: ../coreapi/callbacks.c:722 msgid "no response timeout" msgstr "" -#: ../coreapi/callbacks.c:651 +#: ../coreapi/callbacks.c:725 #, fuzzy, c-format msgid "Registration on %s failed: %s" msgstr "Registratie op %s mislukt (time-out)." -#: ../coreapi/sal_eXosip2.c:873 ../coreapi/sal_eXosip2.c:875 -#, fuzzy -msgid "Authentication failure" -msgstr "Authorisatie gegevens" - -#: ../coreapi/linphonecall.c:128 +#: ../coreapi/linphonecall.c:129 #, fuzzy, c-format msgid "Authentication token is %s" msgstr "Authorisatie gegevens" -#: ../coreapi/linphonecall.c:1560 +#: ../coreapi/linphonecall.c:2124 #, 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." +#~ msgid "Chat with %s" +#~ msgstr "Chat met %s" + +#, fuzzy +#~ msgid "Choosing a username" +#~ msgstr "gebruikersnaam:" + +#, fuzzy +#~ msgid "Confirmation" +#~ msgstr "Informatie" + +#, fuzzy +#~ msgid "Contacts" +#~ msgstr "Verbinden" + +#, fuzzy +#~ msgid "Enable video" +#~ msgstr "Aan" + +#, fuzzy +#~ msgid "Authentication failure" +#~ msgstr "Authorisatie gegevens" + #, fuzzy #~ msgid "Unmute" #~ msgstr "Ongelimiteerd" @@ -1609,10 +1855,6 @@ msgstr[1] "U heeft %i oproep(en) gemist." #~ msgid "Incoming call from %s" #~ msgstr "Inkomende oproep" -#, fuzzy -#~ msgid "Call Details" -#~ msgstr "Oproepgeschiedenis" - #, fuzzy #~ msgid "_Modes" #~ msgstr "Codecs" @@ -1956,9 +2198,6 @@ msgstr[1] "U heeft %i oproep(en) gemist." #~ "Schoon alle opgeslagen authorisatie gegevens op (gebruikersnaam, " #~ "wachtwoord...)" -#~ msgid "SIP" -#~ msgstr "SIP" - #~ msgid "List of audio codecs, in order of preference:" #~ msgstr "Lijst met audio codecs, in volgorde van voorkeur:" @@ -2025,9 +2264,6 @@ msgstr[1] "U heeft %i oproep(en) gemist." #~ msgid "realm:" #~ msgstr "gebied:" -#~ msgid "Chat Room" -#~ msgstr "Chat box" - #~ msgid "Text:" #~ msgstr "Tekst:" diff --git a/po/pl.po b/po/pl.po index b9bb368e0..419af8a98 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: 2011-12-05 12:41+0100\n" +"POT-Creation-Date: 2013-01-08 10:35+0100\n" "PO-Revision-Date: 2003-08-22 12:50+0200\n" "Last-Translator: Robert Nasiadek \n" "Language-Team: Polski \n" @@ -15,32 +15,53 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8-bit\n" -#: ../gtk/calllogs.c:71 +#: ../gtk/calllogs.c:82 +#, fuzzy +msgid "Aborted" +msgstr "Połączenie odwołane." + +#: ../gtk/calllogs.c:85 +msgid "Missed" +msgstr "" + +#: ../gtk/calllogs.c:88 +#, fuzzy +msgid "Declined" +msgstr "linia" + +#: ../gtk/calllogs.c:94 #, c-format msgid "%i minute" msgid_plural "%i minutes" msgstr[0] "" msgstr[1] "" -#: ../gtk/calllogs.c:74 +#: ../gtk/calllogs.c:97 #, c-format msgid "%i second" msgid_plural "%i seconds" msgstr[0] "" msgstr[1] "" -#: ../gtk/calllogs.c:77 +#: ../gtk/calllogs.c:100 #, c-format msgid "" "%s\t%s\tQuality: %s\n" "%s\t%s %s\t" msgstr "" -#: ../gtk/calllogs.c:79 +#: ../gtk/calllogs.c:102 msgid "n/a" msgstr "" -#: ../gtk/conference.c:33 ../gtk/incall_view.c:183 +#: ../gtk/calllogs.c:105 +#, c-format +msgid "" +"%s\t%s\t\n" +"%s\t%s" +msgstr "" + +#: ../gtk/conference.c:33 ../gtk/main.ui.h:13 msgid "Conference" msgstr "" @@ -53,43 +74,42 @@ msgstr "" msgid "Couldn't find pixmap file: %s" msgstr "Nie można znaleźć pixmapy: %s" -#: ../gtk/chat.c:27 -#, c-format -msgid "Chat with %s" -msgstr "" - -#: ../gtk/main.c:83 +#: ../gtk/main.c:89 msgid "log to stdout some debug information while running." msgstr "" -#: ../gtk/main.c:90 +#: ../gtk/main.c:96 msgid "path to a file to write logs into." msgstr "" -#: ../gtk/main.c:97 +#: ../gtk/main.c:103 +msgid "Start linphone with video disabled." +msgstr "" + +#: ../gtk/main.c:110 msgid "Start only in the system tray, do not show the main interface." msgstr "" -#: ../gtk/main.c:104 +#: ../gtk/main.c:117 msgid "address to call right now" msgstr "" -#: ../gtk/main.c:111 +#: ../gtk/main.c:124 msgid "if set automatically answer incoming calls" msgstr "" -#: ../gtk/main.c:118 +#: ../gtk/main.c:131 msgid "" "Specifiy a working directory (should be the base of the installation, eg: c:" "\\Program Files\\Linphone)" msgstr "" -#: ../gtk/main.c:464 +#: ../gtk/main.c:498 #, c-format msgid "Call with %s" msgstr "" -#: ../gtk/main.c:815 +#: ../gtk/main.c:871 #, c-format msgid "" "%s would like to add you to his contact list.\n" @@ -98,229 +118,247 @@ msgid "" "If you answer no, this person will be temporarily blacklisted." msgstr "" -#: ../gtk/main.c:893 +#: ../gtk/main.c:948 #, c-format msgid "" "Please enter your password for username %s\n" " at domain %s:" msgstr "" -#: ../gtk/main.c:993 +#: ../gtk/main.c:1051 #, fuzzy msgid "Call error" msgstr "Połączenie odwołane." -#: ../gtk/main.c:996 ../coreapi/linphonecore.c:2406 +#: ../gtk/main.c:1054 ../coreapi/linphonecore.c:2949 #, fuzzy msgid "Call ended" msgstr "Rozmowa odrzucona." -#: ../gtk/main.c:999 ../coreapi/linphonecore.c:199 +#: ../gtk/main.c:1057 ../coreapi/linphonecore.c:244 msgid "Incoming call" msgstr "" -#: ../gtk/main.c:1001 ../gtk/incall_view.c:292 ../gtk/main.ui.h:20 +#: ../gtk/main.c:1059 ../gtk/incall_view.c:451 ../gtk/main.ui.h:6 msgid "Answer" msgstr "" -#: ../gtk/main.c:1003 ../gtk/main.ui.h:29 +#: ../gtk/main.c:1061 ../gtk/main.ui.h:7 #, fuzzy msgid "Decline" msgstr "linia" -#: ../gtk/main.c:1009 +#: ../gtk/main.c:1067 #, fuzzy msgid "Call paused" msgstr "Połączenie odwołane." -#: ../gtk/main.c:1009 +#: ../gtk/main.c:1067 #, c-format msgid "by %s" msgstr "" -#: ../gtk/main.c:1165 +#: ../gtk/main.c:1116 +#, c-format +msgid "%s proposed to start video. Do you accept ?" +msgstr "" + +#: ../gtk/main.c:1278 msgid "Website link" msgstr "" -#: ../gtk/main.c:1205 +#: ../gtk/main.c:1318 msgid "Linphone - a video internet phone" msgstr "" -#: ../gtk/main.c:1295 +#: ../gtk/main.c:1410 #, c-format msgid "%s (Default)" msgstr "" -#: ../gtk/main.c:1566 ../coreapi/callbacks.c:700 +#: ../gtk/main.c:1714 ../coreapi/callbacks.c:774 #, c-format msgid "We are transferred to %s" msgstr "" -#: ../gtk/main.c:1576 +#: ../gtk/main.c:1724 msgid "" "No sound cards have been detected on this computer.\n" "You won't be able to send or receive audio calls." msgstr "" -#: ../gtk/main.c:1663 +#: ../gtk/main.c:1833 msgid "A free SIP video-phone" msgstr "" -#: ../gtk/friendlist.c:203 +#: ../gtk/friendlist.c:335 #, fuzzy msgid "Add to addressbook" msgstr "Książka adresowa" -#: ../gtk/friendlist.c:258 ../gtk/propertybox.c:296 ../gtk/contact.ui.h:3 -msgid "Name" -msgstr "Nazwa" - -#: ../gtk/friendlist.c:271 +#: ../gtk/friendlist.c:509 #, fuzzy msgid "Presence status" msgstr "Obecność" -#: ../gtk/friendlist.c:308 +#: ../gtk/friendlist.c:526 ../gtk/propertybox.c:362 ../gtk/contact.ui.h:1 +msgid "Name" +msgstr "Nazwa" + +#: ../gtk/friendlist.c:538 +#, fuzzy +msgid "Call" +msgstr "Połączenie odwołane." + +#: ../gtk/friendlist.c:543 +msgid "Chat" +msgstr "" + +#: ../gtk/friendlist.c:573 #, c-format msgid "Search in %s directory" msgstr "" -#: ../gtk/friendlist.c:568 +#: ../gtk/friendlist.c:730 msgid "Invalid sip contact !" msgstr "" -#: ../gtk/friendlist.c:613 +#: ../gtk/friendlist.c:775 #, c-format msgid "Call %s" msgstr "" -#: ../gtk/friendlist.c:614 +#: ../gtk/friendlist.c:776 #, c-format msgid "Send text to %s" msgstr "" -#: ../gtk/friendlist.c:615 +#: ../gtk/friendlist.c:777 #, fuzzy, c-format msgid "Edit contact '%s'" msgstr "(Brak informacji kontaktowych !)" -#: ../gtk/friendlist.c:616 +#: ../gtk/friendlist.c:778 #, c-format msgid "Delete contact '%s'" msgstr "" -#: ../gtk/friendlist.c:658 +#: ../gtk/friendlist.c:820 #, c-format msgid "Add new contact from %s directory" msgstr "" -#: ../gtk/propertybox.c:302 +#: ../gtk/propertybox.c:368 msgid "Rate (Hz)" msgstr "Jakość (Hz)" -#: ../gtk/propertybox.c:308 +#: ../gtk/propertybox.c:374 msgid "Status" msgstr "Status" -#: ../gtk/propertybox.c:314 +#: ../gtk/propertybox.c:380 msgid "Min bitrate (kbit/s)" msgstr "Min przepustowość (kbit/s)" -#: ../gtk/propertybox.c:321 +#: ../gtk/propertybox.c:387 msgid "Parameters" msgstr "Parametr" -#: ../gtk/propertybox.c:364 ../gtk/propertybox.c:507 +#: ../gtk/propertybox.c:430 ../gtk/propertybox.c:573 msgid "Enabled" msgstr "Włączone" -#: ../gtk/propertybox.c:366 ../gtk/propertybox.c:507 +#: ../gtk/propertybox.c:432 ../gtk/propertybox.c:573 msgid "Disabled" msgstr "Wyłączone" -#: ../gtk/propertybox.c:553 +#: ../gtk/propertybox.c:619 msgid "Account" msgstr "" -#: ../gtk/propertybox.c:693 +#: ../gtk/propertybox.c:759 msgid "English" msgstr "" -#: ../gtk/propertybox.c:694 +#: ../gtk/propertybox.c:760 msgid "French" msgstr "" -#: ../gtk/propertybox.c:695 +#: ../gtk/propertybox.c:761 msgid "Swedish" msgstr "" -#: ../gtk/propertybox.c:696 +#: ../gtk/propertybox.c:762 msgid "Italian" msgstr "" -#: ../gtk/propertybox.c:697 +#: ../gtk/propertybox.c:763 msgid "Spanish" msgstr "" -#: ../gtk/propertybox.c:698 +#: ../gtk/propertybox.c:764 msgid "Brazilian Portugese" msgstr "" -#: ../gtk/propertybox.c:699 +#: ../gtk/propertybox.c:765 msgid "Polish" msgstr "" -#: ../gtk/propertybox.c:700 +#: ../gtk/propertybox.c:766 msgid "German" msgstr "" -#: ../gtk/propertybox.c:701 +#: ../gtk/propertybox.c:767 msgid "Russian" msgstr "" -#: ../gtk/propertybox.c:702 +#: ../gtk/propertybox.c:768 msgid "Japanese" msgstr "" -#: ../gtk/propertybox.c:703 +#: ../gtk/propertybox.c:769 msgid "Dutch" msgstr "" -#: ../gtk/propertybox.c:704 +#: ../gtk/propertybox.c:770 msgid "Hungarian" msgstr "" -#: ../gtk/propertybox.c:705 +#: ../gtk/propertybox.c:771 msgid "Czech" msgstr "" -#: ../gtk/propertybox.c:706 +#: ../gtk/propertybox.c:772 msgid "Chinese" msgstr "" -#: ../gtk/propertybox.c:707 +#: ../gtk/propertybox.c:773 msgid "Traditional Chinese" msgstr "" -#: ../gtk/propertybox.c:708 +#: ../gtk/propertybox.c:774 msgid "Norwegian" msgstr "" -#: ../gtk/propertybox.c:765 +#: ../gtk/propertybox.c:775 +msgid "Hebrew" +msgstr "" + +#: ../gtk/propertybox.c:842 msgid "" "You need to restart linphone for the new language selection to take effect." msgstr "" -#: ../gtk/propertybox.c:835 +#: ../gtk/propertybox.c:912 #, fuzzy msgid "None" msgstr "Brak." -#: ../gtk/propertybox.c:839 +#: ../gtk/propertybox.c:916 msgid "SRTP" msgstr "" -#: ../gtk/propertybox.c:845 +#: ../gtk/propertybox.c:922 msgid "ZRTP" msgstr "" @@ -364,181 +402,278 @@ msgid_plural "Found %i contacts" msgstr[0] "" msgstr[1] "" -#: ../gtk/setupwizard.c:25 +#: ../gtk/setupwizard.c:33 msgid "" "Welcome !\n" "This assistant will help you to use a SIP account for your calls." msgstr "" -#: ../gtk/setupwizard.c:34 -msgid "Create an account by choosing a username" +#: ../gtk/setupwizard.c:42 +msgid "Create an account on linphone.org" msgstr "" -#: ../gtk/setupwizard.c:35 -msgid "I have already an account and just want to use it" +#: ../gtk/setupwizard.c:43 +msgid "I have already a linphone.org account and I just want to use it" msgstr "" -#: ../gtk/setupwizard.c:53 -msgid "Please choose a username:" +#: ../gtk/setupwizard.c:44 +msgid "I have already a sip account and I just want to use it" msgstr "" -#: ../gtk/setupwizard.c:54 +#: ../gtk/setupwizard.c:84 +msgid "Enter your linphone.org username" +msgstr "" + +#: ../gtk/setupwizard.c:91 #, fuzzy msgid "Username:" msgstr "Podręcznik" -#: ../gtk/setupwizard.c:92 -#, c-format -msgid "Checking if '%s' is available..." +#: ../gtk/setupwizard.c:93 ../gtk/password.ui.h:4 +#, fuzzy +msgid "Password:" +msgstr "Twoje hasło:" + +#: ../gtk/setupwizard.c:113 +msgid "Enter your account informations" msgstr "" -#: ../gtk/setupwizard.c:97 ../gtk/setupwizard.c:164 -msgid "Please wait..." +#: ../gtk/setupwizard.c:120 +#, fuzzy +msgid "Username*" +msgstr "Podręcznik" + +#: ../gtk/setupwizard.c:121 +#, fuzzy +msgid "Password*" +msgstr "Twoje hasło:" + +#: ../gtk/setupwizard.c:124 +msgid "Domain*" msgstr "" -#: ../gtk/setupwizard.c:101 -msgid "Sorry this username already exists. Please try a new one." +#: ../gtk/setupwizard.c:125 +msgid "Proxy" msgstr "" -#: ../gtk/setupwizard.c:103 ../gtk/setupwizard.c:168 -msgid "Ok !" +#: ../gtk/setupwizard.c:297 +msgid "(*) Required fields" msgstr "" -#: ../gtk/setupwizard.c:106 ../gtk/setupwizard.c:171 -msgid "Communication problem, please try again later." +#: ../gtk/setupwizard.c:298 +#, fuzzy +msgid "Username: (*)" +msgstr "Podręcznik" + +#: ../gtk/setupwizard.c:300 +#, fuzzy +msgid "Password: (*)" +msgstr "Twoje hasło:" + +#: ../gtk/setupwizard.c:302 +msgid "Email: (*)" msgstr "" -#: ../gtk/setupwizard.c:134 +#: ../gtk/setupwizard.c:304 +msgid "Confirm your password: (*)" +msgstr "" + +#: ../gtk/setupwizard.c:368 +msgid "" +"Error, account not validated, username already used or server unreachable.\n" +"Please go back and try again." +msgstr "" + +#: ../gtk/setupwizard.c:379 msgid "Thank you. Your account is now configured and ready for use." msgstr "" -#: ../gtk/setupwizard.c:228 +#: ../gtk/setupwizard.c:387 +msgid "" +"Please validate your account by clicking on the link we just sent you by " +"email.\n" +"Then come back here and press Next button." +msgstr "" + +#: ../gtk/setupwizard.c:554 msgid "Welcome to the account setup assistant" msgstr "" -#: ../gtk/setupwizard.c:232 +#: ../gtk/setupwizard.c:559 msgid "Account setup assistant" msgstr "" -#: ../gtk/setupwizard.c:236 -msgid "Choosing a username" +#: ../gtk/setupwizard.c:565 +msgid "Configure your account (step 1/1)" msgstr "" -#: ../gtk/setupwizard.c:240 -msgid "Verifying" +#: ../gtk/setupwizard.c:570 +msgid "Enter your sip username (step 1/1)" msgstr "" -#: ../gtk/setupwizard.c:244 -#, fuzzy -msgid "Confirmation" -msgstr "Informacja" - -#: ../gtk/setupwizard.c:249 -msgid "Creating your account" +#: ../gtk/setupwizard.c:574 +msgid "Enter account information (step 1/2)" msgstr "" -#: ../gtk/setupwizard.c:253 -msgid "Now ready !" +#: ../gtk/setupwizard.c:583 +msgid "Validation (step 2/2)" msgstr "" -#: ../gtk/incall_view.c:69 +#: ../gtk/setupwizard.c:588 +msgid "Error" +msgstr "" + +#: ../gtk/setupwizard.c:592 +msgid "Terminating" +msgstr "" + +#: ../gtk/incall_view.c:69 ../gtk/incall_view.c:90 #, fuzzy, c-format msgid "Call #%i" msgstr "Połączenie odwołane." -#: ../gtk/incall_view.c:127 +#: ../gtk/incall_view.c:150 #, c-format msgid "Transfer to call #%i with %s" msgstr "" -#: ../gtk/incall_view.c:155 -msgid "Transfer" +#: ../gtk/incall_view.c:209 ../gtk/incall_view.c:212 +msgid "Not used" msgstr "" -#: ../gtk/incall_view.c:271 +#: ../gtk/incall_view.c:219 +msgid "ICE not activated" +msgstr "" + +#: ../gtk/incall_view.c:221 +#, fuzzy +msgid "ICE failed" +msgstr "Połączenie odwołane." + +#: ../gtk/incall_view.c:223 +msgid "ICE in progress" +msgstr "" + +#: ../gtk/incall_view.c:225 +msgid "Going through one or more NATs" +msgstr "" + +#: ../gtk/incall_view.c:227 +msgid "Direct" +msgstr "" + +#: ../gtk/incall_view.c:229 +msgid "Through a relay server" +msgstr "" + +#: ../gtk/incall_view.c:238 ../gtk/incall_view.c:242 +#, c-format +msgid "" +"download: %f\n" +"upload: %f (kbit/s)" +msgstr "" + +#: ../gtk/incall_view.c:341 ../gtk/main.ui.h:12 +msgid "Hang up" +msgstr "" + +#: ../gtk/incall_view.c:430 #, fuzzy msgid "Calling..." msgstr "Dzwonie do " -#: ../gtk/incall_view.c:274 ../gtk/incall_view.c:482 +#: ../gtk/incall_view.c:433 ../gtk/incall_view.c:646 msgid "00::00::00" msgstr "" -#: ../gtk/incall_view.c:285 +#: ../gtk/incall_view.c:444 #, fuzzy msgid "Incoming call" msgstr "Dzwonie do " -#: ../gtk/incall_view.c:322 +#: ../gtk/incall_view.c:481 msgid "good" msgstr "" -#: ../gtk/incall_view.c:324 +#: ../gtk/incall_view.c:483 msgid "average" msgstr "" -#: ../gtk/incall_view.c:326 +#: ../gtk/incall_view.c:485 msgid "poor" msgstr "" -#: ../gtk/incall_view.c:328 +#: ../gtk/incall_view.c:487 msgid "very poor" msgstr "" -#: ../gtk/incall_view.c:330 +#: ../gtk/incall_view.c:489 msgid "too bad" msgstr "" -#: ../gtk/incall_view.c:331 ../gtk/incall_view.c:347 +#: ../gtk/incall_view.c:490 ../gtk/incall_view.c:506 msgid "unavailable" msgstr "" -#: ../gtk/incall_view.c:447 +#: ../gtk/incall_view.c:605 msgid "Secured by SRTP" msgstr "" -#: ../gtk/incall_view.c:453 +#: ../gtk/incall_view.c:611 #, c-format msgid "Secured by ZRTP - [auth token: %s]" msgstr "" -#: ../gtk/incall_view.c:459 +#: ../gtk/incall_view.c:617 msgid "Set unverified" msgstr "" -#: ../gtk/incall_view.c:459 ../gtk/main.ui.h:49 +#: ../gtk/incall_view.c:617 ../gtk/main.ui.h:5 msgid "Set verified" msgstr "" -#: ../gtk/incall_view.c:480 +#: ../gtk/incall_view.c:641 msgid "In conference" msgstr "" -#: ../gtk/incall_view.c:480 +#: ../gtk/incall_view.c:641 #, fuzzy msgid "In call" msgstr "Dzwonie do " -#: ../gtk/incall_view.c:499 +#: ../gtk/incall_view.c:669 #, fuzzy msgid "Paused call" msgstr "Dzwonie do " -#: ../gtk/incall_view.c:511 +#: ../gtk/incall_view.c:682 #, c-format msgid "%02i::%02i::%02i" msgstr "" -#: ../gtk/incall_view.c:527 +#: ../gtk/incall_view.c:699 #, fuzzy msgid "Call ended." msgstr "Rozmowa odrzucona." -#: ../gtk/incall_view.c:584 +#: ../gtk/incall_view.c:731 +msgid "Transfer in progress" +msgstr "" + +#: ../gtk/incall_view.c:734 +msgid "Transfer done." +msgstr "" + +#: ../gtk/incall_view.c:737 +#, fuzzy +msgid "Transfer failed." +msgstr "Połączenie odwołane." + +#: ../gtk/incall_view.c:781 msgid "Resume" msgstr "" -#: ../gtk/incall_view.c:591 ../gtk/main.ui.h:45 +#: ../gtk/incall_view.c:788 ../gtk/main.ui.h:9 msgid "Pause" msgstr "" @@ -548,240 +683,255 @@ msgid "Please enter login information for %s" msgstr "" #: ../gtk/main.ui.h:1 -msgid "#" -msgstr "#" - -#: ../gtk/main.ui.h:2 -msgid "*" -msgstr "*" - -#: ../gtk/main.ui.h:3 -msgid "0" -msgstr "0" - -#: ../gtk/main.ui.h:4 -msgid "1" -msgstr "1" - -#: ../gtk/main.ui.h:5 -msgid "2" -msgstr "2" - -#: ../gtk/main.ui.h:6 -msgid "3" -msgstr "3" - -#: ../gtk/main.ui.h:7 -msgid "4" -msgstr "4" - -#: ../gtk/main.ui.h:8 -msgid "5" -msgstr "5" - -#: ../gtk/main.ui.h:9 -msgid "6" -msgstr "6" - -#: ../gtk/main.ui.h:10 -msgid "7" -msgstr "7" - -#: ../gtk/main.ui.h:11 -msgid "8" -msgstr "8" - -#: ../gtk/main.ui.h:12 -msgid "9" -msgstr "9" - -#: ../gtk/main.ui.h:13 -#, fuzzy -msgid "Add contacts from directory" -msgstr "Informacje o kodeku" - -#: ../gtk/main.ui.h:14 #, fuzzy msgid "Callee name" msgstr "Rozmowa odrzucona." -#: ../gtk/main.ui.h:15 +#: ../gtk/main.ui.h:2 #, fuzzy -msgid "Welcome !" -msgstr "Dzwonie do " +msgid "Send" +msgstr "Dźwięk" -#: ../gtk/main.ui.h:16 -msgid "A" +#: ../gtk/main.ui.h:3 +msgid "End conference" msgstr "" -#: ../gtk/main.ui.h:17 -msgid "ADSL" +#: ../gtk/main.ui.h:4 +msgid "label" msgstr "" -#: ../gtk/main.ui.h:18 -#, fuzzy -msgid "Add contact" -msgstr "(Brak informacji kontaktowych !)" - -#: ../gtk/main.ui.h:19 -msgid "All users" +#: ../gtk/main.ui.h:8 +msgid "Video" msgstr "" -#: ../gtk/main.ui.h:21 -msgid "Automatically log me in" +#: ../gtk/main.ui.h:10 +msgid "Mute" msgstr "" -#: ../gtk/main.ui.h:22 -msgid "B" +#: ../gtk/main.ui.h:11 +msgid "Transfer" msgstr "" -#: ../gtk/main.ui.h:23 ../gtk/parameters.ui.h:21 -msgid "C" -msgstr "" - -#: ../gtk/main.ui.h:24 -#, fuzzy -msgid "Call" -msgstr "Połączenie odwołane." - -#: ../gtk/main.ui.h:25 -msgid "Call quality rating" -msgstr "" - -#: ../gtk/main.ui.h:26 -msgid "Check _Updates" -msgstr "" - -#: ../gtk/main.ui.h:27 -#, fuzzy -msgid "Contacts" -msgstr "Dzwonie do " - -#: ../gtk/main.ui.h:28 -msgid "D" -msgstr "" - -#: ../gtk/main.ui.h:30 -#, fuzzy -msgid "Default" -msgstr "Tożsamość" - -#: ../gtk/main.ui.h:31 -#, fuzzy -msgid "Duration" -msgstr "Informacja" - -#: ../gtk/main.ui.h:32 -#, fuzzy -msgid "Enable self-view" -msgstr "Włączone" - -#: ../gtk/main.ui.h:33 -#, fuzzy -msgid "Enable video" -msgstr "Włączone" - -#: ../gtk/main.ui.h:34 -msgid "Enter username, phone number, or full sip address" -msgstr "" - -#: ../gtk/main.ui.h:35 -msgid "Fiber Channel" -msgstr "" - -#: ../gtk/main.ui.h:36 +#: ../gtk/main.ui.h:14 #, fuzzy msgid "In call" msgstr "Dzwonie do " -#: ../gtk/main.ui.h:37 -msgid "Initiate a new call" +#: ../gtk/main.ui.h:15 +#, fuzzy +msgid "Duration" +msgstr "Informacja" + +#: ../gtk/main.ui.h:16 +msgid "Call quality rating" msgstr "" -#: ../gtk/main.ui.h:38 -msgid "Internet connection:" +#: ../gtk/main.ui.h:17 +msgid "_Options" msgstr "" -#: ../gtk/main.ui.h:39 -msgid "Keypad" +#: ../gtk/main.ui.h:18 +msgid "Always start video" msgstr "" -#: ../gtk/main.ui.h:40 +#: ../gtk/main.ui.h:19 #, fuzzy -msgid "Login information" -msgstr "Informacje o kodeku" +msgid "Enable self-view" +msgstr "Włączone" -#: ../gtk/main.ui.h:41 -msgid "Lookup:" +#: ../gtk/main.ui.h:20 +msgid "_Help" msgstr "" -#: ../gtk/main.ui.h:42 -#, fuzzy -msgid "My current identity:" -msgstr "Tożsamość" +#: ../gtk/main.ui.h:21 +msgid "Show debug window" +msgstr "" -#: ../gtk/main.ui.h:43 -#, fuzzy -msgid "Online users" -msgstr "linia" +#: ../gtk/main.ui.h:22 +msgid "_Homepage" +msgstr "" -#: ../gtk/main.ui.h:44 -#, fuzzy -msgid "Password" -msgstr "Twoje hasło:" +#: ../gtk/main.ui.h:23 +msgid "Check _Updates" +msgstr "" -#: ../gtk/main.ui.h:46 -#, fuzzy -msgid "Recent calls" -msgstr "Dzwonie do " +#: ../gtk/main.ui.h:24 +msgid "Account assistant" +msgstr "" -#: ../gtk/main.ui.h:47 +#: ../gtk/main.ui.h:25 #, fuzzy msgid "SIP address or phone number:" msgstr "Adres serwera rejestracji sip" -#: ../gtk/main.ui.h:48 +#: ../gtk/main.ui.h:26 +msgid "Initiate a new call" +msgstr "" + +#: ../gtk/main.ui.h:27 ../gtk/parameters.ui.h:48 +#, fuzzy +msgid "Add" +msgstr "Adres" + +#: ../gtk/main.ui.h:28 ../gtk/parameters.ui.h:49 +msgid "Edit" +msgstr "" + +#: ../gtk/main.ui.h:29 +msgid "D" +msgstr "" + +#: ../gtk/main.ui.h:30 +msgid "#" +msgstr "#" + +#: ../gtk/main.ui.h:31 +msgid "0" +msgstr "0" + +#: ../gtk/main.ui.h:32 +msgid "*" +msgstr "*" + +#: ../gtk/main.ui.h:33 ../gtk/parameters.ui.h:7 +msgid "C" +msgstr "" + +#: ../gtk/main.ui.h:34 +msgid "9" +msgstr "9" + +#: ../gtk/main.ui.h:35 +msgid "8" +msgstr "8" + +#: ../gtk/main.ui.h:36 +msgid "7" +msgstr "7" + +#: ../gtk/main.ui.h:37 +msgid "B" +msgstr "" + +#: ../gtk/main.ui.h:38 +msgid "6" +msgstr "6" + +#: ../gtk/main.ui.h:39 +msgid "5" +msgstr "5" + +#: ../gtk/main.ui.h:40 +msgid "4" +msgstr "4" + +#: ../gtk/main.ui.h:41 +msgid "A" +msgstr "" + +#: ../gtk/main.ui.h:42 +msgid "3" +msgstr "3" + +#: ../gtk/main.ui.h:43 +msgid "2" +msgstr "2" + +#: ../gtk/main.ui.h:44 +msgid "1" +msgstr "1" + +#: ../gtk/main.ui.h:45 msgid "Search" msgstr "" -#: ../gtk/main.ui.h:50 -msgid "Show debug window" +#: ../gtk/main.ui.h:46 +#, fuzzy +msgid "Add contacts from directory" +msgstr "Informacje o kodeku" + +#: ../gtk/main.ui.h:47 +#, fuzzy +msgid "Add contact" +msgstr "(Brak informacji kontaktowych !)" + +#: ../gtk/main.ui.h:48 +msgid "Keypad" msgstr "" -#: ../gtk/main.ui.h:51 +#: ../gtk/main.ui.h:49 +#, fuzzy +msgid "Recent calls" +msgstr "Dzwonie do " + +#: ../gtk/main.ui.h:50 +#, fuzzy +msgid "My current identity:" +msgstr "Tożsamość" + +#: ../gtk/main.ui.h:51 ../gtk/tunnel_config.ui.h:7 #, fuzzy msgid "Username" msgstr "Podręcznik" -#: ../gtk/main.ui.h:52 -msgid "_Help" -msgstr "" +#: ../gtk/main.ui.h:52 ../gtk/tunnel_config.ui.h:8 +#, fuzzy +msgid "Password" +msgstr "Twoje hasło:" #: ../gtk/main.ui.h:53 -msgid "_Homepage" +msgid "Internet connection:" msgstr "" #: ../gtk/main.ui.h:54 -msgid "_Options" +msgid "Automatically log me in" msgstr "" #: ../gtk/main.ui.h:55 -msgid "in" -msgstr "" +#, fuzzy +msgid "Login information" +msgstr "Informacje o kodeku" #: ../gtk/main.ui.h:56 -msgid "label" +#, fuzzy +msgid "Welcome !" +msgstr "Dzwonie do " + +#: ../gtk/main.ui.h:57 +msgid "All users" +msgstr "" + +#: ../gtk/main.ui.h:58 +#, fuzzy +msgid "Online users" +msgstr "linia" + +#: ../gtk/main.ui.h:59 +msgid "ADSL" +msgstr "" + +#: ../gtk/main.ui.h:60 +msgid "Fiber Channel" +msgstr "" + +#: ../gtk/main.ui.h:61 +#, fuzzy +msgid "Default" +msgstr "Tożsamość" + +#: ../gtk/main.ui.h:62 +msgid "Delete" msgstr "" #: ../gtk/about.ui.h:1 -msgid "(C) Belledonne Communications,2010\n" -msgstr "" - -#: ../gtk/about.ui.h:3 #, fuzzy msgid "About linphone" msgstr "linphone" +#: ../gtk/about.ui.h:2 +msgid "(C) Belledonne Communications,2010\n" +msgstr "" + #: ../gtk/about.ui.h:4 msgid "An internet video phone using the standard SIP (rfc3261) protocol." msgstr "" @@ -801,401 +951,400 @@ msgid "" "hu: anonymous\n" msgstr "" -#: ../gtk/contact.ui.h:1 -#, fuzzy -msgid "Contact information" -msgstr "Informacje o kodeku" - #: ../gtk/contact.ui.h:2 -msgid "Allow this contact to see my presence status" -msgstr "" - -#: ../gtk/contact.ui.h:4 #, fuzzy msgid "SIP Address" msgstr "Adres" -#: ../gtk/contact.ui.h:5 +#: ../gtk/contact.ui.h:3 msgid "Show this contact presence status" msgstr "" +#: ../gtk/contact.ui.h:4 +msgid "Allow this contact to see my presence status" +msgstr "" + +#: ../gtk/contact.ui.h:5 +#, fuzzy +msgid "Contact information" +msgstr "Informacje o kodeku" + #: ../gtk/log.ui.h:1 msgid "Linphone debug window" msgstr "" +#: ../gtk/log.ui.h:2 +msgid "Scroll to end" +msgstr "" + #: ../gtk/password.ui.h:1 #, fuzzy msgid "Linphone - Authentication required" msgstr "Informacje o kodeku" #: ../gtk/password.ui.h:2 -#, fuzzy -msgid "Password:" -msgstr "Twoje hasło:" - -#: ../gtk/password.ui.h:3 msgid "Please enter the domain password" msgstr "" -#: ../gtk/password.ui.h:4 +#: ../gtk/password.ui.h:3 msgid "UserID" msgstr "" #: ../gtk/call_logs.ui.h:1 -msgid "Call back" -msgstr "" - -#: ../gtk/call_logs.ui.h:2 msgid "Call history" msgstr "" -#: ../gtk/call_logs.ui.h:3 +#: ../gtk/call_logs.ui.h:2 msgid "Clear all" msgstr "" -#: ../gtk/sip_account.ui.h:1 -msgid "Configure a SIP account" +#: ../gtk/call_logs.ui.h:3 +msgid "Call back" msgstr "" -#: ../gtk/sip_account.ui.h:2 +#: ../gtk/sip_account.ui.h:1 msgid "Linphone - Configure a SIP account" msgstr "" -#: ../gtk/sip_account.ui.h:3 -msgid "Looks like sip:" -msgstr "" - -#: ../gtk/sip_account.ui.h:4 -msgid "Looks like sip:@" -msgstr "" - -#: ../gtk/sip_account.ui.h:5 -#, fuzzy -msgid "Publish presence information" -msgstr "Informacje o kodeku" - -#: ../gtk/sip_account.ui.h:6 -msgid "Register" -msgstr "" - -#: ../gtk/sip_account.ui.h:7 -#, fuzzy -msgid "Registration duration (sec):" -msgstr "Rejestracja powiodła się." - -#: ../gtk/sip_account.ui.h:8 -msgid "Route (optional):" -msgstr "" - -#: ../gtk/sip_account.ui.h:9 -#, fuzzy -msgid "SIP Proxy address:" -msgstr "Adres sip:" - -#: ../gtk/sip_account.ui.h:10 +#: ../gtk/sip_account.ui.h:2 #, fuzzy msgid "Your SIP identity:" msgstr "Tożsamość" -#: ../gtk/sip_account.ui.h:11 +#: ../gtk/sip_account.ui.h:3 +msgid "Looks like sip:@" +msgstr "" + +#: ../gtk/sip_account.ui.h:4 msgid "sip:" msgstr "sip:" -#: ../gtk/chatroom.ui.h:1 +#: ../gtk/sip_account.ui.h:5 #, fuzzy -msgid "Send" -msgstr "Dźwięk" +msgid "SIP Proxy address:" +msgstr "Adres sip:" + +#: ../gtk/sip_account.ui.h:6 +msgid "Looks like sip:" +msgstr "" + +#: ../gtk/sip_account.ui.h:7 +msgid "Route (optional):" +msgstr "" + +#: ../gtk/sip_account.ui.h:8 +#, fuzzy +msgid "Registration duration (sec):" +msgstr "Rejestracja powiodła się." + +#: ../gtk/sip_account.ui.h:9 +msgid "Register" +msgstr "" + +#: ../gtk/sip_account.ui.h:10 +#, fuzzy +msgid "Publish presence information" +msgstr "Informacje o kodeku" + +#: ../gtk/sip_account.ui.h:11 +msgid "Configure a SIP account" +msgstr "" #: ../gtk/parameters.ui.h:1 -msgid "0 stands for \"unlimited\"" +msgid "default soundcard" msgstr "" #: ../gtk/parameters.ui.h:2 -#, fuzzy -msgid "Audio" -msgstr "Dzwonie do " +msgid "a sound card" +msgstr "" #: ../gtk/parameters.ui.h:3 -msgid "Bandwidth control" +msgid "default camera" msgstr "" #: ../gtk/parameters.ui.h:4 -#, fuzzy -msgid "Codecs" -msgstr "Dzwonie do " +msgid "CIF" +msgstr "" #: ../gtk/parameters.ui.h:5 #, fuzzy -msgid "Default identity" -msgstr "Tożsamość" - -#: ../gtk/parameters.ui.h:6 -#, fuzzy -msgid "Language" -msgstr "Dzwonie do " - -#: ../gtk/parameters.ui.h:7 -#, fuzzy -msgid "Level" -msgstr "Dzwonie do " - -#: ../gtk/parameters.ui.h:8 -#, fuzzy -msgid "NAT and Firewall" -msgstr "Dzwonie do " - -#: ../gtk/parameters.ui.h:9 -msgid "Network protocol and ports" -msgstr "" - -#: ../gtk/parameters.ui.h:10 -#, fuzzy -msgid "Privacy" -msgstr "Dzwonie do " - -#: ../gtk/parameters.ui.h:11 -#, fuzzy -msgid "Proxy accounts" -msgstr "Dzwonie do " - -#: ../gtk/parameters.ui.h:12 -#, fuzzy -msgid "Transport" -msgstr "Dzwonie do " - -#: ../gtk/parameters.ui.h:13 -#, fuzzy -msgid "Video" -msgstr "Dzwonie do " - -#: ../gtk/parameters.ui.h:14 -msgid "" -"Adaptive rate control is a technique to dynamically guess the available " -"bandwidth during a call." -msgstr "" - -#: ../gtk/parameters.ui.h:15 -msgid "ALSA special device (optional):" -msgstr "" - -#: ../gtk/parameters.ui.h:16 -#, fuzzy -msgid "Add" -msgstr "Adres" - -#: ../gtk/parameters.ui.h:17 -msgid "Audio RTP/UDP:" -msgstr "" - -#: ../gtk/parameters.ui.h:18 -#, fuzzy msgid "Audio codecs" msgstr "Kodeki audio" -#: ../gtk/parameters.ui.h:19 -msgid "Behind NAT / Firewall (specify gateway IP below)" -msgstr "" - -#: ../gtk/parameters.ui.h:20 -msgid "Behind NAT / Firewall (use STUN to resolve)" -msgstr "" - -#: ../gtk/parameters.ui.h:22 -msgid "CIF" -msgstr "" - -#: ../gtk/parameters.ui.h:23 +#: ../gtk/parameters.ui.h:6 #, fuzzy -msgid "Capture device:" -msgstr "Użyj tego urządzenia dźwięku:" +msgid "Video codecs" +msgstr "Kodeki audio" -#: ../gtk/parameters.ui.h:24 +#: ../gtk/parameters.ui.h:8 +msgid "SIP (UDP)" +msgstr "" + +#: ../gtk/parameters.ui.h:9 +msgid "SIP (TCP)" +msgstr "" + +#: ../gtk/parameters.ui.h:10 +msgid "SIP (TLS)" +msgstr "" + +#: ../gtk/parameters.ui.h:11 +msgid "Settings" +msgstr "" + +#: ../gtk/parameters.ui.h:12 +msgid "Set Maximum Transmission Unit:" +msgstr "" + +#: ../gtk/parameters.ui.h:13 +msgid "Send DTMFs as SIP info" +msgstr "" + +#: ../gtk/parameters.ui.h:14 +msgid "Use IPv6 instead of IPv4" +msgstr "" + +#: ../gtk/parameters.ui.h:15 #, fuzzy -msgid "Codecs" -msgstr "Kodeki" +msgid "Transport" +msgstr "Dzwonie do " -#: ../gtk/parameters.ui.h:25 -msgid "Direct connection to the Internet" -msgstr "" - -#: ../gtk/parameters.ui.h:26 -msgid "Disable" -msgstr "Wyłącz" - -#: ../gtk/parameters.ui.h:27 -#, fuzzy -msgid "Done" -msgstr "Brak." - -#: ../gtk/parameters.ui.h:28 -msgid "Download speed limit in Kbit/sec:" -msgstr "" - -#: ../gtk/parameters.ui.h:29 -msgid "Edit" -msgstr "" - -#: ../gtk/parameters.ui.h:30 -msgid "Enable" -msgstr "Włączony" - -#: ../gtk/parameters.ui.h:31 -msgid "Enable adaptive rate control" -msgstr "" - -#: ../gtk/parameters.ui.h:32 -msgid "Enable echo cancellation" -msgstr "" - -#: ../gtk/parameters.ui.h:33 -msgid "Erase all passwords" -msgstr "" - -#: ../gtk/parameters.ui.h:34 -msgid "Manage SIP Accounts" -msgstr "" - -#: ../gtk/parameters.ui.h:35 +#: ../gtk/parameters.ui.h:16 msgid "Media encryption type" msgstr "" -#: ../gtk/parameters.ui.h:36 -msgid "Multimedia settings" +#: ../gtk/parameters.ui.h:17 +msgid "Tunnel" msgstr "" -#: ../gtk/parameters.ui.h:37 +#: ../gtk/parameters.ui.h:18 +msgid "Video RTP/UDP:" +msgstr "" + +#: ../gtk/parameters.ui.h:19 +msgid "Audio RTP/UDP:" +msgstr "" + +#: ../gtk/parameters.ui.h:20 +msgid "DSCP fields" +msgstr "" + +#: ../gtk/parameters.ui.h:21 +msgid "Fixed" +msgstr "" + +#: ../gtk/parameters.ui.h:22 +msgid "Network protocol and ports" +msgstr "" + +#: ../gtk/parameters.ui.h:23 +msgid "Direct connection to the Internet" +msgstr "" + +#: ../gtk/parameters.ui.h:24 +msgid "Behind NAT / Firewall (specify gateway IP below)" +msgstr "" + +#: ../gtk/parameters.ui.h:25 +#, fuzzy +msgid "Public IP address:" +msgstr "Adres sip:" + +#: ../gtk/parameters.ui.h:26 +msgid "Behind NAT / Firewall (use STUN to resolve)" +msgstr "" + +#: ../gtk/parameters.ui.h:27 +msgid "Behind NAT / Firewall (use ICE)" +msgstr "" + +#: ../gtk/parameters.ui.h:28 +#, fuzzy +msgid "Stun server:" +msgstr "Dźwięk" + +#: ../gtk/parameters.ui.h:29 +#, fuzzy +msgid "NAT and Firewall" +msgstr "Dzwonie do " + +#: ../gtk/parameters.ui.h:30 #, fuzzy msgid "Network settings" msgstr "Sieć" -#: ../gtk/parameters.ui.h:38 +#: ../gtk/parameters.ui.h:31 +#, fuzzy +msgid "Ring sound:" +msgstr "Źródło nagrywania:" + +#: ../gtk/parameters.ui.h:32 +msgid "ALSA special device (optional):" +msgstr "" + +#: ../gtk/parameters.ui.h:33 +#, fuzzy +msgid "Capture device:" +msgstr "Użyj tego urządzenia dźwięku:" + +#: ../gtk/parameters.ui.h:34 +#, fuzzy +msgid "Ring device:" +msgstr "Użyj tego urządzenia dźwięku:" + +#: ../gtk/parameters.ui.h:35 #, fuzzy msgid "Playback device:" msgstr "Użyj tego urządzenia dźwięku:" +#: ../gtk/parameters.ui.h:36 +msgid "Enable echo cancellation" +msgstr "" + +#: ../gtk/parameters.ui.h:37 +#, fuzzy +msgid "Audio" +msgstr "Dzwonie do " + +#: ../gtk/parameters.ui.h:38 +#, fuzzy +msgid "Video input device:" +msgstr "Dźwięk" + #: ../gtk/parameters.ui.h:39 msgid "Prefered video resolution:" msgstr "" #: ../gtk/parameters.ui.h:40 #, fuzzy -msgid "Public IP address:" -msgstr "Adres sip:" +msgid "Video" +msgstr "Dzwonie do " #: ../gtk/parameters.ui.h:41 -msgid "" -"Register to FONICS\n" -"virtual network !" +msgid "Multimedia settings" +msgstr "" + +#: ../gtk/parameters.ui.h:42 +msgid "This section defines your SIP address when not using a SIP account" msgstr "" #: ../gtk/parameters.ui.h:43 -msgid "Remove" +msgid "Your display name (eg: John Doe):" msgstr "" #: ../gtk/parameters.ui.h:44 #, fuzzy -msgid "Ring device:" -msgstr "Użyj tego urządzenia dźwięku:" - -#: ../gtk/parameters.ui.h:45 -#, fuzzy -msgid "Ring sound:" -msgstr "Źródło nagrywania:" - -#: ../gtk/parameters.ui.h:46 -msgid "SIP (TCP)" -msgstr "" - -#: ../gtk/parameters.ui.h:47 -msgid "SIP (TLS)" -msgstr "" - -#: ../gtk/parameters.ui.h:48 -msgid "SIP (UDP)" -msgstr "" - -#: ../gtk/parameters.ui.h:49 -msgid "Send DTMFs as SIP info" -msgstr "" - -#: ../gtk/parameters.ui.h:50 -msgid "Set Maximum Transmission Unit:" -msgstr "" - -#: ../gtk/parameters.ui.h:51 -msgid "Settings" -msgstr "" - -#: ../gtk/parameters.ui.h:52 -msgid "Show advanced settings" -msgstr "" - -#: ../gtk/parameters.ui.h:53 -#, fuzzy -msgid "Stun server:" -msgstr "Dźwięk" - -#: ../gtk/parameters.ui.h:54 -msgid "This section defines your SIP address when not using a SIP account" -msgstr "" - -#: ../gtk/parameters.ui.h:55 -msgid "Upload speed limit in Kbit/sec:" -msgstr "" - -#: ../gtk/parameters.ui.h:56 -msgid "Use IPv6 instead of IPv4" -msgstr "" - -#: ../gtk/parameters.ui.h:57 -#, fuzzy -msgid "User interface" +msgid "Your username:" msgstr "Podręcznik" -#: ../gtk/parameters.ui.h:58 -msgid "Video RTP/UDP:" -msgstr "" - -#: ../gtk/parameters.ui.h:59 -#, fuzzy -msgid "Video codecs" -msgstr "Kodeki audio" - -#: ../gtk/parameters.ui.h:60 -#, fuzzy -msgid "Video input device:" -msgstr "Dźwięk" - -#: ../gtk/parameters.ui.h:61 -msgid "Your display name (eg: John Doe):" -msgstr "" - -#: ../gtk/parameters.ui.h:62 +#: ../gtk/parameters.ui.h:45 #, fuzzy msgid "Your resulting SIP address:" msgstr "Twój adres sip:" -#: ../gtk/parameters.ui.h:63 +#: ../gtk/parameters.ui.h:46 #, fuzzy -msgid "Your username:" -msgstr "Podręcznik" +msgid "Default identity" +msgstr "Tożsamość" + +#: ../gtk/parameters.ui.h:47 +msgid "Wizard" +msgstr "" + +#: ../gtk/parameters.ui.h:50 +msgid "Remove" +msgstr "" + +#: ../gtk/parameters.ui.h:51 +#, fuzzy +msgid "Proxy accounts" +msgstr "Dzwonie do " + +#: ../gtk/parameters.ui.h:52 +msgid "Erase all passwords" +msgstr "" + +#: ../gtk/parameters.ui.h:53 +#, fuzzy +msgid "Privacy" +msgstr "Dzwonie do " + +#: ../gtk/parameters.ui.h:54 +msgid "Manage SIP Accounts" +msgstr "" + +#: ../gtk/parameters.ui.h:55 ../gtk/tunnel_config.ui.h:4 +msgid "Enable" +msgstr "Włączony" + +#: ../gtk/parameters.ui.h:56 ../gtk/tunnel_config.ui.h:5 +msgid "Disable" +msgstr "Wyłącz" + +#: ../gtk/parameters.ui.h:57 +#, fuzzy +msgid "Codecs" +msgstr "Dzwonie do " + +#: ../gtk/parameters.ui.h:58 +msgid "0 stands for \"unlimited\"" +msgstr "" + +#: ../gtk/parameters.ui.h:59 +msgid "Upload speed limit in Kbit/sec:" +msgstr "" + +#: ../gtk/parameters.ui.h:60 +msgid "Download speed limit in Kbit/sec:" +msgstr "" + +#: ../gtk/parameters.ui.h:61 +msgid "Enable adaptive rate control" +msgstr "" + +#: ../gtk/parameters.ui.h:62 +msgid "" +"Adaptive rate control is a technique to dynamically guess the available " +"bandwidth during a call." +msgstr "" + +#: ../gtk/parameters.ui.h:63 +msgid "Bandwidth control" +msgstr "" #: ../gtk/parameters.ui.h:64 -msgid "a sound card" -msgstr "" +#, fuzzy +msgid "Codecs" +msgstr "Kodeki" #: ../gtk/parameters.ui.h:65 -msgid "default camera" -msgstr "" +#, fuzzy +msgid "Language" +msgstr "Dzwonie do " #: ../gtk/parameters.ui.h:66 -msgid "default soundcard" +msgid "Show advanced settings" msgstr "" +#: ../gtk/parameters.ui.h:67 +#, fuzzy +msgid "Level" +msgstr "Dzwonie do " + +#: ../gtk/parameters.ui.h:68 +#, fuzzy +msgid "User interface" +msgstr "Podręcznik" + +#: ../gtk/parameters.ui.h:69 +#, fuzzy +msgid "Done" +msgstr "Brak." + #: ../gtk/buddylookup.ui.h:1 #, fuzzy -msgid "Search somebody" -msgstr "Dzwonie do " +msgid "Search contacts in directory" +msgstr "Informacje o kodeku" #: ../gtk/buddylookup.ui.h:2 msgid "Add to my list" @@ -1203,8 +1352,8 @@ msgstr "" #: ../gtk/buddylookup.ui.h:3 #, fuzzy -msgid "Search contacts in directory" -msgstr "Informacje o kodeku" +msgid "Search somebody" +msgstr "Dzwonie do " #: ../gtk/waiting.ui.h:1 #, fuzzy @@ -1215,19 +1364,91 @@ msgstr "linphone" msgid "Please wait" msgstr "" -#: ../coreapi/linphonecore.c:187 +#: ../gtk/dscp_settings.ui.h:1 +#, fuzzy +msgid "Dscp settings" +msgstr "Sieć" + +#: ../gtk/dscp_settings.ui.h:2 +msgid "SIP" +msgstr "SIP" + +#: ../gtk/dscp_settings.ui.h:3 +msgid "Audio RTP stream" +msgstr "" + +#: ../gtk/dscp_settings.ui.h:4 +msgid "Video RTP stream" +msgstr "" + +#: ../gtk/dscp_settings.ui.h:5 +msgid "Set DSCP values (in hexadecimal)" +msgstr "" + +#: ../gtk/call_statistics.ui.h:1 +msgid "Call statistics" +msgstr "" + +#: ../gtk/call_statistics.ui.h:2 +#, fuzzy +msgid "Audio codec" +msgstr "Kodeki audio" + +#: ../gtk/call_statistics.ui.h:3 +#, fuzzy +msgid "Video codec" +msgstr "Kodeki audio" + +#: ../gtk/call_statistics.ui.h:4 +msgid "Audio IP bandwidth usage" +msgstr "" + +#: ../gtk/call_statistics.ui.h:5 +msgid "Media connectivity" +msgstr "" + +#: ../gtk/call_statistics.ui.h:6 +msgid "Video IP bandwidth usage" +msgstr "" + +#: ../gtk/call_statistics.ui.h:7 +#, fuzzy +msgid "Call statistics and information" +msgstr "Informacje o kodeku" + +#: ../gtk/tunnel_config.ui.h:1 +msgid "Configure VoIP tunnel" +msgstr "" + +#: ../gtk/tunnel_config.ui.h:2 +msgid "Host" +msgstr "" + +#: ../gtk/tunnel_config.ui.h:3 +msgid "Port" +msgstr "" + +#: ../gtk/tunnel_config.ui.h:6 +msgid "Configure tunnel" +msgstr "" + +#: ../gtk/tunnel_config.ui.h:9 +msgid "Configure http proxy (optional)" +msgstr "" + +#: ../coreapi/linphonecore.c:232 msgid "aborted" msgstr "" -#: ../coreapi/linphonecore.c:190 +#: ../coreapi/linphonecore.c:235 msgid "completed" msgstr "" -#: ../coreapi/linphonecore.c:193 +#: ../coreapi/linphonecore.c:238 msgid "missed" msgstr "" -#: ../coreapi/linphonecore.c:198 +#: ../coreapi/linphonecore.c:243 #, c-format msgid "" "%s at %s\n" @@ -1237,66 +1458,79 @@ msgid "" "Duration: %i mn %i sec\n" msgstr "" -#: ../coreapi/linphonecore.c:199 +#: ../coreapi/linphonecore.c:244 msgid "Outgoing call" msgstr "" -#: ../coreapi/linphonecore.c:1088 +#: ../coreapi/linphonecore.c:1226 #, fuzzy msgid "Ready" msgstr "Gotowy." -#: ../coreapi/linphonecore.c:1831 +#: ../coreapi/linphonecore.c:2074 msgid "Looking for telephone number destination..." msgstr "" -#: ../coreapi/linphonecore.c:1834 +#: ../coreapi/linphonecore.c:2077 msgid "Could not resolve this number." msgstr "" -#: ../coreapi/linphonecore.c:1878 +#: ../coreapi/linphonecore.c:2121 #, 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:2025 +#: ../coreapi/linphonecore.c:2312 #, fuzzy msgid "Contacting" msgstr "Dzwonie do " -#: ../coreapi/linphonecore.c:2032 +#: ../coreapi/linphonecore.c:2319 #, fuzzy msgid "Could not call" msgstr "Nie można znaleźć pixmapy: %s" -#: ../coreapi/linphonecore.c:2140 +#: ../coreapi/linphonecore.c:2429 msgid "Sorry, we have reached the maximum number of simultaneous calls" msgstr "" -#: ../coreapi/linphonecore.c:2270 +#: ../coreapi/linphonecore.c:2573 +#, fuzzy +msgid "is contacting you" +msgstr "dzwoni do Ciebie." + +#: ../coreapi/linphonecore.c:2574 +msgid " and asked autoanswer." +msgstr "" + +#: ../coreapi/linphonecore.c:2574 +msgid "." +msgstr "" + +#: ../coreapi/linphonecore.c:2636 msgid "Modifying call parameters..." msgstr "" -#: ../coreapi/linphonecore.c:2366 +#: ../coreapi/linphonecore.c:2908 msgid "Connected." msgstr "Połączony" -#: ../coreapi/linphonecore.c:2389 +#: ../coreapi/linphonecore.c:2931 #, fuzzy msgid "Call aborted" msgstr "Połączenie odwołane." -#: ../coreapi/linphonecore.c:2530 +#: ../coreapi/linphonecore.c:3102 msgid "Could not pause the call" msgstr "" -#: ../coreapi/linphonecore.c:2535 +#: ../coreapi/linphonecore.c:3107 msgid "Pausing the current call..." msgstr "" -#: ../coreapi/misc.c:147 +#: ../coreapi/misc.c:148 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the pcm oss emulation module\n" @@ -1308,7 +1542,7 @@ msgstr "" "a Linphone go wymaga. Uruchom 'modprobe snd-pcm-oss' jako root,\n" "aby go załadować" -#: ../coreapi/misc.c:150 +#: ../coreapi/misc.c:151 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the mixer oss emulation module\n" @@ -1320,10 +1554,14 @@ msgstr "" "a Linphone go wymaga. Uruchom 'modprobe snd-mixer-oss' jako root,\n" "aby go załadować" -#: ../coreapi/misc.c:478 +#: ../coreapi/misc.c:496 msgid "Stun lookup in progress..." msgstr "" +#: ../coreapi/misc.c:630 +msgid "ICE local candidates gathering in progress..." +msgstr "" + #: ../coreapi/friend.c:33 #, fuzzy msgid "Online" @@ -1376,167 +1614,165 @@ msgstr "" msgid "Unknown-bug" msgstr "" -#: ../coreapi/proxy.c:192 +#: ../coreapi/proxy.c:204 msgid "" "The sip proxy address you entered is invalid, it must start with \"sip:\" " "followed by a hostname." msgstr "" -#: ../coreapi/proxy.c:198 +#: ../coreapi/proxy.c:210 msgid "" "The sip identity you entered is invalid.\n" "It should look like sip:username@proxydomain, such as sip:alice@example.net" msgstr "" -#: ../coreapi/proxy.c:690 +#: ../coreapi/proxy.c:1053 #, fuzzy, c-format msgid "Could not login as %s" msgstr "Nie można znaleźć pixmapy: %s" -#: ../coreapi/callbacks.c:206 -#, fuzzy -msgid "is contacting you" -msgstr "dzwoni do Ciebie." - -#: ../coreapi/callbacks.c:207 -msgid " and asked autoanswer." -msgstr "" - -#: ../coreapi/callbacks.c:207 -msgid "." -msgstr "" - -#: ../coreapi/callbacks.c:266 +#: ../coreapi/callbacks.c:276 #, fuzzy msgid "Remote ringing." msgstr "Rejestruje..." -#: ../coreapi/callbacks.c:282 +#: ../coreapi/callbacks.c:296 #, fuzzy msgid "Remote ringing..." msgstr "Rejestruje..." -#: ../coreapi/callbacks.c:293 +#: ../coreapi/callbacks.c:307 msgid "Early media." msgstr "" -#: ../coreapi/callbacks.c:331 +#: ../coreapi/callbacks.c:352 #, c-format msgid "Call with %s is paused." msgstr "" -#: ../coreapi/callbacks.c:342 +#: ../coreapi/callbacks.c:365 #, c-format msgid "Call answered by %s - on hold." msgstr "" -#: ../coreapi/callbacks.c:357 +#: ../coreapi/callbacks.c:376 #, fuzzy msgid "Call resumed." msgstr "Rozmowa odrzucona." -#: ../coreapi/callbacks.c:362 +#: ../coreapi/callbacks.c:381 #, fuzzy, c-format msgid "Call answered by %s." msgstr "" "Zadzwoń lub\n" "Odpowiedz" -#: ../coreapi/callbacks.c:432 -msgid "We are being paused..." +#: ../coreapi/callbacks.c:396 +msgid "Incompatible, check codecs..." msgstr "" -#: ../coreapi/callbacks.c:436 -msgid "We have been resumed..." +#: ../coreapi/callbacks.c:437 +msgid "We have been resumed." msgstr "" -#: ../coreapi/callbacks.c:441 -msgid "Call has been updated by remote..." +#: ../coreapi/callbacks.c:446 +msgid "We are paused by other party." msgstr "" -#: ../coreapi/callbacks.c:473 +#: ../coreapi/callbacks.c:452 +msgid "Call is updated by remote." +msgstr "" + +#: ../coreapi/callbacks.c:521 #, fuzzy msgid "Call terminated." msgstr "Rozmowa odrzucona." -#: ../coreapi/callbacks.c:480 +#: ../coreapi/callbacks.c:528 msgid "User is busy." msgstr "Osoba jest zajęta." -#: ../coreapi/callbacks.c:481 +#: ../coreapi/callbacks.c:529 msgid "User is temporarily unavailable." msgstr "Osoba jest tymczasowo niedostępna." #. char *retrymsg=_("%s. Retry after %i minute(s)."); -#: ../coreapi/callbacks.c:483 +#: ../coreapi/callbacks.c:531 msgid "User does not want to be disturbed." msgstr "Osoba nie chce, aby jej przeszkadzać." -#: ../coreapi/callbacks.c:484 +#: ../coreapi/callbacks.c:532 msgid "Call declined." msgstr "Rozmowa odrzucona." -#: ../coreapi/callbacks.c:496 +#: ../coreapi/callbacks.c:544 msgid "No response." msgstr "" -#: ../coreapi/callbacks.c:500 +#: ../coreapi/callbacks.c:548 msgid "Protocol error." msgstr "" -#: ../coreapi/callbacks.c:516 +#: ../coreapi/callbacks.c:564 msgid "Redirected" msgstr "" -#: ../coreapi/callbacks.c:526 -msgid "Not found" +#: ../coreapi/callbacks.c:600 +msgid "Incompatible media parameters." msgstr "" -#: ../coreapi/callbacks.c:551 -msgid "No common codecs" -msgstr "" - -#: ../coreapi/callbacks.c:557 +#: ../coreapi/callbacks.c:606 #, fuzzy msgid "Call failed." msgstr "Połączenie odwołane." -#: ../coreapi/callbacks.c:631 +#: ../coreapi/callbacks.c:701 #, fuzzy, c-format msgid "Registration on %s successful." msgstr "Rejestracja powiodła się." -#: ../coreapi/callbacks.c:632 +#: ../coreapi/callbacks.c:702 #, fuzzy, c-format msgid "Unregistration on %s done." msgstr "Rejestracja powiodła się." -#: ../coreapi/callbacks.c:648 +#: ../coreapi/callbacks.c:722 msgid "no response timeout" msgstr "" -#: ../coreapi/callbacks.c:651 +#: ../coreapi/callbacks.c:725 #, fuzzy, c-format msgid "Registration on %s failed: %s" msgstr "Rejestracja powiodła się." -#: ../coreapi/sal_eXosip2.c:873 ../coreapi/sal_eXosip2.c:875 -#, fuzzy -msgid "Authentication failure" -msgstr "Informacje o kodeku" - -#: ../coreapi/linphonecall.c:128 +#: ../coreapi/linphonecall.c:129 #, fuzzy, c-format msgid "Authentication token is %s" msgstr "Informacje o kodeku" -#: ../coreapi/linphonecall.c:1560 +#: ../coreapi/linphonecall.c:2124 #, c-format msgid "You have missed %i call." msgid_plural "You have missed %i calls." msgstr[0] "" msgstr[1] "" +#, fuzzy +#~ msgid "Confirmation" +#~ msgstr "Informacja" + +#, fuzzy +#~ msgid "Contacts" +#~ msgstr "Dzwonie do " + +#, fuzzy +#~ msgid "Enable video" +#~ msgstr "Włączone" + +#, fuzzy +#~ msgid "Authentication failure" +#~ msgstr "Informacje o kodeku" + #, fuzzy #~ msgid "Contact list" #~ msgstr "Dzwonie do " @@ -1733,9 +1969,6 @@ msgstr[1] "" #~ msgid "Remote services" #~ msgstr "Zdalne usługi" -#~ msgid "SIP" -#~ msgstr "SIP" - #~ msgid "List of audio codecs, in order of preference:" #~ msgstr "Lista kodeków audio, w kolejności preferencji:" diff --git a/po/pt_BR.po b/po/pt_BR.po index a95bd71a5..59cde92ef 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: 2011-12-05 12:41+0100\n" +"POT-Creation-Date: 2013-01-08 10:35+0100\n" "PO-Revision-Date: 2006-07-11 23:30+0200\n" "Last-Translator: Rafael Caesar Lenzi \n" "Language-Team: pt_BR \n" @@ -17,32 +17,54 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../gtk/calllogs.c:71 +#: ../gtk/calllogs.c:82 +#, fuzzy +msgid "Aborted" +msgstr "Abortado" + +#: ../gtk/calllogs.c:85 +#, fuzzy +msgid "Missed" +msgstr "Perdido" + +#: ../gtk/calllogs.c:88 +#, fuzzy +msgid "Declined" +msgstr "linha" + +#: ../gtk/calllogs.c:94 #, c-format msgid "%i minute" msgid_plural "%i minutes" msgstr[0] "" msgstr[1] "" -#: ../gtk/calllogs.c:74 +#: ../gtk/calllogs.c:97 #, c-format msgid "%i second" msgid_plural "%i seconds" msgstr[0] "" msgstr[1] "" -#: ../gtk/calllogs.c:77 +#: ../gtk/calllogs.c:100 #, c-format msgid "" "%s\t%s\tQuality: %s\n" "%s\t%s %s\t" msgstr "" -#: ../gtk/calllogs.c:79 +#: ../gtk/calllogs.c:102 msgid "n/a" msgstr "" -#: ../gtk/conference.c:33 ../gtk/incall_view.c:183 +#: ../gtk/calllogs.c:105 +#, c-format +msgid "" +"%s\t%s\t\n" +"%s\t%s" +msgstr "" + +#: ../gtk/conference.c:33 ../gtk/main.ui.h:13 msgid "Conference" msgstr "" @@ -55,43 +77,42 @@ msgstr "" msgid "Couldn't find pixmap file: %s" msgstr "Não é possível achar arquivo pixmap: %s" -#: ../gtk/chat.c:27 -#, c-format -msgid "Chat with %s" -msgstr "Bate-papo com %s" - -#: ../gtk/main.c:83 +#: ../gtk/main.c:89 msgid "log to stdout some debug information while running." msgstr "" -#: ../gtk/main.c:90 +#: ../gtk/main.c:96 msgid "path to a file to write logs into." msgstr "" -#: ../gtk/main.c:97 +#: ../gtk/main.c:103 +msgid "Start linphone with video disabled." +msgstr "" + +#: ../gtk/main.c:110 msgid "Start only in the system tray, do not show the main interface." msgstr "" -#: ../gtk/main.c:104 +#: ../gtk/main.c:117 msgid "address to call right now" msgstr "" -#: ../gtk/main.c:111 +#: ../gtk/main.c:124 msgid "if set automatically answer incoming calls" msgstr "" -#: ../gtk/main.c:118 +#: ../gtk/main.c:131 msgid "" "Specifiy a working directory (should be the base of the installation, eg: c:" "\\Program Files\\Linphone)" msgstr "" -#: ../gtk/main.c:464 +#: ../gtk/main.c:498 #, fuzzy, c-format msgid "Call with %s" msgstr "Bate-papo com %s" -#: ../gtk/main.c:815 +#: ../gtk/main.c:871 #, c-format msgid "" "%s would like to add you to his contact list.\n" @@ -100,228 +121,247 @@ msgid "" "If you answer no, this person will be temporarily blacklisted." msgstr "" -#: ../gtk/main.c:893 +#: ../gtk/main.c:948 #, c-format msgid "" "Please enter your password for username %s\n" " at domain %s:" msgstr "" -#: ../gtk/main.c:993 +#: ../gtk/main.c:1051 #, fuzzy msgid "Call error" msgstr "Linphone - Histórico de chamadas" -#: ../gtk/main.c:996 ../coreapi/linphonecore.c:2406 +#: ../gtk/main.c:1054 ../coreapi/linphonecore.c:2949 #, fuzzy msgid "Call ended" msgstr "Chamada cancelada." -#: ../gtk/main.c:999 ../coreapi/linphonecore.c:199 +#: ../gtk/main.c:1057 ../coreapi/linphonecore.c:244 msgid "Incoming call" msgstr "Camadas recebidas" -#: ../gtk/main.c:1001 ../gtk/incall_view.c:292 ../gtk/main.ui.h:20 +#: ../gtk/main.c:1059 ../gtk/incall_view.c:451 ../gtk/main.ui.h:6 msgid "Answer" msgstr "" -#: ../gtk/main.c:1003 ../gtk/main.ui.h:29 +#: ../gtk/main.c:1061 ../gtk/main.ui.h:7 #, fuzzy msgid "Decline" msgstr "linha" -#: ../gtk/main.c:1009 +#: ../gtk/main.c:1067 #, fuzzy msgid "Call paused" msgstr "Abortado" -#: ../gtk/main.c:1009 +#: ../gtk/main.c:1067 #, c-format msgid "by %s" msgstr "" -#: ../gtk/main.c:1165 +#: ../gtk/main.c:1116 +#, c-format +msgid "%s proposed to start video. Do you accept ?" +msgstr "" + +#: ../gtk/main.c:1278 msgid "Website link" msgstr "" -#: ../gtk/main.c:1205 +#: ../gtk/main.c:1318 msgid "Linphone - a video internet phone" msgstr "" -#: ../gtk/main.c:1295 +#: ../gtk/main.c:1410 #, c-format msgid "%s (Default)" msgstr "" -#: ../gtk/main.c:1566 ../coreapi/callbacks.c:700 +#: ../gtk/main.c:1714 ../coreapi/callbacks.c:774 #, c-format msgid "We are transferred to %s" msgstr "" -#: ../gtk/main.c:1576 +#: ../gtk/main.c:1724 msgid "" "No sound cards have been detected on this computer.\n" "You won't be able to send or receive audio calls." msgstr "" -#: ../gtk/main.c:1663 +#: ../gtk/main.c:1833 msgid "A free SIP video-phone" msgstr "" -#: ../gtk/friendlist.c:203 +#: ../gtk/friendlist.c:335 #, fuzzy msgid "Add to addressbook" msgstr "Catálogo de endereços" -#: ../gtk/friendlist.c:258 ../gtk/propertybox.c:296 ../gtk/contact.ui.h:3 -msgid "Name" -msgstr "Nome" - -#: ../gtk/friendlist.c:271 +#: ../gtk/friendlist.c:509 msgid "Presence status" msgstr "Status de presença" -#: ../gtk/friendlist.c:308 +#: ../gtk/friendlist.c:526 ../gtk/propertybox.c:362 ../gtk/contact.ui.h:1 +msgid "Name" +msgstr "Nome" + +#: ../gtk/friendlist.c:538 +#, fuzzy +msgid "Call" +msgstr "Histórico de chamadas" + +#: ../gtk/friendlist.c:543 +#, fuzzy +msgid "Chat" +msgstr "Sala de bate-papo" + +#: ../gtk/friendlist.c:573 #, c-format msgid "Search in %s directory" msgstr "" -#: ../gtk/friendlist.c:568 +#: ../gtk/friendlist.c:730 msgid "Invalid sip contact !" msgstr "" -#: ../gtk/friendlist.c:613 +#: ../gtk/friendlist.c:775 #, fuzzy, c-format msgid "Call %s" msgstr "Histórico de chamadas" -#: ../gtk/friendlist.c:614 +#: ../gtk/friendlist.c:776 #, c-format msgid "Send text to %s" msgstr "" -#: ../gtk/friendlist.c:615 +#: ../gtk/friendlist.c:777 #, fuzzy, c-format msgid "Edit contact '%s'" msgstr "Edicar informação de contato" -#: ../gtk/friendlist.c:616 +#: ../gtk/friendlist.c:778 #, c-format msgid "Delete contact '%s'" msgstr "" -#: ../gtk/friendlist.c:658 +#: ../gtk/friendlist.c:820 #, c-format msgid "Add new contact from %s directory" msgstr "" -#: ../gtk/propertybox.c:302 +#: ../gtk/propertybox.c:368 msgid "Rate (Hz)" msgstr "Taxa (Hz)" -#: ../gtk/propertybox.c:308 +#: ../gtk/propertybox.c:374 msgid "Status" msgstr "" -#: ../gtk/propertybox.c:314 +#: ../gtk/propertybox.c:380 msgid "Min bitrate (kbit/s)" msgstr "Bitrate mínimo (kbits/s)" -#: ../gtk/propertybox.c:321 +#: ../gtk/propertybox.c:387 msgid "Parameters" msgstr "Parâmetros" -#: ../gtk/propertybox.c:364 ../gtk/propertybox.c:507 +#: ../gtk/propertybox.c:430 ../gtk/propertybox.c:573 msgid "Enabled" msgstr "Ativado" -#: ../gtk/propertybox.c:366 ../gtk/propertybox.c:507 +#: ../gtk/propertybox.c:432 ../gtk/propertybox.c:573 msgid "Disabled" msgstr "Desativado" -#: ../gtk/propertybox.c:553 +#: ../gtk/propertybox.c:619 #, fuzzy msgid "Account" msgstr "Aceitar" -#: ../gtk/propertybox.c:693 +#: ../gtk/propertybox.c:759 msgid "English" msgstr "" -#: ../gtk/propertybox.c:694 +#: ../gtk/propertybox.c:760 msgid "French" msgstr "" -#: ../gtk/propertybox.c:695 +#: ../gtk/propertybox.c:761 msgid "Swedish" msgstr "" -#: ../gtk/propertybox.c:696 +#: ../gtk/propertybox.c:762 msgid "Italian" msgstr "" -#: ../gtk/propertybox.c:697 +#: ../gtk/propertybox.c:763 msgid "Spanish" msgstr "" -#: ../gtk/propertybox.c:698 +#: ../gtk/propertybox.c:764 msgid "Brazilian Portugese" msgstr "" -#: ../gtk/propertybox.c:699 +#: ../gtk/propertybox.c:765 msgid "Polish" msgstr "" -#: ../gtk/propertybox.c:700 +#: ../gtk/propertybox.c:766 msgid "German" msgstr "" -#: ../gtk/propertybox.c:701 +#: ../gtk/propertybox.c:767 msgid "Russian" msgstr "" -#: ../gtk/propertybox.c:702 +#: ../gtk/propertybox.c:768 msgid "Japanese" msgstr "" -#: ../gtk/propertybox.c:703 +#: ../gtk/propertybox.c:769 msgid "Dutch" msgstr "" -#: ../gtk/propertybox.c:704 +#: ../gtk/propertybox.c:770 msgid "Hungarian" msgstr "" -#: ../gtk/propertybox.c:705 +#: ../gtk/propertybox.c:771 msgid "Czech" msgstr "" -#: ../gtk/propertybox.c:706 +#: ../gtk/propertybox.c:772 msgid "Chinese" msgstr "" -#: ../gtk/propertybox.c:707 +#: ../gtk/propertybox.c:773 msgid "Traditional Chinese" msgstr "" -#: ../gtk/propertybox.c:708 +#: ../gtk/propertybox.c:774 msgid "Norwegian" msgstr "" -#: ../gtk/propertybox.c:765 +#: ../gtk/propertybox.c:775 +msgid "Hebrew" +msgstr "" + +#: ../gtk/propertybox.c:842 msgid "" "You need to restart linphone for the new language selection to take effect." msgstr "" -#: ../gtk/propertybox.c:835 +#: ../gtk/propertybox.c:912 msgid "None" msgstr "Nenhum" -#: ../gtk/propertybox.c:839 +#: ../gtk/propertybox.c:916 msgid "SRTP" msgstr "" -#: ../gtk/propertybox.c:845 +#: ../gtk/propertybox.c:922 msgid "ZRTP" msgstr "" @@ -365,182 +405,279 @@ msgid_plural "Found %i contacts" msgstr[0] "" msgstr[1] "" -#: ../gtk/setupwizard.c:25 +#: ../gtk/setupwizard.c:33 msgid "" "Welcome !\n" "This assistant will help you to use a SIP account for your calls." msgstr "" -#: ../gtk/setupwizard.c:34 -msgid "Create an account by choosing a username" +#: ../gtk/setupwizard.c:42 +msgid "Create an account on linphone.org" msgstr "" -#: ../gtk/setupwizard.c:35 -msgid "I have already an account and just want to use it" +#: ../gtk/setupwizard.c:43 +msgid "I have already a linphone.org account and I just want to use it" msgstr "" -#: ../gtk/setupwizard.c:53 -msgid "Please choose a username:" +#: ../gtk/setupwizard.c:44 +msgid "I have already a sip account and I just want to use it" msgstr "" -#: ../gtk/setupwizard.c:54 +#: ../gtk/setupwizard.c:84 +msgid "Enter your linphone.org username" +msgstr "" + +#: ../gtk/setupwizard.c:91 #, fuzzy msgid "Username:" msgstr "Usuário" -#: ../gtk/setupwizard.c:92 -#, c-format -msgid "Checking if '%s' is available..." +#: ../gtk/setupwizard.c:93 ../gtk/password.ui.h:4 +#, fuzzy +msgid "Password:" +msgstr "Senha:" + +#: ../gtk/setupwizard.c:113 +msgid "Enter your account informations" msgstr "" -#: ../gtk/setupwizard.c:97 ../gtk/setupwizard.c:164 -msgid "Please wait..." +#: ../gtk/setupwizard.c:120 +#, fuzzy +msgid "Username*" +msgstr "Usuário" + +#: ../gtk/setupwizard.c:121 +#, fuzzy +msgid "Password*" +msgstr "Senha:" + +#: ../gtk/setupwizard.c:124 +msgid "Domain*" msgstr "" -#: ../gtk/setupwizard.c:101 -msgid "Sorry this username already exists. Please try a new one." +#: ../gtk/setupwizard.c:125 +msgid "Proxy" msgstr "" -#: ../gtk/setupwizard.c:103 ../gtk/setupwizard.c:168 -msgid "Ok !" +#: ../gtk/setupwizard.c:297 +msgid "(*) Required fields" msgstr "" -#: ../gtk/setupwizard.c:106 ../gtk/setupwizard.c:171 -msgid "Communication problem, please try again later." +#: ../gtk/setupwizard.c:298 +#, fuzzy +msgid "Username: (*)" +msgstr "Usuário" + +#: ../gtk/setupwizard.c:300 +#, fuzzy +msgid "Password: (*)" +msgstr "Senha:" + +#: ../gtk/setupwizard.c:302 +msgid "Email: (*)" msgstr "" -#: ../gtk/setupwizard.c:134 +#: ../gtk/setupwizard.c:304 +msgid "Confirm your password: (*)" +msgstr "" + +#: ../gtk/setupwizard.c:368 +msgid "" +"Error, account not validated, username already used or server unreachable.\n" +"Please go back and try again." +msgstr "" + +#: ../gtk/setupwizard.c:379 msgid "Thank you. Your account is now configured and ready for use." msgstr "" -#: ../gtk/setupwizard.c:228 +#: ../gtk/setupwizard.c:387 +msgid "" +"Please validate your account by clicking on the link we just sent you by " +"email.\n" +"Then come back here and press Next button." +msgstr "" + +#: ../gtk/setupwizard.c:554 msgid "Welcome to the account setup assistant" msgstr "" -#: ../gtk/setupwizard.c:232 +#: ../gtk/setupwizard.c:559 msgid "Account setup assistant" msgstr "" -#: ../gtk/setupwizard.c:236 -#, fuzzy -msgid "Choosing a username" -msgstr "Usuário" - -#: ../gtk/setupwizard.c:240 -msgid "Verifying" +#: ../gtk/setupwizard.c:565 +msgid "Configure your account (step 1/1)" msgstr "" -#: ../gtk/setupwizard.c:244 -#, fuzzy -msgid "Confirmation" -msgstr "Informações" - -#: ../gtk/setupwizard.c:249 -msgid "Creating your account" +#: ../gtk/setupwizard.c:570 +msgid "Enter your sip username (step 1/1)" msgstr "" -#: ../gtk/setupwizard.c:253 -msgid "Now ready !" +#: ../gtk/setupwizard.c:574 +msgid "Enter account information (step 1/2)" msgstr "" -#: ../gtk/incall_view.c:69 +#: ../gtk/setupwizard.c:583 +msgid "Validation (step 2/2)" +msgstr "" + +#: ../gtk/setupwizard.c:588 +msgid "Error" +msgstr "" + +#: ../gtk/setupwizard.c:592 +msgid "Terminating" +msgstr "" + +#: ../gtk/incall_view.c:69 ../gtk/incall_view.c:90 #, fuzzy, c-format msgid "Call #%i" msgstr "Histórico de chamadas" -#: ../gtk/incall_view.c:127 +#: ../gtk/incall_view.c:150 #, c-format msgid "Transfer to call #%i with %s" msgstr "" -#: ../gtk/incall_view.c:155 -msgid "Transfer" +#: ../gtk/incall_view.c:209 ../gtk/incall_view.c:212 +msgid "Not used" msgstr "" -#: ../gtk/incall_view.c:271 +#: ../gtk/incall_view.c:219 +msgid "ICE not activated" +msgstr "" + +#: ../gtk/incall_view.c:221 +#, fuzzy +msgid "ICE failed" +msgstr "Histórico de chamadas" + +#: ../gtk/incall_view.c:223 +msgid "ICE in progress" +msgstr "" + +#: ../gtk/incall_view.c:225 +msgid "Going through one or more NATs" +msgstr "" + +#: ../gtk/incall_view.c:227 +#, fuzzy +msgid "Direct" +msgstr "Redirecionado para %s..." + +#: ../gtk/incall_view.c:229 +msgid "Through a relay server" +msgstr "" + +#: ../gtk/incall_view.c:238 ../gtk/incall_view.c:242 +#, c-format +msgid "" +"download: %f\n" +"upload: %f (kbit/s)" +msgstr "" + +#: ../gtk/incall_view.c:341 ../gtk/main.ui.h:12 +msgid "Hang up" +msgstr "" + +#: ../gtk/incall_view.c:430 #, fuzzy msgid "Calling..." msgstr "Contatando " -#: ../gtk/incall_view.c:274 ../gtk/incall_view.c:482 +#: ../gtk/incall_view.c:433 ../gtk/incall_view.c:646 msgid "00::00::00" msgstr "" -#: ../gtk/incall_view.c:285 +#: ../gtk/incall_view.c:444 #, fuzzy msgid "Incoming call" msgstr "Camadas recebidas" -#: ../gtk/incall_view.c:322 +#: ../gtk/incall_view.c:481 msgid "good" msgstr "" -#: ../gtk/incall_view.c:324 +#: ../gtk/incall_view.c:483 msgid "average" msgstr "" -#: ../gtk/incall_view.c:326 +#: ../gtk/incall_view.c:485 msgid "poor" msgstr "" -#: ../gtk/incall_view.c:328 +#: ../gtk/incall_view.c:487 msgid "very poor" msgstr "" -#: ../gtk/incall_view.c:330 +#: ../gtk/incall_view.c:489 msgid "too bad" msgstr "" -#: ../gtk/incall_view.c:331 ../gtk/incall_view.c:347 +#: ../gtk/incall_view.c:490 ../gtk/incall_view.c:506 msgid "unavailable" msgstr "" -#: ../gtk/incall_view.c:447 +#: ../gtk/incall_view.c:605 msgid "Secured by SRTP" msgstr "" -#: ../gtk/incall_view.c:453 +#: ../gtk/incall_view.c:611 #, c-format msgid "Secured by ZRTP - [auth token: %s]" msgstr "" -#: ../gtk/incall_view.c:459 +#: ../gtk/incall_view.c:617 msgid "Set unverified" msgstr "" -#: ../gtk/incall_view.c:459 ../gtk/main.ui.h:49 +#: ../gtk/incall_view.c:617 ../gtk/main.ui.h:5 msgid "Set verified" msgstr "" -#: ../gtk/incall_view.c:480 +#: ../gtk/incall_view.c:641 msgid "In conference" msgstr "" -#: ../gtk/incall_view.c:480 +#: ../gtk/incall_view.c:641 #, fuzzy msgid "In call" msgstr "Contatando " -#: ../gtk/incall_view.c:499 +#: ../gtk/incall_view.c:669 #, fuzzy msgid "Paused call" msgstr "Contatando " -#: ../gtk/incall_view.c:511 +#: ../gtk/incall_view.c:682 #, c-format msgid "%02i::%02i::%02i" msgstr "" -#: ../gtk/incall_view.c:527 +#: ../gtk/incall_view.c:699 #, fuzzy msgid "Call ended." msgstr "Chamada cancelada." -#: ../gtk/incall_view.c:584 +#: ../gtk/incall_view.c:731 +msgid "Transfer in progress" +msgstr "" + +#: ../gtk/incall_view.c:734 +msgid "Transfer done." +msgstr "" + +#: ../gtk/incall_view.c:737 +#, fuzzy +msgid "Transfer failed." +msgstr "Histórico de chamadas" + +#: ../gtk/incall_view.c:781 msgid "Resume" msgstr "" -#: ../gtk/incall_view.c:591 ../gtk/main.ui.h:45 +#: ../gtk/incall_view.c:788 ../gtk/main.ui.h:9 msgid "Pause" msgstr "" @@ -550,237 +687,252 @@ msgid "Please enter login information for %s" msgstr "" #: ../gtk/main.ui.h:1 -msgid "#" -msgstr "" - -#: ../gtk/main.ui.h:2 -msgid "*" -msgstr "" - -#: ../gtk/main.ui.h:3 -msgid "0" -msgstr "" - -#: ../gtk/main.ui.h:4 -msgid "1" -msgstr "" - -#: ../gtk/main.ui.h:5 -msgid "2" -msgstr "" - -#: ../gtk/main.ui.h:6 -msgid "3" -msgstr "" - -#: ../gtk/main.ui.h:7 -msgid "4" -msgstr "" - -#: ../gtk/main.ui.h:8 -msgid "5" -msgstr "" - -#: ../gtk/main.ui.h:9 -msgid "6" -msgstr "" - -#: ../gtk/main.ui.h:10 -msgid "7" -msgstr "" - -#: ../gtk/main.ui.h:11 -msgid "8" -msgstr "" - -#: ../gtk/main.ui.h:12 -msgid "9" -msgstr "" - -#: ../gtk/main.ui.h:13 -#, fuzzy -msgid "Add contacts from directory" -msgstr "Informação de contato" - -#: ../gtk/main.ui.h:14 #, fuzzy msgid "Callee name" msgstr "Chamada cancelada." -#: ../gtk/main.ui.h:15 +#: ../gtk/main.ui.h:2 #, fuzzy -msgid "Welcome !" -msgstr "Contatando " +msgid "Send" +msgstr "Som" -#: ../gtk/main.ui.h:16 -msgid "A" +#: ../gtk/main.ui.h:3 +msgid "End conference" msgstr "" -#: ../gtk/main.ui.h:17 -msgid "ADSL" +#: ../gtk/main.ui.h:4 +msgid "label" msgstr "" -#: ../gtk/main.ui.h:18 -#, fuzzy -msgid "Add contact" -msgstr "Edicar informação de contato" - -#: ../gtk/main.ui.h:19 -msgid "All users" +#: ../gtk/main.ui.h:8 +msgid "Video" msgstr "" -#: ../gtk/main.ui.h:21 -#, fuzzy -msgid "Automatically log me in" -msgstr "Adquirir automaticamente um nome de servidor válido." - -#: ../gtk/main.ui.h:22 -msgid "B" +#: ../gtk/main.ui.h:10 +msgid "Mute" msgstr "" -#: ../gtk/main.ui.h:23 ../gtk/parameters.ui.h:21 -msgid "C" +#: ../gtk/main.ui.h:11 +msgid "Transfer" msgstr "" -#: ../gtk/main.ui.h:24 -#, fuzzy -msgid "Call" -msgstr "Histórico de chamadas" - -#: ../gtk/main.ui.h:25 -msgid "Call quality rating" -msgstr "" - -#: ../gtk/main.ui.h:26 -msgid "Check _Updates" -msgstr "" - -#: ../gtk/main.ui.h:27 -#, fuzzy -msgid "Contacts" -msgstr "Contatando " - -#: ../gtk/main.ui.h:28 -msgid "D" -msgstr "" - -#: ../gtk/main.ui.h:30 -#, fuzzy -msgid "Default" -msgstr "Identificação SIP:" - -#: ../gtk/main.ui.h:31 -#, fuzzy -msgid "Duration" -msgstr "Informações" - -#: ../gtk/main.ui.h:32 -#, fuzzy -msgid "Enable self-view" -msgstr "Ativado" - -#: ../gtk/main.ui.h:33 -#, fuzzy -msgid "Enable video" -msgstr "Ativado" - -#: ../gtk/main.ui.h:34 -msgid "Enter username, phone number, or full sip address" -msgstr "" - -#: ../gtk/main.ui.h:35 -msgid "Fiber Channel" -msgstr "" - -#: ../gtk/main.ui.h:36 +#: ../gtk/main.ui.h:14 #, fuzzy msgid "In call" msgstr "Camadas recebidas" -#: ../gtk/main.ui.h:37 +#: ../gtk/main.ui.h:15 +#, fuzzy +msgid "Duration" +msgstr "Informações" + +#: ../gtk/main.ui.h:16 +msgid "Call quality rating" +msgstr "" + +#: ../gtk/main.ui.h:17 +msgid "_Options" +msgstr "" + +#: ../gtk/main.ui.h:18 +msgid "Always start video" +msgstr "" + +#: ../gtk/main.ui.h:19 +#, fuzzy +msgid "Enable self-view" +msgstr "Ativado" + +#: ../gtk/main.ui.h:20 +msgid "_Help" +msgstr "" + +#: ../gtk/main.ui.h:21 +msgid "Show debug window" +msgstr "" + +#: ../gtk/main.ui.h:22 +msgid "_Homepage" +msgstr "" + +#: ../gtk/main.ui.h:23 +msgid "Check _Updates" +msgstr "" + +#: ../gtk/main.ui.h:24 +msgid "Account assistant" +msgstr "" + +#: ../gtk/main.ui.h:25 +msgid "SIP address or phone number:" +msgstr "" + +#: ../gtk/main.ui.h:26 msgid "Initiate a new call" msgstr "" +#: ../gtk/main.ui.h:27 ../gtk/parameters.ui.h:48 +#, fuzzy +msgid "Add" +msgstr "Endereço" + +#: ../gtk/main.ui.h:28 ../gtk/parameters.ui.h:49 +msgid "Edit" +msgstr "Editar" + +#: ../gtk/main.ui.h:29 +msgid "D" +msgstr "" + +#: ../gtk/main.ui.h:30 +msgid "#" +msgstr "" + +#: ../gtk/main.ui.h:31 +msgid "0" +msgstr "" + +#: ../gtk/main.ui.h:32 +msgid "*" +msgstr "" + +#: ../gtk/main.ui.h:33 ../gtk/parameters.ui.h:7 +msgid "C" +msgstr "" + +#: ../gtk/main.ui.h:34 +msgid "9" +msgstr "" + +#: ../gtk/main.ui.h:35 +msgid "8" +msgstr "" + +#: ../gtk/main.ui.h:36 +msgid "7" +msgstr "" + +#: ../gtk/main.ui.h:37 +msgid "B" +msgstr "" + #: ../gtk/main.ui.h:38 -msgid "Internet connection:" +msgid "6" msgstr "" #: ../gtk/main.ui.h:39 -msgid "Keypad" +msgid "5" msgstr "" #: ../gtk/main.ui.h:40 -#, fuzzy -msgid "Login information" -msgstr "Informação de contato" +msgid "4" +msgstr "" #: ../gtk/main.ui.h:41 -msgid "Lookup:" +msgid "A" msgstr "" #: ../gtk/main.ui.h:42 -#, fuzzy -msgid "My current identity:" -msgstr "Identificação SIP:" +msgid "3" +msgstr "" #: ../gtk/main.ui.h:43 -#, fuzzy -msgid "Online users" -msgstr "linha" +msgid "2" +msgstr "" #: ../gtk/main.ui.h:44 -#, fuzzy -msgid "Password" -msgstr "Senha:" +msgid "1" +msgstr "" + +#: ../gtk/main.ui.h:45 +msgid "Search" +msgstr "" #: ../gtk/main.ui.h:46 #, fuzzy +msgid "Add contacts from directory" +msgstr "Informação de contato" + +#: ../gtk/main.ui.h:47 +#, fuzzy +msgid "Add contact" +msgstr "Edicar informação de contato" + +#: ../gtk/main.ui.h:48 +msgid "Keypad" +msgstr "" + +#: ../gtk/main.ui.h:49 +#, fuzzy msgid "Recent calls" msgstr "Camadas recebidas" -#: ../gtk/main.ui.h:47 -msgid "SIP address or phone number:" -msgstr "" - -#: ../gtk/main.ui.h:48 -msgid "Search" -msgstr "" - #: ../gtk/main.ui.h:50 -msgid "Show debug window" -msgstr "" +#, fuzzy +msgid "My current identity:" +msgstr "Identificação SIP:" -#: ../gtk/main.ui.h:51 +#: ../gtk/main.ui.h:51 ../gtk/tunnel_config.ui.h:7 #, fuzzy msgid "Username" msgstr "Usuário" -#: ../gtk/main.ui.h:52 -msgid "_Help" -msgstr "" +#: ../gtk/main.ui.h:52 ../gtk/tunnel_config.ui.h:8 +#, fuzzy +msgid "Password" +msgstr "Senha:" #: ../gtk/main.ui.h:53 -msgid "_Homepage" +msgid "Internet connection:" msgstr "" #: ../gtk/main.ui.h:54 -msgid "_Options" -msgstr "" +#, fuzzy +msgid "Automatically log me in" +msgstr "Adquirir automaticamente um nome de servidor válido." #: ../gtk/main.ui.h:55 -msgid "in" -msgstr "" +#, fuzzy +msgid "Login information" +msgstr "Informação de contato" #: ../gtk/main.ui.h:56 -msgid "label" +#, fuzzy +msgid "Welcome !" +msgstr "Contatando " + +#: ../gtk/main.ui.h:57 +msgid "All users" +msgstr "" + +#: ../gtk/main.ui.h:58 +#, fuzzy +msgid "Online users" +msgstr "linha" + +#: ../gtk/main.ui.h:59 +msgid "ADSL" +msgstr "" + +#: ../gtk/main.ui.h:60 +msgid "Fiber Channel" +msgstr "" + +#: ../gtk/main.ui.h:61 +#, fuzzy +msgid "Default" +msgstr "Identificação SIP:" + +#: ../gtk/main.ui.h:62 +msgid "Delete" msgstr "" #: ../gtk/about.ui.h:1 -msgid "(C) Belledonne Communications,2010\n" +msgid "About linphone" msgstr "" -#: ../gtk/about.ui.h:3 -msgid "About linphone" +#: ../gtk/about.ui.h:2 +msgid "(C) Belledonne Communications,2010\n" msgstr "" #: ../gtk/about.ui.h:4 @@ -802,403 +954,402 @@ msgid "" "hu: anonymous\n" msgstr "" -#: ../gtk/contact.ui.h:1 -#, fuzzy -msgid "Contact information" -msgstr "Informação de contato" - #: ../gtk/contact.ui.h:2 -msgid "Allow this contact to see my presence status" -msgstr "" - -#: ../gtk/contact.ui.h:4 #, fuzzy msgid "SIP Address" msgstr "Endereço" -#: ../gtk/contact.ui.h:5 +#: ../gtk/contact.ui.h:3 msgid "Show this contact presence status" msgstr "" +#: ../gtk/contact.ui.h:4 +msgid "Allow this contact to see my presence status" +msgstr "" + +#: ../gtk/contact.ui.h:5 +#, fuzzy +msgid "Contact information" +msgstr "Informação de contato" + #: ../gtk/log.ui.h:1 msgid "Linphone debug window" msgstr "" +#: ../gtk/log.ui.h:2 +msgid "Scroll to end" +msgstr "" + #: ../gtk/password.ui.h:1 #, fuzzy msgid "Linphone - Authentication required" msgstr "Autenticação requerida" #: ../gtk/password.ui.h:2 -#, fuzzy -msgid "Password:" -msgstr "Senha:" - -#: ../gtk/password.ui.h:3 msgid "Please enter the domain password" msgstr "" -#: ../gtk/password.ui.h:4 +#: ../gtk/password.ui.h:3 msgid "UserID" msgstr "" #: ../gtk/call_logs.ui.h:1 #, fuzzy -msgid "Call back" -msgstr "Histórico de chamadas" - -#: ../gtk/call_logs.ui.h:2 -#, fuzzy msgid "Call history" msgstr "Linphone - Histórico de chamadas" -#: ../gtk/call_logs.ui.h:3 +#: ../gtk/call_logs.ui.h:2 msgid "Clear all" msgstr "" -#: ../gtk/sip_account.ui.h:1 -msgid "Configure a SIP account" -msgstr "" +#: ../gtk/call_logs.ui.h:3 +#, fuzzy +msgid "Call back" +msgstr "Histórico de chamadas" -#: ../gtk/sip_account.ui.h:2 +#: ../gtk/sip_account.ui.h:1 msgid "Linphone - Configure a SIP account" msgstr "" -#: ../gtk/sip_account.ui.h:3 -msgid "Looks like sip:" -msgstr "" - -#: ../gtk/sip_account.ui.h:4 -msgid "Looks like sip:@" -msgstr "" - -#: ../gtk/sip_account.ui.h:5 -#, fuzzy -msgid "Publish presence information" -msgstr "Informar informação de presença" - -#: ../gtk/sip_account.ui.h:6 -msgid "Register" -msgstr "" - -#: ../gtk/sip_account.ui.h:7 -#, fuzzy -msgid "Registration duration (sec):" -msgstr "Período do registo:" - -#: ../gtk/sip_account.ui.h:8 -msgid "Route (optional):" -msgstr "Rota (opcional):" - -#: ../gtk/sip_account.ui.h:9 -#, fuzzy -msgid "SIP Proxy address:" -msgstr "Proxy SIP:" - -#: ../gtk/sip_account.ui.h:10 +#: ../gtk/sip_account.ui.h:2 #, fuzzy msgid "Your SIP identity:" msgstr "Identificação SIP:" -#: ../gtk/sip_account.ui.h:11 +#: ../gtk/sip_account.ui.h:3 +msgid "Looks like sip:@" +msgstr "" + +#: ../gtk/sip_account.ui.h:4 msgid "sip:" msgstr "" -#: ../gtk/chatroom.ui.h:1 +#: ../gtk/sip_account.ui.h:5 #, fuzzy -msgid "Send" -msgstr "Som" +msgid "SIP Proxy address:" +msgstr "Proxy SIP:" + +#: ../gtk/sip_account.ui.h:6 +msgid "Looks like sip:" +msgstr "" + +#: ../gtk/sip_account.ui.h:7 +msgid "Route (optional):" +msgstr "Rota (opcional):" + +#: ../gtk/sip_account.ui.h:8 +#, fuzzy +msgid "Registration duration (sec):" +msgstr "Período do registo:" + +#: ../gtk/sip_account.ui.h:9 +msgid "Register" +msgstr "" + +#: ../gtk/sip_account.ui.h:10 +#, fuzzy +msgid "Publish presence information" +msgstr "Informar informação de presença" + +#: ../gtk/sip_account.ui.h:11 +msgid "Configure a SIP account" +msgstr "" #: ../gtk/parameters.ui.h:1 -msgid "0 stands for \"unlimited\"" +msgid "default soundcard" msgstr "" #: ../gtk/parameters.ui.h:2 -#, fuzzy -msgid "Audio" -msgstr "Contatando " +msgid "a sound card" +msgstr "" #: ../gtk/parameters.ui.h:3 -msgid "Bandwidth control" +msgid "default camera" msgstr "" #: ../gtk/parameters.ui.h:4 -#, fuzzy -msgid "Codecs" -msgstr "Contatando " +msgid "CIF" +msgstr "" #: ../gtk/parameters.ui.h:5 #, fuzzy -msgid "Default identity" -msgstr "Identificação SIP:" - -#: ../gtk/parameters.ui.h:6 -#, fuzzy -msgid "Language" -msgstr "Contatando " - -#: ../gtk/parameters.ui.h:7 -#, fuzzy -msgid "Level" -msgstr "Contatando " - -#: ../gtk/parameters.ui.h:8 -#, fuzzy -msgid "NAT and Firewall" -msgstr "Contatando " - -#: ../gtk/parameters.ui.h:9 -msgid "Network protocol and ports" -msgstr "" - -#: ../gtk/parameters.ui.h:10 -#, fuzzy -msgid "Privacy" -msgstr "Contatando " - -#: ../gtk/parameters.ui.h:11 -#, fuzzy -msgid "Proxy accounts" -msgstr "Contatando " - -#: ../gtk/parameters.ui.h:12 -#, fuzzy -msgid "Transport" -msgstr "Contatando " - -#: ../gtk/parameters.ui.h:13 -#, fuzzy -msgid "Video" -msgstr "Contatando " - -#: ../gtk/parameters.ui.h:14 -msgid "" -"Adaptive rate control is a technique to dynamically guess the available " -"bandwidth during a call." -msgstr "" - -#: ../gtk/parameters.ui.h:15 -msgid "ALSA special device (optional):" -msgstr "" - -#: ../gtk/parameters.ui.h:16 -#, fuzzy -msgid "Add" -msgstr "Endereço" - -#: ../gtk/parameters.ui.h:17 -msgid "Audio RTP/UDP:" -msgstr "" - -#: ../gtk/parameters.ui.h:18 -#, fuzzy msgid "Audio codecs" msgstr "Codec's de áudio" -#: ../gtk/parameters.ui.h:19 -msgid "Behind NAT / Firewall (specify gateway IP below)" -msgstr "" - -#: ../gtk/parameters.ui.h:20 -msgid "Behind NAT / Firewall (use STUN to resolve)" -msgstr "" - -#: ../gtk/parameters.ui.h:22 -msgid "CIF" -msgstr "" - -#: ../gtk/parameters.ui.h:23 +#: ../gtk/parameters.ui.h:6 #, fuzzy -msgid "Capture device:" -msgstr "Dispositivo de captura de som:" - -#: ../gtk/parameters.ui.h:24 -#, fuzzy -msgid "Codecs" +msgid "Video codecs" msgstr "Codec's de áudio" -#: ../gtk/parameters.ui.h:25 -msgid "Direct connection to the Internet" +#: ../gtk/parameters.ui.h:8 +msgid "SIP (UDP)" msgstr "" -#: ../gtk/parameters.ui.h:26 -msgid "Disable" -msgstr "Desativar" +#: ../gtk/parameters.ui.h:9 +msgid "SIP (TCP)" +msgstr "" -#: ../gtk/parameters.ui.h:27 +#: ../gtk/parameters.ui.h:10 +msgid "SIP (TLS)" +msgstr "" + +#: ../gtk/parameters.ui.h:11 +msgid "Settings" +msgstr "" + +#: ../gtk/parameters.ui.h:12 +msgid "Set Maximum Transmission Unit:" +msgstr "" + +#: ../gtk/parameters.ui.h:13 +msgid "Send DTMFs as SIP info" +msgstr "" + +#: ../gtk/parameters.ui.h:14 +msgid "Use IPv6 instead of IPv4" +msgstr "" + +#: ../gtk/parameters.ui.h:15 #, fuzzy -msgid "Done" -msgstr "Nenhum" +msgid "Transport" +msgstr "Contatando " -#: ../gtk/parameters.ui.h:28 -msgid "Download speed limit in Kbit/sec:" -msgstr "" - -#: ../gtk/parameters.ui.h:29 -msgid "Edit" -msgstr "Editar" - -#: ../gtk/parameters.ui.h:30 -msgid "Enable" -msgstr "Ativado" - -#: ../gtk/parameters.ui.h:31 -msgid "Enable adaptive rate control" -msgstr "" - -#: ../gtk/parameters.ui.h:32 -msgid "Enable echo cancellation" -msgstr "" - -#: ../gtk/parameters.ui.h:33 -msgid "Erase all passwords" -msgstr "" - -#: ../gtk/parameters.ui.h:34 -msgid "Manage SIP Accounts" -msgstr "" - -#: ../gtk/parameters.ui.h:35 +#: ../gtk/parameters.ui.h:16 msgid "Media encryption type" msgstr "" -#: ../gtk/parameters.ui.h:36 -msgid "Multimedia settings" +#: ../gtk/parameters.ui.h:17 +msgid "Tunnel" msgstr "" -#: ../gtk/parameters.ui.h:37 +#: ../gtk/parameters.ui.h:18 +msgid "Video RTP/UDP:" +msgstr "" + +#: ../gtk/parameters.ui.h:19 +msgid "Audio RTP/UDP:" +msgstr "" + +#: ../gtk/parameters.ui.h:20 +msgid "DSCP fields" +msgstr "" + +#: ../gtk/parameters.ui.h:21 +msgid "Fixed" +msgstr "" + +#: ../gtk/parameters.ui.h:22 +msgid "Network protocol and ports" +msgstr "" + +#: ../gtk/parameters.ui.h:23 +msgid "Direct connection to the Internet" +msgstr "" + +#: ../gtk/parameters.ui.h:24 +msgid "Behind NAT / Firewall (specify gateway IP below)" +msgstr "" + +#: ../gtk/parameters.ui.h:25 +#, fuzzy +msgid "Public IP address:" +msgstr "Endereço sip:" + +#: ../gtk/parameters.ui.h:26 +msgid "Behind NAT / Firewall (use STUN to resolve)" +msgstr "" + +#: ../gtk/parameters.ui.h:27 +msgid "Behind NAT / Firewall (use ICE)" +msgstr "" + +#: ../gtk/parameters.ui.h:28 +#, fuzzy +msgid "Stun server:" +msgstr "Dispositivo de som" + +#: ../gtk/parameters.ui.h:29 +#, fuzzy +msgid "NAT and Firewall" +msgstr "Contatando " + +#: ../gtk/parameters.ui.h:30 #, fuzzy msgid "Network settings" msgstr "Rede" -#: ../gtk/parameters.ui.h:38 +#: ../gtk/parameters.ui.h:31 +#, fuzzy +msgid "Ring sound:" +msgstr "Som do toque:" + +#: ../gtk/parameters.ui.h:32 +msgid "ALSA special device (optional):" +msgstr "" + +#: ../gtk/parameters.ui.h:33 +#, fuzzy +msgid "Capture device:" +msgstr "Dispositivo de captura de som:" + +#: ../gtk/parameters.ui.h:34 +#, fuzzy +msgid "Ring device:" +msgstr "Dispositivo de som" + +#: ../gtk/parameters.ui.h:35 #, fuzzy msgid "Playback device:" msgstr "Dispositivo de som:" +#: ../gtk/parameters.ui.h:36 +msgid "Enable echo cancellation" +msgstr "" + +#: ../gtk/parameters.ui.h:37 +#, fuzzy +msgid "Audio" +msgstr "Contatando " + +#: ../gtk/parameters.ui.h:38 +#, fuzzy +msgid "Video input device:" +msgstr "Dispositivo de som" + #: ../gtk/parameters.ui.h:39 msgid "Prefered video resolution:" msgstr "" #: ../gtk/parameters.ui.h:40 #, fuzzy -msgid "Public IP address:" -msgstr "Endereço sip:" +msgid "Video" +msgstr "Contatando " #: ../gtk/parameters.ui.h:41 -msgid "" -"Register to FONICS\n" -"virtual network !" +msgid "Multimedia settings" msgstr "" -#: ../gtk/parameters.ui.h:43 -msgid "Remove" -msgstr "Remover" - -#: ../gtk/parameters.ui.h:44 -#, fuzzy -msgid "Ring device:" -msgstr "Dispositivo de som" - -#: ../gtk/parameters.ui.h:45 -#, fuzzy -msgid "Ring sound:" -msgstr "Som do toque:" - -#: ../gtk/parameters.ui.h:46 -msgid "SIP (TCP)" -msgstr "" - -#: ../gtk/parameters.ui.h:47 -msgid "SIP (TLS)" -msgstr "" - -#: ../gtk/parameters.ui.h:48 -msgid "SIP (UDP)" -msgstr "" - -#: ../gtk/parameters.ui.h:49 -msgid "Send DTMFs as SIP info" -msgstr "" - -#: ../gtk/parameters.ui.h:50 -msgid "Set Maximum Transmission Unit:" -msgstr "" - -#: ../gtk/parameters.ui.h:51 -msgid "Settings" -msgstr "" - -#: ../gtk/parameters.ui.h:52 -msgid "Show advanced settings" -msgstr "" - -#: ../gtk/parameters.ui.h:53 -#, fuzzy -msgid "Stun server:" -msgstr "Dispositivo de som" - -#: ../gtk/parameters.ui.h:54 +#: ../gtk/parameters.ui.h:42 msgid "This section defines your SIP address when not using a SIP account" msgstr "" -#: ../gtk/parameters.ui.h:55 -msgid "Upload speed limit in Kbit/sec:" -msgstr "" - -#: ../gtk/parameters.ui.h:56 -msgid "Use IPv6 instead of IPv4" -msgstr "" - -#: ../gtk/parameters.ui.h:57 -#, fuzzy -msgid "User interface" -msgstr "Usuário" - -#: ../gtk/parameters.ui.h:58 -msgid "Video RTP/UDP:" -msgstr "" - -#: ../gtk/parameters.ui.h:59 -#, fuzzy -msgid "Video codecs" -msgstr "Codec's de áudio" - -#: ../gtk/parameters.ui.h:60 -#, fuzzy -msgid "Video input device:" -msgstr "Dispositivo de som" - -#: ../gtk/parameters.ui.h:61 +#: ../gtk/parameters.ui.h:43 msgid "Your display name (eg: John Doe):" msgstr "" -#: ../gtk/parameters.ui.h:62 -#, fuzzy -msgid "Your resulting SIP address:" -msgstr "Seu endereço SIP:" - -#: ../gtk/parameters.ui.h:63 +#: ../gtk/parameters.ui.h:44 #, fuzzy msgid "Your username:" msgstr "Usuário" -#: ../gtk/parameters.ui.h:64 -msgid "a sound card" +#: ../gtk/parameters.ui.h:45 +#, fuzzy +msgid "Your resulting SIP address:" +msgstr "Seu endereço SIP:" + +#: ../gtk/parameters.ui.h:46 +#, fuzzy +msgid "Default identity" +msgstr "Identificação SIP:" + +#: ../gtk/parameters.ui.h:47 +msgid "Wizard" msgstr "" +#: ../gtk/parameters.ui.h:50 +msgid "Remove" +msgstr "Remover" + +#: ../gtk/parameters.ui.h:51 +#, fuzzy +msgid "Proxy accounts" +msgstr "Contatando " + +#: ../gtk/parameters.ui.h:52 +msgid "Erase all passwords" +msgstr "" + +#: ../gtk/parameters.ui.h:53 +#, fuzzy +msgid "Privacy" +msgstr "Contatando " + +#: ../gtk/parameters.ui.h:54 +msgid "Manage SIP Accounts" +msgstr "" + +#: ../gtk/parameters.ui.h:55 ../gtk/tunnel_config.ui.h:4 +msgid "Enable" +msgstr "Ativado" + +#: ../gtk/parameters.ui.h:56 ../gtk/tunnel_config.ui.h:5 +msgid "Disable" +msgstr "Desativar" + +#: ../gtk/parameters.ui.h:57 +#, fuzzy +msgid "Codecs" +msgstr "Contatando " + +#: ../gtk/parameters.ui.h:58 +msgid "0 stands for \"unlimited\"" +msgstr "" + +#: ../gtk/parameters.ui.h:59 +msgid "Upload speed limit in Kbit/sec:" +msgstr "" + +#: ../gtk/parameters.ui.h:60 +msgid "Download speed limit in Kbit/sec:" +msgstr "" + +#: ../gtk/parameters.ui.h:61 +msgid "Enable adaptive rate control" +msgstr "" + +#: ../gtk/parameters.ui.h:62 +msgid "" +"Adaptive rate control is a technique to dynamically guess the available " +"bandwidth during a call." +msgstr "" + +#: ../gtk/parameters.ui.h:63 +msgid "Bandwidth control" +msgstr "" + +#: ../gtk/parameters.ui.h:64 +#, fuzzy +msgid "Codecs" +msgstr "Codec's de áudio" + #: ../gtk/parameters.ui.h:65 -msgid "default camera" -msgstr "" +#, fuzzy +msgid "Language" +msgstr "Contatando " #: ../gtk/parameters.ui.h:66 -msgid "default soundcard" +msgid "Show advanced settings" msgstr "" +#: ../gtk/parameters.ui.h:67 +#, fuzzy +msgid "Level" +msgstr "Contatando " + +#: ../gtk/parameters.ui.h:68 +#, fuzzy +msgid "User interface" +msgstr "Usuário" + +#: ../gtk/parameters.ui.h:69 +#, fuzzy +msgid "Done" +msgstr "Nenhum" + #: ../gtk/buddylookup.ui.h:1 #, fuzzy -msgid "Search somebody" -msgstr "Contatando " +msgid "Search contacts in directory" +msgstr "Informação de contato" #: ../gtk/buddylookup.ui.h:2 msgid "Add to my list" @@ -1206,8 +1357,8 @@ msgstr "" #: ../gtk/buddylookup.ui.h:3 #, fuzzy -msgid "Search contacts in directory" -msgstr "Informação de contato" +msgid "Search somebody" +msgstr "Contatando " #: ../gtk/waiting.ui.h:1 msgid "Linphone" @@ -1217,19 +1368,92 @@ msgstr "" msgid "Please wait" msgstr "" -#: ../coreapi/linphonecore.c:187 +#: ../gtk/dscp_settings.ui.h:1 +#, fuzzy +msgid "Dscp settings" +msgstr "Rede" + +#: ../gtk/dscp_settings.ui.h:2 +msgid "SIP" +msgstr "" + +#: ../gtk/dscp_settings.ui.h:3 +msgid "Audio RTP stream" +msgstr "" + +#: ../gtk/dscp_settings.ui.h:4 +msgid "Video RTP stream" +msgstr "" + +#: ../gtk/dscp_settings.ui.h:5 +msgid "Set DSCP values (in hexadecimal)" +msgstr "" + +#: ../gtk/call_statistics.ui.h:1 +#, fuzzy +msgid "Call statistics" +msgstr "Histórico de chamadas" + +#: ../gtk/call_statistics.ui.h:2 +#, fuzzy +msgid "Audio codec" +msgstr "Codec's de áudio" + +#: ../gtk/call_statistics.ui.h:3 +#, fuzzy +msgid "Video codec" +msgstr "Codec's de áudio" + +#: ../gtk/call_statistics.ui.h:4 +msgid "Audio IP bandwidth usage" +msgstr "" + +#: ../gtk/call_statistics.ui.h:5 +msgid "Media connectivity" +msgstr "" + +#: ../gtk/call_statistics.ui.h:6 +msgid "Video IP bandwidth usage" +msgstr "" + +#: ../gtk/call_statistics.ui.h:7 +#, fuzzy +msgid "Call statistics and information" +msgstr "Informação de contato" + +#: ../gtk/tunnel_config.ui.h:1 +msgid "Configure VoIP tunnel" +msgstr "" + +#: ../gtk/tunnel_config.ui.h:2 +msgid "Host" +msgstr "" + +#: ../gtk/tunnel_config.ui.h:3 +msgid "Port" +msgstr "" + +#: ../gtk/tunnel_config.ui.h:6 +msgid "Configure tunnel" +msgstr "" + +#: ../gtk/tunnel_config.ui.h:9 +msgid "Configure http proxy (optional)" +msgstr "" + +#: ../coreapi/linphonecore.c:232 msgid "aborted" msgstr "Abortado" -#: ../coreapi/linphonecore.c:190 +#: ../coreapi/linphonecore.c:235 msgid "completed" msgstr "Competado" -#: ../coreapi/linphonecore.c:193 +#: ../coreapi/linphonecore.c:238 msgid "missed" msgstr "Perdido" -#: ../coreapi/linphonecore.c:198 +#: ../coreapi/linphonecore.c:243 #, fuzzy, c-format msgid "" "%s at %s\n" @@ -1243,65 +1467,78 @@ msgstr "" "Status: %s\n" "Duração: %i min %i seg\n" -#: ../coreapi/linphonecore.c:199 +#: ../coreapi/linphonecore.c:244 msgid "Outgoing call" msgstr "Chamadas efetuadas" -#: ../coreapi/linphonecore.c:1088 +#: ../coreapi/linphonecore.c:1226 #, fuzzy msgid "Ready" msgstr "Pronto." -#: ../coreapi/linphonecore.c:1831 +#: ../coreapi/linphonecore.c:2074 msgid "Looking for telephone number destination..." msgstr "Procurando por telefone de destino..." -#: ../coreapi/linphonecore.c:1834 +#: ../coreapi/linphonecore.c:2077 msgid "Could not resolve this number." msgstr "Não foi possível encontrar este número." -#: ../coreapi/linphonecore.c:1878 +#: ../coreapi/linphonecore.c:2121 msgid "" "Could not parse given sip address. A sip url usually looks like sip:" "user@domain" msgstr "" -#: ../coreapi/linphonecore.c:2025 +#: ../coreapi/linphonecore.c:2312 #, fuzzy msgid "Contacting" msgstr "Contatando " -#: ../coreapi/linphonecore.c:2032 +#: ../coreapi/linphonecore.c:2319 #, fuzzy msgid "Could not call" msgstr "Não é possível achar arquivo pixmap: %s" -#: ../coreapi/linphonecore.c:2140 +#: ../coreapi/linphonecore.c:2429 msgid "Sorry, we have reached the maximum number of simultaneous calls" msgstr "" -#: ../coreapi/linphonecore.c:2270 +#: ../coreapi/linphonecore.c:2573 +#, fuzzy +msgid "is contacting you" +msgstr "está chamado você." + +#: ../coreapi/linphonecore.c:2574 +msgid " and asked autoanswer." +msgstr "" + +#: ../coreapi/linphonecore.c:2574 +msgid "." +msgstr "" + +#: ../coreapi/linphonecore.c:2636 msgid "Modifying call parameters..." msgstr "" -#: ../coreapi/linphonecore.c:2366 +#: ../coreapi/linphonecore.c:2908 msgid "Connected." msgstr "Conectado." -#: ../coreapi/linphonecore.c:2389 +#: ../coreapi/linphonecore.c:2931 #, fuzzy msgid "Call aborted" msgstr "Abortado" -#: ../coreapi/linphonecore.c:2530 +#: ../coreapi/linphonecore.c:3102 msgid "Could not pause the call" msgstr "" -#: ../coreapi/linphonecore.c:2535 +#: ../coreapi/linphonecore.c:3107 msgid "Pausing the current call..." msgstr "" -#: ../coreapi/misc.c:147 +#: ../coreapi/misc.c:148 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the pcm oss emulation module\n" @@ -1309,7 +1546,7 @@ msgid "" "'modprobe snd-pcm-oss' as root to load it." msgstr "" -#: ../coreapi/misc.c:150 +#: ../coreapi/misc.c:151 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the mixer oss emulation module\n" @@ -1317,10 +1554,14 @@ msgid "" " 'modprobe snd-mixer-oss' as root to load it." msgstr "" -#: ../coreapi/misc.c:478 +#: ../coreapi/misc.c:496 msgid "Stun lookup in progress..." msgstr "" +#: ../coreapi/misc.c:630 +msgid "ICE local candidates gathering in progress..." +msgstr "" + #: ../coreapi/friend.c:33 #, fuzzy msgid "Online" @@ -1371,167 +1612,172 @@ msgstr "" msgid "Unknown-bug" msgstr "" -#: ../coreapi/proxy.c:192 +#: ../coreapi/proxy.c:204 msgid "" "The sip proxy address you entered is invalid, it must start with \"sip:\" " "followed by a hostname." msgstr "" -#: ../coreapi/proxy.c:198 +#: ../coreapi/proxy.c:210 msgid "" "The sip identity you entered is invalid.\n" "It should look like sip:username@proxydomain, such as sip:alice@example.net" msgstr "" -#: ../coreapi/proxy.c:690 +#: ../coreapi/proxy.c:1053 #, fuzzy, c-format msgid "Could not login as %s" msgstr "Não é possível achar arquivo pixmap: %s" -#: ../coreapi/callbacks.c:206 -#, fuzzy -msgid "is contacting you" -msgstr "está chamado você." - -#: ../coreapi/callbacks.c:207 -msgid " and asked autoanswer." -msgstr "" - -#: ../coreapi/callbacks.c:207 -msgid "." -msgstr "" - -#: ../coreapi/callbacks.c:266 +#: ../coreapi/callbacks.c:276 #, fuzzy msgid "Remote ringing." msgstr "Serviços remotos" -#: ../coreapi/callbacks.c:282 +#: ../coreapi/callbacks.c:296 #, fuzzy msgid "Remote ringing..." msgstr "Serviços remotos" -#: ../coreapi/callbacks.c:293 +#: ../coreapi/callbacks.c:307 msgid "Early media." msgstr "" -#: ../coreapi/callbacks.c:331 +#: ../coreapi/callbacks.c:352 #, fuzzy, c-format msgid "Call with %s is paused." msgstr "Bate-papo com %s" -#: ../coreapi/callbacks.c:342 +#: ../coreapi/callbacks.c:365 #, c-format msgid "Call answered by %s - on hold." msgstr "" -#: ../coreapi/callbacks.c:357 +#: ../coreapi/callbacks.c:376 #, fuzzy msgid "Call resumed." msgstr "Chamada cancelada." -#: ../coreapi/callbacks.c:362 +#: ../coreapi/callbacks.c:381 #, fuzzy, c-format msgid "Call answered by %s." msgstr "" "Ligar ou\n" "atender" -#: ../coreapi/callbacks.c:432 -msgid "We are being paused..." +#: ../coreapi/callbacks.c:396 +msgid "Incompatible, check codecs..." msgstr "" -#: ../coreapi/callbacks.c:436 -msgid "We have been resumed..." +#: ../coreapi/callbacks.c:437 +msgid "We have been resumed." msgstr "" -#: ../coreapi/callbacks.c:441 -msgid "Call has been updated by remote..." +#: ../coreapi/callbacks.c:446 +msgid "We are paused by other party." msgstr "" -#: ../coreapi/callbacks.c:473 +#: ../coreapi/callbacks.c:452 +msgid "Call is updated by remote." +msgstr "" + +#: ../coreapi/callbacks.c:521 msgid "Call terminated." msgstr "" -#: ../coreapi/callbacks.c:480 +#: ../coreapi/callbacks.c:528 msgid "User is busy." msgstr "Usuário está ocupado." -#: ../coreapi/callbacks.c:481 +#: ../coreapi/callbacks.c:529 msgid "User is temporarily unavailable." msgstr "Usuário está temporáriamente indisponível." #. char *retrymsg=_("%s. Retry after %i minute(s)."); -#: ../coreapi/callbacks.c:483 +#: ../coreapi/callbacks.c:531 msgid "User does not want to be disturbed." msgstr "" -#: ../coreapi/callbacks.c:484 +#: ../coreapi/callbacks.c:532 msgid "Call declined." msgstr "" -#: ../coreapi/callbacks.c:496 +#: ../coreapi/callbacks.c:544 msgid "No response." msgstr "" -#: ../coreapi/callbacks.c:500 +#: ../coreapi/callbacks.c:548 msgid "Protocol error." msgstr "" -#: ../coreapi/callbacks.c:516 +#: ../coreapi/callbacks.c:564 #, fuzzy msgid "Redirected" msgstr "Redirecionado para %s..." -#: ../coreapi/callbacks.c:526 -msgid "Not found" +#: ../coreapi/callbacks.c:600 +msgid "Incompatible media parameters." msgstr "" -#: ../coreapi/callbacks.c:551 -msgid "No common codecs" -msgstr "" - -#: ../coreapi/callbacks.c:557 +#: ../coreapi/callbacks.c:606 #, fuzzy msgid "Call failed." msgstr "Histórico de chamadas" -#: ../coreapi/callbacks.c:631 +#: ../coreapi/callbacks.c:701 #, fuzzy, c-format msgid "Registration on %s successful." msgstr "Registro em %s efetuado." -#: ../coreapi/callbacks.c:632 +#: ../coreapi/callbacks.c:702 #, fuzzy, c-format msgid "Unregistration on %s done." msgstr "Registro em %s efetuado." -#: ../coreapi/callbacks.c:648 +#: ../coreapi/callbacks.c:722 msgid "no response timeout" msgstr "" -#: ../coreapi/callbacks.c:651 +#: ../coreapi/callbacks.c:725 #, fuzzy, c-format msgid "Registration on %s failed: %s" msgstr "Registro falhou (tempo esgotado)." -#: ../coreapi/sal_eXosip2.c:873 ../coreapi/sal_eXosip2.c:875 -#, fuzzy -msgid "Authentication failure" -msgstr "Informações de autenticação" - -#: ../coreapi/linphonecall.c:128 +#: ../coreapi/linphonecall.c:129 #, fuzzy, c-format msgid "Authentication token is %s" msgstr "Informações de autenticação" -#: ../coreapi/linphonecall.c:1560 +#: ../coreapi/linphonecall.c:2124 #, 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)." +#~ msgid "Chat with %s" +#~ msgstr "Bate-papo com %s" + +#, fuzzy +#~ msgid "Choosing a username" +#~ msgstr "Usuário" + +#, fuzzy +#~ msgid "Confirmation" +#~ msgstr "Informações" + +#, fuzzy +#~ msgid "Contacts" +#~ msgstr "Contatando " + +#, fuzzy +#~ msgid "Enable video" +#~ msgstr "Ativado" + +#, fuzzy +#~ msgid "Authentication failure" +#~ msgstr "Informações de autenticação" + #, fuzzy #~ msgid "Contact list" #~ msgstr "Contatando " @@ -1581,10 +1827,6 @@ msgstr[1] "Você perdeu %i ligação(ões)." #~ msgid "Incoming call from %s" #~ msgstr "Camadas recebidas" -#, fuzzy -#~ msgid "Call Details" -#~ msgstr "Histórico de chamadas" - #~ msgid "Accept" #~ msgstr "Aceitar" @@ -1800,9 +2042,6 @@ msgstr[1] "Você perdeu %i ligação(ões)." #~ msgid "userid:" #~ msgstr "Identificação:" -#~ msgid "Chat Room" -#~ msgstr "Sala de bate-papo" - #~ msgid "Text:" #~ msgstr "Texto:" diff --git a/po/ru.po b/po/ru.po index 8c48acd1e..84e09cb04 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: 2012-11-24 01:00+0600\n" +"POT-Creation-Date: 2013-01-08 10:35+0100\n" "PO-Revision-Date: 2010-01-22 18:43+0300\n" "Last-Translator: Maxim Prokopyev \n" "Language-Team: Russian \n" @@ -17,7 +17,22 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" -#: ../gtk/calllogs.c:71 +#: ../gtk/calllogs.c:82 +#, fuzzy +msgid "Aborted" +msgstr "отмененный" + +#: ../gtk/calllogs.c:85 +#, fuzzy +msgid "Missed" +msgstr "пропущенный" + +#: ../gtk/calllogs.c:88 +#, fuzzy +msgid "Declined" +msgstr "Отклонить" + +#: ../gtk/calllogs.c:94 #, c-format msgid "%i minute" msgid_plural "%i minutes" @@ -25,7 +40,7 @@ msgstr[0] "%i минута" msgstr[1] "%i минуты" msgstr[2] "%i минут" -#: ../gtk/calllogs.c:74 +#: ../gtk/calllogs.c:97 #, c-format msgid "%i second" msgid_plural "%i seconds" @@ -33,7 +48,7 @@ msgstr[0] "%i секунда" msgstr[1] "%i секунды" msgstr[2] "%i секунд" -#: ../gtk/calllogs.c:77 +#: ../gtk/calllogs.c:100 #, c-format msgid "" "%s\t%s\tQuality: %s\n" @@ -42,11 +57,20 @@ msgstr "" "%s\t%s\tКачество: %s\n" "%s\t%s %s\t" -#: ../gtk/calllogs.c:79 +#: ../gtk/calllogs.c:102 msgid "n/a" msgstr "н/д" -#: ../gtk/conference.c:33 ../gtk/incall_view.c:185 +#: ../gtk/calllogs.c:105 +#, fuzzy, c-format +msgid "" +"%s\t%s\t\n" +"%s\t%s" +msgstr "" +"%s\t%s\tКачество: %s\n" +"%s\t%s %s\t" + +#: ../gtk/conference.c:33 ../gtk/main.ui.h:13 msgid "Conference" msgstr "Конференция" @@ -59,34 +83,33 @@ msgstr "Я" msgid "Couldn't find pixmap file: %s" msgstr "Невозможно найти графический файл: %s" -#: ../gtk/chat.c:27 -#, c-format -msgid "Chat with %s" -msgstr "Чат с %s" - -#: ../gtk/main.c:84 +#: ../gtk/main.c:89 msgid "log to stdout some debug information while running." msgstr "" "Вывод некоторой отладочной информации на устройство стандартного вывода во " "время работы" -#: ../gtk/main.c:91 +#: ../gtk/main.c:96 msgid "path to a file to write logs into." msgstr "путь к файлу для записи журнала работы." -#: ../gtk/main.c:98 +#: ../gtk/main.c:103 +msgid "Start linphone with video disabled." +msgstr "" + +#: ../gtk/main.c:110 msgid "Start only in the system tray, do not show the main interface." msgstr "Запускать только в системном лотке, не показывая главное окно" -#: ../gtk/main.c:105 +#: ../gtk/main.c:117 msgid "address to call right now" msgstr "адрес для звонка" -#: ../gtk/main.c:112 +#: ../gtk/main.c:124 msgid "if set automatically answer incoming calls" msgstr "автоматически принимать входящие вызовы, если включено" -#: ../gtk/main.c:119 +#: ../gtk/main.c:131 msgid "" "Specifiy a working directory (should be the base of the installation, eg: c:" "\\Program Files\\Linphone)" @@ -94,12 +117,12 @@ msgstr "" "Укажите рабочий каталог (должен содержать установленные файлы приложения, " "например: c:\\Program Files\\Linphone)" -#: ../gtk/main.c:465 +#: ../gtk/main.c:498 #, c-format msgid "Call with %s" msgstr "Чат с %s" -#: ../gtk/main.c:820 +#: ../gtk/main.c:871 #, c-format msgid "" "%s would like to add you to his contact list.\n" @@ -112,7 +135,7 @@ msgstr "" "его(её) в свой контактный лист?\n" "Если вы ответите Нет, этот человек будет временно заблокирован." -#: ../gtk/main.c:898 +#: ../gtk/main.c:948 #, c-format msgid "" "Please enter your password for username %s\n" @@ -121,54 +144,59 @@ msgstr "" "Пожалуйста, введите пароль для пользователя %s\n" " в домене %s:" -#: ../gtk/main.c:998 +#: ../gtk/main.c:1051 msgid "Call error" msgstr "Ошибка вызова" -#: ../gtk/main.c:1001 ../coreapi/linphonecore.c:2433 +#: ../gtk/main.c:1054 ../coreapi/linphonecore.c:2949 msgid "Call ended" msgstr "Разговор окончен" -#: ../gtk/main.c:1004 ../coreapi/linphonecore.c:199 +#: ../gtk/main.c:1057 ../coreapi/linphonecore.c:244 msgid "Incoming call" msgstr "Входящий вызов" -#: ../gtk/main.c:1006 ../gtk/incall_view.c:294 ../gtk/main.ui.h:4 +#: ../gtk/main.c:1059 ../gtk/incall_view.c:451 ../gtk/main.ui.h:6 msgid "Answer" msgstr "Ответить" -#: ../gtk/main.c:1008 ../gtk/main.ui.h:5 +#: ../gtk/main.c:1061 ../gtk/main.ui.h:7 msgid "Decline" msgstr "Отклонить" -#: ../gtk/main.c:1014 +#: ../gtk/main.c:1067 msgid "Call paused" msgstr "Вызов приостановлен" -#: ../gtk/main.c:1014 +#: ../gtk/main.c:1067 #, c-format msgid "by %s" msgstr "со стороны: %s" -#: ../gtk/main.c:1170 +#: ../gtk/main.c:1116 +#, c-format +msgid "%s proposed to start video. Do you accept ?" +msgstr "" + +#: ../gtk/main.c:1278 msgid "Website link" msgstr "Ссылка на сайт" -#: ../gtk/main.c:1210 +#: ../gtk/main.c:1318 msgid "Linphone - a video internet phone" msgstr "Linphone - видео-телефон для интернета" -#: ../gtk/main.c:1302 +#: ../gtk/main.c:1410 #, c-format msgid "%s (Default)" msgstr "%s (По умолчанию)" -#: ../gtk/main.c:1580 ../coreapi/callbacks.c:702 +#: ../gtk/main.c:1714 ../coreapi/callbacks.c:774 #, c-format msgid "We are transferred to %s" msgstr "Мы переведены на %s" -#: ../gtk/main.c:1590 +#: ../gtk/main.c:1724 msgid "" "No sound cards have been detected on this computer.\n" "You won't be able to send or receive audio calls." @@ -176,164 +204,177 @@ msgstr "" "На этом компьютере не обнаружено ни одной звуковой карты.\n" "Вы не сможете совершать или принимать аудио-вызовы." -#: ../gtk/main.c:1691 +#: ../gtk/main.c:1833 msgid "A free SIP video-phone" msgstr "Свободный SIP видео-телефон" -#: ../gtk/friendlist.c:203 +#: ../gtk/friendlist.c:335 msgid "Add to addressbook" msgstr "Добавить в адресную книгу" -#: ../gtk/friendlist.c:377 ../gtk/propertybox.c:297 ../gtk/contact.ui.h:1 -msgid "Name" -msgstr "Имя" - -#: ../gtk/friendlist.c:393 +#: ../gtk/friendlist.c:509 msgid "Presence status" msgstr "Статус присутствия" -#: ../gtk/friendlist.c:432 +#: ../gtk/friendlist.c:526 ../gtk/propertybox.c:362 ../gtk/contact.ui.h:1 +msgid "Name" +msgstr "Имя" + +#: ../gtk/friendlist.c:538 +msgid "Call" +msgstr "Вызов" + +#: ../gtk/friendlist.c:543 +#, fuzzy +msgid "Chat" +msgstr "Комната чата" + +#: ../gtk/friendlist.c:573 #, c-format msgid "Search in %s directory" msgstr "Поиск в директории %s" -#: ../gtk/friendlist.c:646 +#: ../gtk/friendlist.c:730 msgid "Invalid sip contact !" msgstr "Неверный sip-контакт!" -#: ../gtk/friendlist.c:691 +#: ../gtk/friendlist.c:775 #, c-format msgid "Call %s" msgstr "Набрать %s" -#: ../gtk/friendlist.c:692 +#: ../gtk/friendlist.c:776 #, c-format msgid "Send text to %s" msgstr "Послать текст к %s" -#: ../gtk/friendlist.c:693 +#: ../gtk/friendlist.c:777 #, c-format msgid "Edit contact '%s'" msgstr "Редактировать контакт '%s'" -#: ../gtk/friendlist.c:694 +#: ../gtk/friendlist.c:778 #, c-format msgid "Delete contact '%s'" msgstr "Удалить контакт '%s'" -#: ../gtk/friendlist.c:736 +#: ../gtk/friendlist.c:820 #, c-format msgid "Add new contact from %s directory" msgstr "Добавить новый контакт из директории '%s'" -#: ../gtk/propertybox.c:303 +#: ../gtk/propertybox.c:368 msgid "Rate (Hz)" msgstr "Частота (Гц)" -#: ../gtk/propertybox.c:309 +#: ../gtk/propertybox.c:374 msgid "Status" msgstr "Статус" -#: ../gtk/propertybox.c:315 +#: ../gtk/propertybox.c:380 msgid "Min bitrate (kbit/s)" msgstr "Минимальный битрейт (кбит/с)" -#: ../gtk/propertybox.c:322 +#: ../gtk/propertybox.c:387 msgid "Parameters" msgstr "Параметры" -#: ../gtk/propertybox.c:365 ../gtk/propertybox.c:508 +#: ../gtk/propertybox.c:430 ../gtk/propertybox.c:573 msgid "Enabled" msgstr "Включен" -#: ../gtk/propertybox.c:367 ../gtk/propertybox.c:508 +#: ../gtk/propertybox.c:432 ../gtk/propertybox.c:573 msgid "Disabled" msgstr "Отключен" -#: ../gtk/propertybox.c:554 +#: ../gtk/propertybox.c:619 msgid "Account" msgstr "Учетная запись" -#: ../gtk/propertybox.c:694 +#: ../gtk/propertybox.c:759 msgid "English" msgstr "Английский" -#: ../gtk/propertybox.c:695 +#: ../gtk/propertybox.c:760 msgid "French" msgstr "Французский" -#: ../gtk/propertybox.c:696 +#: ../gtk/propertybox.c:761 msgid "Swedish" msgstr "Шведский" -#: ../gtk/propertybox.c:697 +#: ../gtk/propertybox.c:762 msgid "Italian" msgstr "Итальянский" -#: ../gtk/propertybox.c:698 +#: ../gtk/propertybox.c:763 msgid "Spanish" msgstr "Испанский" -#: ../gtk/propertybox.c:699 +#: ../gtk/propertybox.c:764 msgid "Brazilian Portugese" msgstr "Бразильский португальский" -#: ../gtk/propertybox.c:700 +#: ../gtk/propertybox.c:765 msgid "Polish" msgstr "Польский" -#: ../gtk/propertybox.c:701 +#: ../gtk/propertybox.c:766 msgid "German" msgstr "Немецкий" -#: ../gtk/propertybox.c:702 +#: ../gtk/propertybox.c:767 msgid "Russian" msgstr "Русский" -#: ../gtk/propertybox.c:703 +#: ../gtk/propertybox.c:768 msgid "Japanese" msgstr "Японский" -#: ../gtk/propertybox.c:704 +#: ../gtk/propertybox.c:769 msgid "Dutch" msgstr "Нидерландский" -#: ../gtk/propertybox.c:705 +#: ../gtk/propertybox.c:770 msgid "Hungarian" msgstr "Венгерский" -#: ../gtk/propertybox.c:706 +#: ../gtk/propertybox.c:771 msgid "Czech" msgstr "Чешский" -#: ../gtk/propertybox.c:707 +#: ../gtk/propertybox.c:772 msgid "Chinese" msgstr "Китайский" -#: ../gtk/propertybox.c:708 +#: ../gtk/propertybox.c:773 msgid "Traditional Chinese" msgstr "Традиционный китайский" -#: ../gtk/propertybox.c:709 +#: ../gtk/propertybox.c:774 msgid "Norwegian" msgstr "Норвежский" -#: ../gtk/propertybox.c:766 +#: ../gtk/propertybox.c:775 +msgid "Hebrew" +msgstr "" + +#: ../gtk/propertybox.c:842 msgid "" "You need to restart linphone for the new language selection to take effect." msgstr "" "Вы должны перезапустить Linphone для того, чтобы языковые настройки вступили " "в силу." -#: ../gtk/propertybox.c:836 +#: ../gtk/propertybox.c:912 msgid "None" msgstr "Нет" -#: ../gtk/propertybox.c:840 +#: ../gtk/propertybox.c:916 msgid "SRTP" msgstr "SRTP" -#: ../gtk/propertybox.c:846 +#: ../gtk/propertybox.c:922 msgid "ZRTP" msgstr "ZRTP" @@ -431,27 +472,27 @@ msgstr "Домен*" msgid "Proxy" msgstr "Прокси" -#: ../gtk/setupwizard.c:293 +#: ../gtk/setupwizard.c:297 msgid "(*) Required fields" msgstr "(*) Обязательные поля" -#: ../gtk/setupwizard.c:294 +#: ../gtk/setupwizard.c:298 msgid "Username: (*)" msgstr "Имя пользователя: (*)" -#: ../gtk/setupwizard.c:296 +#: ../gtk/setupwizard.c:300 msgid "Password: (*)" msgstr "Пароль: (*)" -#: ../gtk/setupwizard.c:298 +#: ../gtk/setupwizard.c:302 msgid "Email: (*)" msgstr "Email: (*)" -#: ../gtk/setupwizard.c:300 +#: ../gtk/setupwizard.c:304 msgid "Confirm your password: (*)" msgstr "Подтвердите ваш пароль: (*)" -#: ../gtk/setupwizard.c:364 +#: ../gtk/setupwizard.c:368 msgid "" "Error, account not validated, username already used or server unreachable.\n" "Please go back and try again." @@ -460,11 +501,11 @@ msgstr "" "сервер недоступен.\n" "Вернитесь и попробуйте ещё раз." -#: ../gtk/setupwizard.c:375 +#: ../gtk/setupwizard.c:379 msgid "Thank you. Your account is now configured and ready for use." msgstr "Спасибо! Учетная запись успешно настроена и готова к использованию." -#: ../gtk/setupwizard.c:383 +#: ../gtk/setupwizard.c:387 msgid "" "Please validate your account by clicking on the link we just sent you by " "email.\n" @@ -474,131 +515,183 @@ msgstr "" "только что выслали вам на электронную почту.\n" "Затем вернитесь и нажмите на кнопку Далее." -#: ../gtk/setupwizard.c:553 +#: ../gtk/setupwizard.c:554 msgid "Welcome to the account setup assistant" msgstr "Добро пожаловать в помощник настройки учётной записи" -#: ../gtk/setupwizard.c:558 +#: ../gtk/setupwizard.c:559 msgid "Account setup assistant" msgstr "Помощник настройки учётной записи" -#: ../gtk/setupwizard.c:564 +#: ../gtk/setupwizard.c:565 msgid "Configure your account (step 1/1)" msgstr "Настройте свою учётную запись (шаг 1/1)" -#: ../gtk/setupwizard.c:569 +#: ../gtk/setupwizard.c:570 msgid "Enter your sip username (step 1/1)" msgstr "Введите ваше имя пользователя SIP (шаг 1/1)" -#: ../gtk/setupwizard.c:573 +#: ../gtk/setupwizard.c:574 msgid "Enter account information (step 1/2)" msgstr "Введи информация об учётной записи (шаг 1/2)" -#: ../gtk/setupwizard.c:582 +#: ../gtk/setupwizard.c:583 msgid "Validation (step 2/2)" msgstr "Проверка (шаг 2/2)" -#: ../gtk/setupwizard.c:587 +#: ../gtk/setupwizard.c:588 msgid "Error" msgstr "Ошибка" -#: ../gtk/setupwizard.c:591 +#: ../gtk/setupwizard.c:592 msgid "Terminating" msgstr "Завершение" -#: ../gtk/incall_view.c:69 +#: ../gtk/incall_view.c:69 ../gtk/incall_view.c:90 #, c-format msgid "Call #%i" msgstr "Вызов #%i" -#: ../gtk/incall_view.c:129 +#: ../gtk/incall_view.c:150 #, c-format msgid "Transfer to call #%i with %s" msgstr "Перевести на #%i с %s" -#: ../gtk/incall_view.c:157 -msgid "Transfer" -msgstr "Перевести" +#: ../gtk/incall_view.c:209 ../gtk/incall_view.c:212 +#, fuzzy +msgid "Not used" +msgstr "Не найден" -#: ../gtk/incall_view.c:273 +#: ../gtk/incall_view.c:219 +msgid "ICE not activated" +msgstr "" + +#: ../gtk/incall_view.c:221 +#, fuzzy +msgid "ICE failed" +msgstr "ICE фильтр" + +#: ../gtk/incall_view.c:223 +msgid "ICE in progress" +msgstr "" + +#: ../gtk/incall_view.c:225 +msgid "Going through one or more NATs" +msgstr "" + +#: ../gtk/incall_view.c:227 +#, fuzzy +msgid "Direct" +msgstr "Переадресован" + +#: ../gtk/incall_view.c:229 +msgid "Through a relay server" +msgstr "" + +#: ../gtk/incall_view.c:238 ../gtk/incall_view.c:242 +#, c-format +msgid "" +"download: %f\n" +"upload: %f (kbit/s)" +msgstr "" + +#: ../gtk/incall_view.c:341 ../gtk/main.ui.h:12 +msgid "Hang up" +msgstr "" + +#: ../gtk/incall_view.c:430 msgid "Calling..." msgstr "Вызов..." -#: ../gtk/incall_view.c:276 ../gtk/incall_view.c:484 +#: ../gtk/incall_view.c:433 ../gtk/incall_view.c:646 msgid "00::00::00" msgstr "00::00::00" -#: ../gtk/incall_view.c:287 +#: ../gtk/incall_view.c:444 msgid "Incoming call" msgstr "Входящий вызов" -#: ../gtk/incall_view.c:324 +#: ../gtk/incall_view.c:481 msgid "good" msgstr "хорошее" -#: ../gtk/incall_view.c:326 +#: ../gtk/incall_view.c:483 msgid "average" msgstr "среднее" -#: ../gtk/incall_view.c:328 +#: ../gtk/incall_view.c:485 msgid "poor" msgstr "плохое" -#: ../gtk/incall_view.c:330 +#: ../gtk/incall_view.c:487 msgid "very poor" msgstr "очень плохое" -#: ../gtk/incall_view.c:332 +#: ../gtk/incall_view.c:489 msgid "too bad" msgstr "слишком плохое" -#: ../gtk/incall_view.c:333 ../gtk/incall_view.c:349 +#: ../gtk/incall_view.c:490 ../gtk/incall_view.c:506 msgid "unavailable" msgstr "недоступно" -#: ../gtk/incall_view.c:449 +#: ../gtk/incall_view.c:605 msgid "Secured by SRTP" msgstr "Защищено SRTP" -#: ../gtk/incall_view.c:455 +#: ../gtk/incall_view.c:611 #, c-format msgid "Secured by ZRTP - [auth token: %s]" msgstr "Защищено ZRTP - [токен: %s]" -#: ../gtk/incall_view.c:461 +#: ../gtk/incall_view.c:617 msgid "Set unverified" msgstr "Не проверен" -#: ../gtk/incall_view.c:461 ../gtk/main.ui.h:3 +#: ../gtk/incall_view.c:617 ../gtk/main.ui.h:5 msgid "Set verified" msgstr "Проверен" -#: ../gtk/incall_view.c:482 +#: ../gtk/incall_view.c:641 msgid "In conference" msgstr "В конференции" -#: ../gtk/incall_view.c:482 +#: ../gtk/incall_view.c:641 msgid "In call" msgstr "Соединен с" -#: ../gtk/incall_view.c:501 +#: ../gtk/incall_view.c:669 msgid "Paused call" msgstr "Приостановленный вызов" -#: ../gtk/incall_view.c:513 +#: ../gtk/incall_view.c:682 #, c-format msgid "%02i::%02i::%02i" msgstr "%02i::%02i::%02i" -#: ../gtk/incall_view.c:529 +#: ../gtk/incall_view.c:699 msgid "Call ended." msgstr "Звонок закончен." -#: ../gtk/incall_view.c:586 +#: ../gtk/incall_view.c:731 +msgid "Transfer in progress" +msgstr "" + +#: ../gtk/incall_view.c:734 +#, fuzzy +msgid "Transfer done." +msgstr "Перевести" + +#: ../gtk/incall_view.c:737 +#, fuzzy +msgid "Transfer failed." +msgstr "Перевести" + +#: ../gtk/incall_view.c:781 msgid "Resume" msgstr "Продолжить" -#: ../gtk/incall_view.c:593 ../gtk/main.ui.h:6 +#: ../gtk/incall_view.c:788 ../gtk/main.ui.h:9 msgid "Pause" msgstr "Пауза" @@ -612,209 +705,226 @@ msgid "Callee name" msgstr "Имя вызываемого абонента" #: ../gtk/main.ui.h:2 +msgid "Send" +msgstr "Отправить" + +#: ../gtk/main.ui.h:3 +#, fuzzy +msgid "End conference" +msgstr "В конференции" + +#: ../gtk/main.ui.h:4 msgid "label" msgstr "метка" -#: ../gtk/main.ui.h:7 +#: ../gtk/main.ui.h:8 +msgid "Video" +msgstr "" + +#: ../gtk/main.ui.h:10 +msgid "Mute" +msgstr "" + +#: ../gtk/main.ui.h:11 +msgid "Transfer" +msgstr "Перевести" + +#: ../gtk/main.ui.h:14 msgid "In call" msgstr "Вызов" -#: ../gtk/main.ui.h:8 +#: ../gtk/main.ui.h:15 msgid "Duration" msgstr "Продолжительность" -#: ../gtk/main.ui.h:9 +#: ../gtk/main.ui.h:16 msgid "Call quality rating" msgstr "Уровень качества звонка" -#: ../gtk/main.ui.h:10 +#: ../gtk/main.ui.h:17 msgid "_Options" msgstr "_Настройки" -#: ../gtk/main.ui.h:11 -msgid "Enable video" -msgstr "Включить видео" +#: ../gtk/main.ui.h:18 +msgid "Always start video" +msgstr "" -#: ../gtk/main.ui.h:12 +#: ../gtk/main.ui.h:19 msgid "Enable self-view" msgstr "Включить своё видео" -#: ../gtk/main.ui.h:13 +#: ../gtk/main.ui.h:20 msgid "_Help" msgstr "_Помощь" -#: ../gtk/main.ui.h:14 +#: ../gtk/main.ui.h:21 msgid "Show debug window" msgstr "Показать окно отладки" -#: ../gtk/main.ui.h:15 +#: ../gtk/main.ui.h:22 msgid "_Homepage" msgstr "_Домашняя страница" -#: ../gtk/main.ui.h:16 +#: ../gtk/main.ui.h:23 msgid "Check _Updates" msgstr "Проверить _Обновления" -#: ../gtk/main.ui.h:17 +#: ../gtk/main.ui.h:24 msgid "Account assistant" msgstr "Помощник настройки учётной записи" -#: ../gtk/main.ui.h:18 -msgid "Initiate a new call" -msgstr "Совершить новый вызов" - -#: ../gtk/main.ui.h:19 -msgid "Enter username, phone number, or full sip address" -msgstr "Введите имя пользователя, номер телефона или полный SIP-адрес" - -#: ../gtk/main.ui.h:20 +#: ../gtk/main.ui.h:25 msgid "SIP address or phone number:" msgstr "SIP-адрес или номер телефона:" -#: ../gtk/main.ui.h:21 -msgid "Lookup:" -msgstr "Поиск:" - -#: ../gtk/main.ui.h:22 -msgid "in" -msgstr "в" - -#: ../gtk/main.ui.h:23 -msgid "Search" -msgstr "Поиск" - -#: ../gtk/main.ui.h:24 -msgid "Add contacts from directory" -msgstr "Добавить контакты из директории" - -#: ../gtk/main.ui.h:25 -msgid "Add contact" -msgstr "Добавить контакт" - #: ../gtk/main.ui.h:26 -msgid "Contacts" -msgstr "Контакты" +msgid "Initiate a new call" +msgstr "Совершить новый вызов" -#: ../gtk/main.ui.h:27 -msgid "Recent calls" -msgstr "Недавние вызовы" +#: ../gtk/main.ui.h:27 ../gtk/parameters.ui.h:48 +msgid "Add" +msgstr "Добавить" -#: ../gtk/main.ui.h:28 +#: ../gtk/main.ui.h:28 ../gtk/parameters.ui.h:49 +msgid "Edit" +msgstr "Редактировать" + +#: ../gtk/main.ui.h:29 msgid "D" msgstr "D" -#: ../gtk/main.ui.h:29 +#: ../gtk/main.ui.h:30 msgid "#" msgstr "#" -#: ../gtk/main.ui.h:30 +#: ../gtk/main.ui.h:31 msgid "0" msgstr "0" -#: ../gtk/main.ui.h:31 +#: ../gtk/main.ui.h:32 msgid "*" msgstr "*" -#: ../gtk/main.ui.h:32 ../gtk/parameters.ui.h:7 +#: ../gtk/main.ui.h:33 ../gtk/parameters.ui.h:7 msgid "C" msgstr "C" -#: ../gtk/main.ui.h:33 +#: ../gtk/main.ui.h:34 msgid "9" msgstr "9" -#: ../gtk/main.ui.h:34 +#: ../gtk/main.ui.h:35 msgid "8" msgstr "8" -#: ../gtk/main.ui.h:35 +#: ../gtk/main.ui.h:36 msgid "7" msgstr "7" -#: ../gtk/main.ui.h:36 +#: ../gtk/main.ui.h:37 msgid "B" msgstr "B" -#: ../gtk/main.ui.h:37 +#: ../gtk/main.ui.h:38 msgid "6" msgstr "6" -#: ../gtk/main.ui.h:38 +#: ../gtk/main.ui.h:39 msgid "5" msgstr "5" -#: ../gtk/main.ui.h:39 +#: ../gtk/main.ui.h:40 msgid "4" msgstr "4" -#: ../gtk/main.ui.h:40 +#: ../gtk/main.ui.h:41 msgid "A" msgstr "A" -#: ../gtk/main.ui.h:41 +#: ../gtk/main.ui.h:42 msgid "3" msgstr "3" -#: ../gtk/main.ui.h:42 +#: ../gtk/main.ui.h:43 msgid "2" msgstr "2" -#: ../gtk/main.ui.h:43 +#: ../gtk/main.ui.h:44 msgid "1" msgstr "1" -#: ../gtk/main.ui.h:44 +#: ../gtk/main.ui.h:45 +msgid "Search" +msgstr "Поиск" + +#: ../gtk/main.ui.h:46 +msgid "Add contacts from directory" +msgstr "Добавить контакты из директории" + +#: ../gtk/main.ui.h:47 +msgid "Add contact" +msgstr "Добавить контакт" + +#: ../gtk/main.ui.h:48 msgid "Keypad" msgstr "Номеронабиратель" -#: ../gtk/main.ui.h:45 +#: ../gtk/main.ui.h:49 +msgid "Recent calls" +msgstr "Недавние вызовы" + +#: ../gtk/main.ui.h:50 msgid "My current identity:" msgstr "Мой текущий идентификатор:" -#: ../gtk/main.ui.h:46 +#: ../gtk/main.ui.h:51 ../gtk/tunnel_config.ui.h:7 msgid "Username" msgstr "Имя пользователя" -#: ../gtk/main.ui.h:47 +#: ../gtk/main.ui.h:52 ../gtk/tunnel_config.ui.h:8 msgid "Password" msgstr "Пароль" -#: ../gtk/main.ui.h:48 +#: ../gtk/main.ui.h:53 msgid "Internet connection:" msgstr "Интернет-соединение:" -#: ../gtk/main.ui.h:49 +#: ../gtk/main.ui.h:54 msgid "Automatically log me in" msgstr "Входить автоматически" -#: ../gtk/main.ui.h:50 +#: ../gtk/main.ui.h:55 msgid "Login information" msgstr "Информация для входа" -#: ../gtk/main.ui.h:51 +#: ../gtk/main.ui.h:56 msgid "Welcome !" msgstr "Добро пожаловать!" -#: ../gtk/main.ui.h:52 +#: ../gtk/main.ui.h:57 msgid "All users" msgstr "Все пользователи" -#: ../gtk/main.ui.h:53 +#: ../gtk/main.ui.h:58 msgid "Online users" msgstr "Пользователи в сети" -#: ../gtk/main.ui.h:54 +#: ../gtk/main.ui.h:59 msgid "ADSL" msgstr "ADSL" -#: ../gtk/main.ui.h:55 +#: ../gtk/main.ui.h:60 msgid "Fiber Channel" msgstr "Оптоволокно" -#: ../gtk/main.ui.h:56 +#: ../gtk/main.ui.h:61 msgid "Default" msgstr "По умолчанию" +#: ../gtk/main.ui.h:62 +msgid "Delete" +msgstr "" + #: ../gtk/about.ui.h:1 msgid "About linphone" msgstr "Про linphone" @@ -946,10 +1056,6 @@ msgstr "Опубликовывать статус присутствия" msgid "Configure a SIP account" msgstr "Настроить учётную запись SIP" -#: ../gtk/chatroom.ui.h:1 -msgid "Send" -msgstr "Отправить" - #: ../gtk/parameters.ui.h:1 msgid "default soundcard" msgstr "звуковая карта по умолчанию" @@ -1015,138 +1121,131 @@ msgid "Tunnel" msgstr "Туннель" #: ../gtk/parameters.ui.h:18 -msgid "edit" -msgstr "редактировать" - -#: ../gtk/parameters.ui.h:19 msgid "Video RTP/UDP:" msgstr "Видео RTP/UDP:" -#: ../gtk/parameters.ui.h:20 +#: ../gtk/parameters.ui.h:19 msgid "Audio RTP/UDP:" msgstr "Аудио RTP/UDP:" +#: ../gtk/parameters.ui.h:20 +msgid "DSCP fields" +msgstr "" + #: ../gtk/parameters.ui.h:21 +msgid "Fixed" +msgstr "" + +#: ../gtk/parameters.ui.h:22 msgid "Network protocol and ports" msgstr "Протокол и порты" -#: ../gtk/parameters.ui.h:22 +#: ../gtk/parameters.ui.h:23 msgid "Direct connection to the Internet" msgstr "Прямое подключение к Интернету" -#: ../gtk/parameters.ui.h:23 +#: ../gtk/parameters.ui.h:24 msgid "Behind NAT / Firewall (specify gateway IP below)" msgstr "За NAT / брандмауэром (укажите IP-адрес шлюза ниже)" -#: ../gtk/parameters.ui.h:24 +#: ../gtk/parameters.ui.h:25 msgid "Public IP address:" msgstr "Внешний IP-адрес:" -#: ../gtk/parameters.ui.h:25 +#: ../gtk/parameters.ui.h:26 msgid "Behind NAT / Firewall (use STUN to resolve)" msgstr "За NAT / брандмауэром (использовать STUN)" -#: ../gtk/parameters.ui.h:26 +#: ../gtk/parameters.ui.h:27 +#, fuzzy +msgid "Behind NAT / Firewall (use ICE)" +msgstr "За NAT / брандмауэром (использовать STUN)" + +#: ../gtk/parameters.ui.h:28 msgid "Stun server:" msgstr "Сервер STUN:" -#: ../gtk/parameters.ui.h:27 +#: ../gtk/parameters.ui.h:29 msgid "NAT and Firewall" msgstr "NAT и брандмауэр" -#: ../gtk/parameters.ui.h:28 +#: ../gtk/parameters.ui.h:30 msgid "Network settings" msgstr "Настройки сети" -#: ../gtk/parameters.ui.h:29 +#: ../gtk/parameters.ui.h:31 msgid "Ring sound:" msgstr "Звук звонка:" -#: ../gtk/parameters.ui.h:30 +#: ../gtk/parameters.ui.h:32 msgid "ALSA special device (optional):" msgstr "Специальное устройство ALSA (необязательно):" -#: ../gtk/parameters.ui.h:31 +#: ../gtk/parameters.ui.h:33 msgid "Capture device:" msgstr "Устройство захвата:" -#: ../gtk/parameters.ui.h:32 +#: ../gtk/parameters.ui.h:34 msgid "Ring device:" msgstr "Устройство звонка:" -#: ../gtk/parameters.ui.h:33 +#: ../gtk/parameters.ui.h:35 msgid "Playback device:" msgstr "Устройство воспроизведения:" -#: ../gtk/parameters.ui.h:34 +#: ../gtk/parameters.ui.h:36 msgid "Enable echo cancellation" msgstr "Включить подавление эхо" -#: ../gtk/parameters.ui.h:35 +#: ../gtk/parameters.ui.h:37 msgid "Audio" msgstr "Звук" -#: ../gtk/parameters.ui.h:36 +#: ../gtk/parameters.ui.h:38 msgid "Video input device:" msgstr "Устройство захвата видео:" -#: ../gtk/parameters.ui.h:37 +#: ../gtk/parameters.ui.h:39 msgid "Prefered video resolution:" msgstr "Предпочтительное разрешение видео:" -#: ../gtk/parameters.ui.h:38 +#: ../gtk/parameters.ui.h:40 msgid "Video" msgstr "Видео" -#: ../gtk/parameters.ui.h:39 +#: ../gtk/parameters.ui.h:41 msgid "Multimedia settings" msgstr "Настройки мультимедиа" -#: ../gtk/parameters.ui.h:40 +#: ../gtk/parameters.ui.h:42 msgid "This section defines your SIP address when not using a SIP account" msgstr "" "Эта секция устанавливает ваш SIP-адрес, когда вы не используете SIP-аккаунт" -#: ../gtk/parameters.ui.h:41 +#: ../gtk/parameters.ui.h:43 msgid "Your display name (eg: John Doe):" msgstr "Отображаемое имя (напр.: Иван Сидоров):" -#: ../gtk/parameters.ui.h:42 +#: ../gtk/parameters.ui.h:44 msgid "Your username:" msgstr "Имя пользователя:" -#: ../gtk/parameters.ui.h:43 +#: ../gtk/parameters.ui.h:45 msgid "Your resulting SIP address:" msgstr "Результирующий SIP-адрес:" -#: ../gtk/parameters.ui.h:44 +#: ../gtk/parameters.ui.h:46 msgid "Default identity" msgstr "Идентификатор по умолчанию" -#: ../gtk/parameters.ui.h:45 +#: ../gtk/parameters.ui.h:47 msgid "Wizard" msgstr "Мастер" -#: ../gtk/parameters.ui.h:46 -msgid "Add" -msgstr "Добавить" - -#: ../gtk/parameters.ui.h:47 -msgid "Edit" -msgstr "Редактировать" - -#: ../gtk/parameters.ui.h:48 +#: ../gtk/parameters.ui.h:50 msgid "Remove" msgstr "Удалить" -#: ../gtk/parameters.ui.h:49 -msgid "" -"Register to FONICS\n" -"virtual network !" -msgstr "" -"Регистрация в \n" -"виртуальной сети FONICS!" - #: ../gtk/parameters.ui.h:51 msgid "Proxy accounts" msgstr "Учетные записи прокси" @@ -1163,11 +1262,11 @@ msgstr "Конфеденциальность" msgid "Manage SIP Accounts" msgstr "Управление учётными записями SIP" -#: ../gtk/parameters.ui.h:55 +#: ../gtk/parameters.ui.h:55 ../gtk/tunnel_config.ui.h:4 msgid "Enable" msgstr "Включить" -#: ../gtk/parameters.ui.h:56 +#: ../gtk/parameters.ui.h:56 ../gtk/tunnel_config.ui.h:5 msgid "Disable" msgstr "Выключить" @@ -1247,19 +1346,96 @@ msgstr "Linphone" msgid "Please wait" msgstr "Подождите" -#: ../coreapi/linphonecore.c:187 +#: ../gtk/dscp_settings.ui.h:1 +#, fuzzy +msgid "Dscp settings" +msgstr "Настройки" + +#: ../gtk/dscp_settings.ui.h:2 +msgid "SIP" +msgstr "SIP" + +#: ../gtk/dscp_settings.ui.h:3 +#, fuzzy +msgid "Audio RTP stream" +msgstr "Аудио RTP/UDP:" + +#: ../gtk/dscp_settings.ui.h:4 +#, fuzzy +msgid "Video RTP stream" +msgstr "Видео RTP/UDP:" + +#: ../gtk/dscp_settings.ui.h:5 +msgid "Set DSCP values (in hexadecimal)" +msgstr "" + +#: ../gtk/call_statistics.ui.h:1 +#, fuzzy +msgid "Call statistics" +msgstr "Звонк %s" + +#: ../gtk/call_statistics.ui.h:2 +#, fuzzy +msgid "Audio codec" +msgstr "Аудио кодеки" + +#: ../gtk/call_statistics.ui.h:3 +#, fuzzy +msgid "Video codec" +msgstr "Видео кодеки" + +#: ../gtk/call_statistics.ui.h:4 +msgid "Audio IP bandwidth usage" +msgstr "" + +#: ../gtk/call_statistics.ui.h:5 +#, fuzzy +msgid "Media connectivity" +msgstr "Тип шифрования потока" + +#: ../gtk/call_statistics.ui.h:6 +msgid "Video IP bandwidth usage" +msgstr "" + +#: ../gtk/call_statistics.ui.h:7 +#, fuzzy +msgid "Call statistics and information" +msgstr "Контактная информация" + +#: ../gtk/tunnel_config.ui.h:1 +#, fuzzy +msgid "Configure VoIP tunnel" +msgstr "Настроить учётную запись SIP" + +#: ../gtk/tunnel_config.ui.h:2 +msgid "Host" +msgstr "" + +#: ../gtk/tunnel_config.ui.h:3 +msgid "Port" +msgstr "" + +#: ../gtk/tunnel_config.ui.h:6 +msgid "Configure tunnel" +msgstr "" + +#: ../gtk/tunnel_config.ui.h:9 +msgid "Configure http proxy (optional)" +msgstr "" + +#: ../coreapi/linphonecore.c:232 msgid "aborted" msgstr "отмененный" -#: ../coreapi/linphonecore.c:190 +#: ../coreapi/linphonecore.c:235 msgid "completed" msgstr "завершённый" -#: ../coreapi/linphonecore.c:193 +#: ../coreapi/linphonecore.c:238 msgid "missed" msgstr "пропущенный" -#: ../coreapi/linphonecore.c:198 +#: ../coreapi/linphonecore.c:243 #, c-format msgid "" "%s at %s\n" @@ -1274,23 +1450,23 @@ msgstr "" "Статус: %s\n" "Длительность: %i мин %i сек\n" -#: ../coreapi/linphonecore.c:199 +#: ../coreapi/linphonecore.c:244 msgid "Outgoing call" msgstr "Исходящий звонок" -#: ../coreapi/linphonecore.c:1105 +#: ../coreapi/linphonecore.c:1226 msgid "Ready" msgstr "Готов" -#: ../coreapi/linphonecore.c:1848 +#: ../coreapi/linphonecore.c:2074 msgid "Looking for telephone number destination..." msgstr "Поиск адреса для телефонного номера..." -#: ../coreapi/linphonecore.c:1851 +#: ../coreapi/linphonecore.c:2077 msgid "Could not resolve this number." msgstr "Не могу найти этот номер." -#: ../coreapi/linphonecore.c:1895 +#: ../coreapi/linphonecore.c:2121 msgid "" "Could not parse given sip address. A sip url usually looks like sip:" "user@domain" @@ -1298,39 +1474,51 @@ msgstr "" "Не могу опознать sip адрес. SIP-URL обычно выглядит как sip:" "username@domainname" -#: ../coreapi/linphonecore.c:2052 +#: ../coreapi/linphonecore.c:2312 msgid "Contacting" msgstr "Соединение" -#: ../coreapi/linphonecore.c:2059 +#: ../coreapi/linphonecore.c:2319 msgid "Could not call" msgstr "Не удалось позвонить" -#: ../coreapi/linphonecore.c:2167 +#: ../coreapi/linphonecore.c:2429 msgid "Sorry, we have reached the maximum number of simultaneous calls" msgstr "Извините, мы превысили максимальное количество одновременных вызовов" -#: ../coreapi/linphonecore.c:2297 +#: ../coreapi/linphonecore.c:2573 +msgid "is contacting you" +msgstr "пытается связаться с вами" + +#: ../coreapi/linphonecore.c:2574 +msgid " and asked autoanswer." +msgstr " и ответил автоответчик." + +#: ../coreapi/linphonecore.c:2574 +msgid "." +msgstr "." + +#: ../coreapi/linphonecore.c:2636 msgid "Modifying call parameters..." msgstr "Изменение параметров вызова..." -#: ../coreapi/linphonecore.c:2393 +#: ../coreapi/linphonecore.c:2908 msgid "Connected." msgstr "Соединён." -#: ../coreapi/linphonecore.c:2416 +#: ../coreapi/linphonecore.c:2931 msgid "Call aborted" msgstr "Вызов отменён" -#: ../coreapi/linphonecore.c:2557 +#: ../coreapi/linphonecore.c:3102 msgid "Could not pause the call" msgstr "Не удалось приостановить вызов" -#: ../coreapi/linphonecore.c:2562 +#: ../coreapi/linphonecore.c:3107 msgid "Pausing the current call..." msgstr "Приостановление текущего вызова..." -#: ../coreapi/misc.c:147 +#: ../coreapi/misc.c:148 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the pcm oss emulation module\n" @@ -1343,7 +1531,7 @@ msgstr "" "Пожалуйста, выполните от имени пользователя root команду 'modprobe snd-pcm-" "oss', чтобы загрузить его." -#: ../coreapi/misc.c:150 +#: ../coreapi/misc.c:151 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the mixer oss emulation module\n" @@ -1356,10 +1544,14 @@ msgstr "" "Пожалуйста, выполните от имени пользователя root команду 'modprobe snd-pcm-" "oss' чтобы загрузить его." -#: ../coreapi/misc.c:479 +#: ../coreapi/misc.c:496 msgid "Stun lookup in progress..." msgstr "Идет поиск Stun..." +#: ../coreapi/misc.c:630 +msgid "ICE local candidates gathering in progress..." +msgstr "" + #: ../coreapi/friend.c:33 msgid "Online" msgstr "В сети" @@ -1408,7 +1600,7 @@ msgstr "В ожидании" msgid "Unknown-bug" msgstr "Неизвестная ошибка" -#: ../coreapi/proxy.c:196 +#: ../coreapi/proxy.c:204 msgid "" "The sip proxy address you entered is invalid, it must start with \"sip:\" " "followed by a hostname." @@ -1416,7 +1608,7 @@ msgstr "" "Введеный адрес SIP-прокси является недействительным, он должен выглядеть как " "\"sip:имя_хоста\"" -#: ../coreapi/proxy.c:202 +#: ../coreapi/proxy.c:210 msgid "" "The sip identity you entered is invalid.\n" "It should look like sip:username@proxydomain, such as sip:alice@example.net" @@ -1425,140 +1617,127 @@ msgstr "" "Они должны выглядеть как sip:username@proxydomain, например such as sip:" "alice@example.net" -#: ../coreapi/proxy.c:702 +#: ../coreapi/proxy.c:1053 #, c-format msgid "Could not login as %s" msgstr "Невозможно зайти как %s" -#: ../coreapi/callbacks.c:206 -msgid "is contacting you" -msgstr "пытается связаться с вами" - -#: ../coreapi/callbacks.c:207 -msgid " and asked autoanswer." -msgstr " и ответил автоответчик." - -#: ../coreapi/callbacks.c:207 -msgid "." -msgstr "." - -#: ../coreapi/callbacks.c:266 +#: ../coreapi/callbacks.c:276 msgid "Remote ringing." msgstr "Абонент вызывается." -#: ../coreapi/callbacks.c:282 +#: ../coreapi/callbacks.c:296 msgid "Remote ringing..." msgstr "Абонент вызывается..." -#: ../coreapi/callbacks.c:293 +#: ../coreapi/callbacks.c:307 msgid "Early media." msgstr "Гудки." -#: ../coreapi/callbacks.c:331 +#: ../coreapi/callbacks.c:352 #, c-format msgid "Call with %s is paused." msgstr "Вызов %s приостановлен." -#: ../coreapi/callbacks.c:342 +#: ../coreapi/callbacks.c:365 #, c-format msgid "Call answered by %s - on hold." msgstr "Вызов отвечен %s - в ожидании." -#: ../coreapi/callbacks.c:357 +#: ../coreapi/callbacks.c:376 msgid "Call resumed." msgstr "Разговор продолжен." -#: ../coreapi/callbacks.c:362 +#: ../coreapi/callbacks.c:381 #, c-format msgid "Call answered by %s." msgstr "Вызов отвечен %s." -#: ../coreapi/callbacks.c:377 +#: ../coreapi/callbacks.c:396 msgid "Incompatible, check codecs..." msgstr "Несовместимо, проверьте кодеки..." -#: ../coreapi/callbacks.c:432 -msgid "We are being paused..." -msgstr "Мы на паузе..." - -#: ../coreapi/callbacks.c:436 -msgid "We have been resumed..." +#: ../coreapi/callbacks.c:437 +#, fuzzy +msgid "We have been resumed." msgstr "Наш вызов продолжен..." -#: ../coreapi/callbacks.c:441 -msgid "Call has been updated by remote..." +#: ../coreapi/callbacks.c:446 +msgid "We are paused by other party." +msgstr "" + +#: ../coreapi/callbacks.c:452 +#, fuzzy +msgid "Call is updated by remote." msgstr "Вызов обновлён вызываемым абонентом..." -#: ../coreapi/callbacks.c:473 +#: ../coreapi/callbacks.c:521 msgid "Call terminated." msgstr "Звонок прерван." -#: ../coreapi/callbacks.c:480 +#: ../coreapi/callbacks.c:528 msgid "User is busy." msgstr "Пользователь занят." -#: ../coreapi/callbacks.c:481 +#: ../coreapi/callbacks.c:529 msgid "User is temporarily unavailable." msgstr "Пользователь временно недоступен." #. char *retrymsg=_("%s. Retry after %i minute(s)."); -#: ../coreapi/callbacks.c:483 +#: ../coreapi/callbacks.c:531 msgid "User does not want to be disturbed." msgstr "Абонент не хочет отвечать." -#: ../coreapi/callbacks.c:484 +#: ../coreapi/callbacks.c:532 msgid "Call declined." msgstr "Звонок отклонён." -#: ../coreapi/callbacks.c:496 +#: ../coreapi/callbacks.c:544 msgid "No response." msgstr "Нет ответа." -#: ../coreapi/callbacks.c:500 +#: ../coreapi/callbacks.c:548 msgid "Protocol error." msgstr "Ошибка протокола." -#: ../coreapi/callbacks.c:516 +#: ../coreapi/callbacks.c:564 msgid "Redirected" msgstr "Переадресован" -#: ../coreapi/callbacks.c:550 -msgid "No common codecs" -msgstr "Нет общих кодеков" +#: ../coreapi/callbacks.c:600 +#, fuzzy +msgid "Incompatible media parameters." +msgstr "Несовместимо, проверьте кодеки..." -#: ../coreapi/callbacks.c:556 +#: ../coreapi/callbacks.c:606 msgid "Call failed." msgstr "Не удалось совершить вызов." -#: ../coreapi/callbacks.c:633 +#: ../coreapi/callbacks.c:701 #, c-format msgid "Registration on %s successful." msgstr "Регистрация на %s прошла успешно." -#: ../coreapi/callbacks.c:634 +#: ../coreapi/callbacks.c:702 #, c-format msgid "Unregistration on %s done." msgstr "Отмена регистрации на %s завершена." -#: ../coreapi/callbacks.c:650 +#: ../coreapi/callbacks.c:722 msgid "no response timeout" msgstr "время ожидания истекло" -#: ../coreapi/callbacks.c:653 +#: ../coreapi/callbacks.c:725 #, c-format msgid "Registration on %s failed: %s" msgstr "Регистрация на %s не удалась: %s" -#: ../coreapi/sal_eXosip2.c:870 ../coreapi/sal_eXosip2.c:872 -msgid "Authentication failure" -msgstr "Ошибка аутентификации" - -#: ../coreapi/linphonecall.c:128 +#: ../coreapi/linphonecall.c:129 #, c-format msgid "Authentication token is %s" msgstr "Аутентификационный токен: %s" -#: ../coreapi/linphonecall.c:1573 +#: ../coreapi/linphonecall.c:2124 #, c-format msgid "You have missed %i call." msgid_plural "You have missed %i calls." @@ -1566,6 +1745,43 @@ msgstr[0] "У вас пропущен %i звонок." msgstr[1] "У вас пропущено %i звонка." msgstr[2] "У вас пропущено %i звонков." +#~ msgid "Chat with %s" +#~ msgstr "Чат с %s" + +#~ msgid "Enable video" +#~ msgstr "Включить видео" + +#~ msgid "Enter username, phone number, or full sip address" +#~ msgstr "Введите имя пользователя, номер телефона или полный SIP-адрес" + +#~ msgid "Lookup:" +#~ msgstr "Поиск:" + +#~ msgid "in" +#~ msgstr "в" + +#~ msgid "Contacts" +#~ msgstr "Контакты" + +#~ msgid "edit" +#~ msgstr "редактировать" + +#~ msgid "" +#~ "Register to FONICS\n" +#~ "virtual network !" +#~ msgstr "" +#~ "Регистрация в \n" +#~ "виртуальной сети FONICS!" + +#~ msgid "We are being paused..." +#~ msgstr "Мы на паузе..." + +#~ msgid "No common codecs" +#~ msgstr "Нет общих кодеков" + +#~ msgid "Authentication failure" +#~ msgstr "Ошибка аутентификации" + #~ msgid "Please choose a username:" #~ msgstr "Выберите имя пользователя:" @@ -1599,12 +1815,6 @@ msgstr[2] "У вас пропущено %i звонков." #~ msgid "Now ready !" #~ msgstr "Готово !" -#~ msgid "Call" -#~ msgstr "Вызов" - -#~ msgid "Not found" -#~ msgstr "Не найден" - #, fuzzy #~ msgid "Unmute" #~ msgstr "Безлимитный" @@ -1727,9 +1937,6 @@ msgstr[2] "У вас пропущено %i звонков." #~ msgid "A MJPEG encoder using ffmpeg library." #~ msgstr "MJPEG декодер ( использует ffmpeg )" -#~ msgid "ICE filter" -#~ msgstr "ICE фильтр" - #, fuzzy #~ msgid "Inter ticker communication filter." #~ msgstr "Ошибка связи с сервером" @@ -1748,10 +1955,6 @@ msgstr[2] "У вас пропущено %i звонков." #~ msgid "Assistant" #~ msgstr "Помощник" -#, fuzzy -#~ msgid "Call Details" -#~ msgstr "Звонк %s" - #, fuzzy #~ msgid "Show debug messages" #~ msgstr "Показать окно ошибок" @@ -2145,9 +2348,6 @@ msgstr[2] "У вас пропущено %i звонков." #~ msgid "Clear all stored authentication information (username,password...)" #~ msgstr "Удалить всю информацию аунтефикации (логин, пароль...)" -#~ msgid "SIP" -#~ msgstr "SIP" - #~ msgid "List of audio codecs, in order of preference:" #~ msgstr "Список аудио кодеков в приоритетном порядке:" @@ -2216,9 +2416,6 @@ msgstr[2] "У вас пропущено %i звонков." #~ msgid "Linphone - Call history" #~ msgstr "Linphone - История звонков" -#~ msgid "Chat Room" -#~ msgstr "Комната чата" - #~ msgid "Text:" #~ msgstr "Текст" diff --git a/po/sv.po b/po/sv.po index 2d7e13645..fed2d6550 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: 2011-12-05 12:41+0100\n" +"POT-Creation-Date: 2013-01-08 10:35+0100\n" "PO-Revision-Date: 2009-02-17 15:22+0100\n" "Last-Translator: Emmanuel Frécon \n" "Language-Team: SWEDISH \n" @@ -16,32 +16,54 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../gtk/calllogs.c:71 +#: ../gtk/calllogs.c:82 +#, fuzzy +msgid "Aborted" +msgstr "avbrytade" + +#: ../gtk/calllogs.c:85 +#, fuzzy +msgid "Missed" +msgstr "missade" + +#: ../gtk/calllogs.c:88 +#, fuzzy +msgid "Declined" +msgstr "Avböj" + +#: ../gtk/calllogs.c:94 #, c-format msgid "%i minute" msgid_plural "%i minutes" msgstr[0] "" msgstr[1] "" -#: ../gtk/calllogs.c:74 +#: ../gtk/calllogs.c:97 #, c-format msgid "%i second" msgid_plural "%i seconds" msgstr[0] "" msgstr[1] "" -#: ../gtk/calllogs.c:77 +#: ../gtk/calllogs.c:100 #, c-format msgid "" "%s\t%s\tQuality: %s\n" "%s\t%s %s\t" msgstr "" -#: ../gtk/calllogs.c:79 +#: ../gtk/calllogs.c:102 msgid "n/a" msgstr "" -#: ../gtk/conference.c:33 ../gtk/incall_view.c:183 +#: ../gtk/calllogs.c:105 +#, c-format +msgid "" +"%s\t%s\t\n" +"%s\t%s" +msgstr "" + +#: ../gtk/conference.c:33 ../gtk/main.ui.h:13 msgid "Conference" msgstr "" @@ -55,32 +77,31 @@ msgstr "Mikrofon av" msgid "Couldn't find pixmap file: %s" msgstr "Kunde inte hitta pixmap filen: %s" -#: ../gtk/chat.c:27 -#, c-format -msgid "Chat with %s" -msgstr "Chatta med %s" - -#: ../gtk/main.c:83 +#: ../gtk/main.c:89 msgid "log to stdout some debug information while running." msgstr "skriv loggning information under körning" -#: ../gtk/main.c:90 +#: ../gtk/main.c:96 msgid "path to a file to write logs into." msgstr "" -#: ../gtk/main.c:97 +#: ../gtk/main.c:103 +msgid "Start linphone with video disabled." +msgstr "" + +#: ../gtk/main.c:110 msgid "Start only in the system tray, do not show the main interface." msgstr "Starta ikonifierat, visa inte huvudfönstret" -#: ../gtk/main.c:104 +#: ../gtk/main.c:117 msgid "address to call right now" msgstr "Samtalsmottagare" -#: ../gtk/main.c:111 +#: ../gtk/main.c:124 msgid "if set automatically answer incoming calls" msgstr "Om på, besvara automatisk alla inkommande samtal" -#: ../gtk/main.c:118 +#: ../gtk/main.c:131 msgid "" "Specifiy a working directory (should be the base of the installation, eg: c:" "\\Program Files\\Linphone)" @@ -88,12 +109,12 @@ msgstr "" "Välj en arbetskatalog som ska vara basen för installationen, såsom C:" "\\Program\\Linphone" -#: ../gtk/main.c:464 +#: ../gtk/main.c:498 #, c-format msgid "Call with %s" msgstr "Samtal med %s" -#: ../gtk/main.c:815 +#: ../gtk/main.c:871 #, c-format msgid "" "%s would like to add you to his contact list.\n" @@ -106,7 +127,7 @@ msgstr "" "henne till din kontaktlista?\n" "Om du svarar nej, personen kommer att vara bannlyst." -#: ../gtk/main.c:893 +#: ../gtk/main.c:948 #, c-format msgid "" "Please enter your password for username %s\n" @@ -115,217 +136,235 @@ msgstr "" "Mata in ditt lösenord för användaren %s\n" "vid domänen %s:" -#: ../gtk/main.c:993 +#: ../gtk/main.c:1051 #, fuzzy msgid "Call error" msgstr "Samtalshistorik" -#: ../gtk/main.c:996 ../coreapi/linphonecore.c:2406 +#: ../gtk/main.c:1054 ../coreapi/linphonecore.c:2949 msgid "Call ended" msgstr "Samtalet slut" -#: ../gtk/main.c:999 ../coreapi/linphonecore.c:199 +#: ../gtk/main.c:1057 ../coreapi/linphonecore.c:244 msgid "Incoming call" msgstr "Inkommande samtal" -#: ../gtk/main.c:1001 ../gtk/incall_view.c:292 ../gtk/main.ui.h:20 +#: ../gtk/main.c:1059 ../gtk/incall_view.c:451 ../gtk/main.ui.h:6 msgid "Answer" msgstr "" -#: ../gtk/main.c:1003 ../gtk/main.ui.h:29 +#: ../gtk/main.c:1061 ../gtk/main.ui.h:7 msgid "Decline" msgstr "Avböj" -#: ../gtk/main.c:1009 +#: ../gtk/main.c:1067 #, fuzzy msgid "Call paused" msgstr "avbrytade" -#: ../gtk/main.c:1009 +#: ../gtk/main.c:1067 #, c-format msgid "by %s" msgstr "" -#: ../gtk/main.c:1165 +#: ../gtk/main.c:1116 +#, c-format +msgid "%s proposed to start video. Do you accept ?" +msgstr "" + +#: ../gtk/main.c:1278 msgid "Website link" msgstr "Webbsajt" -#: ../gtk/main.c:1205 +#: ../gtk/main.c:1318 msgid "Linphone - a video internet phone" msgstr "Linphone - en video Internet telefon" -#: ../gtk/main.c:1295 +#: ../gtk/main.c:1410 #, c-format msgid "%s (Default)" msgstr "%s (Default)" -#: ../gtk/main.c:1566 ../coreapi/callbacks.c:700 +#: ../gtk/main.c:1714 ../coreapi/callbacks.c:774 #, c-format msgid "We are transferred to %s" msgstr "" -#: ../gtk/main.c:1576 +#: ../gtk/main.c:1724 msgid "" "No sound cards have been detected on this computer.\n" "You won't be able to send or receive audio calls." msgstr "" -#: ../gtk/main.c:1663 +#: ../gtk/main.c:1833 msgid "A free SIP video-phone" msgstr "En gratis SIP video-telefon" -#: ../gtk/friendlist.c:203 +#: ../gtk/friendlist.c:335 msgid "Add to addressbook" msgstr "" -#: ../gtk/friendlist.c:258 ../gtk/propertybox.c:296 ../gtk/contact.ui.h:3 -msgid "Name" -msgstr "Namn" - -#: ../gtk/friendlist.c:271 +#: ../gtk/friendlist.c:509 msgid "Presence status" msgstr "Närvarostatus" -#: ../gtk/friendlist.c:308 +#: ../gtk/friendlist.c:526 ../gtk/propertybox.c:362 ../gtk/contact.ui.h:1 +msgid "Name" +msgstr "Namn" + +#: ../gtk/friendlist.c:538 +#, fuzzy +msgid "Call" +msgstr "Ringer %s" + +#: ../gtk/friendlist.c:543 +msgid "Chat" +msgstr "" + +#: ../gtk/friendlist.c:573 #, c-format msgid "Search in %s directory" msgstr "Sök i %s katalogen" -#: ../gtk/friendlist.c:568 +#: ../gtk/friendlist.c:730 msgid "Invalid sip contact !" msgstr "ogiltig SIP kontakt!" -#: ../gtk/friendlist.c:613 +#: ../gtk/friendlist.c:775 #, c-format msgid "Call %s" msgstr "Ringer %s" -#: ../gtk/friendlist.c:614 +#: ../gtk/friendlist.c:776 #, c-format msgid "Send text to %s" msgstr "Skicka text till %s" -#: ../gtk/friendlist.c:615 +#: ../gtk/friendlist.c:777 #, c-format msgid "Edit contact '%s'" msgstr "Ändra kontakt '%s'" -#: ../gtk/friendlist.c:616 +#: ../gtk/friendlist.c:778 #, c-format msgid "Delete contact '%s'" msgstr "Ta bort kontakt '%s'" -#: ../gtk/friendlist.c:658 +#: ../gtk/friendlist.c:820 #, c-format msgid "Add new contact from %s directory" msgstr "Lägg till kontakt ifrån %s katalogen" -#: ../gtk/propertybox.c:302 +#: ../gtk/propertybox.c:368 msgid "Rate (Hz)" msgstr "Frekvens (Hz)" -#: ../gtk/propertybox.c:308 +#: ../gtk/propertybox.c:374 msgid "Status" msgstr "Status" -#: ../gtk/propertybox.c:314 +#: ../gtk/propertybox.c:380 msgid "Min bitrate (kbit/s)" msgstr "Min. datahastighet (kbit/s)" -#: ../gtk/propertybox.c:321 +#: ../gtk/propertybox.c:387 msgid "Parameters" msgstr "Parametrar" -#: ../gtk/propertybox.c:364 ../gtk/propertybox.c:507 +#: ../gtk/propertybox.c:430 ../gtk/propertybox.c:573 msgid "Enabled" msgstr "På" -#: ../gtk/propertybox.c:366 ../gtk/propertybox.c:507 +#: ../gtk/propertybox.c:432 ../gtk/propertybox.c:573 msgid "Disabled" msgstr "Av" -#: ../gtk/propertybox.c:553 +#: ../gtk/propertybox.c:619 msgid "Account" msgstr "Konto" -#: ../gtk/propertybox.c:693 +#: ../gtk/propertybox.c:759 msgid "English" msgstr "Engelska" -#: ../gtk/propertybox.c:694 +#: ../gtk/propertybox.c:760 msgid "French" msgstr "Fransk" -#: ../gtk/propertybox.c:695 +#: ../gtk/propertybox.c:761 msgid "Swedish" msgstr "Svenska" -#: ../gtk/propertybox.c:696 +#: ../gtk/propertybox.c:762 msgid "Italian" msgstr "Italiensk" -#: ../gtk/propertybox.c:697 +#: ../gtk/propertybox.c:763 msgid "Spanish" msgstr "Spanska" -#: ../gtk/propertybox.c:698 +#: ../gtk/propertybox.c:764 msgid "Brazilian Portugese" msgstr "Portugisiska" -#: ../gtk/propertybox.c:699 +#: ../gtk/propertybox.c:765 msgid "Polish" msgstr "Polska" -#: ../gtk/propertybox.c:700 +#: ../gtk/propertybox.c:766 msgid "German" msgstr "Tyska" -#: ../gtk/propertybox.c:701 +#: ../gtk/propertybox.c:767 msgid "Russian" msgstr "Ryska" -#: ../gtk/propertybox.c:702 +#: ../gtk/propertybox.c:768 msgid "Japanese" msgstr "Japanska" -#: ../gtk/propertybox.c:703 +#: ../gtk/propertybox.c:769 msgid "Dutch" msgstr "Nederländksa" -#: ../gtk/propertybox.c:704 +#: ../gtk/propertybox.c:770 msgid "Hungarian" msgstr "Hungerska" -#: ../gtk/propertybox.c:705 +#: ../gtk/propertybox.c:771 msgid "Czech" msgstr "Tjekiska" -#: ../gtk/propertybox.c:706 +#: ../gtk/propertybox.c:772 msgid "Chinese" msgstr "Kinesiska" -#: ../gtk/propertybox.c:707 +#: ../gtk/propertybox.c:773 msgid "Traditional Chinese" msgstr "" -#: ../gtk/propertybox.c:708 +#: ../gtk/propertybox.c:774 msgid "Norwegian" msgstr "" -#: ../gtk/propertybox.c:765 +#: ../gtk/propertybox.c:775 +msgid "Hebrew" +msgstr "" + +#: ../gtk/propertybox.c:842 msgid "" "You need to restart linphone for the new language selection to take effect." msgstr "Du behöver starta om programmet för att det nya språket ska synas." -#: ../gtk/propertybox.c:835 +#: ../gtk/propertybox.c:912 msgid "None" msgstr "" -#: ../gtk/propertybox.c:839 +#: ../gtk/propertybox.c:916 msgid "SRTP" msgstr "" -#: ../gtk/propertybox.c:845 +#: ../gtk/propertybox.c:922 msgid "ZRTP" msgstr "" @@ -369,7 +408,7 @@ msgid_plural "Found %i contacts" msgstr[0] "Hittat kontakt %i" msgstr[1] "Hittat kontakt %i" -#: ../gtk/setupwizard.c:25 +#: ../gtk/setupwizard.c:33 msgid "" "Welcome !\n" "This assistant will help you to use a SIP account for your calls." @@ -377,171 +416,274 @@ msgstr "" "Välkommen!\n" "Assistenten kommer att hjälpa dig använda ett SIP konto för dina samtal:" -#: ../gtk/setupwizard.c:34 -msgid "Create an account by choosing a username" +#: ../gtk/setupwizard.c:42 +#, fuzzy +msgid "Create an account on linphone.org" msgstr "Skapa ett konto genom att välja ett användarnamn" -#: ../gtk/setupwizard.c:35 -msgid "I have already an account and just want to use it" +#: ../gtk/setupwizard.c:43 +#, fuzzy +msgid "I have already a linphone.org account and I just want to use it" msgstr "Jag har redan ett konto och vill bara använda det." -#: ../gtk/setupwizard.c:53 -msgid "Please choose a username:" -msgstr "Välj ett användarnamn:" +#: ../gtk/setupwizard.c:44 +#, fuzzy +msgid "I have already a sip account and I just want to use it" +msgstr "Jag har redan ett konto och vill bara använda det." -#: ../gtk/setupwizard.c:54 +#: ../gtk/setupwizard.c:84 +msgid "Enter your linphone.org username" +msgstr "" + +#: ../gtk/setupwizard.c:91 msgid "Username:" msgstr "Användarnamn:" -#: ../gtk/setupwizard.c:92 -#, c-format -msgid "Checking if '%s' is available..." -msgstr "Verifierar om '%s' är tillgänglig..." +#: ../gtk/setupwizard.c:93 ../gtk/password.ui.h:4 +msgid "Password:" +msgstr "Lösenord:" -#: ../gtk/setupwizard.c:97 ../gtk/setupwizard.c:164 -msgid "Please wait..." -msgstr "Var god dröj..." +#: ../gtk/setupwizard.c:113 +msgid "Enter your account informations" +msgstr "" -#: ../gtk/setupwizard.c:101 -msgid "Sorry this username already exists. Please try a new one." -msgstr "Användarnamnet finns redan, försök med ett nytt namn." +#: ../gtk/setupwizard.c:120 +#, fuzzy +msgid "Username*" +msgstr "Användarnamn" -#: ../gtk/setupwizard.c:103 ../gtk/setupwizard.c:168 -msgid "Ok !" -msgstr "Ok !" +#: ../gtk/setupwizard.c:121 +#, fuzzy +msgid "Password*" +msgstr "Lösenord" -#: ../gtk/setupwizard.c:106 ../gtk/setupwizard.c:171 -msgid "Communication problem, please try again later." -msgstr "Kommunikationsproblem, prova igen senare." +#: ../gtk/setupwizard.c:124 +msgid "Domain*" +msgstr "" -#: ../gtk/setupwizard.c:134 +#: ../gtk/setupwizard.c:125 +msgid "Proxy" +msgstr "" + +#: ../gtk/setupwizard.c:297 +msgid "(*) Required fields" +msgstr "" + +#: ../gtk/setupwizard.c:298 +#, fuzzy +msgid "Username: (*)" +msgstr "Användarnamn:" + +#: ../gtk/setupwizard.c:300 +#, fuzzy +msgid "Password: (*)" +msgstr "Lösenord:" + +#: ../gtk/setupwizard.c:302 +msgid "Email: (*)" +msgstr "" + +#: ../gtk/setupwizard.c:304 +msgid "Confirm your password: (*)" +msgstr "" + +#: ../gtk/setupwizard.c:368 +msgid "" +"Error, account not validated, username already used or server unreachable.\n" +"Please go back and try again." +msgstr "" + +#: ../gtk/setupwizard.c:379 msgid "Thank you. Your account is now configured and ready for use." msgstr "Tack. Ditt konto är nu konfigurerad och färdig att användas." -#: ../gtk/setupwizard.c:228 +#: ../gtk/setupwizard.c:387 +msgid "" +"Please validate your account by clicking on the link we just sent you by " +"email.\n" +"Then come back here and press Next button." +msgstr "" + +#: ../gtk/setupwizard.c:554 msgid "Welcome to the account setup assistant" msgstr "Välkommen till kontoinstallationsassistenten" -#: ../gtk/setupwizard.c:232 +#: ../gtk/setupwizard.c:559 msgid "Account setup assistant" msgstr "Kontoinstallationsassistenten" -#: ../gtk/setupwizard.c:236 -msgid "Choosing a username" -msgstr "Välj ditt användarnamn" +#: ../gtk/setupwizard.c:565 +#, fuzzy +msgid "Configure your account (step 1/1)" +msgstr "Konfigurera ett SIP konto" -#: ../gtk/setupwizard.c:240 -msgid "Verifying" -msgstr "Verifierar" +#: ../gtk/setupwizard.c:570 +msgid "Enter your sip username (step 1/1)" +msgstr "" -#: ../gtk/setupwizard.c:244 -msgid "Confirmation" -msgstr "Bekräftelse" +#: ../gtk/setupwizard.c:574 +msgid "Enter account information (step 1/2)" +msgstr "" -#: ../gtk/setupwizard.c:249 -msgid "Creating your account" -msgstr "Skapar ditt konto" +#: ../gtk/setupwizard.c:583 +msgid "Validation (step 2/2)" +msgstr "" -#: ../gtk/setupwizard.c:253 -msgid "Now ready !" -msgstr "Klar nu!" +#: ../gtk/setupwizard.c:588 +msgid "Error" +msgstr "" -#: ../gtk/incall_view.c:69 +#: ../gtk/setupwizard.c:592 +#, fuzzy +msgid "Terminating" +msgstr "Lägg på" + +#: ../gtk/incall_view.c:69 ../gtk/incall_view.c:90 #, fuzzy, c-format msgid "Call #%i" msgstr "Ringer %s" -#: ../gtk/incall_view.c:127 +#: ../gtk/incall_view.c:150 #, c-format msgid "Transfer to call #%i with %s" msgstr "" -#: ../gtk/incall_view.c:155 -msgid "Transfer" +#: ../gtk/incall_view.c:209 ../gtk/incall_view.c:212 +msgid "Not used" msgstr "" -#: ../gtk/incall_view.c:271 +#: ../gtk/incall_view.c:219 +msgid "ICE not activated" +msgstr "" + +#: ../gtk/incall_view.c:221 +#, fuzzy +msgid "ICE failed" +msgstr "Samtalet avböjdes." + +#: ../gtk/incall_view.c:223 +msgid "ICE in progress" +msgstr "" + +#: ../gtk/incall_view.c:225 +msgid "Going through one or more NATs" +msgstr "" + +#: ../gtk/incall_view.c:227 +#, fuzzy +msgid "Direct" +msgstr "Omdirigerat till %s..." + +#: ../gtk/incall_view.c:229 +msgid "Through a relay server" +msgstr "" + +#: ../gtk/incall_view.c:238 ../gtk/incall_view.c:242 +#, c-format +msgid "" +"download: %f\n" +"upload: %f (kbit/s)" +msgstr "" + +#: ../gtk/incall_view.c:341 ../gtk/main.ui.h:12 +msgid "Hang up" +msgstr "" + +#: ../gtk/incall_view.c:430 msgid "Calling..." msgstr "Ringer..." -#: ../gtk/incall_view.c:274 ../gtk/incall_view.c:482 +#: ../gtk/incall_view.c:433 ../gtk/incall_view.c:646 msgid "00::00::00" msgstr "00:00:00" -#: ../gtk/incall_view.c:285 +#: ../gtk/incall_view.c:444 #, fuzzy msgid "Incoming call" msgstr "Inkommande samtal" -#: ../gtk/incall_view.c:322 +#: ../gtk/incall_view.c:481 msgid "good" msgstr "" -#: ../gtk/incall_view.c:324 +#: ../gtk/incall_view.c:483 msgid "average" msgstr "" -#: ../gtk/incall_view.c:326 +#: ../gtk/incall_view.c:485 msgid "poor" msgstr "" -#: ../gtk/incall_view.c:328 +#: ../gtk/incall_view.c:487 msgid "very poor" msgstr "" -#: ../gtk/incall_view.c:330 +#: ../gtk/incall_view.c:489 msgid "too bad" msgstr "" -#: ../gtk/incall_view.c:331 ../gtk/incall_view.c:347 +#: ../gtk/incall_view.c:490 ../gtk/incall_view.c:506 msgid "unavailable" msgstr "" -#: ../gtk/incall_view.c:447 +#: ../gtk/incall_view.c:605 msgid "Secured by SRTP" msgstr "" -#: ../gtk/incall_view.c:453 +#: ../gtk/incall_view.c:611 #, c-format msgid "Secured by ZRTP - [auth token: %s]" msgstr "" -#: ../gtk/incall_view.c:459 +#: ../gtk/incall_view.c:617 msgid "Set unverified" msgstr "" -#: ../gtk/incall_view.c:459 ../gtk/main.ui.h:49 +#: ../gtk/incall_view.c:617 ../gtk/main.ui.h:5 msgid "Set verified" msgstr "" -#: ../gtk/incall_view.c:480 +#: ../gtk/incall_view.c:641 msgid "In conference" msgstr "" -#: ../gtk/incall_view.c:480 +#: ../gtk/incall_view.c:641 #, fuzzy msgid "In call" msgstr "I samtal med" -#: ../gtk/incall_view.c:499 +#: ../gtk/incall_view.c:669 #, fuzzy msgid "Paused call" msgstr "Lägg på" -#: ../gtk/incall_view.c:511 +#: ../gtk/incall_view.c:682 #, c-format msgid "%02i::%02i::%02i" msgstr "%02i:%02i:%02i" -#: ../gtk/incall_view.c:527 +#: ../gtk/incall_view.c:699 msgid "Call ended." msgstr "Samtalet slut." -#: ../gtk/incall_view.c:584 +#: ../gtk/incall_view.c:731 +msgid "Transfer in progress" +msgstr "" + +#: ../gtk/incall_view.c:734 +msgid "Transfer done." +msgstr "" + +#: ../gtk/incall_view.c:737 +#, fuzzy +msgid "Transfer failed." +msgstr "Samtalet avböjdes." + +#: ../gtk/incall_view.c:781 msgid "Resume" msgstr "" -#: ../gtk/incall_view.c:591 ../gtk/main.ui.h:45 +#: ../gtk/incall_view.c:788 ../gtk/main.ui.h:9 msgid "Pause" msgstr "" @@ -551,237 +693,251 @@ msgid "Please enter login information for %s" msgstr "Mata in ditt lösenord för domänen %s:" #: ../gtk/main.ui.h:1 -msgid "#" -msgstr "" - -#: ../gtk/main.ui.h:2 -msgid "*" -msgstr "" - -#: ../gtk/main.ui.h:3 -msgid "0" -msgstr "" - -#: ../gtk/main.ui.h:4 -msgid "1" -msgstr "" - -#: ../gtk/main.ui.h:5 -msgid "2" -msgstr "" - -#: ../gtk/main.ui.h:6 -msgid "3" -msgstr "" - -#: ../gtk/main.ui.h:7 -msgid "4" -msgstr "" - -#: ../gtk/main.ui.h:8 -msgid "5" -msgstr "" - -#: ../gtk/main.ui.h:9 -msgid "6" -msgstr "" - -#: ../gtk/main.ui.h:10 -msgid "7" -msgstr "" - -#: ../gtk/main.ui.h:11 -msgid "8" -msgstr "" - -#: ../gtk/main.ui.h:12 -msgid "9" -msgstr "" - -#: ../gtk/main.ui.h:13 -msgid "Add contacts from directory" -msgstr "Lägg till kontakt ifrån katalogen" - -#: ../gtk/main.ui.h:14 #, fuzzy msgid "Callee name" msgstr "Samtalet slut." +#: ../gtk/main.ui.h:2 +msgid "Send" +msgstr "Skicka" + +#: ../gtk/main.ui.h:3 +msgid "End conference" +msgstr "" + +#: ../gtk/main.ui.h:4 +msgid "label" +msgstr "etikett" + +#: ../gtk/main.ui.h:8 +msgid "Video" +msgstr "" + +#: ../gtk/main.ui.h:10 +msgid "Mute" +msgstr "" + +#: ../gtk/main.ui.h:11 +msgid "Transfer" +msgstr "" + +#: ../gtk/main.ui.h:14 +msgid "In call" +msgstr "I samtal" + #: ../gtk/main.ui.h:15 -msgid "Welcome !" -msgstr "Välkommen!" +msgid "Duration" +msgstr "Förlopp" #: ../gtk/main.ui.h:16 -msgid "A" -msgstr "" - -#: ../gtk/main.ui.h:17 -msgid "ADSL" -msgstr "" - -#: ../gtk/main.ui.h:18 -#, fuzzy -msgid "Add contact" -msgstr "Hittat kontakt %i" - -#: ../gtk/main.ui.h:19 -msgid "All users" -msgstr "" - -#: ../gtk/main.ui.h:21 -msgid "Automatically log me in" -msgstr "Logga mig automatiskt" - -#: ../gtk/main.ui.h:22 -msgid "B" -msgstr "" - -#: ../gtk/main.ui.h:23 ../gtk/parameters.ui.h:21 -msgid "C" -msgstr "" - -#: ../gtk/main.ui.h:24 -#, fuzzy -msgid "Call" -msgstr "Ringer %s" - -#: ../gtk/main.ui.h:25 msgid "Call quality rating" msgstr "" -#: ../gtk/main.ui.h:26 +#: ../gtk/main.ui.h:17 +msgid "_Options" +msgstr "" + +#: ../gtk/main.ui.h:18 +msgid "Always start video" +msgstr "" + +#: ../gtk/main.ui.h:19 +msgid "Enable self-view" +msgstr "Själv bild" + +#: ../gtk/main.ui.h:20 +msgid "_Help" +msgstr "" + +#: ../gtk/main.ui.h:21 +#, fuzzy +msgid "Show debug window" +msgstr "Linphone debug fönster" + +#: ../gtk/main.ui.h:22 +#, fuzzy +msgid "_Homepage" +msgstr "Hemsidan" + +#: ../gtk/main.ui.h:23 #, fuzzy msgid "Check _Updates" msgstr "Letar efter uppdateringar" -#: ../gtk/main.ui.h:27 +#: ../gtk/main.ui.h:24 #, fuzzy -msgid "Contacts" -msgstr "Kontaktar" +msgid "Account assistant" +msgstr "Kontoinstallationsassistenten" -#: ../gtk/main.ui.h:28 +#: ../gtk/main.ui.h:25 +msgid "SIP address or phone number:" +msgstr "Användarnamn" + +#: ../gtk/main.ui.h:26 +msgid "Initiate a new call" +msgstr "" + +#: ../gtk/main.ui.h:27 ../gtk/parameters.ui.h:48 +msgid "Add" +msgstr "Lägg till" + +#: ../gtk/main.ui.h:28 ../gtk/parameters.ui.h:49 +msgid "Edit" +msgstr "Editera" + +#: ../gtk/main.ui.h:29 msgid "D" msgstr "" #: ../gtk/main.ui.h:30 -#, fuzzy -msgid "Default" -msgstr "%s (Default)" +msgid "#" +msgstr "" #: ../gtk/main.ui.h:31 -msgid "Duration" -msgstr "Förlopp" +msgid "0" +msgstr "" #: ../gtk/main.ui.h:32 -msgid "Enable self-view" -msgstr "Själv bild" +msgid "*" +msgstr "" -#: ../gtk/main.ui.h:33 -#, fuzzy -msgid "Enable video" -msgstr "På" +#: ../gtk/main.ui.h:33 ../gtk/parameters.ui.h:7 +msgid "C" +msgstr "" #: ../gtk/main.ui.h:34 -msgid "Enter username, phone number, or full sip address" -msgstr "Mata in användarnamn, telefonnummer eller SIP adress" +msgid "9" +msgstr "" #: ../gtk/main.ui.h:35 -#, fuzzy -msgid "Fiber Channel" +msgid "8" msgstr "" -"ADSL\n" -"Fiber" #: ../gtk/main.ui.h:36 -msgid "In call" -msgstr "I samtal" +msgid "7" +msgstr "" #: ../gtk/main.ui.h:37 -msgid "Initiate a new call" +msgid "B" msgstr "" #: ../gtk/main.ui.h:38 -msgid "Internet connection:" -msgstr "Internet förbindelse:" +msgid "6" +msgstr "" #: ../gtk/main.ui.h:39 -msgid "Keypad" +msgid "5" msgstr "" #: ../gtk/main.ui.h:40 -msgid "Login information" -msgstr "Login information" +msgid "4" +msgstr "" #: ../gtk/main.ui.h:41 -msgid "Lookup:" -msgstr "Sök:" +msgid "A" +msgstr "" #: ../gtk/main.ui.h:42 +msgid "3" +msgstr "" + +#: ../gtk/main.ui.h:43 +msgid "2" +msgstr "" + +#: ../gtk/main.ui.h:44 +msgid "1" +msgstr "" + +#: ../gtk/main.ui.h:45 +msgid "Search" +msgstr "Sök" + +#: ../gtk/main.ui.h:46 +msgid "Add contacts from directory" +msgstr "Lägg till kontakt ifrån katalogen" + +#: ../gtk/main.ui.h:47 +#, fuzzy +msgid "Add contact" +msgstr "Hittat kontakt %i" + +#: ../gtk/main.ui.h:48 +msgid "Keypad" +msgstr "" + +#: ../gtk/main.ui.h:49 +#, fuzzy +msgid "Recent calls" +msgstr "I samtal" + +#: ../gtk/main.ui.h:50 msgid "My current identity:" msgstr "Min nuvarande identitet" -#: ../gtk/main.ui.h:43 +#: ../gtk/main.ui.h:51 ../gtk/tunnel_config.ui.h:7 +msgid "Username" +msgstr "Användarnamn" + +#: ../gtk/main.ui.h:52 ../gtk/tunnel_config.ui.h:8 +msgid "Password" +msgstr "Lösenord" + +#: ../gtk/main.ui.h:53 +msgid "Internet connection:" +msgstr "Internet förbindelse:" + +#: ../gtk/main.ui.h:54 +msgid "Automatically log me in" +msgstr "Logga mig automatiskt" + +#: ../gtk/main.ui.h:55 +msgid "Login information" +msgstr "Login information" + +#: ../gtk/main.ui.h:56 +msgid "Welcome !" +msgstr "Välkommen!" + +#: ../gtk/main.ui.h:57 +msgid "All users" +msgstr "" + +#: ../gtk/main.ui.h:58 #, fuzzy msgid "Online users" msgstr "" "Alla användare\n" "Online användare" -#: ../gtk/main.ui.h:44 -msgid "Password" -msgstr "Lösenord" - -#: ../gtk/main.ui.h:46 -#, fuzzy -msgid "Recent calls" -msgstr "I samtal" - -#: ../gtk/main.ui.h:47 -msgid "SIP address or phone number:" -msgstr "Användarnamn" - -#: ../gtk/main.ui.h:48 -msgid "Search" -msgstr "Sök" - -#: ../gtk/main.ui.h:50 -#, fuzzy -msgid "Show debug window" -msgstr "Linphone debug fönster" - -#: ../gtk/main.ui.h:51 -msgid "Username" -msgstr "Användarnamn" - -#: ../gtk/main.ui.h:52 -msgid "_Help" +#: ../gtk/main.ui.h:59 +msgid "ADSL" msgstr "" -#: ../gtk/main.ui.h:53 +#: ../gtk/main.ui.h:60 #, fuzzy -msgid "_Homepage" -msgstr "Hemsidan" - -#: ../gtk/main.ui.h:54 -msgid "_Options" +msgid "Fiber Channel" msgstr "" +"ADSL\n" +"Fiber" -#: ../gtk/main.ui.h:55 -msgid "in" -msgstr "i" +#: ../gtk/main.ui.h:61 +#, fuzzy +msgid "Default" +msgstr "%s (Default)" -#: ../gtk/main.ui.h:56 -msgid "label" -msgstr "etikett" +#: ../gtk/main.ui.h:62 +msgid "Delete" +msgstr "" #: ../gtk/about.ui.h:1 -msgid "(C) Belledonne Communications,2010\n" -msgstr "" - -#: ../gtk/about.ui.h:3 msgid "About linphone" msgstr "Apropå linphone" +#: ../gtk/about.ui.h:2 +msgid "(C) Belledonne Communications,2010\n" +msgstr "" + #: ../gtk/about.ui.h:4 msgid "An internet video phone using the standard SIP (rfc3261) protocol." msgstr "En Internet video telefon baserat på SIP protokoll." @@ -801,385 +957,386 @@ msgid "" "hu: anonymous\n" msgstr "" -#: ../gtk/contact.ui.h:1 -msgid "Contact information" -msgstr "Kontakt information" - #: ../gtk/contact.ui.h:2 -msgid "Allow this contact to see my presence status" -msgstr "Tillåt den här kontakten att se min närvarostatus" - -#: ../gtk/contact.ui.h:4 msgid "SIP Address" msgstr "SIP Adress" -#: ../gtk/contact.ui.h:5 +#: ../gtk/contact.ui.h:3 msgid "Show this contact presence status" msgstr "Visa kontaktens närvarostatus" +#: ../gtk/contact.ui.h:4 +msgid "Allow this contact to see my presence status" +msgstr "Tillåt den här kontakten att se min närvarostatus" + +#: ../gtk/contact.ui.h:5 +msgid "Contact information" +msgstr "Kontakt information" + #: ../gtk/log.ui.h:1 msgid "Linphone debug window" msgstr "Linphone debug fönster" +#: ../gtk/log.ui.h:2 +msgid "Scroll to end" +msgstr "" + #: ../gtk/password.ui.h:1 #, fuzzy msgid "Linphone - Authentication required" msgstr "Linphone - Autentisering krävs" #: ../gtk/password.ui.h:2 -msgid "Password:" -msgstr "Lösenord:" - -#: ../gtk/password.ui.h:3 msgid "Please enter the domain password" msgstr "Mata in lösenordet för domänen" -#: ../gtk/password.ui.h:4 +#: ../gtk/password.ui.h:3 msgid "UserID" msgstr "AnvändarID" #: ../gtk/call_logs.ui.h:1 +msgid "Call history" +msgstr "Samtalshistorik" + +#: ../gtk/call_logs.ui.h:2 +msgid "Clear all" +msgstr "" + +#: ../gtk/call_logs.ui.h:3 #, fuzzy msgid "Call back" msgstr "Ringer %s" -#: ../gtk/call_logs.ui.h:2 -msgid "Call history" -msgstr "Samtalshistorik" - -#: ../gtk/call_logs.ui.h:3 -msgid "Clear all" -msgstr "" - #: ../gtk/sip_account.ui.h:1 -msgid "Configure a SIP account" -msgstr "Konfigurera ett SIP konto" - -#: ../gtk/sip_account.ui.h:2 msgid "Linphone - Configure a SIP account" msgstr "Linphone - Konfigurera ett SIP konto" -#: ../gtk/sip_account.ui.h:3 -msgid "Looks like sip:" -msgstr "" - -#: ../gtk/sip_account.ui.h:4 -msgid "Looks like sip:@" -msgstr "" - -#: ../gtk/sip_account.ui.h:5 -msgid "Publish presence information" -msgstr "Publicera närvaro information" - -#: ../gtk/sip_account.ui.h:6 -msgid "Register" -msgstr "" - -#: ../gtk/sip_account.ui.h:7 -msgid "Registration duration (sec):" -msgstr "Registreringsfrekvens (sek.):" - -#: ../gtk/sip_account.ui.h:8 -msgid "Route (optional):" -msgstr "Route (tillval):" - -#: ../gtk/sip_account.ui.h:9 -msgid "SIP Proxy address:" -msgstr "SIP Proxy adress:" - -#: ../gtk/sip_account.ui.h:10 +#: ../gtk/sip_account.ui.h:2 msgid "Your SIP identity:" msgstr "Din SIP identitet:" -#: ../gtk/sip_account.ui.h:11 +#: ../gtk/sip_account.ui.h:3 +msgid "Looks like sip:@" +msgstr "" + +#: ../gtk/sip_account.ui.h:4 msgid "sip:" msgstr "sip:" -#: ../gtk/chatroom.ui.h:1 -msgid "Send" -msgstr "Skicka" +#: ../gtk/sip_account.ui.h:5 +msgid "SIP Proxy address:" +msgstr "SIP Proxy adress:" + +#: ../gtk/sip_account.ui.h:6 +msgid "Looks like sip:" +msgstr "" + +#: ../gtk/sip_account.ui.h:7 +msgid "Route (optional):" +msgstr "Route (tillval):" + +#: ../gtk/sip_account.ui.h:8 +msgid "Registration duration (sec):" +msgstr "Registreringsfrekvens (sek.):" + +#: ../gtk/sip_account.ui.h:9 +msgid "Register" +msgstr "" + +#: ../gtk/sip_account.ui.h:10 +msgid "Publish presence information" +msgstr "Publicera närvaro information" + +#: ../gtk/sip_account.ui.h:11 +msgid "Configure a SIP account" +msgstr "Konfigurera ett SIP konto" #: ../gtk/parameters.ui.h:1 -msgid "0 stands for \"unlimited\"" -msgstr "0 står för \"utan begränsning\"" +msgid "default soundcard" +msgstr "default ljudkort" #: ../gtk/parameters.ui.h:2 -msgid "Audio" -msgstr "Audio" +#, fuzzy +msgid "a sound card" +msgstr "ett ljud kort\n" #: ../gtk/parameters.ui.h:3 -msgid "Bandwidth control" -msgstr "Bandbreddskontroll" +msgid "default camera" +msgstr "default kamera" #: ../gtk/parameters.ui.h:4 -msgid "Codecs" -msgstr "Codecs" +msgid "CIF" +msgstr "" #: ../gtk/parameters.ui.h:5 -msgid "Default identity" -msgstr "Default identitet" - -#: ../gtk/parameters.ui.h:6 -msgid "Language" -msgstr "Språk" - -#: ../gtk/parameters.ui.h:7 -msgid "Level" -msgstr "Nivå" - -#: ../gtk/parameters.ui.h:8 -msgid "NAT and Firewall" -msgstr "NAT och Brandvägg" - -#: ../gtk/parameters.ui.h:9 -msgid "Network protocol and ports" -msgstr "" - -#: ../gtk/parameters.ui.h:10 -msgid "Privacy" -msgstr "Integritet" - -#: ../gtk/parameters.ui.h:11 -msgid "Proxy accounts" -msgstr "Proxy konton" - -#: ../gtk/parameters.ui.h:12 -msgid "Transport" -msgstr "Transport" - -#: ../gtk/parameters.ui.h:13 -msgid "Video" -msgstr "Video" - -#: ../gtk/parameters.ui.h:14 -msgid "" -"Adaptive rate control is a technique to dynamically guess the available " -"bandwidth during a call." -msgstr "" - -#: ../gtk/parameters.ui.h:15 -msgid "ALSA special device (optional):" -msgstr "ALSA speciell enhet (tillval):" - -#: ../gtk/parameters.ui.h:16 -msgid "Add" -msgstr "Lägg till" - -#: ../gtk/parameters.ui.h:17 -msgid "Audio RTP/UDP:" -msgstr "" - -#: ../gtk/parameters.ui.h:18 #, fuzzy msgid "Audio codecs" msgstr "" "Audio codecs\n" "Video codecs" -#: ../gtk/parameters.ui.h:19 -msgid "Behind NAT / Firewall (specify gateway IP below)" -msgstr "Bakom en NAT / brandvägg (specificera gatewap IP adress nedan)" - -#: ../gtk/parameters.ui.h:20 -msgid "Behind NAT / Firewall (use STUN to resolve)" -msgstr "Bakom en NAT / brandvägg (använd STUN för att avgöra adressen)" - -#: ../gtk/parameters.ui.h:22 -msgid "CIF" -msgstr "" - -#: ../gtk/parameters.ui.h:23 -msgid "Capture device:" -msgstr "Mikrofon enhet:" - -#: ../gtk/parameters.ui.h:24 -msgid "Codecs" -msgstr "Codecs" - -#: ../gtk/parameters.ui.h:25 -msgid "Direct connection to the Internet" -msgstr "Direkt förbindelse till Internet" - -#: ../gtk/parameters.ui.h:26 -msgid "Disable" -msgstr "Inaktivera" - -#: ../gtk/parameters.ui.h:27 -msgid "Done" -msgstr "Klar" - -#: ../gtk/parameters.ui.h:28 -msgid "Download speed limit in Kbit/sec:" -msgstr "Max downstream bandbreddshastighet i kbit/sek:" - -#: ../gtk/parameters.ui.h:29 -msgid "Edit" -msgstr "Editera" - -#: ../gtk/parameters.ui.h:30 -msgid "Enable" -msgstr "Möjliggör" - -#: ../gtk/parameters.ui.h:31 -msgid "Enable adaptive rate control" -msgstr "" - -#: ../gtk/parameters.ui.h:32 -msgid "Enable echo cancellation" -msgstr "Tillåta ekokancellering" - -#: ../gtk/parameters.ui.h:33 -msgid "Erase all passwords" -msgstr "Glöm alla lösenord" - -#: ../gtk/parameters.ui.h:34 -msgid "Manage SIP Accounts" -msgstr "Hantera SIP konton" - -#: ../gtk/parameters.ui.h:35 -msgid "Media encryption type" -msgstr "" - -#: ../gtk/parameters.ui.h:36 -msgid "Multimedia settings" -msgstr "Multimedia inställningar" - -#: ../gtk/parameters.ui.h:37 -msgid "Network settings" -msgstr "Nätverksinställningar" - -#: ../gtk/parameters.ui.h:38 -msgid "Playback device:" -msgstr "Uppspelningsenhet:" - -#: ../gtk/parameters.ui.h:39 -msgid "Prefered video resolution:" -msgstr "Video upplösning:" - -#: ../gtk/parameters.ui.h:40 -msgid "Public IP address:" -msgstr "Publik IP adress:" - -#: ../gtk/parameters.ui.h:41 -msgid "" -"Register to FONICS\n" -"virtual network !" -msgstr "" -"Registrera hos FONICS\n" -"virtuella nätverk!" - -#: ../gtk/parameters.ui.h:43 -msgid "Remove" -msgstr "Ta bort" - -#: ../gtk/parameters.ui.h:44 -msgid "Ring device:" -msgstr "Ringning enhet:" - -#: ../gtk/parameters.ui.h:45 -msgid "Ring sound:" -msgstr "Ring signal:" - -#: ../gtk/parameters.ui.h:46 -msgid "SIP (TCP)" -msgstr "" - -#: ../gtk/parameters.ui.h:47 -msgid "SIP (TLS)" -msgstr "" - -#: ../gtk/parameters.ui.h:48 -msgid "SIP (UDP)" -msgstr "" - -#: ../gtk/parameters.ui.h:49 -msgid "Send DTMFs as SIP info" -msgstr "Kicka DTMF koder som SIP info" - -#: ../gtk/parameters.ui.h:50 -msgid "Set Maximum Transmission Unit:" -msgstr "Välj MTU (Maximum Transmission Unit):" - -#: ../gtk/parameters.ui.h:51 -msgid "Settings" -msgstr "Inställningar" - -#: ../gtk/parameters.ui.h:52 -msgid "Show advanced settings" -msgstr "Visa avancerade inställningar" - -#: ../gtk/parameters.ui.h:53 -msgid "Stun server:" -msgstr "STUN server:" - -#: ../gtk/parameters.ui.h:54 -msgid "This section defines your SIP address when not using a SIP account" -msgstr "" -"Denna sektion specificerar din SIP adress när du inte använder ett SIP konto" - -#: ../gtk/parameters.ui.h:55 -msgid "Upload speed limit in Kbit/sec:" -msgstr "Max upstream bandbreddshastighet i kbit/sek:" - -#: ../gtk/parameters.ui.h:56 -msgid "Use IPv6 instead of IPv4" -msgstr "Använd IPv6 istället av IPv4" - -#: ../gtk/parameters.ui.h:57 -msgid "User interface" -msgstr "Användarinterface" - -#: ../gtk/parameters.ui.h:58 -msgid "Video RTP/UDP:" -msgstr "" - -#: ../gtk/parameters.ui.h:59 +#: ../gtk/parameters.ui.h:6 #, fuzzy msgid "Video codecs" msgstr "" "Audio codecs\n" "Video codecs" -#: ../gtk/parameters.ui.h:60 +#: ../gtk/parameters.ui.h:8 +msgid "SIP (UDP)" +msgstr "" + +#: ../gtk/parameters.ui.h:9 +msgid "SIP (TCP)" +msgstr "" + +#: ../gtk/parameters.ui.h:10 +msgid "SIP (TLS)" +msgstr "" + +#: ../gtk/parameters.ui.h:11 +msgid "Settings" +msgstr "Inställningar" + +#: ../gtk/parameters.ui.h:12 +msgid "Set Maximum Transmission Unit:" +msgstr "Välj MTU (Maximum Transmission Unit):" + +#: ../gtk/parameters.ui.h:13 +msgid "Send DTMFs as SIP info" +msgstr "Kicka DTMF koder som SIP info" + +#: ../gtk/parameters.ui.h:14 +msgid "Use IPv6 instead of IPv4" +msgstr "Använd IPv6 istället av IPv4" + +#: ../gtk/parameters.ui.h:15 +msgid "Transport" +msgstr "Transport" + +#: ../gtk/parameters.ui.h:16 +msgid "Media encryption type" +msgstr "" + +#: ../gtk/parameters.ui.h:17 +msgid "Tunnel" +msgstr "" + +#: ../gtk/parameters.ui.h:18 +msgid "Video RTP/UDP:" +msgstr "" + +#: ../gtk/parameters.ui.h:19 +msgid "Audio RTP/UDP:" +msgstr "" + +#: ../gtk/parameters.ui.h:20 +msgid "DSCP fields" +msgstr "" + +#: ../gtk/parameters.ui.h:21 +msgid "Fixed" +msgstr "" + +#: ../gtk/parameters.ui.h:22 +msgid "Network protocol and ports" +msgstr "" + +#: ../gtk/parameters.ui.h:23 +msgid "Direct connection to the Internet" +msgstr "Direkt förbindelse till Internet" + +#: ../gtk/parameters.ui.h:24 +msgid "Behind NAT / Firewall (specify gateway IP below)" +msgstr "Bakom en NAT / brandvägg (specificera gatewap IP adress nedan)" + +#: ../gtk/parameters.ui.h:25 +msgid "Public IP address:" +msgstr "Publik IP adress:" + +#: ../gtk/parameters.ui.h:26 +msgid "Behind NAT / Firewall (use STUN to resolve)" +msgstr "Bakom en NAT / brandvägg (använd STUN för att avgöra adressen)" + +#: ../gtk/parameters.ui.h:27 +#, fuzzy +msgid "Behind NAT / Firewall (use ICE)" +msgstr "Bakom en NAT / brandvägg (använd STUN för att avgöra adressen)" + +#: ../gtk/parameters.ui.h:28 +msgid "Stun server:" +msgstr "STUN server:" + +#: ../gtk/parameters.ui.h:29 +msgid "NAT and Firewall" +msgstr "NAT och Brandvägg" + +#: ../gtk/parameters.ui.h:30 +msgid "Network settings" +msgstr "Nätverksinställningar" + +#: ../gtk/parameters.ui.h:31 +msgid "Ring sound:" +msgstr "Ring signal:" + +#: ../gtk/parameters.ui.h:32 +msgid "ALSA special device (optional):" +msgstr "ALSA speciell enhet (tillval):" + +#: ../gtk/parameters.ui.h:33 +msgid "Capture device:" +msgstr "Mikrofon enhet:" + +#: ../gtk/parameters.ui.h:34 +msgid "Ring device:" +msgstr "Ringning enhet:" + +#: ../gtk/parameters.ui.h:35 +msgid "Playback device:" +msgstr "Uppspelningsenhet:" + +#: ../gtk/parameters.ui.h:36 +msgid "Enable echo cancellation" +msgstr "Tillåta ekokancellering" + +#: ../gtk/parameters.ui.h:37 +msgid "Audio" +msgstr "Audio" + +#: ../gtk/parameters.ui.h:38 msgid "Video input device:" msgstr "Video ingångsenhet:" -#: ../gtk/parameters.ui.h:61 +#: ../gtk/parameters.ui.h:39 +msgid "Prefered video resolution:" +msgstr "Video upplösning:" + +#: ../gtk/parameters.ui.h:40 +msgid "Video" +msgstr "Video" + +#: ../gtk/parameters.ui.h:41 +msgid "Multimedia settings" +msgstr "Multimedia inställningar" + +#: ../gtk/parameters.ui.h:42 +msgid "This section defines your SIP address when not using a SIP account" +msgstr "" +"Denna sektion specificerar din SIP adress när du inte använder ett SIP konto" + +#: ../gtk/parameters.ui.h:43 msgid "Your display name (eg: John Doe):" msgstr "Ditt synliga namn, e.g. Kalle Karlsson:" -#: ../gtk/parameters.ui.h:62 -msgid "Your resulting SIP address:" -msgstr "Din SIP adress:" - -#: ../gtk/parameters.ui.h:63 +#: ../gtk/parameters.ui.h:44 msgid "Your username:" msgstr "Ditt användarnamn:" +#: ../gtk/parameters.ui.h:45 +msgid "Your resulting SIP address:" +msgstr "Din SIP adress:" + +#: ../gtk/parameters.ui.h:46 +msgid "Default identity" +msgstr "Default identitet" + +#: ../gtk/parameters.ui.h:47 +msgid "Wizard" +msgstr "" + +#: ../gtk/parameters.ui.h:50 +msgid "Remove" +msgstr "Ta bort" + +#: ../gtk/parameters.ui.h:51 +msgid "Proxy accounts" +msgstr "Proxy konton" + +#: ../gtk/parameters.ui.h:52 +msgid "Erase all passwords" +msgstr "Glöm alla lösenord" + +#: ../gtk/parameters.ui.h:53 +msgid "Privacy" +msgstr "Integritet" + +#: ../gtk/parameters.ui.h:54 +msgid "Manage SIP Accounts" +msgstr "Hantera SIP konton" + +#: ../gtk/parameters.ui.h:55 ../gtk/tunnel_config.ui.h:4 +msgid "Enable" +msgstr "Möjliggör" + +#: ../gtk/parameters.ui.h:56 ../gtk/tunnel_config.ui.h:5 +msgid "Disable" +msgstr "Inaktivera" + +#: ../gtk/parameters.ui.h:57 +msgid "Codecs" +msgstr "Codecs" + +#: ../gtk/parameters.ui.h:58 +msgid "0 stands for \"unlimited\"" +msgstr "0 står för \"utan begränsning\"" + +#: ../gtk/parameters.ui.h:59 +msgid "Upload speed limit in Kbit/sec:" +msgstr "Max upstream bandbreddshastighet i kbit/sek:" + +#: ../gtk/parameters.ui.h:60 +msgid "Download speed limit in Kbit/sec:" +msgstr "Max downstream bandbreddshastighet i kbit/sek:" + +#: ../gtk/parameters.ui.h:61 +msgid "Enable adaptive rate control" +msgstr "" + +#: ../gtk/parameters.ui.h:62 +msgid "" +"Adaptive rate control is a technique to dynamically guess the available " +"bandwidth during a call." +msgstr "" + +#: ../gtk/parameters.ui.h:63 +msgid "Bandwidth control" +msgstr "Bandbreddskontroll" + #: ../gtk/parameters.ui.h:64 -#, fuzzy -msgid "a sound card" -msgstr "ett ljud kort\n" +msgid "Codecs" +msgstr "Codecs" #: ../gtk/parameters.ui.h:65 -msgid "default camera" -msgstr "default kamera" +msgid "Language" +msgstr "Språk" #: ../gtk/parameters.ui.h:66 -msgid "default soundcard" -msgstr "default ljudkort" +msgid "Show advanced settings" +msgstr "Visa avancerade inställningar" + +#: ../gtk/parameters.ui.h:67 +msgid "Level" +msgstr "Nivå" + +#: ../gtk/parameters.ui.h:68 +msgid "User interface" +msgstr "Användarinterface" + +#: ../gtk/parameters.ui.h:69 +msgid "Done" +msgstr "Klar" #: ../gtk/buddylookup.ui.h:1 -msgid "Search somebody" -msgstr "Sök efter kontakter" +msgid "Search contacts in directory" +msgstr "Sök för kontakter i katalogen" #: ../gtk/buddylookup.ui.h:2 msgid "Add to my list" msgstr "Lägg till min lista" #: ../gtk/buddylookup.ui.h:3 -msgid "Search contacts in directory" -msgstr "Sök för kontakter i katalogen" +msgid "Search somebody" +msgstr "Sök efter kontakter" #: ../gtk/waiting.ui.h:1 msgid "Linphone" @@ -1189,19 +1346,97 @@ msgstr "Linphone" msgid "Please wait" msgstr "Vänta" -#: ../coreapi/linphonecore.c:187 +#: ../gtk/dscp_settings.ui.h:1 +#, fuzzy +msgid "Dscp settings" +msgstr "Inställningar" + +#: ../gtk/dscp_settings.ui.h:2 +msgid "SIP" +msgstr "" + +#: ../gtk/dscp_settings.ui.h:3 +msgid "Audio RTP stream" +msgstr "" + +#: ../gtk/dscp_settings.ui.h:4 +msgid "Video RTP stream" +msgstr "" + +#: ../gtk/dscp_settings.ui.h:5 +msgid "Set DSCP values (in hexadecimal)" +msgstr "" + +#: ../gtk/call_statistics.ui.h:1 +#, fuzzy +msgid "Call statistics" +msgstr "Ringer %s" + +#: ../gtk/call_statistics.ui.h:2 +#, fuzzy +msgid "Audio codec" +msgstr "" +"Audio codecs\n" +"Video codecs" + +#: ../gtk/call_statistics.ui.h:3 +#, fuzzy +msgid "Video codec" +msgstr "" +"Audio codecs\n" +"Video codecs" + +#: ../gtk/call_statistics.ui.h:4 +msgid "Audio IP bandwidth usage" +msgstr "" + +#: ../gtk/call_statistics.ui.h:5 +msgid "Media connectivity" +msgstr "" + +#: ../gtk/call_statistics.ui.h:6 +msgid "Video IP bandwidth usage" +msgstr "" + +#: ../gtk/call_statistics.ui.h:7 +#, fuzzy +msgid "Call statistics and information" +msgstr "Kontakt information" + +#: ../gtk/tunnel_config.ui.h:1 +#, fuzzy +msgid "Configure VoIP tunnel" +msgstr "Konfigurera ett SIP konto" + +#: ../gtk/tunnel_config.ui.h:2 +msgid "Host" +msgstr "" + +#: ../gtk/tunnel_config.ui.h:3 +msgid "Port" +msgstr "" + +#: ../gtk/tunnel_config.ui.h:6 +msgid "Configure tunnel" +msgstr "" + +#: ../gtk/tunnel_config.ui.h:9 +msgid "Configure http proxy (optional)" +msgstr "" + +#: ../coreapi/linphonecore.c:232 msgid "aborted" msgstr "avbrytade" -#: ../coreapi/linphonecore.c:190 +#: ../coreapi/linphonecore.c:235 msgid "completed" msgstr "avslutade" -#: ../coreapi/linphonecore.c:193 +#: ../coreapi/linphonecore.c:238 msgid "missed" msgstr "missade" -#: ../coreapi/linphonecore.c:198 +#: ../coreapi/linphonecore.c:243 #, c-format msgid "" "%s at %s\n" @@ -1216,23 +1451,23 @@ msgstr "" "Status: %s\n" "Längd: %i min %i sek\n" -#: ../coreapi/linphonecore.c:199 +#: ../coreapi/linphonecore.c:244 msgid "Outgoing call" msgstr "Utgående samtal" -#: ../coreapi/linphonecore.c:1088 +#: ../coreapi/linphonecore.c:1226 msgid "Ready" msgstr "Redo" -#: ../coreapi/linphonecore.c:1831 +#: ../coreapi/linphonecore.c:2074 msgid "Looking for telephone number destination..." msgstr "Leta efter telefonnummer för destinationen..." -#: ../coreapi/linphonecore.c:1834 +#: ../coreapi/linphonecore.c:2077 msgid "Could not resolve this number." msgstr "Kan inte nå dett nummer." -#: ../coreapi/linphonecore.c:1878 +#: ../coreapi/linphonecore.c:2121 msgid "" "Could not parse given sip address. A sip url usually looks like sip:" "user@domain" @@ -1240,43 +1475,56 @@ msgstr "" "Kan inte förstå angiven SIP adress. En SIP adress vanligen ser ut som sip:" "användare@domänen" -#: ../coreapi/linphonecore.c:2025 +#: ../coreapi/linphonecore.c:2312 msgid "Contacting" msgstr "Kontaktar" -#: ../coreapi/linphonecore.c:2032 +#: ../coreapi/linphonecore.c:2319 #, fuzzy msgid "Could not call" msgstr "Kunde inte ringa" -#: ../coreapi/linphonecore.c:2140 +#: ../coreapi/linphonecore.c:2429 msgid "Sorry, we have reached the maximum number of simultaneous calls" msgstr "" -#: ../coreapi/linphonecore.c:2270 +#: ../coreapi/linphonecore.c:2573 +#, fuzzy +msgid "is contacting you" +msgstr "kontaktar dig." + +#: ../coreapi/linphonecore.c:2574 +msgid " and asked autoanswer." +msgstr "" + +#: ../coreapi/linphonecore.c:2574 +msgid "." +msgstr "" + +#: ../coreapi/linphonecore.c:2636 msgid "Modifying call parameters..." msgstr "" -#: ../coreapi/linphonecore.c:2366 +#: ../coreapi/linphonecore.c:2908 msgid "Connected." msgstr "Kopplad" -#: ../coreapi/linphonecore.c:2389 +#: ../coreapi/linphonecore.c:2931 #, fuzzy msgid "Call aborted" msgstr "avbrytade" -#: ../coreapi/linphonecore.c:2530 +#: ../coreapi/linphonecore.c:3102 #, fuzzy msgid "Could not pause the call" msgstr "Kunde inte ringa" -#: ../coreapi/linphonecore.c:2535 +#: ../coreapi/linphonecore.c:3107 #, fuzzy msgid "Pausing the current call..." msgstr "Nuvarande samtal" -#: ../coreapi/misc.c:147 +#: ../coreapi/misc.c:148 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the pcm oss emulation module\n" @@ -1288,7 +1536,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:150 +#: ../coreapi/misc.c:151 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the mixer oss emulation module\n" @@ -1300,10 +1548,14 @@ 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:478 +#: ../coreapi/misc.c:496 msgid "Stun lookup in progress..." msgstr "STUN uppslagning pågår..." +#: ../coreapi/misc.c:630 +msgid "ICE local candidates gathering in progress..." +msgstr "" + #: ../coreapi/friend.c:33 msgid "Online" msgstr "Online" @@ -1352,7 +1604,7 @@ msgstr "Pågående" msgid "Unknown-bug" msgstr "Okänd bug" -#: ../coreapi/proxy.c:192 +#: ../coreapi/proxy.c:204 msgid "" "The sip proxy address you entered is invalid, it must start with \"sip:\" " "followed by a hostname." @@ -1360,7 +1612,7 @@ msgstr "" "SIP proxy adressen som du matade in är inte rätt, adressen måste starta med " "\"sip:\", följd av ett hostnamn" -#: ../coreapi/proxy.c:198 +#: ../coreapi/proxy.c:210 msgid "" "The sip identity you entered is invalid.\n" "It should look like sip:username@proxydomain, such as sip:alice@example.net" @@ -1368,153 +1620,199 @@ 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:690 +#: ../coreapi/proxy.c:1053 #, c-format msgid "Could not login as %s" msgstr "Kunde inte logga in som %s" -#: ../coreapi/callbacks.c:206 -#, fuzzy -msgid "is contacting you" -msgstr "kontaktar dig." - -#: ../coreapi/callbacks.c:207 -msgid " and asked autoanswer." -msgstr "" - -#: ../coreapi/callbacks.c:207 -msgid "." -msgstr "" - -#: ../coreapi/callbacks.c:266 +#: ../coreapi/callbacks.c:276 msgid "Remote ringing." msgstr "Ringer hos motparten." -#: ../coreapi/callbacks.c:282 +#: ../coreapi/callbacks.c:296 #, fuzzy msgid "Remote ringing..." msgstr "Ringer hos motparten." -#: ../coreapi/callbacks.c:293 +#: ../coreapi/callbacks.c:307 msgid "Early media." msgstr "Tidig media" -#: ../coreapi/callbacks.c:331 +#: ../coreapi/callbacks.c:352 #, fuzzy, c-format msgid "Call with %s is paused." msgstr "Samtal med %s" -#: ../coreapi/callbacks.c:342 +#: ../coreapi/callbacks.c:365 #, c-format msgid "Call answered by %s - on hold." msgstr "" -#: ../coreapi/callbacks.c:357 +#: ../coreapi/callbacks.c:376 #, fuzzy msgid "Call resumed." msgstr "Samtalet slut" -#: ../coreapi/callbacks.c:362 +#: ../coreapi/callbacks.c:381 #, c-format msgid "Call answered by %s." msgstr "" -#: ../coreapi/callbacks.c:432 -msgid "We are being paused..." +#: ../coreapi/callbacks.c:396 +msgid "Incompatible, check codecs..." msgstr "" -#: ../coreapi/callbacks.c:436 -msgid "We have been resumed..." +#: ../coreapi/callbacks.c:437 +msgid "We have been resumed." msgstr "" -#: ../coreapi/callbacks.c:441 -msgid "Call has been updated by remote..." +#: ../coreapi/callbacks.c:446 +msgid "We are paused by other party." msgstr "" -#: ../coreapi/callbacks.c:473 +#: ../coreapi/callbacks.c:452 +msgid "Call is updated by remote." +msgstr "" + +#: ../coreapi/callbacks.c:521 msgid "Call terminated." msgstr "Samtalet slut." -#: ../coreapi/callbacks.c:480 +#: ../coreapi/callbacks.c:528 msgid "User is busy." msgstr "Användare upptagen." -#: ../coreapi/callbacks.c:481 +#: ../coreapi/callbacks.c:529 msgid "User is temporarily unavailable." msgstr "Användaren temporärt inte tillgänglig." #. char *retrymsg=_("%s. Retry after %i minute(s)."); -#: ../coreapi/callbacks.c:483 +#: ../coreapi/callbacks.c:531 msgid "User does not want to be disturbed." msgstr "Användaren vill inte bli störd." -#: ../coreapi/callbacks.c:484 +#: ../coreapi/callbacks.c:532 msgid "Call declined." msgstr "Samtalet avböjdes." -#: ../coreapi/callbacks.c:496 +#: ../coreapi/callbacks.c:544 #, fuzzy msgid "No response." msgstr "Inget svar inom angiven tid" -#: ../coreapi/callbacks.c:500 +#: ../coreapi/callbacks.c:548 msgid "Protocol error." msgstr "" -#: ../coreapi/callbacks.c:516 +#: ../coreapi/callbacks.c:564 #, fuzzy msgid "Redirected" msgstr "Omdirigerat till %s..." -#: ../coreapi/callbacks.c:526 -msgid "Not found" +#: ../coreapi/callbacks.c:600 +msgid "Incompatible media parameters." msgstr "" -#: ../coreapi/callbacks.c:551 -msgid "No common codecs" -msgstr "" - -#: ../coreapi/callbacks.c:557 +#: ../coreapi/callbacks.c:606 #, fuzzy msgid "Call failed." msgstr "Samtalet avböjdes." -#: ../coreapi/callbacks.c:631 +#: ../coreapi/callbacks.c:701 #, c-format msgid "Registration on %s successful." msgstr "Registrering hos %s lyckades." -#: ../coreapi/callbacks.c:632 +#: ../coreapi/callbacks.c:702 #, c-format msgid "Unregistration on %s done." msgstr "Avregistrering hos %s lyckades." -#: ../coreapi/callbacks.c:648 +#: ../coreapi/callbacks.c:722 msgid "no response timeout" msgstr "Inget svar inom angiven tid" -#: ../coreapi/callbacks.c:651 +#: ../coreapi/callbacks.c:725 #, c-format msgid "Registration on %s failed: %s" msgstr "Registrering hos %s mislyckades: %s" -#: ../coreapi/sal_eXosip2.c:873 ../coreapi/sal_eXosip2.c:875 -#, fuzzy -msgid "Authentication failure" -msgstr "Linphone - Autentisering krävs" - -#: ../coreapi/linphonecall.c:128 +#: ../coreapi/linphonecall.c:129 #, fuzzy, c-format msgid "Authentication token is %s" msgstr "Linphone - Autentisering krävs" -#: ../coreapi/linphonecall.c:1560 +#: ../coreapi/linphonecall.c:2124 #, c-format msgid "You have missed %i call." msgid_plural "You have missed %i calls." msgstr[0] "Du har %i missat samtal" msgstr[1] "Du har %i missade samtal" +#~ msgid "Chat with %s" +#~ msgstr "Chatta med %s" + +#~ msgid "Please choose a username:" +#~ msgstr "Välj ett användarnamn:" + +#~ msgid "Checking if '%s' is available..." +#~ msgstr "Verifierar om '%s' är tillgänglig..." + +#~ msgid "Please wait..." +#~ msgstr "Var god dröj..." + +#~ msgid "Sorry this username already exists. Please try a new one." +#~ msgstr "Användarnamnet finns redan, försök med ett nytt namn." + +#~ msgid "Ok !" +#~ msgstr "Ok !" + +#~ msgid "Communication problem, please try again later." +#~ msgstr "Kommunikationsproblem, prova igen senare." + +#~ msgid "Choosing a username" +#~ msgstr "Välj ditt användarnamn" + +#~ msgid "Verifying" +#~ msgstr "Verifierar" + +#~ msgid "Confirmation" +#~ msgstr "Bekräftelse" + +#~ msgid "Creating your account" +#~ msgstr "Skapar ditt konto" + +#~ msgid "Now ready !" +#~ msgstr "Klar nu!" + +#, fuzzy +#~ msgid "Contacts" +#~ msgstr "Kontaktar" + +#, fuzzy +#~ msgid "Enable video" +#~ msgstr "På" + +#~ msgid "Enter username, phone number, or full sip address" +#~ msgstr "Mata in användarnamn, telefonnummer eller SIP adress" + +#~ msgid "Lookup:" +#~ msgstr "Sök:" + +#~ msgid "in" +#~ msgstr "i" + +#~ msgid "" +#~ "Register to FONICS\n" +#~ "virtual network !" +#~ msgstr "" +#~ "Registrera hos FONICS\n" +#~ "virtuella nätverk!" + +#, fuzzy +#~ msgid "Authentication failure" +#~ msgstr "Linphone - Autentisering krävs" + #~ msgid "Unmute" #~ msgstr "Mikrofon på" @@ -1748,19 +2046,12 @@ msgstr[1] "Du har %i missade samtal" #~ msgid "Assistant" #~ msgstr "Assistent" -#, fuzzy -#~ msgid "Call Details" -#~ msgstr "Ringer %s" - #~ msgid "Show debug messages" #~ msgstr "Visa debugfönstret" #~ msgid "Start call" #~ msgstr "Ring" -#~ msgid "Terminate call" -#~ msgstr "Lägg på" - #~ msgid "_Modes" #~ msgstr "_Media" diff --git a/po/zh_CN.po b/po/zh_CN.po index 42c481890..85fa75c47 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: linphone 3.3.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-12-05 12:41+0100\n" +"POT-Creation-Date: 2013-01-08 10:35+0100\n" "PO-Revision-Date: 2011-01-08 23:51+0800\n" "Last-Translator: Aron Xu \n" "Language-Team: Chinese (simplified) \n" @@ -18,30 +18,52 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../gtk/calllogs.c:71 +#: ../gtk/calllogs.c:82 +#, fuzzy +msgid "Aborted" +msgstr "中断" + +#: ../gtk/calllogs.c:85 +#, fuzzy +msgid "Missed" +msgstr "丢失" + +#: ../gtk/calllogs.c:88 +#, fuzzy +msgid "Declined" +msgstr "拒绝" + +#: ../gtk/calllogs.c:94 #, c-format msgid "%i minute" msgid_plural "%i minutes" msgstr[0] "" -#: ../gtk/calllogs.c:74 +#: ../gtk/calllogs.c:97 #, c-format msgid "%i second" msgid_plural "%i seconds" msgstr[0] "" -#: ../gtk/calllogs.c:77 +#: ../gtk/calllogs.c:100 #, c-format msgid "" "%s\t%s\tQuality: %s\n" "%s\t%s %s\t" msgstr "" -#: ../gtk/calllogs.c:79 +#: ../gtk/calllogs.c:102 msgid "n/a" msgstr "" -#: ../gtk/conference.c:33 ../gtk/incall_view.c:183 +#: ../gtk/calllogs.c:105 +#, c-format +msgid "" +"%s\t%s\t\n" +"%s\t%s" +msgstr "" + +#: ../gtk/conference.c:33 ../gtk/main.ui.h:13 msgid "Conference" msgstr "" @@ -55,43 +77,42 @@ msgstr "静音" msgid "Couldn't find pixmap file: %s" msgstr "无法打开位图文件：%s" -#: ../gtk/chat.c:27 -#, c-format -msgid "Chat with %s" -msgstr "与 %s 通话" - -#: ../gtk/main.c:83 +#: ../gtk/main.c:89 msgid "log to stdout some debug information while running." msgstr "运行时向标准输出记录调试信息。" -#: ../gtk/main.c:90 +#: ../gtk/main.c:96 msgid "path to a file to write logs into." msgstr "" -#: ../gtk/main.c:97 +#: ../gtk/main.c:103 +msgid "Start linphone with video disabled." +msgstr "" + +#: ../gtk/main.c:110 msgid "Start only in the system tray, do not show the main interface." msgstr "启动到系统托盘，不显示主界面。" -#: ../gtk/main.c:104 +#: ../gtk/main.c:117 msgid "address to call right now" msgstr "现在呼叫的地址" -#: ../gtk/main.c:111 +#: ../gtk/main.c:124 msgid "if set automatically answer incoming calls" msgstr "是否设置呼叫自动应答" -#: ../gtk/main.c:118 +#: ../gtk/main.c:131 msgid "" "Specifiy a working directory (should be the base of the installation, eg: c:" "\\Program Files\\Linphone)" msgstr "指定工作目录(应为安装目录例如 C:\\Program Files\\Linphone)" -#: ../gtk/main.c:464 +#: ../gtk/main.c:498 #, c-format msgid "Call with %s" msgstr "与 %s 通话" -#: ../gtk/main.c:815 +#: ../gtk/main.c:871 #, c-format msgid "" "%s would like to add you to his contact list.\n" @@ -103,63 +124,68 @@ msgstr "" "您是否允许他看到您的在线状态或者将它加为您的联系人允许?\n" "如果您回答否，则会将该人临时性的放入黑名单" -#: ../gtk/main.c:893 +#: ../gtk/main.c:948 #, c-format msgid "" "Please enter your password for username %s\n" " at domain %s:" msgstr "请输入 %s@%s 的密码：" -#: ../gtk/main.c:993 +#: ../gtk/main.c:1051 #, fuzzy msgid "Call error" msgstr "呼叫历史" -#: ../gtk/main.c:996 ../coreapi/linphonecore.c:2406 +#: ../gtk/main.c:1054 ../coreapi/linphonecore.c:2949 msgid "Call ended" msgstr "呼叫结束" -#: ../gtk/main.c:999 ../coreapi/linphonecore.c:199 +#: ../gtk/main.c:1057 ../coreapi/linphonecore.c:244 msgid "Incoming call" msgstr "呼入" -#: ../gtk/main.c:1001 ../gtk/incall_view.c:292 ../gtk/main.ui.h:20 +#: ../gtk/main.c:1059 ../gtk/incall_view.c:451 ../gtk/main.ui.h:6 msgid "Answer" msgstr "" -#: ../gtk/main.c:1003 ../gtk/main.ui.h:29 +#: ../gtk/main.c:1061 ../gtk/main.ui.h:7 msgid "Decline" msgstr "拒绝" -#: ../gtk/main.c:1009 +#: ../gtk/main.c:1067 #, fuzzy msgid "Call paused" msgstr "中断" -#: ../gtk/main.c:1009 +#: ../gtk/main.c:1067 #, c-format msgid "by %s" msgstr "" -#: ../gtk/main.c:1165 +#: ../gtk/main.c:1116 +#, c-format +msgid "%s proposed to start video. Do you accept ?" +msgstr "" + +#: ../gtk/main.c:1278 msgid "Website link" msgstr "网站" -#: ../gtk/main.c:1205 +#: ../gtk/main.c:1318 msgid "Linphone - a video internet phone" msgstr "Linphone - 互联网视频电话" -#: ../gtk/main.c:1295 +#: ../gtk/main.c:1410 #, c-format msgid "%s (Default)" msgstr "%s (默认)" -#: ../gtk/main.c:1566 ../coreapi/callbacks.c:700 +#: ../gtk/main.c:1714 ../coreapi/callbacks.c:774 #, c-format msgid "We are transferred to %s" msgstr "" -#: ../gtk/main.c:1576 +#: ../gtk/main.c:1724 msgid "" "No sound cards have been detected on this computer.\n" "You won't be able to send or receive audio calls." @@ -167,162 +193,175 @@ msgstr "" "未在此计算机上检测到声卡。\n" "您无法发送或接收音频呼叫。" -#: ../gtk/main.c:1663 +#: ../gtk/main.c:1833 msgid "A free SIP video-phone" msgstr "免费的 SIP 视频电话" -#: ../gtk/friendlist.c:203 +#: ../gtk/friendlist.c:335 msgid "Add to addressbook" msgstr "" -#: ../gtk/friendlist.c:258 ../gtk/propertybox.c:296 ../gtk/contact.ui.h:3 -msgid "Name" -msgstr "名称" - -#: ../gtk/friendlist.c:271 +#: ../gtk/friendlist.c:509 msgid "Presence status" msgstr "在线状态" -#: ../gtk/friendlist.c:308 +#: ../gtk/friendlist.c:526 ../gtk/propertybox.c:362 ../gtk/contact.ui.h:1 +msgid "Name" +msgstr "名称" + +#: ../gtk/friendlist.c:538 +#, fuzzy +msgid "Call" +msgstr "呼叫 %s" + +#: ../gtk/friendlist.c:543 +msgid "Chat" +msgstr "" + +#: ../gtk/friendlist.c:573 #, c-format msgid "Search in %s directory" msgstr "在 %s 目录中查找 " -#: ../gtk/friendlist.c:568 +#: ../gtk/friendlist.c:730 msgid "Invalid sip contact !" msgstr "无效的 SIP 联系人！" -#: ../gtk/friendlist.c:613 +#: ../gtk/friendlist.c:775 #, c-format msgid "Call %s" msgstr "呼叫 %s" -#: ../gtk/friendlist.c:614 +#: ../gtk/friendlist.c:776 #, c-format msgid "Send text to %s" msgstr "发送消息给 %s" -#: ../gtk/friendlist.c:615 +#: ../gtk/friendlist.c:777 #, c-format msgid "Edit contact '%s'" msgstr "编辑联系人 %s" -#: ../gtk/friendlist.c:616 +#: ../gtk/friendlist.c:778 #, c-format msgid "Delete contact '%s'" msgstr "删除联系人 %s" -#: ../gtk/friendlist.c:658 +#: ../gtk/friendlist.c:820 #, c-format msgid "Add new contact from %s directory" msgstr "从 %s 目录增加联系人 " -#: ../gtk/propertybox.c:302 +#: ../gtk/propertybox.c:368 msgid "Rate (Hz)" msgstr "采样率(Hz)" -#: ../gtk/propertybox.c:308 +#: ../gtk/propertybox.c:374 msgid "Status" msgstr "状态" -#: ../gtk/propertybox.c:314 +#: ../gtk/propertybox.c:380 msgid "Min bitrate (kbit/s)" msgstr "最小比特率(kbit/s)" -#: ../gtk/propertybox.c:321 +#: ../gtk/propertybox.c:387 msgid "Parameters" msgstr "参数" -#: ../gtk/propertybox.c:364 ../gtk/propertybox.c:507 +#: ../gtk/propertybox.c:430 ../gtk/propertybox.c:573 msgid "Enabled" msgstr "启用" -#: ../gtk/propertybox.c:366 ../gtk/propertybox.c:507 +#: ../gtk/propertybox.c:432 ../gtk/propertybox.c:573 msgid "Disabled" msgstr "禁用" -#: ../gtk/propertybox.c:553 +#: ../gtk/propertybox.c:619 msgid "Account" msgstr "帐户" -#: ../gtk/propertybox.c:693 +#: ../gtk/propertybox.c:759 msgid "English" msgstr "英语" -#: ../gtk/propertybox.c:694 +#: ../gtk/propertybox.c:760 msgid "French" msgstr "法语" -#: ../gtk/propertybox.c:695 +#: ../gtk/propertybox.c:761 msgid "Swedish" msgstr "瑞典语" -#: ../gtk/propertybox.c:696 +#: ../gtk/propertybox.c:762 msgid "Italian" msgstr "意大利语" -#: ../gtk/propertybox.c:697 +#: ../gtk/propertybox.c:763 msgid "Spanish" msgstr "西班牙语" -#: ../gtk/propertybox.c:698 +#: ../gtk/propertybox.c:764 msgid "Brazilian Portugese" msgstr "巴西葡萄牙语" -#: ../gtk/propertybox.c:699 +#: ../gtk/propertybox.c:765 msgid "Polish" msgstr "波兰语" -#: ../gtk/propertybox.c:700 +#: ../gtk/propertybox.c:766 msgid "German" msgstr "德语" -#: ../gtk/propertybox.c:701 +#: ../gtk/propertybox.c:767 msgid "Russian" msgstr "俄语" -#: ../gtk/propertybox.c:702 +#: ../gtk/propertybox.c:768 msgid "Japanese" msgstr "日语" -#: ../gtk/propertybox.c:703 +#: ../gtk/propertybox.c:769 msgid "Dutch" msgstr "荷兰语" -#: ../gtk/propertybox.c:704 +#: ../gtk/propertybox.c:770 msgid "Hungarian" msgstr "匈牙利语" -#: ../gtk/propertybox.c:705 +#: ../gtk/propertybox.c:771 msgid "Czech" msgstr "捷克语" -#: ../gtk/propertybox.c:706 +#: ../gtk/propertybox.c:772 msgid "Chinese" msgstr "中文" -#: ../gtk/propertybox.c:707 +#: ../gtk/propertybox.c:773 msgid "Traditional Chinese" msgstr "" -#: ../gtk/propertybox.c:708 +#: ../gtk/propertybox.c:774 msgid "Norwegian" msgstr "" -#: ../gtk/propertybox.c:765 +#: ../gtk/propertybox.c:775 +msgid "Hebrew" +msgstr "" + +#: ../gtk/propertybox.c:842 msgid "" "You need to restart linphone for the new language selection to take effect." msgstr "您需要重启 linphone 以使语言选择生效。" -#: ../gtk/propertybox.c:835 +#: ../gtk/propertybox.c:912 msgid "None" msgstr "" -#: ../gtk/propertybox.c:839 +#: ../gtk/propertybox.c:916 msgid "SRTP" msgstr "" -#: ../gtk/propertybox.c:845 +#: ../gtk/propertybox.c:922 msgid "ZRTP" msgstr "" @@ -365,7 +404,7 @@ msgid "Found %i contact" msgid_plural "Found %i contacts" msgstr[0] "找到 %i 联系方式" -#: ../gtk/setupwizard.c:25 +#: ../gtk/setupwizard.c:33 msgid "" "Welcome !\n" "This assistant will help you to use a SIP account for your calls." @@ -373,171 +412,275 @@ msgstr "" "欢迎使用 Linphone！\n" "设置向导将帮助您配置打网络电话的 SIP 帐户。" -#: ../gtk/setupwizard.c:34 -msgid "Create an account by choosing a username" +#: ../gtk/setupwizard.c:42 +#, fuzzy +msgid "Create an account on linphone.org" msgstr "通过选择一个用户名创建一个新的帐户" -#: ../gtk/setupwizard.c:35 -msgid "I have already an account and just want to use it" +#: ../gtk/setupwizard.c:43 +#, fuzzy +msgid "I have already a linphone.org account and I just want to use it" msgstr "我已经有一个帐户，并想使用原来的帐户" -#: ../gtk/setupwizard.c:53 -msgid "Please choose a username:" -msgstr "请选择用户名：" +#: ../gtk/setupwizard.c:44 +#, fuzzy +msgid "I have already a sip account and I just want to use it" +msgstr "我已经有一个帐户，并想使用原来的帐户" -#: ../gtk/setupwizard.c:54 +#: ../gtk/setupwizard.c:84 +msgid "Enter your linphone.org username" +msgstr "" + +#: ../gtk/setupwizard.c:91 msgid "Username:" msgstr "用户名:" -#: ../gtk/setupwizard.c:92 -#, c-format -msgid "Checking if '%s' is available..." -msgstr "检查 %s 是否可用..." +#: ../gtk/setupwizard.c:93 ../gtk/password.ui.h:4 +msgid "Password:" +msgstr "密码：" -#: ../gtk/setupwizard.c:97 ../gtk/setupwizard.c:164 -msgid "Please wait..." -msgstr "请稍候..." +#: ../gtk/setupwizard.c:113 +msgid "Enter your account informations" +msgstr "" -#: ../gtk/setupwizard.c:101 -msgid "Sorry this username already exists. Please try a new one." -msgstr "对不起，该用户已经存在，请换一个尝试。" +#: ../gtk/setupwizard.c:120 +#, fuzzy +msgid "Username*" +msgstr "用户名" -#: ../gtk/setupwizard.c:103 ../gtk/setupwizard.c:168 -msgid "Ok !" -msgstr "成功！" +#: ../gtk/setupwizard.c:121 +#, fuzzy +msgid "Password*" +msgstr "密码" -#: ../gtk/setupwizard.c:106 ../gtk/setupwizard.c:171 -msgid "Communication problem, please try again later." -msgstr "连接错误，请稍后重试。" +#: ../gtk/setupwizard.c:124 +msgid "Domain*" +msgstr "" -#: ../gtk/setupwizard.c:134 +#: ../gtk/setupwizard.c:125 +msgid "Proxy" +msgstr "" + +#: ../gtk/setupwizard.c:297 +msgid "(*) Required fields" +msgstr "" + +#: ../gtk/setupwizard.c:298 +#, fuzzy +msgid "Username: (*)" +msgstr "用户名:" + +#: ../gtk/setupwizard.c:300 +#, fuzzy +msgid "Password: (*)" +msgstr "密码：" + +#: ../gtk/setupwizard.c:302 +msgid "Email: (*)" +msgstr "" + +#: ../gtk/setupwizard.c:304 +msgid "Confirm your password: (*)" +msgstr "" + +#: ../gtk/setupwizard.c:368 +msgid "" +"Error, account not validated, username already used or server unreachable.\n" +"Please go back and try again." +msgstr "" + +#: ../gtk/setupwizard.c:379 msgid "Thank you. Your account is now configured and ready for use." msgstr "谢谢，您的帐户已经配置完毕，可以使用。" -#: ../gtk/setupwizard.c:228 +#: ../gtk/setupwizard.c:387 +msgid "" +"Please validate your account by clicking on the link we just sent you by " +"email.\n" +"Then come back here and press Next button." +msgstr "" + +#: ../gtk/setupwizard.c:554 msgid "Welcome to the account setup assistant" msgstr "欢迎使用帐户设置向导" -#: ../gtk/setupwizard.c:232 +#: ../gtk/setupwizard.c:559 msgid "Account setup assistant" msgstr "帐户设置向导" -#: ../gtk/setupwizard.c:236 -msgid "Choosing a username" -msgstr "选择用户名：" +#: ../gtk/setupwizard.c:565 +#, fuzzy +msgid "Configure your account (step 1/1)" +msgstr "配置 SIP 帐户" -#: ../gtk/setupwizard.c:240 -msgid "Verifying" -msgstr "验证中" +#: ../gtk/setupwizard.c:570 +msgid "Enter your sip username (step 1/1)" +msgstr "" -#: ../gtk/setupwizard.c:244 -msgid "Confirmation" -msgstr "确认" +#: ../gtk/setupwizard.c:574 +msgid "Enter account information (step 1/2)" +msgstr "" -#: ../gtk/setupwizard.c:249 -msgid "Creating your account" -msgstr "正在创建您的帐户" +#: ../gtk/setupwizard.c:583 +msgid "Validation (step 2/2)" +msgstr "" -#: ../gtk/setupwizard.c:253 -msgid "Now ready !" -msgstr "就绪！" +#: ../gtk/setupwizard.c:588 +msgid "Error" +msgstr "" -#: ../gtk/incall_view.c:69 +#: ../gtk/setupwizard.c:592 +#, fuzzy +msgid "Terminating" +msgstr "终止呼叫" + +#: ../gtk/incall_view.c:69 ../gtk/incall_view.c:90 #, fuzzy, c-format msgid "Call #%i" msgstr "呼叫 %s" -#: ../gtk/incall_view.c:127 +#: ../gtk/incall_view.c:150 #, c-format msgid "Transfer to call #%i with %s" msgstr "" -#: ../gtk/incall_view.c:155 -msgid "Transfer" +#: ../gtk/incall_view.c:209 ../gtk/incall_view.c:212 +#, fuzzy +msgid "Not used" +msgstr "未找到" + +#: ../gtk/incall_view.c:219 +msgid "ICE not activated" msgstr "" -#: ../gtk/incall_view.c:271 +#: ../gtk/incall_view.c:221 +#, fuzzy +msgid "ICE failed" +msgstr "ICE 过滤器" + +#: ../gtk/incall_view.c:223 +msgid "ICE in progress" +msgstr "" + +#: ../gtk/incall_view.c:225 +msgid "Going through one or more NATs" +msgstr "" + +#: ../gtk/incall_view.c:227 +#, fuzzy +msgid "Direct" +msgstr "已重定向" + +#: ../gtk/incall_view.c:229 +msgid "Through a relay server" +msgstr "" + +#: ../gtk/incall_view.c:238 ../gtk/incall_view.c:242 +#, c-format +msgid "" +"download: %f\n" +"upload: %f (kbit/s)" +msgstr "" + +#: ../gtk/incall_view.c:341 ../gtk/main.ui.h:12 +msgid "Hang up" +msgstr "" + +#: ../gtk/incall_view.c:430 msgid "Calling..." msgstr "正在呼叫..." -#: ../gtk/incall_view.c:274 ../gtk/incall_view.c:482 +#: ../gtk/incall_view.c:433 ../gtk/incall_view.c:646 msgid "00::00::00" msgstr "00::00::00" -#: ../gtk/incall_view.c:285 +#: ../gtk/incall_view.c:444 #, fuzzy msgid "Incoming call" msgstr "呼入" -#: ../gtk/incall_view.c:322 +#: ../gtk/incall_view.c:481 msgid "good" msgstr "" -#: ../gtk/incall_view.c:324 +#: ../gtk/incall_view.c:483 msgid "average" msgstr "" -#: ../gtk/incall_view.c:326 +#: ../gtk/incall_view.c:485 msgid "poor" msgstr "" -#: ../gtk/incall_view.c:328 +#: ../gtk/incall_view.c:487 msgid "very poor" msgstr "" -#: ../gtk/incall_view.c:330 +#: ../gtk/incall_view.c:489 msgid "too bad" msgstr "" -#: ../gtk/incall_view.c:331 ../gtk/incall_view.c:347 +#: ../gtk/incall_view.c:490 ../gtk/incall_view.c:506 msgid "unavailable" msgstr "" -#: ../gtk/incall_view.c:447 +#: ../gtk/incall_view.c:605 msgid "Secured by SRTP" msgstr "" -#: ../gtk/incall_view.c:453 +#: ../gtk/incall_view.c:611 #, c-format msgid "Secured by ZRTP - [auth token: %s]" msgstr "" -#: ../gtk/incall_view.c:459 +#: ../gtk/incall_view.c:617 msgid "Set unverified" msgstr "" -#: ../gtk/incall_view.c:459 ../gtk/main.ui.h:49 +#: ../gtk/incall_view.c:617 ../gtk/main.ui.h:5 msgid "Set verified" msgstr "" -#: ../gtk/incall_view.c:480 +#: ../gtk/incall_view.c:641 msgid "In conference" msgstr "" -#: ../gtk/incall_view.c:480 +#: ../gtk/incall_view.c:641 #, fuzzy msgid "In call" msgstr "正在呼叫" -#: ../gtk/incall_view.c:499 +#: ../gtk/incall_view.c:669 #, fuzzy msgid "Paused call" msgstr "正在呼叫" -#: ../gtk/incall_view.c:511 +#: ../gtk/incall_view.c:682 #, c-format msgid "%02i::%02i::%02i" msgstr "%02i::%02i::%02i" -#: ../gtk/incall_view.c:527 +#: ../gtk/incall_view.c:699 msgid "Call ended." msgstr "通话结束。" -#: ../gtk/incall_view.c:584 +#: ../gtk/incall_view.c:731 +msgid "Transfer in progress" +msgstr "" + +#: ../gtk/incall_view.c:734 +msgid "Transfer done." +msgstr "" + +#: ../gtk/incall_view.c:737 +#, fuzzy +msgid "Transfer failed." +msgstr "呼叫失败。" + +#: ../gtk/incall_view.c:781 msgid "Resume" msgstr "" -#: ../gtk/incall_view.c:591 ../gtk/main.ui.h:45 +#: ../gtk/incall_view.c:788 ../gtk/main.ui.h:9 msgid "Pause" msgstr "" @@ -547,235 +690,250 @@ msgid "Please enter login information for %s" msgstr "请输入 %s 的登录信息" #: ../gtk/main.ui.h:1 -msgid "#" -msgstr "#" - -#: ../gtk/main.ui.h:2 -msgid "*" -msgstr "*" - -#: ../gtk/main.ui.h:3 -msgid "0" -msgstr "0" - -#: ../gtk/main.ui.h:4 -msgid "1" -msgstr "1" - -#: ../gtk/main.ui.h:5 -msgid "2" -msgstr "2" - -#: ../gtk/main.ui.h:6 -msgid "3" -msgstr "3" - -#: ../gtk/main.ui.h:7 -msgid "4" -msgstr "4" - -#: ../gtk/main.ui.h:8 -msgid "5" -msgstr "5" - -#: ../gtk/main.ui.h:9 -msgid "6" -msgstr "6" - -#: ../gtk/main.ui.h:10 -msgid "7" -msgstr "7" - -#: ../gtk/main.ui.h:11 -msgid "8" -msgstr "8" - -#: ../gtk/main.ui.h:12 -msgid "9" -msgstr "9" - -#: ../gtk/main.ui.h:13 -msgid "Add contacts from directory" -msgstr "从目录增加联系人" - -#: ../gtk/main.ui.h:14 #, fuzzy msgid "Callee name" msgstr "通话结束。" +#: ../gtk/main.ui.h:2 +msgid "Send" +msgstr "发送" + +#: ../gtk/main.ui.h:3 +msgid "End conference" +msgstr "" + +#: ../gtk/main.ui.h:4 +msgid "label" +msgstr "标签" + +#: ../gtk/main.ui.h:8 +msgid "Video" +msgstr "" + +#: ../gtk/main.ui.h:10 +msgid "Mute" +msgstr "" + +#: ../gtk/main.ui.h:11 +msgid "Transfer" +msgstr "" + +#: ../gtk/main.ui.h:14 +msgid "In call" +msgstr "呼入" + #: ../gtk/main.ui.h:15 -msgid "Welcome !" -msgstr "欢迎！" +msgid "Duration" +msgstr "通话时间" #: ../gtk/main.ui.h:16 -msgid "A" -msgstr "A" - -#: ../gtk/main.ui.h:17 -msgid "ADSL" -msgstr "" - -#: ../gtk/main.ui.h:18 -#, fuzzy -msgid "Add contact" -msgstr "找到 %i 联系方式" - -#: ../gtk/main.ui.h:19 -msgid "All users" -msgstr "" - -#: ../gtk/main.ui.h:21 -msgid "Automatically log me in" -msgstr "自动登录" - -#: ../gtk/main.ui.h:22 -msgid "B" -msgstr "B" - -#: ../gtk/main.ui.h:23 ../gtk/parameters.ui.h:21 -msgid "C" -msgstr "C" - -#: ../gtk/main.ui.h:24 -#, fuzzy -msgid "Call" -msgstr "呼叫 %s" - -#: ../gtk/main.ui.h:25 msgid "Call quality rating" msgstr "" -#: ../gtk/main.ui.h:26 +#: ../gtk/main.ui.h:17 +msgid "_Options" +msgstr "" + +#: ../gtk/main.ui.h:18 +msgid "Always start video" +msgstr "" + +#: ../gtk/main.ui.h:19 +msgid "Enable self-view" +msgstr "启用自视" + +#: ../gtk/main.ui.h:20 +msgid "_Help" +msgstr "" + +#: ../gtk/main.ui.h:21 +#, fuzzy +msgid "Show debug window" +msgstr "Linphone 调试窗口" + +#: ../gtk/main.ui.h:22 +#, fuzzy +msgid "_Homepage" +msgstr "主页" + +#: ../gtk/main.ui.h:23 #, fuzzy msgid "Check _Updates" msgstr "检查更新" -#: ../gtk/main.ui.h:27 -msgid "Contacts" -msgstr "联系人" +#: ../gtk/main.ui.h:24 +#, fuzzy +msgid "Account assistant" +msgstr "帐户设置向导" -#: ../gtk/main.ui.h:28 +#: ../gtk/main.ui.h:25 +msgid "SIP address or phone number:" +msgstr "SIP 地址或电话号码：" + +#: ../gtk/main.ui.h:26 +msgid "Initiate a new call" +msgstr "" + +#: ../gtk/main.ui.h:27 ../gtk/parameters.ui.h:48 +msgid "Add" +msgstr "添加" + +#: ../gtk/main.ui.h:28 ../gtk/parameters.ui.h:49 +msgid "Edit" +msgstr "编辑" + +#: ../gtk/main.ui.h:29 msgid "D" msgstr "D" #: ../gtk/main.ui.h:30 -msgid "Default" -msgstr "默认" +msgid "#" +msgstr "#" #: ../gtk/main.ui.h:31 -msgid "Duration" -msgstr "通话时间" +msgid "0" +msgstr "0" #: ../gtk/main.ui.h:32 -msgid "Enable self-view" -msgstr "启用自视" +msgid "*" +msgstr "*" -#: ../gtk/main.ui.h:33 -#, fuzzy -msgid "Enable video" -msgstr "启用" +#: ../gtk/main.ui.h:33 ../gtk/parameters.ui.h:7 +msgid "C" +msgstr "C" #: ../gtk/main.ui.h:34 -msgid "Enter username, phone number, or full sip address" -msgstr "请输入用户名、电话号码或完整的 SIP 地址" +msgid "9" +msgstr "9" #: ../gtk/main.ui.h:35 -#, fuzzy -msgid "Fiber Channel" -msgstr "" -"ADSL\n" -"光纤" +msgid "8" +msgstr "8" #: ../gtk/main.ui.h:36 -msgid "In call" -msgstr "呼入" +msgid "7" +msgstr "7" #: ../gtk/main.ui.h:37 -msgid "Initiate a new call" -msgstr "" +msgid "B" +msgstr "B" #: ../gtk/main.ui.h:38 -msgid "Internet connection:" -msgstr "网络连接：" +msgid "6" +msgstr "6" #: ../gtk/main.ui.h:39 +msgid "5" +msgstr "5" + +#: ../gtk/main.ui.h:40 +msgid "4" +msgstr "4" + +#: ../gtk/main.ui.h:41 +msgid "A" +msgstr "A" + +#: ../gtk/main.ui.h:42 +msgid "3" +msgstr "3" + +#: ../gtk/main.ui.h:43 +msgid "2" +msgstr "2" + +#: ../gtk/main.ui.h:44 +msgid "1" +msgstr "1" + +#: ../gtk/main.ui.h:45 +msgid "Search" +msgstr "搜索" + +#: ../gtk/main.ui.h:46 +msgid "Add contacts from directory" +msgstr "从目录增加联系人" + +#: ../gtk/main.ui.h:47 +#, fuzzy +msgid "Add contact" +msgstr "找到 %i 联系方式" + +#: ../gtk/main.ui.h:48 msgid "Keypad" msgstr "数字键盘" -#: ../gtk/main.ui.h:40 -msgid "Login information" -msgstr "登录信息" +#: ../gtk/main.ui.h:49 +#, fuzzy +msgid "Recent calls" +msgstr "呼入" -#: ../gtk/main.ui.h:41 -msgid "Lookup:" -msgstr "查找：" - -#: ../gtk/main.ui.h:42 +#: ../gtk/main.ui.h:50 msgid "My current identity:" msgstr "当前地址：" -#: ../gtk/main.ui.h:43 +#: ../gtk/main.ui.h:51 ../gtk/tunnel_config.ui.h:7 +msgid "Username" +msgstr "用户名" + +#: ../gtk/main.ui.h:52 ../gtk/tunnel_config.ui.h:8 +msgid "Password" +msgstr "密码" + +#: ../gtk/main.ui.h:53 +msgid "Internet connection:" +msgstr "网络连接：" + +#: ../gtk/main.ui.h:54 +msgid "Automatically log me in" +msgstr "自动登录" + +#: ../gtk/main.ui.h:55 +msgid "Login information" +msgstr "登录信息" + +#: ../gtk/main.ui.h:56 +msgid "Welcome !" +msgstr "欢迎！" + +#: ../gtk/main.ui.h:57 +msgid "All users" +msgstr "" + +#: ../gtk/main.ui.h:58 #, fuzzy msgid "Online users" msgstr "" "全部用户\n" "在线用户" -#: ../gtk/main.ui.h:44 -msgid "Password" -msgstr "密码" - -#: ../gtk/main.ui.h:46 -#, fuzzy -msgid "Recent calls" -msgstr "呼入" - -#: ../gtk/main.ui.h:47 -msgid "SIP address or phone number:" -msgstr "SIP 地址或电话号码：" - -#: ../gtk/main.ui.h:48 -msgid "Search" -msgstr "搜索" - -#: ../gtk/main.ui.h:50 -#, fuzzy -msgid "Show debug window" -msgstr "Linphone 调试窗口" - -#: ../gtk/main.ui.h:51 -msgid "Username" -msgstr "用户名" - -#: ../gtk/main.ui.h:52 -msgid "_Help" +#: ../gtk/main.ui.h:59 +msgid "ADSL" msgstr "" -#: ../gtk/main.ui.h:53 +#: ../gtk/main.ui.h:60 #, fuzzy -msgid "_Homepage" -msgstr "主页" - -#: ../gtk/main.ui.h:54 -msgid "_Options" +msgid "Fiber Channel" msgstr "" +"ADSL\n" +"光纤" -#: ../gtk/main.ui.h:55 -msgid "in" -msgstr "于" +#: ../gtk/main.ui.h:61 +msgid "Default" +msgstr "默认" -#: ../gtk/main.ui.h:56 -msgid "label" -msgstr "标签" +#: ../gtk/main.ui.h:62 +msgid "Delete" +msgstr "" #: ../gtk/about.ui.h:1 -msgid "(C) Belledonne Communications,2010\n" -msgstr "" - -#: ../gtk/about.ui.h:3 msgid "About linphone" msgstr "关于 Linphone" +#: ../gtk/about.ui.h:2 +msgid "(C) Belledonne Communications,2010\n" +msgstr "" + #: ../gtk/about.ui.h:4 msgid "An internet video phone using the standard SIP (rfc3261) protocol." msgstr "一个采用标准 SIP (rfc3261) 协议的互联网视频电话" @@ -807,387 +965,388 @@ msgstr "" "hu: anonymous\n" "zh_CN: Jiang Honglei 和 Aron Xu \n" -#: ../gtk/contact.ui.h:1 -msgid "Contact information" -msgstr "联系人信息" - #: ../gtk/contact.ui.h:2 -msgid "Allow this contact to see my presence status" -msgstr "允许此人看到我的在线状态" - -#: ../gtk/contact.ui.h:4 msgid "SIP Address" msgstr "SIP 地址" -#: ../gtk/contact.ui.h:5 +#: ../gtk/contact.ui.h:3 msgid "Show this contact presence status" msgstr "显示该联系人的在线状态" +#: ../gtk/contact.ui.h:4 +msgid "Allow this contact to see my presence status" +msgstr "允许此人看到我的在线状态" + +#: ../gtk/contact.ui.h:5 +msgid "Contact information" +msgstr "联系人信息" + #: ../gtk/log.ui.h:1 msgid "Linphone debug window" msgstr "Linphone 调试窗口" +#: ../gtk/log.ui.h:2 +msgid "Scroll to end" +msgstr "" + #: ../gtk/password.ui.h:1 #, fuzzy msgid "Linphone - Authentication required" msgstr "Linphone - 需要认证" #: ../gtk/password.ui.h:2 -msgid "Password:" -msgstr "密码：" - -#: ../gtk/password.ui.h:3 msgid "Please enter the domain password" msgstr "请输入密码" -#: ../gtk/password.ui.h:4 +#: ../gtk/password.ui.h:3 msgid "UserID" msgstr "用户 ID" #: ../gtk/call_logs.ui.h:1 +msgid "Call history" +msgstr "呼叫历史" + +#: ../gtk/call_logs.ui.h:2 +msgid "Clear all" +msgstr "" + +#: ../gtk/call_logs.ui.h:3 #, fuzzy msgid "Call back" msgstr "呼叫 %s" -#: ../gtk/call_logs.ui.h:2 -msgid "Call history" -msgstr "呼叫历史" - -#: ../gtk/call_logs.ui.h:3 -msgid "Clear all" -msgstr "" - #: ../gtk/sip_account.ui.h:1 -msgid "Configure a SIP account" -msgstr "配置 SIP 帐户" - -#: ../gtk/sip_account.ui.h:2 msgid "Linphone - Configure a SIP account" msgstr "Linphone - 配置 SIP 帐户" -#: ../gtk/sip_account.ui.h:3 -msgid "Looks like sip:" -msgstr "类似于 sip:<代理主机名>" - -#: ../gtk/sip_account.ui.h:4 -msgid "Looks like sip:@" -msgstr "类似于 sip:<用户名>@<域>" - -#: ../gtk/sip_account.ui.h:5 -msgid "Publish presence information" -msgstr "发布在线状态" - -#: ../gtk/sip_account.ui.h:6 -msgid "Register" -msgstr "" - -#: ../gtk/sip_account.ui.h:7 -msgid "Registration duration (sec):" -msgstr "注册间隔(秒)：" - -#: ../gtk/sip_account.ui.h:8 -msgid "Route (optional):" -msgstr "路由(可选)：" - -#: ../gtk/sip_account.ui.h:9 -msgid "SIP Proxy address:" -msgstr "SIP 代理地址：" - -#: ../gtk/sip_account.ui.h:10 +#: ../gtk/sip_account.ui.h:2 msgid "Your SIP identity:" msgstr "您的 SIP 地址：" -#: ../gtk/sip_account.ui.h:11 +#: ../gtk/sip_account.ui.h:3 +msgid "Looks like sip:@" +msgstr "类似于 sip:<用户名>@<域>" + +#: ../gtk/sip_account.ui.h:4 msgid "sip:" msgstr "sip:" -#: ../gtk/chatroom.ui.h:1 -msgid "Send" -msgstr "发送" +#: ../gtk/sip_account.ui.h:5 +msgid "SIP Proxy address:" +msgstr "SIP 代理地址：" + +#: ../gtk/sip_account.ui.h:6 +msgid "Looks like sip:" +msgstr "类似于 sip:<代理主机名>" + +#: ../gtk/sip_account.ui.h:7 +msgid "Route (optional):" +msgstr "路由(可选)：" + +#: ../gtk/sip_account.ui.h:8 +msgid "Registration duration (sec):" +msgstr "注册间隔(秒)：" + +#: ../gtk/sip_account.ui.h:9 +msgid "Register" +msgstr "" + +#: ../gtk/sip_account.ui.h:10 +msgid "Publish presence information" +msgstr "发布在线状态" + +#: ../gtk/sip_account.ui.h:11 +msgid "Configure a SIP account" +msgstr "配置 SIP 帐户" #: ../gtk/parameters.ui.h:1 -msgid "0 stands for \"unlimited\"" -msgstr "0 表示 “没有限制”" +msgid "default soundcard" +msgstr "默认声卡" #: ../gtk/parameters.ui.h:2 -msgid "Audio" -msgstr "音频" +#, fuzzy +msgid "a sound card" +msgstr "声卡\n" #: ../gtk/parameters.ui.h:3 -msgid "Bandwidth control" -msgstr "带宽控制" +msgid "default camera" +msgstr "默认摄像头" #: ../gtk/parameters.ui.h:4 -msgid "Codecs" -msgstr "编解码器" +msgid "CIF" +msgstr "CIF" #: ../gtk/parameters.ui.h:5 -msgid "Default identity" -msgstr "默认帐户" - -#: ../gtk/parameters.ui.h:6 -msgid "Language" -msgstr "语言" - -#: ../gtk/parameters.ui.h:7 -msgid "Level" -msgstr "级别" - -#: ../gtk/parameters.ui.h:8 -msgid "NAT and Firewall" -msgstr "NAT 及防火墙" - -#: ../gtk/parameters.ui.h:9 -msgid "Network protocol and ports" -msgstr "" - -#: ../gtk/parameters.ui.h:10 -msgid "Privacy" -msgstr "隐私" - -#: ../gtk/parameters.ui.h:11 -msgid "Proxy accounts" -msgstr "代理帐户" - -#: ../gtk/parameters.ui.h:12 -msgid "Transport" -msgstr "传输协议" - -#: ../gtk/parameters.ui.h:13 -msgid "Video" -msgstr "视频" - -#: ../gtk/parameters.ui.h:14 -msgid "" -"Adaptive rate control is a technique to dynamically guess the available " -"bandwidth during a call." -msgstr "" - -#: ../gtk/parameters.ui.h:15 -msgid "ALSA special device (optional):" -msgstr "ALSA 特殊设备(可选)：" - -#: ../gtk/parameters.ui.h:16 -msgid "Add" -msgstr "添加" - -#: ../gtk/parameters.ui.h:17 -msgid "Audio RTP/UDP:" -msgstr "音频 RTP/UDP：" - -#: ../gtk/parameters.ui.h:18 #, fuzzy msgid "Audio codecs" msgstr "" "音频编解码器\n" "视频编解码器" -#: ../gtk/parameters.ui.h:19 -msgid "Behind NAT / Firewall (specify gateway IP below)" -msgstr "在 NAT 或防火墙后(填写网关 IP)" - -#: ../gtk/parameters.ui.h:20 -msgid "Behind NAT / Firewall (use STUN to resolve)" -msgstr "在 NAT 或防火墙后(使用 STUN 解决)" - -#: ../gtk/parameters.ui.h:22 -msgid "CIF" -msgstr "CIF" - -#: ../gtk/parameters.ui.h:23 -msgid "Capture device:" -msgstr "录音设备：" - -#: ../gtk/parameters.ui.h:24 -msgid "Codecs" -msgstr "编解码器" - -#: ../gtk/parameters.ui.h:25 -msgid "Direct connection to the Internet" -msgstr "直接连接到互联网" - -#: ../gtk/parameters.ui.h:26 -msgid "Disable" -msgstr "禁用" - -#: ../gtk/parameters.ui.h:27 -msgid "Done" -msgstr "完成" - -#: ../gtk/parameters.ui.h:28 -msgid "Download speed limit in Kbit/sec:" -msgstr "下载速率限制 kbit/s：" - -#: ../gtk/parameters.ui.h:29 -msgid "Edit" -msgstr "编辑" - -#: ../gtk/parameters.ui.h:30 -msgid "Enable" -msgstr "启用" - -#: ../gtk/parameters.ui.h:31 -msgid "Enable adaptive rate control" -msgstr "" - -#: ../gtk/parameters.ui.h:32 -msgid "Enable echo cancellation" -msgstr "启用回声抑制" - -#: ../gtk/parameters.ui.h:33 -msgid "Erase all passwords" -msgstr "清除所有密码" - -#: ../gtk/parameters.ui.h:34 -msgid "Manage SIP Accounts" -msgstr "SIP 帐户管理" - -#: ../gtk/parameters.ui.h:35 -msgid "Media encryption type" -msgstr "" - -#: ../gtk/parameters.ui.h:36 -msgid "Multimedia settings" -msgstr "音视频设置" - -#: ../gtk/parameters.ui.h:37 -msgid "Network settings" -msgstr "网络设置" - -#: ../gtk/parameters.ui.h:38 -msgid "Playback device:" -msgstr "回放设备：" - -#: ../gtk/parameters.ui.h:39 -msgid "Prefered video resolution:" -msgstr "视频分辨率：" - -#: ../gtk/parameters.ui.h:40 -msgid "Public IP address:" -msgstr "公网 IP 地址：" - -#: ../gtk/parameters.ui.h:41 -msgid "" -"Register to FONICS\n" -"virtual network !" -msgstr "" -"注册到 FONICS\n" -"虚拟网络!" - -#: ../gtk/parameters.ui.h:43 -msgid "Remove" -msgstr "移除" - -#: ../gtk/parameters.ui.h:44 -msgid "Ring device:" -msgstr "响铃设备：" - -#: ../gtk/parameters.ui.h:45 -msgid "Ring sound:" -msgstr "铃声文件：" - -#: ../gtk/parameters.ui.h:46 -#, fuzzy -msgid "SIP (TCP)" -msgstr "SIP (UDP)：" - -#: ../gtk/parameters.ui.h:47 -#, fuzzy -msgid "SIP (TLS)" -msgstr "SIP (UDP)：" - -#: ../gtk/parameters.ui.h:48 -#, fuzzy -msgid "SIP (UDP)" -msgstr "SIP (UDP)：" - -#: ../gtk/parameters.ui.h:49 -msgid "Send DTMFs as SIP info" -msgstr "以 SIP 消息发送 DTMF" - -#: ../gtk/parameters.ui.h:50 -msgid "Set Maximum Transmission Unit:" -msgstr "设置最大传输单元(MTU)：" - -#: ../gtk/parameters.ui.h:51 -msgid "Settings" -msgstr "设置" - -#: ../gtk/parameters.ui.h:52 -msgid "Show advanced settings" -msgstr "显示高级设置" - -#: ../gtk/parameters.ui.h:53 -msgid "Stun server:" -msgstr "Stun 服务器：" - -#: ../gtk/parameters.ui.h:54 -msgid "This section defines your SIP address when not using a SIP account" -msgstr "该段在您不使用SIP帐户时的SIP地址" - -#: ../gtk/parameters.ui.h:55 -msgid "Upload speed limit in Kbit/sec:" -msgstr "上传速率限制 kbit/s：" - -#: ../gtk/parameters.ui.h:56 -msgid "Use IPv6 instead of IPv4" -msgstr "使用 IPv6 而非 IPv4" - -#: ../gtk/parameters.ui.h:57 -msgid "User interface" -msgstr "用户界面" - -#: ../gtk/parameters.ui.h:58 -msgid "Video RTP/UDP:" -msgstr "视频 RTP/UDP：" - -#: ../gtk/parameters.ui.h:59 +#: ../gtk/parameters.ui.h:6 #, fuzzy msgid "Video codecs" msgstr "" "音频编解码器\n" "视频编解码器" -#: ../gtk/parameters.ui.h:60 +#: ../gtk/parameters.ui.h:8 +#, fuzzy +msgid "SIP (UDP)" +msgstr "SIP (UDP)：" + +#: ../gtk/parameters.ui.h:9 +#, fuzzy +msgid "SIP (TCP)" +msgstr "SIP (UDP)：" + +#: ../gtk/parameters.ui.h:10 +#, fuzzy +msgid "SIP (TLS)" +msgstr "SIP (UDP)：" + +#: ../gtk/parameters.ui.h:11 +msgid "Settings" +msgstr "设置" + +#: ../gtk/parameters.ui.h:12 +msgid "Set Maximum Transmission Unit:" +msgstr "设置最大传输单元(MTU)：" + +#: ../gtk/parameters.ui.h:13 +msgid "Send DTMFs as SIP info" +msgstr "以 SIP 消息发送 DTMF" + +#: ../gtk/parameters.ui.h:14 +msgid "Use IPv6 instead of IPv4" +msgstr "使用 IPv6 而非 IPv4" + +#: ../gtk/parameters.ui.h:15 +msgid "Transport" +msgstr "传输协议" + +#: ../gtk/parameters.ui.h:16 +msgid "Media encryption type" +msgstr "" + +#: ../gtk/parameters.ui.h:17 +msgid "Tunnel" +msgstr "" + +#: ../gtk/parameters.ui.h:18 +msgid "Video RTP/UDP:" +msgstr "视频 RTP/UDP：" + +#: ../gtk/parameters.ui.h:19 +msgid "Audio RTP/UDP:" +msgstr "音频 RTP/UDP：" + +#: ../gtk/parameters.ui.h:20 +msgid "DSCP fields" +msgstr "" + +#: ../gtk/parameters.ui.h:21 +msgid "Fixed" +msgstr "" + +#: ../gtk/parameters.ui.h:22 +msgid "Network protocol and ports" +msgstr "" + +#: ../gtk/parameters.ui.h:23 +msgid "Direct connection to the Internet" +msgstr "直接连接到互联网" + +#: ../gtk/parameters.ui.h:24 +msgid "Behind NAT / Firewall (specify gateway IP below)" +msgstr "在 NAT 或防火墙后(填写网关 IP)" + +#: ../gtk/parameters.ui.h:25 +msgid "Public IP address:" +msgstr "公网 IP 地址：" + +#: ../gtk/parameters.ui.h:26 +msgid "Behind NAT / Firewall (use STUN to resolve)" +msgstr "在 NAT 或防火墙后(使用 STUN 解决)" + +#: ../gtk/parameters.ui.h:27 +#, fuzzy +msgid "Behind NAT / Firewall (use ICE)" +msgstr "在 NAT 或防火墙后(使用 STUN 解决)" + +#: ../gtk/parameters.ui.h:28 +msgid "Stun server:" +msgstr "Stun 服务器：" + +#: ../gtk/parameters.ui.h:29 +msgid "NAT and Firewall" +msgstr "NAT 及防火墙" + +#: ../gtk/parameters.ui.h:30 +msgid "Network settings" +msgstr "网络设置" + +#: ../gtk/parameters.ui.h:31 +msgid "Ring sound:" +msgstr "铃声文件：" + +#: ../gtk/parameters.ui.h:32 +msgid "ALSA special device (optional):" +msgstr "ALSA 特殊设备(可选)：" + +#: ../gtk/parameters.ui.h:33 +msgid "Capture device:" +msgstr "录音设备：" + +#: ../gtk/parameters.ui.h:34 +msgid "Ring device:" +msgstr "响铃设备：" + +#: ../gtk/parameters.ui.h:35 +msgid "Playback device:" +msgstr "回放设备：" + +#: ../gtk/parameters.ui.h:36 +msgid "Enable echo cancellation" +msgstr "启用回声抑制" + +#: ../gtk/parameters.ui.h:37 +msgid "Audio" +msgstr "音频" + +#: ../gtk/parameters.ui.h:38 msgid "Video input device:" msgstr "视频输入设备：" -#: ../gtk/parameters.ui.h:61 +#: ../gtk/parameters.ui.h:39 +msgid "Prefered video resolution:" +msgstr "视频分辨率：" + +#: ../gtk/parameters.ui.h:40 +msgid "Video" +msgstr "视频" + +#: ../gtk/parameters.ui.h:41 +msgid "Multimedia settings" +msgstr "音视频设置" + +#: ../gtk/parameters.ui.h:42 +msgid "This section defines your SIP address when not using a SIP account" +msgstr "该段在您不使用SIP帐户时的SIP地址" + +#: ../gtk/parameters.ui.h:43 msgid "Your display name (eg: John Doe):" msgstr "您的显示名：" -#: ../gtk/parameters.ui.h:62 -msgid "Your resulting SIP address:" -msgstr "您的 SIP 地址结果：" - -#: ../gtk/parameters.ui.h:63 +#: ../gtk/parameters.ui.h:44 msgid "Your username:" msgstr "您的用户名：" +#: ../gtk/parameters.ui.h:45 +msgid "Your resulting SIP address:" +msgstr "您的 SIP 地址结果：" + +#: ../gtk/parameters.ui.h:46 +msgid "Default identity" +msgstr "默认帐户" + +#: ../gtk/parameters.ui.h:47 +msgid "Wizard" +msgstr "" + +#: ../gtk/parameters.ui.h:50 +msgid "Remove" +msgstr "移除" + +#: ../gtk/parameters.ui.h:51 +msgid "Proxy accounts" +msgstr "代理帐户" + +#: ../gtk/parameters.ui.h:52 +msgid "Erase all passwords" +msgstr "清除所有密码" + +#: ../gtk/parameters.ui.h:53 +msgid "Privacy" +msgstr "隐私" + +#: ../gtk/parameters.ui.h:54 +msgid "Manage SIP Accounts" +msgstr "SIP 帐户管理" + +#: ../gtk/parameters.ui.h:55 ../gtk/tunnel_config.ui.h:4 +msgid "Enable" +msgstr "启用" + +#: ../gtk/parameters.ui.h:56 ../gtk/tunnel_config.ui.h:5 +msgid "Disable" +msgstr "禁用" + +#: ../gtk/parameters.ui.h:57 +msgid "Codecs" +msgstr "编解码器" + +#: ../gtk/parameters.ui.h:58 +msgid "0 stands for \"unlimited\"" +msgstr "0 表示 “没有限制”" + +#: ../gtk/parameters.ui.h:59 +msgid "Upload speed limit in Kbit/sec:" +msgstr "上传速率限制 kbit/s：" + +#: ../gtk/parameters.ui.h:60 +msgid "Download speed limit in Kbit/sec:" +msgstr "下载速率限制 kbit/s：" + +#: ../gtk/parameters.ui.h:61 +msgid "Enable adaptive rate control" +msgstr "" + +#: ../gtk/parameters.ui.h:62 +msgid "" +"Adaptive rate control is a technique to dynamically guess the available " +"bandwidth during a call." +msgstr "" + +#: ../gtk/parameters.ui.h:63 +msgid "Bandwidth control" +msgstr "带宽控制" + #: ../gtk/parameters.ui.h:64 -#, fuzzy -msgid "a sound card" -msgstr "声卡\n" +msgid "Codecs" +msgstr "编解码器" #: ../gtk/parameters.ui.h:65 -msgid "default camera" -msgstr "默认摄像头" +msgid "Language" +msgstr "语言" #: ../gtk/parameters.ui.h:66 -msgid "default soundcard" -msgstr "默认声卡" +msgid "Show advanced settings" +msgstr "显示高级设置" + +#: ../gtk/parameters.ui.h:67 +msgid "Level" +msgstr "级别" + +#: ../gtk/parameters.ui.h:68 +msgid "User interface" +msgstr "用户界面" + +#: ../gtk/parameters.ui.h:69 +msgid "Done" +msgstr "完成" #: ../gtk/buddylookup.ui.h:1 -msgid "Search somebody" -msgstr "找人" +msgid "Search contacts in directory" +msgstr "查找联系人" #: ../gtk/buddylookup.ui.h:2 msgid "Add to my list" msgstr "添加为联系人" #: ../gtk/buddylookup.ui.h:3 -msgid "Search contacts in directory" -msgstr "查找联系人" +msgid "Search somebody" +msgstr "找人" #: ../gtk/waiting.ui.h:1 msgid "Linphone" @@ -1197,19 +1356,99 @@ msgstr "Linphone" msgid "Please wait" msgstr "请稍候" -#: ../coreapi/linphonecore.c:187 +#: ../gtk/dscp_settings.ui.h:1 +#, fuzzy +msgid "Dscp settings" +msgstr "设置" + +#: ../gtk/dscp_settings.ui.h:2 +msgid "SIP" +msgstr "" + +#: ../gtk/dscp_settings.ui.h:3 +#, fuzzy +msgid "Audio RTP stream" +msgstr "音频重采样" + +#: ../gtk/dscp_settings.ui.h:4 +#, fuzzy +msgid "Video RTP stream" +msgstr "视频 RTP/UDP：" + +#: ../gtk/dscp_settings.ui.h:5 +msgid "Set DSCP values (in hexadecimal)" +msgstr "" + +#: ../gtk/call_statistics.ui.h:1 +#, fuzzy +msgid "Call statistics" +msgstr "呼叫详情" + +#: ../gtk/call_statistics.ui.h:2 +#, fuzzy +msgid "Audio codec" +msgstr "" +"音频编解码器\n" +"视频编解码器" + +#: ../gtk/call_statistics.ui.h:3 +#, fuzzy +msgid "Video codec" +msgstr "" +"音频编解码器\n" +"视频编解码器" + +#: ../gtk/call_statistics.ui.h:4 +msgid "Audio IP bandwidth usage" +msgstr "" + +#: ../gtk/call_statistics.ui.h:5 +msgid "Media connectivity" +msgstr "" + +#: ../gtk/call_statistics.ui.h:6 +msgid "Video IP bandwidth usage" +msgstr "" + +#: ../gtk/call_statistics.ui.h:7 +#, fuzzy +msgid "Call statistics and information" +msgstr "联系人信息" + +#: ../gtk/tunnel_config.ui.h:1 +#, fuzzy +msgid "Configure VoIP tunnel" +msgstr "配置 SIP 帐户" + +#: ../gtk/tunnel_config.ui.h:2 +msgid "Host" +msgstr "" + +#: ../gtk/tunnel_config.ui.h:3 +msgid "Port" +msgstr "" + +#: ../gtk/tunnel_config.ui.h:6 +msgid "Configure tunnel" +msgstr "" + +#: ../gtk/tunnel_config.ui.h:9 +msgid "Configure http proxy (optional)" +msgstr "" + +#: ../coreapi/linphonecore.c:232 msgid "aborted" msgstr "中断" -#: ../coreapi/linphonecore.c:190 +#: ../coreapi/linphonecore.c:235 msgid "completed" msgstr "完成" -#: ../coreapi/linphonecore.c:193 +#: ../coreapi/linphonecore.c:238 msgid "missed" msgstr "丢失" -#: ../coreapi/linphonecore.c:198 +#: ../coreapi/linphonecore.c:243 #, c-format msgid "" "%s at %s\n" @@ -1224,23 +1463,23 @@ msgstr "" "状态：%s\n" "状态：%i 分 %i 秒\n" -#: ../coreapi/linphonecore.c:199 +#: ../coreapi/linphonecore.c:244 msgid "Outgoing call" msgstr "呼出" -#: ../coreapi/linphonecore.c:1088 +#: ../coreapi/linphonecore.c:1226 msgid "Ready" msgstr "就绪" -#: ../coreapi/linphonecore.c:1831 +#: ../coreapi/linphonecore.c:2074 msgid "Looking for telephone number destination..." msgstr "查询电话号码目的地..." -#: ../coreapi/linphonecore.c:1834 +#: ../coreapi/linphonecore.c:2077 msgid "Could not resolve this number." msgstr "该号码无法解析。" -#: ../coreapi/linphonecore.c:1878 +#: ../coreapi/linphonecore.c:2121 msgid "" "Could not parse given sip address. A sip url usually looks like sip:" "user@domain" @@ -1248,42 +1487,54 @@ msgstr "" "无法解析给定的 SIP 地址，SIP 地址应有如下格式：\n" "sip:用户名@域名" -#: ../coreapi/linphonecore.c:2025 +#: ../coreapi/linphonecore.c:2312 msgid "Contacting" msgstr "联系中" -#: ../coreapi/linphonecore.c:2032 +#: ../coreapi/linphonecore.c:2319 #, fuzzy msgid "Could not call" msgstr "无法呼叫" -#: ../coreapi/linphonecore.c:2140 +#: ../coreapi/linphonecore.c:2429 msgid "Sorry, we have reached the maximum number of simultaneous calls" msgstr "" -#: ../coreapi/linphonecore.c:2270 +#: ../coreapi/linphonecore.c:2573 +msgid "is contacting you" +msgstr "正在联系您" + +#: ../coreapi/linphonecore.c:2574 +msgid " and asked autoanswer." +msgstr " 并询问了自动回答。" + +#: ../coreapi/linphonecore.c:2574 +msgid "." +msgstr "." + +#: ../coreapi/linphonecore.c:2636 msgid "Modifying call parameters..." msgstr "" -#: ../coreapi/linphonecore.c:2366 +#: ../coreapi/linphonecore.c:2908 msgid "Connected." msgstr "已连接。" -#: ../coreapi/linphonecore.c:2389 +#: ../coreapi/linphonecore.c:2931 #, fuzzy msgid "Call aborted" msgstr "中断" -#: ../coreapi/linphonecore.c:2530 +#: ../coreapi/linphonecore.c:3102 #, fuzzy msgid "Could not pause the call" msgstr "无法呼叫" -#: ../coreapi/linphonecore.c:2535 +#: ../coreapi/linphonecore.c:3107 msgid "Pausing the current call..." msgstr "" -#: ../coreapi/misc.c:147 +#: ../coreapi/misc.c:148 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the pcm oss emulation module\n" @@ -1294,7 +1545,7 @@ msgstr "" "ALSA 是最佳选择，然而 Linphone 必须的 PCM OSS 模拟模块缺失。\n" "请以 root 用户运行 modprobe snd-pcm-oss 载入它。" -#: ../coreapi/misc.c:150 +#: ../coreapi/misc.c:151 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the mixer oss emulation module\n" @@ -1305,10 +1556,14 @@ msgstr "" "ALSA 是最佳选择，然而 Linphone 必须的 Mixer OSS 模拟模块缺失。\n" "请以 root 用户运行 modprobe snd-mixer-oss 载入它。" -#: ../coreapi/misc.c:478 +#: ../coreapi/misc.c:496 msgid "Stun lookup in progress..." msgstr "正在进行 Stun 查找..." +#: ../coreapi/misc.c:630 +msgid "ICE local candidates gathering in progress..." +msgstr "" + #: ../coreapi/friend.c:33 msgid "Online" msgstr "在线" @@ -1357,13 +1612,13 @@ msgstr "挂起" msgid "Unknown-bug" msgstr "未知错误" -#: ../coreapi/proxy.c:192 +#: ../coreapi/proxy.c:204 msgid "" "The sip proxy address you entered is invalid, it must start with \"sip:\" " "followed by a hostname." msgstr "您输入的 SIP 代理地址无效，它必须是以“sip:”开头，并紧随一个主机名。" -#: ../coreapi/proxy.c:198 +#: ../coreapi/proxy.c:210 msgid "" "The sip identity you entered is invalid.\n" "It should look like sip:username@proxydomain, such as sip:alice@example.net" @@ -1371,148 +1626,197 @@ msgstr "" "您输入的地址无效。\n" "它应具有“sip:用户名@代理域”的形式，例如 sip:alice@example.net" -#: ../coreapi/proxy.c:690 +#: ../coreapi/proxy.c:1053 #, c-format msgid "Could not login as %s" msgstr "无法登录为 %s" -#: ../coreapi/callbacks.c:206 -msgid "is contacting you" -msgstr "正在联系您" - -#: ../coreapi/callbacks.c:207 -msgid " and asked autoanswer." -msgstr " 并询问了自动回答。" - -#: ../coreapi/callbacks.c:207 -msgid "." -msgstr "." - -#: ../coreapi/callbacks.c:266 +#: ../coreapi/callbacks.c:276 msgid "Remote ringing." msgstr "响铃。" -#: ../coreapi/callbacks.c:282 +#: ../coreapi/callbacks.c:296 #, fuzzy msgid "Remote ringing..." msgstr "响铃。" -#: ../coreapi/callbacks.c:293 +#: ../coreapi/callbacks.c:307 msgid "Early media." msgstr "" -#: ../coreapi/callbacks.c:331 +#: ../coreapi/callbacks.c:352 #, fuzzy, c-format msgid "Call with %s is paused." msgstr "与 %s 通话" -#: ../coreapi/callbacks.c:342 +#: ../coreapi/callbacks.c:365 #, c-format msgid "Call answered by %s - on hold." msgstr "" -#: ../coreapi/callbacks.c:357 +#: ../coreapi/callbacks.c:376 #, fuzzy msgid "Call resumed." msgstr "呼叫结束" -#: ../coreapi/callbacks.c:362 +#: ../coreapi/callbacks.c:381 #, c-format msgid "Call answered by %s." msgstr "" -#: ../coreapi/callbacks.c:432 -msgid "We are being paused..." +#: ../coreapi/callbacks.c:396 +msgid "Incompatible, check codecs..." msgstr "" -#: ../coreapi/callbacks.c:436 -msgid "We have been resumed..." +#: ../coreapi/callbacks.c:437 +msgid "We have been resumed." msgstr "" -#: ../coreapi/callbacks.c:441 -msgid "Call has been updated by remote..." +#: ../coreapi/callbacks.c:446 +msgid "We are paused by other party." msgstr "" -#: ../coreapi/callbacks.c:473 +#: ../coreapi/callbacks.c:452 +msgid "Call is updated by remote." +msgstr "" + +#: ../coreapi/callbacks.c:521 msgid "Call terminated." msgstr "通话结束。" -#: ../coreapi/callbacks.c:480 +#: ../coreapi/callbacks.c:528 msgid "User is busy." msgstr "被叫正忙。" -#: ../coreapi/callbacks.c:481 +#: ../coreapi/callbacks.c:529 msgid "User is temporarily unavailable." msgstr "您呼叫的用户暂时无法接通。" #. char *retrymsg=_("%s. Retry after %i minute(s)."); -#: ../coreapi/callbacks.c:483 +#: ../coreapi/callbacks.c:531 msgid "User does not want to be disturbed." msgstr "用户已开启免打扰功能。" -#: ../coreapi/callbacks.c:484 +#: ../coreapi/callbacks.c:532 msgid "Call declined." msgstr "呼叫被拒绝。" -#: ../coreapi/callbacks.c:496 +#: ../coreapi/callbacks.c:544 msgid "No response." msgstr "没有响应。" -#: ../coreapi/callbacks.c:500 +#: ../coreapi/callbacks.c:548 msgid "Protocol error." msgstr "协议错误。" -#: ../coreapi/callbacks.c:516 +#: ../coreapi/callbacks.c:564 msgid "Redirected" msgstr "已重定向" -#: ../coreapi/callbacks.c:526 -msgid "Not found" -msgstr "未找到" +#: ../coreapi/callbacks.c:600 +msgid "Incompatible media parameters." +msgstr "" -#: ../coreapi/callbacks.c:551 -msgid "No common codecs" -msgstr "未找到常用编解码器" - -#: ../coreapi/callbacks.c:557 +#: ../coreapi/callbacks.c:606 msgid "Call failed." msgstr "呼叫失败。" -#: ../coreapi/callbacks.c:631 +#: ../coreapi/callbacks.c:701 #, c-format msgid "Registration on %s successful." msgstr "成功注册到 %s" -#: ../coreapi/callbacks.c:632 +#: ../coreapi/callbacks.c:702 #, c-format msgid "Unregistration on %s done." msgstr "已在 %s 解除注册。" -#: ../coreapi/callbacks.c:648 +#: ../coreapi/callbacks.c:722 msgid "no response timeout" msgstr "没有响应，超时" -#: ../coreapi/callbacks.c:651 +#: ../coreapi/callbacks.c:725 #, c-format msgid "Registration on %s failed: %s" msgstr "注册到 %s 失败: %s" -#: ../coreapi/sal_eXosip2.c:873 ../coreapi/sal_eXosip2.c:875 -#, fuzzy -msgid "Authentication failure" -msgstr "Linphone - 需要认证" - -#: ../coreapi/linphonecall.c:128 +#: ../coreapi/linphonecall.c:129 #, fuzzy, c-format msgid "Authentication token is %s" msgstr "Linphone - 需要认证" -#: ../coreapi/linphonecall.c:1560 +#: ../coreapi/linphonecall.c:2124 #, c-format msgid "You have missed %i call." msgid_plural "You have missed %i calls." msgstr[0] "您错过了 %i 个呼叫。" +#~ msgid "Chat with %s" +#~ msgstr "与 %s 通话" + +#~ msgid "Please choose a username:" +#~ msgstr "请选择用户名：" + +#~ msgid "Checking if '%s' is available..." +#~ msgstr "检查 %s 是否可用..." + +#~ msgid "Please wait..." +#~ msgstr "请稍候..." + +#~ msgid "Sorry this username already exists. Please try a new one." +#~ msgstr "对不起，该用户已经存在，请换一个尝试。" + +#~ msgid "Ok !" +#~ msgstr "成功！" + +#~ msgid "Communication problem, please try again later." +#~ msgstr "连接错误，请稍后重试。" + +#~ msgid "Choosing a username" +#~ msgstr "选择用户名：" + +#~ msgid "Verifying" +#~ msgstr "验证中" + +#~ msgid "Confirmation" +#~ msgstr "确认" + +#~ msgid "Creating your account" +#~ msgstr "正在创建您的帐户" + +#~ msgid "Now ready !" +#~ msgstr "就绪！" + +#~ msgid "Contacts" +#~ msgstr "联系人" + +#, fuzzy +#~ msgid "Enable video" +#~ msgstr "启用" + +#~ msgid "Enter username, phone number, or full sip address" +#~ msgstr "请输入用户名、电话号码或完整的 SIP 地址" + +#~ msgid "Lookup:" +#~ msgstr "查找：" + +#~ msgid "in" +#~ msgstr "于" + +#~ msgid "" +#~ "Register to FONICS\n" +#~ "virtual network !" +#~ msgstr "" +#~ "注册到 FONICS\n" +#~ "虚拟网络!" + +#~ msgid "No common codecs" +#~ msgstr "未找到常用编解码器" + +#, fuzzy +#~ msgid "Authentication failure" +#~ msgstr "Linphone - 需要认证" + #~ msgid "Unmute" #~ msgstr "取消静音" @@ -1586,9 +1890,6 @@ msgstr[0] "您错过了 %i 个呼叫。" #~ msgid "A filter that send several inputs to one output." #~ msgstr "将多个输入发送至单个输出。" -#~ msgid "Audio resampler" -#~ msgstr "音频重采样" - #~ msgid "RTP output filter" #~ msgstr "RTP 输出过滤器" @@ -1695,9 +1996,6 @@ msgstr[0] "您错过了 %i 个呼叫。" #~ msgid "A SDL-based video display" #~ msgstr "通用视频显示" -#~ msgid "ICE filter" -#~ msgstr "ICE 过滤器" - #~ msgid "A webcam grabber based on directshow." #~ msgstr "使用 DirectShow 的摄像头抓取器" @@ -1741,18 +2039,12 @@ msgstr[0] "您错过了 %i 个呼叫。" #~ msgid "Assistant" #~ msgstr "配置向导" -#~ msgid "Call Details" -#~ msgstr "呼叫详情" - #~ msgid "Show debug messages" #~ msgstr "显示调试信息" #~ msgid "Start call" #~ msgstr "开始呼叫" -#~ msgid "Terminate call" -#~ msgstr "终止呼叫" - #~ msgid "_Modes" #~ msgstr "模式(_M)" diff --git a/po/zh_TW.po b/po/zh_TW.po index 220a3436d..dbc09613d 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: linphone 3.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-12-05 12:41+0100\n" +"POT-Creation-Date: 2013-01-08 10:35+0100\n" "PO-Revision-Date: 2011-04-06 21:24+0800\n" "Last-Translator: Chao-Hsiung Liao \n" "Language-Team: \n" @@ -17,30 +17,52 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../gtk/calllogs.c:71 +#: ../gtk/calllogs.c:82 +#, fuzzy +msgid "Aborted" +msgstr "已放棄" + +#: ../gtk/calllogs.c:85 +#, fuzzy +msgid "Missed" +msgstr "未接" + +#: ../gtk/calllogs.c:88 +#, fuzzy +msgid "Declined" +msgstr "拒接" + +#: ../gtk/calllogs.c:94 #, c-format msgid "%i minute" msgid_plural "%i minutes" msgstr[0] "" -#: ../gtk/calllogs.c:74 +#: ../gtk/calllogs.c:97 #, c-format msgid "%i second" msgid_plural "%i seconds" msgstr[0] "" -#: ../gtk/calllogs.c:77 +#: ../gtk/calllogs.c:100 #, c-format msgid "" "%s\t%s\tQuality: %s\n" "%s\t%s %s\t" msgstr "" -#: ../gtk/calllogs.c:79 +#: ../gtk/calllogs.c:102 msgid "n/a" msgstr "" -#: ../gtk/conference.c:33 ../gtk/incall_view.c:183 +#: ../gtk/calllogs.c:105 +#, c-format +msgid "" +"%s\t%s\t\n" +"%s\t%s" +msgstr "" + +#: ../gtk/conference.c:33 ../gtk/main.ui.h:13 msgid "Conference" msgstr "" @@ -54,44 +76,43 @@ msgstr "靜音" msgid "Couldn't find pixmap file: %s" msgstr "找不到 pixmap 檔：%s" -#: ../gtk/chat.c:27 -#, c-format -msgid "Chat with %s" -msgstr "和 %s 聊天" - -#: ../gtk/main.c:83 +#: ../gtk/main.c:89 msgid "log to stdout some debug information while running." msgstr "執行時將一些除錯資訊記錄到標準輸出。" -#: ../gtk/main.c:90 +#: ../gtk/main.c:96 msgid "path to a file to write logs into." msgstr "" -#: ../gtk/main.c:97 +#: ../gtk/main.c:103 +msgid "Start linphone with video disabled." +msgstr "" + +#: ../gtk/main.c:110 msgid "Start only in the system tray, do not show the main interface." msgstr "只在系統匣啟動，不要顯示主要介面。" -#: ../gtk/main.c:104 +#: ../gtk/main.c:117 msgid "address to call right now" msgstr "現在要打電話的位址" -#: ../gtk/main.c:111 +#: ../gtk/main.c:124 msgid "if set automatically answer incoming calls" msgstr "如啟用此項，將會自動接聽來電" -#: ../gtk/main.c:118 +#: ../gtk/main.c:131 msgid "" "Specifiy a working directory (should be the base of the installation, eg: c:" "\\Program Files\\Linphone)" msgstr "" "指定一個工作目錄（應該為安裝的根目錄，例如：c:\\Program Files\\Linphone）" -#: ../gtk/main.c:464 +#: ../gtk/main.c:498 #, c-format msgid "Call with %s" msgstr "和 %s 通話" -#: ../gtk/main.c:815 +#: ../gtk/main.c:871 #, c-format msgid "" "%s would like to add you to his contact list.\n" @@ -103,7 +124,7 @@ msgstr "" "您是否要允許他看見您的上線狀態或將他加入您的連絡人清單？\n" "如果您回答否，這個人會被暫時列入黑名單。" -#: ../gtk/main.c:893 +#: ../gtk/main.c:948 #, c-format msgid "" "Please enter your password for username %s\n" @@ -112,56 +133,61 @@ msgstr "" "請輸入您使用者名稱 %s\n" "於網域 %s 的密碼：" -#: ../gtk/main.c:993 +#: ../gtk/main.c:1051 #, fuzzy msgid "Call error" msgstr "通話紀錄" -#: ../gtk/main.c:996 ../coreapi/linphonecore.c:2406 +#: ../gtk/main.c:1054 ../coreapi/linphonecore.c:2949 msgid "Call ended" msgstr "通話已結束" -#: ../gtk/main.c:999 ../coreapi/linphonecore.c:199 +#: ../gtk/main.c:1057 ../coreapi/linphonecore.c:244 msgid "Incoming call" msgstr "來電" -#: ../gtk/main.c:1001 ../gtk/incall_view.c:292 ../gtk/main.ui.h:20 +#: ../gtk/main.c:1059 ../gtk/incall_view.c:451 ../gtk/main.ui.h:6 msgid "Answer" msgstr "接聽" -#: ../gtk/main.c:1003 ../gtk/main.ui.h:29 +#: ../gtk/main.c:1061 ../gtk/main.ui.h:7 msgid "Decline" msgstr "拒接" -#: ../gtk/main.c:1009 +#: ../gtk/main.c:1067 #, fuzzy msgid "Call paused" msgstr "通話已放棄" -#: ../gtk/main.c:1009 +#: ../gtk/main.c:1067 #, c-format msgid "by %s" msgstr "" -#: ../gtk/main.c:1165 +#: ../gtk/main.c:1116 +#, c-format +msgid "%s proposed to start video. Do you accept ?" +msgstr "" + +#: ../gtk/main.c:1278 msgid "Website link" msgstr "網站連結" -#: ../gtk/main.c:1205 +#: ../gtk/main.c:1318 msgid "Linphone - a video internet phone" msgstr "Linphone - 網路視訊電話" -#: ../gtk/main.c:1295 +#: ../gtk/main.c:1410 #, c-format msgid "%s (Default)" msgstr "%s （預設值）" -#: ../gtk/main.c:1566 ../coreapi/callbacks.c:700 +#: ../gtk/main.c:1714 ../coreapi/callbacks.c:774 #, c-format msgid "We are transferred to %s" msgstr "我們被轉接到 %s" -#: ../gtk/main.c:1576 +#: ../gtk/main.c:1724 msgid "" "No sound cards have been detected on this computer.\n" "You won't be able to send or receive audio calls." @@ -169,162 +195,175 @@ msgstr "" "在這臺電腦中偵測不到音效卡。\n" "您將無法傳送或接收語音電話。" -#: ../gtk/main.c:1663 +#: ../gtk/main.c:1833 msgid "A free SIP video-phone" msgstr "自由的 SIP 視訊電話" -#: ../gtk/friendlist.c:203 +#: ../gtk/friendlist.c:335 msgid "Add to addressbook" msgstr "" -#: ../gtk/friendlist.c:258 ../gtk/propertybox.c:296 ../gtk/contact.ui.h:3 -msgid "Name" -msgstr "名稱" - -#: ../gtk/friendlist.c:271 +#: ../gtk/friendlist.c:509 msgid "Presence status" msgstr "上線狀態" -#: ../gtk/friendlist.c:308 +#: ../gtk/friendlist.c:526 ../gtk/propertybox.c:362 ../gtk/contact.ui.h:1 +msgid "Name" +msgstr "名稱" + +#: ../gtk/friendlist.c:538 +#, fuzzy +msgid "Call" +msgstr "播打給 %s" + +#: ../gtk/friendlist.c:543 +msgid "Chat" +msgstr "" + +#: ../gtk/friendlist.c:573 #, c-format msgid "Search in %s directory" msgstr "在 %s 目錄中搜尋" -#: ../gtk/friendlist.c:568 +#: ../gtk/friendlist.c:730 msgid "Invalid sip contact !" msgstr "無效的 sip 連絡人！" -#: ../gtk/friendlist.c:613 +#: ../gtk/friendlist.c:775 #, c-format msgid "Call %s" msgstr "播打給 %s" -#: ../gtk/friendlist.c:614 +#: ../gtk/friendlist.c:776 #, c-format msgid "Send text to %s" msgstr "傳送文字給 %s" -#: ../gtk/friendlist.c:615 +#: ../gtk/friendlist.c:777 #, c-format msgid "Edit contact '%s'" msgstr "編輯連絡人「%s」" -#: ../gtk/friendlist.c:616 +#: ../gtk/friendlist.c:778 #, c-format msgid "Delete contact '%s'" msgstr "刪除連絡人「%s」" -#: ../gtk/friendlist.c:658 +#: ../gtk/friendlist.c:820 #, c-format msgid "Add new contact from %s directory" msgstr "從 %s 目錄加入新的連絡人" -#: ../gtk/propertybox.c:302 +#: ../gtk/propertybox.c:368 msgid "Rate (Hz)" msgstr "頻率 (Hz)" -#: ../gtk/propertybox.c:308 +#: ../gtk/propertybox.c:374 msgid "Status" msgstr "狀態" -#: ../gtk/propertybox.c:314 +#: ../gtk/propertybox.c:380 msgid "Min bitrate (kbit/s)" msgstr "最小頻寬 (kbit/s)" -#: ../gtk/propertybox.c:321 +#: ../gtk/propertybox.c:387 msgid "Parameters" msgstr "參數" -#: ../gtk/propertybox.c:364 ../gtk/propertybox.c:507 +#: ../gtk/propertybox.c:430 ../gtk/propertybox.c:573 msgid "Enabled" msgstr "已啟用" -#: ../gtk/propertybox.c:366 ../gtk/propertybox.c:507 +#: ../gtk/propertybox.c:432 ../gtk/propertybox.c:573 msgid "Disabled" msgstr "已停用" -#: ../gtk/propertybox.c:553 +#: ../gtk/propertybox.c:619 msgid "Account" msgstr "帳號" -#: ../gtk/propertybox.c:693 +#: ../gtk/propertybox.c:759 msgid "English" msgstr "英語" -#: ../gtk/propertybox.c:694 +#: ../gtk/propertybox.c:760 msgid "French" msgstr "法語" -#: ../gtk/propertybox.c:695 +#: ../gtk/propertybox.c:761 msgid "Swedish" msgstr "瑞典語" -#: ../gtk/propertybox.c:696 +#: ../gtk/propertybox.c:762 msgid "Italian" msgstr "義大利語" -#: ../gtk/propertybox.c:697 +#: ../gtk/propertybox.c:763 msgid "Spanish" msgstr "西班牙語" -#: ../gtk/propertybox.c:698 +#: ../gtk/propertybox.c:764 msgid "Brazilian Portugese" msgstr "巴西葡萄牙語" -#: ../gtk/propertybox.c:699 +#: ../gtk/propertybox.c:765 msgid "Polish" msgstr "波蘭語" -#: ../gtk/propertybox.c:700 +#: ../gtk/propertybox.c:766 msgid "German" msgstr "德語" -#: ../gtk/propertybox.c:701 +#: ../gtk/propertybox.c:767 msgid "Russian" msgstr "俄語" -#: ../gtk/propertybox.c:702 +#: ../gtk/propertybox.c:768 msgid "Japanese" msgstr "日語" -#: ../gtk/propertybox.c:703 +#: ../gtk/propertybox.c:769 msgid "Dutch" msgstr "荷蘭語" -#: ../gtk/propertybox.c:704 +#: ../gtk/propertybox.c:770 msgid "Hungarian" msgstr "匈牙利語" -#: ../gtk/propertybox.c:705 +#: ../gtk/propertybox.c:771 msgid "Czech" msgstr "捷克語" -#: ../gtk/propertybox.c:706 +#: ../gtk/propertybox.c:772 msgid "Chinese" msgstr "中文" -#: ../gtk/propertybox.c:707 +#: ../gtk/propertybox.c:773 msgid "Traditional Chinese" msgstr "" -#: ../gtk/propertybox.c:708 +#: ../gtk/propertybox.c:774 msgid "Norwegian" msgstr "" -#: ../gtk/propertybox.c:765 +#: ../gtk/propertybox.c:775 +msgid "Hebrew" +msgstr "" + +#: ../gtk/propertybox.c:842 msgid "" "You need to restart linphone for the new language selection to take effect." msgstr "您需要重新啟動 linphone 才能讓新選擇的語言生效。" -#: ../gtk/propertybox.c:835 +#: ../gtk/propertybox.c:912 msgid "None" msgstr "" -#: ../gtk/propertybox.c:839 +#: ../gtk/propertybox.c:916 msgid "SRTP" msgstr "" -#: ../gtk/propertybox.c:845 +#: ../gtk/propertybox.c:922 msgid "ZRTP" msgstr "" @@ -367,7 +406,7 @@ msgid "Found %i contact" msgid_plural "Found %i contacts" msgstr[0] "找不到 %i 個連絡人" -#: ../gtk/setupwizard.c:25 +#: ../gtk/setupwizard.c:33 msgid "" "Welcome !\n" "This assistant will help you to use a SIP account for your calls." @@ -375,168 +414,272 @@ msgstr "" "歡迎！\n" "這個助理會協助您使用電話的 SIP 帳號。" -#: ../gtk/setupwizard.c:34 -msgid "Create an account by choosing a username" +#: ../gtk/setupwizard.c:42 +#, fuzzy +msgid "Create an account on linphone.org" msgstr "以選擇的使用者名稱建立一個帳號" -#: ../gtk/setupwizard.c:35 -msgid "I have already an account and just want to use it" +#: ../gtk/setupwizard.c:43 +#, fuzzy +msgid "I have already a linphone.org account and I just want to use it" msgstr "我已經有帳號，並且要使用這個帳號" -#: ../gtk/setupwizard.c:53 -msgid "Please choose a username:" -msgstr "請選擇一個使用者名稱：" +#: ../gtk/setupwizard.c:44 +#, fuzzy +msgid "I have already a sip account and I just want to use it" +msgstr "我已經有帳號，並且要使用這個帳號" -#: ../gtk/setupwizard.c:54 +#: ../gtk/setupwizard.c:84 +msgid "Enter your linphone.org username" +msgstr "" + +#: ../gtk/setupwizard.c:91 msgid "Username:" msgstr "使用者名稱：" -#: ../gtk/setupwizard.c:92 -#, c-format -msgid "Checking if '%s' is available..." -msgstr "檢查「%s」是否可用…" +#: ../gtk/setupwizard.c:93 ../gtk/password.ui.h:4 +msgid "Password:" +msgstr "密碼： " -#: ../gtk/setupwizard.c:97 ../gtk/setupwizard.c:164 -msgid "Please wait..." -msgstr "請稍候..." +#: ../gtk/setupwizard.c:113 +msgid "Enter your account informations" +msgstr "" -#: ../gtk/setupwizard.c:101 -msgid "Sorry this username already exists. Please try a new one." -msgstr "很抱歉這個使用者名稱已經存在。請嘗試新的名稱。" +#: ../gtk/setupwizard.c:120 +#, fuzzy +msgid "Username*" +msgstr "使用者名稱" -#: ../gtk/setupwizard.c:103 ../gtk/setupwizard.c:168 -msgid "Ok !" -msgstr "確定！" +#: ../gtk/setupwizard.c:121 +#, fuzzy +msgid "Password*" +msgstr "密碼" -#: ../gtk/setupwizard.c:106 ../gtk/setupwizard.c:171 -msgid "Communication problem, please try again later." -msgstr "連線問題，請稍後再試一次。" +#: ../gtk/setupwizard.c:124 +msgid "Domain*" +msgstr "" -#: ../gtk/setupwizard.c:134 +#: ../gtk/setupwizard.c:125 +msgid "Proxy" +msgstr "" + +#: ../gtk/setupwizard.c:297 +msgid "(*) Required fields" +msgstr "" + +#: ../gtk/setupwizard.c:298 +#, fuzzy +msgid "Username: (*)" +msgstr "使用者名稱：" + +#: ../gtk/setupwizard.c:300 +#, fuzzy +msgid "Password: (*)" +msgstr "密碼： " + +#: ../gtk/setupwizard.c:302 +msgid "Email: (*)" +msgstr "" + +#: ../gtk/setupwizard.c:304 +msgid "Confirm your password: (*)" +msgstr "" + +#: ../gtk/setupwizard.c:368 +msgid "" +"Error, account not validated, username already used or server unreachable.\n" +"Please go back and try again." +msgstr "" + +#: ../gtk/setupwizard.c:379 msgid "Thank you. Your account is now configured and ready for use." msgstr "謝謝您。您的帳號已設定完成並且可以使用。" -#: ../gtk/setupwizard.c:228 +#: ../gtk/setupwizard.c:387 +msgid "" +"Please validate your account by clicking on the link we just sent you by " +"email.\n" +"Then come back here and press Next button." +msgstr "" + +#: ../gtk/setupwizard.c:554 msgid "Welcome to the account setup assistant" msgstr "歡迎使用帳號設定助理" -#: ../gtk/setupwizard.c:232 +#: ../gtk/setupwizard.c:559 msgid "Account setup assistant" msgstr "帳號設定助理" -#: ../gtk/setupwizard.c:236 -msgid "Choosing a username" -msgstr "選擇使用者名稱" +#: ../gtk/setupwizard.c:565 +#, fuzzy +msgid "Configure your account (step 1/1)" +msgstr "設定 SIP 帳號" -#: ../gtk/setupwizard.c:240 -msgid "Verifying" -msgstr "檢驗中" +#: ../gtk/setupwizard.c:570 +msgid "Enter your sip username (step 1/1)" +msgstr "" -#: ../gtk/setupwizard.c:244 -msgid "Confirmation" -msgstr "確認" +#: ../gtk/setupwizard.c:574 +msgid "Enter account information (step 1/2)" +msgstr "" -#: ../gtk/setupwizard.c:249 -msgid "Creating your account" -msgstr "正在建立您的帳號" +#: ../gtk/setupwizard.c:583 +msgid "Validation (step 2/2)" +msgstr "" -#: ../gtk/setupwizard.c:253 -msgid "Now ready !" -msgstr "現在已就緒！" +#: ../gtk/setupwizard.c:588 +msgid "Error" +msgstr "" -#: ../gtk/incall_view.c:69 +#: ../gtk/setupwizard.c:592 +msgid "Terminating" +msgstr "" + +#: ../gtk/incall_view.c:69 ../gtk/incall_view.c:90 #, fuzzy, c-format msgid "Call #%i" msgstr "播打給 %s" -#: ../gtk/incall_view.c:127 +#: ../gtk/incall_view.c:150 #, c-format msgid "Transfer to call #%i with %s" msgstr "" -#: ../gtk/incall_view.c:155 -msgid "Transfer" -msgstr "轉接" +#: ../gtk/incall_view.c:209 ../gtk/incall_view.c:212 +#, fuzzy +msgid "Not used" +msgstr "找不到" -#: ../gtk/incall_view.c:271 +#: ../gtk/incall_view.c:219 +msgid "ICE not activated" +msgstr "" + +#: ../gtk/incall_view.c:221 +#, fuzzy +msgid "ICE failed" +msgstr "ICE 過濾器" + +#: ../gtk/incall_view.c:223 +msgid "ICE in progress" +msgstr "" + +#: ../gtk/incall_view.c:225 +msgid "Going through one or more NATs" +msgstr "" + +#: ../gtk/incall_view.c:227 +#, fuzzy +msgid "Direct" +msgstr "已重新導向" + +#: ../gtk/incall_view.c:229 +msgid "Through a relay server" +msgstr "" + +#: ../gtk/incall_view.c:238 ../gtk/incall_view.c:242 +#, c-format +msgid "" +"download: %f\n" +"upload: %f (kbit/s)" +msgstr "" + +#: ../gtk/incall_view.c:341 ../gtk/main.ui.h:12 +msgid "Hang up" +msgstr "" + +#: ../gtk/incall_view.c:430 msgid "Calling..." msgstr "播打..." -#: ../gtk/incall_view.c:274 ../gtk/incall_view.c:482 +#: ../gtk/incall_view.c:433 ../gtk/incall_view.c:646 msgid "00::00::00" msgstr "00::00::00" -#: ../gtk/incall_view.c:285 +#: ../gtk/incall_view.c:444 msgid "Incoming call" msgstr "來電" -#: ../gtk/incall_view.c:322 +#: ../gtk/incall_view.c:481 msgid "good" msgstr "" -#: ../gtk/incall_view.c:324 +#: ../gtk/incall_view.c:483 msgid "average" msgstr "" -#: ../gtk/incall_view.c:326 +#: ../gtk/incall_view.c:485 msgid "poor" msgstr "" -#: ../gtk/incall_view.c:328 +#: ../gtk/incall_view.c:487 msgid "very poor" msgstr "" -#: ../gtk/incall_view.c:330 +#: ../gtk/incall_view.c:489 msgid "too bad" msgstr "" -#: ../gtk/incall_view.c:331 ../gtk/incall_view.c:347 +#: ../gtk/incall_view.c:490 ../gtk/incall_view.c:506 msgid "unavailable" msgstr "" -#: ../gtk/incall_view.c:447 +#: ../gtk/incall_view.c:605 msgid "Secured by SRTP" msgstr "" -#: ../gtk/incall_view.c:453 +#: ../gtk/incall_view.c:611 #, c-format msgid "Secured by ZRTP - [auth token: %s]" msgstr "" -#: ../gtk/incall_view.c:459 +#: ../gtk/incall_view.c:617 msgid "Set unverified" msgstr "" -#: ../gtk/incall_view.c:459 ../gtk/main.ui.h:49 +#: ../gtk/incall_view.c:617 ../gtk/main.ui.h:5 msgid "Set verified" msgstr "" -#: ../gtk/incall_view.c:480 +#: ../gtk/incall_view.c:641 msgid "In conference" msgstr "" -#: ../gtk/incall_view.c:480 +#: ../gtk/incall_view.c:641 msgid "In call" msgstr "通話中" -#: ../gtk/incall_view.c:499 +#: ../gtk/incall_view.c:669 msgid "Paused call" msgstr "暫停通話" -#: ../gtk/incall_view.c:511 +#: ../gtk/incall_view.c:682 #, c-format msgid "%02i::%02i::%02i" msgstr "%02i::%02i::%02i" -#: ../gtk/incall_view.c:527 +#: ../gtk/incall_view.c:699 msgid "Call ended." msgstr "通話結束。" -#: ../gtk/incall_view.c:584 +#: ../gtk/incall_view.c:731 +msgid "Transfer in progress" +msgstr "" + +#: ../gtk/incall_view.c:734 +#, fuzzy +msgid "Transfer done." +msgstr "轉接" + +#: ../gtk/incall_view.c:737 +#, fuzzy +msgid "Transfer failed." +msgstr "轉接" + +#: ../gtk/incall_view.c:781 msgid "Resume" msgstr "繼續" -#: ../gtk/incall_view.c:591 ../gtk/main.ui.h:45 +#: ../gtk/incall_view.c:788 ../gtk/main.ui.h:9 msgid "Pause" msgstr "暫停" @@ -546,225 +689,240 @@ msgid "Please enter login information for %s" msgstr "請輸入 %s 的 登入資訊" #: ../gtk/main.ui.h:1 -msgid "#" -msgstr "#" - -#: ../gtk/main.ui.h:2 -msgid "*" -msgstr "*" - -#: ../gtk/main.ui.h:3 -msgid "0" -msgstr "0" - -#: ../gtk/main.ui.h:4 -msgid "1" -msgstr "1" - -#: ../gtk/main.ui.h:5 -msgid "2" -msgstr "2" - -#: ../gtk/main.ui.h:6 -msgid "3" -msgstr "3" - -#: ../gtk/main.ui.h:7 -msgid "4" -msgstr "4" - -#: ../gtk/main.ui.h:8 -msgid "5" -msgstr "5" - -#: ../gtk/main.ui.h:9 -msgid "6" -msgstr "6" - -#: ../gtk/main.ui.h:10 -msgid "7" -msgstr "7" - -#: ../gtk/main.ui.h:11 -msgid "8" -msgstr "8" - -#: ../gtk/main.ui.h:12 -msgid "9" -msgstr "9" - -#: ../gtk/main.ui.h:13 -msgid "Add contacts from directory" -msgstr "從目錄加入連絡人" - -#: ../gtk/main.ui.h:14 #, fuzzy msgid "Callee name" msgstr "通話結束。" +#: ../gtk/main.ui.h:2 +msgid "Send" +msgstr "傳送" + +#: ../gtk/main.ui.h:3 +msgid "End conference" +msgstr "" + +#: ../gtk/main.ui.h:4 +msgid "label" +msgstr "標籤" + +#: ../gtk/main.ui.h:8 +msgid "Video" +msgstr "" + +#: ../gtk/main.ui.h:10 +msgid "Mute" +msgstr "" + +#: ../gtk/main.ui.h:11 +msgid "Transfer" +msgstr "轉接" + +#: ../gtk/main.ui.h:14 +msgid "In call" +msgstr "通話中" + #: ../gtk/main.ui.h:15 -msgid "Welcome !" -msgstr "歡迎使用！" +msgid "Duration" +msgstr "時間長度" #: ../gtk/main.ui.h:16 -msgid "A" -msgstr "A" - -#: ../gtk/main.ui.h:17 -msgid "ADSL" -msgstr "ADSL" - -#: ../gtk/main.ui.h:18 -msgid "Add contact" -msgstr "加入聯絡人" - -#: ../gtk/main.ui.h:19 -msgid "All users" -msgstr "所有使用者" - -#: ../gtk/main.ui.h:21 -msgid "Automatically log me in" -msgstr "將我自動登入" - -#: ../gtk/main.ui.h:22 -msgid "B" -msgstr "B" - -#: ../gtk/main.ui.h:23 ../gtk/parameters.ui.h:21 -msgid "C" -msgstr "C" - -#: ../gtk/main.ui.h:24 -#, fuzzy -msgid "Call" -msgstr "播打給 %s" - -#: ../gtk/main.ui.h:25 msgid "Call quality rating" msgstr "" -#: ../gtk/main.ui.h:26 +#: ../gtk/main.ui.h:17 +msgid "_Options" +msgstr "選項(_O)" + +#: ../gtk/main.ui.h:18 +msgid "Always start video" +msgstr "" + +#: ../gtk/main.ui.h:19 +msgid "Enable self-view" +msgstr "啟用自拍檢視" + +#: ../gtk/main.ui.h:20 +msgid "_Help" +msgstr "求助(_H)" + +#: ../gtk/main.ui.h:21 +msgid "Show debug window" +msgstr "顯示除錯視窗" + +#: ../gtk/main.ui.h:22 +msgid "_Homepage" +msgstr "官方網頁(_H)" + +#: ../gtk/main.ui.h:23 msgid "Check _Updates" msgstr "檢查更新(_U)" -#: ../gtk/main.ui.h:27 -msgid "Contacts" -msgstr "連絡人" +#: ../gtk/main.ui.h:24 +#, fuzzy +msgid "Account assistant" +msgstr "帳號設定助理" -#: ../gtk/main.ui.h:28 +#: ../gtk/main.ui.h:25 +msgid "SIP address or phone number:" +msgstr "SIP 位址或電話號碼：" + +#: ../gtk/main.ui.h:26 +msgid "Initiate a new call" +msgstr "打出新電話" + +#: ../gtk/main.ui.h:27 ../gtk/parameters.ui.h:48 +msgid "Add" +msgstr "加入" + +#: ../gtk/main.ui.h:28 ../gtk/parameters.ui.h:49 +msgid "Edit" +msgstr "編輯" + +#: ../gtk/main.ui.h:29 msgid "D" msgstr "D" #: ../gtk/main.ui.h:30 -msgid "Default" -msgstr "預設值" +msgid "#" +msgstr "#" #: ../gtk/main.ui.h:31 -msgid "Duration" -msgstr "時間長度" +msgid "0" +msgstr "0" #: ../gtk/main.ui.h:32 -msgid "Enable self-view" -msgstr "啟用自拍檢視" +msgid "*" +msgstr "*" -#: ../gtk/main.ui.h:33 -#, fuzzy -msgid "Enable video" -msgstr "已啟用" +#: ../gtk/main.ui.h:33 ../gtk/parameters.ui.h:7 +msgid "C" +msgstr "C" #: ../gtk/main.ui.h:34 -msgid "Enter username, phone number, or full sip address" -msgstr "輸入使用者名稱、電話號碼或完整的 sip 位址" +msgid "9" +msgstr "9" #: ../gtk/main.ui.h:35 -msgid "Fiber Channel" -msgstr "光纖通道" +msgid "8" +msgstr "8" #: ../gtk/main.ui.h:36 -msgid "In call" -msgstr "通話中" +msgid "7" +msgstr "7" #: ../gtk/main.ui.h:37 -msgid "Initiate a new call" -msgstr "打出新電話" +msgid "B" +msgstr "B" #: ../gtk/main.ui.h:38 -msgid "Internet connection:" -msgstr "網路連線：" +msgid "6" +msgstr "6" #: ../gtk/main.ui.h:39 +msgid "5" +msgstr "5" + +#: ../gtk/main.ui.h:40 +msgid "4" +msgstr "4" + +#: ../gtk/main.ui.h:41 +msgid "A" +msgstr "A" + +#: ../gtk/main.ui.h:42 +msgid "3" +msgstr "3" + +#: ../gtk/main.ui.h:43 +msgid "2" +msgstr "2" + +#: ../gtk/main.ui.h:44 +msgid "1" +msgstr "1" + +#: ../gtk/main.ui.h:45 +msgid "Search" +msgstr "搜尋" + +#: ../gtk/main.ui.h:46 +msgid "Add contacts from directory" +msgstr "從目錄加入連絡人" + +#: ../gtk/main.ui.h:47 +msgid "Add contact" +msgstr "加入聯絡人" + +#: ../gtk/main.ui.h:48 msgid "Keypad" msgstr "撥號盤" -#: ../gtk/main.ui.h:40 -msgid "Login information" -msgstr "登入資訊" - -#: ../gtk/main.ui.h:41 -msgid "Lookup:" -msgstr "查詢：" - -#: ../gtk/main.ui.h:42 -msgid "My current identity:" -msgstr "我目前的使用者識別：" - -#: ../gtk/main.ui.h:43 -msgid "Online users" -msgstr "線上使用者" - -#: ../gtk/main.ui.h:44 -msgid "Password" -msgstr "密碼" - -#: ../gtk/main.ui.h:46 +#: ../gtk/main.ui.h:49 #, fuzzy msgid "Recent calls" msgstr "通話中" -#: ../gtk/main.ui.h:47 -msgid "SIP address or phone number:" -msgstr "SIP 位址或電話號碼：" - -#: ../gtk/main.ui.h:48 -msgid "Search" -msgstr "搜尋" - #: ../gtk/main.ui.h:50 -msgid "Show debug window" -msgstr "顯示除錯視窗" +msgid "My current identity:" +msgstr "我目前的使用者識別：" -#: ../gtk/main.ui.h:51 +#: ../gtk/main.ui.h:51 ../gtk/tunnel_config.ui.h:7 msgid "Username" msgstr "使用者名稱" -#: ../gtk/main.ui.h:52 -msgid "_Help" -msgstr "求助(_H)" +#: ../gtk/main.ui.h:52 ../gtk/tunnel_config.ui.h:8 +msgid "Password" +msgstr "密碼" #: ../gtk/main.ui.h:53 -msgid "_Homepage" -msgstr "官方網頁(_H)" +msgid "Internet connection:" +msgstr "網路連線：" #: ../gtk/main.ui.h:54 -msgid "_Options" -msgstr "選項(_O)" +msgid "Automatically log me in" +msgstr "將我自動登入" #: ../gtk/main.ui.h:55 -msgid "in" -msgstr "於" +msgid "Login information" +msgstr "登入資訊" #: ../gtk/main.ui.h:56 -msgid "label" -msgstr "標籤" +msgid "Welcome !" +msgstr "歡迎使用！" + +#: ../gtk/main.ui.h:57 +msgid "All users" +msgstr "所有使用者" + +#: ../gtk/main.ui.h:58 +msgid "Online users" +msgstr "線上使用者" + +#: ../gtk/main.ui.h:59 +msgid "ADSL" +msgstr "ADSL" + +#: ../gtk/main.ui.h:60 +msgid "Fiber Channel" +msgstr "光纖通道" + +#: ../gtk/main.ui.h:61 +msgid "Default" +msgstr "預設值" + +#: ../gtk/main.ui.h:62 +msgid "Delete" +msgstr "" #: ../gtk/about.ui.h:1 -msgid "(C) Belledonne Communications,2010\n" -msgstr "(C) Belledonne Communications,2010\n" - -#: ../gtk/about.ui.h:3 msgid "About linphone" msgstr "關於 linphone" +#: ../gtk/about.ui.h:2 +msgid "(C) Belledonne Communications,2010\n" +msgstr "(C) Belledonne Communications,2010\n" + #: ../gtk/about.ui.h:4 msgid "An internet video phone using the standard SIP (rfc3261) protocol." msgstr "使用標準 SIP (rfc3261) 通訊協定的網路視訊電話。" @@ -795,378 +953,379 @@ msgstr "" "cs: Petr Pisar \n" "hu: anonymous\n" -#: ../gtk/contact.ui.h:1 -msgid "Contact information" -msgstr "連絡人資訊" - #: ../gtk/contact.ui.h:2 -msgid "Allow this contact to see my presence status" -msgstr "允許這個連絡人看到我的上線狀態" - -#: ../gtk/contact.ui.h:4 msgid "SIP Address" msgstr "SIP 位址" -#: ../gtk/contact.ui.h:5 +#: ../gtk/contact.ui.h:3 msgid "Show this contact presence status" msgstr "顯示這個連絡人的上線狀態" +#: ../gtk/contact.ui.h:4 +msgid "Allow this contact to see my presence status" +msgstr "允許這個連絡人看到我的上線狀態" + +#: ../gtk/contact.ui.h:5 +msgid "Contact information" +msgstr "連絡人資訊" + #: ../gtk/log.ui.h:1 msgid "Linphone debug window" msgstr "Linphone 除錯視窗" +#: ../gtk/log.ui.h:2 +msgid "Scroll to end" +msgstr "" + #: ../gtk/password.ui.h:1 msgid "Linphone - Authentication required" msgstr "Linphone - 需要驗證" #: ../gtk/password.ui.h:2 -msgid "Password:" -msgstr "密碼： " - -#: ../gtk/password.ui.h:3 msgid "Please enter the domain password" msgstr "請輸入這個網域的密碼" -#: ../gtk/password.ui.h:4 +#: ../gtk/password.ui.h:3 msgid "UserID" msgstr "使用者ID" #: ../gtk/call_logs.ui.h:1 -msgid "Call back" -msgstr "回電" - -#: ../gtk/call_logs.ui.h:2 msgid "Call history" msgstr "通話紀錄" -#: ../gtk/call_logs.ui.h:3 +#: ../gtk/call_logs.ui.h:2 msgid "Clear all" msgstr "全部清除" -#: ../gtk/sip_account.ui.h:1 -msgid "Configure a SIP account" -msgstr "設定 SIP 帳號" +#: ../gtk/call_logs.ui.h:3 +msgid "Call back" +msgstr "回電" -#: ../gtk/sip_account.ui.h:2 +#: ../gtk/sip_account.ui.h:1 msgid "Linphone - Configure a SIP account" msgstr "Linphone - 設定 SIP 帳號" -#: ../gtk/sip_account.ui.h:3 -msgid "Looks like sip:" -msgstr "看起來像 sip:" - -#: ../gtk/sip_account.ui.h:4 -msgid "Looks like sip:@" -msgstr "看起來像 sip:@" - -#: ../gtk/sip_account.ui.h:5 -msgid "Publish presence information" -msgstr "發布上線資訊" - -#: ../gtk/sip_account.ui.h:6 -msgid "Register" -msgstr "" - -#: ../gtk/sip_account.ui.h:7 -msgid "Registration duration (sec):" -msgstr "註冊時間 (秒):" - -#: ../gtk/sip_account.ui.h:8 -msgid "Route (optional):" -msgstr "路由 (選擇性):" - -#: ../gtk/sip_account.ui.h:9 -msgid "SIP Proxy address:" -msgstr "SIP 代理位址:" - -#: ../gtk/sip_account.ui.h:10 +#: ../gtk/sip_account.ui.h:2 msgid "Your SIP identity:" msgstr "您的 SIP 使用者識別:" -#: ../gtk/sip_account.ui.h:11 +#: ../gtk/sip_account.ui.h:3 +msgid "Looks like sip:@" +msgstr "看起來像 sip:@" + +#: ../gtk/sip_account.ui.h:4 msgid "sip:" msgstr "sip:" -#: ../gtk/chatroom.ui.h:1 -msgid "Send" -msgstr "傳送" +#: ../gtk/sip_account.ui.h:5 +msgid "SIP Proxy address:" +msgstr "SIP 代理位址:" + +#: ../gtk/sip_account.ui.h:6 +msgid "Looks like sip:" +msgstr "看起來像 sip:" + +#: ../gtk/sip_account.ui.h:7 +msgid "Route (optional):" +msgstr "路由 (選擇性):" + +#: ../gtk/sip_account.ui.h:8 +msgid "Registration duration (sec):" +msgstr "註冊時間 (秒):" + +#: ../gtk/sip_account.ui.h:9 +msgid "Register" +msgstr "" + +#: ../gtk/sip_account.ui.h:10 +msgid "Publish presence information" +msgstr "發布上線資訊" + +#: ../gtk/sip_account.ui.h:11 +msgid "Configure a SIP account" +msgstr "設定 SIP 帳號" #: ../gtk/parameters.ui.h:1 -msgid "0 stands for \"unlimited\"" -msgstr "0 表示「不限制」" +msgid "default soundcard" +msgstr "預設的音效卡" #: ../gtk/parameters.ui.h:2 -msgid "Audio" -msgstr "音效" +msgid "a sound card" +msgstr "音效卡" #: ../gtk/parameters.ui.h:3 -msgid "Bandwidth control" -msgstr "頻寬控制" +msgid "default camera" +msgstr "預設的攝影機" #: ../gtk/parameters.ui.h:4 -msgid "Codecs" -msgstr "編碼解碼器" - -#: ../gtk/parameters.ui.h:5 -msgid "Default identity" -msgstr "預設身分識別" - -#: ../gtk/parameters.ui.h:6 -msgid "Language" -msgstr "語言" - -#: ../gtk/parameters.ui.h:7 -msgid "Level" -msgstr "級數" - -#: ../gtk/parameters.ui.h:8 -msgid "NAT and Firewall" -msgstr "NAT 與防火牆" - -#: ../gtk/parameters.ui.h:9 -msgid "Network protocol and ports" -msgstr "" - -#: ../gtk/parameters.ui.h:10 -msgid "Privacy" -msgstr "隱私" - -#: ../gtk/parameters.ui.h:11 -msgid "Proxy accounts" -msgstr "代理伺服器帳號" - -#: ../gtk/parameters.ui.h:12 -msgid "Transport" -msgstr "傳輸" - -#: ../gtk/parameters.ui.h:13 -msgid "Video" -msgstr "視訊" - -#: ../gtk/parameters.ui.h:14 -msgid "" -"Adaptive rate control is a technique to dynamically guess the available " -"bandwidth during a call." -msgstr "" - -#: ../gtk/parameters.ui.h:15 -msgid "ALSA special device (optional):" -msgstr "ALSA 特殊裝置 (選擇性)：" - -#: ../gtk/parameters.ui.h:16 -msgid "Add" -msgstr "加入" - -#: ../gtk/parameters.ui.h:17 -msgid "Audio RTP/UDP:" -msgstr "音效 RTP/UDP:" - -#: ../gtk/parameters.ui.h:18 -msgid "Audio codecs" -msgstr "音訊編碼解碼器" - -#: ../gtk/parameters.ui.h:19 -msgid "Behind NAT / Firewall (specify gateway IP below)" -msgstr "在 NAT / 防火牆之後 (在下面指定閘道器 IP)" - -#: ../gtk/parameters.ui.h:20 -msgid "Behind NAT / Firewall (use STUN to resolve)" -msgstr "在 NAT / 防火牆之後 (使用 STUN 解析)" - -#: ../gtk/parameters.ui.h:22 msgid "CIF" msgstr "CIF" -#: ../gtk/parameters.ui.h:23 -msgid "Capture device:" -msgstr "捕捉裝置:" +#: ../gtk/parameters.ui.h:5 +msgid "Audio codecs" +msgstr "音訊編碼解碼器" -#: ../gtk/parameters.ui.h:24 -msgid "Codecs" -msgstr "編碼解碼器" +#: ../gtk/parameters.ui.h:6 +msgid "Video codecs" +msgstr "視訊編碼解碼器" -#: ../gtk/parameters.ui.h:25 -msgid "Direct connection to the Internet" -msgstr "直接連線到網際網路" +#: ../gtk/parameters.ui.h:8 +#, fuzzy +msgid "SIP (UDP)" +msgstr "SIP (UDP):" -#: ../gtk/parameters.ui.h:26 -msgid "Disable" -msgstr "停用" +#: ../gtk/parameters.ui.h:9 +#, fuzzy +msgid "SIP (TCP)" +msgstr "SIP (TCP):" -#: ../gtk/parameters.ui.h:27 -msgid "Done" -msgstr "完成" +#: ../gtk/parameters.ui.h:10 +#, fuzzy +msgid "SIP (TLS)" +msgstr "SIP (TCP):" -#: ../gtk/parameters.ui.h:28 -msgid "Download speed limit in Kbit/sec:" -msgstr "下載速度限制於 Kbit/sec:" +#: ../gtk/parameters.ui.h:11 +msgid "Settings" +msgstr "設定值" -#: ../gtk/parameters.ui.h:29 -msgid "Edit" -msgstr "編輯" +#: ../gtk/parameters.ui.h:12 +msgid "Set Maximum Transmission Unit:" +msgstr "設定最大傳輸單位:" -#: ../gtk/parameters.ui.h:30 -msgid "Enable" -msgstr "啟用" +#: ../gtk/parameters.ui.h:13 +msgid "Send DTMFs as SIP info" +msgstr "傳送 DTMFs 為 SIP 資訊" -#: ../gtk/parameters.ui.h:31 -msgid "Enable adaptive rate control" -msgstr "" +#: ../gtk/parameters.ui.h:14 +msgid "Use IPv6 instead of IPv4" +msgstr "使用 IPv6 代替 IPv4" -#: ../gtk/parameters.ui.h:32 -msgid "Enable echo cancellation" -msgstr "啟用回音消除" +#: ../gtk/parameters.ui.h:15 +msgid "Transport" +msgstr "傳輸" -#: ../gtk/parameters.ui.h:33 -msgid "Erase all passwords" -msgstr "消除所有的密碼" - -#: ../gtk/parameters.ui.h:34 -msgid "Manage SIP Accounts" -msgstr "管理 SIP 帳號" - -#: ../gtk/parameters.ui.h:35 +#: ../gtk/parameters.ui.h:16 msgid "Media encryption type" msgstr "" -#: ../gtk/parameters.ui.h:36 -msgid "Multimedia settings" -msgstr "多媒體設定值" +#: ../gtk/parameters.ui.h:17 +msgid "Tunnel" +msgstr "" -#: ../gtk/parameters.ui.h:37 +#: ../gtk/parameters.ui.h:18 +msgid "Video RTP/UDP:" +msgstr "視訊 RTP/UDP:" + +#: ../gtk/parameters.ui.h:19 +msgid "Audio RTP/UDP:" +msgstr "音效 RTP/UDP:" + +#: ../gtk/parameters.ui.h:20 +msgid "DSCP fields" +msgstr "" + +#: ../gtk/parameters.ui.h:21 +msgid "Fixed" +msgstr "" + +#: ../gtk/parameters.ui.h:22 +msgid "Network protocol and ports" +msgstr "" + +#: ../gtk/parameters.ui.h:23 +msgid "Direct connection to the Internet" +msgstr "直接連線到網際網路" + +#: ../gtk/parameters.ui.h:24 +msgid "Behind NAT / Firewall (specify gateway IP below)" +msgstr "在 NAT / 防火牆之後 (在下面指定閘道器 IP)" + +#: ../gtk/parameters.ui.h:25 +msgid "Public IP address:" +msgstr "公共 IP 地址:" + +#: ../gtk/parameters.ui.h:26 +msgid "Behind NAT / Firewall (use STUN to resolve)" +msgstr "在 NAT / 防火牆之後 (使用 STUN 解析)" + +#: ../gtk/parameters.ui.h:27 +#, fuzzy +msgid "Behind NAT / Firewall (use ICE)" +msgstr "在 NAT / 防火牆之後 (使用 STUN 解析)" + +#: ../gtk/parameters.ui.h:28 +msgid "Stun server:" +msgstr "Stun 伺服器:" + +#: ../gtk/parameters.ui.h:29 +msgid "NAT and Firewall" +msgstr "NAT 與防火牆" + +#: ../gtk/parameters.ui.h:30 msgid "Network settings" msgstr "網路設定值" -#: ../gtk/parameters.ui.h:38 +#: ../gtk/parameters.ui.h:31 +msgid "Ring sound:" +msgstr "鈴聲音效:" + +#: ../gtk/parameters.ui.h:32 +msgid "ALSA special device (optional):" +msgstr "ALSA 特殊裝置 (選擇性)：" + +#: ../gtk/parameters.ui.h:33 +msgid "Capture device:" +msgstr "捕捉裝置:" + +#: ../gtk/parameters.ui.h:34 +msgid "Ring device:" +msgstr "響鈴裝置:" + +#: ../gtk/parameters.ui.h:35 msgid "Playback device:" msgstr "播放裝置" +#: ../gtk/parameters.ui.h:36 +msgid "Enable echo cancellation" +msgstr "啟用回音消除" + +#: ../gtk/parameters.ui.h:37 +msgid "Audio" +msgstr "音效" + +#: ../gtk/parameters.ui.h:38 +msgid "Video input device:" +msgstr "視訊輸入裝置:" + #: ../gtk/parameters.ui.h:39 msgid "Prefered video resolution:" msgstr "偏好的視訊解析度:" #: ../gtk/parameters.ui.h:40 -msgid "Public IP address:" -msgstr "公共 IP 地址:" +msgid "Video" +msgstr "視訊" #: ../gtk/parameters.ui.h:41 -msgid "" -"Register to FONICS\n" -"virtual network !" -msgstr "" -"註冊到 FONICS\n" -"虛擬網路！" +msgid "Multimedia settings" +msgstr "多媒體設定值" -#: ../gtk/parameters.ui.h:43 -msgid "Remove" -msgstr "移除" - -#: ../gtk/parameters.ui.h:44 -msgid "Ring device:" -msgstr "響鈴裝置:" - -#: ../gtk/parameters.ui.h:45 -msgid "Ring sound:" -msgstr "鈴聲音效:" - -#: ../gtk/parameters.ui.h:46 -#, fuzzy -msgid "SIP (TCP)" -msgstr "SIP (TCP):" - -#: ../gtk/parameters.ui.h:47 -#, fuzzy -msgid "SIP (TLS)" -msgstr "SIP (TCP):" - -#: ../gtk/parameters.ui.h:48 -#, fuzzy -msgid "SIP (UDP)" -msgstr "SIP (UDP):" - -#: ../gtk/parameters.ui.h:49 -msgid "Send DTMFs as SIP info" -msgstr "傳送 DTMFs 為 SIP 資訊" - -#: ../gtk/parameters.ui.h:50 -msgid "Set Maximum Transmission Unit:" -msgstr "設定最大傳輸單位:" - -#: ../gtk/parameters.ui.h:51 -msgid "Settings" -msgstr "設定值" - -#: ../gtk/parameters.ui.h:52 -msgid "Show advanced settings" -msgstr "顯示進階設定值" - -#: ../gtk/parameters.ui.h:53 -msgid "Stun server:" -msgstr "Stun 伺服器:" - -#: ../gtk/parameters.ui.h:54 +#: ../gtk/parameters.ui.h:42 msgid "This section defines your SIP address when not using a SIP account" msgstr "這一區在不使用 SIP 帳號時定義您的 SIP 位址" -#: ../gtk/parameters.ui.h:55 -msgid "Upload speed limit in Kbit/sec:" -msgstr "上傳速度限制於 Kbit/sec:" - -#: ../gtk/parameters.ui.h:56 -msgid "Use IPv6 instead of IPv4" -msgstr "使用 IPv6 代替 IPv4" - -#: ../gtk/parameters.ui.h:57 -msgid "User interface" -msgstr "使用者介面" - -#: ../gtk/parameters.ui.h:58 -msgid "Video RTP/UDP:" -msgstr "視訊 RTP/UDP:" - -#: ../gtk/parameters.ui.h:59 -msgid "Video codecs" -msgstr "視訊編碼解碼器" - -#: ../gtk/parameters.ui.h:60 -msgid "Video input device:" -msgstr "視訊輸入裝置:" - -#: ../gtk/parameters.ui.h:61 +#: ../gtk/parameters.ui.h:43 msgid "Your display name (eg: John Doe):" msgstr "您的顯示名稱 (例如: John Doe):" -#: ../gtk/parameters.ui.h:62 -msgid "Your resulting SIP address:" -msgstr "您組成的 SIP 位址:" - -#: ../gtk/parameters.ui.h:63 +#: ../gtk/parameters.ui.h:44 msgid "Your username:" msgstr "您的使用者名稱:" +#: ../gtk/parameters.ui.h:45 +msgid "Your resulting SIP address:" +msgstr "您組成的 SIP 位址:" + +#: ../gtk/parameters.ui.h:46 +msgid "Default identity" +msgstr "預設身分識別" + +#: ../gtk/parameters.ui.h:47 +msgid "Wizard" +msgstr "" + +#: ../gtk/parameters.ui.h:50 +msgid "Remove" +msgstr "移除" + +#: ../gtk/parameters.ui.h:51 +msgid "Proxy accounts" +msgstr "代理伺服器帳號" + +#: ../gtk/parameters.ui.h:52 +msgid "Erase all passwords" +msgstr "消除所有的密碼" + +#: ../gtk/parameters.ui.h:53 +msgid "Privacy" +msgstr "隱私" + +#: ../gtk/parameters.ui.h:54 +msgid "Manage SIP Accounts" +msgstr "管理 SIP 帳號" + +#: ../gtk/parameters.ui.h:55 ../gtk/tunnel_config.ui.h:4 +msgid "Enable" +msgstr "啟用" + +#: ../gtk/parameters.ui.h:56 ../gtk/tunnel_config.ui.h:5 +msgid "Disable" +msgstr "停用" + +#: ../gtk/parameters.ui.h:57 +msgid "Codecs" +msgstr "編碼解碼器" + +#: ../gtk/parameters.ui.h:58 +msgid "0 stands for \"unlimited\"" +msgstr "0 表示「不限制」" + +#: ../gtk/parameters.ui.h:59 +msgid "Upload speed limit in Kbit/sec:" +msgstr "上傳速度限制於 Kbit/sec:" + +#: ../gtk/parameters.ui.h:60 +msgid "Download speed limit in Kbit/sec:" +msgstr "下載速度限制於 Kbit/sec:" + +#: ../gtk/parameters.ui.h:61 +msgid "Enable adaptive rate control" +msgstr "" + +#: ../gtk/parameters.ui.h:62 +msgid "" +"Adaptive rate control is a technique to dynamically guess the available " +"bandwidth during a call." +msgstr "" + +#: ../gtk/parameters.ui.h:63 +msgid "Bandwidth control" +msgstr "頻寬控制" + #: ../gtk/parameters.ui.h:64 -msgid "a sound card" -msgstr "音效卡" +msgid "Codecs" +msgstr "編碼解碼器" #: ../gtk/parameters.ui.h:65 -msgid "default camera" -msgstr "預設的攝影機" +msgid "Language" +msgstr "語言" #: ../gtk/parameters.ui.h:66 -msgid "default soundcard" -msgstr "預設的音效卡" +msgid "Show advanced settings" +msgstr "顯示進階設定值" + +#: ../gtk/parameters.ui.h:67 +msgid "Level" +msgstr "級數" + +#: ../gtk/parameters.ui.h:68 +msgid "User interface" +msgstr "使用者介面" + +#: ../gtk/parameters.ui.h:69 +msgid "Done" +msgstr "完成" #: ../gtk/buddylookup.ui.h:1 -msgid "Search somebody" -msgstr "搜尋某人" +msgid "Search contacts in directory" +msgstr "在目錄中搜尋" #: ../gtk/buddylookup.ui.h:2 msgid "Add to my list" msgstr "加入我的清單" #: ../gtk/buddylookup.ui.h:3 -msgid "Search contacts in directory" -msgstr "在目錄中搜尋" +msgid "Search somebody" +msgstr "搜尋某人" #: ../gtk/waiting.ui.h:1 msgid "Linphone" @@ -1176,19 +1335,94 @@ msgstr "Linphone" msgid "Please wait" msgstr "請稍候" -#: ../coreapi/linphonecore.c:187 +#: ../gtk/dscp_settings.ui.h:1 +#, fuzzy +msgid "Dscp settings" +msgstr "設定值" + +#: ../gtk/dscp_settings.ui.h:2 +msgid "SIP" +msgstr "" + +#: ../gtk/dscp_settings.ui.h:3 +#, fuzzy +msgid "Audio RTP stream" +msgstr "音效重取樣器" + +#: ../gtk/dscp_settings.ui.h:4 +#, fuzzy +msgid "Video RTP stream" +msgstr "視訊 RTP/UDP:" + +#: ../gtk/dscp_settings.ui.h:5 +msgid "Set DSCP values (in hexadecimal)" +msgstr "" + +#: ../gtk/call_statistics.ui.h:1 +msgid "Call statistics" +msgstr "" + +#: ../gtk/call_statistics.ui.h:2 +#, fuzzy +msgid "Audio codec" +msgstr "音訊編碼解碼器" + +#: ../gtk/call_statistics.ui.h:3 +#, fuzzy +msgid "Video codec" +msgstr "視訊編碼解碼器" + +#: ../gtk/call_statistics.ui.h:4 +msgid "Audio IP bandwidth usage" +msgstr "" + +#: ../gtk/call_statistics.ui.h:5 +msgid "Media connectivity" +msgstr "" + +#: ../gtk/call_statistics.ui.h:6 +msgid "Video IP bandwidth usage" +msgstr "" + +#: ../gtk/call_statistics.ui.h:7 +#, fuzzy +msgid "Call statistics and information" +msgstr "連絡人資訊" + +#: ../gtk/tunnel_config.ui.h:1 +#, fuzzy +msgid "Configure VoIP tunnel" +msgstr "設定 SIP 帳號" + +#: ../gtk/tunnel_config.ui.h:2 +msgid "Host" +msgstr "" + +#: ../gtk/tunnel_config.ui.h:3 +msgid "Port" +msgstr "" + +#: ../gtk/tunnel_config.ui.h:6 +msgid "Configure tunnel" +msgstr "" + +#: ../gtk/tunnel_config.ui.h:9 +msgid "Configure http proxy (optional)" +msgstr "" + +#: ../coreapi/linphonecore.c:232 msgid "aborted" msgstr "已放棄" -#: ../coreapi/linphonecore.c:190 +#: ../coreapi/linphonecore.c:235 msgid "completed" msgstr "已完成" -#: ../coreapi/linphonecore.c:193 +#: ../coreapi/linphonecore.c:238 msgid "missed" msgstr "未接" -#: ../coreapi/linphonecore.c:198 +#: ../coreapi/linphonecore.c:243 #, c-format msgid "" "%s at %s\n" @@ -1203,61 +1437,73 @@ msgstr "" "狀態：%s\n" "持續時間：%i 分 %i 秒\n" -#: ../coreapi/linphonecore.c:199 +#: ../coreapi/linphonecore.c:244 msgid "Outgoing call" msgstr "去電" -#: ../coreapi/linphonecore.c:1088 +#: ../coreapi/linphonecore.c:1226 msgid "Ready" msgstr "準備就緒" -#: ../coreapi/linphonecore.c:1831 +#: ../coreapi/linphonecore.c:2074 msgid "Looking for telephone number destination..." msgstr "尋找電話號碼目的端..." -#: ../coreapi/linphonecore.c:1834 +#: ../coreapi/linphonecore.c:2077 msgid "Could not resolve this number." msgstr "無法解析這個號碼。" -#: ../coreapi/linphonecore.c:1878 +#: ../coreapi/linphonecore.c:2121 msgid "" "Could not parse given sip address. A sip url usually looks like sip:" "user@domain" msgstr "無法解析指定的 sip 位址。sip 網址通常看起來像 sip:user@domain" -#: ../coreapi/linphonecore.c:2025 +#: ../coreapi/linphonecore.c:2312 msgid "Contacting" msgstr "正在連絡" -#: ../coreapi/linphonecore.c:2032 +#: ../coreapi/linphonecore.c:2319 msgid "Could not call" msgstr "無法通話" -#: ../coreapi/linphonecore.c:2140 +#: ../coreapi/linphonecore.c:2429 msgid "Sorry, we have reached the maximum number of simultaneous calls" msgstr "抱歉，我們已達瀏同步通話的最大數目" -#: ../coreapi/linphonecore.c:2270 +#: ../coreapi/linphonecore.c:2573 +msgid "is contacting you" +msgstr "正在連絡您" + +#: ../coreapi/linphonecore.c:2574 +msgid " and asked autoanswer." +msgstr "並要求自動接聽。" + +#: ../coreapi/linphonecore.c:2574 +msgid "." +msgstr "." + +#: ../coreapi/linphonecore.c:2636 msgid "Modifying call parameters..." msgstr "修改通話參數..." -#: ../coreapi/linphonecore.c:2366 +#: ../coreapi/linphonecore.c:2908 msgid "Connected." msgstr "已連線。" -#: ../coreapi/linphonecore.c:2389 +#: ../coreapi/linphonecore.c:2931 msgid "Call aborted" msgstr "通話已放棄" -#: ../coreapi/linphonecore.c:2530 +#: ../coreapi/linphonecore.c:3102 msgid "Could not pause the call" msgstr "無法暫停通話" -#: ../coreapi/linphonecore.c:2535 +#: ../coreapi/linphonecore.c:3107 msgid "Pausing the current call..." msgstr "暫停目前的通話..." -#: ../coreapi/misc.c:147 +#: ../coreapi/misc.c:148 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the pcm oss emulation module\n" @@ -1269,7 +1515,7 @@ msgstr "" "而 linphone 需要它。請以 root 執行\n" "'modprobe snd-pcm-oss' 載入它。" -#: ../coreapi/misc.c:150 +#: ../coreapi/misc.c:151 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the mixer oss emulation module\n" @@ -1281,10 +1527,14 @@ msgstr "" "而 linphone 需要它。請以 root 執行\n" "'modprobe snd-mixer-oss' 載入它。" -#: ../coreapi/misc.c:478 +#: ../coreapi/misc.c:496 msgid "Stun lookup in progress..." msgstr "正在進行 Stun 搜尋..." +#: ../coreapi/misc.c:630 +msgid "ICE local candidates gathering in progress..." +msgstr "" + #: ../coreapi/friend.c:33 msgid "Online" msgstr "上線" @@ -1333,14 +1583,14 @@ msgstr "等待中" msgid "Unknown-bug" msgstr "不明錯誤" -#: ../coreapi/proxy.c:192 +#: ../coreapi/proxy.c:204 msgid "" "The sip proxy address you entered is invalid, it must start with \"sip:\" " "followed by a hostname." msgstr "" "您輸入的 sip 代理位址是無效的，它必須要以「sip:」開頭，後面接主機名稱。" -#: ../coreapi/proxy.c:198 +#: ../coreapi/proxy.c:210 msgid "" "The sip identity you entered is invalid.\n" "It should look like sip:username@proxydomain, such as sip:alice@example.net" @@ -1348,145 +1598,198 @@ msgstr "" "您輸入的 sip 身分是無效的。\n" "它應該看起來像 sip:使用者名稱@代理網域，像是 sip:alice@example.net" -#: ../coreapi/proxy.c:690 +#: ../coreapi/proxy.c:1053 #, c-format msgid "Could not login as %s" msgstr "無法以 %s 登入" -#: ../coreapi/callbacks.c:206 -msgid "is contacting you" -msgstr "正在連絡您" - -#: ../coreapi/callbacks.c:207 -msgid " and asked autoanswer." -msgstr "並要求自動接聽。" - -#: ../coreapi/callbacks.c:207 -msgid "." -msgstr "." - -#: ../coreapi/callbacks.c:266 +#: ../coreapi/callbacks.c:276 msgid "Remote ringing." msgstr "遠端響鈴。" -#: ../coreapi/callbacks.c:282 +#: ../coreapi/callbacks.c:296 msgid "Remote ringing..." msgstr "遠端響鈴..." -#: ../coreapi/callbacks.c:293 +#: ../coreapi/callbacks.c:307 msgid "Early media." msgstr "早期媒體。" -#: ../coreapi/callbacks.c:331 +#: ../coreapi/callbacks.c:352 #, c-format msgid "Call with %s is paused." msgstr "和 %s 的通話已暫停。" -#: ../coreapi/callbacks.c:342 +#: ../coreapi/callbacks.c:365 #, c-format msgid "Call answered by %s - on hold." msgstr "通話由 %s 接聽 - 保留中。" -#: ../coreapi/callbacks.c:357 +#: ../coreapi/callbacks.c:376 msgid "Call resumed." msgstr "通話已繼續。" -#: ../coreapi/callbacks.c:362 +#: ../coreapi/callbacks.c:381 #, c-format msgid "Call answered by %s." msgstr "通話由 %s 接聽。" -#: ../coreapi/callbacks.c:432 -msgid "We are being paused..." -msgstr "我們被暫停了..." - -#: ../coreapi/callbacks.c:436 -msgid "We have been resumed..." -msgstr "我們要繼續了..." - -#: ../coreapi/callbacks.c:441 -msgid "Call has been updated by remote..." +#: ../coreapi/callbacks.c:396 +msgid "Incompatible, check codecs..." msgstr "" -#: ../coreapi/callbacks.c:473 +#: ../coreapi/callbacks.c:437 +#, fuzzy +msgid "We have been resumed." +msgstr "我們要繼續了..." + +#: ../coreapi/callbacks.c:446 +msgid "We are paused by other party." +msgstr "" + +#: ../coreapi/callbacks.c:452 +msgid "Call is updated by remote." +msgstr "" + +#: ../coreapi/callbacks.c:521 msgid "Call terminated." msgstr "通話已終止。" -#: ../coreapi/callbacks.c:480 +#: ../coreapi/callbacks.c:528 msgid "User is busy." msgstr "使用者現正忙碌。" -#: ../coreapi/callbacks.c:481 +#: ../coreapi/callbacks.c:529 msgid "User is temporarily unavailable." msgstr "使用者暫時無法聯繫。" #. char *retrymsg=_("%s. Retry after %i minute(s)."); -#: ../coreapi/callbacks.c:483 +#: ../coreapi/callbacks.c:531 msgid "User does not want to be disturbed." msgstr "使用者不想要被打擾。" -#: ../coreapi/callbacks.c:484 +#: ../coreapi/callbacks.c:532 msgid "Call declined." msgstr "通話被拒接。" -#: ../coreapi/callbacks.c:496 +#: ../coreapi/callbacks.c:544 msgid "No response." msgstr "沒有回應。" -#: ../coreapi/callbacks.c:500 +#: ../coreapi/callbacks.c:548 msgid "Protocol error." msgstr "通訊協定錯誤。" -#: ../coreapi/callbacks.c:516 +#: ../coreapi/callbacks.c:564 msgid "Redirected" msgstr "已重新導向" -#: ../coreapi/callbacks.c:526 -msgid "Not found" -msgstr "找不到" +#: ../coreapi/callbacks.c:600 +msgid "Incompatible media parameters." +msgstr "" -#: ../coreapi/callbacks.c:551 -msgid "No common codecs" -msgstr "沒有通用的編碼解碼器" - -#: ../coreapi/callbacks.c:557 +#: ../coreapi/callbacks.c:606 msgid "Call failed." msgstr "通話失敗。" -#: ../coreapi/callbacks.c:631 +#: ../coreapi/callbacks.c:701 #, c-format msgid "Registration on %s successful." msgstr "在 %s 註冊成功。" -#: ../coreapi/callbacks.c:632 +#: ../coreapi/callbacks.c:702 #, c-format msgid "Unregistration on %s done." msgstr "在 %s 取消註冊完成。" -#: ../coreapi/callbacks.c:648 +#: ../coreapi/callbacks.c:722 msgid "no response timeout" msgstr "沒有回應逾時" -#: ../coreapi/callbacks.c:651 +#: ../coreapi/callbacks.c:725 #, c-format msgid "Registration on %s failed: %s" msgstr "在 %s 註冊失敗：%s" -#: ../coreapi/sal_eXosip2.c:873 ../coreapi/sal_eXosip2.c:875 -msgid "Authentication failure" -msgstr "驗證失敗" - -#: ../coreapi/linphonecall.c:128 +#: ../coreapi/linphonecall.c:129 #, fuzzy, c-format msgid "Authentication token is %s" msgstr "驗證失敗" -#: ../coreapi/linphonecall.c:1560 +#: ../coreapi/linphonecall.c:2124 #, c-format msgid "You have missed %i call." msgid_plural "You have missed %i calls." msgstr[0] "您有 %i 通未接來電。" +#~ msgid "Chat with %s" +#~ msgstr "和 %s 聊天" + +#~ msgid "Please choose a username:" +#~ msgstr "請選擇一個使用者名稱：" + +#~ msgid "Checking if '%s' is available..." +#~ msgstr "檢查「%s」是否可用…" + +#~ msgid "Please wait..." +#~ msgstr "請稍候..." + +#~ msgid "Sorry this username already exists. Please try a new one." +#~ msgstr "很抱歉這個使用者名稱已經存在。請嘗試新的名稱。" + +#~ msgid "Ok !" +#~ msgstr "確定！" + +#~ msgid "Communication problem, please try again later." +#~ msgstr "連線問題，請稍後再試一次。" + +#~ msgid "Choosing a username" +#~ msgstr "選擇使用者名稱" + +#~ msgid "Verifying" +#~ msgstr "檢驗中" + +#~ msgid "Confirmation" +#~ msgstr "確認" + +#~ msgid "Creating your account" +#~ msgstr "正在建立您的帳號" + +#~ msgid "Now ready !" +#~ msgstr "現在已就緒！" + +#~ msgid "Contacts" +#~ msgstr "連絡人" + +#, fuzzy +#~ msgid "Enable video" +#~ msgstr "已啟用" + +#~ msgid "Enter username, phone number, or full sip address" +#~ msgstr "輸入使用者名稱、電話號碼或完整的 sip 位址" + +#~ msgid "Lookup:" +#~ msgstr "查詢：" + +#~ msgid "in" +#~ msgstr "於" + +#~ msgid "" +#~ "Register to FONICS\n" +#~ "virtual network !" +#~ msgstr "" +#~ "註冊到 FONICS\n" +#~ "虛擬網路！" + +#~ msgid "We are being paused..." +#~ msgstr "我們被暫停了..." + +#~ msgid "No common codecs" +#~ msgstr "沒有通用的編碼解碼器" + +#~ msgid "Authentication failure" +#~ msgstr "驗證失敗" + #~ msgid "Windows" #~ msgstr "視窗" @@ -1589,9 +1892,6 @@ msgstr[0] "您有 %i 通未接來電。" #~ msgid "A filter that send several inputs to one output." #~ msgstr "傳送多個輸入到一個輸出的過濾器。" -#~ msgid "Audio resampler" -#~ msgstr "音效重取樣器" - #~ msgid "RTP output filter" #~ msgstr "RTP 輸出過濾隱器" @@ -1703,9 +2003,6 @@ msgstr[0] "您有 %i 通未接來電。" #~ msgid "A video for windows (vfw.h) based source filter to grab pictures." #~ msgstr "windows (vfw.h) 視訊為基礎的來源過濾器以擷取圖片。" -#~ msgid "ICE filter" -#~ msgstr "ICE 過濾器" - #~ msgid "" #~ "A filter that trashes its input (useful for terminating some graphs)." #~ msgstr "將輸入丟棄的過濾器（可用來中止某些圖形）。" From 5cae5cadeb564fcf4fd0c0cc8e08d45589c22894 Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Tue, 8 Jan 2013 16:16:59 +0100 Subject: [PATCH 06/50] Detect presence of DSCP in exosip --- configure.ac | 11 +++++++++++ coreapi/sal_eXosip2.c | 2 ++ 2 files changed, 13 insertions(+) diff --git a/configure.ac b/configure.ac index 7872c6d2a..22258a9a9 100644 --- a/configure.ac +++ b/configure.ac @@ -370,6 +370,17 @@ fi dnl setup flags for exosip library LP_SETUP_EXOSIP +dnl check exosip support of DSCP in exosip +AC_MSG_CHECKING([for DSCP support in exosip]) +AC_TRY_COMPILE([#include ], +[int dscp=0;eXosip_set_option(EXOSIP_OPT_SET_DSCP,&dscp);], +has_exosip_dscp=yes,has_exosip_dscp=no) +AC_MSG_RESULT($has_exosip_dscp) +if test "$has_exosip_dscp" = "yes" ; then + AC_DEFINE( HAVE_EXOSIP_DSCP, 1, [Define if exosip dscp available] ) +fi + + if test "$console_ui" = "true" ; then dnl check gnu readline LP_CHECK_READLINE diff --git a/coreapi/sal_eXosip2.c b/coreapi/sal_eXosip2.c index 325e495d3..b26751a71 100644 --- a/coreapi/sal_eXosip2.c +++ b/coreapi/sal_eXosip2.c @@ -382,8 +382,10 @@ static void set_tls_options(Sal *ctx){ void sal_set_dscp(Sal *ctx, int dscp){ ctx->dscp=dscp; +#ifdef HAVE_EXOSIP_DSCP if (dscp!=-1) eXosip_set_option(EXOSIP_OPT_SET_DSCP,&ctx->dscp); +#endif } int sal_listen_port(Sal *ctx, const char *addr, int port, SalTransport tr, int is_secure){ From 6e5daed5fdb9daf35ea38e930b44446c5b70e9a1 Mon Sep 17 00:00:00 2001 From: Margaux Clerc Date: Wed, 9 Jan 2013 10:43:17 +0100 Subject: [PATCH 07/50] Disabled buttons in conf frame, callview improved, removing the search bar --- gtk/conference.c | 2 +- gtk/friendlist.c | 18 ++++----- gtk/incall_view.c | 22 ++++++----- gtk/main.c | 13 +++++-- gtk/main.ui | 72 ++++++++++++++++-------------------- pixmaps/startcall-small.png | Bin 0 -> 3869 bytes pixmaps/stopcall-red.png | Bin 3764 -> 5770 bytes pixmaps/stopcall-small.png | Bin 0 -> 3764 bytes 8 files changed, 64 insertions(+), 63 deletions(-) create mode 100644 pixmaps/startcall-small.png create mode 100644 pixmaps/stopcall-small.png diff --git a/gtk/conference.c b/gtk/conference.c index 546b3e1c2..dddb3cec9 100644 --- a/gtk/conference.c +++ b/gtk/conference.c @@ -95,7 +95,7 @@ void linphone_gtk_set_in_conference(LinphoneCall *call){ if(conf_frame==NULL){ conf_frame=linphone_gtk_create_widget("main","conf_frame"); GtkWidget *button_conf=linphone_gtk_get_widget(conf_frame,"terminate_conf"); - GtkWidget *image=create_pixmap("stopcall-red.png"); + GtkWidget *image=create_pixmap("stopcall-small.png"); gtk_button_set_image(GTK_BUTTON(button_conf),image); g_signal_connect_swapped(G_OBJECT(button_conf),"clicked",(GCallback)linphone_gtk_terminate_call,NULL); g_object_set_data(G_OBJECT(mw),"conf_frame",(gpointer)conf_frame); diff --git a/gtk/friendlist.c b/gtk/friendlist.c index 3ab59c613..3124fdbb1 100644 --- a/gtk/friendlist.c +++ b/gtk/friendlist.c @@ -621,10 +621,10 @@ void linphone_gtk_show_friends(void){ GtkListStore *store=NULL; GtkTreeIter iter; const MSList *itf; - GtkWidget *filter=linphone_gtk_get_widget(mw,"search_bar"); + //GtkWidget *filter=linphone_gtk_get_widget(mw,"search_bar"); LinphoneCore *core=linphone_gtk_get_core(); - const gchar *search=NULL; - gboolean lookup=FALSE; + //const gchar *search=NULL; + //gboolean lookup=FALSE; MSList *sorted; linphone_gtk_show_directory_search(); @@ -636,10 +636,10 @@ void linphone_gtk_show_friends(void){ store=GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(friendlist))); gtk_list_store_clear(store); - search=gtk_entry_get_text(GTK_ENTRY(filter)); - if (search==NULL || search[0]=='\0') - lookup=FALSE; - else lookup=TRUE; + //search=gtk_entry_get_text(GTK_ENTRY(filter)); + //if (search==NULL || search[0]=='\0') + // lookup=FALSE; + //else lookup=TRUE; sorted=sort_friend_list(linphone_core_get_friend_list(core)); @@ -650,12 +650,12 @@ void linphone_gtk_show_friends(void){ const char *name=linphone_address_get_display_name(f_uri); const char *display=name; char *escaped=NULL; - if (lookup){ + /*if (lookup){ if (strstr(uri,search)==NULL){ ms_free(uri); continue; } - } + }*/ //BuddyInfo *bi; gboolean send_subscribe=linphone_friend_get_send_subscribe(lf); if (name==NULL || name[0]=='\0') { diff --git a/gtk/incall_view.c b/gtk/incall_view.c index 6230df1ae..192e92fab 100644 --- a/gtk/incall_view.c +++ b/gtk/incall_view.c @@ -64,7 +64,7 @@ LinphoneCall *linphone_gtk_get_currently_displayed_call(gboolean *is_conf){ static GtkWidget *make_tab_header(int number){ GtkWidget *w=gtk_hbox_new (FALSE,0); - GtkWidget *i=create_pixmap ("status-green.png"); + GtkWidget *i=create_pixmap ("startcall-small.png"); GtkWidget *l; gchar *text=g_strdup_printf(_("Call #%i"),number); l=gtk_label_new (text); @@ -84,7 +84,7 @@ void update_tab_header(LinphoneCall *call,gboolean pause){ if(pause){ i=gtk_image_new_from_stock(GTK_STOCK_MEDIA_PAUSE,GTK_ICON_SIZE_SMALL_TOOLBAR); } else { - i=create_pixmap ("status-green.png"); + i=create_pixmap ("startcall-small.png"); } GtkWidget *l; gchar *text=g_strdup_printf(_("Call #%i"),call_index); @@ -107,7 +107,7 @@ static void linphone_gtk_in_call_set_animation_image(GtkWidget *callview, const } image=create_pixmap(image_name); }else - image=gtk_image_new_from_stock(image_name,GTK_ICON_SIZE_DIALOG); + image=gtk_image_new_from_stock(image_name,GTK_ICON_SIZE_DND); if (elem) gtk_widget_destroy((GtkWidget*)elem->data); gtk_widget_show(image); @@ -337,7 +337,7 @@ void linphone_gtk_create_in_call_view(LinphoneCall *call){ gtk_widget_hide(conf); GtkWidget *button=linphone_gtk_get_widget(call_view,"terminate_call"); - GtkWidget *image=create_pixmap("stopcall-red.png"); + GtkWidget *image=create_pixmap("stopcall-small.png"); gtk_button_set_label(GTK_BUTTON(button),_("Hang up")); gtk_button_set_image(GTK_BUTTON(button),image); gtk_widget_show(image); @@ -363,7 +363,7 @@ void linphone_gtk_update_video_button(LinphoneCall *call){ button=linphone_gtk_get_widget(call_view,"video_button"); gtk_button_set_image(GTK_BUTTON(button), - gtk_image_new_from_stock(has_video ? GTK_STOCK_REMOVE : GTK_STOCK_ADD,GTK_ICON_SIZE_BUTTON)); + gtk_image_new_from_stock(has_video ? GTK_STOCK_REMOVE : GTK_STOCK_ADD,GTK_ICON_SIZE_BUTTON)); g_object_set_data(G_OBJECT(button),"adding_video",GINT_TO_POINTER(!has_video)); if (!linphone_core_video_supported(linphone_call_get_core(call))){ gtk_widget_set_sensitive(button,FALSE); @@ -373,7 +373,11 @@ void linphone_gtk_update_video_button(LinphoneCall *call){ g_signal_connect(G_OBJECT(button),"clicked",(GCallback)video_button_clicked,call); g_object_set_data(G_OBJECT(button),"signal_connected",GINT_TO_POINTER(1)); } + GtkWidget *conf_frame=(GtkWidget *)g_object_get_data(G_OBJECT(linphone_gtk_get_main_window()),"conf_frame"); gtk_widget_set_sensitive(button,linphone_call_get_state(call)==LinphoneCallStreamsRunning); + if(conf_frame!=NULL){ + gtk_widget_set_sensitive(button,FALSE); + } } void linphone_gtk_remove_in_call_view(LinphoneCall *call){ @@ -447,12 +451,12 @@ void linphone_gtk_in_call_view_set_incoming(LinphoneCall *call){ display_peer_name_in_label(callee,linphone_call_get_remote_address (call)); answer_button=linphone_gtk_get_widget(callview,"accept_call"); - image=create_pixmap (linphone_gtk_get_ui_config("start_call_icon","startcall-green.png")); + image=create_pixmap (linphone_gtk_get_ui_config("start_call_icon","startcall-small.png")); gtk_button_set_label(GTK_BUTTON(answer_button),_("Answer")); gtk_button_set_image(GTK_BUTTON(answer_button),image); gtk_widget_show(image); - image=create_pixmap (linphone_gtk_get_ui_config("stop_call_icon","stopcall-red.png")); + image=create_pixmap (linphone_gtk_get_ui_config("stop_call_icon","stopcall-small.png")); gtk_button_set_image(GTK_BUTTON(linphone_gtk_get_widget(callview,"decline_call")),image); gtk_widget_show(image); @@ -636,7 +640,6 @@ void linphone_gtk_in_call_view_set_in_call(LinphoneCall *call){ gtk_widget_set_visible(linphone_gtk_get_widget(callview,"buttons_panel"),!in_conf); - gtk_widget_hide(linphone_gtk_get_widget(callview,"answer_decline_panel")); gtk_label_set_markup(GTK_LABEL(status),in_conf ? _("In conference") : _("In call")); @@ -648,7 +651,7 @@ void linphone_gtk_in_call_view_set_in_call(LinphoneCall *call){ update_tab_header(call,FALSE); linphone_gtk_enable_mute_button( GTK_BUTTON(linphone_gtk_get_widget(callview,"incall_mute")),TRUE); - gtk_widget_show_all(linphone_gtk_get_widget(callview,"buttons_panel")); + if (taskid==0){ taskid=g_timeout_add(250,(GSourceFunc)linphone_gtk_in_call_view_refresh,call); g_object_set_data(G_OBJECT(callview),"taskid",GINT_TO_POINTER(taskid)); @@ -659,6 +662,7 @@ void linphone_gtk_in_call_view_set_in_call(LinphoneCall *call){ linphone_gtk_set_in_conference(call); gtk_widget_set_sensitive(linphone_gtk_get_widget(callview,"incall_mute"),FALSE); } + gtk_widget_show_all(linphone_gtk_get_widget(callview,"buttons_panel")); if (call_stats) show_used_codecs(call_stats,call); } diff --git a/gtk/main.c b/gtk/main.c index 734079c16..5d9158713 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -724,9 +724,14 @@ static void linphone_gtk_update_call_buttons(LinphoneCall *call){ gtk_widget_set_visible(button,add_call); //gtk_widget_set_sensitive(linphone_gtk_get_widget(mw,"terminate_call"),stop_active); - - linphone_gtk_enable_transfer_button(lc,call_list_size>1); - linphone_gtk_enable_conference_button(lc,call_list_size>1); + GtkWidget *conf_frame=(GtkWidget *)g_object_get_data(G_OBJECT(mw),"conf_frame"); + if(conf_frame==NULL){ + linphone_gtk_enable_transfer_button(lc,call_list_size>1); + linphone_gtk_enable_conference_button(lc,call_list_size>1); + } else { + linphone_gtk_enable_transfer_button(lc,FALSE); + linphone_gtk_enable_conference_button(lc,FALSE); + } update_video_title(); if (call) linphone_gtk_update_video_button(call); } @@ -1497,7 +1502,7 @@ static void linphone_gtk_configure_main_window(){ home=linphone_gtk_get_ui_config("home","http://www.linphone.org"); start_call_icon=linphone_gtk_get_ui_config("start_call_icon","startcall-green.png"); add_call_icon=linphone_gtk_get_ui_config("add_call_icon","addcall-green.png"); - //stop_call_icon=linphone_gtk_get_ui_config("stop_call_icon","stopcall-red.png"); + //stop_call_icon=linphone_gtk_get_ui_config("stop_call_icon","stopcall-small.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); diff --git a/gtk/main.ui b/gtk/main.ui index 1229289cc..a68ea4cb8 100644 --- a/gtk/main.ui +++ b/gtk/main.ui @@ -386,29 +386,30 @@ 1 - - - 90 - True - False - - - False - False - end - 2 - - True False gtk-missing-image - 1 + 0 False False + 2 + + + + + 90 + 10 + True + False + + + False + False + 1 end 3 @@ -416,7 +417,7 @@ False - True + False 3 @@ -480,6 +481,7 @@ Pause + True True True False @@ -497,7 +499,6 @@ True True False - half @@ -596,14 +597,15 @@ 90 + 10 True False GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK Call quality rating - True - True + False + False 2 @@ -944,9 +946,6 @@ 2 - - - False @@ -963,30 +962,23 @@ True False + 4 - + True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - ● - none - True - False - False - True - True - + False + GDK_POINTER_MOTION_MASK | GDK_STRUCTURE_MASK + 0 + Contacts + True False - True - 4 + False + 3 0 - - - True @@ -1000,7 +992,7 @@ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK True False - 0 + 1 @@ -1011,7 +1003,7 @@ True True - 2 + 1 @@ -1073,7 +1065,7 @@ False False - 3 + 2 diff --git a/pixmaps/startcall-small.png b/pixmaps/startcall-small.png new file mode 100644 index 0000000000000000000000000000000000000000..30b32789a802b49afbd0e0c576ca3fd92a743520 GIT binary patch literal 3869 zcmV+&5908NP)X+uL$Nkc;*P;zf(X>4Tx07wm;mUmQB*%pV-y*Itk5+Wca^cs2zAksTX z6$DXM^`x7XQc?|s+008spb1j2M!0f022SQPH-!CVp(%f$Br7!UytSOLJ{W@ZFO z_(THK{JlMynW#v{v-a*TfMmPdEWc1DbJqWVks>!kBnAKqMb$PuekK>?0+ds;#ThdH z1j_W4DKdsJG8Ul;qO2n0#IJ1jr{*iW$(WZWsE0n`c;fQ!l&-AnmjxZO1uWyz`0VP>&nP`#i ztsL#`S=Q!g`M=rU9)45(J;-|dRq-b5&z?byo>|{)?5r=n76A4nTALlSzLiw~v~31J z<>9PP?;rs31pu_(obw)rY+jPY;tVGXi|p)da{-@gE-UCa`=5eu%D;v=_nFJ?`&K)q z7e9d`Nfk3?MdhZarb|T3%nS~f&t(1g5dY)AIcd$w!z`Siz!&j_=v7hZlnI21XuE|x zfmo0(WD10T)!}~_HYW!eew}L+XmwuzeT6wtxJd`dZ#@7*BLgIEKY9Xv>st^p3dp{^ zXswa2bB{85{^$B13tWnB;Y>jyQ|9&zk7RNsqAVGs--K+z0uqo1bf5|}fi5rtEMN^B zfHQCd-XH*kfJhJnmIE$G0%<@5vOzxB0181d*a3EfYH$G5fqKvcPJ%XY23!PJzzuK< z41h;K3WmW;Fah3yX$XSw5EY_9s*o0>51B&N5F1(uc|$=^I1~fLLy3?Ol0f;;Ca4%H zgQ}rJP(Ab`bQ-z{U4#0d2hboi2K@njgb|nm(_szR0JebHusa+GN5aeCM0gdP2N%HG z;Yzp`J`T6S7vUT504#-H!jlL<$Or?`Mpy_N@kBz9SR?@vA#0H$qyni$nvf2p8@Y{0 zk#Xb$28W?xm>3qu8RLgpjNxKdVb)?wFx8l2m{v>|<~C*!GlBVnrDD~wrdTJeKXwT= z5u1%I#8zOBU|X=4u>;s)>^mF|$G{ol9B_WP7+f-LHLe7=57&&lfa}8z;U@8Tyei%l z?}87(bMRt(A-)QK9Dg3)j~~XrCy)tR1Z#p1A(kK{Y$Q|=8VKhI{e%(1G*N-5Pjn)N z5P8I0VkxnX*g?EW941ba6iJ387g8iCnY4jaNopcpCOsy-A(P2EWJhusSwLP-t|Xrz zUnLKcKTwn?CKOLf97RIePB}`sKzTrUL#0v;sBY9)s+hW+T2H-1eM)^VN0T#`^Oxhv zt&^*fYnAJldnHel*OzyfUoM{~Um<@={-*r60#U(0!Bc^wuvVc);k3d%g-J!4qLpHZ zVwz%!VuRu}#Ze`^l7W)95>Kf>>9Eozr6C$Z)1`URxU@~QI@)F0FdauXr2Es8>BaOP z=)Lp_WhG@>R;lZ?BJkMlIuMhw8Ap ziF&yDYW2hFJ?fJhni{?u85&g@mo&yT8JcdI$(rSw=QPK(Xj%)k1X|@<=e1rim6`6$ zRAwc!i#egKuI;BS(LSWzt39n_sIypSqfWEV6J3%nTQ@-4ii$R;gsG*9XzhRzXqv2yCs*$VFDx+GXJH|L;wsDH_KI2;^ zu!)^Xl1YupO;gy^-c(?^&$Q1BYvyPsG^;hc$D**@Sy`+`)}T4VJji^bd7Jqw3q6Zi zi=7tT7GEswEK@D(EFW1ZSp`^awCb?>!`j4}Yh7b~$A)U-W3$et-R8BesV(1jzwLcH znq9En7Q0Tn&-M=XBKs!$F$X<|c!#|X_tWYh)GZit(Q)Cp9CDE^WG;+fcyOWARoj*0TI>4EP1lX*cEoMO-Pk?Z z{kZ!p4@(b`M~lalr<3Oz&kJ6Nm#vN_+kA5 z{dW4@^Vjg_`q%qU1ULk&3Fr!>1V#i_2R;ij2@(Z$1jE4r!MlPVFVbHmT+|iPIq0wy5aS{>yK?9ZAjVh%SOwMWgFja zir&;wpi!{CU}&@N=Eg#~LQ&zpEzVmGY{hI9Z0+4-0x zS$$Xe-OToc?Y*V;rTcf_b_jRe-RZjXSeas3UfIyD;9afd%<`i0x4T#DzE)vdabOQ= zk7SRuGN`h>O0Q~1)u-yD>VX=Mn&!Rgd$;YK+Q-}1zu#?t(*cbG#Ronf6db&N$oEid ztwC+YVcg-Y!_VuY>bk#Ye_ww@?MU&F&qswvrN_dLb=5o6*Egs)ls3YRlE$&)amR1{ z;Ppd$6RYV^Go!iq1UMl%@#4q$AMc(FJlT1QeX8jv{h#)>&{~RGq1N2iiMFIRX?sk2 z-|2wUogK~{EkB$8eDsX=nVPf8XG_nK&J~=SIiGia@9y}|z3FhX{g&gc zj=lwb=lWgyFW&aLedUh-of`v-2Kw$UzI*>(+&$@i-u=-BsSjR1%z8NeX#HdC`Hh-Z(6xI-`hmHDqv!v)W&&nrf>M(RhcN6(D;jNN*% z^u_SYjF;2ng}*8Ow)d6MtDk;%`@Lsk$;9w$(d(H%O5UixIr`T2ZRcd@WBbBELP!Y0r7z_j%sWbAfXXdmDlveawOG-T&{uwg;S^3FSTSlyYIuR)+sp zD-enMxh}4!W-AMeE#>7UmScyX$!y34lug>;&xpJEQhpO!=N zQV;lB0$0~dWP^|Zp%|xLGnQ2fQv9RC%2OwDT`o(ZQUuv>5Z2)?SoWjoY7%0b8*3oz zCYnZ_kYbQr<7j8VDZ)~5TL-ML|<+McMJhecYuEG*y+%xEo&(lPX+J?e? zpwW|iWCA3>f&`DEQOux4Cn5?|!k{~L5#7A3#ULpu>!v5ZKPBI84cq?$z>?RnF4)B zT;QZHl(A391(89vTL$78QXa3m=ExGdo}=pV}vGNNc9+EDL*8Xz(^lP2iQRr zvM>6*TWf&;p|!mriAd|G(_Nkk>+iCij>xvum}k`1EMOeSlxP>>#7Z&oLG<5%n`A84 ze8S@Vs+=JjOJDMir#JrA0#Z*c*91^iH7AvMldf`?Y$thm_6a%G%1&|aS&HAKjPq~I zIW(^^vj6SQXFC&xCZC_JTYi)sya;!fm0E|Z$E_E=lh!jJNgrVGb&wF8Kq85R3_?m8 zbu1cZ>}OIEEHP&m%#0S;E6eg}Y2$}^Uv~?m=Bc6=9_b6OA++9{O-z`H$PH2(n7j^a z1ZS}SNbI~XVtZb)!xe3lheGa{&v+?E!=%LPtRHeaJ@!KCK3$#t+?R%D{Hd5GkC{`} zCm{s~aWJWDf_ckotgpL)?|8;+%~ax-(aelfTOnQx__<#a&+p9NEoB`mpWce{IUbEK zj&|MuuI;mhH}f$b!>O>@+rCkys(L~R*4?pk?}W1L30s?l4(C%cj03#^xxKbs3yeH% zf4%Jc_fhxGJ!M+yTk3+y*0nne+CR$@H6=OIGq64RCMU_n#sJpsvWc^^J>}}0_{fO) zGzdj{m!MVhL(uphhSxfC=e4<(8;RlLk?mo3G`V<)f(h%$@8eM3iBL{Q4GJ0x0000DNk~Le0000e0000Z2nGNE0OmPJuCXC>3V#dV zNklWf+#t-ulmMkRK5h@y$vB`@-T0AV-#xc8oZ|Jhwk zGKi1o5ajBgJge05Y0wM81D)}VyZ`E;+?_p zK^Y2l`lI1btm>J)4%wYG8y`=NS%-D9V9M!5j9GX5NFhWEk!(=P<&K!BtdwMamq=U* z0P_K=Do8TOeJ=19S3*1SV^1q1H!_2)s+s+Ew4&D+sn~5+mH#VSRke9`O@GZXo<}V$ z1~oMB)X!z<)Bu?^rSzI_iOAVlay6b+2GMjA+86+9OPW>v+0W5(2HoaD&UQ!D57@Z6SbuQeK;e_j*8^|8Y1jguB33}&rOgo7hw z{n{Y0CO~ph8gLX~@ZTt@9Dg7VV&VXR#qk~nESOLTa2b@ASw^-I&RJ%;u#74Gpg&}k z1j+MRWS5qlT{3y{{fB!7f7-X_wFi?O9e)A13;`sa0_1oG3(Rd5k#kHE>j7*r17opC z0+@FQ#TNi(vrF!~m#HqzfF5v)pLegmVQT60ndexMids85^D;XcUVl1u;k>|TE=NwH zkHn!tI`UC_EZ5m}=e&p4?rv^wmW_>#`2`F5J_A?)w@pNsqwl#AlI1D#a()t4np8hP zJ?xVF+hyw0#3`_RaZ?K!!&UE`W6h7Qc1|Q$8GVP#j(yze7=450(e}i#T%vE)d7CzD zoM>(huxQqps6O8ywSU=1qAWw6<0olmNWBct`o&U}_;f6aonlsi$XEbdSEGFj_rd%r zI07~!I_p(uoZC(%LkITEce@6EFZ&K(1(3??IV6(t9xt2dxpr~K_7_MrBL?zJiYB;p zBLX5O7KS7xw**OC1m?0f2_L{cR;S{(om>PgZ=1B-~u$=27eccw~ELsVEAbOeIMhf8Jh($4;=W}uM%E5^Nf?p_H!!pz-QMN-vsnp{ z57nv8JCPLfrXlj(2-B9se;i9Mq#j{#ZQ??%0hKeT<*B()OnmBe*_t00Qg z%T?z)0DqT5?jnGD6xs#+5a2vmO88NJ4*qsI&%Z={G$NGy5C^Rb4v-n z2++{Z9QItSx<;W&qs@@XV6+dhA~b4XcpEs2FC z`v8{T%ZDn!mr0V946uNY1V&nbu|<9|b%_6PX!vj|A6iKqlPbRgyEkk|rWkMnpCHi;t# zCmDL=ki0}CKEU`7;go0=#6IC8i6bv^Jx_?`lQI{-o)p->1%BvJ;)WBX?!~z{j6jni zlGX{Z1jP@2rrbLV=HX-X2qJAjA9dSA^e&k8j{v8s=gCL|agUs3^{TrYybNu!j3NM zRnHKj=>EKswXG#?&m1t{Z-1r8It~W*zZeI||0C?P{Nw{nuf1O^^f9#^LdNy*3l2D)eZZu^0se}gayKnf-G>=0qFXj_Bo^keqOUB_ z6T=$yg+!jBp_dQ``q)EOc?s-Y%{rw9$2)@HN_9J~Q#+B}nJMir%zq?qI#;F1+_II= zO-#_y&ENz+ba4B{TD;LOC;0BrA4r(b;I@d_5gch69Op!U!>wH0%gWfTv=0_5yzpi* zyWAr0WklE#FsXQD(CZ-`81PRnzX%175JlgvS6d6I4TE@Lmc~YW?zRXp%y|@_y$uR| z+(XpVls7SoJ7?7f+<(6Q>pa)J53W=JA{@S&;p%pGy^23j^!bwjd49364bhaO?0Os# zS8CgHCqM$MzMOK7!b)$-P|1t<-rc@<@0)w_L%#TT-*q>imHo7DS^8k_%|`$5g@wzl z1400+z=Cx@1rYuzkbkLx8hk4;%chVMnQvVX`5g%+8?Aeliw9-FLy4Wr>E=(=Qja0)mJpQTPFN6BO=mrISB2tW$~ zm_gJwAt=`JsvO~sg?!1?@c;`fwTd}&QCz_v?Ld_GtwPZ74Fv2NWcdsg@Z+qqyp$zf z8}95g@IMa&p6xS*ix|p{oKTq)NtHW3LYd>o`4R4D+J6XU9BbHd6->IxB=2{ZsDry0 zj7~pez;V+!fP6V%=f**^0uDO`zQ$i`3{oHk;0zTwBUKjW_>Z)W65DUr`b&boKqw@G zXG|s^Om3Vpg={?1w#fu*CK5y%%y~IivzJMyyE3Dro3Z!jaE*I|^>gad?+M_zZ5%+I zKJ-YshJQmIf}qfsQ%;^8(DEuKJk>)7_XbL9?5R>#IhL$ROIhP7Z=UTr(``~gL8R^QVQu}i0%zNHw>Vw+;HvSiimSSKQ>l5E6gQPg{ZBe}#KDGl< zC6N<3jcmj7tVj07dUarEqJoL_p#uj>1C?h4bAN-WOvf8n^75m1$^LoZLp;Fk)#O5zo{~uX7t-R+d Snhk6K0000J`iNf|2fvJhQPY_zgBDAXM+LD{Xv%A(JceP0X}NRnai0leh+m#$ z-}Bt-uD$j?hlCK2t%peM6vB|>Fn?84nn<@1lm-E@A4F~lBV{e$6LGdYHRP(V4estf z9mKYCPgj@P>Gx-RDYHhT@TM82@){H7xm+miDg$r8T;=XAR7${vBd4mO)N`z%u;lrp zNbN7Zr{7;YS6EZ`u_O^}Y0;Vkfi%tniUbY8d-^)OVvsF_vI}99?vm^OwSVY^%bsX3 zcqTSKGbP5x#nc<`g-22E$(-x#R5J_%NjgJB7oM~BqFoC_M8gQL7;sCWM$}i zz`UVjw(pn_lakf!m;Tq(p^1z0KMhRZzx8uNyAV+dpeSEO?j2Ur!(e+P*fsJFxS`gY z5JacE z)=%D7T~O+o?Spj&+Jy143cGU)#(_l`Cu3Xs5BUqJI)}6JyYTMn^N)Y~SzmN!;r#;S zv<;B&kj98@1~V~1zsfL}sa*vjABtV)8QXA!_;Z7|{@Av!If8CWe1GfHf_VDPetX5z zRdf1mE6UzxSzgkZnNtE0Oo!|(Fg{;}U;rxR1B3Y}8soB|AfS3styGCyTYSuC@+StS z@(^zwLG>p<;y2d1R%1r@BqIhm&Yvq!i&m|M9*Pg>l#X?99~S!CJ9;b-TZz>>q_?qZO9%}!8&lh~2j z>xcLFHI#`F_+(K}@VIVgLHoI2MIfMwp&^U#`&B=9zFqVI?0KYN$Bn7_+${)zdiRgON1Me$O!^0jG$ti)DJ#W72GFdrs3)(7;CnVJ_W$Xn{w!JMwaT9V Y2b(D#43G;Xl>h($07*qoM6N<$f+Q;%&j0`b diff --git a/pixmaps/stopcall-small.png b/pixmaps/stopcall-small.png new file mode 100644 index 0000000000000000000000000000000000000000..de77592c742fd52596af41ff6f62350a81d15c0a GIT binary patch literal 3764 zcmV;l4omTgP)X+uL$Nkc;*P;zf(X>4Tx07wm;mUmQB*%pV-y*Itk5+Wca^cs2zAksTX z6$DXM^`x7XQc?|s+008spb1j2M!0f022SQPH-!CVp(%f$Br7!UytSOLJ{W@ZFO z_(THK{JlMynW#v{v-a*TfMmPdEWc1DbJqWVks>!kBnAKqMb$PuekK>?0+ds;#ThdH z1j_W4DKdsJG8Ul;qO2n0#IJ1jr{*iW$(WZWsE0n`c;fQ!l&-AnmjxZO1uWyz`0VP>&nP`#i ztsL#`S=Q!g`M=rU9)45(J;-|dRq-b5&z?byo>|{)?5r=n76A4nTALlSzLiw~v~31J z<>9PP?;rs31pu_(obw)rY+jPY;tVGXi|p)da{-@gE-UCa`=5eu%D;v=_nFJ?`&K)q z7e9d`Nfk3?MdhZarb|T3%nS~f&t(1g5dY)AIcd$w!z`Siz!&j_=v7hZlnI21XuE|x zfmo0(WD10T)!}~_HYW!eew}L+XmwuzeT6wtxJd`dZ#@7*BLgIEKY9Xv>st^p3dp{^ zXswa2bB{85{^$B13tWnB;Y>jyQ|9&zk7RNsqAVGs--K+z0uqo1bf5|}fi5rtEMN^B zfHQCd-XH*kfJhJnmIE$G0%<@5vOzxB0181d*a3EfYH$G5fqKvcPJ%XY23!PJzzuK< z41h;K3WmW;Fah3yX$XSw5EY_9s*o0>51B&N5F1(uc|$=^I1~fLLy3?Ol0f;;Ca4%H zgQ}rJP(Ab`bQ-z{U4#0d2hboi2K@njgb|nm(_szR0JebHusa+GN5aeCM0gdP2N%HG z;Yzp`J`T6S7vUT504#-H!jlL<$Or?`Mpy_N@kBz9SR?@vA#0H$qyni$nvf2p8@Y{0 zk#Xb$28W?xm>3qu8RLgpjNxKdVb)?wFx8l2m{v>|<~C*!GlBVnrDD~wrdTJeKXwT= z5u1%I#8zOBU|X=4u>;s)>^mF|$G{ol9B_WP7+f-LHLe7=57&&lfa}8z;U@8Tyei%l z?}87(bMRt(A-)QK9Dg3)j~~XrCy)tR1Z#p1A(kK{Y$Q|=8VKhI{e%(1G*N-5Pjn)N z5P8I0VkxnX*g?EW941ba6iJ387g8iCnY4jaNopcpCOsy-A(P2EWJhusSwLP-t|Xrz zUnLKcKTwn?CKOLf97RIePB}`sKzTrUL#0v;sBY9)s+hW+T2H-1eM)^VN0T#`^Oxhv zt&^*fYnAJldnHel*OzyfUoM{~Um<@={-*r60#U(0!Bc^wuvVc);k3d%g-J!4qLpHZ zVwz%!VuRu}#Ze`^l7W)95>Kf>>9Eozr6C$Z)1`URxU@~QI@)F0FdauXr2Es8>BaOP z=)Lp_WhG@>R;lZ?BJkMlIuMhw8Ap ziF&yDYW2hFJ?fJhni{?u85&g@mo&yT8JcdI$(rSw=QPK(Xj%)k1X|@<=e1rim6`6$ zRAwc!i#egKuI;BS(LSWzt39n_sIypSqfWEV6J3%nTQ@-4ii$R;gsG*9XzhRzXqv2yCs*$VFDx+GXJH|L;wsDH_KI2;^ zu!)^Xl1YupO;gy^-c(?^&$Q1BYvyPsG^;hc$D**@Sy`+`)}T4VJji^bd7Jqw3q6Zi zi=7tT7GEswEK@D(EFW1ZSp`^awCb?>!`j4}Yh7b~$A)U-W3$et-R8BesV(1jzwLcH znq9En7Q0Tn&-M=XBKs!$F$X<|c!#|X_tWYh)GZit(Q)Cp9CDE^WG;+fcyOWARoj*0TI>4EP1lX*cEoMO-Pk?Z z{kZ!p4@(b`M~lalr<3Oz&kJ6Nm#vN_+kA5 z{dW4@^Vjg_`q%qU1ULk&3Fr!>1V#i_2R;ij2@(Z$1jE4r!MlPVFVbHmT+|iPIq0wy5aS{>yK?9ZAjVh%SOwMWgFja zir&;wpi!{CU}&@N=Eg#~LQ&zpEzVmGY{hI9Z0+4-0x zS$$Xe-OToc?Y*V;rTcf_b_jRe-RZjXSeas3UfIyD;9afd%<`i0x4T#DzE)vdabOQ= zk7SRuGN`h>O0Q~1)u-yD>VX=Mn&!Rgd$;YK+Q-}1zu#?t(*cbG#Ronf6db&N$oEid ztwC+YVcg-Y!_VuY>bk#Ye_ww@?MU&F&qswvrN_dLb=5o6*Egs)ls3YRlE$&)amR1{ z;Ppd$6RYV^Go!iq1UMl%@#4q$AMc(FJlT1QeX8jv{h#)>&{~RGq1N2iiMFIRX?sk2 z-|2wUogK~{EkB$8eDsX=nVPf8XG_nK&J~=SIiGia@9y}|z3FhX{g&gc zj=lwb=lWgyFW&aLedUh-of`v-2Kw$UzI*>(+&$@i-u=-BsSjR1%z8NeX#HdC`Hh-Z(6xI-`hmHDqv!v)W&&nrf>M(RhcN6(D;jNN*% z^u_SYjF;2ng}*8Ow)d6MtDk;%`@Lsk$;9w$(d(H%O5UixIr`T2ZRcd@I1uMO_*J{`oib5B>7+UfUad?~X=r0}L0rt%sS=DA!b?J5Irz+C0-E>udu zgd?Y_qSSM&p|Irnqe$&9y{F$_J6Bj!_pu}qY-!P&1A#Qo0*V9;!F&2Tykd|ogt7}^ zlNjgJB7oM~BqFoC z_M8gQL7;sCWM$}iz`UVjw(pn_lakf!m;Tq(p^1z0KMhRZzx8uNyAV+dpeSEO?j2Ur z!(e+P*fsJFxS`gY5JTpyK@W1fkhZ6V_W(U`3tE!hqLm#@b2pK zkAM4FUvy^S{Q~5)4Uq4U#)xeOGciHG$}pIzT?HW@ie2X!+i-*UbAz}3*tV}Zf^JKE z>(hdG`ptfO#nM%C`fMx8-ey@|(wLc30ufAy>@6@pUxi=*D&+%%`6wFWvY{ZLdQh!Y ziCbHI%xCf^2Bz{5ZyiDPCqUvi*1A?>M)xEm1~|^2D^H7ASt^-Q;Qrs%jEtPyb2{jj zdU6CQm}JAcp+ikD3MmRGEJf$`LXgTD<={tpG>=*Ff7o`kcV)eDGm$*C4CBL1m`N7t z5|c=AU&(+|)Qi2&Jm@2wRUao}Oh>x)sF+*1LQh)UxM_Aue_3SN#^Gn@oWPR9;_hOQ ze9cZ!fRosf+3Sb*_%)P?5%^?LPw=>IXF>b9U_~IHiJ>8j@cUIic)nfq0qlK@eb(4+ z$~E${*zyi@=1wt*%Y5ye9106BK7z&iMUx&G$ui24l>KcInm zqW~^z1WQ{6V)4Z4oEg8Ezsqs{iTSDJ>}#d%2;&SVCYKX4$fUngbJ1hE>{!=Ct*&pD zyVh17F{06QeDbfq6H80CH|Lf|o5ey*`Ui81WG eS?0CMp8p4%DIN@v3nY~Q0000 Date: Wed, 9 Jan 2013 12:19:37 +0100 Subject: [PATCH 08/50] Update ms2 and oRTP submodules for dummy STUN packet sending. --- mediastreamer2 | 2 +- oRTP | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mediastreamer2 b/mediastreamer2 index ec5b03696..3ad9baedf 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit ec5b036960d03242af4e4a63909f1adc17e13eed +Subproject commit 3ad9baedfa381bc4244560cc8307c920adc5aec4 diff --git a/oRTP b/oRTP index b1590514c..0091eeead 160000 --- a/oRTP +++ b/oRTP @@ -1 +1 @@ -Subproject commit b1590514c98d33e5464d46317fdeaec52f778de7 +Subproject commit 0091eeead5d472797fb474f876a4cc835712c3e6 From 2c0a6e99201a2f37ced93aafe873812c36e5742a Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Wed, 9 Jan 2013 15:06:36 +0100 Subject: [PATCH 09/50] Improve statistics display --- mediastreamer2 | 2 +- oRTP | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mediastreamer2 b/mediastreamer2 index 3ad9baedf..fe26d776c 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 3ad9baedfa381bc4244560cc8307c920adc5aec4 +Subproject commit fe26d776c00b091586ed7247669ad1eee893effd diff --git a/oRTP b/oRTP index 0091eeead..20abeb39e 160000 --- a/oRTP +++ b/oRTP @@ -1 +1 @@ -Subproject commit 0091eeead5d472797fb474f876a4cc835712c3e6 +Subproject commit 20abeb39e1edae0f72080f7998410e9b16b9da05 From ace4380e5c32fdf68a9d69e82b08b17bcc313135 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Wed, 9 Jan 2013 17:33:52 +0100 Subject: [PATCH 10/50] Fix issue with assistant and memory leak --- gtk/linphone.h | 5 ++++- gtk/main.c | 29 +++++++++++++++++------------ gtk/main.ui | 2 +- gtk/parameters.ui | 2 +- gtk/setupwizard.c | 18 +++++++++++++----- 5 files changed, 36 insertions(+), 20 deletions(-) diff --git a/gtk/linphone.h b/gtk/linphone.h index c9accb6f6..ca6234b4f 100644 --- a/gtk/linphone.h +++ b/gtk/linphone.h @@ -53,10 +53,13 @@ GtkWidget*create_pixmap(const gchar *filename); GtkWidget *_gtk_image_new_from_memory_at_scale(const void *data, gint len, gint w, gint h, gboolean preserve_ratio); GdkPixbuf *_gdk_pixbuf_new_from_memory_at_scale(const void *data, gint len, gint w, gint h, gboolean preserve_ratio); +void linphone_gtk_destroy_window(GtkWidget *window); GtkWidget *linphone_gtk_create_window(const char *window_name); GtkWidget *linphone_gtk_get_widget(GtkWidget *window, const char *name); GtkWidget *linphone_gtk_create_widget(const char *filename, const char *widget_name); -GtkWidget * linphone_gtk_create_assistant(void); + +void linphone_gtk_show_assistant(void); +void linphone_gtk_close_assistant(void); LinphoneCore *linphone_gtk_get_core(void); GtkWidget *linphone_gtk_get_main_window(); diff --git a/gtk/main.c b/gtk/main.c index 5d9158713..08461290a 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -50,7 +50,6 @@ const char *this_program_ident_string="linphone_ident_string=" LINPHONE_VERSION; static LinphoneCore *the_core=NULL; static GtkWidget *the_ui=NULL; -GtkWidget *the_wizard=NULL; static void linphone_gtk_registration_state_changed(LinphoneCore *lc, LinphoneProxyConfig *cfg, LinphoneRegistrationState rs, const char *msg); static void linphone_gtk_notify_recv(LinphoneCore *lc, LinphoneFriend * fid); @@ -257,6 +256,11 @@ GtkWidget *linphone_gtk_get_main_window(){ return the_ui; } +void linphone_gtk_destroy_main_window() { + linphone_gtk_destroy_window(the_ui); + the_ui = NULL; +} + static void linphone_gtk_configure_window(GtkWidget *w, const char *window_name){ static const char *icon_path=NULL; static const char *hiddens=NULL; @@ -295,6 +299,12 @@ static int get_ui_file(const char *name, char *path, int pathsize){ return 0; } +void linphone_gtk_destroy_window(GtkWidget *widget) { + GtkBuilder* builder = g_object_get_data(G_OBJECT(widget), "builder"); + gtk_widget_destroy(widget); + g_object_unref (G_OBJECT (builder)); +} + GtkWidget *linphone_gtk_create_window(const char *window_name){ GError* error = NULL; GtkBuilder* builder = gtk_builder_new (); @@ -313,7 +323,7 @@ GtkWidget *linphone_gtk_create_window(const char *window_name){ g_error("Could not retrieve '%s' window from xml file",window_name); return NULL; } - g_object_set_data(G_OBJECT(w),"builder",builder); + g_object_set_data(G_OBJECT(w), "builder",builder); gtk_builder_connect_signals(builder,w); linphone_gtk_configure_window(w,window_name); return w; @@ -1731,21 +1741,16 @@ static void linphone_gtk_check_soundcards(){ } } -#ifdef BUILD_WIZARD -// Display the account wizard -void linphone_gtk_display_wizard() { - if (the_wizard == NULL || !gtk_widget_get_visible(the_wizard)) { // Only one instance of the wizard at the same time - the_wizard = linphone_gtk_create_assistant(); - } -} -#endif - static void linphone_gtk_quit(void){ static gboolean quit_done=FALSE; if (!quit_done){ quit_done=TRUE; linphone_gtk_unmonitor_usb(); g_source_remove_by_user_data(linphone_gtk_get_core()); +#ifdef BUILD_WIZARD + linphone_gtk_close_assistant(); +#endif + linphone_gtk_destroy_main_window(); linphone_gtk_uninit_instance(); linphone_gtk_destroy_log_window(); linphone_core_destroy(the_core); @@ -1897,7 +1902,7 @@ int main(int argc, char *argv[]){ #ifdef BUILD_WIZARD // Veryfing if at least one sip account is configured. If not, show wizard if (linphone_core_get_proxy_config_list(linphone_gtk_get_core()) == NULL) { - linphone_gtk_display_wizard(); + linphone_gtk_show_assistant(); } #endif diff --git a/gtk/main.ui b/gtk/main.ui index a68ea4cb8..ca1893cbf 100644 --- a/gtk/main.ui +++ b/gtk/main.ui @@ -834,7 +834,7 @@ False image12 False - + diff --git a/gtk/parameters.ui b/gtk/parameters.ui index 53a644796..9e32e29c7 100644 --- a/gtk/parameters.ui +++ b/gtk/parameters.ui @@ -1429,7 +1429,7 @@ True True True - + True diff --git a/gtk/setupwizard.c b/gtk/setupwizard.c index 39673da99..f4374c539 100644 --- a/gtk/setupwizard.c +++ b/gtk/setupwizard.c @@ -25,6 +25,7 @@ static LinphoneAccountCreator *linphone_gtk_assistant_get_creator(GtkWidget*w); static const int PASSWORD_MIN_SIZE = 6; static const int LOGIN_MIN_SIZE = 4; +static GtkWidget *the_assistant=NULL; static GdkPixbuf *ok; static GdkPixbuf *notok; @@ -400,7 +401,7 @@ static int is_account_validated(GtkWidget *page) { } static void linphone_gtk_assistant_closed(GtkWidget *w){ - gtk_widget_destroy(w); + linphone_gtk_close_assistant(); } static void linphone_gtk_assistant_prepare(GtkWidget *assistant, GtkWidget *page){ @@ -531,8 +532,17 @@ static LinphoneAccountCreator *linphone_gtk_assistant_get_creator(GtkWidget*w){ return (LinphoneAccountCreator*)g_object_get_data(G_OBJECT(w),"creator"); } -GtkWidget * linphone_gtk_create_assistant(void){ - GtkWidget *w=gtk_assistant_new(); +void linphone_gtk_close_assistant(void){ + if(the_assistant==NULL) + return; + gtk_widget_destroy(the_assistant); + the_assistant = NULL; +} + +void linphone_gtk_show_assistant(void){ + if(the_assistant!=NULL) + return; + GtkWidget *w=the_assistant=gtk_assistant_new(); gtk_window_set_resizable (GTK_WINDOW(w), FALSE); ok = create_pixbuf(linphone_gtk_get_ui_config("ok","ok.png")); @@ -597,7 +607,5 @@ GtkWidget * linphone_gtk_create_assistant(void){ g_signal_connect(G_OBJECT(w),"prepare",(GCallback)linphone_gtk_assistant_prepare,NULL); gtk_widget_show(w); - - return w; } From 3500af3adf56561f70e497e4dcf6c50c2af320fd Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Wed, 9 Jan 2013 16:57:41 +0100 Subject: [PATCH 11/50] Do not update session version in SDP when remote send re-invite without updating it. --- coreapi/callbacks.c | 2 ++ coreapi/linphonecall.c | 10 ++++++++++ coreapi/linphonecore.c | 17 +++++++++++++++-- coreapi/private.h | 3 +++ coreapi/sal_eXosip2_sdp.c | 7 +++++++ 5 files changed, 37 insertions(+), 2 deletions(-) diff --git a/coreapi/callbacks.c b/coreapi/callbacks.c index 2f0d25b0d..032218a2e 100644 --- a/coreapi/callbacks.c +++ b/coreapi/callbacks.c @@ -345,6 +345,7 @@ static void call_accepted(SalOp *op){ if (call->referer) linphone_core_notify_refer_state(lc,call->referer,call); } if (md && !sal_media_description_empty(md)){ + linphone_call_update_remote_session_id_and_ver(call); if (sal_media_description_has_dir(md,SalStreamSendOnly) || sal_media_description_has_dir(md,SalStreamInactive)){ if (lc->vtable.display_status){ @@ -425,6 +426,7 @@ static void call_accept_update(LinphoneCore *lc, LinphoneCall *call){ linphone_core_update_ice_from_remote_media_description(call,rmd); linphone_core_update_local_media_description_from_ice(call->localdesc,call->ice_session); } + linphone_call_update_remote_session_id_and_ver(call); sal_call_accept(call->op); md=sal_call_get_final_media_description(call->op); if (md && !sal_media_description_empty(md)) diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c index 3bf93f78e..663e552a9 100644 --- a/coreapi/linphonecall.c +++ b/coreapi/linphonecall.c @@ -1704,6 +1704,16 @@ void linphone_call_update_crypto_parameters(LinphoneCall *call, SalMediaDescript #endif } +void linphone_call_update_remote_session_id_and_ver(LinphoneCall *call) { + SalMediaDescription *remote_desc = sal_call_get_remote_media_description(call->op); + if (remote_desc) { + ms_warning("linphone_call_update_remote_session_id_and_ver(): id=%u, ver=%u", + remote_desc->session_id, remote_desc->session_ver); + call->remote_session_id = remote_desc->session_id; + call->remote_session_ver = remote_desc->session_ver; + } +} + void linphone_call_delete_ice_session(LinphoneCall *call){ if (call->ice_session != NULL) { ice_session_destroy(call->ice_session); diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index c6fc73590..2336dbfe1 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -2722,6 +2722,7 @@ int linphone_core_start_accept_call_update(LinphoneCore *lc, LinphoneCall *call) } linphone_core_update_local_media_description_from_ice(call->localdesc, call->ice_session); } + linphone_call_update_remote_session_id_and_ver(call); sal_call_set_local_media_description(call->op,call->localdesc); sal_call_accept(call->op); md=sal_call_get_final_media_description(call->op); @@ -2751,6 +2752,7 @@ int linphone_core_start_accept_call_update(LinphoneCore *lc, LinphoneCall *call) * @return 0 if sucessful, -1 otherwise (actually when this function call is performed outside ot #LinphoneCallUpdatedByRemote state). **/ int linphone_core_accept_call_update(LinphoneCore *lc, LinphoneCall *call, const LinphoneCallParams *params){ + SalMediaDescription *remote_desc; #ifdef VIDEO_ENABLED bool_t old_has_video = call->params.has_video; #endif @@ -2759,6 +2761,16 @@ int linphone_core_accept_call_update(LinphoneCore *lc, LinphoneCall *call, const linphone_call_state_to_string(call->state)); return -1; } + remote_desc = sal_call_get_remote_media_description(call->op); + ms_warning("linphone_core_accept_update(): rmt_id=%u, rmt_ver=%u, call->rmt_id=%u, call->rmt_ver=%u", + remote_desc->session_id, remote_desc->session_ver, call->remote_session_id, call->remote_session_ver); + if ((remote_desc->session_id == call->remote_session_id) && (remote_desc->session_ver == call->remote_session_ver)) { + /* Remote has sent an INVITE with the same SDP as before, so send a 200 OK with the same SDP as before. */ + ms_warning("Send same SDP as before!"); + sal_call_accept(call->op); + linphone_call_set_state(call,LinphoneCallStreamsRunning,"Connected (streams running)"); + return 0; + } if (params==NULL){ call->params.has_video=lc->video_policy.automatically_accept || call->current_params.has_video; }else @@ -2772,11 +2784,11 @@ int linphone_core_accept_call_update(LinphoneCore *lc, LinphoneCall *call, const ms_warning("Video isn't supported in conference"); call->params.has_video = FALSE; } - call->params.has_video &= linphone_core_media_description_contains_video_stream(sal_call_get_remote_media_description(call->op)); + call->params.has_video &= linphone_core_media_description_contains_video_stream(remote_desc); call->camera_active=call->params.has_video; linphone_call_make_local_media_description(lc,call); if (call->ice_session != NULL) { - linphone_core_update_ice_from_remote_media_description(call, sal_call_get_remote_media_description(call->op)); + linphone_core_update_ice_from_remote_media_description(call, remote_desc); #ifdef VIDEO_ENABLED if ((call->ice_session != NULL) &&!ice_session_candidates_gathered(call->ice_session)) { if ((call->params.has_video) && (call->params.has_video != old_has_video)) { @@ -2903,6 +2915,7 @@ int linphone_core_accept_call_with_params(LinphoneCore *lc, LinphoneCall *call, audio_stream_prepare_sound(call->audiostream,lc->sound_conf.play_sndcard,lc->sound_conf.capt_sndcard); } + linphone_call_update_remote_session_id_and_ver(call); sal_call_accept(call->op); if (lc->vtable.display_status!=NULL) lc->vtable.display_status(lc,_("Connected.")); diff --git a/coreapi/private.h b/coreapi/private.h index c171fac88..93baf7e44 100644 --- a/coreapi/private.h +++ b/coreapi/private.h @@ -148,6 +148,8 @@ struct _LinphoneCall IceSession *ice_session; LinphoneChatMessage* pending_message; int ping_time; + unsigned int remote_session_id; + unsigned int remote_session_ver; bool_t refer_pending; bool_t media_pending; bool_t audio_muted; @@ -286,6 +288,7 @@ void linphone_call_stop_media_streams(LinphoneCall *call); void linphone_call_delete_ice_session(LinphoneCall *call); void linphone_call_stop_media_streams_for_ice_gathering(LinphoneCall *call); void linphone_call_update_crypto_parameters(LinphoneCall *call, SalMediaDescription *old_md, SalMediaDescription *new_md); +void linphone_call_update_remote_session_id_and_ver(LinphoneCall *call); const char * linphone_core_get_identity(LinphoneCore *lc); const char * linphone_core_get_route(LinphoneCore *lc); diff --git a/coreapi/sal_eXosip2_sdp.c b/coreapi/sal_eXosip2_sdp.c index 050a53a76..4aad14863 100644 --- a/coreapi/sal_eXosip2_sdp.c +++ b/coreapi/sal_eXosip2_sdp.c @@ -434,10 +434,17 @@ static int payload_type_fill_from_rtpmap(PayloadType *pt, const char *rtpmap){ int sdp_to_media_description(sdp_message_t *msg, SalMediaDescription *desc){ int i,j; const char *mtype,*proto,*rtp_port,*rtp_addr,*number; + const char *sess; sdp_bandwidth_t *sbw=NULL; sdp_attribute_t *attr; int nb_ice_candidates; + /* Get session information. */ + sess = sdp_message_o_sess_id_get(msg); + if (sess) desc->session_id = strtoul(sess, NULL, 10); + sess = sdp_message_o_sess_version_get(msg); + if (sess) desc->session_ver = strtoul(sess, NULL, 10); + rtp_addr=sdp_message_c_addr_get (msg, -1, 0); if (rtp_addr) strncpy(desc->addr,rtp_addr,sizeof(desc->addr)); From f6e97bc33beb4da2fadc57a9543d417c25730cd5 Mon Sep 17 00:00:00 2001 From: Margaux Clerc Date: Thu, 10 Jan 2013 14:48:28 +0100 Subject: [PATCH 12/50] Fix messages and pixmaps --- gtk/chat.c | 163 +++++++++++++++++--------------- gtk/friendlist.c | 3 - gtk/linphone.h | 2 +- pixmaps/Makefile.am | 4 +- po/fr.po | 222 +++++++++++++++++++++----------------------- 5 files changed, 198 insertions(+), 196 deletions(-) diff --git a/gtk/chat.c b/gtk/chat.c index 8b165f1fa..506c9036d 100644 --- a/gtk/chat.c +++ b/gtk/chat.c @@ -33,6 +33,8 @@ void linphone_gtk_quit_chatroom(LinphoneChatRoom *cr) { gtk_notebook_remove_page (GTK_NOTEBOOK(nb),idx); linphone_gtk_update_chat_picture(FALSE); g_object_set_data(G_OBJECT(friendlist),"chatview",NULL); + g_object_set_data(G_OBJECT(w),"from_message",NULL); + g_object_set_data(G_OBJECT(w),"cr",NULL); gtk_widget_destroy(w); } @@ -56,12 +58,12 @@ GtkWidget *create_tab_chat_header(LinphoneChatRoom *cr,const LinphoneAddress *ur void linphone_gtk_push_text(GtkWidget *w, const LinphoneAddress *from, const char *message, gboolean me,LinphoneChatRoom *cr){ GtkTextView *text=GTK_TEXT_VIEW(linphone_gtk_get_widget(w,"textview")); GtkTextBuffer *buffer=gtk_text_view_get_buffer(text); - GtkTextIter iter,begin; - GList *l = g_object_get_data(G_OBJECT(w),"list"); + GtkTextIter iter,begin,end; gtk_text_buffer_get_start_iter(buffer,&begin); int off; gtk_text_buffer_get_end_iter(buffer,&iter); off=gtk_text_iter_get_offset(&iter); + //GList *list=g_object_get_data(G_OBJECT(w),"list"); if(g_strcmp0((char *)g_object_get_data(G_OBJECT(w),"from_message"),linphone_address_as_string(from))!=0){ gtk_text_buffer_get_iter_at_offset(buffer,&iter,off); @@ -78,32 +80,31 @@ void linphone_gtk_push_text(GtkWidget *w, const LinphoneAddress *from, const cha } gtk_text_buffer_get_end_iter(buffer,&iter); gtk_text_buffer_get_iter_at_offset(buffer,&begin,off); - if(me){ - l=g_list_append(l,GINT_TO_POINTER(gtk_text_iter_get_offset(&iter))); - g_object_set_data(G_OBJECT(w),"list",l); - } - gtk_text_buffer_insert(buffer,&iter,"\t",-1); gtk_text_buffer_insert(buffer,&iter,message,-1); - gtk_text_buffer_get_end_iter(buffer,&iter); + gtk_text_buffer_get_end_iter(buffer,&iter); gtk_text_buffer_insert(buffer,&iter,"\n",-1); - - GtkTextMark *mark=gtk_text_buffer_create_mark(buffer,NULL,&iter,FALSE); - gtk_text_view_scroll_mark_onscreen(text,mark); - //gtk_text_buffer_get_end_iter(b,&iter); - //gtk_text_iter_forward_to_line_end(&iter); - //gtk_text_view_scroll_to_iter(v,&iter,0,TRUE,1.0,1.0); - gtk_text_buffer_get_bounds (buffer, &begin, &iter); - + gtk_text_buffer_get_bounds (buffer, &begin, &end); GHashTable *hash=(GHashTable *)g_object_get_data(G_OBJECT(linphone_gtk_get_main_window()),"history"); if(me){ g_hash_table_insert(hash,linphone_address_as_string_uri_only(linphone_chat_room_get_peer_address(cr)), - (gpointer)gtk_text_buffer_get_text(buffer,&begin,&iter,FALSE)); + (gpointer)gtk_text_buffer_get_text(buffer,&begin,&end,FALSE)); } else { - g_hash_table_insert(hash,linphone_address_as_string_uri_only(from), - (gpointer)gtk_text_buffer_get_text(buffer,&begin,&iter,FALSE)); + (gpointer)gtk_text_buffer_get_text(buffer,&begin,&end,FALSE)); } - g_object_set_data(G_OBJECT(linphone_gtk_get_main_window()),"history",hash); + g_object_set_data(G_OBJECT(linphone_gtk_get_main_window()),"history",hash); + + /*if(me){ + gtk_text_buffer_get_end_iter(buffer,&iter); + list=g_list_append(list,GINT_TO_POINTER(gtk_text_iter_get_line(&iter))); + gtk_text_buffer_insert_with_tags_by_name(buffer,&iter,"Message in progress..",-1, "italic","right","small",NULL); + gtk_text_buffer_get_end_iter(buffer,&iter); + gtk_text_buffer_insert(buffer,&iter,"\n",-1); + g_object_set_data(G_OBJECT(w),"list",list); + }*/ + + GtkTextMark *mark=gtk_text_buffer_create_mark(buffer,NULL,&iter,FALSE); + gtk_text_view_scroll_mark_onscreen(text,mark); } const LinphoneAddress* linphone_gtk_get_used_identity(){ @@ -117,40 +118,52 @@ const LinphoneAddress* linphone_gtk_get_used_identity(){ /* function in dev for displaying ack*/ void update_chat_state_message(LinphoneChatMessageState state){ - /*GdkPixbuf *pixbuf; - - switch (state) { - case LinphoneChatMessageStateInProgress: - pixbuf=create_pixbuf("chat_message_in_progress.png"); - break; - case LinphoneChatMessageStateDelivered: - pixbuf=create_pixbuf("chat_message_delivered.png"); - break; - case LinphoneChatMessageStateNotDelivered: - pixbuf=create_pixbuf("chat_message_not_delivered.png"); - break; - default : pixbuf=NULL; - } - - GtkWidget *main_window=linphone_gtk_get_main_window(); + /*GtkWidget *main_window=linphone_gtk_get_main_window(); GtkWidget *friendlist=linphone_gtk_get_widget(main_window,"contact_list"); GtkWidget *page=(GtkWidget*)g_object_get_data(G_OBJECT(friendlist),"chatview"); + GList *list=g_object_get_data(G_OBJECT(page),"list"); + if(page!=NULL){ GtkTextView *text=GTK_TEXT_VIEW(linphone_gtk_get_widget(page,"textview")); GtkTextBuffer *b=gtk_text_view_get_buffer(text); GtkTextIter iter; - GList *l = g_object_get_data(G_OBJECT(page),"list"); - gtk_text_buffer_get_end_iter(b,&iter); - gtk_text_buffer_get_iter_at_offset(b,&iter,GPOINTER_TO_INT(g_list_nth_data(l,0))); - fprintf(stdout,"offset check %i \n",GPOINTER_TO_INT(g_list_nth_data(l,0))); - l=g_list_remove(l,g_list_nth_data(l,0)); - gtk_text_buffer_insert_pixbuf(b,&iter,pixbuf); + GtkTextIter end; + GtkTextIter start; - //gtk_text_buffer_get_end_iter(b,&iter); - //gtk_text_buffer_insert_pixbuf(b,&iter,pixbuf); - //gtk_text_buffer_get_end_iter(b,&iter); - //gtk_text_buffer_insert(b,&iter,"\n",-1); - g_object_set_data(G_OBJECT(page),"list",l); + gtk_text_buffer_get_iter_at_line(b,&iter, + GPOINTER_TO_INT(g_list_nth_data(list,0))); + if(gtk_text_iter_get_chars_in_line(&iter) >0) { + gtk_text_buffer_get_iter_at_line_offset(b,&start, + GPOINTER_TO_INT(g_list_nth_data(list,0)), + gtk_text_iter_get_chars_in_line(&iter)-1); + }else { + gtk_text_buffer_get_iter_at_line_offset(b,&start, + GPOINTER_TO_INT(g_list_nth_data(list,0)),0); + } + gtk_text_buffer_get_iter_at_line_offset(b,&end, + GPOINTER_TO_INT(g_list_nth_data(list,0)),0); + gtk_text_buffer_delete(b,&start,&end); + gtk_text_buffer_get_iter_at_line(b,&iter,GPOINTER_TO_INT(g_list_nth_data(list,0))); + + switch (state) { + case LinphoneChatMessageStateInProgress: + gtk_text_buffer_insert_with_tags_by_name(b,&iter,"Message in progress.",-1, + "italic","right","small",NULL); + break; + case LinphoneChatMessageStateDelivered: + gtk_text_buffer_insert_with_tags_by_name(b,&iter,"Message delivered",-1, + "italic","right","small",NULL); + break; + case LinphoneChatMessageStateNotDelivered: + gtk_text_buffer_insert_with_tags_by_name(b,&iter,"Message not delivered",-1, + "italic","right","small",NULL); + break; + default : gtk_text_buffer_insert_with_tags_by_name(b,&iter,"12",-1, + "italic","right","small",NULL); + } + + list=g_list_remove(list,g_list_nth_data(list,0)); + g_object_set_data(G_OBJECT(page),"list",list); } else { fprintf(stdout,"NULLLL\n"); }*/ @@ -158,26 +171,25 @@ void update_chat_state_message(LinphoneChatMessageState state){ static void on_chat_state_changed(LinphoneChatMessage *msg, LinphoneChatMessageState state, void *user_pointer){ g_message("chat message state is %s",linphone_chat_message_state_to_string(state)); - update_chat_state_message(state); + update_chat_state_message(state); } -void linphone_gtk_send_text(LinphoneChatRoom *cr){ +void linphone_gtk_send_text(){ GtkWidget *main_window=linphone_gtk_get_main_window(); GtkWidget *friendlist=linphone_gtk_get_widget(main_window,"contact_list"); GtkWidget *w=(GtkWidget*)g_object_get_data(G_OBJECT(friendlist),"chatview"); GtkWidget *entry=linphone_gtk_get_widget(w,"text_entry"); const gchar *entered; - + LinphoneChatRoom *cr=g_object_get_data(G_OBJECT(w),"cr"); entered=gtk_entry_get_text(GTK_ENTRY(entry)); if (strlen(entered)>0) { LinphoneChatMessage *msg; linphone_gtk_push_text(w, linphone_gtk_get_used_identity(), - entered,TRUE,g_object_get_data(G_OBJECT(w),"cr")); - msg=linphone_chat_room_create_message(cr,entered); + entered,TRUE,cr); + msg=linphone_chat_room_create_message(cr,entered); linphone_chat_room_send_message2(cr,msg,on_chat_state_changed,NULL); gtk_entry_set_text(GTK_ENTRY(entry),""); - } } @@ -188,7 +200,8 @@ GtkWidget* linphone_gtk_init_chatroom(LinphoneChatRoom *cr, const LinphoneAddres GtkNotebook *notebook=(GtkNotebook *)linphone_gtk_get_widget(main_window,"viewswitch"); GtkWidget *text=linphone_gtk_get_widget(chat_view,"textview"); int idx; - + + gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW(text),GTK_WRAP_WORD); gtk_text_view_set_editable (GTK_TEXT_VIEW(text),FALSE); gtk_notebook_append_page (notebook,chat_view,create_tab_chat_header(cr,with)); @@ -196,12 +209,14 @@ GtkWidget* linphone_gtk_init_chatroom(LinphoneChatRoom *cr, const LinphoneAddres gtk_notebook_set_current_page(notebook, idx); gtk_widget_show(chat_view); - GList *l = NULL; + g_object_set_data(G_OBJECT(chat_view),"cr",cr); g_object_set_data(G_OBJECT(chat_view),"idx",GINT_TO_POINTER(idx)); g_object_set_data(G_OBJECT(chat_view),"from_message",NULL); g_object_set_data(G_OBJECT(chat_view),"from_chatroom",linphone_address_as_string_uri_only(with)); - g_object_set_data(G_OBJECT(chat_view),"list",l); + + GList *list=NULL; + g_object_set_data(G_OBJECT(chat_view),"list",list); gchar *buf=g_hash_table_lookup(hash,linphone_address_as_string_uri_only(with)); if(buf != NULL){ @@ -211,22 +226,26 @@ GtkWidget* linphone_gtk_init_chatroom(LinphoneChatRoom *cr, const LinphoneAddres GtkTextBuffer *text_buffer; text_buffer=gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)); gtk_text_buffer_get_bounds(text_buffer, &start, &end); - g_object_set_data(G_OBJECT(chat_view),"cr",cr); gtk_text_buffer_delete (text_buffer, &start, &end); gtk_text_buffer_insert(text_buffer,&start,buf,-1); } gtk_text_buffer_create_tag(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)), - "right","justification", GTK_JUSTIFY_RIGHT,NULL); - + "right","justification", GTK_JUSTIFY_RIGHT,NULL); gtk_text_buffer_create_tag(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)), - "bold","weight", PANGO_WEIGHT_BOLD,NULL); + "bold","weight", PANGO_WEIGHT_BOLD,NULL); + gtk_text_buffer_create_tag(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)), + "italic","style", PANGO_STYLE_ITALIC,NULL); + gtk_text_buffer_create_tag(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)), + "small","size",8*PANGO_SCALE,NULL); + gtk_text_buffer_create_tag(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)), + "font_grey","foreground","grey",NULL); GtkWidget *button = linphone_gtk_get_widget(chat_view,"send"); - g_signal_connect_swapped(G_OBJECT(button),"clicked",(GCallback)linphone_gtk_send_text,cr); + g_signal_connect_swapped(G_OBJECT(button),"clicked",(GCallback)linphone_gtk_send_text,NULL); GtkWidget *entry = linphone_gtk_get_widget(chat_view,"text_entry"); - g_signal_connect_swapped(G_OBJECT(entry),"activate",(GCallback)linphone_gtk_send_text,cr); + g_signal_connect_swapped(G_OBJECT(entry),"activate",(GCallback)linphone_gtk_send_text,NULL); return chat_view; } @@ -237,8 +256,6 @@ LinphoneChatRoom * linphone_gtk_create_chatroom(const LinphoneAddress *with){ return cr; } - - void linphone_gtk_load_chatroom(LinphoneChatRoom *cr,const LinphoneAddress *uri,GtkWidget *chat_view){ GtkWidget *main_window=linphone_gtk_get_main_window (); GHashTable *hash=g_object_get_data(G_OBJECT(main_window),"history"); @@ -255,17 +272,14 @@ void linphone_gtk_load_chatroom(LinphoneChatRoom *cr,const LinphoneAddress *uri, g_object_set_data(G_OBJECT(chat_view),"cr",cr); gtk_text_buffer_delete (text_buffer, &start, &end); if(buf!=NULL){ - gtk_text_buffer_insert(text_buffer,&start,buf,-1); - } else { - g_object_set_data(G_OBJECT(chat_view),"from_message",NULL); - GtkWidget *entry = linphone_gtk_get_widget(chat_view,"text_entry"); - g_signal_connect_swapped(G_OBJECT(entry),"activate",(GCallback)linphone_gtk_send_text,cr); - - GtkWidget *button = linphone_gtk_get_widget(chat_view,"send"); - g_signal_connect_swapped(G_OBJECT(button),"clicked",(GCallback)linphone_gtk_send_text,cr); - } - + gtk_text_buffer_insert_with_tags_by_name(text_buffer,&start,buf,-1,"font_grey","small",NULL); + GtkTextMark *mark=gtk_text_buffer_create_mark(text_buffer, NULL, &start, FALSE); + gtk_text_view_scroll_to_mark(text_view,mark, 0, FALSE, 0, 0); + } + g_object_set_data(G_OBJECT(chat_view),"cr",cr); g_object_set_data(G_OBJECT(chat_view),"from_chatroom",linphone_address_as_string_uri_only(uri)); + g_object_set_data(G_OBJECT(chat_view),"from_message",linphone_address_as_string_uri_only(uri)); + g_object_set_data(G_OBJECT(linphone_gtk_get_widget(main_window,"contact_list")),"chatview",(gpointer)chat_view); } } @@ -312,4 +326,3 @@ void linphone_gtk_text_received(LinphoneCore *lc, LinphoneChatRoom *room, const //gtk_window_present(GTK_WINDOW(w)); /*gtk_window_set_urgency_hint(GTK_WINDOW(w),TRUE);*/ } - diff --git a/gtk/friendlist.c b/gtk/friendlist.c index 3124fdbb1..9aabe597a 100644 --- a/gtk/friendlist.c +++ b/gtk/friendlist.c @@ -207,14 +207,11 @@ void linphone_gtk_chat_selected(GtkWidget *item){ store=GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(item))); if (gtk_tree_selection_get_selected (select, &model, &iter)){ GtkNotebook *notebook=(GtkNotebook *)linphone_gtk_get_widget(w,"viewswitch"); - gtk_tree_model_get(model,&iter,FRIEND_CHATROOM,&cr,-1); const LinphoneAddress *uri; gtk_tree_model_get (model, &iter,FRIEND_ID , &lf, -1); uri=linphone_friend_get_address(lf); if(cr == NULL){ cr=linphone_gtk_create_chatroom(uri); - gtk_list_store_set(store,&iter, FRIEND_CHATROOM,cr,-1); - gtk_list_store_set(store,&iter, FRIEND_CHAT_CONVERSATION,NULL,-1); } page=(GtkWidget*)g_object_get_data(G_OBJECT(friendlist),"chatview"); if(page==NULL){ diff --git a/gtk/linphone.h b/gtk/linphone.h index ca6234b4f..f2b02aace 100644 --- a/gtk/linphone.h +++ b/gtk/linphone.h @@ -107,7 +107,7 @@ void linphone_gtk_status_icon_set_blinking(gboolean val); void linphone_gtk_notify(LinphoneCall *call, const char *msg); LinphoneChatRoom *linphone_gtk_start_chat(GtkTreeView* t); void linphone_gtk_load_chatroom(LinphoneChatRoom *cr,const LinphoneAddress *uri,GtkWidget *chat_view); -void linphone_gtk_send_text(LinphoneChatRoom *cr); +void linphone_gtk_send_text(); GtkWidget * linphone_gtk_init_chatroom(LinphoneChatRoom *cr, const LinphoneAddress *with); void linphone_gtk_update_chat_picture(gboolean active); void linphone_gtk_chat_set_conversation(const LinphoneAddress *uri,gchar *conversation); diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am index a7ee4ecb9..186254c11 100644 --- a/pixmaps/Makefile.am +++ b/pixmaps/Makefile.am @@ -11,10 +11,10 @@ status-orange.png \ status-red.png \ status-offline.png \ call.png \ -chat.png \ +chat.png active_chat.png\ chat_message_inprogress.png chat_message_delivered.png chat_message_not_delivered.png\ contact-orange.png dialer-orange.png history-orange.png\ -startcall-green.png stopcall-red.png addcall-green.png linphone.icns \ +startcall-green.png startcall-small.png stopcall-red.png stopcall-small.png addcall-green.png linphone.icns \ contact_starred.png contact_unstarred.png \ speaker.png \ ok.png \ diff --git a/po/fr.po b/po/fr.po index 5062fc074..8c955f75c 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,12 +1,12 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) 2001 Free Software Foundation, Inc. -# Simon Morlat , 2001. -# +# SOME DESCRIPTIVE TITLE. +# Copyright (C) 2001 Free Software Foundation, Inc. +# Simon Morlat , 2001. +# msgid "" msgstr "" "Project-Id-Version: Linphone 0.9.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-08 10:35+0100\n" +"POT-Creation-Date: 2011-12-05 12:41+0100\n" "PO-Revision-Date: 2002-12-06 17:33+0100\n" "Last-Translator: Simon Morlat \n" "Language-Team: french \n" @@ -16,19 +16,16 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: ../gtk/calllogs.c:82 -#, fuzzy msgid "Aborted" -msgstr "abandonné" +msgstr "Abandonné" #: ../gtk/calllogs.c:85 -#, fuzzy msgid "Missed" -msgstr "manqué" +msgstr "Manqué" #: ../gtk/calllogs.c:88 -#, fuzzy msgid "Declined" -msgstr "Refuser" +msgstr "Refusé" #: ../gtk/calllogs.c:94 #, c-format @@ -62,7 +59,8 @@ msgid "" "%s\t%s" msgstr "" -#: ../gtk/conference.c:33 ../gtk/main.ui.h:13 +#: ../gtk/conference.c:33 +#: ../gtk/main.ui.h:13 msgid "Conference" msgstr "Conférence" @@ -70,7 +68,9 @@ msgstr "Conférence" msgid "Me" msgstr "Moi" -#: ../gtk/support.c:49 ../gtk/support.c:73 ../gtk/support.c:102 +#: ../gtk/support.c:49 +#: ../gtk/support.c:73 +#: ../gtk/support.c:102 #, c-format msgid "Couldn't find pixmap file: %s" msgstr "Icone non trouvée: %s" @@ -100,12 +100,8 @@ msgid "if set automatically answer incoming calls" msgstr "si positionné, répond automatiquement aux appels entrants" #: ../gtk/main.c:131 -msgid "" -"Specifiy a working directory (should be the base of the installation, eg: c:" -"\\Program Files\\Linphone)" -msgstr "" -"Spécifie un répertoire de travail (qui devrait être le répertoire " -"d'installation, par exemple c:\\Program Files\\Linphone)" +msgid "Specifiy a working directory (should be the base of the installation, eg: c:\\Program Files\\Linphone)" +msgstr "Spécifie un répertoire de travail (qui devrait être le répertoire d'installation, par exemple c:\\Program Files\\Linphone)" #: ../gtk/main.c:498 #, c-format @@ -116,15 +112,12 @@ msgstr "Appel avec %s" #, c-format msgid "" "%s would like to add you to his contact list.\n" -"Would you allow him to see your presence status or add him to your contact " -"list ?\n" +"Would you allow him to see your presence status or add him to your contact list ?\n" "If you answer no, this person will be temporarily blacklisted." msgstr "" "%s souhaite vous ajouter à sa liste de contact.\n" -"Souhaitez vous l'autoriser à voir votre information de présence et l'ajouter " -"à votre liste également ?\n" -"Si vous répondez non, cette personne sera mise temporairement sur liste " -"noire." +"Souhaitez vous l'autoriser à voir votre information de présence et l'ajouter à votre liste également ?\n" +"Si vous répondez non, cette personne sera mise temporairement sur liste noire." #: ../gtk/main.c:948 #, c-format @@ -139,19 +132,24 @@ msgstr "" msgid "Call error" msgstr "Erreur lors de l'appel" -#: ../gtk/main.c:1054 ../coreapi/linphonecore.c:2949 +#: ../gtk/main.c:1054 +#: ../coreapi/linphonecore.c:2949 msgid "Call ended" msgstr "Appel terminé." -#: ../gtk/main.c:1057 ../coreapi/linphonecore.c:244 +#: ../gtk/main.c:1057 +#: ../coreapi/linphonecore.c:244 msgid "Incoming call" msgstr "Appel entrant" -#: ../gtk/main.c:1059 ../gtk/incall_view.c:451 ../gtk/main.ui.h:6 +#: ../gtk/main.c:1059 +#: ../gtk/incall_view.c:451 +#: ../gtk/main.ui.h:6 msgid "Answer" msgstr "Répondre" -#: ../gtk/main.c:1061 ../gtk/main.ui.h:7 +#: ../gtk/main.c:1061 +#: ../gtk/main.ui.h:7 msgid "Decline" msgstr "Refuser" @@ -182,7 +180,8 @@ msgstr "Linphone - un téléphone video pour l'internet" msgid "%s (Default)" msgstr "%s (par défaut)" -#: ../gtk/main.c:1714 ../coreapi/callbacks.c:774 +#: ../gtk/main.c:1714 +#: ../coreapi/callbacks.c:774 #, c-format msgid "We are transferred to %s" msgstr "Transfert vers %s" @@ -201,13 +200,15 @@ msgstr "Un visiophone libre" #: ../gtk/friendlist.c:335 msgid "Add to addressbook" -msgstr "" +msgstr "Ajouter au carnet d'adresse" #: ../gtk/friendlist.c:509 msgid "Presence status" msgstr "Info de présence" -#: ../gtk/friendlist.c:526 ../gtk/propertybox.c:362 ../gtk/contact.ui.h:1 +#: ../gtk/friendlist.c:526 +#: ../gtk/propertybox.c:362 +#: ../gtk/contact.ui.h:1 msgid "Name" msgstr "Nom" @@ -269,11 +270,13 @@ msgstr "Débit min. (kbit/s)" msgid "Parameters" msgstr "Paramètres" -#: ../gtk/propertybox.c:430 ../gtk/propertybox.c:573 +#: ../gtk/propertybox.c:430 +#: ../gtk/propertybox.c:573 msgid "Enabled" msgstr "Activé" -#: ../gtk/propertybox.c:432 ../gtk/propertybox.c:573 +#: ../gtk/propertybox.c:432 +#: ../gtk/propertybox.c:573 msgid "Disabled" msgstr "Désactivé" @@ -283,7 +286,7 @@ msgstr "Compte" #: ../gtk/propertybox.c:759 msgid "English" -msgstr "" +msgstr "Anglais" #: ../gtk/propertybox.c:760 msgid "French" @@ -291,31 +294,31 @@ msgstr "Français" #: ../gtk/propertybox.c:761 msgid "Swedish" -msgstr "" +msgstr "Suédois" #: ../gtk/propertybox.c:762 msgid "Italian" -msgstr "" +msgstr "Italien" #: ../gtk/propertybox.c:763 msgid "Spanish" -msgstr "" +msgstr "Espagnol" #: ../gtk/propertybox.c:764 msgid "Brazilian Portugese" -msgstr "" +msgstr "Portugais brésilien" #: ../gtk/propertybox.c:765 msgid "Polish" -msgstr "" +msgstr "Polonais" #: ../gtk/propertybox.c:766 msgid "German" -msgstr "" +msgstr "Allemand" #: ../gtk/propertybox.c:767 msgid "Russian" -msgstr "" +msgstr "Russe" #: ../gtk/propertybox.c:768 msgid "Japanese" @@ -323,15 +326,15 @@ msgstr "日本語" #: ../gtk/propertybox.c:769 msgid "Dutch" -msgstr "" +msgstr "Néérlandais" #: ../gtk/propertybox.c:770 msgid "Hungarian" -msgstr "" +msgstr "Hongrois" #: ../gtk/propertybox.c:771 msgid "Czech" -msgstr "" +msgstr "Tchèque" #: ../gtk/propertybox.c:772 msgid "Chinese" @@ -339,22 +342,19 @@ msgstr "简体中文" #: ../gtk/propertybox.c:773 msgid "Traditional Chinese" -msgstr "" +msgstr "Chinois traditionnel" #: ../gtk/propertybox.c:774 msgid "Norwegian" -msgstr "" +msgstr "Norvégien" #: ../gtk/propertybox.c:775 msgid "Hebrew" -msgstr "" +msgstr "Hébreu" #: ../gtk/propertybox.c:842 -msgid "" -"You need to restart linphone for the new language selection to take effect." -msgstr "" -"La nouvelle selection de langue prendra effet au prochain démarrage de " -"linphone." +msgid "You need to restart linphone for the new language selection to take effect." +msgstr "La nouvelle selection de langue prendra effet au prochain démarrage de linphone." #: ../gtk/propertybox.c:912 msgid "None" @@ -432,7 +432,8 @@ msgstr "" msgid "Username:" msgstr "Nom d'utilisateur:" -#: ../gtk/setupwizard.c:93 ../gtk/password.ui.h:4 +#: ../gtk/setupwizard.c:93 +#: ../gtk/password.ui.h:4 msgid "Password:" msgstr "Mot de passe:" @@ -441,14 +442,12 @@ msgid "Enter your account informations" msgstr "" #: ../gtk/setupwizard.c:120 -#, fuzzy msgid "Username*" -msgstr "Nom d'utilisateur" +msgstr "Nom d'utilisateur*" #: ../gtk/setupwizard.c:121 -#, fuzzy msgid "Password*" -msgstr "Mot de passe" +msgstr "Mot de passe*" #: ../gtk/setupwizard.c:124 msgid "Domain*" @@ -463,14 +462,12 @@ msgid "(*) Required fields" msgstr "" #: ../gtk/setupwizard.c:298 -#, fuzzy msgid "Username: (*)" -msgstr "Nom d'utilisateur:" +msgstr "Nom d'utilisateur: (*)" #: ../gtk/setupwizard.c:300 -#, fuzzy msgid "Password: (*)" -msgstr "Mot de passe:" +msgstr "Mot de passe: (*)" #: ../gtk/setupwizard.c:302 msgid "Email: (*)" @@ -492,8 +489,7 @@ msgstr "" #: ../gtk/setupwizard.c:387 msgid "" -"Please validate your account by clicking on the link we just sent you by " -"email.\n" +"Please validate your account by clicking on the link we just sent you by email.\n" "Then come back here and press Next button." msgstr "" @@ -524,13 +520,14 @@ msgstr "" #: ../gtk/setupwizard.c:588 msgid "Error" -msgstr "" +msgstr "Erreur" #: ../gtk/setupwizard.c:592 msgid "Terminating" msgstr "" -#: ../gtk/incall_view.c:69 ../gtk/incall_view.c:90 +#: ../gtk/incall_view.c:69 +#: ../gtk/incall_view.c:90 #, c-format msgid "Call #%i" msgstr "Appel #%i" @@ -540,7 +537,8 @@ msgstr "Appel #%i" msgid "Transfer to call #%i with %s" msgstr "Transférer vers l'appel #%i avec %s" -#: ../gtk/incall_view.c:209 ../gtk/incall_view.c:212 +#: ../gtk/incall_view.c:209 +#: ../gtk/incall_view.c:212 #, fuzzy msgid "Not used" msgstr "Non trouvé" @@ -571,14 +569,16 @@ msgstr "Redirection" msgid "Through a relay server" msgstr "" -#: ../gtk/incall_view.c:238 ../gtk/incall_view.c:242 +#: ../gtk/incall_view.c:238 +#: ../gtk/incall_view.c:242 #, c-format msgid "" "download: %f\n" "upload: %f (kbit/s)" msgstr "" -#: ../gtk/incall_view.c:341 ../gtk/main.ui.h:12 +#: ../gtk/incall_view.c:341 +#: ../gtk/main.ui.h:12 msgid "Hang up" msgstr "" @@ -586,7 +586,8 @@ msgstr "" msgid "Calling..." msgstr "Tentative d'appel..." -#: ../gtk/incall_view.c:433 ../gtk/incall_view.c:646 +#: ../gtk/incall_view.c:433 +#: ../gtk/incall_view.c:646 msgid "00::00::00" msgstr "" @@ -614,7 +615,8 @@ msgstr "très faible" msgid "too bad" msgstr "nulle" -#: ../gtk/incall_view.c:490 ../gtk/incall_view.c:506 +#: ../gtk/incall_view.c:490 +#: ../gtk/incall_view.c:506 msgid "unavailable" msgstr "indisponible" @@ -631,7 +633,8 @@ msgstr "Sécurisé par ZRTP- [jeton: %s]" msgid "Set unverified" msgstr "Marquer comme non vérifié" -#: ../gtk/incall_view.c:617 ../gtk/main.ui.h:5 +#: ../gtk/incall_view.c:617 +#: ../gtk/main.ui.h:5 msgid "Set verified" msgstr "Marquer comme vérifié" @@ -661,20 +664,19 @@ msgid "Transfer in progress" msgstr "" #: ../gtk/incall_view.c:734 -#, fuzzy msgid "Transfer done." -msgstr "Transfert" +msgstr "Transfert terminé" #: ../gtk/incall_view.c:737 -#, fuzzy msgid "Transfer failed." -msgstr "Transfert" +msgstr "Transfert échoué" #: ../gtk/incall_view.c:781 msgid "Resume" msgstr "Reprendre" -#: ../gtk/incall_view.c:788 ../gtk/main.ui.h:9 +#: ../gtk/incall_view.c:788 +#: ../gtk/main.ui.h:9 msgid "Pause" msgstr "Pause" @@ -692,9 +694,8 @@ msgid "Send" msgstr "Envoyer" #: ../gtk/main.ui.h:3 -#, fuzzy msgid "End conference" -msgstr "En conférence" +msgstr "Fin de conférence" #: ../gtk/main.ui.h:4 msgid "label" @@ -702,7 +703,7 @@ msgstr "" #: ../gtk/main.ui.h:8 msgid "Video" -msgstr "" +msgstr "Vidéo" #: ../gtk/main.ui.h:10 msgid "Mute" @@ -758,17 +759,19 @@ msgstr "" #: ../gtk/main.ui.h:25 msgid "SIP address or phone number:" -msgstr "Addresse SIP ou numéro" +msgstr "Adresse SIP ou numéro" #: ../gtk/main.ui.h:26 msgid "Initiate a new call" msgstr "Démarrer un nouvel appel" -#: ../gtk/main.ui.h:27 ../gtk/parameters.ui.h:48 +#: ../gtk/main.ui.h:27 +#: ../gtk/parameters.ui.h:48 msgid "Add" msgstr "Ajouter" -#: ../gtk/main.ui.h:28 ../gtk/parameters.ui.h:49 +#: ../gtk/main.ui.h:28 +#: ../gtk/parameters.ui.h:49 msgid "Edit" msgstr "Editer" @@ -788,7 +791,8 @@ msgstr "" msgid "*" msgstr "" -#: ../gtk/main.ui.h:33 ../gtk/parameters.ui.h:7 +#: ../gtk/main.ui.h:33 +#: ../gtk/parameters.ui.h:7 msgid "C" msgstr "" @@ -860,11 +864,13 @@ msgstr "Appels récents" msgid "My current identity:" msgstr "Mon identité sip:" -#: ../gtk/main.ui.h:51 ../gtk/tunnel_config.ui.h:7 +#: ../gtk/main.ui.h:51 +#: ../gtk/tunnel_config.ui.h:7 msgid "Username" msgstr "Nom d'utilisateur" -#: ../gtk/main.ui.h:52 ../gtk/tunnel_config.ui.h:8 +#: ../gtk/main.ui.h:52 +#: ../gtk/tunnel_config.ui.h:8 msgid "Password" msgstr "Mot de passe" @@ -1113,7 +1119,7 @@ msgstr "Protocoles réseaux et ports" #: ../gtk/parameters.ui.h:23 msgid "Direct connection to the Internet" -msgstr "Connection directe à l'Internet" +msgstr "Connexion directe à l'Internet" #: ../gtk/parameters.ui.h:24 msgid "Behind NAT / Firewall (specify gateway IP below)" @@ -1121,7 +1127,7 @@ msgstr "Derrière un pare-feu (spécifier la passerelle ci dessous)" #: ../gtk/parameters.ui.h:25 msgid "Public IP address:" -msgstr "Addresse IP publique:" +msgstr "Adresse IP publique:" #: ../gtk/parameters.ui.h:26 msgid "Behind NAT / Firewall (use STUN to resolve)" @@ -1190,9 +1196,7 @@ msgstr "Paramètres multimedia" #: ../gtk/parameters.ui.h:42 msgid "This section defines your SIP address when not using a SIP account" -msgstr "" -"Cette rubrique permet de définir son addresse SIP lorsqu'on ne possède pas " -"de compte SIP" +msgstr "Cette rubrique permet de définir son addresse SIP lorsqu'on ne possède pas de compte SIP" #: ../gtk/parameters.ui.h:43 msgid "Your display name (eg: John Doe):" @@ -1234,11 +1238,13 @@ msgstr "Sécurité" msgid "Manage SIP Accounts" msgstr "Gérer mes comptes SIP" -#: ../gtk/parameters.ui.h:55 ../gtk/tunnel_config.ui.h:4 +#: ../gtk/parameters.ui.h:55 +#: ../gtk/tunnel_config.ui.h:4 msgid "Enable" msgstr "Activer" -#: ../gtk/parameters.ui.h:56 ../gtk/tunnel_config.ui.h:5 +#: ../gtk/parameters.ui.h:56 +#: ../gtk/tunnel_config.ui.h:5 msgid "Disable" msgstr "Désactiver" @@ -1263,13 +1269,8 @@ msgid "Enable adaptive rate control" msgstr "Activer le control de débit adaptatif." #: ../gtk/parameters.ui.h:62 -msgid "" -"Adaptive rate control is a technique to dynamically guess the available " -"bandwidth during a call." -msgstr "" -"Le control de débit adaptatif est une technique pour adapter la qualité " -"de l'audio et de la video en fonction de la bande passante disponible, " -"durant l'appel." +msgid "Adaptive rate control is a technique to dynamically guess the available bandwidth during a call." +msgstr "Le control de débit adaptatif est une technique pour adapter la qualité de l'audio et de la video en fonction de la bande passante disponible, durant l'appel." #: ../gtk/parameters.ui.h:63 msgid "Bandwidth control" @@ -1350,9 +1351,8 @@ msgid "Audio codec" msgstr "Codecs audio" #: ../gtk/call_statistics.ui.h:3 -#, fuzzy msgid "Video codec" -msgstr "Codecs video" +msgstr "Codecs vidéo" #: ../gtk/call_statistics.ui.h:4 msgid "Audio IP bandwidth usage" @@ -1437,11 +1437,8 @@ msgid "Could not resolve this number." msgstr "La destination n'a pu être trouvée." #: ../coreapi/linphonecore.c:2121 -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 à " +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:2312 msgid "Contacting" @@ -1569,12 +1566,8 @@ msgid "Unknown-bug" msgstr "Bug inconnu" #: ../coreapi/proxy.c:204 -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:\" " -"suivie par un nom de domaine." +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:\" suivie par un nom de domaine." #: ../coreapi/proxy.c:210 msgid "" @@ -1582,8 +1575,7 @@ 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:1053 #, c-format From 7a457c25e03d8e9ee5a0f7949334b902529e1263 Mon Sep 17 00:00:00 2001 From: Margaux Clerc Date: Thu, 10 Jan 2013 15:55:10 +0100 Subject: [PATCH 13/50] fix linphone quit --- gtk/main.c | 1 - 1 file changed, 1 deletion(-) diff --git a/gtk/main.c b/gtk/main.c index 08461290a..59530d816 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -1750,7 +1750,6 @@ static void linphone_gtk_quit(void){ #ifdef BUILD_WIZARD linphone_gtk_close_assistant(); #endif - linphone_gtk_destroy_main_window(); linphone_gtk_uninit_instance(); linphone_gtk_destroy_log_window(); linphone_core_destroy(the_core); From 643ea99258887997010d0d05df4e21da00b700a8 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Fri, 11 Jan 2013 10:52:22 +0100 Subject: [PATCH 14/50] Update ms2 submodule. --- mediastreamer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediastreamer2 b/mediastreamer2 index fe26d776c..3f8ccb0f4 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit fe26d776c00b091586ed7247669ad1eee893effd +Subproject commit 3f8ccb0f4f3509ceeb486e8da9528a9bde1471e2 From fb408613cdf20119f69c7c6f92186ce55a4a79d4 Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Mon, 14 Jan 2013 14:28:51 +0100 Subject: [PATCH 15/50] Fix BYE authorization when challenged --- coreapi/sal_eXosip2.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/coreapi/sal_eXosip2.c b/coreapi/sal_eXosip2.c index b26751a71..f4830934d 100644 --- a/coreapi/sal_eXosip2.c +++ b/coreapi/sal_eXosip2.c @@ -938,8 +938,13 @@ int sal_call_terminate(SalOp *h){ } void sal_op_authenticate(SalOp *h, const SalAuthInfo *info){ - if (h->terminated) return; - if (h->pending_auth){ + bool_t terminating=FALSE; + if (h->pending_auth && strcmp(h->pending_auth->request->sip_method,"BYE")==0) { + terminating=TRUE; + } + if (h->terminated && !terminating) return; + + if (h->pending_auth){ push_auth_to_exosip(info); /*FIXME exosip does not take into account this update register message*/ From a302d7edd585029ef1258b49f1b503d2f4a7eff6 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 14 Jan 2013 16:17:02 +0100 Subject: [PATCH 16/50] update ms2 --- coreapi/sal_eXosip2.c | 4 ++-- mediastreamer2 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/coreapi/sal_eXosip2.c b/coreapi/sal_eXosip2.c index f4830934d..203c7cb92 100644 --- a/coreapi/sal_eXosip2.c +++ b/coreapi/sal_eXosip2.c @@ -397,12 +397,12 @@ int sal_listen_port(Sal *ctx, const char *addr, int port, SalTransport tr, int i switch (tr) { case SalTransportUDP: proto=IPPROTO_UDP; - eXosip_set_option (EXOSIP_OPT_UDP_KEEP_ALIVE, &keepalive); + eXosip_set_option (EXOSIP_OPT_UDP_KEEP_ALIVE, &keepalive); break; case SalTransportTCP: case SalTransportTLS: proto= IPPROTO_TCP; - keepalive=-1; + keepalive=-1; eXosip_set_option (EXOSIP_OPT_UDP_KEEP_ALIVE,&keepalive); set_tls_options(ctx); break; diff --git a/mediastreamer2 b/mediastreamer2 index 3f8ccb0f4..6874ac86f 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 3f8ccb0f4f3509ceeb486e8da9528a9bde1471e2 +Subproject commit 6874ac86f173b5cf57b87e5ee529652ba6676295 From 27d916ee9806ffa37d3452841d0b353d430570e8 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 15 Jan 2013 11:53:33 +0100 Subject: [PATCH 17/50] enforce "media_encryption_mandatory" policy for incoming calls too. add toggle button for this into gtk interface. --- coreapi/callbacks.c | 4 +- coreapi/linphonecore.c | 24 +++++++-- coreapi/private.h | 1 + gtk/parameters.ui | 111 ++++++++++++++++++++++++----------------- gtk/propertybox.c | 35 +++++++++++-- mediastreamer2 | 2 +- 6 files changed, 118 insertions(+), 59 deletions(-) diff --git a/coreapi/callbacks.c b/coreapi/callbacks.c index 2f0d25b0d..1f7ff42fd 100644 --- a/coreapi/callbacks.c +++ b/coreapi/callbacks.c @@ -344,7 +344,7 @@ static void call_accepted(SalOp *op){ linphone_call_set_state(call,LinphoneCallConnected,"Connected"); if (call->referer) linphone_core_notify_refer_state(lc,call->referer,call); } - if (md && !sal_media_description_empty(md)){ + if (md && !sal_media_description_empty(md) && !linphone_core_incompatible_security(lc,md)){ if (sal_media_description_has_dir(md,SalStreamSendOnly) || sal_media_description_has_dir(md,SalStreamInactive)){ if (lc->vtable.display_status){ @@ -393,7 +393,7 @@ static void call_accepted(SalOp *op){ }else{ /*send a bye*/ ms_error("Incompatible SDP offer received in 200Ok, need to abort the call"); - linphone_core_abort_call(lc,call,_("Incompatible, check codecs...")); + linphone_core_abort_call(lc,call,_("Incompatible, check codecs or security settings...")); } } diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index c6fc73590..4a0c3851b 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -65,6 +65,7 @@ static void linphone_core_run_hooks(LinphoneCore *lc); static void linphone_core_free_hooks(LinphoneCore *lc); #include "enum.h" + const char *linphone_core_get_nat_address_resolved(LinphoneCore *lc); void linphone_core_get_local_ip(LinphoneCore *lc, const char *dest, char *result); static void toggle_video_preview(LinphoneCore *lc, bool_t val); @@ -2549,6 +2550,19 @@ bool_t linphone_core_inc_invite_pending(LinphoneCore*lc){ return FALSE; } +bool_t linphone_core_incompatible_security(LinphoneCore *lc, SalMediaDescription *md){ + if (linphone_core_is_media_encryption_mandatory(lc) && linphone_core_get_media_encryption(lc)==LinphoneMediaEncryptionSRTP){ + int i; + for(i=0;instreams;i++){ + SalStreamDescription *sd=&md->streams[i]; + if (sd->proto!=SalProtoRtpSavp){ + return TRUE; + } + } + } + return FALSE; +} + void linphone_core_notify_incoming_call(LinphoneCore *lc, LinphoneCall *call){ char *barmesg; char *tmp; @@ -2560,10 +2574,12 @@ void linphone_core_notify_incoming_call(LinphoneCore *lc, LinphoneCall *call){ linphone_call_make_local_media_description(lc,call); sal_call_set_local_media_description(call->op,call->localdesc); md=sal_call_get_final_media_description(call->op); - if (md && sal_media_description_empty(md)){ - sal_call_decline(call->op,SalReasonMedia,NULL); - linphone_call_unref(call); - return; + if (md){ + if (sal_media_description_empty(md) || linphone_core_incompatible_security(lc,md)){ + sal_call_decline(call->op,SalReasonMedia,NULL); + linphone_call_unref(call); + return; + } } from_parsed=linphone_address_new(sal_op_get_from(call->op)); diff --git a/coreapi/private.h b/coreapi/private.h index c171fac88..29d31b7c6 100644 --- a/coreapi/private.h +++ b/coreapi/private.h @@ -299,6 +299,7 @@ int linphone_core_start_update_call(LinphoneCore *lc, LinphoneCall *call); int linphone_core_start_accept_call_update(LinphoneCore *lc, LinphoneCall *call); void linphone_core_start_refered_call(LinphoneCore *lc, LinphoneCall *call); void linphone_core_notify_incoming_call(LinphoneCore *lc, LinphoneCall *call); +bool_t linphone_core_incompatible_security(LinphoneCore *lc, SalMediaDescription *md); extern SalCallbacks linphone_sal_callbacks; void linphone_proxy_config_set_error(LinphoneProxyConfig *cfg, LinphoneReason error); bool_t linphone_core_rtcp_enabled(const LinphoneCore *lc); diff --git a/gtk/parameters.ui b/gtk/parameters.ui index 9e32e29c7..130b7e7c5 100644 --- a/gtk/parameters.ui +++ b/gtk/parameters.ui @@ -216,10 +216,10 @@ Set Maximum Transmission Unit: - False True True False + False True @@ -256,10 +256,10 @@ Send DTMFs as SIP info - False True True False + False True @@ -272,11 +272,11 @@ Use IPv6 instead of IPv4 - False True True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False True @@ -324,7 +324,7 @@ True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 6 + 7 2 @@ -364,7 +364,7 @@ 3 - 4 + 5 @@ -380,30 +380,20 @@ 4 - - - False - Tunnel - - - 5 - 6 - - gtk-edit - False True True + False True 1 2 - 5 - 6 + 6 + 7 @@ -439,25 +429,25 @@ DSCP fields - 4 - 5 + 5 + 6 gtk-edit - False True True True + False True 1 2 - 4 - 5 + 5 + 6 @@ -506,10 +496,10 @@ Fixed - False True True False + False True @@ -573,10 +563,10 @@ Fixed - False True True False + False True @@ -594,6 +584,33 @@ 3 + + + False + Tunnel + + + 6 + 7 + + + + + Media encryption is mandatory + True + True + False + False + True + + + + 1 + 2 + 4 + 5 + + @@ -628,10 +645,10 @@ Direct connection to the Internet - False True True False + False True True @@ -649,10 +666,10 @@ Behind NAT / Firewall (specify gateway IP below) - False True True False + False True True no_nat @@ -717,10 +734,10 @@ Behind NAT / Firewall (use STUN to resolve) - False True True False + False True no_nat @@ -734,10 +751,10 @@ Behind NAT / Firewall (use ICE) - False True True False + False True no_nat @@ -875,9 +892,6 @@ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 6 2 - - - True @@ -899,11 +913,11 @@ gtk-media-play - False True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False True @@ -1076,10 +1090,10 @@ Enable echo cancellation - False True True False + False True @@ -1090,6 +1104,9 @@ 6 + + + @@ -1425,10 +1442,10 @@ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False True True True + False @@ -1472,11 +1489,11 @@ - False True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False @@ -1520,11 +1537,11 @@ - False True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False @@ -1568,11 +1585,11 @@ - False True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False @@ -1661,11 +1678,11 @@ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False @@ -1847,11 +1864,11 @@ gtk-go-up - False True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False True @@ -1864,11 +1881,11 @@ gtk-go-down - False True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False True @@ -1880,11 +1897,11 @@ - False True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False @@ -1928,11 +1945,11 @@ - False True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False @@ -2095,10 +2112,10 @@ Enable adaptive rate control - False True True False + False 0 True @@ -2124,7 +2141,7 @@ 2 3 GTK_FILL - + @@ -2250,10 +2267,10 @@ Show advanced settings - False True True False + False True @@ -2330,11 +2347,11 @@ end - False True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False diff --git a/gtk/propertybox.c b/gtk/propertybox.c index 90b2bf947..ea0095fca 100644 --- a/gtk/propertybox.c +++ b/gtk/propertybox.c @@ -880,19 +880,35 @@ void linphone_gtk_ui_level_toggled(GtkWidget *w) { linphone_gtk_ui_level_adapt(top); } +static void linphone_gtk_set_media_encryption_mandatory_sensitive(GtkWidget *propbox, gboolean val){ + GtkWidget *w=linphone_gtk_get_widget(propbox,"media_encryption_mandatory"); + gtk_widget_set_sensitive(w,val); +} + static void linphone_gtk_media_encryption_changed(GtkWidget *combo){ char *selected=gtk_combo_box_get_active_text(GTK_COMBO_BOX(combo)); LinphoneCore *lc=linphone_gtk_get_core(); + GtkWidget *toplevel=gtk_widget_get_toplevel(combo); if (selected!=NULL){ - if (strcasecmp(selected,"SRTP")==0) + if (strcasecmp(selected,"SRTP")==0){ linphone_core_set_media_encryption(lc,LinphoneMediaEncryptionSRTP); - else if (strcasecmp(selected,"ZRTP")==0) + linphone_gtk_set_media_encryption_mandatory_sensitive(toplevel,TRUE); + }else if (strcasecmp(selected,"ZRTP")==0){ linphone_core_set_media_encryption(lc,LinphoneMediaEncryptionZRTP); - else linphone_core_set_media_encryption(lc,LinphoneMediaEncryptionNone); + linphone_gtk_set_media_encryption_mandatory_sensitive(toplevel,FALSE); + } + else { + linphone_core_set_media_encryption(lc,LinphoneMediaEncryptionNone); + linphone_gtk_set_media_encryption_mandatory_sensitive(toplevel,FALSE); + } g_free(selected); }else g_warning("gtk_combo_box_get_active_text() returned NULL"); } +void linphone_gtk_set_media_encryption_mandatory(GtkWidget *button){ + linphone_core_set_media_encryption_mandatory(linphone_gtk_get_core(),gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button))); +} + static void linphone_gtk_show_media_encryption(GtkWidget *pb){ LinphoneCore *lc=linphone_gtk_get_core(); GtkWidget *combo=linphone_gtk_get_widget(pb,"media_encryption_combo"); @@ -928,21 +944,30 @@ static void linphone_gtk_show_media_encryption(GtkWidget *pb){ /*hide this setting*/ gtk_widget_hide(combo); gtk_widget_hide(linphone_gtk_get_widget(pb,"media_encryption_label")); + gtk_widget_hide(linphone_gtk_get_widget(pb,"media_encryption_mandatory")); }else{ LinphoneMediaEncryption menc=linphone_core_get_media_encryption(lc); switch(menc){ case LinphoneMediaEncryptionNone: gtk_combo_box_set_active(GTK_COMBO_BOX(combo),0); + linphone_gtk_set_media_encryption_mandatory_sensitive(pb,FALSE); break; case LinphoneMediaEncryptionSRTP: - if (srtp_id!=-1) gtk_combo_box_set_active(GTK_COMBO_BOX(combo),srtp_id); + if (srtp_id!=-1) { + gtk_combo_box_set_active(GTK_COMBO_BOX(combo),srtp_id); + linphone_gtk_set_media_encryption_mandatory_sensitive(pb,TRUE); + } break; case LinphoneMediaEncryptionZRTP: - if (zrtp_id!=-1) gtk_combo_box_set_active(GTK_COMBO_BOX(combo),zrtp_id); + if (zrtp_id!=-1) { + gtk_combo_box_set_active(GTK_COMBO_BOX(combo),zrtp_id); + linphone_gtk_set_media_encryption_mandatory_sensitive(pb,FALSE); + } break; } g_signal_connect(G_OBJECT(combo),"changed",(GCallback)linphone_gtk_media_encryption_changed,NULL); } + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(linphone_gtk_get_widget(pb,"media_encryption_mandatory")),linphone_core_is_media_encryption_mandatory(lc)); g_object_unref(G_OBJECT(model)); } diff --git a/mediastreamer2 b/mediastreamer2 index 6874ac86f..1ac1a481d 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 6874ac86f173b5cf57b87e5ee529652ba6676295 +Subproject commit 1ac1a481d8b8ae72cba1d908b315e5e1f6b0da16 From 8315c4cf1fc8e5e2a73a68ee3dee3a85c89e5967 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Tue, 15 Jan 2013 12:07:01 +0100 Subject: [PATCH 18/50] Update ms2 --- mediastreamer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediastreamer2 b/mediastreamer2 index 1ac1a481d..ea75c0f9f 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 1ac1a481d8b8ae72cba1d908b315e5e1f6b0da16 +Subproject commit ea75c0f9f29cee8a1a5c37dee4df142c68144172 From d6b9b813eba377be8810033c83e2b735933389c9 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Tue, 15 Jan 2013 12:47:49 +0100 Subject: [PATCH 19/50] Update linphone tunnel API --- coreapi/linphone_tunnel.cc | 287 +++++++++++++++++++++++++++++-------- coreapi/linphone_tunnel.h | 109 +++++++++++--- coreapi/linphonecore.h | 2 +- gtk/propertybox.c | 43 ++---- 4 files changed, 335 insertions(+), 106 deletions(-) diff --git a/coreapi/linphone_tunnel.cc b/coreapi/linphone_tunnel.cc index f5a5d361f..c76441f5a 100644 --- a/coreapi/linphone_tunnel.cc +++ b/coreapi/linphone_tunnel.cc @@ -31,60 +31,257 @@ #include "private.h" #include "lpconfig.h" - LinphoneTunnel* linphone_core_get_tunnel(LinphoneCore *lc){ return lc->tunnel; } +struct _LinphoneTunnelConfig { + char *host; + int port; + int remote_udp_mirror_port; + int delay; +}; + +LinphoneTunnelConfig *linphone_tunnel_config_new() { + LinphoneTunnelConfig *ltc = ms_new0(LinphoneTunnelConfig,1); + ltc->remote_udp_mirror_port = 12345; + ltc->delay = 1000; + return ltc; +} + +void linphone_tunnel_config_set_host(LinphoneTunnelConfig *tunnel, const char *host) { + if(tunnel->host != NULL) { + ms_free(tunnel->host); + tunnel->host = NULL; + } + if(host != NULL && strlen(host)) { + tunnel->host = ms_strdup(host); + } +} + +const char *linphone_tunnel_config_get_host(LinphoneTunnelConfig *tunnel) { + return tunnel->host; +} + +void linphone_tunnel_config_set_port(LinphoneTunnelConfig *tunnel, int port) { + tunnel->port = port; +} + +int linphone_tunnel_config_get_port(LinphoneTunnelConfig *tunnel) { + return tunnel->port; +} + +void linphone_tunnel_config_set_remote_udp_mirror_port(LinphoneTunnelConfig *tunnel, int remote_udp_mirror_port) { + tunnel->remote_udp_mirror_port = remote_udp_mirror_port; +} + +int linphone_tunnel_config_get_remote_udp_mirror_port(LinphoneTunnelConfig *tunnel) { + return tunnel->remote_udp_mirror_port; +} + +void linphone_tunnel_config_set_delay(LinphoneTunnelConfig *tunnel, int delay) { + tunnel->delay = delay; +} + +int linphone_tunnel_config_get_delay(LinphoneTunnelConfig *tunnel) { + return tunnel->delay; +} + +void linphone_tunnel_config_destroy(LinphoneTunnelConfig *tunnel) { + if(tunnel->host != NULL) { + ms_free(tunnel->host); + } + ms_free(tunnel); +} + #ifdef TUNNEL_ENABLED -static inline belledonnecomm::TunnelManager *bcTunnel(LinphoneTunnel *tunnel){ - return (belledonnecomm::TunnelManager *)tunnel; -} - -static inline _LpConfig *config(LinphoneTunnel *tunnel){ - return ((belledonnecomm::TunnelManager *)tunnel)->getLinphoneCore()->config; -} +struct _LinphoneTunnel { + belledonnecomm::TunnelManager *manager; + MSList *config_list; +}; extern "C" LinphoneTunnel* linphone_core_tunnel_new(LinphoneCore *lc){ - LinphoneTunnel* tunnel= (LinphoneTunnel*) new belledonnecomm::TunnelManager(lc); + LinphoneTunnel* tunnel = ms_new0(LinphoneTunnel, 1); + tunnel->manager = new belledonnecomm::TunnelManager(lc); return tunnel; } +static inline belledonnecomm::TunnelManager *bcTunnel(LinphoneTunnel *tunnel){ + return tunnel->manager; +} + +static inline _LpConfig *config(LinphoneTunnel *tunnel){ + return tunnel->manager->getLinphoneCore()->config; +} + void linphone_tunnel_destroy(LinphoneTunnel *tunnel){ - delete bcTunnel(tunnel); + delete tunnel->manager; + ms_free(tunnel); } -static void add_server_to_config(LinphoneTunnel *tunnel, const char *host, int port){ - const char *orig=lp_config_get_string(config(tunnel),"tunnel","server_addresses", NULL); +static char *linphone_tunnel_config_to_string(const LinphoneTunnelConfig *tunnel_config) { + char *str = NULL; + if(tunnel_config->remote_udp_mirror_port != -1) { + str = ms_strdup_printf("%s:%d:%d:%d", + tunnel_config->host, + tunnel_config->port, + tunnel_config->remote_udp_mirror_port, + tunnel_config->delay); + } else { + str = ms_strdup_printf("%s:%d", + tunnel_config->host, + tunnel_config->port); + } + return str; +} + +static LinphoneTunnelConfig *linphone_tunnel_config_from_string(const char *str) { + LinphoneTunnelConfig *tunnel_config = NULL; + char * dstr = ms_strdup(str); + const char *host = NULL; + int port = -1; + int remote_udp_mirror_port = -1; + int delay = -1; + int pos = 0; + char *pch; + pch = strtok(dstr, ":"); + while(pch != NULL) { + switch(pos) { + case 0: + host = pch; + break; + case 1: + port = atoi(pch); + break; + case 2: + remote_udp_mirror_port = atoi(pch); + break; + case 3: + delay = atoi(pch); + break; + default: + // Abort + pos = 0; + break; + + } + ++pos; + pch = strtok(NULL, ":"); + } + if(pos >= 2) { + tunnel_config = linphone_tunnel_config_new(); + linphone_tunnel_config_set_host(tunnel_config, host); + linphone_tunnel_config_set_port(tunnel_config, port); + } + if(pos >= 3) { + linphone_tunnel_config_set_remote_udp_mirror_port(tunnel_config, remote_udp_mirror_port); + } + if(pos == 4) { + linphone_tunnel_config_set_delay(tunnel_config, delay); + } + ms_free(dstr); + return tunnel_config; +} + + +static void linphone_tunnel_save_config(LinphoneTunnel *tunnel) { + MSList *elem = tunnel->config_list; + char *tmp = NULL, *old_tmp = NULL, *tc_str = NULL; + while(elem != NULL) { + LinphoneTunnelConfig *tunnel_config = (LinphoneTunnelConfig *)elem->data; + tc_str = linphone_tunnel_config_to_string(tunnel_config); + if(tmp != NULL) { + old_tmp = tmp; + tmp = ms_strdup_printf("%s %s", old_tmp, tc_str); + ms_free(old_tmp); + ms_free(tc_str); + } else { + tmp = tc_str; + } + elem = elem->next; + } + lp_config_set_string(config(tunnel), "tunnel", "server_addresses", tmp); + if(tmp != NULL) { + ms_free(tmp); + } +} + + +static void linphone_tunnel_add_server_intern(LinphoneTunnel *tunnel, LinphoneTunnelConfig *tunnel_config) { + if(tunnel_config->remote_udp_mirror_port == -1) { + bcTunnel(tunnel)->addServer(tunnel_config->host, tunnel_config->port); + } else { + bcTunnel(tunnel)->addServer(tunnel_config->host, tunnel_config->port, + tunnel_config->remote_udp_mirror_port, tunnel_config->delay); + } + tunnel->config_list = ms_list_append(tunnel->config_list, tunnel_config); +} + + +static void linphone_tunnel_load_config(LinphoneTunnel *tunnel){ + const char * confaddress = lp_config_get_string(config(tunnel), "tunnel", "server_addresses", NULL); char *tmp; - if (orig){ - tmp=ms_strdup_printf("%s %s:%i",orig,host,port); - }else tmp=ms_strdup_printf("%s:%i",host, port); - lp_config_set_string(config(tunnel),"tunnel","server_addresses",tmp); - ms_free(tmp); + const char *it; + LinphoneTunnelConfig *tunnel_config; + int adv; + if(confaddress != NULL) { + tmp = ms_strdup(confaddress); + it = confaddress; + while(confaddress[0] != '\0') { + int ret = sscanf(it,"%s%n", tmp, &adv); + if (ret >= 1){ + it += adv; + tunnel_config = linphone_tunnel_config_from_string(tmp); + if(tunnel_config != NULL) { + linphone_tunnel_add_server_intern(tunnel, tunnel_config); + } else { + ms_error("Tunnel server address incorrectly specified from config file: %s", tmp); + } + } else break; + } + ms_free(tmp); + } } -void linphone_tunnel_add_server(LinphoneTunnel *tunnel, const char *host, int port){ - bcTunnel(tunnel)->addServer(host, port); - add_server_to_config(tunnel,host,port); +static void linphone_tunnel_refresh_config(LinphoneTunnel *tunnel) { + MSList *old_list = tunnel->config_list; + tunnel->config_list = NULL; + bcTunnel(tunnel)->cleanServers(); + while(old_list != NULL) { + LinphoneTunnelConfig *tunnel_config = (LinphoneTunnelConfig *)old_list->data; + linphone_tunnel_add_server_intern(tunnel, tunnel_config); + old_list = old_list->next; + } } -void linphone_tunnel_add_server_and_mirror(LinphoneTunnel *tunnel, const char *host, int port, int remote_udp_mirror, int delay){ - bcTunnel(tunnel)->addServer(host, port, remote_udp_mirror, delay); - /*FIXME, udp-mirror feature not saved in config*/ - add_server_to_config(tunnel,host,port); +void linphone_tunnel_add_server(LinphoneTunnel *tunnel, LinphoneTunnelConfig *tunnel_config) { + linphone_tunnel_add_server_intern(tunnel, tunnel_config); + linphone_tunnel_save_config(tunnel); } -char *linphone_tunnel_get_servers(LinphoneTunnel *tunnel){ - const char *tmp=lp_config_get_string(config(tunnel),"tunnel","server_addresses",NULL); - if (tmp) return ms_strdup(tmp); - return NULL; +void linphone_tunnel_remove_server(LinphoneTunnel *tunnel, LinphoneTunnelConfig *tunnel_config) { + MSList *elem = ms_list_find(tunnel->config_list, tunnel_config); + if(elem != NULL) { + tunnel->config_list = ms_list_remove(tunnel->config_list, tunnel_config); + linphone_tunnel_config_destroy(tunnel_config); + linphone_tunnel_refresh_config(tunnel); + linphone_tunnel_save_config(tunnel); + } +} + +const MSList *linphone_tunnel_get_servers(LinphoneTunnel *tunnel){ + return tunnel->config_list; } void linphone_tunnel_clean_servers(LinphoneTunnel *tunnel){ bcTunnel(tunnel)->cleanServers(); - lp_config_set_string(config(tunnel),"tunnel","server_addresses",NULL); + + /* Free the list */ + ms_list_for_each(tunnel->config_list, (void (*)(void *))linphone_tunnel_config_destroy); + tunnel->config_list = ms_list_free(tunnel->config_list); + + linphone_tunnel_save_config(tunnel); } void linphone_tunnel_enable(LinphoneTunnel *tunnel, bool_t enabled){ @@ -173,28 +370,6 @@ void linphone_tunnel_auto_detect(LinphoneTunnel *tunnel){ bcTunnel(tunnel)->autoDetect(); } -static void tunnel_add_servers_from_config(LinphoneTunnel *tunnel, const char* confaddress){ - char *tmp=(char*)ms_malloc0(strlen(confaddress)+1); - const char *it=confaddress; - int adv; - do{ - int ret=sscanf(it,"%s%n",tmp,&adv); - if (ret>=1){ - it+=adv; - char *port=strchr(tmp,':'); - if (!port){ - ms_error("Tunnel server addresses incorrectly specified from config file: %s",it); - break; - }else{ - *port='\0'; - port++; - bcTunnel(tunnel)->addServer(tmp, atoi(port)); - } - }else break; - }while(1); - ms_free(tmp); -} - static void my_ortp_logv(OrtpLogLevel level, const char *fmt, va_list args){ ortp_logv(level,fmt,args); } @@ -205,10 +380,8 @@ static void my_ortp_logv(OrtpLogLevel level, const char *fmt, va_list args){ */ void linphone_tunnel_configure(LinphoneTunnel *tunnel){ bool_t enabled=(bool_t)lp_config_get_int(config(tunnel),"tunnel","enabled",FALSE); - const char* addresses=lp_config_get_string(config(tunnel),"tunnel","server_addresses", NULL); linphone_tunnel_enable_logs_with_handler(tunnel,TRUE,my_ortp_logv); - if (addresses) - tunnel_add_servers_from_config(tunnel,addresses); + linphone_tunnel_load_config(tunnel); linphone_tunnel_enable(tunnel, enabled); } @@ -220,13 +393,13 @@ void linphone_tunnel_destroy(LinphoneTunnel *tunnel){ } -void linphone_tunnel_add_server(LinphoneTunnel *tunnel, const char *host, int port){ +void linphone_tunnel_add_server(LinphoneTunnel *tunnel, LinphoneTunnelConfig *tunnel_config){ } -void linphone_tunnel_add_server_and_mirror(LinphoneTunnel *tunnel, const char *host, int port, int remote_udp_mirror, int delay){ +void linphone_tunnel_remove_server(LinphoneTunnel *tunnel, LinphoneTunnelConfig *tunnel_config){ } -char *linphone_tunnel_get_servers(LinphoneTunnel *tunnel){ +const MSList *linphone_tunnel_get_servers(LinphoneTunnel *tunnel){ return NULL; } diff --git a/coreapi/linphone_tunnel.h b/coreapi/linphone_tunnel.h index bb343008a..03c568e4e 100644 --- a/coreapi/linphone_tunnel.h +++ b/coreapi/linphone_tunnel.h @@ -23,8 +23,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef LINPHONETUNNELMANAGER_H -#define LINPHONETUNNELMANAGER_H +#ifndef LINPHONETUNNEL_H +#define LINPHONETUNNEL_H #include "linphonecore.h" @@ -48,34 +48,108 @@ extern "C" { #endif +typedef struct _LinphoneTunnelConfig LinphoneTunnelConfig; + /** - * Add a tunnel server. At least one should be provided to be able to connect. - * When several addresses are provided, the tunnel client may try each of them until it gets connected. - * @param tunnel object - * @param host server ip address + * Create a new tunnel configuration + */ +LinphoneTunnelConfig *linphone_tunnel_config_new(); + +/** + * Set address of server. + * + * @param tunnel configuration object + * @param host tunnel server ip address + */ +void linphone_tunnel_config_set_host(LinphoneTunnelConfig *tunnel, const char *host); + +/** + * Get address of server. + * + * @param tunnel configuration object + */ +const char *linphone_tunnel_config_get_host(LinphoneTunnelConfig *tunnel); + +/** + * Set tls port of server. + * + * @param tunnel configuration object * @param port tunnel server tls port, recommended value is 443 */ -void linphone_tunnel_add_server(LinphoneTunnel *tunnel, const char *host, int port); +void linphone_tunnel_config_set_port(LinphoneTunnelConfig *tunnel, int port); + /** - *Add tunnel server with auto detection capabilities + * Get tls port of server. * - * @param tunnel object - * @param host tunnel server ip address - * @param port tunnel server tls port, recommended value is 443 - * @param remote_udp_mirror_port remote port on the tunnel server side used to test udp reachability + * @param tunnel configuration object + */ +int linphone_tunnel_config_get_port(LinphoneTunnelConfig *tunnel); + +/** + * Set the remote port on the tunnel server side used to test udp reachability. + * + * @param tunnel configuration object + * @param remote_udp_mirror_port remote port on the tunnel server side used to test udp reachability, set to -1 to disable the feature + */ +void linphone_tunnel_config_set_remote_udp_mirror_port(LinphoneTunnelConfig *tunnel, int remote_udp_mirror_port); + +/** + * Get the remote port on the tunnel server side used to test udp reachability. + * + * @param tunnel configuration object + */ +int linphone_tunnel_config_get_remote_udp_mirror_port(LinphoneTunnelConfig *tunnel); + +/** + * Set the udp packet round trip delay in ms for a tunnel configuration. + * + * @param tunnel configuration object * @param delay udp packet round trip delay in ms considered as acceptable. recommended value is 1000 ms. */ -void linphone_tunnel_add_server_and_mirror(LinphoneTunnel *tunnel, const char *host, int port, int remote_udp_mirror_port, int delay); +void linphone_tunnel_config_set_delay(LinphoneTunnelConfig *tunnel, int delay); + +/** + * Get the udp packet round trip delay in ms for a tunnel configuration. + * + * @param tunnel configuration object + */ +int linphone_tunnel_config_get_delay(LinphoneTunnelConfig *tunnel); + +/** + * Destroy a tunnel configuration + * + * @param tunnel configuration object + */ +void linphone_tunnel_config_destroy(LinphoneTunnelConfig *tunnel); + +/** + * Add tunnel server configuration + * + * @param tunnel object + * @param tunnel_config object + */ +void linphone_tunnel_add_server(LinphoneTunnel *tunnel, LinphoneTunnelConfig *tunnel_config); + +/** + * Remove tunnel server configuration + * + * @param tunnel object + * @param tunnel_config object + */ +void linphone_tunnel_remove_server(LinphoneTunnel *tunnel, LinphoneTunnelConfig *tunnel_config); + /** * @param tunnel object * returns a string of space separated list of host:port of tunnel server addresses * */ -char *linphone_tunnel_get_servers(LinphoneTunnel *tunnel); +const MSList *linphone_tunnel_get_servers(LinphoneTunnel *tunnel); + /** * @param tunnel object * Removes all tunnel server address previously entered with addServer() **/ void linphone_tunnel_clean_servers(LinphoneTunnel *tunnel); + /** * Sets whether tunneling of SIP and RTP is required. * @param tunnel object @@ -84,11 +158,13 @@ void linphone_tunnel_clean_servers(LinphoneTunnel *tunnel); * **/ void linphone_tunnel_enable(LinphoneTunnel *tunnel, bool_t enabled); + /** * @param tunnel object * Returns a boolean indicating whether tunneled operation is enabled. **/ bool_t linphone_tunnel_enabled(LinphoneTunnel *tunnel); + /** * @param tunnel object * Forces reconnection to the tunnel server. @@ -97,6 +173,7 @@ bool_t linphone_tunnel_enabled(LinphoneTunnel *tunnel); * the lost connection to be closed and new connection to be issued. **/ void linphone_tunnel_reconnect(LinphoneTunnel *tunnel); + /** * Start tunnel need detection. * @param tunnel object @@ -129,8 +206,6 @@ void linphone_tunnel_get_http_proxy(LinphoneTunnel*tunnel,const char **host, int void linphone_tunnel_set_http_proxy_auth_info(LinphoneTunnel*tunnel, const char* username,const char* passwd); -void linphone_tunnel_enable_logs(LinphoneTunnel *tunnel, bool_t enabled); - /** * @} **/ @@ -140,5 +215,5 @@ void linphone_tunnel_enable_logs(LinphoneTunnel *tunnel, bool_t enabled); #endif -#endif +#endif //LINPHONETUNNEL_H diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h index f1a9174c8..2b53f7a73 100644 --- a/coreapi/linphonecore.h +++ b/coreapi/linphonecore.h @@ -1429,7 +1429,7 @@ void linphone_core_init_default_params(LinphoneCore*lc, LinphoneCallParams *para */ bool_t linphone_core_tunnel_available(void); -typedef struct LinphoneTunnel LinphoneTunnel; +typedef struct _LinphoneTunnel LinphoneTunnel; /** * get tunnel instance if available */ diff --git a/gtk/propertybox.c b/gtk/propertybox.c index ea0095fca..41fe854ed 100644 --- a/gtk/propertybox.c +++ b/gtk/propertybox.c @@ -1177,44 +1177,22 @@ void linphone_gtk_edit_tunnel_closed(GtkWidget *button){ gtk_widget_destroy(pb); } - -static void tunnel_get_server_host_and_port(LinphoneTunnel *tunnel, char *host, int size, int *port){ - char *colon; - char *addresses; - char *str1; - char *address; - const char* configured_addresses; - - configured_addresses=linphone_tunnel_get_servers(tunnel); - - if (configured_addresses==NULL){ - host[0]=0; - *port=0; - return; - } - addresses=ms_strdup(configured_addresses); - str1=addresses; - address=strtok(str1," "); // Not thread safe - if (!address) return; - colon=strchr(address, ':'); - if (!colon) return; - *colon++='\0'; - *port=atoi(colon); - strncpy(host,address,size); - ms_free(addresses); -} - - void linphone_gtk_edit_tunnel(GtkButton *button){ GtkWidget *w=linphone_gtk_create_window("tunnel_config"); LinphoneCore *lc=linphone_gtk_get_core(); LinphoneTunnel *tunnel=linphone_core_get_tunnel(lc); - char host[128]={'\0'}; + const MSList *configs; + const char *host = NULL; int port=0; if (!tunnel) return; - tunnel_get_server_host_and_port(tunnel, host, sizeof(host), &port); + configs = linphone_tunnel_get_servers(tunnel); + if(configs != NULL) { + LinphoneTunnelConfig *ltc = (LinphoneTunnelConfig *)configs->data; + host = linphone_tunnel_config_get_host(ltc); + port = linphone_tunnel_config_get_port(ltc); + } gtk_entry_set_text(GTK_ENTRY(linphone_gtk_get_widget(w,"host")),host); if (port==0) port=443; @@ -1247,6 +1225,7 @@ void linphone_gtk_tunnel_ok(GtkButton *button){ GtkWidget *w=gtk_widget_get_toplevel(GTK_WIDGET(button)); LinphoneCore *lc=linphone_gtk_get_core(); LinphoneTunnel *tunnel=linphone_core_get_tunnel(lc); + LinphoneTunnelConfig *config=linphone_tunnel_config_new(); gint port = (gint)gtk_spin_button_get_value(GTK_SPIN_BUTTON(linphone_gtk_get_widget(w,"port"))); gboolean enabled=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(linphone_gtk_get_widget(w,"radio_enable"))); @@ -1260,7 +1239,9 @@ void linphone_gtk_tunnel_ok(GtkButton *button){ if (host && *host=='\0') host=NULL; if (http_port==0) http_port=8080; linphone_tunnel_clean_servers(tunnel); - linphone_tunnel_add_server(tunnel,host,port); + linphone_tunnel_config_set_host(config, host); + linphone_tunnel_config_set_port(config, port); + linphone_tunnel_add_server(tunnel, config); linphone_tunnel_enable(tunnel,enabled); linphone_tunnel_set_http_proxy(tunnel,http_host,http_port,username,password); From cc519568351af1ed3d831a127c40e3ee8ee2807f Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 15 Jan 2013 15:08:42 +0100 Subject: [PATCH 20/50] update ms2 --- mediastreamer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediastreamer2 b/mediastreamer2 index ea75c0f9f..aee6eb383 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit ea75c0f9f29cee8a1a5c37dee4df142c68144172 +Subproject commit aee6eb383119300755835daaced8843d1a5f1272 From 79e4e51702bfcba16d219c708024f0f6ebbf29b6 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Tue, 15 Jan 2013 16:16:58 +0100 Subject: [PATCH 21/50] Fix POTFILES. --- mediastreamer2 | 2 +- po/POTFILES.skip | 96 ++++++++++++++++++++++++------------------------ 2 files changed, 49 insertions(+), 49 deletions(-) diff --git a/mediastreamer2 b/mediastreamer2 index aee6eb383..acc506e32 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit aee6eb383119300755835daaced8843d1a5f1272 +Subproject commit acc506e3225438c1cf4464cc7faeeed45b6bb855 diff --git a/po/POTFILES.skip b/po/POTFILES.skip index 49808b8ef..e254f124a 100755 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -1,49 +1,49 @@ - gtk/p2pwizard.ui -mediastreamer2/src/alaw.c -mediastreamer2/src/alsa.c -mediastreamer2/src/aqsnd.c -mediastreamer2/src/audiomixer.c -mediastreamer2/src/chanadapt.c -mediastreamer2/src/drawdib-display.c -mediastreamer2/src/dtmfgen.c -mediastreamer2/src/equalizer.c -mediastreamer2/src/extdisplay.c -mediastreamer2/src/gsm.c -mediastreamer2/src/ice.c -mediastreamer2/src/itc.c -mediastreamer2/src/genericplc.c -mediastreamer2/src/macsnd.c -mediastreamer2/src/msandroid.cpp -mediastreamer2/src/msandroidvideo.cpp -mediastreamer2/src/msconf.c -mediastreamer2/src/msdscap-mingw.cc -mediastreamer2/src/msfileplayer.c -mediastreamer2/src/msfilerec.c -mediastreamer2/src/msfilerec_win.c -mediastreamer2/src/msiounit.c -mediastreamer2/src/msjoin.c -mediastreamer2/src/msresample.c -mediastreamer2/src/msrtp.c -mediastreamer2/src/msspeex.c -mediastreamer2/src/msv4l.c -mediastreamer2/src/msv4l2.c -mediastreamer2/src/msvolume.c -mediastreamer2/src/nowebcam.c -mediastreamer2/src/pixconv.c -mediastreamer2/src/sizeconv.c -mediastreamer2/src/speexec.c -mediastreamer2/src/tee.c -mediastreamer2/src/theora.c -mediastreamer2/src/ulaw.c -mediastreamer2/src/videodec.c -mediastreamer2/src/videoenc.c -mediastreamer2/src/videoout.c -mediastreamer2/src/void.c -mediastreamer2/src/wincevideods.c -mediastreamer2/src/winvideo.c -mediastreamer2/src/winvideo2.c -mediastreamer2/src/winvideods.c -mediastreamer2/src/x11video.c -mediastreamer2/src/vp8.c - +mediastreamer2/src/android/androidsound_depr.cpp +mediastreamer2/src/android/androidvideo.cpp +mediastreamer2/src/audiofilters/alaw.c +mediastreamer2/src/audiofilters/alsa.c +mediastreamer2/src/audiofilters/aqsnd.c +mediastreamer2/src/audiofilters/audiomixer.c +mediastreamer2/src/audiofilters/chanadapt.c +mediastreamer2/src/audiofilters/dtmfgen.c +mediastreamer2/src/audiofilters/equalizer.c +mediastreamer2/src/audiofilters/gsm.c +mediastreamer2/src/audiofilters/genericplc.c +mediastreamer2/src/audiofilters/macsnd.c +mediastreamer2/src/audiofilters/msconf.c +mediastreamer2/src/audiofilters/msfileplayer.c +mediastreamer2/src/audiofilters/msfilerec.c +mediastreamer2/src/audiofilters/msfilerec_win.c +mediastreamer2/src/audiofilters/msiounit.m +mediastreamer2/src/audiofilters/msresample.c +mediastreamer2/src/audiofilters/msspeex.c +mediastreamer2/src/audiofilters/msvolume.c +mediastreamer2/src/audiofilters/oss.c +mediastreamer2/src/audiofilters/speexec.c +mediastreamer2/src/audiofilters/ulaw.c +mediastreamer2/src/audiofilters/webrtc_aec.c +mediastreamer2/src/otherfilters/itc.c +mediastreamer2/src/otherfilters/join.c +mediastreamer2/src/otherfilters/msrtp.c +mediastreamer2/src/otherfilters/tee.c +mediastreamer2/src/otherfilters/void.c +mediastreamer2/src/videofilters/drawdib-display.c +mediastreamer2/src/videofilters/extdisplay.c +mediastreamer2/src/videofilters/msdscap-mingw.cc +mediastreamer2/src/videofilters/msv4l.c +mediastreamer2/src/videofilters/msv4l2.c +mediastreamer2/src/videofilters/nowebcam.c +mediastreamer2/src/videofilters/pixconv.c +mediastreamer2/src/videofilters/sizeconv.c +mediastreamer2/src/videofilters/theora.c +mediastreamer2/src/videofilters/videodec.c +mediastreamer2/src/videofilters/videoenc.c +mediastreamer2/src/videofilters/videoout.c +mediastreamer2/src/videofilters/vp8.c +mediastreamer2/src/videofilters/wincevideods.c +mediastreamer2/src/videofilters/winvideo.c +mediastreamer2/src/videofilters/winvideods.c +mediastreamer2/src/videofilters/winvideo2.c +mediastreamer2/src/videofilters/x11video.c +mediastreamer2/src/voip/ice.c From 8425cc5706f2cc0ca0e76ecda35f0169c9090c3e Mon Sep 17 00:00:00 2001 From: Margaux Clerc Date: Wed, 16 Jan 2013 09:42:03 +0100 Subject: [PATCH 22/50] name of contact in tab, search bar removed --- gtk/chat.c | 91 +++++++++++++++++++++++++++++++++++++---------------- gtk/main.ui | 1 + 2 files changed, 65 insertions(+), 27 deletions(-) diff --git a/gtk/chat.c b/gtk/chat.c index 506c9036d..868937573 100644 --- a/gtk/chat.c +++ b/gtk/chat.c @@ -42,12 +42,19 @@ GtkWidget *create_tab_chat_header(LinphoneChatRoom *cr,const LinphoneAddress *ur GtkWidget *w=gtk_hbox_new (FALSE,0); GtkWidget *i=create_pixmap ("chat.png"); GtkWidget *l; - GtkWidget *b=gtk_button_new_with_label("x"); + GtkWidget *image=gtk_image_new_from_stock(GTK_STOCK_CLOSE,GTK_ICON_SIZE_MENU); + GtkWidget *b=gtk_button_new(); - gtk_widget_set_size_request(b,20,20); + gtk_button_set_image(GTK_BUTTON(b),image); + gtk_button_set_relief(GTK_BUTTON(b),GTK_RELIEF_NONE); + gtk_widget_set_size_request(b,25,20); g_signal_connect_swapped(G_OBJECT(b),"clicked",G_CALLBACK(linphone_gtk_quit_chatroom),cr); - gchar *text=g_strdup_printf("Chat "); - l=gtk_label_new (text); + + const char *display=linphone_address_get_display_name(uri); + if (display==NULL || display[0]=='\0') { + display=linphone_address_get_username(uri); + } + l=gtk_label_new (display); gtk_box_pack_start (GTK_BOX(w),i,FALSE,FALSE,0); gtk_box_pack_start (GTK_BOX(w),l,FALSE,FALSE,0); gtk_box_pack_end(GTK_BOX(w),b,TRUE,TRUE,0); @@ -55,6 +62,34 @@ GtkWidget *create_tab_chat_header(LinphoneChatRoom *cr,const LinphoneAddress *ur return w; } +void udpate_tab_chat_header(GtkWidget *chat_view,const LinphoneAddress *uri,LinphoneChatRoom *cr){ + GtkWidget *main_window=linphone_gtk_get_main_window(); + GtkNotebook *notebook=GTK_NOTEBOOK(linphone_gtk_get_widget(main_window,"viewswitch")); + GtkWidget *w=gtk_hbox_new (FALSE,0); + GtkWidget *i=create_pixmap ("chat.png"); + GtkWidget *l; + GtkWidget *image=gtk_image_new_from_stock(GTK_STOCK_CLOSE,GTK_ICON_SIZE_MENU); + GtkWidget *b=gtk_button_new(); + + gtk_button_set_image(GTK_BUTTON(b),image); + gtk_button_set_relief(GTK_BUTTON(b),GTK_RELIEF_NONE); + gtk_widget_set_size_request(b,25,20); + g_signal_connect_swapped(G_OBJECT(b),"clicked",G_CALLBACK(linphone_gtk_quit_chatroom),cr); + + const char *display=linphone_address_get_display_name(uri); + if (display==NULL || display[0]=='\0') { + display=linphone_address_get_username(uri); + } + l=gtk_label_new (display); + gtk_box_pack_start (GTK_BOX(w),i,FALSE,FALSE,0); + gtk_box_pack_start (GTK_BOX(w),l,FALSE,FALSE,0); + gtk_box_pack_end(GTK_BOX(w),b,TRUE,TRUE,0); + + gtk_notebook_set_tab_label(notebook,chat_view,w); + gtk_widget_show_all(w); + +} + void linphone_gtk_push_text(GtkWidget *w, const LinphoneAddress *from, const char *message, gboolean me,LinphoneChatRoom *cr){ GtkTextView *text=GTK_TEXT_VIEW(linphone_gtk_get_widget(w,"textview")); GtkTextBuffer *buffer=gtk_text_view_get_buffer(text); @@ -70,17 +105,17 @@ void linphone_gtk_push_text(GtkWidget *w, const LinphoneAddress *from, const cha const char *display=linphone_address_get_display_name(from); if (display==NULL || display[0]=='\0') { display=linphone_address_get_username(from); - } - gtk_text_buffer_insert_with_tags_by_name(buffer,&iter,display,-1,"bold",NULL); + } gtk_text_buffer_get_end_iter(buffer,&iter); - gtk_text_buffer_insert(buffer,&iter,":",-1); + gtk_text_buffer_insert_with_tags_by_name(buffer,&iter,display,-1,"bold",me ? "left" : "left",NULL); gtk_text_buffer_get_end_iter(buffer,&iter); gtk_text_buffer_insert(buffer,&iter,"\n",-1); g_object_set_data(G_OBJECT(w),"from_message",linphone_address_as_string(from)); } gtk_text_buffer_get_end_iter(buffer,&iter); gtk_text_buffer_get_iter_at_offset(buffer,&begin,off); - gtk_text_buffer_insert(buffer,&iter,message,-1); + gtk_text_buffer_get_end_iter(buffer,&iter); + gtk_text_buffer_insert_with_tags_by_name(buffer,&iter,message,-1,me ? "left" : "left",NULL); gtk_text_buffer_get_end_iter(buffer,&iter); gtk_text_buffer_insert(buffer,&iter,"\n",-1); gtk_text_buffer_get_bounds (buffer, &begin, &end); @@ -97,7 +132,8 @@ void linphone_gtk_push_text(GtkWidget *w, const LinphoneAddress *from, const cha /*if(me){ gtk_text_buffer_get_end_iter(buffer,&iter); list=g_list_append(list,GINT_TO_POINTER(gtk_text_iter_get_line(&iter))); - gtk_text_buffer_insert_with_tags_by_name(buffer,&iter,"Message in progress..",-1, "italic","right","small",NULL); + gtk_text_buffer_insert_with_tags_by_name(buffer,&iter,"Message in progress.. ",-1, + "italic","right","small","font_grey",NULL); gtk_text_buffer_get_end_iter(buffer,&iter); gtk_text_buffer_insert(buffer,&iter,"\n",-1); g_object_set_data(G_OBJECT(w),"list",list); @@ -118,7 +154,7 @@ const LinphoneAddress* linphone_gtk_get_used_identity(){ /* function in dev for displaying ack*/ void update_chat_state_message(LinphoneChatMessageState state){ - /*GtkWidget *main_window=linphone_gtk_get_main_window(); + /* GtkWidget *main_window=linphone_gtk_get_main_window(); GtkWidget *friendlist=linphone_gtk_get_widget(main_window,"contact_list"); GtkWidget *page=(GtkWidget*)g_object_get_data(G_OBJECT(friendlist),"chatview"); GList *list=g_object_get_data(G_OBJECT(page),"list"); @@ -144,29 +180,24 @@ void update_chat_state_message(LinphoneChatMessageState state){ GPOINTER_TO_INT(g_list_nth_data(list,0)),0); gtk_text_buffer_delete(b,&start,&end); gtk_text_buffer_get_iter_at_line(b,&iter,GPOINTER_TO_INT(g_list_nth_data(list,0))); - + gchar *result; switch (state) { case LinphoneChatMessageStateInProgress: - gtk_text_buffer_insert_with_tags_by_name(b,&iter,"Message in progress.",-1, - "italic","right","small",NULL); + result="Message in progress.. "; break; case LinphoneChatMessageStateDelivered: - gtk_text_buffer_insert_with_tags_by_name(b,&iter,"Message delivered",-1, - "italic","right","small",NULL); + result="Message delivered "; break; case LinphoneChatMessageStateNotDelivered: - gtk_text_buffer_insert_with_tags_by_name(b,&iter,"Message not delivered",-1, - "italic","right","small",NULL); + result="Message not delivered "; break; - default : gtk_text_buffer_insert_with_tags_by_name(b,&iter,"12",-1, - "italic","right","small",NULL); + default : result="Message in progress.. "; } - + gtk_text_buffer_insert_with_tags_by_name(b,&iter,result,-1, + "italic","right","small","font_grey",NULL); list=g_list_remove(list,g_list_nth_data(list,0)); g_object_set_data(G_OBJECT(page),"list",list); - } else { - fprintf(stdout,"NULLLL\n"); - }*/ + } */ } static void on_chat_state_changed(LinphoneChatMessage *msg, LinphoneChatMessageState state, void *user_pointer){ @@ -199,8 +230,12 @@ GtkWidget* linphone_gtk_init_chatroom(LinphoneChatRoom *cr, const LinphoneAddres GHashTable *hash=g_object_get_data(G_OBJECT(main_window),"history"); GtkNotebook *notebook=(GtkNotebook *)linphone_gtk_get_widget(main_window,"viewswitch"); GtkWidget *text=linphone_gtk_get_widget(chat_view,"textview"); + GdkColor color; int idx; + color.red = 32512; + color.green = 32512; + color.blue = 32512; gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW(text),GTK_WRAP_WORD); gtk_text_view_set_editable (GTK_TEXT_VIEW(text),FALSE); @@ -208,7 +243,6 @@ GtkWidget* linphone_gtk_init_chatroom(LinphoneChatRoom *cr, const LinphoneAddres idx = gtk_notebook_page_num(notebook, chat_view); gtk_notebook_set_current_page(notebook, idx); gtk_widget_show(chat_view); - g_object_set_data(G_OBJECT(chat_view),"cr",cr); g_object_set_data(G_OBJECT(chat_view),"idx",GINT_TO_POINTER(idx)); @@ -232,6 +266,8 @@ GtkWidget* linphone_gtk_init_chatroom(LinphoneChatRoom *cr, const LinphoneAddres gtk_text_buffer_create_tag(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)), "right","justification", GTK_JUSTIFY_RIGHT,NULL); + gtk_text_buffer_create_tag(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)), + "left","justification", GTK_JUSTIFY_LEFT,NULL); gtk_text_buffer_create_tag(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)), "bold","weight", PANGO_WEIGHT_BOLD,NULL); gtk_text_buffer_create_tag(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)), @@ -239,7 +275,7 @@ GtkWidget* linphone_gtk_init_chatroom(LinphoneChatRoom *cr, const LinphoneAddres gtk_text_buffer_create_tag(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)), "small","size",8*PANGO_SCALE,NULL); gtk_text_buffer_create_tag(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)), - "font_grey","foreground","grey",NULL); + "font_grey","foreground-gdk",&color,NULL); GtkWidget *button = linphone_gtk_get_widget(chat_view,"send"); g_signal_connect_swapped(G_OBJECT(button),"clicked",(GCallback)linphone_gtk_send_text,NULL); @@ -272,10 +308,12 @@ void linphone_gtk_load_chatroom(LinphoneChatRoom *cr,const LinphoneAddress *uri, g_object_set_data(G_OBJECT(chat_view),"cr",cr); gtk_text_buffer_delete (text_buffer, &start, &end); if(buf!=NULL){ - gtk_text_buffer_insert_with_tags_by_name(text_buffer,&start,buf,-1,"font_grey","small",NULL); + gtk_text_buffer_insert_with_tags_by_name(text_buffer,&start,buf,-1,"font_grey",NULL); GtkTextMark *mark=gtk_text_buffer_create_mark(text_buffer, NULL, &start, FALSE); gtk_text_view_scroll_to_mark(text_view,mark, 0, FALSE, 0, 0); } + + udpate_tab_chat_header(chat_view,uri,cr); g_object_set_data(G_OBJECT(chat_view),"cr",cr); g_object_set_data(G_OBJECT(chat_view),"from_chatroom",linphone_address_as_string_uri_only(uri)); g_object_set_data(G_OBJECT(chat_view),"from_message",linphone_address_as_string_uri_only(uri)); @@ -307,7 +345,6 @@ void linphone_gtk_text_received(LinphoneCore *lc, LinphoneChatRoom *room, const g_object_set_data(G_OBJECT(friendlist),"chatview",(gpointer)w); } - #ifdef HAVE_GTK_OSX /* Notified when a new message is sent */ linphone_gtk_status_icon_set_blinking(TRUE); diff --git a/gtk/main.ui b/gtk/main.ui index ca1893cbf..f82875cb6 100644 --- a/gtk/main.ui +++ b/gtk/main.ui @@ -113,6 +113,7 @@ True True + 4 From 69ea55ba34a3724b2ffb5c7f2039321b5d33cb45 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Wed, 16 Jan 2013 10:36:28 +0100 Subject: [PATCH 23/50] Do not use deprecated autotools macros. --- configure.ac | 3 +-- coreapi/plugins/buddylookup/configure.ac | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 22258a9a9..1d8f92278 100644 --- a/configure.ac +++ b/configure.ac @@ -33,13 +33,12 @@ AM_INIT_AUTOMAKE AC_SUBST([LIBTOOL_DEPS]) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])],) AC_SUBST([docdir], [${datadir}/doc]) -AC_CONFIG_HEADER(config.h) +AC_CONFIG_HEADERS(config.h) AC_CONFIG_MACRO_DIR([m4]) AC_ISC_POSIX AC_PROG_CC AC_PROG_CXX AC_C_INLINE -AM_PROG_CC_STDC AC_HEADER_STDC AM_PROG_CC_C_O AC_CHECK_PROGS(MD5SUM,[md5sum md5]) diff --git a/coreapi/plugins/buddylookup/configure.ac b/coreapi/plugins/buddylookup/configure.ac index 5e61343da..b3c3c711f 100644 --- a/coreapi/plugins/buddylookup/configure.ac +++ b/coreapi/plugins/buddylookup/configure.ac @@ -22,7 +22,7 @@ AC_ARG_ENABLE(strict, [wall_werror=yes] ) -dnl AC_CONFIG_HEADER([config.h]) +dnl AC_CONFIG_HEADERS([config.h]) # Checks for programs. AC_PROG_CC From 89f457bdb3661101fc955f3d579221ae6d01844a Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Wed, 16 Jan 2013 11:25:01 +0100 Subject: [PATCH 24/50] Take the payload type number into account when comparing to media stream payload types. --- coreapi/sal.c | 1 + 1 file changed, 1 insertion(+) diff --git a/coreapi/sal.c b/coreapi/sal.c index 7a3bbdf7b..2b09212aa 100644 --- a/coreapi/sal.c +++ b/coreapi/sal.c @@ -151,6 +151,7 @@ static bool_t payload_type_equals(const PayloadType *p1, const PayloadType *p2){ if (strcmp(p1->mime_type,p2->mime_type)!=0) return FALSE; if (p1->clock_rate!=p2->clock_rate) return FALSE; if (p1->channels!=p2->channels) return FALSE; + if (payload_type_get_number(p1) != payload_type_get_number(p2)) return FALSE; /* Do not compare fmtp right now: they are modified internally when the call is started */ From 5087bd396a86226764c611e3ddd804a46eb771c7 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Wed, 16 Jan 2013 11:56:28 +0100 Subject: [PATCH 25/50] Updated JNI for tunnel --- coreapi/linphonecore_jni.cc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc index a6a561c86..7871a105d 100644 --- a/coreapi/linphonecore_jni.cc +++ b/coreapi/linphonecore_jni.cc @@ -2126,8 +2126,14 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_tunnelAddServerAndMirror jstring jHost, jint port, jint mirror, jint delay) { LinphoneTunnel *tunnel=((LinphoneCore *) pCore)->tunnel; if (!tunnel) return; + const char* cHost=env->GetStringUTFChars(jHost, NULL); - linphone_tunnel_add_server_and_mirror(tunnel, cHost, port, mirror, delay); + LinphoneTunnelConfig *tunnelconfig = linphone_tunnel_config_new(); + linphone_tunnel_config_set_host(tunnelconfig, cHost); + linphone_tunnel_config_set_port(tunnelconfig, port); + linphone_tunnel_config_set_delay(tunnelconfig, delay); + linphone_tunnel_config_set_remote_udp_mirror_port(tunnelconfig, mirror); + linphone_tunnel_add_server(tunnel, tunnelconfig); env->ReleaseStringUTFChars(jHost, cHost); } @@ -2149,7 +2155,6 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_tunnelSetHttpProxy(JNIEn extern "C" void Java_org_linphone_core_LinphoneCoreImpl_tunnelAutoDetect(JNIEnv *env,jobject thiz,jlong pCore) { LinphoneTunnel *tunnel=((LinphoneCore *) pCore)->tunnel; if (!tunnel) return; linphone_tunnel_auto_detect(tunnel); - } extern "C" void Java_org_linphone_core_LinphoneCoreImpl_tunnelCleanServers(JNIEnv *env,jobject thiz,jlong pCore) { From e5bf94c156a581aafe64c6278956a2ad8e884cf4 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Wed, 16 Jan 2013 11:59:22 +0100 Subject: [PATCH 26/50] Fix intltool-update warnings. --- console/linphonec.c | 32 +-- coreapi/sal_eXosip2_presence.c | 476 ++++++++++++++++----------------- mediastreamer2 | 2 +- 3 files changed, 255 insertions(+), 255 deletions(-) diff --git a/console/linphonec.c b/console/linphonec.c index 6220a0599..fca5a9b86 100644 --- a/console/linphonec.c +++ b/console/linphonec.c @@ -895,22 +895,22 @@ linphonec_prompt_for_auth_final(LinphoneCore *lc) void print_usage (int exit_status) { - fprintf (stdout, "\n\ -usage: linphonec [-c file] [-s sipaddr] [-a] [-V] [-d level ] [-l logfile]\n\ - linphonec -v\n\ -\n\ - -b file specify path of readonly factory configuration file.\n\ - -c file specify path of configuration file.\n\ - -d level be verbose. 0 is no output. 6 is all output\n\ - -l logfile specify the log file for your SIP phone\n\ - -s sipaddress specify the sip call to do at startup\n\ - -a enable auto answering for incoming calls\n\ - -V enable video features globally (disabled by default)\n\ - -C enable video capture only (disabled by default)\n\ - -D enable video display only (disabled by default)\n\ - -S show general state messages (disabled by default)\n\ - --wid windowid force embedding of video window into provided windowid (disabled by default)\n\ - -v or --version display version and exits.\n"); + fprintf (stdout, "\n" +"usage: linphonec [-c file] [-s sipaddr] [-a] [-V] [-d level ] [-l logfile]\n" + "linphonec -v\n" +"\n" +" -b file specify path of readonly factory configuration file.\n" +" -c file specify path of configuration file.\n" +" -d level be verbose. 0 is no output. 6 is all output\n" +" -l logfile specify the log file for your SIP phone\n" +" -s sipaddress specify the sip call to do at startup\n" +" -a enable auto answering for incoming calls\n" +" -V enable video features globally (disabled by default)\n" +" -C enable video capture only (disabled by default)\n" +" -D enable video display only (disabled by default)\n" +" -S show general state messages (disabled by default)\n" +" --wid windowid force embedding of video window into provided windowid (disabled by default)\n" +" -v or --version display version and exits.\n"); exit(exit_status); } diff --git a/coreapi/sal_eXosip2_presence.c b/coreapi/sal_eXosip2_presence.c index 3559081db..078ec24b4 100644 --- a/coreapi/sal_eXosip2_presence.c +++ b/coreapi/sal_eXosip2_presence.c @@ -209,108 +209,108 @@ static void mk_presence_body (const SalPresenceStatus online_status, const char if (online_status==SalPresenceOnline) { - snprintf(buf, buflen, "\n\ -\n\ -\n\ -\n\ -\n\ -
\n\ -\n\ -\n\ -
\n\ -\n\ -", contact_info, atom_id, contact_info); + snprintf(buf, buflen, "\n" +"\n" +"\n" +"\n" +"\n" +"
\n" +"\n" +"\n" +"
\n" +"\n" +"", contact_info, atom_id, contact_info); } else if (online_status == SalPresenceBusy || online_status == SalPresenceDonotdisturb) { - snprintf(buf, buflen, "\n\ -\n\ -\n\ -\n\ -\n\ -
\n\ -\n\ -\n\ -
\n\ -\n", contact_info, atom_id, contact_info); + snprintf(buf, buflen, "\n" +"\n" +"\n" +"\n" +"\n" +"
\n" +"\n" +"\n" +"
\n" +"\n", contact_info, atom_id, contact_info); } else if (online_status==SalPresenceBerightback) { - snprintf(buf, buflen, "\n\ -\n\ -\n\ -\n\ -\n\ -
\n\ -\n\ -\n\ -
\n\ -\n\ -", contact_info, atom_id, contact_info); + snprintf(buf, buflen, "\n" +"\n" +"\n" +"\n" +"\n" +"
\n" +"\n" +"\n" +"
\n" +"\n" +"", contact_info, atom_id, contact_info); } else if (online_status == SalPresenceAway || online_status == SalPresenceMoved) { - snprintf(buf, buflen, "\n\ -\n\ -\n\ -\n\ -\n\ -
\n\ -\n\ -\n\ -
\n\ -\n\ -", contact_info, atom_id, contact_info); + snprintf(buf, buflen, "\n" +"\n" +"\n" +"\n" +"\n" +"
\n" +"\n" +"\n" +"
\n" +"\n" +"", contact_info, atom_id, contact_info); } else if (online_status==SalPresenceOnthephone) { - snprintf(buf, buflen, "\n\ -\n\ -\n\ -\n\ -\n\ -
\n\ -\n\ -\n\ -
\n\ -\n\ -", contact_info, atom_id, contact_info); + snprintf(buf, buflen, "\n" +"\n" +"\n" +"\n" +"\n" +"
\n" +"\n" +"\n" +"
\n" +"\n" +"", contact_info, atom_id, contact_info); } else if (online_status==SalPresenceOuttolunch) { - snprintf(buf, buflen, "\n\ -\n\ -\n\ -\n\ -\n\ -
\n\ -\n\ -\n\ -
\n\ -\n\ -", contact_info, atom_id, contact_info); + snprintf(buf, buflen, "\n" +"\n" +"\n" +"\n" +"\n" +"
\n" +"\n" +"\n" +"
\n" +"\n" +"", contact_info, atom_id, contact_info); } else { - snprintf(buf, buflen, "\n\ -\n\ -\n\ -\n\ -\n\ -
\n\ -\n\ -\n\ -
\n\ -\n\ -", contact_info, atom_id, contact_info); + snprintf(buf, buflen, "\n" +"\n" +"\n" +"\n" +"\n" +"
\n" +"\n" +"\n" +"
\n" +"\n" +"", contact_info, atom_id, contact_info); } break; } @@ -323,108 +323,108 @@ static void mk_presence_body (const SalPresenceStatus online_status, const char if (online_status==SalPresenceOnline) { - snprintf(buf, buflen, "\n\ -\n\ -\n\ -\n\ -\n\ -
\n\ -\n\ -\n\ -
\n\ -\n\ -", contact_info, atom_id, contact_info); + snprintf(buf, buflen, "\n" +"\n" +"\n" +"\n" +"\n" +"
\n" +"\n" +"\n" +"
\n" +"\n" +"", contact_info, atom_id, contact_info); } else if (online_status == SalPresenceBusy || online_status == SalPresenceDonotdisturb) { - snprintf(buf, buflen, "\n\ -\n\ -\n\ -\n\ -\n\ -
\n\ -\n\ -\n\ -
\n\ -\n", contact_info, atom_id, contact_info); + snprintf(buf, buflen, "\n" +"\n" +"\n" +"\n" +"\n" +"
\n" +"\n" +"\n" +"
\n" +"\n", contact_info, atom_id, contact_info); } else if (online_status==SalPresenceBerightback) { - snprintf(buf, buflen, "\n\ -\n\ -\n\ -\n\ -\n\ -
\n\ -\n\ -\n\ -
\n\ -\n\ -", contact_info, atom_id, contact_info); + snprintf(buf, buflen, "\n" +"\n" +"\n" +"\n" +"\n" +"
\n" +"\n" +"\n" +"
\n" +"\n" +"", contact_info, atom_id, contact_info); } else if (online_status == SalPresenceAway || online_status == SalPresenceMoved) { - snprintf(buf, buflen, "\n\ -\n\ -\n\ -\n\ -\n\ -
\n\ -\n\ -\n\ -
\n\ -\n\ -", contact_info, atom_id, contact_info); + snprintf(buf, buflen, "\n" +"\n" +"\n" +"\n" +"\n" +"
\n" +"\n" +"\n" +"
\n" +"\n" +"", contact_info, atom_id, contact_info); } else if (online_status==SalPresenceOnthephone) { - snprintf(buf, buflen, "\n\ -\n\ -\n\ -\n\ -\n\ -
\n\ -\n\ -\n\ -
\n\ -\n\ -", contact_info, atom_id, contact_info); + snprintf(buf, buflen, "\n" +"\n" +"\n" +"\n" +"\n" +"
\n" +"\n" +"\n" +"
\n" +"\n" +"", contact_info, atom_id, contact_info); } else if (online_status==SalPresenceOuttolunch) { - snprintf(buf, buflen, "\n\ -\n\ -\n\ -\n\ -\n\ -
\n\ -\n\ -\n\ -
\n\ -\n\ -", contact_info, atom_id, contact_info); + snprintf(buf, buflen, "\n" +"\n" +"\n" +"\n" +"\n" +"
\n" +"\n" +"\n" +"
\n" +"\n" +"", contact_info, atom_id, contact_info); } else { - snprintf(buf, buflen, "\n\ -\n\ -\n\ -\n\ -\n\ -
\n\ -\n\ -\n\ -
\n\ -\n\ -", contact_info, atom_id, contact_info); + snprintf(buf, buflen, "\n" +"\n" +"\n" +"\n" +"\n" +"
\n" +"\n" +"\n" +"
\n" +"\n" +"", contact_info, atom_id, contact_info); } break; } @@ -432,118 +432,118 @@ static void mk_presence_body (const SalPresenceStatus online_status, const char if (online_status==SalPresenceOnline) { - snprintf(buf, buflen, "\n\ -\n\ -\n\ -open\n\ -%s\n\ -\n\ -", + snprintf(buf, buflen, "\n" +"\n" +"\n" +"open\n" +"%s\n" +"\n" +"", contact_info, contact_info); } else if (online_status == SalPresenceBusy || online_status == SalPresenceDonotdisturb) { - snprintf(buf, buflen, "\n\ -\n\ -\n\ -open\n\ -%s\n\ -\n\ -\n\ -\n\ -\n\ -", + snprintf(buf, buflen, "\n" +"\n" +"\n" +"open\n" +"%s\n" +"\n" +"\n" +"\n" +"\n" +"", contact_info, contact_info); } else if (online_status==SalPresenceBerightback) { - snprintf(buf, buflen, "\n\ -\n\ -\n\ -open\n\ -%s\n\ -\n\ -\n\ -\n\ -\n\ -", + snprintf(buf, buflen, "\n" +"\n" +"\n" +"open\n" +"%s\n" +"\n" +"\n" +"\n" +"\n" +"", contact_info, contact_info); } else if (online_status == SalPresenceAway || online_status == SalPresenceMoved) { - snprintf(buf, buflen, "\n\ -\n\ -\n\ -open\n\ -%s\n\ -\n\ -\n\ -\n\ -\n\ -", + snprintf(buf, buflen, "\n" +"\n" +"\n" +"open\n" +"%s\n" +"\n" +"\n" +"\n" +"\n" +"", contact_info, contact_info); } else if (online_status==SalPresenceOnthephone) { - snprintf(buf, buflen, "\n\ -\n\ -\n\ -open\n\ -%s\n\ -\n\ -\n\ -\n\ -\n\ -", + snprintf(buf, buflen, "\n" +"\n" +"\n" +"open\n" +"%s\n" +"\n" +"\n" +"\n" +"\n" +"", contact_info, contact_info); } else if (online_status==SalPresenceOuttolunch) { - snprintf(buf, buflen, "\n\ -\n\ -\n\ -open\n\ -%s\n\ -\n\ -\n\ -\n\ -Out to lunch \n\ -\n\ -", + snprintf(buf, buflen, "\n" +"\n" +"\n" +"open\n" +"%s\n" +"\n" +"\n" +"\n" +"Out to lunch \n" +"\n" +"", contact_info, contact_info); } else { - snprintf(buf, buflen, "\n\ -\n\ -\n\ -closed\n\ -%s\n\ -\n\ -\n", contact_info, contact_info); + snprintf(buf, buflen, "\n" +"\n" +"\n" +"closed\n" +"%s\n" +"\n" +"\n", contact_info, contact_info); } break; } diff --git a/mediastreamer2 b/mediastreamer2 index acc506e32..43c41795d 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit acc506e3225438c1cf4464cc7faeeed45b6bb855 +Subproject commit 43c41795d9f3e647bf0e338b5119e09d4644eaaf From dc65b20258d448dc5fe4459827e5bccec504e045 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Wed, 16 Jan 2013 13:50:46 +0100 Subject: [PATCH 27/50] Update ms2 submodule. --- mediastreamer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediastreamer2 b/mediastreamer2 index 43c41795d..fecaf6d58 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 43c41795d9f3e647bf0e338b5119e09d4644eaaf +Subproject commit fecaf6d588b106d2154a5bdda7148b74290fccd2 From 576355877db5ffc4e53e83d9e36cd99e8dd68ed8 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Wed, 16 Jan 2013 14:17:13 +0100 Subject: [PATCH 28/50] update ms2 again --- mediastreamer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediastreamer2 b/mediastreamer2 index fecaf6d58..294440b85 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit fecaf6d588b106d2154a5bdda7148b74290fccd2 +Subproject commit 294440b8517a4e5766a56a9d26be282aa44e0588 From 4a1e99432616ba380cff895929df41c68fcd3b08 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Wed, 16 Jan 2013 14:35:37 +0100 Subject: [PATCH 29/50] Improve the lpconfig functions --- coreapi/lpconfig.c | 37 +++++++++++++++++++++++++++++-------- coreapi/lpconfig.h | 25 +++++++++++++++++++------ 2 files changed, 48 insertions(+), 14 deletions(-) diff --git a/coreapi/lpconfig.c b/coreapi/lpconfig.c index bd2adfbb4..8457cf650 100644 --- a/coreapi/lpconfig.c +++ b/coreapi/lpconfig.c @@ -109,7 +109,7 @@ static bool_t is_first_char(const char *start, const char *pos){ return TRUE; } -LpSection *lp_config_find_section(LpConfig *lpconfig, const char *name){ +LpSection *lp_config_find_section(const LpConfig *lpconfig, const char *name){ LpSection *sec; MSList *elem; /*printf("Looking for section %s\n",name);*/ @@ -123,7 +123,7 @@ LpSection *lp_config_find_section(LpConfig *lpconfig, const char *name){ return NULL; } -LpItem *lp_section_find_item(LpSection *sec, const char *name){ +LpItem *lp_section_find_item(const LpSection *sec, const char *name){ MSList *elem; LpItem *item; /*printf("Looking for item %s\n",name);*/ @@ -260,7 +260,7 @@ void lp_section_remove_item(LpSection *sec, LpItem *item){ lp_item_destroy(item); } -const char *lp_config_get_string(LpConfig *lpconfig, const char *section, const char *key, const char *default_string){ +const char *lp_config_get_string(const LpConfig *lpconfig, const char *section, const char *key, const char *default_string){ LpSection *sec; LpItem *item; sec=lp_config_find_section(lpconfig,section); @@ -271,7 +271,7 @@ const char *lp_config_get_string(LpConfig *lpconfig, const char *section, const return default_string; } -bool_t lp_config_get_range(LpConfig *lpconfig, const char *section, const char *key, int *min, int *max, int default_min, int default_max) { +bool_t lp_config_get_range(const LpConfig *lpconfig, const char *section, const char *key, int *min, int *max, int default_min, int default_max) { const char *str = lp_config_get_string(lpconfig, section, key, NULL); if (str != NULL) { char *minusptr = strchr(str, '-'); @@ -290,7 +290,7 @@ bool_t lp_config_get_range(LpConfig *lpconfig, const char *section, const char * } } -int lp_config_get_int(LpConfig *lpconfig,const char *section, const char *key, int default_value){ +int lp_config_get_int(const LpConfig *lpconfig,const char *section, const char *key, int default_value){ const char *str=lp_config_get_string(lpconfig,section,key,NULL); if (str!=NULL) { int ret=0; @@ -302,7 +302,7 @@ int lp_config_get_int(LpConfig *lpconfig,const char *section, const char *key, i else return default_value; } -int64_t lp_config_get_int64(LpConfig *lpconfig,const char *section, const char *key, int64_t default_value){ +int64_t lp_config_get_int64(const LpConfig *lpconfig,const char *section, const char *key, int64_t default_value){ const char *str=lp_config_get_string(lpconfig,section,key,NULL); if (str!=NULL) { #ifdef WIN32 @@ -314,7 +314,7 @@ int64_t lp_config_get_int64(LpConfig *lpconfig,const char *section, const char * else return default_value; } -float lp_config_get_float(LpConfig *lpconfig,const char *section, const char *key, float default_value){ +float lp_config_get_float(const LpConfig *lpconfig,const char *section, const char *key, float default_value){ const char *str=lp_config_get_string(lpconfig,section,key,NULL); float ret=default_value; if (str==NULL) return default_value; @@ -404,11 +404,32 @@ int lp_config_sync(LpConfig *lpconfig){ return 0; } -int lp_config_has_section(LpConfig *lpconfig, const char *section){ +int lp_config_has_section(const LpConfig *lpconfig, const char *section){ if (lp_config_find_section(lpconfig,section)!=NULL) return 1; return 0; } +void lp_config_for_each_section(const LpConfig *lpconfig, void (*callback)(const char *section, void *ctx), void *ctx) { + LpSection *sec; + MSList *elem; + for (elem=lpconfig->sections;elem!=NULL;elem=ms_list_next(elem)){ + sec=(LpSection*)elem->data; + callback(sec->name, ctx); + } +} + +void lp_config_for_each_entry(const LpConfig *lpconfig, const char *section, void (*callback)(const char *entry, void *ctx), void *ctx) { + LpItem *item; + MSList *elem; + LpSection *sec=lp_config_find_section(lpconfig,section); + if (sec!=NULL){ + for (elem=sec->items;elem!=NULL;elem=ms_list_next(elem)){ + item=(LpItem*)elem->data; + callback(item->key, ctx); + } + } +} + void lp_config_clean_section(LpConfig *lpconfig, const char *section){ LpSection *sec=lp_config_find_section(lpconfig,section); if (sec!=NULL){ diff --git a/coreapi/lpconfig.h b/coreapi/lpconfig.h index 8e6f92128..310baaff3 100644 --- a/coreapi/lpconfig.h +++ b/coreapi/lpconfig.h @@ -73,7 +73,7 @@ int lp_config_read_file(LpConfig *lpconfig, const char *filename); * @ingroup misc * The default value string is returned if the config item isn't found. **/ -const char *lp_config_get_string(LpConfig *lpconfig, const char *section, const char *key, const char *default_string); +const char *lp_config_get_string(const LpConfig *lpconfig, const char *section, const char *key, const char *default_string); int lp_config_read_file(LpConfig *lpconfig, const char *filename); /** * Retrieves a configuration item as a range, given its section, key, and default min and max values. @@ -82,14 +82,14 @@ int lp_config_read_file(LpConfig *lpconfig, const char *filename); * @return TRUE if the value is successfully parsed as a range, FALSE otherwise. * If FALSE is returned, min and max are filled respectively with default_min and default_max values. */ -bool_t lp_config_get_range(LpConfig *lpconfig, const char *section, const char *key, int *min, int *max, int default_min, int default_max); +bool_t lp_config_get_range(const LpConfig *lpconfig, const char *section, const char *key, int *min, int *max, int default_min, int default_max); /** * Retrieves a configuration item as an integer, given its section, key, and default value. * * @ingroup misc * The default integer value is returned if the config item isn't found. **/ -int lp_config_get_int(LpConfig *lpconfig,const char *section, const char *key, int default_value); +int lp_config_get_int(const LpConfig *lpconfig,const char *section, const char *key, int default_value); /** * Retrieves a configuration item as a 64 bit integer, given its section, key, and default value. @@ -97,7 +97,7 @@ int lp_config_get_int(LpConfig *lpconfig,const char *section, const char *key, i * @ingroup misc * The default integer value is returned if the config item isn't found. **/ -int64_t lp_config_get_int64(LpConfig *lpconfig,const char *section, const char *key, int64_t default_value); +int64_t lp_config_get_int64(const LpConfig *lpconfig,const char *section, const char *key, int64_t default_value); int lp_config_read_file(LpConfig *lpconfig, const char *filename); @@ -107,7 +107,7 @@ int lp_config_read_file(LpConfig *lpconfig, const char *filename); * @ingroup misc * The default float value is returned if the config item isn't found. **/ -float lp_config_get_float(LpConfig *lpconfig,const char *section, const char *key, float default_value); +float lp_config_get_float(const LpConfig *lpconfig,const char *section, const char *key, float default_value); /** * Sets a string config item * @@ -158,13 +158,26 @@ int lp_config_sync(LpConfig *lpconfig); * * @ingroup misc **/ -int lp_config_has_section(LpConfig *lpconfig, const char *section); +int lp_config_has_section(const LpConfig *lpconfig, const char *section); /** * Removes every pair of key,value in a section and remove the section. * * @ingroup misc **/ void lp_config_clean_section(LpConfig *lpconfig, const char *section); +/** + * Call a function for each section present in the configuration. + * + * @ingroup misc +**/ +void lp_config_for_each_section(const LpConfig *lpconfig, void (*callback)(const char *section, void *ctx), void *ctx); +/** + * Call a function for each entry present in a section configuration. + * + * @ingroup misc +**/ +void lp_config_for_each_entry(const LpConfig *lpconfig, const char *section, void (*callback)(const char *entry, void *ctx), void *ctx); + /*tells whether uncommited (with lp_config_sync()) modifications exist*/ int lp_config_needs_commit(const LpConfig *lpconfig); void lp_config_destroy(LpConfig *cfg); From 66b6427d96cce8f306fba21f17c99b073056f567 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Wed, 16 Jan 2013 14:36:31 +0100 Subject: [PATCH 30/50] Add lpc2xml tool and fix xml2lpc validation --- tools/Makefile.am | 23 +++- tools/lpc2xml.c | 284 +++++++++++++++++++++++++++++++++++++++++++ tools/lpc2xml.h | 46 +++++++ tools/lpc2xml_test.c | 67 ++++++++++ tools/xml2lpc.c | 16 +-- 5 files changed, 425 insertions(+), 11 deletions(-) create mode 100644 tools/lpc2xml.c create mode 100644 tools/lpc2xml.h create mode 100644 tools/lpc2xml_test.c diff --git a/tools/Makefile.am b/tools/Makefile.am index e906e29b0..ffb469214 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -13,29 +13,46 @@ COMMON_CFLAGS=\ if BUILD_TOOLS -lib_LTLIBRARIES=libxml2lpc.la +lib_LTLIBRARIES=libxml2lpc.la liblpc2xml.la libxml2lpc_la_SOURCES=\ xml2lpc.c \ xml2lpc.h +liblpc2xml_la_SOURCES=\ + lpc2xml.c \ + lpc2xml.h + libxml2lpc_la_CFLAGS=$(COMMON_CFLAGS) libxml2lpc_la_LIBADD=\ $(top_builddir)/coreapi/liblinphone.la \ $(LIBXML2_LIBS) -libxml2lpc_la_LDFLAGS=-no-undefined +liblpc2xml_la_CFLAGS=$(COMMON_CFLAGS) +liblpc2xml_la_LIBADD=\ + $(top_builddir)/coreapi/liblinphone.la \ + $(LIBXML2_LIBS) -bin_PROGRAMS=xml2lpc_test +libxml2lpc_la_LDFLAGS=-no-undefined +liblpc2xml_la_LDFLAGS=-no-undefined + +bin_PROGRAMS=xml2lpc_test lpc2xml_test xml2lpc_test_SOURCES=\ xml2lpc_test.c +lpc2xml_test_SOURCES=\ + lpc2xml_test.c + xml2lpc_test_CFLAGS=$(COMMON_CFLAGS) xml2lpc_test_LDADD=\ $(top_builddir)/coreapi/liblinphone.la \ libxml2lpc.la +lpc2xml_test_CFLAGS=$(COMMON_CFLAGS) +lpc2xml_test_LDADD=\ + $(top_builddir)/coreapi/liblinphone.la \ + liblpc2xml.la endif diff --git a/tools/lpc2xml.c b/tools/lpc2xml.c new file mode 100644 index 000000000..cd0df72df --- /dev/null +++ b/tools/lpc2xml.c @@ -0,0 +1,284 @@ +/* +linphone +Copyright (C) 2012 Belledonne Communications SARL +Yann DIORCET (yann.diorcet@linphone.org) + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*/ + +#include "lpc2xml.h" +#include +#include + + +#define LPC2XML_BZ 2048 + +struct _lpc2xml_context { + const LpConfig *lpc; + lpc2xml_function cbf; + void *ctx; + + xmlDoc *doc; + char errorBuffer[LPC2XML_BZ]; + char warningBuffer[LPC2XML_BZ]; +}; + + +lpc2xml_context* lpc2xml_context_new(lpc2xml_function cbf, void *ctx) { + lpc2xml_context *xmlCtx = (lpc2xml_context*)malloc(sizeof(lpc2xml_context)); + if(xmlCtx != NULL) { + xmlCtx->lpc = NULL; + xmlCtx->cbf = cbf; + xmlCtx->ctx = ctx; + + xmlCtx->doc = NULL; + xmlCtx->errorBuffer[0]='\0'; + xmlCtx->warningBuffer[0]='\0'; + } + return xmlCtx; +} + +void lpc2xml_context_destroy(lpc2xml_context *ctx) { + if(ctx->doc != NULL) { + xmlFreeDoc(ctx->doc); + ctx->doc = NULL; + } + free(ctx); +} +/* +static void lpc2xml_context_clear_logs(lpc2xml_context *ctx) { + ctx->errorBuffer[0]='\0'; + ctx->warningBuffer[0]='\0'; +}*/ + +static void lpc2xml_log(lpc2xml_context *xmlCtx, int level, const char *fmt, ...) { + va_list args; + va_start(args, fmt); + if(xmlCtx->cbf != NULL) { + xmlCtx->cbf((xmlCtx)->ctx, level, fmt, args); + } + va_end(args); +} +/* +static void lpc2xml_genericxml_error(void *ctx, const char *fmt, ...) { + lpc2xml_context *xmlCtx = (lpc2xml_context *)ctx; + int sl = strlen(xmlCtx->errorBuffer); + va_list args; + va_start(args, fmt); + vsnprintf(xmlCtx->errorBuffer + sl, LPC2XML_BZ-sl, fmt, args); + va_end(args); +} + +static void lpc2xml_genericxml_warning(void *ctx, const char *fmt, ...) { + lpc2xml_context *xmlCtx = (lpc2xml_context *)ctx; + int sl = strlen(xmlCtx->warningBuffer); + va_list args; + va_start(args, fmt); + vsnprintf(xmlCtx->warningBuffer + sl, LPC2XML_BZ-sl, fmt, args); + va_end(args); +}*/ + +#if 0 +static void dumpNodes(int level, xmlNode * a_node, lpc2xml_context *ctx) { + xmlNode *cur_node = NULL; + + for (cur_node = a_node; cur_node; cur_node = cur_node->next) { + if (cur_node->type == XML_ELEMENT_NODE) { + lpc2xml_log(ctx, LPC2XML_DEBUG, "node level: %d type: Element, name: %s", level, cur_node->name); + } else { + lpc2xml_log(ctx, LPC2XML_DEBUG, "node level: %d type: %d, name: %s", level, cur_node->type, cur_node->name); + } + + dumpNodes(level + 1, cur_node->children, ctx); + } +} +#endif + +#if 0 +static void dumpNode(xmlNode *node, lpc2xml_context *ctx) { + lpc2xml_log(ctx, LPC2XML_DEBUG, "node type: %d, name: %s", node->type, node->name); +} + +static void dumpAttr(xmlNode *node, lpc2xml_context *ctx) { + lpc2xml_log(ctx, LPC2XML_DEBUG, "attr name: %s value:%s", node->name, node->children->content); +} + +static void dumpContent(xmlNode *node, lpc2xml_context *ctx) { + lpc2xml_log(ctx, LPC2XML_DEBUG, "content: %s", node->children->content); +} + + + +#endif + +static int processEntry(const char *section, const char *entry, xmlNode *node, lpc2xml_context *ctx) { + const char *content = lp_config_get_string(ctx->lpc, section, entry, NULL); + if(content == NULL) { + lpc2xml_log(ctx->ctx, LPC2XML_ERROR, "Issue when reading the lpc"); + return -1; + } + xmlNodeSetContent(node, (const xmlChar *) content); + return 0; +} + +struct __processSectionCtx { + int ret; + const char *section; + xmlNode *node; + lpc2xml_context *ctx; +}; + +static void processSection_cb(const char *entry, struct __processSectionCtx *ctx) { + if(ctx->ret == 0) { + xmlNode *node = xmlNewChild(ctx->node, NULL, (const xmlChar *)"entry", NULL); + if(node == NULL) { + lpc2xml_log(ctx->ctx, LPC2XML_ERROR, "Can't create \"entry\" element"); + ctx->ret = -1; + return; + } + xmlAttr *name_attr = xmlSetProp(node, (const xmlChar *)"name", (const xmlChar *)entry); + if(name_attr == NULL) { + lpc2xml_log(ctx->ctx, LPC2XML_ERROR, "Can't create name attribute for \"entry\" element"); + ctx->ret = -1; + return; + } + ctx->ret = processEntry(ctx->section, entry, node, ctx->ctx); + } +} + +static int processSection(const char *section, xmlNode *node, lpc2xml_context *ctx) { + struct __processSectionCtx pc_ctx = {0, section, node, ctx}; + lp_config_for_each_entry(ctx->lpc, section, (void (*)(const char *, void *))processSection_cb, (void*)&pc_ctx); + return pc_ctx.ret; +} + + + +struct __processConfigCtx { + int ret; + xmlNode *node; + lpc2xml_context *ctx; +}; + +static void processConfig_cb(const char *section, struct __processConfigCtx *ctx) { + if(ctx->ret == 0) { + xmlNode *node = xmlNewChild(ctx->node, NULL, (const xmlChar *)"section", NULL); + if(node == NULL) { + lpc2xml_log(ctx->ctx, LPC2XML_ERROR, "Can't create \"section\" element"); + ctx->ret = -1; + return; + } + xmlAttr *name_attr = xmlSetProp(node, (const xmlChar *)"name", (const xmlChar *)section); + if(name_attr == NULL) { + lpc2xml_log(ctx->ctx, LPC2XML_ERROR, "Can't create name attribute for \"section\" element"); + ctx->ret = -1; + return; + } + ctx->ret = processSection(section, node, ctx->ctx); + } +} + +static int processConfig(xmlNode *node, lpc2xml_context *ctx) { + struct __processConfigCtx pc_ctx = {0, node, ctx}; + lp_config_for_each_section(ctx->lpc, (void (*)(const char *, void *))processConfig_cb, (void*)&pc_ctx); + return pc_ctx.ret; +} + +static int processDoc(xmlDoc *doc, lpc2xml_context *ctx) { + int ret = 0; + xmlNode *root_node = xmlNewNode(NULL, (const xmlChar *)"config"); + if(root_node == NULL) { + lpc2xml_log(ctx, LPC2XML_ERROR, "Can't create \"config\" element"); + return -1; + } + xmlNs *lpc_ns = xmlNewNs(root_node, (const xmlChar *)"http://www.linphone.org/xsds/lpconfig.xsd", (const xmlChar *)"lpc"); + if(lpc_ns == NULL) { + lpc2xml_log(ctx, LPC2XML_WARNING, "Can't create lpc namespace"); + } else { + xmlSetNs(root_node, lpc_ns); + } + xmlNs *xsi_ns = xmlNewNs(root_node, (const xmlChar *)"http://www.w3.org/2001/XMLSchema-instance", (const xmlChar *)"xsi"); + if(lpc_ns == NULL) { + lpc2xml_log(ctx, LPC2XML_WARNING, "Can't create xsi namespace"); + } + xmlAttr *schemaLocation = xmlNewNsProp(root_node, xsi_ns, (const xmlChar *)"schemaLocation", (const xmlChar *)"http://www.linphone.org/xsds/lpconfig.xsd lpconfig.xsd "); + if(schemaLocation == NULL) { + lpc2xml_log(ctx, LPC2XML_WARNING, "Can't create schemaLocation"); + } + ret = processConfig(root_node, ctx); + xmlDocSetRootElement(doc, root_node); + return ret; +} + +static int internal_convert_lpc2xml(lpc2xml_context *ctx) { + int ret = 0; + lpc2xml_log(ctx, LPC2XML_DEBUG, "Generation started"); + if(ctx->doc != NULL) { + xmlFreeDoc(ctx->doc); + ctx->doc = NULL; + } + xmlDoc *doc = xmlNewDoc((const xmlChar *)"1.0"); + ret = processDoc(doc, ctx); + if(ret == 0) { + ctx->doc = doc; + } else { + xmlFreeDoc(doc); + } + lpc2xml_log(ctx, LPC2XML_DEBUG, "Generation ended ret:%d", ret); + return ret; +} + +int lpc2xml_set_lpc(lpc2xml_context* context, const LpConfig *lpc) { + context->lpc = lpc; + return 0; +} + +int lpc2xml_convert_file(lpc2xml_context* context, const char *filename) { + int ret = 0; + xmlSaveCtxtPtr save_ctx = xmlSaveToFilename(filename, "UTF-8", XML_SAVE_FORMAT); + ret = internal_convert_lpc2xml(context); + if(ret == 0) { + ret = xmlSaveDoc(save_ctx, context->doc); + } + xmlSaveClose(save_ctx); + return ret; +} + +int lpc2xml_convert_fd(lpc2xml_context* context, int fd) { + int ret = 0; + xmlSaveCtxtPtr save_ctx = xmlSaveToFd(fd, "UTF-8", XML_SAVE_FORMAT); + ret = internal_convert_lpc2xml(context); + if(ret == 0) { + ret = xmlSaveDoc(save_ctx, context->doc); + } + xmlSaveClose(save_ctx); + return ret; +} + +int lpc2xml_convert_string(lpc2xml_context* context, unsigned char **content) { + int ret = 0; + xmlBufferPtr buffer = xmlBufferCreate(); + xmlSaveCtxtPtr save_ctx = xmlSaveToBuffer(buffer, "UTF-8", XML_SAVE_FORMAT); + internal_convert_lpc2xml(context); + if(ret == 0) { + ret = xmlSaveDoc(save_ctx, context->doc); + } + xmlSaveClose(save_ctx); + if(ret == 0) { + *content = xmlBufferDetach(buffer); + } + xmlBufferFree(buffer); + return ret; +} diff --git a/tools/lpc2xml.h b/tools/lpc2xml.h new file mode 100644 index 000000000..f1583109b --- /dev/null +++ b/tools/lpc2xml.h @@ -0,0 +1,46 @@ +/* +linphone +Copyright (C) 2012 Belledonne Communications SARL + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*/ + +#ifndef LPC2XML_H_ +#define LPC2XML_H_ + +#include "lpconfig.h" + +typedef struct _lpc2xml_context lpc2xml_context; + +typedef enum _lpc2xml_log_level { + LPC2XML_DEBUG = 0, + LPC2XML_MESSAGE, + LPC2XML_WARNING, + LPC2XML_ERROR +} lpc2xml_log_level; + +typedef void(*lpc2xml_function)(void *ctx, lpc2xml_log_level level, const char *fmt, va_list list); + +lpc2xml_context* lpc2xml_context_new(lpc2xml_function cbf, void *ctx); +void lpc2xml_context_destroy(lpc2xml_context*); + +int lpc2xml_set_lpc(lpc2xml_context* context, const LpConfig *lpc); + +int lpc2xml_convert_file(lpc2xml_context* context, const char *filename); +int lpc2xml_convert_fd(lpc2xml_context* context, int fd); +int lpc2xml_convert_string(lpc2xml_context* context, unsigned char **content); + + +#endif //LPC2XML_H_ diff --git a/tools/lpc2xml_test.c b/tools/lpc2xml_test.c new file mode 100644 index 000000000..cdad72f97 --- /dev/null +++ b/tools/lpc2xml_test.c @@ -0,0 +1,67 @@ +/* +linphone +Copyright (C) 2012 Belledonne Communications SARL + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*/ + +#include +#include "lpc2xml.h" + +void cb_function(void *ctx, lpc2xml_log_level level, const char *msg, va_list list) { + const char *header = ""; + switch(level) { + case LPC2XML_DEBUG: + header = "DEBUG"; + break; + case LPC2XML_MESSAGE: + header = "MESSAGE"; + break; + case LPC2XML_WARNING: + header = "WARNING"; + break; + case LPC2XML_ERROR: + header = "ERROR"; + break; + } + fprintf(stdout, "%s - ", header); + vfprintf(stdout, msg, list); + fprintf(stdout, "\n"); +} + +void show_usage(int argc, char *argv[]) { + fprintf(stderr, "usage %s convert \n", + argv[0]); +} + +int main(int argc, char *argv[]) { + if(argc != 4) { + show_usage(argc, argv); + return -1; + } + + lpc2xml_context *ctx = lpc2xml_context_new(cb_function, NULL); + LpConfig *lpc = lp_config_new(argv[2]); + lpc2xml_set_lpc(ctx, lpc); + if(strcmp("convert", argv[1]) == 0) { + lpc2xml_convert_file(ctx, argv[3]); + } else { + show_usage(argc, argv); + } + lp_config_destroy(lpc); + lpc2xml_context_destroy(ctx); + return 0; +} + diff --git a/tools/xml2lpc.c b/tools/xml2lpc.c index d5e2160ab..9d720f1f3 100644 --- a/tools/xml2lpc.c +++ b/tools/xml2lpc.c @@ -78,7 +78,7 @@ static void xml2lpc_log(xml2lpc_context *xmlCtx, int level, const char *fmt, ... va_end(args); } -static void xml2lpc_genericxml_error(void *ctx, const char *fmt, ...) { +static void xml2lpc_genericxml_error(void *ctx, const char *fmt, ...) { xml2lpc_context *xmlCtx = (xml2lpc_context *)ctx; int sl = strlen(xmlCtx->errorBuffer); va_list args; @@ -87,7 +87,7 @@ static void xml2lpc_genericxml_error(void *ctx, const char *fmt, ...) { va_end(args); } -static void xml2lpc_genericxml_warning(void *ctx, const char *fmt, ...) { +static void xml2lpc_genericxml_warning(void *ctx, const char *fmt, ...) { xml2lpc_context *xmlCtx = (xml2lpc_context *)ctx; int sl = strlen(xmlCtx->warningBuffer); va_list args; @@ -214,11 +214,11 @@ static int processDoc(xmlNode *node, xml2lpc_context *ctx) { return 0; } -static int internal_convert_xml2lpc(xmlDoc *doc, xml2lpc_context *ctx) { +static int internal_convert_xml2lpc(xml2lpc_context *ctx) { xml2lpc_log(ctx, XML2LPC_DEBUG, "Parse started"); - xmlNode *rootNode = xmlDocGetRootElement(doc); + xmlNode *rootNode = xmlDocGetRootElement(ctx->doc); //dumpNodes(0, rootNode, cbf, ctx); - int ret = processDoc(rootNode, ctx); + int ret = processDoc(rootNode, ctx); xml2lpc_log(ctx, XML2LPC_DEBUG, "Parse ended ret:%d", ret); return ret; } @@ -230,10 +230,10 @@ int xml2lpc_validate(xml2lpc_context *xmlCtx) { validCtx = xmlSchemaNewValidCtxt(xmlSchemaParse(parserCtx)); xmlSchemaSetValidErrors(validCtx, xml2lpc_genericxml_error, xml2lpc_genericxml_warning, xmlCtx); int ret = xmlSchemaValidateDoc(validCtx, xmlCtx->doc); - if(ret >0) { + if(ret > 0) { xml2lpc_log(xmlCtx, XML2LPC_WARNING, "%s", xmlCtx->warningBuffer); xml2lpc_log(xmlCtx, XML2LPC_ERROR, "%s", xmlCtx->errorBuffer); - } else { + } else if(ret < 0) { xml2lpc_log(xmlCtx, XML2LPC_ERROR, "Internal error"); } xmlSchemaFreeValidCtxt(validCtx); @@ -243,7 +243,7 @@ int xml2lpc_validate(xml2lpc_context *xmlCtx) { int xml2lpc_convert(xml2lpc_context *xmlCtx, LpConfig *lpc) { xml2lpc_context_clear_logs(xmlCtx); xmlCtx->lpc = lpc; - return internal_convert_xml2lpc(xmlCtx->doc, xmlCtx); + return internal_convert_xml2lpc(xmlCtx); } int xml2lpc_set_xml_file(xml2lpc_context* xmlCtx, const char *filename) { From d9e81266d5dbd6b68869a6fd3e0c12be57e78fda Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Wed, 16 Jan 2013 14:42:12 +0100 Subject: [PATCH 31/50] Remove useless prefix(use default) --- tools/lpc2xml.c | 55 ++----------------------------------------------- 1 file changed, 2 insertions(+), 53 deletions(-) diff --git a/tools/lpc2xml.c b/tools/lpc2xml.c index cd0df72df..12af75322 100644 --- a/tools/lpc2xml.c +++ b/tools/lpc2xml.c @@ -71,57 +71,6 @@ static void lpc2xml_log(lpc2xml_context *xmlCtx, int level, const char *fmt, ... } va_end(args); } -/* -static void lpc2xml_genericxml_error(void *ctx, const char *fmt, ...) { - lpc2xml_context *xmlCtx = (lpc2xml_context *)ctx; - int sl = strlen(xmlCtx->errorBuffer); - va_list args; - va_start(args, fmt); - vsnprintf(xmlCtx->errorBuffer + sl, LPC2XML_BZ-sl, fmt, args); - va_end(args); -} - -static void lpc2xml_genericxml_warning(void *ctx, const char *fmt, ...) { - lpc2xml_context *xmlCtx = (lpc2xml_context *)ctx; - int sl = strlen(xmlCtx->warningBuffer); - va_list args; - va_start(args, fmt); - vsnprintf(xmlCtx->warningBuffer + sl, LPC2XML_BZ-sl, fmt, args); - va_end(args); -}*/ - -#if 0 -static void dumpNodes(int level, xmlNode * a_node, lpc2xml_context *ctx) { - xmlNode *cur_node = NULL; - - for (cur_node = a_node; cur_node; cur_node = cur_node->next) { - if (cur_node->type == XML_ELEMENT_NODE) { - lpc2xml_log(ctx, LPC2XML_DEBUG, "node level: %d type: Element, name: %s", level, cur_node->name); - } else { - lpc2xml_log(ctx, LPC2XML_DEBUG, "node level: %d type: %d, name: %s", level, cur_node->type, cur_node->name); - } - - dumpNodes(level + 1, cur_node->children, ctx); - } -} -#endif - -#if 0 -static void dumpNode(xmlNode *node, lpc2xml_context *ctx) { - lpc2xml_log(ctx, LPC2XML_DEBUG, "node type: %d, name: %s", node->type, node->name); -} - -static void dumpAttr(xmlNode *node, lpc2xml_context *ctx) { - lpc2xml_log(ctx, LPC2XML_DEBUG, "attr name: %s value:%s", node->name, node->children->content); -} - -static void dumpContent(xmlNode *node, lpc2xml_context *ctx) { - lpc2xml_log(ctx, LPC2XML_DEBUG, "content: %s", node->children->content); -} - - - -#endif static int processEntry(const char *section, const char *entry, xmlNode *node, lpc2xml_context *ctx) { const char *content = lp_config_get_string(ctx->lpc, section, entry, NULL); @@ -203,7 +152,7 @@ static int processDoc(xmlDoc *doc, lpc2xml_context *ctx) { lpc2xml_log(ctx, LPC2XML_ERROR, "Can't create \"config\" element"); return -1; } - xmlNs *lpc_ns = xmlNewNs(root_node, (const xmlChar *)"http://www.linphone.org/xsds/lpconfig.xsd", (const xmlChar *)"lpc"); + xmlNs *lpc_ns = xmlNewNs(root_node, (const xmlChar *)"http://www.linphone.org/xsds/lpconfig.xsd", NULL); if(lpc_ns == NULL) { lpc2xml_log(ctx, LPC2XML_WARNING, "Can't create lpc namespace"); } else { @@ -213,7 +162,7 @@ static int processDoc(xmlDoc *doc, lpc2xml_context *ctx) { if(lpc_ns == NULL) { lpc2xml_log(ctx, LPC2XML_WARNING, "Can't create xsi namespace"); } - xmlAttr *schemaLocation = xmlNewNsProp(root_node, xsi_ns, (const xmlChar *)"schemaLocation", (const xmlChar *)"http://www.linphone.org/xsds/lpconfig.xsd lpconfig.xsd "); + xmlAttr *schemaLocation = xmlNewNsProp(root_node, xsi_ns, (const xmlChar *)"schemaLocation", (const xmlChar *)"http://www.linphone.org/xsds/lpconfig.xsd lpconfig.xsd"); if(schemaLocation == NULL) { lpc2xml_log(ctx, LPC2XML_WARNING, "Can't create schemaLocation"); } From 3a9e33feb0f67bf411a417b436a06358ec97f3a6 Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Wed, 16 Jan 2013 10:53:39 +0100 Subject: [PATCH 32/50] Option to store auth_info in linphonerc Force value in user application after core creation in order to prevent the passwords to be stored. --- coreapi/authentication.c | 2 +- coreapi/linphonecore_jni.cc | 19 ++++++-- gtk/main.c | 1 + .../org/linphone/core/LinphoneCore.java | 6 +++ java/common/org/linphone/core/LpConfig.java | 48 +++++++++++++++++++ .../org/linphone/core/LinphoneCoreImpl.java | 6 +++ java/impl/org/linphone/core/LpConfigImpl.java | 36 ++++++++++++++ 7 files changed, 114 insertions(+), 4 deletions(-) create mode 100644 java/common/org/linphone/core/LpConfig.java create mode 100644 java/impl/org/linphone/core/LpConfigImpl.java diff --git a/coreapi/authentication.c b/coreapi/authentication.c index 1f7dfa91c..4b5d10fa8 100644 --- a/coreapi/authentication.c +++ b/coreapi/authentication.c @@ -131,7 +131,7 @@ void linphone_auth_info_write_config(LpConfig *config, LinphoneAuthInfo *obj, in sprintf(key,"auth_info_%i",pos); lp_config_clean_section(config,key); - if (obj==NULL){ + if (obj==NULL || lp_config_get_int(config, "sip", "store_auth_info", 1) == 0){ return; } if (obj->username!=NULL){ diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc index 7871a105d..4144c1441 100644 --- a/coreapi/linphonecore_jni.cc +++ b/coreapi/linphonecore_jni.cc @@ -23,9 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "linphonecore_utils.h" #include -#ifdef TUNNEL_ENABLED -#include "linphone_tunnel.h" -#endif extern "C" { #include "mediastreamer2/mediastream.h" @@ -34,6 +31,8 @@ extern "C" { #include "private.h" #include +#include "lpconfig.h" + #ifdef ANDROID #include extern "C" void libmsilbc_init(); @@ -2225,3 +2224,17 @@ extern "C" jstring Java_org_linphone_core_LinphoneCoreImpl_getVersion(JNIEnv* e jstring jvalue =env->NewStringUTF(linphone_core_get_version()); return jvalue; } + +extern "C" jlong Java_org_linphone_core_LinphoneCoreImpl_getConfig(JNIEnv *env, jobject thiz, jlong lc) { + return (jlong) linphone_core_get_config((LinphoneCore *)lc); +} + +extern "C" void Java_org_linphone_core_LpConfigImpl_setInt(JNIEnv *env, jobject thiz, jlong lpc, + jstring section, jstring key, jint value) { + const char *csection = env->GetStringUTFChars(section, NULL); + const char *ckey = env->GetStringUTFChars(key, NULL); + lp_config_set_int((LpConfig *)lpc, csection, ckey, (int) value); + env->ReleaseStringUTFChars(section, csection); + env->ReleaseStringUTFChars(key, ckey); +} + diff --git a/gtk/main.c b/gtk/main.c index 59530d816..12e84bc97 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -237,6 +237,7 @@ static void linphone_gtk_init_liblinphone(const char *config_file, vtable.transfer_state_changed=linphone_gtk_transfer_state_changed; the_core=linphone_core_new(&vtable,config_file,factory_config_file,NULL); + //lp_config_set_int(linphone_core_get_config(the_core), "sip", "store_auth_info", 0); linphone_core_set_user_agent(the_core,"Linphone", LINPHONE_VERSION); linphone_core_set_waiting_callback(the_core,linphone_gtk_wait,NULL); linphone_core_set_zrtp_secrets_file(the_core,secrets_file); diff --git a/java/common/org/linphone/core/LinphoneCore.java b/java/common/org/linphone/core/LinphoneCore.java index d612589fe..08371f515 100644 --- a/java/common/org/linphone/core/LinphoneCore.java +++ b/java/common/org/linphone/core/LinphoneCore.java @@ -876,4 +876,10 @@ public interface LinphoneCore { * Enable/Disable the use of inband DTMFs */ void setUseRfc2833ForDtmfs(boolean use); + + /** + * @return returns LpConfig object to read/write to the config file: usefull if you wish to extend + * the config file with your own sections + */ + LpConfig getConfig(); } diff --git a/java/common/org/linphone/core/LpConfig.java b/java/common/org/linphone/core/LpConfig.java new file mode 100644 index 000000000..f31e4d525 --- /dev/null +++ b/java/common/org/linphone/core/LpConfig.java @@ -0,0 +1,48 @@ +/* +LPConfig.java +Copyright (C) 2013 Belledonne Communications, Grenoble, France + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*/ +package org.linphone.core; + + +/** + * The LpConfig object is used to manipulate a configuration file. + * + * 
+ * The format of the configuration file is a .ini like format:
+ * - sections are defined in []
+ * - each section contains a sequence of key=value pairs.
+ * 
+ * Example:
+ * [sound]
+ * echocanceler=1
+ * playback_dev=ALSA: Default device
+ *
+ * [video]
+ * enabled=1
+ *
+ * } + * @author Guillaume Beraudo + */ +public interface LpConfig { + + /** + * Sets an integer config item + * @param key + */ + void setInt(String section, String key, int value); +} diff --git a/java/impl/org/linphone/core/LinphoneCoreImpl.java b/java/impl/org/linphone/core/LinphoneCoreImpl.java index d4f7808c6..02e31f9a1 100644 --- a/java/impl/org/linphone/core/LinphoneCoreImpl.java +++ b/java/impl/org/linphone/core/LinphoneCoreImpl.java @@ -866,4 +866,10 @@ class LinphoneCoreImpl implements LinphoneCore { public void setUseRfc2833ForDtmfs(boolean use) { setUseRfc2833ForDtmfs(nativePtr, use); } + + private native long getConfig(long ptr); + public LpConfig getConfig() { + long configPtr=getConfig(nativePtr); + return new LpConfigImpl(configPtr); + } } diff --git a/java/impl/org/linphone/core/LpConfigImpl.java b/java/impl/org/linphone/core/LpConfigImpl.java new file mode 100644 index 000000000..1cb705ec2 --- /dev/null +++ b/java/impl/org/linphone/core/LpConfigImpl.java @@ -0,0 +1,36 @@ +/* +LPConfigImpl.java +Copyright (C) 2013 Belledonne Communications, Grenoble, France + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*/ +package org.linphone.core; + + + +class LpConfigImpl implements LpConfig { + + private final long nativePtr; + + public LpConfigImpl(long ptr) { + nativePtr=ptr; + } + + private native void setInt(long ptr, String section, String key, int value); + public void setInt(String section, String key, int value) { + setInt(nativePtr, section, key, value); + } + +} From 423375fe678d8f9c8b175881e8d9ded9e62126a0 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Wed, 16 Jan 2013 15:28:29 +0100 Subject: [PATCH 33/50] Updated chatroom tutorial --- .../java/org/linphone/core/tutorials/TutorialChatRoom.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/coreapi/help/java/org/linphone/core/tutorials/TutorialChatRoom.java b/coreapi/help/java/org/linphone/core/tutorials/TutorialChatRoom.java index 3e41dba00..2478131a0 100644 --- a/coreapi/help/java/org/linphone/core/tutorials/TutorialChatRoom.java +++ b/coreapi/help/java/org/linphone/core/tutorials/TutorialChatRoom.java @@ -83,7 +83,7 @@ public class TutorialChatRoom implements LinphoneCoreListener { public void dtmfReceived(LinphoneCore lc, LinphoneCall call, int dtmf) {} public void textReceived(LinphoneCore lc, LinphoneChatRoom cr,LinphoneAddress from, String message) { - write("Message ["+message+"] received from ["+from.asString()+"]"); + //Deprecated } @@ -153,8 +153,7 @@ public class TutorialChatRoom implements LinphoneCoreListener { @Override public void messageReceived(LinphoneCore lc, LinphoneChatRoom cr, LinphoneChatMessage message) { - // TODO Auto-generated method stub - + write("Message [" + message.getMessage() + "] received from [" + message.getFrom().asString() + "]"); } From 3b33b27f609502c3e18e83c4982ad03cd0eb4063 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Wed, 16 Jan 2013 15:35:03 +0100 Subject: [PATCH 34/50] Add common name certificate verification function in sal Add eXosip sal wrapper to eXosip_tls_verify_cn --- coreapi/linphonecore.c | 8 ++++++++ coreapi/linphonecore.h | 1 + coreapi/sal.h | 1 + coreapi/sal_eXosip2.c | 11 +++++++++++ coreapi/sal_eXosip2.h | 1 + m4/exosip.m4 | 4 ++++ 6 files changed, 26 insertions(+) diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index 4a0c3851b..ee0be33be 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -567,6 +567,7 @@ static void sip_config_read(LinphoneCore *lc) sal_set_root_ca(lc->sal, lp_config_get_string(lc->config,"sip","root_ca", ROOT_CA_FILE)); #endif linphone_core_verify_server_certificates(lc,lp_config_get_int(lc->config,"sip","verify_server_certs",TRUE)); + linphone_core_verify_server_cn(lc,lp_config_get_int(lc->config,"sip","verify_server_cn",TRUE)); /*setting the dscp must be done before starting the transports, otherwise it is not taken into effect*/ sal_set_dscp(lc->sal,linphone_core_get_sip_dscp(lc)); /*start listening on ports*/ @@ -3701,6 +3702,13 @@ void linphone_core_verify_server_certificates(LinphoneCore *lc, bool_t yesno){ sal_verify_server_certificates(lc->sal,yesno); } +/** + * Specify whether the tls server certificate common name must be verified when connecting to a SIP/TLS server. +**/ +void linphone_core_verify_server_cn(LinphoneCore *lc, bool_t yesno){ + sal_verify_server_cn(lc->sal,yesno); +} + static void notify_end_of_ring(void *ud, MSFilter *f, unsigned int event, void *arg){ LinphoneCore *lc=(LinphoneCore*)ud; lc->preview_finished=1; diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h index 2b53f7a73..55198e319 100644 --- a/coreapi/linphonecore.h +++ b/coreapi/linphonecore.h @@ -1209,6 +1209,7 @@ void linphone_core_set_sound_source(LinphoneCore *lc, char source); void linphone_core_set_ring(LinphoneCore *lc, const char *path); const char *linphone_core_get_ring(const LinphoneCore *lc); void linphone_core_verify_server_certificates(LinphoneCore *lc, bool_t yesno); +void linphone_core_verify_server_cn(LinphoneCore *lc, bool_t yesno); void linphone_core_set_root_ca(LinphoneCore *lc, const char *path); const char *linphone_core_get_root_ca(LinphoneCore *lc); void linphone_core_set_ringback(LinphoneCore *lc, const char *path); diff --git a/coreapi/sal.h b/coreapi/sal.h index 77e43d6b1..9c0ceca76 100644 --- a/coreapi/sal.h +++ b/coreapi/sal.h @@ -359,6 +359,7 @@ void sal_use_101(Sal *ctx, bool_t use_101); void sal_set_root_ca(Sal* ctx, const char* rootCa); const char *sal_get_root_ca(Sal* ctx); void sal_verify_server_certificates(Sal *ctx, bool_t verify); +void sal_verify_server_cn(Sal *ctx, bool_t verify); int sal_iterate(Sal *sal); MSList * sal_get_pending_auths(Sal *sal); diff --git a/coreapi/sal_eXosip2.c b/coreapi/sal_eXosip2.c index 203c7cb92..93686a75e 100644 --- a/coreapi/sal_eXosip2.c +++ b/coreapi/sal_eXosip2.c @@ -282,6 +282,7 @@ Sal * sal_init(){ sal->reuse_authorization=FALSE; sal->rootCa = 0; sal->verify_server_certs=TRUE; + sal->verify_server_cn=TRUE; sal->expire_old_contact=FALSE; sal->add_dates=FALSE; sal->dscp=-1; @@ -378,6 +379,9 @@ static void set_tls_options(Sal *ctx){ #ifdef HAVE_EXOSIP_TLS_VERIFY_CERTIFICATE eXosip_tls_verify_certificate(ctx->verify_server_certs); #endif +#ifdef HAVE_EXOSIP_TLS_VERIFY_CN + eXosip_tls_verify_cn(ctx->verify_server_cn); +#endif } void sal_set_dscp(Sal *ctx, int dscp){ @@ -499,6 +503,13 @@ void sal_verify_server_certificates(Sal *ctx, bool_t verify){ #endif } +void sal_verify_server_cn(Sal *ctx, bool_t verify){ + ctx->verify_server_cn=verify; +#ifdef HAVE_EXOSIP_TLS_VERIFY_CN + eXosip_tls_verify_cn(verify); +#endif +} + static int extract_received_rport(osip_message_t *msg, const char **received, int *rportval,SalTransport* transport){ osip_via_t *via=NULL; osip_generic_param_t *param=NULL; diff --git a/coreapi/sal_eXosip2.h b/coreapi/sal_eXosip2.h index 29eee78ae..89ac93abf 100644 --- a/coreapi/sal_eXosip2.h +++ b/coreapi/sal_eXosip2.h @@ -48,6 +48,7 @@ struct Sal{ bool_t use_101; bool_t reuse_authorization; bool_t verify_server_certs; + bool_t verify_server_cn; bool_t expire_old_contact; bool_t add_dates; }; diff --git a/m4/exosip.m4 b/m4/exosip.m4 index aa4b7a9c3..31769e00d 100644 --- a/m4/exosip.m4 +++ b/m4/exosip.m4 @@ -40,6 +40,10 @@ AC_CHECK_LIB([eXosip2],[eXosip_tls_verify_certificate], [AC_DEFINE([HAVE_EXOSIP_TLS_VERIFY_CERTIFICATE],[1],[Defined when eXosip_tls_verify_certificate is available])], [AC_MSG_WARN([Could not find eXosip_tls_verify_certificate in eXosip2 !])], [-losipparser2 -losip2 ]) +AC_CHECK_LIB([eXosip2],[eXosip_tls_verify_cn], + [AC_DEFINE([HAVE_EXOSIP_TLS_VERIFY_CN],[1],[Defined when eXosip_tls_verify_certificate is available])], + [AC_MSG_WARN([Could not find eXosip_tls_verify_cn in eXosip2 !])], + [-losipparser2 -losip2 ]) AC_CHECK_LIB([eXosip2],[eXosip_trylock], [AC_DEFINE([HAVE_EXOSIP_TRYLOCK],[1],[Defined when eXosip_get_socket is available])], [], From 80dd3a1b2e4164f0c9d1edb12014e2627dcf578c Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Wed, 16 Jan 2013 15:48:02 +0100 Subject: [PATCH 35/50] Don't use deprecated API in chatroom tutorial --- .../core/tutorials/TutorialChatRoom.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/coreapi/help/java/org/linphone/core/tutorials/TutorialChatRoom.java b/coreapi/help/java/org/linphone/core/tutorials/TutorialChatRoom.java index 2478131a0..a9134dc88 100644 --- a/coreapi/help/java/org/linphone/core/tutorials/TutorialChatRoom.java +++ b/coreapi/help/java/org/linphone/core/tutorials/TutorialChatRoom.java @@ -20,19 +20,19 @@ package org.linphone.core.tutorials; import org.linphone.core.LinphoneAddress; import org.linphone.core.LinphoneCall; +import org.linphone.core.LinphoneCall.State; import org.linphone.core.LinphoneCallStats; import org.linphone.core.LinphoneChatMessage; import org.linphone.core.LinphoneChatRoom; import org.linphone.core.LinphoneCore; import org.linphone.core.LinphoneCore.EcCalibratorStatus; +import org.linphone.core.LinphoneCore.GlobalState; +import org.linphone.core.LinphoneCore.RegistrationState; import org.linphone.core.LinphoneCoreException; import org.linphone.core.LinphoneCoreFactory; import org.linphone.core.LinphoneCoreListener; import org.linphone.core.LinphoneFriend; import org.linphone.core.LinphoneProxyConfig; -import org.linphone.core.LinphoneCall.State; -import org.linphone.core.LinphoneCore.GlobalState; -import org.linphone.core.LinphoneCore.RegistrationState; /** @@ -50,7 +50,7 @@ import org.linphone.core.LinphoneCore.RegistrationState; * @author Guillaume Beraudo * */ -public class TutorialChatRoom implements LinphoneCoreListener { +public class TutorialChatRoom implements LinphoneCoreListener, LinphoneChatMessage.StateListener { private boolean running; private TutorialNotifier TutorialNotifier; @@ -118,7 +118,8 @@ public class TutorialChatRoom implements LinphoneCoreListener { LinphoneChatRoom chatRoom = lc.createChatRoom(destinationSipAddress); // Send message - chatRoom.sendMessage("Hello world"); + LinphoneChatMessage chatMessage = chatRoom.createLinphoneChatMessage("Hello world"); + chatRoom.sendMessage(chatMessage, this); // main loop for receiving notifications and doing background linphonecore work running = true; @@ -156,5 +157,11 @@ public class TutorialChatRoom implements LinphoneCoreListener { write("Message [" + message.getMessage() + "] received from [" + message.getFrom().asString() + "]"); } + @Override + public void onLinphoneChatMessageStateChanged(LinphoneChatMessage msg, + org.linphone.core.LinphoneChatMessage.State state) { + write("Sent message [" + msg.getMessage() + "] new state is " + state.toString()); + } + } From 3dc8812425c2d8fdb843e1090d3bcd17ffc0bce3 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Wed, 16 Jan 2013 15:50:05 +0100 Subject: [PATCH 36/50] update ms2 again --- mediastreamer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediastreamer2 b/mediastreamer2 index 294440b85..d5811e376 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 294440b8517a4e5766a56a9d26be282aa44e0588 +Subproject commit d5811e376759433da3c19585b2d8d0329e1c06b2 From 5730556ca710b442c9c3afd2546916a8cfc6a442 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Thu, 17 Jan 2013 09:31:35 +0100 Subject: [PATCH 37/50] fix libxml compilation error --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 1d8f92278..dc411434a 100644 --- a/configure.ac +++ b/configure.ac @@ -150,7 +150,7 @@ AC_ARG_ENABLE(tools, dnl check libxml2 (needed for tools) if test "$build_tools" != "false" ; then - PKG_CHECK_MODULES(LIBXML2, [libxml-2.0],[], + PKG_CHECK_MODULES(LIBXML2, [libxml-2.0 >= 2.9 ],[], [ if test "$build_tools" = "true" ; then AC_MSG_ERROR([Could not found libxml2, tools cannot be compiled.]) From 56470e4ddd4e8fe214e45f5890ac7f3e77bce5ea Mon Sep 17 00:00:00 2001 From: Margaux Clerc Date: Thu, 17 Jan 2013 10:56:20 +0100 Subject: [PATCH 38/50] Add notification message sending and name in the chat tab --- gtk/chat.c | 43 +++++++++++++++++++++++++++++-------------- gtk/friendlist.c | 33 ++++++++++++++++++++++++++++++--- gtk/linphone.h | 3 ++- 3 files changed, 61 insertions(+), 18 deletions(-) diff --git a/gtk/chat.c b/gtk/chat.c index 868937573..b63144b17 100644 --- a/gtk/chat.c +++ b/gtk/chat.c @@ -31,7 +31,7 @@ void linphone_gtk_quit_chatroom(LinphoneChatRoom *cr) { int idx = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(w),"idx")); g_return_if_fail(w!=NULL); gtk_notebook_remove_page (GTK_NOTEBOOK(nb),idx); - linphone_gtk_update_chat_picture(FALSE); + linphone_gtk_create_chat_picture(FALSE); g_object_set_data(G_OBJECT(friendlist),"chatview",NULL); g_object_set_data(G_OBJECT(w),"from_message",NULL); g_object_set_data(G_OBJECT(w),"cr",NULL); @@ -98,7 +98,7 @@ void linphone_gtk_push_text(GtkWidget *w, const LinphoneAddress *from, const cha int off; gtk_text_buffer_get_end_iter(buffer,&iter); off=gtk_text_iter_get_offset(&iter); - //GList *list=g_object_get_data(G_OBJECT(w),"list"); + GList *list=g_object_get_data(G_OBJECT(w),"list"); if(g_strcmp0((char *)g_object_get_data(G_OBJECT(w),"from_message"),linphone_address_as_string(from))!=0){ gtk_text_buffer_get_iter_at_offset(buffer,&iter,off); @@ -129,7 +129,7 @@ void linphone_gtk_push_text(GtkWidget *w, const LinphoneAddress *from, const cha } g_object_set_data(G_OBJECT(linphone_gtk_get_main_window()),"history",hash); - /*if(me){ + if(me){ gtk_text_buffer_get_end_iter(buffer,&iter); list=g_list_append(list,GINT_TO_POINTER(gtk_text_iter_get_line(&iter))); gtk_text_buffer_insert_with_tags_by_name(buffer,&iter,"Message in progress.. ",-1, @@ -137,7 +137,7 @@ void linphone_gtk_push_text(GtkWidget *w, const LinphoneAddress *from, const cha gtk_text_buffer_get_end_iter(buffer,&iter); gtk_text_buffer_insert(buffer,&iter,"\n",-1); g_object_set_data(G_OBJECT(w),"list",list); - }*/ + } GtkTextMark *mark=gtk_text_buffer_create_mark(buffer,NULL,&iter,FALSE); gtk_text_view_scroll_mark_onscreen(text,mark); @@ -154,7 +154,7 @@ const LinphoneAddress* linphone_gtk_get_used_identity(){ /* function in dev for displaying ack*/ void update_chat_state_message(LinphoneChatMessageState state){ - /* GtkWidget *main_window=linphone_gtk_get_main_window(); + GtkWidget *main_window=linphone_gtk_get_main_window(); GtkWidget *friendlist=linphone_gtk_get_widget(main_window,"contact_list"); GtkWidget *page=(GtkWidget*)g_object_get_data(G_OBJECT(friendlist),"chatview"); GList *list=g_object_get_data(G_OBJECT(page),"list"); @@ -193,11 +193,17 @@ void update_chat_state_message(LinphoneChatMessageState state){ break; default : result="Message in progress.. "; } - gtk_text_buffer_insert_with_tags_by_name(b,&iter,result,-1, + + GDateTime *dt=g_date_time_new_now_local(); + char *time=g_date_time_format(dt,"%k:%M"); + gchar result2[80]; + sprintf(result2,"%s %s",result,time); + + gtk_text_buffer_insert_with_tags_by_name(b,&iter,result2,-1, "italic","right","small","font_grey",NULL); list=g_list_remove(list,g_list_nth_data(list,0)); g_object_set_data(G_OBJECT(page),"list",list); - } */ + } } static void on_chat_state_changed(LinphoneChatMessage *msg, LinphoneChatMessageState state, void *user_pointer){ @@ -247,7 +253,7 @@ GtkWidget* linphone_gtk_init_chatroom(LinphoneChatRoom *cr, const LinphoneAddres g_object_set_data(G_OBJECT(chat_view),"cr",cr); g_object_set_data(G_OBJECT(chat_view),"idx",GINT_TO_POINTER(idx)); g_object_set_data(G_OBJECT(chat_view),"from_message",NULL); - g_object_set_data(G_OBJECT(chat_view),"from_chatroom",linphone_address_as_string_uri_only(with)); + g_object_set_data(G_OBJECT(chat_view),"from_chatroom",(gpointer) with); GList *list=NULL; g_object_set_data(G_OBJECT(chat_view),"list",list); @@ -295,8 +301,8 @@ LinphoneChatRoom * linphone_gtk_create_chatroom(const LinphoneAddress *with){ void linphone_gtk_load_chatroom(LinphoneChatRoom *cr,const LinphoneAddress *uri,GtkWidget *chat_view){ GtkWidget *main_window=linphone_gtk_get_main_window (); GHashTable *hash=g_object_get_data(G_OBJECT(main_window),"history"); - if(g_strcmp0((char *)g_object_get_data(G_OBJECT(chat_view),"from_chatroom"), - linphone_address_as_string_uri_only(uri))!=0) + LinphoneAddress *from=(LinphoneAddress *)g_object_get_data(G_OBJECT(chat_view),"from_chatroom"); + if(g_strcmp0(linphone_address_as_string(from),linphone_address_as_string(uri))!=0) { GtkTextView *text_view=GTK_TEXT_VIEW(linphone_gtk_get_widget(chat_view,"textview")); GtkTextIter start; @@ -315,7 +321,7 @@ void linphone_gtk_load_chatroom(LinphoneChatRoom *cr,const LinphoneAddress *uri, udpate_tab_chat_header(chat_view,uri,cr); g_object_set_data(G_OBJECT(chat_view),"cr",cr); - g_object_set_data(G_OBJECT(chat_view),"from_chatroom",linphone_address_as_string_uri_only(uri)); + g_object_set_data(G_OBJECT(chat_view),"from_chatroom",(gpointer) uri); g_object_set_data(G_OBJECT(chat_view),"from_message",linphone_address_as_string_uri_only(uri)); g_object_set_data(G_OBJECT(linphone_gtk_get_widget(main_window,"contact_list")),"chatview",(gpointer)chat_view); } @@ -336,6 +342,8 @@ void linphone_gtk_text_received(LinphoneCore *lc, LinphoneChatRoom *room, const GtkWidget *main_window=linphone_gtk_get_main_window(); GtkWidget *friendlist=linphone_gtk_get_widget(main_window,"contact_list"); GtkWidget *w; + GDateTime *dt=g_date_time_new_now_local(); + char *time=g_date_time_format(dt,"%k:%M"); w=(GtkWidget*)g_object_get_data(G_OBJECT(friendlist),"chatview"); if(w!=NULL){ @@ -344,14 +352,21 @@ void linphone_gtk_text_received(LinphoneCore *lc, LinphoneChatRoom *room, const w=linphone_gtk_init_chatroom(room,from); g_object_set_data(G_OBJECT(friendlist),"chatview",(gpointer)w); } + + const char *display=linphone_address_get_display_name(from); + if (display==NULL || display[0]=='\0') { + display=linphone_address_get_username(from); + } - #ifdef HAVE_GTK_OSX + #ifdef HAVE_GTK_OSXs /* Notified when a new message is sent */ linphone_gtk_status_icon_set_blinking(TRUE); #else if(!gtk_window_is_active(GTK_WINDOW(main_window))){ if(!GPOINTER_TO_INT(g_object_get_data(G_OBJECT(w),"is_notified"))){ - linphone_gtk_notify(NULL,message); + gchar result2[80]; + sprintf(result2,"%s \n %s sent at %s",message,display,time); + linphone_gtk_notify(NULL,result2); g_object_set_data(G_OBJECT(w),"is_notified",GINT_TO_POINTER(TRUE)); } else { g_object_set_data(G_OBJECT(w),"is_notified",GINT_TO_POINTER(FALSE)); @@ -359,7 +374,7 @@ void linphone_gtk_text_received(LinphoneCore *lc, LinphoneChatRoom *room, const } #endif linphone_gtk_push_text(w,from,message,FALSE,room); - //linphone_gtk_update_chat_picture(TRUE); + linphone_gtk_update_chat_picture(); //gtk_window_present(GTK_WINDOW(w)); /*gtk_window_set_urgency_hint(GTK_WINDOW(w),TRUE);*/ } diff --git a/gtk/friendlist.c b/gtk/friendlist.c index 9aabe597a..88204a102 100644 --- a/gtk/friendlist.c +++ b/gtk/friendlist.c @@ -171,7 +171,7 @@ static void linphone_gtk_call_selected(GtkTreeView *treeview){ "start_call")); } -void linphone_gtk_update_chat_picture(gboolean active){ +void linphone_gtk_create_chat_picture(gboolean active){ GtkTreeIter iter; GtkWidget *w = linphone_gtk_get_main_window(); GtkWidget *friendlist=linphone_gtk_get_widget(w,"contact_list"); @@ -187,6 +187,31 @@ void linphone_gtk_update_chat_picture(gboolean active){ } } +void linphone_gtk_update_chat_picture(){ + GtkTreeIter iter; + GtkListStore *store=NULL; + GtkWidget *w = linphone_gtk_get_main_window(); + GtkWidget *friendlist=linphone_gtk_get_widget(w,"contact_list"); + GtkTreeModel *model=gtk_tree_view_get_model(GTK_TREE_VIEW(friendlist)); + GtkWidget *chat_view=(GtkWidget*)g_object_get_data(G_OBJECT(friendlist),"chatview"); + LinphoneFriend *lf=NULL; + LinphoneAddress *uri=(LinphoneAddress *)g_object_get_data(G_OBJECT(friendlist),"from"); + store=GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(friendlist))); + if (gtk_tree_model_get_iter_first(model,&iter)) { + do{ + gtk_tree_model_get (model, &iter,FRIEND_ID , &lf, -1); + if(chat_view!=NULL){ + if(g_strcmp0(linphone_address_as_string(linphone_friend_get_address(lf)), + linphone_address_as_string(uri))==0){ + gtk_list_store_set(store,&iter,FRIEND_CHAT,create_active_chat_picture(),-1); + } else { + gtk_list_store_set(store,&iter,FRIEND_CHAT,create_chat_picture(),-1); + } + } + }while(gtk_tree_model_iter_next(model,&iter)); + } +} + static gboolean grab_focus(GtkWidget *w){ gtk_widget_grab_focus(w); return FALSE; @@ -214,6 +239,7 @@ void linphone_gtk_chat_selected(GtkWidget *item){ cr=linphone_gtk_create_chatroom(uri); } page=(GtkWidget*)g_object_get_data(G_OBJECT(friendlist),"chatview"); + g_object_set_data(G_OBJECT(friendlist),"from",(gpointer)uri); if(page==NULL){ page=linphone_gtk_init_chatroom(cr,uri); g_object_set_data(G_OBJECT(friendlist),"chatview",(gpointer)page); @@ -221,7 +247,7 @@ void linphone_gtk_chat_selected(GtkWidget *item){ linphone_gtk_load_chatroom(cr,uri,page); } gtk_notebook_set_current_page(notebook,gtk_notebook_page_num(notebook,page)); - linphone_gtk_update_chat_picture(FALSE); + linphone_gtk_create_chat_picture(FALSE); g_idle_add((GSourceFunc)grab_focus,linphone_gtk_get_widget(page,"text_entry")); gtk_list_store_set(store,&iter,FRIEND_CHAT,create_active_chat_picture(),-1); } @@ -669,6 +695,7 @@ void linphone_gtk_show_friends(void){ escaped=g_markup_escape_text(uri,-1); gtk_list_store_set(store,&iter,FRIEND_SIP_ADDRESS,escaped,-1); g_free(escaped); + linphone_gtk_update_chat_picture(); //bi=linphone_friend_get_info(lf); /*if (bi!=NULL && bi->image_data!=NULL){ GdkPixbuf *pbuf= @@ -890,7 +917,7 @@ static gint tree_view_get_cell_from_pos(GtkTreeView *view, guint x, guint y){ for (node = columns; node != NULL && col == NULL; node = node->next){ GtkTreeViewColumn *checkcol = (GtkTreeViewColumn*) node->data; gtk_tree_view_column_cell_get_size(checkcol,NULL,NULL,NULL,NULL,&height); - if (x >= colx && x < (colx + checkcol->width) && y < height*coly){ + if (x >= colx && x < (colx + checkcol->width) && y < (height+2)*coly){ col = checkcol; gint num = get_col_number_from_tree_view_column(col); return num; diff --git a/gtk/linphone.h b/gtk/linphone.h index f2b02aace..367b18c26 100644 --- a/gtk/linphone.h +++ b/gtk/linphone.h @@ -109,7 +109,8 @@ LinphoneChatRoom *linphone_gtk_start_chat(GtkTreeView* t); void linphone_gtk_load_chatroom(LinphoneChatRoom *cr,const LinphoneAddress *uri,GtkWidget *chat_view); void linphone_gtk_send_text(); GtkWidget * linphone_gtk_init_chatroom(LinphoneChatRoom *cr, const LinphoneAddress *with); -void linphone_gtk_update_chat_picture(gboolean active); +void linphone_gtk_create_chat_picture(gboolean active); +void linphone_gtk_update_chat_picture(); void linphone_gtk_chat_set_conversation(const LinphoneAddress *uri,gchar *conversation); gchar * linphone_gtk_chat_get_conversation(const LinphoneAddress *uri); From 3016ec37d0ec238b5c70a61d9b52fe39973db56b Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Thu, 17 Jan 2013 10:57:59 +0100 Subject: [PATCH 39/50] Fix lpc2xml for old libxml version --- configure.ac | 2 +- tools/lpc2xml.c | 10 +++++++--- tools/lpc2xml.h | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index dc411434a..1d8f92278 100644 --- a/configure.ac +++ b/configure.ac @@ -150,7 +150,7 @@ AC_ARG_ENABLE(tools, dnl check libxml2 (needed for tools) if test "$build_tools" != "false" ; then - PKG_CHECK_MODULES(LIBXML2, [libxml-2.0 >= 2.9 ],[], + PKG_CHECK_MODULES(LIBXML2, [libxml-2.0],[], [ if test "$build_tools" = "true" ; then AC_MSG_ERROR([Could not found libxml2, tools cannot be compiled.]) diff --git a/tools/lpc2xml.c b/tools/lpc2xml.c index 12af75322..feabdde2e 100644 --- a/tools/lpc2xml.c +++ b/tools/lpc2xml.c @@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "lpc2xml.h" #include #include - +#include #define LPC2XML_BZ 2048 @@ -216,7 +216,7 @@ int lpc2xml_convert_fd(lpc2xml_context* context, int fd) { return ret; } -int lpc2xml_convert_string(lpc2xml_context* context, unsigned char **content) { +int lpc2xml_convert_string(lpc2xml_context* context, char **content) { int ret = 0; xmlBufferPtr buffer = xmlBufferCreate(); xmlSaveCtxtPtr save_ctx = xmlSaveToBuffer(buffer, "UTF-8", XML_SAVE_FORMAT); @@ -226,7 +226,11 @@ int lpc2xml_convert_string(lpc2xml_context* context, unsigned char **content) { } xmlSaveClose(save_ctx); if(ret == 0) { - *content = xmlBufferDetach(buffer); +#if LIBXML_VERSION >= 20800 + *content = (char *)xmlBufferDetach(buffer); +#else + *content = strdup((const char *)xmlBufferContent(buffer)); +#endif } xmlBufferFree(buffer); return ret; diff --git a/tools/lpc2xml.h b/tools/lpc2xml.h index f1583109b..025400907 100644 --- a/tools/lpc2xml.h +++ b/tools/lpc2xml.h @@ -40,7 +40,7 @@ int lpc2xml_set_lpc(lpc2xml_context* context, const LpConfig *lpc); int lpc2xml_convert_file(lpc2xml_context* context, const char *filename); int lpc2xml_convert_fd(lpc2xml_context* context, int fd); -int lpc2xml_convert_string(lpc2xml_context* context, unsigned char **content); +int lpc2xml_convert_string(lpc2xml_context* context, char **content); #endif //LPC2XML_H_ From 46ce83799ee2e00281c49c2374bb1d86f9196724 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Thu, 17 Jan 2013 11:32:00 +0100 Subject: [PATCH 40/50] Add check to prevent crash. --- coreapi/TunnelManager.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/coreapi/TunnelManager.cc b/coreapi/TunnelManager.cc index 8ce6da7e5..5b1b6dddb 100644 --- a/coreapi/TunnelManager.cc +++ b/coreapi/TunnelManager.cc @@ -107,6 +107,10 @@ void TunnelManager::addServer(const char *ip, int port,unsigned int udpMirrorPor } void TunnelManager::addServer(const char *ip, int port) { + if (ip == NULL) { + ip = ""; + ms_warning("Adding tunnel server with empty ip, it will not work!"); + } mServerAddrs.push_back(ServerAddr(ip,port)); if (mTunnelClient) mTunnelClient->addServer(ip,port); } From 09016bd6cd42fe6b847a5d323bb13058573f7529 Mon Sep 17 00:00:00 2001 From: Margaux Clerc Date: Thu, 17 Jan 2013 13:01:11 +0100 Subject: [PATCH 41/50] modified chat_picture update --- gtk/friendlist.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gtk/friendlist.c b/gtk/friendlist.c index 88204a102..8bdd88ffa 100644 --- a/gtk/friendlist.c +++ b/gtk/friendlist.c @@ -188,28 +188,28 @@ void linphone_gtk_create_chat_picture(gboolean active){ } void linphone_gtk_update_chat_picture(){ - GtkTreeIter iter; + /*GtkTreeIter iter; GtkListStore *store=NULL; GtkWidget *w = linphone_gtk_get_main_window(); GtkWidget *friendlist=linphone_gtk_get_widget(w,"contact_list"); GtkTreeModel *model=gtk_tree_view_get_model(GTK_TREE_VIEW(friendlist)); GtkWidget *chat_view=(GtkWidget*)g_object_get_data(G_OBJECT(friendlist),"chatview"); LinphoneFriend *lf=NULL; - LinphoneAddress *uri=(LinphoneAddress *)g_object_get_data(G_OBJECT(friendlist),"from"); + //LinphoneAddress *uri=(LinphoneAddress *)g_object_get_data(G_OBJECT(friendlist),"from"); store=GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(friendlist))); if (gtk_tree_model_get_iter_first(model,&iter)) { do{ gtk_tree_model_get (model, &iter,FRIEND_ID , &lf, -1); if(chat_view!=NULL){ - if(g_strcmp0(linphone_address_as_string(linphone_friend_get_address(lf)), - linphone_address_as_string(uri))==0){ + //if(g_strcmp0(linphone_address_as_string(linphone_friend_get_address(lf)), + // linphone_address_as_string(uri))==0){ gtk_list_store_set(store,&iter,FRIEND_CHAT,create_active_chat_picture(),-1); - } else { - gtk_list_store_set(store,&iter,FRIEND_CHAT,create_chat_picture(),-1); - } + //} else { + //gtk_list_store_set(store,&iter,FRIEND_CHAT,create_chat_picture(),-1); + //} } }while(gtk_tree_model_iter_next(model,&iter)); - } + }*/ } static gboolean grab_focus(GtkWidget *w){ From d55c0fbf6e48ebe1e14a4ad8772b6d9710f96584 Mon Sep 17 00:00:00 2001 From: Margaux Clerc Date: Thu, 17 Jan 2013 13:42:15 +0100 Subject: [PATCH 42/50] fix chat picture update --- gtk/chat.c | 3 ++- gtk/friendlist.c | 20 +++++++++++--------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/gtk/chat.c b/gtk/chat.c index b63144b17..257a55758 100644 --- a/gtk/chat.c +++ b/gtk/chat.c @@ -279,7 +279,7 @@ GtkWidget* linphone_gtk_init_chatroom(LinphoneChatRoom *cr, const LinphoneAddres gtk_text_buffer_create_tag(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)), "italic","style", PANGO_STYLE_ITALIC,NULL); gtk_text_buffer_create_tag(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)), - "small","size",8*PANGO_SCALE,NULL); + "small","size",9*PANGO_SCALE,NULL); gtk_text_buffer_create_tag(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)), "font_grey","foreground-gdk",&color,NULL); @@ -351,6 +351,7 @@ void linphone_gtk_text_received(LinphoneCore *lc, LinphoneChatRoom *room, const } else { w=linphone_gtk_init_chatroom(room,from); g_object_set_data(G_OBJECT(friendlist),"chatview",(gpointer)w); + g_object_set_data(G_OBJECT(friendlist),"from",(gpointer)from); } const char *display=linphone_address_get_display_name(from); diff --git a/gtk/friendlist.c b/gtk/friendlist.c index 8bdd88ffa..5ce869b46 100644 --- a/gtk/friendlist.c +++ b/gtk/friendlist.c @@ -188,28 +188,30 @@ void linphone_gtk_create_chat_picture(gboolean active){ } void linphone_gtk_update_chat_picture(){ - /*GtkTreeIter iter; + GtkTreeIter iter; GtkListStore *store=NULL; GtkWidget *w = linphone_gtk_get_main_window(); GtkWidget *friendlist=linphone_gtk_get_widget(w,"contact_list"); GtkTreeModel *model=gtk_tree_view_get_model(GTK_TREE_VIEW(friendlist)); GtkWidget *chat_view=(GtkWidget*)g_object_get_data(G_OBJECT(friendlist),"chatview"); LinphoneFriend *lf=NULL; - //LinphoneAddress *uri=(LinphoneAddress *)g_object_get_data(G_OBJECT(friendlist),"from"); + LinphoneAddress *uri=(LinphoneAddress *)g_object_get_data(G_OBJECT(friendlist),"from"); store=GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(friendlist))); if (gtk_tree_model_get_iter_first(model,&iter)) { do{ gtk_tree_model_get (model, &iter,FRIEND_ID , &lf, -1); if(chat_view!=NULL){ - //if(g_strcmp0(linphone_address_as_string(linphone_friend_get_address(lf)), - // linphone_address_as_string(uri))==0){ - gtk_list_store_set(store,&iter,FRIEND_CHAT,create_active_chat_picture(),-1); - //} else { - //gtk_list_store_set(store,&iter,FRIEND_CHAT,create_chat_picture(),-1); - //} + if(uri !=NULL) { + if(g_strcmp0(linphone_address_as_string(linphone_friend_get_address(lf)), + linphone_address_as_string(uri))==0){ + gtk_list_store_set(store,&iter,FRIEND_CHAT,create_active_chat_picture(),-1); + } else { + gtk_list_store_set(store,&iter,FRIEND_CHAT,create_chat_picture(),-1); + } + } } }while(gtk_tree_model_iter_next(model,&iter)); - }*/ + } } static gboolean grab_focus(GtkWidget *w){ From d496d958452a3147eeefb9ba01be233b5b4f0b58 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Thu, 17 Jan 2013 16:27:39 +0100 Subject: [PATCH 43/50] Prevent crash when updating SRTP keys if a media is disabled. --- coreapi/linphonecall.c | 52 +++++++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 24 deletions(-) diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c index 3bf93f78e..4465d6f8e 100644 --- a/coreapi/linphonecall.c +++ b/coreapi/linphonecall.c @@ -1667,18 +1667,20 @@ void linphone_call_update_crypto_parameters(LinphoneCall *call, SalMediaDescript new_stream = sal_media_description_find_stream(new_md, SalProtoRtpSavp, SalAudio); if (old_stream && new_stream) { const SalStreamDescription *local_st_desc = sal_media_description_find_stream(call->localdesc, SalProtoRtpSavp, SalAudio); - int crypto_idx = find_crypto_index_from_tag(local_st_desc->crypto, new_stream->crypto_local_tag); - if (crypto_idx >= 0) { - audio_stream_enable_srtp(call->audiostream, new_stream->crypto[0].algo, local_st_desc->crypto[crypto_idx].master_key, new_stream->crypto[0].master_key); - call->audiostream_encrypted = TRUE; - } else { - ms_warning("Failed to find local crypto algo with tag: %d", new_stream->crypto_local_tag); - call->audiostream_encrypted = FALSE; - } - for (i = 0; i < SAL_CRYPTO_ALGO_MAX; i++) { - old_stream->crypto[i].tag = new_stream->crypto[i].tag; - old_stream->crypto[i].algo = new_stream->crypto[i].algo; - strncpy(old_stream->crypto[i].master_key, new_stream->crypto[i].master_key, sizeof(old_stream->crypto[i].master_key) - 1); + if (local_st_desc) { + int crypto_idx = find_crypto_index_from_tag(local_st_desc->crypto, new_stream->crypto_local_tag); + if (crypto_idx >= 0) { + audio_stream_enable_srtp(call->audiostream, new_stream->crypto[0].algo, local_st_desc->crypto[crypto_idx].master_key, new_stream->crypto[0].master_key); + call->audiostream_encrypted = TRUE; + } else { + ms_warning("Failed to find local crypto algo with tag: %d", new_stream->crypto_local_tag); + call->audiostream_encrypted = FALSE; + } + for (i = 0; i < SAL_CRYPTO_ALGO_MAX; i++) { + old_stream->crypto[i].tag = new_stream->crypto[i].tag; + old_stream->crypto[i].algo = new_stream->crypto[i].algo; + strncpy(old_stream->crypto[i].master_key, new_stream->crypto[i].master_key, sizeof(old_stream->crypto[i].master_key) - 1); + } } } @@ -1687,18 +1689,20 @@ void linphone_call_update_crypto_parameters(LinphoneCall *call, SalMediaDescript new_stream = sal_media_description_find_stream(new_md, SalProtoRtpSavp, SalVideo); if (old_stream && new_stream) { const SalStreamDescription *local_st_desc = sal_media_description_find_stream(call->localdesc, SalProtoRtpSavp, SalVideo); - int crypto_idx = find_crypto_index_from_tag(local_st_desc->crypto, new_stream->crypto_local_tag); - if (crypto_idx >= 0) { - video_stream_enable_strp(call->videostream, new_stream->crypto[0].algo, local_st_desc->crypto[crypto_idx].master_key, new_stream->crypto[0].master_key); - call->videostream_encrypted = TRUE; - } else { - ms_warning("Failed to find local crypto algo with tag: %d", new_stream->crypto_local_tag); - call->videostream_encrypted = FALSE; - } - for (i = 0; i < SAL_CRYPTO_ALGO_MAX; i++) { - old_stream->crypto[i].tag = new_stream->crypto[i].tag; - old_stream->crypto[i].algo = new_stream->crypto[i].algo; - strncpy(old_stream->crypto[i].master_key, new_stream->crypto[i].master_key, sizeof(old_stream->crypto[i].master_key) - 1); + if (local_st_desc) { + int crypto_idx = find_crypto_index_from_tag(local_st_desc->crypto, new_stream->crypto_local_tag); + if (crypto_idx >= 0) { + video_stream_enable_strp(call->videostream, new_stream->crypto[0].algo, local_st_desc->crypto[crypto_idx].master_key, new_stream->crypto[0].master_key); + call->videostream_encrypted = TRUE; + } else { + ms_warning("Failed to find local crypto algo with tag: %d", new_stream->crypto_local_tag); + call->videostream_encrypted = FALSE; + } + for (i = 0; i < SAL_CRYPTO_ALGO_MAX; i++) { + old_stream->crypto[i].tag = new_stream->crypto[i].tag; + old_stream->crypto[i].algo = new_stream->crypto[i].algo; + strncpy(old_stream->crypto[i].master_key, new_stream->crypto[i].master_key, sizeof(old_stream->crypto[i].master_key) - 1); + } } } #endif From ebfa43d5b22d986b5d0076cd04a8d0e8fbfd7fd8 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Fri, 18 Jan 2013 11:48:14 +0100 Subject: [PATCH 44/50] Updated FactoryImpl to change Neon detection in CPUs --- .../core/LinphoneCoreFactoryImpl.java | 28 ++++--------------- 1 file changed, 5 insertions(+), 23 deletions(-) diff --git a/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java b/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java index b719f0f70..04b6af1cf 100644 --- a/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java +++ b/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java @@ -20,8 +20,8 @@ package org.linphone.core; import java.io.File; import java.io.IOException; -import java.io.InputStream; +import org.linphone.CpuUtils; import org.linphone.mediastream.Version; import android.util.Log; @@ -43,6 +43,8 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory { loadOptionalLibrary("avutil"); loadOptionalLibrary("swscale"); loadOptionalLibrary("avcore"); + + System.loadLibrary("neon"); if (!hasNeonInCpuFeatures()) { boolean noNeonLibrariesLoaded = loadOptionalLibrary("avcodecnoneon"); @@ -151,28 +153,8 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory { public static boolean hasNeonInCpuFeatures() { - ProcessBuilder cmd; - boolean result = false; - - try { - String[] args = {"/system/bin/cat", "/proc/cpuinfo"}; - cmd = new ProcessBuilder(args); - - Process process = cmd.start(); - InputStream in = process.getInputStream(); - byte[] re = new byte[1024]; - while(in.read(re) != -1){ - String line = new String(re); - if (line.contains("Features")) { - result = line.contains("neon"); - break; - } - } - in.close(); - } catch(IOException ex){ - ex.printStackTrace(); - } - return result; + CpuUtils cpu = new CpuUtils(); + return cpu.isCpuNeon(); } public static boolean isArmv7() From 848c200eb156b827a1b8c1345ff357677467a8f3 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Fri, 18 Jan 2013 11:57:44 +0100 Subject: [PATCH 45/50] Add "keep_sdp_version" option. --- coreapi/linphonecall.c | 2 -- coreapi/linphonecore.c | 8 ++++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c index 663e552a9..285678f3a 100644 --- a/coreapi/linphonecall.c +++ b/coreapi/linphonecall.c @@ -1707,8 +1707,6 @@ void linphone_call_update_crypto_parameters(LinphoneCall *call, SalMediaDescript void linphone_call_update_remote_session_id_and_ver(LinphoneCall *call) { SalMediaDescription *remote_desc = sal_call_get_remote_media_description(call->op); if (remote_desc) { - ms_warning("linphone_call_update_remote_session_id_and_ver(): id=%u, ver=%u", - remote_desc->session_id, remote_desc->session_ver); call->remote_session_id = remote_desc->session_id; call->remote_session_ver = remote_desc->session_ver; } diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index 2336dbfe1..d38b681c1 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -2753,6 +2753,7 @@ int linphone_core_start_accept_call_update(LinphoneCore *lc, LinphoneCall *call) **/ int linphone_core_accept_call_update(LinphoneCore *lc, LinphoneCall *call, const LinphoneCallParams *params){ SalMediaDescription *remote_desc; + bool_t keep_sdp_version; #ifdef VIDEO_ENABLED bool_t old_has_video = call->params.has_video; #endif @@ -2762,11 +2763,10 @@ int linphone_core_accept_call_update(LinphoneCore *lc, LinphoneCall *call, const return -1; } remote_desc = sal_call_get_remote_media_description(call->op); - ms_warning("linphone_core_accept_update(): rmt_id=%u, rmt_ver=%u, call->rmt_id=%u, call->rmt_ver=%u", - remote_desc->session_id, remote_desc->session_ver, call->remote_session_id, call->remote_session_ver); - if ((remote_desc->session_id == call->remote_session_id) && (remote_desc->session_ver == call->remote_session_ver)) { + keep_sdp_version = lp_config_get_int(lc->config, "sip", "keep_sdp_version", 0); + if (keep_sdp_version &&(remote_desc->session_id == call->remote_session_id) && (remote_desc->session_ver == call->remote_session_ver)) { /* Remote has sent an INVITE with the same SDP as before, so send a 200 OK with the same SDP as before. */ - ms_warning("Send same SDP as before!"); + ms_warning("SDP version has not changed, send same SDP as before."); sal_call_accept(call->op); linphone_call_set_state(call,LinphoneCallStreamsRunning,"Connected (streams running)"); return 0; From ade529b01ce4d8554635781846c8dc029426b49b Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Fri, 18 Jan 2013 12:06:43 +0100 Subject: [PATCH 46/50] Update ms2 submodule. --- mediastreamer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediastreamer2 b/mediastreamer2 index d5811e376..2b00fd885 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit d5811e376759433da3c19585b2d8d0329e1c06b2 +Subproject commit 2b00fd8850748f53404a109473f0243b591ae87b From 2c5cef3bb325535aa66cda0870b6ebb643d5cab9 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Fri, 18 Jan 2013 16:04:58 +0100 Subject: [PATCH 47/50] Fix library dependencies linking on Debian based systems. --- configure.ac | 13 +++++++++++++ console/Makefile.am | 7 ++----- gtk/Makefile.am | 6 ++---- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index 1d8f92278..10370968c 100644 --- a/configure.ac +++ b/configure.ac @@ -84,6 +84,19 @@ IT_PROG_INTLTOOL([0.40], [no-xml]) AM_CONDITIONAL(BUILD_TESTS,test x$build_tests != xno) dnl Initialize libtool LT_INIT([win32-dll shared disable-static]) +dnl Enable library dependencies linking +AC_ARG_ENABLE(deplibs-link, + [AS_HELP_STRING([--disable-deplibs-link ], [Disable library dependencies linking (might break builds)])], + [enable_deplibs_linking="$enableval"], + [enable_deplibs_linking="yes"]) +AC_MSG_NOTICE([Enable library dependencies linking: $enable_interlib_deps]) +if test "${enable_deplibs_linking}" == "yes"; then + link_all_deplibs=yes + link_all_deplibs_CXX=yes +else + link_all_deplibs=no + link_all_deplibs_CXX=no +fi AC_CONFIG_COMMANDS([libtool-hacking],[ if test "$mingw_found" = "yes" ; then diff --git a/console/Makefile.am b/console/Makefile.am index 23a7635d1..82ce998e5 100644 --- a/console/Makefile.am +++ b/console/Makefile.am @@ -26,11 +26,8 @@ endif linphonec_SOURCES=linphonec.c linphonec.h commands.c linphonec_CFLAGS=$(COMMON_CFLAGS) $(CONSOLE_FLAGS) -linphonec_LDADD=$(top_builddir)/coreapi/liblinphone.la $(READLINE_LIBS) \ - $(MEDIASTREAMER_LIBS) \ - $(ORTP_LIBS) \ - $(SPEEX_LIBS) \ - $(OSIP_LIBS) \ +linphonec_LDADD=$(top_builddir)/coreapi/liblinphone.la \ + $(READLINE_LIBS) \ $(X11_LIBS) if BUILD_WIN32 diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 78f5d0de7..1caded7c6 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -53,10 +53,8 @@ linphone_SOURCES+= \ setupwizard.c endif -linphone_LDADD=$(ORTP_LIBS) \ - $(MEDIASTREAMER_LIBS) \ - $(top_builddir)/coreapi/liblinphone.la \ - $(LIBGTK_LIBS) $(NOTIFY1_LIBS) $(NOTIFY4_LIBS) $(LIBGTKMAC_LIBS) $(INTLLIBS) +linphone_LDADD= $(top_builddir)/coreapi/liblinphone.la \ + $(LIBGTK_LIBS) $(NOTIFY1_LIBS) $(NOTIFY4_LIBS) $(LIBGTKMAC_LIBS) $(INTLLIBS) if BUILD_WIN32 From 622af47cb2f519b832a72049ddd2fdc4ea32cce4 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Mon, 21 Jan 2013 11:25:38 +0100 Subject: [PATCH 48/50] Add tcp_tls_keepalive configuration option to (de)activate SIP keepalive for TCP/TLS. --- coreapi/linphonecore.c | 4 +++- coreapi/private.h | 1 + coreapi/sal.h | 1 + coreapi/sal_eXosip2.c | 24 ++++++++++++++++++++---- coreapi/sal_eXosip2.h | 2 ++ 5 files changed, 27 insertions(+), 5 deletions(-) diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index 28488e1dd..3904afc9b 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -635,7 +635,8 @@ static void sip_config_read(LinphoneCore *lc) lc->sip_conf.ping_with_options=lp_config_get_int(lc->config,"sip","ping_with_options",1); lc->sip_conf.auto_net_state_mon=lp_config_get_int(lc->config,"sip","auto_net_state_mon",1); lc->sip_conf.keepalive_period=lp_config_get_int(lc->config,"sip","keepalive_period",10000); - sal_set_keepalive_period(lc->sal,lc->sip_conf.keepalive_period); + lc->sip_conf.tcp_tls_keepalive=lp_config_get_int(lc->config,"sip","tcp_tls_keepalive",0); + linphone_core_enable_keep_alive(lc, (lc->sip_conf.keepalive_period > 0)); sal_use_one_matching_codec_policy(lc->sal,lp_config_get_int(lc->config,"sip","only_one_codec",0)); sal_use_double_registrations(lc->sal,lp_config_get_int(lc->config,"sip","use_double_registrations",1)); sal_use_dates(lc->sal,lp_config_get_int(lc->config,"sip","put_date",0)); @@ -5170,6 +5171,7 @@ const char *linphone_error_to_string(LinphoneReason err){ */ void linphone_core_enable_keep_alive(LinphoneCore* lc,bool_t enable) { if (enable > 0) { + sal_use_tcp_tls_keepalive(lc->sal,lc->sip_conf.tcp_tls_keepalive); sal_set_keepalive_period(lc->sal,lc->sip_conf.keepalive_period); } else { sal_set_keepalive_period(lc->sal,0); diff --git a/coreapi/private.h b/coreapi/private.h index 5c09974b7..edb717ae3 100644 --- a/coreapi/private.h +++ b/coreapi/private.h @@ -399,6 +399,7 @@ typedef struct sip_config bool_t register_only_when_network_is_up; bool_t ping_with_options; bool_t auto_net_state_mon; + bool_t tcp_tls_keepalive; } sip_config_t; typedef struct rtp_config diff --git a/coreapi/sal.h b/coreapi/sal.h index 9c0ceca76..ba6daa221 100644 --- a/coreapi/sal.h +++ b/coreapi/sal.h @@ -343,6 +343,7 @@ ortp_socket_t sal_get_socket(Sal *ctx); void sal_set_user_agent(Sal *ctx, const char *user_agent); /*keepalive period in ms*/ void sal_set_keepalive_period(Sal *ctx,unsigned int value); +void sal_use_tcp_tls_keepalive(Sal *ctx, bool_t enabled); /** * returns keepalive period in ms * 0 desactiaved diff --git a/coreapi/sal_eXosip2.c b/coreapi/sal_eXosip2.c index 93686a75e..d8332621d 100644 --- a/coreapi/sal_eXosip2.c +++ b/coreapi/sal_eXosip2.c @@ -397,7 +397,8 @@ int sal_listen_port(Sal *ctx, const char *addr, int port, SalTransport tr, int i bool_t ipv6; int proto=IPPROTO_UDP; int keepalive = ctx->keepalive_period; - + + ctx->transport = tr; switch (tr) { case SalTransportUDP: proto=IPPROTO_UDP; @@ -406,7 +407,7 @@ int sal_listen_port(Sal *ctx, const char *addr, int port, SalTransport tr, int i case SalTransportTCP: case SalTransportTLS: proto= IPPROTO_TCP; - keepalive=-1; + if (!ctx->tcp_tls_keepalive) keepalive=-1; eXosip_set_option (EXOSIP_OPT_UDP_KEEP_ALIVE,&keepalive); set_tls_options(ctx); break; @@ -2512,9 +2513,24 @@ void sal_address_destroy(SalAddress *u){ osip_from_free((osip_from_t*)u); } +void sal_use_tcp_tls_keepalive(Sal *ctx, bool_t enabled) { + ctx->tcp_tls_keepalive = enabled; +} + void sal_set_keepalive_period(Sal *ctx,unsigned int value) { - ctx->keepalive_period=value; - eXosip_set_option (EXOSIP_OPT_UDP_KEEP_ALIVE, &value); + switch (ctx->transport) { + case SalTransportUDP: + ctx->keepalive_period = value; + break; + case SalTransportTCP: + case SalTransportTLS: + if (ctx->tcp_tls_keepalive) ctx->keepalive_period = value; + else ctx->keepalive_period = -1; + break; + default: + break; + } + eXosip_set_option (EXOSIP_OPT_UDP_KEEP_ALIVE, &ctx->keepalive_period); } unsigned int sal_get_keepalive_period(Sal *ctx) { return ctx->keepalive_period; diff --git a/coreapi/sal_eXosip2.h b/coreapi/sal_eXosip2.h index 89ac93abf..81e3ed9a7 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; + SalTransport transport; MSList *calls; /*MSList of SalOp */ MSList *registers;/*MSList of SalOp */ MSList *out_subscribes;/*MSList of SalOp */ @@ -51,6 +52,7 @@ struct Sal{ bool_t verify_server_cn; bool_t expire_old_contact; bool_t add_dates; + bool_t tcp_tls_keepalive; }; struct SalOp{ From a6c141062397872c64e17ad6b8360888d3c3e6f0 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Mon, 21 Jan 2013 12:01:41 +0100 Subject: [PATCH 49/50] Use random port instead of fixed 15060 for tunnel transport. --- coreapi/TunnelManager.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coreapi/TunnelManager.cc b/coreapi/TunnelManager.cc index 5b1b6dddb..4828bf114 100644 --- a/coreapi/TunnelManager.cc +++ b/coreapi/TunnelManager.cc @@ -257,7 +257,7 @@ void TunnelManager::processTunnelEvent(const Event &ev){ //force transport to udp LCSipTransports lTransport; - lTransport.udp_port=15060; + lTransport.udp_port=(0xDFFF&random())+1024; lTransport.tcp_port=0; lTransport.tls_port=0; lTransport.dtls_port=0; From a2019a94f33c22668ed0ab3c7f849564206aadb0 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Mon, 21 Jan 2013 12:02:40 +0100 Subject: [PATCH 50/50] Update ms2 submodule. --- mediastreamer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediastreamer2 b/mediastreamer2 index 2b00fd885..3a231efb8 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 2b00fd8850748f53404a109473f0243b591ae87b +Subproject commit 3a231efb89305d775ab39a6866ee981a891aed7e