diff --git a/.gitignore b/.gitignore index 4da811c0d..f20d4b31c 100644 --- a/.gitignore +++ b/.gitignore @@ -86,3 +86,4 @@ tester/linphone_log.txt po/linphone.pot .tx/linphone-gtk.audio-assistantdesktopin/ tester/linphone_log.gz.txt +tools/auto_answer diff --git a/CMakeLists.txt b/CMakeLists.txt index fad26da22..46629c8ad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,7 +26,7 @@ project(LINPHONE C CXX) set(LINPHONE_MAJOR_VERSION "3") set(LINPHONE_MINOR_VERSION "8") -set(LINPHONE_MICRO_VERSION "0") +set(LINPHONE_MICRO_VERSION "1") set(LINPHONE_VERSION "${LINPHONE_MAJOR_VERSION}.${LINPHONE_MINOR_VERSION}.${LINPHONE_MICRO_VERSION}") set(LINPHONE_SO_VERSION "6") @@ -94,6 +94,7 @@ endif() find_package(BelleSIP REQUIRED) find_package(Mediastreamer2 REQUIRED) find_package(XML2 REQUIRED) +find_package(Zlib) if(ENABLE_UNIT_TESTS) find_package(CUnit) if(CUNIT_FOUND) @@ -148,6 +149,10 @@ include_directories( ${MEDIASTREAMER2_INCLUDE_DIRS} ${XML2_INCLUDE_DIRS} ) +if(ZLIB_FOUND) + include_directories(${ZLIB_INCLUDE_DIRS}) + set(HAVE_ZLIB 1) +endif() if(SQLITE3_FOUND) include_directories(${SQLITE3_INCLUDE_DIRS}) add_definitions("-DMSG_STORAGE_ENABLED") diff --git a/Makefile.am b/Makefile.am index 194315b92..6d8ead01c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -167,10 +167,10 @@ filelist: zip pull-transifex: tx pull -af - $(MAKE) -C po update-po push-transifex: - tx push -s -t -f --no-interactive + $(MAKE) -C po update-po + tx push -s -f --no-interactive ### WINDOWS @@ -214,7 +214,7 @@ BUNDLEDIR=$(BUNDLEPREFIX)$(MACAPPNAME) #a path prefix where additional libs can be cherry-picked by the bundler. LINPHONE_ADDITIONAL_DEPENDENCIES_PREFIX=/usr/local -bundle: +Linphone.app: rm -rf $(INSTALLDIR) $(MKDIR_P) $(INSTALLDIR) make install DESTDIR=$(INSTALLDIR) @@ -228,9 +228,17 @@ bundle: > $(BUNDLEDIR)/Contents/Resources/etc/pango/pangorc cp -f $(BUNDLEDIR)/Contents/Resources/etc/pango/pango.modules $(BUNDLEDIR)/Contents/Resources/etc/pango/pango.modules.orig sed -e 's:@executable_path.*/::g' $(BUNDLEDIR)/Contents/Resources/etc/pango/pango.modules.orig > $(BUNDLEDIR)/Contents/Resources/etc/pango/pango.modules + patch -R ${BUNDLEDIR}/Contents/Resources/share/themes/Quartz/gtk-2.0/gtkrc ${srcdir}/build/macos/quartz-theme-gtkrc.patch + +bundle: Linphone.app cd $(BUNDLEDIR)/.. && rm -f $(MACAPPZIP) && zip -r $(MACAPPZIP) $(MACAPPNAME) && cd - cd $(BUNDLEDIR)/.. && rm -f $(MAXAPPDMG) && hdiutil create $(MACAPPDMG) -srcfolder $(MACAPPNAME) -ov && cd - +signed-bundle: Linphone.app + codesign --deep -s $(BUNDLE_SIGNING_ID) $(BUNDLEDIR) + cd $(BUNDLEDIR)/.. && rm -f $(MAXAPPDMG) && hdiutil create $(MACAPPDMG) -srcfolder $(MACAPPNAME) -ov && cd - + + ### ### CLEAN diff --git a/NEWS b/NEWS index 8e40b72b6..650178962 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,9 @@ +linphone-3.8.1 -- March 31th, 2015 + Application level improvements: + * Auto-answer ability + * Improvement of UI appearance on Mac OSX + * Bug fixes + linphone-3.8.0 -- March 11th, 2015 Application level improvements: * The video window has now controls in order to switch fullscreen mode and terminate call. diff --git a/README.macos.md b/README.macos.md index 15746cf5e..436f6b967 100644 --- a/README.macos.md +++ b/README.macos.md @@ -13,29 +13,26 @@ ##### Multiple MacOS version support -In order to enable generation of bundle for multiple MacOS version and 32 bit processors, it is recommended to: +In order to enable generation of bundle for older MacOS version, it is recommended to: -1. Edit `/opt/local/etc/macports/macports.conf` to add the following line: + Edit `/opt/local/etc/macports/macports.conf` to add the following line: - > macosx_deployment_target 10.6 - -2. Edit `/opt/local/etc/macports/variants.conf` to add the following line: - - > +universal + > macosx_deployment_target 10.7 + > buildfromsource always ##### Linphone library (liblinphone) sudo port install automake autoconf libtool pkgconfig intltool wget cunit \ - antlr3 speex libvpx readline sqlite3 libsoup openldap libupnp \ + antlr3 speex libvpx readline sqlite3 openldap libupnp \ ffmpeg-devel -gpl2 ##### Linphone UI (GTK version) Install `GTK`. It is recommended to use the `quartz` backend for better integration. - sudo port install gtk2 +quartz +no_x11 - sudo port install gtk-osx-application -python27 + sudo port install gtk2 +quartz +no_x11 libsoup + sudo port install gtk-osx-application +no_python sudo port install hicolor-icon-theme #### Using HomeBrew @@ -62,8 +59,8 @@ The next pieces need to be compiled manually. * To ensure compatibility with multiple MacOS versions it is recommended to do: - export MACOSX_DEPLOYMENT_TARGET=10.6 - export LDFLAGS="-Wl,-headerpad_max_install_names -Wl,-read_only_relocs -Wl,suppress" + export MACOSX_DEPLOYMENT_TARGET=10.7 + export LDFLAGS="-Wl,-headerpad_max_install_names" * (MacPorts only) Install libantlr3c (library used by belle-sip for parsing) @@ -132,10 +129,15 @@ The libvpx build isn't able to produce dual architecture files. To workaround th If you want to generate a portable bundle, then install `gtk-mac-bundler`: git clone https://github.com/jralls/gtk-mac-bundler.git - cd gtk-mac-bundler && make install + cd gtk-mac-bundler + git checkout 6e2ed855aaeae43c29436c342ae83568573b5636 + make install export PATH=$PATH:~/.local/bin # make this dummy charset.alias file for the bundler to be happy: sudo touch /opt/local/lib/charset.alias + # set writing right for owner on the libssl and libcrypto libraries in order gtk-mac-bundler + # be able to rewrite their rpath + sudo chmod u+w /opt/local/lib/libssl.1.0.0.dylib /opt/local/lib/libcrypto.1.0.0.dylib The bundler file in `build/MacOS/linphone.bundle` expects some plugins to be installed in `/opt/local/lib/mediastreamer/plugins`. If you don't need plugins, remove or comment out this line from the bundler file: @@ -160,28 +162,15 @@ Then run, inside Linphone source tree configure as told before but with `--enabl The resulting bundle is located in Linphone build directory, together with a zipped version. * For a better appearance, you can install `gtk-quartz-engine` (a GTK theme) that makes GTK application more similar to other Mac applications (but not perfect). - + sudo port install gnome-common git clone https://github.com/jralls/gtk-quartz-engine.git cd gtk-quartz-engine - autoreconf -i + ./autogen.sh ./configure --prefix=/opt/local CFLAGS="$CFLAGS -Wno-error" && make sudo make install Generate a new bundle to have it included. -### libiconv hack - -The `Makefile.am` rules used to generate the bundle fetch a `libiconv.2.dylib` from a Linphone download page. -This library adds some additional symbols so that dependencies requiring the `iconv` from `/usr/lib` and the ones requiring from the bundle are both satisfied. -In case this library needs to generated, here are the commands: - - wget http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.14.tar.gz - cd libiconv-1.14 - patch -p1 < ../linphone/build/MacOS/libiconv-MacOS.patch - ./configure --prefix=/opt/local --disable-static 'CFLAGS=-arch i386 -arch x86_64 -mmacosx-version-min=10.5' 'LDFLAGS=-arch i386 -arch x86_64 -mmacosx-version-min=10.5' CXXFLAGS="-arch i386 -arch x86_64 -mmacosx-version-min=10.5" && make - make install DESTDIR=/tmp - -The resulted library can be found in `/tmp/opt/local/lib`. diff --git a/build/macos/environment.sh b/build/macos/environment.sh index b466fecc4..fae264e0e 100644 --- a/build/macos/environment.sh +++ b/build/macos/environment.sh @@ -3,5 +3,24 @@ export LINPHONE_WORKDIR="$bundle_res" export GIO_EXTRA_MODULES="$bundle_lib/gio/modules" export PANGO_LIBDIR="$bundle_lib" export PANGO_SYSCONFDIR="$bundle_etc" + +#this is very important not to force a shared library path so that native frameworks can find their dependencies by themselves, +#and not be forced to use the few libraries we have in the bundle that have the same name as native libs (ex: libiconv) export DYLD_LIBRARY_PATH= +#the fucking script of the gtk-mac-bundler resets LANG due to obscure bugs. Set it back. +LANG=`defaults read .GlobalPreferences AppleLocale` + +case "$LANG" in + *.UTF-8) + ;; + *) + if test -d /usr/share/locale/${LANG}.UTF-8 ; then + LANG=${LANG}.UTF-8 + fi + ;; +esac + +export LANG + +echo "LANG is $LANG" \ No newline at end of file diff --git a/build/macos/linphone.bundle b/build/macos/linphone.bundle index 7a5906e9e..8109ff6cb 100644 --- a/build/macos/linphone.bundle +++ b/build/macos/linphone.bundle @@ -104,13 +104,13 @@ want to copy in to the bundle. The "dest" attribute is optional, as usual. Bundler will find all translations of that library/program under the indicated directory and copy them.--> - + + ${prefix:linphone}/share/locale + + ${prefix}/share/locale - - ${prefix}/share/locale - - + ${prefix}/share/locale diff --git a/build/macos/quartz-theme-gtkrc.patch b/build/macos/quartz-theme-gtkrc.patch new file mode 100644 index 000000000..9099f2cac --- /dev/null +++ b/build/macos/quartz-theme-gtkrc.patch @@ -0,0 +1,4 @@ +85c85 +< buttontype = "textured" +--- +> buttontype = "aqua" diff --git a/build/wp8/LibLinphone.vcxproj b/build/wp8/LibLinphone.vcxproj index 93900b840..282d99c2b 100644 --- a/build/wp8/LibLinphone.vcxproj +++ b/build/wp8/LibLinphone.vcxproj @@ -122,6 +122,7 @@ + @@ -141,6 +142,7 @@ + diff --git a/build/wp8/LibLinphone_no_tunnel.vcxproj b/build/wp8/LibLinphone_no_tunnel.vcxproj index 6d8167046..4c31ffbb1 100644 --- a/build/wp8/LibLinphone_no_tunnel.vcxproj +++ b/build/wp8/LibLinphone_no_tunnel.vcxproj @@ -125,6 +125,7 @@ + @@ -143,6 +144,7 @@ + diff --git a/cmake/FindZlib.cmake b/cmake/FindZlib.cmake new file mode 100644 index 000000000..6252049bc --- /dev/null +++ b/cmake/FindZlib.cmake @@ -0,0 +1,55 @@ +############################################################################ +# FindZlib.txt +# Copyright (C) 2015 Belledonne Communications, Grenoble France +# +############################################################################ +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +############################################################################ +# +# - Find the zlib include file and library +# +# ZLIB_FOUND - system has zlib +# ZLIB_INCLUDE_DIRS - the zlib include directory +# ZLIB_LIBRARIES - The libraries needed to use zlib + +set(_ZLIB_ROOT_PATHS + ${CMAKE_INSTALL_PREFIX} +) + +find_path(ZLIB_INCLUDE_DIRS + NAMES zlib.h + HINTS _ZLIB_ROOT_PATHS + PATH_SUFFIXES include +) + +if(ZLIB_INCLUDE_DIRS) + set(HAVE_ZLIB_H 1) +endif() + +find_library(ZLIB_LIBRARIES + NAMES z zlib zlibd + HINTS ${_ZLIB_ROOT_PATHS} + PATH_SUFFIXES bin lib +) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(Zlib + DEFAULT_MSG + ZLIB_INCLUDE_DIRS ZLIB_LIBRARIES HAVE_ZLIB_H +) + +mark_as_advanced(ZLIB_INCLUDE_DIRS ZLIB_LIBRARIES HAVE_ZLIB_H) diff --git a/config.h.cmake b/config.h.cmake index cd6aa1cc3..3adb3cae4 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -39,5 +39,6 @@ #cmakedefine BUILD_WIZARD #cmakedefine HAVE_NOTIFY4 +#cmakedefine HAVE_ZLIB 1 #cmakedefine HAVE_CU_GET_SUITE 1 -#cmakedefine HAVE_CU_CURSES 1 \ No newline at end of file +#cmakedefine HAVE_CU_CURSES 1 diff --git a/configure.ac b/configure.ac index a8e23f911..2187e754a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([linphone],[3.8.0-linphone-daemon],[linphone-developers@nongnu.org]) +AC_INIT([linphone],[3.8.1],[linphone-developers@nongnu.org]) AC_CANONICAL_SYSTEM AC_CONFIG_SRCDIR([coreapi/linphonecore.c]) @@ -337,7 +337,14 @@ AC_ARG_ENABLE(gtk_ui, if test "$gtk_ui" = "true" ; then PKG_CHECK_MODULES(LIBGTK, gtk+-2.0 >= 2.18.0 gthread-2.0) if test "$enable_x11" = "false" ; then - PKG_CHECK_MODULES(LIBGTKMAC,[gtk-mac-integration >= 2.0.1]) + PKG_CHECK_MODULES(LIBGTKMAC,[gtk-mac-integration >= 2.0.1], [found_gtkmac=true], [found_gtkmac=false]) + if test "$found_gtkmac" != "true" ; then + dnl for newest macports, the name changed. + PKG_CHECK_MODULES(LIBGTKMAC,[gtk-mac-integration-gtk2 >= 2.0.1], [found_gtkmac=true], [found_gtkmac=false]) + fi + if test "$found_gtkmac" != "true" ; then + AC_MSG_ERROR([gtk-mac-integration not found. Please install gtk-osx-application package.]) + fi AC_DEFINE([HAVE_GTK_OSX],[1],[Defined when gtk osx is used]) fi else @@ -1008,7 +1015,20 @@ dnl ################################################## dnl # Check for doxygen dnl ################################################## -AC_CHECK_PROG(DOXYGEN,doxygen,doxygen,false) +AC_ARG_ENABLE(doxygen, + [AS_HELP_STRING([--disable-documentation], [Disable documentation generation using doxygen (default=no)])], + [case "${enableval}" in + yes) documentation_enabled=yes;; + no) documentation_enabled=no;; + *) AC_MSG_ERROR("Bad value for --disable-documentation");; + esac], + [documentation_enabled=yes] +) +if test "$documentation_enabled" = "yes" ; then + AC_CHECK_PROG(DOXYGEN,doxygen,doxygen,false) +else + DOXYGEN=false +fi AM_CONDITIONAL(HAVE_DOXYGEN, test "$DOXYGEN" != "false") diff --git a/console/linphonec.c b/console/linphonec.c index 4840a621f..9fa4f4a9a 100644 --- a/console/linphonec.c +++ b/console/linphonec.c @@ -1330,11 +1330,7 @@ handle_configfile_migration() char *old_cfg_gui; char *old_cfg_cli; char *new_cfg; -#if !defined(_WIN32_WCE) const char *home = getenv("HOME"); -#else - const char *home = "."; -#endif /*_WIN32_WCE*/ new_cfg = ms_strdup_printf("%s/.linphonerc", home); /* diff --git a/coreapi/CMakeLists.txt b/coreapi/CMakeLists.txt index 0f9d453a4..73fa16fb9 100644 --- a/coreapi/CMakeLists.txt +++ b/coreapi/CMakeLists.txt @@ -127,6 +127,9 @@ set(LIBS ${MEDIASTREAMER2_LIBRARIES} ${XML2_LIBRARIES} ) +if(ZLIB_FOUND) + list(APPEND LIBS ${ZLIB_LIBRARIES}) +endif() if(SQLITE3_FOUND) list(APPEND LIBS ${SQLITE3_LIBRARIES}) endif() @@ -139,7 +142,7 @@ endif() if(ENABLE_ASSISTANT) list(APPEND LIBS ${SOUP_LIBRARIES}) endif() -if(WIN32) +if(WIN32 AND NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsPhone") list(APPEND LIBS shlwapi) endif() @@ -159,6 +162,9 @@ else() endif() endif() endif() +if(WIN32 AND "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsPhone") + set_target_properties(linphone PROPERTIES PREFIX "lib") +endif() if(ICONV_FOUND) target_include_directories(linphone PUBLIC ${ICONV_INCLUDE_DIRS}) endif() diff --git a/coreapi/Makefile.am b/coreapi/Makefile.am index df58a716b..e57492387 100644 --- a/coreapi/Makefile.am +++ b/coreapi/Makefile.am @@ -164,7 +164,7 @@ endif AM_CPPFLAGS=\ -I$(top_srcdir) -I$(top_srcdir)/include -I$(builddir) \ $(ORTP_CFLAGS) \ - $(MEDIASTREAMER_CFLAGS) + $(MEDIASTREAMER_CFLAGS) COMMON_CFLAGS=\ $(STRICT_OPTIONS) \ @@ -200,14 +200,14 @@ make_gitversion_h: if test -n "$(GITLOG)" ; then \ if test "$(GITDESCRIBE)" != "" ; then \ if test "$(GIT_TAG)" != "$(PACKAGE_VERSION)" ; then \ - echo "*** PACKAGE_VERSION and git tag differ. Please put them identical."; \ + $(ECHO) "*** PACKAGE_VERSION and git tag differ. Please put them identical."; \ exit 1; \ fi ; \ - $(ECHO) -n "#define LIBLINPHONE_GIT_VERSION \"$(GITDESCRIBE)\"" > $(builddir)/$(GITVERSION_FILE_TMP) ; \ + printf "#define LIBLINPHONE_GIT_VERSION \"$(GITDESCRIBE)\"\n" > $(builddir)/$(GITVERSION_FILE_TMP) ; \ elif test "$(GITREVISION)" != "" ; then \ - $(ECHO) -n "#define LIBLINPHONE_GIT_VERSION \"$(LINPHONE_VERSION)_$(GITREVISION)\"" > $(builddir)/$(GITVERSION_FILE_TMP) ; \ + printf "#define LIBLINPHONE_GIT_VERSION \"$(LINPHONE_VERSION)_$(GITREVISION)\"\n" > $(builddir)/$(GITVERSION_FILE_TMP) ; \ else \ - $(ECHO) -n "" > $(builddir)/$(GITVERSION_FILE_TMP) ; \ + printf "" > $(builddir)/$(GITVERSION_FILE_TMP) ; \ fi ; \ if ! test -f $(builddir)/$(GITVERSION_FILE) ; then \ cp -f $(builddir)/$(GITVERSION_FILE_TMP) $(builddir)/$(GITVERSION_FILE) ; \ diff --git a/coreapi/bellesip_sal/sal_impl.h b/coreapi/bellesip_sal/sal_impl.h index a2ec659f7..4cceba127 100644 --- a/coreapi/bellesip_sal/sal_impl.h +++ b/coreapi/bellesip_sal/sal_impl.h @@ -107,6 +107,7 @@ struct SalOp{ bool_t has_auth_pending; SalOpSDPHandling sdp_handling; int auth_requests; /*number of auth requested for this op*/ + bool_t cnx_ip_to_0000_if_sendonly_enabled; /*for */ }; diff --git a/coreapi/bellesip_sal/sal_op_call.c b/coreapi/bellesip_sal/sal_op_call.c index 58b7e9290..acc629f39 100644 --- a/coreapi/bellesip_sal/sal_op_call.c +++ b/coreapi/bellesip_sal/sal_op_call.c @@ -36,7 +36,14 @@ static void call_set_error(SalOp* op,belle_sip_response_t* response){ sal_op_set_error_info_from_response(op,response); op->base.root->callbacks.call_failure(op); } - +static void set_addr_to_0000(char value[]) { + if (ms_is_ipv6(value)) { + strcpy(value,"::0"); + } else { + strcpy(value,"0.0.0.0"); + } + return; +} static void sdp_process(SalOp *h){ ms_message("Doing SDP offer/answer process of type %s",h->sdp_offering ? "outgoing" : "incoming"); if (h->result){ @@ -56,6 +63,15 @@ static void sdp_process(SalOp *h){ belle_sip_object_unref(h->sdp_answer); } offer_answer_initiate_incoming(h->base.local_media,h->base.remote_media,h->result,h->base.root->one_matching_codec); + /*for backward compatibility purpose*/ + if(h->cnx_ip_to_0000_if_sendonly_enabled && sal_media_description_has_dir(h->result,SalStreamSendOnly)) { + set_addr_to_0000(h->result->addr); + for(i=0;iresult->nb_streams;++i){ + if (h->result->streams[i].dir == SalStreamSendOnly) + set_addr_to_0000(h->result->streams[i].rtp_addr); + set_addr_to_0000(h->result->streams[i].rtcp_addr); + } + } h->sdp_answer=(belle_sdp_session_description_t *)belle_sip_object_ref(media_description_to_sdp(h->result)); /*once we have generated the SDP answer, we modify the result description for processing by the upper layer. It should contains media parameters constraint from the remote offer, not our response*/ diff --git a/coreapi/bellesip_sal/sal_op_impl.c b/coreapi/bellesip_sal/sal_op_impl.c index bdd120ae9..796055a55 100644 --- a/coreapi/bellesip_sal/sal_op_impl.c +++ b/coreapi/bellesip_sal/sal_op_impl.c @@ -803,3 +803,9 @@ void sal_call_set_sdp_handling(SalOp *h, SalOpSDPHandling handling) { if (handling != SalOpSDPNormal) ms_message("Enabling special SDP handling for SalOp[%p]!", h); h->sdp_handling = handling; } +void sal_op_cnx_ip_to_0000_if_sendonly_enable(SalOp *op,bool_t yesno) { + op->cnx_ip_to_0000_if_sendonly_enabled = yesno; +} +bool_t sal_op_cnx_ip_to_0000_if_sendonly_enabled(SalOp *op) { + return op->cnx_ip_to_0000_if_sendonly_enabled; +} diff --git a/coreapi/bellesip_sal/sal_sdp.c b/coreapi/bellesip_sal/sal_sdp.c index 806b50e10..2ce189d48 100644 --- a/coreapi/bellesip_sal/sal_sdp.c +++ b/coreapi/bellesip_sal/sal_sdp.c @@ -366,8 +366,8 @@ belle_sdp_session_description_t * media_description_to_sdp ( const SalMediaDescr belle_sdp_session_description_set_session_name ( session_desc, belle_sdp_session_name_create ( desc->name[0]!='\0' ? desc->name : "Talk" ) ); - if ( (!sal_media_description_has_dir ( desc,SalStreamSendOnly ) && !sal_media_description_has_dir ( desc,SalStreamInactive )) - || desc->ice_ufrag[0] != '\0' ) { + if ( !sal_media_description_has_dir ( desc,SalStreamInactive ) || desc->ice_ufrag[0] != '\0' ) { + /*in case of sendonly, setting of the IP on cnx we give a chance to receive stun packets*/ belle_sdp_session_description_set_connection ( session_desc ,belle_sdp_connection_create ( "IN",inet6 ? "IP6" :"IP4",desc->addr ) ); diff --git a/coreapi/callbacks.c b/coreapi/callbacks.c index d3ee638ce..a82b11f33 100644 --- a/coreapi/callbacks.c +++ b/coreapi/callbacks.c @@ -161,7 +161,7 @@ void linphone_core_update_streams(LinphoneCore *lc, LinphoneCall *call, SalMedia linphone_core_enable_mic(lc, linphone_core_mic_enabled(lc)); #ifdef VIDEO_ENABLED if (call->videostream && call->camera_enabled) - video_stream_change_camera(call->videostream,lc->video_conf.device ); + video_stream_change_camera(call->videostream,linphone_call_get_video_device(call)); #endif } /*FIXME ZRTP, might be restarted in any cases ? */ @@ -197,6 +197,15 @@ void linphone_core_update_streams(LinphoneCore *lc, LinphoneCall *call, SalMedia if (call->params->real_early_media && call->state==LinphoneCallOutgoingEarlyMedia){ prepare_early_media_forking(call); } +#ifdef VIDEO_ENABLED + if (call->state==LinphoneCallPausing) { + /*change cam to noweb cam*/ + call->cam = get_nowebcam_device(); + } else if (call->state != LinphoneCallPaused) { + /*restaure web cam*/ + call->cam = lc->video_conf.device; + } +#endif /*VIDEO*/ linphone_call_start_media_streams(call,all_muted,send_ringbacktone); if (call->state==LinphoneCallPausing && call->paused_by_app && ms_list_size(lc->calls)==1){ linphone_core_play_named_tone(lc,LinphoneToneCallOnHold); @@ -491,8 +500,6 @@ static void call_accepted(SalOp *op){ #endif //BUILD_UPNP md=sal_call_get_final_media_description(op); - if (md) /*make sure re-invite will not propose video again*/ - call->params->has_video &= linphone_core_media_description_contains_video_stream(md); switch (call->state){ case LinphoneCallOutgoingProgress: diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c index 5b550a245..1c03ec931 100644 --- a/coreapi/linphonecall.c +++ b/coreapi/linphonecall.c @@ -43,7 +43,7 @@ static const char EC_STATE_STORE[] = ".linphone.ecstate"; static void linphone_call_stats_uninit(LinphoneCallStats *stats); #ifdef VIDEO_ENABLED -static MSWebCam *get_nowebcam_device(){ +MSWebCam *get_nowebcam_device(){ return ms_web_cam_manager_get_cam(ms_web_cam_manager_get(),"StaticImage: Static picture"); } #endif @@ -555,7 +555,7 @@ static void transfer_already_assigned_payload_types(SalMediaDescription *old, Sa } static const char *linphone_call_get_bind_ip_for_stream(LinphoneCall *call, int stream_index){ - const char *bind_ip=call->af==AF_INET6 ? "::0" : "0.0.0.0"; + const char *bind_ip = lp_config_get_string(call->core->config,"rtp","bind_address",call->af==AF_INET6 ? "::0" : "0.0.0.0"); ; if (stream_index<2 && call->media_ports[stream_index].multicast_ip[0]!='\0'){ if (call->dir==LinphoneCallOutgoing){ @@ -611,7 +611,8 @@ void linphone_call_make_local_media_description(LinphoneCore *lc, LinphoneCall * md->nb_streams=(call->biggestdesc ? call->biggestdesc->nb_streams : 1); strncpy(md->addr,call->localip,sizeof(md->addr)); - strncpy(md->username,linphone_address_get_username(addr),sizeof(md->username)); + if (linphone_address_get_username(addr)) /*might be null in case of identity without userinfo*/ + strncpy(md->username,linphone_address_get_username(addr),sizeof(md->username)); if (subject) strncpy(md->name,subject,sizeof(md->name)); if (call->params->down_bw) @@ -647,7 +648,7 @@ void linphone_call_make_local_media_description(LinphoneCore *lc, LinphoneCall * ms_warning("Cannot get audio local ssrc for call [%p]",call); nb_active_streams++; - if (call->params->has_video){ + if (call->params->has_video && (!call->params->internal_call_update || !call->current_params->video_declined)){ strncpy(md->streams[1].rtp_addr,linphone_call_get_public_ip_for_stream(call,1),sizeof(md->streams[1].rtp_addr)); strncpy(md->streams[1].rtcp_addr,linphone_call_get_public_ip_for_stream(call,1),sizeof(md->streams[1].rtcp_addr)); strncpy(md->streams[1].name,"Video",sizeof(md->streams[1].name)-1); @@ -670,6 +671,8 @@ void linphone_call_make_local_media_description(LinphoneCore *lc, LinphoneCall * else ms_warning("Cannot get video local ssrc for call [%p]",call); nb_active_streams++; + } else { + ms_message("Don't put video stream on local offer for call [%p]",call); } if (md->nb_streams < nb_active_streams) @@ -817,7 +820,9 @@ static void linphone_call_init_common(LinphoneCall *call, LinphoneAddress *from, linphone_call_init_stats(&call->stats[LINPHONE_CALL_STATS_AUDIO], LINPHONE_CALL_STATS_AUDIO); linphone_call_init_stats(&call->stats[LINPHONE_CALL_STATS_VIDEO], LINPHONE_CALL_STATS_VIDEO); - +#ifdef VIDEO_ENABLED + call->cam = call->core->video_conf.device; +#endif } void linphone_call_init_stats(LinphoneCallStats *stats, int type) { @@ -973,7 +978,6 @@ static void linphone_call_incoming_select_ip_version(LinphoneCall *call){ */ void linphone_call_set_compatible_incoming_call_parameters(LinphoneCall *call, const SalMediaDescription *md) { int i; - call->params->has_video &= linphone_core_media_description_contains_video_stream(md); /* Handle AVPF, SRTP and DTLS. */ call->params->avpf_enabled = sal_media_description_has_avpf(md); @@ -1013,6 +1017,8 @@ LinphoneCall * linphone_call_new_incoming(LinphoneCore *lc, LinphoneAddress *fro call->core=lc; linphone_call_incoming_select_ip_version(call); + sal_op_cnx_ip_to_0000_if_sendonly_enable(op,lp_config_get_default_int(lc->config,"sip","cnx_ip_to_0000_if_sendonly_enabled",0)); + if (lc->sip_conf.ping_with_options){ #ifdef BUILD_UPNP if (lc->upnp != NULL && linphone_core_get_firewall_policy(lc)==LinphonePolicyUseUpnp && @@ -1171,8 +1177,11 @@ static void linphone_call_set_terminated(LinphoneCall *call){ } void linphone_call_fix_call_parameters(LinphoneCall *call){ - call->params->has_video=call->current_params->has_video; - + if (sal_call_is_offerer(call->op)) { + /*get remote params*/ + const LinphoneCallParams* lcp = linphone_call_get_remote_params(call); + call->current_params->video_declined = call->params->has_video && !lcp->has_video; + } switch(call->params->media_encryption) { case LinphoneMediaEncryptionZRTP: case LinphoneMediaEncryptionDTLS: @@ -1292,6 +1301,11 @@ void linphone_call_set_state(LinphoneCall *call, LinphoneCallState cstate, const linphone_core_multicast_lock_release(call->core); #endif break; + case LinphoneCallStreamsRunning: + if (call->prevstate == LinphoneCallUpdating || call->prevstate == LinphoneCallUpdatedByRemote) { + linphone_core_notify_display_status(lc,_("Call parameters were successfully modified.")); + } + break; default: break; } @@ -1651,16 +1665,17 @@ LinphoneCall *linphone_call_get_replaced_call(LinphoneCall *call){ **/ void linphone_call_enable_camera (LinphoneCall *call, bool_t enable){ #ifdef VIDEO_ENABLED + call->camera_enabled=enable; if ((call->state==LinphoneCallStreamsRunning || call->state==LinphoneCallOutgoingEarlyMedia || call->state==LinphoneCallIncomingEarlyMedia) - && call->videostream!=NULL ){ - LinphoneCore *lc=call->core; - MSWebCam *nowebcam=get_nowebcam_device(); - if (call->camera_enabled!=enable && lc->video_conf.device!=nowebcam){ - video_stream_change_camera(call->videostream, - enable ? lc->video_conf.device : nowebcam); + && call->videostream!=NULL && video_stream_started(call->videostream) ){ + if (video_stream_get_camera(call->videostream) != linphone_call_get_video_device(call)) { + const char *cur_cam, *new_cam; + cur_cam = video_stream_get_camera(call->videostream) ? ms_web_cam_get_name(video_stream_get_camera(call->videostream)) : "NULL"; + new_cam = linphone_call_get_video_device(call) ? ms_web_cam_get_name(linphone_call_get_video_device(call)) : "NULL"; + ms_message("Switching video cam from [%s] to [%s] on call [%p]" , cur_cam, new_cam, call); + video_stream_change_camera(call->videostream, linphone_call_get_video_device(call)); } } - call->camera_enabled=enable; #endif } @@ -1669,7 +1684,11 @@ void linphone_call_enable_camera (LinphoneCall *call, bool_t enable){ **/ void linphone_call_send_vfu_request(LinphoneCall *call) { #ifdef VIDEO_ENABLED - if (call->core->sip_conf.vfu_with_info) { + const LinphoneCallParams *current_params = linphone_call_get_current_params(call); + if (current_params->avpf_enabled && call->videostream && media_stream_get_state((const MediaStream *)call->videostream) == MSStreamStarted) { + ms_message("Request Full Intra Request on call [%p]", call); + video_stream_send_fir(call->videostream); + } else if (call->core->sip_conf.vfu_with_info) { if (LinphoneCallStreamsRunning == linphone_call_get_state(call)) sal_call_send_vfu_request(call->op); } else { @@ -2349,7 +2368,7 @@ void static start_dtls_on_all_streams(LinphoneCall *call) { SalMediaDescription *remote_desc = sal_call_get_remote_media_description(call->op); SalMediaDescription *result_desc = sal_call_get_final_media_description(call->op); if( remote_desc == NULL || result_desc == NULL ){ - ms_warning("Invalid remote or result media description, disabling DTLS"); + /* this can happen in some tricky cases (early-media without SDP in the 200). In that case, simply skip DTLS code */ return; } @@ -2384,7 +2403,7 @@ void static set_dtls_fingerprint_on_all_streams(LinphoneCall *call) { SalMediaDescription *result_desc = sal_call_get_final_media_description(call->op); if( remote_desc == NULL || result_desc == NULL ){ - ms_warning("Invalid remote or final media desc, aborting DTLS fingerprinting"); + /* this can happen in some tricky cases (early-media without SDP in the 200). In that case, simply skip DTLS code */ return; } @@ -2566,9 +2585,8 @@ static void linphone_call_start_video_stream(LinphoneCall *call, bool_t all_inpu if (used_pt!=-1){ VideoStreamDir dir=VideoStreamSendRecv; - MSWebCam *cam=lc->video_conf.device; bool_t is_inactive=FALSE; - + MSWebCam *cam; call->current_params->video_codec = rtp_profile_get_payload(call->video_profile, used_pt); call->current_params->has_video=TRUE; @@ -2596,10 +2614,6 @@ static void linphone_call_start_video_stream(LinphoneCall *call, bool_t all_inpu else dir=VideoStreamSendOnly; } else if (vstream->dir==SalStreamSendOnly && lc->video_conf.capture ){ - if (local_st_desc->dir==SalStreamSendOnly){ - /* localdesc stream dir to SendOnly is when we want to put on hold, so use nowebcam in this case*/ - cam=get_nowebcam_device(); - } dir=VideoStreamSendOnly; }else if (vstream->dir==SalStreamRecvOnly && lc->video_conf.display ){ dir=VideoStreamRecvOnly; @@ -2615,8 +2629,10 @@ static void linphone_call_start_video_stream(LinphoneCall *call, bool_t all_inpu /*either inactive or incompatible with local capabilities*/ is_inactive=TRUE; } - if (call->camera_enabled==FALSE || all_inputs_muted){ + if (all_inputs_muted){ cam=get_nowebcam_device(); + } else { + cam = linphone_call_get_video_device(call); } if (!is_inactive){ if (sal_stream_description_has_srtp(vstream) == TRUE) { @@ -2669,6 +2685,7 @@ static void setZrtpCryptoTypesParameters(MSZrtpParams *params, LinphoneCore *lc) { int i; const MSCryptoSuite *srtp_suites; + MsZrtpCryptoTypesCount ciphersCount, authTagsCount; if (params == NULL) return; if (lc == NULL) return; @@ -2705,7 +2722,18 @@ static void setZrtpCryptoTypesParameters(MSZrtpParams *params, LinphoneCore *lc) } } - params->keyAgreementsCount = linphone_core_get_zrtp_key_agreements(lc, params->keyAgreements); + /* linphone_core_get_srtp_crypto_suites is used to determine sensible defaults; here each can be overridden */ + ciphersCount = linphone_core_get_zrtp_cipher_suites(lc, params->ciphers); /* if not present in config file, params->ciphers is not modified */ + if (ciphersCount!=0) { /* use zrtp_cipher_suites config only when present, keep config from srtp_crypto_suite otherwise */ + params->ciphersCount = ciphersCount; + } + params->hashesCount = linphone_core_get_zrtp_hash_suites(lc, params->hashes); + authTagsCount = linphone_core_get_zrtp_auth_suites(lc, params->authTags); /* if not present in config file, params->authTags is not modified */ + if (authTagsCount!=0) { + params->authTagsCount = authTagsCount; /* use zrtp_auth_suites config only when present, keep config from srtp_crypto_suite otherwise */ + } + params->sasTypesCount = linphone_core_get_zrtp_sas_suites(lc, params->sasTypes); + params->keyAgreementsCount = linphone_core_get_zrtp_key_agreement_suites(lc, params->keyAgreements); } void linphone_call_start_media_streams(LinphoneCall *call, bool_t all_inputs_muted, bool_t send_ringbacktone){ @@ -3313,6 +3341,17 @@ static void report_bandwidth(LinphoneCall *call, MediaStream *as, MediaStream *v call->stats[LINPHONE_CALL_STATS_AUDIO].rtcp_upload_bandwidth=(as_active) ? (media_stream_get_rtcp_up_bw(as)*1e-3) : 0; call->stats[LINPHONE_CALL_STATS_VIDEO].rtcp_download_bandwidth=(vs_active) ? (media_stream_get_rtcp_down_bw(vs)*1e-3) : 0; call->stats[LINPHONE_CALL_STATS_VIDEO].rtcp_upload_bandwidth=(vs_active) ? (media_stream_get_rtcp_up_bw(vs)*1e-3) : 0; + if (as_active) { + call->stats[LINPHONE_CALL_STATS_AUDIO].updated|=LINPHONE_CALL_STATS_PERIODICAL_UPDATE; + linphone_core_notify_call_stats_updated(call->core, call, &call->stats[LINPHONE_CALL_STATS_AUDIO]); + call->stats[LINPHONE_CALL_STATS_AUDIO].updated=0; + } + if (vs_active) { + call->stats[LINPHONE_CALL_STATS_VIDEO].updated|=LINPHONE_CALL_STATS_PERIODICAL_UPDATE; + linphone_core_notify_call_stats_updated(call->core, call, &call->stats[LINPHONE_CALL_STATS_VIDEO]); + call->stats[LINPHONE_CALL_STATS_VIDEO].updated=0; + + } ms_message( "Bandwidth usage for call [%p]:\n" "\tRTP audio=[d=%5.1f,u=%5.1f], video=[d=%5.1f,u=%5.1f] kbits/sec\n" @@ -3327,6 +3366,7 @@ static void report_bandwidth(LinphoneCall *call, MediaStream *as, MediaStream *v call->stats[LINPHONE_CALL_STATS_VIDEO].rtcp_download_bandwidth, call->stats[LINPHONE_CALL_STATS_VIDEO].rtcp_upload_bandwidth ); + } static void linphone_core_disconnected(LinphoneCore *lc, LinphoneCall *call){ @@ -3394,6 +3434,7 @@ static void handle_ice_events(LinphoneCall *call, OrtpEvent *ev){ ice_session_select_candidates(call->ice_session); if (ice_session_role(call->ice_session) == IR_Controlling && lp_config_get_int(call->core->config, "sip", "update_call_when_ice_completed", TRUE)) { + params->internal_call_update = TRUE; linphone_core_update_call(call->core, call, params); } change_ice_media_destinations(call); @@ -3404,6 +3445,7 @@ static void handle_ice_events(LinphoneCall *call, OrtpEvent *ev){ ice_session_select_candidates(call->ice_session); if (ice_session_role(call->ice_session) == IR_Controlling) { /* At least one ICE session has succeeded, so perform a call update. */ + params->internal_call_update = TRUE; linphone_core_update_call(call->core, call, params); } } @@ -3499,7 +3541,13 @@ void linphone_call_notify_stats_updated(LinphoneCall *call, int stream_index){ LinphoneCallStats *stats=&call->stats[stream_index]; LinphoneCore *lc=call->core; if (stats->updated){ - linphone_reporting_on_rtcp_update(call, stream_index); + switch(stats->updated) { + case LINPHONE_CALL_STATS_RECEIVED_RTCP_UPDATE: + case LINPHONE_CALL_STATS_SENT_RTCP_UPDATE: + linphone_reporting_on_rtcp_update(call, stream_index); + break; + default:break; + } linphone_core_notify_call_stats_updated(lc, call, stats); stats->updated = 0; } @@ -3563,18 +3611,29 @@ void linphone_call_background_tasks(LinphoneCall *call, bool_t one_second_elapse int disconnect_timeout = linphone_core_get_nortp_timeout(call->core); bool_t disconnected=FALSE; - if ((call->state==LinphoneCallStreamsRunning || call->state==LinphoneCallOutgoingEarlyMedia || call->state==LinphoneCallIncomingEarlyMedia) && one_second_elapsed){ - float audio_load=0, video_load=0; - if (call->audiostream!=NULL){ - if (call->audiostream->ms.sessions.ticker) - audio_load=ms_ticker_get_average_load(call->audiostream->ms.sessions.ticker); + switch (call->state) { + case LinphoneCallStreamsRunning: + case LinphoneCallOutgoingEarlyMedia: + case LinphoneCallIncomingEarlyMedia: + case LinphoneCallPausedByRemote: + case LinphoneCallPaused: + if (one_second_elapsed){ + float audio_load=0, video_load=0; + if (call->audiostream!=NULL){ + if (call->audiostream->ms.sessions.ticker) + audio_load=ms_ticker_get_average_load(call->audiostream->ms.sessions.ticker); + } + if (call->videostream!=NULL){ + if (call->videostream->ms.sessions.ticker) + video_load=ms_ticker_get_average_load(call->videostream->ms.sessions.ticker); + } + report_bandwidth(call,(MediaStream*)call->audiostream,(MediaStream*)call->videostream); + ms_message("Thread processing load: audio=%f\tvideo=%f",audio_load,video_load); } - if (call->videostream!=NULL){ - if (call->videostream->ms.sessions.ticker) - video_load=ms_ticker_get_average_load(call->videostream->ms.sessions.ticker); - } - report_bandwidth(call,(MediaStream*)call->audiostream,(MediaStream*)call->videostream); - ms_message("Thread processing load: audio=%f\tvideo=%f",audio_load,video_load); + break; + default: + /*no stats for other states*/ + break; } #ifdef BUILD_UPNP @@ -3838,3 +3897,11 @@ void linphone_call_set_native_video_window_id(LinphoneCall *call, unsigned long } #endif } +#ifdef VIDEO_ENABLED +MSWebCam *linphone_call_get_video_device(const LinphoneCall *call) { + if (call->camera_enabled==FALSE) + return get_nowebcam_device(); + else + return call->cam; +} +#endif diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index c22229cd8..82eb5f742 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -171,6 +171,10 @@ void linphone_core_set_log_file(FILE *file) { } void linphone_core_set_log_level(OrtpLogLevel loglevel) { + linphone_core_set_log_level_mask(loglevel); +} + +void linphone_core_set_log_level_mask(OrtpLogLevel loglevel) { ortp_set_log_level_mask(loglevel); if (loglevel == 0) { sal_disable_logs(); @@ -1095,7 +1099,7 @@ static bool_t get_codec(LinphoneCore *lc, SalStreamType type, int index, Payload MSList **default_list=(type==SalAudio) ? &lc->default_audio_codecs : &lc->default_video_codecs; if (type==SalAudio) ms_warning("Codec %s/%i/%i read from conf is not in the default list.",mime,rate,channels); - else + else ms_warning("Codec %s/%i read from conf is not in the default list.",mime,rate); pt=payload_type_new(); pt->type=(type==SalAudio) ? PAYLOAD_AUDIO_PACKETIZED : PAYLOAD_VIDEO; @@ -1165,14 +1169,18 @@ static void codecs_config_read(LinphoneCore *lc) audio_codecs=codec_append_if_new(audio_codecs, pt); } } - audio_codecs=add_missing_codecs(lc->default_audio_codecs,audio_codecs); + if( lp_config_get_int(lc->config, "misc", "add_missing_audio_codecs", 1) == 1 ){ + audio_codecs=add_missing_codecs(lc->default_audio_codecs,audio_codecs); + } for (i=0;get_codec(lc,SalVideo,i,&pt);i++){ if (pt){ video_codecs=codec_append_if_new(video_codecs, pt); } } - video_codecs=add_missing_codecs(lc->default_video_codecs,video_codecs); + if( lp_config_get_int(lc->config, "misc", "add_missing_video_codecs", 1) == 1 ){ + video_codecs=add_missing_codecs(lc->default_video_codecs,video_codecs); + } linphone_core_set_audio_codecs(lc,audio_codecs); linphone_core_set_video_codecs(lc,video_codecs); linphone_core_update_allocated_audio_bandwidth(lc); @@ -1314,7 +1322,7 @@ void linphone_core_set_adaptive_rate_algorithm(LinphoneCore *lc, const char* alg * See linphone_core_set_adaptive_rate_algorithm(). **/ const char * linphone_core_get_adaptive_rate_algorithm(const LinphoneCore *lc){ - return lp_config_get_string(lc->config, "net", "adaptive_rate_algorithm", "Stateful"); + return lp_config_get_string(lc->config, "net", "adaptive_rate_algorithm", "Simple"); } bool_t linphone_core_rtcp_enabled(const LinphoneCore *lc){ @@ -1565,7 +1573,7 @@ static void linphone_core_register_default_codecs(LinphoneCore *lc){ const char *aac_fmtp162248, *aac_fmtp3244; bool_t opus_enabled=TRUE; /*default enabled audio codecs, in order of preference*/ -#ifdef __arm__ +#if defined(__arm__) || defined(_M_ARM) /*hack for opus, that needs to be disabed by default on ARM single processor, otherwise there is no cpu left for video processing*/ if (ms_get_cpu_count()==1) opus_enabled=FALSE; #endif @@ -1646,10 +1654,9 @@ static void linphone_core_init(LinphoneCore * lc, const LinphoneCoreVTable *vtab ms_init(); linphone_core_register_default_codecs(lc); - /* create a mediastreamer2 event queue and set it as global */ + /* Get the mediastreamer2 event queue */ /* This allows to run event's callback in linphone_core_iterate() */ - lc->msevq=ms_event_queue_new(); - ms_set_global_event_queue(lc->msevq); + lc->msevq=ms_factory_get_event_queue(ms_factory_get_fallback()); lc->sal=sal_init(); @@ -1754,12 +1761,21 @@ int linphone_core_set_primary_contact(LinphoneCore *lc, const char *contact) { LinphoneAddress *ctt; + if( lc->sip_conf.contact != NULL && strcmp(lc->sip_conf.contact, contact) == 0){ + /* changing for the same contact: no need to do anything */ + return 0; + } + if ((ctt=linphone_address_new(contact))==0) { ms_error("Bad contact url: %s",contact); return -1; } + if (lc->sip_conf.contact!=NULL) ms_free(lc->sip_conf.contact); lc->sip_conf.contact=ms_strdup(contact); + lp_config_set_string(lc->config, "sip", "contact", lc->sip_conf.contact); + + /* clean the guessed contact, we have to regenerate it */ if (lc->sip_conf.guessed_contact!=NULL){ ms_free(lc->sip_conf.guessed_contact); lc->sip_conf.guessed_contact=NULL; @@ -2223,7 +2239,7 @@ int _linphone_core_apply_transports(LinphoneCore *lc){ Sal *sal=lc->sal; const char *anyaddr; LCSipTransports *tr=&lc->sip_conf.transports; - + const char* listening_address; /*first of all invalidate all current registrations so that we can register again with new transports*/ __linphone_core_invalidate_registers(lc); @@ -2233,24 +2249,27 @@ int _linphone_core_apply_transports(LinphoneCore *lc){ anyaddr="0.0.0.0"; sal_unlisten_ports(sal); + + listening_address = lp_config_get_string(lc->config,"sip","bind_address",anyaddr); + if (lc->tunnel && linphone_tunnel_sip_enabled(lc->tunnel) && linphone_tunnel_get_activated(lc->tunnel)){ if (sal_listen_port(sal,anyaddr,tr->udp_port,SalTransportUDP,TRUE)!=0){ transport_error(lc,"udp+tunnel",tr->udp_port); } }else{ if (tr->udp_port!=0){ - if (sal_listen_port(sal,anyaddr,tr->udp_port,SalTransportUDP,FALSE)!=0){ + if (sal_listen_port(sal,listening_address,tr->udp_port,SalTransportUDP,FALSE)!=0){ transport_error(lc,"udp",tr->udp_port); } } if (tr->tcp_port!=0){ - if (sal_listen_port (sal,anyaddr,tr->tcp_port,SalTransportTCP,FALSE)!=0){ + if (sal_listen_port (sal,listening_address,tr->tcp_port,SalTransportTCP,FALSE)!=0){ transport_error(lc,"tcp",tr->tcp_port); } } if (linphone_core_sip_transport_supported(lc,LinphoneTransportTls)){ if (tr->tls_port!=0){ - if (sal_listen_port (sal,anyaddr,tr->tls_port,SalTransportTLS,FALSE)!=0){ + if (sal_listen_port (sal,listening_address,tr->tls_port,SalTransportTLS,FALSE)!=0){ transport_error(lc,"tls",tr->tls_port); } } @@ -2311,7 +2330,7 @@ int linphone_core_set_sip_transports(LinphoneCore *lc, const LCSipTransports * t /** * Retrieves the port configuration used for each transport (udp, tcp, tls). * A zero value port for a given transport means the transport - * is not used. A value of LC_SIP_TRANSPORT_RANDOM (-1) means the port is to be choosen randomly by the system. + * is not used. A value of LC_SIP_TRANSPORT_RANDOM (-1) means the port is to be chosen randomly by the system. * @ingroup network_parameters **/ int linphone_core_get_sip_transports(LinphoneCore *lc, LCSipTransports *tr){ @@ -3115,6 +3134,7 @@ void linphone_configure_op(LinphoneCore *lc, SalOp *op, const LinphoneAddress *d sal_address_destroy(new_contact); } } + sal_op_cnx_ip_to_0000_if_sendonly_enable(op,lp_config_get_default_int(lc->config,"sip","cnx_ip_to_0000_if_sendonly_enabled",0)); /*also set in linphone_call_new_incoming*/ } /** @@ -3639,7 +3659,6 @@ int _linphone_core_accept_call_update(LinphoneCore *lc, LinphoneCall *call, cons ms_warning("Video isn't supported in conference"); call->params->has_video = FALSE; } - call->params->has_video &= linphone_core_media_description_contains_video_stream(remote_desc); linphone_call_init_media_streams(call); /*so that video stream is initialized if necessary*/ if (call->ice_session != NULL) { if (linphone_call_prepare_ice(call,TRUE)==1) @@ -4158,6 +4177,9 @@ int linphone_core_get_inc_timeout(LinphoneCore *lc){ **/ void linphone_core_set_in_call_timeout(LinphoneCore *lc, int seconds){ lc->sip_conf.in_call_timeout=seconds; + if( linphone_core_ready(lc)){ + lp_config_set_int(lc->config, "sip", "in_call_timeout", seconds); + } } /** @@ -4809,7 +4831,7 @@ static void linphone_core_mute_audio_stream(LinphoneCore *lc, AudioStream *st, b } else { audio_stream_set_mic_gain_db(st, lc->sound_conf.soft_mic_lev); } - + if ( linphone_core_get_rtp_no_xmit_on_audio_mute(lc) ){ audio_stream_mute_rtp(st,val); } @@ -6323,7 +6345,6 @@ static void linphone_core_uninit(LinphoneCore *lc) } #endif - ms_event_queue_destroy(lc->msevq); lc->msevq=NULL; /* save all config */ ui_config_uninit(lc); @@ -6886,9 +6907,7 @@ const char *linphone_media_encryption_to_string(LinphoneMediaEncryption menc){ return "INVALID"; } -/** - * Returns whether a media encryption scheme is supported by the LinphoneCore engine -**/ + bool_t linphone_core_media_encryption_supported(const LinphoneCore *lc, LinphoneMediaEncryption menc){ switch(menc){ case LinphoneMediaEncryptionSRTP: diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h index 4f642acc3..761bdcd63 100644 --- a/coreapi/linphonecore.h +++ b/coreapi/linphonecore.h @@ -513,6 +513,7 @@ typedef enum _LinphoneUpnpState LinphoneUpnpState; #define LINPHONE_CALL_STATS_RECEIVED_RTCP_UPDATE (1 << 0) /**< received_rtcp field of LinphoneCallStats object has been updated */ #define LINPHONE_CALL_STATS_SENT_RTCP_UPDATE (1 << 1) /**< sent_rtcp field of LinphoneCallStats object has been updated */ +#define LINPHONE_CALL_STATS_PERIODICAL_UPDATE (1 << 2) /**< Every seconds LinphoneCallStats object has been updated */ /** @@ -529,7 +530,7 @@ typedef struct _LinphoneCallStats LinphoneCallStats; * The LinphoneCallStats objects carries various statistic informations regarding quality of audio or video streams. * * To receive these informations periodically and as soon as they are computed, the application is invited to place a #LinphoneCoreCallStatsUpdatedCb callback in the LinphoneCoreVTable structure - * it passes for instanciating the LinphoneCore object (see linphone_core_new() ). + * it passes for instantiating the LinphoneCore object (see linphone_core_new() ). * * At any time, the application can access last computed statistics using linphone_call_get_audio_stats() or linphone_call_get_video_stats(). **/ @@ -1166,7 +1167,7 @@ LINPHONE_PUBLIC const char *linphone_proxy_config_get_custom_header(LinphoneProx /** * Set the value of a custom header sent to the server in REGISTERs request. * @param cfg the proxy config object - * @param header_name the header name + * @param header_name the header name * @param header_value the header's value **/ LINPHONE_PUBLIC void linphone_proxy_config_set_custom_header(LinphoneProxyConfig *cfg, const char *header_name, const char *header_value); @@ -2072,6 +2073,12 @@ LINPHONE_PUBLIC void linphone_core_set_log_handler(OrtpLogFunc logfunc); * @param file A pointer to the FILE structure of the file to write to. */ LINPHONE_PUBLIC void linphone_core_set_log_file(FILE *file); + +/** + * @deprecated Use #linphone_core_set_log_level_mask instead, which is exactly the + * same function.. +**/ +LINPHONE_PUBLIC void linphone_core_set_log_level(OrtpLogLevel loglevel); /** * Define the log level. * @@ -2082,7 +2089,7 @@ LINPHONE_PUBLIC void linphone_core_set_log_file(FILE *file); * * @param loglevel A bitmask of the log levels to set. */ -LINPHONE_PUBLIC void linphone_core_set_log_level(OrtpLogLevel loglevel); +LINPHONE_PUBLIC void linphone_core_set_log_level_mask(OrtpLogLevel loglevel); LINPHONE_PUBLIC void linphone_core_enable_logs(FILE *file); LINPHONE_PUBLIC void linphone_core_enable_logs_with_cb(OrtpLogFunc logfunc); LINPHONE_PUBLIC void linphone_core_disable_logs(void); diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc index 49a8b133a..b372f393c 100644 --- a/coreapi/linphonecore_jni.cc +++ b/coreapi/linphonecore_jni.cc @@ -2892,6 +2892,21 @@ extern "C" jobject Java_org_linphone_core_LinphoneFriendImpl_getCore(JNIEnv* en } return NULL; } +extern "C" void Java_org_linphone_core_LinphoneFriendImpl_setRefKey(JNIEnv* env + ,jobject thiz + ,jlong ptr + ,jstring jkey) { + const char* key = env->GetStringUTFChars(jkey, NULL); + linphone_friend_set_ref_key((LinphoneFriend*)ptr,key); + env->ReleaseStringUTFChars(jkey, key); +} +extern "C" jstring Java_org_linphone_core_LinphoneFriendImpl_getRefKey(JNIEnv* env + ,jobject thiz + ,jlong ptr) { + const char * key = linphone_friend_get_ref_key((LinphoneFriend *)ptr); + return key ? env->NewStringUTF(key) : NULL; +} + /* * Class: org_linphone_core_LinphoneFriendImpl diff --git a/coreapi/lpconfig.c b/coreapi/lpconfig.c index e6b7b4098..d7eb6ad5c 100644 --- a/coreapi/lpconfig.c +++ b/coreapi/lpconfig.c @@ -94,7 +94,16 @@ LpItem * lp_item_new(const char *key, const char *value){ LpItem * lp_comment_new(const char *comment){ LpItem *item=lp_new0(LpItem,1); + char* pos = NULL; item->value=ortp_strdup(comment); + + pos=strchr(item->value,'\r'); + if (pos==NULL) + pos=strchr(item->value,'\n'); + + if(pos) { + *pos='\0'; /*replace the '\n' */ + } item->is_comment=TRUE; return item; } @@ -567,7 +576,7 @@ void lp_config_set_float(LpConfig *lpconfig,const char *section, const char *key void lp_item_write(LpItem *item, FILE *file){ if (item->is_comment) - fprintf(file,"%s",item->value); + fprintf(file,"%s\n",item->value); else if (item->value && item->value[0] != '\0' ) fprintf(file,"%s=%s\n",item->key,item->value); else { @@ -696,18 +705,12 @@ const char* lp_config_get_default_string(const LpConfig *lpconfig, const char *s static char *_lp_config_dirname(char *path) { #ifdef _MSC_VER -#ifdef WINAPI_FAMILY_PHONE_APP char drive[_MAX_DRIVE]; char dir[_MAX_DIR]; char fname[_MAX_FNAME]; char ext[_MAX_EXT]; _splitpath(path, drive, dir, fname, ext); return ms_strdup_printf("%s%s", drive, dir); -#else - char *dir = ms_strdup(path); - PathRemoveFileSpec(dir); - return dir; -#endif #else char *tmp = ms_strdup(path); char *dir = ms_strdup(dirname(tmp)); @@ -735,9 +738,14 @@ void lp_config_write_relative_file(const LpConfig *lpconfig, const char *filenam } int lp_config_read_relative_file(const LpConfig *lpconfig, const char *filename, char *data, size_t max_length) { - char *dir = _lp_config_dirname(lpconfig->filename); - char *filepath = ms_strdup_printf("%s/%s", dir, filename); - FILE *file = fopen(filepath, "r"); + char *dir; + char *filepath; + FILE *file; + + if (lpconfig->filename == NULL) return -1; + dir = _lp_config_dirname(lpconfig->filename); + filepath = ms_strdup_printf("%s/%s", dir, filename); + file = fopen(filepath, "r"); if(file != NULL) { if(fread(data, 1, max_length, file)<=0) { ms_error("%s could not be loaded. %s", filepath, strerror(errno)); diff --git a/coreapi/misc.c b/coreapi/misc.c index f978e2948..9d3d76989 100644 --- a/coreapi/misc.c +++ b/coreapi/misc.c @@ -537,7 +537,7 @@ void linphone_core_adapt_to_network(LinphoneCore *lc, int ping_time_ms, Linphone static void stun_server_resolved(LinphoneCore *lc, const char *name, struct addrinfo *addrinfo){ if (lc->net_conf.stun_addrinfo){ - freeaddrinfo(lc->net_conf.stun_addrinfo); + belle_sip_freeaddrinfo(lc->net_conf.stun_addrinfo); lc->net_conf.stun_addrinfo=NULL; } if (addrinfo){ @@ -555,7 +555,7 @@ void linphone_core_resolve_stun_server(LinphoneCore *lc){ * TODO: use IPv6 resolution if linphone_core_ipv6_enabled()==TRUE and use V4Mapped addresses for ICE gathering. */ const char *server=lc->net_conf.stun_server; - if (lc->sal && server){ + if (lc->sal && server && !lc->net_conf.stun_res){ char host[NI_MAXHOST]; int port=3478; linphone_parse_host_port(server,host,sizeof(host),&port); @@ -1599,14 +1599,17 @@ static char * seperate_string_list(char **str) { } } -MsZrtpCryptoTypesCount linphone_core_get_zrtp_key_agreements(LinphoneCore *lc, MSZrtpKeyAgreement keyAgreements[MS_MAX_ZRTP_CRYPTO_TYPES]){ - char *config=strdup(lp_config_get_string(lc->config, "sip", "zrtp_key_agreements_suites", "MS_ZRTP_KEY_AGREEMENT_DH3K, MS_ZRTP_KEY_AGREEMENT_DH2K")); - char *entry; +MsZrtpCryptoTypesCount linphone_core_get_zrtp_key_agreement_suites(LinphoneCore *lc, MSZrtpKeyAgreement keyAgreements[MS_MAX_ZRTP_CRYPTO_TYPES]){ + char * zrtpConfig = (char*)lp_config_get_string(lc->config, "sip", "zrtp_key_agreements_suites", NULL); MsZrtpCryptoTypesCount key_agreements_count = 0; - - if (config == NULL) return 0; - - while ((entry = seperate_string_list(&config))) { + char * entry, * origPtr; + if (zrtpConfig == NULL) { + return 0; + } + + origPtr = strdup(zrtpConfig); + zrtpConfig = origPtr; + while ((entry = seperate_string_list(&zrtpConfig))) { const MSZrtpKeyAgreement agreement = ms_zrtp_key_agreement_from_string(entry); if (agreement != MS_ZRTP_KEY_AGREEMENT_INVALID) { ms_message("Configured zrtp key agreement: '%s'", ms_zrtp_key_agreement_to_string(agreement)); @@ -1614,9 +1617,97 @@ MsZrtpCryptoTypesCount linphone_core_get_zrtp_key_agreements(LinphoneCore *lc, M } } + free(origPtr); return key_agreements_count; } +MsZrtpCryptoTypesCount linphone_core_get_zrtp_cipher_suites(LinphoneCore *lc, MSZrtpCipher ciphers[MS_MAX_ZRTP_CRYPTO_TYPES]){ + char * zrtpConfig = (char*)lp_config_get_string(lc->config, "sip", "zrtp_cipher_suites", NULL); + MsZrtpCryptoTypesCount cipher_count = 0; + char * entry, * origPtr; + if (zrtpConfig == NULL) { + return 0; + } + + origPtr = strdup(zrtpConfig); + zrtpConfig = origPtr; + while ((entry = seperate_string_list(&zrtpConfig))) { + const MSZrtpCipher cipher = ms_zrtp_cipher_from_string(entry); + if (cipher != MS_ZRTP_CIPHER_INVALID) { + ms_message("Configured zrtp cipher: '%s'", ms_zrtp_cipher_to_string(cipher)); + ciphers[cipher_count++] = cipher; + } + } + + free(origPtr); + return cipher_count; +} + +MsZrtpCryptoTypesCount linphone_core_get_zrtp_hash_suites(LinphoneCore *lc, MSZrtpHash hashes[MS_MAX_ZRTP_CRYPTO_TYPES]){ + char * zrtpConfig = (char*)lp_config_get_string(lc->config, "sip", "zrtp_hash_suites", NULL); + MsZrtpCryptoTypesCount hash_count = 0; + char * entry, * origPtr; + if (zrtpConfig == NULL) { + return 0; + } + + origPtr = strdup(zrtpConfig); + zrtpConfig = origPtr; + while ((entry = seperate_string_list(&zrtpConfig))) { + const MSZrtpHash hash = ms_zrtp_hash_from_string(entry); + if (hash != MS_ZRTP_HASH_INVALID) { + ms_message("Configured zrtp hash: '%s'", ms_zrtp_hash_to_string(hash)); + hashes[hash_count++] = hash; + } + } + + free(origPtr); + return hash_count; +} + +MsZrtpCryptoTypesCount linphone_core_get_zrtp_auth_suites(LinphoneCore *lc, MSZrtpAuthTag authTags[MS_MAX_ZRTP_CRYPTO_TYPES]){ + char * zrtpConfig = (char*)lp_config_get_string(lc->config, "sip", "zrtp_auth_suites", NULL); + MsZrtpCryptoTypesCount auth_tag_count = 0; + char * entry, * origPtr; + if (zrtpConfig == NULL) { + return 0; + } + + origPtr = strdup(zrtpConfig); + zrtpConfig = origPtr; + while ((entry = seperate_string_list(&zrtpConfig))) { + const MSZrtpAuthTag authTag = ms_zrtp_auth_tag_from_string(entry); + if (authTag != MS_ZRTP_AUTHTAG_INVALID) { + ms_message("Configured zrtp auth tag: '%s'", ms_zrtp_auth_tag_to_string(authTag)); + authTags[auth_tag_count++] = authTag; + } + } + + free(origPtr); + return auth_tag_count; +} + +MsZrtpCryptoTypesCount linphone_core_get_zrtp_sas_suites(LinphoneCore *lc, MSZrtpSasType sasTypes[MS_MAX_ZRTP_CRYPTO_TYPES]){ + char * zrtpConfig = (char*)lp_config_get_string(lc->config, "sip", "zrtp_sas_suites", NULL); + MsZrtpCryptoTypesCount sas_count = 0; + char * entry, * origPtr; + if (zrtpConfig == NULL) { + return 0; + } + + origPtr = strdup(zrtpConfig); + zrtpConfig = origPtr; + while ((entry = seperate_string_list(&zrtpConfig))) { + const MSZrtpSasType type = ms_zrtp_sas_type_from_string(entry); + if (type != MS_ZRTP_SAS_INVALID) { + ms_message("Configured zrtp SAS type: '%s'", ms_zrtp_sas_type_to_string(type)); + sasTypes[sas_count++] = type; + } + } + + free(origPtr); + return sas_count; +} const char ** linphone_core_get_supported_file_formats(LinphoneCore *core){ static const char *mkv="mkv"; diff --git a/coreapi/private.h b/coreapi/private.h index 4dea61ebb..ccb43d24c 100644 --- a/coreapi/private.h +++ b/coreapi/private.h @@ -110,6 +110,8 @@ struct _LinphoneCallParams{ LinphonePrivacyMask privacy; LinphoneMediaDirection audio_dir; LinphoneMediaDirection video_dir; + bool_t video_declined; /*use to keep traces of declined video to avoid to re-offer video in case of automatic RE-INVITE*/ + bool_t internal_call_update; /*use mark that call update was requested internally (might be by ice)*/ }; @@ -281,6 +283,8 @@ struct _LinphoneCall{ bool_t record_active; bool_t paused_by_app; + + MSWebCam *cam; /*webcam use for this call*/ }; BELLE_SIP_DECLARE_VPTR(LinphoneCall); @@ -438,6 +442,9 @@ void linphone_core_stop_waiting(LinphoneCore *lc); int linphone_core_proceed_with_invite_if_ready(LinphoneCore *lc, LinphoneCall *call, LinphoneProxyConfig *dest_proxy); int linphone_core_start_invite(LinphoneCore *lc, LinphoneCall *call, const LinphoneAddress* destination/* = NULL if to be taken from the call log */); int linphone_core_restart_invite(LinphoneCore *lc, LinphoneCall *call); +/* + * param automatic_offering aims is to take into account previous answer for video in case of automatic re-invite. + * Purpose is to avoid to re-ask video previously declined */ int linphone_core_start_update_call(LinphoneCore *lc, LinphoneCall *call); int linphone_core_start_accept_call_update(LinphoneCore *lc, LinphoneCall *call, LinphoneCallState next_state, const char *state_info); void linphone_core_notify_incoming_call(LinphoneCore *lc, LinphoneCall *call); @@ -1050,7 +1057,11 @@ static MS2_INLINE bool_t payload_type_enabled(const PayloadType *pt) { bool_t is_payload_type_number_available(const MSList *l, int number, const PayloadType *ignore); const MSCryptoSuite * linphone_core_get_srtp_crypto_suites(LinphoneCore *lc); -MsZrtpCryptoTypesCount linphone_core_get_zrtp_key_agreements(LinphoneCore *lc, MSZrtpKeyAgreement keyAgreements[MS_MAX_ZRTP_CRYPTO_TYPES]); +MsZrtpCryptoTypesCount linphone_core_get_zrtp_key_agreement_suites(LinphoneCore *lc, MSZrtpKeyAgreement keyAgreements[MS_MAX_ZRTP_CRYPTO_TYPES]); +MsZrtpCryptoTypesCount linphone_core_get_zrtp_cipher_suites(LinphoneCore *lc, MSZrtpCipher ciphers[MS_MAX_ZRTP_CRYPTO_TYPES]); +MsZrtpCryptoTypesCount linphone_core_get_zrtp_hash_suites(LinphoneCore *lc, MSZrtpHash hashes[MS_MAX_ZRTP_CRYPTO_TYPES]); +MsZrtpCryptoTypesCount linphone_core_get_zrtp_auth_suites(LinphoneCore *lc, MSZrtpAuthTag authTags[MS_MAX_ZRTP_CRYPTO_TYPES]); +MsZrtpCryptoTypesCount linphone_core_get_zrtp_sas_suites(LinphoneCore *lc, MSZrtpSasType sasTypes[MS_MAX_ZRTP_CRYPTO_TYPES]); /** Belle Sip-based objects need unique ids */ @@ -1165,7 +1176,10 @@ typedef struct _VTableReference VTableReference; void v_table_reference_destroy(VTableReference *ref); void _linphone_core_add_listener(LinphoneCore *lc, LinphoneCoreVTable *vtable, bool_t autorelease); - +#ifdef VIDEO_ENABLED +MSWebCam *linphone_call_get_video_device(const LinphoneCall *call); +MSWebCam *get_nowebcam_device(); +#endif #ifdef __cplusplus } #endif diff --git a/coreapi/proxy.c b/coreapi/proxy.c index 2a21d6312..c66bdc4d4 100644 --- a/coreapi/proxy.c +++ b/coreapi/proxy.c @@ -450,7 +450,7 @@ LinphoneAddress *guess_contact_for_register(LinphoneProxyConfig *obj){ * unregister without moving the register_enable flag */ void _linphone_proxy_config_unregister(LinphoneProxyConfig *obj) { - if (obj->state == LinphoneRegistrationOk) { + if (obj->op && obj->state == LinphoneRegistrationOk) { sal_unregister(obj->op); } } diff --git a/gtk/chat.c b/gtk/chat.c index 79f0d0535..b6cdb76ca 100644 --- a/gtk/chat.c +++ b/gtk/chat.c @@ -357,26 +357,19 @@ void display_history_message(GtkWidget *chat_view,MSList *messages,const Linphon } } -void linphone_gtk_chat_add_contact(const LinphoneAddress *addr){ +static void linphone_gtk_chat_add_contact(const LinphoneAddress *addr){ LinphoneFriend *lf=NULL; - LinphoneAddress *fixed_uri=NULL; gboolean show_presence=FALSE; char *uri=linphone_address_as_string(addr); lf=linphone_friend_new_with_address(uri); ms_free(uri); - linphone_friend_set_inc_subscribe_policy(lf,LinphoneSPDeny); + linphone_friend_set_inc_subscribe_policy(lf,LinphoneSPWait); linphone_friend_send_subscribe(lf,show_presence); - fixed_uri = linphone_core_interpret_url(linphone_gtk_get_core(),uri); - if (fixed_uri==NULL){ - linphone_gtk_display_something(GTK_MESSAGE_WARNING,_("Invalid sip contact !")); - return ; - } linphone_friend_set_address(lf,addr); linphone_core_add_friend(linphone_gtk_get_core(),lf); - linphone_address_destroy(fixed_uri); linphone_gtk_show_friends(); } diff --git a/gtk/main.c b/gtk/main.c index ac0b4cd52..ad984c081 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -92,7 +92,6 @@ static gint main_window_y=0; #endif static gboolean verbose=0; static gboolean quit_done=FALSE; -static gboolean auto_answer = 0; static gchar * addr_to_call = NULL; static int start_option = START_LINPHONE; static gboolean no_video=FALSE; @@ -139,7 +138,6 @@ static GOptionEntry linphone_options[]={ LINPHONE_OPTION("no-video", '\0', G_OPTION_ARG_NONE, (gpointer)&no_video, N_("Start linphone with video disabled.")), LINPHONE_OPTION("iconified", '\0', G_OPTION_ARG_NONE, (gpointer)&iconified, N_("Start only in the system tray, do not show the main interface.")), LINPHONE_OPTION("call", 'c', G_OPTION_ARG_STRING, &addr_to_call, N_("address to call right now")), - LINPHONE_OPTION("auto-answer", 'a', G_OPTION_ARG_NONE, (gpointer) & auto_answer, N_("if set automatically answer incoming calls")), LINPHONE_OPTION("workdir", '\0', G_OPTION_ARG_STRING, (gpointer) & workingdir, N_("Specifiy a working directory (should be the base of the installation, eg: c:\\Program Files\\Linphone)")), LINPHONE_OPTION("config", '\0', G_OPTION_ARG_FILENAME, (gpointer) &custom_config_file, N_("Configuration file")), LINPHONE_OPTION("run-audio-assistant", '\0', G_OPTION_ARG_NONE, (gpointer) &run_audio_assistant, N_("Run the audio assistant")), @@ -345,8 +343,18 @@ static void linphone_gtk_configure_window(GtkWidget *w, const char *window_name) if (icon_path) { GdkPixbuf *pbuf=create_pixbuf(icon_path); if(pbuf != NULL) { - gtk_window_set_icon(GTK_WINDOW(w),pbuf); + GList *pbuf_list = NULL; + GdkPixbuf *pbuf_16=gdk_pixbuf_scale_simple(pbuf, 16, 16, GDK_INTERP_BILINEAR); + GdkPixbuf *pbuf_32=gdk_pixbuf_scale_simple(pbuf, 32, 32, GDK_INTERP_BILINEAR); + pbuf_list = g_list_append(pbuf_list, pbuf); + pbuf_list = g_list_append(pbuf_list, pbuf_16); + pbuf_list = g_list_append(pbuf_list, pbuf_32); + gtk_window_set_icon_list(GTK_WINDOW(w), pbuf_list); + gtk_window_set_default_icon_list(pbuf_list); + g_object_unref(G_OBJECT(pbuf_16)); + g_object_unref(G_OBJECT(pbuf_32)); g_object_unref(G_OBJECT(pbuf)); + g_list_free(pbuf_list); } } } @@ -1375,9 +1383,10 @@ static void linphone_gtk_call_state_changed(LinphoneCore *lc, LinphoneCall *call linphone_gtk_create_in_call_view(call); linphone_gtk_in_call_view_set_incoming(call); linphone_gtk_status_icon_set_blinking(TRUE); - if (auto_answer) { + if (linphone_gtk_get_ui_config_int("auto_answer", 0)) { + int delay = linphone_gtk_get_ui_config_int("auto_answer_delay", 2000); linphone_call_ref(call); - g_timeout_add(2000,(GSourceFunc)linphone_gtk_auto_answer ,call); + g_timeout_add(delay, (GSourceFunc)linphone_gtk_auto_answer, call); } break; case LinphoneCallResuming: @@ -2101,8 +2110,11 @@ int main(int argc, char *argv[]){ /*for pulseaudio:*/ g_setenv("PULSE_PROP_media.role", "phone", TRUE); #endif - - if ((lang=linphone_gtk_get_lang(config_file))!=NULL && lang[0]!='\0'){ + lang=linphone_gtk_get_lang(config_file); + if (lang == NULL || lang[0]=='\0'){ + lang = getenv("LANG"); + } + if (lang && lang[0]!='\0'){ #ifdef WIN32 char tmp[128]; snprintf(tmp,sizeof(tmp),"LANG=%s",lang); @@ -2235,6 +2247,10 @@ core_start: if (icon) gtk_status_icon_set_visible(icon,FALSE); #endif free(progpath); + /*output a translated "hello" string to the terminal, which allows the builder to check that translations are working.*/ + if (selftest){ + printf(_("Hello\n")); + } return 0; } diff --git a/gtk/main.ui b/gtk/main.ui index c66728af5..48e5a61d6 100644 --- a/gtk/main.ui +++ b/gtk/main.ui @@ -7,15 +7,10 @@ False gtk-add - + True False - gtk-add - - - True - False - gtk-add + gtk-connect False @@ -47,7 +42,6 @@ True True - False False @@ -159,7 +153,6 @@ True True True - False True @@ -235,7 +228,6 @@ True True True - False False @@ -262,7 +254,6 @@ True True True - False True @@ -349,7 +340,7 @@ False - + True False gtk-dialog-authentication @@ -391,7 +382,6 @@ True True True - False @@ -483,7 +473,6 @@ True True True - False @@ -498,7 +487,6 @@ True True True - False @@ -524,7 +512,6 @@ True True Record this call to an audio file - False True @@ -567,7 +554,6 @@ True True True - False @@ -576,7 +562,6 @@ True True True - False @@ -590,7 +575,6 @@ True True True - False @@ -604,7 +588,6 @@ True True True - False 1 @@ -617,7 +600,6 @@ True True True - False @@ -633,7 +615,6 @@ True True True - False 2 @@ -711,121 +692,20 @@ False gtk-edit - - True - False - gtk-edit - - - True - False - gtk-edit - - - True - False - gtk-info - - - True - False - gtk-add - - - True - False - gtk-clear - - - True - False - gtk-connect - - - True - False - gtk-add - - - True - False - gtk-add - - - True - False - gtk-add - - - True - False - gtk-add - - - True - False - gtk-missing-image - - - True - False - gtk-select-color - - - True - False - gtk-add - - - True - False - gtk-refresh - - - True - False - gtk-add - - - True - False - 0.49000000953674316 - gtk-properties - - - True - False - gtk-properties - - - True - False - gtk-home - - + True False gtk-execute - + True False - gtk-add + gtk-home - + True False - gtk-add - - - True - False - gtk-add - - - True - False - gtk-add + gtk-info @@ -880,6 +760,18 @@ + + True + False + 0.49000000953674316 + gtk-properties + + + True + False + Delete + gtk-remove + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -898,7 +790,6 @@ True False - False _Options True @@ -911,7 +802,6 @@ gtk-preferences True False - False True True @@ -921,7 +811,6 @@ True False - False Set configuration URI True @@ -931,7 +820,6 @@ gtk-disconnect False - False True True @@ -947,7 +835,6 @@ True False - False Always start video True @@ -957,7 +844,6 @@ True False - False Enable self-view True True @@ -974,7 +860,6 @@ gtk-quit False - False True True @@ -988,7 +873,6 @@ True False - False _Help True @@ -1000,7 +884,6 @@ gtk-about True False - False True True @@ -1011,8 +894,7 @@ Show debug window True False - False - image1 + info_image False @@ -1022,9 +904,8 @@ _Homepage True False - False True - image4 + home_image False @@ -1033,9 +914,8 @@ Check _Updates False - False True - image5 + execute_image False @@ -1044,8 +924,7 @@ Account assistant False - False - image12 + connect_image False @@ -1055,8 +934,7 @@ Audio assistant True False - False - image21 + properties_image False @@ -1148,7 +1026,6 @@ True True Initiate a new call - False @@ -1164,7 +1041,6 @@ True True True - False @@ -1180,7 +1056,6 @@ True True True - False @@ -1266,8 +1141,7 @@ True True immediate - False - add_image2 + add_image 1 @@ -1282,8 +1156,7 @@ True True True - False - edit_image2 + edit_image @@ -1297,8 +1170,7 @@ True True True - False - remove_image2 + remove_image @@ -1396,7 +1268,6 @@ True True True - False none @@ -1463,8 +1334,6 @@ Add contact True True - False - image20 @@ -1498,7 +1367,6 @@ True True True - False True @@ -1597,18 +1465,44 @@ 0 none - + True False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - model3 - 0 - - - - 0 - + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + model3 + 0 + + + + + 0 + + + + + True + True + 0 + + + + + True + True + True + none + + + + False + True + 5 + 1 + @@ -1636,7 +1530,6 @@ True True True - False none @@ -1706,6 +1599,9 @@ False 5 2 + + + True @@ -1772,7 +1668,6 @@ False model4 0 - @@ -1793,7 +1688,6 @@ True True False - False True @@ -1829,9 +1723,6 @@ 3 - - - @@ -1862,7 +1753,6 @@ True True True - False True @@ -1909,64 +1799,18 @@ - + True False - - - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 - - - True - True - 0 - - - - - True - True - True - False - none - - - - False - True - 5 - 1 - - + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK False - False + True 2 - - True - False - Delete - gtk-remove - - - True - False - Delete - gtk-remove - - - True - False - Delete - gtk-remove - diff --git a/gtk/parameters.ui b/gtk/parameters.ui index 864674822..c40537c8f 100644 --- a/gtk/parameters.ui +++ b/gtk/parameters.ui @@ -2,69 +2,12 @@ - - 500 - 3001 - 500 - 1 - 10 - - - 500 - 50 - 1 - 10 - - - 1 - 65535 - 1 - 1 - 10 - - - 1 - 65535 - 1 - 1 - 10 - - - 65535 - 1 - 1 - 10 - - + -1 100000 1 10 - - -1 - 100000 - 1 - 10 - - - 65535 - 5060 - 1 - 9.9999999995529656 - - - 65535 - 5060 - 1 - 10 - - - 100 - 10 - 1 - 10 - 65535 2 @@ -85,12 +28,31 @@ 2 10 - - 65535 - 1 + + 500 + 3001 + 500 1 10 + + 65535 + 5060 + 1 + 10 + + + -1 + 100000 + 1 + 10 + + + 60000 + 2000 + 100 + 500 + @@ -206,6 +168,12 @@ + + 65535 + 5060 + 1 + 9.9999999995529656 + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -253,7 +221,6 @@ True True False - False True @@ -271,7 +238,7 @@ False True True - adjustment1 + adjustment_mtu @@ -293,7 +260,6 @@ True True False - False True @@ -305,12 +271,11 @@ - Use IPv6 instead of IPv4 + Allow IPv6 True True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False True @@ -360,257 +325,238 @@ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 8 2 - - - True - False - SIP/UDP port - + + True + False + SIP/UDP port + - - True - False - - - - Disabled - True - True - False - False - True - - - - True - True - 0 - - - - - - Random - True - True - False - False - True - - - - True - True - 1 - - - - - - True - True - • - True - False - False - True - True - adjustment8 - - - - True - True - 2 - - - - - 1 - 2 - 1 - 1 - - - - - - True - False - SIP/TCP port - - - 1 - 2 - + + True + False + + + Disabled + True + True + False + True + + + + True + True + 0 + + + + + Random + True + True + False + True + + + + True + True + 1 + + + + + True + True + • + True + False + False + True + True + udp_port_adjustment + + + + True + True + 2 + + + + + 1 + 2 + - - True - False - - - - Disabled - True - True - False - False - True - - - - True - True - 0 - - - - - - Random - True - True - False - False - True - - - - True - True - 1 - - - - - - True - True - • - True - False - False - True - True - adjustment8 - - - - True - True - 2 - - - - - 1 - 2 - 1 - 2 - - - - - - - - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Audio RTP/UDP: - right - - - 2 - 3 - + + True + False + SIP/TCP port + + + 1 + 2 + - - True - False - - - True - True - • - False - False - True - True - adjustment_min_audio_port - True - - - - True - True - 0 - - - - - True - True - • - True - False - False - True - True - adjustment_max_audio_port - True - - - - True - True - 1 - - - - - Fixed - True - True - False - False - True - - - - True - True - 2 - - - - - 1 - 2 - 2 - 3 - - - - - - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Video RTP/UDP: - right - - - 3 - 4 - + + True + False + + + Disabled + True + True + False + True + + + + True + True + 0 + + + + + Random + True + True + False + True + + + + True + True + 1 + + + + + True + True + • + True + False + False + True + True + adjustment_tcp_port + + + + True + True + 2 + + + + + 1 + 2 + 1 + 2 + - + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Audio RTP/UDP: + right + + + 2 + 3 + + + + + True + False + + + True + True + • + False + False + True + True + adjustment_min_audio_port + True + + + + True + True + 0 + + + + + True + True + • + True + False + False + True + True + adjustment_max_audio_port + True + + + + True + True + 1 + + + + + Fixed + True + True + False + True + + + + True + True + 2 + + + + + 1 + 2 + 2 + 3 + + + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Video RTP/UDP: + right + + + 3 + 4 + + + + True False @@ -658,7 +604,6 @@ True True False - False True @@ -668,109 +613,105 @@ 2 - - + + 1 2 3 4 - - - - - - True - False - Media encryption type - - - 4 - 6 - + - - True - False - 0 - - - 1 - 2 - 4 - 5 - + + True + False + Media encryption type + + + 4 + 6 + - - Media encryption is mandatory - True - True - False - False - True - - - - 1 - 2 - 5 - 6 - + + True + False + 0 + + + 1 + 2 + 4 + 5 + - - False - Tunnel - - - 7 - 8 - + + Media encryption is mandatory + True + True + False + True + + + + 1 + 2 + 5 + 6 + - - gtk-edit - True - True - False - True - - - - 1 - 2 - 7 - 8 - + + False + Tunnel + + + 7 + 8 + - - True - False - DSCP fields - - - 6 - 7 - + + gtk-edit + True + True + True + + + + 1 + 2 + 7 + 8 + - - gtk-edit - True - True - True - False - True - - - - 1 - 2 - 6 - 7 - + + True + False + DSCP fields + + + 6 + 7 + + + + + gtk-edit + True + True + True + True + + + + 1 + 2 + 6 + 7 + @@ -813,7 +754,6 @@ True True False - False True True @@ -830,7 +770,6 @@ True True False - False True no_nat @@ -847,7 +786,6 @@ True True False - False True no_nat @@ -864,7 +802,6 @@ True True False - False True no_nat @@ -881,7 +818,6 @@ True True False - False True no_nat @@ -1084,6 +1020,9 @@ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 6 2 + + + True @@ -1109,7 +1048,6 @@ True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False True @@ -1285,7 +1223,6 @@ True True False - False True @@ -1296,9 +1233,6 @@ 6 - - - @@ -1437,7 +1371,6 @@ True True True - False @@ -1515,7 +1448,7 @@ False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -1640,7 +1573,7 @@ - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -1686,7 +1619,6 @@ True True True - False @@ -1734,7 +1666,6 @@ True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False @@ -1782,7 +1713,6 @@ True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False @@ -1830,7 +1760,6 @@ True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False @@ -1900,7 +1829,7 @@ - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -1923,7 +1852,6 @@ True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False @@ -1985,6 +1913,86 @@ 2 + + + True + False + 0 + none + + + True + False + 12 + + + True + False + 2 + 2 + + + Automatically answer when a call is received + True + True + False + True + + + + 2 + + + + + True + False + Delay before answering (ms) + + + 1 + 2 + + + + + True + True + ● + False + False + True + True + ajustment_auto_answer_delay + True + + + + 1 + 2 + 1 + 2 + + + + + + + + + True + False + <b>Auto-answer</b> + True + + + + + True + True + 3 + + 2 @@ -2109,7 +2117,6 @@ True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False True @@ -2126,7 +2133,6 @@ True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False True @@ -2142,7 +2148,6 @@ True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False @@ -2190,7 +2195,6 @@ True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False @@ -2296,7 +2300,7 @@ False True True - adjustment5 + adjustment_upload_bw @@ -2318,7 +2322,7 @@ False True True - adjustment6 + adjustment_download_bw @@ -2356,7 +2360,6 @@ True True False - False 0 True @@ -2449,7 +2452,7 @@ - + True False @@ -2511,7 +2514,6 @@ True True False - False True @@ -2596,6 +2598,9 @@ 4 2 True + + + True @@ -2638,7 +2643,6 @@ True True True - False True @@ -2655,7 +2659,6 @@ True False - label 1 @@ -2667,7 +2670,6 @@ True False - label 1 @@ -2681,7 +2683,6 @@ True False - label 1 @@ -2691,9 +2692,6 @@ GTK_SHRINK - - - @@ -2755,6 +2753,12 @@ False + + + + + + True @@ -2774,7 +2778,6 @@ True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False diff --git a/gtk/propertybox.c b/gtk/propertybox.c index 5f2c177ab..102aeafc1 100644 --- a/gtk/propertybox.c +++ b/gtk/propertybox.c @@ -1582,6 +1582,9 @@ void linphone_gtk_show_parameters(void){ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(linphone_gtk_get_widget(pb,"adaptive_rate_control")), linphone_core_adaptive_rate_control_enabled(lc)); + /* CALL PARAMS CONFIG */ + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(linphone_gtk_get_widget(pb, "auto_answer_checkbox")), linphone_gtk_get_ui_config_int("auto_answer", 0)); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(linphone_gtk_get_widget(pb, "auto_answer_delay_spinbutton")), linphone_gtk_get_ui_config_int("auto_answer_delay", 2000)); /* UI CONFIG */ linphone_gtk_fill_langs(pb); @@ -1770,3 +1773,13 @@ void linphone_gtk_dscp_edit_response(GtkWidget *dialog, guint response_id){ } gtk_widget_destroy(dialog); } + +void linphone_gtk_enable_auto_answer(GtkToggleButton *checkbox, gpointer user_data) { + gboolean auto_answer_enabled = gtk_toggle_button_get_active(checkbox); + linphone_gtk_set_ui_config_int("auto_answer", auto_answer_enabled ? 1 : 0); +} + +void linphone_gtk_auto_answer_delay_changed(GtkSpinButton *spinbutton, gpointer user_data) { + int delay = gtk_spin_button_get_value(spinbutton); + linphone_gtk_set_ui_config_int("auto_answer_delay", delay); +} diff --git a/gtk/videowindow.c b/gtk/videowindow.c index 8d26eb212..07a22bf29 100644 --- a/gtk/videowindow.c +++ b/gtk/videowindow.c @@ -257,8 +257,6 @@ static GtkWidget *create_video_window(LinphoneCall *call){ char *remote,*title; GtkWidget *video_window; const LinphoneAddress *addr; - const char *icon_path=linphone_gtk_get_ui_config("icon",LINPHONE_ICON); - GdkPixbuf *pbuf=create_pixbuf(icon_path); guint timeout; MSVideoSize vsize={MS_VIDEO_SIZE_CIF_W,MS_VIDEO_SIZE_CIF_H}; GdkColor color; @@ -270,9 +268,6 @@ static GtkWidget *create_video_window(LinphoneCall *call){ ms_free(remote); gtk_window_set_title(GTK_WINDOW(video_window),title); g_free(title); - if (pbuf){ - gtk_window_set_icon(GTK_WINDOW(video_window),pbuf); - } gtk_window_resize(GTK_WINDOW(video_window),vsize.width,vsize.height); gdk_color_parse("black",&color); gtk_widget_modify_bg(video_window,GTK_STATE_NORMAL,&color); diff --git a/include/sal/sal.h b/include/sal/sal.h index a663c16cd..26d8e5bb9 100644 --- a/include/sal/sal.h +++ b/include/sal/sal.h @@ -827,6 +827,10 @@ char* sal_op_get_public_uri(SalOp *sal); unsigned long sal_begin_background_task(const char *name, void (*max_time_reached)(void *), void *data); void sal_end_background_task(unsigned long id); +/*Some old equipment may not only rely on attribute sendonly/recvonly/sendrecv/inative*/ +void sal_op_cnx_ip_to_0000_if_sendonly_enable(SalOp *sal,bool_t yesno); +bool_t sal_op_cnx_ip_to_0000_if_sendonly_enabled(SalOp *sal); + #endif diff --git a/java/common/org/linphone/core/LinphoneFriend.java b/java/common/org/linphone/core/LinphoneFriend.java index 1a84498ce..b9080bd94 100644 --- a/java/common/org/linphone/core/LinphoneFriend.java +++ b/java/common/org/linphone/core/LinphoneFriend.java @@ -133,4 +133,16 @@ public interface LinphoneFriend { * Return the native pointer for this object */ long getNativePtr(); + + /** + * Set the reference key of a friend. + * @param key The reference key to use for the friend. + **/ + void setRefKey(String key); + + /** + * Get the reference key of a friend. + * @return The reference key of the friend. + **/ + String getRefKey(); } diff --git a/java/impl/org/linphone/core/LinphoneFriendImpl.java b/java/impl/org/linphone/core/LinphoneFriendImpl.java index 986f0a6b7..2285f3788 100644 --- a/java/impl/org/linphone/core/LinphoneFriendImpl.java +++ b/java/impl/org/linphone/core/LinphoneFriendImpl.java @@ -36,6 +36,8 @@ class LinphoneFriendImpl implements LinphoneFriend, Serializable { private native void done(long nativePtr); private native void delete(long ptr); private native Object getCore(long ptr); + private native void setRefKey(long nativePtr, String key); + private native String getRefKey(long nativePtr); boolean ownPtr = false; protected LinphoneFriendImpl() { @@ -103,4 +105,14 @@ class LinphoneFriendImpl implements LinphoneFriend, Serializable { if (core!=null) return core; else return this; } + + public void setRefKey(String key){ + synchronized(getSyncObject()){ + setRefKey(nativePtr,key); + } + } + + public String getRefKey(){ + return getRefKey(nativePtr); + } } diff --git a/linphone.spec.in b/linphone.spec.in index 9e10c35c1..f9e954945 100644 --- a/linphone.spec.in +++ b/linphone.spec.in @@ -38,7 +38,7 @@ over the internet. It has a gtk+ and console interface. Summary: Development libraries for linphone Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: ortp-devel = @ORTP_VERSION@ +Requires: ortp-devel = 1:@ORTP_VERSION@ Requires: mediastreamer-devel = @MS2_VERSION@ Requires: glib2-devel @@ -60,7 +60,6 @@ Libraries and headers required to develop software with linphone. %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -install -p -m 0644 pixmaps/linphone.png $RPM_BUILD_ROOT%{_datadir}/pixmaps %find_lang %{name} desktop-file-install \ --delete-original \ @@ -88,7 +87,7 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/audio-assistant.desktop %{_datadir}/pixmaps/linphone %{_datadir}/linphone -%{_datadir}/pixmaps/linphone.png +%{_datadir}/icons/* %{_datadir}/sounds/linphone %{_datadir}/appdata/linphone.appdata.xml diff --git a/pixmaps/CMakeLists.txt b/pixmaps/CMakeLists.txt index 61dacfe46..aaf7d011f 100644 --- a/pixmaps/CMakeLists.txt +++ b/pixmaps/CMakeLists.txt @@ -42,7 +42,6 @@ set(PIXMAPS hold_on.png linphone-banner.png linphone.icns - linphone.png mic_active.png mic_muted.png notok.png @@ -62,3 +61,8 @@ install(FILES ${PIXMAPS} DESTINATION ${PACKAGE_DATA_DIR}/pixmaps/linphone PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ ) + +install(FILES linphone.png + DESTINATION ${PACKAGE_DATA_DIR}/icons/hicolor/48x48/apps + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +) diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am index 5e9b7a177..10ad6856c 100644 --- a/pixmaps/Makefile.am +++ b/pixmaps/Makefile.am @@ -1,25 +1,29 @@ - - pixmapdir=$(datadir)/pixmaps/linphone pixmap_DATA= \ -hold_on.png hold_off.png \ -mic_muted.png mic_active.png \ -linphone.png linphone-banner.png \ -status-green.png \ -status-orange.png \ -status-red.png \ -status-offline.png \ -call.png \ -chat.png active_chat.png composing_chat.png composing_active_chat.png\ -chat_message_inprogress.png chat_message_delivered.png chat_message_not_delivered.png\ -contact-orange.png dialer-orange.png history-orange.png\ -startcall-green.png startcall-small.png stopcall-red.png stopcall-small.png addcall-green.png linphone.icns \ -contact_starred.png contact_unstarred.png \ -speaker.png \ -call_status_incoming.png call_status_outgoing.png \ -ok.png \ -dialer.png \ -notok.png + hold_on.png hold_off.png \ + mic_muted.png mic_active.png \ + linphone.png linphone-banner.png \ + status-green.png \ + status-orange.png \ + status-red.png \ + status-offline.png \ + call.png \ + chat.png active_chat.png composing_chat.png composing_active_chat.png\ + chat_message_inprogress.png chat_message_delivered.png chat_message_not_delivered.png\ + contact-orange.png dialer-orange.png history-orange.png\ + startcall-green.png startcall-small.png stopcall-red.png stopcall-small.png addcall-green.png linphone.icns \ + contact_starred.png contact_unstarred.png \ + speaker.png \ + call_status_incoming.png call_status_outgoing.png \ + ok.png \ + dialer.png \ + notok.png -EXTRA_DIST=$(pixmap_DATA) + +iconsdir=$(datadir)/icons/hicolor/48x48/apps + +icons_DATA= linphone.png + + +EXTRA_DIST=$(pixmap_DATA) $(icons_DATA) diff --git a/pixmaps/linphone.png b/pixmaps/linphone.png index 722593e65..4031d7205 100644 Binary files a/pixmaps/linphone.png and b/pixmaps/linphone.png differ diff --git a/po/ar.po b/po/ar.po index ab28394f1..93272a4a9 100644 --- a/po/ar.po +++ b/po/ar.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # محيي الدين , 2014 # محيي الدين , 2014-2015 @@ -9,17 +9,15 @@ msgid "" msgstr "" "Project-Id-Version: linphone-gtk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-11 16:26+0100\n" -"PO-Revision-Date: 2015-02-17 21:52+0000\n" +"POT-Creation-Date: 2015-03-27 14:40+0100\n" +"PO-Revision-Date: 2015-03-30 15:42+0000\n" "Last-Translator: محيي الدين \n" -"Language-Team: Arabic (http://www.transifex.com/projects/p/linphone-gtk/" -"language/ar/)\n" -"Language: ar\n" +"Language-Team: Arabic (http://www.transifex.com/projects/p/linphone-gtk/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " -"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" +"Language: ar\n" +"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" #: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974 #, c-format @@ -79,9 +77,7 @@ msgstr[5] "%i ثانية" msgid "" "%s\tQuality: %s\n" "%s\t%s\t" -msgstr "" -"%s\tالجودة : %s\n" -"%s\t%s\t" +msgstr "%s\tالجودة : %s\n%s\t%s\t" #: ../gtk/calllogs.c:341 #, c-format @@ -101,138 +97,126 @@ msgstr "أنا" msgid "Couldn't find pixmap file: %s" msgstr "أيقونة غير موجودة : %s" -#: ../gtk/chat.c:374 ../gtk/friendlist.c:924 -msgid "Invalid sip contact !" -msgstr "جهة اتصال sip غير صالحة !" - -#: ../gtk/main.c:137 +#: ../gtk/main.c:136 msgid "log to stdout some debug information while running." msgstr "أظهِرْ بعض معلومات التنقيح خلال التشغيل." -#: ../gtk/main.c:138 +#: ../gtk/main.c:137 msgid "path to a file to write logs into." msgstr "الدليل إلى الملف الذي سيُكتَب فيه سجل الوقائع." -#: ../gtk/main.c:139 +#: ../gtk/main.c:138 msgid "Start linphone with video disabled." msgstr "ابدأ لِنْفُونْ لكن دون تفعيل الفيديو." -#: ../gtk/main.c:140 +#: ../gtk/main.c:139 msgid "Start only in the system tray, do not show the main interface." msgstr "شغِّله مُصغَّرا، ولا تُظهِر الواجهة الرئيسية." -#: ../gtk/main.c:141 +#: ../gtk/main.c:140 msgid "address to call right now" msgstr "العنوان المُراد الاتصال به الآن" -#: ../gtk/main.c:142 -msgid "if set automatically answer incoming calls" -msgstr "إذا تم التفعيل، سيجيب تلقائيا عن المكالمات الواردة" - -#: ../gtk/main.c:143 +#: ../gtk/main.c:141 msgid "" -"Specifiy a working directory (should be the base of the installation, eg: c:" -"\\Program Files\\Linphone)" -msgstr "" -"حدِّد مجلد العمل (الذي سيكون مجلد التثبيت، مثلا c:\\Program Files\\Linphone)" +"Specifiy a working directory (should be the base of the installation, eg: " +"c:\\Program Files\\Linphone)" +msgstr "حدِّد مجلد العمل (الذي سيكون مجلد التثبيت، مثلا c:\\Program Files\\Linphone)" -#: ../gtk/main.c:144 +#: ../gtk/main.c:142 msgid "Configuration file" msgstr "ملف التهيئة" -#: ../gtk/main.c:145 +#: ../gtk/main.c:143 msgid "Run the audio assistant" msgstr "ابدأ مرشد الصوت" -#: ../gtk/main.c:146 +#: ../gtk/main.c:144 msgid "Run self test and exit 0 if succeed" msgstr "شغِّل الاختبار الذاتي ثم اخرِجْ 0 إذا نجح" -#: ../gtk/main.c:1061 +#: ../gtk/main.c:1059 #, 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 يريد إضافتك إلى جهة اتصاله.\n" -"هل تريد السماح له برؤية معلومات حضورك وكذا إضافته إلى جهة اتصالك أيضا ؟ إذا " -"أجبت ب لا، سيُحظَر هذا الشخص مؤقتا." +msgstr "%s يريد إضافتك إلى جهة اتصاله.\nهل تريد السماح له برؤية معلومات حضورك وكذا إضافته إلى جهة اتصالك أيضا ؟ إذا أجبت ب لا، سيُحظَر هذا الشخص مؤقتا." -#: ../gtk/main.c:1138 +#: ../gtk/main.c:1136 #, c-format msgid "" "Please enter your password for username %s\n" " at realm %s:" -msgstr "" -"ادخل كلمة السر ل %s\n" -" في نطاق %s:" +msgstr "ادخل كلمة السر ل %s\n في نطاق %s:" -#: ../gtk/main.c:1259 +#: ../gtk/main.c:1257 msgid "Call error" msgstr "خطأ في المكالمة" -#: ../gtk/main.c:1262 ../coreapi/linphonecore.c:3791 +#: ../gtk/main.c:1260 ../coreapi/linphonecore.c:3826 msgid "Call ended" msgstr "إنتهت المكالمة" -#: ../gtk/main.c:1265 ../coreapi/call_log.c:221 +#: ../gtk/main.c:1263 ../coreapi/call_log.c:221 msgid "Incoming call" msgstr "مكالمة واردة" -#: ../gtk/main.c:1267 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5 +#: ../gtk/main.c:1265 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5 msgid "Answer" msgstr "أجِبْ" -#: ../gtk/main.c:1269 ../gtk/main.ui.h:6 +#: ../gtk/main.c:1267 ../gtk/main.ui.h:6 msgid "Decline" msgstr "ارفضْ" -#: ../gtk/main.c:1275 +#: ../gtk/main.c:1273 msgid "Call paused" msgstr "المكالمة متوقفة" -#: ../gtk/main.c:1275 +#: ../gtk/main.c:1273 #, c-format msgid "by %s" msgstr "بواسطة %s" -#: ../gtk/main.c:1345 +#: ../gtk/main.c:1343 #, c-format msgid "%s proposed to start video. Do you accept ?" msgstr "يود %s تشغيل الفيديو. هل تقبل ذلك ؟" -#: ../gtk/main.c:1507 +#: ../gtk/main.c:1505 msgid "Website link" msgstr "وصلة إلى الموقع وِبْ" -#: ../gtk/main.c:1556 +#: ../gtk/main.c:1554 msgid "Linphone - a video internet phone" msgstr "لِنْفُونْ - الهاتف المرئي عبر الإنترنت" -#: ../gtk/main.c:1648 +#: ../gtk/main.c:1646 #, c-format msgid "%s (Default)" msgstr "%s (افتراضي)" -#: ../gtk/main.c:1980 ../coreapi/callbacks.c:1045 +#: ../gtk/main.c:1978 ../coreapi/callbacks.c:1057 #, c-format msgid "We are transferred to %s" msgstr "التحويل إلى %s" -#: ../gtk/main.c:1990 +#: ../gtk/main.c:1988 msgid "" "No sound cards have been detected on this computer.\n" "You won't be able to send or receive audio calls." -msgstr "" -"لا وجود للوحة الصوت على هذا الحاسوب.\n" -"لن تتمكن من تلقي أو إجراء أي مكالمة." +msgstr "لا وجود للوحة الصوت على هذا الحاسوب.\nلن تتمكن من تلقي أو إجراء أي مكالمة." -#: ../gtk/main.c:2135 +#: ../gtk/main.c:2136 msgid "A free SIP video-phone" msgstr "هاتف SIP المرئي الحر" +#: ../gtk/main.c:2241 +#, c-format +msgid "Hello\n" +msgstr "أهلا\n" + #: ../gtk/friendlist.c:505 msgid "Add to addressbook" msgstr "أضف إلى دفتر العناوين" @@ -258,6 +242,10 @@ msgstr "محادثة" msgid "Search in %s directory" msgstr "ابحث في دليل %s" +#: ../gtk/friendlist.c:924 +msgid "Invalid sip contact !" +msgstr "جهة اتصال sip غير صالحة !" + #: ../gtk/friendlist.c:976 #, c-format msgid "Edit contact '%s'" @@ -298,7 +286,7 @@ msgstr "الإعدادات" msgid "Enabled" msgstr "مفعَّل" -#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763 ../gtk/parameters.ui.h:20 +#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763 ../gtk/parameters.ui.h:17 msgid "Disabled" msgstr "غير مفعَّل" @@ -404,9 +392,7 @@ msgstr "ZRTP" msgid "" "A more recent version is availalble from %s.\n" "Would you like to open a browser to download it ?" -msgstr "" -"يوجد إصدار حديث من طرف %s.\n" -"هل تريد فتح المتصفح لتنزيله ؟" +msgstr "يوجد إصدار حديث من طرف %s.\nهل تريد فتح المتصفح لتنزيله ؟" #: ../gtk/update.c:91 msgid "You are running the lastest version." @@ -447,9 +433,7 @@ msgstr[5] "عُثِر على %i جهة اتصال" msgid "" "Welcome!\n" "This assistant will help you to use a SIP account for your calls." -msgstr "" -"مرحبا !\n" -"سيمكنك هذا المرشد من إعداد حسابك SIP لإجراء المكالمات." +msgstr "مرحبا !\nسيمكنك هذا المرشد من إعداد حسابك SIP لإجراء المكالمات." #: ../gtk/setupwizard.c:43 msgid "Create an account on linphone.org" @@ -471,7 +455,7 @@ msgstr "أريد تحديد عنوان التهيئة عن بعد" msgid "Enter your linphone.org username" msgstr "أدخِلْ إسم المستخدم في linphone.org" -#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:82 ../gtk/ldap.ui.h:4 +#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:81 ../gtk/ldap.ui.h:4 msgid "Username:" msgstr "إسم المستخدم :" @@ -527,9 +511,7 @@ msgstr "أحطني علما بتحديثات لِنْفُونْ" msgid "" "Error, account not validated, username already used or server unreachable.\n" "Please go back and try again." -msgstr "" -"خطأ، لم يتم تأكيد الحساب، إسم المستخدم سبق استخدامه أو تعذر الوصول للخادم.\n" -"يُرجى إعادة المحاولة لاحقا." +msgstr "خطأ، لم يتم تأكيد الحساب، إسم المستخدم سبق استخدامه أو تعذر الوصول للخادم.\nيُرجى إعادة المحاولة لاحقا." #: ../gtk/setupwizard.c:405 msgid "Thank you. Your account is now configured and ready for use." @@ -537,13 +519,9 @@ msgstr "شكرا لك، لقد جرت تهيئة حسابك وهو الآن قا #: ../gtk/setupwizard.c:413 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 "" -"يُرجى تأكيد حسابك وذلك بالضغط على الوصلة التي أرسلناها لك بالبريد " -"الإلكتروني.\n" -"ثم ارجع إلى هنا واضغط على زر التالي." +msgstr "يُرجى تأكيد حسابك وذلك بالضغط على الوصلة التي أرسلناها لك بالبريد الإلكتروني.\nثم ارجع إلى هنا واضغط على زر التالي." #: ../gtk/setupwizard.c:602 msgid "SIP account configuration assistant" @@ -648,9 +626,7 @@ msgstr "مباشرة أو عبر خادم" msgid "" "download: %f\n" "upload: %f (kbit/s)" -msgstr "" -"التنزيل % f\n" -"الرفع : %f (ك.بِتْ/الثانية)" +msgstr "التنزيل % f\nالرفع : %f (ك.بِتْ/الثانية)" #: ../gtk/incall_view.c:272 ../gtk/incall_view.c:274 #, c-format @@ -764,9 +740,7 @@ msgstr "إيقاف مؤقت" msgid "" "Recording into\n" "%s %s" -msgstr "" -"يسجل في\n" -"%s %s" +msgstr "يسجل في\n%s %s" #: ../gtk/incall_view.c:954 msgid "(Paused)" @@ -819,9 +793,7 @@ msgstr "لم يتمكن من تشغيل التحكم في الصوت للنظا msgid "" "Welcome!\n" "This assistant will help you to configure audio settings for Linphone" -msgstr "" -"مرحبا !\n" -"سيمكنك هذا المرشد من تهيئة إعدادات الصوت من أجل لِنْفُونْ" +msgstr "مرحبا !\nسيمكنك هذا المرشد من تهيئة إعدادات الصوت من أجل لِنْفُونْ" #: ../gtk/audio_assistant.c:328 msgid "Capture device" @@ -871,7 +843,7 @@ msgstr "لنُشغِّل لِنْفُونْ الآن" msgid "Audio Assistant" msgstr "مرشد الصوت" -#: ../gtk/audio_assistant.c:513 ../gtk/main.ui.h:31 +#: ../gtk/audio_assistant.c:513 ../gtk/main.ui.h:32 msgid "Audio assistant" msgstr "مرشد الصوت" @@ -948,105 +920,105 @@ msgid "Default" msgstr "افتراضي" #: ../gtk/main.ui.h:22 +msgid "Delete" +msgstr "احذف" + +#: ../gtk/main.ui.h:23 msgid "_Options" msgstr "الخ_يارات" -#: ../gtk/main.ui.h:23 +#: ../gtk/main.ui.h:24 msgid "Set configuration URI" msgstr "عنوان URI للتهيئة" -#: ../gtk/main.ui.h:24 +#: ../gtk/main.ui.h:25 msgid "Always start video" msgstr "شغِّل الفيديو دائما" -#: ../gtk/main.ui.h:25 +#: ../gtk/main.ui.h:26 msgid "Enable self-view" msgstr "تفعيل رؤية نفسي" -#: ../gtk/main.ui.h:26 +#: ../gtk/main.ui.h:27 msgid "_Help" msgstr "_مساعدة" -#: ../gtk/main.ui.h:27 +#: ../gtk/main.ui.h:28 msgid "Show debug window" msgstr "أظهِر نافذة التنقيح" -#: ../gtk/main.ui.h:28 +#: ../gtk/main.ui.h:29 msgid "_Homepage" msgstr "موق_ع الوِبْ" -#: ../gtk/main.ui.h:29 +#: ../gtk/main.ui.h:30 msgid "Check _Updates" msgstr "تحقق من التح_ديثات" -#: ../gtk/main.ui.h:30 +#: ../gtk/main.ui.h:31 msgid "Account assistant" msgstr "مرشد الحساب" -#: ../gtk/main.ui.h:32 +#: ../gtk/main.ui.h:33 msgid "SIP address or phone number:" msgstr "عنوان SIP أو رقم الهاتف :" -#: ../gtk/main.ui.h:33 +#: ../gtk/main.ui.h:34 msgid "Initiate a new call" msgstr "ابدأ مكالمة جديدة" -#: ../gtk/main.ui.h:34 +#: ../gtk/main.ui.h:35 msgid "Contacts" msgstr "جهات الاتصال" -#: ../gtk/main.ui.h:35 +#: ../gtk/main.ui.h:36 msgid "Search" msgstr "بحث" -#: ../gtk/main.ui.h:36 +#: ../gtk/main.ui.h:37 msgid "Add contacts from directory" msgstr "إضافة جهات الاتصال من الدليل" -#: ../gtk/main.ui.h:37 +#: ../gtk/main.ui.h:38 msgid "Add contact" msgstr "إضافة جهة الاتصال" -#: ../gtk/main.ui.h:38 +#: ../gtk/main.ui.h:39 msgid "Recent calls" msgstr "المكالمات السابقة" -#: ../gtk/main.ui.h:39 +#: ../gtk/main.ui.h:40 msgid "My current identity:" msgstr "هويتي الحالية :" -#: ../gtk/main.ui.h:40 ../gtk/tunnel_config.ui.h:7 +#: ../gtk/main.ui.h:41 ../gtk/tunnel_config.ui.h:7 msgid "Username" msgstr "إسم المستخدم" -#: ../gtk/main.ui.h:41 ../gtk/tunnel_config.ui.h:8 +#: ../gtk/main.ui.h:42 ../gtk/tunnel_config.ui.h:8 msgid "Password" msgstr "كلمة السر" -#: ../gtk/main.ui.h:42 +#: ../gtk/main.ui.h:43 msgid "Internet connection:" msgstr "الاتصال بالإنترنت :" -#: ../gtk/main.ui.h:43 +#: ../gtk/main.ui.h:44 msgid "Automatically log me in" msgstr "سَجِّل دخولي تلقائيا" -#: ../gtk/main.ui.h:44 ../gtk/password.ui.h:3 +#: ../gtk/main.ui.h:45 ../gtk/password.ui.h:3 msgid "UserID" msgstr "مُعرِّف المستخدم" -#: ../gtk/main.ui.h:45 +#: ../gtk/main.ui.h:46 msgid "Login information" msgstr "معلومات الولوج" -#: ../gtk/main.ui.h:46 +#: ../gtk/main.ui.h:47 msgid "Welcome!" msgstr "مرحبا !" -#: ../gtk/main.ui.h:47 -msgid "Delete" -msgstr "احذف" - #: ../gtk/about.ui.h:1 msgid "About Linphone" msgstr "حول لِنْفُونْ" @@ -1073,20 +1045,7 @@ msgid "" "cs: Petr Pisar \n" "hu: anonymous\n" "he: Eli Zaretskii \n" -msgstr "" -"fr: Simon Morlat\n" -"en: Simon Morlat and Delphine Perreau\n" -"it: Alberto Zanoni \n" -"de: Jean-Jacques Sarton \n" -"sv: Daniel Nylander \n" -"es: Jesus Benitez \n" -"ja: YAMAGUCHI YOSHIYA \n" -"pt_BR: Rafael Caesar Lenzi \n" -"pl: Robert Nasiadek \n" -"cs: Petr Pisar \n" -"hu: anonymous\n" -"he: Eli Zaretskii \n" -"ar: Muhiyeddine Cherik \n" +msgstr "fr: Simon Morlat\nen: Simon Morlat and Delphine Perreau\nit: Alberto Zanoni \nde: Jean-Jacques Sarton \nsv: Daniel Nylander \nes: Jesus Benitez \nja: YAMAGUCHI YOSHIYA \npt_BR: Rafael Caesar Lenzi \npl: Robert Nasiadek \ncs: Petr Pisar \nhu: anonymous\nhe: Eli Zaretskii \nar: Muhiyeddine Cherik \n" #: ../gtk/contact.ui.h:2 msgid "SIP Address" @@ -1233,301 +1192,307 @@ msgid "C" msgstr "C" #: ../gtk/parameters.ui.h:11 -msgid "SIP (UDP)" -msgstr "SIP (UDP)" - -#: ../gtk/parameters.ui.h:12 -msgid "SIP (TCP)" -msgstr "SIP (TCP)" - -#: ../gtk/parameters.ui.h:13 -msgid "SIP (TLS)" -msgstr "SIP (TLS)" - -#: ../gtk/parameters.ui.h:14 msgid "Settings" msgstr "الإعدادات" -#: ../gtk/parameters.ui.h:15 +#: ../gtk/parameters.ui.h:12 msgid "Set Maximum Transmission Unit:" msgstr "حدِّد Maximum Transmission Unit :" -#: ../gtk/parameters.ui.h:16 +#: ../gtk/parameters.ui.h:13 msgid "Send DTMFs as SIP info" msgstr "أرسِل الأرقام الهاتفية على هيئة SIP INFO" -#: ../gtk/parameters.ui.h:17 -msgid "Use IPv6 instead of IPv4" -msgstr "استخدم IPv6 عوضا عن IPv4" +#: ../gtk/parameters.ui.h:14 +msgid "Allow IPv6" +msgstr "السماح باستخدام IPv6" -#: ../gtk/parameters.ui.h:18 +#: ../gtk/parameters.ui.h:15 msgid "Transport" msgstr "النقل" -#: ../gtk/parameters.ui.h:19 +#: ../gtk/parameters.ui.h:16 msgid "SIP/UDP port" msgstr "منفذ SIP/UDP" -#: ../gtk/parameters.ui.h:21 +#: ../gtk/parameters.ui.h:18 msgid "Random" msgstr "عشوائي" -#: ../gtk/parameters.ui.h:22 +#: ../gtk/parameters.ui.h:19 msgid "SIP/TCP port" msgstr "منفذ SIP/TCP" -#: ../gtk/parameters.ui.h:23 +#: ../gtk/parameters.ui.h:20 msgid "Audio RTP/UDP:" msgstr "صوت RTP/UDP :" -#: ../gtk/parameters.ui.h:24 +#: ../gtk/parameters.ui.h:21 msgid "Fixed" msgstr "ثابت" -#: ../gtk/parameters.ui.h:25 +#: ../gtk/parameters.ui.h:22 msgid "Video RTP/UDP:" msgstr "فيديو RTP/UDP :" -#: ../gtk/parameters.ui.h:26 +#: ../gtk/parameters.ui.h:23 msgid "Media encryption type" msgstr "نوع وسيط التعمية" -#: ../gtk/parameters.ui.h:27 +#: ../gtk/parameters.ui.h:24 msgid "Media encryption is mandatory" msgstr "وسيط التعمية إجباري" -#: ../gtk/parameters.ui.h:28 +#: ../gtk/parameters.ui.h:25 msgid "Tunnel" msgstr "النفق" -#: ../gtk/parameters.ui.h:29 +#: ../gtk/parameters.ui.h:26 msgid "DSCP fields" msgstr "حقول DSCP" -#: ../gtk/parameters.ui.h:30 +#: ../gtk/parameters.ui.h:27 msgid "Network protocol and ports" msgstr "بروتوكول الشبكة والمنافذ" -#: ../gtk/parameters.ui.h:31 +#: ../gtk/parameters.ui.h:28 msgid "Direct connection to the Internet" msgstr "الاتصال مباشر بالإنترنت" -#: ../gtk/parameters.ui.h:32 +#: ../gtk/parameters.ui.h:29 msgid "Behind NAT / Firewall (specify gateway IP )" msgstr "وراء جدار ناري (حدِّد عنوان IP البوابة)" -#: ../gtk/parameters.ui.h:33 +#: ../gtk/parameters.ui.h:30 msgid "Behind NAT / Firewall (use STUN to resolve)" msgstr "وراء جدار ناري (استخدم STUN)" -#: ../gtk/parameters.ui.h:34 +#: ../gtk/parameters.ui.h:31 msgid "Behind NAT / Firewall (use ICE)" msgstr "وراء جدار ناري (استخدم ICE)" -#: ../gtk/parameters.ui.h:35 +#: ../gtk/parameters.ui.h:32 msgid "Behind NAT / Firewall (use uPnP)" msgstr "وراء جدار ناري (استخدم uPnP)" -#: ../gtk/parameters.ui.h:36 +#: ../gtk/parameters.ui.h:33 msgid "Public IP address:" msgstr "عنوان IP العمومي :" -#: ../gtk/parameters.ui.h:37 +#: ../gtk/parameters.ui.h:34 msgid "Stun server:" msgstr "خادم STUN :" -#: ../gtk/parameters.ui.h:38 +#: ../gtk/parameters.ui.h:35 msgid "NAT and Firewall" msgstr "إعدادات حول الجدار الناري" -#: ../gtk/parameters.ui.h:39 +#: ../gtk/parameters.ui.h:36 msgid "Network settings" msgstr "إعدادات الشبكة" -#: ../gtk/parameters.ui.h:40 +#: ../gtk/parameters.ui.h:37 msgid "Ring sound:" msgstr "صوت الجرس :" -#: ../gtk/parameters.ui.h:41 +#: ../gtk/parameters.ui.h:38 msgid "ALSA special device (optional):" msgstr "عتاد ALSA الخصوصي (اختياري) :" -#: ../gtk/parameters.ui.h:42 +#: ../gtk/parameters.ui.h:39 msgid "Capture device:" msgstr "جهاز الالتقاط :" -#: ../gtk/parameters.ui.h:43 +#: ../gtk/parameters.ui.h:40 msgid "Ring device:" msgstr "جهاز الرنين :" -#: ../gtk/parameters.ui.h:44 +#: ../gtk/parameters.ui.h:41 msgid "Playback device:" msgstr "جهاز السمع :" -#: ../gtk/parameters.ui.h:45 +#: ../gtk/parameters.ui.h:42 msgid "Enable echo cancellation" msgstr "فعِّل إزالة الصدى" -#: ../gtk/parameters.ui.h:46 +#: ../gtk/parameters.ui.h:43 msgid "Audio" msgstr "الصوت" -#: ../gtk/parameters.ui.h:47 +#: ../gtk/parameters.ui.h:44 msgid "Video input device:" msgstr "جهاز إدخال الفيديو :" -#: ../gtk/parameters.ui.h:48 +#: ../gtk/parameters.ui.h:45 msgid "Prefered video resolution:" msgstr "المقدار المُراد لدقة الفيديو :" -#: ../gtk/parameters.ui.h:49 +#: ../gtk/parameters.ui.h:46 msgid "Video output method:" msgstr "طريقة إخراج الفيديو :" -#: ../gtk/parameters.ui.h:50 +#: ../gtk/parameters.ui.h:47 msgid "Show camera preview" msgstr "اظهر معاينة الكاميرا" -#: ../gtk/parameters.ui.h:51 +#: ../gtk/parameters.ui.h:48 msgid "Video" msgstr "الفيديو" -#: ../gtk/parameters.ui.h:52 +#: ../gtk/parameters.ui.h:49 msgid "Multimedia settings" msgstr "إعدادات الوسائط المتعددة" -#: ../gtk/parameters.ui.h:53 +#: ../gtk/parameters.ui.h:50 msgid "This section defines your SIP address when not using a SIP account" msgstr "هذه الفقرة تحدد عنوانك SIP إن كنت لا تستخدم حساب SIP" -#: ../gtk/parameters.ui.h:54 +#: ../gtk/parameters.ui.h:51 msgid "Your display name (eg: John Doe):" msgstr "إسمك المعروض (مثلا : زيد عمرو) :" -#: ../gtk/parameters.ui.h:55 +#: ../gtk/parameters.ui.h:52 msgid "Your username:" msgstr "إسم المستخدم لديك :" -#: ../gtk/parameters.ui.h:56 +#: ../gtk/parameters.ui.h:53 msgid "Your resulting SIP address:" msgstr "عنوانك SIP :" -#: ../gtk/parameters.ui.h:57 +#: ../gtk/parameters.ui.h:54 msgid "Default identity" msgstr "الهوية الافتراضية" -#: ../gtk/parameters.ui.h:58 +#: ../gtk/parameters.ui.h:55 msgid "Wizard" msgstr "المرشد" -#: ../gtk/parameters.ui.h:59 +#: ../gtk/parameters.ui.h:56 msgid "Add" msgstr "إضافة" -#: ../gtk/parameters.ui.h:60 +#: ../gtk/parameters.ui.h:57 msgid "Edit" msgstr "حرر" -#: ../gtk/parameters.ui.h:61 +#: ../gtk/parameters.ui.h:58 msgid "Remove" msgstr "أزل" -#: ../gtk/parameters.ui.h:62 +#: ../gtk/parameters.ui.h:59 msgid "Proxy accounts" msgstr "حسابات الوكيل" -#: ../gtk/parameters.ui.h:63 +#: ../gtk/parameters.ui.h:60 msgid "Erase all passwords" msgstr "احذف جميع كلمات السر" -#: ../gtk/parameters.ui.h:64 +#: ../gtk/parameters.ui.h:61 msgid "Privacy" msgstr "الأمان" -#: ../gtk/parameters.ui.h:65 +#: ../gtk/parameters.ui.h:62 +msgid "Automatically answer when a call is received" +msgstr "الإجابة تلقائيا فور تلقي المكالمة" + +#: ../gtk/parameters.ui.h:63 +msgid "Auto-answer" +msgstr "الإجابة تلقائيا" + +#: ../gtk/parameters.ui.h:64 msgid "Manage SIP Accounts" msgstr "إدارة حسابات SIP" -#: ../gtk/parameters.ui.h:66 ../gtk/tunnel_config.ui.h:4 +#: ../gtk/parameters.ui.h:65 ../gtk/tunnel_config.ui.h:4 msgid "Enable" msgstr "فعِّل" -#: ../gtk/parameters.ui.h:67 ../gtk/tunnel_config.ui.h:5 +#: ../gtk/parameters.ui.h:66 ../gtk/tunnel_config.ui.h:5 msgid "Disable" msgstr "إلغاء التفعيل" -#: ../gtk/parameters.ui.h:68 +#: ../gtk/parameters.ui.h:67 msgid "Codecs" msgstr "المراميز" -#: ../gtk/parameters.ui.h:69 +#: ../gtk/parameters.ui.h:68 msgid "0 stands for \"unlimited\"" msgstr "حدِّد 0 لعدم وضع أي حد" -#: ../gtk/parameters.ui.h:70 +#: ../gtk/parameters.ui.h:69 msgid "Upload speed limit in Kbit/sec:" msgstr "حد سرعة الرفع بالكيلوبِتْ/الثانية :" -#: ../gtk/parameters.ui.h:71 +#: ../gtk/parameters.ui.h:70 msgid "Download speed limit in Kbit/sec:" msgstr "حد سرعة التنزيل بالكيلوبِتْ/الثانية :" -#: ../gtk/parameters.ui.h:72 +#: ../gtk/parameters.ui.h:71 msgid "Enable adaptive rate control" msgstr "فعِّل التحكم المتكيف مع الصبيب" -#: ../gtk/parameters.ui.h:73 +#: ../gtk/parameters.ui.h:72 msgid "" "Adaptive rate control is a technique to dynamically guess the available " "bandwidth during a call." -msgstr "" -"التحكم المتكيف مع الصبيب هو تقنية لملائمة جودة الصوت والصورة بناءً على سعة " -"قناة الاتصال المتاحة خلال المكالمة." +msgstr "التحكم المتكيف مع الصبيب هو تقنية لملائمة جودة الصوت والصورة بناءً على سعة قناة الاتصال المتاحة خلال المكالمة." -#: ../gtk/parameters.ui.h:74 +#: ../gtk/parameters.ui.h:73 msgid "Bandwidth control" msgstr "إدارة سعة القناة" -#: ../gtk/parameters.ui.h:75 +#: ../gtk/parameters.ui.h:74 msgid "Codecs" msgstr "المراميز" -#: ../gtk/parameters.ui.h:76 +#: ../gtk/parameters.ui.h:75 msgid "Language" msgstr "اللغة" -#: ../gtk/parameters.ui.h:77 +#: ../gtk/parameters.ui.h:76 msgid "Show advanced settings" msgstr "أظهر الإعدادات المتقدمة" -#: ../gtk/parameters.ui.h:78 +#: ../gtk/parameters.ui.h:77 msgid "Level" msgstr "المستوى" -#: ../gtk/parameters.ui.h:79 +#: ../gtk/parameters.ui.h:78 msgid "User interface" msgstr "واجهة المستخدم" -#: ../gtk/parameters.ui.h:80 ../gtk/ldap.ui.h:2 +#: ../gtk/parameters.ui.h:79 ../gtk/ldap.ui.h:2 msgid "Server address:" msgstr "عنوان الخادم :" -#: ../gtk/parameters.ui.h:81 ../gtk/ldap.ui.h:3 +#: ../gtk/parameters.ui.h:80 ../gtk/ldap.ui.h:3 msgid "Authentication method:" msgstr "طريقة التحقق من الهوية :" -#: ../gtk/parameters.ui.h:83 +#: ../gtk/parameters.ui.h:82 msgid "LDAP Account setup" msgstr "تهيئة LDAP" -#: ../gtk/parameters.ui.h:84 +#: ../gtk/parameters.ui.h:83 msgid "LDAP" msgstr "LDAP" -#: ../gtk/parameters.ui.h:85 +#: ../gtk/parameters.ui.h:84 msgid "Done" msgstr "أغلق" +#: ../gtk/parameters.ui.h:85 +msgid "SIP (UDP)" +msgstr "SIP (UDP)" + +#: ../gtk/parameters.ui.h:86 +msgid "SIP (TCP)" +msgstr "SIP (TCP)" + +#: ../gtk/parameters.ui.h:87 +msgid "SIP (TLS)" +msgstr "SIP (TLS)" + #: ../gtk/buddylookup.ui.h:1 msgid "Search contacts in directory" msgstr "البحث عن جهات الاتصال في الدليل" @@ -1731,16 +1696,9 @@ msgstr "تحديد عنوان URI التهيئة عن بعد" #: ../gtk/config-uri.ui.h:2 msgid "" -"This dialog allows to set an http or https address when configuration is to " -"be fetched at startup.\n" -"Please enter or modify the configuration URI below. After clicking OK, " -"Linphone will restart automatically in order to fetch and take into account " -"the new configuration. " -msgstr "" -"يسمح لك مربع الحوار هذا بإعداد عنوان http أو https الذي من خلاله تود جلب " -"التهيئة عند بدء البرنامج.\n" -"أدخل العنوان أسفله. بعد تأكيد الأمر، ستجري إعادة تشغيل لِنْفُونْ تلقائيا من أجل " -"جلب والأخذ بعين الاعتبار الإعدادات الحديثة." +"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n" +"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. " +msgstr "يسمح لك مربع الحوار هذا بإعداد عنوان http أو https الذي من خلاله تود جلب التهيئة عند بدء البرنامج.\nأدخل العنوان أسفله. بعد تأكيد الأمر، ستجري إعادة تشغيل لِنْفُونْ تلقائيا من أجل جلب والأخذ بعين الاعتبار الإعدادات الحديثة." #: ../gtk/provisioning-fetch.ui.h:1 msgid "Configuring..." @@ -1750,60 +1708,60 @@ msgstr "تجري التهيئة..." msgid "Please wait while fetching configuration from server..." msgstr "رجاءً انتظر ريثما ينتهي من جلب الإعدادات من الخادم..." -#: ../coreapi/linphonecore.c:1512 +#: ../coreapi/linphonecore.c:1534 msgid "Ready" msgstr "جاهز" -#: ../coreapi/linphonecore.c:2499 +#: ../coreapi/linphonecore.c:2534 msgid "Configuring" msgstr "تجري التهيئة" -#: ../coreapi/linphonecore.c:2673 +#: ../coreapi/linphonecore.c:2708 msgid "Looking for telephone number destination..." msgstr "يجري البحث عن وجهة رقم الهاتف..." -#: ../coreapi/linphonecore.c:2675 +#: ../coreapi/linphonecore.c:2710 msgid "Could not resolve this number." msgstr "لم يتمكن من إيجاد هذا الرقم." #. must be known at that time -#: ../coreapi/linphonecore.c:2961 +#: ../coreapi/linphonecore.c:2996 msgid "Contacting" msgstr "يتصل ب" -#: ../coreapi/linphonecore.c:2966 +#: ../coreapi/linphonecore.c:3001 msgid "Could not call" msgstr "لم يتمكن من الاتصال" -#: ../coreapi/linphonecore.c:3116 +#: ../coreapi/linphonecore.c:3152 msgid "Sorry, we have reached the maximum number of simultaneous calls" msgstr "آسف، وصل عدد المكالمات الآنية إلى حده الأقصى" -#: ../coreapi/linphonecore.c:3274 +#: ../coreapi/linphonecore.c:3310 msgid "is contacting you" msgstr "يتصل بك" -#: ../coreapi/linphonecore.c:3275 +#: ../coreapi/linphonecore.c:3311 msgid " and asked autoanswer." msgstr "ويطلب ردا تلقائيا." -#: ../coreapi/linphonecore.c:3399 +#: ../coreapi/linphonecore.c:3435 msgid "Modifying call parameters..." msgstr "يجري تعديل إعدادات المكالمة..." -#: ../coreapi/linphonecore.c:3747 +#: ../coreapi/linphonecore.c:3782 msgid "Connected." msgstr "متصل." -#: ../coreapi/linphonecore.c:3772 +#: ../coreapi/linphonecore.c:3807 msgid "Call aborted" msgstr "أُلغيت المكالمة" -#: ../coreapi/linphonecore.c:3962 +#: ../coreapi/linphonecore.c:3997 msgid "Could not pause the call" msgstr "لم يتمكن من توقيف المكالمة مؤقتا" -#: ../coreapi/linphonecore.c:3965 +#: ../coreapi/linphonecore.c:4000 msgid "Pausing the current call..." msgstr "وضع المكالمة قيد الانتظار..." @@ -1871,128 +1829,125 @@ msgstr "حالة مجهولة" msgid "" "The sip proxy address you entered is invalid, it must start with \"sip:\" " "followed by a hostname." -msgstr "" -"عنوان SIP الذي أدخلت غير صالح، يجب أن يبدأ ب \"sip:\" متبوعا بإسم النطاق." +msgstr "عنوان SIP الذي أدخلت غير صالح، يجب أن يبدأ ب \"sip:\" متبوعا بإسم النطاق." #: ../coreapi/proxy.c:334 msgid "" "The sip identity you entered is invalid.\n" "It should look like sip:username@proxydomain, such as sip:alice@example.net" -msgstr "" -"هوية SIP التي أدخلت غير صحيحة.\n" -"يجب أن تشبه هذا النمط sip:username@proxydomain، مثلا sip:alice@example.net" +msgstr "هوية SIP التي أدخلت غير صحيحة.\nيجب أن تشبه هذا النمط sip:username@proxydomain، مثلا sip:alice@example.net" -#: ../coreapi/proxy.c:1403 +#: ../coreapi/proxy.c:1416 #, c-format msgid "Could not login as %s" msgstr "تعذر الولوج بالهوية %s" -#: ../coreapi/callbacks.c:419 +#: ../coreapi/callbacks.c:428 msgid "Remote ringing." msgstr "يرن الجرس عن بعد..." -#: ../coreapi/callbacks.c:431 +#: ../coreapi/callbacks.c:440 msgid "Remote ringing..." msgstr "يرن الجرس عن بعد..." -#: ../coreapi/callbacks.c:448 +#: ../coreapi/callbacks.c:461 msgid "Early media." msgstr "أخذ المكالمة مبكرا." -#: ../coreapi/callbacks.c:521 +#: ../coreapi/callbacks.c:533 #, c-format msgid "Call with %s is paused." msgstr "المكاملة مع %s متوقفة." -#: ../coreapi/callbacks.c:534 +#: ../coreapi/callbacks.c:546 #, c-format msgid "Call answered by %s - on hold." msgstr "يجيب %s عن المكالمة - في وضع الانتظار." -#: ../coreapi/callbacks.c:544 +#: ../coreapi/callbacks.c:556 msgid "Call resumed." msgstr "استُعيدت المكالمة." -#: ../coreapi/callbacks.c:548 +#: ../coreapi/callbacks.c:560 #, c-format msgid "Call answered by %s." msgstr "أجاب عن المكالمة %s." -#: ../coreapi/callbacks.c:571 +#: ../coreapi/callbacks.c:583 msgid "Incompatible, check codecs or security settings..." msgstr "غير موائم، تحقق من المراميز أو إعدادات الأمان..." -#: ../coreapi/callbacks.c:576 ../coreapi/callbacks.c:888 +#: ../coreapi/callbacks.c:588 ../coreapi/callbacks.c:900 msgid "Incompatible media parameters." msgstr "إعدادات الوسائط غير موائمة." -#: ../coreapi/callbacks.c:606 +#: ../coreapi/callbacks.c:618 msgid "We have been resumed." msgstr "استُأنِفت المكالمة." #. we are being paused -#: ../coreapi/callbacks.c:614 +#: ../coreapi/callbacks.c:626 msgid "We are paused by other party." msgstr "وُقِّفت المكالمة مؤقتا من طرف آخر." #. reINVITE and in-dialogs UPDATE go here -#: ../coreapi/callbacks.c:648 +#: ../coreapi/callbacks.c:660 msgid "Call is updated by remote." msgstr "حُدِّث الاتصال من البعيد." -#: ../coreapi/callbacks.c:764 +#: ../coreapi/callbacks.c:776 msgid "Call terminated." msgstr "أُنهيت المكالمة." -#: ../coreapi/callbacks.c:792 +#: ../coreapi/callbacks.c:804 msgid "User is busy." msgstr "المستخدم مشغول." -#: ../coreapi/callbacks.c:793 +#: ../coreapi/callbacks.c:805 msgid "User is temporarily unavailable." msgstr "المستخدم غير متاح مؤقتا." #. char *retrymsg=_("%s. Retry after %i minute(s)."); -#: ../coreapi/callbacks.c:795 +#: ../coreapi/callbacks.c:807 msgid "User does not want to be disturbed." msgstr "لا يريد المستخدم أي إزعاج." -#: ../coreapi/callbacks.c:796 +#: ../coreapi/callbacks.c:808 msgid "Call declined." msgstr "تم تجاهل المكالمة." -#: ../coreapi/callbacks.c:811 +#: ../coreapi/callbacks.c:823 msgid "Request timeout." msgstr "انتهت مهلة الطلب." -#: ../coreapi/callbacks.c:842 +#: ../coreapi/callbacks.c:854 msgid "Redirected" msgstr "مُوجَّه" -#: ../coreapi/callbacks.c:897 +#: ../coreapi/callbacks.c:909 msgid "Call failed." msgstr "فشل الاتصال." -#: ../coreapi/callbacks.c:975 +#: ../coreapi/callbacks.c:987 #, c-format msgid "Registration on %s successful." msgstr "تم التسجيل في %s بنجاح." -#: ../coreapi/callbacks.c:976 +#: ../coreapi/callbacks.c:988 #, c-format msgid "Unregistration on %s done." msgstr "أُلغي التسجيل في %s ." -#: ../coreapi/callbacks.c:994 +#: ../coreapi/callbacks.c:1006 msgid "no response timeout" msgstr "لا إجابة قبل انتهاء المهلة" -#: ../coreapi/callbacks.c:997 +#: ../coreapi/callbacks.c:1009 #, c-format msgid "Registration on %s failed: %s" msgstr "فَشِل التسجيل في %s: %s" -#: ../coreapi/callbacks.c:1004 +#: ../coreapi/callbacks.c:1016 msgid "Service unavailable, retrying" msgstr "خدمة غير متاحة، تجري الإعادة" @@ -2002,7 +1957,11 @@ msgstr "خدمة غير متاحة، تجري الإعادة" msgid "Authentication token is %s" msgstr "شارة التحقق من الهوية هي %s" -#: ../coreapi/linphonecall.c:3600 +#: ../coreapi/linphonecall.c:1305 +msgid "Call parameters were successfully modified." +msgstr "عُدِّلت معاملات المكالمات بنجاج." + +#: ../coreapi/linphonecall.c:3659 #, c-format msgid "You have missed %i call." msgid_plural "You have missed %i calls." @@ -2037,12 +1996,7 @@ msgid "" "To: %s\n" "Status: %s\n" "Duration: %i mn %i sec\n" -msgstr "" -"%s في %s\n" -"من : %s\n" -"إلى : %s\n" -"الحالة : %s\n" -"المدة : %i دقيقة %i ثانية\n" +msgstr "%s في %s\nمن : %s\nإلى : %s\nالحالة : %s\nالمدة : %i دقيقة %i ثانية\n" #: ../coreapi/call_log.c:221 msgid "Outgoing call" diff --git a/po/cs.po b/po/cs.po index 6cf402f00..05e682390 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Klara Cihlarova , 2005 # Petr Pisar , 2006-2011,2013 @@ -9,16 +9,14 @@ msgid "" msgstr "" "Project-Id-Version: linphone-gtk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-11 16:26+0100\n" -"PO-Revision-Date: 2015-02-17 11:28+0000\n" -"Last-Translator: Belledonne Communications \n" -"Language-Team: Czech (http://www.transifex.com/projects/p/linphone-gtk/" -"language/cs/)\n" -"Language: cs\n" +"POT-Creation-Date: 2015-03-27 14:40+0100\n" +"PO-Revision-Date: 2015-03-27 13:40+0000\n" +"Last-Translator: Belledonne Communications \n" +"Language-Team: Czech (http://www.transifex.com/projects/p/linphone-gtk/language/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: cs\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" #: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974 @@ -73,9 +71,7 @@ msgstr[2] "%i sekund" msgid "" "%s\tQuality: %s\n" "%s\t%s\t" -msgstr "" -"%s\tKvalita: %s\n" -"%s\t%s\t" +msgstr "%s\tKvalita: %s\n%s\t%s\t" #: ../gtk/calllogs.c:341 #, c-format @@ -95,138 +91,126 @@ msgstr "Já" msgid "Couldn't find pixmap file: %s" msgstr "Nelze najít soubor s obrázkem: %s" -#: ../gtk/chat.c:374 ../gtk/friendlist.c:924 -msgid "Invalid sip contact !" -msgstr "Neplatný sipový kontakt!" - -#: ../gtk/main.c:137 +#: ../gtk/main.c:136 msgid "log to stdout some debug information while running." msgstr "Za běhu vypisuje některé ladicí informace na standardní výstup." -#: ../gtk/main.c:138 +#: ../gtk/main.c:137 msgid "path to a file to write logs into." msgstr "Soubor, kam zapisovat protokol." -#: ../gtk/main.c:139 +#: ../gtk/main.c:138 msgid "Start linphone with video disabled." msgstr "Spustí linphone se zakázaným obrazem." -#: ../gtk/main.c:140 +#: ../gtk/main.c:139 msgid "Start only in the system tray, do not show the main interface." msgstr "Spustí se pouze do systémové oblasti, nezobrazí hlavní okno." -#: ../gtk/main.c:141 +#: ../gtk/main.c:140 msgid "address to call right now" msgstr "Zavolá právě teď na tuto adresu" -#: ../gtk/main.c:142 -msgid "if set automatically answer incoming calls" -msgstr "je-li nastaveno, automaticky zvedne příchozí hovor" - -#: ../gtk/main.c:143 +#: ../gtk/main.c:141 msgid "" -"Specifiy a working directory (should be the base of the installation, eg: c:" -"\\Program Files\\Linphone)" -msgstr "" -"Zadejte pracovní adresář (měl by být základní instalační adresář, například " +"Specifiy a working directory (should be the base of the installation, eg: " "c:\\Program Files\\Linphone)" +msgstr "Zadejte pracovní adresář (měl by být základní instalační adresář, například c:\\Program Files\\Linphone)" -#: ../gtk/main.c:144 +#: ../gtk/main.c:142 msgid "Configuration file" msgstr "" -#: ../gtk/main.c:145 +#: ../gtk/main.c:143 msgid "Run the audio assistant" msgstr "" -#: ../gtk/main.c:146 +#: ../gtk/main.c:144 msgid "Run self test and exit 0 if succeed" msgstr "" -#: ../gtk/main.c:1061 +#: ../gtk/main.c:1059 #, 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 si vás chce přidat do svého adresáře.\n" -"Dovolíte mu, aby viděl váš stav přítomnosti, nebo si ho také chcete přidat " -"do svého adresáře?\n" -"Odpovíte-li ne, tato osobo bude dočasně blokována." +msgstr "%s si vás chce přidat do svého adresáře.\nDovolíte mu, aby viděl váš stav přítomnosti, nebo si ho také chcete přidat do svého adresáře?\nOdpovíte-li ne, tato osobo bude dočasně blokována." -#: ../gtk/main.c:1138 +#: ../gtk/main.c:1136 #, c-format msgid "" "Please enter your password for username %s\n" " at realm %s:" msgstr "" -#: ../gtk/main.c:1259 +#: ../gtk/main.c:1257 msgid "Call error" msgstr "Chyba hovoru" -#: ../gtk/main.c:1262 ../coreapi/linphonecore.c:3791 +#: ../gtk/main.c:1260 ../coreapi/linphonecore.c:3826 msgid "Call ended" msgstr "Hovor ukončen" -#: ../gtk/main.c:1265 ../coreapi/call_log.c:221 +#: ../gtk/main.c:1263 ../coreapi/call_log.c:221 msgid "Incoming call" msgstr "Příchozí hovor" -#: ../gtk/main.c:1267 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5 +#: ../gtk/main.c:1265 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5 msgid "Answer" msgstr "Odpovědět" -#: ../gtk/main.c:1269 ../gtk/main.ui.h:6 +#: ../gtk/main.c:1267 ../gtk/main.ui.h:6 msgid "Decline" msgstr "Odmítnout" -#: ../gtk/main.c:1275 +#: ../gtk/main.c:1273 msgid "Call paused" msgstr "Hovor odložen" -#: ../gtk/main.c:1275 +#: ../gtk/main.c:1273 #, c-format msgid "by %s" msgstr "kým: %s" -#: ../gtk/main.c:1345 +#: ../gtk/main.c:1343 #, c-format msgid "%s proposed to start video. Do you accept ?" msgstr "%s navrhuje začít videohovor. Přijímáte?" -#: ../gtk/main.c:1507 +#: ../gtk/main.c:1505 msgid "Website link" msgstr "Odkaz na webovou stránku" -#: ../gtk/main.c:1556 +#: ../gtk/main.c:1554 msgid "Linphone - a video internet phone" msgstr "Lipnhone – internetový videofon" -#: ../gtk/main.c:1648 +#: ../gtk/main.c:1646 #, c-format msgid "%s (Default)" msgstr "%s (Výchozí)" -#: ../gtk/main.c:1980 ../coreapi/callbacks.c:1045 +#: ../gtk/main.c:1978 ../coreapi/callbacks.c:1057 #, c-format msgid "We are transferred to %s" msgstr "Byly jsme přepojeni na %s" -#: ../gtk/main.c:1990 +#: ../gtk/main.c:1988 msgid "" "No sound cards have been detected on this computer.\n" "You won't be able to send or receive audio calls." -msgstr "" -"Na tomto počítači nebyla objevena žádná zvuková karta.\n" -"Nebudete moci vytáčet a přijímat a zvukové hovory." +msgstr "Na tomto počítači nebyla objevena žádná zvuková karta.\nNebudete moci vytáčet a přijímat a zvukové hovory." -#: ../gtk/main.c:2135 +#: ../gtk/main.c:2136 msgid "A free SIP video-phone" msgstr "Volný SIP videofon" +#: ../gtk/main.c:2241 +#, c-format +msgid "Hello\n" +msgstr "" + #: ../gtk/friendlist.c:505 msgid "Add to addressbook" msgstr "Přidat do adresáře" @@ -252,6 +236,10 @@ msgstr "Diskuze" msgid "Search in %s directory" msgstr "Hledat v adresáři %s" +#: ../gtk/friendlist.c:924 +msgid "Invalid sip contact !" +msgstr "Neplatný sipový kontakt!" + #: ../gtk/friendlist.c:976 #, c-format msgid "Edit contact '%s'" @@ -292,7 +280,7 @@ msgstr "Parametry" msgid "Enabled" msgstr "Povoleno" -#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763 ../gtk/parameters.ui.h:20 +#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763 ../gtk/parameters.ui.h:17 msgid "Disabled" msgstr "Zakázáno" @@ -398,9 +386,7 @@ msgstr "ZRTP" msgid "" "A more recent version is availalble from %s.\n" "Would you like to open a browser to download it ?" -msgstr "" -"Na %s je dostupná novější verze.\n" -"Přejete si otevřít prohlížeč, abyste si ji mohli stáhnout?" +msgstr "Na %s je dostupná novější verze.\nPřejete si otevřít prohlížeč, abyste si ji mohli stáhnout?" #: ../gtk/update.c:91 msgid "You are running the lastest version." @@ -460,7 +446,7 @@ msgstr "" msgid "Enter your linphone.org username" msgstr "Zadejte uživatelské jméno na linphone.org" -#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:82 ../gtk/ldap.ui.h:4 +#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:81 ../gtk/ldap.ui.h:4 msgid "Username:" msgstr "Uživatelské jméno:" @@ -516,10 +502,7 @@ msgstr "" 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." +msgstr "Došlo k chybě (účet nebyl ověřen, uživatelské jméno již existuje nebo server není dostupný).\nProsím, vraťte se a zkoste to znovu." #: ../gtk/setupwizard.c:405 msgid "Thank you. Your account is now configured and ready for use." @@ -527,13 +510,9 @@ msgstr "Děkujeme vám. Váš účet je nyní nastaven a připraven k použití #: ../gtk/setupwizard.c:413 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 "" -"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ší." +msgstr "Prosím, ověřte svůj účet tak, že kliknete na odkaz, který jsme vám právě zaslali e-mailem.\nPak se sem vraťte a stiskněte tlačítko Další." #: ../gtk/setupwizard.c:602 msgid "SIP account configuration assistant" @@ -638,9 +617,7 @@ msgstr "Přímé nebo skrze server" msgid "" "download: %f\n" "upload: %f (kbit/s)" -msgstr "" -"příchozí: %f\n" -"odchozí: %f (kb/s)" +msgstr "příchozí: %f\nodchozí: %f (kb/s)" #: ../gtk/incall_view.c:272 ../gtk/incall_view.c:274 #, c-format @@ -754,9 +731,7 @@ msgstr "Odložit" msgid "" "Recording into\n" "%s %s" -msgstr "" -"Nahrává se do\n" -"%s %s" +msgstr "Nahrává se do\n%s %s" #: ../gtk/incall_view.c:954 msgid "(Paused)" @@ -859,7 +834,7 @@ msgstr "" msgid "Audio Assistant" msgstr "" -#: ../gtk/audio_assistant.c:513 ../gtk/main.ui.h:31 +#: ../gtk/audio_assistant.c:513 ../gtk/main.ui.h:32 msgid "Audio assistant" msgstr "" @@ -936,105 +911,105 @@ msgid "Default" msgstr "Výchozí" #: ../gtk/main.ui.h:22 +msgid "Delete" +msgstr "Smazat" + +#: ../gtk/main.ui.h:23 msgid "_Options" msgstr "V_olby" -#: ../gtk/main.ui.h:23 +#: ../gtk/main.ui.h:24 msgid "Set configuration URI" msgstr "" -#: ../gtk/main.ui.h:24 +#: ../gtk/main.ui.h:25 msgid "Always start video" msgstr "Vždy spustit obraz" -#: ../gtk/main.ui.h:25 +#: ../gtk/main.ui.h:26 msgid "Enable self-view" msgstr "Zobrazovat sám sebe" -#: ../gtk/main.ui.h:26 +#: ../gtk/main.ui.h:27 msgid "_Help" msgstr "Nápo_věda" -#: ../gtk/main.ui.h:27 +#: ../gtk/main.ui.h:28 msgid "Show debug window" msgstr "Zobrazit ladicí okno" -#: ../gtk/main.ui.h:28 +#: ../gtk/main.ui.h:29 msgid "_Homepage" msgstr "_Domovská stránka" -#: ../gtk/main.ui.h:29 +#: ../gtk/main.ui.h:30 msgid "Check _Updates" msgstr "Vyhledat akt_ualizace" -#: ../gtk/main.ui.h:30 +#: ../gtk/main.ui.h:31 msgid "Account assistant" msgstr "Průvodce účtem" -#: ../gtk/main.ui.h:32 +#: ../gtk/main.ui.h:33 msgid "SIP address or phone number:" msgstr "SIP adresa nebo telefonní číslo:" -#: ../gtk/main.ui.h:33 +#: ../gtk/main.ui.h:34 msgid "Initiate a new call" msgstr "Zahájit nový hovor" -#: ../gtk/main.ui.h:34 +#: ../gtk/main.ui.h:35 msgid "Contacts" msgstr "Kontakty" -#: ../gtk/main.ui.h:35 +#: ../gtk/main.ui.h:36 msgid "Search" msgstr "Hledat" -#: ../gtk/main.ui.h:36 +#: ../gtk/main.ui.h:37 msgid "Add contacts from directory" msgstr "Přidat kontakty z adresáře" -#: ../gtk/main.ui.h:37 +#: ../gtk/main.ui.h:38 msgid "Add contact" msgstr "Přidat kontakt" -#: ../gtk/main.ui.h:38 +#: ../gtk/main.ui.h:39 msgid "Recent calls" msgstr "Nedávné hovory" -#: ../gtk/main.ui.h:39 +#: ../gtk/main.ui.h:40 msgid "My current identity:" msgstr "Moje současná totožnost:" -#: ../gtk/main.ui.h:40 ../gtk/tunnel_config.ui.h:7 +#: ../gtk/main.ui.h:41 ../gtk/tunnel_config.ui.h:7 msgid "Username" msgstr "Uživatelské jméno" -#: ../gtk/main.ui.h:41 ../gtk/tunnel_config.ui.h:8 +#: ../gtk/main.ui.h:42 ../gtk/tunnel_config.ui.h:8 msgid "Password" msgstr "Heslo" -#: ../gtk/main.ui.h:42 +#: ../gtk/main.ui.h:43 msgid "Internet connection:" msgstr "Připojení k Internetu:" -#: ../gtk/main.ui.h:43 +#: ../gtk/main.ui.h:44 msgid "Automatically log me in" msgstr "Přihlašovat mě automaticky" -#: ../gtk/main.ui.h:44 ../gtk/password.ui.h:3 +#: ../gtk/main.ui.h:45 ../gtk/password.ui.h:3 msgid "UserID" msgstr "Identifikátor uživatele" -#: ../gtk/main.ui.h:45 +#: ../gtk/main.ui.h:46 msgid "Login information" msgstr "Informace o přihlášení" -#: ../gtk/main.ui.h:46 +#: ../gtk/main.ui.h:47 msgid "Welcome!" msgstr "" -#: ../gtk/main.ui.h:47 -msgid "Delete" -msgstr "Smazat" - #: ../gtk/about.ui.h:1 msgid "About Linphone" msgstr "" @@ -1208,301 +1183,307 @@ msgid "C" msgstr "C" #: ../gtk/parameters.ui.h:11 -msgid "SIP (UDP)" -msgstr "SIP (UDP)" - -#: ../gtk/parameters.ui.h:12 -msgid "SIP (TCP)" -msgstr "SIP (TCP)" - -#: ../gtk/parameters.ui.h:13 -msgid "SIP (TLS)" -msgstr "SIP (TLS)" - -#: ../gtk/parameters.ui.h:14 msgid "Settings" msgstr "Nastavení" -#: ../gtk/parameters.ui.h:15 +#: ../gtk/parameters.ui.h:12 msgid "Set Maximum Transmission Unit:" msgstr "Nastavit MTU (největší přenositelná zpráva):" -#: ../gtk/parameters.ui.h:16 +#: ../gtk/parameters.ui.h:13 msgid "Send DTMFs as SIP info" msgstr "Odesílat tóny DTMF jako SIP INFO zprávy" -#: ../gtk/parameters.ui.h:17 -msgid "Use IPv6 instead of IPv4" -msgstr "Používat IPv6 místo IPv4" +#: ../gtk/parameters.ui.h:14 +msgid "Allow IPv6" +msgstr "" -#: ../gtk/parameters.ui.h:18 +#: ../gtk/parameters.ui.h:15 msgid "Transport" msgstr "Přenos" -#: ../gtk/parameters.ui.h:19 +#: ../gtk/parameters.ui.h:16 msgid "SIP/UDP port" msgstr "" -#: ../gtk/parameters.ui.h:21 +#: ../gtk/parameters.ui.h:18 msgid "Random" msgstr "" -#: ../gtk/parameters.ui.h:22 +#: ../gtk/parameters.ui.h:19 msgid "SIP/TCP port" msgstr "" -#: ../gtk/parameters.ui.h:23 +#: ../gtk/parameters.ui.h:20 msgid "Audio RTP/UDP:" msgstr "Zvukový RTP/UDP:" -#: ../gtk/parameters.ui.h:24 +#: ../gtk/parameters.ui.h:21 msgid "Fixed" msgstr "Stálý" -#: ../gtk/parameters.ui.h:25 +#: ../gtk/parameters.ui.h:22 msgid "Video RTP/UDP:" msgstr "Obrazový RTP/UDP:" -#: ../gtk/parameters.ui.h:26 +#: ../gtk/parameters.ui.h:23 msgid "Media encryption type" msgstr "Druh šifrování médií" -#: ../gtk/parameters.ui.h:27 +#: ../gtk/parameters.ui.h:24 msgid "Media encryption is mandatory" msgstr "Šifrování médií je povinné" -#: ../gtk/parameters.ui.h:28 +#: ../gtk/parameters.ui.h:25 msgid "Tunnel" msgstr "Tunel" -#: ../gtk/parameters.ui.h:29 +#: ../gtk/parameters.ui.h:26 msgid "DSCP fields" msgstr "Položky DSCP" -#: ../gtk/parameters.ui.h:30 +#: ../gtk/parameters.ui.h:27 msgid "Network protocol and ports" msgstr "Síťové protokoly a porty" -#: ../gtk/parameters.ui.h:31 +#: ../gtk/parameters.ui.h:28 msgid "Direct connection to the Internet" msgstr "Přímé připojení do Internetu" -#: ../gtk/parameters.ui.h:32 +#: ../gtk/parameters.ui.h:29 msgid "Behind NAT / Firewall (specify gateway IP )" msgstr "" -#: ../gtk/parameters.ui.h:33 +#: ../gtk/parameters.ui.h:30 msgid "Behind NAT / Firewall (use STUN to resolve)" msgstr "Za NAT/firewallem (adresu určí STUN)" -#: ../gtk/parameters.ui.h:34 +#: ../gtk/parameters.ui.h:31 msgid "Behind NAT / Firewall (use ICE)" msgstr "Za NAT/firewallem (adresu určí ICE)" -#: ../gtk/parameters.ui.h:35 +#: ../gtk/parameters.ui.h:32 msgid "Behind NAT / Firewall (use uPnP)" msgstr "Za NAT/firewallem (adresu určí UPnP)" -#: ../gtk/parameters.ui.h:36 +#: ../gtk/parameters.ui.h:33 msgid "Public IP address:" msgstr "Veřejná IP adresa:" -#: ../gtk/parameters.ui.h:37 +#: ../gtk/parameters.ui.h:34 msgid "Stun server:" msgstr "STUN server:" -#: ../gtk/parameters.ui.h:38 +#: ../gtk/parameters.ui.h:35 msgid "NAT and Firewall" msgstr "NAT a firewall" -#: ../gtk/parameters.ui.h:39 +#: ../gtk/parameters.ui.h:36 msgid "Network settings" msgstr "Nastavení sítě" -#: ../gtk/parameters.ui.h:40 +#: ../gtk/parameters.ui.h:37 msgid "Ring sound:" msgstr "Vyzvánění:" -#: ../gtk/parameters.ui.h:41 +#: ../gtk/parameters.ui.h:38 msgid "ALSA special device (optional):" msgstr "Zvláštní ALSA zařízení (volitelné):" -#: ../gtk/parameters.ui.h:42 +#: ../gtk/parameters.ui.h:39 msgid "Capture device:" msgstr "Zařízení pro nahrávání:" -#: ../gtk/parameters.ui.h:43 +#: ../gtk/parameters.ui.h:40 msgid "Ring device:" msgstr "Zařízení pro vyzvánění:" -#: ../gtk/parameters.ui.h:44 +#: ../gtk/parameters.ui.h:41 msgid "Playback device:" msgstr "Zařízení pro přehrávání:" -#: ../gtk/parameters.ui.h:45 +#: ../gtk/parameters.ui.h:42 msgid "Enable echo cancellation" msgstr "Zapnout potlačení ozvěny" -#: ../gtk/parameters.ui.h:46 +#: ../gtk/parameters.ui.h:43 msgid "Audio" msgstr "Zvuk" -#: ../gtk/parameters.ui.h:47 +#: ../gtk/parameters.ui.h:44 msgid "Video input device:" msgstr "Vstupní zařízení obrazu:" -#: ../gtk/parameters.ui.h:48 +#: ../gtk/parameters.ui.h:45 msgid "Prefered video resolution:" msgstr "Upřednostňované rozlišení obrazu:" -#: ../gtk/parameters.ui.h:49 +#: ../gtk/parameters.ui.h:46 msgid "Video output method:" msgstr "" -#: ../gtk/parameters.ui.h:50 +#: ../gtk/parameters.ui.h:47 msgid "Show camera preview" msgstr "" -#: ../gtk/parameters.ui.h:51 +#: ../gtk/parameters.ui.h:48 msgid "Video" msgstr "Obraz" -#: ../gtk/parameters.ui.h:52 +#: ../gtk/parameters.ui.h:49 msgid "Multimedia settings" msgstr "Nastavení multimédií" -#: ../gtk/parameters.ui.h:53 +#: ../gtk/parameters.ui.h:50 msgid "This section defines your SIP address when not using a SIP account" msgstr "Tento oddíl určuje vaši SIP adresu, když se nepoužívá žádný účet" -#: ../gtk/parameters.ui.h:54 +#: ../gtk/parameters.ui.h:51 msgid "Your display name (eg: John Doe):" msgstr "Vaše zobrazované jméno (např. Jan Novák):" -#: ../gtk/parameters.ui.h:55 +#: ../gtk/parameters.ui.h:52 msgid "Your username:" msgstr "Vaše uživatelské jméno:" -#: ../gtk/parameters.ui.h:56 +#: ../gtk/parameters.ui.h:53 msgid "Your resulting SIP address:" msgstr "Vaše výsledná SIP adresa:" -#: ../gtk/parameters.ui.h:57 +#: ../gtk/parameters.ui.h:54 msgid "Default identity" msgstr "Implicitní totožnost" -#: ../gtk/parameters.ui.h:58 +#: ../gtk/parameters.ui.h:55 msgid "Wizard" msgstr "Průvodce" -#: ../gtk/parameters.ui.h:59 +#: ../gtk/parameters.ui.h:56 msgid "Add" msgstr "Přidat" -#: ../gtk/parameters.ui.h:60 +#: ../gtk/parameters.ui.h:57 msgid "Edit" msgstr "Upravit" -#: ../gtk/parameters.ui.h:61 +#: ../gtk/parameters.ui.h:58 msgid "Remove" msgstr "Odstranit" -#: ../gtk/parameters.ui.h:62 +#: ../gtk/parameters.ui.h:59 msgid "Proxy accounts" msgstr "Proxy účty" -#: ../gtk/parameters.ui.h:63 +#: ../gtk/parameters.ui.h:60 msgid "Erase all passwords" msgstr "Vymazat všechna hesla" -#: ../gtk/parameters.ui.h:64 +#: ../gtk/parameters.ui.h:61 msgid "Privacy" msgstr "Soukromí" -#: ../gtk/parameters.ui.h:65 +#: ../gtk/parameters.ui.h:62 +msgid "Automatically answer when a call is received" +msgstr "" + +#: ../gtk/parameters.ui.h:63 +msgid "Auto-answer" +msgstr "" + +#: ../gtk/parameters.ui.h:64 msgid "Manage SIP Accounts" msgstr "Nastavení SIP účtů" -#: ../gtk/parameters.ui.h:66 ../gtk/tunnel_config.ui.h:4 +#: ../gtk/parameters.ui.h:65 ../gtk/tunnel_config.ui.h:4 msgid "Enable" msgstr "Povolit" -#: ../gtk/parameters.ui.h:67 ../gtk/tunnel_config.ui.h:5 +#: ../gtk/parameters.ui.h:66 ../gtk/tunnel_config.ui.h:5 msgid "Disable" msgstr "Zakázat" -#: ../gtk/parameters.ui.h:68 +#: ../gtk/parameters.ui.h:67 msgid "Codecs" msgstr "Kodeky" -#: ../gtk/parameters.ui.h:69 +#: ../gtk/parameters.ui.h:68 msgid "0 stands for \"unlimited\"" msgstr "0 znamená „neomezeno“" -#: ../gtk/parameters.ui.h:70 +#: ../gtk/parameters.ui.h:69 msgid "Upload speed limit in Kbit/sec:" msgstr "Omezení odchozí rychlosti (kb/s):" -#: ../gtk/parameters.ui.h:71 +#: ../gtk/parameters.ui.h:70 msgid "Download speed limit in Kbit/sec:" msgstr "Omezení příchozí rychlosti (kb/s):" -#: ../gtk/parameters.ui.h:72 +#: ../gtk/parameters.ui.h:71 msgid "Enable adaptive rate control" msgstr "Zapnout přizpůsobující se řízení rychlosti" -#: ../gtk/parameters.ui.h:73 +#: ../gtk/parameters.ui.h:72 msgid "" "Adaptive rate control is a technique to dynamically guess the available " "bandwidth during a call." -msgstr "" -"Přizpůsobující se řízení rychlosti je technika dynamického odhadu " -"dostupného pásma během hovoru." +msgstr "Přizpůsobující se řízení rychlosti je technika dynamického odhadu dostupného pásma během hovoru." -#: ../gtk/parameters.ui.h:74 +#: ../gtk/parameters.ui.h:73 msgid "Bandwidth control" msgstr "Využití šířky pásma" -#: ../gtk/parameters.ui.h:75 +#: ../gtk/parameters.ui.h:74 msgid "Codecs" msgstr "Kodeky" -#: ../gtk/parameters.ui.h:76 +#: ../gtk/parameters.ui.h:75 msgid "Language" msgstr "Jazyk" -#: ../gtk/parameters.ui.h:77 +#: ../gtk/parameters.ui.h:76 msgid "Show advanced settings" msgstr "Zobrazit podrobnější nastavení" -#: ../gtk/parameters.ui.h:78 +#: ../gtk/parameters.ui.h:77 msgid "Level" msgstr "Úroveň" -#: ../gtk/parameters.ui.h:79 +#: ../gtk/parameters.ui.h:78 msgid "User interface" msgstr "Uživatelské rozhraní" -#: ../gtk/parameters.ui.h:80 ../gtk/ldap.ui.h:2 +#: ../gtk/parameters.ui.h:79 ../gtk/ldap.ui.h:2 msgid "Server address:" msgstr "" -#: ../gtk/parameters.ui.h:81 ../gtk/ldap.ui.h:3 +#: ../gtk/parameters.ui.h:80 ../gtk/ldap.ui.h:3 msgid "Authentication method:" msgstr "" -#: ../gtk/parameters.ui.h:83 +#: ../gtk/parameters.ui.h:82 msgid "LDAP Account setup" msgstr "" -#: ../gtk/parameters.ui.h:84 +#: ../gtk/parameters.ui.h:83 msgid "LDAP" msgstr "" -#: ../gtk/parameters.ui.h:85 +#: ../gtk/parameters.ui.h:84 msgid "Done" msgstr "Hotovo" +#: ../gtk/parameters.ui.h:85 +msgid "SIP (UDP)" +msgstr "SIP (UDP)" + +#: ../gtk/parameters.ui.h:86 +msgid "SIP (TCP)" +msgstr "SIP (TCP)" + +#: ../gtk/parameters.ui.h:87 +msgid "SIP (TLS)" +msgstr "SIP (TLS)" + #: ../gtk/buddylookup.ui.h:1 msgid "Search contacts in directory" msgstr "Hledat kontakty v adresáři" @@ -1706,11 +1687,8 @@ msgstr "" #: ../gtk/config-uri.ui.h:2 msgid "" -"This dialog allows to set an http or https address when configuration is to " -"be fetched at startup.\n" -"Please enter or modify the configuration URI below. After clicking OK, " -"Linphone will restart automatically in order to fetch and take into account " -"the new configuration. " +"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n" +"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. " msgstr "" #: ../gtk/provisioning-fetch.ui.h:1 @@ -1721,60 +1699,60 @@ msgstr "" msgid "Please wait while fetching configuration from server..." msgstr "" -#: ../coreapi/linphonecore.c:1512 +#: ../coreapi/linphonecore.c:1534 msgid "Ready" msgstr "Připraven." -#: ../coreapi/linphonecore.c:2499 +#: ../coreapi/linphonecore.c:2534 msgid "Configuring" msgstr "" -#: ../coreapi/linphonecore.c:2673 +#: ../coreapi/linphonecore.c:2708 msgid "Looking for telephone number destination..." msgstr "Vyhledává se umístění čísla…" -#: ../coreapi/linphonecore.c:2675 +#: ../coreapi/linphonecore.c:2710 msgid "Could not resolve this number." msgstr "Toto číslo nelze vyhledat." #. must be known at that time -#: ../coreapi/linphonecore.c:2961 +#: ../coreapi/linphonecore.c:2996 msgid "Contacting" msgstr "Navazuje se spojení" -#: ../coreapi/linphonecore.c:2966 +#: ../coreapi/linphonecore.c:3001 msgid "Could not call" msgstr "Nelze volat" -#: ../coreapi/linphonecore.c:3116 +#: ../coreapi/linphonecore.c:3152 msgid "Sorry, we have reached the maximum number of simultaneous calls" msgstr "Je nám líto, ale byl dosažen maximální počet současných hovorů." -#: ../coreapi/linphonecore.c:3274 +#: ../coreapi/linphonecore.c:3310 msgid "is contacting you" msgstr "vás volá" -#: ../coreapi/linphonecore.c:3275 +#: ../coreapi/linphonecore.c:3311 msgid " and asked autoanswer." msgstr " a požaduje automatickou zvednutí." -#: ../coreapi/linphonecore.c:3399 +#: ../coreapi/linphonecore.c:3435 msgid "Modifying call parameters..." msgstr "Upravují se parametry hovoru…" -#: ../coreapi/linphonecore.c:3747 +#: ../coreapi/linphonecore.c:3782 msgid "Connected." msgstr "Připojeno." -#: ../coreapi/linphonecore.c:3772 +#: ../coreapi/linphonecore.c:3807 msgid "Call aborted" msgstr "Hovor přerušen" -#: ../coreapi/linphonecore.c:3962 +#: ../coreapi/linphonecore.c:3997 msgid "Could not pause the call" msgstr "Hovor nebylo možné odložit" -#: ../coreapi/linphonecore.c:3965 +#: ../coreapi/linphonecore.c:4000 msgid "Pausing the current call..." msgstr "Současný hovor se odkládá…" @@ -1842,129 +1820,125 @@ msgstr "" msgid "" "The sip proxy address you entered is invalid, it must start with \"sip:\" " "followed by a hostname." -msgstr "" -"Adresa SIP proxy, kterou jste zadali, není platná. Musí začínat na „sip:“ a " -"pak musí následovat jméno stroje." +msgstr "Adresa SIP proxy, kterou jste zadali, není platná. Musí začínat na „sip:“ a pak musí následovat jméno stroje." #: ../coreapi/proxy.c:334 msgid "" "The sip identity you entered is invalid.\n" "It should look like sip:username@proxydomain, such as sip:alice@example.net" -msgstr "" -"SIP identita, kterou jste zadali, není platná.\n" -"Měla by mít tvar sip:uživatel@proxydoména, například sip:alice@example.net" +msgstr "SIP identita, kterou jste zadali, není platná.\nMěla by mít tvar sip:uživatel@proxydoména, například sip:alice@example.net" -#: ../coreapi/proxy.c:1403 +#: ../coreapi/proxy.c:1416 #, c-format msgid "Could not login as %s" msgstr "Nelze se přihlásit jako %s" -#: ../coreapi/callbacks.c:419 +#: ../coreapi/callbacks.c:428 msgid "Remote ringing." msgstr "Vyzvání na druhé straně." -#: ../coreapi/callbacks.c:431 +#: ../coreapi/callbacks.c:440 msgid "Remote ringing..." msgstr "Vyzvání na druhé straně…" -#: ../coreapi/callbacks.c:448 +#: ../coreapi/callbacks.c:461 msgid "Early media." msgstr "Časná média." -#: ../coreapi/callbacks.c:521 +#: ../coreapi/callbacks.c:533 #, c-format msgid "Call with %s is paused." msgstr "Hovor s %s je odložen." -#: ../coreapi/callbacks.c:534 +#: ../coreapi/callbacks.c:546 #, c-format msgid "Call answered by %s - on hold." msgstr "Hovor přijat kým: %s – odložen." -#: ../coreapi/callbacks.c:544 +#: ../coreapi/callbacks.c:556 msgid "Call resumed." msgstr "Hovor obnoven." -#: ../coreapi/callbacks.c:548 +#: ../coreapi/callbacks.c:560 #, c-format msgid "Call answered by %s." msgstr "Hovor přijat kým: %s." -#: ../coreapi/callbacks.c:571 +#: ../coreapi/callbacks.c:583 msgid "Incompatible, check codecs or security settings..." msgstr "Není slučitelné. Zkontrolujte nastavení kodeků a zabezpečení…" -#: ../coreapi/callbacks.c:576 ../coreapi/callbacks.c:888 +#: ../coreapi/callbacks.c:588 ../coreapi/callbacks.c:900 msgid "Incompatible media parameters." msgstr "Neslučitelné parametry médií." -#: ../coreapi/callbacks.c:606 +#: ../coreapi/callbacks.c:618 msgid "We have been resumed." msgstr "Byli jsme obnoveni." #. we are being paused -#: ../coreapi/callbacks.c:614 +#: ../coreapi/callbacks.c:626 msgid "We are paused by other party." msgstr "Byli jsme odloženi protistranou." #. reINVITE and in-dialogs UPDATE go here -#: ../coreapi/callbacks.c:648 +#: ../coreapi/callbacks.c:660 msgid "Call is updated by remote." msgstr "Hovor byl aktualizován protistranou." -#: ../coreapi/callbacks.c:764 +#: ../coreapi/callbacks.c:776 msgid "Call terminated." msgstr "Hovor ukončen." -#: ../coreapi/callbacks.c:792 +#: ../coreapi/callbacks.c:804 msgid "User is busy." msgstr "Uživatel je zaneprázdněn." -#: ../coreapi/callbacks.c:793 +#: ../coreapi/callbacks.c:805 msgid "User is temporarily unavailable." msgstr "Uživatel je dočasně nedostupný." #. char *retrymsg=_("%s. Retry after %i minute(s)."); -#: ../coreapi/callbacks.c:795 +#: ../coreapi/callbacks.c:807 msgid "User does not want to be disturbed." msgstr "Uživatel si nepřeje být rušen." -#: ../coreapi/callbacks.c:796 +#: ../coreapi/callbacks.c:808 msgid "Call declined." msgstr "Volání odmítnuto." -#: ../coreapi/callbacks.c:811 +#: ../coreapi/callbacks.c:823 msgid "Request timeout." msgstr "" -#: ../coreapi/callbacks.c:842 +#: ../coreapi/callbacks.c:854 msgid "Redirected" msgstr "Přesměrováno" -#: ../coreapi/callbacks.c:897 +#: ../coreapi/callbacks.c:909 msgid "Call failed." msgstr "Volání se nezdařilo." -#: ../coreapi/callbacks.c:975 +#: ../coreapi/callbacks.c:987 #, c-format msgid "Registration on %s successful." msgstr "Registrace na %s byla úspěšná." -#: ../coreapi/callbacks.c:976 +#: ../coreapi/callbacks.c:988 #, c-format msgid "Unregistration on %s done." msgstr "Odregistrování z %s hotovo." -#: ../coreapi/callbacks.c:994 +#: ../coreapi/callbacks.c:1006 msgid "no response timeout" msgstr "odpověď nedorazila včas" -#: ../coreapi/callbacks.c:997 +#: ../coreapi/callbacks.c:1009 #, c-format msgid "Registration on %s failed: %s" msgstr "Registrace na %s selhala: %s" -#: ../coreapi/callbacks.c:1004 +#: ../coreapi/callbacks.c:1016 msgid "Service unavailable, retrying" msgstr "" @@ -1974,7 +1948,11 @@ msgstr "" msgid "Authentication token is %s" msgstr "Klíč k ověření totožnosti je %s" -#: ../coreapi/linphonecall.c:3600 +#: ../coreapi/linphonecall.c:1305 +msgid "Call parameters were successfully modified." +msgstr "" + +#: ../coreapi/linphonecall.c:3659 #, c-format msgid "You have missed %i call." msgid_plural "You have missed %i calls." diff --git a/po/de.po b/po/de.po index 645e8b52e..1d5b4011b 100644 --- a/po/de.po +++ b/po/de.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # andreas, 2014 # andreas, 2014 @@ -11,16 +11,14 @@ msgid "" msgstr "" "Project-Id-Version: linphone-gtk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-11 16:26+0100\n" -"PO-Revision-Date: 2015-02-17 11:28+0000\n" -"Last-Translator: Belledonne Communications \n" -"Language-Team: German (http://www.transifex.com/projects/p/linphone-gtk/" -"language/de/)\n" -"Language: de\n" +"POT-Creation-Date: 2015-03-27 14:40+0100\n" +"PO-Revision-Date: 2015-03-27 13:40+0000\n" +"Last-Translator: Belledonne Communications \n" +"Language-Team: German (http://www.transifex.com/projects/p/linphone-gtk/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974 @@ -73,9 +71,7 @@ msgstr[1] "%i Sekunden" msgid "" "%s\tQuality: %s\n" "%s\t%s\t" -msgstr "" -"%s\tQualität: %s\n" -"%s\t%s\t" +msgstr "%s\tQualität: %s\n%s\t%s\t" #: ../gtk/calllogs.c:341 #, c-format @@ -95,142 +91,126 @@ msgstr "Eigenes Telefon" msgid "Couldn't find pixmap file: %s" msgstr "Pixmapdatei %s kann nicht gefunden werden." -#: ../gtk/chat.c:374 ../gtk/friendlist.c:924 -msgid "Invalid sip contact !" -msgstr "Ungültiger SIP-Kontakt!" - -#: ../gtk/main.c:137 +#: ../gtk/main.c:136 msgid "log to stdout some debug information while running." msgstr "Ausgabe von Debug-Informationen auf stdout während der Laufzeit" -#: ../gtk/main.c:138 +#: ../gtk/main.c:137 msgid "path to a file to write logs into." msgstr "Pfad zu einer Datei, in die Protokolle geschrieben werden." -#: ../gtk/main.c:139 +#: ../gtk/main.c:138 msgid "Start linphone with video disabled." msgstr "Linphone mit ausgeschaltetem Video starten." -#: ../gtk/main.c:140 +#: ../gtk/main.c:139 msgid "Start only in the system tray, do not show the main interface." -msgstr "" -"Nur im Systemabschnitt der Kontrollleiste starten, aber das Hauptfenster " -"nicht zeigen." +msgstr "Nur im Systemabschnitt der Kontrollleiste starten, aber das Hauptfenster nicht zeigen." -#: ../gtk/main.c:141 +#: ../gtk/main.c:140 msgid "address to call right now" msgstr "Im Moment anzurufende Adresse" -#: ../gtk/main.c:142 -msgid "if set automatically answer incoming calls" -msgstr "Falls aktiviert, werden eingehende Anrufe automatisch beantwortet" - -#: ../gtk/main.c:143 +#: ../gtk/main.c:141 msgid "" -"Specifiy a working directory (should be the base of the installation, eg: c:" -"\\Program Files\\Linphone)" -msgstr "" -"Geben Sie einen Arbeitsordner an (sollte der Installationsordner sein, z. B. " -"C:\\Programme\\Linphone)" +"Specifiy a working directory (should be the base of the installation, eg: " +"c:\\Program Files\\Linphone)" +msgstr "Geben Sie einen Arbeitsordner an (sollte der Installationsordner sein, z. B. C:\\Programme\\Linphone)" -#: ../gtk/main.c:144 +#: ../gtk/main.c:142 msgid "Configuration file" msgstr "Konfigurationsdatei" -#: ../gtk/main.c:145 +#: ../gtk/main.c:143 msgid "Run the audio assistant" msgstr "Starte den Audio-Assistent" -#: ../gtk/main.c:146 +#: ../gtk/main.c:144 msgid "Run self test and exit 0 if succeed" msgstr "" -#: ../gtk/main.c:1061 +#: ../gtk/main.c:1059 #, 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 möchte Sie zu seiner Kontaktliste hinzufügen.\n" -"Möchten Sie ihm erlauben, Ihren Anwesenheitsstatus zu sehen, oder ihn zu " -"Ihrer Kontaktliste hinzufügen?\n" -"Wenn Sie mit Nein antworten, wird diese Person vorläufig blockiert." +msgstr "%s möchte Sie zu seiner Kontaktliste hinzufügen.\nMöchten Sie ihm erlauben, Ihren Anwesenheitsstatus zu sehen, oder ihn zu Ihrer Kontaktliste hinzufügen?\nWenn Sie mit Nein antworten, wird diese Person vorläufig blockiert." -#: ../gtk/main.c:1138 +#: ../gtk/main.c:1136 #, c-format msgid "" "Please enter your password for username %s\n" " at realm %s:" -msgstr "" -"Bitte geben Sie Ihr Passwort für den Benutzernamen %s\n" -" für Bereich %s ein:" +msgstr "Bitte geben Sie Ihr Passwort für den Benutzernamen %s\n für Bereich %s ein:" -#: ../gtk/main.c:1259 +#: ../gtk/main.c:1257 msgid "Call error" msgstr "Anruf fehlgeschlagen" -#: ../gtk/main.c:1262 ../coreapi/linphonecore.c:3791 +#: ../gtk/main.c:1260 ../coreapi/linphonecore.c:3826 msgid "Call ended" msgstr "Anruf beendet" -#: ../gtk/main.c:1265 ../coreapi/call_log.c:221 +#: ../gtk/main.c:1263 ../coreapi/call_log.c:221 msgid "Incoming call" msgstr "Eingehender Anruf" -#: ../gtk/main.c:1267 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5 +#: ../gtk/main.c:1265 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5 msgid "Answer" msgstr "Annehmen" -#: ../gtk/main.c:1269 ../gtk/main.ui.h:6 +#: ../gtk/main.c:1267 ../gtk/main.ui.h:6 msgid "Decline" msgstr "Abweisen" -#: ../gtk/main.c:1275 +#: ../gtk/main.c:1273 msgid "Call paused" msgstr "Anruf wird gehalten" -#: ../gtk/main.c:1275 +#: ../gtk/main.c:1273 #, c-format msgid "by %s" msgstr "von %s" -#: ../gtk/main.c:1345 +#: ../gtk/main.c:1343 #, c-format msgid "%s proposed to start video. Do you accept ?" msgstr "%s schlägt vor, eine Videoübertragung zu starten. Nehmen Sie an?" -#: ../gtk/main.c:1507 +#: ../gtk/main.c:1505 msgid "Website link" msgstr "Website-Verknüpfung" -#: ../gtk/main.c:1556 +#: ../gtk/main.c:1554 msgid "Linphone - a video internet phone" msgstr "Linphone - ein Internet-Video-Telefon" -#: ../gtk/main.c:1648 +#: ../gtk/main.c:1646 #, c-format msgid "%s (Default)" msgstr "%s (Vorgabe)" -#: ../gtk/main.c:1980 ../coreapi/callbacks.c:1045 +#: ../gtk/main.c:1978 ../coreapi/callbacks.c:1057 #, c-format msgid "We are transferred to %s" msgstr "Vermittlung nach %s" -#: ../gtk/main.c:1990 +#: ../gtk/main.c:1988 msgid "" "No sound cards have been detected on this computer.\n" "You won't be able to send or receive audio calls." -msgstr "" -"Auf diesem Rechner können keine Soundkarten gefunden werden.\n" -"Sie können keine Audio-Anrufe tätigen oder entgegennehmen." +msgstr "Auf diesem Rechner können keine Soundkarten gefunden werden.\nSie können keine Audio-Anrufe tätigen oder entgegennehmen." -#: ../gtk/main.c:2135 +#: ../gtk/main.c:2136 msgid "A free SIP video-phone" msgstr "Ein freies SIP-Video-Telefon" +#: ../gtk/main.c:2241 +#, c-format +msgid "Hello\n" +msgstr "" + #: ../gtk/friendlist.c:505 msgid "Add to addressbook" msgstr "Zum Adressbuch hinzufügen" @@ -256,6 +236,10 @@ msgstr "Chat" msgid "Search in %s directory" msgstr "Im %s-Verzeichnis suchen" +#: ../gtk/friendlist.c:924 +msgid "Invalid sip contact !" +msgstr "Ungültiger SIP-Kontakt!" + #: ../gtk/friendlist.c:976 #, c-format msgid "Edit contact '%s'" @@ -296,7 +280,7 @@ msgstr "Parameter" msgid "Enabled" msgstr "Freigegeben" -#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763 ../gtk/parameters.ui.h:20 +#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763 ../gtk/parameters.ui.h:17 msgid "Disabled" msgstr "Gesperrt" @@ -379,9 +363,7 @@ msgstr "Serbisch" #: ../gtk/propertybox.c:1156 msgid "" "You need to restart linphone for the new language selection to take effect." -msgstr "" -"Linphone muss neu gestartet werden, damit die neue Spracheinstellung wirksam " -"wird." +msgstr "Linphone muss neu gestartet werden, damit die neue Spracheinstellung wirksam wird." #: ../gtk/propertybox.c:1236 msgid "None" @@ -404,9 +386,7 @@ msgstr "ZRTP" msgid "" "A more recent version is availalble from %s.\n" "Would you like to open a browser to download it ?" -msgstr "" -"Eine neuere Version ist von %s verfügbar.\n" -"Möchten Sie einen Browser zum Herunterladen öffnen?" +msgstr "Eine neuere Version ist von %s verfügbar.\nMöchten Sie einen Browser zum Herunterladen öffnen?" #: ../gtk/update.c:91 msgid "You are running the lastest version." @@ -443,9 +423,7 @@ msgstr[1] "%i Kontakte gefunden" msgid "" "Welcome!\n" "This assistant will help you to use a SIP account for your calls." -msgstr "" -"Willkommen!\n" -"Dieser Assistent hilft Ihnen dabei ein SIP-Konto einzurichten." +msgstr "Willkommen!\nDieser Assistent hilft Ihnen dabei ein SIP-Konto einzurichten." #: ../gtk/setupwizard.c:43 msgid "Create an account on linphone.org" @@ -453,8 +431,7 @@ msgstr "Ein Konto bei linphone.org erstellen." #: ../gtk/setupwizard.c:44 msgid "I have already a linphone.org account and I just want to use it" -msgstr "" -"Ich habe bereits ein Konto bei linphone.org und möchte es jetzt benutzen." +msgstr "Ich habe bereits ein Konto bei linphone.org und möchte es jetzt benutzen." #: ../gtk/setupwizard.c:45 msgid "I have already a sip account and I just want to use it" @@ -468,7 +445,7 @@ msgstr "Ich möchte eine URI zur Fernkonfiguration angeben" msgid "Enter your linphone.org username" msgstr "Geben Sie Ihren Benutzernamen bei linphone.org ein." -#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:82 ../gtk/ldap.ui.h:4 +#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:81 ../gtk/ldap.ui.h:4 msgid "Username:" msgstr "Benutzername:" @@ -524,25 +501,17 @@ msgstr "Halte mich über linphone Aktualisierungen auf dem laufenden" msgid "" "Error, account not validated, username already used or server unreachable.\n" "Please go back and try again." -msgstr "" -"Fehler, Konto kann nicht bestätigt werden. Der Benutzername wird bereits\n" -"verwendet oder der Server ist unerreichbar.\n" -"Bitte gehen Sie zurück und versuchen Sie es noch einmal." +msgstr "Fehler, Konto kann nicht bestätigt werden. Der Benutzername wird bereits\nverwendet oder der Server ist unerreichbar.\nBitte gehen Sie zurück und versuchen Sie es noch einmal." #: ../gtk/setupwizard.c:405 msgid "Thank you. Your account is now configured and ready for use." -msgstr "" -"Danke. Ihr Konto ist nun fertig eingerichtet und kann verwendet werden." +msgstr "Danke. Ihr Konto ist nun fertig eingerichtet und kann verwendet werden." #: ../gtk/setupwizard.c:413 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 "" -"Bitte bestätigen Sie Ihr Konto, indem Sie auf die Verknüpfung klicken, die " -"wir Ihnen soeben per E-Mail geschickt haben.\n" -"Danach gehen Sie hierher zurück und drücken auf „Vor“." +msgstr "Bitte bestätigen Sie Ihr Konto, indem Sie auf die Verknüpfung klicken, die wir Ihnen soeben per E-Mail geschickt haben.\nDanach gehen Sie hierher zurück und drücken auf „Vor“." #: ../gtk/setupwizard.c:602 msgid "SIP account configuration assistant" @@ -647,9 +616,7 @@ msgstr "Direkt oder über Server" msgid "" "download: %f\n" "upload: %f (kbit/s)" -msgstr "" -"Herunterladen: %f\n" -"Hochladen: %f (kbit/s)" +msgstr "Herunterladen: %f\nHochladen: %f (kbit/s)" #: ../gtk/incall_view.c:272 ../gtk/incall_view.c:274 #, c-format @@ -763,9 +730,7 @@ msgstr "Halten" msgid "" "Recording into\n" "%s %s" -msgstr "" -"Recording into\n" -"%s %s" +msgstr "Recording into\n%s %s" #: ../gtk/incall_view.c:954 msgid "(Paused)" @@ -818,10 +783,7 @@ msgstr "" msgid "" "Welcome!\n" "This assistant will help you to configure audio settings for Linphone" -msgstr "" -"Willkommen!\n" -"Dieser Assistent hilft Ihnen die Audioeinstellungen für Linphone " -"einzurichten." +msgstr "Willkommen!\nDieser Assistent hilft Ihnen die Audioeinstellungen für Linphone einzurichten." #: ../gtk/audio_assistant.c:328 msgid "Capture device" @@ -871,7 +833,7 @@ msgstr "Linphone jetzt starten" msgid "Audio Assistant" msgstr "Audio-Assistant" -#: ../gtk/audio_assistant.c:513 ../gtk/main.ui.h:31 +#: ../gtk/audio_assistant.c:513 ../gtk/main.ui.h:32 msgid "Audio assistant" msgstr "Audio-Assistant" @@ -948,105 +910,105 @@ msgid "Default" msgstr "Vorgabe" #: ../gtk/main.ui.h:22 +msgid "Delete" +msgstr "Löschen" + +#: ../gtk/main.ui.h:23 msgid "_Options" msgstr "_Optionen" -#: ../gtk/main.ui.h:23 +#: ../gtk/main.ui.h:24 msgid "Set configuration URI" msgstr "Konfigurations URI angeben" -#: ../gtk/main.ui.h:24 +#: ../gtk/main.ui.h:25 msgid "Always start video" msgstr "Video immer starten" -#: ../gtk/main.ui.h:25 +#: ../gtk/main.ui.h:26 msgid "Enable self-view" msgstr "Selbstansicht ein" -#: ../gtk/main.ui.h:26 +#: ../gtk/main.ui.h:27 msgid "_Help" msgstr "_Hilfe" -#: ../gtk/main.ui.h:27 +#: ../gtk/main.ui.h:28 msgid "Show debug window" msgstr "Debug-Fenster anzeigen" -#: ../gtk/main.ui.h:28 +#: ../gtk/main.ui.h:29 msgid "_Homepage" msgstr "_Homepage" -#: ../gtk/main.ui.h:29 +#: ../gtk/main.ui.h:30 msgid "Check _Updates" msgstr "Auf _Aktualisierungen überprüfen" -#: ../gtk/main.ui.h:30 +#: ../gtk/main.ui.h:31 msgid "Account assistant" msgstr "Konto-Einrichtungsassistent" -#: ../gtk/main.ui.h:32 +#: ../gtk/main.ui.h:33 msgid "SIP address or phone number:" msgstr "SIP-Adresse oder Telefonnummer:" -#: ../gtk/main.ui.h:33 +#: ../gtk/main.ui.h:34 msgid "Initiate a new call" msgstr "Einen neuen Anruf beginnen" -#: ../gtk/main.ui.h:34 +#: ../gtk/main.ui.h:35 msgid "Contacts" msgstr "Kontakte" -#: ../gtk/main.ui.h:35 +#: ../gtk/main.ui.h:36 msgid "Search" msgstr "Suchen" -#: ../gtk/main.ui.h:36 +#: ../gtk/main.ui.h:37 msgid "Add contacts from directory" msgstr "Kontakte aus einem Verzeichnis hinzufügen" -#: ../gtk/main.ui.h:37 +#: ../gtk/main.ui.h:38 msgid "Add contact" msgstr "Kontakt hinzufügen" -#: ../gtk/main.ui.h:38 +#: ../gtk/main.ui.h:39 msgid "Recent calls" msgstr "Letzte Gespräche" -#: ../gtk/main.ui.h:39 +#: ../gtk/main.ui.h:40 msgid "My current identity:" msgstr "Aktuelle Identität:" -#: ../gtk/main.ui.h:40 ../gtk/tunnel_config.ui.h:7 +#: ../gtk/main.ui.h:41 ../gtk/tunnel_config.ui.h:7 msgid "Username" msgstr "Benutzername" -#: ../gtk/main.ui.h:41 ../gtk/tunnel_config.ui.h:8 +#: ../gtk/main.ui.h:42 ../gtk/tunnel_config.ui.h:8 msgid "Password" msgstr "Passwort" -#: ../gtk/main.ui.h:42 +#: ../gtk/main.ui.h:43 msgid "Internet connection:" msgstr "Internetverbindung:" -#: ../gtk/main.ui.h:43 +#: ../gtk/main.ui.h:44 msgid "Automatically log me in" msgstr "Automatisch anmelden" -#: ../gtk/main.ui.h:44 ../gtk/password.ui.h:3 +#: ../gtk/main.ui.h:45 ../gtk/password.ui.h:3 msgid "UserID" msgstr "Benutzer-ID" -#: ../gtk/main.ui.h:45 +#: ../gtk/main.ui.h:46 msgid "Login information" msgstr "Anmeldeinformationen" -#: ../gtk/main.ui.h:46 +#: ../gtk/main.ui.h:47 msgid "Welcome!" msgstr "Willkommen!" -#: ../gtk/main.ui.h:47 -msgid "Delete" -msgstr "Löschen" - #: ../gtk/about.ui.h:1 msgid "About Linphone" msgstr "Über Linphone" @@ -1057,9 +1019,7 @@ msgstr "(C) Belledonne Communications, 2010\n" #: ../gtk/about.ui.h:4 msgid "An internet video phone using the standard SIP (rfc3261) protocol." -msgstr "" -"Ein Internet-Video-Telefon, das das Standard-SIP-Protokoll (RFC3261) " -"verwendet." +msgstr "Ein Internet-Video-Telefon, das das Standard-SIP-Protokoll (RFC3261) verwendet." #: ../gtk/about.ui.h:5 msgid "" @@ -1075,19 +1035,7 @@ msgid "" "cs: Petr Pisar \n" "hu: anonymous\n" "he: Eli Zaretskii \n" -msgstr "" -"fr: Simon Morlat\n" -"en: Simon Morlat and Delphine Perreau\n" -"it: Alberto Zanoni \n" -"de: Jean-Jacques Sarton \n" -"sv: Daniel Nylander \n" -"es: Jesus Benitez \n" -"ja: YAMAGUCHI YOSHIYA \n" -"pt_BR: Rafael Caesar Lenzi \n" -"pl: Robert Nasiadek \n" -"cs: Petr Pisar \n" -"hu: anonymous\n" -"he: Eli Zaretskii \n" +msgstr "fr: Simon Morlat\nen: Simon Morlat and Delphine Perreau\nit: Alberto Zanoni \nde: Jean-Jacques Sarton \nsv: Daniel Nylander \nes: Jesus Benitez \nja: YAMAGUCHI YOSHIYA \npt_BR: Rafael Caesar Lenzi \npl: Robert Nasiadek \ncs: Petr Pisar \nhu: anonymous\nhe: Eli Zaretskii \n" #: ../gtk/contact.ui.h:2 msgid "SIP Address" @@ -1234,303 +1182,307 @@ msgid "C" msgstr "C" #: ../gtk/parameters.ui.h:11 -msgid "SIP (UDP)" -msgstr "SIP (UDP)" - -#: ../gtk/parameters.ui.h:12 -msgid "SIP (TCP)" -msgstr "SIP (TCP)" - -#: ../gtk/parameters.ui.h:13 -msgid "SIP (TLS)" -msgstr "SIP (TLS)" - -#: ../gtk/parameters.ui.h:14 msgid "Settings" msgstr "Einstellungen" -#: ../gtk/parameters.ui.h:15 +#: ../gtk/parameters.ui.h:12 msgid "Set Maximum Transmission Unit:" msgstr "Maximum Transmission Unit setzen:" -#: ../gtk/parameters.ui.h:16 +#: ../gtk/parameters.ui.h:13 msgid "Send DTMFs as SIP info" msgstr "DTMFs als SIP-Info senden" -#: ../gtk/parameters.ui.h:17 -msgid "Use IPv6 instead of IPv4" -msgstr "IPv6 statt IPv4 verwenden" +#: ../gtk/parameters.ui.h:14 +msgid "Allow IPv6" +msgstr "" -#: ../gtk/parameters.ui.h:18 +#: ../gtk/parameters.ui.h:15 msgid "Transport" msgstr "Übertragung" -#: ../gtk/parameters.ui.h:19 +#: ../gtk/parameters.ui.h:16 msgid "SIP/UDP port" msgstr "SIP/UDP Port" -#: ../gtk/parameters.ui.h:21 +#: ../gtk/parameters.ui.h:18 msgid "Random" msgstr "" -#: ../gtk/parameters.ui.h:22 +#: ../gtk/parameters.ui.h:19 msgid "SIP/TCP port" msgstr "SIP/TCP Port" -#: ../gtk/parameters.ui.h:23 +#: ../gtk/parameters.ui.h:20 msgid "Audio RTP/UDP:" msgstr "Audio RTP/UDP:" -#: ../gtk/parameters.ui.h:24 +#: ../gtk/parameters.ui.h:21 msgid "Fixed" msgstr "Fest" -#: ../gtk/parameters.ui.h:25 +#: ../gtk/parameters.ui.h:22 msgid "Video RTP/UDP:" msgstr "Video RTP/UDP:" -#: ../gtk/parameters.ui.h:26 +#: ../gtk/parameters.ui.h:23 msgid "Media encryption type" msgstr "Verschlüsselungstyp der Medien" -#: ../gtk/parameters.ui.h:27 +#: ../gtk/parameters.ui.h:24 msgid "Media encryption is mandatory" msgstr "Medienverschlüsselung erzwingen" -#: ../gtk/parameters.ui.h:28 +#: ../gtk/parameters.ui.h:25 msgid "Tunnel" msgstr "Tunnel" -#: ../gtk/parameters.ui.h:29 +#: ../gtk/parameters.ui.h:26 msgid "DSCP fields" msgstr "DSCP-Felder" -#: ../gtk/parameters.ui.h:30 +#: ../gtk/parameters.ui.h:27 msgid "Network protocol and ports" msgstr "Netzwerkprotokoll und Ports" -#: ../gtk/parameters.ui.h:31 +#: ../gtk/parameters.ui.h:28 msgid "Direct connection to the Internet" msgstr "Direkte Verbindung ins Internet" -#: ../gtk/parameters.ui.h:32 +#: ../gtk/parameters.ui.h:29 msgid "Behind NAT / Firewall (specify gateway IP )" msgstr "Hinter NAT / Firewall (Gateway IP angeben)" -#: ../gtk/parameters.ui.h:33 +#: ../gtk/parameters.ui.h:30 msgid "Behind NAT / Firewall (use STUN to resolve)" msgstr "Hinter NAT / Firewall (STUN verwenden)" -#: ../gtk/parameters.ui.h:34 +#: ../gtk/parameters.ui.h:31 msgid "Behind NAT / Firewall (use ICE)" msgstr "Hinter NAT / Firewall (ICE verwenden)" -#: ../gtk/parameters.ui.h:35 +#: ../gtk/parameters.ui.h:32 msgid "Behind NAT / Firewall (use uPnP)" msgstr "Hinter NAT / Firewall (uPnP verwenden)" -#: ../gtk/parameters.ui.h:36 +#: ../gtk/parameters.ui.h:33 msgid "Public IP address:" msgstr "Öffentliche IP-Adresse:" -#: ../gtk/parameters.ui.h:37 +#: ../gtk/parameters.ui.h:34 msgid "Stun server:" msgstr "STUN-Server:" -#: ../gtk/parameters.ui.h:38 +#: ../gtk/parameters.ui.h:35 msgid "NAT and Firewall" msgstr "NAT und Firewall" -#: ../gtk/parameters.ui.h:39 +#: ../gtk/parameters.ui.h:36 msgid "Network settings" msgstr "Netzwerkeinstellungen" -#: ../gtk/parameters.ui.h:40 +#: ../gtk/parameters.ui.h:37 msgid "Ring sound:" msgstr "Klingelton:" -#: ../gtk/parameters.ui.h:41 +#: ../gtk/parameters.ui.h:38 msgid "ALSA special device (optional):" msgstr "Spezielles ALSA-Gerät (optional):" -#: ../gtk/parameters.ui.h:42 +#: ../gtk/parameters.ui.h:39 msgid "Capture device:" msgstr "Aufnahmegerät:" -#: ../gtk/parameters.ui.h:43 +#: ../gtk/parameters.ui.h:40 msgid "Ring device:" msgstr "Gerät für Klingelton:" -#: ../gtk/parameters.ui.h:44 +#: ../gtk/parameters.ui.h:41 msgid "Playback device:" msgstr "Wiedergabegerät:" -#: ../gtk/parameters.ui.h:45 +#: ../gtk/parameters.ui.h:42 msgid "Enable echo cancellation" msgstr "Echounterdrückung ein" -#: ../gtk/parameters.ui.h:46 +#: ../gtk/parameters.ui.h:43 msgid "Audio" msgstr "Audio" -#: ../gtk/parameters.ui.h:47 +#: ../gtk/parameters.ui.h:44 msgid "Video input device:" msgstr "Video-Aufnahmegerät:" -#: ../gtk/parameters.ui.h:48 +#: ../gtk/parameters.ui.h:45 msgid "Prefered video resolution:" msgstr "Bevorzugte Video-Auflösung:" -#: ../gtk/parameters.ui.h:49 +#: ../gtk/parameters.ui.h:46 msgid "Video output method:" msgstr "Methode zur Videoausgabe" -#: ../gtk/parameters.ui.h:50 +#: ../gtk/parameters.ui.h:47 msgid "Show camera preview" msgstr "" -#: ../gtk/parameters.ui.h:51 +#: ../gtk/parameters.ui.h:48 msgid "Video" msgstr "Video" -#: ../gtk/parameters.ui.h:52 +#: ../gtk/parameters.ui.h:49 msgid "Multimedia settings" msgstr "Multimedia-Einstellungen" -#: ../gtk/parameters.ui.h:53 +#: ../gtk/parameters.ui.h:50 msgid "This section defines your SIP address when not using a SIP account" -msgstr "" -"In diesem Bereich legen Sie Ihre SIP-Adresse fest, wenn Sie kein SIP-Konto " -"verwenden." +msgstr "In diesem Bereich legen Sie Ihre SIP-Adresse fest, wenn Sie kein SIP-Konto verwenden." -#: ../gtk/parameters.ui.h:54 +#: ../gtk/parameters.ui.h:51 msgid "Your display name (eg: John Doe):" msgstr "Ihr angezeigter Name (z. B. Heinz Müller):" -#: ../gtk/parameters.ui.h:55 +#: ../gtk/parameters.ui.h:52 msgid "Your username:" msgstr "Ihr Benutzername:" -#: ../gtk/parameters.ui.h:56 +#: ../gtk/parameters.ui.h:53 msgid "Your resulting SIP address:" msgstr "Sich ergebende SIP-Adresse:" -#: ../gtk/parameters.ui.h:57 +#: ../gtk/parameters.ui.h:54 msgid "Default identity" msgstr "Standard-Identität" -#: ../gtk/parameters.ui.h:58 +#: ../gtk/parameters.ui.h:55 msgid "Wizard" msgstr "Assistent" -#: ../gtk/parameters.ui.h:59 +#: ../gtk/parameters.ui.h:56 msgid "Add" msgstr "Hinzufügen" -#: ../gtk/parameters.ui.h:60 +#: ../gtk/parameters.ui.h:57 msgid "Edit" msgstr "Bearbeiten" -#: ../gtk/parameters.ui.h:61 +#: ../gtk/parameters.ui.h:58 msgid "Remove" msgstr "Entfernen" -#: ../gtk/parameters.ui.h:62 +#: ../gtk/parameters.ui.h:59 msgid "Proxy accounts" msgstr "Proxy-Konten" -#: ../gtk/parameters.ui.h:63 +#: ../gtk/parameters.ui.h:60 msgid "Erase all passwords" msgstr "Alle Passwörter löschen" -#: ../gtk/parameters.ui.h:64 +#: ../gtk/parameters.ui.h:61 msgid "Privacy" msgstr "Privatsphäre" -#: ../gtk/parameters.ui.h:65 +#: ../gtk/parameters.ui.h:62 +msgid "Automatically answer when a call is received" +msgstr "" + +#: ../gtk/parameters.ui.h:63 +msgid "Auto-answer" +msgstr "" + +#: ../gtk/parameters.ui.h:64 msgid "Manage SIP Accounts" msgstr "SIP-Konten verwalten" -#: ../gtk/parameters.ui.h:66 ../gtk/tunnel_config.ui.h:4 +#: ../gtk/parameters.ui.h:65 ../gtk/tunnel_config.ui.h:4 msgid "Enable" msgstr "Freigeben" -#: ../gtk/parameters.ui.h:67 ../gtk/tunnel_config.ui.h:5 +#: ../gtk/parameters.ui.h:66 ../gtk/tunnel_config.ui.h:5 msgid "Disable" msgstr "Sperren" -#: ../gtk/parameters.ui.h:68 +#: ../gtk/parameters.ui.h:67 msgid "Codecs" msgstr "Codecs" -#: ../gtk/parameters.ui.h:69 +#: ../gtk/parameters.ui.h:68 msgid "0 stands for \"unlimited\"" msgstr "0 bedeutet „unbegrenzt“" -#: ../gtk/parameters.ui.h:70 +#: ../gtk/parameters.ui.h:69 msgid "Upload speed limit in Kbit/sec:" msgstr "Upload-Bandbreite (kbit/sec):" -#: ../gtk/parameters.ui.h:71 +#: ../gtk/parameters.ui.h:70 msgid "Download speed limit in Kbit/sec:" msgstr "Download-Bandbreite (kbit/sec):" -#: ../gtk/parameters.ui.h:72 +#: ../gtk/parameters.ui.h:71 msgid "Enable adaptive rate control" msgstr "Adaptive Ratenregelung ein" -#: ../gtk/parameters.ui.h:73 +#: ../gtk/parameters.ui.h:72 msgid "" "Adaptive rate control is a technique to dynamically guess the available " "bandwidth during a call." -msgstr "" -"Adaptive Ratenregelung ist eine Technik zur dynamischen Abschätzung der " -"zur Verfügung stehenden Bandbreite während eines Anrufs." +msgstr "Adaptive Ratenregelung ist eine Technik zur dynamischen Abschätzung der zur Verfügung stehenden Bandbreite während eines Anrufs." -#: ../gtk/parameters.ui.h:74 +#: ../gtk/parameters.ui.h:73 msgid "Bandwidth control" msgstr "Bandbreiten-Einstellungen" -#: ../gtk/parameters.ui.h:75 +#: ../gtk/parameters.ui.h:74 msgid "Codecs" msgstr "Codecs" -#: ../gtk/parameters.ui.h:76 +#: ../gtk/parameters.ui.h:75 msgid "Language" msgstr "Sprache" -#: ../gtk/parameters.ui.h:77 +#: ../gtk/parameters.ui.h:76 msgid "Show advanced settings" msgstr "Fortgeschrittene Einstellungen anzeigen" -#: ../gtk/parameters.ui.h:78 +#: ../gtk/parameters.ui.h:77 msgid "Level" msgstr "Detaillierung" -#: ../gtk/parameters.ui.h:79 +#: ../gtk/parameters.ui.h:78 msgid "User interface" msgstr "Benutzeroberfläche" -#: ../gtk/parameters.ui.h:80 ../gtk/ldap.ui.h:2 +#: ../gtk/parameters.ui.h:79 ../gtk/ldap.ui.h:2 msgid "Server address:" msgstr "Server-Adresse" -#: ../gtk/parameters.ui.h:81 ../gtk/ldap.ui.h:3 +#: ../gtk/parameters.ui.h:80 ../gtk/ldap.ui.h:3 msgid "Authentication method:" msgstr "Authentifizierungsmethode" -#: ../gtk/parameters.ui.h:83 +#: ../gtk/parameters.ui.h:82 msgid "LDAP Account setup" msgstr "LDAP-Kontoeinrichtung" -#: ../gtk/parameters.ui.h:84 +#: ../gtk/parameters.ui.h:83 msgid "LDAP" msgstr "LDAP" -#: ../gtk/parameters.ui.h:85 +#: ../gtk/parameters.ui.h:84 msgid "Done" msgstr "Fertig" +#: ../gtk/parameters.ui.h:85 +msgid "SIP (UDP)" +msgstr "SIP (UDP)" + +#: ../gtk/parameters.ui.h:86 +msgid "SIP (TCP)" +msgstr "SIP (TCP)" + +#: ../gtk/parameters.ui.h:87 +msgid "SIP (TLS)" +msgstr "SIP (TLS)" + #: ../gtk/buddylookup.ui.h:1 msgid "Search contacts in directory" msgstr "Kontakte im Verzeichnis suchen" @@ -1734,17 +1686,9 @@ msgstr "Eine URI zur FErnkonfiguration angeben" #: ../gtk/config-uri.ui.h:2 msgid "" -"This dialog allows to set an http or https address when configuration is to " -"be fetched at startup.\n" -"Please enter or modify the configuration URI below. After clicking OK, " -"Linphone will restart automatically in order to fetch and take into account " -"the new configuration. " -msgstr "" -"Diese Maske erlaubt Ihnen für das Laden der Konfiguration beim Programmstart " -"eine http- oder https-Adresse anzugeben.\n" -"Bitte geben Sie unten die Konfigurations-URI ein oder ändern diese. Nach dem " -"Bestätigen mit OK wird Linphone automatisch neustarten, um die neuen " -"Einstellungen zu übernehmen." +"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n" +"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. " +msgstr "Diese Maske erlaubt Ihnen für das Laden der Konfiguration beim Programmstart eine http- oder https-Adresse anzugeben.\nBitte geben Sie unten die Konfigurations-URI ein oder ändern diese. Nach dem Bestätigen mit OK wird Linphone automatisch neustarten, um die neuen Einstellungen zu übernehmen." #: ../gtk/provisioning-fetch.ui.h:1 msgid "Configuring..." @@ -1752,63 +1696,62 @@ msgstr "Einstellen..." #: ../gtk/provisioning-fetch.ui.h:2 msgid "Please wait while fetching configuration from server..." -msgstr "" -"Bitte warten Sie während die Einstellungen vom Server abgerufen werden..." +msgstr "Bitte warten Sie während die Einstellungen vom Server abgerufen werden..." -#: ../coreapi/linphonecore.c:1512 +#: ../coreapi/linphonecore.c:1534 msgid "Ready" msgstr "Bereit" -#: ../coreapi/linphonecore.c:2499 +#: ../coreapi/linphonecore.c:2534 msgid "Configuring" msgstr "Einstellen" -#: ../coreapi/linphonecore.c:2673 +#: ../coreapi/linphonecore.c:2708 msgid "Looking for telephone number destination..." msgstr "Telefonnummernziel wird gesucht..." -#: ../coreapi/linphonecore.c:2675 +#: ../coreapi/linphonecore.c:2710 msgid "Could not resolve this number." msgstr "Diese Nummer kann nicht aufgelöst werden." #. must be known at that time -#: ../coreapi/linphonecore.c:2961 +#: ../coreapi/linphonecore.c:2996 msgid "Contacting" msgstr "Verbindungsaufbau" -#: ../coreapi/linphonecore.c:2966 +#: ../coreapi/linphonecore.c:3001 msgid "Could not call" msgstr "Anruf kann nicht getätigt werden." -#: ../coreapi/linphonecore.c:3116 +#: ../coreapi/linphonecore.c:3152 msgid "Sorry, we have reached the maximum number of simultaneous calls" msgstr "Die maximale Anzahl der gleichzeitigen Anrufe ist erreicht." -#: ../coreapi/linphonecore.c:3274 +#: ../coreapi/linphonecore.c:3310 msgid "is contacting you" msgstr "ruft Sie an" -#: ../coreapi/linphonecore.c:3275 +#: ../coreapi/linphonecore.c:3311 msgid " and asked autoanswer." msgstr " und fragt nach automatischer Antwort." -#: ../coreapi/linphonecore.c:3399 +#: ../coreapi/linphonecore.c:3435 msgid "Modifying call parameters..." msgstr "Die Anrufparameter werden verändert..." -#: ../coreapi/linphonecore.c:3747 +#: ../coreapi/linphonecore.c:3782 msgid "Connected." msgstr "Verbunden." -#: ../coreapi/linphonecore.c:3772 +#: ../coreapi/linphonecore.c:3807 msgid "Call aborted" msgstr "Anruf abgebrochen" -#: ../coreapi/linphonecore.c:3962 +#: ../coreapi/linphonecore.c:3997 msgid "Could not pause the call" msgstr "Anruf kann nicht gehalten werden" -#: ../coreapi/linphonecore.c:3965 +#: ../coreapi/linphonecore.c:4000 msgid "Pausing the current call..." msgstr "Aktueller Anruf wird gehalten..." @@ -1876,130 +1819,125 @@ msgstr "Unbekannter Status" msgid "" "The sip proxy address you entered is invalid, it must start with \"sip:\" " "followed by a hostname." -msgstr "" -"Die von Ihnen eingegebene SIP-Proxy-Adresse ist ungültig, sie muss mit " -"„sip:“ gefolgt vom Hostnamen beginnen." +msgstr "Die von Ihnen eingegebene SIP-Proxy-Adresse ist ungültig, sie muss mit „sip:“ gefolgt vom Hostnamen beginnen." #: ../coreapi/proxy.c:334 msgid "" "The sip identity you entered is invalid.\n" "It should look like sip:username@proxydomain, such as sip:alice@example.net" -msgstr "" -"Die von Ihnen eingegebene SIP-Identität ist ungültig.\n" -"Sie sollte wie sip:benutzername@proxydomain aussehen, also z.B. sip:" -"alice@beispiel.net" +msgstr "Die von Ihnen eingegebene SIP-Identität ist ungültig.\nSie sollte wie sip:benutzername@proxydomain aussehen, also z.B. sip:alice@beispiel.net" -#: ../coreapi/proxy.c:1403 +#: ../coreapi/proxy.c:1416 #, c-format msgid "Could not login as %s" msgstr "Anmeldung als %s fehlgeschlagen" -#: ../coreapi/callbacks.c:419 +#: ../coreapi/callbacks.c:428 msgid "Remote ringing." msgstr "Klingeln bei der Gegenseite." -#: ../coreapi/callbacks.c:431 +#: ../coreapi/callbacks.c:440 msgid "Remote ringing..." msgstr "Klingeln bei der Gegenseite..." -#: ../coreapi/callbacks.c:448 +#: ../coreapi/callbacks.c:461 msgid "Early media." msgstr "nicht kompatibel, prüfe Codecs oder Sicherheitseinstellungen..." -#: ../coreapi/callbacks.c:521 +#: ../coreapi/callbacks.c:533 #, c-format msgid "Call with %s is paused." msgstr "Anruf mit %s wird gehalten." -#: ../coreapi/callbacks.c:534 +#: ../coreapi/callbacks.c:546 #, c-format msgid "Call answered by %s - on hold." msgstr "Der von %s entgegengenommene Anruf wird gehalten." -#: ../coreapi/callbacks.c:544 +#: ../coreapi/callbacks.c:556 msgid "Call resumed." msgstr "Anruf fortgesetzt." -#: ../coreapi/callbacks.c:548 +#: ../coreapi/callbacks.c:560 #, c-format msgid "Call answered by %s." msgstr "Anruf wird von %s entgegengenommen." -#: ../coreapi/callbacks.c:571 +#: ../coreapi/callbacks.c:583 msgid "Incompatible, check codecs or security settings..." msgstr "Inkompatibel, prüfe Codecs oder Sicherheitseinstellungen..." -#: ../coreapi/callbacks.c:576 ../coreapi/callbacks.c:888 +#: ../coreapi/callbacks.c:588 ../coreapi/callbacks.c:900 msgid "Incompatible media parameters." msgstr "Inkompatible Medienparameter." -#: ../coreapi/callbacks.c:606 +#: ../coreapi/callbacks.c:618 msgid "We have been resumed." msgstr "Anruf wird fortgesetzt." #. we are being paused -#: ../coreapi/callbacks.c:614 +#: ../coreapi/callbacks.c:626 msgid "We are paused by other party." msgstr "Anruf wird von der Gegenseite gehalten." #. reINVITE and in-dialogs UPDATE go here -#: ../coreapi/callbacks.c:648 +#: ../coreapi/callbacks.c:660 msgid "Call is updated by remote." msgstr "Anruf ist von der Gegenseite aktualisiert worden." -#: ../coreapi/callbacks.c:764 +#: ../coreapi/callbacks.c:776 msgid "Call terminated." msgstr "Anruf beendet." -#: ../coreapi/callbacks.c:792 +#: ../coreapi/callbacks.c:804 msgid "User is busy." msgstr "Teilnehmer ist besetzt." -#: ../coreapi/callbacks.c:793 +#: ../coreapi/callbacks.c:805 msgid "User is temporarily unavailable." msgstr "Teilnehmer zur Zeit nicht verfügbar." #. char *retrymsg=_("%s. Retry after %i minute(s)."); -#: ../coreapi/callbacks.c:795 +#: ../coreapi/callbacks.c:807 msgid "User does not want to be disturbed." msgstr "Teilnehmer möchte nicht gestört werden." -#: ../coreapi/callbacks.c:796 +#: ../coreapi/callbacks.c:808 msgid "Call declined." msgstr "Anruf abgewiesen" -#: ../coreapi/callbacks.c:811 +#: ../coreapi/callbacks.c:823 msgid "Request timeout." msgstr "Zeitüberschreitung bei der Anfrage" -#: ../coreapi/callbacks.c:842 +#: ../coreapi/callbacks.c:854 msgid "Redirected" msgstr "Umgeleitet" -#: ../coreapi/callbacks.c:897 +#: ../coreapi/callbacks.c:909 msgid "Call failed." msgstr "Anruf fehlgeschlagen." -#: ../coreapi/callbacks.c:975 +#: ../coreapi/callbacks.c:987 #, c-format msgid "Registration on %s successful." msgstr "Registrierung auf %s erfolgreich." -#: ../coreapi/callbacks.c:976 +#: ../coreapi/callbacks.c:988 #, c-format msgid "Unregistration on %s done." msgstr "Abmeldung von %s ist erfolgt." -#: ../coreapi/callbacks.c:994 +#: ../coreapi/callbacks.c:1006 msgid "no response timeout" msgstr "Zeitüberschreitung bei der Antwort" -#: ../coreapi/callbacks.c:997 +#: ../coreapi/callbacks.c:1009 #, c-format msgid "Registration on %s failed: %s" msgstr "Registrierung auf %s fehlgeschlagen: %s" -#: ../coreapi/callbacks.c:1004 +#: ../coreapi/callbacks.c:1016 msgid "Service unavailable, retrying" msgstr "Service nicht verfügbar, versuche erneut" @@ -2009,7 +1947,11 @@ msgstr "Service nicht verfügbar, versuche erneut" msgid "Authentication token is %s" msgstr "Authentifizierungs-Token ist %s" -#: ../coreapi/linphonecall.c:3600 +#: ../coreapi/linphonecall.c:1305 +msgid "Call parameters were successfully modified." +msgstr "" + +#: ../coreapi/linphonecall.c:3659 #, c-format msgid "You have missed %i call." msgid_plural "You have missed %i calls." diff --git a/po/es.po b/po/es.po index c3e0b494f..3422f3896 100644 --- a/po/es.po +++ b/po/es.po @@ -1,22 +1,20 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: msgid "" msgstr "" "Project-Id-Version: linphone-gtk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-11 16:26+0100\n" -"PO-Revision-Date: 2015-02-17 11:28+0000\n" -"Last-Translator: Belledonne Communications \n" -"Language-Team: Spanish (http://www.transifex.com/projects/p/linphone-gtk/" -"language/es/)\n" -"Language: es\n" +"POT-Creation-Date: 2015-03-27 14:40+0100\n" +"PO-Revision-Date: 2015-03-27 13:40+0000\n" +"Last-Translator: Belledonne Communications \n" +"Language-Team: Spanish (http://www.transifex.com/projects/p/linphone-gtk/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974 @@ -89,139 +87,126 @@ msgstr "Yo" msgid "Couldn't find pixmap file: %s" msgstr "No se pudo encontrar el archivo pixmap: %s" -#: ../gtk/chat.c:374 ../gtk/friendlist.c:924 -msgid "Invalid sip contact !" -msgstr "¡Contacto SIP no válido!" +#: ../gtk/main.c:136 +msgid "log to stdout some debug information while running." +msgstr "registra a stdout cierta información de depuración durante la ejecución." #: ../gtk/main.c:137 -msgid "log to stdout some debug information while running." -msgstr "" -"registra a stdout cierta información de depuración durante la ejecución." - -#: ../gtk/main.c:138 msgid "path to a file to write logs into." msgstr "ruta a un fichero donde escribir logs." -#: ../gtk/main.c:139 +#: ../gtk/main.c:138 msgid "Start linphone with video disabled." msgstr "" -#: ../gtk/main.c:140 +#: ../gtk/main.c:139 msgid "Start only in the system tray, do not show the main interface." msgstr "Iniciar sólo en la barra de tareas, no mostrar la interfaz principal." -#: ../gtk/main.c:141 +#: ../gtk/main.c:140 msgid "address to call right now" msgstr "dirección a la que llamar inmediatamente" -#: ../gtk/main.c:142 -msgid "if set automatically answer incoming calls" -msgstr "si está activo, responder a llamadas entrantes automáticamente" - -#: ../gtk/main.c:143 +#: ../gtk/main.c:141 msgid "" -"Specifiy a working directory (should be the base of the installation, eg: c:" -"\\Program Files\\Linphone)" -msgstr "" -"Especifique un directorio de trabajo (debería ser la raíz de la instalación, " -"ej: c:\\Archivos de Programa\\Linphone)" +"Specifiy a working directory (should be the base of the installation, eg: " +"c:\\Program Files\\Linphone)" +msgstr "Especifique un directorio de trabajo (debería ser la raíz de la instalación, ej: c:\\Archivos de Programa\\Linphone)" -#: ../gtk/main.c:144 +#: ../gtk/main.c:142 msgid "Configuration file" msgstr "" -#: ../gtk/main.c:145 +#: ../gtk/main.c:143 msgid "Run the audio assistant" msgstr "" -#: ../gtk/main.c:146 +#: ../gtk/main.c:144 msgid "Run self test and exit 0 if succeed" msgstr "" -#: ../gtk/main.c:1061 +#: ../gtk/main.c:1059 #, 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 desea añadirle a su lista de contactos.\n" -"¿Desea permitirle ver su estado de presencia o añadirle a su lista de " -"contactos?\n" -"Si responde no, esta persona será bloqueada temporalmente." +msgstr "%s desea añadirle a su lista de contactos.\n¿Desea permitirle ver su estado de presencia o añadirle a su lista de contactos?\nSi responde no, esta persona será bloqueada temporalmente." -#: ../gtk/main.c:1138 +#: ../gtk/main.c:1136 #, c-format msgid "" "Please enter your password for username %s\n" " at realm %s:" msgstr "" -#: ../gtk/main.c:1259 +#: ../gtk/main.c:1257 msgid "Call error" msgstr "" -#: ../gtk/main.c:1262 ../coreapi/linphonecore.c:3791 +#: ../gtk/main.c:1260 ../coreapi/linphonecore.c:3826 msgid "Call ended" msgstr "" -#: ../gtk/main.c:1265 ../coreapi/call_log.c:221 +#: ../gtk/main.c:1263 ../coreapi/call_log.c:221 msgid "Incoming call" msgstr "Llamada entrante" -#: ../gtk/main.c:1267 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5 +#: ../gtk/main.c:1265 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5 msgid "Answer" msgstr "Contestar" -#: ../gtk/main.c:1269 ../gtk/main.ui.h:6 +#: ../gtk/main.c:1267 ../gtk/main.ui.h:6 msgid "Decline" msgstr "" -#: ../gtk/main.c:1275 +#: ../gtk/main.c:1273 msgid "Call paused" msgstr "" -#: ../gtk/main.c:1275 +#: ../gtk/main.c:1273 #, c-format msgid "by %s" msgstr "" -#: ../gtk/main.c:1345 +#: ../gtk/main.c:1343 #, c-format msgid "%s proposed to start video. Do you accept ?" msgstr "" -#: ../gtk/main.c:1507 +#: ../gtk/main.c:1505 msgid "Website link" msgstr "Enlace a la Web" -#: ../gtk/main.c:1556 +#: ../gtk/main.c:1554 msgid "Linphone - a video internet phone" msgstr "Linphone - un video-teléfono a través de Internet" -#: ../gtk/main.c:1648 +#: ../gtk/main.c:1646 #, c-format msgid "%s (Default)" msgstr "%s (Opción predeterminada)" -#: ../gtk/main.c:1980 ../coreapi/callbacks.c:1045 +#: ../gtk/main.c:1978 ../coreapi/callbacks.c:1057 #, c-format msgid "We are transferred to %s" msgstr "Somos transferidos a %s" -#: ../gtk/main.c:1990 +#: ../gtk/main.c:1988 msgid "" "No sound cards have been detected on this computer.\n" "You won't be able to send or receive audio calls." -msgstr "" -"No se ha encontrado una tarjeta de sonido en este equipo.\n" -"No será posible realizar o recibir llamadas de audio." +msgstr "No se ha encontrado una tarjeta de sonido en este equipo.\nNo será posible realizar o recibir llamadas de audio." -#: ../gtk/main.c:2135 +#: ../gtk/main.c:2136 msgid "A free SIP video-phone" msgstr "Un video-teléfono SIP gratuito" +#: ../gtk/main.c:2241 +#, c-format +msgid "Hello\n" +msgstr "" + #: ../gtk/friendlist.c:505 msgid "Add to addressbook" msgstr "" @@ -247,6 +232,10 @@ msgstr "" msgid "Search in %s directory" msgstr "Buscar en el directorio %s" +#: ../gtk/friendlist.c:924 +msgid "Invalid sip contact !" +msgstr "¡Contacto SIP no válido!" + #: ../gtk/friendlist.c:976 #, c-format msgid "Edit contact '%s'" @@ -287,7 +276,7 @@ msgstr "Parámetros" msgid "Enabled" msgstr "Activado" -#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763 ../gtk/parameters.ui.h:20 +#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763 ../gtk/parameters.ui.h:17 msgid "Disabled" msgstr "Desactivado" @@ -452,7 +441,7 @@ msgstr "" msgid "Enter your linphone.org username" msgstr "" -#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:82 ../gtk/ldap.ui.h:4 +#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:81 ../gtk/ldap.ui.h:4 msgid "Username:" msgstr "" @@ -516,8 +505,7 @@ msgstr "Gracias. Su cuenta está configurada y lista para su utilización." #: ../gtk/setupwizard.c:413 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 "" @@ -841,7 +829,7 @@ msgstr "" msgid "Audio Assistant" msgstr "" -#: ../gtk/audio_assistant.c:513 ../gtk/main.ui.h:31 +#: ../gtk/audio_assistant.c:513 ../gtk/main.ui.h:32 msgid "Audio assistant" msgstr "" @@ -918,103 +906,103 @@ msgid "Default" msgstr "" #: ../gtk/main.ui.h:22 +msgid "Delete" +msgstr "" + +#: ../gtk/main.ui.h:23 msgid "_Options" msgstr "_Opciones" -#: ../gtk/main.ui.h:23 +#: ../gtk/main.ui.h:24 msgid "Set configuration URI" msgstr "" -#: ../gtk/main.ui.h:24 +#: ../gtk/main.ui.h:25 msgid "Always start video" msgstr "" -#: ../gtk/main.ui.h:25 +#: ../gtk/main.ui.h:26 msgid "Enable self-view" msgstr "" -#: ../gtk/main.ui.h:26 +#: ../gtk/main.ui.h:27 msgid "_Help" msgstr "_Ayuda" -#: ../gtk/main.ui.h:27 +#: ../gtk/main.ui.h:28 msgid "Show debug window" msgstr "" -#: ../gtk/main.ui.h:28 +#: ../gtk/main.ui.h:29 msgid "_Homepage" msgstr "_Pagina_de_Inicio" -#: ../gtk/main.ui.h:29 +#: ../gtk/main.ui.h:30 msgid "Check _Updates" msgstr "Buscar_Actualizaciones" -#: ../gtk/main.ui.h:30 +#: ../gtk/main.ui.h:31 msgid "Account assistant" msgstr "" -#: ../gtk/main.ui.h:32 +#: ../gtk/main.ui.h:33 msgid "SIP address or phone number:" msgstr "" -#: ../gtk/main.ui.h:33 +#: ../gtk/main.ui.h:34 msgid "Initiate a new call" msgstr "Iniciar nueva llamada" -#: ../gtk/main.ui.h:34 +#: ../gtk/main.ui.h:35 msgid "Contacts" msgstr "" -#: ../gtk/main.ui.h:35 +#: ../gtk/main.ui.h:36 msgid "Search" msgstr "Buscar" -#: ../gtk/main.ui.h:36 +#: ../gtk/main.ui.h:37 msgid "Add contacts from directory" msgstr "" -#: ../gtk/main.ui.h:37 +#: ../gtk/main.ui.h:38 msgid "Add contact" msgstr "" -#: ../gtk/main.ui.h:38 +#: ../gtk/main.ui.h:39 msgid "Recent calls" msgstr "" -#: ../gtk/main.ui.h:39 +#: ../gtk/main.ui.h:40 msgid "My current identity:" msgstr "" -#: ../gtk/main.ui.h:40 ../gtk/tunnel_config.ui.h:7 +#: ../gtk/main.ui.h:41 ../gtk/tunnel_config.ui.h:7 msgid "Username" msgstr "" -#: ../gtk/main.ui.h:41 ../gtk/tunnel_config.ui.h:8 +#: ../gtk/main.ui.h:42 ../gtk/tunnel_config.ui.h:8 msgid "Password" msgstr "" -#: ../gtk/main.ui.h:42 +#: ../gtk/main.ui.h:43 msgid "Internet connection:" msgstr "Conexión a Internet" -#: ../gtk/main.ui.h:43 +#: ../gtk/main.ui.h:44 msgid "Automatically log me in" msgstr "Iniciar sesión automáticamente" -#: ../gtk/main.ui.h:44 ../gtk/password.ui.h:3 +#: ../gtk/main.ui.h:45 ../gtk/password.ui.h:3 msgid "UserID" msgstr "UserID" -#: ../gtk/main.ui.h:45 +#: ../gtk/main.ui.h:46 msgid "Login information" msgstr "" -#: ../gtk/main.ui.h:46 -msgid "Welcome!" -msgstr "" - #: ../gtk/main.ui.h:47 -msgid "Delete" +msgid "Welcome!" msgstr "" #: ../gtk/about.ui.h:1 @@ -1027,9 +1015,7 @@ msgstr "" #: ../gtk/about.ui.h:4 msgid "An internet video phone using the standard SIP (rfc3261) protocol." -msgstr "" -"Un vídeo-teléfono a través de Internet que usa el protocolo estándar SIP " -"(rfc3261)" +msgstr "Un vídeo-teléfono a través de Internet que usa el protocolo estándar SIP (rfc3261)" #: ../gtk/about.ui.h:5 msgid "" @@ -1192,301 +1178,307 @@ msgid "C" msgstr "C" #: ../gtk/parameters.ui.h:11 -msgid "SIP (UDP)" -msgstr "SIP (UDP)" - -#: ../gtk/parameters.ui.h:12 -msgid "SIP (TCP)" -msgstr "SIP (TCP)" - -#: ../gtk/parameters.ui.h:13 -msgid "SIP (TLS)" -msgstr "SIP (TLS)" - -#: ../gtk/parameters.ui.h:14 msgid "Settings" msgstr "Configuración" -#: ../gtk/parameters.ui.h:15 +#: ../gtk/parameters.ui.h:12 msgid "Set Maximum Transmission Unit:" msgstr "Fijar Unidad de Transmisión Máxima:" -#: ../gtk/parameters.ui.h:16 +#: ../gtk/parameters.ui.h:13 msgid "Send DTMFs as SIP info" msgstr "Enviar DTMFs como información SIP" -#: ../gtk/parameters.ui.h:17 -msgid "Use IPv6 instead of IPv4" -msgstr "Utilizar IPv6 en lugar de IPv4" +#: ../gtk/parameters.ui.h:14 +msgid "Allow IPv6" +msgstr "" -#: ../gtk/parameters.ui.h:18 +#: ../gtk/parameters.ui.h:15 msgid "Transport" msgstr "" -#: ../gtk/parameters.ui.h:19 +#: ../gtk/parameters.ui.h:16 msgid "SIP/UDP port" msgstr "" -#: ../gtk/parameters.ui.h:21 +#: ../gtk/parameters.ui.h:18 msgid "Random" msgstr "" -#: ../gtk/parameters.ui.h:22 +#: ../gtk/parameters.ui.h:19 msgid "SIP/TCP port" msgstr "" -#: ../gtk/parameters.ui.h:23 +#: ../gtk/parameters.ui.h:20 msgid "Audio RTP/UDP:" msgstr "Audio RTP/UDP:" -#: ../gtk/parameters.ui.h:24 +#: ../gtk/parameters.ui.h:21 msgid "Fixed" msgstr "" -#: ../gtk/parameters.ui.h:25 +#: ../gtk/parameters.ui.h:22 msgid "Video RTP/UDP:" msgstr "Vídeo RTP/UDP" -#: ../gtk/parameters.ui.h:26 +#: ../gtk/parameters.ui.h:23 msgid "Media encryption type" msgstr "Tipo de cifrado de medios" -#: ../gtk/parameters.ui.h:27 +#: ../gtk/parameters.ui.h:24 msgid "Media encryption is mandatory" msgstr "" -#: ../gtk/parameters.ui.h:28 +#: ../gtk/parameters.ui.h:25 msgid "Tunnel" msgstr "" -#: ../gtk/parameters.ui.h:29 +#: ../gtk/parameters.ui.h:26 msgid "DSCP fields" msgstr "" -#: ../gtk/parameters.ui.h:30 +#: ../gtk/parameters.ui.h:27 msgid "Network protocol and ports" msgstr "Protocolo de red y puertos" -#: ../gtk/parameters.ui.h:31 +#: ../gtk/parameters.ui.h:28 msgid "Direct connection to the Internet" msgstr "Conexión directa a Internet" -#: ../gtk/parameters.ui.h:32 +#: ../gtk/parameters.ui.h:29 msgid "Behind NAT / Firewall (specify gateway IP )" msgstr "" -#: ../gtk/parameters.ui.h:33 +#: ../gtk/parameters.ui.h:30 msgid "Behind NAT / Firewall (use STUN to resolve)" msgstr "Tras un NAT/Firewall (utilizar STUN para resolver)" -#: ../gtk/parameters.ui.h:34 +#: ../gtk/parameters.ui.h:31 msgid "Behind NAT / Firewall (use ICE)" msgstr "" -#: ../gtk/parameters.ui.h:35 +#: ../gtk/parameters.ui.h:32 msgid "Behind NAT / Firewall (use uPnP)" msgstr "" -#: ../gtk/parameters.ui.h:36 +#: ../gtk/parameters.ui.h:33 msgid "Public IP address:" msgstr "" -#: ../gtk/parameters.ui.h:37 +#: ../gtk/parameters.ui.h:34 msgid "Stun server:" msgstr "" -#: ../gtk/parameters.ui.h:38 +#: ../gtk/parameters.ui.h:35 msgid "NAT and Firewall" msgstr "" -#: ../gtk/parameters.ui.h:39 +#: ../gtk/parameters.ui.h:36 msgid "Network settings" msgstr "" -#: ../gtk/parameters.ui.h:40 +#: ../gtk/parameters.ui.h:37 msgid "Ring sound:" msgstr "" -#: ../gtk/parameters.ui.h:41 +#: ../gtk/parameters.ui.h:38 msgid "ALSA special device (optional):" msgstr "Dispositivo especial ALSA (opcional):" -#: ../gtk/parameters.ui.h:42 +#: ../gtk/parameters.ui.h:39 msgid "Capture device:" msgstr "" -#: ../gtk/parameters.ui.h:43 +#: ../gtk/parameters.ui.h:40 msgid "Ring device:" msgstr "" -#: ../gtk/parameters.ui.h:44 +#: ../gtk/parameters.ui.h:41 msgid "Playback device:" msgstr "" -#: ../gtk/parameters.ui.h:45 +#: ../gtk/parameters.ui.h:42 msgid "Enable echo cancellation" msgstr "Activar cancelación de eco" -#: ../gtk/parameters.ui.h:46 +#: ../gtk/parameters.ui.h:43 msgid "Audio" msgstr "" -#: ../gtk/parameters.ui.h:47 +#: ../gtk/parameters.ui.h:44 msgid "Video input device:" msgstr "" -#: ../gtk/parameters.ui.h:48 +#: ../gtk/parameters.ui.h:45 msgid "Prefered video resolution:" msgstr "Resolución de vídeo preferida:" -#: ../gtk/parameters.ui.h:49 +#: ../gtk/parameters.ui.h:46 msgid "Video output method:" msgstr "" -#: ../gtk/parameters.ui.h:50 +#: ../gtk/parameters.ui.h:47 msgid "Show camera preview" msgstr "" -#: ../gtk/parameters.ui.h:51 +#: ../gtk/parameters.ui.h:48 msgid "Video" msgstr "" -#: ../gtk/parameters.ui.h:52 +#: ../gtk/parameters.ui.h:49 msgid "Multimedia settings" msgstr "Configuración multimedia" -#: ../gtk/parameters.ui.h:53 +#: ../gtk/parameters.ui.h:50 msgid "This section defines your SIP address when not using a SIP account" msgstr "Esta sección define su dirección SIP cuando no utiliza una cuenta SIP" -#: ../gtk/parameters.ui.h:54 +#: ../gtk/parameters.ui.h:51 msgid "Your display name (eg: John Doe):" msgstr "Su nombre a mostrar (x ej: Pepito Pérez):" -#: ../gtk/parameters.ui.h:55 +#: ../gtk/parameters.ui.h:52 msgid "Your username:" msgstr "" -#: ../gtk/parameters.ui.h:56 +#: ../gtk/parameters.ui.h:53 msgid "Your resulting SIP address:" msgstr "" -#: ../gtk/parameters.ui.h:57 +#: ../gtk/parameters.ui.h:54 msgid "Default identity" msgstr "" -#: ../gtk/parameters.ui.h:58 +#: ../gtk/parameters.ui.h:55 msgid "Wizard" msgstr "" -#: ../gtk/parameters.ui.h:59 +#: ../gtk/parameters.ui.h:56 msgid "Add" msgstr "Añadir" -#: ../gtk/parameters.ui.h:60 +#: ../gtk/parameters.ui.h:57 msgid "Edit" msgstr "Editar" -#: ../gtk/parameters.ui.h:61 +#: ../gtk/parameters.ui.h:58 msgid "Remove" msgstr "Eliminar" -#: ../gtk/parameters.ui.h:62 +#: ../gtk/parameters.ui.h:59 msgid "Proxy accounts" msgstr "" -#: ../gtk/parameters.ui.h:63 +#: ../gtk/parameters.ui.h:60 msgid "Erase all passwords" msgstr "Borrar todas las contraseñas" -#: ../gtk/parameters.ui.h:64 +#: ../gtk/parameters.ui.h:61 msgid "Privacy" msgstr "" -#: ../gtk/parameters.ui.h:65 +#: ../gtk/parameters.ui.h:62 +msgid "Automatically answer when a call is received" +msgstr "" + +#: ../gtk/parameters.ui.h:63 +msgid "Auto-answer" +msgstr "" + +#: ../gtk/parameters.ui.h:64 msgid "Manage SIP Accounts" msgstr "Gestionar cuentas SIP" -#: ../gtk/parameters.ui.h:66 ../gtk/tunnel_config.ui.h:4 +#: ../gtk/parameters.ui.h:65 ../gtk/tunnel_config.ui.h:4 msgid "Enable" msgstr "Activar" -#: ../gtk/parameters.ui.h:67 ../gtk/tunnel_config.ui.h:5 +#: ../gtk/parameters.ui.h:66 ../gtk/tunnel_config.ui.h:5 msgid "Disable" msgstr "Desactivar" -#: ../gtk/parameters.ui.h:68 +#: ../gtk/parameters.ui.h:67 msgid "Codecs" msgstr "" -#: ../gtk/parameters.ui.h:69 +#: ../gtk/parameters.ui.h:68 msgid "0 stands for \"unlimited\"" msgstr "0 significa \"ilimitado\"" -#: ../gtk/parameters.ui.h:70 +#: ../gtk/parameters.ui.h:69 msgid "Upload speed limit in Kbit/sec:" msgstr "Velocidad límite de subida en Kbit/seg" -#: ../gtk/parameters.ui.h:71 +#: ../gtk/parameters.ui.h:70 msgid "Download speed limit in Kbit/sec:" msgstr "Velocidad límite de descarga en Kbit/seg:" -#: ../gtk/parameters.ui.h:72 +#: ../gtk/parameters.ui.h:71 msgid "Enable adaptive rate control" msgstr "Activar control de frecuencia adaptativo" -#: ../gtk/parameters.ui.h:73 +#: ../gtk/parameters.ui.h:72 msgid "" "Adaptive rate control is a technique to dynamically guess the available " "bandwidth during a call." -msgstr "" -"Control de frecuencia adaptativo es una técnica que estima dinámicamente " -"el ancho de banda disponible durante la llamada." +msgstr "Control de frecuencia adaptativo es una técnica que estima dinámicamente el ancho de banda disponible durante la llamada." -#: ../gtk/parameters.ui.h:74 +#: ../gtk/parameters.ui.h:73 msgid "Bandwidth control" msgstr "Control de ancho de banda" -#: ../gtk/parameters.ui.h:75 +#: ../gtk/parameters.ui.h:74 msgid "Codecs" msgstr "" -#: ../gtk/parameters.ui.h:76 +#: ../gtk/parameters.ui.h:75 msgid "Language" msgstr "" -#: ../gtk/parameters.ui.h:77 +#: ../gtk/parameters.ui.h:76 msgid "Show advanced settings" msgstr "Mostrar opciones avanzadas" -#: ../gtk/parameters.ui.h:78 +#: ../gtk/parameters.ui.h:77 msgid "Level" msgstr "" -#: ../gtk/parameters.ui.h:79 +#: ../gtk/parameters.ui.h:78 msgid "User interface" msgstr "" -#: ../gtk/parameters.ui.h:80 ../gtk/ldap.ui.h:2 +#: ../gtk/parameters.ui.h:79 ../gtk/ldap.ui.h:2 msgid "Server address:" msgstr "" -#: ../gtk/parameters.ui.h:81 ../gtk/ldap.ui.h:3 +#: ../gtk/parameters.ui.h:80 ../gtk/ldap.ui.h:3 msgid "Authentication method:" msgstr "" -#: ../gtk/parameters.ui.h:83 +#: ../gtk/parameters.ui.h:82 msgid "LDAP Account setup" msgstr "" -#: ../gtk/parameters.ui.h:84 +#: ../gtk/parameters.ui.h:83 msgid "LDAP" msgstr "" -#: ../gtk/parameters.ui.h:85 +#: ../gtk/parameters.ui.h:84 msgid "Done" msgstr "" +#: ../gtk/parameters.ui.h:85 +msgid "SIP (UDP)" +msgstr "SIP (UDP)" + +#: ../gtk/parameters.ui.h:86 +msgid "SIP (TCP)" +msgstr "SIP (TCP)" + +#: ../gtk/parameters.ui.h:87 +msgid "SIP (TLS)" +msgstr "SIP (TLS)" + #: ../gtk/buddylookup.ui.h:1 msgid "Search contacts in directory" msgstr "" @@ -1690,11 +1682,8 @@ msgstr "" #: ../gtk/config-uri.ui.h:2 msgid "" -"This dialog allows to set an http or https address when configuration is to " -"be fetched at startup.\n" -"Please enter or modify the configuration URI below. After clicking OK, " -"Linphone will restart automatically in order to fetch and take into account " -"the new configuration. " +"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n" +"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. " msgstr "" #: ../gtk/provisioning-fetch.ui.h:1 @@ -1705,60 +1694,60 @@ msgstr "" msgid "Please wait while fetching configuration from server..." msgstr "" -#: ../coreapi/linphonecore.c:1512 +#: ../coreapi/linphonecore.c:1534 msgid "Ready" msgstr "" -#: ../coreapi/linphonecore.c:2499 +#: ../coreapi/linphonecore.c:2534 msgid "Configuring" msgstr "" -#: ../coreapi/linphonecore.c:2673 +#: ../coreapi/linphonecore.c:2708 msgid "Looking for telephone number destination..." msgstr "Buscando el número de teléfono del destinatario…" -#: ../coreapi/linphonecore.c:2675 +#: ../coreapi/linphonecore.c:2710 msgid "Could not resolve this number." msgstr "No se ha podido resolver este número." #. must be known at that time -#: ../coreapi/linphonecore.c:2961 +#: ../coreapi/linphonecore.c:2996 msgid "Contacting" msgstr "" -#: ../coreapi/linphonecore.c:2966 +#: ../coreapi/linphonecore.c:3001 msgid "Could not call" msgstr "" -#: ../coreapi/linphonecore.c:3116 +#: ../coreapi/linphonecore.c:3152 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:3274 +#: ../coreapi/linphonecore.c:3310 msgid "is contacting you" msgstr "" -#: ../coreapi/linphonecore.c:3275 +#: ../coreapi/linphonecore.c:3311 msgid " and asked autoanswer." msgstr "y ha solicitado auto respuesta." -#: ../coreapi/linphonecore.c:3399 +#: ../coreapi/linphonecore.c:3435 msgid "Modifying call parameters..." msgstr "Modificando parámetros de llamada…" -#: ../coreapi/linphonecore.c:3747 +#: ../coreapi/linphonecore.c:3782 msgid "Connected." msgstr "Conectado." -#: ../coreapi/linphonecore.c:3772 +#: ../coreapi/linphonecore.c:3807 msgid "Call aborted" msgstr "" -#: ../coreapi/linphonecore.c:3962 +#: ../coreapi/linphonecore.c:3997 msgid "Could not pause the call" msgstr "No se pudo pausar la llamada" -#: ../coreapi/linphonecore.c:3965 +#: ../coreapi/linphonecore.c:4000 msgid "Pausing the current call..." msgstr "Pausando la llamada actual..." @@ -1826,130 +1815,125 @@ msgstr "" msgid "" "The sip proxy address you entered is invalid, it must start with \"sip:\" " "followed by a hostname." -msgstr "" -"La dirección del Proxy SIP que ha introducido no es válida, debe empezar con " -"\"sip:\" seguido del hostname." +msgstr "La dirección del Proxy SIP que ha introducido no es válida, debe empezar con \"sip:\" seguido del hostname." #: ../coreapi/proxy.c:334 msgid "" "The sip identity you entered is invalid.\n" "It should look like sip:username@proxydomain, such as sip:alice@example.net" -msgstr "" -"La identidad SIP que ha introducido no es válida.\n" -"Debe ser del tipo sip:username@proxydomain, como por ejemplo sip:" -"alice@example.net" +msgstr "La identidad SIP que ha introducido no es válida.\nDebe ser del tipo sip:username@proxydomain, como por ejemplo sip:alice@example.net" -#: ../coreapi/proxy.c:1403 +#: ../coreapi/proxy.c:1416 #, c-format msgid "Could not login as %s" msgstr "" -#: ../coreapi/callbacks.c:419 +#: ../coreapi/callbacks.c:428 msgid "Remote ringing." msgstr "" -#: ../coreapi/callbacks.c:431 +#: ../coreapi/callbacks.c:440 msgid "Remote ringing..." msgstr "" -#: ../coreapi/callbacks.c:448 +#: ../coreapi/callbacks.c:461 msgid "Early media." msgstr "Medios iniciales." -#: ../coreapi/callbacks.c:521 +#: ../coreapi/callbacks.c:533 #, c-format msgid "Call with %s is paused." msgstr "La llamada con %s está puesta en pausa." -#: ../coreapi/callbacks.c:534 +#: ../coreapi/callbacks.c:546 #, c-format msgid "Call answered by %s - on hold." msgstr "Llamada respondida por %s - en espera." -#: ../coreapi/callbacks.c:544 +#: ../coreapi/callbacks.c:556 msgid "Call resumed." msgstr "" -#: ../coreapi/callbacks.c:548 +#: ../coreapi/callbacks.c:560 #, c-format msgid "Call answered by %s." msgstr "" -#: ../coreapi/callbacks.c:571 +#: ../coreapi/callbacks.c:583 msgid "Incompatible, check codecs or security settings..." msgstr "" -#: ../coreapi/callbacks.c:576 ../coreapi/callbacks.c:888 +#: ../coreapi/callbacks.c:588 ../coreapi/callbacks.c:900 msgid "Incompatible media parameters." msgstr "" -#: ../coreapi/callbacks.c:606 +#: ../coreapi/callbacks.c:618 msgid "We have been resumed." msgstr "" #. we are being paused -#: ../coreapi/callbacks.c:614 +#: ../coreapi/callbacks.c:626 msgid "We are paused by other party." msgstr "" #. reINVITE and in-dialogs UPDATE go here -#: ../coreapi/callbacks.c:648 +#: ../coreapi/callbacks.c:660 msgid "Call is updated by remote." msgstr "" -#: ../coreapi/callbacks.c:764 +#: ../coreapi/callbacks.c:776 msgid "Call terminated." msgstr "" -#: ../coreapi/callbacks.c:792 +#: ../coreapi/callbacks.c:804 msgid "User is busy." msgstr "El usuario está ocupado." -#: ../coreapi/callbacks.c:793 +#: ../coreapi/callbacks.c:805 msgid "User is temporarily unavailable." msgstr "El usuario no está disponible temporalmente." #. char *retrymsg=_("%s. Retry after %i minute(s)."); -#: ../coreapi/callbacks.c:795 +#: ../coreapi/callbacks.c:807 msgid "User does not want to be disturbed." msgstr "El usuario no quiere que le molesten." -#: ../coreapi/callbacks.c:796 +#: ../coreapi/callbacks.c:808 msgid "Call declined." msgstr "Llamada rechazada." -#: ../coreapi/callbacks.c:811 +#: ../coreapi/callbacks.c:823 msgid "Request timeout." msgstr "" -#: ../coreapi/callbacks.c:842 +#: ../coreapi/callbacks.c:854 msgid "Redirected" msgstr "Redigirida" -#: ../coreapi/callbacks.c:897 +#: ../coreapi/callbacks.c:909 msgid "Call failed." msgstr "" -#: ../coreapi/callbacks.c:975 +#: ../coreapi/callbacks.c:987 #, c-format msgid "Registration on %s successful." msgstr "" -#: ../coreapi/callbacks.c:976 +#: ../coreapi/callbacks.c:988 #, c-format msgid "Unregistration on %s done." msgstr "" -#: ../coreapi/callbacks.c:994 +#: ../coreapi/callbacks.c:1006 msgid "no response timeout" msgstr "timeout sin respuesta" -#: ../coreapi/callbacks.c:997 +#: ../coreapi/callbacks.c:1009 #, c-format msgid "Registration on %s failed: %s" msgstr "" -#: ../coreapi/callbacks.c:1004 +#: ../coreapi/callbacks.c:1016 msgid "Service unavailable, retrying" msgstr "" @@ -1959,7 +1943,11 @@ msgstr "" msgid "Authentication token is %s" msgstr "" -#: ../coreapi/linphonecall.c:3600 +#: ../coreapi/linphonecall.c:1305 +msgid "Call parameters were successfully modified." +msgstr "" + +#: ../coreapi/linphonecall.c:3659 #, c-format msgid "You have missed %i call." msgid_plural "You have missed %i calls." diff --git a/po/fr.po b/po/fr.po index 557cee354..72b945b5e 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Belledonne Communications , 2015 # Gautier Pelloux-Prayer , 2014 @@ -12,16 +12,14 @@ msgid "" msgstr "" "Project-Id-Version: linphone-gtk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-11 16:26+0100\n" -"PO-Revision-Date: 2015-02-17 14:38+0000\n" -"Last-Translator: Belledonne Communications \n" -"Language-Team: French (http://www.transifex.com/projects/p/linphone-gtk/" -"language/fr/)\n" -"Language: fr\n" +"POT-Creation-Date: 2015-03-27 14:40+0100\n" +"PO-Revision-Date: 2015-03-27 13:51+0000\n" +"Last-Translator: Belledonne Communications \n" +"Language-Team: French (http://www.transifex.com/projects/p/linphone-gtk/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974 @@ -74,9 +72,7 @@ msgstr[1] "%i secondes" msgid "" "%s\tQuality: %s\n" "%s\t%s\t" -msgstr "" -"%s\tQualité: %s\n" -"%s\t%s\t" +msgstr "%s\tQualité: %s\n%s\t%s\t" #: ../gtk/calllogs.c:341 #, c-format @@ -96,141 +92,126 @@ msgstr "Moi" msgid "Couldn't find pixmap file: %s" msgstr "Icone non trouvée: %s" -#: ../gtk/chat.c:374 ../gtk/friendlist.c:924 -msgid "Invalid sip contact !" -msgstr "Contact sip invalide !" - -#: ../gtk/main.c:137 +#: ../gtk/main.c:136 msgid "log to stdout some debug information while running." msgstr "affiche des informations de debogage" -#: ../gtk/main.c:138 +#: ../gtk/main.c:137 msgid "path to a file to write logs into." msgstr "chemin vers le fichier de logs." -#: ../gtk/main.c:139 +#: ../gtk/main.c:138 msgid "Start linphone with video disabled." msgstr "Démarrer linphone avec la vidéo désactivée." -#: ../gtk/main.c:140 +#: ../gtk/main.c:139 msgid "Start only in the system tray, do not show the main interface." msgstr "Démarre iconifié, sans interface principale." -#: ../gtk/main.c:141 +#: ../gtk/main.c:140 msgid "address to call right now" msgstr "adresse à appeler maintenant" -#: ../gtk/main.c:142 -msgid "if set automatically answer incoming calls" -msgstr "si positionné, répond automatiquement aux appels entrants" - -#: ../gtk/main.c:143 +#: ../gtk/main.c:141 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)" +"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:144 +#: ../gtk/main.c:142 msgid "Configuration file" msgstr "Ficher de configuration" -#: ../gtk/main.c:145 +#: ../gtk/main.c:143 msgid "Run the audio assistant" msgstr "Démarre l'assistant audio" -#: ../gtk/main.c:146 +#: ../gtk/main.c:144 msgid "Run self test and exit 0 if succeed" msgstr "Exécuter le test local et retourner 0 en cas de succès" -#: ../gtk/main.c:1061 +#: ../gtk/main.c:1059 #, 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." +msgstr "%s souhaite vous ajouter à sa liste de contact.\nSouhaitez vous l'autoriser à voir votre information de présence et l'ajouter à votre liste également ?\nSi vous répondez non, cette personne sera mise temporairement sur liste noire." -#: ../gtk/main.c:1138 +#: ../gtk/main.c:1136 #, c-format msgid "" "Please enter your password for username %s\n" " at realm %s:" -msgstr "" -"Entrez le mot de passe pour %s\n" -" sur le domaine %s:" +msgstr "Entrez le mot de passe pour %s\n sur le domaine %s:" -#: ../gtk/main.c:1259 +#: ../gtk/main.c:1257 msgid "Call error" msgstr "Erreur lors de l'appel" -#: ../gtk/main.c:1262 ../coreapi/linphonecore.c:3791 +#: ../gtk/main.c:1260 ../coreapi/linphonecore.c:3826 msgid "Call ended" msgstr "Appel terminé." -#: ../gtk/main.c:1265 ../coreapi/call_log.c:221 +#: ../gtk/main.c:1263 ../coreapi/call_log.c:221 msgid "Incoming call" msgstr "Appel entrant" -#: ../gtk/main.c:1267 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5 +#: ../gtk/main.c:1265 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5 msgid "Answer" msgstr "Répondre" -#: ../gtk/main.c:1269 ../gtk/main.ui.h:6 +#: ../gtk/main.c:1267 ../gtk/main.ui.h:6 msgid "Decline" msgstr "Refuser" -#: ../gtk/main.c:1275 +#: ../gtk/main.c:1273 msgid "Call paused" msgstr "Appel en pause" -#: ../gtk/main.c:1275 +#: ../gtk/main.c:1273 #, c-format msgid "by %s" msgstr "b>par %s" -#: ../gtk/main.c:1345 +#: ../gtk/main.c:1343 #, c-format msgid "%s proposed to start video. Do you accept ?" msgstr "%s propose de démarrer la vidéo. Acceptez-vous ?" -#: ../gtk/main.c:1507 +#: ../gtk/main.c:1505 msgid "Website link" msgstr "Lien site web" -#: ../gtk/main.c:1556 +#: ../gtk/main.c:1554 msgid "Linphone - a video internet phone" msgstr "Linphone - un téléphone video pour l'internet" -#: ../gtk/main.c:1648 +#: ../gtk/main.c:1646 #, c-format msgid "%s (Default)" msgstr "%s (par défaut)" -#: ../gtk/main.c:1980 ../coreapi/callbacks.c:1045 +#: ../gtk/main.c:1978 ../coreapi/callbacks.c:1057 #, c-format msgid "We are transferred to %s" msgstr "Transfert vers %s" -#: ../gtk/main.c:1990 +#: ../gtk/main.c:1988 msgid "" "No sound cards have been detected on this computer.\n" "You won't be able to send or receive audio calls." -msgstr "" -"Aucune carte son n'a été détectée sur cet ordinateur.\n" -"Vous ne pourrez pas effectuer d'appels audio." +msgstr "Aucune carte son n'a été détectée sur cet ordinateur.\nVous ne pourrez pas effectuer d'appels audio." -#: ../gtk/main.c:2135 +#: ../gtk/main.c:2136 msgid "A free SIP video-phone" msgstr "Un visiophone libre" +#: ../gtk/main.c:2241 +#, c-format +msgid "Hello\n" +msgstr "Bonjour\n" + #: ../gtk/friendlist.c:505 msgid "Add to addressbook" msgstr "Ajouter au carnet d'adresse" @@ -256,6 +237,10 @@ msgstr "Chat" msgid "Search in %s directory" msgstr "Rechercher dans l'annuaire de %s" +#: ../gtk/friendlist.c:924 +msgid "Invalid sip contact !" +msgstr "Contact sip invalide !" + #: ../gtk/friendlist.c:976 #, c-format msgid "Edit contact '%s'" @@ -296,7 +281,7 @@ msgstr "Paramètres" msgid "Enabled" msgstr "Activé" -#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763 ../gtk/parameters.ui.h:20 +#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763 ../gtk/parameters.ui.h:17 msgid "Disabled" msgstr "Désactivé" @@ -379,9 +364,7 @@ msgstr "Serbe" #: ../gtk/propertybox.c:1156 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." +msgstr "La nouvelle selection de langue prendra effet au prochain démarrage de linphone." #: ../gtk/propertybox.c:1236 msgid "None" @@ -404,10 +387,7 @@ msgstr "ZRTP" msgid "" "A more recent version is availalble from %s.\n" "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 ?" +msgstr "Une version plus récente est disponible sur %s.\nVoulez 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." @@ -444,9 +424,7 @@ msgstr[1] "%i contacts trouvés." msgid "" "Welcome!\n" "This assistant will help you to use a SIP account for your calls." -msgstr "" -"Bienvenue !\n" -"Cet assistant va vous aider à utiliser un compte SIP pour vos appels." +msgstr "Bienvenue !\nCet assistant va vous aider à utiliser un compte SIP pour vos appels." #: ../gtk/setupwizard.c:43 msgid "Create an account on linphone.org" @@ -468,7 +446,7 @@ msgstr "Je veux spécifier une URI de configuration" msgid "Enter your linphone.org username" msgstr "Entrez votre identifiant linphone.org" -#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:82 ../gtk/ldap.ui.h:4 +#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:81 ../gtk/ldap.ui.h:4 msgid "Username:" msgstr "Nom d'utilisateur:" @@ -524,10 +502,7 @@ msgstr "Me tenir informer des mises à jour de Linphone " 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" -"Merci d'essayer à nouveau." +msgstr "Erreur, le compte n'est pas validé, l'identifiant est déjà utilisé ou le serveur n'est pas accessible.\nMerci d'essayer à nouveau." #: ../gtk/setupwizard.c:405 msgid "Thank you. Your account is now configured and ready for use." @@ -535,13 +510,9 @@ msgstr "Merci. Votre compte est maintenant configuré et prêt à être utilisé #: ../gtk/setupwizard.c:413 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" -"Puis appuyez sur suivant." +msgstr "Merci de valider votre compte en cliquant sur le lien que nous avons envoyé par email.\nPuis appuyez sur suivant." #: ../gtk/setupwizard.c:602 msgid "SIP account configuration assistant" @@ -646,9 +617,7 @@ msgstr "Directe ou via un serveur" msgid "" "download: %f\n" "upload: %f (kbit/s)" -msgstr "" -"débit descendant : %f\n" -"débit ascendant : %f (kbits/s)" +msgstr "débit descendant : %f\ndébit ascendant : %f (kbits/s)" #: ../gtk/incall_view.c:272 ../gtk/incall_view.c:274 #, c-format @@ -762,9 +731,7 @@ msgstr "Pause" msgid "" "Recording into\n" "%s %s" -msgstr "" -"Enregistrement dans\n" -"%s %s" +msgstr "Enregistrement dans\n%s %s" #: ../gtk/incall_view.c:954 msgid "(Paused)" @@ -817,10 +784,7 @@ msgstr "Impossible de démarrer le contrôleur système du son" msgid "" "Welcome!\n" "This assistant will help you to configure audio settings for Linphone" -msgstr "" -"Bienvenue !\n" -"Cet assistant va vous aider à régler les paramètres audio de votre " -"ordinateur pour une utilisation optimale avec Linphone." +msgstr "Bienvenue !\nCet assistant va vous aider à régler les paramètres audio de votre ordinateur pour une utilisation optimale avec Linphone." #: ../gtk/audio_assistant.c:328 msgid "Capture device" @@ -870,7 +834,7 @@ msgstr "Démarrons Linphone maintenant" msgid "Audio Assistant" msgstr "Assistant audio" -#: ../gtk/audio_assistant.c:513 ../gtk/main.ui.h:31 +#: ../gtk/audio_assistant.c:513 ../gtk/main.ui.h:32 msgid "Audio assistant" msgstr "Assistant audio" @@ -947,105 +911,105 @@ msgid "Default" msgstr "Par défaut" #: ../gtk/main.ui.h:22 +msgid "Delete" +msgstr "Supprimer" + +#: ../gtk/main.ui.h:23 msgid "_Options" msgstr "_Options" -#: ../gtk/main.ui.h:23 +#: ../gtk/main.ui.h:24 msgid "Set configuration URI" msgstr "URI de configuration" -#: ../gtk/main.ui.h:24 +#: ../gtk/main.ui.h:25 msgid "Always start video" msgstr "Toujours démarrer la vidéo" -#: ../gtk/main.ui.h:25 +#: ../gtk/main.ui.h:26 msgid "Enable self-view" msgstr "Se voir" -#: ../gtk/main.ui.h:26 +#: ../gtk/main.ui.h:27 msgid "_Help" msgstr "_Aide" -#: ../gtk/main.ui.h:27 +#: ../gtk/main.ui.h:28 msgid "Show debug window" msgstr "Fenêtre de débogage" -#: ../gtk/main.ui.h:28 +#: ../gtk/main.ui.h:29 msgid "_Homepage" msgstr "_Site web" -#: ../gtk/main.ui.h:29 +#: ../gtk/main.ui.h:30 msgid "Check _Updates" msgstr "_Mises à jour" -#: ../gtk/main.ui.h:30 +#: ../gtk/main.ui.h:31 msgid "Account assistant" msgstr "Assistant de compte" -#: ../gtk/main.ui.h:32 +#: ../gtk/main.ui.h:33 msgid "SIP address or phone number:" msgstr "Adresse SIP ou numéro" -#: ../gtk/main.ui.h:33 +#: ../gtk/main.ui.h:34 msgid "Initiate a new call" msgstr "Démarrer un nouvel appel" -#: ../gtk/main.ui.h:34 +#: ../gtk/main.ui.h:35 msgid "Contacts" msgstr "Contacts" -#: ../gtk/main.ui.h:35 +#: ../gtk/main.ui.h:36 msgid "Search" msgstr "Rechercher" -#: ../gtk/main.ui.h:36 +#: ../gtk/main.ui.h:37 msgid "Add contacts from directory" msgstr "Ajouter un contact depuis l'annuaire" -#: ../gtk/main.ui.h:37 +#: ../gtk/main.ui.h:38 msgid "Add contact" msgstr "Ajouter un contact." -#: ../gtk/main.ui.h:38 +#: ../gtk/main.ui.h:39 msgid "Recent calls" msgstr "Appels récents" -#: ../gtk/main.ui.h:39 +#: ../gtk/main.ui.h:40 msgid "My current identity:" msgstr "Mon identité sip:" -#: ../gtk/main.ui.h:40 ../gtk/tunnel_config.ui.h:7 +#: ../gtk/main.ui.h:41 ../gtk/tunnel_config.ui.h:7 msgid "Username" msgstr "Nom d'utilisateur" -#: ../gtk/main.ui.h:41 ../gtk/tunnel_config.ui.h:8 +#: ../gtk/main.ui.h:42 ../gtk/tunnel_config.ui.h:8 msgid "Password" msgstr "Mot de passe" -#: ../gtk/main.ui.h:42 +#: ../gtk/main.ui.h:43 msgid "Internet connection:" msgstr "Connexion internet:" -#: ../gtk/main.ui.h:43 +#: ../gtk/main.ui.h:44 msgid "Automatically log me in" msgstr "Me connecter automatiquement" -#: ../gtk/main.ui.h:44 ../gtk/password.ui.h:3 +#: ../gtk/main.ui.h:45 ../gtk/password.ui.h:3 msgid "UserID" msgstr "ID utilisateur" -#: ../gtk/main.ui.h:45 +#: ../gtk/main.ui.h:46 msgid "Login information" msgstr "Information de login" -#: ../gtk/main.ui.h:46 +#: ../gtk/main.ui.h:47 msgid "Welcome!" msgstr "Bienvenue !" -#: ../gtk/main.ui.h:47 -msgid "Delete" -msgstr "Supprimer" - #: ../gtk/about.ui.h:1 msgid "About Linphone" msgstr "À propos de Linphone" @@ -1072,19 +1036,7 @@ msgid "" "cs: Petr Pisar \n" "hu: anonymous\n" "he: Eli Zaretskii \n" -msgstr "" -"fr: Simon Morlat\n" -"en: Simon Morlat and Delphine Perreau\n" -"it: Alberto Zanoni \n" -"de: Jean-Jacques Sarton \n" -"sv: Daniel Nylander \n" -"es: Jesus Benitez \n" -"ja: YAMAGUCHI YOSHIYA \n" -"pt_BR: Rafael Caesar Lenzi \n" -"pl: Robert Nasiadek \n" -"cs: Petr Pisar \n" -"hu: anonymous\n" -"he: Eli Zaretskii \n" +msgstr "fr: Simon Morlat\nen: Simon Morlat and Delphine Perreau\nit: Alberto Zanoni \nde: Jean-Jacques Sarton \nsv: Daniel Nylander \nes: Jesus Benitez \nja: YAMAGUCHI YOSHIYA \npt_BR: Rafael Caesar Lenzi \npl: Robert Nasiadek \ncs: Petr Pisar \nhu: anonymous\nhe: Eli Zaretskii \n" #: ../gtk/contact.ui.h:2 msgid "SIP Address" @@ -1231,304 +1183,307 @@ msgid "C" msgstr "C" #: ../gtk/parameters.ui.h:11 -msgid "SIP (UDP)" -msgstr "SIP (UDP)" - -#: ../gtk/parameters.ui.h:12 -msgid "SIP (TCP)" -msgstr "SIP (TCP)" - -#: ../gtk/parameters.ui.h:13 -msgid "SIP (TLS)" -msgstr "SIP (TLS)" - -#: ../gtk/parameters.ui.h:14 msgid "Settings" msgstr "Réglages" -#: ../gtk/parameters.ui.h:15 +#: ../gtk/parameters.ui.h:12 msgid "Set Maximum Transmission Unit:" msgstr "Spécifier la Maximum Transmission Unit" -#: ../gtk/parameters.ui.h:16 +#: ../gtk/parameters.ui.h:13 msgid "Send DTMFs as SIP info" msgstr "Envoyer les digits en tant que SIP INFO" -#: ../gtk/parameters.ui.h:17 -msgid "Use IPv6 instead of IPv4" -msgstr "Utiliser l'IPv6 au lieu d'IPv4" +#: ../gtk/parameters.ui.h:14 +msgid "Allow IPv6" +msgstr "Utiliser IPv6" -#: ../gtk/parameters.ui.h:18 +#: ../gtk/parameters.ui.h:15 msgid "Transport" msgstr "Transport" -#: ../gtk/parameters.ui.h:19 +#: ../gtk/parameters.ui.h:16 msgid "SIP/UDP port" msgstr "Port SIP / UDP" -#: ../gtk/parameters.ui.h:21 +#: ../gtk/parameters.ui.h:18 msgid "Random" msgstr "Aléatoire" -#: ../gtk/parameters.ui.h:22 +#: ../gtk/parameters.ui.h:19 msgid "SIP/TCP port" msgstr "Port SIP / TCP" -#: ../gtk/parameters.ui.h:23 +#: ../gtk/parameters.ui.h:20 msgid "Audio RTP/UDP:" msgstr "Audio RTP / UDP :" -#: ../gtk/parameters.ui.h:24 +#: ../gtk/parameters.ui.h:21 msgid "Fixed" msgstr "Fixe" -#: ../gtk/parameters.ui.h:25 +#: ../gtk/parameters.ui.h:22 msgid "Video RTP/UDP:" msgstr "Vidéo RTP / UDP :" -#: ../gtk/parameters.ui.h:26 +#: ../gtk/parameters.ui.h:23 msgid "Media encryption type" msgstr "Type d'encryption media" -#: ../gtk/parameters.ui.h:27 +#: ../gtk/parameters.ui.h:24 msgid "Media encryption is mandatory" msgstr "Le chiffrement media est obligatoire" -#: ../gtk/parameters.ui.h:28 +#: ../gtk/parameters.ui.h:25 msgid "Tunnel" msgstr "Tunnel" -#: ../gtk/parameters.ui.h:29 +#: ../gtk/parameters.ui.h:26 msgid "DSCP fields" msgstr "Champs DSCP" -#: ../gtk/parameters.ui.h:30 +#: ../gtk/parameters.ui.h:27 msgid "Network protocol and ports" msgstr "Protocoles réseaux et ports" -#: ../gtk/parameters.ui.h:31 +#: ../gtk/parameters.ui.h:28 msgid "Direct connection to the Internet" msgstr "Connexion directe à l'Internet" -#: ../gtk/parameters.ui.h:32 +#: ../gtk/parameters.ui.h:29 msgid "Behind NAT / Firewall (specify gateway IP )" msgstr "Derrière un pare-feu (spécifier la passerelle ci dessous)" -#: ../gtk/parameters.ui.h:33 +#: ../gtk/parameters.ui.h:30 msgid "Behind NAT / Firewall (use STUN to resolve)" msgstr "Derrière un pare-feu (utiliser STUN)" -#: ../gtk/parameters.ui.h:34 +#: ../gtk/parameters.ui.h:31 msgid "Behind NAT / Firewall (use ICE)" msgstr "Derrière un pare-feu (utiliser ICE)" -#: ../gtk/parameters.ui.h:35 +#: ../gtk/parameters.ui.h:32 msgid "Behind NAT / Firewall (use uPnP)" msgstr "Derrière un pare-feu (utiliser uPnP)" -#: ../gtk/parameters.ui.h:36 +#: ../gtk/parameters.ui.h:33 msgid "Public IP address:" msgstr "Adresse IP publique:" -#: ../gtk/parameters.ui.h:37 +#: ../gtk/parameters.ui.h:34 msgid "Stun server:" msgstr "Serveur STUN:" -#: ../gtk/parameters.ui.h:38 +#: ../gtk/parameters.ui.h:35 msgid "NAT and Firewall" msgstr "Paramètres liés au pare-feu" -#: ../gtk/parameters.ui.h:39 +#: ../gtk/parameters.ui.h:36 msgid "Network settings" msgstr "Paramètres réseau" -#: ../gtk/parameters.ui.h:40 +#: ../gtk/parameters.ui.h:37 msgid "Ring sound:" msgstr "Sonnerie:" -#: ../gtk/parameters.ui.h:41 +#: ../gtk/parameters.ui.h:38 msgid "ALSA special device (optional):" msgstr "Appareil ALSA spécifique (optionnel) :" -#: ../gtk/parameters.ui.h:42 +#: ../gtk/parameters.ui.h:39 msgid "Capture device:" msgstr "Périphérique de capture:" -#: ../gtk/parameters.ui.h:43 +#: ../gtk/parameters.ui.h:40 msgid "Ring device:" msgstr "Périphérique de sonnerie:" -#: ../gtk/parameters.ui.h:44 +#: ../gtk/parameters.ui.h:41 msgid "Playback device:" msgstr "Périphérique d'écoute:" -#: ../gtk/parameters.ui.h:45 +#: ../gtk/parameters.ui.h:42 msgid "Enable echo cancellation" msgstr "Activer l'annulation d'écho" -#: ../gtk/parameters.ui.h:46 +#: ../gtk/parameters.ui.h:43 msgid "Audio" msgstr "Son" -#: ../gtk/parameters.ui.h:47 +#: ../gtk/parameters.ui.h:44 msgid "Video input device:" msgstr "Périphérique d'entrée vidéo" -#: ../gtk/parameters.ui.h:48 +#: ../gtk/parameters.ui.h:45 msgid "Prefered video resolution:" msgstr "Résolution de vidéo préférée:" -#: ../gtk/parameters.ui.h:49 +#: ../gtk/parameters.ui.h:46 msgid "Video output method:" msgstr "Type de rendu video:" -#: ../gtk/parameters.ui.h:50 +#: ../gtk/parameters.ui.h:47 msgid "Show camera preview" msgstr "Afficher la vidéo" -#: ../gtk/parameters.ui.h:51 +#: ../gtk/parameters.ui.h:48 msgid "Video" msgstr "Video" -#: ../gtk/parameters.ui.h:52 +#: ../gtk/parameters.ui.h:49 msgid "Multimedia settings" msgstr "Paramètres multimedia" -#: ../gtk/parameters.ui.h:53 +#: ../gtk/parameters.ui.h:50 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:54 +#: ../gtk/parameters.ui.h:51 msgid "Your display name (eg: John Doe):" msgstr "Votre nom d'affichage (ex: John Doe)" -#: ../gtk/parameters.ui.h:55 +#: ../gtk/parameters.ui.h:52 msgid "Your username:" msgstr "Votre nom d'utilisateur:" -#: ../gtk/parameters.ui.h:56 +#: ../gtk/parameters.ui.h:53 msgid "Your resulting SIP address:" msgstr "Votre adresse SIP:" -#: ../gtk/parameters.ui.h:57 +#: ../gtk/parameters.ui.h:54 msgid "Default identity" msgstr "Identité par défaut" -#: ../gtk/parameters.ui.h:58 +#: ../gtk/parameters.ui.h:55 msgid "Wizard" msgstr "Assistant" -#: ../gtk/parameters.ui.h:59 +#: ../gtk/parameters.ui.h:56 msgid "Add" msgstr "Ajouter" -#: ../gtk/parameters.ui.h:60 +#: ../gtk/parameters.ui.h:57 msgid "Edit" msgstr "Editer" -#: ../gtk/parameters.ui.h:61 +#: ../gtk/parameters.ui.h:58 msgid "Remove" msgstr "Enlever" -#: ../gtk/parameters.ui.h:62 +#: ../gtk/parameters.ui.h:59 msgid "Proxy accounts" msgstr "Comptes SIP via des proxy" -#: ../gtk/parameters.ui.h:63 +#: ../gtk/parameters.ui.h:60 msgid "Erase all passwords" msgstr "Effacer tous les mots de passe" -#: ../gtk/parameters.ui.h:64 +#: ../gtk/parameters.ui.h:61 msgid "Privacy" msgstr "Sécurité" -#: ../gtk/parameters.ui.h:65 +#: ../gtk/parameters.ui.h:62 +msgid "Automatically answer when a call is received" +msgstr "Répondre automatiquement aux appels entrants" + +#: ../gtk/parameters.ui.h:63 +msgid "Auto-answer" +msgstr "Décrochage automatique" + +#: ../gtk/parameters.ui.h:64 msgid "Manage SIP Accounts" msgstr "Gérer mes comptes SIP" -#: ../gtk/parameters.ui.h:66 ../gtk/tunnel_config.ui.h:4 +#: ../gtk/parameters.ui.h:65 ../gtk/tunnel_config.ui.h:4 msgid "Enable" msgstr "Activer" -#: ../gtk/parameters.ui.h:67 ../gtk/tunnel_config.ui.h:5 +#: ../gtk/parameters.ui.h:66 ../gtk/tunnel_config.ui.h:5 msgid "Disable" msgstr "Désactiver" -#: ../gtk/parameters.ui.h:68 +#: ../gtk/parameters.ui.h:67 msgid "Codecs" msgstr "Codecs" -#: ../gtk/parameters.ui.h:69 +#: ../gtk/parameters.ui.h:68 msgid "0 stands for \"unlimited\"" msgstr "Indiquez 0 pour ne pas mettre de limite" -#: ../gtk/parameters.ui.h:70 +#: ../gtk/parameters.ui.h:69 msgid "Upload speed limit in Kbit/sec:" msgstr "Limite de débit montant en kbits/sec:" -#: ../gtk/parameters.ui.h:71 +#: ../gtk/parameters.ui.h:70 msgid "Download speed limit in Kbit/sec:" msgstr "Limite de débit descendant en kbits/sec:" -#: ../gtk/parameters.ui.h:72 +#: ../gtk/parameters.ui.h:71 msgid "Enable adaptive rate control" msgstr "Activer le control de débit adaptatif." -#: ../gtk/parameters.ui.h:73 +#: ../gtk/parameters.ui.h:72 msgid "" "Adaptive rate control is a technique to dynamically guess the available " "bandwidth during a call." -msgstr "" -"Le control de débit adaptatif est une technique pour adapter la qualité " -"de l'audio et de la video en fonction de la bande passante disponible, " -"durant l'appel." +msgstr "Le control de débit adaptatif est une technique pour adapter la qualité de l'audio et de la video en fonction de la bande passante disponible, durant l'appel." -#: ../gtk/parameters.ui.h:74 +#: ../gtk/parameters.ui.h:73 msgid "Bandwidth control" msgstr "Gestion de la bande passante" -#: ../gtk/parameters.ui.h:75 +#: ../gtk/parameters.ui.h:74 msgid "Codecs" msgstr "Codecs" -#: ../gtk/parameters.ui.h:76 +#: ../gtk/parameters.ui.h:75 msgid "Language" msgstr "Langue" -#: ../gtk/parameters.ui.h:77 +#: ../gtk/parameters.ui.h:76 msgid "Show advanced settings" msgstr "Montrer les réglages avancés" -#: ../gtk/parameters.ui.h:78 +#: ../gtk/parameters.ui.h:77 msgid "Level" msgstr "Niveau" -#: ../gtk/parameters.ui.h:79 +#: ../gtk/parameters.ui.h:78 msgid "User interface" msgstr "Interface utilisateur" -#: ../gtk/parameters.ui.h:80 ../gtk/ldap.ui.h:2 +#: ../gtk/parameters.ui.h:79 ../gtk/ldap.ui.h:2 msgid "Server address:" msgstr "Adresse du serveur:" -#: ../gtk/parameters.ui.h:81 ../gtk/ldap.ui.h:3 +#: ../gtk/parameters.ui.h:80 ../gtk/ldap.ui.h:3 msgid "Authentication method:" msgstr "Méthode d'authentification:" -#: ../gtk/parameters.ui.h:83 +#: ../gtk/parameters.ui.h:82 msgid "LDAP Account setup" msgstr "Configuration LDAP" -#: ../gtk/parameters.ui.h:84 +#: ../gtk/parameters.ui.h:83 msgid "LDAP" msgstr "LDAP" -#: ../gtk/parameters.ui.h:85 +#: ../gtk/parameters.ui.h:84 msgid "Done" msgstr "Fermer" +#: ../gtk/parameters.ui.h:85 +msgid "SIP (UDP)" +msgstr "SIP (UDP)" + +#: ../gtk/parameters.ui.h:86 +msgid "SIP (TCP)" +msgstr "SIP (TCP)" + +#: ../gtk/parameters.ui.h:87 +msgid "SIP (TLS)" +msgstr "SIP (TLS)" + #: ../gtk/buddylookup.ui.h:1 msgid "Search contacts in directory" msgstr "Rechercher dans l'annuaire" @@ -1575,11 +1530,11 @@ msgstr "Statistiques de l'appel" #: ../gtk/call_statistics.ui.h:2 msgid "Audio codec" -msgstr "Codecs audio" +msgstr "Codec audio" #: ../gtk/call_statistics.ui.h:3 msgid "Video codec" -msgstr "Codecs vidéo" +msgstr "Codec vidéo" #: ../gtk/call_statistics.ui.h:4 msgid "Audio IP bandwidth usage" @@ -1732,17 +1687,9 @@ msgstr "Spécifier une URI de configuration" #: ../gtk/config-uri.ui.h:2 msgid "" -"This dialog allows to set an http or https address when configuration is to " -"be fetched at startup.\n" -"Please enter or modify the configuration URI below. After clicking OK, " -"Linphone will restart automatically in order to fetch and take into account " -"the new configuration. " -msgstr "" -"Cette boite de dialogue vous permet de spécifier une addresse http ou https " -"où la configuration doit être téléchargée au démarrage.\n" -"Veuillez entrer l'URI http(s) ci dessous. Après avoir validé, Linphone va " -"redémarrer automatiquement pour charger et prendre en compte la nouvelle " -"configuration." +"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n" +"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. " +msgstr "Cette boite de dialogue vous permet de spécifier une addresse http ou https où la configuration doit être téléchargée au démarrage.\nVeuillez entrer l'URI http(s) ci dessous. Après avoir validé, Linphone va redémarrer automatiquement pour charger et prendre en compte la nouvelle configuration." #: ../gtk/provisioning-fetch.ui.h:1 msgid "Configuring..." @@ -1750,64 +1697,62 @@ msgstr "Configuration en cours" #: ../gtk/provisioning-fetch.ui.h:2 msgid "Please wait while fetching configuration from server..." -msgstr "" -"Veuillez patenter un instant pendant le chargement de la configuration " -"distante..." +msgstr "Veuillez patenter un instant pendant le chargement de la configuration distante..." -#: ../coreapi/linphonecore.c:1512 +#: ../coreapi/linphonecore.c:1534 msgid "Ready" msgstr "Prêt." -#: ../coreapi/linphonecore.c:2499 +#: ../coreapi/linphonecore.c:2534 msgid "Configuring" msgstr "Configuration en cours" -#: ../coreapi/linphonecore.c:2673 +#: ../coreapi/linphonecore.c:2708 msgid "Looking for telephone number destination..." msgstr "Recherche de la destination du numéro de téléphone..." -#: ../coreapi/linphonecore.c:2675 +#: ../coreapi/linphonecore.c:2710 msgid "Could not resolve this number." msgstr "La destination n'a pu être trouvée." #. must be known at that time -#: ../coreapi/linphonecore.c:2961 +#: ../coreapi/linphonecore.c:2996 msgid "Contacting" msgstr "Appel de" -#: ../coreapi/linphonecore.c:2966 +#: ../coreapi/linphonecore.c:3001 msgid "Could not call" msgstr "Echec de l'appel" -#: ../coreapi/linphonecore.c:3116 +#: ../coreapi/linphonecore.c:3152 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:3274 +#: ../coreapi/linphonecore.c:3310 msgid "is contacting you" msgstr "vous appelle" -#: ../coreapi/linphonecore.c:3275 +#: ../coreapi/linphonecore.c:3311 msgid " and asked autoanswer." msgstr "et sollicite un décrochage automatique." -#: ../coreapi/linphonecore.c:3399 +#: ../coreapi/linphonecore.c:3435 msgid "Modifying call parameters..." msgstr "Modifications des paramètres d'appels..." -#: ../coreapi/linphonecore.c:3747 +#: ../coreapi/linphonecore.c:3782 msgid "Connected." msgstr "En ligne." -#: ../coreapi/linphonecore.c:3772 +#: ../coreapi/linphonecore.c:3807 msgid "Call aborted" msgstr "Appel abandonné" -#: ../coreapi/linphonecore.c:3962 +#: ../coreapi/linphonecore.c:3997 msgid "Could not pause the call" msgstr "La mise en attente a échoué" -#: ../coreapi/linphonecore.c:3965 +#: ../coreapi/linphonecore.c:4000 msgid "Pausing the current call..." msgstr "Mise en attente de l'appel..." @@ -1875,130 +1820,125 @@ msgstr "Status inconnu" 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." +msgstr "L'adresse SIP du proxy est invalide. Elle doit commencer par \"sip:\" suivie par un nom de domaine." #: ../coreapi/proxy.c:334 msgid "" "The sip identity you entered is invalid.\n" "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" +msgstr "L'identité SIP que vous avez fourni est invalide.\nElle doit être de la forme sip:username@domain, comme par example sip:alice@example.net" -#: ../coreapi/proxy.c:1403 +#: ../coreapi/proxy.c:1416 #, c-format msgid "Could not login as %s" msgstr "Echec de la connexion en tant que %s" -#: ../coreapi/callbacks.c:419 +#: ../coreapi/callbacks.c:428 msgid "Remote ringing." msgstr "Sonnerie distante." -#: ../coreapi/callbacks.c:431 +#: ../coreapi/callbacks.c:440 msgid "Remote ringing..." msgstr "Sonnerie distante..." -#: ../coreapi/callbacks.c:448 +#: ../coreapi/callbacks.c:461 msgid "Early media." msgstr "Prise d'appel anticipée." -#: ../coreapi/callbacks.c:521 +#: ../coreapi/callbacks.c:533 #, c-format msgid "Call with %s is paused." msgstr "%s est maintenant en attente." -#: ../coreapi/callbacks.c:534 +#: ../coreapi/callbacks.c:546 #, c-format msgid "Call answered by %s - on hold." msgstr "Appel répondu par %s - en attente" -#: ../coreapi/callbacks.c:544 +#: ../coreapi/callbacks.c:556 msgid "Call resumed." msgstr "Appel repris." -#: ../coreapi/callbacks.c:548 +#: ../coreapi/callbacks.c:560 #, c-format msgid "Call answered by %s." msgstr "Appel répondu par %s." -#: ../coreapi/callbacks.c:571 +#: ../coreapi/callbacks.c:583 msgid "Incompatible, check codecs or security settings..." msgstr "Incompatible, vérfiez les codecs ou les paramètres de sécurité..." -#: ../coreapi/callbacks.c:576 ../coreapi/callbacks.c:888 +#: ../coreapi/callbacks.c:588 ../coreapi/callbacks.c:900 msgid "Incompatible media parameters." msgstr "Paramètres media incompatibles." -#: ../coreapi/callbacks.c:606 +#: ../coreapi/callbacks.c:618 msgid "We have been resumed." msgstr "Appel repris." #. we are being paused -#: ../coreapi/callbacks.c:614 +#: ../coreapi/callbacks.c:626 msgid "We are paused by other party." msgstr "L'appel a été mis en attente." #. reINVITE and in-dialogs UPDATE go here -#: ../coreapi/callbacks.c:648 +#: ../coreapi/callbacks.c:660 msgid "Call is updated by remote." msgstr "L'appel est modifié par la partie distante." -#: ../coreapi/callbacks.c:764 +#: ../coreapi/callbacks.c:776 msgid "Call terminated." msgstr "Appel terminé." -#: ../coreapi/callbacks.c:792 +#: ../coreapi/callbacks.c:804 msgid "User is busy." msgstr "Occupé..." -#: ../coreapi/callbacks.c:793 +#: ../coreapi/callbacks.c:805 msgid "User is temporarily unavailable." msgstr "L'usager est temporairement indisponible." #. char *retrymsg=_("%s. Retry after %i minute(s)."); -#: ../coreapi/callbacks.c:795 +#: ../coreapi/callbacks.c:807 msgid "User does not want to be disturbed." msgstr "L'usager ne souhaite pas être dérangé" -#: ../coreapi/callbacks.c:796 +#: ../coreapi/callbacks.c:808 msgid "Call declined." msgstr "Appel décliné." -#: ../coreapi/callbacks.c:811 +#: ../coreapi/callbacks.c:823 msgid "Request timeout." msgstr "Délai d'attente de la requête dépassé." -#: ../coreapi/callbacks.c:842 +#: ../coreapi/callbacks.c:854 msgid "Redirected" msgstr "Redirection" -#: ../coreapi/callbacks.c:897 +#: ../coreapi/callbacks.c:909 msgid "Call failed." msgstr "L'appel a échoué." -#: ../coreapi/callbacks.c:975 +#: ../coreapi/callbacks.c:987 #, c-format msgid "Registration on %s successful." msgstr "Enregistrement sur %s effectué." -#: ../coreapi/callbacks.c:976 +#: ../coreapi/callbacks.c:988 #, c-format msgid "Unregistration on %s done." msgstr "Désenregistrement sur %s effectué." -#: ../coreapi/callbacks.c:994 +#: ../coreapi/callbacks.c:1006 msgid "no response timeout" msgstr "Pas de réponse" -#: ../coreapi/callbacks.c:997 +#: ../coreapi/callbacks.c:1009 #, c-format msgid "Registration on %s failed: %s" msgstr "Echec de l'enregistrement sur %s: %s" -#: ../coreapi/callbacks.c:1004 +#: ../coreapi/callbacks.c:1016 msgid "Service unavailable, retrying" msgstr "Service indisponible, nouvelle tentative" @@ -2008,7 +1948,11 @@ msgstr "Service indisponible, nouvelle tentative" msgid "Authentication token is %s" msgstr "Le jeton d'authentification est %s" -#: ../coreapi/linphonecall.c:3600 +#: ../coreapi/linphonecall.c:1305 +msgid "Call parameters were successfully modified." +msgstr "Les paramètres d'appel ont été modifiés avec succès." + +#: ../coreapi/linphonecall.c:3659 #, c-format msgid "You have missed %i call." msgid_plural "You have missed %i calls." @@ -2039,12 +1983,7 @@ msgid "" "To: %s\n" "Status: %s\n" "Duration: %i mn %i sec\n" -msgstr "" -"%s à %s\n" -"De : %s\n" -"Vers : %s\n" -"Status : %s\n" -"Durée : %i min %i sec\n" +msgstr "%s à %s\nDe : %s\nVers : %s\nStatus : %s\nDurée : %i min %i sec\n" #: ../coreapi/call_log.c:221 msgid "Outgoing call" diff --git a/po/he.po b/po/he.po index f0b2ac7d1..d0730fa4f 100644 --- a/po/he.po +++ b/po/he.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Eli Zaretskii , 2012 # Gautier Pelloux-Prayer , 2015 @@ -12,15 +12,14 @@ msgid "" msgstr "" "Project-Id-Version: linphone-gtk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-11 16:26+0100\n" -"PO-Revision-Date: 2015-03-11 15:33+0000\n" -"Last-Translator: Gautier Pelloux-Prayer \n" -"Language-Team: Hebrew (http://www.transifex.com/projects/p/linphone-gtk/" -"language/he/)\n" -"Language: he\n" +"POT-Creation-Date: 2015-03-27 14:40+0100\n" +"PO-Revision-Date: 2015-03-27 13:40+0000\n" +"Last-Translator: Belledonne Communications \n" +"Language-Team: Hebrew (http://www.transifex.com/projects/p/linphone-gtk/language/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: he\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974 @@ -73,9 +72,7 @@ msgstr[1] "%i שניות" msgid "" "%s\tQuality: %s\n" "%s\t%s\t" -msgstr "" -"%s\tאיכות: %s\n" -"%s\t%s\t" +msgstr "%s\tאיכות: %s\n%s\t%s\t" #: ../gtk/calllogs.c:341 #, c-format @@ -95,138 +92,126 @@ msgstr "אני" msgid "Couldn't find pixmap file: %s" msgstr "לא ניתן למצוא קובץ ‫pixmap: ‫%s" -#: ../gtk/chat.c:374 ../gtk/friendlist.c:924 -msgid "Invalid sip contact !" -msgstr "כתובת sip לא תקפה !" - -#: ../gtk/main.c:137 +#: ../gtk/main.c:136 msgid "log to stdout some debug information while running." msgstr "" -#: ../gtk/main.c:138 +#: ../gtk/main.c:137 msgid "path to a file to write logs into." msgstr "" -#: ../gtk/main.c:139 +#: ../gtk/main.c:138 msgid "Start linphone with video disabled." msgstr "" -#: ../gtk/main.c:140 +#: ../gtk/main.c:139 msgid "Start only in the system tray, do not show the main interface." msgstr "" -#: ../gtk/main.c:141 +#: ../gtk/main.c:140 msgid "address to call right now" msgstr "" -#: ../gtk/main.c:142 -msgid "if set automatically answer incoming calls" -msgstr "" - -#: ../gtk/main.c:143 +#: ../gtk/main.c:141 msgid "" -"Specifiy a working directory (should be the base of the installation, eg: c:" -"\\Program Files\\Linphone)" +"Specifiy a working directory (should be the base of the installation, eg: " +"c:\\Program Files\\Linphone)" msgstr "" -#: ../gtk/main.c:144 +#: ../gtk/main.c:142 msgid "Configuration file" msgstr "" -#: ../gtk/main.c:145 +#: ../gtk/main.c:143 msgid "Run the audio assistant" msgstr "" -#: ../gtk/main.c:146 +#: ../gtk/main.c:144 msgid "Run self test and exit 0 if succeed" msgstr "" -#: ../gtk/main.c:1061 +#: ../gtk/main.c:1059 #, 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 מעוניין להוסיפך אל רשימת אנשי הקשר שלו.\n" -"האם ברצונך להרשות להם לראות את מצב נוכחותך או להוסיפם אל רשימת אנשי הקשר " -"שלך ?\n" -"היה ותשובתך תהיה לא, אדם זה יהיה מסומן באופן זמני ברשימה השחורה." +msgstr "‫%s מעוניין להוסיפך אל רשימת אנשי הקשר שלו.\nהאם ברצונך להרשות להם לראות את מצב נוכחותך או להוסיפם אל רשימת אנשי הקשר שלך ?\nהיה ותשובתך תהיה לא, אדם זה יהיה מסומן באופן זמני ברשימה השחורה." -#: ../gtk/main.c:1138 +#: ../gtk/main.c:1136 #, c-format msgid "" "Please enter your password for username %s\n" " at realm %s:" -msgstr "" -"אנא הזן סיסמה עבור משתמש %s\n" -"במתחם %s:" +msgstr "אנא הזן סיסמה עבור משתמש %s\nבמתחם %s:" -#: ../gtk/main.c:1259 +#: ../gtk/main.c:1257 msgid "Call error" msgstr "שגיאת קריאה" -#: ../gtk/main.c:1262 ../coreapi/linphonecore.c:3791 +#: ../gtk/main.c:1260 ../coreapi/linphonecore.c:3826 msgid "Call ended" msgstr "שיחה הסתיימה" -#: ../gtk/main.c:1265 ../coreapi/call_log.c:221 +#: ../gtk/main.c:1263 ../coreapi/call_log.c:221 msgid "Incoming call" msgstr "קריאה נכנסת" -#: ../gtk/main.c:1267 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5 +#: ../gtk/main.c:1265 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5 msgid "Answer" msgstr "לענות" -#: ../gtk/main.c:1269 ../gtk/main.ui.h:6 +#: ../gtk/main.c:1267 ../gtk/main.ui.h:6 msgid "Decline" msgstr "לדחות" -#: ../gtk/main.c:1275 +#: ../gtk/main.c:1273 msgid "Call paused" msgstr "שיחה הושהתה" -#: ../gtk/main.c:1275 +#: ../gtk/main.c:1273 #, c-format msgid "by %s" msgstr "על ידי %s" -#: ../gtk/main.c:1345 +#: ../gtk/main.c:1343 #, c-format msgid "%s proposed to start video. Do you accept ?" msgstr "‏%s רוצה להתחיל וידאו. האם אתה מסכים ?" -#: ../gtk/main.c:1507 +#: ../gtk/main.c:1505 msgid "Website link" msgstr "קישור אתר רשת" -#: ../gtk/main.c:1556 +#: ../gtk/main.c:1554 msgid "Linphone - a video internet phone" msgstr "‫Linphone - וידאופון אינטרנטי" -#: ../gtk/main.c:1648 +#: ../gtk/main.c:1646 #, c-format msgid "%s (Default)" msgstr "‫%s (ברירת מחדל)" -#: ../gtk/main.c:1980 ../coreapi/callbacks.c:1045 +#: ../gtk/main.c:1978 ../coreapi/callbacks.c:1057 #, c-format msgid "We are transferred to %s" msgstr "אנחנו מועברים אל %s" -#: ../gtk/main.c:1990 +#: ../gtk/main.c:1988 msgid "" "No sound cards have been detected on this computer.\n" "You won't be able to send or receive audio calls." -msgstr "" -"לא אותרו כרטיסי קול במחשב זה.\n" -"לא תהיה ביכולתך לשלוח או לקבל שיחות אודיו." +msgstr "לא אותרו כרטיסי קול במחשב זה.\nלא תהיה ביכולתך לשלוח או לקבל שיחות אודיו." -#: ../gtk/main.c:2135 +#: ../gtk/main.c:2136 msgid "A free SIP video-phone" msgstr "וידאופון SIP חופשי" +#: ../gtk/main.c:2241 +#, c-format +msgid "Hello\n" +msgstr "" + #: ../gtk/friendlist.c:505 msgid "Add to addressbook" msgstr "הוסף אל ספר כתובות" @@ -252,6 +237,10 @@ msgstr "שיחה" msgid "Search in %s directory" msgstr "חיפוש במדור %s" +#: ../gtk/friendlist.c:924 +msgid "Invalid sip contact !" +msgstr "כתובת sip לא תקפה !" + #: ../gtk/friendlist.c:976 #, c-format msgid "Edit contact '%s'" @@ -292,7 +281,7 @@ msgstr "פרמטרים" msgid "Enabled" msgstr "מופעל" -#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763 ../gtk/parameters.ui.h:20 +#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763 ../gtk/parameters.ui.h:17 msgid "Disabled" msgstr "לא מופעל" @@ -398,9 +387,7 @@ msgstr "" msgid "" "A more recent version is availalble from %s.\n" "Would you like to open a browser to download it ?" -msgstr "" -"גרסא מאוחרת יותר זמינה מן %s.\n" -"האם ברצונך לפתוח דפדפן בכדי להורידה ?" +msgstr "גרסא מאוחרת יותר זמינה מן %s.\nהאם ברצונך לפתוח דפדפן בכדי להורידה ?" #: ../gtk/update.c:91 msgid "You are running the lastest version." @@ -459,7 +446,7 @@ msgstr "" msgid "Enter your linphone.org username" msgstr "הזן את שם משתמשך אצל linphone.org" -#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:82 ../gtk/ldap.ui.h:4 +#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:81 ../gtk/ldap.ui.h:4 msgid "Username:" msgstr "שם משתמש:" @@ -515,9 +502,7 @@ msgstr "" msgid "" "Error, account not validated, username already used or server unreachable.\n" "Please go back and try again." -msgstr "" -"שגיאה, חשבון לא אומת, שם משתמש כבר בשימוש או שרת לא ניתן להשגה.\n" -"נא לחזור ולנסות שוב." +msgstr "שגיאה, חשבון לא אומת, שם משתמש כבר בשימוש או שרת לא ניתן להשגה.\nנא לחזור ולנסות שוב." #: ../gtk/setupwizard.c:405 msgid "Thank you. Your account is now configured and ready for use." @@ -525,12 +510,9 @@ msgstr "תודה לך. חשבונך מוגדר ומוכן לשימוש כעת." #: ../gtk/setupwizard.c:413 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 "" -"נא לאמת את חשבונך באמצעות הקלקה על הקישור ששלחנו לך עתה באמצעות דוא״ל.\n" -"אחרי כן נא לחזור לכאן וללחוץ על הלחצן 'קדימה'." +msgstr "נא לאמת את חשבונך באמצעות הקלקה על הקישור ששלחנו לך עתה באמצעות דוא״ל.\nאחרי כן נא לחזור לכאן וללחוץ על הלחצן 'קדימה'." #: ../gtk/setupwizard.c:602 msgid "SIP account configuration assistant" @@ -635,9 +617,7 @@ msgstr "ישיר או דרך שרת" msgid "" "download: %f\n" "upload: %f (kbit/s)" -msgstr "" -"הורדה: %f\n" -"העלאה: %f (קי״ב/שנ׳)" +msgstr "הורדה: %f\nהעלאה: %f (קי״ב/שנ׳)" #: ../gtk/incall_view.c:272 ../gtk/incall_view.c:274 #, c-format @@ -751,9 +731,7 @@ msgstr "השהה" msgid "" "Recording into\n" "%s %s" -msgstr "" -"מקליט אל תוך\n" -"%s %s" +msgstr "מקליט אל תוך\n%s %s" #: ../gtk/incall_view.c:954 msgid "(Paused)" @@ -856,7 +834,7 @@ msgstr "הבא נתחיל את Linphone עכשיו" msgid "Audio Assistant" msgstr "" -#: ../gtk/audio_assistant.c:513 ../gtk/main.ui.h:31 +#: ../gtk/audio_assistant.c:513 ../gtk/main.ui.h:32 msgid "Audio assistant" msgstr "" @@ -933,105 +911,105 @@ msgid "Default" msgstr "ברירת מחדל" #: ../gtk/main.ui.h:22 +msgid "Delete" +msgstr "מחק" + +#: ../gtk/main.ui.h:23 msgid "_Options" msgstr "_אפשרויות" -#: ../gtk/main.ui.h:23 +#: ../gtk/main.ui.h:24 msgid "Set configuration URI" msgstr "" -#: ../gtk/main.ui.h:24 +#: ../gtk/main.ui.h:25 msgid "Always start video" msgstr "התחל תמיד וידאו" -#: ../gtk/main.ui.h:25 +#: ../gtk/main.ui.h:26 msgid "Enable self-view" msgstr "אפשר ראות-עצמית" -#: ../gtk/main.ui.h:26 +#: ../gtk/main.ui.h:27 msgid "_Help" msgstr "_עזרה" -#: ../gtk/main.ui.h:27 +#: ../gtk/main.ui.h:28 msgid "Show debug window" msgstr "הצג חלון ניפוי שגיאות" -#: ../gtk/main.ui.h:28 +#: ../gtk/main.ui.h:29 msgid "_Homepage" msgstr "_עמוד הבית" -#: ../gtk/main.ui.h:29 +#: ../gtk/main.ui.h:30 msgid "Check _Updates" msgstr "בדיקת _עדכונים" -#: ../gtk/main.ui.h:30 +#: ../gtk/main.ui.h:31 msgid "Account assistant" msgstr "אשף חשבון" -#: ../gtk/main.ui.h:32 +#: ../gtk/main.ui.h:33 msgid "SIP address or phone number:" msgstr "כתובת SIP או מספר טלפון" -#: ../gtk/main.ui.h:33 +#: ../gtk/main.ui.h:34 msgid "Initiate a new call" msgstr "התחל שיחה חדשה" -#: ../gtk/main.ui.h:34 +#: ../gtk/main.ui.h:35 msgid "Contacts" msgstr "אנשי קשר" -#: ../gtk/main.ui.h:35 +#: ../gtk/main.ui.h:36 msgid "Search" msgstr "חיפוש" -#: ../gtk/main.ui.h:36 +#: ../gtk/main.ui.h:37 msgid "Add contacts from directory" msgstr "הוסף אנשי קשר מן מדור" -#: ../gtk/main.ui.h:37 +#: ../gtk/main.ui.h:38 msgid "Add contact" msgstr "הוסף איש קשר" -#: ../gtk/main.ui.h:38 +#: ../gtk/main.ui.h:39 msgid "Recent calls" msgstr "שיחות אחרונות" -#: ../gtk/main.ui.h:39 +#: ../gtk/main.ui.h:40 msgid "My current identity:" msgstr "זהותי הנוכחית:" -#: ../gtk/main.ui.h:40 ../gtk/tunnel_config.ui.h:7 +#: ../gtk/main.ui.h:41 ../gtk/tunnel_config.ui.h:7 msgid "Username" msgstr "שם משתמש" -#: ../gtk/main.ui.h:41 ../gtk/tunnel_config.ui.h:8 +#: ../gtk/main.ui.h:42 ../gtk/tunnel_config.ui.h:8 msgid "Password" msgstr "סיסמה" -#: ../gtk/main.ui.h:42 +#: ../gtk/main.ui.h:43 msgid "Internet connection:" msgstr "חיבור אינטרנט:" -#: ../gtk/main.ui.h:43 +#: ../gtk/main.ui.h:44 msgid "Automatically log me in" msgstr "חבר אותי אוטומטית" -#: ../gtk/main.ui.h:44 ../gtk/password.ui.h:3 +#: ../gtk/main.ui.h:45 ../gtk/password.ui.h:3 msgid "UserID" msgstr "מזהה משתמש" -#: ../gtk/main.ui.h:45 +#: ../gtk/main.ui.h:46 msgid "Login information" msgstr "מידע התחברות" -#: ../gtk/main.ui.h:46 +#: ../gtk/main.ui.h:47 msgid "Welcome!" msgstr "" -#: ../gtk/main.ui.h:47 -msgid "Delete" -msgstr "מחק" - #: ../gtk/about.ui.h:1 msgid "About Linphone" msgstr "" @@ -1205,301 +1183,307 @@ msgid "C" msgstr "" #: ../gtk/parameters.ui.h:11 -msgid "SIP (UDP)" -msgstr "‏SIP ‏(UDP)" - -#: ../gtk/parameters.ui.h:12 -msgid "SIP (TCP)" -msgstr "‏SIP ‏(TCP)" - -#: ../gtk/parameters.ui.h:13 -msgid "SIP (TLS)" -msgstr "‏SIP ‏(TLS)" - -#: ../gtk/parameters.ui.h:14 msgid "Settings" msgstr "הגדרות" -#: ../gtk/parameters.ui.h:15 +#: ../gtk/parameters.ui.h:12 msgid "Set Maximum Transmission Unit:" msgstr "הגדר יחידת תמסורת מרבית:" -#: ../gtk/parameters.ui.h:16 +#: ../gtk/parameters.ui.h:13 msgid "Send DTMFs as SIP info" msgstr "שלח טזמ״תים (DTMFs) כמידע SIP" -#: ../gtk/parameters.ui.h:17 -msgid "Use IPv6 instead of IPv4" -msgstr "השתמש בפרוטוקול IPv6 במקום בפרוטוקול IPv4" +#: ../gtk/parameters.ui.h:14 +msgid "Allow IPv6" +msgstr "" -#: ../gtk/parameters.ui.h:18 +#: ../gtk/parameters.ui.h:15 msgid "Transport" msgstr "טרנספורט" -#: ../gtk/parameters.ui.h:19 +#: ../gtk/parameters.ui.h:16 msgid "SIP/UDP port" msgstr "" -#: ../gtk/parameters.ui.h:21 +#: ../gtk/parameters.ui.h:18 msgid "Random" msgstr "" -#: ../gtk/parameters.ui.h:22 +#: ../gtk/parameters.ui.h:19 msgid "SIP/TCP port" msgstr "" -#: ../gtk/parameters.ui.h:23 +#: ../gtk/parameters.ui.h:20 msgid "Audio RTP/UDP:" msgstr "אודיו RTP/UDP:" -#: ../gtk/parameters.ui.h:24 +#: ../gtk/parameters.ui.h:21 msgid "Fixed" msgstr "מקובע" -#: ../gtk/parameters.ui.h:25 +#: ../gtk/parameters.ui.h:22 msgid "Video RTP/UDP:" msgstr "וידאו RTP/UDP:" -#: ../gtk/parameters.ui.h:26 +#: ../gtk/parameters.ui.h:23 msgid "Media encryption type" msgstr "סוג הצפנת מדיה" -#: ../gtk/parameters.ui.h:27 +#: ../gtk/parameters.ui.h:24 msgid "Media encryption is mandatory" msgstr "הצפנת מדיה הינה מנדטורית" -#: ../gtk/parameters.ui.h:28 +#: ../gtk/parameters.ui.h:25 msgid "Tunnel" msgstr "מינהור" -#: ../gtk/parameters.ui.h:29 +#: ../gtk/parameters.ui.h:26 msgid "DSCP fields" msgstr "שדות DSCP" -#: ../gtk/parameters.ui.h:30 +#: ../gtk/parameters.ui.h:27 msgid "Network protocol and ports" msgstr "פרוטוקולי רשת תקשורת ופורטים" -#: ../gtk/parameters.ui.h:31 +#: ../gtk/parameters.ui.h:28 msgid "Direct connection to the Internet" msgstr "חיבור ישיר אל האינטרנט" -#: ../gtk/parameters.ui.h:32 +#: ../gtk/parameters.ui.h:29 msgid "Behind NAT / Firewall (specify gateway IP )" msgstr "" -#: ../gtk/parameters.ui.h:33 +#: ../gtk/parameters.ui.h:30 msgid "Behind NAT / Firewall (use STUN to resolve)" msgstr "מאחורי NAT / חומת אש (בעזרת STUN לפתירה)" -#: ../gtk/parameters.ui.h:34 +#: ../gtk/parameters.ui.h:31 msgid "Behind NAT / Firewall (use ICE)" msgstr "מאחורי NAT / חומת אש (בעזרת ICE)" -#: ../gtk/parameters.ui.h:35 +#: ../gtk/parameters.ui.h:32 msgid "Behind NAT / Firewall (use uPnP)" msgstr "מאחורי NAT / חומת אש (בעזרת uPnP)" -#: ../gtk/parameters.ui.h:36 +#: ../gtk/parameters.ui.h:33 msgid "Public IP address:" msgstr "כתובת IP פומבית:" -#: ../gtk/parameters.ui.h:37 +#: ../gtk/parameters.ui.h:34 msgid "Stun server:" msgstr "שרת STUN:" -#: ../gtk/parameters.ui.h:38 +#: ../gtk/parameters.ui.h:35 msgid "NAT and Firewall" msgstr "‫NAT וחומת אש" -#: ../gtk/parameters.ui.h:39 +#: ../gtk/parameters.ui.h:36 msgid "Network settings" msgstr "הגדרות רשת תקשורת" -#: ../gtk/parameters.ui.h:40 +#: ../gtk/parameters.ui.h:37 msgid "Ring sound:" msgstr "צליל צלצול:" -#: ../gtk/parameters.ui.h:41 +#: ../gtk/parameters.ui.h:38 msgid "ALSA special device (optional):" msgstr "התקן ALSA מיוחד (רשות):" -#: ../gtk/parameters.ui.h:42 +#: ../gtk/parameters.ui.h:39 msgid "Capture device:" msgstr "התקן לכידה:" -#: ../gtk/parameters.ui.h:43 +#: ../gtk/parameters.ui.h:40 msgid "Ring device:" msgstr "התקן צלצול:" -#: ../gtk/parameters.ui.h:44 +#: ../gtk/parameters.ui.h:41 msgid "Playback device:" msgstr "התקן פס קול:" -#: ../gtk/parameters.ui.h:45 +#: ../gtk/parameters.ui.h:42 msgid "Enable echo cancellation" msgstr "אפשר ביטול הד" -#: ../gtk/parameters.ui.h:46 +#: ../gtk/parameters.ui.h:43 msgid "Audio" msgstr "אודיו" -#: ../gtk/parameters.ui.h:47 +#: ../gtk/parameters.ui.h:44 msgid "Video input device:" msgstr "התקן קלט וידאו:" -#: ../gtk/parameters.ui.h:48 +#: ../gtk/parameters.ui.h:45 msgid "Prefered video resolution:" msgstr "רזולוציית וידאו מועדפת:" -#: ../gtk/parameters.ui.h:49 +#: ../gtk/parameters.ui.h:46 msgid "Video output method:" msgstr "" -#: ../gtk/parameters.ui.h:50 +#: ../gtk/parameters.ui.h:47 msgid "Show camera preview" msgstr "" -#: ../gtk/parameters.ui.h:51 +#: ../gtk/parameters.ui.h:48 msgid "Video" msgstr "וידאו" -#: ../gtk/parameters.ui.h:52 +#: ../gtk/parameters.ui.h:49 msgid "Multimedia settings" msgstr "הגדרות מולטימדיה" -#: ../gtk/parameters.ui.h:53 +#: ../gtk/parameters.ui.h:50 msgid "This section defines your SIP address when not using a SIP account" msgstr "חלק זה מגדיר את כתובת ה־SIP כאשר אינך עושה שימוש בחשבון SIP" -#: ../gtk/parameters.ui.h:54 +#: ../gtk/parameters.ui.h:51 msgid "Your display name (eg: John Doe):" msgstr "שם התצוגה שלך (למשל: יורם יהודה):" -#: ../gtk/parameters.ui.h:55 +#: ../gtk/parameters.ui.h:52 msgid "Your username:" msgstr "שם המשתמש שלך:" -#: ../gtk/parameters.ui.h:56 +#: ../gtk/parameters.ui.h:53 msgid "Your resulting SIP address:" msgstr "כתובת SIP נובעת:" -#: ../gtk/parameters.ui.h:57 +#: ../gtk/parameters.ui.h:54 msgid "Default identity" msgstr "זהות משתמטת" -#: ../gtk/parameters.ui.h:58 +#: ../gtk/parameters.ui.h:55 msgid "Wizard" msgstr "אשף" -#: ../gtk/parameters.ui.h:59 +#: ../gtk/parameters.ui.h:56 msgid "Add" msgstr "הוסף" -#: ../gtk/parameters.ui.h:60 +#: ../gtk/parameters.ui.h:57 msgid "Edit" msgstr "ערוך" -#: ../gtk/parameters.ui.h:61 +#: ../gtk/parameters.ui.h:58 msgid "Remove" msgstr "הסר" -#: ../gtk/parameters.ui.h:62 +#: ../gtk/parameters.ui.h:59 msgid "Proxy accounts" msgstr "חשבונות Proxy" -#: ../gtk/parameters.ui.h:63 +#: ../gtk/parameters.ui.h:60 msgid "Erase all passwords" msgstr "מחק סיסמאות" -#: ../gtk/parameters.ui.h:64 +#: ../gtk/parameters.ui.h:61 msgid "Privacy" msgstr "פרטיות" -#: ../gtk/parameters.ui.h:65 +#: ../gtk/parameters.ui.h:62 +msgid "Automatically answer when a call is received" +msgstr "" + +#: ../gtk/parameters.ui.h:63 +msgid "Auto-answer" +msgstr "" + +#: ../gtk/parameters.ui.h:64 msgid "Manage SIP Accounts" msgstr "ניהול חשבונות ‫SIP" -#: ../gtk/parameters.ui.h:66 ../gtk/tunnel_config.ui.h:4 +#: ../gtk/parameters.ui.h:65 ../gtk/tunnel_config.ui.h:4 msgid "Enable" msgstr "אפשר" -#: ../gtk/parameters.ui.h:67 ../gtk/tunnel_config.ui.h:5 +#: ../gtk/parameters.ui.h:66 ../gtk/tunnel_config.ui.h:5 msgid "Disable" msgstr "נטרל" -#: ../gtk/parameters.ui.h:68 +#: ../gtk/parameters.ui.h:67 msgid "Codecs" msgstr "קודקים" -#: ../gtk/parameters.ui.h:69 +#: ../gtk/parameters.ui.h:68 msgid "0 stands for \"unlimited\"" msgstr "0 מסמל \"בלי הגבלה\"" -#: ../gtk/parameters.ui.h:70 +#: ../gtk/parameters.ui.h:69 msgid "Upload speed limit in Kbit/sec:" msgstr "מגבלת מהירות העלאה בקי״ב/שנ׳:" -#: ../gtk/parameters.ui.h:71 +#: ../gtk/parameters.ui.h:70 msgid "Download speed limit in Kbit/sec:" msgstr "מגבלת מהירות הורדה בקי״ב/שנ׳:" -#: ../gtk/parameters.ui.h:72 +#: ../gtk/parameters.ui.h:71 msgid "Enable adaptive rate control" msgstr "אפשר בקרת קצב מסתגלת" -#: ../gtk/parameters.ui.h:73 +#: ../gtk/parameters.ui.h:72 msgid "" "Adaptive rate control is a technique to dynamically guess the available " "bandwidth during a call." -msgstr "" -"בקרת קצב מסתגלת הינה טכניקה להשערה דינמית של רוחב הפס הזמין במהלך שיחה." +msgstr "בקרת קצב מסתגלת הינה טכניקה להשערה דינמית של רוחב הפס הזמין במהלך שיחה." -#: ../gtk/parameters.ui.h:74 +#: ../gtk/parameters.ui.h:73 msgid "Bandwidth control" msgstr "בקרת רוחב פס" -#: ../gtk/parameters.ui.h:75 +#: ../gtk/parameters.ui.h:74 msgid "Codecs" msgstr "קודקים" -#: ../gtk/parameters.ui.h:76 +#: ../gtk/parameters.ui.h:75 msgid "Language" msgstr "שפה" -#: ../gtk/parameters.ui.h:77 +#: ../gtk/parameters.ui.h:76 msgid "Show advanced settings" msgstr "הצג הגדרות מתקדמות" -#: ../gtk/parameters.ui.h:78 +#: ../gtk/parameters.ui.h:77 msgid "Level" msgstr "רמה" -#: ../gtk/parameters.ui.h:79 +#: ../gtk/parameters.ui.h:78 msgid "User interface" msgstr "ממשק משתמש" -#: ../gtk/parameters.ui.h:80 ../gtk/ldap.ui.h:2 +#: ../gtk/parameters.ui.h:79 ../gtk/ldap.ui.h:2 msgid "Server address:" msgstr "" -#: ../gtk/parameters.ui.h:81 ../gtk/ldap.ui.h:3 +#: ../gtk/parameters.ui.h:80 ../gtk/ldap.ui.h:3 msgid "Authentication method:" msgstr "" -#: ../gtk/parameters.ui.h:83 +#: ../gtk/parameters.ui.h:82 msgid "LDAP Account setup" msgstr "" -#: ../gtk/parameters.ui.h:84 +#: ../gtk/parameters.ui.h:83 msgid "LDAP" msgstr "" -#: ../gtk/parameters.ui.h:85 +#: ../gtk/parameters.ui.h:84 msgid "Done" msgstr "סיום" +#: ../gtk/parameters.ui.h:85 +msgid "SIP (UDP)" +msgstr "‏SIP ‏(UDP)" + +#: ../gtk/parameters.ui.h:86 +msgid "SIP (TCP)" +msgstr "‏SIP ‏(TCP)" + +#: ../gtk/parameters.ui.h:87 +msgid "SIP (TLS)" +msgstr "‏SIP ‏(TLS)" + #: ../gtk/buddylookup.ui.h:1 msgid "Search contacts in directory" msgstr "חיפוש אנשי קשר בתוך מדור" @@ -1703,11 +1687,8 @@ msgstr "" #: ../gtk/config-uri.ui.h:2 msgid "" -"This dialog allows to set an http or https address when configuration is to " -"be fetched at startup.\n" -"Please enter or modify the configuration URI below. After clicking OK, " -"Linphone will restart automatically in order to fetch and take into account " -"the new configuration. " +"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n" +"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. " msgstr "" #: ../gtk/provisioning-fetch.ui.h:1 @@ -1718,60 +1699,60 @@ msgstr "" msgid "Please wait while fetching configuration from server..." msgstr "" -#: ../coreapi/linphonecore.c:1512 +#: ../coreapi/linphonecore.c:1534 msgid "Ready" msgstr "מוכן" -#: ../coreapi/linphonecore.c:2499 +#: ../coreapi/linphonecore.c:2534 msgid "Configuring" msgstr "" -#: ../coreapi/linphonecore.c:2673 +#: ../coreapi/linphonecore.c:2708 msgid "Looking for telephone number destination..." msgstr "מחפש כעת עבור יעד מספר טלפון..." -#: ../coreapi/linphonecore.c:2675 +#: ../coreapi/linphonecore.c:2710 msgid "Could not resolve this number." msgstr "לא ניתן לפתור את מספר זה." #. must be known at that time -#: ../coreapi/linphonecore.c:2961 +#: ../coreapi/linphonecore.c:2996 msgid "Contacting" msgstr "מתקשר כעת" -#: ../coreapi/linphonecore.c:2966 +#: ../coreapi/linphonecore.c:3001 msgid "Could not call" msgstr "לא ניתן להתקשר" -#: ../coreapi/linphonecore.c:3116 +#: ../coreapi/linphonecore.c:3152 msgid "Sorry, we have reached the maximum number of simultaneous calls" msgstr "הגענו אל המספר המרבי של שיחות מקבילות, עמך הסליחה" -#: ../coreapi/linphonecore.c:3274 +#: ../coreapi/linphonecore.c:3310 msgid "is contacting you" msgstr "מתקשר/ת אליך" -#: ../coreapi/linphonecore.c:3275 +#: ../coreapi/linphonecore.c:3311 msgid " and asked autoanswer." msgstr " ומבקש/ת מענה אוטומטי." -#: ../coreapi/linphonecore.c:3399 +#: ../coreapi/linphonecore.c:3435 msgid "Modifying call parameters..." msgstr "מתאים כעת פרמטרים של שיחה..." -#: ../coreapi/linphonecore.c:3747 +#: ../coreapi/linphonecore.c:3782 msgid "Connected." msgstr "מקושר." -#: ../coreapi/linphonecore.c:3772 +#: ../coreapi/linphonecore.c:3807 msgid "Call aborted" msgstr "קריאה בוטלה" -#: ../coreapi/linphonecore.c:3962 +#: ../coreapi/linphonecore.c:3997 msgid "Could not pause the call" msgstr "לא ניתן להשהות את השיחה" -#: ../coreapi/linphonecore.c:3965 +#: ../coreapi/linphonecore.c:4000 msgid "Pausing the current call..." msgstr "משהה כעת שיחה נוכחית..." @@ -1839,128 +1820,125 @@ msgstr "" msgid "" "The sip proxy address you entered is invalid, it must start with \"sip:\" " "followed by a hostname." -msgstr "" -"כתובת sip proxy שהזנת הינה שגויה, זו צריכה להתחיל עם‭\"sip:\" ‬ לאחר שם מארח." +msgstr "כתובת sip proxy שהזנת הינה שגויה, זו צריכה להתחיל עם‭\"sip:\" ‬ לאחר שם מארח." #: ../coreapi/proxy.c:334 msgid "" "The sip identity you entered is invalid.\n" "It should look like sip:username@proxydomain, such as sip:alice@example.net" -msgstr "" -"זהות sip שהוזנה הינה שגויה.\n" -"זו צריכה להיראות כמו sip:username@proxydomain, למשל sip:alice@example.net" +msgstr "זהות sip שהוזנה הינה שגויה.\nזו צריכה להיראות כמו sip:username@proxydomain, למשל sip:alice@example.net" -#: ../coreapi/proxy.c:1403 +#: ../coreapi/proxy.c:1416 #, c-format msgid "Could not login as %s" msgstr "לא ניתן להתחבר בזהות %s" -#: ../coreapi/callbacks.c:419 +#: ../coreapi/callbacks.c:428 msgid "Remote ringing." msgstr "צלצול מרוחק." -#: ../coreapi/callbacks.c:431 +#: ../coreapi/callbacks.c:440 msgid "Remote ringing..." msgstr "צלצול מרוחק..." -#: ../coreapi/callbacks.c:448 +#: ../coreapi/callbacks.c:461 msgid "Early media." msgstr "מדיה מוקדמת." -#: ../coreapi/callbacks.c:521 +#: ../coreapi/callbacks.c:533 #, c-format msgid "Call with %s is paused." msgstr "שיחה עם %s מושהית." -#: ../coreapi/callbacks.c:534 +#: ../coreapi/callbacks.c:546 #, c-format msgid "Call answered by %s - on hold." msgstr "קריאה נענתה על ידי %s - בהמתנה." -#: ../coreapi/callbacks.c:544 +#: ../coreapi/callbacks.c:556 msgid "Call resumed." msgstr "קריאה חודשה." -#: ../coreapi/callbacks.c:548 +#: ../coreapi/callbacks.c:560 #, c-format msgid "Call answered by %s." msgstr "קריאה נענתה על ידי %s." -#: ../coreapi/callbacks.c:571 +#: ../coreapi/callbacks.c:583 msgid "Incompatible, check codecs or security settings..." msgstr "חוסר תאימות, בדוק קודקים או הגדרות אבטחה..." -#: ../coreapi/callbacks.c:576 ../coreapi/callbacks.c:888 +#: ../coreapi/callbacks.c:588 ../coreapi/callbacks.c:900 msgid "Incompatible media parameters." msgstr "פרמטריי מדיה חסרי תואמים." -#: ../coreapi/callbacks.c:606 +#: ../coreapi/callbacks.c:618 msgid "We have been resumed." msgstr "חזרנו." #. we are being paused -#: ../coreapi/callbacks.c:614 +#: ../coreapi/callbacks.c:626 msgid "We are paused by other party." msgstr "אנו מושהים על ידי צד אחר." #. reINVITE and in-dialogs UPDATE go here -#: ../coreapi/callbacks.c:648 +#: ../coreapi/callbacks.c:660 msgid "Call is updated by remote." msgstr "שיחה עודכנה מרחוק." -#: ../coreapi/callbacks.c:764 +#: ../coreapi/callbacks.c:776 msgid "Call terminated." msgstr "קריאה הסתיימה." -#: ../coreapi/callbacks.c:792 +#: ../coreapi/callbacks.c:804 msgid "User is busy." msgstr "משתמש עסוק כעת." -#: ../coreapi/callbacks.c:793 +#: ../coreapi/callbacks.c:805 msgid "User is temporarily unavailable." msgstr "משתמש לא זמין זמנית." #. char *retrymsg=_("%s. Retry after %i minute(s)."); -#: ../coreapi/callbacks.c:795 +#: ../coreapi/callbacks.c:807 msgid "User does not want to be disturbed." msgstr "משתמש לא מעוניין שיפריעו לו." -#: ../coreapi/callbacks.c:796 +#: ../coreapi/callbacks.c:808 msgid "Call declined." msgstr "קריאה סורבה." -#: ../coreapi/callbacks.c:811 +#: ../coreapi/callbacks.c:823 msgid "Request timeout." msgstr "" -#: ../coreapi/callbacks.c:842 +#: ../coreapi/callbacks.c:854 msgid "Redirected" msgstr "מכוון מחדש" -#: ../coreapi/callbacks.c:897 +#: ../coreapi/callbacks.c:909 msgid "Call failed." msgstr "קריאה נכשלה." -#: ../coreapi/callbacks.c:975 +#: ../coreapi/callbacks.c:987 #, c-format msgid "Registration on %s successful." msgstr "רישום אצל %s הושלם בהצלחה." -#: ../coreapi/callbacks.c:976 +#: ../coreapi/callbacks.c:988 #, c-format msgid "Unregistration on %s done." msgstr "אי רישום אצל %s סוים." -#: ../coreapi/callbacks.c:994 +#: ../coreapi/callbacks.c:1006 msgid "no response timeout" msgstr "אין היענות תוך זמן מוגדר" -#: ../coreapi/callbacks.c:997 +#: ../coreapi/callbacks.c:1009 #, c-format msgid "Registration on %s failed: %s" msgstr "רישום אצל %s נכשל: %s" -#: ../coreapi/callbacks.c:1004 +#: ../coreapi/callbacks.c:1016 msgid "Service unavailable, retrying" msgstr "" @@ -1970,7 +1948,11 @@ msgstr "" msgid "Authentication token is %s" msgstr "אות האימות הינה %s" -#: ../coreapi/linphonecall.c:3600 +#: ../coreapi/linphonecall.c:1305 +msgid "Call parameters were successfully modified." +msgstr "" + +#: ../coreapi/linphonecall.c:3659 #, c-format msgid "You have missed %i call." msgid_plural "You have missed %i calls." diff --git a/po/hu.po b/po/hu.po index 75e5856d3..a32fbab4c 100644 --- a/po/hu.po +++ b/po/hu.po @@ -1,22 +1,20 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: msgid "" msgstr "" "Project-Id-Version: linphone-gtk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-11 16:26+0100\n" -"PO-Revision-Date: 2015-02-17 11:28+0000\n" -"Last-Translator: Belledonne Communications \n" -"Language-Team: Hungarian (http://www.transifex.com/projects/p/linphone-gtk/" -"language/hu/)\n" -"Language: hu\n" +"POT-Creation-Date: 2015-03-27 14:40+0100\n" +"PO-Revision-Date: 2015-03-27 13:40+0000\n" +"Last-Translator: Belledonne Communications \n" +"Language-Team: Hungarian (http://www.transifex.com/projects/p/linphone-gtk/language/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: hu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974 @@ -89,138 +87,126 @@ msgstr "én" msgid "Couldn't find pixmap file: %s" msgstr "Nemtalálható a pixmap fájl: %s" -#: ../gtk/chat.c:374 ../gtk/friendlist.c:924 -msgid "Invalid sip contact !" -msgstr "Érvénytelen sip partner !" - -#: ../gtk/main.c:137 +#: ../gtk/main.c:136 msgid "log to stdout some debug information while running." msgstr "Futás közben némi hibakeresési információ az stdout-ra naplózása." -#: ../gtk/main.c:138 +#: ../gtk/main.c:137 msgid "path to a file to write logs into." msgstr "fájl elérési útja, melybe a naplók kerülnek." -#: ../gtk/main.c:139 +#: ../gtk/main.c:138 msgid "Start linphone with video disabled." msgstr "Linphone indítása, videó kikpacsolva. " -#: ../gtk/main.c:140 +#: ../gtk/main.c:139 msgid "Start only in the system tray, do not show the main interface." msgstr "Csak a tálcaikon indítása, ne mutassa a fő ablakot." -#: ../gtk/main.c:141 +#: ../gtk/main.c:140 msgid "address to call right now" msgstr "Cím azonnali híváshoz" -#: ../gtk/main.c:142 -msgid "if set automatically answer incoming calls" -msgstr "Bekapcsolva automatikusan válaszol a bejövő hívásokra" - -#: ../gtk/main.c:143 +#: ../gtk/main.c:141 msgid "" -"Specifiy a working directory (should be the base of the installation, eg: c:" -"\\Program Files\\Linphone)" -msgstr "" -"Adjon meg egy munkakönyvtárat (ennek az installációs könyvtárnak kéne " -"lennie, pl. C:\\Program Files\\Linphone)" +"Specifiy a working directory (should be the base of the installation, eg: " +"c:\\Program Files\\Linphone)" +msgstr "Adjon meg egy munkakönyvtárat (ennek az installációs könyvtárnak kéne lennie, pl. C:\\Program Files\\Linphone)" -#: ../gtk/main.c:144 +#: ../gtk/main.c:142 msgid "Configuration file" msgstr "" -#: ../gtk/main.c:145 +#: ../gtk/main.c:143 msgid "Run the audio assistant" msgstr "" -#: ../gtk/main.c:146 +#: ../gtk/main.c:144 msgid "Run self test and exit 0 if succeed" msgstr "" -#: ../gtk/main.c:1061 +#: ../gtk/main.c:1059 #, 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 szeretné Önt hozzáadni partnerlistájához.\n" -"Szeretné megengedni neki, hogy lássa az Ön jelenlétét, illetve hozzá " -"szeretné adni a partnerlistához?\n" -"Ha nemmel válaszol, ez a személy átmenetileg tiltólistára kerül." +msgstr "%s szeretné Önt hozzáadni partnerlistájához.\nSzeretné megengedni neki, hogy lássa az Ön jelenlétét, illetve hozzá szeretné adni a partnerlistához?\nHa nemmel válaszol, ez a személy átmenetileg tiltólistára kerül." -#: ../gtk/main.c:1138 +#: ../gtk/main.c:1136 #, c-format msgid "" "Please enter your password for username %s\n" " at realm %s:" msgstr "" -#: ../gtk/main.c:1259 +#: ../gtk/main.c:1257 msgid "Call error" msgstr "Hiba a hívás közben" -#: ../gtk/main.c:1262 ../coreapi/linphonecore.c:3791 +#: ../gtk/main.c:1260 ../coreapi/linphonecore.c:3826 msgid "Call ended" msgstr "Hívás vége" -#: ../gtk/main.c:1265 ../coreapi/call_log.c:221 +#: ../gtk/main.c:1263 ../coreapi/call_log.c:221 msgid "Incoming call" msgstr "Beérkező hívás" -#: ../gtk/main.c:1267 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5 +#: ../gtk/main.c:1265 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5 msgid "Answer" msgstr "Hívás fogadása" -#: ../gtk/main.c:1269 ../gtk/main.ui.h:6 +#: ../gtk/main.c:1267 ../gtk/main.ui.h:6 msgid "Decline" msgstr "Elutasítás" -#: ../gtk/main.c:1275 +#: ../gtk/main.c:1273 msgid "Call paused" msgstr "Hívás várakoztatva" -#: ../gtk/main.c:1275 +#: ../gtk/main.c:1273 #, c-format msgid "by %s" msgstr "a következő által: %s" -#: ../gtk/main.c:1345 +#: ../gtk/main.c:1343 #, c-format msgid "%s proposed to start video. Do you accept ?" msgstr "%s szerené elidítani a videót. Elfogadja?" -#: ../gtk/main.c:1507 +#: ../gtk/main.c:1505 msgid "Website link" msgstr "Internetes oldal" -#: ../gtk/main.c:1556 +#: ../gtk/main.c:1554 msgid "Linphone - a video internet phone" msgstr "Linphone - internetes videó telefon" -#: ../gtk/main.c:1648 +#: ../gtk/main.c:1646 #, c-format msgid "%s (Default)" msgstr "%s (Alapértelmezett)" -#: ../gtk/main.c:1980 ../coreapi/callbacks.c:1045 +#: ../gtk/main.c:1978 ../coreapi/callbacks.c:1057 #, c-format msgid "We are transferred to %s" msgstr "Át vagyunk irányítva ide: %s" -#: ../gtk/main.c:1990 +#: ../gtk/main.c:1988 msgid "" "No sound cards have been detected on this computer.\n" "You won't be able to send or receive audio calls." -msgstr "" -"Hangkártya nincs érzékelve ezen a számítógépen.\n" -"Nem fog tudni hang hívásokat küldeni vagy fogadni." +msgstr "Hangkártya nincs érzékelve ezen a számítógépen.\nNem fog tudni hang hívásokat küldeni vagy fogadni." -#: ../gtk/main.c:2135 +#: ../gtk/main.c:2136 msgid "A free SIP video-phone" msgstr "Egy ingyenes SIP video-telefon" +#: ../gtk/main.c:2241 +#, c-format +msgid "Hello\n" +msgstr "" + #: ../gtk/friendlist.c:505 msgid "Add to addressbook" msgstr "Hozzáadás címjegyzékhez" @@ -246,6 +232,10 @@ msgstr "Csevegés" msgid "Search in %s directory" msgstr "Keresés ebben a könyvtárban: %s" +#: ../gtk/friendlist.c:924 +msgid "Invalid sip contact !" +msgstr "Érvénytelen sip partner !" + #: ../gtk/friendlist.c:976 #, c-format msgid "Edit contact '%s'" @@ -286,7 +276,7 @@ msgstr "Paraméterek" msgid "Enabled" msgstr "Engedélyezve" -#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763 ../gtk/parameters.ui.h:20 +#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763 ../gtk/parameters.ui.h:17 msgid "Disabled" msgstr "Tiltva" @@ -369,9 +359,7 @@ msgstr "" #: ../gtk/propertybox.c:1156 msgid "" "You need to restart linphone for the new language selection to take effect." -msgstr "" -"Újra kell indítania a linphone-t, hogy az új nyelv kiválasztása érvényre " -"jusson. " +msgstr "Újra kell indítania a linphone-t, hogy az új nyelv kiválasztása érvényre jusson. " #: ../gtk/propertybox.c:1236 msgid "None" @@ -394,9 +382,7 @@ msgstr "ZRTP" msgid "" "A more recent version is availalble from %s.\n" "Would you like to open a browser to download it ?" -msgstr "" -"Elérhető egy újabb verzió a következőn: %s.\n" -"Szeretné, hogy a letöltéshez egy új böngésző ablak nyíljon?" +msgstr "Elérhető egy újabb verzió a következőn: %s.\nSzeretné, hogy a letöltéshez egy új böngésző ablak nyíljon?" #: ../gtk/update.c:91 msgid "You are running the lastest version." @@ -455,7 +441,7 @@ msgstr "" msgid "Enter your linphone.org username" msgstr "Adja meg linphone.org felhasználónevét" -#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:82 ../gtk/ldap.ui.h:4 +#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:81 ../gtk/ldap.ui.h:4 msgid "Username:" msgstr "Felhasználónév:" @@ -511,10 +497,7 @@ msgstr "" msgid "" "Error, account not validated, username already used or server unreachable.\n" "Please go back and try again." -msgstr "" -"Hiba, a fiók nincs érvényesítve. Valaki már használja ezt a felhasználónevet " -"vagy a kiszolgáló nem elérhető.\n" -"Kérjük, lépjen vissza és próbálja újra." +msgstr "Hiba, a fiók nincs érvényesítve. Valaki már használja ezt a felhasználónevet vagy a kiszolgáló nem elérhető.\nKérjük, lépjen vissza és próbálja újra." #: ../gtk/setupwizard.c:405 msgid "Thank you. Your account is now configured and ready for use." @@ -522,13 +505,9 @@ msgstr "Köszönjük! Az Ön fiókját beállítottuk és használatra kész." #: ../gtk/setupwizard.c:413 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 "" -"Kérjük, érvényesítse fiókját az általunk elektronikus levélben küldött " -"hivatkozásra kattintva.\n" -"Azután térjen vissza ide és kattintson a Következő gombra." +msgstr "Kérjük, érvényesítse fiókját az általunk elektronikus levélben küldött hivatkozásra kattintva.\nAzután térjen vissza ide és kattintson a Következő gombra." #: ../gtk/setupwizard.c:602 msgid "SIP account configuration assistant" @@ -633,9 +612,7 @@ msgstr "közvetlen vagy kiszolgálón keresztül" msgid "" "download: %f\n" "upload: %f (kbit/s)" -msgstr "" -"letöltés: %f\n" -"feltöltés: %f (kbit/mp)" +msgstr "letöltés: %f\nfeltöltés: %f (kbit/mp)" #: ../gtk/incall_view.c:272 ../gtk/incall_view.c:274 #, c-format @@ -749,9 +726,7 @@ msgstr "Várakoztatás" msgid "" "Recording into\n" "%s %s" -msgstr "" -"Felvétel a következőbe\n" -"%s %s" +msgstr "Felvétel a következőbe\n%s %s" #: ../gtk/incall_view.c:954 msgid "(Paused)" @@ -854,7 +829,7 @@ msgstr "" msgid "Audio Assistant" msgstr "" -#: ../gtk/audio_assistant.c:513 ../gtk/main.ui.h:31 +#: ../gtk/audio_assistant.c:513 ../gtk/main.ui.h:32 msgid "Audio assistant" msgstr "" @@ -931,105 +906,105 @@ msgid "Default" msgstr "Alapértelmezett" #: ../gtk/main.ui.h:22 +msgid "Delete" +msgstr "Törlés" + +#: ../gtk/main.ui.h:23 msgid "_Options" msgstr "_Beállítások" -#: ../gtk/main.ui.h:23 +#: ../gtk/main.ui.h:24 msgid "Set configuration URI" msgstr "" -#: ../gtk/main.ui.h:24 +#: ../gtk/main.ui.h:25 msgid "Always start video" msgstr "Videó indítása mindig" -#: ../gtk/main.ui.h:25 +#: ../gtk/main.ui.h:26 msgid "Enable self-view" msgstr "Saját nézet" -#: ../gtk/main.ui.h:26 +#: ../gtk/main.ui.h:27 msgid "_Help" msgstr "_Segítség" -#: ../gtk/main.ui.h:27 +#: ../gtk/main.ui.h:28 msgid "Show debug window" msgstr "Hibakeresési ablak mutatása" -#: ../gtk/main.ui.h:28 +#: ../gtk/main.ui.h:29 msgid "_Homepage" msgstr "_Honlap" -#: ../gtk/main.ui.h:29 +#: ../gtk/main.ui.h:30 msgid "Check _Updates" msgstr "Frissítések keresése" -#: ../gtk/main.ui.h:30 +#: ../gtk/main.ui.h:31 msgid "Account assistant" msgstr "Fiók varázsló" -#: ../gtk/main.ui.h:32 +#: ../gtk/main.ui.h:33 msgid "SIP address or phone number:" msgstr "Adja meg a SIP címet vagy a telefonszámot:" -#: ../gtk/main.ui.h:33 +#: ../gtk/main.ui.h:34 msgid "Initiate a new call" msgstr "Új hívás kezdeményezése" -#: ../gtk/main.ui.h:34 +#: ../gtk/main.ui.h:35 msgid "Contacts" msgstr "Partnerek" -#: ../gtk/main.ui.h:35 +#: ../gtk/main.ui.h:36 msgid "Search" msgstr "Keresés" -#: ../gtk/main.ui.h:36 +#: ../gtk/main.ui.h:37 msgid "Add contacts from directory" msgstr "Partnerek hozzáadása könyvtárból" -#: ../gtk/main.ui.h:37 +#: ../gtk/main.ui.h:38 msgid "Add contact" msgstr "Partner hozzáadása" -#: ../gtk/main.ui.h:38 +#: ../gtk/main.ui.h:39 msgid "Recent calls" msgstr "Legutóbbi hívások" -#: ../gtk/main.ui.h:39 +#: ../gtk/main.ui.h:40 msgid "My current identity:" msgstr "Jelenlegi identitásom:" -#: ../gtk/main.ui.h:40 ../gtk/tunnel_config.ui.h:7 +#: ../gtk/main.ui.h:41 ../gtk/tunnel_config.ui.h:7 msgid "Username" msgstr "Felhasználónév" -#: ../gtk/main.ui.h:41 ../gtk/tunnel_config.ui.h:8 +#: ../gtk/main.ui.h:42 ../gtk/tunnel_config.ui.h:8 msgid "Password" msgstr "Jelszó" -#: ../gtk/main.ui.h:42 +#: ../gtk/main.ui.h:43 msgid "Internet connection:" msgstr "Internet kapcsolat:" -#: ../gtk/main.ui.h:43 +#: ../gtk/main.ui.h:44 msgid "Automatically log me in" msgstr "Jelentkeztessen be automatikusan" -#: ../gtk/main.ui.h:44 ../gtk/password.ui.h:3 +#: ../gtk/main.ui.h:45 ../gtk/password.ui.h:3 msgid "UserID" msgstr "Felhasználó azonosító" -#: ../gtk/main.ui.h:45 +#: ../gtk/main.ui.h:46 msgid "Login information" msgstr "Bejelentkezési információ" -#: ../gtk/main.ui.h:46 +#: ../gtk/main.ui.h:47 msgid "Welcome!" msgstr "" -#: ../gtk/main.ui.h:47 -msgid "Delete" -msgstr "Törlés" - #: ../gtk/about.ui.h:1 msgid "About Linphone" msgstr "" @@ -1040,9 +1015,7 @@ msgstr "" #: ../gtk/about.ui.h:4 msgid "An internet video phone using the standard SIP (rfc3261) protocol." -msgstr "" -"Internetes videó telefon, mely a szabványos SIP (rfc3261) protokolt " -"használja." +msgstr "Internetes videó telefon, mely a szabványos SIP (rfc3261) protokolt használja." #: ../gtk/about.ui.h:5 msgid "" @@ -1205,301 +1178,307 @@ msgid "C" msgstr "C" #: ../gtk/parameters.ui.h:11 -msgid "SIP (UDP)" -msgstr "SIP (UDP)" - -#: ../gtk/parameters.ui.h:12 -msgid "SIP (TCP)" -msgstr "SIP (TCP)" - -#: ../gtk/parameters.ui.h:13 -msgid "SIP (TLS)" -msgstr "SIP (TLS)" - -#: ../gtk/parameters.ui.h:14 msgid "Settings" msgstr "Beállítások" -#: ../gtk/parameters.ui.h:15 +#: ../gtk/parameters.ui.h:12 msgid "Set Maximum Transmission Unit:" msgstr "Maximum Továbbítási Egység beállítása:" -#: ../gtk/parameters.ui.h:16 +#: ../gtk/parameters.ui.h:13 msgid "Send DTMFs as SIP info" msgstr "DTMF küldése SIP infóként" -#: ../gtk/parameters.ui.h:17 -msgid "Use IPv6 instead of IPv4" -msgstr "IPv6 használata IPv4 helyett" +#: ../gtk/parameters.ui.h:14 +msgid "Allow IPv6" +msgstr "" -#: ../gtk/parameters.ui.h:18 +#: ../gtk/parameters.ui.h:15 msgid "Transport" msgstr "Átvitel" -#: ../gtk/parameters.ui.h:19 +#: ../gtk/parameters.ui.h:16 msgid "SIP/UDP port" msgstr "" -#: ../gtk/parameters.ui.h:21 +#: ../gtk/parameters.ui.h:18 msgid "Random" msgstr "" -#: ../gtk/parameters.ui.h:22 +#: ../gtk/parameters.ui.h:19 msgid "SIP/TCP port" msgstr "" -#: ../gtk/parameters.ui.h:23 +#: ../gtk/parameters.ui.h:20 msgid "Audio RTP/UDP:" msgstr "Audió RTP/UDP:" -#: ../gtk/parameters.ui.h:24 +#: ../gtk/parameters.ui.h:21 msgid "Fixed" msgstr "Javítva" -#: ../gtk/parameters.ui.h:25 +#: ../gtk/parameters.ui.h:22 msgid "Video RTP/UDP:" msgstr "Videó RTP/UDP:" -#: ../gtk/parameters.ui.h:26 +#: ../gtk/parameters.ui.h:23 msgid "Media encryption type" msgstr "Média titkosítás típusa" -#: ../gtk/parameters.ui.h:27 +#: ../gtk/parameters.ui.h:24 msgid "Media encryption is mandatory" msgstr "Média titkosítás kötelező" -#: ../gtk/parameters.ui.h:28 +#: ../gtk/parameters.ui.h:25 msgid "Tunnel" msgstr "Alagút" -#: ../gtk/parameters.ui.h:29 +#: ../gtk/parameters.ui.h:26 msgid "DSCP fields" msgstr "DSCP mezők" -#: ../gtk/parameters.ui.h:30 +#: ../gtk/parameters.ui.h:27 msgid "Network protocol and ports" msgstr "Hálózati protokoll és port" -#: ../gtk/parameters.ui.h:31 +#: ../gtk/parameters.ui.h:28 msgid "Direct connection to the Internet" msgstr "Közvetlen Internet kapcsolat" -#: ../gtk/parameters.ui.h:32 +#: ../gtk/parameters.ui.h:29 msgid "Behind NAT / Firewall (specify gateway IP )" msgstr "" -#: ../gtk/parameters.ui.h:33 +#: ../gtk/parameters.ui.h:30 msgid "Behind NAT / Firewall (use STUN to resolve)" msgstr "NAT / tűzfal mögött (STUN használata a feloldáshoz)" -#: ../gtk/parameters.ui.h:34 +#: ../gtk/parameters.ui.h:31 msgid "Behind NAT / Firewall (use ICE)" msgstr "NAT / tűzfal mögött (ICE használata)" -#: ../gtk/parameters.ui.h:35 +#: ../gtk/parameters.ui.h:32 msgid "Behind NAT / Firewall (use uPnP)" msgstr "NAT / tűzfal mögött (uPnP használata)" -#: ../gtk/parameters.ui.h:36 +#: ../gtk/parameters.ui.h:33 msgid "Public IP address:" msgstr "Publikus IP cím:" -#: ../gtk/parameters.ui.h:37 +#: ../gtk/parameters.ui.h:34 msgid "Stun server:" msgstr "STUN kiszolgáló:" -#: ../gtk/parameters.ui.h:38 +#: ../gtk/parameters.ui.h:35 msgid "NAT and Firewall" msgstr "NAT és tűzfal" -#: ../gtk/parameters.ui.h:39 +#: ../gtk/parameters.ui.h:36 msgid "Network settings" msgstr "Hálózati beállítások" -#: ../gtk/parameters.ui.h:40 +#: ../gtk/parameters.ui.h:37 msgid "Ring sound:" msgstr "Csengőhang:" -#: ../gtk/parameters.ui.h:41 +#: ../gtk/parameters.ui.h:38 msgid "ALSA special device (optional):" msgstr "Különleges ALSA eszköz (nem kötelező):" -#: ../gtk/parameters.ui.h:42 +#: ../gtk/parameters.ui.h:39 msgid "Capture device:" msgstr "Felvevő hang eszköz:" -#: ../gtk/parameters.ui.h:43 +#: ../gtk/parameters.ui.h:40 msgid "Ring device:" msgstr "Csengőhang eszköz:" -#: ../gtk/parameters.ui.h:44 +#: ../gtk/parameters.ui.h:41 msgid "Playback device:" msgstr "Lejátszó hang eszköz:" -#: ../gtk/parameters.ui.h:45 +#: ../gtk/parameters.ui.h:42 msgid "Enable echo cancellation" msgstr "Visszhang-elnyomás engedélyezése" -#: ../gtk/parameters.ui.h:46 +#: ../gtk/parameters.ui.h:43 msgid "Audio" msgstr "Audió" -#: ../gtk/parameters.ui.h:47 +#: ../gtk/parameters.ui.h:44 msgid "Video input device:" msgstr "Videó bemeneti eszköz:" -#: ../gtk/parameters.ui.h:48 +#: ../gtk/parameters.ui.h:45 msgid "Prefered video resolution:" msgstr "Kívánt videó felbontás:" -#: ../gtk/parameters.ui.h:49 +#: ../gtk/parameters.ui.h:46 msgid "Video output method:" msgstr "" -#: ../gtk/parameters.ui.h:50 +#: ../gtk/parameters.ui.h:47 msgid "Show camera preview" msgstr "" -#: ../gtk/parameters.ui.h:51 +#: ../gtk/parameters.ui.h:48 msgid "Video" msgstr "Videó" -#: ../gtk/parameters.ui.h:52 +#: ../gtk/parameters.ui.h:49 msgid "Multimedia settings" msgstr "Multimédia beállítások" -#: ../gtk/parameters.ui.h:53 +#: ../gtk/parameters.ui.h:50 msgid "This section defines your SIP address when not using a SIP account" msgstr "Ez a rész határozza meg az Ön SIP címét, amikor nem használ SIP fiókot" -#: ../gtk/parameters.ui.h:54 +#: ../gtk/parameters.ui.h:51 msgid "Your display name (eg: John Doe):" msgstr "Az Ön megjelenített neve (pl. Kis József):" -#: ../gtk/parameters.ui.h:55 +#: ../gtk/parameters.ui.h:52 msgid "Your username:" msgstr "Az Ön felhasználóneve:" -#: ../gtk/parameters.ui.h:56 +#: ../gtk/parameters.ui.h:53 msgid "Your resulting SIP address:" msgstr "Az Ön így keletkezett SIP címe:" -#: ../gtk/parameters.ui.h:57 +#: ../gtk/parameters.ui.h:54 msgid "Default identity" msgstr "Alapértelmezett identitás" -#: ../gtk/parameters.ui.h:58 +#: ../gtk/parameters.ui.h:55 msgid "Wizard" msgstr "Varázsló" -#: ../gtk/parameters.ui.h:59 +#: ../gtk/parameters.ui.h:56 msgid "Add" msgstr "Hozzáadás" -#: ../gtk/parameters.ui.h:60 +#: ../gtk/parameters.ui.h:57 msgid "Edit" msgstr "Szerkesztés" -#: ../gtk/parameters.ui.h:61 +#: ../gtk/parameters.ui.h:58 msgid "Remove" msgstr "Eltávolítás" -#: ../gtk/parameters.ui.h:62 +#: ../gtk/parameters.ui.h:59 msgid "Proxy accounts" msgstr "Proxy fiókok" -#: ../gtk/parameters.ui.h:63 +#: ../gtk/parameters.ui.h:60 msgid "Erase all passwords" msgstr "Minden kulcsszó törlése" -#: ../gtk/parameters.ui.h:64 +#: ../gtk/parameters.ui.h:61 msgid "Privacy" msgstr "Titoktartás" -#: ../gtk/parameters.ui.h:65 +#: ../gtk/parameters.ui.h:62 +msgid "Automatically answer when a call is received" +msgstr "" + +#: ../gtk/parameters.ui.h:63 +msgid "Auto-answer" +msgstr "" + +#: ../gtk/parameters.ui.h:64 msgid "Manage SIP Accounts" msgstr "SIP fiókok beállítása" -#: ../gtk/parameters.ui.h:66 ../gtk/tunnel_config.ui.h:4 +#: ../gtk/parameters.ui.h:65 ../gtk/tunnel_config.ui.h:4 msgid "Enable" msgstr "Engedélyezés" -#: ../gtk/parameters.ui.h:67 ../gtk/tunnel_config.ui.h:5 +#: ../gtk/parameters.ui.h:66 ../gtk/tunnel_config.ui.h:5 msgid "Disable" msgstr "Tiltás" -#: ../gtk/parameters.ui.h:68 +#: ../gtk/parameters.ui.h:67 msgid "Codecs" msgstr "Kódekek" -#: ../gtk/parameters.ui.h:69 +#: ../gtk/parameters.ui.h:68 msgid "0 stands for \"unlimited\"" msgstr "A 0 jelentése \"végtelen\"" -#: ../gtk/parameters.ui.h:70 +#: ../gtk/parameters.ui.h:69 msgid "Upload speed limit in Kbit/sec:" msgstr "Feltöltési sebesség korlát (kbit/mp):" -#: ../gtk/parameters.ui.h:71 +#: ../gtk/parameters.ui.h:70 msgid "Download speed limit in Kbit/sec:" msgstr "Letöltési sebesség korlát (kbit/mp):" -#: ../gtk/parameters.ui.h:72 +#: ../gtk/parameters.ui.h:71 msgid "Enable adaptive rate control" msgstr "Alkalmazkodó mérték-szabályozás engedélyezése" -#: ../gtk/parameters.ui.h:73 +#: ../gtk/parameters.ui.h:72 msgid "" "Adaptive rate control is a technique to dynamically guess the available " "bandwidth during a call." -msgstr "" -"Az alkalmazkodó mérték-szabályozás egy módszer, mely erőteljesen próbálja " -"megállapítani a rendelkezésre álló sávszélességet hívás alatt." +msgstr "Az alkalmazkodó mérték-szabályozás egy módszer, mely erőteljesen próbálja megállapítani a rendelkezésre álló sávszélességet hívás alatt." -#: ../gtk/parameters.ui.h:74 +#: ../gtk/parameters.ui.h:73 msgid "Bandwidth control" msgstr "Sávszélesség szabályozása" -#: ../gtk/parameters.ui.h:75 +#: ../gtk/parameters.ui.h:74 msgid "Codecs" msgstr "Kódekek" -#: ../gtk/parameters.ui.h:76 +#: ../gtk/parameters.ui.h:75 msgid "Language" msgstr "Nyelv" -#: ../gtk/parameters.ui.h:77 +#: ../gtk/parameters.ui.h:76 msgid "Show advanced settings" msgstr "Haladó beállítások megjelenítése" -#: ../gtk/parameters.ui.h:78 +#: ../gtk/parameters.ui.h:77 msgid "Level" msgstr "Szint" -#: ../gtk/parameters.ui.h:79 +#: ../gtk/parameters.ui.h:78 msgid "User interface" msgstr "Felhasználói környezet" -#: ../gtk/parameters.ui.h:80 ../gtk/ldap.ui.h:2 +#: ../gtk/parameters.ui.h:79 ../gtk/ldap.ui.h:2 msgid "Server address:" msgstr "" -#: ../gtk/parameters.ui.h:81 ../gtk/ldap.ui.h:3 +#: ../gtk/parameters.ui.h:80 ../gtk/ldap.ui.h:3 msgid "Authentication method:" msgstr "" -#: ../gtk/parameters.ui.h:83 +#: ../gtk/parameters.ui.h:82 msgid "LDAP Account setup" msgstr "" -#: ../gtk/parameters.ui.h:84 +#: ../gtk/parameters.ui.h:83 msgid "LDAP" msgstr "" -#: ../gtk/parameters.ui.h:85 +#: ../gtk/parameters.ui.h:84 msgid "Done" msgstr "Kész" +#: ../gtk/parameters.ui.h:85 +msgid "SIP (UDP)" +msgstr "SIP (UDP)" + +#: ../gtk/parameters.ui.h:86 +msgid "SIP (TCP)" +msgstr "SIP (TCP)" + +#: ../gtk/parameters.ui.h:87 +msgid "SIP (TLS)" +msgstr "SIP (TLS)" + #: ../gtk/buddylookup.ui.h:1 msgid "Search contacts in directory" msgstr "Partnerek keresése könyvtárban" @@ -1703,11 +1682,8 @@ msgstr "" #: ../gtk/config-uri.ui.h:2 msgid "" -"This dialog allows to set an http or https address when configuration is to " -"be fetched at startup.\n" -"Please enter or modify the configuration URI below. After clicking OK, " -"Linphone will restart automatically in order to fetch and take into account " -"the new configuration. " +"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n" +"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. " msgstr "" #: ../gtk/provisioning-fetch.ui.h:1 @@ -1718,60 +1694,60 @@ msgstr "" msgid "Please wait while fetching configuration from server..." msgstr "" -#: ../coreapi/linphonecore.c:1512 +#: ../coreapi/linphonecore.c:1534 msgid "Ready" msgstr "Kész" -#: ../coreapi/linphonecore.c:2499 +#: ../coreapi/linphonecore.c:2534 msgid "Configuring" msgstr "" -#: ../coreapi/linphonecore.c:2673 +#: ../coreapi/linphonecore.c:2708 msgid "Looking for telephone number destination..." msgstr "Telefonszám-cél keresése..." -#: ../coreapi/linphonecore.c:2675 +#: ../coreapi/linphonecore.c:2710 msgid "Could not resolve this number." msgstr "Nem sikkerült értelmezni a számot." #. must be known at that time -#: ../coreapi/linphonecore.c:2961 +#: ../coreapi/linphonecore.c:2996 msgid "Contacting" msgstr "Kapcsolódás" -#: ../coreapi/linphonecore.c:2966 +#: ../coreapi/linphonecore.c:3001 msgid "Could not call" msgstr "Nem sikerült hívni" -#: ../coreapi/linphonecore.c:3116 +#: ../coreapi/linphonecore.c:3152 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:3274 +#: ../coreapi/linphonecore.c:3310 msgid "is contacting you" msgstr "kapcsolatba lépett veled." -#: ../coreapi/linphonecore.c:3275 +#: ../coreapi/linphonecore.c:3311 msgid " and asked autoanswer." msgstr "és automatikus választ kért." -#: ../coreapi/linphonecore.c:3399 +#: ../coreapi/linphonecore.c:3435 msgid "Modifying call parameters..." msgstr "A hívási jellemzők módosítása..." -#: ../coreapi/linphonecore.c:3747 +#: ../coreapi/linphonecore.c:3782 msgid "Connected." msgstr "Kapcsolódva." -#: ../coreapi/linphonecore.c:3772 +#: ../coreapi/linphonecore.c:3807 msgid "Call aborted" msgstr "Hívás megszakítva" -#: ../coreapi/linphonecore.c:3962 +#: ../coreapi/linphonecore.c:3997 msgid "Could not pause the call" msgstr "Nem sikerült várakoztatni a hívást" -#: ../coreapi/linphonecore.c:3965 +#: ../coreapi/linphonecore.c:4000 msgid "Pausing the current call..." msgstr "Jelenlegi hívás várakoztatásának aktiválása..." @@ -1839,131 +1815,125 @@ msgstr "" msgid "" "The sip proxy address you entered is invalid, it must start with \"sip:\" " "followed by a hostname." -msgstr "" -"Az Ön által megadott SIP proxy cím érvénytelen. \"sip:\"-tal kell kezdődnie, " -"ezt egy hosztnév követi." +msgstr "Az Ön által megadott SIP proxy cím érvénytelen. \"sip:\"-tal kell kezdődnie, ezt egy hosztnév követi." #: ../coreapi/proxy.c:334 msgid "" "The sip identity you entered is invalid.\n" "It should look like sip:username@proxydomain, such as sip:alice@example.net" -msgstr "" -"Az Ön által megadott SIP identitás érvénytelen.\n" -"Így kéne kinéznie: sip:felhasznalonev@proxytartomany, például sip:" -"aladar@pelda.hu" +msgstr "Az Ön által megadott SIP identitás érvénytelen.\nÍgy kéne kinéznie: sip:felhasznalonev@proxytartomany, például sip:aladar@pelda.hu" -#: ../coreapi/proxy.c:1403 +#: ../coreapi/proxy.c:1416 #, c-format msgid "Could not login as %s" msgstr "Nem sikerült belépni ezzel: %s" -#: ../coreapi/callbacks.c:419 +#: ../coreapi/callbacks.c:428 msgid "Remote ringing." msgstr "Távoli csengés." -#: ../coreapi/callbacks.c:431 +#: ../coreapi/callbacks.c:440 msgid "Remote ringing..." msgstr "Távoli csengés..." -#: ../coreapi/callbacks.c:448 +#: ../coreapi/callbacks.c:461 msgid "Early media." msgstr "Korai médiák." -#: ../coreapi/callbacks.c:521 +#: ../coreapi/callbacks.c:533 #, c-format msgid "Call with %s is paused." msgstr "A hívás a következővel: %s várakoztatva" -#: ../coreapi/callbacks.c:534 +#: ../coreapi/callbacks.c:546 #, c-format msgid "Call answered by %s - on hold." msgstr "%s fogadta a hívást - várakoztatva." -#: ../coreapi/callbacks.c:544 +#: ../coreapi/callbacks.c:556 msgid "Call resumed." msgstr "Hívás visszatért" -#: ../coreapi/callbacks.c:548 +#: ../coreapi/callbacks.c:560 #, c-format msgid "Call answered by %s." msgstr "%s válaszolt a hívásra." -#: ../coreapi/callbacks.c:571 +#: ../coreapi/callbacks.c:583 msgid "Incompatible, check codecs or security settings..." -msgstr "" -"Nem kompatibilis, ellenőrizze a kódek- vagy a biztonsági beállításokat..." +msgstr "Nem kompatibilis, ellenőrizze a kódek- vagy a biztonsági beállításokat..." -#: ../coreapi/callbacks.c:576 ../coreapi/callbacks.c:888 +#: ../coreapi/callbacks.c:588 ../coreapi/callbacks.c:900 msgid "Incompatible media parameters." msgstr "Nem kompatibilis médiajellemzők." -#: ../coreapi/callbacks.c:606 +#: ../coreapi/callbacks.c:618 msgid "We have been resumed." msgstr "Visszatértünk." #. we are being paused -#: ../coreapi/callbacks.c:614 +#: ../coreapi/callbacks.c:626 msgid "We are paused by other party." msgstr "Megállítva a másik fél által." #. reINVITE and in-dialogs UPDATE go here -#: ../coreapi/callbacks.c:648 +#: ../coreapi/callbacks.c:660 msgid "Call is updated by remote." msgstr "A hívás távolról frissítve." -#: ../coreapi/callbacks.c:764 +#: ../coreapi/callbacks.c:776 msgid "Call terminated." msgstr "A hívás befejezve." -#: ../coreapi/callbacks.c:792 +#: ../coreapi/callbacks.c:804 msgid "User is busy." msgstr "A felhasználó foglalt." -#: ../coreapi/callbacks.c:793 +#: ../coreapi/callbacks.c:805 msgid "User is temporarily unavailable." msgstr "A felhasználó ideiglenesen nem elérhető" #. char *retrymsg=_("%s. Retry after %i minute(s)."); -#: ../coreapi/callbacks.c:795 +#: ../coreapi/callbacks.c:807 msgid "User does not want to be disturbed." msgstr "A felhasználó nem akarja, hogy zavarják." -#: ../coreapi/callbacks.c:796 +#: ../coreapi/callbacks.c:808 msgid "Call declined." msgstr "Hívás elutasítva" -#: ../coreapi/callbacks.c:811 +#: ../coreapi/callbacks.c:823 msgid "Request timeout." msgstr "" -#: ../coreapi/callbacks.c:842 +#: ../coreapi/callbacks.c:854 msgid "Redirected" msgstr "Átirányítva" -#: ../coreapi/callbacks.c:897 +#: ../coreapi/callbacks.c:909 msgid "Call failed." msgstr "Nem sikerült a hívás." -#: ../coreapi/callbacks.c:975 +#: ../coreapi/callbacks.c:987 #, c-format msgid "Registration on %s successful." msgstr "A regisztáció a %s -n sikerült." -#: ../coreapi/callbacks.c:976 +#: ../coreapi/callbacks.c:988 #, c-format msgid "Unregistration on %s done." msgstr "A kiregisztrálás kész a következőn: %s ." -#: ../coreapi/callbacks.c:994 +#: ../coreapi/callbacks.c:1006 msgid "no response timeout" msgstr "időtúllépés után nincs válasz" -#: ../coreapi/callbacks.c:997 +#: ../coreapi/callbacks.c:1009 #, c-format msgid "Registration on %s failed: %s" msgstr "A regisztáció a %s -n nem sikerült: %s" -#: ../coreapi/callbacks.c:1004 +#: ../coreapi/callbacks.c:1016 msgid "Service unavailable, retrying" msgstr "" @@ -1973,7 +1943,11 @@ msgstr "" msgid "Authentication token is %s" msgstr "Hitelesítési jel: %s" -#: ../coreapi/linphonecall.c:3600 +#: ../coreapi/linphonecall.c:1305 +msgid "Call parameters were successfully modified." +msgstr "" + +#: ../coreapi/linphonecall.c:3659 #, c-format msgid "You have missed %i call." msgid_plural "You have missed %i calls." diff --git a/po/it.po b/po/it.po index d9fb54e86..6c369ce0a 100644 --- a/po/it.po +++ b/po/it.po @@ -1,22 +1,20 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: msgid "" msgstr "" "Project-Id-Version: linphone-gtk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-11 16:26+0100\n" -"PO-Revision-Date: 2015-02-17 11:28+0000\n" -"Last-Translator: Belledonne Communications \n" -"Language-Team: Italian (http://www.transifex.com/projects/p/linphone-gtk/" -"language/it/)\n" -"Language: it\n" +"POT-Creation-Date: 2015-03-27 14:40+0100\n" +"PO-Revision-Date: 2015-03-27 13:40+0000\n" +"Last-Translator: Belledonne Communications \n" +"Language-Team: Italian (http://www.transifex.com/projects/p/linphone-gtk/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974 @@ -89,133 +87,126 @@ msgstr "" msgid "Couldn't find pixmap file: %s" msgstr "" -#: ../gtk/chat.c:374 ../gtk/friendlist.c:924 -msgid "Invalid sip contact !" -msgstr "Contatto SIP non valido" - -#: ../gtk/main.c:137 +#: ../gtk/main.c:136 msgid "log to stdout some debug information while running." msgstr "" -#: ../gtk/main.c:138 +#: ../gtk/main.c:137 msgid "path to a file to write logs into." msgstr "" -#: ../gtk/main.c:139 +#: ../gtk/main.c:138 msgid "Start linphone with video disabled." msgstr "" -#: ../gtk/main.c:140 +#: ../gtk/main.c:139 msgid "Start only in the system tray, do not show the main interface." msgstr "" -#: ../gtk/main.c:141 +#: ../gtk/main.c:140 msgid "address to call right now" msgstr "" -#: ../gtk/main.c:142 -msgid "if set automatically answer incoming calls" -msgstr "" - -#: ../gtk/main.c:143 +#: ../gtk/main.c:141 msgid "" -"Specifiy a working directory (should be the base of the installation, eg: c:" -"\\Program Files\\Linphone)" +"Specifiy a working directory (should be the base of the installation, eg: " +"c:\\Program Files\\Linphone)" msgstr "" -#: ../gtk/main.c:144 +#: ../gtk/main.c:142 msgid "Configuration file" msgstr "" -#: ../gtk/main.c:145 +#: ../gtk/main.c:143 msgid "Run the audio assistant" msgstr "" -#: ../gtk/main.c:146 +#: ../gtk/main.c:144 msgid "Run self test and exit 0 if succeed" msgstr "" -#: ../gtk/main.c:1061 +#: ../gtk/main.c:1059 #, 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 voui aggiungere il tuo contatto alla sua listaVoui permettere che lui " -"veda il tuo stato o aggiungerlo alla tua lista dei contatti Se rispondi no " -"questo utente sarà momentaneamente bloccato." +msgstr "%s voui aggiungere il tuo contatto alla sua listaVoui permettere che lui veda il tuo stato o aggiungerlo alla tua lista dei contatti Se rispondi no questo utente sarà momentaneamente bloccato." -#: ../gtk/main.c:1138 +#: ../gtk/main.c:1136 #, c-format msgid "" "Please enter your password for username %s\n" " at realm %s:" msgstr "" -#: ../gtk/main.c:1259 +#: ../gtk/main.c:1257 msgid "Call error" msgstr "" -#: ../gtk/main.c:1262 ../coreapi/linphonecore.c:3791 +#: ../gtk/main.c:1260 ../coreapi/linphonecore.c:3826 msgid "Call ended" msgstr "Chiamata terminata" -#: ../gtk/main.c:1265 ../coreapi/call_log.c:221 +#: ../gtk/main.c:1263 ../coreapi/call_log.c:221 msgid "Incoming call" msgstr "Chimata in entrata" -#: ../gtk/main.c:1267 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5 +#: ../gtk/main.c:1265 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5 msgid "Answer" msgstr "" -#: ../gtk/main.c:1269 ../gtk/main.ui.h:6 +#: ../gtk/main.c:1267 ../gtk/main.ui.h:6 msgid "Decline" msgstr "Rifiuta" -#: ../gtk/main.c:1275 +#: ../gtk/main.c:1273 msgid "Call paused" msgstr "" -#: ../gtk/main.c:1275 +#: ../gtk/main.c:1273 #, c-format msgid "by %s" msgstr "" -#: ../gtk/main.c:1345 +#: ../gtk/main.c:1343 #, c-format msgid "%s proposed to start video. Do you accept ?" msgstr "" -#: ../gtk/main.c:1507 +#: ../gtk/main.c:1505 msgid "Website link" msgstr "" -#: ../gtk/main.c:1556 +#: ../gtk/main.c:1554 msgid "Linphone - a video internet phone" msgstr "" -#: ../gtk/main.c:1648 +#: ../gtk/main.c:1646 #, c-format msgid "%s (Default)" msgstr "%s (Default)" -#: ../gtk/main.c:1980 ../coreapi/callbacks.c:1045 +#: ../gtk/main.c:1978 ../coreapi/callbacks.c:1057 #, c-format msgid "We are transferred to %s" msgstr "" -#: ../gtk/main.c:1990 +#: ../gtk/main.c:1988 msgid "" "No sound cards have been detected on this computer.\n" "You won't be able to send or receive audio calls." msgstr "" -#: ../gtk/main.c:2135 +#: ../gtk/main.c:2136 msgid "A free SIP video-phone" msgstr "" +#: ../gtk/main.c:2241 +#, c-format +msgid "Hello\n" +msgstr "" + #: ../gtk/friendlist.c:505 msgid "Add to addressbook" msgstr "" @@ -241,6 +232,10 @@ msgstr "" msgid "Search in %s directory" msgstr "Cerca contatti nella directory %s" +#: ../gtk/friendlist.c:924 +msgid "Invalid sip contact !" +msgstr "Contatto SIP non valido" + #: ../gtk/friendlist.c:976 #, c-format msgid "Edit contact '%s'" @@ -281,7 +276,7 @@ msgstr "Parametri" msgid "Enabled" msgstr "Attivato" -#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763 ../gtk/parameters.ui.h:20 +#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763 ../gtk/parameters.ui.h:17 msgid "Disabled" msgstr "Disattivato" @@ -387,9 +382,7 @@ msgstr "" msgid "" "A more recent version is availalble from %s.\n" "Would you like to open a browser to download it ?" -msgstr "" -"Una versione più recente è disponibile da %s.\n" -"Vuoi aprire un browser per eseguire il download ?" +msgstr "Una versione più recente è disponibile da %s.\nVuoi aprire un browser per eseguire il download ?" #: ../gtk/update.c:91 msgid "You are running the lastest version." @@ -448,7 +441,7 @@ msgstr "" msgid "Enter your linphone.org username" msgstr "" -#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:82 ../gtk/ldap.ui.h:4 +#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:81 ../gtk/ldap.ui.h:4 msgid "Username:" msgstr "Manuale utente" @@ -512,8 +505,7 @@ msgstr "Grazie. Il tuo account è configurato e pronto all'uso" #: ../gtk/setupwizard.c:413 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 "" @@ -837,7 +829,7 @@ msgstr "" msgid "Audio Assistant" msgstr "" -#: ../gtk/audio_assistant.c:513 ../gtk/main.ui.h:31 +#: ../gtk/audio_assistant.c:513 ../gtk/main.ui.h:32 msgid "Audio assistant" msgstr "" @@ -914,103 +906,103 @@ msgid "Default" msgstr "Default" #: ../gtk/main.ui.h:22 -msgid "_Options" +msgid "Delete" msgstr "" #: ../gtk/main.ui.h:23 -msgid "Set configuration URI" +msgid "_Options" msgstr "" #: ../gtk/main.ui.h:24 -msgid "Always start video" +msgid "Set configuration URI" msgstr "" #: ../gtk/main.ui.h:25 +msgid "Always start video" +msgstr "" + +#: ../gtk/main.ui.h:26 msgid "Enable self-view" msgstr "Self-view abilitato" -#: ../gtk/main.ui.h:26 +#: ../gtk/main.ui.h:27 msgid "_Help" msgstr "" -#: ../gtk/main.ui.h:27 +#: ../gtk/main.ui.h:28 msgid "Show debug window" msgstr "" -#: ../gtk/main.ui.h:28 +#: ../gtk/main.ui.h:29 msgid "_Homepage" msgstr "" -#: ../gtk/main.ui.h:29 +#: ../gtk/main.ui.h:30 msgid "Check _Updates" msgstr "" -#: ../gtk/main.ui.h:30 +#: ../gtk/main.ui.h:31 msgid "Account assistant" msgstr "" -#: ../gtk/main.ui.h:32 +#: ../gtk/main.ui.h:33 msgid "SIP address or phone number:" msgstr "Indirizzo sip o numero." -#: ../gtk/main.ui.h:33 +#: ../gtk/main.ui.h:34 msgid "Initiate a new call" msgstr "" -#: ../gtk/main.ui.h:34 +#: ../gtk/main.ui.h:35 msgid "Contacts" msgstr "" -#: ../gtk/main.ui.h:35 +#: ../gtk/main.ui.h:36 msgid "Search" msgstr "" -#: ../gtk/main.ui.h:36 +#: ../gtk/main.ui.h:37 msgid "Add contacts from directory" msgstr "" -#: ../gtk/main.ui.h:37 +#: ../gtk/main.ui.h:38 msgid "Add contact" msgstr "" -#: ../gtk/main.ui.h:38 +#: ../gtk/main.ui.h:39 msgid "Recent calls" msgstr "" -#: ../gtk/main.ui.h:39 +#: ../gtk/main.ui.h:40 msgid "My current identity:" msgstr "Identità corrente" -#: ../gtk/main.ui.h:40 ../gtk/tunnel_config.ui.h:7 +#: ../gtk/main.ui.h:41 ../gtk/tunnel_config.ui.h:7 msgid "Username" msgstr "Username" -#: ../gtk/main.ui.h:41 ../gtk/tunnel_config.ui.h:8 +#: ../gtk/main.ui.h:42 ../gtk/tunnel_config.ui.h:8 msgid "Password" msgstr "Password" -#: ../gtk/main.ui.h:42 +#: ../gtk/main.ui.h:43 msgid "Internet connection:" msgstr "Connessione Internet:" -#: ../gtk/main.ui.h:43 +#: ../gtk/main.ui.h:44 msgid "Automatically log me in" msgstr "Login Automatico" -#: ../gtk/main.ui.h:44 ../gtk/password.ui.h:3 +#: ../gtk/main.ui.h:45 ../gtk/password.ui.h:3 msgid "UserID" msgstr "" -#: ../gtk/main.ui.h:45 +#: ../gtk/main.ui.h:46 msgid "Login information" msgstr "Credenziali di accesso" -#: ../gtk/main.ui.h:46 -msgid "Welcome!" -msgstr "" - #: ../gtk/main.ui.h:47 -msgid "Delete" +msgid "Welcome!" msgstr "" #: ../gtk/about.ui.h:1 @@ -1186,300 +1178,307 @@ msgid "C" msgstr "C" #: ../gtk/parameters.ui.h:11 -msgid "SIP (UDP)" -msgstr "" - -#: ../gtk/parameters.ui.h:12 -msgid "SIP (TCP)" -msgstr "" - -#: ../gtk/parameters.ui.h:13 -msgid "SIP (TLS)" -msgstr "" - -#: ../gtk/parameters.ui.h:14 msgid "Settings" msgstr "Preferenze" -#: ../gtk/parameters.ui.h:15 +#: ../gtk/parameters.ui.h:12 msgid "Set Maximum Transmission Unit:" msgstr "Imposta Maximum Transmission Unit:" -#: ../gtk/parameters.ui.h:16 +#: ../gtk/parameters.ui.h:13 msgid "Send DTMFs as SIP info" msgstr "Invia DTMF come SIP info" -#: ../gtk/parameters.ui.h:17 -msgid "Use IPv6 instead of IPv4" -msgstr "Usa IPv6 invece che IPv4" +#: ../gtk/parameters.ui.h:14 +msgid "Allow IPv6" +msgstr "" -#: ../gtk/parameters.ui.h:18 +#: ../gtk/parameters.ui.h:15 msgid "Transport" msgstr "Transporto" -#: ../gtk/parameters.ui.h:19 +#: ../gtk/parameters.ui.h:16 msgid "SIP/UDP port" msgstr "" -#: ../gtk/parameters.ui.h:21 +#: ../gtk/parameters.ui.h:18 msgid "Random" msgstr "" -#: ../gtk/parameters.ui.h:22 +#: ../gtk/parameters.ui.h:19 msgid "SIP/TCP port" msgstr "" -#: ../gtk/parameters.ui.h:23 +#: ../gtk/parameters.ui.h:20 msgid "Audio RTP/UDP:" msgstr "Audio RTP/UDP:" -#: ../gtk/parameters.ui.h:24 +#: ../gtk/parameters.ui.h:21 msgid "Fixed" msgstr "" -#: ../gtk/parameters.ui.h:25 +#: ../gtk/parameters.ui.h:22 msgid "Video RTP/UDP:" msgstr "Video RTP/UDP" -#: ../gtk/parameters.ui.h:26 +#: ../gtk/parameters.ui.h:23 msgid "Media encryption type" msgstr "" -#: ../gtk/parameters.ui.h:27 +#: ../gtk/parameters.ui.h:24 msgid "Media encryption is mandatory" msgstr "" -#: ../gtk/parameters.ui.h:28 +#: ../gtk/parameters.ui.h:25 msgid "Tunnel" msgstr "" -#: ../gtk/parameters.ui.h:29 +#: ../gtk/parameters.ui.h:26 msgid "DSCP fields" msgstr "" -#: ../gtk/parameters.ui.h:30 +#: ../gtk/parameters.ui.h:27 msgid "Network protocol and ports" msgstr "" -#: ../gtk/parameters.ui.h:31 +#: ../gtk/parameters.ui.h:28 msgid "Direct connection to the Internet" msgstr "Connessione diretta a internet" -#: ../gtk/parameters.ui.h:32 +#: ../gtk/parameters.ui.h:29 msgid "Behind NAT / Firewall (specify gateway IP )" msgstr "" -#: ../gtk/parameters.ui.h:33 +#: ../gtk/parameters.ui.h:30 msgid "Behind NAT / Firewall (use STUN to resolve)" msgstr "Dietro NAT / Firewall (utilizza STUN)" -#: ../gtk/parameters.ui.h:34 +#: ../gtk/parameters.ui.h:31 msgid "Behind NAT / Firewall (use ICE)" msgstr "" -#: ../gtk/parameters.ui.h:35 +#: ../gtk/parameters.ui.h:32 msgid "Behind NAT / Firewall (use uPnP)" msgstr "" -#: ../gtk/parameters.ui.h:36 +#: ../gtk/parameters.ui.h:33 msgid "Public IP address:" msgstr "Indirizzo ip pubblico:" -#: ../gtk/parameters.ui.h:37 +#: ../gtk/parameters.ui.h:34 msgid "Stun server:" msgstr "Stun server:" -#: ../gtk/parameters.ui.h:38 +#: ../gtk/parameters.ui.h:35 msgid "NAT and Firewall" msgstr "NAT and Firewall" -#: ../gtk/parameters.ui.h:39 +#: ../gtk/parameters.ui.h:36 msgid "Network settings" msgstr "Impostazioni di rete" -#: ../gtk/parameters.ui.h:40 +#: ../gtk/parameters.ui.h:37 msgid "Ring sound:" msgstr "Suoneria:" -#: ../gtk/parameters.ui.h:41 +#: ../gtk/parameters.ui.h:38 msgid "ALSA special device (optional):" msgstr "Dispositivo ALSA (optional):" -#: ../gtk/parameters.ui.h:42 +#: ../gtk/parameters.ui.h:39 msgid "Capture device:" msgstr "Dispositivo microfono:" -#: ../gtk/parameters.ui.h:43 +#: ../gtk/parameters.ui.h:40 msgid "Ring device:" msgstr "Dispositivo squillo:" -#: ../gtk/parameters.ui.h:44 +#: ../gtk/parameters.ui.h:41 msgid "Playback device:" msgstr "Dispositivo uscita audio:" -#: ../gtk/parameters.ui.h:45 +#: ../gtk/parameters.ui.h:42 msgid "Enable echo cancellation" msgstr "Attiva cancellazione eco" -#: ../gtk/parameters.ui.h:46 +#: ../gtk/parameters.ui.h:43 msgid "Audio" msgstr "Audio" -#: ../gtk/parameters.ui.h:47 +#: ../gtk/parameters.ui.h:44 msgid "Video input device:" msgstr "Dispositivo Video:" -#: ../gtk/parameters.ui.h:48 +#: ../gtk/parameters.ui.h:45 msgid "Prefered video resolution:" msgstr "Risoluzione video preferita" -#: ../gtk/parameters.ui.h:49 +#: ../gtk/parameters.ui.h:46 msgid "Video output method:" msgstr "" -#: ../gtk/parameters.ui.h:50 +#: ../gtk/parameters.ui.h:47 msgid "Show camera preview" msgstr "" -#: ../gtk/parameters.ui.h:51 +#: ../gtk/parameters.ui.h:48 msgid "Video" msgstr "Video" -#: ../gtk/parameters.ui.h:52 +#: ../gtk/parameters.ui.h:49 msgid "Multimedia settings" msgstr "Impostazioni multimediali" -#: ../gtk/parameters.ui.h:53 +#: ../gtk/parameters.ui.h:50 msgid "This section defines your SIP address when not using a SIP account" -msgstr "" -"questa sezione definisce il tuo indirizzo SIP se non hai account attivi" +msgstr "questa sezione definisce il tuo indirizzo SIP se non hai account attivi" -#: ../gtk/parameters.ui.h:54 +#: ../gtk/parameters.ui.h:51 msgid "Your display name (eg: John Doe):" msgstr "Nome visualizzato (es: Mario Rossi):" -#: ../gtk/parameters.ui.h:55 +#: ../gtk/parameters.ui.h:52 msgid "Your username:" msgstr "Username" -#: ../gtk/parameters.ui.h:56 +#: ../gtk/parameters.ui.h:53 msgid "Your resulting SIP address:" msgstr "Il tuo indirizzo sip:" -#: ../gtk/parameters.ui.h:57 +#: ../gtk/parameters.ui.h:54 msgid "Default identity" msgstr "Identità di default" -#: ../gtk/parameters.ui.h:58 +#: ../gtk/parameters.ui.h:55 msgid "Wizard" msgstr "" -#: ../gtk/parameters.ui.h:59 +#: ../gtk/parameters.ui.h:56 msgid "Add" msgstr "Aggiungi" -#: ../gtk/parameters.ui.h:60 +#: ../gtk/parameters.ui.h:57 msgid "Edit" msgstr "Edita" -#: ../gtk/parameters.ui.h:61 +#: ../gtk/parameters.ui.h:58 msgid "Remove" msgstr "Rimuovi" -#: ../gtk/parameters.ui.h:62 +#: ../gtk/parameters.ui.h:59 msgid "Proxy accounts" msgstr "Account proxy" -#: ../gtk/parameters.ui.h:63 +#: ../gtk/parameters.ui.h:60 msgid "Erase all passwords" msgstr "Cancella tutte le password" -#: ../gtk/parameters.ui.h:64 +#: ../gtk/parameters.ui.h:61 msgid "Privacy" msgstr "Privacy" -#: ../gtk/parameters.ui.h:65 +#: ../gtk/parameters.ui.h:62 +msgid "Automatically answer when a call is received" +msgstr "" + +#: ../gtk/parameters.ui.h:63 +msgid "Auto-answer" +msgstr "" + +#: ../gtk/parameters.ui.h:64 msgid "Manage SIP Accounts" msgstr "Gestici SIP Account" -#: ../gtk/parameters.ui.h:66 ../gtk/tunnel_config.ui.h:4 +#: ../gtk/parameters.ui.h:65 ../gtk/tunnel_config.ui.h:4 msgid "Enable" msgstr "Attivato" -#: ../gtk/parameters.ui.h:67 ../gtk/tunnel_config.ui.h:5 +#: ../gtk/parameters.ui.h:66 ../gtk/tunnel_config.ui.h:5 msgid "Disable" msgstr "Disattivato" -#: ../gtk/parameters.ui.h:68 +#: ../gtk/parameters.ui.h:67 msgid "Codecs" msgstr "Codecs" -#: ../gtk/parameters.ui.h:69 +#: ../gtk/parameters.ui.h:68 msgid "0 stands for \"unlimited\"" msgstr "0 sta per illimitato" -#: ../gtk/parameters.ui.h:70 +#: ../gtk/parameters.ui.h:69 msgid "Upload speed limit in Kbit/sec:" msgstr "Velocità massima in upload Kbit/sec:" -#: ../gtk/parameters.ui.h:71 +#: ../gtk/parameters.ui.h:70 msgid "Download speed limit in Kbit/sec:" msgstr "Velocita massima in Dowload Kbit/sec" -#: ../gtk/parameters.ui.h:72 +#: ../gtk/parameters.ui.h:71 msgid "Enable adaptive rate control" msgstr "" -#: ../gtk/parameters.ui.h:73 +#: ../gtk/parameters.ui.h:72 msgid "" "Adaptive rate control is a technique to dynamically guess the available " "bandwidth during a call." msgstr "" -#: ../gtk/parameters.ui.h:74 +#: ../gtk/parameters.ui.h:73 msgid "Bandwidth control" msgstr "Gestione banda" -#: ../gtk/parameters.ui.h:75 +#: ../gtk/parameters.ui.h:74 msgid "Codecs" msgstr "Codec" -#: ../gtk/parameters.ui.h:76 +#: ../gtk/parameters.ui.h:75 msgid "Language" msgstr "Linguaggio" -#: ../gtk/parameters.ui.h:77 +#: ../gtk/parameters.ui.h:76 msgid "Show advanced settings" msgstr "" -#: ../gtk/parameters.ui.h:78 +#: ../gtk/parameters.ui.h:77 msgid "Level" msgstr "" -#: ../gtk/parameters.ui.h:79 +#: ../gtk/parameters.ui.h:78 msgid "User interface" msgstr "Interfaccia utente" -#: ../gtk/parameters.ui.h:80 ../gtk/ldap.ui.h:2 +#: ../gtk/parameters.ui.h:79 ../gtk/ldap.ui.h:2 msgid "Server address:" msgstr "" -#: ../gtk/parameters.ui.h:81 ../gtk/ldap.ui.h:3 +#: ../gtk/parameters.ui.h:80 ../gtk/ldap.ui.h:3 msgid "Authentication method:" msgstr "" -#: ../gtk/parameters.ui.h:83 +#: ../gtk/parameters.ui.h:82 msgid "LDAP Account setup" msgstr "" -#: ../gtk/parameters.ui.h:84 +#: ../gtk/parameters.ui.h:83 msgid "LDAP" msgstr "" -#: ../gtk/parameters.ui.h:85 +#: ../gtk/parameters.ui.h:84 msgid "Done" msgstr "Fatto" +#: ../gtk/parameters.ui.h:85 +msgid "SIP (UDP)" +msgstr "" + +#: ../gtk/parameters.ui.h:86 +msgid "SIP (TCP)" +msgstr "" + +#: ../gtk/parameters.ui.h:87 +msgid "SIP (TLS)" +msgstr "" + #: ../gtk/buddylookup.ui.h:1 msgid "Search contacts in directory" msgstr "Cerca contatti nella directory" @@ -1683,11 +1682,8 @@ msgstr "" #: ../gtk/config-uri.ui.h:2 msgid "" -"This dialog allows to set an http or https address when configuration is to " -"be fetched at startup.\n" -"Please enter or modify the configuration URI below. After clicking OK, " -"Linphone will restart automatically in order to fetch and take into account " -"the new configuration. " +"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n" +"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. " msgstr "" #: ../gtk/provisioning-fetch.ui.h:1 @@ -1698,60 +1694,60 @@ msgstr "" msgid "Please wait while fetching configuration from server..." msgstr "" -#: ../coreapi/linphonecore.c:1512 +#: ../coreapi/linphonecore.c:1534 msgid "Ready" msgstr "Pronto" -#: ../coreapi/linphonecore.c:2499 +#: ../coreapi/linphonecore.c:2534 msgid "Configuring" msgstr "" -#: ../coreapi/linphonecore.c:2673 +#: ../coreapi/linphonecore.c:2708 msgid "Looking for telephone number destination..." msgstr "Ricerca numero destinazione..." -#: ../coreapi/linphonecore.c:2675 +#: ../coreapi/linphonecore.c:2710 msgid "Could not resolve this number." msgstr "Impossibile risolvere il numero." #. must be known at that time -#: ../coreapi/linphonecore.c:2961 +#: ../coreapi/linphonecore.c:2996 msgid "Contacting" msgstr "In connessione" -#: ../coreapi/linphonecore.c:2966 +#: ../coreapi/linphonecore.c:3001 msgid "Could not call" msgstr "" -#: ../coreapi/linphonecore.c:3116 +#: ../coreapi/linphonecore.c:3152 msgid "Sorry, we have reached the maximum number of simultaneous calls" msgstr "" -#: ../coreapi/linphonecore.c:3274 +#: ../coreapi/linphonecore.c:3310 msgid "is contacting you" msgstr "" -#: ../coreapi/linphonecore.c:3275 +#: ../coreapi/linphonecore.c:3311 msgid " and asked autoanswer." msgstr "" -#: ../coreapi/linphonecore.c:3399 +#: ../coreapi/linphonecore.c:3435 msgid "Modifying call parameters..." msgstr "" -#: ../coreapi/linphonecore.c:3747 +#: ../coreapi/linphonecore.c:3782 msgid "Connected." msgstr "Connessione" -#: ../coreapi/linphonecore.c:3772 +#: ../coreapi/linphonecore.c:3807 msgid "Call aborted" msgstr "" -#: ../coreapi/linphonecore.c:3962 +#: ../coreapi/linphonecore.c:3997 msgid "Could not pause the call" msgstr "" -#: ../coreapi/linphonecore.c:3965 +#: ../coreapi/linphonecore.c:4000 msgid "Pausing the current call..." msgstr "" @@ -1819,129 +1815,125 @@ msgstr "" msgid "" "The sip proxy address you entered is invalid, it must start with \"sip:\" " "followed by a hostname." -msgstr "" -"L'indirizzo sip proxy utilizzato è invalido, deve iniziare con \"sip:\" " -"seguito dall' hostaname." +msgstr "L'indirizzo sip proxy utilizzato è invalido, deve iniziare con \"sip:\" seguito dall' hostaname." #: ../coreapi/proxy.c:334 msgid "" "The sip identity you entered is invalid.\n" "It should look like sip:username@proxydomain, such as sip:alice@example.net" -msgstr "" -"L'identità sip utilizza è invalida.\n" -"Dovrebbre essere sip:username@proxydomain, esempio: sip:alice@example.net" +msgstr "L'identità sip utilizza è invalida.\nDovrebbre essere sip:username@proxydomain, esempio: sip:alice@example.net" -#: ../coreapi/proxy.c:1403 +#: ../coreapi/proxy.c:1416 #, c-format msgid "Could not login as %s" msgstr "impossibile login come %s" -#: ../coreapi/callbacks.c:419 +#: ../coreapi/callbacks.c:428 msgid "Remote ringing." msgstr "" -#: ../coreapi/callbacks.c:431 +#: ../coreapi/callbacks.c:440 msgid "Remote ringing..." msgstr "" -#: ../coreapi/callbacks.c:448 +#: ../coreapi/callbacks.c:461 msgid "Early media." msgstr "" -#: ../coreapi/callbacks.c:521 +#: ../coreapi/callbacks.c:533 #, c-format msgid "Call with %s is paused." msgstr "" -#: ../coreapi/callbacks.c:534 +#: ../coreapi/callbacks.c:546 #, c-format msgid "Call answered by %s - on hold." msgstr "" -#: ../coreapi/callbacks.c:544 +#: ../coreapi/callbacks.c:556 msgid "Call resumed." msgstr "" -#: ../coreapi/callbacks.c:548 +#: ../coreapi/callbacks.c:560 #, c-format msgid "Call answered by %s." msgstr "" -#: ../coreapi/callbacks.c:571 +#: ../coreapi/callbacks.c:583 msgid "Incompatible, check codecs or security settings..." msgstr "" -#: ../coreapi/callbacks.c:576 ../coreapi/callbacks.c:888 +#: ../coreapi/callbacks.c:588 ../coreapi/callbacks.c:900 msgid "Incompatible media parameters." msgstr "" -#: ../coreapi/callbacks.c:606 +#: ../coreapi/callbacks.c:618 msgid "We have been resumed." msgstr "" #. we are being paused -#: ../coreapi/callbacks.c:614 +#: ../coreapi/callbacks.c:626 msgid "We are paused by other party." msgstr "" #. reINVITE and in-dialogs UPDATE go here -#: ../coreapi/callbacks.c:648 +#: ../coreapi/callbacks.c:660 msgid "Call is updated by remote." msgstr "" -#: ../coreapi/callbacks.c:764 +#: ../coreapi/callbacks.c:776 msgid "Call terminated." msgstr "Chiamata terminata." -#: ../coreapi/callbacks.c:792 +#: ../coreapi/callbacks.c:804 msgid "User is busy." msgstr "Utente occupato" -#: ../coreapi/callbacks.c:793 +#: ../coreapi/callbacks.c:805 msgid "User is temporarily unavailable." msgstr "Utente non disponibile" #. char *retrymsg=_("%s. Retry after %i minute(s)."); -#: ../coreapi/callbacks.c:795 +#: ../coreapi/callbacks.c:807 msgid "User does not want to be disturbed." msgstr "L'utente non vuole essere disturbato" -#: ../coreapi/callbacks.c:796 +#: ../coreapi/callbacks.c:808 msgid "Call declined." msgstr "Chiamata rifiutata" -#: ../coreapi/callbacks.c:811 +#: ../coreapi/callbacks.c:823 msgid "Request timeout." msgstr "" -#: ../coreapi/callbacks.c:842 +#: ../coreapi/callbacks.c:854 msgid "Redirected" msgstr "" -#: ../coreapi/callbacks.c:897 +#: ../coreapi/callbacks.c:909 msgid "Call failed." msgstr "" -#: ../coreapi/callbacks.c:975 +#: ../coreapi/callbacks.c:987 #, c-format msgid "Registration on %s successful." msgstr "Registrazione su %s attiva" -#: ../coreapi/callbacks.c:976 +#: ../coreapi/callbacks.c:988 #, c-format msgid "Unregistration on %s done." msgstr "Unregistrazione su %s" -#: ../coreapi/callbacks.c:994 +#: ../coreapi/callbacks.c:1006 msgid "no response timeout" msgstr "timeout no risposta" -#: ../coreapi/callbacks.c:997 +#: ../coreapi/callbacks.c:1009 #, c-format msgid "Registration on %s failed: %s" msgstr "Registrazione su %s fallita: %s" -#: ../coreapi/callbacks.c:1004 +#: ../coreapi/callbacks.c:1016 msgid "Service unavailable, retrying" msgstr "" @@ -1951,7 +1943,11 @@ msgstr "" msgid "Authentication token is %s" msgstr "" -#: ../coreapi/linphonecall.c:3600 +#: ../coreapi/linphonecall.c:1305 +msgid "Call parameters were successfully modified." +msgstr "" + +#: ../coreapi/linphonecall.c:3659 #, c-format msgid "You have missed %i call." msgid_plural "You have missed %i calls." diff --git a/po/ja.po b/po/ja.po index 7a809c610..6b9b7e926 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Alexander, 2014 # Alexander, 2014-2015 @@ -9,16 +9,14 @@ msgid "" msgstr "" "Project-Id-Version: linphone-gtk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-11 16:26+0100\n" -"PO-Revision-Date: 2015-02-17 11:28+0000\n" -"Last-Translator: Belledonne Communications \n" -"Language-Team: Japanese (http://www.transifex.com/projects/p/linphone-gtk/" -"language/ja/)\n" -"Language: ja\n" +"POT-Creation-Date: 2015-03-27 14:40+0100\n" +"PO-Revision-Date: 2015-03-27 13:40+0000\n" +"Last-Translator: Belledonne Communications \n" +"Language-Team: Japanese (http://www.transifex.com/projects/p/linphone-gtk/language/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: ja\n" "Plural-Forms: nplurals=1; plural=0;\n" #: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974 @@ -69,9 +67,7 @@ msgstr[0] "%i 秒" msgid "" "%s\tQuality: %s\n" "%s\t%s\t" -msgstr "" -"%s⇥品質: %s\n" -"%s⇥%s⇥" +msgstr "%s⇥品質: %s\n%s⇥%s⇥" #: ../gtk/calllogs.c:341 #, c-format @@ -91,136 +87,126 @@ msgstr "自分" msgid "Couldn't find pixmap file: %s" msgstr "pixmapファイルが見つかりません %s" -#: ../gtk/chat.c:374 ../gtk/friendlist.c:924 -msgid "Invalid sip contact !" -msgstr "無効なSIP接続です！" - -#: ../gtk/main.c:137 +#: ../gtk/main.c:136 msgid "log to stdout some debug information while running." msgstr "実行中にいくつかのデバッグ情報をstdoutに送信します。" -#: ../gtk/main.c:138 +#: ../gtk/main.c:137 msgid "path to a file to write logs into." msgstr "ログを書き込むファイルへのパス。" -#: ../gtk/main.c:139 +#: ../gtk/main.c:138 msgid "Start linphone with video disabled." msgstr "ビデオを無効にしてLinphoneを開始します。" -#: ../gtk/main.c:140 +#: ../gtk/main.c:139 msgid "Start only in the system tray, do not show the main interface." msgstr "主なインターフェイスを表示しないでシステムトレイに移動します。" -#: ../gtk/main.c:141 +#: ../gtk/main.c:140 msgid "address to call right now" msgstr "今すぐに呼び出す" -#: ../gtk/main.c:142 -msgid "if set automatically answer incoming calls" -msgstr "着信呼び出しが設定されている場合自動的に応答する" - -#: ../gtk/main.c:143 +#: ../gtk/main.c:141 msgid "" -"Specifiy a working directory (should be the base of the installation, eg: c:" -"\\Program Files\\Linphone)" -msgstr "" -"作業ディレクトリをSpecifiy (インストールした時のベースである必要があります。" -"例:c:\\Program Files\\Linphone)" +"Specifiy a working directory (should be the base of the installation, eg: " +"c:\\Program Files\\Linphone)" +msgstr "作業ディレクトリをSpecifiy (インストールした時のベースである必要があります。例:c:\\Program Files\\Linphone)" -#: ../gtk/main.c:144 +#: ../gtk/main.c:142 msgid "Configuration file" msgstr "設定ファイル" -#: ../gtk/main.c:145 +#: ../gtk/main.c:143 msgid "Run the audio assistant" msgstr "オーディオアシスタントを実行" -#: ../gtk/main.c:146 +#: ../gtk/main.c:144 msgid "Run self test and exit 0 if succeed" msgstr "" -#: ../gtk/main.c:1061 +#: ../gtk/main.c:1059 #, 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 が連絡相手にあなたを追加しようとしています。\n" -"あなたのステータスを参照させるか、もしくは連絡先リストに追加することができま" -"す。\n" -"あなたが拒否すると、この人は一時的にブラックリストへ登録されます。" +msgstr "%s が連絡相手にあなたを追加しようとしています。\nあなたのステータスを参照させるか、もしくは連絡先リストに追加することができます。\nあなたが拒否すると、この人は一時的にブラックリストへ登録されます。" -#: ../gtk/main.c:1138 +#: ../gtk/main.c:1136 #, c-format msgid "" "Please enter your password for username %s\n" " at realm %s:" msgstr "" -#: ../gtk/main.c:1259 +#: ../gtk/main.c:1257 msgid "Call error" msgstr "呼出エラー" -#: ../gtk/main.c:1262 ../coreapi/linphonecore.c:3791 +#: ../gtk/main.c:1260 ../coreapi/linphonecore.c:3826 msgid "Call ended" msgstr "呼出終了" -#: ../gtk/main.c:1265 ../coreapi/call_log.c:221 +#: ../gtk/main.c:1263 ../coreapi/call_log.c:221 msgid "Incoming call" msgstr "着信" -#: ../gtk/main.c:1267 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5 +#: ../gtk/main.c:1265 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5 msgid "Answer" msgstr "応答" -#: ../gtk/main.c:1269 ../gtk/main.ui.h:6 +#: ../gtk/main.c:1267 ../gtk/main.ui.h:6 msgid "Decline" msgstr "拒否" -#: ../gtk/main.c:1275 +#: ../gtk/main.c:1273 msgid "Call paused" msgstr "呼び出しの一時停止" -#: ../gtk/main.c:1275 +#: ../gtk/main.c:1273 #, c-format msgid "by %s" msgstr "%s" -#: ../gtk/main.c:1345 +#: ../gtk/main.c:1343 #, c-format msgid "%s proposed to start video. Do you accept ?" msgstr "" -#: ../gtk/main.c:1507 +#: ../gtk/main.c:1505 msgid "Website link" msgstr "ウェブサイトリンク" -#: ../gtk/main.c:1556 +#: ../gtk/main.c:1554 msgid "Linphone - a video internet phone" msgstr "Linphone - ビデオインターネット電話" -#: ../gtk/main.c:1648 +#: ../gtk/main.c:1646 #, c-format msgid "%s (Default)" msgstr "%s (デフォルト)" -#: ../gtk/main.c:1980 ../coreapi/callbacks.c:1045 +#: ../gtk/main.c:1978 ../coreapi/callbacks.c:1057 #, c-format msgid "We are transferred to %s" msgstr "%s に転送しました" -#: ../gtk/main.c:1990 +#: ../gtk/main.c:1988 msgid "" "No sound cards have been detected on this computer.\n" "You won't be able to send or receive audio calls." msgstr "" -#: ../gtk/main.c:2135 +#: ../gtk/main.c:2136 msgid "A free SIP video-phone" msgstr "無料 SIP ビデオ-電話" +#: ../gtk/main.c:2241 +#, c-format +msgid "Hello\n" +msgstr "" + #: ../gtk/friendlist.c:505 msgid "Add to addressbook" msgstr "電話帳に追加する" @@ -246,6 +232,10 @@ msgstr "チャット" msgid "Search in %s directory" msgstr "%s のディレクトリ内を検索" +#: ../gtk/friendlist.c:924 +msgid "Invalid sip contact !" +msgstr "無効なSIP接続です！" + #: ../gtk/friendlist.c:976 #, c-format msgid "Edit contact '%s'" @@ -286,7 +276,7 @@ msgstr "パラメーター" msgid "Enabled" msgstr "使用する" -#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763 ../gtk/parameters.ui.h:20 +#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763 ../gtk/parameters.ui.h:17 msgid "Disabled" msgstr "使用しない" @@ -392,9 +382,7 @@ msgstr "ZRTP" msgid "" "A more recent version is availalble from %s.\n" "Would you like to open a browser to download it ?" -msgstr "" -"%s よりも新しいバージョンが利用可能です。\n" -"ダウンロードするために、ブラウザを開きますか？" +msgstr "%s よりも新しいバージョンが利用可能です。\nダウンロードするために、ブラウザを開きますか？" #: ../gtk/update.c:91 msgid "You are running the lastest version." @@ -430,9 +418,7 @@ msgstr[0] "%i 件発見" msgid "" "Welcome!\n" "This assistant will help you to use a SIP account for your calls." -msgstr "" -"ようこそ！\n" -"あなたの通話のためのSIPアカウント設定をお手伝いします。" +msgstr "ようこそ！\nあなたの通話のためのSIPアカウント設定をお手伝いします。" #: ../gtk/setupwizard.c:43 msgid "Create an account on linphone.org" @@ -454,7 +440,7 @@ msgstr "" msgid "Enter your linphone.org username" msgstr "linphone.orgで取得したユーザー名を入力" -#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:82 ../gtk/ldap.ui.h:4 +#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:81 ../gtk/ldap.ui.h:4 msgid "Username:" msgstr "ユーザー名:" @@ -514,18 +500,13 @@ msgstr "" #: ../gtk/setupwizard.c:405 msgid "Thank you. Your account is now configured and ready for use." -msgstr "" -"ありがとう。あなたのアカウントは無事に設定され、使用する準備ができました。" +msgstr "ありがとう。あなたのアカウントは無事に設定され、使用する準備ができました。" #: ../gtk/setupwizard.c:413 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 "" -"送信されたメールの本文内にあるリンクをクリックしてアカウントを有効にしてくだ" -"さい。\n" -"その後こちらへ戻って「次へ」を押してください。" +msgstr "送信されたメールの本文内にあるリンクをクリックしてアカウントを有効にしてください。\nその後こちらへ戻って「次へ」を押してください。" #: ../gtk/setupwizard.c:602 msgid "SIP account configuration assistant" @@ -630,9 +611,7 @@ msgstr "" msgid "" "download: %f\n" "upload: %f (kbit/s)" -msgstr "" -"ダウンロード： %f\n" -"アップロード： %f (kbit/s)" +msgstr "ダウンロード： %f\nアップロード： %f (kbit/s)" #: ../gtk/incall_view.c:272 ../gtk/incall_view.c:274 #, c-format @@ -849,7 +828,7 @@ msgstr "Linphoneをはじめる" msgid "Audio Assistant" msgstr "音声アシスタント" -#: ../gtk/audio_assistant.c:513 ../gtk/main.ui.h:31 +#: ../gtk/audio_assistant.c:513 ../gtk/main.ui.h:32 msgid "Audio assistant" msgstr "音声アシスタント" @@ -926,105 +905,105 @@ msgid "Default" msgstr "デフォルト" #: ../gtk/main.ui.h:22 +msgid "Delete" +msgstr "削除" + +#: ../gtk/main.ui.h:23 msgid "_Options" msgstr "_オプション" -#: ../gtk/main.ui.h:23 +#: ../gtk/main.ui.h:24 msgid "Set configuration URI" msgstr "" -#: ../gtk/main.ui.h:24 +#: ../gtk/main.ui.h:25 msgid "Always start video" msgstr "いつでもビデオをスタートする" -#: ../gtk/main.ui.h:25 +#: ../gtk/main.ui.h:26 msgid "Enable self-view" msgstr "セルフビューを有効にする" -#: ../gtk/main.ui.h:26 +#: ../gtk/main.ui.h:27 msgid "_Help" msgstr "_ヘルプ" -#: ../gtk/main.ui.h:27 +#: ../gtk/main.ui.h:28 msgid "Show debug window" msgstr "デバッグウインドウを見る" -#: ../gtk/main.ui.h:28 +#: ../gtk/main.ui.h:29 msgid "_Homepage" msgstr "_ホームページ" -#: ../gtk/main.ui.h:29 +#: ../gtk/main.ui.h:30 msgid "Check _Updates" msgstr "チェック _アップデート" -#: ../gtk/main.ui.h:30 +#: ../gtk/main.ui.h:31 msgid "Account assistant" msgstr "アカウントのアシスタント" -#: ../gtk/main.ui.h:32 +#: ../gtk/main.ui.h:33 msgid "SIP address or phone number:" msgstr "SIPアドレスもしくは電話番号：" -#: ../gtk/main.ui.h:33 +#: ../gtk/main.ui.h:34 msgid "Initiate a new call" msgstr "" -#: ../gtk/main.ui.h:34 +#: ../gtk/main.ui.h:35 msgid "Contacts" msgstr "" -#: ../gtk/main.ui.h:35 +#: ../gtk/main.ui.h:36 msgid "Search" msgstr "検索" -#: ../gtk/main.ui.h:36 +#: ../gtk/main.ui.h:37 msgid "Add contacts from directory" msgstr "" -#: ../gtk/main.ui.h:37 +#: ../gtk/main.ui.h:38 msgid "Add contact" msgstr "連絡相手に追加する" -#: ../gtk/main.ui.h:38 +#: ../gtk/main.ui.h:39 msgid "Recent calls" msgstr "" -#: ../gtk/main.ui.h:39 +#: ../gtk/main.ui.h:40 msgid "My current identity:" msgstr "" -#: ../gtk/main.ui.h:40 ../gtk/tunnel_config.ui.h:7 +#: ../gtk/main.ui.h:41 ../gtk/tunnel_config.ui.h:7 msgid "Username" msgstr "ユーザー名" -#: ../gtk/main.ui.h:41 ../gtk/tunnel_config.ui.h:8 +#: ../gtk/main.ui.h:42 ../gtk/tunnel_config.ui.h:8 msgid "Password" msgstr "パスワード" -#: ../gtk/main.ui.h:42 +#: ../gtk/main.ui.h:43 msgid "Internet connection:" msgstr "インターネット接続:" -#: ../gtk/main.ui.h:43 +#: ../gtk/main.ui.h:44 msgid "Automatically log me in" msgstr "自動的にログインする" -#: ../gtk/main.ui.h:44 ../gtk/password.ui.h:3 +#: ../gtk/main.ui.h:45 ../gtk/password.ui.h:3 msgid "UserID" msgstr "ユーザーID" -#: ../gtk/main.ui.h:45 +#: ../gtk/main.ui.h:46 msgid "Login information" msgstr "ログイン情報" -#: ../gtk/main.ui.h:46 +#: ../gtk/main.ui.h:47 msgid "Welcome!" msgstr "" -#: ../gtk/main.ui.h:47 -msgid "Delete" -msgstr "削除" - #: ../gtk/about.ui.h:1 msgid "About Linphone" msgstr "Linphoneについて" @@ -1035,9 +1014,7 @@ msgstr "(C) Belledonne Communications, 2010\n" #: ../gtk/about.ui.h:4 msgid "An internet video phone using the standard SIP (rfc3261) protocol." -msgstr "" -"インターネットによる動画送信には標準的なSIPプロトコル (rfc3261) を使用してい" -"ます。" +msgstr "インターネットによる動画送信には標準的なSIPプロトコル (rfc3261) を使用しています。" #: ../gtk/about.ui.h:5 msgid "" @@ -1053,19 +1030,7 @@ msgid "" "cs: Petr Pisar \n" "hu: anonymous\n" "he: Eli Zaretskii \n" -msgstr "" -"fr: Simon Morlat\n" -"en: Simon Morlat and Delphine Perreau\n" -"it: Alberto Zanoni \n" -"de: Jean-Jacques Sarton \n" -"sv: Daniel Nylander \n" -"es: Jesus Benitez \n" -"ja: YAMAGUCHI YOSHIYA \n" -"pt_BR: Rafael Caesar Lenzi \n" -"pl: Robert Nasiadek \n" -"cs: Petr Pisar \n" -"hu: anonymous\n" -"he: Eli Zaretskii \n" +msgstr "fr: Simon Morlat\nen: Simon Morlat and Delphine Perreau\nit: Alberto Zanoni \nde: Jean-Jacques Sarton \nsv: Daniel Nylander \nes: Jesus Benitez \nja: YAMAGUCHI YOSHIYA \npt_BR: Rafael Caesar Lenzi \npl: Robert Nasiadek \ncs: Petr Pisar \nhu: anonymous\nhe: Eli Zaretskii \n" #: ../gtk/contact.ui.h:2 msgid "SIP Address" @@ -1212,299 +1177,307 @@ msgid "C" msgstr "C" #: ../gtk/parameters.ui.h:11 -msgid "SIP (UDP)" -msgstr "SIP (UDP)" - -#: ../gtk/parameters.ui.h:12 -msgid "SIP (TCP)" -msgstr "SIP (TCP)" - -#: ../gtk/parameters.ui.h:13 -msgid "SIP (TLS)" -msgstr "SIP (TLS)" - -#: ../gtk/parameters.ui.h:14 msgid "Settings" msgstr "設定" -#: ../gtk/parameters.ui.h:15 +#: ../gtk/parameters.ui.h:12 msgid "Set Maximum Transmission Unit:" msgstr "" -#: ../gtk/parameters.ui.h:16 +#: ../gtk/parameters.ui.h:13 msgid "Send DTMFs as SIP info" msgstr "DTMFをSIP情報で送信する" -#: ../gtk/parameters.ui.h:17 -msgid "Use IPv6 instead of IPv4" -msgstr "IPv4ではなくIPv6を使用する" +#: ../gtk/parameters.ui.h:14 +msgid "Allow IPv6" +msgstr "" -#: ../gtk/parameters.ui.h:18 +#: ../gtk/parameters.ui.h:15 msgid "Transport" msgstr "転送" -#: ../gtk/parameters.ui.h:19 +#: ../gtk/parameters.ui.h:16 msgid "SIP/UDP port" msgstr "SIP/UDP ポート" -#: ../gtk/parameters.ui.h:21 +#: ../gtk/parameters.ui.h:18 msgid "Random" msgstr "" -#: ../gtk/parameters.ui.h:22 +#: ../gtk/parameters.ui.h:19 msgid "SIP/TCP port" msgstr "SIP/TCP ポート" -#: ../gtk/parameters.ui.h:23 +#: ../gtk/parameters.ui.h:20 msgid "Audio RTP/UDP:" msgstr "オーディオ RTP/UDP:" -#: ../gtk/parameters.ui.h:24 +#: ../gtk/parameters.ui.h:21 msgid "Fixed" msgstr "" -#: ../gtk/parameters.ui.h:25 +#: ../gtk/parameters.ui.h:22 msgid "Video RTP/UDP:" msgstr "ビデオ RTP/UDP:" -#: ../gtk/parameters.ui.h:26 +#: ../gtk/parameters.ui.h:23 msgid "Media encryption type" msgstr "メディアの暗号化の種類" -#: ../gtk/parameters.ui.h:27 +#: ../gtk/parameters.ui.h:24 msgid "Media encryption is mandatory" msgstr "" -#: ../gtk/parameters.ui.h:28 +#: ../gtk/parameters.ui.h:25 msgid "Tunnel" msgstr "トンネル" -#: ../gtk/parameters.ui.h:29 +#: ../gtk/parameters.ui.h:26 msgid "DSCP fields" msgstr "DSCP値" -#: ../gtk/parameters.ui.h:30 +#: ../gtk/parameters.ui.h:27 msgid "Network protocol and ports" msgstr "ネットワークのプロトコルとポート" -#: ../gtk/parameters.ui.h:31 +#: ../gtk/parameters.ui.h:28 msgid "Direct connection to the Internet" msgstr "" -#: ../gtk/parameters.ui.h:32 +#: ../gtk/parameters.ui.h:29 msgid "Behind NAT / Firewall (specify gateway IP )" msgstr "" -#: ../gtk/parameters.ui.h:33 +#: ../gtk/parameters.ui.h:30 msgid "Behind NAT / Firewall (use STUN to resolve)" msgstr "" -#: ../gtk/parameters.ui.h:34 +#: ../gtk/parameters.ui.h:31 msgid "Behind NAT / Firewall (use ICE)" msgstr "" -#: ../gtk/parameters.ui.h:35 +#: ../gtk/parameters.ui.h:32 msgid "Behind NAT / Firewall (use uPnP)" msgstr "" -#: ../gtk/parameters.ui.h:36 +#: ../gtk/parameters.ui.h:33 msgid "Public IP address:" msgstr "パブリック IP アドレス:" -#: ../gtk/parameters.ui.h:37 +#: ../gtk/parameters.ui.h:34 msgid "Stun server:" msgstr "Stunサーバー:" -#: ../gtk/parameters.ui.h:38 +#: ../gtk/parameters.ui.h:35 msgid "NAT and Firewall" msgstr "NAT と ファイヤーウォール" -#: ../gtk/parameters.ui.h:39 +#: ../gtk/parameters.ui.h:36 msgid "Network settings" msgstr "ネットワーク設定" -#: ../gtk/parameters.ui.h:40 +#: ../gtk/parameters.ui.h:37 msgid "Ring sound:" msgstr "鳴動音:" -#: ../gtk/parameters.ui.h:41 +#: ../gtk/parameters.ui.h:38 msgid "ALSA special device (optional):" msgstr "" -#: ../gtk/parameters.ui.h:42 +#: ../gtk/parameters.ui.h:39 msgid "Capture device:" msgstr "" -#: ../gtk/parameters.ui.h:43 +#: ../gtk/parameters.ui.h:40 msgid "Ring device:" msgstr "" -#: ../gtk/parameters.ui.h:44 +#: ../gtk/parameters.ui.h:41 msgid "Playback device:" msgstr "" -#: ../gtk/parameters.ui.h:45 +#: ../gtk/parameters.ui.h:42 msgid "Enable echo cancellation" msgstr "エコーキャンセラーを有効にする" -#: ../gtk/parameters.ui.h:46 +#: ../gtk/parameters.ui.h:43 msgid "Audio" msgstr "オーディオ" -#: ../gtk/parameters.ui.h:47 +#: ../gtk/parameters.ui.h:44 msgid "Video input device:" msgstr "" -#: ../gtk/parameters.ui.h:48 +#: ../gtk/parameters.ui.h:45 msgid "Prefered video resolution:" msgstr "" -#: ../gtk/parameters.ui.h:49 +#: ../gtk/parameters.ui.h:46 msgid "Video output method:" msgstr "" -#: ../gtk/parameters.ui.h:50 +#: ../gtk/parameters.ui.h:47 msgid "Show camera preview" msgstr "" -#: ../gtk/parameters.ui.h:51 +#: ../gtk/parameters.ui.h:48 msgid "Video" msgstr "ビデオ" -#: ../gtk/parameters.ui.h:52 +#: ../gtk/parameters.ui.h:49 msgid "Multimedia settings" msgstr "マルチメディア設定" -#: ../gtk/parameters.ui.h:53 +#: ../gtk/parameters.ui.h:50 msgid "This section defines your SIP address when not using a SIP account" msgstr "" -#: ../gtk/parameters.ui.h:54 +#: ../gtk/parameters.ui.h:51 msgid "Your display name (eg: John Doe):" msgstr "あなたの表示名 (例: John Doe):" -#: ../gtk/parameters.ui.h:55 +#: ../gtk/parameters.ui.h:52 msgid "Your username:" msgstr "あなたのユーザー名:" -#: ../gtk/parameters.ui.h:56 +#: ../gtk/parameters.ui.h:53 msgid "Your resulting SIP address:" msgstr "" -#: ../gtk/parameters.ui.h:57 +#: ../gtk/parameters.ui.h:54 msgid "Default identity" msgstr "" -#: ../gtk/parameters.ui.h:58 +#: ../gtk/parameters.ui.h:55 msgid "Wizard" msgstr "ウィザード" -#: ../gtk/parameters.ui.h:59 +#: ../gtk/parameters.ui.h:56 msgid "Add" msgstr "追加する" -#: ../gtk/parameters.ui.h:60 +#: ../gtk/parameters.ui.h:57 msgid "Edit" msgstr "編集する" -#: ../gtk/parameters.ui.h:61 +#: ../gtk/parameters.ui.h:58 msgid "Remove" msgstr "削除する" -#: ../gtk/parameters.ui.h:62 +#: ../gtk/parameters.ui.h:59 msgid "Proxy accounts" msgstr "プロキシアカウント" -#: ../gtk/parameters.ui.h:63 +#: ../gtk/parameters.ui.h:60 msgid "Erase all passwords" msgstr "すべてのパスワードを消去する" -#: ../gtk/parameters.ui.h:64 +#: ../gtk/parameters.ui.h:61 msgid "Privacy" msgstr "プライバシー" -#: ../gtk/parameters.ui.h:65 +#: ../gtk/parameters.ui.h:62 +msgid "Automatically answer when a call is received" +msgstr "" + +#: ../gtk/parameters.ui.h:63 +msgid "Auto-answer" +msgstr "" + +#: ../gtk/parameters.ui.h:64 msgid "Manage SIP Accounts" msgstr "" -#: ../gtk/parameters.ui.h:66 ../gtk/tunnel_config.ui.h:4 +#: ../gtk/parameters.ui.h:65 ../gtk/tunnel_config.ui.h:4 msgid "Enable" msgstr "使用する" -#: ../gtk/parameters.ui.h:67 ../gtk/tunnel_config.ui.h:5 +#: ../gtk/parameters.ui.h:66 ../gtk/tunnel_config.ui.h:5 msgid "Disable" msgstr "使用しない" -#: ../gtk/parameters.ui.h:68 +#: ../gtk/parameters.ui.h:67 msgid "Codecs" msgstr "コーデック" -#: ../gtk/parameters.ui.h:69 +#: ../gtk/parameters.ui.h:68 msgid "0 stands for \"unlimited\"" msgstr "" -#: ../gtk/parameters.ui.h:70 +#: ../gtk/parameters.ui.h:69 msgid "Upload speed limit in Kbit/sec:" msgstr "アップロード速度制限 Kbit/sec:" -#: ../gtk/parameters.ui.h:71 +#: ../gtk/parameters.ui.h:70 msgid "Download speed limit in Kbit/sec:" msgstr "ダウンロード速度制限 Kbit/sec:" -#: ../gtk/parameters.ui.h:72 +#: ../gtk/parameters.ui.h:71 msgid "Enable adaptive rate control" msgstr "" -#: ../gtk/parameters.ui.h:73 +#: ../gtk/parameters.ui.h:72 msgid "" "Adaptive rate control is a technique to dynamically guess the available " "bandwidth during a call." msgstr "" -#: ../gtk/parameters.ui.h:74 +#: ../gtk/parameters.ui.h:73 msgid "Bandwidth control" msgstr "帯域幅制御" -#: ../gtk/parameters.ui.h:75 +#: ../gtk/parameters.ui.h:74 msgid "Codecs" msgstr "コーデック" -#: ../gtk/parameters.ui.h:76 +#: ../gtk/parameters.ui.h:75 msgid "Language" msgstr "言語" -#: ../gtk/parameters.ui.h:77 +#: ../gtk/parameters.ui.h:76 msgid "Show advanced settings" msgstr "拡張設定を表示する" -#: ../gtk/parameters.ui.h:78 +#: ../gtk/parameters.ui.h:77 msgid "Level" msgstr "レベル" -#: ../gtk/parameters.ui.h:79 +#: ../gtk/parameters.ui.h:78 msgid "User interface" msgstr "ユーザーインターフェイス" -#: ../gtk/parameters.ui.h:80 ../gtk/ldap.ui.h:2 +#: ../gtk/parameters.ui.h:79 ../gtk/ldap.ui.h:2 msgid "Server address:" msgstr "サーバーアドレス:" -#: ../gtk/parameters.ui.h:81 ../gtk/ldap.ui.h:3 +#: ../gtk/parameters.ui.h:80 ../gtk/ldap.ui.h:3 msgid "Authentication method:" msgstr "" -#: ../gtk/parameters.ui.h:83 +#: ../gtk/parameters.ui.h:82 msgid "LDAP Account setup" msgstr "" -#: ../gtk/parameters.ui.h:84 +#: ../gtk/parameters.ui.h:83 msgid "LDAP" msgstr "LDAP" -#: ../gtk/parameters.ui.h:85 +#: ../gtk/parameters.ui.h:84 msgid "Done" msgstr "完了" +#: ../gtk/parameters.ui.h:85 +msgid "SIP (UDP)" +msgstr "SIP (UDP)" + +#: ../gtk/parameters.ui.h:86 +msgid "SIP (TCP)" +msgstr "SIP (TCP)" + +#: ../gtk/parameters.ui.h:87 +msgid "SIP (TLS)" +msgstr "SIP (TLS)" + #: ../gtk/buddylookup.ui.h:1 msgid "Search contacts in directory" msgstr "" @@ -1708,11 +1681,8 @@ msgstr "" #: ../gtk/config-uri.ui.h:2 msgid "" -"This dialog allows to set an http or https address when configuration is to " -"be fetched at startup.\n" -"Please enter or modify the configuration URI below. After clicking OK, " -"Linphone will restart automatically in order to fetch and take into account " -"the new configuration. " +"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n" +"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. " msgstr "" #: ../gtk/provisioning-fetch.ui.h:1 @@ -1723,60 +1693,60 @@ msgstr "" msgid "Please wait while fetching configuration from server..." msgstr "" -#: ../coreapi/linphonecore.c:1512 +#: ../coreapi/linphonecore.c:1534 msgid "Ready" msgstr "準備" -#: ../coreapi/linphonecore.c:2499 +#: ../coreapi/linphonecore.c:2534 msgid "Configuring" msgstr "" -#: ../coreapi/linphonecore.c:2673 +#: ../coreapi/linphonecore.c:2708 msgid "Looking for telephone number destination..." msgstr "" -#: ../coreapi/linphonecore.c:2675 +#: ../coreapi/linphonecore.c:2710 msgid "Could not resolve this number." msgstr "" #. must be known at that time -#: ../coreapi/linphonecore.c:2961 +#: ../coreapi/linphonecore.c:2996 msgid "Contacting" msgstr "" -#: ../coreapi/linphonecore.c:2966 +#: ../coreapi/linphonecore.c:3001 msgid "Could not call" msgstr "" -#: ../coreapi/linphonecore.c:3116 +#: ../coreapi/linphonecore.c:3152 msgid "Sorry, we have reached the maximum number of simultaneous calls" msgstr "" -#: ../coreapi/linphonecore.c:3274 +#: ../coreapi/linphonecore.c:3310 msgid "is contacting you" msgstr "" -#: ../coreapi/linphonecore.c:3275 +#: ../coreapi/linphonecore.c:3311 msgid " and asked autoanswer." msgstr "と自動応答を尋ねる" -#: ../coreapi/linphonecore.c:3399 +#: ../coreapi/linphonecore.c:3435 msgid "Modifying call parameters..." msgstr "コールパラメーターの変更..." -#: ../coreapi/linphonecore.c:3747 +#: ../coreapi/linphonecore.c:3782 msgid "Connected." msgstr "接続しました。" -#: ../coreapi/linphonecore.c:3772 +#: ../coreapi/linphonecore.c:3807 msgid "Call aborted" msgstr "呼び出しを打ち切る" -#: ../coreapi/linphonecore.c:3962 +#: ../coreapi/linphonecore.c:3997 msgid "Could not pause the call" msgstr "呼び出しを一時停止できませんでした" -#: ../coreapi/linphonecore.c:3965 +#: ../coreapi/linphonecore.c:4000 msgid "Pausing the current call..." msgstr "現在の通話を一時停止..." @@ -1852,117 +1822,117 @@ msgid "" "It should look like sip:username@proxydomain, such as sip:alice@example.net" msgstr "" -#: ../coreapi/proxy.c:1403 +#: ../coreapi/proxy.c:1416 #, c-format msgid "Could not login as %s" msgstr "" -#: ../coreapi/callbacks.c:419 +#: ../coreapi/callbacks.c:428 msgid "Remote ringing." msgstr "" -#: ../coreapi/callbacks.c:431 +#: ../coreapi/callbacks.c:440 msgid "Remote ringing..." msgstr "" -#: ../coreapi/callbacks.c:448 +#: ../coreapi/callbacks.c:461 msgid "Early media." msgstr "Early media." -#: ../coreapi/callbacks.c:521 +#: ../coreapi/callbacks.c:533 #, c-format msgid "Call with %s is paused." msgstr "" -#: ../coreapi/callbacks.c:534 +#: ../coreapi/callbacks.c:546 #, c-format msgid "Call answered by %s - on hold." msgstr "" -#: ../coreapi/callbacks.c:544 +#: ../coreapi/callbacks.c:556 msgid "Call resumed." msgstr "" -#: ../coreapi/callbacks.c:548 +#: ../coreapi/callbacks.c:560 #, c-format msgid "Call answered by %s." msgstr "" -#: ../coreapi/callbacks.c:571 +#: ../coreapi/callbacks.c:583 msgid "Incompatible, check codecs or security settings..." msgstr "" -#: ../coreapi/callbacks.c:576 ../coreapi/callbacks.c:888 +#: ../coreapi/callbacks.c:588 ../coreapi/callbacks.c:900 msgid "Incompatible media parameters." msgstr "" -#: ../coreapi/callbacks.c:606 +#: ../coreapi/callbacks.c:618 msgid "We have been resumed." msgstr "" #. we are being paused -#: ../coreapi/callbacks.c:614 +#: ../coreapi/callbacks.c:626 msgid "We are paused by other party." msgstr "" #. reINVITE and in-dialogs UPDATE go here -#: ../coreapi/callbacks.c:648 +#: ../coreapi/callbacks.c:660 msgid "Call is updated by remote." msgstr "" -#: ../coreapi/callbacks.c:764 +#: ../coreapi/callbacks.c:776 msgid "Call terminated." msgstr "呼び出し終了。" -#: ../coreapi/callbacks.c:792 +#: ../coreapi/callbacks.c:804 msgid "User is busy." msgstr "相手はビジーです。" -#: ../coreapi/callbacks.c:793 +#: ../coreapi/callbacks.c:805 msgid "User is temporarily unavailable." msgstr "相手は、今出られません。" #. char *retrymsg=_("%s. Retry after %i minute(s)."); -#: ../coreapi/callbacks.c:795 +#: ../coreapi/callbacks.c:807 msgid "User does not want to be disturbed." msgstr "相手は手が離せないようです。" -#: ../coreapi/callbacks.c:796 +#: ../coreapi/callbacks.c:808 msgid "Call declined." msgstr "通話は拒否されました。" -#: ../coreapi/callbacks.c:811 +#: ../coreapi/callbacks.c:823 msgid "Request timeout." msgstr "リクエストは時間切れです。" -#: ../coreapi/callbacks.c:842 +#: ../coreapi/callbacks.c:854 msgid "Redirected" msgstr "" -#: ../coreapi/callbacks.c:897 +#: ../coreapi/callbacks.c:909 msgid "Call failed." msgstr "" -#: ../coreapi/callbacks.c:975 +#: ../coreapi/callbacks.c:987 #, c-format msgid "Registration on %s successful." msgstr "" -#: ../coreapi/callbacks.c:976 +#: ../coreapi/callbacks.c:988 #, c-format msgid "Unregistration on %s done." msgstr "" -#: ../coreapi/callbacks.c:994 +#: ../coreapi/callbacks.c:1006 msgid "no response timeout" msgstr "" -#: ../coreapi/callbacks.c:997 +#: ../coreapi/callbacks.c:1009 #, c-format msgid "Registration on %s failed: %s" msgstr "" -#: ../coreapi/callbacks.c:1004 +#: ../coreapi/callbacks.c:1016 msgid "Service unavailable, retrying" msgstr "" @@ -1972,7 +1942,11 @@ msgstr "" msgid "Authentication token is %s" msgstr "" -#: ../coreapi/linphonecall.c:3600 +#: ../coreapi/linphonecall.c:1305 +msgid "Call parameters were successfully modified." +msgstr "" + +#: ../coreapi/linphonecall.c:3659 #, c-format msgid "You have missed %i call." msgid_plural "You have missed %i calls." diff --git a/po/nb_NO.po b/po/nb_NO.po index 010981476..07c3a2728 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -1,23 +1,21 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Øyvind Sæther , 2011 msgid "" msgstr "" "Project-Id-Version: linphone-gtk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-11 16:26+0100\n" -"PO-Revision-Date: 2015-02-17 11:28+0000\n" -"Last-Translator: Belledonne Communications \n" -"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/" -"p/linphone-gtk/language/nb_NO/)\n" -"Language: nb_NO\n" +"POT-Creation-Date: 2015-03-27 14:40+0100\n" +"PO-Revision-Date: 2015-03-27 13:40+0000\n" +"Last-Translator: Belledonne Communications \n" +"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/linphone-gtk/language/nb_NO/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: nb_NO\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974 @@ -90,138 +88,126 @@ msgstr "" msgid "Couldn't find pixmap file: %s" msgstr "Fant ikke pixmap fli: %s" -#: ../gtk/chat.c:374 ../gtk/friendlist.c:924 -msgid "Invalid sip contact !" -msgstr "Ugyldig SIP kontakt !" - -#: ../gtk/main.c:137 +#: ../gtk/main.c:136 msgid "log to stdout some debug information while running." msgstr "skriv logg-informasjon under kjøring" -#: ../gtk/main.c:138 +#: ../gtk/main.c:137 msgid "path to a file to write logs into." msgstr "" -#: ../gtk/main.c:139 +#: ../gtk/main.c:138 msgid "Start linphone with video disabled." msgstr "" -#: ../gtk/main.c:140 +#: ../gtk/main.c:139 msgid "Start only in the system tray, do not show the main interface." msgstr "Start skjult i systemkurven, ikke vis programbildet." -#: ../gtk/main.c:141 +#: ../gtk/main.c:140 msgid "address to call right now" msgstr "address som skal ringes nå" -#: ../gtk/main.c:142 -msgid "if set automatically answer incoming calls" -msgstr "besvarer innkommende samtaler automatisk om valgt" - -#: ../gtk/main.c:143 +#: ../gtk/main.c:141 msgid "" -"Specifiy a working directory (should be the base of the installation, eg: c:" -"\\Program Files\\Linphone)" -msgstr "" -"Spesifiser arbeidsmappe (bør være base for installasjonen, f.eks: c:" -"\\Programfiler\\Linphone)" +"Specifiy a working directory (should be the base of the installation, eg: " +"c:\\Program Files\\Linphone)" +msgstr "Spesifiser arbeidsmappe (bør være base for installasjonen, f.eks: c:\\Programfiler\\Linphone)" -#: ../gtk/main.c:144 +#: ../gtk/main.c:142 msgid "Configuration file" msgstr "" -#: ../gtk/main.c:145 +#: ../gtk/main.c:143 msgid "Run the audio assistant" msgstr "" -#: ../gtk/main.c:146 +#: ../gtk/main.c:144 msgid "Run self test and exit 0 if succeed" msgstr "" -#: ../gtk/main.c:1061 +#: ../gtk/main.c:1059 #, 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 vil legge deg til i hans/hennes kontaktliste.\n" -"Vil du tillate vedkommende å se din tilstedestatus eller legge vedkommende i " -"din kontaktliste?\n" -"Hvis du svarer nei vil personen bli svartelyst midlertidig." +msgstr "%s vil legge deg til i hans/hennes kontaktliste.\nVil du tillate vedkommende å se din tilstedestatus eller legge vedkommende i din kontaktliste?\nHvis du svarer nei vil personen bli svartelyst midlertidig." -#: ../gtk/main.c:1138 +#: ../gtk/main.c:1136 #, c-format msgid "" "Please enter your password for username %s\n" " at realm %s:" msgstr "" -#: ../gtk/main.c:1259 +#: ../gtk/main.c:1257 msgid "Call error" msgstr "" -#: ../gtk/main.c:1262 ../coreapi/linphonecore.c:3791 +#: ../gtk/main.c:1260 ../coreapi/linphonecore.c:3826 msgid "Call ended" msgstr "Samtale avsluttet" -#: ../gtk/main.c:1265 ../coreapi/call_log.c:221 +#: ../gtk/main.c:1263 ../coreapi/call_log.c:221 msgid "Incoming call" msgstr "Innkommende samtale" -#: ../gtk/main.c:1267 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5 +#: ../gtk/main.c:1265 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5 msgid "Answer" msgstr "Svarer" -#: ../gtk/main.c:1269 ../gtk/main.ui.h:6 +#: ../gtk/main.c:1267 ../gtk/main.ui.h:6 msgid "Decline" msgstr "Avvis" -#: ../gtk/main.c:1275 +#: ../gtk/main.c:1273 msgid "Call paused" msgstr "" -#: ../gtk/main.c:1275 +#: ../gtk/main.c:1273 #, c-format msgid "by %s" msgstr "" -#: ../gtk/main.c:1345 +#: ../gtk/main.c:1343 #, c-format msgid "%s proposed to start video. Do you accept ?" msgstr "" -#: ../gtk/main.c:1507 +#: ../gtk/main.c:1505 msgid "Website link" msgstr "Peker til nettsted" -#: ../gtk/main.c:1556 +#: ../gtk/main.c:1554 msgid "Linphone - a video internet phone" msgstr "Linphone - en video Internet telefon" -#: ../gtk/main.c:1648 +#: ../gtk/main.c:1646 #, c-format msgid "%s (Default)" msgstr "%s (Standard)" -#: ../gtk/main.c:1980 ../coreapi/callbacks.c:1045 +#: ../gtk/main.c:1978 ../coreapi/callbacks.c:1057 #, c-format msgid "We are transferred to %s" msgstr "Vi er overført til %s" -#: ../gtk/main.c:1990 +#: ../gtk/main.c:1988 msgid "" "No sound cards have been detected on this computer.\n" "You won't be able to send or receive audio calls." -msgstr "" -"Klarte ikke å finne noe lydkort på denne datamaskinen.\n" -"Du vil ikke kunne sende eller motta lydsamtaler." +msgstr "Klarte ikke å finne noe lydkort på denne datamaskinen.\nDu vil ikke kunne sende eller motta lydsamtaler." -#: ../gtk/main.c:2135 +#: ../gtk/main.c:2136 msgid "A free SIP video-phone" msgstr "En gratis SIP video-telefon" +#: ../gtk/main.c:2241 +#, c-format +msgid "Hello\n" +msgstr "" + #: ../gtk/friendlist.c:505 msgid "Add to addressbook" msgstr "" @@ -247,6 +233,10 @@ msgstr "" msgid "Search in %s directory" msgstr "Søk i %s katalogen" +#: ../gtk/friendlist.c:924 +msgid "Invalid sip contact !" +msgstr "Ugyldig SIP kontakt !" + #: ../gtk/friendlist.c:976 #, c-format msgid "Edit contact '%s'" @@ -287,7 +277,7 @@ msgstr "Parametere" msgid "Enabled" msgstr "På" -#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763 ../gtk/parameters.ui.h:20 +#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763 ../gtk/parameters.ui.h:17 msgid "Disabled" msgstr "Av" @@ -393,9 +383,7 @@ msgstr "" msgid "" "A more recent version is availalble from %s.\n" "Would you like to open a browser to download it ?" -msgstr "" -"En nyere utgave er tilgjengelig fra %s.\n" -"Vil du åpne en nettleser og laste den ned ?" +msgstr "En nyere utgave er tilgjengelig fra %s.\nVil du åpne en nettleser og laste den ned ?" #: ../gtk/update.c:91 msgid "You are running the lastest version." @@ -454,7 +442,7 @@ msgstr "" msgid "Enter your linphone.org username" msgstr "" -#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:82 ../gtk/ldap.ui.h:4 +#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:81 ../gtk/ldap.ui.h:4 msgid "Username:" msgstr "Brukernavn:" @@ -518,8 +506,7 @@ msgstr "Takk. Ditt konto er nå satt opp og klart til bruk." #: ../gtk/setupwizard.c:413 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 "" @@ -843,7 +830,7 @@ msgstr "" msgid "Audio Assistant" msgstr "" -#: ../gtk/audio_assistant.c:513 ../gtk/main.ui.h:31 +#: ../gtk/audio_assistant.c:513 ../gtk/main.ui.h:32 msgid "Audio assistant" msgstr "" @@ -920,103 +907,103 @@ msgid "Default" msgstr "Standard" #: ../gtk/main.ui.h:22 +msgid "Delete" +msgstr "" + +#: ../gtk/main.ui.h:23 msgid "_Options" msgstr "_Alternativer" -#: ../gtk/main.ui.h:23 +#: ../gtk/main.ui.h:24 msgid "Set configuration URI" msgstr "" -#: ../gtk/main.ui.h:24 +#: ../gtk/main.ui.h:25 msgid "Always start video" msgstr "" -#: ../gtk/main.ui.h:25 +#: ../gtk/main.ui.h:26 msgid "Enable self-view" msgstr "Vis video av deg selv" -#: ../gtk/main.ui.h:26 +#: ../gtk/main.ui.h:27 msgid "_Help" msgstr "_Hjelp" -#: ../gtk/main.ui.h:27 +#: ../gtk/main.ui.h:28 msgid "Show debug window" msgstr "Vis avlusningsvindu" -#: ../gtk/main.ui.h:28 +#: ../gtk/main.ui.h:29 msgid "_Homepage" msgstr "H_jemmeside" -#: ../gtk/main.ui.h:29 +#: ../gtk/main.ui.h:30 msgid "Check _Updates" msgstr "Sjekk _Oppdateringer" -#: ../gtk/main.ui.h:30 +#: ../gtk/main.ui.h:31 msgid "Account assistant" msgstr "" -#: ../gtk/main.ui.h:32 +#: ../gtk/main.ui.h:33 msgid "SIP address or phone number:" msgstr "Sip adresse eller telefonnummer:" -#: ../gtk/main.ui.h:33 +#: ../gtk/main.ui.h:34 msgid "Initiate a new call" msgstr "Start en ny samtale" -#: ../gtk/main.ui.h:34 +#: ../gtk/main.ui.h:35 msgid "Contacts" msgstr "Kontakter" -#: ../gtk/main.ui.h:35 +#: ../gtk/main.ui.h:36 msgid "Search" msgstr "Søk" -#: ../gtk/main.ui.h:36 +#: ../gtk/main.ui.h:37 msgid "Add contacts from directory" msgstr "Legg til kontakter fra katalogen" -#: ../gtk/main.ui.h:37 +#: ../gtk/main.ui.h:38 msgid "Add contact" msgstr "Legg til kontakt" -#: ../gtk/main.ui.h:38 +#: ../gtk/main.ui.h:39 msgid "Recent calls" msgstr "" -#: ../gtk/main.ui.h:39 +#: ../gtk/main.ui.h:40 msgid "My current identity:" msgstr "Min nåværende identitet:" -#: ../gtk/main.ui.h:40 ../gtk/tunnel_config.ui.h:7 +#: ../gtk/main.ui.h:41 ../gtk/tunnel_config.ui.h:7 msgid "Username" msgstr "Brukernavn" -#: ../gtk/main.ui.h:41 ../gtk/tunnel_config.ui.h:8 +#: ../gtk/main.ui.h:42 ../gtk/tunnel_config.ui.h:8 msgid "Password" msgstr "Passord" -#: ../gtk/main.ui.h:42 +#: ../gtk/main.ui.h:43 msgid "Internet connection:" msgstr "Internet forbindelse:" -#: ../gtk/main.ui.h:43 +#: ../gtk/main.ui.h:44 msgid "Automatically log me in" msgstr "Logg meg på automatisk" -#: ../gtk/main.ui.h:44 ../gtk/password.ui.h:3 +#: ../gtk/main.ui.h:45 ../gtk/password.ui.h:3 msgid "UserID" msgstr "BrukerID" -#: ../gtk/main.ui.h:45 +#: ../gtk/main.ui.h:46 msgid "Login information" msgstr "Innlogginsinformasjon" -#: ../gtk/main.ui.h:46 -msgid "Welcome!" -msgstr "" - #: ../gtk/main.ui.h:47 -msgid "Delete" +msgid "Welcome!" msgstr "" #: ../gtk/about.ui.h:1 @@ -1029,9 +1016,7 @@ msgstr "" #: ../gtk/about.ui.h:4 msgid "An internet video phone using the standard SIP (rfc3261) protocol." -msgstr "" -"En Internet Videotelefon som bruker den standardiserte SIP-protokollen " -"(rfc3261)." +msgstr "En Internet Videotelefon som bruker den standardiserte SIP-protokollen (rfc3261)." #: ../gtk/about.ui.h:5 msgid "" @@ -1194,299 +1179,307 @@ msgid "C" msgstr "C" #: ../gtk/parameters.ui.h:11 -msgid "SIP (UDP)" -msgstr "" - -#: ../gtk/parameters.ui.h:12 -msgid "SIP (TCP)" -msgstr "" - -#: ../gtk/parameters.ui.h:13 -msgid "SIP (TLS)" -msgstr "" - -#: ../gtk/parameters.ui.h:14 msgid "Settings" msgstr "Innstillinger" -#: ../gtk/parameters.ui.h:15 +#: ../gtk/parameters.ui.h:12 msgid "Set Maximum Transmission Unit:" msgstr "Velg MTU (Maximum Transmission Unit):" -#: ../gtk/parameters.ui.h:16 +#: ../gtk/parameters.ui.h:13 msgid "Send DTMFs as SIP info" msgstr "Send DTMF som SIP-info" -#: ../gtk/parameters.ui.h:17 -msgid "Use IPv6 instead of IPv4" -msgstr "Bruk IPv6 istedet for IPv4" +#: ../gtk/parameters.ui.h:14 +msgid "Allow IPv6" +msgstr "" -#: ../gtk/parameters.ui.h:18 +#: ../gtk/parameters.ui.h:15 msgid "Transport" msgstr "Transport" -#: ../gtk/parameters.ui.h:19 +#: ../gtk/parameters.ui.h:16 msgid "SIP/UDP port" msgstr "" -#: ../gtk/parameters.ui.h:21 +#: ../gtk/parameters.ui.h:18 msgid "Random" msgstr "" -#: ../gtk/parameters.ui.h:22 +#: ../gtk/parameters.ui.h:19 msgid "SIP/TCP port" msgstr "" -#: ../gtk/parameters.ui.h:23 +#: ../gtk/parameters.ui.h:20 msgid "Audio RTP/UDP:" msgstr "Lyd RTP/UDP:" -#: ../gtk/parameters.ui.h:24 +#: ../gtk/parameters.ui.h:21 msgid "Fixed" msgstr "" -#: ../gtk/parameters.ui.h:25 +#: ../gtk/parameters.ui.h:22 msgid "Video RTP/UDP:" msgstr "Video RTP/UDP:" -#: ../gtk/parameters.ui.h:26 +#: ../gtk/parameters.ui.h:23 msgid "Media encryption type" msgstr "" -#: ../gtk/parameters.ui.h:27 +#: ../gtk/parameters.ui.h:24 msgid "Media encryption is mandatory" msgstr "" -#: ../gtk/parameters.ui.h:28 +#: ../gtk/parameters.ui.h:25 msgid "Tunnel" msgstr "" -#: ../gtk/parameters.ui.h:29 +#: ../gtk/parameters.ui.h:26 msgid "DSCP fields" msgstr "" -#: ../gtk/parameters.ui.h:30 +#: ../gtk/parameters.ui.h:27 msgid "Network protocol and ports" msgstr "" -#: ../gtk/parameters.ui.h:31 +#: ../gtk/parameters.ui.h:28 msgid "Direct connection to the Internet" msgstr "Tilkoblet Internett direkte" -#: ../gtk/parameters.ui.h:32 +#: ../gtk/parameters.ui.h:29 msgid "Behind NAT / Firewall (specify gateway IP )" msgstr "" -#: ../gtk/parameters.ui.h:33 +#: ../gtk/parameters.ui.h:30 msgid "Behind NAT / Firewall (use STUN to resolve)" msgstr "Bak NAT / Brannmur (bruk STUN for å avgjøre)" -#: ../gtk/parameters.ui.h:34 +#: ../gtk/parameters.ui.h:31 msgid "Behind NAT / Firewall (use ICE)" msgstr "" -#: ../gtk/parameters.ui.h:35 +#: ../gtk/parameters.ui.h:32 msgid "Behind NAT / Firewall (use uPnP)" msgstr "" -#: ../gtk/parameters.ui.h:36 +#: ../gtk/parameters.ui.h:33 msgid "Public IP address:" msgstr "Offentlig IP-addresse:" -#: ../gtk/parameters.ui.h:37 +#: ../gtk/parameters.ui.h:34 msgid "Stun server:" msgstr "STUN tjener:" -#: ../gtk/parameters.ui.h:38 +#: ../gtk/parameters.ui.h:35 msgid "NAT and Firewall" msgstr "NAT og Brannvegg" -#: ../gtk/parameters.ui.h:39 +#: ../gtk/parameters.ui.h:36 msgid "Network settings" msgstr "Nettverksinnstillinger" -#: ../gtk/parameters.ui.h:40 +#: ../gtk/parameters.ui.h:37 msgid "Ring sound:" msgstr "Ringelyd:" -#: ../gtk/parameters.ui.h:41 +#: ../gtk/parameters.ui.h:38 msgid "ALSA special device (optional):" msgstr "Spesiell ALSA enhet (valgfritt):" -#: ../gtk/parameters.ui.h:42 +#: ../gtk/parameters.ui.h:39 msgid "Capture device:" msgstr "Mikrofonenhet:" -#: ../gtk/parameters.ui.h:43 +#: ../gtk/parameters.ui.h:40 msgid "Ring device:" msgstr "Ringe-enhet:" -#: ../gtk/parameters.ui.h:44 +#: ../gtk/parameters.ui.h:41 msgid "Playback device:" msgstr "Avspillingsenhet:" -#: ../gtk/parameters.ui.h:45 +#: ../gtk/parameters.ui.h:42 msgid "Enable echo cancellation" msgstr "Bruk ekko-kansellering" -#: ../gtk/parameters.ui.h:46 +#: ../gtk/parameters.ui.h:43 msgid "Audio" msgstr "Lyd" -#: ../gtk/parameters.ui.h:47 +#: ../gtk/parameters.ui.h:44 msgid "Video input device:" msgstr "Videoenhet:" -#: ../gtk/parameters.ui.h:48 +#: ../gtk/parameters.ui.h:45 msgid "Prefered video resolution:" msgstr "Foretrukke video-oppløsning:" -#: ../gtk/parameters.ui.h:49 +#: ../gtk/parameters.ui.h:46 msgid "Video output method:" msgstr "" -#: ../gtk/parameters.ui.h:50 +#: ../gtk/parameters.ui.h:47 msgid "Show camera preview" msgstr "" -#: ../gtk/parameters.ui.h:51 +#: ../gtk/parameters.ui.h:48 msgid "Video" msgstr "Video" -#: ../gtk/parameters.ui.h:52 +#: ../gtk/parameters.ui.h:49 msgid "Multimedia settings" msgstr "Multimediainnstillinger" -#: ../gtk/parameters.ui.h:53 +#: ../gtk/parameters.ui.h:50 msgid "This section defines your SIP address when not using a SIP account" msgstr "Denne seksjonen velger SIP-addresse når du ikke bruker en SIP-konto" -#: ../gtk/parameters.ui.h:54 +#: ../gtk/parameters.ui.h:51 msgid "Your display name (eg: John Doe):" msgstr "Vist navn (eks: Ola Nordmann):" -#: ../gtk/parameters.ui.h:55 +#: ../gtk/parameters.ui.h:52 msgid "Your username:" msgstr "Ditt brukernavn:" -#: ../gtk/parameters.ui.h:56 +#: ../gtk/parameters.ui.h:53 msgid "Your resulting SIP address:" msgstr "Din resulterende SIP addresse:" -#: ../gtk/parameters.ui.h:57 +#: ../gtk/parameters.ui.h:54 msgid "Default identity" msgstr "Standard identitet" -#: ../gtk/parameters.ui.h:58 +#: ../gtk/parameters.ui.h:55 msgid "Wizard" msgstr "" -#: ../gtk/parameters.ui.h:59 +#: ../gtk/parameters.ui.h:56 msgid "Add" msgstr "Legg til" -#: ../gtk/parameters.ui.h:60 +#: ../gtk/parameters.ui.h:57 msgid "Edit" msgstr "Rediger" -#: ../gtk/parameters.ui.h:61 +#: ../gtk/parameters.ui.h:58 msgid "Remove" msgstr "Fjern" -#: ../gtk/parameters.ui.h:62 +#: ../gtk/parameters.ui.h:59 msgid "Proxy accounts" msgstr "Proxy kontoer" -#: ../gtk/parameters.ui.h:63 +#: ../gtk/parameters.ui.h:60 msgid "Erase all passwords" msgstr "Slett alle passord" -#: ../gtk/parameters.ui.h:64 +#: ../gtk/parameters.ui.h:61 msgid "Privacy" msgstr "Personvern" -#: ../gtk/parameters.ui.h:65 +#: ../gtk/parameters.ui.h:62 +msgid "Automatically answer when a call is received" +msgstr "" + +#: ../gtk/parameters.ui.h:63 +msgid "Auto-answer" +msgstr "" + +#: ../gtk/parameters.ui.h:64 msgid "Manage SIP Accounts" msgstr "Behandle SIP-kontoer" -#: ../gtk/parameters.ui.h:66 ../gtk/tunnel_config.ui.h:4 +#: ../gtk/parameters.ui.h:65 ../gtk/tunnel_config.ui.h:4 msgid "Enable" msgstr "Aktiver" -#: ../gtk/parameters.ui.h:67 ../gtk/tunnel_config.ui.h:5 +#: ../gtk/parameters.ui.h:66 ../gtk/tunnel_config.ui.h:5 msgid "Disable" msgstr "Deaktiver" -#: ../gtk/parameters.ui.h:68 +#: ../gtk/parameters.ui.h:67 msgid "Codecs" msgstr "Kodeker" -#: ../gtk/parameters.ui.h:69 +#: ../gtk/parameters.ui.h:68 msgid "0 stands for \"unlimited\"" msgstr "0 betyr \"ubegrenset\"" -#: ../gtk/parameters.ui.h:70 +#: ../gtk/parameters.ui.h:69 msgid "Upload speed limit in Kbit/sec:" msgstr "Maks opplastningshastighet i Kbit/sek:" -#: ../gtk/parameters.ui.h:71 +#: ../gtk/parameters.ui.h:70 msgid "Download speed limit in Kbit/sec:" msgstr "Nedlastningsbegrensning i Kbit/sek:" -#: ../gtk/parameters.ui.h:72 +#: ../gtk/parameters.ui.h:71 msgid "Enable adaptive rate control" msgstr "" -#: ../gtk/parameters.ui.h:73 +#: ../gtk/parameters.ui.h:72 msgid "" "Adaptive rate control is a technique to dynamically guess the available " "bandwidth during a call." msgstr "" -#: ../gtk/parameters.ui.h:74 +#: ../gtk/parameters.ui.h:73 msgid "Bandwidth control" msgstr "Båndbreddekontrol" -#: ../gtk/parameters.ui.h:75 +#: ../gtk/parameters.ui.h:74 msgid "Codecs" msgstr "Kodek" -#: ../gtk/parameters.ui.h:76 +#: ../gtk/parameters.ui.h:75 msgid "Language" msgstr "Språk" -#: ../gtk/parameters.ui.h:77 +#: ../gtk/parameters.ui.h:76 msgid "Show advanced settings" msgstr "Vis avanserte innstillinger" -#: ../gtk/parameters.ui.h:78 +#: ../gtk/parameters.ui.h:77 msgid "Level" msgstr "Nivå" -#: ../gtk/parameters.ui.h:79 +#: ../gtk/parameters.ui.h:78 msgid "User interface" msgstr "Brukergrensesnitt" -#: ../gtk/parameters.ui.h:80 ../gtk/ldap.ui.h:2 +#: ../gtk/parameters.ui.h:79 ../gtk/ldap.ui.h:2 msgid "Server address:" msgstr "" -#: ../gtk/parameters.ui.h:81 ../gtk/ldap.ui.h:3 +#: ../gtk/parameters.ui.h:80 ../gtk/ldap.ui.h:3 msgid "Authentication method:" msgstr "" -#: ../gtk/parameters.ui.h:83 +#: ../gtk/parameters.ui.h:82 msgid "LDAP Account setup" msgstr "" -#: ../gtk/parameters.ui.h:84 +#: ../gtk/parameters.ui.h:83 msgid "LDAP" msgstr "" -#: ../gtk/parameters.ui.h:85 +#: ../gtk/parameters.ui.h:84 msgid "Done" msgstr "Ferdig" +#: ../gtk/parameters.ui.h:85 +msgid "SIP (UDP)" +msgstr "" + +#: ../gtk/parameters.ui.h:86 +msgid "SIP (TCP)" +msgstr "" + +#: ../gtk/parameters.ui.h:87 +msgid "SIP (TLS)" +msgstr "" + #: ../gtk/buddylookup.ui.h:1 msgid "Search contacts in directory" msgstr "Søk kontakter i katalogen" @@ -1690,11 +1683,8 @@ msgstr "" #: ../gtk/config-uri.ui.h:2 msgid "" -"This dialog allows to set an http or https address when configuration is to " -"be fetched at startup.\n" -"Please enter or modify the configuration URI below. After clicking OK, " -"Linphone will restart automatically in order to fetch and take into account " -"the new configuration. " +"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n" +"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. " msgstr "" #: ../gtk/provisioning-fetch.ui.h:1 @@ -1705,60 +1695,60 @@ msgstr "" msgid "Please wait while fetching configuration from server..." msgstr "" -#: ../coreapi/linphonecore.c:1512 +#: ../coreapi/linphonecore.c:1534 msgid "Ready" msgstr "Klar" -#: ../coreapi/linphonecore.c:2499 +#: ../coreapi/linphonecore.c:2534 msgid "Configuring" msgstr "" -#: ../coreapi/linphonecore.c:2673 +#: ../coreapi/linphonecore.c:2708 msgid "Looking for telephone number destination..." msgstr "Ser etter telefonnummer for destinasjonen..." -#: ../coreapi/linphonecore.c:2675 +#: ../coreapi/linphonecore.c:2710 msgid "Could not resolve this number." msgstr "Kan ikke tilkoble dette nummeret." #. must be known at that time -#: ../coreapi/linphonecore.c:2961 +#: ../coreapi/linphonecore.c:2996 msgid "Contacting" msgstr "Tilknytter" -#: ../coreapi/linphonecore.c:2966 +#: ../coreapi/linphonecore.c:3001 msgid "Could not call" msgstr "Kunne ikke ringe" -#: ../coreapi/linphonecore.c:3116 +#: ../coreapi/linphonecore.c:3152 msgid "Sorry, we have reached the maximum number of simultaneous calls" msgstr "Beklager, du har nådd maksimalt antall samtidige samtaler" -#: ../coreapi/linphonecore.c:3274 +#: ../coreapi/linphonecore.c:3310 msgid "is contacting you" msgstr "Kontakter deg." -#: ../coreapi/linphonecore.c:3275 +#: ../coreapi/linphonecore.c:3311 msgid " and asked autoanswer." msgstr " og ba om autosvar." -#: ../coreapi/linphonecore.c:3399 +#: ../coreapi/linphonecore.c:3435 msgid "Modifying call parameters..." msgstr "Endrer ringeparametre..." -#: ../coreapi/linphonecore.c:3747 +#: ../coreapi/linphonecore.c:3782 msgid "Connected." msgstr "Tilkoblet" -#: ../coreapi/linphonecore.c:3772 +#: ../coreapi/linphonecore.c:3807 msgid "Call aborted" msgstr "Samtale avbrutt" -#: ../coreapi/linphonecore.c:3962 +#: ../coreapi/linphonecore.c:3997 msgid "Could not pause the call" msgstr "Kunne ikke pause samtalen" -#: ../coreapi/linphonecore.c:3965 +#: ../coreapi/linphonecore.c:4000 msgid "Pausing the current call..." msgstr "Pauser nåværende samtale" @@ -1826,129 +1816,125 @@ msgstr "" msgid "" "The sip proxy address you entered is invalid, it must start with \"sip:\" " "followed by a hostname." -msgstr "" -"SIP proxy adressen du har angitt er ugyldig, den må begynne med \"sip:\" " -"etterfult av vertsnavn." +msgstr "SIP proxy adressen du har angitt er ugyldig, den må begynne med \"sip:\" etterfult av vertsnavn." #: ../coreapi/proxy.c:334 msgid "" "The sip identity you entered is invalid.\n" "It should look like sip:username@proxydomain, such as sip:alice@example.net" -msgstr "" -"SIP adressen du har angitt er feil. Adressen bør se ut som sip: " -"brukernavn@domenenavn, f.eks sip:ola@eksempel.no" +msgstr "SIP adressen du har angitt er feil. Adressen bør se ut som sip: brukernavn@domenenavn, f.eks sip:ola@eksempel.no" -#: ../coreapi/proxy.c:1403 +#: ../coreapi/proxy.c:1416 #, c-format msgid "Could not login as %s" msgstr "Ikke ikke logge inn som %s" -#: ../coreapi/callbacks.c:419 +#: ../coreapi/callbacks.c:428 msgid "Remote ringing." msgstr "Ringer hos motparten." -#: ../coreapi/callbacks.c:431 +#: ../coreapi/callbacks.c:440 msgid "Remote ringing..." msgstr "" -#: ../coreapi/callbacks.c:448 +#: ../coreapi/callbacks.c:461 msgid "Early media." msgstr "Tidlig media" -#: ../coreapi/callbacks.c:521 +#: ../coreapi/callbacks.c:533 #, c-format msgid "Call with %s is paused." msgstr "Samtalen med %s er pauset." -#: ../coreapi/callbacks.c:534 +#: ../coreapi/callbacks.c:546 #, c-format msgid "Call answered by %s - on hold." msgstr "Samtale besvart av %s - på vent." -#: ../coreapi/callbacks.c:544 +#: ../coreapi/callbacks.c:556 msgid "Call resumed." msgstr "Samtale gjenopptatt." -#: ../coreapi/callbacks.c:548 +#: ../coreapi/callbacks.c:560 #, c-format msgid "Call answered by %s." msgstr "Samtale besvart av %s." -#: ../coreapi/callbacks.c:571 +#: ../coreapi/callbacks.c:583 msgid "Incompatible, check codecs or security settings..." msgstr "" -#: ../coreapi/callbacks.c:576 ../coreapi/callbacks.c:888 +#: ../coreapi/callbacks.c:588 ../coreapi/callbacks.c:900 msgid "Incompatible media parameters." msgstr "" -#: ../coreapi/callbacks.c:606 +#: ../coreapi/callbacks.c:618 msgid "We have been resumed." msgstr "" #. we are being paused -#: ../coreapi/callbacks.c:614 +#: ../coreapi/callbacks.c:626 msgid "We are paused by other party." msgstr "" #. reINVITE and in-dialogs UPDATE go here -#: ../coreapi/callbacks.c:648 +#: ../coreapi/callbacks.c:660 msgid "Call is updated by remote." msgstr "" -#: ../coreapi/callbacks.c:764 +#: ../coreapi/callbacks.c:776 msgid "Call terminated." msgstr "Samtale avsluttet." -#: ../coreapi/callbacks.c:792 +#: ../coreapi/callbacks.c:804 msgid "User is busy." msgstr "Brukeren er opptatt." -#: ../coreapi/callbacks.c:793 +#: ../coreapi/callbacks.c:805 msgid "User is temporarily unavailable." msgstr "Brukeren er midlertidig ikke tilgjengelig." #. char *retrymsg=_("%s. Retry after %i minute(s)."); -#: ../coreapi/callbacks.c:795 +#: ../coreapi/callbacks.c:807 msgid "User does not want to be disturbed." msgstr "Brukeren vil ikke bli forstyrret." -#: ../coreapi/callbacks.c:796 +#: ../coreapi/callbacks.c:808 msgid "Call declined." msgstr "Samtale avvist." -#: ../coreapi/callbacks.c:811 +#: ../coreapi/callbacks.c:823 msgid "Request timeout." msgstr "" -#: ../coreapi/callbacks.c:842 +#: ../coreapi/callbacks.c:854 msgid "Redirected" msgstr "Omdirigert" -#: ../coreapi/callbacks.c:897 +#: ../coreapi/callbacks.c:909 msgid "Call failed." msgstr "Samtale feilet." -#: ../coreapi/callbacks.c:975 +#: ../coreapi/callbacks.c:987 #, c-format msgid "Registration on %s successful." msgstr "Registrering hos %s lykkes." -#: ../coreapi/callbacks.c:976 +#: ../coreapi/callbacks.c:988 #, c-format msgid "Unregistration on %s done." msgstr "Avregistrering hos %s lykkes." -#: ../coreapi/callbacks.c:994 +#: ../coreapi/callbacks.c:1006 msgid "no response timeout" msgstr "ingen svar innen angitt tid" -#: ../coreapi/callbacks.c:997 +#: ../coreapi/callbacks.c:1009 #, c-format msgid "Registration on %s failed: %s" msgstr "Registrering hos %s mislykkes: %s" -#: ../coreapi/callbacks.c:1004 +#: ../coreapi/callbacks.c:1016 msgid "Service unavailable, retrying" msgstr "" @@ -1958,7 +1944,11 @@ msgstr "" msgid "Authentication token is %s" msgstr "" -#: ../coreapi/linphonecall.c:3600 +#: ../coreapi/linphonecall.c:1305 +msgid "Call parameters were successfully modified." +msgstr "" + +#: ../coreapi/linphonecall.c:3659 #, c-format msgid "You have missed %i call." msgid_plural "You have missed %i calls." diff --git a/po/nl.po b/po/nl.po index d11793325..3b0b86a42 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1,22 +1,21 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Heimen Stoffels , 2015 msgid "" msgstr "" "Project-Id-Version: linphone-gtk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-11 16:26+0100\n" -"PO-Revision-Date: 2015-03-09 21:41+0000\n" -"Last-Translator: Heimen Stoffels \n" -"Language-Team: Dutch (http://www.transifex.com/projects/p/linphone-gtk/" -"language/nl/)\n" -"Language: nl\n" +"POT-Creation-Date: 2015-03-27 14:40+0100\n" +"PO-Revision-Date: 2015-03-27 13:40+0000\n" +"Last-Translator: Belledonne Communications \n" +"Language-Team: Dutch (http://www.transifex.com/projects/p/linphone-gtk/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974 @@ -69,9 +68,7 @@ msgstr[1] "%i seconden" msgid "" "%s\tQuality: %s\n" "%s\t%s\t" -msgstr "" -"%s\tKwaliteit: %s\n" -"%s\t%s\t" +msgstr "%s\tKwaliteit: %s\n%s\t%s\t" #: ../gtk/calllogs.c:341 #, c-format @@ -91,143 +88,126 @@ msgstr "Ik" msgid "Couldn't find pixmap file: %s" msgstr "Het pixmap-bestand %s kon niet worden gevonden" -#: ../gtk/chat.c:374 ../gtk/friendlist.c:924 -msgid "Invalid sip contact !" -msgstr "Ongeldig SIP-contactpersoon" +#: ../gtk/main.c:136 +msgid "log to stdout some debug information while running." +msgstr "loggen naar stdout om wat foutopsporingsinformatie te verkrijgen tijdens uitvoeren." #: ../gtk/main.c:137 -msgid "log to stdout some debug information while running." -msgstr "" -"loggen naar stdout om wat foutopsporingsinformatie te verkrijgen tijdens " -"uitvoeren." - -#: ../gtk/main.c:138 msgid "path to a file to write logs into." msgstr "Pad naar een bestand om logbestanden heen te schrijven." -#: ../gtk/main.c:139 +#: ../gtk/main.c:138 msgid "Start linphone with video disabled." msgstr "Linphone opstarten met uitgeschakelde video." -#: ../gtk/main.c:140 +#: ../gtk/main.c:139 msgid "Start only in the system tray, do not show the main interface." msgstr "Alleen in het systeemvak opstarten, niet met venster en al." -#: ../gtk/main.c:141 +#: ../gtk/main.c:140 msgid "address to call right now" msgstr "adres om nu naar toe te bellen" -#: ../gtk/main.c:142 -msgid "if set automatically answer incoming calls" -msgstr "als u dit inschakelt worden oproepen automatisch beantwoord" - -#: ../gtk/main.c:143 +#: ../gtk/main.c:141 msgid "" -"Specifiy a working directory (should be the base of the installation, eg: c:" -"\\Program Files\\Linphone)" -msgstr "" -"Specificeer een werkmap (dit moet de basis van uw installatie zijn, bijv.: C:" -"\\Program Files\\Linphone)" +"Specifiy a working directory (should be the base of the installation, eg: " +"c:\\Program Files\\Linphone)" +msgstr "Specificeer een werkmap (dit moet de basis van uw installatie zijn, bijv.: C:\\Program Files\\Linphone)" -#: ../gtk/main.c:144 +#: ../gtk/main.c:142 msgid "Configuration file" msgstr "Configuratiebestand" -#: ../gtk/main.c:145 +#: ../gtk/main.c:143 msgid "Run the audio assistant" msgstr "Doorloop de audio-instelwizard" -#: ../gtk/main.c:146 +#: ../gtk/main.c:144 msgid "Run self test and exit 0 if succeed" msgstr "Draai een zelftest en exit 0 wanneer succesvol" -#: ../gtk/main.c:1061 +#: ../gtk/main.c:1059 #, 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 wil u toevoegen aan zijn/haar contactpersonenlijst.\n" -"Wilt u toestaan dat hij/zij uw aanwezigheidsstatus ziet of hem/haar " -"toevoegen aan uw contactpersonenljst?\n" -"Indien u nee antwoordt, zal deze persoon tijdelijk op de zwarte lijst worden " -"gezet." +msgstr "%s wil u toevoegen aan zijn/haar contactpersonenlijst.\nWilt u toestaan dat hij/zij uw aanwezigheidsstatus ziet of hem/haar toevoegen aan uw contactpersonenljst?\nIndien u nee antwoordt, zal deze persoon tijdelijk op de zwarte lijst worden gezet." -#: ../gtk/main.c:1138 +#: ../gtk/main.c:1136 #, c-format msgid "" "Please enter your password for username %s\n" " at realm %s:" -msgstr "" -"Vul uw wachtwoord in voor gebruikersnaam %s\n" -"op realm %s" +msgstr "Vul uw wachtwoord in voor gebruikersnaam %s\nop realm %s" -#: ../gtk/main.c:1259 +#: ../gtk/main.c:1257 msgid "Call error" msgstr "Oproepfout" -#: ../gtk/main.c:1262 ../coreapi/linphonecore.c:3791 +#: ../gtk/main.c:1260 ../coreapi/linphonecore.c:3826 msgid "Call ended" msgstr "Oproep beëindigd" -#: ../gtk/main.c:1265 ../coreapi/call_log.c:221 +#: ../gtk/main.c:1263 ../coreapi/call_log.c:221 msgid "Incoming call" msgstr "Inkomende oproep" -#: ../gtk/main.c:1267 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5 +#: ../gtk/main.c:1265 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5 msgid "Answer" msgstr "Opnemen" -#: ../gtk/main.c:1269 ../gtk/main.ui.h:6 +#: ../gtk/main.c:1267 ../gtk/main.ui.h:6 msgid "Decline" msgstr "Weigeren" -#: ../gtk/main.c:1275 +#: ../gtk/main.c:1273 msgid "Call paused" msgstr "Oproep gepauzeerd" -#: ../gtk/main.c:1275 +#: ../gtk/main.c:1273 #, c-format msgid "by %s" msgstr "door %s" -#: ../gtk/main.c:1345 +#: ../gtk/main.c:1343 #, c-format msgid "%s proposed to start video. Do you accept ?" msgstr "%s stelt u voor om video in te schakelen. Wilt u dit accepteren?" -#: ../gtk/main.c:1507 +#: ../gtk/main.c:1505 msgid "Website link" msgstr "Websitelink" -#: ../gtk/main.c:1556 +#: ../gtk/main.c:1554 msgid "Linphone - a video internet phone" msgstr "Linphone - een video-internettelefoon" -#: ../gtk/main.c:1648 +#: ../gtk/main.c:1646 #, c-format msgid "%s (Default)" msgstr "%s (Standaard)" -#: ../gtk/main.c:1980 ../coreapi/callbacks.c:1045 +#: ../gtk/main.c:1978 ../coreapi/callbacks.c:1057 #, c-format msgid "We are transferred to %s" msgstr "We zijn overgeschakeld naar %s" -#: ../gtk/main.c:1990 +#: ../gtk/main.c:1988 msgid "" "No sound cards have been detected on this computer.\n" "You won't be able to send or receive audio calls." -msgstr "" -"Er zijn geluidskaarten aangetroffen op deze computer.\n" -"U zult niet in staat zijn om audio-oproepen te ontvangen of versturen." +msgstr "Er zijn geluidskaarten aangetroffen op deze computer.\nU zult niet in staat zijn om audio-oproepen te ontvangen of versturen." -#: ../gtk/main.c:2135 +#: ../gtk/main.c:2136 msgid "A free SIP video-phone" msgstr "Een gratis SIP-videotelefoon" +#: ../gtk/main.c:2241 +#, c-format +msgid "Hello\n" +msgstr "" + #: ../gtk/friendlist.c:505 msgid "Add to addressbook" msgstr "Toevoegen aan adresboek" @@ -253,6 +233,10 @@ msgstr "Chatten" msgid "Search in %s directory" msgstr "Zoeken in de map %s" +#: ../gtk/friendlist.c:924 +msgid "Invalid sip contact !" +msgstr "Ongeldig SIP-contactpersoon" + #: ../gtk/friendlist.c:976 #, c-format msgid "Edit contact '%s'" @@ -293,7 +277,7 @@ msgstr "Argumenten" msgid "Enabled" msgstr "Ingeschakeld" -#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763 ../gtk/parameters.ui.h:20 +#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763 ../gtk/parameters.ui.h:17 msgid "Disabled" msgstr "Uitgeschakeld" @@ -376,8 +360,7 @@ msgstr "Servisch" #: ../gtk/propertybox.c:1156 msgid "" "You need to restart linphone for the new language selection to take effect." -msgstr "" -"U moet linphone herstarten om de nieuw geselecteerde taal toe te passen." +msgstr "U moet linphone herstarten om de nieuw geselecteerde taal toe te passen." #: ../gtk/propertybox.c:1236 msgid "None" @@ -400,9 +383,7 @@ msgstr "ZRTP" msgid "" "A more recent version is availalble from %s.\n" "Would you like to open a browser to download it ?" -msgstr "" -"Er is een nieuwere versie beschikbaar op %s.\n" -"Wilt een webbrowser openen en deze downloaden?" +msgstr "Er is een nieuwere versie beschikbaar op %s.\nWilt een webbrowser openen en deze downloaden?" #: ../gtk/update.c:91 msgid "You are running the lastest version." @@ -439,10 +420,7 @@ msgstr[1] "%i contactpersonen gevonden" msgid "" "Welcome!\n" "This assistant will help you to use a SIP account for your calls." -msgstr "" -"Welkom!\n" -"Deze instelwizard zal u begeleiden bij het gebruiken van een SIP-account " -"voor oproepen." +msgstr "Welkom!\nDeze instelwizard zal u begeleiden bij het gebruiken van een SIP-account voor oproepen." #: ../gtk/setupwizard.c:43 msgid "Create an account on linphone.org" @@ -464,7 +442,7 @@ msgstr "Ik wil een externe URI-configuratie opgeven" msgid "Enter your linphone.org username" msgstr "Vul uw linphone.org-gebruikersnaam in" -#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:82 ../gtk/ldap.ui.h:4 +#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:81 ../gtk/ldap.ui.h:4 msgid "Username:" msgstr "Gebruikersnaam:" @@ -520,10 +498,7 @@ msgstr "Houdt me op de hoogte van linphone-updates" msgid "" "Error, account not validated, username already used or server unreachable.\n" "Please go back and try again." -msgstr "" -"Er is een fout opgetreden: uw account is niet gevalideerd, de gebruikersnaam " -"wordt al door iemand anders gebruikt of de server is onbereikbaar.\n" -"Ga terug en probeer het opnieuw." +msgstr "Er is een fout opgetreden: uw account is niet gevalideerd, de gebruikersnaam wordt al door iemand anders gebruikt of de server is onbereikbaar.\nGa terug en probeer het opnieuw." #: ../gtk/setupwizard.c:405 msgid "Thank you. Your account is now configured and ready for use." @@ -531,13 +506,9 @@ msgstr "Bedankt. Uw account is nu ingesteld en klaar voor gebruik." #: ../gtk/setupwizard.c:413 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 "" -"Valideer uw account door te klikken op de link die we zojuist naar uw e-" -"mailadres hebben verstuurd.\n" -"Kom dan terug naar dit venster en klik op de knop Volgende." +msgstr "Valideer uw account door te klikken op de link die we zojuist naar uw e-mailadres hebben verstuurd.\nKom dan terug naar dit venster en klik op de knop Volgende." #: ../gtk/setupwizard.c:602 msgid "SIP account configuration assistant" @@ -642,9 +613,7 @@ msgstr "Direct of via een server" msgid "" "download: %f\n" "upload: %f (kbit/s)" -msgstr "" -"download: %f\n" -"upload: %f (kbit/s)" +msgstr "download: %f\nupload: %f (kbit/s)" #: ../gtk/incall_view.c:272 ../gtk/incall_view.c:274 #, c-format @@ -811,10 +780,7 @@ msgstr "Het systeemgeluidspaneel kon niet worden gestart" msgid "" "Welcome!\n" "This assistant will help you to configure audio settings for Linphone" -msgstr "" -"Welkom!\n" -"Deze instelwizard zal u begeleiden bij het instellen van de audio-" -"instellingen van Linphone" +msgstr "Welkom!\nDeze instelwizard zal u begeleiden bij het instellen van de audio-instellingen van Linphone" #: ../gtk/audio_assistant.c:328 msgid "Capture device" @@ -864,17 +830,17 @@ msgstr "Laten we nu Linphone opstarten" msgid "Audio Assistant" msgstr "Audio-instelwizard" -#: ../gtk/audio_assistant.c:513 ../gtk/main.ui.h:31 +#: ../gtk/audio_assistant.c:513 ../gtk/main.ui.h:32 msgid "Audio assistant" msgstr "Audio-instelwizard" #: ../gtk/audio_assistant.c:518 msgid "Mic Gain calibration" -msgstr "" +msgstr "Kalibratie van het microfoonbereik" #: ../gtk/audio_assistant.c:524 msgid "Speaker volume calibration" -msgstr "" +msgstr "Kalibratie van het luidsprekervolume" #: ../gtk/audio_assistant.c:529 msgid "Record and Play" @@ -918,139 +884,139 @@ msgstr "Duur" #: ../gtk/main.ui.h:16 msgid "Call quality rating" -msgstr "" +msgstr "Waardering van de gesprekskwaliteit" #: ../gtk/main.ui.h:17 msgid "All users" -msgstr "" +msgstr "Alle gebruikers" #: ../gtk/main.ui.h:18 msgid "Online users" -msgstr "" +msgstr "Online gebruikers" #: ../gtk/main.ui.h:19 msgid "ADSL" -msgstr "" +msgstr "ADSL" #: ../gtk/main.ui.h:20 msgid "Fiber Channel" -msgstr "" +msgstr "Fiber-kanaal" #: ../gtk/main.ui.h:21 msgid "Default" -msgstr "" +msgstr "Standaard" #: ../gtk/main.ui.h:22 -msgid "_Options" -msgstr "" +msgid "Delete" +msgstr "Verwijderen" #: ../gtk/main.ui.h:23 -msgid "Set configuration URI" -msgstr "" +msgid "_Options" +msgstr "_Opties" #: ../gtk/main.ui.h:24 -msgid "Always start video" -msgstr "" +msgid "Set configuration URI" +msgstr "Configuratie-URI instellen" #: ../gtk/main.ui.h:25 -msgid "Enable self-view" -msgstr "" +msgid "Always start video" +msgstr "Video altijd starten" #: ../gtk/main.ui.h:26 -msgid "_Help" -msgstr "" +msgid "Enable self-view" +msgstr "Eigen weergave inschakelen" #: ../gtk/main.ui.h:27 -msgid "Show debug window" -msgstr "" +msgid "_Help" +msgstr "_Hulp" #: ../gtk/main.ui.h:28 -msgid "_Homepage" -msgstr "" +msgid "Show debug window" +msgstr "Foutopsporingsvenster weergeven" #: ../gtk/main.ui.h:29 -msgid "Check _Updates" -msgstr "" +msgid "_Homepage" +msgstr "_Website" #: ../gtk/main.ui.h:30 -msgid "Account assistant" -msgstr "" +msgid "Check _Updates" +msgstr "Controleren op _updates" -#: ../gtk/main.ui.h:32 -msgid "SIP address or phone number:" -msgstr "" +#: ../gtk/main.ui.h:31 +msgid "Account assistant" +msgstr "Account-instelwizard" #: ../gtk/main.ui.h:33 -msgid "Initiate a new call" -msgstr "" +msgid "SIP address or phone number:" +msgstr "SIP-adres of telefoonnummer:" #: ../gtk/main.ui.h:34 -msgid "Contacts" -msgstr "" +msgid "Initiate a new call" +msgstr "Een nieuw gesprek beginnen" #: ../gtk/main.ui.h:35 -msgid "Search" -msgstr "" +msgid "Contacts" +msgstr "Contactpersonen" #: ../gtk/main.ui.h:36 -msgid "Add contacts from directory" -msgstr "" +msgid "Search" +msgstr "Zoeken" #: ../gtk/main.ui.h:37 -msgid "Add contact" -msgstr "" +msgid "Add contacts from directory" +msgstr "Voeg contactpersonen toe uit map" #: ../gtk/main.ui.h:38 -msgid "Recent calls" -msgstr "" +msgid "Add contact" +msgstr "Contactpersoon toevoegen" #: ../gtk/main.ui.h:39 +msgid "Recent calls" +msgstr "Recente gesprekken" + +#: ../gtk/main.ui.h:40 msgid "My current identity:" -msgstr "" +msgstr "Mijn huidige identiteit:" -#: ../gtk/main.ui.h:40 ../gtk/tunnel_config.ui.h:7 +#: ../gtk/main.ui.h:41 ../gtk/tunnel_config.ui.h:7 msgid "Username" -msgstr "" +msgstr "Gebruikersnaam" -#: ../gtk/main.ui.h:41 ../gtk/tunnel_config.ui.h:8 +#: ../gtk/main.ui.h:42 ../gtk/tunnel_config.ui.h:8 msgid "Password" -msgstr "" - -#: ../gtk/main.ui.h:42 -msgid "Internet connection:" -msgstr "" +msgstr "Wachtwoord" #: ../gtk/main.ui.h:43 +msgid "Internet connection:" +msgstr "Internetverbinding:" + +#: ../gtk/main.ui.h:44 msgid "Automatically log me in" -msgstr "" +msgstr "Automatisch inloggen" -#: ../gtk/main.ui.h:44 ../gtk/password.ui.h:3 +#: ../gtk/main.ui.h:45 ../gtk/password.ui.h:3 msgid "UserID" -msgstr "" - -#: ../gtk/main.ui.h:45 -msgid "Login information" -msgstr "" +msgstr "Gebruikersidentificatie" #: ../gtk/main.ui.h:46 -msgid "Welcome!" -msgstr "" +msgid "Login information" +msgstr "Inloginformatie" #: ../gtk/main.ui.h:47 -msgid "Delete" -msgstr "" +msgid "Welcome!" +msgstr "Welkom!" #: ../gtk/about.ui.h:1 msgid "About Linphone" -msgstr "" +msgstr "Over Linphone" #: ../gtk/about.ui.h:2 msgid "(C) Belledonne Communications, 2010\n" -msgstr "" +msgstr "(C) Belledonne Communications, 2010\n" #: ../gtk/about.ui.h:4 msgid "An internet video phone using the standard SIP (rfc3261) protocol." -msgstr "" +msgstr "Een internetvideotelefoon gebruikmakende van het standaard SIP (rfc3261) protocol." #: ../gtk/about.ui.h:5 msgid "" @@ -1066,63 +1032,63 @@ msgid "" "cs: Petr Pisar \n" "hu: anonymous\n" "he: Eli Zaretskii \n" -msgstr "" +msgstr "fr: Simon Morlat\nen: Simon Morlat and Delphine Perreau\nit: Alberto Zanoni \nde: Jean-Jacques Sarton \nsv: Daniel Nylander \nes: Jesus Benitez \nja: YAMAGUCHI YOSHIYA \npt_BR: Rafael Caesar Lenzi \npl: Robert Nasiadek \ncs: Petr Pisar \nhu: anonymous\nhe: Eli Zaretskii \n" #: ../gtk/contact.ui.h:2 msgid "SIP Address" -msgstr "" +msgstr "SIP-adres" #: ../gtk/contact.ui.h:3 msgid "Show this contact presence status" -msgstr "" +msgstr "De aanwezigheidsstatus van dit contactpersoon weergeven" #: ../gtk/contact.ui.h:4 msgid "Allow this contact to see my presence status" -msgstr "" +msgstr "Toestaan dat deze contactpersoon mijn aanwezigheidsstatus kan weergeven" #: ../gtk/contact.ui.h:5 msgid "Contact information" -msgstr "" +msgstr "Contactinformatie" #: ../gtk/log.ui.h:1 msgid "Linphone debug window" -msgstr "" +msgstr "Linphone-foutopsporingsvenster" #: ../gtk/log.ui.h:2 msgid "Scroll to end" -msgstr "" +msgstr "Scroll naar het einde" #: ../gtk/password.ui.h:1 msgid "Linphone - Authentication required" -msgstr "" +msgstr "Linphone - Authenticatie is vereist" #: ../gtk/password.ui.h:2 msgid "Please enter the domain password" -msgstr "" +msgstr "Vul het domeinnaamwachtwoord in" #: ../gtk/call_logs.ui.h:1 msgid "Call history" -msgstr "" +msgstr "Gespreksgeschiedenis" #: ../gtk/call_logs.ui.h:2 msgid "Clear all" -msgstr "" +msgstr "Alles wissen" #: ../gtk/call_logs.ui.h:3 msgid "Call back" -msgstr "" +msgstr "Terugbellen" #: ../gtk/sip_account.ui.h:1 msgid "Linphone - Configure a SIP account" -msgstr "" +msgstr "Linphone - Een SIP-account instellen" #: ../gtk/sip_account.ui.h:2 msgid "Your SIP identity:" -msgstr "" +msgstr "Uw SIP-identiteit:" #: ../gtk/sip_account.ui.h:3 msgid "Looks like sip:@" -msgstr "" +msgstr "Lijkt op:@" #: ../gtk/sip_account.ui.h:4 msgid "sip:" @@ -1130,23 +1096,23 @@ msgstr "sip:" #: ../gtk/sip_account.ui.h:5 msgid "SIP Proxy address:" -msgstr "" +msgstr "SIP-proxyadres:" #: ../gtk/sip_account.ui.h:6 msgid "Looks like sip:" -msgstr "" +msgstr "Lijkt op sip:" #: ../gtk/sip_account.ui.h:7 msgid "Registration duration (sec):" -msgstr "" +msgstr "Registratieduur (sec):" #: ../gtk/sip_account.ui.h:8 msgid "Contact params (optional):" -msgstr "" +msgstr "Contactparameters (optioneel):" #: ../gtk/sip_account.ui.h:9 msgid "AVPF regular RTCP interval (sec):" -msgstr "" +msgstr "AVPF regulier RTCP-tussenpose (sec):" #: ../gtk/sip_account.ui.h:10 msgid "Route (optional):" @@ -1154,358 +1120,366 @@ msgstr "Route (optioneel):" #: ../gtk/sip_account.ui.h:11 msgid "Transport" -msgstr "" +msgstr "Overdracht" #: ../gtk/sip_account.ui.h:12 msgid "Register" -msgstr "" +msgstr "Registreren" #: ../gtk/sip_account.ui.h:13 msgid "Publish presence information" -msgstr "" +msgstr "Aanwezigheidsinformatie publiceren" #: ../gtk/sip_account.ui.h:14 msgid "Enable AVPF" -msgstr "" +msgstr "AVPF inschakelen" #: ../gtk/sip_account.ui.h:15 msgid "Configure a SIP account" -msgstr "" +msgstr "Een SIP-account instellen" #: ../gtk/parameters.ui.h:1 msgid "anonymous" -msgstr "" +msgstr "anoniem" #: ../gtk/parameters.ui.h:2 msgid "GSSAPI" -msgstr "" +msgstr "GSSAPI" #: ../gtk/parameters.ui.h:3 msgid "SASL" -msgstr "" +msgstr "SASL" #: ../gtk/parameters.ui.h:4 msgid "default soundcard" -msgstr "" +msgstr "standaard geluidskaart" #: ../gtk/parameters.ui.h:5 msgid "a sound card" -msgstr "" +msgstr "een geluidskaart" #: ../gtk/parameters.ui.h:6 msgid "default camera" -msgstr "" +msgstr "standaard camera" #: ../gtk/parameters.ui.h:7 msgid "CIF" -msgstr "" +msgstr "CIF" #: ../gtk/parameters.ui.h:8 msgid "Audio codecs" -msgstr "" +msgstr "Audio-codecs" #: ../gtk/parameters.ui.h:9 msgid "Video codecs" -msgstr "" +msgstr "Video-codecs" #: ../gtk/parameters.ui.h:10 msgid "C" -msgstr "" +msgstr "C" #: ../gtk/parameters.ui.h:11 -msgid "SIP (UDP)" -msgstr "" +msgid "Settings" +msgstr "Instellingen" #: ../gtk/parameters.ui.h:12 -msgid "SIP (TCP)" -msgstr "" +msgid "Set Maximum Transmission Unit:" +msgstr "Maximale Transmissie-unit instellen:" #: ../gtk/parameters.ui.h:13 -msgid "SIP (TLS)" -msgstr "" +msgid "Send DTMFs as SIP info" +msgstr "DTMF's als SIP-informatie versturen" #: ../gtk/parameters.ui.h:14 -msgid "Settings" +msgid "Allow IPv6" msgstr "" #: ../gtk/parameters.ui.h:15 -msgid "Set Maximum Transmission Unit:" -msgstr "" +msgid "Transport" +msgstr "Overdracht" #: ../gtk/parameters.ui.h:16 -msgid "Send DTMFs as SIP info" -msgstr "" - -#: ../gtk/parameters.ui.h:17 -msgid "Use IPv6 instead of IPv4" -msgstr "" +msgid "SIP/UDP port" +msgstr "SIP/UDP-poort" #: ../gtk/parameters.ui.h:18 -msgid "Transport" -msgstr "" +msgid "Random" +msgstr "Willekeurig" #: ../gtk/parameters.ui.h:19 -msgid "SIP/UDP port" -msgstr "" +msgid "SIP/TCP port" +msgstr "SIP/TCP-poort" + +#: ../gtk/parameters.ui.h:20 +msgid "Audio RTP/UDP:" +msgstr "AUDIO RTP/UDP:" #: ../gtk/parameters.ui.h:21 -msgid "Random" -msgstr "" +msgid "Fixed" +msgstr "Vastgezet" #: ../gtk/parameters.ui.h:22 -msgid "SIP/TCP port" -msgstr "" +msgid "Video RTP/UDP:" +msgstr "Video RTP/UDP:" #: ../gtk/parameters.ui.h:23 -msgid "Audio RTP/UDP:" -msgstr "" +msgid "Media encryption type" +msgstr "Mediaversleutelingstype" #: ../gtk/parameters.ui.h:24 -msgid "Fixed" -msgstr "" +msgid "Media encryption is mandatory" +msgstr "Mediaversleuteling is vereist" #: ../gtk/parameters.ui.h:25 -msgid "Video RTP/UDP:" -msgstr "" +msgid "Tunnel" +msgstr "Tunnel" #: ../gtk/parameters.ui.h:26 -msgid "Media encryption type" -msgstr "" +msgid "DSCP fields" +msgstr "DSCP-velden" #: ../gtk/parameters.ui.h:27 -msgid "Media encryption is mandatory" -msgstr "" +msgid "Network protocol and ports" +msgstr "Netwerkprotocol en -poorten" #: ../gtk/parameters.ui.h:28 -msgid "Tunnel" -msgstr "" +msgid "Direct connection to the Internet" +msgstr "Directe verbinding met het internet" #: ../gtk/parameters.ui.h:29 -msgid "DSCP fields" -msgstr "" +msgid "Behind NAT / Firewall (specify gateway IP )" +msgstr "Achter een NAT / Firewall (specificeer de gateway IP)" #: ../gtk/parameters.ui.h:30 -msgid "Network protocol and ports" -msgstr "" - -#: ../gtk/parameters.ui.h:31 -msgid "Direct connection to the Internet" -msgstr "" - -#: ../gtk/parameters.ui.h:32 -msgid "Behind NAT / Firewall (specify gateway IP )" -msgstr "" - -#: ../gtk/parameters.ui.h:33 msgid "Behind NAT / Firewall (use STUN to resolve)" msgstr "" -#: ../gtk/parameters.ui.h:34 +#: ../gtk/parameters.ui.h:31 msgid "Behind NAT / Firewall (use ICE)" msgstr "" -#: ../gtk/parameters.ui.h:35 +#: ../gtk/parameters.ui.h:32 msgid "Behind NAT / Firewall (use uPnP)" msgstr "" -#: ../gtk/parameters.ui.h:36 +#: ../gtk/parameters.ui.h:33 msgid "Public IP address:" -msgstr "" +msgstr "Openbaar IP-adres:" + +#: ../gtk/parameters.ui.h:34 +msgid "Stun server:" +msgstr "Stun-server" + +#: ../gtk/parameters.ui.h:35 +msgid "NAT and Firewall" +msgstr "NAT en Firewall" + +#: ../gtk/parameters.ui.h:36 +msgid "Network settings" +msgstr "Netwerkinstellingen" #: ../gtk/parameters.ui.h:37 -msgid "Stun server:" -msgstr "" +msgid "Ring sound:" +msgstr "Belgeluid:" #: ../gtk/parameters.ui.h:38 -msgid "NAT and Firewall" -msgstr "" +msgid "ALSA special device (optional):" +msgstr "ALSA speciaal apparaat (optioneel)" #: ../gtk/parameters.ui.h:39 -msgid "Network settings" -msgstr "" +msgid "Capture device:" +msgstr "Opnameapparaat:" #: ../gtk/parameters.ui.h:40 -msgid "Ring sound:" -msgstr "" +msgid "Ring device:" +msgstr "Belapparaat:" #: ../gtk/parameters.ui.h:41 -msgid "ALSA special device (optional):" -msgstr "" +msgid "Playback device:" +msgstr "Afspeelapparaat:" #: ../gtk/parameters.ui.h:42 -msgid "Capture device:" -msgstr "" +msgid "Enable echo cancellation" +msgstr "Echo-onderdrukking inschakelen" #: ../gtk/parameters.ui.h:43 -msgid "Ring device:" -msgstr "" +msgid "Audio" +msgstr "Audio" #: ../gtk/parameters.ui.h:44 -msgid "Playback device:" -msgstr "" +msgid "Video input device:" +msgstr "Videoingang-apparaat:" #: ../gtk/parameters.ui.h:45 -msgid "Enable echo cancellation" -msgstr "" +msgid "Prefered video resolution:" +msgstr "Voorkeursvideoresolutie:" #: ../gtk/parameters.ui.h:46 -msgid "Audio" -msgstr "" +msgid "Video output method:" +msgstr "Videouitgangsmethode:" #: ../gtk/parameters.ui.h:47 -msgid "Video input device:" -msgstr "" +msgid "Show camera preview" +msgstr "Cameravoorbeeld weergeven" #: ../gtk/parameters.ui.h:48 -msgid "Prefered video resolution:" -msgstr "" +msgid "Video" +msgstr "Video" #: ../gtk/parameters.ui.h:49 -msgid "Video output method:" -msgstr "" +msgid "Multimedia settings" +msgstr "Multimedia-instellingen" #: ../gtk/parameters.ui.h:50 -msgid "Show camera preview" -msgstr "" - -#: ../gtk/parameters.ui.h:51 -msgid "Video" -msgstr "" - -#: ../gtk/parameters.ui.h:52 -msgid "Multimedia settings" -msgstr "" - -#: ../gtk/parameters.ui.h:53 msgid "This section defines your SIP address when not using a SIP account" msgstr "" -#: ../gtk/parameters.ui.h:54 +#: ../gtk/parameters.ui.h:51 msgid "Your display name (eg: John Doe):" -msgstr "" +msgstr "Uw weergavenaam (bijv.: Jan Noniem):" -#: ../gtk/parameters.ui.h:55 +#: ../gtk/parameters.ui.h:52 msgid "Your username:" -msgstr "" +msgstr "Uw gebruikersnaam:" -#: ../gtk/parameters.ui.h:56 +#: ../gtk/parameters.ui.h:53 msgid "Your resulting SIP address:" msgstr "" -#: ../gtk/parameters.ui.h:57 +#: ../gtk/parameters.ui.h:54 msgid "Default identity" -msgstr "" +msgstr "Standaardidentiteit" -#: ../gtk/parameters.ui.h:58 +#: ../gtk/parameters.ui.h:55 msgid "Wizard" -msgstr "" +msgstr "Instelhulp" -#: ../gtk/parameters.ui.h:59 +#: ../gtk/parameters.ui.h:56 msgid "Add" -msgstr "" +msgstr "Toevoegen" -#: ../gtk/parameters.ui.h:60 +#: ../gtk/parameters.ui.h:57 msgid "Edit" msgstr "Bewerken" -#: ../gtk/parameters.ui.h:61 +#: ../gtk/parameters.ui.h:58 msgid "Remove" msgstr "Verwijderen" -#: ../gtk/parameters.ui.h:62 +#: ../gtk/parameters.ui.h:59 msgid "Proxy accounts" msgstr "" -#: ../gtk/parameters.ui.h:63 +#: ../gtk/parameters.ui.h:60 msgid "Erase all passwords" msgstr "" -#: ../gtk/parameters.ui.h:64 +#: ../gtk/parameters.ui.h:61 msgid "Privacy" msgstr "" -#: ../gtk/parameters.ui.h:65 +#: ../gtk/parameters.ui.h:62 +msgid "Automatically answer when a call is received" +msgstr "" + +#: ../gtk/parameters.ui.h:63 +msgid "Auto-answer" +msgstr "" + +#: ../gtk/parameters.ui.h:64 msgid "Manage SIP Accounts" msgstr "" -#: ../gtk/parameters.ui.h:66 ../gtk/tunnel_config.ui.h:4 +#: ../gtk/parameters.ui.h:65 ../gtk/tunnel_config.ui.h:4 msgid "Enable" msgstr "Aan" -#: ../gtk/parameters.ui.h:67 ../gtk/tunnel_config.ui.h:5 +#: ../gtk/parameters.ui.h:66 ../gtk/tunnel_config.ui.h:5 msgid "Disable" msgstr "Uit" -#: ../gtk/parameters.ui.h:68 +#: ../gtk/parameters.ui.h:67 msgid "Codecs" msgstr "" -#: ../gtk/parameters.ui.h:69 +#: ../gtk/parameters.ui.h:68 msgid "0 stands for \"unlimited\"" msgstr "" -#: ../gtk/parameters.ui.h:70 +#: ../gtk/parameters.ui.h:69 msgid "Upload speed limit in Kbit/sec:" msgstr "" -#: ../gtk/parameters.ui.h:71 +#: ../gtk/parameters.ui.h:70 msgid "Download speed limit in Kbit/sec:" msgstr "" -#: ../gtk/parameters.ui.h:72 +#: ../gtk/parameters.ui.h:71 msgid "Enable adaptive rate control" msgstr "" -#: ../gtk/parameters.ui.h:73 +#: ../gtk/parameters.ui.h:72 msgid "" "Adaptive rate control is a technique to dynamically guess the available " "bandwidth during a call." msgstr "" -#: ../gtk/parameters.ui.h:74 +#: ../gtk/parameters.ui.h:73 msgid "Bandwidth control" msgstr "" -#: ../gtk/parameters.ui.h:75 +#: ../gtk/parameters.ui.h:74 msgid "Codecs" msgstr "" -#: ../gtk/parameters.ui.h:76 +#: ../gtk/parameters.ui.h:75 msgid "Language" msgstr "" -#: ../gtk/parameters.ui.h:77 +#: ../gtk/parameters.ui.h:76 msgid "Show advanced settings" msgstr "" -#: ../gtk/parameters.ui.h:78 +#: ../gtk/parameters.ui.h:77 msgid "Level" msgstr "" -#: ../gtk/parameters.ui.h:79 +#: ../gtk/parameters.ui.h:78 msgid "User interface" msgstr "" -#: ../gtk/parameters.ui.h:80 ../gtk/ldap.ui.h:2 +#: ../gtk/parameters.ui.h:79 ../gtk/ldap.ui.h:2 msgid "Server address:" msgstr "" -#: ../gtk/parameters.ui.h:81 ../gtk/ldap.ui.h:3 +#: ../gtk/parameters.ui.h:80 ../gtk/ldap.ui.h:3 msgid "Authentication method:" msgstr "" -#: ../gtk/parameters.ui.h:83 +#: ../gtk/parameters.ui.h:82 msgid "LDAP Account setup" msgstr "" -#: ../gtk/parameters.ui.h:84 +#: ../gtk/parameters.ui.h:83 msgid "LDAP" msgstr "" -#: ../gtk/parameters.ui.h:85 +#: ../gtk/parameters.ui.h:84 msgid "Done" msgstr "" +#: ../gtk/parameters.ui.h:85 +msgid "SIP (UDP)" +msgstr "" + +#: ../gtk/parameters.ui.h:86 +msgid "SIP (TCP)" +msgstr "" + +#: ../gtk/parameters.ui.h:87 +msgid "SIP (TLS)" +msgstr "" + #: ../gtk/buddylookup.ui.h:1 msgid "Search contacts in directory" msgstr "" @@ -1709,11 +1683,8 @@ msgstr "" #: ../gtk/config-uri.ui.h:2 msgid "" -"This dialog allows to set an http or https address when configuration is to " -"be fetched at startup.\n" -"Please enter or modify the configuration URI below. After clicking OK, " -"Linphone will restart automatically in order to fetch and take into account " -"the new configuration. " +"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n" +"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. " msgstr "" #: ../gtk/provisioning-fetch.ui.h:1 @@ -1724,60 +1695,60 @@ msgstr "" msgid "Please wait while fetching configuration from server..." msgstr "" -#: ../coreapi/linphonecore.c:1512 +#: ../coreapi/linphonecore.c:1534 msgid "Ready" msgstr "Gereed." -#: ../coreapi/linphonecore.c:2499 +#: ../coreapi/linphonecore.c:2534 msgid "Configuring" msgstr "" -#: ../coreapi/linphonecore.c:2673 +#: ../coreapi/linphonecore.c:2708 msgid "Looking for telephone number destination..." msgstr "Zoekt de lokatie van het telefoonnummer..." -#: ../coreapi/linphonecore.c:2675 +#: ../coreapi/linphonecore.c:2710 msgid "Could not resolve this number." msgstr "Kon dit nummer niet vinden." #. must be known at that time -#: ../coreapi/linphonecore.c:2961 +#: ../coreapi/linphonecore.c:2996 msgid "Contacting" msgstr "Verbinden" -#: ../coreapi/linphonecore.c:2966 +#: ../coreapi/linphonecore.c:3001 msgid "Could not call" msgstr "" -#: ../coreapi/linphonecore.c:3116 +#: ../coreapi/linphonecore.c:3152 msgid "Sorry, we have reached the maximum number of simultaneous calls" msgstr "" -#: ../coreapi/linphonecore.c:3274 +#: ../coreapi/linphonecore.c:3310 msgid "is contacting you" msgstr "" -#: ../coreapi/linphonecore.c:3275 +#: ../coreapi/linphonecore.c:3311 msgid " and asked autoanswer." msgstr "" -#: ../coreapi/linphonecore.c:3399 +#: ../coreapi/linphonecore.c:3435 msgid "Modifying call parameters..." msgstr "" -#: ../coreapi/linphonecore.c:3747 +#: ../coreapi/linphonecore.c:3782 msgid "Connected." msgstr "Verbonden." -#: ../coreapi/linphonecore.c:3772 +#: ../coreapi/linphonecore.c:3807 msgid "Call aborted" msgstr "" -#: ../coreapi/linphonecore.c:3962 +#: ../coreapi/linphonecore.c:3997 msgid "Could not pause the call" msgstr "" -#: ../coreapi/linphonecore.c:3965 +#: ../coreapi/linphonecore.c:4000 msgid "Pausing the current call..." msgstr "" @@ -1853,117 +1824,117 @@ msgid "" "It should look like sip:username@proxydomain, such as sip:alice@example.net" msgstr "" -#: ../coreapi/proxy.c:1403 +#: ../coreapi/proxy.c:1416 #, c-format msgid "Could not login as %s" msgstr "" -#: ../coreapi/callbacks.c:419 +#: ../coreapi/callbacks.c:428 msgid "Remote ringing." msgstr "" -#: ../coreapi/callbacks.c:431 +#: ../coreapi/callbacks.c:440 msgid "Remote ringing..." msgstr "" -#: ../coreapi/callbacks.c:448 +#: ../coreapi/callbacks.c:461 msgid "Early media." msgstr "" -#: ../coreapi/callbacks.c:521 +#: ../coreapi/callbacks.c:533 #, c-format msgid "Call with %s is paused." msgstr "" -#: ../coreapi/callbacks.c:534 +#: ../coreapi/callbacks.c:546 #, c-format msgid "Call answered by %s - on hold." msgstr "" -#: ../coreapi/callbacks.c:544 +#: ../coreapi/callbacks.c:556 msgid "Call resumed." msgstr "" -#: ../coreapi/callbacks.c:548 +#: ../coreapi/callbacks.c:560 #, c-format msgid "Call answered by %s." msgstr "" -#: ../coreapi/callbacks.c:571 +#: ../coreapi/callbacks.c:583 msgid "Incompatible, check codecs or security settings..." msgstr "" -#: ../coreapi/callbacks.c:576 ../coreapi/callbacks.c:888 +#: ../coreapi/callbacks.c:588 ../coreapi/callbacks.c:900 msgid "Incompatible media parameters." msgstr "" -#: ../coreapi/callbacks.c:606 +#: ../coreapi/callbacks.c:618 msgid "We have been resumed." msgstr "" #. we are being paused -#: ../coreapi/callbacks.c:614 +#: ../coreapi/callbacks.c:626 msgid "We are paused by other party." msgstr "" #. reINVITE and in-dialogs UPDATE go here -#: ../coreapi/callbacks.c:648 +#: ../coreapi/callbacks.c:660 msgid "Call is updated by remote." msgstr "" -#: ../coreapi/callbacks.c:764 +#: ../coreapi/callbacks.c:776 msgid "Call terminated." msgstr "Oproep beeindigd." -#: ../coreapi/callbacks.c:792 +#: ../coreapi/callbacks.c:804 msgid "User is busy." msgstr "Gebruiker is bezet." -#: ../coreapi/callbacks.c:793 +#: ../coreapi/callbacks.c:805 msgid "User is temporarily unavailable." msgstr "Gebruiker is tijdelijk niet beschikbaar." #. char *retrymsg=_("%s. Retry after %i minute(s)."); -#: ../coreapi/callbacks.c:795 +#: ../coreapi/callbacks.c:807 msgid "User does not want to be disturbed." msgstr "De gebruiker wenst niet gestoord te worden." -#: ../coreapi/callbacks.c:796 +#: ../coreapi/callbacks.c:808 msgid "Call declined." msgstr "Oproep geweigerd." -#: ../coreapi/callbacks.c:811 +#: ../coreapi/callbacks.c:823 msgid "Request timeout." msgstr "" -#: ../coreapi/callbacks.c:842 +#: ../coreapi/callbacks.c:854 msgid "Redirected" msgstr "" -#: ../coreapi/callbacks.c:897 +#: ../coreapi/callbacks.c:909 msgid "Call failed." msgstr "" -#: ../coreapi/callbacks.c:975 +#: ../coreapi/callbacks.c:987 #, c-format msgid "Registration on %s successful." msgstr "Registratie op %s gelukt." -#: ../coreapi/callbacks.c:976 +#: ../coreapi/callbacks.c:988 #, c-format msgid "Unregistration on %s done." msgstr "" -#: ../coreapi/callbacks.c:994 +#: ../coreapi/callbacks.c:1006 msgid "no response timeout" msgstr "" -#: ../coreapi/callbacks.c:997 +#: ../coreapi/callbacks.c:1009 #, c-format msgid "Registration on %s failed: %s" msgstr "" -#: ../coreapi/callbacks.c:1004 +#: ../coreapi/callbacks.c:1016 msgid "Service unavailable, retrying" msgstr "" @@ -1973,7 +1944,11 @@ msgstr "" msgid "Authentication token is %s" msgstr "" -#: ../coreapi/linphonecall.c:3600 +#: ../coreapi/linphonecall.c:1305 +msgid "Call parameters were successfully modified." +msgstr "" + +#: ../coreapi/linphonecall.c:3659 #, c-format msgid "You have missed %i call." msgid_plural "You have missed %i calls." diff --git a/po/pl.po b/po/pl.po index 40787491c..0b5ddec6c 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1,24 +1,21 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: msgid "" msgstr "" "Project-Id-Version: linphone-gtk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-11 16:26+0100\n" -"PO-Revision-Date: 2015-02-17 11:28+0000\n" -"Last-Translator: Belledonne Communications \n" -"Language-Team: Polish (http://www.transifex.com/projects/p/linphone-gtk/" -"language/pl/)\n" -"Language: pl\n" +"POT-Creation-Date: 2015-03-27 14:40+0100\n" +"PO-Revision-Date: 2015-03-27 13:40+0000\n" +"Last-Translator: Belledonne Communications \n" +"Language-Team: Polish (http://www.transifex.com/projects/p/linphone-gtk/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " -"|| n%100>=20) ? 1 : 2);\n" +"Language: pl\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974 #, c-format @@ -92,130 +89,126 @@ msgstr "" msgid "Couldn't find pixmap file: %s" msgstr "Nie można znaleźć pixmapy: %s" -#: ../gtk/chat.c:374 ../gtk/friendlist.c:924 -msgid "Invalid sip contact !" -msgstr "" - -#: ../gtk/main.c:137 +#: ../gtk/main.c:136 msgid "log to stdout some debug information while running." msgstr "" -#: ../gtk/main.c:138 +#: ../gtk/main.c:137 msgid "path to a file to write logs into." msgstr "" -#: ../gtk/main.c:139 +#: ../gtk/main.c:138 msgid "Start linphone with video disabled." msgstr "" -#: ../gtk/main.c:140 +#: ../gtk/main.c:139 msgid "Start only in the system tray, do not show the main interface." msgstr "" -#: ../gtk/main.c:141 +#: ../gtk/main.c:140 msgid "address to call right now" msgstr "" -#: ../gtk/main.c:142 -msgid "if set automatically answer incoming calls" -msgstr "" - -#: ../gtk/main.c:143 +#: ../gtk/main.c:141 msgid "" -"Specifiy a working directory (should be the base of the installation, eg: c:" -"\\Program Files\\Linphone)" +"Specifiy a working directory (should be the base of the installation, eg: " +"c:\\Program Files\\Linphone)" msgstr "" -#: ../gtk/main.c:144 +#: ../gtk/main.c:142 msgid "Configuration file" msgstr "" -#: ../gtk/main.c:145 +#: ../gtk/main.c:143 msgid "Run the audio assistant" msgstr "" -#: ../gtk/main.c:146 +#: ../gtk/main.c:144 msgid "Run self test and exit 0 if succeed" msgstr "" -#: ../gtk/main.c:1061 +#: ../gtk/main.c:1059 #, 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 "" -#: ../gtk/main.c:1138 +#: ../gtk/main.c:1136 #, c-format msgid "" "Please enter your password for username %s\n" " at realm %s:" msgstr "" -#: ../gtk/main.c:1259 +#: ../gtk/main.c:1257 msgid "Call error" msgstr "" -#: ../gtk/main.c:1262 ../coreapi/linphonecore.c:3791 +#: ../gtk/main.c:1260 ../coreapi/linphonecore.c:3826 msgid "Call ended" msgstr "" -#: ../gtk/main.c:1265 ../coreapi/call_log.c:221 +#: ../gtk/main.c:1263 ../coreapi/call_log.c:221 msgid "Incoming call" msgstr "" -#: ../gtk/main.c:1267 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5 +#: ../gtk/main.c:1265 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5 msgid "Answer" msgstr "" -#: ../gtk/main.c:1269 ../gtk/main.ui.h:6 +#: ../gtk/main.c:1267 ../gtk/main.ui.h:6 msgid "Decline" msgstr "" -#: ../gtk/main.c:1275 +#: ../gtk/main.c:1273 msgid "Call paused" msgstr "" -#: ../gtk/main.c:1275 +#: ../gtk/main.c:1273 #, c-format msgid "by %s" msgstr "" -#: ../gtk/main.c:1345 +#: ../gtk/main.c:1343 #, c-format msgid "%s proposed to start video. Do you accept ?" msgstr "" -#: ../gtk/main.c:1507 +#: ../gtk/main.c:1505 msgid "Website link" msgstr "" -#: ../gtk/main.c:1556 +#: ../gtk/main.c:1554 msgid "Linphone - a video internet phone" msgstr "" -#: ../gtk/main.c:1648 +#: ../gtk/main.c:1646 #, c-format msgid "%s (Default)" msgstr "" -#: ../gtk/main.c:1980 ../coreapi/callbacks.c:1045 +#: ../gtk/main.c:1978 ../coreapi/callbacks.c:1057 #, c-format msgid "We are transferred to %s" msgstr "" -#: ../gtk/main.c:1990 +#: ../gtk/main.c:1988 msgid "" "No sound cards have been detected on this computer.\n" "You won't be able to send or receive audio calls." msgstr "" -#: ../gtk/main.c:2135 +#: ../gtk/main.c:2136 msgid "A free SIP video-phone" msgstr "" +#: ../gtk/main.c:2241 +#, c-format +msgid "Hello\n" +msgstr "" + #: ../gtk/friendlist.c:505 msgid "Add to addressbook" msgstr "" @@ -241,6 +234,10 @@ msgstr "" msgid "Search in %s directory" msgstr "" +#: ../gtk/friendlist.c:924 +msgid "Invalid sip contact !" +msgstr "" + #: ../gtk/friendlist.c:976 #, c-format msgid "Edit contact '%s'" @@ -281,7 +278,7 @@ msgstr "Parametr" msgid "Enabled" msgstr "Włączone" -#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763 ../gtk/parameters.ui.h:20 +#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763 ../gtk/parameters.ui.h:17 msgid "Disabled" msgstr "Wyłączone" @@ -447,7 +444,7 @@ msgstr "" msgid "Enter your linphone.org username" msgstr "" -#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:82 ../gtk/ldap.ui.h:4 +#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:81 ../gtk/ldap.ui.h:4 msgid "Username:" msgstr "" @@ -511,8 +508,7 @@ msgstr "" #: ../gtk/setupwizard.c:413 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 "" @@ -836,7 +832,7 @@ msgstr "" msgid "Audio Assistant" msgstr "" -#: ../gtk/audio_assistant.c:513 ../gtk/main.ui.h:31 +#: ../gtk/audio_assistant.c:513 ../gtk/main.ui.h:32 msgid "Audio assistant" msgstr "" @@ -913,103 +909,103 @@ msgid "Default" msgstr "" #: ../gtk/main.ui.h:22 -msgid "_Options" +msgid "Delete" msgstr "" #: ../gtk/main.ui.h:23 -msgid "Set configuration URI" +msgid "_Options" msgstr "" #: ../gtk/main.ui.h:24 -msgid "Always start video" +msgid "Set configuration URI" msgstr "" #: ../gtk/main.ui.h:25 -msgid "Enable self-view" +msgid "Always start video" msgstr "" #: ../gtk/main.ui.h:26 -msgid "_Help" +msgid "Enable self-view" msgstr "" #: ../gtk/main.ui.h:27 -msgid "Show debug window" +msgid "_Help" msgstr "" #: ../gtk/main.ui.h:28 -msgid "_Homepage" +msgid "Show debug window" msgstr "" #: ../gtk/main.ui.h:29 -msgid "Check _Updates" +msgid "_Homepage" msgstr "" #: ../gtk/main.ui.h:30 +msgid "Check _Updates" +msgstr "" + +#: ../gtk/main.ui.h:31 msgid "Account assistant" msgstr "" -#: ../gtk/main.ui.h:32 +#: ../gtk/main.ui.h:33 msgid "SIP address or phone number:" msgstr "" -#: ../gtk/main.ui.h:33 +#: ../gtk/main.ui.h:34 msgid "Initiate a new call" msgstr "" -#: ../gtk/main.ui.h:34 +#: ../gtk/main.ui.h:35 msgid "Contacts" msgstr "" -#: ../gtk/main.ui.h:35 +#: ../gtk/main.ui.h:36 msgid "Search" msgstr "" -#: ../gtk/main.ui.h:36 +#: ../gtk/main.ui.h:37 msgid "Add contacts from directory" msgstr "" -#: ../gtk/main.ui.h:37 +#: ../gtk/main.ui.h:38 msgid "Add contact" msgstr "" -#: ../gtk/main.ui.h:38 +#: ../gtk/main.ui.h:39 msgid "Recent calls" msgstr "" -#: ../gtk/main.ui.h:39 +#: ../gtk/main.ui.h:40 msgid "My current identity:" msgstr "" -#: ../gtk/main.ui.h:40 ../gtk/tunnel_config.ui.h:7 +#: ../gtk/main.ui.h:41 ../gtk/tunnel_config.ui.h:7 msgid "Username" msgstr "" -#: ../gtk/main.ui.h:41 ../gtk/tunnel_config.ui.h:8 +#: ../gtk/main.ui.h:42 ../gtk/tunnel_config.ui.h:8 msgid "Password" msgstr "" -#: ../gtk/main.ui.h:42 +#: ../gtk/main.ui.h:43 msgid "Internet connection:" msgstr "" -#: ../gtk/main.ui.h:43 +#: ../gtk/main.ui.h:44 msgid "Automatically log me in" msgstr "" -#: ../gtk/main.ui.h:44 ../gtk/password.ui.h:3 +#: ../gtk/main.ui.h:45 ../gtk/password.ui.h:3 msgid "UserID" msgstr "" -#: ../gtk/main.ui.h:45 +#: ../gtk/main.ui.h:46 msgid "Login information" msgstr "" -#: ../gtk/main.ui.h:46 -msgid "Welcome!" -msgstr "" - #: ../gtk/main.ui.h:47 -msgid "Delete" +msgid "Welcome!" msgstr "" #: ../gtk/about.ui.h:1 @@ -1185,299 +1181,307 @@ msgid "C" msgstr "" #: ../gtk/parameters.ui.h:11 -msgid "SIP (UDP)" -msgstr "" - -#: ../gtk/parameters.ui.h:12 -msgid "SIP (TCP)" -msgstr "" - -#: ../gtk/parameters.ui.h:13 -msgid "SIP (TLS)" -msgstr "" - -#: ../gtk/parameters.ui.h:14 msgid "Settings" msgstr "" -#: ../gtk/parameters.ui.h:15 +#: ../gtk/parameters.ui.h:12 msgid "Set Maximum Transmission Unit:" msgstr "" -#: ../gtk/parameters.ui.h:16 +#: ../gtk/parameters.ui.h:13 msgid "Send DTMFs as SIP info" msgstr "" -#: ../gtk/parameters.ui.h:17 -msgid "Use IPv6 instead of IPv4" +#: ../gtk/parameters.ui.h:14 +msgid "Allow IPv6" msgstr "" -#: ../gtk/parameters.ui.h:18 +#: ../gtk/parameters.ui.h:15 msgid "Transport" msgstr "" -#: ../gtk/parameters.ui.h:19 +#: ../gtk/parameters.ui.h:16 msgid "SIP/UDP port" msgstr "" -#: ../gtk/parameters.ui.h:21 +#: ../gtk/parameters.ui.h:18 msgid "Random" msgstr "" -#: ../gtk/parameters.ui.h:22 +#: ../gtk/parameters.ui.h:19 msgid "SIP/TCP port" msgstr "" -#: ../gtk/parameters.ui.h:23 +#: ../gtk/parameters.ui.h:20 msgid "Audio RTP/UDP:" msgstr "" -#: ../gtk/parameters.ui.h:24 +#: ../gtk/parameters.ui.h:21 msgid "Fixed" msgstr "" -#: ../gtk/parameters.ui.h:25 +#: ../gtk/parameters.ui.h:22 msgid "Video RTP/UDP:" msgstr "" -#: ../gtk/parameters.ui.h:26 +#: ../gtk/parameters.ui.h:23 msgid "Media encryption type" msgstr "" -#: ../gtk/parameters.ui.h:27 +#: ../gtk/parameters.ui.h:24 msgid "Media encryption is mandatory" msgstr "" -#: ../gtk/parameters.ui.h:28 +#: ../gtk/parameters.ui.h:25 msgid "Tunnel" msgstr "" -#: ../gtk/parameters.ui.h:29 +#: ../gtk/parameters.ui.h:26 msgid "DSCP fields" msgstr "" -#: ../gtk/parameters.ui.h:30 +#: ../gtk/parameters.ui.h:27 msgid "Network protocol and ports" msgstr "" -#: ../gtk/parameters.ui.h:31 +#: ../gtk/parameters.ui.h:28 msgid "Direct connection to the Internet" msgstr "" -#: ../gtk/parameters.ui.h:32 +#: ../gtk/parameters.ui.h:29 msgid "Behind NAT / Firewall (specify gateway IP )" msgstr "" -#: ../gtk/parameters.ui.h:33 +#: ../gtk/parameters.ui.h:30 msgid "Behind NAT / Firewall (use STUN to resolve)" msgstr "" -#: ../gtk/parameters.ui.h:34 +#: ../gtk/parameters.ui.h:31 msgid "Behind NAT / Firewall (use ICE)" msgstr "" -#: ../gtk/parameters.ui.h:35 +#: ../gtk/parameters.ui.h:32 msgid "Behind NAT / Firewall (use uPnP)" msgstr "" -#: ../gtk/parameters.ui.h:36 +#: ../gtk/parameters.ui.h:33 msgid "Public IP address:" msgstr "" -#: ../gtk/parameters.ui.h:37 +#: ../gtk/parameters.ui.h:34 msgid "Stun server:" msgstr "" -#: ../gtk/parameters.ui.h:38 +#: ../gtk/parameters.ui.h:35 msgid "NAT and Firewall" msgstr "" -#: ../gtk/parameters.ui.h:39 +#: ../gtk/parameters.ui.h:36 msgid "Network settings" msgstr "" -#: ../gtk/parameters.ui.h:40 +#: ../gtk/parameters.ui.h:37 msgid "Ring sound:" msgstr "" -#: ../gtk/parameters.ui.h:41 +#: ../gtk/parameters.ui.h:38 msgid "ALSA special device (optional):" msgstr "" -#: ../gtk/parameters.ui.h:42 +#: ../gtk/parameters.ui.h:39 msgid "Capture device:" msgstr "" -#: ../gtk/parameters.ui.h:43 +#: ../gtk/parameters.ui.h:40 msgid "Ring device:" msgstr "" -#: ../gtk/parameters.ui.h:44 +#: ../gtk/parameters.ui.h:41 msgid "Playback device:" msgstr "" -#: ../gtk/parameters.ui.h:45 +#: ../gtk/parameters.ui.h:42 msgid "Enable echo cancellation" msgstr "" -#: ../gtk/parameters.ui.h:46 +#: ../gtk/parameters.ui.h:43 msgid "Audio" msgstr "" -#: ../gtk/parameters.ui.h:47 +#: ../gtk/parameters.ui.h:44 msgid "Video input device:" msgstr "" -#: ../gtk/parameters.ui.h:48 +#: ../gtk/parameters.ui.h:45 msgid "Prefered video resolution:" msgstr "" -#: ../gtk/parameters.ui.h:49 +#: ../gtk/parameters.ui.h:46 msgid "Video output method:" msgstr "" -#: ../gtk/parameters.ui.h:50 +#: ../gtk/parameters.ui.h:47 msgid "Show camera preview" msgstr "" -#: ../gtk/parameters.ui.h:51 +#: ../gtk/parameters.ui.h:48 msgid "Video" msgstr "" -#: ../gtk/parameters.ui.h:52 +#: ../gtk/parameters.ui.h:49 msgid "Multimedia settings" msgstr "" -#: ../gtk/parameters.ui.h:53 +#: ../gtk/parameters.ui.h:50 msgid "This section defines your SIP address when not using a SIP account" msgstr "" -#: ../gtk/parameters.ui.h:54 +#: ../gtk/parameters.ui.h:51 msgid "Your display name (eg: John Doe):" msgstr "" -#: ../gtk/parameters.ui.h:55 +#: ../gtk/parameters.ui.h:52 msgid "Your username:" msgstr "" -#: ../gtk/parameters.ui.h:56 +#: ../gtk/parameters.ui.h:53 msgid "Your resulting SIP address:" msgstr "" -#: ../gtk/parameters.ui.h:57 +#: ../gtk/parameters.ui.h:54 msgid "Default identity" msgstr "" -#: ../gtk/parameters.ui.h:58 +#: ../gtk/parameters.ui.h:55 msgid "Wizard" msgstr "" -#: ../gtk/parameters.ui.h:59 +#: ../gtk/parameters.ui.h:56 msgid "Add" msgstr "" -#: ../gtk/parameters.ui.h:60 +#: ../gtk/parameters.ui.h:57 msgid "Edit" msgstr "" -#: ../gtk/parameters.ui.h:61 +#: ../gtk/parameters.ui.h:58 msgid "Remove" msgstr "" -#: ../gtk/parameters.ui.h:62 +#: ../gtk/parameters.ui.h:59 msgid "Proxy accounts" msgstr "" -#: ../gtk/parameters.ui.h:63 +#: ../gtk/parameters.ui.h:60 msgid "Erase all passwords" msgstr "" -#: ../gtk/parameters.ui.h:64 +#: ../gtk/parameters.ui.h:61 msgid "Privacy" msgstr "" -#: ../gtk/parameters.ui.h:65 +#: ../gtk/parameters.ui.h:62 +msgid "Automatically answer when a call is received" +msgstr "" + +#: ../gtk/parameters.ui.h:63 +msgid "Auto-answer" +msgstr "" + +#: ../gtk/parameters.ui.h:64 msgid "Manage SIP Accounts" msgstr "" -#: ../gtk/parameters.ui.h:66 ../gtk/tunnel_config.ui.h:4 +#: ../gtk/parameters.ui.h:65 ../gtk/tunnel_config.ui.h:4 msgid "Enable" msgstr "Włączony" -#: ../gtk/parameters.ui.h:67 ../gtk/tunnel_config.ui.h:5 +#: ../gtk/parameters.ui.h:66 ../gtk/tunnel_config.ui.h:5 msgid "Disable" msgstr "Wyłącz" -#: ../gtk/parameters.ui.h:68 +#: ../gtk/parameters.ui.h:67 msgid "Codecs" msgstr "" -#: ../gtk/parameters.ui.h:69 +#: ../gtk/parameters.ui.h:68 msgid "0 stands for \"unlimited\"" msgstr "" -#: ../gtk/parameters.ui.h:70 +#: ../gtk/parameters.ui.h:69 msgid "Upload speed limit in Kbit/sec:" msgstr "" -#: ../gtk/parameters.ui.h:71 +#: ../gtk/parameters.ui.h:70 msgid "Download speed limit in Kbit/sec:" msgstr "" -#: ../gtk/parameters.ui.h:72 +#: ../gtk/parameters.ui.h:71 msgid "Enable adaptive rate control" msgstr "" -#: ../gtk/parameters.ui.h:73 +#: ../gtk/parameters.ui.h:72 msgid "" "Adaptive rate control is a technique to dynamically guess the available " "bandwidth during a call." msgstr "" -#: ../gtk/parameters.ui.h:74 +#: ../gtk/parameters.ui.h:73 msgid "Bandwidth control" msgstr "" -#: ../gtk/parameters.ui.h:75 +#: ../gtk/parameters.ui.h:74 msgid "Codecs" msgstr "" -#: ../gtk/parameters.ui.h:76 +#: ../gtk/parameters.ui.h:75 msgid "Language" msgstr "" -#: ../gtk/parameters.ui.h:77 +#: ../gtk/parameters.ui.h:76 msgid "Show advanced settings" msgstr "" -#: ../gtk/parameters.ui.h:78 +#: ../gtk/parameters.ui.h:77 msgid "Level" msgstr "" -#: ../gtk/parameters.ui.h:79 +#: ../gtk/parameters.ui.h:78 msgid "User interface" msgstr "" -#: ../gtk/parameters.ui.h:80 ../gtk/ldap.ui.h:2 +#: ../gtk/parameters.ui.h:79 ../gtk/ldap.ui.h:2 msgid "Server address:" msgstr "" -#: ../gtk/parameters.ui.h:81 ../gtk/ldap.ui.h:3 +#: ../gtk/parameters.ui.h:80 ../gtk/ldap.ui.h:3 msgid "Authentication method:" msgstr "" -#: ../gtk/parameters.ui.h:83 +#: ../gtk/parameters.ui.h:82 msgid "LDAP Account setup" msgstr "" -#: ../gtk/parameters.ui.h:84 +#: ../gtk/parameters.ui.h:83 msgid "LDAP" msgstr "" -#: ../gtk/parameters.ui.h:85 +#: ../gtk/parameters.ui.h:84 msgid "Done" msgstr "" +#: ../gtk/parameters.ui.h:85 +msgid "SIP (UDP)" +msgstr "" + +#: ../gtk/parameters.ui.h:86 +msgid "SIP (TCP)" +msgstr "" + +#: ../gtk/parameters.ui.h:87 +msgid "SIP (TLS)" +msgstr "" + #: ../gtk/buddylookup.ui.h:1 msgid "Search contacts in directory" msgstr "" @@ -1681,11 +1685,8 @@ msgstr "" #: ../gtk/config-uri.ui.h:2 msgid "" -"This dialog allows to set an http or https address when configuration is to " -"be fetched at startup.\n" -"Please enter or modify the configuration URI below. After clicking OK, " -"Linphone will restart automatically in order to fetch and take into account " -"the new configuration. " +"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n" +"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. " msgstr "" #: ../gtk/provisioning-fetch.ui.h:1 @@ -1696,60 +1697,60 @@ msgstr "" msgid "Please wait while fetching configuration from server..." msgstr "" -#: ../coreapi/linphonecore.c:1512 +#: ../coreapi/linphonecore.c:1534 msgid "Ready" msgstr "" -#: ../coreapi/linphonecore.c:2499 +#: ../coreapi/linphonecore.c:2534 msgid "Configuring" msgstr "" -#: ../coreapi/linphonecore.c:2673 +#: ../coreapi/linphonecore.c:2708 msgid "Looking for telephone number destination..." msgstr "" -#: ../coreapi/linphonecore.c:2675 +#: ../coreapi/linphonecore.c:2710 msgid "Could not resolve this number." msgstr "" #. must be known at that time -#: ../coreapi/linphonecore.c:2961 +#: ../coreapi/linphonecore.c:2996 msgid "Contacting" msgstr "" -#: ../coreapi/linphonecore.c:2966 +#: ../coreapi/linphonecore.c:3001 msgid "Could not call" msgstr "" -#: ../coreapi/linphonecore.c:3116 +#: ../coreapi/linphonecore.c:3152 msgid "Sorry, we have reached the maximum number of simultaneous calls" msgstr "" -#: ../coreapi/linphonecore.c:3274 +#: ../coreapi/linphonecore.c:3310 msgid "is contacting you" msgstr "" -#: ../coreapi/linphonecore.c:3275 +#: ../coreapi/linphonecore.c:3311 msgid " and asked autoanswer." msgstr "" -#: ../coreapi/linphonecore.c:3399 +#: ../coreapi/linphonecore.c:3435 msgid "Modifying call parameters..." msgstr "" -#: ../coreapi/linphonecore.c:3747 +#: ../coreapi/linphonecore.c:3782 msgid "Connected." msgstr "Połączony" -#: ../coreapi/linphonecore.c:3772 +#: ../coreapi/linphonecore.c:3807 msgid "Call aborted" msgstr "" -#: ../coreapi/linphonecore.c:3962 +#: ../coreapi/linphonecore.c:3997 msgid "Could not pause the call" msgstr "" -#: ../coreapi/linphonecore.c:3965 +#: ../coreapi/linphonecore.c:4000 msgid "Pausing the current call..." msgstr "" @@ -1825,117 +1826,117 @@ msgid "" "It should look like sip:username@proxydomain, such as sip:alice@example.net" msgstr "" -#: ../coreapi/proxy.c:1403 +#: ../coreapi/proxy.c:1416 #, c-format msgid "Could not login as %s" msgstr "" -#: ../coreapi/callbacks.c:419 +#: ../coreapi/callbacks.c:428 msgid "Remote ringing." msgstr "" -#: ../coreapi/callbacks.c:431 +#: ../coreapi/callbacks.c:440 msgid "Remote ringing..." msgstr "" -#: ../coreapi/callbacks.c:448 +#: ../coreapi/callbacks.c:461 msgid "Early media." msgstr "" -#: ../coreapi/callbacks.c:521 +#: ../coreapi/callbacks.c:533 #, c-format msgid "Call with %s is paused." msgstr "" -#: ../coreapi/callbacks.c:534 +#: ../coreapi/callbacks.c:546 #, c-format msgid "Call answered by %s - on hold." msgstr "" -#: ../coreapi/callbacks.c:544 +#: ../coreapi/callbacks.c:556 msgid "Call resumed." msgstr "" -#: ../coreapi/callbacks.c:548 +#: ../coreapi/callbacks.c:560 #, c-format msgid "Call answered by %s." msgstr "" -#: ../coreapi/callbacks.c:571 +#: ../coreapi/callbacks.c:583 msgid "Incompatible, check codecs or security settings..." msgstr "" -#: ../coreapi/callbacks.c:576 ../coreapi/callbacks.c:888 +#: ../coreapi/callbacks.c:588 ../coreapi/callbacks.c:900 msgid "Incompatible media parameters." msgstr "" -#: ../coreapi/callbacks.c:606 +#: ../coreapi/callbacks.c:618 msgid "We have been resumed." msgstr "" #. we are being paused -#: ../coreapi/callbacks.c:614 +#: ../coreapi/callbacks.c:626 msgid "We are paused by other party." msgstr "" #. reINVITE and in-dialogs UPDATE go here -#: ../coreapi/callbacks.c:648 +#: ../coreapi/callbacks.c:660 msgid "Call is updated by remote." msgstr "" -#: ../coreapi/callbacks.c:764 +#: ../coreapi/callbacks.c:776 msgid "Call terminated." msgstr "" -#: ../coreapi/callbacks.c:792 +#: ../coreapi/callbacks.c:804 msgid "User is busy." msgstr "Osoba jest zajęta." -#: ../coreapi/callbacks.c:793 +#: ../coreapi/callbacks.c:805 msgid "User is temporarily unavailable." msgstr "Osoba jest tymczasowo niedostępna." #. char *retrymsg=_("%s. Retry after %i minute(s)."); -#: ../coreapi/callbacks.c:795 +#: ../coreapi/callbacks.c:807 msgid "User does not want to be disturbed." msgstr "Osoba nie chce, aby jej przeszkadzać." -#: ../coreapi/callbacks.c:796 +#: ../coreapi/callbacks.c:808 msgid "Call declined." msgstr "Rozmowa odrzucona." -#: ../coreapi/callbacks.c:811 +#: ../coreapi/callbacks.c:823 msgid "Request timeout." msgstr "" -#: ../coreapi/callbacks.c:842 +#: ../coreapi/callbacks.c:854 msgid "Redirected" msgstr "" -#: ../coreapi/callbacks.c:897 +#: ../coreapi/callbacks.c:909 msgid "Call failed." msgstr "" -#: ../coreapi/callbacks.c:975 +#: ../coreapi/callbacks.c:987 #, c-format msgid "Registration on %s successful." msgstr "" -#: ../coreapi/callbacks.c:976 +#: ../coreapi/callbacks.c:988 #, c-format msgid "Unregistration on %s done." msgstr "" -#: ../coreapi/callbacks.c:994 +#: ../coreapi/callbacks.c:1006 msgid "no response timeout" msgstr "" -#: ../coreapi/callbacks.c:997 +#: ../coreapi/callbacks.c:1009 #, c-format msgid "Registration on %s failed: %s" msgstr "" -#: ../coreapi/callbacks.c:1004 +#: ../coreapi/callbacks.c:1016 msgid "Service unavailable, retrying" msgstr "" @@ -1945,7 +1946,11 @@ msgstr "" msgid "Authentication token is %s" msgstr "" -#: ../coreapi/linphonecall.c:3600 +#: ../coreapi/linphonecall.c:1305 +msgid "Call parameters were successfully modified." +msgstr "" + +#: ../coreapi/linphonecall.c:3659 #, c-format msgid "You have missed %i call." msgid_plural "You have missed %i calls." diff --git a/po/pt_BR.po b/po/pt_BR.po index 77b5fc220..0ff0e6705 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1,22 +1,20 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: msgid "" msgstr "" "Project-Id-Version: linphone-gtk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-11 16:26+0100\n" -"PO-Revision-Date: 2015-02-17 11:28+0000\n" -"Last-Translator: Belledonne Communications \n" -"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/" -"linphone-gtk/language/pt_BR/)\n" -"Language: pt_BR\n" +"POT-Creation-Date: 2015-03-27 14:40+0100\n" +"PO-Revision-Date: 2015-03-27 13:40+0000\n" +"Last-Translator: Belledonne Communications \n" +"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/linphone-gtk/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974 @@ -89,130 +87,126 @@ msgstr "" msgid "Couldn't find pixmap file: %s" msgstr "Não é possível achar arquivo pixmap: %s" -#: ../gtk/chat.c:374 ../gtk/friendlist.c:924 -msgid "Invalid sip contact !" -msgstr "" - -#: ../gtk/main.c:137 +#: ../gtk/main.c:136 msgid "log to stdout some debug information while running." msgstr "" -#: ../gtk/main.c:138 +#: ../gtk/main.c:137 msgid "path to a file to write logs into." msgstr "" -#: ../gtk/main.c:139 +#: ../gtk/main.c:138 msgid "Start linphone with video disabled." msgstr "" -#: ../gtk/main.c:140 +#: ../gtk/main.c:139 msgid "Start only in the system tray, do not show the main interface." msgstr "" -#: ../gtk/main.c:141 +#: ../gtk/main.c:140 msgid "address to call right now" msgstr "" -#: ../gtk/main.c:142 -msgid "if set automatically answer incoming calls" -msgstr "" - -#: ../gtk/main.c:143 +#: ../gtk/main.c:141 msgid "" -"Specifiy a working directory (should be the base of the installation, eg: c:" -"\\Program Files\\Linphone)" +"Specifiy a working directory (should be the base of the installation, eg: " +"c:\\Program Files\\Linphone)" msgstr "" -#: ../gtk/main.c:144 +#: ../gtk/main.c:142 msgid "Configuration file" msgstr "" -#: ../gtk/main.c:145 +#: ../gtk/main.c:143 msgid "Run the audio assistant" msgstr "" -#: ../gtk/main.c:146 +#: ../gtk/main.c:144 msgid "Run self test and exit 0 if succeed" msgstr "" -#: ../gtk/main.c:1061 +#: ../gtk/main.c:1059 #, 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 "" -#: ../gtk/main.c:1138 +#: ../gtk/main.c:1136 #, c-format msgid "" "Please enter your password for username %s\n" " at realm %s:" msgstr "" -#: ../gtk/main.c:1259 +#: ../gtk/main.c:1257 msgid "Call error" msgstr "" -#: ../gtk/main.c:1262 ../coreapi/linphonecore.c:3791 +#: ../gtk/main.c:1260 ../coreapi/linphonecore.c:3826 msgid "Call ended" msgstr "" -#: ../gtk/main.c:1265 ../coreapi/call_log.c:221 +#: ../gtk/main.c:1263 ../coreapi/call_log.c:221 msgid "Incoming call" msgstr "Camadas recebidas" -#: ../gtk/main.c:1267 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5 +#: ../gtk/main.c:1265 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5 msgid "Answer" msgstr "" -#: ../gtk/main.c:1269 ../gtk/main.ui.h:6 +#: ../gtk/main.c:1267 ../gtk/main.ui.h:6 msgid "Decline" msgstr "" -#: ../gtk/main.c:1275 +#: ../gtk/main.c:1273 msgid "Call paused" msgstr "" -#: ../gtk/main.c:1275 +#: ../gtk/main.c:1273 #, c-format msgid "by %s" msgstr "" -#: ../gtk/main.c:1345 +#: ../gtk/main.c:1343 #, c-format msgid "%s proposed to start video. Do you accept ?" msgstr "" -#: ../gtk/main.c:1507 +#: ../gtk/main.c:1505 msgid "Website link" msgstr "" -#: ../gtk/main.c:1556 +#: ../gtk/main.c:1554 msgid "Linphone - a video internet phone" msgstr "" -#: ../gtk/main.c:1648 +#: ../gtk/main.c:1646 #, c-format msgid "%s (Default)" msgstr "" -#: ../gtk/main.c:1980 ../coreapi/callbacks.c:1045 +#: ../gtk/main.c:1978 ../coreapi/callbacks.c:1057 #, c-format msgid "We are transferred to %s" msgstr "" -#: ../gtk/main.c:1990 +#: ../gtk/main.c:1988 msgid "" "No sound cards have been detected on this computer.\n" "You won't be able to send or receive audio calls." msgstr "" -#: ../gtk/main.c:2135 +#: ../gtk/main.c:2136 msgid "A free SIP video-phone" msgstr "" +#: ../gtk/main.c:2241 +#, c-format +msgid "Hello\n" +msgstr "" + #: ../gtk/friendlist.c:505 msgid "Add to addressbook" msgstr "" @@ -238,6 +232,10 @@ msgstr "" msgid "Search in %s directory" msgstr "" +#: ../gtk/friendlist.c:924 +msgid "Invalid sip contact !" +msgstr "" + #: ../gtk/friendlist.c:976 #, c-format msgid "Edit contact '%s'" @@ -278,7 +276,7 @@ msgstr "Parâmetros" msgid "Enabled" msgstr "Ativado" -#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763 ../gtk/parameters.ui.h:20 +#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763 ../gtk/parameters.ui.h:17 msgid "Disabled" msgstr "Desativado" @@ -443,7 +441,7 @@ msgstr "" msgid "Enter your linphone.org username" msgstr "" -#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:82 ../gtk/ldap.ui.h:4 +#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:81 ../gtk/ldap.ui.h:4 msgid "Username:" msgstr "" @@ -507,8 +505,7 @@ msgstr "" #: ../gtk/setupwizard.c:413 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 "" @@ -832,7 +829,7 @@ msgstr "" msgid "Audio Assistant" msgstr "" -#: ../gtk/audio_assistant.c:513 ../gtk/main.ui.h:31 +#: ../gtk/audio_assistant.c:513 ../gtk/main.ui.h:32 msgid "Audio assistant" msgstr "" @@ -909,103 +906,103 @@ msgid "Default" msgstr "" #: ../gtk/main.ui.h:22 -msgid "_Options" +msgid "Delete" msgstr "" #: ../gtk/main.ui.h:23 -msgid "Set configuration URI" +msgid "_Options" msgstr "" #: ../gtk/main.ui.h:24 -msgid "Always start video" +msgid "Set configuration URI" msgstr "" #: ../gtk/main.ui.h:25 -msgid "Enable self-view" +msgid "Always start video" msgstr "" #: ../gtk/main.ui.h:26 -msgid "_Help" +msgid "Enable self-view" msgstr "" #: ../gtk/main.ui.h:27 -msgid "Show debug window" +msgid "_Help" msgstr "" #: ../gtk/main.ui.h:28 -msgid "_Homepage" +msgid "Show debug window" msgstr "" #: ../gtk/main.ui.h:29 -msgid "Check _Updates" +msgid "_Homepage" msgstr "" #: ../gtk/main.ui.h:30 +msgid "Check _Updates" +msgstr "" + +#: ../gtk/main.ui.h:31 msgid "Account assistant" msgstr "" -#: ../gtk/main.ui.h:32 +#: ../gtk/main.ui.h:33 msgid "SIP address or phone number:" msgstr "" -#: ../gtk/main.ui.h:33 +#: ../gtk/main.ui.h:34 msgid "Initiate a new call" msgstr "" -#: ../gtk/main.ui.h:34 +#: ../gtk/main.ui.h:35 msgid "Contacts" msgstr "" -#: ../gtk/main.ui.h:35 +#: ../gtk/main.ui.h:36 msgid "Search" msgstr "" -#: ../gtk/main.ui.h:36 +#: ../gtk/main.ui.h:37 msgid "Add contacts from directory" msgstr "" -#: ../gtk/main.ui.h:37 +#: ../gtk/main.ui.h:38 msgid "Add contact" msgstr "" -#: ../gtk/main.ui.h:38 +#: ../gtk/main.ui.h:39 msgid "Recent calls" msgstr "" -#: ../gtk/main.ui.h:39 +#: ../gtk/main.ui.h:40 msgid "My current identity:" msgstr "" -#: ../gtk/main.ui.h:40 ../gtk/tunnel_config.ui.h:7 +#: ../gtk/main.ui.h:41 ../gtk/tunnel_config.ui.h:7 msgid "Username" msgstr "" -#: ../gtk/main.ui.h:41 ../gtk/tunnel_config.ui.h:8 +#: ../gtk/main.ui.h:42 ../gtk/tunnel_config.ui.h:8 msgid "Password" msgstr "" -#: ../gtk/main.ui.h:42 +#: ../gtk/main.ui.h:43 msgid "Internet connection:" msgstr "" -#: ../gtk/main.ui.h:43 +#: ../gtk/main.ui.h:44 msgid "Automatically log me in" msgstr "" -#: ../gtk/main.ui.h:44 ../gtk/password.ui.h:3 +#: ../gtk/main.ui.h:45 ../gtk/password.ui.h:3 msgid "UserID" msgstr "" -#: ../gtk/main.ui.h:45 +#: ../gtk/main.ui.h:46 msgid "Login information" msgstr "" -#: ../gtk/main.ui.h:46 -msgid "Welcome!" -msgstr "" - #: ../gtk/main.ui.h:47 -msgid "Delete" +msgid "Welcome!" msgstr "" #: ../gtk/about.ui.h:1 @@ -1181,299 +1178,307 @@ msgid "C" msgstr "" #: ../gtk/parameters.ui.h:11 -msgid "SIP (UDP)" -msgstr "" - -#: ../gtk/parameters.ui.h:12 -msgid "SIP (TCP)" -msgstr "" - -#: ../gtk/parameters.ui.h:13 -msgid "SIP (TLS)" -msgstr "" - -#: ../gtk/parameters.ui.h:14 msgid "Settings" msgstr "" -#: ../gtk/parameters.ui.h:15 +#: ../gtk/parameters.ui.h:12 msgid "Set Maximum Transmission Unit:" msgstr "" -#: ../gtk/parameters.ui.h:16 +#: ../gtk/parameters.ui.h:13 msgid "Send DTMFs as SIP info" msgstr "" -#: ../gtk/parameters.ui.h:17 -msgid "Use IPv6 instead of IPv4" +#: ../gtk/parameters.ui.h:14 +msgid "Allow IPv6" msgstr "" -#: ../gtk/parameters.ui.h:18 +#: ../gtk/parameters.ui.h:15 msgid "Transport" msgstr "" -#: ../gtk/parameters.ui.h:19 +#: ../gtk/parameters.ui.h:16 msgid "SIP/UDP port" msgstr "" -#: ../gtk/parameters.ui.h:21 +#: ../gtk/parameters.ui.h:18 msgid "Random" msgstr "" -#: ../gtk/parameters.ui.h:22 +#: ../gtk/parameters.ui.h:19 msgid "SIP/TCP port" msgstr "" -#: ../gtk/parameters.ui.h:23 +#: ../gtk/parameters.ui.h:20 msgid "Audio RTP/UDP:" msgstr "" -#: ../gtk/parameters.ui.h:24 +#: ../gtk/parameters.ui.h:21 msgid "Fixed" msgstr "" -#: ../gtk/parameters.ui.h:25 +#: ../gtk/parameters.ui.h:22 msgid "Video RTP/UDP:" msgstr "" -#: ../gtk/parameters.ui.h:26 +#: ../gtk/parameters.ui.h:23 msgid "Media encryption type" msgstr "" -#: ../gtk/parameters.ui.h:27 +#: ../gtk/parameters.ui.h:24 msgid "Media encryption is mandatory" msgstr "" -#: ../gtk/parameters.ui.h:28 +#: ../gtk/parameters.ui.h:25 msgid "Tunnel" msgstr "" -#: ../gtk/parameters.ui.h:29 +#: ../gtk/parameters.ui.h:26 msgid "DSCP fields" msgstr "" -#: ../gtk/parameters.ui.h:30 +#: ../gtk/parameters.ui.h:27 msgid "Network protocol and ports" msgstr "" -#: ../gtk/parameters.ui.h:31 +#: ../gtk/parameters.ui.h:28 msgid "Direct connection to the Internet" msgstr "" -#: ../gtk/parameters.ui.h:32 +#: ../gtk/parameters.ui.h:29 msgid "Behind NAT / Firewall (specify gateway IP )" msgstr "" -#: ../gtk/parameters.ui.h:33 +#: ../gtk/parameters.ui.h:30 msgid "Behind NAT / Firewall (use STUN to resolve)" msgstr "" -#: ../gtk/parameters.ui.h:34 +#: ../gtk/parameters.ui.h:31 msgid "Behind NAT / Firewall (use ICE)" msgstr "" -#: ../gtk/parameters.ui.h:35 +#: ../gtk/parameters.ui.h:32 msgid "Behind NAT / Firewall (use uPnP)" msgstr "" -#: ../gtk/parameters.ui.h:36 +#: ../gtk/parameters.ui.h:33 msgid "Public IP address:" msgstr "" -#: ../gtk/parameters.ui.h:37 +#: ../gtk/parameters.ui.h:34 msgid "Stun server:" msgstr "" -#: ../gtk/parameters.ui.h:38 +#: ../gtk/parameters.ui.h:35 msgid "NAT and Firewall" msgstr "" -#: ../gtk/parameters.ui.h:39 +#: ../gtk/parameters.ui.h:36 msgid "Network settings" msgstr "" -#: ../gtk/parameters.ui.h:40 +#: ../gtk/parameters.ui.h:37 msgid "Ring sound:" msgstr "" -#: ../gtk/parameters.ui.h:41 +#: ../gtk/parameters.ui.h:38 msgid "ALSA special device (optional):" msgstr "" -#: ../gtk/parameters.ui.h:42 +#: ../gtk/parameters.ui.h:39 msgid "Capture device:" msgstr "" -#: ../gtk/parameters.ui.h:43 +#: ../gtk/parameters.ui.h:40 msgid "Ring device:" msgstr "" -#: ../gtk/parameters.ui.h:44 +#: ../gtk/parameters.ui.h:41 msgid "Playback device:" msgstr "" -#: ../gtk/parameters.ui.h:45 +#: ../gtk/parameters.ui.h:42 msgid "Enable echo cancellation" msgstr "" -#: ../gtk/parameters.ui.h:46 +#: ../gtk/parameters.ui.h:43 msgid "Audio" msgstr "" -#: ../gtk/parameters.ui.h:47 +#: ../gtk/parameters.ui.h:44 msgid "Video input device:" msgstr "" -#: ../gtk/parameters.ui.h:48 +#: ../gtk/parameters.ui.h:45 msgid "Prefered video resolution:" msgstr "" -#: ../gtk/parameters.ui.h:49 +#: ../gtk/parameters.ui.h:46 msgid "Video output method:" msgstr "" -#: ../gtk/parameters.ui.h:50 +#: ../gtk/parameters.ui.h:47 msgid "Show camera preview" msgstr "" -#: ../gtk/parameters.ui.h:51 +#: ../gtk/parameters.ui.h:48 msgid "Video" msgstr "" -#: ../gtk/parameters.ui.h:52 +#: ../gtk/parameters.ui.h:49 msgid "Multimedia settings" msgstr "" -#: ../gtk/parameters.ui.h:53 +#: ../gtk/parameters.ui.h:50 msgid "This section defines your SIP address when not using a SIP account" msgstr "" -#: ../gtk/parameters.ui.h:54 +#: ../gtk/parameters.ui.h:51 msgid "Your display name (eg: John Doe):" msgstr "" -#: ../gtk/parameters.ui.h:55 +#: ../gtk/parameters.ui.h:52 msgid "Your username:" msgstr "" -#: ../gtk/parameters.ui.h:56 +#: ../gtk/parameters.ui.h:53 msgid "Your resulting SIP address:" msgstr "" -#: ../gtk/parameters.ui.h:57 +#: ../gtk/parameters.ui.h:54 msgid "Default identity" msgstr "" -#: ../gtk/parameters.ui.h:58 +#: ../gtk/parameters.ui.h:55 msgid "Wizard" msgstr "" -#: ../gtk/parameters.ui.h:59 +#: ../gtk/parameters.ui.h:56 msgid "Add" msgstr "" -#: ../gtk/parameters.ui.h:60 +#: ../gtk/parameters.ui.h:57 msgid "Edit" msgstr "Editar" -#: ../gtk/parameters.ui.h:61 +#: ../gtk/parameters.ui.h:58 msgid "Remove" msgstr "Remover" -#: ../gtk/parameters.ui.h:62 +#: ../gtk/parameters.ui.h:59 msgid "Proxy accounts" msgstr "" -#: ../gtk/parameters.ui.h:63 +#: ../gtk/parameters.ui.h:60 msgid "Erase all passwords" msgstr "" -#: ../gtk/parameters.ui.h:64 +#: ../gtk/parameters.ui.h:61 msgid "Privacy" msgstr "" -#: ../gtk/parameters.ui.h:65 +#: ../gtk/parameters.ui.h:62 +msgid "Automatically answer when a call is received" +msgstr "" + +#: ../gtk/parameters.ui.h:63 +msgid "Auto-answer" +msgstr "" + +#: ../gtk/parameters.ui.h:64 msgid "Manage SIP Accounts" msgstr "" -#: ../gtk/parameters.ui.h:66 ../gtk/tunnel_config.ui.h:4 +#: ../gtk/parameters.ui.h:65 ../gtk/tunnel_config.ui.h:4 msgid "Enable" msgstr "Ativado" -#: ../gtk/parameters.ui.h:67 ../gtk/tunnel_config.ui.h:5 +#: ../gtk/parameters.ui.h:66 ../gtk/tunnel_config.ui.h:5 msgid "Disable" msgstr "Desativar" -#: ../gtk/parameters.ui.h:68 +#: ../gtk/parameters.ui.h:67 msgid "Codecs" msgstr "" -#: ../gtk/parameters.ui.h:69 +#: ../gtk/parameters.ui.h:68 msgid "0 stands for \"unlimited\"" msgstr "" -#: ../gtk/parameters.ui.h:70 +#: ../gtk/parameters.ui.h:69 msgid "Upload speed limit in Kbit/sec:" msgstr "" -#: ../gtk/parameters.ui.h:71 +#: ../gtk/parameters.ui.h:70 msgid "Download speed limit in Kbit/sec:" msgstr "" -#: ../gtk/parameters.ui.h:72 +#: ../gtk/parameters.ui.h:71 msgid "Enable adaptive rate control" msgstr "" -#: ../gtk/parameters.ui.h:73 +#: ../gtk/parameters.ui.h:72 msgid "" "Adaptive rate control is a technique to dynamically guess the available " "bandwidth during a call." msgstr "" -#: ../gtk/parameters.ui.h:74 +#: ../gtk/parameters.ui.h:73 msgid "Bandwidth control" msgstr "" -#: ../gtk/parameters.ui.h:75 +#: ../gtk/parameters.ui.h:74 msgid "Codecs" msgstr "" -#: ../gtk/parameters.ui.h:76 +#: ../gtk/parameters.ui.h:75 msgid "Language" msgstr "" -#: ../gtk/parameters.ui.h:77 +#: ../gtk/parameters.ui.h:76 msgid "Show advanced settings" msgstr "" -#: ../gtk/parameters.ui.h:78 +#: ../gtk/parameters.ui.h:77 msgid "Level" msgstr "" -#: ../gtk/parameters.ui.h:79 +#: ../gtk/parameters.ui.h:78 msgid "User interface" msgstr "" -#: ../gtk/parameters.ui.h:80 ../gtk/ldap.ui.h:2 +#: ../gtk/parameters.ui.h:79 ../gtk/ldap.ui.h:2 msgid "Server address:" msgstr "" -#: ../gtk/parameters.ui.h:81 ../gtk/ldap.ui.h:3 +#: ../gtk/parameters.ui.h:80 ../gtk/ldap.ui.h:3 msgid "Authentication method:" msgstr "" -#: ../gtk/parameters.ui.h:83 +#: ../gtk/parameters.ui.h:82 msgid "LDAP Account setup" msgstr "" -#: ../gtk/parameters.ui.h:84 +#: ../gtk/parameters.ui.h:83 msgid "LDAP" msgstr "" -#: ../gtk/parameters.ui.h:85 +#: ../gtk/parameters.ui.h:84 msgid "Done" msgstr "" +#: ../gtk/parameters.ui.h:85 +msgid "SIP (UDP)" +msgstr "" + +#: ../gtk/parameters.ui.h:86 +msgid "SIP (TCP)" +msgstr "" + +#: ../gtk/parameters.ui.h:87 +msgid "SIP (TLS)" +msgstr "" + #: ../gtk/buddylookup.ui.h:1 msgid "Search contacts in directory" msgstr "" @@ -1677,11 +1682,8 @@ msgstr "" #: ../gtk/config-uri.ui.h:2 msgid "" -"This dialog allows to set an http or https address when configuration is to " -"be fetched at startup.\n" -"Please enter or modify the configuration URI below. After clicking OK, " -"Linphone will restart automatically in order to fetch and take into account " -"the new configuration. " +"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n" +"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. " msgstr "" #: ../gtk/provisioning-fetch.ui.h:1 @@ -1692,60 +1694,60 @@ msgstr "" msgid "Please wait while fetching configuration from server..." msgstr "" -#: ../coreapi/linphonecore.c:1512 +#: ../coreapi/linphonecore.c:1534 msgid "Ready" msgstr "" -#: ../coreapi/linphonecore.c:2499 +#: ../coreapi/linphonecore.c:2534 msgid "Configuring" msgstr "" -#: ../coreapi/linphonecore.c:2673 +#: ../coreapi/linphonecore.c:2708 msgid "Looking for telephone number destination..." msgstr "Procurando por telefone de destino..." -#: ../coreapi/linphonecore.c:2675 +#: ../coreapi/linphonecore.c:2710 msgid "Could not resolve this number." msgstr "Não foi possível encontrar este número." #. must be known at that time -#: ../coreapi/linphonecore.c:2961 +#: ../coreapi/linphonecore.c:2996 msgid "Contacting" msgstr "" -#: ../coreapi/linphonecore.c:2966 +#: ../coreapi/linphonecore.c:3001 msgid "Could not call" msgstr "" -#: ../coreapi/linphonecore.c:3116 +#: ../coreapi/linphonecore.c:3152 msgid "Sorry, we have reached the maximum number of simultaneous calls" msgstr "" -#: ../coreapi/linphonecore.c:3274 +#: ../coreapi/linphonecore.c:3310 msgid "is contacting you" msgstr "" -#: ../coreapi/linphonecore.c:3275 +#: ../coreapi/linphonecore.c:3311 msgid " and asked autoanswer." msgstr "" -#: ../coreapi/linphonecore.c:3399 +#: ../coreapi/linphonecore.c:3435 msgid "Modifying call parameters..." msgstr "" -#: ../coreapi/linphonecore.c:3747 +#: ../coreapi/linphonecore.c:3782 msgid "Connected." msgstr "Conectado." -#: ../coreapi/linphonecore.c:3772 +#: ../coreapi/linphonecore.c:3807 msgid "Call aborted" msgstr "" -#: ../coreapi/linphonecore.c:3962 +#: ../coreapi/linphonecore.c:3997 msgid "Could not pause the call" msgstr "" -#: ../coreapi/linphonecore.c:3965 +#: ../coreapi/linphonecore.c:4000 msgid "Pausing the current call..." msgstr "" @@ -1821,117 +1823,117 @@ msgid "" "It should look like sip:username@proxydomain, such as sip:alice@example.net" msgstr "" -#: ../coreapi/proxy.c:1403 +#: ../coreapi/proxy.c:1416 #, c-format msgid "Could not login as %s" msgstr "" -#: ../coreapi/callbacks.c:419 +#: ../coreapi/callbacks.c:428 msgid "Remote ringing." msgstr "" -#: ../coreapi/callbacks.c:431 +#: ../coreapi/callbacks.c:440 msgid "Remote ringing..." msgstr "" -#: ../coreapi/callbacks.c:448 +#: ../coreapi/callbacks.c:461 msgid "Early media." msgstr "" -#: ../coreapi/callbacks.c:521 +#: ../coreapi/callbacks.c:533 #, c-format msgid "Call with %s is paused." msgstr "" -#: ../coreapi/callbacks.c:534 +#: ../coreapi/callbacks.c:546 #, c-format msgid "Call answered by %s - on hold." msgstr "" -#: ../coreapi/callbacks.c:544 +#: ../coreapi/callbacks.c:556 msgid "Call resumed." msgstr "" -#: ../coreapi/callbacks.c:548 +#: ../coreapi/callbacks.c:560 #, c-format msgid "Call answered by %s." msgstr "" -#: ../coreapi/callbacks.c:571 +#: ../coreapi/callbacks.c:583 msgid "Incompatible, check codecs or security settings..." msgstr "" -#: ../coreapi/callbacks.c:576 ../coreapi/callbacks.c:888 +#: ../coreapi/callbacks.c:588 ../coreapi/callbacks.c:900 msgid "Incompatible media parameters." msgstr "" -#: ../coreapi/callbacks.c:606 +#: ../coreapi/callbacks.c:618 msgid "We have been resumed." msgstr "" #. we are being paused -#: ../coreapi/callbacks.c:614 +#: ../coreapi/callbacks.c:626 msgid "We are paused by other party." msgstr "" #. reINVITE and in-dialogs UPDATE go here -#: ../coreapi/callbacks.c:648 +#: ../coreapi/callbacks.c:660 msgid "Call is updated by remote." msgstr "" -#: ../coreapi/callbacks.c:764 +#: ../coreapi/callbacks.c:776 msgid "Call terminated." msgstr "" -#: ../coreapi/callbacks.c:792 +#: ../coreapi/callbacks.c:804 msgid "User is busy." msgstr "Usuário está ocupado." -#: ../coreapi/callbacks.c:793 +#: ../coreapi/callbacks.c:805 msgid "User is temporarily unavailable." msgstr "Usuário está temporáriamente indisponível." #. char *retrymsg=_("%s. Retry after %i minute(s)."); -#: ../coreapi/callbacks.c:795 +#: ../coreapi/callbacks.c:807 msgid "User does not want to be disturbed." msgstr "" -#: ../coreapi/callbacks.c:796 +#: ../coreapi/callbacks.c:808 msgid "Call declined." msgstr "" -#: ../coreapi/callbacks.c:811 +#: ../coreapi/callbacks.c:823 msgid "Request timeout." msgstr "" -#: ../coreapi/callbacks.c:842 +#: ../coreapi/callbacks.c:854 msgid "Redirected" msgstr "" -#: ../coreapi/callbacks.c:897 +#: ../coreapi/callbacks.c:909 msgid "Call failed." msgstr "" -#: ../coreapi/callbacks.c:975 +#: ../coreapi/callbacks.c:987 #, c-format msgid "Registration on %s successful." msgstr "" -#: ../coreapi/callbacks.c:976 +#: ../coreapi/callbacks.c:988 #, c-format msgid "Unregistration on %s done." msgstr "" -#: ../coreapi/callbacks.c:994 +#: ../coreapi/callbacks.c:1006 msgid "no response timeout" msgstr "" -#: ../coreapi/callbacks.c:997 +#: ../coreapi/callbacks.c:1009 #, c-format msgid "Registration on %s failed: %s" msgstr "" -#: ../coreapi/callbacks.c:1004 +#: ../coreapi/callbacks.c:1016 msgid "Service unavailable, retrying" msgstr "" @@ -1941,7 +1943,11 @@ msgstr "" msgid "Authentication token is %s" msgstr "" -#: ../coreapi/linphonecall.c:3600 +#: ../coreapi/linphonecall.c:1305 +msgid "Call parameters were successfully modified." +msgstr "" + +#: ../coreapi/linphonecall.c:3659 #, c-format msgid "You have missed %i call." msgid_plural "You have missed %i calls." diff --git a/po/ru.po b/po/ru.po index 549b6e1ba..cdffa1646 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # AlexL , 2014 # AlexL , 2014-2015 @@ -12,17 +12,15 @@ msgid "" msgstr "" "Project-Id-Version: linphone-gtk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-11 16:26+0100\n" -"PO-Revision-Date: 2015-02-18 18:31+0000\n" +"POT-Creation-Date: 2015-03-27 14:40+0100\n" +"PO-Revision-Date: 2015-03-28 09:22+0000\n" "Last-Translator: AlexL \n" -"Language-Team: Russian (http://www.transifex.com/projects/p/linphone-gtk/" -"language/ru/)\n" -"Language: ru\n" +"Language-Team: Russian (http://www.transifex.com/projects/p/linphone-gtk/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Language: ru\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974 #, c-format @@ -76,9 +74,7 @@ msgstr[2] "%i секунд" msgid "" "%s\tQuality: %s\n" "%s\t%s\t" -msgstr "" -"%s\tКачество: %s\n" -"%s\t%s\t" +msgstr "%s\tКачество: %s\n%s\t%s\t" #: ../gtk/calllogs.c:341 #, c-format @@ -98,142 +94,126 @@ msgstr "Мне" msgid "Couldn't find pixmap file: %s" msgstr "Невозможно найти графический файл: %s" -#: ../gtk/chat.c:374 ../gtk/friendlist.c:924 -msgid "Invalid sip contact !" -msgstr "Неверный sip контакт!" +#: ../gtk/main.c:136 +msgid "log to stdout some debug information while running." +msgstr "Вывод некоторой отладочной информации на устройство стандартного вывода во время работы." #: ../gtk/main.c:137 -msgid "log to stdout some debug information while running." -msgstr "" -"Вывод некоторой отладочной информации на устройство стандартного вывода во " -"время работы." - -#: ../gtk/main.c:138 msgid "path to a file to write logs into." msgstr "Путь к файлу для записи логов." -#: ../gtk/main.c:139 +#: ../gtk/main.c:138 msgid "Start linphone with video disabled." msgstr "Запуск linphone с видео отключен." -#: ../gtk/main.c:140 +#: ../gtk/main.c:139 msgid "Start only in the system tray, do not show the main interface." msgstr "Показывать только в системном лотке, не запуская главное окно." -#: ../gtk/main.c:141 +#: ../gtk/main.c:140 msgid "address to call right now" msgstr "Адрес для звонка прямо сейчас." -#: ../gtk/main.c:142 -msgid "if set automatically answer incoming calls" -msgstr "Если установлено, то автоматический приём входящих звонков." - -#: ../gtk/main.c:143 +#: ../gtk/main.c:141 msgid "" -"Specifiy a working directory (should be the base of the installation, eg: c:" -"\\Program Files\\Linphone)" -msgstr "" -"Определить рабочий каталог (относительно каталога установки, например: c:" -"\\Program Files\\Linphone)" +"Specifiy a working directory (should be the base of the installation, eg: " +"c:\\Program Files\\Linphone)" +msgstr "Определить рабочий каталог (относительно каталога установки, например: c:\\Program Files\\Linphone)" -#: ../gtk/main.c:144 +#: ../gtk/main.c:142 msgid "Configuration file" msgstr "Файл конфигурации" -#: ../gtk/main.c:145 +#: ../gtk/main.c:143 msgid "Run the audio assistant" msgstr "Запустить помощника аудио" -#: ../gtk/main.c:146 +#: ../gtk/main.c:144 msgid "Run self test and exit 0 if succeed" msgstr "Запустить самотест и выйти при успехе со статусом 0" -#: ../gtk/main.c:1061 +#: ../gtk/main.c:1059 #, 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 вы бы хотели быть добавленным в этот контактный лист.\n" -"Вы разрешаете ему(ей) видеть ваш статус присутствия или добавить в " -"контактный лист?\n" -"Если вы ответите Нет, эта персона будет временно в чёрном списке." +msgstr "%s вы бы хотели быть добавленным в этот контактный лист.\nВы разрешаете ему(ей) видеть ваш статус присутствия или добавить в контактный лист?\nЕсли вы ответите Нет, эта персона будет временно в чёрном списке." -#: ../gtk/main.c:1138 +#: ../gtk/main.c:1136 #, c-format msgid "" "Please enter your password for username %s\n" " at realm %s:" -msgstr "" -"Пожалуйста, введите пароль для пользователя %s\n" -" для реалм (рилм) %s:" +msgstr "Пожалуйста, введите пароль для пользователя %s\n для реалм (рилм) %s:" -#: ../gtk/main.c:1259 +#: ../gtk/main.c:1257 msgid "Call error" msgstr "Ошибка звонка" -#: ../gtk/main.c:1262 ../coreapi/linphonecore.c:3791 +#: ../gtk/main.c:1260 ../coreapi/linphonecore.c:3826 msgid "Call ended" msgstr "Звонок окончен" -#: ../gtk/main.c:1265 ../coreapi/call_log.c:221 +#: ../gtk/main.c:1263 ../coreapi/call_log.c:221 msgid "Incoming call" msgstr "Входящий звонок" -#: ../gtk/main.c:1267 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5 +#: ../gtk/main.c:1265 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5 msgid "Answer" msgstr "Ответ" -#: ../gtk/main.c:1269 ../gtk/main.ui.h:6 +#: ../gtk/main.c:1267 ../gtk/main.ui.h:6 msgid "Decline" msgstr "Отклонить" -#: ../gtk/main.c:1275 +#: ../gtk/main.c:1273 msgid "Call paused" msgstr "Звонок приостановлен" -#: ../gtk/main.c:1275 +#: ../gtk/main.c:1273 #, c-format msgid "by %s" msgstr "%s" -#: ../gtk/main.c:1345 +#: ../gtk/main.c:1343 #, c-format msgid "%s proposed to start video. Do you accept ?" msgstr "%s предложил запустить видео. Вы принимаете?" -#: ../gtk/main.c:1507 +#: ../gtk/main.c:1505 msgid "Website link" msgstr "Домашняя страница" -#: ../gtk/main.c:1556 +#: ../gtk/main.c:1554 msgid "Linphone - a video internet phone" msgstr "Linphone - интернет видео телефон" -#: ../gtk/main.c:1648 +#: ../gtk/main.c:1646 #, c-format msgid "%s (Default)" msgstr "%s (по умолчанию)" -#: ../gtk/main.c:1980 ../coreapi/callbacks.c:1045 +#: ../gtk/main.c:1978 ../coreapi/callbacks.c:1057 #, c-format msgid "We are transferred to %s" msgstr "Мы передали в %s" -#: ../gtk/main.c:1990 +#: ../gtk/main.c:1988 msgid "" "No sound cards have been detected on this computer.\n" "You won't be able to send or receive audio calls." -msgstr "" -"Звуковые карты не были обнаружены на этом компьютере.\n" -"Вы не сможете отправлять или получать аудио звонки." +msgstr "Звуковые карты не были обнаружены на этом компьютере.\nВы не сможете отправлять или получать аудио звонки." -#: ../gtk/main.c:2135 +#: ../gtk/main.c:2136 msgid "A free SIP video-phone" msgstr "Свободный SIP видео-телефон" +#: ../gtk/main.c:2241 +#, c-format +msgid "Hello\n" +msgstr "Привет\n" + #: ../gtk/friendlist.c:505 msgid "Add to addressbook" msgstr "Добавить в адресную книгу" @@ -259,6 +239,10 @@ msgstr "Чат" msgid "Search in %s directory" msgstr "Поиск в директории %s" +#: ../gtk/friendlist.c:924 +msgid "Invalid sip contact !" +msgstr "Неверный sip контакт!" + #: ../gtk/friendlist.c:976 #, c-format msgid "Edit contact '%s'" @@ -299,7 +283,7 @@ msgstr "Параметры" msgid "Enabled" msgstr "Разрешён" -#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763 ../gtk/parameters.ui.h:20 +#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763 ../gtk/parameters.ui.h:17 msgid "Disabled" msgstr "Не разрешён" @@ -382,9 +366,7 @@ msgstr "Сербский" #: ../gtk/propertybox.c:1156 msgid "" "You need to restart linphone for the new language selection to take effect." -msgstr "" -"Вы должны перезагрузить linphone для того, чтобы языковые настройки вступили " -"в силу." +msgstr "Вы должны перезагрузить linphone для того, чтобы языковые настройки вступили в силу." #: ../gtk/propertybox.c:1236 msgid "None" @@ -407,9 +389,7 @@ msgstr "ZRTP" msgid "" "A more recent version is availalble from %s.\n" "Would you like to open a browser to download it ?" -msgstr "" -"Доступна новая версия с %s.\n" -"Открыть браузер для загрузки?" +msgstr "Доступна новая версия с %s.\nОткрыть браузер для загрузки?" #: ../gtk/update.c:91 msgid "You are running the lastest version." @@ -447,9 +427,7 @@ msgstr[2] "Найдено %i контактов" msgid "" "Welcome!\n" "This assistant will help you to use a SIP account for your calls." -msgstr "" -"Добро пожаловать!\n" -"Этот ассистент поможет вам использовать SIP аккаунт для ваших звонков." +msgstr "Добро пожаловать!\nЭтот ассистент поможет вам использовать SIP аккаунт для ваших звонков." #: ../gtk/setupwizard.c:43 msgid "Create an account on linphone.org" @@ -457,8 +435,7 @@ msgstr "Создать учётную запись на linphone.org" #: ../gtk/setupwizard.c:44 msgid "I have already a linphone.org account and I just want to use it" -msgstr "" -"Я уже имею учётную запись на linphone.org и только хочу использовать её" +msgstr "Я уже имею учётную запись на linphone.org и только хочу использовать её" #: ../gtk/setupwizard.c:45 msgid "I have already a sip account and I just want to use it" @@ -472,7 +449,7 @@ msgstr "Я хочу указать удалённую конфигурацию U msgid "Enter your linphone.org username" msgstr "Введите ваше имя пользователя для linphone.org" -#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:82 ../gtk/ldap.ui.h:4 +#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:81 ../gtk/ldap.ui.h:4 msgid "Username:" msgstr "Имя пользователя:" @@ -528,10 +505,7 @@ msgstr "Информировать об обновлениях linphone" msgid "" "Error, account not validated, username already used or server unreachable.\n" "Please go back and try again." -msgstr "" -"Ошибка, учётная запись не подтверждена, имя пользователя уже используется " -"или\n" -"сервер недоступен. Пожалуйста, зайдите снова и попробуйте ещё раз." +msgstr "Ошибка, учётная запись не подтверждена, имя пользователя уже используется или\nсервер недоступен. Пожалуйста, зайдите снова и попробуйте ещё раз." #: ../gtk/setupwizard.c:405 msgid "Thank you. Your account is now configured and ready for use." @@ -539,14 +513,9 @@ msgstr "Спасибо! Учётная запись успешно настро #: ../gtk/setupwizard.c:413 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 "" -"Пожалуйста, подтвердите вашу учётную запись, щёлкнув на ссылку, которую вы " -"только\n" -"что получили по электронной почте. Затем вернитесь сюда и нажмите кнопку " -"Далее." +msgstr "Пожалуйста, подтвердите вашу учётную запись, щёлкнув на ссылку, которую вы только\nчто получили по электронной почте. Затем вернитесь сюда и нажмите кнопку Далее." #: ../gtk/setupwizard.c:602 msgid "SIP account configuration assistant" @@ -651,9 +620,7 @@ msgstr "Напрямую или через сервер" msgid "" "download: %f\n" "upload: %f (kbit/s)" -msgstr "" -"загрузка: %f\n" -"отдача: %f (КБит/сек)" +msgstr "загрузка: %f\nотдача: %f (КБит/сек)" #: ../gtk/incall_view.c:272 ../gtk/incall_view.c:274 #, c-format @@ -767,9 +734,7 @@ msgstr "Пауза" msgid "" "Recording into\n" "%s %s" -msgstr "" -"Записывается в\n" -"%s %s" +msgstr "Записывается в\n%s %s" #: ../gtk/incall_view.c:954 msgid "(Paused)" @@ -822,9 +787,7 @@ msgstr "Не удаётся запустить системное управле msgid "" "Welcome!\n" "This assistant will help you to configure audio settings for Linphone" -msgstr "" -"Добро пожаловать!\n" -"Этот ассистент поможет вам настроить настройки аудио для Linphone." +msgstr "Добро пожаловать!\nЭтот ассистент поможет вам настроить настройки аудио для Linphone." #: ../gtk/audio_assistant.c:328 msgid "Capture device" @@ -874,7 +837,7 @@ msgstr "Давайте сейчас запустим linphone" msgid "Audio Assistant" msgstr "Помощник аудио" -#: ../gtk/audio_assistant.c:513 ../gtk/main.ui.h:31 +#: ../gtk/audio_assistant.c:513 ../gtk/main.ui.h:32 msgid "Audio assistant" msgstr "Помощник аудио" @@ -951,105 +914,105 @@ msgid "Default" msgstr "По умолчанию" #: ../gtk/main.ui.h:22 +msgid "Delete" +msgstr "Удалить" + +#: ../gtk/main.ui.h:23 msgid "_Options" msgstr "_Опции" -#: ../gtk/main.ui.h:23 +#: ../gtk/main.ui.h:24 msgid "Set configuration URI" msgstr "Установить конфигурацию URI" -#: ../gtk/main.ui.h:24 +#: ../gtk/main.ui.h:25 msgid "Always start video" msgstr "Всегда запускать видео" -#: ../gtk/main.ui.h:25 +#: ../gtk/main.ui.h:26 msgid "Enable self-view" msgstr "Показать окно видео" -#: ../gtk/main.ui.h:26 +#: ../gtk/main.ui.h:27 msgid "_Help" msgstr "_Помощь" -#: ../gtk/main.ui.h:27 +#: ../gtk/main.ui.h:28 msgid "Show debug window" msgstr "Показать окно отладки" -#: ../gtk/main.ui.h:28 +#: ../gtk/main.ui.h:29 msgid "_Homepage" msgstr "_Домашняя страница" -#: ../gtk/main.ui.h:29 +#: ../gtk/main.ui.h:30 msgid "Check _Updates" msgstr "Проверить _обновления" -#: ../gtk/main.ui.h:30 +#: ../gtk/main.ui.h:31 msgid "Account assistant" msgstr "Помощник учётной записи" -#: ../gtk/main.ui.h:32 +#: ../gtk/main.ui.h:33 msgid "SIP address or phone number:" msgstr "SIP-адрес или номер телефона:" -#: ../gtk/main.ui.h:33 +#: ../gtk/main.ui.h:34 msgid "Initiate a new call" msgstr "Начать новый звонок" -#: ../gtk/main.ui.h:34 +#: ../gtk/main.ui.h:35 msgid "Contacts" msgstr "Контакты" -#: ../gtk/main.ui.h:35 +#: ../gtk/main.ui.h:36 msgid "Search" msgstr "Поиск" -#: ../gtk/main.ui.h:36 +#: ../gtk/main.ui.h:37 msgid "Add contacts from directory" msgstr "Добавить контакты из директории" -#: ../gtk/main.ui.h:37 +#: ../gtk/main.ui.h:38 msgid "Add contact" msgstr "Добавить контакт" -#: ../gtk/main.ui.h:38 +#: ../gtk/main.ui.h:39 msgid "Recent calls" msgstr "Последние звонки" -#: ../gtk/main.ui.h:39 +#: ../gtk/main.ui.h:40 msgid "My current identity:" msgstr "Мой текущий идентификатор:" -#: ../gtk/main.ui.h:40 ../gtk/tunnel_config.ui.h:7 +#: ../gtk/main.ui.h:41 ../gtk/tunnel_config.ui.h:7 msgid "Username" msgstr "Имя пользователя" -#: ../gtk/main.ui.h:41 ../gtk/tunnel_config.ui.h:8 +#: ../gtk/main.ui.h:42 ../gtk/tunnel_config.ui.h:8 msgid "Password" msgstr "Пароль" -#: ../gtk/main.ui.h:42 +#: ../gtk/main.ui.h:43 msgid "Internet connection:" msgstr "Интернет-соединение:" -#: ../gtk/main.ui.h:43 +#: ../gtk/main.ui.h:44 msgid "Automatically log me in" msgstr "Входить автоматически" -#: ../gtk/main.ui.h:44 ../gtk/password.ui.h:3 +#: ../gtk/main.ui.h:45 ../gtk/password.ui.h:3 msgid "UserID" msgstr "Идентификатор пользователя" -#: ../gtk/main.ui.h:45 +#: ../gtk/main.ui.h:46 msgid "Login information" msgstr "Информация для входа" -#: ../gtk/main.ui.h:46 +#: ../gtk/main.ui.h:47 msgid "Welcome!" msgstr "Добро пожаловать!" -#: ../gtk/main.ui.h:47 -msgid "Delete" -msgstr "Удалить" - #: ../gtk/about.ui.h:1 msgid "About Linphone" msgstr "О Linphone" @@ -1076,19 +1039,7 @@ msgid "" "cs: Petr Pisar \n" "hu: anonymous\n" "he: Eli Zaretskii \n" -msgstr "" -"fr: Simon Morlat\n" -"en: Simon Morlat and Delphine Perreau\n" -"it: Alberto Zanoni \n" -"de: Jean-Jacques Sarton \n" -"sv: Daniel Nylander \n" -"es: Jesus Benitez \n" -"ja: YAMAGUCHI YOSHIYA \n" -"pt_BR: Rafael Caesar Lenzi \n" -"pl: Robert Nasiadek \n" -"cs: Petr Pisar \n" -"hu: anonymous\n" -"he: Eli Zaretskii \n" +msgstr "fr: Simon Morlat\nen: Simon Morlat and Delphine Perreau\nit: Alberto Zanoni \nde: Jean-Jacques Sarton \nsv: Daniel Nylander \nes: Jesus Benitez \nja: YAMAGUCHI YOSHIYA \npt_BR: Rafael Caesar Lenzi \npl: Robert Nasiadek \ncs: Petr Pisar \nhu: anonymous\nhe: Eli Zaretskii \n" #: ../gtk/contact.ui.h:2 msgid "SIP Address" @@ -1235,303 +1186,307 @@ msgid "C" msgstr "C" #: ../gtk/parameters.ui.h:11 -msgid "SIP (UDP)" -msgstr "SIP (UDP)" - -#: ../gtk/parameters.ui.h:12 -msgid "SIP (TCP)" -msgstr "SIP (TCP)" - -#: ../gtk/parameters.ui.h:13 -msgid "SIP (TLS)" -msgstr "SIP (TLS)" - -#: ../gtk/parameters.ui.h:14 msgid "Settings" msgstr "Настройки" -#: ../gtk/parameters.ui.h:15 +#: ../gtk/parameters.ui.h:12 msgid "Set Maximum Transmission Unit:" msgstr "Установить MTU (максимально передаваемый блок):" -#: ../gtk/parameters.ui.h:16 +#: ../gtk/parameters.ui.h:13 msgid "Send DTMFs as SIP info" msgstr "Отправлять DTFM как SIP-информацию" -#: ../gtk/parameters.ui.h:17 -msgid "Use IPv6 instead of IPv4" -msgstr "Использовать IPv6 вместо IPv4" +#: ../gtk/parameters.ui.h:14 +msgid "Allow IPv6" +msgstr "Разрешить IPv6" -#: ../gtk/parameters.ui.h:18 +#: ../gtk/parameters.ui.h:15 msgid "Transport" msgstr "Транспорт" -#: ../gtk/parameters.ui.h:19 +#: ../gtk/parameters.ui.h:16 msgid "SIP/UDP port" msgstr "Порт SIP/UDP" -#: ../gtk/parameters.ui.h:21 +#: ../gtk/parameters.ui.h:18 msgid "Random" msgstr "Случайно" -#: ../gtk/parameters.ui.h:22 +#: ../gtk/parameters.ui.h:19 msgid "SIP/TCP port" msgstr "Порт SIP/TCP" -#: ../gtk/parameters.ui.h:23 +#: ../gtk/parameters.ui.h:20 msgid "Audio RTP/UDP:" msgstr "Аудио RTP/UDP:" -#: ../gtk/parameters.ui.h:24 +#: ../gtk/parameters.ui.h:21 msgid "Fixed" msgstr "Фиксированный" -#: ../gtk/parameters.ui.h:25 +#: ../gtk/parameters.ui.h:22 msgid "Video RTP/UDP:" msgstr "Видео RTP/UDP:" -#: ../gtk/parameters.ui.h:26 +#: ../gtk/parameters.ui.h:23 msgid "Media encryption type" msgstr "Тип медиа-шифрования" -#: ../gtk/parameters.ui.h:27 +#: ../gtk/parameters.ui.h:24 msgid "Media encryption is mandatory" msgstr "Медиа-шифрование обязательно" -#: ../gtk/parameters.ui.h:28 +#: ../gtk/parameters.ui.h:25 msgid "Tunnel" msgstr "Тунель" -#: ../gtk/parameters.ui.h:29 +#: ../gtk/parameters.ui.h:26 msgid "DSCP fields" msgstr "Поля DSCP" -#: ../gtk/parameters.ui.h:30 +#: ../gtk/parameters.ui.h:27 msgid "Network protocol and ports" msgstr "Сетевые протоколы и порты" -#: ../gtk/parameters.ui.h:31 +#: ../gtk/parameters.ui.h:28 msgid "Direct connection to the Internet" msgstr "Прямое подключение к интернет" -#: ../gtk/parameters.ui.h:32 +#: ../gtk/parameters.ui.h:29 msgid "Behind NAT / Firewall (specify gateway IP )" msgstr "За NAT / брандмауэром (указать IP шлюза)" -#: ../gtk/parameters.ui.h:33 +#: ../gtk/parameters.ui.h:30 msgid "Behind NAT / Firewall (use STUN to resolve)" msgstr "За NAT / брандмауэром (использовать STUN)" -#: ../gtk/parameters.ui.h:34 +#: ../gtk/parameters.ui.h:31 msgid "Behind NAT / Firewall (use ICE)" msgstr "За NAT / брандмауэром (использовать ICE)" -#: ../gtk/parameters.ui.h:35 +#: ../gtk/parameters.ui.h:32 msgid "Behind NAT / Firewall (use uPnP)" msgstr "За NAT / брандмауэром (использовать uPnP)" -#: ../gtk/parameters.ui.h:36 +#: ../gtk/parameters.ui.h:33 msgid "Public IP address:" msgstr "Выделенный (публичный) IP-адрес:" -#: ../gtk/parameters.ui.h:37 +#: ../gtk/parameters.ui.h:34 msgid "Stun server:" msgstr "STUN сервер:" -#: ../gtk/parameters.ui.h:38 +#: ../gtk/parameters.ui.h:35 msgid "NAT and Firewall" msgstr "NAT и брандмауэр" -#: ../gtk/parameters.ui.h:39 +#: ../gtk/parameters.ui.h:36 msgid "Network settings" msgstr "Настройки сети" -#: ../gtk/parameters.ui.h:40 +#: ../gtk/parameters.ui.h:37 msgid "Ring sound:" msgstr "Мелодия звонка:" -#: ../gtk/parameters.ui.h:41 +#: ../gtk/parameters.ui.h:38 msgid "ALSA special device (optional):" msgstr "Специальное устройство ALSA (опционально)" -#: ../gtk/parameters.ui.h:42 +#: ../gtk/parameters.ui.h:39 msgid "Capture device:" msgstr "Устройство захвата:" -#: ../gtk/parameters.ui.h:43 +#: ../gtk/parameters.ui.h:40 msgid "Ring device:" msgstr "Устройство звонка:" -#: ../gtk/parameters.ui.h:44 +#: ../gtk/parameters.ui.h:41 msgid "Playback device:" msgstr "Устройство воспроизведения:" -#: ../gtk/parameters.ui.h:45 +#: ../gtk/parameters.ui.h:42 msgid "Enable echo cancellation" msgstr "Разрешить подавление эха" -#: ../gtk/parameters.ui.h:46 +#: ../gtk/parameters.ui.h:43 msgid "Audio" msgstr "Аудио" -#: ../gtk/parameters.ui.h:47 +#: ../gtk/parameters.ui.h:44 msgid "Video input device:" msgstr "Устройство для вывода видео:" -#: ../gtk/parameters.ui.h:48 +#: ../gtk/parameters.ui.h:45 msgid "Prefered video resolution:" msgstr "Предпочтительное разрешение видео:" -#: ../gtk/parameters.ui.h:49 +#: ../gtk/parameters.ui.h:46 msgid "Video output method:" msgstr "Метод вывода видео:" -#: ../gtk/parameters.ui.h:50 +#: ../gtk/parameters.ui.h:47 msgid "Show camera preview" msgstr "Показать предпросмотр с камеры" -#: ../gtk/parameters.ui.h:51 +#: ../gtk/parameters.ui.h:48 msgid "Video" msgstr "Видео" -#: ../gtk/parameters.ui.h:52 +#: ../gtk/parameters.ui.h:49 msgid "Multimedia settings" msgstr "Настройки мультимедиа" -#: ../gtk/parameters.ui.h:53 +#: ../gtk/parameters.ui.h:50 msgid "This section defines your SIP address when not using a SIP account" -msgstr "" -"Эта секция определяет ваш SIP адрес, когда вы не используете учётную запись " -"SIP" +msgstr "Эта секция определяет ваш SIP адрес, когда вы не используете учётную запись SIP" -#: ../gtk/parameters.ui.h:54 +#: ../gtk/parameters.ui.h:51 msgid "Your display name (eg: John Doe):" msgstr "Отображаемое имя (например: Иван Сидоров):" -#: ../gtk/parameters.ui.h:55 +#: ../gtk/parameters.ui.h:52 msgid "Your username:" msgstr "Ваше имя пользователя:" -#: ../gtk/parameters.ui.h:56 +#: ../gtk/parameters.ui.h:53 msgid "Your resulting SIP address:" msgstr "Ваш результирующий SIP адрес:" -#: ../gtk/parameters.ui.h:57 +#: ../gtk/parameters.ui.h:54 msgid "Default identity" msgstr "Идентификатор по умолчанию" -#: ../gtk/parameters.ui.h:58 +#: ../gtk/parameters.ui.h:55 msgid "Wizard" msgstr "Мастер" -#: ../gtk/parameters.ui.h:59 +#: ../gtk/parameters.ui.h:56 msgid "Add" msgstr "Добавить" -#: ../gtk/parameters.ui.h:60 +#: ../gtk/parameters.ui.h:57 msgid "Edit" msgstr "Редактировать" -#: ../gtk/parameters.ui.h:61 +#: ../gtk/parameters.ui.h:58 msgid "Remove" msgstr "Удалить" -#: ../gtk/parameters.ui.h:62 +#: ../gtk/parameters.ui.h:59 msgid "Proxy accounts" msgstr "Учётные записи" -#: ../gtk/parameters.ui.h:63 +#: ../gtk/parameters.ui.h:60 msgid "Erase all passwords" msgstr "Стереть все пароли" -#: ../gtk/parameters.ui.h:64 +#: ../gtk/parameters.ui.h:61 msgid "Privacy" msgstr "Секретность" -#: ../gtk/parameters.ui.h:65 +#: ../gtk/parameters.ui.h:62 +msgid "Automatically answer when a call is received" +msgstr "Автоматический ответ при получении звонка" + +#: ../gtk/parameters.ui.h:63 +msgid "Auto-answer" +msgstr "Автоответ" + +#: ../gtk/parameters.ui.h:64 msgid "Manage SIP Accounts" msgstr "Управление учётными записями SIP" -#: ../gtk/parameters.ui.h:66 ../gtk/tunnel_config.ui.h:4 +#: ../gtk/parameters.ui.h:65 ../gtk/tunnel_config.ui.h:4 msgid "Enable" msgstr "Разрешить" -#: ../gtk/parameters.ui.h:67 ../gtk/tunnel_config.ui.h:5 +#: ../gtk/parameters.ui.h:66 ../gtk/tunnel_config.ui.h:5 msgid "Disable" msgstr "Выключить" -#: ../gtk/parameters.ui.h:68 +#: ../gtk/parameters.ui.h:67 msgid "Codecs" msgstr "Кодеки" -#: ../gtk/parameters.ui.h:69 +#: ../gtk/parameters.ui.h:68 msgid "0 stands for \"unlimited\"" msgstr "0 означает \"безлимитный\"" -#: ../gtk/parameters.ui.h:70 +#: ../gtk/parameters.ui.h:69 msgid "Upload speed limit in Kbit/sec:" msgstr "Ограничение исходящего потока КБит/сек:" -#: ../gtk/parameters.ui.h:71 +#: ../gtk/parameters.ui.h:70 msgid "Download speed limit in Kbit/sec:" msgstr "Ограничение скорости входящего потока КБит/сек:" -#: ../gtk/parameters.ui.h:72 +#: ../gtk/parameters.ui.h:71 msgid "Enable adaptive rate control" msgstr "Разрешить адаптивное управление скоростью" -#: ../gtk/parameters.ui.h:73 +#: ../gtk/parameters.ui.h:72 msgid "" "Adaptive rate control is a technique to dynamically guess the available " "bandwidth during a call." -msgstr "" -"Адаптивное управление скоростью - это технология динамического угадывания " -"доступной пропускной способности во время звонка." +msgstr "Адаптивное управление скоростью - это технология динамического угадывания доступной пропускной способности во время звонка." -#: ../gtk/parameters.ui.h:74 +#: ../gtk/parameters.ui.h:73 msgid "Bandwidth control" msgstr "Пропускная способность" -#: ../gtk/parameters.ui.h:75 +#: ../gtk/parameters.ui.h:74 msgid "Codecs" msgstr "Кодеки" -#: ../gtk/parameters.ui.h:76 +#: ../gtk/parameters.ui.h:75 msgid "Language" msgstr "Язык" -#: ../gtk/parameters.ui.h:77 +#: ../gtk/parameters.ui.h:76 msgid "Show advanced settings" msgstr "Показать дополнительные настройки" -#: ../gtk/parameters.ui.h:78 +#: ../gtk/parameters.ui.h:77 msgid "Level" msgstr "Уровень" -#: ../gtk/parameters.ui.h:79 +#: ../gtk/parameters.ui.h:78 msgid "User interface" msgstr "Пользовательский интерфейс" -#: ../gtk/parameters.ui.h:80 ../gtk/ldap.ui.h:2 +#: ../gtk/parameters.ui.h:79 ../gtk/ldap.ui.h:2 msgid "Server address:" msgstr "Адрес сервера:" -#: ../gtk/parameters.ui.h:81 ../gtk/ldap.ui.h:3 +#: ../gtk/parameters.ui.h:80 ../gtk/ldap.ui.h:3 msgid "Authentication method:" msgstr "Метод аутентификации:" -#: ../gtk/parameters.ui.h:83 +#: ../gtk/parameters.ui.h:82 msgid "LDAP Account setup" msgstr "Установка учётной записи LDAP" -#: ../gtk/parameters.ui.h:84 +#: ../gtk/parameters.ui.h:83 msgid "LDAP" msgstr "LDAP" -#: ../gtk/parameters.ui.h:85 +#: ../gtk/parameters.ui.h:84 msgid "Done" msgstr "Готово" +#: ../gtk/parameters.ui.h:85 +msgid "SIP (UDP)" +msgstr "SIP (UDP)" + +#: ../gtk/parameters.ui.h:86 +msgid "SIP (TCP)" +msgstr "SIP (TCP)" + +#: ../gtk/parameters.ui.h:87 +msgid "SIP (TLS)" +msgstr "SIP (TLS)" + #: ../gtk/buddylookup.ui.h:1 msgid "Search contacts in directory" msgstr "Поиск контактов в директории" @@ -1735,17 +1690,9 @@ msgstr "Указание удалённой конфигурации URI" #: ../gtk/config-uri.ui.h:2 msgid "" -"This dialog allows to set an http or https address when configuration is to " -"be fetched at startup.\n" -"Please enter or modify the configuration URI below. After clicking OK, " -"Linphone will restart automatically in order to fetch and take into account " -"the new configuration. " -msgstr "" -"Этот диалог позволяет установить HTTP или HTTPS адрес, когда конфигурация " -"будет получена при запуске.\n" -"Пожалуйста, введите или измените настройки URI ниже. После нажатия OK " -"linphone автоматически перезагрузится чтобы получить и учесть новую " -"конфигурацию в учётной записи." +"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n" +"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. " +msgstr "Этот диалог позволяет установить HTTP или HTTPS адрес, когда конфигурация будет получена при запуске.\nПожалуйста, введите или измените настройки URI ниже. После нажатия OK linphone автоматически перезагрузится чтобы получить и учесть новую конфигурацию в учётной записи." #: ../gtk/provisioning-fetch.ui.h:1 msgid "Configuring..." @@ -1755,61 +1702,60 @@ msgstr "Конфигурирование..." msgid "Please wait while fetching configuration from server..." msgstr "Пожалуйста, подождите пока получается конфигурация с сервера..." -#: ../coreapi/linphonecore.c:1512 +#: ../coreapi/linphonecore.c:1534 msgid "Ready" msgstr "Готов" -#: ../coreapi/linphonecore.c:2499 +#: ../coreapi/linphonecore.c:2534 msgid "Configuring" msgstr "Конфигурирование" -#: ../coreapi/linphonecore.c:2673 +#: ../coreapi/linphonecore.c:2708 msgid "Looking for telephone number destination..." msgstr "Поиск назначения для телефонного номера.." -#: ../coreapi/linphonecore.c:2675 +#: ../coreapi/linphonecore.c:2710 msgid "Could not resolve this number." msgstr "Не получилось принять решение по этому номеру." #. must be known at that time -#: ../coreapi/linphonecore.c:2961 +#: ../coreapi/linphonecore.c:2996 msgid "Contacting" msgstr "Соединение" -#: ../coreapi/linphonecore.c:2966 +#: ../coreapi/linphonecore.c:3001 msgid "Could not call" msgstr "Невозможно позвонить" -#: ../coreapi/linphonecore.c:3116 +#: ../coreapi/linphonecore.c:3152 msgid "Sorry, we have reached the maximum number of simultaneous calls" -msgstr "" -"К сожалению, мы достигли максимального количества одновременных звонков" +msgstr "К сожалению, мы достигли максимального количества одновременных звонков" -#: ../coreapi/linphonecore.c:3274 +#: ../coreapi/linphonecore.c:3310 msgid "is contacting you" msgstr "контактирует с вами" -#: ../coreapi/linphonecore.c:3275 +#: ../coreapi/linphonecore.c:3311 msgid " and asked autoanswer." msgstr "и спросил автоматический ответ." -#: ../coreapi/linphonecore.c:3399 +#: ../coreapi/linphonecore.c:3435 msgid "Modifying call parameters..." msgstr "Изменение параметров звонка..." -#: ../coreapi/linphonecore.c:3747 +#: ../coreapi/linphonecore.c:3782 msgid "Connected." msgstr "Соединён." -#: ../coreapi/linphonecore.c:3772 +#: ../coreapi/linphonecore.c:3807 msgid "Call aborted" msgstr "Звонок отменён" -#: ../coreapi/linphonecore.c:3962 +#: ../coreapi/linphonecore.c:3997 msgid "Could not pause the call" msgstr "Невозможно приостановить звонок" -#: ../coreapi/linphonecore.c:3965 +#: ../coreapi/linphonecore.c:4000 msgid "Pausing the current call..." msgstr "Приостановка текущего звонка..." @@ -1877,130 +1823,125 @@ msgstr "Неизвестный статус" msgid "" "The sip proxy address you entered is invalid, it must start with \"sip:\" " "followed by a hostname." -msgstr "" -"Введённый SIP-адрес прокси является недействительным, он должен начинаться с " -"\"sip:имя_хоста\"" +msgstr "Введённый SIP-адрес прокси является недействительным, он должен начинаться с \"sip:имя_хоста\"" #: ../coreapi/proxy.c:334 msgid "" "The sip identity you entered is invalid.\n" "It should look like sip:username@proxydomain, such as sip:alice@example.net" -msgstr "" -"Неверные параметры для sip идентификации\n" -"Должно выглядеть как sip:имя_пользователя@домен_прокси, как например, sip:" -"alice@example.net" +msgstr "Неверные параметры для sip идентификации\nДолжно выглядеть как sip:имя_пользователя@домен_прокси, как например, sip:alice@example.net" -#: ../coreapi/proxy.c:1403 +#: ../coreapi/proxy.c:1416 #, c-format msgid "Could not login as %s" msgstr "Невозможно зайти как: %s" -#: ../coreapi/callbacks.c:419 +#: ../coreapi/callbacks.c:428 msgid "Remote ringing." msgstr "Дистанционный звонок." -#: ../coreapi/callbacks.c:431 +#: ../coreapi/callbacks.c:440 msgid "Remote ringing..." msgstr "Дистанционный звонок..." -#: ../coreapi/callbacks.c:448 +#: ../coreapi/callbacks.c:461 msgid "Early media." msgstr "Предответное проключение." -#: ../coreapi/callbacks.c:521 +#: ../coreapi/callbacks.c:533 #, c-format msgid "Call with %s is paused." msgstr "Звонок с %s приостановлен." -#: ../coreapi/callbacks.c:534 +#: ../coreapi/callbacks.c:546 #, c-format msgid "Call answered by %s - on hold." msgstr "На звонок ответил %s - на удержании." -#: ../coreapi/callbacks.c:544 +#: ../coreapi/callbacks.c:556 msgid "Call resumed." msgstr "Звонок возобновлён." -#: ../coreapi/callbacks.c:548 +#: ../coreapi/callbacks.c:560 #, c-format msgid "Call answered by %s." msgstr "На звонок ответил %s." -#: ../coreapi/callbacks.c:571 +#: ../coreapi/callbacks.c:583 msgid "Incompatible, check codecs or security settings..." msgstr "Несовместимость, проверьте кодеки или параметры безопасности..." -#: ../coreapi/callbacks.c:576 ../coreapi/callbacks.c:888 +#: ../coreapi/callbacks.c:588 ../coreapi/callbacks.c:900 msgid "Incompatible media parameters." msgstr "Несовместимость медиа-параметров." -#: ../coreapi/callbacks.c:606 +#: ../coreapi/callbacks.c:618 msgid "We have been resumed." msgstr "Мы возобновили." #. we are being paused -#: ../coreapi/callbacks.c:614 +#: ../coreapi/callbacks.c:626 msgid "We are paused by other party." msgstr "Мы приостановлены другой стороной." #. reINVITE and in-dialogs UPDATE go here -#: ../coreapi/callbacks.c:648 +#: ../coreapi/callbacks.c:660 msgid "Call is updated by remote." msgstr "Звонок был дистанционно обновлён." -#: ../coreapi/callbacks.c:764 +#: ../coreapi/callbacks.c:776 msgid "Call terminated." msgstr "Звонок прерван." -#: ../coreapi/callbacks.c:792 +#: ../coreapi/callbacks.c:804 msgid "User is busy." msgstr "Пользователь занят." -#: ../coreapi/callbacks.c:793 +#: ../coreapi/callbacks.c:805 msgid "User is temporarily unavailable." msgstr "Пользователь временно недоступен." #. char *retrymsg=_("%s. Retry after %i minute(s)."); -#: ../coreapi/callbacks.c:795 +#: ../coreapi/callbacks.c:807 msgid "User does not want to be disturbed." msgstr "Пользователь не хочет чтобы его беспокоили." -#: ../coreapi/callbacks.c:796 +#: ../coreapi/callbacks.c:808 msgid "Call declined." msgstr "Звонок отклонён." -#: ../coreapi/callbacks.c:811 +#: ../coreapi/callbacks.c:823 msgid "Request timeout." msgstr "Таймаут запроса." -#: ../coreapi/callbacks.c:842 +#: ../coreapi/callbacks.c:854 msgid "Redirected" msgstr "Переадресован" -#: ../coreapi/callbacks.c:897 +#: ../coreapi/callbacks.c:909 msgid "Call failed." msgstr "Звонок не удался." -#: ../coreapi/callbacks.c:975 +#: ../coreapi/callbacks.c:987 #, c-format msgid "Registration on %s successful." msgstr "Регистрация на %s прошла успешно." -#: ../coreapi/callbacks.c:976 +#: ../coreapi/callbacks.c:988 #, c-format msgid "Unregistration on %s done." msgstr "Отмена регистрации на %s завершена." -#: ../coreapi/callbacks.c:994 +#: ../coreapi/callbacks.c:1006 msgid "no response timeout" msgstr "время ожидания истекло" -#: ../coreapi/callbacks.c:997 +#: ../coreapi/callbacks.c:1009 #, c-format msgid "Registration on %s failed: %s" msgstr "Регистрация на %s не удалась: %s" -#: ../coreapi/callbacks.c:1004 +#: ../coreapi/callbacks.c:1016 msgid "Service unavailable, retrying" msgstr "Сервис недоступен, повтор" @@ -2010,7 +1951,11 @@ msgstr "Сервис недоступен, повтор" msgid "Authentication token is %s" msgstr "Маркер проверки подлинности: %s" -#: ../coreapi/linphonecall.c:3600 +#: ../coreapi/linphonecall.c:1305 +msgid "Call parameters were successfully modified." +msgstr "Параметры звонка были успешно изменены." + +#: ../coreapi/linphonecall.c:3659 #, c-format msgid "You have missed %i call." msgid_plural "You have missed %i calls." @@ -2042,12 +1987,7 @@ msgid "" "To: %s\n" "Status: %s\n" "Duration: %i mn %i sec\n" -msgstr "" -"%s в %s\n" -"От: %s\n" -"До: %s\n" -"Статус: %s\n" -"Продолжительность: %i мин %i сек\n" +msgstr "%s в %s\nОт: %s\nДо: %s\nСтатус: %s\nПродолжительность: %i мин %i сек\n" #: ../coreapi/call_log.c:221 msgid "Outgoing call" diff --git a/po/sr.po b/po/sr.po index ada4f8844..e27cd10ae 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1,25 +1,22 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Мирослав Николић , 2014 msgid "" msgstr "" "Project-Id-Version: linphone-gtk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-11 16:26+0100\n" -"PO-Revision-Date: 2015-02-17 11:28+0000\n" -"Last-Translator: Belledonne Communications \n" -"Language-Team: Serbian (http://www.transifex.com/projects/p/linphone-gtk/" -"language/sr/)\n" -"Language: sr\n" +"POT-Creation-Date: 2015-03-27 14:40+0100\n" +"PO-Revision-Date: 2015-03-27 13:40+0000\n" +"Last-Translator: Belledonne Communications \n" +"Language-Team: Serbian (http://www.transifex.com/projects/p/linphone-gtk/language/sr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Language: sr\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974 #, c-format @@ -73,9 +70,7 @@ msgstr[2] "%i секунди" msgid "" "%s\tQuality: %s\n" "%s\t%s\t" -msgstr "" -"%s\tКвалитет: %s\n" -"%s\t%s\t" +msgstr "%s\tКвалитет: %s\n%s\t%s\t" #: ../gtk/calllogs.c:341 #, c-format @@ -95,141 +90,126 @@ msgstr "Ја" msgid "Couldn't find pixmap file: %s" msgstr "Не могу да пронађем датотеку сличице: %s" -#: ../gtk/chat.c:374 ../gtk/friendlist.c:924 -msgid "Invalid sip contact !" -msgstr "Неисправан сип контакт !" - -#: ../gtk/main.c:137 +#: ../gtk/main.c:136 msgid "log to stdout some debug information while running." msgstr "бележи на стандардни излаз неке податке прочишћавања док ради." -#: ../gtk/main.c:138 +#: ../gtk/main.c:137 msgid "path to a file to write logs into." msgstr "путања до датотеке за уписивање дневника." -#: ../gtk/main.c:139 +#: ../gtk/main.c:138 msgid "Start linphone with video disabled." msgstr "Покреће линфон са искљученим видеом." -#: ../gtk/main.c:140 +#: ../gtk/main.c:139 msgid "Start only in the system tray, do not show the main interface." msgstr "Покреће се само у системској фиоци, не приказује главно сучеље." -#: ../gtk/main.c:141 +#: ../gtk/main.c:140 msgid "address to call right now" msgstr "адреса за позивање управо сада" -#: ../gtk/main.c:142 -msgid "if set automatically answer incoming calls" -msgstr "ако је подешено сам ће се јављати на долазне позиве" - -#: ../gtk/main.c:143 +#: ../gtk/main.c:141 msgid "" -"Specifiy a working directory (should be the base of the installation, eg: c:" -"\\Program Files\\Linphone)" -msgstr "" -"Наводи радни директоријум (треба да буде основа инсталације, нпр: „c:" -"\\Program Files\\Linphone“)" +"Specifiy a working directory (should be the base of the installation, eg: " +"c:\\Program Files\\Linphone)" +msgstr "Наводи радни директоријум (треба да буде основа инсталације, нпр: „c:\\Program Files\\Linphone“)" -#: ../gtk/main.c:144 +#: ../gtk/main.c:142 msgid "Configuration file" msgstr "Датотека подешавања" -#: ../gtk/main.c:145 +#: ../gtk/main.c:143 msgid "Run the audio assistant" msgstr "Покреће помоћника звука" -#: ../gtk/main.c:146 +#: ../gtk/main.c:144 msgid "Run self test and exit 0 if succeed" msgstr "Покреће самоиспробавање и излази 0 ако је успешно" -#: ../gtk/main.c:1061 +#: ../gtk/main.c:1059 #, 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 жели да вас дода на списак пријатеља.\n" -"Да ли желите да му допустите да види ваше стање присуства или да га додате " -"на ваш списак пријатеља ?\n" -"Ако одговорите са не, ова особа ће привремено бити стављена на списак " -"забрана." +msgstr "%s жели да вас дода на списак пријатеља.\nДа ли желите да му допустите да види ваше стање присуства или да га додате на ваш списак пријатеља ?\nАко одговорите са не, ова особа ће привремено бити стављена на списак забрана." -#: ../gtk/main.c:1138 +#: ../gtk/main.c:1136 #, c-format msgid "" "Please enter your password for username %s\n" " at realm %s:" -msgstr "" -"Унесите вашу лозинку за корисничко име %s\n" -" на подручју %s:" +msgstr "Унесите вашу лозинку за корисничко име %s\n на подручју %s:" -#: ../gtk/main.c:1259 +#: ../gtk/main.c:1257 msgid "Call error" msgstr "Грешка позива" -#: ../gtk/main.c:1262 ../coreapi/linphonecore.c:3791 +#: ../gtk/main.c:1260 ../coreapi/linphonecore.c:3826 msgid "Call ended" msgstr "Позив је завршен" -#: ../gtk/main.c:1265 ../coreapi/call_log.c:221 +#: ../gtk/main.c:1263 ../coreapi/call_log.c:221 msgid "Incoming call" msgstr "Долазни позив" -#: ../gtk/main.c:1267 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5 +#: ../gtk/main.c:1265 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5 msgid "Answer" msgstr "Јави се" -#: ../gtk/main.c:1269 ../gtk/main.ui.h:6 +#: ../gtk/main.c:1267 ../gtk/main.ui.h:6 msgid "Decline" msgstr "Одбиј" -#: ../gtk/main.c:1275 +#: ../gtk/main.c:1273 msgid "Call paused" msgstr "Позив је заустављен" -#: ../gtk/main.c:1275 +#: ../gtk/main.c:1273 #, c-format msgid "by %s" msgstr "од %s" -#: ../gtk/main.c:1345 +#: ../gtk/main.c:1343 #, c-format msgid "%s proposed to start video. Do you accept ?" msgstr "%s предлаже да започнете видео. Да ли прихватате ?" -#: ../gtk/main.c:1507 +#: ../gtk/main.c:1505 msgid "Website link" msgstr "Веза веб сајта" -#: ../gtk/main.c:1556 +#: ../gtk/main.c:1554 msgid "Linphone - a video internet phone" msgstr "Линфон — интернет телефон са снимком" -#: ../gtk/main.c:1648 +#: ../gtk/main.c:1646 #, c-format msgid "%s (Default)" msgstr "%s (основно)" -#: ../gtk/main.c:1980 ../coreapi/callbacks.c:1045 +#: ../gtk/main.c:1978 ../coreapi/callbacks.c:1057 #, c-format msgid "We are transferred to %s" msgstr "Преселили смо се на %s" -#: ../gtk/main.c:1990 +#: ../gtk/main.c:1988 msgid "" "No sound cards have been detected on this computer.\n" "You won't be able to send or receive audio calls." -msgstr "" -"Ниједна звучна картица није откривена на овом рачунару.\n" -"Нећете бити у могућности да шаљете или да примате звучне позиве." +msgstr "Ниједна звучна картица није откривена на овом рачунару.\nНећете бити у могућности да шаљете или да примате звучне позиве." -#: ../gtk/main.c:2135 +#: ../gtk/main.c:2136 msgid "A free SIP video-phone" msgstr "Слободан СИП телефон са снимком" +#: ../gtk/main.c:2241 +#, c-format +msgid "Hello\n" +msgstr "" + #: ../gtk/friendlist.c:505 msgid "Add to addressbook" msgstr "Додајте у адресар" @@ -255,6 +235,10 @@ msgstr "Ћаскај" msgid "Search in %s directory" msgstr "Тражи у директоријуму „%s“" +#: ../gtk/friendlist.c:924 +msgid "Invalid sip contact !" +msgstr "Неисправан сип контакт !" + #: ../gtk/friendlist.c:976 #, c-format msgid "Edit contact '%s'" @@ -295,7 +279,7 @@ msgstr "Параметри" msgid "Enabled" msgstr "Укључено" -#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763 ../gtk/parameters.ui.h:20 +#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763 ../gtk/parameters.ui.h:17 msgid "Disabled" msgstr "Искључено" @@ -378,8 +362,7 @@ msgstr "Српски" #: ../gtk/propertybox.c:1156 msgid "" "You need to restart linphone for the new language selection to take effect." -msgstr "" -"Треба поново да покренете линфон да би нови изабрани језик ступио у дејство." +msgstr "Треба поново да покренете линфон да би нови изабрани језик ступио у дејство." #: ../gtk/propertybox.c:1236 msgid "None" @@ -402,9 +385,7 @@ msgstr "ЗРТП" msgid "" "A more recent version is availalble from %s.\n" "Would you like to open a browser to download it ?" -msgstr "" -"Новије издање је доступно са „%s“.\n" -"Да ли желите да отворите прегледник и да га преузмете ?" +msgstr "Новије издање је доступно са „%s“.\nДа ли желите да отворите прегледник и да га преузмете ?" #: ../gtk/update.c:91 msgid "You are running the lastest version." @@ -442,9 +423,7 @@ msgstr[2] "Нашао сам %i контаката" msgid "" "Welcome!\n" "This assistant will help you to use a SIP account for your calls." -msgstr "" -"Добро дошли!\n" -"Овај помоћник ће вам помоћи да користите СИП налог за ваше позиве." +msgstr "Добро дошли!\nОвај помоћник ће вам помоћи да користите СИП налог за ваше позиве." #: ../gtk/setupwizard.c:43 msgid "Create an account on linphone.org" @@ -466,7 +445,7 @@ msgstr "Желим да наведем удаљену путању подеша msgid "Enter your linphone.org username" msgstr "Унесите ваше корисничко име линфон.орг-а" -#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:82 ../gtk/ldap.ui.h:4 +#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:81 ../gtk/ldap.ui.h:4 msgid "Username:" msgstr "Корисничко име:" @@ -522,10 +501,7 @@ msgstr "Обавештавај ме о ажурирањима линфона" msgid "" "Error, account not validated, username already used or server unreachable.\n" "Please go back and try again." -msgstr "" -"Грешка, налог није потврђен, корисничко име је већ у употреби или је сервер " -"недоступан.\n" -"Вратите се назад и покушајте опет." +msgstr "Грешка, налог није потврђен, корисничко име је већ у употреби или је сервер недоступан.\nВратите се назад и покушајте опет." #: ../gtk/setupwizard.c:405 msgid "Thank you. Your account is now configured and ready for use." @@ -533,13 +509,9 @@ msgstr "Хвала вам. Ваш налог је сада подешен и с #: ../gtk/setupwizard.c:413 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 "" -"Потврдите ваш налог притиском на везу коју смо вам управо послали ел. " -"поштом.\n" -"Затим се вратите овде и притисните дугме „Напред“." +msgstr "Потврдите ваш налог притиском на везу коју смо вам управо послали ел. поштом.\nЗатим се вратите овде и притисните дугме „Напред“." #: ../gtk/setupwizard.c:602 msgid "SIP account configuration assistant" @@ -644,9 +616,7 @@ msgstr "Непосредно или кроз сервер" msgid "" "download: %f\n" "upload: %f (kbit/s)" -msgstr "" -"преузимање: %f\n" -"отпремање: %f (kbit/s)" +msgstr "преузимање: %f\nотпремање: %f (kbit/s)" #: ../gtk/incall_view.c:272 ../gtk/incall_view.c:274 #, c-format @@ -760,9 +730,7 @@ msgstr "Застани" msgid "" "Recording into\n" "%s %s" -msgstr "" -"Снимам у\n" -"%s %s" +msgstr "Снимам у\n%s %s" #: ../gtk/incall_view.c:954 msgid "(Paused)" @@ -815,9 +783,7 @@ msgstr "Не могу да покренем управљање звуком си msgid "" "Welcome!\n" "This assistant will help you to configure audio settings for Linphone" -msgstr "" -"Добро дошли!\n" -"Овај помоћник ће вам помоћи да подесите поставке звука за Линфон" +msgstr "Добро дошли!\nОвај помоћник ће вам помоћи да подесите поставке звука за Линфон" #: ../gtk/audio_assistant.c:328 msgid "Capture device" @@ -867,7 +833,7 @@ msgstr "Хајде сада да покренемо Линфон" msgid "Audio Assistant" msgstr "Помоћник звука" -#: ../gtk/audio_assistant.c:513 ../gtk/main.ui.h:31 +#: ../gtk/audio_assistant.c:513 ../gtk/main.ui.h:32 msgid "Audio assistant" msgstr "Помоћник звука" @@ -944,105 +910,105 @@ msgid "Default" msgstr "Основно" #: ../gtk/main.ui.h:22 +msgid "Delete" +msgstr "Обриши" + +#: ../gtk/main.ui.h:23 msgid "_Options" msgstr "_Могућности" -#: ../gtk/main.ui.h:23 +#: ../gtk/main.ui.h:24 msgid "Set configuration URI" msgstr "Постави путању подешавања" -#: ../gtk/main.ui.h:24 +#: ../gtk/main.ui.h:25 msgid "Always start video" msgstr "Увек покрени видео" -#: ../gtk/main.ui.h:25 +#: ../gtk/main.ui.h:26 msgid "Enable self-view" msgstr "Укључи самовиђење" -#: ../gtk/main.ui.h:26 +#: ../gtk/main.ui.h:27 msgid "_Help" msgstr "По_моћ" -#: ../gtk/main.ui.h:27 +#: ../gtk/main.ui.h:28 msgid "Show debug window" msgstr "Прикажи прозорче прочишћавања" -#: ../gtk/main.ui.h:28 +#: ../gtk/main.ui.h:29 msgid "_Homepage" msgstr "_Матична страница" -#: ../gtk/main.ui.h:29 +#: ../gtk/main.ui.h:30 msgid "Check _Updates" msgstr "Провери _ажурирања" -#: ../gtk/main.ui.h:30 +#: ../gtk/main.ui.h:31 msgid "Account assistant" msgstr "Помоћник налога" -#: ../gtk/main.ui.h:32 +#: ../gtk/main.ui.h:33 msgid "SIP address or phone number:" msgstr "СИП адреса или број телефона:" -#: ../gtk/main.ui.h:33 +#: ../gtk/main.ui.h:34 msgid "Initiate a new call" msgstr "Започните нови позив" -#: ../gtk/main.ui.h:34 +#: ../gtk/main.ui.h:35 msgid "Contacts" msgstr "Пријатељи" -#: ../gtk/main.ui.h:35 +#: ../gtk/main.ui.h:36 msgid "Search" msgstr "Тражи" -#: ../gtk/main.ui.h:36 +#: ../gtk/main.ui.h:37 msgid "Add contacts from directory" msgstr "Додај пријатеље из директоријума" -#: ../gtk/main.ui.h:37 +#: ../gtk/main.ui.h:38 msgid "Add contact" msgstr "Додај пријатеља" -#: ../gtk/main.ui.h:38 +#: ../gtk/main.ui.h:39 msgid "Recent calls" msgstr "Скорашњи позиви" -#: ../gtk/main.ui.h:39 +#: ../gtk/main.ui.h:40 msgid "My current identity:" msgstr "Мој тренутни идентитет:" -#: ../gtk/main.ui.h:40 ../gtk/tunnel_config.ui.h:7 +#: ../gtk/main.ui.h:41 ../gtk/tunnel_config.ui.h:7 msgid "Username" msgstr "Корисник" -#: ../gtk/main.ui.h:41 ../gtk/tunnel_config.ui.h:8 +#: ../gtk/main.ui.h:42 ../gtk/tunnel_config.ui.h:8 msgid "Password" msgstr "Лозинка" -#: ../gtk/main.ui.h:42 +#: ../gtk/main.ui.h:43 msgid "Internet connection:" msgstr "Интернет веза:" -#: ../gtk/main.ui.h:43 +#: ../gtk/main.ui.h:44 msgid "Automatically log me in" msgstr "Сам ме пријави" -#: ../gtk/main.ui.h:44 ../gtk/password.ui.h:3 +#: ../gtk/main.ui.h:45 ../gtk/password.ui.h:3 msgid "UserID" msgstr "ИБ корисника" -#: ../gtk/main.ui.h:45 +#: ../gtk/main.ui.h:46 msgid "Login information" msgstr "Подаци пријављивања" -#: ../gtk/main.ui.h:46 +#: ../gtk/main.ui.h:47 msgid "Welcome!" msgstr "Добро дошли!" -#: ../gtk/main.ui.h:47 -msgid "Delete" -msgstr "Обриши" - #: ../gtk/about.ui.h:1 msgid "About Linphone" msgstr "О Линфону" @@ -1053,8 +1019,7 @@ msgstr "(C) Беледоне комуникације, 2010\n" #: ../gtk/about.ui.h:4 msgid "An internet video phone using the standard SIP (rfc3261) protocol." -msgstr "" -"Интернет телефон са снимком који користи уобичајени СИП протокол (rfc3261)." +msgstr "Интернет телефон са снимком који користи уобичајени СИП протокол (rfc3261)." #: ../gtk/about.ui.h:5 msgid "" @@ -1070,20 +1035,7 @@ msgid "" "cs: Petr Pisar \n" "hu: anonymous\n" "he: Eli Zaretskii \n" -msgstr "" -"fr: Simon Morlat\n" -"en: Simon Morlat and Delphine Perreau\n" -"it: Alberto Zanoni \n" -"de: Jean-Jacques Sarton \n" -"sv: Daniel Nylander \n" -"es: Jesus Benitez \n" -"ja: YAMAGUCHI YOSHIYA \n" -"pt_BR: Rafael Caesar Lenzi \n" -"pl: Robert Nasiadek \n" -"cs: Petr Pisar \n" -"hu: anonymous\n" -"he: Eli Zaretskii \n" -"sr: Мирослав Николић \n" +msgstr "fr: Simon Morlat\nen: Simon Morlat and Delphine Perreau\nit: Alberto Zanoni \nde: Jean-Jacques Sarton \nsv: Daniel Nylander \nes: Jesus Benitez \nja: YAMAGUCHI YOSHIYA \npt_BR: Rafael Caesar Lenzi \npl: Robert Nasiadek \ncs: Petr Pisar \nhu: anonymous\nhe: Eli Zaretskii \nsr: Мирослав Николић \n" #: ../gtk/contact.ui.h:2 msgid "SIP Address" @@ -1230,301 +1182,307 @@ msgid "C" msgstr "В" #: ../gtk/parameters.ui.h:11 -msgid "SIP (UDP)" -msgstr "СИП (УДП)" - -#: ../gtk/parameters.ui.h:12 -msgid "SIP (TCP)" -msgstr "СИП (ТЦП)" - -#: ../gtk/parameters.ui.h:13 -msgid "SIP (TLS)" -msgstr "СИП (ТЛС)" - -#: ../gtk/parameters.ui.h:14 msgid "Settings" msgstr "Подешавања" -#: ../gtk/parameters.ui.h:15 +#: ../gtk/parameters.ui.h:12 msgid "Set Maximum Transmission Unit:" msgstr "Подеси јединицу највећег преноса:" -#: ../gtk/parameters.ui.h:16 +#: ../gtk/parameters.ui.h:13 msgid "Send DTMFs as SIP info" msgstr "Пошаљи ДТМФ као СИП податке" -#: ../gtk/parameters.ui.h:17 -msgid "Use IPv6 instead of IPv4" -msgstr "Користи ИПв6 уместо ИПв4" +#: ../gtk/parameters.ui.h:14 +msgid "Allow IPv6" +msgstr "" -#: ../gtk/parameters.ui.h:18 +#: ../gtk/parameters.ui.h:15 msgid "Transport" msgstr "Пренос" -#: ../gtk/parameters.ui.h:19 +#: ../gtk/parameters.ui.h:16 msgid "SIP/UDP port" msgstr "СИП/УДП прикључник" -#: ../gtk/parameters.ui.h:21 +#: ../gtk/parameters.ui.h:18 msgid "Random" msgstr "Насумично" -#: ../gtk/parameters.ui.h:22 +#: ../gtk/parameters.ui.h:19 msgid "SIP/TCP port" msgstr "СИП/ТЦП прикључник" -#: ../gtk/parameters.ui.h:23 +#: ../gtk/parameters.ui.h:20 msgid "Audio RTP/UDP:" msgstr "РТП/УДП звука:" -#: ../gtk/parameters.ui.h:24 +#: ../gtk/parameters.ui.h:21 msgid "Fixed" msgstr "Неизмењиво" -#: ../gtk/parameters.ui.h:25 +#: ../gtk/parameters.ui.h:22 msgid "Video RTP/UDP:" msgstr "РТП/УДП снимка:" -#: ../gtk/parameters.ui.h:26 +#: ../gtk/parameters.ui.h:23 msgid "Media encryption type" msgstr "Врста шифровања медија" -#: ../gtk/parameters.ui.h:27 +#: ../gtk/parameters.ui.h:24 msgid "Media encryption is mandatory" msgstr "Шифровање медија је обавезно" -#: ../gtk/parameters.ui.h:28 +#: ../gtk/parameters.ui.h:25 msgid "Tunnel" msgstr "Тунел" -#: ../gtk/parameters.ui.h:29 +#: ../gtk/parameters.ui.h:26 msgid "DSCP fields" msgstr "ДСЦП поља" -#: ../gtk/parameters.ui.h:30 +#: ../gtk/parameters.ui.h:27 msgid "Network protocol and ports" msgstr "Мрежни протокол и прикључници" -#: ../gtk/parameters.ui.h:31 +#: ../gtk/parameters.ui.h:28 msgid "Direct connection to the Internet" msgstr "Непосредна веза на Интернет" -#: ../gtk/parameters.ui.h:32 +#: ../gtk/parameters.ui.h:29 msgid "Behind NAT / Firewall (specify gateway IP )" msgstr "Иза НАТ-а / мрежне баријере (наведите ИП мрежног пролаза)" -#: ../gtk/parameters.ui.h:33 +#: ../gtk/parameters.ui.h:30 msgid "Behind NAT / Firewall (use STUN to resolve)" msgstr "Иза НАТ-а / мрежне баријере (користите СТУН за решавање)" -#: ../gtk/parameters.ui.h:34 +#: ../gtk/parameters.ui.h:31 msgid "Behind NAT / Firewall (use ICE)" msgstr "Иза НАТ-а / мрежне баријере (користите ИЦЕ)" -#: ../gtk/parameters.ui.h:35 +#: ../gtk/parameters.ui.h:32 msgid "Behind NAT / Firewall (use uPnP)" msgstr "Иза НАТ-а / мрежне баријере (користите уПнП)" -#: ../gtk/parameters.ui.h:36 +#: ../gtk/parameters.ui.h:33 msgid "Public IP address:" msgstr "Јавна ИП адреса:" -#: ../gtk/parameters.ui.h:37 +#: ../gtk/parameters.ui.h:34 msgid "Stun server:" msgstr "Стун сервер:" -#: ../gtk/parameters.ui.h:38 +#: ../gtk/parameters.ui.h:35 msgid "NAT and Firewall" msgstr "НАТ и мрежна баријера" -#: ../gtk/parameters.ui.h:39 +#: ../gtk/parameters.ui.h:36 msgid "Network settings" msgstr "Мрежа" -#: ../gtk/parameters.ui.h:40 +#: ../gtk/parameters.ui.h:37 msgid "Ring sound:" msgstr "Звук звона:" -#: ../gtk/parameters.ui.h:41 +#: ../gtk/parameters.ui.h:38 msgid "ALSA special device (optional):" msgstr "АЛСА-ин посебни уређај (изборно):" -#: ../gtk/parameters.ui.h:42 +#: ../gtk/parameters.ui.h:39 msgid "Capture device:" msgstr "Уређај за снимање:" -#: ../gtk/parameters.ui.h:43 +#: ../gtk/parameters.ui.h:40 msgid "Ring device:" msgstr "Уређај за звоно:" -#: ../gtk/parameters.ui.h:44 +#: ../gtk/parameters.ui.h:41 msgid "Playback device:" msgstr "Уређај за пуштање:" -#: ../gtk/parameters.ui.h:45 +#: ../gtk/parameters.ui.h:42 msgid "Enable echo cancellation" msgstr "Укључи поништавање одјека" -#: ../gtk/parameters.ui.h:46 +#: ../gtk/parameters.ui.h:43 msgid "Audio" msgstr "Звук" -#: ../gtk/parameters.ui.h:47 +#: ../gtk/parameters.ui.h:44 msgid "Video input device:" msgstr "Улазни уређај снимка:" -#: ../gtk/parameters.ui.h:48 +#: ../gtk/parameters.ui.h:45 msgid "Prefered video resolution:" msgstr "Жељена резолуција снимка:" -#: ../gtk/parameters.ui.h:49 +#: ../gtk/parameters.ui.h:46 msgid "Video output method:" msgstr "Начин излаза снимка:" -#: ../gtk/parameters.ui.h:50 +#: ../gtk/parameters.ui.h:47 msgid "Show camera preview" msgstr "Прикажи претпреглед камерице" -#: ../gtk/parameters.ui.h:51 +#: ../gtk/parameters.ui.h:48 msgid "Video" msgstr "Снимак" -#: ../gtk/parameters.ui.h:52 +#: ../gtk/parameters.ui.h:49 msgid "Multimedia settings" msgstr "Мултимедија" -#: ../gtk/parameters.ui.h:53 +#: ../gtk/parameters.ui.h:50 msgid "This section defines your SIP address when not using a SIP account" msgstr "Овај одељак одређује вашу СИП адресу када не користите СИП налог" -#: ../gtk/parameters.ui.h:54 +#: ../gtk/parameters.ui.h:51 msgid "Your display name (eg: John Doe):" msgstr "Ваше приказано име (нпр: Пера Перић):" -#: ../gtk/parameters.ui.h:55 +#: ../gtk/parameters.ui.h:52 msgid "Your username:" msgstr "Ваше корисничко име:" -#: ../gtk/parameters.ui.h:56 +#: ../gtk/parameters.ui.h:53 msgid "Your resulting SIP address:" msgstr "Ваша резултирајућа СИП адреса:" -#: ../gtk/parameters.ui.h:57 +#: ../gtk/parameters.ui.h:54 msgid "Default identity" msgstr "Основни идентитет" -#: ../gtk/parameters.ui.h:58 +#: ../gtk/parameters.ui.h:55 msgid "Wizard" msgstr "Чаробњак" -#: ../gtk/parameters.ui.h:59 +#: ../gtk/parameters.ui.h:56 msgid "Add" msgstr "Додај" -#: ../gtk/parameters.ui.h:60 +#: ../gtk/parameters.ui.h:57 msgid "Edit" msgstr "Уреди" -#: ../gtk/parameters.ui.h:61 +#: ../gtk/parameters.ui.h:58 msgid "Remove" msgstr "Уклони" -#: ../gtk/parameters.ui.h:62 +#: ../gtk/parameters.ui.h:59 msgid "Proxy accounts" msgstr "Посреднички налози" -#: ../gtk/parameters.ui.h:63 +#: ../gtk/parameters.ui.h:60 msgid "Erase all passwords" msgstr "Обриши све лозинке" -#: ../gtk/parameters.ui.h:64 +#: ../gtk/parameters.ui.h:61 msgid "Privacy" msgstr "Приватност" -#: ../gtk/parameters.ui.h:65 +#: ../gtk/parameters.ui.h:62 +msgid "Automatically answer when a call is received" +msgstr "" + +#: ../gtk/parameters.ui.h:63 +msgid "Auto-answer" +msgstr "" + +#: ../gtk/parameters.ui.h:64 msgid "Manage SIP Accounts" msgstr "СИП налози" -#: ../gtk/parameters.ui.h:66 ../gtk/tunnel_config.ui.h:4 +#: ../gtk/parameters.ui.h:65 ../gtk/tunnel_config.ui.h:4 msgid "Enable" msgstr "Укључи" -#: ../gtk/parameters.ui.h:67 ../gtk/tunnel_config.ui.h:5 +#: ../gtk/parameters.ui.h:66 ../gtk/tunnel_config.ui.h:5 msgid "Disable" msgstr "Искључи" -#: ../gtk/parameters.ui.h:68 +#: ../gtk/parameters.ui.h:67 msgid "Codecs" msgstr "Кодеци" -#: ../gtk/parameters.ui.h:69 +#: ../gtk/parameters.ui.h:68 msgid "0 stands for \"unlimited\"" msgstr "0 значи „неограничено“" -#: ../gtk/parameters.ui.h:70 +#: ../gtk/parameters.ui.h:69 msgid "Upload speed limit in Kbit/sec:" msgstr "Ограничи брзину слања на (Kb/s):" -#: ../gtk/parameters.ui.h:71 +#: ../gtk/parameters.ui.h:70 msgid "Download speed limit in Kbit/sec:" msgstr "Ограничи брзину преузимања на (Kb/s):" -#: ../gtk/parameters.ui.h:72 +#: ../gtk/parameters.ui.h:71 msgid "Enable adaptive rate control" msgstr "Укључи прилагодљиво управљање протоком" -#: ../gtk/parameters.ui.h:73 +#: ../gtk/parameters.ui.h:72 msgid "" "Adaptive rate control is a technique to dynamically guess the available " "bandwidth during a call." -msgstr "" -"Прилагодљиво управљање протоком је техника за променљиво погађање " -"доступног пропусног опсега за време позива." +msgstr "Прилагодљиво управљање протоком је техника за променљиво погађање доступног пропусног опсега за време позива." -#: ../gtk/parameters.ui.h:74 +#: ../gtk/parameters.ui.h:73 msgid "Bandwidth control" msgstr "Управљање пропусним опсегом" -#: ../gtk/parameters.ui.h:75 +#: ../gtk/parameters.ui.h:74 msgid "Codecs" msgstr "Kодеци" -#: ../gtk/parameters.ui.h:76 +#: ../gtk/parameters.ui.h:75 msgid "Language" msgstr "Језик" -#: ../gtk/parameters.ui.h:77 +#: ../gtk/parameters.ui.h:76 msgid "Show advanced settings" msgstr "Прикажи напредна подешавања" -#: ../gtk/parameters.ui.h:78 +#: ../gtk/parameters.ui.h:77 msgid "Level" msgstr "Ниво" -#: ../gtk/parameters.ui.h:79 +#: ../gtk/parameters.ui.h:78 msgid "User interface" msgstr "Корисничко сучеље" -#: ../gtk/parameters.ui.h:80 ../gtk/ldap.ui.h:2 +#: ../gtk/parameters.ui.h:79 ../gtk/ldap.ui.h:2 msgid "Server address:" msgstr "Адреса сервера:" -#: ../gtk/parameters.ui.h:81 ../gtk/ldap.ui.h:3 +#: ../gtk/parameters.ui.h:80 ../gtk/ldap.ui.h:3 msgid "Authentication method:" msgstr "Начин потврђивања идентитета:" -#: ../gtk/parameters.ui.h:83 +#: ../gtk/parameters.ui.h:82 msgid "LDAP Account setup" msgstr "Подешавања ЛДАП налога" -#: ../gtk/parameters.ui.h:84 +#: ../gtk/parameters.ui.h:83 msgid "LDAP" msgstr "ЛДАП" -#: ../gtk/parameters.ui.h:85 +#: ../gtk/parameters.ui.h:84 msgid "Done" msgstr "Готово" +#: ../gtk/parameters.ui.h:85 +msgid "SIP (UDP)" +msgstr "СИП (УДП)" + +#: ../gtk/parameters.ui.h:86 +msgid "SIP (TCP)" +msgstr "СИП (ТЦП)" + +#: ../gtk/parameters.ui.h:87 +msgid "SIP (TLS)" +msgstr "СИП (ТЛС)" + #: ../gtk/buddylookup.ui.h:1 msgid "Search contacts in directory" msgstr "Потражите пријатеље у директоријуму" @@ -1728,17 +1686,9 @@ msgstr "Наводим удаљену путању подешавања" #: ../gtk/config-uri.ui.h:2 msgid "" -"This dialog allows to set an http or https address when configuration is to " -"be fetched at startup.\n" -"Please enter or modify the configuration URI below. After clicking OK, " -"Linphone will restart automatically in order to fetch and take into account " -"the new configuration. " -msgstr "" -"Ово прозорче омогућава подешавање хттп или хттпс адресе када се подешавање " -"добавља на покретању.\n" -"Унесите или измените путању подешавања. Након што притиснете „У реду“, " -"Линфон ће се сам поново покренути како би довукао и унео у налог нова " -"подешавања. " +"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n" +"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. " +msgstr "Ово прозорче омогућава подешавање хттп или хттпс адресе када се подешавање добавља на покретању.\nУнесите или измените путању подешавања. Након што притиснете „У реду“, Линфон ће се сам поново покренути како би довукао и унео у налог нова подешавања. " #: ../gtk/provisioning-fetch.ui.h:1 msgid "Configuring..." @@ -1748,60 +1698,60 @@ msgstr "Подешавам..." msgid "Please wait while fetching configuration from server..." msgstr "Сачекајте док довучем подешавања са сервера..." -#: ../coreapi/linphonecore.c:1512 +#: ../coreapi/linphonecore.c:1534 msgid "Ready" msgstr "Спреман" -#: ../coreapi/linphonecore.c:2499 +#: ../coreapi/linphonecore.c:2534 msgid "Configuring" msgstr "Подешавам" -#: ../coreapi/linphonecore.c:2673 +#: ../coreapi/linphonecore.c:2708 msgid "Looking for telephone number destination..." msgstr "Тражим одредиште телефонског броја..." -#: ../coreapi/linphonecore.c:2675 +#: ../coreapi/linphonecore.c:2710 msgid "Could not resolve this number." msgstr "Не могу да решим овај број." #. must be known at that time -#: ../coreapi/linphonecore.c:2961 +#: ../coreapi/linphonecore.c:2996 msgid "Contacting" msgstr "Ступам у везу" -#: ../coreapi/linphonecore.c:2966 +#: ../coreapi/linphonecore.c:3001 msgid "Could not call" msgstr "Не могу да позовем" -#: ../coreapi/linphonecore.c:3116 +#: ../coreapi/linphonecore.c:3152 msgid "Sorry, we have reached the maximum number of simultaneous calls" msgstr "Извините, достигли смо највећи број истовремених позива" -#: ../coreapi/linphonecore.c:3274 +#: ../coreapi/linphonecore.c:3310 msgid "is contacting you" msgstr "вам се обраћа" -#: ../coreapi/linphonecore.c:3275 +#: ../coreapi/linphonecore.c:3311 msgid " and asked autoanswer." msgstr " и затражени само-одговор." -#: ../coreapi/linphonecore.c:3399 +#: ../coreapi/linphonecore.c:3435 msgid "Modifying call parameters..." msgstr "Мењам параметре позива..." -#: ../coreapi/linphonecore.c:3747 +#: ../coreapi/linphonecore.c:3782 msgid "Connected." msgstr "Повезан сам." -#: ../coreapi/linphonecore.c:3772 +#: ../coreapi/linphonecore.c:3807 msgid "Call aborted" msgstr "Позив је прекинут" -#: ../coreapi/linphonecore.c:3962 +#: ../coreapi/linphonecore.c:3997 msgid "Could not pause the call" msgstr "Не могу да зауставим позив" -#: ../coreapi/linphonecore.c:3965 +#: ../coreapi/linphonecore.c:4000 msgid "Pausing the current call..." msgstr "Заустављам тренутни позив..." @@ -1869,130 +1819,125 @@ msgstr "Непознато стање" msgid "" "The sip proxy address you entered is invalid, it must start with \"sip:\" " "followed by a hostname." -msgstr "" -"Адреса сип посредника коју сте унели је неисправна, мора почети на „sip:“ за " -"којим следи назив домаћина." +msgstr "Адреса сип посредника коју сте унели је неисправна, мора почети на „sip:“ за којим следи назив домаћина." #: ../coreapi/proxy.c:334 msgid "" "The sip identity you entered is invalid.\n" "It should look like sip:username@proxydomain, such as sip:alice@example.net" -msgstr "" -"Сип идентитет који сте унели није исправан.\n" -"Треба да изгледа као „sip:корисник@домен-посредника, као што је „sip:" -"alice@example.net“" +msgstr "Сип идентитет који сте унели није исправан.\nТреба да изгледа као „sip:корисник@домен-посредника, као што је „sip:alice@example.net“" -#: ../coreapi/proxy.c:1403 +#: ../coreapi/proxy.c:1416 #, c-format msgid "Could not login as %s" msgstr "Не могу да се пријавим као %s" -#: ../coreapi/callbacks.c:419 +#: ../coreapi/callbacks.c:428 msgid "Remote ringing." msgstr "Удаљено звоњење." -#: ../coreapi/callbacks.c:431 +#: ../coreapi/callbacks.c:440 msgid "Remote ringing..." msgstr "Удаљено звоњење..." -#: ../coreapi/callbacks.c:448 +#: ../coreapi/callbacks.c:461 msgid "Early media." msgstr "Ранији медиј." -#: ../coreapi/callbacks.c:521 +#: ../coreapi/callbacks.c:533 #, c-format msgid "Call with %s is paused." msgstr "Позив са „%s“ је заустављен." -#: ../coreapi/callbacks.c:534 +#: ../coreapi/callbacks.c:546 #, c-format msgid "Call answered by %s - on hold." msgstr "Позив на који је одговорио „%s“ — на чекању." -#: ../coreapi/callbacks.c:544 +#: ../coreapi/callbacks.c:556 msgid "Call resumed." msgstr "Позив је настављен." -#: ../coreapi/callbacks.c:548 +#: ../coreapi/callbacks.c:560 #, c-format msgid "Call answered by %s." msgstr "На позив је одговорио „%s“." -#: ../coreapi/callbacks.c:571 +#: ../coreapi/callbacks.c:583 msgid "Incompatible, check codecs or security settings..." msgstr "Несагласно, проверите кодеке или безбедносна подешавања..." -#: ../coreapi/callbacks.c:576 ../coreapi/callbacks.c:888 +#: ../coreapi/callbacks.c:588 ../coreapi/callbacks.c:900 msgid "Incompatible media parameters." msgstr "Медијски параметри су несагласни." -#: ../coreapi/callbacks.c:606 +#: ../coreapi/callbacks.c:618 msgid "We have been resumed." msgstr "Наставили смо." #. we are being paused -#: ../coreapi/callbacks.c:614 +#: ../coreapi/callbacks.c:626 msgid "We are paused by other party." msgstr "Друга страна нас је паузирала." #. reINVITE and in-dialogs UPDATE go here -#: ../coreapi/callbacks.c:648 +#: ../coreapi/callbacks.c:660 msgid "Call is updated by remote." msgstr "Позив је освежен удаљеним." -#: ../coreapi/callbacks.c:764 +#: ../coreapi/callbacks.c:776 msgid "Call terminated." msgstr "Позив је завршен." -#: ../coreapi/callbacks.c:792 +#: ../coreapi/callbacks.c:804 msgid "User is busy." msgstr "Корисник је заузет." -#: ../coreapi/callbacks.c:793 +#: ../coreapi/callbacks.c:805 msgid "User is temporarily unavailable." msgstr "Корисник је привремено недоступан." #. char *retrymsg=_("%s. Retry after %i minute(s)."); -#: ../coreapi/callbacks.c:795 +#: ../coreapi/callbacks.c:807 msgid "User does not want to be disturbed." msgstr "Корисник не жели да буде узнемираван." -#: ../coreapi/callbacks.c:796 +#: ../coreapi/callbacks.c:808 msgid "Call declined." msgstr "Позив је одбијен." -#: ../coreapi/callbacks.c:811 +#: ../coreapi/callbacks.c:823 msgid "Request timeout." msgstr "Истекло је време захтева." -#: ../coreapi/callbacks.c:842 +#: ../coreapi/callbacks.c:854 msgid "Redirected" msgstr "Преусмерен" -#: ../coreapi/callbacks.c:897 +#: ../coreapi/callbacks.c:909 msgid "Call failed." msgstr "Позив није успео." -#: ../coreapi/callbacks.c:975 +#: ../coreapi/callbacks.c:987 #, c-format msgid "Registration on %s successful." msgstr "Уписивање на „%s“ је успело." -#: ../coreapi/callbacks.c:976 +#: ../coreapi/callbacks.c:988 #, c-format msgid "Unregistration on %s done." msgstr "Исписивање са „%s“ је обављено." -#: ../coreapi/callbacks.c:994 +#: ../coreapi/callbacks.c:1006 msgid "no response timeout" msgstr "нема ограничења одговора" -#: ../coreapi/callbacks.c:997 +#: ../coreapi/callbacks.c:1009 #, c-format msgid "Registration on %s failed: %s" msgstr "Уписивање на „%s“ није успело: %s" -#: ../coreapi/callbacks.c:1004 +#: ../coreapi/callbacks.c:1016 msgid "Service unavailable, retrying" msgstr "Услуга није доступна, поново покушавам" @@ -2002,7 +1947,11 @@ msgstr "Услуга није доступна, поново покушавам" msgid "Authentication token is %s" msgstr "Симбол потврђивања идентитета је „%s“" -#: ../coreapi/linphonecall.c:3600 +#: ../coreapi/linphonecall.c:1305 +msgid "Call parameters were successfully modified." +msgstr "" + +#: ../coreapi/linphonecall.c:3659 #, c-format msgid "You have missed %i call." msgid_plural "You have missed %i calls." @@ -2034,12 +1983,7 @@ msgid "" "To: %s\n" "Status: %s\n" "Duration: %i mn %i sec\n" -msgstr "" -"%s на %s\n" -"Позивач: %s\n" -"Позивник: %s\n" -"Стање: %s\n" -"Трајање: %i мин. %i сек.\n" +msgstr "%s на %s\nПозивач: %s\nПозивник: %s\nСтање: %s\nТрајање: %i мин. %i сек.\n" #: ../coreapi/call_log.c:221 msgid "Outgoing call" diff --git a/po/sv.po b/po/sv.po index 6e2ada759..ef23005fe 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,22 +1,20 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: msgid "" msgstr "" "Project-Id-Version: linphone-gtk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-11 16:26+0100\n" -"PO-Revision-Date: 2015-02-17 11:28+0000\n" -"Last-Translator: Belledonne Communications \n" -"Language-Team: Swedish (http://www.transifex.com/projects/p/linphone-gtk/" -"language/sv/)\n" -"Language: sv\n" +"POT-Creation-Date: 2015-03-27 14:40+0100\n" +"PO-Revision-Date: 2015-03-27 13:40+0000\n" +"Last-Translator: Belledonne Communications \n" +"Language-Team: Swedish (http://www.transifex.com/projects/p/linphone-gtk/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: sv\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974 @@ -89,136 +87,126 @@ msgstr "" msgid "Couldn't find pixmap file: %s" msgstr "Kunde inte hitta pixmap filen: %s" -#: ../gtk/chat.c:374 ../gtk/friendlist.c:924 -msgid "Invalid sip contact !" -msgstr "ogiltig SIP kontakt!" - -#: ../gtk/main.c:137 +#: ../gtk/main.c:136 msgid "log to stdout some debug information while running." msgstr "skriv loggning information under körning" -#: ../gtk/main.c:138 +#: ../gtk/main.c:137 msgid "path to a file to write logs into." msgstr "" -#: ../gtk/main.c:139 +#: ../gtk/main.c:138 msgid "Start linphone with video disabled." msgstr "" -#: ../gtk/main.c:140 +#: ../gtk/main.c:139 msgid "Start only in the system tray, do not show the main interface." msgstr "Starta ikonifierat, visa inte huvudfönstret" -#: ../gtk/main.c:141 +#: ../gtk/main.c:140 msgid "address to call right now" msgstr "Samtalsmottagare" -#: ../gtk/main.c:142 -msgid "if set automatically answer incoming calls" -msgstr "Om på, besvara automatisk alla inkommande samtal" - -#: ../gtk/main.c:143 +#: ../gtk/main.c:141 msgid "" -"Specifiy a working directory (should be the base of the installation, eg: c:" -"\\Program Files\\Linphone)" -msgstr "" -"Välj en arbetskatalog som ska vara basen för installationen, såsom C:" -"\\Program\\Linphone" +"Specifiy a working directory (should be the base of the installation, eg: " +"c:\\Program Files\\Linphone)" +msgstr "Välj en arbetskatalog som ska vara basen för installationen, såsom C:\\Program\\Linphone" -#: ../gtk/main.c:144 +#: ../gtk/main.c:142 msgid "Configuration file" msgstr "" -#: ../gtk/main.c:145 +#: ../gtk/main.c:143 msgid "Run the audio assistant" msgstr "" -#: ../gtk/main.c:146 +#: ../gtk/main.c:144 msgid "Run self test and exit 0 if succeed" msgstr "" -#: ../gtk/main.c:1061 +#: ../gtk/main.c:1059 #, 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 skulle vilja lägga till dig till hans/hennes kontaktlista.\n" -"Vill du tillåta honom/henne att se din närvarostatus eller lägga till honom/" -"henne till din kontaktlista?\n" -"Om du svarar nej, personen kommer att vara bannlyst." +msgstr "%s skulle vilja lägga till dig till hans/hennes kontaktlista.\nVill du tillåta honom/henne att se din närvarostatus eller lägga till honom/henne till din kontaktlista?\nOm du svarar nej, personen kommer att vara bannlyst." -#: ../gtk/main.c:1138 +#: ../gtk/main.c:1136 #, c-format msgid "" "Please enter your password for username %s\n" " at realm %s:" msgstr "" -#: ../gtk/main.c:1259 +#: ../gtk/main.c:1257 msgid "Call error" msgstr "" -#: ../gtk/main.c:1262 ../coreapi/linphonecore.c:3791 +#: ../gtk/main.c:1260 ../coreapi/linphonecore.c:3826 msgid "Call ended" msgstr "Samtalet slut" -#: ../gtk/main.c:1265 ../coreapi/call_log.c:221 +#: ../gtk/main.c:1263 ../coreapi/call_log.c:221 msgid "Incoming call" msgstr "Inkommande samtal" -#: ../gtk/main.c:1267 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5 +#: ../gtk/main.c:1265 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5 msgid "Answer" msgstr "" -#: ../gtk/main.c:1269 ../gtk/main.ui.h:6 +#: ../gtk/main.c:1267 ../gtk/main.ui.h:6 msgid "Decline" msgstr "Avböj" -#: ../gtk/main.c:1275 +#: ../gtk/main.c:1273 msgid "Call paused" msgstr "" -#: ../gtk/main.c:1275 +#: ../gtk/main.c:1273 #, c-format msgid "by %s" msgstr "" -#: ../gtk/main.c:1345 +#: ../gtk/main.c:1343 #, c-format msgid "%s proposed to start video. Do you accept ?" msgstr "" -#: ../gtk/main.c:1507 +#: ../gtk/main.c:1505 msgid "Website link" msgstr "Webbsajt" -#: ../gtk/main.c:1556 +#: ../gtk/main.c:1554 msgid "Linphone - a video internet phone" msgstr "Linphone - en video Internet telefon" -#: ../gtk/main.c:1648 +#: ../gtk/main.c:1646 #, c-format msgid "%s (Default)" msgstr "%s (Default)" -#: ../gtk/main.c:1980 ../coreapi/callbacks.c:1045 +#: ../gtk/main.c:1978 ../coreapi/callbacks.c:1057 #, c-format msgid "We are transferred to %s" msgstr "" -#: ../gtk/main.c:1990 +#: ../gtk/main.c:1988 msgid "" "No sound cards have been detected on this computer.\n" "You won't be able to send or receive audio calls." msgstr "" -#: ../gtk/main.c:2135 +#: ../gtk/main.c:2136 msgid "A free SIP video-phone" msgstr "En gratis SIP video-telefon" +#: ../gtk/main.c:2241 +#, c-format +msgid "Hello\n" +msgstr "" + #: ../gtk/friendlist.c:505 msgid "Add to addressbook" msgstr "" @@ -244,6 +232,10 @@ msgstr "" msgid "Search in %s directory" msgstr "Sök i %s katalogen" +#: ../gtk/friendlist.c:924 +msgid "Invalid sip contact !" +msgstr "ogiltig SIP kontakt!" + #: ../gtk/friendlist.c:976 #, c-format msgid "Edit contact '%s'" @@ -284,7 +276,7 @@ msgstr "Parametrar" msgid "Enabled" msgstr "På" -#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763 ../gtk/parameters.ui.h:20 +#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763 ../gtk/parameters.ui.h:17 msgid "Disabled" msgstr "Av" @@ -390,9 +382,7 @@ msgstr "" msgid "" "A more recent version is availalble from %s.\n" "Would you like to open a browser to download it ?" -msgstr "" -"En nyare version är tillgänglig på %s.\n" -"Vill du öppna en browser för att ladda ner den?" +msgstr "En nyare version är tillgänglig på %s.\nVill du öppna en browser för att ladda ner den?" #: ../gtk/update.c:91 msgid "You are running the lastest version." @@ -451,7 +441,7 @@ msgstr "" msgid "Enter your linphone.org username" msgstr "" -#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:82 ../gtk/ldap.ui.h:4 +#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:81 ../gtk/ldap.ui.h:4 msgid "Username:" msgstr "Användarnamn:" @@ -515,8 +505,7 @@ msgstr "Tack. Ditt konto är nu konfigurerad och färdig att användas." #: ../gtk/setupwizard.c:413 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 "" @@ -840,7 +829,7 @@ msgstr "" msgid "Audio Assistant" msgstr "" -#: ../gtk/audio_assistant.c:513 ../gtk/main.ui.h:31 +#: ../gtk/audio_assistant.c:513 ../gtk/main.ui.h:32 msgid "Audio assistant" msgstr "" @@ -917,103 +906,103 @@ msgid "Default" msgstr "" #: ../gtk/main.ui.h:22 -msgid "_Options" +msgid "Delete" msgstr "" #: ../gtk/main.ui.h:23 -msgid "Set configuration URI" +msgid "_Options" msgstr "" #: ../gtk/main.ui.h:24 -msgid "Always start video" +msgid "Set configuration URI" msgstr "" #: ../gtk/main.ui.h:25 +msgid "Always start video" +msgstr "" + +#: ../gtk/main.ui.h:26 msgid "Enable self-view" msgstr "Själv bild" -#: ../gtk/main.ui.h:26 +#: ../gtk/main.ui.h:27 msgid "_Help" msgstr "" -#: ../gtk/main.ui.h:27 +#: ../gtk/main.ui.h:28 msgid "Show debug window" msgstr "" -#: ../gtk/main.ui.h:28 +#: ../gtk/main.ui.h:29 msgid "_Homepage" msgstr "" -#: ../gtk/main.ui.h:29 +#: ../gtk/main.ui.h:30 msgid "Check _Updates" msgstr "" -#: ../gtk/main.ui.h:30 +#: ../gtk/main.ui.h:31 msgid "Account assistant" msgstr "" -#: ../gtk/main.ui.h:32 +#: ../gtk/main.ui.h:33 msgid "SIP address or phone number:" msgstr "Användarnamn" -#: ../gtk/main.ui.h:33 +#: ../gtk/main.ui.h:34 msgid "Initiate a new call" msgstr "" -#: ../gtk/main.ui.h:34 +#: ../gtk/main.ui.h:35 msgid "Contacts" msgstr "" -#: ../gtk/main.ui.h:35 +#: ../gtk/main.ui.h:36 msgid "Search" msgstr "Sök" -#: ../gtk/main.ui.h:36 +#: ../gtk/main.ui.h:37 msgid "Add contacts from directory" msgstr "Lägg till kontakt ifrån katalogen" -#: ../gtk/main.ui.h:37 +#: ../gtk/main.ui.h:38 msgid "Add contact" msgstr "" -#: ../gtk/main.ui.h:38 +#: ../gtk/main.ui.h:39 msgid "Recent calls" msgstr "" -#: ../gtk/main.ui.h:39 +#: ../gtk/main.ui.h:40 msgid "My current identity:" msgstr "Min nuvarande identitet" -#: ../gtk/main.ui.h:40 ../gtk/tunnel_config.ui.h:7 +#: ../gtk/main.ui.h:41 ../gtk/tunnel_config.ui.h:7 msgid "Username" msgstr "Användarnamn" -#: ../gtk/main.ui.h:41 ../gtk/tunnel_config.ui.h:8 +#: ../gtk/main.ui.h:42 ../gtk/tunnel_config.ui.h:8 msgid "Password" msgstr "Lösenord" -#: ../gtk/main.ui.h:42 +#: ../gtk/main.ui.h:43 msgid "Internet connection:" msgstr "Internet förbindelse:" -#: ../gtk/main.ui.h:43 +#: ../gtk/main.ui.h:44 msgid "Automatically log me in" msgstr "Logga mig automatiskt" -#: ../gtk/main.ui.h:44 ../gtk/password.ui.h:3 +#: ../gtk/main.ui.h:45 ../gtk/password.ui.h:3 msgid "UserID" msgstr "AnvändarID" -#: ../gtk/main.ui.h:45 +#: ../gtk/main.ui.h:46 msgid "Login information" msgstr "Login information" -#: ../gtk/main.ui.h:46 -msgid "Welcome!" -msgstr "" - #: ../gtk/main.ui.h:47 -msgid "Delete" +msgid "Welcome!" msgstr "" #: ../gtk/about.ui.h:1 @@ -1189,300 +1178,307 @@ msgid "C" msgstr "" #: ../gtk/parameters.ui.h:11 -msgid "SIP (UDP)" -msgstr "" - -#: ../gtk/parameters.ui.h:12 -msgid "SIP (TCP)" -msgstr "" - -#: ../gtk/parameters.ui.h:13 -msgid "SIP (TLS)" -msgstr "" - -#: ../gtk/parameters.ui.h:14 msgid "Settings" msgstr "Inställningar" -#: ../gtk/parameters.ui.h:15 +#: ../gtk/parameters.ui.h:12 msgid "Set Maximum Transmission Unit:" msgstr "Välj MTU (Maximum Transmission Unit):" -#: ../gtk/parameters.ui.h:16 +#: ../gtk/parameters.ui.h:13 msgid "Send DTMFs as SIP info" msgstr "Kicka DTMF koder som SIP info" -#: ../gtk/parameters.ui.h:17 -msgid "Use IPv6 instead of IPv4" -msgstr "Använd IPv6 istället av IPv4" +#: ../gtk/parameters.ui.h:14 +msgid "Allow IPv6" +msgstr "" -#: ../gtk/parameters.ui.h:18 +#: ../gtk/parameters.ui.h:15 msgid "Transport" msgstr "Transport" -#: ../gtk/parameters.ui.h:19 +#: ../gtk/parameters.ui.h:16 msgid "SIP/UDP port" msgstr "" -#: ../gtk/parameters.ui.h:21 +#: ../gtk/parameters.ui.h:18 msgid "Random" msgstr "" -#: ../gtk/parameters.ui.h:22 +#: ../gtk/parameters.ui.h:19 msgid "SIP/TCP port" msgstr "" -#: ../gtk/parameters.ui.h:23 +#: ../gtk/parameters.ui.h:20 msgid "Audio RTP/UDP:" msgstr "" -#: ../gtk/parameters.ui.h:24 +#: ../gtk/parameters.ui.h:21 msgid "Fixed" msgstr "" -#: ../gtk/parameters.ui.h:25 +#: ../gtk/parameters.ui.h:22 msgid "Video RTP/UDP:" msgstr "" -#: ../gtk/parameters.ui.h:26 +#: ../gtk/parameters.ui.h:23 msgid "Media encryption type" msgstr "" -#: ../gtk/parameters.ui.h:27 +#: ../gtk/parameters.ui.h:24 msgid "Media encryption is mandatory" msgstr "" -#: ../gtk/parameters.ui.h:28 +#: ../gtk/parameters.ui.h:25 msgid "Tunnel" msgstr "" -#: ../gtk/parameters.ui.h:29 +#: ../gtk/parameters.ui.h:26 msgid "DSCP fields" msgstr "" -#: ../gtk/parameters.ui.h:30 +#: ../gtk/parameters.ui.h:27 msgid "Network protocol and ports" msgstr "" -#: ../gtk/parameters.ui.h:31 +#: ../gtk/parameters.ui.h:28 msgid "Direct connection to the Internet" msgstr "Direkt förbindelse till Internet" -#: ../gtk/parameters.ui.h:32 +#: ../gtk/parameters.ui.h:29 msgid "Behind NAT / Firewall (specify gateway IP )" msgstr "" -#: ../gtk/parameters.ui.h:33 +#: ../gtk/parameters.ui.h:30 msgid "Behind NAT / Firewall (use STUN to resolve)" msgstr "Bakom en NAT / brandvägg (använd STUN för att avgöra adressen)" -#: ../gtk/parameters.ui.h:34 +#: ../gtk/parameters.ui.h:31 msgid "Behind NAT / Firewall (use ICE)" msgstr "" -#: ../gtk/parameters.ui.h:35 +#: ../gtk/parameters.ui.h:32 msgid "Behind NAT / Firewall (use uPnP)" msgstr "" -#: ../gtk/parameters.ui.h:36 +#: ../gtk/parameters.ui.h:33 msgid "Public IP address:" msgstr "Publik IP adress:" -#: ../gtk/parameters.ui.h:37 +#: ../gtk/parameters.ui.h:34 msgid "Stun server:" msgstr "STUN server:" -#: ../gtk/parameters.ui.h:38 +#: ../gtk/parameters.ui.h:35 msgid "NAT and Firewall" msgstr "NAT och Brandvägg" -#: ../gtk/parameters.ui.h:39 +#: ../gtk/parameters.ui.h:36 msgid "Network settings" msgstr "Nätverksinställningar" -#: ../gtk/parameters.ui.h:40 +#: ../gtk/parameters.ui.h:37 msgid "Ring sound:" msgstr "Ring signal:" -#: ../gtk/parameters.ui.h:41 +#: ../gtk/parameters.ui.h:38 msgid "ALSA special device (optional):" msgstr "ALSA speciell enhet (tillval):" -#: ../gtk/parameters.ui.h:42 +#: ../gtk/parameters.ui.h:39 msgid "Capture device:" msgstr "Mikrofon enhet:" -#: ../gtk/parameters.ui.h:43 +#: ../gtk/parameters.ui.h:40 msgid "Ring device:" msgstr "Ringning enhet:" -#: ../gtk/parameters.ui.h:44 +#: ../gtk/parameters.ui.h:41 msgid "Playback device:" msgstr "Uppspelningsenhet:" -#: ../gtk/parameters.ui.h:45 +#: ../gtk/parameters.ui.h:42 msgid "Enable echo cancellation" msgstr "Tillåta ekokancellering" -#: ../gtk/parameters.ui.h:46 +#: ../gtk/parameters.ui.h:43 msgid "Audio" msgstr "Audio" -#: ../gtk/parameters.ui.h:47 +#: ../gtk/parameters.ui.h:44 msgid "Video input device:" msgstr "Video ingångsenhet:" -#: ../gtk/parameters.ui.h:48 +#: ../gtk/parameters.ui.h:45 msgid "Prefered video resolution:" msgstr "Video upplösning:" -#: ../gtk/parameters.ui.h:49 +#: ../gtk/parameters.ui.h:46 msgid "Video output method:" msgstr "" -#: ../gtk/parameters.ui.h:50 +#: ../gtk/parameters.ui.h:47 msgid "Show camera preview" msgstr "" -#: ../gtk/parameters.ui.h:51 +#: ../gtk/parameters.ui.h:48 msgid "Video" msgstr "Video" -#: ../gtk/parameters.ui.h:52 +#: ../gtk/parameters.ui.h:49 msgid "Multimedia settings" msgstr "Multimedia inställningar" -#: ../gtk/parameters.ui.h:53 +#: ../gtk/parameters.ui.h:50 msgid "This section defines your SIP address when not using a SIP account" -msgstr "" -"Denna sektion specificerar din SIP adress när du inte använder ett SIP konto" +msgstr "Denna sektion specificerar din SIP adress när du inte använder ett SIP konto" -#: ../gtk/parameters.ui.h:54 +#: ../gtk/parameters.ui.h:51 msgid "Your display name (eg: John Doe):" msgstr "Ditt synliga namn, e.g. Kalle Karlsson:" -#: ../gtk/parameters.ui.h:55 +#: ../gtk/parameters.ui.h:52 msgid "Your username:" msgstr "Ditt användarnamn:" -#: ../gtk/parameters.ui.h:56 +#: ../gtk/parameters.ui.h:53 msgid "Your resulting SIP address:" msgstr "Din SIP adress:" -#: ../gtk/parameters.ui.h:57 +#: ../gtk/parameters.ui.h:54 msgid "Default identity" msgstr "Default identitet" -#: ../gtk/parameters.ui.h:58 +#: ../gtk/parameters.ui.h:55 msgid "Wizard" msgstr "" -#: ../gtk/parameters.ui.h:59 +#: ../gtk/parameters.ui.h:56 msgid "Add" msgstr "Lägg till" -#: ../gtk/parameters.ui.h:60 +#: ../gtk/parameters.ui.h:57 msgid "Edit" msgstr "Editera" -#: ../gtk/parameters.ui.h:61 +#: ../gtk/parameters.ui.h:58 msgid "Remove" msgstr "Ta bort" -#: ../gtk/parameters.ui.h:62 +#: ../gtk/parameters.ui.h:59 msgid "Proxy accounts" msgstr "Proxy konton" -#: ../gtk/parameters.ui.h:63 +#: ../gtk/parameters.ui.h:60 msgid "Erase all passwords" msgstr "Glöm alla lösenord" -#: ../gtk/parameters.ui.h:64 +#: ../gtk/parameters.ui.h:61 msgid "Privacy" msgstr "Integritet" -#: ../gtk/parameters.ui.h:65 +#: ../gtk/parameters.ui.h:62 +msgid "Automatically answer when a call is received" +msgstr "" + +#: ../gtk/parameters.ui.h:63 +msgid "Auto-answer" +msgstr "" + +#: ../gtk/parameters.ui.h:64 msgid "Manage SIP Accounts" msgstr "Hantera SIP konton" -#: ../gtk/parameters.ui.h:66 ../gtk/tunnel_config.ui.h:4 +#: ../gtk/parameters.ui.h:65 ../gtk/tunnel_config.ui.h:4 msgid "Enable" msgstr "Möjliggör" -#: ../gtk/parameters.ui.h:67 ../gtk/tunnel_config.ui.h:5 +#: ../gtk/parameters.ui.h:66 ../gtk/tunnel_config.ui.h:5 msgid "Disable" msgstr "Inaktivera" -#: ../gtk/parameters.ui.h:68 +#: ../gtk/parameters.ui.h:67 msgid "Codecs" msgstr "Codecs" -#: ../gtk/parameters.ui.h:69 +#: ../gtk/parameters.ui.h:68 msgid "0 stands for \"unlimited\"" msgstr "0 står för \"utan begränsning\"" -#: ../gtk/parameters.ui.h:70 +#: ../gtk/parameters.ui.h:69 msgid "Upload speed limit in Kbit/sec:" msgstr "Max upstream bandbreddshastighet i kbit/sek:" -#: ../gtk/parameters.ui.h:71 +#: ../gtk/parameters.ui.h:70 msgid "Download speed limit in Kbit/sec:" msgstr "Max downstream bandbreddshastighet i kbit/sek:" -#: ../gtk/parameters.ui.h:72 +#: ../gtk/parameters.ui.h:71 msgid "Enable adaptive rate control" msgstr "" -#: ../gtk/parameters.ui.h:73 +#: ../gtk/parameters.ui.h:72 msgid "" "Adaptive rate control is a technique to dynamically guess the available " "bandwidth during a call." msgstr "" -#: ../gtk/parameters.ui.h:74 +#: ../gtk/parameters.ui.h:73 msgid "Bandwidth control" msgstr "Bandbreddskontroll" -#: ../gtk/parameters.ui.h:75 +#: ../gtk/parameters.ui.h:74 msgid "Codecs" msgstr "Codecs" -#: ../gtk/parameters.ui.h:76 +#: ../gtk/parameters.ui.h:75 msgid "Language" msgstr "Språk" -#: ../gtk/parameters.ui.h:77 +#: ../gtk/parameters.ui.h:76 msgid "Show advanced settings" msgstr "Visa avancerade inställningar" -#: ../gtk/parameters.ui.h:78 +#: ../gtk/parameters.ui.h:77 msgid "Level" msgstr "Nivå" -#: ../gtk/parameters.ui.h:79 +#: ../gtk/parameters.ui.h:78 msgid "User interface" msgstr "Användarinterface" -#: ../gtk/parameters.ui.h:80 ../gtk/ldap.ui.h:2 +#: ../gtk/parameters.ui.h:79 ../gtk/ldap.ui.h:2 msgid "Server address:" msgstr "" -#: ../gtk/parameters.ui.h:81 ../gtk/ldap.ui.h:3 +#: ../gtk/parameters.ui.h:80 ../gtk/ldap.ui.h:3 msgid "Authentication method:" msgstr "" -#: ../gtk/parameters.ui.h:83 +#: ../gtk/parameters.ui.h:82 msgid "LDAP Account setup" msgstr "" -#: ../gtk/parameters.ui.h:84 +#: ../gtk/parameters.ui.h:83 msgid "LDAP" msgstr "" -#: ../gtk/parameters.ui.h:85 +#: ../gtk/parameters.ui.h:84 msgid "Done" msgstr "Klar" +#: ../gtk/parameters.ui.h:85 +msgid "SIP (UDP)" +msgstr "" + +#: ../gtk/parameters.ui.h:86 +msgid "SIP (TCP)" +msgstr "" + +#: ../gtk/parameters.ui.h:87 +msgid "SIP (TLS)" +msgstr "" + #: ../gtk/buddylookup.ui.h:1 msgid "Search contacts in directory" msgstr "Sök för kontakter i katalogen" @@ -1686,11 +1682,8 @@ msgstr "" #: ../gtk/config-uri.ui.h:2 msgid "" -"This dialog allows to set an http or https address when configuration is to " -"be fetched at startup.\n" -"Please enter or modify the configuration URI below. After clicking OK, " -"Linphone will restart automatically in order to fetch and take into account " -"the new configuration. " +"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n" +"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. " msgstr "" #: ../gtk/provisioning-fetch.ui.h:1 @@ -1701,60 +1694,60 @@ msgstr "" msgid "Please wait while fetching configuration from server..." msgstr "" -#: ../coreapi/linphonecore.c:1512 +#: ../coreapi/linphonecore.c:1534 msgid "Ready" msgstr "Redo" -#: ../coreapi/linphonecore.c:2499 +#: ../coreapi/linphonecore.c:2534 msgid "Configuring" msgstr "" -#: ../coreapi/linphonecore.c:2673 +#: ../coreapi/linphonecore.c:2708 msgid "Looking for telephone number destination..." msgstr "Leta efter telefonnummer för destinationen..." -#: ../coreapi/linphonecore.c:2675 +#: ../coreapi/linphonecore.c:2710 msgid "Could not resolve this number." msgstr "Kan inte nå dett nummer." #. must be known at that time -#: ../coreapi/linphonecore.c:2961 +#: ../coreapi/linphonecore.c:2996 msgid "Contacting" msgstr "Kontaktar" -#: ../coreapi/linphonecore.c:2966 +#: ../coreapi/linphonecore.c:3001 msgid "Could not call" msgstr "" -#: ../coreapi/linphonecore.c:3116 +#: ../coreapi/linphonecore.c:3152 msgid "Sorry, we have reached the maximum number of simultaneous calls" msgstr "" -#: ../coreapi/linphonecore.c:3274 +#: ../coreapi/linphonecore.c:3310 msgid "is contacting you" msgstr "" -#: ../coreapi/linphonecore.c:3275 +#: ../coreapi/linphonecore.c:3311 msgid " and asked autoanswer." msgstr "" -#: ../coreapi/linphonecore.c:3399 +#: ../coreapi/linphonecore.c:3435 msgid "Modifying call parameters..." msgstr "" -#: ../coreapi/linphonecore.c:3747 +#: ../coreapi/linphonecore.c:3782 msgid "Connected." msgstr "Kopplad" -#: ../coreapi/linphonecore.c:3772 +#: ../coreapi/linphonecore.c:3807 msgid "Call aborted" msgstr "" -#: ../coreapi/linphonecore.c:3962 +#: ../coreapi/linphonecore.c:3997 msgid "Could not pause the call" msgstr "" -#: ../coreapi/linphonecore.c:3965 +#: ../coreapi/linphonecore.c:4000 msgid "Pausing the current call..." msgstr "" @@ -1822,129 +1815,125 @@ msgstr "" msgid "" "The sip proxy address you entered is invalid, it must start with \"sip:\" " "followed by a hostname." -msgstr "" -"SIP proxy adressen som du matade in är inte rätt, adressen måste starta med " -"\"sip:\", följd av ett hostnamn" +msgstr "SIP proxy adressen som du matade in är inte rätt, adressen måste starta med \"sip:\", följd av ett hostnamn" #: ../coreapi/proxy.c:334 msgid "" "The sip identity you entered is invalid.\n" "It should look like sip:username@proxydomain, such as sip:alice@example.net" -msgstr "" -"SIP adressen som du matade in är inte rätt. Adressen borde se ut som sip:" -"namn@domän, såsom sip:peter@exempel.se" +msgstr "SIP adressen som du matade in är inte rätt. Adressen borde se ut som sip:namn@domän, såsom sip:peter@exempel.se" -#: ../coreapi/proxy.c:1403 +#: ../coreapi/proxy.c:1416 #, c-format msgid "Could not login as %s" msgstr "Kunde inte logga in som %s" -#: ../coreapi/callbacks.c:419 +#: ../coreapi/callbacks.c:428 msgid "Remote ringing." msgstr "Ringer hos motparten." -#: ../coreapi/callbacks.c:431 +#: ../coreapi/callbacks.c:440 msgid "Remote ringing..." msgstr "" -#: ../coreapi/callbacks.c:448 +#: ../coreapi/callbacks.c:461 msgid "Early media." msgstr "Tidig media" -#: ../coreapi/callbacks.c:521 +#: ../coreapi/callbacks.c:533 #, c-format msgid "Call with %s is paused." msgstr "" -#: ../coreapi/callbacks.c:534 +#: ../coreapi/callbacks.c:546 #, c-format msgid "Call answered by %s - on hold." msgstr "" -#: ../coreapi/callbacks.c:544 +#: ../coreapi/callbacks.c:556 msgid "Call resumed." msgstr "" -#: ../coreapi/callbacks.c:548 +#: ../coreapi/callbacks.c:560 #, c-format msgid "Call answered by %s." msgstr "" -#: ../coreapi/callbacks.c:571 +#: ../coreapi/callbacks.c:583 msgid "Incompatible, check codecs or security settings..." msgstr "" -#: ../coreapi/callbacks.c:576 ../coreapi/callbacks.c:888 +#: ../coreapi/callbacks.c:588 ../coreapi/callbacks.c:900 msgid "Incompatible media parameters." msgstr "" -#: ../coreapi/callbacks.c:606 +#: ../coreapi/callbacks.c:618 msgid "We have been resumed." msgstr "" #. we are being paused -#: ../coreapi/callbacks.c:614 +#: ../coreapi/callbacks.c:626 msgid "We are paused by other party." msgstr "" #. reINVITE and in-dialogs UPDATE go here -#: ../coreapi/callbacks.c:648 +#: ../coreapi/callbacks.c:660 msgid "Call is updated by remote." msgstr "" -#: ../coreapi/callbacks.c:764 +#: ../coreapi/callbacks.c:776 msgid "Call terminated." msgstr "Samtalet slut." -#: ../coreapi/callbacks.c:792 +#: ../coreapi/callbacks.c:804 msgid "User is busy." msgstr "Användare upptagen." -#: ../coreapi/callbacks.c:793 +#: ../coreapi/callbacks.c:805 msgid "User is temporarily unavailable." msgstr "Användaren temporärt inte tillgänglig." #. char *retrymsg=_("%s. Retry after %i minute(s)."); -#: ../coreapi/callbacks.c:795 +#: ../coreapi/callbacks.c:807 msgid "User does not want to be disturbed." msgstr "Användaren vill inte bli störd." -#: ../coreapi/callbacks.c:796 +#: ../coreapi/callbacks.c:808 msgid "Call declined." msgstr "Samtalet avböjdes." -#: ../coreapi/callbacks.c:811 +#: ../coreapi/callbacks.c:823 msgid "Request timeout." msgstr "" -#: ../coreapi/callbacks.c:842 +#: ../coreapi/callbacks.c:854 msgid "Redirected" msgstr "" -#: ../coreapi/callbacks.c:897 +#: ../coreapi/callbacks.c:909 msgid "Call failed." msgstr "" -#: ../coreapi/callbacks.c:975 +#: ../coreapi/callbacks.c:987 #, c-format msgid "Registration on %s successful." msgstr "Registrering hos %s lyckades." -#: ../coreapi/callbacks.c:976 +#: ../coreapi/callbacks.c:988 #, c-format msgid "Unregistration on %s done." msgstr "Avregistrering hos %s lyckades." -#: ../coreapi/callbacks.c:994 +#: ../coreapi/callbacks.c:1006 msgid "no response timeout" msgstr "Inget svar inom angiven tid" -#: ../coreapi/callbacks.c:997 +#: ../coreapi/callbacks.c:1009 #, c-format msgid "Registration on %s failed: %s" msgstr "Registrering hos %s mislyckades: %s" -#: ../coreapi/callbacks.c:1004 +#: ../coreapi/callbacks.c:1016 msgid "Service unavailable, retrying" msgstr "" @@ -1954,7 +1943,11 @@ msgstr "" msgid "Authentication token is %s" msgstr "" -#: ../coreapi/linphonecall.c:3600 +#: ../coreapi/linphonecall.c:1305 +msgid "Call parameters were successfully modified." +msgstr "" + +#: ../coreapi/linphonecall.c:3659 #, c-format msgid "You have missed %i call." msgid_plural "You have missed %i calls." diff --git a/po/tr.po b/po/tr.po new file mode 100644 index 000000000..97ef267a3 --- /dev/null +++ b/po/tr.po @@ -0,0 +1,1991 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# faradundamarti , 2015 +msgid "" +msgstr "" +"Project-Id-Version: linphone-gtk\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-03-27 14:40+0100\n" +"PO-Revision-Date: 2015-03-27 13:40+0000\n" +"Last-Translator: Belledonne Communications \n" +"Language-Team: Turkish (http://www.transifex.com/projects/p/linphone-gtk/language/tr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: tr\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974 +#, c-format +msgid "Call %s" +msgstr "" + +#: ../gtk/calllogs.c:149 ../gtk/friendlist.c:975 +#, c-format +msgid "Send text to %s" +msgstr "" + +#: ../gtk/calllogs.c:232 +#, c-format +msgid "Recent calls (%i)" +msgstr "" + +#: ../gtk/calllogs.c:314 +msgid "n/a" +msgstr "" + +#: ../gtk/calllogs.c:317 +msgid "Aborted" +msgstr "İptal edildi" + +#: ../gtk/calllogs.c:320 +msgid "Missed" +msgstr "Yanıtsız" + +#: ../gtk/calllogs.c:323 +msgid "Declined" +msgstr "Reddedildi" + +#: ../gtk/calllogs.c:329 +#, c-format +msgid "%i minute" +msgid_plural "%i minutes" +msgstr[0] "" +msgstr[1] "" + +#: ../gtk/calllogs.c:332 +#, c-format +msgid "%i second" +msgid_plural "%i seconds" +msgstr[0] "" +msgstr[1] "" + +#: ../gtk/calllogs.c:337 +#, c-format +msgid "" +"%s\tQuality: %s\n" +"%s\t%s\t" +msgstr "" + +#: ../gtk/calllogs.c:341 +#, c-format +msgid "%s\t%s" +msgstr "" + +#: ../gtk/conference.c:38 ../gtk/main.ui.h:13 +msgid "Conference" +msgstr "Grup görüşme" + +#: ../gtk/conference.c:46 +msgid "Me" +msgstr "" + +#: ../gtk/support.c:49 ../gtk/support.c:73 ../gtk/support.c:102 +#, c-format +msgid "Couldn't find pixmap file: %s" +msgstr "" + +#: ../gtk/main.c:136 +msgid "log to stdout some debug information while running." +msgstr "" + +#: ../gtk/main.c:137 +msgid "path to a file to write logs into." +msgstr "" + +#: ../gtk/main.c:138 +msgid "Start linphone with video disabled." +msgstr "Linphonu görüntü olmadan başlat" + +#: ../gtk/main.c:139 +msgid "Start only in the system tray, do not show the main interface." +msgstr "" + +#: ../gtk/main.c:140 +msgid "address to call right now" +msgstr "" + +#: ../gtk/main.c:141 +msgid "" +"Specifiy a working directory (should be the base of the installation, eg: " +"c:\\Program Files\\Linphone)" +msgstr "" + +#: ../gtk/main.c:142 +msgid "Configuration file" +msgstr "Yapılandırma dosyası" + +#: ../gtk/main.c:143 +msgid "Run the audio assistant" +msgstr "Ses yardımcısını çalıştır" + +#: ../gtk/main.c:144 +msgid "Run self test and exit 0 if succeed" +msgstr "" + +#: ../gtk/main.c:1059 +#, c-format +msgid "" +"%s would like to add you to his contact list.\n" +"Would you allow him to see your presence status or add him to your contact list ?\n" +"If you answer no, this person will be temporarily blacklisted." +msgstr "" + +#: ../gtk/main.c:1136 +#, c-format +msgid "" +"Please enter your password for username %s\n" +" at realm %s:" +msgstr "" + +#: ../gtk/main.c:1257 +msgid "Call error" +msgstr "Çağrı yanlış" + +#: ../gtk/main.c:1260 ../coreapi/linphonecore.c:3826 +msgid "Call ended" +msgstr "Çağrı sonlandırıldı" + +#: ../gtk/main.c:1263 ../coreapi/call_log.c:221 +msgid "Incoming call" +msgstr "Gelen çağrı" + +#: ../gtk/main.c:1265 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5 +msgid "Answer" +msgstr "Yanıt" + +#: ../gtk/main.c:1267 ../gtk/main.ui.h:6 +msgid "Decline" +msgstr "Reddet" + +#: ../gtk/main.c:1273 +msgid "Call paused" +msgstr "Çağrı duraklatıldı" + +#: ../gtk/main.c:1273 +#, c-format +msgid "by %s" +msgstr "" + +#: ../gtk/main.c:1343 +#, c-format +msgid "%s proposed to start video. Do you accept ?" +msgstr "" + +#: ../gtk/main.c:1505 +msgid "Website link" +msgstr "İnternet " + +#: ../gtk/main.c:1554 +msgid "Linphone - a video internet phone" +msgstr "Linphone - görüntülü internet telefonu" + +#: ../gtk/main.c:1646 +#, c-format +msgid "%s (Default)" +msgstr "" + +#: ../gtk/main.c:1978 ../coreapi/callbacks.c:1057 +#, c-format +msgid "We are transferred to %s" +msgstr "" + +#: ../gtk/main.c:1988 +msgid "" +"No sound cards have been detected on this computer.\n" +"You won't be able to send or receive audio calls." +msgstr "" + +#: ../gtk/main.c:2136 +msgid "A free SIP video-phone" +msgstr "" + +#: ../gtk/main.c:2241 +#, c-format +msgid "Hello\n" +msgstr "" + +#: ../gtk/friendlist.c:505 +msgid "Add to addressbook" +msgstr "Adres defterine ekle" + +#: ../gtk/friendlist.c:691 +msgid "Presence status" +msgstr "" + +#: ../gtk/friendlist.c:709 ../gtk/propertybox.c:552 ../gtk/contact.ui.h:1 +msgid "Name" +msgstr "Ad" + +#: ../gtk/friendlist.c:721 +msgid "Call" +msgstr "Çağrı" + +#: ../gtk/friendlist.c:726 +msgid "Chat" +msgstr "Söyleşi" + +#: ../gtk/friendlist.c:756 +#, c-format +msgid "Search in %s directory" +msgstr "" + +#: ../gtk/friendlist.c:924 +msgid "Invalid sip contact !" +msgstr "Geçersiz sip bağlantısı !" + +#: ../gtk/friendlist.c:976 +#, c-format +msgid "Edit contact '%s'" +msgstr "" + +#: ../gtk/friendlist.c:977 +#, c-format +msgid "Delete contact '%s'" +msgstr "" + +#: ../gtk/friendlist.c:978 +#, c-format +msgid "Delete chat history of '%s'" +msgstr "" + +#: ../gtk/friendlist.c:1029 +#, c-format +msgid "Add new contact from %s directory" +msgstr "" + +#: ../gtk/propertybox.c:558 +msgid "Rate (Hz)" +msgstr "" + +#: ../gtk/propertybox.c:564 +msgid "Status" +msgstr "Durum" + +#: ../gtk/propertybox.c:570 +msgid "IP Bitrate (kbit/s)" +msgstr "" + +#: ../gtk/propertybox.c:577 +msgid "Parameters" +msgstr "Değişkenler" + +#: ../gtk/propertybox.c:620 ../gtk/propertybox.c:763 +msgid "Enabled" +msgstr "Etkin" + +#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763 ../gtk/parameters.ui.h:17 +msgid "Disabled" +msgstr "Devre dışı" + +#: ../gtk/propertybox.c:809 +msgid "Account" +msgstr "Hesap" + +#: ../gtk/propertybox.c:1072 +msgid "English" +msgstr "İngilizce" + +#: ../gtk/propertybox.c:1073 +msgid "French" +msgstr "Fransızca" + +#: ../gtk/propertybox.c:1074 +msgid "Swedish" +msgstr "İsveççe" + +#: ../gtk/propertybox.c:1075 +msgid "Italian" +msgstr "İtalyanca" + +#: ../gtk/propertybox.c:1076 +msgid "Spanish" +msgstr "İspanyolca" + +#: ../gtk/propertybox.c:1077 +msgid "Brazilian Portugese" +msgstr "Brezilya Portekizcesi" + +#: ../gtk/propertybox.c:1078 +msgid "Polish" +msgstr "Lehçe" + +#: ../gtk/propertybox.c:1079 +msgid "German" +msgstr "Almanca" + +#: ../gtk/propertybox.c:1080 +msgid "Russian" +msgstr "Rusca" + +#: ../gtk/propertybox.c:1081 +msgid "Japanese" +msgstr "Japonca" + +#: ../gtk/propertybox.c:1082 +msgid "Dutch" +msgstr "Flemenkçe" + +#: ../gtk/propertybox.c:1083 +msgid "Hungarian" +msgstr "Macarca" + +#: ../gtk/propertybox.c:1084 +msgid "Czech" +msgstr "Çekce" + +#: ../gtk/propertybox.c:1085 +msgid "Chinese" +msgstr "Çince" + +#: ../gtk/propertybox.c:1086 +msgid "Traditional Chinese" +msgstr "Geleneksel Çince" + +#: ../gtk/propertybox.c:1087 +msgid "Norwegian" +msgstr "Norveççe" + +#: ../gtk/propertybox.c:1088 +msgid "Hebrew" +msgstr "İbranice" + +#: ../gtk/propertybox.c:1089 +msgid "Serbian" +msgstr "Sırpça" + +#: ../gtk/propertybox.c:1156 +msgid "" +"You need to restart linphone for the new language selection to take effect." +msgstr "Yeni dil seçiminizin etkili olabilmesi için linfonu yeniden başlatmalısınız." + +#: ../gtk/propertybox.c:1236 +msgid "None" +msgstr "Hiçbiri" + +#: ../gtk/propertybox.c:1240 +msgid "SRTP" +msgstr "SRTP (Güvenli Gerçek Zamanlı Aktarım Protokolü)" + +#: ../gtk/propertybox.c:1246 +msgid "DTLS" +msgstr "DTLS" + +#: ../gtk/propertybox.c:1253 +msgid "ZRTP" +msgstr "ZRTP" + +#: ../gtk/update.c:80 +#, c-format +msgid "" +"A more recent version is availalble from %s.\n" +"Would you like to open a browser to download it ?" +msgstr "" + +#: ../gtk/update.c:91 +msgid "You are running the lastest version." +msgstr "En son sürümü çalıştırıyorsunuz" + +#: ../gtk/buddylookup.c:85 +msgid "Firstname, Lastname" +msgstr "" + +#: ../gtk/buddylookup.c:160 +msgid "Error communicating with server." +msgstr "Sunucuya bağlanma hatası" + +#: ../gtk/buddylookup.c:164 +msgid "Connecting..." +msgstr "Bağlanıyor..." + +#: ../gtk/buddylookup.c:168 +msgid "Connected" +msgstr "Bağlandı" + +#: ../gtk/buddylookup.c:172 +msgid "Receiving data..." +msgstr "Veri alınıyor..." + +#: ../gtk/buddylookup.c:180 +#, c-format +msgid "Found %i contact" +msgid_plural "Found %i contacts" +msgstr[0] "" +msgstr[1] "" + +#: ../gtk/setupwizard.c:34 +msgid "" +"Welcome!\n" +"This assistant will help you to use a SIP account for your calls." +msgstr "Hoşgeldiniz!\nBu yardımcı,çağrılarınız için bir SIP hesabı kullanmanıza yardım edecek." + +#: ../gtk/setupwizard.c:43 +msgid "Create an account on linphone.org" +msgstr "linphone.org'da bir hesap oluştur" + +#: ../gtk/setupwizard.c:44 +msgid "I have already a linphone.org account and I just want to use it" +msgstr "" + +#: ../gtk/setupwizard.c:45 +msgid "I have already a sip account and I just want to use it" +msgstr "" + +#: ../gtk/setupwizard.c:46 +msgid "I want to specify a remote configuration URI" +msgstr "" + +#: ../gtk/setupwizard.c:89 +msgid "Enter your linphone.org username" +msgstr "linphone.org kullanıcı adınızı girin" + +#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:81 ../gtk/ldap.ui.h:4 +msgid "Username:" +msgstr "Kullanıcı adı:" + +#: ../gtk/setupwizard.c:104 ../gtk/password.ui.h:4 ../gtk/ldap.ui.h:5 +msgid "Password:" +msgstr "Parola:" + +#: ../gtk/setupwizard.c:124 +msgid "Enter your account informations" +msgstr "Hesap bilgilerinizi girin" + +#: ../gtk/setupwizard.c:140 +msgid "Username*" +msgstr "Kallanıcı adı*" + +#: ../gtk/setupwizard.c:141 +msgid "Password*" +msgstr "Parola*" + +#: ../gtk/setupwizard.c:144 +msgid "Domain*" +msgstr "Alan adı*" + +#: ../gtk/setupwizard.c:145 +msgid "Proxy" +msgstr "Vekil sunucu" + +#: ../gtk/setupwizard.c:317 +msgid "(*) Required fields" +msgstr "(*) Zorunlu alanlar" + +#: ../gtk/setupwizard.c:318 +msgid "Username: (*)" +msgstr "Kullanıcı adı: (*)" + +#: ../gtk/setupwizard.c:320 +msgid "Password: (*)" +msgstr "Parola: (*)" + +#: ../gtk/setupwizard.c:322 +msgid "Email: (*)" +msgstr "E-posta: (*)" + +#: ../gtk/setupwizard.c:324 +msgid "Confirm your password: (*)" +msgstr "Parolanızı onaylayın: (*)" + +#: ../gtk/setupwizard.c:338 +msgid "Keep me informed with linphone updates" +msgstr "linphone güncellemeleri hakkında beni bilgilendir" + +#: ../gtk/setupwizard.c:394 +msgid "" +"Error, account not validated, username already used or server unreachable.\n" +"Please go back and try again." +msgstr "Hata,hesap geçersiz,kullanıcı adı kullanılıyor veya sunucuya erişilemiyor.\nLütfen geri dönün ve tekrar deneyin." + +#: ../gtk/setupwizard.c:405 +msgid "Thank you. Your account is now configured and ready for use." +msgstr "Teşekkürler. Hesabınız yapılandırıldı ve kullanıma hazır." + +#: ../gtk/setupwizard.c:413 +msgid "" +"Please validate your account by clicking on the link we just sent you by email.\n" +"Then come back here and press Next button." +msgstr "" + +#: ../gtk/setupwizard.c:602 +msgid "SIP account configuration assistant" +msgstr "SİP hesabı yapılandırma yardımcısı" + +#: ../gtk/setupwizard.c:620 +msgid "Welcome to the account setup assistant" +msgstr "Hesap açma yardımcısına hoşgeldiniz" + +#: ../gtk/setupwizard.c:625 +msgid "Account setup assistant" +msgstr "Hesap açma yardımcısı" + +#: ../gtk/setupwizard.c:631 +msgid "Configure your account (step 1/1)" +msgstr "Hesabınızı yapılandırın (adım 1/1)" + +#: ../gtk/setupwizard.c:636 +msgid "Enter your sip username (step 1/1)" +msgstr "sip kullanıcı adınızı girin (adım 1/1)" + +#: ../gtk/setupwizard.c:640 +msgid "Enter account information (step 1/2)" +msgstr "Hesap bilgilerini girin (adım 1/2)" + +#: ../gtk/setupwizard.c:649 +msgid "Validation (step 2/2)" +msgstr "Doğrulama (adım 2/2)" + +#: ../gtk/setupwizard.c:654 +msgid "Error" +msgstr "Hata" + +#: ../gtk/setupwizard.c:658 ../gtk/audio_assistant.c:534 +msgid "Terminating" +msgstr "Sonlandırma" + +#: ../gtk/incall_view.c:70 ../gtk/incall_view.c:94 +#, c-format +msgid "Call #%i" +msgstr "" + +#: ../gtk/incall_view.c:155 +#, c-format +msgid "Transfer to call #%i with %s" +msgstr "" + +#: ../gtk/incall_view.c:211 ../gtk/incall_view.c:214 +msgid "Not used" +msgstr "Kullanılmıyor" + +#: ../gtk/incall_view.c:221 +msgid "ICE not activated" +msgstr "ICE etkin değil" + +#: ../gtk/incall_view.c:223 +msgid "ICE failed" +msgstr "ICE başarısız" + +#: ../gtk/incall_view.c:225 +msgid "ICE in progress" +msgstr "" + +#: ../gtk/incall_view.c:227 +msgid "Going through one or more NATs" +msgstr "" + +#: ../gtk/incall_view.c:229 +msgid "Direct" +msgstr "" + +#: ../gtk/incall_view.c:231 +msgid "Through a relay server" +msgstr "" + +#: ../gtk/incall_view.c:239 +msgid "uPnP not activated" +msgstr "Evrensel Tak-Çalıştır etkin değil" + +#: ../gtk/incall_view.c:241 +msgid "uPnP in progress" +msgstr "Evrensel Tak-Çalıştır ilerliyor" + +#: ../gtk/incall_view.c:243 +msgid "uPnp not available" +msgstr "Evrensel Tak-Çalıştır kullanılamaz" + +#: ../gtk/incall_view.c:245 +msgid "uPnP is running" +msgstr "Evrensel Tak-Çalıştır çalışıyor" + +#: ../gtk/incall_view.c:247 +msgid "uPnP failed" +msgstr "Evrensel Tak-Çalıştır başarısız" + +#: ../gtk/incall_view.c:257 ../gtk/incall_view.c:258 +msgid "Direct or through server" +msgstr "" + +#: ../gtk/incall_view.c:267 ../gtk/incall_view.c:279 +#, c-format +msgid "" +"download: %f\n" +"upload: %f (kbit/s)" +msgstr "" + +#: ../gtk/incall_view.c:272 ../gtk/incall_view.c:274 +#, c-format +msgid "%ix%i @ %f fps" +msgstr "" + +#: ../gtk/incall_view.c:304 +#, c-format +msgid "%.3f seconds" +msgstr "" + +#: ../gtk/incall_view.c:407 ../gtk/main.ui.h:12 ../gtk/videowindow.c:235 +msgid "Hang up" +msgstr "" + +#: ../gtk/incall_view.c:511 +msgid "Calling..." +msgstr "" + +#: ../gtk/incall_view.c:514 ../gtk/incall_view.c:733 +msgid "00::00::00" +msgstr "00::00::00" + +#: ../gtk/incall_view.c:525 +msgid "Incoming call" +msgstr "" + +#: ../gtk/incall_view.c:562 +msgid "good" +msgstr "iyi" + +#: ../gtk/incall_view.c:564 +msgid "average" +msgstr "orta" + +#: ../gtk/incall_view.c:566 +msgid "poor" +msgstr "kötü" + +#: ../gtk/incall_view.c:568 +msgid "very poor" +msgstr "çok kötü" + +#: ../gtk/incall_view.c:570 +msgid "too bad" +msgstr "" + +#: ../gtk/incall_view.c:571 ../gtk/incall_view.c:587 +msgid "unavailable" +msgstr "kullanılamaz" + +#: ../gtk/incall_view.c:679 +msgid "Secured by SRTP" +msgstr "" + +#: ../gtk/incall_view.c:685 +msgid "Secured by DTLS" +msgstr "" + +#: ../gtk/incall_view.c:691 +#, c-format +msgid "Secured by ZRTP - [auth token: %s]" +msgstr "" + +#: ../gtk/incall_view.c:697 +msgid "Set unverified" +msgstr "" + +#: ../gtk/incall_view.c:697 ../gtk/main.ui.h:4 +msgid "Set verified" +msgstr "" + +#: ../gtk/incall_view.c:728 +msgid "In conference" +msgstr "" + +#: ../gtk/incall_view.c:728 +msgid "In call" +msgstr "" + +#: ../gtk/incall_view.c:764 +msgid "Paused call" +msgstr "" + +#: ../gtk/incall_view.c:800 +msgid "Call ended." +msgstr "" + +#: ../gtk/incall_view.c:831 +msgid "Transfer in progress" +msgstr "" + +#: ../gtk/incall_view.c:834 +msgid "Transfer done." +msgstr "" + +#: ../gtk/incall_view.c:837 +msgid "Transfer failed." +msgstr "" + +#: ../gtk/incall_view.c:881 +msgid "Resume" +msgstr "Devam et" + +#: ../gtk/incall_view.c:888 ../gtk/main.ui.h:9 +msgid "Pause" +msgstr "Duraklat" + +#: ../gtk/incall_view.c:954 +#, c-format +msgid "" +"Recording into\n" +"%s %s" +msgstr "" + +#: ../gtk/incall_view.c:954 +msgid "(Paused)" +msgstr "(Duraklatıldı)" + +#: ../gtk/loginframe.c:87 +#, c-format +msgid "Please enter login information for %s" +msgstr "" + +#: ../gtk/config-fetching.c:57 +#, c-format +msgid "fetching from %s" +msgstr "" + +#: ../gtk/config-fetching.c:73 +#, c-format +msgid "Downloading of remote configuration from %s failed." +msgstr "" + +#: ../gtk/audio_assistant.c:98 +msgid "No voice detected" +msgstr "Ses olmadığı algılandı" + +#: ../gtk/audio_assistant.c:99 +msgid "Too low" +msgstr "Çok düşük" + +#: ../gtk/audio_assistant.c:100 +msgid "Good" +msgstr "İyi" + +#: ../gtk/audio_assistant.c:101 +msgid "Too loud" +msgstr "Çok yüksek" + +#: ../gtk/audio_assistant.c:183 +msgid "Did you hear three beeps ?" +msgstr "" + +#: ../gtk/audio_assistant.c:292 ../gtk/audio_assistant.c:297 +msgid "Sound preferences not found " +msgstr "Ses tercihleri bulunamadı" + +#: ../gtk/audio_assistant.c:306 +msgid "Cannot launch system sound control " +msgstr "Ses kontrol sistemi başlatılamıyor" + +#: ../gtk/audio_assistant.c:318 +msgid "" +"Welcome!\n" +"This assistant will help you to configure audio settings for Linphone" +msgstr "Hoşgeldiniz!\nBu yardımcı,Linphone'un ses ayarlarını yapılandırmanıza yardım edecek" + +#: ../gtk/audio_assistant.c:328 +msgid "Capture device" +msgstr "Görüntü yakalama aygıtı" + +#: ../gtk/audio_assistant.c:329 +msgid "Recorded volume" +msgstr "" + +#: ../gtk/audio_assistant.c:333 +msgid "No voice" +msgstr "Ses yok" + +#: ../gtk/audio_assistant.c:334 ../gtk/audio_assistant.c:373 +msgid "System sound preferences" +msgstr "Sistem ses tercihleri" + +#: ../gtk/audio_assistant.c:369 +msgid "Playback device" +msgstr "Oynatma aygıtı" + +#: ../gtk/audio_assistant.c:370 +msgid "Play three beeps" +msgstr "" + +#: ../gtk/audio_assistant.c:403 +msgid "Press the record button and say some words" +msgstr "Kayıt tuşuna bas ve bazı kelimeler söyle" + +#: ../gtk/audio_assistant.c:404 +msgid "Listen to your record voice" +msgstr "" + +#: ../gtk/audio_assistant.c:405 +msgid "Record" +msgstr "" + +#: ../gtk/audio_assistant.c:406 +msgid "Play" +msgstr "" + +#: ../gtk/audio_assistant.c:433 +msgid "Let's start Linphone now" +msgstr "" + +#: ../gtk/audio_assistant.c:503 +msgid "Audio Assistant" +msgstr "Ses Yardımcısı" + +#: ../gtk/audio_assistant.c:513 ../gtk/main.ui.h:32 +msgid "Audio assistant" +msgstr "Ses yardımcısı" + +#: ../gtk/audio_assistant.c:518 +msgid "Mic Gain calibration" +msgstr "" + +#: ../gtk/audio_assistant.c:524 +msgid "Speaker volume calibration" +msgstr "" + +#: ../gtk/audio_assistant.c:529 +msgid "Record and Play" +msgstr "" + +#: ../gtk/main.ui.h:1 +msgid "Callee name" +msgstr "" + +#: ../gtk/main.ui.h:2 +msgid "Send" +msgstr "Gönder" + +#: ../gtk/main.ui.h:3 +msgid "End conference" +msgstr "" + +#: ../gtk/main.ui.h:7 +msgid "Record this call to an audio file" +msgstr "" + +#: ../gtk/main.ui.h:8 +msgid "Video" +msgstr "" + +#: ../gtk/main.ui.h:10 +msgid "Mute" +msgstr "Sessiz" + +#: ../gtk/main.ui.h:11 +msgid "Transfer" +msgstr "" + +#: ../gtk/main.ui.h:14 +msgid "In call" +msgstr "" + +#: ../gtk/main.ui.h:15 +msgid "Duration" +msgstr "Süre" + +#: ../gtk/main.ui.h:16 +msgid "Call quality rating" +msgstr "" + +#: ../gtk/main.ui.h:17 +msgid "All users" +msgstr "Tüm kullanıcılar" + +#: ../gtk/main.ui.h:18 +msgid "Online users" +msgstr "Çevrimiçi kullanıcılar" + +#: ../gtk/main.ui.h:19 +msgid "ADSL" +msgstr "ADSL" + +#: ../gtk/main.ui.h:20 +msgid "Fiber Channel" +msgstr "" + +#: ../gtk/main.ui.h:21 +msgid "Default" +msgstr "Öntanımlı" + +#: ../gtk/main.ui.h:22 +msgid "Delete" +msgstr "Sil" + +#: ../gtk/main.ui.h:23 +msgid "_Options" +msgstr "_Seçenekler" + +#: ../gtk/main.ui.h:24 +msgid "Set configuration URI" +msgstr "" + +#: ../gtk/main.ui.h:25 +msgid "Always start video" +msgstr "" + +#: ../gtk/main.ui.h:26 +msgid "Enable self-view" +msgstr "" + +#: ../gtk/main.ui.h:27 +msgid "_Help" +msgstr "_Yardım" + +#: ../gtk/main.ui.h:28 +msgid "Show debug window" +msgstr "Hata düzeltme penceresini göster" + +#: ../gtk/main.ui.h:29 +msgid "_Homepage" +msgstr "_Anasayfa" + +#: ../gtk/main.ui.h:30 +msgid "Check _Updates" +msgstr "Güncellemeleri _Denetle" + +#: ../gtk/main.ui.h:31 +msgid "Account assistant" +msgstr "Hesap yardımcısı" + +#: ../gtk/main.ui.h:33 +msgid "SIP address or phone number:" +msgstr "SİP adresi veya telefon numarası:" + +#: ../gtk/main.ui.h:34 +msgid "Initiate a new call" +msgstr "Yeni bir arama başlat" + +#: ../gtk/main.ui.h:35 +msgid "Contacts" +msgstr "" + +#: ../gtk/main.ui.h:36 +msgid "Search" +msgstr "Arama" + +#: ../gtk/main.ui.h:37 +msgid "Add contacts from directory" +msgstr "" + +#: ../gtk/main.ui.h:38 +msgid "Add contact" +msgstr "Bağlantı ekle" + +#: ../gtk/main.ui.h:39 +msgid "Recent calls" +msgstr "Son çağrılar" + +#: ../gtk/main.ui.h:40 +msgid "My current identity:" +msgstr "" + +#: ../gtk/main.ui.h:41 ../gtk/tunnel_config.ui.h:7 +msgid "Username" +msgstr "Kallanıcı adı" + +#: ../gtk/main.ui.h:42 ../gtk/tunnel_config.ui.h:8 +msgid "Password" +msgstr "Parola" + +#: ../gtk/main.ui.h:43 +msgid "Internet connection:" +msgstr "İnternet bağlantısı:" + +#: ../gtk/main.ui.h:44 +msgid "Automatically log me in" +msgstr "" + +#: ../gtk/main.ui.h:45 ../gtk/password.ui.h:3 +msgid "UserID" +msgstr "Kullanıcı kimliği" + +#: ../gtk/main.ui.h:46 +msgid "Login information" +msgstr "" + +#: ../gtk/main.ui.h:47 +msgid "Welcome!" +msgstr "" + +#: ../gtk/about.ui.h:1 +msgid "About Linphone" +msgstr "Linphone Hakkında" + +#: ../gtk/about.ui.h:2 +msgid "(C) Belledonne Communications, 2010\n" +msgstr "" + +#: ../gtk/about.ui.h:4 +msgid "An internet video phone using the standard SIP (rfc3261) protocol." +msgstr "" + +#: ../gtk/about.ui.h:5 +msgid "" +"fr: Simon Morlat\n" +"en: Simon Morlat and Delphine Perreau\n" +"it: Alberto Zanoni \n" +"de: Jean-Jacques Sarton \n" +"sv: Daniel Nylander \n" +"es: Jesus Benitez \n" +"ja: YAMAGUCHI YOSHIYA \n" +"pt_BR: Rafael Caesar Lenzi \n" +"pl: Robert Nasiadek \n" +"cs: Petr Pisar \n" +"hu: anonymous\n" +"he: Eli Zaretskii \n" +msgstr "fr: Simon Morlat\nen: Simon Morlat and Delphine Perreau\nit: Alberto Zanoni \nde: Jean-Jacques Sarton \nsv: Daniel Nylander \nes: Jesus Benitez \nja: YAMAGUCHI YOSHIYA \npt_BR: Rafael Caesar Lenzi \npl: Robert Nasiadek \ncs: Petr Pisar \nhu: anonymous\nhe: Eli Zaretskii \n" + +#: ../gtk/contact.ui.h:2 +msgid "SIP Address" +msgstr "SİP Adresi" + +#: ../gtk/contact.ui.h:3 +msgid "Show this contact presence status" +msgstr "" + +#: ../gtk/contact.ui.h:4 +msgid "Allow this contact to see my presence status" +msgstr "" + +#: ../gtk/contact.ui.h:5 +msgid "Contact information" +msgstr "" + +#: ../gtk/log.ui.h:1 +msgid "Linphone debug window" +msgstr "Linphone hata giderme penceresi" + +#: ../gtk/log.ui.h:2 +msgid "Scroll to end" +msgstr "Sonuna kadar ilerleyin" + +#: ../gtk/password.ui.h:1 +msgid "Linphone - Authentication required" +msgstr "Linphone - Kimlik doğrulaması gerekli" + +#: ../gtk/password.ui.h:2 +msgid "Please enter the domain password" +msgstr "Lütfen alan adı parolası girin" + +#: ../gtk/call_logs.ui.h:1 +msgid "Call history" +msgstr "Çağrı geçmişi" + +#: ../gtk/call_logs.ui.h:2 +msgid "Clear all" +msgstr "Hepsini temizle" + +#: ../gtk/call_logs.ui.h:3 +msgid "Call back" +msgstr "Geri arama" + +#: ../gtk/sip_account.ui.h:1 +msgid "Linphone - Configure a SIP account" +msgstr "" + +#: ../gtk/sip_account.ui.h:2 +msgid "Your SIP identity:" +msgstr "SİP kimliğiniz:" + +#: ../gtk/sip_account.ui.h:3 +msgid "Looks like sip:@" +msgstr "" + +#: ../gtk/sip_account.ui.h:4 +msgid "sip:" +msgstr "sip:" + +#: ../gtk/sip_account.ui.h:5 +msgid "SIP Proxy address:" +msgstr "SİP Vekil sunucu adresi:" + +#: ../gtk/sip_account.ui.h:6 +msgid "Looks like sip:" +msgstr "" + +#: ../gtk/sip_account.ui.h:7 +msgid "Registration duration (sec):" +msgstr "Kayıt süresi (saniye)" + +#: ../gtk/sip_account.ui.h:8 +msgid "Contact params (optional):" +msgstr "" + +#: ../gtk/sip_account.ui.h:9 +msgid "AVPF regular RTCP interval (sec):" +msgstr "" + +#: ../gtk/sip_account.ui.h:10 +msgid "Route (optional):" +msgstr "" + +#: ../gtk/sip_account.ui.h:11 +msgid "Transport" +msgstr "" + +#: ../gtk/sip_account.ui.h:12 +msgid "Register" +msgstr "Kayıt" + +#: ../gtk/sip_account.ui.h:13 +msgid "Publish presence information" +msgstr "" + +#: ../gtk/sip_account.ui.h:14 +msgid "Enable AVPF" +msgstr "" + +#: ../gtk/sip_account.ui.h:15 +msgid "Configure a SIP account" +msgstr "" + +#: ../gtk/parameters.ui.h:1 +msgid "anonymous" +msgstr "kimliği belirsiz" + +#: ../gtk/parameters.ui.h:2 +msgid "GSSAPI" +msgstr "" + +#: ../gtk/parameters.ui.h:3 +msgid "SASL" +msgstr "" + +#: ../gtk/parameters.ui.h:4 +msgid "default soundcard" +msgstr "öntanımlı ses kartı" + +#: ../gtk/parameters.ui.h:5 +msgid "a sound card" +msgstr "" + +#: ../gtk/parameters.ui.h:6 +msgid "default camera" +msgstr "öntanımlı kamera" + +#: ../gtk/parameters.ui.h:7 +msgid "CIF" +msgstr "CIF" + +#: ../gtk/parameters.ui.h:8 +msgid "Audio codecs" +msgstr "Ses kodekleri" + +#: ../gtk/parameters.ui.h:9 +msgid "Video codecs" +msgstr "Görüntü kodekleri" + +#: ../gtk/parameters.ui.h:10 +msgid "C" +msgstr "C" + +#: ../gtk/parameters.ui.h:11 +msgid "Settings" +msgstr "Ayarlar" + +#: ../gtk/parameters.ui.h:12 +msgid "Set Maximum Transmission Unit:" +msgstr "" + +#: ../gtk/parameters.ui.h:13 +msgid "Send DTMFs as SIP info" +msgstr "" + +#: ../gtk/parameters.ui.h:14 +msgid "Allow IPv6" +msgstr "" + +#: ../gtk/parameters.ui.h:15 +msgid "Transport" +msgstr "" + +#: ../gtk/parameters.ui.h:16 +msgid "SIP/UDP port" +msgstr "SIP/UDP bağlantı noktası" + +#: ../gtk/parameters.ui.h:18 +msgid "Random" +msgstr "Rastgele" + +#: ../gtk/parameters.ui.h:19 +msgid "SIP/TCP port" +msgstr "SIP/TCP bağlantı noktası" + +#: ../gtk/parameters.ui.h:20 +msgid "Audio RTP/UDP:" +msgstr "" + +#: ../gtk/parameters.ui.h:21 +msgid "Fixed" +msgstr "Sabitlenmiş" + +#: ../gtk/parameters.ui.h:22 +msgid "Video RTP/UDP:" +msgstr "" + +#: ../gtk/parameters.ui.h:23 +msgid "Media encryption type" +msgstr "Ortam şifreleme türü" + +#: ../gtk/parameters.ui.h:24 +msgid "Media encryption is mandatory" +msgstr "Ortam şifrelemesi zorunludur" + +#: ../gtk/parameters.ui.h:25 +msgid "Tunnel" +msgstr "Tünel" + +#: ../gtk/parameters.ui.h:26 +msgid "DSCP fields" +msgstr "" + +#: ../gtk/parameters.ui.h:27 +msgid "Network protocol and ports" +msgstr "" + +#: ../gtk/parameters.ui.h:28 +msgid "Direct connection to the Internet" +msgstr "İnternete doğrudan bağlantı" + +#: ../gtk/parameters.ui.h:29 +msgid "Behind NAT / Firewall (specify gateway IP )" +msgstr "" + +#: ../gtk/parameters.ui.h:30 +msgid "Behind NAT / Firewall (use STUN to resolve)" +msgstr "" + +#: ../gtk/parameters.ui.h:31 +msgid "Behind NAT / Firewall (use ICE)" +msgstr "" + +#: ../gtk/parameters.ui.h:32 +msgid "Behind NAT / Firewall (use uPnP)" +msgstr "" + +#: ../gtk/parameters.ui.h:33 +msgid "Public IP address:" +msgstr "Ortak İP adresi:" + +#: ../gtk/parameters.ui.h:34 +msgid "Stun server:" +msgstr "Stun sunucusu:" + +#: ../gtk/parameters.ui.h:35 +msgid "NAT and Firewall" +msgstr "" + +#: ../gtk/parameters.ui.h:36 +msgid "Network settings" +msgstr "Ağ ayarları" + +#: ../gtk/parameters.ui.h:37 +msgid "Ring sound:" +msgstr "Zil sesi:" + +#: ../gtk/parameters.ui.h:38 +msgid "ALSA special device (optional):" +msgstr "" + +#: ../gtk/parameters.ui.h:39 +msgid "Capture device:" +msgstr "Görüntü yakalama aygıtı" + +#: ../gtk/parameters.ui.h:40 +msgid "Ring device:" +msgstr "Ses çalma aygıtı:" + +#: ../gtk/parameters.ui.h:41 +msgid "Playback device:" +msgstr "Oynatma aygıtı:" + +#: ../gtk/parameters.ui.h:42 +msgid "Enable echo cancellation" +msgstr "" + +#: ../gtk/parameters.ui.h:43 +msgid "Audio" +msgstr "" + +#: ../gtk/parameters.ui.h:44 +msgid "Video input device:" +msgstr "Görüntü aygıtı:" + +#: ../gtk/parameters.ui.h:45 +msgid "Prefered video resolution:" +msgstr "Tercih edilen görüntü çözünürlüğü:" + +#: ../gtk/parameters.ui.h:46 +msgid "Video output method:" +msgstr "Görüntü çıkış yöntemi:" + +#: ../gtk/parameters.ui.h:47 +msgid "Show camera preview" +msgstr "Kamera önizlemesi göster" + +#: ../gtk/parameters.ui.h:48 +msgid "Video" +msgstr "" + +#: ../gtk/parameters.ui.h:49 +msgid "Multimedia settings" +msgstr "Çokluortam ayarları" + +#: ../gtk/parameters.ui.h:50 +msgid "This section defines your SIP address when not using a SIP account" +msgstr "" + +#: ../gtk/parameters.ui.h:51 +msgid "Your display name (eg: John Doe):" +msgstr "" + +#: ../gtk/parameters.ui.h:52 +msgid "Your username:" +msgstr "Kullanıcı adınız:" + +#: ../gtk/parameters.ui.h:53 +msgid "Your resulting SIP address:" +msgstr "" + +#: ../gtk/parameters.ui.h:54 +msgid "Default identity" +msgstr "" + +#: ../gtk/parameters.ui.h:55 +msgid "Wizard" +msgstr "Yardımcı" + +#: ../gtk/parameters.ui.h:56 +msgid "Add" +msgstr "Ekle" + +#: ../gtk/parameters.ui.h:57 +msgid "Edit" +msgstr "Düzenle" + +#: ../gtk/parameters.ui.h:58 +msgid "Remove" +msgstr "Kaldır" + +#: ../gtk/parameters.ui.h:59 +msgid "Proxy accounts" +msgstr "" + +#: ../gtk/parameters.ui.h:60 +msgid "Erase all passwords" +msgstr "Bütün parolaları sil" + +#: ../gtk/parameters.ui.h:61 +msgid "Privacy" +msgstr "" + +#: ../gtk/parameters.ui.h:62 +msgid "Automatically answer when a call is received" +msgstr "" + +#: ../gtk/parameters.ui.h:63 +msgid "Auto-answer" +msgstr "" + +#: ../gtk/parameters.ui.h:64 +msgid "Manage SIP Accounts" +msgstr "SİP Hesaplarını Yönet" + +#: ../gtk/parameters.ui.h:65 ../gtk/tunnel_config.ui.h:4 +msgid "Enable" +msgstr "Etkinleştirme" + +#: ../gtk/parameters.ui.h:66 ../gtk/tunnel_config.ui.h:5 +msgid "Disable" +msgstr "Devre dışı" + +#: ../gtk/parameters.ui.h:67 +msgid "Codecs" +msgstr "" + +#: ../gtk/parameters.ui.h:68 +msgid "0 stands for \"unlimited\"" +msgstr "" + +#: ../gtk/parameters.ui.h:69 +msgid "Upload speed limit in Kbit/sec:" +msgstr "Gönderim hız sınırı Kbit/saniye:" + +#: ../gtk/parameters.ui.h:70 +msgid "Download speed limit in Kbit/sec:" +msgstr "İndirme hız sınırı Kbit/saniye:" + +#: ../gtk/parameters.ui.h:71 +msgid "Enable adaptive rate control" +msgstr "" + +#: ../gtk/parameters.ui.h:72 +msgid "" +"Adaptive rate control is a technique to dynamically guess the available " +"bandwidth during a call." +msgstr "" + +#: ../gtk/parameters.ui.h:73 +msgid "Bandwidth control" +msgstr "" + +#: ../gtk/parameters.ui.h:74 +msgid "Codecs" +msgstr "Çözücüler" + +#: ../gtk/parameters.ui.h:75 +msgid "Language" +msgstr "" + +#: ../gtk/parameters.ui.h:76 +msgid "Show advanced settings" +msgstr "Gelişmiş ayarları göster" + +#: ../gtk/parameters.ui.h:77 +msgid "Level" +msgstr "" + +#: ../gtk/parameters.ui.h:78 +msgid "User interface" +msgstr "Kullanıcı arayüzü" + +#: ../gtk/parameters.ui.h:79 ../gtk/ldap.ui.h:2 +msgid "Server address:" +msgstr "Sunucu adresi:" + +#: ../gtk/parameters.ui.h:80 ../gtk/ldap.ui.h:3 +msgid "Authentication method:" +msgstr "Kimlik doğrulama yöntemi:" + +#: ../gtk/parameters.ui.h:82 +msgid "LDAP Account setup" +msgstr "" + +#: ../gtk/parameters.ui.h:83 +msgid "LDAP" +msgstr "LDAP" + +#: ../gtk/parameters.ui.h:84 +msgid "Done" +msgstr "Tamam" + +#: ../gtk/parameters.ui.h:85 +msgid "SIP (UDP)" +msgstr "SIP (UDP)" + +#: ../gtk/parameters.ui.h:86 +msgid "SIP (TCP)" +msgstr "SIP (TCP)" + +#: ../gtk/parameters.ui.h:87 +msgid "SIP (TLS)" +msgstr "SIP (TLS)" + +#: ../gtk/buddylookup.ui.h:1 +msgid "Search contacts in directory" +msgstr "" + +#: ../gtk/buddylookup.ui.h:2 +msgid "Add to my list" +msgstr "Listeme ekle" + +#: ../gtk/buddylookup.ui.h:3 +msgid "Search somebody" +msgstr "" + +#: ../gtk/waiting.ui.h:1 +msgid "Linphone" +msgstr "Linphone" + +#: ../gtk/waiting.ui.h:2 +msgid "Please wait" +msgstr "Lütfen bekleyin" + +#: ../gtk/dscp_settings.ui.h:1 +msgid "DSCP settings" +msgstr "DSCP ayarları" + +#: ../gtk/dscp_settings.ui.h:2 +msgid "SIP" +msgstr "SİP" + +#: ../gtk/dscp_settings.ui.h:3 +msgid "Audio RTP stream" +msgstr "" + +#: ../gtk/dscp_settings.ui.h:4 +msgid "Video RTP stream" +msgstr "" + +#: ../gtk/dscp_settings.ui.h:5 +msgid "Set DSCP values (in hexadecimal)" +msgstr "" + +#: ../gtk/call_statistics.ui.h:1 +msgid "Call statistics" +msgstr "Çağrı istatistikleri" + +#: ../gtk/call_statistics.ui.h:2 +msgid "Audio codec" +msgstr "Ses çözücü" + +#: ../gtk/call_statistics.ui.h:3 +msgid "Video codec" +msgstr "Görüntü çözücü" + +#: ../gtk/call_statistics.ui.h:4 +msgid "Audio IP bandwidth usage" +msgstr "" + +#: ../gtk/call_statistics.ui.h:5 +msgid "Audio Media connectivity" +msgstr "" + +#: ../gtk/call_statistics.ui.h:6 +msgid "Video IP bandwidth usage" +msgstr "" + +#: ../gtk/call_statistics.ui.h:7 +msgid "Video Media connectivity" +msgstr "" + +#: ../gtk/call_statistics.ui.h:8 +msgid "Round trip time" +msgstr "" + +#: ../gtk/call_statistics.ui.h:9 +msgid "Video resolution received" +msgstr "Alınan görüntü çözünürlüğü" + +#: ../gtk/call_statistics.ui.h:10 +msgid "Video resolution sent" +msgstr "Giden görüntü çözünürlüğü" + +#: ../gtk/call_statistics.ui.h:11 +msgid "RTP profile" +msgstr "" + +#: ../gtk/call_statistics.ui.h:12 +msgid "Call statistics and information" +msgstr "" + +#: ../gtk/tunnel_config.ui.h:1 +msgid "Configure VoIP tunnel" +msgstr "" + +#: ../gtk/tunnel_config.ui.h:2 +msgid "Host" +msgstr "" + +#: ../gtk/tunnel_config.ui.h:3 +msgid "Port" +msgstr "Bağlantı noktası" + +#: ../gtk/tunnel_config.ui.h:6 +msgid "Configure tunnel" +msgstr "" + +#: ../gtk/tunnel_config.ui.h:9 +msgid "Configure http proxy (optional)" +msgstr "" + +#: ../gtk/ldap.ui.h:1 +msgid "LDAP Settings" +msgstr "LDAP Ayarları" + +#: ../gtk/ldap.ui.h:6 +msgid "Use TLS Connection" +msgstr "TLS Bağlantısı Kullan" + +#: ../gtk/ldap.ui.h:7 +msgid "Not yet available" +msgstr "Henüz kullanılabilir değil" + +#: ../gtk/ldap.ui.h:8 +msgid "Connection" +msgstr "" + +#: ../gtk/ldap.ui.h:9 +msgid "Bind DN" +msgstr "" + +#: ../gtk/ldap.ui.h:10 +msgid "Authname" +msgstr "" + +#: ../gtk/ldap.ui.h:11 +msgid "Realm" +msgstr "Ülke" + +#: ../gtk/ldap.ui.h:12 +msgid "SASL" +msgstr "" + +#: ../gtk/ldap.ui.h:13 +msgid "Base object:" +msgstr "" + +#: ../gtk/ldap.ui.h:15 +#, no-c-format +msgid "Filter (%s for name):" +msgstr "" + +#: ../gtk/ldap.ui.h:16 +msgid "Name Attribute:" +msgstr "" + +#: ../gtk/ldap.ui.h:17 +msgid "SIP address attribute:" +msgstr "" + +#: ../gtk/ldap.ui.h:18 +msgid "Attributes to query:" +msgstr "" + +#: ../gtk/ldap.ui.h:19 +msgid "Search" +msgstr "" + +#: ../gtk/ldap.ui.h:20 +msgid "Timeout for search:" +msgstr "" + +#: ../gtk/ldap.ui.h:21 +msgid "Max results:" +msgstr "" + +#: ../gtk/ldap.ui.h:22 +msgid "Follow Aliases" +msgstr "" + +#: ../gtk/ldap.ui.h:23 +msgid "Miscellaneous" +msgstr "" + +#: ../gtk/ldap.ui.h:24 +msgid "ANONYMOUS" +msgstr "" + +#: ../gtk/ldap.ui.h:25 +msgid "SIMPLE" +msgstr "" + +#: ../gtk/ldap.ui.h:26 +msgid "DIGEST-MD5" +msgstr "" + +#: ../gtk/ldap.ui.h:27 +msgid "NTLM" +msgstr "" + +#: ../gtk/config-uri.ui.h:1 +msgid "Specifying a remote configuration URI" +msgstr "" + +#: ../gtk/config-uri.ui.h:2 +msgid "" +"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n" +"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. " +msgstr "" + +#: ../gtk/provisioning-fetch.ui.h:1 +msgid "Configuring..." +msgstr "Yapılandırılıyor..." + +#: ../gtk/provisioning-fetch.ui.h:2 +msgid "Please wait while fetching configuration from server..." +msgstr "" + +#: ../coreapi/linphonecore.c:1534 +msgid "Ready" +msgstr "Hazır" + +#: ../coreapi/linphonecore.c:2534 +msgid "Configuring" +msgstr "Yapılandırılıyor" + +#: ../coreapi/linphonecore.c:2708 +msgid "Looking for telephone number destination..." +msgstr "" + +#: ../coreapi/linphonecore.c:2710 +msgid "Could not resolve this number." +msgstr "" + +#. must be known at that time +#: ../coreapi/linphonecore.c:2996 +msgid "Contacting" +msgstr "Bağlanıyor" + +#: ../coreapi/linphonecore.c:3001 +msgid "Could not call" +msgstr "" + +#: ../coreapi/linphonecore.c:3152 +msgid "Sorry, we have reached the maximum number of simultaneous calls" +msgstr "" + +#: ../coreapi/linphonecore.c:3310 +msgid "is contacting you" +msgstr "" + +#: ../coreapi/linphonecore.c:3311 +msgid " and asked autoanswer." +msgstr "" + +#: ../coreapi/linphonecore.c:3435 +msgid "Modifying call parameters..." +msgstr "" + +#: ../coreapi/linphonecore.c:3782 +msgid "Connected." +msgstr "Bağlandı." + +#: ../coreapi/linphonecore.c:3807 +msgid "Call aborted" +msgstr "Çağrı iptal edildi" + +#: ../coreapi/linphonecore.c:3997 +msgid "Could not pause the call" +msgstr "" + +#: ../coreapi/linphonecore.c:4000 +msgid "Pausing the current call..." +msgstr "" + +#: ../coreapi/misc.c:433 +msgid "Stun lookup in progress..." +msgstr "" + +#: ../coreapi/misc.c:614 +msgid "ICE local candidates gathering in progress..." +msgstr "" + +#: ../coreapi/friend.c:33 +msgid "Online" +msgstr "Çevrimiçi" + +#: ../coreapi/friend.c:36 +msgid "Busy" +msgstr "Meşgul" + +#: ../coreapi/friend.c:39 +msgid "Be right back" +msgstr "" + +#: ../coreapi/friend.c:42 +msgid "Away" +msgstr "Uzakta" + +#: ../coreapi/friend.c:45 +msgid "On the phone" +msgstr "Telefondayım" + +#: ../coreapi/friend.c:48 +msgid "Out to lunch" +msgstr "Yemekteyim" + +#: ../coreapi/friend.c:51 +msgid "Do not disturb" +msgstr "" + +#: ../coreapi/friend.c:54 +msgid "Moved" +msgstr "Taşındı" + +#: ../coreapi/friend.c:57 +msgid "Using another messaging service" +msgstr "" + +#: ../coreapi/friend.c:60 +msgid "Offline" +msgstr "Çevrimdışı" + +#: ../coreapi/friend.c:63 +msgid "Pending" +msgstr "Bekliyor" + +#: ../coreapi/friend.c:66 +msgid "Vacation" +msgstr "Tatil" + +#: ../coreapi/friend.c:68 +msgid "Unknown status" +msgstr "Bilinmeyen durum" + +#: ../coreapi/proxy.c:328 +msgid "" +"The sip proxy address you entered is invalid, it must start with \"sip:\" " +"followed by a hostname." +msgstr "" + +#: ../coreapi/proxy.c:334 +msgid "" +"The sip identity you entered is invalid.\n" +"It should look like sip:username@proxydomain, such as sip:alice@example.net" +msgstr "" + +#: ../coreapi/proxy.c:1416 +#, c-format +msgid "Could not login as %s" +msgstr "" + +#: ../coreapi/callbacks.c:428 +msgid "Remote ringing." +msgstr "" + +#: ../coreapi/callbacks.c:440 +msgid "Remote ringing..." +msgstr "" + +#: ../coreapi/callbacks.c:461 +msgid "Early media." +msgstr "" + +#: ../coreapi/callbacks.c:533 +#, c-format +msgid "Call with %s is paused." +msgstr "" + +#: ../coreapi/callbacks.c:546 +#, c-format +msgid "Call answered by %s - on hold." +msgstr "" + +#: ../coreapi/callbacks.c:556 +msgid "Call resumed." +msgstr "" + +#: ../coreapi/callbacks.c:560 +#, c-format +msgid "Call answered by %s." +msgstr "" + +#: ../coreapi/callbacks.c:583 +msgid "Incompatible, check codecs or security settings..." +msgstr "" + +#: ../coreapi/callbacks.c:588 ../coreapi/callbacks.c:900 +msgid "Incompatible media parameters." +msgstr "" + +#: ../coreapi/callbacks.c:618 +msgid "We have been resumed." +msgstr "" + +#. we are being paused +#: ../coreapi/callbacks.c:626 +msgid "We are paused by other party." +msgstr "" + +#. reINVITE and in-dialogs UPDATE go here +#: ../coreapi/callbacks.c:660 +msgid "Call is updated by remote." +msgstr "" + +#: ../coreapi/callbacks.c:776 +msgid "Call terminated." +msgstr "Çağrı sonlandırıldı" + +#: ../coreapi/callbacks.c:804 +msgid "User is busy." +msgstr "Kullanıcı meşgul" + +#: ../coreapi/callbacks.c:805 +msgid "User is temporarily unavailable." +msgstr "" + +#. char *retrymsg=_("%s. Retry after %i minute(s)."); +#: ../coreapi/callbacks.c:807 +msgid "User does not want to be disturbed." +msgstr "" + +#: ../coreapi/callbacks.c:808 +msgid "Call declined." +msgstr "Çağrı reddedildi." + +#: ../coreapi/callbacks.c:823 +msgid "Request timeout." +msgstr "İstek zamanaşımına uğradı." + +#: ../coreapi/callbacks.c:854 +msgid "Redirected" +msgstr "Yeniden yönlendirildi" + +#: ../coreapi/callbacks.c:909 +msgid "Call failed." +msgstr "Arama başarısız" + +#: ../coreapi/callbacks.c:987 +#, c-format +msgid "Registration on %s successful." +msgstr "" + +#: ../coreapi/callbacks.c:988 +#, c-format +msgid "Unregistration on %s done." +msgstr "" + +#: ../coreapi/callbacks.c:1006 +msgid "no response timeout" +msgstr "" + +#: ../coreapi/callbacks.c:1009 +#, c-format +msgid "Registration on %s failed: %s" +msgstr "" + +#: ../coreapi/callbacks.c:1016 +msgid "Service unavailable, retrying" +msgstr "" + +#. if encryption is DTLS, no status to be displayed +#: ../coreapi/linphonecall.c:180 +#, c-format +msgid "Authentication token is %s" +msgstr "" + +#: ../coreapi/linphonecall.c:1305 +msgid "Call parameters were successfully modified." +msgstr "" + +#: ../coreapi/linphonecall.c:3659 +#, c-format +msgid "You have missed %i call." +msgid_plural "You have missed %i calls." +msgstr[0] "" +msgstr[1] "" + +#: ../coreapi/call_log.c:209 +msgid "aborted" +msgstr "iptal edildi" + +#: ../coreapi/call_log.c:212 +msgid "completed" +msgstr "tamamlandı" + +#: ../coreapi/call_log.c:215 +msgid "missed" +msgstr "Yanıtsız" + +#: ../coreapi/call_log.c:218 +msgid "unknown" +msgstr "" + +#: ../coreapi/call_log.c:220 +#, c-format +msgid "" +"%s at %s\n" +"From: %s\n" +"To: %s\n" +"Status: %s\n" +"Duration: %i mn %i sec\n" +msgstr "" + +#: ../coreapi/call_log.c:221 +msgid "Outgoing call" +msgstr "" + +#: ../gtk/videowindow.c:66 +#, c-format +msgid "Cannot play %s." +msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index 67145f034..2dfc0f91a 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1,22 +1,20 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: msgid "" msgstr "" "Project-Id-Version: linphone-gtk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-11 16:26+0100\n" -"PO-Revision-Date: 2015-02-17 11:28+0000\n" -"Last-Translator: Belledonne Communications \n" -"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/linphone-" -"gtk/language/zh_CN/)\n" -"Language: zh_CN\n" +"POT-Creation-Date: 2015-03-27 14:40+0100\n" +"PO-Revision-Date: 2015-03-27 13:40+0000\n" +"Last-Translator: Belledonne Communications \n" +"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/linphone-gtk/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" #: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974 @@ -87,135 +85,126 @@ msgstr "" msgid "Couldn't find pixmap file: %s" msgstr "无法打开位图文件：%s" -#: ../gtk/chat.c:374 ../gtk/friendlist.c:924 -msgid "Invalid sip contact !" -msgstr "无效的 SIP 联系人！" - -#: ../gtk/main.c:137 +#: ../gtk/main.c:136 msgid "log to stdout some debug information while running." msgstr "运行时向标准输出记录调试信息。" -#: ../gtk/main.c:138 +#: ../gtk/main.c:137 msgid "path to a file to write logs into." msgstr "" -#: ../gtk/main.c:139 +#: ../gtk/main.c:138 msgid "Start linphone with video disabled." msgstr "" -#: ../gtk/main.c:140 +#: ../gtk/main.c:139 msgid "Start only in the system tray, do not show the main interface." msgstr "启动到系统托盘，不显示主界面。" -#: ../gtk/main.c:141 +#: ../gtk/main.c:140 msgid "address to call right now" msgstr "现在呼叫的地址" -#: ../gtk/main.c:142 -msgid "if set automatically answer incoming calls" -msgstr "是否设置呼叫自动应答" - -#: ../gtk/main.c:143 +#: ../gtk/main.c:141 msgid "" -"Specifiy a working directory (should be the base of the installation, eg: c:" -"\\Program Files\\Linphone)" +"Specifiy a working directory (should be the base of the installation, eg: " +"c:\\Program Files\\Linphone)" msgstr "指定工作目录(应为安装目录例如 C:\\Program Files\\Linphone)" -#: ../gtk/main.c:144 +#: ../gtk/main.c:142 msgid "Configuration file" msgstr "" -#: ../gtk/main.c:145 +#: ../gtk/main.c:143 msgid "Run the audio assistant" msgstr "" -#: ../gtk/main.c:146 +#: ../gtk/main.c:144 msgid "Run self test and exit 0 if succeed" msgstr "" -#: ../gtk/main.c:1061 +#: ../gtk/main.c:1059 #, 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 想加您为联系人。\n" -"您是否允许他看到您的在线状态或者将它加为您的联系人允许?\n" -"如果您回答否，则会将该人临时性的放入黑名单" +msgstr "%s 想加您为联系人。\n您是否允许他看到您的在线状态或者将它加为您的联系人允许?\n如果您回答否，则会将该人临时性的放入黑名单" -#: ../gtk/main.c:1138 +#: ../gtk/main.c:1136 #, c-format msgid "" "Please enter your password for username %s\n" " at realm %s:" msgstr "" -#: ../gtk/main.c:1259 +#: ../gtk/main.c:1257 msgid "Call error" msgstr "" -#: ../gtk/main.c:1262 ../coreapi/linphonecore.c:3791 +#: ../gtk/main.c:1260 ../coreapi/linphonecore.c:3826 msgid "Call ended" msgstr "呼叫结束" -#: ../gtk/main.c:1265 ../coreapi/call_log.c:221 +#: ../gtk/main.c:1263 ../coreapi/call_log.c:221 msgid "Incoming call" msgstr "呼入" -#: ../gtk/main.c:1267 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5 +#: ../gtk/main.c:1265 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5 msgid "Answer" msgstr "" -#: ../gtk/main.c:1269 ../gtk/main.ui.h:6 +#: ../gtk/main.c:1267 ../gtk/main.ui.h:6 msgid "Decline" msgstr "拒绝" -#: ../gtk/main.c:1275 +#: ../gtk/main.c:1273 msgid "Call paused" msgstr "" -#: ../gtk/main.c:1275 +#: ../gtk/main.c:1273 #, c-format msgid "by %s" msgstr "" -#: ../gtk/main.c:1345 +#: ../gtk/main.c:1343 #, c-format msgid "%s proposed to start video. Do you accept ?" msgstr "" -#: ../gtk/main.c:1507 +#: ../gtk/main.c:1505 msgid "Website link" msgstr "网站" -#: ../gtk/main.c:1556 +#: ../gtk/main.c:1554 msgid "Linphone - a video internet phone" msgstr "Linphone - 互联网视频电话" -#: ../gtk/main.c:1648 +#: ../gtk/main.c:1646 #, c-format msgid "%s (Default)" msgstr "%s (默认)" -#: ../gtk/main.c:1980 ../coreapi/callbacks.c:1045 +#: ../gtk/main.c:1978 ../coreapi/callbacks.c:1057 #, c-format msgid "We are transferred to %s" msgstr "" -#: ../gtk/main.c:1990 +#: ../gtk/main.c:1988 msgid "" "No sound cards have been detected on this computer.\n" "You won't be able to send or receive audio calls." -msgstr "" -"未在此计算机上检测到声卡。\n" -"您无法发送或接收音频呼叫。" +msgstr "未在此计算机上检测到声卡。\n您无法发送或接收音频呼叫。" -#: ../gtk/main.c:2135 +#: ../gtk/main.c:2136 msgid "A free SIP video-phone" msgstr "免费的 SIP 视频电话" +#: ../gtk/main.c:2241 +#, c-format +msgid "Hello\n" +msgstr "" + #: ../gtk/friendlist.c:505 msgid "Add to addressbook" msgstr "" @@ -241,6 +230,10 @@ msgstr "" msgid "Search in %s directory" msgstr "在 %s 目录中查找 " +#: ../gtk/friendlist.c:924 +msgid "Invalid sip contact !" +msgstr "无效的 SIP 联系人！" + #: ../gtk/friendlist.c:976 #, c-format msgid "Edit contact '%s'" @@ -281,7 +274,7 @@ msgstr "参数" msgid "Enabled" msgstr "启用" -#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763 ../gtk/parameters.ui.h:20 +#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763 ../gtk/parameters.ui.h:17 msgid "Disabled" msgstr "禁用" @@ -387,9 +380,7 @@ msgstr "" msgid "" "A more recent version is availalble from %s.\n" "Would you like to open a browser to download it ?" -msgstr "" -"%s 有新版本。\n" -"您是否要打开浏览器下载它？" +msgstr "%s 有新版本。\n您是否要打开浏览器下载它？" #: ../gtk/update.c:91 msgid "You are running the lastest version." @@ -447,7 +438,7 @@ msgstr "" msgid "Enter your linphone.org username" msgstr "" -#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:82 ../gtk/ldap.ui.h:4 +#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:81 ../gtk/ldap.ui.h:4 msgid "Username:" msgstr "用户名:" @@ -511,8 +502,7 @@ msgstr "谢谢，您的帐户已经配置完毕，可以使用。" #: ../gtk/setupwizard.c:413 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 "" @@ -836,7 +826,7 @@ msgstr "" msgid "Audio Assistant" msgstr "" -#: ../gtk/audio_assistant.c:513 ../gtk/main.ui.h:31 +#: ../gtk/audio_assistant.c:513 ../gtk/main.ui.h:32 msgid "Audio assistant" msgstr "" @@ -913,103 +903,103 @@ msgid "Default" msgstr "默认" #: ../gtk/main.ui.h:22 -msgid "_Options" +msgid "Delete" msgstr "" #: ../gtk/main.ui.h:23 -msgid "Set configuration URI" +msgid "_Options" msgstr "" #: ../gtk/main.ui.h:24 -msgid "Always start video" +msgid "Set configuration URI" msgstr "" #: ../gtk/main.ui.h:25 +msgid "Always start video" +msgstr "" + +#: ../gtk/main.ui.h:26 msgid "Enable self-view" msgstr "启用自视" -#: ../gtk/main.ui.h:26 +#: ../gtk/main.ui.h:27 msgid "_Help" msgstr "" -#: ../gtk/main.ui.h:27 +#: ../gtk/main.ui.h:28 msgid "Show debug window" msgstr "" -#: ../gtk/main.ui.h:28 +#: ../gtk/main.ui.h:29 msgid "_Homepage" msgstr "" -#: ../gtk/main.ui.h:29 +#: ../gtk/main.ui.h:30 msgid "Check _Updates" msgstr "" -#: ../gtk/main.ui.h:30 +#: ../gtk/main.ui.h:31 msgid "Account assistant" msgstr "" -#: ../gtk/main.ui.h:32 +#: ../gtk/main.ui.h:33 msgid "SIP address or phone number:" msgstr "SIP 地址或电话号码：" -#: ../gtk/main.ui.h:33 +#: ../gtk/main.ui.h:34 msgid "Initiate a new call" msgstr "" -#: ../gtk/main.ui.h:34 +#: ../gtk/main.ui.h:35 msgid "Contacts" msgstr "联系人" -#: ../gtk/main.ui.h:35 +#: ../gtk/main.ui.h:36 msgid "Search" msgstr "搜索" -#: ../gtk/main.ui.h:36 +#: ../gtk/main.ui.h:37 msgid "Add contacts from directory" msgstr "从目录增加联系人" -#: ../gtk/main.ui.h:37 +#: ../gtk/main.ui.h:38 msgid "Add contact" msgstr "" -#: ../gtk/main.ui.h:38 +#: ../gtk/main.ui.h:39 msgid "Recent calls" msgstr "" -#: ../gtk/main.ui.h:39 +#: ../gtk/main.ui.h:40 msgid "My current identity:" msgstr "当前地址：" -#: ../gtk/main.ui.h:40 ../gtk/tunnel_config.ui.h:7 +#: ../gtk/main.ui.h:41 ../gtk/tunnel_config.ui.h:7 msgid "Username" msgstr "用户名" -#: ../gtk/main.ui.h:41 ../gtk/tunnel_config.ui.h:8 +#: ../gtk/main.ui.h:42 ../gtk/tunnel_config.ui.h:8 msgid "Password" msgstr "密码" -#: ../gtk/main.ui.h:42 +#: ../gtk/main.ui.h:43 msgid "Internet connection:" msgstr "网络连接：" -#: ../gtk/main.ui.h:43 +#: ../gtk/main.ui.h:44 msgid "Automatically log me in" msgstr "自动登录" -#: ../gtk/main.ui.h:44 ../gtk/password.ui.h:3 +#: ../gtk/main.ui.h:45 ../gtk/password.ui.h:3 msgid "UserID" msgstr "用户 ID" -#: ../gtk/main.ui.h:45 +#: ../gtk/main.ui.h:46 msgid "Login information" msgstr "登录信息" -#: ../gtk/main.ui.h:46 -msgid "Welcome!" -msgstr "" - #: ../gtk/main.ui.h:47 -msgid "Delete" +msgid "Welcome!" msgstr "" #: ../gtk/about.ui.h:1 @@ -1185,299 +1175,307 @@ msgid "C" msgstr "C" #: ../gtk/parameters.ui.h:11 -msgid "SIP (UDP)" -msgstr "" - -#: ../gtk/parameters.ui.h:12 -msgid "SIP (TCP)" -msgstr "" - -#: ../gtk/parameters.ui.h:13 -msgid "SIP (TLS)" -msgstr "" - -#: ../gtk/parameters.ui.h:14 msgid "Settings" msgstr "设置" -#: ../gtk/parameters.ui.h:15 +#: ../gtk/parameters.ui.h:12 msgid "Set Maximum Transmission Unit:" msgstr "设置最大传输单元(MTU)：" -#: ../gtk/parameters.ui.h:16 +#: ../gtk/parameters.ui.h:13 msgid "Send DTMFs as SIP info" msgstr "以 SIP 消息发送 DTMF" -#: ../gtk/parameters.ui.h:17 -msgid "Use IPv6 instead of IPv4" -msgstr "使用 IPv6 而非 IPv4" +#: ../gtk/parameters.ui.h:14 +msgid "Allow IPv6" +msgstr "" -#: ../gtk/parameters.ui.h:18 +#: ../gtk/parameters.ui.h:15 msgid "Transport" msgstr "传输协议" -#: ../gtk/parameters.ui.h:19 +#: ../gtk/parameters.ui.h:16 msgid "SIP/UDP port" msgstr "" -#: ../gtk/parameters.ui.h:21 +#: ../gtk/parameters.ui.h:18 msgid "Random" msgstr "" -#: ../gtk/parameters.ui.h:22 +#: ../gtk/parameters.ui.h:19 msgid "SIP/TCP port" msgstr "" -#: ../gtk/parameters.ui.h:23 +#: ../gtk/parameters.ui.h:20 msgid "Audio RTP/UDP:" msgstr "音频 RTP/UDP：" -#: ../gtk/parameters.ui.h:24 +#: ../gtk/parameters.ui.h:21 msgid "Fixed" msgstr "" -#: ../gtk/parameters.ui.h:25 +#: ../gtk/parameters.ui.h:22 msgid "Video RTP/UDP:" msgstr "视频 RTP/UDP：" -#: ../gtk/parameters.ui.h:26 +#: ../gtk/parameters.ui.h:23 msgid "Media encryption type" msgstr "" -#: ../gtk/parameters.ui.h:27 +#: ../gtk/parameters.ui.h:24 msgid "Media encryption is mandatory" msgstr "" -#: ../gtk/parameters.ui.h:28 +#: ../gtk/parameters.ui.h:25 msgid "Tunnel" msgstr "" -#: ../gtk/parameters.ui.h:29 +#: ../gtk/parameters.ui.h:26 msgid "DSCP fields" msgstr "" -#: ../gtk/parameters.ui.h:30 +#: ../gtk/parameters.ui.h:27 msgid "Network protocol and ports" msgstr "" -#: ../gtk/parameters.ui.h:31 +#: ../gtk/parameters.ui.h:28 msgid "Direct connection to the Internet" msgstr "直接连接到互联网" -#: ../gtk/parameters.ui.h:32 +#: ../gtk/parameters.ui.h:29 msgid "Behind NAT / Firewall (specify gateway IP )" msgstr "" -#: ../gtk/parameters.ui.h:33 +#: ../gtk/parameters.ui.h:30 msgid "Behind NAT / Firewall (use STUN to resolve)" msgstr "在 NAT 或防火墙后(使用 STUN 解决)" -#: ../gtk/parameters.ui.h:34 +#: ../gtk/parameters.ui.h:31 msgid "Behind NAT / Firewall (use ICE)" msgstr "" -#: ../gtk/parameters.ui.h:35 +#: ../gtk/parameters.ui.h:32 msgid "Behind NAT / Firewall (use uPnP)" msgstr "" -#: ../gtk/parameters.ui.h:36 +#: ../gtk/parameters.ui.h:33 msgid "Public IP address:" msgstr "公网 IP 地址：" -#: ../gtk/parameters.ui.h:37 +#: ../gtk/parameters.ui.h:34 msgid "Stun server:" msgstr "Stun 服务器：" -#: ../gtk/parameters.ui.h:38 +#: ../gtk/parameters.ui.h:35 msgid "NAT and Firewall" msgstr "NAT 及防火墙" -#: ../gtk/parameters.ui.h:39 +#: ../gtk/parameters.ui.h:36 msgid "Network settings" msgstr "网络设置" -#: ../gtk/parameters.ui.h:40 +#: ../gtk/parameters.ui.h:37 msgid "Ring sound:" msgstr "铃声文件：" -#: ../gtk/parameters.ui.h:41 +#: ../gtk/parameters.ui.h:38 msgid "ALSA special device (optional):" msgstr "ALSA 特殊设备(可选)：" -#: ../gtk/parameters.ui.h:42 +#: ../gtk/parameters.ui.h:39 msgid "Capture device:" msgstr "录音设备：" -#: ../gtk/parameters.ui.h:43 +#: ../gtk/parameters.ui.h:40 msgid "Ring device:" msgstr "响铃设备：" -#: ../gtk/parameters.ui.h:44 +#: ../gtk/parameters.ui.h:41 msgid "Playback device:" msgstr "回放设备：" -#: ../gtk/parameters.ui.h:45 +#: ../gtk/parameters.ui.h:42 msgid "Enable echo cancellation" msgstr "启用回声抑制" -#: ../gtk/parameters.ui.h:46 +#: ../gtk/parameters.ui.h:43 msgid "Audio" msgstr "音频" -#: ../gtk/parameters.ui.h:47 +#: ../gtk/parameters.ui.h:44 msgid "Video input device:" msgstr "视频输入设备：" -#: ../gtk/parameters.ui.h:48 +#: ../gtk/parameters.ui.h:45 msgid "Prefered video resolution:" msgstr "视频分辨率：" -#: ../gtk/parameters.ui.h:49 +#: ../gtk/parameters.ui.h:46 msgid "Video output method:" msgstr "" -#: ../gtk/parameters.ui.h:50 +#: ../gtk/parameters.ui.h:47 msgid "Show camera preview" msgstr "" -#: ../gtk/parameters.ui.h:51 +#: ../gtk/parameters.ui.h:48 msgid "Video" msgstr "视频" -#: ../gtk/parameters.ui.h:52 +#: ../gtk/parameters.ui.h:49 msgid "Multimedia settings" msgstr "音视频设置" -#: ../gtk/parameters.ui.h:53 +#: ../gtk/parameters.ui.h:50 msgid "This section defines your SIP address when not using a SIP account" msgstr "该段在您不使用SIP帐户时的SIP地址" -#: ../gtk/parameters.ui.h:54 +#: ../gtk/parameters.ui.h:51 msgid "Your display name (eg: John Doe):" msgstr "您的显示名：" -#: ../gtk/parameters.ui.h:55 +#: ../gtk/parameters.ui.h:52 msgid "Your username:" msgstr "您的用户名：" -#: ../gtk/parameters.ui.h:56 +#: ../gtk/parameters.ui.h:53 msgid "Your resulting SIP address:" msgstr "您的 SIP 地址结果：" -#: ../gtk/parameters.ui.h:57 +#: ../gtk/parameters.ui.h:54 msgid "Default identity" msgstr "默认帐户" -#: ../gtk/parameters.ui.h:58 +#: ../gtk/parameters.ui.h:55 msgid "Wizard" msgstr "" -#: ../gtk/parameters.ui.h:59 +#: ../gtk/parameters.ui.h:56 msgid "Add" msgstr "添加" -#: ../gtk/parameters.ui.h:60 +#: ../gtk/parameters.ui.h:57 msgid "Edit" msgstr "编辑" -#: ../gtk/parameters.ui.h:61 +#: ../gtk/parameters.ui.h:58 msgid "Remove" msgstr "移除" -#: ../gtk/parameters.ui.h:62 +#: ../gtk/parameters.ui.h:59 msgid "Proxy accounts" msgstr "代理帐户" -#: ../gtk/parameters.ui.h:63 +#: ../gtk/parameters.ui.h:60 msgid "Erase all passwords" msgstr "清除所有密码" -#: ../gtk/parameters.ui.h:64 +#: ../gtk/parameters.ui.h:61 msgid "Privacy" msgstr "隐私" -#: ../gtk/parameters.ui.h:65 +#: ../gtk/parameters.ui.h:62 +msgid "Automatically answer when a call is received" +msgstr "" + +#: ../gtk/parameters.ui.h:63 +msgid "Auto-answer" +msgstr "" + +#: ../gtk/parameters.ui.h:64 msgid "Manage SIP Accounts" msgstr "SIP 帐户管理" -#: ../gtk/parameters.ui.h:66 ../gtk/tunnel_config.ui.h:4 +#: ../gtk/parameters.ui.h:65 ../gtk/tunnel_config.ui.h:4 msgid "Enable" msgstr "启用" -#: ../gtk/parameters.ui.h:67 ../gtk/tunnel_config.ui.h:5 +#: ../gtk/parameters.ui.h:66 ../gtk/tunnel_config.ui.h:5 msgid "Disable" msgstr "禁用" -#: ../gtk/parameters.ui.h:68 +#: ../gtk/parameters.ui.h:67 msgid "Codecs" msgstr "编解码器" -#: ../gtk/parameters.ui.h:69 +#: ../gtk/parameters.ui.h:68 msgid "0 stands for \"unlimited\"" msgstr "0 表示 “没有限制”" -#: ../gtk/parameters.ui.h:70 +#: ../gtk/parameters.ui.h:69 msgid "Upload speed limit in Kbit/sec:" msgstr "上传速率限制 kbit/s：" -#: ../gtk/parameters.ui.h:71 +#: ../gtk/parameters.ui.h:70 msgid "Download speed limit in Kbit/sec:" msgstr "下载速率限制 kbit/s：" -#: ../gtk/parameters.ui.h:72 +#: ../gtk/parameters.ui.h:71 msgid "Enable adaptive rate control" msgstr "" -#: ../gtk/parameters.ui.h:73 +#: ../gtk/parameters.ui.h:72 msgid "" "Adaptive rate control is a technique to dynamically guess the available " "bandwidth during a call." msgstr "" -#: ../gtk/parameters.ui.h:74 +#: ../gtk/parameters.ui.h:73 msgid "Bandwidth control" msgstr "带宽控制" -#: ../gtk/parameters.ui.h:75 +#: ../gtk/parameters.ui.h:74 msgid "Codecs" msgstr "编解码器" -#: ../gtk/parameters.ui.h:76 +#: ../gtk/parameters.ui.h:75 msgid "Language" msgstr "语言" -#: ../gtk/parameters.ui.h:77 +#: ../gtk/parameters.ui.h:76 msgid "Show advanced settings" msgstr "显示高级设置" -#: ../gtk/parameters.ui.h:78 +#: ../gtk/parameters.ui.h:77 msgid "Level" msgstr "级别" -#: ../gtk/parameters.ui.h:79 +#: ../gtk/parameters.ui.h:78 msgid "User interface" msgstr "用户界面" -#: ../gtk/parameters.ui.h:80 ../gtk/ldap.ui.h:2 +#: ../gtk/parameters.ui.h:79 ../gtk/ldap.ui.h:2 msgid "Server address:" msgstr "" -#: ../gtk/parameters.ui.h:81 ../gtk/ldap.ui.h:3 +#: ../gtk/parameters.ui.h:80 ../gtk/ldap.ui.h:3 msgid "Authentication method:" msgstr "" -#: ../gtk/parameters.ui.h:83 +#: ../gtk/parameters.ui.h:82 msgid "LDAP Account setup" msgstr "" -#: ../gtk/parameters.ui.h:84 +#: ../gtk/parameters.ui.h:83 msgid "LDAP" msgstr "" -#: ../gtk/parameters.ui.h:85 +#: ../gtk/parameters.ui.h:84 msgid "Done" msgstr "完成" +#: ../gtk/parameters.ui.h:85 +msgid "SIP (UDP)" +msgstr "" + +#: ../gtk/parameters.ui.h:86 +msgid "SIP (TCP)" +msgstr "" + +#: ../gtk/parameters.ui.h:87 +msgid "SIP (TLS)" +msgstr "" + #: ../gtk/buddylookup.ui.h:1 msgid "Search contacts in directory" msgstr "查找联系人" @@ -1681,11 +1679,8 @@ msgstr "" #: ../gtk/config-uri.ui.h:2 msgid "" -"This dialog allows to set an http or https address when configuration is to " -"be fetched at startup.\n" -"Please enter or modify the configuration URI below. After clicking OK, " -"Linphone will restart automatically in order to fetch and take into account " -"the new configuration. " +"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n" +"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. " msgstr "" #: ../gtk/provisioning-fetch.ui.h:1 @@ -1696,60 +1691,60 @@ msgstr "" msgid "Please wait while fetching configuration from server..." msgstr "" -#: ../coreapi/linphonecore.c:1512 +#: ../coreapi/linphonecore.c:1534 msgid "Ready" msgstr "就绪" -#: ../coreapi/linphonecore.c:2499 +#: ../coreapi/linphonecore.c:2534 msgid "Configuring" msgstr "" -#: ../coreapi/linphonecore.c:2673 +#: ../coreapi/linphonecore.c:2708 msgid "Looking for telephone number destination..." msgstr "查询电话号码目的地..." -#: ../coreapi/linphonecore.c:2675 +#: ../coreapi/linphonecore.c:2710 msgid "Could not resolve this number." msgstr "该号码无法解析。" #. must be known at that time -#: ../coreapi/linphonecore.c:2961 +#: ../coreapi/linphonecore.c:2996 msgid "Contacting" msgstr "联系中" -#: ../coreapi/linphonecore.c:2966 +#: ../coreapi/linphonecore.c:3001 msgid "Could not call" msgstr "" -#: ../coreapi/linphonecore.c:3116 +#: ../coreapi/linphonecore.c:3152 msgid "Sorry, we have reached the maximum number of simultaneous calls" msgstr "" -#: ../coreapi/linphonecore.c:3274 +#: ../coreapi/linphonecore.c:3310 msgid "is contacting you" msgstr "正在联系您" -#: ../coreapi/linphonecore.c:3275 +#: ../coreapi/linphonecore.c:3311 msgid " and asked autoanswer." msgstr " 并询问了自动回答。" -#: ../coreapi/linphonecore.c:3399 +#: ../coreapi/linphonecore.c:3435 msgid "Modifying call parameters..." msgstr "" -#: ../coreapi/linphonecore.c:3747 +#: ../coreapi/linphonecore.c:3782 msgid "Connected." msgstr "已连接。" -#: ../coreapi/linphonecore.c:3772 +#: ../coreapi/linphonecore.c:3807 msgid "Call aborted" msgstr "" -#: ../coreapi/linphonecore.c:3962 +#: ../coreapi/linphonecore.c:3997 msgid "Could not pause the call" msgstr "" -#: ../coreapi/linphonecore.c:3965 +#: ../coreapi/linphonecore.c:4000 msgid "Pausing the current call..." msgstr "" @@ -1823,121 +1818,119 @@ msgstr "您输入的 SIP 代理地址无效，它必须是以“sip:”开头， msgid "" "The sip identity you entered is invalid.\n" "It should look like sip:username@proxydomain, such as sip:alice@example.net" -msgstr "" -"您输入的地址无效。\n" -"它应具有“sip:用户名@代理域”的形式，例如 sip:alice@example.net" +msgstr "您输入的地址无效。\n它应具有“sip:用户名@代理域”的形式，例如 sip:alice@example.net" -#: ../coreapi/proxy.c:1403 +#: ../coreapi/proxy.c:1416 #, c-format msgid "Could not login as %s" msgstr "无法登录为 %s" -#: ../coreapi/callbacks.c:419 +#: ../coreapi/callbacks.c:428 msgid "Remote ringing." msgstr "响铃。" -#: ../coreapi/callbacks.c:431 +#: ../coreapi/callbacks.c:440 msgid "Remote ringing..." msgstr "" -#: ../coreapi/callbacks.c:448 +#: ../coreapi/callbacks.c:461 msgid "Early media." msgstr "" -#: ../coreapi/callbacks.c:521 +#: ../coreapi/callbacks.c:533 #, c-format msgid "Call with %s is paused." msgstr "" -#: ../coreapi/callbacks.c:534 +#: ../coreapi/callbacks.c:546 #, c-format msgid "Call answered by %s - on hold." msgstr "" -#: ../coreapi/callbacks.c:544 +#: ../coreapi/callbacks.c:556 msgid "Call resumed." msgstr "" -#: ../coreapi/callbacks.c:548 +#: ../coreapi/callbacks.c:560 #, c-format msgid "Call answered by %s." msgstr "" -#: ../coreapi/callbacks.c:571 +#: ../coreapi/callbacks.c:583 msgid "Incompatible, check codecs or security settings..." msgstr "" -#: ../coreapi/callbacks.c:576 ../coreapi/callbacks.c:888 +#: ../coreapi/callbacks.c:588 ../coreapi/callbacks.c:900 msgid "Incompatible media parameters." msgstr "" -#: ../coreapi/callbacks.c:606 +#: ../coreapi/callbacks.c:618 msgid "We have been resumed." msgstr "" #. we are being paused -#: ../coreapi/callbacks.c:614 +#: ../coreapi/callbacks.c:626 msgid "We are paused by other party." msgstr "" #. reINVITE and in-dialogs UPDATE go here -#: ../coreapi/callbacks.c:648 +#: ../coreapi/callbacks.c:660 msgid "Call is updated by remote." msgstr "" -#: ../coreapi/callbacks.c:764 +#: ../coreapi/callbacks.c:776 msgid "Call terminated." msgstr "通话结束。" -#: ../coreapi/callbacks.c:792 +#: ../coreapi/callbacks.c:804 msgid "User is busy." msgstr "被叫正忙。" -#: ../coreapi/callbacks.c:793 +#: ../coreapi/callbacks.c:805 msgid "User is temporarily unavailable." msgstr "您呼叫的用户暂时无法接通。" #. char *retrymsg=_("%s. Retry after %i minute(s)."); -#: ../coreapi/callbacks.c:795 +#: ../coreapi/callbacks.c:807 msgid "User does not want to be disturbed." msgstr "用户已开启免打扰功能。" -#: ../coreapi/callbacks.c:796 +#: ../coreapi/callbacks.c:808 msgid "Call declined." msgstr "呼叫被拒绝。" -#: ../coreapi/callbacks.c:811 +#: ../coreapi/callbacks.c:823 msgid "Request timeout." msgstr "" -#: ../coreapi/callbacks.c:842 +#: ../coreapi/callbacks.c:854 msgid "Redirected" msgstr "已重定向" -#: ../coreapi/callbacks.c:897 +#: ../coreapi/callbacks.c:909 msgid "Call failed." msgstr "呼叫失败。" -#: ../coreapi/callbacks.c:975 +#: ../coreapi/callbacks.c:987 #, c-format msgid "Registration on %s successful." msgstr "成功注册到 %s" -#: ../coreapi/callbacks.c:976 +#: ../coreapi/callbacks.c:988 #, c-format msgid "Unregistration on %s done." msgstr "已在 %s 解除注册。" -#: ../coreapi/callbacks.c:994 +#: ../coreapi/callbacks.c:1006 msgid "no response timeout" msgstr "没有响应，超时" -#: ../coreapi/callbacks.c:997 +#: ../coreapi/callbacks.c:1009 #, c-format msgid "Registration on %s failed: %s" msgstr "注册到 %s 失败: %s" -#: ../coreapi/callbacks.c:1004 +#: ../coreapi/callbacks.c:1016 msgid "Service unavailable, retrying" msgstr "" @@ -1947,7 +1940,11 @@ msgstr "" msgid "Authentication token is %s" msgstr "" -#: ../coreapi/linphonecall.c:3600 +#: ../coreapi/linphonecall.c:1305 +msgid "Call parameters were successfully modified." +msgstr "" + +#: ../coreapi/linphonecall.c:3659 #, c-format msgid "You have missed %i call." msgid_plural "You have missed %i calls." diff --git a/po/zh_TW.po b/po/zh_TW.po index e052ee316..fcc1a2ea2 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -1,22 +1,20 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: msgid "" msgstr "" "Project-Id-Version: linphone-gtk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-11 16:26+0100\n" -"PO-Revision-Date: 2015-02-17 11:28+0000\n" -"Last-Translator: Belledonne Communications \n" -"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/" -"linphone-gtk/language/zh_TW/)\n" -"Language: zh_TW\n" +"POT-Creation-Date: 2015-03-27 14:40+0100\n" +"PO-Revision-Date: 2015-03-27 13:40+0000\n" +"Last-Translator: Belledonne Communications \n" +"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/linphone-gtk/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: zh_TW\n" "Plural-Forms: nplurals=1; plural=0;\n" #: ../gtk/calllogs.c:148 ../gtk/friendlist.c:974 @@ -87,136 +85,126 @@ msgstr "" msgid "Couldn't find pixmap file: %s" msgstr "找不到 pixmap 檔：%s" -#: ../gtk/chat.c:374 ../gtk/friendlist.c:924 -msgid "Invalid sip contact !" -msgstr "無效的 sip 連絡人！" - -#: ../gtk/main.c:137 +#: ../gtk/main.c:136 msgid "log to stdout some debug information while running." msgstr "執行時將一些除錯資訊記錄到標準輸出。" -#: ../gtk/main.c:138 +#: ../gtk/main.c:137 msgid "path to a file to write logs into." msgstr "" -#: ../gtk/main.c:139 +#: ../gtk/main.c:138 msgid "Start linphone with video disabled." msgstr "" -#: ../gtk/main.c:140 +#: ../gtk/main.c:139 msgid "Start only in the system tray, do not show the main interface." msgstr "只在系統匣啟動，不要顯示主要介面。" -#: ../gtk/main.c:141 +#: ../gtk/main.c:140 msgid "address to call right now" msgstr "現在要打電話的位址" -#: ../gtk/main.c:142 -msgid "if set automatically answer incoming calls" -msgstr "如啟用此項，將會自動接聽來電" - -#: ../gtk/main.c:143 +#: ../gtk/main.c:141 msgid "" -"Specifiy a working directory (should be the base of the installation, eg: c:" -"\\Program Files\\Linphone)" -msgstr "" -"指定一個工作目錄（應該為安裝的根目錄，例如：c:\\Program Files\\Linphone）" +"Specifiy a working directory (should be the base of the installation, eg: " +"c:\\Program Files\\Linphone)" +msgstr "指定一個工作目錄（應該為安裝的根目錄，例如：c:\\Program Files\\Linphone）" -#: ../gtk/main.c:144 +#: ../gtk/main.c:142 msgid "Configuration file" msgstr "" -#: ../gtk/main.c:145 +#: ../gtk/main.c:143 msgid "Run the audio assistant" msgstr "" -#: ../gtk/main.c:146 +#: ../gtk/main.c:144 msgid "Run self test and exit 0 if succeed" msgstr "" -#: ../gtk/main.c:1061 +#: ../gtk/main.c:1059 #, 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 想要加您加入他的連絡人清單。\n" -"您是否要允許他看見您的上線狀態或將他加入您的連絡人清單？\n" -"如果您回答否，這個人會被暫時列入黑名單。" +msgstr "%s 想要加您加入他的連絡人清單。\n您是否要允許他看見您的上線狀態或將他加入您的連絡人清單？\n如果您回答否，這個人會被暫時列入黑名單。" -#: ../gtk/main.c:1138 +#: ../gtk/main.c:1136 #, c-format msgid "" "Please enter your password for username %s\n" " at realm %s:" msgstr "" -#: ../gtk/main.c:1259 +#: ../gtk/main.c:1257 msgid "Call error" msgstr "" -#: ../gtk/main.c:1262 ../coreapi/linphonecore.c:3791 +#: ../gtk/main.c:1260 ../coreapi/linphonecore.c:3826 msgid "Call ended" msgstr "通話已結束" -#: ../gtk/main.c:1265 ../coreapi/call_log.c:221 +#: ../gtk/main.c:1263 ../coreapi/call_log.c:221 msgid "Incoming call" msgstr "來電" -#: ../gtk/main.c:1267 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5 +#: ../gtk/main.c:1265 ../gtk/incall_view.c:532 ../gtk/main.ui.h:5 msgid "Answer" msgstr "接聽" -#: ../gtk/main.c:1269 ../gtk/main.ui.h:6 +#: ../gtk/main.c:1267 ../gtk/main.ui.h:6 msgid "Decline" msgstr "拒接" -#: ../gtk/main.c:1275 +#: ../gtk/main.c:1273 msgid "Call paused" msgstr "" -#: ../gtk/main.c:1275 +#: ../gtk/main.c:1273 #, c-format msgid "by %s" msgstr "" -#: ../gtk/main.c:1345 +#: ../gtk/main.c:1343 #, c-format msgid "%s proposed to start video. Do you accept ?" msgstr "" -#: ../gtk/main.c:1507 +#: ../gtk/main.c:1505 msgid "Website link" msgstr "網站連結" -#: ../gtk/main.c:1556 +#: ../gtk/main.c:1554 msgid "Linphone - a video internet phone" msgstr "Linphone - 網路視訊電話" -#: ../gtk/main.c:1648 +#: ../gtk/main.c:1646 #, c-format msgid "%s (Default)" msgstr "%s （預設值）" -#: ../gtk/main.c:1980 ../coreapi/callbacks.c:1045 +#: ../gtk/main.c:1978 ../coreapi/callbacks.c:1057 #, c-format msgid "We are transferred to %s" msgstr "我們被轉接到 %s" -#: ../gtk/main.c:1990 +#: ../gtk/main.c:1988 msgid "" "No sound cards have been detected on this computer.\n" "You won't be able to send or receive audio calls." -msgstr "" -"在這臺電腦中偵測不到音效卡。\n" -"您將無法傳送或接收語音電話。" +msgstr "在這臺電腦中偵測不到音效卡。\n您將無法傳送或接收語音電話。" -#: ../gtk/main.c:2135 +#: ../gtk/main.c:2136 msgid "A free SIP video-phone" msgstr "自由的 SIP 視訊電話" +#: ../gtk/main.c:2241 +#, c-format +msgid "Hello\n" +msgstr "" + #: ../gtk/friendlist.c:505 msgid "Add to addressbook" msgstr "" @@ -242,6 +230,10 @@ msgstr "" msgid "Search in %s directory" msgstr "在 %s 目錄中搜尋" +#: ../gtk/friendlist.c:924 +msgid "Invalid sip contact !" +msgstr "無效的 sip 連絡人！" + #: ../gtk/friendlist.c:976 #, c-format msgid "Edit contact '%s'" @@ -282,7 +274,7 @@ msgstr "參數" msgid "Enabled" msgstr "已啟用" -#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763 ../gtk/parameters.ui.h:20 +#: ../gtk/propertybox.c:622 ../gtk/propertybox.c:763 ../gtk/parameters.ui.h:17 msgid "Disabled" msgstr "已停用" @@ -388,9 +380,7 @@ msgstr "" msgid "" "A more recent version is availalble from %s.\n" "Would you like to open a browser to download it ?" -msgstr "" -"在 %s 有最新的版本。\n" -"您想要開啟瀏覽器下載它嗎？" +msgstr "在 %s 有最新的版本。\n您想要開啟瀏覽器下載它嗎？" #: ../gtk/update.c:91 msgid "You are running the lastest version." @@ -448,7 +438,7 @@ msgstr "" msgid "Enter your linphone.org username" msgstr "" -#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:82 ../gtk/ldap.ui.h:4 +#: ../gtk/setupwizard.c:102 ../gtk/parameters.ui.h:81 ../gtk/ldap.ui.h:4 msgid "Username:" msgstr "使用者名稱：" @@ -512,8 +502,7 @@ msgstr "謝謝您。您的帳號已設定完成並且可以使用。" #: ../gtk/setupwizard.c:413 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 "" @@ -837,7 +826,7 @@ msgstr "" msgid "Audio Assistant" msgstr "" -#: ../gtk/audio_assistant.c:513 ../gtk/main.ui.h:31 +#: ../gtk/audio_assistant.c:513 ../gtk/main.ui.h:32 msgid "Audio assistant" msgstr "" @@ -914,103 +903,103 @@ msgid "Default" msgstr "預設值" #: ../gtk/main.ui.h:22 +msgid "Delete" +msgstr "" + +#: ../gtk/main.ui.h:23 msgid "_Options" msgstr "選項(_O)" -#: ../gtk/main.ui.h:23 +#: ../gtk/main.ui.h:24 msgid "Set configuration URI" msgstr "" -#: ../gtk/main.ui.h:24 +#: ../gtk/main.ui.h:25 msgid "Always start video" msgstr "" -#: ../gtk/main.ui.h:25 +#: ../gtk/main.ui.h:26 msgid "Enable self-view" msgstr "啟用自拍檢視" -#: ../gtk/main.ui.h:26 +#: ../gtk/main.ui.h:27 msgid "_Help" msgstr "求助(_H)" -#: ../gtk/main.ui.h:27 +#: ../gtk/main.ui.h:28 msgid "Show debug window" msgstr "顯示除錯視窗" -#: ../gtk/main.ui.h:28 +#: ../gtk/main.ui.h:29 msgid "_Homepage" msgstr "官方網頁(_H)" -#: ../gtk/main.ui.h:29 +#: ../gtk/main.ui.h:30 msgid "Check _Updates" msgstr "檢查更新(_U)" -#: ../gtk/main.ui.h:30 +#: ../gtk/main.ui.h:31 msgid "Account assistant" msgstr "" -#: ../gtk/main.ui.h:32 +#: ../gtk/main.ui.h:33 msgid "SIP address or phone number:" msgstr "SIP 位址或電話號碼：" -#: ../gtk/main.ui.h:33 +#: ../gtk/main.ui.h:34 msgid "Initiate a new call" msgstr "打出新電話" -#: ../gtk/main.ui.h:34 +#: ../gtk/main.ui.h:35 msgid "Contacts" msgstr "連絡人" -#: ../gtk/main.ui.h:35 +#: ../gtk/main.ui.h:36 msgid "Search" msgstr "搜尋" -#: ../gtk/main.ui.h:36 +#: ../gtk/main.ui.h:37 msgid "Add contacts from directory" msgstr "從目錄加入連絡人" -#: ../gtk/main.ui.h:37 +#: ../gtk/main.ui.h:38 msgid "Add contact" msgstr "加入聯絡人" -#: ../gtk/main.ui.h:38 +#: ../gtk/main.ui.h:39 msgid "Recent calls" msgstr "" -#: ../gtk/main.ui.h:39 +#: ../gtk/main.ui.h:40 msgid "My current identity:" msgstr "我目前的使用者識別：" -#: ../gtk/main.ui.h:40 ../gtk/tunnel_config.ui.h:7 +#: ../gtk/main.ui.h:41 ../gtk/tunnel_config.ui.h:7 msgid "Username" msgstr "使用者名稱" -#: ../gtk/main.ui.h:41 ../gtk/tunnel_config.ui.h:8 +#: ../gtk/main.ui.h:42 ../gtk/tunnel_config.ui.h:8 msgid "Password" msgstr "密碼" -#: ../gtk/main.ui.h:42 +#: ../gtk/main.ui.h:43 msgid "Internet connection:" msgstr "網路連線：" -#: ../gtk/main.ui.h:43 +#: ../gtk/main.ui.h:44 msgid "Automatically log me in" msgstr "將我自動登入" -#: ../gtk/main.ui.h:44 ../gtk/password.ui.h:3 +#: ../gtk/main.ui.h:45 ../gtk/password.ui.h:3 msgid "UserID" msgstr "使用者ID" -#: ../gtk/main.ui.h:45 +#: ../gtk/main.ui.h:46 msgid "Login information" msgstr "登入資訊" -#: ../gtk/main.ui.h:46 -msgid "Welcome!" -msgstr "" - #: ../gtk/main.ui.h:47 -msgid "Delete" +msgid "Welcome!" msgstr "" #: ../gtk/about.ui.h:1 @@ -1186,299 +1175,307 @@ msgid "C" msgstr "C" #: ../gtk/parameters.ui.h:11 -msgid "SIP (UDP)" -msgstr "" - -#: ../gtk/parameters.ui.h:12 -msgid "SIP (TCP)" -msgstr "" - -#: ../gtk/parameters.ui.h:13 -msgid "SIP (TLS)" -msgstr "" - -#: ../gtk/parameters.ui.h:14 msgid "Settings" msgstr "設定值" -#: ../gtk/parameters.ui.h:15 +#: ../gtk/parameters.ui.h:12 msgid "Set Maximum Transmission Unit:" msgstr "設定最大傳輸單位:" -#: ../gtk/parameters.ui.h:16 +#: ../gtk/parameters.ui.h:13 msgid "Send DTMFs as SIP info" msgstr "傳送 DTMFs 為 SIP 資訊" -#: ../gtk/parameters.ui.h:17 -msgid "Use IPv6 instead of IPv4" -msgstr "使用 IPv6 代替 IPv4" +#: ../gtk/parameters.ui.h:14 +msgid "Allow IPv6" +msgstr "" -#: ../gtk/parameters.ui.h:18 +#: ../gtk/parameters.ui.h:15 msgid "Transport" msgstr "傳輸" -#: ../gtk/parameters.ui.h:19 +#: ../gtk/parameters.ui.h:16 msgid "SIP/UDP port" msgstr "" -#: ../gtk/parameters.ui.h:21 +#: ../gtk/parameters.ui.h:18 msgid "Random" msgstr "" -#: ../gtk/parameters.ui.h:22 +#: ../gtk/parameters.ui.h:19 msgid "SIP/TCP port" msgstr "" -#: ../gtk/parameters.ui.h:23 +#: ../gtk/parameters.ui.h:20 msgid "Audio RTP/UDP:" msgstr "音效 RTP/UDP:" -#: ../gtk/parameters.ui.h:24 +#: ../gtk/parameters.ui.h:21 msgid "Fixed" msgstr "" -#: ../gtk/parameters.ui.h:25 +#: ../gtk/parameters.ui.h:22 msgid "Video RTP/UDP:" msgstr "視訊 RTP/UDP:" -#: ../gtk/parameters.ui.h:26 +#: ../gtk/parameters.ui.h:23 msgid "Media encryption type" msgstr "" -#: ../gtk/parameters.ui.h:27 +#: ../gtk/parameters.ui.h:24 msgid "Media encryption is mandatory" msgstr "" -#: ../gtk/parameters.ui.h:28 +#: ../gtk/parameters.ui.h:25 msgid "Tunnel" msgstr "" -#: ../gtk/parameters.ui.h:29 +#: ../gtk/parameters.ui.h:26 msgid "DSCP fields" msgstr "" -#: ../gtk/parameters.ui.h:30 +#: ../gtk/parameters.ui.h:27 msgid "Network protocol and ports" msgstr "" -#: ../gtk/parameters.ui.h:31 +#: ../gtk/parameters.ui.h:28 msgid "Direct connection to the Internet" msgstr "直接連線到網際網路" -#: ../gtk/parameters.ui.h:32 +#: ../gtk/parameters.ui.h:29 msgid "Behind NAT / Firewall (specify gateway IP )" msgstr "" -#: ../gtk/parameters.ui.h:33 +#: ../gtk/parameters.ui.h:30 msgid "Behind NAT / Firewall (use STUN to resolve)" msgstr "在 NAT / 防火牆之後 (使用 STUN 解析)" -#: ../gtk/parameters.ui.h:34 +#: ../gtk/parameters.ui.h:31 msgid "Behind NAT / Firewall (use ICE)" msgstr "" -#: ../gtk/parameters.ui.h:35 +#: ../gtk/parameters.ui.h:32 msgid "Behind NAT / Firewall (use uPnP)" msgstr "" -#: ../gtk/parameters.ui.h:36 +#: ../gtk/parameters.ui.h:33 msgid "Public IP address:" msgstr "公共 IP 地址:" -#: ../gtk/parameters.ui.h:37 +#: ../gtk/parameters.ui.h:34 msgid "Stun server:" msgstr "Stun 伺服器:" -#: ../gtk/parameters.ui.h:38 +#: ../gtk/parameters.ui.h:35 msgid "NAT and Firewall" msgstr "NAT 與防火牆" -#: ../gtk/parameters.ui.h:39 +#: ../gtk/parameters.ui.h:36 msgid "Network settings" msgstr "網路設定值" -#: ../gtk/parameters.ui.h:40 +#: ../gtk/parameters.ui.h:37 msgid "Ring sound:" msgstr "鈴聲音效:" -#: ../gtk/parameters.ui.h:41 +#: ../gtk/parameters.ui.h:38 msgid "ALSA special device (optional):" msgstr "ALSA 特殊裝置 (選擇性)：" -#: ../gtk/parameters.ui.h:42 +#: ../gtk/parameters.ui.h:39 msgid "Capture device:" msgstr "捕捉裝置:" -#: ../gtk/parameters.ui.h:43 +#: ../gtk/parameters.ui.h:40 msgid "Ring device:" msgstr "響鈴裝置:" -#: ../gtk/parameters.ui.h:44 +#: ../gtk/parameters.ui.h:41 msgid "Playback device:" msgstr "播放裝置" -#: ../gtk/parameters.ui.h:45 +#: ../gtk/parameters.ui.h:42 msgid "Enable echo cancellation" msgstr "啟用回音消除" -#: ../gtk/parameters.ui.h:46 +#: ../gtk/parameters.ui.h:43 msgid "Audio" msgstr "音效" -#: ../gtk/parameters.ui.h:47 +#: ../gtk/parameters.ui.h:44 msgid "Video input device:" msgstr "視訊輸入裝置:" -#: ../gtk/parameters.ui.h:48 +#: ../gtk/parameters.ui.h:45 msgid "Prefered video resolution:" msgstr "偏好的視訊解析度:" -#: ../gtk/parameters.ui.h:49 +#: ../gtk/parameters.ui.h:46 msgid "Video output method:" msgstr "" -#: ../gtk/parameters.ui.h:50 +#: ../gtk/parameters.ui.h:47 msgid "Show camera preview" msgstr "" -#: ../gtk/parameters.ui.h:51 +#: ../gtk/parameters.ui.h:48 msgid "Video" msgstr "視訊" -#: ../gtk/parameters.ui.h:52 +#: ../gtk/parameters.ui.h:49 msgid "Multimedia settings" msgstr "多媒體設定值" -#: ../gtk/parameters.ui.h:53 +#: ../gtk/parameters.ui.h:50 msgid "This section defines your SIP address when not using a SIP account" msgstr "這一區在不使用 SIP 帳號時定義您的 SIP 位址" -#: ../gtk/parameters.ui.h:54 +#: ../gtk/parameters.ui.h:51 msgid "Your display name (eg: John Doe):" msgstr "您的顯示名稱 (例如: John Doe):" -#: ../gtk/parameters.ui.h:55 +#: ../gtk/parameters.ui.h:52 msgid "Your username:" msgstr "您的使用者名稱:" -#: ../gtk/parameters.ui.h:56 +#: ../gtk/parameters.ui.h:53 msgid "Your resulting SIP address:" msgstr "您組成的 SIP 位址:" -#: ../gtk/parameters.ui.h:57 +#: ../gtk/parameters.ui.h:54 msgid "Default identity" msgstr "預設身分識別" -#: ../gtk/parameters.ui.h:58 +#: ../gtk/parameters.ui.h:55 msgid "Wizard" msgstr "" -#: ../gtk/parameters.ui.h:59 +#: ../gtk/parameters.ui.h:56 msgid "Add" msgstr "加入" -#: ../gtk/parameters.ui.h:60 +#: ../gtk/parameters.ui.h:57 msgid "Edit" msgstr "編輯" -#: ../gtk/parameters.ui.h:61 +#: ../gtk/parameters.ui.h:58 msgid "Remove" msgstr "移除" -#: ../gtk/parameters.ui.h:62 +#: ../gtk/parameters.ui.h:59 msgid "Proxy accounts" msgstr "代理伺服器帳號" -#: ../gtk/parameters.ui.h:63 +#: ../gtk/parameters.ui.h:60 msgid "Erase all passwords" msgstr "消除所有的密碼" -#: ../gtk/parameters.ui.h:64 +#: ../gtk/parameters.ui.h:61 msgid "Privacy" msgstr "隱私" -#: ../gtk/parameters.ui.h:65 +#: ../gtk/parameters.ui.h:62 +msgid "Automatically answer when a call is received" +msgstr "" + +#: ../gtk/parameters.ui.h:63 +msgid "Auto-answer" +msgstr "" + +#: ../gtk/parameters.ui.h:64 msgid "Manage SIP Accounts" msgstr "管理 SIP 帳號" -#: ../gtk/parameters.ui.h:66 ../gtk/tunnel_config.ui.h:4 +#: ../gtk/parameters.ui.h:65 ../gtk/tunnel_config.ui.h:4 msgid "Enable" msgstr "啟用" -#: ../gtk/parameters.ui.h:67 ../gtk/tunnel_config.ui.h:5 +#: ../gtk/parameters.ui.h:66 ../gtk/tunnel_config.ui.h:5 msgid "Disable" msgstr "停用" -#: ../gtk/parameters.ui.h:68 +#: ../gtk/parameters.ui.h:67 msgid "Codecs" msgstr "編碼解碼器" -#: ../gtk/parameters.ui.h:69 +#: ../gtk/parameters.ui.h:68 msgid "0 stands for \"unlimited\"" msgstr "0 表示「不限制」" -#: ../gtk/parameters.ui.h:70 +#: ../gtk/parameters.ui.h:69 msgid "Upload speed limit in Kbit/sec:" msgstr "上傳速度限制於 Kbit/sec:" -#: ../gtk/parameters.ui.h:71 +#: ../gtk/parameters.ui.h:70 msgid "Download speed limit in Kbit/sec:" msgstr "下載速度限制於 Kbit/sec:" -#: ../gtk/parameters.ui.h:72 +#: ../gtk/parameters.ui.h:71 msgid "Enable adaptive rate control" msgstr "" -#: ../gtk/parameters.ui.h:73 +#: ../gtk/parameters.ui.h:72 msgid "" "Adaptive rate control is a technique to dynamically guess the available " "bandwidth during a call." msgstr "" -#: ../gtk/parameters.ui.h:74 +#: ../gtk/parameters.ui.h:73 msgid "Bandwidth control" msgstr "頻寬控制" -#: ../gtk/parameters.ui.h:75 +#: ../gtk/parameters.ui.h:74 msgid "Codecs" msgstr "編碼解碼器" -#: ../gtk/parameters.ui.h:76 +#: ../gtk/parameters.ui.h:75 msgid "Language" msgstr "語言" -#: ../gtk/parameters.ui.h:77 +#: ../gtk/parameters.ui.h:76 msgid "Show advanced settings" msgstr "顯示進階設定值" -#: ../gtk/parameters.ui.h:78 +#: ../gtk/parameters.ui.h:77 msgid "Level" msgstr "級數" -#: ../gtk/parameters.ui.h:79 +#: ../gtk/parameters.ui.h:78 msgid "User interface" msgstr "使用者介面" -#: ../gtk/parameters.ui.h:80 ../gtk/ldap.ui.h:2 +#: ../gtk/parameters.ui.h:79 ../gtk/ldap.ui.h:2 msgid "Server address:" msgstr "" -#: ../gtk/parameters.ui.h:81 ../gtk/ldap.ui.h:3 +#: ../gtk/parameters.ui.h:80 ../gtk/ldap.ui.h:3 msgid "Authentication method:" msgstr "" -#: ../gtk/parameters.ui.h:83 +#: ../gtk/parameters.ui.h:82 msgid "LDAP Account setup" msgstr "" -#: ../gtk/parameters.ui.h:84 +#: ../gtk/parameters.ui.h:83 msgid "LDAP" msgstr "" -#: ../gtk/parameters.ui.h:85 +#: ../gtk/parameters.ui.h:84 msgid "Done" msgstr "完成" +#: ../gtk/parameters.ui.h:85 +msgid "SIP (UDP)" +msgstr "" + +#: ../gtk/parameters.ui.h:86 +msgid "SIP (TCP)" +msgstr "" + +#: ../gtk/parameters.ui.h:87 +msgid "SIP (TLS)" +msgstr "" + #: ../gtk/buddylookup.ui.h:1 msgid "Search contacts in directory" msgstr "在目錄中搜尋" @@ -1682,11 +1679,8 @@ msgstr "" #: ../gtk/config-uri.ui.h:2 msgid "" -"This dialog allows to set an http or https address when configuration is to " -"be fetched at startup.\n" -"Please enter or modify the configuration URI below. After clicking OK, " -"Linphone will restart automatically in order to fetch and take into account " -"the new configuration. " +"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n" +"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. " msgstr "" #: ../gtk/provisioning-fetch.ui.h:1 @@ -1697,60 +1691,60 @@ msgstr "" msgid "Please wait while fetching configuration from server..." msgstr "" -#: ../coreapi/linphonecore.c:1512 +#: ../coreapi/linphonecore.c:1534 msgid "Ready" msgstr "準備就緒" -#: ../coreapi/linphonecore.c:2499 +#: ../coreapi/linphonecore.c:2534 msgid "Configuring" msgstr "" -#: ../coreapi/linphonecore.c:2673 +#: ../coreapi/linphonecore.c:2708 msgid "Looking for telephone number destination..." msgstr "尋找電話號碼目的端..." -#: ../coreapi/linphonecore.c:2675 +#: ../coreapi/linphonecore.c:2710 msgid "Could not resolve this number." msgstr "無法解析這個號碼。" #. must be known at that time -#: ../coreapi/linphonecore.c:2961 +#: ../coreapi/linphonecore.c:2996 msgid "Contacting" msgstr "正在連絡" -#: ../coreapi/linphonecore.c:2966 +#: ../coreapi/linphonecore.c:3001 msgid "Could not call" msgstr "無法通話" -#: ../coreapi/linphonecore.c:3116 +#: ../coreapi/linphonecore.c:3152 msgid "Sorry, we have reached the maximum number of simultaneous calls" msgstr "抱歉，我們已達瀏同步通話的最大數目" -#: ../coreapi/linphonecore.c:3274 +#: ../coreapi/linphonecore.c:3310 msgid "is contacting you" msgstr "正在連絡您" -#: ../coreapi/linphonecore.c:3275 +#: ../coreapi/linphonecore.c:3311 msgid " and asked autoanswer." msgstr "並要求自動接聽。" -#: ../coreapi/linphonecore.c:3399 +#: ../coreapi/linphonecore.c:3435 msgid "Modifying call parameters..." msgstr "修改通話參數..." -#: ../coreapi/linphonecore.c:3747 +#: ../coreapi/linphonecore.c:3782 msgid "Connected." msgstr "已連線。" -#: ../coreapi/linphonecore.c:3772 +#: ../coreapi/linphonecore.c:3807 msgid "Call aborted" msgstr "通話已放棄" -#: ../coreapi/linphonecore.c:3962 +#: ../coreapi/linphonecore.c:3997 msgid "Could not pause the call" msgstr "無法暫停通話" -#: ../coreapi/linphonecore.c:3965 +#: ../coreapi/linphonecore.c:4000 msgid "Pausing the current call..." msgstr "暫停目前的通話..." @@ -1818,128 +1812,125 @@ msgstr "" msgid "" "The sip proxy address you entered is invalid, it must start with \"sip:\" " "followed by a hostname." -msgstr "" -"您輸入的 sip 代理位址是無效的，它必須要以「sip:」開頭，後面接主機名稱。" +msgstr "您輸入的 sip 代理位址是無效的，它必須要以「sip:」開頭，後面接主機名稱。" #: ../coreapi/proxy.c:334 msgid "" "The sip identity you entered is invalid.\n" "It should look like sip:username@proxydomain, such as sip:alice@example.net" -msgstr "" -"您輸入的 sip 身分是無效的。\n" -"它應該看起來像 sip:使用者名稱@代理網域，像是 sip:alice@example.net" +msgstr "您輸入的 sip 身分是無效的。\n它應該看起來像 sip:使用者名稱@代理網域，像是 sip:alice@example.net" -#: ../coreapi/proxy.c:1403 +#: ../coreapi/proxy.c:1416 #, c-format msgid "Could not login as %s" msgstr "無法以 %s 登入" -#: ../coreapi/callbacks.c:419 +#: ../coreapi/callbacks.c:428 msgid "Remote ringing." msgstr "遠端響鈴。" -#: ../coreapi/callbacks.c:431 +#: ../coreapi/callbacks.c:440 msgid "Remote ringing..." msgstr "遠端響鈴..." -#: ../coreapi/callbacks.c:448 +#: ../coreapi/callbacks.c:461 msgid "Early media." msgstr "早期媒體。" -#: ../coreapi/callbacks.c:521 +#: ../coreapi/callbacks.c:533 #, c-format msgid "Call with %s is paused." msgstr "和 %s 的通話已暫停。" -#: ../coreapi/callbacks.c:534 +#: ../coreapi/callbacks.c:546 #, c-format msgid "Call answered by %s - on hold." msgstr "通話由 %s 接聽 - 保留中。" -#: ../coreapi/callbacks.c:544 +#: ../coreapi/callbacks.c:556 msgid "Call resumed." msgstr "通話已繼續。" -#: ../coreapi/callbacks.c:548 +#: ../coreapi/callbacks.c:560 #, c-format msgid "Call answered by %s." msgstr "通話由 %s 接聽。" -#: ../coreapi/callbacks.c:571 +#: ../coreapi/callbacks.c:583 msgid "Incompatible, check codecs or security settings..." msgstr "" -#: ../coreapi/callbacks.c:576 ../coreapi/callbacks.c:888 +#: ../coreapi/callbacks.c:588 ../coreapi/callbacks.c:900 msgid "Incompatible media parameters." msgstr "" -#: ../coreapi/callbacks.c:606 +#: ../coreapi/callbacks.c:618 msgid "We have been resumed." msgstr "" #. we are being paused -#: ../coreapi/callbacks.c:614 +#: ../coreapi/callbacks.c:626 msgid "We are paused by other party." msgstr "" #. reINVITE and in-dialogs UPDATE go here -#: ../coreapi/callbacks.c:648 +#: ../coreapi/callbacks.c:660 msgid "Call is updated by remote." msgstr "" -#: ../coreapi/callbacks.c:764 +#: ../coreapi/callbacks.c:776 msgid "Call terminated." msgstr "通話已終止。" -#: ../coreapi/callbacks.c:792 +#: ../coreapi/callbacks.c:804 msgid "User is busy." msgstr "使用者現正忙碌。" -#: ../coreapi/callbacks.c:793 +#: ../coreapi/callbacks.c:805 msgid "User is temporarily unavailable." msgstr "使用者暫時無法聯繫。" #. char *retrymsg=_("%s. Retry after %i minute(s)."); -#: ../coreapi/callbacks.c:795 +#: ../coreapi/callbacks.c:807 msgid "User does not want to be disturbed." msgstr "使用者不想要被打擾。" -#: ../coreapi/callbacks.c:796 +#: ../coreapi/callbacks.c:808 msgid "Call declined." msgstr "通話被拒接。" -#: ../coreapi/callbacks.c:811 +#: ../coreapi/callbacks.c:823 msgid "Request timeout." msgstr "" -#: ../coreapi/callbacks.c:842 +#: ../coreapi/callbacks.c:854 msgid "Redirected" msgstr "已重新導向" -#: ../coreapi/callbacks.c:897 +#: ../coreapi/callbacks.c:909 msgid "Call failed." msgstr "通話失敗。" -#: ../coreapi/callbacks.c:975 +#: ../coreapi/callbacks.c:987 #, c-format msgid "Registration on %s successful." msgstr "在 %s 註冊成功。" -#: ../coreapi/callbacks.c:976 +#: ../coreapi/callbacks.c:988 #, c-format msgid "Unregistration on %s done." msgstr "在 %s 取消註冊完成。" -#: ../coreapi/callbacks.c:994 +#: ../coreapi/callbacks.c:1006 msgid "no response timeout" msgstr "沒有回應逾時" -#: ../coreapi/callbacks.c:997 +#: ../coreapi/callbacks.c:1009 #, c-format msgid "Registration on %s failed: %s" msgstr "在 %s 註冊失敗：%s" -#: ../coreapi/callbacks.c:1004 +#: ../coreapi/callbacks.c:1016 msgid "Service unavailable, retrying" msgstr "" @@ -1949,7 +1940,11 @@ msgstr "" msgid "Authentication token is %s" msgstr "" -#: ../coreapi/linphonecall.c:3600 +#: ../coreapi/linphonecall.c:1305 +msgid "Call parameters were successfully modified." +msgstr "" + +#: ../coreapi/linphonecall.c:3659 #, c-format msgid "You have missed %i call." msgid_plural "You have missed %i calls." diff --git a/share/audio-assistant.desktop.in b/share/audio-assistant.desktop.in index 72c871521..7f107545d 100644 --- a/share/audio-assistant.desktop.in +++ b/share/audio-assistant.desktop.in @@ -7,6 +7,6 @@ Comment[fr]=Assistant audio de Linphone. Comment[ru]=Помощник аудио Linphone Type=Application Exec=linphone --run-audio-assistant -Icon=@prefix@/share/pixmaps/linphone/linphone.png +Icon=linphone Terminal=false Categories=Network;Telephony; diff --git a/share/linphone.desktop.in b/share/linphone.desktop.in index 748076ecf..656897a48 100644 --- a/share/linphone.desktop.in +++ b/share/linphone.desktop.in @@ -4,7 +4,7 @@ GenericName=Web-phone Comment=Linphone is a web-phone Type=Application Exec=linphone -Icon=@prefix@/share/pixmaps/linphone/linphone.png +Icon=linphone Terminal=false Categories=Network;Telephony; diff --git a/tester/call_tester.c b/tester/call_tester.c index 710696216..721f8362c 100644 --- a/tester/call_tester.c +++ b/tester/call_tester.c @@ -84,11 +84,17 @@ void call_state_changed(LinphoneCore *lc, LinphoneCall *call, LinphoneCallState void call_stats_updated(LinphoneCore *lc, LinphoneCall *call, const LinphoneCallStats *lstats) { stats* counters = get_stats(lc); + counters->number_of_LinphoneCallStatsUpdated++; if (lstats->updated == LINPHONE_CALL_STATS_RECEIVED_RTCP_UPDATE) { counters->number_of_rtcp_received++; } else if (lstats->updated == LINPHONE_CALL_STATS_SENT_RTCP_UPDATE) { counters->number_of_rtcp_sent++; } + counters->audio_download_bandwidth = linphone_call_get_audio_stats(call)->download_bandwidth; + counters->audio_upload_bandwidth = linphone_call_get_audio_stats(call)->upload_bandwidth; + counters->video_download_bandwidth = linphone_call_get_video_stats(call)->download_bandwidth; + counters->video_upload_bandwidth = linphone_call_get_video_stats(call)->upload_bandwidth; + } void linphone_call_encryption_changed(LinphoneCore *lc, LinphoneCall *call, bool_t on, const char *authentication_token) { @@ -260,7 +266,7 @@ bool_t call_with_params2(LinphoneCoreManager* caller_mgr linphone_core_accept_call_with_params(callee_mgr->lc,linphone_core_get_current_call(callee_mgr->lc),callee_params); }else if (build_callee_params){ LinphoneCallParams *default_params=linphone_core_create_call_params(callee_mgr->lc,linphone_core_get_current_call(callee_mgr->lc)); - ms_error("Created default call params with video=%i", linphone_call_params_video_enabled(default_params)); + ms_message("Created default call params with video=%i", linphone_call_params_video_enabled(default_params)); linphone_core_accept_call_with_params(callee_mgr->lc,linphone_core_get_current_call(callee_mgr->lc),default_params); linphone_call_params_destroy(default_params); }else{ @@ -1295,7 +1301,51 @@ bool_t pause_call_1(LinphoneCoreManager* mgr_1,LinphoneCall* call_1,LinphoneCore CU_ASSERT_EQUAL(linphone_call_get_state(call_2),LinphoneCallPausedByRemote); return linphone_call_get_state(call_1) == LinphoneCallPaused && linphone_call_get_state(call_2)==LinphoneCallPausedByRemote; } +#if 0 +void concurrent_paused_resumed_base() { + LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc"); + LinphoneCall* call_pauline,call_marie; + const rtp_stats_t * stats; + + CU_ASSERT_TRUE(call(pauline,marie)); + + call_pauline = linphone_core_get_current_call(pauline->lc); + call_marie = linphone_core_get_current_call(marie->lc); + + linphone_core_pause_call(pauline->lc,call_pauline); + CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallPausing,1)); + + linphone_core_pause_call(marie->lc,call_marie); + + CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallPausedByRemote,1)); + CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallPaused,1)); + + /*stay in pause a little while in order to generate traffic*/ + wait_for_until(pauline->lc, marie->lc, NULL, 5, 2000); + + linphone_core_resume_call(pauline->lc,call_pauline); + + CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallStreamsRunning,2)); + CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallStreamsRunning,2)); + /*same here: wait a while for a bit of a traffic, we need to receive a RTCP packet*/ + wait_for_until(pauline->lc, marie->lc, NULL, 5, 5000); + + /*since RTCP streams are reset when call is paused/resumed, there should be no loss at all*/ + stats = rtp_session_get_stats(call_pauline->sessions->rtp_session); + CU_ASSERT_EQUAL(stats->cum_packet_loss, 0); + + /*just to sleep*/ + linphone_core_terminate_all_calls(pauline->lc); + CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,1)); + CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1)); + + + linphone_core_manager_destroy(marie); + linphone_core_manager_destroy(pauline); +} +#endif static void call_paused_resumed_from_callee(void) { LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc"); LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc"); @@ -1614,7 +1664,7 @@ static void call_with_declined_video_using_policy(void) { call_with_declined_video_base(TRUE); } -static void video_call_base(LinphoneCoreManager* pauline,LinphoneCoreManager* marie, bool_t using_policy,LinphoneMediaEncryption mode, bool_t callee_video_enabled, bool_t caller_video_enabled) { +static void video_call_base_2(LinphoneCoreManager* pauline,LinphoneCoreManager* marie, bool_t using_policy,LinphoneMediaEncryption mode, bool_t callee_video_enabled, bool_t caller_video_enabled) { LinphoneCallTestParams caller_test_params = {0}, callee_test_params = {0}; LinphoneCall* marie_call; LinphoneCall* pauline_call; @@ -1689,12 +1739,15 @@ static void video_call_base(LinphoneCoreManager* pauline,LinphoneCoreManager* ma liblinphone_tester_check_rtcp(marie,pauline); - linphone_core_terminate_all_calls(pauline->lc); - CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,1)); - CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1)); } } +static void video_call_base(LinphoneCoreManager* pauline,LinphoneCoreManager* marie, bool_t using_policy,LinphoneMediaEncryption mode, bool_t callee_video_enabled, bool_t caller_video_enabled) { + video_call_base_2(pauline,marie,using_policy,mode,callee_video_enabled,caller_video_enabled); + linphone_core_terminate_all_calls(pauline->lc); + CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,1)); + CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1)); +} static void video_call(void) { LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc"); LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc"); @@ -2033,6 +2086,18 @@ static void srtp_call() { static void zrtp_call() { call_base(LinphoneMediaEncryptionZRTP,FALSE,FALSE,LinphonePolicyNoFirewall,FALSE); } + +static void zrtp_sas_call() { + call_base_with_configfile(LinphoneMediaEncryptionZRTP,FALSE,FALSE,LinphonePolicyNoFirewall,FALSE, "marie_zrtp_b256_rc", "pauline_zrtp_b256_rc"); + call_base_with_configfile(LinphoneMediaEncryptionZRTP,FALSE,FALSE,LinphonePolicyNoFirewall,FALSE, "marie_zrtp_b256_rc", "pauline_rc"); +} + +static void zrtp_cipher_call() { + call_base_with_configfile(LinphoneMediaEncryptionZRTP,FALSE,FALSE,LinphonePolicyNoFirewall,FALSE, "marie_zrtp_srtpsuite_aes256_rc", "pauline_zrtp_srtpsuite_aes256_rc"); + call_base_with_configfile(LinphoneMediaEncryptionZRTP,FALSE,FALSE,LinphonePolicyNoFirewall,FALSE, "marie_zrtp_aes256_rc", "pauline_zrtp_aes256_rc"); + call_base_with_configfile(LinphoneMediaEncryptionZRTP,FALSE,FALSE,LinphonePolicyNoFirewall,FALSE, "marie_zrtp_aes256_rc", "pauline_rc"); +} + static void zrtp_video_call() { call_base(LinphoneMediaEncryptionZRTP,TRUE,FALSE,LinphonePolicyNoFirewall,FALSE); } @@ -2221,9 +2286,9 @@ end: } -void call_base(LinphoneMediaEncryption mode, bool_t enable_video,bool_t enable_relay,LinphoneFirewallPolicy policy,bool_t enable_tunnel) { - LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc"); +void call_base_with_configfile(LinphoneMediaEncryption mode, bool_t enable_video,bool_t enable_relay,LinphoneFirewallPolicy policy,bool_t enable_tunnel, const char *marie_rc, const char *pauline_rc) { + LinphoneCoreManager* marie = linphone_core_manager_new(marie_rc); + LinphoneCoreManager* pauline = linphone_core_manager_new(pauline_rc); if (enable_relay) { linphone_core_set_user_agent(marie->lc,"Natted Linphone",NULL); linphone_core_set_user_agent(pauline->lc,"Natted Linphone",NULL); @@ -2270,10 +2335,10 @@ void call_base(LinphoneMediaEncryption mode, bool_t enable_video,bool_t enable_r && linphone_call_get_authentication_token(linphone_core_get_current_call(marie->lc))) { /*check SAS*/ - CU_ASSERT_STRING_EQUAL(linphone_call_get_authentication_token(linphone_core_get_current_call(pauline->lc)) - ,linphone_call_get_authentication_token(linphone_core_get_current_call(marie->lc))); - liblinphone_tester_check_rtcp(pauline,marie); - break; + CU_ASSERT_STRING_EQUAL(linphone_call_get_authentication_token(linphone_core_get_current_call(pauline->lc)) + ,linphone_call_get_authentication_token(linphone_core_get_current_call(marie->lc))); + liblinphone_tester_check_rtcp(pauline,marie); + break; } linphone_core_iterate(marie->lc); linphone_core_iterate(pauline->lc); @@ -2318,6 +2383,11 @@ void call_base(LinphoneMediaEncryption mode, bool_t enable_video,bool_t enable_r linphone_core_manager_destroy(marie); linphone_core_manager_destroy(pauline); } + +void call_base(LinphoneMediaEncryption mode, bool_t enable_video,bool_t enable_relay,LinphoneFirewallPolicy policy,bool_t enable_tunnel) { + call_base_with_configfile(mode, enable_video, enable_relay, policy, enable_tunnel, "marie_rc", "pauline_rc"); +} + #ifdef VIDEO_ENABLED static void srtp_video_ice_call(void) { call_base(LinphoneMediaEncryptionSRTP,TRUE,FALSE,LinphonePolicyUseIce,FALSE); @@ -2838,6 +2908,186 @@ static void multiple_early_media(void) { linphone_core_manager_destroy(marie2); linphone_core_manager_destroy(pauline); } + +static void check_media_direction(LinphoneCoreManager* mgr, LinphoneCall *call, MSList* lcs,LinphoneMediaDirection audio_dir, LinphoneMediaDirection video_dir) { + CU_ASSERT_PTR_NOT_NULL(call); + if (call) { + int current_recv_iframe = mgr->stat.number_of_IframeDecoded; + int expected_recv_iframe=0; + int dummy = 0; + const LinphoneCallParams *params = linphone_call_get_current_params(call); + CU_ASSERT_EQUAL(audio_dir,linphone_call_params_get_audio_direction(params)); + CU_ASSERT_EQUAL(video_dir,linphone_call_params_get_video_direction(params)); + + linphone_call_set_next_video_frame_decoded_callback(call,linphone_call_cb,mgr->lc); + linphone_call_send_vfu_request(call); + + wait_for_list(lcs,&dummy,1,2000); /*on some device, it may take 3 to 4s to get audio from mic*/ + + switch (video_dir) { + case LinphoneMediaDirectionInactive: + CU_ASSERT_TRUE(linphone_call_get_video_stats(call)->upload_bandwidth<5); + case LinphoneMediaDirectionSendOnly: + expected_recv_iframe = 0; + CU_ASSERT_TRUE(linphone_call_get_video_stats(call)->download_bandwidth<5); + break; + case LinphoneMediaDirectionRecvOnly: + CU_ASSERT_TRUE(linphone_call_get_video_stats(call)->upload_bandwidth<5); + case LinphoneMediaDirectionSendRecv: + expected_recv_iframe = 1; + break; + } + + CU_ASSERT_TRUE(wait_for_list(lcs, &mgr->stat.number_of_IframeDecoded,current_recv_iframe + expected_recv_iframe,3000)); + + switch (audio_dir) { + case LinphoneMediaDirectionInactive: + CU_ASSERT_TRUE(linphone_call_get_audio_stats(call)->upload_bandwidth<5); + case LinphoneMediaDirectionSendOnly: + CU_ASSERT_TRUE(linphone_call_get_video_stats(call)->download_bandwidth<5); + if (audio_dir == LinphoneMediaDirectionSendOnly) CU_ASSERT_TRUE(wait_for_list(lcs,&mgr->stat.audio_upload_bandwidth,70,4000)); + break; + case LinphoneMediaDirectionRecvOnly: + CU_ASSERT_TRUE(linphone_call_get_audio_stats(call)->upload_bandwidth<5); + case LinphoneMediaDirectionSendRecv: + CU_ASSERT_TRUE(wait_for_list(lcs,&mgr->stat.audio_download_bandwidth,70,4000)); + if (audio_dir == LinphoneMediaDirectionSendRecv) CU_ASSERT_TRUE(wait_for_list(lcs,&mgr->stat.audio_upload_bandwidth,70,4000)); + break; + } + } + +} + +static void accept_call_in_send_only_base(LinphoneCoreManager* pauline, LinphoneCoreManager *marie, MSList *lcs) { +#define DEFAULT_WAIT_FOR 10000 + LinphoneCallParams *params; + LinphoneVideoPolicy pol; + LinphoneCall *call; + pol.automatically_accept=1; + pol.automatically_initiate=1; + + linphone_core_enable_video(pauline->lc,TRUE,TRUE); + linphone_core_set_video_policy(pauline->lc,&pol); + linphone_core_set_video_device(pauline->lc,"Mire: Mire (synthetic moving picture)"); + + linphone_core_enable_video(marie->lc,TRUE,TRUE); + linphone_core_set_video_policy(marie->lc,&pol); + linphone_core_set_video_device(marie->lc,"Mire: Mire (synthetic moving picture)"); + + linphone_call_set_next_video_frame_decoded_callback(linphone_core_invite_address(pauline->lc,marie->identity) + ,linphone_call_cb + ,pauline->lc); + + + CU_ASSERT_TRUE(wait_for_list(lcs, &marie->stat.number_of_LinphoneCallIncomingReceived,1,DEFAULT_WAIT_FOR)); + + { + char* remote_uri = linphone_address_as_string_uri_only(pauline->identity); + call = linphone_core_find_call_from_uri(marie->lc,remote_uri); + ms_free(remote_uri); + } + + if (call) { + params=linphone_core_create_default_call_parameters(marie->lc); + linphone_call_params_set_audio_direction(params,LinphoneMediaDirectionSendOnly); + linphone_call_params_set_video_direction(params,LinphoneMediaDirectionSendOnly); + linphone_core_accept_call_with_params(marie->lc,call,params); + linphone_call_params_destroy(params); + + CU_ASSERT_TRUE(wait_for_list(lcs, &marie->stat.number_of_LinphoneCallStreamsRunning,1,DEFAULT_WAIT_FOR)); + CU_ASSERT_TRUE(wait_for_list(lcs, &pauline->stat.number_of_LinphoneCallPausedByRemote,1,DEFAULT_WAIT_FOR)); + + check_media_direction(marie,call,lcs,LinphoneMediaDirectionSendOnly,LinphoneMediaDirectionSendOnly); + } + + + call=linphone_core_get_current_call(pauline->lc); + if (call) { + check_media_direction(pauline,call,lcs,LinphoneMediaDirectionRecvOnly,LinphoneMediaDirectionRecvOnly); + } + +} +static void accept_call_in_send_base(bool_t caller_has_ice) { + int begin; + int leaked_objects; + LinphoneCoreManager *pauline, *marie; + MSList *lcs=NULL;; + + belle_sip_object_enable_leak_detector(TRUE); + begin=belle_sip_object_get_object_count(); + + pauline = linphone_core_manager_new("pauline_rc"); + if (caller_has_ice) { + linphone_core_set_stun_server(pauline->lc,"stun.linphone.org"); + linphone_core_set_firewall_policy(pauline->lc,LinphonePolicyUseIce); + } + marie = linphone_core_manager_new("marie_rc"); + + lcs=ms_list_append(lcs,pauline->lc); + lcs=ms_list_append(lcs,marie->lc); + + accept_call_in_send_only_base(pauline,marie,lcs); + + + end_call(marie,pauline); + ms_free(lcs); + linphone_core_manager_destroy(marie); + linphone_core_manager_destroy(pauline); + + leaked_objects=belle_sip_object_get_object_count()-begin; + + CU_ASSERT_TRUE(leaked_objects==0); + if (leaked_objects>0){ + belle_sip_object_dump_active_objects(); + } +} + +static void accept_call_in_send_only(void) { + accept_call_in_send_base(FALSE); +} + +static void accept_call_in_send_only_with_ice(void) { + accept_call_in_send_base(TRUE); +} + +void two_accepted_call_in_send_only() { + int begin; + int leaked_objects; + LinphoneCoreManager *pauline, *marie, *laure; + MSList *lcs=NULL; + + belle_sip_object_enable_leak_detector(TRUE); + begin=belle_sip_object_get_object_count(); + + pauline = linphone_core_manager_new("pauline_rc"); + marie = linphone_core_manager_new("marie_rc"); + laure = linphone_core_manager_new("laure_rc"); + + lcs=ms_list_append(lcs,pauline->lc); + lcs=ms_list_append(lcs,marie->lc); + lcs=ms_list_append(lcs,laure->lc); + + accept_call_in_send_only_base(pauline,marie,lcs); + + + reset_counters(&marie->stat); + accept_call_in_send_only_base(laure,marie,lcs); + + end_call(marie,pauline); + end_call(laure,marie); + + linphone_core_manager_destroy(marie); + linphone_core_manager_destroy(pauline); + linphone_core_manager_destroy(laure); + + leaked_objects=belle_sip_object_get_object_count()-begin; + + CU_ASSERT_TRUE(leaked_objects==0); + if (leaked_objects>0){ + belle_sip_object_dump_active_objects(); + } + +} #endif static char *create_filepath(const char *dir, const char *filename, const char *ext) { @@ -3501,6 +3751,87 @@ static void call_with_transport_change_after_released(void) { static void unsucessfull_call_with_transport_change_after_released(void) { call_with_transport_change_base(FALSE); } +#ifdef VIDEO_ENABLED + +static void video_call_with_re_invite_inactive_followed_by_re_invite_base(bool_t no_sdp) { + int begin; + int leaked_objects; + LinphoneCoreManager* marie; + LinphoneCoreManager* pauline; + LinphoneCallParams *params; + MSList *lcs=NULL; + + belle_sip_object_enable_leak_detector(TRUE); + begin=belle_sip_object_get_object_count(); + + marie = linphone_core_manager_new( "marie_rc"); + pauline = linphone_core_manager_new( "pauline_rc"); + linphone_core_set_avpf_mode(pauline->lc,TRUE); + linphone_core_set_video_device(pauline->lc,"Mire: Mire (synthetic moving picture)"); + linphone_core_set_video_device(marie->lc,"Mire: Mire (synthetic moving picture)"); + linphone_core_set_avpf_mode(marie->lc,TRUE); + lcs=ms_list_append(lcs,pauline->lc); + lcs=ms_list_append(lcs,marie->lc); + + video_call_base_2(marie,pauline,TRUE,LinphoneMediaEncryptionNone,TRUE,TRUE); + + if (linphone_core_get_current_call(marie->lc)) { + params=linphone_core_create_call_params(marie->lc,linphone_core_get_current_call(marie->lc)); + linphone_call_params_set_audio_direction(params,LinphoneMediaDirectionInactive); + linphone_call_params_set_video_direction(params,LinphoneMediaDirectionInactive); + + linphone_core_update_call(marie->lc, linphone_core_get_current_call(marie->lc),params); + linphone_call_params_destroy(params); + + CU_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&marie->stat.number_of_LinphoneCallUpdating,1)); + CU_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&marie->stat.number_of_LinphoneCallPaused,1)); + CU_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&pauline->stat.number_of_LinphoneCallPausedByRemote,1)); + + check_media_direction(marie,linphone_core_get_current_call(marie->lc),lcs,LinphoneMediaDirectionInactive,LinphoneMediaDirectionInactive); + check_media_direction(pauline,linphone_core_get_current_call(pauline->lc), lcs, LinphoneMediaDirectionInactive, LinphoneMediaDirectionInactive); + + if (no_sdp) { + linphone_core_enable_sdp_200_ack(marie->lc,TRUE); + } + + /* + currently update call cannot be used in paused state, might not be good. + params=linphone_core_create_call_params(marie->lc,linphone_core_get_current_call(marie->lc)); + linphone_call_params_set_audio_direction(params,LinphoneMediaDirectionSendRecv); + linphone_call_params_set_video_direction(params,LinphoneMediaDirectionSendRecv); + linphone_core_update_call(marie->lc,linphone_core_get_current_call(marie->lc),params); + linphone_call_params_destroy(params); + */ + + linphone_core_resume_call(marie->lc,linphone_core_get_current_call(marie->lc)); + + CU_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&marie->stat.number_of_LinphoneCallResuming,1)); + CU_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&marie->stat.number_of_LinphoneCallStreamsRunning,2)); + CU_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&pauline->stat.number_of_LinphoneCallStreamsRunning,2)); + + check_media_direction(marie,linphone_core_get_current_call(marie->lc),lcs,LinphoneMediaDirectionSendRecv,LinphoneMediaDirectionSendRecv); + check_media_direction(pauline,linphone_core_get_current_call(pauline->lc),lcs,LinphoneMediaDirectionSendRecv,LinphoneMediaDirectionSendRecv); + + } + end_call(marie,pauline); + linphone_core_manager_destroy(marie); + linphone_core_manager_destroy(pauline); + + leaked_objects=belle_sip_object_get_object_count()-begin; + CU_ASSERT_TRUE(leaked_objects==0); + if (leaked_objects>0){ + belle_sip_object_dump_active_objects(); + } +} + +static void video_call_with_re_invite_inactive_followed_by_re_invite() { + video_call_with_re_invite_inactive_followed_by_re_invite_base(FALSE); +} + +static void video_call_with_re_invite_inactive_followed_by_re_invite_no_sdp() { + video_call_with_re_invite_inactive_followed_by_re_invite_base(TRUE); +} +#endif test_t call_tests[] = { { "Phone number normalization", phone_number_normalization }, @@ -3534,6 +3865,8 @@ test_t call_tests[] = { { "Call paused resumed from callee", call_paused_resumed_from_callee }, { "SRTP call", srtp_call }, { "ZRTP call",zrtp_call}, + { "ZRTP SAS call",zrtp_sas_call}, + { "ZRTP Cipher call",zrtp_cipher_call}, { "DTLS SRTP call",dtls_srtp_call}, { "DTLS SRTP call with media relay", dtls_srtp_call_with_media_realy}, { "ZRTP video call",zrtp_video_call}, @@ -3567,6 +3900,11 @@ test_t call_tests[] = { { "DTLS SRTP ice video call",dtls_srtp_ice_video_call}, { "DTLS SRTP ice video call with relay",dtls_srtp_ice_video_call_with_relay}, { "Video call with limited bandwidth", video_call_limited_bandwidth}, + { "Video call accepted in send only", accept_call_in_send_only}, + { "Video call accepted in send only with ice", accept_call_in_send_only_with_ice}, + { "2 Video call accepted in send only", two_accepted_call_in_send_only}, + { "Video call with re-invite(inactive) followed by re-invite", video_call_with_re_invite_inactive_followed_by_re_invite}, + { "Video call with re-invite(inactive) followed by re-invite(no sdp)", video_call_with_re_invite_inactive_followed_by_re_invite_no_sdp}, #endif { "SRTP ice call", srtp_ice_call }, { "ZRTP ice call", zrtp_ice_call }, @@ -3606,6 +3944,7 @@ test_t call_tests[] = { { "Call with generic CN", call_with_generic_cn }, { "Call with transport change after released", call_with_transport_change_after_released }, { "Unsuccessful call with transport change after released",unsucessfull_call_with_transport_change_after_released} + }; test_suite_t call_test_suite = { diff --git a/tester/common/bc_tester_utils.c b/tester/common/bc_tester_utils.c index b66ca7935..077ec0569 100644 --- a/tester/common/bc_tester_utils.c +++ b/tester/common/bc_tester_utils.c @@ -115,7 +115,7 @@ int bc_tester_nb_tests(const char *suite_name) { void bc_tester_list_suites() { int j; for(j=0;jpName); + tester_printf(verbosity_error,"Suite initialization failed for [%s]", pSuite->pName); } static void suite_cleanup_failure_message_handler(const CU_pSuite pSuite) { - tester_printf(verbosity_error,"Suite cleanup failed for [%s].", pSuite->pName); + tester_printf(verbosity_error,"Suite cleanup failed for [%s]", pSuite->pName); } #ifdef HAVE_CU_GET_SUITE static void suite_start_message_handler(const CU_pSuite pSuite) { - tester_printf(verbosity_info,"Suite [%s] started\n", pSuite->pName); + tester_printf(verbosity_info,"Suite [%s] started", pSuite->pName); } static void suite_complete_message_handler(const CU_pSuite pSuite, const CU_pFailureRecord pFailure) { - tester_printf(verbosity_info,"Suite [%s] ended\n", pSuite->pName); + tester_printf(verbosity_info,"Suite [%s] ended", pSuite->pName); } static void test_start_message_handler(const CU_pTest pTest, const CU_pSuite pSuite) { @@ -160,22 +160,23 @@ static void test_complete_message_handler(const CU_pTest pTest, const CU_pSuite pSuite, const CU_pFailureRecord pFailureList) { int i; - char * result = malloc(sizeof(char)*2048);//not very pretty but... + char result[2048]; + char buffer[2048]; CU_pFailureRecord pFailure = pFailureList; - sprintf(result, "Suite [%s] Test [%s]", pSuite->pName, pTest->pName); + snprintf(result, sizeof(result), "Suite [%s] Test [%s]", pSuite->pName, pTest->pName); if (pFailure) { strncat(result, " failed:", strlen(" failed:")); for (i = 1 ; (NULL != pFailure) ; pFailure = pFailure->pNext, i++) { - sprintf(result, "%s\n %d. %s:%u - %s", result, i, + snprintf(buffer, sizeof(buffer), "\n %d. %s:%u - %s", i, (NULL != pFailure->strFileName) ? pFailure->strFileName : "", pFailure->uiLineNumber, (NULL != pFailure->strCondition) ? pFailure->strCondition : ""); + strncat(result, buffer, strlen(buffer)); } } else { strncat(result, " passed", strlen(" passed")); } tester_printf(verbosity_info,"%s\n", result); - free(result); } #endif @@ -252,7 +253,7 @@ int bc_tester_run_tests(const char *suite_name, const char *test_name) { void bc_tester_helper(const char *name, const char* additionnal_helper) { - fprintf(stdout,"%s --help\n" + tester_printf(verbosity_info,"%s --help\n" "\t\t\t--list-suites\n" "\t\t\t--list-tests \n" "\t\t\t--suite \n" @@ -277,7 +278,6 @@ void bc_tester_init(void (*ftester_printf)(int level, const char *fmt, va_list a int bc_tester_parse_args(int argc, char **argv, int argid) { int i = argid; - if (strcmp(argv[i],"--help")==0){ return -1; } else if (strcmp(argv[i],"--test")==0){ @@ -301,12 +301,12 @@ int bc_tester_parse_args(int argc, char **argv, int argid) } else if (strcmp(argv[i], "--xml") == 0){ xml_enabled = 1; }else { - fprintf(stderr, "Unknown option \"%s\"\n", argv[i]); + tester_printf(verbosity_error, "Unknown option \"%s\"\n", argv[i]); return -1; } if( xml_enabled && (suite_name || test_name) ){ - fprintf(stderr, "Cannot use both XML and specific test suite\n"); + tester_printf(verbosity_error, "Cannot use both XML and specific test suite\n"); return -1; } @@ -317,8 +317,9 @@ int bc_tester_parse_args(int argc, char **argv, int argid) int bc_tester_start() { int ret; if( xml_enabled ){ - char * xml_tmp_file = malloc(sizeof(char) * (strlen(xml_file) + strlen(".tmp") + 1)); - sprintf(xml_tmp_file, "%s.tmp", xml_file); + size_t size = strlen(xml_file) + strlen(".tmp") + 1; + char * xml_tmp_file = malloc(sizeof(char) * size); + snprintf(xml_tmp_file, size, "%s.tmp", xml_file); CU_set_output_filename(xml_tmp_file); free(xml_tmp_file); } @@ -342,14 +343,16 @@ void bc_tester_uninit() { /* Redisplay list of failed tests on end */ if (CU_get_number_of_failure_records()){ CU_basic_show_failures(CU_get_failure_list()); - tester_printf(verbosity_info,""); /*add missing final newline*/ } CU_cleanup_registry(); + /*add missing final newline*/ + tester_printf(verbosity_info,""); if( xml_enabled ){ /*create real xml file only if tester did not crash*/ - char * xml_tmp_file = malloc(sizeof(char) * (strlen(xml_file) + strlen(".tmp-Results.xml") + 1)); - sprintf(xml_tmp_file, "%s.tmp-Results.xml", xml_file); + size_t size = strlen(xml_file) + strlen(".tmp-Results.xml") + 1; + char * xml_tmp_file = malloc(sizeof(char) * size); + snprintf(xml_tmp_file, size, "%s.tmp-Results.xml", xml_file); rename(xml_tmp_file, xml_file); free(xml_tmp_file); } diff --git a/tester/liblinphone_tester.c b/tester/liblinphone_tester.c index f8528943f..0469b3675 100644 --- a/tester/liblinphone_tester.c +++ b/tester/liblinphone_tester.c @@ -30,7 +30,6 @@ static FILE * log_file = NULL; -static OrtpLogFunc ortp_log_handler; #ifdef ANDROID @@ -132,23 +131,35 @@ static void liblinphone_tester_qnx_log_handler(OrtpLogLevel lev, const char *fmt #endif /* __QNX__ */ static void log_handler(int lev, const char *fmt, va_list args) { - ortp_set_log_file(stderr); - ortp_log_handler(lev, fmt, args); +#ifdef WIN32 + vfprintf(lev == ORTP_ERROR ? stderr : stdout, fmt, args); + fprintf(lev == ORTP_ERROR ? stderr : stdout, "\n"); +#else + va_list cap; + va_copy(cap,args); +#ifdef ANDROID + /* IMPORTANT: needed by liblinphone tester to retrieve suite list...*/ + cunit_android_trace_handler(lev == ORTP_ERROR, fmt, cap); +#else + /* Otherwise, we must use stdio to avoid log formatting (for autocompletion etc.) */ + vfprintf(lev == ORTP_ERROR ? stderr : stdout, fmt, cap); + fprintf(lev == ORTP_ERROR ? stderr : stdout, "\n"); +#endif + va_end(cap); +#endif if (log_file){ - ortp_set_log_file(log_file); - ortp_log_handler(lev, fmt, args); + ortp_logv_out(lev, fmt, args); } } void liblinphone_tester_init(void) { - ortp_log_handler = ortp_get_log_handler(); + if (! log_file) { #if defined(ANDROID) - linphone_core_set_log_handler(liblinphone_android_ortp_log_handler); + linphone_core_set_log_handler(liblinphone_android_ortp_log_handler); #elif defined(__QNX__) - linphone_core_set_log_handler(liblinphone_tester_qnx_log_handler); -#else - linphone_core_set_log_handler(ortp_logv_out); + linphone_core_set_log_handler(liblinphone_tester_qnx_log_handler); #endif + } bc_tester_init(log_handler, ORTP_MESSAGE, ORTP_ERROR); liblinphone_tester_add_suites(); @@ -186,9 +197,9 @@ int main (int argc, char *argv[]) for(i = 1; i < argc; ++i) { if (strcmp(argv[i], "--verbose") == 0) { - linphone_core_set_log_level(ORTP_MESSAGE); + linphone_core_set_log_level_mask(ORTP_MESSAGE|ORTP_WARNING|ORTP_ERROR|ORTP_FATAL); } else if (strcmp(argv[i], "--silent") == 0) { - linphone_core_set_log_level(ORTP_FATAL); + linphone_core_set_log_level_mask(ORTP_FATAL); } else if (strcmp(argv[i],"--log-file")==0){ CHECK_ARG("--log-file", ++i, argc); log_file=fopen(argv[i],"w"); @@ -197,6 +208,7 @@ int main (int argc, char *argv[]) return -2; } else { ms_message("Redirecting traces to file [%s]",argv[i]); + ortp_set_log_file(log_file); } } else if (strcmp(argv[i],"--domain")==0){ CHECK_ARG("--domain", ++i, argc); diff --git a/tester/liblinphone_tester.h b/tester/liblinphone_tester.h index 1c9ff34b4..72e6abd99 100644 --- a/tester/liblinphone_tester.h +++ b/tester/liblinphone_tester.h @@ -202,6 +202,7 @@ typedef struct _stats { char * dtmf_list_received; int dtmf_count; + int number_of_LinphoneCallStatsUpdated; int number_of_rtcp_sent; int number_of_rtcp_received; @@ -211,6 +212,10 @@ typedef struct _stats { int number_of_LinphoneCoreLogCollectionUploadStateDelivered; int number_of_LinphoneCoreLogCollectionUploadStateNotDelivered; int number_of_LinphoneCoreLogCollectionUploadStateInProgress; + int audio_download_bandwidth; + int audio_upload_bandwidth; + int video_download_bandwidth; + int video_upload_bandwidth; }stats; @@ -297,6 +302,7 @@ void liblinphone_tester_enable_ipv6(bool_t enabled); void linphone_call_cb(LinphoneCall *call,void * user_data); void call_paused_resumed_base(bool_t multicast); void simple_call_base(bool_t enable_multicast_recv_side); +void call_base_with_configfile(LinphoneMediaEncryption mode, bool_t enable_video,bool_t enable_relay,LinphoneFirewallPolicy policy,bool_t enable_tunnel, const char *marie_rc, const char *pauline_rc); void call_base(LinphoneMediaEncryption mode, bool_t enable_video,bool_t enable_relay,LinphoneFirewallPolicy policy,bool_t enable_tunnel); bool_t call_with_caller_params(LinphoneCoreManager* caller_mgr,LinphoneCoreManager* callee_mgr, const LinphoneCallParams *params); bool_t pause_call_1(LinphoneCoreManager* mgr_1,LinphoneCall* call_1,LinphoneCoreManager* mgr_2,LinphoneCall* call_2); diff --git a/tester/log_collection_tester.c b/tester/log_collection_tester.c index 4bd5cb55e..9a5d8b179 100644 --- a/tester/log_collection_tester.c +++ b/tester/log_collection_tester.c @@ -143,11 +143,29 @@ static FILE* gzuncompress(const char* filepath) { } #endif +static time_t get_current_time() { + struct timeval tp; + struct tm *lt; +#ifndef WIN32 + struct tm tmbuf; +#endif + time_t tt; + ortp_gettimeofday(&tp,NULL); + tt = (time_t)tp.tv_sec; + +#ifdef WIN32 + lt = localtime(&tt); +#else + lt = localtime_r(&tt,&tmbuf); +#endif + return mktime(lt); +} + static time_t check_file(LinphoneCoreManager* mgr) { - time_t last_log = ms_time(NULL); + time_t cur_time = get_current_time(); char* filepath = linphone_core_compress_log_collection(mgr->lc); - time_t time_curr = -1; + time_t log_time = -1; uint32_t timediff = 0; FILE *file = NULL; @@ -159,7 +177,7 @@ static time_t check_file(LinphoneCoreManager* mgr) { size_t line_size = 256; #ifndef WIN32 struct tm tm_curr = {0}; - time_t time_prev = -1; + time_t time_prev = 0; #endif #if HAVE_ZLIB @@ -182,10 +200,13 @@ static time_t check_file(LinphoneCoreManager* mgr) { if (strlen(line) > 24) { char date[24] = {'\0'}; memcpy(date, line, 23); + /*reset tm_curr to reset milliseconds and below fields*/ + memset(&tm_curr, 0, sizeof(struct tm)); if (strptime(date, "%Y-%m-%d %H:%M:%S", &tm_curr) != NULL) { - time_curr = mktime(&tm_curr); - CU_ASSERT_TRUE(time_curr >= time_prev); - time_prev = time_curr; + tm_curr.tm_isdst = -1; // LOL + log_time = mktime(&tm_curr); + CU_ASSERT_TRUE(log_time >= time_prev); + time_prev = log_time; } } #endif @@ -196,19 +217,27 @@ static time_t check_file(LinphoneCoreManager* mgr) { ms_free(filepath); - timediff = labs((long int)time_curr - (long int)last_log); + timediff = labs((long int)log_time - (long int)cur_time); (void)timediff; #ifndef WIN32 CU_ASSERT_TRUE( timediff <= 1 ); if( !(timediff <= 1) ){ - ms_error("time_curr: %ld, last_log: %ld timediff: %u", (long int)time_curr, (long int)last_log, timediff ); + char buffers[2][128] = {{0}}; + strftime(buffers[0], sizeof(buffers[0]), "%Y-%m-%d %H:%M:%S", localtime(&log_time)); + strftime(buffers[1], sizeof(buffers[1]), "%Y-%m-%d %H:%M:%S", localtime(&cur_time)); + + ms_error("log_time: %ld (%s), cur_time: %ld (%s) timediff: %u" + , (long int)log_time, buffers[0] + , (long int)cur_time, buffers[1] + , timediff + ); } #else ms_warning("strptime() not available for this platform, test is incomplete."); #endif } // return latest time in file - return time_curr; + return log_time; } static void collect_files_disabled() { diff --git a/tester/offeranswer_tester.c b/tester/offeranswer_tester.c index 0a659aaf3..8225faf9d 100644 --- a/tester/offeranswer_tester.c +++ b/tester/offeranswer_tester.c @@ -197,10 +197,14 @@ static void profile_call_base(bool_t avpf1, LinphoneMediaEncryption srtp1,bool_t CU_ASSERT_TRUE(call(marie, pauline)); CU_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallStreamsRunning, 1)); CU_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallStreamsRunning, 1)); - params = linphone_call_get_current_params(linphone_core_get_current_call(marie->lc)); - CU_ASSERT_STRING_EQUAL(linphone_call_params_get_rtp_profile(params), expected_profile); - params = linphone_call_get_current_params(linphone_core_get_current_call(pauline->lc)); - CU_ASSERT_STRING_EQUAL(linphone_call_params_get_rtp_profile(params), expected_profile); + if (linphone_core_get_current_call(marie->lc)) { + params = linphone_call_get_current_params(linphone_core_get_current_call(marie->lc)); + CU_ASSERT_STRING_EQUAL(linphone_call_params_get_rtp_profile(params), expected_profile); + } + if (linphone_core_get_current_call(pauline->lc)) { + params = linphone_call_get_current_params(linphone_core_get_current_call(pauline->lc)); + CU_ASSERT_STRING_EQUAL(linphone_call_params_get_rtp_profile(params), expected_profile); + } linphone_core_terminate_all_calls(marie->lc); CU_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallEnd, 1)); diff --git a/tester/rcfiles/laure_rc b/tester/rcfiles/laure_rc index 9156afc39..2b6ce617a 100644 --- a/tester/rcfiles/laure_rc +++ b/tester/rcfiles/laure_rc @@ -30,7 +30,7 @@ video_rtp_port=9410-9910 display=0 capture=0 show_local=0 -size=vga +size=qcif enabled=0 self_view=0 automatically_initiate=0 diff --git a/tester/rcfiles/marie_rc b/tester/rcfiles/marie_rc index 536725564..5dec5f724 100644 --- a/tester/rcfiles/marie_rc +++ b/tester/rcfiles/marie_rc @@ -39,7 +39,7 @@ video_rtp_port=28070-38000 display=0 capture=0 show_local=0 -size=vga +size=qcif enabled=0 self_view=0 automatically_initiate=0 diff --git a/tester/rcfiles/marie_zrtp_aes256_rc b/tester/rcfiles/marie_zrtp_aes256_rc new file mode 100644 index 000000000..6bf6d2612 --- /dev/null +++ b/tester/rcfiles/marie_zrtp_aes256_rc @@ -0,0 +1,54 @@ +[sip] +sip_port=-1 +sip_tcp_port=-1 +sip_tls_port=-1 +default_proxy=0 +ping_with_options=0 +register_only_when_network_is_up=0 +composing_idle_timeout=1 +zrtp_cipher_suites=MS_ZRTP_CIPHER_AES3,MS_ZRTP_CIPHER_AES1 + +[auth_info_0] +username=marie +userid=marie +passwd=secret +realm=sip.example.org + + +[proxy_0] +reg_proxy=sip.example.org;transport=tcp +reg_route=sip.example.org;transport=tcp;lr +reg_identity="Super Marie" +reg_expires=3600 +reg_sendregister=1 +publish=0 +dial_escape_plus=0 +quality_reporting_collector=sip:collector@sip.example.org +quality_reporting_enabled=1 + +[friend_0] +url="Paupoche" +pol=accept +subscribe=0 + + +[rtp] +audio_rtp_port=18070-28000 +video_rtp_port=28070-38000 + +[video] +display=0 +capture=0 +show_local=0 +size=qcif +enabled=0 +self_view=0 +automatically_initiate=0 +automatically_accept=0 +device=StaticImage: Static picture + +[sound] +echocancellation=0 #to not overload cpu in case of VG + +[net] +dns_srv_enabled=0 #no srv needed in general diff --git a/tester/rcfiles/marie_zrtp_b256_rc b/tester/rcfiles/marie_zrtp_b256_rc new file mode 100644 index 000000000..b7cfca0a4 --- /dev/null +++ b/tester/rcfiles/marie_zrtp_b256_rc @@ -0,0 +1,54 @@ +[sip] +sip_port=-1 +sip_tcp_port=-1 +sip_tls_port=-1 +default_proxy=0 +ping_with_options=0 +register_only_when_network_is_up=0 +composing_idle_timeout=1 +zrtp_sas_suites=MS_ZRTP_SAS_B256 + +[auth_info_0] +username=marie +userid=marie +passwd=secret +realm=sip.example.org + + +[proxy_0] +reg_proxy=sip.example.org;transport=tcp +reg_route=sip.example.org;transport=tcp;lr +reg_identity="Super Marie" +reg_expires=3600 +reg_sendregister=1 +publish=0 +dial_escape_plus=0 +quality_reporting_collector=sip:collector@sip.example.org +quality_reporting_enabled=1 + +[friend_0] +url="Paupoche" +pol=accept +subscribe=0 + + +[rtp] +audio_rtp_port=18070-28000 +video_rtp_port=28070-38000 + +[video] +display=0 +capture=0 +show_local=0 +size=qcif +enabled=0 +self_view=0 +automatically_initiate=0 +automatically_accept=0 +device=StaticImage: Static picture + +[sound] +echocancellation=0 #to not overload cpu in case of VG + +[net] +dns_srv_enabled=0 #no srv needed in general diff --git a/tester/rcfiles/marie_zrtp_srtpsuite_aes256_rc b/tester/rcfiles/marie_zrtp_srtpsuite_aes256_rc new file mode 100644 index 000000000..e966e59c2 --- /dev/null +++ b/tester/rcfiles/marie_zrtp_srtpsuite_aes256_rc @@ -0,0 +1,54 @@ +[sip] +sip_port=-1 +sip_tcp_port=-1 +sip_tls_port=-1 +default_proxy=0 +ping_with_options=0 +register_only_when_network_is_up=0 +composing_idle_timeout=1 +srtp_crypto_suites=AES_CM_256_HMAC_SHA1_80,AES_CM_256_HMAC_SHA1_32 + +[auth_info_0] +username=marie +userid=marie +passwd=secret +realm=sip.example.org + + +[proxy_0] +reg_proxy=sip.example.org;transport=tcp +reg_route=sip.example.org;transport=tcp;lr +reg_identity="Super Marie" +reg_expires=3600 +reg_sendregister=1 +publish=0 +dial_escape_plus=0 +quality_reporting_collector=sip:collector@sip.example.org +quality_reporting_enabled=1 + +[friend_0] +url="Paupoche" +pol=accept +subscribe=0 + + +[rtp] +audio_rtp_port=18070-28000 +video_rtp_port=28070-38000 + +[video] +display=0 +capture=0 +show_local=0 +size=qcif +enabled=0 +self_view=0 +automatically_initiate=0 +automatically_accept=0 +device=StaticImage: Static picture + +[sound] +echocancellation=0 #to not overload cpu in case of VG + +[net] +dns_srv_enabled=0 #no srv needed in general diff --git a/tester/rcfiles/pauline_rc b/tester/rcfiles/pauline_rc index 35ad8c36f..f8cffd4b3 100644 --- a/tester/rcfiles/pauline_rc +++ b/tester/rcfiles/pauline_rc @@ -36,7 +36,7 @@ video_rtp_port=39072-49000 display=0 capture=0 show_local=0 -size=vga +size=qcif enabled=0 self_view=0 automatically_initiate=0 diff --git a/tester/rcfiles/pauline_zrtp_aes256_rc b/tester/rcfiles/pauline_zrtp_aes256_rc new file mode 100644 index 000000000..470432c99 --- /dev/null +++ b/tester/rcfiles/pauline_zrtp_aes256_rc @@ -0,0 +1,51 @@ +[sip] +sip_port=-1 +sip_tcp_port=-1 +sip_tls_port=-1 +default_proxy=0 +ping_with_options=0 +register_only_when_network_is_up=0 +composing_idle_timeout=1 +zrtp_cipher_suites=MS_ZRTP_CIPHER_AES3,MS_ZRTP_CIPHER_AES1 + +[auth_info_0] +username=pauline +userid=pauline +passwd=secret +realm=sip.example.org + + +[proxy_0] +reg_proxy=sip2.linphone.org;transport=tls +reg_route=sip2.linphone.org;transport=tls +reg_identity=sip:pauline@sip.example.org +reg_expires=3600 +reg_sendregister=1 +publish=0 +dial_escape_plus=0 + +#[friend_0] +#url="Mariette" +#pol=accept +#subscribe=0 + +[rtp] +audio_rtp_port=18070-28000 +video_rtp_port=39072-49000 + +[video] +display=0 +capture=0 +show_local=0 +size=qcif +enabled=0 +self_view=0 +automatically_initiate=0 +automatically_accept=0 +device=StaticImage: Static picture + +[sound] +echocancellation=0 #to not overload cpu in case of VG + +[net] +dns_srv_enabled=0 #no srv needed in general diff --git a/tester/rcfiles/pauline_zrtp_b256_rc b/tester/rcfiles/pauline_zrtp_b256_rc new file mode 100644 index 000000000..e2d6ce14b --- /dev/null +++ b/tester/rcfiles/pauline_zrtp_b256_rc @@ -0,0 +1,51 @@ +[sip] +sip_port=-1 +sip_tcp_port=-1 +sip_tls_port=-1 +default_proxy=0 +ping_with_options=0 +register_only_when_network_is_up=0 +composing_idle_timeout=1 +zrtp_sas_suites=MS_ZRTP_SAS_B256 + +[auth_info_0] +username=pauline +userid=pauline +passwd=secret +realm=sip.example.org + + +[proxy_0] +reg_proxy=sip2.linphone.org;transport=tls +reg_route=sip2.linphone.org;transport=tls +reg_identity=sip:pauline@sip.example.org +reg_expires=3600 +reg_sendregister=1 +publish=0 +dial_escape_plus=0 + +#[friend_0] +#url="Mariette" +#pol=accept +#subscribe=0 + +[rtp] +audio_rtp_port=18070-28000 +video_rtp_port=39072-49000 + +[video] +display=0 +capture=0 +show_local=0 +size=qcif +enabled=0 +self_view=0 +automatically_initiate=0 +automatically_accept=0 +device=StaticImage: Static picture + +[sound] +echocancellation=0 #to not overload cpu in case of VG + +[net] +dns_srv_enabled=0 #no srv needed in general diff --git a/tester/rcfiles/pauline_zrtp_srtpsuite_aes256_rc b/tester/rcfiles/pauline_zrtp_srtpsuite_aes256_rc new file mode 100644 index 000000000..08ba14da8 --- /dev/null +++ b/tester/rcfiles/pauline_zrtp_srtpsuite_aes256_rc @@ -0,0 +1,51 @@ +[sip] +sip_port=-1 +sip_tcp_port=-1 +sip_tls_port=-1 +default_proxy=0 +ping_with_options=0 +register_only_when_network_is_up=0 +composing_idle_timeout=1 +srtp_crypto_suites=AES_CM_256_HMAC_SHA1_80,AES_CM_256_HMAC_SHA1_32 + +[auth_info_0] +username=pauline +userid=pauline +passwd=secret +realm=sip.example.org + + +[proxy_0] +reg_proxy=sip2.linphone.org;transport=tls +reg_route=sip2.linphone.org;transport=tls +reg_identity=sip:pauline@sip.example.org +reg_expires=3600 +reg_sendregister=1 +publish=0 +dial_escape_plus=0 + +#[friend_0] +#url="Mariette" +#pol=accept +#subscribe=0 + +[rtp] +audio_rtp_port=18070-28000 +video_rtp_port=39072-49000 + +[video] +display=0 +capture=0 +show_local=0 +size=qcif +enabled=0 +self_view=0 +automatically_initiate=0 +automatically_accept=0 +device=StaticImage: Static picture + +[sound] +echocancellation=0 #to not overload cpu in case of VG + +[net] +dns_srv_enabled=0 #no srv needed in general diff --git a/tester/tester.c b/tester/tester.c index f63562f71..fe3054c0b 100644 --- a/tester/tester.c +++ b/tester/tester.c @@ -259,6 +259,23 @@ LinphoneCoreManager* linphone_core_manager_init(const char* rc_file) { linphone_core_set_ringback(mgr->lc, NULL); #endif +#ifdef VIDEO_ENABLED + { + MSWebCam *cam; + + cam = ms_web_cam_manager_get_cam(ms_web_cam_manager_get(), "Mire: Mire (synthetic moving picture)"); + + if (cam == NULL) { + MSWebCamDesc *desc = ms_mire_webcam_desc_get(); + if (desc){ + cam=ms_web_cam_new(desc); + ms_web_cam_manager_add_cam(ms_web_cam_manager_get(), cam); + } + } + } +#endif + + if( manager_count >= 2){ char hellopath[512]; char *recordpath = ms_strdup_printf("%s/record_for_lc_%p.wav",bc_tester_writable_dir_prefix,mgr->lc); @@ -269,6 +286,7 @@ LinphoneCoreManager* linphone_core_manager_init(const char* rc_file) { linphone_core_set_record_file(mgr->lc,recordpath); ms_free(recordpath); } + linphone_core_set_user_certificates_path(mgr->lc,bc_tester_writable_dir_prefix); if (rc_path) ms_free(rc_path); diff --git a/tools/Makefile.am b/tools/Makefile.am index 0515faae2..ab76dddb2 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -19,7 +19,7 @@ EXTRA_DIST=xml2lpc_jni.cc lpc2xml_jni.cc if BUILD_TOOLS -bin_PROGRAMS=xml2lpc_test lpc2xml_test lp-gen-wrappers +bin_PROGRAMS=xml2lpc_test lpc2xml_test lp-gen-wrappers auto_answer xml2lpc_test_SOURCES=\ xml2lpc_test.c @@ -42,6 +42,12 @@ lp_gen_wrappers_SOURCES=genwrappers.cc \ lp_gen_wrappers_LDADD= \ $(LIBXML2_LIBS) +auto_answer_SOURCES=auto_answer.c +auto_answer_CFLAGS=$(COMMON_CFLAGS) +auto_answer_LDADD=\ + $(top_builddir)/coreapi/liblinphone.la \ + $(MEDIASTREAMER_LIBS) + endif diff --git a/tools/auto_answer.c b/tools/auto_answer.c new file mode 100644 index 000000000..3e7f64b80 --- /dev/null +++ b/tools/auto_answer.c @@ -0,0 +1,158 @@ +/* +linphone +Copyright (C) 2010 Belledonne Communications SARL + (simon.morlat@linphone.org) + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*/ + + +#ifdef IN_LINPHONE +#include "linphonecore.h" +#else +#include "linphone/linphonecore.h" +#endif +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif +#include + +static bool_t running=TRUE; + +static void stop(int signum){ + running=FALSE; +} + +#ifndef PACKAGE_DATA_DIR + #define PACKAGE_DATA_DIR '.' +#endif +/* + * Call state notification callback + */ +static void call_state_changed(LinphoneCore *lc, LinphoneCall *call, LinphoneCallState cstate, const char *msg){ + LinphoneCallParams * call_params; + switch(cstate){ + case LinphoneCallIncomingReceived: + ms_message("Incoming call arrive !\n"); + /* accept the incoming call*/ + call_params = linphone_core_create_default_call_parameters(lc); + linphone_call_params_enable_video(call_params,TRUE); + linphone_call_params_set_audio_direction(call_params,LinphoneMediaDirectionSendOnly); + linphone_call_params_set_video_direction(call_params,LinphoneMediaDirectionSendOnly); + linphone_core_accept_call_with_params(lc,call,call_params); + linphone_call_params_destroy(call_params); + + break; + default: + break; + } +} +extern MSWebCamDesc mire_desc; +static void helper() { + printf("auto_answer --help\n" + "\t\t\t--listening-uri uri to listen on, default [sip:localhost:5060]\n" + "\t\t\t--verbose\n"); + exit(0); +} + +int main(int argc, char *argv[]){ + LinphoneCoreVTable vtable={0}; + LinphoneCore *lc; + LinphoneVideoPolicy policy; + int i; + LinphoneAddress *addr=NULL; + LCSipTransports tp; + char * tmp = NULL; + LpConfig * lp_config = lp_config_new(NULL); + policy.automatically_accept=TRUE; + signal(SIGINT,stop); + for(i = 1; i < argc; ++i) { + if (strcmp(argv[i], "--verbose") == 0) { + linphone_core_set_log_level_mask(ORTP_MESSAGE|ORTP_WARNING|ORTP_ERROR|ORTP_FATAL); + } else if (strcmp(argv[i], "--listening-uri") == 0){ + addr = linphone_address_new(argv[++i]); + if (!addr) { + printf("Error, bad sip uri"); + helper(); + } +/* switch(linphone_address_get_transport(addr)) { + case LinphoneTransportUdp: + case LinphoneTransportTcp: + break; + default: + ms_error("Error, bad sip uri [%s] transport, should be udp | tcp",argv[i]); + helper(); + break; + }*/ + } else { + helper(); + } + } + + if (!addr) { + addr = linphone_address_new("sip:bot@0.0.0.0:5060"); + } + + lp_config_set_string(lp_config,"sip","bind_address",linphone_address_get_domain(addr)); + lp_config_set_string(lp_config,"rtp","bind_address",linphone_address_get_domain(addr)); + + vtable.call_state_changed=call_state_changed; + + lc=linphone_core_new_with_config(&vtable,lp_config,NULL); + linphone_core_enable_video_capture(lc,TRUE); + linphone_core_enable_video_display(lc,FALSE); + linphone_core_set_video_policy(lc,&policy); + + + /*instead of using sound capture card, a file is played to the calling party*/ + linphone_core_set_play_file(lc,PACKAGE_DATA_DIR "/sounds/linphone/hello16000.wav"); + linphone_core_set_use_files(lc,TRUE); + + { + MSWebCamDesc *desc = ms_mire_webcam_desc_get(); + if (desc){ + ms_web_cam_manager_add_cam(ms_web_cam_manager_get(),ms_web_cam_new(desc)); + linphone_core_set_video_device(lc,"Mire: Mire (synthetic moving picture)"); + } + } + + + + memset(&tp,0,sizeof(LCSipTransports)); + + tp.udp_port = linphone_address_get_port(addr); + tp.tcp_port = linphone_address_get_port(addr); + + linphone_core_set_sip_transports(lc,&tp); + linphone_core_set_audio_port_range(lc,1024,65000); + linphone_core_set_preferred_framerate(lc,5); + linphone_core_set_primary_contact(lc,tmp=linphone_address_as_string(addr)); + ms_free(tmp); + + /* main loop for receiving notifications and doing background linphonecore work: */ + while(running){ + linphone_core_iterate(lc); + ms_usleep(50000); + } + + ms_message("Shutting down...\n"); + linphone_core_destroy(lc); + ms_message("Exited\n"); + return 0; +} + + + + diff --git a/tools/python/apixml2python.py b/tools/python/apixml2python.py index da91429b5..a073e8141 100755 --- a/tools/python/apixml2python.py +++ b/tools/python/apixml2python.py @@ -58,6 +58,7 @@ blacklisted_functions = [ 'linphone_core_set_log_file', # There is no use to wrap this function 'linphone_core_set_log_handler', # Hand-written but put directly in the linphone module 'linphone_core_set_log_level', # There is no use to wrap this function + 'linphone_core_set_log_level_mask', # There is no use to wrap this function 'linphone_core_set_video_policy', # missing LinphoneVideoPolicy 'linphone_proxy_config_get_privacy', # missing LinphonePrivacyMask 'linphone_proxy_config_normalize_number', # to be handwritten because of result via arguments diff --git a/tools/python/apixml2python/handwritten_definitions.mustache b/tools/python/apixml2python/handwritten_definitions.mustache index 4bd8f9f71..e9edec0fb 100644 --- a/tools/python/apixml2python/handwritten_definitions.mustache +++ b/tools/python/apixml2python/handwritten_definitions.mustache @@ -106,7 +106,7 @@ static void pylinphone_module_log_handler(OrtpLogLevel lev, const char *fmt, va_ static void pylinphone_init_logging(void) { linphone_core_serialize_logs(); linphone_core_set_log_handler(pylinphone_module_log_handler); - linphone_core_set_log_level(ORTP_MESSAGE|ORTP_WARNING|ORTP_ERROR|ORTP_FATAL); + linphone_core_set_log_level_mask(ORTP_MESSAGE|ORTP_WARNING|ORTP_ERROR|ORTP_FATAL); }