diff --git a/NEWS b/NEWS index ceab2b179..c34031a76 100644 --- a/NEWS +++ b/NEWS @@ -3,8 +3,10 @@ linphone-3.3.0 -- ????????? * Internal refactoring of liblinphone (code factorisation, encapsulation of signaling) * enhancements made to presence support (SIP/SIMPLE) - -linphone-3.2.2 -- ????????? + * new icons + * new tabbed ui + * be nat friendly using OPTIONS request and using received,rport from + responses. * improve bitrate usage of speex codec * allow speex to run with vbr (variable bit rate) mode * add speex/32000 (ultra wide band speex codec) diff --git a/autogen.sh b/autogen.sh index a8bd1ca1e..f32cf85f3 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,6 +1,6 @@ #!/bin/sh -AM_VERSION="1.10" +#AM_VERSION="1.10" if ! type aclocal-$AM_VERSION 1>/dev/null 2>&1; then # automake-1.10 (recommended) is not available on Fedora 8 AUTOMAKE=automake diff --git a/configure.in b/configure.in index fb1ce96c7..b96111c88 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([linphone],[3.2.99.1],[linphone-developers@nongnu.org]) +AC_INIT([linphone],[3.2.99.4],[linphone-developers@nongnu.org]) AC_CANONICAL_SYSTEM dnl Source packaging numbers diff --git a/coreapi/callbacks.c b/coreapi/callbacks.c index 03941be15..cdb180428 100644 --- a/coreapi/callbacks.c +++ b/coreapi/callbacks.c @@ -267,6 +267,7 @@ static void call_failure(SalOp *op, SalError error, SalReason sr, const char *de /*char *retrymsg=_("%s. Retry after %i minute(s).");*/ char *msg600=_("User does not want to be disturbed."); char *msg603=_("Call declined."); + char *msg=NULL; LinphoneCall *call=lc->call; if (sal_op_get_user_pointer(op)!=lc->call){ @@ -280,36 +281,43 @@ static void call_failure(SalOp *op, SalError error, SalReason sr, const char *de lc->vtable.display_status(lc,_("No response.")); }else if (error==SalErrorProtocol){ if (lc->vtable.display_status) - lc->vtable.display_status(lc, details ? details : _("Error.")); + lc->vtable.display_status(lc, details ? details : _("Protocol error.")); }else if (error==SalErrorFailure){ switch(sr){ case SalReasonDeclined: + msg=msg603; if (lc->vtable.display_status) lc->vtable.display_status(lc,msg603); break; case SalReasonBusy: + msg=msg486; if (lc->vtable.display_status) lc->vtable.display_status(lc,msg486); break; case SalReasonRedirect: + msg=_("Redirected"); if (lc->vtable.display_status) - lc->vtable.display_status(lc,_("Redirected")); + lc->vtable.display_status(lc,msg); break; case SalReasonTemporarilyUnavailable: + msg=msg480; if (lc->vtable.display_status) lc->vtable.display_status(lc,msg480); break; case SalReasonNotFound: + msg=_("Not found"); if (lc->vtable.display_status) - lc->vtable.display_status(lc,_("Not found")); + lc->vtable.display_status(lc,msg); break; case SalReasonDoNotDisturb: + msg=msg600; if (lc->vtable.display_status) lc->vtable.display_status(lc,msg600); break; case SalReasonMedia: + msg=_("No common codecs"); if (lc->vtable.display_status) - lc->vtable.display_status(lc,_("No common codecs")); + lc->vtable.display_status(lc,msg); break; default: if (lc->vtable.display_status) @@ -323,7 +331,8 @@ static void call_failure(SalOp *op, SalError error, SalReason sr, const char *de linphone_core_stop_media_streams(lc,call); if (call!=NULL) { linphone_call_destroy(call); - gstate_new_state(lc, GSTATE_CALL_ERROR, NULL); + if (sr!=SalReasonDeclined) gstate_new_state(lc, GSTATE_CALL_ERROR, msg); + else gstate_new_state(lc, GSTATE_CALL_END, NULL); lc->call=NULL; } } diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index e6df7ee17..eb2a58f93 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -84,6 +84,7 @@ static SalMediaDescription *create_local_media_description(LinphoneCore *lc, md->nstreams=1; strncpy(md->addr,localip,sizeof(md->addr)); strncpy(md->username,username,sizeof(md->username)); + md->bandwidth=linphone_core_get_download_bandwidth(lc); /*set audio capabilities */ strncpy(md->streams[0].addr,localip,sizeof(md->streams[0].addr)); md->streams[0].port=linphone_core_get_audio_port(lc); @@ -715,13 +716,21 @@ static PayloadType * find_payload(RtpProfile *prof, const char *mime_type, int c it=rtp_profile_get_payload(prof,i); if (it!=NULL && strcasecmp(mime_type,it->mime_type)==0 && (clock_rate==it->clock_rate || clock_rate<=0) ){ - if ( (recv_fmtp && it->recv_fmtp && strcasecmp(recv_fmtp,it->recv_fmtp)==0) || + if ( (recv_fmtp && it->recv_fmtp && strstr(recv_fmtp,it->recv_fmtp)!=NULL) || (recv_fmtp==NULL && it->recv_fmtp==NULL) ){ /*exact match*/ + if (recv_fmtp) payload_type_set_recv_fmtp(it,recv_fmtp); return it; - }else candidate=it; + }else { + if (candidate){ + if (it->recv_fmtp==NULL) candidate=it; + }else candidate=it; + } } } + if (candidate && recv_fmtp){ + payload_type_set_recv_fmtp(candidate,recv_fmtp); + } return candidate; } @@ -1161,8 +1170,7 @@ void linphone_core_get_local_ip(LinphoneCore *lc, const char *dest, char *result strncpy(result,linphone_core_get_nat_address(lc),LINPHONE_IPADDR_SIZE); return; } - if (dest==NULL) dest="87.98.157.38"; /*a public IP address*/ - if (linphone_core_get_local_ip_for(dest,result)==0) + if (linphone_core_get_local_ip_for(lc->sip_conf.ipv6_enabled ? AF_INET6 : AF_INET,dest,result)==0) return; /*else fallback to SAL routine that will attempt to find the most realistic interface */ sal_get_default_local_ip(lc->sal,lc->sip_conf.ipv6_enabled ? AF_INET6 : AF_INET,result,LINPHONE_IPADDR_SIZE); @@ -1514,14 +1522,15 @@ static void monitor_network_state(LinphoneCore *lc, time_t curtime){ /* only do the network up checking every five seconds */ if (last_check==0 || (curtime-last_check)>=5){ - sal_get_default_local_ip(lc->sal, - lc->sip_conf.ipv6_enabled ? AF_INET6 : AF_INET, - result,LINPHONE_IPADDR_SIZE); + linphone_core_get_local_ip_for(lc->sip_conf.ipv6_enabled ? AF_INET6 : AF_INET,NULL,result); if (strcmp(result,"::1")!=0 && strcmp(result,"127.0.0.1")!=0){ new_status=TRUE; }else new_status=FALSE; last_check=curtime; if (new_status!=last_status) { + if (new_status){ + ms_message("New local ip address is %s",result); + } set_network_reachable(lc,new_status); last_status=new_status; } @@ -1842,14 +1851,7 @@ static char *get_fixed_contact(LinphoneCore *lc, LinphoneCall *call , LinphonePr if (call->op && sal_op_get_contact(call->op)!=NULL){ return NULL; } - /*if using a proxy, use the contact address as guessed with the REGISTERs*/ - if (dest_proxy && dest_proxy->op){ - const char *fixed_contact=sal_op_get_contact(dest_proxy->op); - if (fixed_contact) { - ms_message("Contact has been fixed using proxy to %s",fixed_contact); - return ms_strdup(fixed_contact); - } - } + /* if the ping OPTIONS request succeeded use the contact guessed from the received, rport*/ if (call->ping_op){ @@ -1859,6 +1861,15 @@ static char *get_fixed_contact(LinphoneCore *lc, LinphoneCall *call , LinphonePr return ms_strdup(guessed); } } + + /*if using a proxy, use the contact address as guessed with the REGISTERs*/ + if (dest_proxy && dest_proxy->op){ + const char *fixed_contact=sal_op_get_contact(dest_proxy->op); + if (fixed_contact) { + ms_message("Contact has been fixed using proxy to %s",fixed_contact); + return ms_strdup(fixed_contact); + } + } ctt=linphone_core_get_primary_contact_parsed(lc); @@ -2147,11 +2158,12 @@ static void post_configure_audio_streams(LinphoneCore *lc){ } } -static RtpProfile *make_profile(LinphoneCore *lc, const SalStreamDescription *desc, int *used_pt){ +static RtpProfile *make_profile(LinphoneCore *lc, const SalMediaDescription *md, const SalStreamDescription *desc, int *used_pt){ int bw; const MSList *elem; RtpProfile *prof=rtp_profile_new("Call profile"); bool_t first=TRUE; + int remote_bw=0; for(elem=desc->payloads;elem!=NULL;elem=elem->next){ PayloadType *pt=(PayloadType*)elem->data; @@ -2163,9 +2175,18 @@ static RtpProfile *make_profile(LinphoneCore *lc, const SalStreamDescription *de *used_pt=payload_type_get_number(pt); first=FALSE; } + if (desc->bandwidth>0) remote_bw=desc->bandwidth; + else if (md->bandwidth>0) { + /*case where b=AS is given globally, not per stream*/ + remote_bw=md->bandwidth; + if (desc->type==SalVideo){ + remote_bw-=lc->audio_bw; + } + } + if (desc->type==SalAudio){ - bw=get_min_bandwidth(lc->up_audio_bw,desc->bandwidth); - }else bw=get_min_bandwidth(lc->up_video_bw,desc->bandwidth); + bw=get_min_bandwidth(lc->up_audio_bw,remote_bw); + }else bw=get_min_bandwidth(lc->up_video_bw,remote_bw); if (bw>0) pt->normal_bitrate=bw*1000; else if (desc->type==SalAudio){ pt->normal_bitrate=-1; @@ -2195,7 +2216,7 @@ void linphone_core_start_media_streams(LinphoneCore *lc, LinphoneCall *call){ const SalStreamDescription *stream=sal_media_description_find_stream(call->resultdesc, SalProtoRtpAvp,SalAudio); if (stream){ - call->audio_profile=make_profile(lc,stream,&used_pt); + call->audio_profile=make_profile(lc,call->resultdesc,stream,&used_pt); if (!lc->use_files){ MSSndCard *playcard=lc->sound_conf.play_sndcard; MSSndCard *captcard=lc->sound_conf.capt_sndcard; @@ -2245,7 +2266,7 @@ void linphone_core_start_media_streams(LinphoneCore *lc, LinphoneCall *call){ } if (stream && (lc->video_conf.display || lc->video_conf.capture)) { const char *addr=stream->addr[0]!='\0' ? stream->addr : call->resultdesc->addr; - call->video_profile=make_profile(lc,stream,&used_pt); + call->video_profile=make_profile(lc,call->resultdesc,stream,&used_pt); video_stream_set_sent_video_size(lc->videostream,linphone_core_get_preferred_video_size(lc)); video_stream_enable_self_view(lc->videostream,lc->video_conf.selfview); if (lc->video_conf.display && lc->video_conf.capture) @@ -2323,6 +2344,7 @@ void linphone_core_stop_media_streams(LinphoneCore *lc, LinphoneCall *call){ int linphone_core_accept_call(LinphoneCore *lc, const char *url) { LinphoneCall *call=lc->call; + LinphoneProxyConfig *cfg=NULL; const char *contact=NULL; if (call==NULL){ @@ -2341,9 +2363,10 @@ int linphone_core_accept_call(LinphoneCore *lc, const char *url) ms_message("ring stopped"); lc->ringstream=NULL; } - + + linphone_core_get_default_proxy(lc,&cfg); /*try to be best-effort in giving real local or routable contact address*/ - contact=get_fixed_contact(lc,call,NULL); + contact=get_fixed_contact(lc,call,cfg); if (contact) sal_op_set_contact(call->op,contact); @@ -3559,6 +3582,13 @@ void linphone_core_set_network_reachable(LinphoneCore* lc,bool_t isReachable) { } set_network_reachable(lc,isReachable); } + +bool_t linphone_core_is_network_reachabled(LinphoneCore* lc) { + return lc->network_reachable; +} +ortp_socket_t linphone_core_get_sip_socket(LinphoneCore *lc){ + return sal_get_socket(lc->sal); +} /** * Destroys a LinphoneCore * diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h index 46d9e2944..945ea25ea 100644 --- a/coreapi/linphonecore.h +++ b/coreapi/linphonecore.h @@ -607,6 +607,8 @@ int linphone_core_get_sip_port(LinphoneCore *lc); void linphone_core_set_sip_port(LinphoneCore *lc,int port); +ortp_socket_t linphone_core_get_sip_socket(LinphoneCore *lc); + void linphone_core_set_inc_timeout(LinphoneCore *lc, int seconds); int linphone_core_get_inc_timeout(LinphoneCore *lc); @@ -752,6 +754,10 @@ void linphone_core_set_mtu(LinphoneCore *lc, int mtu); * */ void linphone_core_set_network_reachable(LinphoneCore* lc,bool_t value); +/** + * return network state either as positioned by the application or by linphone + */ +bool_t linphone_core_is_network_reachabled(LinphoneCore* lc); void *linphone_core_get_user_data(LinphoneCore *lc); diff --git a/coreapi/misc.c b/coreapi/misc.c index c6e673547..86b527e94 100644 --- a/coreapi/misc.c +++ b/coreapi/misc.c @@ -38,6 +38,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #undef snprintf #include +#ifdef HAVE_GETIFADDRS +#include +#include +#endif + #if !defined(WIN32) @@ -646,7 +651,40 @@ int linphone_core_wake_up_possible_already_running_instance( return -1; } -int linphone_core_get_local_ip_for(const char *dest, char *result){ +#ifdef HAVE_GETIFADDRS + +#include +static int get_local_ip_with_getifaddrs(int type, char *address, int size) +{ + struct ifaddrs *ifp; + struct ifaddrs *ifpstart; + int ret = 0; + + if (getifaddrs(&ifpstart) < 0) { + return -1; + } + + for (ifp = ifpstart; ifp != NULL; ifp = ifp->ifa_next) { + if (ifp->ifa_addr && ifp->ifa_addr->sa_family == type + && (ifp->ifa_flags & IFF_RUNNING) && !(ifp->ifa_flags & IFF_LOOPBACK)) + { + getnameinfo(ifp->ifa_addr, + (type == AF_INET6) ? + sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in), + address, size, NULL, 0, NI_NUMERICHOST); + if (strchr(address, '%') == NULL) { /*avoid ipv6 link-local addresses */ + /*ms_message("getifaddrs() found %s",address);*/ + ret++; + } + } + } + freeifaddrs(ifpstart); + return ret; +} +#endif + + +static int get_local_ip_for_with_connect(int type, const char *dest, char *result){ int err,tmp; struct addrinfo hints; struct addrinfo *res=NULL; @@ -656,7 +694,7 @@ int linphone_core_get_local_ip_for(const char *dest, char *result){ socklen_t s; memset(&hints,0,sizeof(hints)); - hints.ai_family=PF_UNSPEC; + hints.ai_family=(type==AF_INET6) ? PF_INET6 : PF_INET; hints.ai_socktype=SOCK_DGRAM; /*hints.ai_flags=AI_NUMERICHOST|AI_CANONNAME;*/ err=getaddrinfo(dest,"5060",&hints,&res); @@ -705,3 +743,27 @@ int linphone_core_get_local_ip_for(const char *dest, char *result){ ms_message("Local interface to reach %s is %s.",dest,result); return 0; } + +int linphone_core_get_local_ip_for(int type, const char *dest, char *result){ + if (dest==NULL) { + if (type==AF_INET) + dest="87.98.157.38"; /*a public IP address*/ + else dest="2a00:1450:8002::68"; + } + strcpy(result,type==AF_INET ? "127.0.0.1" : "::1"); +#ifdef HAVE_GETIFADDRS + { + int found_ifs; + + found_ifs=get_local_ip_with_getifaddrs(type,result,LINPHONE_IPADDR_SIZE); + if (found_ifs==1){ + return 0; + }else if (found_ifs<=0){ + /*absolutely no network on this machine */ + return -1; + } + } +#endif + /*else use connect to find the best local ip address */ + return get_local_ip_for_with_connect(type,dest,result); +} diff --git a/coreapi/private.h b/coreapi/private.h index 18ed34c74..4a3c1dbaa 100644 --- a/coreapi/private.h +++ b/coreapi/private.h @@ -164,7 +164,7 @@ LinphoneFriend * linphone_friend_new_from_config_file(struct _LinphoneCore *lc, void linphone_proxy_config_update(LinphoneProxyConfig *cfg); void linphone_proxy_config_get_contact(LinphoneProxyConfig *cfg, const char **ip, int *port); LinphoneProxyConfig * linphone_core_lookup_known_proxy(LinphoneCore *lc, const LinphoneAddress *uri); -int linphone_core_get_local_ip_for(const char *dest, char *result); +int linphone_core_get_local_ip_for(int type, const char *dest, char *result); LinphoneProxyConfig *linphone_proxy_config_new_from_config_file(struct _LpConfig *config, int index); void linphone_proxy_config_write_to_config_file(struct _LpConfig* config,LinphoneProxyConfig *obj, int index); diff --git a/coreapi/sal.h b/coreapi/sal.h index 23780f6b3..882761ffb 100644 --- a/coreapi/sal.h +++ b/coreapi/sal.h @@ -107,6 +107,7 @@ typedef struct SalMediaDescription{ char addr[64]; char username[64]; int nstreams; + int bandwidth; SalStreamDescription streams[SAL_MEDIA_DESCRIPTION_MAX_STREAMS]; } SalMediaDescription; @@ -223,6 +224,7 @@ typedef struct SalAuthInfo{ void sal_set_callbacks(Sal *ctx, const SalCallbacks *cbs); int sal_listen_port(Sal *ctx, const char *addr, int port, SalTransport tr, int is_secure); +ortp_socket_t sal_get_socket(Sal *ctx); void sal_set_user_agent(Sal *ctx, const char *user_agent); void sal_use_session_timers(Sal *ctx, int expires); int sal_iterate(Sal *sal); diff --git a/coreapi/sal_eXosip2.c b/coreapi/sal_eXosip2.c index 4e0f6a05a..afbc4f85f 100644 --- a/coreapi/sal_eXosip2.c +++ b/coreapi/sal_eXosip2.c @@ -23,8 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "sal_eXosip2.h" #include "offeranswer.h" -/*this function is not declared in some versions of eXosip*/ -extern void *eXosip_call_get_reference(int cid); static void text_received(Sal *sal, eXosip_event_t *ev); @@ -44,6 +42,25 @@ void sal_get_default_local_ip(Sal *sal, int address_family,char *ip, size_t iple } } + +static SalOp * sal_find_call(Sal *sal, int cid){ + const MSList *elem; + SalOp *op; + for(elem=sal->calls;elem!=NULL;elem=elem->next){ + op=(SalOp*)elem->data; + if (op->cid==cid) return op; + } + return NULL; +} + +static void sal_add_call(Sal *sal, SalOp *op){ + sal->calls=ms_list_append(sal->calls,op); +} + +static void sal_remove_call(Sal *sal, SalOp *op){ + sal->calls=ms_list_remove(sal->calls, op); +} + static SalOp * sal_find_register(Sal *sal, int rid){ const MSList *elem; SalOp *op; @@ -164,7 +181,7 @@ void sal_op_release(SalOp *op){ } if (op->cid!=-1){ ms_message("Cleaning cid %i",op->cid); - eXosip_call_set_reference(op->cid,NULL); + sal_remove_call(op->base.root,op); } if (op->sid!=-1){ sal_remove_out_subscribe(op->base.root,op); @@ -227,12 +244,14 @@ static void _osip_trace_func(char *fi, int li, osip_trace_level_t level, char *c Sal * sal_init(){ static bool_t firsttime=TRUE; + Sal *sal; if (firsttime){ osip_trace_initialize_func (OSIP_INFO4,&_osip_trace_func); firsttime=FALSE; } eXosip_init(); - return ms_new0(Sal,1); + sal=ms_new0(Sal,1); + return sal; } void sal_uninit(Sal* sal){ @@ -295,8 +314,10 @@ int sal_listen_port(Sal *ctx, const char *addr, int port, SalTransport tr, int i bool_t ipv6; int proto=IPPROTO_UDP; - if (ctx->running) eXosip_quit(); - eXosip_init(); + if (ctx->running){ + eXosip_quit(); + eXosip_init(); + } err=0; eXosip_set_option(13,&err); /*13=EXOSIP_OPT_SRV_WITH_NAPTR, as it is an enum value, we can't use it unless we are sure of the version of eXosip, which is not the case*/ @@ -308,11 +329,23 @@ int sal_listen_port(Sal *ctx, const char *addr, int port, SalTransport tr, int i ms_fatal("SIP over TCP or TLS or DTLS is not supported yet."); return -1; } - err=eXosip_listen_addr(proto, addr, port, ipv6 ? PF_INET6 : PF_INET, 0); +#ifdef HAVE_EXOSIP_GET_SOCKET + ms_message("Exosip has socket number %i",eXosip_get_socket(proto)); +#endif + ctx->running=TRUE; return err; } +ortp_socket_t sal_get_socket(Sal *ctx){ +#ifdef HAVE_EXOSIP_GET_SOCKET + return eXosip_get_socket(IPPROTO_UDP); +#else + ms_warning("Sorry, eXosip does not have eXosip_get_socket() method"); + return -1; +#endif +} + void sal_set_user_agent(Sal *ctx, const char *user_agent){ eXosip_set_user_agent(user_agent); } @@ -337,6 +370,7 @@ static int extract_received_rport(osip_message_t *msg, const char **received, in rport=param->gvalue; if (rport && rport[0]!='\0') *rportval=atoi(rport); else *rportval=5060; + *received=via->host; } param=NULL; osip_via_param_get_byname(via,"received",¶m); @@ -381,6 +415,7 @@ static void sdp_process(SalOp *h){ offer_answer_initiate_incoming(h->base.local_media,h->base.remote_media,h->result); h->sdp_answer=media_description_to_sdp(h->result); strcpy(h->result->addr,h->base.remote_media->addr); + h->result->bandwidth=h->base.remote_media->bandwidth; for(i=0;iresult->nstreams;++i){ if (h->result->streams[i].port>0){ strcpy(h->result->streams[i].addr,h->base.remote_media->streams[i].addr); @@ -413,6 +448,7 @@ int sal_call(SalOp *h, const char *from, const char *to){ ms_error("Could not create call."); return -1; } + osip_message_set_allow(invite, "INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, NOTIFY, MESSAGE, SUBSCRIBE, INFO"); if (h->base.contact){ _osip_list_set_empty(&invite->contacts,(void (*)(void*))osip_contact_free); osip_message_set_contact(invite,h->base.contact); @@ -433,7 +469,7 @@ int sal_call(SalOp *h, const char *from, const char *to){ ms_error("Fail to send invite !"); return -1; }else{ - eXosip_call_set_reference(h->cid,h); + sal_add_call(h->base.root,h); } return 0; } @@ -588,8 +624,9 @@ int sal_call_send_dtmf(SalOp *h, char dtmf){ int sal_call_terminate(SalOp *h){ eXosip_lock(); eXosip_call_terminate(h->cid,h->did); - eXosip_call_set_reference(h->cid,NULL); eXosip_unlock(); + sal_remove_call(h->base.root,h); + h->cid=-1; return 0; } @@ -630,11 +667,7 @@ static void set_network_origin(SalOp *op, osip_message_t *req){ static SalOp *find_op(Sal *sal, eXosip_event_t *ev){ if (ev->cid>0){ -#ifdef HAVE_EXOSIP_GET_REF - return (SalOp*)eXosip_call_get_ref(ev->cid); -#else - return (SalOp*)eXosip_call_get_reference(ev->cid); -#endif + return sal_find_call(sal,ev->cid); } if (ev->rid>0){ return sal_find_register(sal,ev->rid); @@ -684,7 +717,7 @@ static void inc_new_call(Sal *sal, eXosip_event_t *ev){ op->cid=ev->cid; op->did=ev->did; - eXosip_call_set_reference(op->cid,op); + sal_add_call(op->base.root,op); sal->callbacks.call_received(op); } @@ -797,9 +830,9 @@ static int call_proceeding(Sal *sal, eXosip_event_t *ev){ static void call_ringing(Sal *sal, eXosip_event_t *ev){ sdp_message_t *sdp; - SalOp *op; + SalOp *op=find_op(sal,ev); if (call_proceeding(sal, ev)==-1) return; - op=(SalOp*)ev->external_reference; + sdp=eXosip_get_sdp_info(ev->response); if (sdp){ op->base.remote_media=sal_media_description_new(); @@ -840,22 +873,25 @@ static void call_accepted(Sal *sal, eXosip_event_t *ev){ } static void call_terminated(Sal *sal, eXosip_event_t *ev){ - char *from; + char *from=NULL; SalOp *op=find_op(sal,ev); if (op==NULL){ ms_warning("Call terminated for already closed call ?"); return; } - osip_from_to_str(ev->request->from,&from); - eXosip_call_set_reference(ev->cid,NULL); + if (ev->request){ + osip_from_to_str(ev->request->from,&from); + } + sal_remove_call(sal,op); op->cid=-1; - sal->callbacks.call_terminated(op,from); - osip_free(from); + sal->callbacks.call_terminated(op,from!=NULL ? from : sal_op_get_from(op)); + if (from) osip_free(from); } static void call_released(Sal *sal, eXosip_event_t *ev){ SalOp *op=find_op(sal,ev); if (op==NULL){ + ms_warning("No op associated to this call_released()"); return; } op->cid=-1; @@ -1366,7 +1402,8 @@ static void other_request_reply(Sal *sal,eXosip_event_t *ev){ } if (ev->response){ update_contact_from_response(op,ev->response); - sal->callbacks.ping_reply(op); + if (ev->request && strcmp(osip_message_get_method(ev->request),"OPTIONS")==0) + sal->callbacks.ping_reply(op); } } @@ -1394,6 +1431,10 @@ static bool_t process_event(Sal *sal, eXosip_event_t *ev){ ms_message("CALL_REQUESTFAILURE or GLOBALFAILURE or SERVERFAILURE\n"); return call_failure(sal,ev); break; + case EXOSIP_CALL_RELEASED: + ms_message("CALL_RELEASED\n"); + call_released(sal, ev); + break; case EXOSIP_CALL_INVITE: ms_message("CALL_NEW\n"); inc_new_call(sal,ev); @@ -1458,10 +1499,6 @@ static bool_t process_event(Sal *sal, eXosip_event_t *ev){ case EXOSIP_SUBSCRIPTION_GLOBALFAILURE: sal_exosip_subscription_closed(sal,ev); break; - case EXOSIP_CALL_RELEASED: - ms_message("CALL_RELEASED\n"); - call_released(sal, ev); - break; case EXOSIP_REGISTRATION_FAILURE: ms_message("REGISTRATION_FAILURE\n"); return registration_failure(sal,ev); @@ -1484,6 +1521,7 @@ static bool_t process_event(Sal *sal, eXosip_event_t *ev){ if (ev->response && (ev->response->status_code == 407 || ev->response->status_code == 401)){ return process_authentication(sal,ev); } + other_request_reply(sal,ev); break; default: ms_message("Unhandled exosip event ! %i",ev->type); diff --git a/coreapi/sal_eXosip2.h b/coreapi/sal_eXosip2.h index 1dd11e6ae..0df6023a6 100644 --- a/coreapi/sal_eXosip2.h +++ b/coreapi/sal_eXosip2.h @@ -30,6 +30,7 @@ int sdp_to_media_description(sdp_message_t *sdp, SalMediaDescription *desc); struct Sal{ SalCallbacks callbacks; + MSList *calls; /*MSList of SalOp */ MSList *registers;/*MSList of SalOp */ MSList *out_subscribes;/*MSList of SalOp */ MSList *in_subscribes;/*MSList of SalOp */ diff --git a/coreapi/sal_eXosip2_presence.c b/coreapi/sal_eXosip2_presence.c index 355590710..9be8a698f 100644 --- a/coreapi/sal_eXosip2_presence.c +++ b/coreapi/sal_eXosip2_presence.c @@ -101,9 +101,11 @@ int sal_text_send(SalOp *op, const char *from, const char *to, const char *msg){ eXosip_unlock(); return -1; } - osip_free(sip->sip_method); //change the sip_message to be a MESSAGE ... + osip_free(osip_message_get_method(sip)); osip_message_set_method(sip,osip_strdup("MESSAGE")); + osip_free(osip_cseq_get_method(osip_message_get_cseq(sip))); + osip_cseq_set_method(osip_message_get_cseq(sip),osip_strdup("MESSAGE")); osip_message_set_content_type(sip,"text/plain"); osip_message_set_body(sip,msg,strlen(msg)); eXosip_message_send_request(sip); diff --git a/coreapi/sal_eXosip2_sdp.c b/coreapi/sal_eXosip2_sdp.c index 580428765..2165708b1 100644 --- a/coreapi/sal_eXosip2_sdp.c +++ b/coreapi/sal_eXosip2_sdp.c @@ -125,6 +125,8 @@ static sdp_message_t *create_generic_sdp(const SalMediaDescription *desc) osip_strdup ("IN"), inet6 ? osip_strdup ("IP6") : osip_strdup ("IP4"), osip_strdup (desc->addr), NULL, NULL); sdp_message_t_time_descr_add (local, osip_strdup ("0"), osip_strdup ("0")); + if (desc->bandwidth>0) sdp_message_b_bandwidth_add (local, -1, osip_strdup ("AS"), + int_2char(desc->bandwidth)); return local; } @@ -234,6 +236,10 @@ int sdp_to_media_description(sdp_message_t *msg, SalMediaDescription *desc){ addr=sdp_message_c_addr_get (msg, -1, 0); if (addr) strncpy(desc->addr,addr,sizeof(desc->addr)); + for(j=0;(sbw=sdp_message_bandwidth_get(msg,-1,j))!=NULL;++j){ + if (strcasecmp(sbw->b_bwtype,"AS")==0) desc->bandwidth=atoi(sbw->b_bandwidth); + } + /* for each m= line */ for (i=0; !sdp_message_endof_media (msg, i) && iCall ended.")); @@ -208,6 +208,5 @@ void linphone_gtk_mute_toggled(GtkToggleButton *button){ void linphone_gtk_enable_mute_button(GtkToggleButton *button, gboolean sensitive){ gtk_widget_set_sensitive(GTK_WIDGET(button),sensitive); - gtk_object_set(GTK_OBJECT(button),"gtk-button-images",TRUE,NULL); linphone_gtk_draw_mute_button(button,FALSE); } diff --git a/gtk-glade/linphone.ico b/gtk-glade/linphone.ico index 7232763bb..2633d58f3 100755 Binary files a/gtk-glade/linphone.ico and b/gtk-glade/linphone.ico differ diff --git a/gtk-glade/main.c b/gtk-glade/main.c index 85a354d40..364accbb3 100644 --- a/gtk-glade/main.c +++ b/gtk-glade/main.c @@ -662,6 +662,8 @@ static gboolean linphone_gtk_auto_answer(GtkWidget *incall_window){ void linphone_gtk_set_audio_video(){ linphone_core_enable_video(linphone_gtk_get_core(),TRUE,TRUE); + linphone_core_enable_video_preview(linphone_gtk_get_core(), + linphone_gtk_get_ui_config_int("videoselfview",VIDEOSELFVIEW_DEFAULT)); } void linphone_gtk_set_audio_only(){ @@ -690,8 +692,10 @@ void linphone_gtk_used_identity_changed(GtkWidget *w){ static void linphone_gtk_show_main_window(){ GtkWidget *w=linphone_gtk_get_main_window(); LinphoneCore *lc=linphone_gtk_get_core(); - linphone_core_enable_video_preview(lc,linphone_gtk_get_ui_config_int("videoselfview", - VIDEOSELFVIEW_DEFAULT)); + if (linphone_core_video_enabled(lc)){ + linphone_core_enable_video_preview(lc,linphone_gtk_get_ui_config_int("videoselfview", + VIDEOSELFVIEW_DEFAULT)); + } gtk_widget_show(w); gtk_window_present(GTK_WINDOW(w)); } @@ -1048,14 +1052,16 @@ static void linphone_gtk_configure_main_window(){ static const char *stop_call_icon; static const char *search_icon; static gboolean update_check_menu; + static gboolean buttons_have_borders; GtkWidget *w=linphone_gtk_get_main_window(); if (!config_loaded){ title=linphone_gtk_get_ui_config("title","Linphone"); home=linphone_gtk_get_ui_config("home","http://www.linphone.org"); - start_call_icon=linphone_gtk_get_ui_config("start_call_icon","green.png"); - stop_call_icon=linphone_gtk_get_ui_config("stop_call_icon","red.png"); + start_call_icon=linphone_gtk_get_ui_config("start_call_icon","startcall-green.png"); + stop_call_icon=linphone_gtk_get_ui_config("stop_call_icon","stopcall-red.png"); search_icon=linphone_gtk_get_ui_config("directory_search_icon",NULL); update_check_menu=linphone_gtk_get_ui_config_int("update_check_menu",0); + buttons_have_borders=linphone_gtk_get_ui_config_int("buttons_border",1); config_loaded=TRUE; } linphone_gtk_configure_window(w,"main_window"); @@ -1068,11 +1074,15 @@ static void linphone_gtk_configure_main_window(){ if (start_call_icon){ GdkPixbuf *pbuf=create_pixbuf(start_call_icon); gtk_image_set_from_pixbuf(GTK_IMAGE(linphone_gtk_get_widget(w,"start_call_icon")),pbuf); + if (buttons_have_borders) + gtk_button_set_relief(GTK_BUTTON(linphone_gtk_get_widget(w,"start_call")),GTK_RELIEF_NORMAL); g_object_unref(G_OBJECT(pbuf)); } if (stop_call_icon){ GdkPixbuf *pbuf=create_pixbuf(stop_call_icon); gtk_image_set_from_pixbuf(GTK_IMAGE(linphone_gtk_get_widget(w,"terminate_call_icon")),pbuf); + if (buttons_have_borders) + gtk_button_set_relief(GTK_BUTTON(linphone_gtk_get_widget(w,"terminate_call")),GTK_RELIEF_NORMAL); g_object_unref(G_OBJECT(pbuf)); } if (search_icon){ @@ -1086,6 +1096,20 @@ static void linphone_gtk_configure_main_window(){ tmp=g_strdup(home); g_object_set_data(G_OBJECT(menu_item),"home",tmp); } + { + GdkPixbuf *pbuf=create_pixbuf("contact-orange.png"); + if (pbuf) { + gtk_image_set_from_pixbuf(GTK_IMAGE(linphone_gtk_get_widget(w,"contact_tab_icon")),pbuf); + g_object_unref(G_OBJECT(pbuf)); + } + } + { + GdkPixbuf *pbuf=create_pixbuf("dialer-orange.png"); + if (pbuf) { + gtk_image_set_from_pixbuf(GTK_IMAGE(linphone_gtk_get_widget(w,"keypad_tab_icon")),pbuf); + g_object_unref(G_OBJECT(pbuf)); + } + } if (!linphone_gtk_can_manage_accounts()) gtk_widget_hide(linphone_gtk_get_widget(w,"run_assistant")); if (update_check_menu){ @@ -1206,6 +1230,7 @@ int main(int argc, char *argv[]){ const char *config_file; const char *factory_config_file; const char *lang; + GtkSettings *settings; g_thread_init(NULL); gdk_threads_init(); @@ -1252,6 +1277,9 @@ int main(int argc, char *argv[]){ gdk_threads_leave(); return -1; } + settings=gtk_settings_get_default(); + g_object_set(settings, "gtk-menu-images", TRUE, NULL); + g_object_set(settings, "gtk-button-images", TRUE, NULL); #ifdef WIN32 if (workingdir!=NULL) _chdir(workingdir); diff --git a/gtk-glade/main.glade b/gtk-glade/main.glade index ee3183636..b858892fb 100644 --- a/gtk-glade/main.glade +++ b/gtk-glade/main.glade @@ -285,6 +285,7 @@ True True + True Enter username, phone number, or full sip address ● @@ -709,9 +710,26 @@ Fiber Channel - + True - Contacts + + + True + gtk-missing-image + + + 0 + + + + + True + Contacts + + + 1 + + False @@ -733,270 +751,306 @@ Fiber Channel 0 0 - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 4 - 4 - 4 - 20 - 10 - True + 0 - - D + True - True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 4 + 4 + 4 + True + + + D + 50 + 50 + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 3 + 4 + 3 + 4 + GTK_FILL + + + + + + # + 50 + 50 + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 2 + 3 + 3 + 4 + GTK_FILL + + + + + + 0 + 50 + 50 + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 1 + 2 + 3 + 4 + GTK_FILL + + + + + + * + 50 + 50 + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 3 + 4 + GTK_FILL + + + + + + C + 50 + 50 + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 3 + 4 + 2 + 3 + GTK_FILL + + + + + + 9 + 50 + 50 + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 2 + 3 + 2 + 3 + GTK_FILL + + + + + + 8 + 50 + 50 + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 1 + 2 + 2 + 3 + GTK_FILL + + + + + + 7 + 50 + 50 + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 2 + 3 + GTK_FILL + + + + + + B + 50 + 50 + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 3 + 4 + 1 + 2 + GTK_FILL + + + + + + 6 + 50 + 50 + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 2 + 3 + 1 + 2 + GTK_FILL + + + + + + 5 + 50 + 50 + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + + 4 + 50 + 50 + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 1 + 2 + GTK_FILL + + + + + + A + 50 + 50 + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 3 + 4 + GTK_FILL + + + + + + 3 + 50 + 50 + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 2 + 3 + GTK_FILL + + + + + + 2 + 50 + 50 + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 1 + 2 + GTK_FILL + + + + + + 1 + 50 + 50 + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + GTK_FILL + + + - - 3 - 4 - 3 - 4 - GTK_FILL - - - - - - # - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 2 - 3 - 3 - 4 - GTK_FILL - - - - - - 0 - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 1 - 2 - 3 - 4 - GTK_FILL - - - - - - * - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 3 - 4 - GTK_FILL - - - - - - C - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 3 - 4 - 2 - 3 - GTK_FILL - - - - - - 9 - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 2 - 3 - 2 - 3 - GTK_FILL - - - - - - 8 - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 1 - 2 - 2 - 3 - GTK_FILL - - - - - - 7 - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 2 - 3 - GTK_FILL - - - - - - B - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 3 - 4 - 1 - 2 - GTK_FILL - - - - - - 6 - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 2 - 3 - 1 - 2 - GTK_FILL - - - - - - 5 - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - - 4 - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 1 - 2 - GTK_FILL - - - - - - A - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 3 - 4 - GTK_FILL - - - - - - 3 - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 2 - 3 - GTK_FILL - - - - - - 2 - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 1 - 2 - GTK_FILL - - - - - - 1 - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - GTK_FILL - - @@ -1022,9 +1076,26 @@ Fiber Channel - + True - Keypad + + + True + gtk-missing-image + + + 0 + + + + + True + Keypad + + + 1 + + 1 diff --git a/gtk-glade/parameters.glade b/gtk-glade/parameters.glade index 14e07514f..3f3671330 100644 --- a/gtk-glade/parameters.glade +++ b/gtk-glade/parameters.glade @@ -10,6 +10,7 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + vertical True @@ -19,6 +20,7 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + vertical True @@ -32,6 +34,7 @@ True + vertical True @@ -232,6 +235,7 @@ True + vertical Direct connection to the Internet @@ -251,6 +255,7 @@ True + vertical Behind NAT / Firewall (specify gateway IP below) @@ -307,6 +312,7 @@ True + vertical Behind NAT / Firewall (use STUN to resolve) @@ -415,6 +421,7 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + vertical True @@ -447,7 +454,7 @@ - gtk-media-play + gtk-media-play True True True @@ -749,6 +756,7 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + vertical True @@ -892,6 +900,7 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + vertical True @@ -1189,6 +1198,7 @@ virtual network ! True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + vertical True @@ -1203,6 +1213,7 @@ virtual network ! True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + vertical True @@ -1246,9 +1257,10 @@ Video codecs True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + vertical - gtk-go-up + gtk-go-up True True True @@ -1264,7 +1276,7 @@ Video codecs - gtk-go-down + gtk-go-down True True True @@ -1642,7 +1654,6 @@ Video codecs True gtk-apply - 4 0 diff --git a/gtk-glade/propertybox.c b/gtk-glade/propertybox.c index 4ed3f2f0e..85ebdbb8d 100644 --- a/gtk-glade/propertybox.c +++ b/gtk-glade/propertybox.c @@ -227,6 +227,17 @@ enum { CODEC_NCOLUMNS }; +static void fmtp_edited(GtkCellRendererText *renderer, gchar *path, gchar *new_text, gpointer userdata){ + GtkListStore *store=(GtkListStore*)userdata; + GtkTreeIter iter; + if (gtk_tree_model_get_iter_from_string(GTK_TREE_MODEL(store),&iter,path)){ + PayloadType *pt; + gtk_list_store_set(store,&iter,CODEC_PARAMS,new_text,-1); + gtk_tree_model_get(GTK_TREE_MODEL(store),&iter,CODEC_PRIVDATA,&pt,-1); + payload_type_set_recv_fmtp(pt,new_text); + } +} + static void linphone_gtk_init_codec_list(GtkTreeView *listview){ GtkCellRenderer *renderer; GtkTreeViewColumn *column; @@ -268,11 +279,14 @@ static void linphone_gtk_init_codec_list(GtkTreeView *listview){ "foreground",CODEC_COLOR, NULL); gtk_tree_view_append_column (listview, column); + renderer = gtk_cell_renderer_text_new (); column = gtk_tree_view_column_new_with_attributes (_("Parameters"), renderer, "text", CODEC_PARAMS, "foreground",CODEC_COLOR, + "editable",TRUE, NULL); + g_signal_connect(G_OBJECT(renderer),"edited",G_CALLBACK(fmtp_edited),store); gtk_tree_view_append_column (listview, column); /* Setup the selection handler */ select = gtk_tree_view_get_selection (listview); diff --git a/m4/exosip.m4 b/m4/exosip.m4 index ae89236c8..fc1775a42 100644 --- a/m4/exosip.m4 +++ b/m4/exosip.m4 @@ -24,9 +24,9 @@ AC_CHECK_LIB([eXosip2],[eXosip_get_version], [AC_DEFINE([HAVE_EXOSIP_GET_VERSION],[1],[Defined when eXosip_get_version is available])], [], [-losipparser2 -losip2 ]) -AC_CHECK_LIB([eXosip2],[eXosip_call_get_reference], - [], - [AC_MSG_ERROR([Could not find eXosip_call_get_reference() in eXosip2 !])], +AC_CHECK_LIB([eXosip2],[eXosip_get_socket], + [AC_DEFINE([HAVE_EXOSIP_GET_SOCKET],[1],[Defined when eXosip_get_socket is available])], + [AC_MSG_WARN([Could not find eXosip_get_socket in eXosip2 !])], [-losipparser2 -losip2 ]) dnl AC_CHECK_LIB([eXosip2],[eXosip_get_naptr], dnl [AC_DEFINE([HAVE_EXOSIP_NAPTR_SUPPORT],[1],[Defined when eXosip_get_naptr is available])], diff --git a/mediastreamer2 b/mediastreamer2 index a4d247cb5..166db20a4 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit a4d247cb5e8fc2cf04e615d5a7b90251d349b7a8 +Subproject commit 166db20a49a308e161d7b5c74fdc5aff000db9a2 diff --git a/oRTP b/oRTP index 6600413b7..92c452dcd 160000 --- a/oRTP +++ b/oRTP @@ -1 +1 @@ -Subproject commit 6600413b76e49b33976ea4459e5ceffe345655d6 +Subproject commit 92c452dcd38b26a0ce41d10be9a32d37f72a7d27 diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am index e94ac7eef..6247f4d27 100644 --- a/pixmaps/Makefile.am +++ b/pixmaps/Makefile.am @@ -2,14 +2,15 @@ pixmapdir=$(datadir)/pixmaps/linphone -pixmap_DATA= linphone2.png linphone2.xpm \ -sip-away.png sip-bifm.png \ -sip-busy.png sip-closed.png \ -sip-online.png sip-otl.png \ -sip-otp.png sip-wfa.png \ -green.png red.png \ +pixmap_DATA= \ mic_muted.png mic_active.png \ linphone-3-250x130.png linphone-3.png linphone2-57x57.png \ -linphone.png linphone-banner.png +linphone.png linphone-banner.png \ +status-green.png \ +status-orange.png \ +status-red.png \ +status-offline.png \ +contact-orange.png dialer-orange.png \ +startcall-green.png stopcall-red.png EXTRA_DIST=$(pixmap_DATA) diff --git a/pixmaps/contact-orange.png b/pixmaps/contact-orange.png new file mode 100644 index 000000000..53ba07ed8 Binary files /dev/null and b/pixmaps/contact-orange.png differ diff --git a/pixmaps/dialer-orange.png b/pixmaps/dialer-orange.png new file mode 100644 index 000000000..2d715eac0 Binary files /dev/null and b/pixmaps/dialer-orange.png differ diff --git a/pixmaps/history-orange.png b/pixmaps/history-orange.png new file mode 100644 index 000000000..dc9bbf60a Binary files /dev/null and b/pixmaps/history-orange.png differ diff --git a/pixmaps/startcall-green.png b/pixmaps/startcall-green.png new file mode 100644 index 000000000..940802a0c Binary files /dev/null and b/pixmaps/startcall-green.png differ diff --git a/pixmaps/status-green.png b/pixmaps/status-green.png new file mode 100644 index 000000000..1a39a4242 Binary files /dev/null and b/pixmaps/status-green.png differ diff --git a/pixmaps/status-offline.png b/pixmaps/status-offline.png new file mode 100644 index 000000000..243c5c069 Binary files /dev/null and b/pixmaps/status-offline.png differ diff --git a/pixmaps/status-orange.png b/pixmaps/status-orange.png new file mode 100644 index 000000000..f2e66d34d Binary files /dev/null and b/pixmaps/status-orange.png differ diff --git a/pixmaps/status-red.png b/pixmaps/status-red.png new file mode 100644 index 000000000..e7a0ec98a Binary files /dev/null and b/pixmaps/status-red.png differ diff --git a/pixmaps/stopcall-red.png b/pixmaps/stopcall-red.png new file mode 100644 index 000000000..1004b8a01 Binary files /dev/null and b/pixmaps/stopcall-red.png differ diff --git a/pixmaps/svg/callkeybackground.svg b/pixmaps/svg/callkeybackground.svg new file mode 100644 index 000000000..4d86f7fd4 --- /dev/null +++ b/pixmaps/svg/callkeybackground.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + diff --git a/pixmaps/svg/contact.svg b/pixmaps/svg/contact.svg new file mode 100644 index 000000000..f094b7a0a --- /dev/null +++ b/pixmaps/svg/contact.svg @@ -0,0 +1,16 @@ + + + + + + + diff --git a/pixmaps/svg/dialer.svg b/pixmaps/svg/dialer.svg new file mode 100644 index 000000000..fef344bc3 --- /dev/null +++ b/pixmaps/svg/dialer.svg @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/pixmaps/svg/history.svg b/pixmaps/svg/history.svg new file mode 100644 index 000000000..11ba3a203 --- /dev/null +++ b/pixmaps/svg/history.svg @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/pixmaps/svg/linphone-logo.svg b/pixmaps/svg/linphone-logo.svg new file mode 100644 index 000000000..6861fef41 --- /dev/null +++ b/pixmaps/svg/linphone-logo.svg @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pixmaps/svg/linphone.svg b/pixmaps/svg/linphone.svg new file mode 100644 index 000000000..528247c89 --- /dev/null +++ b/pixmaps/svg/linphone.svg @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pixmaps/svg/more.svg b/pixmaps/svg/more.svg new file mode 100644 index 000000000..a9d1c50c3 --- /dev/null +++ b/pixmaps/svg/more.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + diff --git a/pixmaps/svg/startcall-green.svg b/pixmaps/svg/startcall-green.svg new file mode 100644 index 000000000..dac2c713b --- /dev/null +++ b/pixmaps/svg/startcall-green.svg @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/pixmaps/svg/status-green.svg b/pixmaps/svg/status-green.svg new file mode 100644 index 000000000..d875488b8 --- /dev/null +++ b/pixmaps/svg/status-green.svg @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/pixmaps/svg/status-offline.svg b/pixmaps/svg/status-offline.svg new file mode 100644 index 000000000..1576f034c --- /dev/null +++ b/pixmaps/svg/status-offline.svg @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pixmaps/svg/status-orange.svg b/pixmaps/svg/status-orange.svg new file mode 100644 index 000000000..9fbd47226 --- /dev/null +++ b/pixmaps/svg/status-orange.svg @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pixmaps/svg/status-red.svg b/pixmaps/svg/status-red.svg new file mode 100644 index 000000000..eb47308a2 --- /dev/null +++ b/pixmaps/svg/status-red.svg @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pixmaps/svg/stopcall-red.svg b/pixmaps/svg/stopcall-red.svg new file mode 100644 index 000000000..c3616ae7c --- /dev/null +++ b/pixmaps/svg/stopcall-red.svg @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/po/cs.po b/po/cs.po index 60fb413c5..df52dff71 100644 --- a/po/cs.po +++ b/po/cs.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: linphone-3.2.99.1-" "a4be9bcfe5ebee60493f7c439b5c6616a5c8b6e6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-02 10:28+0200\n" +"POT-Creation-Date: 2010-04-22 17:16+0200\n" "PO-Revision-Date: 2010-04-01 21:26+0200\n" "Last-Translator: Petr Pisar \n" "Language-Team: Czech \n" @@ -31,23 +31,23 @@ msgstr "Nelze najít soubor s obrázkem: %s" msgid "Chat with %s" msgstr "Diskuze s %s" -#: ../gtk-glade/main.c:92 +#: ../gtk-glade/main.c:94 msgid "log to stdout some debug information while running." msgstr "za běhu vypisovat některé ladicí informace na standardní výstup." -#: ../gtk-glade/main.c:99 +#: ../gtk-glade/main.c:101 msgid "Start only in the system tray, do not show the main interface." msgstr "Spouštět se pouze do systémové oblasti, nezobrazovat hlavní okno." -#: ../gtk-glade/main.c:106 +#: ../gtk-glade/main.c:108 msgid "address to call right now" msgstr "zavolat právě teď na tuto adresu" -#: ../gtk-glade/main.c:113 +#: ../gtk-glade/main.c:115 msgid "if set automatically answer incoming calls" msgstr "je-li nastaveno, automaticky zvedne příchozí hovor" -#: ../gtk-glade/main.c:121 +#: ../gtk-glade/main.c:123 msgid "" "Specifiy a working directory (should be the base of the installation, eg: c:" "\\Program Files\\Linphone)" @@ -55,17 +55,17 @@ msgstr "" "Zadejte pracovní adresář (měl by být základní instalační adresář, například " "c:\\Program Files\\Linphone)" -#: ../gtk-glade/main.c:396 +#: ../gtk-glade/main.c:402 #, c-format msgid "Call with %s" msgstr "Hovor s %s" -#: ../gtk-glade/main.c:707 +#: ../gtk-glade/main.c:720 #, c-format msgid "Incoming call from %s" msgstr "Příchozí hovor od %s" -#: ../gtk-glade/main.c:746 +#: ../gtk-glade/main.c:759 #, c-format msgid "" "%s would like to add you to his contact list.\n" @@ -78,7 +78,7 @@ msgstr "" "do svého adresáře?\n" "Odpovíte-li ne, tato osobo bude dočasně blokována." -#: ../gtk-glade/main.c:824 +#: ../gtk-glade/main.c:837 #, c-format msgid "" "Please enter your password for username %s\n" @@ -87,24 +87,30 @@ msgstr "" "Prosím, zadejte heslo pro uživatele %s\n" "v doméně %s:" -#: ../gtk-glade/main.c:921 +#: ../gtk-glade/main.c:934 msgid "Website link" msgstr "Odkaz na webovou stránku" -#: ../gtk-glade/main.c:957 +#: ../gtk-glade/main.c:970 msgid "Linphone - a video internet phone" msgstr "Lipnhone – internetový videofon" -#: ../gtk-glade/main.c:976 +#: ../gtk-glade/main.c:989 #, c-format msgid "%s (Default)" msgstr "%s (Výchozí)" -#: ../gtk-glade/main.c:1229 +#: ../gtk-glade/main.c:1221 +msgid "" +"No sound cards have been detected on this computer.\n" +"You won't be able to send or receive audio calls." +msgstr "" + +#: ../gtk-glade/main.c:1275 msgid "A free SIP video-phone" msgstr "Volný SIP videofon" -#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:247 +#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:258 #: ../gtk-glade/contact.glade.h:3 msgid "Name" msgstr "Jméno" @@ -147,91 +153,91 @@ msgstr "Odstranit kontakt „%s“" msgid "Add new contact from %s directory" msgstr "Přidat nový kontakt z adresáře %s" -#: ../gtk-glade/propertybox.c:253 +#: ../gtk-glade/propertybox.c:264 msgid "Rate (Hz)" msgstr "Rychlost (Hz)" -#: ../gtk-glade/propertybox.c:259 +#: ../gtk-glade/propertybox.c:270 msgid "Status" msgstr "Stav" -#: ../gtk-glade/propertybox.c:265 +#: ../gtk-glade/propertybox.c:276 msgid "Min bitrate (kbit/s)" msgstr "Min. rychlost (kbit/s)" -#: ../gtk-glade/propertybox.c:271 +#: ../gtk-glade/propertybox.c:283 msgid "Parameters" msgstr "Parametry" -#: ../gtk-glade/propertybox.c:298 ../gtk-glade/propertybox.c:437 +#: ../gtk-glade/propertybox.c:312 ../gtk-glade/propertybox.c:451 msgid "Enabled" msgstr "Povoleno" -#: ../gtk-glade/propertybox.c:299 ../gtk-glade/propertybox.c:437 +#: ../gtk-glade/propertybox.c:313 ../gtk-glade/propertybox.c:451 msgid "Disabled" msgstr "Zakázáno" -#: ../gtk-glade/propertybox.c:482 +#: ../gtk-glade/propertybox.c:496 msgid "Account" msgstr "Účet" -#: ../gtk-glade/propertybox.c:622 +#: ../gtk-glade/propertybox.c:636 msgid "English" msgstr "angličtina" -#: ../gtk-glade/propertybox.c:623 +#: ../gtk-glade/propertybox.c:637 msgid "French" msgstr "francouzština" -#: ../gtk-glade/propertybox.c:624 +#: ../gtk-glade/propertybox.c:638 msgid "Swedish" msgstr "švédština" -#: ../gtk-glade/propertybox.c:625 +#: ../gtk-glade/propertybox.c:639 msgid "Italian" msgstr "italština" -#: ../gtk-glade/propertybox.c:626 +#: ../gtk-glade/propertybox.c:640 msgid "Spanish" msgstr "španělština" -#: ../gtk-glade/propertybox.c:627 +#: ../gtk-glade/propertybox.c:641 msgid "Brazilian Portugese" msgstr "brazilská portugalština" -#: ../gtk-glade/propertybox.c:628 +#: ../gtk-glade/propertybox.c:642 msgid "Polish" msgstr "polština" -#: ../gtk-glade/propertybox.c:629 +#: ../gtk-glade/propertybox.c:643 msgid "German" msgstr "němčina" -#: ../gtk-glade/propertybox.c:630 +#: ../gtk-glade/propertybox.c:644 msgid "Russian" msgstr "ruština" -#: ../gtk-glade/propertybox.c:631 +#: ../gtk-glade/propertybox.c:645 msgid "Japanese" msgstr "japonština" -#: ../gtk-glade/propertybox.c:632 +#: ../gtk-glade/propertybox.c:646 msgid "Dutch" msgstr "dánština" -#: ../gtk-glade/propertybox.c:633 +#: ../gtk-glade/propertybox.c:647 msgid "Hungarian" msgstr "maďarština" -#: ../gtk-glade/propertybox.c:634 +#: ../gtk-glade/propertybox.c:648 msgid "Czech" msgstr "čeština" -#: ../gtk-glade/propertybox.c:635 +#: ../gtk-glade/propertybox.c:649 msgid "Chinese" msgstr "čínština" -#: ../gtk-glade/propertybox.c:692 +#: ../gtk-glade/propertybox.c:706 msgid "" "You need to restart linphone for the new language selection to take effect." msgstr "Aby se projevil výběr nového jazyka, je nutné znovu spustit linphone." @@ -746,7 +752,7 @@ msgstr "Přijmout" msgid "Decline" msgstr "Odmítnout" -#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:368 +#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:369 msgid "Incoming call" msgstr "Příchozí hovor" @@ -1002,21 +1008,6 @@ msgstr "implicitní zvuková karta" msgid "default soundcard\n" msgstr "implicitní zvuková karta\n" -# XXX: Dummy string. Make it not translatable or use real message -#: ../gtk-glade/parameters.glade.h:65 -msgid "gtk-go-down" -msgstr "" - -# XXX: Dummy string. Make it not translatable or use real message -#: ../gtk-glade/parameters.glade.h:66 -msgid "gtk-go-up" -msgstr "" - -# XXX: Dummy string. Make it not translatable or use real message -#: ../gtk-glade/parameters.glade.h:67 -msgid "gtk-media-play" -msgstr "" - #: ../gtk-glade/buddylookup.glade.h:1 msgid "Search somebody" msgstr "Hledat někoho" @@ -1037,7 +1028,7 @@ msgstr "Linphone" msgid "Please wait" msgstr "Prosím, čekejte" -#: ../coreapi/linphonecore.c:310 +#: ../coreapi/linphonecore.c:311 #, c-format msgid "You have missed %i call." msgid_plural "You have missed %i calls." @@ -1045,19 +1036,19 @@ msgstr[0] "Máte %i zmeškaný hovor." msgstr[1] "Máte %i zmeškané hovory." msgstr[2] "Máte %i zmeškaných hovorů." -#: ../coreapi/linphonecore.c:356 +#: ../coreapi/linphonecore.c:357 msgid "aborted" msgstr "přerušen" -#: ../coreapi/linphonecore.c:359 +#: ../coreapi/linphonecore.c:360 msgid "completed" msgstr "dokončen" -#: ../coreapi/linphonecore.c:362 +#: ../coreapi/linphonecore.c:363 msgid "missed" msgstr "promeškán" -#: ../coreapi/linphonecore.c:367 +#: ../coreapi/linphonecore.c:368 #, c-format msgid "" "%s at %s\n" @@ -1072,11 +1063,11 @@ msgstr "" "Stav: %s\n" "Délka: %i min %i s\n" -#: ../coreapi/linphonecore.c:368 +#: ../coreapi/linphonecore.c:369 msgid "Outgoing call" msgstr "Odchozí hovor" -#: ../coreapi/linphonecore.c:625 +#: ../coreapi/linphonecore.c:626 msgid "" "Your machine appears to be connected to an IPv6 network. By default linphone " "always uses IPv4. Please update your configuration if you want to use IPv6" @@ -1084,50 +1075,50 @@ msgstr "" "Zdá se, že váš počítač je připojen do IPv6 sítě. Standardně linphone používá " "pouze IPv4. Prosím, změňte nastavení programu, pokud chcete používat IPv6." -#: ../coreapi/linphonecore.c:1074 +#: ../coreapi/linphonecore.c:1083 msgid "Ready" msgstr "Připraven." -#: ../coreapi/linphonecore.c:1505 +#: ../coreapi/linphonecore.c:1513 msgid "Remote end seems to have disconnected, the call is going to be closed." msgstr "Vzdálený konec se asi odpojil, hovor bude ukončen." -#: ../coreapi/linphonecore.c:1703 +#: ../coreapi/linphonecore.c:1725 msgid "Looking for telephone number destination..." msgstr "Vyhledává se umístění čísla…" -#: ../coreapi/linphonecore.c:1705 +#: ../coreapi/linphonecore.c:1727 msgid "Could not resolve this number." msgstr "Toto číslo nelze vyhledat." -#: ../coreapi/linphonecore.c:1749 +#: ../coreapi/linphonecore.c:1771 msgid "" "Could not parse given sip address. A sip url usually looks like sip:" "user@domain" msgstr "" "Špatně zadaná SIP adresa. Adresa má mít tento formát " -#: ../coreapi/linphonecore.c:1890 +#: ../coreapi/linphonecore.c:1912 msgid "Contacting" msgstr "Kontaktuji" -#: ../coreapi/linphonecore.c:1896 +#: ../coreapi/linphonecore.c:1918 msgid "could not call" msgstr "Nelze volat." -#: ../coreapi/linphonecore.c:1942 +#: ../coreapi/linphonecore.c:1965 msgid "Sorry, having multiple simultaneous calls is not supported yet !" msgstr "Promiňte, vedení více současných hovorů není podporováno!" -#: ../coreapi/linphonecore.c:2337 ../coreapi/callbacks.c:32 +#: ../coreapi/linphonecore.c:2370 ../coreapi/callbacks.c:32 msgid "Connected." msgstr "Připojeno." -#: ../coreapi/linphonecore.c:2371 +#: ../coreapi/linphonecore.c:2404 msgid "Call ended" msgstr "Hovor skončil." -#: ../coreapi/misc.c:142 +#: ../coreapi/misc.c:147 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the pcm oss emulation module\n" @@ -1139,7 +1130,7 @@ msgstr "" "oss, který chybí. Prosím zadejte jako uživatel root příkaz\n" "'modprobe snd-pcm-oss', kterým modul zavede." -#: ../coreapi/misc.c:145 +#: ../coreapi/misc.c:150 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the mixer oss emulation module\n" @@ -1151,7 +1142,7 @@ msgstr "" "oss, který chybí. Prosím zadejte jako uživatel root příkaz\n" "'modprobe snd-mixer-oss', kterým modul zavede." -#: ../coreapi/misc.c:492 +#: ../coreapi/misc.c:497 msgid "Stun lookup in progress..." msgstr "Hledá se adresa pomocí STUN…" @@ -1265,46 +1256,46 @@ msgstr "Uživatel si nepřeje být rušen." msgid "Call declined." msgstr "Volání odmítnuto." -#: ../coreapi/callbacks.c:280 +#: ../coreapi/callbacks.c:281 msgid "No response." msgstr "Žádná odpověď." -#: ../coreapi/callbacks.c:283 -msgid "Error." -msgstr "Chyba." +#: ../coreapi/callbacks.c:284 +msgid "Protocol error." +msgstr "" -#: ../coreapi/callbacks.c:296 +#: ../coreapi/callbacks.c:298 msgid "Redirected" msgstr "Přesměrováno" -#: ../coreapi/callbacks.c:304 +#: ../coreapi/callbacks.c:308 msgid "Not found" msgstr "Nenalezeno" -#: ../coreapi/callbacks.c:312 +#: ../coreapi/callbacks.c:318 msgid "No common codecs" msgstr "Žádný společný formát" -#: ../coreapi/callbacks.c:316 +#: ../coreapi/callbacks.c:324 msgid "Call failed." msgstr "Volání se nezdařilo." -#: ../coreapi/callbacks.c:365 +#: ../coreapi/callbacks.c:374 #, c-format msgid "Registration on %s successful." msgstr "Registrace na %s byla úspěšná." -#: ../coreapi/callbacks.c:366 +#: ../coreapi/callbacks.c:375 #, c-format msgid "Unregistration on %s done." msgstr "Odregistrování z %s hotovo." -#: ../coreapi/callbacks.c:374 +#: ../coreapi/callbacks.c:383 #, c-format msgid "Registration on %s failed: %s" msgstr "Registrace na %s selhala: %s" -#: ../coreapi/callbacks.c:374 +#: ../coreapi/callbacks.c:383 msgid "no response timeout" msgstr "odpověď nedorazila včas" @@ -1324,11 +1315,11 @@ msgstr "Zdroj zvuku ALSA" msgid "Alsa sound output" msgstr "Zvukový výstup ALSA" -#: ../mediastreamer2/src/aqsnd.c:1005 +#: ../mediastreamer2/src/aqsnd.c:1008 msgid "Sound capture filter for MacOS X Audio Queue Service" msgstr "Filtr zachytávání zvuku přes MacOS X službu zvukové fronty" -#: ../mediastreamer2/src/aqsnd.c:1029 +#: ../mediastreamer2/src/aqsnd.c:1032 msgid "Sound playback filter for MacOS X Audio Queue Service" msgstr "Filtr přehrávání zvuku přes MacOS X službu zvukové fronty" @@ -1344,11 +1335,11 @@ msgstr "Kodek plnopásmového GSM" msgid "The GSM codec" msgstr "GSM kodek" -#: ../mediastreamer2/src/macsnd.c:670 +#: ../mediastreamer2/src/macsnd.c:1083 msgid "Sound capture filter for MacOS X Core Audio drivers" msgstr "Filtr zachytávání zvuku přes MacOS X ovladače Core Audio" -#: ../mediastreamer2/src/macsnd.c:684 +#: ../mediastreamer2/src/macsnd.c:1098 msgid "Sound playback filter for MacOS X Core Audio drivers" msgstr "Filtr přehrávání zvuku přes MacOS X ovladače Core Audio" @@ -1393,7 +1384,7 @@ msgstr "Svobodný a úžasný kodek speex" msgid "A filter that controls and measure sound volume" msgstr "Filtr, který měří a řídí hlasitost zvuku" -#: ../mediastreamer2/src/msv4l.c:1009 +#: ../mediastreamer2/src/msv4l.c:1011 msgid "A video4linux compatible source filter to stream pictures." msgstr "Zdrojový filtr kompatibilní s Video4Linux proudující obrázky." @@ -1559,6 +1550,9 @@ msgstr "Parametrický ekvalizér zvuku." msgid "A webcam grabber based on directshow." msgstr "Snímač kamer postavený na directshow." +#~ msgid "Error." +#~ msgstr "Chyba." + #~ msgid "Terminate call" #~ msgstr "Ukončit hovor" diff --git a/po/de.po b/po/de.po index c0d4b43c4..909e478e8 100644 --- a/po/de.po +++ b/po/de.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: linphone 0.7.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-02 10:28+0200\n" +"POT-Creation-Date: 2010-04-22 17:16+0200\n" "PO-Revision-Date: 2003-05-23 17:51-0400\n" "Last-Translator: Jean-Jacques Sarton , Ursula Herles-" "Hartz \n" @@ -26,39 +26,39 @@ msgstr "Pixmapdatei %s nicht gefunden" msgid "Chat with %s" msgstr "Chat mit %s" -#: ../gtk-glade/main.c:92 +#: ../gtk-glade/main.c:94 msgid "log to stdout some debug information while running." msgstr "" -#: ../gtk-glade/main.c:99 +#: ../gtk-glade/main.c:101 msgid "Start only in the system tray, do not show the main interface." msgstr "" -#: ../gtk-glade/main.c:106 +#: ../gtk-glade/main.c:108 msgid "address to call right now" msgstr "" -#: ../gtk-glade/main.c:113 +#: ../gtk-glade/main.c:115 msgid "if set automatically answer incoming calls" msgstr "" -#: ../gtk-glade/main.c:121 +#: ../gtk-glade/main.c:123 msgid "" "Specifiy a working directory (should be the base of the installation, eg: c:" "\\Program Files\\Linphone)" msgstr "" -#: ../gtk-glade/main.c:396 +#: ../gtk-glade/main.c:402 #, fuzzy, c-format msgid "Call with %s" msgstr "Chat mit %s" -#: ../gtk-glade/main.c:707 +#: ../gtk-glade/main.c:720 #, fuzzy, c-format msgid "Incoming call from %s" msgstr "Eingehendes Gespr�h" -#: ../gtk-glade/main.c:746 +#: ../gtk-glade/main.c:759 #, c-format msgid "" "%s would like to add you to his contact list.\n" @@ -67,31 +67,37 @@ msgid "" "If you answer no, this person will be temporarily blacklisted." msgstr "" -#: ../gtk-glade/main.c:824 +#: ../gtk-glade/main.c:837 #, c-format msgid "" "Please enter your password for username %s\n" " at domain %s:" msgstr "" -#: ../gtk-glade/main.c:921 +#: ../gtk-glade/main.c:934 msgid "Website link" msgstr "" -#: ../gtk-glade/main.c:957 +#: ../gtk-glade/main.c:970 msgid "Linphone - a video internet phone" msgstr "" -#: ../gtk-glade/main.c:976 +#: ../gtk-glade/main.c:989 #, c-format msgid "%s (Default)" msgstr "" -#: ../gtk-glade/main.c:1229 +#: ../gtk-glade/main.c:1221 +msgid "" +"No sound cards have been detected on this computer.\n" +"You won't be able to send or receive audio calls." +msgstr "" + +#: ../gtk-glade/main.c:1275 msgid "A free SIP video-phone" msgstr "Ein freies SIP Video-Fone" -#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:247 +#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:258 #: ../gtk-glade/contact.glade.h:3 msgid "Name" msgstr "Name" @@ -134,91 +140,91 @@ msgstr "" msgid "Add new contact from %s directory" msgstr "" -#: ../gtk-glade/propertybox.c:253 +#: ../gtk-glade/propertybox.c:264 msgid "Rate (Hz)" msgstr "Rate (Hz)" -#: ../gtk-glade/propertybox.c:259 +#: ../gtk-glade/propertybox.c:270 msgid "Status" msgstr "Status" -#: ../gtk-glade/propertybox.c:265 +#: ../gtk-glade/propertybox.c:276 msgid "Min bitrate (kbit/s)" msgstr "Min Bitrate (kbit/s)" -#: ../gtk-glade/propertybox.c:271 +#: ../gtk-glade/propertybox.c:283 msgid "Parameters" msgstr "Parameter" -#: ../gtk-glade/propertybox.c:298 ../gtk-glade/propertybox.c:437 +#: ../gtk-glade/propertybox.c:312 ../gtk-glade/propertybox.c:451 msgid "Enabled" msgstr "Freigegeben" -#: ../gtk-glade/propertybox.c:299 ../gtk-glade/propertybox.c:437 +#: ../gtk-glade/propertybox.c:313 ../gtk-glade/propertybox.c:451 msgid "Disabled" msgstr "Gesperrt" -#: ../gtk-glade/propertybox.c:482 +#: ../gtk-glade/propertybox.c:496 msgid "Account" msgstr "Konto" -#: ../gtk-glade/propertybox.c:622 +#: ../gtk-glade/propertybox.c:636 msgid "English" msgstr "" -#: ../gtk-glade/propertybox.c:623 +#: ../gtk-glade/propertybox.c:637 msgid "French" msgstr "" -#: ../gtk-glade/propertybox.c:624 +#: ../gtk-glade/propertybox.c:638 msgid "Swedish" msgstr "" -#: ../gtk-glade/propertybox.c:625 +#: ../gtk-glade/propertybox.c:639 msgid "Italian" msgstr "" -#: ../gtk-glade/propertybox.c:626 +#: ../gtk-glade/propertybox.c:640 msgid "Spanish" msgstr "" -#: ../gtk-glade/propertybox.c:627 +#: ../gtk-glade/propertybox.c:641 msgid "Brazilian Portugese" msgstr "" -#: ../gtk-glade/propertybox.c:628 +#: ../gtk-glade/propertybox.c:642 msgid "Polish" msgstr "" -#: ../gtk-glade/propertybox.c:629 +#: ../gtk-glade/propertybox.c:643 msgid "German" msgstr "" -#: ../gtk-glade/propertybox.c:630 +#: ../gtk-glade/propertybox.c:644 msgid "Russian" msgstr "" -#: ../gtk-glade/propertybox.c:631 +#: ../gtk-glade/propertybox.c:645 msgid "Japanese" msgstr "" -#: ../gtk-glade/propertybox.c:632 +#: ../gtk-glade/propertybox.c:646 msgid "Dutch" msgstr "" -#: ../gtk-glade/propertybox.c:633 +#: ../gtk-glade/propertybox.c:647 msgid "Hungarian" msgstr "" -#: ../gtk-glade/propertybox.c:634 +#: ../gtk-glade/propertybox.c:648 msgid "Czech" msgstr "" -#: ../gtk-glade/propertybox.c:635 +#: ../gtk-glade/propertybox.c:649 msgid "Chinese" msgstr "" -#: ../gtk-glade/propertybox.c:692 +#: ../gtk-glade/propertybox.c:706 msgid "" "You need to restart linphone for the new language selection to take effect." msgstr "" @@ -750,7 +756,7 @@ msgstr "Annehmen" msgid "Decline" msgstr "Leitung" -#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:368 +#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:369 msgid "Incoming call" msgstr "Eingehendes Gespr�h" @@ -1026,18 +1032,6 @@ msgstr "" msgid "default soundcard\n" msgstr "" -#: ../gtk-glade/parameters.glade.h:65 -msgid "gtk-go-down" -msgstr "" - -#: ../gtk-glade/parameters.glade.h:66 -msgid "gtk-go-up" -msgstr "" - -#: ../gtk-glade/parameters.glade.h:67 -msgid "gtk-media-play" -msgstr "" - #: ../gtk-glade/buddylookup.glade.h:1 msgid "Search somebody" msgstr "" @@ -1058,26 +1052,26 @@ msgstr "Linphone" msgid "Please wait" msgstr "" -#: ../coreapi/linphonecore.c:310 +#: ../coreapi/linphonecore.c:311 #, fuzzy, c-format msgid "You have missed %i call." msgid_plural "You have missed %i calls." msgstr[0] "Sie haben %i Anruf(e) in Abwesenheit." msgstr[1] "Sie haben %i Anruf(e) in Abwesenheit." -#: ../coreapi/linphonecore.c:356 +#: ../coreapi/linphonecore.c:357 msgid "aborted" msgstr "abgebrochen" -#: ../coreapi/linphonecore.c:359 +#: ../coreapi/linphonecore.c:360 msgid "completed" msgstr "beendet" -#: ../coreapi/linphonecore.c:362 +#: ../coreapi/linphonecore.c:363 msgid "missed" msgstr "verpasst" -#: ../coreapi/linphonecore.c:367 +#: ../coreapi/linphonecore.c:368 #, c-format msgid "" "%s at %s\n" @@ -1091,11 +1085,11 @@ msgstr "" "Status: %s\n" "Dauer: %i mn %i sec\n" -#: ../coreapi/linphonecore.c:368 +#: ../coreapi/linphonecore.c:369 msgid "Outgoing call" msgstr "Abgehendes Gespräch" -#: ../coreapi/linphonecore.c:625 +#: ../coreapi/linphonecore.c:626 msgid "" "Your machine appears to be connected to an IPv6 network. By default linphone " "always uses IPv4. Please update your configuration if you want to use IPv6" @@ -1104,23 +1098,23 @@ msgstr "" "Linphoneverwendet normalerweise IPv4. Bitte Konfiguration anpassen wenn sie " "IPv6 verwenden wollen" -#: ../coreapi/linphonecore.c:1074 +#: ../coreapi/linphonecore.c:1083 msgid "Ready" msgstr "Bereit" -#: ../coreapi/linphonecore.c:1505 +#: ../coreapi/linphonecore.c:1513 msgid "Remote end seems to have disconnected, the call is going to be closed." msgstr "" -#: ../coreapi/linphonecore.c:1703 +#: ../coreapi/linphonecore.c:1725 msgid "Looking for telephone number destination..." msgstr "Suche Telefonnummernziel.." -#: ../coreapi/linphonecore.c:1705 +#: ../coreapi/linphonecore.c:1727 msgid "Could not resolve this number." msgstr "Konnte dies Nummer nicht auflösen." -#: ../coreapi/linphonecore.c:1749 +#: ../coreapi/linphonecore.c:1771 msgid "" "Could not parse given sip address. A sip url usually looks like sip:" "user@domain" @@ -1128,27 +1122,27 @@ msgstr "" "Sip-Adresse kann nicht bestimmt werden. Eine Sip-Adresse hat folgenden " "Aufbau " -#: ../coreapi/linphonecore.c:1890 +#: ../coreapi/linphonecore.c:1912 msgid "Contacting" msgstr "Rufe an" -#: ../coreapi/linphonecore.c:1896 +#: ../coreapi/linphonecore.c:1918 msgid "could not call" msgstr "Konnte kein Anruf vornehmen" -#: ../coreapi/linphonecore.c:1942 +#: ../coreapi/linphonecore.c:1965 msgid "Sorry, having multiple simultaneous calls is not supported yet !" msgstr "Mehrfachen gleichzeitigen Anrufen nicht unterstützt !" -#: ../coreapi/linphonecore.c:2337 ../coreapi/callbacks.c:32 +#: ../coreapi/linphonecore.c:2370 ../coreapi/callbacks.c:32 msgid "Connected." msgstr "Verbunden." -#: ../coreapi/linphonecore.c:2371 +#: ../coreapi/linphonecore.c:2404 msgid "Call ended" msgstr "Anruf beendet" -#: ../coreapi/misc.c:142 +#: ../coreapi/misc.c:147 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the pcm oss emulation module\n" @@ -1161,7 +1155,7 @@ msgstr "" "nicht vorhanden. Für die Einbindung des Moduls\n" "bitte den Befehl 'modprobe snd-pcm-oss' als Anwender-Root verwenden." -#: ../coreapi/misc.c:145 +#: ../coreapi/misc.c:150 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the mixer oss emulation module\n" @@ -1174,7 +1168,7 @@ msgstr "" "nicht vorhanden. Fr die Einbindung des Moduls\n" "bitte den Befehl 'modprobe snd-pcm-oss' als Anwender-Root verwenden." -#: ../coreapi/misc.c:492 +#: ../coreapi/misc.c:497 msgid "Stun lookup in progress..." msgstr "Stun Ermittlung läuft..." @@ -1291,48 +1285,48 @@ msgstr "Teilnehmer möchte nicht gestört werden." msgid "Call declined." msgstr "Anruf abgewiesen" -#: ../coreapi/callbacks.c:280 +#: ../coreapi/callbacks.c:281 msgid "No response." msgstr "" -#: ../coreapi/callbacks.c:283 -msgid "Error." +#: ../coreapi/callbacks.c:284 +msgid "Protocol error." msgstr "" -#: ../coreapi/callbacks.c:296 +#: ../coreapi/callbacks.c:298 #, fuzzy msgid "Redirected" msgstr "Nach %s umgeleitet..." -#: ../coreapi/callbacks.c:304 +#: ../coreapi/callbacks.c:308 msgid "Not found" msgstr "" -#: ../coreapi/callbacks.c:312 +#: ../coreapi/callbacks.c:318 msgid "No common codecs" msgstr "" -#: ../coreapi/callbacks.c:316 +#: ../coreapi/callbacks.c:324 #, fuzzy msgid "Call failed." msgstr "Anruf annulliert" -#: ../coreapi/callbacks.c:365 +#: ../coreapi/callbacks.c:374 #, c-format msgid "Registration on %s successful." msgstr "Registrierung auf %s erfolgreich." -#: ../coreapi/callbacks.c:366 +#: ../coreapi/callbacks.c:375 #, fuzzy, c-format msgid "Unregistration on %s done." msgstr "Registrierung auf %s erfolgreich." -#: ../coreapi/callbacks.c:374 +#: ../coreapi/callbacks.c:383 #, fuzzy, c-format msgid "Registration on %s failed: %s" msgstr "Registrierung auf %s schlug fehl (Zeitberschreitung)." -#: ../coreapi/callbacks.c:374 +#: ../coreapi/callbacks.c:383 msgid "no response timeout" msgstr "" @@ -1352,11 +1346,11 @@ msgstr "" msgid "Alsa sound output" msgstr "" -#: ../mediastreamer2/src/aqsnd.c:1005 +#: ../mediastreamer2/src/aqsnd.c:1008 msgid "Sound capture filter for MacOS X Audio Queue Service" msgstr "" -#: ../mediastreamer2/src/aqsnd.c:1029 +#: ../mediastreamer2/src/aqsnd.c:1032 msgid "Sound playback filter for MacOS X Audio Queue Service" msgstr "" @@ -1372,11 +1366,11 @@ msgstr "" msgid "The GSM codec" msgstr "" -#: ../mediastreamer2/src/macsnd.c:670 +#: ../mediastreamer2/src/macsnd.c:1083 msgid "Sound capture filter for MacOS X Core Audio drivers" msgstr "" -#: ../mediastreamer2/src/macsnd.c:684 +#: ../mediastreamer2/src/macsnd.c:1098 msgid "Sound playback filter for MacOS X Core Audio drivers" msgstr "" @@ -1421,7 +1415,7 @@ msgstr "" msgid "A filter that controls and measure sound volume" msgstr "" -#: ../mediastreamer2/src/msv4l.c:1009 +#: ../mediastreamer2/src/msv4l.c:1011 msgid "A video4linux compatible source filter to stream pictures." msgstr "" diff --git a/po/es.po b/po/es.po index 6d6e039bf..0b2201bcf 100644 --- a/po/es.po +++ b/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Linphone 0.9.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-02 10:28+0200\n" +"POT-Creation-Date: 2010-04-22 17:16+0200\n" "PO-Revision-Date: 2002-10-15 HO:MI+ZONE\n" "Last-Translator: Nelson Benitez \n" "Language-Team: es \n" @@ -26,39 +26,39 @@ msgstr "No se pudo encontrar el archivo pixmap: %s" msgid "Chat with %s" msgstr "" -#: ../gtk-glade/main.c:92 +#: ../gtk-glade/main.c:94 msgid "log to stdout some debug information while running." msgstr "" -#: ../gtk-glade/main.c:99 +#: ../gtk-glade/main.c:101 msgid "Start only in the system tray, do not show the main interface." msgstr "" -#: ../gtk-glade/main.c:106 +#: ../gtk-glade/main.c:108 msgid "address to call right now" msgstr "" -#: ../gtk-glade/main.c:113 +#: ../gtk-glade/main.c:115 msgid "if set automatically answer incoming calls" msgstr "" -#: ../gtk-glade/main.c:121 +#: ../gtk-glade/main.c:123 msgid "" "Specifiy a working directory (should be the base of the installation, eg: c:" "\\Program Files\\Linphone)" msgstr "" -#: ../gtk-glade/main.c:396 +#: ../gtk-glade/main.c:402 #, c-format msgid "Call with %s" msgstr "" -#: ../gtk-glade/main.c:707 +#: ../gtk-glade/main.c:720 #, c-format msgid "Incoming call from %s" msgstr "" -#: ../gtk-glade/main.c:746 +#: ../gtk-glade/main.c:759 #, c-format msgid "" "%s would like to add you to his contact list.\n" @@ -67,31 +67,37 @@ msgid "" "If you answer no, this person will be temporarily blacklisted." msgstr "" -#: ../gtk-glade/main.c:824 +#: ../gtk-glade/main.c:837 #, c-format msgid "" "Please enter your password for username %s\n" " at domain %s:" msgstr "" -#: ../gtk-glade/main.c:921 +#: ../gtk-glade/main.c:934 msgid "Website link" msgstr "" -#: ../gtk-glade/main.c:957 +#: ../gtk-glade/main.c:970 msgid "Linphone - a video internet phone" msgstr "" -#: ../gtk-glade/main.c:976 +#: ../gtk-glade/main.c:989 #, c-format msgid "%s (Default)" msgstr "" -#: ../gtk-glade/main.c:1229 +#: ../gtk-glade/main.c:1221 +msgid "" +"No sound cards have been detected on this computer.\n" +"You won't be able to send or receive audio calls." +msgstr "" + +#: ../gtk-glade/main.c:1275 msgid "A free SIP video-phone" msgstr "" -#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:247 +#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:258 #: ../gtk-glade/contact.glade.h:3 msgid "Name" msgstr "Nombre" @@ -135,91 +141,91 @@ msgstr "" msgid "Add new contact from %s directory" msgstr "" -#: ../gtk-glade/propertybox.c:253 +#: ../gtk-glade/propertybox.c:264 msgid "Rate (Hz)" msgstr "" -#: ../gtk-glade/propertybox.c:259 +#: ../gtk-glade/propertybox.c:270 msgid "Status" msgstr "Estado" -#: ../gtk-glade/propertybox.c:265 +#: ../gtk-glade/propertybox.c:276 msgid "Min bitrate (kbit/s)" msgstr "" -#: ../gtk-glade/propertybox.c:271 +#: ../gtk-glade/propertybox.c:283 msgid "Parameters" msgstr "Parametros" -#: ../gtk-glade/propertybox.c:298 ../gtk-glade/propertybox.c:437 +#: ../gtk-glade/propertybox.c:312 ../gtk-glade/propertybox.c:451 msgid "Enabled" msgstr "Activado" -#: ../gtk-glade/propertybox.c:299 ../gtk-glade/propertybox.c:437 +#: ../gtk-glade/propertybox.c:313 ../gtk-glade/propertybox.c:451 msgid "Disabled" msgstr "Desactivado" -#: ../gtk-glade/propertybox.c:482 +#: ../gtk-glade/propertybox.c:496 msgid "Account" msgstr "" -#: ../gtk-glade/propertybox.c:622 +#: ../gtk-glade/propertybox.c:636 msgid "English" msgstr "" -#: ../gtk-glade/propertybox.c:623 +#: ../gtk-glade/propertybox.c:637 msgid "French" msgstr "" -#: ../gtk-glade/propertybox.c:624 +#: ../gtk-glade/propertybox.c:638 msgid "Swedish" msgstr "" -#: ../gtk-glade/propertybox.c:625 +#: ../gtk-glade/propertybox.c:639 msgid "Italian" msgstr "" -#: ../gtk-glade/propertybox.c:626 +#: ../gtk-glade/propertybox.c:640 msgid "Spanish" msgstr "" -#: ../gtk-glade/propertybox.c:627 +#: ../gtk-glade/propertybox.c:641 msgid "Brazilian Portugese" msgstr "" -#: ../gtk-glade/propertybox.c:628 +#: ../gtk-glade/propertybox.c:642 msgid "Polish" msgstr "" -#: ../gtk-glade/propertybox.c:629 +#: ../gtk-glade/propertybox.c:643 msgid "German" msgstr "" -#: ../gtk-glade/propertybox.c:630 +#: ../gtk-glade/propertybox.c:644 msgid "Russian" msgstr "" -#: ../gtk-glade/propertybox.c:631 +#: ../gtk-glade/propertybox.c:645 msgid "Japanese" msgstr "" -#: ../gtk-glade/propertybox.c:632 +#: ../gtk-glade/propertybox.c:646 msgid "Dutch" msgstr "" -#: ../gtk-glade/propertybox.c:633 +#: ../gtk-glade/propertybox.c:647 msgid "Hungarian" msgstr "" -#: ../gtk-glade/propertybox.c:634 +#: ../gtk-glade/propertybox.c:648 msgid "Czech" msgstr "" -#: ../gtk-glade/propertybox.c:635 +#: ../gtk-glade/propertybox.c:649 msgid "Chinese" msgstr "" -#: ../gtk-glade/propertybox.c:692 +#: ../gtk-glade/propertybox.c:706 msgid "" "You need to restart linphone for the new language selection to take effect." msgstr "" @@ -743,7 +749,7 @@ msgstr "" msgid "Decline" msgstr "linea" -#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:368 +#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:369 msgid "Incoming call" msgstr "" @@ -1014,18 +1020,6 @@ msgstr "" msgid "default soundcard\n" msgstr "" -#: ../gtk-glade/parameters.glade.h:65 -msgid "gtk-go-down" -msgstr "" - -#: ../gtk-glade/parameters.glade.h:66 -msgid "gtk-go-up" -msgstr "" - -#: ../gtk-glade/parameters.glade.h:67 -msgid "gtk-media-play" -msgstr "" - #: ../gtk-glade/buddylookup.glade.h:1 msgid "Search somebody" msgstr "" @@ -1047,26 +1041,26 @@ msgstr "linphone" msgid "Please wait" msgstr "" -#: ../coreapi/linphonecore.c:310 +#: ../coreapi/linphonecore.c:311 #, c-format msgid "You have missed %i call." msgid_plural "You have missed %i calls." msgstr[0] "" msgstr[1] "" -#: ../coreapi/linphonecore.c:356 +#: ../coreapi/linphonecore.c:357 msgid "aborted" msgstr "" -#: ../coreapi/linphonecore.c:359 +#: ../coreapi/linphonecore.c:360 msgid "completed" msgstr "" -#: ../coreapi/linphonecore.c:362 +#: ../coreapi/linphonecore.c:363 msgid "missed" msgstr "" -#: ../coreapi/linphonecore.c:367 +#: ../coreapi/linphonecore.c:368 #, c-format msgid "" "%s at %s\n" @@ -1076,34 +1070,34 @@ msgid "" "Duration: %i mn %i sec\n" msgstr "" -#: ../coreapi/linphonecore.c:368 +#: ../coreapi/linphonecore.c:369 msgid "Outgoing call" msgstr "" -#: ../coreapi/linphonecore.c:625 +#: ../coreapi/linphonecore.c:626 msgid "" "Your machine appears to be connected to an IPv6 network. By default linphone " "always uses IPv4. Please update your configuration if you want to use IPv6" msgstr "" -#: ../coreapi/linphonecore.c:1074 +#: ../coreapi/linphonecore.c:1083 #, fuzzy msgid "Ready" msgstr "Preparado." -#: ../coreapi/linphonecore.c:1505 +#: ../coreapi/linphonecore.c:1513 msgid "Remote end seems to have disconnected, the call is going to be closed." msgstr "" -#: ../coreapi/linphonecore.c:1703 +#: ../coreapi/linphonecore.c:1725 msgid "Looking for telephone number destination..." msgstr "" -#: ../coreapi/linphonecore.c:1705 +#: ../coreapi/linphonecore.c:1727 msgid "Could not resolve this number." msgstr "" -#: ../coreapi/linphonecore.c:1749 +#: ../coreapi/linphonecore.c:1771 #, fuzzy msgid "" "Could not parse given sip address. A sip url usually looks like sip:" @@ -1111,29 +1105,29 @@ msgid "" msgstr "" "Direccion SIP mal escrita. Una direccion SIP es " -#: ../coreapi/linphonecore.c:1890 +#: ../coreapi/linphonecore.c:1912 #, fuzzy msgid "Contacting" msgstr "Contactando " -#: ../coreapi/linphonecore.c:1896 +#: ../coreapi/linphonecore.c:1918 msgid "could not call" msgstr "" -#: ../coreapi/linphonecore.c:1942 +#: ../coreapi/linphonecore.c:1965 msgid "Sorry, having multiple simultaneous calls is not supported yet !" msgstr "" -#: ../coreapi/linphonecore.c:2337 ../coreapi/callbacks.c:32 +#: ../coreapi/linphonecore.c:2370 ../coreapi/callbacks.c:32 msgid "Connected." msgstr "Conectado." -#: ../coreapi/linphonecore.c:2371 +#: ../coreapi/linphonecore.c:2404 #, fuzzy msgid "Call ended" msgstr "Llamada cancelada." -#: ../coreapi/misc.c:142 +#: ../coreapi/misc.c:147 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the pcm oss emulation module\n" @@ -1145,7 +1139,7 @@ msgstr "" "no se encuentra y linphone lo necesita. Por favor ejecute\n" "'modprobe snd-pcm-oss' como root para cargarlo." -#: ../coreapi/misc.c:145 +#: ../coreapi/misc.c:150 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the mixer oss emulation module\n" @@ -1157,7 +1151,7 @@ msgstr "" "no se encuentra y linphone lo necesita. Por favor ejecute\n" " 'modprobe snd-mixer-oss' como root para cargarlo." -#: ../coreapi/misc.c:492 +#: ../coreapi/misc.c:497 msgid "Stun lookup in progress..." msgstr "" @@ -1274,47 +1268,47 @@ msgstr "El usuario no quiere que lo molesten." msgid "Call declined." msgstr "Llamada cancelada." -#: ../coreapi/callbacks.c:280 +#: ../coreapi/callbacks.c:281 msgid "No response." msgstr "" -#: ../coreapi/callbacks.c:283 -msgid "Error." +#: ../coreapi/callbacks.c:284 +msgid "Protocol error." msgstr "" -#: ../coreapi/callbacks.c:296 +#: ../coreapi/callbacks.c:298 msgid "Redirected" msgstr "" -#: ../coreapi/callbacks.c:304 +#: ../coreapi/callbacks.c:308 msgid "Not found" msgstr "" -#: ../coreapi/callbacks.c:312 +#: ../coreapi/callbacks.c:318 msgid "No common codecs" msgstr "" -#: ../coreapi/callbacks.c:316 +#: ../coreapi/callbacks.c:324 #, fuzzy msgid "Call failed." msgstr "Llamada cancelada." -#: ../coreapi/callbacks.c:365 +#: ../coreapi/callbacks.c:374 #, fuzzy, c-format msgid "Registration on %s successful." msgstr "Se ha registrado con exito." -#: ../coreapi/callbacks.c:366 +#: ../coreapi/callbacks.c:375 #, fuzzy, c-format msgid "Unregistration on %s done." msgstr "Se ha registrado con exito." -#: ../coreapi/callbacks.c:374 +#: ../coreapi/callbacks.c:383 #, fuzzy, c-format msgid "Registration on %s failed: %s" msgstr "Se ha registrado con exito." -#: ../coreapi/callbacks.c:374 +#: ../coreapi/callbacks.c:383 msgid "no response timeout" msgstr "" @@ -1334,11 +1328,11 @@ msgstr "" msgid "Alsa sound output" msgstr "" -#: ../mediastreamer2/src/aqsnd.c:1005 +#: ../mediastreamer2/src/aqsnd.c:1008 msgid "Sound capture filter for MacOS X Audio Queue Service" msgstr "" -#: ../mediastreamer2/src/aqsnd.c:1029 +#: ../mediastreamer2/src/aqsnd.c:1032 msgid "Sound playback filter for MacOS X Audio Queue Service" msgstr "" @@ -1354,11 +1348,11 @@ msgstr "" msgid "The GSM codec" msgstr "" -#: ../mediastreamer2/src/macsnd.c:670 +#: ../mediastreamer2/src/macsnd.c:1083 msgid "Sound capture filter for MacOS X Core Audio drivers" msgstr "" -#: ../mediastreamer2/src/macsnd.c:684 +#: ../mediastreamer2/src/macsnd.c:1098 msgid "Sound playback filter for MacOS X Core Audio drivers" msgstr "" @@ -1403,7 +1397,7 @@ msgstr "" msgid "A filter that controls and measure sound volume" msgstr "" -#: ../mediastreamer2/src/msv4l.c:1009 +#: ../mediastreamer2/src/msv4l.c:1011 msgid "A video4linux compatible source filter to stream pictures." msgstr "" diff --git a/po/fr.po b/po/fr.po index 89108273e..b7fc236ef 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Linphone 0.9.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-02 10:28+0200\n" +"POT-Creation-Date: 2010-04-22 17:16+0200\n" "PO-Revision-Date: 2002-12-06 17:33+0100\n" "Last-Translator: Simon Morlat \n" "Language-Team: french \n" @@ -25,38 +25,39 @@ msgstr "Icone non trouvée: %s" msgid "Chat with %s" msgstr "Chat avec %s" -#: ../gtk-glade/main.c:92 +#: ../gtk-glade/main.c:94 msgid "log to stdout some debug information while running." msgstr "" -#: ../gtk-glade/main.c:99 +#: ../gtk-glade/main.c:101 msgid "Start only in the system tray, do not show the main interface." msgstr "" -#: ../gtk-glade/main.c:106 +#: ../gtk-glade/main.c:108 msgid "address to call right now" msgstr "" -#: ../gtk-glade/main.c:113 +#: ../gtk-glade/main.c:115 msgid "if set automatically answer incoming calls" msgstr "" -#: ../gtk-glade/main.c:121 +#: ../gtk-glade/main.c:123 msgid "" "Specifiy a working directory (should be the base of the installation, eg: c:" "\\Program Files\\Linphone)" msgstr "" -#: ../gtk-glade/main.c:396 +#: ../gtk-glade/main.c:402 +#, c-format msgid "Call with %s" msgstr "Appel avec %s" -#: ../gtk-glade/main.c:707 +#: ../gtk-glade/main.c:720 #, c-format msgid "Incoming call from %s" msgstr "Appel entrant de %s" -#: ../gtk-glade/main.c:746 +#: ../gtk-glade/main.c:759 #, c-format msgid "" "%s would like to add you to his contact list.\n" @@ -65,31 +66,39 @@ msgid "" "If you answer no, this person will be temporarily blacklisted." msgstr "" -#: ../gtk-glade/main.c:824 +#: ../gtk-glade/main.c:837 #, c-format msgid "" "Please enter your password for username %s\n" " at domain %s:" -msgstr "Entrez le mot de passe pour %s\n sur le domaine %s:" +msgstr "" +"Entrez le mot de passe pour %s\n" +" sur le domaine %s:" -#: ../gtk-glade/main.c:921 +#: ../gtk-glade/main.c:934 msgid "Website link" msgstr "Lien site web" -#: ../gtk-glade/main.c:957 +#: ../gtk-glade/main.c:970 msgid "Linphone - a video internet phone" msgstr "Linphone - un téléphone video pour l'internet" -#: ../gtk-glade/main.c:976 +#: ../gtk-glade/main.c:989 #, c-format msgid "%s (Default)" msgstr "%s (par défaut)" -#: ../gtk-glade/main.c:1229 +#: ../gtk-glade/main.c:1221 +msgid "" +"No sound cards have been detected on this computer.\n" +"You won't be able to send or receive audio calls." +msgstr "" + +#: ../gtk-glade/main.c:1275 msgid "A free SIP video-phone" msgstr "Un visiophone libre" -#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:247 +#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:258 #: ../gtk-glade/contact.glade.h:3 msgid "Name" msgstr "Nom" @@ -132,91 +141,91 @@ msgstr "Supprimer le contact '%s'" msgid "Add new contact from %s directory" msgstr "Ajouter un contact depuis l'annuaire %s" -#: ../gtk-glade/propertybox.c:253 +#: ../gtk-glade/propertybox.c:264 msgid "Rate (Hz)" msgstr "Fréquence (Hz)" -#: ../gtk-glade/propertybox.c:259 +#: ../gtk-glade/propertybox.c:270 msgid "Status" msgstr "Etat" -#: ../gtk-glade/propertybox.c:265 +#: ../gtk-glade/propertybox.c:276 msgid "Min bitrate (kbit/s)" msgstr "Débit min. (kbit/s)" -#: ../gtk-glade/propertybox.c:271 +#: ../gtk-glade/propertybox.c:283 msgid "Parameters" msgstr "Paramètres" -#: ../gtk-glade/propertybox.c:298 ../gtk-glade/propertybox.c:437 +#: ../gtk-glade/propertybox.c:312 ../gtk-glade/propertybox.c:451 msgid "Enabled" msgstr "Activé" -#: ../gtk-glade/propertybox.c:299 ../gtk-glade/propertybox.c:437 +#: ../gtk-glade/propertybox.c:313 ../gtk-glade/propertybox.c:451 msgid "Disabled" msgstr "Désactivé" -#: ../gtk-glade/propertybox.c:482 +#: ../gtk-glade/propertybox.c:496 msgid "Account" msgstr "Compte" -#: ../gtk-glade/propertybox.c:622 +#: ../gtk-glade/propertybox.c:636 msgid "English" msgstr "" -#: ../gtk-glade/propertybox.c:623 +#: ../gtk-glade/propertybox.c:637 msgid "French" msgstr "Français" -#: ../gtk-glade/propertybox.c:624 +#: ../gtk-glade/propertybox.c:638 msgid "Swedish" msgstr "" -#: ../gtk-glade/propertybox.c:625 +#: ../gtk-glade/propertybox.c:639 msgid "Italian" msgstr "" -#: ../gtk-glade/propertybox.c:626 +#: ../gtk-glade/propertybox.c:640 msgid "Spanish" msgstr "" -#: ../gtk-glade/propertybox.c:627 +#: ../gtk-glade/propertybox.c:641 msgid "Brazilian Portugese" msgstr "" -#: ../gtk-glade/propertybox.c:628 +#: ../gtk-glade/propertybox.c:642 msgid "Polish" msgstr "" -#: ../gtk-glade/propertybox.c:629 +#: ../gtk-glade/propertybox.c:643 msgid "German" msgstr "" -#: ../gtk-glade/propertybox.c:630 +#: ../gtk-glade/propertybox.c:644 msgid "Russian" msgstr "" -#: ../gtk-glade/propertybox.c:631 +#: ../gtk-glade/propertybox.c:645 msgid "Japanese" msgstr "日本語" -#: ../gtk-glade/propertybox.c:632 +#: ../gtk-glade/propertybox.c:646 msgid "Dutch" msgstr "" -#: ../gtk-glade/propertybox.c:633 +#: ../gtk-glade/propertybox.c:647 msgid "Hungarian" msgstr "" -#: ../gtk-glade/propertybox.c:634 +#: ../gtk-glade/propertybox.c:648 msgid "Czech" msgstr "" -#: ../gtk-glade/propertybox.c:635 +#: ../gtk-glade/propertybox.c:649 msgid "Chinese" msgstr "简体中文" -#: ../gtk-glade/propertybox.c:692 +#: ../gtk-glade/propertybox.c:706 msgid "" "You need to restart linphone for the new language selection to take effect." msgstr "" @@ -716,7 +725,7 @@ msgstr "Accepter" msgid "Decline" msgstr "Refuser" -#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:368 +#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:369 msgid "Incoming call" msgstr "Appel entrant" @@ -972,18 +981,6 @@ msgstr "Carte son par défaut" msgid "default soundcard\n" msgstr "Carte son par défaut\n" -#: ../gtk-glade/parameters.glade.h:65 -msgid "gtk-go-down" -msgstr "" - -#: ../gtk-glade/parameters.glade.h:66 -msgid "gtk-go-up" -msgstr "" - -#: ../gtk-glade/parameters.glade.h:67 -msgid "gtk-media-play" -msgstr "" - #: ../gtk-glade/buddylookup.glade.h:1 msgid "Search somebody" msgstr "Rechercher une personne" @@ -1004,26 +1001,26 @@ msgstr "Linphone" msgid "Please wait" msgstr "En attente" -#: ../coreapi/linphonecore.c:310 +#: ../coreapi/linphonecore.c:311 #, c-format msgid "You have missed %i call." msgid_plural "You have missed %i calls." msgstr[0] "Vous avez manqué %i appel" msgstr[1] "Vous avez manqué %i appels" -#: ../coreapi/linphonecore.c:356 +#: ../coreapi/linphonecore.c:357 msgid "aborted" msgstr "abandonné" -#: ../coreapi/linphonecore.c:359 +#: ../coreapi/linphonecore.c:360 msgid "completed" msgstr "terminé" -#: ../coreapi/linphonecore.c:362 +#: ../coreapi/linphonecore.c:363 msgid "missed" msgstr "manqué" -#: ../coreapi/linphonecore.c:367 +#: ../coreapi/linphonecore.c:368 #, c-format msgid "" "%s at %s\n" @@ -1038,11 +1035,11 @@ msgstr "" "Etat: %s\n" "Durée: %i mn %i sec\n" -#: ../coreapi/linphonecore.c:368 +#: ../coreapi/linphonecore.c:369 msgid "Outgoing call" msgstr "Appel sortant" -#: ../coreapi/linphonecore.c:625 +#: ../coreapi/linphonecore.c:626 msgid "" "Your machine appears to be connected to an IPv6 network. By default linphone " "always uses IPv4. Please update your configuration if you want to use IPv6" @@ -1051,50 +1048,50 @@ msgstr "" "utilise toujours de l'IPv4. Merci de mettre à jour votre configuration si " "vous souhaitez utilisez un réseau IPv6." -#: ../coreapi/linphonecore.c:1074 +#: ../coreapi/linphonecore.c:1083 msgid "Ready" msgstr "Prêt." -#: ../coreapi/linphonecore.c:1505 +#: ../coreapi/linphonecore.c:1513 msgid "Remote end seems to have disconnected, the call is going to be closed." msgstr "Votre correspondant a du se déconnecter, l'appel va être raccroché." -#: ../coreapi/linphonecore.c:1703 +#: ../coreapi/linphonecore.c:1725 msgid "Looking for telephone number destination..." msgstr "Recherche de la destination du numéro de téléphone..." -#: ../coreapi/linphonecore.c:1705 +#: ../coreapi/linphonecore.c:1727 msgid "Could not resolve this number." msgstr "La destination n'a pu être trouvée." -#: ../coreapi/linphonecore.c:1749 +#: ../coreapi/linphonecore.c:1771 msgid "" "Could not parse given sip address. A sip url usually looks like sip:" "user@domain" msgstr "" "Adresse SIP mal formulée. Une address sip ressemble à " -#: ../coreapi/linphonecore.c:1890 +#: ../coreapi/linphonecore.c:1912 msgid "Contacting" msgstr "Appel de" -#: ../coreapi/linphonecore.c:1896 +#: ../coreapi/linphonecore.c:1918 msgid "could not call" msgstr "Echec" -#: ../coreapi/linphonecore.c:1942 +#: ../coreapi/linphonecore.c:1965 msgid "Sorry, having multiple simultaneous calls is not supported yet !" msgstr "Désolé, vous ne pouvez appeler plusieurs personnes simultanément !" -#: ../coreapi/linphonecore.c:2337 ../coreapi/callbacks.c:32 +#: ../coreapi/linphonecore.c:2370 ../coreapi/callbacks.c:32 msgid "Connected." msgstr "En ligne." -#: ../coreapi/linphonecore.c:2371 +#: ../coreapi/linphonecore.c:2404 msgid "Call ended" msgstr "Appel terminé." -#: ../coreapi/misc.c:142 +#: ../coreapi/misc.c:147 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the pcm oss emulation module\n" @@ -1107,7 +1104,7 @@ msgstr "" "Veuillez s'il vous plait executer la commande\n" "'modprobe snd-pcm-oss' en tant que root afin de le charger." -#: ../coreapi/misc.c:145 +#: ../coreapi/misc.c:150 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the mixer oss emulation module\n" @@ -1119,7 +1116,7 @@ msgstr "" "a besoin. Veuillez s'il vous plait executer la commande\n" "'modprobe snd-mixer-oss' en tant que root afin de le charger." -#: ../coreapi/misc.c:492 +#: ../coreapi/misc.c:497 msgid "Stun lookup in progress..." msgstr "Découverte STUN en cours" @@ -1175,7 +1172,8 @@ msgstr "Bug inconnu" msgid "" "The sip proxy address you entered is invalid, it must start with \"sip:\" " "followed by a hostname." -msgstr "L'addresse SIP du proxy est invalide. Elle doit commencer par \"sip:\" " +msgstr "" +"L'addresse SIP du proxy est invalide. Elle doit commencer par \"sip:\" " "suivie par un nom de domaine." #: ../coreapi/proxy.c:182 @@ -1184,7 +1182,8 @@ msgid "" "It should look like sip:username@proxydomain, such as sip:alice@example.net" msgstr "" "L'identité SIP que vous avez fourni est invalide.\n" -"Elle doit être de la forme sip:username@domain, comme par example sip:alice@example.net" +"Elle doit être de la forme sip:username@domain, comme par example sip:" +"alice@example.net" #: ../coreapi/proxy.c:621 #, c-format @@ -1232,46 +1231,46 @@ msgstr "L'usager ne souhaite pas être dérangé" msgid "Call declined." msgstr "Appel décliné." -#: ../coreapi/callbacks.c:280 +#: ../coreapi/callbacks.c:281 msgid "No response." msgstr "Pas de réponse." -#: ../coreapi/callbacks.c:283 -msgid "Error." -msgstr "Erreur." +#: ../coreapi/callbacks.c:284 +msgid "Protocol error." +msgstr "" -#: ../coreapi/callbacks.c:296 +#: ../coreapi/callbacks.c:298 msgid "Redirected" msgstr "Redirection" -#: ../coreapi/callbacks.c:304 +#: ../coreapi/callbacks.c:308 msgid "Not found" msgstr "Non trouvé" -#: ../coreapi/callbacks.c:312 +#: ../coreapi/callbacks.c:318 msgid "No common codecs" msgstr "Pas de codecs commun" -#: ../coreapi/callbacks.c:316 +#: ../coreapi/callbacks.c:324 msgid "Call failed." msgstr "L'appel a échoué." -#: ../coreapi/callbacks.c:365 +#: ../coreapi/callbacks.c:374 #, c-format msgid "Registration on %s successful." msgstr "Enregistrement sur %s effectué." -#: ../coreapi/callbacks.c:366 +#: ../coreapi/callbacks.c:375 #, c-format msgid "Unregistration on %s done." msgstr "Désenregistrement sur %s effectué." -#: ../coreapi/callbacks.c:374 +#: ../coreapi/callbacks.c:383 #, c-format msgid "Registration on %s failed: %s" msgstr "Echec de l'enregistrement sur %s: %s" -#: ../coreapi/callbacks.c:374 +#: ../coreapi/callbacks.c:383 msgid "no response timeout" msgstr "Pas de réponse" @@ -1291,11 +1290,11 @@ msgstr "Source alsa" msgid "Alsa sound output" msgstr "Sortie alsa" -#: ../mediastreamer2/src/aqsnd.c:1005 +#: ../mediastreamer2/src/aqsnd.c:1008 msgid "Sound capture filter for MacOS X Audio Queue Service" msgstr "" -#: ../mediastreamer2/src/aqsnd.c:1029 +#: ../mediastreamer2/src/aqsnd.c:1032 msgid "Sound playback filter for MacOS X Audio Queue Service" msgstr "" @@ -1311,11 +1310,11 @@ msgstr "Le codec GSM full-rate" msgid "The GSM codec" msgstr "Le codec GSM" -#: ../mediastreamer2/src/macsnd.c:670 +#: ../mediastreamer2/src/macsnd.c:1083 msgid "Sound capture filter for MacOS X Core Audio drivers" msgstr "" -#: ../mediastreamer2/src/macsnd.c:684 +#: ../mediastreamer2/src/macsnd.c:1098 msgid "Sound playback filter for MacOS X Core Audio drivers" msgstr "" @@ -1360,7 +1359,7 @@ msgstr "Le codec speex, libre et performant" msgid "A filter that controls and measure sound volume" msgstr "" -#: ../mediastreamer2/src/msv4l.c:1009 +#: ../mediastreamer2/src/msv4l.c:1011 msgid "A video4linux compatible source filter to stream pictures." msgstr "" @@ -1513,3 +1512,5 @@ msgstr "" msgid "A webcam grabber based on directshow." msgstr "" +#~ msgid "Error." +#~ msgstr "Erreur." diff --git a/po/hu.po b/po/hu.po index eb5385b5f..8e2e1c152 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-02 10:28+0200\n" +"POT-Creation-Date: 2010-04-22 17:16+0200\n" "PO-Revision-Date: 2007-12-14 11:12+0100\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" @@ -26,39 +26,39 @@ msgstr "Nemtalálható a pixmap fájl: %s" msgid "Chat with %s" msgstr "Chat-elés %s -el" -#: ../gtk-glade/main.c:92 +#: ../gtk-glade/main.c:94 msgid "log to stdout some debug information while running." msgstr "" -#: ../gtk-glade/main.c:99 +#: ../gtk-glade/main.c:101 msgid "Start only in the system tray, do not show the main interface." msgstr "" -#: ../gtk-glade/main.c:106 +#: ../gtk-glade/main.c:108 msgid "address to call right now" msgstr "" -#: ../gtk-glade/main.c:113 +#: ../gtk-glade/main.c:115 msgid "if set automatically answer incoming calls" msgstr "" -#: ../gtk-glade/main.c:121 +#: ../gtk-glade/main.c:123 msgid "" "Specifiy a working directory (should be the base of the installation, eg: c:" "\\Program Files\\Linphone)" msgstr "" -#: ../gtk-glade/main.c:396 +#: ../gtk-glade/main.c:402 #, fuzzy, c-format msgid "Call with %s" msgstr "Chat-elés %s -el" -#: ../gtk-glade/main.c:707 +#: ../gtk-glade/main.c:720 #, fuzzy, c-format msgid "Incoming call from %s" msgstr "Beérkező hívás" -#: ../gtk-glade/main.c:746 +#: ../gtk-glade/main.c:759 #, c-format msgid "" "%s would like to add you to his contact list.\n" @@ -67,31 +67,37 @@ msgid "" "If you answer no, this person will be temporarily blacklisted." msgstr "" -#: ../gtk-glade/main.c:824 +#: ../gtk-glade/main.c:837 #, c-format msgid "" "Please enter your password for username %s\n" " at domain %s:" msgstr "" -#: ../gtk-glade/main.c:921 +#: ../gtk-glade/main.c:934 msgid "Website link" msgstr "" -#: ../gtk-glade/main.c:957 +#: ../gtk-glade/main.c:970 msgid "Linphone - a video internet phone" msgstr "" -#: ../gtk-glade/main.c:976 +#: ../gtk-glade/main.c:989 #, c-format msgid "%s (Default)" msgstr "" -#: ../gtk-glade/main.c:1229 +#: ../gtk-glade/main.c:1221 +msgid "" +"No sound cards have been detected on this computer.\n" +"You won't be able to send or receive audio calls." +msgstr "" + +#: ../gtk-glade/main.c:1275 msgid "A free SIP video-phone" msgstr "Egy ingyenes SIP video-telefon" -#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:247 +#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:258 #: ../gtk-glade/contact.glade.h:3 msgid "Name" msgstr "Név" @@ -134,91 +140,91 @@ msgstr "" msgid "Add new contact from %s directory" msgstr "" -#: ../gtk-glade/propertybox.c:253 +#: ../gtk-glade/propertybox.c:264 msgid "Rate (Hz)" msgstr "Érték (Hz)" -#: ../gtk-glade/propertybox.c:259 +#: ../gtk-glade/propertybox.c:270 msgid "Status" msgstr "Állapot" -#: ../gtk-glade/propertybox.c:265 +#: ../gtk-glade/propertybox.c:276 msgid "Min bitrate (kbit/s)" msgstr "Min bitrate (kbit/s)" -#: ../gtk-glade/propertybox.c:271 +#: ../gtk-glade/propertybox.c:283 msgid "Parameters" msgstr "Paraméterek" -#: ../gtk-glade/propertybox.c:298 ../gtk-glade/propertybox.c:437 +#: ../gtk-glade/propertybox.c:312 ../gtk-glade/propertybox.c:451 msgid "Enabled" msgstr "Engedélyezve" -#: ../gtk-glade/propertybox.c:299 ../gtk-glade/propertybox.c:437 +#: ../gtk-glade/propertybox.c:313 ../gtk-glade/propertybox.c:451 msgid "Disabled" msgstr "Tiltva" -#: ../gtk-glade/propertybox.c:482 +#: ../gtk-glade/propertybox.c:496 msgid "Account" msgstr "Hozzáférés" -#: ../gtk-glade/propertybox.c:622 +#: ../gtk-glade/propertybox.c:636 msgid "English" msgstr "" -#: ../gtk-glade/propertybox.c:623 +#: ../gtk-glade/propertybox.c:637 msgid "French" msgstr "" -#: ../gtk-glade/propertybox.c:624 +#: ../gtk-glade/propertybox.c:638 msgid "Swedish" msgstr "" -#: ../gtk-glade/propertybox.c:625 +#: ../gtk-glade/propertybox.c:639 msgid "Italian" msgstr "" -#: ../gtk-glade/propertybox.c:626 +#: ../gtk-glade/propertybox.c:640 msgid "Spanish" msgstr "" -#: ../gtk-glade/propertybox.c:627 +#: ../gtk-glade/propertybox.c:641 msgid "Brazilian Portugese" msgstr "" -#: ../gtk-glade/propertybox.c:628 +#: ../gtk-glade/propertybox.c:642 msgid "Polish" msgstr "" -#: ../gtk-glade/propertybox.c:629 +#: ../gtk-glade/propertybox.c:643 msgid "German" msgstr "" -#: ../gtk-glade/propertybox.c:630 +#: ../gtk-glade/propertybox.c:644 msgid "Russian" msgstr "" -#: ../gtk-glade/propertybox.c:631 +#: ../gtk-glade/propertybox.c:645 msgid "Japanese" msgstr "" -#: ../gtk-glade/propertybox.c:632 +#: ../gtk-glade/propertybox.c:646 msgid "Dutch" msgstr "" -#: ../gtk-glade/propertybox.c:633 +#: ../gtk-glade/propertybox.c:647 msgid "Hungarian" msgstr "" -#: ../gtk-glade/propertybox.c:634 +#: ../gtk-glade/propertybox.c:648 msgid "Czech" msgstr "" -#: ../gtk-glade/propertybox.c:635 +#: ../gtk-glade/propertybox.c:649 msgid "Chinese" msgstr "" -#: ../gtk-glade/propertybox.c:692 +#: ../gtk-glade/propertybox.c:706 msgid "" "You need to restart linphone for the new language selection to take effect." msgstr "" @@ -748,7 +754,7 @@ msgstr "Elfogad" msgid "Decline" msgstr "line" -#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:368 +#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:369 msgid "Incoming call" msgstr "Beérkező hívás" @@ -1024,18 +1030,6 @@ msgstr "" msgid "default soundcard\n" msgstr "" -#: ../gtk-glade/parameters.glade.h:65 -msgid "gtk-go-down" -msgstr "" - -#: ../gtk-glade/parameters.glade.h:66 -msgid "gtk-go-up" -msgstr "" - -#: ../gtk-glade/parameters.glade.h:67 -msgid "gtk-media-play" -msgstr "" - #: ../gtk-glade/buddylookup.glade.h:1 msgid "Search somebody" msgstr "" @@ -1056,26 +1050,26 @@ msgstr "Linphone" msgid "Please wait" msgstr "" -#: ../coreapi/linphonecore.c:310 +#: ../coreapi/linphonecore.c:311 #, fuzzy, c-format msgid "You have missed %i call." msgid_plural "You have missed %i calls." msgstr[0] "Van %i elhibázott hivás." msgstr[1] "Van %i elhibázott hivás." -#: ../coreapi/linphonecore.c:356 +#: ../coreapi/linphonecore.c:357 msgid "aborted" msgstr "megszakítva" -#: ../coreapi/linphonecore.c:359 +#: ../coreapi/linphonecore.c:360 msgid "completed" msgstr "befejezve" -#: ../coreapi/linphonecore.c:362 +#: ../coreapi/linphonecore.c:363 msgid "missed" msgstr "elhibázva" -#: ../coreapi/linphonecore.c:367 +#: ../coreapi/linphonecore.c:368 #, c-format msgid "" "%s at %s\n" @@ -1090,11 +1084,11 @@ msgstr "" "Állapot: %s\n" "Időtartam: %i perc %i másodperc\n" -#: ../coreapi/linphonecore.c:368 +#: ../coreapi/linphonecore.c:369 msgid "Outgoing call" msgstr "Kimenő hívás" -#: ../coreapi/linphonecore.c:625 +#: ../coreapi/linphonecore.c:626 msgid "" "Your machine appears to be connected to an IPv6 network. By default linphone " "always uses IPv4. Please update your configuration if you want to use IPv6" @@ -1103,50 +1097,50 @@ msgstr "" "mindig az IPv4-et használja. Frissítsd a konfigurációdat, ha használni " "akarod az IPv6-ot" -#: ../coreapi/linphonecore.c:1074 +#: ../coreapi/linphonecore.c:1083 msgid "Ready" msgstr "Kész" -#: ../coreapi/linphonecore.c:1505 +#: ../coreapi/linphonecore.c:1513 msgid "Remote end seems to have disconnected, the call is going to be closed." msgstr "" -#: ../coreapi/linphonecore.c:1703 +#: ../coreapi/linphonecore.c:1725 msgid "Looking for telephone number destination..." msgstr "Telefonszám-cél keresése..." -#: ../coreapi/linphonecore.c:1705 +#: ../coreapi/linphonecore.c:1727 msgid "Could not resolve this number." msgstr "Nem sikkerült értelmezni a számot." -#: ../coreapi/linphonecore.c:1749 +#: ../coreapi/linphonecore.c:1771 msgid "" "Could not parse given sip address. A sip url usually looks like sip:" "user@domain" msgstr "" "Az adott szám nem értelmezhető. Egy sip cím általában így néz ki: user@domain" -#: ../coreapi/linphonecore.c:1890 +#: ../coreapi/linphonecore.c:1912 msgid "Contacting" msgstr "Kapcsolódás" -#: ../coreapi/linphonecore.c:1896 +#: ../coreapi/linphonecore.c:1918 msgid "could not call" msgstr "nem sikerült hívni" -#: ../coreapi/linphonecore.c:1942 +#: ../coreapi/linphonecore.c:1965 msgid "Sorry, having multiple simultaneous calls is not supported yet !" msgstr "Bocsánat, a többszörös egyidejű hívások még nem támogatottak!" -#: ../coreapi/linphonecore.c:2337 ../coreapi/callbacks.c:32 +#: ../coreapi/linphonecore.c:2370 ../coreapi/callbacks.c:32 msgid "Connected." msgstr "Kapcsolódva." -#: ../coreapi/linphonecore.c:2371 +#: ../coreapi/linphonecore.c:2404 msgid "Call ended" msgstr "Hívás vége" -#: ../coreapi/misc.c:142 +#: ../coreapi/misc.c:147 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the pcm oss emulation module\n" @@ -1158,7 +1152,7 @@ msgstr "" " a linphone-nak szüksége van és ez hiányzik. Kérem futassa le a\n" "'modprobe snd-pcm-oss' parancsot rendszergazdaként." -#: ../coreapi/misc.c:145 +#: ../coreapi/misc.c:150 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the mixer oss emulation module\n" @@ -1170,7 +1164,7 @@ msgstr "" " a linphone-nak szüksége van és ez hiányzik. Kérem futassa le a\n" "'modprobe snd-pcm-oss' parancsot rendszergazdaként." -#: ../coreapi/misc.c:492 +#: ../coreapi/misc.c:497 msgid "Stun lookup in progress..." msgstr "Stun keresés folyamatban..." @@ -1287,49 +1281,49 @@ msgstr "A felhasználó nem akarja, hogy zavarják." msgid "Call declined." msgstr "Hívás elutasítva" -#: ../coreapi/callbacks.c:280 +#: ../coreapi/callbacks.c:281 #, fuzzy msgid "No response." msgstr "időtúllépés után nincs válasz" -#: ../coreapi/callbacks.c:283 -msgid "Error." +#: ../coreapi/callbacks.c:284 +msgid "Protocol error." msgstr "" -#: ../coreapi/callbacks.c:296 +#: ../coreapi/callbacks.c:298 #, fuzzy msgid "Redirected" msgstr "Átirányítva idw %s..." -#: ../coreapi/callbacks.c:304 +#: ../coreapi/callbacks.c:308 msgid "Not found" msgstr "" -#: ../coreapi/callbacks.c:312 +#: ../coreapi/callbacks.c:318 msgid "No common codecs" msgstr "" -#: ../coreapi/callbacks.c:316 +#: ../coreapi/callbacks.c:324 #, fuzzy msgid "Call failed." msgstr "Hívás elutasítva" -#: ../coreapi/callbacks.c:365 +#: ../coreapi/callbacks.c:374 #, c-format msgid "Registration on %s successful." msgstr "A regisztáció a %s -n sikerült." -#: ../coreapi/callbacks.c:366 +#: ../coreapi/callbacks.c:375 #, fuzzy, c-format msgid "Unregistration on %s done." msgstr "A regisztáció a %s -n sikerült." -#: ../coreapi/callbacks.c:374 +#: ../coreapi/callbacks.c:383 #, c-format msgid "Registration on %s failed: %s" msgstr "A regisztáció a %s -n nem sikerült: %s" -#: ../coreapi/callbacks.c:374 +#: ../coreapi/callbacks.c:383 msgid "no response timeout" msgstr "időtúllépés után nincs válasz" @@ -1349,11 +1343,11 @@ msgstr "" msgid "Alsa sound output" msgstr "" -#: ../mediastreamer2/src/aqsnd.c:1005 +#: ../mediastreamer2/src/aqsnd.c:1008 msgid "Sound capture filter for MacOS X Audio Queue Service" msgstr "" -#: ../mediastreamer2/src/aqsnd.c:1029 +#: ../mediastreamer2/src/aqsnd.c:1032 msgid "Sound playback filter for MacOS X Audio Queue Service" msgstr "" @@ -1369,11 +1363,11 @@ msgstr "" msgid "The GSM codec" msgstr "" -#: ../mediastreamer2/src/macsnd.c:670 +#: ../mediastreamer2/src/macsnd.c:1083 msgid "Sound capture filter for MacOS X Core Audio drivers" msgstr "" -#: ../mediastreamer2/src/macsnd.c:684 +#: ../mediastreamer2/src/macsnd.c:1098 msgid "Sound playback filter for MacOS X Core Audio drivers" msgstr "" @@ -1418,7 +1412,7 @@ msgstr "" msgid "A filter that controls and measure sound volume" msgstr "" -#: ../mediastreamer2/src/msv4l.c:1009 +#: ../mediastreamer2/src/msv4l.c:1011 msgid "A video4linux compatible source filter to stream pictures." msgstr "" diff --git a/po/it.po b/po/it.po index c9fbafb23..9fd95ae77 100644 --- a/po/it.po +++ b/po/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Linphone 3.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-02 10:28+0200\n" +"POT-Creation-Date: 2010-04-22 17:16+0200\n" "PO-Revision-Date: 2002-10-15 HO:MI+ZONE\n" "Last-Translator: Matteo Piazza \n" "Language-Team: it \n" @@ -25,39 +25,39 @@ msgstr "" msgid "Chat with %s" msgstr "Chat con %s" -#: ../gtk-glade/main.c:92 +#: ../gtk-glade/main.c:94 msgid "log to stdout some debug information while running." msgstr "" -#: ../gtk-glade/main.c:99 +#: ../gtk-glade/main.c:101 msgid "Start only in the system tray, do not show the main interface." msgstr "" -#: ../gtk-glade/main.c:106 +#: ../gtk-glade/main.c:108 msgid "address to call right now" msgstr "" -#: ../gtk-glade/main.c:113 +#: ../gtk-glade/main.c:115 msgid "if set automatically answer incoming calls" msgstr "" -#: ../gtk-glade/main.c:121 +#: ../gtk-glade/main.c:123 msgid "" "Specifiy a working directory (should be the base of the installation, eg: c:" "\\Program Files\\Linphone)" msgstr "" -#: ../gtk-glade/main.c:396 +#: ../gtk-glade/main.c:402 #, fuzzy, c-format msgid "Call with %s" msgstr "Chat con %s" -#: ../gtk-glade/main.c:707 +#: ../gtk-glade/main.c:720 #, c-format msgid "Incoming call from %s" msgstr "Chiamata proveniente da %s" -#: ../gtk-glade/main.c:746 +#: ../gtk-glade/main.c:759 #, c-format msgid "" "%s would like to add you to his contact list.\n" @@ -69,31 +69,37 @@ msgstr "" "veda il tuo stato o aggiungerlo alla tua lista dei contatti Se rispondi no " "questo utente sarà momentaneamente bloccato." -#: ../gtk-glade/main.c:824 +#: ../gtk-glade/main.c:837 #, c-format msgid "" "Please enter your password for username %s\n" " at domain %s:" msgstr "Prego inserire la password per username %s e dominio %s" -#: ../gtk-glade/main.c:921 +#: ../gtk-glade/main.c:934 msgid "Website link" msgstr "" -#: ../gtk-glade/main.c:957 +#: ../gtk-glade/main.c:970 msgid "Linphone - a video internet phone" msgstr "" -#: ../gtk-glade/main.c:976 +#: ../gtk-glade/main.c:989 #, c-format msgid "%s (Default)" msgstr "%s (Default)" -#: ../gtk-glade/main.c:1229 +#: ../gtk-glade/main.c:1221 +msgid "" +"No sound cards have been detected on this computer.\n" +"You won't be able to send or receive audio calls." +msgstr "" + +#: ../gtk-glade/main.c:1275 msgid "A free SIP video-phone" msgstr "" -#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:247 +#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:258 #: ../gtk-glade/contact.glade.h:3 msgid "Name" msgstr "Nome" @@ -136,91 +142,91 @@ msgstr "Elimina contatto %s" msgid "Add new contact from %s directory" msgstr "Aggiungi nuovo contatto dalla directory %s" -#: ../gtk-glade/propertybox.c:253 +#: ../gtk-glade/propertybox.c:264 msgid "Rate (Hz)" msgstr "" -#: ../gtk-glade/propertybox.c:259 +#: ../gtk-glade/propertybox.c:270 msgid "Status" msgstr "Stato" -#: ../gtk-glade/propertybox.c:265 +#: ../gtk-glade/propertybox.c:276 msgid "Min bitrate (kbit/s)" msgstr "Bitrate Min (kbit/s)" -#: ../gtk-glade/propertybox.c:271 +#: ../gtk-glade/propertybox.c:283 msgid "Parameters" msgstr "Parametri" -#: ../gtk-glade/propertybox.c:298 ../gtk-glade/propertybox.c:437 +#: ../gtk-glade/propertybox.c:312 ../gtk-glade/propertybox.c:451 msgid "Enabled" msgstr "Attivato" -#: ../gtk-glade/propertybox.c:299 ../gtk-glade/propertybox.c:437 +#: ../gtk-glade/propertybox.c:313 ../gtk-glade/propertybox.c:451 msgid "Disabled" msgstr "Disattivato" -#: ../gtk-glade/propertybox.c:482 +#: ../gtk-glade/propertybox.c:496 msgid "Account" msgstr "Account" -#: ../gtk-glade/propertybox.c:622 +#: ../gtk-glade/propertybox.c:636 msgid "English" msgstr "Inglese" -#: ../gtk-glade/propertybox.c:623 +#: ../gtk-glade/propertybox.c:637 msgid "French" msgstr "Francese" -#: ../gtk-glade/propertybox.c:624 +#: ../gtk-glade/propertybox.c:638 msgid "Swedish" msgstr "Svedese" -#: ../gtk-glade/propertybox.c:625 +#: ../gtk-glade/propertybox.c:639 msgid "Italian" msgstr "Italiano" -#: ../gtk-glade/propertybox.c:626 +#: ../gtk-glade/propertybox.c:640 msgid "Spanish" msgstr "Spagnolo" -#: ../gtk-glade/propertybox.c:627 +#: ../gtk-glade/propertybox.c:641 msgid "Brazilian Portugese" msgstr "" -#: ../gtk-glade/propertybox.c:628 +#: ../gtk-glade/propertybox.c:642 msgid "Polish" msgstr "Polacco" -#: ../gtk-glade/propertybox.c:629 +#: ../gtk-glade/propertybox.c:643 msgid "German" msgstr "Tedesco" -#: ../gtk-glade/propertybox.c:630 +#: ../gtk-glade/propertybox.c:644 msgid "Russian" msgstr "Russo" -#: ../gtk-glade/propertybox.c:631 +#: ../gtk-glade/propertybox.c:645 msgid "Japanese" msgstr "Giapponese" -#: ../gtk-glade/propertybox.c:632 +#: ../gtk-glade/propertybox.c:646 msgid "Dutch" msgstr "Olandese" -#: ../gtk-glade/propertybox.c:633 +#: ../gtk-glade/propertybox.c:647 msgid "Hungarian" msgstr "Ungherese" -#: ../gtk-glade/propertybox.c:634 +#: ../gtk-glade/propertybox.c:648 msgid "Czech" msgstr "Ceco" -#: ../gtk-glade/propertybox.c:635 +#: ../gtk-glade/propertybox.c:649 msgid "Chinese" msgstr "" -#: ../gtk-glade/propertybox.c:692 +#: ../gtk-glade/propertybox.c:706 msgid "" "You need to restart linphone for the new language selection to take effect." msgstr "Riavviare il software per utilizzare la nuova lingua selezionata" @@ -727,7 +733,7 @@ msgstr "Accetta" msgid "Decline" msgstr "Rifiuta" -#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:368 +#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:369 msgid "Incoming call" msgstr "Chimata in entrata" @@ -985,18 +991,6 @@ msgstr "default scheda audio" msgid "default soundcard\n" msgstr "default scheda audio\n" -#: ../gtk-glade/parameters.glade.h:65 -msgid "gtk-go-down" -msgstr "" - -#: ../gtk-glade/parameters.glade.h:66 -msgid "gtk-go-up" -msgstr "" - -#: ../gtk-glade/parameters.glade.h:67 -msgid "gtk-media-play" -msgstr "" - #: ../gtk-glade/buddylookup.glade.h:1 msgid "Search somebody" msgstr "Cerca" @@ -1017,26 +1011,26 @@ msgstr "Linphone" msgid "Please wait" msgstr "Prego attendere" -#: ../coreapi/linphonecore.c:310 +#: ../coreapi/linphonecore.c:311 #, c-format msgid "You have missed %i call." msgid_plural "You have missed %i calls." msgstr[0] "" msgstr[1] "" -#: ../coreapi/linphonecore.c:356 +#: ../coreapi/linphonecore.c:357 msgid "aborted" msgstr "annullato" -#: ../coreapi/linphonecore.c:359 +#: ../coreapi/linphonecore.c:360 msgid "completed" msgstr "comletato" -#: ../coreapi/linphonecore.c:362 +#: ../coreapi/linphonecore.c:363 msgid "missed" msgstr "mancante" -#: ../coreapi/linphonecore.c:367 +#: ../coreapi/linphonecore.c:368 #, c-format msgid "" "%s at %s\n" @@ -1051,11 +1045,11 @@ msgstr "" "Stato: %s\n" "Durata: %i mn %i sec\n" -#: ../coreapi/linphonecore.c:368 +#: ../coreapi/linphonecore.c:369 msgid "Outgoing call" msgstr "Chiamata in uscita" -#: ../coreapi/linphonecore.c:625 +#: ../coreapi/linphonecore.c:626 msgid "" "Your machine appears to be connected to an IPv6 network. By default linphone " "always uses IPv4. Please update your configuration if you want to use IPv6" @@ -1063,23 +1057,23 @@ msgstr "" "La tua macchina sembra connessa ad una rete IPv6. Di default linphone " "utilizza IPv4. Prego aggiorna la tua configurazione se vuoi usare IPv6" -#: ../coreapi/linphonecore.c:1074 +#: ../coreapi/linphonecore.c:1083 msgid "Ready" msgstr "Pronto" -#: ../coreapi/linphonecore.c:1505 +#: ../coreapi/linphonecore.c:1513 msgid "Remote end seems to have disconnected, the call is going to be closed." msgstr "L'utente remoto sembra disconesso, la chiamata verrà terminata" -#: ../coreapi/linphonecore.c:1703 +#: ../coreapi/linphonecore.c:1725 msgid "Looking for telephone number destination..." msgstr "Ricerca numero destinazione..." -#: ../coreapi/linphonecore.c:1705 +#: ../coreapi/linphonecore.c:1727 msgid "Could not resolve this number." msgstr "Impossibile risolvere il numero." -#: ../coreapi/linphonecore.c:1749 +#: ../coreapi/linphonecore.c:1771 msgid "" "Could not parse given sip address. A sip url usually looks like sip:" "user@domain" @@ -1087,27 +1081,27 @@ msgstr "" "Errore nel formato del contatto sip. Usualmente un indirizzo appare sip:" "user@domain" -#: ../coreapi/linphonecore.c:1890 +#: ../coreapi/linphonecore.c:1912 msgid "Contacting" msgstr "In connessione" -#: ../coreapi/linphonecore.c:1896 +#: ../coreapi/linphonecore.c:1918 msgid "could not call" msgstr "chiamata fallita" -#: ../coreapi/linphonecore.c:1942 +#: ../coreapi/linphonecore.c:1965 msgid "Sorry, having multiple simultaneous calls is not supported yet !" msgstr "Spiacenti, le chiamate multiple non sono supportate" -#: ../coreapi/linphonecore.c:2337 ../coreapi/callbacks.c:32 +#: ../coreapi/linphonecore.c:2370 ../coreapi/callbacks.c:32 msgid "Connected." msgstr "Connessione" -#: ../coreapi/linphonecore.c:2371 +#: ../coreapi/linphonecore.c:2404 msgid "Call ended" msgstr "Chiamata terminata" -#: ../coreapi/misc.c:142 +#: ../coreapi/misc.c:147 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the pcm oss emulation module\n" @@ -1119,7 +1113,7 @@ msgstr "" "è assente e linphone lo richede. Prego eseguire\n" "'modprobe snd-pcm-oss' da utente root per caricarlo." -#: ../coreapi/misc.c:145 +#: ../coreapi/misc.c:150 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the mixer oss emulation module\n" @@ -1131,7 +1125,7 @@ msgstr "" "è assente e linphone lo richede. Prego eseguire\n" "'modprobe snd-mixer-oss' da utente root per caricarlo." -#: ../coreapi/misc.c:492 +#: ../coreapi/misc.c:497 msgid "Stun lookup in progress..." msgstr "Ricerca Stun in progresso ..." @@ -1246,49 +1240,49 @@ msgstr "L'utente non vuole essere disturbato" msgid "Call declined." msgstr "Chiamata rifiutata" -#: ../coreapi/callbacks.c:280 +#: ../coreapi/callbacks.c:281 #, fuzzy msgid "No response." msgstr "timeout no risposta" -#: ../coreapi/callbacks.c:283 -msgid "Error." +#: ../coreapi/callbacks.c:284 +msgid "Protocol error." msgstr "" -#: ../coreapi/callbacks.c:296 +#: ../coreapi/callbacks.c:298 #, fuzzy msgid "Redirected" msgstr "Rediretto verso %s..." -#: ../coreapi/callbacks.c:304 +#: ../coreapi/callbacks.c:308 msgid "Not found" msgstr "" -#: ../coreapi/callbacks.c:312 +#: ../coreapi/callbacks.c:318 msgid "No common codecs" msgstr "" -#: ../coreapi/callbacks.c:316 +#: ../coreapi/callbacks.c:324 #, fuzzy msgid "Call failed." msgstr "Chiamata rifiutata" -#: ../coreapi/callbacks.c:365 +#: ../coreapi/callbacks.c:374 #, c-format msgid "Registration on %s successful." msgstr "Registrazione su %s attiva" -#: ../coreapi/callbacks.c:366 +#: ../coreapi/callbacks.c:375 #, c-format msgid "Unregistration on %s done." msgstr "Unregistrazione su %s" -#: ../coreapi/callbacks.c:374 +#: ../coreapi/callbacks.c:383 #, c-format msgid "Registration on %s failed: %s" msgstr "Registrazione su %s fallita: %s" -#: ../coreapi/callbacks.c:374 +#: ../coreapi/callbacks.c:383 msgid "no response timeout" msgstr "timeout no risposta" @@ -1308,11 +1302,11 @@ msgstr "Alsa sound sorgente" msgid "Alsa sound output" msgstr "Alsa sound riproduzione" -#: ../mediastreamer2/src/aqsnd.c:1005 +#: ../mediastreamer2/src/aqsnd.c:1008 msgid "Sound capture filter for MacOS X Audio Queue Service" msgstr "Sound capture filter for MacOS X Audio Queue Service" -#: ../mediastreamer2/src/aqsnd.c:1029 +#: ../mediastreamer2/src/aqsnd.c:1032 msgid "Sound playback filter for MacOS X Audio Queue Service" msgstr "Sound playback filter for MacOS X Audio Queue Service" @@ -1328,11 +1322,11 @@ msgstr "GSM full-rate codec" msgid "The GSM codec" msgstr "GSM codec" -#: ../mediastreamer2/src/macsnd.c:670 +#: ../mediastreamer2/src/macsnd.c:1083 msgid "Sound capture filter for MacOS X Core Audio drivers" msgstr "Sound capture filter for MacOS X Core Audio drivers" -#: ../mediastreamer2/src/macsnd.c:684 +#: ../mediastreamer2/src/macsnd.c:1098 msgid "Sound playback filter for MacOS X Core Audio drivers" msgstr "Sound playback filter for MacOS X Core Audio drivers" @@ -1377,7 +1371,7 @@ msgstr "The free and wonderful speex codec" msgid "A filter that controls and measure sound volume" msgstr "Un filtro che controlla e misura il volume" -#: ../mediastreamer2/src/msv4l.c:1009 +#: ../mediastreamer2/src/msv4l.c:1011 msgid "A video4linux compatible source filter to stream pictures." msgstr "Un video4linux filtro per inviare immagini" diff --git a/po/ja.po b/po/ja.po index fb4eb9c27..f312c7afa 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: linphone 0.10\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-02 10:28+0200\n" +"POT-Creation-Date: 2010-04-22 17:16+0200\n" "PO-Revision-Date: 2003-01-21 00:05+9000\n" "Last-Translator: YAMAGUCHI YOSHIYA \n" "Language-Team: \n" @@ -27,39 +27,39 @@ msgstr "pixmapファイルが見つかりません %s" msgid "Chat with %s" msgstr "" -#: ../gtk-glade/main.c:92 +#: ../gtk-glade/main.c:94 msgid "log to stdout some debug information while running." msgstr "" -#: ../gtk-glade/main.c:99 +#: ../gtk-glade/main.c:101 msgid "Start only in the system tray, do not show the main interface." msgstr "" -#: ../gtk-glade/main.c:106 +#: ../gtk-glade/main.c:108 msgid "address to call right now" msgstr "" -#: ../gtk-glade/main.c:113 +#: ../gtk-glade/main.c:115 msgid "if set automatically answer incoming calls" msgstr "" -#: ../gtk-glade/main.c:121 +#: ../gtk-glade/main.c:123 msgid "" "Specifiy a working directory (should be the base of the installation, eg: c:" "\\Program Files\\Linphone)" msgstr "" -#: ../gtk-glade/main.c:396 +#: ../gtk-glade/main.c:402 #, c-format msgid "Call with %s" msgstr "" -#: ../gtk-glade/main.c:707 +#: ../gtk-glade/main.c:720 #, c-format msgid "Incoming call from %s" msgstr "" -#: ../gtk-glade/main.c:746 +#: ../gtk-glade/main.c:759 #, c-format msgid "" "%s would like to add you to his contact list.\n" @@ -68,31 +68,37 @@ msgid "" "If you answer no, this person will be temporarily blacklisted." msgstr "" -#: ../gtk-glade/main.c:824 +#: ../gtk-glade/main.c:837 #, c-format msgid "" "Please enter your password for username %s\n" " at domain %s:" msgstr "" -#: ../gtk-glade/main.c:921 +#: ../gtk-glade/main.c:934 msgid "Website link" msgstr "" -#: ../gtk-glade/main.c:957 +#: ../gtk-glade/main.c:970 msgid "Linphone - a video internet phone" msgstr "" -#: ../gtk-glade/main.c:976 +#: ../gtk-glade/main.c:989 #, c-format msgid "%s (Default)" msgstr "" -#: ../gtk-glade/main.c:1229 +#: ../gtk-glade/main.c:1221 +msgid "" +"No sound cards have been detected on this computer.\n" +"You won't be able to send or receive audio calls." +msgstr "" + +#: ../gtk-glade/main.c:1275 msgid "A free SIP video-phone" msgstr "" -#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:247 +#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:258 #: ../gtk-glade/contact.glade.h:3 msgid "Name" msgstr "名前" @@ -136,91 +142,91 @@ msgstr "" msgid "Add new contact from %s directory" msgstr "" -#: ../gtk-glade/propertybox.c:253 +#: ../gtk-glade/propertybox.c:264 msgid "Rate (Hz)" msgstr "" -#: ../gtk-glade/propertybox.c:259 +#: ../gtk-glade/propertybox.c:270 msgid "Status" msgstr "状態" -#: ../gtk-glade/propertybox.c:265 +#: ../gtk-glade/propertybox.c:276 msgid "Min bitrate (kbit/s)" msgstr "最低限のビットレート (kbit/s)" -#: ../gtk-glade/propertybox.c:271 +#: ../gtk-glade/propertybox.c:283 msgid "Parameters" msgstr "パラメーター" -#: ../gtk-glade/propertybox.c:298 ../gtk-glade/propertybox.c:437 +#: ../gtk-glade/propertybox.c:312 ../gtk-glade/propertybox.c:451 msgid "Enabled" msgstr "使用する" -#: ../gtk-glade/propertybox.c:299 ../gtk-glade/propertybox.c:437 +#: ../gtk-glade/propertybox.c:313 ../gtk-glade/propertybox.c:451 msgid "Disabled" msgstr "使用しない" -#: ../gtk-glade/propertybox.c:482 +#: ../gtk-glade/propertybox.c:496 msgid "Account" msgstr "" -#: ../gtk-glade/propertybox.c:622 +#: ../gtk-glade/propertybox.c:636 msgid "English" msgstr "" -#: ../gtk-glade/propertybox.c:623 +#: ../gtk-glade/propertybox.c:637 msgid "French" msgstr "Français" -#: ../gtk-glade/propertybox.c:624 +#: ../gtk-glade/propertybox.c:638 msgid "Swedish" msgstr "" -#: ../gtk-glade/propertybox.c:625 +#: ../gtk-glade/propertybox.c:639 msgid "Italian" msgstr "" -#: ../gtk-glade/propertybox.c:626 +#: ../gtk-glade/propertybox.c:640 msgid "Spanish" msgstr "" -#: ../gtk-glade/propertybox.c:627 +#: ../gtk-glade/propertybox.c:641 msgid "Brazilian Portugese" msgstr "" -#: ../gtk-glade/propertybox.c:628 +#: ../gtk-glade/propertybox.c:642 msgid "Polish" msgstr "" -#: ../gtk-glade/propertybox.c:629 +#: ../gtk-glade/propertybox.c:643 msgid "German" msgstr "" -#: ../gtk-glade/propertybox.c:630 +#: ../gtk-glade/propertybox.c:644 msgid "Russian" msgstr "" -#: ../gtk-glade/propertybox.c:631 +#: ../gtk-glade/propertybox.c:645 msgid "Japanese" msgstr "日本語" -#: ../gtk-glade/propertybox.c:632 +#: ../gtk-glade/propertybox.c:646 msgid "Dutch" msgstr "" -#: ../gtk-glade/propertybox.c:633 +#: ../gtk-glade/propertybox.c:647 msgid "Hungarian" msgstr "Magyar" -#: ../gtk-glade/propertybox.c:634 +#: ../gtk-glade/propertybox.c:648 msgid "Czech" msgstr "čeština" -#: ../gtk-glade/propertybox.c:635 +#: ../gtk-glade/propertybox.c:649 msgid "Chinese" msgstr "简体中文" -#: ../gtk-glade/propertybox.c:692 +#: ../gtk-glade/propertybox.c:706 msgid "" "You need to restart linphone for the new language selection to take effect." msgstr "" @@ -743,7 +749,7 @@ msgstr "" msgid "Decline" msgstr "ライン入力" -#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:368 +#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:369 msgid "Incoming call" msgstr "" @@ -1014,18 +1020,6 @@ msgstr "" msgid "default soundcard\n" msgstr "" -#: ../gtk-glade/parameters.glade.h:65 -msgid "gtk-go-down" -msgstr "" - -#: ../gtk-glade/parameters.glade.h:66 -msgid "gtk-go-up" -msgstr "" - -#: ../gtk-glade/parameters.glade.h:67 -msgid "gtk-media-play" -msgstr "" - #: ../gtk-glade/buddylookup.glade.h:1 msgid "Search somebody" msgstr "" @@ -1047,26 +1041,26 @@ msgstr "Linphone" msgid "Please wait" msgstr "" -#: ../coreapi/linphonecore.c:310 +#: ../coreapi/linphonecore.c:311 #, c-format msgid "You have missed %i call." msgid_plural "You have missed %i calls." msgstr[0] "" msgstr[1] "" -#: ../coreapi/linphonecore.c:356 +#: ../coreapi/linphonecore.c:357 msgid "aborted" msgstr "" -#: ../coreapi/linphonecore.c:359 +#: ../coreapi/linphonecore.c:360 msgid "completed" msgstr "" -#: ../coreapi/linphonecore.c:362 +#: ../coreapi/linphonecore.c:363 msgid "missed" msgstr "" -#: ../coreapi/linphonecore.c:367 +#: ../coreapi/linphonecore.c:368 #, c-format msgid "" "%s at %s\n" @@ -1076,34 +1070,34 @@ msgid "" "Duration: %i mn %i sec\n" msgstr "" -#: ../coreapi/linphonecore.c:368 +#: ../coreapi/linphonecore.c:369 msgid "Outgoing call" msgstr "" -#: ../coreapi/linphonecore.c:625 +#: ../coreapi/linphonecore.c:626 msgid "" "Your machine appears to be connected to an IPv6 network. By default linphone " "always uses IPv4. Please update your configuration if you want to use IPv6" msgstr "" -#: ../coreapi/linphonecore.c:1074 +#: ../coreapi/linphonecore.c:1083 #, fuzzy msgid "Ready" msgstr "準備完了。" -#: ../coreapi/linphonecore.c:1505 +#: ../coreapi/linphonecore.c:1513 msgid "Remote end seems to have disconnected, the call is going to be closed." msgstr "" -#: ../coreapi/linphonecore.c:1703 +#: ../coreapi/linphonecore.c:1725 msgid "Looking for telephone number destination..." msgstr "" -#: ../coreapi/linphonecore.c:1705 +#: ../coreapi/linphonecore.c:1727 msgid "Could not resolve this number." msgstr "" -#: ../coreapi/linphonecore.c:1749 +#: ../coreapi/linphonecore.c:1771 #, fuzzy msgid "" "Could not parse given sip address. A sip url usually looks like sip:" @@ -1112,29 +1106,29 @@ msgstr "" "SIPアドレスの形式エラーです。SIPアドレスは、のような" "形式です。" -#: ../coreapi/linphonecore.c:1890 +#: ../coreapi/linphonecore.c:1912 #, fuzzy msgid "Contacting" msgstr "接続中" -#: ../coreapi/linphonecore.c:1896 +#: ../coreapi/linphonecore.c:1918 msgid "could not call" msgstr "" -#: ../coreapi/linphonecore.c:1942 +#: ../coreapi/linphonecore.c:1965 msgid "Sorry, having multiple simultaneous calls is not supported yet !" msgstr "" -#: ../coreapi/linphonecore.c:2337 ../coreapi/callbacks.c:32 +#: ../coreapi/linphonecore.c:2370 ../coreapi/callbacks.c:32 msgid "Connected." msgstr "接続しました。" -#: ../coreapi/linphonecore.c:2371 +#: ../coreapi/linphonecore.c:2404 #, fuzzy msgid "Call ended" msgstr "通話は拒否されました。" -#: ../coreapi/misc.c:142 +#: ../coreapi/misc.c:147 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the pcm oss emulation module\n" @@ -1146,7 +1140,7 @@ msgstr "" "pcm ossエミュレーションモジュールが見つかりません。\n" "ロードするために、ルート権限で'modprobe snd-pcm-oss'を実行してください。" -#: ../coreapi/misc.c:145 +#: ../coreapi/misc.c:150 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the mixer oss emulation module\n" @@ -1158,7 +1152,7 @@ msgstr "" "mixer ossエミュレーションモジュールが見つかりません。\n" "ロードするために、ルート権限で'modprobe snd-mixer-oss'を実行してください。" -#: ../coreapi/misc.c:492 +#: ../coreapi/misc.c:497 msgid "Stun lookup in progress..." msgstr "" @@ -1275,47 +1269,47 @@ msgstr "ユーザーは手が離せないようです。" msgid "Call declined." msgstr "通話は拒否されました。" -#: ../coreapi/callbacks.c:280 +#: ../coreapi/callbacks.c:281 msgid "No response." msgstr "" -#: ../coreapi/callbacks.c:283 -msgid "Error." +#: ../coreapi/callbacks.c:284 +msgid "Protocol error." msgstr "" -#: ../coreapi/callbacks.c:296 +#: ../coreapi/callbacks.c:298 msgid "Redirected" msgstr "" -#: ../coreapi/callbacks.c:304 +#: ../coreapi/callbacks.c:308 msgid "Not found" msgstr "" -#: ../coreapi/callbacks.c:312 +#: ../coreapi/callbacks.c:318 msgid "No common codecs" msgstr "" -#: ../coreapi/callbacks.c:316 +#: ../coreapi/callbacks.c:324 #, fuzzy msgid "Call failed." msgstr "通話はキャンセルされました。" -#: ../coreapi/callbacks.c:365 +#: ../coreapi/callbacks.c:374 #, fuzzy, c-format msgid "Registration on %s successful." msgstr "登録しました。" -#: ../coreapi/callbacks.c:366 +#: ../coreapi/callbacks.c:375 #, fuzzy, c-format msgid "Unregistration on %s done." msgstr "登録しました。" -#: ../coreapi/callbacks.c:374 +#: ../coreapi/callbacks.c:383 #, fuzzy, c-format msgid "Registration on %s failed: %s" msgstr "登録しました。" -#: ../coreapi/callbacks.c:374 +#: ../coreapi/callbacks.c:383 msgid "no response timeout" msgstr "" @@ -1335,11 +1329,11 @@ msgstr "" msgid "Alsa sound output" msgstr "" -#: ../mediastreamer2/src/aqsnd.c:1005 +#: ../mediastreamer2/src/aqsnd.c:1008 msgid "Sound capture filter for MacOS X Audio Queue Service" msgstr "" -#: ../mediastreamer2/src/aqsnd.c:1029 +#: ../mediastreamer2/src/aqsnd.c:1032 msgid "Sound playback filter for MacOS X Audio Queue Service" msgstr "" @@ -1355,11 +1349,11 @@ msgstr "" msgid "The GSM codec" msgstr "" -#: ../mediastreamer2/src/macsnd.c:670 +#: ../mediastreamer2/src/macsnd.c:1083 msgid "Sound capture filter for MacOS X Core Audio drivers" msgstr "" -#: ../mediastreamer2/src/macsnd.c:684 +#: ../mediastreamer2/src/macsnd.c:1098 msgid "Sound playback filter for MacOS X Core Audio drivers" msgstr "" @@ -1404,7 +1398,7 @@ msgstr "" msgid "A filter that controls and measure sound volume" msgstr "" -#: ../mediastreamer2/src/msv4l.c:1009 +#: ../mediastreamer2/src/msv4l.c:1011 msgid "A video4linux compatible source filter to stream pictures." msgstr "" diff --git a/po/nl.po b/po/nl.po index 8ff903eb6..caa543b00 100644 --- a/po/nl.po +++ b/po/nl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: nl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-02 10:28+0200\n" +"POT-Creation-Date: 2010-04-22 17:16+0200\n" "PO-Revision-Date: 2007-09-05 10:40+0200\n" "Last-Translator: Hendrik-Jan Heins \n" "Language-Team: Nederlands \n" @@ -29,39 +29,39 @@ msgstr "Kon pixmap bestand %s niet vinden" msgid "Chat with %s" msgstr "Chat met %s" -#: ../gtk-glade/main.c:92 +#: ../gtk-glade/main.c:94 msgid "log to stdout some debug information while running." msgstr "" -#: ../gtk-glade/main.c:99 +#: ../gtk-glade/main.c:101 msgid "Start only in the system tray, do not show the main interface." msgstr "" -#: ../gtk-glade/main.c:106 +#: ../gtk-glade/main.c:108 msgid "address to call right now" msgstr "" -#: ../gtk-glade/main.c:113 +#: ../gtk-glade/main.c:115 msgid "if set automatically answer incoming calls" msgstr "" -#: ../gtk-glade/main.c:121 +#: ../gtk-glade/main.c:123 msgid "" "Specifiy a working directory (should be the base of the installation, eg: c:" "\\Program Files\\Linphone)" msgstr "" -#: ../gtk-glade/main.c:396 +#: ../gtk-glade/main.c:402 #, fuzzy, c-format msgid "Call with %s" msgstr "Chat met %s" -#: ../gtk-glade/main.c:707 +#: ../gtk-glade/main.c:720 #, fuzzy, c-format msgid "Incoming call from %s" msgstr "Inkomende oproep" -#: ../gtk-glade/main.c:746 +#: ../gtk-glade/main.c:759 #, c-format msgid "" "%s would like to add you to his contact list.\n" @@ -70,31 +70,37 @@ msgid "" "If you answer no, this person will be temporarily blacklisted." msgstr "" -#: ../gtk-glade/main.c:824 +#: ../gtk-glade/main.c:837 #, c-format msgid "" "Please enter your password for username %s\n" " at domain %s:" msgstr "" -#: ../gtk-glade/main.c:921 +#: ../gtk-glade/main.c:934 msgid "Website link" msgstr "" -#: ../gtk-glade/main.c:957 +#: ../gtk-glade/main.c:970 msgid "Linphone - a video internet phone" msgstr "" -#: ../gtk-glade/main.c:976 +#: ../gtk-glade/main.c:989 #, c-format msgid "%s (Default)" msgstr "" -#: ../gtk-glade/main.c:1229 +#: ../gtk-glade/main.c:1221 +msgid "" +"No sound cards have been detected on this computer.\n" +"You won't be able to send or receive audio calls." +msgstr "" + +#: ../gtk-glade/main.c:1275 msgid "A free SIP video-phone" msgstr "Een Vrije SIP video-telefoon" -#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:247 +#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:258 #: ../gtk-glade/contact.glade.h:3 msgid "Name" msgstr "Naam" @@ -137,91 +143,91 @@ msgstr "" msgid "Add new contact from %s directory" msgstr "" -#: ../gtk-glade/propertybox.c:253 +#: ../gtk-glade/propertybox.c:264 msgid "Rate (Hz)" msgstr "Frequentie (Hz)" -#: ../gtk-glade/propertybox.c:259 +#: ../gtk-glade/propertybox.c:270 msgid "Status" msgstr "Status" -#: ../gtk-glade/propertybox.c:265 +#: ../gtk-glade/propertybox.c:276 msgid "Min bitrate (kbit/s)" msgstr "Minimale bitrate (kbit/s)" -#: ../gtk-glade/propertybox.c:271 +#: ../gtk-glade/propertybox.c:283 msgid "Parameters" msgstr "Parameters" -#: ../gtk-glade/propertybox.c:298 ../gtk-glade/propertybox.c:437 +#: ../gtk-glade/propertybox.c:312 ../gtk-glade/propertybox.c:451 msgid "Enabled" msgstr "Aan" -#: ../gtk-glade/propertybox.c:299 ../gtk-glade/propertybox.c:437 +#: ../gtk-glade/propertybox.c:313 ../gtk-glade/propertybox.c:451 msgid "Disabled" msgstr "Uit" -#: ../gtk-glade/propertybox.c:482 +#: ../gtk-glade/propertybox.c:496 msgid "Account" msgstr "Account" -#: ../gtk-glade/propertybox.c:622 +#: ../gtk-glade/propertybox.c:636 msgid "English" msgstr "" -#: ../gtk-glade/propertybox.c:623 +#: ../gtk-glade/propertybox.c:637 msgid "French" msgstr "" -#: ../gtk-glade/propertybox.c:624 +#: ../gtk-glade/propertybox.c:638 msgid "Swedish" msgstr "" -#: ../gtk-glade/propertybox.c:625 +#: ../gtk-glade/propertybox.c:639 msgid "Italian" msgstr "" -#: ../gtk-glade/propertybox.c:626 +#: ../gtk-glade/propertybox.c:640 msgid "Spanish" msgstr "" -#: ../gtk-glade/propertybox.c:627 +#: ../gtk-glade/propertybox.c:641 msgid "Brazilian Portugese" msgstr "" -#: ../gtk-glade/propertybox.c:628 +#: ../gtk-glade/propertybox.c:642 msgid "Polish" msgstr "" -#: ../gtk-glade/propertybox.c:629 +#: ../gtk-glade/propertybox.c:643 msgid "German" msgstr "" -#: ../gtk-glade/propertybox.c:630 +#: ../gtk-glade/propertybox.c:644 msgid "Russian" msgstr "" -#: ../gtk-glade/propertybox.c:631 +#: ../gtk-glade/propertybox.c:645 msgid "Japanese" msgstr "" -#: ../gtk-glade/propertybox.c:632 +#: ../gtk-glade/propertybox.c:646 msgid "Dutch" msgstr "" -#: ../gtk-glade/propertybox.c:633 +#: ../gtk-glade/propertybox.c:647 msgid "Hungarian" msgstr "" -#: ../gtk-glade/propertybox.c:634 +#: ../gtk-glade/propertybox.c:648 msgid "Czech" msgstr "" -#: ../gtk-glade/propertybox.c:635 +#: ../gtk-glade/propertybox.c:649 msgid "Chinese" msgstr "" -#: ../gtk-glade/propertybox.c:692 +#: ../gtk-glade/propertybox.c:706 msgid "" "You need to restart linphone for the new language selection to take effect." msgstr "" @@ -751,7 +757,7 @@ msgstr "Accepteren" msgid "Decline" msgstr "lijn" -#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:368 +#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:369 msgid "Incoming call" msgstr "Inkomende oproep" @@ -1028,18 +1034,6 @@ msgstr "" msgid "default soundcard\n" msgstr "" -#: ../gtk-glade/parameters.glade.h:65 -msgid "gtk-go-down" -msgstr "" - -#: ../gtk-glade/parameters.glade.h:66 -msgid "gtk-go-up" -msgstr "" - -#: ../gtk-glade/parameters.glade.h:67 -msgid "gtk-media-play" -msgstr "" - #: ../gtk-glade/buddylookup.glade.h:1 msgid "Search somebody" msgstr "" @@ -1061,26 +1055,26 @@ msgstr "linphone" msgid "Please wait" msgstr "" -#: ../coreapi/linphonecore.c:310 +#: ../coreapi/linphonecore.c:311 #, fuzzy, c-format msgid "You have missed %i call." msgid_plural "You have missed %i calls." msgstr[0] "U heeft %i oproep(en) gemist." msgstr[1] "U heeft %i oproep(en) gemist." -#: ../coreapi/linphonecore.c:356 +#: ../coreapi/linphonecore.c:357 msgid "aborted" msgstr "afgebroken" -#: ../coreapi/linphonecore.c:359 +#: ../coreapi/linphonecore.c:360 msgid "completed" msgstr "voltooid" -#: ../coreapi/linphonecore.c:362 +#: ../coreapi/linphonecore.c:363 msgid "missed" msgstr "gemist" -#: ../coreapi/linphonecore.c:367 +#: ../coreapi/linphonecore.c:368 #, c-format msgid "" "%s at %s\n" @@ -1095,11 +1089,11 @@ msgstr "" "Status: %s\n" "Tijdsduur: %i mins %i secs\n" -#: ../coreapi/linphonecore.c:368 +#: ../coreapi/linphonecore.c:369 msgid "Outgoing call" msgstr "Uitgaande oproep" -#: ../coreapi/linphonecore.c:625 +#: ../coreapi/linphonecore.c:626 msgid "" "Your machine appears to be connected to an IPv6 network. By default linphone " "always uses IPv4. Please update your configuration if you want to use IPv6" @@ -1107,23 +1101,23 @@ msgstr "" "Uw machine lijkt verbonden te zijn met een IPv6 netwerk. Standaard gebruikt " "linphone altijd IPv4. Wijzig uw configuratie wanneer u IPv6 wilt gebruiken." -#: ../coreapi/linphonecore.c:1074 +#: ../coreapi/linphonecore.c:1083 msgid "Ready" msgstr "Gereed." -#: ../coreapi/linphonecore.c:1505 +#: ../coreapi/linphonecore.c:1513 msgid "Remote end seems to have disconnected, the call is going to be closed." msgstr "" -#: ../coreapi/linphonecore.c:1703 +#: ../coreapi/linphonecore.c:1725 msgid "Looking for telephone number destination..." msgstr "Zoekt de lokatie van het telefoonnummer..." -#: ../coreapi/linphonecore.c:1705 +#: ../coreapi/linphonecore.c:1727 msgid "Could not resolve this number." msgstr "Kon dit nummer niet vinden." -#: ../coreapi/linphonecore.c:1749 +#: ../coreapi/linphonecore.c:1771 msgid "" "Could not parse given sip address. A sip url usually looks like sip:" "user@domain" @@ -1131,27 +1125,27 @@ msgstr "" "Slecht geformuleerd SIP-adres. Een SIP-adres ziet er uit als sip:" "gebruikersnaam@domeinnaam" -#: ../coreapi/linphonecore.c:1890 +#: ../coreapi/linphonecore.c:1912 msgid "Contacting" msgstr "Verbinden" -#: ../coreapi/linphonecore.c:1896 +#: ../coreapi/linphonecore.c:1918 msgid "could not call" msgstr "Kon niet oproepen" -#: ../coreapi/linphonecore.c:1942 +#: ../coreapi/linphonecore.c:1965 msgid "Sorry, having multiple simultaneous calls is not supported yet !" msgstr "Helaas, meerdere gelijktijdige gesprekken wordt nog niet ondersteund!" -#: ../coreapi/linphonecore.c:2337 ../coreapi/callbacks.c:32 +#: ../coreapi/linphonecore.c:2370 ../coreapi/callbacks.c:32 msgid "Connected." msgstr "Verbonden." -#: ../coreapi/linphonecore.c:2371 +#: ../coreapi/linphonecore.c:2404 msgid "Call ended" msgstr "Oproep beeindigd" -#: ../coreapi/misc.c:142 +#: ../coreapi/misc.c:147 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the pcm oss emulation module\n" @@ -1163,7 +1157,7 @@ msgstr "" "en linphone heeft deze nodig. Geeft u alstublieft het commando\n" "'modprobe snd-pcm-oss' als root om de module te laden." -#: ../coreapi/misc.c:145 +#: ../coreapi/misc.c:150 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the mixer oss emulation module\n" @@ -1175,7 +1169,7 @@ msgstr "" "en linphone heeft deze nodig. Geeft u alstublieft het commando\n" "'modprobe snd-mixer-oss' als root om de module te laden." -#: ../coreapi/misc.c:492 +#: ../coreapi/misc.c:497 msgid "Stun lookup in progress..." msgstr "STUN adres wordt opgezocht..." @@ -1292,48 +1286,48 @@ msgstr "De gebruiker wenst niet gestoord te worden." msgid "Call declined." msgstr "Oproep geweigerd." -#: ../coreapi/callbacks.c:280 +#: ../coreapi/callbacks.c:281 msgid "No response." msgstr "" -#: ../coreapi/callbacks.c:283 -msgid "Error." +#: ../coreapi/callbacks.c:284 +msgid "Protocol error." msgstr "" -#: ../coreapi/callbacks.c:296 +#: ../coreapi/callbacks.c:298 #, fuzzy msgid "Redirected" msgstr "Doorgeschakeld naar %s..." -#: ../coreapi/callbacks.c:304 +#: ../coreapi/callbacks.c:308 msgid "Not found" msgstr "" -#: ../coreapi/callbacks.c:312 +#: ../coreapi/callbacks.c:318 msgid "No common codecs" msgstr "" -#: ../coreapi/callbacks.c:316 +#: ../coreapi/callbacks.c:324 #, fuzzy msgid "Call failed." msgstr "Oproep geannuleerd." -#: ../coreapi/callbacks.c:365 +#: ../coreapi/callbacks.c:374 #, c-format msgid "Registration on %s successful." msgstr "Registratie op %s gelukt." -#: ../coreapi/callbacks.c:366 +#: ../coreapi/callbacks.c:375 #, fuzzy, c-format msgid "Unregistration on %s done." msgstr "Registratie op %s gelukt." -#: ../coreapi/callbacks.c:374 +#: ../coreapi/callbacks.c:383 #, fuzzy, c-format msgid "Registration on %s failed: %s" msgstr "Registratie op %s mislukt (time-out)." -#: ../coreapi/callbacks.c:374 +#: ../coreapi/callbacks.c:383 msgid "no response timeout" msgstr "" @@ -1353,11 +1347,11 @@ msgstr "" msgid "Alsa sound output" msgstr "" -#: ../mediastreamer2/src/aqsnd.c:1005 +#: ../mediastreamer2/src/aqsnd.c:1008 msgid "Sound capture filter for MacOS X Audio Queue Service" msgstr "" -#: ../mediastreamer2/src/aqsnd.c:1029 +#: ../mediastreamer2/src/aqsnd.c:1032 msgid "Sound playback filter for MacOS X Audio Queue Service" msgstr "" @@ -1373,11 +1367,11 @@ msgstr "" msgid "The GSM codec" msgstr "" -#: ../mediastreamer2/src/macsnd.c:670 +#: ../mediastreamer2/src/macsnd.c:1083 msgid "Sound capture filter for MacOS X Core Audio drivers" msgstr "" -#: ../mediastreamer2/src/macsnd.c:684 +#: ../mediastreamer2/src/macsnd.c:1098 msgid "Sound playback filter for MacOS X Core Audio drivers" msgstr "" @@ -1422,7 +1416,7 @@ msgstr "" msgid "A filter that controls and measure sound volume" msgstr "" -#: ../mediastreamer2/src/msv4l.c:1009 +#: ../mediastreamer2/src/msv4l.c:1011 msgid "A video4linux compatible source filter to stream pictures." msgstr "" diff --git a/po/pl.po b/po/pl.po index 8f1f4e9b8..dc9e5cf4d 100644 --- a/po/pl.po +++ b/po/pl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: linphone 0.7.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-02 10:28+0200\n" +"POT-Creation-Date: 2010-04-22 17:16+0200\n" "PO-Revision-Date: 2003-08-22 12:50+0200\n" "Last-Translator: Robert Nasiadek \n" "Language-Team: Polski \n" @@ -25,39 +25,39 @@ msgstr "Nie można znaleźć pixmapy: %s" msgid "Chat with %s" msgstr "" -#: ../gtk-glade/main.c:92 +#: ../gtk-glade/main.c:94 msgid "log to stdout some debug information while running." msgstr "" -#: ../gtk-glade/main.c:99 +#: ../gtk-glade/main.c:101 msgid "Start only in the system tray, do not show the main interface." msgstr "" -#: ../gtk-glade/main.c:106 +#: ../gtk-glade/main.c:108 msgid "address to call right now" msgstr "" -#: ../gtk-glade/main.c:113 +#: ../gtk-glade/main.c:115 msgid "if set automatically answer incoming calls" msgstr "" -#: ../gtk-glade/main.c:121 +#: ../gtk-glade/main.c:123 msgid "" "Specifiy a working directory (should be the base of the installation, eg: c:" "\\Program Files\\Linphone)" msgstr "" -#: ../gtk-glade/main.c:396 +#: ../gtk-glade/main.c:402 #, c-format msgid "Call with %s" msgstr "" -#: ../gtk-glade/main.c:707 +#: ../gtk-glade/main.c:720 #, c-format msgid "Incoming call from %s" msgstr "" -#: ../gtk-glade/main.c:746 +#: ../gtk-glade/main.c:759 #, c-format msgid "" "%s would like to add you to his contact list.\n" @@ -66,31 +66,37 @@ msgid "" "If you answer no, this person will be temporarily blacklisted." msgstr "" -#: ../gtk-glade/main.c:824 +#: ../gtk-glade/main.c:837 #, c-format msgid "" "Please enter your password for username %s\n" " at domain %s:" msgstr "" -#: ../gtk-glade/main.c:921 +#: ../gtk-glade/main.c:934 msgid "Website link" msgstr "" -#: ../gtk-glade/main.c:957 +#: ../gtk-glade/main.c:970 msgid "Linphone - a video internet phone" msgstr "" -#: ../gtk-glade/main.c:976 +#: ../gtk-glade/main.c:989 #, c-format msgid "%s (Default)" msgstr "" -#: ../gtk-glade/main.c:1229 +#: ../gtk-glade/main.c:1221 +msgid "" +"No sound cards have been detected on this computer.\n" +"You won't be able to send or receive audio calls." +msgstr "" + +#: ../gtk-glade/main.c:1275 msgid "A free SIP video-phone" msgstr "" -#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:247 +#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:258 #: ../gtk-glade/contact.glade.h:3 msgid "Name" msgstr "Nazwa" @@ -134,91 +140,91 @@ msgstr "" msgid "Add new contact from %s directory" msgstr "" -#: ../gtk-glade/propertybox.c:253 +#: ../gtk-glade/propertybox.c:264 msgid "Rate (Hz)" msgstr "Jakość (Hz)" -#: ../gtk-glade/propertybox.c:259 +#: ../gtk-glade/propertybox.c:270 msgid "Status" msgstr "Status" -#: ../gtk-glade/propertybox.c:265 +#: ../gtk-glade/propertybox.c:276 msgid "Min bitrate (kbit/s)" msgstr "Min przepustowość (kbit/s)" -#: ../gtk-glade/propertybox.c:271 +#: ../gtk-glade/propertybox.c:283 msgid "Parameters" msgstr "Parametr" -#: ../gtk-glade/propertybox.c:298 ../gtk-glade/propertybox.c:437 +#: ../gtk-glade/propertybox.c:312 ../gtk-glade/propertybox.c:451 msgid "Enabled" msgstr "Włączone" -#: ../gtk-glade/propertybox.c:299 ../gtk-glade/propertybox.c:437 +#: ../gtk-glade/propertybox.c:313 ../gtk-glade/propertybox.c:451 msgid "Disabled" msgstr "Wyłączone" -#: ../gtk-glade/propertybox.c:482 +#: ../gtk-glade/propertybox.c:496 msgid "Account" msgstr "" -#: ../gtk-glade/propertybox.c:622 +#: ../gtk-glade/propertybox.c:636 msgid "English" msgstr "" -#: ../gtk-glade/propertybox.c:623 +#: ../gtk-glade/propertybox.c:637 msgid "French" msgstr "" -#: ../gtk-glade/propertybox.c:624 +#: ../gtk-glade/propertybox.c:638 msgid "Swedish" msgstr "" -#: ../gtk-glade/propertybox.c:625 +#: ../gtk-glade/propertybox.c:639 msgid "Italian" msgstr "" -#: ../gtk-glade/propertybox.c:626 +#: ../gtk-glade/propertybox.c:640 msgid "Spanish" msgstr "" -#: ../gtk-glade/propertybox.c:627 +#: ../gtk-glade/propertybox.c:641 msgid "Brazilian Portugese" msgstr "" -#: ../gtk-glade/propertybox.c:628 +#: ../gtk-glade/propertybox.c:642 msgid "Polish" msgstr "" -#: ../gtk-glade/propertybox.c:629 +#: ../gtk-glade/propertybox.c:643 msgid "German" msgstr "" -#: ../gtk-glade/propertybox.c:630 +#: ../gtk-glade/propertybox.c:644 msgid "Russian" msgstr "" -#: ../gtk-glade/propertybox.c:631 +#: ../gtk-glade/propertybox.c:645 msgid "Japanese" msgstr "" -#: ../gtk-glade/propertybox.c:632 +#: ../gtk-glade/propertybox.c:646 msgid "Dutch" msgstr "" -#: ../gtk-glade/propertybox.c:633 +#: ../gtk-glade/propertybox.c:647 msgid "Hungarian" msgstr "" -#: ../gtk-glade/propertybox.c:634 +#: ../gtk-glade/propertybox.c:648 msgid "Czech" msgstr "" -#: ../gtk-glade/propertybox.c:635 +#: ../gtk-glade/propertybox.c:649 msgid "Chinese" msgstr "" -#: ../gtk-glade/propertybox.c:692 +#: ../gtk-glade/propertybox.c:706 msgid "" "You need to restart linphone for the new language selection to take effect." msgstr "" @@ -741,7 +747,7 @@ msgstr "" msgid "Decline" msgstr "linia" -#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:368 +#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:369 msgid "Incoming call" msgstr "" @@ -1013,18 +1019,6 @@ msgstr "" msgid "default soundcard\n" msgstr "" -#: ../gtk-glade/parameters.glade.h:65 -msgid "gtk-go-down" -msgstr "" - -#: ../gtk-glade/parameters.glade.h:66 -msgid "gtk-go-up" -msgstr "" - -#: ../gtk-glade/parameters.glade.h:67 -msgid "gtk-media-play" -msgstr "" - #: ../gtk-glade/buddylookup.glade.h:1 msgid "Search somebody" msgstr "" @@ -1046,26 +1040,26 @@ msgstr "linphone" msgid "Please wait" msgstr "" -#: ../coreapi/linphonecore.c:310 +#: ../coreapi/linphonecore.c:311 #, c-format msgid "You have missed %i call." msgid_plural "You have missed %i calls." msgstr[0] "" msgstr[1] "" -#: ../coreapi/linphonecore.c:356 +#: ../coreapi/linphonecore.c:357 msgid "aborted" msgstr "" -#: ../coreapi/linphonecore.c:359 +#: ../coreapi/linphonecore.c:360 msgid "completed" msgstr "" -#: ../coreapi/linphonecore.c:362 +#: ../coreapi/linphonecore.c:363 msgid "missed" msgstr "" -#: ../coreapi/linphonecore.c:367 +#: ../coreapi/linphonecore.c:368 #, c-format msgid "" "%s at %s\n" @@ -1075,63 +1069,63 @@ msgid "" "Duration: %i mn %i sec\n" msgstr "" -#: ../coreapi/linphonecore.c:368 +#: ../coreapi/linphonecore.c:369 msgid "Outgoing call" msgstr "" -#: ../coreapi/linphonecore.c:625 +#: ../coreapi/linphonecore.c:626 msgid "" "Your machine appears to be connected to an IPv6 network. By default linphone " "always uses IPv4. Please update your configuration if you want to use IPv6" msgstr "" -#: ../coreapi/linphonecore.c:1074 +#: ../coreapi/linphonecore.c:1083 #, fuzzy msgid "Ready" msgstr "Gotowy." -#: ../coreapi/linphonecore.c:1505 +#: ../coreapi/linphonecore.c:1513 msgid "Remote end seems to have disconnected, the call is going to be closed." msgstr "" -#: ../coreapi/linphonecore.c:1703 +#: ../coreapi/linphonecore.c:1725 msgid "Looking for telephone number destination..." msgstr "" -#: ../coreapi/linphonecore.c:1705 +#: ../coreapi/linphonecore.c:1727 msgid "Could not resolve this number." msgstr "" -#: ../coreapi/linphonecore.c:1749 +#: ../coreapi/linphonecore.c:1771 #, fuzzy msgid "" "Could not parse given sip address. A sip url usually looks like sip:" "user@domain" msgstr "Nie poprawny adres sip. Adres sip wygląda tak " -#: ../coreapi/linphonecore.c:1890 +#: ../coreapi/linphonecore.c:1912 #, fuzzy msgid "Contacting" msgstr "Dzwonie do " -#: ../coreapi/linphonecore.c:1896 +#: ../coreapi/linphonecore.c:1918 msgid "could not call" msgstr "" -#: ../coreapi/linphonecore.c:1942 +#: ../coreapi/linphonecore.c:1965 msgid "Sorry, having multiple simultaneous calls is not supported yet !" msgstr "" -#: ../coreapi/linphonecore.c:2337 ../coreapi/callbacks.c:32 +#: ../coreapi/linphonecore.c:2370 ../coreapi/callbacks.c:32 msgid "Connected." msgstr "Połączony" -#: ../coreapi/linphonecore.c:2371 +#: ../coreapi/linphonecore.c:2404 #, fuzzy msgid "Call ended" msgstr "Rozmowa odrzucona." -#: ../coreapi/misc.c:142 +#: ../coreapi/misc.c:147 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the pcm oss emulation module\n" @@ -1143,7 +1137,7 @@ msgstr "" "a Linphone go wymaga. Uruchom 'modprobe snd-pcm-oss' jako root,\n" "aby go załadować" -#: ../coreapi/misc.c:145 +#: ../coreapi/misc.c:150 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the mixer oss emulation module\n" @@ -1155,7 +1149,7 @@ msgstr "" "a Linphone go wymaga. Uruchom 'modprobe snd-mixer-oss' jako root,\n" "aby go załadować" -#: ../coreapi/misc.c:492 +#: ../coreapi/misc.c:497 msgid "Stun lookup in progress..." msgstr "" @@ -1272,47 +1266,47 @@ msgstr "Osoba nie chce, aby jej przeszkadzać." msgid "Call declined." msgstr "Rozmowa odrzucona." -#: ../coreapi/callbacks.c:280 +#: ../coreapi/callbacks.c:281 msgid "No response." msgstr "" -#: ../coreapi/callbacks.c:283 -msgid "Error." +#: ../coreapi/callbacks.c:284 +msgid "Protocol error." msgstr "" -#: ../coreapi/callbacks.c:296 +#: ../coreapi/callbacks.c:298 msgid "Redirected" msgstr "" -#: ../coreapi/callbacks.c:304 +#: ../coreapi/callbacks.c:308 msgid "Not found" msgstr "" -#: ../coreapi/callbacks.c:312 +#: ../coreapi/callbacks.c:318 msgid "No common codecs" msgstr "" -#: ../coreapi/callbacks.c:316 +#: ../coreapi/callbacks.c:324 #, fuzzy msgid "Call failed." msgstr "Połączenie odwołane." -#: ../coreapi/callbacks.c:365 +#: ../coreapi/callbacks.c:374 #, fuzzy, c-format msgid "Registration on %s successful." msgstr "Rejestracja powiodła się." -#: ../coreapi/callbacks.c:366 +#: ../coreapi/callbacks.c:375 #, fuzzy, c-format msgid "Unregistration on %s done." msgstr "Rejestracja powiodła się." -#: ../coreapi/callbacks.c:374 +#: ../coreapi/callbacks.c:383 #, fuzzy, c-format msgid "Registration on %s failed: %s" msgstr "Rejestracja powiodła się." -#: ../coreapi/callbacks.c:374 +#: ../coreapi/callbacks.c:383 msgid "no response timeout" msgstr "" @@ -1332,11 +1326,11 @@ msgstr "" msgid "Alsa sound output" msgstr "" -#: ../mediastreamer2/src/aqsnd.c:1005 +#: ../mediastreamer2/src/aqsnd.c:1008 msgid "Sound capture filter for MacOS X Audio Queue Service" msgstr "" -#: ../mediastreamer2/src/aqsnd.c:1029 +#: ../mediastreamer2/src/aqsnd.c:1032 msgid "Sound playback filter for MacOS X Audio Queue Service" msgstr "" @@ -1352,11 +1346,11 @@ msgstr "" msgid "The GSM codec" msgstr "" -#: ../mediastreamer2/src/macsnd.c:670 +#: ../mediastreamer2/src/macsnd.c:1083 msgid "Sound capture filter for MacOS X Core Audio drivers" msgstr "" -#: ../mediastreamer2/src/macsnd.c:684 +#: ../mediastreamer2/src/macsnd.c:1098 msgid "Sound playback filter for MacOS X Core Audio drivers" msgstr "" @@ -1401,7 +1395,7 @@ msgstr "" msgid "A filter that controls and measure sound volume" msgstr "" -#: ../mediastreamer2/src/msv4l.c:1009 +#: ../mediastreamer2/src/msv4l.c:1011 msgid "A video4linux compatible source filter to stream pictures." msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index d15f40700..9da079f60 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: linphone-1.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-02 10:28+0200\n" +"POT-Creation-Date: 2010-04-22 17:16+0200\n" "PO-Revision-Date: 2006-07-11 23:30+0200\n" "Last-Translator: Rafael Caesar Lenzi \n" "Language-Team: pt_BR \n" @@ -27,39 +27,39 @@ msgstr "Não é possível achar arquivo pixmap: %s" msgid "Chat with %s" msgstr "Bate-papo com %s" -#: ../gtk-glade/main.c:92 +#: ../gtk-glade/main.c:94 msgid "log to stdout some debug information while running." msgstr "" -#: ../gtk-glade/main.c:99 +#: ../gtk-glade/main.c:101 msgid "Start only in the system tray, do not show the main interface." msgstr "" -#: ../gtk-glade/main.c:106 +#: ../gtk-glade/main.c:108 msgid "address to call right now" msgstr "" -#: ../gtk-glade/main.c:113 +#: ../gtk-glade/main.c:115 msgid "if set automatically answer incoming calls" msgstr "" -#: ../gtk-glade/main.c:121 +#: ../gtk-glade/main.c:123 msgid "" "Specifiy a working directory (should be the base of the installation, eg: c:" "\\Program Files\\Linphone)" msgstr "" -#: ../gtk-glade/main.c:396 +#: ../gtk-glade/main.c:402 #, fuzzy, c-format msgid "Call with %s" msgstr "Bate-papo com %s" -#: ../gtk-glade/main.c:707 +#: ../gtk-glade/main.c:720 #, fuzzy, c-format msgid "Incoming call from %s" msgstr "Camadas recebidas" -#: ../gtk-glade/main.c:746 +#: ../gtk-glade/main.c:759 #, c-format msgid "" "%s would like to add you to his contact list.\n" @@ -68,31 +68,37 @@ msgid "" "If you answer no, this person will be temporarily blacklisted." msgstr "" -#: ../gtk-glade/main.c:824 +#: ../gtk-glade/main.c:837 #, c-format msgid "" "Please enter your password for username %s\n" " at domain %s:" msgstr "" -#: ../gtk-glade/main.c:921 +#: ../gtk-glade/main.c:934 msgid "Website link" msgstr "" -#: ../gtk-glade/main.c:957 +#: ../gtk-glade/main.c:970 msgid "Linphone - a video internet phone" msgstr "" -#: ../gtk-glade/main.c:976 +#: ../gtk-glade/main.c:989 #, c-format msgid "%s (Default)" msgstr "" -#: ../gtk-glade/main.c:1229 +#: ../gtk-glade/main.c:1221 +msgid "" +"No sound cards have been detected on this computer.\n" +"You won't be able to send or receive audio calls." +msgstr "" + +#: ../gtk-glade/main.c:1275 msgid "A free SIP video-phone" msgstr "" -#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:247 +#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:258 #: ../gtk-glade/contact.glade.h:3 msgid "Name" msgstr "Nome" @@ -135,92 +141,92 @@ msgstr "" msgid "Add new contact from %s directory" msgstr "" -#: ../gtk-glade/propertybox.c:253 +#: ../gtk-glade/propertybox.c:264 msgid "Rate (Hz)" msgstr "Taxa (Hz)" -#: ../gtk-glade/propertybox.c:259 +#: ../gtk-glade/propertybox.c:270 msgid "Status" msgstr "" -#: ../gtk-glade/propertybox.c:265 +#: ../gtk-glade/propertybox.c:276 msgid "Min bitrate (kbit/s)" msgstr "Bitrate mínimo (kbits/s)" -#: ../gtk-glade/propertybox.c:271 +#: ../gtk-glade/propertybox.c:283 msgid "Parameters" msgstr "Parâmetros" -#: ../gtk-glade/propertybox.c:298 ../gtk-glade/propertybox.c:437 +#: ../gtk-glade/propertybox.c:312 ../gtk-glade/propertybox.c:451 msgid "Enabled" msgstr "Ativado" -#: ../gtk-glade/propertybox.c:299 ../gtk-glade/propertybox.c:437 +#: ../gtk-glade/propertybox.c:313 ../gtk-glade/propertybox.c:451 msgid "Disabled" msgstr "Desativado" -#: ../gtk-glade/propertybox.c:482 +#: ../gtk-glade/propertybox.c:496 #, fuzzy msgid "Account" msgstr "Aceitar" -#: ../gtk-glade/propertybox.c:622 +#: ../gtk-glade/propertybox.c:636 msgid "English" msgstr "" -#: ../gtk-glade/propertybox.c:623 +#: ../gtk-glade/propertybox.c:637 msgid "French" msgstr "" -#: ../gtk-glade/propertybox.c:624 +#: ../gtk-glade/propertybox.c:638 msgid "Swedish" msgstr "" -#: ../gtk-glade/propertybox.c:625 +#: ../gtk-glade/propertybox.c:639 msgid "Italian" msgstr "" -#: ../gtk-glade/propertybox.c:626 +#: ../gtk-glade/propertybox.c:640 msgid "Spanish" msgstr "" -#: ../gtk-glade/propertybox.c:627 +#: ../gtk-glade/propertybox.c:641 msgid "Brazilian Portugese" msgstr "" -#: ../gtk-glade/propertybox.c:628 +#: ../gtk-glade/propertybox.c:642 msgid "Polish" msgstr "" -#: ../gtk-glade/propertybox.c:629 +#: ../gtk-glade/propertybox.c:643 msgid "German" msgstr "" -#: ../gtk-glade/propertybox.c:630 +#: ../gtk-glade/propertybox.c:644 msgid "Russian" msgstr "" -#: ../gtk-glade/propertybox.c:631 +#: ../gtk-glade/propertybox.c:645 msgid "Japanese" msgstr "" -#: ../gtk-glade/propertybox.c:632 +#: ../gtk-glade/propertybox.c:646 msgid "Dutch" msgstr "" -#: ../gtk-glade/propertybox.c:633 +#: ../gtk-glade/propertybox.c:647 msgid "Hungarian" msgstr "" -#: ../gtk-glade/propertybox.c:634 +#: ../gtk-glade/propertybox.c:648 msgid "Czech" msgstr "" -#: ../gtk-glade/propertybox.c:635 +#: ../gtk-glade/propertybox.c:649 msgid "Chinese" msgstr "" -#: ../gtk-glade/propertybox.c:692 +#: ../gtk-glade/propertybox.c:706 msgid "" "You need to restart linphone for the new language selection to take effect." msgstr "" @@ -745,7 +751,7 @@ msgstr "Aceitar" msgid "Decline" msgstr "linha" -#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:368 +#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:369 msgid "Incoming call" msgstr "Camadas recebidas" @@ -1020,18 +1026,6 @@ msgstr "" msgid "default soundcard\n" msgstr "" -#: ../gtk-glade/parameters.glade.h:65 -msgid "gtk-go-down" -msgstr "" - -#: ../gtk-glade/parameters.glade.h:66 -msgid "gtk-go-up" -msgstr "" - -#: ../gtk-glade/parameters.glade.h:67 -msgid "gtk-media-play" -msgstr "" - #: ../gtk-glade/buddylookup.glade.h:1 msgid "Search somebody" msgstr "" @@ -1052,26 +1046,26 @@ msgstr "" msgid "Please wait" msgstr "" -#: ../coreapi/linphonecore.c:310 +#: ../coreapi/linphonecore.c:311 #, fuzzy, c-format msgid "You have missed %i call." msgid_plural "You have missed %i calls." msgstr[0] "Você perdeu %i ligação(ões)." msgstr[1] "Você perdeu %i ligação(ões)." -#: ../coreapi/linphonecore.c:356 +#: ../coreapi/linphonecore.c:357 msgid "aborted" msgstr "Abortado" -#: ../coreapi/linphonecore.c:359 +#: ../coreapi/linphonecore.c:360 msgid "completed" msgstr "Competado" -#: ../coreapi/linphonecore.c:362 +#: ../coreapi/linphonecore.c:363 msgid "missed" msgstr "Perdido" -#: ../coreapi/linphonecore.c:367 +#: ../coreapi/linphonecore.c:368 #, fuzzy, c-format msgid "" "%s at %s\n" @@ -1085,11 +1079,11 @@ msgstr "" "Status: %s\n" "Duração: %i min %i seg\n" -#: ../coreapi/linphonecore.c:368 +#: ../coreapi/linphonecore.c:369 msgid "Outgoing call" msgstr "Chamadas efetuadas" -#: ../coreapi/linphonecore.c:625 +#: ../coreapi/linphonecore.c:626 msgid "" "Your machine appears to be connected to an IPv6 network. By default linphone " "always uses IPv4. Please update your configuration if you want to use IPv6" @@ -1098,52 +1092,52 @@ msgstr "" "linphone sempre usa IPv4. Por favor atualize sua configuração se deseja usar " "IPv6" -#: ../coreapi/linphonecore.c:1074 +#: ../coreapi/linphonecore.c:1083 #, fuzzy msgid "Ready" msgstr "Pronto." -#: ../coreapi/linphonecore.c:1505 +#: ../coreapi/linphonecore.c:1513 msgid "Remote end seems to have disconnected, the call is going to be closed." msgstr "" -#: ../coreapi/linphonecore.c:1703 +#: ../coreapi/linphonecore.c:1725 msgid "Looking for telephone number destination..." msgstr "Procurando por telefone de destino..." -#: ../coreapi/linphonecore.c:1705 +#: ../coreapi/linphonecore.c:1727 msgid "Could not resolve this number." msgstr "Não foi possível encontrar este número." -#: ../coreapi/linphonecore.c:1749 +#: ../coreapi/linphonecore.c:1771 msgid "" "Could not parse given sip address. A sip url usually looks like sip:" "user@domain" msgstr "" -#: ../coreapi/linphonecore.c:1890 +#: ../coreapi/linphonecore.c:1912 #, fuzzy msgid "Contacting" msgstr "Contatando " -#: ../coreapi/linphonecore.c:1896 +#: ../coreapi/linphonecore.c:1918 msgid "could not call" msgstr "" -#: ../coreapi/linphonecore.c:1942 +#: ../coreapi/linphonecore.c:1965 msgid "Sorry, having multiple simultaneous calls is not supported yet !" msgstr "" -#: ../coreapi/linphonecore.c:2337 ../coreapi/callbacks.c:32 +#: ../coreapi/linphonecore.c:2370 ../coreapi/callbacks.c:32 msgid "Connected." msgstr "Conectado." -#: ../coreapi/linphonecore.c:2371 +#: ../coreapi/linphonecore.c:2404 #, fuzzy msgid "Call ended" msgstr "Chamada cancelada." -#: ../coreapi/misc.c:142 +#: ../coreapi/misc.c:147 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the pcm oss emulation module\n" @@ -1151,7 +1145,7 @@ msgid "" "'modprobe snd-pcm-oss' as root to load it." msgstr "" -#: ../coreapi/misc.c:145 +#: ../coreapi/misc.c:150 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the mixer oss emulation module\n" @@ -1159,7 +1153,7 @@ msgid "" " 'modprobe snd-mixer-oss' as root to load it." msgstr "" -#: ../coreapi/misc.c:492 +#: ../coreapi/misc.c:497 msgid "Stun lookup in progress..." msgstr "" @@ -1273,48 +1267,48 @@ msgstr "" msgid "Call declined." msgstr "" -#: ../coreapi/callbacks.c:280 +#: ../coreapi/callbacks.c:281 msgid "No response." msgstr "" -#: ../coreapi/callbacks.c:283 -msgid "Error." +#: ../coreapi/callbacks.c:284 +msgid "Protocol error." msgstr "" -#: ../coreapi/callbacks.c:296 +#: ../coreapi/callbacks.c:298 #, fuzzy msgid "Redirected" msgstr "Redirecionado para %s..." -#: ../coreapi/callbacks.c:304 +#: ../coreapi/callbacks.c:308 msgid "Not found" msgstr "" -#: ../coreapi/callbacks.c:312 +#: ../coreapi/callbacks.c:318 msgid "No common codecs" msgstr "" -#: ../coreapi/callbacks.c:316 +#: ../coreapi/callbacks.c:324 #, fuzzy msgid "Call failed." msgstr "Histórico de chamadas" -#: ../coreapi/callbacks.c:365 +#: ../coreapi/callbacks.c:374 #, fuzzy, c-format msgid "Registration on %s successful." msgstr "Registro em %s efetuado." -#: ../coreapi/callbacks.c:366 +#: ../coreapi/callbacks.c:375 #, fuzzy, c-format msgid "Unregistration on %s done." msgstr "Registro em %s efetuado." -#: ../coreapi/callbacks.c:374 +#: ../coreapi/callbacks.c:383 #, fuzzy, c-format msgid "Registration on %s failed: %s" msgstr "Registro falhou (tempo esgotado)." -#: ../coreapi/callbacks.c:374 +#: ../coreapi/callbacks.c:383 msgid "no response timeout" msgstr "" @@ -1334,11 +1328,11 @@ msgstr "" msgid "Alsa sound output" msgstr "" -#: ../mediastreamer2/src/aqsnd.c:1005 +#: ../mediastreamer2/src/aqsnd.c:1008 msgid "Sound capture filter for MacOS X Audio Queue Service" msgstr "" -#: ../mediastreamer2/src/aqsnd.c:1029 +#: ../mediastreamer2/src/aqsnd.c:1032 msgid "Sound playback filter for MacOS X Audio Queue Service" msgstr "" @@ -1354,11 +1348,11 @@ msgstr "" msgid "The GSM codec" msgstr "" -#: ../mediastreamer2/src/macsnd.c:670 +#: ../mediastreamer2/src/macsnd.c:1083 msgid "Sound capture filter for MacOS X Core Audio drivers" msgstr "" -#: ../mediastreamer2/src/macsnd.c:684 +#: ../mediastreamer2/src/macsnd.c:1098 msgid "Sound playback filter for MacOS X Core Audio drivers" msgstr "" @@ -1403,7 +1397,7 @@ msgstr "" msgid "A filter that controls and measure sound volume" msgstr "" -#: ../mediastreamer2/src/msv4l.c:1009 +#: ../mediastreamer2/src/msv4l.c:1011 msgid "A video4linux compatible source filter to stream pictures." msgstr "" diff --git a/po/ru.po b/po/ru.po index 14f188c4a..3eb04e36a 100644 --- a/po/ru.po +++ b/po/ru.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: linphone 0.7.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-02 10:28+0200\n" +"POT-Creation-Date: 2010-04-22 17:16+0200\n" "PO-Revision-Date: 2010-01-22 18:43+0300\n" "Last-Translator: Maxim Prokopyev \n" "Language-Team: Russian \n" @@ -25,25 +25,25 @@ msgstr "Невозможно найти графический файл: %s" msgid "Chat with %s" msgstr "Обмен сообщениями с %s" -#: ../gtk-glade/main.c:92 +#: ../gtk-glade/main.c:94 msgid "log to stdout some debug information while running." msgstr "" "Вывод некоторой отладочной информации на устройство стандартного вывода во " "время работы " -#: ../gtk-glade/main.c:99 +#: ../gtk-glade/main.c:101 msgid "Start only in the system tray, do not show the main interface." msgstr "Показывать только в системном лотке, не запуская главное окно" -#: ../gtk-glade/main.c:106 +#: ../gtk-glade/main.c:108 msgid "address to call right now" msgstr "адрес для звонка" -#: ../gtk-glade/main.c:113 +#: ../gtk-glade/main.c:115 msgid "if set automatically answer incoming calls" msgstr "если установлен автоматический прием входящих вызовов" -#: ../gtk-glade/main.c:121 +#: ../gtk-glade/main.c:123 msgid "" "Specifiy a working directory (should be the base of the installation, eg: c:" "\\Program Files\\Linphone)" @@ -51,17 +51,17 @@ msgstr "" "Определить рабочий каталог (относительно каталога установки, например: c:" "\\Program Files\\Linphone)" -#: ../gtk-glade/main.c:396 +#: ../gtk-glade/main.c:402 #, fuzzy, c-format msgid "Call with %s" msgstr "Обмен сообщениями с %s" -#: ../gtk-glade/main.c:707 +#: ../gtk-glade/main.c:720 #, c-format msgid "Incoming call from %s" msgstr "Входящий звонок от %s" -#: ../gtk-glade/main.c:746 +#: ../gtk-glade/main.c:759 #, c-format msgid "" "%s would like to add you to his contact list.\n" @@ -74,7 +74,7 @@ msgstr "" "контактный лист?\n" "Если вы ответите Нет, эта персона будет временно заблокирована." -#: ../gtk-glade/main.c:824 +#: ../gtk-glade/main.c:837 #, c-format msgid "" "Please enter your password for username %s\n" @@ -83,24 +83,30 @@ msgstr "" "Пожалуйста, введите пароль для пользователя %s\n" " в домене %s:" -#: ../gtk-glade/main.c:921 +#: ../gtk-glade/main.c:934 msgid "Website link" msgstr "Домашняя страница" -#: ../gtk-glade/main.c:957 +#: ../gtk-glade/main.c:970 msgid "Linphone - a video internet phone" msgstr "Linphone - Интернет видео телефон" -#: ../gtk-glade/main.c:976 +#: ../gtk-glade/main.c:989 #, c-format msgid "%s (Default)" msgstr "%s (По умолчанию)" -#: ../gtk-glade/main.c:1229 +#: ../gtk-glade/main.c:1221 +msgid "" +"No sound cards have been detected on this computer.\n" +"You won't be able to send or receive audio calls." +msgstr "" + +#: ../gtk-glade/main.c:1275 msgid "A free SIP video-phone" msgstr "Свободный SIP видео-телефон" -#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:247 +#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:258 #: ../gtk-glade/contact.glade.h:3 msgid "Name" msgstr "Имя" @@ -143,92 +149,92 @@ msgstr "Удалить контакт '%s'" msgid "Add new contact from %s directory" msgstr "Добавить новый контакт из директории '%s'" -#: ../gtk-glade/propertybox.c:253 +#: ../gtk-glade/propertybox.c:264 msgid "Rate (Hz)" msgstr "Частота (Hz)" -#: ../gtk-glade/propertybox.c:259 +#: ../gtk-glade/propertybox.c:270 msgid "Status" msgstr "Статус" -#: ../gtk-glade/propertybox.c:265 +#: ../gtk-glade/propertybox.c:276 msgid "Min bitrate (kbit/s)" msgstr "Минимальный битрейт (kbit/s)" -#: ../gtk-glade/propertybox.c:271 +#: ../gtk-glade/propertybox.c:283 msgid "Parameters" msgstr "Параметры" -#: ../gtk-glade/propertybox.c:298 ../gtk-glade/propertybox.c:437 +#: ../gtk-glade/propertybox.c:312 ../gtk-glade/propertybox.c:451 msgid "Enabled" msgstr "Включен" -#: ../gtk-glade/propertybox.c:299 ../gtk-glade/propertybox.c:437 +#: ../gtk-glade/propertybox.c:313 ../gtk-glade/propertybox.c:451 msgid "Disabled" msgstr "Отключен" -#: ../gtk-glade/propertybox.c:482 +#: ../gtk-glade/propertybox.c:496 msgid "Account" msgstr "Учетная запись" -#: ../gtk-glade/propertybox.c:622 +#: ../gtk-glade/propertybox.c:636 msgid "English" msgstr "Английский" -#: ../gtk-glade/propertybox.c:623 +#: ../gtk-glade/propertybox.c:637 msgid "French" msgstr "Французский" -#: ../gtk-glade/propertybox.c:624 +#: ../gtk-glade/propertybox.c:638 msgid "Swedish" msgstr "Шведский" -#: ../gtk-glade/propertybox.c:625 +#: ../gtk-glade/propertybox.c:639 msgid "Italian" msgstr "Итальянский" -#: ../gtk-glade/propertybox.c:626 +#: ../gtk-glade/propertybox.c:640 msgid "Spanish" msgstr "Испанский" -#: ../gtk-glade/propertybox.c:627 +#: ../gtk-glade/propertybox.c:641 #, fuzzy msgid "Brazilian Portugese" msgstr "Португальский" -#: ../gtk-glade/propertybox.c:628 +#: ../gtk-glade/propertybox.c:642 msgid "Polish" msgstr "Польский" -#: ../gtk-glade/propertybox.c:629 +#: ../gtk-glade/propertybox.c:643 msgid "German" msgstr "Немецкий" -#: ../gtk-glade/propertybox.c:630 +#: ../gtk-glade/propertybox.c:644 msgid "Russian" msgstr "Русский" -#: ../gtk-glade/propertybox.c:631 +#: ../gtk-glade/propertybox.c:645 msgid "Japanese" msgstr "Японский" -#: ../gtk-glade/propertybox.c:632 +#: ../gtk-glade/propertybox.c:646 msgid "Dutch" msgstr "Датский" -#: ../gtk-glade/propertybox.c:633 +#: ../gtk-glade/propertybox.c:647 msgid "Hungarian" msgstr "Венгерский" -#: ../gtk-glade/propertybox.c:634 +#: ../gtk-glade/propertybox.c:648 msgid "Czech" msgstr "Чешский" -#: ../gtk-glade/propertybox.c:635 +#: ../gtk-glade/propertybox.c:649 msgid "Chinese" msgstr "Китайский" -#: ../gtk-glade/propertybox.c:692 +#: ../gtk-glade/propertybox.c:706 msgid "" "You need to restart linphone for the new language selection to take effect." msgstr "" @@ -747,7 +753,7 @@ msgstr "Принять" msgid "Decline" msgstr "Отклонить" -#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:368 +#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:369 msgid "Incoming call" msgstr "Входящий вызов" @@ -1004,18 +1010,6 @@ msgstr "звуковая карта по умолчанию" msgid "default soundcard\n" msgstr "звуковая карта по умолчанию\n" -#: ../gtk-glade/parameters.glade.h:65 -msgid "gtk-go-down" -msgstr "Вниз" - -#: ../gtk-glade/parameters.glade.h:66 -msgid "gtk-go-up" -msgstr "Вверх" - -#: ../gtk-glade/parameters.glade.h:67 -msgid "gtk-media-play" -msgstr "Проиграть" - #: ../gtk-glade/buddylookup.glade.h:1 msgid "Search somebody" msgstr "Поиск" @@ -1036,26 +1030,26 @@ msgstr "Linphone" msgid "Please wait" msgstr "Подождите" -#: ../coreapi/linphonecore.c:310 +#: ../coreapi/linphonecore.c:311 #, c-format msgid "You have missed %i call." msgid_plural "You have missed %i calls." msgstr[0] "У вас пропущено %i звонков." msgstr[1] "У вас пропущено %i звонков." -#: ../coreapi/linphonecore.c:356 +#: ../coreapi/linphonecore.c:357 msgid "aborted" msgstr "отмененный" -#: ../coreapi/linphonecore.c:359 +#: ../coreapi/linphonecore.c:360 msgid "completed" msgstr "заверщённый" -#: ../coreapi/linphonecore.c:362 +#: ../coreapi/linphonecore.c:363 msgid "missed" msgstr "пропущенный" -#: ../coreapi/linphonecore.c:367 +#: ../coreapi/linphonecore.c:368 #, c-format msgid "" "%s at %s\n" @@ -1070,11 +1064,11 @@ msgstr "" "Статус: %s\n" "Длительность: %i мн %i сек\n" -#: ../coreapi/linphonecore.c:368 +#: ../coreapi/linphonecore.c:369 msgid "Outgoing call" msgstr "Исходящий звонок" -#: ../coreapi/linphonecore.c:625 +#: ../coreapi/linphonecore.c:626 msgid "" "Your machine appears to be connected to an IPv6 network. By default linphone " "always uses IPv4. Please update your configuration if you want to use IPv6" @@ -1082,23 +1076,23 @@ msgstr "" "Ваш компьютер подключен по IPv6. Linphone по умолчанию использует IPv4. " "Пожалуйста, обновите настройки если хотите использовать IPv6." -#: ../coreapi/linphonecore.c:1074 +#: ../coreapi/linphonecore.c:1083 msgid "Ready" msgstr "Готов" -#: ../coreapi/linphonecore.c:1505 +#: ../coreapi/linphonecore.c:1513 msgid "Remote end seems to have disconnected, the call is going to be closed." msgstr "Удалённый узел отключился, звонок завершён." -#: ../coreapi/linphonecore.c:1703 +#: ../coreapi/linphonecore.c:1725 msgid "Looking for telephone number destination..." msgstr "Поиск назначения для телефонного номера.." -#: ../coreapi/linphonecore.c:1705 +#: ../coreapi/linphonecore.c:1727 msgid "Could not resolve this number." msgstr "Не может принять решение по этому номеру." -#: ../coreapi/linphonecore.c:1749 +#: ../coreapi/linphonecore.c:1771 msgid "" "Could not parse given sip address. A sip url usually looks like sip:" "user@domain" @@ -1106,27 +1100,27 @@ msgstr "" "Не могу опознать sip адрес. SIP url обычно выглядит как: " -#: ../coreapi/linphonecore.c:1890 +#: ../coreapi/linphonecore.c:1912 msgid "Contacting" msgstr "Соединение" -#: ../coreapi/linphonecore.c:1896 +#: ../coreapi/linphonecore.c:1918 msgid "could not call" msgstr "невозможно позвонить" -#: ../coreapi/linphonecore.c:1942 +#: ../coreapi/linphonecore.c:1965 msgid "Sorry, having multiple simultaneous calls is not supported yet !" msgstr "Одновременные вызовы пока не поддерживается!" -#: ../coreapi/linphonecore.c:2337 ../coreapi/callbacks.c:32 +#: ../coreapi/linphonecore.c:2370 ../coreapi/callbacks.c:32 msgid "Connected." msgstr "Соединён." -#: ../coreapi/linphonecore.c:2371 +#: ../coreapi/linphonecore.c:2404 msgid "Call ended" msgstr "Разговор окончен" -#: ../coreapi/misc.c:142 +#: ../coreapi/misc.c:147 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the pcm oss emulation module\n" @@ -1139,7 +1133,7 @@ msgstr "" "Пожалуйста, выполните от пользователя root 'modprobe snd-pcm-oss' чтоб " "загрузить его." -#: ../coreapi/misc.c:145 +#: ../coreapi/misc.c:150 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the mixer oss emulation module\n" @@ -1152,7 +1146,7 @@ msgstr "" "Пожалуйста, выполните от пользователя root 'modprobe snd-pcm-oss' чтоб " "загрузить его." -#: ../coreapi/misc.c:492 +#: ../coreapi/misc.c:497 msgid "Stun lookup in progress..." msgstr "Идет поиск Stun..." @@ -1268,49 +1262,49 @@ msgstr "Пользователь не хочет чтоб его беспоко msgid "Call declined." msgstr "Звонок отклонён." -#: ../coreapi/callbacks.c:280 +#: ../coreapi/callbacks.c:281 #, fuzzy msgid "No response." msgstr "время ожидания истекло" -#: ../coreapi/callbacks.c:283 -msgid "Error." +#: ../coreapi/callbacks.c:284 +msgid "Protocol error." msgstr "" -#: ../coreapi/callbacks.c:296 +#: ../coreapi/callbacks.c:298 #, fuzzy msgid "Redirected" msgstr "Переадресован на %s..." -#: ../coreapi/callbacks.c:304 +#: ../coreapi/callbacks.c:308 msgid "Not found" msgstr "" -#: ../coreapi/callbacks.c:312 +#: ../coreapi/callbacks.c:318 msgid "No common codecs" msgstr "" -#: ../coreapi/callbacks.c:316 +#: ../coreapi/callbacks.c:324 #, fuzzy msgid "Call failed." msgstr "Anruf annulliert" -#: ../coreapi/callbacks.c:365 +#: ../coreapi/callbacks.c:374 #, c-format msgid "Registration on %s successful." msgstr "Регистрация на %s прошла успешно." -#: ../coreapi/callbacks.c:366 +#: ../coreapi/callbacks.c:375 #, c-format msgid "Unregistration on %s done." msgstr "Отмена регистрации на %s завершена." -#: ../coreapi/callbacks.c:374 +#: ../coreapi/callbacks.c:383 #, c-format msgid "Registration on %s failed: %s" msgstr "Регистрация на %s не удалась: %s" -#: ../coreapi/callbacks.c:374 +#: ../coreapi/callbacks.c:383 msgid "no response timeout" msgstr "время ожидания истекло" @@ -1330,11 +1324,11 @@ msgstr "Источник ALSA" msgid "Alsa sound output" msgstr "" -#: ../mediastreamer2/src/aqsnd.c:1005 +#: ../mediastreamer2/src/aqsnd.c:1008 msgid "Sound capture filter for MacOS X Audio Queue Service" msgstr "" -#: ../mediastreamer2/src/aqsnd.c:1029 +#: ../mediastreamer2/src/aqsnd.c:1032 msgid "Sound playback filter for MacOS X Audio Queue Service" msgstr "" @@ -1350,11 +1344,11 @@ msgstr "Кодек GSM full-rate" msgid "The GSM codec" msgstr "Кодек GSM" -#: ../mediastreamer2/src/macsnd.c:670 +#: ../mediastreamer2/src/macsnd.c:1083 msgid "Sound capture filter for MacOS X Core Audio drivers" msgstr "" -#: ../mediastreamer2/src/macsnd.c:684 +#: ../mediastreamer2/src/macsnd.c:1098 msgid "Sound playback filter for MacOS X Core Audio drivers" msgstr "" @@ -1399,7 +1393,7 @@ msgstr "" msgid "A filter that controls and measure sound volume" msgstr "" -#: ../mediastreamer2/src/msv4l.c:1009 +#: ../mediastreamer2/src/msv4l.c:1011 msgid "A video4linux compatible source filter to stream pictures." msgstr "" @@ -1556,6 +1550,15 @@ msgstr "" msgid "A webcam grabber based on directshow." msgstr "" +#~ msgid "gtk-go-down" +#~ msgstr "Вниз" + +#~ msgid "gtk-go-up" +#~ msgstr "Вверх" + +#~ msgid "gtk-media-play" +#~ msgstr "Проиграть" + #~ msgid "Could not reach destination." #~ msgstr "Невозможно соединиться." diff --git a/po/sv.po b/po/sv.po index f8779bdea..cb0975300 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-02 10:28+0200\n" +"POT-Creation-Date: 2010-04-22 17:16+0200\n" "PO-Revision-Date: 2009-02-17 15:22+0100\n" "Last-Translator: Emmanuel Frécon \n" "Language-Team: SWEDISH \n" @@ -26,23 +26,23 @@ msgstr "Kunde inte hitta pixmap filen: %s" msgid "Chat with %s" msgstr "Chatta med %s" -#: ../gtk-glade/main.c:92 +#: ../gtk-glade/main.c:94 msgid "log to stdout some debug information while running." msgstr "skriv loggning information under körning" -#: ../gtk-glade/main.c:99 +#: ../gtk-glade/main.c:101 msgid "Start only in the system tray, do not show the main interface." msgstr "Starta ikonifierat, visa inte huvudfönstret" -#: ../gtk-glade/main.c:106 +#: ../gtk-glade/main.c:108 msgid "address to call right now" msgstr "Samtalsmottagare" -#: ../gtk-glade/main.c:113 +#: ../gtk-glade/main.c:115 msgid "if set automatically answer incoming calls" msgstr "Om på, besvara automatisk alla inkommande samtal" -#: ../gtk-glade/main.c:121 +#: ../gtk-glade/main.c:123 msgid "" "Specifiy a working directory (should be the base of the installation, eg: c:" "\\Program Files\\Linphone)" @@ -50,17 +50,17 @@ msgstr "" "Välj en arbetskatalog som ska vara basen för installationen, såsom C:" "\\Program\\Linphone" -#: ../gtk-glade/main.c:396 +#: ../gtk-glade/main.c:402 #, c-format msgid "Call with %s" msgstr "Samtal med %s" -#: ../gtk-glade/main.c:707 +#: ../gtk-glade/main.c:720 #, c-format msgid "Incoming call from %s" msgstr "Inkommande samtal från %s" -#: ../gtk-glade/main.c:746 +#: ../gtk-glade/main.c:759 #, c-format msgid "" "%s would like to add you to his contact list.\n" @@ -73,7 +73,7 @@ msgstr "" "henne till din kontaktlista?\n" "Om du svarar nej, personen kommer att vara bannlyst." -#: ../gtk-glade/main.c:824 +#: ../gtk-glade/main.c:837 #, c-format msgid "" "Please enter your password for username %s\n" @@ -82,24 +82,30 @@ msgstr "" "Mata in ditt lösenord för användaren %s\n" "vid domänen %s:" -#: ../gtk-glade/main.c:921 +#: ../gtk-glade/main.c:934 msgid "Website link" msgstr "Webbsajt" -#: ../gtk-glade/main.c:957 +#: ../gtk-glade/main.c:970 msgid "Linphone - a video internet phone" msgstr "Linphone - en video Internet telefon" -#: ../gtk-glade/main.c:976 +#: ../gtk-glade/main.c:989 #, c-format msgid "%s (Default)" msgstr "%s (Default)" -#: ../gtk-glade/main.c:1229 +#: ../gtk-glade/main.c:1221 +msgid "" +"No sound cards have been detected on this computer.\n" +"You won't be able to send or receive audio calls." +msgstr "" + +#: ../gtk-glade/main.c:1275 msgid "A free SIP video-phone" msgstr "En gratis SIP video-telefon" -#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:247 +#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:258 #: ../gtk-glade/contact.glade.h:3 msgid "Name" msgstr "Namn" @@ -142,91 +148,91 @@ msgstr "Ta bort kontakt '%s'" msgid "Add new contact from %s directory" msgstr "Lägg till kontakt ifrån %s katalogen" -#: ../gtk-glade/propertybox.c:253 +#: ../gtk-glade/propertybox.c:264 msgid "Rate (Hz)" msgstr "Frekvens (Hz)" -#: ../gtk-glade/propertybox.c:259 +#: ../gtk-glade/propertybox.c:270 msgid "Status" msgstr "Status" -#: ../gtk-glade/propertybox.c:265 +#: ../gtk-glade/propertybox.c:276 msgid "Min bitrate (kbit/s)" msgstr "Min. datahastighet (kbit/s)" -#: ../gtk-glade/propertybox.c:271 +#: ../gtk-glade/propertybox.c:283 msgid "Parameters" msgstr "Parametrar" -#: ../gtk-glade/propertybox.c:298 ../gtk-glade/propertybox.c:437 +#: ../gtk-glade/propertybox.c:312 ../gtk-glade/propertybox.c:451 msgid "Enabled" msgstr "På" -#: ../gtk-glade/propertybox.c:299 ../gtk-glade/propertybox.c:437 +#: ../gtk-glade/propertybox.c:313 ../gtk-glade/propertybox.c:451 msgid "Disabled" msgstr "Av" -#: ../gtk-glade/propertybox.c:482 +#: ../gtk-glade/propertybox.c:496 msgid "Account" msgstr "Konto" -#: ../gtk-glade/propertybox.c:622 +#: ../gtk-glade/propertybox.c:636 msgid "English" msgstr "Engelska" -#: ../gtk-glade/propertybox.c:623 +#: ../gtk-glade/propertybox.c:637 msgid "French" msgstr "Fransk" -#: ../gtk-glade/propertybox.c:624 +#: ../gtk-glade/propertybox.c:638 msgid "Swedish" msgstr "Svenska" -#: ../gtk-glade/propertybox.c:625 +#: ../gtk-glade/propertybox.c:639 msgid "Italian" msgstr "Italiensk" -#: ../gtk-glade/propertybox.c:626 +#: ../gtk-glade/propertybox.c:640 msgid "Spanish" msgstr "Spanska" -#: ../gtk-glade/propertybox.c:627 +#: ../gtk-glade/propertybox.c:641 msgid "Brazilian Portugese" msgstr "Portugisiska" -#: ../gtk-glade/propertybox.c:628 +#: ../gtk-glade/propertybox.c:642 msgid "Polish" msgstr "Polska" -#: ../gtk-glade/propertybox.c:629 +#: ../gtk-glade/propertybox.c:643 msgid "German" msgstr "Tyska" -#: ../gtk-glade/propertybox.c:630 +#: ../gtk-glade/propertybox.c:644 msgid "Russian" msgstr "Ryska" -#: ../gtk-glade/propertybox.c:631 +#: ../gtk-glade/propertybox.c:645 msgid "Japanese" msgstr "Japanska" -#: ../gtk-glade/propertybox.c:632 +#: ../gtk-glade/propertybox.c:646 msgid "Dutch" msgstr "Nederländksa" -#: ../gtk-glade/propertybox.c:633 +#: ../gtk-glade/propertybox.c:647 msgid "Hungarian" msgstr "Hungerska" -#: ../gtk-glade/propertybox.c:634 +#: ../gtk-glade/propertybox.c:648 msgid "Czech" msgstr "Tjekiska" -#: ../gtk-glade/propertybox.c:635 +#: ../gtk-glade/propertybox.c:649 msgid "Chinese" msgstr "Kinesiska" -#: ../gtk-glade/propertybox.c:692 +#: ../gtk-glade/propertybox.c:706 msgid "" "You need to restart linphone for the new language selection to take effect." msgstr "Du behöver starta om programmet för att det nya språket ska synas." @@ -726,7 +732,7 @@ msgstr "Godkänn" msgid "Decline" msgstr "Avböj" -#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:368 +#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:369 msgid "Incoming call" msgstr "Inkommande samtal" @@ -983,18 +989,6 @@ msgstr "default ljudkort" msgid "default soundcard\n" msgstr "default ljudkort\n" -#: ../gtk-glade/parameters.glade.h:65 -msgid "gtk-go-down" -msgstr "" - -#: ../gtk-glade/parameters.glade.h:66 -msgid "gtk-go-up" -msgstr "" - -#: ../gtk-glade/parameters.glade.h:67 -msgid "gtk-media-play" -msgstr "" - #: ../gtk-glade/buddylookup.glade.h:1 msgid "Search somebody" msgstr "Sök efter kontakter" @@ -1015,26 +1009,26 @@ msgstr "Linphone" msgid "Please wait" msgstr "Vänta" -#: ../coreapi/linphonecore.c:310 +#: ../coreapi/linphonecore.c:311 #, c-format msgid "You have missed %i call." msgid_plural "You have missed %i calls." msgstr[0] "Du har %i missat samtal" msgstr[1] "Du har %i missade samtal" -#: ../coreapi/linphonecore.c:356 +#: ../coreapi/linphonecore.c:357 msgid "aborted" msgstr "avbrytade" -#: ../coreapi/linphonecore.c:359 +#: ../coreapi/linphonecore.c:360 msgid "completed" msgstr "avslutade" -#: ../coreapi/linphonecore.c:362 +#: ../coreapi/linphonecore.c:363 msgid "missed" msgstr "missade" -#: ../coreapi/linphonecore.c:367 +#: ../coreapi/linphonecore.c:368 #, c-format msgid "" "%s at %s\n" @@ -1049,11 +1043,11 @@ msgstr "" "Status: %s\n" "Längd: %i min %i sek\n" -#: ../coreapi/linphonecore.c:368 +#: ../coreapi/linphonecore.c:369 msgid "Outgoing call" msgstr "Utgående samtal" -#: ../coreapi/linphonecore.c:625 +#: ../coreapi/linphonecore.c:626 msgid "" "Your machine appears to be connected to an IPv6 network. By default linphone " "always uses IPv4. Please update your configuration if you want to use IPv6" @@ -1061,23 +1055,23 @@ msgstr "" "Din dator verkar vara kopplad till ett IPv6 nätverk. Default, använder " "linphone IPv4. Uppdatera din konfiguration om du vill använda IPv6." -#: ../coreapi/linphonecore.c:1074 +#: ../coreapi/linphonecore.c:1083 msgid "Ready" msgstr "Redo" -#: ../coreapi/linphonecore.c:1505 +#: ../coreapi/linphonecore.c:1513 msgid "Remote end seems to have disconnected, the call is going to be closed." msgstr "Motparten verkar ha avbrutit samtalet, samtalet kommer att avslutas." -#: ../coreapi/linphonecore.c:1703 +#: ../coreapi/linphonecore.c:1725 msgid "Looking for telephone number destination..." msgstr "Leta efter telefonnummer för destinationen..." -#: ../coreapi/linphonecore.c:1705 +#: ../coreapi/linphonecore.c:1727 msgid "Could not resolve this number." msgstr "Kan inte nå dett nummer." -#: ../coreapi/linphonecore.c:1749 +#: ../coreapi/linphonecore.c:1771 msgid "" "Could not parse given sip address. A sip url usually looks like sip:" "user@domain" @@ -1085,27 +1079,27 @@ msgstr "" "Kan inte förstå angiven SIP adress. En SIP adress vanligen ser ut som sip:" "användare@domänen" -#: ../coreapi/linphonecore.c:1890 +#: ../coreapi/linphonecore.c:1912 msgid "Contacting" msgstr "Kontaktar" -#: ../coreapi/linphonecore.c:1896 +#: ../coreapi/linphonecore.c:1918 msgid "could not call" msgstr "Kunde inte ringa" -#: ../coreapi/linphonecore.c:1942 +#: ../coreapi/linphonecore.c:1965 msgid "Sorry, having multiple simultaneous calls is not supported yet !" msgstr "Förlåt, men linphone stödjer inte flera samtliga samtal än!" -#: ../coreapi/linphonecore.c:2337 ../coreapi/callbacks.c:32 +#: ../coreapi/linphonecore.c:2370 ../coreapi/callbacks.c:32 msgid "Connected." msgstr "Kopplad" -#: ../coreapi/linphonecore.c:2371 +#: ../coreapi/linphonecore.c:2404 msgid "Call ended" msgstr "Samtalet slut" -#: ../coreapi/misc.c:142 +#: ../coreapi/misc.c:147 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the pcm oss emulation module\n" @@ -1117,7 +1111,7 @@ msgstr "" "saknas och linphone behöver ha det. Var god exekvera\n" "'modprobe snd-pcm-oss' som root för att ladda in den." -#: ../coreapi/misc.c:145 +#: ../coreapi/misc.c:150 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the mixer oss emulation module\n" @@ -1129,7 +1123,7 @@ msgstr "" "saknas och linphone behöver ha det. Var god exekvera\n" "'modprobe snd-mixer-oss' som root för att ladda in den." -#: ../coreapi/misc.c:492 +#: ../coreapi/misc.c:497 msgid "Stun lookup in progress..." msgstr "STUN uppslagning pågår..." @@ -1244,49 +1238,49 @@ msgstr "Användaren vill inte bli störd." msgid "Call declined." msgstr "Samtalet avböjdes." -#: ../coreapi/callbacks.c:280 +#: ../coreapi/callbacks.c:281 #, fuzzy msgid "No response." msgstr "Inget svar inom angiven tid" -#: ../coreapi/callbacks.c:283 -msgid "Error." +#: ../coreapi/callbacks.c:284 +msgid "Protocol error." msgstr "" -#: ../coreapi/callbacks.c:296 +#: ../coreapi/callbacks.c:298 #, fuzzy msgid "Redirected" msgstr "Omdirigerat till %s..." -#: ../coreapi/callbacks.c:304 +#: ../coreapi/callbacks.c:308 msgid "Not found" msgstr "" -#: ../coreapi/callbacks.c:312 +#: ../coreapi/callbacks.c:318 msgid "No common codecs" msgstr "" -#: ../coreapi/callbacks.c:316 +#: ../coreapi/callbacks.c:324 #, fuzzy msgid "Call failed." msgstr "Samtalet avböjdes." -#: ../coreapi/callbacks.c:365 +#: ../coreapi/callbacks.c:374 #, c-format msgid "Registration on %s successful." msgstr "Registrering hos %s lyckades." -#: ../coreapi/callbacks.c:366 +#: ../coreapi/callbacks.c:375 #, c-format msgid "Unregistration on %s done." msgstr "Avregistrering hos %s lyckades." -#: ../coreapi/callbacks.c:374 +#: ../coreapi/callbacks.c:383 #, c-format msgid "Registration on %s failed: %s" msgstr "Registrering hos %s mislyckades: %s" -#: ../coreapi/callbacks.c:374 +#: ../coreapi/callbacks.c:383 msgid "no response timeout" msgstr "Inget svar inom angiven tid" @@ -1306,11 +1300,11 @@ msgstr "Alsa ljud ingång" msgid "Alsa sound output" msgstr "Also ljud utgång" -#: ../mediastreamer2/src/aqsnd.c:1005 +#: ../mediastreamer2/src/aqsnd.c:1008 msgid "Sound capture filter for MacOS X Audio Queue Service" msgstr "" -#: ../mediastreamer2/src/aqsnd.c:1029 +#: ../mediastreamer2/src/aqsnd.c:1032 msgid "Sound playback filter for MacOS X Audio Queue Service" msgstr "" @@ -1326,11 +1320,11 @@ msgstr "Hög hastighet GSM codec" msgid "The GSM codec" msgstr "GSM codec" -#: ../mediastreamer2/src/macsnd.c:670 +#: ../mediastreamer2/src/macsnd.c:1083 msgid "Sound capture filter for MacOS X Core Audio drivers" msgstr "" -#: ../mediastreamer2/src/macsnd.c:684 +#: ../mediastreamer2/src/macsnd.c:1098 msgid "Sound playback filter for MacOS X Core Audio drivers" msgstr "" @@ -1375,7 +1369,7 @@ msgstr "Den fria speex codec" msgid "A filter that controls and measure sound volume" msgstr "Ett filter som kontrollerar och mäter ljudvolym" -#: ../mediastreamer2/src/msv4l.c:1009 +#: ../mediastreamer2/src/msv4l.c:1011 msgid "A video4linux compatible source filter to stream pictures." msgstr "En video4linux kompatibel ingångsfilter för att strömma bilder" diff --git a/po/zh_CN.po b/po/zh_CN.po index e33fa8ab9..92b458054 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: linphone 0.7.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-02 10:28+0200\n" +"POT-Creation-Date: 2010-04-22 17:16+0200\n" "PO-Revision-Date: 2009-09-24 18:39+0300\n" "Last-Translator: Jiang Honglei\n" "Language-Team: Jiang Honglei\n" @@ -25,39 +25,39 @@ msgstr "无法打开图像文件: %s" msgid "Chat with %s" msgstr "与 %s 聊天" -#: ../gtk-glade/main.c:92 +#: ../gtk-glade/main.c:94 msgid "log to stdout some debug information while running." msgstr "" -#: ../gtk-glade/main.c:99 +#: ../gtk-glade/main.c:101 msgid "Start only in the system tray, do not show the main interface." msgstr "" -#: ../gtk-glade/main.c:106 +#: ../gtk-glade/main.c:108 msgid "address to call right now" msgstr "" -#: ../gtk-glade/main.c:113 +#: ../gtk-glade/main.c:115 msgid "if set automatically answer incoming calls" msgstr "是否设置呼叫自动应答" -#: ../gtk-glade/main.c:121 +#: ../gtk-glade/main.c:123 msgid "" "Specifiy a working directory (should be the base of the installation, eg: c:" "\\Program Files\\Linphone)" msgstr "" -#: ../gtk-glade/main.c:396 +#: ../gtk-glade/main.c:402 #, fuzzy, c-format msgid "Call with %s" msgstr "与 %s 聊天" -#: ../gtk-glade/main.c:707 +#: ../gtk-glade/main.c:720 #, c-format msgid "Incoming call from %s" msgstr "来自 %s 的呼叫" -#: ../gtk-glade/main.c:746 +#: ../gtk-glade/main.c:759 #, c-format msgid "" "%s would like to add you to his contact list.\n" @@ -69,31 +69,37 @@ msgstr "" "你是否允许他看到你的在线状态或者将它加为你的好友允许?\n" "如果你回答否，则会将该人临时性的放入黑名单" -#: ../gtk-glade/main.c:824 +#: ../gtk-glade/main.c:837 #, fuzzy, c-format msgid "" "Please enter your password for username %s\n" " at domain %s:" msgstr "请输入你的密码 %s:" -#: ../gtk-glade/main.c:921 +#: ../gtk-glade/main.c:934 msgid "Website link" msgstr "" -#: ../gtk-glade/main.c:957 +#: ../gtk-glade/main.c:970 msgid "Linphone - a video internet phone" msgstr "Linphone - 互联网视频电话" -#: ../gtk-glade/main.c:976 +#: ../gtk-glade/main.c:989 #, c-format msgid "%s (Default)" msgstr "%s (缺省)" -#: ../gtk-glade/main.c:1229 +#: ../gtk-glade/main.c:1221 +msgid "" +"No sound cards have been detected on this computer.\n" +"You won't be able to send or receive audio calls." +msgstr "" + +#: ../gtk-glade/main.c:1275 msgid "A free SIP video-phone" msgstr "免费的 SIP 视频电话" -#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:247 +#: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:258 #: ../gtk-glade/contact.glade.h:3 msgid "Name" msgstr "名字" @@ -136,91 +142,91 @@ msgstr "删除好友 '%s'" msgid "Add new contact from %s directory" msgstr "从 %s 目录增加好友 " -#: ../gtk-glade/propertybox.c:253 +#: ../gtk-glade/propertybox.c:264 msgid "Rate (Hz)" msgstr "采样率 (Hz)" -#: ../gtk-glade/propertybox.c:259 +#: ../gtk-glade/propertybox.c:270 msgid "Status" msgstr "状态" -#: ../gtk-glade/propertybox.c:265 +#: ../gtk-glade/propertybox.c:276 msgid "Min bitrate (kbit/s)" msgstr "最小速率 (kbit/s)" -#: ../gtk-glade/propertybox.c:271 +#: ../gtk-glade/propertybox.c:283 msgid "Parameters" msgstr "参数设置" -#: ../gtk-glade/propertybox.c:298 ../gtk-glade/propertybox.c:437 +#: ../gtk-glade/propertybox.c:312 ../gtk-glade/propertybox.c:451 msgid "Enabled" msgstr "启用" -#: ../gtk-glade/propertybox.c:299 ../gtk-glade/propertybox.c:437 +#: ../gtk-glade/propertybox.c:313 ../gtk-glade/propertybox.c:451 msgid "Disabled" msgstr "禁用" -#: ../gtk-glade/propertybox.c:482 +#: ../gtk-glade/propertybox.c:496 msgid "Account" msgstr "账号" -#: ../gtk-glade/propertybox.c:622 +#: ../gtk-glade/propertybox.c:636 msgid "English" msgstr "" -#: ../gtk-glade/propertybox.c:623 +#: ../gtk-glade/propertybox.c:637 msgid "French" msgstr "Français" -#: ../gtk-glade/propertybox.c:624 +#: ../gtk-glade/propertybox.c:638 msgid "Swedish" msgstr "" -#: ../gtk-glade/propertybox.c:625 +#: ../gtk-glade/propertybox.c:639 msgid "Italian" msgstr "" -#: ../gtk-glade/propertybox.c:626 +#: ../gtk-glade/propertybox.c:640 msgid "Spanish" msgstr "" -#: ../gtk-glade/propertybox.c:627 +#: ../gtk-glade/propertybox.c:641 msgid "Brazilian Portugese" msgstr "" -#: ../gtk-glade/propertybox.c:628 +#: ../gtk-glade/propertybox.c:642 msgid "Polish" msgstr "" -#: ../gtk-glade/propertybox.c:629 +#: ../gtk-glade/propertybox.c:643 msgid "German" msgstr "" -#: ../gtk-glade/propertybox.c:630 +#: ../gtk-glade/propertybox.c:644 msgid "Russian" msgstr "русский язык" -#: ../gtk-glade/propertybox.c:631 +#: ../gtk-glade/propertybox.c:645 msgid "Japanese" msgstr "日本語" -#: ../gtk-glade/propertybox.c:632 +#: ../gtk-glade/propertybox.c:646 msgid "Dutch" msgstr "Nederlands" -#: ../gtk-glade/propertybox.c:633 +#: ../gtk-glade/propertybox.c:647 msgid "Hungarian" msgstr "Magyar" -#: ../gtk-glade/propertybox.c:634 +#: ../gtk-glade/propertybox.c:648 msgid "Czech" msgstr "čeština" -#: ../gtk-glade/propertybox.c:635 +#: ../gtk-glade/propertybox.c:649 msgid "Chinese" msgstr "简体中文" -#: ../gtk-glade/propertybox.c:692 +#: ../gtk-glade/propertybox.c:706 msgid "" "You need to restart linphone for the new language selection to take effect." msgstr "你需要重新启动linphone以使你的语言选择生效" @@ -744,7 +750,7 @@ msgstr "接受" msgid "Decline" msgstr "拒绝" -#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:368 +#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:369 msgid "Incoming call" msgstr "呼入" @@ -1014,18 +1020,6 @@ msgstr "缺省声卡" msgid "default soundcard\n" msgstr "缺省声卡\n" -#: ../gtk-glade/parameters.glade.h:65 -msgid "gtk-go-down" -msgstr "" - -#: ../gtk-glade/parameters.glade.h:66 -msgid "gtk-go-up" -msgstr "" - -#: ../gtk-glade/parameters.glade.h:67 -msgid "gtk-media-play" -msgstr "" - #: ../gtk-glade/buddylookup.glade.h:1 msgid "Search somebody" msgstr "查找用户" @@ -1046,26 +1040,26 @@ msgstr "Linphone" msgid "Please wait" msgstr "请等待" -#: ../coreapi/linphonecore.c:310 +#: ../coreapi/linphonecore.c:311 #, fuzzy, c-format msgid "You have missed %i call." msgid_plural "You have missed %i calls." msgstr[0] "你丢失 %i 呼叫." msgstr[1] "你共丢失 %i 次呼叫." -#: ../coreapi/linphonecore.c:356 +#: ../coreapi/linphonecore.c:357 msgid "aborted" msgstr "中断" -#: ../coreapi/linphonecore.c:359 +#: ../coreapi/linphonecore.c:360 msgid "completed" msgstr "完成" -#: ../coreapi/linphonecore.c:362 +#: ../coreapi/linphonecore.c:363 msgid "missed" msgstr "丢失" -#: ../coreapi/linphonecore.c:367 +#: ../coreapi/linphonecore.c:368 #, c-format msgid "" "%s at %s\n" @@ -1080,60 +1074,60 @@ msgstr "" "Status: %s\n" "Status: %i min %i sec\n" -#: ../coreapi/linphonecore.c:368 +#: ../coreapi/linphonecore.c:369 msgid "Outgoing call" msgstr "呼出" -#: ../coreapi/linphonecore.c:625 +#: ../coreapi/linphonecore.c:626 msgid "" "Your machine appears to be connected to an IPv6 network. By default linphone " "always uses IPv4. Please update your configuration if you want to use IPv6" msgstr "" "你的机器缺省配置为IPv6. Linphone 缺省使用IPv4. 请修改配置如果你想使用IPv6. " -#: ../coreapi/linphonecore.c:1074 +#: ../coreapi/linphonecore.c:1083 msgid "Ready" msgstr "就绪" -#: ../coreapi/linphonecore.c:1505 +#: ../coreapi/linphonecore.c:1513 msgid "Remote end seems to have disconnected, the call is going to be closed." msgstr "对方断开连接, 通话终止." -#: ../coreapi/linphonecore.c:1703 +#: ../coreapi/linphonecore.c:1725 msgid "Looking for telephone number destination..." msgstr "查询对方电话号码.." -#: ../coreapi/linphonecore.c:1705 +#: ../coreapi/linphonecore.c:1727 msgid "Could not resolve this number." msgstr "该号码无法解析." -#: ../coreapi/linphonecore.c:1749 +#: ../coreapi/linphonecore.c:1771 msgid "" "Could not parse given sip address. A sip url usually looks like sip:" "user@domain" msgstr "无法解析给定的SIP地址. SIP url 应有如下格式: " -#: ../coreapi/linphonecore.c:1890 +#: ../coreapi/linphonecore.c:1912 msgid "Contacting" msgstr "联系中" -#: ../coreapi/linphonecore.c:1896 +#: ../coreapi/linphonecore.c:1918 msgid "could not call" msgstr "无法呼叫" -#: ../coreapi/linphonecore.c:1942 +#: ../coreapi/linphonecore.c:1965 msgid "Sorry, having multiple simultaneous calls is not supported yet !" msgstr "抱歉, 还不支持并发多路呼叫!" -#: ../coreapi/linphonecore.c:2337 ../coreapi/callbacks.c:32 +#: ../coreapi/linphonecore.c:2370 ../coreapi/callbacks.c:32 msgid "Connected." msgstr "连接建立." -#: ../coreapi/linphonecore.c:2371 +#: ../coreapi/linphonecore.c:2404 msgid "Call ended" msgstr "呼叫结束" -#: ../coreapi/misc.c:142 +#: ../coreapi/misc.c:147 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the pcm oss emulation module\n" @@ -1145,7 +1139,7 @@ msgstr "" "is missing and linphone needs it. Please execute\n" "'modprobe snd-pcm-oss' as root to load it." -#: ../coreapi/misc.c:145 +#: ../coreapi/misc.c:150 msgid "" "Your computer appears to be using ALSA sound drivers.\n" "This is the best choice. However the mixer oss emulation module\n" @@ -1157,7 +1151,7 @@ msgstr "" "is missing and linphone needs it. Please execute\n" " 'modprobe snd-mixer-oss' as root to load it." -#: ../coreapi/misc.c:492 +#: ../coreapi/misc.c:497 msgid "Stun lookup in progress..." msgstr "正在进行Stun查找..." @@ -1272,49 +1266,49 @@ msgstr "用户开启免打扰功能." msgid "Call declined." msgstr "呼叫被拒绝." -#: ../coreapi/callbacks.c:280 +#: ../coreapi/callbacks.c:281 #, fuzzy msgid "No response." msgstr "没有响应，超时" -#: ../coreapi/callbacks.c:283 -msgid "Error." +#: ../coreapi/callbacks.c:284 +msgid "Protocol error." msgstr "" -#: ../coreapi/callbacks.c:296 +#: ../coreapi/callbacks.c:298 #, fuzzy msgid "Redirected" msgstr "重定向到 %s..." -#: ../coreapi/callbacks.c:304 +#: ../coreapi/callbacks.c:308 msgid "Not found" msgstr "" -#: ../coreapi/callbacks.c:312 +#: ../coreapi/callbacks.c:318 msgid "No common codecs" msgstr "" -#: ../coreapi/callbacks.c:316 +#: ../coreapi/callbacks.c:324 #, fuzzy msgid "Call failed." msgstr "呼叫被拒绝." -#: ../coreapi/callbacks.c:365 +#: ../coreapi/callbacks.c:374 #, c-format msgid "Registration on %s successful." msgstr "成功注册到 %s " -#: ../coreapi/callbacks.c:366 +#: ../coreapi/callbacks.c:375 #, fuzzy, c-format msgid "Unregistration on %s done." msgstr "成功注册到 %s " -#: ../coreapi/callbacks.c:374 +#: ../coreapi/callbacks.c:383 #, c-format msgid "Registration on %s failed: %s" msgstr "注册到 %s 失败: %s" -#: ../coreapi/callbacks.c:374 +#: ../coreapi/callbacks.c:383 msgid "no response timeout" msgstr "没有响应，超时" @@ -1335,11 +1329,11 @@ msgstr "ALSA音频源" msgid "Alsa sound output" msgstr "ALSA音频输出" -#: ../mediastreamer2/src/aqsnd.c:1005 +#: ../mediastreamer2/src/aqsnd.c:1008 msgid "Sound capture filter for MacOS X Audio Queue Service" msgstr "" -#: ../mediastreamer2/src/aqsnd.c:1029 +#: ../mediastreamer2/src/aqsnd.c:1032 msgid "Sound playback filter for MacOS X Audio Queue Service" msgstr "" @@ -1355,11 +1349,11 @@ msgstr "" msgid "The GSM codec" msgstr "" -#: ../mediastreamer2/src/macsnd.c:670 +#: ../mediastreamer2/src/macsnd.c:1083 msgid "Sound capture filter for MacOS X Core Audio drivers" msgstr "" -#: ../mediastreamer2/src/macsnd.c:684 +#: ../mediastreamer2/src/macsnd.c:1098 msgid "Sound playback filter for MacOS X Core Audio drivers" msgstr "" @@ -1404,7 +1398,7 @@ msgstr "" msgid "A filter that controls and measure sound volume" msgstr "" -#: ../mediastreamer2/src/msv4l.c:1009 +#: ../mediastreamer2/src/msv4l.c:1011 msgid "A video4linux compatible source filter to stream pictures." msgstr "" diff --git a/share/linphone.desktop.in b/share/linphone.desktop.in index cde170df2..7a490a74d 100644 --- a/share/linphone.desktop.in +++ b/share/linphone.desktop.in @@ -7,4 +7,4 @@ Type=Application Exec=linphone-3 Icon=@prefix@/share/pixmaps/linphone/linphone.png Terminal=false -Categories=Application;Network; \ No newline at end of file +Categories=Network;Telephony; \ No newline at end of file