]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git://git.linphone.org/linphone
authorJehan Monnier <jehan.monnier@linphone.org>
Mon, 27 May 2013 09:18:35 +0000 (11:18 +0200)
committerJehan Monnier <jehan.monnier@linphone.org>
Mon, 27 May 2013 09:18:35 +0000 (11:18 +0200)
55 files changed:
NEWS
README
README.mingw
build/android/Android-no-neon.mk
build/android/Android.mk
configure.ac
console/linphonec.c
coreapi/TunnelManager.cc
coreapi/TunnelManager.hh
coreapi/callbacks.c
coreapi/conference.c
coreapi/ec-calibrator.c
coreapi/linphone_tunnel.cc
coreapi/linphone_tunnel.h
coreapi/linphone_tunnel_stubs.c
coreapi/linphonecall.c
coreapi/linphonecore.c
coreapi/linphonecore.h
coreapi/linphonecore_jni.cc
coreapi/message_storage.c
coreapi/proxy.c
coreapi/sal_eXosip2.c
coreapi/sal_eXosip2_presence.c
coreapi/sal_eXosip2_sdp.c
gtk/about.ui
gtk/chat.c
gtk/dscp_settings.ui
gtk/friendlist.c
gtk/incall_view.c
gtk/main.ui
gtk/parameters.ui
gtk/propertybox.c
java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
linphone-deps.filelist
mediastreamer2
oRTP
pixmaps/contact_unstarred.png
pixmaps/startcall-small.png
po/cs.po
po/de.po
po/es.po
po/fr.po
po/he.po
po/hu.po
po/it.po
po/ja.po
po/nb_NO.po
po/nl.po
po/pl.po
po/pt_BR.po
po/ru.po
po/sr.po
po/sv.po
po/zh_CN.po
po/zh_TW.po

diff --git a/NEWS b/NEWS
index 413970e6a9df58885d12ad43a4d936a642b06dd1..0eede9fa552cfdd9646e1b3e84d3499f4c7fa323 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,24 @@
-linphone-3.xxx --
+linphone-3.6.0 -- May 27, 2013
+       UI:
+       * new friend list and chat messaging UI
+       * enhanced call history
+       * call and conference audio recording
+       * persistent chat history
+       * DSCP settings for SIP and RTP
+       * display of call statistics (when clicking on the quality indicator bar)
+       core:
+       * ICE for efficient RTP exchange
        * fix bug in zRTP support (upgrade required)
-       *
+       * call recording
+       * uPnP
+       * call statistics
+       * adaptive bitrate control improvements
+       * faster call quality indicator feedback
+       * DSCP settings for SIP and RTP
+       * detailed call statistics feedback API
+
+       Requires: mediastreamer2 = 2.9.0 and ortp = 0.22.0
+
 
 linphone-3.5.2 -- February 22, 2012
        * updated oRTP to 0.20.0
diff --git a/README b/README
index db78b72e561eada12eda84a3aab25c9bf3e7f33f..a1fb5bd3deb256360627079b28b5464b8e7c5fb7 100644 (file)
--- a/README
+++ b/README
@@ -8,29 +8,35 @@ This is Linphone, a free (GPL) video softphone based on the SIP protocol.
        - intltool
 
 - you need at least:
-       - libosip2>=3.0.3
-       - libeXosip2>=3.0.3
+       - libosip2>=3.5.0
+       - libeXosip2>=3.5.0
        - speex>=1.2.0 (including libspeexdsp part)
        
        + if you want the gtk/glade interface:
                - libgtk >=2.16.0
        + if you want video support:
-               - SDL>=1.2.10
+               - libvpx (VP8 codec)
                - libavcodec (ffmpeg) 
                - libswscale (part of ffmpeg too) for better scaling performance
                - libxv (x11 video extension)
-              - ligl1-mesa (OpenGL API -- GLX development files)
-              - libglew (OpenGL Extension Wrangler library)
-              - libv4l (Video for linux)
-              - libx11 (x11)
+               - ligl1-mesa (OpenGL API -- GLX development files)
+               - libglew (OpenGL Extension Wrangler library)
+               - libv4l (Video for linux)
+               - libx11 (x11)
                - theora (optional)
-
        + gsm codec (gsm source package or libgsm-dev or gsm-devel) (optional)
        + libreadline (optional: for convenient command line in linphonec)
        + libsoup (optional: for wizard - account creation assistant)
-       + libsqlite3 (optional : for a local history of messages)
+       + libsqlite3 (optional : for a local history of chat messages)
        + if you want uPnP support (optional):
                - libupnp (version 1.6 branch (not patched with 18-url-upnpstrings.patch))
+
+       Here is the command line to get these dependencies installed for Ubuntu && Debian 
+
+       $ sudo apt-get install libtool intltool libgtk2.0-dev libosip2-dev libexosip2-dev libspeexdsp-dev libavcodec-dev libswscale-dev libx11-dev libvx-dev ligl1-mesa-dev libglew-dev libv4l-dev
+
+       + for optional library
+       $ sudo apt-get install libreadline-dev liggsm1-dev libtheora-dev libsoup2.4-dev libsqlit3-dev libupnp6-dev 
        
        + Install srtp (optional) for call encryption :
                $ git clone git://git.linphone.org/srtp.git
@@ -43,22 +49,15 @@ This is Linphone, a free (GPL) video softphone based on the SIP protocol.
                $ cd zrtpcpp && cmake -Denable-ccrtp=false . && make
                $ sudo make install
 
-with their corresponding -dev or -devel package if you don't use source packages.
 
 - Compile linphone
 
  $ ./autogen.sh
  $ ./configure 
- $ sudo make install 
+ $ make && sudo make install 
  $ sudo ldconfig
 
-- Command line for Ubuntu && Debian 
-
-       $ sudo apt-get install libtool intltool libgtk2.0-dev libosip2-dev libexosip2-dev libspeexdsp-dev libavcodec-dev libswscale-dev libx11-dev libvx-dev ligl1-mesa-dev libglew-dev libv4l-dev
 
-       + for optional library
-       $ sudo apt-get install libreadline-dev liggsm1-dev libtheora-dev libsoup2.4-dev libsqlit3-dev libupnp6-dev 
 
 For windows compilation see README.mingw.
 For macOS X, see README.macos
index 42b130f335035020d35fd466f723741a72b4d69f..be45614f2af070ca4ed662ce88b3bcf22780c97c 100644 (file)
@@ -136,11 +136,21 @@ libgnutls (from the web)
 libgsm (from the web)
 libxml2 (compiled)
 libsoup (compiled)
+libsqlite3 (compiled)
 
 Remarks:
 For every package compiled that goes into linphone-deps, .la files (libtool files) must be removed to avoid libtool errors.
 When running "make install DESTDIR=<somepath>", somepath must be absolute and should not contain any ~ or space.
 
+- building sqlite3
+  * download the sources on the following website:
+  http://www.sqlite.org/download.html (choose the sqlite-autoconf-3XXX.tar.gz)
+  
+  * install: 
+  ./configure
+  make && make install DESTDIR=/home/<myuser>/sqlite3-install
+  then copy the content of ~/sqlite3-install/usr/local/ into linphone-deps/.   
+
 - building ffmpeg 
   ./configure --enable-shared --disable-static --enable-memalign-hack --extra-cflags="-fno-common" --enable-gpl && make
   make install DESTDIR=/home/<myuser>/ffmpeg-install
@@ -152,6 +162,7 @@ When running "make install DESTDIR=<somepath>", somepath must be absolute and sh
   ./configure --enable-shared --disable-static && make && make install DESTDIR=/home/<myuser>/libxml2-install
   copy ~/libxml2-install/usr/local/* into linphone-deps/.
 
+
 - building x264:
  
   * download yasm normal version windows executable from yasm project page:
index d8e75ca0b9aeb9805bc395ed313008bd351e3fe8..39818fbf4df97fca7c9733f611bdb96c71cedc85 100644 (file)
@@ -35,7 +35,13 @@ endif
 
 LOCAL_MODULE := liblinphonenoneon
 ifeq ($(TARGET_ARCH_ABI),armeabi)
-LOCAL_MODULE_FILENAME := liblinphonearmv5
+LOCAL_MODULE_FILENAME := liblinphonearmv5noneon
+endif
+ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
+LOCAL_MODULE_FILENAME := liblinphonearmv7noneon
+endif
+ifeq ($(TARGET_ARCH_ABI),x86)
+LOCAL_MODULE_FILENAME := liblinphonex86
 endif
 
 include $(BUILD_SHARED_LIBRARY)
index 10fba32dde675a67c35a4270ea8fa2491a2df79c..0dc0bd041fe283c94e62fdf9516692e8263dddb9 100755 (executable)
@@ -34,6 +34,9 @@ LOCAL_SHARED_LIBRARIES += \
 endif
 
 LOCAL_MODULE := liblinphone
+ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
+LOCAL_MODULE_FILENAME := liblinphonearmv7
+endif
 
 include $(BUILD_SHARED_LIBRARY)
 
index 7bc526bbb288f379be0ad3ceae3f86cf1930a86b..0fcf38fc9529e1c806192cf8b0a852374ac430da 100644 (file)
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([linphone],[3.5.99.0],[linphone-developers@nongnu.org])
+AC_INIT([linphone],[3.6.0],[linphone-developers@nongnu.org])
 AC_CANONICAL_SYSTEM
 AC_CONFIG_SRCDIR([coreapi/linphonecore.c])
 
@@ -656,9 +656,7 @@ AC_ARG_ENABLE(tunnel,
 AM_CONDITIONAL(BUILD_TUNNEL, test x$enable_tunnel = xtrue)
 if test x$enable_tunnel = xtrue; then
        PKG_CHECK_MODULES(TUNNEL, tunnel >= 0.3.3)
-       TUNNEL_CFLAGS+="-DTUNNEL_ENABLED"
-       AC_SUBST(TUNNEL_CFLAGS)
-       AC_SUBST(TUNNEL_LIBS)
+       AC_DEFINE(TUNNEL_ENABLED,1,[Tells tunnel extension is built-in])
 fi
 
 AC_ARG_ENABLE(msg-storage,
index fca5a9b86987565c02c4e5914f4a524e13d140d9..60c3c2af11c48256e6af0ccfaa290d702e683b05 100644 (file)
@@ -1400,6 +1400,7 @@ copy_file(const char *from, const char *to)
                snprintf(message, 255, "Can't open %s for writing: %s\n",
                        to, strerror(errno));
                fprintf(stderr, "%s", message);
+               fclose(in);
                return 0;
        }
 
@@ -1408,6 +1409,8 @@ copy_file(const char *from, const char *to)
        {
                if ( ! fwrite(buf, 1, n, out) )
                {
+                       fclose(in);
+                       fclose(out);
                        return 0;
                }
        }
index d1020b1b2782f6d431fefa607771a1ea4bd05173..409f9c42a83635c41ba6ff2890b7166aae46d9f6 100644 (file)
@@ -189,7 +189,7 @@ bool TunnelManager::isStarted() {
 }
 
 bool TunnelManager::isReady() const {
-       return mTunnelClient && mTunnelClient->isReady();
+       return mTunnelClient && mTunnelClient->isReady() && mReady;
 }
 
 int TunnelManager::customSendto(struct _RtpTransport *t, mblk_t *msg , int flags, const struct sockaddr *to, socklen_t tolen){
@@ -214,6 +214,7 @@ TunnelManager::TunnelManager(LinphoneCore* lc) :TunnelClientController()
 ,mEnabled(false)
 ,mTunnelClient(NULL)
 ,mAutoDetectStarted(false)
+,mReady(false)
 ,mHttpProxyPort(0){
 
        mExosipTransport.data=this;
@@ -271,6 +272,7 @@ void TunnelManager::processTunnelEvent(const Event &ev){
                if (lProxy) {
                        linphone_proxy_config_done(lProxy);
                }
+               mReady=true;
        }else if (mEnabled && !mTunnelClient->isReady()){
                /* we got disconnected from the tunnel */
                if (lProxy && linphone_proxy_config_is_registered(lProxy)) {
@@ -278,6 +280,7 @@ void TunnelManager::processTunnelEvent(const Event &ev){
                        linphone_proxy_config_edit(lProxy);
                        linphone_core_iterate(mCore);
                }
+               mReady=false;
        }
 }
 
@@ -317,7 +320,7 @@ void TunnelManager::enable(bool isEnable) {
                
                mEnabled=false;
                stopClient();
-               
+               mReady=false;
                linphone_core_set_rtp_transport_factories(mCore,NULL);
 
                eXosip_transport_hook_register(NULL);
index d4c1458fcfc933c122b8cec44604fe298a974958..113f76786c5ca3fa90291dd952b2f826d3c8aa59 100644 (file)
@@ -129,6 +129,7 @@ class UdpMirrorClient;
                 */
                LinphoneCore *getLinphoneCore();
                virtual void setHttpProxy(const char *host,int port, const char *username, const char *passwd);
+               virtual bool isReady() const;
        private:
                enum EventType{
                        UdpMirrorClientEvent,
@@ -143,7 +144,6 @@ class UdpMirrorClient;
                };
                typedef std::list<UdpMirrorClient> UdpMirrorClientList;
                virtual bool isStarted();
-               virtual bool isReady() const;
                void onIterate();
                static int customSendto(struct _RtpTransport *t, mblk_t *msg , int flags, const struct sockaddr *to, socklen_t tolen);
                static int customRecvfrom(struct _RtpTransport *t, mblk_t *msg, int flags, struct sockaddr *from, socklen_t *fromlen);
@@ -173,6 +173,7 @@ class UdpMirrorClient;
                Mutex mMutex;
                static Mutex sMutex;
                bool mAutoDetectStarted;
+               bool mReady;
                LinphoneRtpTransportFactories mTransportFactories;
                std::string mHttpUserName;
                std::string mHttpPasswd;
index 8a6ea631ceaea1fce25e032d0a096be0f8249422..a6b49a0e8e878eb76cee10453ce86a0ab55187bb 100644 (file)
@@ -351,7 +351,8 @@ static void call_accepted(SalOp *op){
 #endif //BUILD_UPNP
 
        md=sal_call_get_final_media_description(op);
-       call->params.has_video &= linphone_core_media_description_contains_video_stream(md);
+       if (md)
+               call->params.has_video &= linphone_core_media_description_contains_video_stream(md);
        
        if (call->state==LinphoneCallOutgoingProgress ||
            call->state==LinphoneCallOutgoingRinging ||
index c9d51b151c89beb144614a5bcc55a3dcf926cf5c..0d8ea39a0fdd0e6b44f76581961744a63d5e4ff7 100644 (file)
@@ -182,7 +182,6 @@ float linphone_core_get_conference_local_input_volume(LinphoneCore *lc){
  * @returns 0 if successful, -1 otherwise.
 **/
 int linphone_core_add_to_conference(LinphoneCore *lc, LinphoneCall *call){
-       LinphoneCallParams params;
        LinphoneConference *conf=&lc->conf_ctx;
        
        if (call->current_params.in_conference){
@@ -190,21 +189,25 @@ int linphone_core_add_to_conference(LinphoneCore *lc, LinphoneCall *call){
                return -1;
        }
        conference_check_init(&lc->conf_ctx, lp_config_get_int(lc->config, "sound","conference_rate",16000));
-       call->params.in_conference=TRUE;
-       call->params.has_video=FALSE;
-       call->params.media_encryption=LinphoneMediaEncryptionNone;
-       params=call->params;
-       if (call->state==LinphoneCallPaused)
+       
+       if (call->state==LinphoneCallPaused){
+               call->params.in_conference=TRUE;
+               call->params.has_video=FALSE;
                linphone_core_resume_call(lc,call);
-       else if (call->state==LinphoneCallStreamsRunning){
-               /*this will trigger a reINVITE that will later redraw the streams */
+       }else if (call->state==LinphoneCallStreamsRunning){
+               LinphoneCallParams *params=linphone_call_params_copy(linphone_call_get_current_params(call));
+               params->in_conference=TRUE;
+               params->has_video=FALSE;
+               
                if (call->audiostream || call->videostream){
                        linphone_call_stop_media_streams (call); /*free the audio & video local resources*/
                }
                if (call==lc->current_call){
                        lc->current_call=NULL;
                }
-               linphone_core_update_call(lc,call,&params);
+               /*this will trigger a reINVITE that will later redraw the streams */
+               linphone_core_update_call(lc,call,params);
+               linphone_call_params_destroy(params);
                add_local_endpoint(conf,lc);
        }else{
                ms_error("Call is in state %s, it cannot be added to the conference.",linphone_call_state_to_string(call->state));
@@ -231,13 +234,16 @@ static int remove_from_conference(LinphoneCore *lc, LinphoneCall *call, bool_t a
        ms_message("%s will be removed from conference", str);
        ms_free(str);
        if (active){
+               LinphoneCallParams *params=linphone_call_params_copy(linphone_call_get_current_params(call));
+               params->in_conference=FALSE;
                // reconnect local audio with this call
                if (linphone_core_is_in_conference(lc)){
                        ms_message("Leaving conference for reconnecting with unique call.");
                        linphone_core_leave_conference(lc);
                }
                ms_message("Updating call to actually remove from conference");
-               err=linphone_core_update_call(lc,call,&call->params);
+               err=linphone_core_update_call(lc,call,params);
+               linphone_call_params_destroy(params);
        } else{
                ms_message("Pausing call to actually remove from conference");
                err=_linphone_core_pause_call(lc,call);
index 223fb087d91b3c3144aefccee607a12d7ce894dd..fa92b499283950f2f8e6e9cace2334724edbf18b 100644 (file)
@@ -36,7 +36,7 @@ static void ecc_init_filters(EcCalibrator *ecc){
        params.prio=MS_TICKER_PRIO_HIGH;
        ecc->ticker=ms_ticker_new_with_params(&params);
 
-       ecc->sndread=ms_snd_card_create_reader(ecc->play_card);
+       ecc->sndread=ms_snd_card_create_reader(ecc->capt_card);
        ms_filter_call_method(ecc->sndread,MS_FILTER_SET_SAMPLE_RATE,&ecc->rate);
        ms_filter_call_method(ecc->sndread,MS_FILTER_GET_SAMPLE_RATE,&rate);
        ms_filter_call_method(ecc->sndread,MS_FILTER_SET_NCHANNELS,&ecc_channels);
@@ -50,7 +50,7 @@ static void ecc_init_filters(EcCalibrator *ecc){
        
        ecc->det=ms_filter_new(MS_TONE_DETECTOR_ID);
        ms_filter_call_method(ecc->det,MS_FILTER_SET_SAMPLE_RATE,&ecc->rate);
-       ecc->rec=ms_filter_new(MS_FILE_REC_ID);
+       ecc->rec=ms_filter_new(MS_VOID_SINK_ID);
 
        ms_filter_link(ecc->sndread,0,ecc->read_resampler,0);
        ms_filter_link(ecc->read_resampler,0,ecc->det,0);
@@ -60,7 +60,7 @@ static void ecc_init_filters(EcCalibrator *ecc){
        ecc->gen=ms_filter_new(MS_DTMF_GEN_ID);
        ms_filter_call_method(ecc->gen,MS_FILTER_SET_SAMPLE_RATE,&ecc->rate);
        ecc->write_resampler=ms_filter_new(MS_RESAMPLE_ID);
-       ecc->sndwrite=ms_snd_card_create_writer(ecc->capt_card);
+       ecc->sndwrite=ms_snd_card_create_writer(ecc->play_card);
        
        ms_filter_call_method(ecc->sndwrite,MS_FILTER_SET_SAMPLE_RATE,&ecc->rate);
        ms_filter_call_method(ecc->sndwrite,MS_FILTER_GET_SAMPLE_RATE,&rate);
index f0de56694d02a564cf1ea8376a981d2b584b6c8b..079074aa8d2b76e23331476f2bd60bd5bfacdc71 100644 (file)
@@ -233,6 +233,10 @@ bool_t linphone_tunnel_enabled(LinphoneTunnel *tunnel){
        return bcTunnel(tunnel)->isEnabled();
 }
 
+bool_t linphone_tunnel_connected(LinphoneTunnel *tunnel){
+       return bcTunnel(tunnel)->isReady();
+}
+
 static OrtpLogFunc tunnelOrtpLogHandler=NULL;
 
 /*
index e42a054dcc4023bb9385979eb788f28b3f650c0f..f02baab5473ee6d8f7f29b03808eb253667b47a8 100644 (file)
@@ -165,6 +165,12 @@ void linphone_tunnel_enable(LinphoneTunnel *tunnel, bool_t enabled);
 **/
 bool_t linphone_tunnel_enabled(LinphoneTunnel *tunnel);
 
+/**
+ * @param  tunnel object
+ * Returns a boolean indicating whether tunnel is connected successfully.
+**/
+bool_t linphone_tunnel_connected(LinphoneTunnel *tunnel);
+
 /**
  * @param  tunnel object
  * Forces reconnection to the tunnel server.
index 0560b3956d945a150b6cda0f74f599e55257aeb4..0865704a0dfd904158f91a1cb320f9cbbbf8f3d9 100644 (file)
@@ -59,6 +59,10 @@ bool_t linphone_tunnel_enabled(LinphoneTunnel *tunnel){
         return FALSE;
 }
 
+bool_t linphone_tunnel_connected(LinphoneTunnel *tunnel){
+       return FALSE;
+}
+
 
 void linphone_tunnel_enable_logs_with_handler(LinphoneTunnel *tunnel, bool_t enabled, OrtpLogFunc logHandler){
 }
index db3190bbb3e851709690144472689ea3cc3e6ad5..d5366e5c66a3da90a322392b1adaa029a39626b9 100644 (file)
@@ -84,9 +84,11 @@ static bool_t linphone_call_are_all_streams_encrypted(LinphoneCall *call) {
 
 #ifdef VIDEO_ENABLED
        // If video enabled, check ZRTP encryption in videostream
-       const LinphoneCallParams *params=linphone_call_get_current_params(call);
-       if (params->has_video && !call->videostream_encrypted) {
-               return FALSE;
+       {
+               const LinphoneCallParams *params=linphone_call_get_current_params(call);
+               if (params->has_video && !call->videostream_encrypted) {
+                       return FALSE;
+               }
        }
 #endif
 
@@ -110,9 +112,9 @@ void propagate_encryption_changed(LinphoneCall *call){
 
 #ifdef VIDEO_ENABLED
 static void linphone_call_videostream_encryption_changed(void *data, bool_t encrypted){
-       ms_message("Video stream is %s", encrypted ? "encrypted" : "not encrypted");
-
        LinphoneCall *call = (LinphoneCall *)data;
+
+       ms_message("Video stream is %s", encrypted ? "encrypted" : "not encrypted");
        call->videostream_encrypted=encrypted;
        propagate_encryption_changed(call);
 }
@@ -135,12 +137,14 @@ static void linphone_call_audiostream_encryption_changed(void *data, bool_t encr
 
 #ifdef VIDEO_ENABLED
        // Enable video encryption
-       const LinphoneCallParams *params=linphone_call_get_current_params(call);
-       if (params->has_video) {
-               ms_message("Trying to enable encryption on video stream");
-               OrtpZrtpParams params;
-               params.zid_file=NULL; //unused
-               video_stream_enable_zrtp(call->videostream,call->audiostream,&params);
+       {
+               const LinphoneCallParams *params=linphone_call_get_current_params(call);
+               if (params->has_video) {
+                       OrtpZrtpParams params;
+                       ms_message("Trying to enable encryption on video stream");
+                       params.zid_file=NULL; //unused
+                       video_stream_enable_zrtp(call->videostream,call->audiostream,&params);
+               }
        }
 #endif
 }
@@ -1627,11 +1631,11 @@ static void linphone_call_start_video_stream(LinphoneCall *call, const char *cna
                const char *rtcp_addr=vstream->rtcp_addr[0]!='\0' ? vstream->rtcp_addr : call->resultdesc->addr;
                call->video_profile=make_profile(call,call->resultdesc,vstream,&used_pt);
                if (used_pt!=-1){
-                       call->current_params.video_codec = rtp_profile_get_payload(call->video_profile, used_pt);
                        VideoStreamDir dir=VideoStreamSendRecv;
                        MSWebCam *cam=lc->video_conf.device;
                        bool_t is_inactive=FALSE;
 
+                       call->current_params.video_codec = rtp_profile_get_payload(call->video_profile, used_pt);
                        call->current_params.has_video=TRUE;
 
                        video_stream_enable_adaptive_bitrate_control(call->videostream,
@@ -1701,9 +1705,6 @@ static void linphone_call_start_video_stream(LinphoneCall *call, const char *cna
 void linphone_call_start_media_streams(LinphoneCall *call, bool_t all_inputs_muted, bool_t send_ringbacktone){
        LinphoneCore *lc=call->core;
 
-       call->current_params.audio_codec = NULL;
-       call->current_params.video_codec = NULL;
-
        LinphoneAddress *me=linphone_core_get_primary_contact_parsed(lc);
        char *cname;
        bool_t use_arc=linphone_core_adaptive_rate_control_enabled(lc);
@@ -1712,6 +1713,9 @@ void linphone_call_start_media_streams(LinphoneCall *call, bool_t all_inputs_mut
                                                        SalProtoRtpAvp,SalVideo);
 #endif
 
+       call->current_params.audio_codec = NULL;
+       call->current_params.video_codec = NULL;
+
        if ((call->audiostream == NULL) && (call->videostream == NULL)) {
                ms_fatal("start_media_stream() called without prior init !");
                return;
index bb2b4a83cf324a5411da60366e7458e5f0d008bb..f0963f904f2e87233e48091e7a9687b1eba01b40 100644 (file)
@@ -825,6 +825,7 @@ typedef struct codec_desc{
 }codec_desc_t;
 
 static codec_desc_t codec_pref_order[]={
+       {"opus", 48000},
        {"SILK", 16000},
        {"speex", 16000},
        {"speex", 8000},
@@ -1285,8 +1286,9 @@ static void linphone_core_init (LinphoneCore * lc, const LinphoneCoreVTable *vta
        linphone_core_assign_payload_type(lc,&payload_type_silk_wb,-1,NULL);
        linphone_core_assign_payload_type(lc,&payload_type_silk_swb,-1,NULL);
        linphone_core_assign_payload_type(lc,&payload_type_g729,18,"annexb=no");
-       linphone_core_assign_payload_type(lc,&payload_type_aaceld_22k,-1,"config=F8EE2000; constantDuration=512;  indexDeltaLength=3; indexLength=3; mode=AAC-hbr; profile-level-id=24; sizeLength=13; streamType=5");
-       linphone_core_assign_payload_type(lc,&payload_type_aaceld_44k,-1,"config=F8E82000; constantDuration=512;  indexDeltaLength=3; indexLength=3; mode=AAC-hbr; profile-level-id=24; sizeLength=13; streamType=5");
+       linphone_core_assign_payload_type(lc,&payload_type_aaceld_22k,-1,"config=F8EE2000; constantDuration=512;  indexDeltaLength=3; indexLength=3; mode=AAC-hbr; profile-level-id=76; sizeLength=13; streamType=5");
+       linphone_core_assign_payload_type(lc,&payload_type_aaceld_44k,-1,"config=F8E82000; constantDuration=512;  indexDeltaLength=3; indexLength=3; mode=AAC-hbr; profile-level-id=76; sizeLength=13; streamType=5");
+       linphone_core_assign_payload_type(lc,&payload_type_opus,-1,"useinbandfec=1; usedtx=1");
        linphone_core_handle_static_payloads(lc);
        
        ms_init();
@@ -2838,10 +2840,13 @@ int linphone_core_start_update_call(LinphoneCore *lc, LinphoneCall *call){
 **/
 int linphone_core_update_call(LinphoneCore *lc, LinphoneCall *call, const LinphoneCallParams *params){
        int err=0;
+#ifdef VIDEO_ENABLED
+       bool_t has_video = FALSE;
+#endif
        if (params!=NULL){
                linphone_call_set_state(call,LinphoneCallUpdating,"Updating call");
 #ifdef VIDEO_ENABLED
-               bool_t has_video = call->params.has_video;
+               has_video = call->params.has_video;
 
                // Video removing
                if((call->videostream != NULL) && !params->has_video) {
@@ -4190,7 +4195,7 @@ const char * linphone_core_get_stun_server(const LinphoneCore *lc){
        return lc->net_conf.stun_server;
 }
 
-bool_t linphone_core_upnp_available(const LinphoneCore *lc){
+bool_t linphone_core_upnp_available(){
 #ifdef BUILD_UPNP
        return TRUE;
 #else
@@ -4677,9 +4682,9 @@ unsigned long linphone_core_get_native_preview_window_id(const LinphoneCore *lc)
  * If not set the core will create its own window.
 **/
 void linphone_core_set_native_preview_window_id(LinphoneCore *lc, unsigned long id){
-       lc->preview_window_id=id;
 #ifdef VIDEO_ENABLED
        LinphoneCall *call=linphone_core_get_current_call(lc);
+       lc->preview_window_id=id;
        if (call!=NULL && call->videostream){
                video_stream_set_native_preview_window_id(call->videostream,id);
        }else if (lc->previewstream){
@@ -4693,8 +4698,8 @@ void linphone_core_set_native_preview_window_id(LinphoneCore *lc, unsigned long
 **/
 void linphone_core_show_video(LinphoneCore *lc, bool_t show){
 #ifdef VIDEO_ENABLED
-       ms_error("linphone_core_show_video %d", show);
        LinphoneCall *call=linphone_core_get_current_call(lc);
+       ms_error("linphone_core_show_video %d", show);
        if (call!=NULL && call->videostream){
                video_stream_show_video(call->videostream,show);
        }
@@ -4730,9 +4735,11 @@ void linphone_core_set_device_rotation(LinphoneCore *lc, int rotation) {
        ms_message("%s : rotation=%d\n", __FUNCTION__, rotation);
        lc->device_rotation = rotation;
 #ifdef VIDEO_ENABLED
-       LinphoneCall *call=linphone_core_get_current_call(lc);
-       if (call!=NULL && call->videostream){
-               video_stream_set_device_rotation(call->videostream,rotation);
+       {
+               LinphoneCall *call=linphone_core_get_current_call(lc);
+               if (call!=NULL && call->videostream){
+                       video_stream_set_device_rotation(call->videostream,rotation);
+               }
        }
 #endif
 }
index 5ae73cc4dd91bb48676affa7a65d06151992d48e..67d4fb255bf02f3c9d102cc252b264992268b64d 100644 (file)
@@ -1199,10 +1199,9 @@ const char * linphone_core_get_stun_server(const LinphoneCore *lc);
  * @ingroup network_parameters
  * Return the availability of uPnP.
  *
- * @param lc #LinphoneCore
  * @return true if uPnP is available otherwise return false. 
  */
-bool_t linphone_core_upnp_available(const LinphoneCore *lc);
+bool_t linphone_core_upnp_available();
 
 /**
  * @ingroup network_parameters
index 02ac62c7a8498c546a1d49f557b7fe1cca97dabc..5619993ab2931e0b4b35e2e097f6c8b3e78f9402 100644 (file)
@@ -2491,7 +2491,7 @@ extern "C" jlong Java_org_linphone_core_LinphoneCoreImpl_getConfig(JNIEnv *env,
 }
 
 extern "C" jboolean Java_org_linphone_core_LinphoneCoreImpl_upnpAvailable(JNIEnv *env, jobject thiz, jlong lc) {
-       return (jboolean) linphone_core_upnp_available((LinphoneCore *)lc);
+       return (jboolean) linphone_core_upnp_available();
 }
 
 extern "C" jint Java_org_linphone_core_LinphoneCoreImpl_getUpnpState(JNIEnv *env, jobject thiz, jlong lc) {
index 8ba642b6877aecd0216177f057073b2bb435a248..deed140c7a48c8a2c410c45719d93845ec2f5c5c 100644 (file)
@@ -204,13 +204,13 @@ void linphone_create_table(sqlite3* db){
 \r
 void linphone_core_message_storage_init(LinphoneCore *lc){\r
        int ret;\r
-       char *errmsg=NULL;\r
+       const char *errmsg;\r
        sqlite3 *db;\r
        ret=sqlite3_open(lc->chat_db_file,&db);\r
        if(ret != SQLITE_OK) {\r
+               errmsg=sqlite3_errmsg(db);\r
                printf("Error in the opening: %s.\n", errmsg);\r
                sqlite3_close(db);\r
-               sqlite3_free(errmsg);\r
        }\r
        linphone_create_table(db);\r
        lc->db=db;\r
index 42c21f01b29a36000a9f0ed4b7ef882613c545f2..05258c1d1f26bdf2212ca9d6083b48f2370e58b1 100644 (file)
@@ -413,7 +413,7 @@ static dial_plan_t const dial_plans[]={
        {"Bahrain"                      ,"BH"           , "973"     , 8     , "00"  },
        {"Bangladesh"                   ,"BD"           , "880"     , 10    , "00"  },
        {"Barbados"                     ,"BB"           , "1"       , 10    , "011"     },
-    {"Belarus"                      ,"BY"              , "375"     , 9     , "00"  },
+       {"Belarus"                      ,"BY"           , "375"     , 9     , "00"  },
        {"Belgium"                      ,"BE"           , "32"      , 9     , "00"  },
        {"Belize"                       ,"BZ"           , "501"     , 7     , "00"  },
        {"Benin"                        ,"BJ"           , "229"     , 8     , "00"      },
@@ -422,12 +422,12 @@ static dial_plan_t const dial_plans[]={
        {"Bolivia"                      ,"BO"           , "591"     , 8     , "00"      },
        {"Bosnia and Herzegovina"       ,"BA"           , "387"     , 8     , "00"  },
        {"Botswana"                     ,"BW"           , "267"     , 8     , "00"  },
-    {"Brazil"                       ,"BR"              , "55"      , 10        , "00"  },
+       {"Brazil"                       ,"BR"           , "55"      , 10        , "00"  },
        {"Brunei Darussalam"            ,"BN"           , "673"     , 7         , "00"  },
        {"Bulgaria"                     ,"BG"           , "359"     , 9         , "00"  },
        {"Burkina Faso"                 ,"BF"           , "226"     , 8         , "00"  },
        {"Burundi"                      ,"BI"           , "257"     , 8     , "011" },
-    {"Cambodia"                     ,"KH"              , "855"     , 9         , "00"  },
+       {"Cambodia"                     ,"KH"           , "855"     , 9         , "00"  },
        {"Cameroon"                     ,"CM"           , "237"     , 8         , "00"  },
        {"Canada"                       ,"CA"           , "1"       , 10        , "011" },
        {"Cape Verde"                   ,"CV"           , "238"     , 7         , "00"  },
@@ -436,188 +436,188 @@ static dial_plan_t const dial_plans[]={
        {"Chad"                         ,"TD"           , "235"     , 8         , "00"  },
        {"Chile"                        ,"CL"           , "56"      , 9     , "00"  },
        {"China"                        ,"CN"           , "86"      , 11        , "00"  },
-    {"Colombia"                     ,"CO"       , "57"      , 10       , "00"  },
-    {"Comoros"                      ,"KM"              , "269"     , 7     , "00"      },
-    {"Congo"                        ,"CG"              , "242"     , 9         , "00"  },
-    {"Congo Democratic Republic"       ,"CD"           , "243"     , 9         , "00"  },
-    {"Cook Islands"                 ,"CK"              , "682"     , 5         , "00"  },
-    {"Costa Rica"                   ,"CR"              , "506"     , 8     , "00"      },
-    {"C�te d'Ivoire"             ,"AD"               , "225"     , 8     , "00"  },
-    {"Croatia"                      ,"HR"              , "385"     , 9         , "00"  },
-    {"Cuba"                         ,"CU"              , "53"      , 8     , "119" },
-    {"Cyprus"                       ,"CY"              , "357"     , 8     , "00"      },
-    {"Czech Republic"               ,"CZ"              , "420"     , 9     , "00"  },
-    {"Denmark"                      ,"DK"              , "45"      , 8         , "00"  },
-    {"Djibouti"                     ,"DJ"              , "253"     , 8         , "00"  },
-    {"Dominica"                     ,"DM"              , "1"       , 10        , "011" },
-    {"Dominican Republic"              ,"DO"           , "1"       , 10        , "011" },
-    {"Ecuador"                      ,"EC"       , "593"     , 9                , "00"  },
-    {"Egypt"                        ,"EG"              , "20"      , 10        , "00"  },
-    {"El Salvador"                  ,"SV"              , "503"     , 8         , "00"  },
-    {"Equatorial Guinea"            ,"GQ"              , "240"     , 9         , "00"  },
-    {"Eritrea"                      ,"ER"              , "291"     , 7         , "00"  },
-    {"Estonia"                      ,"EE"              , "372"     , 8     , "00"      },
-    {"Ethiopia"                     ,"ET"              , "251"     , 9     , "00"  },
-    {"Falkland Islands"                    ,"FK"               , "500"     , 5         , "00"  },
-    {"Faroe Islands"               ,"FO"               , "298"     , 6     , "00"  },
-    {"Fiji"                         ,"FJ"              , "679"     , 7     , "00"      },
-    {"Finland"                      ,"FI"              , "358"     , 9     , "00"  },
-    {"France"                       ,"FR"              , "33"      , 9         , "00"  },
-    {"French Guiana"                           ,"GF"           , "594"     , 9         , "00"  },
-    {"French Polynesia"             ,"PF"              , "689"     , 6     , "00"  },
-    {"Gabon"                        ,"GA"              , "241"     , 8     , "00"  },
-    {"Gambia"                       ,"GM"       , "220"     , 7                , "00"  },
-    {"Georgia"                      ,"GE"              , "995"     , 9     , "00"      },
-    {"Germany"                      ,"DE"              , "49"      , 11        , "00"  },
-    {"Ghana"                        ,"GH"              , "233"     , 9         , "00"  },
-    {"Gibraltar"                    ,"GI"              , "350"     , 8         , "00"  },
-    {"Greece"                       ,"GR"              , "30"      ,10     , "00"      },
-    {"Greenland"                    ,"GL"              , "299"     , 6         , "00"  },
-    {"Grenada"                      ,"GD"              , "1"       , 10        , "011" },
-    {"Guadeloupe"                   ,"GP"              , "590"     , 9     , "00"  },
-    {"Guam"                         ,"GU"              , "1"       , 10        , "011" },
-    {"Guatemala"                    ,"GT"              , "502"     , 8     , "00"  },
-    {"Guinea"                       ,"GN"              , "224"     , 8         , "00"  },
-    {"Guinea-Bissau"                           ,"GW"           , "245"     , 7         , "00"  },
-    {"Guyana"                       ,"GY"              , "592"     , 7     , "001" },
-    {"Haiti"                        ,"HT"              , "509"     , 8     , "00"  },
-    {"Honduras"                     ,"HN"       , "504"     , 8                , "00"  },
-    {"Hong Kong"                    ,"HK"              , "852"     , 8     , "001"     },
-    {"Hungary"                      ,"HU"              , "36"      , 9     , "00"  },
-    {"Iceland"                      ,"IS"              , "354"     , 9     , "00"  },
-    {"India"                        ,"IN"              , "91"      , 10    , "00"  },
-    {"Indonesia"                    ,"ID"              , "62"      , 10        , "001" },
-    {"Iran"                         ,"IR"              , "98"      , 10        , "00"  },
-    {"Iraq"                         ,"IQ"              , "964"     , 10        , "00"  },
-    {"Ireland"                      ,"IE"              , "353"     , 9         , "00"  },
-    {"Israel"                       ,"IL"              , "972"     , 9     , "00"      },
-    {"Italy"                        ,"IT"              , "39"      , 10        , "00"  },
-    {"Jamaica"                      ,"JM"              , "1"       , 10        , "011" },
-    {"Japan"                        ,"JP"              , "81"      , 10        , "010" },
-    {"Jordan"                       ,"JO"              , "962"     , 9     , "00"      },
-    {"Kazakhstan"                   ,"KZ"              , "7"       , 10    , "00"  },
-    {"Kenya"                        ,"KE"              , "254"     , 9         , "000" },
-    {"Kiribati"                     ,"KI"              , "686"     , 5         , "00"  },
-    {"Korea, North"                 ,"KP"              , "850"     , 12        , "99"  },
-    {"Korea, South"                 ,"KR"       , "82"      , 12       , "001" },
-    {"Kuwait"                       ,"KW"              , "965"     , 8     , "00"      },
-    {"Kyrgyzstan"                   ,"KG"              , "996"     , 9     , "00"  },
-    {"Laos"                         ,"LA"              , "856"     , 10    , "00"  },
-    {"Latvia"                       ,"LV"              , "371"     , 8     , "00"      },
-    {"Lebanon"                      ,"LB"              , "961"     , 7     , "00"      },
-    {"Lesotho"                      ,"LS"              , "266"     , 8         , "00"  },
-    {"Liberia"                      ,"LR"              , "231"     , 8         , "00"  },
-    {"Libya"                        ,"LY"              , "218"     , 8         , "00"  },
-    {"Liechtenstein"                ,"LI"              , "423"     , 7     , "00"      },
-    {"Lithuania"                    ,"LT"              , "370"     , 8         , "00"  },
-    {"Luxembourg"                   ,"LU"              , "352"     , 9         , "00"  },
-    {"Macau"                        ,"MO"              , "853"     , 8     , "00"  },
-    {"Macedonia"                    ,"MK"              , "389"     , 8     , "00"      },
-    {"Madagascar"                   ,"MG"              , "261"     , 9     , "00"  },
-    {"Malawi"                       ,"MW"              , "265"     , 9         , "00"  },
-    {"Malaysia"                     ,"MY"              , "60"      , 9         , "00"  },
-    {"Maldives"                     ,"MV"              , "960"     , 7     , "00"  },
-    {"Mali"                         ,"ML"              , "223"     , 8     , "00"  },
-    {"Malta"                        ,"MT"       , "356"     , 8                , "00"  },
-    {"Marshall Islands"                                ,"MH"           , "692"     , 7     , "011"     },
-    {"Martinique"                   ,"MQ"              , "596"     , 9     , "00"  },
-    {"Mauritania"                   ,"MR"              , "222"     , 8     , "00"  },
-    {"Mauritius"                    ,"MU"              , "230"     , 7     , "00"      },
-    {"Mayotte Island"               ,"YT"              , "262"     , 9     , "00"      },
-    {"Mexico"                       ,"MX"              , "52"      , 10        , "00"  },
-    {"Micronesia"                   ,"FM"              , "691"     , 7         , "011" },
-    {"Moldova"                      ,"MD"              , "373"     , 8         , "00"  },
-    {"Monaco"                       ,"MC"              , "377"     , 8     , "00"      },
-    {"Mongolia"                     ,"MN"              , "976"     , 8     , "001" },
-    {"Montenegro"                   ,"ME"              , "382"     , 8         , "00"  },
-    {"Montserrat"                   ,"MS"              , "664"     , 10        , "011" },
-    {"Morocco"                      ,"MA"              , "212"     , 9     , "00"      },
-    {"Mozambique"                   ,"MZ"              , "258"     , 9     , "00"  },
-    {"Myanmar"                      ,"MM"              , "95"      , 8         , "00"  },
-    {"Namibia"                      ,"NA"              , "264"     , 9         , "00"  },
-    {"Nauru"                        ,"NR"              , "674"     , 7     , "00"  },
-    {"Nepal"                        ,"NP"              , "43"      , 10        , "00"  },
-    {"Netherlands"                  ,"NL"       , "31"      , 9                , "00"  },
-    {"New Caledonia"                           ,"NC"           , "687"     , 6     , "00"      },
-    {"New Zealand"                  ,"NZ"              , "64"      , 10        , "00"  },
-    {"Nicaragua"                    ,"NI"              , "505"     , 8     , "00"  },
-    {"Niger"                        ,"NE"              , "227"     , 8     , "00"      },
-    {"Nigeria"                      ,"NG"              , "234"     , 10        , "009" },
-    {"Niue"                         ,"NU"              , "683"     , 4         , "00"  },
-    {"Norfolk Island"              ,"NF"               , "672"     , 5         , "00"  },
-    {"Northern Mariana Islands"            ,"MP"               , "1"       , 10        , "011" },
-    {"Norway"                       ,"NO"              , "47"      , 8     , "00"      },
-    {"Oman"                         ,"OM"              , "968"     , 8         , "00"  },
-    {"Pakistan"                     ,"PK"              , "92"      , 10        , "00"  },
-    {"Palau"                        ,"PW"              , "680"     , 7     , "011" },
-    {"Palestine"                    ,"PS"              , "970"     , 9     , "00"      },
-    {"Panama"                       ,"PA"              , "507"     , 8     , "00"  },
-    {"Papua New Guinea"                    ,"PG"               , "675"     , 8         , "00"  },
-    {"Paraguay"                     ,"PY"              , "595"     , 9         , "00"  },
-    {"Peru"                         ,"PE"              , "51"      , 9     , "00"  },
-    {"Philippines"                  ,"PH"              , "63"      , 10        , "00"  },
-    {"Poland"                       ,"PL"       , "48"      , 9                , "00"  },
-    {"Portugal"                     ,"PT"              , "351"     , 9     , "00"      },
-    {"Puerto Rico"                  ,"PR"              , "1"       , 10        , "011" },
-    {"Qatar"                        ,"QA"              , "974"     , 8     , "00"  },
-    {"R�union Island"                                ,"RE"           , "262"     , 9     , "011"     },
-    {"Romania"                      ,"RO"              , "40"      , 9     , "00"      },
-    {"Russian Federation"           ,"RU"              , "7"       , 10        , "8"   },
-    {"Rwanda"                       ,"RW"              , "250"     , 9         , "00"  },
-    {"Saint Helena"                 ,"SH"              , "290"     , 4         , "00"  },
-    {"Saint Kitts and Nevis"           ,"KN"           , "1"       , 10        , "011" },
-    {"Saint Lucia"                  ,"LC"              , "1"       , 10        , "011" },
-    {"Saint Pierre and Miquelon"    ,"PM"              , "508"     , 6         , "00"  },
-    {"Saint Vincent and the Grenadines","VC"   , "1"       , 10        , "011" },
-    {"Samoa"                        ,"WS"              , "685"     , 7     , "0"       },
-    {"San Marino"                   ,"SM"              , "378"     , 10        , "00"  },
-    {"S�o Tom� and Pr�ncipe"        ,"ST"                , "239"     , 7         , "00"  },
-    {"Saudi Arabia"                 ,"SA"              , "966"     , 9         , "00"  },
-    {"Senegal"                      ,"SN"              , "221"     , 9     , "00"  },
-    {"Serbia"                       ,"RS"              , "381"     , 9     , "00"  },
-    {"Seychelles"                   ,"SC"       , "248"     , 7                , "00"  },
-    {"Sierra Leone"                 ,"SL"              , "232"     , 8     , "00"      },
-    {"Singapore"                    ,"SG"              , "65"      , 8     , "001" },
-    {"Slovakia"                     ,"SK"              , "421"     , 9     , "00"  },
-    {"Slovenia"                     ,"SI"              , "386"     , 8     , "00"      },
-    {"Solomon Islands"              ,"SB"              , "677"     , 7     , "00"      },
-    {"Somalia"                      ,"SO"              , "252"     , 8         , "00"  },
-    {"South Africa"                 ,"ZA"              , "27"      , 9         , "00"  },
-    {"Spain"                        ,"ES"              , "34"      , 9         , "00"  },
-    {"Sri Lanka"                    ,"LK"              , "94"      , 9     , "00"      },
-    {"Sudan"                        ,"SD"              , "249"     , 9         , "00"  },
-    {"Suriname"                     ,"SR"              , "597"     , 7         , "00"  },
-    {"Swaziland"                    ,"SZ"              , "268"     , 8     , "00"  },
-    {"Sweden"                       ,"SE"              , "1"       , 9     , "00"      },
-    {"Switzerland"                  ,"XK"              , "41"      , 9         , "00"  },
-    {"Syria"                        ,"SY"              , "963"     , 9         , "00"  },
-    {"Taiwan"                       ,"TW"              , "886"     , 9         , "810" },
-    {"Tajikistan"                   ,"TJ"              , "992"     , 9     , "002" },
-    {"Tanzania"                     ,"TZ"              , "255"     , 9     , "000" },
-    {"Thailand"                     ,"TH"       , "66"      , 9                , "001" },
-    {"Togo"                         ,"TG"              , "228"     , 8     , "00"      },
-    {"Tokelau"                      ,"TK"              , "690"     , 4     , "00"  },
-    {"Tonga"                        ,"TO"              , "676"     , 5     , "00"  },
-    {"Trinidad and Tobago"                     ,"TT"           , "1"       , 10    , "011"     },
-    {"Tunisia"                      ,"TN"              , "216"     , 8     , "00"      },
-    {"Turkey"                       ,"TR"              , "90"      , 10        , "00"  },
-    {"Turkmenistan"                 ,"TM"              , "993"     , 8         , "00"  },
-    {"Turks and Caicos Islands"            ,"TC"               , "1"       , 7         , "0"   },
-    {"Tuvalu"                       ,"TV"              , "688"     , 5     , "00"      },
-    {"Uganda"                       ,"UG"              , "256"     , 9     , "000" },
-    {"Ukraine"                      ,"UA"              , "380"     , 9         , "00"  },
-    {"United Arab Emirates"            ,"AE"           , "971"     , 9     , "00"  },
-    {"United Kingdom"               ,"UK"              , "44"      , 10        , "00"  },
-    {"United States"                ,"US"              , "1"       , 10        , "011" },
-    {"Uruguay"                      ,"UY"              , "598"     , 8         , "00"  },
-    {"Uzbekistan"                   ,"UZ"              , "998"     , 9         , "8"   },
-    {"Vanuatu"                      ,"VU"              , "678"     , 7     , "00"  },
-    {"Venezuela"                    ,"VE"              , "58"      , 10        , "00"  },
-    {"Vietnam"                      ,"VN"              , "84"      , 9     , "00"  },
-    {"Wallis and Futuna"               ,"WF"           , "681"     , 5         , "00"  },
-    {"Yemen"                        ,"YE"              , "967"     , 9     , "00"  },
-    {"Zambia"                       ,"ZM"              , "260"     , 9     , "00"      },
-    {"Zimbabwe"                     ,"ZW"              , "263"     , 9     , "00"  },
+       {"Colombia"                     ,"CO"       , "57"      , 10    , "00"  },
+       {"Comoros"                      ,"KM"           , "269"     , 7     , "00"      },
+       {"Congo"                        ,"CG"           , "242"     , 9         , "00"  },
+       {"Congo Democratic Republic"    ,"CD"           , "243"     , 9         , "00"  },
+       {"Cook Islands"                 ,"CK"           , "682"     , 5         , "00"  },
+       {"Costa Rica"                   ,"CR"           , "506"     , 8     , "00"      },
+       {"C�te d'Ivoire"                  ,"AD"               , "225"     , 8     , "00"  },
+       {"Croatia"                      ,"HR"           , "385"     , 9         , "00"  },
+       {"Cuba"                         ,"CU"           , "53"      , 8     , "119" },
+       {"Cyprus"                       ,"CY"           , "357"     , 8     , "00"      },
+       {"Czech Republic"               ,"CZ"           , "420"     , 9     , "00"  },
+       {"Denmark"                      ,"DK"           , "45"      , 8         , "00"  },
+       {"Djibouti"                     ,"DJ"           , "253"     , 8         , "00"  },
+       {"Dominica"                     ,"DM"           , "1"       , 10        , "011" },
+       {"Dominican Republic"           ,"DO"           , "1"       , 10        , "011" },
+       {"Ecuador"                      ,"EC"       , "593"     , 9             , "00"  },
+       {"Egypt"                        ,"EG"           , "20"      , 10        , "00"  },
+       {"El Salvador"                  ,"SV"           , "503"     , 8         , "00"  },
+       {"Equatorial Guinea"            ,"GQ"           , "240"     , 9         , "00"  },
+       {"Eritrea"                      ,"ER"           , "291"     , 7         , "00"  },
+       {"Estonia"                      ,"EE"           , "372"     , 8     , "00"      },
+       {"Ethiopia"                     ,"ET"           , "251"     , 9     , "00"  },
+       {"Falkland Islands"                 ,"FK"               , "500"     , 5         , "00"  },
+       {"Faroe Islands"                    ,"FO"               , "298"     , 6     , "00"  },
+       {"Fiji"                         ,"FJ"           , "679"     , 7     , "00"      },
+       {"Finland"                      ,"FI"           , "358"     , 9     , "00"  },
+       {"France"                       ,"FR"           , "33"      , 9         , "00"  },
+       {"French Guiana"                                ,"GF"           , "594"     , 9         , "00"  },
+       {"French Polynesia"             ,"PF"           , "689"     , 6     , "00"  },
+       {"Gabon"                        ,"GA"           , "241"     , 8     , "00"  },
+       {"Gambia"                       ,"GM"       , "220"     , 7             , "00"  },
+       {"Georgia"                      ,"GE"           , "995"     , 9     , "00"      },
+       {"Germany"                      ,"DE"           , "49"      , 11        , "00"  },
+       {"Ghana"                        ,"GH"           , "233"     , 9         , "00"  },
+       {"Gibraltar"                    ,"GI"           , "350"     , 8         , "00"  },
+       {"Greece"                       ,"GR"           , "30"      ,10     , "00"      },
+       {"Greenland"                    ,"GL"           , "299"     , 6         , "00"  },
+       {"Grenada"                      ,"GD"           , "1"       , 10        , "011" },
+       {"Guadeloupe"                   ,"GP"           , "590"     , 9     , "00"  },
+       {"Guam"                         ,"GU"           , "1"       , 10        , "011" },
+       {"Guatemala"                    ,"GT"           , "502"     , 8     , "00"  },
+       {"Guinea"                       ,"GN"           , "224"     , 8         , "00"  },
+       {"Guinea-Bissau"                                ,"GW"           , "245"     , 7         , "00"  },
+       {"Guyana"                       ,"GY"           , "592"     , 7     , "001" },
+       {"Haiti"                        ,"HT"           , "509"     , 8     , "00"  },
+       {"Honduras"                     ,"HN"       , "504"     , 8             , "00"  },
+       {"Hong Kong"                    ,"HK"           , "852"     , 8     , "001"     },
+       {"Hungary"                      ,"HU"           , "36"      , 9     , "00"  },
+       {"Iceland"                      ,"IS"           , "354"     , 9     , "00"  },
+       {"India"                        ,"IN"           , "91"      , 10    , "00"  },
+       {"Indonesia"                    ,"ID"           , "62"      , 10        , "001" },
+       {"Iran"                         ,"IR"           , "98"      , 10        , "00"  },
+       {"Iraq"                         ,"IQ"           , "964"     , 10        , "00"  },
+       {"Ireland"                      ,"IE"           , "353"     , 9         , "00"  },
+       {"Israel"                       ,"IL"           , "972"     , 9     , "00"      },
+       {"Italy"                        ,"IT"           , "39"      , 10        , "00"  },
+       {"Jamaica"                      ,"JM"           , "1"       , 10        , "011" },
+       {"Japan"                        ,"JP"           , "81"      , 10        , "010" },
+       {"Jordan"                       ,"JO"           , "962"     , 9     , "00"      },
+       {"Kazakhstan"                   ,"KZ"           , "7"       , 10    , "00"  },
+       {"Kenya"                        ,"KE"           , "254"     , 9         , "000" },
+       {"Kiribati"                     ,"KI"           , "686"     , 5         , "00"  },
+       {"Korea, North"                 ,"KP"           , "850"     , 12        , "99"  },
+       {"Korea, South"                 ,"KR"       , "82"      , 12    , "001" },
+       {"Kuwait"                       ,"KW"           , "965"     , 8     , "00"      },
+       {"Kyrgyzstan"                   ,"KG"           , "996"     , 9     , "00"  },
+       {"Laos"                         ,"LA"           , "856"     , 10    , "00"  },
+       {"Latvia"                       ,"LV"           , "371"     , 8     , "00"      },
+       {"Lebanon"                      ,"LB"           , "961"     , 7     , "00"      },
+       {"Lesotho"                      ,"LS"           , "266"     , 8         , "00"  },
+       {"Liberia"                      ,"LR"           , "231"     , 8         , "00"  },
+       {"Libya"                        ,"LY"           , "218"     , 8         , "00"  },
+       {"Liechtenstein"                ,"LI"           , "423"     , 7     , "00"      },
+       {"Lithuania"                    ,"LT"           , "370"     , 8         , "00"  },
+       {"Luxembourg"                   ,"LU"           , "352"     , 9         , "00"  },
+       {"Macau"                        ,"MO"           , "853"     , 8     , "00"  },
+       {"Macedonia"                    ,"MK"           , "389"     , 8     , "00"      },
+       {"Madagascar"                   ,"MG"           , "261"     , 9     , "00"  },
+       {"Malawi"                       ,"MW"           , "265"     , 9         , "00"  },
+       {"Malaysia"                     ,"MY"           , "60"      , 9         , "00"  },
+       {"Maldives"                     ,"MV"           , "960"     , 7     , "00"  },
+       {"Mali"                         ,"ML"           , "223"     , 8     , "00"  },
+       {"Malta"                        ,"MT"       , "356"     , 8             , "00"  },
+       {"Marshall Islands"                             ,"MH"           , "692"     , 7     , "011"     },
+       {"Martinique"                   ,"MQ"           , "596"     , 9     , "00"  },
+       {"Mauritania"                   ,"MR"           , "222"     , 8     , "00"  },
+       {"Mauritius"                    ,"MU"           , "230"     , 7     , "00"      },
+       {"Mayotte Island"               ,"YT"           , "262"     , 9     , "00"      },
+       {"Mexico"                       ,"MX"           , "52"      , 10        , "00"  },
+       {"Micronesia"                   ,"FM"           , "691"     , 7         , "011" },
+       {"Moldova"                      ,"MD"           , "373"     , 8         , "00"  },
+       {"Monaco"                       ,"MC"           , "377"     , 8     , "00"      },
+       {"Mongolia"                     ,"MN"           , "976"     , 8     , "001" },
+       {"Montenegro"                   ,"ME"           , "382"     , 8         , "00"  },
+       {"Montserrat"                   ,"MS"           , "664"     , 10        , "011" },
+       {"Morocco"                      ,"MA"           , "212"     , 9     , "00"      },
+       {"Mozambique"                   ,"MZ"           , "258"     , 9     , "00"  },
+       {"Myanmar"                      ,"MM"           , "95"      , 8         , "00"  },
+       {"Namibia"                      ,"NA"           , "264"     , 9         , "00"  },
+       {"Nauru"                        ,"NR"           , "674"     , 7     , "00"  },
+       {"Nepal"                        ,"NP"           , "43"      , 10        , "00"  },
+       {"Netherlands"                  ,"NL"       , "31"      , 9             , "00"  },
+       {"New Caledonia"                                ,"NC"           , "687"     , 6     , "00"      },
+       {"New Zealand"                  ,"NZ"           , "64"      , 10        , "00"  },
+       {"Nicaragua"                    ,"NI"           , "505"     , 8     , "00"  },
+       {"Niger"                        ,"NE"           , "227"     , 8     , "00"      },
+       {"Nigeria"                      ,"NG"           , "234"     , 10        , "009" },
+       {"Niue"                         ,"NU"           , "683"     , 4         , "00"  },
+       {"Norfolk Island"                   ,"NF"               , "672"     , 5         , "00"  },
+       {"Northern Mariana Islands"         ,"MP"               , "1"       , 10        , "011" },
+       {"Norway"                       ,"NO"           , "47"      , 8     , "00"      },
+       {"Oman"                         ,"OM"           , "968"     , 8         , "00"  },
+       {"Pakistan"                     ,"PK"           , "92"      , 10        , "00"  },
+       {"Palau"                        ,"PW"           , "680"     , 7     , "011" },
+       {"Palestine"                    ,"PS"           , "970"     , 9     , "00"      },
+       {"Panama"                       ,"PA"           , "507"     , 8     , "00"  },
+       {"Papua New Guinea"                 ,"PG"               , "675"     , 8         , "00"  },
+       {"Paraguay"                     ,"PY"           , "595"     , 9         , "00"  },
+       {"Peru"                         ,"PE"           , "51"      , 9     , "00"  },
+       {"Philippines"                  ,"PH"           , "63"      , 10        , "00"  },
+       {"Poland"                       ,"PL"       , "48"      , 9             , "00"  },
+       {"Portugal"                     ,"PT"           , "351"     , 9     , "00"      },
+       {"Puerto Rico"                  ,"PR"           , "1"       , 10        , "011" },
+       {"Qatar"                        ,"QA"           , "974"     , 8     , "00"  },
+       {"R�union Island"                             ,"RE"           , "262"     , 9     , "011"     },
+       {"Romania"                      ,"RO"           , "40"      , 9     , "00"      },
+       {"Russian Federation"           ,"RU"           , "7"       , 10        , "8"   },
+       {"Rwanda"                       ,"RW"           , "250"     , 9         , "00"  },
+       {"Saint Helena"                 ,"SH"           , "290"     , 4         , "00"  },
+       {"Saint Kitts and Nevis"                ,"KN"           , "1"       , 10        , "011" },
+       {"Saint Lucia"                  ,"LC"           , "1"       , 10        , "011" },
+       {"Saint Pierre and Miquelon"    ,"PM"           , "508"     , 6         , "00"  },
+       {"Saint Vincent and the Grenadines","VC"        , "1"       , 10        , "011" },
+       {"Samoa"                        ,"WS"           , "685"     , 7     , "0"       },
+       {"San Marino"                   ,"SM"           , "378"     , 10        , "00"  },
+       {"S�o Tom� and Pr�ncipe"        ,"ST"             , "239"     , 7         , "00"  },
+       {"Saudi Arabia"                 ,"SA"           , "966"     , 9         , "00"  },
+       {"Senegal"                      ,"SN"           , "221"     , 9     , "00"  },
+       {"Serbia"                       ,"RS"           , "381"     , 9     , "00"  },
+       {"Seychelles"                   ,"SC"       , "248"     , 7             , "00"  },
+       {"Sierra Leone"                 ,"SL"           , "232"     , 8     , "00"      },
+       {"Singapore"                    ,"SG"           , "65"      , 8     , "001" },
+       {"Slovakia"                     ,"SK"           , "421"     , 9     , "00"  },
+       {"Slovenia"                     ,"SI"           , "386"     , 8     , "00"      },
+       {"Solomon Islands"              ,"SB"           , "677"     , 7     , "00"      },
+       {"Somalia"                      ,"SO"           , "252"     , 8         , "00"  },
+       {"South Africa"                 ,"ZA"           , "27"      , 9         , "00"  },
+       {"Spain"                        ,"ES"           , "34"      , 9         , "00"  },
+       {"Sri Lanka"                    ,"LK"           , "94"      , 9     , "00"      },
+       {"Sudan"                        ,"SD"           , "249"     , 9         , "00"  },
+       {"Suriname"                     ,"SR"           , "597"     , 7         , "00"  },
+       {"Swaziland"                    ,"SZ"           , "268"     , 8     , "00"  },
+       {"Sweden"                       ,"SE"           , "1"       , 9     , "00"      },
+       {"Switzerland"                  ,"XK"           , "41"      , 9         , "00"  },
+       {"Syria"                        ,"SY"           , "963"     , 9         , "00"  },
+       {"Taiwan"                       ,"TW"           , "886"     , 9         , "810" },
+       {"Tajikistan"                   ,"TJ"           , "992"     , 9     , "002" },
+       {"Tanzania"                     ,"TZ"           , "255"     , 9     , "000" },
+       {"Thailand"                     ,"TH"       , "66"      , 9             , "001" },
+       {"Togo"                         ,"TG"           , "228"     , 8     , "00"      },
+       {"Tokelau"                      ,"TK"           , "690"     , 4     , "00"  },
+       {"Tonga"                        ,"TO"           , "676"     , 5     , "00"  },
+       {"Trinidad and Tobago"                  ,"TT"           , "1"       , 10    , "011"     },
+       {"Tunisia"                      ,"TN"           , "216"     , 8     , "00"      },
+       {"Turkey"                       ,"TR"           , "90"      , 10        , "00"  },
+       {"Turkmenistan"                 ,"TM"           , "993"     , 8         , "00"  },
+       {"Turks and Caicos Islands"         ,"TC"               , "1"       , 7         , "0"   },
+       {"Tuvalu"                       ,"TV"           , "688"     , 5     , "00"      },
+       {"Uganda"                       ,"UG"           , "256"     , 9     , "000" },
+       {"Ukraine"                      ,"UA"           , "380"     , 9         , "00"  },
+       {"United Arab Emirates"         ,"AE"           , "971"     , 9     , "00"  },
+       {"United Kingdom"               ,"UK"           , "44"      , 10        , "00"  },
+       {"United States"                ,"US"           , "1"       , 10        , "011" },
+       {"Uruguay"                      ,"UY"           , "598"     , 8         , "00"  },
+       {"Uzbekistan"                   ,"UZ"           , "998"     , 9         , "8"   },
+       {"Vanuatu"                      ,"VU"           , "678"     , 7     , "00"  },
+       {"Venezuela"                    ,"VE"           , "58"      , 10        , "00"  },
+       {"Vietnam"                      ,"VN"           , "84"      , 9     , "00"  },
+       {"Wallis and Futuna"            ,"WF"           , "681"     , 5         , "00"  },
+       {"Yemen"                        ,"YE"           , "967"     , 9     , "00"  },
+       {"Zambia"                       ,"ZM"           , "260"     , 9     , "00"      },
+       {"Zimbabwe"                     ,"ZW"           , "263"     , 9     , "00"  },
        {NULL                           ,NULL       ,  ""       , 0     , NULL  }
 };
 static dial_plan_t most_common_dialplan={ "generic" ,"", "", 10, "00"};
@@ -1092,29 +1092,40 @@ SipSetup *linphone_proxy_config_get_sip_setup(LinphoneProxyConfig *cfg){
        return NULL;
 }
 
+static bool_t can_register(LinphoneProxyConfig *cfg){
+       LinphoneCore *lc=cfg->lc;
+#ifdef BUILD_UPNP
+       if (linphone_core_get_firewall_policy(lc)==LinphonePolicyUseUpnp){
+               if(lc->sip_conf.register_only_when_upnp_is_ok && 
+                       (lc->upnp == NULL || !linphone_upnp_context_is_ready_for_register(lc->upnp))) {
+                       return FALSE;
+               }
+       }
+#endif //BUILD_UPNP
+       if (lc->sip_conf.register_only_when_network_is_up){
+               LinphoneTunnel *tunnel=linphone_core_get_tunnel(lc);
+               if (tunnel && linphone_tunnel_enabled(tunnel)){
+                       return linphone_tunnel_connected(tunnel);
+               }else{
+                       return lc->network_reachable;
+               }
+       }
+       return TRUE;
+}
+
 void linphone_proxy_config_update(LinphoneProxyConfig *cfg){
        LinphoneCore *lc=cfg->lc;
        if (cfg->commit){
                if (cfg->type && cfg->ssctx==NULL){
                        linphone_proxy_config_activate_sip_setup(cfg);
                }
-               switch(linphone_core_get_firewall_policy(lc)) {
-                       case LinphonePolicyUseUpnp:
-#ifdef BUILD_UPNP
-                       if(lc->sip_conf.register_only_when_upnp_is_ok && 
-                          (lc->upnp == NULL || !linphone_upnp_context_is_ready_for_register(lc->upnp))) {
-                               break;
-                       }
-#endif //BUILD_UPNP
-                       default:
-                       if ((!lc->sip_conf.register_only_when_network_is_up || lc->network_reachable)) {
-                               linphone_proxy_config_register(cfg);
+               if (can_register(cfg)){
+                       linphone_proxy_config_register(cfg);
+                       if (cfg->publish && cfg->publish_op==NULL){
+                               linphone_proxy_config_send_publish(cfg,lc->presence_mode);
                        }
-               }       
-               if (cfg->publish && cfg->publish_op==NULL){
-                       linphone_proxy_config_send_publish(cfg,lc->presence_mode);
+                       cfg->commit=FALSE;
                }
-               cfg->commit=FALSE;
        }
 }
 
index e577b6422ad43b4de8802e232456eae23eb7c477..284773c9d503264010ea14f8e9cedbaaa9dea505 100644 (file)
@@ -1464,6 +1464,7 @@ static bool_t call_failure(Sal *sal, eXosip_event_t *ev){
                case 480:\r
                        error=SalErrorFailure;\r
                        sr=SalReasonTemporarilyUnavailable;\r
+               break;\r
                case 486:\r
                        error=SalErrorFailure;\r
                        sr=SalReasonBusy;\r
@@ -1653,7 +1654,7 @@ static void process_notify(Sal *sal, eXosip_event_t *ev){
                //osip_content_type_t *ct=NULL;\r
                osip_message_get_body(ev->request,0,&body);\r
                //ct=osip_message_get_content_type(ev->request);\r
-               if (h->hvalue && strcasecmp(h->hvalue,"refer")==0){\r
+               if (h->hvalue && strncasecmp(h->hvalue,"refer",strlen("refer"))==0){\r
                        /*special handling of refer events*/\r
                        if (body && body->body){\r
                                osip_message_t *msg;\r
@@ -2400,6 +2401,7 @@ int sal_register_refresh(SalOp *op, int expires){
                * the exosip lock in a non blocking way, and give up if it takes too long*/\r
                while (eXosip_trylock()!=0){\r
                        ms_usleep(100000);\r
+                       tries++;\r
                        if (tries>30) {/*after 3 seconds, give up*/\r
                                ms_warning("Could not obtain exosip lock in a reasonable time, giving up.");\r
                                return -1;\r
index c8191098649343f2bb6ebf8689d06e881efd557f..b9f7b5763620474fe605218410fa1b4db587cbcc 100644 (file)
@@ -85,19 +85,19 @@ static const char *days[]={"Sun","Mon","Tue","Wed","Thu","Fri","Sat"};
 static const char *months[]={"Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"};
 
 static void msg_add_current_date(osip_message_t *msg){
-        char tmp[64]={0};
-        time_t curtime=time(NULL);
-        struct tm *ret;
+       char tmp[64]={0};
+       time_t curtime=time(NULL);
+       struct tm *ret;
 #ifndef WIN32
-        struct tm gmt;
-        ret=gmtime_r(&curtime,&gmt);
+       struct tm gmt;
+       ret=gmtime_r(&curtime,&gmt);
 #else
-        ret=gmtime(&curtime);
+       ret=gmtime(&curtime);
 #endif
-        /*cannot use strftime because it is locale dependant*/
-        snprintf(tmp,sizeof(tmp)-1,"%s, %i %s %i %02i:%02i:%02i GMT",
-                 days[ret->tm_wday],ret->tm_mday,months[ret->tm_mon],1900+ret->tm_year,ret->tm_hour,ret->tm_min,ret->tm_sec);
-        osip_message_replace_header(msg,"Date",tmp);
+       /*cannot use strftime because it is locale dependant*/
+       snprintf(tmp,sizeof(tmp)-1,"%s, %i %s %i %02i:%02i:%02i GMT",
+                       days[ret->tm_wday],ret->tm_mday,months[ret->tm_mon],1900+ret->tm_year,ret->tm_hour,ret->tm_min,ret->tm_sec);
+       osip_message_replace_header(msg,"Date",tmp);
 }
 
 
index debd8550f63e35fb288286946d6e17616ce4041a..54865aab6a19ef69d0333d33d3dfaba28dcb20c1 100644 (file)
@@ -547,7 +547,7 @@ int sdp_to_media_description(sdp_message_t *msg, SalMediaDescription *desc){
                        for (k=0;valid_count < SAL_CRYPTO_ALGO_MAX && (attr=sdp_message_attribute_get(msg,i,k))!=NULL;k++){
                                char tmp[256], tmp2[256];
                                if (keywordcmp("crypto",attr->a_att_field)==0 && attr->a_att_value!=NULL){
-                                       int nb = sscanf(attr->a_att_value, "%d %256s inline:%256s",
+                                       int nb = sscanf(attr->a_att_value, "%d %255s inline:%255s",
                                                &stream->crypto[valid_count].tag,
                                                tmp,
                                                tmp2);
index 1d79dbf7e40cd3d9224930521e9212601ddc5da7..38fc2e796a79732083f385e1e40e89d625e71803 100644 (file)
@@ -30,6 +30,7 @@ pt_BR: Rafael Caesar Lenzi &lt;rc_lenzi@yahoo.com.br&gt;
 pl: Robert Nasiadek &lt;darkone@darkone.pl&gt;
 cs: Petr Pisar &lt;petr.pisar@atlas.cz&gt;
 hu: anonymous
+he: Eli Zaretskii &lt;eliz@gnu.org&gt;
 </property>
     <property name="artists">Icons by kerosine.fr</property>
     <signal name="response" handler="linphone_gtk_about_response"/>
index 2cba0754fe48772caa9932cfb9edaf6db70ccaa9..13c1406156ba645c95f44c1a91cbc82a09115d0b 100644 (file)
@@ -66,6 +66,7 @@ void linphone_gtk_quit_chatroom(LinphoneChatRoom *cr) {
        
        g_return_if_fail(w!=NULL);
        gtk_notebook_remove_page(GTK_NOTEBOOK(nb),gtk_notebook_page_num(GTK_NOTEBOOK(nb),w));
+       linphone_chat_room_mark_as_read(cr);
        linphone_gtk_friend_list_update_chat_picture();
        g_object_set_data(G_OBJECT(friendlist),"chatview",NULL);
        from=g_object_get_data(G_OBJECT(w),"from_message");
@@ -128,6 +129,15 @@ void udpate_tab_chat_header(GtkWidget *chat_view,const LinphoneAddress *uri,Linp
        gtk_widget_show_all(w);
 }
 
+static gboolean scroll_to_end(GtkTextView *w){
+       GtkTextBuffer *buffer=gtk_text_view_get_buffer(w);
+       GtkTextIter iter;
+       gtk_text_buffer_get_end_iter(buffer,&iter);
+       GtkTextMark *mark=gtk_text_buffer_create_mark(buffer,NULL,&iter,FALSE);
+       gtk_text_view_scroll_mark_onscreen(w,mark); 
+       return FALSE;
+}
+
 void linphone_gtk_push_text(GtkWidget *w, const LinphoneAddress *from, 
                  gboolean me,LinphoneChatRoom *cr,LinphoneChatMessage *msg, gboolean hist){
        GtkTextView *text=GTK_TEXT_VIEW(linphone_gtk_get_widget(w,"textview"));
@@ -198,8 +208,7 @@ void linphone_gtk_push_text(GtkWidget *w, const LinphoneAddress *from,
        }
        gtk_text_buffer_get_end_iter(buffer,&iter);
        gtk_text_buffer_insert(buffer,&iter,"\n",-1);
-       GtkTextMark *mark=gtk_text_buffer_create_mark(buffer,NULL,&iter,FALSE);
-       gtk_text_view_scroll_mark_onscreen(text,mark); 
+       g_idle_add((GSourceFunc)scroll_to_end,text);
        ms_free(from_str);
 }
 
@@ -364,7 +373,6 @@ GtkWidget* linphone_gtk_init_chatroom(LinphoneChatRoom *cr, const LinphoneAddres
        colorb.blue = 61952;
        
        with_str=linphone_address_as_string_uri_only(with);
-       linphone_chat_room_mark_as_read(cr);
        gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(text),GTK_WRAP_WORD_CHAR);
        gtk_text_view_set_editable(GTK_TEXT_VIEW(text),FALSE);
        gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(text),FALSE);
@@ -404,8 +412,9 @@ GtkWidget* linphone_gtk_init_chatroom(LinphoneChatRoom *cr, const LinphoneAddres
 }
 
 LinphoneChatRoom * linphone_gtk_create_chatroom(const LinphoneAddress *with){
-       LinphoneChatRoom *cr=linphone_core_create_chat_room(linphone_gtk_get_core(),linphone_address_as_string(with));
-       if (!cr) return NULL;
+       char *tmp=linphone_address_as_string(with);
+       LinphoneChatRoom *cr=linphone_core_create_chat_room(linphone_gtk_get_core(),tmp);
+       ms_free(tmp);
        return cr;
 }
 
@@ -424,7 +433,6 @@ void linphone_gtk_load_chatroom(LinphoneChatRoom *cr,const LinphoneAddress *uri,
                GtkTextIter end;
                GtkTextBuffer *text_buffer;
 
-               linphone_chat_room_mark_as_read(cr);
                text_buffer=gtk_text_view_get_buffer(text_view);
                gtk_text_buffer_get_bounds(text_buffer, &start, &end);
                gtk_text_buffer_delete (text_buffer, &start, &end);
@@ -434,6 +442,8 @@ void linphone_gtk_load_chatroom(LinphoneChatRoom *cr,const LinphoneAddress *uri,
                messages=linphone_chat_room_get_history(cr,NB_MSG_HIST);
                g_object_set_data(G_OBJECT(chat_view),"from_message",g_strdup(uri_str));
                display_history_message(chat_view,messages,uri);
+               gtk_text_buffer_get_end_iter(text_buffer,&end);
+               gtk_text_view_scroll_to_iter(text_view,&end,0,FALSE,1.0,0);
        }
        ms_free(from_str);
        ms_free(uri_str);
@@ -445,11 +455,6 @@ void linphone_gtk_chat_destroyed(GtkWidget *w){
        linphone_chat_room_destroy(cr);
 }
 
-void linphone_gtk_chat_close(GtkWidget *button){
-       GtkWidget *w=gtk_widget_get_toplevel(button);
-       gtk_widget_destroy(w);
-}
-
 
 void linphone_gtk_text_received ( LinphoneCore *lc, LinphoneChatRoom *room,
                                                                  LinphoneChatMessage *msg ) {
@@ -457,7 +462,7 @@ void linphone_gtk_text_received ( LinphoneCore *lc, LinphoneChatRoom *room,
        GtkWidget *friendlist=linphone_gtk_get_widget ( main_window,"contact_list" );
        GtkWidget *w;
        gboolean send=TRUE;
-       GtkNotebook *notebook= ( GtkNotebook * ) linphone_gtk_get_widget ( main_window,"viewswitch" );
+       /*GtkNotebook *notebook= ( GtkNotebook * ) linphone_gtk_get_widget ( main_window,"viewswitch" );*/
        char *from=linphone_address_as_string ( linphone_chat_message_get_from ( msg ) );
 
        w= ( GtkWidget* ) g_object_get_data ( G_OBJECT ( friendlist ),"chatview" );
@@ -481,7 +486,7 @@ void linphone_gtk_text_received ( LinphoneCore *lc, LinphoneChatRoom *room,
                g_object_set_data ( G_OBJECT ( friendlist ),"from",from );
        }
 
-#ifdef HAVE_GTK_OSXs
+#ifdef HAVE_GTK_OSX
        /* Notified when a new message is sent */
        linphone_gtk_status_icon_set_blinking ( TRUE );
 #else
@@ -495,14 +500,9 @@ void linphone_gtk_text_received ( LinphoneCore *lc, LinphoneChatRoom *room,
        }
 #endif
        if ( send ) {
-               if ( gtk_notebook_get_current_page ( notebook ) !=gtk_notebook_page_num ( notebook,w ) ) {
-                       linphone_gtk_show_friends();
-               } else {
-                       linphone_chat_room_mark_as_read ( room );
-               }
                linphone_gtk_push_text ( w,linphone_chat_message_get_from ( msg ),
                                                                 FALSE,room,msg,FALSE );
-       } else {
-               linphone_gtk_show_friends();
        }
+       linphone_gtk_show_friends();
+       
 }
index 22679a49b92cb8c4c7fd339d7526bb6e8cda60cd..7f5061f72222f5bed42fe613481b3bfb8de40697 100644 (file)
@@ -5,7 +5,7 @@
   <object class="GtkDialog" id="dscp_settings">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
-    <property name="title" translatable="yes">Dscp settings</property>
+    <property name="title" translatable="yes">DSCP settings</property>
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
     <signal name="response" handler="linphone_gtk_dscp_edit_response" swapped="no"/>
index 8f73c2fcb7fea3d325547b5d58912cf3f0740377..12da891f41410396e3a9d4cb813386a372a2c8a1 100644 (file)
@@ -352,6 +352,7 @@ void linphone_gtk_chat_selected(GtkWidget *item){
                } else {
                        linphone_gtk_load_chatroom(cr,uri,page);
                }
+               linphone_chat_room_mark_as_read(cr);
                gtk_notebook_set_current_page(notebook,gtk_notebook_page_num(notebook,page));
                linphone_gtk_friend_list_update_chat_picture();
                g_idle_add((GSourceFunc)grab_focus,linphone_gtk_get_widget(page,"text_entry"));
@@ -513,7 +514,11 @@ static gboolean friend_search_func(GtkTreeModel *model, gint column,
        gboolean ret=TRUE;
        gtk_tree_model_get(model,iter,FRIEND_NAME,&name,-1);
        if (name!=NULL){
-               ret=strstr(name,key)==NULL;
+               gchar *uname=g_utf8_casefold(name,-1); /* need that to perform case-insensitive search in utf8 */
+               gchar *ukey=g_utf8_casefold(key,-1);
+               ret=strstr(uname,ukey)==NULL;
+               g_free(uname);
+               g_free(ukey);
                g_free(name);
        }
        return ret;
@@ -552,6 +557,13 @@ static void on_name_column_clicked(GtkTreeModel *model){
 
 static int get_friend_weight(const LinphoneFriend *lf){
        int w=0;
+       LinphoneCore *lc=linphone_gtk_get_core();
+       LinphoneChatRoom *cr=linphone_core_get_chat_room(lc,linphone_friend_get_address(lf));
+       
+       if (cr && linphone_chat_room_get_unread_messages_count(cr)>0){
+               w+=2000;
+       }
+       
        switch(linphone_friend_get_status(lf)){
                case LinphoneStatusOnline:
                        w+=1000;
index 44b35c03c6cefb784759cef6b1c16ec3d344c092..da954a45b84c3e19c12de2eee419dcbc273880ac 100644 (file)
@@ -701,9 +701,11 @@ void linphone_gtk_in_call_view_set_in_call(LinphoneCall *call){
        if (in_conf){
                linphone_gtk_set_in_conference(call);
                gtk_widget_set_sensitive(linphone_gtk_get_widget(callview,"incall_mute"),FALSE);
+               gtk_widget_set_sensitive(linphone_gtk_get_widget(callview,"hold_call"),FALSE);
        }else{
                linphone_gtk_unset_from_conference(call); /*in case it was previously*/
                gtk_widget_set_sensitive(linphone_gtk_get_widget(callview,"incall_mute"),TRUE);
+               gtk_widget_set_sensitive(linphone_gtk_get_widget(callview,"hold_call"),TRUE);
        }
        gtk_widget_show_all(linphone_gtk_get_widget(callview,"buttons_panel"));
        if (!in_conf) gtk_widget_show_all(linphone_gtk_get_widget(callview,"record_hbox"));
@@ -739,11 +741,12 @@ static gboolean in_call_view_terminated(LinphoneCall *call){
 
 void linphone_gtk_in_call_view_terminate(LinphoneCall *call, const char *error_msg){
        GtkWidget *callview=(GtkWidget*)linphone_call_get_user_pointer(call);
+       if(callview==NULL) return;
        GtkWidget *status=linphone_gtk_get_widget(callview,"in_call_status");
        guint taskid=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(callview),"taskid"));
        gboolean in_conf=linphone_call_params_local_conference_mode(linphone_call_get_current_params(call));
 
-       if ((callview==NULL) || (status==NULL)) return;
+       if (status==NULL) return;
        if (error_msg==NULL)
                gtk_label_set_markup(GTK_LABEL(status),_("<b>Call ended.</b>"));
        else{
@@ -758,10 +761,11 @@ void linphone_gtk_in_call_view_terminate(LinphoneCall *call, const char *error_m
        gtk_widget_hide(linphone_gtk_get_widget(callview,"record_hbox"));
        gtk_widget_hide(linphone_gtk_get_widget(callview,"buttons_panel"));
        gtk_widget_hide(linphone_gtk_get_widget(callview,"incall_audioview"));
+       gtk_widget_hide(linphone_gtk_get_widget(callview,"quality_indicator"));
        linphone_gtk_enable_mute_button(
                GTK_BUTTON(linphone_gtk_get_widget(callview,"incall_mute")),FALSE);
        linphone_gtk_enable_hold_button(call,FALSE,TRUE);
-
+       
        if (taskid!=0) g_source_remove(taskid);
        g_timeout_add_seconds(2,(GSourceFunc)in_call_view_terminated,call);
        if (in_conf)
index 347a402eae529f64574e2ef92a3249d3d1776294..dde462ec34396e050df8ab5233e6c081150615d4 100644 (file)
@@ -7,6 +7,16 @@
     <property name="can_focus">False</property>
     <property name="stock">gtk-add</property>
   </object>
+  <object class="GtkImage" id="add_image1">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-add</property>
+  </object>
+  <object class="GtkImage" id="add_image2">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-add</property>
+  </object>
   <object class="GtkWindow" id="dummy_callee_frame">
     <property name="can_focus">False</property>
     <child>
     <property name="can_focus">False</property>
     <property name="stock">gtk-edit</property>
   </object>
+  <object class="GtkImage" id="edit_image1">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-edit</property>
+  </object>
+  <object class="GtkImage" id="edit_image2">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-edit</property>
+  </object>
   <object class="GtkImage" id="image1">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="can_focus">False</property>
     <property name="stock">gtk-select-color</property>
   </object>
+  <object class="GtkImage" id="image19">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-add</property>
+  </object>
   <object class="GtkImage" id="image2">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="stock">gtk-refresh</property>
   </object>
+  <object class="GtkImage" id="image20">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-add</property>
+  </object>
   <object class="GtkImage" id="image3">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkHBox" id="hbox">
+                  <object class="GtkHPaned" id="central_paned">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can_focus">True</property>
                     <child>
                       <object class="GtkVBox" id="vbox12">
                         <property name="visible">True</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="has_tooltip">True</property>
                             <child>
                               <object class="GtkButton" id="add_button">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
-                                <property name="tooltip_text" translatable="yes">Add</property>
                                 <property name="resize_mode">immediate</property>
                                 <property name="use_action_appearance">False</property>
-                                <property name="image">add_image</property>
+                                <property name="image">add_image2</property>
                                 <property name="xalign">1</property>
                                 <signal name="clicked" handler="linphone_gtk_add_button_clicked" swapped="no"/>
                               </object>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
-                                <property name="tooltip_text" translatable="yes">Edit</property>
                                 <property name="use_action_appearance">False</property>
-                                <property name="image">edit_image</property>
+                                <property name="image">edit_image2</property>
                                 <signal name="clicked" handler="linphone_gtk_edit_button_clicked" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
                                 <property name="use_action_appearance">False</property>
-                                <property name="image">remove_image</property>
+                                <property name="image">remove_image2</property>
                                 <signal name="clicked" handler="linphone_gtk_remove_button_clicked" swapped="no"/>
                               </object>
                               <packing>
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="padding">6</property>
-                        <property name="position">0</property>
+                        <property name="resize">False</property>
+                        <property name="shrink">False</property>
                       </packing>
                     </child>
                     <child>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
                                             <property name="use_action_appearance">False</property>
-                                            <property name="image">image16</property>
+                                            <property name="image">image20</property>
                                             <signal name="clicked" handler="linphone_gtk_add_contact" swapped="no"/>
                                           </object>
                                           <packing>
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="padding">6</property>
-                        <property name="position">1</property>
+                        <property name="resize">True</property>
+                        <property name="shrink">True</property>
                       </packing>
                     </child>
                   </object>
                             <property name="use_action_appearance">False</property>
                             <property name="relief">none</property>
                             <signal name="clicked" handler="on_proxy_refresh_button_clicked" swapped="no"/>
-                            <child>
-                              <object class="GtkImage" id="image20">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="stock">gtk-refresh</property>
-                              </object>
-                            </child>
                           </object>
                           <packing>
                             <property name="expand">True</property>
     <property name="tooltip_text" translatable="yes">Delete</property>
     <property name="stock">gtk-remove</property>
   </object>
+  <object class="GtkImage" id="remove_image1">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="tooltip_text" translatable="yes">Delete</property>
+    <property name="stock">gtk-remove</property>
+  </object>
+  <object class="GtkImage" id="remove_image2">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="tooltip_text" translatable="yes">Delete</property>
+    <property name="stock">gtk-remove</property>
+  </object>
 </interface>
index e4a6430fa2e409785f63e4c7c851003031ae51c0..b8063792fb0e2c132bad2a9b0f651a40019b5c18 100644 (file)
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
-                      <object class="GtkVButtonBox" id="vbuttonbox3">
+                      <object class="GtkHBox" id="hbox1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
-                          <object class="GtkRadioButton" id="no_nat">
-                            <property name="label" translatable="yes">Direct connection to the Internet</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="use_action_appearance">False</property>
-                            <property name="active">True</property>
-                            <property name="draw_indicator">True</property>
-                            <signal name="toggled" handler="linphone_gtk_no_firewall_toggled" swapped="no"/>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkVBox" id="vbox4">
+                          <object class="GtkVButtonBox" id="vbuttonbox3">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <child>
-                              <object class="GtkRadioButton" id="use_nat_address">
-                                <property name="label" translatable="yes">Behind NAT / Firewall (specify gateway IP below)</property>
+                              <object class="GtkRadioButton" id="no_nat">
+                                <property name="label" translatable="yes">Direct connection to the Internet</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="use_action_appearance">False</property>
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
+                                <signal name="toggled" handler="linphone_gtk_no_firewall_toggled" swapped="no"/>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkRadioButton" id="use_nat_address">
+                                <property name="label" translatable="yes">Behind NAT / Firewall (specify gateway IP )</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="draw_indicator">True</property>
                                 <property name="group">no_nat</property>
                                 <signal name="toggled" handler="linphone_gtk_use_nat_address_toggled" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="expand">True</property>
                                 <property name="fill">True</property>
-                                <property name="position">0</property>
+                                <property name="position">1</property>
                               </packing>
                             </child>
+                            <child>
+                              <object class="GtkRadioButton" id="use_stun">
+                                <property name="label" translatable="yes">Behind NAT / Firewall (use STUN to resolve)</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="draw_indicator">True</property>
+                                <property name="group">no_nat</property>
+                                <signal name="toggled" handler="linphone_gtk_use_stun_toggled" swapped="no"/>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkRadioButton" id="use_ice">
+                                <property name="label" translatable="yes">Behind NAT / Firewall (use ICE)</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="draw_indicator">True</property>
+                                <property name="group">no_nat</property>
+                                <signal name="toggled" handler="linphone_gtk_use_ice_toggled" swapped="no"/>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">3</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkRadioButton" id="use_upnp">
+                                <property name="label" translatable="yes">Behind NAT / Firewall (use uPnP)</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="draw_indicator">True</property>
+                                <property name="group">no_nat</property>
+                                <signal name="toggled" handler="linphone_gtk_use_upnp_toggled" swapped="no"/>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">4</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkVBox" id="vbox5">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <child>
                               <object class="GtkHBox" id="hbox21">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <property name="homogeneous">True</property>
                                 <child>
                                   <object class="GtkLabel" id="label39">
                                     <property name="visible">True</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="invisible_char">•</property>
+                                    <property name="invisible_char_set">True</property>
                                     <property name="primary_icon_activatable">False</property>
                                     <property name="secondary_icon_activatable">False</property>
                                     <property name="primary_icon_sensitive">True</property>
                               </object>
                               <packing>
                                 <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkRadioButton" id="use_stun">
-                            <property name="label" translatable="yes">Behind NAT / Firewall (use STUN to resolve)</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="use_action_appearance">False</property>
-                            <property name="draw_indicator">True</property>
-                            <property name="group">no_nat</property>
-                            <signal name="toggled" handler="linphone_gtk_use_stun_toggled" swapped="no"/>
-                          </object>
-                          <packing>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkRadioButton" id="use_ice">
-                            <property name="label" translatable="yes">Behind NAT / Firewall (use ICE)</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="use_action_appearance">False</property>
-                            <property name="draw_indicator">True</property>
-                            <property name="group">no_nat</property>
-                            <signal name="toggled" handler="linphone_gtk_use_ice_toggled" swapped="no"/>
-                          </object>
-                          <packing>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
-                            <property name="position">3</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkRadioButton" id="use_upnp">
-                            <property name="label" translatable="yes">Behind NAT / Firewall (use uPnP)</property>
-                            <property name="use_action_appearance">False</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="draw_indicator">True</property>
-                            <property name="group">no_nat</property>
-                            <signal name="toggled" handler="linphone_gtk_use_upnp_toggled" swapped="no"/>
-                          </object>
-                          <packing>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
-                            <property name="position">4</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkHBox" id="hbox24">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <child>
-                              <object class="GtkLabel" id="label42">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="label" translatable="yes">Stun server:</property>
-                                <property name="justify">right</property>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
+                                <property name="fill">False</property>
                                 <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkEntry" id="stun_server">
+                              <object class="GtkHBox" id="hbox24">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="invisible_char">●</property>
-                                <property name="invisible_char_set">True</property>
-                                <property name="primary_icon_activatable">False</property>
-                                <property name="secondary_icon_activatable">False</property>
-                                <property name="primary_icon_sensitive">True</property>
-                                <property name="secondary_icon_sensitive">True</property>
-                                <signal name="changed" handler="linphone_gtk_stun_server_changed" swapped="no"/>
+                                <property name="homogeneous">True</property>
+                                <child>
+                                  <object class="GtkLabel" id="label42">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="label" translatable="yes">Stun server:</property>
+                                    <property name="justify">right</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkEntry" id="stun_server">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="invisible_char">●</property>
+                                    <property name="invisible_char_set">True</property>
+                                    <property name="primary_icon_activatable">False</property>
+                                    <property name="secondary_icon_activatable">False</property>
+                                    <property name="primary_icon_sensitive">True</property>
+                                    <property name="secondary_icon_sensitive">True</property>
+                                    <signal name="changed" handler="linphone_gtk_stun_server_changed" swapped="no"/>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
                               </object>
                               <packing>
                                 <property name="expand">True</property>
-                                <property name="fill">True</property>
+                                <property name="fill">False</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
-                            <property name="position">4</property>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
                           </packing>
                         </child>
                       </object>
index 1c189e0b8ba1ca5c58231333e8e9ee5385634bb2..f30b55d05e080e122be42a18f2366f419ff1d7a9 100644 (file)
@@ -131,6 +131,13 @@ void linphone_gtk_update_my_port(GtkWidget *w){
        linphone_core_set_sip_transports(lc,&tr);
 }
 
+void linphone_gtk_set_propety_entry(GtkWidget *w, gboolean stunServer, gboolean ip){
+       GtkWidget *stun_entry=linphone_gtk_get_widget(gtk_widget_get_toplevel(w),"stun_server");
+       GtkWidget *ip_entry=linphone_gtk_get_widget(gtk_widget_get_toplevel(w),"nat_address");
+       gtk_widget_set_sensitive(stun_entry,stunServer);
+       gtk_widget_set_sensitive(ip_entry,ip);
+}
+
 void linphone_gtk_stun_server_changed(GtkWidget *w){
        const gchar *addr=gtk_entry_get_text(GTK_ENTRY(w));
        linphone_core_set_stun_server(linphone_gtk_get_core(),addr);
@@ -217,28 +224,38 @@ void linphone_gtk_max_video_port_changed(GtkWidget *w){
 }
 
 void linphone_gtk_no_firewall_toggled(GtkWidget *w){
-       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w)))
+       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w))){
+               linphone_gtk_set_propety_entry(w,FALSE,FALSE);
                linphone_core_set_firewall_policy(linphone_gtk_get_core(),LinphonePolicyNoFirewall);
+       }
 }
 
 void linphone_gtk_use_nat_address_toggled(GtkWidget *w){
-       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w)))
+       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w))){
+               linphone_gtk_set_propety_entry(w,FALSE,TRUE);
                linphone_core_set_firewall_policy(linphone_gtk_get_core(),LinphonePolicyUseNatAddress);
+       }
 }
 
 void linphone_gtk_use_stun_toggled(GtkWidget *w){
-       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w)))
+       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w))){
+               linphone_gtk_set_propety_entry(w,TRUE,FALSE);
                linphone_core_set_firewall_policy(linphone_gtk_get_core(),LinphonePolicyUseStun);
+       }
 }
 
 void linphone_gtk_use_ice_toggled(GtkWidget *w){
-       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w)))
+       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w))){
+               linphone_gtk_set_propety_entry(w,TRUE,FALSE);
                linphone_core_set_firewall_policy(linphone_gtk_get_core(),LinphonePolicyUseIce);
+       }
 }
 
 void linphone_gtk_use_upnp_toggled(GtkWidget *w){
-       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w)))
+       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w))){
+               linphone_gtk_set_propety_entry(w,FALSE,FALSE);
                linphone_core_set_firewall_policy(linphone_gtk_get_core(),LinphonePolicyUseUpnp);
+       }
 }
 
 void linphone_gtk_mtu_changed(GtkWidget *w){
index 0b799f33ee169bac41f0890068e96af85e64d1d2..8cedba44575e83bea58aa680078a9fbdb97d976e 100644 (file)
@@ -71,20 +71,20 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
                loadOptionalLibrary("bcg729");
 
                //Main library
-               if (!hasNeonInCpuFeatures()) {
-                       try {
-                               if (!isArmv7() && !Version.isX86()) {
-                                       System.loadLibrary("linphonearmv5"); 
-                               } else {
-                                       System.loadLibrary("linphonenoneon"); 
-                               }
-                               Log.w("linphone", "No-neon liblinphone loaded");
-                       } catch (UnsatisfiedLinkError ule) {
-                               Log.w("linphone", "Failed to load no-neon liblinphone, loading neon liblinphone");
-                               System.loadLibrary("linphone"); 
+               if (isArmv7()) {
+                       if (hasNeonInCpuFeatures()) {
+                               Log.d("linphone", "armv7 liblinphone loaded");
+                               System.loadLibrary("linphonearmv7"); 
+                       } else {
+                               Log.w("linphone", "No-neon armv7 liblinphone loaded");
+                               System.loadLibrary("linphonearmv7noneon"); 
                        }
+               } else if (Version.isX86()) {
+                       Log.d("linphone", "No-neon x86 liblinphone loaded");
+                       System.loadLibrary("linphonex86"); 
                } else {
-                       System.loadLibrary("linphone"); 
+                       Log.d("linphone", "No-neon armv5 liblinphone loaded");
+                       System.loadLibrary("linphonearmv5noneon"); 
                }
 
                Version.dumpCapabilities();
index 1df0777a691f2c9ab61a3f550fce9ad13a805a64..7eef0eea512c52f7085df74c76fd4564441da5f8 100755 (executable)
@@ -14,3 +14,4 @@
 ./bin/libgpg-error-0.dll
 ./bin/libgnutls-26.dll
 ./bin/libtasn1-3.dll
+./bin/libsqlite3-0.dll
index 23b802c4631fdf909a218a0dd0a77c6cf6d4d5a9..f8ca6065676eff95752d546e387684ccc90e7b1e 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 23b802c4631fdf909a218a0dd0a77c6cf6d4d5a9
+Subproject commit f8ca6065676eff95752d546e387684ccc90e7b1e
diff --git a/oRTP b/oRTP
index bd64df5148bdfd4a2ff5153927676fc497118279..2c37d1205e9dd0e30a918ccf666ab217b66c2899 160000 (submodule)
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit bd64df5148bdfd4a2ff5153927676fc497118279
+Subproject commit 2c37d1205e9dd0e30a918ccf666ab217b66c2899
index ad041095b4696747d24dbc5d4392a74efb589bd1..38fdbbb7740c1712054214af3d63427b1b7201a7 100644 (file)
Binary files a/pixmaps/contact_unstarred.png and b/pixmaps/contact_unstarred.png differ
index 30b32789a802b49afbd0e0c576ca3fd92a743520..d5726e12c03df86864df4c48e8f98c33ba6af9fe 100644 (file)
Binary files a/pixmaps/startcall-small.png and b/pixmaps/startcall-small.png differ
index 481b7aa17d0e0a06e78e124228f55125221abffc..4c1cb650364e78bef1b01d599ec8237aa095e582 100644 (file)
--- a/po/cs.po
+++ b/po/cs.po
@@ -2,12 +2,13 @@
 # This file is distributed under the same license as the linphone package.
 # Copyright (C) 2009 Simon Morlat (msgids)
 # Klara Cihlarova <koty@seznam.cz>, 2005.
-# Petr Pisar <petr.pisar@atlas.cz>, 2006, 2007, 2008, 2009, 2010, 2011.
+# Petr Pisar <petr.pisar@atlas.cz>, 2006, 2007, 2008, 2009, 2010, 2011, 2013.
 #
 # XXX: Don't translate gtk-* messages. They will be replaced from GTK+
 # catalogue.
 #
 # On hold → odložen
+# chat → diskuze
 # Pause call → odložit hovor
 # Resume call → obnovit hovor
 # token → klíč
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: linphone-3.4.99.4\n"
+"Project-Id-Version: linphone-3.5.99.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-04-08 16:59+0200\n"
-"PO-Revision-Date: 2011-11-04 22:30+0100\n"
+"PO-Revision-Date: 2013-05-01 09:55+0200\n"
 "Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
 "Language: cs\n"
@@ -38,49 +39,46 @@ msgid "Send text to %s"
 msgstr "Poslat text komu: %s"
 
 #: ../gtk/calllogs.c:223
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Recent calls (%i)</b>"
-msgstr "<b>Probíhá hovor</b>"
+msgstr "<b>Nedávné hovory (%i)</b>"
 
 #: ../gtk/calllogs.c:300
 msgid "n/a"
 msgstr "–"
 
 #: ../gtk/calllogs.c:303
-#, fuzzy
 msgid "Aborted"
-msgstr "přerušen"
+msgstr "Přerušen"
 
 #: ../gtk/calllogs.c:306
-#, fuzzy
 msgid "Missed"
-msgstr "promeškán"
+msgstr "Zmeškán"
 
 #: ../gtk/calllogs.c:309
-#, fuzzy
 msgid "Declined"
-msgstr "Odmítnout"
+msgstr "Odmítnut"
 
 #: ../gtk/calllogs.c:315
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%i minuta"
+msgstr[1] "%i minuty"
+msgstr[2] "%i minut"
 
 #: ../gtk/calllogs.c:318
 #, c-format
 msgid "%i second"
 msgid_plural "%i seconds"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%i sekunda"
+msgstr[1] "%i sekundy"
+msgstr[2] "%i sekund"
 
 #: ../gtk/calllogs.c:321 ../gtk/calllogs.c:327
 #, c-format
 msgid "<big><b>%s</b></big>\t%s"
-msgstr ""
+msgstr "<big><b>%s</b></big>\t%s"
 
 #: ../gtk/calllogs.c:323
 #, c-format
@@ -88,6 +86,8 @@ msgid ""
 "<small><i>%s</i>\t<i>Quality: %s</i></small>\n"
 "%s\t%s\t"
 msgstr ""
+"<small><i>%s</i>\t<i>Kvalita: %s</i></small>\n"
+"%s\t%s\t"
 
 #: ../gtk/calllogs.c:329
 #, c-format
@@ -95,6 +95,8 @@ msgid ""
 "<small><i>%s</i></small>\t\n"
 "%s"
 msgstr ""
+"<small><i>%s</i></small>\t\n"
+"%s"
 
 #: ../gtk/conference.c:38 ../gtk/main.ui.h:13
 msgid "Conference"
@@ -123,7 +125,7 @@ msgstr "Soubor, kam zapisovat protokol."
 
 #: ../gtk/main.c:106
 msgid "Start linphone with video disabled."
-msgstr ""
+msgstr "Spustí linphone se zakázaným obrazem."
 
 #: ../gtk/main.c:113
 msgid "Start only in the system tray, do not show the main interface."
@@ -197,14 +199,14 @@ msgid "Call paused"
 msgstr "Hovor odložen"
 
 #: ../gtk/main.c:1142
-#, fuzzy, c-format
+#, c-format
 msgid "<b>by %s</b>"
-msgstr "<b>Porty</b>"
+msgstr "<b>kým: %s</b>"
 
 #: ../gtk/main.c:1191
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
-msgstr ""
+msgstr "%s navrhuje začít videohovor. Přijímáte?"
 
 #: ../gtk/main.c:1353
 msgid "Website link"
@@ -237,9 +239,8 @@ msgid "A free SIP video-phone"
 msgstr "Volný SIP videofon"
 
 #: ../gtk/friendlist.c:469
-#, fuzzy
 msgid "Add to addressbook"
-msgstr "Zobrazit adresář"
+msgstr "Přidat do adresáře"
 
 #: ../gtk/friendlist.c:643
 msgid "Presence status"
@@ -250,14 +251,12 @@ msgid "Name"
 msgstr "Jméno"
 
 #: ../gtk/friendlist.c:673
-#, fuzzy
 msgid "Call"
-msgstr "Volat komu: %s"
+msgstr "Zavolat"
 
 #: ../gtk/friendlist.c:678
-#, fuzzy
 msgid "Chat"
-msgstr "Diskuzní skupina"
+msgstr "Diskuze"
 
 #: ../gtk/friendlist.c:708
 #, c-format
@@ -275,9 +274,9 @@ msgid "Delete contact '%s'"
 msgstr "Odstranit kontakt „%s“"
 
 #: ../gtk/friendlist.c:926
-#, fuzzy, c-format
+#, c-format
 msgid "Delete chat history of '%s'"
-msgstr "Odstranit kontakt „%s“"
+msgstr "Odstranit historii diskuze u kontaktu „%s“"
 
 #: ../gtk/friendlist.c:977
 #, c-format
@@ -378,20 +377,21 @@ msgstr "norština"
 
 #: ../gtk/propertybox.c:780
 msgid "Hebrew"
-msgstr ""
+msgstr "hebrejština"
 
 #: ../gtk/propertybox.c:781
 msgid "Serbian"
-msgstr ""
+msgstr "srbština"
 
 #: ../gtk/propertybox.c:848
 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."
 
+# Media encryption type:
 #: ../gtk/propertybox.c:934
 msgid "None"
-msgstr "Žádná"
+msgstr "Žádné"
 
 #: ../gtk/propertybox.c:938
 msgid "SRTP"
@@ -451,23 +451,20 @@ msgstr ""
 "Tento průvodce vám pomůže používat sipový účet při vašich hovorech."
 
 #: ../gtk/setupwizard.c:43
-#, fuzzy
 msgid "Create an account on linphone.org"
-msgstr "Vytvořit účet vybráním uživatelského jména"
+msgstr "Vytvořit účet na linphone.org"
 
 #: ../gtk/setupwizard.c:44
-#, fuzzy
 msgid "I have already a linphone.org account and I just want to use it"
-msgstr "Účet již mám a chci jej použít"
+msgstr "Účet na linphone.org již mám a chci jej použít"
 
 #: ../gtk/setupwizard.c:45
-#, fuzzy
 msgid "I have already a sip account and I just want to use it"
-msgstr "Účet již mám a chci jej použít"
+msgstr "SIP účet již mám a chci jej použít"
 
 #: ../gtk/setupwizard.c:85
 msgid "Enter your linphone.org username"
-msgstr ""
+msgstr "Zadejte uživatelské jméno na linphone.org"
 
 #: ../gtk/setupwizard.c:92
 msgid "Username:"
@@ -479,53 +476,52 @@ msgstr "Heslo:"
 
 #: ../gtk/setupwizard.c:114
 msgid "Enter your account informations"
-msgstr ""
+msgstr "Zadejte údaje o vašem účtu"
 
 #: ../gtk/setupwizard.c:121
-#, fuzzy
 msgid "Username*"
-msgstr "Uživatelské jméno"
+msgstr "Uživatelské jméno*"
 
 #: ../gtk/setupwizard.c:122
-#, fuzzy
 msgid "Password*"
-msgstr "Heslo"
+msgstr "Heslo*"
 
 #: ../gtk/setupwizard.c:125
 msgid "Domain*"
-msgstr ""
+msgstr "Doména*"
 
 #: ../gtk/setupwizard.c:126
 msgid "Proxy"
-msgstr ""
+msgstr "Proxy"
 
 #: ../gtk/setupwizard.c:298
 msgid "(*) Required fields"
-msgstr ""
+msgstr "(*) Povinné položky"
 
 #: ../gtk/setupwizard.c:299
-#, fuzzy
 msgid "Username: (*)"
-msgstr "Uživatelské jméno:"
+msgstr "Uživatelské jméno: (*)"
 
 #: ../gtk/setupwizard.c:301
-#, fuzzy
 msgid "Password: (*)"
-msgstr "Heslo:"
+msgstr "Heslo: (*)"
 
 #: ../gtk/setupwizard.c:303
 msgid "Email: (*)"
-msgstr ""
+msgstr "E-mail: (*)"
 
 #: ../gtk/setupwizard.c:305
 msgid "Confirm your password: (*)"
-msgstr ""
+msgstr "Potvrďte heslo: (*)"
 
 #: ../gtk/setupwizard.c:369
 msgid ""
 "Error, account not validated, username already used or server unreachable.\n"
 "Please go back and try again."
 msgstr ""
+"Došlo k chybě (účet nebyl ověřen, uživatelské jméno již existuje nebo server "
+"není dostupný).\n"
+"Prosím, vraťte se a zkoste to znovu."
 
 #: ../gtk/setupwizard.c:380
 msgid "Thank you. Your account is now configured and ready for use."
@@ -537,6 +533,9 @@ msgid ""
 "email.\n"
 "Then come back here and press Next button."
 msgstr ""
+"Prosím, ověřte svůj účet tak, že kliknete na odkaz, který jsme vám právě "
+"zaslali e-mailem.\n"
+"Pak se sem vraťte a stiskněte tlačítko Další."
 
 #: ../gtk/setupwizard.c:564
 msgid "Welcome to the account setup assistant"
@@ -547,31 +546,28 @@ msgid "Account setup assistant"
 msgstr "Průvodce nastavením účtu"
 
 #: ../gtk/setupwizard.c:575
-#, fuzzy
 msgid "Configure your account (step 1/1)"
-msgstr "Nastavit SIP účet"
+msgstr "Nastavit účet (krok 1/1)"
 
 #: ../gtk/setupwizard.c:580
 msgid "Enter your sip username (step 1/1)"
-msgstr ""
+msgstr "Zadejte vaše sipové uživatelské jméno (krok 1/1)"
 
 #: ../gtk/setupwizard.c:584
 msgid "Enter account information (step 1/2)"
-msgstr ""
+msgstr "Zadejte údaje o účtu (krok 1/2)"
 
 #: ../gtk/setupwizard.c:593
 msgid "Validation (step 2/2)"
-msgstr ""
+msgstr "Ověření (krok 2/2)"
 
 #: ../gtk/setupwizard.c:598
-#, fuzzy
 msgid "Error"
-msgstr "Chyba."
+msgstr "Chyba"
 
 #: ../gtk/setupwizard.c:602
-#, fuzzy
 msgid "Terminating"
-msgstr "Ukončit hovor"
+msgstr "Ukončuje se"
 
 #: ../gtk/incall_view.c:70 ../gtk/incall_view.c:94
 #, c-format
@@ -584,62 +580,56 @@ msgid "Transfer to call #%i with %s"
 msgstr "Přepojit hovor č. %i s %s"
 
 #: ../gtk/incall_view.c:210 ../gtk/incall_view.c:213
-#, fuzzy
 msgid "Not used"
-msgstr "Nenalezeno"
+msgstr "Nepoužito"
 
 #: ../gtk/incall_view.c:220
 msgid "ICE not activated"
-msgstr ""
+msgstr "ICE není zapnuto"
 
 #: ../gtk/incall_view.c:222
-#, fuzzy
 msgid "ICE failed"
-msgstr "Filtr ICE"
+msgstr "ICE selhalo"
 
 #: ../gtk/incall_view.c:224
 msgid "ICE in progress"
-msgstr ""
+msgstr "Probíhá ICE"
 
 #: ../gtk/incall_view.c:226
 msgid "Going through one or more NATs"
-msgstr ""
+msgstr "Prochází se jedním nebo více NATy"
 
 #: ../gtk/incall_view.c:228
-#, fuzzy
 msgid "Direct"
-msgstr "Přesměrováno"
+msgstr "Přímé"
 
 #: ../gtk/incall_view.c:230
 msgid "Through a relay server"
-msgstr ""
+msgstr "Skrze relay server"
 
 #: ../gtk/incall_view.c:238
 msgid "uPnP not activated"
-msgstr ""
+msgstr "UPnP není zapnuto"
 
 #: ../gtk/incall_view.c:240
-#, fuzzy
 msgid "uPnP in progress"
-msgstr "Hledá se adresa pomocí STUN…"
+msgstr "Probíhá UPnP"
 
 #: ../gtk/incall_view.c:242
-#, fuzzy
 msgid "uPnp not available"
-msgstr "nedostupná"
+msgstr "UPnP není nedostupné"
 
 #: ../gtk/incall_view.c:244
 msgid "uPnP is running"
-msgstr ""
+msgstr "UPnP běží"
 
 #: ../gtk/incall_view.c:246
-#, fuzzy
 msgid "uPnP failed"
-msgstr "Filtr ICE"
+msgstr "UPnP selhalo"
 
 #: ../gtk/incall_view.c:256 ../gtk/incall_view.c:257
 msgid "Direct or through server"
-msgstr ""
+msgstr "Přímé nebo skrze server"
 
 #: ../gtk/incall_view.c:259 ../gtk/incall_view.c:265
 #, c-format
@@ -647,15 +637,17 @@ msgid ""
 "download: %f\n"
 "upload: %f (kbit/s)"
 msgstr ""
+"příchozí: %f\n"
+"odchozí: %f (kb/s)"
 
 #: ../gtk/incall_view.c:286
 #, c-format
 msgid "%.3f seconds"
-msgstr ""
+msgstr "%.3f sekund"
 
 #: ../gtk/incall_view.c:384 ../gtk/main.ui.h:12
 msgid "Hang up"
-msgstr ""
+msgstr "Zavěsit"
 
 #: ../gtk/incall_view.c:476
 msgid "<b>Calling...</b>"
@@ -695,20 +687,20 @@ msgstr "nedostupná"
 
 #: ../gtk/incall_view.c:651
 msgid "Secured by SRTP"
-msgstr ""
+msgstr "Zabezpečeno pomocí SRTP"
 
 #: ../gtk/incall_view.c:657
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
-msgstr ""
+msgstr "Zabezpečeno pomocí ZRTP – [ověřovací klíč: %s]"
 
 #: ../gtk/incall_view.c:663
 msgid "Set unverified"
-msgstr ""
+msgstr "Nastavit na neověřeno"
 
 #: ../gtk/incall_view.c:663 ../gtk/main.ui.h:4
 msgid "Set verified"
-msgstr ""
+msgstr "Nastavit na ověřeno"
 
 #: ../gtk/incall_view.c:684
 msgid "In conference"
@@ -733,17 +725,15 @@ msgstr "<b>Hovor skončil.</b>"
 
 #: ../gtk/incall_view.c:778
 msgid "Transfer in progress"
-msgstr ""
+msgstr "Probíhá přepojení"
 
 #: ../gtk/incall_view.c:781
-#, fuzzy
 msgid "Transfer done."
-msgstr "Přepojit"
+msgstr "Přepojení dokončeno."
 
 #: ../gtk/incall_view.c:784
-#, fuzzy
 msgid "Transfer failed."
-msgstr "Přepojit"
+msgstr "Přepojení selhalo."
 
 #: ../gtk/incall_view.c:828
 msgid "Resume"
@@ -759,11 +749,12 @@ msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
 msgstr ""
+"<small><i>Nahrává se do\n"
+"%s %s</i></small>"
 
 #: ../gtk/incall_view.c:900
-#, fuzzy
 msgid "(Paused)"
-msgstr "Odložit"
+msgstr "(Odloženo)"
 
 #: ../gtk/loginframe.c:93
 #, c-format
@@ -779,21 +770,20 @@ msgid "Send"
 msgstr "Odeslat"
 
 #: ../gtk/main.ui.h:3
-#, fuzzy
 msgid "End conference"
-msgstr "Probíhá konference"
+msgstr "Ukončit konferenci"
 
 #: ../gtk/main.ui.h:7
 msgid "Record this call to an audio file"
-msgstr ""
+msgstr "Nahrát tento hovor do zvukového souboru"
 
 #: ../gtk/main.ui.h:8
 msgid "Video"
-msgstr ""
+msgstr "Obraz"
 
 #: ../gtk/main.ui.h:10
 msgid "Mute"
-msgstr ""
+msgstr "Ztišit"
 
 #: ../gtk/main.ui.h:11
 msgid "Transfer"
@@ -817,7 +807,7 @@ msgstr "V_olby"
 
 #: ../gtk/main.ui.h:18
 msgid "Always start video"
-msgstr ""
+msgstr "Vždy spustit obraz"
 
 #: ../gtk/main.ui.h:19
 msgid "Enable self-view"
@@ -840,9 +830,8 @@ msgid "Check _Updates"
 msgstr "Vyhledat akt_ualizace"
 
 #: ../gtk/main.ui.h:24
-#, fuzzy
 msgid "Account assistant"
-msgstr "Průvodce nastavením účtu"
+msgstr "Průvodce účtem"
 
 #: ../gtk/main.ui.h:25
 msgid "SIP address or phone number:"
@@ -930,7 +919,7 @@ msgstr "Výchozí"
 
 #: ../gtk/main.ui.h:46
 msgid "Delete"
-msgstr ""
+msgstr "Smazat"
 
 #: ../gtk/about.ui.h:1
 msgid "About linphone"
@@ -992,7 +981,7 @@ msgstr "Ladicí okno Linphonu"
 
 #: ../gtk/log.ui.h:2
 msgid "Scroll to end"
-msgstr ""
+msgstr "Přejít na konec"
 
 #: ../gtk/password.ui.h:1
 msgid "Linphone - Authentication required"
@@ -1052,7 +1041,7 @@ msgstr "Registrační období (s):"
 
 #: ../gtk/sip_account.ui.h:9
 msgid "Register"
-msgstr ""
+msgstr "Zaregistrovat se"
 
 #: ../gtk/sip_account.ui.h:10
 msgid "Publish presence information"
@@ -1136,20 +1125,20 @@ msgstr "Zvukový RTP/UDP:"
 
 #: ../gtk/parameters.ui.h:19
 msgid "DSCP fields"
-msgstr ""
+msgstr "Položky DSCP"
 
+# Port number
 #: ../gtk/parameters.ui.h:20
 msgid "Fixed"
-msgstr ""
+msgstr "Stálý"
 
 #: ../gtk/parameters.ui.h:21
 msgid "Tunnel"
-msgstr ""
+msgstr "Tunel"
 
 #: ../gtk/parameters.ui.h:22
-#, fuzzy
 msgid "Media encryption is mandatory"
-msgstr "Druh šifrování médií"
+msgstr "Šifrování médií je povinné"
 
 #: ../gtk/parameters.ui.h:23
 msgid "<b>Network protocol and ports</b>"
@@ -1172,14 +1161,12 @@ msgid "Behind NAT / Firewall (use STUN to resolve)"
 msgstr "Za NAT/firewallem (adresu určí STUN)"
 
 #: ../gtk/parameters.ui.h:28
-#, fuzzy
 msgid "Behind NAT / Firewall (use ICE)"
-msgstr "Za NAT/firewallem (adresu určí STUN)"
+msgstr "Za NAT/firewallem (adresu určí ICE)"
 
 #: ../gtk/parameters.ui.h:29
-#, fuzzy
 msgid "Behind NAT / Firewall (use uPnP)"
-msgstr "Za NAT/firewallem (adresu určí STUN)"
+msgstr "Za NAT/firewallem (adresu určí UPnP)"
 
 #: ../gtk/parameters.ui.h:30
 msgid "Stun server:"
@@ -1259,7 +1246,7 @@ msgstr "<b>Implicitní totožnost</b>"
 
 #: ../gtk/parameters.ui.h:49
 msgid "Wizard"
-msgstr ""
+msgstr "Průvodce"
 
 #: ../gtk/parameters.ui.h:52
 msgid "Remove"
@@ -1307,7 +1294,7 @@ msgstr "Omezení příchozí rychlosti (kb/s):"
 
 #: ../gtk/parameters.ui.h:63
 msgid "Enable adaptive rate control"
-msgstr "Zapnout přizpůsobující řízení rychlosti"
+msgstr "Zapnout přizpůsobující se řízení rychlosti"
 
 #: ../gtk/parameters.ui.h:64
 msgid ""
@@ -1366,91 +1353,80 @@ msgid "Please wait"
 msgstr "Prosím, čekejte"
 
 #: ../gtk/dscp_settings.ui.h:1
-#, fuzzy
 msgid "Dscp settings"
-msgstr "Nastavení"
+msgstr "Nastavení DSCP"
 
 #: ../gtk/dscp_settings.ui.h:2
 msgid "SIP"
 msgstr "SIP"
 
 #: ../gtk/dscp_settings.ui.h:3
-#, fuzzy
 msgid "Audio RTP stream"
-msgstr "Převzorkování zvuku"
+msgstr "RTP proud zvuku"
 
 #: ../gtk/dscp_settings.ui.h:4
-#, fuzzy
 msgid "Video RTP stream"
-msgstr "Obrazový RTP/UDP:"
+msgstr "RTP proud obrazu"
 
 #: ../gtk/dscp_settings.ui.h:5
 msgid "<b>Set DSCP values (in hexadecimal)</b>"
-msgstr ""
+msgstr "<b>Nastavit hodnoty DSCP (šestnáctkově)</b>"
 
 #: ../gtk/call_statistics.ui.h:1
-#, fuzzy
 msgid "Call statistics"
-msgstr "Informace o hovoru"
+msgstr "Statistické údaje o hovoru"
 
 #: ../gtk/call_statistics.ui.h:2
-#, fuzzy
 msgid "Audio codec"
-msgstr "Kodeky zvuku"
+msgstr "Kodek zvuku"
 
 #: ../gtk/call_statistics.ui.h:3
-#, fuzzy
 msgid "Video codec"
-msgstr "Kodeky obrazu"
+msgstr "Kodek obrazu"
 
 #: ../gtk/call_statistics.ui.h:4
 msgid "Audio IP bandwidth usage"
-msgstr ""
+msgstr "Přenosová rychlost zvuku na úrovni IP"
 
 #: ../gtk/call_statistics.ui.h:5
-#, fuzzy
 msgid "Audio Media connectivity"
-msgstr "Druh šifrování médií"
+msgstr "Zvukové spojení"
 
 #: ../gtk/call_statistics.ui.h:6
 msgid "Video IP bandwidth usage"
-msgstr ""
+msgstr "Přenosová rychlost obrazu na úrovni IP"
 
 #: ../gtk/call_statistics.ui.h:7
-#, fuzzy
 msgid "Video Media connectivity"
-msgstr "Druh šifrování médií"
+msgstr "Obrazové spojení"
 
 #: ../gtk/call_statistics.ui.h:8
-#, fuzzy
 msgid "Round trip time"
-msgstr "Vlastnosti zvuku"
+msgstr "Odezva"
 
 #: ../gtk/call_statistics.ui.h:9
-#, fuzzy
 msgid "<b>Call statistics and information</b>"
-msgstr "<b>Informace o kontaktu</b>"
+msgstr "<b>Statistické a ostatní údaje o hovoru</b>"
 
 #: ../gtk/tunnel_config.ui.h:1
-#, fuzzy
 msgid "Configure VoIP tunnel"
-msgstr "Nastavit SIP účet"
+msgstr "Nastavit VoIP tunel"
 
 #: ../gtk/tunnel_config.ui.h:2
 msgid "Host"
-msgstr ""
+msgstr "Stroj"
 
 #: ../gtk/tunnel_config.ui.h:3
 msgid "Port"
-msgstr ""
+msgstr "Port"
 
 #: ../gtk/tunnel_config.ui.h:6
 msgid "<b>Configure tunnel</b>"
-msgstr ""
+msgstr "<b>Nastavit tunel</b>"
 
 #: ../gtk/tunnel_config.ui.h:9
 msgid "<b>Configure http proxy (optional)</b>"
-msgstr ""
+msgstr "<b>Nastavit HTTP proxy (volitelné)</b>"
 
 #: ../gtk/keypad.ui.h:1
 msgid "D"
@@ -1564,7 +1540,7 @@ msgstr ""
 
 #: ../coreapi/linphonecore.c:2432
 msgid "Contacting"
-msgstr "Kontaktuji"
+msgstr "Navazuje se spojení"
 
 #: ../coreapi/linphonecore.c:2439
 msgid "Could not call"
@@ -1636,11 +1612,11 @@ msgstr "Hledá se adresa pomocí STUN…"
 
 #: ../coreapi/misc.c:630
 msgid "ICE local candidates gathering in progress..."
-msgstr ""
+msgstr "Shromažďují se místní kandidáti ICE…"
 
 #: ../coreapi/friend.c:33
 msgid "Online"
-msgstr "Připojeno"
+msgstr "Připojen"
 
 #: ../coreapi/friend.c:36
 msgid "Busy"
@@ -1668,19 +1644,19 @@ msgstr "Nerušit"
 
 #: ../coreapi/friend.c:54
 msgid "Moved"
-msgstr "Přestěhoval se"
+msgstr "Přestěhoval jsem se"
 
 #: ../coreapi/friend.c:57
 msgid "Using another messaging service"
-msgstr "Používá jinou službu přenosu zpráv"
+msgstr "Používám jinou službu přenosu zpráv"
 
 #: ../coreapi/friend.c:60
 msgid "Offline"
-msgstr "Odpojeno"
+msgstr "Odpojen"
 
 #: ../coreapi/friend.c:63
 msgid "Pending"
-msgstr "Čeká"
+msgstr "Čekám"
 
 #: ../coreapi/friend.c:66
 msgid "Unknown-bug"
@@ -1691,7 +1667,7 @@ msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
 msgstr ""
-"Adresa SIPproxy, kterou jste zadali, není platná. Musí začínat na „sip:“ a "
+"Adresa SIP proxy, kterou jste zadali, není platná. Musí začínat na „sip:“ a "
 "pak musí následovat jméno stroje."
 
 #: ../coreapi/proxy.c:210
@@ -1740,21 +1716,19 @@ msgstr "Hovor přijat kým: %s."
 
 #: ../coreapi/callbacks.c:412
 msgid "Incompatible, check codecs or security settings..."
-msgstr ""
+msgstr "Není slučitelné. Zkontrolujte nastavení kodeků a zabezpečení…"
 
 #: ../coreapi/callbacks.c:460
-#, fuzzy
 msgid "We have been resumed."
-msgstr "Byli jsme obnoveni"
+msgstr "Byli jsme obnoveni."
 
 #: ../coreapi/callbacks.c:469
 msgid "We are paused by other party."
-msgstr ""
+msgstr "Byli jsme odloženi protistranou."
 
 #: ../coreapi/callbacks.c:475
-#, fuzzy
 msgid "Call is updated by remote."
-msgstr "Hovor byl aktualizován protistranou"
+msgstr "Hovor byl aktualizován protistranou."
 
 #: ../coreapi/callbacks.c:544
 msgid "Call terminated."
@@ -1791,7 +1765,7 @@ msgstr "Přesměrováno"
 
 #: ../coreapi/callbacks.c:627
 msgid "Incompatible media parameters."
-msgstr ""
+msgstr "Neslučitelné parametry médií."
 
 #: ../coreapi/callbacks.c:633
 msgid "Call failed."
index 44c1e66ea660fed6af7eecac03366aa44b0a9338..855048c94800303309554fdab920b98b9044fddd 100644 (file)
--- 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: 2013-04-08 16:59+0200\n"
+"POT-Creation-Date: 2013-04-24 14:04+0200\n"
 "PO-Revision-Date: 2012-11-07 19:27+0100\n"
 "Last-Translator: Gerhard Stengel <gstengel@gmx.net>\n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
@@ -96,7 +96,7 @@ msgstr "Eigenes Telefon"
 msgid "Couldn't find pixmap file: %s"
 msgstr "Pixmapdatei %s kann nicht gefunden werden."
 
-#: ../gtk/chat.c:324 ../gtk/friendlist.c:872
+#: ../gtk/chat.c:336 ../gtk/friendlist.c:872
 msgid "Invalid sip contact !"
 msgstr "Ungültiger SIP-Kontakt!"
 
@@ -165,11 +165,11 @@ msgstr ""
 msgid "Call error"
 msgstr "Anruf fehlgeschlagen"
 
-#: ../gtk/main.c:1129 ../coreapi/linphonecore.c:3189
+#: ../gtk/main.c:1129 ../coreapi/linphonecore.c:3210
 msgid "Call ended"
 msgstr "Anruf beendet"
 
-#: ../gtk/main.c:1132 ../coreapi/linphonecore.c:239
+#: ../gtk/main.c:1132 ../coreapi/linphonecore.c:240
 msgid "Incoming call"
 msgstr "Eingehender Anruf"
 
@@ -1492,19 +1492,19 @@ msgstr ""
 msgid "1"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:227
+#: ../coreapi/linphonecore.c:228
 msgid "aborted"
 msgstr "abgebrochen"
 
-#: ../coreapi/linphonecore.c:230
+#: ../coreapi/linphonecore.c:231
 msgid "completed"
 msgstr "beendet"
 
-#: ../coreapi/linphonecore.c:233
+#: ../coreapi/linphonecore.c:234
 msgid "missed"
 msgstr "entgangen"
 
-#: ../coreapi/linphonecore.c:238
+#: ../coreapi/linphonecore.c:239
 #, c-format
 msgid ""
 "%s at %s\n"
@@ -1519,23 +1519,23 @@ msgstr ""
 "Status: %s\n"
 "Dauer: %i min %i sec\n"
 
-#: ../coreapi/linphonecore.c:239
+#: ../coreapi/linphonecore.c:240
 msgid "Outgoing call"
 msgstr "Abgehender Anruf"
 
-#: ../coreapi/linphonecore.c:1312
+#: ../coreapi/linphonecore.c:1321
 msgid "Ready"
 msgstr "Bereit"
 
-#: ../coreapi/linphonecore.c:2184
+#: ../coreapi/linphonecore.c:2205
 msgid "Looking for telephone number destination..."
 msgstr "Telefonnummernziel wird gesucht..."
 
-#: ../coreapi/linphonecore.c:2187
+#: ../coreapi/linphonecore.c:2208
 msgid "Could not resolve this number."
 msgstr "Diese Nummer kann nicht aufgelöst werden."
 
-#: ../coreapi/linphonecore.c:2231
+#: ../coreapi/linphonecore.c:2252
 msgid ""
 "Could not parse given sip address. A sip url usually looks like sip:"
 "user@domain"
@@ -1543,47 +1543,47 @@ msgstr ""
 "SIP-Adresse kann nicht eingelesen werden. Eine SIP-Adresse hat folgenden "
 "Aufbau <sip:benutzername@domainname>"
 
-#: ../coreapi/linphonecore.c:2432
+#: ../coreapi/linphonecore.c:2453
 msgid "Contacting"
 msgstr "Verbindungsaufbau"
 
-#: ../coreapi/linphonecore.c:2439
+#: ../coreapi/linphonecore.c:2460
 msgid "Could not call"
 msgstr "Anruf kann nicht getätigt werden."
 
-#: ../coreapi/linphonecore.c:2549
+#: ../coreapi/linphonecore.c:2570
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "Die maximale Anzahl der gleichzeitigen Anrufe ist erreicht."
 
-#: ../coreapi/linphonecore.c:2731
+#: ../coreapi/linphonecore.c:2752
 msgid "is contacting you"
 msgstr "ruft Sie an"
 
-#: ../coreapi/linphonecore.c:2732
+#: ../coreapi/linphonecore.c:2753
 msgid " and asked autoanswer."
 msgstr " und fragt nach automatischer Antwort."
 
-#: ../coreapi/linphonecore.c:2732
+#: ../coreapi/linphonecore.c:2753
 msgid "."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2799
+#: ../coreapi/linphonecore.c:2820
 msgid "Modifying call parameters..."
 msgstr "Die Anrufparameter werden verändert..."
 
-#: ../coreapi/linphonecore.c:3138
+#: ../coreapi/linphonecore.c:3159
 msgid "Connected."
 msgstr "Verbunden."
 
-#: ../coreapi/linphonecore.c:3166
+#: ../coreapi/linphonecore.c:3187
 msgid "Call aborted"
 msgstr "Anruf abgebrochen"
 
-#: ../coreapi/linphonecore.c:3357
+#: ../coreapi/linphonecore.c:3378
 msgid "Could not pause the call"
 msgstr "Anruf kann nicht gehalten werden"
 
-#: ../coreapi/linphonecore.c:3362
+#: ../coreapi/linphonecore.c:3383
 msgid "Pausing the current call..."
 msgstr "Aktueller Anruf wird gehalten..."
 
@@ -1802,7 +1802,7 @@ msgstr "Registrierung auf %s fehlgeschlagen: %s"
 msgid "Authentication token is %s"
 msgstr "Authentifizierungs-Token ist %s"
 
-#: ../coreapi/linphonecall.c:2319
+#: ../coreapi/linphonecall.c:2355
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
index 90fa0f926c1c684abbb59c6c1e4868629f5059eb..474f630f4ec3e9b3e12bba61caa6fc19aabeca1c 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Linphone 0.9.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-08 16:59+0200\n"
+"POT-Creation-Date: 2013-04-24 14:04+0200\n"
 "PO-Revision-Date: 2012-12-06 15:54+0100\n"
 "Last-Translator: BERAUDO Guillaume <guillaume.beraudo@linphone.org>\n"
 "Language-Team: es <es@li.org>\n"
@@ -101,7 +101,7 @@ msgstr "Yo"
 msgid "Couldn't find pixmap file: %s"
 msgstr "No se pudo encontrar el archivo pixmap: %s"
 
-#: ../gtk/chat.c:324 ../gtk/friendlist.c:872
+#: ../gtk/chat.c:336 ../gtk/friendlist.c:872
 msgid "Invalid sip contact !"
 msgstr "¡Contacto SIP no válido!"
 
@@ -170,12 +170,12 @@ msgstr ""
 msgid "Call error"
 msgstr "Error en la llamada."
 
-#: ../gtk/main.c:1129 ../coreapi/linphonecore.c:3189
+#: ../gtk/main.c:1129 ../coreapi/linphonecore.c:3210
 #, fuzzy
 msgid "Call ended"
 msgstr "Llamada terminada"
 
-#: ../gtk/main.c:1132 ../coreapi/linphonecore.c:239
+#: ../gtk/main.c:1132 ../coreapi/linphonecore.c:240
 msgid "Incoming call"
 msgstr "Llamada entrante"
 
@@ -1572,19 +1572,19 @@ msgstr "2"
 msgid "1"
 msgstr "1"
 
-#: ../coreapi/linphonecore.c:227
+#: ../coreapi/linphonecore.c:228
 msgid "aborted"
 msgstr "abortada"
 
-#: ../coreapi/linphonecore.c:230
+#: ../coreapi/linphonecore.c:231
 msgid "completed"
 msgstr "completada"
 
-#: ../coreapi/linphonecore.c:233
+#: ../coreapi/linphonecore.c:234
 msgid "missed"
 msgstr "perdida"
 
-#: ../coreapi/linphonecore.c:238
+#: ../coreapi/linphonecore.c:239
 #, c-format
 msgid ""
 "%s at %s\n"
@@ -1599,24 +1599,24 @@ msgstr ""
 "Estado: %s\n"
 "Duración: %i min %i seg\n"
 
-#: ../coreapi/linphonecore.c:239
+#: ../coreapi/linphonecore.c:240
 msgid "Outgoing call"
 msgstr "Llamada saliente"
 
-#: ../coreapi/linphonecore.c:1312
+#: ../coreapi/linphonecore.c:1321
 #, fuzzy
 msgid "Ready"
 msgstr "Preparado"
 
-#: ../coreapi/linphonecore.c:2184
+#: ../coreapi/linphonecore.c:2205
 msgid "Looking for telephone number destination..."
 msgstr "Buscando el número de teléfono del destinatario…"
 
-#: ../coreapi/linphonecore.c:2187
+#: ../coreapi/linphonecore.c:2208
 msgid "Could not resolve this number."
 msgstr "No se ha podido resolver este número."
 
-#: ../coreapi/linphonecore.c:2231
+#: ../coreapi/linphonecore.c:2252
 #, fuzzy
 msgid ""
 "Could not parse given sip address. A sip url usually looks like sip:"
@@ -1625,51 +1625,51 @@ msgstr ""
 "Dirección SIP mal escrita. Una dirección SIP es del tipo <sip:"
 "username@domainname>"
 
-#: ../coreapi/linphonecore.c:2432
+#: ../coreapi/linphonecore.c:2453
 #, fuzzy
 msgid "Contacting"
 msgstr "Contactando"
 
-#: ../coreapi/linphonecore.c:2439
+#: ../coreapi/linphonecore.c:2460
 #, fuzzy
 msgid "Could not call"
 msgstr "No se pudo llamar"
 
-#: ../coreapi/linphonecore.c:2549
+#: ../coreapi/linphonecore.c:2570
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "Disculpe, se ha alcanzado el máximo número de llamadas simultáneas"
 
-#: ../coreapi/linphonecore.c:2731
+#: ../coreapi/linphonecore.c:2752
 #, fuzzy
 msgid "is contacting you"
 msgstr "le está llamando"
 
-#: ../coreapi/linphonecore.c:2732
+#: ../coreapi/linphonecore.c:2753
 msgid " and asked autoanswer."
 msgstr "y ha solicitado auto respuesta."
 
-#: ../coreapi/linphonecore.c:2732
+#: ../coreapi/linphonecore.c:2753
 msgid "."
 msgstr "."
 
-#: ../coreapi/linphonecore.c:2799
+#: ../coreapi/linphonecore.c:2820
 msgid "Modifying call parameters..."
 msgstr "Modificando parámetros de llamada…"
 
-#: ../coreapi/linphonecore.c:3138
+#: ../coreapi/linphonecore.c:3159
 msgid "Connected."
 msgstr "Conectado."
 
-#: ../coreapi/linphonecore.c:3166
+#: ../coreapi/linphonecore.c:3187
 #, fuzzy
 msgid "Call aborted"
 msgstr "Llamada abortada"
 
-#: ../coreapi/linphonecore.c:3357
+#: ../coreapi/linphonecore.c:3378
 msgid "Could not pause the call"
 msgstr "No se pudo pausar la llamada"
 
-#: ../coreapi/linphonecore.c:3362
+#: ../coreapi/linphonecore.c:3383
 msgid "Pausing the current call..."
 msgstr "Pausando la llamada actual..."
 
@@ -1898,7 +1898,7 @@ msgstr "El registro en %s ha fallado."
 msgid "Authentication token is %s"
 msgstr "El tóken de autenticación es%s"
 
-#: ../coreapi/linphonecall.c:2319
+#: ../coreapi/linphonecall.c:2355
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
index 48e85b46b39bfa0bd4c17ae3c401e89e13e3937a..02c1f8fca149d80850d1f0423cc623b222ded611 100644 (file)
--- 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: 2013-04-08 16:59+0200\n"
+"POT-Creation-Date: 2013-04-24 14:04+0200\n"
 "PO-Revision-Date: 2013-04-09 13:57+0100\n"
 "Last-Translator: Simon Morlat <simon.morlat@linphone.org> \n"
 "Language-Team: french <fr@li.org>\n"
@@ -15,14 +15,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../gtk/calllogs.c:139
-#: ../gtk/friendlist.c:922
+#: ../gtk/calllogs.c:139 ../gtk/friendlist.c:922
 #, c-format
 msgid "Call %s"
 msgstr "Appeler %s"
 
-#: ../gtk/calllogs.c:140
-#: ../gtk/friendlist.c:923
+#: ../gtk/calllogs.c:140 ../gtk/friendlist.c:923
 #, c-format
 msgid "Send text to %s"
 msgstr "Chatter avec %s"
@@ -62,8 +60,7 @@ msgid_plural "%i seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gtk/calllogs.c:321
-#: ../gtk/calllogs.c:327
+#: ../gtk/calllogs.c:321 ../gtk/calllogs.c:327
 #, c-format
 msgid "<big><b>%s</b></big>\t%s"
 msgstr ""
@@ -84,8 +81,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../gtk/conference.c:38
-#: ../gtk/main.ui.h:13
+#: ../gtk/conference.c:38 ../gtk/main.ui.h:13
 msgid "Conference"
 msgstr "Conférence"
 
@@ -93,15 +89,12 @@ msgstr "Conférence"
 msgid "Me"
 msgstr "Moi"
 
-#: ../gtk/support.c:49
-#: ../gtk/support.c:73
-#: ../gtk/support.c:102
+#: ../gtk/support.c:49 ../gtk/support.c:73 ../gtk/support.c:102
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "Icone non trouvée: %s"
 
-#: ../gtk/chat.c:324
-#: ../gtk/friendlist.c:872
+#: ../gtk/chat.c:336 ../gtk/friendlist.c:872
 msgid "Invalid sip contact !"
 msgstr "Contact sip invalide !"
 
@@ -130,8 +123,12 @@ msgid "if set automatically answer incoming calls"
 msgstr "si positionné, répond automatiquement aux appels entrants"
 
 #: ../gtk/main.c:134
-msgid "Specifiy a working directory (should be the base of the installation, eg: c:\\Program Files\\Linphone)"
-msgstr "Spécifie un répertoire de travail (qui devrait être le répertoire d'installation, par exemple c:\\Program Files\\Linphone)"
+msgid ""
+"Specifiy a working directory (should be the base of the installation, eg: c:"
+"\\Program Files\\Linphone)"
+msgstr ""
+"Spécifie un répertoire de travail (qui devrait être le répertoire "
+"d'installation, par exemple c:\\Program Files\\Linphone)"
 
 #: ../gtk/main.c:515
 #, c-format
@@ -142,12 +139,15 @@ msgstr "Appel avec %s"
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"
-"Would you allow him to see your presence status or add him to your contact list ?\n"
+"Would you allow him to see your presence status or add him to your contact "
+"list ?\n"
 "If you answer no, this person will be temporarily blacklisted."
 msgstr ""
 "%s souhaite vous ajouter à sa liste de contact.\n"
-"Souhaitez vous l'autoriser à voir votre information de présence et l'ajouter à votre liste également ?\n"
-"Si vous répondez non, cette personne sera mise temporairement sur liste noire."
+"Souhaitez vous l'autoriser à voir votre information de présence et l'ajouter "
+"à votre liste également ?\n"
+"Si vous répondez non, cette personne sera mise temporairement sur liste "
+"noire."
 
 #: ../gtk/main.c:1023
 #, c-format
@@ -162,24 +162,19 @@ msgstr ""
 msgid "Call error"
 msgstr "Erreur lors de l'appel"
 
-#: ../gtk/main.c:1129
-#: ../coreapi/linphonecore.c:3189
+#: ../gtk/main.c:1129 ../coreapi/linphonecore.c:3210
 msgid "Call ended"
 msgstr "Appel terminé."
 
-#: ../gtk/main.c:1132
-#: ../coreapi/linphonecore.c:239
+#: ../gtk/main.c:1132 ../coreapi/linphonecore.c:240
 msgid "Incoming call"
 msgstr "Appel entrant"
 
-#: ../gtk/main.c:1134
-#: ../gtk/incall_view.c:497
-#: ../gtk/main.ui.h:5
+#: ../gtk/main.c:1134 ../gtk/incall_view.c:497 ../gtk/main.ui.h:5
 msgid "Answer"
 msgstr "Répondre"
 
-#: ../gtk/main.c:1136
-#: ../gtk/main.ui.h:6
+#: ../gtk/main.c:1136 ../gtk/main.ui.h:6
 msgid "Decline"
 msgstr "Refuser"
 
@@ -210,8 +205,7 @@ msgstr "Linphone - un téléphone video pour l'internet"
 msgid "%s (Default)"
 msgstr "%s (par défaut)"
 
-#: ../gtk/main.c:1796
-#: ../coreapi/callbacks.c:810
+#: ../gtk/main.c:1796 ../coreapi/callbacks.c:810
 #, c-format
 msgid "We are transferred to %s"
 msgstr "Transfert vers %s"
@@ -236,9 +230,7 @@ msgstr "Ajouter au carnet d'adresse"
 msgid "Presence status"
 msgstr "Info de présence"
 
-#: ../gtk/friendlist.c:661
-#: ../gtk/propertybox.c:367
-#: ../gtk/contact.ui.h:1
+#: ../gtk/friendlist.c:661 ../gtk/propertybox.c:367 ../gtk/contact.ui.h:1
 msgid "Name"
 msgstr "Nom"
 
@@ -291,13 +283,11 @@ msgstr "Débit min. (kbit/s)"
 msgid "Parameters"
 msgstr "Paramètres"
 
-#: ../gtk/propertybox.c:435
-#: ../gtk/propertybox.c:578
+#: ../gtk/propertybox.c:435 ../gtk/propertybox.c:578
 msgid "Enabled"
 msgstr "Activé"
 
-#: ../gtk/propertybox.c:437
-#: ../gtk/propertybox.c:578
+#: ../gtk/propertybox.c:437 ../gtk/propertybox.c:578
 msgid "Disabled"
 msgstr "Désactivé"
 
@@ -378,8 +368,11 @@ msgid "Serbian"
 msgstr "Serbe"
 
 #: ../gtk/propertybox.c:848
-msgid "You need to restart linphone for the new language selection to take effect."
-msgstr "La nouvelle selection de langue prendra effet au prochain démarrage de linphone."
+msgid ""
+"You need to restart linphone for the new language selection to take effect."
+msgstr ""
+"La nouvelle selection de langue prendra effet au prochain démarrage de "
+"linphone."
 
 #: ../gtk/propertybox.c:934
 msgid "None"
@@ -400,7 +393,8 @@ msgid ""
 "Would you like to open a browser to download it ?"
 msgstr ""
 "Une version plus récente est disponible sur %s.\n"
-"Voulez vous ouvrir le navigateur afin de pouvoir télécharger la dernière version ?"
+"Voulez vous ouvrir le navigateur afin de pouvoir télécharger la dernière "
+"version ?"
 
 #: ../gtk/update.c:91
 msgid "You are running the lastest version."
@@ -461,8 +455,7 @@ msgstr "Entrez votre identifiant linphone.org"
 msgid "Username:"
 msgstr "Nom d'utilisateur:"
 
-#: ../gtk/setupwizard.c:94
-#: ../gtk/password.ui.h:4
+#: ../gtk/setupwizard.c:94 ../gtk/password.ui.h:4
 msgid "Password:"
 msgstr "Mot de passe:"
 
@@ -511,7 +504,8 @@ msgid ""
 "Error, account not validated, username already used or server unreachable.\n"
 "Please go back and try again."
 msgstr ""
-"Erreur, le compte n'est pas validé, l'identifiant est déjà utilisé ou le serveur n'est pas accessible.\n"
+"Erreur, le compte n'est pas validé, l'identifiant est déjà utilisé ou le "
+"serveur n'est pas accessible.\n"
 "Merci d'essayer à nouveau."
 
 #: ../gtk/setupwizard.c:380
@@ -520,10 +514,12 @@ msgstr "Merci. Votre compte est maintenant configuré et prêt à être utilisé
 
 #: ../gtk/setupwizard.c:388
 msgid ""
-"Please validate your account by clicking on the link we just sent you by email.\n"
+"Please validate your account by clicking on the link we just sent you by "
+"email.\n"
 "Then come back here and press Next button."
 msgstr ""
-"Merci de valider votre compte en cliquant sur le lien que nous avons envoyé par email.\n"
+"Merci de valider votre compte en cliquant sur le lien que nous avons envoyé "
+"par email.\n"
 "Puis appuyez sur suivant."
 
 #: ../gtk/setupwizard.c:564
@@ -558,8 +554,7 @@ msgstr "Erreur"
 msgid "Terminating"
 msgstr "En cours d’arrêt."
 
-#: ../gtk/incall_view.c:70
-#: ../gtk/incall_view.c:94
+#: ../gtk/incall_view.c:70 ../gtk/incall_view.c:94
 #, c-format
 msgid "Call #%i"
 msgstr "Appel #%i"
@@ -569,8 +564,7 @@ msgstr "Appel #%i"
 msgid "Transfer to call #%i with %s"
 msgstr "Transférer vers l'appel #%i avec %s"
 
-#: ../gtk/incall_view.c:210
-#: ../gtk/incall_view.c:213
+#: ../gtk/incall_view.c:210 ../gtk/incall_view.c:213
 #, fuzzy
 msgid "Not used"
 msgstr "Non trouvé"
@@ -621,13 +615,11 @@ msgstr "uPnP en cours d’exécution"
 msgid "uPnP failed"
 msgstr "uPnP a échoué."
 
-#: ../gtk/incall_view.c:256
-#: ../gtk/incall_view.c:257
+#: ../gtk/incall_view.c:256 ../gtk/incall_view.c:257
 msgid "Direct or through server"
 msgstr "Directe ou via un serveur"
 
-#: ../gtk/incall_view.c:259
-#: ../gtk/incall_view.c:265
+#: ../gtk/incall_view.c:259 ../gtk/incall_view.c:265
 #, c-format
 msgid ""
 "download: %f\n"
@@ -639,8 +631,7 @@ msgstr ""
 msgid "%.3f seconds"
 msgstr ""
 
-#: ../gtk/incall_view.c:384
-#: ../gtk/main.ui.h:12
+#: ../gtk/incall_view.c:384 ../gtk/main.ui.h:12
 msgid "Hang up"
 msgstr "Raccrocher"
 
@@ -648,8 +639,7 @@ msgstr "Raccrocher"
 msgid "<b>Calling...</b>"
 msgstr "<b>Tentative d'appel...</b>"
 
-#: ../gtk/incall_view.c:479
-#: ../gtk/incall_view.c:689
+#: ../gtk/incall_view.c:479 ../gtk/incall_view.c:689
 msgid "00::00::00"
 msgstr ""
 
@@ -677,8 +667,7 @@ msgstr "très faible"
 msgid "too bad"
 msgstr "nulle"
 
-#: ../gtk/incall_view.c:536
-#: ../gtk/incall_view.c:552
+#: ../gtk/incall_view.c:536 ../gtk/incall_view.c:552
 msgid "unavailable"
 msgstr "indisponible"
 
@@ -695,8 +684,7 @@ msgstr "Sécurisé par ZRTP- [jeton: %s]"
 msgid "Set unverified"
 msgstr "Marquer comme non vérifié"
 
-#: ../gtk/incall_view.c:663
-#: ../gtk/main.ui.h:4
+#: ../gtk/incall_view.c:663 ../gtk/main.ui.h:4
 msgid "Set verified"
 msgstr "Marquer comme vérifié"
 
@@ -737,8 +725,7 @@ msgstr "Transfert échoué"
 msgid "Resume"
 msgstr "Reprendre"
 
-#: ../gtk/incall_view.c:835
-#: ../gtk/main.ui.h:9
+#: ../gtk/incall_view.c:835 ../gtk/main.ui.h:9
 msgid "Pause"
 msgstr "Pause"
 
@@ -843,13 +830,11 @@ msgstr "Démarrer un nouvel appel"
 msgid "Contacts"
 msgstr "Contacts"
 
-#: ../gtk/main.ui.h:28
-#: ../gtk/parameters.ui.h:50
+#: ../gtk/main.ui.h:28 ../gtk/parameters.ui.h:50
 msgid "Add"
 msgstr "Ajouter"
 
-#: ../gtk/main.ui.h:29
-#: ../gtk/parameters.ui.h:51
+#: ../gtk/main.ui.h:29 ../gtk/parameters.ui.h:51
 msgid "Edit"
 msgstr "Editer"
 
@@ -873,13 +858,11 @@ msgstr "Appels récents"
 msgid "My current identity:"
 msgstr "Mon identité sip:"
 
-#: ../gtk/main.ui.h:35
-#: ../gtk/tunnel_config.ui.h:7
+#: ../gtk/main.ui.h:35 ../gtk/tunnel_config.ui.h:7
 msgid "Username"
 msgstr "Nom d'utilisateur"
 
-#: ../gtk/main.ui.h:36
-#: ../gtk/tunnel_config.ui.h:8
+#: ../gtk/main.ui.h:36 ../gtk/tunnel_config.ui.h:8
 msgid "Password"
 msgstr "Mot de passe"
 
@@ -1066,8 +1049,7 @@ msgstr "Codecs audio"
 msgid "Video codecs"
 msgstr "Codecs vidéo"
 
-#: ../gtk/parameters.ui.h:7
-#: ../gtk/keypad.ui.h:5
+#: ../gtk/parameters.ui.h:7 ../gtk/keypad.ui.h:5
 msgid "C"
 msgstr ""
 
@@ -1218,7 +1200,9 @@ msgstr "Paramètres multimedia"
 
 #: ../gtk/parameters.ui.h:44
 msgid "This section defines your SIP address when not using a SIP account"
-msgstr "Cette rubrique permet de définir son adresse SIP lorsqu'on ne possède pas de compte SIP"
+msgstr ""
+"Cette rubrique permet de définir son adresse SIP lorsqu'on ne possède pas de "
+"compte SIP"
 
 #: ../gtk/parameters.ui.h:45
 msgid "Your display name (eg: John Doe):"
@@ -1260,13 +1244,11 @@ msgstr "<b>Sécurité</b>"
 msgid "Manage SIP Accounts"
 msgstr "Gérer mes comptes SIP"
 
-#: ../gtk/parameters.ui.h:57
-#: ../gtk/tunnel_config.ui.h:4
+#: ../gtk/parameters.ui.h:57 ../gtk/tunnel_config.ui.h:4
 msgid "Enable"
 msgstr "Activer"
 
-#: ../gtk/parameters.ui.h:58
-#: ../gtk/tunnel_config.ui.h:5
+#: ../gtk/parameters.ui.h:58 ../gtk/tunnel_config.ui.h:5
 msgid "Disable"
 msgstr "Désactiver"
 
@@ -1291,8 +1273,13 @@ msgid "Enable adaptive rate control"
 msgstr "Activer le control de débit adaptatif."
 
 #: ../gtk/parameters.ui.h:64
-msgid "<i>Adaptive rate control is a technique to dynamically guess the available bandwidth during a call.</i>"
-msgstr "<i>Le control de débit adaptatif est une technique pour adapter la qualité de l'audio et de la video en fonction de la bande passante disponible, durant l'appel.</i>"
+msgid ""
+"<i>Adaptive rate control is a technique to dynamically guess the available "
+"bandwidth during a call.</i>"
+msgstr ""
+"<i>Le control de débit adaptatif est une technique pour adapter la qualité "
+"de l'audio et de la video en fonction de la bande passante disponible, "
+"durant l'appel.</i>"
 
 #: ../gtk/parameters.ui.h:65
 msgid "<b>Bandwidth control</b>"
@@ -1481,19 +1468,19 @@ msgstr ""
 msgid "1"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:227
+#: ../coreapi/linphonecore.c:228
 msgid "aborted"
 msgstr "abandonné"
 
-#: ../coreapi/linphonecore.c:230
+#: ../coreapi/linphonecore.c:231
 msgid "completed"
 msgstr "terminé"
 
-#: ../coreapi/linphonecore.c:233
+#: ../coreapi/linphonecore.c:234
 msgid "missed"
 msgstr "manqué"
 
-#: ../coreapi/linphonecore.c:238
+#: ../coreapi/linphonecore.c:239
 #, c-format
 msgid ""
 "%s at %s\n"
@@ -1508,67 +1495,70 @@ msgstr ""
 "Etat: %s\n"
 "Durée: %i mn %i sec\n"
 
-#: ../coreapi/linphonecore.c:239
+#: ../coreapi/linphonecore.c:240
 msgid "Outgoing call"
 msgstr "Appel sortant"
 
-#: ../coreapi/linphonecore.c:1312
+#: ../coreapi/linphonecore.c:1321
 msgid "Ready"
 msgstr "Prêt."
 
-#: ../coreapi/linphonecore.c:2184
+#: ../coreapi/linphonecore.c:2205
 msgid "Looking for telephone number destination..."
 msgstr "Recherche de la destination du numéro de téléphone..."
 
-#: ../coreapi/linphonecore.c:2187
+#: ../coreapi/linphonecore.c:2208
 msgid "Could not resolve this number."
 msgstr "La destination n'a pu être trouvée."
 
-#: ../coreapi/linphonecore.c:2231
-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 à <sip:nom@domaine>"
+#: ../coreapi/linphonecore.c:2252
+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 à <sip:nom@domaine>"
 
-#: ../coreapi/linphonecore.c:2432
+#: ../coreapi/linphonecore.c:2453
 msgid "Contacting"
 msgstr "Appel de"
 
-#: ../coreapi/linphonecore.c:2439
+#: ../coreapi/linphonecore.c:2460
 msgid "Could not call"
 msgstr "Echec de l'appel"
 
-#: ../coreapi/linphonecore.c:2549
+#: ../coreapi/linphonecore.c:2570
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "Désolé, le nombre maximum d'appels simultanés est atteint."
 
-#: ../coreapi/linphonecore.c:2731
+#: ../coreapi/linphonecore.c:2752
 msgid "is contacting you"
 msgstr "vous appelle"
 
-#: ../coreapi/linphonecore.c:2732
+#: ../coreapi/linphonecore.c:2753
 msgid " and asked autoanswer."
 msgstr "et sollicite un décrochage automatique."
 
-#: ../coreapi/linphonecore.c:2732
+#: ../coreapi/linphonecore.c:2753
 msgid "."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2799
+#: ../coreapi/linphonecore.c:2820
 msgid "Modifying call parameters..."
 msgstr "Modifications des paramètres d'appels..."
 
-#: ../coreapi/linphonecore.c:3138
+#: ../coreapi/linphonecore.c:3159
 msgid "Connected."
 msgstr "En ligne."
 
-#: ../coreapi/linphonecore.c:3166
+#: ../coreapi/linphonecore.c:3187
 msgid "Call aborted"
 msgstr "Appel abandonné"
 
-#: ../coreapi/linphonecore.c:3357
+#: ../coreapi/linphonecore.c:3378
 msgid "Could not pause the call"
 msgstr "La mise en attente a échoué"
 
-#: ../coreapi/linphonecore.c:3362
+#: ../coreapi/linphonecore.c:3383
 msgid "Pausing the current call..."
 msgstr "Mise en attente de l'appel..."
 
@@ -1654,8 +1644,12 @@ msgid "Unknown-bug"
 msgstr "Bug inconnu"
 
 #: ../coreapi/proxy.c:204
-msgid "The sip proxy address you entered is invalid, it must start with \"sip:\" followed by a hostname."
-msgstr "L'adresse SIP du proxy est invalide. Elle doit commencer par \"sip:\" suivie par un nom de domaine."
+msgid ""
+"The sip proxy address you entered is invalid, it must start with \"sip:\" "
+"followed by a hostname."
+msgstr ""
+"L'adresse SIP du proxy est invalide. Elle doit commencer par \"sip:\" suivie "
+"par un nom de domaine."
 
 #: ../coreapi/proxy.c:210
 msgid ""
@@ -1663,7 +1657,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:1069
 #, c-format
@@ -1784,7 +1779,7 @@ msgstr "Echec de l'enregistrement sur %s: %s"
 msgid "Authentication token is %s"
 msgstr "Le jeton d'authentification est %s"
 
-#: ../coreapi/linphonecall.c:2319
+#: ../coreapi/linphonecall.c:2355
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
index b8b2895b816d1f56898979f636ae047452912e35..32e51337ce05b62f34e6d94494fa38f3779d36f5 100644 (file)
--- a/po/he.po
+++ b/po/he.po
@@ -2,16 +2,16 @@
 # Copyright (C) Belledonne Communications,2010
 # This file is distributed under the same license as the linphone package.
 # Eli Zaretskii <eliz@gnu.org>, 2012.
-# Isratine Citizen <genghiskhan@gmx.ca>, 2012.
+# Isratine Citizen <genghiskhan@gmx.ca>, 2012, 2013.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Linphone 3.5.2\n"
+"Project-Id-Version: Linphone 3.5.99.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-04-08 16:59+0200\n"
-"PO-Revision-Date: 2012-12-27 10:14+0200\n"
+"PO-Revision-Date: 2013-04-24 21:31+0200\n"
 "Last-Translator: Isratine Citizen <genghiskhan@gmx.ca>\n"
-"Language-Team: Rahut <genghiskhan@gmx.ca>\n"
+"Language-Team: Rahut Project <http://sourceforge.net/projects/rahut/>\n"
 "Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,29 +31,25 @@ msgid "Send text to %s"
 msgstr "שלח טקסט אל %s"
 
 #: ../gtk/calllogs.c:223
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Recent calls (%i)</b>"
-msgstr "<b>×\91ש×\99×\97×\94 ×\9bעת</b>"
+msgstr "<b>ש×\99×\97×\95ת ×\90×\97ר×\95× ×\95ת (%i)</b>"
 
 #: ../gtk/calllogs.c:300
 msgid "n/a"
 msgstr "לא זמין (n/a)"
 
 #: ../gtk/calllogs.c:303
-#, fuzzy
 msgid "Aborted"
 msgstr "ננטשה"
 
 #: ../gtk/calllogs.c:306
-#, fuzzy
 msgid "Missed"
 msgstr "הוחמצה"
 
-# דחיה
 #: ../gtk/calllogs.c:309
-#, fuzzy
 msgid "Declined"
-msgstr "×\9c×\93×\97×\95ת"
+msgstr "× ×\93×\97ת×\94"
 
 #: ../gtk/calllogs.c:315
 #, c-format
@@ -70,29 +66,25 @@ msgstr[0] "שניה %i"
 msgstr[1] "%i שניות"
 
 #: ../gtk/calllogs.c:321 ../gtk/calllogs.c:327
-#, fuzzy, c-format
+#, c-format
 msgid "<big><b>%s</b></big>\t%s"
 msgstr ""
-"<big><b>%s</b></big>\t<small><i>%s</i>\t<i>איכות: %s</i></small>\n"
-"%s\t%s %s\t"
 
 #: ../gtk/calllogs.c:323
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<small><i>%s</i>\t<i>Quality: %s</i></small>\n"
 "%s\t%s\t"
 msgstr ""
-"<big><b>%s</b></big>\t<small><i>%s</i>\t<i>איכות: %s</i></small>\n"
-"%s\t%s %s\t"
+"<small><i>%s</i>\t<i>איכות: %s</i></small>\n"
+"%s\t%s\t"
 
 #: ../gtk/calllogs.c:329
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<small><i>%s</i></small>\t\n"
 "%s"
 msgstr ""
-"<big><b>%s</b></big>\t<small><i>%s</i>\t<i>איכות: %s</i></small>\n"
-"%s\t%s %s\t"
 
 #: ../gtk/conference.c:38 ../gtk/main.ui.h:13
 msgid "Conference"
@@ -124,9 +116,11 @@ msgstr "רשום אל stdout מידע ניפוי שגיאות מסוים בזמ
 msgid "path to a file to write logs into."
 msgstr "נתיב אל קובץ שברצונך לרשום אליו את הרשומות."
 
+# cli
 #: ../gtk/main.c:106
+#, fuzzy
 msgid "Start linphone with video disabled."
-msgstr ""
+msgstr "התחל את לינפון עם וידאו מנוטרל."
 
 # cli
 #: ../gtk/main.c:113
@@ -214,14 +208,14 @@ msgid "Call paused"
 msgstr "שיחה הושהתה"
 
 #: ../gtk/main.c:1142
-#, fuzzy, c-format
+#, c-format
 msgid "<b>by %s</b>"
-msgstr "<b>Ports utilisés</b>"
+msgstr "<b>על ידי %s</b>"
 
 #: ../gtk/main.c:1191
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
-msgstr ""
+msgstr "‏%s רוצה להתחיל וידאו. האם אתה מסכים ?"
 
 #: ../gtk/main.c:1353
 msgid "Website link"
@@ -232,10 +226,11 @@ msgstr "קישור אתר רשת"
 msgid "Linphone - a video internet phone"
 msgstr "‫Linphone - וידאופון אינטרנטי"
 
+# משתמטת
 #: ../gtk/main.c:1494
 #, c-format
 msgid "%s (Default)"
-msgstr "â\80«%s (×\9eשת×\9e×\98ת)"
+msgstr "â\80«%s (×\91ר×\99רת ×\9e×\97×\93×\9c)"
 
 #: ../gtk/main.c:1796 ../coreapi/callbacks.c:810
 #, c-format
@@ -249,7 +244,7 @@ msgid ""
 "You won't be able to send or receive audio calls."
 msgstr ""
 "לא אותרו כרטיסי קול במחשב זה.\n"
-"×\9c×\90 ×ª×\94×\99×\94 ×\91×\99×\9b×\95×\9cת×\9a ×\9cש×\9c×\95×\97 ×\90×\95 ×\9cק×\91×\9c ×©×\99×\97×\95ת ×©×\9e×¢."
+"×\9c×\90 ×ª×\94×\99×\94 ×\91×\99×\9b×\95×\9cת×\9a ×\9cש×\9c×\95×\97 ×\90×\95 ×\9cק×\91×\9c ×©×\99×\97×\95ת ×\90×\95×\93×\99×\95."
 
 #: ../gtk/main.c:1911
 msgid "A free SIP video-phone"
@@ -273,7 +268,7 @@ msgstr "קריאה"
 
 #: ../gtk/friendlist.c:678
 msgid "Chat"
-msgstr ""
+msgstr "שיחה"
 
 # a name or a number
 #: ../gtk/friendlist.c:708
@@ -292,9 +287,9 @@ msgid "Delete contact '%s'"
 msgstr "מחק איש קשר '%s'"
 
 #: ../gtk/friendlist.c:926
-#, fuzzy, c-format
+#, c-format
 msgid "Delete chat history of '%s'"
-msgstr "×\9e×\97ק ×\90×\99ש ×§×©×¨ '%s'"
+msgstr "×\9e×\97ק ×\94×\99ס×\98×\95ר×\99×\99ת ×©×\99×\97×\94 ×©×\9c '%s'"
 
 #: ../gtk/friendlist.c:977
 #, c-format
@@ -319,10 +314,12 @@ msgstr "קצב נתונים מינימלי (קי״ב/שנ׳)"
 msgid "Parameters"
 msgstr "פרמטרים"
 
+# מאופשר
 #: ../gtk/propertybox.c:435 ../gtk/propertybox.c:578
 msgid "Enabled"
 msgstr "מופעל"
 
+# מנוטרל
 #: ../gtk/propertybox.c:437 ../gtk/propertybox.c:578
 msgid "Disabled"
 msgstr "לא מופעל"
@@ -399,11 +396,11 @@ msgstr "norsk"
 
 #: ../gtk/propertybox.c:780
 msgid "Hebrew"
-msgstr ""
+msgstr "עברית"
 
 #: ../gtk/propertybox.c:781
 msgid "Serbian"
-msgstr ""
+msgstr "српски srpski"
 
 # selected הנבחרת
 #: ../gtk/propertybox.c:848
@@ -548,7 +545,6 @@ msgstr ""
 "שגיאה, חשבון לא אומת, שם משתמש כבר בשימוש או שרת לא ניתן להשגה.\n"
 "נא לחזור ולנסות שוב."
 
-# תודה רבה
 #: ../gtk/setupwizard.c:380
 msgid "Thank you. Your account is now configured and ready for use."
 msgstr "תודה לך. חשבונך מוגדר ומוכן לשימוש כעת."
@@ -610,63 +606,56 @@ msgid "Transfer to call #%i with %s"
 msgstr "העברה אל שיחה מס׳ %i עם %s"
 
 #: ../gtk/incall_view.c:210 ../gtk/incall_view.c:213
-#, fuzzy
 msgid "Not used"
-msgstr "×\9c×\90 × ×\9eצ×\90"
+msgstr "×\9c×\90 ×\91ש×\99×\9e×\95ש"
 
 #: ../gtk/incall_view.c:220
 msgid "ICE not activated"
-msgstr ""
+msgstr "‏ICE לא מופעלת"
 
 #: ../gtk/incall_view.c:222
-#, fuzzy
 msgid "ICE failed"
-msgstr "קריאה נכשלה."
+msgstr "‏ICE נכשלה"
 
 #: ../gtk/incall_view.c:224
 msgid "ICE in progress"
-msgstr ""
+msgstr "‏ICE מצויה כעת בעיצומה"
 
 #: ../gtk/incall_view.c:226
 msgid "Going through one or more NATs"
-msgstr ""
+msgstr "עובר דרך NAT אחד או יותר"
 
 #: ../gtk/incall_view.c:228
-#, fuzzy
 msgid "Direct"
-msgstr "×\9e×\9b×\95×\95×\9f ×\9e×\97×\93ש"
+msgstr "×\99ש×\99ר"
 
 #: ../gtk/incall_view.c:230
 msgid "Through a relay server"
-msgstr ""
+msgstr "דרך שרת ממסר"
 
 #: ../gtk/incall_view.c:238
 msgid "uPnP not activated"
-msgstr ""
+msgstr "‏uPnP לא מופעלת"
 
-# במהלך (או) באמצע חיפוש...
 #: ../gtk/incall_view.c:240
-#, fuzzy
 msgid "uPnP in progress"
-msgstr "בדיקת STUN מצויה כעת בעיצומה..."
+msgstr "‏uPnP מצויה כעת בעיצומה"
 
 #: ../gtk/incall_view.c:242
-#, fuzzy
 msgid "uPnp not available"
-msgstr "לא זמינה"
+msgstr "‏uPnp לא זמינה"
 
 #: ../gtk/incall_view.c:244
 msgid "uPnP is running"
-msgstr ""
+msgstr "‏uPnP מורצת כעת"
 
 #: ../gtk/incall_view.c:246
-#, fuzzy
 msgid "uPnP failed"
-msgstr "קריאה נכשלה."
+msgstr "‏uPnP נכשלה"
 
 #: ../gtk/incall_view.c:256 ../gtk/incall_view.c:257
 msgid "Direct or through server"
-msgstr ""
+msgstr "ישיר או דרך שרת"
 
 #: ../gtk/incall_view.c:259 ../gtk/incall_view.c:265
 #, c-format
@@ -674,15 +663,17 @@ msgid ""
 "download: %f\n"
 "upload: %f (kbit/s)"
 msgstr ""
+"הורדה: %f\n"
+"העלאה: %f (קי״ב/שנ׳)"
 
 #: ../gtk/incall_view.c:286
-#, fuzzy, c-format
+#, c-format
 msgid "%.3f seconds"
-msgstr "שניה %i"
+msgstr "%.3f שניות"
 
 #: ../gtk/incall_view.c:384 ../gtk/main.ui.h:12
 msgid "Hang up"
-msgstr ""
+msgstr "נתק"
 
 #: ../gtk/incall_view.c:476
 msgid "<b>Calling...</b>"
@@ -767,25 +758,23 @@ msgstr "<b>שיחה הסתיימה.</b>"
 
 #: ../gtk/incall_view.c:778
 msgid "Transfer in progress"
-msgstr ""
+msgstr "העברה מצויה כעת בעיצומה"
 
 #: ../gtk/incall_view.c:781
-#, fuzzy
 msgid "Transfer done."
-msgstr "העברה"
+msgstr "העברה הסתיימה."
 
 #: ../gtk/incall_view.c:784
-#, fuzzy
 msgid "Transfer failed."
-msgstr "העברה"
+msgstr "העברה נכשלה."
 
 #: ../gtk/incall_view.c:828
 msgid "Resume"
-msgstr "×\97×\96ר×\94"
+msgstr "×\97×\96×\95ר"
 
 #: ../gtk/incall_view.c:835 ../gtk/main.ui.h:9
 msgid "Pause"
-msgstr "×\94ש×\94×\99×\94"
+msgstr "השהה"
 
 #: ../gtk/incall_view.c:900
 #, c-format
@@ -793,11 +782,12 @@ msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
 msgstr ""
+"<small><i>מקליט אל תוך\n"
+"%s %s</i></small>"
 
 #: ../gtk/incall_view.c:900
-#, fuzzy
 msgid "(Paused)"
-msgstr "השהיה"
+msgstr "(מושהה)"
 
 #: ../gtk/loginframe.c:93
 #, c-format
@@ -808,32 +798,32 @@ msgstr "נא להזין מידע התחברות עבור %s"
 # זה ש: נתקשר או מתוקשר או הותקשר?
 #: ../gtk/main.ui.h:1
 msgid "<b>Callee name</b>"
-msgstr "<b>ש×\9d ×\94×\9eק×\91×\9c</b>"
+msgstr "<b>שם מקבל</b>"
 
+# שגר
 #: ../gtk/main.ui.h:2
 msgid "Send"
-msgstr "ש×\99×\92×\95ר"
+msgstr "ש×\9c×\97"
 
 #: ../gtk/main.ui.h:3
-#, fuzzy
 msgid "End conference"
-msgstr "×\91ש×\99×\97ת ועידה"
+msgstr "ס×\99×\99×\9d ועידה"
 
 #: ../gtk/main.ui.h:7
 msgid "Record this call to an audio file"
-msgstr ""
+msgstr "הקלט את שיחה זו אל קובץ אודיו"
 
 #: ../gtk/main.ui.h:8
 msgid "Video"
-msgstr ""
+msgstr "וידאו"
 
 #: ../gtk/main.ui.h:10
 msgid "Mute"
-msgstr ""
+msgstr "השתק"
 
 #: ../gtk/main.ui.h:11
 msgid "Transfer"
-msgstr "העברה"
+msgstr "העבר"
 
 #: ../gtk/main.ui.h:14
 msgid "In call"
@@ -853,7 +843,7 @@ msgstr "_אפשרויות"
 
 #: ../gtk/main.ui.h:18
 msgid "Always start video"
-msgstr ""
+msgstr "התחל תמיד וידאו"
 
 #: ../gtk/main.ui.h:19
 msgid "Enable self-view"
@@ -885,7 +875,7 @@ msgstr "כתובת SIP או מספר טלפון"
 
 #: ../gtk/main.ui.h:26
 msgid "Initiate a new call"
-msgstr "התחלת שיחה חדשה"
+msgstr "התחל שיחה חדשה"
 
 #: ../gtk/main.ui.h:27
 msgid "Contacts"
@@ -909,7 +899,7 @@ msgstr "<b>הוסף אנשי קשר מן מדור</b>"
 
 #: ../gtk/main.ui.h:32
 msgid "Add contact"
-msgstr "×\94×\95ספת איש קשר"
+msgstr "×\94×\95סף איש קשר"
 
 # קריאות אחרונות
 #: ../gtk/main.ui.h:33
@@ -969,7 +959,7 @@ msgstr "ברירת מחדל"
 
 #: ../gtk/main.ui.h:46
 msgid "Delete"
-msgstr ""
+msgstr "מחק"
 
 #: ../gtk/about.ui.h:1
 msgid "About linphone"
@@ -1035,7 +1025,7 @@ msgstr "נא להזין את סיסמת המתחם"
 
 #: ../gtk/password.ui.h:3
 msgid "UserID"
-msgstr "×\96×\94×\95ת ×\9eשת×\9eש (â\80«UID)"
+msgstr "×\9e×\96×\94×\94 ×\9eשת×\9eש"
 
 # קריאות
 #: ../gtk/call_logs.ui.h:1
@@ -1113,7 +1103,7 @@ msgstr ""
 
 #: ../gtk/parameters.ui.h:5
 msgid "Audio codecs"
-msgstr "ק×\95×\93ק×\99×\9d ×©×\9c ×©×\9e×¢"
+msgstr "ק×\95×\93ק×\99×\9d ×©×\9c ×\90×\95×\93×\99×\95"
 
 #: ../gtk/parameters.ui.h:6
 msgid "Video codecs"
@@ -1125,15 +1115,15 @@ msgstr ""
 
 #: ../gtk/parameters.ui.h:8
 msgid "SIP (UDP)"
-msgstr ""
+msgstr "‏SIP ‏(UDP)"
 
 #: ../gtk/parameters.ui.h:9
 msgid "SIP (TCP)"
-msgstr ""
+msgstr "‏SIP ‏(TCP)"
 
 #: ../gtk/parameters.ui.h:10
 msgid "SIP (TLS)"
-msgstr ""
+msgstr "‏SIP ‏(TLS)"
 
 #: ../gtk/parameters.ui.h:11
 msgid "Settings"
@@ -1167,29 +1157,27 @@ msgstr "וידאו RTP/UDP:"
 
 #: ../gtk/parameters.ui.h:18
 msgid "Audio RTP/UDP:"
-msgstr "ש×\9e×¢ RTP/UDP:"
+msgstr "×\90×\95×\93×\99×\95 RTP/UDP:"
 
 #: ../gtk/parameters.ui.h:19
 msgid "DSCP fields"
-msgstr ""
+msgstr "שדות DSCP"
 
 #: ../gtk/parameters.ui.h:20
 msgid "Fixed"
-msgstr ""
+msgstr "מקובע"
 
-# מנהרה
 #: ../gtk/parameters.ui.h:21
 msgid "Tunnel"
-msgstr ""
+msgstr "מינהור"
 
 #: ../gtk/parameters.ui.h:22
-#, fuzzy
 msgid "Media encryption is mandatory"
-msgstr "ס×\95×\92 ×\94צפנת ×\9e×\93×\99×\94"
+msgstr "×\94צפנת ×\9e×\93×\99×\94 ×\94×\99× ×\94 ×\9e× ×\93×\98×\95ר×\99ת"
 
 #: ../gtk/parameters.ui.h:23
 msgid "<b>Network protocol and ports</b>"
-msgstr "<b>פר×\95×\98×\95ק×\95×\9c×\99 ×¨×©×ª ×¢×\91×\95×\93×\94 ופורטים</b>"
+msgstr "<b>פר×\95×\98×\95ק×\95×\9c×\99 ×¨×©×ª ×ª×§×©×\95רת ופורטים</b>"
 
 #: ../gtk/parameters.ui.h:24
 msgid "Direct connection to the Internet"
@@ -1197,31 +1185,30 @@ msgstr "חיבור ישיר אל האינטרנט"
 
 #: ../gtk/parameters.ui.h:25
 msgid "Behind NAT / Firewall (specify gateway IP below)"
-msgstr "מאחורי NAT \\ חומת־אש (ציון כתובת שער (Gateway IP) למטה)"
+msgstr "מאחורי NAT / חומת אש (ציון כתובת שער (Gateway IP) למטה)"
 
 #: ../gtk/parameters.ui.h:26
 msgid "Public IP address:"
 msgstr "כתובת IP פומבית:"
 
+# ניצול STUN
 # שימוש ב־STUN
 # utilize
 #: ../gtk/parameters.ui.h:27
 msgid "Behind NAT / Firewall (use STUN to resolve)"
-msgstr "מאחורי NAT \\ חומת־אש (ניצול STUN)"
+msgstr "מאחורי NAT  /  חומת אש (בעזרת STUN לפתירה)"
 
 # שימוש ב־STUN
 # utilize
 #: ../gtk/parameters.ui.h:28
-#, fuzzy
 msgid "Behind NAT / Firewall (use ICE)"
-msgstr "מאחורי NAT \\ חומת־אש (ניצול STUN)"
+msgstr "מאחורי NAT  /  חומת אש (בעזרת ICE)"
 
 # שימוש ב־STUN
 # utilize
 #: ../gtk/parameters.ui.h:29
-#, fuzzy
 msgid "Behind NAT / Firewall (use uPnP)"
-msgstr "מאחורי NAT \\ חומת־אש (ניצול STUN)"
+msgstr "מאחורי NAT  /  חומת אש (בעזרת uPnP)"
 
 #: ../gtk/parameters.ui.h:30
 msgid "Stun server:"
@@ -1233,7 +1220,7 @@ msgstr "<b>‫NAT וחומת אש</b>"
 
 #: ../gtk/parameters.ui.h:32
 msgid "Network settings"
-msgstr "×\94×\92×\93ר×\95ת ×¨×©×ª ×¢×\91×\95×\93×\94"
+msgstr "×\94×\92×\93ר×\95ת ×¨×©×ª ×ª×§×©×\95רת"
 
 #: ../gtk/parameters.ui.h:33
 msgid "Ring sound:"
@@ -1261,7 +1248,7 @@ msgstr "אפשר ביטול הד"
 
 #: ../gtk/parameters.ui.h:39
 msgid "<b>Audio</b>"
-msgstr "<b>ש×\9e×¢</b>"
+msgstr "<b>×\90×\95×\93×\99×\95</b>"
 
 #: ../gtk/parameters.ui.h:40
 msgid "Video input device:"
@@ -1342,12 +1329,12 @@ msgstr "<b>קודקים</b>"
 msgid "0 stands for \"unlimited\""
 msgstr "0 מסמל \"בלי הגבלה\""
 
-# האם KiB means kibibyte?
+# does KiB mean kibibyte?
 #: ../gtk/parameters.ui.h:61
 msgid "Upload speed limit in Kbit/sec:"
 msgstr "מגבלת מהירות העלאה בקי״ב/שנ׳:"
 
-# האם KiB means kibibyte?
+# האם KiB זה kibibyte?
 # קי״ב (1024) אל מול ק״ב (1000)
 #: ../gtk/parameters.ui.h:62
 msgid "Download speed limit in Kbit/sec:"
@@ -1418,89 +1405,80 @@ msgid "Please wait"
 msgstr "נא להמתין"
 
 #: ../gtk/dscp_settings.ui.h:1
-#, fuzzy
 msgid "Dscp settings"
-msgstr "הגדרות"
+msgstr "הגדרות Dscp"
 
 #: ../gtk/dscp_settings.ui.h:2
 msgid "SIP"
 msgstr ""
 
 #: ../gtk/dscp_settings.ui.h:3
-#, fuzzy
 msgid "Audio RTP stream"
-msgstr "ש×\9e×¢ RTP/UDP:"
+msgstr "×\96ר×\9d RTP ×\90×\95×\93×\99×\95"
 
 #: ../gtk/dscp_settings.ui.h:4
-#, fuzzy
 msgid "Video RTP stream"
-msgstr "×\95×\99×\93×\90×\95 RTP/UDP:"
+msgstr "×\96ר×\9d RTP ×\95×\99×\93×\90×\95"
 
 #: ../gtk/dscp_settings.ui.h:5
 msgid "<b>Set DSCP values (in hexadecimal)</b>"
-msgstr ""
+msgstr "<b>קבע ערכי DSCP (בהקסדצימלי)</b>"
 
 #: ../gtk/call_statistics.ui.h:1
 msgid "Call statistics"
-msgstr ""
+msgstr "סטטיסטיקות שיחה"
 
 #: ../gtk/call_statistics.ui.h:2
-#, fuzzy
 msgid "Audio codec"
-msgstr "קודקים של שמע"
+msgstr "קודק של אודיו"
 
 #: ../gtk/call_statistics.ui.h:3
-#, fuzzy
 msgid "Video codec"
-msgstr "קודקים של וידאו"
+msgstr "קודק של וידאו"
 
 #: ../gtk/call_statistics.ui.h:4
 msgid "Audio IP bandwidth usage"
-msgstr ""
+msgstr "ניצול רוחב פס IP אודיו"
 
 #: ../gtk/call_statistics.ui.h:5
-#, fuzzy
 msgid "Audio Media connectivity"
-msgstr "ס×\95×\92 ×\94צפנת ×\9e×\93×\99×\94"
+msgstr "ק×\99ש×\95ר×\99×\95ת ×\9e×\93×\99×\95×\9d ×\90×\95×\93×\99×\95"
 
 #: ../gtk/call_statistics.ui.h:6
 msgid "Video IP bandwidth usage"
-msgstr ""
+msgstr "ניצול רוחב פס IP וידאו"
 
 #: ../gtk/call_statistics.ui.h:7
-#, fuzzy
 msgid "Video Media connectivity"
-msgstr "ס×\95×\92 ×\94צפנת ×\9e×\93×\99×\94"
+msgstr "ק×\99ש×\95ר×\99×\95ת ×\9e×\93×\99×\95×\9d ×\95×\99×\93×\90×\95"
 
 #: ../gtk/call_statistics.ui.h:8
 msgid "Round trip time"
-msgstr ""
+msgstr "זמן הלוך ושוב"
 
 #: ../gtk/call_statistics.ui.h:9
-#, fuzzy
 msgid "<b>Call statistics and information</b>"
-msgstr "<b>×\9e×\99×\93×¢ ×\90×\99ש ×§×©×¨</b>"
+msgstr "<b>ס×\98×\98×\99ס×\98×\99ק×\95ת ×\95×\9e×\99×\93×¢ ×©×\99×\97×\94</b>"
 
 #: ../gtk/tunnel_config.ui.h:1
-#, fuzzy
 msgid "Configure VoIP tunnel"
-msgstr "הגדרת חשבון ‫SIP"
+msgstr "הגדר תיעול VoIP"
 
 #: ../gtk/tunnel_config.ui.h:2
 msgid "Host"
-msgstr ""
+msgstr "מארח"
 
 #: ../gtk/tunnel_config.ui.h:3
 msgid "Port"
-msgstr ""
+msgstr "פורט"
 
 #: ../gtk/tunnel_config.ui.h:6
 msgid "<b>Configure tunnel</b>"
-msgstr ""
+msgstr "<b>הגדר מינהור</b>"
 
 #: ../gtk/tunnel_config.ui.h:9
 msgid "<b>Configure http proxy (optional)</b>"
-msgstr ""
+msgstr "<b>הגדר http proxy (רשות)</b>"
 
 #: ../gtk/keypad.ui.h:1
 msgid "D"
@@ -1520,15 +1498,15 @@ msgstr ""
 
 #: ../gtk/keypad.ui.h:6
 msgid "9"
-msgstr "9 (סעפ)"
+msgstr "9 [סעפ]"
 
 #: ../gtk/keypad.ui.h:7
 msgid "8"
-msgstr "8 (צק)"
+msgstr "8 [צק]"
 
 #: ../gtk/keypad.ui.h:8
 msgid "7"
-msgstr "7 (רשת)"
+msgstr "7 [רשת]"
 
 #: ../gtk/keypad.ui.h:9
 msgid "B"
@@ -1536,15 +1514,15 @@ msgstr ""
 
 #: ../gtk/keypad.ui.h:10
 msgid "6"
-msgstr "6 (זחט)"
+msgstr "6 [זחט]"
 
 #: ../gtk/keypad.ui.h:11
 msgid "5"
-msgstr "5 (יכל)"
+msgstr "5 [יכל]"
 
 #: ../gtk/keypad.ui.h:12
 msgid "4"
-msgstr "4 (מנ)"
+msgstr "4 [מנ]"
 
 #: ../gtk/keypad.ui.h:13
 msgid "A"
@@ -1552,11 +1530,11 @@ msgstr ""
 
 #: ../gtk/keypad.ui.h:14
 msgid "3"
-msgstr "3 (אבג)"
+msgstr "3 [אבג]"
 
 #: ../gtk/keypad.ui.h:15
 msgid "2"
-msgstr "2 (דהו)"
+msgstr "2 [דהו]"
 
 #: ../gtk/keypad.ui.h:16
 msgid "1"
@@ -1692,7 +1670,7 @@ msgstr "בדיקת STUN מצויה כעת בעיצומה..."
 
 #: ../coreapi/misc.c:630
 msgid "ICE local candidates gathering in progress..."
-msgstr ""
+msgstr "צבירת מועמדים מקומיים של ICE מצויה כעת בעיצומה..."
 
 #: ../coreapi/friend.c:33
 msgid "Online"
@@ -1745,14 +1723,14 @@ msgstr "בהמתנה"
 
 #: ../coreapi/friend.c:66
 msgid "Unknown-bug"
-msgstr "תק×\9c×\94 ×\9c×\90 ×\99×\93×\95×¢×\94"
+msgstr "תק×\9c×\94 ×\9c×\90 ×\9e×\95×\9bרת"
 
 #: ../coreapi/proxy.c:204
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
 msgstr ""
-"×\9bת×\95×\91ת sip proxy ×©×\94×\95×\96× ×\94 הינה שגויה, זו צריכה להתחיל עם‭\"sip:\" ‬ לאחר שם מארח."
+"×\9bת×\95×\91ת sip proxy ×©×\94×\96נת הינה שגויה, זו צריכה להתחיל עם‭\"sip:\" ‬ לאחר שם מארח."
 
 # כמו למשל
 #: ../coreapi/proxy.c:210
@@ -1806,24 +1784,21 @@ msgstr "קריאה נענתה על ידי %s."
 # אי תאימות
 # אי התאמה
 #: ../coreapi/callbacks.c:412
-#, fuzzy
 msgid "Incompatible, check codecs or security settings..."
-msgstr "×\97×\95סר ×ª×\90×\99×\9e×\95ת, × ×\90 ×\9c×\91×\93×\95ק ×§×\95×\93ק×\99×\9d..."
+msgstr "×\97×\95סר ×ª×\90×\99×\9e×\95ת, ×\91×\93×\95ק ×§×\95×\93ק×\99×\9d ×\90×\95 ×\94×\92×\93ר×\95ת ×\90×\91×\98×\97×\94..."
 
 #: ../coreapi/callbacks.c:460
-#, fuzzy
 msgid "We have been resumed."
-msgstr "חזרנו..."
+msgstr "חזרנו."
 
 #: ../coreapi/callbacks.c:469
 msgid "We are paused by other party."
-msgstr ""
+msgstr "אנו מושהים על ידי צד אחר."
 
 # באופן מרוחק
 #: ../coreapi/callbacks.c:475
-#, fuzzy
 msgid "Call is updated by remote."
-msgstr "שיחה עודכנה מרחוק..."
+msgstr "שיחה עודכנה מרחוק."
 
 #: ../coreapi/callbacks.c:544
 msgid "Call terminated."
@@ -1862,9 +1837,8 @@ msgstr "מכוון מחדש"
 # אי תאימות
 # אי התאמה
 #: ../coreapi/callbacks.c:627
-#, fuzzy
 msgid "Incompatible media parameters."
-msgstr "×\97×\95סר ×ª×\90×\99×\9e×\95ת, × ×\90 ×\9c×\91×\93×\95ק ×§×\95×\93ק×\99×\9d..."
+msgstr "פר×\9e×\98ר×\99×\99 ×\9e×\93×\99×\94 ×\97סר×\99 ×ª×\95×\90×\9e×\99×\9d."
 
 #: ../coreapi/callbacks.c:633
 msgid "Call failed."
index 256e7ffba980f0cf9dfc1421abd99b0530db1521..65bbb3e7b9942102acf488011b9d8a85d47d1d0b 100644 (file)
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Linphone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-08 16:59+0200\n"
+"POT-Creation-Date: 2013-04-24 14:04+0200\n"
 "PO-Revision-Date: 2013-03-26 19:00+0100\n"
 "Last-Translator: Viktor <viktorbarczi@lavabit.com>\n"
 "Language-Team:  <LL@li.org>\n"
@@ -98,7 +98,7 @@ msgstr "én"
 msgid "Couldn't find pixmap file: %s"
 msgstr "Nemtalálható a pixmap fájl: %s"
 
-#: ../gtk/chat.c:324 ../gtk/friendlist.c:872
+#: ../gtk/chat.c:336 ../gtk/friendlist.c:872
 msgid "Invalid sip contact !"
 msgstr "Érvénytelen sip partner !"
 
@@ -165,11 +165,11 @@ msgstr ""
 msgid "Call error"
 msgstr "Hiba a hívás közben"
 
-#: ../gtk/main.c:1129 ../coreapi/linphonecore.c:3189
+#: ../gtk/main.c:1129 ../coreapi/linphonecore.c:3210
 msgid "Call ended"
 msgstr "Hívás vége"
 
-#: ../gtk/main.c:1132 ../coreapi/linphonecore.c:239
+#: ../gtk/main.c:1132 ../coreapi/linphonecore.c:240
 msgid "Incoming call"
 msgstr "Beérkező hívás"
 
@@ -1475,19 +1475,19 @@ msgstr "2"
 msgid "1"
 msgstr "1"
 
-#: ../coreapi/linphonecore.c:227
+#: ../coreapi/linphonecore.c:228
 msgid "aborted"
 msgstr "megszakítva"
 
-#: ../coreapi/linphonecore.c:230
+#: ../coreapi/linphonecore.c:231
 msgid "completed"
 msgstr "befejezve"
 
-#: ../coreapi/linphonecore.c:233
+#: ../coreapi/linphonecore.c:234
 msgid "missed"
 msgstr "elhibázva"
 
-#: ../coreapi/linphonecore.c:238
+#: ../coreapi/linphonecore.c:239
 #, c-format
 msgid ""
 "%s at %s\n"
@@ -1502,70 +1502,70 @@ msgstr ""
 "Állapot: %s\n"
 "Időtartam: %i perc %i másodperc\n"
 
-#: ../coreapi/linphonecore.c:239
+#: ../coreapi/linphonecore.c:240
 msgid "Outgoing call"
 msgstr "Kimenő hívás"
 
-#: ../coreapi/linphonecore.c:1312
+#: ../coreapi/linphonecore.c:1321
 msgid "Ready"
 msgstr "Kész"
 
-#: ../coreapi/linphonecore.c:2184
+#: ../coreapi/linphonecore.c:2205
 msgid "Looking for telephone number destination..."
 msgstr "Telefonszám-cél keresése..."
 
-#: ../coreapi/linphonecore.c:2187
+#: ../coreapi/linphonecore.c:2208
 msgid "Could not resolve this number."
 msgstr "Nem sikkerült értelmezni a számot."
 
-#: ../coreapi/linphonecore.c:2231
+#: ../coreapi/linphonecore.c:2252
 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:2432
+#: ../coreapi/linphonecore.c:2453
 msgid "Contacting"
 msgstr "Kapcsolódás"
 
-#: ../coreapi/linphonecore.c:2439
+#: ../coreapi/linphonecore.c:2460
 msgid "Could not call"
 msgstr "Nem sikerült hívni"
 
-#: ../coreapi/linphonecore.c:2549
+#: ../coreapi/linphonecore.c:2570
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "Elnézést, elértük a egyidejű hívások maximális számát"
 
-#: ../coreapi/linphonecore.c:2731
+#: ../coreapi/linphonecore.c:2752
 msgid "is contacting you"
 msgstr "kapcsolatba lépett veled."
 
-#: ../coreapi/linphonecore.c:2732
+#: ../coreapi/linphonecore.c:2753
 msgid " and asked autoanswer."
 msgstr "és automatikus választ kért."
 
-#: ../coreapi/linphonecore.c:2732
+#: ../coreapi/linphonecore.c:2753
 msgid "."
 msgstr "."
 
-#: ../coreapi/linphonecore.c:2799
+#: ../coreapi/linphonecore.c:2820
 msgid "Modifying call parameters..."
 msgstr "A hívási jellemzők módosítása..."
 
-#: ../coreapi/linphonecore.c:3138
+#: ../coreapi/linphonecore.c:3159
 msgid "Connected."
 msgstr "Kapcsolódva."
 
-#: ../coreapi/linphonecore.c:3166
+#: ../coreapi/linphonecore.c:3187
 msgid "Call aborted"
 msgstr "Hívás megszakítva"
 
-#: ../coreapi/linphonecore.c:3357
+#: ../coreapi/linphonecore.c:3378
 msgid "Could not pause the call"
 msgstr "Nem sikerült várakoztatni a hívást"
 
-#: ../coreapi/linphonecore.c:3362
+#: ../coreapi/linphonecore.c:3383
 msgid "Pausing the current call..."
 msgstr "Jelenlegi hívás várakoztatásának aktiválása..."
 
@@ -1784,7 +1784,7 @@ msgstr "A regisztáció a %s -n nem sikerült: %s"
 msgid "Authentication token is %s"
 msgstr "Hitelesítési jel: %s"
 
-#: ../coreapi/linphonecall.c:2319
+#: ../coreapi/linphonecall.c:2355
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
index f1c29e8b063e3d9b79ad5ff3dfd6c9632500c938..e7c8cfc1374da2badd1f1f60c3cf4534bbbe6c33 100644 (file)
--- 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: 2013-04-08 16:59+0200\n"
+"POT-Creation-Date: 2013-04-24 14:04+0200\n"
 "PO-Revision-Date: 2002-10-15 HO:MI+ZONE\n"
 "Last-Translator: Matteo Piazza <matteo.piazza@trentinonetwork.it>\n"
 "Language-Team: it <it@li.org>\n"
@@ -98,7 +98,7 @@ msgstr ""
 msgid "Couldn't find pixmap file: %s"
 msgstr ""
 
-#: ../gtk/chat.c:324 ../gtk/friendlist.c:872
+#: ../gtk/chat.c:336 ../gtk/friendlist.c:872
 msgid "Invalid sip contact !"
 msgstr "Contatto SIP non valido"
 
@@ -161,11 +161,11 @@ msgstr "Prego inserire la password per username <i>%s</i> e dominio <i>%s<i>"
 msgid "Call error"
 msgstr "Cronologia"
 
-#: ../gtk/main.c:1129 ../coreapi/linphonecore.c:3189
+#: ../gtk/main.c:1129 ../coreapi/linphonecore.c:3210
 msgid "Call ended"
 msgstr "Chiamata terminata"
 
-#: ../gtk/main.c:1132 ../coreapi/linphonecore.c:239
+#: ../gtk/main.c:1132 ../coreapi/linphonecore.c:240
 msgid "Incoming call"
 msgstr "Chimata in entrata"
 
@@ -1505,19 +1505,19 @@ msgstr "2"
 msgid "1"
 msgstr "1"
 
-#: ../coreapi/linphonecore.c:227
+#: ../coreapi/linphonecore.c:228
 msgid "aborted"
 msgstr "annullato"
 
-#: ../coreapi/linphonecore.c:230
+#: ../coreapi/linphonecore.c:231
 msgid "completed"
 msgstr "comletato"
 
-#: ../coreapi/linphonecore.c:233
+#: ../coreapi/linphonecore.c:234
 msgid "missed"
 msgstr "mancante"
 
-#: ../coreapi/linphonecore.c:238
+#: ../coreapi/linphonecore.c:239
 #, c-format
 msgid ""
 "%s at %s\n"
@@ -1532,23 +1532,23 @@ msgstr ""
 "Stato: %s\n"
 "Durata: %i mn %i sec\n"
 
-#: ../coreapi/linphonecore.c:239
+#: ../coreapi/linphonecore.c:240
 msgid "Outgoing call"
 msgstr "Chiamata in uscita"
 
-#: ../coreapi/linphonecore.c:1312
+#: ../coreapi/linphonecore.c:1321
 msgid "Ready"
 msgstr "Pronto"
 
-#: ../coreapi/linphonecore.c:2184
+#: ../coreapi/linphonecore.c:2205
 msgid "Looking for telephone number destination..."
 msgstr "Ricerca numero destinazione..."
 
-#: ../coreapi/linphonecore.c:2187
+#: ../coreapi/linphonecore.c:2208
 msgid "Could not resolve this number."
 msgstr "Impossibile risolvere il numero."
 
-#: ../coreapi/linphonecore.c:2231
+#: ../coreapi/linphonecore.c:2252
 msgid ""
 "Could not parse given sip address. A sip url usually looks like sip:"
 "user@domain"
@@ -1556,51 +1556,51 @@ msgstr ""
 "Errore nel formato del contatto sip. Usualmente un indirizzo appare sip:"
 "user@domain"
 
-#: ../coreapi/linphonecore.c:2432
+#: ../coreapi/linphonecore.c:2453
 msgid "Contacting"
 msgstr "In connessione"
 
-#: ../coreapi/linphonecore.c:2439
+#: ../coreapi/linphonecore.c:2460
 #, fuzzy
 msgid "Could not call"
 msgstr "chiamata fallita"
 
-#: ../coreapi/linphonecore.c:2549
+#: ../coreapi/linphonecore.c:2570
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2731
+#: ../coreapi/linphonecore.c:2752
 #, fuzzy
 msgid "is contacting you"
 msgstr "ti sta conttatando."
 
-#: ../coreapi/linphonecore.c:2732
+#: ../coreapi/linphonecore.c:2753
 msgid " and asked autoanswer."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2732
+#: ../coreapi/linphonecore.c:2753
 msgid "."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2799
+#: ../coreapi/linphonecore.c:2820
 msgid "Modifying call parameters..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3138
+#: ../coreapi/linphonecore.c:3159
 msgid "Connected."
 msgstr "Connessione"
 
-#: ../coreapi/linphonecore.c:3166
+#: ../coreapi/linphonecore.c:3187
 #, fuzzy
 msgid "Call aborted"
 msgstr "annullato"
 
-#: ../coreapi/linphonecore.c:3357
+#: ../coreapi/linphonecore.c:3378
 #, fuzzy
 msgid "Could not pause the call"
 msgstr "chiamata fallita"
 
-#: ../coreapi/linphonecore.c:3362
+#: ../coreapi/linphonecore.c:3383
 #, fuzzy
 msgid "Pausing the current call..."
 msgstr "Mostra chiamata corrente"
@@ -1822,7 +1822,7 @@ msgstr "Registrazione su %s fallita: %s"
 msgid "Authentication token is %s"
 msgstr "Linphone - Autenticazione richiesta"
 
-#: ../coreapi/linphonecall.c:2319
+#: ../coreapi/linphonecall.c:2355
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
index 668018fd1353a6a99c930972d90cb069f522a7f7..56362238b50db0c41d3e5588e674a460df060e8f 100644 (file)
--- 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: 2013-04-08 16:59+0200\n"
+"POT-Creation-Date: 2013-04-24 14:04+0200\n"
 "PO-Revision-Date: 2003-01-21 00:05+9000\n"
 "Last-Translator: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\n"
 "Language-Team: <ja@li.org>\n"
@@ -96,7 +96,7 @@ msgstr ""
 msgid "Couldn't find pixmap file: %s"
 msgstr "pixmapファイルが見つかりません %s"
 
-#: ../gtk/chat.c:324 ../gtk/friendlist.c:872
+#: ../gtk/chat.c:336 ../gtk/friendlist.c:872
 msgid "Invalid sip contact !"
 msgstr ""
 
@@ -156,12 +156,12 @@ msgstr ""
 msgid "Call error"
 msgstr "通話はキャンセルされました。"
 
-#: ../gtk/main.c:1129 ../coreapi/linphonecore.c:3189
+#: ../gtk/main.c:1129 ../coreapi/linphonecore.c:3210
 #, fuzzy
 msgid "Call ended"
 msgstr "通話は拒否されました。"
 
-#: ../gtk/main.c:1132 ../coreapi/linphonecore.c:239
+#: ../gtk/main.c:1132 ../coreapi/linphonecore.c:240
 msgid "Incoming call"
 msgstr ""
 
@@ -1516,19 +1516,19 @@ msgstr "2"
 msgid "1"
 msgstr "1"
 
-#: ../coreapi/linphonecore.c:227
+#: ../coreapi/linphonecore.c:228
 msgid "aborted"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:230
+#: ../coreapi/linphonecore.c:231
 msgid "completed"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:233
+#: ../coreapi/linphonecore.c:234
 msgid "missed"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:238
+#: ../coreapi/linphonecore.c:239
 #, c-format
 msgid ""
 "%s at %s\n"
@@ -1538,24 +1538,24 @@ msgid ""
 "Duration: %i mn %i sec\n"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:239
+#: ../coreapi/linphonecore.c:240
 msgid "Outgoing call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1312
+#: ../coreapi/linphonecore.c:1321
 #, fuzzy
 msgid "Ready"
 msgstr "準備完了。"
 
-#: ../coreapi/linphonecore.c:2184
+#: ../coreapi/linphonecore.c:2205
 msgid "Looking for telephone number destination..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2187
+#: ../coreapi/linphonecore.c:2208
 msgid "Could not resolve this number."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2231
+#: ../coreapi/linphonecore.c:2252
 #, fuzzy
 msgid ""
 "Could not parse given sip address. A sip url usually looks like sip:"
@@ -1564,51 +1564,51 @@ msgstr ""
 "SIPアドレスの形式エラーです。SIPアドレスは、<sip:username@domainname>のような"
 "形式です。"
 
-#: ../coreapi/linphonecore.c:2432
+#: ../coreapi/linphonecore.c:2453
 #, fuzzy
 msgid "Contacting"
 msgstr "接続中"
 
-#: ../coreapi/linphonecore.c:2439
+#: ../coreapi/linphonecore.c:2460
 #, fuzzy
 msgid "Could not call"
 msgstr "pixmapファイルが見つかりません %s"
 
-#: ../coreapi/linphonecore.c:2549
+#: ../coreapi/linphonecore.c:2570
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2731
+#: ../coreapi/linphonecore.c:2752
 #, fuzzy
 msgid "is contacting you"
 msgstr "から電話です。"
 
-#: ../coreapi/linphonecore.c:2732
+#: ../coreapi/linphonecore.c:2753
 msgid " and asked autoanswer."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2732
+#: ../coreapi/linphonecore.c:2753
 msgid "."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2799
+#: ../coreapi/linphonecore.c:2820
 msgid "Modifying call parameters..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3138
+#: ../coreapi/linphonecore.c:3159
 msgid "Connected."
 msgstr "接続しました。"
 
-#: ../coreapi/linphonecore.c:3166
+#: ../coreapi/linphonecore.c:3187
 #, fuzzy
 msgid "Call aborted"
 msgstr "通話はキャンセルされました。"
 
-#: ../coreapi/linphonecore.c:3357
+#: ../coreapi/linphonecore.c:3378
 msgid "Could not pause the call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3362
+#: ../coreapi/linphonecore.c:3383
 msgid "Pausing the current call..."
 msgstr ""
 
@@ -1832,7 +1832,7 @@ msgstr "登録しました。"
 msgid "Authentication token is %s"
 msgstr "コーデックの情報"
 
-#: ../coreapi/linphonecall.c:2319
+#: ../coreapi/linphonecall.c:2355
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
index 8b7f20c28dd3d100691d8907e51e867adcda5307..470e0d02499cfe5fb7ff479135b30cb0871ad29d 100644 (file)
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-08 16:59+0200\n"
+"POT-Creation-Date: 2013-04-24 14:04+0200\n"
 "PO-Revision-Date: 2011-04-05 01:56+0200\n"
 "Last-Translator: Øyvind Sæther <oyvinds@everdot.org>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -98,7 +98,7 @@ msgstr "Skru mikrofonen av"
 msgid "Couldn't find pixmap file: %s"
 msgstr "Fant ikke pixmap fli: %s"
 
-#: ../gtk/chat.c:324 ../gtk/friendlist.c:872
+#: ../gtk/chat.c:336 ../gtk/friendlist.c:872
 msgid "Invalid sip contact !"
 msgstr "Ugyldig SIP kontakt !"
 
@@ -166,11 +166,11 @@ msgstr ""
 msgid "Call error"
 msgstr "Samtalehistorikk"
 
-#: ../gtk/main.c:1129 ../coreapi/linphonecore.c:3189
+#: ../gtk/main.c:1129 ../coreapi/linphonecore.c:3210
 msgid "Call ended"
 msgstr "Samtale avsluttet"
 
-#: ../gtk/main.c:1132 ../coreapi/linphonecore.c:239
+#: ../gtk/main.c:1132 ../coreapi/linphonecore.c:240
 msgid "Incoming call"
 msgstr "Innkommende samtale"
 
@@ -1498,19 +1498,19 @@ msgstr "2"
 msgid "1"
 msgstr "1"
 
-#: ../coreapi/linphonecore.c:227
+#: ../coreapi/linphonecore.c:228
 msgid "aborted"
 msgstr "avbrutt"
 
-#: ../coreapi/linphonecore.c:230
+#: ../coreapi/linphonecore.c:231
 msgid "completed"
 msgstr "Fullført"
 
-#: ../coreapi/linphonecore.c:233
+#: ../coreapi/linphonecore.c:234
 msgid "missed"
 msgstr "ubesvart"
 
-#: ../coreapi/linphonecore.c:238
+#: ../coreapi/linphonecore.c:239
 #, c-format
 msgid ""
 "%s at %s\n"
@@ -1525,23 +1525,23 @@ msgstr ""
 "Status: %s\n"
 "Lengde: %i min %i sek\n"
 
-#: ../coreapi/linphonecore.c:239
+#: ../coreapi/linphonecore.c:240
 msgid "Outgoing call"
 msgstr "Utgående samtale"
 
-#: ../coreapi/linphonecore.c:1312
+#: ../coreapi/linphonecore.c:1321
 msgid "Ready"
 msgstr "Klar"
 
-#: ../coreapi/linphonecore.c:2184
+#: ../coreapi/linphonecore.c:2205
 msgid "Looking for telephone number destination..."
 msgstr "Ser etter telefonnummer for destinasjonen..."
 
-#: ../coreapi/linphonecore.c:2187
+#: ../coreapi/linphonecore.c:2208
 msgid "Could not resolve this number."
 msgstr "Kan ikke tilkoble dette nummeret."
 
-#: ../coreapi/linphonecore.c:2231
+#: ../coreapi/linphonecore.c:2252
 msgid ""
 "Could not parse given sip address. A sip url usually looks like sip:"
 "user@domain"
@@ -1549,47 +1549,47 @@ msgstr ""
 "Klarer ikke å tolke angitt SIP-adresse. En SIP-adresse er vanligvis ut som "
 "sip: brukernavn@domenenavn"
 
-#: ../coreapi/linphonecore.c:2432
+#: ../coreapi/linphonecore.c:2453
 msgid "Contacting"
 msgstr "Tilknytter"
 
-#: ../coreapi/linphonecore.c:2439
+#: ../coreapi/linphonecore.c:2460
 msgid "Could not call"
 msgstr "Kunne ikke ringe"
 
-#: ../coreapi/linphonecore.c:2549
+#: ../coreapi/linphonecore.c:2570
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "Beklager, du har nådd maksimalt antall samtidige samtaler"
 
-#: ../coreapi/linphonecore.c:2731
+#: ../coreapi/linphonecore.c:2752
 msgid "is contacting you"
 msgstr "Kontakter deg."
 
-#: ../coreapi/linphonecore.c:2732
+#: ../coreapi/linphonecore.c:2753
 msgid " and asked autoanswer."
 msgstr " og ba om autosvar."
 
-#: ../coreapi/linphonecore.c:2732
+#: ../coreapi/linphonecore.c:2753
 msgid "."
 msgstr "."
 
-#: ../coreapi/linphonecore.c:2799
+#: ../coreapi/linphonecore.c:2820
 msgid "Modifying call parameters..."
 msgstr "Endrer ringeparametre..."
 
-#: ../coreapi/linphonecore.c:3138
+#: ../coreapi/linphonecore.c:3159
 msgid "Connected."
 msgstr "Tilkoblet"
 
-#: ../coreapi/linphonecore.c:3166
+#: ../coreapi/linphonecore.c:3187
 msgid "Call aborted"
 msgstr "Samtale avbrutt"
 
-#: ../coreapi/linphonecore.c:3357
+#: ../coreapi/linphonecore.c:3378
 msgid "Could not pause the call"
 msgstr "Kunne ikke pause samtalen"
 
-#: ../coreapi/linphonecore.c:3362
+#: ../coreapi/linphonecore.c:3383
 msgid "Pausing the current call..."
 msgstr "Pauser nåværende samtale"
 
@@ -1810,7 +1810,7 @@ msgstr "Registrering hos %s mislykkes: %s"
 msgid "Authentication token is %s"
 msgstr "Autorisering kreves"
 
-#: ../coreapi/linphonecall.c:2319
+#: ../coreapi/linphonecall.c:2355
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
index 8cfe7febdb6f76503b1209e1745f5fa2d6024201..fcd4ca42b2d6ee37f0f490cfd78cdd181a049fe8 100644 (file)
--- 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: 2013-04-08 16:59+0200\n"
+"POT-Creation-Date: 2013-04-24 14:04+0200\n"
 "PO-Revision-Date: 2007-09-05 10:40+0200\n"
 "Last-Translator: Hendrik-Jan Heins <hjheins@gmail.com>\n"
 "Language-Team: Nederlands <vertaling@nl.linux.org>\n"
@@ -99,7 +99,7 @@ msgstr ""
 msgid "Couldn't find pixmap file: %s"
 msgstr "Kon pixmap bestand %s niet vinden"
 
-#: ../gtk/chat.c:324 ../gtk/friendlist.c:872
+#: ../gtk/chat.c:336 ../gtk/friendlist.c:872
 msgid "Invalid sip contact !"
 msgstr ""
 
@@ -159,11 +159,11 @@ msgstr ""
 msgid "Call error"
 msgstr "Linphone - Oproepgeschiedenis"
 
-#: ../gtk/main.c:1129 ../coreapi/linphonecore.c:3189
+#: ../gtk/main.c:1129 ../coreapi/linphonecore.c:3210
 msgid "Call ended"
 msgstr "Oproep beeindigd"
 
-#: ../gtk/main.c:1132 ../coreapi/linphonecore.c:239
+#: ../gtk/main.c:1132 ../coreapi/linphonecore.c:240
 msgid "Incoming call"
 msgstr "Inkomende oproep"
 
@@ -1527,19 +1527,19 @@ msgstr ""
 msgid "1"
 msgstr "1"
 
-#: ../coreapi/linphonecore.c:227
+#: ../coreapi/linphonecore.c:228
 msgid "aborted"
 msgstr "afgebroken"
 
-#: ../coreapi/linphonecore.c:230
+#: ../coreapi/linphonecore.c:231
 msgid "completed"
 msgstr "voltooid"
 
-#: ../coreapi/linphonecore.c:233
+#: ../coreapi/linphonecore.c:234
 msgid "missed"
 msgstr "gemist"
 
-#: ../coreapi/linphonecore.c:238
+#: ../coreapi/linphonecore.c:239
 #, c-format
 msgid ""
 "%s at %s\n"
@@ -1554,23 +1554,23 @@ msgstr ""
 "Status: %s\n"
 "Tijdsduur: %i mins %i secs\n"
 
-#: ../coreapi/linphonecore.c:239
+#: ../coreapi/linphonecore.c:240
 msgid "Outgoing call"
 msgstr "Uitgaande oproep"
 
-#: ../coreapi/linphonecore.c:1312
+#: ../coreapi/linphonecore.c:1321
 msgid "Ready"
 msgstr "Gereed."
 
-#: ../coreapi/linphonecore.c:2184
+#: ../coreapi/linphonecore.c:2205
 msgid "Looking for telephone number destination..."
 msgstr "Zoekt de lokatie van het telefoonnummer..."
 
-#: ../coreapi/linphonecore.c:2187
+#: ../coreapi/linphonecore.c:2208
 msgid "Could not resolve this number."
 msgstr "Kon dit nummer niet vinden."
 
-#: ../coreapi/linphonecore.c:2231
+#: ../coreapi/linphonecore.c:2252
 msgid ""
 "Could not parse given sip address. A sip url usually looks like sip:"
 "user@domain"
@@ -1578,51 +1578,51 @@ msgstr ""
 "Slecht geformuleerd SIP-adres. Een SIP-adres ziet er uit als sip:"
 "gebruikersnaam@domeinnaam"
 
-#: ../coreapi/linphonecore.c:2432
+#: ../coreapi/linphonecore.c:2453
 msgid "Contacting"
 msgstr "Verbinden"
 
-#: ../coreapi/linphonecore.c:2439
+#: ../coreapi/linphonecore.c:2460
 #, fuzzy
 msgid "Could not call"
 msgstr "Kon niet oproepen"
 
-#: ../coreapi/linphonecore.c:2549
+#: ../coreapi/linphonecore.c:2570
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2731
+#: ../coreapi/linphonecore.c:2752
 #, fuzzy
 msgid "is contacting you"
 msgstr "belt u."
 
-#: ../coreapi/linphonecore.c:2732
+#: ../coreapi/linphonecore.c:2753
 msgid " and asked autoanswer."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2732
+#: ../coreapi/linphonecore.c:2753
 msgid "."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2799
+#: ../coreapi/linphonecore.c:2820
 msgid "Modifying call parameters..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3138
+#: ../coreapi/linphonecore.c:3159
 msgid "Connected."
 msgstr "Verbonden."
 
-#: ../coreapi/linphonecore.c:3166
+#: ../coreapi/linphonecore.c:3187
 #, fuzzy
 msgid "Call aborted"
 msgstr "afgebroken"
 
-#: ../coreapi/linphonecore.c:3357
+#: ../coreapi/linphonecore.c:3378
 #, fuzzy
 msgid "Could not pause the call"
 msgstr "Kon niet oproepen"
 
-#: ../coreapi/linphonecore.c:3362
+#: ../coreapi/linphonecore.c:3383
 #, fuzzy
 msgid "Pausing the current call..."
 msgstr "Kon niet oproepen"
@@ -1848,7 +1848,7 @@ msgstr "Registratie op %s mislukt (time-out)."
 msgid "Authentication token is %s"
 msgstr "Authorisatie gegevens"
 
-#: ../coreapi/linphonecall.c:2319
+#: ../coreapi/linphonecall.c:2355
 #, fuzzy, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
index 4512b7230adddbab50511beb9f64e0db59474f4f..869f9b85e323a3b5bd407a86a28b6dc18e697017 100644 (file)
--- 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: 2013-04-08 16:59+0200\n"
+"POT-Creation-Date: 2013-04-24 14:04+0200\n"
 "PO-Revision-Date: 2003-08-22 12:50+0200\n"
 "Last-Translator: Robert Nasiadek <darkone@darkone.pl>\n"
 "Language-Team: Polski <pl@li.org>\n"
@@ -94,7 +94,7 @@ msgstr ""
 msgid "Couldn't find pixmap file: %s"
 msgstr "Nie można znaleźć pixmapy: %s"
 
-#: ../gtk/chat.c:324 ../gtk/friendlist.c:872
+#: ../gtk/chat.c:336 ../gtk/friendlist.c:872
 msgid "Invalid sip contact !"
 msgstr ""
 
@@ -154,12 +154,12 @@ msgstr ""
 msgid "Call error"
 msgstr "Połączenie odwołane."
 
-#: ../gtk/main.c:1129 ../coreapi/linphonecore.c:3189
+#: ../gtk/main.c:1129 ../coreapi/linphonecore.c:3210
 #, fuzzy
 msgid "Call ended"
 msgstr "Rozmowa odrzucona."
 
-#: ../gtk/main.c:1132 ../coreapi/linphonecore.c:239
+#: ../gtk/main.c:1132 ../coreapi/linphonecore.c:240
 msgid "Incoming call"
 msgstr ""
 
@@ -1515,19 +1515,19 @@ msgstr "2"
 msgid "1"
 msgstr "1"
 
-#: ../coreapi/linphonecore.c:227
+#: ../coreapi/linphonecore.c:228
 msgid "aborted"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:230
+#: ../coreapi/linphonecore.c:231
 msgid "completed"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:233
+#: ../coreapi/linphonecore.c:234
 msgid "missed"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:238
+#: ../coreapi/linphonecore.c:239
 #, c-format
 msgid ""
 "%s at %s\n"
@@ -1537,75 +1537,75 @@ msgid ""
 "Duration: %i mn %i sec\n"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:239
+#: ../coreapi/linphonecore.c:240
 msgid "Outgoing call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1312
+#: ../coreapi/linphonecore.c:1321
 #, fuzzy
 msgid "Ready"
 msgstr "Gotowy."
 
-#: ../coreapi/linphonecore.c:2184
+#: ../coreapi/linphonecore.c:2205
 msgid "Looking for telephone number destination..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2187
+#: ../coreapi/linphonecore.c:2208
 msgid "Could not resolve this number."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2231
+#: ../coreapi/linphonecore.c:2252
 #, 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 <sip:osoba@serwer>"
 
-#: ../coreapi/linphonecore.c:2432
+#: ../coreapi/linphonecore.c:2453
 #, fuzzy
 msgid "Contacting"
 msgstr "Dzwonie do "
 
-#: ../coreapi/linphonecore.c:2439
+#: ../coreapi/linphonecore.c:2460
 #, fuzzy
 msgid "Could not call"
 msgstr "Nie można znaleźć pixmapy: %s"
 
-#: ../coreapi/linphonecore.c:2549
+#: ../coreapi/linphonecore.c:2570
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2731
+#: ../coreapi/linphonecore.c:2752
 #, fuzzy
 msgid "is contacting you"
 msgstr "dzwoni do Ciebie."
 
-#: ../coreapi/linphonecore.c:2732
+#: ../coreapi/linphonecore.c:2753
 msgid " and asked autoanswer."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2732
+#: ../coreapi/linphonecore.c:2753
 msgid "."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2799
+#: ../coreapi/linphonecore.c:2820
 msgid "Modifying call parameters..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3138
+#: ../coreapi/linphonecore.c:3159
 msgid "Connected."
 msgstr "Połączony"
 
-#: ../coreapi/linphonecore.c:3166
+#: ../coreapi/linphonecore.c:3187
 #, fuzzy
 msgid "Call aborted"
 msgstr "Połączenie odwołane."
 
-#: ../coreapi/linphonecore.c:3357
+#: ../coreapi/linphonecore.c:3378
 msgid "Could not pause the call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3362
+#: ../coreapi/linphonecore.c:3383
 msgid "Pausing the current call..."
 msgstr ""
 
@@ -1829,7 +1829,7 @@ msgstr "Rejestracja powiodła się."
 msgid "Authentication token is %s"
 msgstr "Informacje o kodeku"
 
-#: ../coreapi/linphonecall.c:2319
+#: ../coreapi/linphonecall.c:2355
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
index 821ba910f1305a7c3b0c5d130921e51710987fe8..1ebd70a43fa6a09e471e67f0cfc13ed13f255f2b 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-1.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-08 16:59+0200\n"
+"POT-Creation-Date: 2013-04-24 14:04+0200\n"
 "PO-Revision-Date: 2006-07-11 23:30+0200\n"
 "Last-Translator: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\n"
 "Language-Team: pt_BR <pt_BR@li.org>\n"
@@ -97,7 +97,7 @@ msgstr ""
 msgid "Couldn't find pixmap file: %s"
 msgstr "Não é possível achar arquivo pixmap: %s"
 
-#: ../gtk/chat.c:324 ../gtk/friendlist.c:872
+#: ../gtk/chat.c:336 ../gtk/friendlist.c:872
 msgid "Invalid sip contact !"
 msgstr ""
 
@@ -157,12 +157,12 @@ msgstr ""
 msgid "Call error"
 msgstr "Linphone - Histórico de chamadas"
 
-#: ../gtk/main.c:1129 ../coreapi/linphonecore.c:3189
+#: ../gtk/main.c:1129 ../coreapi/linphonecore.c:3210
 #, fuzzy
 msgid "Call ended"
 msgstr "Chamada cancelada."
 
-#: ../gtk/main.c:1132 ../coreapi/linphonecore.c:239
+#: ../gtk/main.c:1132 ../coreapi/linphonecore.c:240
 msgid "Incoming call"
 msgstr "Camadas recebidas"
 
@@ -1520,19 +1520,19 @@ msgstr ""
 msgid "1"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:227
+#: ../coreapi/linphonecore.c:228
 msgid "aborted"
 msgstr "Abortado"
 
-#: ../coreapi/linphonecore.c:230
+#: ../coreapi/linphonecore.c:231
 msgid "completed"
 msgstr "Competado"
 
-#: ../coreapi/linphonecore.c:233
+#: ../coreapi/linphonecore.c:234
 msgid "missed"
 msgstr "Perdido"
 
-#: ../coreapi/linphonecore.c:238
+#: ../coreapi/linphonecore.c:239
 #, fuzzy, c-format
 msgid ""
 "%s at %s\n"
@@ -1546,74 +1546,74 @@ msgstr ""
 "Status: %s\n"
 "Duração: %i min %i seg\n"
 
-#: ../coreapi/linphonecore.c:239
+#: ../coreapi/linphonecore.c:240
 msgid "Outgoing call"
 msgstr "Chamadas efetuadas"
 
-#: ../coreapi/linphonecore.c:1312
+#: ../coreapi/linphonecore.c:1321
 #, fuzzy
 msgid "Ready"
 msgstr "Pronto."
 
-#: ../coreapi/linphonecore.c:2184
+#: ../coreapi/linphonecore.c:2205
 msgid "Looking for telephone number destination..."
 msgstr "Procurando por telefone de destino..."
 
-#: ../coreapi/linphonecore.c:2187
+#: ../coreapi/linphonecore.c:2208
 msgid "Could not resolve this number."
 msgstr "Não foi possível encontrar este número."
 
-#: ../coreapi/linphonecore.c:2231
+#: ../coreapi/linphonecore.c:2252
 msgid ""
 "Could not parse given sip address. A sip url usually looks like sip:"
 "user@domain"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2432
+#: ../coreapi/linphonecore.c:2453
 #, fuzzy
 msgid "Contacting"
 msgstr "Contatando "
 
-#: ../coreapi/linphonecore.c:2439
+#: ../coreapi/linphonecore.c:2460
 #, fuzzy
 msgid "Could not call"
 msgstr "Não é possível achar arquivo pixmap: %s"
 
-#: ../coreapi/linphonecore.c:2549
+#: ../coreapi/linphonecore.c:2570
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2731
+#: ../coreapi/linphonecore.c:2752
 #, fuzzy
 msgid "is contacting you"
 msgstr "está chamado você."
 
-#: ../coreapi/linphonecore.c:2732
+#: ../coreapi/linphonecore.c:2753
 msgid " and asked autoanswer."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2732
+#: ../coreapi/linphonecore.c:2753
 msgid "."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2799
+#: ../coreapi/linphonecore.c:2820
 msgid "Modifying call parameters..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3138
+#: ../coreapi/linphonecore.c:3159
 msgid "Connected."
 msgstr "Conectado."
 
-#: ../coreapi/linphonecore.c:3166
+#: ../coreapi/linphonecore.c:3187
 #, fuzzy
 msgid "Call aborted"
 msgstr "Abortado"
 
-#: ../coreapi/linphonecore.c:3357
+#: ../coreapi/linphonecore.c:3378
 msgid "Could not pause the call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3362
+#: ../coreapi/linphonecore.c:3383
 msgid "Pausing the current call..."
 msgstr ""
 
@@ -1827,7 +1827,7 @@ msgstr "Registro falhou (tempo esgotado)."
 msgid "Authentication token is %s"
 msgstr "Informações de autenticação"
 
-#: ../coreapi/linphonecall.c:2319
+#: ../coreapi/linphonecall.c:2355
 #, fuzzy, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
index 66419e69af8ef9dbf7e3c97b07e16b5263a89e3d..0c81d472b8c7b704190f5c950dd2693a2f3078af 100644 (file)
--- 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: 2013-04-08 16:59+0200\n"
+"POT-Creation-Date: 2013-04-24 14:04+0200\n"
 "PO-Revision-Date: 2010-01-22 18:43+0300\n"
 "Last-Translator: Maxim Prokopyev <jazzelastic@gmail.com>\n"
 "Language-Team: Russian <greg@dial.com.ru>\n"
@@ -105,7 +105,7 @@ msgstr "Я"
 msgid "Couldn't find pixmap file: %s"
 msgstr "Невозможно найти графический файл: %s"
 
-#: ../gtk/chat.c:324 ../gtk/friendlist.c:872
+#: ../gtk/chat.c:336 ../gtk/friendlist.c:872
 msgid "Invalid sip contact !"
 msgstr "Неверный sip-контакт!"
 
@@ -174,11 +174,11 @@ msgstr ""
 msgid "Call error"
 msgstr "Ошибка вызова"
 
-#: ../gtk/main.c:1129 ../coreapi/linphonecore.c:3189
+#: ../gtk/main.c:1129 ../coreapi/linphonecore.c:3210
 msgid "Call ended"
 msgstr "Разговор окончен"
 
-#: ../gtk/main.c:1132 ../coreapi/linphonecore.c:239
+#: ../gtk/main.c:1132 ../coreapi/linphonecore.c:240
 msgid "Incoming call"
 msgstr "Входящий вызов"
 
@@ -1508,19 +1508,19 @@ msgstr "2"
 msgid "1"
 msgstr "1"
 
-#: ../coreapi/linphonecore.c:227
+#: ../coreapi/linphonecore.c:228
 msgid "aborted"
 msgstr "отмененный"
 
-#: ../coreapi/linphonecore.c:230
+#: ../coreapi/linphonecore.c:231
 msgid "completed"
 msgstr "завершённый"
 
-#: ../coreapi/linphonecore.c:233
+#: ../coreapi/linphonecore.c:234
 msgid "missed"
 msgstr "пропущенный"
 
-#: ../coreapi/linphonecore.c:238
+#: ../coreapi/linphonecore.c:239
 #, c-format
 msgid ""
 "%s at %s\n"
@@ -1535,23 +1535,23 @@ msgstr ""
 "Статус: %s\n"
 "Длительность: %i мин %i сек\n"
 
-#: ../coreapi/linphonecore.c:239
+#: ../coreapi/linphonecore.c:240
 msgid "Outgoing call"
 msgstr "Исходящий звонок"
 
-#: ../coreapi/linphonecore.c:1312
+#: ../coreapi/linphonecore.c:1321
 msgid "Ready"
 msgstr "Готов"
 
-#: ../coreapi/linphonecore.c:2184
+#: ../coreapi/linphonecore.c:2205
 msgid "Looking for telephone number destination..."
 msgstr "Поиск адреса для телефонного номера..."
 
-#: ../coreapi/linphonecore.c:2187
+#: ../coreapi/linphonecore.c:2208
 msgid "Could not resolve this number."
 msgstr "Не могу найти этот номер."
 
-#: ../coreapi/linphonecore.c:2231
+#: ../coreapi/linphonecore.c:2252
 msgid ""
 "Could not parse given sip address. A sip url usually looks like sip:"
 "user@domain"
@@ -1559,47 +1559,47 @@ msgstr ""
 "Не могу опознать sip адрес. SIP-URL обычно выглядит как sip:"
 "username@domainname"
 
-#: ../coreapi/linphonecore.c:2432
+#: ../coreapi/linphonecore.c:2453
 msgid "Contacting"
 msgstr "Соединение"
 
-#: ../coreapi/linphonecore.c:2439
+#: ../coreapi/linphonecore.c:2460
 msgid "Could not call"
 msgstr "Не удалось позвонить"
 
-#: ../coreapi/linphonecore.c:2549
+#: ../coreapi/linphonecore.c:2570
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "Извините, мы превысили максимальное количество одновременных вызовов"
 
-#: ../coreapi/linphonecore.c:2731
+#: ../coreapi/linphonecore.c:2752
 msgid "is contacting you"
 msgstr "пытается связаться с вами"
 
-#: ../coreapi/linphonecore.c:2732
+#: ../coreapi/linphonecore.c:2753
 msgid " and asked autoanswer."
 msgstr " и ответил автоответчик."
 
-#: ../coreapi/linphonecore.c:2732
+#: ../coreapi/linphonecore.c:2753
 msgid "."
 msgstr "."
 
-#: ../coreapi/linphonecore.c:2799
+#: ../coreapi/linphonecore.c:2820
 msgid "Modifying call parameters..."
 msgstr "Изменение параметров вызова..."
 
-#: ../coreapi/linphonecore.c:3138
+#: ../coreapi/linphonecore.c:3159
 msgid "Connected."
 msgstr "Соединён."
 
-#: ../coreapi/linphonecore.c:3166
+#: ../coreapi/linphonecore.c:3187
 msgid "Call aborted"
 msgstr "Вызов отменён"
 
-#: ../coreapi/linphonecore.c:3357
+#: ../coreapi/linphonecore.c:3378
 msgid "Could not pause the call"
 msgstr "Не удалось приостановить вызов"
 
-#: ../coreapi/linphonecore.c:3362
+#: ../coreapi/linphonecore.c:3383
 msgid "Pausing the current call..."
 msgstr "Приостановление текущего вызова..."
 
@@ -1823,7 +1823,7 @@ msgstr "Регистрация на %s не удалась: %s"
 msgid "Authentication token is %s"
 msgstr "Аутентификационный токен: %s"
 
-#: ../coreapi/linphonecall.c:2319
+#: ../coreapi/linphonecall.c:2355
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
index 814b4d05030bfda8742971e27dae64aa2905ad7e..d0b470f95167ddda75b027891b1767b0094d98bc 100644 (file)
--- a/po/sr.po
+++ b/po/sr.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone 0.7.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-08 16:59+0200\n"
+"POT-Creation-Date: 2013-04-24 14:04+0200\n"
 "PO-Revision-Date: 2013-02-11 19:03+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <gnom@prevod.org>\n"
@@ -106,7 +106,7 @@ msgstr "Ја"
 msgid "Couldn't find pixmap file: %s"
 msgstr "Не могу да пронађем датотеку сличице: %s"
 
-#: ../gtk/chat.c:324 ../gtk/friendlist.c:872
+#: ../gtk/chat.c:336 ../gtk/friendlist.c:872
 msgid "Invalid sip contact !"
 msgstr "Неисправан сип контакт !"
 
@@ -173,11 +173,11 @@ msgstr ""
 msgid "Call error"
 msgstr "Грешка позива"
 
-#: ../gtk/main.c:1129 ../coreapi/linphonecore.c:3189
+#: ../gtk/main.c:1129 ../coreapi/linphonecore.c:3210
 msgid "Call ended"
 msgstr "Позив је завршен"
 
-#: ../gtk/main.c:1132 ../coreapi/linphonecore.c:239
+#: ../gtk/main.c:1132 ../coreapi/linphonecore.c:240
 msgid "Incoming call"
 msgstr "Долазни позив"
 
@@ -1503,19 +1503,19 @@ msgstr "2"
 msgid "1"
 msgstr "1"
 
-#: ../coreapi/linphonecore.c:227
+#: ../coreapi/linphonecore.c:228
 msgid "aborted"
 msgstr "прекинути"
 
-#: ../coreapi/linphonecore.c:230
+#: ../coreapi/linphonecore.c:231
 msgid "completed"
 msgstr "завршени"
 
-#: ../coreapi/linphonecore.c:233
+#: ../coreapi/linphonecore.c:234
 msgid "missed"
 msgstr "пропуштени"
 
-#: ../coreapi/linphonecore.c:238
+#: ../coreapi/linphonecore.c:239
 #, c-format
 msgid ""
 "%s at %s\n"
@@ -1530,23 +1530,23 @@ msgstr ""
 "Стање: %s\n"
 "Трајање: %i мин %i сек\n"
 
-#: ../coreapi/linphonecore.c:239
+#: ../coreapi/linphonecore.c:240
 msgid "Outgoing call"
 msgstr "Одлазни позив"
 
-#: ../coreapi/linphonecore.c:1312
+#: ../coreapi/linphonecore.c:1321
 msgid "Ready"
 msgstr "Спреман"
 
-#: ../coreapi/linphonecore.c:2184
+#: ../coreapi/linphonecore.c:2205
 msgid "Looking for telephone number destination..."
 msgstr "Тражим одредиште телефонског броја..."
 
-#: ../coreapi/linphonecore.c:2187
+#: ../coreapi/linphonecore.c:2208
 msgid "Could not resolve this number."
 msgstr "Не могу да решим овај број."
 
-#: ../coreapi/linphonecore.c:2231
+#: ../coreapi/linphonecore.c:2252
 msgid ""
 "Could not parse given sip address. A sip url usually looks like sip:"
 "user@domain"
@@ -1554,47 +1554,47 @@ msgstr ""
 "Не могу да обрадим дату сип адресу. Сип адреса обично изгледа као „sip:"
 "корисник@домен“"
 
-#: ../coreapi/linphonecore.c:2432
+#: ../coreapi/linphonecore.c:2453
 msgid "Contacting"
 msgstr "Ступам у везу"
 
-#: ../coreapi/linphonecore.c:2439
+#: ../coreapi/linphonecore.c:2460
 msgid "Could not call"
 msgstr "Не могу да позовем"
 
-#: ../coreapi/linphonecore.c:2549
+#: ../coreapi/linphonecore.c:2570
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "Извините, достигли смо највећи број истовремених позива"
 
-#: ../coreapi/linphonecore.c:2731
+#: ../coreapi/linphonecore.c:2752
 msgid "is contacting you"
 msgstr "вам се обраћа"
 
-#: ../coreapi/linphonecore.c:2732
+#: ../coreapi/linphonecore.c:2753
 msgid " and asked autoanswer."
 msgstr " и затражени само-одговор."
 
-#: ../coreapi/linphonecore.c:2732
+#: ../coreapi/linphonecore.c:2753
 msgid "."
 msgstr "."
 
-#: ../coreapi/linphonecore.c:2799
+#: ../coreapi/linphonecore.c:2820
 msgid "Modifying call parameters..."
 msgstr "Мењам параметре позива..."
 
-#: ../coreapi/linphonecore.c:3138
+#: ../coreapi/linphonecore.c:3159
 msgid "Connected."
 msgstr "Повезан сам."
 
-#: ../coreapi/linphonecore.c:3166
+#: ../coreapi/linphonecore.c:3187
 msgid "Call aborted"
 msgstr "Позив је прекинут"
 
-#: ../coreapi/linphonecore.c:3357
+#: ../coreapi/linphonecore.c:3378
 msgid "Could not pause the call"
 msgstr "Не могу да зауставим позив"
 
-#: ../coreapi/linphonecore.c:3362
+#: ../coreapi/linphonecore.c:3383
 msgid "Pausing the current call..."
 msgstr "Заустављам тренутни позив..."
 
@@ -1814,7 +1814,7 @@ msgstr "Уписивање на „%s“ није успело: %s"
 msgid "Authentication token is %s"
 msgstr "Симбол потврђивања идентитета је „%s“"
 
-#: ../coreapi/linphonecall.c:2319
+#: ../coreapi/linphonecall.c:2355
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
index 4f7ec762c722df770daa4b043c74b28daee86982..c814f86c4f0b6b3d3a1089eabd810d648942114d 100644 (file)
--- 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: 2013-04-08 16:59+0200\n"
+"POT-Creation-Date: 2013-04-24 14:04+0200\n"
 "PO-Revision-Date: 2009-02-17 15:22+0100\n"
 "Last-Translator: Emmanuel Frécon <emmanuel.frecon@myjoice.com>\n"
 "Language-Team: SWEDISH <SE@li.org>\n"
@@ -97,7 +97,7 @@ msgstr "Mikrofon av"
 msgid "Couldn't find pixmap file: %s"
 msgstr "Kunde inte hitta pixmap filen: %s"
 
-#: ../gtk/chat.c:324 ../gtk/friendlist.c:872
+#: ../gtk/chat.c:336 ../gtk/friendlist.c:872
 msgid "Invalid sip contact !"
 msgstr "ogiltig SIP kontakt!"
 
@@ -165,11 +165,11 @@ msgstr ""
 msgid "Call error"
 msgstr "Samtalshistorik"
 
-#: ../gtk/main.c:1129 ../coreapi/linphonecore.c:3189
+#: ../gtk/main.c:1129 ../coreapi/linphonecore.c:3210
 msgid "Call ended"
 msgstr "Samtalet slut"
 
-#: ../gtk/main.c:1132 ../coreapi/linphonecore.c:239
+#: ../gtk/main.c:1132 ../coreapi/linphonecore.c:240
 msgid "Incoming call"
 msgstr "Inkommande samtal"
 
@@ -1503,19 +1503,19 @@ msgstr ""
 msgid "1"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:227
+#: ../coreapi/linphonecore.c:228
 msgid "aborted"
 msgstr "avbrytade"
 
-#: ../coreapi/linphonecore.c:230
+#: ../coreapi/linphonecore.c:231
 msgid "completed"
 msgstr "avslutade"
 
-#: ../coreapi/linphonecore.c:233
+#: ../coreapi/linphonecore.c:234
 msgid "missed"
 msgstr "missade"
 
-#: ../coreapi/linphonecore.c:238
+#: ../coreapi/linphonecore.c:239
 #, c-format
 msgid ""
 "%s at %s\n"
@@ -1530,23 +1530,23 @@ msgstr ""
 "Status: %s\n"
 "Längd: %i min %i sek\n"
 
-#: ../coreapi/linphonecore.c:239
+#: ../coreapi/linphonecore.c:240
 msgid "Outgoing call"
 msgstr "Utgående samtal"
 
-#: ../coreapi/linphonecore.c:1312
+#: ../coreapi/linphonecore.c:1321
 msgid "Ready"
 msgstr "Redo"
 
-#: ../coreapi/linphonecore.c:2184
+#: ../coreapi/linphonecore.c:2205
 msgid "Looking for telephone number destination..."
 msgstr "Leta efter telefonnummer för destinationen..."
 
-#: ../coreapi/linphonecore.c:2187
+#: ../coreapi/linphonecore.c:2208
 msgid "Could not resolve this number."
 msgstr "Kan inte nå dett nummer."
 
-#: ../coreapi/linphonecore.c:2231
+#: ../coreapi/linphonecore.c:2252
 msgid ""
 "Could not parse given sip address. A sip url usually looks like sip:"
 "user@domain"
@@ -1554,51 +1554,51 @@ msgstr ""
 "Kan inte förstå angiven SIP adress. En SIP adress vanligen ser ut som sip:"
 "användare@domänen"
 
-#: ../coreapi/linphonecore.c:2432
+#: ../coreapi/linphonecore.c:2453
 msgid "Contacting"
 msgstr "Kontaktar"
 
-#: ../coreapi/linphonecore.c:2439
+#: ../coreapi/linphonecore.c:2460
 #, fuzzy
 msgid "Could not call"
 msgstr "Kunde inte ringa"
 
-#: ../coreapi/linphonecore.c:2549
+#: ../coreapi/linphonecore.c:2570
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2731
+#: ../coreapi/linphonecore.c:2752
 #, fuzzy
 msgid "is contacting you"
 msgstr "kontaktar dig."
 
-#: ../coreapi/linphonecore.c:2732
+#: ../coreapi/linphonecore.c:2753
 msgid " and asked autoanswer."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2732
+#: ../coreapi/linphonecore.c:2753
 msgid "."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2799
+#: ../coreapi/linphonecore.c:2820
 msgid "Modifying call parameters..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3138
+#: ../coreapi/linphonecore.c:3159
 msgid "Connected."
 msgstr "Kopplad"
 
-#: ../coreapi/linphonecore.c:3166
+#: ../coreapi/linphonecore.c:3187
 #, fuzzy
 msgid "Call aborted"
 msgstr "avbrytade"
 
-#: ../coreapi/linphonecore.c:3357
+#: ../coreapi/linphonecore.c:3378
 #, fuzzy
 msgid "Could not pause the call"
 msgstr "Kunde inte ringa"
 
-#: ../coreapi/linphonecore.c:3362
+#: ../coreapi/linphonecore.c:3383
 #, fuzzy
 msgid "Pausing the current call..."
 msgstr "Nuvarande samtal"
@@ -1821,7 +1821,7 @@ msgstr "Registrering hos %s mislyckades: %s"
 msgid "Authentication token is %s"
 msgstr "Linphone - Autentisering krävs"
 
-#: ../coreapi/linphonecall.c:2319
+#: ../coreapi/linphonecall.c:2355
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
index 7c81df3fc81d53c76a204f0320f13a3048ae12d9..0d21351a8b68be8462af7f2f26b30f0879846325 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone 3.3.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-08 16:59+0200\n"
+"POT-Creation-Date: 2013-04-24 14:04+0200\n"
 "PO-Revision-Date: 2011-01-08 23:51+0800\n"
 "Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -97,7 +97,7 @@ msgstr "静音"
 msgid "Couldn't find pixmap file: %s"
 msgstr "无法打开位图文件:%s"
 
-#: ../gtk/chat.c:324 ../gtk/friendlist.c:872
+#: ../gtk/chat.c:336 ../gtk/friendlist.c:872
 msgid "Invalid sip contact !"
 msgstr "无效的 SIP 联系人!"
 
@@ -160,11 +160,11 @@ msgstr "请输入 %s@%s 的密码:"
 msgid "Call error"
 msgstr "呼叫历史"
 
-#: ../gtk/main.c:1129 ../coreapi/linphonecore.c:3189
+#: ../gtk/main.c:1129 ../coreapi/linphonecore.c:3210
 msgid "Call ended"
 msgstr "呼叫结束"
 
-#: ../gtk/main.c:1132 ../coreapi/linphonecore.c:239
+#: ../gtk/main.c:1132 ../coreapi/linphonecore.c:240
 msgid "Incoming call"
 msgstr "呼入"
 
@@ -1514,19 +1514,19 @@ msgstr "2"
 msgid "1"
 msgstr "1"
 
-#: ../coreapi/linphonecore.c:227
+#: ../coreapi/linphonecore.c:228
 msgid "aborted"
 msgstr "中断"
 
-#: ../coreapi/linphonecore.c:230
+#: ../coreapi/linphonecore.c:231
 msgid "completed"
 msgstr "完成"
 
-#: ../coreapi/linphonecore.c:233
+#: ../coreapi/linphonecore.c:234
 msgid "missed"
 msgstr "丢失"
 
-#: ../coreapi/linphonecore.c:238
+#: ../coreapi/linphonecore.c:239
 #, c-format
 msgid ""
 "%s at %s\n"
@@ -1541,23 +1541,23 @@ msgstr ""
 "状态:%s\n"
 "状态:%i 分 %i 秒\n"
 
-#: ../coreapi/linphonecore.c:239
+#: ../coreapi/linphonecore.c:240
 msgid "Outgoing call"
 msgstr "呼出"
 
-#: ../coreapi/linphonecore.c:1312
+#: ../coreapi/linphonecore.c:1321
 msgid "Ready"
 msgstr "就绪"
 
-#: ../coreapi/linphonecore.c:2184
+#: ../coreapi/linphonecore.c:2205
 msgid "Looking for telephone number destination..."
 msgstr "查询电话号码目的地..."
 
-#: ../coreapi/linphonecore.c:2187
+#: ../coreapi/linphonecore.c:2208
 msgid "Could not resolve this number."
 msgstr "该号码无法解析。"
 
-#: ../coreapi/linphonecore.c:2231
+#: ../coreapi/linphonecore.c:2252
 msgid ""
 "Could not parse given sip address. A sip url usually looks like sip:"
 "user@domain"
@@ -1565,50 +1565,50 @@ msgstr ""
 "无法解析给定的 SIP 地址,SIP 地址应有如下格式:\n"
 "sip:用户名@域名"
 
-#: ../coreapi/linphonecore.c:2432
+#: ../coreapi/linphonecore.c:2453
 msgid "Contacting"
 msgstr "联系中"
 
-#: ../coreapi/linphonecore.c:2439
+#: ../coreapi/linphonecore.c:2460
 #, fuzzy
 msgid "Could not call"
 msgstr "无法呼叫"
 
-#: ../coreapi/linphonecore.c:2549
+#: ../coreapi/linphonecore.c:2570
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2731
+#: ../coreapi/linphonecore.c:2752
 msgid "is contacting you"
 msgstr "正在联系您"
 
-#: ../coreapi/linphonecore.c:2732
+#: ../coreapi/linphonecore.c:2753
 msgid " and asked autoanswer."
 msgstr " 并询问了自动回答。"
 
-#: ../coreapi/linphonecore.c:2732
+#: ../coreapi/linphonecore.c:2753
 msgid "."
 msgstr "."
 
-#: ../coreapi/linphonecore.c:2799
+#: ../coreapi/linphonecore.c:2820
 msgid "Modifying call parameters..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3138
+#: ../coreapi/linphonecore.c:3159
 msgid "Connected."
 msgstr "已连接。"
 
-#: ../coreapi/linphonecore.c:3166
+#: ../coreapi/linphonecore.c:3187
 #, fuzzy
 msgid "Call aborted"
 msgstr "中断"
 
-#: ../coreapi/linphonecore.c:3357
+#: ../coreapi/linphonecore.c:3378
 #, fuzzy
 msgid "Could not pause the call"
 msgstr "无法呼叫"
 
-#: ../coreapi/linphonecore.c:3362
+#: ../coreapi/linphonecore.c:3383
 msgid "Pausing the current call..."
 msgstr ""
 
@@ -1823,7 +1823,7 @@ msgstr "注册到 %s 失败: %s"
 msgid "Authentication token is %s"
 msgstr "Linphone - 需要认证"
 
-#: ../coreapi/linphonecall.c:2319
+#: ../coreapi/linphonecall.c:2355
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
index d1b2ce1a734348a0b2286552238c03c97435079c..26a08615095a4d21170aeabe15e0f3b458fa3047 100644 (file)
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone 3.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-08 16:59+0200\n"
+"POT-Creation-Date: 2013-04-24 14:04+0200\n"
 "PO-Revision-Date: 2011-04-06 21:24+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: \n"
@@ -96,7 +96,7 @@ msgstr "靜音"
 msgid "Couldn't find pixmap file: %s"
 msgstr "找不到 pixmap 檔:%s"
 
-#: ../gtk/chat.c:324 ../gtk/friendlist.c:872
+#: ../gtk/chat.c:336 ../gtk/friendlist.c:872
 msgid "Invalid sip contact !"
 msgstr "無效的 sip 連絡人!"
 
@@ -162,11 +162,11 @@ msgstr ""
 msgid "Call error"
 msgstr "通話紀錄"
 
-#: ../gtk/main.c:1129 ../coreapi/linphonecore.c:3189
+#: ../gtk/main.c:1129 ../coreapi/linphonecore.c:3210
 msgid "Call ended"
 msgstr "通話已結束"
 
-#: ../gtk/main.c:1132 ../coreapi/linphonecore.c:239
+#: ../gtk/main.c:1132 ../coreapi/linphonecore.c:240
 msgid "Incoming call"
 msgstr "來電"
 
@@ -1489,19 +1489,19 @@ msgstr "2"
 msgid "1"
 msgstr "1"
 
-#: ../coreapi/linphonecore.c:227
+#: ../coreapi/linphonecore.c:228
 msgid "aborted"
 msgstr "已放棄"
 
-#: ../coreapi/linphonecore.c:230
+#: ../coreapi/linphonecore.c:231
 msgid "completed"
 msgstr "已完成"
 
-#: ../coreapi/linphonecore.c:233
+#: ../coreapi/linphonecore.c:234
 msgid "missed"
 msgstr "未接"
 
-#: ../coreapi/linphonecore.c:238
+#: ../coreapi/linphonecore.c:239
 #, c-format
 msgid ""
 "%s at %s\n"
@@ -1516,69 +1516,69 @@ msgstr ""
 "狀態:%s\n"
 "持續時間:%i 分 %i 秒\n"
 
-#: ../coreapi/linphonecore.c:239
+#: ../coreapi/linphonecore.c:240
 msgid "Outgoing call"
 msgstr "去電"
 
-#: ../coreapi/linphonecore.c:1312
+#: ../coreapi/linphonecore.c:1321
 msgid "Ready"
 msgstr "準備就緒"
 
-#: ../coreapi/linphonecore.c:2184
+#: ../coreapi/linphonecore.c:2205
 msgid "Looking for telephone number destination..."
 msgstr "尋找電話號碼目的端..."
 
-#: ../coreapi/linphonecore.c:2187
+#: ../coreapi/linphonecore.c:2208
 msgid "Could not resolve this number."
 msgstr "無法解析這個號碼。"
 
-#: ../coreapi/linphonecore.c:2231
+#: ../coreapi/linphonecore.c:2252
 msgid ""
 "Could not parse given sip address. A sip url usually looks like sip:"
 "user@domain"
 msgstr "無法解析指定的 sip 位址。sip 網址通常看起來像 sip:user@domain"
 
-#: ../coreapi/linphonecore.c:2432
+#: ../coreapi/linphonecore.c:2453
 msgid "Contacting"
 msgstr "正在連絡"
 
-#: ../coreapi/linphonecore.c:2439
+#: ../coreapi/linphonecore.c:2460
 msgid "Could not call"
 msgstr "無法通話"
 
-#: ../coreapi/linphonecore.c:2549
+#: ../coreapi/linphonecore.c:2570
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "抱歉,我們已達瀏同步通話的最大數目"
 
-#: ../coreapi/linphonecore.c:2731
+#: ../coreapi/linphonecore.c:2752
 msgid "is contacting you"
 msgstr "正在連絡您"
 
-#: ../coreapi/linphonecore.c:2732
+#: ../coreapi/linphonecore.c:2753
 msgid " and asked autoanswer."
 msgstr "並要求自動接聽。"
 
-#: ../coreapi/linphonecore.c:2732
+#: ../coreapi/linphonecore.c:2753
 msgid "."
 msgstr "."
 
-#: ../coreapi/linphonecore.c:2799
+#: ../coreapi/linphonecore.c:2820
 msgid "Modifying call parameters..."
 msgstr "修改通話參數..."
 
-#: ../coreapi/linphonecore.c:3138
+#: ../coreapi/linphonecore.c:3159
 msgid "Connected."
 msgstr "已連線。"
 
-#: ../coreapi/linphonecore.c:3166
+#: ../coreapi/linphonecore.c:3187
 msgid "Call aborted"
 msgstr "通話已放棄"
 
-#: ../coreapi/linphonecore.c:3357
+#: ../coreapi/linphonecore.c:3378
 msgid "Could not pause the call"
 msgstr "無法暫停通話"
 
-#: ../coreapi/linphonecore.c:3362
+#: ../coreapi/linphonecore.c:3383
 msgid "Pausing the current call..."
 msgstr "暫停目前的通話..."
 
@@ -1795,7 +1795,7 @@ msgstr "在 %s 註冊失敗:%s"
 msgid "Authentication token is %s"
 msgstr "驗證失敗"
 
-#: ../coreapi/linphonecall.c:2319
+#: ../coreapi/linphonecall.c:2355
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."