diff -Nru pidgin-sipe-1.21.1/AUTHORS pidgin-sipe-1.22.1/AUTHORS --- pidgin-sipe-1.21.1/AUTHORS 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/AUTHORS 2017-06-11 15:41:22.000000000 +0000 @@ -33,6 +33,8 @@ Edmondas Girkantas Peter Fales Kyle Hubert +Andrey Vaynberger +Michael Olbrich Based on the initial SIP/SIMPLE gaim protocol plugin by: diff -Nru pidgin-sipe-1.21.1/ChangeLog pidgin-sipe-1.22.1/ChangeLog --- pidgin-sipe-1.21.1/ChangeLog 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/ChangeLog 2017-06-11 15:41:22.000000000 +0000 @@ -1,3 +1,29 @@ +version 1.22.1 "Bug Fixes I" (2017-06-11) + - Fixed #320: Multiple client detection broken (Stefan Becker) + - speed up Lync Autodiscover by using AccessLocation (Andrey Vaynberger) + - adium: update build instructions for Xcode 7.x or newer (Stefan Becker) + * the build environment used for releases 1.22.0 or older (Xcode 6.x + on OS X 10.11) is no longer available to the project + * releases starting with 1.??.? will use Xcode 8.x on macOS 10.12 + * build target continues to be OS X 10.9 + - purple: avoid rare SSL read deadlock (Stefan Becker) + - various minor fixes (Michael Olbrich) + - crypto: make code compile with OpenSSL 1.1.0 (Stefan Becker) + - drop references to Reuters Messaging (Stefan Becker) + - updated translations: Lithuanian (lt), Russian (ru), Swedish (sv), Turkish (tr) + +version 1.22.0 "Application Sharing, Lync Autodiscover & Logging" (2017-02-01) + - Feature #93: Support for Lync Autodiscover (Stefan Becker) + - Feature #6: Application Sharing Viewer (Jakub Adam) + * requires libpurple >= 2.12.0 + * needs an external RDP client - remmina and xfreerdp are supported + - Fixed #315: Crash when contact list is empty (Stefan Becker) + - Fixed #314: sipe login problems with long pw (Stefan Becker) + - separate logging and debugging output (Stefan Becker) + * logging is always shown, e.g. in the Pidgin debug window + * full message debugging now requires PURPLE_UNSAFE_DEBUG=1 + - new translations: Greek (el), Lithuanian (lt) + version 1.21.1 "Bug Fixes I" (2016-05-28) - various bug fixes in media support (Jakub Adam) - configure no longer ignores CFLAGS/LDFLAGS/LIBS (Stefan Becker) diff -Nru pidgin-sipe-1.21.1/configure.ac pidgin-sipe-1.22.1/configure.ac --- pidgin-sipe-1.21.1/configure.ac 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/configure.ac 2017-06-11 15:41:22.000000000 +0000 @@ -63,7 +63,7 @@ AM_CONDITIONAL(SIPE_OS_WIN32, [test "x${os_win32}" = xyes]) dnl checks for header files -AC_CHECK_HEADERS([sys/sockio.h]) +AC_CHECK_HEADERS([]) dnl checks for library functions AC_CHECK_FUNCS([]) @@ -104,6 +104,7 @@ "-Wcast-align" \ "-Wdeclaration-after-statement" \ "-Wdeprecated-declarations" \ + "-Wduplicate-decl-specifier" \ "-Winit-self" \ "-Wmaybe-uninitialized" \ "-Wmissing-declarations" \ @@ -161,7 +162,7 @@ AC_ARG_WITH(vv, [AC_HELP_STRING([--with-vv], [compile with voice and video support @<:@default=check@:>@])], - [AS_IF([test "x$withval" = xyes], [with_vv=check])], + [AS_IF([test "x$withval" = xyes], [with_vv=yes])], [with_vv=check]) dnl check for Kerberos 5 support @@ -348,6 +349,7 @@ [AC_HELP_STRING([--enable-purple], [build purple plugin @<:@default=yes@:>@])], [], [enable_purple=yes]) +ac_have_appshare=no ac_have_xdata=no with_purple_vv=no AS_IF([test "x$enable_purple" != xno], @@ -371,44 +373,54 @@ dnl check whether enable voice and video support AS_IF([test "x$with_vv" = xno], [], dnl disabled by user - [test "x$with_vv" = xcheck], dnl autodetect - [AC_MSG_CHECKING(for purple voice and video support) - AC_RUN_IFELSE( + [AC_MSG_CHECKING(for purple voice and video support) + purple_has_media=no + AC_RUN_IFELSE( [AC_LANG_PROGRAM([[ #include ]], [[return (purple_media_get_type() == G_TYPE_NONE ? 1 : 0);]] )], - [AC_MSG_RESULT(ok) - PKG_CHECK_MODULES(NICE, [nice >= 0.1.0], + [purple_has_media=yes + AC_MSG_RESULT(ok) + ], + [AC_MSG_RESULT([no - your purple hasn't been compiled with voice and video support.])], + [AS_IF([test "x$with_vv" = xyes], + [purple_has_media=yes + AC_MSG_RESULT([yes - enabling voice and video support for cross compiling on users' request.])], + [AC_MSG_RESULT([no - disabled for cross compiling.])]) + ] + ) + AS_IF([test "x$purple_has_media" = xyes], + [PKG_CHECK_MODULES(NICE, [nice >= 0.1.0], dnl sipe-media.c uses g_slist_free_full() [PKG_CHECK_MODULES(_SIPE_MEDIA_RECHECK_PLEASE_IGNORE, [$purple_pkgconfig >= 2.8.0], dnl check purple pkgconfig for gstreamer version [gstreamer_pkgconfig=`$PKG_CONFIG --variable=gstreamer $purple_pkgconfig` - AS_IF([test "x$gstreamer_pkgconfig" != x], - [gstreamer_pkgconfig=gstreamer-$gstreamer_pkgconfig], + AS_IF([test "x$gstreamer_pkgconfig" == x], [AS_IF([test "x$purple_pkgconfig" == xpurple-3], - [gstreamer_pkgconfig=gstreamer-1.0], - [gstreamer_pkgconfig=gstreamer-0.10])]) + [gstreamer_pkgconfig=1.0], [gstreamer_pkgconfig=0.10])]) + gstreamer_pkgconfig="gstreamer-$gstreamer_pkgconfig gstreamer-rtp-$gstreamer_pkgconfig" - AC_MSG_NOTICE([using package "$gstreamer_pkgconfig".]) + AC_MSG_NOTICE([using packages "$gstreamer_pkgconfig".]) PKG_CHECK_MODULES(GSTREAMER, [$gstreamer_pkgconfig], - [with_purple_vv=yes + [PKG_CHECK_MODULES(FARSTREAM, [farstream-0.2], + [with_purple_vv=yes - AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([[ + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[ #include - ]], - [[return (PURPLE_MEDIA_NETWORK_PROTOCOL_TCP_PASSIVE);]] + ]], + [[return (PURPLE_MEDIA_NETWORK_PROTOCOL_TCP_PASSIVE);]] + )], + [AC_DEFINE(HAVE_PURPLE_NEW_TCP_ENUMS, 1, [Define if libpurple has new TCP enums in media backend.])] )], - [AC_DEFINE(HAVE_PURPLE_NEW_TCP_ENUMS, 1, [Define if libpurple has new TCP enums in media backend.])] - )], + [AC_MSG_NOTICE(Farstream required: disabling purple voice and video support)])], [AC_MSG_NOTICE(GStreamer required: disabling purple voice and video support)])], [AC_MSG_NOTICE(libpurple >= 2.8.0 required: disabling purple voice and video support)])], - [AC_MSG_NOTICE(libnice required: disabling purple voice and video support)])], - [AC_MSG_RESULT(no - your purple hasn't been compiled with voice and video support.)], - [AC_MSG_WARN([cross compiling: not checking])]) - ]) + [AC_MSG_NOTICE(libnice required: disabling purple voice and video support)]) + ]) + ]) dnl SRTP and XDATA require media backend AS_IF([test "x$with_purple_vv" != xno], @@ -429,9 +441,17 @@ [[return (PURPLE_MEDIA_APPLICATION);]] )], [dnl libpurple supports raw data RTP connections - ac_have_xdata=yes] + ac_have_xdata=yes + + dnl gio-2.0 is mandatory for application sharing support + PKG_CHECK_MODULES(GIO, [gio-2.0], [ac_have_appshare=yes]) + ] ) - ]) + ], + [AS_IF([test "x$with_vv" = xyes], dnl explicitly requested by user + [AC_ERROR([Voice and video support explicitly requested, but not available])] + )] + ) CFLAGS="$ac_save_CFLAGS" LIBS="$ac_save_LIBS"])]) @@ -484,11 +504,16 @@ AS_IF([test "x$ac_have_xdata" == xyes], [AC_DEFINE(HAVE_XDATA, 1, [Define if we have raw data RTP in media backend.])]) -dnl these code parts rely on interfaces that require GValueArray. This +dnl enable appshare support +AM_CONDITIONAL(SIPE_HAVE_APPSHARE, [test "x$ac_have_appshare" == xyes]) +AS_IF([test "x$ac_have_appshare" == xyes], + [AC_DEFINE(HAVE_APPSHARE, 1, [Define to 1 if we have appshare support.])]) + +dnl telepathy code parts rely on interfaces that require GValueArray. This dnl type has been declared "deprectated" in glib-2.0 >= 2.32.0, but there dnl is no backward compatible replacement implementation possible -AS_IF([test "x$with_purple_vv" != xno -o "x$enable_telepathy" != xno], - [AC_DEFINE(GLIB_VERSION_MIN_REQUIRED, GLIB_VERSION_2_28, +AS_IF([test "x$enable_telepathy" != xno], + [AC_DEFINE(GLIB_VERSION_MIN_REQUIRED, GLIB_VERSION_2_30, [We need GValueArray for which no replacement is available])]) dnl i18n diff -Nru pidgin-sipe-1.21.1/contrib/debian/changelog pidgin-sipe-1.22.1/contrib/debian/changelog --- pidgin-sipe-1.21.1/contrib/debian/changelog 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/contrib/debian/changelog 2017-06-11 15:41:22.000000000 +0000 @@ -1,3 +1,37 @@ +pidgin-sipe (1.22.1-1) unstable; urgency=low + + * New upstream version 1.22.1 "Bug Fixes I" (2017-06-11) + - Fixed #320: Multiple client detection broken (Stefan Becker) + - speed up Lync Autodiscover by using AccessLocation (Andrey Vaynberger) + - adium: update build instructions for Xcode 7.x or newer (Stefan Becker) + * the build environment used for releases 1.22.0 or older (Xcode 6.x + on OS X 10.11) is no longer available to the project + * releases starting with 1.??.? will use Xcode 8.x on macOS 10.12 + * build target continues to be OS X 10.9 + - purple: avoid rare SSL read deadlock (Stefan Becker) + - various minor fixes (Michael Olbrich) + - crypto: make code compile with OpenSSL 1.1.0 (Stefan Becker) + - drop references to Reuters Messaging (Stefan Becker) + - updated translations: Lithuanian (lt), Russian (ru), Swedish (sv), Turkish (tr) + + -- Stefan Becker Sun, 11 Jun 2017 18:38:00 +0300 + +pidgin-sipe (1.22.0-1) unstable; urgency=low + + * New upstream version 1.22.0 "Application Sharing, Lync Autodiscover & Logging" (2017-02-01) + - Feature #93: Support for Lync Autodiscover (Stefan Becker) + - Feature #6: Application Sharing Viewer (Jakub Adam) + * requires libpurple >= 2.12.0 + * needs an external RDP client - remmina and xfreerdp are supported + - Fixed #315: Crash when contact list is empty (Stefan Becker) + - Fixed #314: sipe login problems with long pw (Stefan Becker) + - separate logging and debugging output (Stefan Becker) + * logging is always shown, e.g. in the Pidgin debug window + * full message debugging now requires PURPLE_UNSAFE_DEBUG=1 + - new translations: Greek (el), Lithuanian (lt) + + -- Stefan Becker Wed, 01 Feb 2017 18:57:00 +0200 + pidgin-sipe (1.21.1-1) unstable; urgency=low * New upstream version 1.21.1 "Bug Fixes I" (2016-05-28) diff -Nru pidgin-sipe-1.21.1/contrib/debian/control pidgin-sipe-1.22.1/contrib/debian/control --- pidgin-sipe-1.21.1/contrib/debian/control 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/contrib/debian/control 2017-06-11 15:41:22.000000000 +0000 @@ -22,7 +22,6 @@ * Microsoft Lync Server * Microsoft Office Communications Server (OCS 2007/2007 R2) * Microsoft Live Communications Server (LCS 2003/2005) - * Reuters Messaging . With this plugin you should be able to replace your Microsoft Office Communicator client with Pidgin. diff -Nru pidgin-sipe-1.21.1/contrib/maemo/control pidgin-sipe-1.22.1/contrib/maemo/control --- pidgin-sipe-1.21.1/contrib/maemo/control 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/contrib/maemo/control 2017-06-11 15:41:22.000000000 +0000 @@ -23,7 +23,6 @@ * Microsoft Lync Server * Microsoft Office Communications Server (OCS 2007/2007 R2) * Microsoft Live Communications Server (LCS 2003/2005) - * Reuters Messaging . With this plugin you should be able to replace your Microsoft Office Communicator client with Pidgin. diff -Nru pidgin-sipe-1.21.1/contrib/mingw-cross-compile/fetch.sh pidgin-sipe-1.22.1/contrib/mingw-cross-compile/fetch.sh --- pidgin-sipe-1.21.1/contrib/mingw-cross-compile/fetch.sh 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/contrib/mingw-cross-compile/fetch.sh 2017-06-11 15:41:22.000000000 +0000 @@ -11,7 +11,7 @@ # Check these page for latest MinGW/Pidgin URLs if you get fetch errors! # # update Pidgin version here -export PIDGIN_VERSION=2.10.12 +export PIDGIN_VERSION=2.12.0 # must be absolute path export PIDGIN_DEV_ROOT=$(pwd -P)/build-${PIDGIN_VERSION} @@ -53,14 +53,12 @@ wget -nv https://developer.pidgin.im/static/win32/libxml2-2.9.2_daa1.tar.gz wget -nv https://developer.pidgin.im/static/win32/gtkspell-2.0.16.tar.bz2 wget -nv https://developer.pidgin.im/static/win32/enchant_1.6.0_win32.zip -wget -nv https://developer.pidgin.im/static/win32/nss-3.20.1-nspr-4.10.10.tar.gz +wget -nv https://developer.pidgin.im/static/win32/nss-3.24-nspr-4.12.tar.gz wget -nv https://developer.pidgin.im/static/win32/silc-toolkit-1.1.12.tar.gz wget -nv https://developer.pidgin.im/static/win32/meanwhile-1.0.2_daa3-win32.zip wget -nv https://developer.pidgin.im/static/win32/cyrus-sasl-2.1.26_daa1.tar.gz wget -nv http://ftp.acc.umu.se/pub/GNOME/binaries/win32/intltool/0.40/intltool_0.40.4-1_win32.zip wget -nv http://prdownloads.sourceforge.net/pidgin/pidgin-${PIDGIN_VERSION}.tar.bz2 -# Fixes not included in source release -wget -nv https://hg.pidgin.im/pidgin/main/raw-rev/30f7c83da15d echo 1>&2 unpacking pidgin dev stuff... unzip ${SOURCES_DIR}/gtk+-bundle_2.14.7-20090119_win32.zip -d ${DEV_DIR}/gtk_2_0-2.14 @@ -73,12 +71,11 @@ cd ${DEV_DIR} tar xzf ${SOURCES_DIR}/libxml2-2.9.2_daa1.tar.gz tar xjf ${SOURCES_DIR}/gtkspell-2.0.16.tar.bz2 -tar xzf ${SOURCES_DIR}/nss-3.20.1-nspr-4.10.10.tar.gz +tar xzf ${SOURCES_DIR}/nss-3.24-nspr-4.12.tar.gz tar xzf ${SOURCES_DIR}/silc-toolkit-1.1.12.tar.gz tar xzf ${SOURCES_DIR}/cyrus-sasl-2.1.26_daa1.tar.gz cd ${PIDGIN_DEV_ROOT} tar xjf ${SOURCES_DIR}/pidgin-${PIDGIN_VERSION}.tar.bz2 -patch -d pidgin-${PIDGIN_VERSION} -p1 -b -z.30f7c83da15d <${SOURCES_DIR}/30f7c83da15d echo 1>&2 done diff -Nru pidgin-sipe-1.21.1/contrib/opensuse-build-service/generate_debian.sh pidgin-sipe-1.22.1/contrib/opensuse-build-service/generate_debian.sh --- pidgin-sipe-1.21.1/contrib/opensuse-build-service/generate_debian.sh 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/contrib/opensuse-build-service/generate_debian.sh 2017-06-11 15:41:22.000000000 +0000 @@ -58,10 +58,12 @@ # All current platforms currently support telepathy - use only default .dsc cp pidgin-sipe-telepathy.dsc pidgin-sipe.dsc # Overwrite those .dsc's that have support for gstreamer1.0 -# Debian_x.y for os in \ + Debian_9.0 \ xUbuntu_15.10 \ - xUbuntu_16.04; \ + xUbuntu_16.04 \ + xUbuntu_16.10 \ + xUbuntu_17.04; \ do \ cp pidgin-sipe-gstreamer1.dsc pidgin-sipe-${os}.dsc; \ done diff -Nru pidgin-sipe-1.21.1/contrib/opensuse-build-service/pidgin-sipe.changes pidgin-sipe-1.22.1/contrib/opensuse-build-service/pidgin-sipe.changes --- pidgin-sipe-1.21.1/contrib/opensuse-build-service/pidgin-sipe.changes 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/contrib/opensuse-build-service/pidgin-sipe.changes 2017-06-11 15:41:22.000000000 +0000 @@ -1,468 +1,394 @@ ------------------------------------------------------------------- -Sat May 28 15:19:00 UTC 2016 - chemobejk@gmail.com +Sun Jun 11 15:38:00 UTC 2017 - chemobejk@gmail.com + +- Update to version 1.22.1: + - Fixed #320: Multiple client detection broken (Stefan Becker) + - speed up Lync Autodiscover by using AccessLocation (Andrey Vaynberger) + - adium: update build instructions for Xcode 7.x or newer (Stefan Becker) + * the build environment used for releases 1.22.0 or older (Xcode 6.x + on OS X 10.11) is no longer available to the project + * releases starting with 1.??.? will use Xcode 8.x on macOS 10.12 + * build target continues to be OS X 10.9 + - purple: avoid rare SSL read deadlock (Stefan Becker) + - various minor fixes (Michael Olbrich) + - crypto: make code compile with OpenSSL 1.1.0 (Stefan Becker) + - drop references to Reuters Messaging (Stefan Becker) + - updated translations: Lithuanian (lt), Russian (ru), Swedish (sv), Turkish (tr) + +------------------------------------------------------------------- +Wed Feb 1 16:58:00 UTC 2017 - chemobejk@gmail.com + +- Update to version 1.22.0: + - Feature #93: Support for Lync Autodiscover (Stefan Becker) + - Feature #6: Application Sharing Viewer (Jakub Adam) + * requires libpurple >= 2.12.0 + * needs an external RDP client - remmina and xfreerdp are supported + - Fixed #315: Crash when contact list is empty (Stefan Becker) + - Fixed #314: sipe login problems with long pw (Stefan Becker) + - separate logging and debugging output (Stefan Becker) + * logging is always shown, e.g. in the Pidgin debug window + * full message debugging now requires PURPLE_UNSAFE_DEBUG=1 + - new translations: Greek (el), Lithuanian (lt) + +------------------------------------------------------------------- +Sat May 28 16:50:00 UTC 2016 - chemobejk@gmail.com - Update to version 1.21.1: + - various bug fixes in media support (Jakub Adam) + - configure no longer ignores CFLAGS/LDFLAGS/LIBS (Stefan Becker) ------------------------------------------------------------------- -Sat Apr 23 12:56:00 UTC 2016 - chemobejk@gmail.com +Sat Apr 23 14:16:00 UTC 2016 - chemobejk@gmail.com - Update to version 1.21.0: + - Feature #91: Support embedded XML as buddy photo URL (Stefan Becker) + - Feature #90: Add AppStream metadata file (Jiri Eischmann, Stefan Becker) + - Feature #89: Improve "Join scheduled conference" dialog (Stefan Becker) + - Feature #87: Support multiple HTTP cookies (Stefan Becker) + - Feature #85: XML raw extract should ignore name space (Stefan Becker) + - Fixed #311: Crash when SIP transport becomes invalid (Stefan Becker) + - Fixed #293: Mandatory wsa:MessageID node missing (Stefan Becker) + - add support for Lync File Transfer protocol (Jakub Adam) + * requires libpurple >= 2.12.0 + * Lync FT will be used for sending files when Lync 2013 is detected + - add build options to "About SIPE plugin" message (Stefan Becker) ------------------------------------------------------------------- -Fri Feb 12 09:26:02 UTC 2016 - dimstar@opensuse.org +Sat Oct 24 13:36:00 UTC 2015 - chemobejk@gmail.com -- Pass --disable-quality-check to configure: the 'quality' checks - are a bunch of compiler flags like Werror and more warning. This - is more important for development versions than for released - ones. +- Update to version 1.20.1: + - add support for another type of ADFS response (Stefan Becker) + - improve configure check for back-ported features (Stefan Becker, Jakub Adam) + - updated translations: French (fr), Russian (ru) ------------------------------------------------------------------- -Wed Jan 13 16:44:50 UTC 2016 - dimstar@opensuse.org +Sat Aug 29 16:41:00 UTC 2015 - chemobejk@gmail.com -- Update to version 1.20.1: - + Add support for another type of ADFS response. - + Improve configure check for back-ported features. - + Updated translations. -- Changes from version 1.20.0: - + Parse HTML from Lync conference URL (Stefan Becker) - + SRTP Support. - + Office365 rejects RC4 in TLS-DSK: added support for - AES-128/256-CBC. - -------------------------------------------------------------------- -Tue Jun 30 15:14:25 UTC 2015 - dimstar@opensuse.org - -- Port to GStreamer 1.0 (follow pidin's port): - + Add pidgin-sipe-gstreamer-1.0.patch - + Replace pkgconfig(gstreamer-0.10) BuildRequires with - pkgconfig(gstreamer-1.0). - + Add autoreconf call, as the patch touches the buildsystem. - + Pass --with-vv to configure, to ensure we do not lose Voice & - Video support. +- Update to version 1.20.0: + - Feature #82: Parse HTML from Lync conference URL (Stefan Becker) + - Feature #69: SRTP Support (Jakub Adam) + * requires libpurple >= 3.0.0 + - Fixed #285: Office365 rejects RC4 in TLS-DSK (Stefan Becker) + * added support for AES-128/256-CBC ------------------------------------------------------------------- -Tue Apr 7 16:35:34 UTC 2015 - dimstar@opensuse.org +Sat Apr 4 15:13:00 UTC 2015 - chemobejk@gmail.com - Update to version 1.19.1: - + Fixed sf#278: 488 error after libnice upgrade. - + Fix SIP re-authentication timeout to be max. 8 hours. + - Fixed #278: 488 error after libnice upgrade (Jakub Adam) + - fix SIP re-authentication timeout to be max. 8 hours (Stefan Becker) ------------------------------------------------------------------- -Fri Feb 13 21:22:20 UTC 2015 - zaitor@opensuse.org +Sat Feb 7 11:48:00 UTC 2015 - chemobejk@gmail.com - Update to version 1.19.0: - + Move parsing of login name. - + Support for Adium group chat bookmarks. - + Support searching for SIP ID. - + ADFS can't always be used for accounts that have Multi-Factor - Authentication (MFA) enabled. - + Support buddy photos from contactCard. - + Fall back from Kerberos to NTLM. - + Raised contact names. - + Corrupted HTTP response crashes SIPE. - + Fix calendar state machine when EWS URL is set. - + Fall back to [MS-DLX] BasicSearch to improve search experience. - + Implement search functionality for UCS. - + adium: - - Add chat room list UI. - - Fix duplicate debug log messages. - + Support for libnice TCP mode. - + Refactor CCCP request code. - -------------------------------------------------------------------- -Wed Dec 31 09:36:53 UTC 2014 - jozef.koval03@gmail.com - -- Update to version 1.18.5: - + Redundant "const" breaks build with clang. - + Purple idle-away converted to Away. - + Svc: use authuser for RealmInfo request. - + Adium: add release checking script. - + Mingw: update fetch script to Pidgin 2.10.11. - + Bugs fixed: sf#269, sf#276. - + Updated translations. - -------------------------------------------------------------------- -Tue Nov 11 07:53:25 UTC 2014 - jozef.koval03@gmail.com - -- Update to version 1.18.4: - + ADFS fails when user and login name differ. - + Adium: SIPE doesn't auto- or re-connect. - + Fixed memory leaks. - + Fixed processing of presence publish event response. - + Fixed a longstanding issue that the Pidgin user status - sometimes didn't switch back to "Available" after the end of a - meeting. - + Bugs fixed: sf#263, sf#264. - -------------------------------------------------------------------- -Sat Aug 16 20:54:45 UTC 2014 - dimstar@opensuse.org - -- Update to version 1.18.3: - + HTML response to EWS autodiscover triggers libxml2 assert. - + V&V call gets rejected when IPv6 is enabled. - + Windows 7: SIPE crashes after a minute. - + mingw: improve crash information reporting. - + Bugs fixed: sf#257, sf#258, sf#259. - -------------------------------------------------------------------- -Sat Jul 12 13:49:48 UTC 2014 - dimstar@opensuse.org - -- Update to version 1.18.2: - + ews: extract settings also from type EXPR. - + ucs: honor user specified email URL. - + adium: fix compilation on OS X 10.7. - + Updated Transifex URLs. - + Bugs fixed: sf#210, sf#241, sf#245, sf#248, sf#255. - + Updated translations. - -------------------------------------------------------------------- -Sun Apr 13 20:58:31 UTC 2014 - zaitor@opensuse.org - -- Update to version 1.18.1: - + sf#238: Fixed false "not delivered" in conference. - + sf#237: HTML escaping not removed from URL. - + sf#210: Conference call ends with error message. - + Fix endless loop with failed HTTP Basic authentication. - + Fix crash when gstreamer nice plugin is missing. - + Fix EWS autodiscover for some Office 365 users. - + purple: fix missing "Copy to" in buddy menu. - + purple/adium: ignore empty search values. - + adium: - - Fix group chat UI. - - Implement BEAST mitigations for 10.8.5. - + Add indication when user is connected from a mobile device. - + Updated translations. - -------------------------------------------------------------------- -Mon Jan 20 12:49:36 UTC 2014 - zaitor@opensuse.org - -- Update to version 1.18.0: - + sf#71: Add support for EWS Autodiscover redirection. - + sf#69: Add UI support for (group) chats. NOTE: Adium does not - have an UI to fetch the room list. - + sf#64: Add support for GSS-NTLMSSP. - + sip-sec-krb5.c module has been renamed to sip-sec-gssapi.c if - gssapi/gssapi_ntlmssp.h is detected then sip-sec-ntlm.c will be - disabled and NTLM will be handled by sip-sec-gssapi.c instead. - NOTE: at the time of this writing the user has to set up - GSS-NTLMSSP by hand on his system, i.e. /etc/gss/mech. - + Fixed sf#227: Adium client doesn't save email option settings. - + Fixed sf#216: SIPE stops working on Mavericks. - + Add an UI option to disable SSL BEAST mitigations NOTE: - requires Adium 1.5.10. - + Fixed sf#197: Account stays in connecting stage. - + Cleanup for sip-sec Kerberos & SSPI modules. - + Replace old TGT hack with gss_acquire_cred_with_password(). - + Clean up Kerberos detection in configure. - + Remove special case handling; code is more straight-forward - now. - + Implement internal keepalive handling. - + Implement crypto backend based on OpenSSL. - + adium: - - Xcode project files update. - - Replace NSS crypto backend with OpenSSL. - -------------------------------------------------------------------- -Mon Dec 23 21:02:50 UTC 2013 - dimstar@opensuse.org - -- Update to version 1.17.3: - + Fixed sf#222: SIPE crashes when groupchat session expires. - + Fixed sf#225: HTTP re-authentication with NTLM fails. - + Fix UCS Persona key extraction. - -------------------------------------------------------------------- -Sun Dec 8 10:13:31 UTC 2013 - zaitor@opensuse.org - -- Update to version 1.17.2: - + Fixed sf#214: Typing notification does not always work. - + Reverted one change which caused problems for some users. - + Fixed sf#222: SIPE crashes when groupchat session expires. - + Updated translations. -- Changes from version 1.17.1: - + Fixed sf#215: Password not entity encoded in WSSE element. - + Fixed sf#214: Typing notification does not always work. - + Accept alternatives for webticket timestamp/keydata. - + Adium: add "don't publish calendar" to account UI. - + Contrib: add SSL BEAST mitigation patch for Adium. - + Updated translations. - -------------------------------------------------------------------- -Sun Sep 22 03:06:20 UTC 2013 - zaitor@opensuse.org - -- Update to version 1.17.0: - + Feature sf#62: Support for Lync 2013 Unified Contact Store. - + Feature sf#59: Support for Lync 2013 Persistent Chats - + Fixed sf#211: Status "away" or "busy" incorrectly mapped to - "Invisible". - + Fixed sf#209: group chat doesn't like HTML. - + Fixed sf#200: OCS archiving system blocks audio/video - connection. - + Fixed sf#187: Duplicate messages in group chat. - + Fixed sf#184: Duplicate users showing in Group Chat. - + Fix EWS autodiscover for Office 365. - + Add support for group chat history. - + Add support for buddy photos on Lync 2013. - -------------------------------------------------------------------- -Tue Jul 16 19:06:23 UTC 2013 - zaitor@opensuse.org - -- Update to version 1.16.1: - + sf#66: Windows DLL version information. - + Fix call failure when host has multiple IP addresses. - + Fix buddy list handling after moving to Lync 2013. Lync 2013 - migrates buddy list to Unified Contact Store (UCS). Note: - modifying the buddy list is *NOT* supported yet! - + Crash fixes for new HTTP stack. - -------------------------------------------------------------------- -Sat Jun 22 10:41:37 UTC 2013 - zaitor@opensuse.org - -- Update to version 1.16.0: - + sf#58: Implement Digest authentication scheme for SIP Proxy - Authentication. - + sf#196: Useragent value not forwarded to core. - + sf#193: Pidgin Status changes stop working. - + sf#186: Users appear offline when they are not. - + Fix kinit-less use case with krb5 >= 1.11. - + Rewritten HTTP stack from scratch: - - cleaner, layered and hopefully less error-prone - implementation. - - HTTP stack internals no longer exposed to user code. - - Reduced network traffic and less SSL handshakes by utilizing - HTTP/1.1 connection keep alive for multiple HTTP requests to - the same host. - + Switch purple backend to deferred destruction approach: - - Pidgin should no longer crash at connection close, even in - corner cases. - + Add menu entry to make a call with a phone number. - + Some progress on telepathy backend. - - Add TLS certificate accept/reject user interaction. - - Add "Single Sign-On" & "Don't Publish Calendar" account - options. - -------------------------------------------------------------------- -Sat Apr 13 13:48:45 UTC 2013 - dimstar@opensuse.org - -- Update to version 1.15.1: - + NOTE: SIPE SourceForge project got updated. Because of this all - bug and feature request numbers have changed. - + sf#190: SIP 407 response rejected with invalid message - signature. - + sf#189: Adium SIPE plugin vs. libpurple linking issues. - + Fixed free-after-use issue that caused crashes for some users. - + Fixed broken NTLM fallback in Negotiate. - + Fixed subscriptions expiration by subscribing again after - re-authentication. - + Allow different user name and login for Office 365 - authentication. - + Add SIPE version & git commit ID to debug log. - + Added valgrind log analyzer script. - + Added NTLM message anaylzer. - + Updated Adium port. - + Updated translations. - -------------------------------------------------------------------- -Tue Mar 19 22:24:11 UTC 2013 - dimstar@opensuse.org - -- Update to version 1.15.0: - + Support Kerberos for HTTP(S) authentication w/o SSPI - (sf#3578135). - + Add HTTPS to autodiscover probe (sf#3594094). - + Simple button to disable calendar integration (sf#3607040). - + Crash on 1.14.1 when connecting to server (sf#3603228). - + sip uri with apostrophe is not valid (sf#3604671). - + Fixed HTTP redirect crash. - + Unified Single Sign-On handling in all places. - + Added implementation for HTTP "WWW-Authenticate: Negotiate" - scheme. - + Enabled TLS-DSK support in Windows SSPI version. - + TLS-DSK: don't ask for password if SSPI or Kerberos are - compiled in. - + Farstream 0.1.1 compatibility fix. - + Support conf:sip: meeting URIs. - + Updated Adium port. - -------------------------------------------------------------------- -Tue Feb 5 22:32:56 UTC 2013 - zaitor@opensuse.org - -- Update to version 1.14.1: - + Kerberos configuration should be passwordless (sf#3578132). - - purple: non Single Sign-on users are asked for the password - again. - + Bug & memory leak fixes in sipe-buddy.c. - -------------------------------------------------------------------- -Mon Dec 17 10:46:21 UTC 2012 - dimstar@opensuse.org - -- Update to version 1.14.0: - + Add support for Web Ticket authentication using ADFS - (sf#3585364). - + Kerberos configuration should be passwordless (sf#3578132). - + Connection drops after a few hours (sf#3580212) - + Add support for buddy photos. - + Add support for call to Audio Test Service. - + Initial implementation for telepathy backend. - + Reduce Web Ticket traffic by queueing requests & caching - tickets. - + Update OBS packaging information for Debian. - + Various minor bug & build fixes. - -------------------------------------------------------------------- -Sun Sep 16 19:06:03 UTC 2012 - zaitor@opensuse.org - -- Update to version 1.13.3: - + Fixed OpenBSD build issue. - + Support Lync 2010 meet URLs. - + Revert to legacy MSOC protocol on Lync FT invitation. - + Fix broken busy->available status switch. - + Updated translations. - -------------------------------------------------------------------- -Mon Apr 9 18:51:47 UTC 2012 - dimstar@opensuse.org - -- Update to version 1.13.1: - + Detect incompatible encryption level with Lync - + purple: add URI validity check to Add Buddy callback - + Various build fixes - + Updated translations. -- Drop pidgin-sipe-gcc47.patch: fixed upstream. - -------------------------------------------------------------------- -Sat Mar 24 23:13:09 UTC 2012 - dimstar@opensuse.org - -- Add pidgin-sipe-gcc47.patch: Fix build with gcc 4.7; taken from - git. - -------------------------------------------------------------------- -Thu Mar 15 13:23:31 UTC 2012 - vuntz@opensuse.org - -- Update to version 1.13.0: - + Added [MS-SIPAE] TLS-DSK authentication scheme: - - TLS-DSK has been introduced in Lync - - mandatory for Office365 accounts - - also works for non-public Lync installations - - does not work yet with SSPI on Windows - + Added [MS-DLX] based Get Info/Contact Search: - - [MS-PRES] SIP-Based Active Directory Search is disabled in - Lync - + Added experimental media TCP transport - + Make it compile against the latest purple 3.0.x API - + Make it compile against the latest glib2 2.31.x API - + Completed cleanup: core no longer requires libpurple - + Refactored crypto code, ie. NSS can replaced if necessary - + Removed kopete backend: KDE is moving to telepathy - + Build-related changes -- Drop pidgin-sipe-no-deprecated.patch: fixed upstream. - -------------------------------------------------------------------- -Thu Jan 12 08:57:16 UTC 2012 - dimstar@opensuse.org - -- Change gmime-2_4-devel BuildRequires to gmime-devel. This rename - happened long ago and was just a virtual provides by now. -- Drop checks for openSUSE 11.1. - -------------------------------------------------------------------- -Mon Jan 9 13:07:06 UTC 2012 - vuntz@opensuse.org - -- Add pidgin-sipe-no-deprecated.patch: do not use deprecated glib - API, to fix build on Factory. - -------------------------------------------------------------------- -Fri Sep 2 10:00:33 UTC 2011 - vuntz@opensuse.org - -- Update to version 1.12.0: - + Add support for OCS2007R2 Group Chat (sf#3064877) - + Support for HTTP/1.1 Transfer-Encoding: chunked (sf##3311026) - + Added MS TURN support - + Implement timeouts for SIP request. Used for REGISTER - + More work on Voice & Video call support - + Add random Ms-Conversation-ID to INVITE - + Fix parsing of P-Asserted-Identity header - + Fix several crashes (including sf#3082602, sf#3148124, - sf#3399007) - + Fix several authenticfation issues (inclusing sf#2834758, - sf#3090663, sf#3130915) - + Make it compile against the purple 2.8.x & 3.0.x APIs - + More internal changes to prepare for non-purple backends - + Updated/add Adium and Miranda ports - + Several build system fixes and improvements (including - sf#3092324, sf#3150482, sf#3091490, sf#3108246) - + Other bugs fixed: sf#3156430, sf#3161273, sf#3198585, - sf#3267073. -- Drop pidgin-sipe-1.11.2-gcc46.patch: fixed upstream. -- Add pkgconfig(gstreamer-0.10) and pkgconfig(nice) BuildRequires - on 12.1 and later (since 11.4 and earlier have a too old version - of libnice), to build Voice & Video call support. - -------------------------------------------------------------------- -Mon May 23 08:50:03 UTC 2011 - idonmez@novell.com - -- Add pidgin-sipe-1.11.2-gcc46.patch: remove write-only variables - to fix compilation with gcc 4.6 + - Feature #80: Move parsing of login name (Stefan Becker) + - Feature #79: support for Adium group chat bookmarks (David Matz, Stefan Becker) + - Feature #78: Support searching for SIP ID (Stefan Becker) + - Feature #76: ADFS can't always be used (Stefan Becker) + * for accounts that have Multi-Factor Authentication (MFA) enabled + - Feature #73: Support buddy photos from contactCard (Stefan Becker) + - Feature #65: Fall back from Kerberos to NTLM (Stefan Becker) + - Fixed #277: Raised contact names (Stefan Becker) + - Fixed #240: Corrupted HTTP response crashes SIPE (Stefan Becker) + - fix calendar state machine when EWS URL is set (Stefan Becker) + - fall back to [MS-DLX] BasicSearch to improve search experience (Stefan Becker, various) + - implement search functionality for UCS (Stefan Becker) + - adium: add chat room list UI (David Matz) + - adium: fix duplicate debug log messages (Stefan Becker) + - support for libnice TCP mode (Youness Alaoul, Jakub Adam) + - refactor CCCP request code (Jakub Adam) + +------------------------------------------------------------------- +Tue Dec 29 23:52:00 UTC 2014 - chemobejk@gmail.com + +- Update to new upstream version, 1.18.5: + - Fixed #276: Redundant "const" breaks build with clang (Stefan Becker) + - Fixed #269: purple idle-away converted to Away (Stefan Becker) + - svc: use authuser for RealmInfo request (Stefan Becker) + - adium: add release checking script (Stefan Becker) + - mingw: update fetch script to Pidgin 2.10.11 (Stefan Becker) + - updated translations: Italian (it), Swedish (sv) + +------------------------------------------------------------------- +Sat Oct 18 15:42:00 UTC 2014 - chemobejk@gmail.com + +- Update to new upstream version, 1.18.4: + - Fixed #263: ADFS fails when user and login name differ (Stefan Becker) + - Fixed #262: Adium: SIPE doesn't auto- or re-connect (Stefan Becker) + - fixed memory leaks (Stefan Becker) + - fixed processing of presence publish event response (John Zhang, Stefan Becker) + * fixes a longstanding issue that the Pidgin user status sometimes + didn't switch back to "Available" after the end of a meeting + +------------------------------------------------------------------- +Sat Aug 16 12:50:00 UTC 2014 - chemobejk@gmail.com + +- Update to new upstream version, 1.18.3: + - Fixed #259: HTML response to EWS autodiscover triggers libxml2 assert (Stefan Becker) + - Fixed #258: V&V call gets rejected when IPv6 is enabled (Stefan Becker, Jakub Adam) + - Fixed #257: Windows 7: SIPE crashes after a minute (Stefan Becker) + - mingw: improve crash information reporting (Stefan Becker) + +------------------------------------------------------------------- +Sat Jun 7 18:08:00 UTC 2014 - chemobejk@gmail.com + +- Update to new upstream version, 1.18.2: + - Fixed #255: Crash when PersistentChat sends BYE instead of response (Stefan Becker) + - Fixed #248: Remove libpurple SSL configure check (Stefan Becker) + - Fixed #245: "Unable to resolve DNS SRV record" error when joining conference (Stefan Becker) + - Fixed #241: Adium filters ":" from "sip:" (Stefan Becker) + - Fixed #210: Conference call ends with error message (for real this time, Jakub Adam) + - ews: extract settings also from type EXPR (Stefan Becker) + - ucs: honor user specified email URL (Stefan Becker) + - adium: fix compilation on OS X 10.7 (Stefan Becker) + - updated Transifex URLs (Stefan Becker) + - updated translations: Hindi (hi), Telugu (te) + +------------------------------------------------------------------- +Sat Apr 12 18:08:00 UTC 2014 - chemobejk@gmail.com + +- Update to new upstream version, 1.18.1: + - Fixed #238: False "not delivered" in conference (Stefan Becker) + - Fixed #237: HTML escaping not removed from URL (Stefan Becker) + - Fixed #210: Conference call ends with error message (Jakub Adam) + - fix endless loop with failed HTTP Basic authentication (Stefan Becker) + - fix crash when gstreamer nice plugin is missing (Stefan Becker, Jakub Adam) + - fix EWS autodiscover for some Office 365 users (Stefan Becker) + - purple: fix missing "Copy to" in buddy menu (Stefan Becker) + - purple/adium: ignore empty search values (Stefan Becker) + - adium: fix group chat UI (Stefan Becker) + - adium: implement BEAST mitigations for 10.8.5 (Michael Lamb) + - add indication when user is connected from a mobile device (Harris Kauffman) + - updated translations: Chinese (zh_CN), Portuguese (pt) + +------------------------------------------------------------------- +Sat Jan 11 15:43:00 UTC 2014 - chemobejk@gmail.com + +- Update to new upstream version, 1.18.0: + - Feature #71: Add support for EWS Autodiscover redirection (Stefan Becker) + - Feature #69: Add UI support for (group) chats (Michael Lamb) + * NOTE: Adium does not have an UI to fetch the room list + - Feature #64: Add support for GSS-NTLMSSP (Stefan Becker) + * sip-sec-krb5.c module has been renamed to sip-sec-gssapi.c + * if gssapi/gssapi_ntlmssp.h is detected then sip-sec-ntlm.c will + be disabled and NTLM will be handled by sip-sec-gssapi.c instead + * NOTE: at the time of this writing the user has to set up + GSS-NTLMSSP by hand on his system, i.e. /etc/gss/mech + - Fixed #227: Adium client doesn't save email option settings (Harris P. Kauffman) + - Fixed #216: SIPE stops working on Mavericks (Stefan Becker, Michael Lamb) + * add an UI option to disable SSL BEAST mitigations + * NOTE: requires Adium 1.5.10 + - Fixed #197: Account stays in connecting stage (Harris P. Kauffman) + - cleanup for sip-sec Kerberos & SSPI modules (Stefan Becker) + * replace old TGT hack with gss_acquire_cred_with_password() + * clean up Kerberos detection in configure + * remove special case handling; code is more straight-forward now + * thanks to David Woodhouse and Simo Sorce for the GSSAPI information + - implement internal keepalive handling (Stefan Becker) + - implement crypto backend based on OpenSSL (Stefan Becker) + - adium: Xcode project files update (Michael Lamb) + - adium: replace NSS crypto backend with OpenSSL (Stefan Becker) + * NOTE: please make sure to read the updated build instructions! + +------------------------------------------------------------------- +Wed Dec 11 19:40:00 UTC 2013 - chemobejk@gmail.com + +- Update to new upstream version, 1.17.3: + - Fixed #225: HTTP re-authentication with NTLM fails (Stefan Becker) + - Fixed #222: SIPE crashes when groupchat session expires (Stefan Becker) + - fix UCS Persona key extraction (Stefan Becker) + +------------------------------------------------------------------- +Sat Nov 30 16:49:00 UTC 2013 - chemobejk@gmail.com + +- Update to new upstream version, 1.17.2: + - Fixed #214: Typing notification does not always work (Stefan Becker) + * reverted one change which caused problems for some users + - Fixed #222: SIPE crashes when groupchat session expires (Stefan Becker) + - updated translations: Romanian (ro) + +------------------------------------------------------------------- +Sat Nov 16 14:46:00 UTC 2013 - chemobejk@gmail.com + +- Update to new upstream version, 1.17.1: + - Fixed #215: Password not entity encoded in WSSE element (Stefan Becker) + - Fixed #214: Typing notification does not always work (Stefan Becker) + - accept alternatives for webticket timestamp/keydata (Stefan Becker) + - adium: add "don't publish calendar" to account UI (Stefan Becker) + - contrib: add SSL BEAST mitigation patch for Adium (Stefan Becker) + - updated translations: French (fr) + +------------------------------------------------------------------- +Sat Sep 21 14:06:00 UTC 2013 - chemobejk@gmail.com + +- Update to new upstream version, 1.17.0: + - Feature #62: Support for Lync 2013 Unified Contact Store (Stefan Becker) + - Feature #59: Support for Lync 2013 Persistent Chats (Stefan Becker) + - Fixed #211: Status "away" or "busy" incorrectly mapped to "Invisible" (Michael Lamb) + - Fixed #209: group chat doesn't like HTML (Stefan Becker) + - Fixed #200: OCS archiving system blocks audio/video connection (Jakub Adam) + - Fixed #187: Duplicate messages in group chat (Stefan Becker) + - Fixed #184: Duplicate users showing in Group Chat (Stefan Becker) + - fix EWS autodiscover for Office 365 (Stefan Becker) + - add support for group chat history (Stefan Becker) + - add support for buddy photos on Lync 2013 (Stefan Becker) + +------------------------------------------------------------------- +Sat Jul 13 14:29:00 UTC 2013 - chemobejk@gmail.com + +- Update to new upstream version, 1.16.1: + - Feature #66: Windows DLL version information (Stefan Becker) + - fix call failure when host has multiple IP addresses (Jakub Adam) + - fix buddy list handling after moving to Lync 2013 (Stefan Becker) + * Lync 2013 migrates buddy list to Unified Contact Store (UCS) + * NOTE: modifying the buddy list is *NOT* supported yet! + - crash fixes for new HTTP stack (Stefan Becker) + +------------------------------------------------------------------- +Sat Jun 8 16:58:00 UTC 2013 - chemobejk@gmail.com + +- Update to new upstream version, 1.16.0: + - Feature #58: Implement Digest authentication scheme for SIP Proxy Authentication (Stefan Becker) + - Fixed #196: Useragent value not forwarded to core (Michael Lamb) + - Fixed #193: Pidgin Status changes stop working (Stefan Becker) + - Fixed #186: Users appear offline when they are not (Stefan Becker) + - fix kinit-less use case with krb5 >= 1.11 (Stefan Becker) + - rewritten HTTP stack from scratch (Stefan Becker) + * cleaner, layered and hopefully less error-prone implementation + * HTTP stack internals no longer exposed to user code + * reduced network traffic and less SSL handshakes by utilizing HTTP/1.1 + connection keep alive for multiple HTTP requests to the same host + - switch purple backend to deferred destruction approach (Stefan Becker) + * Pidgin should no longer crash at connection close, even in corner cases + - add menu entry to make a call with a phone number (Jakub Adam) + - some progress on telepathy backend (Stefan Becker) + * add TLS certificate accept/reject user interaction + * add "Single Sign-On" & "Don't Publish Calendar" account options + +------------------------------------------------------------------- +Sun Apr 7 12:44:00 UTC 2013 - chemobejk@gmail.com + +- Update to new upstream version, 1.15.1: + - NOTE: SIPE SourceForge project got updated. Because of this all bug and feature request numbers have changed. + - Fixed #190: SIP 407 response rejected with invalid message signature (Stefan Becker) + - Fixed #189: Adium SIPE plugin vs. libpurple linking issues (Michal Lamb) + - fixed free-after-use issue that caused crashes for some users (Stefan Becker) + - fixed broken NTLM fallback in Negotiate (Stefan Becker) + - fixed subscriptions expiration by subscribing again after re-authentication (Stefan Becker) + - allow different user name and login for Office 365 authentication (Stefan Becker) + - add SIPE version & git commit ID to debug log (Stefan Becker) + - added valgrind log analyzer script (Stefan Becker) + - added NTLM message anaylzer (Stefan Becker) + - updated translations: Hungarion (hu), Romanian (ro) + - updated Adium port (Michael Lamb, Harris P. Kauffman) + +------------------------------------------------------------------- +Mon Apr 1 13:42:00 UTC 2013 - chemobejk@gmail.com + +- New project maintainer +- Fast forward files to prepare for upcoming 1.15.1 release +- Replace old Debian packaging files with new 3.0 (quilt) ones +- Add repository specific Debian .dsc to enable V&V where possible + +------------------------------------------------------------------- +Wed Aug 8 11:57:14 UTC 2012 - john@redux.org.uk + +- Update to new upstream version, 1.13.2: + - tls: fix buffer overrun (Oleksandr Hryshchuk, Stefan Becker) + - win32: fix TCP connections (Stefan Becker) + - nsis: fix broken locale installation (Stefan Becker) + - updated translations: French (fr) + - various build fixes (Stefan Becker, Jakub Adam) + +------------------------------------------------------------------- +Wed May 16 10:56:37 UTC 2012 - john@redux.org.uk + +- Update to new upstream version, 1.13.1: + - detect incompatible encryption level with Lync (Jakub Adam) + - purple: add URI validity check to Add Buddy callback (Stefan Becker) + - new translations: Romanian (ro), Turkish (tr) + - various build fixes (Stefan Becker) + - added [MS-SIPAE] TLS-DSK authentication scheme (Stefan Becker) + * TLS-DSK has been introduced in Lync + * mandatory for Office365 accounts + * also works for non-public Lync installations + * does not work yet with SSPI on Windows + - added [MS-DLX] based Get Info/Contact Search (Stefan Becker) + * [MS-PRES] SIP-Based Active Directory Search is disabled in Lync + - added experimental media TCP transport (Jakub Adam) + - make it compile against the latest purple 3.0.x API (Stefan Becker) + - make it compile against the latest glib2 2.31.x API (Stefan Becker) + - completed cleanup: core no longer requires libpurple (Stefan Becker) + - refactored crypto code, ie. NSS can replaced if necessary (Stefan Becker) + - sipe-domino.c is no longer built under UNIX to remove dead code (Stefan Becker) + - restricted XXX_CFLAGS to modules that need them (Stefan Becker) + - NSS is now a mandatory build requirement (Stefan Becker) + - decoupled SSPI from HAVE_LIBKRB5 flag. New flag is HAVE_SSPI (Stefan Becker) + - OBS mingw packages now use SSPI instead of NTLM (Stefan Becker) + - added NSIS package generation to OBS mingw packages (Stefan Becker) + - removed kopete backend. KDE is moving to telepathy (Stefan Becker) + - added MinGW cross-compilation on Linux instructions (Stefan Becker) + +------------------------------------------------------------------- +Tue Sep 20 20:27:56 UTC 2011 - john@redux.org.uk + +- Update to version 1.12.0 + + Feature #3064877: Add support for OCS2007R2 Group Chat (Stefan Becker) + + Feature #3311026: Support for HTTP/1.1 Transfer-Encoding: chunked (Stefan Becker) + + Fixed #2834758: First NTLM signature check after startup fails (Stefan Becker) + + Fixed #3082602: Crash on Autodiscover (Stefan Becker) + + Fixed #3090663: Re-authentication fails (Stefan Becker) + + Fixed #3092324: Core dump in "make check" (psfales) + + Fixed #3130915: Failed to authenticate to server (Stefan Becker) + + Fixed #3148124: sipe segfaults during login on Solaris (Jakub Adam) + + Fixed #3150482: "configure --with-vv" test uses wrong include (Stefan Becker) + + Fixed #3156430: Messages not Delivered (rwinchsf, Stefan Becker) + + Fixed #3161273: Lost Connection Gives No Error Message (rwinchsf, Stefan Becker) + + Fixed #3198585: Extra line breaks (Stefan Becker) + + Fixed #3267073: False "could not be delivered" errors (sort of..., Stefan Becker) + + Fixed #3399007: Crash when sipe_cal_working_hours->days_of_week is NULL (Stefan Becker) + + Patch #3091490: Make 1.11.0 Compile on FreeBSD (jprather) + + Patch #3108246: Patch for better windows installer (archrival, galiven) + + add random Ms-Conversation-ID to INVITE (Jakub Adam) + + fix parsing of P-Asserted-Identity header (Jakub Adam) + + added MS TURN support (Jakub Adam) + + fix crash on zero length password in NTLM (Vladimir Ushakov) + + implement timeouts for SIP request. Used for REGISTER (Stefan Becker) + + more work on Voice & Video call support (Jakub Adam) + + make it compile against the purple 2.8.x & 3.0.x APIs (Stefan Becker) + + more internal changes to prepare for non-purple backends (Stefan Becker) + + added integration for transifex.net update (Stefan Becker) + + configure improvements for 64-bit: use libdir, gsize/size_t compatibility (Stefan Becker) + + update compiler warnings configuration for all build platforms (Stefan Becker) + + updated Adium port (Matthew Duggan) + + mingw build updates (Harris P. Kauffman, Stefan Becker) + + added miranda port (Jochen De Smet) + + added mingw to OpenSUSE Build Service configuration (Stefan Becker) ------------------------------------------------------------------- -Thu Nov 18 10:39:02 CET 2010 - dimstar@opensuse.org +Fri Feb 4 20:24:34 UTC 2011 - john@redux.org.uk -- Update to version 1.11.2: - + Sipe-sign: fix parsing of P-Asserted-Identity header +- Update to version 1.11.2 + + fix parsing of P-Asserted-Identity header + Fixed memory leaks - + sf#3090663: Re-authentication fails - + sf#3091490: Make 1.11.0 Compile on FreeBSD - + sf#3092324: Core dump in "make check" -- Changes from version 1.11.1: - + sf#2834758: First NTLM signature check after startup fails - + purple: fix memory leak in sipe_backend_transport_connect() - error path - + sf#3082602: Crash on Autodiscover - + Build fixes. - -------------------------------------------------------------------- -Sun Oct 17 10:07:58 UTC 2010 - dimstar@opensuse.org - -- Some simple preparations to enable telepathy plugin once it - becomes available. - -------------------------------------------------------------------- -Wed Oct 6 09:02:38 UTC 2010 - john@redux.org.uk - -- Update to version 1.11.0. - + Feature sf#2945346 - added Lotus Notes/Domino Calendar - integration. - + Fixed sf#2971422: idle check for OCS2005 presence case (Stefan - Becker) - + Fixed sf#2982424: krb5 build errors on FreeBSD (Stefan Becker) - + Fixed sf#2997639: pidgin crash after accepting cert (Stefan - Becker) - + Fixed sf#3001523: Cancelling a long pending file transfer - crashes Pidgin (Jakub Adam) - + Fixed sf#3002993: Group Name issues with ampersand (Stefan - Becker) - + Fixed sf#3029228: Calendar published at/with incorrect time - (Stefan Becker) - + Fixed sf#3029929: Crash with outlook 2k3 Calendar (Stefan - Becker) - + Fix logout from OCS (Jakub Adam) - + Implement workaround for buddy list menu memory leaks - (Stefan Becker) - + Dropped UDP transport support (Stefan Becker) - + Rewrote TCP & TLS transport support (Stefan Becker) - + HTTP improvements: GET, cookies (pier11) - + Alternative crypt/digest implementation based on NSS (pier11) - + Rewrote message debug log and implemented an analyzer script - for it (Stefan Becker) - + More internal changes to prepare for non-purple backends - (Stefan Becker) - + New translation: Dutch (Flemish) 'nl' (fieona, ridiekel) - + New translation: Swedish 'sv' (Rijad) - + Added translations 'ar' 'hu' 'ja' 'ko' 'sv' 'zh_TW' submitted - by Novell - + New build option: nss/mozilla-nss/microb-engine-nss for - non-purple backends - + Add build option for kopete backend (Stefan Becker) - + Updated Adium port (Emanuele Zattin) + + Fixed bug #3090663: Re-authentication failures + + Fixed bug #3092324: Core dump in "make check" + + Fixed bug #2834758: First NTLM signature check after starup + fails + + Fix memory leak in sipe_backend_transport_connect() error path + + Fixed bug #3082602: Crash on Autodiscover + + Configure now uses libdir and datadir + + configure: update 32-bit vs. 64-bit header conflict test + + debian: build stability fix in post-install + +------------------------------------------------------------------- +Wed Oct 6 08:36:02 UTC 2010 - john@redux.org.uk + +- Update to version 1.11.0 ------------------------------------------------------------------- -Tue Jun 29 10:38:37 UTC 2010 - john@redux.org.uk +Mon Jun 28 08:43:10 UTC 2010 - john@redux.org.uk - Update to version 1.10.1 + Fixed bug in the SIPE buddy list hash table functionality @@ -470,90 +396,19 @@ + Fixed Pidgin 2.7.0 API compatibility. ------------------------------------------------------------------- -Tue Jun 15 21:30:52 UTC 2010 - john@redux.org.uk - -- Fix openSUSE 11.1 build by removing unnecessary BuildRequires. - -------------------------------------------------------------------- -Fri Jun 4 17:28:29 CEST 2010 - sbrabec@suse.cz - -- Added support for translation-update-upstream (FATE#301344). - -------------------------------------------------------------------- -Sun Apr 04 13:30:00 BST 2010 - pier11@operamail.com - -- Update to version 1.10.0: - + Feature sf#2823160: Access Levels (2007+ environment) - + Feature sf#2957811: add support for "automaton" class - + Feature sf#2972823: fail on in-line variable declarations - + Fixed sf#2971422: handle OCS 2005 idiosyncrasy of varying SIP - URI case - + Fixed sf#2981563: Authentication protocol v4 - invalid - signature of some incoming messages containing - P-Asserted-Identity or P-Preferred-Identity with uppercased SIP - or TEL in URI. - + Fixed publication/"409 Conflict" endless looping - + Prepare for Pidgin 2.7.0 - + Added SVG icon artwork - + Many changes to configure script. Be sure to look at "configure - --help" - + Many internal changes to prepare for non-purple backends - + New build requirements: libxml2, glib-2.0 >= 2.12.0 - + New build option: gmime-2.4 >= 2.4.16 or gmime-2.6 >= 2.5.2 for - non-purple backends -- Add BuildRequires: glib2-devel >= 2.12.0 -- Add --enable-purple --disable-telepathy to configure -- Add %check section. -- Add %{_datadir}/pixmaps/pidgin/protocols/*/sipe.svg with - workarounds for SLE11, openSUSE 11.0/1 don't have - pidgin/protocols/scalable directory. - -------------------------------------------------------------------- -Wed Mar 17 22:11:51 CET 2010 - dimstar@opensuse.org - -- Update to version 1.9.1: - + sf#2969327: Kerberos authentication always fails on *nix - platforms - + sf#2968287: Authentication failure in scenario when director - server is Office Communications Server 2007 or above and home - server is Live Communications Server 2005 - + Send BYE when response to IM message is 408/480/481 - + Re-enable offline status to be user settable. - -------------------------------------------------------------------- -Wed Mar 10 14:37:21 CET 2010 - dimstar@opensuse.org - -- Update to version 1.9.0: - + Contributed File transfer functionality. File encryption is - supported. - + NTLMv2 and NTLMv2 Session Security support - + Implemented SIP Authentication Extensions protocol version 4 - and 3 - + Adoption for commercial UNIX - HP/UX, Irix, Solaris - big - endian fixes and build improvements - + Packaged for Maemo platform (Nokia N900, etc.) at Maemo.org. - Works with Pidgin from the same site. - + Adoption of file transfer for Windows build - + Official Debian package files in contrib - + another shot at presence update problems - + fix crash caused by uninitialized security contexts - + Code analysis with Coverity Prevent. - + Fix for "SIP/2.0 481 Call leg unavailable" error - + Increased libpurple build requisite to >= 2.4.0 - + Updated translations. - -------------------------------------------------------------------- -Thu Feb 18 01:58:10 CET 2010 - vuntz@opensuse.org +Thu Feb 11 01:15:00 CET 2010 - pier11@operamail.com - Update to version 1.8.1: - + Many crash fixes for error or corner cases in calendar + + many crash fixes for error or corner cases in calendar integration - + More detailed code analysis with Coverity Prevent + + more detailed code analysis with Coverity Prevent + OpenSUSE Build Service configuration files + Fix NTLM crash if login setting is undefined + Use of g_str_has_prefix() available since glib 2.2 and null-safe - + Build fixes for older OS releases. + + build fixes for older OS releases, e.g. Ubuntu older than 9.10 +- Changed source from .bz2 to .gz. Seems OBS for Debian doesn't + understand .bz2 source file. ------------------------------------------------------------------- Thu Feb 11 01:15:00 CET 2010 - vuntz@opensuse.org diff -Nru pidgin-sipe-1.21.1/contrib/opensuse-build-service/pidgin-sipe-gstreamer1.dsc pidgin-sipe-1.22.1/contrib/opensuse-build-service/pidgin-sipe-gstreamer1.dsc --- pidgin-sipe-1.21.1/contrib/opensuse-build-service/pidgin-sipe-gstreamer1.dsc 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/contrib/opensuse-build-service/pidgin-sipe-gstreamer1.dsc 2017-06-11 15:41:22.000000000 +0000 @@ -1,9 +1,9 @@ Format: 3.0 (quilt) Source: pidgin-sipe -Version: 1.21.1-1 +Version: 1.22.1-1 Binary: pidgin-sipe Maintainer: pidgin-sipe Architecture: any Standards-Version: 3.9.1 -Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 5), pkg-config, libglib2.0-dev (>= 2.28.0), libxml2-dev, libssl-dev, pidgin-dev, libpurple-dev (>= 2.8.0), libtool, intltool, libkrb5-dev, libzephyr-dev, libnice-dev (>= 0.1.0), libgstreamer1.0-dev, libtelepathy-glib-dev (>= 0.18.0), libgmime-2.6-dev +Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 5), pkg-config, libglib2.0-dev (>= 2.28.0), libxml2-dev, libssl-dev, pidgin-dev, libpurple-dev (>= 2.8.0), libtool, intltool, libkrb5-dev, libzephyr-dev, libnice-dev (>= 0.1.0), libgstreamer1.0-dev, libgstreamer-plugins-base1.0-dev, libfarstream-0.2-dev, libtelepathy-glib-dev (>= 0.18.0), libgmime-2.6-dev Homepage: http://sipe.sourceforge.net/ diff -Nru pidgin-sipe-1.21.1/contrib/opensuse-build-service/pidgin-sipe.spec pidgin-sipe-1.22.1/contrib/opensuse-build-service/pidgin-sipe.spec --- pidgin-sipe-1.21.1/contrib/opensuse-build-service/pidgin-sipe.spec 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/contrib/opensuse-build-service/pidgin-sipe.spec 2017-06-11 15:41:22.000000000 +0000 @@ -92,6 +92,7 @@ %if 0%{?suse_version} >= 1315 %define has_gstreamer 0 %define has_gstreamer1 1 +%define has_farstream 1 %undefine nice_gstreamer %endif %endif @@ -111,6 +112,7 @@ %define build_telepathy 1 %define build_ktp 1 %if 0%{?fedora} >= 20 +%define has_farstream 1 %define nice_gstreamer libnice-gstreamer %if 0%{?fedora} >= 21 %define has_appdata 1 @@ -146,7 +148,7 @@ %endif %endif Summary: Pidgin protocol plugin to connect to MS Office Communicator -Version: 1.21.1 +Version: 1.22.1 Release: 1 Source: pidgin-sipe-%{version}.tar.gz Group: %{pkg_group} @@ -201,6 +203,10 @@ %if 0%{?has_gstreamer1:1} BuildRequires: pkgconfig(gstreamer-1.0) %endif +%if 0%{?has_farstream:1} +BuildRequires: pkgconfig(farstream-0.2) +BuildRequires: pkgconfig(gio-2.0) +%endif # Requirements for telepathy backend %if 0%{?build_telepathy:1} BuildRequires: pkgconfig(telepathy-glib) >= 0.18.0 @@ -246,7 +252,6 @@ * Microsoft Lync Server * Microsoft Office Communications Server (OCS 2007/2007 R2) * Microsoft Live Communications Server (LCS 2003/2005) - * Reuters Messaging With this plugin you should be able to replace your Microsoft Office Communicator client with Pidgin. @@ -273,7 +278,6 @@ * Microsoft Lync Server * Microsoft Office Communications Server (OCS 2007/2007 R2) * Microsoft Live Communications Server (LCS 2003/2005) - * Reuters Messaging This package provides the protocol plugin for libpurple clients. @@ -296,7 +300,6 @@ * Microsoft Lync Server * Microsoft Office Communications Server (OCS 2007/2007 R2) * Microsoft Live Communications Server (LCS 2003/2005) - * Reuters Messaging This package provides the icon set for Empathy. @@ -318,7 +321,6 @@ * Microsoft Lync Server * Microsoft Office Communications Server (OCS 2007/2007 R2) * Microsoft Live Communications Server (LCS 2003/2005) - * Reuters Messaging This package provides the profile for KTP account manager. %endif @@ -340,7 +342,6 @@ * Microsoft Lync Server * Microsoft Office Communications Server (OCS 2007/2007 R2) * Microsoft Live Communications Server (LCS 2003/2005) - * Reuters Messaging This package provides the protocol support for Telepathy clients. @@ -374,7 +375,6 @@ * Microsoft Lync Server * Microsoft Office Communications Server (OCS 2007/2007 R2) * Microsoft Live Communications Server (LCS 2003/2005) - * Reuters Messaging This package contains the NSIS installer package of the protocol plugin for Pidgin on Windows. @@ -570,6 +570,18 @@ %changelog +* Sun Jun 11 2017 J. D. User 1.22.1 +- update to 1.22.1 + +* Wed Feb 01 2017 J. D. User 1.22.0 +- update to 1.22.0 + +* Sun Dec 18 2016 J. D. User 1.21.1-*git* +- add BR gio-2.0 + +* Wed Jun 15 2016 J. D. User 1.21.1-*git* +- add BR farstream-0.2 + * Sat May 28 2016 J. D. User 1.21.1 - update to 1.21.1 diff -Nru pidgin-sipe-1.21.1/contrib/opensuse-build-service/pidgin-sipe-telepathy.dsc pidgin-sipe-1.22.1/contrib/opensuse-build-service/pidgin-sipe-telepathy.dsc --- pidgin-sipe-1.21.1/contrib/opensuse-build-service/pidgin-sipe-telepathy.dsc 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/contrib/opensuse-build-service/pidgin-sipe-telepathy.dsc 2017-06-11 15:41:22.000000000 +0000 @@ -1,6 +1,6 @@ Format: 3.0 (quilt) Source: pidgin-sipe -Version: 1.21.1-1 +Version: 1.22.1-1 Binary: pidgin-sipe Maintainer: pidgin-sipe Architecture: any diff -Nru pidgin-sipe-1.21.1/contrib/opensuse-build-service/PKGBUILD pidgin-sipe-1.22.1/contrib/opensuse-build-service/PKGBUILD --- pidgin-sipe-1.21.1/contrib/opensuse-build-service/PKGBUILD 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/contrib/opensuse-build-service/PKGBUILD 2017-06-11 15:41:22.000000000 +0000 @@ -1,25 +1,28 @@ # Maintainer: SIPE Project pkgname=pidgin-sipe -pkgver=1.21.1 +pkgver=1.22.1 pkgrel=1 pkgdesc="Libpurple protocol plugin to connect to MS Office Communicator" -arch=(i686 x86_64) -license=('GPL') +arch=('i686' 'x86_64') +license=('GPL2') url="http://sipe.sourceforge.net/" -depends=('glib2' 'gtk2' 'gmime' 'gettext' 'libpurple' 'nss') -makedepends=('pkgconfig' 'intltool' 'nss') +depends=('gmime' 'libpurple') +makedepends=('intltool') options=('!libtool' '!buildflags') source=( ${pkgname}-${pkgver}.tar.gz ) sha256sums=( '@@SHA256SUM@@' ) build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr - make || return 1 + cd ${pkgname}-${pkgver} + + ./configure --prefix=/usr + + make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install || return 1 + cd ${pkgname}-${pkgver} + + make DESTDIR=${pkgdir} install } diff -Nru pidgin-sipe-1.21.1/contrib/rpm/pidgin-sipe.spec pidgin-sipe-1.22.1/contrib/rpm/pidgin-sipe.spec --- pidgin-sipe-1.21.1/contrib/rpm/pidgin-sipe.spec 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/contrib/rpm/pidgin-sipe.spec 2017-06-11 15:41:22.000000000 +0000 @@ -25,7 +25,7 @@ Name: pidgin-sipe Summary: Pidgin protocol plugin to connect to MS Office Communicator -Version: 1.21.1 +Version: 1.22.1 %if 0%{?_with_git:1} Release: %{gitcount}.%{git}%{?dist} Source0: %{name}-%{git}.tar.bz2 @@ -54,6 +54,8 @@ # Use "--without vv" to disable Voice & Video features %if !0%{?_without_vv:1} BuildRequires: pkgconfig(purple) >= 2.8.0 +BuildRequires: pkgconfig(farstream-0.2) +BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(nice) >= 0.1.0 %if 0%{?fedora} >= 22 BuildRequires: pkgconfig(gstreamer-1.0) @@ -98,7 +100,6 @@ * Microsoft Lync Server * Microsoft Office Communications Server (OCS 2007/2007 R2) * Microsoft Live Communications Server (LCS 2003/2005) - * Reuters Messaging With this plugin you should be able to replace your Microsoft Office Communicator client with Pidgin. @@ -129,7 +130,6 @@ * Microsoft Lync Server * Microsoft Office Communications Server (OCS 2007/2007 R2) * Microsoft Live Communications Server (LCS 2003/2005) - * Reuters Messaging This package provides the protocol plugin for libpurple clients. @@ -151,7 +151,6 @@ * Microsoft Lync Server * Microsoft Office Communications Server (OCS 2007/2007 R2) * Microsoft Live Communications Server (LCS 2003/2005) - * Reuters Messaging This package provides the icon set for Empathy. @@ -172,7 +171,6 @@ * Microsoft Lync Server * Microsoft Office Communications Server (OCS 2007/2007 R2) * Microsoft Live Communications Server (LCS 2003/2005) - * Reuters Messaging This package provides the profile for KTP account manager. @@ -201,7 +199,6 @@ * Microsoft Lync Server * Microsoft Office Communications Server (OCS 2007/2007 R2) * Microsoft Live Communications Server (LCS 2003/2005) - * Reuters Messaging This package provides the protocol support for Telepathy clients. %endif @@ -301,6 +298,18 @@ %changelog +* Sun Jun 11 2017 J. D. User 1.22.1 +- update to 1.22.1 + +* Wed Feb 01 2017 J. D. User 1.22.0 +- update to 1.22.0 + +* Sun Dec 18 2016 J. D. User 1.21.1-*git* +- add BR gio-2.0 + +* Wed Jun 15 2016 J. D. User 1.21.1-*git* +- add BR farstream-0.2 + * Sat May 28 2016 J. D. User 1.21.1 - update to 1.21.1 diff -Nru pidgin-sipe-1.21.1/debian/changelog pidgin-sipe-1.22.1/debian/changelog --- pidgin-sipe-1.21.1/debian/changelog 2017-02-24 11:15:15.000000000 +0000 +++ pidgin-sipe-1.22.1/debian/changelog 2017-06-18 12:04:30.000000000 +0000 @@ -1,8 +1,23 @@ -pidgin-sipe (1.21.1-1build1) zesty; urgency=medium +pidgin-sipe (1.22.1-1) unstable; urgency=medium - * No-change rebuild against libnspr4 + * New upstream release (Closes: #853612). + - Feature #93: Support for Lync Autodiscover + - Feature #6: Application Sharing Viewer + - Fixed #315: Crash when contact list is empty + - Fixed #314: sipe login problems with long pw + - Fixed #320: Multiple client detection broken + - separate logging and debugging output + - speed up Lync Autodiscover by using AccessLocation + - purple: avoid rare SSL read deadlock + - crypto: make code compile with OpenSSL 1.1.0 + - drop references to Reuters Messaging + - new translations: Greek (el), Lithuanian (lt), Russian (ru), + Swedish (sv), Turkish (tr) + * Add libfarstream-0.2-dev and libgstreamer-plugins-base1.0-dev + to Build-Depends. + * Recommend remmina RDP client plugin. - -- Andy Whitcroft Fri, 24 Feb 2017 11:15:15 +0000 + -- Jakub Adam Sun, 18 Jun 2017 14:04:30 +0200 pidgin-sipe (1.21.1-1) unstable; urgency=medium diff -Nru pidgin-sipe-1.21.1/debian/control pidgin-sipe-1.22.1/debian/control --- pidgin-sipe-1.21.1/debian/control 2016-05-02 05:36:24.000000000 +0000 +++ pidgin-sipe-1.22.1/debian/control 2017-02-02 16:20:17.000000000 +0000 @@ -5,7 +5,8 @@ Homepage: http://sipe.sourceforge.net/ Build-Depends: dpkg-dev (>= 1.16.1~), debhelper (>= 9), pkg-config, libglib2.0-dev (>= 2.12.0), libxml2-dev, libpurple-dev (>= 2.10.12), libtool, - intltool, libkrb5-dev, libnss3-dev, libnice-dev (>= 0.1.4), libgstreamer1.0-dev + intltool, libkrb5-dev, libnss3-dev, libnice-dev (>= 0.1.4), libfarstream-0.2-dev, + libgstreamer-plugins-base1.0-dev Standards-Version: 3.9.8 Vcs-Git: https://anonscm.debian.org/git/collab-maint/pidgin-sipe.git Vcs-Browser: https://anonscm.debian.org/gitweb/?p=collab-maint/pidgin-sipe.git @@ -14,7 +15,7 @@ Section: net Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Recommends: gstreamer1.0-libav, gstreamer1.0-x +Recommends: gstreamer1.0-libav, gstreamer1.0-x, remmina-plugin-rdp Description: Pidgin plugin for MS Office Communicator and MS Lync A third-party plugin for the Pidgin multi-protocol instant messenger. It implements the extended version of SIP/SIMPLE used by various products: diff -Nru pidgin-sipe-1.21.1/debian/copyright pidgin-sipe-1.22.1/debian/copyright --- pidgin-sipe-1.21.1/debian/copyright 2015-08-31 06:02:40.000000000 +0000 +++ pidgin-sipe-1.22.1/debian/copyright 2017-06-18 12:04:30.000000000 +0000 @@ -7,7 +7,7 @@ 2010-2014, Jakub Adam 2008, Novell, Inc. 2009-2010, pier11 - 2007-2014, SIPE Project + 2007-2017, SIPE Project 2011-2013, Stefan Becker 2005, Thomas Butter 2010, Tomáš Hrabčík diff -Nru pidgin-sipe-1.21.1/NEWS pidgin-sipe-1.22.1/NEWS --- pidgin-sipe-1.21.1/NEWS 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/NEWS 2017-06-11 15:41:22.000000000 +0000 @@ -1,3 +1,13 @@ -version 1.21.1 "Bug Fixes I" (2016-05-28) - - various bug fixes in media support (Jakub Adam) - - configure no longer ignores CFLAGS/LDFLAGS/LIBS (Stefan Becker) +version 1.22.1 "Bug Fixes I" (2017-06-11) + - Fixed #320: Multiple client detection broken (Stefan Becker) + - speed up Lync Autodiscover by using AccessLocation (Andrey Vaynberger) + - adium: update build instructions for Xcode 7.x or newer (Stefan Becker) + * the build environment used for releases 1.22.0 or older (Xcode 6.x + on OS X 10.11) is no longer available to the project + * releases starting with 1.??.? will use Xcode 8.x on macOS 10.12 + * build target continues to be OS X 10.9 + - purple: avoid rare SSL read deadlock (Stefan Becker) + - various minor fixes (Michael Olbrich) + - crypto: make code compile with OpenSSL 1.1.0 (Stefan Becker) + - drop references to Reuters Messaging (Stefan Becker) + - updated translations: Lithuanian (lt), Russian (ru), Swedish (sv), Turkish (tr) diff -Nru pidgin-sipe-1.21.1/po/ar.po pidgin-sipe-1.22.1/po/ar.po --- pidgin-sipe-1.21.1/po/ar.po 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/po/ar.po 2017-06-11 15:41:22.000000000 +0000 @@ -11,7 +11,7 @@ "Project-Id-Version: pidgin sipe\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/sipe/bugs/\n" "POT-Creation-Date: 2010-11-30 23:36+0200\n" -"PO-Revision-Date: 2016-05-28 15:08+0000\n" +"PO-Revision-Date: 2017-01-23 17:47+0000\n" "Last-Translator: Stefan Becker \n" "Language-Team: Arabic (http://www.transifex.com/stefanb/pidgin-sipe/language/ar/)\n" "MIME-Version: 1.0\n" @@ -20,94 +20,119 @@ "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" -#: ../src/core/sip-transport.c:235 +#: ../src/core/sip-transport.c:240 msgid "Failed to authenticate to server" msgstr "" -#: ../src/core/sip-transport.c:293 +#: ../src/core/sip-transport.c:298 #, c-format msgid "Can't request certificate from %s" msgstr "" -#: ../src/core/sip-transport.c:303 +#: ../src/core/sip-transport.c:308 msgid "No URI for certificate provisioning service provided" msgstr "" -#: ../src/core/sip-transport.c:1281 +#: ../src/core/sip-transport.c:1285 msgid "Authentication failed" msgstr "" -#: ../src/core/sip-transport.c:1338 +#: ../src/core/sip-transport.c:1342 msgid "Incompatible authentication scheme chosen" msgstr "" -#: ../src/core/sip-transport.c:1355 ../src/core/sipe-notify.c:1149 +#: ../src/core/sip-transport.c:1359 ../src/core/sipe-notify.c:1149 #, c-format msgid "You have been rejected by the server: %s" msgstr "لقد تم رفضك من قِبل الخادم: %s" -#: ../src/core/sip-transport.c:1356 ../src/core/sip-transport.c:1372 -#: ../src/core/sip-transport.c:1396 ../src/core/sip-transport.c:1420 +#: ../src/core/sip-transport.c:1360 ../src/core/sip-transport.c:1376 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 #: ../src/core/sipe-conf.c:265 ../src/core/sipe-notify.c:1149 msgid "no reason given" msgstr "السبب غير محدد" -#: ../src/core/sip-transport.c:1371 +#: ../src/core/sip-transport.c:1375 #, c-format msgid "Not found: %s. Please contact your Administrator" msgstr "" -#: ../src/core/sip-transport.c:1373 +#: ../src/core/sip-transport.c:1377 msgid "SIP is either not enabled for the destination URI or it does not exist" msgstr "" -#: ../src/core/sip-transport.c:1396 ../src/core/sip-transport.c:1420 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 #, c-format msgid "Service unavailable: %s" msgstr "الخدمة غير متاحة: %s" -#: ../src/core/sip-transport.c:1766 +#: ../src/core/sip-transport.c:1775 msgid "Corrupted message received" msgstr "" -#: ../src/core/sip-transport.c:1790 +#: ../src/core/sip-transport.c:1799 msgid "Invalid message signature received" msgstr "تم استلام توقيع رسالة غير صالح" -#: ../src/core/sipe-buddy.c:540 ../src/core/sipe-buddy.c:2300 +#: ../src/core/sipe-appshare.c:458 +#, c-format +msgid "%s wants to start presenting" +msgstr "" + +#: ../src/core/sipe-appshare.c:462 ../src/core/sipe-conf.c:1086 +msgid "Accept" +msgstr "" + +#: ../src/core/sipe-appshare.c:463 ../src/core/sipe-conf.c:1087 +msgid "Decline" +msgstr "" + +#: ../src/core/sipe-appshare.c:501 ../src/core/sipe-appshare.c:599 +msgid "Application sharing error" +msgstr "" + +#: ../src/core/sipe-appshare.c:502 +msgid "Unknown remote desktop client configured." +msgstr "" + +#: ../src/core/sipe-appshare.c:600 +msgid "Couldn't connect application sharing" +msgstr "" + +#: ../src/core/sipe-buddy.c:541 ../src/core/sipe-buddy.c:2301 msgid "Mobile" msgstr "" -#: ../src/core/sipe-buddy.c:828 +#: ../src/core/sipe-buddy.c:829 msgid "Status" msgstr "" -#: ../src/core/sipe-buddy.c:831 +#: ../src/core/sipe-buddy.c:832 msgid "Calendar" msgstr "" -#: ../src/core/sipe-buddy.c:836 +#: ../src/core/sipe-buddy.c:837 msgid "Meeting in" msgstr "" -#: ../src/core/sipe-buddy.c:840 +#: ../src/core/sipe-buddy.c:841 msgid "Meeting about" msgstr "" -#: ../src/core/sipe-buddy.c:845 +#: ../src/core/sipe-buddy.c:846 msgid "Out of office note" msgstr "" -#: ../src/core/sipe-buddy.c:845 +#: ../src/core/sipe-buddy.c:846 msgid "Note" msgstr "" -#: ../src/core/sipe-buddy.c:850 ../src/core/sipe-buddy.c:2345 +#: ../src/core/sipe-buddy.c:851 ../src/core/sipe-buddy.c:2346 #: ../src/purple/purple-buddy.c:633 msgid "Access level" msgstr "" -#: ../src/core/sipe-buddy.c:1073 +#: ../src/core/sipe-buddy.c:1074 #, c-format msgid "Found %d contact%s:" msgid_plural "Found %d contacts%s:" @@ -118,119 +143,119 @@ msgstr[4] "" msgstr[5] "" -#: ../src/core/sipe-buddy.c:1075 +#: ../src/core/sipe-buddy.c:1076 msgid " (more matched your query)" msgstr " (أكثر تطابقًا للاستعلام الخاص بك)" -#: ../src/core/sipe-buddy.c:1121 ../src/core/sipe-buddy.c:1259 +#: ../src/core/sipe-buddy.c:1122 ../src/core/sipe-buddy.c:1260 #: ../src/core/sipe-ucs.c:314 msgid "No contacts found" msgstr "" -#: ../src/core/sipe-buddy.c:1134 ../src/core/sipe-buddy.c:1272 +#: ../src/core/sipe-buddy.c:1135 ../src/core/sipe-buddy.c:1273 #: ../src/core/sipe-ucs.c:278 msgid "Unable to display the search results" msgstr "" -#: ../src/core/sipe-buddy.c:1237 ../src/core/sipe-buddy.c:1249 +#: ../src/core/sipe-buddy.c:1238 ../src/core/sipe-buddy.c:1250 #: ../src/core/sipe-ucs.c:391 msgid "Contact search failed" msgstr "" -#: ../src/core/sipe-buddy.c:1412 ../src/core/sipe-ucs.c:395 +#: ../src/core/sipe-buddy.c:1413 ../src/core/sipe-ucs.c:395 msgid "Invalid contact search query" msgstr "" -#: ../src/core/sipe-buddy.c:2237 +#: ../src/core/sipe-buddy.c:2238 #, c-format msgid "Make leader of '%s'" msgstr "" -#: ../src/core/sipe-buddy.c:2250 +#: ../src/core/sipe-buddy.c:2251 #, c-format msgid "Remove from '%s'" msgstr "" -#: ../src/core/sipe-buddy.c:2264 +#: ../src/core/sipe-buddy.c:2265 #, c-format msgid "Invite to '%s'" msgstr "" -#: ../src/core/sipe-buddy.c:2280 +#: ../src/core/sipe-buddy.c:2281 msgid "New chat" msgstr "" -#: ../src/core/sipe-buddy.c:2293 +#: ../src/core/sipe-buddy.c:2294 msgid "Work" msgstr "" -#: ../src/core/sipe-buddy.c:2308 +#: ../src/core/sipe-buddy.c:2309 msgid "Home" msgstr "" -#: ../src/core/sipe-buddy.c:2316 +#: ../src/core/sipe-buddy.c:2317 msgid "Other" msgstr "" -#: ../src/core/sipe-buddy.c:2324 +#: ../src/core/sipe-buddy.c:2325 msgid "Custom1" msgstr "" -#: ../src/core/sipe-buddy.c:2334 +#: ../src/core/sipe-buddy.c:2335 msgid "Send email..." msgstr "" -#: ../src/core/sipe-cal.c:907 +#: ../src/core/sipe-cal.c:906 msgid "Free" msgstr "" -#: ../src/core/sipe-cal.c:908 +#: ../src/core/sipe-cal.c:907 msgid "Tentative" msgstr "" #. SIPE_ACTIVITY_BUSY -#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:59 +#: ../src/core/sipe-cal.c:908 ../src/core/sipe-status.c:57 msgid "Busy" msgstr "مشغول" #. SIPE_ACTIVITY_OOF -#: ../src/core/sipe-cal.c:910 ../src/core/sipe-status.c:70 +#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:68 msgid "Out of office" msgstr "" -#: ../src/core/sipe-cal.c:911 +#: ../src/core/sipe-cal.c:910 msgid "No data" msgstr "" -#: ../src/core/sipe-cal.c:1019 ../src/core/sipe-cal.c:1046 +#: ../src/core/sipe-cal.c:1018 ../src/core/sipe-cal.c:1045 #, c-format msgid "Currently %s" msgstr "" -#: ../src/core/sipe-cal.c:1025 +#: ../src/core/sipe-cal.c:1024 msgid "Outside of working hours for next 8 hours" msgstr "" -#: ../src/core/sipe-cal.c:1027 +#: ../src/core/sipe-cal.c:1026 #, c-format msgid "%s for next 8 hours" msgstr "" -#: ../src/core/sipe-cal.c:1036 +#: ../src/core/sipe-cal.c:1035 msgid "Not working" msgstr "" -#: ../src/core/sipe-cal.c:1040 +#: ../src/core/sipe-cal.c:1039 #, c-format msgid "%s until %.2d:%.2d" msgstr "" -#: ../src/core/sipe-cal.c:1048 +#: ../src/core/sipe-cal.c:1047 #, c-format msgid "%s. Outside of working hours at %.2d:%.2d" msgstr "" -#: ../src/core/sipe-cal.c:1053 +#: ../src/core/sipe-cal.c:1052 #, c-format msgid "%s. %s at %.2d:%.2d" msgstr "" @@ -246,7 +271,7 @@ msgstr "" #. Generate next ID -#: ../src/core/sipe-chat.c:240 +#: ../src/core/sipe-chat.c:246 #, c-format msgid "Chat #%d" msgstr "" @@ -273,123 +298,115 @@ msgid "Incomplete conference information provided" msgstr "" -#: ../src/core/sipe-conf.c:1041 +#: ../src/core/sipe-conf.c:1106 msgid "" "\n" "\n" "As this client was not compiled with voice call support, if you accept, you will be able to contact the other participants only via IM session." msgstr "" -#: ../src/core/sipe-conf.c:1049 +#: ../src/core/sipe-conf.c:1111 #, c-format -msgid "%s wants to invite you to the conference call%s" +msgid "wants to invite you to a conference call%s" msgstr "" -#: ../src/core/sipe-conf.c:1063 -msgid "Accept" -msgstr "" - -#: ../src/core/sipe-conf.c:1064 -msgid "Decline" -msgstr "" - -#: ../src/core/sipe-conf.c:1345 +#: ../src/core/sipe-conf.c:1459 msgid "" "This conference is no longer locked. Additional participants can now join." msgstr "" -#: ../src/core/sipe-conf.c:1349 +#: ../src/core/sipe-conf.c:1463 msgid "" "This conference is locked. Nobody else can join the conference while it is " "locked." msgstr "" -#: ../src/core/sipe-conf.c:1382 +#: ../src/core/sipe-conf.c:1496 msgid "You have been disconnected from this conference." msgstr "" -#: ../src/core/sipe-conf.c:1542 +#: ../src/core/sipe-conf.c:1656 msgid "Dial-in info" msgstr "" -#: ../src/core/sipe-conf.c:1543 +#: ../src/core/sipe-conf.c:1657 msgid "Number" msgstr "" -#: ../src/core/sipe-conf.c:1545 +#: ../src/core/sipe-conf.c:1659 msgid "Conference ID" msgstr "" -#: ../src/core/sipe-conf.c:1547 +#: ../src/core/sipe-conf.c:1661 msgid "Meeting link" msgstr "" -#: ../src/core/sipe-conf.c:1549 +#: ../src/core/sipe-conf.c:1663 msgid "Organizer" msgstr "" -#: ../src/core/sipe-conf.c:1551 +#: ../src/core/sipe-conf.c:1665 msgid "Alternative dial-in numbers" msgstr "" #. The next 13 texts make up the SIPE about note text #. About note, part 1/13: introduction -#: ../src/core/sipe-core.c:220 +#: ../src/core/sipe-core.c:221 msgid "" "A third-party plugin implementing extended version of SIP/SIMPLE used by " "various products" msgstr "" #. About note, part 2/13: home page URL (label) -#: ../src/core/sipe-core.c:222 +#: ../src/core/sipe-core.c:223 msgid "Home Page" msgstr "" #. About note, part 3/13: support forum URL (label) -#: ../src/core/sipe-core.c:224 +#: ../src/core/sipe-core.c:225 msgid "Support" msgstr "" #. About note, part 4/13: support forum name (hyperlink text) -#: ../src/core/sipe-core.c:226 +#: ../src/core/sipe-core.c:227 msgid "Help Forum" msgstr "" #. About note, part 5/13: bug tracker URL (label) -#: ../src/core/sipe-core.c:228 +#: ../src/core/sipe-core.c:229 msgid "Report Problems" msgstr "" #. About note, part 6/13: bug tracker URL (hyperlink text) -#: ../src/core/sipe-core.c:230 +#: ../src/core/sipe-core.c:231 msgid "Bug Tracker" msgstr "" #. About note, part 7/13: translation service URL (label) -#: ../src/core/sipe-core.c:232 +#: ../src/core/sipe-core.c:233 msgid "Translations" msgstr "" #. About note, part 8/13: license type (label) -#: ../src/core/sipe-core.c:234 +#: ../src/core/sipe-core.c:235 msgid "License" msgstr "" #. About note, part 9/13: (REMOVED) #. About note, part 10/13: translation request, text before Transifex.com URL #. append a space if text is not empty -#: ../src/core/sipe-core.c:238 +#: ../src/core/sipe-core.c:239 msgid "Please help us to translate SIPE to your native language here at " msgstr "" #. About note, part 11/13: translation request, text after Transifex.com URL #. start with a space if text is not empty -#: ../src/core/sipe-core.c:241 +#: ../src/core/sipe-core.c:242 msgid " using convenient web interface" msgstr "" #. About note, part 12/13: author list (header) -#: ../src/core/sipe-core.c:243 +#: ../src/core/sipe-core.c:244 msgid "Authors" msgstr "" @@ -397,15 +414,15 @@ #. PLEASE NOTE: do *NOT* simply translate the english original #. but write something similar to the following sentence: #. "Localization for (): " -#: ../src/core/sipe-core.c:248 +#: ../src/core/sipe-core.c:249 msgid "Original texts in English (en): SIPE developers" msgstr "" -#: ../src/core/sipe-core.c:269 +#: ../src/core/sipe-core.c:273 msgid "SIP Exchange user name contains invalid characters" msgstr "" -#: ../src/core/sipe-core.c:277 ../src/purple/purple-buddy.c:485 +#: ../src/core/sipe-core.c:281 ../src/purple/purple-buddy.c:485 #: ../src/telepathy/telepathy-protocol.c:89 #: ../src/telepathy/telepathy-protocol.c:191 #, c-format @@ -414,21 +431,21 @@ "Example: user@company.com" msgstr "" -#: ../src/core/sipe-core.c:284 +#: ../src/core/sipe-core.c:288 msgid "Password is required when Single Sign-On is not enabled" msgstr "" -#: ../src/core/sipe-core.c:294 +#: ../src/core/sipe-core.c:298 msgid "" "Email address should be valid if provided\n" "Example: user@company.com" msgstr "" -#: ../src/core/sipe-core.c:303 +#: ../src/core/sipe-core.c:307 msgid "SIP Exchange user name contains whitespace" msgstr "" -#: ../src/core/sipe-core.c:317 +#: ../src/core/sipe-core.c:321 msgid "" "Email services URL should be valid if provided\n" "Example: https://exchange.corp.com/EWS/Exchange.asmx\n" @@ -459,13 +476,13 @@ msgid "Could not create listen socket" msgstr "تعذر إنشاء مقبس استماع" -#: ../src/core/sipe-ft-lync.c:757 ../src/core/sipe-media.c:1195 -#: ../src/core/sipe-media.c:1206 ../src/core/sipe-media.c:1284 -#: ../src/core/sipe-media.c:1740 +#: ../src/core/sipe-ft-lync.c:762 ../src/core/sipe-media.c:1328 +#: ../src/core/sipe-media.c:1339 ../src/core/sipe-media.c:1417 +#: ../src/core/sipe-media.c:1923 msgid "Error occurred" msgstr "" -#: ../src/core/sipe-ft-lync.c:758 +#: ../src/core/sipe-ft-lync.c:763 msgid "Error creating data stream" msgstr "" @@ -500,7 +517,7 @@ msgstr "" #: ../src/core/sipe-group.c:168 ../src/core/sipe-notify.c:1163 -#: ../src/core/sipe-notify.c:1190 ../src/core/sipe-notify.c:1294 +#: ../src/core/sipe-notify.c:1197 ../src/core/sipe-notify.c:1301 #: ../src/purple/purple-search.c:128 msgid "Other Contacts" msgstr "" @@ -538,77 +555,77 @@ msgid "Failed to invite %s" msgstr "" -#: ../src/core/sipe-incoming.c:741 +#: ../src/core/sipe-incoming.c:754 #, c-format msgid "Received a message with unrecognized contents from %s" msgstr "" -#: ../src/core/sipe-media.c:835 ../src/core/sipe-media.c:1347 -#: ../src/core/sipe-media.c:1357 ../src/core/sipe-media.c:1721 -#: ../src/core/sipe-media.c:1741 +#: ../src/core/sipe-media.c:869 ../src/core/sipe-media.c:1483 +#: ../src/core/sipe-media.c:1493 ../src/core/sipe-media.c:1904 +#: ../src/core/sipe-media.c:1924 msgid "Unable to establish a call" msgstr "" -#: ../src/core/sipe-media.c:836 ../src/core/sipe-media.c:1722 +#: ../src/core/sipe-media.c:870 ../src/core/sipe-media.c:1905 msgid "Encryption settings of peer are incompatible with ours." msgstr "" -#: ../src/core/sipe-media.c:929 +#: ../src/core/sipe-media.c:963 #, c-format msgid "User %s rejected call" msgstr "" -#: ../src/core/sipe-media.c:930 +#: ../src/core/sipe-media.c:964 msgid "Call rejected" msgstr "" -#: ../src/core/sipe-media.c:1196 ../src/core/sipe-media.c:1285 +#: ../src/core/sipe-media.c:1329 ../src/core/sipe-media.c:1418 msgid "Error creating audio stream" msgstr "" -#: ../src/core/sipe-media.c:1207 +#: ../src/core/sipe-media.c:1340 msgid "Error creating video stream" msgstr "" -#: ../src/core/sipe-media.c:1251 ../src/purple/purple-chat.c:314 +#: ../src/core/sipe-media.c:1384 ../src/purple/purple-chat.c:329 msgid "Join conference call" msgstr "" -#: ../src/core/sipe-media.c:1252 +#: ../src/core/sipe-media.c:1385 msgid "Conference calls are not supported on this server." msgstr "" -#: ../src/core/sipe-media.c:1348 +#: ../src/core/sipe-media.c:1484 msgid "Invalid phone number" msgstr "" -#: ../src/core/sipe-media.c:1358 +#: ../src/core/sipe-media.c:1494 msgid "Audio Test Service is not available." msgstr "" -#: ../src/core/sipe-media.c:1690 +#: ../src/core/sipe-media.c:1873 msgid "User unavailable" msgstr "" -#: ../src/core/sipe-media.c:1693 +#: ../src/core/sipe-media.c:1876 #, c-format msgid "%s does not want to be disturbed" msgstr "" -#: ../src/core/sipe-media.c:1695 +#: ../src/core/sipe-media.c:1878 #, c-format msgid "User %s is not available" msgstr "" -#: ../src/core/sipe-media.c:1704 +#: ../src/core/sipe-media.c:1887 msgid "Unsupported media type" msgstr "" -#: ../src/core/sipe-media.c:2062 +#: ../src/core/sipe-media.c:2246 msgid "Media error" msgstr "" -#: ../src/core/sipe-media.c:2063 +#: ../src/core/sipe-media.c:2247 msgid "Error while reading from stream" msgstr "" @@ -659,36 +676,36 @@ msgstr "" #. Translators: remove (clear) previously assigned access level -#: ../src/core/sipe-ocs2007.c:2571 +#: ../src/core/sipe-ocs2007.c:2570 msgid "Unspecify" msgstr "" -#: ../src/core/sipe-ocs2007.c:2590 +#: ../src/core/sipe-ocs2007.c:2589 msgid "People in my company" msgstr "" -#: ../src/core/sipe-ocs2007.c:2600 +#: ../src/core/sipe-ocs2007.c:2599 msgid "People in domains connected with my company" msgstr "" -#: ../src/core/sipe-ocs2007.c:2609 +#: ../src/core/sipe-ocs2007.c:2608 msgid "People in public domains" msgstr "" -#: ../src/core/sipe-ocs2007.c:2619 +#: ../src/core/sipe-ocs2007.c:2618 #, c-format msgid "People at %s" msgstr "" -#: ../src/core/sipe-ocs2007.c:2644 +#: ../src/core/sipe-ocs2007.c:2643 msgid "Add new domain..." msgstr "" -#: ../src/core/sipe-ocs2007.c:2673 +#: ../src/core/sipe-ocs2007.c:2672 msgid "Online help..." msgstr "" -#: ../src/core/sipe-ocs2007.c:2681 +#: ../src/core/sipe-ocs2007.c:2680 msgid "Access groups" msgstr "" @@ -700,49 +717,60 @@ #. SIPE_ACTIVITY_AVAILABLE #. SIPE_ACTIVITY_ONLINE #. SIPE_ACTIVITY_INACTIVE -#: ../src/core/sipe-status.c:58 +#: ../src/core/sipe-status.c:56 msgid "Inactive" msgstr "" #. SIPE_ACTIVITY_BUSYIDLE -#: ../src/core/sipe-status.c:60 +#: ../src/core/sipe-status.c:58 msgid "Busy-Idle" msgstr "" #. SIPE_ACTIVITY_DND #. SIPE_ACTIVITY_BRB -#: ../src/core/sipe-status.c:62 +#: ../src/core/sipe-status.c:60 msgid "Be right back" msgstr "" #. SIPE_ACTIVITY_AWAY #. SIPE_ACTIVITY_LUNCH -#: ../src/core/sipe-status.c:64 +#: ../src/core/sipe-status.c:62 msgid "Out to lunch" msgstr "" #. SIPE_ACTIVITY_INVISIBLE #. SIPE_ACTIVITY_OFFLINE #. SIPE_ACTIVITY_ON_PHONE -#: ../src/core/sipe-status.c:67 +#: ../src/core/sipe-status.c:65 msgid "In a call" msgstr "" #. SIPE_ACTIVITY_IN_CONF -#: ../src/core/sipe-status.c:68 +#: ../src/core/sipe-status.c:66 msgid "In a conference" msgstr "" #. SIPE_ACTIVITY_IN_MEETING -#: ../src/core/sipe-status.c:69 +#: ../src/core/sipe-status.c:67 msgid "In a meeting" msgstr "" #. SIPE_ACTIVITY_URGENT_ONLY -#: ../src/core/sipe-status.c:71 +#: ../src/core/sipe-status.c:69 msgid "Urgent interruptions only" msgstr "" +#: ../src/core/sipe-subscriptions.c:189 +msgid "Presence subscription failed!" +msgstr "" + +#: ../src/core/sipe-subscriptions.c:190 +msgid "" +"One or more buddies will therefore permanently show as offline.\n" +"\n" +"Please check that there are no corrupted SIP URIs in your contacts list." +msgstr "" + #: ../src/core/sipe-ucs.c:674 msgid "UCS initialization failed!" msgstr "" @@ -895,15 +923,19 @@ msgid "Copy to" msgstr "" -#: ../src/purple/purple-chat.c:295 +#: ../src/purple/purple-chat.c:310 msgid "Lock" msgstr "" -#: ../src/purple/purple-chat.c:300 +#: ../src/purple/purple-chat.c:315 msgid "Unlock" msgstr "" -#: ../src/purple/purple-chat.c:321 +#: ../src/purple/purple-chat.c:338 +msgid "Show presentation" +msgstr "" + +#: ../src/purple/purple-chat.c:345 msgid "Meeting entry info" msgstr "" @@ -1155,26 +1187,30 @@ msgstr "" #: ../src/purple/purple-plugin-common.c:933 +msgid "Remote desktop client" +msgstr "" + +#: ../src/purple/purple-plugin-common.c:938 msgid "Media encryption" msgstr "" -#: ../src/purple/purple-plugin-common.c:934 +#: ../src/purple/purple-plugin-common.c:939 msgid "Obey server policy" msgstr "" -#: ../src/purple/purple-plugin-common.c:935 +#: ../src/purple/purple-plugin-common.c:940 msgid "Always" msgstr "" -#: ../src/purple/purple-plugin-common.c:936 +#: ../src/purple/purple-plugin-common.c:941 msgid "Optional" msgstr "" -#: ../src/purple/purple-plugin-common.c:937 +#: ../src/purple/purple-plugin-common.c:942 msgid "Disabled" msgstr "" -#: ../src/purple/purple-plugin-common.c:947 +#: ../src/purple/purple-plugin-common.c:952 msgid "" "Login\n" " user or DOMAIN\\user or\n" @@ -1223,27 +1259,27 @@ msgid "_Search" msgstr "_بحث" -#: ../src/purple/purple-transport.c:132 +#: ../src/purple/purple-transport.c:135 msgid "Read error" msgstr "" -#: ../src/purple/purple-transport.c:136 -#: ../src/telepathy/telepathy-transport.c:96 +#: ../src/purple/purple-transport.c:139 +#: ../src/telepathy/telepathy-transport.c:95 msgid "Server has disconnected" msgstr "تم قطع الاتصال بالخادم" -#: ../src/purple/purple-transport.c:198 +#: ../src/purple/purple-transport.c:201 msgid "Could not connect" msgstr "تعذر الاتصال" -#: ../src/purple/purple-transport.c:268 +#: ../src/purple/purple-transport.c:271 msgid "Could not create SSL context" msgstr "تعذر إنشاء سياق SSL" -#: ../src/purple/purple-transport.c:290 +#: ../src/purple/purple-transport.c:293 msgid "Could not create socket" msgstr "" -#: ../src/purple/purple-transport.c:381 +#: ../src/purple/purple-transport.c:417 msgid "Write error" msgstr "" diff -Nru pidgin-sipe-1.21.1/po/ChangeLog pidgin-sipe-1.22.1/po/ChangeLog --- pidgin-sipe-1.21.1/po/ChangeLog 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/po/ChangeLog 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -2009-05-01 pier11 - - * zh_CN: Added translation by Kang Kai (kappa8086) - -2008-12-16 Gabriel Burt - - * es.po: Update - -2008-12-07 Gabriel Burt - - * es.po: Nearly-empty Spanish translation to help prove the app is - translatable diff -Nru pidgin-sipe-1.21.1/po/cs.po pidgin-sipe-1.22.1/po/cs.po --- pidgin-sipe-1.21.1/po/cs.po 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/po/cs.po 2017-06-11 15:41:22.000000000 +0000 @@ -5,15 +5,15 @@ # # # Translators: -# Jakub Adam , 2011-2013,2015-2016 +# Jakub Adam , 2011-2013,2015-2017 # Stefan Becker , 2011 msgid "" msgstr "" "Project-Id-Version: pidgin sipe\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/sipe/bugs/\n" "POT-Creation-Date: 2010-11-30 23:36+0200\n" -"PO-Revision-Date: 2016-05-28 15:08+0000\n" -"Last-Translator: Stefan Becker \n" +"PO-Revision-Date: 2017-01-23 20:32+0000\n" +"Last-Translator: Jakub Adam \n" "Language-Team: Czech (http://www.transifex.com/stefanb/pidgin-sipe/language/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,94 +21,119 @@ "Language: cs\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: ../src/core/sip-transport.c:235 +#: ../src/core/sip-transport.c:240 msgid "Failed to authenticate to server" msgstr "Nepodařilo se ověřit přihlašovací údaje na serveru" -#: ../src/core/sip-transport.c:293 +#: ../src/core/sip-transport.c:298 #, c-format msgid "Can't request certificate from %s" msgstr "Selhal požadavek na certifikát od %s" -#: ../src/core/sip-transport.c:303 +#: ../src/core/sip-transport.c:308 msgid "No URI for certificate provisioning service provided" msgstr "Nebylo zadáno URI služby poskytující certifikáty" -#: ../src/core/sip-transport.c:1281 +#: ../src/core/sip-transport.c:1285 msgid "Authentication failed" msgstr "Nepodařilo se ověřit přihlašovací údaje na serveru" -#: ../src/core/sip-transport.c:1338 +#: ../src/core/sip-transport.c:1342 msgid "Incompatible authentication scheme chosen" msgstr "Zvoleno nekompatibilní autentizační schéma" -#: ../src/core/sip-transport.c:1355 ../src/core/sipe-notify.c:1149 +#: ../src/core/sip-transport.c:1359 ../src/core/sipe-notify.c:1149 #, c-format msgid "You have been rejected by the server: %s" msgstr "Následující server odmítl připojení: %s" -#: ../src/core/sip-transport.c:1356 ../src/core/sip-transport.c:1372 -#: ../src/core/sip-transport.c:1396 ../src/core/sip-transport.c:1420 +#: ../src/core/sip-transport.c:1360 ../src/core/sip-transport.c:1376 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 #: ../src/core/sipe-conf.c:265 ../src/core/sipe-notify.c:1149 msgid "no reason given" msgstr "bez udání důvodu" -#: ../src/core/sip-transport.c:1371 +#: ../src/core/sip-transport.c:1375 #, c-format msgid "Not found: %s. Please contact your Administrator" msgstr "Uživatel %s nenalezen. Prosím kontaktujte svého administrátora" -#: ../src/core/sip-transport.c:1373 +#: ../src/core/sip-transport.c:1377 msgid "SIP is either not enabled for the destination URI or it does not exist" msgstr "SIP není povolen pro cílové URI nebo neexistuje" -#: ../src/core/sip-transport.c:1396 ../src/core/sip-transport.c:1420 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 #, c-format msgid "Service unavailable: %s" msgstr "Služba není dostupná: %s" -#: ../src/core/sip-transport.c:1766 +#: ../src/core/sip-transport.c:1775 msgid "Corrupted message received" msgstr "Přijatá zpráva je poškozená" -#: ../src/core/sip-transport.c:1790 +#: ../src/core/sip-transport.c:1799 msgid "Invalid message signature received" msgstr "Přijatý podpis zprávy je neplatný" -#: ../src/core/sipe-buddy.c:540 ../src/core/sipe-buddy.c:2300 +#: ../src/core/sipe-appshare.c:458 +#, c-format +msgid "%s wants to start presenting" +msgstr "%s chce spustit prezentaci" + +#: ../src/core/sipe-appshare.c:462 ../src/core/sipe-conf.c:1086 +msgid "Accept" +msgstr "Přijmout" + +#: ../src/core/sipe-appshare.c:463 ../src/core/sipe-conf.c:1087 +msgid "Decline" +msgstr "Odmítnout" + +#: ../src/core/sipe-appshare.c:501 ../src/core/sipe-appshare.c:599 +msgid "Application sharing error" +msgstr "Problém při sdílení plochy" + +#: ../src/core/sipe-appshare.c:502 +msgid "Unknown remote desktop client configured." +msgstr "Nastavený klient vzdálené plochy není podporován." + +#: ../src/core/sipe-appshare.c:600 +msgid "Couldn't connect application sharing" +msgstr "Nepodařilo se připojit ke vzdálené ploše" + +#: ../src/core/sipe-buddy.c:541 ../src/core/sipe-buddy.c:2301 msgid "Mobile" msgstr "Mobilní telefon" -#: ../src/core/sipe-buddy.c:828 +#: ../src/core/sipe-buddy.c:829 msgid "Status" msgstr "Stav" -#: ../src/core/sipe-buddy.c:831 +#: ../src/core/sipe-buddy.c:832 msgid "Calendar" msgstr "Kalendář" -#: ../src/core/sipe-buddy.c:836 +#: ../src/core/sipe-buddy.c:837 msgid "Meeting in" msgstr "Schůzka v" -#: ../src/core/sipe-buddy.c:840 +#: ../src/core/sipe-buddy.c:841 msgid "Meeting about" msgstr "Schůzka o" -#: ../src/core/sipe-buddy.c:845 +#: ../src/core/sipe-buddy.c:846 msgid "Out of office note" msgstr "Poznámka \"mimo kancelář\"" -#: ../src/core/sipe-buddy.c:845 +#: ../src/core/sipe-buddy.c:846 msgid "Note" msgstr "Poznámka" -#: ../src/core/sipe-buddy.c:850 ../src/core/sipe-buddy.c:2345 +#: ../src/core/sipe-buddy.c:851 ../src/core/sipe-buddy.c:2346 #: ../src/purple/purple-buddy.c:633 msgid "Access level" msgstr "Úroveň přístupu" -#: ../src/core/sipe-buddy.c:1073 +#: ../src/core/sipe-buddy.c:1074 #, c-format msgid "Found %d contact%s:" msgid_plural "Found %d contacts%s:" @@ -116,119 +141,119 @@ msgstr[1] "Nalezeny %d kontakty%s:" msgstr[2] "Nalezeno %d kontaktů%s:" -#: ../src/core/sipe-buddy.c:1075 +#: ../src/core/sipe-buddy.c:1076 msgid " (more matched your query)" msgstr " (další shody s dotazem)" -#: ../src/core/sipe-buddy.c:1121 ../src/core/sipe-buddy.c:1259 +#: ../src/core/sipe-buddy.c:1122 ../src/core/sipe-buddy.c:1260 #: ../src/core/sipe-ucs.c:314 msgid "No contacts found" msgstr "Žádné kontakty nebyly nalezeny" -#: ../src/core/sipe-buddy.c:1134 ../src/core/sipe-buddy.c:1272 +#: ../src/core/sipe-buddy.c:1135 ../src/core/sipe-buddy.c:1273 #: ../src/core/sipe-ucs.c:278 msgid "Unable to display the search results" msgstr "Nemohu zobrazit výsledky hledání." -#: ../src/core/sipe-buddy.c:1237 ../src/core/sipe-buddy.c:1249 +#: ../src/core/sipe-buddy.c:1238 ../src/core/sipe-buddy.c:1250 #: ../src/core/sipe-ucs.c:391 msgid "Contact search failed" msgstr "Vyhledání kontaktu selhalo" -#: ../src/core/sipe-buddy.c:1412 ../src/core/sipe-ucs.c:395 +#: ../src/core/sipe-buddy.c:1413 ../src/core/sipe-ucs.c:395 msgid "Invalid contact search query" msgstr "Chybný vyhledávací dotaz" -#: ../src/core/sipe-buddy.c:2237 +#: ../src/core/sipe-buddy.c:2238 #, c-format msgid "Make leader of '%s'" msgstr "Učinit vedoucím '%s'" -#: ../src/core/sipe-buddy.c:2250 +#: ../src/core/sipe-buddy.c:2251 #, c-format msgid "Remove from '%s'" msgstr "Odstranit z '%s'" -#: ../src/core/sipe-buddy.c:2264 +#: ../src/core/sipe-buddy.c:2265 #, c-format msgid "Invite to '%s'" msgstr "Pozvat do '%s'" -#: ../src/core/sipe-buddy.c:2280 +#: ../src/core/sipe-buddy.c:2281 msgid "New chat" msgstr "Nový chat" -#: ../src/core/sipe-buddy.c:2293 +#: ../src/core/sipe-buddy.c:2294 msgid "Work" msgstr "Telefon do práce" -#: ../src/core/sipe-buddy.c:2308 +#: ../src/core/sipe-buddy.c:2309 msgid "Home" msgstr "Domů" -#: ../src/core/sipe-buddy.c:2316 +#: ../src/core/sipe-buddy.c:2317 msgid "Other" msgstr "Jiný telefon" -#: ../src/core/sipe-buddy.c:2324 +#: ../src/core/sipe-buddy.c:2325 msgid "Custom1" msgstr "Vlastní1" -#: ../src/core/sipe-buddy.c:2334 +#: ../src/core/sipe-buddy.c:2335 msgid "Send email..." msgstr "Odeslat e-mail..." -#: ../src/core/sipe-cal.c:907 +#: ../src/core/sipe-cal.c:906 msgid "Free" msgstr "Volný" -#: ../src/core/sipe-cal.c:908 +#: ../src/core/sipe-cal.c:907 msgid "Tentative" msgstr "Nezávazně zaneprázdněn" #. SIPE_ACTIVITY_BUSY -#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:59 +#: ../src/core/sipe-cal.c:908 ../src/core/sipe-status.c:57 msgid "Busy" msgstr "Zaneprázdněn" #. SIPE_ACTIVITY_OOF -#: ../src/core/sipe-cal.c:910 ../src/core/sipe-status.c:70 +#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:68 msgid "Out of office" msgstr "Mimo kancelář" -#: ../src/core/sipe-cal.c:911 +#: ../src/core/sipe-cal.c:910 msgid "No data" msgstr "není znám stav kontaktu" -#: ../src/core/sipe-cal.c:1019 ../src/core/sipe-cal.c:1046 +#: ../src/core/sipe-cal.c:1018 ../src/core/sipe-cal.c:1045 #, c-format msgid "Currently %s" msgstr "Právě %s" -#: ../src/core/sipe-cal.c:1025 +#: ../src/core/sipe-cal.c:1024 msgid "Outside of working hours for next 8 hours" msgstr "Příštích 8 hodin není v práci" -#: ../src/core/sipe-cal.c:1027 +#: ../src/core/sipe-cal.c:1026 #, c-format msgid "%s for next 8 hours" msgstr "%s dalších 8 hodin" -#: ../src/core/sipe-cal.c:1036 +#: ../src/core/sipe-cal.c:1035 msgid "Not working" msgstr "Není v práci" -#: ../src/core/sipe-cal.c:1040 +#: ../src/core/sipe-cal.c:1039 #, c-format msgid "%s until %.2d:%.2d" msgstr "%s do %.2d:%.2d" -#: ../src/core/sipe-cal.c:1048 +#: ../src/core/sipe-cal.c:1047 #, c-format msgid "%s. Outside of working hours at %.2d:%.2d" msgstr "%s. Pracovní doba mu končí %.2d:%.2d" -#: ../src/core/sipe-cal.c:1053 +#: ../src/core/sipe-cal.c:1052 #, c-format msgid "%s. %s at %.2d:%.2d" msgstr "%s. %s v %.2d:%.2d" @@ -244,7 +269,7 @@ msgstr "Požadavek na Web ticket od %s selhal" #. Generate next ID -#: ../src/core/sipe-chat.c:240 +#: ../src/core/sipe-chat.c:246 #, c-format msgid "Chat #%d" msgstr "Chat #%d" @@ -271,123 +296,115 @@ msgid "Incomplete conference information provided" msgstr "Zadány neúplné údaje o konferenci" -#: ../src/core/sipe-conf.c:1041 +#: ../src/core/sipe-conf.c:1106 msgid "" "\n" "\n" "As this client was not compiled with voice call support, if you accept, you will be able to contact the other participants only via IM session." msgstr "\n\nProtože tento klient nebyl přeložen se zapnutou podporou audiohovoru, pokud se připojíte, budete moci ostatní účastníky kontaktovat pouze pomocí textových zpráv." -#: ../src/core/sipe-conf.c:1049 +#: ../src/core/sipe-conf.c:1111 #, c-format -msgid "%s wants to invite you to the conference call%s" -msgstr "%s vás chce přizvat ke konferenčnímu hovoru%s" - -#: ../src/core/sipe-conf.c:1063 -msgid "Accept" -msgstr "Přijmout" - -#: ../src/core/sipe-conf.c:1064 -msgid "Decline" -msgstr "Odmítnout" +msgid "wants to invite you to a conference call%s" +msgstr "vás chce přizvat ke konferenčnímu hovoru%s" -#: ../src/core/sipe-conf.c:1345 +#: ../src/core/sipe-conf.c:1459 msgid "" "This conference is no longer locked. Additional participants can now join." msgstr "Tato konference již není uzamčená. Mohou se připojovat další účastníci." -#: ../src/core/sipe-conf.c:1349 +#: ../src/core/sipe-conf.c:1463 msgid "" "This conference is locked. Nobody else can join the conference while it is " "locked." msgstr "Tato konference je uzamčená. Dokud tomu tak je, nikdo další se do ní nemůže připojit." -#: ../src/core/sipe-conf.c:1382 +#: ../src/core/sipe-conf.c:1496 msgid "You have been disconnected from this conference." msgstr "Byl jste od této konference odpojen." -#: ../src/core/sipe-conf.c:1542 +#: ../src/core/sipe-conf.c:1656 msgid "Dial-in info" msgstr "Údaje pro připojení telefonem" -#: ../src/core/sipe-conf.c:1543 +#: ../src/core/sipe-conf.c:1657 msgid "Number" msgstr "Telefonní číslo" -#: ../src/core/sipe-conf.c:1545 +#: ../src/core/sipe-conf.c:1659 msgid "Conference ID" msgstr "ID konference" -#: ../src/core/sipe-conf.c:1547 +#: ../src/core/sipe-conf.c:1661 msgid "Meeting link" msgstr "URL konference" -#: ../src/core/sipe-conf.c:1549 +#: ../src/core/sipe-conf.c:1663 msgid "Organizer" msgstr "Organizátor" -#: ../src/core/sipe-conf.c:1551 +#: ../src/core/sipe-conf.c:1665 msgid "Alternative dial-in numbers" msgstr "Alternativní telefonní čísla" #. The next 13 texts make up the SIPE about note text #. About note, part 1/13: introduction -#: ../src/core/sipe-core.c:220 +#: ../src/core/sipe-core.c:221 msgid "" "A third-party plugin implementing extended version of SIP/SIMPLE used by " "various products" msgstr "Plugin třetí strany poskytující rozšířenou verzi SIP/SIMPLE, používanou v různých produktech." #. About note, part 2/13: home page URL (label) -#: ../src/core/sipe-core.c:222 +#: ../src/core/sipe-core.c:223 msgid "Home Page" msgstr "Domovská stránka" #. About note, part 3/13: support forum URL (label) -#: ../src/core/sipe-core.c:224 +#: ../src/core/sipe-core.c:225 msgid "Support" msgstr "Uživatelská podpora" #. About note, part 4/13: support forum name (hyperlink text) -#: ../src/core/sipe-core.c:226 +#: ../src/core/sipe-core.c:227 msgid "Help Forum" msgstr "Diskuzní forum s pomocí" #. About note, part 5/13: bug tracker URL (label) -#: ../src/core/sipe-core.c:228 +#: ../src/core/sipe-core.c:229 msgid "Report Problems" msgstr "Nahlásit problémy" #. About note, part 6/13: bug tracker URL (hyperlink text) -#: ../src/core/sipe-core.c:230 +#: ../src/core/sipe-core.c:231 msgid "Bug Tracker" msgstr "Sledování nahlášených chyb" #. About note, part 7/13: translation service URL (label) -#: ../src/core/sipe-core.c:232 +#: ../src/core/sipe-core.c:233 msgid "Translations" msgstr "Překlady" #. About note, part 8/13: license type (label) -#: ../src/core/sipe-core.c:234 +#: ../src/core/sipe-core.c:235 msgid "License" msgstr "Licence" #. About note, part 9/13: (REMOVED) #. About note, part 10/13: translation request, text before Transifex.com URL #. append a space if text is not empty -#: ../src/core/sipe-core.c:238 +#: ../src/core/sipe-core.c:239 msgid "Please help us to translate SIPE to your native language here at " msgstr "Prosím pomozte přeložit SIPE do vašeho mateřského jazyka" #. About note, part 11/13: translation request, text after Transifex.com URL #. start with a space if text is not empty -#: ../src/core/sipe-core.c:241 +#: ../src/core/sipe-core.c:242 msgid " using convenient web interface" msgstr "použitím pohodlného webového rozhraní" #. About note, part 12/13: author list (header) -#: ../src/core/sipe-core.c:243 +#: ../src/core/sipe-core.c:244 msgid "Authors" msgstr "Autoři" @@ -395,15 +412,15 @@ #. PLEASE NOTE: do *NOT* simply translate the english original #. but write something similar to the following sentence: #. "Localization for (): " -#: ../src/core/sipe-core.c:248 +#: ../src/core/sipe-core.c:249 msgid "Original texts in English (en): SIPE developers" msgstr "Překlad do češtiny (cs): psilo a Jakub Adam" -#: ../src/core/sipe-core.c:269 +#: ../src/core/sipe-core.c:273 msgid "SIP Exchange user name contains invalid characters" msgstr "Uživatelské jméno pro SIP Exchange obsahuje neplatné znaky" -#: ../src/core/sipe-core.c:277 ../src/purple/purple-buddy.c:485 +#: ../src/core/sipe-core.c:281 ../src/purple/purple-buddy.c:485 #: ../src/telepathy/telepathy-protocol.c:89 #: ../src/telepathy/telepathy-protocol.c:191 #, c-format @@ -412,21 +429,21 @@ "Example: user@company.com" msgstr "Uživatelské jméno musí být platné SIP URI\nNapříklad: uzivatel@spolecnost.cz" -#: ../src/core/sipe-core.c:284 +#: ../src/core/sipe-core.c:288 msgid "Password is required when Single Sign-On is not enabled" msgstr "Pokud není povoleno jednotné přihlašování (Single Sign-On), je nutné zadat heslo" -#: ../src/core/sipe-core.c:294 +#: ../src/core/sipe-core.c:298 msgid "" "Email address should be valid if provided\n" "Example: user@company.com" msgstr "E-mailová adresa musí mít správný formát nebo zůstat nevyplněná\nNapříklad: uzivatel@spolecnost.cz" -#: ../src/core/sipe-core.c:303 +#: ../src/core/sipe-core.c:307 msgid "SIP Exchange user name contains whitespace" msgstr "Uživatelské jméno služby SIP Exchange obsahuje mezery" -#: ../src/core/sipe-core.c:317 +#: ../src/core/sipe-core.c:321 msgid "" "Email services URL should be valid if provided\n" "Example: https://exchange.corp.com/EWS/Exchange.asmx\n" @@ -457,13 +474,13 @@ msgid "Could not create listen socket" msgstr "Soket pro naslouchání nelze vytvořit" -#: ../src/core/sipe-ft-lync.c:757 ../src/core/sipe-media.c:1195 -#: ../src/core/sipe-media.c:1206 ../src/core/sipe-media.c:1284 -#: ../src/core/sipe-media.c:1740 +#: ../src/core/sipe-ft-lync.c:762 ../src/core/sipe-media.c:1328 +#: ../src/core/sipe-media.c:1339 ../src/core/sipe-media.c:1417 +#: ../src/core/sipe-media.c:1923 msgid "Error occurred" msgstr "Došlo k chybě" -#: ../src/core/sipe-ft-lync.c:758 +#: ../src/core/sipe-ft-lync.c:763 msgid "Error creating data stream" msgstr "Problém při vytváření spojení" @@ -498,7 +515,7 @@ msgstr "Nedostatek paměti" #: ../src/core/sipe-group.c:168 ../src/core/sipe-notify.c:1163 -#: ../src/core/sipe-notify.c:1190 ../src/core/sipe-notify.c:1294 +#: ../src/core/sipe-notify.c:1197 ../src/core/sipe-notify.c:1301 #: ../src/purple/purple-search.c:128 msgid "Other Contacts" msgstr "Ostatní kontakty" @@ -536,77 +553,77 @@ msgid "Failed to invite %s" msgstr "Pozvat uživatele %s se nezdařilo" -#: ../src/core/sipe-incoming.c:741 +#: ../src/core/sipe-incoming.c:754 #, c-format msgid "Received a message with unrecognized contents from %s" msgstr "Obdržena zpráva s nerozpoznaným obsahem od uživatele %s" -#: ../src/core/sipe-media.c:835 ../src/core/sipe-media.c:1347 -#: ../src/core/sipe-media.c:1357 ../src/core/sipe-media.c:1721 -#: ../src/core/sipe-media.c:1741 +#: ../src/core/sipe-media.c:869 ../src/core/sipe-media.c:1483 +#: ../src/core/sipe-media.c:1493 ../src/core/sipe-media.c:1904 +#: ../src/core/sipe-media.c:1924 msgid "Unable to establish a call" msgstr "Hovor nelze spojit" -#: ../src/core/sipe-media.c:836 ../src/core/sipe-media.c:1722 +#: ../src/core/sipe-media.c:870 ../src/core/sipe-media.c:1905 msgid "Encryption settings of peer are incompatible with ours." msgstr "Nastavení šifrování na straně kontaktu není kompatibilní s naším" -#: ../src/core/sipe-media.c:929 +#: ../src/core/sipe-media.c:963 #, c-format msgid "User %s rejected call" msgstr "Uživatel %s hovor odmítl " -#: ../src/core/sipe-media.c:930 +#: ../src/core/sipe-media.c:964 msgid "Call rejected" msgstr "Hovor odmítnut" -#: ../src/core/sipe-media.c:1196 ../src/core/sipe-media.c:1285 +#: ../src/core/sipe-media.c:1329 ../src/core/sipe-media.c:1418 msgid "Error creating audio stream" msgstr "Chyba při vytváření audio proudu" -#: ../src/core/sipe-media.c:1207 +#: ../src/core/sipe-media.c:1340 msgid "Error creating video stream" msgstr "Chyba při vytváření video proudu" -#: ../src/core/sipe-media.c:1251 ../src/purple/purple-chat.c:314 +#: ../src/core/sipe-media.c:1384 ../src/purple/purple-chat.c:329 msgid "Join conference call" msgstr "Připojit ke konferenčnímu hovoru" -#: ../src/core/sipe-media.c:1252 +#: ../src/core/sipe-media.c:1385 msgid "Conference calls are not supported on this server." msgstr "Tento server nepodporuje konferenční hovory." -#: ../src/core/sipe-media.c:1348 +#: ../src/core/sipe-media.c:1484 msgid "Invalid phone number" msgstr "Chybné telefonní číslo" -#: ../src/core/sipe-media.c:1358 +#: ../src/core/sipe-media.c:1494 msgid "Audio Test Service is not available." msgstr "Služba zkušební hovor není k dispozici." -#: ../src/core/sipe-media.c:1690 +#: ../src/core/sipe-media.c:1873 msgid "User unavailable" msgstr "Uživatel nedostupný" -#: ../src/core/sipe-media.c:1693 +#: ../src/core/sipe-media.c:1876 #, c-format msgid "%s does not want to be disturbed" msgstr "%s si nepřeje být vyrušován" -#: ../src/core/sipe-media.c:1695 +#: ../src/core/sipe-media.c:1878 #, c-format msgid "User %s is not available" msgstr "Uživatel %s je nedostupný" -#: ../src/core/sipe-media.c:1704 +#: ../src/core/sipe-media.c:1887 msgid "Unsupported media type" msgstr "Nepodporovaný formát média" -#: ../src/core/sipe-media.c:2062 +#: ../src/core/sipe-media.c:2246 msgid "Media error" msgstr "Problém se spojením" -#: ../src/core/sipe-media.c:2063 +#: ../src/core/sipe-media.c:2247 msgid "Error while reading from stream" msgstr "Problém při čtení dat" @@ -657,36 +674,36 @@ msgstr "Neznámý" #. Translators: remove (clear) previously assigned access level -#: ../src/core/sipe-ocs2007.c:2571 +#: ../src/core/sipe-ocs2007.c:2570 msgid "Unspecify" msgstr "Odebrat nastavení" -#: ../src/core/sipe-ocs2007.c:2590 +#: ../src/core/sipe-ocs2007.c:2589 msgid "People in my company" msgstr "Lidé v mé společnosti" -#: ../src/core/sipe-ocs2007.c:2600 +#: ../src/core/sipe-ocs2007.c:2599 msgid "People in domains connected with my company" msgstr "Lidé v doménách propojených s mou společností" -#: ../src/core/sipe-ocs2007.c:2609 +#: ../src/core/sipe-ocs2007.c:2608 msgid "People in public domains" msgstr "Lidé ve veřejných doménách" -#: ../src/core/sipe-ocs2007.c:2619 +#: ../src/core/sipe-ocs2007.c:2618 #, c-format msgid "People at %s" msgstr "Lidé v %s" -#: ../src/core/sipe-ocs2007.c:2644 +#: ../src/core/sipe-ocs2007.c:2643 msgid "Add new domain..." msgstr "Přidat další doménu..." -#: ../src/core/sipe-ocs2007.c:2673 +#: ../src/core/sipe-ocs2007.c:2672 msgid "Online help..." msgstr "Online nápověda..." -#: ../src/core/sipe-ocs2007.c:2681 +#: ../src/core/sipe-ocs2007.c:2680 msgid "Access groups" msgstr "Přístupové skupiny" @@ -698,49 +715,60 @@ #. SIPE_ACTIVITY_AVAILABLE #. SIPE_ACTIVITY_ONLINE #. SIPE_ACTIVITY_INACTIVE -#: ../src/core/sipe-status.c:58 +#: ../src/core/sipe-status.c:56 msgid "Inactive" msgstr "Neaktivní" #. SIPE_ACTIVITY_BUSYIDLE -#: ../src/core/sipe-status.c:60 +#: ../src/core/sipe-status.c:58 msgid "Busy-Idle" msgstr "Zaneprázdněn" #. SIPE_ACTIVITY_DND #. SIPE_ACTIVITY_BRB -#: ../src/core/sipe-status.c:62 +#: ../src/core/sipe-status.c:60 msgid "Be right back" msgstr "Za chvíli budu zpět" #. SIPE_ACTIVITY_AWAY #. SIPE_ACTIVITY_LUNCH -#: ../src/core/sipe-status.c:64 +#: ../src/core/sipe-status.c:62 msgid "Out to lunch" msgstr "Na obědě" #. SIPE_ACTIVITY_INVISIBLE #. SIPE_ACTIVITY_OFFLINE #. SIPE_ACTIVITY_ON_PHONE -#: ../src/core/sipe-status.c:67 +#: ../src/core/sipe-status.c:65 msgid "In a call" msgstr "Telefonuji" #. SIPE_ACTIVITY_IN_CONF -#: ../src/core/sipe-status.c:68 +#: ../src/core/sipe-status.c:66 msgid "In a conference" msgstr "Na konferenci" #. SIPE_ACTIVITY_IN_MEETING -#: ../src/core/sipe-status.c:69 +#: ../src/core/sipe-status.c:67 msgid "In a meeting" msgstr "Na schůzce" #. SIPE_ACTIVITY_URGENT_ONLY -#: ../src/core/sipe-status.c:71 +#: ../src/core/sipe-status.c:69 msgid "Urgent interruptions only" msgstr "Pouze urgentní záležitosti" +#: ../src/core/sipe-subscriptions.c:189 +msgid "Presence subscription failed!" +msgstr "Nelze odebírat informace o přítomnosti uživatelů!" + +#: ../src/core/sipe-subscriptions.c:190 +msgid "" +"One or more buddies will therefore permanently show as offline.\n" +"\n" +"Please check that there are no corrupted SIP URIs in your contacts list." +msgstr "Některé kontakty se proto budou trvale jevit jako nedostupné.\n\nProsím zkontroluje jestli váš seznam kontaktů neobsahuje neplatná SIP URI." + #: ../src/core/sipe-ucs.c:674 msgid "UCS initialization failed!" msgstr "Nelze inicializovat jednotné úložiště kontaktů (UCS)!" @@ -893,15 +921,19 @@ msgid "Copy to" msgstr "Zkopírovat do" -#: ../src/purple/purple-chat.c:295 +#: ../src/purple/purple-chat.c:310 msgid "Lock" msgstr "Zamknout" -#: ../src/purple/purple-chat.c:300 +#: ../src/purple/purple-chat.c:315 msgid "Unlock" msgstr "Odemknout" -#: ../src/purple/purple-chat.c:321 +#: ../src/purple/purple-chat.c:338 +msgid "Show presentation" +msgstr "Zobrazit prezentaci" + +#: ../src/purple/purple-chat.c:345 msgid "Meeting entry info" msgstr "Přístupové údaje" @@ -1153,26 +1185,30 @@ msgstr "Proxy server pro skupinový chat\n spolecnost.com nebo uzivatel@spolecnost.com\n(nechte prázdné pro odvození z uživatelského jména)" #: ../src/purple/purple-plugin-common.c:933 +msgid "Remote desktop client" +msgstr "Klient vzdálené plochy" + +#: ../src/purple/purple-plugin-common.c:938 msgid "Media encryption" msgstr "Šifrování hovorů" -#: ../src/purple/purple-plugin-common.c:934 +#: ../src/purple/purple-plugin-common.c:939 msgid "Obey server policy" msgstr "Podle politiky serveru" -#: ../src/purple/purple-plugin-common.c:935 +#: ../src/purple/purple-plugin-common.c:940 msgid "Always" msgstr "Vždy" -#: ../src/purple/purple-plugin-common.c:936 +#: ../src/purple/purple-plugin-common.c:941 msgid "Optional" msgstr "Volitelně" -#: ../src/purple/purple-plugin-common.c:937 +#: ../src/purple/purple-plugin-common.c:942 msgid "Disabled" msgstr "Nikdy" -#: ../src/purple/purple-plugin-common.c:947 +#: ../src/purple/purple-plugin-common.c:952 msgid "" "Login\n" " user or DOMAIN\\user or\n" @@ -1221,27 +1257,27 @@ msgid "_Search" msgstr "_Hledat" -#: ../src/purple/purple-transport.c:132 +#: ../src/purple/purple-transport.c:135 msgid "Read error" msgstr "Chyba čtení" -#: ../src/purple/purple-transport.c:136 -#: ../src/telepathy/telepathy-transport.c:96 +#: ../src/purple/purple-transport.c:139 +#: ../src/telepathy/telepathy-transport.c:95 msgid "Server has disconnected" msgstr "Došlo k odpojení serveru." -#: ../src/purple/purple-transport.c:198 +#: ../src/purple/purple-transport.c:201 msgid "Could not connect" msgstr "Spojení nelze navázat" -#: ../src/purple/purple-transport.c:268 +#: ../src/purple/purple-transport.c:271 msgid "Could not create SSL context" msgstr "Kontext protokolu SSL se nepodařilo vytvořit." -#: ../src/purple/purple-transport.c:290 +#: ../src/purple/purple-transport.c:293 msgid "Could not create socket" msgstr "Nemohu vytvořit socket" -#: ../src/purple/purple-transport.c:381 +#: ../src/purple/purple-transport.c:417 msgid "Write error" msgstr "Chyba zápisu" diff -Nru pidgin-sipe-1.21.1/po/da.po pidgin-sipe-1.22.1/po/da.po --- pidgin-sipe-1.21.1/po/da.po 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/po/da.po 2017-06-11 15:41:22.000000000 +0000 @@ -5,15 +5,15 @@ # # # Translators: -# Joe Hansen , 2013,2015-2016 +# Joe Hansen , 2013,2015-2017 # Stefan Becker , 2011 msgid "" msgstr "" "Project-Id-Version: pidgin sipe\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/sipe/bugs/\n" "POT-Creation-Date: 2010-11-30 23:36+0200\n" -"PO-Revision-Date: 2016-05-28 15:08+0000\n" -"Last-Translator: Stefan Becker \n" +"PO-Revision-Date: 2017-01-23 19:46+0000\n" +"Last-Translator: Joe Hansen \n" "Language-Team: Danish (http://www.transifex.com/stefanb/pidgin-sipe/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,213 +21,238 @@ "Language: da\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../src/core/sip-transport.c:235 +#: ../src/core/sip-transport.c:240 msgid "Failed to authenticate to server" msgstr "Kunne ikke godkende til serveren" -#: ../src/core/sip-transport.c:293 +#: ../src/core/sip-transport.c:298 #, c-format msgid "Can't request certificate from %s" msgstr "Kan ikke anmode om certifikat fra %s" -#: ../src/core/sip-transport.c:303 +#: ../src/core/sip-transport.c:308 msgid "No URI for certificate provisioning service provided" msgstr "Ingen URI for certifikatprovisioningtjeneste tilbudt" -#: ../src/core/sip-transport.c:1281 +#: ../src/core/sip-transport.c:1285 msgid "Authentication failed" msgstr "Godkendelse mislykkedes" -#: ../src/core/sip-transport.c:1338 +#: ../src/core/sip-transport.c:1342 msgid "Incompatible authentication scheme chosen" msgstr "Inkompatibelt godkendelsesskema valgt" -#: ../src/core/sip-transport.c:1355 ../src/core/sipe-notify.c:1149 +#: ../src/core/sip-transport.c:1359 ../src/core/sipe-notify.c:1149 #, c-format msgid "You have been rejected by the server: %s" msgstr "Du er blevet afvist af serveren: %s" -#: ../src/core/sip-transport.c:1356 ../src/core/sip-transport.c:1372 -#: ../src/core/sip-transport.c:1396 ../src/core/sip-transport.c:1420 +#: ../src/core/sip-transport.c:1360 ../src/core/sip-transport.c:1376 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 #: ../src/core/sipe-conf.c:265 ../src/core/sipe-notify.c:1149 msgid "no reason given" msgstr "ingen årsag angivet" -#: ../src/core/sip-transport.c:1371 +#: ../src/core/sip-transport.c:1375 #, c-format msgid "Not found: %s. Please contact your Administrator" msgstr "Ikke fundt: %s. Kontakt venligst din administrator" -#: ../src/core/sip-transport.c:1373 +#: ../src/core/sip-transport.c:1377 msgid "SIP is either not enabled for the destination URI or it does not exist" msgstr "SIP er enten ikke aktiveret for destinations-URI'en eller den findes ikke" -#: ../src/core/sip-transport.c:1396 ../src/core/sip-transport.c:1420 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 #, c-format msgid "Service unavailable: %s" msgstr "Tjenesten er ikke tilgængelig: %s" -#: ../src/core/sip-transport.c:1766 +#: ../src/core/sip-transport.c:1775 msgid "Corrupted message received" msgstr "Ødelagt besked modtaget" -#: ../src/core/sip-transport.c:1790 +#: ../src/core/sip-transport.c:1799 msgid "Invalid message signature received" msgstr "Ugyldig meddelelsessignatur modtaget" -#: ../src/core/sipe-buddy.c:540 ../src/core/sipe-buddy.c:2300 +#: ../src/core/sipe-appshare.c:458 +#, c-format +msgid "%s wants to start presenting" +msgstr "%s ønsker at starte præsentation" + +#: ../src/core/sipe-appshare.c:462 ../src/core/sipe-conf.c:1086 +msgid "Accept" +msgstr "Accepter" + +#: ../src/core/sipe-appshare.c:463 ../src/core/sipe-conf.c:1087 +msgid "Decline" +msgstr "Afvis" + +#: ../src/core/sipe-appshare.c:501 ../src/core/sipe-appshare.c:599 +msgid "Application sharing error" +msgstr "Programdelingsfejl" + +#: ../src/core/sipe-appshare.c:502 +msgid "Unknown remote desktop client configured." +msgstr "Ukendt ekstern skrivebordsklient konfigureret." + +#: ../src/core/sipe-appshare.c:600 +msgid "Couldn't connect application sharing" +msgstr "Kunne ikke forbinde programdeling" + +#: ../src/core/sipe-buddy.c:541 ../src/core/sipe-buddy.c:2301 msgid "Mobile" msgstr "Mobil" -#: ../src/core/sipe-buddy.c:828 +#: ../src/core/sipe-buddy.c:829 msgid "Status" msgstr "Status" -#: ../src/core/sipe-buddy.c:831 +#: ../src/core/sipe-buddy.c:832 msgid "Calendar" msgstr "Kalender" -#: ../src/core/sipe-buddy.c:836 +#: ../src/core/sipe-buddy.c:837 msgid "Meeting in" msgstr "Møde i" -#: ../src/core/sipe-buddy.c:840 +#: ../src/core/sipe-buddy.c:841 msgid "Meeting about" msgstr "Møde om" -#: ../src/core/sipe-buddy.c:845 +#: ../src/core/sipe-buddy.c:846 msgid "Out of office note" msgstr "Væk fra kontoret-note" -#: ../src/core/sipe-buddy.c:845 +#: ../src/core/sipe-buddy.c:846 msgid "Note" msgstr "Note" -#: ../src/core/sipe-buddy.c:850 ../src/core/sipe-buddy.c:2345 +#: ../src/core/sipe-buddy.c:851 ../src/core/sipe-buddy.c:2346 #: ../src/purple/purple-buddy.c:633 msgid "Access level" msgstr "Adgangsniveau" -#: ../src/core/sipe-buddy.c:1073 +#: ../src/core/sipe-buddy.c:1074 #, c-format msgid "Found %d contact%s:" msgid_plural "Found %d contacts%s:" msgstr[0] "Fandt %d kontakt%s:" msgstr[1] "Fandt %d kontakter%s:" -#: ../src/core/sipe-buddy.c:1075 +#: ../src/core/sipe-buddy.c:1076 msgid " (more matched your query)" msgstr " (mere stemte med din forespørgsel)" -#: ../src/core/sipe-buddy.c:1121 ../src/core/sipe-buddy.c:1259 +#: ../src/core/sipe-buddy.c:1122 ../src/core/sipe-buddy.c:1260 #: ../src/core/sipe-ucs.c:314 msgid "No contacts found" msgstr "Ingen kontakter fundet" -#: ../src/core/sipe-buddy.c:1134 ../src/core/sipe-buddy.c:1272 +#: ../src/core/sipe-buddy.c:1135 ../src/core/sipe-buddy.c:1273 #: ../src/core/sipe-ucs.c:278 msgid "Unable to display the search results" msgstr "Kunne ikke vise søgeresultaterne" -#: ../src/core/sipe-buddy.c:1237 ../src/core/sipe-buddy.c:1249 +#: ../src/core/sipe-buddy.c:1238 ../src/core/sipe-buddy.c:1250 #: ../src/core/sipe-ucs.c:391 msgid "Contact search failed" msgstr "Kontaktsøgning mislykkedes" -#: ../src/core/sipe-buddy.c:1412 ../src/core/sipe-ucs.c:395 +#: ../src/core/sipe-buddy.c:1413 ../src/core/sipe-ucs.c:395 msgid "Invalid contact search query" msgstr "Ugyldig kontaktsøgningsforespørgsel" -#: ../src/core/sipe-buddy.c:2237 +#: ../src/core/sipe-buddy.c:2238 #, c-format msgid "Make leader of '%s'" msgstr "Gør »%s« til leder" -#: ../src/core/sipe-buddy.c:2250 +#: ../src/core/sipe-buddy.c:2251 #, c-format msgid "Remove from '%s'" msgstr "Fjern fra »%s«" -#: ../src/core/sipe-buddy.c:2264 +#: ../src/core/sipe-buddy.c:2265 #, c-format msgid "Invite to '%s'" msgstr "Inviter til »%s" -#: ../src/core/sipe-buddy.c:2280 +#: ../src/core/sipe-buddy.c:2281 msgid "New chat" msgstr "Ny snak (chat)" -#: ../src/core/sipe-buddy.c:2293 +#: ../src/core/sipe-buddy.c:2294 msgid "Work" msgstr "Arbejde" -#: ../src/core/sipe-buddy.c:2308 +#: ../src/core/sipe-buddy.c:2309 msgid "Home" msgstr "Hjem" -#: ../src/core/sipe-buddy.c:2316 +#: ../src/core/sipe-buddy.c:2317 msgid "Other" msgstr "Andet" -#: ../src/core/sipe-buddy.c:2324 +#: ../src/core/sipe-buddy.c:2325 msgid "Custom1" msgstr "Tilpasset1" -#: ../src/core/sipe-buddy.c:2334 +#: ../src/core/sipe-buddy.c:2335 msgid "Send email..." msgstr "Send e-post ..." -#: ../src/core/sipe-cal.c:907 +#: ../src/core/sipe-cal.c:906 msgid "Free" msgstr "Fri" -#: ../src/core/sipe-cal.c:908 +#: ../src/core/sipe-cal.c:907 msgid "Tentative" msgstr "Foreløbig" #. SIPE_ACTIVITY_BUSY -#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:59 +#: ../src/core/sipe-cal.c:908 ../src/core/sipe-status.c:57 msgid "Busy" msgstr "Optaget" #. SIPE_ACTIVITY_OOF -#: ../src/core/sipe-cal.c:910 ../src/core/sipe-status.c:70 +#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:68 msgid "Out of office" msgstr "Væk fra kontoret" -#: ../src/core/sipe-cal.c:911 +#: ../src/core/sipe-cal.c:910 msgid "No data" msgstr "Ingen data" -#: ../src/core/sipe-cal.c:1019 ../src/core/sipe-cal.c:1046 +#: ../src/core/sipe-cal.c:1018 ../src/core/sipe-cal.c:1045 #, c-format msgid "Currently %s" msgstr "I øjeblikket %s" -#: ../src/core/sipe-cal.c:1025 +#: ../src/core/sipe-cal.c:1024 msgid "Outside of working hours for next 8 hours" msgstr "Uden for arbejdstid de næste 8 timer" -#: ../src/core/sipe-cal.c:1027 +#: ../src/core/sipe-cal.c:1026 #, c-format msgid "%s for next 8 hours" msgstr "%s for de næste 8 timer" -#: ../src/core/sipe-cal.c:1036 +#: ../src/core/sipe-cal.c:1035 msgid "Not working" msgstr "Arbejder ikke" -#: ../src/core/sipe-cal.c:1040 +#: ../src/core/sipe-cal.c:1039 #, c-format msgid "%s until %.2d:%.2d" msgstr "%s indtil %.2d:%.2d" -#: ../src/core/sipe-cal.c:1048 +#: ../src/core/sipe-cal.c:1047 #, c-format msgid "%s. Outside of working hours at %.2d:%.2d" msgstr "%s. Uden for arbejdstid kl. %.2d:%.2d" -#: ../src/core/sipe-cal.c:1053 +#: ../src/core/sipe-cal.c:1052 #, c-format msgid "%s. %s at %.2d:%.2d" msgstr "%s. %s kl. %.2d:%.2d" @@ -243,7 +268,7 @@ msgstr "Netbilletforespørgsel til %s mislykkedes" #. Generate next ID -#: ../src/core/sipe-chat.c:240 +#: ../src/core/sipe-chat.c:246 #, c-format msgid "Chat #%d" msgstr "Snak #%d" @@ -270,123 +295,115 @@ msgid "Incomplete conference information provided" msgstr "Ufuldstændig konferenceinformation" -#: ../src/core/sipe-conf.c:1041 +#: ../src/core/sipe-conf.c:1106 msgid "" "\n" "\n" "As this client was not compiled with voice call support, if you accept, you will be able to contact the other participants only via IM session." msgstr "\n\nDa denne klient ikke blev kompileret med understøttelse af stemmekald (voice call), vil du kun kunne kontakte de andre deltagere via IM-session, såfremt du accepterer dette." -#: ../src/core/sipe-conf.c:1049 +#: ../src/core/sipe-conf.c:1111 #, c-format -msgid "%s wants to invite you to the conference call%s" -msgstr "%s ønsker at invitere dig til konferencekald%s" - -#: ../src/core/sipe-conf.c:1063 -msgid "Accept" -msgstr "Accepter" - -#: ../src/core/sipe-conf.c:1064 -msgid "Decline" -msgstr "Afvis" +msgid "wants to invite you to a conference call%s" +msgstr "ønsker at invitere dig til et konferencekald%s" -#: ../src/core/sipe-conf.c:1345 +#: ../src/core/sipe-conf.c:1459 msgid "" "This conference is no longer locked. Additional participants can now join." msgstr "Denne konference er ikke længere låst. Yderligere deltagere kan nu slutte sig til." -#: ../src/core/sipe-conf.c:1349 +#: ../src/core/sipe-conf.c:1463 msgid "" "This conference is locked. Nobody else can join the conference while it is " "locked." msgstr "Denne konference er låst. Ingen andre kan slutte sig til konferencen mens den er låst." -#: ../src/core/sipe-conf.c:1382 +#: ../src/core/sipe-conf.c:1496 msgid "You have been disconnected from this conference." msgstr "Du er blevet frakoblet fra denne konference." -#: ../src/core/sipe-conf.c:1542 +#: ../src/core/sipe-conf.c:1656 msgid "Dial-in info" msgstr "Opkaldsinfo" -#: ../src/core/sipe-conf.c:1543 +#: ../src/core/sipe-conf.c:1657 msgid "Number" msgstr "Nummer" -#: ../src/core/sipe-conf.c:1545 +#: ../src/core/sipe-conf.c:1659 msgid "Conference ID" msgstr "Konference-id" -#: ../src/core/sipe-conf.c:1547 +#: ../src/core/sipe-conf.c:1661 msgid "Meeting link" msgstr "Mødehenvisning" -#: ../src/core/sipe-conf.c:1549 +#: ../src/core/sipe-conf.c:1663 msgid "Organizer" msgstr "Organisator" -#: ../src/core/sipe-conf.c:1551 +#: ../src/core/sipe-conf.c:1665 msgid "Alternative dial-in numbers" msgstr "Alternative opkaldsnumre" #. The next 13 texts make up the SIPE about note text #. About note, part 1/13: introduction -#: ../src/core/sipe-core.c:220 +#: ../src/core/sipe-core.c:221 msgid "" "A third-party plugin implementing extended version of SIP/SIMPLE used by " "various products" msgstr "Et tredjepartudvidelsesmodul der implementerer en udvidet version af SIP/SIMPLe brug af diverse produkter" #. About note, part 2/13: home page URL (label) -#: ../src/core/sipe-core.c:222 +#: ../src/core/sipe-core.c:223 msgid "Home Page" msgstr "Hjemmeside" #. About note, part 3/13: support forum URL (label) -#: ../src/core/sipe-core.c:224 +#: ../src/core/sipe-core.c:225 msgid "Support" msgstr "Hjælp" #. About note, part 4/13: support forum name (hyperlink text) -#: ../src/core/sipe-core.c:226 +#: ../src/core/sipe-core.c:227 msgid "Help Forum" msgstr "Hjælpeforum" #. About note, part 5/13: bug tracker URL (label) -#: ../src/core/sipe-core.c:228 +#: ../src/core/sipe-core.c:229 msgid "Report Problems" msgstr "Rapporter problemer" #. About note, part 6/13: bug tracker URL (hyperlink text) -#: ../src/core/sipe-core.c:230 +#: ../src/core/sipe-core.c:231 msgid "Bug Tracker" msgstr "Fejlrapporter" #. About note, part 7/13: translation service URL (label) -#: ../src/core/sipe-core.c:232 +#: ../src/core/sipe-core.c:233 msgid "Translations" msgstr "Oversættelser" #. About note, part 8/13: license type (label) -#: ../src/core/sipe-core.c:234 +#: ../src/core/sipe-core.c:235 msgid "License" msgstr "Licens" #. About note, part 9/13: (REMOVED) #. About note, part 10/13: translation request, text before Transifex.com URL #. append a space if text is not empty -#: ../src/core/sipe-core.c:238 +#: ../src/core/sipe-core.c:239 msgid "Please help us to translate SIPE to your native language here at " msgstr "Hjælp os venligst med at oversætte SIPE til dit sprog via" #. About note, part 11/13: translation request, text after Transifex.com URL #. start with a space if text is not empty -#: ../src/core/sipe-core.c:241 +#: ../src/core/sipe-core.c:242 msgid " using convenient web interface" msgstr "bruger praktisk netgrænseflade" #. About note, part 12/13: author list (header) -#: ../src/core/sipe-core.c:243 +#: ../src/core/sipe-core.c:244 msgid "Authors" msgstr "Forfattere" @@ -394,15 +411,15 @@ #. PLEASE NOTE: do *NOT* simply translate the english original #. but write something similar to the following sentence: #. "Localization for (): " -#: ../src/core/sipe-core.c:248 +#: ../src/core/sipe-core.c:249 msgid "Original texts in English (en): SIPE developers" msgstr "Oprindelige tekster på engelsk (en): SIPE-udviklere" -#: ../src/core/sipe-core.c:269 +#: ../src/core/sipe-core.c:273 msgid "SIP Exchange user name contains invalid characters" msgstr "SIP Exchange-brugernavn indeholder ugyldige tegn" -#: ../src/core/sipe-core.c:277 ../src/purple/purple-buddy.c:485 +#: ../src/core/sipe-core.c:281 ../src/purple/purple-buddy.c:485 #: ../src/telepathy/telepathy-protocol.c:89 #: ../src/telepathy/telepathy-protocol.c:191 #, c-format @@ -411,21 +428,21 @@ "Example: user@company.com" msgstr "Brugernavn skal være en gyldig SIP URI\nEksempel: bruger@firma.com" -#: ../src/core/sipe-core.c:284 +#: ../src/core/sipe-core.c:288 msgid "Password is required when Single Sign-On is not enabled" msgstr "Adgangskode er krævet når Single Sign-On ikke er aktiveret" -#: ../src/core/sipe-core.c:294 +#: ../src/core/sipe-core.c:298 msgid "" "Email address should be valid if provided\n" "Example: user@company.com" msgstr "E-postadresse skal være gyldig hvis angivet\nEksempel: bruger@firma.com" -#: ../src/core/sipe-core.c:303 +#: ../src/core/sipe-core.c:307 msgid "SIP Exchange user name contains whitespace" msgstr "SIP Exchange-brugernavn indeholder mellemrum" -#: ../src/core/sipe-core.c:317 +#: ../src/core/sipe-core.c:321 msgid "" "Email services URL should be valid if provided\n" "Example: https://exchange.corp.com/EWS/Exchange.asmx\n" @@ -456,13 +473,13 @@ msgid "Could not create listen socket" msgstr "Kunne ikke oprette lyttende sokkel" -#: ../src/core/sipe-ft-lync.c:757 ../src/core/sipe-media.c:1195 -#: ../src/core/sipe-media.c:1206 ../src/core/sipe-media.c:1284 -#: ../src/core/sipe-media.c:1740 +#: ../src/core/sipe-ft-lync.c:762 ../src/core/sipe-media.c:1328 +#: ../src/core/sipe-media.c:1339 ../src/core/sipe-media.c:1417 +#: ../src/core/sipe-media.c:1923 msgid "Error occurred" msgstr "Der opstod en fejl" -#: ../src/core/sipe-ft-lync.c:758 +#: ../src/core/sipe-ft-lync.c:763 msgid "Error creating data stream" msgstr "Der opstod en fejl under oprettelse af datastrøm" @@ -497,7 +514,7 @@ msgstr "Ikke nok hukommelse" #: ../src/core/sipe-group.c:168 ../src/core/sipe-notify.c:1163 -#: ../src/core/sipe-notify.c:1190 ../src/core/sipe-notify.c:1294 +#: ../src/core/sipe-notify.c:1197 ../src/core/sipe-notify.c:1301 #: ../src/purple/purple-search.c:128 msgid "Other Contacts" msgstr "Andre kontakter" @@ -535,77 +552,77 @@ msgid "Failed to invite %s" msgstr "Kunne ikke invitere %s" -#: ../src/core/sipe-incoming.c:741 +#: ../src/core/sipe-incoming.c:754 #, c-format msgid "Received a message with unrecognized contents from %s" msgstr "Modtog en besked med ukendt indhold fra %s" -#: ../src/core/sipe-media.c:835 ../src/core/sipe-media.c:1347 -#: ../src/core/sipe-media.c:1357 ../src/core/sipe-media.c:1721 -#: ../src/core/sipe-media.c:1741 +#: ../src/core/sipe-media.c:869 ../src/core/sipe-media.c:1483 +#: ../src/core/sipe-media.c:1493 ../src/core/sipe-media.c:1904 +#: ../src/core/sipe-media.c:1924 msgid "Unable to establish a call" msgstr "Kunne ikke etablere et opkald" -#: ../src/core/sipe-media.c:836 ../src/core/sipe-media.c:1722 +#: ../src/core/sipe-media.c:870 ../src/core/sipe-media.c:1905 msgid "Encryption settings of peer are incompatible with ours." msgstr "Krypteringsindstillinger for modpart er ikke kompatible med vores." -#: ../src/core/sipe-media.c:929 +#: ../src/core/sipe-media.c:963 #, c-format msgid "User %s rejected call" msgstr "Bruger %s afviste kald" -#: ../src/core/sipe-media.c:930 +#: ../src/core/sipe-media.c:964 msgid "Call rejected" msgstr "Kald afvist" -#: ../src/core/sipe-media.c:1196 ../src/core/sipe-media.c:1285 +#: ../src/core/sipe-media.c:1329 ../src/core/sipe-media.c:1418 msgid "Error creating audio stream" msgstr "Fejl under oprettelse af lydstrøm" -#: ../src/core/sipe-media.c:1207 +#: ../src/core/sipe-media.c:1340 msgid "Error creating video stream" msgstr "Fejl ved oprettelse af videostrøm" -#: ../src/core/sipe-media.c:1251 ../src/purple/purple-chat.c:314 +#: ../src/core/sipe-media.c:1384 ../src/purple/purple-chat.c:329 msgid "Join conference call" msgstr "Gå til konferencekald" -#: ../src/core/sipe-media.c:1252 +#: ../src/core/sipe-media.c:1385 msgid "Conference calls are not supported on this server." msgstr "Konferencekald er ikke understøttet på denne server." -#: ../src/core/sipe-media.c:1348 +#: ../src/core/sipe-media.c:1484 msgid "Invalid phone number" msgstr "Ugyldigt telefonnummer" -#: ../src/core/sipe-media.c:1358 +#: ../src/core/sipe-media.c:1494 msgid "Audio Test Service is not available." msgstr "Audio Test Service er ikke tilgængelig." -#: ../src/core/sipe-media.c:1690 +#: ../src/core/sipe-media.c:1873 msgid "User unavailable" msgstr "Bruger utilgængelig" -#: ../src/core/sipe-media.c:1693 +#: ../src/core/sipe-media.c:1876 #, c-format msgid "%s does not want to be disturbed" msgstr "%s ønsker ikke at blive forstyrret" -#: ../src/core/sipe-media.c:1695 +#: ../src/core/sipe-media.c:1878 #, c-format msgid "User %s is not available" msgstr "Bruger %s er ikke tilgængelig" -#: ../src/core/sipe-media.c:1704 +#: ../src/core/sipe-media.c:1887 msgid "Unsupported media type" msgstr "Medietype er ikke understøttet" -#: ../src/core/sipe-media.c:2062 +#: ../src/core/sipe-media.c:2246 msgid "Media error" msgstr "Mediefejl" -#: ../src/core/sipe-media.c:2063 +#: ../src/core/sipe-media.c:2247 msgid "Error while reading from stream" msgstr "Der opstod en fejl under læsning fra strøm" @@ -656,36 +673,36 @@ msgstr "Ukendt" #. Translators: remove (clear) previously assigned access level -#: ../src/core/sipe-ocs2007.c:2571 +#: ../src/core/sipe-ocs2007.c:2570 msgid "Unspecify" msgstr "Fjern specifikation" -#: ../src/core/sipe-ocs2007.c:2590 +#: ../src/core/sipe-ocs2007.c:2589 msgid "People in my company" msgstr "Folk i mit firma" -#: ../src/core/sipe-ocs2007.c:2600 +#: ../src/core/sipe-ocs2007.c:2599 msgid "People in domains connected with my company" msgstr "Folk i domæner forbundet med mit firma" -#: ../src/core/sipe-ocs2007.c:2609 +#: ../src/core/sipe-ocs2007.c:2608 msgid "People in public domains" msgstr "Folk i offentlige domæner" -#: ../src/core/sipe-ocs2007.c:2619 +#: ../src/core/sipe-ocs2007.c:2618 #, c-format msgid "People at %s" msgstr "Folk i %s" -#: ../src/core/sipe-ocs2007.c:2644 +#: ../src/core/sipe-ocs2007.c:2643 msgid "Add new domain..." msgstr "Tilføj et nyt domæne ..." -#: ../src/core/sipe-ocs2007.c:2673 +#: ../src/core/sipe-ocs2007.c:2672 msgid "Online help..." msgstr "Hjælp på nettet ..." -#: ../src/core/sipe-ocs2007.c:2681 +#: ../src/core/sipe-ocs2007.c:2680 msgid "Access groups" msgstr "Tilgå grupper" @@ -697,49 +714,60 @@ #. SIPE_ACTIVITY_AVAILABLE #. SIPE_ACTIVITY_ONLINE #. SIPE_ACTIVITY_INACTIVE -#: ../src/core/sipe-status.c:58 +#: ../src/core/sipe-status.c:56 msgid "Inactive" msgstr "Inaktiv" #. SIPE_ACTIVITY_BUSYIDLE -#: ../src/core/sipe-status.c:60 +#: ../src/core/sipe-status.c:58 msgid "Busy-Idle" msgstr "Optaget-ledig" #. SIPE_ACTIVITY_DND #. SIPE_ACTIVITY_BRB -#: ../src/core/sipe-status.c:62 +#: ../src/core/sipe-status.c:60 msgid "Be right back" msgstr "Er snart tilbage" #. SIPE_ACTIVITY_AWAY #. SIPE_ACTIVITY_LUNCH -#: ../src/core/sipe-status.c:64 +#: ../src/core/sipe-status.c:62 msgid "Out to lunch" msgstr "Væk til frokost" #. SIPE_ACTIVITY_INVISIBLE #. SIPE_ACTIVITY_OFFLINE #. SIPE_ACTIVITY_ON_PHONE -#: ../src/core/sipe-status.c:67 +#: ../src/core/sipe-status.c:65 msgid "In a call" msgstr "Optaget på telefonen" #. SIPE_ACTIVITY_IN_CONF -#: ../src/core/sipe-status.c:68 +#: ../src/core/sipe-status.c:66 msgid "In a conference" msgstr "Til konference" #. SIPE_ACTIVITY_IN_MEETING -#: ../src/core/sipe-status.c:69 +#: ../src/core/sipe-status.c:67 msgid "In a meeting" msgstr "I møde" #. SIPE_ACTIVITY_URGENT_ONLY -#: ../src/core/sipe-status.c:71 +#: ../src/core/sipe-status.c:69 msgid "Urgent interruptions only" msgstr "Kun vigtige afbrydelser" +#: ../src/core/sipe-subscriptions.c:189 +msgid "Presence subscription failed!" +msgstr "Presence-abonnement mislykkedes!" + +#: ../src/core/sipe-subscriptions.c:190 +msgid "" +"One or more buddies will therefore permanently show as offline.\n" +"\n" +"Please check that there are no corrupted SIP URIs in your contacts list." +msgstr "En eller flere venner vil derfor permanent blive vist frakoblet.\n\nKontroller at der ikke er ødelagte SIP URI'er i din kontaktliste." + #: ../src/core/sipe-ucs.c:674 msgid "UCS initialization failed!" msgstr "Initialisering af UCS mislykkedes!" @@ -892,15 +920,19 @@ msgid "Copy to" msgstr "Kopier til" -#: ../src/purple/purple-chat.c:295 +#: ../src/purple/purple-chat.c:310 msgid "Lock" msgstr "Lås" -#: ../src/purple/purple-chat.c:300 +#: ../src/purple/purple-chat.c:315 msgid "Unlock" msgstr "Åbn" -#: ../src/purple/purple-chat.c:321 +#: ../src/purple/purple-chat.c:338 +msgid "Show presentation" +msgstr "Vis præsentation" + +#: ../src/purple/purple-chat.c:345 msgid "Meeting entry info" msgstr "Info om mødepunkt" @@ -1152,26 +1184,30 @@ msgstr "Group Chat Proxy\nfirma.com eller bruger@firma.com\n(tom hvis brugernavn skal bruges)" #: ../src/purple/purple-plugin-common.c:933 +msgid "Remote desktop client" +msgstr "Ekstern skrivebordsklient" + +#: ../src/purple/purple-plugin-common.c:938 msgid "Media encryption" msgstr "Mediekryptering" -#: ../src/purple/purple-plugin-common.c:934 +#: ../src/purple/purple-plugin-common.c:939 msgid "Obey server policy" msgstr "Overhold serverpolitik" -#: ../src/purple/purple-plugin-common.c:935 +#: ../src/purple/purple-plugin-common.c:940 msgid "Always" msgstr "Altid" -#: ../src/purple/purple-plugin-common.c:936 +#: ../src/purple/purple-plugin-common.c:941 msgid "Optional" msgstr "Valgfrit" -#: ../src/purple/purple-plugin-common.c:937 +#: ../src/purple/purple-plugin-common.c:942 msgid "Disabled" msgstr "Deaktiveret" -#: ../src/purple/purple-plugin-common.c:947 +#: ../src/purple/purple-plugin-common.c:952 msgid "" "Login\n" " user or DOMAIN\\user or\n" @@ -1220,27 +1256,27 @@ msgid "_Search" msgstr "_Søg" -#: ../src/purple/purple-transport.c:132 +#: ../src/purple/purple-transport.c:135 msgid "Read error" msgstr "Læsefejl" -#: ../src/purple/purple-transport.c:136 -#: ../src/telepathy/telepathy-transport.c:96 +#: ../src/purple/purple-transport.c:139 +#: ../src/telepathy/telepathy-transport.c:95 msgid "Server has disconnected" msgstr "Server har afbrudt forbindelsen" -#: ../src/purple/purple-transport.c:198 +#: ../src/purple/purple-transport.c:201 msgid "Could not connect" msgstr "Kunne ikke forbinde" -#: ../src/purple/purple-transport.c:268 +#: ../src/purple/purple-transport.c:271 msgid "Could not create SSL context" msgstr "Kunne ikke oprette SSL-kontekst" -#: ../src/purple/purple-transport.c:290 +#: ../src/purple/purple-transport.c:293 msgid "Could not create socket" msgstr "Kunne ikke oprette sokkel" -#: ../src/purple/purple-transport.c:381 +#: ../src/purple/purple-transport.c:417 msgid "Write error" msgstr "Skrivefejl" diff -Nru pidgin-sipe-1.21.1/po/de.po pidgin-sipe-1.22.1/po/de.po --- pidgin-sipe-1.21.1/po/de.po 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/po/de.po 2017-06-11 15:41:22.000000000 +0000 @@ -5,13 +5,13 @@ # # # Translators: -# Stefan Becker , 2011-2013,2015-2016 +# Stefan Becker , 2011-2013,2015-2017 msgid "" msgstr "" "Project-Id-Version: pidgin sipe\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/sipe/bugs/\n" "POT-Creation-Date: 2010-11-30 23:36+0200\n" -"PO-Revision-Date: 2016-05-28 15:08+0000\n" +"PO-Revision-Date: 2017-01-23 18:58+0000\n" "Last-Translator: Stefan Becker \n" "Language-Team: German (http://www.transifex.com/stefanb/pidgin-sipe/language/de/)\n" "MIME-Version: 1.0\n" @@ -20,213 +20,238 @@ "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../src/core/sip-transport.c:235 +#: ../src/core/sip-transport.c:240 msgid "Failed to authenticate to server" msgstr "Authentifizierung mit dem Server fehlgeschlagen." -#: ../src/core/sip-transport.c:293 +#: ../src/core/sip-transport.c:298 #, c-format msgid "Can't request certificate from %s" msgstr "Kann kein Zertifikat bei %s anfordern" -#: ../src/core/sip-transport.c:303 +#: ../src/core/sip-transport.c:308 msgid "No URI for certificate provisioning service provided" msgstr "Keine URI für den Zertifikationsbereitstellungsdienst angegeben" -#: ../src/core/sip-transport.c:1281 +#: ../src/core/sip-transport.c:1285 msgid "Authentication failed" msgstr "Authentifizierung fehlgeschlagen" -#: ../src/core/sip-transport.c:1338 +#: ../src/core/sip-transport.c:1342 msgid "Incompatible authentication scheme chosen" msgstr "Sie haben ein nicht unterstütztes Authentizierungsverfahren konfiguriert" -#: ../src/core/sip-transport.c:1355 ../src/core/sipe-notify.c:1149 +#: ../src/core/sip-transport.c:1359 ../src/core/sipe-notify.c:1149 #, c-format msgid "You have been rejected by the server: %s" msgstr "Sie wurden vom Server '%s' abgewiesen" -#: ../src/core/sip-transport.c:1356 ../src/core/sip-transport.c:1372 -#: ../src/core/sip-transport.c:1396 ../src/core/sip-transport.c:1420 +#: ../src/core/sip-transport.c:1360 ../src/core/sip-transport.c:1376 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 #: ../src/core/sipe-conf.c:265 ../src/core/sipe-notify.c:1149 msgid "no reason given" msgstr "Kein Grund angegeben" -#: ../src/core/sip-transport.c:1371 +#: ../src/core/sip-transport.c:1375 #, c-format msgid "Not found: %s. Please contact your Administrator" msgstr "Konnte %s nicht finden. Bitte wenden Sie sich an Ihren Systemadministrator" -#: ../src/core/sip-transport.c:1373 +#: ../src/core/sip-transport.c:1377 msgid "SIP is either not enabled for the destination URI or it does not exist" msgstr "entweder wurde der SIP-Service nicht für die Ziel-URI aktiviert oder die URI existiert nicht" -#: ../src/core/sip-transport.c:1396 ../src/core/sip-transport.c:1420 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 #, c-format msgid "Service unavailable: %s" msgstr "Der Dienst %s ist nicht verfügbar" -#: ../src/core/sip-transport.c:1766 +#: ../src/core/sip-transport.c:1775 msgid "Corrupted message received" msgstr "Beschädigte Nachricht empfangen" -#: ../src/core/sip-transport.c:1790 +#: ../src/core/sip-transport.c:1799 msgid "Invalid message signature received" msgstr "Ungültige Nachrichtensignatur erhalten" -#: ../src/core/sipe-buddy.c:540 ../src/core/sipe-buddy.c:2300 +#: ../src/core/sipe-appshare.c:458 +#, c-format +msgid "%s wants to start presenting" +msgstr "%s will mit der Präsentation beginnen" + +#: ../src/core/sipe-appshare.c:462 ../src/core/sipe-conf.c:1086 +msgid "Accept" +msgstr "Akzeptieren" + +#: ../src/core/sipe-appshare.c:463 ../src/core/sipe-conf.c:1087 +msgid "Decline" +msgstr "Ablehnen" + +#: ../src/core/sipe-appshare.c:501 ../src/core/sipe-appshare.c:599 +msgid "Application sharing error" +msgstr "Anwendungsfreigabefehler" + +#: ../src/core/sipe-appshare.c:502 +msgid "Unknown remote desktop client configured." +msgstr "Unbekannter Remote-Desktop-Client konfiguriert" + +#: ../src/core/sipe-appshare.c:600 +msgid "Couldn't connect application sharing" +msgstr "Verbindung zur Anwendungsfreigabe fehlgeschlagen" + +#: ../src/core/sipe-buddy.c:541 ../src/core/sipe-buddy.c:2301 msgid "Mobile" msgstr "Telefon (Handy)" -#: ../src/core/sipe-buddy.c:828 +#: ../src/core/sipe-buddy.c:829 msgid "Status" msgstr "Status" -#: ../src/core/sipe-buddy.c:831 +#: ../src/core/sipe-buddy.c:832 msgid "Calendar" msgstr "Kalender" -#: ../src/core/sipe-buddy.c:836 +#: ../src/core/sipe-buddy.c:837 msgid "Meeting in" msgstr "Besprechungsraum" -#: ../src/core/sipe-buddy.c:840 +#: ../src/core/sipe-buddy.c:841 msgid "Meeting about" msgstr "Besprechungsthema" -#: ../src/core/sipe-buddy.c:845 +#: ../src/core/sipe-buddy.c:846 msgid "Out of office note" msgstr "Abwesenheitsnotiz" -#: ../src/core/sipe-buddy.c:845 +#: ../src/core/sipe-buddy.c:846 msgid "Note" msgstr "Notiz" -#: ../src/core/sipe-buddy.c:850 ../src/core/sipe-buddy.c:2345 +#: ../src/core/sipe-buddy.c:851 ../src/core/sipe-buddy.c:2346 #: ../src/purple/purple-buddy.c:633 msgid "Access level" msgstr "Sichtbarkeitsniveau" -#: ../src/core/sipe-buddy.c:1073 +#: ../src/core/sipe-buddy.c:1074 #, c-format msgid "Found %d contact%s:" msgid_plural "Found %d contacts%s:" msgstr[0] "%d Kontakt%s gefunden:" msgstr[1] "%d Kontakte%s gefunden:" -#: ../src/core/sipe-buddy.c:1075 +#: ../src/core/sipe-buddy.c:1076 msgid " (more matched your query)" msgstr " (es gab noch mehr Ergebnisse für Ihrer Suche)" -#: ../src/core/sipe-buddy.c:1121 ../src/core/sipe-buddy.c:1259 +#: ../src/core/sipe-buddy.c:1122 ../src/core/sipe-buddy.c:1260 #: ../src/core/sipe-ucs.c:314 msgid "No contacts found" msgstr "Es wurden keine Einträge gefunden" -#: ../src/core/sipe-buddy.c:1134 ../src/core/sipe-buddy.c:1272 +#: ../src/core/sipe-buddy.c:1135 ../src/core/sipe-buddy.c:1273 #: ../src/core/sipe-ucs.c:278 msgid "Unable to display the search results" msgstr "Kann die Suchergebnisse nicht anzeigen" -#: ../src/core/sipe-buddy.c:1237 ../src/core/sipe-buddy.c:1249 +#: ../src/core/sipe-buddy.c:1238 ../src/core/sipe-buddy.c:1250 #: ../src/core/sipe-ucs.c:391 msgid "Contact search failed" msgstr "Suche im Adressbuch fehlgeschlagen" -#: ../src/core/sipe-buddy.c:1412 ../src/core/sipe-ucs.c:395 +#: ../src/core/sipe-buddy.c:1413 ../src/core/sipe-ucs.c:395 msgid "Invalid contact search query" msgstr "Ungültige Suchanfrage" -#: ../src/core/sipe-buddy.c:2237 +#: ../src/core/sipe-buddy.c:2238 #, c-format msgid "Make leader of '%s'" msgstr "Ernenne zum Leiter der Konferenz '%s'" -#: ../src/core/sipe-buddy.c:2250 +#: ../src/core/sipe-buddy.c:2251 #, c-format msgid "Remove from '%s'" msgstr "Aus der Konferenz '%s' entfernen" -#: ../src/core/sipe-buddy.c:2264 +#: ../src/core/sipe-buddy.c:2265 #, c-format msgid "Invite to '%s'" msgstr "Zu der Konferenz '%s' einladen" -#: ../src/core/sipe-buddy.c:2280 +#: ../src/core/sipe-buddy.c:2281 msgid "New chat" msgstr "Neue Konferenz" -#: ../src/core/sipe-buddy.c:2293 +#: ../src/core/sipe-buddy.c:2294 msgid "Work" msgstr "Telefon (Arbeit)" -#: ../src/core/sipe-buddy.c:2308 +#: ../src/core/sipe-buddy.c:2309 msgid "Home" msgstr "Telefon (Privat)" -#: ../src/core/sipe-buddy.c:2316 +#: ../src/core/sipe-buddy.c:2317 msgid "Other" msgstr "Telefon" -#: ../src/core/sipe-buddy.c:2324 +#: ../src/core/sipe-buddy.c:2325 msgid "Custom1" msgstr "Telefon (benutzerdefiniert)" -#: ../src/core/sipe-buddy.c:2334 +#: ../src/core/sipe-buddy.c:2335 msgid "Send email..." msgstr "Sende E-Mail..." -#: ../src/core/sipe-cal.c:907 +#: ../src/core/sipe-cal.c:906 msgid "Free" msgstr "Verfügbar" -#: ../src/core/sipe-cal.c:908 +#: ../src/core/sipe-cal.c:907 msgid "Tentative" msgstr "Vorläufig" #. SIPE_ACTIVITY_BUSY -#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:59 +#: ../src/core/sipe-cal.c:908 ../src/core/sipe-status.c:57 msgid "Busy" msgstr "Beschäftigt" #. SIPE_ACTIVITY_OOF -#: ../src/core/sipe-cal.c:910 ../src/core/sipe-status.c:70 +#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:68 msgid "Out of office" msgstr "Nicht im Büro" -#: ../src/core/sipe-cal.c:911 +#: ../src/core/sipe-cal.c:910 msgid "No data" msgstr "Keine Angaben" -#: ../src/core/sipe-cal.c:1019 ../src/core/sipe-cal.c:1046 +#: ../src/core/sipe-cal.c:1018 ../src/core/sipe-cal.c:1045 #, c-format msgid "Currently %s" msgstr "Zurzeit %s" -#: ../src/core/sipe-cal.c:1025 +#: ../src/core/sipe-cal.c:1024 msgid "Outside of working hours for next 8 hours" msgstr "Nicht im Büro in den nächsten 8 Stunden" -#: ../src/core/sipe-cal.c:1027 +#: ../src/core/sipe-cal.c:1026 #, c-format msgid "%s for next 8 hours" msgstr "%s für die nächsten 8 Stunden" -#: ../src/core/sipe-cal.c:1036 +#: ../src/core/sipe-cal.c:1035 msgid "Not working" msgstr "Freizeit" -#: ../src/core/sipe-cal.c:1040 +#: ../src/core/sipe-cal.c:1039 #, c-format msgid "%s until %.2d:%.2d" msgstr "%s bis %.2d:%.2d" -#: ../src/core/sipe-cal.c:1048 +#: ../src/core/sipe-cal.c:1047 #, c-format msgid "%s. Outside of working hours at %.2d:%.2d" msgstr "%s. Verlässt das Büro um %.2d:%.2d" -#: ../src/core/sipe-cal.c:1053 +#: ../src/core/sipe-cal.c:1052 #, c-format msgid "%s. %s at %.2d:%.2d" msgstr "%s. %s ab %.2d:%.2d" @@ -242,7 +267,7 @@ msgstr "Web-Ticket-Anforderung bei %s fehlgeschlagen" #. Generate next ID -#: ../src/core/sipe-chat.c:240 +#: ../src/core/sipe-chat.c:246 #, c-format msgid "Chat #%d" msgstr "Konferenz #%d" @@ -269,123 +294,115 @@ msgid "Incomplete conference information provided" msgstr "Die Konferenz-Daten sind unvollständig " -#: ../src/core/sipe-conf.c:1041 +#: ../src/core/sipe-conf.c:1106 msgid "" "\n" "\n" "As this client was not compiled with voice call support, if you accept, you will be able to contact the other participants only via IM session." msgstr "\n\nWenn sie die Einladung akzeptieren, dann können Sie sich mit den anderen Teilnehmer nur via Textmitteilungen unterhalten, da Ihr Client keinen Voice Call unterstützt." -#: ../src/core/sipe-conf.c:1049 +#: ../src/core/sipe-conf.c:1111 #, c-format -msgid "%s wants to invite you to the conference call%s" -msgstr "%s möchte Sie zu der Telefonkonferenz %s einladen" - -#: ../src/core/sipe-conf.c:1063 -msgid "Accept" -msgstr "Akzeptieren" - -#: ../src/core/sipe-conf.c:1064 -msgid "Decline" -msgstr "Ablehnen" +msgid "wants to invite you to a conference call%s" +msgstr "möchte Sie zu der Telefonkonferenz %s einladen" -#: ../src/core/sipe-conf.c:1345 +#: ../src/core/sipe-conf.c:1459 msgid "" "This conference is no longer locked. Additional participants can now join." msgstr "Diese Konferenz ist nicht mehr gesperrt. Andere Teilnehmer können jetzt ungehindert daran teilnehmen." -#: ../src/core/sipe-conf.c:1349 +#: ../src/core/sipe-conf.c:1463 msgid "" "This conference is locked. Nobody else can join the conference while it is " "locked." msgstr "Diese Konferenz ist gesperrt. Niemand kann ihr beitreten solange sie gesperrt ist." -#: ../src/core/sipe-conf.c:1382 +#: ../src/core/sipe-conf.c:1496 msgid "You have been disconnected from this conference." msgstr "Sie haben die Verbindung mit dieser Konferenz verloren." -#: ../src/core/sipe-conf.c:1542 +#: ../src/core/sipe-conf.c:1656 msgid "Dial-in info" msgstr "Einwahlinformation" -#: ../src/core/sipe-conf.c:1543 +#: ../src/core/sipe-conf.c:1657 msgid "Number" msgstr "Telefonnummer" -#: ../src/core/sipe-conf.c:1545 +#: ../src/core/sipe-conf.c:1659 msgid "Conference ID" msgstr "Konferenz-Kennung" -#: ../src/core/sipe-conf.c:1547 +#: ../src/core/sipe-conf.c:1661 msgid "Meeting link" msgstr "Veranstaltungs-URL" -#: ../src/core/sipe-conf.c:1549 +#: ../src/core/sipe-conf.c:1663 msgid "Organizer" msgstr "Organisator" -#: ../src/core/sipe-conf.c:1551 +#: ../src/core/sipe-conf.c:1665 msgid "Alternative dial-in numbers" msgstr "Alternative Einwahlnummern" #. The next 13 texts make up the SIPE about note text #. About note, part 1/13: introduction -#: ../src/core/sipe-core.c:220 +#: ../src/core/sipe-core.c:221 msgid "" "A third-party plugin implementing extended version of SIP/SIMPLE used by " "various products" msgstr "Ein Third-Party Plugin, das die von den folgenden Produkten eingesetzte erweiterte Version des SIP/SIMPLE-Protokolls implementiert" #. About note, part 2/13: home page URL (label) -#: ../src/core/sipe-core.c:222 +#: ../src/core/sipe-core.c:223 msgid "Home Page" msgstr "Homepage" #. About note, part 3/13: support forum URL (label) -#: ../src/core/sipe-core.c:224 +#: ../src/core/sipe-core.c:225 msgid "Support" msgstr "Forum" #. About note, part 4/13: support forum name (hyperlink text) -#: ../src/core/sipe-core.c:226 +#: ../src/core/sipe-core.c:227 msgid "Help Forum" msgstr "Hilfe-Forum (in Englisch)" #. About note, part 5/13: bug tracker URL (label) -#: ../src/core/sipe-core.c:228 +#: ../src/core/sipe-core.c:229 msgid "Report Problems" msgstr "Probleme melden im" #. About note, part 6/13: bug tracker URL (hyperlink text) -#: ../src/core/sipe-core.c:230 +#: ../src/core/sipe-core.c:231 msgid "Bug Tracker" msgstr "Bugtracker" #. About note, part 7/13: translation service URL (label) -#: ../src/core/sipe-core.c:232 +#: ../src/core/sipe-core.c:233 msgid "Translations" msgstr "Übersetzungen" #. About note, part 8/13: license type (label) -#: ../src/core/sipe-core.c:234 +#: ../src/core/sipe-core.c:235 msgid "License" msgstr "Lizenz" #. About note, part 9/13: (REMOVED) #. About note, part 10/13: translation request, text before Transifex.com URL #. append a space if text is not empty -#: ../src/core/sipe-core.c:238 +#: ../src/core/sipe-core.c:239 msgid "Please help us to translate SIPE to your native language here at " msgstr "Wir bitten um Ihre Hilfe bei der Anpassung von SIPE an weitere Sprachen. Auf " #. About note, part 11/13: translation request, text after Transifex.com URL #. start with a space if text is not empty -#: ../src/core/sipe-core.c:241 +#: ../src/core/sipe-core.c:242 msgid " using convenient web interface" msgstr " gibt es dazu eine einfach zu erlernende Web-Benutzerschnittstelle" #. About note, part 12/13: author list (header) -#: ../src/core/sipe-core.c:243 +#: ../src/core/sipe-core.c:244 msgid "Authors" msgstr "Autoren" @@ -393,15 +410,15 @@ #. PLEASE NOTE: do *NOT* simply translate the english original #. but write something similar to the following sentence: #. "Localization for (): " -#: ../src/core/sipe-core.c:248 +#: ../src/core/sipe-core.c:249 msgid "Original texts in English (en): SIPE developers" msgstr "Deutsche Übersetzung (de): Stefan Becker" -#: ../src/core/sipe-core.c:269 +#: ../src/core/sipe-core.c:273 msgid "SIP Exchange user name contains invalid characters" msgstr "Der SIP-Exchange-Benutzername enthält unerlaubte Zeichen" -#: ../src/core/sipe-core.c:277 ../src/purple/purple-buddy.c:485 +#: ../src/core/sipe-core.c:281 ../src/purple/purple-buddy.c:485 #: ../src/telepathy/telepathy-protocol.c:89 #: ../src/telepathy/telepathy-protocol.c:191 #, c-format @@ -410,21 +427,21 @@ "Example: user@company.com" msgstr "Benutzername sollte eine gültige SIP URI sein\nBeispiel: benutzer@domäne.com" -#: ../src/core/sipe-core.c:284 +#: ../src/core/sipe-core.c:288 msgid "Password is required when Single Sign-On is not enabled" msgstr "Sie müssen ein Passwort setzen, wenn Sie Single Sign-On nicht aktiviert haben" -#: ../src/core/sipe-core.c:294 +#: ../src/core/sipe-core.c:298 msgid "" "Email address should be valid if provided\n" "Example: user@company.com" msgstr "Falls angegeben, dann sollte der Benutzername eine gültige SIP URI sein\nBeispiel: benutzer@domäne.com" -#: ../src/core/sipe-core.c:303 +#: ../src/core/sipe-core.c:307 msgid "SIP Exchange user name contains whitespace" msgstr "Der SIP-Exchange-Benutzername enthält Leerzeichen" -#: ../src/core/sipe-core.c:317 +#: ../src/core/sipe-core.c:321 msgid "" "Email services URL should be valid if provided\n" "Example: https://exchange.corp.com/EWS/Exchange.asmx\n" @@ -455,13 +472,13 @@ msgid "Could not create listen socket" msgstr "Konnte den Listen-Socket nicht erstellen" -#: ../src/core/sipe-ft-lync.c:757 ../src/core/sipe-media.c:1195 -#: ../src/core/sipe-media.c:1206 ../src/core/sipe-media.c:1284 -#: ../src/core/sipe-media.c:1740 +#: ../src/core/sipe-ft-lync.c:762 ../src/core/sipe-media.c:1328 +#: ../src/core/sipe-media.c:1339 ../src/core/sipe-media.c:1417 +#: ../src/core/sipe-media.c:1923 msgid "Error occurred" msgstr "Ein Fehler ist aufgetreten" -#: ../src/core/sipe-ft-lync.c:758 +#: ../src/core/sipe-ft-lync.c:763 msgid "Error creating data stream" msgstr "Es konnte keine Daten-Verbindung hergestellt werden" @@ -496,7 +513,7 @@ msgstr "Es ist nicht genügend freier Speicher verfügbar." #: ../src/core/sipe-group.c:168 ../src/core/sipe-notify.c:1163 -#: ../src/core/sipe-notify.c:1190 ../src/core/sipe-notify.c:1294 +#: ../src/core/sipe-notify.c:1197 ../src/core/sipe-notify.c:1301 #: ../src/purple/purple-search.c:128 msgid "Other Contacts" msgstr "Andere Kontakte" @@ -534,77 +551,77 @@ msgid "Failed to invite %s" msgstr "Kann den Benutzer %s nicht einladen" -#: ../src/core/sipe-incoming.c:741 +#: ../src/core/sipe-incoming.c:754 #, c-format msgid "Received a message with unrecognized contents from %s" msgstr "Es wurde eine Nachricht von %s mit unbekanntem Inhalt empfangen" -#: ../src/core/sipe-media.c:835 ../src/core/sipe-media.c:1347 -#: ../src/core/sipe-media.c:1357 ../src/core/sipe-media.c:1721 -#: ../src/core/sipe-media.c:1741 +#: ../src/core/sipe-media.c:869 ../src/core/sipe-media.c:1483 +#: ../src/core/sipe-media.c:1493 ../src/core/sipe-media.c:1904 +#: ../src/core/sipe-media.c:1924 msgid "Unable to establish a call" msgstr "Der Anruf ist fehlgeschlagen" -#: ../src/core/sipe-media.c:836 ../src/core/sipe-media.c:1722 +#: ../src/core/sipe-media.c:870 ../src/core/sipe-media.c:1905 msgid "Encryption settings of peer are incompatible with ours." msgstr "Es konnten keine gemeinsamen Verschlüsselungseinstellungen mit der Gegenseite ausgehandelt werden." -#: ../src/core/sipe-media.c:929 +#: ../src/core/sipe-media.c:963 #, c-format msgid "User %s rejected call" msgstr "Der Benutzer %s hat den Anruf abgewiesen" -#: ../src/core/sipe-media.c:930 +#: ../src/core/sipe-media.c:964 msgid "Call rejected" msgstr "Der Anruf wurde abgewiesen" -#: ../src/core/sipe-media.c:1196 ../src/core/sipe-media.c:1285 +#: ../src/core/sipe-media.c:1329 ../src/core/sipe-media.c:1418 msgid "Error creating audio stream" msgstr "Es konnte keine Audio-Verbindung hergestellt werden" -#: ../src/core/sipe-media.c:1207 +#: ../src/core/sipe-media.c:1340 msgid "Error creating video stream" msgstr "Es konnte keine Video-Verbindung hergestellt werden" -#: ../src/core/sipe-media.c:1251 ../src/purple/purple-chat.c:314 +#: ../src/core/sipe-media.c:1384 ../src/purple/purple-chat.c:329 msgid "Join conference call" msgstr "Telefonkonferenz beitreten" -#: ../src/core/sipe-media.c:1252 +#: ../src/core/sipe-media.c:1385 msgid "Conference calls are not supported on this server." msgstr "Telefonkonferenzen werden von diesem Server nicht unterstützt." -#: ../src/core/sipe-media.c:1348 +#: ../src/core/sipe-media.c:1484 msgid "Invalid phone number" msgstr "Ungültige Telefonnummer" -#: ../src/core/sipe-media.c:1358 +#: ../src/core/sipe-media.c:1494 msgid "Audio Test Service is not available." msgstr "Der Audio Test-Service ist nicht verfügbar" -#: ../src/core/sipe-media.c:1690 +#: ../src/core/sipe-media.c:1873 msgid "User unavailable" msgstr "Der Benutzer ist nicht verfügbar" -#: ../src/core/sipe-media.c:1693 +#: ../src/core/sipe-media.c:1876 #, c-format msgid "%s does not want to be disturbed" msgstr "%s möchte nicht gestört werden" -#: ../src/core/sipe-media.c:1695 +#: ../src/core/sipe-media.c:1878 #, c-format msgid "User %s is not available" msgstr "Der Benutzer %s ist nicht verfügbar" -#: ../src/core/sipe-media.c:1704 +#: ../src/core/sipe-media.c:1887 msgid "Unsupported media type" msgstr "Medientyp wird nicht unterstützt" -#: ../src/core/sipe-media.c:2062 +#: ../src/core/sipe-media.c:2246 msgid "Media error" msgstr "Fehler in der Daten-Verbindung" -#: ../src/core/sipe-media.c:2063 +#: ../src/core/sipe-media.c:2247 msgid "Error while reading from stream" msgstr "Fehler beim Lesen von der Daten-Verbindung" @@ -655,36 +672,36 @@ msgstr "Unbekannt" #. Translators: remove (clear) previously assigned access level -#: ../src/core/sipe-ocs2007.c:2571 +#: ../src/core/sipe-ocs2007.c:2570 msgid "Unspecify" msgstr "Zurücksetzen" -#: ../src/core/sipe-ocs2007.c:2590 +#: ../src/core/sipe-ocs2007.c:2589 msgid "People in my company" msgstr "Personen in meiner Firma" -#: ../src/core/sipe-ocs2007.c:2600 +#: ../src/core/sipe-ocs2007.c:2599 msgid "People in domains connected with my company" msgstr "Personen in Domänen, die mit meiner Firma verbunden sind" -#: ../src/core/sipe-ocs2007.c:2609 +#: ../src/core/sipe-ocs2007.c:2608 msgid "People in public domains" msgstr "Personen in öffentlichen Domänen" -#: ../src/core/sipe-ocs2007.c:2619 +#: ../src/core/sipe-ocs2007.c:2618 #, c-format msgid "People at %s" msgstr "Personen in %s" -#: ../src/core/sipe-ocs2007.c:2644 +#: ../src/core/sipe-ocs2007.c:2643 msgid "Add new domain..." msgstr "Neue Domäne hinzufügen..." -#: ../src/core/sipe-ocs2007.c:2673 +#: ../src/core/sipe-ocs2007.c:2672 msgid "Online help..." msgstr "Online-Hilfe..." -#: ../src/core/sipe-ocs2007.c:2681 +#: ../src/core/sipe-ocs2007.c:2680 msgid "Access groups" msgstr "Zugriffsgruppen" @@ -696,49 +713,60 @@ #. SIPE_ACTIVITY_AVAILABLE #. SIPE_ACTIVITY_ONLINE #. SIPE_ACTIVITY_INACTIVE -#: ../src/core/sipe-status.c:58 +#: ../src/core/sipe-status.c:56 msgid "Inactive" msgstr "Inaktiv" #. SIPE_ACTIVITY_BUSYIDLE -#: ../src/core/sipe-status.c:60 +#: ../src/core/sipe-status.c:58 msgid "Busy-Idle" msgstr "Nicht verfügbar" #. SIPE_ACTIVITY_DND #. SIPE_ACTIVITY_BRB -#: ../src/core/sipe-status.c:62 +#: ../src/core/sipe-status.c:60 msgid "Be right back" msgstr "Bin gleich zurück" #. SIPE_ACTIVITY_AWAY #. SIPE_ACTIVITY_LUNCH -#: ../src/core/sipe-status.c:64 +#: ../src/core/sipe-status.c:62 msgid "Out to lunch" msgstr "Zur Mittagspause" #. SIPE_ACTIVITY_INVISIBLE #. SIPE_ACTIVITY_OFFLINE #. SIPE_ACTIVITY_ON_PHONE -#: ../src/core/sipe-status.c:67 +#: ../src/core/sipe-status.c:65 msgid "In a call" msgstr "In einem Telefonat" #. SIPE_ACTIVITY_IN_CONF -#: ../src/core/sipe-status.c:68 +#: ../src/core/sipe-status.c:66 msgid "In a conference" msgstr "In einer Konferenz" #. SIPE_ACTIVITY_IN_MEETING -#: ../src/core/sipe-status.c:69 +#: ../src/core/sipe-status.c:67 msgid "In a meeting" msgstr "In einer Besprechung" #. SIPE_ACTIVITY_URGENT_ONLY -#: ../src/core/sipe-status.c:71 +#: ../src/core/sipe-status.c:69 msgid "Urgent interruptions only" msgstr "Bitte nur in dringenden Fällen stören" +#: ../src/core/sipe-subscriptions.c:189 +msgid "Presence subscription failed!" +msgstr "Registrierung für Präsenz-Informationen fehlgeschlagen!" + +#: ../src/core/sipe-subscriptions.c:190 +msgid "" +"One or more buddies will therefore permanently show as offline.\n" +"\n" +"Please check that there are no corrupted SIP URIs in your contacts list." +msgstr "Ein oder mehrere Kontakte werden daher als offline angezeigt.\n\nBitte überprüfen Sie, dass sich keine fehlerhafte SIP URI in Ihrer Kontakte-Liste befindet." + #: ../src/core/sipe-ucs.c:674 msgid "UCS initialization failed!" msgstr "UCS-Initialisierung fehlgeschlagen! " @@ -891,15 +919,19 @@ msgid "Copy to" msgstr "Kopiere nach" -#: ../src/purple/purple-chat.c:295 +#: ../src/purple/purple-chat.c:310 msgid "Lock" msgstr "Sperren" -#: ../src/purple/purple-chat.c:300 +#: ../src/purple/purple-chat.c:315 msgid "Unlock" msgstr "Freigeben" -#: ../src/purple/purple-chat.c:321 +#: ../src/purple/purple-chat.c:338 +msgid "Show presentation" +msgstr "Präsentation anzeigen" + +#: ../src/purple/purple-chat.c:345 msgid "Meeting entry info" msgstr "Veranstaltungsinformation" @@ -1151,26 +1183,30 @@ msgstr "Group Chat Proxy\n domäne.com oder benutzer@domäne.com\n(Bitte leer lassen um vom Benutzernamen abzuleiten)" #: ../src/purple/purple-plugin-common.c:933 +msgid "Remote desktop client" +msgstr "Remote-Desktop-Client" + +#: ../src/purple/purple-plugin-common.c:938 msgid "Media encryption" msgstr "Audio/Video-Verschlüsselung" -#: ../src/purple/purple-plugin-common.c:934 +#: ../src/purple/purple-plugin-common.c:939 msgid "Obey server policy" msgstr "Server-Vorgabe" -#: ../src/purple/purple-plugin-common.c:935 +#: ../src/purple/purple-plugin-common.c:940 msgid "Always" msgstr "Immer" -#: ../src/purple/purple-plugin-common.c:936 +#: ../src/purple/purple-plugin-common.c:941 msgid "Optional" msgstr "Optional" -#: ../src/purple/purple-plugin-common.c:937 +#: ../src/purple/purple-plugin-common.c:942 msgid "Disabled" msgstr "Abgeschaltet" -#: ../src/purple/purple-plugin-common.c:947 +#: ../src/purple/purple-plugin-common.c:952 msgid "" "Login\n" " user or DOMAIN\\user or\n" @@ -1219,27 +1255,27 @@ msgid "_Search" msgstr "_Suchen" -#: ../src/purple/purple-transport.c:132 +#: ../src/purple/purple-transport.c:135 msgid "Read error" msgstr "Lesefehler" -#: ../src/purple/purple-transport.c:136 -#: ../src/telepathy/telepathy-transport.c:96 +#: ../src/purple/purple-transport.c:139 +#: ../src/telepathy/telepathy-transport.c:95 msgid "Server has disconnected" msgstr "Der Server hat die Verbindung abgebrochen" -#: ../src/purple/purple-transport.c:198 +#: ../src/purple/purple-transport.c:201 msgid "Could not connect" msgstr "Es konnte keine Verbindung hergestellt werden" -#: ../src/purple/purple-transport.c:268 +#: ../src/purple/purple-transport.c:271 msgid "Could not create SSL context" msgstr "Es konnte kein SSL-Kontext erstellt werden" -#: ../src/purple/purple-transport.c:290 +#: ../src/purple/purple-transport.c:293 msgid "Could not create socket" msgstr "Es konnte kein Socket erzeugt werden" -#: ../src/purple/purple-transport.c:381 +#: ../src/purple/purple-transport.c:417 msgid "Write error" msgstr "Schreib-Fehler" diff -Nru pidgin-sipe-1.21.1/po/el.po pidgin-sipe-1.22.1/po/el.po --- pidgin-sipe-1.21.1/po/el.po 1970-01-01 00:00:00.000000000 +0000 +++ pidgin-sipe-1.22.1/po/el.po 2017-06-11 15:41:22.000000000 +0000 @@ -0,0 +1,1280 @@ +# (English) English User Interface strings for pidgin-sipe. +# Copyright (C) 2008-2011 SIPE Project +# This file is distributed under the same license as the pidgin-sipe package. +# +# +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: pidgin sipe\n" +"Report-Msgid-Bugs-To: https://sourceforge.net/p/sipe/bugs/\n" +"POT-Creation-Date: 2010-11-30 23:36+0200\n" +"PO-Revision-Date: 2017-01-23 17:47+0000\n" +"Last-Translator: Stefan Becker \n" +"Language-Team: Greek (http://www.transifex.com/stefanb/pidgin-sipe/language/el/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: el\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../src/core/sip-transport.c:240 +msgid "Failed to authenticate to server" +msgstr "" + +#: ../src/core/sip-transport.c:298 +#, c-format +msgid "Can't request certificate from %s" +msgstr "" + +#: ../src/core/sip-transport.c:308 +msgid "No URI for certificate provisioning service provided" +msgstr "" + +#: ../src/core/sip-transport.c:1285 +msgid "Authentication failed" +msgstr "" + +#: ../src/core/sip-transport.c:1342 +msgid "Incompatible authentication scheme chosen" +msgstr "" + +#: ../src/core/sip-transport.c:1359 ../src/core/sipe-notify.c:1149 +#, c-format +msgid "You have been rejected by the server: %s" +msgstr "" + +#: ../src/core/sip-transport.c:1360 ../src/core/sip-transport.c:1376 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 +#: ../src/core/sipe-conf.c:265 ../src/core/sipe-notify.c:1149 +msgid "no reason given" +msgstr "" + +#: ../src/core/sip-transport.c:1375 +#, c-format +msgid "Not found: %s. Please contact your Administrator" +msgstr "" + +#: ../src/core/sip-transport.c:1377 +msgid "SIP is either not enabled for the destination URI or it does not exist" +msgstr "" + +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 +#, c-format +msgid "Service unavailable: %s" +msgstr "" + +#: ../src/core/sip-transport.c:1775 +msgid "Corrupted message received" +msgstr "" + +#: ../src/core/sip-transport.c:1799 +msgid "Invalid message signature received" +msgstr "" + +#: ../src/core/sipe-appshare.c:458 +#, c-format +msgid "%s wants to start presenting" +msgstr "" + +#: ../src/core/sipe-appshare.c:462 ../src/core/sipe-conf.c:1086 +msgid "Accept" +msgstr "" + +#: ../src/core/sipe-appshare.c:463 ../src/core/sipe-conf.c:1087 +msgid "Decline" +msgstr "" + +#: ../src/core/sipe-appshare.c:501 ../src/core/sipe-appshare.c:599 +msgid "Application sharing error" +msgstr "" + +#: ../src/core/sipe-appshare.c:502 +msgid "Unknown remote desktop client configured." +msgstr "" + +#: ../src/core/sipe-appshare.c:600 +msgid "Couldn't connect application sharing" +msgstr "" + +#: ../src/core/sipe-buddy.c:541 ../src/core/sipe-buddy.c:2301 +msgid "Mobile" +msgstr "" + +#: ../src/core/sipe-buddy.c:829 +msgid "Status" +msgstr "" + +#: ../src/core/sipe-buddy.c:832 +msgid "Calendar" +msgstr "" + +#: ../src/core/sipe-buddy.c:837 +msgid "Meeting in" +msgstr "" + +#: ../src/core/sipe-buddy.c:841 +msgid "Meeting about" +msgstr "" + +#: ../src/core/sipe-buddy.c:846 +msgid "Out of office note" +msgstr "" + +#: ../src/core/sipe-buddy.c:846 +msgid "Note" +msgstr "" + +#: ../src/core/sipe-buddy.c:851 ../src/core/sipe-buddy.c:2346 +#: ../src/purple/purple-buddy.c:633 +msgid "Access level" +msgstr "" + +#: ../src/core/sipe-buddy.c:1074 +#, c-format +msgid "Found %d contact%s:" +msgid_plural "Found %d contacts%s:" +msgstr[0] "" +msgstr[1] "" + +#: ../src/core/sipe-buddy.c:1076 +msgid " (more matched your query)" +msgstr "" + +#: ../src/core/sipe-buddy.c:1122 ../src/core/sipe-buddy.c:1260 +#: ../src/core/sipe-ucs.c:314 +msgid "No contacts found" +msgstr "" + +#: ../src/core/sipe-buddy.c:1135 ../src/core/sipe-buddy.c:1273 +#: ../src/core/sipe-ucs.c:278 +msgid "Unable to display the search results" +msgstr "" + +#: ../src/core/sipe-buddy.c:1238 ../src/core/sipe-buddy.c:1250 +#: ../src/core/sipe-ucs.c:391 +msgid "Contact search failed" +msgstr "" + +#: ../src/core/sipe-buddy.c:1413 ../src/core/sipe-ucs.c:395 +msgid "Invalid contact search query" +msgstr "" + +#: ../src/core/sipe-buddy.c:2238 +#, c-format +msgid "Make leader of '%s'" +msgstr "" + +#: ../src/core/sipe-buddy.c:2251 +#, c-format +msgid "Remove from '%s'" +msgstr "" + +#: ../src/core/sipe-buddy.c:2265 +#, c-format +msgid "Invite to '%s'" +msgstr "" + +#: ../src/core/sipe-buddy.c:2281 +msgid "New chat" +msgstr "" + +#: ../src/core/sipe-buddy.c:2294 +msgid "Work" +msgstr "" + +#: ../src/core/sipe-buddy.c:2309 +msgid "Home" +msgstr "" + +#: ../src/core/sipe-buddy.c:2317 +msgid "Other" +msgstr "" + +#: ../src/core/sipe-buddy.c:2325 +msgid "Custom1" +msgstr "" + +#: ../src/core/sipe-buddy.c:2335 +msgid "Send email..." +msgstr "" + +#: ../src/core/sipe-cal.c:906 +msgid "Free" +msgstr "" + +#: ../src/core/sipe-cal.c:907 +msgid "Tentative" +msgstr "" + +#. SIPE_ACTIVITY_BUSY +#: ../src/core/sipe-cal.c:908 ../src/core/sipe-status.c:57 +msgid "Busy" +msgstr "" + +#. SIPE_ACTIVITY_OOF +#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:68 +msgid "Out of office" +msgstr "" + +#: ../src/core/sipe-cal.c:910 +msgid "No data" +msgstr "" + +#: ../src/core/sipe-cal.c:1018 ../src/core/sipe-cal.c:1045 +#, c-format +msgid "Currently %s" +msgstr "" + +#: ../src/core/sipe-cal.c:1024 +msgid "Outside of working hours for next 8 hours" +msgstr "" + +#: ../src/core/sipe-cal.c:1026 +#, c-format +msgid "%s for next 8 hours" +msgstr "" + +#: ../src/core/sipe-cal.c:1035 +msgid "Not working" +msgstr "" + +#: ../src/core/sipe-cal.c:1039 +#, c-format +msgid "%s until %.2d:%.2d" +msgstr "" + +#: ../src/core/sipe-cal.c:1047 +#, c-format +msgid "%s. Outside of working hours at %.2d:%.2d" +msgstr "" + +#: ../src/core/sipe-cal.c:1052 +#, c-format +msgid "%s. %s at %.2d:%.2d" +msgstr "" + +#: ../src/core/sipe-certificate.c:233 ../src/core/sipe-certificate.c:277 +#, c-format +msgid "Certificate request to %s failed" +msgstr "" + +#: ../src/core/sipe-certificate.c:284 +#, c-format +msgid "Web ticket request to %s failed" +msgstr "" + +#. Generate next ID +#: ../src/core/sipe-chat.c:246 +#, c-format +msgid "Chat #%d" +msgstr "" + +#: ../src/core/sipe-conf.c:264 ../src/core/sipe-conf.c:412 +#: ../src/core/sipe-conf.c:446 ../src/core/sipe-conf.c:498 +msgid "Failed to join the conference" +msgstr "" + +#: ../src/core/sipe-conf.c:408 +#, c-format +msgid "" +"Can't find a conference URI on this page:\n" +"\n" +"%s" +msgstr "" + +#: ../src/core/sipe-conf.c:443 +#, c-format +msgid "\"%s\" is not a valid conference URI" +msgstr "" + +#: ../src/core/sipe-conf.c:499 +msgid "Incomplete conference information provided" +msgstr "" + +#: ../src/core/sipe-conf.c:1106 +msgid "" +"\n" +"\n" +"As this client was not compiled with voice call support, if you accept, you will be able to contact the other participants only via IM session." +msgstr "" + +#: ../src/core/sipe-conf.c:1111 +#, c-format +msgid "wants to invite you to a conference call%s" +msgstr "" + +#: ../src/core/sipe-conf.c:1459 +msgid "" +"This conference is no longer locked. Additional participants can now join." +msgstr "" + +#: ../src/core/sipe-conf.c:1463 +msgid "" +"This conference is locked. Nobody else can join the conference while it is " +"locked." +msgstr "" + +#: ../src/core/sipe-conf.c:1496 +msgid "You have been disconnected from this conference." +msgstr "" + +#: ../src/core/sipe-conf.c:1656 +msgid "Dial-in info" +msgstr "" + +#: ../src/core/sipe-conf.c:1657 +msgid "Number" +msgstr "" + +#: ../src/core/sipe-conf.c:1659 +msgid "Conference ID" +msgstr "" + +#: ../src/core/sipe-conf.c:1661 +msgid "Meeting link" +msgstr "" + +#: ../src/core/sipe-conf.c:1663 +msgid "Organizer" +msgstr "" + +#: ../src/core/sipe-conf.c:1665 +msgid "Alternative dial-in numbers" +msgstr "" + +#. The next 13 texts make up the SIPE about note text +#. About note, part 1/13: introduction +#: ../src/core/sipe-core.c:221 +msgid "" +"A third-party plugin implementing extended version of SIP/SIMPLE used by " +"various products" +msgstr "" + +#. About note, part 2/13: home page URL (label) +#: ../src/core/sipe-core.c:223 +msgid "Home Page" +msgstr "" + +#. About note, part 3/13: support forum URL (label) +#: ../src/core/sipe-core.c:225 +msgid "Support" +msgstr "" + +#. About note, part 4/13: support forum name (hyperlink text) +#: ../src/core/sipe-core.c:227 +msgid "Help Forum" +msgstr "" + +#. About note, part 5/13: bug tracker URL (label) +#: ../src/core/sipe-core.c:229 +msgid "Report Problems" +msgstr "" + +#. About note, part 6/13: bug tracker URL (hyperlink text) +#: ../src/core/sipe-core.c:231 +msgid "Bug Tracker" +msgstr "" + +#. About note, part 7/13: translation service URL (label) +#: ../src/core/sipe-core.c:233 +msgid "Translations" +msgstr "" + +#. About note, part 8/13: license type (label) +#: ../src/core/sipe-core.c:235 +msgid "License" +msgstr "" + +#. About note, part 9/13: (REMOVED) +#. About note, part 10/13: translation request, text before Transifex.com URL +#. append a space if text is not empty +#: ../src/core/sipe-core.c:239 +msgid "Please help us to translate SIPE to your native language here at " +msgstr "" + +#. About note, part 11/13: translation request, text after Transifex.com URL +#. start with a space if text is not empty +#: ../src/core/sipe-core.c:242 +msgid " using convenient web interface" +msgstr "" + +#. About note, part 12/13: author list (header) +#: ../src/core/sipe-core.c:244 +msgid "Authors" +msgstr "" + +#. About note, part 13/13: Localization credit +#. PLEASE NOTE: do *NOT* simply translate the english original +#. but write something similar to the following sentence: +#. "Localization for (): " +#: ../src/core/sipe-core.c:249 +msgid "Original texts in English (en): SIPE developers" +msgstr "" + +#: ../src/core/sipe-core.c:273 +msgid "SIP Exchange user name contains invalid characters" +msgstr "" + +#: ../src/core/sipe-core.c:281 ../src/purple/purple-buddy.c:485 +#: ../src/telepathy/telepathy-protocol.c:89 +#: ../src/telepathy/telepathy-protocol.c:191 +#, c-format +msgid "" +"User name should be a valid SIP URI\n" +"Example: user@company.com" +msgstr "" + +#: ../src/core/sipe-core.c:288 +msgid "Password is required when Single Sign-On is not enabled" +msgstr "" + +#: ../src/core/sipe-core.c:298 +msgid "" +"Email address should be valid if provided\n" +"Example: user@company.com" +msgstr "" + +#: ../src/core/sipe-core.c:307 +msgid "SIP Exchange user name contains whitespace" +msgstr "" + +#: ../src/core/sipe-core.c:321 +msgid "" +"Email services URL should be valid if provided\n" +"Example: https://exchange.corp.com/EWS/Exchange.asmx\n" +"Example: https://domino.corp.com/maildatabase.nsf" +msgstr "" + +#. Translators: (!) should be as in localized Lotus Notes to be able to +#. extract meeting location +#: ../src/core/sipe-domino.c:260 ../src/core/sipe-domino.c:261 +msgid "Location:" +msgstr "" + +#: ../src/core/sipe-ft.c:264 ../src/core/sipe-ft-tftp.c:109 +#: ../src/core/sipe-ft-tftp.c:393 ../src/core/sipe-ft-tftp.c:422 +#: ../src/core/sipe-ft-tftp.c:481 +msgid "Socket read failed" +msgstr "" + +#: ../src/core/sipe-ft.c:412 +msgid "Received encryption key has wrong size." +msgstr "" + +#: ../src/core/sipe-ft.c:427 +msgid "Received hash key has wrong size." +msgstr "" + +#: ../src/core/sipe-ft.c:447 +msgid "Could not create listen socket" +msgstr "" + +#: ../src/core/sipe-ft-lync.c:762 ../src/core/sipe-media.c:1328 +#: ../src/core/sipe-media.c:1339 ../src/core/sipe-media.c:1417 +#: ../src/core/sipe-media.c:1923 +msgid "Error occurred" +msgstr "" + +#: ../src/core/sipe-ft-lync.c:763 +msgid "Error creating data stream" +msgstr "" + +#: ../src/core/sipe-ft-tftp.c:115 ../src/core/sipe-ft-tftp.c:525 +#: ../src/core/sipe-ft-tftp.c:534 +msgid "Socket write failed" +msgstr "" + +#: ../src/core/sipe-ft-tftp.c:208 +msgid "File size is different from the advertised value." +msgstr "" + +#: ../src/core/sipe-ft-tftp.c:247 +msgid "Received MAC is corrupted" +msgstr "" + +#: ../src/core/sipe-ft-tftp.c:258 +msgid "Received file is corrupted" +msgstr "" + +#: ../src/core/sipe-ft-tftp.c:287 +msgid "File transfer initialization failed." +msgstr "" + +#: ../src/core/sipe-ft-tftp.c:318 +msgid "File transfer authentication failed." +msgstr "" + +#: ../src/core/sipe-ft-tftp.c:414 ../src/core/sipe-ft-tftp.c:432 +#: ../src/core/sipe-ft-tftp.c:495 +msgid "Out of memory" +msgstr "" + +#: ../src/core/sipe-group.c:168 ../src/core/sipe-notify.c:1163 +#: ../src/core/sipe-notify.c:1197 ../src/core/sipe-notify.c:1301 +#: ../src/purple/purple-search.c:128 +msgid "Other Contacts" +msgstr "" + +#: ../src/core/sipe-groupchat.c:329 +#, c-format +msgid "" +"Group Chat Proxy setting is incorrect:\n" +"\n" +"\t%s\n" +"\n" +"Please update your Account." +msgstr "" + +#: ../src/core/sipe-groupchat.c:332 +msgid "Couldn't find Group Chat server!" +msgstr "" + +#: ../src/core/sipe-groupchat.c:508 +#, c-format +msgid "This message was not delivered to chat room '%s'" +msgstr "" + +#: ../src/core/sipe-groupchat.c:616 +msgid "Error retrieving room list" +msgstr "" + +#: ../src/core/sipe-groupchat.c:720 +msgid "Error joining chat room" +msgstr "" + +#. generate one error and remove all unprocessed messages +#: ../src/core/sipe-im.c:197 +#, c-format +msgid "Failed to invite %s" +msgstr "" + +#: ../src/core/sipe-incoming.c:754 +#, c-format +msgid "Received a message with unrecognized contents from %s" +msgstr "" + +#: ../src/core/sipe-media.c:869 ../src/core/sipe-media.c:1483 +#: ../src/core/sipe-media.c:1493 ../src/core/sipe-media.c:1904 +#: ../src/core/sipe-media.c:1924 +msgid "Unable to establish a call" +msgstr "" + +#: ../src/core/sipe-media.c:870 ../src/core/sipe-media.c:1905 +msgid "Encryption settings of peer are incompatible with ours." +msgstr "" + +#: ../src/core/sipe-media.c:963 +#, c-format +msgid "User %s rejected call" +msgstr "" + +#: ../src/core/sipe-media.c:964 +msgid "Call rejected" +msgstr "" + +#: ../src/core/sipe-media.c:1329 ../src/core/sipe-media.c:1418 +msgid "Error creating audio stream" +msgstr "" + +#: ../src/core/sipe-media.c:1340 +msgid "Error creating video stream" +msgstr "" + +#: ../src/core/sipe-media.c:1384 ../src/purple/purple-chat.c:329 +msgid "Join conference call" +msgstr "" + +#: ../src/core/sipe-media.c:1385 +msgid "Conference calls are not supported on this server." +msgstr "" + +#: ../src/core/sipe-media.c:1484 +msgid "Invalid phone number" +msgstr "" + +#: ../src/core/sipe-media.c:1494 +msgid "Audio Test Service is not available." +msgstr "" + +#: ../src/core/sipe-media.c:1873 +msgid "User unavailable" +msgstr "" + +#: ../src/core/sipe-media.c:1876 +#, c-format +msgid "%s does not want to be disturbed" +msgstr "" + +#: ../src/core/sipe-media.c:1878 +#, c-format +msgid "User %s is not available" +msgstr "" + +#: ../src/core/sipe-media.c:1887 +msgid "Unsupported media type" +msgstr "" + +#: ../src/core/sipe-media.c:2246 +msgid "Media error" +msgstr "" + +#: ../src/core/sipe-media.c:2247 +msgid "Error while reading from stream" +msgstr "" + +#. reason = g_strdup(_("User logged out")); // [MS-OCER] +#: ../src/core/sipe-notify.c:1141 +msgid "you are already signed in at another location" +msgstr "" + +#: ../src/core/sipe-notify.c:1143 +msgid "user disabled" +msgstr "" + +#: ../src/core/sipe-notify.c:1145 +msgid "user moved" +msgstr "" + +#: ../src/core/sipe-ocs2007.c:458 ../src/purple/purple-buddy.c:640 +#: ../src/purple/purple-buddy.c:647 +msgid "Blocked" +msgstr "" + +#: ../src/core/sipe-ocs2007.c:459 ../src/purple/purple-buddy.c:636 +#: ../src/purple/purple-buddy.c:643 +msgid "Personal" +msgstr "" + +#. index 0 +#: ../src/core/sipe-ocs2007.c:460 ../src/purple/purple-buddy.c:637 +#: ../src/purple/purple-buddy.c:644 +msgid "Team" +msgstr "" + +#. SIPE_BUDDY_INFO_WORK_PHONE_DISPLAY +#. SIPE_BUDDY_INFO_COMPANY +#: ../src/core/sipe-ocs2007.c:461 ../src/purple/purple-buddy.c:76 +#: ../src/purple/purple-buddy.c:638 ../src/purple/purple-buddy.c:645 +#: ../src/purple/purple-search.c:66 ../src/purple/purple-search.c:229 +msgid "Company" +msgstr "" + +#: ../src/core/sipe-ocs2007.c:462 ../src/purple/purple-buddy.c:639 +#: ../src/purple/purple-buddy.c:646 +msgid "Public" +msgstr "" + +#: ../src/core/sipe-ocs2007.c:464 +msgid "Unknown" +msgstr "" + +#. Translators: remove (clear) previously assigned access level +#: ../src/core/sipe-ocs2007.c:2570 +msgid "Unspecify" +msgstr "" + +#: ../src/core/sipe-ocs2007.c:2589 +msgid "People in my company" +msgstr "" + +#: ../src/core/sipe-ocs2007.c:2599 +msgid "People in domains connected with my company" +msgstr "" + +#: ../src/core/sipe-ocs2007.c:2608 +msgid "People in public domains" +msgstr "" + +#: ../src/core/sipe-ocs2007.c:2618 +#, c-format +msgid "People at %s" +msgstr "" + +#: ../src/core/sipe-ocs2007.c:2643 +msgid "Add new domain..." +msgstr "" + +#: ../src/core/sipe-ocs2007.c:2672 +msgid "Online help..." +msgstr "" + +#: ../src/core/sipe-ocs2007.c:2680 +msgid "Access groups" +msgstr "" + +#. * This has nothing to do with Availability numbers, like 3500 (online). +#. * Just a mapping of Communicator Activities to tokens/translations +#. @TODO: NULL means "default translation from Pidgin"? +#. * What about other backends? +#. SIPE_ACTIVITY_UNSET +#. SIPE_ACTIVITY_AVAILABLE +#. SIPE_ACTIVITY_ONLINE +#. SIPE_ACTIVITY_INACTIVE +#: ../src/core/sipe-status.c:56 +msgid "Inactive" +msgstr "" + +#. SIPE_ACTIVITY_BUSYIDLE +#: ../src/core/sipe-status.c:58 +msgid "Busy-Idle" +msgstr "" + +#. SIPE_ACTIVITY_DND +#. SIPE_ACTIVITY_BRB +#: ../src/core/sipe-status.c:60 +msgid "Be right back" +msgstr "" + +#. SIPE_ACTIVITY_AWAY +#. SIPE_ACTIVITY_LUNCH +#: ../src/core/sipe-status.c:62 +msgid "Out to lunch" +msgstr "" + +#. SIPE_ACTIVITY_INVISIBLE +#. SIPE_ACTIVITY_OFFLINE +#. SIPE_ACTIVITY_ON_PHONE +#: ../src/core/sipe-status.c:65 +msgid "In a call" +msgstr "" + +#. SIPE_ACTIVITY_IN_CONF +#: ../src/core/sipe-status.c:66 +msgid "In a conference" +msgstr "" + +#. SIPE_ACTIVITY_IN_MEETING +#: ../src/core/sipe-status.c:67 +msgid "In a meeting" +msgstr "" + +#. SIPE_ACTIVITY_URGENT_ONLY +#: ../src/core/sipe-status.c:69 +msgid "Urgent interruptions only" +msgstr "" + +#: ../src/core/sipe-subscriptions.c:189 +msgid "Presence subscription failed!" +msgstr "" + +#: ../src/core/sipe-subscriptions.c:190 +msgid "" +"One or more buddies will therefore permanently show as offline.\n" +"\n" +"Please check that there are no corrupted SIP URIs in your contacts list." +msgstr "" + +#: ../src/core/sipe-ucs.c:674 +msgid "UCS initialization failed!" +msgstr "" + +#: ../src/core/sipe-ucs.c:676 +msgid "" +"Couldn't find an Exchange server with the default Email settings. Therefore the contacts list will not work.\n" +"\n" +"You'll need to provide Email settings in the account setup." +msgstr "" + +#: ../src/core/sipe-ucs.c:677 +msgid "" +"Couldn't find an Exchange server with the Email settings provided in the account setup. Therefore the contacts list will not work.\n" +"\n" +"Please correct your Email settings." +msgstr "" + +#. Service unavailable; Server Internal Error; Server Time-out +#. Not acceptable all. +#. Message contents not allowed by policy +#: ../src/core/sipe-user.c:78 +msgid "" +"Your message or invitation was not delivered, possibly because it contains a" +" hyperlink or other content that the system administrator has blocked." +msgstr "" + +#: ../src/core/sipe-user.c:82 +#, c-format +msgid "" +"This message was not delivered to %s because the service is not available" +msgstr "" + +#. Busy Here +#: ../src/core/sipe-user.c:84 +#, c-format +msgid "" +"This message was not delivered to %s because one or more recipients do not " +"want to be disturbed" +msgstr "" + +#. Unsupported media type +#: ../src/core/sipe-user.c:86 +#, c-format +msgid "" +"This message was not delivered to %s because one or more recipients don't " +"support this type of message" +msgstr "" + +#: ../src/core/sipe-user.c:88 +#, c-format +msgid "" +"This message was not delivered to %s because one or more recipients are " +"offline" +msgstr "" + +#. SIPE_BUDDY_INFO_DISPLAY_NAME +#: ../src/purple/purple-buddy.c:67 +msgid "Display name" +msgstr "" + +#. SIPE_BUDDY_INFO_JOB_TITLE +#: ../src/purple/purple-buddy.c:68 +msgid "Job title" +msgstr "" + +#. SIPE_BUDDY_INFO_CITY +#: ../src/purple/purple-buddy.c:69 +msgid "City" +msgstr "" + +#. SIPE_BUDDY_INFO_STATE +#: ../src/purple/purple-buddy.c:70 +msgid "State" +msgstr "" + +#. SIPE_BUDDY_INFO_OFFICE +#: ../src/purple/purple-buddy.c:71 +msgid "Office" +msgstr "" + +#. SIPE_BUDDY_INFO_DEPARTMENT +#. SIPE_BUDDY_INFO_COUNTRY +#: ../src/purple/purple-buddy.c:73 ../src/purple/purple-search.c:69 +#: ../src/purple/purple-search.c:231 +msgid "Country" +msgstr "" + +#. SIPE_BUDDY_INFO_WORK_PHONE +#: ../src/purple/purple-buddy.c:74 +msgid "Business phone" +msgstr "" + +#. SIPE_BUDDY_INFO_EMAIL +#: ../src/purple/purple-buddy.c:77 +msgid "Email address" +msgstr "" + +#. SIPE_BUDDY_INFO_SITE +#: ../src/purple/purple-buddy.c:78 +msgid "Site" +msgstr "" + +#. SIPE_BUDDY_INFO_ZIPCODE +#. SIPE_BUDDY_INFO_STREET +#. SIPE_BUDDY_INFO_MOBILE_PHONE +#. SIPE_BUDDY_INFO_MOBILE_PHONE_DISPLAY +#. SIPE_BUDDY_INFO_HOME_PHONE +#. SIPE_BUDDY_INFO_HOME_PHONE_DISPLAY +#. SIPE_BUDDY_INFO_OTHER_PHONE +#. SIPE_BUDDY_INFO_OTHER_PHONE_DISPLAY +#. SIPE_BUDDY_INFO_CUSTOM1_PHONE +#. SIPE_BUDDY_INFO_CUSTOM1_PHONE_DISPLAY +#. SIPE_BUDDY_INFO_ALIAS +#: ../src/purple/purple-buddy.c:89 +msgid "Alias" +msgstr "" + +#. SIPE_BUDDY_INFO_DEVICE +#: ../src/purple/purple-buddy.c:90 +msgid "Device" +msgstr "" + +#: ../src/purple/purple-buddy.c:260 ../src/purple/purple-buddy.c:278 +msgid "you" +msgstr "" + +#: ../src/purple/purple-buddy.c:584 +msgid "" +"https://sourceforge.net/apps/mediawiki/sipe/index.php?title=Access_Levels" +msgstr "" + +#: ../src/purple/purple-buddy.c:626 +msgid "Domain" +msgstr "" + +#: ../src/purple/purple-buddy.c:655 ../src/purple/purple-buddy.c:656 +msgid "Add new domain" +msgstr "" + +#: ../src/purple/purple-buddy.c:657 +msgid "Add" +msgstr "" + +#: ../src/purple/purple-buddy.c:658 +msgid "Cancel" +msgstr "" + +#: ../src/purple/purple-buddy.c:810 +msgid "Copy to" +msgstr "" + +#: ../src/purple/purple-chat.c:310 +msgid "Lock" +msgstr "" + +#: ../src/purple/purple-chat.c:315 +msgid "Unlock" +msgstr "" + +#: ../src/purple/purple-chat.c:338 +msgid "Show presentation" +msgstr "" + +#: ../src/purple/purple-chat.c:345 +msgid "Meeting entry info" +msgstr "" + +#: ../src/purple/purple-groupchat.c:56 +msgid "_URI:" +msgstr "" + +#: ../src/purple/purple-groupchat.c:160 +msgid "Users" +msgstr "" + +#: ../src/purple/purple-groupchat.c:163 +msgid "Invite" +msgstr "" + +#: ../src/purple/purple-groupchat.c:166 +msgid "Private" +msgstr "" + +#: ../src/purple/purple-groupchat.c:169 +msgid "Log" +msgstr "" + +#: ../src/purple/purple-groupchat.c:172 +msgid "Description" +msgstr "" + +#: ../src/purple/purple-im.c:86 +#, c-format +msgid "Conversation subject: %s" +msgstr "" + +#. Macro to reduce code repetition +#. Translators: noun +#: ../src/purple/purple-plugin-common.c:188 +msgid "Message" +msgstr "" + +#: ../src/purple/purple-plugin-common.c:421 +msgid "Connecting" +msgstr "" + +#: ../src/purple/purple-plugin-common.c:451 +msgid "Password required" +msgstr "" + +#: ../src/purple/purple-plugin-common.c:611 +msgid "user@company.com" +msgstr "" + +#: ../src/purple/purple-plugin-common.c:724 +msgid "Phone number" +msgstr "" + +#: ../src/purple/purple-plugin-common.c:728 +#: ../src/purple/purple-plugin-common.c:729 +msgid "Call a phone number" +msgstr "" + +#: ../src/purple/purple-plugin-common.c:732 +msgid "_Call" +msgstr "" + +#: ../src/purple/purple-plugin-common.c:733 +#: ../src/purple/purple-plugin-common.c:781 ../src/purple/purple-search.c:240 +msgid "_Cancel" +msgstr "" + +#: ../src/purple/purple-plugin-common.c:760 +msgid "Meeting location" +msgstr "" + +#: ../src/purple/purple-plugin-common.c:762 +msgid "Alternatively" +msgstr "" + +#: ../src/purple/purple-plugin-common.c:764 +msgid "Organizer email" +msgstr "" + +#: ../src/purple/purple-plugin-common.c:766 +msgid "Meeting ID" +msgstr "" + +#: ../src/purple/purple-plugin-common.c:770 +msgid "Join conference" +msgstr "" + +#: ../src/purple/purple-plugin-common.c:771 +msgid "Join scheduled conference" +msgstr "" + +#: ../src/purple/purple-plugin-common.c:772 +msgid "" +"Enter meeting location string you received in the invitation.\n" +"\n" +"Valid location will be something like\n" +"meet:sip:someone@company.com;gruu;opaque=app:conf:focus:id:abcdef1234\n" +"conf:sip:someone@company.com;gruu;opaque=app:conf:focus:id:abcdef1234\n" +"or\n" +"https://meet.company.com/someone/abcdef1234" +msgstr "" + +#: ../src/purple/purple-plugin-common.c:780 +msgid "_Join" +msgstr "" + +#: ../src/purple/purple-plugin-common.c:797 +#: ../src/purple/purple-plugin-common.c:811 +msgid "Publishing of calendar information has been disabled" +msgstr "" + +#: ../src/purple/purple-plugin-common.c:823 +msgid "About SIPE plugin..." +msgstr "" + +#: ../src/purple/purple-plugin-common.c:826 +msgid "Contact search..." +msgstr "" + +#: ../src/purple/purple-plugin-common.c:830 +msgid "Call a phone number..." +msgstr "" + +#: ../src/purple/purple-plugin-common.c:833 +msgid "Test call" +msgstr "" + +#: ../src/purple/purple-plugin-common.c:837 +msgid "Join scheduled conference..." +msgstr "" + +#: ../src/purple/purple-plugin-common.c:840 +msgid "Republish Calendar" +msgstr "" + +#: ../src/purple/purple-plugin-common.c:843 +msgid "Reset status" +msgstr "" + +#. * +#. * When adding new string settings please make sure to keep these +#. * in sync: +#. * +#. * api/sipe-backend.h +#. * purple-settings.c:setting_name[] +#: ../src/purple/purple-plugin-common.c:861 +msgid "" +"Server[:Port]\n" +"(leave empty for auto-discovery)" +msgstr "" + +#: ../src/purple/purple-plugin-common.c:864 +msgid "Connection type" +msgstr "" + +#: ../src/purple/purple-plugin-common.c:865 +#: ../src/purple/purple-plugin-common.c:877 +msgid "Auto" +msgstr "" + +#: ../src/purple/purple-plugin-common.c:866 +msgid "SSL/TLS" +msgstr "" + +#: ../src/purple/purple-plugin-common.c:867 +msgid "TCP" +msgstr "" + +#. option = purple_account_option_bool_new(_("Publish status (note: everyone +#. may watch you)"), "doservice", TRUE); +#. sipe_prpl_info.protocol_options = +#. g_list_append(sipe_prpl_info.protocol_options, option); +#: ../src/purple/purple-plugin-common.c:873 +msgid "User Agent" +msgstr "" + +#: ../src/purple/purple-plugin-common.c:876 +msgid "Authentication scheme" +msgstr "" + +#: ../src/purple/purple-plugin-common.c:878 +msgid "NTLM" +msgstr "" + +#: ../src/purple/purple-plugin-common.c:880 +msgid "Kerberos" +msgstr "" + +#: ../src/purple/purple-plugin-common.c:882 +msgid "TLS-DSK" +msgstr "" + +#. * When the user selects Single Sign-On then SIPE will ignore the +#. * settings for "login name" and "password". Instead it will use the +#. * default credentials provided by the OS. +#. * +#. * NOTE: the default must be *OFF*, i.e. it is up to the user to tell +#. * SIPE that it is OK to use Single Sign-On or not. +#. * +#. * Configurations that are known to support Single Sign-On: +#. * +#. * - Windows, host joined to domain, SIPE with SSPI: NTLM +#. * - Windows, host joined to domain, SIPE with SSPI: Kerberos +#. * - SIPE with libkrb5, valid TGT in cache (kinit): Kerberos +#: ../src/purple/purple-plugin-common.c:900 +msgid "Use Single Sign-On" +msgstr "" + +#. * Example (Exchange): https://server.company.com/EWS/Exchange.asmx +#. * Example (Domino) : https://[domino_server]/[mail_database_name].nsf +#: ../src/purple/purple-plugin-common.c:907 +msgid "Don't publish my calendar information" +msgstr "" + +#: ../src/purple/purple-plugin-common.c:910 +msgid "" +"Email services URL\n" +"(leave empty for auto-discovery)" +msgstr "" + +#: ../src/purple/purple-plugin-common.c:913 +msgid "" +"Email address\n" +"(if different from Username)" +msgstr "" + +#. * Example (Exchange): DOMAIN\user or user@company.com +#. * Example (Domino) : email_address +#: ../src/purple/purple-plugin-common.c:919 +msgid "" +"Email login\n" +"(if different from Login)" +msgstr "" + +#: ../src/purple/purple-plugin-common.c:922 +msgid "" +"Email password\n" +"(if different from Password)" +msgstr "" + +#. * Example (federated domain): company.com (i.e. ocschat@company.com) +#. * Example (non-default user): user@company.com +#: ../src/purple/purple-plugin-common.c:929 +msgid "" +"Group Chat Proxy\n" +" company.com or user@company.com\n" +"(leave empty to determine from Username)" +msgstr "" + +#: ../src/purple/purple-plugin-common.c:933 +msgid "Remote desktop client" +msgstr "" + +#: ../src/purple/purple-plugin-common.c:938 +msgid "Media encryption" +msgstr "" + +#: ../src/purple/purple-plugin-common.c:939 +msgid "Obey server policy" +msgstr "" + +#: ../src/purple/purple-plugin-common.c:940 +msgid "Always" +msgstr "" + +#: ../src/purple/purple-plugin-common.c:941 +msgid "Optional" +msgstr "" + +#: ../src/purple/purple-plugin-common.c:942 +msgid "Disabled" +msgstr "" + +#: ../src/purple/purple-plugin-common.c:952 +msgid "" +"Login\n" +" user or DOMAIN\\user or\n" +" user@company.com" +msgstr "" + +#: ../src/purple/purple-search.c:60 +msgid "User name" +msgstr "" + +#: ../src/purple/purple-search.c:63 +msgid "Name" +msgstr "" + +#: ../src/purple/purple-search.c:72 ../src/purple/purple-search.c:225 +msgid "Email" +msgstr "" + +#: ../src/purple/purple-search.c:221 +msgid "First name" +msgstr "" + +#: ../src/purple/purple-search.c:223 +msgid "Last name" +msgstr "" + +#: ../src/purple/purple-search.c:227 +msgid "SIP ID" +msgstr "" + +#: ../src/purple/purple-search.c:235 +msgid "Search" +msgstr "" + +#: ../src/purple/purple-search.c:236 +msgid "Search for a contact" +msgstr "" + +#: ../src/purple/purple-search.c:237 +msgid "" +"Enter the information for the person you wish to find. Empty fields will be " +"ignored." +msgstr "" + +#: ../src/purple/purple-search.c:239 +msgid "_Search" +msgstr "" + +#: ../src/purple/purple-transport.c:135 +msgid "Read error" +msgstr "" + +#: ../src/purple/purple-transport.c:139 +#: ../src/telepathy/telepathy-transport.c:95 +msgid "Server has disconnected" +msgstr "" + +#: ../src/purple/purple-transport.c:201 +msgid "Could not connect" +msgstr "" + +#: ../src/purple/purple-transport.c:271 +msgid "Could not create SSL context" +msgstr "" + +#: ../src/purple/purple-transport.c:293 +msgid "Could not create socket" +msgstr "" + +#: ../src/purple/purple-transport.c:417 +msgid "Write error" +msgstr "" diff -Nru pidgin-sipe-1.21.1/po/es.po pidgin-sipe-1.22.1/po/es.po --- pidgin-sipe-1.21.1/po/es.po 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/po/es.po 2017-06-11 15:41:22.000000000 +0000 @@ -14,7 +14,7 @@ "Project-Id-Version: pidgin sipe\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/sipe/bugs/\n" "POT-Creation-Date: 2010-11-30 23:36+0200\n" -"PO-Revision-Date: 2016-05-28 15:08+0000\n" +"PO-Revision-Date: 2017-01-23 17:47+0000\n" "Last-Translator: Stefan Becker \n" "Language-Team: Spanish (http://www.transifex.com/stefanb/pidgin-sipe/language/es/)\n" "MIME-Version: 1.0\n" @@ -23,213 +23,238 @@ "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../src/core/sip-transport.c:235 +#: ../src/core/sip-transport.c:240 msgid "Failed to authenticate to server" msgstr "Fallo de autenticación con el servidor" -#: ../src/core/sip-transport.c:293 +#: ../src/core/sip-transport.c:298 #, c-format msgid "Can't request certificate from %s" msgstr "No se puede solicitar certificado de %s" -#: ../src/core/sip-transport.c:303 +#: ../src/core/sip-transport.c:308 msgid "No URI for certificate provisioning service provided" msgstr "No URI para el certificado de servicio de aprovisionamiento" -#: ../src/core/sip-transport.c:1281 +#: ../src/core/sip-transport.c:1285 msgid "Authentication failed" msgstr "Fallo de autenticación" -#: ../src/core/sip-transport.c:1338 +#: ../src/core/sip-transport.c:1342 msgid "Incompatible authentication scheme chosen" msgstr "Seleccionado un esquema de autenticación incompatible" -#: ../src/core/sip-transport.c:1355 ../src/core/sipe-notify.c:1149 +#: ../src/core/sip-transport.c:1359 ../src/core/sipe-notify.c:1149 #, c-format msgid "You have been rejected by the server: %s" msgstr "El servidor %s ha rechazado al usuario" -#: ../src/core/sip-transport.c:1356 ../src/core/sip-transport.c:1372 -#: ../src/core/sip-transport.c:1396 ../src/core/sip-transport.c:1420 +#: ../src/core/sip-transport.c:1360 ../src/core/sip-transport.c:1376 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 #: ../src/core/sipe-conf.c:265 ../src/core/sipe-notify.c:1149 msgid "no reason given" msgstr "no se indicó una razón" -#: ../src/core/sip-transport.c:1371 +#: ../src/core/sip-transport.c:1375 #, c-format msgid "Not found: %s. Please contact your Administrator" msgstr "No encontró: %s. Por favor, contacte a su administrador" -#: ../src/core/sip-transport.c:1373 +#: ../src/core/sip-transport.c:1377 msgid "SIP is either not enabled for the destination URI or it does not exist" msgstr "SIP está deshabilitado para la URI de destino o la URI no existe" -#: ../src/core/sip-transport.c:1396 ../src/core/sip-transport.c:1420 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 #, c-format msgid "Service unavailable: %s" msgstr "Servicio no disponible: %s" -#: ../src/core/sip-transport.c:1766 +#: ../src/core/sip-transport.c:1775 msgid "Corrupted message received" msgstr "El mensaje recibido está corrupto" -#: ../src/core/sip-transport.c:1790 +#: ../src/core/sip-transport.c:1799 msgid "Invalid message signature received" msgstr "Recibida firma de mensaje no valida" -#: ../src/core/sipe-buddy.c:540 ../src/core/sipe-buddy.c:2300 +#: ../src/core/sipe-appshare.c:458 +#, c-format +msgid "%s wants to start presenting" +msgstr "" + +#: ../src/core/sipe-appshare.c:462 ../src/core/sipe-conf.c:1086 +msgid "Accept" +msgstr "Aceptar" + +#: ../src/core/sipe-appshare.c:463 ../src/core/sipe-conf.c:1087 +msgid "Decline" +msgstr "Declinado" + +#: ../src/core/sipe-appshare.c:501 ../src/core/sipe-appshare.c:599 +msgid "Application sharing error" +msgstr "" + +#: ../src/core/sipe-appshare.c:502 +msgid "Unknown remote desktop client configured." +msgstr "" + +#: ../src/core/sipe-appshare.c:600 +msgid "Couldn't connect application sharing" +msgstr "" + +#: ../src/core/sipe-buddy.c:541 ../src/core/sipe-buddy.c:2301 msgid "Mobile" msgstr "Móvil" -#: ../src/core/sipe-buddy.c:828 +#: ../src/core/sipe-buddy.c:829 msgid "Status" msgstr "Status" -#: ../src/core/sipe-buddy.c:831 +#: ../src/core/sipe-buddy.c:832 msgid "Calendar" msgstr "Calendario" -#: ../src/core/sipe-buddy.c:836 +#: ../src/core/sipe-buddy.c:837 msgid "Meeting in" msgstr "Reunión en" -#: ../src/core/sipe-buddy.c:840 +#: ../src/core/sipe-buddy.c:841 msgid "Meeting about" msgstr "Reunión sobre" -#: ../src/core/sipe-buddy.c:845 +#: ../src/core/sipe-buddy.c:846 msgid "Out of office note" msgstr "Mensaje de ausencia" -#: ../src/core/sipe-buddy.c:845 +#: ../src/core/sipe-buddy.c:846 msgid "Note" msgstr "Nota" -#: ../src/core/sipe-buddy.c:850 ../src/core/sipe-buddy.c:2345 +#: ../src/core/sipe-buddy.c:851 ../src/core/sipe-buddy.c:2346 #: ../src/purple/purple-buddy.c:633 msgid "Access level" msgstr "Nivel de Acceso" -#: ../src/core/sipe-buddy.c:1073 +#: ../src/core/sipe-buddy.c:1074 #, c-format msgid "Found %d contact%s:" msgid_plural "Found %d contacts%s:" msgstr[0] "Se ha encontrado %d contacto%s:" msgstr[1] "Se han encontrado %d contactos%s:" -#: ../src/core/sipe-buddy.c:1075 +#: ../src/core/sipe-buddy.c:1076 msgid " (more matched your query)" msgstr " (hay más que coinciden con la consulta)" -#: ../src/core/sipe-buddy.c:1121 ../src/core/sipe-buddy.c:1259 +#: ../src/core/sipe-buddy.c:1122 ../src/core/sipe-buddy.c:1260 #: ../src/core/sipe-ucs.c:314 msgid "No contacts found" msgstr "No se encontrarón contactos" -#: ../src/core/sipe-buddy.c:1134 ../src/core/sipe-buddy.c:1272 +#: ../src/core/sipe-buddy.c:1135 ../src/core/sipe-buddy.c:1273 #: ../src/core/sipe-ucs.c:278 msgid "Unable to display the search results" msgstr "Imposible mostrar los resultados de la búsqueda." -#: ../src/core/sipe-buddy.c:1237 ../src/core/sipe-buddy.c:1249 +#: ../src/core/sipe-buddy.c:1238 ../src/core/sipe-buddy.c:1250 #: ../src/core/sipe-ucs.c:391 msgid "Contact search failed" msgstr "Búsqueda de contacto fallo" -#: ../src/core/sipe-buddy.c:1412 ../src/core/sipe-ucs.c:395 +#: ../src/core/sipe-buddy.c:1413 ../src/core/sipe-ucs.c:395 msgid "Invalid contact search query" msgstr "Búsqueda de contact inválida" -#: ../src/core/sipe-buddy.c:2237 +#: ../src/core/sipe-buddy.c:2238 #, c-format msgid "Make leader of '%s'" msgstr "Hazte líder de '%s'" -#: ../src/core/sipe-buddy.c:2250 +#: ../src/core/sipe-buddy.c:2251 #, c-format msgid "Remove from '%s'" msgstr "Eliminar de '%s'" -#: ../src/core/sipe-buddy.c:2264 +#: ../src/core/sipe-buddy.c:2265 #, c-format msgid "Invite to '%s'" msgstr "Invitar a '%s'" -#: ../src/core/sipe-buddy.c:2280 +#: ../src/core/sipe-buddy.c:2281 msgid "New chat" msgstr "Chat nuevo" -#: ../src/core/sipe-buddy.c:2293 +#: ../src/core/sipe-buddy.c:2294 msgid "Work" msgstr "Trabajo" -#: ../src/core/sipe-buddy.c:2308 +#: ../src/core/sipe-buddy.c:2309 msgid "Home" msgstr "Inicio" -#: ../src/core/sipe-buddy.c:2316 +#: ../src/core/sipe-buddy.c:2317 msgid "Other" msgstr "Otro" -#: ../src/core/sipe-buddy.c:2324 +#: ../src/core/sipe-buddy.c:2325 msgid "Custom1" msgstr "Custom1" -#: ../src/core/sipe-buddy.c:2334 +#: ../src/core/sipe-buddy.c:2335 msgid "Send email..." msgstr "Enviar E-Mail..." -#: ../src/core/sipe-cal.c:907 +#: ../src/core/sipe-cal.c:906 msgid "Free" msgstr "Libre" -#: ../src/core/sipe-cal.c:908 +#: ../src/core/sipe-cal.c:907 msgid "Tentative" msgstr "Tentativo" #. SIPE_ACTIVITY_BUSY -#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:59 +#: ../src/core/sipe-cal.c:908 ../src/core/sipe-status.c:57 msgid "Busy" msgstr "Ocupado" #. SIPE_ACTIVITY_OOF -#: ../src/core/sipe-cal.c:910 ../src/core/sipe-status.c:70 +#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:68 msgid "Out of office" msgstr "Fuera de la oficina" -#: ../src/core/sipe-cal.c:911 +#: ../src/core/sipe-cal.c:910 msgid "No data" msgstr "Sin datos" -#: ../src/core/sipe-cal.c:1019 ../src/core/sipe-cal.c:1046 +#: ../src/core/sipe-cal.c:1018 ../src/core/sipe-cal.c:1045 #, c-format msgid "Currently %s" msgstr "Actualmente %s" -#: ../src/core/sipe-cal.c:1025 +#: ../src/core/sipe-cal.c:1024 msgid "Outside of working hours for next 8 hours" msgstr "Fuera de horas de trabajo durante las siguientes 8 horas" -#: ../src/core/sipe-cal.c:1027 +#: ../src/core/sipe-cal.c:1026 #, c-format msgid "%s for next 8 hours" msgstr "%s durante las siguientes 8 horas" -#: ../src/core/sipe-cal.c:1036 +#: ../src/core/sipe-cal.c:1035 msgid "Not working" msgstr "Sin trabajar" -#: ../src/core/sipe-cal.c:1040 +#: ../src/core/sipe-cal.c:1039 #, c-format msgid "%s until %.2d:%.2d" msgstr "%s hasta que %.2d:%.2d" -#: ../src/core/sipe-cal.c:1048 +#: ../src/core/sipe-cal.c:1047 #, c-format msgid "%s. Outside of working hours at %.2d:%.2d" msgstr "%s. Fuera del trabajo a las %.2d:%.2d" -#: ../src/core/sipe-cal.c:1053 +#: ../src/core/sipe-cal.c:1052 #, c-format msgid "%s. %s at %.2d:%.2d" msgstr "%s. %s en %.2d:%.2d" @@ -245,7 +270,7 @@ msgstr "Petición de Web ticket a %s fallo" #. Generate next ID -#: ../src/core/sipe-chat.c:240 +#: ../src/core/sipe-chat.c:246 #, c-format msgid "Chat #%d" msgstr "Conversación #%d" @@ -272,123 +297,115 @@ msgid "Incomplete conference information provided" msgstr "La Información de conferencia es inconmpleta" -#: ../src/core/sipe-conf.c:1041 +#: ../src/core/sipe-conf.c:1106 msgid "" "\n" "\n" "As this client was not compiled with voice call support, if you accept, you will be able to contact the other participants only via IM session." msgstr "\n\nComo el cliente no fue compilado con soporte de llamadas de voz, sí tú la aceptas, tú debes ser capaz de contactar a los demás participantes sólo vía sesión de IM." -#: ../src/core/sipe-conf.c:1049 +#: ../src/core/sipe-conf.c:1111 #, c-format -msgid "%s wants to invite you to the conference call%s" -msgstr "%s quiere invitar te a la llamada de conferencia %s" - -#: ../src/core/sipe-conf.c:1063 -msgid "Accept" -msgstr "Aceptar" - -#: ../src/core/sipe-conf.c:1064 -msgid "Decline" -msgstr "Declinado" +msgid "wants to invite you to a conference call%s" +msgstr "" -#: ../src/core/sipe-conf.c:1345 +#: ../src/core/sipe-conf.c:1459 msgid "" "This conference is no longer locked. Additional participants can now join." msgstr "Esta conferencia ya no esta bloqueada. Mas participantes pueden unirse." -#: ../src/core/sipe-conf.c:1349 +#: ../src/core/sipe-conf.c:1463 msgid "" "This conference is locked. Nobody else can join the conference while it is " "locked." msgstr "Esta conferencia esta bloqueada. Nadie mas puede unirse a la conferencia mientras esté bloqueada." -#: ../src/core/sipe-conf.c:1382 +#: ../src/core/sipe-conf.c:1496 msgid "You have been disconnected from this conference." msgstr "Usted ha sido desconectado de esta conferencia." -#: ../src/core/sipe-conf.c:1542 +#: ../src/core/sipe-conf.c:1656 msgid "Dial-in info" msgstr "Información de discado" -#: ../src/core/sipe-conf.c:1543 +#: ../src/core/sipe-conf.c:1657 msgid "Number" msgstr "Número" -#: ../src/core/sipe-conf.c:1545 +#: ../src/core/sipe-conf.c:1659 msgid "Conference ID" msgstr "ID de conferencia" -#: ../src/core/sipe-conf.c:1547 +#: ../src/core/sipe-conf.c:1661 msgid "Meeting link" msgstr "enlace a la reunión" -#: ../src/core/sipe-conf.c:1549 +#: ../src/core/sipe-conf.c:1663 msgid "Organizer" msgstr "Organizador" -#: ../src/core/sipe-conf.c:1551 +#: ../src/core/sipe-conf.c:1665 msgid "Alternative dial-in numbers" msgstr "Números de discado alternativos" #. The next 13 texts make up the SIPE about note text #. About note, part 1/13: introduction -#: ../src/core/sipe-core.c:220 +#: ../src/core/sipe-core.c:221 msgid "" "A third-party plugin implementing extended version of SIP/SIMPLE used by " "various products" msgstr "Un plugin desarrollado por terceros que implementa una versión del protocolo SIP/SIMPLE usado por varios productos." #. About note, part 2/13: home page URL (label) -#: ../src/core/sipe-core.c:222 +#: ../src/core/sipe-core.c:223 msgid "Home Page" msgstr "Página principal" #. About note, part 3/13: support forum URL (label) -#: ../src/core/sipe-core.c:224 +#: ../src/core/sipe-core.c:225 msgid "Support" msgstr "Soporte" #. About note, part 4/13: support forum name (hyperlink text) -#: ../src/core/sipe-core.c:226 +#: ../src/core/sipe-core.c:227 msgid "Help Forum" msgstr "Foro de Ayuda" #. About note, part 5/13: bug tracker URL (label) -#: ../src/core/sipe-core.c:228 +#: ../src/core/sipe-core.c:229 msgid "Report Problems" msgstr "Reportar Problemas" #. About note, part 6/13: bug tracker URL (hyperlink text) -#: ../src/core/sipe-core.c:230 +#: ../src/core/sipe-core.c:231 msgid "Bug Tracker" msgstr "Seguimiento de Errores" #. About note, part 7/13: translation service URL (label) -#: ../src/core/sipe-core.c:232 +#: ../src/core/sipe-core.c:233 msgid "Translations" msgstr "Traducciones" #. About note, part 8/13: license type (label) -#: ../src/core/sipe-core.c:234 +#: ../src/core/sipe-core.c:235 msgid "License" msgstr "Licencia" #. About note, part 9/13: (REMOVED) #. About note, part 10/13: translation request, text before Transifex.com URL #. append a space if text is not empty -#: ../src/core/sipe-core.c:238 +#: ../src/core/sipe-core.c:239 msgid "Please help us to translate SIPE to your native language here at " msgstr "Por favor, ayudanos a traducir SIPE para su lenguaje nativo en" #. About note, part 11/13: translation request, text after Transifex.com URL #. start with a space if text is not empty -#: ../src/core/sipe-core.c:241 +#: ../src/core/sipe-core.c:242 msgid " using convenient web interface" msgstr "usando una interfaz web" #. About note, part 12/13: author list (header) -#: ../src/core/sipe-core.c:243 +#: ../src/core/sipe-core.c:244 msgid "Authors" msgstr "Autores" @@ -396,15 +413,15 @@ #. PLEASE NOTE: do *NOT* simply translate the english original #. but write something similar to the following sentence: #. "Localization for (): " -#: ../src/core/sipe-core.c:248 +#: ../src/core/sipe-core.c:249 msgid "Original texts in English (en): SIPE developers" msgstr "Textos originales en Ingles (en): Desarrolladores de SIPE" -#: ../src/core/sipe-core.c:269 +#: ../src/core/sipe-core.c:273 msgid "SIP Exchange user name contains invalid characters" msgstr "El nombre de usuario de SIP Exchange contiene caracteres inválidos" -#: ../src/core/sipe-core.c:277 ../src/purple/purple-buddy.c:485 +#: ../src/core/sipe-core.c:281 ../src/purple/purple-buddy.c:485 #: ../src/telepathy/telepathy-protocol.c:89 #: ../src/telepathy/telepathy-protocol.c:191 #, c-format @@ -413,21 +430,21 @@ "Example: user@company.com" msgstr "El nombre de usuario debe ser una URI SIP válida\nEjemplo: usuario@dominio.com" -#: ../src/core/sipe-core.c:284 +#: ../src/core/sipe-core.c:288 msgid "Password is required when Single Sign-On is not enabled" msgstr "La contraseña es requerida cuando la Autenticación única no se encuentra habilitada." -#: ../src/core/sipe-core.c:294 +#: ../src/core/sipe-core.c:298 msgid "" "Email address should be valid if provided\n" "Example: user@company.com" msgstr "Si se proporciona una direccion de correo, debe ser válida\nEjemplo: usuario@dominio.com" -#: ../src/core/sipe-core.c:303 +#: ../src/core/sipe-core.c:307 msgid "SIP Exchange user name contains whitespace" msgstr "El nombre de cuenta SIP Exchange contiene espacios" -#: ../src/core/sipe-core.c:317 +#: ../src/core/sipe-core.c:321 msgid "" "Email services URL should be valid if provided\n" "Example: https://exchange.corp.com/EWS/Exchange.asmx\n" @@ -458,13 +475,13 @@ msgid "Could not create listen socket" msgstr "Imposible crear el socket de escucha" -#: ../src/core/sipe-ft-lync.c:757 ../src/core/sipe-media.c:1195 -#: ../src/core/sipe-media.c:1206 ../src/core/sipe-media.c:1284 -#: ../src/core/sipe-media.c:1740 +#: ../src/core/sipe-ft-lync.c:762 ../src/core/sipe-media.c:1328 +#: ../src/core/sipe-media.c:1339 ../src/core/sipe-media.c:1417 +#: ../src/core/sipe-media.c:1923 msgid "Error occurred" msgstr "Ocurrió un error" -#: ../src/core/sipe-ft-lync.c:758 +#: ../src/core/sipe-ft-lync.c:763 msgid "Error creating data stream" msgstr "Error creando el flujo de datos" @@ -499,7 +516,7 @@ msgstr "Memoria insuficiente" #: ../src/core/sipe-group.c:168 ../src/core/sipe-notify.c:1163 -#: ../src/core/sipe-notify.c:1190 ../src/core/sipe-notify.c:1294 +#: ../src/core/sipe-notify.c:1197 ../src/core/sipe-notify.c:1301 #: ../src/purple/purple-search.c:128 msgid "Other Contacts" msgstr "Otros contactos" @@ -537,77 +554,77 @@ msgid "Failed to invite %s" msgstr "Fallo invitando a %s" -#: ../src/core/sipe-incoming.c:741 +#: ../src/core/sipe-incoming.c:754 #, c-format msgid "Received a message with unrecognized contents from %s" msgstr "Se recibió un mensaje con contenido no reconocido de %s" -#: ../src/core/sipe-media.c:835 ../src/core/sipe-media.c:1347 -#: ../src/core/sipe-media.c:1357 ../src/core/sipe-media.c:1721 -#: ../src/core/sipe-media.c:1741 +#: ../src/core/sipe-media.c:869 ../src/core/sipe-media.c:1483 +#: ../src/core/sipe-media.c:1493 ../src/core/sipe-media.c:1904 +#: ../src/core/sipe-media.c:1924 msgid "Unable to establish a call" msgstr "Imposible establecer la llamada" -#: ../src/core/sipe-media.c:836 ../src/core/sipe-media.c:1722 +#: ../src/core/sipe-media.c:870 ../src/core/sipe-media.c:1905 msgid "Encryption settings of peer are incompatible with ours." msgstr "La configuración de encriptación del destino es incompatible con la nuestra." -#: ../src/core/sipe-media.c:929 +#: ../src/core/sipe-media.c:963 #, c-format msgid "User %s rejected call" msgstr "El usuario %s rechazo la llamada" -#: ../src/core/sipe-media.c:930 +#: ../src/core/sipe-media.c:964 msgid "Call rejected" msgstr "Llamada rechazada" -#: ../src/core/sipe-media.c:1196 ../src/core/sipe-media.c:1285 +#: ../src/core/sipe-media.c:1329 ../src/core/sipe-media.c:1418 msgid "Error creating audio stream" msgstr "Error creando el flujo de audio" -#: ../src/core/sipe-media.c:1207 +#: ../src/core/sipe-media.c:1340 msgid "Error creating video stream" msgstr "Error creando el flujo de video" -#: ../src/core/sipe-media.c:1251 ../src/purple/purple-chat.c:314 +#: ../src/core/sipe-media.c:1384 ../src/purple/purple-chat.c:329 msgid "Join conference call" msgstr "Unirse a llamada de conferencia" -#: ../src/core/sipe-media.c:1252 +#: ../src/core/sipe-media.c:1385 msgid "Conference calls are not supported on this server." msgstr "Las llamadas en conferencia no son soportadas en este servidor." -#: ../src/core/sipe-media.c:1348 +#: ../src/core/sipe-media.c:1484 msgid "Invalid phone number" msgstr "Número de teléfono inválido" -#: ../src/core/sipe-media.c:1358 +#: ../src/core/sipe-media.c:1494 msgid "Audio Test Service is not available." msgstr "El servicio para Test de Audio no se encuentra disponible" -#: ../src/core/sipe-media.c:1690 +#: ../src/core/sipe-media.c:1873 msgid "User unavailable" msgstr "Usuario no disponible" -#: ../src/core/sipe-media.c:1693 +#: ../src/core/sipe-media.c:1876 #, c-format msgid "%s does not want to be disturbed" msgstr "%s no quiere ser molestado" -#: ../src/core/sipe-media.c:1695 +#: ../src/core/sipe-media.c:1878 #, c-format msgid "User %s is not available" msgstr "El usuario %s no esta disponible" -#: ../src/core/sipe-media.c:1704 +#: ../src/core/sipe-media.c:1887 msgid "Unsupported media type" msgstr "medio no soportado." -#: ../src/core/sipe-media.c:2062 +#: ../src/core/sipe-media.c:2246 msgid "Media error" msgstr "Error media" -#: ../src/core/sipe-media.c:2063 +#: ../src/core/sipe-media.c:2247 msgid "Error while reading from stream" msgstr "Error leyendo desde flujo" @@ -658,36 +675,36 @@ msgstr "Desconocido" #. Translators: remove (clear) previously assigned access level -#: ../src/core/sipe-ocs2007.c:2571 +#: ../src/core/sipe-ocs2007.c:2570 msgid "Unspecify" msgstr "No especificado" -#: ../src/core/sipe-ocs2007.c:2590 +#: ../src/core/sipe-ocs2007.c:2589 msgid "People in my company" msgstr "Personas de mi compañia" -#: ../src/core/sipe-ocs2007.c:2600 +#: ../src/core/sipe-ocs2007.c:2599 msgid "People in domains connected with my company" msgstr "Personas de dominios conectados con mi compañia" -#: ../src/core/sipe-ocs2007.c:2609 +#: ../src/core/sipe-ocs2007.c:2608 msgid "People in public domains" msgstr "Personas de dominios públicos" -#: ../src/core/sipe-ocs2007.c:2619 +#: ../src/core/sipe-ocs2007.c:2618 #, c-format msgid "People at %s" msgstr "Persona en %s" -#: ../src/core/sipe-ocs2007.c:2644 +#: ../src/core/sipe-ocs2007.c:2643 msgid "Add new domain..." msgstr "Agregar nuevo dominio..." -#: ../src/core/sipe-ocs2007.c:2673 +#: ../src/core/sipe-ocs2007.c:2672 msgid "Online help..." msgstr "Ayuda en linea ..." -#: ../src/core/sipe-ocs2007.c:2681 +#: ../src/core/sipe-ocs2007.c:2680 msgid "Access groups" msgstr "Agregar grupos" @@ -699,49 +716,60 @@ #. SIPE_ACTIVITY_AVAILABLE #. SIPE_ACTIVITY_ONLINE #. SIPE_ACTIVITY_INACTIVE -#: ../src/core/sipe-status.c:58 +#: ../src/core/sipe-status.c:56 msgid "Inactive" msgstr "Inactivo" #. SIPE_ACTIVITY_BUSYIDLE -#: ../src/core/sipe-status.c:60 +#: ../src/core/sipe-status.c:58 msgid "Busy-Idle" msgstr "Ocupado-Inactivo" #. SIPE_ACTIVITY_DND #. SIPE_ACTIVITY_BRB -#: ../src/core/sipe-status.c:62 +#: ../src/core/sipe-status.c:60 msgid "Be right back" msgstr "Regreso en un momento" #. SIPE_ACTIVITY_AWAY #. SIPE_ACTIVITY_LUNCH -#: ../src/core/sipe-status.c:64 +#: ../src/core/sipe-status.c:62 msgid "Out to lunch" msgstr "He salido a comer" #. SIPE_ACTIVITY_INVISIBLE #. SIPE_ACTIVITY_OFFLINE #. SIPE_ACTIVITY_ON_PHONE -#: ../src/core/sipe-status.c:67 +#: ../src/core/sipe-status.c:65 msgid "In a call" msgstr "En una llamada" #. SIPE_ACTIVITY_IN_CONF -#: ../src/core/sipe-status.c:68 +#: ../src/core/sipe-status.c:66 msgid "In a conference" msgstr "En una conferencia" #. SIPE_ACTIVITY_IN_MEETING -#: ../src/core/sipe-status.c:69 +#: ../src/core/sipe-status.c:67 msgid "In a meeting" msgstr "En una reunión" #. SIPE_ACTIVITY_URGENT_ONLY -#: ../src/core/sipe-status.c:71 +#: ../src/core/sipe-status.c:69 msgid "Urgent interruptions only" msgstr "Sólo interrupciones urgentes" +#: ../src/core/sipe-subscriptions.c:189 +msgid "Presence subscription failed!" +msgstr "" + +#: ../src/core/sipe-subscriptions.c:190 +msgid "" +"One or more buddies will therefore permanently show as offline.\n" +"\n" +"Please check that there are no corrupted SIP URIs in your contacts list." +msgstr "" + #: ../src/core/sipe-ucs.c:674 msgid "UCS initialization failed!" msgstr "Fallo en inicialización UCS!" @@ -894,15 +922,19 @@ msgid "Copy to" msgstr "Copiar a" -#: ../src/purple/purple-chat.c:295 +#: ../src/purple/purple-chat.c:310 msgid "Lock" msgstr "Bloquear" -#: ../src/purple/purple-chat.c:300 +#: ../src/purple/purple-chat.c:315 msgid "Unlock" msgstr "Desbloquear" -#: ../src/purple/purple-chat.c:321 +#: ../src/purple/purple-chat.c:338 +msgid "Show presentation" +msgstr "" + +#: ../src/purple/purple-chat.c:345 msgid "Meeting entry info" msgstr "Información de la reunión" @@ -1154,26 +1186,30 @@ msgstr "Proxy para Chat de Grupo\n company.com o user@company.com\n (dejar vácio para dejar el Username)" #: ../src/purple/purple-plugin-common.c:933 +msgid "Remote desktop client" +msgstr "" + +#: ../src/purple/purple-plugin-common.c:938 msgid "Media encryption" msgstr "Encriptación media" -#: ../src/purple/purple-plugin-common.c:934 +#: ../src/purple/purple-plugin-common.c:939 msgid "Obey server policy" msgstr "Seguir política del servidor" -#: ../src/purple/purple-plugin-common.c:935 +#: ../src/purple/purple-plugin-common.c:940 msgid "Always" msgstr "Siempre" -#: ../src/purple/purple-plugin-common.c:936 +#: ../src/purple/purple-plugin-common.c:941 msgid "Optional" msgstr "Opcional" -#: ../src/purple/purple-plugin-common.c:937 +#: ../src/purple/purple-plugin-common.c:942 msgid "Disabled" msgstr "Deshabilitado" -#: ../src/purple/purple-plugin-common.c:947 +#: ../src/purple/purple-plugin-common.c:952 msgid "" "Login\n" " user or DOMAIN\\user or\n" @@ -1222,27 +1258,27 @@ msgid "_Search" msgstr "_Buscar" -#: ../src/purple/purple-transport.c:132 +#: ../src/purple/purple-transport.c:135 msgid "Read error" msgstr "Error de lectura" -#: ../src/purple/purple-transport.c:136 -#: ../src/telepathy/telepathy-transport.c:96 +#: ../src/purple/purple-transport.c:139 +#: ../src/telepathy/telepathy-transport.c:95 msgid "Server has disconnected" msgstr "El servidor ha desconectado" -#: ../src/purple/purple-transport.c:198 +#: ../src/purple/purple-transport.c:201 msgid "Could not connect" msgstr "No es posible conectar" -#: ../src/purple/purple-transport.c:268 +#: ../src/purple/purple-transport.c:271 msgid "Could not create SSL context" msgstr "No es posible crear el contexto SSL" -#: ../src/purple/purple-transport.c:290 +#: ../src/purple/purple-transport.c:293 msgid "Could not create socket" msgstr "No se pudo crear el socket" -#: ../src/purple/purple-transport.c:381 +#: ../src/purple/purple-transport.c:417 msgid "Write error" msgstr "Error de escritura" diff -Nru pidgin-sipe-1.21.1/po/fi.po pidgin-sipe-1.22.1/po/fi.po --- pidgin-sipe-1.21.1/po/fi.po 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/po/fi.po 2017-06-11 15:41:22.000000000 +0000 @@ -11,7 +11,7 @@ "Project-Id-Version: pidgin sipe\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/sipe/bugs/\n" "POT-Creation-Date: 2010-11-30 23:36+0200\n" -"PO-Revision-Date: 2016-05-28 15:08+0000\n" +"PO-Revision-Date: 2017-01-23 17:47+0000\n" "Last-Translator: Stefan Becker \n" "Language-Team: Finnish (http://www.transifex.com/stefanb/pidgin-sipe/language/fi/)\n" "MIME-Version: 1.0\n" @@ -20,213 +20,238 @@ "Language: fi\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../src/core/sip-transport.c:235 +#: ../src/core/sip-transport.c:240 msgid "Failed to authenticate to server" msgstr "Varmentaminen epäonnistui palvelimelle" -#: ../src/core/sip-transport.c:293 +#: ../src/core/sip-transport.c:298 #, c-format msgid "Can't request certificate from %s" msgstr "" -#: ../src/core/sip-transport.c:303 +#: ../src/core/sip-transport.c:308 msgid "No URI for certificate provisioning service provided" msgstr "" -#: ../src/core/sip-transport.c:1281 +#: ../src/core/sip-transport.c:1285 msgid "Authentication failed" msgstr "" -#: ../src/core/sip-transport.c:1338 +#: ../src/core/sip-transport.c:1342 msgid "Incompatible authentication scheme chosen" msgstr "" -#: ../src/core/sip-transport.c:1355 ../src/core/sipe-notify.c:1149 +#: ../src/core/sip-transport.c:1359 ../src/core/sipe-notify.c:1149 #, c-format msgid "You have been rejected by the server: %s" msgstr "" -#: ../src/core/sip-transport.c:1356 ../src/core/sip-transport.c:1372 -#: ../src/core/sip-transport.c:1396 ../src/core/sip-transport.c:1420 +#: ../src/core/sip-transport.c:1360 ../src/core/sip-transport.c:1376 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 #: ../src/core/sipe-conf.c:265 ../src/core/sipe-notify.c:1149 msgid "no reason given" msgstr "" -#: ../src/core/sip-transport.c:1371 +#: ../src/core/sip-transport.c:1375 #, c-format msgid "Not found: %s. Please contact your Administrator" msgstr "" -#: ../src/core/sip-transport.c:1373 +#: ../src/core/sip-transport.c:1377 msgid "SIP is either not enabled for the destination URI or it does not exist" msgstr "" -#: ../src/core/sip-transport.c:1396 ../src/core/sip-transport.c:1420 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 #, c-format msgid "Service unavailable: %s" msgstr "Palvelu ei käytettävissä: %s" -#: ../src/core/sip-transport.c:1766 +#: ../src/core/sip-transport.c:1775 msgid "Corrupted message received" msgstr "" -#: ../src/core/sip-transport.c:1790 +#: ../src/core/sip-transport.c:1799 msgid "Invalid message signature received" msgstr "Virheellinen viesti allekirjoitus vastaanotettu" -#: ../src/core/sipe-buddy.c:540 ../src/core/sipe-buddy.c:2300 +#: ../src/core/sipe-appshare.c:458 +#, c-format +msgid "%s wants to start presenting" +msgstr "" + +#: ../src/core/sipe-appshare.c:462 ../src/core/sipe-conf.c:1086 +msgid "Accept" +msgstr "" + +#: ../src/core/sipe-appshare.c:463 ../src/core/sipe-conf.c:1087 +msgid "Decline" +msgstr "" + +#: ../src/core/sipe-appshare.c:501 ../src/core/sipe-appshare.c:599 +msgid "Application sharing error" +msgstr "" + +#: ../src/core/sipe-appshare.c:502 +msgid "Unknown remote desktop client configured." +msgstr "" + +#: ../src/core/sipe-appshare.c:600 +msgid "Couldn't connect application sharing" +msgstr "" + +#: ../src/core/sipe-buddy.c:541 ../src/core/sipe-buddy.c:2301 msgid "Mobile" msgstr "" -#: ../src/core/sipe-buddy.c:828 +#: ../src/core/sipe-buddy.c:829 msgid "Status" msgstr "Tila" -#: ../src/core/sipe-buddy.c:831 +#: ../src/core/sipe-buddy.c:832 msgid "Calendar" msgstr "Kalenteri" -#: ../src/core/sipe-buddy.c:836 +#: ../src/core/sipe-buddy.c:837 msgid "Meeting in" msgstr "" -#: ../src/core/sipe-buddy.c:840 +#: ../src/core/sipe-buddy.c:841 msgid "Meeting about" msgstr "" -#: ../src/core/sipe-buddy.c:845 +#: ../src/core/sipe-buddy.c:846 msgid "Out of office note" msgstr "" -#: ../src/core/sipe-buddy.c:845 +#: ../src/core/sipe-buddy.c:846 msgid "Note" msgstr "" -#: ../src/core/sipe-buddy.c:850 ../src/core/sipe-buddy.c:2345 +#: ../src/core/sipe-buddy.c:851 ../src/core/sipe-buddy.c:2346 #: ../src/purple/purple-buddy.c:633 msgid "Access level" msgstr "" -#: ../src/core/sipe-buddy.c:1073 +#: ../src/core/sipe-buddy.c:1074 #, c-format msgid "Found %d contact%s:" msgid_plural "Found %d contacts%s:" msgstr[0] "" msgstr[1] "" -#: ../src/core/sipe-buddy.c:1075 +#: ../src/core/sipe-buddy.c:1076 msgid " (more matched your query)" msgstr "" -#: ../src/core/sipe-buddy.c:1121 ../src/core/sipe-buddy.c:1259 +#: ../src/core/sipe-buddy.c:1122 ../src/core/sipe-buddy.c:1260 #: ../src/core/sipe-ucs.c:314 msgid "No contacts found" msgstr "" -#: ../src/core/sipe-buddy.c:1134 ../src/core/sipe-buddy.c:1272 +#: ../src/core/sipe-buddy.c:1135 ../src/core/sipe-buddy.c:1273 #: ../src/core/sipe-ucs.c:278 msgid "Unable to display the search results" msgstr "" -#: ../src/core/sipe-buddy.c:1237 ../src/core/sipe-buddy.c:1249 +#: ../src/core/sipe-buddy.c:1238 ../src/core/sipe-buddy.c:1250 #: ../src/core/sipe-ucs.c:391 msgid "Contact search failed" msgstr "" -#: ../src/core/sipe-buddy.c:1412 ../src/core/sipe-ucs.c:395 +#: ../src/core/sipe-buddy.c:1413 ../src/core/sipe-ucs.c:395 msgid "Invalid contact search query" msgstr "" -#: ../src/core/sipe-buddy.c:2237 +#: ../src/core/sipe-buddy.c:2238 #, c-format msgid "Make leader of '%s'" msgstr "" -#: ../src/core/sipe-buddy.c:2250 +#: ../src/core/sipe-buddy.c:2251 #, c-format msgid "Remove from '%s'" msgstr "" -#: ../src/core/sipe-buddy.c:2264 +#: ../src/core/sipe-buddy.c:2265 #, c-format msgid "Invite to '%s'" msgstr "" -#: ../src/core/sipe-buddy.c:2280 +#: ../src/core/sipe-buddy.c:2281 msgid "New chat" msgstr "Uusi ryhmäkeskustelu" -#: ../src/core/sipe-buddy.c:2293 +#: ../src/core/sipe-buddy.c:2294 msgid "Work" msgstr "" -#: ../src/core/sipe-buddy.c:2308 +#: ../src/core/sipe-buddy.c:2309 msgid "Home" msgstr "Kotisivu" -#: ../src/core/sipe-buddy.c:2316 +#: ../src/core/sipe-buddy.c:2317 msgid "Other" msgstr "" -#: ../src/core/sipe-buddy.c:2324 +#: ../src/core/sipe-buddy.c:2325 msgid "Custom1" msgstr "" -#: ../src/core/sipe-buddy.c:2334 +#: ../src/core/sipe-buddy.c:2335 msgid "Send email..." msgstr "Lähetä sähköpostia..." -#: ../src/core/sipe-cal.c:907 +#: ../src/core/sipe-cal.c:906 msgid "Free" msgstr "Vapaa" -#: ../src/core/sipe-cal.c:908 +#: ../src/core/sipe-cal.c:907 msgid "Tentative" msgstr "Alustavia" #. SIPE_ACTIVITY_BUSY -#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:59 +#: ../src/core/sipe-cal.c:908 ../src/core/sipe-status.c:57 msgid "Busy" msgstr "Varattu" #. SIPE_ACTIVITY_OOF -#: ../src/core/sipe-cal.c:910 ../src/core/sipe-status.c:70 +#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:68 msgid "Out of office" msgstr "" -#: ../src/core/sipe-cal.c:911 +#: ../src/core/sipe-cal.c:910 msgid "No data" msgstr "Ei tietoja" -#: ../src/core/sipe-cal.c:1019 ../src/core/sipe-cal.c:1046 +#: ../src/core/sipe-cal.c:1018 ../src/core/sipe-cal.c:1045 #, c-format msgid "Currently %s" msgstr "Nykyään %s" -#: ../src/core/sipe-cal.c:1025 +#: ../src/core/sipe-cal.c:1024 msgid "Outside of working hours for next 8 hours" msgstr "" -#: ../src/core/sipe-cal.c:1027 +#: ../src/core/sipe-cal.c:1026 #, c-format msgid "%s for next 8 hours" msgstr "%s seuraavan 8 tuntia" -#: ../src/core/sipe-cal.c:1036 +#: ../src/core/sipe-cal.c:1035 msgid "Not working" msgstr "Ei töissä" -#: ../src/core/sipe-cal.c:1040 +#: ../src/core/sipe-cal.c:1039 #, c-format msgid "%s until %.2d:%.2d" msgstr "" -#: ../src/core/sipe-cal.c:1048 +#: ../src/core/sipe-cal.c:1047 #, c-format msgid "%s. Outside of working hours at %.2d:%.2d" msgstr "" -#: ../src/core/sipe-cal.c:1053 +#: ../src/core/sipe-cal.c:1052 #, c-format msgid "%s. %s at %.2d:%.2d" msgstr "" @@ -242,7 +267,7 @@ msgstr "" #. Generate next ID -#: ../src/core/sipe-chat.c:240 +#: ../src/core/sipe-chat.c:246 #, c-format msgid "Chat #%d" msgstr "Ryhmäkeskustelu #%d" @@ -269,123 +294,115 @@ msgid "Incomplete conference information provided" msgstr "" -#: ../src/core/sipe-conf.c:1041 +#: ../src/core/sipe-conf.c:1106 msgid "" "\n" "\n" "As this client was not compiled with voice call support, if you accept, you will be able to contact the other participants only via IM session." msgstr "" -#: ../src/core/sipe-conf.c:1049 +#: ../src/core/sipe-conf.c:1111 #, c-format -msgid "%s wants to invite you to the conference call%s" +msgid "wants to invite you to a conference call%s" msgstr "" -#: ../src/core/sipe-conf.c:1063 -msgid "Accept" -msgstr "" - -#: ../src/core/sipe-conf.c:1064 -msgid "Decline" -msgstr "" - -#: ../src/core/sipe-conf.c:1345 +#: ../src/core/sipe-conf.c:1459 msgid "" "This conference is no longer locked. Additional participants can now join." msgstr "" -#: ../src/core/sipe-conf.c:1349 +#: ../src/core/sipe-conf.c:1463 msgid "" "This conference is locked. Nobody else can join the conference while it is " "locked." msgstr "" -#: ../src/core/sipe-conf.c:1382 +#: ../src/core/sipe-conf.c:1496 msgid "You have been disconnected from this conference." msgstr "" -#: ../src/core/sipe-conf.c:1542 +#: ../src/core/sipe-conf.c:1656 msgid "Dial-in info" msgstr "" -#: ../src/core/sipe-conf.c:1543 +#: ../src/core/sipe-conf.c:1657 msgid "Number" msgstr "" -#: ../src/core/sipe-conf.c:1545 +#: ../src/core/sipe-conf.c:1659 msgid "Conference ID" msgstr "" -#: ../src/core/sipe-conf.c:1547 +#: ../src/core/sipe-conf.c:1661 msgid "Meeting link" msgstr "" -#: ../src/core/sipe-conf.c:1549 +#: ../src/core/sipe-conf.c:1663 msgid "Organizer" msgstr "" -#: ../src/core/sipe-conf.c:1551 +#: ../src/core/sipe-conf.c:1665 msgid "Alternative dial-in numbers" msgstr "" #. The next 13 texts make up the SIPE about note text #. About note, part 1/13: introduction -#: ../src/core/sipe-core.c:220 +#: ../src/core/sipe-core.c:221 msgid "" "A third-party plugin implementing extended version of SIP/SIMPLE used by " "various products" msgstr "" #. About note, part 2/13: home page URL (label) -#: ../src/core/sipe-core.c:222 +#: ../src/core/sipe-core.c:223 msgid "Home Page" msgstr "" #. About note, part 3/13: support forum URL (label) -#: ../src/core/sipe-core.c:224 +#: ../src/core/sipe-core.c:225 msgid "Support" msgstr "" #. About note, part 4/13: support forum name (hyperlink text) -#: ../src/core/sipe-core.c:226 +#: ../src/core/sipe-core.c:227 msgid "Help Forum" msgstr "" #. About note, part 5/13: bug tracker URL (label) -#: ../src/core/sipe-core.c:228 +#: ../src/core/sipe-core.c:229 msgid "Report Problems" msgstr "" #. About note, part 6/13: bug tracker URL (hyperlink text) -#: ../src/core/sipe-core.c:230 +#: ../src/core/sipe-core.c:231 msgid "Bug Tracker" msgstr "" #. About note, part 7/13: translation service URL (label) -#: ../src/core/sipe-core.c:232 +#: ../src/core/sipe-core.c:233 msgid "Translations" msgstr "" #. About note, part 8/13: license type (label) -#: ../src/core/sipe-core.c:234 +#: ../src/core/sipe-core.c:235 msgid "License" msgstr "" #. About note, part 9/13: (REMOVED) #. About note, part 10/13: translation request, text before Transifex.com URL #. append a space if text is not empty -#: ../src/core/sipe-core.c:238 +#: ../src/core/sipe-core.c:239 msgid "Please help us to translate SIPE to your native language here at " msgstr "" #. About note, part 11/13: translation request, text after Transifex.com URL #. start with a space if text is not empty -#: ../src/core/sipe-core.c:241 +#: ../src/core/sipe-core.c:242 msgid " using convenient web interface" msgstr "" #. About note, part 12/13: author list (header) -#: ../src/core/sipe-core.c:243 +#: ../src/core/sipe-core.c:244 msgid "Authors" msgstr "" @@ -393,15 +410,15 @@ #. PLEASE NOTE: do *NOT* simply translate the english original #. but write something similar to the following sentence: #. "Localization for (): " -#: ../src/core/sipe-core.c:248 +#: ../src/core/sipe-core.c:249 msgid "Original texts in English (en): SIPE developers" msgstr "" -#: ../src/core/sipe-core.c:269 +#: ../src/core/sipe-core.c:273 msgid "SIP Exchange user name contains invalid characters" msgstr "SIP Exchange:n käyttäjätunnus sisältää virheellisiä merkkejä" -#: ../src/core/sipe-core.c:277 ../src/purple/purple-buddy.c:485 +#: ../src/core/sipe-core.c:281 ../src/purple/purple-buddy.c:485 #: ../src/telepathy/telepathy-protocol.c:89 #: ../src/telepathy/telepathy-protocol.c:191 #, c-format @@ -410,21 +427,21 @@ "Example: user@company.com" msgstr "Käyttäjätunnus on voimassa SIP-URI\nEsimerkki: user@company.com" -#: ../src/core/sipe-core.c:284 +#: ../src/core/sipe-core.c:288 msgid "Password is required when Single Sign-On is not enabled" msgstr "" -#: ../src/core/sipe-core.c:294 +#: ../src/core/sipe-core.c:298 msgid "" "Email address should be valid if provided\n" "Example: user@company.com" msgstr "" -#: ../src/core/sipe-core.c:303 +#: ../src/core/sipe-core.c:307 msgid "SIP Exchange user name contains whitespace" msgstr "" -#: ../src/core/sipe-core.c:317 +#: ../src/core/sipe-core.c:321 msgid "" "Email services URL should be valid if provided\n" "Example: https://exchange.corp.com/EWS/Exchange.asmx\n" @@ -455,13 +472,13 @@ msgid "Could not create listen socket" msgstr "" -#: ../src/core/sipe-ft-lync.c:757 ../src/core/sipe-media.c:1195 -#: ../src/core/sipe-media.c:1206 ../src/core/sipe-media.c:1284 -#: ../src/core/sipe-media.c:1740 +#: ../src/core/sipe-ft-lync.c:762 ../src/core/sipe-media.c:1328 +#: ../src/core/sipe-media.c:1339 ../src/core/sipe-media.c:1417 +#: ../src/core/sipe-media.c:1923 msgid "Error occurred" msgstr "" -#: ../src/core/sipe-ft-lync.c:758 +#: ../src/core/sipe-ft-lync.c:763 msgid "Error creating data stream" msgstr "" @@ -496,7 +513,7 @@ msgstr "" #: ../src/core/sipe-group.c:168 ../src/core/sipe-notify.c:1163 -#: ../src/core/sipe-notify.c:1190 ../src/core/sipe-notify.c:1294 +#: ../src/core/sipe-notify.c:1197 ../src/core/sipe-notify.c:1301 #: ../src/purple/purple-search.c:128 msgid "Other Contacts" msgstr "Muut yhteystiedot" @@ -534,77 +551,77 @@ msgid "Failed to invite %s" msgstr "Epäonnistui kutsua %s" -#: ../src/core/sipe-incoming.c:741 +#: ../src/core/sipe-incoming.c:754 #, c-format msgid "Received a message with unrecognized contents from %s" msgstr "Vastaanotettu viesti tuntemattomat sisältö %s:lta" -#: ../src/core/sipe-media.c:835 ../src/core/sipe-media.c:1347 -#: ../src/core/sipe-media.c:1357 ../src/core/sipe-media.c:1721 -#: ../src/core/sipe-media.c:1741 +#: ../src/core/sipe-media.c:869 ../src/core/sipe-media.c:1483 +#: ../src/core/sipe-media.c:1493 ../src/core/sipe-media.c:1904 +#: ../src/core/sipe-media.c:1924 msgid "Unable to establish a call" msgstr "" -#: ../src/core/sipe-media.c:836 ../src/core/sipe-media.c:1722 +#: ../src/core/sipe-media.c:870 ../src/core/sipe-media.c:1905 msgid "Encryption settings of peer are incompatible with ours." msgstr "" -#: ../src/core/sipe-media.c:929 +#: ../src/core/sipe-media.c:963 #, c-format msgid "User %s rejected call" msgstr "" -#: ../src/core/sipe-media.c:930 +#: ../src/core/sipe-media.c:964 msgid "Call rejected" msgstr "" -#: ../src/core/sipe-media.c:1196 ../src/core/sipe-media.c:1285 +#: ../src/core/sipe-media.c:1329 ../src/core/sipe-media.c:1418 msgid "Error creating audio stream" msgstr "" -#: ../src/core/sipe-media.c:1207 +#: ../src/core/sipe-media.c:1340 msgid "Error creating video stream" msgstr "" -#: ../src/core/sipe-media.c:1251 ../src/purple/purple-chat.c:314 +#: ../src/core/sipe-media.c:1384 ../src/purple/purple-chat.c:329 msgid "Join conference call" msgstr "" -#: ../src/core/sipe-media.c:1252 +#: ../src/core/sipe-media.c:1385 msgid "Conference calls are not supported on this server." msgstr "" -#: ../src/core/sipe-media.c:1348 +#: ../src/core/sipe-media.c:1484 msgid "Invalid phone number" msgstr "" -#: ../src/core/sipe-media.c:1358 +#: ../src/core/sipe-media.c:1494 msgid "Audio Test Service is not available." msgstr "" -#: ../src/core/sipe-media.c:1690 +#: ../src/core/sipe-media.c:1873 msgid "User unavailable" msgstr "" -#: ../src/core/sipe-media.c:1693 +#: ../src/core/sipe-media.c:1876 #, c-format msgid "%s does not want to be disturbed" msgstr "" -#: ../src/core/sipe-media.c:1695 +#: ../src/core/sipe-media.c:1878 #, c-format msgid "User %s is not available" msgstr "" -#: ../src/core/sipe-media.c:1704 +#: ../src/core/sipe-media.c:1887 msgid "Unsupported media type" msgstr "" -#: ../src/core/sipe-media.c:2062 +#: ../src/core/sipe-media.c:2246 msgid "Media error" msgstr "" -#: ../src/core/sipe-media.c:2063 +#: ../src/core/sipe-media.c:2247 msgid "Error while reading from stream" msgstr "" @@ -655,36 +672,36 @@ msgstr "" #. Translators: remove (clear) previously assigned access level -#: ../src/core/sipe-ocs2007.c:2571 +#: ../src/core/sipe-ocs2007.c:2570 msgid "Unspecify" msgstr "" -#: ../src/core/sipe-ocs2007.c:2590 +#: ../src/core/sipe-ocs2007.c:2589 msgid "People in my company" msgstr "" -#: ../src/core/sipe-ocs2007.c:2600 +#: ../src/core/sipe-ocs2007.c:2599 msgid "People in domains connected with my company" msgstr "" -#: ../src/core/sipe-ocs2007.c:2609 +#: ../src/core/sipe-ocs2007.c:2608 msgid "People in public domains" msgstr "" -#: ../src/core/sipe-ocs2007.c:2619 +#: ../src/core/sipe-ocs2007.c:2618 #, c-format msgid "People at %s" msgstr "" -#: ../src/core/sipe-ocs2007.c:2644 +#: ../src/core/sipe-ocs2007.c:2643 msgid "Add new domain..." msgstr "" -#: ../src/core/sipe-ocs2007.c:2673 +#: ../src/core/sipe-ocs2007.c:2672 msgid "Online help..." msgstr "" -#: ../src/core/sipe-ocs2007.c:2681 +#: ../src/core/sipe-ocs2007.c:2680 msgid "Access groups" msgstr "" @@ -696,49 +713,60 @@ #. SIPE_ACTIVITY_AVAILABLE #. SIPE_ACTIVITY_ONLINE #. SIPE_ACTIVITY_INACTIVE -#: ../src/core/sipe-status.c:58 +#: ../src/core/sipe-status.c:56 msgid "Inactive" msgstr "Inaktiivinen" #. SIPE_ACTIVITY_BUSYIDLE -#: ../src/core/sipe-status.c:60 +#: ../src/core/sipe-status.c:58 msgid "Busy-Idle" msgstr "" #. SIPE_ACTIVITY_DND #. SIPE_ACTIVITY_BRB -#: ../src/core/sipe-status.c:62 +#: ../src/core/sipe-status.c:60 msgid "Be right back" msgstr "Kohta takaisin" #. SIPE_ACTIVITY_AWAY #. SIPE_ACTIVITY_LUNCH -#: ../src/core/sipe-status.c:64 +#: ../src/core/sipe-status.c:62 msgid "Out to lunch" msgstr "" #. SIPE_ACTIVITY_INVISIBLE #. SIPE_ACTIVITY_OFFLINE #. SIPE_ACTIVITY_ON_PHONE -#: ../src/core/sipe-status.c:67 +#: ../src/core/sipe-status.c:65 msgid "In a call" msgstr "" #. SIPE_ACTIVITY_IN_CONF -#: ../src/core/sipe-status.c:68 +#: ../src/core/sipe-status.c:66 msgid "In a conference" msgstr "" #. SIPE_ACTIVITY_IN_MEETING -#: ../src/core/sipe-status.c:69 +#: ../src/core/sipe-status.c:67 msgid "In a meeting" msgstr "" #. SIPE_ACTIVITY_URGENT_ONLY -#: ../src/core/sipe-status.c:71 +#: ../src/core/sipe-status.c:69 msgid "Urgent interruptions only" msgstr "" +#: ../src/core/sipe-subscriptions.c:189 +msgid "Presence subscription failed!" +msgstr "" + +#: ../src/core/sipe-subscriptions.c:190 +msgid "" +"One or more buddies will therefore permanently show as offline.\n" +"\n" +"Please check that there are no corrupted SIP URIs in your contacts list." +msgstr "" + #: ../src/core/sipe-ucs.c:674 msgid "UCS initialization failed!" msgstr "" @@ -891,15 +919,19 @@ msgid "Copy to" msgstr "" -#: ../src/purple/purple-chat.c:295 +#: ../src/purple/purple-chat.c:310 msgid "Lock" msgstr "Lukitse" -#: ../src/purple/purple-chat.c:300 +#: ../src/purple/purple-chat.c:315 msgid "Unlock" msgstr "Aukaista" -#: ../src/purple/purple-chat.c:321 +#: ../src/purple/purple-chat.c:338 +msgid "Show presentation" +msgstr "" + +#: ../src/purple/purple-chat.c:345 msgid "Meeting entry info" msgstr "" @@ -1151,26 +1183,30 @@ msgstr "" #: ../src/purple/purple-plugin-common.c:933 +msgid "Remote desktop client" +msgstr "" + +#: ../src/purple/purple-plugin-common.c:938 msgid "Media encryption" msgstr "" -#: ../src/purple/purple-plugin-common.c:934 +#: ../src/purple/purple-plugin-common.c:939 msgid "Obey server policy" msgstr "" -#: ../src/purple/purple-plugin-common.c:935 +#: ../src/purple/purple-plugin-common.c:940 msgid "Always" msgstr "" -#: ../src/purple/purple-plugin-common.c:936 +#: ../src/purple/purple-plugin-common.c:941 msgid "Optional" msgstr "" -#: ../src/purple/purple-plugin-common.c:937 +#: ../src/purple/purple-plugin-common.c:942 msgid "Disabled" msgstr "" -#: ../src/purple/purple-plugin-common.c:947 +#: ../src/purple/purple-plugin-common.c:952 msgid "" "Login\n" " user or DOMAIN\\user or\n" @@ -1219,27 +1255,27 @@ msgid "_Search" msgstr "_Etsi" -#: ../src/purple/purple-transport.c:132 +#: ../src/purple/purple-transport.c:135 msgid "Read error" msgstr "" -#: ../src/purple/purple-transport.c:136 -#: ../src/telepathy/telepathy-transport.c:96 +#: ../src/purple/purple-transport.c:139 +#: ../src/telepathy/telepathy-transport.c:95 msgid "Server has disconnected" msgstr "" -#: ../src/purple/purple-transport.c:198 +#: ../src/purple/purple-transport.c:201 msgid "Could not connect" msgstr "Ei voitu yhdistää" -#: ../src/purple/purple-transport.c:268 +#: ../src/purple/purple-transport.c:271 msgid "Could not create SSL context" msgstr "" -#: ../src/purple/purple-transport.c:290 +#: ../src/purple/purple-transport.c:293 msgid "Could not create socket" msgstr "Ei voitu luoda socket" -#: ../src/purple/purple-transport.c:381 +#: ../src/purple/purple-transport.c:417 msgid "Write error" msgstr "" diff -Nru pidgin-sipe-1.21.1/po/fr_CA.po pidgin-sipe-1.22.1/po/fr_CA.po --- pidgin-sipe-1.21.1/po/fr_CA.po 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/po/fr_CA.po 2017-06-11 15:41:22.000000000 +0000 @@ -10,7 +10,7 @@ "Project-Id-Version: pidgin sipe\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/sipe/bugs/\n" "POT-Creation-Date: 2010-11-30 23:36+0200\n" -"PO-Revision-Date: 2016-05-28 15:08+0000\n" +"PO-Revision-Date: 2017-01-23 17:47+0000\n" "Last-Translator: Stefan Becker \n" "Language-Team: French (Canada) (http://www.transifex.com/stefanb/pidgin-sipe/language/fr_CA/)\n" "MIME-Version: 1.0\n" @@ -19,213 +19,238 @@ "Language: fr_CA\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: ../src/core/sip-transport.c:235 +#: ../src/core/sip-transport.c:240 msgid "Failed to authenticate to server" msgstr "" -#: ../src/core/sip-transport.c:293 +#: ../src/core/sip-transport.c:298 #, c-format msgid "Can't request certificate from %s" msgstr "" -#: ../src/core/sip-transport.c:303 +#: ../src/core/sip-transport.c:308 msgid "No URI for certificate provisioning service provided" msgstr "" -#: ../src/core/sip-transport.c:1281 +#: ../src/core/sip-transport.c:1285 msgid "Authentication failed" msgstr "" -#: ../src/core/sip-transport.c:1338 +#: ../src/core/sip-transport.c:1342 msgid "Incompatible authentication scheme chosen" msgstr "" -#: ../src/core/sip-transport.c:1355 ../src/core/sipe-notify.c:1149 +#: ../src/core/sip-transport.c:1359 ../src/core/sipe-notify.c:1149 #, c-format msgid "You have been rejected by the server: %s" msgstr "" -#: ../src/core/sip-transport.c:1356 ../src/core/sip-transport.c:1372 -#: ../src/core/sip-transport.c:1396 ../src/core/sip-transport.c:1420 +#: ../src/core/sip-transport.c:1360 ../src/core/sip-transport.c:1376 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 #: ../src/core/sipe-conf.c:265 ../src/core/sipe-notify.c:1149 msgid "no reason given" msgstr "" -#: ../src/core/sip-transport.c:1371 +#: ../src/core/sip-transport.c:1375 #, c-format msgid "Not found: %s. Please contact your Administrator" msgstr "" -#: ../src/core/sip-transport.c:1373 +#: ../src/core/sip-transport.c:1377 msgid "SIP is either not enabled for the destination URI or it does not exist" msgstr "" -#: ../src/core/sip-transport.c:1396 ../src/core/sip-transport.c:1420 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 #, c-format msgid "Service unavailable: %s" msgstr "" -#: ../src/core/sip-transport.c:1766 +#: ../src/core/sip-transport.c:1775 msgid "Corrupted message received" msgstr "" -#: ../src/core/sip-transport.c:1790 +#: ../src/core/sip-transport.c:1799 msgid "Invalid message signature received" msgstr "" -#: ../src/core/sipe-buddy.c:540 ../src/core/sipe-buddy.c:2300 +#: ../src/core/sipe-appshare.c:458 +#, c-format +msgid "%s wants to start presenting" +msgstr "" + +#: ../src/core/sipe-appshare.c:462 ../src/core/sipe-conf.c:1086 +msgid "Accept" +msgstr "" + +#: ../src/core/sipe-appshare.c:463 ../src/core/sipe-conf.c:1087 +msgid "Decline" +msgstr "" + +#: ../src/core/sipe-appshare.c:501 ../src/core/sipe-appshare.c:599 +msgid "Application sharing error" +msgstr "" + +#: ../src/core/sipe-appshare.c:502 +msgid "Unknown remote desktop client configured." +msgstr "" + +#: ../src/core/sipe-appshare.c:600 +msgid "Couldn't connect application sharing" +msgstr "" + +#: ../src/core/sipe-buddy.c:541 ../src/core/sipe-buddy.c:2301 msgid "Mobile" msgstr "" -#: ../src/core/sipe-buddy.c:828 +#: ../src/core/sipe-buddy.c:829 msgid "Status" msgstr "" -#: ../src/core/sipe-buddy.c:831 +#: ../src/core/sipe-buddy.c:832 msgid "Calendar" msgstr "" -#: ../src/core/sipe-buddy.c:836 +#: ../src/core/sipe-buddy.c:837 msgid "Meeting in" msgstr "" -#: ../src/core/sipe-buddy.c:840 +#: ../src/core/sipe-buddy.c:841 msgid "Meeting about" msgstr "" -#: ../src/core/sipe-buddy.c:845 +#: ../src/core/sipe-buddy.c:846 msgid "Out of office note" msgstr "" -#: ../src/core/sipe-buddy.c:845 +#: ../src/core/sipe-buddy.c:846 msgid "Note" msgstr "" -#: ../src/core/sipe-buddy.c:850 ../src/core/sipe-buddy.c:2345 +#: ../src/core/sipe-buddy.c:851 ../src/core/sipe-buddy.c:2346 #: ../src/purple/purple-buddy.c:633 msgid "Access level" msgstr "" -#: ../src/core/sipe-buddy.c:1073 +#: ../src/core/sipe-buddy.c:1074 #, c-format msgid "Found %d contact%s:" msgid_plural "Found %d contacts%s:" msgstr[0] "" msgstr[1] "" -#: ../src/core/sipe-buddy.c:1075 +#: ../src/core/sipe-buddy.c:1076 msgid " (more matched your query)" msgstr "" -#: ../src/core/sipe-buddy.c:1121 ../src/core/sipe-buddy.c:1259 +#: ../src/core/sipe-buddy.c:1122 ../src/core/sipe-buddy.c:1260 #: ../src/core/sipe-ucs.c:314 msgid "No contacts found" msgstr "" -#: ../src/core/sipe-buddy.c:1134 ../src/core/sipe-buddy.c:1272 +#: ../src/core/sipe-buddy.c:1135 ../src/core/sipe-buddy.c:1273 #: ../src/core/sipe-ucs.c:278 msgid "Unable to display the search results" msgstr "" -#: ../src/core/sipe-buddy.c:1237 ../src/core/sipe-buddy.c:1249 +#: ../src/core/sipe-buddy.c:1238 ../src/core/sipe-buddy.c:1250 #: ../src/core/sipe-ucs.c:391 msgid "Contact search failed" msgstr "" -#: ../src/core/sipe-buddy.c:1412 ../src/core/sipe-ucs.c:395 +#: ../src/core/sipe-buddy.c:1413 ../src/core/sipe-ucs.c:395 msgid "Invalid contact search query" msgstr "" -#: ../src/core/sipe-buddy.c:2237 +#: ../src/core/sipe-buddy.c:2238 #, c-format msgid "Make leader of '%s'" msgstr "" -#: ../src/core/sipe-buddy.c:2250 +#: ../src/core/sipe-buddy.c:2251 #, c-format msgid "Remove from '%s'" msgstr "" -#: ../src/core/sipe-buddy.c:2264 +#: ../src/core/sipe-buddy.c:2265 #, c-format msgid "Invite to '%s'" msgstr "" -#: ../src/core/sipe-buddy.c:2280 +#: ../src/core/sipe-buddy.c:2281 msgid "New chat" msgstr "" -#: ../src/core/sipe-buddy.c:2293 +#: ../src/core/sipe-buddy.c:2294 msgid "Work" msgstr "" -#: ../src/core/sipe-buddy.c:2308 +#: ../src/core/sipe-buddy.c:2309 msgid "Home" msgstr "" -#: ../src/core/sipe-buddy.c:2316 +#: ../src/core/sipe-buddy.c:2317 msgid "Other" msgstr "" -#: ../src/core/sipe-buddy.c:2324 +#: ../src/core/sipe-buddy.c:2325 msgid "Custom1" msgstr "" -#: ../src/core/sipe-buddy.c:2334 +#: ../src/core/sipe-buddy.c:2335 msgid "Send email..." msgstr "" -#: ../src/core/sipe-cal.c:907 +#: ../src/core/sipe-cal.c:906 msgid "Free" msgstr "" -#: ../src/core/sipe-cal.c:908 +#: ../src/core/sipe-cal.c:907 msgid "Tentative" msgstr "" #. SIPE_ACTIVITY_BUSY -#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:59 +#: ../src/core/sipe-cal.c:908 ../src/core/sipe-status.c:57 msgid "Busy" msgstr "" #. SIPE_ACTIVITY_OOF -#: ../src/core/sipe-cal.c:910 ../src/core/sipe-status.c:70 +#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:68 msgid "Out of office" msgstr "" -#: ../src/core/sipe-cal.c:911 +#: ../src/core/sipe-cal.c:910 msgid "No data" msgstr "" -#: ../src/core/sipe-cal.c:1019 ../src/core/sipe-cal.c:1046 +#: ../src/core/sipe-cal.c:1018 ../src/core/sipe-cal.c:1045 #, c-format msgid "Currently %s" msgstr "" -#: ../src/core/sipe-cal.c:1025 +#: ../src/core/sipe-cal.c:1024 msgid "Outside of working hours for next 8 hours" msgstr "" -#: ../src/core/sipe-cal.c:1027 +#: ../src/core/sipe-cal.c:1026 #, c-format msgid "%s for next 8 hours" msgstr "" -#: ../src/core/sipe-cal.c:1036 +#: ../src/core/sipe-cal.c:1035 msgid "Not working" msgstr "" -#: ../src/core/sipe-cal.c:1040 +#: ../src/core/sipe-cal.c:1039 #, c-format msgid "%s until %.2d:%.2d" msgstr "" -#: ../src/core/sipe-cal.c:1048 +#: ../src/core/sipe-cal.c:1047 #, c-format msgid "%s. Outside of working hours at %.2d:%.2d" msgstr "" -#: ../src/core/sipe-cal.c:1053 +#: ../src/core/sipe-cal.c:1052 #, c-format msgid "%s. %s at %.2d:%.2d" msgstr "" @@ -241,7 +266,7 @@ msgstr "" #. Generate next ID -#: ../src/core/sipe-chat.c:240 +#: ../src/core/sipe-chat.c:246 #, c-format msgid "Chat #%d" msgstr "" @@ -268,123 +293,115 @@ msgid "Incomplete conference information provided" msgstr "" -#: ../src/core/sipe-conf.c:1041 +#: ../src/core/sipe-conf.c:1106 msgid "" "\n" "\n" "As this client was not compiled with voice call support, if you accept, you will be able to contact the other participants only via IM session." msgstr "" -#: ../src/core/sipe-conf.c:1049 +#: ../src/core/sipe-conf.c:1111 #, c-format -msgid "%s wants to invite you to the conference call%s" +msgid "wants to invite you to a conference call%s" msgstr "" -#: ../src/core/sipe-conf.c:1063 -msgid "Accept" -msgstr "" - -#: ../src/core/sipe-conf.c:1064 -msgid "Decline" -msgstr "" - -#: ../src/core/sipe-conf.c:1345 +#: ../src/core/sipe-conf.c:1459 msgid "" "This conference is no longer locked. Additional participants can now join." msgstr "" -#: ../src/core/sipe-conf.c:1349 +#: ../src/core/sipe-conf.c:1463 msgid "" "This conference is locked. Nobody else can join the conference while it is " "locked." msgstr "" -#: ../src/core/sipe-conf.c:1382 +#: ../src/core/sipe-conf.c:1496 msgid "You have been disconnected from this conference." msgstr "" -#: ../src/core/sipe-conf.c:1542 +#: ../src/core/sipe-conf.c:1656 msgid "Dial-in info" msgstr "" -#: ../src/core/sipe-conf.c:1543 +#: ../src/core/sipe-conf.c:1657 msgid "Number" msgstr "" -#: ../src/core/sipe-conf.c:1545 +#: ../src/core/sipe-conf.c:1659 msgid "Conference ID" msgstr "" -#: ../src/core/sipe-conf.c:1547 +#: ../src/core/sipe-conf.c:1661 msgid "Meeting link" msgstr "" -#: ../src/core/sipe-conf.c:1549 +#: ../src/core/sipe-conf.c:1663 msgid "Organizer" msgstr "" -#: ../src/core/sipe-conf.c:1551 +#: ../src/core/sipe-conf.c:1665 msgid "Alternative dial-in numbers" msgstr "" #. The next 13 texts make up the SIPE about note text #. About note, part 1/13: introduction -#: ../src/core/sipe-core.c:220 +#: ../src/core/sipe-core.c:221 msgid "" "A third-party plugin implementing extended version of SIP/SIMPLE used by " "various products" msgstr "" #. About note, part 2/13: home page URL (label) -#: ../src/core/sipe-core.c:222 +#: ../src/core/sipe-core.c:223 msgid "Home Page" msgstr "" #. About note, part 3/13: support forum URL (label) -#: ../src/core/sipe-core.c:224 +#: ../src/core/sipe-core.c:225 msgid "Support" msgstr "" #. About note, part 4/13: support forum name (hyperlink text) -#: ../src/core/sipe-core.c:226 +#: ../src/core/sipe-core.c:227 msgid "Help Forum" msgstr "" #. About note, part 5/13: bug tracker URL (label) -#: ../src/core/sipe-core.c:228 +#: ../src/core/sipe-core.c:229 msgid "Report Problems" msgstr "" #. About note, part 6/13: bug tracker URL (hyperlink text) -#: ../src/core/sipe-core.c:230 +#: ../src/core/sipe-core.c:231 msgid "Bug Tracker" msgstr "" #. About note, part 7/13: translation service URL (label) -#: ../src/core/sipe-core.c:232 +#: ../src/core/sipe-core.c:233 msgid "Translations" msgstr "" #. About note, part 8/13: license type (label) -#: ../src/core/sipe-core.c:234 +#: ../src/core/sipe-core.c:235 msgid "License" msgstr "" #. About note, part 9/13: (REMOVED) #. About note, part 10/13: translation request, text before Transifex.com URL #. append a space if text is not empty -#: ../src/core/sipe-core.c:238 +#: ../src/core/sipe-core.c:239 msgid "Please help us to translate SIPE to your native language here at " msgstr "" #. About note, part 11/13: translation request, text after Transifex.com URL #. start with a space if text is not empty -#: ../src/core/sipe-core.c:241 +#: ../src/core/sipe-core.c:242 msgid " using convenient web interface" msgstr "" #. About note, part 12/13: author list (header) -#: ../src/core/sipe-core.c:243 +#: ../src/core/sipe-core.c:244 msgid "Authors" msgstr "" @@ -392,15 +409,15 @@ #. PLEASE NOTE: do *NOT* simply translate the english original #. but write something similar to the following sentence: #. "Localization for (): " -#: ../src/core/sipe-core.c:248 +#: ../src/core/sipe-core.c:249 msgid "Original texts in English (en): SIPE developers" msgstr "" -#: ../src/core/sipe-core.c:269 +#: ../src/core/sipe-core.c:273 msgid "SIP Exchange user name contains invalid characters" msgstr "" -#: ../src/core/sipe-core.c:277 ../src/purple/purple-buddy.c:485 +#: ../src/core/sipe-core.c:281 ../src/purple/purple-buddy.c:485 #: ../src/telepathy/telepathy-protocol.c:89 #: ../src/telepathy/telepathy-protocol.c:191 #, c-format @@ -409,21 +426,21 @@ "Example: user@company.com" msgstr "" -#: ../src/core/sipe-core.c:284 +#: ../src/core/sipe-core.c:288 msgid "Password is required when Single Sign-On is not enabled" msgstr "" -#: ../src/core/sipe-core.c:294 +#: ../src/core/sipe-core.c:298 msgid "" "Email address should be valid if provided\n" "Example: user@company.com" msgstr "" -#: ../src/core/sipe-core.c:303 +#: ../src/core/sipe-core.c:307 msgid "SIP Exchange user name contains whitespace" msgstr "" -#: ../src/core/sipe-core.c:317 +#: ../src/core/sipe-core.c:321 msgid "" "Email services URL should be valid if provided\n" "Example: https://exchange.corp.com/EWS/Exchange.asmx\n" @@ -454,13 +471,13 @@ msgid "Could not create listen socket" msgstr "" -#: ../src/core/sipe-ft-lync.c:757 ../src/core/sipe-media.c:1195 -#: ../src/core/sipe-media.c:1206 ../src/core/sipe-media.c:1284 -#: ../src/core/sipe-media.c:1740 +#: ../src/core/sipe-ft-lync.c:762 ../src/core/sipe-media.c:1328 +#: ../src/core/sipe-media.c:1339 ../src/core/sipe-media.c:1417 +#: ../src/core/sipe-media.c:1923 msgid "Error occurred" msgstr "" -#: ../src/core/sipe-ft-lync.c:758 +#: ../src/core/sipe-ft-lync.c:763 msgid "Error creating data stream" msgstr "" @@ -495,7 +512,7 @@ msgstr "" #: ../src/core/sipe-group.c:168 ../src/core/sipe-notify.c:1163 -#: ../src/core/sipe-notify.c:1190 ../src/core/sipe-notify.c:1294 +#: ../src/core/sipe-notify.c:1197 ../src/core/sipe-notify.c:1301 #: ../src/purple/purple-search.c:128 msgid "Other Contacts" msgstr "" @@ -533,77 +550,77 @@ msgid "Failed to invite %s" msgstr "" -#: ../src/core/sipe-incoming.c:741 +#: ../src/core/sipe-incoming.c:754 #, c-format msgid "Received a message with unrecognized contents from %s" msgstr "" -#: ../src/core/sipe-media.c:835 ../src/core/sipe-media.c:1347 -#: ../src/core/sipe-media.c:1357 ../src/core/sipe-media.c:1721 -#: ../src/core/sipe-media.c:1741 +#: ../src/core/sipe-media.c:869 ../src/core/sipe-media.c:1483 +#: ../src/core/sipe-media.c:1493 ../src/core/sipe-media.c:1904 +#: ../src/core/sipe-media.c:1924 msgid "Unable to establish a call" msgstr "" -#: ../src/core/sipe-media.c:836 ../src/core/sipe-media.c:1722 +#: ../src/core/sipe-media.c:870 ../src/core/sipe-media.c:1905 msgid "Encryption settings of peer are incompatible with ours." msgstr "" -#: ../src/core/sipe-media.c:929 +#: ../src/core/sipe-media.c:963 #, c-format msgid "User %s rejected call" msgstr "" -#: ../src/core/sipe-media.c:930 +#: ../src/core/sipe-media.c:964 msgid "Call rejected" msgstr "" -#: ../src/core/sipe-media.c:1196 ../src/core/sipe-media.c:1285 +#: ../src/core/sipe-media.c:1329 ../src/core/sipe-media.c:1418 msgid "Error creating audio stream" msgstr "" -#: ../src/core/sipe-media.c:1207 +#: ../src/core/sipe-media.c:1340 msgid "Error creating video stream" msgstr "" -#: ../src/core/sipe-media.c:1251 ../src/purple/purple-chat.c:314 +#: ../src/core/sipe-media.c:1384 ../src/purple/purple-chat.c:329 msgid "Join conference call" msgstr "" -#: ../src/core/sipe-media.c:1252 +#: ../src/core/sipe-media.c:1385 msgid "Conference calls are not supported on this server." msgstr "" -#: ../src/core/sipe-media.c:1348 +#: ../src/core/sipe-media.c:1484 msgid "Invalid phone number" msgstr "" -#: ../src/core/sipe-media.c:1358 +#: ../src/core/sipe-media.c:1494 msgid "Audio Test Service is not available." msgstr "" -#: ../src/core/sipe-media.c:1690 +#: ../src/core/sipe-media.c:1873 msgid "User unavailable" msgstr "" -#: ../src/core/sipe-media.c:1693 +#: ../src/core/sipe-media.c:1876 #, c-format msgid "%s does not want to be disturbed" msgstr "" -#: ../src/core/sipe-media.c:1695 +#: ../src/core/sipe-media.c:1878 #, c-format msgid "User %s is not available" msgstr "" -#: ../src/core/sipe-media.c:1704 +#: ../src/core/sipe-media.c:1887 msgid "Unsupported media type" msgstr "" -#: ../src/core/sipe-media.c:2062 +#: ../src/core/sipe-media.c:2246 msgid "Media error" msgstr "" -#: ../src/core/sipe-media.c:2063 +#: ../src/core/sipe-media.c:2247 msgid "Error while reading from stream" msgstr "" @@ -654,36 +671,36 @@ msgstr "" #. Translators: remove (clear) previously assigned access level -#: ../src/core/sipe-ocs2007.c:2571 +#: ../src/core/sipe-ocs2007.c:2570 msgid "Unspecify" msgstr "" -#: ../src/core/sipe-ocs2007.c:2590 +#: ../src/core/sipe-ocs2007.c:2589 msgid "People in my company" msgstr "" -#: ../src/core/sipe-ocs2007.c:2600 +#: ../src/core/sipe-ocs2007.c:2599 msgid "People in domains connected with my company" msgstr "" -#: ../src/core/sipe-ocs2007.c:2609 +#: ../src/core/sipe-ocs2007.c:2608 msgid "People in public domains" msgstr "" -#: ../src/core/sipe-ocs2007.c:2619 +#: ../src/core/sipe-ocs2007.c:2618 #, c-format msgid "People at %s" msgstr "" -#: ../src/core/sipe-ocs2007.c:2644 +#: ../src/core/sipe-ocs2007.c:2643 msgid "Add new domain..." msgstr "" -#: ../src/core/sipe-ocs2007.c:2673 +#: ../src/core/sipe-ocs2007.c:2672 msgid "Online help..." msgstr "" -#: ../src/core/sipe-ocs2007.c:2681 +#: ../src/core/sipe-ocs2007.c:2680 msgid "Access groups" msgstr "" @@ -695,49 +712,60 @@ #. SIPE_ACTIVITY_AVAILABLE #. SIPE_ACTIVITY_ONLINE #. SIPE_ACTIVITY_INACTIVE -#: ../src/core/sipe-status.c:58 +#: ../src/core/sipe-status.c:56 msgid "Inactive" msgstr "" #. SIPE_ACTIVITY_BUSYIDLE -#: ../src/core/sipe-status.c:60 +#: ../src/core/sipe-status.c:58 msgid "Busy-Idle" msgstr "" #. SIPE_ACTIVITY_DND #. SIPE_ACTIVITY_BRB -#: ../src/core/sipe-status.c:62 +#: ../src/core/sipe-status.c:60 msgid "Be right back" msgstr "" #. SIPE_ACTIVITY_AWAY #. SIPE_ACTIVITY_LUNCH -#: ../src/core/sipe-status.c:64 +#: ../src/core/sipe-status.c:62 msgid "Out to lunch" msgstr "" #. SIPE_ACTIVITY_INVISIBLE #. SIPE_ACTIVITY_OFFLINE #. SIPE_ACTIVITY_ON_PHONE -#: ../src/core/sipe-status.c:67 +#: ../src/core/sipe-status.c:65 msgid "In a call" msgstr "" #. SIPE_ACTIVITY_IN_CONF -#: ../src/core/sipe-status.c:68 +#: ../src/core/sipe-status.c:66 msgid "In a conference" msgstr "" #. SIPE_ACTIVITY_IN_MEETING -#: ../src/core/sipe-status.c:69 +#: ../src/core/sipe-status.c:67 msgid "In a meeting" msgstr "" #. SIPE_ACTIVITY_URGENT_ONLY -#: ../src/core/sipe-status.c:71 +#: ../src/core/sipe-status.c:69 msgid "Urgent interruptions only" msgstr "" +#: ../src/core/sipe-subscriptions.c:189 +msgid "Presence subscription failed!" +msgstr "" + +#: ../src/core/sipe-subscriptions.c:190 +msgid "" +"One or more buddies will therefore permanently show as offline.\n" +"\n" +"Please check that there are no corrupted SIP URIs in your contacts list." +msgstr "" + #: ../src/core/sipe-ucs.c:674 msgid "UCS initialization failed!" msgstr "" @@ -890,15 +918,19 @@ msgid "Copy to" msgstr "" -#: ../src/purple/purple-chat.c:295 +#: ../src/purple/purple-chat.c:310 msgid "Lock" msgstr "" -#: ../src/purple/purple-chat.c:300 +#: ../src/purple/purple-chat.c:315 msgid "Unlock" msgstr "" -#: ../src/purple/purple-chat.c:321 +#: ../src/purple/purple-chat.c:338 +msgid "Show presentation" +msgstr "" + +#: ../src/purple/purple-chat.c:345 msgid "Meeting entry info" msgstr "" @@ -1150,26 +1182,30 @@ msgstr "" #: ../src/purple/purple-plugin-common.c:933 +msgid "Remote desktop client" +msgstr "" + +#: ../src/purple/purple-plugin-common.c:938 msgid "Media encryption" msgstr "" -#: ../src/purple/purple-plugin-common.c:934 +#: ../src/purple/purple-plugin-common.c:939 msgid "Obey server policy" msgstr "" -#: ../src/purple/purple-plugin-common.c:935 +#: ../src/purple/purple-plugin-common.c:940 msgid "Always" msgstr "" -#: ../src/purple/purple-plugin-common.c:936 +#: ../src/purple/purple-plugin-common.c:941 msgid "Optional" msgstr "" -#: ../src/purple/purple-plugin-common.c:937 +#: ../src/purple/purple-plugin-common.c:942 msgid "Disabled" msgstr "" -#: ../src/purple/purple-plugin-common.c:947 +#: ../src/purple/purple-plugin-common.c:952 msgid "" "Login\n" " user or DOMAIN\\user or\n" @@ -1218,27 +1254,27 @@ msgid "_Search" msgstr "" -#: ../src/purple/purple-transport.c:132 +#: ../src/purple/purple-transport.c:135 msgid "Read error" msgstr "" -#: ../src/purple/purple-transport.c:136 -#: ../src/telepathy/telepathy-transport.c:96 +#: ../src/purple/purple-transport.c:139 +#: ../src/telepathy/telepathy-transport.c:95 msgid "Server has disconnected" msgstr "" -#: ../src/purple/purple-transport.c:198 +#: ../src/purple/purple-transport.c:201 msgid "Could not connect" msgstr "" -#: ../src/purple/purple-transport.c:268 +#: ../src/purple/purple-transport.c:271 msgid "Could not create SSL context" msgstr "" -#: ../src/purple/purple-transport.c:290 +#: ../src/purple/purple-transport.c:293 msgid "Could not create socket" msgstr "" -#: ../src/purple/purple-transport.c:381 +#: ../src/purple/purple-transport.c:417 msgid "Write error" msgstr "" diff -Nru pidgin-sipe-1.21.1/po/fr.po pidgin-sipe-1.22.1/po/fr.po --- pidgin-sipe-1.21.1/po/fr.po 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/po/fr.po 2017-06-11 15:41:22.000000000 +0000 @@ -15,7 +15,7 @@ "Project-Id-Version: pidgin sipe\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/sipe/bugs/\n" "POT-Creation-Date: 2010-11-30 23:36+0200\n" -"PO-Revision-Date: 2016-05-28 15:08+0000\n" +"PO-Revision-Date: 2017-01-23 17:47+0000\n" "Last-Translator: Stefan Becker \n" "Language-Team: French (http://www.transifex.com/stefanb/pidgin-sipe/language/fr/)\n" "MIME-Version: 1.0\n" @@ -24,213 +24,238 @@ "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: ../src/core/sip-transport.c:235 +#: ../src/core/sip-transport.c:240 msgid "Failed to authenticate to server" msgstr "Échec de l'authentification sur le serveur" -#: ../src/core/sip-transport.c:293 +#: ../src/core/sip-transport.c:298 #, c-format msgid "Can't request certificate from %s" msgstr "Impossible de demander le certificat auprès de %s" -#: ../src/core/sip-transport.c:303 +#: ../src/core/sip-transport.c:308 msgid "No URI for certificate provisioning service provided" msgstr "Aucun URI fourni pour le service de certification" -#: ../src/core/sip-transport.c:1281 +#: ../src/core/sip-transport.c:1285 msgid "Authentication failed" msgstr "Échec de l'authentification" -#: ../src/core/sip-transport.c:1338 +#: ../src/core/sip-transport.c:1342 msgid "Incompatible authentication scheme chosen" msgstr "Le protocole d'authentification choisi est incompatible" -#: ../src/core/sip-transport.c:1355 ../src/core/sipe-notify.c:1149 +#: ../src/core/sip-transport.c:1359 ../src/core/sipe-notify.c:1149 #, c-format msgid "You have been rejected by the server: %s" msgstr "Vous avez été rejeté par le serveur : %s" -#: ../src/core/sip-transport.c:1356 ../src/core/sip-transport.c:1372 -#: ../src/core/sip-transport.c:1396 ../src/core/sip-transport.c:1420 +#: ../src/core/sip-transport.c:1360 ../src/core/sip-transport.c:1376 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 #: ../src/core/sipe-conf.c:265 ../src/core/sipe-notify.c:1149 msgid "no reason given" msgstr "pas de raison donnée" -#: ../src/core/sip-transport.c:1371 +#: ../src/core/sip-transport.c:1375 #, c-format msgid "Not found: %s. Please contact your Administrator" msgstr "%s introuvable. Merci de contacter l'Administrateur" -#: ../src/core/sip-transport.c:1373 +#: ../src/core/sip-transport.c:1377 msgid "SIP is either not enabled for the destination URI or it does not exist" msgstr "SIP n'est pas activé pour l'URI de destination ou bien l'URI n'existe pas." -#: ../src/core/sip-transport.c:1396 ../src/core/sip-transport.c:1420 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 #, c-format msgid "Service unavailable: %s" msgstr "Service indisponible : %s" -#: ../src/core/sip-transport.c:1766 +#: ../src/core/sip-transport.c:1775 msgid "Corrupted message received" msgstr "Message corrompu reçu" -#: ../src/core/sip-transport.c:1790 +#: ../src/core/sip-transport.c:1799 msgid "Invalid message signature received" msgstr "La signature de message reçue est invalide" -#: ../src/core/sipe-buddy.c:540 ../src/core/sipe-buddy.c:2300 +#: ../src/core/sipe-appshare.c:458 +#, c-format +msgid "%s wants to start presenting" +msgstr "" + +#: ../src/core/sipe-appshare.c:462 ../src/core/sipe-conf.c:1086 +msgid "Accept" +msgstr "Accepter" + +#: ../src/core/sipe-appshare.c:463 ../src/core/sipe-conf.c:1087 +msgid "Decline" +msgstr "Refuser" + +#: ../src/core/sipe-appshare.c:501 ../src/core/sipe-appshare.c:599 +msgid "Application sharing error" +msgstr "" + +#: ../src/core/sipe-appshare.c:502 +msgid "Unknown remote desktop client configured." +msgstr "" + +#: ../src/core/sipe-appshare.c:600 +msgid "Couldn't connect application sharing" +msgstr "" + +#: ../src/core/sipe-buddy.c:541 ../src/core/sipe-buddy.c:2301 msgid "Mobile" msgstr "Portable" -#: ../src/core/sipe-buddy.c:828 +#: ../src/core/sipe-buddy.c:829 msgid "Status" msgstr "État" -#: ../src/core/sipe-buddy.c:831 +#: ../src/core/sipe-buddy.c:832 msgid "Calendar" msgstr "Calendrier" -#: ../src/core/sipe-buddy.c:836 +#: ../src/core/sipe-buddy.c:837 msgid "Meeting in" msgstr "Réunion en cours" -#: ../src/core/sipe-buddy.c:840 +#: ../src/core/sipe-buddy.c:841 msgid "Meeting about" msgstr "Réunion au sujet de" -#: ../src/core/sipe-buddy.c:845 +#: ../src/core/sipe-buddy.c:846 msgid "Out of office note" msgstr "Message d'absent du bureau" -#: ../src/core/sipe-buddy.c:845 +#: ../src/core/sipe-buddy.c:846 msgid "Note" msgstr "Note" -#: ../src/core/sipe-buddy.c:850 ../src/core/sipe-buddy.c:2345 +#: ../src/core/sipe-buddy.c:851 ../src/core/sipe-buddy.c:2346 #: ../src/purple/purple-buddy.c:633 msgid "Access level" msgstr "Niveau d'accès" -#: ../src/core/sipe-buddy.c:1073 +#: ../src/core/sipe-buddy.c:1074 #, c-format msgid "Found %d contact%s:" msgid_plural "Found %d contacts%s:" msgstr[0] "%d contact%s trouvé :" msgstr[1] "%d contacts%s trouvés :" -#: ../src/core/sipe-buddy.c:1075 +#: ../src/core/sipe-buddy.c:1076 msgid " (more matched your query)" msgstr " (il y avait plus de résultats pour votre requête)" -#: ../src/core/sipe-buddy.c:1121 ../src/core/sipe-buddy.c:1259 +#: ../src/core/sipe-buddy.c:1122 ../src/core/sipe-buddy.c:1260 #: ../src/core/sipe-ucs.c:314 msgid "No contacts found" msgstr "Aucun contact trouvé" -#: ../src/core/sipe-buddy.c:1134 ../src/core/sipe-buddy.c:1272 +#: ../src/core/sipe-buddy.c:1135 ../src/core/sipe-buddy.c:1273 #: ../src/core/sipe-ucs.c:278 msgid "Unable to display the search results" msgstr "Impossible d'afficher les résultats de la recherche" -#: ../src/core/sipe-buddy.c:1237 ../src/core/sipe-buddy.c:1249 +#: ../src/core/sipe-buddy.c:1238 ../src/core/sipe-buddy.c:1250 #: ../src/core/sipe-ucs.c:391 msgid "Contact search failed" msgstr "Échec de la recherche de contact" -#: ../src/core/sipe-buddy.c:1412 ../src/core/sipe-ucs.c:395 +#: ../src/core/sipe-buddy.c:1413 ../src/core/sipe-ucs.c:395 msgid "Invalid contact search query" msgstr "Requête de recherche de contact invalide" -#: ../src/core/sipe-buddy.c:2237 +#: ../src/core/sipe-buddy.c:2238 #, c-format msgid "Make leader of '%s'" msgstr "Promouvoir à la tête de '%s'" -#: ../src/core/sipe-buddy.c:2250 +#: ../src/core/sipe-buddy.c:2251 #, c-format msgid "Remove from '%s'" msgstr "Supprimer de '%s'" -#: ../src/core/sipe-buddy.c:2264 +#: ../src/core/sipe-buddy.c:2265 #, c-format msgid "Invite to '%s'" msgstr "Inviter à '%s'" -#: ../src/core/sipe-buddy.c:2280 +#: ../src/core/sipe-buddy.c:2281 msgid "New chat" msgstr "Nouvelle discussion" -#: ../src/core/sipe-buddy.c:2293 +#: ../src/core/sipe-buddy.c:2294 msgid "Work" msgstr "Travail" -#: ../src/core/sipe-buddy.c:2308 +#: ../src/core/sipe-buddy.c:2309 msgid "Home" msgstr "Accueil" -#: ../src/core/sipe-buddy.c:2316 +#: ../src/core/sipe-buddy.c:2317 msgid "Other" msgstr "Autres" -#: ../src/core/sipe-buddy.c:2324 +#: ../src/core/sipe-buddy.c:2325 msgid "Custom1" msgstr "Personnalisé1" -#: ../src/core/sipe-buddy.c:2334 +#: ../src/core/sipe-buddy.c:2335 msgid "Send email..." msgstr "Envoyer un courriel…" -#: ../src/core/sipe-cal.c:907 +#: ../src/core/sipe-cal.c:906 msgid "Free" msgstr "Disponible" -#: ../src/core/sipe-cal.c:908 +#: ../src/core/sipe-cal.c:907 msgid "Tentative" msgstr "En réunion acceptée provisoirement" #. SIPE_ACTIVITY_BUSY -#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:59 +#: ../src/core/sipe-cal.c:908 ../src/core/sipe-status.c:57 msgid "Busy" msgstr "Occupé" #. SIPE_ACTIVITY_OOF -#: ../src/core/sipe-cal.c:910 ../src/core/sipe-status.c:70 +#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:68 msgid "Out of office" msgstr "Absent du bureau" -#: ../src/core/sipe-cal.c:911 +#: ../src/core/sipe-cal.c:910 msgid "No data" msgstr "Aucune donnée" -#: ../src/core/sipe-cal.c:1019 ../src/core/sipe-cal.c:1046 +#: ../src/core/sipe-cal.c:1018 ../src/core/sipe-cal.c:1045 #, c-format msgid "Currently %s" msgstr "Actuellement %s" -#: ../src/core/sipe-cal.c:1025 +#: ../src/core/sipe-cal.c:1024 msgid "Outside of working hours for next 8 hours" msgstr "En repos pour les 8 prochaines heures" -#: ../src/core/sipe-cal.c:1027 +#: ../src/core/sipe-cal.c:1026 #, c-format msgid "%s for next 8 hours" msgstr "%s pour les 8 prochaines heures" -#: ../src/core/sipe-cal.c:1036 +#: ../src/core/sipe-cal.c:1035 msgid "Not working" msgstr "En repos" -#: ../src/core/sipe-cal.c:1040 +#: ../src/core/sipe-cal.c:1039 #, c-format msgid "%s until %.2d:%.2d" msgstr "%s jusqu'à %.2d:%.2d" -#: ../src/core/sipe-cal.c:1048 +#: ../src/core/sipe-cal.c:1047 #, c-format msgid "%s. Outside of working hours at %.2d:%.2d" msgstr "%s. En repos à partir de %.2d:%.2d" -#: ../src/core/sipe-cal.c:1053 +#: ../src/core/sipe-cal.c:1052 #, c-format msgid "%s. %s at %.2d:%.2d" msgstr "%s. %s à %.2d:%.2d" @@ -246,7 +271,7 @@ msgstr "La demande de ticket web auprès de %s a échoué" #. Generate next ID -#: ../src/core/sipe-chat.c:240 +#: ../src/core/sipe-chat.c:246 #, c-format msgid "Chat #%d" msgstr "Chat #%d" @@ -273,123 +298,115 @@ msgid "Incomplete conference information provided" msgstr "Les informations fournies pour la conférence sont incomplètes" -#: ../src/core/sipe-conf.c:1041 +#: ../src/core/sipe-conf.c:1106 msgid "" "\n" "\n" "As this client was not compiled with voice call support, if you accept, you will be able to contact the other participants only via IM session." msgstr "\n\nPuisque ce client n'a pas été compilé avec la prise en charge des appels vocaux, si vous acceptez, vous pourrez seulement contacter les autres participants par chat." -#: ../src/core/sipe-conf.c:1049 +#: ../src/core/sipe-conf.c:1111 #, c-format -msgid "%s wants to invite you to the conference call%s" -msgstr "%s veut vous inviter à la conférence %s" - -#: ../src/core/sipe-conf.c:1063 -msgid "Accept" -msgstr "Accepter" - -#: ../src/core/sipe-conf.c:1064 -msgid "Decline" -msgstr "Refuser" +msgid "wants to invite you to a conference call%s" +msgstr "" -#: ../src/core/sipe-conf.c:1345 +#: ../src/core/sipe-conf.c:1459 msgid "" "This conference is no longer locked. Additional participants can now join." msgstr "Cette conférence n'est plus verrouillée. D'autres participants peuvent maintenant se joindre à celle-ci." -#: ../src/core/sipe-conf.c:1349 +#: ../src/core/sipe-conf.c:1463 msgid "" "This conference is locked. Nobody else can join the conference while it is " "locked." msgstr "Cette conférence est verrouillée. Personne d'autres ne peut participer à celle-ci tant qu'elle le sera." -#: ../src/core/sipe-conf.c:1382 +#: ../src/core/sipe-conf.c:1496 msgid "You have been disconnected from this conference." msgstr "Vous avez été déconnecté de cette conférence." -#: ../src/core/sipe-conf.c:1542 +#: ../src/core/sipe-conf.c:1656 msgid "Dial-in info" msgstr "Information de connexion" -#: ../src/core/sipe-conf.c:1543 +#: ../src/core/sipe-conf.c:1657 msgid "Number" msgstr "Numéro" -#: ../src/core/sipe-conf.c:1545 +#: ../src/core/sipe-conf.c:1659 msgid "Conference ID" msgstr "ID de la conférence" -#: ../src/core/sipe-conf.c:1547 +#: ../src/core/sipe-conf.c:1661 msgid "Meeting link" msgstr "Lien de la réunion" -#: ../src/core/sipe-conf.c:1549 +#: ../src/core/sipe-conf.c:1663 msgid "Organizer" msgstr "Organisateur" -#: ../src/core/sipe-conf.c:1551 +#: ../src/core/sipe-conf.c:1665 msgid "Alternative dial-in numbers" msgstr "Numéros alternatifs" #. The next 13 texts make up the SIPE about note text #. About note, part 1/13: introduction -#: ../src/core/sipe-core.c:220 +#: ../src/core/sipe-core.c:221 msgid "" "A third-party plugin implementing extended version of SIP/SIMPLE used by " "various products" msgstr "Une extension tierce qui implémente une version étendue de SIP / SIMPLE utilisée par divers produits." #. About note, part 2/13: home page URL (label) -#: ../src/core/sipe-core.c:222 +#: ../src/core/sipe-core.c:223 msgid "Home Page" msgstr "Page d'accueil" #. About note, part 3/13: support forum URL (label) -#: ../src/core/sipe-core.c:224 +#: ../src/core/sipe-core.c:225 msgid "Support" msgstr "Support" #. About note, part 4/13: support forum name (hyperlink text) -#: ../src/core/sipe-core.c:226 +#: ../src/core/sipe-core.c:227 msgid "Help Forum" msgstr "Forum d'aide" #. About note, part 5/13: bug tracker URL (label) -#: ../src/core/sipe-core.c:228 +#: ../src/core/sipe-core.c:229 msgid "Report Problems" msgstr "Signaler un problème" #. About note, part 6/13: bug tracker URL (hyperlink text) -#: ../src/core/sipe-core.c:230 +#: ../src/core/sipe-core.c:231 msgid "Bug Tracker" msgstr "Système de suivi des bogues" #. About note, part 7/13: translation service URL (label) -#: ../src/core/sipe-core.c:232 +#: ../src/core/sipe-core.c:233 msgid "Translations" msgstr "Traductions" #. About note, part 8/13: license type (label) -#: ../src/core/sipe-core.c:234 +#: ../src/core/sipe-core.c:235 msgid "License" msgstr "Licence" #. About note, part 9/13: (REMOVED) #. About note, part 10/13: translation request, text before Transifex.com URL #. append a space if text is not empty -#: ../src/core/sipe-core.c:238 +#: ../src/core/sipe-core.c:239 msgid "Please help us to translate SIPE to your native language here at " msgstr "Merci de nous aider à traduire SIPE dans votre langue maternelle ici " #. About note, part 11/13: translation request, text after Transifex.com URL #. start with a space if text is not empty -#: ../src/core/sipe-core.c:241 +#: ../src/core/sipe-core.c:242 msgid " using convenient web interface" msgstr " utilisation d'une interface web conviviale" #. About note, part 12/13: author list (header) -#: ../src/core/sipe-core.c:243 +#: ../src/core/sipe-core.c:244 msgid "Authors" msgstr "Auteurs" @@ -397,15 +414,15 @@ #. PLEASE NOTE: do *NOT* simply translate the english original #. but write something similar to the following sentence: #. "Localization for (): " -#: ../src/core/sipe-core.c:248 +#: ../src/core/sipe-core.c:249 msgid "Original texts in English (en): SIPE developers" msgstr "Textes originaux en Anglais (en) : développeurs SIPE" -#: ../src/core/sipe-core.c:269 +#: ../src/core/sipe-core.c:273 msgid "SIP Exchange user name contains invalid characters" msgstr "Le nom d'utilisateur SIP Exchange contient des caractères invalides" -#: ../src/core/sipe-core.c:277 ../src/purple/purple-buddy.c:485 +#: ../src/core/sipe-core.c:281 ../src/purple/purple-buddy.c:485 #: ../src/telepathy/telepathy-protocol.c:89 #: ../src/telepathy/telepathy-protocol.c:191 #, c-format @@ -414,21 +431,21 @@ "Example: user@company.com" msgstr "Le nom d'utilisateur doit être une URI SIP valide\nExemple : utilisateur@company.com" -#: ../src/core/sipe-core.c:284 +#: ../src/core/sipe-core.c:288 msgid "Password is required when Single Sign-On is not enabled" msgstr "Un mot de passe est requis lorsque l'authentification unique (SSO) n'est pas activée" -#: ../src/core/sipe-core.c:294 +#: ../src/core/sipe-core.c:298 msgid "" "Email address should be valid if provided\n" "Example: user@company.com" msgstr "Si l'adresse email est fournie, elle doit être valide\nExemple : utilisateur@company.com" -#: ../src/core/sipe-core.c:303 +#: ../src/core/sipe-core.c:307 msgid "SIP Exchange user name contains whitespace" msgstr "Les noms SIP Exchange ne peuvent contenir d'espace" -#: ../src/core/sipe-core.c:317 +#: ../src/core/sipe-core.c:321 msgid "" "Email services URL should be valid if provided\n" "Example: https://exchange.corp.com/EWS/Exchange.asmx\n" @@ -459,13 +476,13 @@ msgid "Could not create listen socket" msgstr "Impossible de créer le socket d'écoute" -#: ../src/core/sipe-ft-lync.c:757 ../src/core/sipe-media.c:1195 -#: ../src/core/sipe-media.c:1206 ../src/core/sipe-media.c:1284 -#: ../src/core/sipe-media.c:1740 +#: ../src/core/sipe-ft-lync.c:762 ../src/core/sipe-media.c:1328 +#: ../src/core/sipe-media.c:1339 ../src/core/sipe-media.c:1417 +#: ../src/core/sipe-media.c:1923 msgid "Error occurred" msgstr "Une erreur est survenue" -#: ../src/core/sipe-ft-lync.c:758 +#: ../src/core/sipe-ft-lync.c:763 msgid "Error creating data stream" msgstr "Erreur lors de la création du flux de données" @@ -500,7 +517,7 @@ msgstr "Plus de mémoire." #: ../src/core/sipe-group.c:168 ../src/core/sipe-notify.c:1163 -#: ../src/core/sipe-notify.c:1190 ../src/core/sipe-notify.c:1294 +#: ../src/core/sipe-notify.c:1197 ../src/core/sipe-notify.c:1301 #: ../src/purple/purple-search.c:128 msgid "Other Contacts" msgstr "Autres contacts" @@ -538,77 +555,77 @@ msgid "Failed to invite %s" msgstr "L'invitation de %s a échoué" -#: ../src/core/sipe-incoming.c:741 +#: ../src/core/sipe-incoming.c:754 #, c-format msgid "Received a message with unrecognized contents from %s" msgstr "Message reçu de %s avec un contenu non reconnaissable" -#: ../src/core/sipe-media.c:835 ../src/core/sipe-media.c:1347 -#: ../src/core/sipe-media.c:1357 ../src/core/sipe-media.c:1721 -#: ../src/core/sipe-media.c:1741 +#: ../src/core/sipe-media.c:869 ../src/core/sipe-media.c:1483 +#: ../src/core/sipe-media.c:1493 ../src/core/sipe-media.c:1904 +#: ../src/core/sipe-media.c:1924 msgid "Unable to establish a call" msgstr "Impossible d'établir un appel" -#: ../src/core/sipe-media.c:836 ../src/core/sipe-media.c:1722 +#: ../src/core/sipe-media.c:870 ../src/core/sipe-media.c:1905 msgid "Encryption settings of peer are incompatible with ours." msgstr "Les paramètres d'encodage du correspondant sont incompatibles avec les votres." -#: ../src/core/sipe-media.c:929 +#: ../src/core/sipe-media.c:963 #, c-format msgid "User %s rejected call" msgstr "L'utilisateur %s a rejeté l'appel" -#: ../src/core/sipe-media.c:930 +#: ../src/core/sipe-media.c:964 msgid "Call rejected" msgstr "Appel rejeté" -#: ../src/core/sipe-media.c:1196 ../src/core/sipe-media.c:1285 +#: ../src/core/sipe-media.c:1329 ../src/core/sipe-media.c:1418 msgid "Error creating audio stream" msgstr "Impossible de créer le flux audio" -#: ../src/core/sipe-media.c:1207 +#: ../src/core/sipe-media.c:1340 msgid "Error creating video stream" msgstr "Impossible de créer le flux vidéo" -#: ../src/core/sipe-media.c:1251 ../src/purple/purple-chat.c:314 +#: ../src/core/sipe-media.c:1384 ../src/purple/purple-chat.c:329 msgid "Join conference call" msgstr "Rejoindre l'appel en conférence" -#: ../src/core/sipe-media.c:1252 +#: ../src/core/sipe-media.c:1385 msgid "Conference calls are not supported on this server." msgstr "Les audio-conférences ne sont pas supportées sur ce serveur." -#: ../src/core/sipe-media.c:1348 +#: ../src/core/sipe-media.c:1484 msgid "Invalid phone number" msgstr "Numéro de téléphone invalide" -#: ../src/core/sipe-media.c:1358 +#: ../src/core/sipe-media.c:1494 msgid "Audio Test Service is not available." msgstr "Le service de test audio est indisponible." -#: ../src/core/sipe-media.c:1690 +#: ../src/core/sipe-media.c:1873 msgid "User unavailable" msgstr "Utilisateur indisponible" -#: ../src/core/sipe-media.c:1693 +#: ../src/core/sipe-media.c:1876 #, c-format msgid "%s does not want to be disturbed" msgstr "%s ne veut pas être dérangé" -#: ../src/core/sipe-media.c:1695 +#: ../src/core/sipe-media.c:1878 #, c-format msgid "User %s is not available" msgstr "L'utilisateur %s est indisponible" -#: ../src/core/sipe-media.c:1704 +#: ../src/core/sipe-media.c:1887 msgid "Unsupported media type" msgstr "Format non supporté" -#: ../src/core/sipe-media.c:2062 +#: ../src/core/sipe-media.c:2246 msgid "Media error" msgstr "Erreur du média" -#: ../src/core/sipe-media.c:2063 +#: ../src/core/sipe-media.c:2247 msgid "Error while reading from stream" msgstr "Erreur lors de la lecture des informations du flux" @@ -659,36 +676,36 @@ msgstr "Inconnu" #. Translators: remove (clear) previously assigned access level -#: ../src/core/sipe-ocs2007.c:2571 +#: ../src/core/sipe-ocs2007.c:2570 msgid "Unspecify" msgstr "Non spécifié" -#: ../src/core/sipe-ocs2007.c:2590 +#: ../src/core/sipe-ocs2007.c:2589 msgid "People in my company" msgstr "Personnes de ma société" -#: ../src/core/sipe-ocs2007.c:2600 +#: ../src/core/sipe-ocs2007.c:2599 msgid "People in domains connected with my company" msgstr "Personnes provenant de domaines connectés à mon entreprise" -#: ../src/core/sipe-ocs2007.c:2609 +#: ../src/core/sipe-ocs2007.c:2608 msgid "People in public domains" msgstr "Personnes de la fonction publique" -#: ../src/core/sipe-ocs2007.c:2619 +#: ../src/core/sipe-ocs2007.c:2618 #, c-format msgid "People at %s" msgstr "Personnes à %s" -#: ../src/core/sipe-ocs2007.c:2644 +#: ../src/core/sipe-ocs2007.c:2643 msgid "Add new domain..." msgstr "Ajouter un nouveau domaine..." -#: ../src/core/sipe-ocs2007.c:2673 +#: ../src/core/sipe-ocs2007.c:2672 msgid "Online help..." msgstr "Aide en ligne…" -#: ../src/core/sipe-ocs2007.c:2681 +#: ../src/core/sipe-ocs2007.c:2680 msgid "Access groups" msgstr "Groupes d'accès" @@ -700,49 +717,60 @@ #. SIPE_ACTIVITY_AVAILABLE #. SIPE_ACTIVITY_ONLINE #. SIPE_ACTIVITY_INACTIVE -#: ../src/core/sipe-status.c:58 +#: ../src/core/sipe-status.c:56 msgid "Inactive" msgstr "Inactif" #. SIPE_ACTIVITY_BUSYIDLE -#: ../src/core/sipe-status.c:60 +#: ../src/core/sipe-status.c:58 msgid "Busy-Idle" msgstr "Occupé-inactif" #. SIPE_ACTIVITY_DND #. SIPE_ACTIVITY_BRB -#: ../src/core/sipe-status.c:62 +#: ../src/core/sipe-status.c:60 msgid "Be right back" msgstr "Bientôt de retour" #. SIPE_ACTIVITY_AWAY #. SIPE_ACTIVITY_LUNCH -#: ../src/core/sipe-status.c:64 +#: ../src/core/sipe-status.c:62 msgid "Out to lunch" msgstr "Sorti manger" #. SIPE_ACTIVITY_INVISIBLE #. SIPE_ACTIVITY_OFFLINE #. SIPE_ACTIVITY_ON_PHONE -#: ../src/core/sipe-status.c:67 +#: ../src/core/sipe-status.c:65 msgid "In a call" msgstr "Au téléphone" #. SIPE_ACTIVITY_IN_CONF -#: ../src/core/sipe-status.c:68 +#: ../src/core/sipe-status.c:66 msgid "In a conference" msgstr "En conférence" #. SIPE_ACTIVITY_IN_MEETING -#: ../src/core/sipe-status.c:69 +#: ../src/core/sipe-status.c:67 msgid "In a meeting" msgstr "En réunion" #. SIPE_ACTIVITY_URGENT_ONLY -#: ../src/core/sipe-status.c:71 +#: ../src/core/sipe-status.c:69 msgid "Urgent interruptions only" msgstr "Urgences uniquement" +#: ../src/core/sipe-subscriptions.c:189 +msgid "Presence subscription failed!" +msgstr "" + +#: ../src/core/sipe-subscriptions.c:190 +msgid "" +"One or more buddies will therefore permanently show as offline.\n" +"\n" +"Please check that there are no corrupted SIP URIs in your contacts list." +msgstr "" + #: ../src/core/sipe-ucs.c:674 msgid "UCS initialization failed!" msgstr "L'initialisation UCS a échoué !" @@ -895,15 +923,19 @@ msgid "Copy to" msgstr "Copier vers" -#: ../src/purple/purple-chat.c:295 +#: ../src/purple/purple-chat.c:310 msgid "Lock" msgstr "Bloquer" -#: ../src/purple/purple-chat.c:300 +#: ../src/purple/purple-chat.c:315 msgid "Unlock" msgstr "Débloquer" -#: ../src/purple/purple-chat.c:321 +#: ../src/purple/purple-chat.c:338 +msgid "Show presentation" +msgstr "" + +#: ../src/purple/purple-chat.c:345 msgid "Meeting entry info" msgstr "Information d'entrée en réunion" @@ -1155,26 +1187,30 @@ msgstr "Proxy pour le chat en groupe\n entreprise.com or utilisateur@entreprise.com\n(laisser vide pour le déterminer à partir du nom d'utilisateur)" #: ../src/purple/purple-plugin-common.c:933 +msgid "Remote desktop client" +msgstr "" + +#: ../src/purple/purple-plugin-common.c:938 msgid "Media encryption" msgstr "Chiffrement du média" -#: ../src/purple/purple-plugin-common.c:934 +#: ../src/purple/purple-plugin-common.c:939 msgid "Obey server policy" msgstr "Respecte la politique du serveur" -#: ../src/purple/purple-plugin-common.c:935 +#: ../src/purple/purple-plugin-common.c:940 msgid "Always" msgstr "Toujours" -#: ../src/purple/purple-plugin-common.c:936 +#: ../src/purple/purple-plugin-common.c:941 msgid "Optional" msgstr "Optionnel" -#: ../src/purple/purple-plugin-common.c:937 +#: ../src/purple/purple-plugin-common.c:942 msgid "Disabled" msgstr "Désactivé" -#: ../src/purple/purple-plugin-common.c:947 +#: ../src/purple/purple-plugin-common.c:952 msgid "" "Login\n" " user or DOMAIN\\user or\n" @@ -1223,27 +1259,27 @@ msgid "_Search" msgstr "_Rechercher" -#: ../src/purple/purple-transport.c:132 +#: ../src/purple/purple-transport.c:135 msgid "Read error" msgstr "Erreur de lecture" -#: ../src/purple/purple-transport.c:136 -#: ../src/telepathy/telepathy-transport.c:96 +#: ../src/purple/purple-transport.c:139 +#: ../src/telepathy/telepathy-transport.c:95 msgid "Server has disconnected" msgstr "Le serveur s'est déconnecté" -#: ../src/purple/purple-transport.c:198 +#: ../src/purple/purple-transport.c:201 msgid "Could not connect" msgstr "Impossible de se connecter" -#: ../src/purple/purple-transport.c:268 +#: ../src/purple/purple-transport.c:271 msgid "Could not create SSL context" msgstr "Impossible de créer un contexte SSL" -#: ../src/purple/purple-transport.c:290 +#: ../src/purple/purple-transport.c:293 msgid "Could not create socket" msgstr "Impossible de créer le socket" -#: ../src/purple/purple-transport.c:381 +#: ../src/purple/purple-transport.c:417 msgid "Write error" msgstr "Erreur d'écriture" diff -Nru pidgin-sipe-1.21.1/po/hi.po pidgin-sipe-1.22.1/po/hi.po --- pidgin-sipe-1.21.1/po/hi.po 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/po/hi.po 2017-06-11 15:41:22.000000000 +0000 @@ -12,7 +12,7 @@ "Project-Id-Version: pidgin sipe\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/sipe/bugs/\n" "POT-Creation-Date: 2010-11-30 23:36+0200\n" -"PO-Revision-Date: 2016-05-28 15:08+0000\n" +"PO-Revision-Date: 2017-01-23 17:47+0000\n" "Last-Translator: Stefan Becker \n" "Language-Team: Hindi (http://www.transifex.com/stefanb/pidgin-sipe/language/hi/)\n" "MIME-Version: 1.0\n" @@ -21,213 +21,238 @@ "Language: hi\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../src/core/sip-transport.c:235 +#: ../src/core/sip-transport.c:240 msgid "Failed to authenticate to server" msgstr "सर्वर से प्रमाणीकरण करने मे विफल " -#: ../src/core/sip-transport.c:293 +#: ../src/core/sip-transport.c:298 #, c-format msgid "Can't request certificate from %s" msgstr "" -#: ../src/core/sip-transport.c:303 +#: ../src/core/sip-transport.c:308 msgid "No URI for certificate provisioning service provided" msgstr "" -#: ../src/core/sip-transport.c:1281 +#: ../src/core/sip-transport.c:1285 msgid "Authentication failed" msgstr "प्रमाणीकरण विफल " -#: ../src/core/sip-transport.c:1338 +#: ../src/core/sip-transport.c:1342 msgid "Incompatible authentication scheme chosen" msgstr "असंगत प्रमाणीकरण व्यवस्था चुना गया " -#: ../src/core/sip-transport.c:1355 ../src/core/sipe-notify.c:1149 +#: ../src/core/sip-transport.c:1359 ../src/core/sipe-notify.c:1149 #, c-format msgid "You have been rejected by the server: %s" msgstr "%s: आप सर्वर द्वारा अस्वीकार किये गए" -#: ../src/core/sip-transport.c:1356 ../src/core/sip-transport.c:1372 -#: ../src/core/sip-transport.c:1396 ../src/core/sip-transport.c:1420 +#: ../src/core/sip-transport.c:1360 ../src/core/sip-transport.c:1376 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 #: ../src/core/sipe-conf.c:265 ../src/core/sipe-notify.c:1149 msgid "no reason given" msgstr "कोई कारण नहीं दिया गया " -#: ../src/core/sip-transport.c:1371 +#: ../src/core/sip-transport.c:1375 #, c-format msgid "Not found: %s. Please contact your Administrator" msgstr "%s मौजूद नहीं। अपने व्यवस्थापक से संपर्क करें " -#: ../src/core/sip-transport.c:1373 +#: ../src/core/sip-transport.c:1377 msgid "SIP is either not enabled for the destination URI or it does not exist" msgstr "" -#: ../src/core/sip-transport.c:1396 ../src/core/sip-transport.c:1420 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 #, c-format msgid "Service unavailable: %s" msgstr "" -#: ../src/core/sip-transport.c:1766 +#: ../src/core/sip-transport.c:1775 msgid "Corrupted message received" msgstr "" -#: ../src/core/sip-transport.c:1790 +#: ../src/core/sip-transport.c:1799 msgid "Invalid message signature received" msgstr "अवैध संदेश हस्ताक्षर प्राप्त" -#: ../src/core/sipe-buddy.c:540 ../src/core/sipe-buddy.c:2300 +#: ../src/core/sipe-appshare.c:458 +#, c-format +msgid "%s wants to start presenting" +msgstr "" + +#: ../src/core/sipe-appshare.c:462 ../src/core/sipe-conf.c:1086 +msgid "Accept" +msgstr "" + +#: ../src/core/sipe-appshare.c:463 ../src/core/sipe-conf.c:1087 +msgid "Decline" +msgstr "" + +#: ../src/core/sipe-appshare.c:501 ../src/core/sipe-appshare.c:599 +msgid "Application sharing error" +msgstr "" + +#: ../src/core/sipe-appshare.c:502 +msgid "Unknown remote desktop client configured." +msgstr "" + +#: ../src/core/sipe-appshare.c:600 +msgid "Couldn't connect application sharing" +msgstr "" + +#: ../src/core/sipe-buddy.c:541 ../src/core/sipe-buddy.c:2301 msgid "Mobile" msgstr "" -#: ../src/core/sipe-buddy.c:828 +#: ../src/core/sipe-buddy.c:829 msgid "Status" msgstr "स्थिति " -#: ../src/core/sipe-buddy.c:831 +#: ../src/core/sipe-buddy.c:832 msgid "Calendar" msgstr "कैलेंडर " -#: ../src/core/sipe-buddy.c:836 +#: ../src/core/sipe-buddy.c:837 msgid "Meeting in" msgstr "" -#: ../src/core/sipe-buddy.c:840 +#: ../src/core/sipe-buddy.c:841 msgid "Meeting about" msgstr "" -#: ../src/core/sipe-buddy.c:845 +#: ../src/core/sipe-buddy.c:846 msgid "Out of office note" msgstr "" -#: ../src/core/sipe-buddy.c:845 +#: ../src/core/sipe-buddy.c:846 msgid "Note" msgstr "" -#: ../src/core/sipe-buddy.c:850 ../src/core/sipe-buddy.c:2345 +#: ../src/core/sipe-buddy.c:851 ../src/core/sipe-buddy.c:2346 #: ../src/purple/purple-buddy.c:633 msgid "Access level" msgstr "" -#: ../src/core/sipe-buddy.c:1073 +#: ../src/core/sipe-buddy.c:1074 #, c-format msgid "Found %d contact%s:" msgid_plural "Found %d contacts%s:" msgstr[0] "" msgstr[1] "" -#: ../src/core/sipe-buddy.c:1075 +#: ../src/core/sipe-buddy.c:1076 msgid " (more matched your query)" msgstr "" -#: ../src/core/sipe-buddy.c:1121 ../src/core/sipe-buddy.c:1259 +#: ../src/core/sipe-buddy.c:1122 ../src/core/sipe-buddy.c:1260 #: ../src/core/sipe-ucs.c:314 msgid "No contacts found" msgstr "" -#: ../src/core/sipe-buddy.c:1134 ../src/core/sipe-buddy.c:1272 +#: ../src/core/sipe-buddy.c:1135 ../src/core/sipe-buddy.c:1273 #: ../src/core/sipe-ucs.c:278 msgid "Unable to display the search results" msgstr "खोज परिणामों को प्रदर्शित करने में तकलीफ़ " -#: ../src/core/sipe-buddy.c:1237 ../src/core/sipe-buddy.c:1249 +#: ../src/core/sipe-buddy.c:1238 ../src/core/sipe-buddy.c:1250 #: ../src/core/sipe-ucs.c:391 msgid "Contact search failed" msgstr "" -#: ../src/core/sipe-buddy.c:1412 ../src/core/sipe-ucs.c:395 +#: ../src/core/sipe-buddy.c:1413 ../src/core/sipe-ucs.c:395 msgid "Invalid contact search query" msgstr "अवैध कांटेक्ट खोज क्वेरी " -#: ../src/core/sipe-buddy.c:2237 +#: ../src/core/sipe-buddy.c:2238 #, c-format msgid "Make leader of '%s'" msgstr "" -#: ../src/core/sipe-buddy.c:2250 +#: ../src/core/sipe-buddy.c:2251 #, c-format msgid "Remove from '%s'" msgstr "" -#: ../src/core/sipe-buddy.c:2264 +#: ../src/core/sipe-buddy.c:2265 #, c-format msgid "Invite to '%s'" msgstr "" -#: ../src/core/sipe-buddy.c:2280 +#: ../src/core/sipe-buddy.c:2281 msgid "New chat" msgstr "नया चैट " -#: ../src/core/sipe-buddy.c:2293 +#: ../src/core/sipe-buddy.c:2294 msgid "Work" msgstr "" -#: ../src/core/sipe-buddy.c:2308 +#: ../src/core/sipe-buddy.c:2309 msgid "Home" msgstr "होम " -#: ../src/core/sipe-buddy.c:2316 +#: ../src/core/sipe-buddy.c:2317 msgid "Other" msgstr "अन्य " -#: ../src/core/sipe-buddy.c:2324 +#: ../src/core/sipe-buddy.c:2325 msgid "Custom1" msgstr "" -#: ../src/core/sipe-buddy.c:2334 +#: ../src/core/sipe-buddy.c:2335 msgid "Send email..." msgstr "ईमेल भेजिए ... " -#: ../src/core/sipe-cal.c:907 +#: ../src/core/sipe-cal.c:906 msgid "Free" msgstr "" -#: ../src/core/sipe-cal.c:908 +#: ../src/core/sipe-cal.c:907 msgid "Tentative" msgstr "" #. SIPE_ACTIVITY_BUSY -#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:59 +#: ../src/core/sipe-cal.c:908 ../src/core/sipe-status.c:57 msgid "Busy" msgstr "व्यस्त " #. SIPE_ACTIVITY_OOF -#: ../src/core/sipe-cal.c:910 ../src/core/sipe-status.c:70 +#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:68 msgid "Out of office" msgstr "छुट्टी पे " -#: ../src/core/sipe-cal.c:911 +#: ../src/core/sipe-cal.c:910 msgid "No data" msgstr "" -#: ../src/core/sipe-cal.c:1019 ../src/core/sipe-cal.c:1046 +#: ../src/core/sipe-cal.c:1018 ../src/core/sipe-cal.c:1045 #, c-format msgid "Currently %s" msgstr "" -#: ../src/core/sipe-cal.c:1025 +#: ../src/core/sipe-cal.c:1024 msgid "Outside of working hours for next 8 hours" msgstr "" -#: ../src/core/sipe-cal.c:1027 +#: ../src/core/sipe-cal.c:1026 #, c-format msgid "%s for next 8 hours" msgstr "" -#: ../src/core/sipe-cal.c:1036 +#: ../src/core/sipe-cal.c:1035 msgid "Not working" msgstr "" -#: ../src/core/sipe-cal.c:1040 +#: ../src/core/sipe-cal.c:1039 #, c-format msgid "%s until %.2d:%.2d" msgstr "" -#: ../src/core/sipe-cal.c:1048 +#: ../src/core/sipe-cal.c:1047 #, c-format msgid "%s. Outside of working hours at %.2d:%.2d" msgstr "" -#: ../src/core/sipe-cal.c:1053 +#: ../src/core/sipe-cal.c:1052 #, c-format msgid "%s. %s at %.2d:%.2d" msgstr "" @@ -243,7 +268,7 @@ msgstr "" #. Generate next ID -#: ../src/core/sipe-chat.c:240 +#: ../src/core/sipe-chat.c:246 #, c-format msgid "Chat #%d" msgstr "" @@ -270,123 +295,115 @@ msgid "Incomplete conference information provided" msgstr "" -#: ../src/core/sipe-conf.c:1041 +#: ../src/core/sipe-conf.c:1106 msgid "" "\n" "\n" "As this client was not compiled with voice call support, if you accept, you will be able to contact the other participants only via IM session." msgstr "" -#: ../src/core/sipe-conf.c:1049 +#: ../src/core/sipe-conf.c:1111 #, c-format -msgid "%s wants to invite you to the conference call%s" +msgid "wants to invite you to a conference call%s" msgstr "" -#: ../src/core/sipe-conf.c:1063 -msgid "Accept" -msgstr "" - -#: ../src/core/sipe-conf.c:1064 -msgid "Decline" -msgstr "" - -#: ../src/core/sipe-conf.c:1345 +#: ../src/core/sipe-conf.c:1459 msgid "" "This conference is no longer locked. Additional participants can now join." msgstr "" -#: ../src/core/sipe-conf.c:1349 +#: ../src/core/sipe-conf.c:1463 msgid "" "This conference is locked. Nobody else can join the conference while it is " "locked." msgstr "" -#: ../src/core/sipe-conf.c:1382 +#: ../src/core/sipe-conf.c:1496 msgid "You have been disconnected from this conference." msgstr "" -#: ../src/core/sipe-conf.c:1542 +#: ../src/core/sipe-conf.c:1656 msgid "Dial-in info" msgstr "" -#: ../src/core/sipe-conf.c:1543 +#: ../src/core/sipe-conf.c:1657 msgid "Number" msgstr "" -#: ../src/core/sipe-conf.c:1545 +#: ../src/core/sipe-conf.c:1659 msgid "Conference ID" msgstr "" -#: ../src/core/sipe-conf.c:1547 +#: ../src/core/sipe-conf.c:1661 msgid "Meeting link" msgstr "" -#: ../src/core/sipe-conf.c:1549 +#: ../src/core/sipe-conf.c:1663 msgid "Organizer" msgstr "" -#: ../src/core/sipe-conf.c:1551 +#: ../src/core/sipe-conf.c:1665 msgid "Alternative dial-in numbers" msgstr "" #. The next 13 texts make up the SIPE about note text #. About note, part 1/13: introduction -#: ../src/core/sipe-core.c:220 +#: ../src/core/sipe-core.c:221 msgid "" "A third-party plugin implementing extended version of SIP/SIMPLE used by " "various products" msgstr "" #. About note, part 2/13: home page URL (label) -#: ../src/core/sipe-core.c:222 +#: ../src/core/sipe-core.c:223 msgid "Home Page" msgstr "होम पेज " #. About note, part 3/13: support forum URL (label) -#: ../src/core/sipe-core.c:224 +#: ../src/core/sipe-core.c:225 msgid "Support" msgstr "सपोर्ट " #. About note, part 4/13: support forum name (hyperlink text) -#: ../src/core/sipe-core.c:226 +#: ../src/core/sipe-core.c:227 msgid "Help Forum" msgstr "सहायता फोरम " #. About note, part 5/13: bug tracker URL (label) -#: ../src/core/sipe-core.c:228 +#: ../src/core/sipe-core.c:229 msgid "Report Problems" msgstr "समस्याए बतायें " #. About note, part 6/13: bug tracker URL (hyperlink text) -#: ../src/core/sipe-core.c:230 +#: ../src/core/sipe-core.c:231 msgid "Bug Tracker" msgstr "बग ट्रैकर " #. About note, part 7/13: translation service URL (label) -#: ../src/core/sipe-core.c:232 +#: ../src/core/sipe-core.c:233 msgid "Translations" msgstr "अनुवाद " #. About note, part 8/13: license type (label) -#: ../src/core/sipe-core.c:234 +#: ../src/core/sipe-core.c:235 msgid "License" msgstr "लाइसेंस " #. About note, part 9/13: (REMOVED) #. About note, part 10/13: translation request, text before Transifex.com URL #. append a space if text is not empty -#: ../src/core/sipe-core.c:238 +#: ../src/core/sipe-core.c:239 msgid "Please help us to translate SIPE to your native language here at " msgstr "SIPE को अपनी भाषा में अनुवाद करने में हमारी मदद करें - यहाँ पे " #. About note, part 11/13: translation request, text after Transifex.com URL #. start with a space if text is not empty -#: ../src/core/sipe-core.c:241 +#: ../src/core/sipe-core.c:242 msgid " using convenient web interface" msgstr "सुविधाजनक वेब इंटरफ़ेस का उपयोग करके " #. About note, part 12/13: author list (header) -#: ../src/core/sipe-core.c:243 +#: ../src/core/sipe-core.c:244 msgid "Authors" msgstr "ऑथर्स " @@ -394,15 +411,15 @@ #. PLEASE NOTE: do *NOT* simply translate the english original #. but write something similar to the following sentence: #. "Localization for (): " -#: ../src/core/sipe-core.c:248 +#: ../src/core/sipe-core.c:249 msgid "Original texts in English (en): SIPE developers" msgstr "" -#: ../src/core/sipe-core.c:269 +#: ../src/core/sipe-core.c:273 msgid "SIP Exchange user name contains invalid characters" msgstr "" -#: ../src/core/sipe-core.c:277 ../src/purple/purple-buddy.c:485 +#: ../src/core/sipe-core.c:281 ../src/purple/purple-buddy.c:485 #: ../src/telepathy/telepathy-protocol.c:89 #: ../src/telepathy/telepathy-protocol.c:191 #, c-format @@ -411,21 +428,21 @@ "Example: user@company.com" msgstr "" -#: ../src/core/sipe-core.c:284 +#: ../src/core/sipe-core.c:288 msgid "Password is required when Single Sign-On is not enabled" msgstr "" -#: ../src/core/sipe-core.c:294 +#: ../src/core/sipe-core.c:298 msgid "" "Email address should be valid if provided\n" "Example: user@company.com" msgstr "" -#: ../src/core/sipe-core.c:303 +#: ../src/core/sipe-core.c:307 msgid "SIP Exchange user name contains whitespace" msgstr "" -#: ../src/core/sipe-core.c:317 +#: ../src/core/sipe-core.c:321 msgid "" "Email services URL should be valid if provided\n" "Example: https://exchange.corp.com/EWS/Exchange.asmx\n" @@ -456,13 +473,13 @@ msgid "Could not create listen socket" msgstr "" -#: ../src/core/sipe-ft-lync.c:757 ../src/core/sipe-media.c:1195 -#: ../src/core/sipe-media.c:1206 ../src/core/sipe-media.c:1284 -#: ../src/core/sipe-media.c:1740 +#: ../src/core/sipe-ft-lync.c:762 ../src/core/sipe-media.c:1328 +#: ../src/core/sipe-media.c:1339 ../src/core/sipe-media.c:1417 +#: ../src/core/sipe-media.c:1923 msgid "Error occurred" msgstr "" -#: ../src/core/sipe-ft-lync.c:758 +#: ../src/core/sipe-ft-lync.c:763 msgid "Error creating data stream" msgstr "" @@ -497,7 +514,7 @@ msgstr "" #: ../src/core/sipe-group.c:168 ../src/core/sipe-notify.c:1163 -#: ../src/core/sipe-notify.c:1190 ../src/core/sipe-notify.c:1294 +#: ../src/core/sipe-notify.c:1197 ../src/core/sipe-notify.c:1301 #: ../src/purple/purple-search.c:128 msgid "Other Contacts" msgstr "अन्य कांटेक्ट " @@ -535,77 +552,77 @@ msgid "Failed to invite %s" msgstr "%s को आमंत्रित करने मे विफल " -#: ../src/core/sipe-incoming.c:741 +#: ../src/core/sipe-incoming.c:754 #, c-format msgid "Received a message with unrecognized contents from %s" msgstr "" -#: ../src/core/sipe-media.c:835 ../src/core/sipe-media.c:1347 -#: ../src/core/sipe-media.c:1357 ../src/core/sipe-media.c:1721 -#: ../src/core/sipe-media.c:1741 +#: ../src/core/sipe-media.c:869 ../src/core/sipe-media.c:1483 +#: ../src/core/sipe-media.c:1493 ../src/core/sipe-media.c:1904 +#: ../src/core/sipe-media.c:1924 msgid "Unable to establish a call" msgstr "" -#: ../src/core/sipe-media.c:836 ../src/core/sipe-media.c:1722 +#: ../src/core/sipe-media.c:870 ../src/core/sipe-media.c:1905 msgid "Encryption settings of peer are incompatible with ours." msgstr "" -#: ../src/core/sipe-media.c:929 +#: ../src/core/sipe-media.c:963 #, c-format msgid "User %s rejected call" msgstr "" -#: ../src/core/sipe-media.c:930 +#: ../src/core/sipe-media.c:964 msgid "Call rejected" msgstr "" -#: ../src/core/sipe-media.c:1196 ../src/core/sipe-media.c:1285 +#: ../src/core/sipe-media.c:1329 ../src/core/sipe-media.c:1418 msgid "Error creating audio stream" msgstr "" -#: ../src/core/sipe-media.c:1207 +#: ../src/core/sipe-media.c:1340 msgid "Error creating video stream" msgstr "" -#: ../src/core/sipe-media.c:1251 ../src/purple/purple-chat.c:314 +#: ../src/core/sipe-media.c:1384 ../src/purple/purple-chat.c:329 msgid "Join conference call" msgstr "" -#: ../src/core/sipe-media.c:1252 +#: ../src/core/sipe-media.c:1385 msgid "Conference calls are not supported on this server." msgstr "" -#: ../src/core/sipe-media.c:1348 +#: ../src/core/sipe-media.c:1484 msgid "Invalid phone number" msgstr "" -#: ../src/core/sipe-media.c:1358 +#: ../src/core/sipe-media.c:1494 msgid "Audio Test Service is not available." msgstr "ऑडियो टेस्ट सेवा उपलब्ध नही है " -#: ../src/core/sipe-media.c:1690 +#: ../src/core/sipe-media.c:1873 msgid "User unavailable" msgstr "" -#: ../src/core/sipe-media.c:1693 +#: ../src/core/sipe-media.c:1876 #, c-format msgid "%s does not want to be disturbed" msgstr "" -#: ../src/core/sipe-media.c:1695 +#: ../src/core/sipe-media.c:1878 #, c-format msgid "User %s is not available" msgstr "" -#: ../src/core/sipe-media.c:1704 +#: ../src/core/sipe-media.c:1887 msgid "Unsupported media type" msgstr " " -#: ../src/core/sipe-media.c:2062 +#: ../src/core/sipe-media.c:2246 msgid "Media error" msgstr "" -#: ../src/core/sipe-media.c:2063 +#: ../src/core/sipe-media.c:2247 msgid "Error while reading from stream" msgstr "" @@ -656,36 +673,36 @@ msgstr "अनजाना " #. Translators: remove (clear) previously assigned access level -#: ../src/core/sipe-ocs2007.c:2571 +#: ../src/core/sipe-ocs2007.c:2570 msgid "Unspecify" msgstr "" -#: ../src/core/sipe-ocs2007.c:2590 +#: ../src/core/sipe-ocs2007.c:2589 msgid "People in my company" msgstr "मेरे संस्था के लोग " -#: ../src/core/sipe-ocs2007.c:2600 +#: ../src/core/sipe-ocs2007.c:2599 msgid "People in domains connected with my company" msgstr "" -#: ../src/core/sipe-ocs2007.c:2609 +#: ../src/core/sipe-ocs2007.c:2608 msgid "People in public domains" msgstr "" -#: ../src/core/sipe-ocs2007.c:2619 +#: ../src/core/sipe-ocs2007.c:2618 #, c-format msgid "People at %s" msgstr "" -#: ../src/core/sipe-ocs2007.c:2644 +#: ../src/core/sipe-ocs2007.c:2643 msgid "Add new domain..." msgstr "" -#: ../src/core/sipe-ocs2007.c:2673 +#: ../src/core/sipe-ocs2007.c:2672 msgid "Online help..." msgstr "" -#: ../src/core/sipe-ocs2007.c:2681 +#: ../src/core/sipe-ocs2007.c:2680 msgid "Access groups" msgstr "" @@ -697,49 +714,60 @@ #. SIPE_ACTIVITY_AVAILABLE #. SIPE_ACTIVITY_ONLINE #. SIPE_ACTIVITY_INACTIVE -#: ../src/core/sipe-status.c:58 +#: ../src/core/sipe-status.c:56 msgid "Inactive" msgstr "निष्क्रिय" #. SIPE_ACTIVITY_BUSYIDLE -#: ../src/core/sipe-status.c:60 +#: ../src/core/sipe-status.c:58 msgid "Busy-Idle" msgstr "व्यस्त-निष्क्रिय" #. SIPE_ACTIVITY_DND #. SIPE_ACTIVITY_BRB -#: ../src/core/sipe-status.c:62 +#: ../src/core/sipe-status.c:60 msgid "Be right back" msgstr "थोड़ी ही देर में वापस " #. SIPE_ACTIVITY_AWAY #. SIPE_ACTIVITY_LUNCH -#: ../src/core/sipe-status.c:64 +#: ../src/core/sipe-status.c:62 msgid "Out to lunch" msgstr "भोजन विराम में " #. SIPE_ACTIVITY_INVISIBLE #. SIPE_ACTIVITY_OFFLINE #. SIPE_ACTIVITY_ON_PHONE -#: ../src/core/sipe-status.c:67 +#: ../src/core/sipe-status.c:65 msgid "In a call" msgstr "कॉल में " #. SIPE_ACTIVITY_IN_CONF -#: ../src/core/sipe-status.c:68 +#: ../src/core/sipe-status.c:66 msgid "In a conference" msgstr "कॉन्फरेंस में " #. SIPE_ACTIVITY_IN_MEETING -#: ../src/core/sipe-status.c:69 +#: ../src/core/sipe-status.c:67 msgid "In a meeting" msgstr "मीटिंग में " #. SIPE_ACTIVITY_URGENT_ONLY -#: ../src/core/sipe-status.c:71 +#: ../src/core/sipe-status.c:69 msgid "Urgent interruptions only" msgstr "सिर्फ़ ज़रूरी रुकावटें ही " +#: ../src/core/sipe-subscriptions.c:189 +msgid "Presence subscription failed!" +msgstr "" + +#: ../src/core/sipe-subscriptions.c:190 +msgid "" +"One or more buddies will therefore permanently show as offline.\n" +"\n" +"Please check that there are no corrupted SIP URIs in your contacts list." +msgstr "" + #: ../src/core/sipe-ucs.c:674 msgid "UCS initialization failed!" msgstr "" @@ -892,15 +920,19 @@ msgid "Copy to" msgstr "" -#: ../src/purple/purple-chat.c:295 +#: ../src/purple/purple-chat.c:310 msgid "Lock" msgstr "" -#: ../src/purple/purple-chat.c:300 +#: ../src/purple/purple-chat.c:315 msgid "Unlock" msgstr "" -#: ../src/purple/purple-chat.c:321 +#: ../src/purple/purple-chat.c:338 +msgid "Show presentation" +msgstr "" + +#: ../src/purple/purple-chat.c:345 msgid "Meeting entry info" msgstr "" @@ -1152,26 +1184,30 @@ msgstr "" #: ../src/purple/purple-plugin-common.c:933 +msgid "Remote desktop client" +msgstr "" + +#: ../src/purple/purple-plugin-common.c:938 msgid "Media encryption" msgstr "" -#: ../src/purple/purple-plugin-common.c:934 +#: ../src/purple/purple-plugin-common.c:939 msgid "Obey server policy" msgstr "" -#: ../src/purple/purple-plugin-common.c:935 +#: ../src/purple/purple-plugin-common.c:940 msgid "Always" msgstr "" -#: ../src/purple/purple-plugin-common.c:936 +#: ../src/purple/purple-plugin-common.c:941 msgid "Optional" msgstr "" -#: ../src/purple/purple-plugin-common.c:937 +#: ../src/purple/purple-plugin-common.c:942 msgid "Disabled" msgstr "" -#: ../src/purple/purple-plugin-common.c:947 +#: ../src/purple/purple-plugin-common.c:952 msgid "" "Login\n" " user or DOMAIN\\user or\n" @@ -1220,27 +1256,27 @@ msgid "_Search" msgstr "" -#: ../src/purple/purple-transport.c:132 +#: ../src/purple/purple-transport.c:135 msgid "Read error" msgstr "" -#: ../src/purple/purple-transport.c:136 -#: ../src/telepathy/telepathy-transport.c:96 +#: ../src/purple/purple-transport.c:139 +#: ../src/telepathy/telepathy-transport.c:95 msgid "Server has disconnected" msgstr "सर्वर ने कनेक्शन तोड़ा" -#: ../src/purple/purple-transport.c:198 +#: ../src/purple/purple-transport.c:201 msgid "Could not connect" msgstr "कनेक्ट नहीं कर पाया" -#: ../src/purple/purple-transport.c:268 +#: ../src/purple/purple-transport.c:271 msgid "Could not create SSL context" msgstr "" -#: ../src/purple/purple-transport.c:290 +#: ../src/purple/purple-transport.c:293 msgid "Could not create socket" msgstr "" -#: ../src/purple/purple-transport.c:381 +#: ../src/purple/purple-transport.c:417 msgid "Write error" msgstr "" diff -Nru pidgin-sipe-1.21.1/po/hu.po pidgin-sipe-1.22.1/po/hu.po --- pidgin-sipe-1.21.1/po/hu.po 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/po/hu.po 2017-06-11 15:41:22.000000000 +0000 @@ -12,7 +12,7 @@ "Project-Id-Version: pidgin sipe\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/sipe/bugs/\n" "POT-Creation-Date: 2010-11-30 23:36+0200\n" -"PO-Revision-Date: 2016-05-28 15:08+0000\n" +"PO-Revision-Date: 2017-01-23 17:47+0000\n" "Last-Translator: Stefan Becker \n" "Language-Team: Hungarian (http://www.transifex.com/stefanb/pidgin-sipe/language/hu/)\n" "MIME-Version: 1.0\n" @@ -21,213 +21,238 @@ "Language: hu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../src/core/sip-transport.c:235 +#: ../src/core/sip-transport.c:240 msgid "Failed to authenticate to server" msgstr "Sikertelen bejelentkezés a szerverre" -#: ../src/core/sip-transport.c:293 +#: ../src/core/sip-transport.c:298 #, c-format msgid "Can't request certificate from %s" msgstr "Nem sikerült tanúsítványt kérni %s tól/től" -#: ../src/core/sip-transport.c:303 +#: ../src/core/sip-transport.c:308 msgid "No URI for certificate provisioning service provided" msgstr "Nincs megadva URI a tanúsítvány elosztó szolgáltatáshoz" -#: ../src/core/sip-transport.c:1281 +#: ../src/core/sip-transport.c:1285 msgid "Authentication failed" msgstr "Sikertelen azonosítás" -#: ../src/core/sip-transport.c:1338 +#: ../src/core/sip-transport.c:1342 msgid "Incompatible authentication scheme chosen" msgstr "Nem kompatibilis azonosítási módszer" -#: ../src/core/sip-transport.c:1355 ../src/core/sipe-notify.c:1149 +#: ../src/core/sip-transport.c:1359 ../src/core/sipe-notify.c:1149 #, c-format msgid "You have been rejected by the server: %s" msgstr "A(z) %s kiszolgáló elutasította" -#: ../src/core/sip-transport.c:1356 ../src/core/sip-transport.c:1372 -#: ../src/core/sip-transport.c:1396 ../src/core/sip-transport.c:1420 +#: ../src/core/sip-transport.c:1360 ../src/core/sip-transport.c:1376 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 #: ../src/core/sipe-conf.c:265 ../src/core/sipe-notify.c:1149 msgid "no reason given" msgstr "nincs ok megadva" -#: ../src/core/sip-transport.c:1371 +#: ../src/core/sip-transport.c:1375 #, c-format msgid "Not found: %s. Please contact your Administrator" msgstr "%s nem található. Kérem lépjen kapcsolatba a rendszergazdával" -#: ../src/core/sip-transport.c:1373 +#: ../src/core/sip-transport.c:1377 msgid "SIP is either not enabled for the destination URI or it does not exist" msgstr "A SIP protokol nincs engedélyezve a megadott URI-n, vagy az URI nem létezik " -#: ../src/core/sip-transport.c:1396 ../src/core/sip-transport.c:1420 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 #, c-format msgid "Service unavailable: %s" msgstr "A(z) %s szolgáltatás nem érhető el" -#: ../src/core/sip-transport.c:1766 +#: ../src/core/sip-transport.c:1775 msgid "Corrupted message received" msgstr "Sérült üzenet" -#: ../src/core/sip-transport.c:1790 +#: ../src/core/sip-transport.c:1799 msgid "Invalid message signature received" msgstr "Érvénytelen üzenetaláírás érkezett" -#: ../src/core/sipe-buddy.c:540 ../src/core/sipe-buddy.c:2300 +#: ../src/core/sipe-appshare.c:458 +#, c-format +msgid "%s wants to start presenting" +msgstr "" + +#: ../src/core/sipe-appshare.c:462 ../src/core/sipe-conf.c:1086 +msgid "Accept" +msgstr "Elfogad" + +#: ../src/core/sipe-appshare.c:463 ../src/core/sipe-conf.c:1087 +msgid "Decline" +msgstr "Elutasít" + +#: ../src/core/sipe-appshare.c:501 ../src/core/sipe-appshare.c:599 +msgid "Application sharing error" +msgstr "" + +#: ../src/core/sipe-appshare.c:502 +msgid "Unknown remote desktop client configured." +msgstr "" + +#: ../src/core/sipe-appshare.c:600 +msgid "Couldn't connect application sharing" +msgstr "" + +#: ../src/core/sipe-buddy.c:541 ../src/core/sipe-buddy.c:2301 msgid "Mobile" msgstr "Mobil" -#: ../src/core/sipe-buddy.c:828 +#: ../src/core/sipe-buddy.c:829 msgid "Status" msgstr "Állapot" -#: ../src/core/sipe-buddy.c:831 +#: ../src/core/sipe-buddy.c:832 msgid "Calendar" msgstr "Naptár" -#: ../src/core/sipe-buddy.c:836 +#: ../src/core/sipe-buddy.c:837 msgid "Meeting in" msgstr "Megbeszélés -kor" -#: ../src/core/sipe-buddy.c:840 +#: ../src/core/sipe-buddy.c:841 msgid "Meeting about" msgstr "Megbeszélés témája" -#: ../src/core/sipe-buddy.c:845 +#: ../src/core/sipe-buddy.c:846 msgid "Out of office note" msgstr "\"Irodán kívül\" üzenet" -#: ../src/core/sipe-buddy.c:845 +#: ../src/core/sipe-buddy.c:846 msgid "Note" msgstr "Megjegyzés" -#: ../src/core/sipe-buddy.c:850 ../src/core/sipe-buddy.c:2345 +#: ../src/core/sipe-buddy.c:851 ../src/core/sipe-buddy.c:2346 #: ../src/purple/purple-buddy.c:633 msgid "Access level" msgstr "Hozzáférési szint" -#: ../src/core/sipe-buddy.c:1073 +#: ../src/core/sipe-buddy.c:1074 #, c-format msgid "Found %d contact%s:" msgid_plural "Found %d contacts%s:" msgstr[0] "Found %d contacts%s:" msgstr[1] "Found %d contacts%s:" -#: ../src/core/sipe-buddy.c:1075 +#: ../src/core/sipe-buddy.c:1076 msgid " (more matched your query)" msgstr " (a keresésnek több találata van)" -#: ../src/core/sipe-buddy.c:1121 ../src/core/sipe-buddy.c:1259 +#: ../src/core/sipe-buddy.c:1122 ../src/core/sipe-buddy.c:1260 #: ../src/core/sipe-ucs.c:314 msgid "No contacts found" msgstr "Nem található kapcsolat" -#: ../src/core/sipe-buddy.c:1134 ../src/core/sipe-buddy.c:1272 +#: ../src/core/sipe-buddy.c:1135 ../src/core/sipe-buddy.c:1273 #: ../src/core/sipe-ucs.c:278 msgid "Unable to display the search results" msgstr "A keresési eredményeket nem lehet megjeleníteni" -#: ../src/core/sipe-buddy.c:1237 ../src/core/sipe-buddy.c:1249 +#: ../src/core/sipe-buddy.c:1238 ../src/core/sipe-buddy.c:1250 #: ../src/core/sipe-ucs.c:391 msgid "Contact search failed" msgstr "Kapcsolat keresés meghiúsult" -#: ../src/core/sipe-buddy.c:1412 ../src/core/sipe-ucs.c:395 +#: ../src/core/sipe-buddy.c:1413 ../src/core/sipe-ucs.c:395 msgid "Invalid contact search query" msgstr "Érvénytelen kapcsolat keresési lekérdezés" -#: ../src/core/sipe-buddy.c:2237 +#: ../src/core/sipe-buddy.c:2238 #, c-format msgid "Make leader of '%s'" msgstr "Vezetőnek jelölés %s -hez/höz" -#: ../src/core/sipe-buddy.c:2250 +#: ../src/core/sipe-buddy.c:2251 #, c-format msgid "Remove from '%s'" msgstr "Eltávolítás %s -ból/ből" -#: ../src/core/sipe-buddy.c:2264 +#: ../src/core/sipe-buddy.c:2265 #, c-format msgid "Invite to '%s'" msgstr "Meghívás %s -ba/be" -#: ../src/core/sipe-buddy.c:2280 +#: ../src/core/sipe-buddy.c:2281 msgid "New chat" msgstr "Új társalgás" -#: ../src/core/sipe-buddy.c:2293 +#: ../src/core/sipe-buddy.c:2294 msgid "Work" msgstr "Munka" -#: ../src/core/sipe-buddy.c:2308 +#: ../src/core/sipe-buddy.c:2309 msgid "Home" msgstr "Kiindulás" -#: ../src/core/sipe-buddy.c:2316 +#: ../src/core/sipe-buddy.c:2317 msgid "Other" msgstr "Más" -#: ../src/core/sipe-buddy.c:2324 +#: ../src/core/sipe-buddy.c:2325 msgid "Custom1" msgstr "Speciális1" -#: ../src/core/sipe-buddy.c:2334 +#: ../src/core/sipe-buddy.c:2335 msgid "Send email..." msgstr "E-mail küldése..." -#: ../src/core/sipe-cal.c:907 +#: ../src/core/sipe-cal.c:906 msgid "Free" msgstr "Szabad" -#: ../src/core/sipe-cal.c:908 +#: ../src/core/sipe-cal.c:907 msgid "Tentative" msgstr "Kétséges" #. SIPE_ACTIVITY_BUSY -#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:59 +#: ../src/core/sipe-cal.c:908 ../src/core/sipe-status.c:57 msgid "Busy" msgstr "Elfoglalt" #. SIPE_ACTIVITY_OOF -#: ../src/core/sipe-cal.c:910 ../src/core/sipe-status.c:70 +#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:68 msgid "Out of office" msgstr "Irodán kívül" -#: ../src/core/sipe-cal.c:911 +#: ../src/core/sipe-cal.c:910 msgid "No data" msgstr "Nincs információ" -#: ../src/core/sipe-cal.c:1019 ../src/core/sipe-cal.c:1046 +#: ../src/core/sipe-cal.c:1018 ../src/core/sipe-cal.c:1045 #, c-format msgid "Currently %s" msgstr "Jelenleg %s" -#: ../src/core/sipe-cal.c:1025 +#: ../src/core/sipe-cal.c:1024 msgid "Outside of working hours for next 8 hours" msgstr "A következő 8 órában nem dolgozik" -#: ../src/core/sipe-cal.c:1027 +#: ../src/core/sipe-cal.c:1026 #, c-format msgid "%s for next 8 hours" msgstr "A következő nyolc órában %s" -#: ../src/core/sipe-cal.c:1036 +#: ../src/core/sipe-cal.c:1035 msgid "Not working" msgstr "Nem dolgozik" -#: ../src/core/sipe-cal.c:1040 +#: ../src/core/sipe-cal.c:1039 #, c-format msgid "%s until %.2d:%.2d" msgstr "%s %.2d:%.2d -ig" -#: ../src/core/sipe-cal.c:1048 +#: ../src/core/sipe-cal.c:1047 #, c-format msgid "%s. Outside of working hours at %.2d:%.2d" msgstr "%s. \"Nem dolgozik\" %.2d:%.2d" -#: ../src/core/sipe-cal.c:1053 +#: ../src/core/sipe-cal.c:1052 #, c-format msgid "%s. %s at %.2d:%.2d" msgstr "%s. %s %.2d:%.2d -kor" @@ -243,7 +268,7 @@ msgstr "Nem sikerült Web-es jegyet nyitni %s-hez" #. Generate next ID -#: ../src/core/sipe-chat.c:240 +#: ../src/core/sipe-chat.c:246 #, c-format msgid "Chat #%d" msgstr "Beszélgetés #%d" @@ -270,123 +295,115 @@ msgid "Incomplete conference information provided" msgstr "Hiányos konferencia információ" -#: ../src/core/sipe-conf.c:1041 +#: ../src/core/sipe-conf.c:1106 msgid "" "\n" "\n" "As this client was not compiled with voice call support, if you accept, you will be able to contact the other participants only via IM session." msgstr "\n\nMivel ez a kliens hang-hívás támogatás nélkül került lefordításra, ezért amennyiben elfogadja a másik féllel csak azonnali üzeneteket fog tudni váltani." -#: ../src/core/sipe-conf.c:1049 +#: ../src/core/sipe-conf.c:1111 #, c-format -msgid "%s wants to invite you to the conference call%s" -msgstr "%s meghívta egy konferencia hívásba %s" - -#: ../src/core/sipe-conf.c:1063 -msgid "Accept" -msgstr "Elfogad" - -#: ../src/core/sipe-conf.c:1064 -msgid "Decline" -msgstr "Elutasít" +msgid "wants to invite you to a conference call%s" +msgstr "" -#: ../src/core/sipe-conf.c:1345 +#: ../src/core/sipe-conf.c:1459 msgid "" "This conference is no longer locked. Additional participants can now join." msgstr "A megbeszélés feloldva, további résztvevők csatlakozhatnak" -#: ../src/core/sipe-conf.c:1349 +#: ../src/core/sipe-conf.c:1463 msgid "" "This conference is locked. Nobody else can join the conference while it is " "locked." msgstr "Megbeszélés lezárva, további résztvevők nem csatlakozhatnak" -#: ../src/core/sipe-conf.c:1382 +#: ../src/core/sipe-conf.c:1496 msgid "You have been disconnected from this conference." msgstr "Ön eltávolításra került a megbeszélésről" -#: ../src/core/sipe-conf.c:1542 +#: ../src/core/sipe-conf.c:1656 msgid "Dial-in info" msgstr "Behívási adatok" -#: ../src/core/sipe-conf.c:1543 +#: ../src/core/sipe-conf.c:1657 msgid "Number" msgstr "Szám" -#: ../src/core/sipe-conf.c:1545 +#: ../src/core/sipe-conf.c:1659 msgid "Conference ID" msgstr "Konferencia azonosító" -#: ../src/core/sipe-conf.c:1547 +#: ../src/core/sipe-conf.c:1661 msgid "Meeting link" msgstr "A megbeszéléshez tartozó link" -#: ../src/core/sipe-conf.c:1549 +#: ../src/core/sipe-conf.c:1663 msgid "Organizer" msgstr "Szervező" -#: ../src/core/sipe-conf.c:1551 +#: ../src/core/sipe-conf.c:1665 msgid "Alternative dial-in numbers" msgstr "Alternatív behívószám" #. The next 13 texts make up the SIPE about note text #. About note, part 1/13: introduction -#: ../src/core/sipe-core.c:220 +#: ../src/core/sipe-core.c:221 msgid "" "A third-party plugin implementing extended version of SIP/SIMPLE used by " "various products" msgstr "Egy harmadik féltől származó kiegészítés amely a SIP/SIMPLE egy kiterjesztett verzióját valósítja meg." #. About note, part 2/13: home page URL (label) -#: ../src/core/sipe-core.c:222 +#: ../src/core/sipe-core.c:223 msgid "Home Page" msgstr "Web-lap" #. About note, part 3/13: support forum URL (label) -#: ../src/core/sipe-core.c:224 +#: ../src/core/sipe-core.c:225 msgid "Support" msgstr "Támogatás" #. About note, part 4/13: support forum name (hyperlink text) -#: ../src/core/sipe-core.c:226 +#: ../src/core/sipe-core.c:227 msgid "Help Forum" msgstr "Közösségi segítség" #. About note, part 5/13: bug tracker URL (label) -#: ../src/core/sipe-core.c:228 +#: ../src/core/sipe-core.c:229 msgid "Report Problems" msgstr "Problémák jelzése" #. About note, part 6/13: bug tracker URL (hyperlink text) -#: ../src/core/sipe-core.c:230 +#: ../src/core/sipe-core.c:231 msgid "Bug Tracker" msgstr "Hiba követés" #. About note, part 7/13: translation service URL (label) -#: ../src/core/sipe-core.c:232 +#: ../src/core/sipe-core.c:233 msgid "Translations" msgstr "Fordítás" #. About note, part 8/13: license type (label) -#: ../src/core/sipe-core.c:234 +#: ../src/core/sipe-core.c:235 msgid "License" msgstr "Licensz" #. About note, part 9/13: (REMOVED) #. About note, part 10/13: translation request, text before Transifex.com URL #. append a space if text is not empty -#: ../src/core/sipe-core.c:238 +#: ../src/core/sipe-core.c:239 msgid "Please help us to translate SIPE to your native language here at " msgstr "Kérem segítse munkánkat a a SIPE fordításával más nyelvekre a következő címen: " #. About note, part 11/13: translation request, text after Transifex.com URL #. start with a space if text is not empty -#: ../src/core/sipe-core.c:241 +#: ../src/core/sipe-core.c:242 msgid " using convenient web interface" msgstr "egy könnyen használható web-es interfész használatával" #. About note, part 12/13: author list (header) -#: ../src/core/sipe-core.c:243 +#: ../src/core/sipe-core.c:244 msgid "Authors" msgstr "Fejlesztők" @@ -394,15 +411,15 @@ #. PLEASE NOTE: do *NOT* simply translate the english original #. but write something similar to the following sentence: #. "Localization for (): " -#: ../src/core/sipe-core.c:248 +#: ../src/core/sipe-core.c:249 msgid "Original texts in English (en): SIPE developers" msgstr "Az eredeti szöveg Angolul (en): SIPE Developers" -#: ../src/core/sipe-core.c:269 +#: ../src/core/sipe-core.c:273 msgid "SIP Exchange user name contains invalid characters" msgstr "Az Exchange SIP felhasználó név tiltott karaktereket tartalmaz" -#: ../src/core/sipe-core.c:277 ../src/purple/purple-buddy.c:485 +#: ../src/core/sipe-core.c:281 ../src/purple/purple-buddy.c:485 #: ../src/telepathy/telepathy-protocol.c:89 #: ../src/telepathy/telepathy-protocol.c:191 #, c-format @@ -411,21 +428,21 @@ "Example: user@company.com" msgstr "A felhasználó névnek egy valós SIP URI-nak kell lennie⏎\nmint például \"felhasznalo@ceg.hu\"" -#: ../src/core/sipe-core.c:284 +#: ../src/core/sipe-core.c:288 msgid "Password is required when Single Sign-On is not enabled" msgstr "A jelszó megadása kötelező amennyiben az Egyszeri bejelentkezés (Single Sign-On) nincs engedélyezve" -#: ../src/core/sipe-core.c:294 +#: ../src/core/sipe-core.c:298 msgid "" "Email address should be valid if provided\n" "Example: user@company.com" msgstr "Ha megadott e-mail címet, akkor ennek valósnak kell lennie⏎\nmint például \"felhasznalo@ceg.hu\"" -#: ../src/core/sipe-core.c:303 +#: ../src/core/sipe-core.c:307 msgid "SIP Exchange user name contains whitespace" msgstr "Az Exchange SIP felhasználó név üres karaktert tartalmaz" -#: ../src/core/sipe-core.c:317 +#: ../src/core/sipe-core.c:321 msgid "" "Email services URL should be valid if provided\n" "Example: https://exchange.corp.com/EWS/Exchange.asmx\n" @@ -456,13 +473,13 @@ msgid "Could not create listen socket" msgstr "Nem sikerült létrehozni a figyelő foglalatot" -#: ../src/core/sipe-ft-lync.c:757 ../src/core/sipe-media.c:1195 -#: ../src/core/sipe-media.c:1206 ../src/core/sipe-media.c:1284 -#: ../src/core/sipe-media.c:1740 +#: ../src/core/sipe-ft-lync.c:762 ../src/core/sipe-media.c:1328 +#: ../src/core/sipe-media.c:1339 ../src/core/sipe-media.c:1417 +#: ../src/core/sipe-media.c:1923 msgid "Error occurred" msgstr "Hiba történt" -#: ../src/core/sipe-ft-lync.c:758 +#: ../src/core/sipe-ft-lync.c:763 msgid "Error creating data stream" msgstr "Adatfolyam létrehozása sikertelen" @@ -497,7 +514,7 @@ msgstr "Elfogyott a memória" #: ../src/core/sipe-group.c:168 ../src/core/sipe-notify.c:1163 -#: ../src/core/sipe-notify.c:1190 ../src/core/sipe-notify.c:1294 +#: ../src/core/sipe-notify.c:1197 ../src/core/sipe-notify.c:1301 #: ../src/purple/purple-search.c:128 msgid "Other Contacts" msgstr "Egyéb kapcsolatok" @@ -535,77 +552,77 @@ msgid "Failed to invite %s" msgstr "%s meghívása sikertelen" -#: ../src/core/sipe-incoming.c:741 +#: ../src/core/sipe-incoming.c:754 #, c-format msgid "Received a message with unrecognized contents from %s" msgstr "%s értelmezhetetlen tartalmú üzenetet küldött" -#: ../src/core/sipe-media.c:835 ../src/core/sipe-media.c:1347 -#: ../src/core/sipe-media.c:1357 ../src/core/sipe-media.c:1721 -#: ../src/core/sipe-media.c:1741 +#: ../src/core/sipe-media.c:869 ../src/core/sipe-media.c:1483 +#: ../src/core/sipe-media.c:1493 ../src/core/sipe-media.c:1904 +#: ../src/core/sipe-media.c:1924 msgid "Unable to establish a call" msgstr "Sikertelen hívás" -#: ../src/core/sipe-media.c:836 ../src/core/sipe-media.c:1722 +#: ../src/core/sipe-media.c:870 ../src/core/sipe-media.c:1905 msgid "Encryption settings of peer are incompatible with ours." msgstr "A partner titkosítási beállításai nem egyeznek a mienkkel" -#: ../src/core/sipe-media.c:929 +#: ../src/core/sipe-media.c:963 #, c-format msgid "User %s rejected call" msgstr "%s visszautasította a hívást" -#: ../src/core/sipe-media.c:930 +#: ../src/core/sipe-media.c:964 msgid "Call rejected" msgstr "Hívás visszautasítva" -#: ../src/core/sipe-media.c:1196 ../src/core/sipe-media.c:1285 +#: ../src/core/sipe-media.c:1329 ../src/core/sipe-media.c:1418 msgid "Error creating audio stream" msgstr "A hang adatfolyam létrehozása nem sikerült" -#: ../src/core/sipe-media.c:1207 +#: ../src/core/sipe-media.c:1340 msgid "Error creating video stream" msgstr "A videó adatfolyam létrehozása nem sikerült" -#: ../src/core/sipe-media.c:1251 ../src/purple/purple-chat.c:314 +#: ../src/core/sipe-media.c:1384 ../src/purple/purple-chat.c:329 msgid "Join conference call" msgstr "Csatlakozás telefon konferenciához" -#: ../src/core/sipe-media.c:1252 +#: ../src/core/sipe-media.c:1385 msgid "Conference calls are not supported on this server." msgstr "A konferenciahívások nem támogatottak ezen a kiszolgálón" -#: ../src/core/sipe-media.c:1348 +#: ../src/core/sipe-media.c:1484 msgid "Invalid phone number" msgstr "Érvénytelen telefonszám" -#: ../src/core/sipe-media.c:1358 +#: ../src/core/sipe-media.c:1494 msgid "Audio Test Service is not available." msgstr "Hang tesztelési szolgáltatás nem elérhető" -#: ../src/core/sipe-media.c:1690 +#: ../src/core/sipe-media.c:1873 msgid "User unavailable" msgstr "Felhasználó nem elérhető" -#: ../src/core/sipe-media.c:1693 +#: ../src/core/sipe-media.c:1876 #, c-format msgid "%s does not want to be disturbed" msgstr "%s állapota: \"Ne zavarj!\"" -#: ../src/core/sipe-media.c:1695 +#: ../src/core/sipe-media.c:1878 #, c-format msgid "User %s is not available" msgstr "%s állapota: \"Nem elérhető\"" -#: ../src/core/sipe-media.c:1704 +#: ../src/core/sipe-media.c:1887 msgid "Unsupported media type" msgstr "Nem támogatott médiatípus " -#: ../src/core/sipe-media.c:2062 +#: ../src/core/sipe-media.c:2246 msgid "Media error" msgstr "Média hiba" -#: ../src/core/sipe-media.c:2063 +#: ../src/core/sipe-media.c:2247 msgid "Error while reading from stream" msgstr "Hiba az adatfolyam olvasásakor" @@ -656,36 +673,36 @@ msgstr "Ismeretlen" #. Translators: remove (clear) previously assigned access level -#: ../src/core/sipe-ocs2007.c:2571 +#: ../src/core/sipe-ocs2007.c:2570 msgid "Unspecify" msgstr "Mellőz" -#: ../src/core/sipe-ocs2007.c:2590 +#: ../src/core/sipe-ocs2007.c:2589 msgid "People in my company" msgstr "Emberek a cégemnél" -#: ../src/core/sipe-ocs2007.c:2600 +#: ../src/core/sipe-ocs2007.c:2599 msgid "People in domains connected with my company" msgstr "Emberek a cégemmel kapcsolódott domainekben" -#: ../src/core/sipe-ocs2007.c:2609 +#: ../src/core/sipe-ocs2007.c:2608 msgid "People in public domains" msgstr "Emberek a nyílvános domainekben" -#: ../src/core/sipe-ocs2007.c:2619 +#: ../src/core/sipe-ocs2007.c:2618 #, c-format msgid "People at %s" msgstr "Emberek %s -nál/nél" -#: ../src/core/sipe-ocs2007.c:2644 +#: ../src/core/sipe-ocs2007.c:2643 msgid "Add new domain..." msgstr "Domain hozzáadása..." -#: ../src/core/sipe-ocs2007.c:2673 +#: ../src/core/sipe-ocs2007.c:2672 msgid "Online help..." msgstr "Online segítség..." -#: ../src/core/sipe-ocs2007.c:2681 +#: ../src/core/sipe-ocs2007.c:2680 msgid "Access groups" msgstr "Hozzáférési csoportok..." @@ -697,49 +714,60 @@ #. SIPE_ACTIVITY_AVAILABLE #. SIPE_ACTIVITY_ONLINE #. SIPE_ACTIVITY_INACTIVE -#: ../src/core/sipe-status.c:58 +#: ../src/core/sipe-status.c:56 msgid "Inactive" msgstr "Tétlen" #. SIPE_ACTIVITY_BUSYIDLE -#: ../src/core/sipe-status.c:60 +#: ../src/core/sipe-status.c:58 msgid "Busy-Idle" msgstr "Elfoglalt->Tétlen" #. SIPE_ACTIVITY_DND #. SIPE_ACTIVITY_BRB -#: ../src/core/sipe-status.c:62 +#: ../src/core/sipe-status.c:60 msgid "Be right back" msgstr "Rögtön jön" #. SIPE_ACTIVITY_AWAY #. SIPE_ACTIVITY_LUNCH -#: ../src/core/sipe-status.c:64 +#: ../src/core/sipe-status.c:62 msgid "Out to lunch" msgstr "Ebédel" #. SIPE_ACTIVITY_INVISIBLE #. SIPE_ACTIVITY_OFFLINE #. SIPE_ACTIVITY_ON_PHONE -#: ../src/core/sipe-status.c:67 +#: ../src/core/sipe-status.c:65 msgid "In a call" msgstr "Hívásban" #. SIPE_ACTIVITY_IN_CONF -#: ../src/core/sipe-status.c:68 +#: ../src/core/sipe-status.c:66 msgid "In a conference" msgstr "Telefonkonferenciában" #. SIPE_ACTIVITY_IN_MEETING -#: ../src/core/sipe-status.c:69 +#: ../src/core/sipe-status.c:67 msgid "In a meeting" msgstr "Megbeszélésen" #. SIPE_ACTIVITY_URGENT_ONLY -#: ../src/core/sipe-status.c:71 +#: ../src/core/sipe-status.c:69 msgid "Urgent interruptions only" msgstr "Csak sürgős esetben elérhető" +#: ../src/core/sipe-subscriptions.c:189 +msgid "Presence subscription failed!" +msgstr "" + +#: ../src/core/sipe-subscriptions.c:190 +msgid "" +"One or more buddies will therefore permanently show as offline.\n" +"\n" +"Please check that there are no corrupted SIP URIs in your contacts list." +msgstr "" + #: ../src/core/sipe-ucs.c:674 msgid "UCS initialization failed!" msgstr "UCS inicializálás sikertelen!" @@ -892,15 +920,19 @@ msgid "Copy to" msgstr "Másolás..." -#: ../src/purple/purple-chat.c:295 +#: ../src/purple/purple-chat.c:310 msgid "Lock" msgstr "Kizár" -#: ../src/purple/purple-chat.c:300 +#: ../src/purple/purple-chat.c:315 msgid "Unlock" msgstr "Kizárást felold" -#: ../src/purple/purple-chat.c:321 +#: ../src/purple/purple-chat.c:338 +msgid "Show presentation" +msgstr "" + +#: ../src/purple/purple-chat.c:345 msgid "Meeting entry info" msgstr "A megbeszélés belépési adatai" @@ -1152,26 +1184,30 @@ msgstr "Csoportos beszélgetés proxy\nceg.hu vagy felhasznalo@ceg.hu\n(hagyja üresen a felhasználó névből való meghatározáshoz!)" #: ../src/purple/purple-plugin-common.c:933 +msgid "Remote desktop client" +msgstr "" + +#: ../src/purple/purple-plugin-common.c:938 msgid "Media encryption" msgstr "Média titkosítás" -#: ../src/purple/purple-plugin-common.c:934 +#: ../src/purple/purple-plugin-common.c:939 msgid "Obey server policy" msgstr "" -#: ../src/purple/purple-plugin-common.c:935 +#: ../src/purple/purple-plugin-common.c:940 msgid "Always" msgstr "Mindig" -#: ../src/purple/purple-plugin-common.c:936 +#: ../src/purple/purple-plugin-common.c:941 msgid "Optional" msgstr "Opcionális" -#: ../src/purple/purple-plugin-common.c:937 +#: ../src/purple/purple-plugin-common.c:942 msgid "Disabled" msgstr "Letiltva" -#: ../src/purple/purple-plugin-common.c:947 +#: ../src/purple/purple-plugin-common.c:952 msgid "" "Login\n" " user or DOMAIN\\user or\n" @@ -1220,27 +1256,27 @@ msgid "_Search" msgstr "_Keresés" -#: ../src/purple/purple-transport.c:132 +#: ../src/purple/purple-transport.c:135 msgid "Read error" msgstr "Olvasási hiba" -#: ../src/purple/purple-transport.c:136 -#: ../src/telepathy/telepathy-transport.c:96 +#: ../src/purple/purple-transport.c:139 +#: ../src/telepathy/telepathy-transport.c:95 msgid "Server has disconnected" msgstr "A kiszolgáló bontotta a kapcsolatot" -#: ../src/purple/purple-transport.c:198 +#: ../src/purple/purple-transport.c:201 msgid "Could not connect" msgstr "Nem sikerült kapcsolódni" -#: ../src/purple/purple-transport.c:268 +#: ../src/purple/purple-transport.c:271 msgid "Could not create SSL context" msgstr "Az SSL-környezet nem hozható létre" -#: ../src/purple/purple-transport.c:290 +#: ../src/purple/purple-transport.c:293 msgid "Could not create socket" msgstr "Nem tudom létrehozni a \"Socket\"-et" -#: ../src/purple/purple-transport.c:381 +#: ../src/purple/purple-transport.c:417 msgid "Write error" msgstr "Írási hiba" diff -Nru pidgin-sipe-1.21.1/po/it.po pidgin-sipe-1.22.1/po/it.po --- pidgin-sipe-1.21.1/po/it.po 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/po/it.po 2017-06-11 15:41:22.000000000 +0000 @@ -12,7 +12,7 @@ "Project-Id-Version: pidgin sipe\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/sipe/bugs/\n" "POT-Creation-Date: 2010-11-30 23:36+0200\n" -"PO-Revision-Date: 2016-05-28 15:08+0000\n" +"PO-Revision-Date: 2017-01-23 17:47+0000\n" "Last-Translator: Stefan Becker \n" "Language-Team: Italian (http://www.transifex.com/stefanb/pidgin-sipe/language/it/)\n" "MIME-Version: 1.0\n" @@ -21,213 +21,238 @@ "Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../src/core/sip-transport.c:235 +#: ../src/core/sip-transport.c:240 msgid "Failed to authenticate to server" msgstr "Errore di autenticazione con il server" -#: ../src/core/sip-transport.c:293 +#: ../src/core/sip-transport.c:298 #, c-format msgid "Can't request certificate from %s" msgstr "Impossibile richiedere il certificato da %s" -#: ../src/core/sip-transport.c:303 +#: ../src/core/sip-transport.c:308 msgid "No URI for certificate provisioning service provided" msgstr "Nessun URI fornito per il servizio di rilascio certificati" -#: ../src/core/sip-transport.c:1281 +#: ../src/core/sip-transport.c:1285 msgid "Authentication failed" msgstr "Errore di autenticazione" -#: ../src/core/sip-transport.c:1338 +#: ../src/core/sip-transport.c:1342 msgid "Incompatible authentication scheme chosen" msgstr "Lo schema di autenticazione scelto è incompatibile." -#: ../src/core/sip-transport.c:1355 ../src/core/sipe-notify.c:1149 +#: ../src/core/sip-transport.c:1359 ../src/core/sipe-notify.c:1149 #, c-format msgid "You have been rejected by the server: %s" msgstr "Connessione rifiutata dal server: %s" -#: ../src/core/sip-transport.c:1356 ../src/core/sip-transport.c:1372 -#: ../src/core/sip-transport.c:1396 ../src/core/sip-transport.c:1420 +#: ../src/core/sip-transport.c:1360 ../src/core/sip-transport.c:1376 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 #: ../src/core/sipe-conf.c:265 ../src/core/sipe-notify.c:1149 msgid "no reason given" msgstr "nessun motivo fornito" -#: ../src/core/sip-transport.c:1371 +#: ../src/core/sip-transport.c:1375 #, c-format msgid "Not found: %s. Please contact your Administrator" msgstr "Non trovato: %s. Contattare l'amministratore" -#: ../src/core/sip-transport.c:1373 +#: ../src/core/sip-transport.c:1377 msgid "SIP is either not enabled for the destination URI or it does not exist" msgstr "SIP non abilitato per la URI di destinazione oppure non esistente" -#: ../src/core/sip-transport.c:1396 ../src/core/sip-transport.c:1420 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 #, c-format msgid "Service unavailable: %s" msgstr "Servizio non disponibile:%s" -#: ../src/core/sip-transport.c:1766 +#: ../src/core/sip-transport.c:1775 msgid "Corrupted message received" msgstr "" -#: ../src/core/sip-transport.c:1790 +#: ../src/core/sip-transport.c:1799 msgid "Invalid message signature received" msgstr "La firma del messaggio ricevuta non è valida" -#: ../src/core/sipe-buddy.c:540 ../src/core/sipe-buddy.c:2300 +#: ../src/core/sipe-appshare.c:458 +#, c-format +msgid "%s wants to start presenting" +msgstr "" + +#: ../src/core/sipe-appshare.c:462 ../src/core/sipe-conf.c:1086 +msgid "Accept" +msgstr "Accetta" + +#: ../src/core/sipe-appshare.c:463 ../src/core/sipe-conf.c:1087 +msgid "Decline" +msgstr "Rifiuta" + +#: ../src/core/sipe-appshare.c:501 ../src/core/sipe-appshare.c:599 +msgid "Application sharing error" +msgstr "" + +#: ../src/core/sipe-appshare.c:502 +msgid "Unknown remote desktop client configured." +msgstr "" + +#: ../src/core/sipe-appshare.c:600 +msgid "Couldn't connect application sharing" +msgstr "" + +#: ../src/core/sipe-buddy.c:541 ../src/core/sipe-buddy.c:2301 msgid "Mobile" msgstr "Mobile" -#: ../src/core/sipe-buddy.c:828 +#: ../src/core/sipe-buddy.c:829 msgid "Status" msgstr "Stato" -#: ../src/core/sipe-buddy.c:831 +#: ../src/core/sipe-buddy.c:832 msgid "Calendar" msgstr "Calendario" -#: ../src/core/sipe-buddy.c:836 +#: ../src/core/sipe-buddy.c:837 msgid "Meeting in" msgstr "Riunione in" -#: ../src/core/sipe-buddy.c:840 +#: ../src/core/sipe-buddy.c:841 msgid "Meeting about" msgstr "Riunione su" -#: ../src/core/sipe-buddy.c:845 +#: ../src/core/sipe-buddy.c:846 msgid "Out of office note" msgstr "Nota per il Fuori Ufficio" -#: ../src/core/sipe-buddy.c:845 +#: ../src/core/sipe-buddy.c:846 msgid "Note" msgstr "Nota" -#: ../src/core/sipe-buddy.c:850 ../src/core/sipe-buddy.c:2345 +#: ../src/core/sipe-buddy.c:851 ../src/core/sipe-buddy.c:2346 #: ../src/purple/purple-buddy.c:633 msgid "Access level" msgstr "Livello di accesso" -#: ../src/core/sipe-buddy.c:1073 +#: ../src/core/sipe-buddy.c:1074 #, c-format msgid "Found %d contact%s:" msgid_plural "Found %d contacts%s:" msgstr[0] "%d contatto%s trovato:" msgstr[1] "%d contatti%s trovati:" -#: ../src/core/sipe-buddy.c:1075 +#: ../src/core/sipe-buddy.c:1076 msgid " (more matched your query)" msgstr " (altri risultati per l'interrogazione)" -#: ../src/core/sipe-buddy.c:1121 ../src/core/sipe-buddy.c:1259 +#: ../src/core/sipe-buddy.c:1122 ../src/core/sipe-buddy.c:1260 #: ../src/core/sipe-ucs.c:314 msgid "No contacts found" msgstr "Nessun contatto trovato" -#: ../src/core/sipe-buddy.c:1134 ../src/core/sipe-buddy.c:1272 +#: ../src/core/sipe-buddy.c:1135 ../src/core/sipe-buddy.c:1273 #: ../src/core/sipe-ucs.c:278 msgid "Unable to display the search results" msgstr "Non è stato possibile mostrare i risultati della ricerca." -#: ../src/core/sipe-buddy.c:1237 ../src/core/sipe-buddy.c:1249 +#: ../src/core/sipe-buddy.c:1238 ../src/core/sipe-buddy.c:1250 #: ../src/core/sipe-ucs.c:391 msgid "Contact search failed" msgstr "Impossibile cercare il contatto" -#: ../src/core/sipe-buddy.c:1412 ../src/core/sipe-ucs.c:395 +#: ../src/core/sipe-buddy.c:1413 ../src/core/sipe-ucs.c:395 msgid "Invalid contact search query" msgstr "Criteri non validi per la ricerca del contatto" -#: ../src/core/sipe-buddy.c:2237 +#: ../src/core/sipe-buddy.c:2238 #, c-format msgid "Make leader of '%s'" msgstr "Rendi leader di '%s'" -#: ../src/core/sipe-buddy.c:2250 +#: ../src/core/sipe-buddy.c:2251 #, c-format msgid "Remove from '%s'" msgstr "Rimuovi da '%s'" -#: ../src/core/sipe-buddy.c:2264 +#: ../src/core/sipe-buddy.c:2265 #, c-format msgid "Invite to '%s'" msgstr "Invita a '%s'" -#: ../src/core/sipe-buddy.c:2280 +#: ../src/core/sipe-buddy.c:2281 msgid "New chat" msgstr "Nuova chat" -#: ../src/core/sipe-buddy.c:2293 +#: ../src/core/sipe-buddy.c:2294 msgid "Work" msgstr "Lavoro" -#: ../src/core/sipe-buddy.c:2308 +#: ../src/core/sipe-buddy.c:2309 msgid "Home" msgstr "Home" -#: ../src/core/sipe-buddy.c:2316 +#: ../src/core/sipe-buddy.c:2317 msgid "Other" msgstr "Altro" -#: ../src/core/sipe-buddy.c:2324 +#: ../src/core/sipe-buddy.c:2325 msgid "Custom1" msgstr "Personalizzato1" -#: ../src/core/sipe-buddy.c:2334 +#: ../src/core/sipe-buddy.c:2335 msgid "Send email..." msgstr "Spedisci email..." -#: ../src/core/sipe-cal.c:907 +#: ../src/core/sipe-cal.c:906 msgid "Free" msgstr "Libero" -#: ../src/core/sipe-cal.c:908 +#: ../src/core/sipe-cal.c:907 msgid "Tentative" msgstr "Incerto" #. SIPE_ACTIVITY_BUSY -#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:59 +#: ../src/core/sipe-cal.c:908 ../src/core/sipe-status.c:57 msgid "Busy" msgstr "Occupato" #. SIPE_ACTIVITY_OOF -#: ../src/core/sipe-cal.c:910 ../src/core/sipe-status.c:70 +#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:68 msgid "Out of office" msgstr "Fuori ufficio" -#: ../src/core/sipe-cal.c:911 +#: ../src/core/sipe-cal.c:910 msgid "No data" msgstr "Nessun dato" -#: ../src/core/sipe-cal.c:1019 ../src/core/sipe-cal.c:1046 +#: ../src/core/sipe-cal.c:1018 ../src/core/sipe-cal.c:1045 #, c-format msgid "Currently %s" msgstr "Attualmente %s" -#: ../src/core/sipe-cal.c:1025 +#: ../src/core/sipe-cal.c:1024 msgid "Outside of working hours for next 8 hours" msgstr "Fuori sede per le prossime 8 ore" -#: ../src/core/sipe-cal.c:1027 +#: ../src/core/sipe-cal.c:1026 #, c-format msgid "%s for next 8 hours" msgstr "%s per le prossime 8 ore" -#: ../src/core/sipe-cal.c:1036 +#: ../src/core/sipe-cal.c:1035 msgid "Not working" msgstr "Non al lavoro" -#: ../src/core/sipe-cal.c:1040 +#: ../src/core/sipe-cal.c:1039 #, c-format msgid "%s until %.2d:%.2d" msgstr "%s fino a %.2d:%.2d" -#: ../src/core/sipe-cal.c:1048 +#: ../src/core/sipe-cal.c:1047 #, c-format msgid "%s. Outside of working hours at %.2d:%.2d" msgstr "%s. Fuori dagli orari di lavoro al %.2d:%.2d" -#: ../src/core/sipe-cal.c:1053 +#: ../src/core/sipe-cal.c:1052 #, c-format msgid "%s. %s at %.2d:%.2d" msgstr "%s. %s al %.2d:%.2d" @@ -243,7 +268,7 @@ msgstr "La richiesta del web ticket a %s non è andata a buon fine" #. Generate next ID -#: ../src/core/sipe-chat.c:240 +#: ../src/core/sipe-chat.c:246 #, c-format msgid "Chat #%d" msgstr "Chat #%d" @@ -270,123 +295,115 @@ msgid "Incomplete conference information provided" msgstr "" -#: ../src/core/sipe-conf.c:1041 +#: ../src/core/sipe-conf.c:1106 msgid "" "\n" "\n" "As this client was not compiled with voice call support, if you accept, you will be able to contact the other participants only via IM session." msgstr "\n\nPoichè il client non è stato compilato con il supporto alla chiamata vocale, se si accetta, si potranno contattare gli altri partecipanti solo tramite sessione IM." -#: ../src/core/sipe-conf.c:1049 +#: ../src/core/sipe-conf.c:1111 #, c-format -msgid "%s wants to invite you to the conference call%s" -msgstr "%s ti invita alla chiamata in conferenza%s" - -#: ../src/core/sipe-conf.c:1063 -msgid "Accept" -msgstr "Accetta" - -#: ../src/core/sipe-conf.c:1064 -msgid "Decline" -msgstr "Rifiuta" +msgid "wants to invite you to a conference call%s" +msgstr "" -#: ../src/core/sipe-conf.c:1345 +#: ../src/core/sipe-conf.c:1459 msgid "" "This conference is no longer locked. Additional participants can now join." msgstr "Questa conference non è più bloccata. Ora possono connnettersi altri partecipanti." -#: ../src/core/sipe-conf.c:1349 +#: ../src/core/sipe-conf.c:1463 msgid "" "This conference is locked. Nobody else can join the conference while it is " "locked." msgstr "Questa conference è bloccata. Nessun altro può partecipare fino a che sarà bloccata." -#: ../src/core/sipe-conf.c:1382 +#: ../src/core/sipe-conf.c:1496 msgid "You have been disconnected from this conference." msgstr "Sei stato disconnesso da questa conferenza" -#: ../src/core/sipe-conf.c:1542 +#: ../src/core/sipe-conf.c:1656 msgid "Dial-in info" msgstr "" -#: ../src/core/sipe-conf.c:1543 +#: ../src/core/sipe-conf.c:1657 msgid "Number" msgstr "" -#: ../src/core/sipe-conf.c:1545 +#: ../src/core/sipe-conf.c:1659 msgid "Conference ID" msgstr "" -#: ../src/core/sipe-conf.c:1547 +#: ../src/core/sipe-conf.c:1661 msgid "Meeting link" msgstr "" -#: ../src/core/sipe-conf.c:1549 +#: ../src/core/sipe-conf.c:1663 msgid "Organizer" msgstr "" -#: ../src/core/sipe-conf.c:1551 +#: ../src/core/sipe-conf.c:1665 msgid "Alternative dial-in numbers" msgstr "" #. The next 13 texts make up the SIPE about note text #. About note, part 1/13: introduction -#: ../src/core/sipe-core.c:220 +#: ../src/core/sipe-core.c:221 msgid "" "A third-party plugin implementing extended version of SIP/SIMPLE used by " "various products" msgstr "Un plugin che implementa una versione estesa di SIP/SIMPLE usato in molti prodotti" #. About note, part 2/13: home page URL (label) -#: ../src/core/sipe-core.c:222 +#: ../src/core/sipe-core.c:223 msgid "Home Page" msgstr "Pagina principale" #. About note, part 3/13: support forum URL (label) -#: ../src/core/sipe-core.c:224 +#: ../src/core/sipe-core.c:225 msgid "Support" msgstr "Supporto" #. About note, part 4/13: support forum name (hyperlink text) -#: ../src/core/sipe-core.c:226 +#: ../src/core/sipe-core.c:227 msgid "Help Forum" msgstr "Forum di Aiuto" #. About note, part 5/13: bug tracker URL (label) -#: ../src/core/sipe-core.c:228 +#: ../src/core/sipe-core.c:229 msgid "Report Problems" msgstr "Riporta Problemi" #. About note, part 6/13: bug tracker URL (hyperlink text) -#: ../src/core/sipe-core.c:230 +#: ../src/core/sipe-core.c:231 msgid "Bug Tracker" msgstr "Bug Tracker" #. About note, part 7/13: translation service URL (label) -#: ../src/core/sipe-core.c:232 +#: ../src/core/sipe-core.c:233 msgid "Translations" msgstr "Traduzioni" #. About note, part 8/13: license type (label) -#: ../src/core/sipe-core.c:234 +#: ../src/core/sipe-core.c:235 msgid "License" msgstr "Licenza" #. About note, part 9/13: (REMOVED) #. About note, part 10/13: translation request, text before Transifex.com URL #. append a space if text is not empty -#: ../src/core/sipe-core.c:238 +#: ../src/core/sipe-core.c:239 msgid "Please help us to translate SIPE to your native language here at " msgstr "Per favore aiutaci a tradurre SIPI nella tua lingua madra qui in" #. About note, part 11/13: translation request, text after Transifex.com URL #. start with a space if text is not empty -#: ../src/core/sipe-core.c:241 +#: ../src/core/sipe-core.c:242 msgid " using convenient web interface" msgstr "usando una comoda interfaccia web" #. About note, part 12/13: author list (header) -#: ../src/core/sipe-core.c:243 +#: ../src/core/sipe-core.c:244 msgid "Authors" msgstr "Autori" @@ -394,15 +411,15 @@ #. PLEASE NOTE: do *NOT* simply translate the english original #. but write something similar to the following sentence: #. "Localization for (): " -#: ../src/core/sipe-core.c:248 +#: ../src/core/sipe-core.c:249 msgid "Original texts in English (en): SIPE developers" msgstr "Traduzione in Italiano (it): Emanuele Zattin" -#: ../src/core/sipe-core.c:269 +#: ../src/core/sipe-core.c:273 msgid "SIP Exchange user name contains invalid characters" msgstr "Il nome utente di SIP Exchange contiene caratteri non validi" -#: ../src/core/sipe-core.c:277 ../src/purple/purple-buddy.c:485 +#: ../src/core/sipe-core.c:281 ../src/purple/purple-buddy.c:485 #: ../src/telepathy/telepathy-protocol.c:89 #: ../src/telepathy/telepathy-protocol.c:191 #, c-format @@ -411,21 +428,21 @@ "Example: user@company.com" msgstr "Il nome utente deve essere un SIP URI valido\nEsempio: utente@azienda.com" -#: ../src/core/sipe-core.c:284 +#: ../src/core/sipe-core.c:288 msgid "Password is required when Single Sign-On is not enabled" msgstr "" -#: ../src/core/sipe-core.c:294 +#: ../src/core/sipe-core.c:298 msgid "" "Email address should be valid if provided\n" "Example: user@company.com" msgstr "L'indirizzo email deve essere valido se fornito\nEsempio: utente@azienda.com" -#: ../src/core/sipe-core.c:303 +#: ../src/core/sipe-core.c:307 msgid "SIP Exchange user name contains whitespace" msgstr "Il nome utente di SIP Exchange contiene spazi bianchi" -#: ../src/core/sipe-core.c:317 +#: ../src/core/sipe-core.c:321 msgid "" "Email services URL should be valid if provided\n" "Example: https://exchange.corp.com/EWS/Exchange.asmx\n" @@ -456,13 +473,13 @@ msgid "Could not create listen socket" msgstr "Impossibile creare il socket in ascolto" -#: ../src/core/sipe-ft-lync.c:757 ../src/core/sipe-media.c:1195 -#: ../src/core/sipe-media.c:1206 ../src/core/sipe-media.c:1284 -#: ../src/core/sipe-media.c:1740 +#: ../src/core/sipe-ft-lync.c:762 ../src/core/sipe-media.c:1328 +#: ../src/core/sipe-media.c:1339 ../src/core/sipe-media.c:1417 +#: ../src/core/sipe-media.c:1923 msgid "Error occurred" msgstr "" -#: ../src/core/sipe-ft-lync.c:758 +#: ../src/core/sipe-ft-lync.c:763 msgid "Error creating data stream" msgstr "" @@ -497,7 +514,7 @@ msgstr "Memoria esaurita" #: ../src/core/sipe-group.c:168 ../src/core/sipe-notify.c:1163 -#: ../src/core/sipe-notify.c:1190 ../src/core/sipe-notify.c:1294 +#: ../src/core/sipe-notify.c:1197 ../src/core/sipe-notify.c:1301 #: ../src/purple/purple-search.c:128 msgid "Other Contacts" msgstr "Altri Contatti" @@ -535,77 +552,77 @@ msgid "Failed to invite %s" msgstr "Errore nell'invitare %s" -#: ../src/core/sipe-incoming.c:741 +#: ../src/core/sipe-incoming.c:754 #, c-format msgid "Received a message with unrecognized contents from %s" msgstr "È stato ricevuto un messaggio con contenuti non riconosciuti da %s" -#: ../src/core/sipe-media.c:835 ../src/core/sipe-media.c:1347 -#: ../src/core/sipe-media.c:1357 ../src/core/sipe-media.c:1721 -#: ../src/core/sipe-media.c:1741 +#: ../src/core/sipe-media.c:869 ../src/core/sipe-media.c:1483 +#: ../src/core/sipe-media.c:1493 ../src/core/sipe-media.c:1904 +#: ../src/core/sipe-media.c:1924 msgid "Unable to establish a call" msgstr "Impossibile stabilire una chiamata" -#: ../src/core/sipe-media.c:836 ../src/core/sipe-media.c:1722 +#: ../src/core/sipe-media.c:870 ../src/core/sipe-media.c:1905 msgid "Encryption settings of peer are incompatible with ours." msgstr "I settaggi del criptaggio del peer sono incompatibili con i nostri." -#: ../src/core/sipe-media.c:929 +#: ../src/core/sipe-media.c:963 #, c-format msgid "User %s rejected call" msgstr "L'utente %s ha rifiutato la chiamata" -#: ../src/core/sipe-media.c:930 +#: ../src/core/sipe-media.c:964 msgid "Call rejected" msgstr "Chiamata rifiutata" -#: ../src/core/sipe-media.c:1196 ../src/core/sipe-media.c:1285 +#: ../src/core/sipe-media.c:1329 ../src/core/sipe-media.c:1418 msgid "Error creating audio stream" msgstr "Errore durante la creazione dello stream audio" -#: ../src/core/sipe-media.c:1207 +#: ../src/core/sipe-media.c:1340 msgid "Error creating video stream" msgstr "Errore durante la creazione dello stream video" -#: ../src/core/sipe-media.c:1251 ../src/purple/purple-chat.c:314 +#: ../src/core/sipe-media.c:1384 ../src/purple/purple-chat.c:329 msgid "Join conference call" msgstr "Partecipa alla chiamata in conferenza" -#: ../src/core/sipe-media.c:1252 +#: ../src/core/sipe-media.c:1385 msgid "Conference calls are not supported on this server." msgstr "" -#: ../src/core/sipe-media.c:1348 +#: ../src/core/sipe-media.c:1484 msgid "Invalid phone number" msgstr "Numero di telefono errato" -#: ../src/core/sipe-media.c:1358 +#: ../src/core/sipe-media.c:1494 msgid "Audio Test Service is not available." msgstr "Servizio per il test audio non disponibile" -#: ../src/core/sipe-media.c:1690 +#: ../src/core/sipe-media.c:1873 msgid "User unavailable" msgstr "Utente non disponibile:%s" -#: ../src/core/sipe-media.c:1693 +#: ../src/core/sipe-media.c:1876 #, c-format msgid "%s does not want to be disturbed" msgstr "%s non vuole essere disturbato/a" -#: ../src/core/sipe-media.c:1695 +#: ../src/core/sipe-media.c:1878 #, c-format msgid "User %s is not available" msgstr "L'utente %s non é disponibile" -#: ../src/core/sipe-media.c:1704 +#: ../src/core/sipe-media.c:1887 msgid "Unsupported media type" msgstr "Tipo di supporto non gestito" -#: ../src/core/sipe-media.c:2062 +#: ../src/core/sipe-media.c:2246 msgid "Media error" msgstr "" -#: ../src/core/sipe-media.c:2063 +#: ../src/core/sipe-media.c:2247 msgid "Error while reading from stream" msgstr "" @@ -656,36 +673,36 @@ msgstr "Sconosciuti" #. Translators: remove (clear) previously assigned access level -#: ../src/core/sipe-ocs2007.c:2571 +#: ../src/core/sipe-ocs2007.c:2570 msgid "Unspecify" msgstr "Rimuovi" -#: ../src/core/sipe-ocs2007.c:2590 +#: ../src/core/sipe-ocs2007.c:2589 msgid "People in my company" msgstr "Persone nella mia azienda" -#: ../src/core/sipe-ocs2007.c:2600 +#: ../src/core/sipe-ocs2007.c:2599 msgid "People in domains connected with my company" msgstr "Persone in domini connessi alla mia azienda" -#: ../src/core/sipe-ocs2007.c:2609 +#: ../src/core/sipe-ocs2007.c:2608 msgid "People in public domains" msgstr "Persone in domini pubblici" -#: ../src/core/sipe-ocs2007.c:2619 +#: ../src/core/sipe-ocs2007.c:2618 #, c-format msgid "People at %s" msgstr "Persone in %s" -#: ../src/core/sipe-ocs2007.c:2644 +#: ../src/core/sipe-ocs2007.c:2643 msgid "Add new domain..." msgstr "Aggiungi nuovo dominio..." -#: ../src/core/sipe-ocs2007.c:2673 +#: ../src/core/sipe-ocs2007.c:2672 msgid "Online help..." msgstr "Aiuto online..." -#: ../src/core/sipe-ocs2007.c:2681 +#: ../src/core/sipe-ocs2007.c:2680 msgid "Access groups" msgstr "Gruppi di accesso" @@ -697,49 +714,60 @@ #. SIPE_ACTIVITY_AVAILABLE #. SIPE_ACTIVITY_ONLINE #. SIPE_ACTIVITY_INACTIVE -#: ../src/core/sipe-status.c:58 +#: ../src/core/sipe-status.c:56 msgid "Inactive" msgstr "Inattivo" #. SIPE_ACTIVITY_BUSYIDLE -#: ../src/core/sipe-status.c:60 +#: ../src/core/sipe-status.c:58 msgid "Busy-Idle" msgstr "Occupato-Inattivo" #. SIPE_ACTIVITY_DND #. SIPE_ACTIVITY_BRB -#: ../src/core/sipe-status.c:62 +#: ../src/core/sipe-status.c:60 msgid "Be right back" msgstr "Torno subito" #. SIPE_ACTIVITY_AWAY #. SIPE_ACTIVITY_LUNCH -#: ../src/core/sipe-status.c:64 +#: ../src/core/sipe-status.c:62 msgid "Out to lunch" msgstr "A pranzo" #. SIPE_ACTIVITY_INVISIBLE #. SIPE_ACTIVITY_OFFLINE #. SIPE_ACTIVITY_ON_PHONE -#: ../src/core/sipe-status.c:67 +#: ../src/core/sipe-status.c:65 msgid "In a call" msgstr "Al telefono" #. SIPE_ACTIVITY_IN_CONF -#: ../src/core/sipe-status.c:68 +#: ../src/core/sipe-status.c:66 msgid "In a conference" msgstr "In una conferenza" #. SIPE_ACTIVITY_IN_MEETING -#: ../src/core/sipe-status.c:69 +#: ../src/core/sipe-status.c:67 msgid "In a meeting" msgstr "In riunione" #. SIPE_ACTIVITY_URGENT_ONLY -#: ../src/core/sipe-status.c:71 +#: ../src/core/sipe-status.c:69 msgid "Urgent interruptions only" msgstr "Solo interruzioni urgenti" +#: ../src/core/sipe-subscriptions.c:189 +msgid "Presence subscription failed!" +msgstr "" + +#: ../src/core/sipe-subscriptions.c:190 +msgid "" +"One or more buddies will therefore permanently show as offline.\n" +"\n" +"Please check that there are no corrupted SIP URIs in your contacts list." +msgstr "" + #: ../src/core/sipe-ucs.c:674 msgid "UCS initialization failed!" msgstr "" @@ -892,15 +920,19 @@ msgid "Copy to" msgstr "Copia in" -#: ../src/purple/purple-chat.c:295 +#: ../src/purple/purple-chat.c:310 msgid "Lock" msgstr "Blocca" -#: ../src/purple/purple-chat.c:300 +#: ../src/purple/purple-chat.c:315 msgid "Unlock" msgstr "Sblocca" -#: ../src/purple/purple-chat.c:321 +#: ../src/purple/purple-chat.c:338 +msgid "Show presentation" +msgstr "" + +#: ../src/purple/purple-chat.c:345 msgid "Meeting entry info" msgstr "" @@ -1152,26 +1184,30 @@ msgstr "Proxy della chat di gruppo\ncompany.com oppure user@company.com\n(lasciare vuoto per rilevare il proxy dal nome utente) " #: ../src/purple/purple-plugin-common.c:933 +msgid "Remote desktop client" +msgstr "" + +#: ../src/purple/purple-plugin-common.c:938 msgid "Media encryption" msgstr "" -#: ../src/purple/purple-plugin-common.c:934 +#: ../src/purple/purple-plugin-common.c:939 msgid "Obey server policy" msgstr "" -#: ../src/purple/purple-plugin-common.c:935 +#: ../src/purple/purple-plugin-common.c:940 msgid "Always" msgstr "" -#: ../src/purple/purple-plugin-common.c:936 +#: ../src/purple/purple-plugin-common.c:941 msgid "Optional" msgstr "" -#: ../src/purple/purple-plugin-common.c:937 +#: ../src/purple/purple-plugin-common.c:942 msgid "Disabled" msgstr "" -#: ../src/purple/purple-plugin-common.c:947 +#: ../src/purple/purple-plugin-common.c:952 msgid "" "Login\n" " user or DOMAIN\\user or\n" @@ -1220,27 +1256,27 @@ msgid "_Search" msgstr "_Cerca" -#: ../src/purple/purple-transport.c:132 +#: ../src/purple/purple-transport.c:135 msgid "Read error" msgstr "Errore di lettura" -#: ../src/purple/purple-transport.c:136 -#: ../src/telepathy/telepathy-transport.c:96 +#: ../src/purple/purple-transport.c:139 +#: ../src/telepathy/telepathy-transport.c:95 msgid "Server has disconnected" msgstr "Il server si è disconnesso" -#: ../src/purple/purple-transport.c:198 +#: ../src/purple/purple-transport.c:201 msgid "Could not connect" msgstr "Impossibile connettersi" -#: ../src/purple/purple-transport.c:268 +#: ../src/purple/purple-transport.c:271 msgid "Could not create SSL context" msgstr "Impossibile creare il contesto SSL" -#: ../src/purple/purple-transport.c:290 +#: ../src/purple/purple-transport.c:293 msgid "Could not create socket" msgstr "Errore nella creazione del socket" -#: ../src/purple/purple-transport.c:381 +#: ../src/purple/purple-transport.c:417 msgid "Write error" msgstr "Errore di scrittura" diff -Nru pidgin-sipe-1.21.1/po/ja.po pidgin-sipe-1.22.1/po/ja.po --- pidgin-sipe-1.21.1/po/ja.po 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/po/ja.po 2017-06-11 15:41:22.000000000 +0000 @@ -12,7 +12,7 @@ "Project-Id-Version: pidgin sipe\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/sipe/bugs/\n" "POT-Creation-Date: 2010-11-30 23:36+0200\n" -"PO-Revision-Date: 2016-05-28 15:08+0000\n" +"PO-Revision-Date: 2017-01-23 17:47+0000\n" "Last-Translator: Stefan Becker \n" "Language-Team: Japanese (http://www.transifex.com/stefanb/pidgin-sipe/language/ja/)\n" "MIME-Version: 1.0\n" @@ -21,212 +21,237 @@ "Language: ja\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../src/core/sip-transport.c:235 +#: ../src/core/sip-transport.c:240 msgid "Failed to authenticate to server" msgstr "サーバーに認証できませんでした" -#: ../src/core/sip-transport.c:293 +#: ../src/core/sip-transport.c:298 #, c-format msgid "Can't request certificate from %s" msgstr "" -#: ../src/core/sip-transport.c:303 +#: ../src/core/sip-transport.c:308 msgid "No URI for certificate provisioning service provided" msgstr "" -#: ../src/core/sip-transport.c:1281 +#: ../src/core/sip-transport.c:1285 msgid "Authentication failed" msgstr "認証は失敗しました" -#: ../src/core/sip-transport.c:1338 +#: ../src/core/sip-transport.c:1342 msgid "Incompatible authentication scheme chosen" msgstr "" -#: ../src/core/sip-transport.c:1355 ../src/core/sipe-notify.c:1149 +#: ../src/core/sip-transport.c:1359 ../src/core/sipe-notify.c:1149 #, c-format msgid "You have been rejected by the server: %s" msgstr "サーバに拒否されました: %s" -#: ../src/core/sip-transport.c:1356 ../src/core/sip-transport.c:1372 -#: ../src/core/sip-transport.c:1396 ../src/core/sip-transport.c:1420 +#: ../src/core/sip-transport.c:1360 ../src/core/sip-transport.c:1376 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 #: ../src/core/sipe-conf.c:265 ../src/core/sipe-notify.c:1149 msgid "no reason given" msgstr "理由はわかりません" -#: ../src/core/sip-transport.c:1371 +#: ../src/core/sip-transport.c:1375 #, c-format msgid "Not found: %s. Please contact your Administrator" msgstr "" -#: ../src/core/sip-transport.c:1373 +#: ../src/core/sip-transport.c:1377 msgid "SIP is either not enabled for the destination URI or it does not exist" msgstr "" -#: ../src/core/sip-transport.c:1396 ../src/core/sip-transport.c:1420 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 #, c-format msgid "Service unavailable: %s" msgstr "サービスが利用できません: %s" -#: ../src/core/sip-transport.c:1766 +#: ../src/core/sip-transport.c:1775 msgid "Corrupted message received" msgstr "" -#: ../src/core/sip-transport.c:1790 +#: ../src/core/sip-transport.c:1799 msgid "Invalid message signature received" msgstr "受信したメッセージ署名が正しくありません" -#: ../src/core/sipe-buddy.c:540 ../src/core/sipe-buddy.c:2300 +#: ../src/core/sipe-appshare.c:458 +#, c-format +msgid "%s wants to start presenting" +msgstr "" + +#: ../src/core/sipe-appshare.c:462 ../src/core/sipe-conf.c:1086 +msgid "Accept" +msgstr "承諾" + +#: ../src/core/sipe-appshare.c:463 ../src/core/sipe-conf.c:1087 +msgid "Decline" +msgstr "否定" + +#: ../src/core/sipe-appshare.c:501 ../src/core/sipe-appshare.c:599 +msgid "Application sharing error" +msgstr "" + +#: ../src/core/sipe-appshare.c:502 +msgid "Unknown remote desktop client configured." +msgstr "" + +#: ../src/core/sipe-appshare.c:600 +msgid "Couldn't connect application sharing" +msgstr "" + +#: ../src/core/sipe-buddy.c:541 ../src/core/sipe-buddy.c:2301 msgid "Mobile" msgstr "携帯" -#: ../src/core/sipe-buddy.c:828 +#: ../src/core/sipe-buddy.c:829 msgid "Status" msgstr "状態" -#: ../src/core/sipe-buddy.c:831 +#: ../src/core/sipe-buddy.c:832 msgid "Calendar" msgstr "カレンダー" -#: ../src/core/sipe-buddy.c:836 +#: ../src/core/sipe-buddy.c:837 msgid "Meeting in" msgstr "会議室" -#: ../src/core/sipe-buddy.c:840 +#: ../src/core/sipe-buddy.c:841 msgid "Meeting about" msgstr "会議課題" -#: ../src/core/sipe-buddy.c:845 +#: ../src/core/sipe-buddy.c:846 msgid "Out of office note" msgstr "外出参考" -#: ../src/core/sipe-buddy.c:845 +#: ../src/core/sipe-buddy.c:846 msgid "Note" msgstr "メモ" -#: ../src/core/sipe-buddy.c:850 ../src/core/sipe-buddy.c:2345 +#: ../src/core/sipe-buddy.c:851 ../src/core/sipe-buddy.c:2346 #: ../src/purple/purple-buddy.c:633 msgid "Access level" msgstr "アクセスレベル" -#: ../src/core/sipe-buddy.c:1073 +#: ../src/core/sipe-buddy.c:1074 #, c-format msgid "Found %d contact%s:" msgid_plural "Found %d contacts%s:" msgstr[0] "%d連絡先が見つかりました%s:" -#: ../src/core/sipe-buddy.c:1075 +#: ../src/core/sipe-buddy.c:1076 msgid " (more matched your query)" msgstr " (クエリに一致したものが他にもあります)" -#: ../src/core/sipe-buddy.c:1121 ../src/core/sipe-buddy.c:1259 +#: ../src/core/sipe-buddy.c:1122 ../src/core/sipe-buddy.c:1260 #: ../src/core/sipe-ucs.c:314 msgid "No contacts found" msgstr "連絡先は見つかりませんでした" -#: ../src/core/sipe-buddy.c:1134 ../src/core/sipe-buddy.c:1272 +#: ../src/core/sipe-buddy.c:1135 ../src/core/sipe-buddy.c:1273 #: ../src/core/sipe-ucs.c:278 msgid "Unable to display the search results" msgstr "検索結果は表示できませんでした" -#: ../src/core/sipe-buddy.c:1237 ../src/core/sipe-buddy.c:1249 +#: ../src/core/sipe-buddy.c:1238 ../src/core/sipe-buddy.c:1250 #: ../src/core/sipe-ucs.c:391 msgid "Contact search failed" msgstr "連絡先検索失敗しました" -#: ../src/core/sipe-buddy.c:1412 ../src/core/sipe-ucs.c:395 +#: ../src/core/sipe-buddy.c:1413 ../src/core/sipe-ucs.c:395 msgid "Invalid contact search query" msgstr "" -#: ../src/core/sipe-buddy.c:2237 +#: ../src/core/sipe-buddy.c:2238 #, c-format msgid "Make leader of '%s'" msgstr "「%s」のリーダーにします" -#: ../src/core/sipe-buddy.c:2250 +#: ../src/core/sipe-buddy.c:2251 #, c-format msgid "Remove from '%s'" msgstr "「%s」から取り除く" -#: ../src/core/sipe-buddy.c:2264 +#: ../src/core/sipe-buddy.c:2265 #, c-format msgid "Invite to '%s'" msgstr "「%s」に誘います" -#: ../src/core/sipe-buddy.c:2280 +#: ../src/core/sipe-buddy.c:2281 msgid "New chat" msgstr "新しいチャット" -#: ../src/core/sipe-buddy.c:2293 +#: ../src/core/sipe-buddy.c:2294 msgid "Work" msgstr "勤務先" -#: ../src/core/sipe-buddy.c:2308 +#: ../src/core/sipe-buddy.c:2309 msgid "Home" msgstr "自宅" -#: ../src/core/sipe-buddy.c:2316 +#: ../src/core/sipe-buddy.c:2317 msgid "Other" msgstr "その他" -#: ../src/core/sipe-buddy.c:2324 +#: ../src/core/sipe-buddy.c:2325 msgid "Custom1" msgstr "カスタム１" -#: ../src/core/sipe-buddy.c:2334 +#: ../src/core/sipe-buddy.c:2335 msgid "Send email..." msgstr "メールを送ります。。。" -#: ../src/core/sipe-cal.c:907 +#: ../src/core/sipe-cal.c:906 msgid "Free" msgstr "開いている" -#: ../src/core/sipe-cal.c:908 +#: ../src/core/sipe-cal.c:907 msgid "Tentative" msgstr "保留" #. SIPE_ACTIVITY_BUSY -#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:59 +#: ../src/core/sipe-cal.c:908 ../src/core/sipe-status.c:57 msgid "Busy" msgstr "取り込み中" #. SIPE_ACTIVITY_OOF -#: ../src/core/sipe-cal.c:910 ../src/core/sipe-status.c:70 +#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:68 msgid "Out of office" msgstr "外出中" -#: ../src/core/sipe-cal.c:911 +#: ../src/core/sipe-cal.c:910 msgid "No data" msgstr "データなし" -#: ../src/core/sipe-cal.c:1019 ../src/core/sipe-cal.c:1046 +#: ../src/core/sipe-cal.c:1018 ../src/core/sipe-cal.c:1045 #, c-format msgid "Currently %s" msgstr "現在%s" -#: ../src/core/sipe-cal.c:1025 +#: ../src/core/sipe-cal.c:1024 msgid "Outside of working hours for next 8 hours" msgstr "" -#: ../src/core/sipe-cal.c:1027 +#: ../src/core/sipe-cal.c:1026 #, c-format msgid "%s for next 8 hours" msgstr "これから８時間%s" -#: ../src/core/sipe-cal.c:1036 +#: ../src/core/sipe-cal.c:1035 msgid "Not working" msgstr "" -#: ../src/core/sipe-cal.c:1040 +#: ../src/core/sipe-cal.c:1039 #, c-format msgid "%s until %.2d:%.2d" msgstr "%s、%.2d:%.2dまで" -#: ../src/core/sipe-cal.c:1048 +#: ../src/core/sipe-cal.c:1047 #, c-format msgid "%s. Outside of working hours at %.2d:%.2d" msgstr "" -#: ../src/core/sipe-cal.c:1053 +#: ../src/core/sipe-cal.c:1052 #, c-format msgid "%s. %s at %.2d:%.2d" msgstr "%s。%s、%.2d:%.2dから" @@ -242,7 +267,7 @@ msgstr "" #. Generate next ID -#: ../src/core/sipe-chat.c:240 +#: ../src/core/sipe-chat.c:246 #, c-format msgid "Chat #%d" msgstr "チャット%d番" @@ -269,123 +294,115 @@ msgid "Incomplete conference information provided" msgstr "" -#: ../src/core/sipe-conf.c:1041 +#: ../src/core/sipe-conf.c:1106 msgid "" "\n" "\n" "As this client was not compiled with voice call support, if you accept, you will be able to contact the other participants only via IM session." msgstr "" -#: ../src/core/sipe-conf.c:1049 +#: ../src/core/sipe-conf.c:1111 #, c-format -msgid "%s wants to invite you to the conference call%s" +msgid "wants to invite you to a conference call%s" msgstr "" -#: ../src/core/sipe-conf.c:1063 -msgid "Accept" -msgstr "承諾" - -#: ../src/core/sipe-conf.c:1064 -msgid "Decline" -msgstr "否定" - -#: ../src/core/sipe-conf.c:1345 +#: ../src/core/sipe-conf.c:1459 msgid "" "This conference is no longer locked. Additional participants can now join." msgstr "会議のロックは解除されました。他の人は参加できるようになりました。" -#: ../src/core/sipe-conf.c:1349 +#: ../src/core/sipe-conf.c:1463 msgid "" "This conference is locked. Nobody else can join the conference while it is " "locked." msgstr "会議はロックされています。ロックは解除されたまで他の人は参加できません。" -#: ../src/core/sipe-conf.c:1382 +#: ../src/core/sipe-conf.c:1496 msgid "You have been disconnected from this conference." msgstr "オンライン会議からログアウトされました" -#: ../src/core/sipe-conf.c:1542 +#: ../src/core/sipe-conf.c:1656 msgid "Dial-in info" msgstr "" -#: ../src/core/sipe-conf.c:1543 +#: ../src/core/sipe-conf.c:1657 msgid "Number" msgstr "" -#: ../src/core/sipe-conf.c:1545 +#: ../src/core/sipe-conf.c:1659 msgid "Conference ID" msgstr "" -#: ../src/core/sipe-conf.c:1547 +#: ../src/core/sipe-conf.c:1661 msgid "Meeting link" msgstr "" -#: ../src/core/sipe-conf.c:1549 +#: ../src/core/sipe-conf.c:1663 msgid "Organizer" msgstr "" -#: ../src/core/sipe-conf.c:1551 +#: ../src/core/sipe-conf.c:1665 msgid "Alternative dial-in numbers" msgstr "" #. The next 13 texts make up the SIPE about note text #. About note, part 1/13: introduction -#: ../src/core/sipe-core.c:220 +#: ../src/core/sipe-core.c:221 msgid "" "A third-party plugin implementing extended version of SIP/SIMPLE used by " "various products" msgstr "" #. About note, part 2/13: home page URL (label) -#: ../src/core/sipe-core.c:222 +#: ../src/core/sipe-core.c:223 msgid "Home Page" msgstr "ホームページ" #. About note, part 3/13: support forum URL (label) -#: ../src/core/sipe-core.c:224 +#: ../src/core/sipe-core.c:225 msgid "Support" msgstr "サポート" #. About note, part 4/13: support forum name (hyperlink text) -#: ../src/core/sipe-core.c:226 +#: ../src/core/sipe-core.c:227 msgid "Help Forum" msgstr "" #. About note, part 5/13: bug tracker URL (label) -#: ../src/core/sipe-core.c:228 +#: ../src/core/sipe-core.c:229 msgid "Report Problems" msgstr "" #. About note, part 6/13: bug tracker URL (hyperlink text) -#: ../src/core/sipe-core.c:230 +#: ../src/core/sipe-core.c:231 msgid "Bug Tracker" msgstr "" #. About note, part 7/13: translation service URL (label) -#: ../src/core/sipe-core.c:232 +#: ../src/core/sipe-core.c:233 msgid "Translations" msgstr "翻訳" #. About note, part 8/13: license type (label) -#: ../src/core/sipe-core.c:234 +#: ../src/core/sipe-core.c:235 msgid "License" msgstr "ライセンス" #. About note, part 9/13: (REMOVED) #. About note, part 10/13: translation request, text before Transifex.com URL #. append a space if text is not empty -#: ../src/core/sipe-core.c:238 +#: ../src/core/sipe-core.c:239 msgid "Please help us to translate SIPE to your native language here at " msgstr "" #. About note, part 11/13: translation request, text after Transifex.com URL #. start with a space if text is not empty -#: ../src/core/sipe-core.c:241 +#: ../src/core/sipe-core.c:242 msgid " using convenient web interface" msgstr "" #. About note, part 12/13: author list (header) -#: ../src/core/sipe-core.c:243 +#: ../src/core/sipe-core.c:244 msgid "Authors" msgstr "作者" @@ -393,15 +410,15 @@ #. PLEASE NOTE: do *NOT* simply translate the english original #. but write something similar to the following sentence: #. "Localization for (): " -#: ../src/core/sipe-core.c:248 +#: ../src/core/sipe-core.c:249 msgid "Original texts in English (en): SIPE developers" msgstr "" -#: ../src/core/sipe-core.c:269 +#: ../src/core/sipe-core.c:273 msgid "SIP Exchange user name contains invalid characters" msgstr "" -#: ../src/core/sipe-core.c:277 ../src/purple/purple-buddy.c:485 +#: ../src/core/sipe-core.c:281 ../src/purple/purple-buddy.c:485 #: ../src/telepathy/telepathy-protocol.c:89 #: ../src/telepathy/telepathy-protocol.c:191 #, c-format @@ -410,21 +427,21 @@ "Example: user@company.com" msgstr "" -#: ../src/core/sipe-core.c:284 +#: ../src/core/sipe-core.c:288 msgid "Password is required when Single Sign-On is not enabled" msgstr "" -#: ../src/core/sipe-core.c:294 +#: ../src/core/sipe-core.c:298 msgid "" "Email address should be valid if provided\n" "Example: user@company.com" msgstr "" -#: ../src/core/sipe-core.c:303 +#: ../src/core/sipe-core.c:307 msgid "SIP Exchange user name contains whitespace" msgstr "" -#: ../src/core/sipe-core.c:317 +#: ../src/core/sipe-core.c:321 msgid "" "Email services URL should be valid if provided\n" "Example: https://exchange.corp.com/EWS/Exchange.asmx\n" @@ -455,13 +472,13 @@ msgid "Could not create listen socket" msgstr "監視ソケットを生成できませんでした" -#: ../src/core/sipe-ft-lync.c:757 ../src/core/sipe-media.c:1195 -#: ../src/core/sipe-media.c:1206 ../src/core/sipe-media.c:1284 -#: ../src/core/sipe-media.c:1740 +#: ../src/core/sipe-ft-lync.c:762 ../src/core/sipe-media.c:1328 +#: ../src/core/sipe-media.c:1339 ../src/core/sipe-media.c:1417 +#: ../src/core/sipe-media.c:1923 msgid "Error occurred" msgstr "" -#: ../src/core/sipe-ft-lync.c:758 +#: ../src/core/sipe-ft-lync.c:763 msgid "Error creating data stream" msgstr "" @@ -496,7 +513,7 @@ msgstr "メモリー不足" #: ../src/core/sipe-group.c:168 ../src/core/sipe-notify.c:1163 -#: ../src/core/sipe-notify.c:1190 ../src/core/sipe-notify.c:1294 +#: ../src/core/sipe-notify.c:1197 ../src/core/sipe-notify.c:1301 #: ../src/purple/purple-search.c:128 msgid "Other Contacts" msgstr "その他の連絡先" @@ -534,77 +551,77 @@ msgid "Failed to invite %s" msgstr "%sを招待できませんでした" -#: ../src/core/sipe-incoming.c:741 +#: ../src/core/sipe-incoming.c:754 #, c-format msgid "Received a message with unrecognized contents from %s" msgstr "" -#: ../src/core/sipe-media.c:835 ../src/core/sipe-media.c:1347 -#: ../src/core/sipe-media.c:1357 ../src/core/sipe-media.c:1721 -#: ../src/core/sipe-media.c:1741 +#: ../src/core/sipe-media.c:869 ../src/core/sipe-media.c:1483 +#: ../src/core/sipe-media.c:1493 ../src/core/sipe-media.c:1904 +#: ../src/core/sipe-media.c:1924 msgid "Unable to establish a call" msgstr "" -#: ../src/core/sipe-media.c:836 ../src/core/sipe-media.c:1722 +#: ../src/core/sipe-media.c:870 ../src/core/sipe-media.c:1905 msgid "Encryption settings of peer are incompatible with ours." msgstr "" -#: ../src/core/sipe-media.c:929 +#: ../src/core/sipe-media.c:963 #, c-format msgid "User %s rejected call" msgstr "" -#: ../src/core/sipe-media.c:930 +#: ../src/core/sipe-media.c:964 msgid "Call rejected" msgstr "呼び出しは否定されました" -#: ../src/core/sipe-media.c:1196 ../src/core/sipe-media.c:1285 +#: ../src/core/sipe-media.c:1329 ../src/core/sipe-media.c:1418 msgid "Error creating audio stream" msgstr "" -#: ../src/core/sipe-media.c:1207 +#: ../src/core/sipe-media.c:1340 msgid "Error creating video stream" msgstr "" -#: ../src/core/sipe-media.c:1251 ../src/purple/purple-chat.c:314 +#: ../src/core/sipe-media.c:1384 ../src/purple/purple-chat.c:329 msgid "Join conference call" msgstr "オンライン会議に参加する" -#: ../src/core/sipe-media.c:1252 +#: ../src/core/sipe-media.c:1385 msgid "Conference calls are not supported on this server." msgstr "" -#: ../src/core/sipe-media.c:1348 +#: ../src/core/sipe-media.c:1484 msgid "Invalid phone number" msgstr "" -#: ../src/core/sipe-media.c:1358 +#: ../src/core/sipe-media.c:1494 msgid "Audio Test Service is not available." msgstr "" -#: ../src/core/sipe-media.c:1690 +#: ../src/core/sipe-media.c:1873 msgid "User unavailable" msgstr "" -#: ../src/core/sipe-media.c:1693 +#: ../src/core/sipe-media.c:1876 #, c-format msgid "%s does not want to be disturbed" msgstr "" -#: ../src/core/sipe-media.c:1695 +#: ../src/core/sipe-media.c:1878 #, c-format msgid "User %s is not available" msgstr "" -#: ../src/core/sipe-media.c:1704 +#: ../src/core/sipe-media.c:1887 msgid "Unsupported media type" msgstr "" -#: ../src/core/sipe-media.c:2062 +#: ../src/core/sipe-media.c:2246 msgid "Media error" msgstr "" -#: ../src/core/sipe-media.c:2063 +#: ../src/core/sipe-media.c:2247 msgid "Error while reading from stream" msgstr "" @@ -655,36 +672,36 @@ msgstr "不明" #. Translators: remove (clear) previously assigned access level -#: ../src/core/sipe-ocs2007.c:2571 +#: ../src/core/sipe-ocs2007.c:2570 msgid "Unspecify" msgstr "指定をなくする" -#: ../src/core/sipe-ocs2007.c:2590 +#: ../src/core/sipe-ocs2007.c:2589 msgid "People in my company" msgstr "" -#: ../src/core/sipe-ocs2007.c:2600 +#: ../src/core/sipe-ocs2007.c:2599 msgid "People in domains connected with my company" msgstr "" -#: ../src/core/sipe-ocs2007.c:2609 +#: ../src/core/sipe-ocs2007.c:2608 msgid "People in public domains" msgstr "" -#: ../src/core/sipe-ocs2007.c:2619 +#: ../src/core/sipe-ocs2007.c:2618 #, c-format msgid "People at %s" msgstr "%sにいる人々" -#: ../src/core/sipe-ocs2007.c:2644 +#: ../src/core/sipe-ocs2007.c:2643 msgid "Add new domain..." msgstr "ドメインを追加する。。。" -#: ../src/core/sipe-ocs2007.c:2673 +#: ../src/core/sipe-ocs2007.c:2672 msgid "Online help..." msgstr "オンラインヘルプ。。。" -#: ../src/core/sipe-ocs2007.c:2681 +#: ../src/core/sipe-ocs2007.c:2680 msgid "Access groups" msgstr "" @@ -696,49 +713,60 @@ #. SIPE_ACTIVITY_AVAILABLE #. SIPE_ACTIVITY_ONLINE #. SIPE_ACTIVITY_INACTIVE -#: ../src/core/sipe-status.c:58 +#: ../src/core/sipe-status.c:56 msgid "Inactive" msgstr "" #. SIPE_ACTIVITY_BUSYIDLE -#: ../src/core/sipe-status.c:60 +#: ../src/core/sipe-status.c:58 msgid "Busy-Idle" msgstr "" #. SIPE_ACTIVITY_DND #. SIPE_ACTIVITY_BRB -#: ../src/core/sipe-status.c:62 +#: ../src/core/sipe-status.c:60 msgid "Be right back" msgstr "一時退席" #. SIPE_ACTIVITY_AWAY #. SIPE_ACTIVITY_LUNCH -#: ../src/core/sipe-status.c:64 +#: ../src/core/sipe-status.c:62 msgid "Out to lunch" msgstr "昼休み" #. SIPE_ACTIVITY_INVISIBLE #. SIPE_ACTIVITY_OFFLINE #. SIPE_ACTIVITY_ON_PHONE -#: ../src/core/sipe-status.c:67 +#: ../src/core/sipe-status.c:65 msgid "In a call" msgstr "話し中" #. SIPE_ACTIVITY_IN_CONF -#: ../src/core/sipe-status.c:68 +#: ../src/core/sipe-status.c:66 msgid "In a conference" msgstr "会談中" #. SIPE_ACTIVITY_IN_MEETING -#: ../src/core/sipe-status.c:69 +#: ../src/core/sipe-status.c:67 msgid "In a meeting" msgstr "会議中" #. SIPE_ACTIVITY_URGENT_ONLY -#: ../src/core/sipe-status.c:71 +#: ../src/core/sipe-status.c:69 msgid "Urgent interruptions only" msgstr "" +#: ../src/core/sipe-subscriptions.c:189 +msgid "Presence subscription failed!" +msgstr "" + +#: ../src/core/sipe-subscriptions.c:190 +msgid "" +"One or more buddies will therefore permanently show as offline.\n" +"\n" +"Please check that there are no corrupted SIP URIs in your contacts list." +msgstr "" + #: ../src/core/sipe-ucs.c:674 msgid "UCS initialization failed!" msgstr "" @@ -891,15 +919,19 @@ msgid "Copy to" msgstr "コピー" -#: ../src/purple/purple-chat.c:295 +#: ../src/purple/purple-chat.c:310 msgid "Lock" msgstr "ロック" -#: ../src/purple/purple-chat.c:300 +#: ../src/purple/purple-chat.c:315 msgid "Unlock" msgstr "ロック解除" -#: ../src/purple/purple-chat.c:321 +#: ../src/purple/purple-chat.c:338 +msgid "Show presentation" +msgstr "" + +#: ../src/purple/purple-chat.c:345 msgid "Meeting entry info" msgstr "" @@ -1151,26 +1183,30 @@ msgstr "" #: ../src/purple/purple-plugin-common.c:933 +msgid "Remote desktop client" +msgstr "" + +#: ../src/purple/purple-plugin-common.c:938 msgid "Media encryption" msgstr "" -#: ../src/purple/purple-plugin-common.c:934 +#: ../src/purple/purple-plugin-common.c:939 msgid "Obey server policy" msgstr "" -#: ../src/purple/purple-plugin-common.c:935 +#: ../src/purple/purple-plugin-common.c:940 msgid "Always" msgstr "" -#: ../src/purple/purple-plugin-common.c:936 +#: ../src/purple/purple-plugin-common.c:941 msgid "Optional" msgstr "" -#: ../src/purple/purple-plugin-common.c:937 +#: ../src/purple/purple-plugin-common.c:942 msgid "Disabled" msgstr "" -#: ../src/purple/purple-plugin-common.c:947 +#: ../src/purple/purple-plugin-common.c:952 msgid "" "Login\n" " user or DOMAIN\\user or\n" @@ -1219,27 +1255,27 @@ msgid "_Search" msgstr "検索(_S)" -#: ../src/purple/purple-transport.c:132 +#: ../src/purple/purple-transport.c:135 msgid "Read error" msgstr "読み込みエラー" -#: ../src/purple/purple-transport.c:136 -#: ../src/telepathy/telepathy-transport.c:96 +#: ../src/purple/purple-transport.c:139 +#: ../src/telepathy/telepathy-transport.c:95 msgid "Server has disconnected" msgstr "サーバが切断しました" -#: ../src/purple/purple-transport.c:198 +#: ../src/purple/purple-transport.c:201 msgid "Could not connect" msgstr "接続できませんでした" -#: ../src/purple/purple-transport.c:268 +#: ../src/purple/purple-transport.c:271 msgid "Could not create SSL context" msgstr "SSLコンテキストを作成できませんでした" -#: ../src/purple/purple-transport.c:290 +#: ../src/purple/purple-transport.c:293 msgid "Could not create socket" msgstr "ソケットを作成できませんでした" -#: ../src/purple/purple-transport.c:381 +#: ../src/purple/purple-transport.c:417 msgid "Write error" msgstr "書き込みエラー" diff -Nru pidgin-sipe-1.21.1/po/ko.po pidgin-sipe-1.22.1/po/ko.po --- pidgin-sipe-1.21.1/po/ko.po 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/po/ko.po 2017-06-11 15:41:22.000000000 +0000 @@ -11,7 +11,7 @@ "Project-Id-Version: pidgin sipe\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/sipe/bugs/\n" "POT-Creation-Date: 2010-11-30 23:36+0200\n" -"PO-Revision-Date: 2016-05-28 15:08+0000\n" +"PO-Revision-Date: 2017-01-23 17:47+0000\n" "Last-Translator: Stefan Becker \n" "Language-Team: Korean (http://www.transifex.com/stefanb/pidgin-sipe/language/ko/)\n" "MIME-Version: 1.0\n" @@ -20,212 +20,237 @@ "Language: ko\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../src/core/sip-transport.c:235 +#: ../src/core/sip-transport.c:240 msgid "Failed to authenticate to server" msgstr "" -#: ../src/core/sip-transport.c:293 +#: ../src/core/sip-transport.c:298 #, c-format msgid "Can't request certificate from %s" msgstr "" -#: ../src/core/sip-transport.c:303 +#: ../src/core/sip-transport.c:308 msgid "No URI for certificate provisioning service provided" msgstr "" -#: ../src/core/sip-transport.c:1281 +#: ../src/core/sip-transport.c:1285 msgid "Authentication failed" msgstr "" -#: ../src/core/sip-transport.c:1338 +#: ../src/core/sip-transport.c:1342 msgid "Incompatible authentication scheme chosen" msgstr "" -#: ../src/core/sip-transport.c:1355 ../src/core/sipe-notify.c:1149 +#: ../src/core/sip-transport.c:1359 ../src/core/sipe-notify.c:1149 #, c-format msgid "You have been rejected by the server: %s" msgstr "서버에서 거부되었습니다. %s" -#: ../src/core/sip-transport.c:1356 ../src/core/sip-transport.c:1372 -#: ../src/core/sip-transport.c:1396 ../src/core/sip-transport.c:1420 +#: ../src/core/sip-transport.c:1360 ../src/core/sip-transport.c:1376 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 #: ../src/core/sipe-conf.c:265 ../src/core/sipe-notify.c:1149 msgid "no reason given" msgstr "이유가 없습니다." -#: ../src/core/sip-transport.c:1371 +#: ../src/core/sip-transport.c:1375 #, c-format msgid "Not found: %s. Please contact your Administrator" msgstr "" -#: ../src/core/sip-transport.c:1373 +#: ../src/core/sip-transport.c:1377 msgid "SIP is either not enabled for the destination URI or it does not exist" msgstr "" -#: ../src/core/sip-transport.c:1396 ../src/core/sip-transport.c:1420 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 #, c-format msgid "Service unavailable: %s" msgstr "서비스를 이용할 수 없습니다. %s" -#: ../src/core/sip-transport.c:1766 +#: ../src/core/sip-transport.c:1775 msgid "Corrupted message received" msgstr "" -#: ../src/core/sip-transport.c:1790 +#: ../src/core/sip-transport.c:1799 msgid "Invalid message signature received" msgstr "잘못된 메시지 서명이 수신되었습니다." -#: ../src/core/sipe-buddy.c:540 ../src/core/sipe-buddy.c:2300 +#: ../src/core/sipe-appshare.c:458 +#, c-format +msgid "%s wants to start presenting" +msgstr "" + +#: ../src/core/sipe-appshare.c:462 ../src/core/sipe-conf.c:1086 +msgid "Accept" +msgstr "" + +#: ../src/core/sipe-appshare.c:463 ../src/core/sipe-conf.c:1087 +msgid "Decline" +msgstr "" + +#: ../src/core/sipe-appshare.c:501 ../src/core/sipe-appshare.c:599 +msgid "Application sharing error" +msgstr "" + +#: ../src/core/sipe-appshare.c:502 +msgid "Unknown remote desktop client configured." +msgstr "" + +#: ../src/core/sipe-appshare.c:600 +msgid "Couldn't connect application sharing" +msgstr "" + +#: ../src/core/sipe-buddy.c:541 ../src/core/sipe-buddy.c:2301 msgid "Mobile" msgstr "" -#: ../src/core/sipe-buddy.c:828 +#: ../src/core/sipe-buddy.c:829 msgid "Status" msgstr "" -#: ../src/core/sipe-buddy.c:831 +#: ../src/core/sipe-buddy.c:832 msgid "Calendar" msgstr "" -#: ../src/core/sipe-buddy.c:836 +#: ../src/core/sipe-buddy.c:837 msgid "Meeting in" msgstr "" -#: ../src/core/sipe-buddy.c:840 +#: ../src/core/sipe-buddy.c:841 msgid "Meeting about" msgstr "" -#: ../src/core/sipe-buddy.c:845 +#: ../src/core/sipe-buddy.c:846 msgid "Out of office note" msgstr "" -#: ../src/core/sipe-buddy.c:845 +#: ../src/core/sipe-buddy.c:846 msgid "Note" msgstr "" -#: ../src/core/sipe-buddy.c:850 ../src/core/sipe-buddy.c:2345 +#: ../src/core/sipe-buddy.c:851 ../src/core/sipe-buddy.c:2346 #: ../src/purple/purple-buddy.c:633 msgid "Access level" msgstr "" -#: ../src/core/sipe-buddy.c:1073 +#: ../src/core/sipe-buddy.c:1074 #, c-format msgid "Found %d contact%s:" msgid_plural "Found %d contacts%s:" msgstr[0] "%d contact%s 찾음:" -#: ../src/core/sipe-buddy.c:1075 +#: ../src/core/sipe-buddy.c:1076 msgid " (more matched your query)" msgstr " (더 많은 항목이 쿼리와 일치)" -#: ../src/core/sipe-buddy.c:1121 ../src/core/sipe-buddy.c:1259 +#: ../src/core/sipe-buddy.c:1122 ../src/core/sipe-buddy.c:1260 #: ../src/core/sipe-ucs.c:314 msgid "No contacts found" msgstr "" -#: ../src/core/sipe-buddy.c:1134 ../src/core/sipe-buddy.c:1272 +#: ../src/core/sipe-buddy.c:1135 ../src/core/sipe-buddy.c:1273 #: ../src/core/sipe-ucs.c:278 msgid "Unable to display the search results" msgstr "" -#: ../src/core/sipe-buddy.c:1237 ../src/core/sipe-buddy.c:1249 +#: ../src/core/sipe-buddy.c:1238 ../src/core/sipe-buddy.c:1250 #: ../src/core/sipe-ucs.c:391 msgid "Contact search failed" msgstr "" -#: ../src/core/sipe-buddy.c:1412 ../src/core/sipe-ucs.c:395 +#: ../src/core/sipe-buddy.c:1413 ../src/core/sipe-ucs.c:395 msgid "Invalid contact search query" msgstr "" -#: ../src/core/sipe-buddy.c:2237 +#: ../src/core/sipe-buddy.c:2238 #, c-format msgid "Make leader of '%s'" msgstr "" -#: ../src/core/sipe-buddy.c:2250 +#: ../src/core/sipe-buddy.c:2251 #, c-format msgid "Remove from '%s'" msgstr "" -#: ../src/core/sipe-buddy.c:2264 +#: ../src/core/sipe-buddy.c:2265 #, c-format msgid "Invite to '%s'" msgstr "" -#: ../src/core/sipe-buddy.c:2280 +#: ../src/core/sipe-buddy.c:2281 msgid "New chat" msgstr "" -#: ../src/core/sipe-buddy.c:2293 +#: ../src/core/sipe-buddy.c:2294 msgid "Work" msgstr "" -#: ../src/core/sipe-buddy.c:2308 +#: ../src/core/sipe-buddy.c:2309 msgid "Home" msgstr "" -#: ../src/core/sipe-buddy.c:2316 +#: ../src/core/sipe-buddy.c:2317 msgid "Other" msgstr "" -#: ../src/core/sipe-buddy.c:2324 +#: ../src/core/sipe-buddy.c:2325 msgid "Custom1" msgstr "" -#: ../src/core/sipe-buddy.c:2334 +#: ../src/core/sipe-buddy.c:2335 msgid "Send email..." msgstr "" -#: ../src/core/sipe-cal.c:907 +#: ../src/core/sipe-cal.c:906 msgid "Free" msgstr "" -#: ../src/core/sipe-cal.c:908 +#: ../src/core/sipe-cal.c:907 msgid "Tentative" msgstr "" #. SIPE_ACTIVITY_BUSY -#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:59 +#: ../src/core/sipe-cal.c:908 ../src/core/sipe-status.c:57 msgid "Busy" msgstr "다른 용무 중" #. SIPE_ACTIVITY_OOF -#: ../src/core/sipe-cal.c:910 ../src/core/sipe-status.c:70 +#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:68 msgid "Out of office" msgstr "" -#: ../src/core/sipe-cal.c:911 +#: ../src/core/sipe-cal.c:910 msgid "No data" msgstr "" -#: ../src/core/sipe-cal.c:1019 ../src/core/sipe-cal.c:1046 +#: ../src/core/sipe-cal.c:1018 ../src/core/sipe-cal.c:1045 #, c-format msgid "Currently %s" msgstr "" -#: ../src/core/sipe-cal.c:1025 +#: ../src/core/sipe-cal.c:1024 msgid "Outside of working hours for next 8 hours" msgstr "" -#: ../src/core/sipe-cal.c:1027 +#: ../src/core/sipe-cal.c:1026 #, c-format msgid "%s for next 8 hours" msgstr "" -#: ../src/core/sipe-cal.c:1036 +#: ../src/core/sipe-cal.c:1035 msgid "Not working" msgstr "" -#: ../src/core/sipe-cal.c:1040 +#: ../src/core/sipe-cal.c:1039 #, c-format msgid "%s until %.2d:%.2d" msgstr "" -#: ../src/core/sipe-cal.c:1048 +#: ../src/core/sipe-cal.c:1047 #, c-format msgid "%s. Outside of working hours at %.2d:%.2d" msgstr "" -#: ../src/core/sipe-cal.c:1053 +#: ../src/core/sipe-cal.c:1052 #, c-format msgid "%s. %s at %.2d:%.2d" msgstr "" @@ -241,7 +266,7 @@ msgstr "" #. Generate next ID -#: ../src/core/sipe-chat.c:240 +#: ../src/core/sipe-chat.c:246 #, c-format msgid "Chat #%d" msgstr "" @@ -268,123 +293,115 @@ msgid "Incomplete conference information provided" msgstr "" -#: ../src/core/sipe-conf.c:1041 +#: ../src/core/sipe-conf.c:1106 msgid "" "\n" "\n" "As this client was not compiled with voice call support, if you accept, you will be able to contact the other participants only via IM session." msgstr "" -#: ../src/core/sipe-conf.c:1049 +#: ../src/core/sipe-conf.c:1111 #, c-format -msgid "%s wants to invite you to the conference call%s" +msgid "wants to invite you to a conference call%s" msgstr "" -#: ../src/core/sipe-conf.c:1063 -msgid "Accept" -msgstr "" - -#: ../src/core/sipe-conf.c:1064 -msgid "Decline" -msgstr "" - -#: ../src/core/sipe-conf.c:1345 +#: ../src/core/sipe-conf.c:1459 msgid "" "This conference is no longer locked. Additional participants can now join." msgstr "" -#: ../src/core/sipe-conf.c:1349 +#: ../src/core/sipe-conf.c:1463 msgid "" "This conference is locked. Nobody else can join the conference while it is " "locked." msgstr "" -#: ../src/core/sipe-conf.c:1382 +#: ../src/core/sipe-conf.c:1496 msgid "You have been disconnected from this conference." msgstr "" -#: ../src/core/sipe-conf.c:1542 +#: ../src/core/sipe-conf.c:1656 msgid "Dial-in info" msgstr "" -#: ../src/core/sipe-conf.c:1543 +#: ../src/core/sipe-conf.c:1657 msgid "Number" msgstr "" -#: ../src/core/sipe-conf.c:1545 +#: ../src/core/sipe-conf.c:1659 msgid "Conference ID" msgstr "" -#: ../src/core/sipe-conf.c:1547 +#: ../src/core/sipe-conf.c:1661 msgid "Meeting link" msgstr "" -#: ../src/core/sipe-conf.c:1549 +#: ../src/core/sipe-conf.c:1663 msgid "Organizer" msgstr "" -#: ../src/core/sipe-conf.c:1551 +#: ../src/core/sipe-conf.c:1665 msgid "Alternative dial-in numbers" msgstr "" #. The next 13 texts make up the SIPE about note text #. About note, part 1/13: introduction -#: ../src/core/sipe-core.c:220 +#: ../src/core/sipe-core.c:221 msgid "" "A third-party plugin implementing extended version of SIP/SIMPLE used by " "various products" msgstr "" #. About note, part 2/13: home page URL (label) -#: ../src/core/sipe-core.c:222 +#: ../src/core/sipe-core.c:223 msgid "Home Page" msgstr "" #. About note, part 3/13: support forum URL (label) -#: ../src/core/sipe-core.c:224 +#: ../src/core/sipe-core.c:225 msgid "Support" msgstr "" #. About note, part 4/13: support forum name (hyperlink text) -#: ../src/core/sipe-core.c:226 +#: ../src/core/sipe-core.c:227 msgid "Help Forum" msgstr "" #. About note, part 5/13: bug tracker URL (label) -#: ../src/core/sipe-core.c:228 +#: ../src/core/sipe-core.c:229 msgid "Report Problems" msgstr "" #. About note, part 6/13: bug tracker URL (hyperlink text) -#: ../src/core/sipe-core.c:230 +#: ../src/core/sipe-core.c:231 msgid "Bug Tracker" msgstr "" #. About note, part 7/13: translation service URL (label) -#: ../src/core/sipe-core.c:232 +#: ../src/core/sipe-core.c:233 msgid "Translations" msgstr "" #. About note, part 8/13: license type (label) -#: ../src/core/sipe-core.c:234 +#: ../src/core/sipe-core.c:235 msgid "License" msgstr "" #. About note, part 9/13: (REMOVED) #. About note, part 10/13: translation request, text before Transifex.com URL #. append a space if text is not empty -#: ../src/core/sipe-core.c:238 +#: ../src/core/sipe-core.c:239 msgid "Please help us to translate SIPE to your native language here at " msgstr "" #. About note, part 11/13: translation request, text after Transifex.com URL #. start with a space if text is not empty -#: ../src/core/sipe-core.c:241 +#: ../src/core/sipe-core.c:242 msgid " using convenient web interface" msgstr "" #. About note, part 12/13: author list (header) -#: ../src/core/sipe-core.c:243 +#: ../src/core/sipe-core.c:244 msgid "Authors" msgstr "" @@ -392,15 +409,15 @@ #. PLEASE NOTE: do *NOT* simply translate the english original #. but write something similar to the following sentence: #. "Localization for (): " -#: ../src/core/sipe-core.c:248 +#: ../src/core/sipe-core.c:249 msgid "Original texts in English (en): SIPE developers" msgstr "" -#: ../src/core/sipe-core.c:269 +#: ../src/core/sipe-core.c:273 msgid "SIP Exchange user name contains invalid characters" msgstr "" -#: ../src/core/sipe-core.c:277 ../src/purple/purple-buddy.c:485 +#: ../src/core/sipe-core.c:281 ../src/purple/purple-buddy.c:485 #: ../src/telepathy/telepathy-protocol.c:89 #: ../src/telepathy/telepathy-protocol.c:191 #, c-format @@ -409,21 +426,21 @@ "Example: user@company.com" msgstr "" -#: ../src/core/sipe-core.c:284 +#: ../src/core/sipe-core.c:288 msgid "Password is required when Single Sign-On is not enabled" msgstr "" -#: ../src/core/sipe-core.c:294 +#: ../src/core/sipe-core.c:298 msgid "" "Email address should be valid if provided\n" "Example: user@company.com" msgstr "" -#: ../src/core/sipe-core.c:303 +#: ../src/core/sipe-core.c:307 msgid "SIP Exchange user name contains whitespace" msgstr "" -#: ../src/core/sipe-core.c:317 +#: ../src/core/sipe-core.c:321 msgid "" "Email services URL should be valid if provided\n" "Example: https://exchange.corp.com/EWS/Exchange.asmx\n" @@ -454,13 +471,13 @@ msgid "Could not create listen socket" msgstr "수신 소켓을 생성할 수 없습니다." -#: ../src/core/sipe-ft-lync.c:757 ../src/core/sipe-media.c:1195 -#: ../src/core/sipe-media.c:1206 ../src/core/sipe-media.c:1284 -#: ../src/core/sipe-media.c:1740 +#: ../src/core/sipe-ft-lync.c:762 ../src/core/sipe-media.c:1328 +#: ../src/core/sipe-media.c:1339 ../src/core/sipe-media.c:1417 +#: ../src/core/sipe-media.c:1923 msgid "Error occurred" msgstr "" -#: ../src/core/sipe-ft-lync.c:758 +#: ../src/core/sipe-ft-lync.c:763 msgid "Error creating data stream" msgstr "" @@ -495,7 +512,7 @@ msgstr "" #: ../src/core/sipe-group.c:168 ../src/core/sipe-notify.c:1163 -#: ../src/core/sipe-notify.c:1190 ../src/core/sipe-notify.c:1294 +#: ../src/core/sipe-notify.c:1197 ../src/core/sipe-notify.c:1301 #: ../src/purple/purple-search.c:128 msgid "Other Contacts" msgstr "" @@ -533,77 +550,77 @@ msgid "Failed to invite %s" msgstr "" -#: ../src/core/sipe-incoming.c:741 +#: ../src/core/sipe-incoming.c:754 #, c-format msgid "Received a message with unrecognized contents from %s" msgstr "" -#: ../src/core/sipe-media.c:835 ../src/core/sipe-media.c:1347 -#: ../src/core/sipe-media.c:1357 ../src/core/sipe-media.c:1721 -#: ../src/core/sipe-media.c:1741 +#: ../src/core/sipe-media.c:869 ../src/core/sipe-media.c:1483 +#: ../src/core/sipe-media.c:1493 ../src/core/sipe-media.c:1904 +#: ../src/core/sipe-media.c:1924 msgid "Unable to establish a call" msgstr "" -#: ../src/core/sipe-media.c:836 ../src/core/sipe-media.c:1722 +#: ../src/core/sipe-media.c:870 ../src/core/sipe-media.c:1905 msgid "Encryption settings of peer are incompatible with ours." msgstr "" -#: ../src/core/sipe-media.c:929 +#: ../src/core/sipe-media.c:963 #, c-format msgid "User %s rejected call" msgstr "" -#: ../src/core/sipe-media.c:930 +#: ../src/core/sipe-media.c:964 msgid "Call rejected" msgstr "" -#: ../src/core/sipe-media.c:1196 ../src/core/sipe-media.c:1285 +#: ../src/core/sipe-media.c:1329 ../src/core/sipe-media.c:1418 msgid "Error creating audio stream" msgstr "" -#: ../src/core/sipe-media.c:1207 +#: ../src/core/sipe-media.c:1340 msgid "Error creating video stream" msgstr "" -#: ../src/core/sipe-media.c:1251 ../src/purple/purple-chat.c:314 +#: ../src/core/sipe-media.c:1384 ../src/purple/purple-chat.c:329 msgid "Join conference call" msgstr "" -#: ../src/core/sipe-media.c:1252 +#: ../src/core/sipe-media.c:1385 msgid "Conference calls are not supported on this server." msgstr "" -#: ../src/core/sipe-media.c:1348 +#: ../src/core/sipe-media.c:1484 msgid "Invalid phone number" msgstr "" -#: ../src/core/sipe-media.c:1358 +#: ../src/core/sipe-media.c:1494 msgid "Audio Test Service is not available." msgstr "" -#: ../src/core/sipe-media.c:1690 +#: ../src/core/sipe-media.c:1873 msgid "User unavailable" msgstr "" -#: ../src/core/sipe-media.c:1693 +#: ../src/core/sipe-media.c:1876 #, c-format msgid "%s does not want to be disturbed" msgstr "" -#: ../src/core/sipe-media.c:1695 +#: ../src/core/sipe-media.c:1878 #, c-format msgid "User %s is not available" msgstr "" -#: ../src/core/sipe-media.c:1704 +#: ../src/core/sipe-media.c:1887 msgid "Unsupported media type" msgstr "" -#: ../src/core/sipe-media.c:2062 +#: ../src/core/sipe-media.c:2246 msgid "Media error" msgstr "" -#: ../src/core/sipe-media.c:2063 +#: ../src/core/sipe-media.c:2247 msgid "Error while reading from stream" msgstr "" @@ -654,36 +671,36 @@ msgstr "" #. Translators: remove (clear) previously assigned access level -#: ../src/core/sipe-ocs2007.c:2571 +#: ../src/core/sipe-ocs2007.c:2570 msgid "Unspecify" msgstr "" -#: ../src/core/sipe-ocs2007.c:2590 +#: ../src/core/sipe-ocs2007.c:2589 msgid "People in my company" msgstr "" -#: ../src/core/sipe-ocs2007.c:2600 +#: ../src/core/sipe-ocs2007.c:2599 msgid "People in domains connected with my company" msgstr "" -#: ../src/core/sipe-ocs2007.c:2609 +#: ../src/core/sipe-ocs2007.c:2608 msgid "People in public domains" msgstr "" -#: ../src/core/sipe-ocs2007.c:2619 +#: ../src/core/sipe-ocs2007.c:2618 #, c-format msgid "People at %s" msgstr "" -#: ../src/core/sipe-ocs2007.c:2644 +#: ../src/core/sipe-ocs2007.c:2643 msgid "Add new domain..." msgstr "" -#: ../src/core/sipe-ocs2007.c:2673 +#: ../src/core/sipe-ocs2007.c:2672 msgid "Online help..." msgstr "" -#: ../src/core/sipe-ocs2007.c:2681 +#: ../src/core/sipe-ocs2007.c:2680 msgid "Access groups" msgstr "" @@ -695,49 +712,60 @@ #. SIPE_ACTIVITY_AVAILABLE #. SIPE_ACTIVITY_ONLINE #. SIPE_ACTIVITY_INACTIVE -#: ../src/core/sipe-status.c:58 +#: ../src/core/sipe-status.c:56 msgid "Inactive" msgstr "" #. SIPE_ACTIVITY_BUSYIDLE -#: ../src/core/sipe-status.c:60 +#: ../src/core/sipe-status.c:58 msgid "Busy-Idle" msgstr "" #. SIPE_ACTIVITY_DND #. SIPE_ACTIVITY_BRB -#: ../src/core/sipe-status.c:62 +#: ../src/core/sipe-status.c:60 msgid "Be right back" msgstr "" #. SIPE_ACTIVITY_AWAY #. SIPE_ACTIVITY_LUNCH -#: ../src/core/sipe-status.c:64 +#: ../src/core/sipe-status.c:62 msgid "Out to lunch" msgstr "" #. SIPE_ACTIVITY_INVISIBLE #. SIPE_ACTIVITY_OFFLINE #. SIPE_ACTIVITY_ON_PHONE -#: ../src/core/sipe-status.c:67 +#: ../src/core/sipe-status.c:65 msgid "In a call" msgstr "" #. SIPE_ACTIVITY_IN_CONF -#: ../src/core/sipe-status.c:68 +#: ../src/core/sipe-status.c:66 msgid "In a conference" msgstr "" #. SIPE_ACTIVITY_IN_MEETING -#: ../src/core/sipe-status.c:69 +#: ../src/core/sipe-status.c:67 msgid "In a meeting" msgstr "" #. SIPE_ACTIVITY_URGENT_ONLY -#: ../src/core/sipe-status.c:71 +#: ../src/core/sipe-status.c:69 msgid "Urgent interruptions only" msgstr "" +#: ../src/core/sipe-subscriptions.c:189 +msgid "Presence subscription failed!" +msgstr "" + +#: ../src/core/sipe-subscriptions.c:190 +msgid "" +"One or more buddies will therefore permanently show as offline.\n" +"\n" +"Please check that there are no corrupted SIP URIs in your contacts list." +msgstr "" + #: ../src/core/sipe-ucs.c:674 msgid "UCS initialization failed!" msgstr "" @@ -890,15 +918,19 @@ msgid "Copy to" msgstr "" -#: ../src/purple/purple-chat.c:295 +#: ../src/purple/purple-chat.c:310 msgid "Lock" msgstr "" -#: ../src/purple/purple-chat.c:300 +#: ../src/purple/purple-chat.c:315 msgid "Unlock" msgstr "" -#: ../src/purple/purple-chat.c:321 +#: ../src/purple/purple-chat.c:338 +msgid "Show presentation" +msgstr "" + +#: ../src/purple/purple-chat.c:345 msgid "Meeting entry info" msgstr "" @@ -1150,26 +1182,30 @@ msgstr "" #: ../src/purple/purple-plugin-common.c:933 +msgid "Remote desktop client" +msgstr "" + +#: ../src/purple/purple-plugin-common.c:938 msgid "Media encryption" msgstr "" -#: ../src/purple/purple-plugin-common.c:934 +#: ../src/purple/purple-plugin-common.c:939 msgid "Obey server policy" msgstr "" -#: ../src/purple/purple-plugin-common.c:935 +#: ../src/purple/purple-plugin-common.c:940 msgid "Always" msgstr "" -#: ../src/purple/purple-plugin-common.c:936 +#: ../src/purple/purple-plugin-common.c:941 msgid "Optional" msgstr "" -#: ../src/purple/purple-plugin-common.c:937 +#: ../src/purple/purple-plugin-common.c:942 msgid "Disabled" msgstr "" -#: ../src/purple/purple-plugin-common.c:947 +#: ../src/purple/purple-plugin-common.c:952 msgid "" "Login\n" " user or DOMAIN\\user or\n" @@ -1218,27 +1254,27 @@ msgid "_Search" msgstr "검색(_S)" -#: ../src/purple/purple-transport.c:132 +#: ../src/purple/purple-transport.c:135 msgid "Read error" msgstr "" -#: ../src/purple/purple-transport.c:136 -#: ../src/telepathy/telepathy-transport.c:96 +#: ../src/purple/purple-transport.c:139 +#: ../src/telepathy/telepathy-transport.c:95 msgid "Server has disconnected" msgstr "서버의 연결이 끊겼습니다." -#: ../src/purple/purple-transport.c:198 +#: ../src/purple/purple-transport.c:201 msgid "Could not connect" msgstr "연결할 수 없습니다." -#: ../src/purple/purple-transport.c:268 +#: ../src/purple/purple-transport.c:271 msgid "Could not create SSL context" msgstr "SSL 컨텍스트를 생성할 수 없습니다." -#: ../src/purple/purple-transport.c:290 +#: ../src/purple/purple-transport.c:293 msgid "Could not create socket" msgstr "" -#: ../src/purple/purple-transport.c:381 +#: ../src/purple/purple-transport.c:417 msgid "Write error" msgstr "" diff -Nru pidgin-sipe-1.21.1/po/LINGUAS pidgin-sipe-1.22.1/po/LINGUAS --- pidgin-sipe-1.21.1/po/LINGUAS 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/po/LINGUAS 2017-06-11 15:41:22.000000000 +0000 @@ -2,8 +2,9 @@ cs da de +el es -fi +fi fr fr_CA hi @@ -11,6 +12,7 @@ it ja ko +lt nb nl pl diff -Nru pidgin-sipe-1.21.1/po/lt.po pidgin-sipe-1.22.1/po/lt.po --- pidgin-sipe-1.21.1/po/lt.po 1970-01-01 00:00:00.000000000 +0000 +++ pidgin-sipe-1.22.1/po/lt.po 2017-06-11 15:41:22.000000000 +0000 @@ -0,0 +1,1282 @@ +# (English) English User Interface strings for pidgin-sipe. +# Copyright (C) 2008-2011 SIPE Project +# This file is distributed under the same license as the pidgin-sipe package. +# +# +# +# Translators: +# Moo, 2016-2017 +msgid "" +msgstr "" +"Project-Id-Version: pidgin sipe\n" +"Report-Msgid-Bugs-To: https://sourceforge.net/p/sipe/bugs/\n" +"POT-Creation-Date: 2010-11-30 23:36+0200\n" +"PO-Revision-Date: 2017-02-04 19:08+0000\n" +"Last-Translator: Moo\n" +"Language-Team: Lithuanian (http://www.transifex.com/stefanb/pidgin-sipe/language/lt/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: lt\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#: ../src/core/sip-transport.c:240 +msgid "Failed to authenticate to server" +msgstr "Nepavyko nustatyti tapatybės serveriui" + +#: ../src/core/sip-transport.c:298 +#, c-format +msgid "Can't request certificate from %s" +msgstr "Nepavyksta užklausti liudijimo iš %s" + +#: ../src/core/sip-transport.c:308 +msgid "No URI for certificate provisioning service provided" +msgstr "Nebuvo pateiktas liudijimų aprūpinimo paslaugos URI" + +#: ../src/core/sip-transport.c:1285 +msgid "Authentication failed" +msgstr "Tapatybės nustatymas nepavyko" + +#: ../src/core/sip-transport.c:1342 +msgid "Incompatible authentication scheme chosen" +msgstr "Pasirinkta nesuderinama tapatybės nustatymo schema" + +#: ../src/core/sip-transport.c:1359 ../src/core/sipe-notify.c:1149 +#, c-format +msgid "You have been rejected by the server: %s" +msgstr "Serveris jus atmetė: %s" + +#: ../src/core/sip-transport.c:1360 ../src/core/sip-transport.c:1376 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 +#: ../src/core/sipe-conf.c:265 ../src/core/sipe-notify.c:1149 +msgid "no reason given" +msgstr "priežastis nenurodyta" + +#: ../src/core/sip-transport.c:1375 +#, c-format +msgid "Not found: %s. Please contact your Administrator" +msgstr "Nerasta: %s. Prašome susisiekti su savo administratoriumi" + +#: ../src/core/sip-transport.c:1377 +msgid "SIP is either not enabled for the destination URI or it does not exist" +msgstr "Arba SIP, skirtas paskirties URI neįjungtas, arbo jo nėra" + +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 +#, c-format +msgid "Service unavailable: %s" +msgstr "Paslauga neprieinama: %s" + +#: ../src/core/sip-transport.c:1775 +msgid "Corrupted message received" +msgstr "Gauta sugadinta žinutė" + +#: ../src/core/sip-transport.c:1799 +msgid "Invalid message signature received" +msgstr "Gautas neteisingas žinutės parašas" + +#: ../src/core/sipe-appshare.c:458 +#, c-format +msgid "%s wants to start presenting" +msgstr "%s nori pradėti pristatymą" + +#: ../src/core/sipe-appshare.c:462 ../src/core/sipe-conf.c:1086 +msgid "Accept" +msgstr "Priimti" + +#: ../src/core/sipe-appshare.c:463 ../src/core/sipe-conf.c:1087 +msgid "Decline" +msgstr "Atmesti" + +#: ../src/core/sipe-appshare.c:501 ../src/core/sipe-appshare.c:599 +msgid "Application sharing error" +msgstr "Programos bendrinimo klaida" + +#: ../src/core/sipe-appshare.c:502 +msgid "Unknown remote desktop client configured." +msgstr "Sukonfigūruotas nežinomas nuotolinis darbalaukio klientas." + +#: ../src/core/sipe-appshare.c:600 +msgid "Couldn't connect application sharing" +msgstr "Nepavyko prijungti programos bendrinimą" + +#: ../src/core/sipe-buddy.c:541 ../src/core/sipe-buddy.c:2301 +msgid "Mobile" +msgstr "Mobilusis telefonas" + +#: ../src/core/sipe-buddy.c:829 +msgid "Status" +msgstr "Būsena" + +#: ../src/core/sipe-buddy.c:832 +msgid "Calendar" +msgstr "Kalendorius" + +#: ../src/core/sipe-buddy.c:837 +msgid "Meeting in" +msgstr "Susitikimo vieta" + +#: ../src/core/sipe-buddy.c:841 +msgid "Meeting about" +msgstr "Susitikimas apie" + +#: ../src/core/sipe-buddy.c:846 +msgid "Out of office note" +msgstr "\"Nėra biure\" raštelis" + +#: ../src/core/sipe-buddy.c:846 +msgid "Note" +msgstr "Raštelis" + +#: ../src/core/sipe-buddy.c:851 ../src/core/sipe-buddy.c:2346 +#: ../src/purple/purple-buddy.c:633 +msgid "Access level" +msgstr "Prieigos lygis" + +#: ../src/core/sipe-buddy.c:1074 +#, c-format +msgid "Found %d contact%s:" +msgid_plural "Found %d contacts%s:" +msgstr[0] "Rastas %d kontaktas%s:" +msgstr[1] "Rasti %d kontaktai%s:" +msgstr[2] "Rasta %d kontaktų%s:" + +#: ../src/core/sipe-buddy.c:1076 +msgid " (more matched your query)" +msgstr " (daugiau atitiko jūsų užklausą)" + +#: ../src/core/sipe-buddy.c:1122 ../src/core/sipe-buddy.c:1260 +#: ../src/core/sipe-ucs.c:314 +msgid "No contacts found" +msgstr "Kontaktų nerasta" + +#: ../src/core/sipe-buddy.c:1135 ../src/core/sipe-buddy.c:1273 +#: ../src/core/sipe-ucs.c:278 +msgid "Unable to display the search results" +msgstr "Nepavyksta parodyti paieškos rezultatų" + +#: ../src/core/sipe-buddy.c:1238 ../src/core/sipe-buddy.c:1250 +#: ../src/core/sipe-ucs.c:391 +msgid "Contact search failed" +msgstr "Kontaktų paieška nepavyko" + +#: ../src/core/sipe-buddy.c:1413 ../src/core/sipe-ucs.c:395 +msgid "Invalid contact search query" +msgstr "Neteisinga kontaktų paieškos užklausa" + +#: ../src/core/sipe-buddy.c:2238 +#, c-format +msgid "Make leader of '%s'" +msgstr "Padaryti \"%s\" lyderiu" + +#: ../src/core/sipe-buddy.c:2251 +#, c-format +msgid "Remove from '%s'" +msgstr "Šalinti iš \"%s\"" + +#: ../src/core/sipe-buddy.c:2265 +#, c-format +msgid "Invite to '%s'" +msgstr "Pakviesti į \"%s\"" + +#: ../src/core/sipe-buddy.c:2281 +msgid "New chat" +msgstr "Naujas pokalbis" + +#: ../src/core/sipe-buddy.c:2294 +msgid "Work" +msgstr "Darbas" + +#: ../src/core/sipe-buddy.c:2309 +msgid "Home" +msgstr "Namai" + +#: ../src/core/sipe-buddy.c:2317 +msgid "Other" +msgstr "Kita" + +#: ../src/core/sipe-buddy.c:2325 +msgid "Custom1" +msgstr "Tinkinta1" + +#: ../src/core/sipe-buddy.c:2335 +msgid "Send email..." +msgstr "Siųsti el. paštą..." + +#: ../src/core/sipe-cal.c:906 +msgid "Free" +msgstr "Laisvas" + +#: ../src/core/sipe-cal.c:907 +msgid "Tentative" +msgstr "Preliminariai užimtas" + +#. SIPE_ACTIVITY_BUSY +#: ../src/core/sipe-cal.c:908 ../src/core/sipe-status.c:57 +msgid "Busy" +msgstr "Užimtas" + +#. SIPE_ACTIVITY_OOF +#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:68 +msgid "Out of office" +msgstr "Nėra biure" + +#: ../src/core/sipe-cal.c:910 +msgid "No data" +msgstr "Nėra duomenų" + +#: ../src/core/sipe-cal.c:1018 ../src/core/sipe-cal.c:1045 +#, c-format +msgid "Currently %s" +msgstr "Šiuo metu %s" + +#: ../src/core/sipe-cal.c:1024 +msgid "Outside of working hours for next 8 hours" +msgstr "Kitas 8 valandas ne darbe" + +#: ../src/core/sipe-cal.c:1026 +#, c-format +msgid "%s for next 8 hours" +msgstr "%s kitas 8 valandas" + +#: ../src/core/sipe-cal.c:1035 +msgid "Not working" +msgstr "Nedirba" + +#: ../src/core/sipe-cal.c:1039 +#, c-format +msgid "%s until %.2d:%.2d" +msgstr "%s iki %.2d:%.2d" + +#: ../src/core/sipe-cal.c:1047 +#, c-format +msgid "%s. Outside of working hours at %.2d:%.2d" +msgstr "%s. Darbo laikas baigiasi %.2d:%.2d" + +#: ../src/core/sipe-cal.c:1052 +#, c-format +msgid "%s. %s at %.2d:%.2d" +msgstr "%s. %s %.2d:%.2d" + +#: ../src/core/sipe-certificate.c:233 ../src/core/sipe-certificate.c:277 +#, c-format +msgid "Certificate request to %s failed" +msgstr "%s liudijimo užklausa nepavyko" + +#: ../src/core/sipe-certificate.c:284 +#, c-format +msgid "Web ticket request to %s failed" +msgstr "%s saityno bilieto užklausa nepavyko" + +#. Generate next ID +#: ../src/core/sipe-chat.c:246 +#, c-format +msgid "Chat #%d" +msgstr "Pokalbis #%d" + +#: ../src/core/sipe-conf.c:264 ../src/core/sipe-conf.c:412 +#: ../src/core/sipe-conf.c:446 ../src/core/sipe-conf.c:498 +msgid "Failed to join the conference" +msgstr "Nepavyko prisijungti prie konferencijos" + +#: ../src/core/sipe-conf.c:408 +#, c-format +msgid "" +"Can't find a conference URI on this page:\n" +"\n" +"%s" +msgstr "Nepavyksta šiame puslapyje rasti konferencijos URI:\n\n%s" + +#: ../src/core/sipe-conf.c:443 +#, c-format +msgid "\"%s\" is not a valid conference URI" +msgstr "\"%s\" nėra teisingas konferencijos URI" + +#: ../src/core/sipe-conf.c:499 +msgid "Incomplete conference information provided" +msgstr "Pateikta ne visa konferencijos informacija" + +#: ../src/core/sipe-conf.c:1106 +msgid "" +"\n" +"\n" +"As this client was not compiled with voice call support, if you accept, you will be able to contact the other participants only via IM session." +msgstr "\n\nKadangi šis klientas nebuvo kompiliuotas su balso skambučių palaikymu, jeigu priimsite, jūs galėsite susisiekti su kitais dalyviais tik per žinučių seansą." + +#: ../src/core/sipe-conf.c:1111 +#, c-format +msgid "wants to invite you to a conference call%s" +msgstr "nori jus pakviesti į konferencinį skambutį%s" + +#: ../src/core/sipe-conf.c:1459 +msgid "" +"This conference is no longer locked. Additional participants can now join." +msgstr "Ši konferencija daugiau nebeužrakinta. Dabar, papildomi dalyviai gali prisijungti." + +#: ../src/core/sipe-conf.c:1463 +msgid "" +"This conference is locked. Nobody else can join the conference while it is " +"locked." +msgstr "Ši konferencija yra užrakinta. Niekas negali prisijungti prie konferencijos, kol ji yra užrakinta." + +#: ../src/core/sipe-conf.c:1496 +msgid "You have been disconnected from this conference." +msgstr "Jūs buvote atjungti nuo šios konferencijos." + +#: ../src/core/sipe-conf.c:1656 +msgid "Dial-in info" +msgstr "Numerio rinkimo informacija" + +#: ../src/core/sipe-conf.c:1657 +msgid "Number" +msgstr "Numeris" + +#: ../src/core/sipe-conf.c:1659 +msgid "Conference ID" +msgstr "Konferencijos ID" + +#: ../src/core/sipe-conf.c:1661 +msgid "Meeting link" +msgstr "Susitikimo nuoroda" + +#: ../src/core/sipe-conf.c:1663 +msgid "Organizer" +msgstr "Organizatorius" + +#: ../src/core/sipe-conf.c:1665 +msgid "Alternative dial-in numbers" +msgstr "Alternatyvūs numerio rinkimo numeriai" + +#. The next 13 texts make up the SIPE about note text +#. About note, part 1/13: introduction +#: ../src/core/sipe-core.c:221 +msgid "" +"A third-party plugin implementing extended version of SIP/SIMPLE used by " +"various products" +msgstr "Trečiosios šalies papildinys, įgyvendinantis įvairių produktų naudojamą išplėstinę SIP/SIMPLE versiją" + +#. About note, part 2/13: home page URL (label) +#: ../src/core/sipe-core.c:223 +msgid "Home Page" +msgstr "Tinklalapis" + +#. About note, part 3/13: support forum URL (label) +#: ../src/core/sipe-core.c:225 +msgid "Support" +msgstr "Palaikymas" + +#. About note, part 4/13: support forum name (hyperlink text) +#: ../src/core/sipe-core.c:227 +msgid "Help Forum" +msgstr "Pagalbos forumas" + +#. About note, part 5/13: bug tracker URL (label) +#: ../src/core/sipe-core.c:229 +msgid "Report Problems" +msgstr "Pranešti apie klaidas" + +#. About note, part 6/13: bug tracker URL (hyperlink text) +#: ../src/core/sipe-core.c:231 +msgid "Bug Tracker" +msgstr "Klaidų seklys" + +#. About note, part 7/13: translation service URL (label) +#: ../src/core/sipe-core.c:233 +msgid "Translations" +msgstr "Vertimai" + +#. About note, part 8/13: license type (label) +#: ../src/core/sipe-core.c:235 +msgid "License" +msgstr "Licencija" + +#. About note, part 9/13: (REMOVED) +#. About note, part 10/13: translation request, text before Transifex.com URL +#. append a space if text is not empty +#: ../src/core/sipe-core.c:239 +msgid "Please help us to translate SIPE to your native language here at " +msgstr "Padėkite mums išversti SIPE į jūsų gimtąją kalbą, apsilankydami " + +#. About note, part 11/13: translation request, text after Transifex.com URL +#. start with a space if text is not empty +#: ../src/core/sipe-core.c:242 +msgid " using convenient web interface" +msgstr " bei naudodamiesi patogia saityno sąsaja" + +#. About note, part 12/13: author list (header) +#: ../src/core/sipe-core.c:244 +msgid "Authors" +msgstr "Autoriai" + +#. About note, part 13/13: Localization credit +#. PLEASE NOTE: do *NOT* simply translate the english original +#. but write something similar to the following sentence: +#. "Localization for (): " +#: ../src/core/sipe-core.c:249 +msgid "Original texts in English (en): SIPE developers" +msgstr "Lokalizavimas į (): " + +#: ../src/core/sipe-core.c:273 +msgid "SIP Exchange user name contains invalid characters" +msgstr "SIP Exchange naudotojo varde yra neteisingų simbolių" + +#: ../src/core/sipe-core.c:281 ../src/purple/purple-buddy.c:485 +#: ../src/telepathy/telepathy-protocol.c:89 +#: ../src/telepathy/telepathy-protocol.c:191 +#, c-format +msgid "" +"User name should be a valid SIP URI\n" +"Example: user@company.com" +msgstr "Naudotojo vardas turėtų būti tinkamas SIP URI\nPavyzdys: naudotojas@kompanija.com" + +#: ../src/core/sipe-core.c:288 +msgid "Password is required when Single Sign-On is not enabled" +msgstr "Slaptažodis reikalingas, kai nėra įjungtas vieningas prisijungimas (Single Sign-On)" + +#: ../src/core/sipe-core.c:298 +msgid "" +"Email address should be valid if provided\n" +"Example: user@company.com" +msgstr "Pateikiant el. pašto adresą, jis turi būti teisingas\nPavyzdys: naudotojas@kompanija.com" + +#: ../src/core/sipe-core.c:307 +msgid "SIP Exchange user name contains whitespace" +msgstr "SIP Exchange naudotojo varde yra tarpų" + +#: ../src/core/sipe-core.c:321 +msgid "" +"Email services URL should be valid if provided\n" +"Example: https://exchange.corp.com/EWS/Exchange.asmx\n" +"Example: https://domino.corp.com/maildatabase.nsf" +msgstr "Pateikiant el. pašto paslaugų URL, jis turi būti teisingas\nPavyzdys: https://exchange.corp.com/EWS/Exchange.asmx\nPavyzdys: https://domino.corp.com/maildatabase.nsf" + +#. Translators: (!) should be as in localized Lotus Notes to be able to +#. extract meeting location +#: ../src/core/sipe-domino.c:260 ../src/core/sipe-domino.c:261 +msgid "Location:" +msgstr "Vieta:" + +#: ../src/core/sipe-ft.c:264 ../src/core/sipe-ft-tftp.c:109 +#: ../src/core/sipe-ft-tftp.c:393 ../src/core/sipe-ft-tftp.c:422 +#: ../src/core/sipe-ft-tftp.c:481 +msgid "Socket read failed" +msgstr "Lizdo skaitymas nepavyko" + +#: ../src/core/sipe-ft.c:412 +msgid "Received encryption key has wrong size." +msgstr "Gautas šifravimo raktas yra neteisingo dydžio." + +#: ../src/core/sipe-ft.c:427 +msgid "Received hash key has wrong size." +msgstr "Gautas maišos raktas yra neteisingo dydžio." + +#: ../src/core/sipe-ft.c:447 +msgid "Could not create listen socket" +msgstr "Nepavyko sukurti klausymosi lizdo" + +#: ../src/core/sipe-ft-lync.c:762 ../src/core/sipe-media.c:1328 +#: ../src/core/sipe-media.c:1339 ../src/core/sipe-media.c:1417 +#: ../src/core/sipe-media.c:1923 +msgid "Error occurred" +msgstr "Įvyko klaida" + +#: ../src/core/sipe-ft-lync.c:763 +msgid "Error creating data stream" +msgstr "Klaida, kuriant duomenų srautą" + +#: ../src/core/sipe-ft-tftp.c:115 ../src/core/sipe-ft-tftp.c:525 +#: ../src/core/sipe-ft-tftp.c:534 +msgid "Socket write failed" +msgstr "Lizdo rašymas nepavyko" + +#: ../src/core/sipe-ft-tftp.c:208 +msgid "File size is different from the advertised value." +msgstr "Failo dydis skiriasi nuo skelbiamos reikšmės." + +#: ../src/core/sipe-ft-tftp.c:247 +msgid "Received MAC is corrupted" +msgstr "Gautas MAC yra sugadintas" + +#: ../src/core/sipe-ft-tftp.c:258 +msgid "Received file is corrupted" +msgstr "Gautas failas yra sugadintas" + +#: ../src/core/sipe-ft-tftp.c:287 +msgid "File transfer initialization failed." +msgstr "Failo persiuntimo inicijavimas nepavyko." + +#: ../src/core/sipe-ft-tftp.c:318 +msgid "File transfer authentication failed." +msgstr "Failo persiuntimo tapatybės nustatymas nepavyko." + +#: ../src/core/sipe-ft-tftp.c:414 ../src/core/sipe-ft-tftp.c:432 +#: ../src/core/sipe-ft-tftp.c:495 +msgid "Out of memory" +msgstr "Trūksta atminties" + +#: ../src/core/sipe-group.c:168 ../src/core/sipe-notify.c:1163 +#: ../src/core/sipe-notify.c:1197 ../src/core/sipe-notify.c:1301 +#: ../src/purple/purple-search.c:128 +msgid "Other Contacts" +msgstr "Kiti kontaktai" + +#: ../src/core/sipe-groupchat.c:329 +#, c-format +msgid "" +"Group Chat Proxy setting is incorrect:\n" +"\n" +"\t%s\n" +"\n" +"Please update your Account." +msgstr "Grupės pokalbio įgaliotojo serverio nustatymas yra neteisingas:\n\n\t%s\n\nPrašome atnaujinti savo paskyrą." + +#: ../src/core/sipe-groupchat.c:332 +msgid "Couldn't find Group Chat server!" +msgstr "Nepavyko rasti grupės pokalbio serverio!" + +#: ../src/core/sipe-groupchat.c:508 +#, c-format +msgid "This message was not delivered to chat room '%s'" +msgstr "Ši žinutė nebuvo pristatyta į pokalbių kambarį \"%s\"" + +#: ../src/core/sipe-groupchat.c:616 +msgid "Error retrieving room list" +msgstr "Klaida, gaunant kambarių sąrašą" + +#: ../src/core/sipe-groupchat.c:720 +msgid "Error joining chat room" +msgstr "Klaida, prisijungiant prie pokalbių kambario" + +#. generate one error and remove all unprocessed messages +#: ../src/core/sipe-im.c:197 +#, c-format +msgid "Failed to invite %s" +msgstr "Nepavyko pakviesti %s" + +#: ../src/core/sipe-incoming.c:754 +#, c-format +msgid "Received a message with unrecognized contents from %s" +msgstr "Gauta žinutė su nepažįstamu turiniu nuo %s" + +#: ../src/core/sipe-media.c:869 ../src/core/sipe-media.c:1483 +#: ../src/core/sipe-media.c:1493 ../src/core/sipe-media.c:1904 +#: ../src/core/sipe-media.c:1924 +msgid "Unable to establish a call" +msgstr "Nepavyksta užmegzti skambutį" + +#: ../src/core/sipe-media.c:870 ../src/core/sipe-media.c:1905 +msgid "Encryption settings of peer are incompatible with ours." +msgstr "Pašnekovo šifravimo nustatymai yra nesuderinami su mūsų." + +#: ../src/core/sipe-media.c:963 +#, c-format +msgid "User %s rejected call" +msgstr "Naudotojas %s atmetė skambutį" + +#: ../src/core/sipe-media.c:964 +msgid "Call rejected" +msgstr "Skambutis atmestas" + +#: ../src/core/sipe-media.c:1329 ../src/core/sipe-media.c:1418 +msgid "Error creating audio stream" +msgstr "Klaida, kuriant garso srautą" + +#: ../src/core/sipe-media.c:1340 +msgid "Error creating video stream" +msgstr "Klaida, kuriant vaizdo srautą" + +#: ../src/core/sipe-media.c:1384 ../src/purple/purple-chat.c:329 +msgid "Join conference call" +msgstr "Prisijungti prie konferencinio skambučio" + +#: ../src/core/sipe-media.c:1385 +msgid "Conference calls are not supported on this server." +msgstr "Konferenciniai skambučiai šiame serveryje nėra palaikomi." + +#: ../src/core/sipe-media.c:1484 +msgid "Invalid phone number" +msgstr "Neteisingas telefono numeris" + +#: ../src/core/sipe-media.c:1494 +msgid "Audio Test Service is not available." +msgstr "Garso bandymo paslauga neprieinama." + +#: ../src/core/sipe-media.c:1873 +msgid "User unavailable" +msgstr "Naudotojas neprieinamas" + +#: ../src/core/sipe-media.c:1876 +#, c-format +msgid "%s does not want to be disturbed" +msgstr "%s nenori būti trukdomas(-a)" + +#: ../src/core/sipe-media.c:1878 +#, c-format +msgid "User %s is not available" +msgstr "Naudotojas %s yra neprieinamas" + +#: ../src/core/sipe-media.c:1887 +msgid "Unsupported media type" +msgstr "Nepalaikomas medijos tipas" + +#: ../src/core/sipe-media.c:2246 +msgid "Media error" +msgstr "Medijos klaida" + +#: ../src/core/sipe-media.c:2247 +msgid "Error while reading from stream" +msgstr "Klaida, skaitant iš srauto" + +#. reason = g_strdup(_("User logged out")); // [MS-OCER] +#: ../src/core/sipe-notify.c:1141 +msgid "you are already signed in at another location" +msgstr "jūs jau esate prisijungę kitoje vietoje" + +#: ../src/core/sipe-notify.c:1143 +msgid "user disabled" +msgstr "naudotojas išjungtas" + +#: ../src/core/sipe-notify.c:1145 +msgid "user moved" +msgstr "naudotojas perkeltas" + +#: ../src/core/sipe-ocs2007.c:458 ../src/purple/purple-buddy.c:640 +#: ../src/purple/purple-buddy.c:647 +msgid "Blocked" +msgstr "Užblokuotas" + +#: ../src/core/sipe-ocs2007.c:459 ../src/purple/purple-buddy.c:636 +#: ../src/purple/purple-buddy.c:643 +msgid "Personal" +msgstr "Asmeninis" + +#. index 0 +#: ../src/core/sipe-ocs2007.c:460 ../src/purple/purple-buddy.c:637 +#: ../src/purple/purple-buddy.c:644 +msgid "Team" +msgstr "Komanda" + +#. SIPE_BUDDY_INFO_WORK_PHONE_DISPLAY +#. SIPE_BUDDY_INFO_COMPANY +#: ../src/core/sipe-ocs2007.c:461 ../src/purple/purple-buddy.c:76 +#: ../src/purple/purple-buddy.c:638 ../src/purple/purple-buddy.c:645 +#: ../src/purple/purple-search.c:66 ../src/purple/purple-search.c:229 +msgid "Company" +msgstr "Kompanija" + +#: ../src/core/sipe-ocs2007.c:462 ../src/purple/purple-buddy.c:639 +#: ../src/purple/purple-buddy.c:646 +msgid "Public" +msgstr "Viešas" + +#: ../src/core/sipe-ocs2007.c:464 +msgid "Unknown" +msgstr "Nežinoma" + +#. Translators: remove (clear) previously assigned access level +#: ../src/core/sipe-ocs2007.c:2570 +msgid "Unspecify" +msgstr "Nebenurodinėti" + +#: ../src/core/sipe-ocs2007.c:2589 +msgid "People in my company" +msgstr "Žmonės mano kompanijoje" + +#: ../src/core/sipe-ocs2007.c:2599 +msgid "People in domains connected with my company" +msgstr "Žmonės viešuosiuose tinkluose, prijungtuose prie mano kompanijos" + +#: ../src/core/sipe-ocs2007.c:2608 +msgid "People in public domains" +msgstr "Žmonės viešuosiuose tinkluose" + +#: ../src/core/sipe-ocs2007.c:2618 +#, c-format +msgid "People at %s" +msgstr "Žmonės ties %s" + +#: ../src/core/sipe-ocs2007.c:2643 +msgid "Add new domain..." +msgstr "Pridėti naują sritį..." + +#: ../src/core/sipe-ocs2007.c:2672 +msgid "Online help..." +msgstr "Žinynas internete..." + +#: ../src/core/sipe-ocs2007.c:2680 +msgid "Access groups" +msgstr "Prieigos grupės" + +#. * This has nothing to do with Availability numbers, like 3500 (online). +#. * Just a mapping of Communicator Activities to tokens/translations +#. @TODO: NULL means "default translation from Pidgin"? +#. * What about other backends? +#. SIPE_ACTIVITY_UNSET +#. SIPE_ACTIVITY_AVAILABLE +#. SIPE_ACTIVITY_ONLINE +#. SIPE_ACTIVITY_INACTIVE +#: ../src/core/sipe-status.c:56 +msgid "Inactive" +msgstr "Neaktyvus" + +#. SIPE_ACTIVITY_BUSYIDLE +#: ../src/core/sipe-status.c:58 +msgid "Busy-Idle" +msgstr "Užimtas-Neveiklus" + +#. SIPE_ACTIVITY_DND +#. SIPE_ACTIVITY_BRB +#: ../src/core/sipe-status.c:60 +msgid "Be right back" +msgstr "Netrukus grįšiu" + +#. SIPE_ACTIVITY_AWAY +#. SIPE_ACTIVITY_LUNCH +#: ../src/core/sipe-status.c:62 +msgid "Out to lunch" +msgstr "Pietauju" + +#. SIPE_ACTIVITY_INVISIBLE +#. SIPE_ACTIVITY_OFFLINE +#. SIPE_ACTIVITY_ON_PHONE +#: ../src/core/sipe-status.c:65 +msgid "In a call" +msgstr "Dalyvauju skambutyje" + +#. SIPE_ACTIVITY_IN_CONF +#: ../src/core/sipe-status.c:66 +msgid "In a conference" +msgstr "Konferencijoje" + +#. SIPE_ACTIVITY_IN_MEETING +#: ../src/core/sipe-status.c:67 +msgid "In a meeting" +msgstr "Susitikime" + +#. SIPE_ACTIVITY_URGENT_ONLY +#: ../src/core/sipe-status.c:69 +msgid "Urgent interruptions only" +msgstr "Tik skubūs pertraukimai" + +#: ../src/core/sipe-subscriptions.c:189 +msgid "Presence subscription failed!" +msgstr "Prisijungimo būsenos prenumerata nepavyko!" + +#: ../src/core/sipe-subscriptions.c:190 +msgid "" +"One or more buddies will therefore permanently show as offline.\n" +"\n" +"Please check that there are no corrupted SIP URIs in your contacts list." +msgstr "Dėl to, vienas ar daugiau bičiulių bus visą laiką rodomi kaip atsijungę.\n\nPrašome patikrinti ar jūsų kontaktų sąraše nėra sugadintų SIP URI." + +#: ../src/core/sipe-ucs.c:674 +msgid "UCS initialization failed!" +msgstr "UCS inicijavimas nepavyko!" + +#: ../src/core/sipe-ucs.c:676 +msgid "" +"Couldn't find an Exchange server with the default Email settings. Therefore the contacts list will not work.\n" +"\n" +"You'll need to provide Email settings in the account setup." +msgstr "Nepavyko rasti Exchange serverio su numatytaisiais el. pašto nustatymais. Dėl to, kontaktų sąrašas neveiks.\n\nJums reikės pateikti el. pašto nustatymus paskyros sąrankoje." + +#: ../src/core/sipe-ucs.c:677 +msgid "" +"Couldn't find an Exchange server with the Email settings provided in the account setup. Therefore the contacts list will not work.\n" +"\n" +"Please correct your Email settings." +msgstr "Nepavyko rasti Exchange serverio su paskyros sąrankoje pateiktais el. pašto nustatymais. Dėl to, kontaktų sąrašas neveiks.\n\nPrašome ištaisyti savo el. pašto nustatymus." + +#. Service unavailable; Server Internal Error; Server Time-out +#. Not acceptable all. +#. Message contents not allowed by policy +#: ../src/core/sipe-user.c:78 +msgid "" +"Your message or invitation was not delivered, possibly because it contains a" +" hyperlink or other content that the system administrator has blocked." +msgstr "Jūsų žinutė ar pakvietimas nebuvo pristatytas, tikriausiai, dėl to, kad jame yra saitas arba kitas sistemos administratoriaus užblokuotas turinys." + +#: ../src/core/sipe-user.c:82 +#, c-format +msgid "" +"This message was not delivered to %s because the service is not available" +msgstr "Ši žinutė nebuvo pristatyta pašnekovui %s, kadangi paslauga yra neprieinama" + +#. Busy Here +#: ../src/core/sipe-user.c:84 +#, c-format +msgid "" +"This message was not delivered to %s because one or more recipients do not " +"want to be disturbed" +msgstr "Ši žinutė nebuvo pristatyta pašnekovui %s, kadangi vienas ar daugiau gavėjų nenori būti trukdomi" + +#. Unsupported media type +#: ../src/core/sipe-user.c:86 +#, c-format +msgid "" +"This message was not delivered to %s because one or more recipients don't " +"support this type of message" +msgstr "Ši žinutė nebuvo pristatyta pašnekovui %s, kadangi vienas ar daugiau gavėjų nepalaiko šio žinutės tipo" + +#: ../src/core/sipe-user.c:88 +#, c-format +msgid "" +"This message was not delivered to %s because one or more recipients are " +"offline" +msgstr "Ši žinutė nebuvo pristatyta pašnekovui %s, kadangi vienas ar daugiau gavėjų yra atsijungę" + +#. SIPE_BUDDY_INFO_DISPLAY_NAME +#: ../src/purple/purple-buddy.c:67 +msgid "Display name" +msgstr "Rodomas vardas" + +#. SIPE_BUDDY_INFO_JOB_TITLE +#: ../src/purple/purple-buddy.c:68 +msgid "Job title" +msgstr "Pareigos" + +#. SIPE_BUDDY_INFO_CITY +#: ../src/purple/purple-buddy.c:69 +msgid "City" +msgstr "Miestas" + +#. SIPE_BUDDY_INFO_STATE +#: ../src/purple/purple-buddy.c:70 +msgid "State" +msgstr "Valstija" + +#. SIPE_BUDDY_INFO_OFFICE +#: ../src/purple/purple-buddy.c:71 +msgid "Office" +msgstr "Biuras" + +#. SIPE_BUDDY_INFO_DEPARTMENT +#. SIPE_BUDDY_INFO_COUNTRY +#: ../src/purple/purple-buddy.c:73 ../src/purple/purple-search.c:69 +#: ../src/purple/purple-search.c:231 +msgid "Country" +msgstr "Šalis" + +#. SIPE_BUDDY_INFO_WORK_PHONE +#: ../src/purple/purple-buddy.c:74 +msgid "Business phone" +msgstr "Darbo telefonas" + +#. SIPE_BUDDY_INFO_EMAIL +#: ../src/purple/purple-buddy.c:77 +msgid "Email address" +msgstr "El. pašto adresas" + +#. SIPE_BUDDY_INFO_SITE +#: ../src/purple/purple-buddy.c:78 +msgid "Site" +msgstr "Svetainė" + +#. SIPE_BUDDY_INFO_ZIPCODE +#. SIPE_BUDDY_INFO_STREET +#. SIPE_BUDDY_INFO_MOBILE_PHONE +#. SIPE_BUDDY_INFO_MOBILE_PHONE_DISPLAY +#. SIPE_BUDDY_INFO_HOME_PHONE +#. SIPE_BUDDY_INFO_HOME_PHONE_DISPLAY +#. SIPE_BUDDY_INFO_OTHER_PHONE +#. SIPE_BUDDY_INFO_OTHER_PHONE_DISPLAY +#. SIPE_BUDDY_INFO_CUSTOM1_PHONE +#. SIPE_BUDDY_INFO_CUSTOM1_PHONE_DISPLAY +#. SIPE_BUDDY_INFO_ALIAS +#: ../src/purple/purple-buddy.c:89 +msgid "Alias" +msgstr "Slapyvardis" + +#. SIPE_BUDDY_INFO_DEVICE +#: ../src/purple/purple-buddy.c:90 +msgid "Device" +msgstr "Įrenginys" + +#: ../src/purple/purple-buddy.c:260 ../src/purple/purple-buddy.c:278 +msgid "you" +msgstr "jūs" + +#: ../src/purple/purple-buddy.c:584 +msgid "" +"https://sourceforge.net/apps/mediawiki/sipe/index.php?title=Access_Levels" +msgstr "https://sourceforge.net/apps/mediawiki/sipe/index.php?title=Access_Levels" + +#: ../src/purple/purple-buddy.c:626 +msgid "Domain" +msgstr "Sritis" + +#: ../src/purple/purple-buddy.c:655 ../src/purple/purple-buddy.c:656 +msgid "Add new domain" +msgstr "Pridėti naują sritį" + +#: ../src/purple/purple-buddy.c:657 +msgid "Add" +msgstr "Pridėti" + +#: ../src/purple/purple-buddy.c:658 +msgid "Cancel" +msgstr "Atsisakyti" + +#: ../src/purple/purple-buddy.c:810 +msgid "Copy to" +msgstr "Kopijuoti į" + +#: ../src/purple/purple-chat.c:310 +msgid "Lock" +msgstr "Užrakinti" + +#: ../src/purple/purple-chat.c:315 +msgid "Unlock" +msgstr "Atrakinti" + +#: ../src/purple/purple-chat.c:338 +msgid "Show presentation" +msgstr "Rodyti pristatymą" + +#: ../src/purple/purple-chat.c:345 +msgid "Meeting entry info" +msgstr "Susitikimo įrašo informacija" + +#: ../src/purple/purple-groupchat.c:56 +msgid "_URI:" +msgstr "_URI:" + +#: ../src/purple/purple-groupchat.c:160 +msgid "Users" +msgstr "Naudotojai" + +#: ../src/purple/purple-groupchat.c:163 +msgid "Invite" +msgstr "Pakviesti" + +#: ../src/purple/purple-groupchat.c:166 +msgid "Private" +msgstr "Privatus" + +#: ../src/purple/purple-groupchat.c:169 +msgid "Log" +msgstr "Žurnalas" + +#: ../src/purple/purple-groupchat.c:172 +msgid "Description" +msgstr "Aprašas" + +#: ../src/purple/purple-im.c:86 +#, c-format +msgid "Conversation subject: %s" +msgstr "Pokalbio tema: %s" + +#. Macro to reduce code repetition +#. Translators: noun +#: ../src/purple/purple-plugin-common.c:188 +msgid "Message" +msgstr "Žinutė" + +#: ../src/purple/purple-plugin-common.c:421 +msgid "Connecting" +msgstr "Jungiamasi" + +#: ../src/purple/purple-plugin-common.c:451 +msgid "Password required" +msgstr "Reikalingas slaptažodis" + +#: ../src/purple/purple-plugin-common.c:611 +msgid "user@company.com" +msgstr "naudotojas@kompanija.com" + +#: ../src/purple/purple-plugin-common.c:724 +msgid "Phone number" +msgstr "Telefono numeris" + +#: ../src/purple/purple-plugin-common.c:728 +#: ../src/purple/purple-plugin-common.c:729 +msgid "Call a phone number" +msgstr "Skambinti telefono numeriu" + +#: ../src/purple/purple-plugin-common.c:732 +msgid "_Call" +msgstr "_Skambinti" + +#: ../src/purple/purple-plugin-common.c:733 +#: ../src/purple/purple-plugin-common.c:781 ../src/purple/purple-search.c:240 +msgid "_Cancel" +msgstr "_Atsisakyti" + +#: ../src/purple/purple-plugin-common.c:760 +msgid "Meeting location" +msgstr "Susitikimo vieta" + +#: ../src/purple/purple-plugin-common.c:762 +msgid "Alternatively" +msgstr "Kitu atveju" + +#: ../src/purple/purple-plugin-common.c:764 +msgid "Organizer email" +msgstr "Organizatoriaus el. paštas" + +#: ../src/purple/purple-plugin-common.c:766 +msgid "Meeting ID" +msgstr "Susitikimo ID" + +#: ../src/purple/purple-plugin-common.c:770 +msgid "Join conference" +msgstr "Prisijungti prie konferencijos" + +#: ../src/purple/purple-plugin-common.c:771 +msgid "Join scheduled conference" +msgstr "Prisijungti prie suplanuotos konferencijos" + +#: ../src/purple/purple-plugin-common.c:772 +msgid "" +"Enter meeting location string you received in the invitation.\n" +"\n" +"Valid location will be something like\n" +"meet:sip:someone@company.com;gruu;opaque=app:conf:focus:id:abcdef1234\n" +"conf:sip:someone@company.com;gruu;opaque=app:conf:focus:id:abcdef1234\n" +"or\n" +"https://meet.company.com/someone/abcdef1234" +msgstr "Įveskite susitikimo vietos eilutę, kurią gavote pakvietime.\n\nTeisinga vieta būtų kažkas panašaus į\nmeet:sip:kažkas@kompanija.com;gruu;opaque=app:conf:focus:id:abcdef1234\nconf:sip:kažkas@kompanija.com;gruu;opaque=app:conf:focus:id:abcdef1234\narba\nhttps://susitikimas.kompanija.com/kažkas/abcdef1234" + +#: ../src/purple/purple-plugin-common.c:780 +msgid "_Join" +msgstr "_Prisijungti" + +#: ../src/purple/purple-plugin-common.c:797 +#: ../src/purple/purple-plugin-common.c:811 +msgid "Publishing of calendar information has been disabled" +msgstr "Kalendoriaus informacijos skelbimas buvo išjungtas" + +#: ../src/purple/purple-plugin-common.c:823 +msgid "About SIPE plugin..." +msgstr "Apie SIPE papildinį..." + +#: ../src/purple/purple-plugin-common.c:826 +msgid "Contact search..." +msgstr "Kontaktų paieška..." + +#: ../src/purple/purple-plugin-common.c:830 +msgid "Call a phone number..." +msgstr "Skambinti telefono numeriu..." + +#: ../src/purple/purple-plugin-common.c:833 +msgid "Test call" +msgstr "Bandomasis skambutis" + +#: ../src/purple/purple-plugin-common.c:837 +msgid "Join scheduled conference..." +msgstr "Prisijungti prie suplanuotos konferencijos..." + +#: ../src/purple/purple-plugin-common.c:840 +msgid "Republish Calendar" +msgstr "Iš naujo skelbti kalendorių" + +#: ../src/purple/purple-plugin-common.c:843 +msgid "Reset status" +msgstr "Atstatyti būseną" + +#. * +#. * When adding new string settings please make sure to keep these +#. * in sync: +#. * +#. * api/sipe-backend.h +#. * purple-settings.c:setting_name[] +#: ../src/purple/purple-plugin-common.c:861 +msgid "" +"Server[:Port]\n" +"(leave empty for auto-discovery)" +msgstr "Serveris[:Prievadas]\n(automatiniam aptikimui palikite tuščią)" + +#: ../src/purple/purple-plugin-common.c:864 +msgid "Connection type" +msgstr "Ryšio tipas" + +#: ../src/purple/purple-plugin-common.c:865 +#: ../src/purple/purple-plugin-common.c:877 +msgid "Auto" +msgstr "Automatiškai" + +#: ../src/purple/purple-plugin-common.c:866 +msgid "SSL/TLS" +msgstr "SSL/TLS" + +#: ../src/purple/purple-plugin-common.c:867 +msgid "TCP" +msgstr "TCP" + +#. option = purple_account_option_bool_new(_("Publish status (note: everyone +#. may watch you)"), "doservice", TRUE); +#. sipe_prpl_info.protocol_options = +#. g_list_append(sipe_prpl_info.protocol_options, option); +#: ../src/purple/purple-plugin-common.c:873 +msgid "User Agent" +msgstr "Naudotojo agentas" + +#: ../src/purple/purple-plugin-common.c:876 +msgid "Authentication scheme" +msgstr "Tapatybės nustatymo schema" + +#: ../src/purple/purple-plugin-common.c:878 +msgid "NTLM" +msgstr "NTLM" + +#: ../src/purple/purple-plugin-common.c:880 +msgid "Kerberos" +msgstr "Kerberos" + +#: ../src/purple/purple-plugin-common.c:882 +msgid "TLS-DSK" +msgstr "TLS-DSK" + +#. * When the user selects Single Sign-On then SIPE will ignore the +#. * settings for "login name" and "password". Instead it will use the +#. * default credentials provided by the OS. +#. * +#. * NOTE: the default must be *OFF*, i.e. it is up to the user to tell +#. * SIPE that it is OK to use Single Sign-On or not. +#. * +#. * Configurations that are known to support Single Sign-On: +#. * +#. * - Windows, host joined to domain, SIPE with SSPI: NTLM +#. * - Windows, host joined to domain, SIPE with SSPI: Kerberos +#. * - SIPE with libkrb5, valid TGT in cache (kinit): Kerberos +#: ../src/purple/purple-plugin-common.c:900 +msgid "Use Single Sign-On" +msgstr "Naudoti vieningą prisijungimą (Single Sign-On)" + +#. * Example (Exchange): https://server.company.com/EWS/Exchange.asmx +#. * Example (Domino) : https://[domino_server]/[mail_database_name].nsf +#: ../src/purple/purple-plugin-common.c:907 +msgid "Don't publish my calendar information" +msgstr "Neskelbti mano kalendoriaus informacijos" + +#: ../src/purple/purple-plugin-common.c:910 +msgid "" +"Email services URL\n" +"(leave empty for auto-discovery)" +msgstr "El. pašto paslaugų URL\n(automatiniam aptikimui palikite tuščią)" + +#: ../src/purple/purple-plugin-common.c:913 +msgid "" +"Email address\n" +"(if different from Username)" +msgstr "El. pašto adresas\n(jeigu kitoks nei Naudotojo vardas)" + +#. * Example (Exchange): DOMAIN\user or user@company.com +#. * Example (Domino) : email_address +#: ../src/purple/purple-plugin-common.c:919 +msgid "" +"Email login\n" +"(if different from Login)" +msgstr "El. pašto prisijungimas\n(jeigu kitoks nei Prisijungimas)" + +#: ../src/purple/purple-plugin-common.c:922 +msgid "" +"Email password\n" +"(if different from Password)" +msgstr "El. pašto slaptažodis\n(jeigu kitoks nei Slaptažodis)" + +#. * Example (federated domain): company.com (i.e. ocschat@company.com) +#. * Example (non-default user): user@company.com +#: ../src/purple/purple-plugin-common.c:929 +msgid "" +"Group Chat Proxy\n" +" company.com or user@company.com\n" +"(leave empty to determine from Username)" +msgstr "Grupės pokalbio įgaliotasis serveris\n kompanija.com arba naudotojas@kompanija.com\n(palikite tuščią, kad būtų nustatyta pagal naudotojo vardą)" + +#: ../src/purple/purple-plugin-common.c:933 +msgid "Remote desktop client" +msgstr "Nuotolinio darbalaukio klientas" + +#: ../src/purple/purple-plugin-common.c:938 +msgid "Media encryption" +msgstr "Medijos šifravimas" + +#: ../src/purple/purple-plugin-common.c:939 +msgid "Obey server policy" +msgstr "Paklusti serverio politikai" + +#: ../src/purple/purple-plugin-common.c:940 +msgid "Always" +msgstr "Visada" + +#: ../src/purple/purple-plugin-common.c:941 +msgid "Optional" +msgstr "Pasirinktinai" + +#: ../src/purple/purple-plugin-common.c:942 +msgid "Disabled" +msgstr "Išjungta" + +#: ../src/purple/purple-plugin-common.c:952 +msgid "" +"Login\n" +" user or DOMAIN\\user or\n" +" user@company.com" +msgstr "Prisijungimas\n naudotojas ar SRITIS\\naudotojas ar\n naudotojas@kompanija.com" + +#: ../src/purple/purple-search.c:60 +msgid "User name" +msgstr "Naudotojo vardas" + +#: ../src/purple/purple-search.c:63 +msgid "Name" +msgstr "Vardas" + +#: ../src/purple/purple-search.c:72 ../src/purple/purple-search.c:225 +msgid "Email" +msgstr "El. paštas" + +#: ../src/purple/purple-search.c:221 +msgid "First name" +msgstr "Vardas" + +#: ../src/purple/purple-search.c:223 +msgid "Last name" +msgstr "Pavardė" + +#: ../src/purple/purple-search.c:227 +msgid "SIP ID" +msgstr "SIP ID" + +#: ../src/purple/purple-search.c:235 +msgid "Search" +msgstr "Paieška" + +#: ../src/purple/purple-search.c:236 +msgid "Search for a contact" +msgstr "Kontakto paieška" + +#: ../src/purple/purple-search.c:237 +msgid "" +"Enter the information for the person you wish to find. Empty fields will be " +"ignored." +msgstr "Įrašykite norimo rasti asmens informaciją. Tuščių laukų bus nepaisoma." + +#: ../src/purple/purple-search.c:239 +msgid "_Search" +msgstr "_Ieškoti" + +#: ../src/purple/purple-transport.c:135 +msgid "Read error" +msgstr "Skaitymo klaida" + +#: ../src/purple/purple-transport.c:139 +#: ../src/telepathy/telepathy-transport.c:95 +msgid "Server has disconnected" +msgstr "Serveris atsijungė" + +#: ../src/purple/purple-transport.c:201 +msgid "Could not connect" +msgstr "Nepavyko prisijungti" + +#: ../src/purple/purple-transport.c:271 +msgid "Could not create SSL context" +msgstr "Nepavyko sukurti SSL konteksto" + +#: ../src/purple/purple-transport.c:293 +msgid "Could not create socket" +msgstr "Nepavyko sukurti lizdo" + +#: ../src/purple/purple-transport.c:417 +msgid "Write error" +msgstr "Rašymo klaida" diff -Nru pidgin-sipe-1.21.1/po/nb.po pidgin-sipe-1.22.1/po/nb.po --- pidgin-sipe-1.21.1/po/nb.po 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/po/nb.po 2017-06-11 15:41:22.000000000 +0000 @@ -12,7 +12,7 @@ "Project-Id-Version: pidgin sipe\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/sipe/bugs/\n" "POT-Creation-Date: 2010-11-30 23:36+0200\n" -"PO-Revision-Date: 2016-05-28 15:08+0000\n" +"PO-Revision-Date: 2017-01-23 17:47+0000\n" "Last-Translator: Stefan Becker \n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/stefanb/pidgin-sipe/language/nb/)\n" "MIME-Version: 1.0\n" @@ -21,213 +21,238 @@ "Language: nb\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../src/core/sip-transport.c:235 +#: ../src/core/sip-transport.c:240 msgid "Failed to authenticate to server" msgstr "Klarte ikke å autentisere til tjener" -#: ../src/core/sip-transport.c:293 +#: ../src/core/sip-transport.c:298 #, c-format msgid "Can't request certificate from %s" msgstr "" -#: ../src/core/sip-transport.c:303 +#: ../src/core/sip-transport.c:308 msgid "No URI for certificate provisioning service provided" msgstr "" -#: ../src/core/sip-transport.c:1281 +#: ../src/core/sip-transport.c:1285 msgid "Authentication failed" msgstr "Autentisering feilet" -#: ../src/core/sip-transport.c:1338 +#: ../src/core/sip-transport.c:1342 msgid "Incompatible authentication scheme chosen" msgstr "" -#: ../src/core/sip-transport.c:1355 ../src/core/sipe-notify.c:1149 +#: ../src/core/sip-transport.c:1359 ../src/core/sipe-notify.c:1149 #, c-format msgid "You have been rejected by the server: %s" msgstr "Du har blitt avslått av tjeneren: %s" -#: ../src/core/sip-transport.c:1356 ../src/core/sip-transport.c:1372 -#: ../src/core/sip-transport.c:1396 ../src/core/sip-transport.c:1420 +#: ../src/core/sip-transport.c:1360 ../src/core/sip-transport.c:1376 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 #: ../src/core/sipe-conf.c:265 ../src/core/sipe-notify.c:1149 msgid "no reason given" msgstr "ingen grunn gitt" -#: ../src/core/sip-transport.c:1371 +#: ../src/core/sip-transport.c:1375 #, c-format msgid "Not found: %s. Please contact your Administrator" msgstr "Ikke funnet: %s. Vennligst ta kontakt med administrator" -#: ../src/core/sip-transport.c:1373 +#: ../src/core/sip-transport.c:1377 msgid "SIP is either not enabled for the destination URI or it does not exist" msgstr "" -#: ../src/core/sip-transport.c:1396 ../src/core/sip-transport.c:1420 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 #, c-format msgid "Service unavailable: %s" msgstr "Tjeneste utilgjengelig: %s" -#: ../src/core/sip-transport.c:1766 +#: ../src/core/sip-transport.c:1775 msgid "Corrupted message received" msgstr "" -#: ../src/core/sip-transport.c:1790 +#: ../src/core/sip-transport.c:1799 msgid "Invalid message signature received" msgstr "Ugyldig meldingssignatur mottatt" -#: ../src/core/sipe-buddy.c:540 ../src/core/sipe-buddy.c:2300 +#: ../src/core/sipe-appshare.c:458 +#, c-format +msgid "%s wants to start presenting" +msgstr "" + +#: ../src/core/sipe-appshare.c:462 ../src/core/sipe-conf.c:1086 +msgid "Accept" +msgstr "Aksepter" + +#: ../src/core/sipe-appshare.c:463 ../src/core/sipe-conf.c:1087 +msgid "Decline" +msgstr "Avslå" + +#: ../src/core/sipe-appshare.c:501 ../src/core/sipe-appshare.c:599 +msgid "Application sharing error" +msgstr "" + +#: ../src/core/sipe-appshare.c:502 +msgid "Unknown remote desktop client configured." +msgstr "" + +#: ../src/core/sipe-appshare.c:600 +msgid "Couldn't connect application sharing" +msgstr "" + +#: ../src/core/sipe-buddy.c:541 ../src/core/sipe-buddy.c:2301 msgid "Mobile" msgstr "" -#: ../src/core/sipe-buddy.c:828 +#: ../src/core/sipe-buddy.c:829 msgid "Status" msgstr "Status" -#: ../src/core/sipe-buddy.c:831 +#: ../src/core/sipe-buddy.c:832 msgid "Calendar" msgstr "Kalender" -#: ../src/core/sipe-buddy.c:836 +#: ../src/core/sipe-buddy.c:837 msgid "Meeting in" msgstr "Møte i" -#: ../src/core/sipe-buddy.c:840 +#: ../src/core/sipe-buddy.c:841 msgid "Meeting about" msgstr "Møte om" -#: ../src/core/sipe-buddy.c:845 +#: ../src/core/sipe-buddy.c:846 msgid "Out of office note" msgstr "Ute av kontoret merknad" -#: ../src/core/sipe-buddy.c:845 +#: ../src/core/sipe-buddy.c:846 msgid "Note" msgstr "Merknad" -#: ../src/core/sipe-buddy.c:850 ../src/core/sipe-buddy.c:2345 +#: ../src/core/sipe-buddy.c:851 ../src/core/sipe-buddy.c:2346 #: ../src/purple/purple-buddy.c:633 msgid "Access level" msgstr "Tilgangsnivå" -#: ../src/core/sipe-buddy.c:1073 +#: ../src/core/sipe-buddy.c:1074 #, c-format msgid "Found %d contact%s:" msgid_plural "Found %d contacts%s:" msgstr[0] "Fant %d kontakt%s:" msgstr[1] "Fant %d kontakter%s:" -#: ../src/core/sipe-buddy.c:1075 +#: ../src/core/sipe-buddy.c:1076 msgid " (more matched your query)" msgstr "" -#: ../src/core/sipe-buddy.c:1121 ../src/core/sipe-buddy.c:1259 +#: ../src/core/sipe-buddy.c:1122 ../src/core/sipe-buddy.c:1260 #: ../src/core/sipe-ucs.c:314 msgid "No contacts found" msgstr "" -#: ../src/core/sipe-buddy.c:1134 ../src/core/sipe-buddy.c:1272 +#: ../src/core/sipe-buddy.c:1135 ../src/core/sipe-buddy.c:1273 #: ../src/core/sipe-ucs.c:278 msgid "Unable to display the search results" msgstr "Klarte ikke vise søkeresultater" -#: ../src/core/sipe-buddy.c:1237 ../src/core/sipe-buddy.c:1249 +#: ../src/core/sipe-buddy.c:1238 ../src/core/sipe-buddy.c:1250 #: ../src/core/sipe-ucs.c:391 msgid "Contact search failed" msgstr "" -#: ../src/core/sipe-buddy.c:1412 ../src/core/sipe-ucs.c:395 +#: ../src/core/sipe-buddy.c:1413 ../src/core/sipe-ucs.c:395 msgid "Invalid contact search query" msgstr "" -#: ../src/core/sipe-buddy.c:2237 +#: ../src/core/sipe-buddy.c:2238 #, c-format msgid "Make leader of '%s'" msgstr "" -#: ../src/core/sipe-buddy.c:2250 +#: ../src/core/sipe-buddy.c:2251 #, c-format msgid "Remove from '%s'" msgstr "Fjern fra '%s'" -#: ../src/core/sipe-buddy.c:2264 +#: ../src/core/sipe-buddy.c:2265 #, c-format msgid "Invite to '%s'" msgstr "Inviter til '%s'" -#: ../src/core/sipe-buddy.c:2280 +#: ../src/core/sipe-buddy.c:2281 msgid "New chat" msgstr "Ny chat" -#: ../src/core/sipe-buddy.c:2293 +#: ../src/core/sipe-buddy.c:2294 msgid "Work" msgstr "" -#: ../src/core/sipe-buddy.c:2308 +#: ../src/core/sipe-buddy.c:2309 msgid "Home" msgstr "Hjemmeside" -#: ../src/core/sipe-buddy.c:2316 +#: ../src/core/sipe-buddy.c:2317 msgid "Other" msgstr "" -#: ../src/core/sipe-buddy.c:2324 +#: ../src/core/sipe-buddy.c:2325 msgid "Custom1" msgstr "" -#: ../src/core/sipe-buddy.c:2334 +#: ../src/core/sipe-buddy.c:2335 msgid "Send email..." msgstr "Send e-post..." -#: ../src/core/sipe-cal.c:907 +#: ../src/core/sipe-cal.c:906 msgid "Free" msgstr "Ledig" -#: ../src/core/sipe-cal.c:908 +#: ../src/core/sipe-cal.c:907 msgid "Tentative" msgstr "Foreløpig" #. SIPE_ACTIVITY_BUSY -#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:59 +#: ../src/core/sipe-cal.c:908 ../src/core/sipe-status.c:57 msgid "Busy" msgstr "Opptatt" #. SIPE_ACTIVITY_OOF -#: ../src/core/sipe-cal.c:910 ../src/core/sipe-status.c:70 +#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:68 msgid "Out of office" msgstr "Ikke på kontoret" -#: ../src/core/sipe-cal.c:911 +#: ../src/core/sipe-cal.c:910 msgid "No data" msgstr "Ingen informasjon" -#: ../src/core/sipe-cal.c:1019 ../src/core/sipe-cal.c:1046 +#: ../src/core/sipe-cal.c:1018 ../src/core/sipe-cal.c:1045 #, c-format msgid "Currently %s" msgstr "I øyeblikket %s" -#: ../src/core/sipe-cal.c:1025 +#: ../src/core/sipe-cal.c:1024 msgid "Outside of working hours for next 8 hours" msgstr "Utenfor arbeidstid de neste 8 timene" -#: ../src/core/sipe-cal.c:1027 +#: ../src/core/sipe-cal.c:1026 #, c-format msgid "%s for next 8 hours" msgstr "%s for de neste 8 timene" -#: ../src/core/sipe-cal.c:1036 +#: ../src/core/sipe-cal.c:1035 msgid "Not working" msgstr "Fritid" -#: ../src/core/sipe-cal.c:1040 +#: ../src/core/sipe-cal.c:1039 #, c-format msgid "%s until %.2d:%.2d" msgstr "%s til %.2d:%.2d" -#: ../src/core/sipe-cal.c:1048 +#: ../src/core/sipe-cal.c:1047 #, c-format msgid "%s. Outside of working hours at %.2d:%.2d" msgstr "" -#: ../src/core/sipe-cal.c:1053 +#: ../src/core/sipe-cal.c:1052 #, c-format msgid "%s. %s at %.2d:%.2d" msgstr "" @@ -243,7 +268,7 @@ msgstr "" #. Generate next ID -#: ../src/core/sipe-chat.c:240 +#: ../src/core/sipe-chat.c:246 #, c-format msgid "Chat #%d" msgstr "" @@ -270,123 +295,115 @@ msgid "Incomplete conference information provided" msgstr "" -#: ../src/core/sipe-conf.c:1041 +#: ../src/core/sipe-conf.c:1106 msgid "" "\n" "\n" "As this client was not compiled with voice call support, if you accept, you will be able to contact the other participants only via IM session." msgstr "" -#: ../src/core/sipe-conf.c:1049 +#: ../src/core/sipe-conf.c:1111 #, c-format -msgid "%s wants to invite you to the conference call%s" +msgid "wants to invite you to a conference call%s" msgstr "" -#: ../src/core/sipe-conf.c:1063 -msgid "Accept" -msgstr "Aksepter" - -#: ../src/core/sipe-conf.c:1064 -msgid "Decline" -msgstr "Avslå" - -#: ../src/core/sipe-conf.c:1345 +#: ../src/core/sipe-conf.c:1459 msgid "" "This conference is no longer locked. Additional participants can now join." msgstr "Konferansen er ikke lengre låst. Nå kan andre deltakere koble til" -#: ../src/core/sipe-conf.c:1349 +#: ../src/core/sipe-conf.c:1463 msgid "" "This conference is locked. Nobody else can join the conference while it is " "locked." msgstr "Konferansen er låst. Ingen andre kan koble til så lenge konferansen er låst." -#: ../src/core/sipe-conf.c:1382 +#: ../src/core/sipe-conf.c:1496 msgid "You have been disconnected from this conference." msgstr "Du har blitt koblet fra denne konferansen." -#: ../src/core/sipe-conf.c:1542 +#: ../src/core/sipe-conf.c:1656 msgid "Dial-in info" msgstr "" -#: ../src/core/sipe-conf.c:1543 +#: ../src/core/sipe-conf.c:1657 msgid "Number" msgstr "" -#: ../src/core/sipe-conf.c:1545 +#: ../src/core/sipe-conf.c:1659 msgid "Conference ID" msgstr "" -#: ../src/core/sipe-conf.c:1547 +#: ../src/core/sipe-conf.c:1661 msgid "Meeting link" msgstr "" -#: ../src/core/sipe-conf.c:1549 +#: ../src/core/sipe-conf.c:1663 msgid "Organizer" msgstr "" -#: ../src/core/sipe-conf.c:1551 +#: ../src/core/sipe-conf.c:1665 msgid "Alternative dial-in numbers" msgstr "" #. The next 13 texts make up the SIPE about note text #. About note, part 1/13: introduction -#: ../src/core/sipe-core.c:220 +#: ../src/core/sipe-core.c:221 msgid "" "A third-party plugin implementing extended version of SIP/SIMPLE used by " "various products" msgstr "Et tredjeparts programtillegg som implementerer en utvidet versjon av SIP/SIMPLE i bruk av diverse produkter" #. About note, part 2/13: home page URL (label) -#: ../src/core/sipe-core.c:222 +#: ../src/core/sipe-core.c:223 msgid "Home Page" msgstr "" #. About note, part 3/13: support forum URL (label) -#: ../src/core/sipe-core.c:224 +#: ../src/core/sipe-core.c:225 msgid "Support" msgstr "" #. About note, part 4/13: support forum name (hyperlink text) -#: ../src/core/sipe-core.c:226 +#: ../src/core/sipe-core.c:227 msgid "Help Forum" msgstr "Hjelpeforum (på engelsk)" #. About note, part 5/13: bug tracker URL (label) -#: ../src/core/sipe-core.c:228 +#: ../src/core/sipe-core.c:229 msgid "Report Problems" msgstr "Rapporter problemer" #. About note, part 6/13: bug tracker URL (hyperlink text) -#: ../src/core/sipe-core.c:230 +#: ../src/core/sipe-core.c:231 msgid "Bug Tracker" msgstr "" #. About note, part 7/13: translation service URL (label) -#: ../src/core/sipe-core.c:232 +#: ../src/core/sipe-core.c:233 msgid "Translations" msgstr "Oversettelser" #. About note, part 8/13: license type (label) -#: ../src/core/sipe-core.c:234 +#: ../src/core/sipe-core.c:235 msgid "License" msgstr "Lisens" #. About note, part 9/13: (REMOVED) #. About note, part 10/13: translation request, text before Transifex.com URL #. append a space if text is not empty -#: ../src/core/sipe-core.c:238 +#: ../src/core/sipe-core.c:239 msgid "Please help us to translate SIPE to your native language here at " msgstr "Hjelp oss å oversette SIPE til flere språk på" #. About note, part 11/13: translation request, text after Transifex.com URL #. start with a space if text is not empty -#: ../src/core/sipe-core.c:241 +#: ../src/core/sipe-core.c:242 msgid " using convenient web interface" msgstr "ved å bruke et lettvindt vev-grensesnitt" #. About note, part 12/13: author list (header) -#: ../src/core/sipe-core.c:243 +#: ../src/core/sipe-core.c:244 msgid "Authors" msgstr "Utviklere" @@ -394,15 +411,15 @@ #. PLEASE NOTE: do *NOT* simply translate the english original #. but write something similar to the following sentence: #. "Localization for (): " -#: ../src/core/sipe-core.c:248 +#: ../src/core/sipe-core.c:249 msgid "Original texts in English (en): SIPE developers" msgstr "Norsk oversettelse (nb): Andreas Angerman" -#: ../src/core/sipe-core.c:269 +#: ../src/core/sipe-core.c:273 msgid "SIP Exchange user name contains invalid characters" msgstr "SIP Exchange brukernavn inneholder ugyldige tegn" -#: ../src/core/sipe-core.c:277 ../src/purple/purple-buddy.c:485 +#: ../src/core/sipe-core.c:281 ../src/purple/purple-buddy.c:485 #: ../src/telepathy/telepathy-protocol.c:89 #: ../src/telepathy/telepathy-protocol.c:191 #, c-format @@ -411,21 +428,21 @@ "Example: user@company.com" msgstr "Brukernavn skal være en gyldig SIP URI\nEksempel: bruker@firma.no" -#: ../src/core/sipe-core.c:284 +#: ../src/core/sipe-core.c:288 msgid "Password is required when Single Sign-On is not enabled" msgstr "" -#: ../src/core/sipe-core.c:294 +#: ../src/core/sipe-core.c:298 msgid "" "Email address should be valid if provided\n" "Example: user@company.com" msgstr "E-postadresse skal være gyldig hvis oppgitt\nEksempel: bruker@firma.no" -#: ../src/core/sipe-core.c:303 +#: ../src/core/sipe-core.c:307 msgid "SIP Exchange user name contains whitespace" msgstr "Brukernavnet til SIP Exchange inneholder mellomrom" -#: ../src/core/sipe-core.c:317 +#: ../src/core/sipe-core.c:321 msgid "" "Email services URL should be valid if provided\n" "Example: https://exchange.corp.com/EWS/Exchange.asmx\n" @@ -456,13 +473,13 @@ msgid "Could not create listen socket" msgstr "Kunne ikke lage lytte-sokkel" -#: ../src/core/sipe-ft-lync.c:757 ../src/core/sipe-media.c:1195 -#: ../src/core/sipe-media.c:1206 ../src/core/sipe-media.c:1284 -#: ../src/core/sipe-media.c:1740 +#: ../src/core/sipe-ft-lync.c:762 ../src/core/sipe-media.c:1328 +#: ../src/core/sipe-media.c:1339 ../src/core/sipe-media.c:1417 +#: ../src/core/sipe-media.c:1923 msgid "Error occurred" msgstr "" -#: ../src/core/sipe-ft-lync.c:758 +#: ../src/core/sipe-ft-lync.c:763 msgid "Error creating data stream" msgstr "" @@ -497,7 +514,7 @@ msgstr "Tomt for minne" #: ../src/core/sipe-group.c:168 ../src/core/sipe-notify.c:1163 -#: ../src/core/sipe-notify.c:1190 ../src/core/sipe-notify.c:1294 +#: ../src/core/sipe-notify.c:1197 ../src/core/sipe-notify.c:1301 #: ../src/purple/purple-search.c:128 msgid "Other Contacts" msgstr "Andre kontakter" @@ -535,77 +552,77 @@ msgid "Failed to invite %s" msgstr "Mislykkes med å invitere %s" -#: ../src/core/sipe-incoming.c:741 +#: ../src/core/sipe-incoming.c:754 #, c-format msgid "Received a message with unrecognized contents from %s" msgstr "Mottok en melding med ukjent innhold fra %s" -#: ../src/core/sipe-media.c:835 ../src/core/sipe-media.c:1347 -#: ../src/core/sipe-media.c:1357 ../src/core/sipe-media.c:1721 -#: ../src/core/sipe-media.c:1741 +#: ../src/core/sipe-media.c:869 ../src/core/sipe-media.c:1483 +#: ../src/core/sipe-media.c:1493 ../src/core/sipe-media.c:1904 +#: ../src/core/sipe-media.c:1924 msgid "Unable to establish a call" msgstr "Kunne ikke etablere en samtale" -#: ../src/core/sipe-media.c:836 ../src/core/sipe-media.c:1722 +#: ../src/core/sipe-media.c:870 ../src/core/sipe-media.c:1905 msgid "Encryption settings of peer are incompatible with ours." msgstr "" -#: ../src/core/sipe-media.c:929 +#: ../src/core/sipe-media.c:963 #, c-format msgid "User %s rejected call" msgstr "" -#: ../src/core/sipe-media.c:930 +#: ../src/core/sipe-media.c:964 msgid "Call rejected" msgstr "" -#: ../src/core/sipe-media.c:1196 ../src/core/sipe-media.c:1285 +#: ../src/core/sipe-media.c:1329 ../src/core/sipe-media.c:1418 msgid "Error creating audio stream" msgstr "" -#: ../src/core/sipe-media.c:1207 +#: ../src/core/sipe-media.c:1340 msgid "Error creating video stream" msgstr "" -#: ../src/core/sipe-media.c:1251 ../src/purple/purple-chat.c:314 +#: ../src/core/sipe-media.c:1384 ../src/purple/purple-chat.c:329 msgid "Join conference call" msgstr "" -#: ../src/core/sipe-media.c:1252 +#: ../src/core/sipe-media.c:1385 msgid "Conference calls are not supported on this server." msgstr "" -#: ../src/core/sipe-media.c:1348 +#: ../src/core/sipe-media.c:1484 msgid "Invalid phone number" msgstr "" -#: ../src/core/sipe-media.c:1358 +#: ../src/core/sipe-media.c:1494 msgid "Audio Test Service is not available." msgstr "" -#: ../src/core/sipe-media.c:1690 +#: ../src/core/sipe-media.c:1873 msgid "User unavailable" msgstr "Bruker utilgjengelig" -#: ../src/core/sipe-media.c:1693 +#: ../src/core/sipe-media.c:1876 #, c-format msgid "%s does not want to be disturbed" msgstr "%s ønsker ikke å bli forstyrret" -#: ../src/core/sipe-media.c:1695 +#: ../src/core/sipe-media.c:1878 #, c-format msgid "User %s is not available" msgstr "Bruker %s er ikke tilgjengelig" -#: ../src/core/sipe-media.c:1704 +#: ../src/core/sipe-media.c:1887 msgid "Unsupported media type" msgstr "" -#: ../src/core/sipe-media.c:2062 +#: ../src/core/sipe-media.c:2246 msgid "Media error" msgstr "" -#: ../src/core/sipe-media.c:2063 +#: ../src/core/sipe-media.c:2247 msgid "Error while reading from stream" msgstr "" @@ -656,36 +673,36 @@ msgstr "Ukjent" #. Translators: remove (clear) previously assigned access level -#: ../src/core/sipe-ocs2007.c:2571 +#: ../src/core/sipe-ocs2007.c:2570 msgid "Unspecify" msgstr "" -#: ../src/core/sipe-ocs2007.c:2590 +#: ../src/core/sipe-ocs2007.c:2589 msgid "People in my company" msgstr "Personer i mitt firma" -#: ../src/core/sipe-ocs2007.c:2600 +#: ../src/core/sipe-ocs2007.c:2599 msgid "People in domains connected with my company" msgstr "Personer i domener koblet til mitt firma" -#: ../src/core/sipe-ocs2007.c:2609 +#: ../src/core/sipe-ocs2007.c:2608 msgid "People in public domains" msgstr "Personer i offentlige domener" -#: ../src/core/sipe-ocs2007.c:2619 +#: ../src/core/sipe-ocs2007.c:2618 #, c-format msgid "People at %s" msgstr "Personer hos %s" -#: ../src/core/sipe-ocs2007.c:2644 +#: ../src/core/sipe-ocs2007.c:2643 msgid "Add new domain..." msgstr "Legg til nytt domene..." -#: ../src/core/sipe-ocs2007.c:2673 +#: ../src/core/sipe-ocs2007.c:2672 msgid "Online help..." msgstr "" -#: ../src/core/sipe-ocs2007.c:2681 +#: ../src/core/sipe-ocs2007.c:2680 msgid "Access groups" msgstr "" @@ -697,49 +714,60 @@ #. SIPE_ACTIVITY_AVAILABLE #. SIPE_ACTIVITY_ONLINE #. SIPE_ACTIVITY_INACTIVE -#: ../src/core/sipe-status.c:58 +#: ../src/core/sipe-status.c:56 msgid "Inactive" msgstr "Ikke tilgjengelig" #. SIPE_ACTIVITY_BUSYIDLE -#: ../src/core/sipe-status.c:60 +#: ../src/core/sipe-status.c:58 msgid "Busy-Idle" msgstr "" #. SIPE_ACTIVITY_DND #. SIPE_ACTIVITY_BRB -#: ../src/core/sipe-status.c:62 +#: ../src/core/sipe-status.c:60 msgid "Be right back" msgstr "Er snart tilbake" #. SIPE_ACTIVITY_AWAY #. SIPE_ACTIVITY_LUNCH -#: ../src/core/sipe-status.c:64 +#: ../src/core/sipe-status.c:62 msgid "Out to lunch" msgstr "Ute til lunsj" #. SIPE_ACTIVITY_INVISIBLE #. SIPE_ACTIVITY_OFFLINE #. SIPE_ACTIVITY_ON_PHONE -#: ../src/core/sipe-status.c:67 +#: ../src/core/sipe-status.c:65 msgid "In a call" msgstr "I en samtale" #. SIPE_ACTIVITY_IN_CONF -#: ../src/core/sipe-status.c:68 +#: ../src/core/sipe-status.c:66 msgid "In a conference" msgstr "I en konferanse" #. SIPE_ACTIVITY_IN_MEETING -#: ../src/core/sipe-status.c:69 +#: ../src/core/sipe-status.c:67 msgid "In a meeting" msgstr "I et møte" #. SIPE_ACTIVITY_URGENT_ONLY -#: ../src/core/sipe-status.c:71 +#: ../src/core/sipe-status.c:69 msgid "Urgent interruptions only" msgstr "Bare viktige forstyrrelser" +#: ../src/core/sipe-subscriptions.c:189 +msgid "Presence subscription failed!" +msgstr "" + +#: ../src/core/sipe-subscriptions.c:190 +msgid "" +"One or more buddies will therefore permanently show as offline.\n" +"\n" +"Please check that there are no corrupted SIP URIs in your contacts list." +msgstr "" + #: ../src/core/sipe-ucs.c:674 msgid "UCS initialization failed!" msgstr "" @@ -892,15 +920,19 @@ msgid "Copy to" msgstr "Kopier til" -#: ../src/purple/purple-chat.c:295 +#: ../src/purple/purple-chat.c:310 msgid "Lock" msgstr "Lås" -#: ../src/purple/purple-chat.c:300 +#: ../src/purple/purple-chat.c:315 msgid "Unlock" msgstr "Lås opp" -#: ../src/purple/purple-chat.c:321 +#: ../src/purple/purple-chat.c:338 +msgid "Show presentation" +msgstr "" + +#: ../src/purple/purple-chat.c:345 msgid "Meeting entry info" msgstr "" @@ -1152,26 +1184,30 @@ msgstr "" #: ../src/purple/purple-plugin-common.c:933 +msgid "Remote desktop client" +msgstr "" + +#: ../src/purple/purple-plugin-common.c:938 msgid "Media encryption" msgstr "" -#: ../src/purple/purple-plugin-common.c:934 +#: ../src/purple/purple-plugin-common.c:939 msgid "Obey server policy" msgstr "" -#: ../src/purple/purple-plugin-common.c:935 +#: ../src/purple/purple-plugin-common.c:940 msgid "Always" msgstr "" -#: ../src/purple/purple-plugin-common.c:936 +#: ../src/purple/purple-plugin-common.c:941 msgid "Optional" msgstr "" -#: ../src/purple/purple-plugin-common.c:937 +#: ../src/purple/purple-plugin-common.c:942 msgid "Disabled" msgstr "" -#: ../src/purple/purple-plugin-common.c:947 +#: ../src/purple/purple-plugin-common.c:952 msgid "" "Login\n" " user or DOMAIN\\user or\n" @@ -1220,27 +1256,27 @@ msgid "_Search" msgstr "_Søk" -#: ../src/purple/purple-transport.c:132 +#: ../src/purple/purple-transport.c:135 msgid "Read error" msgstr "Lesefeil" -#: ../src/purple/purple-transport.c:136 -#: ../src/telepathy/telepathy-transport.c:96 +#: ../src/purple/purple-transport.c:139 +#: ../src/telepathy/telepathy-transport.c:95 msgid "Server has disconnected" msgstr "Tjener har koblet fra" -#: ../src/purple/purple-transport.c:198 +#: ../src/purple/purple-transport.c:201 msgid "Could not connect" msgstr "Kunne ikke koble til" -#: ../src/purple/purple-transport.c:268 +#: ../src/purple/purple-transport.c:271 msgid "Could not create SSL context" msgstr "" -#: ../src/purple/purple-transport.c:290 +#: ../src/purple/purple-transport.c:293 msgid "Could not create socket" msgstr "" -#: ../src/purple/purple-transport.c:381 +#: ../src/purple/purple-transport.c:417 msgid "Write error" msgstr "Skrivefeil" diff -Nru pidgin-sipe-1.21.1/po/nl.po pidgin-sipe-1.22.1/po/nl.po --- pidgin-sipe-1.21.1/po/nl.po 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/po/nl.po 2017-06-11 15:41:22.000000000 +0000 @@ -7,14 +7,15 @@ # Translators: # fieona , 2012 # Stefan Becker , 2011 -# Tonnes , 2016 +# Tonnes , 2016-2017 +# Yves Jacmans , 2017 msgid "" msgstr "" "Project-Id-Version: pidgin sipe\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/sipe/bugs/\n" "POT-Creation-Date: 2010-11-30 23:36+0200\n" -"PO-Revision-Date: 2016-05-28 15:08+0000\n" -"Last-Translator: Stefan Becker \n" +"PO-Revision-Date: 2017-01-31 12:02+0000\n" +"Last-Translator: Tonnes \n" "Language-Team: Dutch (http://www.transifex.com/stefanb/pidgin-sipe/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,213 +23,238 @@ "Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../src/core/sip-transport.c:235 +#: ../src/core/sip-transport.c:240 msgid "Failed to authenticate to server" msgstr "Authenticatie bij server mislukt" -#: ../src/core/sip-transport.c:293 +#: ../src/core/sip-transport.c:298 #, c-format msgid "Can't request certificate from %s" msgstr "Kan geen certificaat aanvragen bij %s" -#: ../src/core/sip-transport.c:303 +#: ../src/core/sip-transport.c:308 msgid "No URI for certificate provisioning service provided" msgstr "Geen URI voor certificaat verstrekkende service opgegeven" -#: ../src/core/sip-transport.c:1281 +#: ../src/core/sip-transport.c:1285 msgid "Authentication failed" msgstr "Authenticatie mislukt" -#: ../src/core/sip-transport.c:1338 +#: ../src/core/sip-transport.c:1342 msgid "Incompatible authentication scheme chosen" msgstr "Niet-compatibel authenticatieschema gekozen" -#: ../src/core/sip-transport.c:1355 ../src/core/sipe-notify.c:1149 +#: ../src/core/sip-transport.c:1359 ../src/core/sipe-notify.c:1149 #, c-format msgid "You have been rejected by the server: %s" msgstr "U bent geweigerd door de server %s" -#: ../src/core/sip-transport.c:1356 ../src/core/sip-transport.c:1372 -#: ../src/core/sip-transport.c:1396 ../src/core/sip-transport.c:1420 +#: ../src/core/sip-transport.c:1360 ../src/core/sip-transport.c:1376 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 #: ../src/core/sipe-conf.c:265 ../src/core/sipe-notify.c:1149 msgid "no reason given" msgstr "geen reden opgegeven" -#: ../src/core/sip-transport.c:1371 +#: ../src/core/sip-transport.c:1375 #, c-format msgid "Not found: %s. Please contact your Administrator" msgstr "Niet gevonden: %s. Neem contact op met uw beheerder" -#: ../src/core/sip-transport.c:1373 +#: ../src/core/sip-transport.c:1377 msgid "SIP is either not enabled for the destination URI or it does not exist" msgstr "SIP is niet ingeschakeld voor de bestemmings-URI, of deze bestaat niet" -#: ../src/core/sip-transport.c:1396 ../src/core/sip-transport.c:1420 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 #, c-format msgid "Service unavailable: %s" msgstr "Service niet beschikbaar: %s" -#: ../src/core/sip-transport.c:1766 +#: ../src/core/sip-transport.c:1775 msgid "Corrupted message received" msgstr "Beschadigd bericht ontvangen" -#: ../src/core/sip-transport.c:1790 +#: ../src/core/sip-transport.c:1799 msgid "Invalid message signature received" msgstr "Ongeldige berichthandtekening ontvangen" -#: ../src/core/sipe-buddy.c:540 ../src/core/sipe-buddy.c:2300 +#: ../src/core/sipe-appshare.c:458 +#, c-format +msgid "%s wants to start presenting" +msgstr "%s wil een presentatie starten" + +#: ../src/core/sipe-appshare.c:462 ../src/core/sipe-conf.c:1086 +msgid "Accept" +msgstr "Accepteren" + +#: ../src/core/sipe-appshare.c:463 ../src/core/sipe-conf.c:1087 +msgid "Decline" +msgstr "Weigeren" + +#: ../src/core/sipe-appshare.c:501 ../src/core/sipe-appshare.c:599 +msgid "Application sharing error" +msgstr "Fout bij delen van toepassingen" + +#: ../src/core/sipe-appshare.c:502 +msgid "Unknown remote desktop client configured." +msgstr "Onbekende extern-bureaubladclient geconfigureerd." + +#: ../src/core/sipe-appshare.c:600 +msgid "Couldn't connect application sharing" +msgstr "Kon het delen van toepassingen niet starten" + +#: ../src/core/sipe-buddy.c:541 ../src/core/sipe-buddy.c:2301 msgid "Mobile" msgstr "Mobiel" -#: ../src/core/sipe-buddy.c:828 +#: ../src/core/sipe-buddy.c:829 msgid "Status" msgstr "Status" -#: ../src/core/sipe-buddy.c:831 +#: ../src/core/sipe-buddy.c:832 msgid "Calendar" msgstr "Agenda" -#: ../src/core/sipe-buddy.c:836 +#: ../src/core/sipe-buddy.c:837 msgid "Meeting in" msgstr "Vergadering in" -#: ../src/core/sipe-buddy.c:840 +#: ../src/core/sipe-buddy.c:841 msgid "Meeting about" msgstr "Vergadering over" -#: ../src/core/sipe-buddy.c:845 +#: ../src/core/sipe-buddy.c:846 msgid "Out of office note" msgstr "Afwezigheidsbericht" -#: ../src/core/sipe-buddy.c:845 +#: ../src/core/sipe-buddy.c:846 msgid "Note" msgstr "Bericht" -#: ../src/core/sipe-buddy.c:850 ../src/core/sipe-buddy.c:2345 +#: ../src/core/sipe-buddy.c:851 ../src/core/sipe-buddy.c:2346 #: ../src/purple/purple-buddy.c:633 msgid "Access level" msgstr "Toegangsniveau" -#: ../src/core/sipe-buddy.c:1073 +#: ../src/core/sipe-buddy.c:1074 #, c-format msgid "Found %d contact%s:" msgid_plural "Found %d contacts%s:" msgstr[0] "%d contact gevonden%s:" msgstr[1] "%d contacten gevonden%s:" -#: ../src/core/sipe-buddy.c:1075 +#: ../src/core/sipe-buddy.c:1076 msgid " (more matched your query)" -msgstr "(meer resultaten voor uw query)" +msgstr " (meer resultaten voor uw query)" -#: ../src/core/sipe-buddy.c:1121 ../src/core/sipe-buddy.c:1259 +#: ../src/core/sipe-buddy.c:1122 ../src/core/sipe-buddy.c:1260 #: ../src/core/sipe-ucs.c:314 msgid "No contacts found" msgstr "Geen contacten gevonden" -#: ../src/core/sipe-buddy.c:1134 ../src/core/sipe-buddy.c:1272 +#: ../src/core/sipe-buddy.c:1135 ../src/core/sipe-buddy.c:1273 #: ../src/core/sipe-ucs.c:278 msgid "Unable to display the search results" msgstr "Kan de zoekresultaten niet weergeven" -#: ../src/core/sipe-buddy.c:1237 ../src/core/sipe-buddy.c:1249 +#: ../src/core/sipe-buddy.c:1238 ../src/core/sipe-buddy.c:1250 #: ../src/core/sipe-ucs.c:391 msgid "Contact search failed" msgstr "Zoeken naar contact mislukt" -#: ../src/core/sipe-buddy.c:1412 ../src/core/sipe-ucs.c:395 +#: ../src/core/sipe-buddy.c:1413 ../src/core/sipe-ucs.c:395 msgid "Invalid contact search query" msgstr "Ongeldige query voor zoeken naar contact" -#: ../src/core/sipe-buddy.c:2237 +#: ../src/core/sipe-buddy.c:2238 #, c-format msgid "Make leader of '%s'" msgstr "Leider maken van ‘%s’" -#: ../src/core/sipe-buddy.c:2250 +#: ../src/core/sipe-buddy.c:2251 #, c-format msgid "Remove from '%s'" msgstr "Verwijderen van ‘%s’" -#: ../src/core/sipe-buddy.c:2264 +#: ../src/core/sipe-buddy.c:2265 #, c-format msgid "Invite to '%s'" msgstr "Uitnodigen voor ‘%s’" -#: ../src/core/sipe-buddy.c:2280 +#: ../src/core/sipe-buddy.c:2281 msgid "New chat" msgstr "Nieuwe chat" -#: ../src/core/sipe-buddy.c:2293 +#: ../src/core/sipe-buddy.c:2294 msgid "Work" msgstr "Werk" -#: ../src/core/sipe-buddy.c:2308 +#: ../src/core/sipe-buddy.c:2309 msgid "Home" msgstr "Thuis" -#: ../src/core/sipe-buddy.c:2316 +#: ../src/core/sipe-buddy.c:2317 msgid "Other" msgstr "Anders" -#: ../src/core/sipe-buddy.c:2324 +#: ../src/core/sipe-buddy.c:2325 msgid "Custom1" msgstr "Aangepast1" -#: ../src/core/sipe-buddy.c:2334 +#: ../src/core/sipe-buddy.c:2335 msgid "Send email..." msgstr "E-mail sturen..." -#: ../src/core/sipe-cal.c:907 +#: ../src/core/sipe-cal.c:906 msgid "Free" msgstr "Beschikbaar" -#: ../src/core/sipe-cal.c:908 +#: ../src/core/sipe-cal.c:907 msgid "Tentative" msgstr "Voorlopig" #. SIPE_ACTIVITY_BUSY -#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:59 +#: ../src/core/sipe-cal.c:908 ../src/core/sipe-status.c:57 msgid "Busy" msgstr "Bezet" #. SIPE_ACTIVITY_OOF -#: ../src/core/sipe-cal.c:910 ../src/core/sipe-status.c:70 +#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:68 msgid "Out of office" msgstr "Niet aanwezig" -#: ../src/core/sipe-cal.c:911 +#: ../src/core/sipe-cal.c:910 msgid "No data" msgstr "Geen gegevens" -#: ../src/core/sipe-cal.c:1019 ../src/core/sipe-cal.c:1046 +#: ../src/core/sipe-cal.c:1018 ../src/core/sipe-cal.c:1045 #, c-format msgid "Currently %s" msgstr "Momenteel %s" -#: ../src/core/sipe-cal.c:1025 +#: ../src/core/sipe-cal.c:1024 msgid "Outside of working hours for next 8 hours" msgstr "Buiten werktijden voor de komende 8 uur" -#: ../src/core/sipe-cal.c:1027 +#: ../src/core/sipe-cal.c:1026 #, c-format msgid "%s for next 8 hours" msgstr "%s voor de komende 8 uur" -#: ../src/core/sipe-cal.c:1036 +#: ../src/core/sipe-cal.c:1035 msgid "Not working" -msgstr "Werkt niet op" +msgstr "Niet aan het werk" -#: ../src/core/sipe-cal.c:1040 +#: ../src/core/sipe-cal.c:1039 #, c-format msgid "%s until %.2d:%.2d" msgstr "%s tot %.2d:%.2d" -#: ../src/core/sipe-cal.c:1048 +#: ../src/core/sipe-cal.c:1047 #, c-format msgid "%s. Outside of working hours at %.2d:%.2d" msgstr "%s. Buiten werktijden om %.2d:%.2d" -#: ../src/core/sipe-cal.c:1053 +#: ../src/core/sipe-cal.c:1052 #, c-format msgid "%s. %s at %.2d:%.2d" msgstr "%s. %s om %.2d:%.2d" @@ -244,7 +270,7 @@ msgstr "Webticketaanvraag bij %s mislukt" #. Generate next ID -#: ../src/core/sipe-chat.c:240 +#: ../src/core/sipe-chat.c:246 #, c-format msgid "Chat #%d" msgstr "Chat #%d" @@ -265,129 +291,121 @@ #: ../src/core/sipe-conf.c:443 #, c-format msgid "\"%s\" is not a valid conference URI" -msgstr "‘%s’ is geen geldige vergaderings-URI" +msgstr "‘%s’ is geen geldige vergadering-URI" #: ../src/core/sipe-conf.c:499 msgid "Incomplete conference information provided" msgstr "Onvolledige vergaderingsgegevens opgegeven" -#: ../src/core/sipe-conf.c:1041 +#: ../src/core/sipe-conf.c:1106 msgid "" "\n" "\n" "As this client was not compiled with voice call support, if you accept, you will be able to contact the other participants only via IM session." msgstr "\n\nAangezien deze client niet met ondersteuning voor audiogesprekken is gecompileerd, zult u bij accepteren alleen met de andere deelnemers in contact kunnen komen via een IM-sessie." -#: ../src/core/sipe-conf.c:1049 +#: ../src/core/sipe-conf.c:1111 #, c-format -msgid "%s wants to invite you to the conference call%s" -msgstr "%s wil u uitnodigen voor de telefonische vergadering %s" - -#: ../src/core/sipe-conf.c:1063 -msgid "Accept" -msgstr "Accepteren" - -#: ../src/core/sipe-conf.c:1064 -msgid "Decline" -msgstr "Weigeren" +msgid "wants to invite you to a conference call%s" +msgstr "wil u uitnodigen voor een telefonische vergadering%s" -#: ../src/core/sipe-conf.c:1345 +#: ../src/core/sipe-conf.c:1459 msgid "" "This conference is no longer locked. Additional participants can now join." msgstr "Deze vergadering is niet meer vergrendeld. Er kunnen nu anderen aan de vergadering deelnemen." -#: ../src/core/sipe-conf.c:1349 +#: ../src/core/sipe-conf.c:1463 msgid "" "This conference is locked. Nobody else can join the conference while it is " "locked." msgstr "Deze vergadering is vergrendeld. Er kunnen geen anderen aan de vergadering deelnemen zolang deze is vergrendeld." -#: ../src/core/sipe-conf.c:1382 +#: ../src/core/sipe-conf.c:1496 msgid "You have been disconnected from this conference." msgstr "Uw verbinding met deze vergadering is verbroken." -#: ../src/core/sipe-conf.c:1542 +#: ../src/core/sipe-conf.c:1656 msgid "Dial-in info" msgstr "Inbelgegevens" -#: ../src/core/sipe-conf.c:1543 +#: ../src/core/sipe-conf.c:1657 msgid "Number" msgstr "Nummer" -#: ../src/core/sipe-conf.c:1545 +#: ../src/core/sipe-conf.c:1659 msgid "Conference ID" msgstr "Vergadering-id" -#: ../src/core/sipe-conf.c:1547 +#: ../src/core/sipe-conf.c:1661 msgid "Meeting link" msgstr "Koppeling naar vergadering" -#: ../src/core/sipe-conf.c:1549 +#: ../src/core/sipe-conf.c:1663 msgid "Organizer" msgstr "Organisator" -#: ../src/core/sipe-conf.c:1551 +#: ../src/core/sipe-conf.c:1665 msgid "Alternative dial-in numbers" msgstr "Alternatieve inbelnummers" #. The next 13 texts make up the SIPE about note text #. About note, part 1/13: introduction -#: ../src/core/sipe-core.c:220 +#: ../src/core/sipe-core.c:221 msgid "" "A third-party plugin implementing extended version of SIP/SIMPLE used by " "various products" msgstr "Een plug-in van derden voor implementatie van een uitgebreide versie van SIP/SIMPLE, dat door diverse producten wordt gebruikt" #. About note, part 2/13: home page URL (label) -#: ../src/core/sipe-core.c:222 +#: ../src/core/sipe-core.c:223 msgid "Home Page" msgstr "Startpagina" #. About note, part 3/13: support forum URL (label) -#: ../src/core/sipe-core.c:224 +#: ../src/core/sipe-core.c:225 msgid "Support" msgstr "Ondersteuning" #. About note, part 4/13: support forum name (hyperlink text) -#: ../src/core/sipe-core.c:226 +#: ../src/core/sipe-core.c:227 msgid "Help Forum" msgstr "Helpforum" #. About note, part 5/13: bug tracker URL (label) -#: ../src/core/sipe-core.c:228 +#: ../src/core/sipe-core.c:229 msgid "Report Problems" msgstr "Problemen melden" #. About note, part 6/13: bug tracker URL (hyperlink text) -#: ../src/core/sipe-core.c:230 +#: ../src/core/sipe-core.c:231 msgid "Bug Tracker" msgstr "Bugtracker" #. About note, part 7/13: translation service URL (label) -#: ../src/core/sipe-core.c:232 +#: ../src/core/sipe-core.c:233 msgid "Translations" msgstr "Vertalingen" #. About note, part 8/13: license type (label) -#: ../src/core/sipe-core.c:234 +#: ../src/core/sipe-core.c:235 msgid "License" msgstr "Licentie" #. About note, part 9/13: (REMOVED) #. About note, part 10/13: translation request, text before Transifex.com URL #. append a space if text is not empty -#: ../src/core/sipe-core.c:238 +#: ../src/core/sipe-core.c:239 msgid "Please help us to translate SIPE to your native language here at " msgstr "Help SIPE naar uw eigen taal te vertalen op " #. About note, part 11/13: translation request, text after Transifex.com URL #. start with a space if text is not empty -#: ../src/core/sipe-core.c:241 +#: ../src/core/sipe-core.c:242 msgid " using convenient web interface" msgstr " via een handige webinterface" #. About note, part 12/13: author list (header) -#: ../src/core/sipe-core.c:243 +#: ../src/core/sipe-core.c:244 msgid "Authors" msgstr "Auteurs" @@ -395,15 +413,15 @@ #. PLEASE NOTE: do *NOT* simply translate the english original #. but write something similar to the following sentence: #. "Localization for (): " -#: ../src/core/sipe-core.c:248 +#: ../src/core/sipe-core.c:249 msgid "Original texts in English (en): SIPE developers" msgstr "Nederlandse vertaling (nl): Fieona, Tonnes" -#: ../src/core/sipe-core.c:269 +#: ../src/core/sipe-core.c:273 msgid "SIP Exchange user name contains invalid characters" msgstr "SIP Exchange-gebruikersnaam bevat ongeldige tekens" -#: ../src/core/sipe-core.c:277 ../src/purple/purple-buddy.c:485 +#: ../src/core/sipe-core.c:281 ../src/purple/purple-buddy.c:485 #: ../src/telepathy/telepathy-protocol.c:89 #: ../src/telepathy/telepathy-protocol.c:191 #, c-format @@ -412,21 +430,21 @@ "Example: user@company.com" msgstr "Gebruikersnaam moet een geldige SIP-URI zijn\nVoorbeeld: gebruiker@bedrijf.com" -#: ../src/core/sipe-core.c:284 +#: ../src/core/sipe-core.c:288 msgid "Password is required when Single Sign-On is not enabled" msgstr "Wachtwoord is vereist als eenmalige aanmelding niet is ingeschakeld" -#: ../src/core/sipe-core.c:294 +#: ../src/core/sipe-core.c:298 msgid "" "Email address should be valid if provided\n" "Example: user@company.com" msgstr "E-mailadres moet geldig zijn wanneer opgegeven\nVoorbeeld: gebruiker@bedrijf.com" -#: ../src/core/sipe-core.c:303 +#: ../src/core/sipe-core.c:307 msgid "SIP Exchange user name contains whitespace" msgstr "SIP Exchange-gebruikersnaam bevat spatie" -#: ../src/core/sipe-core.c:317 +#: ../src/core/sipe-core.c:321 msgid "" "Email services URL should be valid if provided\n" "Example: https://exchange.corp.com/EWS/Exchange.asmx\n" @@ -457,13 +475,13 @@ msgid "Could not create listen socket" msgstr "Kon geen listen-socket maken" -#: ../src/core/sipe-ft-lync.c:757 ../src/core/sipe-media.c:1195 -#: ../src/core/sipe-media.c:1206 ../src/core/sipe-media.c:1284 -#: ../src/core/sipe-media.c:1740 +#: ../src/core/sipe-ft-lync.c:762 ../src/core/sipe-media.c:1328 +#: ../src/core/sipe-media.c:1339 ../src/core/sipe-media.c:1417 +#: ../src/core/sipe-media.c:1923 msgid "Error occurred" msgstr "Er is een fout opgetreden" -#: ../src/core/sipe-ft-lync.c:758 +#: ../src/core/sipe-ft-lync.c:763 msgid "Error creating data stream" msgstr "Fout bij het maken van gegevensstroom" @@ -498,7 +516,7 @@ msgstr "Onvoldoende geheugen" #: ../src/core/sipe-group.c:168 ../src/core/sipe-notify.c:1163 -#: ../src/core/sipe-notify.c:1190 ../src/core/sipe-notify.c:1294 +#: ../src/core/sipe-notify.c:1197 ../src/core/sipe-notify.c:1301 #: ../src/purple/purple-search.c:128 msgid "Other Contacts" msgstr "Andere contacten" @@ -536,77 +554,77 @@ msgid "Failed to invite %s" msgstr "Uitnodigen van %s mislukt" -#: ../src/core/sipe-incoming.c:741 +#: ../src/core/sipe-incoming.c:754 #, c-format msgid "Received a message with unrecognized contents from %s" msgstr "Bericht met niet-herkende inhoud ontvangen van %s" -#: ../src/core/sipe-media.c:835 ../src/core/sipe-media.c:1347 -#: ../src/core/sipe-media.c:1357 ../src/core/sipe-media.c:1721 -#: ../src/core/sipe-media.c:1741 +#: ../src/core/sipe-media.c:869 ../src/core/sipe-media.c:1483 +#: ../src/core/sipe-media.c:1493 ../src/core/sipe-media.c:1904 +#: ../src/core/sipe-media.c:1924 msgid "Unable to establish a call" msgstr "Kan geen gesprek tot stand brengen" -#: ../src/core/sipe-media.c:836 ../src/core/sipe-media.c:1722 +#: ../src/core/sipe-media.c:870 ../src/core/sipe-media.c:1905 msgid "Encryption settings of peer are incompatible with ours." msgstr "Versleutelingsinstellingen van peer zijn niet compatibel met de onze." -#: ../src/core/sipe-media.c:929 +#: ../src/core/sipe-media.c:963 #, c-format msgid "User %s rejected call" msgstr "Gebruiker %s heeft oproep geweigerd" -#: ../src/core/sipe-media.c:930 +#: ../src/core/sipe-media.c:964 msgid "Call rejected" msgstr "Oproep geweigerd" -#: ../src/core/sipe-media.c:1196 ../src/core/sipe-media.c:1285 +#: ../src/core/sipe-media.c:1329 ../src/core/sipe-media.c:1418 msgid "Error creating audio stream" msgstr "Fout bij het maken van audiostream" -#: ../src/core/sipe-media.c:1207 +#: ../src/core/sipe-media.c:1340 msgid "Error creating video stream" msgstr "Fout bij het maken van videostream" -#: ../src/core/sipe-media.c:1251 ../src/purple/purple-chat.c:314 +#: ../src/core/sipe-media.c:1384 ../src/purple/purple-chat.c:329 msgid "Join conference call" msgstr "Deelnemen aan telefonische vergadering" -#: ../src/core/sipe-media.c:1252 +#: ../src/core/sipe-media.c:1385 msgid "Conference calls are not supported on this server." msgstr "Telefonische vergaderingen worden niet ondersteund op deze server." -#: ../src/core/sipe-media.c:1348 +#: ../src/core/sipe-media.c:1484 msgid "Invalid phone number" msgstr "Ongeldig telefoonnummer" -#: ../src/core/sipe-media.c:1358 +#: ../src/core/sipe-media.c:1494 msgid "Audio Test Service is not available." msgstr "Audiotestservice is niet beschikbaar." -#: ../src/core/sipe-media.c:1690 +#: ../src/core/sipe-media.c:1873 msgid "User unavailable" msgstr "Gebruiker niet beschikbaar" -#: ../src/core/sipe-media.c:1693 +#: ../src/core/sipe-media.c:1876 #, c-format msgid "%s does not want to be disturbed" msgstr "%s wil niet gestoord worden" -#: ../src/core/sipe-media.c:1695 +#: ../src/core/sipe-media.c:1878 #, c-format msgid "User %s is not available" msgstr "Gebruiker %s is niet beschikbaar" -#: ../src/core/sipe-media.c:1704 +#: ../src/core/sipe-media.c:1887 msgid "Unsupported media type" msgstr "Niet-ondersteund mediatype" -#: ../src/core/sipe-media.c:2062 +#: ../src/core/sipe-media.c:2246 msgid "Media error" msgstr "Mediafout" -#: ../src/core/sipe-media.c:2063 +#: ../src/core/sipe-media.c:2247 msgid "Error while reading from stream" msgstr "Fout bij het lezen van stream" @@ -657,36 +675,36 @@ msgstr "Onbekend" #. Translators: remove (clear) previously assigned access level -#: ../src/core/sipe-ocs2007.c:2571 +#: ../src/core/sipe-ocs2007.c:2570 msgid "Unspecify" msgstr "Wissen" -#: ../src/core/sipe-ocs2007.c:2590 +#: ../src/core/sipe-ocs2007.c:2589 msgid "People in my company" msgstr "Personen in mijn bedrijf" -#: ../src/core/sipe-ocs2007.c:2600 +#: ../src/core/sipe-ocs2007.c:2599 msgid "People in domains connected with my company" msgstr "Personen in domeinen verbonden met mijn bedrijf" -#: ../src/core/sipe-ocs2007.c:2609 +#: ../src/core/sipe-ocs2007.c:2608 msgid "People in public domains" msgstr "Personen in openbare domeinen" -#: ../src/core/sipe-ocs2007.c:2619 +#: ../src/core/sipe-ocs2007.c:2618 #, c-format msgid "People at %s" msgstr "Personen bij %s" -#: ../src/core/sipe-ocs2007.c:2644 +#: ../src/core/sipe-ocs2007.c:2643 msgid "Add new domain..." msgstr "Nieuw domein toevoegen..." -#: ../src/core/sipe-ocs2007.c:2673 +#: ../src/core/sipe-ocs2007.c:2672 msgid "Online help..." msgstr "Onlinehulp..." -#: ../src/core/sipe-ocs2007.c:2681 +#: ../src/core/sipe-ocs2007.c:2680 msgid "Access groups" msgstr "Toegangsgroepen" @@ -698,49 +716,60 @@ #. SIPE_ACTIVITY_AVAILABLE #. SIPE_ACTIVITY_ONLINE #. SIPE_ACTIVITY_INACTIVE -#: ../src/core/sipe-status.c:58 +#: ../src/core/sipe-status.c:56 msgid "Inactive" msgstr "Inactief" #. SIPE_ACTIVITY_BUSYIDLE -#: ../src/core/sipe-status.c:60 +#: ../src/core/sipe-status.c:58 msgid "Busy-Idle" msgstr "Bezig-Inactief" #. SIPE_ACTIVITY_DND #. SIPE_ACTIVITY_BRB -#: ../src/core/sipe-status.c:62 +#: ../src/core/sipe-status.c:60 msgid "Be right back" msgstr "Ben zo terug" #. SIPE_ACTIVITY_AWAY #. SIPE_ACTIVITY_LUNCH -#: ../src/core/sipe-status.c:64 +#: ../src/core/sipe-status.c:62 msgid "Out to lunch" msgstr "Lunchpauze" #. SIPE_ACTIVITY_INVISIBLE #. SIPE_ACTIVITY_OFFLINE #. SIPE_ACTIVITY_ON_PHONE -#: ../src/core/sipe-status.c:67 +#: ../src/core/sipe-status.c:65 msgid "In a call" msgstr "In gesprek" #. SIPE_ACTIVITY_IN_CONF -#: ../src/core/sipe-status.c:68 +#: ../src/core/sipe-status.c:66 msgid "In a conference" msgstr "In conferentie" #. SIPE_ACTIVITY_IN_MEETING -#: ../src/core/sipe-status.c:69 +#: ../src/core/sipe-status.c:67 msgid "In a meeting" msgstr "In vergadering" #. SIPE_ACTIVITY_URGENT_ONLY -#: ../src/core/sipe-status.c:71 +#: ../src/core/sipe-status.c:69 msgid "Urgent interruptions only" msgstr "Alleen urgente onderbrekingen" +#: ../src/core/sipe-subscriptions.c:189 +msgid "Presence subscription failed!" +msgstr "Aanwezigheidsabonnement mislukt!" + +#: ../src/core/sipe-subscriptions.c:190 +msgid "" +"One or more buddies will therefore permanently show as offline.\n" +"\n" +"Please check that there are no corrupted SIP URIs in your contacts list." +msgstr "Een of meer buddy’s verschijnen daarom permanent als offline.\n\nControleer of er geen beschadigde SIP-URI’s in uw contactenlijst staan." + #: ../src/core/sipe-ucs.c:674 msgid "UCS initialization failed!" msgstr "UCS-initialisatie mislukt!" @@ -893,15 +922,19 @@ msgid "Copy to" msgstr "Kopiëren naar" -#: ../src/purple/purple-chat.c:295 +#: ../src/purple/purple-chat.c:310 msgid "Lock" msgstr "Vergrendelen" -#: ../src/purple/purple-chat.c:300 +#: ../src/purple/purple-chat.c:315 msgid "Unlock" msgstr "Ontgrendelen" -#: ../src/purple/purple-chat.c:321 +#: ../src/purple/purple-chat.c:338 +msgid "Show presentation" +msgstr "Presentatie tonen" + +#: ../src/purple/purple-chat.c:345 msgid "Meeting entry info" msgstr "Toegangsgegevens voor de vergadering" @@ -984,7 +1017,7 @@ #: ../src/purple/purple-plugin-common.c:766 msgid "Meeting ID" -msgstr "Vergaderings-id" +msgstr "Vergadering-id" #: ../src/purple/purple-plugin-common.c:770 msgid "Join conference" @@ -1153,26 +1186,30 @@ msgstr "Proxy voor groepschat\nbedrijf.com of gebruiker@bedrijf.com\n(laat leeg voor bepaling uit Gebruikersnaam)" #: ../src/purple/purple-plugin-common.c:933 +msgid "Remote desktop client" +msgstr "Extern-bureaubladclient" + +#: ../src/purple/purple-plugin-common.c:938 msgid "Media encryption" msgstr "Mediaversleuteling" -#: ../src/purple/purple-plugin-common.c:934 +#: ../src/purple/purple-plugin-common.c:939 msgid "Obey server policy" msgstr "Serverbeleid volgen" -#: ../src/purple/purple-plugin-common.c:935 +#: ../src/purple/purple-plugin-common.c:940 msgid "Always" msgstr "Altijd" -#: ../src/purple/purple-plugin-common.c:936 +#: ../src/purple/purple-plugin-common.c:941 msgid "Optional" msgstr "Optioneel" -#: ../src/purple/purple-plugin-common.c:937 +#: ../src/purple/purple-plugin-common.c:942 msgid "Disabled" msgstr "Uitgeschakeld" -#: ../src/purple/purple-plugin-common.c:947 +#: ../src/purple/purple-plugin-common.c:952 msgid "" "Login\n" " user or DOMAIN\\user or\n" @@ -1221,27 +1258,27 @@ msgid "_Search" msgstr "_Zoeken" -#: ../src/purple/purple-transport.c:132 +#: ../src/purple/purple-transport.c:135 msgid "Read error" msgstr "Leesfout" -#: ../src/purple/purple-transport.c:136 -#: ../src/telepathy/telepathy-transport.c:96 +#: ../src/purple/purple-transport.c:139 +#: ../src/telepathy/telepathy-transport.c:95 msgid "Server has disconnected" msgstr "Server heeft verbinding verbroken" -#: ../src/purple/purple-transport.c:198 +#: ../src/purple/purple-transport.c:201 msgid "Could not connect" msgstr "Kon geen verbinding maken" -#: ../src/purple/purple-transport.c:268 +#: ../src/purple/purple-transport.c:271 msgid "Could not create SSL context" msgstr "Kon geen SSL-context maken" -#: ../src/purple/purple-transport.c:290 +#: ../src/purple/purple-transport.c:293 msgid "Could not create socket" msgstr "Kon geen socket maken" -#: ../src/purple/purple-transport.c:381 +#: ../src/purple/purple-transport.c:417 msgid "Write error" msgstr "Schrijffout" diff -Nru pidgin-sipe-1.21.1/po/pidgin-sipe.pot pidgin-sipe-1.22.1/po/pidgin-sipe.pot --- pidgin-sipe-1.21.1/po/pidgin-sipe.pot 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/po/pidgin-sipe.pot 2017-06-11 15:41:22.000000000 +0000 @@ -4,251 +4,278 @@ # # # +# Translators: +# Stefan Becker , 2011 msgid "" msgstr "" "Project-Id-Version: pidgin sipe\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/sipe/bugs/\n" "POT-Creation-Date: 2010-11-30 23:36+0200\n" -"PO-Revision-Date: 2016-05-28 15:08+0000\n" -"Last-Translator: stefanb \n" -"Language-Team: English \n" +"PO-Revision-Date: 2017-01-23 17:47+0000\n" +"Last-Translator: Stefan Becker \n" +"Language-Team: English (http://www.transifex.com/stefanb/pidgin-sipe/language/en/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: en\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../src/core/sip-transport.c:235 +#: ../src/core/sip-transport.c:240 msgid "Failed to authenticate to server" -msgstr "" +msgstr "Failed to authenticate to server" -#: ../src/core/sip-transport.c:293 +#: ../src/core/sip-transport.c:298 #, c-format msgid "Can't request certificate from %s" -msgstr "" +msgstr "Can't request certificate from %s" -#: ../src/core/sip-transport.c:303 +#: ../src/core/sip-transport.c:308 msgid "No URI for certificate provisioning service provided" -msgstr "" +msgstr "No URI for certificate provisioning service provided" -#: ../src/core/sip-transport.c:1281 +#: ../src/core/sip-transport.c:1285 msgid "Authentication failed" -msgstr "" +msgstr "Authentication failed" -#: ../src/core/sip-transport.c:1338 +#: ../src/core/sip-transport.c:1342 msgid "Incompatible authentication scheme chosen" -msgstr "" +msgstr "Incompatible authentication scheme chosen" -#: ../src/core/sip-transport.c:1355 ../src/core/sipe-notify.c:1149 +#: ../src/core/sip-transport.c:1359 ../src/core/sipe-notify.c:1149 #, c-format msgid "You have been rejected by the server: %s" -msgstr "" +msgstr "You have been rejected by the server: %s" -#: ../src/core/sip-transport.c:1356 ../src/core/sip-transport.c:1372 -#: ../src/core/sip-transport.c:1396 ../src/core/sip-transport.c:1420 +#: ../src/core/sip-transport.c:1360 ../src/core/sip-transport.c:1376 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 #: ../src/core/sipe-conf.c:265 ../src/core/sipe-notify.c:1149 msgid "no reason given" -msgstr "" +msgstr "no reason given" -#: ../src/core/sip-transport.c:1371 +#: ../src/core/sip-transport.c:1375 #, c-format msgid "Not found: %s. Please contact your Administrator" -msgstr "" +msgstr "Not found: %s. Please contact your Administrator" -#: ../src/core/sip-transport.c:1373 +#: ../src/core/sip-transport.c:1377 msgid "SIP is either not enabled for the destination URI or it does not exist" -msgstr "" +msgstr "SIP is either not enabled for the destination URI or it does not exist" -#: ../src/core/sip-transport.c:1396 ../src/core/sip-transport.c:1420 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 #, c-format msgid "Service unavailable: %s" -msgstr "" +msgstr "Service unavailable: %s" -#: ../src/core/sip-transport.c:1766 +#: ../src/core/sip-transport.c:1775 msgid "Corrupted message received" -msgstr "" +msgstr "Corrupted message received" -#: ../src/core/sip-transport.c:1790 +#: ../src/core/sip-transport.c:1799 msgid "Invalid message signature received" -msgstr "" +msgstr "Invalid message signature received" + +#: ../src/core/sipe-appshare.c:458 +#, c-format +msgid "%s wants to start presenting" +msgstr "%s wants to start presenting" + +#: ../src/core/sipe-appshare.c:462 ../src/core/sipe-conf.c:1086 +msgid "Accept" +msgstr "Accept" + +#: ../src/core/sipe-appshare.c:463 ../src/core/sipe-conf.c:1087 +msgid "Decline" +msgstr "Decline" -#: ../src/core/sipe-buddy.c:540 ../src/core/sipe-buddy.c:2300 +#: ../src/core/sipe-appshare.c:501 ../src/core/sipe-appshare.c:599 +msgid "Application sharing error" +msgstr "Application sharing error" + +#: ../src/core/sipe-appshare.c:502 +msgid "Unknown remote desktop client configured." +msgstr "Unknown remote desktop client configured." + +#: ../src/core/sipe-appshare.c:600 +msgid "Couldn't connect application sharing" +msgstr "Couldn't connect application sharing" + +#: ../src/core/sipe-buddy.c:541 ../src/core/sipe-buddy.c:2301 msgid "Mobile" -msgstr "" +msgstr "Mobile" -#: ../src/core/sipe-buddy.c:828 +#: ../src/core/sipe-buddy.c:829 msgid "Status" -msgstr "" +msgstr "Status" -#: ../src/core/sipe-buddy.c:831 +#: ../src/core/sipe-buddy.c:832 msgid "Calendar" -msgstr "" +msgstr "Calendar" -#: ../src/core/sipe-buddy.c:836 +#: ../src/core/sipe-buddy.c:837 msgid "Meeting in" -msgstr "" +msgstr "Meeting in" -#: ../src/core/sipe-buddy.c:840 +#: ../src/core/sipe-buddy.c:841 msgid "Meeting about" -msgstr "" +msgstr "Meeting about" -#: ../src/core/sipe-buddy.c:845 +#: ../src/core/sipe-buddy.c:846 msgid "Out of office note" -msgstr "" +msgstr "Out of office note" -#: ../src/core/sipe-buddy.c:845 +#: ../src/core/sipe-buddy.c:846 msgid "Note" -msgstr "" +msgstr "Note" -#: ../src/core/sipe-buddy.c:850 ../src/core/sipe-buddy.c:2345 +#: ../src/core/sipe-buddy.c:851 ../src/core/sipe-buddy.c:2346 #: ../src/purple/purple-buddy.c:633 msgid "Access level" -msgstr "" +msgstr "Access level" -#: ../src/core/sipe-buddy.c:1073 +#: ../src/core/sipe-buddy.c:1074 #, c-format msgid "Found %d contact%s:" msgid_plural "Found %d contacts%s:" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Found %d contact%s:" +msgstr[1] "Found %d contacts%s:" -#: ../src/core/sipe-buddy.c:1075 +#: ../src/core/sipe-buddy.c:1076 msgid " (more matched your query)" -msgstr "" +msgstr " (more matched your query)" -#: ../src/core/sipe-buddy.c:1121 ../src/core/sipe-buddy.c:1259 +#: ../src/core/sipe-buddy.c:1122 ../src/core/sipe-buddy.c:1260 #: ../src/core/sipe-ucs.c:314 msgid "No contacts found" -msgstr "" +msgstr "No contacts found" -#: ../src/core/sipe-buddy.c:1134 ../src/core/sipe-buddy.c:1272 +#: ../src/core/sipe-buddy.c:1135 ../src/core/sipe-buddy.c:1273 #: ../src/core/sipe-ucs.c:278 msgid "Unable to display the search results" -msgstr "" +msgstr "Unable to display the search results" -#: ../src/core/sipe-buddy.c:1237 ../src/core/sipe-buddy.c:1249 +#: ../src/core/sipe-buddy.c:1238 ../src/core/sipe-buddy.c:1250 #: ../src/core/sipe-ucs.c:391 msgid "Contact search failed" -msgstr "" +msgstr "Contact search failed" -#: ../src/core/sipe-buddy.c:1412 ../src/core/sipe-ucs.c:395 +#: ../src/core/sipe-buddy.c:1413 ../src/core/sipe-ucs.c:395 msgid "Invalid contact search query" -msgstr "" +msgstr "Invalid contact search query" -#: ../src/core/sipe-buddy.c:2237 +#: ../src/core/sipe-buddy.c:2238 #, c-format msgid "Make leader of '%s'" -msgstr "" +msgstr "Make leader of '%s'" -#: ../src/core/sipe-buddy.c:2250 +#: ../src/core/sipe-buddy.c:2251 #, c-format msgid "Remove from '%s'" -msgstr "" +msgstr "Remove from '%s'" -#: ../src/core/sipe-buddy.c:2264 +#: ../src/core/sipe-buddy.c:2265 #, c-format msgid "Invite to '%s'" -msgstr "" +msgstr "Invite to '%s'" -#: ../src/core/sipe-buddy.c:2280 +#: ../src/core/sipe-buddy.c:2281 msgid "New chat" -msgstr "" +msgstr "New chat" -#: ../src/core/sipe-buddy.c:2293 +#: ../src/core/sipe-buddy.c:2294 msgid "Work" -msgstr "" +msgstr "Work" -#: ../src/core/sipe-buddy.c:2308 +#: ../src/core/sipe-buddy.c:2309 msgid "Home" -msgstr "" +msgstr "Home" -#: ../src/core/sipe-buddy.c:2316 +#: ../src/core/sipe-buddy.c:2317 msgid "Other" -msgstr "" +msgstr "Other" -#: ../src/core/sipe-buddy.c:2324 +#: ../src/core/sipe-buddy.c:2325 msgid "Custom1" -msgstr "" +msgstr "Custom1" -#: ../src/core/sipe-buddy.c:2334 +#: ../src/core/sipe-buddy.c:2335 msgid "Send email..." -msgstr "" +msgstr "Send email..." -#: ../src/core/sipe-cal.c:907 +#: ../src/core/sipe-cal.c:906 msgid "Free" -msgstr "" +msgstr "Free" -#: ../src/core/sipe-cal.c:908 +#: ../src/core/sipe-cal.c:907 msgid "Tentative" -msgstr "" +msgstr "Tentative" #. SIPE_ACTIVITY_BUSY -#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:59 +#: ../src/core/sipe-cal.c:908 ../src/core/sipe-status.c:57 msgid "Busy" -msgstr "" +msgstr "Busy" #. SIPE_ACTIVITY_OOF -#: ../src/core/sipe-cal.c:910 ../src/core/sipe-status.c:70 +#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:68 msgid "Out of office" -msgstr "" +msgstr "Out of office" -#: ../src/core/sipe-cal.c:911 +#: ../src/core/sipe-cal.c:910 msgid "No data" -msgstr "" +msgstr "No data" -#: ../src/core/sipe-cal.c:1019 ../src/core/sipe-cal.c:1046 +#: ../src/core/sipe-cal.c:1018 ../src/core/sipe-cal.c:1045 #, c-format msgid "Currently %s" -msgstr "" +msgstr "Currently %s" -#: ../src/core/sipe-cal.c:1025 +#: ../src/core/sipe-cal.c:1024 msgid "Outside of working hours for next 8 hours" -msgstr "" +msgstr "Outside of working hours for next 8 hours" -#: ../src/core/sipe-cal.c:1027 +#: ../src/core/sipe-cal.c:1026 #, c-format msgid "%s for next 8 hours" -msgstr "" +msgstr "%s for next 8 hours" -#: ../src/core/sipe-cal.c:1036 +#: ../src/core/sipe-cal.c:1035 msgid "Not working" -msgstr "" +msgstr "Not working" -#: ../src/core/sipe-cal.c:1040 +#: ../src/core/sipe-cal.c:1039 #, c-format msgid "%s until %.2d:%.2d" -msgstr "" +msgstr "%s until %.2d:%.2d" -#: ../src/core/sipe-cal.c:1048 +#: ../src/core/sipe-cal.c:1047 #, c-format msgid "%s. Outside of working hours at %.2d:%.2d" -msgstr "" +msgstr "%s. Outside of working hours at %.2d:%.2d" -#: ../src/core/sipe-cal.c:1053 +#: ../src/core/sipe-cal.c:1052 #, c-format msgid "%s. %s at %.2d:%.2d" -msgstr "" +msgstr "%s. %s at %.2d:%.2d" #: ../src/core/sipe-certificate.c:233 ../src/core/sipe-certificate.c:277 #, c-format msgid "Certificate request to %s failed" -msgstr "" +msgstr "Certificate request to %s failed" #: ../src/core/sipe-certificate.c:284 #, c-format msgid "Web ticket request to %s failed" -msgstr "" +msgstr "Web ticket request to %s failed" #. Generate next ID -#: ../src/core/sipe-chat.c:240 +#: ../src/core/sipe-chat.c:246 #, c-format msgid "Chat #%d" -msgstr "" +msgstr "Chat #%d" #: ../src/core/sipe-conf.c:264 ../src/core/sipe-conf.c:412 #: ../src/core/sipe-conf.c:446 ../src/core/sipe-conf.c:498 msgid "Failed to join the conference" -msgstr "" +msgstr "Failed to join the conference" #: ../src/core/sipe-conf.c:408 #, c-format @@ -256,248 +283,240 @@ "Can't find a conference URI on this page:\n" "\n" "%s" -msgstr "" +msgstr "Can't find a conference URI on this page:\n\n%s" #: ../src/core/sipe-conf.c:443 #, c-format msgid "\"%s\" is not a valid conference URI" -msgstr "" +msgstr "\"%s\" is not a valid conference URI" #: ../src/core/sipe-conf.c:499 msgid "Incomplete conference information provided" -msgstr "" +msgstr "Incomplete conference information provided" -#: ../src/core/sipe-conf.c:1041 +#: ../src/core/sipe-conf.c:1106 msgid "" "\n" "\n" -"As this client was not compiled with voice call support, if you accept, you " -"will be able to contact the other participants only via IM session." -msgstr "" +"As this client was not compiled with voice call support, if you accept, you will be able to contact the other participants only via IM session." +msgstr "\n\nAs this client was not compiled with voice call support, if you accept, you will be able to contact the other participants only via IM session." -#: ../src/core/sipe-conf.c:1049 +#: ../src/core/sipe-conf.c:1111 #, c-format -msgid "%s wants to invite you to the conference call%s" -msgstr "" +msgid "wants to invite you to a conference call%s" +msgstr "wants to invite you to a conference call%s" -#: ../src/core/sipe-conf.c:1063 -msgid "Accept" -msgstr "" - -#: ../src/core/sipe-conf.c:1064 -msgid "Decline" -msgstr "" - -#: ../src/core/sipe-conf.c:1345 +#: ../src/core/sipe-conf.c:1459 msgid "" "This conference is no longer locked. Additional participants can now join." -msgstr "" +msgstr "This conference is no longer locked. Additional participants can now join." -#: ../src/core/sipe-conf.c:1349 +#: ../src/core/sipe-conf.c:1463 msgid "" "This conference is locked. Nobody else can join the conference while it is " "locked." -msgstr "" +msgstr "This conference is locked. Nobody else can join the conference while it is locked." -#: ../src/core/sipe-conf.c:1382 +#: ../src/core/sipe-conf.c:1496 msgid "You have been disconnected from this conference." -msgstr "" +msgstr "You have been disconnected from this conference." -#: ../src/core/sipe-conf.c:1542 +#: ../src/core/sipe-conf.c:1656 msgid "Dial-in info" -msgstr "" +msgstr "Dial-in info" -#: ../src/core/sipe-conf.c:1543 +#: ../src/core/sipe-conf.c:1657 msgid "Number" -msgstr "" +msgstr "Number" -#: ../src/core/sipe-conf.c:1545 +#: ../src/core/sipe-conf.c:1659 msgid "Conference ID" -msgstr "" +msgstr "Conference ID" -#: ../src/core/sipe-conf.c:1547 +#: ../src/core/sipe-conf.c:1661 msgid "Meeting link" -msgstr "" +msgstr "Meeting link" -#: ../src/core/sipe-conf.c:1549 +#: ../src/core/sipe-conf.c:1663 msgid "Organizer" -msgstr "" +msgstr "Organizer" -#: ../src/core/sipe-conf.c:1551 +#: ../src/core/sipe-conf.c:1665 msgid "Alternative dial-in numbers" -msgstr "" +msgstr "Alternative dial-in numbers" #. The next 13 texts make up the SIPE about note text #. About note, part 1/13: introduction -#: ../src/core/sipe-core.c:220 +#: ../src/core/sipe-core.c:221 msgid "" "A third-party plugin implementing extended version of SIP/SIMPLE used by " "various products" -msgstr "" +msgstr "A third-party plugin implementing extended version of SIP/SIMPLE used by various products" #. About note, part 2/13: home page URL (label) -#: ../src/core/sipe-core.c:222 +#: ../src/core/sipe-core.c:223 msgid "Home Page" -msgstr "" +msgstr "Home Page" #. About note, part 3/13: support forum URL (label) -#: ../src/core/sipe-core.c:224 +#: ../src/core/sipe-core.c:225 msgid "Support" -msgstr "" +msgstr "Support" #. About note, part 4/13: support forum name (hyperlink text) -#: ../src/core/sipe-core.c:226 +#: ../src/core/sipe-core.c:227 msgid "Help Forum" -msgstr "" +msgstr "Help Forum" #. About note, part 5/13: bug tracker URL (label) -#: ../src/core/sipe-core.c:228 +#: ../src/core/sipe-core.c:229 msgid "Report Problems" -msgstr "" +msgstr "Report Problems" #. About note, part 6/13: bug tracker URL (hyperlink text) -#: ../src/core/sipe-core.c:230 +#: ../src/core/sipe-core.c:231 msgid "Bug Tracker" -msgstr "" +msgstr "Bug Tracker" #. About note, part 7/13: translation service URL (label) -#: ../src/core/sipe-core.c:232 +#: ../src/core/sipe-core.c:233 msgid "Translations" -msgstr "" +msgstr "Translations" #. About note, part 8/13: license type (label) -#: ../src/core/sipe-core.c:234 +#: ../src/core/sipe-core.c:235 msgid "License" -msgstr "" +msgstr "License" #. About note, part 9/13: (REMOVED) #. About note, part 10/13: translation request, text before Transifex.com URL #. append a space if text is not empty -#: ../src/core/sipe-core.c:238 +#: ../src/core/sipe-core.c:239 msgid "Please help us to translate SIPE to your native language here at " -msgstr "" +msgstr "Please help us to translate SIPE to your native language here at " #. About note, part 11/13: translation request, text after Transifex.com URL #. start with a space if text is not empty -#: ../src/core/sipe-core.c:241 +#: ../src/core/sipe-core.c:242 msgid " using convenient web interface" -msgstr "" +msgstr " using convenient web interface" #. About note, part 12/13: author list (header) -#: ../src/core/sipe-core.c:243 +#: ../src/core/sipe-core.c:244 msgid "Authors" -msgstr "" +msgstr "Authors" #. About note, part 13/13: Localization credit #. PLEASE NOTE: do *NOT* simply translate the english original #. but write something similar to the following sentence: #. "Localization for (): " -#: ../src/core/sipe-core.c:248 +#: ../src/core/sipe-core.c:249 msgid "Original texts in English (en): SIPE developers" -msgstr "" +msgstr "Original texts in English (en): SIPE developers" -#: ../src/core/sipe-core.c:269 +#: ../src/core/sipe-core.c:273 msgid "SIP Exchange user name contains invalid characters" -msgstr "" +msgstr "SIP Exchange user name contains invalid characters" -#: ../src/core/sipe-core.c:277 ../src/purple/purple-buddy.c:485 +#: ../src/core/sipe-core.c:281 ../src/purple/purple-buddy.c:485 #: ../src/telepathy/telepathy-protocol.c:89 #: ../src/telepathy/telepathy-protocol.c:191 #, c-format msgid "" "User name should be a valid SIP URI\n" "Example: user@company.com" -msgstr "" +msgstr "User name should be a valid SIP URI\nExample: user@company.com" -#: ../src/core/sipe-core.c:284 +#: ../src/core/sipe-core.c:288 msgid "Password is required when Single Sign-On is not enabled" -msgstr "" +msgstr "Password is required when Single Sign-On is not enabled" -#: ../src/core/sipe-core.c:294 +#: ../src/core/sipe-core.c:298 msgid "" "Email address should be valid if provided\n" "Example: user@company.com" -msgstr "" +msgstr "Email address should be valid if provided\nExample: user@company.com" -#: ../src/core/sipe-core.c:303 +#: ../src/core/sipe-core.c:307 msgid "SIP Exchange user name contains whitespace" -msgstr "" +msgstr "SIP Exchange user name contains whitespace" -#: ../src/core/sipe-core.c:317 +#: ../src/core/sipe-core.c:321 msgid "" "Email services URL should be valid if provided\n" "Example: https://exchange.corp.com/EWS/Exchange.asmx\n" "Example: https://domino.corp.com/maildatabase.nsf" -msgstr "" +msgstr "Email services URL should be valid if provided\nExample: https://exchange.corp.com/EWS/Exchange.asmx\nExample: https://domino.corp.com/maildatabase.nsf" -#. Translators: (!) should be as in localized Lotus Notes to be able to extract meeting location +#. Translators: (!) should be as in localized Lotus Notes to be able to +#. extract meeting location #: ../src/core/sipe-domino.c:260 ../src/core/sipe-domino.c:261 msgid "Location:" -msgstr "" +msgstr "Location:" #: ../src/core/sipe-ft.c:264 ../src/core/sipe-ft-tftp.c:109 #: ../src/core/sipe-ft-tftp.c:393 ../src/core/sipe-ft-tftp.c:422 #: ../src/core/sipe-ft-tftp.c:481 msgid "Socket read failed" -msgstr "" +msgstr "Socket read failed" #: ../src/core/sipe-ft.c:412 msgid "Received encryption key has wrong size." -msgstr "" +msgstr "Received encryption key has wrong size." #: ../src/core/sipe-ft.c:427 msgid "Received hash key has wrong size." -msgstr "" +msgstr "Received hash key has wrong size." #: ../src/core/sipe-ft.c:447 msgid "Could not create listen socket" -msgstr "" +msgstr "Could not create listen socket" -#: ../src/core/sipe-ft-lync.c:757 ../src/core/sipe-media.c:1195 -#: ../src/core/sipe-media.c:1206 ../src/core/sipe-media.c:1284 -#: ../src/core/sipe-media.c:1740 +#: ../src/core/sipe-ft-lync.c:762 ../src/core/sipe-media.c:1328 +#: ../src/core/sipe-media.c:1339 ../src/core/sipe-media.c:1417 +#: ../src/core/sipe-media.c:1923 msgid "Error occurred" -msgstr "" +msgstr "Error occurred" -#: ../src/core/sipe-ft-lync.c:758 +#: ../src/core/sipe-ft-lync.c:763 msgid "Error creating data stream" -msgstr "" +msgstr "Error creating data stream" #: ../src/core/sipe-ft-tftp.c:115 ../src/core/sipe-ft-tftp.c:525 #: ../src/core/sipe-ft-tftp.c:534 msgid "Socket write failed" -msgstr "" +msgstr "Socket write failed" #: ../src/core/sipe-ft-tftp.c:208 msgid "File size is different from the advertised value." -msgstr "" +msgstr "File size is different from the advertised value." #: ../src/core/sipe-ft-tftp.c:247 msgid "Received MAC is corrupted" -msgstr "" +msgstr "Received MAC is corrupted" #: ../src/core/sipe-ft-tftp.c:258 msgid "Received file is corrupted" -msgstr "" +msgstr "Received file is corrupted" #: ../src/core/sipe-ft-tftp.c:287 msgid "File transfer initialization failed." -msgstr "" +msgstr "File transfer initialization failed." #: ../src/core/sipe-ft-tftp.c:318 msgid "File transfer authentication failed." -msgstr "" +msgstr "File transfer authentication failed." #: ../src/core/sipe-ft-tftp.c:414 ../src/core/sipe-ft-tftp.c:432 #: ../src/core/sipe-ft-tftp.c:495 msgid "Out of memory" -msgstr "" +msgstr "Out of memory" #: ../src/core/sipe-group.c:168 ../src/core/sipe-notify.c:1163 -#: ../src/core/sipe-notify.c:1190 ../src/core/sipe-notify.c:1294 +#: ../src/core/sipe-notify.c:1197 ../src/core/sipe-notify.c:1301 #: ../src/purple/purple-search.c:128 msgid "Other Contacts" -msgstr "" +msgstr "Other Contacts" #: ../src/core/sipe-groupchat.c:329 #, c-format @@ -507,133 +526,133 @@ "\t%s\n" "\n" "Please update your Account." -msgstr "" +msgstr "Group Chat Proxy setting is incorrect:\n\n\t%s\n\nPlease update your Account." #: ../src/core/sipe-groupchat.c:332 msgid "Couldn't find Group Chat server!" -msgstr "" +msgstr "Couldn't find Group Chat server!" #: ../src/core/sipe-groupchat.c:508 #, c-format msgid "This message was not delivered to chat room '%s'" -msgstr "" +msgstr "This message was not delivered to chat room '%s'" #: ../src/core/sipe-groupchat.c:616 msgid "Error retrieving room list" -msgstr "" +msgstr "Error retrieving room list" #: ../src/core/sipe-groupchat.c:720 msgid "Error joining chat room" -msgstr "" +msgstr "Error joining chat room" #. generate one error and remove all unprocessed messages #: ../src/core/sipe-im.c:197 #, c-format msgid "Failed to invite %s" -msgstr "" +msgstr "Failed to invite %s" -#: ../src/core/sipe-incoming.c:741 +#: ../src/core/sipe-incoming.c:754 #, c-format msgid "Received a message with unrecognized contents from %s" -msgstr "" +msgstr "Received a message with unrecognized contents from %s" -#: ../src/core/sipe-media.c:835 ../src/core/sipe-media.c:1347 -#: ../src/core/sipe-media.c:1357 ../src/core/sipe-media.c:1721 -#: ../src/core/sipe-media.c:1741 +#: ../src/core/sipe-media.c:869 ../src/core/sipe-media.c:1483 +#: ../src/core/sipe-media.c:1493 ../src/core/sipe-media.c:1904 +#: ../src/core/sipe-media.c:1924 msgid "Unable to establish a call" -msgstr "" +msgstr "Unable to establish a call" -#: ../src/core/sipe-media.c:836 ../src/core/sipe-media.c:1722 +#: ../src/core/sipe-media.c:870 ../src/core/sipe-media.c:1905 msgid "Encryption settings of peer are incompatible with ours." -msgstr "" +msgstr "Encryption settings of peer are incompatible with ours." -#: ../src/core/sipe-media.c:929 +#: ../src/core/sipe-media.c:963 #, c-format msgid "User %s rejected call" -msgstr "" +msgstr "User %s rejected call" -#: ../src/core/sipe-media.c:930 +#: ../src/core/sipe-media.c:964 msgid "Call rejected" -msgstr "" +msgstr "Call rejected" -#: ../src/core/sipe-media.c:1196 ../src/core/sipe-media.c:1285 +#: ../src/core/sipe-media.c:1329 ../src/core/sipe-media.c:1418 msgid "Error creating audio stream" -msgstr "" +msgstr "Error creating audio stream" -#: ../src/core/sipe-media.c:1207 +#: ../src/core/sipe-media.c:1340 msgid "Error creating video stream" -msgstr "" +msgstr "Error creating video stream" -#: ../src/core/sipe-media.c:1251 ../src/purple/purple-chat.c:314 +#: ../src/core/sipe-media.c:1384 ../src/purple/purple-chat.c:329 msgid "Join conference call" -msgstr "" +msgstr "Join conference call" -#: ../src/core/sipe-media.c:1252 +#: ../src/core/sipe-media.c:1385 msgid "Conference calls are not supported on this server." -msgstr "" +msgstr "Conference calls are not supported on this server." -#: ../src/core/sipe-media.c:1348 +#: ../src/core/sipe-media.c:1484 msgid "Invalid phone number" -msgstr "" +msgstr "Invalid phone number" -#: ../src/core/sipe-media.c:1358 +#: ../src/core/sipe-media.c:1494 msgid "Audio Test Service is not available." -msgstr "" +msgstr "Audio Test Service is not available." -#: ../src/core/sipe-media.c:1690 +#: ../src/core/sipe-media.c:1873 msgid "User unavailable" -msgstr "" +msgstr "User unavailable" -#: ../src/core/sipe-media.c:1693 +#: ../src/core/sipe-media.c:1876 #, c-format msgid "%s does not want to be disturbed" -msgstr "" +msgstr "%s does not want to be disturbed" -#: ../src/core/sipe-media.c:1695 +#: ../src/core/sipe-media.c:1878 #, c-format msgid "User %s is not available" -msgstr "" +msgstr "User %s is not available" -#: ../src/core/sipe-media.c:1704 +#: ../src/core/sipe-media.c:1887 msgid "Unsupported media type" -msgstr "" +msgstr "Unsupported media type" -#: ../src/core/sipe-media.c:2062 +#: ../src/core/sipe-media.c:2246 msgid "Media error" -msgstr "" +msgstr "Media error" -#: ../src/core/sipe-media.c:2063 +#: ../src/core/sipe-media.c:2247 msgid "Error while reading from stream" -msgstr "" +msgstr "Error while reading from stream" #. reason = g_strdup(_("User logged out")); // [MS-OCER] #: ../src/core/sipe-notify.c:1141 msgid "you are already signed in at another location" -msgstr "" +msgstr "you are already signed in at another location" #: ../src/core/sipe-notify.c:1143 msgid "user disabled" -msgstr "" +msgstr "user disabled" #: ../src/core/sipe-notify.c:1145 msgid "user moved" -msgstr "" +msgstr "user moved" #: ../src/core/sipe-ocs2007.c:458 ../src/purple/purple-buddy.c:640 #: ../src/purple/purple-buddy.c:647 msgid "Blocked" -msgstr "" +msgstr "Blocked" #: ../src/core/sipe-ocs2007.c:459 ../src/purple/purple-buddy.c:636 #: ../src/purple/purple-buddy.c:643 msgid "Personal" -msgstr "" +msgstr "Personal" #. index 0 #: ../src/core/sipe-ocs2007.c:460 ../src/purple/purple-buddy.c:637 #: ../src/purple/purple-buddy.c:644 msgid "Team" -msgstr "" +msgstr "Team" #. SIPE_BUDDY_INFO_WORK_PHONE_DISPLAY #. SIPE_BUDDY_INFO_COMPANY @@ -641,138 +660,145 @@ #: ../src/purple/purple-buddy.c:638 ../src/purple/purple-buddy.c:645 #: ../src/purple/purple-search.c:66 ../src/purple/purple-search.c:229 msgid "Company" -msgstr "" +msgstr "Company" #: ../src/core/sipe-ocs2007.c:462 ../src/purple/purple-buddy.c:639 #: ../src/purple/purple-buddy.c:646 msgid "Public" -msgstr "" +msgstr "Public" #: ../src/core/sipe-ocs2007.c:464 msgid "Unknown" -msgstr "" +msgstr "Unknown" #. Translators: remove (clear) previously assigned access level -#: ../src/core/sipe-ocs2007.c:2571 +#: ../src/core/sipe-ocs2007.c:2570 msgid "Unspecify" -msgstr "" +msgstr "Unspecify" -#: ../src/core/sipe-ocs2007.c:2590 +#: ../src/core/sipe-ocs2007.c:2589 msgid "People in my company" -msgstr "" +msgstr "People in my company" -#: ../src/core/sipe-ocs2007.c:2600 +#: ../src/core/sipe-ocs2007.c:2599 msgid "People in domains connected with my company" -msgstr "" +msgstr "People in domains connected with my company" -#: ../src/core/sipe-ocs2007.c:2609 +#: ../src/core/sipe-ocs2007.c:2608 msgid "People in public domains" -msgstr "" +msgstr "People in public domains" -#: ../src/core/sipe-ocs2007.c:2619 +#: ../src/core/sipe-ocs2007.c:2618 #, c-format msgid "People at %s" -msgstr "" +msgstr "People at %s" -#: ../src/core/sipe-ocs2007.c:2644 +#: ../src/core/sipe-ocs2007.c:2643 msgid "Add new domain..." -msgstr "" +msgstr "Add new domain..." -#: ../src/core/sipe-ocs2007.c:2673 +#: ../src/core/sipe-ocs2007.c:2672 msgid "Online help..." -msgstr "" +msgstr "Online help..." -#: ../src/core/sipe-ocs2007.c:2681 +#: ../src/core/sipe-ocs2007.c:2680 msgid "Access groups" -msgstr "" +msgstr "Access groups" -#. #. * This has nothing to do with Availability numbers, like 3500 (online). #. * Just a mapping of Communicator Activities to tokens/translations -#. #. @TODO: NULL means "default translation from Pidgin"? #. * What about other backends? #. SIPE_ACTIVITY_UNSET #. SIPE_ACTIVITY_AVAILABLE #. SIPE_ACTIVITY_ONLINE #. SIPE_ACTIVITY_INACTIVE -#: ../src/core/sipe-status.c:58 +#: ../src/core/sipe-status.c:56 msgid "Inactive" -msgstr "" +msgstr "Inactive" #. SIPE_ACTIVITY_BUSYIDLE -#: ../src/core/sipe-status.c:60 +#: ../src/core/sipe-status.c:58 msgid "Busy-Idle" -msgstr "" +msgstr "Busy-Idle" #. SIPE_ACTIVITY_DND #. SIPE_ACTIVITY_BRB -#: ../src/core/sipe-status.c:62 +#: ../src/core/sipe-status.c:60 msgid "Be right back" -msgstr "" +msgstr "Be right back" #. SIPE_ACTIVITY_AWAY #. SIPE_ACTIVITY_LUNCH -#: ../src/core/sipe-status.c:64 +#: ../src/core/sipe-status.c:62 msgid "Out to lunch" -msgstr "" +msgstr "Out to lunch" #. SIPE_ACTIVITY_INVISIBLE #. SIPE_ACTIVITY_OFFLINE #. SIPE_ACTIVITY_ON_PHONE -#: ../src/core/sipe-status.c:67 +#: ../src/core/sipe-status.c:65 msgid "In a call" -msgstr "" +msgstr "In a call" #. SIPE_ACTIVITY_IN_CONF -#: ../src/core/sipe-status.c:68 +#: ../src/core/sipe-status.c:66 msgid "In a conference" -msgstr "" +msgstr "In a conference" #. SIPE_ACTIVITY_IN_MEETING -#: ../src/core/sipe-status.c:69 +#: ../src/core/sipe-status.c:67 msgid "In a meeting" -msgstr "" +msgstr "In a meeting" #. SIPE_ACTIVITY_URGENT_ONLY -#: ../src/core/sipe-status.c:71 +#: ../src/core/sipe-status.c:69 msgid "Urgent interruptions only" -msgstr "" +msgstr "Urgent interruptions only" + +#: ../src/core/sipe-subscriptions.c:189 +msgid "Presence subscription failed!" +msgstr "Presence subscription failed!" + +#: ../src/core/sipe-subscriptions.c:190 +msgid "" +"One or more buddies will therefore permanently show as offline.\n" +"\n" +"Please check that there are no corrupted SIP URIs in your contacts list." +msgstr "One or more buddies will therefore permanently show as offline.\n\nPlease check that there are no corrupted SIP URIs in your contacts list." #: ../src/core/sipe-ucs.c:674 msgid "UCS initialization failed!" -msgstr "" +msgstr "UCS initialization failed!" #: ../src/core/sipe-ucs.c:676 msgid "" -"Couldn't find an Exchange server with the default Email settings. Therefore " -"the contacts list will not work.\n" +"Couldn't find an Exchange server with the default Email settings. Therefore the contacts list will not work.\n" "\n" "You'll need to provide Email settings in the account setup." -msgstr "" +msgstr "Couldn't find an Exchange server with the default Email settings. Therefore the contacts list will not work.\n\nYou'll need to provide Email settings in the account setup." #: ../src/core/sipe-ucs.c:677 msgid "" -"Couldn't find an Exchange server with the Email settings provided in the " -"account setup. Therefore the contacts list will not work.\n" +"Couldn't find an Exchange server with the Email settings provided in the account setup. Therefore the contacts list will not work.\n" "\n" "Please correct your Email settings." -msgstr "" +msgstr "Couldn't find an Exchange server with the Email settings provided in the account setup. Therefore the contacts list will not work.\n\nPlease correct your Email settings." #. Service unavailable; Server Internal Error; Server Time-out #. Not acceptable all. #. Message contents not allowed by policy #: ../src/core/sipe-user.c:78 msgid "" -"Your message or invitation was not delivered, possibly because it contains a " -"hyperlink or other content that the system administrator has blocked." -msgstr "" +"Your message or invitation was not delivered, possibly because it contains a" +" hyperlink or other content that the system administrator has blocked." +msgstr "Your message or invitation was not delivered, possibly because it contains a hyperlink or other content that the system administrator has blocked." #: ../src/core/sipe-user.c:82 #, c-format msgid "" "This message was not delivered to %s because the service is not available" -msgstr "" +msgstr "This message was not delivered to %s because the service is not available" #. Busy Here #: ../src/core/sipe-user.c:84 @@ -780,7 +806,7 @@ msgid "" "This message was not delivered to %s because one or more recipients do not " "want to be disturbed" -msgstr "" +msgstr "This message was not delivered to %s because one or more recipients do not want to be disturbed" #. Unsupported media type #: ../src/core/sipe-user.c:86 @@ -788,61 +814,61 @@ msgid "" "This message was not delivered to %s because one or more recipients don't " "support this type of message" -msgstr "" +msgstr "This message was not delivered to %s because one or more recipients don't support this type of message" #: ../src/core/sipe-user.c:88 #, c-format msgid "" "This message was not delivered to %s because one or more recipients are " "offline" -msgstr "" +msgstr "This message was not delivered to %s because one or more recipients are offline" #. SIPE_BUDDY_INFO_DISPLAY_NAME #: ../src/purple/purple-buddy.c:67 msgid "Display name" -msgstr "" +msgstr "Display name" #. SIPE_BUDDY_INFO_JOB_TITLE #: ../src/purple/purple-buddy.c:68 msgid "Job title" -msgstr "" +msgstr "Job title" #. SIPE_BUDDY_INFO_CITY #: ../src/purple/purple-buddy.c:69 msgid "City" -msgstr "" +msgstr "City" #. SIPE_BUDDY_INFO_STATE #: ../src/purple/purple-buddy.c:70 msgid "State" -msgstr "" +msgstr "State" #. SIPE_BUDDY_INFO_OFFICE #: ../src/purple/purple-buddy.c:71 msgid "Office" -msgstr "" +msgstr "Office" #. SIPE_BUDDY_INFO_DEPARTMENT #. SIPE_BUDDY_INFO_COUNTRY #: ../src/purple/purple-buddy.c:73 ../src/purple/purple-search.c:69 #: ../src/purple/purple-search.c:231 msgid "Country" -msgstr "" +msgstr "Country" #. SIPE_BUDDY_INFO_WORK_PHONE #: ../src/purple/purple-buddy.c:74 msgid "Business phone" -msgstr "" +msgstr "Business phone" #. SIPE_BUDDY_INFO_EMAIL #: ../src/purple/purple-buddy.c:77 msgid "Email address" -msgstr "" +msgstr "Email address" #. SIPE_BUDDY_INFO_SITE #: ../src/purple/purple-buddy.c:78 msgid "Site" -msgstr "" +msgstr "Site" #. SIPE_BUDDY_INFO_ZIPCODE #. SIPE_BUDDY_INFO_STREET @@ -857,142 +883,146 @@ #. SIPE_BUDDY_INFO_ALIAS #: ../src/purple/purple-buddy.c:89 msgid "Alias" -msgstr "" +msgstr "Alias" #. SIPE_BUDDY_INFO_DEVICE #: ../src/purple/purple-buddy.c:90 msgid "Device" -msgstr "" +msgstr "Device" #: ../src/purple/purple-buddy.c:260 ../src/purple/purple-buddy.c:278 msgid "you" -msgstr "" +msgstr "you" #: ../src/purple/purple-buddy.c:584 msgid "" "https://sourceforge.net/apps/mediawiki/sipe/index.php?title=Access_Levels" -msgstr "" +msgstr "https://sourceforge.net/apps/mediawiki/sipe/index.php?title=Access_Levels" #: ../src/purple/purple-buddy.c:626 msgid "Domain" -msgstr "" +msgstr "Domain" #: ../src/purple/purple-buddy.c:655 ../src/purple/purple-buddy.c:656 msgid "Add new domain" -msgstr "" +msgstr "Add new domain" #: ../src/purple/purple-buddy.c:657 msgid "Add" -msgstr "" +msgstr "Add" #: ../src/purple/purple-buddy.c:658 msgid "Cancel" -msgstr "" +msgstr "Cancel" #: ../src/purple/purple-buddy.c:810 msgid "Copy to" -msgstr "" +msgstr "Copy to" -#: ../src/purple/purple-chat.c:295 +#: ../src/purple/purple-chat.c:310 msgid "Lock" -msgstr "" +msgstr "Lock" -#: ../src/purple/purple-chat.c:300 +#: ../src/purple/purple-chat.c:315 msgid "Unlock" -msgstr "" +msgstr "Unlock" -#: ../src/purple/purple-chat.c:321 +#: ../src/purple/purple-chat.c:338 +msgid "Show presentation" +msgstr "Show presentation" + +#: ../src/purple/purple-chat.c:345 msgid "Meeting entry info" -msgstr "" +msgstr "Meeting entry info" #: ../src/purple/purple-groupchat.c:56 msgid "_URI:" -msgstr "" +msgstr "_URI:" #: ../src/purple/purple-groupchat.c:160 msgid "Users" -msgstr "" +msgstr "Users" #: ../src/purple/purple-groupchat.c:163 msgid "Invite" -msgstr "" +msgstr "Invite" #: ../src/purple/purple-groupchat.c:166 msgid "Private" -msgstr "" +msgstr "Private" #: ../src/purple/purple-groupchat.c:169 msgid "Log" -msgstr "" +msgstr "Log" #: ../src/purple/purple-groupchat.c:172 msgid "Description" -msgstr "" +msgstr "Description" #: ../src/purple/purple-im.c:86 #, c-format msgid "Conversation subject: %s" -msgstr "" +msgstr "Conversation subject: %s" #. Macro to reduce code repetition #. Translators: noun #: ../src/purple/purple-plugin-common.c:188 msgid "Message" -msgstr "" +msgstr "Message" #: ../src/purple/purple-plugin-common.c:421 msgid "Connecting" -msgstr "" +msgstr "Connecting" #: ../src/purple/purple-plugin-common.c:451 msgid "Password required" -msgstr "" +msgstr "Password required" #: ../src/purple/purple-plugin-common.c:611 msgid "user@company.com" -msgstr "" +msgstr "user@company.com" #: ../src/purple/purple-plugin-common.c:724 msgid "Phone number" -msgstr "" +msgstr "Phone number" #: ../src/purple/purple-plugin-common.c:728 #: ../src/purple/purple-plugin-common.c:729 msgid "Call a phone number" -msgstr "" +msgstr "Call a phone number" #: ../src/purple/purple-plugin-common.c:732 msgid "_Call" -msgstr "" +msgstr "_Call" #: ../src/purple/purple-plugin-common.c:733 #: ../src/purple/purple-plugin-common.c:781 ../src/purple/purple-search.c:240 msgid "_Cancel" -msgstr "" +msgstr "_Cancel" #: ../src/purple/purple-plugin-common.c:760 msgid "Meeting location" -msgstr "" +msgstr "Meeting location" #: ../src/purple/purple-plugin-common.c:762 msgid "Alternatively" -msgstr "" +msgstr "Alternatively" #: ../src/purple/purple-plugin-common.c:764 msgid "Organizer email" -msgstr "" +msgstr "Organizer email" #: ../src/purple/purple-plugin-common.c:766 msgid "Meeting ID" -msgstr "" +msgstr "Meeting ID" #: ../src/purple/purple-plugin-common.c:770 msgid "Join conference" -msgstr "" +msgstr "Join conference" #: ../src/purple/purple-plugin-common.c:771 msgid "Join scheduled conference" -msgstr "" +msgstr "Join scheduled conference" #: ../src/purple/purple-plugin-common.c:772 msgid "" @@ -1003,44 +1033,44 @@ "conf:sip:someone@company.com;gruu;opaque=app:conf:focus:id:abcdef1234\n" "or\n" "https://meet.company.com/someone/abcdef1234" -msgstr "" +msgstr "Enter meeting location string you received in the invitation.\n\nValid location will be something like\nmeet:sip:someone@company.com;gruu;opaque=app:conf:focus:id:abcdef1234\nconf:sip:someone@company.com;gruu;opaque=app:conf:focus:id:abcdef1234\nor\nhttps://meet.company.com/someone/abcdef1234" #: ../src/purple/purple-plugin-common.c:780 msgid "_Join" -msgstr "" +msgstr "_Join" #: ../src/purple/purple-plugin-common.c:797 #: ../src/purple/purple-plugin-common.c:811 msgid "Publishing of calendar information has been disabled" -msgstr "" +msgstr "Publishing of calendar information has been disabled" #: ../src/purple/purple-plugin-common.c:823 msgid "About SIPE plugin..." -msgstr "" +msgstr "About SIPE plugin..." #: ../src/purple/purple-plugin-common.c:826 msgid "Contact search..." -msgstr "" +msgstr "Contact search..." #: ../src/purple/purple-plugin-common.c:830 msgid "Call a phone number..." -msgstr "" +msgstr "Call a phone number..." #: ../src/purple/purple-plugin-common.c:833 msgid "Test call" -msgstr "" +msgstr "Test call" #: ../src/purple/purple-plugin-common.c:837 msgid "Join scheduled conference..." -msgstr "" +msgstr "Join scheduled conference..." #: ../src/purple/purple-plugin-common.c:840 msgid "Republish Calendar" -msgstr "" +msgstr "Republish Calendar" #: ../src/purple/purple-plugin-common.c:843 msgid "Reset status" -msgstr "" +msgstr "Reset status" #. * #. * When adding new string settings please make sure to keep these @@ -1048,53 +1078,53 @@ #. * #. * api/sipe-backend.h #. * purple-settings.c:setting_name[] -#. #: ../src/purple/purple-plugin-common.c:861 msgid "" "Server[:Port]\n" "(leave empty for auto-discovery)" -msgstr "" +msgstr "Server[:Port]\n(leave empty for auto-discovery)" #: ../src/purple/purple-plugin-common.c:864 msgid "Connection type" -msgstr "" +msgstr "Connection type" #: ../src/purple/purple-plugin-common.c:865 #: ../src/purple/purple-plugin-common.c:877 msgid "Auto" -msgstr "" +msgstr "Auto" #: ../src/purple/purple-plugin-common.c:866 msgid "SSL/TLS" -msgstr "" +msgstr "SSL/TLS" #: ../src/purple/purple-plugin-common.c:867 msgid "TCP" -msgstr "" +msgstr "TCP" -#. option = purple_account_option_bool_new(_("Publish status (note: everyone may watch you)"), "doservice", TRUE); -#. sipe_prpl_info.protocol_options = g_list_append(sipe_prpl_info.protocol_options, option); +#. option = purple_account_option_bool_new(_("Publish status (note: everyone +#. may watch you)"), "doservice", TRUE); +#. sipe_prpl_info.protocol_options = +#. g_list_append(sipe_prpl_info.protocol_options, option); #: ../src/purple/purple-plugin-common.c:873 msgid "User Agent" -msgstr "" +msgstr "User Agent" #: ../src/purple/purple-plugin-common.c:876 msgid "Authentication scheme" -msgstr "" +msgstr "Authentication scheme" #: ../src/purple/purple-plugin-common.c:878 msgid "NTLM" -msgstr "" +msgstr "NTLM" #: ../src/purple/purple-plugin-common.c:880 msgid "Kerberos" -msgstr "" +msgstr "Kerberos" #: ../src/purple/purple-plugin-common.c:882 msgid "TLS-DSK" -msgstr "" +msgstr "TLS-DSK" -#. #. * When the user selects Single Sign-On then SIPE will ignore the #. * settings for "login name" and "password". Instead it will use the #. * default credentials provided by the OS. @@ -1107,145 +1137,145 @@ #. * - Windows, host joined to domain, SIPE with SSPI: NTLM #. * - Windows, host joined to domain, SIPE with SSPI: Kerberos #. * - SIPE with libkrb5, valid TGT in cache (kinit): Kerberos -#. #: ../src/purple/purple-plugin-common.c:900 msgid "Use Single Sign-On" -msgstr "" +msgstr "Use Single Sign-On" #. * Example (Exchange): https://server.company.com/EWS/Exchange.asmx #. * Example (Domino) : https://[domino_server]/[mail_database_name].nsf -#. #: ../src/purple/purple-plugin-common.c:907 msgid "Don't publish my calendar information" -msgstr "" +msgstr "Don't publish my calendar information" #: ../src/purple/purple-plugin-common.c:910 msgid "" "Email services URL\n" "(leave empty for auto-discovery)" -msgstr "" +msgstr "Email services URL\n(leave empty for auto-discovery)" #: ../src/purple/purple-plugin-common.c:913 msgid "" "Email address\n" "(if different from Username)" -msgstr "" +msgstr "Email address\n(if different from Username)" #. * Example (Exchange): DOMAIN\user or user@company.com #. * Example (Domino) : email_address -#. #: ../src/purple/purple-plugin-common.c:919 msgid "" "Email login\n" "(if different from Login)" -msgstr "" +msgstr "Email login\n(if different from Login)" #: ../src/purple/purple-plugin-common.c:922 msgid "" "Email password\n" "(if different from Password)" -msgstr "" +msgstr "Email password\n(if different from Password)" #. * Example (federated domain): company.com (i.e. ocschat@company.com) #. * Example (non-default user): user@company.com -#. #: ../src/purple/purple-plugin-common.c:929 msgid "" "Group Chat Proxy\n" " company.com or user@company.com\n" "(leave empty to determine from Username)" -msgstr "" +msgstr "Group Chat Proxy\n company.com or user@company.com\n(leave empty to determine from Username)" #: ../src/purple/purple-plugin-common.c:933 +msgid "Remote desktop client" +msgstr "Remote desktop client" + +#: ../src/purple/purple-plugin-common.c:938 msgid "Media encryption" -msgstr "" +msgstr "Media encryption" -#: ../src/purple/purple-plugin-common.c:934 +#: ../src/purple/purple-plugin-common.c:939 msgid "Obey server policy" -msgstr "" +msgstr "Obey server policy" -#: ../src/purple/purple-plugin-common.c:935 +#: ../src/purple/purple-plugin-common.c:940 msgid "Always" -msgstr "" +msgstr "Always" -#: ../src/purple/purple-plugin-common.c:936 +#: ../src/purple/purple-plugin-common.c:941 msgid "Optional" -msgstr "" +msgstr "Optional" -#: ../src/purple/purple-plugin-common.c:937 +#: ../src/purple/purple-plugin-common.c:942 msgid "Disabled" -msgstr "" +msgstr "Disabled" -#: ../src/purple/purple-plugin-common.c:947 +#: ../src/purple/purple-plugin-common.c:952 msgid "" "Login\n" " user or DOMAIN\\user or\n" " user@company.com" -msgstr "" +msgstr "Login\n user or DOMAIN\\user or\n user@company.com" #: ../src/purple/purple-search.c:60 msgid "User name" -msgstr "" +msgstr "User name" #: ../src/purple/purple-search.c:63 msgid "Name" -msgstr "" +msgstr "Name" #: ../src/purple/purple-search.c:72 ../src/purple/purple-search.c:225 msgid "Email" -msgstr "" +msgstr "Email" #: ../src/purple/purple-search.c:221 msgid "First name" -msgstr "" +msgstr "First name" #: ../src/purple/purple-search.c:223 msgid "Last name" -msgstr "" +msgstr "Last name" #: ../src/purple/purple-search.c:227 msgid "SIP ID" -msgstr "" +msgstr "SIP ID" #: ../src/purple/purple-search.c:235 msgid "Search" -msgstr "" +msgstr "Search" #: ../src/purple/purple-search.c:236 msgid "Search for a contact" -msgstr "" +msgstr "Search for a contact" #: ../src/purple/purple-search.c:237 msgid "" "Enter the information for the person you wish to find. Empty fields will be " "ignored." -msgstr "" +msgstr "Enter the information for the person you wish to find. Empty fields will be ignored." #: ../src/purple/purple-search.c:239 msgid "_Search" -msgstr "" +msgstr "_Search" -#: ../src/purple/purple-transport.c:132 +#: ../src/purple/purple-transport.c:135 msgid "Read error" -msgstr "" +msgstr "Read error" -#: ../src/purple/purple-transport.c:136 -#: ../src/telepathy/telepathy-transport.c:96 +#: ../src/purple/purple-transport.c:139 +#: ../src/telepathy/telepathy-transport.c:95 msgid "Server has disconnected" -msgstr "" +msgstr "Server has disconnected" -#: ../src/purple/purple-transport.c:198 +#: ../src/purple/purple-transport.c:201 msgid "Could not connect" -msgstr "" +msgstr "Could not connect" -#: ../src/purple/purple-transport.c:268 +#: ../src/purple/purple-transport.c:271 msgid "Could not create SSL context" -msgstr "" +msgstr "Could not create SSL context" -#: ../src/purple/purple-transport.c:290 +#: ../src/purple/purple-transport.c:293 msgid "Could not create socket" -msgstr "" +msgstr "Could not create socket" -#: ../src/purple/purple-transport.c:381 +#: ../src/purple/purple-transport.c:417 msgid "Write error" -msgstr "" +msgstr "Write error" diff -Nru pidgin-sipe-1.21.1/po/pl.po pidgin-sipe-1.22.1/po/pl.po --- pidgin-sipe-1.21.1/po/pl.po 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/po/pl.po 2017-06-11 15:41:22.000000000 +0000 @@ -5,15 +5,15 @@ # # # Translators: -# Piotr Drąg , 2011-2013,2015-2016 +# Piotr Drąg , 2011-2013,2015-2017 # Stefan Becker , 2011 msgid "" msgstr "" "Project-Id-Version: pidgin sipe\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/sipe/bugs/\n" "POT-Creation-Date: 2010-11-30 23:36+0200\n" -"PO-Revision-Date: 2016-05-28 15:08+0000\n" -"Last-Translator: Stefan Becker \n" +"PO-Revision-Date: 2017-01-23 19:42+0000\n" +"Last-Translator: Piotr Drąg \n" "Language-Team: Polish (http://www.transifex.com/stefanb/pidgin-sipe/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,94 +21,119 @@ "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" -#: ../src/core/sip-transport.c:235 +#: ../src/core/sip-transport.c:240 msgid "Failed to authenticate to server" msgstr "Uwierzytelnienie do serwera się nie powiodło" -#: ../src/core/sip-transport.c:293 +#: ../src/core/sip-transport.c:298 #, c-format msgid "Can't request certificate from %s" msgstr "Nie można zażądać certyfikatu od %s" -#: ../src/core/sip-transport.c:303 +#: ../src/core/sip-transport.c:308 msgid "No URI for certificate provisioning service provided" msgstr "Nie podano adresu URI dla usługi zabezpieczania certyfikatów" -#: ../src/core/sip-transport.c:1281 +#: ../src/core/sip-transport.c:1285 msgid "Authentication failed" msgstr "Uwierzytelnienie się nie powiodło" -#: ../src/core/sip-transport.c:1338 +#: ../src/core/sip-transport.c:1342 msgid "Incompatible authentication scheme chosen" msgstr "Wybrano niezgodny schemat uwierzytelnienia" -#: ../src/core/sip-transport.c:1355 ../src/core/sipe-notify.c:1149 +#: ../src/core/sip-transport.c:1359 ../src/core/sipe-notify.c:1149 #, c-format msgid "You have been rejected by the server: %s" msgstr "Użytkownik został odrzucony przez serwer: %s" -#: ../src/core/sip-transport.c:1356 ../src/core/sip-transport.c:1372 -#: ../src/core/sip-transport.c:1396 ../src/core/sip-transport.c:1420 +#: ../src/core/sip-transport.c:1360 ../src/core/sip-transport.c:1376 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 #: ../src/core/sipe-conf.c:265 ../src/core/sipe-notify.c:1149 msgid "no reason given" msgstr "nie podano przyczyny" -#: ../src/core/sip-transport.c:1371 +#: ../src/core/sip-transport.c:1375 #, c-format msgid "Not found: %s. Please contact your Administrator" -msgstr "Nie odnaleziono: %s. Proszę skontaktować się z administratorem" +msgstr "Nie odnaleziono: %s. Proszę skontaktować się z administratorem" -#: ../src/core/sip-transport.c:1373 +#: ../src/core/sip-transport.c:1377 msgid "SIP is either not enabled for the destination URI or it does not exist" msgstr "SIP nie jest włączony dla docelowego adresu URI lub nie istnieje" -#: ../src/core/sip-transport.c:1396 ../src/core/sip-transport.c:1420 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 #, c-format msgid "Service unavailable: %s" msgstr "Usługa jest niedostępna: %s" -#: ../src/core/sip-transport.c:1766 +#: ../src/core/sip-transport.c:1775 msgid "Corrupted message received" msgstr "Odebrano uszkodzoną wiadomość" -#: ../src/core/sip-transport.c:1790 +#: ../src/core/sip-transport.c:1799 msgid "Invalid message signature received" msgstr "Odebrano nieprawidłowy podpis wiadomości" -#: ../src/core/sipe-buddy.c:540 ../src/core/sipe-buddy.c:2300 +#: ../src/core/sipe-appshare.c:458 +#, c-format +msgid "%s wants to start presenting" +msgstr "Użytkownik %s chce zacząć prezentację" + +#: ../src/core/sipe-appshare.c:462 ../src/core/sipe-conf.c:1086 +msgid "Accept" +msgstr "Odbierz" + +#: ../src/core/sipe-appshare.c:463 ../src/core/sipe-conf.c:1087 +msgid "Decline" +msgstr "Odmów" + +#: ../src/core/sipe-appshare.c:501 ../src/core/sipe-appshare.c:599 +msgid "Application sharing error" +msgstr "Błąd podczas udostępniania aplikacji" + +#: ../src/core/sipe-appshare.c:502 +msgid "Unknown remote desktop client configured." +msgstr "Skonfigurowano nieznanego zdalnego klienta." + +#: ../src/core/sipe-appshare.c:600 +msgid "Couldn't connect application sharing" +msgstr "Nie można połączyć udostępniania aplikacji" + +#: ../src/core/sipe-buddy.c:541 ../src/core/sipe-buddy.c:2301 msgid "Mobile" msgstr "Komórka" -#: ../src/core/sipe-buddy.c:828 +#: ../src/core/sipe-buddy.c:829 msgid "Status" msgstr "Stan" -#: ../src/core/sipe-buddy.c:831 +#: ../src/core/sipe-buddy.c:832 msgid "Calendar" msgstr "Kalendarz" -#: ../src/core/sipe-buddy.c:836 +#: ../src/core/sipe-buddy.c:837 msgid "Meeting in" msgstr "Spotkanie za" -#: ../src/core/sipe-buddy.c:840 +#: ../src/core/sipe-buddy.c:841 msgid "Meeting about" msgstr "Spotkanie w" -#: ../src/core/sipe-buddy.c:845 +#: ../src/core/sipe-buddy.c:846 msgid "Out of office note" msgstr "Notatka poza biurem" -#: ../src/core/sipe-buddy.c:845 +#: ../src/core/sipe-buddy.c:846 msgid "Note" msgstr "Notatka" -#: ../src/core/sipe-buddy.c:850 ../src/core/sipe-buddy.c:2345 +#: ../src/core/sipe-buddy.c:851 ../src/core/sipe-buddy.c:2346 #: ../src/purple/purple-buddy.c:633 msgid "Access level" msgstr "Poziom dostępu" -#: ../src/core/sipe-buddy.c:1073 +#: ../src/core/sipe-buddy.c:1074 #, c-format msgid "Found %d contact%s:" msgid_plural "Found %d contacts%s:" @@ -116,122 +141,122 @@ msgstr[1] "Odnaleziono %d kontakty%s:" msgstr[2] "Odnaleziono %d kontaktów%s:" -#: ../src/core/sipe-buddy.c:1075 +#: ../src/core/sipe-buddy.c:1076 msgid " (more matched your query)" msgstr " (więcej wyników zapytania)" -#: ../src/core/sipe-buddy.c:1121 ../src/core/sipe-buddy.c:1259 +#: ../src/core/sipe-buddy.c:1122 ../src/core/sipe-buddy.c:1260 #: ../src/core/sipe-ucs.c:314 msgid "No contacts found" msgstr "Nie odnaleziono kontaktów" -#: ../src/core/sipe-buddy.c:1134 ../src/core/sipe-buddy.c:1272 +#: ../src/core/sipe-buddy.c:1135 ../src/core/sipe-buddy.c:1273 #: ../src/core/sipe-ucs.c:278 msgid "Unable to display the search results" msgstr "Nie można wyświetlić wyników wyszukiwania" -#: ../src/core/sipe-buddy.c:1237 ../src/core/sipe-buddy.c:1249 +#: ../src/core/sipe-buddy.c:1238 ../src/core/sipe-buddy.c:1250 #: ../src/core/sipe-ucs.c:391 msgid "Contact search failed" msgstr "Wyszukanie kontaktu się nie powiodło" -#: ../src/core/sipe-buddy.c:1412 ../src/core/sipe-ucs.c:395 +#: ../src/core/sipe-buddy.c:1413 ../src/core/sipe-ucs.c:395 msgid "Invalid contact search query" msgstr "Nieprawidłowe zapytanie wyszukiwania kontaktu" -#: ../src/core/sipe-buddy.c:2237 +#: ../src/core/sipe-buddy.c:2238 #, c-format msgid "Make leader of '%s'" msgstr "Uczyń przywódcą „%s”" -#: ../src/core/sipe-buddy.c:2250 +#: ../src/core/sipe-buddy.c:2251 #, c-format msgid "Remove from '%s'" -msgstr "Usuń z „%s”" +msgstr "Usuń z „%s”" -#: ../src/core/sipe-buddy.c:2264 +#: ../src/core/sipe-buddy.c:2265 #, c-format msgid "Invite to '%s'" msgstr "Zaproś do „%s”" -#: ../src/core/sipe-buddy.c:2280 +#: ../src/core/sipe-buddy.c:2281 msgid "New chat" msgstr "Nowa rozmowa" -#: ../src/core/sipe-buddy.c:2293 +#: ../src/core/sipe-buddy.c:2294 msgid "Work" msgstr "Praca" -#: ../src/core/sipe-buddy.c:2308 +#: ../src/core/sipe-buddy.c:2309 msgid "Home" msgstr "Strona domowa" -#: ../src/core/sipe-buddy.c:2316 +#: ../src/core/sipe-buddy.c:2317 msgid "Other" msgstr "Inne" -#: ../src/core/sipe-buddy.c:2324 +#: ../src/core/sipe-buddy.c:2325 msgid "Custom1" msgstr "Własne1" -#: ../src/core/sipe-buddy.c:2334 +#: ../src/core/sipe-buddy.c:2335 msgid "Send email..." msgstr "Wyślij wiadomość e-mail…" -#: ../src/core/sipe-cal.c:907 +#: ../src/core/sipe-cal.c:906 msgid "Free" msgstr "Wolne" -#: ../src/core/sipe-cal.c:908 +#: ../src/core/sipe-cal.c:907 msgid "Tentative" msgstr "Wstępnie" #. SIPE_ACTIVITY_BUSY -#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:59 +#: ../src/core/sipe-cal.c:908 ../src/core/sipe-status.c:57 msgid "Busy" msgstr "Zajęty" #. SIPE_ACTIVITY_OOF -#: ../src/core/sipe-cal.c:910 ../src/core/sipe-status.c:70 +#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:68 msgid "Out of office" msgstr "Poza biurem" -#: ../src/core/sipe-cal.c:911 +#: ../src/core/sipe-cal.c:910 msgid "No data" msgstr "Brak danych" -#: ../src/core/sipe-cal.c:1019 ../src/core/sipe-cal.c:1046 +#: ../src/core/sipe-cal.c:1018 ../src/core/sipe-cal.c:1045 #, c-format msgid "Currently %s" msgstr "Obecnie %s" -#: ../src/core/sipe-cal.c:1025 +#: ../src/core/sipe-cal.c:1024 msgid "Outside of working hours for next 8 hours" msgstr "Poza godzinami pracy przez następne 8 godzin" -#: ../src/core/sipe-cal.c:1027 +#: ../src/core/sipe-cal.c:1026 #, c-format msgid "%s for next 8 hours" msgstr "%s przez następne 8 godzin" -#: ../src/core/sipe-cal.c:1036 +#: ../src/core/sipe-cal.c:1035 msgid "Not working" msgstr "Nie pracuje" -#: ../src/core/sipe-cal.c:1040 +#: ../src/core/sipe-cal.c:1039 #, c-format msgid "%s until %.2d:%.2d" msgstr "%s od %.2d∶%.2d" -#: ../src/core/sipe-cal.c:1048 +#: ../src/core/sipe-cal.c:1047 #, c-format msgid "%s. Outside of working hours at %.2d:%.2d" -msgstr "%s. Poza godzinami pracy o %.2d∶%.2d" +msgstr "%s. Poza godzinami pracy o %.2d∶%.2d" -#: ../src/core/sipe-cal.c:1053 +#: ../src/core/sipe-cal.c:1052 #, c-format msgid "%s. %s at %.2d:%.2d" -msgstr "%s. %s o %.2d∶%.2d" +msgstr "%s. %s o %.2d∶%.2d" #: ../src/core/sipe-certificate.c:233 ../src/core/sipe-certificate.c:277 #, c-format @@ -244,7 +269,7 @@ msgstr "Żądanie zgłoszenia WWW do %s się nie powiodło" #. Generate next ID -#: ../src/core/sipe-chat.c:240 +#: ../src/core/sipe-chat.c:246 #, c-format msgid "Chat #%d" msgstr "Rozmowa #%d" @@ -269,125 +294,117 @@ #: ../src/core/sipe-conf.c:499 msgid "Incomplete conference information provided" -msgstr "Podano niepełne informacje o konferencji" +msgstr "Podano niepełne informacje o konferencji" -#: ../src/core/sipe-conf.c:1041 +#: ../src/core/sipe-conf.c:1106 msgid "" "\n" "\n" "As this client was not compiled with voice call support, if you accept, you will be able to contact the other participants only via IM session." -msgstr "\n\nPonieważ klient nie został skompilowany z obsługą rozmów głosowych, po zaakceptowaniu będzie można kontaktować się z innymi uczestnikami tylko za pomocą komunikatora." +msgstr "\n\nPonieważ klient nie został skompilowany z obsługą rozmów głosowych, po odebraniu będzie można kontaktować się z innymi uczestnikami tylko za pomocą komunikatora." -#: ../src/core/sipe-conf.c:1049 +#: ../src/core/sipe-conf.c:1111 #, c-format -msgid "%s wants to invite you to the conference call%s" -msgstr "Użytkownik %s chce zaprosić użytkownika do pokoju konferencji%s" - -#: ../src/core/sipe-conf.c:1063 -msgid "Accept" -msgstr "Zaakceptuj" +msgid "wants to invite you to a conference call%s" +msgstr "chce zaprosić użytkownika do pokoju konferencji%s" -#: ../src/core/sipe-conf.c:1064 -msgid "Decline" -msgstr "Odmów" - -#: ../src/core/sipe-conf.c:1345 +#: ../src/core/sipe-conf.c:1459 msgid "" "This conference is no longer locked. Additional participants can now join." msgstr "Ta konferencja nie jest już zablokowana. Dodatkowi uczestnicy mogą teraz dołączyć." -#: ../src/core/sipe-conf.c:1349 +#: ../src/core/sipe-conf.c:1463 msgid "" "This conference is locked. Nobody else can join the conference while it is " "locked." msgstr "Ta konferencja jest zablokowana. Nikt więcej nie może teraz dołączyć." -#: ../src/core/sipe-conf.c:1382 +#: ../src/core/sipe-conf.c:1496 msgid "You have been disconnected from this conference." -msgstr "Rozłączono z tej konferencji." +msgstr "Rozłączono z tej konferencji." -#: ../src/core/sipe-conf.c:1542 +#: ../src/core/sipe-conf.c:1656 msgid "Dial-in info" -msgstr "Informacje o wdzwanianiu" +msgstr "Informacje o wdzwanianiu" -#: ../src/core/sipe-conf.c:1543 +#: ../src/core/sipe-conf.c:1657 msgid "Number" msgstr "Numer" -#: ../src/core/sipe-conf.c:1545 +#: ../src/core/sipe-conf.c:1659 msgid "Conference ID" msgstr "Identyfikator konferencji" -#: ../src/core/sipe-conf.c:1547 +#: ../src/core/sipe-conf.c:1661 msgid "Meeting link" msgstr "Odnośnik do spotkania" -#: ../src/core/sipe-conf.c:1549 +#: ../src/core/sipe-conf.c:1663 msgid "Organizer" msgstr "Organizator" -#: ../src/core/sipe-conf.c:1551 +#: ../src/core/sipe-conf.c:1665 msgid "Alternative dial-in numbers" msgstr "Alternatywne numery wdzwaniania" #. The next 13 texts make up the SIPE about note text #. About note, part 1/13: introduction -#: ../src/core/sipe-core.c:220 +#: ../src/core/sipe-core.c:221 msgid "" "A third-party plugin implementing extended version of SIP/SIMPLE used by " "various products" msgstr "Wtyczka firmy trzeciej implementująca rozszerzoną wersję protokołu SIP/SIMPLE używaną przez różne produkty" #. About note, part 2/13: home page URL (label) -#: ../src/core/sipe-core.c:222 +#: ../src/core/sipe-core.c:223 msgid "Home Page" msgstr "Strona domowa" #. About note, part 3/13: support forum URL (label) -#: ../src/core/sipe-core.c:224 +#: ../src/core/sipe-core.c:225 msgid "Support" msgstr "Wsparcie" #. About note, part 4/13: support forum name (hyperlink text) -#: ../src/core/sipe-core.c:226 +#: ../src/core/sipe-core.c:227 msgid "Help Forum" msgstr "Forum pomocy" #. About note, part 5/13: bug tracker URL (label) -#: ../src/core/sipe-core.c:228 +#: ../src/core/sipe-core.c:229 msgid "Report Problems" msgstr "Zgłaszanie problemów" #. About note, part 6/13: bug tracker URL (hyperlink text) -#: ../src/core/sipe-core.c:230 +#: ../src/core/sipe-core.c:231 msgid "Bug Tracker" msgstr "System śledzenia błędów" #. About note, part 7/13: translation service URL (label) -#: ../src/core/sipe-core.c:232 +#: ../src/core/sipe-core.c:233 msgid "Translations" msgstr "Tłumaczenia" #. About note, part 8/13: license type (label) -#: ../src/core/sipe-core.c:234 +#: ../src/core/sipe-core.c:235 msgid "License" msgstr "Licencja" #. About note, part 9/13: (REMOVED) #. About note, part 10/13: translation request, text before Transifex.com URL #. append a space if text is not empty -#: ../src/core/sipe-core.c:238 +#: ../src/core/sipe-core.c:239 msgid "Please help us to translate SIPE to your native language here at " -msgstr "Prosimy o pomoc w przetłumaczeniu wtyczki SIPE na inne języki za pomocą usługi " +msgstr "Prosimy o pomoc w przetłumaczeniu wtyczki SIPE na inne języki pod adresem " #. About note, part 11/13: translation request, text after Transifex.com URL #. start with a space if text is not empty -#: ../src/core/sipe-core.c:241 +#: ../src/core/sipe-core.c:242 msgid " using convenient web interface" -msgstr " używając wygodnego interfejsu WWW" +msgstr " za pomocą wygodnego interfejsu WWW" #. About note, part 12/13: author list (header) -#: ../src/core/sipe-core.c:243 +#: ../src/core/sipe-core.c:244 msgid "Authors" msgstr "Autorzy" @@ -395,38 +412,38 @@ #. PLEASE NOTE: do *NOT* simply translate the english original #. but write something similar to the following sentence: #. "Localization for (): " -#: ../src/core/sipe-core.c:248 +#: ../src/core/sipe-core.c:249 msgid "Original texts in English (en): SIPE developers" msgstr "Tłumaczenie na język polski (pl): Piotr Drąg" -#: ../src/core/sipe-core.c:269 +#: ../src/core/sipe-core.c:273 msgid "SIP Exchange user name contains invalid characters" msgstr "Nazwa użytkownika SIP Exchange zawiera nieprawidłowe znaki" -#: ../src/core/sipe-core.c:277 ../src/purple/purple-buddy.c:485 +#: ../src/core/sipe-core.c:281 ../src/purple/purple-buddy.c:485 #: ../src/telepathy/telepathy-protocol.c:89 #: ../src/telepathy/telepathy-protocol.c:191 #, c-format msgid "" "User name should be a valid SIP URI\n" "Example: user@company.com" -msgstr "Nazwa użytkownika powinna być prawidłowym adresem URI protokołu SIP\nPrzykład: użytkownik@firma.pl" +msgstr "Nazwa użytkownika powinna być prawidłowym adresem URI protokołu SIP\nPrzykład: użytkownik@example.com" -#: ../src/core/sipe-core.c:284 +#: ../src/core/sipe-core.c:288 msgid "Password is required when Single Sign-On is not enabled" msgstr "Wymagane jest hasło, kiedy logowanie pojedyncze nie jest włączone" -#: ../src/core/sipe-core.c:294 +#: ../src/core/sipe-core.c:298 msgid "" "Email address should be valid if provided\n" "Example: user@company.com" -msgstr "Jeśli podano adres e-mail, powinien on być prawidłowy\nPrzykład: użytkownik@firma.pl" +msgstr "Jeśli podano adres e-mail, powinien on być prawidłowy\nPrzykład: użytkownik@example.com" -#: ../src/core/sipe-core.c:303 +#: ../src/core/sipe-core.c:307 msgid "SIP Exchange user name contains whitespace" msgstr "Nazwa użytkownika SIP Exchange zawiera spację" -#: ../src/core/sipe-core.c:317 +#: ../src/core/sipe-core.c:321 msgid "" "Email services URL should be valid if provided\n" "Example: https://exchange.corp.com/EWS/Exchange.asmx\n" @@ -443,27 +460,27 @@ #: ../src/core/sipe-ft-tftp.c:393 ../src/core/sipe-ft-tftp.c:422 #: ../src/core/sipe-ft-tftp.c:481 msgid "Socket read failed" -msgstr "Odczyt z gniazda się nie powiódł" +msgstr "Odczyt z gniazda się nie powiódł" #: ../src/core/sipe-ft.c:412 msgid "Received encryption key has wrong size." -msgstr "Pobrany klucz szyfrowania posiada błędny rozmiar." +msgstr "Pobrany klucz szyfrowania ma błędny rozmiar." #: ../src/core/sipe-ft.c:427 msgid "Received hash key has wrong size." -msgstr "Pobrany klucz mieszania posiada błędny rozmiar." +msgstr "Pobrany klucz mieszania ma błędny rozmiar." #: ../src/core/sipe-ft.c:447 msgid "Could not create listen socket" msgstr "Nie można utworzyć gniazda nasłuchiwania" -#: ../src/core/sipe-ft-lync.c:757 ../src/core/sipe-media.c:1195 -#: ../src/core/sipe-media.c:1206 ../src/core/sipe-media.c:1284 -#: ../src/core/sipe-media.c:1740 +#: ../src/core/sipe-ft-lync.c:762 ../src/core/sipe-media.c:1328 +#: ../src/core/sipe-media.c:1339 ../src/core/sipe-media.c:1417 +#: ../src/core/sipe-media.c:1923 msgid "Error occurred" msgstr "Wystąpił błąd" -#: ../src/core/sipe-ft-lync.c:758 +#: ../src/core/sipe-ft-lync.c:763 msgid "Error creating data stream" msgstr "Błąd podczas tworzenia strumienia danych" @@ -498,7 +515,7 @@ msgstr "Brak pamięci" #: ../src/core/sipe-group.c:168 ../src/core/sipe-notify.c:1163 -#: ../src/core/sipe-notify.c:1190 ../src/core/sipe-notify.c:1294 +#: ../src/core/sipe-notify.c:1197 ../src/core/sipe-notify.c:1301 #: ../src/purple/purple-search.c:128 msgid "Other Contacts" msgstr "Inne kontakty" @@ -536,84 +553,84 @@ msgid "Failed to invite %s" msgstr "Zaproszenie %s się nie powiodło" -#: ../src/core/sipe-incoming.c:741 +#: ../src/core/sipe-incoming.c:754 #, c-format msgid "Received a message with unrecognized contents from %s" -msgstr "Odebrano wiadomość z nierozpoznaną zawartością od %s" +msgstr "Odebrano wiadomość z nierozpoznaną zawartością od %s" -#: ../src/core/sipe-media.c:835 ../src/core/sipe-media.c:1347 -#: ../src/core/sipe-media.c:1357 ../src/core/sipe-media.c:1721 -#: ../src/core/sipe-media.c:1741 +#: ../src/core/sipe-media.c:869 ../src/core/sipe-media.c:1483 +#: ../src/core/sipe-media.c:1493 ../src/core/sipe-media.c:1904 +#: ../src/core/sipe-media.c:1924 msgid "Unable to establish a call" msgstr "Nie można nawiązać rozmowy" -#: ../src/core/sipe-media.c:836 ../src/core/sipe-media.c:1722 +#: ../src/core/sipe-media.c:870 ../src/core/sipe-media.c:1905 msgid "Encryption settings of peer are incompatible with ours." -msgstr "Ustawienia szyfrowania partnera są niezgodne z lokalnymi." +msgstr "Ustawienia szyfrowania partnera są niezgodne z lokalnymi." -#: ../src/core/sipe-media.c:929 +#: ../src/core/sipe-media.c:963 #, c-format msgid "User %s rejected call" msgstr "Użytkownik %s odrzucił rozmowę" -#: ../src/core/sipe-media.c:930 +#: ../src/core/sipe-media.c:964 msgid "Call rejected" msgstr "Odrzucono rozmowę" -#: ../src/core/sipe-media.c:1196 ../src/core/sipe-media.c:1285 +#: ../src/core/sipe-media.c:1329 ../src/core/sipe-media.c:1418 msgid "Error creating audio stream" msgstr "Błąd podczas tworzenia strumienia dźwięku" -#: ../src/core/sipe-media.c:1207 +#: ../src/core/sipe-media.c:1340 msgid "Error creating video stream" msgstr "Błąd podczas tworzenia strumienia obrazu" -#: ../src/core/sipe-media.c:1251 ../src/purple/purple-chat.c:314 +#: ../src/core/sipe-media.c:1384 ../src/purple/purple-chat.c:329 msgid "Join conference call" msgstr "Dołącz do konferencji" -#: ../src/core/sipe-media.c:1252 +#: ../src/core/sipe-media.c:1385 msgid "Conference calls are not supported on this server." msgstr "Ten serwer nie obsługuje konferencji" -#: ../src/core/sipe-media.c:1348 +#: ../src/core/sipe-media.c:1484 msgid "Invalid phone number" msgstr "Nieprawidłowy numer telefonu" -#: ../src/core/sipe-media.c:1358 +#: ../src/core/sipe-media.c:1494 msgid "Audio Test Service is not available." msgstr "Usługa testowania dźwięku jest niedostępna." -#: ../src/core/sipe-media.c:1690 +#: ../src/core/sipe-media.c:1873 msgid "User unavailable" msgstr "Użytkownik jest niedostępny" -#: ../src/core/sipe-media.c:1693 +#: ../src/core/sipe-media.c:1876 #, c-format msgid "%s does not want to be disturbed" msgstr "Użytkownik %s nie chce, aby mu przeszkadzać" -#: ../src/core/sipe-media.c:1695 +#: ../src/core/sipe-media.c:1878 #, c-format msgid "User %s is not available" msgstr "Użytkownik %s jest niedostępny" -#: ../src/core/sipe-media.c:1704 +#: ../src/core/sipe-media.c:1887 msgid "Unsupported media type" msgstr "Nieobsługiwany typ multimediów" -#: ../src/core/sipe-media.c:2062 +#: ../src/core/sipe-media.c:2246 msgid "Media error" msgstr "Błąd multimediów" -#: ../src/core/sipe-media.c:2063 +#: ../src/core/sipe-media.c:2247 msgid "Error while reading from stream" msgstr "Błąd podczas odczytywania ze strumienia" #. reason = g_strdup(_("User logged out")); // [MS-OCER] #: ../src/core/sipe-notify.c:1141 msgid "you are already signed in at another location" -msgstr "zalogowano się z innego położenia" +msgstr "zalogowano się z innego położenia" #: ../src/core/sipe-notify.c:1143 msgid "user disabled" @@ -657,36 +674,36 @@ msgstr "Nieznane" #. Translators: remove (clear) previously assigned access level -#: ../src/core/sipe-ocs2007.c:2571 +#: ../src/core/sipe-ocs2007.c:2570 msgid "Unspecify" msgstr "Nieokreślony" -#: ../src/core/sipe-ocs2007.c:2590 +#: ../src/core/sipe-ocs2007.c:2589 msgid "People in my company" -msgstr "Osoby z firmy" +msgstr "Osoby z firmy" -#: ../src/core/sipe-ocs2007.c:2600 +#: ../src/core/sipe-ocs2007.c:2599 msgid "People in domains connected with my company" -msgstr "Osoby w domenach połączonych z firmą" +msgstr "Osoby w domenach połączonych z firmą" -#: ../src/core/sipe-ocs2007.c:2609 +#: ../src/core/sipe-ocs2007.c:2608 msgid "People in public domains" -msgstr "Osoby w domenach publicznych" +msgstr "Osoby w domenach publicznych" -#: ../src/core/sipe-ocs2007.c:2619 +#: ../src/core/sipe-ocs2007.c:2618 #, c-format msgid "People at %s" -msgstr "Osoby w %s" +msgstr "Osoby w %s" -#: ../src/core/sipe-ocs2007.c:2644 +#: ../src/core/sipe-ocs2007.c:2643 msgid "Add new domain..." msgstr "Dodaj nową domenę…" -#: ../src/core/sipe-ocs2007.c:2673 +#: ../src/core/sipe-ocs2007.c:2672 msgid "Online help..." msgstr "Pomoc online…" -#: ../src/core/sipe-ocs2007.c:2681 +#: ../src/core/sipe-ocs2007.c:2680 msgid "Access groups" msgstr "Grupy dostępu" @@ -698,48 +715,59 @@ #. SIPE_ACTIVITY_AVAILABLE #. SIPE_ACTIVITY_ONLINE #. SIPE_ACTIVITY_INACTIVE -#: ../src/core/sipe-status.c:58 +#: ../src/core/sipe-status.c:56 msgid "Inactive" msgstr "Nieaktywny" #. SIPE_ACTIVITY_BUSYIDLE -#: ../src/core/sipe-status.c:60 +#: ../src/core/sipe-status.c:58 msgid "Busy-Idle" msgstr "Bezczynny" #. SIPE_ACTIVITY_DND #. SIPE_ACTIVITY_BRB -#: ../src/core/sipe-status.c:62 +#: ../src/core/sipe-status.c:60 msgid "Be right back" msgstr "Zaraz wracam" #. SIPE_ACTIVITY_AWAY #. SIPE_ACTIVITY_LUNCH -#: ../src/core/sipe-status.c:64 +#: ../src/core/sipe-status.c:62 msgid "Out to lunch" msgstr "Na obiedzie" #. SIPE_ACTIVITY_INVISIBLE #. SIPE_ACTIVITY_OFFLINE #. SIPE_ACTIVITY_ON_PHONE -#: ../src/core/sipe-status.c:67 +#: ../src/core/sipe-status.c:65 msgid "In a call" msgstr "Przy telefonie" #. SIPE_ACTIVITY_IN_CONF -#: ../src/core/sipe-status.c:68 +#: ../src/core/sipe-status.c:66 msgid "In a conference" msgstr "Na konferencji" #. SIPE_ACTIVITY_IN_MEETING -#: ../src/core/sipe-status.c:69 +#: ../src/core/sipe-status.c:67 msgid "In a meeting" msgstr "Na spotkaniu" #. SIPE_ACTIVITY_URGENT_ONLY -#: ../src/core/sipe-status.c:71 +#: ../src/core/sipe-status.c:69 msgid "Urgent interruptions only" -msgstr "Przeszkadzać tylko w pilnych przypadkach" +msgstr "Przeszkadzać tylko w pilnych przypadkach" + +#: ../src/core/sipe-subscriptions.c:189 +msgid "Presence subscription failed!" +msgstr "Subskrypcja obecności się nie powiodła." + +#: ../src/core/sipe-subscriptions.c:190 +msgid "" +"One or more buddies will therefore permanently show as offline.\n" +"\n" +"Please check that there are no corrupted SIP URIs in your contacts list." +msgstr "Jeden lub więcej znajomych będzie wyświetlanych jako w trybie offline.\n\nProszę sprawdzić, czy na liście kontaktów nie ma uszkodzonych adresów URI protokołu SIP." #: ../src/core/sipe-ucs.c:674 msgid "UCS initialization failed!" @@ -750,14 +778,14 @@ "Couldn't find an Exchange server with the default Email settings. Therefore the contacts list will not work.\n" "\n" "You'll need to provide Email settings in the account setup." -msgstr "Nie można odnaleźć serwera Exchange za pomocą domyślnych ustawień poczty. Z tego powodu lista kontaktów nie będzie działała.\n\nNależy podać ustawienia poczty w ustawieniach konta." +msgstr "Nie można odnaleźć serwera Exchange za pomocą domyślnych ustawień poczty. z tego powodu lista kontaktów nie będzie działała.\n\nNależy podać ustawienia poczty w ustawieniach konta." #: ../src/core/sipe-ucs.c:677 msgid "" "Couldn't find an Exchange server with the Email settings provided in the account setup. Therefore the contacts list will not work.\n" "\n" "Please correct your Email settings." -msgstr "Nie można odnaleźć serwera Exchange za pomocą ustawień poczty podanych w ustawieniach konta. Z tego powodu lista kontaktów nie będzie działała.\n\nNależy poprawić ustawienia poczty." +msgstr "Nie można odnaleźć serwera Exchange za pomocą ustawień poczty podanych w ustawieniach konta. Z tego powodu lista kontaktów nie będzie działała.\n\nNależy poprawić ustawienia poczty." #. Service unavailable; Server Internal Error; Server Time-out #. Not acceptable all. @@ -893,17 +921,21 @@ msgid "Copy to" msgstr "Skopiuj do" -#: ../src/purple/purple-chat.c:295 +#: ../src/purple/purple-chat.c:310 msgid "Lock" msgstr "Zablokuj" -#: ../src/purple/purple-chat.c:300 +#: ../src/purple/purple-chat.c:315 msgid "Unlock" msgstr "Odblokuj" -#: ../src/purple/purple-chat.c:321 +#: ../src/purple/purple-chat.c:338 +msgid "Show presentation" +msgstr "Wyświetl prezentację" + +#: ../src/purple/purple-chat.c:345 msgid "Meeting entry info" -msgstr "Informacje o spotkaniu" +msgstr "Informacje o spotkaniu" #: ../src/purple/purple-groupchat.c:56 msgid "_URI:" @@ -950,7 +982,7 @@ #: ../src/purple/purple-plugin-common.c:611 msgid "user@company.com" -msgstr "użytkownik@firma.pl" +msgstr "użytkownik@example.com" #: ../src/purple/purple-plugin-common.c:724 msgid "Phone number" @@ -1003,7 +1035,7 @@ "conf:sip:someone@company.com;gruu;opaque=app:conf:focus:id:abcdef1234\n" "or\n" "https://meet.company.com/someone/abcdef1234" -msgstr "Proszę podać ciąg położenia spotkania, który otrzymano w zaproszeniu.\n\nPrawidłowe położenie wygląda podobnie do\nmeet:sip:ktoś@company.com;gruu;opaque=app:conf:focus:id:abcdef1234⏎ conf:sip:ktoś@company.com;gruu;opaque=app:conf:focus:id:abcdef1234⏎ or⏎ https://meet.company.com/ktoś/abcdef1234" +msgstr "Proszę podać ciąg położenia spotkania, który otrzymano w zaproszeniu.\n\nPrawidłowe położenie wygląda podobnie do\nmeet:sip:ktoś@example.com;gruu;opaque=app:conf:focus:id:abcdef1234\nconf:sip:ktoś@example.com;gruu;opaque=app:conf:focus:id:abcdef1234\nlub\nhttps://meet.example.com/ktoś/abcdef1234" #: ../src/purple/purple-plugin-common.c:780 msgid "_Join" @@ -1016,7 +1048,7 @@ #: ../src/purple/purple-plugin-common.c:823 msgid "About SIPE plugin..." -msgstr "O wtyczce SIPE…" +msgstr "O wtyczce SIPE…" #: ../src/purple/purple-plugin-common.c:826 msgid "Contact search..." @@ -1109,7 +1141,7 @@ #. * - SIPE with libkrb5, valid TGT in cache (kinit): Kerberos #: ../src/purple/purple-plugin-common.c:900 msgid "Use Single Sign-On" -msgstr "Użycie logowania pojedynczego" +msgstr "Logowanie pojedyncze" #. * Example (Exchange): https://server.company.com/EWS/Exchange.asmx #. * Example (Domino) : https://[domino_server]/[mail_database_name].nsf @@ -1150,34 +1182,38 @@ "Group Chat Proxy\n" " company.com or user@company.com\n" "(leave empty to determine from Username)" -msgstr "Pośrednik rozmów grupowych\n firma.pl lub użytkownik@firma.pl\n(należy pozostawić puste, aby ustalić z nazwy użytkownika)" +msgstr "Pośrednik rozmów grupowych\n example.com lub użytkownik@example.com\n(należy pozostawić puste, aby ustalić z nazwy użytkownika)" #: ../src/purple/purple-plugin-common.c:933 +msgid "Remote desktop client" +msgstr "Zdalny klient" + +#: ../src/purple/purple-plugin-common.c:938 msgid "Media encryption" msgstr "Szyfrowanie multimediów" -#: ../src/purple/purple-plugin-common.c:934 +#: ../src/purple/purple-plugin-common.c:939 msgid "Obey server policy" msgstr "Przestrzeganie polityki serwera" -#: ../src/purple/purple-plugin-common.c:935 +#: ../src/purple/purple-plugin-common.c:940 msgid "Always" msgstr "Zawsze" -#: ../src/purple/purple-plugin-common.c:936 +#: ../src/purple/purple-plugin-common.c:941 msgid "Optional" msgstr "Opcjonalnie" -#: ../src/purple/purple-plugin-common.c:937 +#: ../src/purple/purple-plugin-common.c:942 msgid "Disabled" msgstr "Wyłączone" -#: ../src/purple/purple-plugin-common.c:947 +#: ../src/purple/purple-plugin-common.c:952 msgid "" "Login\n" " user or DOMAIN\\user or\n" " user@company.com" -msgstr "Login\n użytkownik lub DOMENA\\użytkownik lub\n użytkownik@firma.pl" +msgstr "Login\n użytkownik lub DOMENA\\użytkownik lub\n użytkownik@example.com" #: ../src/purple/purple-search.c:60 msgid "User name" @@ -1215,33 +1251,33 @@ msgid "" "Enter the information for the person you wish to find. Empty fields will be " "ignored." -msgstr "Proszę podać informacje o wyszukiwanej osobie. Puste pola zostaną zignorowane." +msgstr "Proszę podać informacje o wyszukiwanej osobie. Puste pola zostaną zignorowane." #: ../src/purple/purple-search.c:239 msgid "_Search" msgstr "Wy_szukaj" -#: ../src/purple/purple-transport.c:132 +#: ../src/purple/purple-transport.c:135 msgid "Read error" msgstr "Błąd odczytu" -#: ../src/purple/purple-transport.c:136 -#: ../src/telepathy/telepathy-transport.c:96 +#: ../src/purple/purple-transport.c:139 +#: ../src/telepathy/telepathy-transport.c:95 msgid "Server has disconnected" msgstr "Serwer został rozłączony" -#: ../src/purple/purple-transport.c:198 +#: ../src/purple/purple-transport.c:201 msgid "Could not connect" msgstr "Nie można połączyć" -#: ../src/purple/purple-transport.c:268 +#: ../src/purple/purple-transport.c:271 msgid "Could not create SSL context" msgstr "Nie można utworzyć kontekstu SSL" -#: ../src/purple/purple-transport.c:290 +#: ../src/purple/purple-transport.c:293 msgid "Could not create socket" msgstr "Nie można utworzyć gniazda" -#: ../src/purple/purple-transport.c:381 +#: ../src/purple/purple-transport.c:417 msgid "Write error" msgstr "Błąd zapisu" diff -Nru pidgin-sipe-1.21.1/po/POTFILES.in pidgin-sipe-1.22.1/po/POTFILES.in --- pidgin-sipe-1.21.1/po/POTFILES.in 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/po/POTFILES.in 2017-06-11 15:41:22.000000000 +0000 @@ -3,6 +3,7 @@ src/adium/ESPurpleSIPEAccount.h src/core/sip-transport.c +src/core/sipe-appshare.c src/core/sipe-buddy.c src/core/sipe-cal.c src/core/sipe-certificate.c @@ -21,6 +22,7 @@ src/core/sipe-notify.c src/core/sipe-ocs2007.c src/core/sipe-status.c +src/core/sipe-subscriptions.c src/core/sipe-ucs.c src/core/sipe-user.c src/purple/purple-buddy.c diff -Nru pidgin-sipe-1.21.1/po/pt_BR.po pidgin-sipe-1.22.1/po/pt_BR.po --- pidgin-sipe-1.21.1/po/pt_BR.po 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/po/pt_BR.po 2017-06-11 15:41:22.000000000 +0000 @@ -6,14 +6,14 @@ # # Translators: # Anibal Avelar , 2011, 2012 -# raul.liota , 2013 +# Raul Liota da Rosa , 2013 # Stefan Becker , 2011 msgid "" msgstr "" "Project-Id-Version: pidgin sipe\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/sipe/bugs/\n" "POT-Creation-Date: 2010-11-30 23:36+0200\n" -"PO-Revision-Date: 2016-05-28 15:08+0000\n" +"PO-Revision-Date: 2017-01-23 17:47+0000\n" "Last-Translator: Stefan Becker \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/stefanb/pidgin-sipe/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -22,213 +22,238 @@ "Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: ../src/core/sip-transport.c:235 +#: ../src/core/sip-transport.c:240 msgid "Failed to authenticate to server" msgstr "A autenticação com o servidor falhou" -#: ../src/core/sip-transport.c:293 +#: ../src/core/sip-transport.c:298 #, c-format msgid "Can't request certificate from %s" msgstr "Não é possível solicitar o certificado de %s" -#: ../src/core/sip-transport.c:303 +#: ../src/core/sip-transport.c:308 msgid "No URI for certificate provisioning service provided" msgstr "Não URI para o serviço de provisionamento certificado previsto" -#: ../src/core/sip-transport.c:1281 +#: ../src/core/sip-transport.c:1285 msgid "Authentication failed" msgstr "Falha de autenticação" -#: ../src/core/sip-transport.c:1338 +#: ../src/core/sip-transport.c:1342 msgid "Incompatible authentication scheme chosen" msgstr "Um esquema de autenticação incompatível foi escolhido" -#: ../src/core/sip-transport.c:1355 ../src/core/sipe-notify.c:1149 +#: ../src/core/sip-transport.c:1359 ../src/core/sipe-notify.c:1149 #, c-format msgid "You have been rejected by the server: %s" msgstr "Você foi rejeitado pelo servidor: %s" -#: ../src/core/sip-transport.c:1356 ../src/core/sip-transport.c:1372 -#: ../src/core/sip-transport.c:1396 ../src/core/sip-transport.c:1420 +#: ../src/core/sip-transport.c:1360 ../src/core/sip-transport.c:1376 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 #: ../src/core/sipe-conf.c:265 ../src/core/sipe-notify.c:1149 msgid "no reason given" msgstr "nenhum motivo especificado" -#: ../src/core/sip-transport.c:1371 +#: ../src/core/sip-transport.c:1375 #, c-format msgid "Not found: %s. Please contact your Administrator" msgstr "Não encontrado: %s. Por favor, entre em contato com seu Administrador de Rede." -#: ../src/core/sip-transport.c:1373 +#: ../src/core/sip-transport.c:1377 msgid "SIP is either not enabled for the destination URI or it does not exist" msgstr "SIP não está habilitado para a URI de destino ou a mesma não existe" -#: ../src/core/sip-transport.c:1396 ../src/core/sip-transport.c:1420 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 #, c-format msgid "Service unavailable: %s" msgstr "Serviço indisponível: %s" -#: ../src/core/sip-transport.c:1766 +#: ../src/core/sip-transport.c:1775 msgid "Corrupted message received" msgstr "" -#: ../src/core/sip-transport.c:1790 +#: ../src/core/sip-transport.c:1799 msgid "Invalid message signature received" msgstr "Assinatura da mensagem inválida recebida" -#: ../src/core/sipe-buddy.c:540 ../src/core/sipe-buddy.c:2300 +#: ../src/core/sipe-appshare.c:458 +#, c-format +msgid "%s wants to start presenting" +msgstr "" + +#: ../src/core/sipe-appshare.c:462 ../src/core/sipe-conf.c:1086 +msgid "Accept" +msgstr "Aceitar" + +#: ../src/core/sipe-appshare.c:463 ../src/core/sipe-conf.c:1087 +msgid "Decline" +msgstr "Declínio" + +#: ../src/core/sipe-appshare.c:501 ../src/core/sipe-appshare.c:599 +msgid "Application sharing error" +msgstr "" + +#: ../src/core/sipe-appshare.c:502 +msgid "Unknown remote desktop client configured." +msgstr "" + +#: ../src/core/sipe-appshare.c:600 +msgid "Couldn't connect application sharing" +msgstr "" + +#: ../src/core/sipe-buddy.c:541 ../src/core/sipe-buddy.c:2301 msgid "Mobile" msgstr "Móvel" -#: ../src/core/sipe-buddy.c:828 +#: ../src/core/sipe-buddy.c:829 msgid "Status" msgstr "Status" -#: ../src/core/sipe-buddy.c:831 +#: ../src/core/sipe-buddy.c:832 msgid "Calendar" msgstr "Calendário" -#: ../src/core/sipe-buddy.c:836 +#: ../src/core/sipe-buddy.c:837 msgid "Meeting in" msgstr "Reunião em" -#: ../src/core/sipe-buddy.c:840 +#: ../src/core/sipe-buddy.c:841 msgid "Meeting about" msgstr "Reunião sobre" -#: ../src/core/sipe-buddy.c:845 +#: ../src/core/sipe-buddy.c:846 msgid "Out of office note" msgstr "Mensagem de ausência temporária" -#: ../src/core/sipe-buddy.c:845 +#: ../src/core/sipe-buddy.c:846 msgid "Note" msgstr "Nota" -#: ../src/core/sipe-buddy.c:850 ../src/core/sipe-buddy.c:2345 +#: ../src/core/sipe-buddy.c:851 ../src/core/sipe-buddy.c:2346 #: ../src/purple/purple-buddy.c:633 msgid "Access level" msgstr "O nível de acesso" -#: ../src/core/sipe-buddy.c:1073 +#: ../src/core/sipe-buddy.c:1074 #, c-format msgid "Found %d contact%s:" msgid_plural "Found %d contacts%s:" msgstr[0] "%d contato%s encontrado:" msgstr[1] "%d contatos%s encontrados:" -#: ../src/core/sipe-buddy.c:1075 +#: ../src/core/sipe-buddy.c:1076 msgid " (more matched your query)" msgstr " (mais correspondências à sua consulta)" -#: ../src/core/sipe-buddy.c:1121 ../src/core/sipe-buddy.c:1259 +#: ../src/core/sipe-buddy.c:1122 ../src/core/sipe-buddy.c:1260 #: ../src/core/sipe-ucs.c:314 msgid "No contacts found" msgstr "Nenhum contacto encontrado" -#: ../src/core/sipe-buddy.c:1134 ../src/core/sipe-buddy.c:1272 +#: ../src/core/sipe-buddy.c:1135 ../src/core/sipe-buddy.c:1273 #: ../src/core/sipe-ucs.c:278 msgid "Unable to display the search results" msgstr "Não foi possível exibir os resultados da busca" -#: ../src/core/sipe-buddy.c:1237 ../src/core/sipe-buddy.c:1249 +#: ../src/core/sipe-buddy.c:1238 ../src/core/sipe-buddy.c:1250 #: ../src/core/sipe-ucs.c:391 msgid "Contact search failed" msgstr "Busca contato falhou" -#: ../src/core/sipe-buddy.c:1412 ../src/core/sipe-ucs.c:395 +#: ../src/core/sipe-buddy.c:1413 ../src/core/sipe-ucs.c:395 msgid "Invalid contact search query" msgstr "Consulta inválida de pesquisa de contato" -#: ../src/core/sipe-buddy.c:2237 +#: ../src/core/sipe-buddy.c:2238 #, c-format msgid "Make leader of '%s'" msgstr "Tornar líder de '%s'" -#: ../src/core/sipe-buddy.c:2250 +#: ../src/core/sipe-buddy.c:2251 #, c-format msgid "Remove from '%s'" msgstr "Remover de '%s'" -#: ../src/core/sipe-buddy.c:2264 +#: ../src/core/sipe-buddy.c:2265 #, c-format msgid "Invite to '%s'" msgstr "Convidar a '%s'" -#: ../src/core/sipe-buddy.c:2280 +#: ../src/core/sipe-buddy.c:2281 msgid "New chat" msgstr "Nova conversa" -#: ../src/core/sipe-buddy.c:2293 +#: ../src/core/sipe-buddy.c:2294 msgid "Work" msgstr "Trabalhar" -#: ../src/core/sipe-buddy.c:2308 +#: ../src/core/sipe-buddy.c:2309 msgid "Home" msgstr "Início" -#: ../src/core/sipe-buddy.c:2316 +#: ../src/core/sipe-buddy.c:2317 msgid "Other" msgstr "Outro" -#: ../src/core/sipe-buddy.c:2324 +#: ../src/core/sipe-buddy.c:2325 msgid "Custom1" msgstr "Custom1" -#: ../src/core/sipe-buddy.c:2334 +#: ../src/core/sipe-buddy.c:2335 msgid "Send email..." msgstr "Enviar Email..." -#: ../src/core/sipe-cal.c:907 +#: ../src/core/sipe-cal.c:906 msgid "Free" msgstr "Gratuito" -#: ../src/core/sipe-cal.c:908 +#: ../src/core/sipe-cal.c:907 msgid "Tentative" msgstr "Tentativa" #. SIPE_ACTIVITY_BUSY -#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:59 +#: ../src/core/sipe-cal.c:908 ../src/core/sipe-status.c:57 msgid "Busy" msgstr "Ocupado" #. SIPE_ACTIVITY_OOF -#: ../src/core/sipe-cal.c:910 ../src/core/sipe-status.c:70 +#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:68 msgid "Out of office" msgstr "Fora do escritório" -#: ../src/core/sipe-cal.c:911 +#: ../src/core/sipe-cal.c:910 msgid "No data" msgstr "Sem data" -#: ../src/core/sipe-cal.c:1019 ../src/core/sipe-cal.c:1046 +#: ../src/core/sipe-cal.c:1018 ../src/core/sipe-cal.c:1045 #, c-format msgid "Currently %s" msgstr "Atualmente %s" -#: ../src/core/sipe-cal.c:1025 +#: ../src/core/sipe-cal.c:1024 msgid "Outside of working hours for next 8 hours" msgstr "Fora do horário de trabalho pelas próximas 8 horas" -#: ../src/core/sipe-cal.c:1027 +#: ../src/core/sipe-cal.c:1026 #, c-format msgid "%s for next 8 hours" msgstr "%s pelas próximas 8 horas" -#: ../src/core/sipe-cal.c:1036 +#: ../src/core/sipe-cal.c:1035 msgid "Not working" msgstr "Não funcionando" -#: ../src/core/sipe-cal.c:1040 +#: ../src/core/sipe-cal.c:1039 #, c-format msgid "%s until %.2d:%.2d" msgstr "%s até %.2d:%.2d" -#: ../src/core/sipe-cal.c:1048 +#: ../src/core/sipe-cal.c:1047 #, c-format msgid "%s. Outside of working hours at %.2d:%.2d" msgstr "%s. Fora do horário de trabalho às %.2d:%.2d" -#: ../src/core/sipe-cal.c:1053 +#: ../src/core/sipe-cal.c:1052 #, c-format msgid "%s. %s at %.2d:%.2d" msgstr "%s. %s às %.2d:%.2d" @@ -244,7 +269,7 @@ msgstr "Solicitação da Web bilhete para %s falhou" #. Generate next ID -#: ../src/core/sipe-chat.c:240 +#: ../src/core/sipe-chat.c:246 #, c-format msgid "Chat #%d" msgstr "Conversa #%d" @@ -271,123 +296,115 @@ msgid "Incomplete conference information provided" msgstr "" -#: ../src/core/sipe-conf.c:1041 +#: ../src/core/sipe-conf.c:1106 msgid "" "\n" "\n" "As this client was not compiled with voice call support, if you accept, you will be able to contact the other participants only via IM session." msgstr "\n\nComo esse cliente não foi compilado com suporte a chamadas de voz, se você aceitar, você poderá entrar em contato com os outros participantes da sessão somente via IM." -#: ../src/core/sipe-conf.c:1049 +#: ../src/core/sipe-conf.c:1111 #, c-format -msgid "%s wants to invite you to the conference call%s" -msgstr "%s quer convidá-lo para a chamada de conferência %s" - -#: ../src/core/sipe-conf.c:1063 -msgid "Accept" -msgstr "Aceitar" - -#: ../src/core/sipe-conf.c:1064 -msgid "Decline" -msgstr "Declínio" +msgid "wants to invite you to a conference call%s" +msgstr "" -#: ../src/core/sipe-conf.c:1345 +#: ../src/core/sipe-conf.c:1459 msgid "" "This conference is no longer locked. Additional participants can now join." msgstr "Esta conferência não está mais bloqueada. Participantes adicionais podem se conectar agora." -#: ../src/core/sipe-conf.c:1349 +#: ../src/core/sipe-conf.c:1463 msgid "" "This conference is locked. Nobody else can join the conference while it is " "locked." msgstr "Esta conferência está bloqueada. Nenhum novo participante pode se conectar enquanto a mesma se encontrar bloqueada." -#: ../src/core/sipe-conf.c:1382 +#: ../src/core/sipe-conf.c:1496 msgid "You have been disconnected from this conference." msgstr "Você foi desconectado desta conferência." -#: ../src/core/sipe-conf.c:1542 +#: ../src/core/sipe-conf.c:1656 msgid "Dial-in info" msgstr "" -#: ../src/core/sipe-conf.c:1543 +#: ../src/core/sipe-conf.c:1657 msgid "Number" msgstr "" -#: ../src/core/sipe-conf.c:1545 +#: ../src/core/sipe-conf.c:1659 msgid "Conference ID" msgstr "" -#: ../src/core/sipe-conf.c:1547 +#: ../src/core/sipe-conf.c:1661 msgid "Meeting link" msgstr "" -#: ../src/core/sipe-conf.c:1549 +#: ../src/core/sipe-conf.c:1663 msgid "Organizer" msgstr "" -#: ../src/core/sipe-conf.c:1551 +#: ../src/core/sipe-conf.c:1665 msgid "Alternative dial-in numbers" msgstr "" #. The next 13 texts make up the SIPE about note text #. About note, part 1/13: introduction -#: ../src/core/sipe-core.c:220 +#: ../src/core/sipe-core.c:221 msgid "" "A third-party plugin implementing extended version of SIP/SIMPLE used by " "various products" msgstr "Um plugin desenvolvido por terceiros que implementa uma versão do protocolo SIP/SIMPLE usado por vários produtos" #. About note, part 2/13: home page URL (label) -#: ../src/core/sipe-core.c:222 +#: ../src/core/sipe-core.c:223 msgid "Home Page" msgstr "Homepage" #. About note, part 3/13: support forum URL (label) -#: ../src/core/sipe-core.c:224 +#: ../src/core/sipe-core.c:225 msgid "Support" msgstr "Apoiar" #. About note, part 4/13: support forum name (hyperlink text) -#: ../src/core/sipe-core.c:226 +#: ../src/core/sipe-core.c:227 msgid "Help Forum" msgstr "Fórum de ajuda" #. About note, part 5/13: bug tracker URL (label) -#: ../src/core/sipe-core.c:228 +#: ../src/core/sipe-core.c:229 msgid "Report Problems" msgstr "Problemas de relatório" #. About note, part 6/13: bug tracker URL (hyperlink text) -#: ../src/core/sipe-core.c:230 +#: ../src/core/sipe-core.c:231 msgid "Bug Tracker" msgstr "completa bug" #. About note, part 7/13: translation service URL (label) -#: ../src/core/sipe-core.c:232 +#: ../src/core/sipe-core.c:233 msgid "Translations" msgstr "Traduções" #. About note, part 8/13: license type (label) -#: ../src/core/sipe-core.c:234 +#: ../src/core/sipe-core.c:235 msgid "License" msgstr "Licença" #. About note, part 9/13: (REMOVED) #. About note, part 10/13: translation request, text before Transifex.com URL #. append a space if text is not empty -#: ../src/core/sipe-core.c:238 +#: ../src/core/sipe-core.c:239 msgid "Please help us to translate SIPE to your native language here at " msgstr "Por favor nos ajude a traduzir o SIPE para seu idioma nativo em " #. About note, part 11/13: translation request, text after Transifex.com URL #. start with a space if text is not empty -#: ../src/core/sipe-core.c:241 +#: ../src/core/sipe-core.c:242 msgid " using convenient web interface" msgstr "usando uma conveniente interface web" #. About note, part 12/13: author list (header) -#: ../src/core/sipe-core.c:243 +#: ../src/core/sipe-core.c:244 msgid "Authors" msgstr "Autores" @@ -395,15 +412,15 @@ #. PLEASE NOTE: do *NOT* simply translate the english original #. but write something similar to the following sentence: #. "Localization for (): " -#: ../src/core/sipe-core.c:248 +#: ../src/core/sipe-core.c:249 msgid "Original texts in English (en): SIPE developers" msgstr "Textos originais em Português (pt_BR): ?" -#: ../src/core/sipe-core.c:269 +#: ../src/core/sipe-core.c:273 msgid "SIP Exchange user name contains invalid characters" msgstr "O nome de usuário SIP Exchange contém caracteres inválidos" -#: ../src/core/sipe-core.c:277 ../src/purple/purple-buddy.c:485 +#: ../src/core/sipe-core.c:281 ../src/purple/purple-buddy.c:485 #: ../src/telepathy/telepathy-protocol.c:89 #: ../src/telepathy/telepathy-protocol.c:191 #, c-format @@ -412,21 +429,21 @@ "Example: user@company.com" msgstr "O nome de usuário deve ser um SIP URI válido\nExemplo: usuario@dominio.com" -#: ../src/core/sipe-core.c:284 +#: ../src/core/sipe-core.c:288 msgid "Password is required when Single Sign-On is not enabled" msgstr "" -#: ../src/core/sipe-core.c:294 +#: ../src/core/sipe-core.c:298 msgid "" "Email address should be valid if provided\n" "Example: user@company.com" msgstr "O endereço de email deve ser válido, se fornecido\nExemplo: usuario@dominio.com" -#: ../src/core/sipe-core.c:303 +#: ../src/core/sipe-core.c:307 msgid "SIP Exchange user name contains whitespace" msgstr "O nome de usuario SIP Exchange contém espaços em branco" -#: ../src/core/sipe-core.c:317 +#: ../src/core/sipe-core.c:321 msgid "" "Email services URL should be valid if provided\n" "Example: https://exchange.corp.com/EWS/Exchange.asmx\n" @@ -457,13 +474,13 @@ msgid "Could not create listen socket" msgstr "Não foi possível criar soquete de escuta" -#: ../src/core/sipe-ft-lync.c:757 ../src/core/sipe-media.c:1195 -#: ../src/core/sipe-media.c:1206 ../src/core/sipe-media.c:1284 -#: ../src/core/sipe-media.c:1740 +#: ../src/core/sipe-ft-lync.c:762 ../src/core/sipe-media.c:1328 +#: ../src/core/sipe-media.c:1339 ../src/core/sipe-media.c:1417 +#: ../src/core/sipe-media.c:1923 msgid "Error occurred" msgstr "" -#: ../src/core/sipe-ft-lync.c:758 +#: ../src/core/sipe-ft-lync.c:763 msgid "Error creating data stream" msgstr "" @@ -498,7 +515,7 @@ msgstr "Fora do escritório" #: ../src/core/sipe-group.c:168 ../src/core/sipe-notify.c:1163 -#: ../src/core/sipe-notify.c:1190 ../src/core/sipe-notify.c:1294 +#: ../src/core/sipe-notify.c:1197 ../src/core/sipe-notify.c:1301 #: ../src/purple/purple-search.c:128 msgid "Other Contacts" msgstr "Outros contatos" @@ -536,77 +553,77 @@ msgid "Failed to invite %s" msgstr "O convite a %s falhou" -#: ../src/core/sipe-incoming.c:741 +#: ../src/core/sipe-incoming.c:754 #, c-format msgid "Received a message with unrecognized contents from %s" msgstr "Uma mensagem com conteúdo desconhecido for recebida de %s" -#: ../src/core/sipe-media.c:835 ../src/core/sipe-media.c:1347 -#: ../src/core/sipe-media.c:1357 ../src/core/sipe-media.c:1721 -#: ../src/core/sipe-media.c:1741 +#: ../src/core/sipe-media.c:869 ../src/core/sipe-media.c:1483 +#: ../src/core/sipe-media.c:1493 ../src/core/sipe-media.c:1904 +#: ../src/core/sipe-media.c:1924 msgid "Unable to establish a call" msgstr "Não é possível estabelecer uma chamada" -#: ../src/core/sipe-media.c:836 ../src/core/sipe-media.c:1722 +#: ../src/core/sipe-media.c:870 ../src/core/sipe-media.c:1905 msgid "Encryption settings of peer are incompatible with ours." msgstr "Configurações de criptografia de pares são incompatíveis com a nossa." -#: ../src/core/sipe-media.c:929 +#: ../src/core/sipe-media.c:963 #, c-format msgid "User %s rejected call" msgstr "Usuário %s chamada rejeitada" -#: ../src/core/sipe-media.c:930 +#: ../src/core/sipe-media.c:964 msgid "Call rejected" msgstr "Chamada rejeitada" -#: ../src/core/sipe-media.c:1196 ../src/core/sipe-media.c:1285 +#: ../src/core/sipe-media.c:1329 ../src/core/sipe-media.c:1418 msgid "Error creating audio stream" msgstr "Erro ao criar fluxo de áudio" -#: ../src/core/sipe-media.c:1207 +#: ../src/core/sipe-media.c:1340 msgid "Error creating video stream" msgstr "Erro ao criar fluxo de vídeo" -#: ../src/core/sipe-media.c:1251 ../src/purple/purple-chat.c:314 +#: ../src/core/sipe-media.c:1384 ../src/purple/purple-chat.c:329 msgid "Join conference call" msgstr "Junte-se a chamada de conferência" -#: ../src/core/sipe-media.c:1252 +#: ../src/core/sipe-media.c:1385 msgid "Conference calls are not supported on this server." msgstr "" -#: ../src/core/sipe-media.c:1348 +#: ../src/core/sipe-media.c:1484 msgid "Invalid phone number" msgstr "" -#: ../src/core/sipe-media.c:1358 +#: ../src/core/sipe-media.c:1494 msgid "Audio Test Service is not available." msgstr "" -#: ../src/core/sipe-media.c:1690 +#: ../src/core/sipe-media.c:1873 msgid "User unavailable" msgstr "Usuário não disponível" -#: ../src/core/sipe-media.c:1693 +#: ../src/core/sipe-media.c:1876 #, c-format msgid "%s does not want to be disturbed" msgstr "%s não quer ser incomodado" -#: ../src/core/sipe-media.c:1695 +#: ../src/core/sipe-media.c:1878 #, c-format msgid "User %s is not available" msgstr "Usuário %s não disponível" -#: ../src/core/sipe-media.c:1704 +#: ../src/core/sipe-media.c:1887 msgid "Unsupported media type" msgstr "" -#: ../src/core/sipe-media.c:2062 +#: ../src/core/sipe-media.c:2246 msgid "Media error" msgstr "" -#: ../src/core/sipe-media.c:2063 +#: ../src/core/sipe-media.c:2247 msgid "Error while reading from stream" msgstr "" @@ -657,36 +674,36 @@ msgstr "Desconhecido" #. Translators: remove (clear) previously assigned access level -#: ../src/core/sipe-ocs2007.c:2571 +#: ../src/core/sipe-ocs2007.c:2570 msgid "Unspecify" msgstr "Indeterminado" -#: ../src/core/sipe-ocs2007.c:2590 +#: ../src/core/sipe-ocs2007.c:2589 msgid "People in my company" msgstr "As pessoas na minha empresa" -#: ../src/core/sipe-ocs2007.c:2600 +#: ../src/core/sipe-ocs2007.c:2599 msgid "People in domains connected with my company" msgstr "Pessoas em domínios relacionados com a minha empresa" -#: ../src/core/sipe-ocs2007.c:2609 +#: ../src/core/sipe-ocs2007.c:2608 msgid "People in public domains" msgstr "Pessoas em domínios públicos" -#: ../src/core/sipe-ocs2007.c:2619 +#: ../src/core/sipe-ocs2007.c:2618 #, c-format msgid "People at %s" msgstr "Pessoas em% s" -#: ../src/core/sipe-ocs2007.c:2644 +#: ../src/core/sipe-ocs2007.c:2643 msgid "Add new domain..." msgstr "Adicionar novo domínio..." -#: ../src/core/sipe-ocs2007.c:2673 +#: ../src/core/sipe-ocs2007.c:2672 msgid "Online help..." msgstr "Ajuda Online" -#: ../src/core/sipe-ocs2007.c:2681 +#: ../src/core/sipe-ocs2007.c:2680 msgid "Access groups" msgstr "Grupos de acesso" @@ -698,49 +715,60 @@ #. SIPE_ACTIVITY_AVAILABLE #. SIPE_ACTIVITY_ONLINE #. SIPE_ACTIVITY_INACTIVE -#: ../src/core/sipe-status.c:58 +#: ../src/core/sipe-status.c:56 msgid "Inactive" msgstr "Inativo" #. SIPE_ACTIVITY_BUSYIDLE -#: ../src/core/sipe-status.c:60 +#: ../src/core/sipe-status.c:58 msgid "Busy-Idle" msgstr "Não disponible-inativo" #. SIPE_ACTIVITY_DND #. SIPE_ACTIVITY_BRB -#: ../src/core/sipe-status.c:62 +#: ../src/core/sipe-status.c:60 msgid "Be right back" msgstr "Regresso em un momento" #. SIPE_ACTIVITY_AWAY #. SIPE_ACTIVITY_LUNCH -#: ../src/core/sipe-status.c:64 +#: ../src/core/sipe-status.c:62 msgid "Out to lunch" msgstr "Saí para almoçar" #. SIPE_ACTIVITY_INVISIBLE #. SIPE_ACTIVITY_OFFLINE #. SIPE_ACTIVITY_ON_PHONE -#: ../src/core/sipe-status.c:67 +#: ../src/core/sipe-status.c:65 msgid "In a call" msgstr "Em uma chamada" #. SIPE_ACTIVITY_IN_CONF -#: ../src/core/sipe-status.c:68 +#: ../src/core/sipe-status.c:66 msgid "In a conference" msgstr "Em uma conferência" #. SIPE_ACTIVITY_IN_MEETING -#: ../src/core/sipe-status.c:69 +#: ../src/core/sipe-status.c:67 msgid "In a meeting" msgstr "Em uma reunião" #. SIPE_ACTIVITY_URGENT_ONLY -#: ../src/core/sipe-status.c:71 +#: ../src/core/sipe-status.c:69 msgid "Urgent interruptions only" msgstr "Apenas interrupções urgentes" +#: ../src/core/sipe-subscriptions.c:189 +msgid "Presence subscription failed!" +msgstr "" + +#: ../src/core/sipe-subscriptions.c:190 +msgid "" +"One or more buddies will therefore permanently show as offline.\n" +"\n" +"Please check that there are no corrupted SIP URIs in your contacts list." +msgstr "" + #: ../src/core/sipe-ucs.c:674 msgid "UCS initialization failed!" msgstr "" @@ -893,15 +921,19 @@ msgid "Copy to" msgstr "Copiar a" -#: ../src/purple/purple-chat.c:295 +#: ../src/purple/purple-chat.c:310 msgid "Lock" msgstr "Bloquear" -#: ../src/purple/purple-chat.c:300 +#: ../src/purple/purple-chat.c:315 msgid "Unlock" msgstr "Desbloquear" -#: ../src/purple/purple-chat.c:321 +#: ../src/purple/purple-chat.c:338 +msgid "Show presentation" +msgstr "" + +#: ../src/purple/purple-chat.c:345 msgid "Meeting entry info" msgstr "" @@ -1153,26 +1185,30 @@ msgstr "Grupo Chat Proxy\n company.com o user@company.com\n(deixe em branco para determinar a partir de Usuário)" #: ../src/purple/purple-plugin-common.c:933 +msgid "Remote desktop client" +msgstr "" + +#: ../src/purple/purple-plugin-common.c:938 msgid "Media encryption" msgstr "" -#: ../src/purple/purple-plugin-common.c:934 +#: ../src/purple/purple-plugin-common.c:939 msgid "Obey server policy" msgstr "" -#: ../src/purple/purple-plugin-common.c:935 +#: ../src/purple/purple-plugin-common.c:940 msgid "Always" msgstr "" -#: ../src/purple/purple-plugin-common.c:936 +#: ../src/purple/purple-plugin-common.c:941 msgid "Optional" msgstr "" -#: ../src/purple/purple-plugin-common.c:937 +#: ../src/purple/purple-plugin-common.c:942 msgid "Disabled" msgstr "" -#: ../src/purple/purple-plugin-common.c:947 +#: ../src/purple/purple-plugin-common.c:952 msgid "" "Login\n" " user or DOMAIN\\user or\n" @@ -1221,27 +1257,27 @@ msgid "_Search" msgstr "_Pesquisar" -#: ../src/purple/purple-transport.c:132 +#: ../src/purple/purple-transport.c:135 msgid "Read error" msgstr "Erro de leitura" -#: ../src/purple/purple-transport.c:136 -#: ../src/telepathy/telepathy-transport.c:96 +#: ../src/purple/purple-transport.c:139 +#: ../src/telepathy/telepathy-transport.c:95 msgid "Server has disconnected" msgstr "O servidor desconectou-se" -#: ../src/purple/purple-transport.c:198 +#: ../src/purple/purple-transport.c:201 msgid "Could not connect" msgstr "Não foi possível conectar" -#: ../src/purple/purple-transport.c:268 +#: ../src/purple/purple-transport.c:271 msgid "Could not create SSL context" msgstr "Não foi possível criar contexto SSL" -#: ../src/purple/purple-transport.c:290 +#: ../src/purple/purple-transport.c:293 msgid "Could not create socket" msgstr "Não foi possível criar socket" -#: ../src/purple/purple-transport.c:381 +#: ../src/purple/purple-transport.c:417 msgid "Write error" msgstr "Erro de gravação" diff -Nru pidgin-sipe-1.21.1/po/pt.po pidgin-sipe-1.22.1/po/pt.po --- pidgin-sipe-1.21.1/po/pt.po 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/po/pt.po 2017-06-11 15:41:22.000000000 +0000 @@ -14,7 +14,7 @@ "Project-Id-Version: pidgin sipe\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/sipe/bugs/\n" "POT-Creation-Date: 2010-11-30 23:36+0200\n" -"PO-Revision-Date: 2016-05-28 15:08+0000\n" +"PO-Revision-Date: 2017-01-23 17:47+0000\n" "Last-Translator: Stefan Becker \n" "Language-Team: Portuguese (http://www.transifex.com/stefanb/pidgin-sipe/language/pt/)\n" "MIME-Version: 1.0\n" @@ -23,213 +23,238 @@ "Language: pt\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../src/core/sip-transport.c:235 +#: ../src/core/sip-transport.c:240 msgid "Failed to authenticate to server" msgstr "Falha ao autenticar no servidor" -#: ../src/core/sip-transport.c:293 +#: ../src/core/sip-transport.c:298 #, c-format msgid "Can't request certificate from %s" msgstr "Não é possível solicitar o certificado de %s" -#: ../src/core/sip-transport.c:303 +#: ../src/core/sip-transport.c:308 msgid "No URI for certificate provisioning service provided" msgstr "Nenhum URI fornecido para o serviço de provisionamento" -#: ../src/core/sip-transport.c:1281 +#: ../src/core/sip-transport.c:1285 msgid "Authentication failed" msgstr "Autenticação falhou" -#: ../src/core/sip-transport.c:1338 +#: ../src/core/sip-transport.c:1342 msgid "Incompatible authentication scheme chosen" msgstr "O método de autenticação escolhido é incompatível" -#: ../src/core/sip-transport.c:1355 ../src/core/sipe-notify.c:1149 +#: ../src/core/sip-transport.c:1359 ../src/core/sipe-notify.c:1149 #, c-format msgid "You have been rejected by the server: %s" msgstr "Você foi rejeitado pelo servidor: %s" -#: ../src/core/sip-transport.c:1356 ../src/core/sip-transport.c:1372 -#: ../src/core/sip-transport.c:1396 ../src/core/sip-transport.c:1420 +#: ../src/core/sip-transport.c:1360 ../src/core/sip-transport.c:1376 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 #: ../src/core/sipe-conf.c:265 ../src/core/sipe-notify.c:1149 msgid "no reason given" msgstr "nenhuma razão apresentada" -#: ../src/core/sip-transport.c:1371 +#: ../src/core/sip-transport.c:1375 #, c-format msgid "Not found: %s. Please contact your Administrator" msgstr "Não encontrado: %s. Por favor contacte o seu Administrador " -#: ../src/core/sip-transport.c:1373 +#: ../src/core/sip-transport.c:1377 msgid "SIP is either not enabled for the destination URI or it does not exist" msgstr "Ou o SIP não está habilitado no URI de destino, ou não existe" -#: ../src/core/sip-transport.c:1396 ../src/core/sip-transport.c:1420 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 #, c-format msgid "Service unavailable: %s" msgstr "Serviço indisponível: %s" -#: ../src/core/sip-transport.c:1766 +#: ../src/core/sip-transport.c:1775 msgid "Corrupted message received" msgstr "Mensagem corrompida recebida" -#: ../src/core/sip-transport.c:1790 +#: ../src/core/sip-transport.c:1799 msgid "Invalid message signature received" msgstr "Recebida uma assinatura de mensagem inválida" -#: ../src/core/sipe-buddy.c:540 ../src/core/sipe-buddy.c:2300 +#: ../src/core/sipe-appshare.c:458 +#, c-format +msgid "%s wants to start presenting" +msgstr "" + +#: ../src/core/sipe-appshare.c:462 ../src/core/sipe-conf.c:1086 +msgid "Accept" +msgstr "Aceitar" + +#: ../src/core/sipe-appshare.c:463 ../src/core/sipe-conf.c:1087 +msgid "Decline" +msgstr "Negar" + +#: ../src/core/sipe-appshare.c:501 ../src/core/sipe-appshare.c:599 +msgid "Application sharing error" +msgstr "" + +#: ../src/core/sipe-appshare.c:502 +msgid "Unknown remote desktop client configured." +msgstr "" + +#: ../src/core/sipe-appshare.c:600 +msgid "Couldn't connect application sharing" +msgstr "" + +#: ../src/core/sipe-buddy.c:541 ../src/core/sipe-buddy.c:2301 msgid "Mobile" msgstr "Móvel" -#: ../src/core/sipe-buddy.c:828 +#: ../src/core/sipe-buddy.c:829 msgid "Status" msgstr "Estado" -#: ../src/core/sipe-buddy.c:831 +#: ../src/core/sipe-buddy.c:832 msgid "Calendar" msgstr "Calendário" -#: ../src/core/sipe-buddy.c:836 +#: ../src/core/sipe-buddy.c:837 msgid "Meeting in" msgstr "Reunião em" -#: ../src/core/sipe-buddy.c:840 +#: ../src/core/sipe-buddy.c:841 msgid "Meeting about" msgstr "Reunião sobre" -#: ../src/core/sipe-buddy.c:845 +#: ../src/core/sipe-buddy.c:846 msgid "Out of office note" msgstr "Nota de fora do escritório" -#: ../src/core/sipe-buddy.c:845 +#: ../src/core/sipe-buddy.c:846 msgid "Note" msgstr "Notas" -#: ../src/core/sipe-buddy.c:850 ../src/core/sipe-buddy.c:2345 +#: ../src/core/sipe-buddy.c:851 ../src/core/sipe-buddy.c:2346 #: ../src/purple/purple-buddy.c:633 msgid "Access level" msgstr "Nivel de acesso " -#: ../src/core/sipe-buddy.c:1073 +#: ../src/core/sipe-buddy.c:1074 #, c-format msgid "Found %d contact%s:" msgid_plural "Found %d contacts%s:" msgstr[0] "Encontrados %d contactos%s:" msgstr[1] "Encontrados %d contactos%s:" -#: ../src/core/sipe-buddy.c:1075 +#: ../src/core/sipe-buddy.c:1076 msgid " (more matched your query)" msgstr "(mais correspondente à sua consulta)" -#: ../src/core/sipe-buddy.c:1121 ../src/core/sipe-buddy.c:1259 +#: ../src/core/sipe-buddy.c:1122 ../src/core/sipe-buddy.c:1260 #: ../src/core/sipe-ucs.c:314 msgid "No contacts found" msgstr "Nenhum contacto encontrado" -#: ../src/core/sipe-buddy.c:1134 ../src/core/sipe-buddy.c:1272 +#: ../src/core/sipe-buddy.c:1135 ../src/core/sipe-buddy.c:1273 #: ../src/core/sipe-ucs.c:278 msgid "Unable to display the search results" msgstr "Impossivel de apresentar resultados da pesquisa " -#: ../src/core/sipe-buddy.c:1237 ../src/core/sipe-buddy.c:1249 +#: ../src/core/sipe-buddy.c:1238 ../src/core/sipe-buddy.c:1250 #: ../src/core/sipe-ucs.c:391 msgid "Contact search failed" msgstr "Pesquisa por contato falhou" -#: ../src/core/sipe-buddy.c:1412 ../src/core/sipe-ucs.c:395 +#: ../src/core/sipe-buddy.c:1413 ../src/core/sipe-ucs.c:395 msgid "Invalid contact search query" msgstr "Comando de procura de contacto inválido" -#: ../src/core/sipe-buddy.c:2237 +#: ../src/core/sipe-buddy.c:2238 #, c-format msgid "Make leader of '%s'" msgstr "Tornar líder de '%s'" -#: ../src/core/sipe-buddy.c:2250 +#: ../src/core/sipe-buddy.c:2251 #, c-format msgid "Remove from '%s'" msgstr "Remover de '%s'" -#: ../src/core/sipe-buddy.c:2264 +#: ../src/core/sipe-buddy.c:2265 #, c-format msgid "Invite to '%s'" msgstr "Convidar para '%s'" -#: ../src/core/sipe-buddy.c:2280 +#: ../src/core/sipe-buddy.c:2281 msgid "New chat" msgstr "Novo chat" -#: ../src/core/sipe-buddy.c:2293 +#: ../src/core/sipe-buddy.c:2294 msgid "Work" msgstr "Trabalhar" -#: ../src/core/sipe-buddy.c:2308 +#: ../src/core/sipe-buddy.c:2309 msgid "Home" msgstr "Home" -#: ../src/core/sipe-buddy.c:2316 +#: ../src/core/sipe-buddy.c:2317 msgid "Other" msgstr "Outro" -#: ../src/core/sipe-buddy.c:2324 +#: ../src/core/sipe-buddy.c:2325 msgid "Custom1" msgstr "Custom1" -#: ../src/core/sipe-buddy.c:2334 +#: ../src/core/sipe-buddy.c:2335 msgid "Send email..." msgstr "Enviar email..." -#: ../src/core/sipe-cal.c:907 +#: ../src/core/sipe-cal.c:906 msgid "Free" msgstr "Livre" -#: ../src/core/sipe-cal.c:908 +#: ../src/core/sipe-cal.c:907 msgid "Tentative" msgstr "Tentativa" #. SIPE_ACTIVITY_BUSY -#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:59 +#: ../src/core/sipe-cal.c:908 ../src/core/sipe-status.c:57 msgid "Busy" msgstr "Ocupado" #. SIPE_ACTIVITY_OOF -#: ../src/core/sipe-cal.c:910 ../src/core/sipe-status.c:70 +#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:68 msgid "Out of office" msgstr "Fora do escritório" -#: ../src/core/sipe-cal.c:911 +#: ../src/core/sipe-cal.c:910 msgid "No data" msgstr "Sem data" -#: ../src/core/sipe-cal.c:1019 ../src/core/sipe-cal.c:1046 +#: ../src/core/sipe-cal.c:1018 ../src/core/sipe-cal.c:1045 #, c-format msgid "Currently %s" msgstr "Atualmente %s" -#: ../src/core/sipe-cal.c:1025 +#: ../src/core/sipe-cal.c:1024 msgid "Outside of working hours for next 8 hours" msgstr "Fora das horas de trabalho nas próximas 8 horas" -#: ../src/core/sipe-cal.c:1027 +#: ../src/core/sipe-cal.c:1026 #, c-format msgid "%s for next 8 hours" msgstr "%s para as próximas 8 horas" -#: ../src/core/sipe-cal.c:1036 +#: ../src/core/sipe-cal.c:1035 msgid "Not working" msgstr "Não funciona" -#: ../src/core/sipe-cal.c:1040 +#: ../src/core/sipe-cal.c:1039 #, c-format msgid "%s until %.2d:%.2d" msgstr "%s até %.2d:%.2d" -#: ../src/core/sipe-cal.c:1048 +#: ../src/core/sipe-cal.c:1047 #, c-format msgid "%s. Outside of working hours at %.2d:%.2d" msgstr "%s. Fora das horas de trabalho de %.2d:%.2d" -#: ../src/core/sipe-cal.c:1053 +#: ../src/core/sipe-cal.c:1052 #, c-format msgid "%s. %s at %.2d:%.2d" msgstr "%s. %s at %.2d:%.2d" @@ -245,7 +270,7 @@ msgstr "Solicitação da Web bilhete para %s falhou" #. Generate next ID -#: ../src/core/sipe-chat.c:240 +#: ../src/core/sipe-chat.c:246 #, c-format msgid "Chat #%d" msgstr "Chat #%d" @@ -272,123 +297,115 @@ msgid "Incomplete conference information provided" msgstr "Informação de conferência incompleta " -#: ../src/core/sipe-conf.c:1041 +#: ../src/core/sipe-conf.c:1106 msgid "" "\n" "\n" "As this client was not compiled with voice call support, if you accept, you will be able to contact the other participants only via IM session." msgstr "\n\nComo este cliente não foi compilado com suporte a chamadas de voz, se você aceitar, você poderá entrar em contato com os outros participantes da sessão somente via IM." -#: ../src/core/sipe-conf.c:1049 +#: ../src/core/sipe-conf.c:1111 #, c-format -msgid "%s wants to invite you to the conference call%s" -msgstr "%s quer convidá-lo para a conferência chamada%s" - -#: ../src/core/sipe-conf.c:1063 -msgid "Accept" -msgstr "Aceitar" - -#: ../src/core/sipe-conf.c:1064 -msgid "Decline" -msgstr "Negar" +msgid "wants to invite you to a conference call%s" +msgstr "" -#: ../src/core/sipe-conf.c:1345 +#: ../src/core/sipe-conf.c:1459 msgid "" "This conference is no longer locked. Additional participants can now join." msgstr "Esta conferência não é mais protegida. Participantes adicionais podem agora juntar-se." -#: ../src/core/sipe-conf.c:1349 +#: ../src/core/sipe-conf.c:1463 msgid "" "This conference is locked. Nobody else can join the conference while it is " "locked." msgstr "Esta conferência está bloqueada. Ninguém mais pode participar na conferência, enquanto esta estiver bloqueada." -#: ../src/core/sipe-conf.c:1382 +#: ../src/core/sipe-conf.c:1496 msgid "You have been disconnected from this conference." msgstr "Você foi desconectado desta conferência." -#: ../src/core/sipe-conf.c:1542 +#: ../src/core/sipe-conf.c:1656 msgid "Dial-in info" msgstr "Informação de número Dial-in" -#: ../src/core/sipe-conf.c:1543 +#: ../src/core/sipe-conf.c:1657 msgid "Number" msgstr "Número" -#: ../src/core/sipe-conf.c:1545 +#: ../src/core/sipe-conf.c:1659 msgid "Conference ID" msgstr "ID da conferência " -#: ../src/core/sipe-conf.c:1547 +#: ../src/core/sipe-conf.c:1661 msgid "Meeting link" msgstr "Link da reunião" -#: ../src/core/sipe-conf.c:1549 +#: ../src/core/sipe-conf.c:1663 msgid "Organizer" msgstr "Organizador" -#: ../src/core/sipe-conf.c:1551 +#: ../src/core/sipe-conf.c:1665 msgid "Alternative dial-in numbers" msgstr "Números alternativos de dial-in" #. The next 13 texts make up the SIPE about note text #. About note, part 1/13: introduction -#: ../src/core/sipe-core.c:220 +#: ../src/core/sipe-core.c:221 msgid "" "A third-party plugin implementing extended version of SIP/SIMPLE used by " "various products" msgstr "Um plugin de terceiros implementa versão estendida do SIP / SIMPLE usado por vários produtos" #. About note, part 2/13: home page URL (label) -#: ../src/core/sipe-core.c:222 +#: ../src/core/sipe-core.c:223 msgid "Home Page" msgstr "Homepage" #. About note, part 3/13: support forum URL (label) -#: ../src/core/sipe-core.c:224 +#: ../src/core/sipe-core.c:225 msgid "Support" msgstr "Apoiar" #. About note, part 4/13: support forum name (hyperlink text) -#: ../src/core/sipe-core.c:226 +#: ../src/core/sipe-core.c:227 msgid "Help Forum" msgstr "Forum de Ajuda" #. About note, part 5/13: bug tracker URL (label) -#: ../src/core/sipe-core.c:228 +#: ../src/core/sipe-core.c:229 msgid "Report Problems" msgstr "Reportar problemas" #. About note, part 6/13: bug tracker URL (hyperlink text) -#: ../src/core/sipe-core.c:230 +#: ../src/core/sipe-core.c:231 msgid "Bug Tracker" msgstr "Bug Tracker" #. About note, part 7/13: translation service URL (label) -#: ../src/core/sipe-core.c:232 +#: ../src/core/sipe-core.c:233 msgid "Translations" msgstr "Traduções" #. About note, part 8/13: license type (label) -#: ../src/core/sipe-core.c:234 +#: ../src/core/sipe-core.c:235 msgid "License" msgstr "Licença" #. About note, part 9/13: (REMOVED) #. About note, part 10/13: translation request, text before Transifex.com URL #. append a space if text is not empty -#: ../src/core/sipe-core.c:238 +#: ../src/core/sipe-core.c:239 msgid "Please help us to translate SIPE to your native language here at " msgstr "Por favor, ajude-nos a traduzir SIPE à sua língua nativa aqui no" #. About note, part 11/13: translation request, text after Transifex.com URL #. start with a space if text is not empty -#: ../src/core/sipe-core.c:241 +#: ../src/core/sipe-core.c:242 msgid " using convenient web interface" msgstr "utilizar web interface conviniente " #. About note, part 12/13: author list (header) -#: ../src/core/sipe-core.c:243 +#: ../src/core/sipe-core.c:244 msgid "Authors" msgstr "Autores" @@ -396,15 +413,15 @@ #. PLEASE NOTE: do *NOT* simply translate the english original #. but write something similar to the following sentence: #. "Localization for (): " -#: ../src/core/sipe-core.c:248 +#: ../src/core/sipe-core.c:249 msgid "Original texts in English (en): SIPE developers" msgstr "Textos originais em Inglês (en): desenvolvedores SIPE" -#: ../src/core/sipe-core.c:269 +#: ../src/core/sipe-core.c:273 msgid "SIP Exchange user name contains invalid characters" msgstr "Utilizador de SIP Exchange contém caracteres inválidos" -#: ../src/core/sipe-core.c:277 ../src/purple/purple-buddy.c:485 +#: ../src/core/sipe-core.c:281 ../src/purple/purple-buddy.c:485 #: ../src/telepathy/telepathy-protocol.c:89 #: ../src/telepathy/telepathy-protocol.c:191 #, c-format @@ -413,21 +430,21 @@ "Example: user@company.com" msgstr "Nome do utilizador deve ser um URI SIP\nExemplo: user@company.com" -#: ../src/core/sipe-core.c:284 +#: ../src/core/sipe-core.c:288 msgid "Password is required when Single Sign-On is not enabled" msgstr "Palavra passe é necessária quando o Single Sign-on não está activo" -#: ../src/core/sipe-core.c:294 +#: ../src/core/sipe-core.c:298 msgid "" "Email address should be valid if provided\n" "Example: user@company.com" msgstr "Endereço de e-mail deve ser válido se especificado\nExemplo: user@company.com" -#: ../src/core/sipe-core.c:303 +#: ../src/core/sipe-core.c:307 msgid "SIP Exchange user name contains whitespace" msgstr "SIP Exchange contém espaços em branco" -#: ../src/core/sipe-core.c:317 +#: ../src/core/sipe-core.c:321 msgid "" "Email services URL should be valid if provided\n" "Example: https://exchange.corp.com/EWS/Exchange.asmx\n" @@ -458,13 +475,13 @@ msgid "Could not create listen socket" msgstr "Não foi possível criar socket de escuta" -#: ../src/core/sipe-ft-lync.c:757 ../src/core/sipe-media.c:1195 -#: ../src/core/sipe-media.c:1206 ../src/core/sipe-media.c:1284 -#: ../src/core/sipe-media.c:1740 +#: ../src/core/sipe-ft-lync.c:762 ../src/core/sipe-media.c:1328 +#: ../src/core/sipe-media.c:1339 ../src/core/sipe-media.c:1417 +#: ../src/core/sipe-media.c:1923 msgid "Error occurred" msgstr "Ocorreu um erro" -#: ../src/core/sipe-ft-lync.c:758 +#: ../src/core/sipe-ft-lync.c:763 msgid "Error creating data stream" msgstr "Erro ao criar o fluxo de dados" @@ -499,7 +516,7 @@ msgstr "Sem memória" #: ../src/core/sipe-group.c:168 ../src/core/sipe-notify.c:1163 -#: ../src/core/sipe-notify.c:1190 ../src/core/sipe-notify.c:1294 +#: ../src/core/sipe-notify.c:1197 ../src/core/sipe-notify.c:1301 #: ../src/purple/purple-search.c:128 msgid "Other Contacts" msgstr "Outros Contactos" @@ -537,77 +554,77 @@ msgid "Failed to invite %s" msgstr "Falhou o convite %s" -#: ../src/core/sipe-incoming.c:741 +#: ../src/core/sipe-incoming.c:754 #, c-format msgid "Received a message with unrecognized contents from %s" msgstr "Recebeu uma mensagem com conteúdo não reconhecido de %s" -#: ../src/core/sipe-media.c:835 ../src/core/sipe-media.c:1347 -#: ../src/core/sipe-media.c:1357 ../src/core/sipe-media.c:1721 -#: ../src/core/sipe-media.c:1741 +#: ../src/core/sipe-media.c:869 ../src/core/sipe-media.c:1483 +#: ../src/core/sipe-media.c:1493 ../src/core/sipe-media.c:1904 +#: ../src/core/sipe-media.c:1924 msgid "Unable to establish a call" msgstr "Não é possível estabelecer a chamada" -#: ../src/core/sipe-media.c:836 ../src/core/sipe-media.c:1722 +#: ../src/core/sipe-media.c:870 ../src/core/sipe-media.c:1905 msgid "Encryption settings of peer are incompatible with ours." msgstr "Configurações de criptografia de pares são incompatíveis com o nossa." -#: ../src/core/sipe-media.c:929 +#: ../src/core/sipe-media.c:963 #, c-format msgid "User %s rejected call" msgstr "Utilizador %s rejeitou a chamada" -#: ../src/core/sipe-media.c:930 +#: ../src/core/sipe-media.c:964 msgid "Call rejected" msgstr "Chamada rejeitada" -#: ../src/core/sipe-media.c:1196 ../src/core/sipe-media.c:1285 +#: ../src/core/sipe-media.c:1329 ../src/core/sipe-media.c:1418 msgid "Error creating audio stream" msgstr "Erro ao criar fluxo de áudio" -#: ../src/core/sipe-media.c:1207 +#: ../src/core/sipe-media.c:1340 msgid "Error creating video stream" msgstr "Erro ao criar fluxo de vídeo" -#: ../src/core/sipe-media.c:1251 ../src/purple/purple-chat.c:314 +#: ../src/core/sipe-media.c:1384 ../src/purple/purple-chat.c:329 msgid "Join conference call" msgstr "Entrar em chamada de conferência" -#: ../src/core/sipe-media.c:1252 +#: ../src/core/sipe-media.c:1385 msgid "Conference calls are not supported on this server." msgstr "Chamadas de conferência não são suportadas neste servidor" -#: ../src/core/sipe-media.c:1348 +#: ../src/core/sipe-media.c:1484 msgid "Invalid phone number" msgstr "Número de telefone inválido" -#: ../src/core/sipe-media.c:1358 +#: ../src/core/sipe-media.c:1494 msgid "Audio Test Service is not available." msgstr "Serviço de Testes de Áudio não está disponível." -#: ../src/core/sipe-media.c:1690 +#: ../src/core/sipe-media.c:1873 msgid "User unavailable" msgstr "Usuário não está disponível" -#: ../src/core/sipe-media.c:1693 +#: ../src/core/sipe-media.c:1876 #, c-format msgid "%s does not want to be disturbed" msgstr "%s não quer ser incomodado" -#: ../src/core/sipe-media.c:1695 +#: ../src/core/sipe-media.c:1878 #, c-format msgid "User %s is not available" msgstr "%s usuário não está disponível" -#: ../src/core/sipe-media.c:1704 +#: ../src/core/sipe-media.c:1887 msgid "Unsupported media type" msgstr "Tipo de média não suportado" -#: ../src/core/sipe-media.c:2062 +#: ../src/core/sipe-media.c:2246 msgid "Media error" msgstr "Erro de Media" -#: ../src/core/sipe-media.c:2063 +#: ../src/core/sipe-media.c:2247 msgid "Error while reading from stream" msgstr "Erro durante a leitura do fluxo" @@ -658,36 +675,36 @@ msgstr "Desconhecido" #. Translators: remove (clear) previously assigned access level -#: ../src/core/sipe-ocs2007.c:2571 +#: ../src/core/sipe-ocs2007.c:2570 msgid "Unspecify" msgstr "Unspecify" -#: ../src/core/sipe-ocs2007.c:2590 +#: ../src/core/sipe-ocs2007.c:2589 msgid "People in my company" msgstr "Pessoas na minha empresa" -#: ../src/core/sipe-ocs2007.c:2600 +#: ../src/core/sipe-ocs2007.c:2599 msgid "People in domains connected with my company" msgstr "Pessoas em domínios conectados com a minha empresa" -#: ../src/core/sipe-ocs2007.c:2609 +#: ../src/core/sipe-ocs2007.c:2608 msgid "People in public domains" msgstr "Pessoas em dominios publicos " -#: ../src/core/sipe-ocs2007.c:2619 +#: ../src/core/sipe-ocs2007.c:2618 #, c-format msgid "People at %s" msgstr "Pessoas em %s" -#: ../src/core/sipe-ocs2007.c:2644 +#: ../src/core/sipe-ocs2007.c:2643 msgid "Add new domain..." msgstr "Adicionar novo domínio... " -#: ../src/core/sipe-ocs2007.c:2673 +#: ../src/core/sipe-ocs2007.c:2672 msgid "Online help..." msgstr "Ajuda Online..." -#: ../src/core/sipe-ocs2007.c:2681 +#: ../src/core/sipe-ocs2007.c:2680 msgid "Access groups" msgstr "Grupos de acesso " @@ -699,49 +716,60 @@ #. SIPE_ACTIVITY_AVAILABLE #. SIPE_ACTIVITY_ONLINE #. SIPE_ACTIVITY_INACTIVE -#: ../src/core/sipe-status.c:58 +#: ../src/core/sipe-status.c:56 msgid "Inactive" msgstr "Inativo" #. SIPE_ACTIVITY_BUSYIDLE -#: ../src/core/sipe-status.c:60 +#: ../src/core/sipe-status.c:58 msgid "Busy-Idle" msgstr "Ocupado-Ocioso" #. SIPE_ACTIVITY_DND #. SIPE_ACTIVITY_BRB -#: ../src/core/sipe-status.c:62 +#: ../src/core/sipe-status.c:60 msgid "Be right back" msgstr "Volto já" #. SIPE_ACTIVITY_AWAY #. SIPE_ACTIVITY_LUNCH -#: ../src/core/sipe-status.c:64 +#: ../src/core/sipe-status.c:62 msgid "Out to lunch" msgstr "Ausente para almoço" #. SIPE_ACTIVITY_INVISIBLE #. SIPE_ACTIVITY_OFFLINE #. SIPE_ACTIVITY_ON_PHONE -#: ../src/core/sipe-status.c:67 +#: ../src/core/sipe-status.c:65 msgid "In a call" msgstr "Numa chamada" #. SIPE_ACTIVITY_IN_CONF -#: ../src/core/sipe-status.c:68 +#: ../src/core/sipe-status.c:66 msgid "In a conference" msgstr "Numa conferência" #. SIPE_ACTIVITY_IN_MEETING -#: ../src/core/sipe-status.c:69 +#: ../src/core/sipe-status.c:67 msgid "In a meeting" msgstr "Numa reunião" #. SIPE_ACTIVITY_URGENT_ONLY -#: ../src/core/sipe-status.c:71 +#: ../src/core/sipe-status.c:69 msgid "Urgent interruptions only" msgstr "Apenas interrupções urgentes" +#: ../src/core/sipe-subscriptions.c:189 +msgid "Presence subscription failed!" +msgstr "" + +#: ../src/core/sipe-subscriptions.c:190 +msgid "" +"One or more buddies will therefore permanently show as offline.\n" +"\n" +"Please check that there are no corrupted SIP URIs in your contacts list." +msgstr "" + #: ../src/core/sipe-ucs.c:674 msgid "UCS initialization failed!" msgstr "Inicialização UCS falhou!" @@ -894,15 +922,19 @@ msgid "Copy to" msgstr "Copiar para" -#: ../src/purple/purple-chat.c:295 +#: ../src/purple/purple-chat.c:310 msgid "Lock" msgstr "Bloquear" -#: ../src/purple/purple-chat.c:300 +#: ../src/purple/purple-chat.c:315 msgid "Unlock" msgstr "Desbloquear" -#: ../src/purple/purple-chat.c:321 +#: ../src/purple/purple-chat.c:338 +msgid "Show presentation" +msgstr "" + +#: ../src/purple/purple-chat.c:345 msgid "Meeting entry info" msgstr "Reunião Informação de entrada" @@ -1154,26 +1186,30 @@ msgstr "Proxy de chat de grupo \n company.com ou user@company.com \n(deixe em branco para determinar a partir de nome de utilizador)" #: ../src/purple/purple-plugin-common.c:933 +msgid "Remote desktop client" +msgstr "" + +#: ../src/purple/purple-plugin-common.c:938 msgid "Media encryption" msgstr "Encriptação do média" -#: ../src/purple/purple-plugin-common.c:934 +#: ../src/purple/purple-plugin-common.c:939 msgid "Obey server policy" msgstr "Obedecer à política do servidor" -#: ../src/purple/purple-plugin-common.c:935 +#: ../src/purple/purple-plugin-common.c:940 msgid "Always" msgstr "Sempre" -#: ../src/purple/purple-plugin-common.c:936 +#: ../src/purple/purple-plugin-common.c:941 msgid "Optional" msgstr "Opcional" -#: ../src/purple/purple-plugin-common.c:937 +#: ../src/purple/purple-plugin-common.c:942 msgid "Disabled" msgstr "Desactivado" -#: ../src/purple/purple-plugin-common.c:947 +#: ../src/purple/purple-plugin-common.c:952 msgid "" "Login\n" " user or DOMAIN\\user or\n" @@ -1222,27 +1258,27 @@ msgid "_Search" msgstr "_Procurar" -#: ../src/purple/purple-transport.c:132 +#: ../src/purple/purple-transport.c:135 msgid "Read error" msgstr "Erro de leitura" -#: ../src/purple/purple-transport.c:136 -#: ../src/telepathy/telepathy-transport.c:96 +#: ../src/purple/purple-transport.c:139 +#: ../src/telepathy/telepathy-transport.c:95 msgid "Server has disconnected" msgstr "Servidor foi desligado" -#: ../src/purple/purple-transport.c:198 +#: ../src/purple/purple-transport.c:201 msgid "Could not connect" msgstr "Não foi possível conectar" -#: ../src/purple/purple-transport.c:268 +#: ../src/purple/purple-transport.c:271 msgid "Could not create SSL context" msgstr "Não foi possível criar contexto SSL" -#: ../src/purple/purple-transport.c:290 +#: ../src/purple/purple-transport.c:293 msgid "Could not create socket" msgstr "Não foi possível criar socket" -#: ../src/purple/purple-transport.c:381 +#: ../src/purple/purple-transport.c:417 msgid "Write error" msgstr "Erro de escrita" diff -Nru pidgin-sipe-1.21.1/po/ro.po pidgin-sipe-1.22.1/po/ro.po --- pidgin-sipe-1.21.1/po/ro.po 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/po/ro.po 2017-06-11 15:41:22.000000000 +0000 @@ -12,7 +12,7 @@ "Project-Id-Version: pidgin sipe\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/sipe/bugs/\n" "POT-Creation-Date: 2010-11-30 23:36+0200\n" -"PO-Revision-Date: 2016-05-28 15:08+0000\n" +"PO-Revision-Date: 2017-01-23 17:47+0000\n" "Last-Translator: Stefan Becker \n" "Language-Team: Romanian (http://www.transifex.com/stefanb/pidgin-sipe/language/ro/)\n" "MIME-Version: 1.0\n" @@ -21,94 +21,119 @@ "Language: ro\n" "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" -#: ../src/core/sip-transport.c:235 +#: ../src/core/sip-transport.c:240 msgid "Failed to authenticate to server" msgstr "Nu s-a putut face autentificarea la server" -#: ../src/core/sip-transport.c:293 +#: ../src/core/sip-transport.c:298 #, c-format msgid "Can't request certificate from %s" msgstr "Nu s-a putut cere certificatul de la %s" -#: ../src/core/sip-transport.c:303 +#: ../src/core/sip-transport.c:308 msgid "No URI for certificate provisioning service provided" msgstr "Nu a fost configurat nici un URI pentru serviciul de distribuție a certificatelor" -#: ../src/core/sip-transport.c:1281 +#: ../src/core/sip-transport.c:1285 msgid "Authentication failed" msgstr "Autentificarea a eșuat" -#: ../src/core/sip-transport.c:1338 +#: ../src/core/sip-transport.c:1342 msgid "Incompatible authentication scheme chosen" msgstr "Schema de autentificare este incompatibilă" -#: ../src/core/sip-transport.c:1355 ../src/core/sipe-notify.c:1149 +#: ../src/core/sip-transport.c:1359 ../src/core/sipe-notify.c:1149 #, c-format msgid "You have been rejected by the server: %s" msgstr "Ați fost refuzat de către server: %s" -#: ../src/core/sip-transport.c:1356 ../src/core/sip-transport.c:1372 -#: ../src/core/sip-transport.c:1396 ../src/core/sip-transport.c:1420 +#: ../src/core/sip-transport.c:1360 ../src/core/sip-transport.c:1376 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 #: ../src/core/sipe-conf.c:265 ../src/core/sipe-notify.c:1149 msgid "no reason given" msgstr "nu s-a dat nici un motiv" -#: ../src/core/sip-transport.c:1371 +#: ../src/core/sip-transport.c:1375 #, c-format msgid "Not found: %s. Please contact your Administrator" msgstr "Nu s-a putut găsi: %s. Contactați administratorul sistemului" -#: ../src/core/sip-transport.c:1373 +#: ../src/core/sip-transport.c:1377 msgid "SIP is either not enabled for the destination URI or it does not exist" msgstr "Protocolul SIP este dezactivat pentru URI-ul destinație sau acesta nu există" -#: ../src/core/sip-transport.c:1396 ../src/core/sip-transport.c:1420 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 #, c-format msgid "Service unavailable: %s" msgstr "Serviciu indisponibil: %s" -#: ../src/core/sip-transport.c:1766 +#: ../src/core/sip-transport.c:1775 msgid "Corrupted message received" msgstr "A fost recepționat un mesaj corupt" -#: ../src/core/sip-transport.c:1790 +#: ../src/core/sip-transport.c:1799 msgid "Invalid message signature received" msgstr "Semnătura mesajului primit este invalidă" -#: ../src/core/sipe-buddy.c:540 ../src/core/sipe-buddy.c:2300 +#: ../src/core/sipe-appshare.c:458 +#, c-format +msgid "%s wants to start presenting" +msgstr "" + +#: ../src/core/sipe-appshare.c:462 ../src/core/sipe-conf.c:1086 +msgid "Accept" +msgstr "Acceptă" + +#: ../src/core/sipe-appshare.c:463 ../src/core/sipe-conf.c:1087 +msgid "Decline" +msgstr "Refuză" + +#: ../src/core/sipe-appshare.c:501 ../src/core/sipe-appshare.c:599 +msgid "Application sharing error" +msgstr "" + +#: ../src/core/sipe-appshare.c:502 +msgid "Unknown remote desktop client configured." +msgstr "" + +#: ../src/core/sipe-appshare.c:600 +msgid "Couldn't connect application sharing" +msgstr "" + +#: ../src/core/sipe-buddy.c:541 ../src/core/sipe-buddy.c:2301 msgid "Mobile" msgstr "Mobil" -#: ../src/core/sipe-buddy.c:828 +#: ../src/core/sipe-buddy.c:829 msgid "Status" msgstr "Stare" -#: ../src/core/sipe-buddy.c:831 +#: ../src/core/sipe-buddy.c:832 msgid "Calendar" msgstr "Calendar" -#: ../src/core/sipe-buddy.c:836 +#: ../src/core/sipe-buddy.c:837 msgid "Meeting in" msgstr "Ședință în" -#: ../src/core/sipe-buddy.c:840 +#: ../src/core/sipe-buddy.c:841 msgid "Meeting about" msgstr "Ședință despre" -#: ../src/core/sipe-buddy.c:845 +#: ../src/core/sipe-buddy.c:846 msgid "Out of office note" msgstr "Mesaj de absență" -#: ../src/core/sipe-buddy.c:845 +#: ../src/core/sipe-buddy.c:846 msgid "Note" msgstr "Notă" -#: ../src/core/sipe-buddy.c:850 ../src/core/sipe-buddy.c:2345 +#: ../src/core/sipe-buddy.c:851 ../src/core/sipe-buddy.c:2346 #: ../src/purple/purple-buddy.c:633 msgid "Access level" msgstr "Nivel de acces" -#: ../src/core/sipe-buddy.c:1073 +#: ../src/core/sipe-buddy.c:1074 #, c-format msgid "Found %d contact%s:" msgid_plural "Found %d contacts%s:" @@ -116,119 +141,119 @@ msgstr[1] "S-au găsit %d contacte%s:" msgstr[2] "S-au găsit %d contacte%s:" -#: ../src/core/sipe-buddy.c:1075 +#: ../src/core/sipe-buddy.c:1076 msgid " (more matched your query)" msgstr "(căutarea a avut mai multe rezultate)" -#: ../src/core/sipe-buddy.c:1121 ../src/core/sipe-buddy.c:1259 +#: ../src/core/sipe-buddy.c:1122 ../src/core/sipe-buddy.c:1260 #: ../src/core/sipe-ucs.c:314 msgid "No contacts found" msgstr "Nu s-a găsit nimic" -#: ../src/core/sipe-buddy.c:1134 ../src/core/sipe-buddy.c:1272 +#: ../src/core/sipe-buddy.c:1135 ../src/core/sipe-buddy.c:1273 #: ../src/core/sipe-ucs.c:278 msgid "Unable to display the search results" msgstr "Nu s-au putut afișa rezultatele căutării" -#: ../src/core/sipe-buddy.c:1237 ../src/core/sipe-buddy.c:1249 +#: ../src/core/sipe-buddy.c:1238 ../src/core/sipe-buddy.c:1250 #: ../src/core/sipe-ucs.c:391 msgid "Contact search failed" msgstr "Căutarea contactelor a eșuat" -#: ../src/core/sipe-buddy.c:1412 ../src/core/sipe-ucs.c:395 +#: ../src/core/sipe-buddy.c:1413 ../src/core/sipe-ucs.c:395 msgid "Invalid contact search query" msgstr "Căutarea de contacte este invalidă" -#: ../src/core/sipe-buddy.c:2237 +#: ../src/core/sipe-buddy.c:2238 #, c-format msgid "Make leader of '%s'" msgstr "Setează lider pentru '%s'" -#: ../src/core/sipe-buddy.c:2250 +#: ../src/core/sipe-buddy.c:2251 #, c-format msgid "Remove from '%s'" msgstr "Elimină din '%s'" -#: ../src/core/sipe-buddy.c:2264 +#: ../src/core/sipe-buddy.c:2265 #, c-format msgid "Invite to '%s'" msgstr "Invită în '%s'" -#: ../src/core/sipe-buddy.c:2280 +#: ../src/core/sipe-buddy.c:2281 msgid "New chat" msgstr "Convorbire nouă" -#: ../src/core/sipe-buddy.c:2293 +#: ../src/core/sipe-buddy.c:2294 msgid "Work" msgstr "Muncă" -#: ../src/core/sipe-buddy.c:2308 +#: ../src/core/sipe-buddy.c:2309 msgid "Home" msgstr "Acasă" -#: ../src/core/sipe-buddy.c:2316 +#: ../src/core/sipe-buddy.c:2317 msgid "Other" msgstr "Altceva" -#: ../src/core/sipe-buddy.c:2324 +#: ../src/core/sipe-buddy.c:2325 msgid "Custom1" msgstr "Personalizat1" -#: ../src/core/sipe-buddy.c:2334 +#: ../src/core/sipe-buddy.c:2335 msgid "Send email..." msgstr "Trimite e-mail" -#: ../src/core/sipe-cal.c:907 +#: ../src/core/sipe-cal.c:906 msgid "Free" msgstr "Liber" -#: ../src/core/sipe-cal.c:908 +#: ../src/core/sipe-cal.c:907 msgid "Tentative" msgstr "Încerc" #. SIPE_ACTIVITY_BUSY -#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:59 +#: ../src/core/sipe-cal.c:908 ../src/core/sipe-status.c:57 msgid "Busy" msgstr "Ocupat" #. SIPE_ACTIVITY_OOF -#: ../src/core/sipe-cal.c:910 ../src/core/sipe-status.c:70 +#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:68 msgid "Out of office" msgstr "În afara serviciului" -#: ../src/core/sipe-cal.c:911 +#: ../src/core/sipe-cal.c:910 msgid "No data" msgstr "Nu există date" -#: ../src/core/sipe-cal.c:1019 ../src/core/sipe-cal.c:1046 +#: ../src/core/sipe-cal.c:1018 ../src/core/sipe-cal.c:1045 #, c-format msgid "Currently %s" msgstr "Momentan %s" -#: ../src/core/sipe-cal.c:1025 +#: ../src/core/sipe-cal.c:1024 msgid "Outside of working hours for next 8 hours" msgstr "În afara programului de lucru pentru următoarele 8 ore" -#: ../src/core/sipe-cal.c:1027 +#: ../src/core/sipe-cal.c:1026 #, c-format msgid "%s for next 8 hours" msgstr "%s pentru următoarele 8 ore" -#: ../src/core/sipe-cal.c:1036 +#: ../src/core/sipe-cal.c:1035 msgid "Not working" msgstr "Nu lucrez" -#: ../src/core/sipe-cal.c:1040 +#: ../src/core/sipe-cal.c:1039 #, c-format msgid "%s until %.2d:%.2d" msgstr "%s până la %.2d:%.2d" -#: ../src/core/sipe-cal.c:1048 +#: ../src/core/sipe-cal.c:1047 #, c-format msgid "%s. Outside of working hours at %.2d:%.2d" msgstr "%s. În afara orelor de serviciu la %.2d:%.2d" -#: ../src/core/sipe-cal.c:1053 +#: ../src/core/sipe-cal.c:1052 #, c-format msgid "%s. %s at %.2d:%.2d" msgstr "%s. %s la %.2d:%.2d" @@ -244,7 +269,7 @@ msgstr "Cererea pentru ticketul web către %s a eșuat" #. Generate next ID -#: ../src/core/sipe-chat.c:240 +#: ../src/core/sipe-chat.c:246 #, c-format msgid "Chat #%d" msgstr "Conversație #%d" @@ -271,123 +296,115 @@ msgid "Incomplete conference information provided" msgstr "" -#: ../src/core/sipe-conf.c:1041 +#: ../src/core/sipe-conf.c:1106 msgid "" "\n" "\n" "As this client was not compiled with voice call support, if you accept, you will be able to contact the other participants only via IM session." msgstr "\n\nDeoarece clientul a fost compilat fără suport audio, în cazul în care acceptați, veți putea contacta pe ceilalți participanți doar prin mesaje scrise." -#: ../src/core/sipe-conf.c:1049 +#: ../src/core/sipe-conf.c:1111 #, c-format -msgid "%s wants to invite you to the conference call%s" -msgstr "%s dorește să vă invite într-un apel de tip conferință %s" - -#: ../src/core/sipe-conf.c:1063 -msgid "Accept" -msgstr "Acceptă" - -#: ../src/core/sipe-conf.c:1064 -msgid "Decline" -msgstr "Refuză" +msgid "wants to invite you to a conference call%s" +msgstr "" -#: ../src/core/sipe-conf.c:1345 +#: ../src/core/sipe-conf.c:1459 msgid "" "This conference is no longer locked. Additional participants can now join." msgstr "Această conferință nu mai este închisă. Alți participanți pot să se alăture începând de acum." -#: ../src/core/sipe-conf.c:1349 +#: ../src/core/sipe-conf.c:1463 msgid "" "This conference is locked. Nobody else can join the conference while it is " "locked." msgstr "Această conferință este închisă. Nimeni nu mai poate să se alăture până la deschidere." -#: ../src/core/sipe-conf.c:1382 +#: ../src/core/sipe-conf.c:1496 msgid "You have been disconnected from this conference." msgstr "Ați fost deconectat din această conferință" -#: ../src/core/sipe-conf.c:1542 +#: ../src/core/sipe-conf.c:1656 msgid "Dial-in info" msgstr "" -#: ../src/core/sipe-conf.c:1543 +#: ../src/core/sipe-conf.c:1657 msgid "Number" msgstr "" -#: ../src/core/sipe-conf.c:1545 +#: ../src/core/sipe-conf.c:1659 msgid "Conference ID" msgstr "" -#: ../src/core/sipe-conf.c:1547 +#: ../src/core/sipe-conf.c:1661 msgid "Meeting link" msgstr "" -#: ../src/core/sipe-conf.c:1549 +#: ../src/core/sipe-conf.c:1663 msgid "Organizer" msgstr "" -#: ../src/core/sipe-conf.c:1551 +#: ../src/core/sipe-conf.c:1665 msgid "Alternative dial-in numbers" msgstr "" #. The next 13 texts make up the SIPE about note text #. About note, part 1/13: introduction -#: ../src/core/sipe-core.c:220 +#: ../src/core/sipe-core.c:221 msgid "" "A third-party plugin implementing extended version of SIP/SIMPLE used by " "various products" msgstr "Un modul adițional care implementează o versiune extinsă a protocolului SIP/SIMPLE utilizat de diverse produse" #. About note, part 2/13: home page URL (label) -#: ../src/core/sipe-core.c:222 +#: ../src/core/sipe-core.c:223 msgid "Home Page" msgstr "Pagină de start" #. About note, part 3/13: support forum URL (label) -#: ../src/core/sipe-core.c:224 +#: ../src/core/sipe-core.c:225 msgid "Support" msgstr "Suport tehnic" #. About note, part 4/13: support forum name (hyperlink text) -#: ../src/core/sipe-core.c:226 +#: ../src/core/sipe-core.c:227 msgid "Help Forum" msgstr "Forum de ajutor" #. About note, part 5/13: bug tracker URL (label) -#: ../src/core/sipe-core.c:228 +#: ../src/core/sipe-core.c:229 msgid "Report Problems" msgstr "Raportați Probleme" #. About note, part 6/13: bug tracker URL (hyperlink text) -#: ../src/core/sipe-core.c:230 +#: ../src/core/sipe-core.c:231 msgid "Bug Tracker" msgstr "Urmărirea Erorilor" #. About note, part 7/13: translation service URL (label) -#: ../src/core/sipe-core.c:232 +#: ../src/core/sipe-core.c:233 msgid "Translations" msgstr "Traduceri" #. About note, part 8/13: license type (label) -#: ../src/core/sipe-core.c:234 +#: ../src/core/sipe-core.c:235 msgid "License" msgstr "Licență" #. About note, part 9/13: (REMOVED) #. About note, part 10/13: translation request, text before Transifex.com URL #. append a space if text is not empty -#: ../src/core/sipe-core.c:238 +#: ../src/core/sipe-core.c:239 msgid "Please help us to translate SIPE to your native language here at " msgstr "Vă rugăm să ne ajutați traducând SIPE în limba dvs. aici " #. About note, part 11/13: translation request, text after Transifex.com URL #. start with a space if text is not empty -#: ../src/core/sipe-core.c:241 +#: ../src/core/sipe-core.c:242 msgid " using convenient web interface" msgstr " folosind o interfață web prietenoasă" #. About note, part 12/13: author list (header) -#: ../src/core/sipe-core.c:243 +#: ../src/core/sipe-core.c:244 msgid "Authors" msgstr "Autori" @@ -395,15 +412,15 @@ #. PLEASE NOTE: do *NOT* simply translate the english original #. but write something similar to the following sentence: #. "Localization for (): " -#: ../src/core/sipe-core.c:248 +#: ../src/core/sipe-core.c:249 msgid "Original texts in English (en): SIPE developers" msgstr "Texte originale în engleză(en): dezvoltatorii SIPE" -#: ../src/core/sipe-core.c:269 +#: ../src/core/sipe-core.c:273 msgid "SIP Exchange user name contains invalid characters" msgstr "Numele de utilizator SIP Exchange conține caractere invalide" -#: ../src/core/sipe-core.c:277 ../src/purple/purple-buddy.c:485 +#: ../src/core/sipe-core.c:281 ../src/purple/purple-buddy.c:485 #: ../src/telepathy/telepathy-protocol.c:89 #: ../src/telepathy/telepathy-protocol.c:191 #, c-format @@ -412,21 +429,21 @@ "Example: user@company.com" msgstr "Numele de utilizator ar trebui să fie un URI valid de SIP\nExemplu: utilizator@companie.com" -#: ../src/core/sipe-core.c:284 +#: ../src/core/sipe-core.c:288 msgid "Password is required when Single Sign-On is not enabled" msgstr "Parola este necesară dacă opțiunea Single Sign-On nu este activată" -#: ../src/core/sipe-core.c:294 +#: ../src/core/sipe-core.c:298 msgid "" "Email address should be valid if provided\n" "Example: user@company.com" msgstr "Adresa de e-mail ar trebui să fie validă, dacă a fost introdusă\nExemplu: utilizator@companie.com" -#: ../src/core/sipe-core.c:303 +#: ../src/core/sipe-core.c:307 msgid "SIP Exchange user name contains whitespace" msgstr "Numele de utilizator SIP Exchange conține spații" -#: ../src/core/sipe-core.c:317 +#: ../src/core/sipe-core.c:321 msgid "" "Email services URL should be valid if provided\n" "Example: https://exchange.corp.com/EWS/Exchange.asmx\n" @@ -457,13 +474,13 @@ msgid "Could not create listen socket" msgstr "Nu s-a putut crea soclul de ascultare prin rețea" -#: ../src/core/sipe-ft-lync.c:757 ../src/core/sipe-media.c:1195 -#: ../src/core/sipe-media.c:1206 ../src/core/sipe-media.c:1284 -#: ../src/core/sipe-media.c:1740 +#: ../src/core/sipe-ft-lync.c:762 ../src/core/sipe-media.c:1328 +#: ../src/core/sipe-media.c:1339 ../src/core/sipe-media.c:1417 +#: ../src/core/sipe-media.c:1923 msgid "Error occurred" msgstr "" -#: ../src/core/sipe-ft-lync.c:758 +#: ../src/core/sipe-ft-lync.c:763 msgid "Error creating data stream" msgstr "" @@ -498,7 +515,7 @@ msgstr "Memorie insuficientă" #: ../src/core/sipe-group.c:168 ../src/core/sipe-notify.c:1163 -#: ../src/core/sipe-notify.c:1190 ../src/core/sipe-notify.c:1294 +#: ../src/core/sipe-notify.c:1197 ../src/core/sipe-notify.c:1301 #: ../src/purple/purple-search.c:128 msgid "Other Contacts" msgstr "Alte contacte" @@ -536,77 +553,77 @@ msgid "Failed to invite %s" msgstr "Nu s-a putut invita %s" -#: ../src/core/sipe-incoming.c:741 +#: ../src/core/sipe-incoming.c:754 #, c-format msgid "Received a message with unrecognized contents from %s" msgstr "S-a primit un mesaj cu conținut recunoscut de la %s" -#: ../src/core/sipe-media.c:835 ../src/core/sipe-media.c:1347 -#: ../src/core/sipe-media.c:1357 ../src/core/sipe-media.c:1721 -#: ../src/core/sipe-media.c:1741 +#: ../src/core/sipe-media.c:869 ../src/core/sipe-media.c:1483 +#: ../src/core/sipe-media.c:1493 ../src/core/sipe-media.c:1904 +#: ../src/core/sipe-media.c:1924 msgid "Unable to establish a call" msgstr "Nu s-a putut stabili apelul" -#: ../src/core/sipe-media.c:836 ../src/core/sipe-media.c:1722 +#: ../src/core/sipe-media.c:870 ../src/core/sipe-media.c:1905 msgid "Encryption settings of peer are incompatible with ours." msgstr "Configurarea de criptare a partenerului de conversație este incompatibilă cu a dvs." -#: ../src/core/sipe-media.c:929 +#: ../src/core/sipe-media.c:963 #, c-format msgid "User %s rejected call" msgstr "Utilizatorul %s a respins apelul" -#: ../src/core/sipe-media.c:930 +#: ../src/core/sipe-media.c:964 msgid "Call rejected" msgstr "Apel respins" -#: ../src/core/sipe-media.c:1196 ../src/core/sipe-media.c:1285 +#: ../src/core/sipe-media.c:1329 ../src/core/sipe-media.c:1418 msgid "Error creating audio stream" msgstr "Eroare la crearea semnalului audio" -#: ../src/core/sipe-media.c:1207 +#: ../src/core/sipe-media.c:1340 msgid "Error creating video stream" msgstr "Eroare la crearea semnalului video" -#: ../src/core/sipe-media.c:1251 ../src/purple/purple-chat.c:314 +#: ../src/core/sipe-media.c:1384 ../src/purple/purple-chat.c:329 msgid "Join conference call" msgstr "Sună în conferință" -#: ../src/core/sipe-media.c:1252 +#: ../src/core/sipe-media.c:1385 msgid "Conference calls are not supported on this server." msgstr "Acest server nu oferă suport pentru teleconferințe" -#: ../src/core/sipe-media.c:1348 +#: ../src/core/sipe-media.c:1484 msgid "Invalid phone number" msgstr "Număr de telefon invalid" -#: ../src/core/sipe-media.c:1358 +#: ../src/core/sipe-media.c:1494 msgid "Audio Test Service is not available." msgstr "Serviciul de testare a apelurilor audio este indisponibil" -#: ../src/core/sipe-media.c:1690 +#: ../src/core/sipe-media.c:1873 msgid "User unavailable" msgstr "Utilizator indisponibil" -#: ../src/core/sipe-media.c:1693 +#: ../src/core/sipe-media.c:1876 #, c-format msgid "%s does not want to be disturbed" msgstr "%s nu dorește să fie deranjat" -#: ../src/core/sipe-media.c:1695 +#: ../src/core/sipe-media.c:1878 #, c-format msgid "User %s is not available" msgstr "Utilizatorul %s nu este disponibil" -#: ../src/core/sipe-media.c:1704 +#: ../src/core/sipe-media.c:1887 msgid "Unsupported media type" msgstr "Tip nesuportat" -#: ../src/core/sipe-media.c:2062 +#: ../src/core/sipe-media.c:2246 msgid "Media error" msgstr "" -#: ../src/core/sipe-media.c:2063 +#: ../src/core/sipe-media.c:2247 msgid "Error while reading from stream" msgstr "" @@ -657,36 +674,36 @@ msgstr "Necunoscut" #. Translators: remove (clear) previously assigned access level -#: ../src/core/sipe-ocs2007.c:2571 +#: ../src/core/sipe-ocs2007.c:2570 msgid "Unspecify" msgstr "Elimină" -#: ../src/core/sipe-ocs2007.c:2590 +#: ../src/core/sipe-ocs2007.c:2589 msgid "People in my company" msgstr "Oameni din companie" -#: ../src/core/sipe-ocs2007.c:2600 +#: ../src/core/sipe-ocs2007.c:2599 msgid "People in domains connected with my company" msgstr "Oameni din domenii conectate cu compania mea" -#: ../src/core/sipe-ocs2007.c:2609 +#: ../src/core/sipe-ocs2007.c:2608 msgid "People in public domains" msgstr "Oameni din domenii publice" -#: ../src/core/sipe-ocs2007.c:2619 +#: ../src/core/sipe-ocs2007.c:2618 #, c-format msgid "People at %s" msgstr "Oameni de la %s" -#: ../src/core/sipe-ocs2007.c:2644 +#: ../src/core/sipe-ocs2007.c:2643 msgid "Add new domain..." msgstr "Adaugă domeniu nou..." -#: ../src/core/sipe-ocs2007.c:2673 +#: ../src/core/sipe-ocs2007.c:2672 msgid "Online help..." msgstr "Ajutor online" -#: ../src/core/sipe-ocs2007.c:2681 +#: ../src/core/sipe-ocs2007.c:2680 msgid "Access groups" msgstr "Grupuri de acces" @@ -698,49 +715,60 @@ #. SIPE_ACTIVITY_AVAILABLE #. SIPE_ACTIVITY_ONLINE #. SIPE_ACTIVITY_INACTIVE -#: ../src/core/sipe-status.c:58 +#: ../src/core/sipe-status.c:56 msgid "Inactive" msgstr "Inactiv" #. SIPE_ACTIVITY_BUSYIDLE -#: ../src/core/sipe-status.c:60 +#: ../src/core/sipe-status.c:58 msgid "Busy-Idle" msgstr "Ocupat-Absent" #. SIPE_ACTIVITY_DND #. SIPE_ACTIVITY_BRB -#: ../src/core/sipe-status.c:62 +#: ../src/core/sipe-status.c:60 msgid "Be right back" msgstr "Revin imediat" #. SIPE_ACTIVITY_AWAY #. SIPE_ACTIVITY_LUNCH -#: ../src/core/sipe-status.c:64 +#: ../src/core/sipe-status.c:62 msgid "Out to lunch" msgstr "La masă" #. SIPE_ACTIVITY_INVISIBLE #. SIPE_ACTIVITY_OFFLINE #. SIPE_ACTIVITY_ON_PHONE -#: ../src/core/sipe-status.c:67 +#: ../src/core/sipe-status.c:65 msgid "In a call" msgstr "Într-un apel" #. SIPE_ACTIVITY_IN_CONF -#: ../src/core/sipe-status.c:68 +#: ../src/core/sipe-status.c:66 msgid "In a conference" msgstr "Într-o conferință" #. SIPE_ACTIVITY_IN_MEETING -#: ../src/core/sipe-status.c:69 +#: ../src/core/sipe-status.c:67 msgid "In a meeting" msgstr "Într-o ședință" #. SIPE_ACTIVITY_URGENT_ONLY -#: ../src/core/sipe-status.c:71 +#: ../src/core/sipe-status.c:69 msgid "Urgent interruptions only" msgstr "Întrerupeți doar în caz de urgență" +#: ../src/core/sipe-subscriptions.c:189 +msgid "Presence subscription failed!" +msgstr "" + +#: ../src/core/sipe-subscriptions.c:190 +msgid "" +"One or more buddies will therefore permanently show as offline.\n" +"\n" +"Please check that there are no corrupted SIP URIs in your contacts list." +msgstr "" + #: ../src/core/sipe-ucs.c:674 msgid "UCS initialization failed!" msgstr "" @@ -893,15 +921,19 @@ msgid "Copy to" msgstr "Copiază în" -#: ../src/purple/purple-chat.c:295 +#: ../src/purple/purple-chat.c:310 msgid "Lock" msgstr "Blochează" -#: ../src/purple/purple-chat.c:300 +#: ../src/purple/purple-chat.c:315 msgid "Unlock" msgstr "Deblochează" -#: ../src/purple/purple-chat.c:321 +#: ../src/purple/purple-chat.c:338 +msgid "Show presentation" +msgstr "" + +#: ../src/purple/purple-chat.c:345 msgid "Meeting entry info" msgstr "" @@ -1153,26 +1185,30 @@ msgstr "Proxy pentru convorbiri de grup\n companie.com say utilizator@companie.com\n(lăsați liber pentru a se determina din numele de utilizator)" #: ../src/purple/purple-plugin-common.c:933 +msgid "Remote desktop client" +msgstr "" + +#: ../src/purple/purple-plugin-common.c:938 msgid "Media encryption" msgstr "" -#: ../src/purple/purple-plugin-common.c:934 +#: ../src/purple/purple-plugin-common.c:939 msgid "Obey server policy" msgstr "" -#: ../src/purple/purple-plugin-common.c:935 +#: ../src/purple/purple-plugin-common.c:940 msgid "Always" msgstr "" -#: ../src/purple/purple-plugin-common.c:936 +#: ../src/purple/purple-plugin-common.c:941 msgid "Optional" msgstr "" -#: ../src/purple/purple-plugin-common.c:937 +#: ../src/purple/purple-plugin-common.c:942 msgid "Disabled" msgstr "" -#: ../src/purple/purple-plugin-common.c:947 +#: ../src/purple/purple-plugin-common.c:952 msgid "" "Login\n" " user or DOMAIN\\user or\n" @@ -1221,27 +1257,27 @@ msgid "_Search" msgstr "_Caută" -#: ../src/purple/purple-transport.c:132 +#: ../src/purple/purple-transport.c:135 msgid "Read error" msgstr "Eroare la citire" -#: ../src/purple/purple-transport.c:136 -#: ../src/telepathy/telepathy-transport.c:96 +#: ../src/purple/purple-transport.c:139 +#: ../src/telepathy/telepathy-transport.c:95 msgid "Server has disconnected" msgstr "Serverul s-a deconectat" -#: ../src/purple/purple-transport.c:198 +#: ../src/purple/purple-transport.c:201 msgid "Could not connect" msgstr "Nu s-a putut conecta" -#: ../src/purple/purple-transport.c:268 +#: ../src/purple/purple-transport.c:271 msgid "Could not create SSL context" msgstr "Nu s-a putut stabili sesiunea SSL" -#: ../src/purple/purple-transport.c:290 +#: ../src/purple/purple-transport.c:293 msgid "Could not create socket" msgstr "Nu s-a putut crea slotul" -#: ../src/purple/purple-transport.c:381 +#: ../src/purple/purple-transport.c:417 msgid "Write error" msgstr "Eroare la scriere" diff -Nru pidgin-sipe-1.21.1/po/ru.po pidgin-sipe-1.22.1/po/ru.po --- pidgin-sipe-1.21.1/po/ru.po 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/po/ru.po 2017-06-11 15:41:22.000000000 +0000 @@ -11,13 +11,14 @@ # Stefan Becker , 2011 # Ivan Gromov , 2015 # G0LDEN_key , 2013,2015 +# Дмитрий Д. , 2017 msgid "" msgstr "" "Project-Id-Version: pidgin sipe\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/sipe/bugs/\n" "POT-Creation-Date: 2010-11-30 23:36+0200\n" -"PO-Revision-Date: 2016-05-28 15:08+0000\n" -"Last-Translator: Stefan Becker \n" +"PO-Revision-Date: 2017-06-06 08:29+0000\n" +"Last-Translator: Дмитрий Д. \n" "Language-Team: Russian (http://www.transifex.com/stefanb/pidgin-sipe/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,94 +26,119 @@ "Language: ru\n" "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" -#: ../src/core/sip-transport.c:235 +#: ../src/core/sip-transport.c:240 msgid "Failed to authenticate to server" msgstr "Не удалось проверить подлинность сервера" -#: ../src/core/sip-transport.c:293 +#: ../src/core/sip-transport.c:298 #, c-format msgid "Can't request certificate from %s" msgstr "Невозможно запросить сертификат от %s" -#: ../src/core/sip-transport.c:303 +#: ../src/core/sip-transport.c:308 msgid "No URI for certificate provisioning service provided" msgstr "Нет URI для сертификата" -#: ../src/core/sip-transport.c:1281 +#: ../src/core/sip-transport.c:1285 msgid "Authentication failed" msgstr "Ошибка аутентификации" -#: ../src/core/sip-transport.c:1338 +#: ../src/core/sip-transport.c:1342 msgid "Incompatible authentication scheme chosen" msgstr "Выбрана несовместимая схема проверки подлинности пользователя" -#: ../src/core/sip-transport.c:1355 ../src/core/sipe-notify.c:1149 +#: ../src/core/sip-transport.c:1359 ../src/core/sipe-notify.c:1149 #, c-format msgid "You have been rejected by the server: %s" msgstr "Вы были отклонены сервером: %s" -#: ../src/core/sip-transport.c:1356 ../src/core/sip-transport.c:1372 -#: ../src/core/sip-transport.c:1396 ../src/core/sip-transport.c:1420 +#: ../src/core/sip-transport.c:1360 ../src/core/sip-transport.c:1376 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 #: ../src/core/sipe-conf.c:265 ../src/core/sipe-notify.c:1149 msgid "no reason given" msgstr "причина не указана" -#: ../src/core/sip-transport.c:1371 +#: ../src/core/sip-transport.c:1375 #, c-format msgid "Not found: %s. Please contact your Administrator" msgstr "Не найден: %s. Пожалуйста, обратитесь к администратору" -#: ../src/core/sip-transport.c:1373 +#: ../src/core/sip-transport.c:1377 msgid "SIP is either not enabled for the destination URI or it does not exist" msgstr "SIP-адрес либо не включен для URI назначения либо не существует" -#: ../src/core/sip-transport.c:1396 ../src/core/sip-transport.c:1420 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 #, c-format msgid "Service unavailable: %s" msgstr "Сервис недоступен: %s" -#: ../src/core/sip-transport.c:1766 +#: ../src/core/sip-transport.c:1775 msgid "Corrupted message received" msgstr "Получено искажённое сообщение" -#: ../src/core/sip-transport.c:1790 +#: ../src/core/sip-transport.c:1799 msgid "Invalid message signature received" msgstr "Получена недопустимая подпись сообщения" -#: ../src/core/sipe-buddy.c:540 ../src/core/sipe-buddy.c:2300 +#: ../src/core/sipe-appshare.c:458 +#, c-format +msgid "%s wants to start presenting" +msgstr "%s желает начать презентацию" + +#: ../src/core/sipe-appshare.c:462 ../src/core/sipe-conf.c:1086 +msgid "Accept" +msgstr "Принять" + +#: ../src/core/sipe-appshare.c:463 ../src/core/sipe-conf.c:1087 +msgid "Decline" +msgstr "Отклонить" + +#: ../src/core/sipe-appshare.c:501 ../src/core/sipe-appshare.c:599 +msgid "Application sharing error" +msgstr "" + +#: ../src/core/sipe-appshare.c:502 +msgid "Unknown remote desktop client configured." +msgstr "" + +#: ../src/core/sipe-appshare.c:600 +msgid "Couldn't connect application sharing" +msgstr "" + +#: ../src/core/sipe-buddy.c:541 ../src/core/sipe-buddy.c:2301 msgid "Mobile" msgstr "Мобильный" -#: ../src/core/sipe-buddy.c:828 +#: ../src/core/sipe-buddy.c:829 msgid "Status" msgstr "Состояние" -#: ../src/core/sipe-buddy.c:831 +#: ../src/core/sipe-buddy.c:832 msgid "Calendar" msgstr "Календарь" -#: ../src/core/sipe-buddy.c:836 +#: ../src/core/sipe-buddy.c:837 msgid "Meeting in" msgstr "Место собрания" -#: ../src/core/sipe-buddy.c:840 +#: ../src/core/sipe-buddy.c:841 msgid "Meeting about" msgstr "Тема собрания" -#: ../src/core/sipe-buddy.c:845 +#: ../src/core/sipe-buddy.c:846 msgid "Out of office note" msgstr "Сообщение \"Нет на работе\"" -#: ../src/core/sipe-buddy.c:845 +#: ../src/core/sipe-buddy.c:846 msgid "Note" msgstr "Личное сообщение" -#: ../src/core/sipe-buddy.c:850 ../src/core/sipe-buddy.c:2345 +#: ../src/core/sipe-buddy.c:851 ../src/core/sipe-buddy.c:2346 #: ../src/purple/purple-buddy.c:633 msgid "Access level" msgstr "Уровень доступа" -#: ../src/core/sipe-buddy.c:1073 +#: ../src/core/sipe-buddy.c:1074 #, c-format msgid "Found %d contact%s:" msgid_plural "Found %d contacts%s:" @@ -121,119 +147,119 @@ msgstr[2] "Найдены %d другие контакты %s :" msgstr[3] "Найдены %d другие контакты %s :" -#: ../src/core/sipe-buddy.c:1075 +#: ../src/core/sipe-buddy.c:1076 msgid " (more matched your query)" msgstr " (большее соответствие вашему запросу)" -#: ../src/core/sipe-buddy.c:1121 ../src/core/sipe-buddy.c:1259 +#: ../src/core/sipe-buddy.c:1122 ../src/core/sipe-buddy.c:1260 #: ../src/core/sipe-ucs.c:314 msgid "No contacts found" msgstr "Контакты не найдены" -#: ../src/core/sipe-buddy.c:1134 ../src/core/sipe-buddy.c:1272 +#: ../src/core/sipe-buddy.c:1135 ../src/core/sipe-buddy.c:1273 #: ../src/core/sipe-ucs.c:278 msgid "Unable to display the search results" msgstr "Не удается отобразить результаты поиска" -#: ../src/core/sipe-buddy.c:1237 ../src/core/sipe-buddy.c:1249 +#: ../src/core/sipe-buddy.c:1238 ../src/core/sipe-buddy.c:1250 #: ../src/core/sipe-ucs.c:391 msgid "Contact search failed" msgstr "Поиск контактов неудачен" -#: ../src/core/sipe-buddy.c:1412 ../src/core/sipe-ucs.c:395 +#: ../src/core/sipe-buddy.c:1413 ../src/core/sipe-ucs.c:395 msgid "Invalid contact search query" msgstr "Неверный запрос поиска контакта" -#: ../src/core/sipe-buddy.c:2237 +#: ../src/core/sipe-buddy.c:2238 #, c-format msgid "Make leader of '%s'" msgstr "Сделать ведущим '%s'" -#: ../src/core/sipe-buddy.c:2250 +#: ../src/core/sipe-buddy.c:2251 #, c-format msgid "Remove from '%s'" msgstr "Удалить из '%s'" -#: ../src/core/sipe-buddy.c:2264 +#: ../src/core/sipe-buddy.c:2265 #, c-format msgid "Invite to '%s'" msgstr "Пригласить в '%s'" -#: ../src/core/sipe-buddy.c:2280 +#: ../src/core/sipe-buddy.c:2281 msgid "New chat" msgstr "Новый чат" -#: ../src/core/sipe-buddy.c:2293 +#: ../src/core/sipe-buddy.c:2294 msgid "Work" msgstr "Рабочий" -#: ../src/core/sipe-buddy.c:2308 +#: ../src/core/sipe-buddy.c:2309 msgid "Home" msgstr "Домашняя страница" -#: ../src/core/sipe-buddy.c:2316 +#: ../src/core/sipe-buddy.c:2317 msgid "Other" msgstr "Другой" -#: ../src/core/sipe-buddy.c:2324 +#: ../src/core/sipe-buddy.c:2325 msgid "Custom1" msgstr "Свой тип" -#: ../src/core/sipe-buddy.c:2334 +#: ../src/core/sipe-buddy.c:2335 msgid "Send email..." msgstr "Отправить сообщение электронной почты..." -#: ../src/core/sipe-cal.c:907 +#: ../src/core/sipe-cal.c:906 msgid "Free" msgstr "Свободен" -#: ../src/core/sipe-cal.c:908 +#: ../src/core/sipe-cal.c:907 msgid "Tentative" msgstr "Под вопросом" #. SIPE_ACTIVITY_BUSY -#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:59 +#: ../src/core/sipe-cal.c:908 ../src/core/sipe-status.c:57 msgid "Busy" msgstr "Занят" #. SIPE_ACTIVITY_OOF -#: ../src/core/sipe-cal.c:910 ../src/core/sipe-status.c:70 +#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:68 msgid "Out of office" msgstr "Нет на месте" -#: ../src/core/sipe-cal.c:911 +#: ../src/core/sipe-cal.c:910 msgid "No data" msgstr "Нет данных" -#: ../src/core/sipe-cal.c:1019 ../src/core/sipe-cal.c:1046 +#: ../src/core/sipe-cal.c:1018 ../src/core/sipe-cal.c:1045 #, c-format msgid "Currently %s" msgstr "в настоящий момент %s" -#: ../src/core/sipe-cal.c:1025 +#: ../src/core/sipe-cal.c:1024 msgid "Outside of working hours for next 8 hours" msgstr "Нерабочее время в течение следующих 8 часов" -#: ../src/core/sipe-cal.c:1027 +#: ../src/core/sipe-cal.c:1026 #, c-format msgid "%s for next 8 hours" msgstr "%s в течение следующих 8 часов" -#: ../src/core/sipe-cal.c:1036 +#: ../src/core/sipe-cal.c:1035 msgid "Not working" msgstr "не работаю" -#: ../src/core/sipe-cal.c:1040 +#: ../src/core/sipe-cal.c:1039 #, c-format msgid "%s until %.2d:%.2d" msgstr "%s до %.2d:%.2d" -#: ../src/core/sipe-cal.c:1048 +#: ../src/core/sipe-cal.c:1047 #, c-format msgid "%s. Outside of working hours at %.2d:%.2d" msgstr "%s. Нерабочее время в %.2d:%.2d" -#: ../src/core/sipe-cal.c:1053 +#: ../src/core/sipe-cal.c:1052 #, c-format msgid "%s. %s at %.2d:%.2d" msgstr "%s. %s в %.2d:%.2d" @@ -249,7 +275,7 @@ msgstr "Не удачный запрос вебтикета %s " #. Generate next ID -#: ../src/core/sipe-chat.c:240 +#: ../src/core/sipe-chat.c:246 #, c-format msgid "Chat #%d" msgstr "Чат #%d" @@ -276,123 +302,115 @@ msgid "Incomplete conference information provided" msgstr "Предоставлена неполная информация о конференции" -#: ../src/core/sipe-conf.c:1041 +#: ../src/core/sipe-conf.c:1106 msgid "" "\n" "\n" "As this client was not compiled with voice call support, if you accept, you will be able to contact the other participants only via IM session." msgstr "\n\nДанное приложение не поддерживает голосовых звонков, если вы согласитесь, вы будете иметь возможность связаться с другими участниками только через сеанс обмена мгновенными сообщениями." -#: ../src/core/sipe-conf.c:1049 +#: ../src/core/sipe-conf.c:1111 #, c-format -msgid "%s wants to invite you to the conference call%s" -msgstr "%s хочет пригласить вас на конференцию %s " - -#: ../src/core/sipe-conf.c:1063 -msgid "Accept" -msgstr "Принять" - -#: ../src/core/sipe-conf.c:1064 -msgid "Decline" -msgstr "Отклонить" +msgid "wants to invite you to a conference call%s" +msgstr "хочет пригласить вас на конференцию %s" -#: ../src/core/sipe-conf.c:1345 +#: ../src/core/sipe-conf.c:1459 msgid "" "This conference is no longer locked. Additional participants can now join." msgstr "Конференция разблокирована. Новые участники могут присоединиться." -#: ../src/core/sipe-conf.c:1349 +#: ../src/core/sipe-conf.c:1463 msgid "" "This conference is locked. Nobody else can join the conference while it is " "locked." msgstr "Конференция заблокирована. Пока доступ к конференции заблокирован, к ней не могут присоединяться новые участники." -#: ../src/core/sipe-conf.c:1382 +#: ../src/core/sipe-conf.c:1496 msgid "You have been disconnected from this conference." msgstr "Ведущий конференции удалил вас из конференции." -#: ../src/core/sipe-conf.c:1542 +#: ../src/core/sipe-conf.c:1656 msgid "Dial-in info" msgstr "Информация о подключении по телефону" -#: ../src/core/sipe-conf.c:1543 +#: ../src/core/sipe-conf.c:1657 msgid "Number" msgstr "Номер" -#: ../src/core/sipe-conf.c:1545 +#: ../src/core/sipe-conf.c:1659 msgid "Conference ID" msgstr "Идентификатор конференции" -#: ../src/core/sipe-conf.c:1547 +#: ../src/core/sipe-conf.c:1661 msgid "Meeting link" msgstr "Сылка на собрание" -#: ../src/core/sipe-conf.c:1549 +#: ../src/core/sipe-conf.c:1663 msgid "Organizer" msgstr "Организатор" -#: ../src/core/sipe-conf.c:1551 +#: ../src/core/sipe-conf.c:1665 msgid "Alternative dial-in numbers" msgstr "Другие номера для дозвона" #. The next 13 texts make up the SIPE about note text #. About note, part 1/13: introduction -#: ../src/core/sipe-core.c:220 +#: ../src/core/sipe-core.c:221 msgid "" "A third-party plugin implementing extended version of SIP/SIMPLE used by " "various products" msgstr "Независимый плагин реализующий расширенную версию SIP/SIMPLE используемую в таких продуктах, как" #. About note, part 2/13: home page URL (label) -#: ../src/core/sipe-core.c:222 +#: ../src/core/sipe-core.c:223 msgid "Home Page" msgstr "Домашняя страничка" #. About note, part 3/13: support forum URL (label) -#: ../src/core/sipe-core.c:224 +#: ../src/core/sipe-core.c:225 msgid "Support" msgstr "Поддержка" #. About note, part 4/13: support forum name (hyperlink text) -#: ../src/core/sipe-core.c:226 +#: ../src/core/sipe-core.c:227 msgid "Help Forum" msgstr "Форум" #. About note, part 5/13: bug tracker URL (label) -#: ../src/core/sipe-core.c:228 +#: ../src/core/sipe-core.c:229 msgid "Report Problems" msgstr "Сообщить о проблеме" #. About note, part 6/13: bug tracker URL (hyperlink text) -#: ../src/core/sipe-core.c:230 +#: ../src/core/sipe-core.c:231 msgid "Bug Tracker" msgstr "База дефектов" #. About note, part 7/13: translation service URL (label) -#: ../src/core/sipe-core.c:232 +#: ../src/core/sipe-core.c:233 msgid "Translations" msgstr "Страница локализации" #. About note, part 8/13: license type (label) -#: ../src/core/sipe-core.c:234 +#: ../src/core/sipe-core.c:235 msgid "License" msgstr "Лицензия" #. About note, part 9/13: (REMOVED) #. About note, part 10/13: translation request, text before Transifex.com URL #. append a space if text is not empty -#: ../src/core/sipe-core.c:238 +#: ../src/core/sipe-core.c:239 msgid "Please help us to translate SIPE to your native language here at " msgstr "Пожалуйста, помогите нам перевести SIPE на Ваш родной язык здесь " #. About note, part 11/13: translation request, text after Transifex.com URL #. start with a space if text is not empty -#: ../src/core/sipe-core.c:241 +#: ../src/core/sipe-core.c:242 msgid " using convenient web interface" msgstr " с помощью удобного веб-интерфейса" #. About note, part 12/13: author list (header) -#: ../src/core/sipe-core.c:243 +#: ../src/core/sipe-core.c:244 msgid "Authors" msgstr "Авторы" @@ -400,15 +418,15 @@ #. PLEASE NOTE: do *NOT* simply translate the english original #. but write something similar to the following sentence: #. "Localization for (): " -#: ../src/core/sipe-core.c:248 +#: ../src/core/sipe-core.c:249 msgid "Original texts in English (en): SIPE developers" msgstr "Русский перевод (ru): pier11" -#: ../src/core/sipe-core.c:269 +#: ../src/core/sipe-core.c:273 msgid "SIP Exchange user name contains invalid characters" msgstr "Имя пользователя содержит недопустимые символы" -#: ../src/core/sipe-core.c:277 ../src/purple/purple-buddy.c:485 +#: ../src/core/sipe-core.c:281 ../src/purple/purple-buddy.c:485 #: ../src/telepathy/telepathy-protocol.c:89 #: ../src/telepathy/telepathy-protocol.c:191 #, c-format @@ -417,21 +435,21 @@ "Example: user@company.com" msgstr "Имя пользователя должно быть верным SIP URI\nПример: user@company.com" -#: ../src/core/sipe-core.c:284 +#: ../src/core/sipe-core.c:288 msgid "Password is required when Single Sign-On is not enabled" msgstr "Если не включен Single Sign-On, требуется пароль" -#: ../src/core/sipe-core.c:294 +#: ../src/core/sipe-core.c:298 msgid "" "Email address should be valid if provided\n" "Example: user@company.com" msgstr "Адрес электронной почты должен быть верным если введен\nПример: user@company.com" -#: ../src/core/sipe-core.c:303 +#: ../src/core/sipe-core.c:307 msgid "SIP Exchange user name contains whitespace" msgstr "Имя пользователя не может содержать пробелы" -#: ../src/core/sipe-core.c:317 +#: ../src/core/sipe-core.c:321 msgid "" "Email services URL should be valid if provided\n" "Example: https://exchange.corp.com/EWS/Exchange.asmx\n" @@ -462,13 +480,13 @@ msgid "Could not create listen socket" msgstr "Не удалось создать сокет для прослушивания" -#: ../src/core/sipe-ft-lync.c:757 ../src/core/sipe-media.c:1195 -#: ../src/core/sipe-media.c:1206 ../src/core/sipe-media.c:1284 -#: ../src/core/sipe-media.c:1740 +#: ../src/core/sipe-ft-lync.c:762 ../src/core/sipe-media.c:1328 +#: ../src/core/sipe-media.c:1339 ../src/core/sipe-media.c:1417 +#: ../src/core/sipe-media.c:1923 msgid "Error occurred" msgstr "Произошла ошибка" -#: ../src/core/sipe-ft-lync.c:758 +#: ../src/core/sipe-ft-lync.c:763 msgid "Error creating data stream" msgstr "Ошибка при создании потока данных" @@ -503,7 +521,7 @@ msgstr "Недостаточно памяти" #: ../src/core/sipe-group.c:168 ../src/core/sipe-notify.c:1163 -#: ../src/core/sipe-notify.c:1190 ../src/core/sipe-notify.c:1294 +#: ../src/core/sipe-notify.c:1197 ../src/core/sipe-notify.c:1301 #: ../src/purple/purple-search.c:128 msgid "Other Contacts" msgstr "Другие контакты" @@ -541,77 +559,77 @@ msgid "Failed to invite %s" msgstr "Не удалось пригласить %s" -#: ../src/core/sipe-incoming.c:741 +#: ../src/core/sipe-incoming.c:754 #, c-format msgid "Received a message with unrecognized contents from %s" msgstr "Поступило сообщение неподдерживаемого типа от %s" -#: ../src/core/sipe-media.c:835 ../src/core/sipe-media.c:1347 -#: ../src/core/sipe-media.c:1357 ../src/core/sipe-media.c:1721 -#: ../src/core/sipe-media.c:1741 +#: ../src/core/sipe-media.c:869 ../src/core/sipe-media.c:1483 +#: ../src/core/sipe-media.c:1493 ../src/core/sipe-media.c:1904 +#: ../src/core/sipe-media.c:1924 msgid "Unable to establish a call" msgstr "Не удалось сделать вызов" -#: ../src/core/sipe-media.c:836 ../src/core/sipe-media.c:1722 +#: ../src/core/sipe-media.c:870 ../src/core/sipe-media.c:1905 msgid "Encryption settings of peer are incompatible with ours." msgstr "Настройки шифрования собеседника несовместимы с нашими." -#: ../src/core/sipe-media.c:929 +#: ../src/core/sipe-media.c:963 #, c-format msgid "User %s rejected call" msgstr "Пользователь %s отклонил вызов" -#: ../src/core/sipe-media.c:930 +#: ../src/core/sipe-media.c:964 msgid "Call rejected" msgstr "Вызов отклонен" -#: ../src/core/sipe-media.c:1196 ../src/core/sipe-media.c:1285 +#: ../src/core/sipe-media.c:1329 ../src/core/sipe-media.c:1418 msgid "Error creating audio stream" msgstr "Ошибка при создании аудио потокa" -#: ../src/core/sipe-media.c:1207 +#: ../src/core/sipe-media.c:1340 msgid "Error creating video stream" msgstr "Ошибка при создании видео потокa" -#: ../src/core/sipe-media.c:1251 ../src/purple/purple-chat.c:314 +#: ../src/core/sipe-media.c:1384 ../src/purple/purple-chat.c:329 msgid "Join conference call" msgstr "Присоединиться к конференции" -#: ../src/core/sipe-media.c:1252 +#: ../src/core/sipe-media.c:1385 msgid "Conference calls are not supported on this server." msgstr "Этот сервер не поддерживает конференции" -#: ../src/core/sipe-media.c:1348 +#: ../src/core/sipe-media.c:1484 msgid "Invalid phone number" msgstr "Неверный номер телефона" -#: ../src/core/sipe-media.c:1358 +#: ../src/core/sipe-media.c:1494 msgid "Audio Test Service is not available." msgstr "Служба аудиотеста недоступна" -#: ../src/core/sipe-media.c:1690 +#: ../src/core/sipe-media.c:1873 msgid "User unavailable" msgstr "Пользователь недоступен" -#: ../src/core/sipe-media.c:1693 +#: ../src/core/sipe-media.c:1876 #, c-format msgid "%s does not want to be disturbed" msgstr "%s не хочет, чтобы его беспокоили" -#: ../src/core/sipe-media.c:1695 +#: ../src/core/sipe-media.c:1878 #, c-format msgid "User %s is not available" msgstr "Пользователь %s недоступен" -#: ../src/core/sipe-media.c:1704 +#: ../src/core/sipe-media.c:1887 msgid "Unsupported media type" msgstr "Неподдерживаемый тип носителя" -#: ../src/core/sipe-media.c:2062 +#: ../src/core/sipe-media.c:2246 msgid "Media error" msgstr "Ошибка данных" -#: ../src/core/sipe-media.c:2063 +#: ../src/core/sipe-media.c:2247 msgid "Error while reading from stream" msgstr "Ошибка чтения из потока" @@ -662,36 +680,36 @@ msgstr "Неизвестный" #. Translators: remove (clear) previously assigned access level -#: ../src/core/sipe-ocs2007.c:2571 +#: ../src/core/sipe-ocs2007.c:2570 msgid "Unspecify" msgstr "Не определять" -#: ../src/core/sipe-ocs2007.c:2590 +#: ../src/core/sipe-ocs2007.c:2589 msgid "People in my company" msgstr "Пользователи в моей организации" -#: ../src/core/sipe-ocs2007.c:2600 +#: ../src/core/sipe-ocs2007.c:2599 msgid "People in domains connected with my company" msgstr "Пользователи в доменах, подключенных к моей организации" -#: ../src/core/sipe-ocs2007.c:2609 +#: ../src/core/sipe-ocs2007.c:2608 msgid "People in public domains" msgstr "Пользователи в общедоступных доменах" -#: ../src/core/sipe-ocs2007.c:2619 +#: ../src/core/sipe-ocs2007.c:2618 #, c-format msgid "People at %s" msgstr "Пользователи в %s" -#: ../src/core/sipe-ocs2007.c:2644 +#: ../src/core/sipe-ocs2007.c:2643 msgid "Add new domain..." msgstr "Добавить новый домен..." -#: ../src/core/sipe-ocs2007.c:2673 +#: ../src/core/sipe-ocs2007.c:2672 msgid "Online help..." msgstr "Онлайн помощь..." -#: ../src/core/sipe-ocs2007.c:2681 +#: ../src/core/sipe-ocs2007.c:2680 msgid "Access groups" msgstr "Группы доступа" @@ -703,49 +721,60 @@ #. SIPE_ACTIVITY_AVAILABLE #. SIPE_ACTIVITY_ONLINE #. SIPE_ACTIVITY_INACTIVE -#: ../src/core/sipe-status.c:58 +#: ../src/core/sipe-status.c:56 msgid "Inactive" msgstr "Неактивен" #. SIPE_ACTIVITY_BUSYIDLE -#: ../src/core/sipe-status.c:60 +#: ../src/core/sipe-status.c:58 msgid "Busy-Idle" msgstr "Занят-Неактивен" #. SIPE_ACTIVITY_DND #. SIPE_ACTIVITY_BRB -#: ../src/core/sipe-status.c:62 +#: ../src/core/sipe-status.c:60 msgid "Be right back" msgstr "Скоро вернусь" #. SIPE_ACTIVITY_AWAY #. SIPE_ACTIVITY_LUNCH -#: ../src/core/sipe-status.c:64 +#: ../src/core/sipe-status.c:62 msgid "Out to lunch" msgstr "На обеде" #. SIPE_ACTIVITY_INVISIBLE #. SIPE_ACTIVITY_OFFLINE #. SIPE_ACTIVITY_ON_PHONE -#: ../src/core/sipe-status.c:67 +#: ../src/core/sipe-status.c:65 msgid "In a call" msgstr "Говорю по телефону" #. SIPE_ACTIVITY_IN_CONF -#: ../src/core/sipe-status.c:68 +#: ../src/core/sipe-status.c:66 msgid "In a conference" msgstr "На конференции" #. SIPE_ACTIVITY_IN_MEETING -#: ../src/core/sipe-status.c:69 +#: ../src/core/sipe-status.c:67 msgid "In a meeting" msgstr "На собрании" #. SIPE_ACTIVITY_URGENT_ONLY -#: ../src/core/sipe-status.c:71 +#: ../src/core/sipe-status.c:69 msgid "Urgent interruptions only" msgstr "Беспокоить только по срочным делам" +#: ../src/core/sipe-subscriptions.c:189 +msgid "Presence subscription failed!" +msgstr "" + +#: ../src/core/sipe-subscriptions.c:190 +msgid "" +"One or more buddies will therefore permanently show as offline.\n" +"\n" +"Please check that there are no corrupted SIP URIs in your contacts list." +msgstr "" + #: ../src/core/sipe-ucs.c:674 msgid "UCS initialization failed!" msgstr "Ошибка инициализации USC." @@ -898,15 +927,19 @@ msgid "Copy to" msgstr "Скопировать в" -#: ../src/purple/purple-chat.c:295 +#: ../src/purple/purple-chat.c:310 msgid "Lock" msgstr "Заблокировать" -#: ../src/purple/purple-chat.c:300 +#: ../src/purple/purple-chat.c:315 msgid "Unlock" msgstr "Разблокировать" -#: ../src/purple/purple-chat.c:321 +#: ../src/purple/purple-chat.c:338 +msgid "Show presentation" +msgstr "Показать презентацию" + +#: ../src/purple/purple-chat.c:345 msgid "Meeting entry info" msgstr "Информация о собрании" @@ -1158,26 +1191,30 @@ msgstr "Прокси пруппового чата \ncompany.com или user@company.com \n(оставьте пустым, чтобы использовать \"Имя пользователя\")" #: ../src/purple/purple-plugin-common.c:933 +msgid "Remote desktop client" +msgstr "Клиент удалённого рабочего стола" + +#: ../src/purple/purple-plugin-common.c:938 msgid "Media encryption" msgstr "Шифрование данных" -#: ../src/purple/purple-plugin-common.c:934 +#: ../src/purple/purple-plugin-common.c:939 msgid "Obey server policy" msgstr "Следовать политике сервера" -#: ../src/purple/purple-plugin-common.c:935 +#: ../src/purple/purple-plugin-common.c:940 msgid "Always" msgstr "Всегда" -#: ../src/purple/purple-plugin-common.c:936 +#: ../src/purple/purple-plugin-common.c:941 msgid "Optional" msgstr "Не обязательно" -#: ../src/purple/purple-plugin-common.c:937 +#: ../src/purple/purple-plugin-common.c:942 msgid "Disabled" msgstr "Отключен" -#: ../src/purple/purple-plugin-common.c:947 +#: ../src/purple/purple-plugin-common.c:952 msgid "" "Login\n" " user or DOMAIN\\user or\n" @@ -1226,27 +1263,27 @@ msgid "_Search" msgstr "_Искать" -#: ../src/purple/purple-transport.c:132 +#: ../src/purple/purple-transport.c:135 msgid "Read error" msgstr "Ошибка чтения" -#: ../src/purple/purple-transport.c:136 -#: ../src/telepathy/telepathy-transport.c:96 +#: ../src/purple/purple-transport.c:139 +#: ../src/telepathy/telepathy-transport.c:95 msgid "Server has disconnected" msgstr "Сервер прервал соединение" -#: ../src/purple/purple-transport.c:198 +#: ../src/purple/purple-transport.c:201 msgid "Could not connect" msgstr "Не удалось установить соединение" -#: ../src/purple/purple-transport.c:268 +#: ../src/purple/purple-transport.c:271 msgid "Could not create SSL context" msgstr "Не удалось создать контекст SSL" -#: ../src/purple/purple-transport.c:290 +#: ../src/purple/purple-transport.c:293 msgid "Could not create socket" msgstr "Не удалось создать сокет" -#: ../src/purple/purple-transport.c:381 +#: ../src/purple/purple-transport.c:417 msgid "Write error" msgstr "Ошибка записи" diff -Nru pidgin-sipe-1.21.1/po/sv.po pidgin-sipe-1.22.1/po/sv.po --- pidgin-sipe-1.21.1/po/sv.po 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/po/sv.po 2017-06-11 15:41:22.000000000 +0000 @@ -5,7 +5,7 @@ # # # Translators: -# Göran Uddeborg , 2014-2015 +# Göran Uddeborg , 2014-2015,2017 # Karl-Johan Karlsson , 2015-2016 # Stefan Becker , 2011 msgid "" @@ -13,8 +13,8 @@ "Project-Id-Version: pidgin sipe\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/sipe/bugs/\n" "POT-Creation-Date: 2010-11-30 23:36+0200\n" -"PO-Revision-Date: 2016-05-28 15:08+0000\n" -"Last-Translator: Stefan Becker \n" +"PO-Revision-Date: 2017-02-11 11:02+0000\n" +"Last-Translator: Göran Uddeborg \n" "Language-Team: Swedish (http://www.transifex.com/stefanb/pidgin-sipe/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,213 +22,238 @@ "Language: sv\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../src/core/sip-transport.c:235 +#: ../src/core/sip-transport.c:240 msgid "Failed to authenticate to server" msgstr "Misslyckades att autentisera till servern" -#: ../src/core/sip-transport.c:293 +#: ../src/core/sip-transport.c:298 #, c-format msgid "Can't request certificate from %s" msgstr "Kan inte begära certifikat ifrån %s" -#: ../src/core/sip-transport.c:303 +#: ../src/core/sip-transport.c:308 msgid "No URI for certificate provisioning service provided" msgstr "Ingen URI för tjänsten som tillhandahåller certifikat gavs" -#: ../src/core/sip-transport.c:1281 +#: ../src/core/sip-transport.c:1285 msgid "Authentication failed" msgstr "Autentiseringen misslyckades" -#: ../src/core/sip-transport.c:1338 +#: ../src/core/sip-transport.c:1342 msgid "Incompatible authentication scheme chosen" msgstr "Inkompatibelt autentiseringsschema valt" -#: ../src/core/sip-transport.c:1355 ../src/core/sipe-notify.c:1149 +#: ../src/core/sip-transport.c:1359 ../src/core/sipe-notify.c:1149 #, c-format msgid "You have been rejected by the server: %s" msgstr "Du nekades av servern: %s" -#: ../src/core/sip-transport.c:1356 ../src/core/sip-transport.c:1372 -#: ../src/core/sip-transport.c:1396 ../src/core/sip-transport.c:1420 +#: ../src/core/sip-transport.c:1360 ../src/core/sip-transport.c:1376 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 #: ../src/core/sipe-conf.c:265 ../src/core/sipe-notify.c:1149 msgid "no reason given" msgstr "ingen motivering angiven" -#: ../src/core/sip-transport.c:1371 +#: ../src/core/sip-transport.c:1375 #, c-format msgid "Not found: %s. Please contact your Administrator" msgstr "Hittades inte: %s. Vänligen kontakta administratören" -#: ../src/core/sip-transport.c:1373 +#: ../src/core/sip-transport.c:1377 msgid "SIP is either not enabled for the destination URI or it does not exist" msgstr "SIP är antingen inte aktiverad för den destinationen (URI) eller så den finns inte" -#: ../src/core/sip-transport.c:1396 ../src/core/sip-transport.c:1420 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 #, c-format msgid "Service unavailable: %s" msgstr "Tjänsten är ej tillgänglig: %s" -#: ../src/core/sip-transport.c:1766 +#: ../src/core/sip-transport.c:1775 msgid "Corrupted message received" msgstr "Ett trasigt meddelande togs emot" -#: ../src/core/sip-transport.c:1790 +#: ../src/core/sip-transport.c:1799 msgid "Invalid message signature received" msgstr "En ogiltig meddelandesignatur togs emot" -#: ../src/core/sipe-buddy.c:540 ../src/core/sipe-buddy.c:2300 +#: ../src/core/sipe-appshare.c:458 +#, c-format +msgid "%s wants to start presenting" +msgstr "%s vill börja presentera" + +#: ../src/core/sipe-appshare.c:462 ../src/core/sipe-conf.c:1086 +msgid "Accept" +msgstr "Godta" + +#: ../src/core/sipe-appshare.c:463 ../src/core/sipe-conf.c:1087 +msgid "Decline" +msgstr "Neka" + +#: ../src/core/sipe-appshare.c:501 ../src/core/sipe-appshare.c:599 +msgid "Application sharing error" +msgstr "Programdelningsfel" + +#: ../src/core/sipe-appshare.c:502 +msgid "Unknown remote desktop client configured." +msgstr "Okänd klient för fjärrskrivbord konfigurerad." + +#: ../src/core/sipe-appshare.c:600 +msgid "Couldn't connect application sharing" +msgstr "Kunde inte ansluta till programdelning" + +#: ../src/core/sipe-buddy.c:541 ../src/core/sipe-buddy.c:2301 msgid "Mobile" msgstr "Mobil" -#: ../src/core/sipe-buddy.c:828 +#: ../src/core/sipe-buddy.c:829 msgid "Status" msgstr "Status" -#: ../src/core/sipe-buddy.c:831 +#: ../src/core/sipe-buddy.c:832 msgid "Calendar" msgstr "Kalender" -#: ../src/core/sipe-buddy.c:836 +#: ../src/core/sipe-buddy.c:837 msgid "Meeting in" msgstr "Möte om" -#: ../src/core/sipe-buddy.c:840 +#: ../src/core/sipe-buddy.c:841 msgid "Meeting about" msgstr "Möte gällande" -#: ../src/core/sipe-buddy.c:845 +#: ../src/core/sipe-buddy.c:846 msgid "Out of office note" msgstr "Inte på kontoret - Notifiering" -#: ../src/core/sipe-buddy.c:845 +#: ../src/core/sipe-buddy.c:846 msgid "Note" msgstr "Notifiering" -#: ../src/core/sipe-buddy.c:850 ../src/core/sipe-buddy.c:2345 +#: ../src/core/sipe-buddy.c:851 ../src/core/sipe-buddy.c:2346 #: ../src/purple/purple-buddy.c:633 msgid "Access level" msgstr "Åtkomst nivå" -#: ../src/core/sipe-buddy.c:1073 +#: ../src/core/sipe-buddy.c:1074 #, c-format msgid "Found %d contact%s:" msgid_plural "Found %d contacts%s:" msgstr[0] "Hittade %d kontakt%s:" msgstr[1] "Hittade %d kontakter%s:" -#: ../src/core/sipe-buddy.c:1075 +#: ../src/core/sipe-buddy.c:1076 msgid " (more matched your query)" msgstr " (flera matchade din fråga)" -#: ../src/core/sipe-buddy.c:1121 ../src/core/sipe-buddy.c:1259 +#: ../src/core/sipe-buddy.c:1122 ../src/core/sipe-buddy.c:1260 #: ../src/core/sipe-ucs.c:314 msgid "No contacts found" msgstr "Inga kontakter hittade" -#: ../src/core/sipe-buddy.c:1134 ../src/core/sipe-buddy.c:1272 +#: ../src/core/sipe-buddy.c:1135 ../src/core/sipe-buddy.c:1273 #: ../src/core/sipe-ucs.c:278 msgid "Unable to display the search results" msgstr "Det går inte att visa sökresultatet." -#: ../src/core/sipe-buddy.c:1237 ../src/core/sipe-buddy.c:1249 +#: ../src/core/sipe-buddy.c:1238 ../src/core/sipe-buddy.c:1250 #: ../src/core/sipe-ucs.c:391 msgid "Contact search failed" msgstr "Kontaktsökningen misslyckades" -#: ../src/core/sipe-buddy.c:1412 ../src/core/sipe-ucs.c:395 +#: ../src/core/sipe-buddy.c:1413 ../src/core/sipe-ucs.c:395 msgid "Invalid contact search query" msgstr "Ogiltig kontaktsökningsfråga" -#: ../src/core/sipe-buddy.c:2237 +#: ../src/core/sipe-buddy.c:2238 #, c-format msgid "Make leader of '%s'" msgstr "Gör ledare av ”%s”" -#: ../src/core/sipe-buddy.c:2250 +#: ../src/core/sipe-buddy.c:2251 #, c-format msgid "Remove from '%s'" msgstr "Ta bort från ”%s”" -#: ../src/core/sipe-buddy.c:2264 +#: ../src/core/sipe-buddy.c:2265 #, c-format msgid "Invite to '%s'" msgstr "Bjud in till ”%s”" -#: ../src/core/sipe-buddy.c:2280 +#: ../src/core/sipe-buddy.c:2281 msgid "New chat" msgstr "Ny chatt" -#: ../src/core/sipe-buddy.c:2293 +#: ../src/core/sipe-buddy.c:2294 msgid "Work" msgstr "Arbete" -#: ../src/core/sipe-buddy.c:2308 +#: ../src/core/sipe-buddy.c:2309 msgid "Home" msgstr "Hem" -#: ../src/core/sipe-buddy.c:2316 +#: ../src/core/sipe-buddy.c:2317 msgid "Other" msgstr "Annat" -#: ../src/core/sipe-buddy.c:2324 +#: ../src/core/sipe-buddy.c:2325 msgid "Custom1" msgstr "Anpassad1" -#: ../src/core/sipe-buddy.c:2334 +#: ../src/core/sipe-buddy.c:2335 msgid "Send email..." msgstr "Skicka e-post …" -#: ../src/core/sipe-cal.c:907 +#: ../src/core/sipe-cal.c:906 msgid "Free" msgstr "Ledig" -#: ../src/core/sipe-cal.c:908 +#: ../src/core/sipe-cal.c:907 msgid "Tentative" msgstr "Preliminärt" #. SIPE_ACTIVITY_BUSY -#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:59 +#: ../src/core/sipe-cal.c:908 ../src/core/sipe-status.c:57 msgid "Busy" msgstr "Upptagen" #. SIPE_ACTIVITY_OOF -#: ../src/core/sipe-cal.c:910 ../src/core/sipe-status.c:70 +#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:68 msgid "Out of office" msgstr "Inte på kontoret" -#: ../src/core/sipe-cal.c:911 +#: ../src/core/sipe-cal.c:910 msgid "No data" msgstr "Inga uppgifter" -#: ../src/core/sipe-cal.c:1019 ../src/core/sipe-cal.c:1046 +#: ../src/core/sipe-cal.c:1018 ../src/core/sipe-cal.c:1045 #, c-format msgid "Currently %s" msgstr "För närvarande %s" -#: ../src/core/sipe-cal.c:1025 +#: ../src/core/sipe-cal.c:1024 msgid "Outside of working hours for next 8 hours" msgstr "Utanför arbetstid (närmsta 8 timmarna)" -#: ../src/core/sipe-cal.c:1027 +#: ../src/core/sipe-cal.c:1026 #, c-format msgid "%s for next 8 hours" msgstr "%s (närmsta 8 timmarna)" -#: ../src/core/sipe-cal.c:1036 +#: ../src/core/sipe-cal.c:1035 msgid "Not working" msgstr "Fungerar ej" -#: ../src/core/sipe-cal.c:1040 +#: ../src/core/sipe-cal.c:1039 #, c-format msgid "%s until %.2d:%.2d" msgstr "%s till och med %.2d:%.2d" -#: ../src/core/sipe-cal.c:1048 +#: ../src/core/sipe-cal.c:1047 #, c-format msgid "%s. Outside of working hours at %.2d:%.2d" msgstr "%s. Utanför arbetstid mellan %.2d:%.2d" -#: ../src/core/sipe-cal.c:1053 +#: ../src/core/sipe-cal.c:1052 #, c-format msgid "%s. %s at %.2d:%.2d" msgstr "%s. %s till %.2d%.2d" @@ -244,7 +269,7 @@ msgstr "Webbiljettsbegäran av %s misslyckades" #. Generate next ID -#: ../src/core/sipe-chat.c:240 +#: ../src/core/sipe-chat.c:246 #, c-format msgid "Chat #%d" msgstr "Chatt nr. %d" @@ -271,123 +296,115 @@ msgid "Incomplete conference information provided" msgstr "Ofullständig konferens information angiven" -#: ../src/core/sipe-conf.c:1041 +#: ../src/core/sipe-conf.c:1106 msgid "" "\n" "\n" "As this client was not compiled with voice call support, if you accept, you will be able to contact the other participants only via IM session." msgstr "\n\nEftersom denna klient inte kompilerades med stöd för röstsamtal kommer du, om du godtar, bara kunna kontakta de andra deltagarna via IM-sessioner." -#: ../src/core/sipe-conf.c:1049 +#: ../src/core/sipe-conf.c:1111 #, c-format -msgid "%s wants to invite you to the conference call%s" -msgstr "%s vill bjuda in dig till konferenssamtalet%s" - -#: ../src/core/sipe-conf.c:1063 -msgid "Accept" -msgstr "Godta" - -#: ../src/core/sipe-conf.c:1064 -msgid "Decline" -msgstr "Neka" +msgid "wants to invite you to a conference call%s" +msgstr "vill bjuda in dig till ett konferenssamtal%s" -#: ../src/core/sipe-conf.c:1345 +#: ../src/core/sipe-conf.c:1459 msgid "" "This conference is no longer locked. Additional participants can now join." msgstr "Denna konferens är inte längre låst. Ytterligare deltagare kan nu gå med." -#: ../src/core/sipe-conf.c:1349 +#: ../src/core/sipe-conf.c:1463 msgid "" "This conference is locked. Nobody else can join the conference while it is " "locked." msgstr "Denna konferens är låst. Ingen annan kan delta i konferensen medan den är låst." -#: ../src/core/sipe-conf.c:1382 +#: ../src/core/sipe-conf.c:1496 msgid "You have been disconnected from this conference." msgstr "Du har kopplats bort från denna konferens." -#: ../src/core/sipe-conf.c:1542 +#: ../src/core/sipe-conf.c:1656 msgid "Dial-in info" msgstr "Inkommande information" -#: ../src/core/sipe-conf.c:1543 +#: ../src/core/sipe-conf.c:1657 msgid "Number" msgstr "Nummer" -#: ../src/core/sipe-conf.c:1545 +#: ../src/core/sipe-conf.c:1659 msgid "Conference ID" msgstr "Konferens-ID" -#: ../src/core/sipe-conf.c:1547 +#: ../src/core/sipe-conf.c:1661 msgid "Meeting link" msgstr "Möteslänk" -#: ../src/core/sipe-conf.c:1549 +#: ../src/core/sipe-conf.c:1663 msgid "Organizer" msgstr "Organisatör" -#: ../src/core/sipe-conf.c:1551 +#: ../src/core/sipe-conf.c:1665 msgid "Alternative dial-in numbers" msgstr "Alternativa inkommande nummer" #. The next 13 texts make up the SIPE about note text #. About note, part 1/13: introduction -#: ../src/core/sipe-core.c:220 +#: ../src/core/sipe-core.c:221 msgid "" "A third-party plugin implementing extended version of SIP/SIMPLE used by " "various products" msgstr "En tredje parts tillägg med stöd för den utökade versionen av SIP/SIMPLE som kan användas av olika produkter" #. About note, part 2/13: home page URL (label) -#: ../src/core/sipe-core.c:222 +#: ../src/core/sipe-core.c:223 msgid "Home Page" msgstr "Hemsida" #. About note, part 3/13: support forum URL (label) -#: ../src/core/sipe-core.c:224 +#: ../src/core/sipe-core.c:225 msgid "Support" msgstr "Support" #. About note, part 4/13: support forum name (hyperlink text) -#: ../src/core/sipe-core.c:226 +#: ../src/core/sipe-core.c:227 msgid "Help Forum" msgstr "Hjälpforum" #. About note, part 5/13: bug tracker URL (label) -#: ../src/core/sipe-core.c:228 +#: ../src/core/sipe-core.c:229 msgid "Report Problems" msgstr "Rapportera fel" #. About note, part 6/13: bug tracker URL (hyperlink text) -#: ../src/core/sipe-core.c:230 +#: ../src/core/sipe-core.c:231 msgid "Bug Tracker" msgstr "Felhanteringssystem" #. About note, part 7/13: translation service URL (label) -#: ../src/core/sipe-core.c:232 +#: ../src/core/sipe-core.c:233 msgid "Translations" msgstr "Översättningar" #. About note, part 8/13: license type (label) -#: ../src/core/sipe-core.c:234 +#: ../src/core/sipe-core.c:235 msgid "License" msgstr "Licenser" #. About note, part 9/13: (REMOVED) #. About note, part 10/13: translation request, text before Transifex.com URL #. append a space if text is not empty -#: ../src/core/sipe-core.c:238 +#: ../src/core/sipe-core.c:239 msgid "Please help us to translate SIPE to your native language here at " msgstr "Hjälp oss att översätta sipe till ditt modersmål här på " #. About note, part 11/13: translation request, text after Transifex.com URL #. start with a space if text is not empty -#: ../src/core/sipe-core.c:241 +#: ../src/core/sipe-core.c:242 msgid " using convenient web interface" msgstr " med ett bekvämt webbgränssnitt" #. About note, part 12/13: author list (header) -#: ../src/core/sipe-core.c:243 +#: ../src/core/sipe-core.c:244 msgid "Authors" msgstr "Författare" @@ -395,15 +412,15 @@ #. PLEASE NOTE: do *NOT* simply translate the english original #. but write something similar to the following sentence: #. "Localization for (): " -#: ../src/core/sipe-core.c:248 +#: ../src/core/sipe-core.c:249 msgid "Original texts in English (en): SIPE developers" msgstr "Originaltexter på Engelska (en): SIPE-utvecklarna" -#: ../src/core/sipe-core.c:269 +#: ../src/core/sipe-core.c:273 msgid "SIP Exchange user name contains invalid characters" msgstr "SIP Exchange-användarnamn innehåller ogiltiga tecken" -#: ../src/core/sipe-core.c:277 ../src/purple/purple-buddy.c:485 +#: ../src/core/sipe-core.c:281 ../src/purple/purple-buddy.c:485 #: ../src/telepathy/telepathy-protocol.c:89 #: ../src/telepathy/telepathy-protocol.c:191 #, c-format @@ -412,21 +429,21 @@ "Example: user@company.com" msgstr "Användarnamnet måste vara ett giltigt SIP URI\nExempel: user@company.com" -#: ../src/core/sipe-core.c:284 +#: ../src/core/sipe-core.c:288 msgid "Password is required when Single Sign-On is not enabled" msgstr "Lösenord krävs när Single Sign-on inte är aktiverat" -#: ../src/core/sipe-core.c:294 +#: ../src/core/sipe-core.c:298 msgid "" "Email address should be valid if provided\n" "Example: user@company.com" msgstr "E-postadressen bör vara giltig enligt nedan\n\nExempel: user@company.com" -#: ../src/core/sipe-core.c:303 +#: ../src/core/sipe-core.c:307 msgid "SIP Exchange user name contains whitespace" msgstr "SIP Exchange-användarnamn får inte innehålla blanksteg" -#: ../src/core/sipe-core.c:317 +#: ../src/core/sipe-core.c:321 msgid "" "Email services URL should be valid if provided\n" "Example: https://exchange.corp.com/EWS/Exchange.asmx\n" @@ -457,13 +474,13 @@ msgid "Could not create listen socket" msgstr "Det gick inte att skapa lyssnaruttag" -#: ../src/core/sipe-ft-lync.c:757 ../src/core/sipe-media.c:1195 -#: ../src/core/sipe-media.c:1206 ../src/core/sipe-media.c:1284 -#: ../src/core/sipe-media.c:1740 +#: ../src/core/sipe-ft-lync.c:762 ../src/core/sipe-media.c:1328 +#: ../src/core/sipe-media.c:1339 ../src/core/sipe-media.c:1417 +#: ../src/core/sipe-media.c:1923 msgid "Error occurred" msgstr "Ett fel inträffade" -#: ../src/core/sipe-ft-lync.c:758 +#: ../src/core/sipe-ft-lync.c:763 msgid "Error creating data stream" msgstr "Fel när dataström skapades" @@ -498,7 +515,7 @@ msgstr "Slut på minne" #: ../src/core/sipe-group.c:168 ../src/core/sipe-notify.c:1163 -#: ../src/core/sipe-notify.c:1190 ../src/core/sipe-notify.c:1294 +#: ../src/core/sipe-notify.c:1197 ../src/core/sipe-notify.c:1301 #: ../src/purple/purple-search.c:128 msgid "Other Contacts" msgstr "Övriga Kontakter" @@ -536,77 +553,77 @@ msgid "Failed to invite %s" msgstr "Misslyckades att bjuda in %s" -#: ../src/core/sipe-incoming.c:741 +#: ../src/core/sipe-incoming.c:754 #, c-format msgid "Received a message with unrecognized contents from %s" msgstr "Meddelande mottaget med okänt innehåll från %s" -#: ../src/core/sipe-media.c:835 ../src/core/sipe-media.c:1347 -#: ../src/core/sipe-media.c:1357 ../src/core/sipe-media.c:1721 -#: ../src/core/sipe-media.c:1741 +#: ../src/core/sipe-media.c:869 ../src/core/sipe-media.c:1483 +#: ../src/core/sipe-media.c:1493 ../src/core/sipe-media.c:1904 +#: ../src/core/sipe-media.c:1924 msgid "Unable to establish a call" msgstr "Kan inte etablera ett samtal" -#: ../src/core/sipe-media.c:836 ../src/core/sipe-media.c:1722 +#: ../src/core/sipe-media.c:870 ../src/core/sipe-media.c:1905 msgid "Encryption settings of peer are incompatible with ours." msgstr "Krypteringsinställningarna hos motparten är inkompatibla med våra." -#: ../src/core/sipe-media.c:929 +#: ../src/core/sipe-media.c:963 #, c-format msgid "User %s rejected call" msgstr "Användare %s avvisade samtalet" -#: ../src/core/sipe-media.c:930 +#: ../src/core/sipe-media.c:964 msgid "Call rejected" msgstr "Samtalet avvisades" -#: ../src/core/sipe-media.c:1196 ../src/core/sipe-media.c:1285 +#: ../src/core/sipe-media.c:1329 ../src/core/sipe-media.c:1418 msgid "Error creating audio stream" msgstr "Fel när audioströmmen skapades" -#: ../src/core/sipe-media.c:1207 +#: ../src/core/sipe-media.c:1340 msgid "Error creating video stream" msgstr "Fel när videoströmmen skapades" -#: ../src/core/sipe-media.c:1251 ../src/purple/purple-chat.c:314 +#: ../src/core/sipe-media.c:1384 ../src/purple/purple-chat.c:329 msgid "Join conference call" msgstr "Anslut till konferenssamtal" -#: ../src/core/sipe-media.c:1252 +#: ../src/core/sipe-media.c:1385 msgid "Conference calls are not supported on this server." msgstr "Konferenssamtal stödjs inte av denna servern" -#: ../src/core/sipe-media.c:1348 +#: ../src/core/sipe-media.c:1484 msgid "Invalid phone number" msgstr "Felaktigt telefonnummer" -#: ../src/core/sipe-media.c:1358 +#: ../src/core/sipe-media.c:1494 msgid "Audio Test Service is not available." msgstr "Audiotesttjänsten är inte tillgänglig." -#: ../src/core/sipe-media.c:1690 +#: ../src/core/sipe-media.c:1873 msgid "User unavailable" msgstr "Användare ej tillgänglig" -#: ../src/core/sipe-media.c:1693 +#: ../src/core/sipe-media.c:1876 #, c-format msgid "%s does not want to be disturbed" msgstr "%s vill inte bli störd" -#: ../src/core/sipe-media.c:1695 +#: ../src/core/sipe-media.c:1878 #, c-format msgid "User %s is not available" msgstr "Användare %s är inte tillgänglig" -#: ../src/core/sipe-media.c:1704 +#: ../src/core/sipe-media.c:1887 msgid "Unsupported media type" msgstr "Ej stödd mediatyp" -#: ../src/core/sipe-media.c:2062 +#: ../src/core/sipe-media.c:2246 msgid "Media error" msgstr "Mediafel" -#: ../src/core/sipe-media.c:2063 +#: ../src/core/sipe-media.c:2247 msgid "Error while reading from stream" msgstr "Fel vid läsning från strömmen" @@ -657,36 +674,36 @@ msgstr "Okänt" #. Translators: remove (clear) previously assigned access level -#: ../src/core/sipe-ocs2007.c:2571 +#: ../src/core/sipe-ocs2007.c:2570 msgid "Unspecify" msgstr "Ospecificerad" -#: ../src/core/sipe-ocs2007.c:2590 +#: ../src/core/sipe-ocs2007.c:2589 msgid "People in my company" msgstr "Personer i mitt företag" -#: ../src/core/sipe-ocs2007.c:2600 +#: ../src/core/sipe-ocs2007.c:2599 msgid "People in domains connected with my company" msgstr "Personer i domäner kopplade till mitt företag" -#: ../src/core/sipe-ocs2007.c:2609 +#: ../src/core/sipe-ocs2007.c:2608 msgid "People in public domains" msgstr "Personer i offentliga domäner" -#: ../src/core/sipe-ocs2007.c:2619 +#: ../src/core/sipe-ocs2007.c:2618 #, c-format msgid "People at %s" msgstr "Personer i %s" -#: ../src/core/sipe-ocs2007.c:2644 +#: ../src/core/sipe-ocs2007.c:2643 msgid "Add new domain..." msgstr "Lägg till en ny domän …" -#: ../src/core/sipe-ocs2007.c:2673 +#: ../src/core/sipe-ocs2007.c:2672 msgid "Online help..." msgstr "Online hjälp …" -#: ../src/core/sipe-ocs2007.c:2681 +#: ../src/core/sipe-ocs2007.c:2680 msgid "Access groups" msgstr "Anslut grupper" @@ -698,49 +715,60 @@ #. SIPE_ACTIVITY_AVAILABLE #. SIPE_ACTIVITY_ONLINE #. SIPE_ACTIVITY_INACTIVE -#: ../src/core/sipe-status.c:58 +#: ../src/core/sipe-status.c:56 msgid "Inactive" msgstr "Inaktiv" #. SIPE_ACTIVITY_BUSYIDLE -#: ../src/core/sipe-status.c:60 +#: ../src/core/sipe-status.c:58 msgid "Busy-Idle" msgstr "Upptagen" #. SIPE_ACTIVITY_DND #. SIPE_ACTIVITY_BRB -#: ../src/core/sipe-status.c:62 +#: ../src/core/sipe-status.c:60 msgid "Be right back" msgstr "Strax tillbaka" #. SIPE_ACTIVITY_AWAY #. SIPE_ACTIVITY_LUNCH -#: ../src/core/sipe-status.c:64 +#: ../src/core/sipe-status.c:62 msgid "Out to lunch" msgstr "På lunch" #. SIPE_ACTIVITY_INVISIBLE #. SIPE_ACTIVITY_OFFLINE #. SIPE_ACTIVITY_ON_PHONE -#: ../src/core/sipe-status.c:67 +#: ../src/core/sipe-status.c:65 msgid "In a call" msgstr "I ett telefonsamtal" #. SIPE_ACTIVITY_IN_CONF -#: ../src/core/sipe-status.c:68 +#: ../src/core/sipe-status.c:66 msgid "In a conference" msgstr "I en konferens" #. SIPE_ACTIVITY_IN_MEETING -#: ../src/core/sipe-status.c:69 +#: ../src/core/sipe-status.c:67 msgid "In a meeting" msgstr "I ett möte" #. SIPE_ACTIVITY_URGENT_ONLY -#: ../src/core/sipe-status.c:71 +#: ../src/core/sipe-status.c:69 msgid "Urgent interruptions only" msgstr "Enbart brådskade ärenden får avbryta" +#: ../src/core/sipe-subscriptions.c:189 +msgid "Presence subscription failed!" +msgstr "Närvaroprenumerationen misslyckades!" + +#: ../src/core/sipe-subscriptions.c:190 +msgid "" +"One or more buddies will therefore permanently show as offline.\n" +"\n" +"Please check that there are no corrupted SIP URIs in your contacts list." +msgstr "En eller flera kompisar kommer därför att permanent visas som frånkopplade.\n\nKontrollera att det inte finns några trasiga SIP URI:er i din kontaktlista." + #: ../src/core/sipe-ucs.c:674 msgid "UCS initialization failed!" msgstr "UCS-initiering misslyckades!" @@ -893,15 +921,19 @@ msgid "Copy to" msgstr "Kopiera till" -#: ../src/purple/purple-chat.c:295 +#: ../src/purple/purple-chat.c:310 msgid "Lock" msgstr "Lås" -#: ../src/purple/purple-chat.c:300 +#: ../src/purple/purple-chat.c:315 msgid "Unlock" msgstr "Lås upp" -#: ../src/purple/purple-chat.c:321 +#: ../src/purple/purple-chat.c:338 +msgid "Show presentation" +msgstr "Visa presentationen" + +#: ../src/purple/purple-chat.c:345 msgid "Meeting entry info" msgstr "Mötespostinformation" @@ -1153,26 +1185,30 @@ msgstr "Mellanserver för gruppchatt\n foretag.se eller person@foretag.se\n(lämna tomt för att bestämma från Username)" #: ../src/purple/purple-plugin-common.c:933 +msgid "Remote desktop client" +msgstr "Fjärrskrivbordsklient" + +#: ../src/purple/purple-plugin-common.c:938 msgid "Media encryption" msgstr "Mediakryptering" -#: ../src/purple/purple-plugin-common.c:934 +#: ../src/purple/purple-plugin-common.c:939 msgid "Obey server policy" msgstr "Följ serverpolicyn" -#: ../src/purple/purple-plugin-common.c:935 +#: ../src/purple/purple-plugin-common.c:940 msgid "Always" msgstr "Alltid" -#: ../src/purple/purple-plugin-common.c:936 +#: ../src/purple/purple-plugin-common.c:941 msgid "Optional" msgstr "Optionell" -#: ../src/purple/purple-plugin-common.c:937 +#: ../src/purple/purple-plugin-common.c:942 msgid "Disabled" msgstr "Avstängd" -#: ../src/purple/purple-plugin-common.c:947 +#: ../src/purple/purple-plugin-common.c:952 msgid "" "Login\n" " user or DOMAIN\\user or\n" @@ -1221,27 +1257,27 @@ msgid "_Search" msgstr "_Sök" -#: ../src/purple/purple-transport.c:132 +#: ../src/purple/purple-transport.c:135 msgid "Read error" msgstr "Läsfel" -#: ../src/purple/purple-transport.c:136 -#: ../src/telepathy/telepathy-transport.c:96 +#: ../src/purple/purple-transport.c:139 +#: ../src/telepathy/telepathy-transport.c:95 msgid "Server has disconnected" msgstr "Servern har kopplat ifrån" -#: ../src/purple/purple-transport.c:198 +#: ../src/purple/purple-transport.c:201 msgid "Could not connect" msgstr "Det gick inte att ansluta" -#: ../src/purple/purple-transport.c:268 +#: ../src/purple/purple-transport.c:271 msgid "Could not create SSL context" msgstr "Det gick inte att skapa SSL-kontext" -#: ../src/purple/purple-transport.c:290 +#: ../src/purple/purple-transport.c:293 msgid "Could not create socket" msgstr "Kunde inte skapa en socket" -#: ../src/purple/purple-transport.c:381 +#: ../src/purple/purple-transport.c:417 msgid "Write error" msgstr "Skrivfel" diff -Nru pidgin-sipe-1.21.1/po/ta.po pidgin-sipe-1.22.1/po/ta.po --- pidgin-sipe-1.21.1/po/ta.po 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/po/ta.po 2017-06-11 15:41:22.000000000 +0000 @@ -11,7 +11,7 @@ "Project-Id-Version: pidgin sipe\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/sipe/bugs/\n" "POT-Creation-Date: 2010-11-30 23:36+0200\n" -"PO-Revision-Date: 2016-05-28 15:08+0000\n" +"PO-Revision-Date: 2017-01-23 17:47+0000\n" "Last-Translator: Stefan Becker \n" "Language-Team: Tamil (http://www.transifex.com/stefanb/pidgin-sipe/language/ta/)\n" "MIME-Version: 1.0\n" @@ -20,213 +20,238 @@ "Language: ta\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../src/core/sip-transport.c:235 +#: ../src/core/sip-transport.c:240 msgid "Failed to authenticate to server" msgstr "" -#: ../src/core/sip-transport.c:293 +#: ../src/core/sip-transport.c:298 #, c-format msgid "Can't request certificate from %s" msgstr "" -#: ../src/core/sip-transport.c:303 +#: ../src/core/sip-transport.c:308 msgid "No URI for certificate provisioning service provided" msgstr "" -#: ../src/core/sip-transport.c:1281 +#: ../src/core/sip-transport.c:1285 msgid "Authentication failed" msgstr "" -#: ../src/core/sip-transport.c:1338 +#: ../src/core/sip-transport.c:1342 msgid "Incompatible authentication scheme chosen" msgstr "" -#: ../src/core/sip-transport.c:1355 ../src/core/sipe-notify.c:1149 +#: ../src/core/sip-transport.c:1359 ../src/core/sipe-notify.c:1149 #, c-format msgid "You have been rejected by the server: %s" msgstr "" -#: ../src/core/sip-transport.c:1356 ../src/core/sip-transport.c:1372 -#: ../src/core/sip-transport.c:1396 ../src/core/sip-transport.c:1420 +#: ../src/core/sip-transport.c:1360 ../src/core/sip-transport.c:1376 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 #: ../src/core/sipe-conf.c:265 ../src/core/sipe-notify.c:1149 msgid "no reason given" msgstr "" -#: ../src/core/sip-transport.c:1371 +#: ../src/core/sip-transport.c:1375 #, c-format msgid "Not found: %s. Please contact your Administrator" msgstr "" -#: ../src/core/sip-transport.c:1373 +#: ../src/core/sip-transport.c:1377 msgid "SIP is either not enabled for the destination URI or it does not exist" msgstr "" -#: ../src/core/sip-transport.c:1396 ../src/core/sip-transport.c:1420 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 #, c-format msgid "Service unavailable: %s" msgstr "" -#: ../src/core/sip-transport.c:1766 +#: ../src/core/sip-transport.c:1775 msgid "Corrupted message received" msgstr "" -#: ../src/core/sip-transport.c:1790 +#: ../src/core/sip-transport.c:1799 msgid "Invalid message signature received" msgstr "" -#: ../src/core/sipe-buddy.c:540 ../src/core/sipe-buddy.c:2300 +#: ../src/core/sipe-appshare.c:458 +#, c-format +msgid "%s wants to start presenting" +msgstr "" + +#: ../src/core/sipe-appshare.c:462 ../src/core/sipe-conf.c:1086 +msgid "Accept" +msgstr "" + +#: ../src/core/sipe-appshare.c:463 ../src/core/sipe-conf.c:1087 +msgid "Decline" +msgstr "" + +#: ../src/core/sipe-appshare.c:501 ../src/core/sipe-appshare.c:599 +msgid "Application sharing error" +msgstr "" + +#: ../src/core/sipe-appshare.c:502 +msgid "Unknown remote desktop client configured." +msgstr "" + +#: ../src/core/sipe-appshare.c:600 +msgid "Couldn't connect application sharing" +msgstr "" + +#: ../src/core/sipe-buddy.c:541 ../src/core/sipe-buddy.c:2301 msgid "Mobile" msgstr "" -#: ../src/core/sipe-buddy.c:828 +#: ../src/core/sipe-buddy.c:829 msgid "Status" msgstr "" -#: ../src/core/sipe-buddy.c:831 +#: ../src/core/sipe-buddy.c:832 msgid "Calendar" msgstr "" -#: ../src/core/sipe-buddy.c:836 +#: ../src/core/sipe-buddy.c:837 msgid "Meeting in" msgstr "" -#: ../src/core/sipe-buddy.c:840 +#: ../src/core/sipe-buddy.c:841 msgid "Meeting about" msgstr "" -#: ../src/core/sipe-buddy.c:845 +#: ../src/core/sipe-buddy.c:846 msgid "Out of office note" msgstr "" -#: ../src/core/sipe-buddy.c:845 +#: ../src/core/sipe-buddy.c:846 msgid "Note" msgstr "" -#: ../src/core/sipe-buddy.c:850 ../src/core/sipe-buddy.c:2345 +#: ../src/core/sipe-buddy.c:851 ../src/core/sipe-buddy.c:2346 #: ../src/purple/purple-buddy.c:633 msgid "Access level" msgstr "" -#: ../src/core/sipe-buddy.c:1073 +#: ../src/core/sipe-buddy.c:1074 #, c-format msgid "Found %d contact%s:" msgid_plural "Found %d contacts%s:" msgstr[0] "" msgstr[1] "" -#: ../src/core/sipe-buddy.c:1075 +#: ../src/core/sipe-buddy.c:1076 msgid " (more matched your query)" msgstr "" -#: ../src/core/sipe-buddy.c:1121 ../src/core/sipe-buddy.c:1259 +#: ../src/core/sipe-buddy.c:1122 ../src/core/sipe-buddy.c:1260 #: ../src/core/sipe-ucs.c:314 msgid "No contacts found" msgstr "" -#: ../src/core/sipe-buddy.c:1134 ../src/core/sipe-buddy.c:1272 +#: ../src/core/sipe-buddy.c:1135 ../src/core/sipe-buddy.c:1273 #: ../src/core/sipe-ucs.c:278 msgid "Unable to display the search results" msgstr "" -#: ../src/core/sipe-buddy.c:1237 ../src/core/sipe-buddy.c:1249 +#: ../src/core/sipe-buddy.c:1238 ../src/core/sipe-buddy.c:1250 #: ../src/core/sipe-ucs.c:391 msgid "Contact search failed" msgstr "" -#: ../src/core/sipe-buddy.c:1412 ../src/core/sipe-ucs.c:395 +#: ../src/core/sipe-buddy.c:1413 ../src/core/sipe-ucs.c:395 msgid "Invalid contact search query" msgstr "" -#: ../src/core/sipe-buddy.c:2237 +#: ../src/core/sipe-buddy.c:2238 #, c-format msgid "Make leader of '%s'" msgstr "" -#: ../src/core/sipe-buddy.c:2250 +#: ../src/core/sipe-buddy.c:2251 #, c-format msgid "Remove from '%s'" msgstr "" -#: ../src/core/sipe-buddy.c:2264 +#: ../src/core/sipe-buddy.c:2265 #, c-format msgid "Invite to '%s'" msgstr "" -#: ../src/core/sipe-buddy.c:2280 +#: ../src/core/sipe-buddy.c:2281 msgid "New chat" msgstr "" -#: ../src/core/sipe-buddy.c:2293 +#: ../src/core/sipe-buddy.c:2294 msgid "Work" msgstr "" -#: ../src/core/sipe-buddy.c:2308 +#: ../src/core/sipe-buddy.c:2309 msgid "Home" msgstr "" -#: ../src/core/sipe-buddy.c:2316 +#: ../src/core/sipe-buddy.c:2317 msgid "Other" msgstr "" -#: ../src/core/sipe-buddy.c:2324 +#: ../src/core/sipe-buddy.c:2325 msgid "Custom1" msgstr "" -#: ../src/core/sipe-buddy.c:2334 +#: ../src/core/sipe-buddy.c:2335 msgid "Send email..." msgstr "" -#: ../src/core/sipe-cal.c:907 +#: ../src/core/sipe-cal.c:906 msgid "Free" msgstr "" -#: ../src/core/sipe-cal.c:908 +#: ../src/core/sipe-cal.c:907 msgid "Tentative" msgstr "" #. SIPE_ACTIVITY_BUSY -#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:59 +#: ../src/core/sipe-cal.c:908 ../src/core/sipe-status.c:57 msgid "Busy" msgstr "" #. SIPE_ACTIVITY_OOF -#: ../src/core/sipe-cal.c:910 ../src/core/sipe-status.c:70 +#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:68 msgid "Out of office" msgstr "" -#: ../src/core/sipe-cal.c:911 +#: ../src/core/sipe-cal.c:910 msgid "No data" msgstr "" -#: ../src/core/sipe-cal.c:1019 ../src/core/sipe-cal.c:1046 +#: ../src/core/sipe-cal.c:1018 ../src/core/sipe-cal.c:1045 #, c-format msgid "Currently %s" msgstr "" -#: ../src/core/sipe-cal.c:1025 +#: ../src/core/sipe-cal.c:1024 msgid "Outside of working hours for next 8 hours" msgstr "" -#: ../src/core/sipe-cal.c:1027 +#: ../src/core/sipe-cal.c:1026 #, c-format msgid "%s for next 8 hours" msgstr "" -#: ../src/core/sipe-cal.c:1036 +#: ../src/core/sipe-cal.c:1035 msgid "Not working" msgstr "" -#: ../src/core/sipe-cal.c:1040 +#: ../src/core/sipe-cal.c:1039 #, c-format msgid "%s until %.2d:%.2d" msgstr "" -#: ../src/core/sipe-cal.c:1048 +#: ../src/core/sipe-cal.c:1047 #, c-format msgid "%s. Outside of working hours at %.2d:%.2d" msgstr "" -#: ../src/core/sipe-cal.c:1053 +#: ../src/core/sipe-cal.c:1052 #, c-format msgid "%s. %s at %.2d:%.2d" msgstr "" @@ -242,7 +267,7 @@ msgstr "" #. Generate next ID -#: ../src/core/sipe-chat.c:240 +#: ../src/core/sipe-chat.c:246 #, c-format msgid "Chat #%d" msgstr "" @@ -269,123 +294,115 @@ msgid "Incomplete conference information provided" msgstr "" -#: ../src/core/sipe-conf.c:1041 +#: ../src/core/sipe-conf.c:1106 msgid "" "\n" "\n" "As this client was not compiled with voice call support, if you accept, you will be able to contact the other participants only via IM session." msgstr "" -#: ../src/core/sipe-conf.c:1049 +#: ../src/core/sipe-conf.c:1111 #, c-format -msgid "%s wants to invite you to the conference call%s" +msgid "wants to invite you to a conference call%s" msgstr "" -#: ../src/core/sipe-conf.c:1063 -msgid "Accept" -msgstr "" - -#: ../src/core/sipe-conf.c:1064 -msgid "Decline" -msgstr "" - -#: ../src/core/sipe-conf.c:1345 +#: ../src/core/sipe-conf.c:1459 msgid "" "This conference is no longer locked. Additional participants can now join." msgstr "" -#: ../src/core/sipe-conf.c:1349 +#: ../src/core/sipe-conf.c:1463 msgid "" "This conference is locked. Nobody else can join the conference while it is " "locked." msgstr "" -#: ../src/core/sipe-conf.c:1382 +#: ../src/core/sipe-conf.c:1496 msgid "You have been disconnected from this conference." msgstr "" -#: ../src/core/sipe-conf.c:1542 +#: ../src/core/sipe-conf.c:1656 msgid "Dial-in info" msgstr "" -#: ../src/core/sipe-conf.c:1543 +#: ../src/core/sipe-conf.c:1657 msgid "Number" msgstr "" -#: ../src/core/sipe-conf.c:1545 +#: ../src/core/sipe-conf.c:1659 msgid "Conference ID" msgstr "" -#: ../src/core/sipe-conf.c:1547 +#: ../src/core/sipe-conf.c:1661 msgid "Meeting link" msgstr "" -#: ../src/core/sipe-conf.c:1549 +#: ../src/core/sipe-conf.c:1663 msgid "Organizer" msgstr "" -#: ../src/core/sipe-conf.c:1551 +#: ../src/core/sipe-conf.c:1665 msgid "Alternative dial-in numbers" msgstr "" #. The next 13 texts make up the SIPE about note text #. About note, part 1/13: introduction -#: ../src/core/sipe-core.c:220 +#: ../src/core/sipe-core.c:221 msgid "" "A third-party plugin implementing extended version of SIP/SIMPLE used by " "various products" msgstr "" #. About note, part 2/13: home page URL (label) -#: ../src/core/sipe-core.c:222 +#: ../src/core/sipe-core.c:223 msgid "Home Page" msgstr "" #. About note, part 3/13: support forum URL (label) -#: ../src/core/sipe-core.c:224 +#: ../src/core/sipe-core.c:225 msgid "Support" msgstr "" #. About note, part 4/13: support forum name (hyperlink text) -#: ../src/core/sipe-core.c:226 +#: ../src/core/sipe-core.c:227 msgid "Help Forum" msgstr "" #. About note, part 5/13: bug tracker URL (label) -#: ../src/core/sipe-core.c:228 +#: ../src/core/sipe-core.c:229 msgid "Report Problems" msgstr "" #. About note, part 6/13: bug tracker URL (hyperlink text) -#: ../src/core/sipe-core.c:230 +#: ../src/core/sipe-core.c:231 msgid "Bug Tracker" msgstr "" #. About note, part 7/13: translation service URL (label) -#: ../src/core/sipe-core.c:232 +#: ../src/core/sipe-core.c:233 msgid "Translations" msgstr "" #. About note, part 8/13: license type (label) -#: ../src/core/sipe-core.c:234 +#: ../src/core/sipe-core.c:235 msgid "License" msgstr "" #. About note, part 9/13: (REMOVED) #. About note, part 10/13: translation request, text before Transifex.com URL #. append a space if text is not empty -#: ../src/core/sipe-core.c:238 +#: ../src/core/sipe-core.c:239 msgid "Please help us to translate SIPE to your native language here at " msgstr "" #. About note, part 11/13: translation request, text after Transifex.com URL #. start with a space if text is not empty -#: ../src/core/sipe-core.c:241 +#: ../src/core/sipe-core.c:242 msgid " using convenient web interface" msgstr "" #. About note, part 12/13: author list (header) -#: ../src/core/sipe-core.c:243 +#: ../src/core/sipe-core.c:244 msgid "Authors" msgstr "" @@ -393,15 +410,15 @@ #. PLEASE NOTE: do *NOT* simply translate the english original #. but write something similar to the following sentence: #. "Localization for (): " -#: ../src/core/sipe-core.c:248 +#: ../src/core/sipe-core.c:249 msgid "Original texts in English (en): SIPE developers" msgstr "" -#: ../src/core/sipe-core.c:269 +#: ../src/core/sipe-core.c:273 msgid "SIP Exchange user name contains invalid characters" msgstr "" -#: ../src/core/sipe-core.c:277 ../src/purple/purple-buddy.c:485 +#: ../src/core/sipe-core.c:281 ../src/purple/purple-buddy.c:485 #: ../src/telepathy/telepathy-protocol.c:89 #: ../src/telepathy/telepathy-protocol.c:191 #, c-format @@ -410,21 +427,21 @@ "Example: user@company.com" msgstr "" -#: ../src/core/sipe-core.c:284 +#: ../src/core/sipe-core.c:288 msgid "Password is required when Single Sign-On is not enabled" msgstr "" -#: ../src/core/sipe-core.c:294 +#: ../src/core/sipe-core.c:298 msgid "" "Email address should be valid if provided\n" "Example: user@company.com" msgstr "" -#: ../src/core/sipe-core.c:303 +#: ../src/core/sipe-core.c:307 msgid "SIP Exchange user name contains whitespace" msgstr "" -#: ../src/core/sipe-core.c:317 +#: ../src/core/sipe-core.c:321 msgid "" "Email services URL should be valid if provided\n" "Example: https://exchange.corp.com/EWS/Exchange.asmx\n" @@ -455,13 +472,13 @@ msgid "Could not create listen socket" msgstr "கேட்கும் கொள்குழி (சாக்கெட்) ஐ உருவாக்க முடியவில்லை!" -#: ../src/core/sipe-ft-lync.c:757 ../src/core/sipe-media.c:1195 -#: ../src/core/sipe-media.c:1206 ../src/core/sipe-media.c:1284 -#: ../src/core/sipe-media.c:1740 +#: ../src/core/sipe-ft-lync.c:762 ../src/core/sipe-media.c:1328 +#: ../src/core/sipe-media.c:1339 ../src/core/sipe-media.c:1417 +#: ../src/core/sipe-media.c:1923 msgid "Error occurred" msgstr "" -#: ../src/core/sipe-ft-lync.c:758 +#: ../src/core/sipe-ft-lync.c:763 msgid "Error creating data stream" msgstr "" @@ -496,7 +513,7 @@ msgstr "" #: ../src/core/sipe-group.c:168 ../src/core/sipe-notify.c:1163 -#: ../src/core/sipe-notify.c:1190 ../src/core/sipe-notify.c:1294 +#: ../src/core/sipe-notify.c:1197 ../src/core/sipe-notify.c:1301 #: ../src/purple/purple-search.c:128 msgid "Other Contacts" msgstr "" @@ -534,77 +551,77 @@ msgid "Failed to invite %s" msgstr "" -#: ../src/core/sipe-incoming.c:741 +#: ../src/core/sipe-incoming.c:754 #, c-format msgid "Received a message with unrecognized contents from %s" msgstr "" -#: ../src/core/sipe-media.c:835 ../src/core/sipe-media.c:1347 -#: ../src/core/sipe-media.c:1357 ../src/core/sipe-media.c:1721 -#: ../src/core/sipe-media.c:1741 +#: ../src/core/sipe-media.c:869 ../src/core/sipe-media.c:1483 +#: ../src/core/sipe-media.c:1493 ../src/core/sipe-media.c:1904 +#: ../src/core/sipe-media.c:1924 msgid "Unable to establish a call" msgstr "" -#: ../src/core/sipe-media.c:836 ../src/core/sipe-media.c:1722 +#: ../src/core/sipe-media.c:870 ../src/core/sipe-media.c:1905 msgid "Encryption settings of peer are incompatible with ours." msgstr "" -#: ../src/core/sipe-media.c:929 +#: ../src/core/sipe-media.c:963 #, c-format msgid "User %s rejected call" msgstr "" -#: ../src/core/sipe-media.c:930 +#: ../src/core/sipe-media.c:964 msgid "Call rejected" msgstr "" -#: ../src/core/sipe-media.c:1196 ../src/core/sipe-media.c:1285 +#: ../src/core/sipe-media.c:1329 ../src/core/sipe-media.c:1418 msgid "Error creating audio stream" msgstr "" -#: ../src/core/sipe-media.c:1207 +#: ../src/core/sipe-media.c:1340 msgid "Error creating video stream" msgstr "" -#: ../src/core/sipe-media.c:1251 ../src/purple/purple-chat.c:314 +#: ../src/core/sipe-media.c:1384 ../src/purple/purple-chat.c:329 msgid "Join conference call" msgstr "" -#: ../src/core/sipe-media.c:1252 +#: ../src/core/sipe-media.c:1385 msgid "Conference calls are not supported on this server." msgstr "" -#: ../src/core/sipe-media.c:1348 +#: ../src/core/sipe-media.c:1484 msgid "Invalid phone number" msgstr "" -#: ../src/core/sipe-media.c:1358 +#: ../src/core/sipe-media.c:1494 msgid "Audio Test Service is not available." msgstr "" -#: ../src/core/sipe-media.c:1690 +#: ../src/core/sipe-media.c:1873 msgid "User unavailable" msgstr "" -#: ../src/core/sipe-media.c:1693 +#: ../src/core/sipe-media.c:1876 #, c-format msgid "%s does not want to be disturbed" msgstr "" -#: ../src/core/sipe-media.c:1695 +#: ../src/core/sipe-media.c:1878 #, c-format msgid "User %s is not available" msgstr "" -#: ../src/core/sipe-media.c:1704 +#: ../src/core/sipe-media.c:1887 msgid "Unsupported media type" msgstr "" -#: ../src/core/sipe-media.c:2062 +#: ../src/core/sipe-media.c:2246 msgid "Media error" msgstr "" -#: ../src/core/sipe-media.c:2063 +#: ../src/core/sipe-media.c:2247 msgid "Error while reading from stream" msgstr "" @@ -655,36 +672,36 @@ msgstr "" #. Translators: remove (clear) previously assigned access level -#: ../src/core/sipe-ocs2007.c:2571 +#: ../src/core/sipe-ocs2007.c:2570 msgid "Unspecify" msgstr "" -#: ../src/core/sipe-ocs2007.c:2590 +#: ../src/core/sipe-ocs2007.c:2589 msgid "People in my company" msgstr "" -#: ../src/core/sipe-ocs2007.c:2600 +#: ../src/core/sipe-ocs2007.c:2599 msgid "People in domains connected with my company" msgstr "" -#: ../src/core/sipe-ocs2007.c:2609 +#: ../src/core/sipe-ocs2007.c:2608 msgid "People in public domains" msgstr "" -#: ../src/core/sipe-ocs2007.c:2619 +#: ../src/core/sipe-ocs2007.c:2618 #, c-format msgid "People at %s" msgstr "" -#: ../src/core/sipe-ocs2007.c:2644 +#: ../src/core/sipe-ocs2007.c:2643 msgid "Add new domain..." msgstr "" -#: ../src/core/sipe-ocs2007.c:2673 +#: ../src/core/sipe-ocs2007.c:2672 msgid "Online help..." msgstr "" -#: ../src/core/sipe-ocs2007.c:2681 +#: ../src/core/sipe-ocs2007.c:2680 msgid "Access groups" msgstr "" @@ -696,49 +713,60 @@ #. SIPE_ACTIVITY_AVAILABLE #. SIPE_ACTIVITY_ONLINE #. SIPE_ACTIVITY_INACTIVE -#: ../src/core/sipe-status.c:58 +#: ../src/core/sipe-status.c:56 msgid "Inactive" msgstr "" #. SIPE_ACTIVITY_BUSYIDLE -#: ../src/core/sipe-status.c:60 +#: ../src/core/sipe-status.c:58 msgid "Busy-Idle" msgstr "" #. SIPE_ACTIVITY_DND #. SIPE_ACTIVITY_BRB -#: ../src/core/sipe-status.c:62 +#: ../src/core/sipe-status.c:60 msgid "Be right back" msgstr "" #. SIPE_ACTIVITY_AWAY #. SIPE_ACTIVITY_LUNCH -#: ../src/core/sipe-status.c:64 +#: ../src/core/sipe-status.c:62 msgid "Out to lunch" msgstr "" #. SIPE_ACTIVITY_INVISIBLE #. SIPE_ACTIVITY_OFFLINE #. SIPE_ACTIVITY_ON_PHONE -#: ../src/core/sipe-status.c:67 +#: ../src/core/sipe-status.c:65 msgid "In a call" msgstr "" #. SIPE_ACTIVITY_IN_CONF -#: ../src/core/sipe-status.c:68 +#: ../src/core/sipe-status.c:66 msgid "In a conference" msgstr "" #. SIPE_ACTIVITY_IN_MEETING -#: ../src/core/sipe-status.c:69 +#: ../src/core/sipe-status.c:67 msgid "In a meeting" msgstr "" #. SIPE_ACTIVITY_URGENT_ONLY -#: ../src/core/sipe-status.c:71 +#: ../src/core/sipe-status.c:69 msgid "Urgent interruptions only" msgstr "" +#: ../src/core/sipe-subscriptions.c:189 +msgid "Presence subscription failed!" +msgstr "" + +#: ../src/core/sipe-subscriptions.c:190 +msgid "" +"One or more buddies will therefore permanently show as offline.\n" +"\n" +"Please check that there are no corrupted SIP URIs in your contacts list." +msgstr "" + #: ../src/core/sipe-ucs.c:674 msgid "UCS initialization failed!" msgstr "" @@ -891,15 +919,19 @@ msgid "Copy to" msgstr "" -#: ../src/purple/purple-chat.c:295 +#: ../src/purple/purple-chat.c:310 msgid "Lock" msgstr "" -#: ../src/purple/purple-chat.c:300 +#: ../src/purple/purple-chat.c:315 msgid "Unlock" msgstr "" -#: ../src/purple/purple-chat.c:321 +#: ../src/purple/purple-chat.c:338 +msgid "Show presentation" +msgstr "" + +#: ../src/purple/purple-chat.c:345 msgid "Meeting entry info" msgstr "" @@ -1151,26 +1183,30 @@ msgstr "" #: ../src/purple/purple-plugin-common.c:933 +msgid "Remote desktop client" +msgstr "" + +#: ../src/purple/purple-plugin-common.c:938 msgid "Media encryption" msgstr "" -#: ../src/purple/purple-plugin-common.c:934 +#: ../src/purple/purple-plugin-common.c:939 msgid "Obey server policy" msgstr "" -#: ../src/purple/purple-plugin-common.c:935 +#: ../src/purple/purple-plugin-common.c:940 msgid "Always" msgstr "" -#: ../src/purple/purple-plugin-common.c:936 +#: ../src/purple/purple-plugin-common.c:941 msgid "Optional" msgstr "" -#: ../src/purple/purple-plugin-common.c:937 +#: ../src/purple/purple-plugin-common.c:942 msgid "Disabled" msgstr "" -#: ../src/purple/purple-plugin-common.c:947 +#: ../src/purple/purple-plugin-common.c:952 msgid "" "Login\n" " user or DOMAIN\\user or\n" @@ -1219,27 +1255,27 @@ msgid "_Search" msgstr "_தேடுக" -#: ../src/purple/purple-transport.c:132 +#: ../src/purple/purple-transport.c:135 msgid "Read error" msgstr "" -#: ../src/purple/purple-transport.c:136 -#: ../src/telepathy/telepathy-transport.c:96 +#: ../src/purple/purple-transport.c:139 +#: ../src/telepathy/telepathy-transport.c:95 msgid "Server has disconnected" msgstr "" -#: ../src/purple/purple-transport.c:198 +#: ../src/purple/purple-transport.c:201 msgid "Could not connect" msgstr "இணைக்க முடியவில்லை" -#: ../src/purple/purple-transport.c:268 +#: ../src/purple/purple-transport.c:271 msgid "Could not create SSL context" msgstr "" -#: ../src/purple/purple-transport.c:290 +#: ../src/purple/purple-transport.c:293 msgid "Could not create socket" msgstr "" -#: ../src/purple/purple-transport.c:381 +#: ../src/purple/purple-transport.c:417 msgid "Write error" msgstr "" diff -Nru pidgin-sipe-1.21.1/po/te.po pidgin-sipe-1.22.1/po/te.po --- pidgin-sipe-1.21.1/po/te.po 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/po/te.po 2017-06-11 15:41:22.000000000 +0000 @@ -10,7 +10,7 @@ "Project-Id-Version: pidgin sipe\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/sipe/bugs/\n" "POT-Creation-Date: 2010-11-30 23:36+0200\n" -"PO-Revision-Date: 2016-05-28 15:08+0000\n" +"PO-Revision-Date: 2017-01-23 17:47+0000\n" "Last-Translator: Stefan Becker \n" "Language-Team: Telugu (http://www.transifex.com/stefanb/pidgin-sipe/language/te/)\n" "MIME-Version: 1.0\n" @@ -19,213 +19,238 @@ "Language: te\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../src/core/sip-transport.c:235 +#: ../src/core/sip-transport.c:240 msgid "Failed to authenticate to server" msgstr "" -#: ../src/core/sip-transport.c:293 +#: ../src/core/sip-transport.c:298 #, c-format msgid "Can't request certificate from %s" msgstr "" -#: ../src/core/sip-transport.c:303 +#: ../src/core/sip-transport.c:308 msgid "No URI for certificate provisioning service provided" msgstr "" -#: ../src/core/sip-transport.c:1281 +#: ../src/core/sip-transport.c:1285 msgid "Authentication failed" msgstr "" -#: ../src/core/sip-transport.c:1338 +#: ../src/core/sip-transport.c:1342 msgid "Incompatible authentication scheme chosen" msgstr "" -#: ../src/core/sip-transport.c:1355 ../src/core/sipe-notify.c:1149 +#: ../src/core/sip-transport.c:1359 ../src/core/sipe-notify.c:1149 #, c-format msgid "You have been rejected by the server: %s" msgstr "" -#: ../src/core/sip-transport.c:1356 ../src/core/sip-transport.c:1372 -#: ../src/core/sip-transport.c:1396 ../src/core/sip-transport.c:1420 +#: ../src/core/sip-transport.c:1360 ../src/core/sip-transport.c:1376 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 #: ../src/core/sipe-conf.c:265 ../src/core/sipe-notify.c:1149 msgid "no reason given" msgstr "" -#: ../src/core/sip-transport.c:1371 +#: ../src/core/sip-transport.c:1375 #, c-format msgid "Not found: %s. Please contact your Administrator" msgstr "" -#: ../src/core/sip-transport.c:1373 +#: ../src/core/sip-transport.c:1377 msgid "SIP is either not enabled for the destination URI or it does not exist" msgstr "" -#: ../src/core/sip-transport.c:1396 ../src/core/sip-transport.c:1420 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 #, c-format msgid "Service unavailable: %s" msgstr "" -#: ../src/core/sip-transport.c:1766 +#: ../src/core/sip-transport.c:1775 msgid "Corrupted message received" msgstr "" -#: ../src/core/sip-transport.c:1790 +#: ../src/core/sip-transport.c:1799 msgid "Invalid message signature received" msgstr "" -#: ../src/core/sipe-buddy.c:540 ../src/core/sipe-buddy.c:2300 +#: ../src/core/sipe-appshare.c:458 +#, c-format +msgid "%s wants to start presenting" +msgstr "" + +#: ../src/core/sipe-appshare.c:462 ../src/core/sipe-conf.c:1086 +msgid "Accept" +msgstr "" + +#: ../src/core/sipe-appshare.c:463 ../src/core/sipe-conf.c:1087 +msgid "Decline" +msgstr "" + +#: ../src/core/sipe-appshare.c:501 ../src/core/sipe-appshare.c:599 +msgid "Application sharing error" +msgstr "" + +#: ../src/core/sipe-appshare.c:502 +msgid "Unknown remote desktop client configured." +msgstr "" + +#: ../src/core/sipe-appshare.c:600 +msgid "Couldn't connect application sharing" +msgstr "" + +#: ../src/core/sipe-buddy.c:541 ../src/core/sipe-buddy.c:2301 msgid "Mobile" msgstr "" -#: ../src/core/sipe-buddy.c:828 +#: ../src/core/sipe-buddy.c:829 msgid "Status" msgstr "" -#: ../src/core/sipe-buddy.c:831 +#: ../src/core/sipe-buddy.c:832 msgid "Calendar" msgstr "" -#: ../src/core/sipe-buddy.c:836 +#: ../src/core/sipe-buddy.c:837 msgid "Meeting in" msgstr "" -#: ../src/core/sipe-buddy.c:840 +#: ../src/core/sipe-buddy.c:841 msgid "Meeting about" msgstr "" -#: ../src/core/sipe-buddy.c:845 +#: ../src/core/sipe-buddy.c:846 msgid "Out of office note" msgstr "" -#: ../src/core/sipe-buddy.c:845 +#: ../src/core/sipe-buddy.c:846 msgid "Note" msgstr "" -#: ../src/core/sipe-buddy.c:850 ../src/core/sipe-buddy.c:2345 +#: ../src/core/sipe-buddy.c:851 ../src/core/sipe-buddy.c:2346 #: ../src/purple/purple-buddy.c:633 msgid "Access level" msgstr "" -#: ../src/core/sipe-buddy.c:1073 +#: ../src/core/sipe-buddy.c:1074 #, c-format msgid "Found %d contact%s:" msgid_plural "Found %d contacts%s:" msgstr[0] "" msgstr[1] "" -#: ../src/core/sipe-buddy.c:1075 +#: ../src/core/sipe-buddy.c:1076 msgid " (more matched your query)" msgstr "" -#: ../src/core/sipe-buddy.c:1121 ../src/core/sipe-buddy.c:1259 +#: ../src/core/sipe-buddy.c:1122 ../src/core/sipe-buddy.c:1260 #: ../src/core/sipe-ucs.c:314 msgid "No contacts found" msgstr "" -#: ../src/core/sipe-buddy.c:1134 ../src/core/sipe-buddy.c:1272 +#: ../src/core/sipe-buddy.c:1135 ../src/core/sipe-buddy.c:1273 #: ../src/core/sipe-ucs.c:278 msgid "Unable to display the search results" msgstr "" -#: ../src/core/sipe-buddy.c:1237 ../src/core/sipe-buddy.c:1249 +#: ../src/core/sipe-buddy.c:1238 ../src/core/sipe-buddy.c:1250 #: ../src/core/sipe-ucs.c:391 msgid "Contact search failed" msgstr "" -#: ../src/core/sipe-buddy.c:1412 ../src/core/sipe-ucs.c:395 +#: ../src/core/sipe-buddy.c:1413 ../src/core/sipe-ucs.c:395 msgid "Invalid contact search query" msgstr "" -#: ../src/core/sipe-buddy.c:2237 +#: ../src/core/sipe-buddy.c:2238 #, c-format msgid "Make leader of '%s'" msgstr "" -#: ../src/core/sipe-buddy.c:2250 +#: ../src/core/sipe-buddy.c:2251 #, c-format msgid "Remove from '%s'" msgstr "" -#: ../src/core/sipe-buddy.c:2264 +#: ../src/core/sipe-buddy.c:2265 #, c-format msgid "Invite to '%s'" msgstr "" -#: ../src/core/sipe-buddy.c:2280 +#: ../src/core/sipe-buddy.c:2281 msgid "New chat" msgstr "" -#: ../src/core/sipe-buddy.c:2293 +#: ../src/core/sipe-buddy.c:2294 msgid "Work" msgstr "" -#: ../src/core/sipe-buddy.c:2308 +#: ../src/core/sipe-buddy.c:2309 msgid "Home" msgstr "" -#: ../src/core/sipe-buddy.c:2316 +#: ../src/core/sipe-buddy.c:2317 msgid "Other" msgstr "" -#: ../src/core/sipe-buddy.c:2324 +#: ../src/core/sipe-buddy.c:2325 msgid "Custom1" msgstr "" -#: ../src/core/sipe-buddy.c:2334 +#: ../src/core/sipe-buddy.c:2335 msgid "Send email..." msgstr "" -#: ../src/core/sipe-cal.c:907 +#: ../src/core/sipe-cal.c:906 msgid "Free" msgstr "" -#: ../src/core/sipe-cal.c:908 +#: ../src/core/sipe-cal.c:907 msgid "Tentative" msgstr "" #. SIPE_ACTIVITY_BUSY -#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:59 +#: ../src/core/sipe-cal.c:908 ../src/core/sipe-status.c:57 msgid "Busy" msgstr "" #. SIPE_ACTIVITY_OOF -#: ../src/core/sipe-cal.c:910 ../src/core/sipe-status.c:70 +#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:68 msgid "Out of office" msgstr "" -#: ../src/core/sipe-cal.c:911 +#: ../src/core/sipe-cal.c:910 msgid "No data" msgstr "" -#: ../src/core/sipe-cal.c:1019 ../src/core/sipe-cal.c:1046 +#: ../src/core/sipe-cal.c:1018 ../src/core/sipe-cal.c:1045 #, c-format msgid "Currently %s" msgstr "" -#: ../src/core/sipe-cal.c:1025 +#: ../src/core/sipe-cal.c:1024 msgid "Outside of working hours for next 8 hours" msgstr "" -#: ../src/core/sipe-cal.c:1027 +#: ../src/core/sipe-cal.c:1026 #, c-format msgid "%s for next 8 hours" msgstr "" -#: ../src/core/sipe-cal.c:1036 +#: ../src/core/sipe-cal.c:1035 msgid "Not working" msgstr "" -#: ../src/core/sipe-cal.c:1040 +#: ../src/core/sipe-cal.c:1039 #, c-format msgid "%s until %.2d:%.2d" msgstr "" -#: ../src/core/sipe-cal.c:1048 +#: ../src/core/sipe-cal.c:1047 #, c-format msgid "%s. Outside of working hours at %.2d:%.2d" msgstr "" -#: ../src/core/sipe-cal.c:1053 +#: ../src/core/sipe-cal.c:1052 #, c-format msgid "%s. %s at %.2d:%.2d" msgstr "" @@ -241,7 +266,7 @@ msgstr "" #. Generate next ID -#: ../src/core/sipe-chat.c:240 +#: ../src/core/sipe-chat.c:246 #, c-format msgid "Chat #%d" msgstr "" @@ -268,123 +293,115 @@ msgid "Incomplete conference information provided" msgstr "" -#: ../src/core/sipe-conf.c:1041 +#: ../src/core/sipe-conf.c:1106 msgid "" "\n" "\n" "As this client was not compiled with voice call support, if you accept, you will be able to contact the other participants only via IM session." msgstr "" -#: ../src/core/sipe-conf.c:1049 +#: ../src/core/sipe-conf.c:1111 #, c-format -msgid "%s wants to invite you to the conference call%s" +msgid "wants to invite you to a conference call%s" msgstr "" -#: ../src/core/sipe-conf.c:1063 -msgid "Accept" -msgstr "" - -#: ../src/core/sipe-conf.c:1064 -msgid "Decline" -msgstr "" - -#: ../src/core/sipe-conf.c:1345 +#: ../src/core/sipe-conf.c:1459 msgid "" "This conference is no longer locked. Additional participants can now join." msgstr "" -#: ../src/core/sipe-conf.c:1349 +#: ../src/core/sipe-conf.c:1463 msgid "" "This conference is locked. Nobody else can join the conference while it is " "locked." msgstr "" -#: ../src/core/sipe-conf.c:1382 +#: ../src/core/sipe-conf.c:1496 msgid "You have been disconnected from this conference." msgstr "" -#: ../src/core/sipe-conf.c:1542 +#: ../src/core/sipe-conf.c:1656 msgid "Dial-in info" msgstr "" -#: ../src/core/sipe-conf.c:1543 +#: ../src/core/sipe-conf.c:1657 msgid "Number" msgstr "" -#: ../src/core/sipe-conf.c:1545 +#: ../src/core/sipe-conf.c:1659 msgid "Conference ID" msgstr "" -#: ../src/core/sipe-conf.c:1547 +#: ../src/core/sipe-conf.c:1661 msgid "Meeting link" msgstr "" -#: ../src/core/sipe-conf.c:1549 +#: ../src/core/sipe-conf.c:1663 msgid "Organizer" msgstr "" -#: ../src/core/sipe-conf.c:1551 +#: ../src/core/sipe-conf.c:1665 msgid "Alternative dial-in numbers" msgstr "" #. The next 13 texts make up the SIPE about note text #. About note, part 1/13: introduction -#: ../src/core/sipe-core.c:220 +#: ../src/core/sipe-core.c:221 msgid "" "A third-party plugin implementing extended version of SIP/SIMPLE used by " "various products" msgstr "" #. About note, part 2/13: home page URL (label) -#: ../src/core/sipe-core.c:222 +#: ../src/core/sipe-core.c:223 msgid "Home Page" msgstr "" #. About note, part 3/13: support forum URL (label) -#: ../src/core/sipe-core.c:224 +#: ../src/core/sipe-core.c:225 msgid "Support" msgstr "" #. About note, part 4/13: support forum name (hyperlink text) -#: ../src/core/sipe-core.c:226 +#: ../src/core/sipe-core.c:227 msgid "Help Forum" msgstr "" #. About note, part 5/13: bug tracker URL (label) -#: ../src/core/sipe-core.c:228 +#: ../src/core/sipe-core.c:229 msgid "Report Problems" msgstr "" #. About note, part 6/13: bug tracker URL (hyperlink text) -#: ../src/core/sipe-core.c:230 +#: ../src/core/sipe-core.c:231 msgid "Bug Tracker" msgstr "" #. About note, part 7/13: translation service URL (label) -#: ../src/core/sipe-core.c:232 +#: ../src/core/sipe-core.c:233 msgid "Translations" msgstr "" #. About note, part 8/13: license type (label) -#: ../src/core/sipe-core.c:234 +#: ../src/core/sipe-core.c:235 msgid "License" msgstr "" #. About note, part 9/13: (REMOVED) #. About note, part 10/13: translation request, text before Transifex.com URL #. append a space if text is not empty -#: ../src/core/sipe-core.c:238 +#: ../src/core/sipe-core.c:239 msgid "Please help us to translate SIPE to your native language here at " msgstr "" #. About note, part 11/13: translation request, text after Transifex.com URL #. start with a space if text is not empty -#: ../src/core/sipe-core.c:241 +#: ../src/core/sipe-core.c:242 msgid " using convenient web interface" msgstr "" #. About note, part 12/13: author list (header) -#: ../src/core/sipe-core.c:243 +#: ../src/core/sipe-core.c:244 msgid "Authors" msgstr "" @@ -392,15 +409,15 @@ #. PLEASE NOTE: do *NOT* simply translate the english original #. but write something similar to the following sentence: #. "Localization for (): " -#: ../src/core/sipe-core.c:248 +#: ../src/core/sipe-core.c:249 msgid "Original texts in English (en): SIPE developers" msgstr "" -#: ../src/core/sipe-core.c:269 +#: ../src/core/sipe-core.c:273 msgid "SIP Exchange user name contains invalid characters" msgstr "" -#: ../src/core/sipe-core.c:277 ../src/purple/purple-buddy.c:485 +#: ../src/core/sipe-core.c:281 ../src/purple/purple-buddy.c:485 #: ../src/telepathy/telepathy-protocol.c:89 #: ../src/telepathy/telepathy-protocol.c:191 #, c-format @@ -409,21 +426,21 @@ "Example: user@company.com" msgstr "" -#: ../src/core/sipe-core.c:284 +#: ../src/core/sipe-core.c:288 msgid "Password is required when Single Sign-On is not enabled" msgstr "" -#: ../src/core/sipe-core.c:294 +#: ../src/core/sipe-core.c:298 msgid "" "Email address should be valid if provided\n" "Example: user@company.com" msgstr "" -#: ../src/core/sipe-core.c:303 +#: ../src/core/sipe-core.c:307 msgid "SIP Exchange user name contains whitespace" msgstr "" -#: ../src/core/sipe-core.c:317 +#: ../src/core/sipe-core.c:321 msgid "" "Email services URL should be valid if provided\n" "Example: https://exchange.corp.com/EWS/Exchange.asmx\n" @@ -454,13 +471,13 @@ msgid "Could not create listen socket" msgstr "" -#: ../src/core/sipe-ft-lync.c:757 ../src/core/sipe-media.c:1195 -#: ../src/core/sipe-media.c:1206 ../src/core/sipe-media.c:1284 -#: ../src/core/sipe-media.c:1740 +#: ../src/core/sipe-ft-lync.c:762 ../src/core/sipe-media.c:1328 +#: ../src/core/sipe-media.c:1339 ../src/core/sipe-media.c:1417 +#: ../src/core/sipe-media.c:1923 msgid "Error occurred" msgstr "" -#: ../src/core/sipe-ft-lync.c:758 +#: ../src/core/sipe-ft-lync.c:763 msgid "Error creating data stream" msgstr "" @@ -495,7 +512,7 @@ msgstr "" #: ../src/core/sipe-group.c:168 ../src/core/sipe-notify.c:1163 -#: ../src/core/sipe-notify.c:1190 ../src/core/sipe-notify.c:1294 +#: ../src/core/sipe-notify.c:1197 ../src/core/sipe-notify.c:1301 #: ../src/purple/purple-search.c:128 msgid "Other Contacts" msgstr "" @@ -533,77 +550,77 @@ msgid "Failed to invite %s" msgstr "" -#: ../src/core/sipe-incoming.c:741 +#: ../src/core/sipe-incoming.c:754 #, c-format msgid "Received a message with unrecognized contents from %s" msgstr "" -#: ../src/core/sipe-media.c:835 ../src/core/sipe-media.c:1347 -#: ../src/core/sipe-media.c:1357 ../src/core/sipe-media.c:1721 -#: ../src/core/sipe-media.c:1741 +#: ../src/core/sipe-media.c:869 ../src/core/sipe-media.c:1483 +#: ../src/core/sipe-media.c:1493 ../src/core/sipe-media.c:1904 +#: ../src/core/sipe-media.c:1924 msgid "Unable to establish a call" msgstr "" -#: ../src/core/sipe-media.c:836 ../src/core/sipe-media.c:1722 +#: ../src/core/sipe-media.c:870 ../src/core/sipe-media.c:1905 msgid "Encryption settings of peer are incompatible with ours." msgstr "" -#: ../src/core/sipe-media.c:929 +#: ../src/core/sipe-media.c:963 #, c-format msgid "User %s rejected call" msgstr "" -#: ../src/core/sipe-media.c:930 +#: ../src/core/sipe-media.c:964 msgid "Call rejected" msgstr "" -#: ../src/core/sipe-media.c:1196 ../src/core/sipe-media.c:1285 +#: ../src/core/sipe-media.c:1329 ../src/core/sipe-media.c:1418 msgid "Error creating audio stream" msgstr "" -#: ../src/core/sipe-media.c:1207 +#: ../src/core/sipe-media.c:1340 msgid "Error creating video stream" msgstr "" -#: ../src/core/sipe-media.c:1251 ../src/purple/purple-chat.c:314 +#: ../src/core/sipe-media.c:1384 ../src/purple/purple-chat.c:329 msgid "Join conference call" msgstr "" -#: ../src/core/sipe-media.c:1252 +#: ../src/core/sipe-media.c:1385 msgid "Conference calls are not supported on this server." msgstr "" -#: ../src/core/sipe-media.c:1348 +#: ../src/core/sipe-media.c:1484 msgid "Invalid phone number" msgstr "" -#: ../src/core/sipe-media.c:1358 +#: ../src/core/sipe-media.c:1494 msgid "Audio Test Service is not available." msgstr "" -#: ../src/core/sipe-media.c:1690 +#: ../src/core/sipe-media.c:1873 msgid "User unavailable" msgstr "" -#: ../src/core/sipe-media.c:1693 +#: ../src/core/sipe-media.c:1876 #, c-format msgid "%s does not want to be disturbed" msgstr "" -#: ../src/core/sipe-media.c:1695 +#: ../src/core/sipe-media.c:1878 #, c-format msgid "User %s is not available" msgstr "" -#: ../src/core/sipe-media.c:1704 +#: ../src/core/sipe-media.c:1887 msgid "Unsupported media type" msgstr "" -#: ../src/core/sipe-media.c:2062 +#: ../src/core/sipe-media.c:2246 msgid "Media error" msgstr "" -#: ../src/core/sipe-media.c:2063 +#: ../src/core/sipe-media.c:2247 msgid "Error while reading from stream" msgstr "" @@ -654,36 +671,36 @@ msgstr "" #. Translators: remove (clear) previously assigned access level -#: ../src/core/sipe-ocs2007.c:2571 +#: ../src/core/sipe-ocs2007.c:2570 msgid "Unspecify" msgstr "" -#: ../src/core/sipe-ocs2007.c:2590 +#: ../src/core/sipe-ocs2007.c:2589 msgid "People in my company" msgstr "" -#: ../src/core/sipe-ocs2007.c:2600 +#: ../src/core/sipe-ocs2007.c:2599 msgid "People in domains connected with my company" msgstr "" -#: ../src/core/sipe-ocs2007.c:2609 +#: ../src/core/sipe-ocs2007.c:2608 msgid "People in public domains" msgstr "" -#: ../src/core/sipe-ocs2007.c:2619 +#: ../src/core/sipe-ocs2007.c:2618 #, c-format msgid "People at %s" msgstr "" -#: ../src/core/sipe-ocs2007.c:2644 +#: ../src/core/sipe-ocs2007.c:2643 msgid "Add new domain..." msgstr "" -#: ../src/core/sipe-ocs2007.c:2673 +#: ../src/core/sipe-ocs2007.c:2672 msgid "Online help..." msgstr "" -#: ../src/core/sipe-ocs2007.c:2681 +#: ../src/core/sipe-ocs2007.c:2680 msgid "Access groups" msgstr "" @@ -695,49 +712,60 @@ #. SIPE_ACTIVITY_AVAILABLE #. SIPE_ACTIVITY_ONLINE #. SIPE_ACTIVITY_INACTIVE -#: ../src/core/sipe-status.c:58 +#: ../src/core/sipe-status.c:56 msgid "Inactive" msgstr "" #. SIPE_ACTIVITY_BUSYIDLE -#: ../src/core/sipe-status.c:60 +#: ../src/core/sipe-status.c:58 msgid "Busy-Idle" msgstr "" #. SIPE_ACTIVITY_DND #. SIPE_ACTIVITY_BRB -#: ../src/core/sipe-status.c:62 +#: ../src/core/sipe-status.c:60 msgid "Be right back" msgstr "" #. SIPE_ACTIVITY_AWAY #. SIPE_ACTIVITY_LUNCH -#: ../src/core/sipe-status.c:64 +#: ../src/core/sipe-status.c:62 msgid "Out to lunch" msgstr "" #. SIPE_ACTIVITY_INVISIBLE #. SIPE_ACTIVITY_OFFLINE #. SIPE_ACTIVITY_ON_PHONE -#: ../src/core/sipe-status.c:67 +#: ../src/core/sipe-status.c:65 msgid "In a call" msgstr "" #. SIPE_ACTIVITY_IN_CONF -#: ../src/core/sipe-status.c:68 +#: ../src/core/sipe-status.c:66 msgid "In a conference" msgstr "" #. SIPE_ACTIVITY_IN_MEETING -#: ../src/core/sipe-status.c:69 +#: ../src/core/sipe-status.c:67 msgid "In a meeting" msgstr "" #. SIPE_ACTIVITY_URGENT_ONLY -#: ../src/core/sipe-status.c:71 +#: ../src/core/sipe-status.c:69 msgid "Urgent interruptions only" msgstr "" +#: ../src/core/sipe-subscriptions.c:189 +msgid "Presence subscription failed!" +msgstr "" + +#: ../src/core/sipe-subscriptions.c:190 +msgid "" +"One or more buddies will therefore permanently show as offline.\n" +"\n" +"Please check that there are no corrupted SIP URIs in your contacts list." +msgstr "" + #: ../src/core/sipe-ucs.c:674 msgid "UCS initialization failed!" msgstr "" @@ -890,15 +918,19 @@ msgid "Copy to" msgstr "" -#: ../src/purple/purple-chat.c:295 +#: ../src/purple/purple-chat.c:310 msgid "Lock" msgstr "" -#: ../src/purple/purple-chat.c:300 +#: ../src/purple/purple-chat.c:315 msgid "Unlock" msgstr "" -#: ../src/purple/purple-chat.c:321 +#: ../src/purple/purple-chat.c:338 +msgid "Show presentation" +msgstr "" + +#: ../src/purple/purple-chat.c:345 msgid "Meeting entry info" msgstr "" @@ -1150,26 +1182,30 @@ msgstr "" #: ../src/purple/purple-plugin-common.c:933 +msgid "Remote desktop client" +msgstr "" + +#: ../src/purple/purple-plugin-common.c:938 msgid "Media encryption" msgstr "" -#: ../src/purple/purple-plugin-common.c:934 +#: ../src/purple/purple-plugin-common.c:939 msgid "Obey server policy" msgstr "" -#: ../src/purple/purple-plugin-common.c:935 +#: ../src/purple/purple-plugin-common.c:940 msgid "Always" msgstr "" -#: ../src/purple/purple-plugin-common.c:936 +#: ../src/purple/purple-plugin-common.c:941 msgid "Optional" msgstr "" -#: ../src/purple/purple-plugin-common.c:937 +#: ../src/purple/purple-plugin-common.c:942 msgid "Disabled" msgstr "" -#: ../src/purple/purple-plugin-common.c:947 +#: ../src/purple/purple-plugin-common.c:952 msgid "" "Login\n" " user or DOMAIN\\user or\n" @@ -1218,27 +1254,27 @@ msgid "_Search" msgstr "" -#: ../src/purple/purple-transport.c:132 +#: ../src/purple/purple-transport.c:135 msgid "Read error" msgstr "" -#: ../src/purple/purple-transport.c:136 -#: ../src/telepathy/telepathy-transport.c:96 +#: ../src/purple/purple-transport.c:139 +#: ../src/telepathy/telepathy-transport.c:95 msgid "Server has disconnected" msgstr "" -#: ../src/purple/purple-transport.c:198 +#: ../src/purple/purple-transport.c:201 msgid "Could not connect" msgstr "" -#: ../src/purple/purple-transport.c:268 +#: ../src/purple/purple-transport.c:271 msgid "Could not create SSL context" msgstr "" -#: ../src/purple/purple-transport.c:290 +#: ../src/purple/purple-transport.c:293 msgid "Could not create socket" msgstr "" -#: ../src/purple/purple-transport.c:381 +#: ../src/purple/purple-transport.c:417 msgid "Write error" msgstr "" diff -Nru pidgin-sipe-1.21.1/po/tr.po pidgin-sipe-1.22.1/po/tr.po --- pidgin-sipe-1.21.1/po/tr.po 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/po/tr.po 2017-06-11 15:41:22.000000000 +0000 @@ -5,7 +5,7 @@ # # # Translators: -# onur , 2013,2015 +# onur , 2013,2015-2017 # onur , 2012 # Stefan Becker , 2013 msgid "" @@ -13,8 +13,8 @@ "Project-Id-Version: pidgin sipe\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/sipe/bugs/\n" "POT-Creation-Date: 2010-11-30 23:36+0200\n" -"PO-Revision-Date: 2016-05-28 15:08+0000\n" -"Last-Translator: Stefan Becker \n" +"PO-Revision-Date: 2017-02-07 19:34+0000\n" +"Last-Translator: onur \n" "Language-Team: Turkish (http://www.transifex.com/stefanb/pidgin-sipe/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,213 +22,238 @@ "Language: tr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: ../src/core/sip-transport.c:235 +#: ../src/core/sip-transport.c:240 msgid "Failed to authenticate to server" msgstr "Sunucuda kimlik doğrulaması yapılamadı" -#: ../src/core/sip-transport.c:293 +#: ../src/core/sip-transport.c:298 #, c-format msgid "Can't request certificate from %s" msgstr "%s'den sertifika istenemiyor " -#: ../src/core/sip-transport.c:303 +#: ../src/core/sip-transport.c:308 msgid "No URI for certificate provisioning service provided" msgstr "Sertifika sağlama servisi için URI belirtilmedi" -#: ../src/core/sip-transport.c:1281 +#: ../src/core/sip-transport.c:1285 msgid "Authentication failed" msgstr "Kimlik doğrulaması başarısız oldu" -#: ../src/core/sip-transport.c:1338 +#: ../src/core/sip-transport.c:1342 msgid "Incompatible authentication scheme chosen" msgstr "Seçilen kimlik doğrulama düzeni uygun değildir" -#: ../src/core/sip-transport.c:1355 ../src/core/sipe-notify.c:1149 +#: ../src/core/sip-transport.c:1359 ../src/core/sipe-notify.c:1149 #, c-format msgid "You have been rejected by the server: %s" msgstr "Sunucu tarafından reddedildiniz: %s" -#: ../src/core/sip-transport.c:1356 ../src/core/sip-transport.c:1372 -#: ../src/core/sip-transport.c:1396 ../src/core/sip-transport.c:1420 +#: ../src/core/sip-transport.c:1360 ../src/core/sip-transport.c:1376 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 #: ../src/core/sipe-conf.c:265 ../src/core/sipe-notify.c:1149 msgid "no reason given" msgstr "bir neden bildirilmedi" -#: ../src/core/sip-transport.c:1371 +#: ../src/core/sip-transport.c:1375 #, c-format msgid "Not found: %s. Please contact your Administrator" msgstr "Bulunamadı: %s. Lütfen yöneticinize başvurun" -#: ../src/core/sip-transport.c:1373 +#: ../src/core/sip-transport.c:1377 msgid "SIP is either not enabled for the destination URI or it does not exist" msgstr "SIP, hedef URI için etkin değil veya mevcut değil" -#: ../src/core/sip-transport.c:1396 ../src/core/sip-transport.c:1420 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 #, c-format msgid "Service unavailable: %s" msgstr "Servis kullanılamıyor: %s" -#: ../src/core/sip-transport.c:1766 +#: ../src/core/sip-transport.c:1775 msgid "Corrupted message received" msgstr "Hatalı bir ileti alındı" -#: ../src/core/sip-transport.c:1790 +#: ../src/core/sip-transport.c:1799 msgid "Invalid message signature received" msgstr "Geçersiz ileti imzası alındı" -#: ../src/core/sipe-buddy.c:540 ../src/core/sipe-buddy.c:2300 +#: ../src/core/sipe-appshare.c:458 +#, c-format +msgid "%s wants to start presenting" +msgstr "%s sunum yapmak istiyor" + +#: ../src/core/sipe-appshare.c:462 ../src/core/sipe-conf.c:1086 +msgid "Accept" +msgstr "Kabul et" + +#: ../src/core/sipe-appshare.c:463 ../src/core/sipe-conf.c:1087 +msgid "Decline" +msgstr "Reddet" + +#: ../src/core/sipe-appshare.c:501 ../src/core/sipe-appshare.c:599 +msgid "Application sharing error" +msgstr "Uygulama paylaşım hatası" + +#: ../src/core/sipe-appshare.c:502 +msgid "Unknown remote desktop client configured." +msgstr "Bilinmeyen bir uzak masaüstü istemcisi tanımlanmış." + +#: ../src/core/sipe-appshare.c:600 +msgid "Couldn't connect application sharing" +msgstr "Uygulama paylaşımına bağlanılamıyor." + +#: ../src/core/sipe-buddy.c:541 ../src/core/sipe-buddy.c:2301 msgid "Mobile" msgstr "Cep" -#: ../src/core/sipe-buddy.c:828 +#: ../src/core/sipe-buddy.c:829 msgid "Status" msgstr "Durum" -#: ../src/core/sipe-buddy.c:831 +#: ../src/core/sipe-buddy.c:832 msgid "Calendar" msgstr "Takvim" -#: ../src/core/sipe-buddy.c:836 +#: ../src/core/sipe-buddy.c:837 msgid "Meeting in" msgstr "Toplantı yeri" -#: ../src/core/sipe-buddy.c:840 +#: ../src/core/sipe-buddy.c:841 msgid "Meeting about" msgstr "Toplantı konusu" -#: ../src/core/sipe-buddy.c:845 +#: ../src/core/sipe-buddy.c:846 msgid "Out of office note" msgstr "\"Ofis dışında\" notu" -#: ../src/core/sipe-buddy.c:845 +#: ../src/core/sipe-buddy.c:846 msgid "Note" msgstr "Not" -#: ../src/core/sipe-buddy.c:850 ../src/core/sipe-buddy.c:2345 +#: ../src/core/sipe-buddy.c:851 ../src/core/sipe-buddy.c:2346 #: ../src/purple/purple-buddy.c:633 msgid "Access level" msgstr "Erişim düzeyi" -#: ../src/core/sipe-buddy.c:1073 +#: ../src/core/sipe-buddy.c:1074 #, c-format msgid "Found %d contact%s:" msgid_plural "Found %d contacts%s:" msgstr[0] "%d kişi bulundu%s:\n%d kişi bulundu%s:" msgstr[1] "%d kişi bulundu%s:\n%d kişi bulundu%s:" -#: ../src/core/sipe-buddy.c:1075 +#: ../src/core/sipe-buddy.c:1076 msgid " (more matched your query)" msgstr "(aramanız daha fazla sonuç verdi)" -#: ../src/core/sipe-buddy.c:1121 ../src/core/sipe-buddy.c:1259 +#: ../src/core/sipe-buddy.c:1122 ../src/core/sipe-buddy.c:1260 #: ../src/core/sipe-ucs.c:314 msgid "No contacts found" msgstr "Aranan kişi bulunamadı" -#: ../src/core/sipe-buddy.c:1134 ../src/core/sipe-buddy.c:1272 +#: ../src/core/sipe-buddy.c:1135 ../src/core/sipe-buddy.c:1273 #: ../src/core/sipe-ucs.c:278 msgid "Unable to display the search results" msgstr "Arama sonuçları görüntülenemiyor" -#: ../src/core/sipe-buddy.c:1237 ../src/core/sipe-buddy.c:1249 +#: ../src/core/sipe-buddy.c:1238 ../src/core/sipe-buddy.c:1250 #: ../src/core/sipe-ucs.c:391 msgid "Contact search failed" msgstr "Kişi araması başarısız oldu" -#: ../src/core/sipe-buddy.c:1412 ../src/core/sipe-ucs.c:395 +#: ../src/core/sipe-buddy.c:1413 ../src/core/sipe-ucs.c:395 msgid "Invalid contact search query" msgstr "Hatalı kişi arama sorgusu" -#: ../src/core/sipe-buddy.c:2237 +#: ../src/core/sipe-buddy.c:2238 #, c-format msgid "Make leader of '%s'" msgstr "'%s' adlı kişiyi lider yap" -#: ../src/core/sipe-buddy.c:2250 +#: ../src/core/sipe-buddy.c:2251 #, c-format msgid "Remove from '%s'" msgstr "'%s'den çıkar" -#: ../src/core/sipe-buddy.c:2264 +#: ../src/core/sipe-buddy.c:2265 #, c-format msgid "Invite to '%s'" msgstr "'%s'e davet et" -#: ../src/core/sipe-buddy.c:2280 +#: ../src/core/sipe-buddy.c:2281 msgid "New chat" msgstr "Yeni sohbet" -#: ../src/core/sipe-buddy.c:2293 +#: ../src/core/sipe-buddy.c:2294 msgid "Work" msgstr "İş" -#: ../src/core/sipe-buddy.c:2308 +#: ../src/core/sipe-buddy.c:2309 msgid "Home" msgstr "Ev" -#: ../src/core/sipe-buddy.c:2316 +#: ../src/core/sipe-buddy.c:2317 msgid "Other" msgstr "Diğer" -#: ../src/core/sipe-buddy.c:2324 +#: ../src/core/sipe-buddy.c:2325 msgid "Custom1" msgstr "Özel1" -#: ../src/core/sipe-buddy.c:2334 +#: ../src/core/sipe-buddy.c:2335 msgid "Send email..." msgstr "E-posta gönder..." -#: ../src/core/sipe-cal.c:907 +#: ../src/core/sipe-cal.c:906 msgid "Free" msgstr "Serbest" -#: ../src/core/sipe-cal.c:908 +#: ../src/core/sipe-cal.c:907 msgid "Tentative" msgstr "Kesin değil" #. SIPE_ACTIVITY_BUSY -#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:59 +#: ../src/core/sipe-cal.c:908 ../src/core/sipe-status.c:57 msgid "Busy" msgstr "Meşgul" #. SIPE_ACTIVITY_OOF -#: ../src/core/sipe-cal.c:910 ../src/core/sipe-status.c:70 +#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:68 msgid "Out of office" msgstr "Ofis dışında" -#: ../src/core/sipe-cal.c:911 +#: ../src/core/sipe-cal.c:910 msgid "No data" msgstr "Veri yok" -#: ../src/core/sipe-cal.c:1019 ../src/core/sipe-cal.c:1046 +#: ../src/core/sipe-cal.c:1018 ../src/core/sipe-cal.c:1045 #, c-format msgid "Currently %s" msgstr "Şu anda %s" -#: ../src/core/sipe-cal.c:1025 +#: ../src/core/sipe-cal.c:1024 msgid "Outside of working hours for next 8 hours" msgstr "Gelecek 8 saat boyunca çalışma saatleri dışında" -#: ../src/core/sipe-cal.c:1027 +#: ../src/core/sipe-cal.c:1026 #, c-format msgid "%s for next 8 hours" msgstr "Gelecek 8 saat boyunca %s" -#: ../src/core/sipe-cal.c:1036 +#: ../src/core/sipe-cal.c:1035 msgid "Not working" msgstr "Çalışmıyor" -#: ../src/core/sipe-cal.c:1040 +#: ../src/core/sipe-cal.c:1039 #, c-format msgid "%s until %.2d:%.2d" msgstr "%.2d:%.2d'e kadar %s" -#: ../src/core/sipe-cal.c:1048 +#: ../src/core/sipe-cal.c:1047 #, c-format msgid "%s. Outside of working hours at %.2d:%.2d" msgstr "%s. %.2d:%.2d çalışma saatleri dışında" -#: ../src/core/sipe-cal.c:1053 +#: ../src/core/sipe-cal.c:1052 #, c-format msgid "%s. %s at %.2d:%.2d" msgstr "%s. %.2d:%.2d itibarıyla %s" @@ -244,7 +269,7 @@ msgstr "%s için web bileti isteği başarısız oldu" #. Generate next ID -#: ../src/core/sipe-chat.c:240 +#: ../src/core/sipe-chat.c:246 #, c-format msgid "Chat #%d" msgstr "Sohbet #%d" @@ -260,7 +285,7 @@ "Can't find a conference URI on this page:\n" "\n" "%s" -msgstr "" +msgstr "Bu sayfada konferans için bir URI bulunamadı:\n\n\n%s" #: ../src/core/sipe-conf.c:443 #, c-format @@ -269,125 +294,117 @@ #: ../src/core/sipe-conf.c:499 msgid "Incomplete conference information provided" -msgstr "" +msgstr "Girilen konferans bilgisi yetersiz" -#: ../src/core/sipe-conf.c:1041 +#: ../src/core/sipe-conf.c:1106 msgid "" "\n" "\n" "As this client was not compiled with voice call support, if you accept, you will be able to contact the other participants only via IM session." msgstr "\n\nBu program ses desteği olmadan derlenmiş olduğundan, eğer kabul ederseniz, diğer kişilerle sadece mesajlaşarak iletişim kurabileceksiniz." -#: ../src/core/sipe-conf.c:1049 +#: ../src/core/sipe-conf.c:1111 #, c-format -msgid "%s wants to invite you to the conference call%s" -msgstr "%s sizi %s konferans görüşmesine davet etmek istiyor" - -#: ../src/core/sipe-conf.c:1063 -msgid "Accept" -msgstr "Kabul et" - -#: ../src/core/sipe-conf.c:1064 -msgid "Decline" -msgstr "Reddet" +msgid "wants to invite you to a conference call%s" +msgstr "seni %s konferans görüşmesine davet etmek istiyor" -#: ../src/core/sipe-conf.c:1345 +#: ../src/core/sipe-conf.c:1459 msgid "" "This conference is no longer locked. Additional participants can now join." msgstr "Bu görüşme artık kilitli değil. Başkaları da katılabilir. " -#: ../src/core/sipe-conf.c:1349 +#: ../src/core/sipe-conf.c:1463 msgid "" "This conference is locked. Nobody else can join the conference while it is " "locked." msgstr "Bu görüşme kilitli. Görüşme kilitli olduğu sürece başka kimse katılamaz." -#: ../src/core/sipe-conf.c:1382 +#: ../src/core/sipe-conf.c:1496 msgid "You have been disconnected from this conference." msgstr "Bu görüşmeyle bağlantınız kesildi." -#: ../src/core/sipe-conf.c:1542 +#: ../src/core/sipe-conf.c:1656 msgid "Dial-in info" -msgstr "" +msgstr "Arama bilgisi" -#: ../src/core/sipe-conf.c:1543 +#: ../src/core/sipe-conf.c:1657 msgid "Number" -msgstr "" +msgstr "Numara" -#: ../src/core/sipe-conf.c:1545 +#: ../src/core/sipe-conf.c:1659 msgid "Conference ID" -msgstr "" +msgstr "Konferans kimliği" -#: ../src/core/sipe-conf.c:1547 +#: ../src/core/sipe-conf.c:1661 msgid "Meeting link" -msgstr "" +msgstr "Toplantı bağlantısı" -#: ../src/core/sipe-conf.c:1549 +#: ../src/core/sipe-conf.c:1663 msgid "Organizer" -msgstr "" +msgstr "Düzenleyen" -#: ../src/core/sipe-conf.c:1551 +#: ../src/core/sipe-conf.c:1665 msgid "Alternative dial-in numbers" -msgstr "" +msgstr "Alternatif arama numaraları" #. The next 13 texts make up the SIPE about note text #. About note, part 1/13: introduction -#: ../src/core/sipe-core.c:220 +#: ../src/core/sipe-core.c:221 msgid "" "A third-party plugin implementing extended version of SIP/SIMPLE used by " "various products" msgstr "Birçok ürün tarafından kullanılan SIP/SIMPLE'ın genişletilmiş sürümünü uygulayan bir üçüncü taraf eklentisi" #. About note, part 2/13: home page URL (label) -#: ../src/core/sipe-core.c:222 +#: ../src/core/sipe-core.c:223 msgid "Home Page" msgstr "Kişisel Web Sayfası" #. About note, part 3/13: support forum URL (label) -#: ../src/core/sipe-core.c:224 +#: ../src/core/sipe-core.c:225 msgid "Support" msgstr "Destek" #. About note, part 4/13: support forum name (hyperlink text) -#: ../src/core/sipe-core.c:226 +#: ../src/core/sipe-core.c:227 msgid "Help Forum" msgstr "Yardım Forumu" #. About note, part 5/13: bug tracker URL (label) -#: ../src/core/sipe-core.c:228 +#: ../src/core/sipe-core.c:229 msgid "Report Problems" msgstr "Sorun Bildir" #. About note, part 6/13: bug tracker URL (hyperlink text) -#: ../src/core/sipe-core.c:230 +#: ../src/core/sipe-core.c:231 msgid "Bug Tracker" msgstr "Hata Takibi" #. About note, part 7/13: translation service URL (label) -#: ../src/core/sipe-core.c:232 +#: ../src/core/sipe-core.c:233 msgid "Translations" msgstr "Çeviriler" #. About note, part 8/13: license type (label) -#: ../src/core/sipe-core.c:234 +#: ../src/core/sipe-core.c:235 msgid "License" msgstr "Lisans" #. About note, part 9/13: (REMOVED) #. About note, part 10/13: translation request, text before Transifex.com URL #. append a space if text is not empty -#: ../src/core/sipe-core.c:238 +#: ../src/core/sipe-core.c:239 msgid "Please help us to translate SIPE to your native language here at " msgstr "Lütfen burada pratik web arayüzünü kullanarak SIPE'ı anadilinize çevirmemize yardımcı olun" #. About note, part 11/13: translation request, text after Transifex.com URL #. start with a space if text is not empty -#: ../src/core/sipe-core.c:241 +#: ../src/core/sipe-core.c:242 msgid " using convenient web interface" msgstr "pratik web arayüzünü kullanarak" #. About note, part 12/13: author list (header) -#: ../src/core/sipe-core.c:243 +#: ../src/core/sipe-core.c:244 msgid "Authors" msgstr "Yazarlar" @@ -395,15 +412,15 @@ #. PLEASE NOTE: do *NOT* simply translate the english original #. but write something similar to the following sentence: #. "Localization for (): " -#: ../src/core/sipe-core.c:248 +#: ../src/core/sipe-core.c:249 msgid "Original texts in English (en): SIPE developers" msgstr "Orijinal metinler İngilizce (en): SIPE geliştiricileri" -#: ../src/core/sipe-core.c:269 +#: ../src/core/sipe-core.c:273 msgid "SIP Exchange user name contains invalid characters" msgstr "SIP Exchange kullanıcı adı geçersiz karakterler içeriyor" -#: ../src/core/sipe-core.c:277 ../src/purple/purple-buddy.c:485 +#: ../src/core/sipe-core.c:281 ../src/purple/purple-buddy.c:485 #: ../src/telepathy/telepathy-protocol.c:89 #: ../src/telepathy/telepathy-protocol.c:191 #, c-format @@ -412,21 +429,21 @@ "Example: user@company.com" msgstr "Kullanıcı adı geçerli bir SIP URI olmalıdır\nÖrnek: kullanıcı@firma.com" -#: ../src/core/sipe-core.c:284 +#: ../src/core/sipe-core.c:288 msgid "Password is required when Single Sign-On is not enabled" msgstr "Tek yerden oturum açma etkin değilken şifre gerekmektedir" -#: ../src/core/sipe-core.c:294 +#: ../src/core/sipe-core.c:298 msgid "" "Email address should be valid if provided\n" "Example: user@company.com" msgstr "E-posta adresi girilmişse geçerli olmalıdır\nÖrnek: kullanıcı@firma.com" -#: ../src/core/sipe-core.c:303 +#: ../src/core/sipe-core.c:307 msgid "SIP Exchange user name contains whitespace" msgstr "SIP Exchange kullanıcı adı boşluk içeriyor" -#: ../src/core/sipe-core.c:317 +#: ../src/core/sipe-core.c:321 msgid "" "Email services URL should be valid if provided\n" "Example: https://exchange.corp.com/EWS/Exchange.asmx\n" @@ -457,15 +474,15 @@ msgid "Could not create listen socket" msgstr "Dinleme soketi oluşturulamadı" -#: ../src/core/sipe-ft-lync.c:757 ../src/core/sipe-media.c:1195 -#: ../src/core/sipe-media.c:1206 ../src/core/sipe-media.c:1284 -#: ../src/core/sipe-media.c:1740 +#: ../src/core/sipe-ft-lync.c:762 ../src/core/sipe-media.c:1328 +#: ../src/core/sipe-media.c:1339 ../src/core/sipe-media.c:1417 +#: ../src/core/sipe-media.c:1923 msgid "Error occurred" msgstr "Hata oluştu" -#: ../src/core/sipe-ft-lync.c:758 +#: ../src/core/sipe-ft-lync.c:763 msgid "Error creating data stream" -msgstr "" +msgstr "Veri akışını gerçekleştirirken hata oluştu" #: ../src/core/sipe-ft-tftp.c:115 ../src/core/sipe-ft-tftp.c:525 #: ../src/core/sipe-ft-tftp.c:534 @@ -498,7 +515,7 @@ msgstr "Bellek yetersiz" #: ../src/core/sipe-group.c:168 ../src/core/sipe-notify.c:1163 -#: ../src/core/sipe-notify.c:1190 ../src/core/sipe-notify.c:1294 +#: ../src/core/sipe-notify.c:1197 ../src/core/sipe-notify.c:1301 #: ../src/purple/purple-search.c:128 msgid "Other Contacts" msgstr "Diğer Kişiler" @@ -536,79 +553,79 @@ msgid "Failed to invite %s" msgstr "%s davet edilemedi" -#: ../src/core/sipe-incoming.c:741 +#: ../src/core/sipe-incoming.c:754 #, c-format msgid "Received a message with unrecognized contents from %s" msgstr "%s adresinden tanınmayan içerikli bir mesaj alındı" -#: ../src/core/sipe-media.c:835 ../src/core/sipe-media.c:1347 -#: ../src/core/sipe-media.c:1357 ../src/core/sipe-media.c:1721 -#: ../src/core/sipe-media.c:1741 +#: ../src/core/sipe-media.c:869 ../src/core/sipe-media.c:1483 +#: ../src/core/sipe-media.c:1493 ../src/core/sipe-media.c:1904 +#: ../src/core/sipe-media.c:1924 msgid "Unable to establish a call" msgstr "Çağrı yapılamıyor" -#: ../src/core/sipe-media.c:836 ../src/core/sipe-media.c:1722 +#: ../src/core/sipe-media.c:870 ../src/core/sipe-media.c:1905 msgid "Encryption settings of peer are incompatible with ours." msgstr "Karşı tarafın şifreleme ayarları bizimkiyle uyumsuz." -#: ../src/core/sipe-media.c:929 +#: ../src/core/sipe-media.c:963 #, c-format msgid "User %s rejected call" msgstr "%s adlı kullanıcı çağrıyı reddetti" -#: ../src/core/sipe-media.c:930 +#: ../src/core/sipe-media.c:964 msgid "Call rejected" msgstr "Çağrı reddedildi" -#: ../src/core/sipe-media.c:1196 ../src/core/sipe-media.c:1285 +#: ../src/core/sipe-media.c:1329 ../src/core/sipe-media.c:1418 msgid "Error creating audio stream" msgstr "Ses akışını gerçekleştirirken hata oluştu" -#: ../src/core/sipe-media.c:1207 +#: ../src/core/sipe-media.c:1340 msgid "Error creating video stream" msgstr "Video akışını gerçekleştirirken hata oluştu" -#: ../src/core/sipe-media.c:1251 ../src/purple/purple-chat.c:314 +#: ../src/core/sipe-media.c:1384 ../src/purple/purple-chat.c:329 msgid "Join conference call" msgstr "Konferans çağrısına katıl" -#: ../src/core/sipe-media.c:1252 +#: ../src/core/sipe-media.c:1385 msgid "Conference calls are not supported on this server." msgstr "Bu sunucuda konferans görüşmeleri desteklenmemektedir." -#: ../src/core/sipe-media.c:1348 +#: ../src/core/sipe-media.c:1484 msgid "Invalid phone number" msgstr "Geçersiz telefon numarası" -#: ../src/core/sipe-media.c:1358 +#: ../src/core/sipe-media.c:1494 msgid "Audio Test Service is not available." msgstr "Ses Test Servisi mevcut değil." -#: ../src/core/sipe-media.c:1690 +#: ../src/core/sipe-media.c:1873 msgid "User unavailable" msgstr "Kullanıcıya ulaşılamıyor" -#: ../src/core/sipe-media.c:1693 +#: ../src/core/sipe-media.c:1876 #, c-format msgid "%s does not want to be disturbed" msgstr "%s rahatsız edilmek istemiyor" -#: ../src/core/sipe-media.c:1695 +#: ../src/core/sipe-media.c:1878 #, c-format msgid "User %s is not available" msgstr "%s adlı kullanıcıya ulaşılamıyor" -#: ../src/core/sipe-media.c:1704 +#: ../src/core/sipe-media.c:1887 msgid "Unsupported media type" msgstr "Desteklenmeyen ortam türü" -#: ../src/core/sipe-media.c:2062 +#: ../src/core/sipe-media.c:2246 msgid "Media error" -msgstr "" +msgstr "Ortam hatası" -#: ../src/core/sipe-media.c:2063 +#: ../src/core/sipe-media.c:2247 msgid "Error while reading from stream" -msgstr "" +msgstr "Akışı okurken hata oluştu" #. reason = g_strdup(_("User logged out")); // [MS-OCER] #: ../src/core/sipe-notify.c:1141 @@ -657,36 +674,36 @@ msgstr "Bilinmeyen" #. Translators: remove (clear) previously assigned access level -#: ../src/core/sipe-ocs2007.c:2571 +#: ../src/core/sipe-ocs2007.c:2570 msgid "Unspecify" msgstr "Belirtme" -#: ../src/core/sipe-ocs2007.c:2590 +#: ../src/core/sipe-ocs2007.c:2589 msgid "People in my company" msgstr "Şirketimdeki kişiler" -#: ../src/core/sipe-ocs2007.c:2600 +#: ../src/core/sipe-ocs2007.c:2599 msgid "People in domains connected with my company" msgstr "Şirketime bağlı alanlardaki kişiler" -#: ../src/core/sipe-ocs2007.c:2609 +#: ../src/core/sipe-ocs2007.c:2608 msgid "People in public domains" msgstr "Genel alanlardaki kişiler" -#: ../src/core/sipe-ocs2007.c:2619 +#: ../src/core/sipe-ocs2007.c:2618 #, c-format msgid "People at %s" msgstr "%s konumundaki kişiler" -#: ../src/core/sipe-ocs2007.c:2644 +#: ../src/core/sipe-ocs2007.c:2643 msgid "Add new domain..." msgstr "Yeni alan ekle..." -#: ../src/core/sipe-ocs2007.c:2673 +#: ../src/core/sipe-ocs2007.c:2672 msgid "Online help..." msgstr "Çevrimiçi yardım..." -#: ../src/core/sipe-ocs2007.c:2681 +#: ../src/core/sipe-ocs2007.c:2680 msgid "Access groups" msgstr "Erişim grupları" @@ -698,49 +715,60 @@ #. SIPE_ACTIVITY_AVAILABLE #. SIPE_ACTIVITY_ONLINE #. SIPE_ACTIVITY_INACTIVE -#: ../src/core/sipe-status.c:58 +#: ../src/core/sipe-status.c:56 msgid "Inactive" msgstr "Etkin değil" #. SIPE_ACTIVITY_BUSYIDLE -#: ../src/core/sipe-status.c:60 +#: ../src/core/sipe-status.c:58 msgid "Busy-Idle" msgstr "Meşgul-Yerinde değil" #. SIPE_ACTIVITY_DND #. SIPE_ACTIVITY_BRB -#: ../src/core/sipe-status.c:62 +#: ../src/core/sipe-status.c:60 msgid "Be right back" msgstr "Hemen dönecek" #. SIPE_ACTIVITY_AWAY #. SIPE_ACTIVITY_LUNCH -#: ../src/core/sipe-status.c:64 +#: ../src/core/sipe-status.c:62 msgid "Out to lunch" msgstr "Yemekte" #. SIPE_ACTIVITY_INVISIBLE #. SIPE_ACTIVITY_OFFLINE #. SIPE_ACTIVITY_ON_PHONE -#: ../src/core/sipe-status.c:67 +#: ../src/core/sipe-status.c:65 msgid "In a call" msgstr "Telefonda" #. SIPE_ACTIVITY_IN_CONF -#: ../src/core/sipe-status.c:68 +#: ../src/core/sipe-status.c:66 msgid "In a conference" msgstr "Konferansta" #. SIPE_ACTIVITY_IN_MEETING -#: ../src/core/sipe-status.c:69 +#: ../src/core/sipe-status.c:67 msgid "In a meeting" msgstr "Toplantıda" #. SIPE_ACTIVITY_URGENT_ONLY -#: ../src/core/sipe-status.c:71 +#: ../src/core/sipe-status.c:69 msgid "Urgent interruptions only" msgstr "Sadece acil durumlarda" +#: ../src/core/sipe-subscriptions.c:189 +msgid "Presence subscription failed!" +msgstr "Durum bildiriminde hata oluştu!" + +#: ../src/core/sipe-subscriptions.c:190 +msgid "" +"One or more buddies will therefore permanently show as offline.\n" +"\n" +"Please check that there are no corrupted SIP URIs in your contacts list." +msgstr "Bu yüzden bir veya daha fazla arkadaş sürekli olarak çevrimdışı görünecektir.\nLütfen kişi listenizde hatalı SIP URI'leri olmadığından emin olun." + #: ../src/core/sipe-ucs.c:674 msgid "UCS initialization failed!" msgstr "UCS başlatılamadı." @@ -893,17 +921,21 @@ msgid "Copy to" msgstr "Kopyala" -#: ../src/purple/purple-chat.c:295 +#: ../src/purple/purple-chat.c:310 msgid "Lock" msgstr "Kilitle" -#: ../src/purple/purple-chat.c:300 +#: ../src/purple/purple-chat.c:315 msgid "Unlock" msgstr "Kilidi kaldır" -#: ../src/purple/purple-chat.c:321 +#: ../src/purple/purple-chat.c:338 +msgid "Show presentation" +msgstr "Sunum göster." + +#: ../src/purple/purple-chat.c:345 msgid "Meeting entry info" -msgstr "" +msgstr "Toplantı girişi bilgileri" #: ../src/purple/purple-groupchat.c:56 msgid "_URI:" @@ -976,15 +1008,15 @@ #: ../src/purple/purple-plugin-common.c:762 msgid "Alternatively" -msgstr "" +msgstr "Alternatif olarak" #: ../src/purple/purple-plugin-common.c:764 msgid "Organizer email" -msgstr "" +msgstr "Düzenleyenin e-postası" #: ../src/purple/purple-plugin-common.c:766 msgid "Meeting ID" -msgstr "" +msgstr "Toplantı kimliği" #: ../src/purple/purple-plugin-common.c:770 msgid "Join conference" @@ -1153,26 +1185,30 @@ msgstr "Grup Sohbet Proxy'si\nfirma.com veya kullanıcı@firma.com\n(Kullanıcı Adı üzerinden belirlemek için boş bırakın)" #: ../src/purple/purple-plugin-common.c:933 +msgid "Remote desktop client" +msgstr "Uzak masaüstü istemcisi" + +#: ../src/purple/purple-plugin-common.c:938 msgid "Media encryption" msgstr "Ortam şifrelemesi" -#: ../src/purple/purple-plugin-common.c:934 +#: ../src/purple/purple-plugin-common.c:939 msgid "Obey server policy" msgstr "Sunucu ilkerine uy" -#: ../src/purple/purple-plugin-common.c:935 +#: ../src/purple/purple-plugin-common.c:940 msgid "Always" msgstr "Her zaman" -#: ../src/purple/purple-plugin-common.c:936 +#: ../src/purple/purple-plugin-common.c:941 msgid "Optional" msgstr "İsteğe bağlı" -#: ../src/purple/purple-plugin-common.c:937 +#: ../src/purple/purple-plugin-common.c:942 msgid "Disabled" msgstr "Devre dışı" -#: ../src/purple/purple-plugin-common.c:947 +#: ../src/purple/purple-plugin-common.c:952 msgid "" "Login\n" " user or DOMAIN\\user or\n" @@ -1201,7 +1237,7 @@ #: ../src/purple/purple-search.c:227 msgid "SIP ID" -msgstr "SIP KİMLİĞİ" +msgstr "SIP Kimliği" #: ../src/purple/purple-search.c:235 msgid "Search" @@ -1221,27 +1257,27 @@ msgid "_Search" msgstr "_Ara" -#: ../src/purple/purple-transport.c:132 +#: ../src/purple/purple-transport.c:135 msgid "Read error" msgstr "Okuma hatası" -#: ../src/purple/purple-transport.c:136 -#: ../src/telepathy/telepathy-transport.c:96 +#: ../src/purple/purple-transport.c:139 +#: ../src/telepathy/telepathy-transport.c:95 msgid "Server has disconnected" msgstr "Sunucu bağlantısını kesti" -#: ../src/purple/purple-transport.c:198 +#: ../src/purple/purple-transport.c:201 msgid "Could not connect" msgstr "Bağlanamadı" -#: ../src/purple/purple-transport.c:268 +#: ../src/purple/purple-transport.c:271 msgid "Could not create SSL context" msgstr "SSL ortamı oluşturulamadı" -#: ../src/purple/purple-transport.c:290 +#: ../src/purple/purple-transport.c:293 msgid "Could not create socket" msgstr "Soket oluşturulamadı" -#: ../src/purple/purple-transport.c:381 +#: ../src/purple/purple-transport.c:417 msgid "Write error" msgstr "Yazma hatası" diff -Nru pidgin-sipe-1.21.1/po/zh_CN.po pidgin-sipe-1.22.1/po/zh_CN.po --- pidgin-sipe-1.21.1/po/zh_CN.po 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/po/zh_CN.po 2017-06-11 15:41:22.000000000 +0000 @@ -5,7 +5,7 @@ # # # Translators: -# Kyle Wang, 2014-2016 +# Kyle Wang, 2014-2017 # Stefan Becker , 2011 # Tommy He , 2015 msgid "" @@ -13,8 +13,8 @@ "Project-Id-Version: pidgin sipe\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/sipe/bugs/\n" "POT-Creation-Date: 2010-11-30 23:36+0200\n" -"PO-Revision-Date: 2016-05-28 15:08+0000\n" -"Last-Translator: Stefan Becker \n" +"PO-Revision-Date: 2017-01-24 01:29+0000\n" +"Last-Translator: Kyle Wang\n" "Language-Team: Chinese (China) (http://www.transifex.com/stefanb/pidgin-sipe/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,212 +22,237 @@ "Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../src/core/sip-transport.c:235 +#: ../src/core/sip-transport.c:240 msgid "Failed to authenticate to server" msgstr "到服务器的认证失败" -#: ../src/core/sip-transport.c:293 +#: ../src/core/sip-transport.c:298 #, c-format msgid "Can't request certificate from %s" msgstr "无法从 %s 请求证书" -#: ../src/core/sip-transport.c:303 +#: ../src/core/sip-transport.c:308 msgid "No URI for certificate provisioning service provided" msgstr "未提供证书置备服务的URI" -#: ../src/core/sip-transport.c:1281 +#: ../src/core/sip-transport.c:1285 msgid "Authentication failed" msgstr "认证失败" -#: ../src/core/sip-transport.c:1338 +#: ../src/core/sip-transport.c:1342 msgid "Incompatible authentication scheme chosen" msgstr "选择了不兼容的认证方案" -#: ../src/core/sip-transport.c:1355 ../src/core/sipe-notify.c:1149 +#: ../src/core/sip-transport.c:1359 ../src/core/sipe-notify.c:1149 #, c-format msgid "You have been rejected by the server: %s" msgstr "您已被服务器拒绝：%s" -#: ../src/core/sip-transport.c:1356 ../src/core/sip-transport.c:1372 -#: ../src/core/sip-transport.c:1396 ../src/core/sip-transport.c:1420 +#: ../src/core/sip-transport.c:1360 ../src/core/sip-transport.c:1376 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 #: ../src/core/sipe-conf.c:265 ../src/core/sipe-notify.c:1149 msgid "no reason given" msgstr "未给出原因" -#: ../src/core/sip-transport.c:1371 +#: ../src/core/sip-transport.c:1375 #, c-format msgid "Not found: %s. Please contact your Administrator" msgstr "没找到：%s。请和您的管理员联系" -#: ../src/core/sip-transport.c:1373 +#: ../src/core/sip-transport.c:1377 msgid "SIP is either not enabled for the destination URI or it does not exist" msgstr "目标 URI 没有启用 SIP 或不存在" -#: ../src/core/sip-transport.c:1396 ../src/core/sip-transport.c:1420 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 #, c-format msgid "Service unavailable: %s" msgstr "服务不可用：%s" -#: ../src/core/sip-transport.c:1766 +#: ../src/core/sip-transport.c:1775 msgid "Corrupted message received" msgstr "收到损坏的消息" -#: ../src/core/sip-transport.c:1790 +#: ../src/core/sip-transport.c:1799 msgid "Invalid message signature received" msgstr "收到无效消息签名" -#: ../src/core/sipe-buddy.c:540 ../src/core/sipe-buddy.c:2300 +#: ../src/core/sipe-appshare.c:458 +#, c-format +msgid "%s wants to start presenting" +msgstr "%s 想要开始报告" + +#: ../src/core/sipe-appshare.c:462 ../src/core/sipe-conf.c:1086 +msgid "Accept" +msgstr "接受" + +#: ../src/core/sipe-appshare.c:463 ../src/core/sipe-conf.c:1087 +msgid "Decline" +msgstr "拒绝" + +#: ../src/core/sipe-appshare.c:501 ../src/core/sipe-appshare.c:599 +msgid "Application sharing error" +msgstr "程序共享错误" + +#: ../src/core/sipe-appshare.c:502 +msgid "Unknown remote desktop client configured." +msgstr "未知的远程桌面客户端已配置。" + +#: ../src/core/sipe-appshare.c:600 +msgid "Couldn't connect application sharing" +msgstr "无法连接程序共享" + +#: ../src/core/sipe-buddy.c:541 ../src/core/sipe-buddy.c:2301 msgid "Mobile" msgstr "手机" -#: ../src/core/sipe-buddy.c:828 +#: ../src/core/sipe-buddy.c:829 msgid "Status" msgstr "状态" -#: ../src/core/sipe-buddy.c:831 +#: ../src/core/sipe-buddy.c:832 msgid "Calendar" msgstr "日历" -#: ../src/core/sipe-buddy.c:836 +#: ../src/core/sipe-buddy.c:837 msgid "Meeting in" msgstr "会议场所" -#: ../src/core/sipe-buddy.c:840 +#: ../src/core/sipe-buddy.c:841 msgid "Meeting about" msgstr "会议内容" -#: ../src/core/sipe-buddy.c:845 +#: ../src/core/sipe-buddy.c:846 msgid "Out of office note" msgstr "不在办公室备注" -#: ../src/core/sipe-buddy.c:845 +#: ../src/core/sipe-buddy.c:846 msgid "Note" msgstr "备注" -#: ../src/core/sipe-buddy.c:850 ../src/core/sipe-buddy.c:2345 +#: ../src/core/sipe-buddy.c:851 ../src/core/sipe-buddy.c:2346 #: ../src/purple/purple-buddy.c:633 msgid "Access level" msgstr "访问级别" -#: ../src/core/sipe-buddy.c:1073 +#: ../src/core/sipe-buddy.c:1074 #, c-format msgid "Found %d contact%s:" msgid_plural "Found %d contacts%s:" msgstr[0] "找到 %d 个联系人%s：" -#: ../src/core/sipe-buddy.c:1075 +#: ../src/core/sipe-buddy.c:1076 msgid " (more matched your query)" msgstr " （与您的查询越匹配）" -#: ../src/core/sipe-buddy.c:1121 ../src/core/sipe-buddy.c:1259 +#: ../src/core/sipe-buddy.c:1122 ../src/core/sipe-buddy.c:1260 #: ../src/core/sipe-ucs.c:314 msgid "No contacts found" msgstr "未找到联系人" -#: ../src/core/sipe-buddy.c:1134 ../src/core/sipe-buddy.c:1272 +#: ../src/core/sipe-buddy.c:1135 ../src/core/sipe-buddy.c:1273 #: ../src/core/sipe-ucs.c:278 msgid "Unable to display the search results" msgstr "无法显示搜索结果" -#: ../src/core/sipe-buddy.c:1237 ../src/core/sipe-buddy.c:1249 +#: ../src/core/sipe-buddy.c:1238 ../src/core/sipe-buddy.c:1250 #: ../src/core/sipe-ucs.c:391 msgid "Contact search failed" msgstr "联系人搜索失败" -#: ../src/core/sipe-buddy.c:1412 ../src/core/sipe-ucs.c:395 +#: ../src/core/sipe-buddy.c:1413 ../src/core/sipe-ucs.c:395 msgid "Invalid contact search query" msgstr "无效的联系人搜索请求" -#: ../src/core/sipe-buddy.c:2237 +#: ../src/core/sipe-buddy.c:2238 #, c-format msgid "Make leader of '%s'" msgstr "设置为“%s”的领导者" -#: ../src/core/sipe-buddy.c:2250 +#: ../src/core/sipe-buddy.c:2251 #, c-format msgid "Remove from '%s'" msgstr "从“%s”中删除" -#: ../src/core/sipe-buddy.c:2264 +#: ../src/core/sipe-buddy.c:2265 #, c-format msgid "Invite to '%s'" msgstr "邀请到“%s”" -#: ../src/core/sipe-buddy.c:2280 +#: ../src/core/sipe-buddy.c:2281 msgid "New chat" msgstr "新建聊天" -#: ../src/core/sipe-buddy.c:2293 +#: ../src/core/sipe-buddy.c:2294 msgid "Work" msgstr "工作" -#: ../src/core/sipe-buddy.c:2308 +#: ../src/core/sipe-buddy.c:2309 msgid "Home" msgstr "家庭" -#: ../src/core/sipe-buddy.c:2316 +#: ../src/core/sipe-buddy.c:2317 msgid "Other" msgstr "其他" -#: ../src/core/sipe-buddy.c:2324 +#: ../src/core/sipe-buddy.c:2325 msgid "Custom1" msgstr "自定义 1" -#: ../src/core/sipe-buddy.c:2334 +#: ../src/core/sipe-buddy.c:2335 msgid "Send email..." msgstr "发送邮件..." -#: ../src/core/sipe-cal.c:907 +#: ../src/core/sipe-cal.c:906 msgid "Free" msgstr "空闲" -#: ../src/core/sipe-cal.c:908 +#: ../src/core/sipe-cal.c:907 msgid "Tentative" msgstr "待定" #. SIPE_ACTIVITY_BUSY -#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:59 +#: ../src/core/sipe-cal.c:908 ../src/core/sipe-status.c:57 msgid "Busy" msgstr "忙碌" #. SIPE_ACTIVITY_OOF -#: ../src/core/sipe-cal.c:910 ../src/core/sipe-status.c:70 +#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:68 msgid "Out of office" msgstr "不在办公室" -#: ../src/core/sipe-cal.c:911 +#: ../src/core/sipe-cal.c:910 msgid "No data" msgstr "无数据" -#: ../src/core/sipe-cal.c:1019 ../src/core/sipe-cal.c:1046 +#: ../src/core/sipe-cal.c:1018 ../src/core/sipe-cal.c:1045 #, c-format msgid "Currently %s" msgstr "目前为 %s" -#: ../src/core/sipe-cal.c:1025 +#: ../src/core/sipe-cal.c:1024 msgid "Outside of working hours for next 8 hours" msgstr "未来 8 小时为工作以外时间" -#: ../src/core/sipe-cal.c:1027 +#: ../src/core/sipe-cal.c:1026 #, c-format msgid "%s for next 8 hours" msgstr "未来 8 小时 %s" -#: ../src/core/sipe-cal.c:1036 +#: ../src/core/sipe-cal.c:1035 msgid "Not working" msgstr "不工作" -#: ../src/core/sipe-cal.c:1040 +#: ../src/core/sipe-cal.c:1039 #, c-format msgid "%s until %.2d:%.2d" msgstr "%s 直到 %.2d:%.2d" -#: ../src/core/sipe-cal.c:1048 +#: ../src/core/sipe-cal.c:1047 #, c-format msgid "%s. Outside of working hours at %.2d:%.2d" msgstr "%s。%.2d:%.2d 为工作以外时间" -#: ../src/core/sipe-cal.c:1053 +#: ../src/core/sipe-cal.c:1052 #, c-format msgid "%s. %s at %.2d:%.2d" msgstr "%1$s。%3$.2d:%4$.2d 为 %2$s" @@ -243,7 +268,7 @@ msgstr "向 %s 请求票据凭证失败" #. Generate next ID -#: ../src/core/sipe-chat.c:240 +#: ../src/core/sipe-chat.c:246 #, c-format msgid "Chat #%d" msgstr "聊天 #%d" @@ -270,123 +295,115 @@ msgid "Incomplete conference information provided" msgstr "未提供完整的会议信息" -#: ../src/core/sipe-conf.c:1041 +#: ../src/core/sipe-conf.c:1106 msgid "" "\n" "\n" "As this client was not compiled with voice call support, if you accept, you will be able to contact the other participants only via IM session." msgstr "\n\n因本客户端编译时未加入语音通话支持，如果您接受，您将只能通过即时消息会话与其他与会者进行联系。" -#: ../src/core/sipe-conf.c:1049 +#: ../src/core/sipe-conf.c:1111 #, c-format -msgid "%s wants to invite you to the conference call%s" -msgstr "%s 想邀请您加入电话会议 %s" - -#: ../src/core/sipe-conf.c:1063 -msgid "Accept" -msgstr "接受" - -#: ../src/core/sipe-conf.c:1064 -msgid "Decline" -msgstr "拒绝" +msgid "wants to invite you to a conference call%s" +msgstr "想邀请您加入电话会议 %s" -#: ../src/core/sipe-conf.c:1345 +#: ../src/core/sipe-conf.c:1459 msgid "" "This conference is no longer locked. Additional participants can now join." msgstr "此会议不再锁定。其他参与者可以加入。" -#: ../src/core/sipe-conf.c:1349 +#: ../src/core/sipe-conf.c:1463 msgid "" "This conference is locked. Nobody else can join the conference while it is " "locked." msgstr "此会议被锁定。被锁定时其他人不能加入会议。" -#: ../src/core/sipe-conf.c:1382 +#: ../src/core/sipe-conf.c:1496 msgid "You have been disconnected from this conference." msgstr "您已被从会议中断开。" -#: ../src/core/sipe-conf.c:1542 +#: ../src/core/sipe-conf.c:1656 msgid "Dial-in info" msgstr "拨入信息" -#: ../src/core/sipe-conf.c:1543 +#: ../src/core/sipe-conf.c:1657 msgid "Number" msgstr "号码" -#: ../src/core/sipe-conf.c:1545 +#: ../src/core/sipe-conf.c:1659 msgid "Conference ID" msgstr "会议 ID" -#: ../src/core/sipe-conf.c:1547 +#: ../src/core/sipe-conf.c:1661 msgid "Meeting link" msgstr "会议连接" -#: ../src/core/sipe-conf.c:1549 +#: ../src/core/sipe-conf.c:1663 msgid "Organizer" msgstr "组织者" -#: ../src/core/sipe-conf.c:1551 +#: ../src/core/sipe-conf.c:1665 msgid "Alternative dial-in numbers" msgstr "备选拨入号码" #. The next 13 texts make up the SIPE about note text #. About note, part 1/13: introduction -#: ../src/core/sipe-core.c:220 +#: ../src/core/sipe-core.c:221 msgid "" "A third-party plugin implementing extended version of SIP/SIMPLE used by " "various products" msgstr "实现用于多个产品的 SIP/SIMPLE 扩展版本的第三方插件" #. About note, part 2/13: home page URL (label) -#: ../src/core/sipe-core.c:222 +#: ../src/core/sipe-core.c:223 msgid "Home Page" msgstr "主页" #. About note, part 3/13: support forum URL (label) -#: ../src/core/sipe-core.c:224 +#: ../src/core/sipe-core.c:225 msgid "Support" msgstr "支持" #. About note, part 4/13: support forum name (hyperlink text) -#: ../src/core/sipe-core.c:226 +#: ../src/core/sipe-core.c:227 msgid "Help Forum" msgstr "帮助论坛" #. About note, part 5/13: bug tracker URL (label) -#: ../src/core/sipe-core.c:228 +#: ../src/core/sipe-core.c:229 msgid "Report Problems" msgstr "报告问题" #. About note, part 6/13: bug tracker URL (hyperlink text) -#: ../src/core/sipe-core.c:230 +#: ../src/core/sipe-core.c:231 msgid "Bug Tracker" msgstr "缺陷追踪" #. About note, part 7/13: translation service URL (label) -#: ../src/core/sipe-core.c:232 +#: ../src/core/sipe-core.c:233 msgid "Translations" msgstr "翻译" #. About note, part 8/13: license type (label) -#: ../src/core/sipe-core.c:234 +#: ../src/core/sipe-core.c:235 msgid "License" msgstr "许可证" #. About note, part 9/13: (REMOVED) #. About note, part 10/13: translation request, text before Transifex.com URL #. append a space if text is not empty -#: ../src/core/sipe-core.c:238 +#: ../src/core/sipe-core.c:239 msgid "Please help us to translate SIPE to your native language here at " msgstr "请到这里帮助我们将 SIPE 翻译为您的母语 " #. About note, part 11/13: translation request, text after Transifex.com URL #. start with a space if text is not empty -#: ../src/core/sipe-core.c:241 +#: ../src/core/sipe-core.c:242 msgid " using convenient web interface" msgstr " 使用方便的 web 界面" #. About note, part 12/13: author list (header) -#: ../src/core/sipe-core.c:243 +#: ../src/core/sipe-core.c:244 msgid "Authors" msgstr "作者" @@ -394,15 +411,15 @@ #. PLEASE NOTE: do *NOT* simply translate the english original #. but write something similar to the following sentence: #. "Localization for (): " -#: ../src/core/sipe-core.c:248 +#: ../src/core/sipe-core.c:249 msgid "Original texts in English (en): SIPE developers" msgstr "中文化 (zh_CN): 神州散人，Kyle Wang" -#: ../src/core/sipe-core.c:269 +#: ../src/core/sipe-core.c:273 msgid "SIP Exchange user name contains invalid characters" msgstr "SIP Exchange 用户名包含无效字符" -#: ../src/core/sipe-core.c:277 ../src/purple/purple-buddy.c:485 +#: ../src/core/sipe-core.c:281 ../src/purple/purple-buddy.c:485 #: ../src/telepathy/telepathy-protocol.c:89 #: ../src/telepathy/telepathy-protocol.c:191 #, c-format @@ -411,21 +428,21 @@ "Example: user@company.com" msgstr "用户名必须是有效的 SIP URI\n例如：user@company.com" -#: ../src/core/sipe-core.c:284 +#: ../src/core/sipe-core.c:288 msgid "Password is required when Single Sign-On is not enabled" msgstr "禁用单点登录时，需要输入密码" -#: ../src/core/sipe-core.c:294 +#: ../src/core/sipe-core.c:298 msgid "" "Email address should be valid if provided\n" "Example: user@company.com" msgstr "如果提供了电子邮件地址那么它应该是有效的\n例如：user@company.com" -#: ../src/core/sipe-core.c:303 +#: ../src/core/sipe-core.c:307 msgid "SIP Exchange user name contains whitespace" msgstr "SIP Exchange 用户名包含空格" -#: ../src/core/sipe-core.c:317 +#: ../src/core/sipe-core.c:321 msgid "" "Email services URL should be valid if provided\n" "Example: https://exchange.corp.com/EWS/Exchange.asmx\n" @@ -456,13 +473,13 @@ msgid "Could not create listen socket" msgstr "无法创建侦听套接字" -#: ../src/core/sipe-ft-lync.c:757 ../src/core/sipe-media.c:1195 -#: ../src/core/sipe-media.c:1206 ../src/core/sipe-media.c:1284 -#: ../src/core/sipe-media.c:1740 +#: ../src/core/sipe-ft-lync.c:762 ../src/core/sipe-media.c:1328 +#: ../src/core/sipe-media.c:1339 ../src/core/sipe-media.c:1417 +#: ../src/core/sipe-media.c:1923 msgid "Error occurred" msgstr "发生了错误" -#: ../src/core/sipe-ft-lync.c:758 +#: ../src/core/sipe-ft-lync.c:763 msgid "Error creating data stream" msgstr "创建数据流错误" @@ -497,7 +514,7 @@ msgstr "内存不足" #: ../src/core/sipe-group.c:168 ../src/core/sipe-notify.c:1163 -#: ../src/core/sipe-notify.c:1190 ../src/core/sipe-notify.c:1294 +#: ../src/core/sipe-notify.c:1197 ../src/core/sipe-notify.c:1301 #: ../src/purple/purple-search.c:128 msgid "Other Contacts" msgstr "其他联系人" @@ -535,77 +552,77 @@ msgid "Failed to invite %s" msgstr "邀请 %s 失败" -#: ../src/core/sipe-incoming.c:741 +#: ../src/core/sipe-incoming.c:754 #, c-format msgid "Received a message with unrecognized contents from %s" msgstr "从 %s 收到含有无法识别的内容的消息" -#: ../src/core/sipe-media.c:835 ../src/core/sipe-media.c:1347 -#: ../src/core/sipe-media.c:1357 ../src/core/sipe-media.c:1721 -#: ../src/core/sipe-media.c:1741 +#: ../src/core/sipe-media.c:869 ../src/core/sipe-media.c:1483 +#: ../src/core/sipe-media.c:1493 ../src/core/sipe-media.c:1904 +#: ../src/core/sipe-media.c:1924 msgid "Unable to establish a call" msgstr "无法建立通话" -#: ../src/core/sipe-media.c:836 ../src/core/sipe-media.c:1722 +#: ../src/core/sipe-media.c:870 ../src/core/sipe-media.c:1905 msgid "Encryption settings of peer are incompatible with ours." msgstr "节点的加密设置和我们的不兼容。" -#: ../src/core/sipe-media.c:929 +#: ../src/core/sipe-media.c:963 #, c-format msgid "User %s rejected call" msgstr "用户 %s 拒绝了通话" -#: ../src/core/sipe-media.c:930 +#: ../src/core/sipe-media.c:964 msgid "Call rejected" msgstr "通话被拒绝" -#: ../src/core/sipe-media.c:1196 ../src/core/sipe-media.c:1285 +#: ../src/core/sipe-media.c:1329 ../src/core/sipe-media.c:1418 msgid "Error creating audio stream" msgstr "创建音频流错误" -#: ../src/core/sipe-media.c:1207 +#: ../src/core/sipe-media.c:1340 msgid "Error creating video stream" msgstr "创建视频流错误" -#: ../src/core/sipe-media.c:1251 ../src/purple/purple-chat.c:314 +#: ../src/core/sipe-media.c:1384 ../src/purple/purple-chat.c:329 msgid "Join conference call" msgstr "加入电话会议" -#: ../src/core/sipe-media.c:1252 +#: ../src/core/sipe-media.c:1385 msgid "Conference calls are not supported on this server." msgstr "此服务器不支持电话会议。" -#: ../src/core/sipe-media.c:1348 +#: ../src/core/sipe-media.c:1484 msgid "Invalid phone number" msgstr "无效的电话号码" -#: ../src/core/sipe-media.c:1358 +#: ../src/core/sipe-media.c:1494 msgid "Audio Test Service is not available." msgstr "音频测试服务不可用。" -#: ../src/core/sipe-media.c:1690 +#: ../src/core/sipe-media.c:1873 msgid "User unavailable" msgstr "用户不可用" -#: ../src/core/sipe-media.c:1693 +#: ../src/core/sipe-media.c:1876 #, c-format msgid "%s does not want to be disturbed" msgstr "%s 不想被打扰" -#: ../src/core/sipe-media.c:1695 +#: ../src/core/sipe-media.c:1878 #, c-format msgid "User %s is not available" msgstr "用户 %s 不可用" -#: ../src/core/sipe-media.c:1704 +#: ../src/core/sipe-media.c:1887 msgid "Unsupported media type" msgstr "不支持的媒体类型" -#: ../src/core/sipe-media.c:2062 +#: ../src/core/sipe-media.c:2246 msgid "Media error" msgstr "媒体错误" -#: ../src/core/sipe-media.c:2063 +#: ../src/core/sipe-media.c:2247 msgid "Error while reading from stream" msgstr "流读取错误" @@ -656,36 +673,36 @@ msgstr "未知" #. Translators: remove (clear) previously assigned access level -#: ../src/core/sipe-ocs2007.c:2571 +#: ../src/core/sipe-ocs2007.c:2570 msgid "Unspecify" msgstr "未指定" -#: ../src/core/sipe-ocs2007.c:2590 +#: ../src/core/sipe-ocs2007.c:2589 msgid "People in my company" msgstr "我公司里的人" -#: ../src/core/sipe-ocs2007.c:2600 +#: ../src/core/sipe-ocs2007.c:2599 msgid "People in domains connected with my company" msgstr "连接至我公司的域里的人" -#: ../src/core/sipe-ocs2007.c:2609 +#: ../src/core/sipe-ocs2007.c:2608 msgid "People in public domains" msgstr "公共域里的人" -#: ../src/core/sipe-ocs2007.c:2619 +#: ../src/core/sipe-ocs2007.c:2618 #, c-format msgid "People at %s" msgstr "在 %s 的人" -#: ../src/core/sipe-ocs2007.c:2644 +#: ../src/core/sipe-ocs2007.c:2643 msgid "Add new domain..." msgstr "新增域..." -#: ../src/core/sipe-ocs2007.c:2673 +#: ../src/core/sipe-ocs2007.c:2672 msgid "Online help..." msgstr "在线帮助..." -#: ../src/core/sipe-ocs2007.c:2681 +#: ../src/core/sipe-ocs2007.c:2680 msgid "Access groups" msgstr "访问组" @@ -697,49 +714,60 @@ #. SIPE_ACTIVITY_AVAILABLE #. SIPE_ACTIVITY_ONLINE #. SIPE_ACTIVITY_INACTIVE -#: ../src/core/sipe-status.c:58 +#: ../src/core/sipe-status.c:56 msgid "Inactive" msgstr "不活动" #. SIPE_ACTIVITY_BUSYIDLE -#: ../src/core/sipe-status.c:60 +#: ../src/core/sipe-status.c:58 msgid "Busy-Idle" msgstr "忙碌-发呆" #. SIPE_ACTIVITY_DND #. SIPE_ACTIVITY_BRB -#: ../src/core/sipe-status.c:62 +#: ../src/core/sipe-status.c:60 msgid "Be right back" msgstr "马上回来" #. SIPE_ACTIVITY_AWAY #. SIPE_ACTIVITY_LUNCH -#: ../src/core/sipe-status.c:64 +#: ../src/core/sipe-status.c:62 msgid "Out to lunch" msgstr "外出就餐" #. SIPE_ACTIVITY_INVISIBLE #. SIPE_ACTIVITY_OFFLINE #. SIPE_ACTIVITY_ON_PHONE -#: ../src/core/sipe-status.c:67 +#: ../src/core/sipe-status.c:65 msgid "In a call" msgstr "接电话中" #. SIPE_ACTIVITY_IN_CONF -#: ../src/core/sipe-status.c:68 +#: ../src/core/sipe-status.c:66 msgid "In a conference" msgstr "在会议中" #. SIPE_ACTIVITY_IN_MEETING -#: ../src/core/sipe-status.c:69 +#: ../src/core/sipe-status.c:67 msgid "In a meeting" msgstr "在会谈中" #. SIPE_ACTIVITY_URGENT_ONLY -#: ../src/core/sipe-status.c:71 +#: ../src/core/sipe-status.c:69 msgid "Urgent interruptions only" msgstr "非紧急事件勿扰" +#: ../src/core/sipe-subscriptions.c:189 +msgid "Presence subscription failed!" +msgstr "在线情况订阅错误！" + +#: ../src/core/sipe-subscriptions.c:190 +msgid "" +"One or more buddies will therefore permanently show as offline.\n" +"\n" +"Please check that there are no corrupted SIP URIs in your contacts list." +msgstr "有些好友将一直显示为离线状态。\n\n请检查您的联系人列表中有无损坏的SIP URI。" + #: ../src/core/sipe-ucs.c:674 msgid "UCS initialization failed!" msgstr "UCS初始化失败！" @@ -892,15 +920,19 @@ msgid "Copy to" msgstr "复制到" -#: ../src/purple/purple-chat.c:295 +#: ../src/purple/purple-chat.c:310 msgid "Lock" msgstr "锁定" -#: ../src/purple/purple-chat.c:300 +#: ../src/purple/purple-chat.c:315 msgid "Unlock" msgstr "解锁" -#: ../src/purple/purple-chat.c:321 +#: ../src/purple/purple-chat.c:338 +msgid "Show presentation" +msgstr "显示报告" + +#: ../src/purple/purple-chat.c:345 msgid "Meeting entry info" msgstr "会议信息" @@ -1152,26 +1184,30 @@ msgstr "群组聊天代理\ncompany.com 或 user@company.com\n(留空表示根据用户名决定)" #: ../src/purple/purple-plugin-common.c:933 +msgid "Remote desktop client" +msgstr "远程桌面客户端" + +#: ../src/purple/purple-plugin-common.c:938 msgid "Media encryption" msgstr "媒体加密" -#: ../src/purple/purple-plugin-common.c:934 +#: ../src/purple/purple-plugin-common.c:939 msgid "Obey server policy" msgstr "遵从服务器策略" -#: ../src/purple/purple-plugin-common.c:935 +#: ../src/purple/purple-plugin-common.c:940 msgid "Always" msgstr "始终" -#: ../src/purple/purple-plugin-common.c:936 +#: ../src/purple/purple-plugin-common.c:941 msgid "Optional" msgstr "可选" -#: ../src/purple/purple-plugin-common.c:937 +#: ../src/purple/purple-plugin-common.c:942 msgid "Disabled" msgstr "禁用" -#: ../src/purple/purple-plugin-common.c:947 +#: ../src/purple/purple-plugin-common.c:952 msgid "" "Login\n" " user or DOMAIN\\user or\n" @@ -1220,27 +1256,27 @@ msgid "_Search" msgstr "搜索(_S)" -#: ../src/purple/purple-transport.c:132 +#: ../src/purple/purple-transport.c:135 msgid "Read error" msgstr "读取错误" -#: ../src/purple/purple-transport.c:136 -#: ../src/telepathy/telepathy-transport.c:96 +#: ../src/purple/purple-transport.c:139 +#: ../src/telepathy/telepathy-transport.c:95 msgid "Server has disconnected" msgstr "服务器已断开连接" -#: ../src/purple/purple-transport.c:198 +#: ../src/purple/purple-transport.c:201 msgid "Could not connect" msgstr "无法连接" -#: ../src/purple/purple-transport.c:268 +#: ../src/purple/purple-transport.c:271 msgid "Could not create SSL context" msgstr "无法创建 SSL 环境" -#: ../src/purple/purple-transport.c:290 +#: ../src/purple/purple-transport.c:293 msgid "Could not create socket" msgstr "无法创建套接字" -#: ../src/purple/purple-transport.c:381 +#: ../src/purple/purple-transport.c:417 msgid "Write error" msgstr "写入错误" diff -Nru pidgin-sipe-1.21.1/po/zh_TW.po pidgin-sipe-1.22.1/po/zh_TW.po --- pidgin-sipe-1.21.1/po/zh_TW.po 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/po/zh_TW.po 2017-06-11 15:41:22.000000000 +0000 @@ -11,7 +11,7 @@ "Project-Id-Version: pidgin sipe\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/sipe/bugs/\n" "POT-Creation-Date: 2010-11-30 23:36+0200\n" -"PO-Revision-Date: 2016-05-28 15:08+0000\n" +"PO-Revision-Date: 2017-01-23 17:47+0000\n" "Last-Translator: Stefan Becker \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/stefanb/pidgin-sipe/language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -20,212 +20,237 @@ "Language: zh_TW\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../src/core/sip-transport.c:235 +#: ../src/core/sip-transport.c:240 msgid "Failed to authenticate to server" msgstr "由伺服器認證時失敗" -#: ../src/core/sip-transport.c:293 +#: ../src/core/sip-transport.c:298 #, c-format msgid "Can't request certificate from %s" msgstr "" -#: ../src/core/sip-transport.c:303 +#: ../src/core/sip-transport.c:308 msgid "No URI for certificate provisioning service provided" msgstr "" -#: ../src/core/sip-transport.c:1281 +#: ../src/core/sip-transport.c:1285 msgid "Authentication failed" msgstr "認證失敗" -#: ../src/core/sip-transport.c:1338 +#: ../src/core/sip-transport.c:1342 msgid "Incompatible authentication scheme chosen" msgstr "選擇了不相容的認證方案" -#: ../src/core/sip-transport.c:1355 ../src/core/sipe-notify.c:1149 +#: ../src/core/sip-transport.c:1359 ../src/core/sipe-notify.c:1149 #, c-format msgid "You have been rejected by the server: %s" msgstr "您已被伺服器 %s 拒絕" -#: ../src/core/sip-transport.c:1356 ../src/core/sip-transport.c:1372 -#: ../src/core/sip-transport.c:1396 ../src/core/sip-transport.c:1420 +#: ../src/core/sip-transport.c:1360 ../src/core/sip-transport.c:1376 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 #: ../src/core/sipe-conf.c:265 ../src/core/sipe-notify.c:1149 msgid "no reason given" msgstr "沒有給予原因" -#: ../src/core/sip-transport.c:1371 +#: ../src/core/sip-transport.c:1375 #, c-format msgid "Not found: %s. Please contact your Administrator" msgstr "找不到：%s。請與您的管理員聯絡" -#: ../src/core/sip-transport.c:1373 +#: ../src/core/sip-transport.c:1377 msgid "SIP is either not enabled for the destination URI or it does not exist" msgstr "SIP 若非未對目的 URI 啟用或是它並不存在" -#: ../src/core/sip-transport.c:1396 ../src/core/sip-transport.c:1420 +#: ../src/core/sip-transport.c:1400 ../src/core/sip-transport.c:1424 #, c-format msgid "Service unavailable: %s" msgstr "不提供該項服務︰%s" -#: ../src/core/sip-transport.c:1766 +#: ../src/core/sip-transport.c:1775 msgid "Corrupted message received" msgstr "" -#: ../src/core/sip-transport.c:1790 +#: ../src/core/sip-transport.c:1799 msgid "Invalid message signature received" msgstr "收到的訊息簽章無效" -#: ../src/core/sipe-buddy.c:540 ../src/core/sipe-buddy.c:2300 +#: ../src/core/sipe-appshare.c:458 +#, c-format +msgid "%s wants to start presenting" +msgstr "" + +#: ../src/core/sipe-appshare.c:462 ../src/core/sipe-conf.c:1086 +msgid "Accept" +msgstr "" + +#: ../src/core/sipe-appshare.c:463 ../src/core/sipe-conf.c:1087 +msgid "Decline" +msgstr "" + +#: ../src/core/sipe-appshare.c:501 ../src/core/sipe-appshare.c:599 +msgid "Application sharing error" +msgstr "" + +#: ../src/core/sipe-appshare.c:502 +msgid "Unknown remote desktop client configured." +msgstr "" + +#: ../src/core/sipe-appshare.c:600 +msgid "Couldn't connect application sharing" +msgstr "" + +#: ../src/core/sipe-buddy.c:541 ../src/core/sipe-buddy.c:2301 msgid "Mobile" msgstr "" -#: ../src/core/sipe-buddy.c:828 +#: ../src/core/sipe-buddy.c:829 msgid "Status" msgstr "狀態" -#: ../src/core/sipe-buddy.c:831 +#: ../src/core/sipe-buddy.c:832 msgid "Calendar" msgstr "行事曆" -#: ../src/core/sipe-buddy.c:836 +#: ../src/core/sipe-buddy.c:837 msgid "Meeting in" msgstr "會議舉行於" -#: ../src/core/sipe-buddy.c:840 +#: ../src/core/sipe-buddy.c:841 msgid "Meeting about" msgstr "會議關於" -#: ../src/core/sipe-buddy.c:845 +#: ../src/core/sipe-buddy.c:846 msgid "Out of office note" msgstr "不在辦公室註記" -#: ../src/core/sipe-buddy.c:845 +#: ../src/core/sipe-buddy.c:846 msgid "Note" msgstr "註記" -#: ../src/core/sipe-buddy.c:850 ../src/core/sipe-buddy.c:2345 +#: ../src/core/sipe-buddy.c:851 ../src/core/sipe-buddy.c:2346 #: ../src/purple/purple-buddy.c:633 msgid "Access level" msgstr "存取等級" -#: ../src/core/sipe-buddy.c:1073 +#: ../src/core/sipe-buddy.c:1074 #, c-format msgid "Found %d contact%s:" msgid_plural "Found %d contacts%s:" msgstr[0] "找到 %d 位聯絡人%s︰" -#: ../src/core/sipe-buddy.c:1075 +#: ../src/core/sipe-buddy.c:1076 msgid " (more matched your query)" msgstr " (更多符合您查詢的項目)" -#: ../src/core/sipe-buddy.c:1121 ../src/core/sipe-buddy.c:1259 +#: ../src/core/sipe-buddy.c:1122 ../src/core/sipe-buddy.c:1260 #: ../src/core/sipe-ucs.c:314 msgid "No contacts found" msgstr "" -#: ../src/core/sipe-buddy.c:1134 ../src/core/sipe-buddy.c:1272 +#: ../src/core/sipe-buddy.c:1135 ../src/core/sipe-buddy.c:1273 #: ../src/core/sipe-ucs.c:278 msgid "Unable to display the search results" msgstr "無法顯示搜尋結果" -#: ../src/core/sipe-buddy.c:1237 ../src/core/sipe-buddy.c:1249 +#: ../src/core/sipe-buddy.c:1238 ../src/core/sipe-buddy.c:1250 #: ../src/core/sipe-ucs.c:391 msgid "Contact search failed" msgstr "" -#: ../src/core/sipe-buddy.c:1412 ../src/core/sipe-ucs.c:395 +#: ../src/core/sipe-buddy.c:1413 ../src/core/sipe-ucs.c:395 msgid "Invalid contact search query" msgstr "" -#: ../src/core/sipe-buddy.c:2237 +#: ../src/core/sipe-buddy.c:2238 #, c-format msgid "Make leader of '%s'" msgstr "成為「%s」的召集人" -#: ../src/core/sipe-buddy.c:2250 +#: ../src/core/sipe-buddy.c:2251 #, c-format msgid "Remove from '%s'" msgstr "從「%s」移除" -#: ../src/core/sipe-buddy.c:2264 +#: ../src/core/sipe-buddy.c:2265 #, c-format msgid "Invite to '%s'" msgstr "邀請參加「%s」" -#: ../src/core/sipe-buddy.c:2280 +#: ../src/core/sipe-buddy.c:2281 msgid "New chat" msgstr "新的聊天室" -#: ../src/core/sipe-buddy.c:2293 +#: ../src/core/sipe-buddy.c:2294 msgid "Work" msgstr "" -#: ../src/core/sipe-buddy.c:2308 +#: ../src/core/sipe-buddy.c:2309 msgid "Home" msgstr "首頁" -#: ../src/core/sipe-buddy.c:2316 +#: ../src/core/sipe-buddy.c:2317 msgid "Other" msgstr "" -#: ../src/core/sipe-buddy.c:2324 +#: ../src/core/sipe-buddy.c:2325 msgid "Custom1" msgstr "" -#: ../src/core/sipe-buddy.c:2334 +#: ../src/core/sipe-buddy.c:2335 msgid "Send email..." msgstr "發送電子郵件…" -#: ../src/core/sipe-cal.c:907 +#: ../src/core/sipe-cal.c:906 msgid "Free" msgstr "免費" -#: ../src/core/sipe-cal.c:908 +#: ../src/core/sipe-cal.c:907 msgid "Tentative" msgstr "臨時" #. SIPE_ACTIVITY_BUSY -#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:59 +#: ../src/core/sipe-cal.c:908 ../src/core/sipe-status.c:57 msgid "Busy" msgstr "忙碌" #. SIPE_ACTIVITY_OOF -#: ../src/core/sipe-cal.c:910 ../src/core/sipe-status.c:70 +#: ../src/core/sipe-cal.c:909 ../src/core/sipe-status.c:68 msgid "Out of office" msgstr "不在辦公室" -#: ../src/core/sipe-cal.c:911 +#: ../src/core/sipe-cal.c:910 msgid "No data" msgstr "沒有資料" -#: ../src/core/sipe-cal.c:1019 ../src/core/sipe-cal.c:1046 +#: ../src/core/sipe-cal.c:1018 ../src/core/sipe-cal.c:1045 #, c-format msgid "Currently %s" msgstr "目前 %s" -#: ../src/core/sipe-cal.c:1025 +#: ../src/core/sipe-cal.c:1024 msgid "Outside of working hours for next 8 hours" msgstr "在下一個 8 小時工作時數之外" -#: ../src/core/sipe-cal.c:1027 +#: ../src/core/sipe-cal.c:1026 #, c-format msgid "%s for next 8 hours" msgstr "%s 用於下一個 8 小時" -#: ../src/core/sipe-cal.c:1036 +#: ../src/core/sipe-cal.c:1035 msgid "Not working" msgstr "不在工作中" -#: ../src/core/sipe-cal.c:1040 +#: ../src/core/sipe-cal.c:1039 #, c-format msgid "%s until %.2d:%.2d" msgstr "%s 直到 %.2d:%.2d" -#: ../src/core/sipe-cal.c:1048 +#: ../src/core/sipe-cal.c:1047 #, c-format msgid "%s. Outside of working hours at %.2d:%.2d" msgstr "%s。於 %.2d:%.2d 的工作時數之外" -#: ../src/core/sipe-cal.c:1053 +#: ../src/core/sipe-cal.c:1052 #, c-format msgid "%s. %s at %.2d:%.2d" msgstr "%s。%s 於 %.2d:%.2d" @@ -241,7 +266,7 @@ msgstr "" #. Generate next ID -#: ../src/core/sipe-chat.c:240 +#: ../src/core/sipe-chat.c:246 #, c-format msgid "Chat #%d" msgstr "聊天室 #%d" @@ -268,123 +293,115 @@ msgid "Incomplete conference information provided" msgstr "" -#: ../src/core/sipe-conf.c:1041 +#: ../src/core/sipe-conf.c:1106 msgid "" "\n" "\n" "As this client was not compiled with voice call support, if you accept, you will be able to contact the other participants only via IM session." msgstr "" -#: ../src/core/sipe-conf.c:1049 +#: ../src/core/sipe-conf.c:1111 #, c-format -msgid "%s wants to invite you to the conference call%s" +msgid "wants to invite you to a conference call%s" msgstr "" -#: ../src/core/sipe-conf.c:1063 -msgid "Accept" -msgstr "" - -#: ../src/core/sipe-conf.c:1064 -msgid "Decline" -msgstr "" - -#: ../src/core/sipe-conf.c:1345 +#: ../src/core/sipe-conf.c:1459 msgid "" "This conference is no longer locked. Additional participants can now join." msgstr "這個會議已不再鎖定。額外參與者現在可以加入。" -#: ../src/core/sipe-conf.c:1349 +#: ../src/core/sipe-conf.c:1463 msgid "" "This conference is locked. Nobody else can join the conference while it is " "locked." msgstr "這個會議已被鎖定。當它被鎖定時，其他任何人都不可以加入會議。" -#: ../src/core/sipe-conf.c:1382 +#: ../src/core/sipe-conf.c:1496 msgid "You have been disconnected from this conference." msgstr "您已經從這個會議結束連線。" -#: ../src/core/sipe-conf.c:1542 +#: ../src/core/sipe-conf.c:1656 msgid "Dial-in info" msgstr "" -#: ../src/core/sipe-conf.c:1543 +#: ../src/core/sipe-conf.c:1657 msgid "Number" msgstr "" -#: ../src/core/sipe-conf.c:1545 +#: ../src/core/sipe-conf.c:1659 msgid "Conference ID" msgstr "" -#: ../src/core/sipe-conf.c:1547 +#: ../src/core/sipe-conf.c:1661 msgid "Meeting link" msgstr "" -#: ../src/core/sipe-conf.c:1549 +#: ../src/core/sipe-conf.c:1663 msgid "Organizer" msgstr "" -#: ../src/core/sipe-conf.c:1551 +#: ../src/core/sipe-conf.c:1665 msgid "Alternative dial-in numbers" msgstr "" #. The next 13 texts make up the SIPE about note text #. About note, part 1/13: introduction -#: ../src/core/sipe-core.c:220 +#: ../src/core/sipe-core.c:221 msgid "" "A third-party plugin implementing extended version of SIP/SIMPLE used by " "various products" msgstr "一個協力廠商的外掛程式，實作了由不同產品所使用的 SIP/SIMPLE 進階版本" #. About note, part 2/13: home page URL (label) -#: ../src/core/sipe-core.c:222 +#: ../src/core/sipe-core.c:223 msgid "Home Page" msgstr "" #. About note, part 3/13: support forum URL (label) -#: ../src/core/sipe-core.c:224 +#: ../src/core/sipe-core.c:225 msgid "Support" msgstr "" #. About note, part 4/13: support forum name (hyperlink text) -#: ../src/core/sipe-core.c:226 +#: ../src/core/sipe-core.c:227 msgid "Help Forum" msgstr "說明論壇" #. About note, part 5/13: bug tracker URL (label) -#: ../src/core/sipe-core.c:228 +#: ../src/core/sipe-core.c:229 msgid "Report Problems" msgstr "報告問題" #. About note, part 6/13: bug tracker URL (hyperlink text) -#: ../src/core/sipe-core.c:230 +#: ../src/core/sipe-core.c:231 msgid "Bug Tracker" msgstr "錯誤追蹤者" #. About note, part 7/13: translation service URL (label) -#: ../src/core/sipe-core.c:232 +#: ../src/core/sipe-core.c:233 msgid "Translations" msgstr "翻譯" #. About note, part 8/13: license type (label) -#: ../src/core/sipe-core.c:234 +#: ../src/core/sipe-core.c:235 msgid "License" msgstr "授權" #. About note, part 9/13: (REMOVED) #. About note, part 10/13: translation request, text before Transifex.com URL #. append a space if text is not empty -#: ../src/core/sipe-core.c:238 +#: ../src/core/sipe-core.c:239 msgid "Please help us to translate SIPE to your native language here at " msgstr "請幫助我們將 SIPE 翻譯為您的原生語言，並在" #. About note, part 11/13: translation request, text after Transifex.com URL #. start with a space if text is not empty -#: ../src/core/sipe-core.c:241 +#: ../src/core/sipe-core.c:242 msgid " using convenient web interface" msgstr " 使用方便的網頁介面" #. About note, part 12/13: author list (header) -#: ../src/core/sipe-core.c:243 +#: ../src/core/sipe-core.c:244 msgid "Authors" msgstr "作者" @@ -392,15 +409,15 @@ #. PLEASE NOTE: do *NOT* simply translate the english original #. but write something similar to the following sentence: #. "Localization for (): " -#: ../src/core/sipe-core.c:248 +#: ../src/core/sipe-core.c:249 msgid "Original texts in English (en): SIPE developers" msgstr "傳統漢語本地化 (zh_TW)：趙惟倫 " -#: ../src/core/sipe-core.c:269 +#: ../src/core/sipe-core.c:273 msgid "SIP Exchange user name contains invalid characters" msgstr "SIP Exchange 的使用者名稱不可含有無效字元" -#: ../src/core/sipe-core.c:277 ../src/purple/purple-buddy.c:485 +#: ../src/core/sipe-core.c:281 ../src/purple/purple-buddy.c:485 #: ../src/telepathy/telepathy-protocol.c:89 #: ../src/telepathy/telepathy-protocol.c:191 #, c-format @@ -409,21 +426,21 @@ "Example: user@company.com" msgstr "使用者名稱應該是有效的 SIP URI\n範例：user@company.com" -#: ../src/core/sipe-core.c:284 +#: ../src/core/sipe-core.c:288 msgid "Password is required when Single Sign-On is not enabled" msgstr "" -#: ../src/core/sipe-core.c:294 +#: ../src/core/sipe-core.c:298 msgid "" "Email address should be valid if provided\n" "Example: user@company.com" msgstr "如果提供電子郵件地址應該是有效的\n範例：user@company.com" -#: ../src/core/sipe-core.c:303 +#: ../src/core/sipe-core.c:307 msgid "SIP Exchange user name contains whitespace" msgstr "SIP Exchange 的使用者名稱不可含有空白字元" -#: ../src/core/sipe-core.c:317 +#: ../src/core/sipe-core.c:321 msgid "" "Email services URL should be valid if provided\n" "Example: https://exchange.corp.com/EWS/Exchange.asmx\n" @@ -454,13 +471,13 @@ msgid "Could not create listen socket" msgstr "無法建立監聽通訊端" -#: ../src/core/sipe-ft-lync.c:757 ../src/core/sipe-media.c:1195 -#: ../src/core/sipe-media.c:1206 ../src/core/sipe-media.c:1284 -#: ../src/core/sipe-media.c:1740 +#: ../src/core/sipe-ft-lync.c:762 ../src/core/sipe-media.c:1328 +#: ../src/core/sipe-media.c:1339 ../src/core/sipe-media.c:1417 +#: ../src/core/sipe-media.c:1923 msgid "Error occurred" msgstr "" -#: ../src/core/sipe-ft-lync.c:758 +#: ../src/core/sipe-ft-lync.c:763 msgid "Error creating data stream" msgstr "" @@ -495,7 +512,7 @@ msgstr "記憶體不足" #: ../src/core/sipe-group.c:168 ../src/core/sipe-notify.c:1163 -#: ../src/core/sipe-notify.c:1190 ../src/core/sipe-notify.c:1294 +#: ../src/core/sipe-notify.c:1197 ../src/core/sipe-notify.c:1301 #: ../src/purple/purple-search.c:128 msgid "Other Contacts" msgstr "其他聯絡人" @@ -533,77 +550,77 @@ msgid "Failed to invite %s" msgstr "邀請 %s 時失敗" -#: ../src/core/sipe-incoming.c:741 +#: ../src/core/sipe-incoming.c:754 #, c-format msgid "Received a message with unrecognized contents from %s" msgstr "從 %s 接收到內容無法辨識的訊息" -#: ../src/core/sipe-media.c:835 ../src/core/sipe-media.c:1347 -#: ../src/core/sipe-media.c:1357 ../src/core/sipe-media.c:1721 -#: ../src/core/sipe-media.c:1741 +#: ../src/core/sipe-media.c:869 ../src/core/sipe-media.c:1483 +#: ../src/core/sipe-media.c:1493 ../src/core/sipe-media.c:1904 +#: ../src/core/sipe-media.c:1924 msgid "Unable to establish a call" msgstr "無法建立呼叫" -#: ../src/core/sipe-media.c:836 ../src/core/sipe-media.c:1722 +#: ../src/core/sipe-media.c:870 ../src/core/sipe-media.c:1905 msgid "Encryption settings of peer are incompatible with ours." msgstr "對方的加密設定值與我們的不相容。" -#: ../src/core/sipe-media.c:929 +#: ../src/core/sipe-media.c:963 #, c-format msgid "User %s rejected call" msgstr "使用者 %s 已拒絕呼叫" -#: ../src/core/sipe-media.c:930 +#: ../src/core/sipe-media.c:964 msgid "Call rejected" msgstr "呼叫被拒絕" -#: ../src/core/sipe-media.c:1196 ../src/core/sipe-media.c:1285 +#: ../src/core/sipe-media.c:1329 ../src/core/sipe-media.c:1418 msgid "Error creating audio stream" msgstr "建立音訊串流時發生錯誤" -#: ../src/core/sipe-media.c:1207 +#: ../src/core/sipe-media.c:1340 msgid "Error creating video stream" msgstr "建立視訊串流時發生錯誤" -#: ../src/core/sipe-media.c:1251 ../src/purple/purple-chat.c:314 +#: ../src/core/sipe-media.c:1384 ../src/purple/purple-chat.c:329 msgid "Join conference call" msgstr "加入會議談話" -#: ../src/core/sipe-media.c:1252 +#: ../src/core/sipe-media.c:1385 msgid "Conference calls are not supported on this server." msgstr "" -#: ../src/core/sipe-media.c:1348 +#: ../src/core/sipe-media.c:1484 msgid "Invalid phone number" msgstr "" -#: ../src/core/sipe-media.c:1358 +#: ../src/core/sipe-media.c:1494 msgid "Audio Test Service is not available." msgstr "" -#: ../src/core/sipe-media.c:1690 +#: ../src/core/sipe-media.c:1873 msgid "User unavailable" msgstr "使用者無法聯繫" -#: ../src/core/sipe-media.c:1693 +#: ../src/core/sipe-media.c:1876 #, c-format msgid "%s does not want to be disturbed" msgstr "%s 不想被打擾" -#: ../src/core/sipe-media.c:1695 +#: ../src/core/sipe-media.c:1878 #, c-format msgid "User %s is not available" msgstr "使用者 %s 無法聯繫" -#: ../src/core/sipe-media.c:1704 +#: ../src/core/sipe-media.c:1887 msgid "Unsupported media type" msgstr "" -#: ../src/core/sipe-media.c:2062 +#: ../src/core/sipe-media.c:2246 msgid "Media error" msgstr "" -#: ../src/core/sipe-media.c:2063 +#: ../src/core/sipe-media.c:2247 msgid "Error while reading from stream" msgstr "" @@ -654,36 +671,36 @@ msgstr "不明" #. Translators: remove (clear) previously assigned access level -#: ../src/core/sipe-ocs2007.c:2571 +#: ../src/core/sipe-ocs2007.c:2570 msgid "Unspecify" msgstr "未定義" -#: ../src/core/sipe-ocs2007.c:2590 +#: ../src/core/sipe-ocs2007.c:2589 msgid "People in my company" msgstr "公司同事" -#: ../src/core/sipe-ocs2007.c:2600 +#: ../src/core/sipe-ocs2007.c:2599 msgid "People in domains connected with my company" msgstr "與公司有連結的認證域名中的人" -#: ../src/core/sipe-ocs2007.c:2609 +#: ../src/core/sipe-ocs2007.c:2608 msgid "People in public domains" msgstr "位於公共認證域名中的人" -#: ../src/core/sipe-ocs2007.c:2619 +#: ../src/core/sipe-ocs2007.c:2618 #, c-format msgid "People at %s" msgstr "位於 %s 中的人" -#: ../src/core/sipe-ocs2007.c:2644 +#: ../src/core/sipe-ocs2007.c:2643 msgid "Add new domain..." msgstr "加入新的認證域名…" -#: ../src/core/sipe-ocs2007.c:2673 +#: ../src/core/sipe-ocs2007.c:2672 msgid "Online help..." msgstr "線上說明…" -#: ../src/core/sipe-ocs2007.c:2681 +#: ../src/core/sipe-ocs2007.c:2680 msgid "Access groups" msgstr "存取群組" @@ -695,49 +712,60 @@ #. SIPE_ACTIVITY_AVAILABLE #. SIPE_ACTIVITY_ONLINE #. SIPE_ACTIVITY_INACTIVE -#: ../src/core/sipe-status.c:58 +#: ../src/core/sipe-status.c:56 msgid "Inactive" msgstr "非作用中" #. SIPE_ACTIVITY_BUSYIDLE -#: ../src/core/sipe-status.c:60 +#: ../src/core/sipe-status.c:58 msgid "Busy-Idle" msgstr "忙碌-空閒" #. SIPE_ACTIVITY_DND #. SIPE_ACTIVITY_BRB -#: ../src/core/sipe-status.c:62 +#: ../src/core/sipe-status.c:60 msgid "Be right back" msgstr "馬上回來" #. SIPE_ACTIVITY_AWAY #. SIPE_ACTIVITY_LUNCH -#: ../src/core/sipe-status.c:64 +#: ../src/core/sipe-status.c:62 msgid "Out to lunch" msgstr "外出午餐" #. SIPE_ACTIVITY_INVISIBLE #. SIPE_ACTIVITY_OFFLINE #. SIPE_ACTIVITY_ON_PHONE -#: ../src/core/sipe-status.c:67 +#: ../src/core/sipe-status.c:65 msgid "In a call" msgstr "電話中" #. SIPE_ACTIVITY_IN_CONF -#: ../src/core/sipe-status.c:68 +#: ../src/core/sipe-status.c:66 msgid "In a conference" msgstr "會議中" #. SIPE_ACTIVITY_IN_MEETING -#: ../src/core/sipe-status.c:69 +#: ../src/core/sipe-status.c:67 msgid "In a meeting" msgstr "談話中" #. SIPE_ACTIVITY_URGENT_ONLY -#: ../src/core/sipe-status.c:71 +#: ../src/core/sipe-status.c:69 msgid "Urgent interruptions only" msgstr "非急勿擾" +#: ../src/core/sipe-subscriptions.c:189 +msgid "Presence subscription failed!" +msgstr "" + +#: ../src/core/sipe-subscriptions.c:190 +msgid "" +"One or more buddies will therefore permanently show as offline.\n" +"\n" +"Please check that there are no corrupted SIP URIs in your contacts list." +msgstr "" + #: ../src/core/sipe-ucs.c:674 msgid "UCS initialization failed!" msgstr "" @@ -890,15 +918,19 @@ msgid "Copy to" msgstr "複製到" -#: ../src/purple/purple-chat.c:295 +#: ../src/purple/purple-chat.c:310 msgid "Lock" msgstr "鎖定" -#: ../src/purple/purple-chat.c:300 +#: ../src/purple/purple-chat.c:315 msgid "Unlock" msgstr "解除鎖定" -#: ../src/purple/purple-chat.c:321 +#: ../src/purple/purple-chat.c:338 +msgid "Show presentation" +msgstr "" + +#: ../src/purple/purple-chat.c:345 msgid "Meeting entry info" msgstr "" @@ -1150,26 +1182,30 @@ msgstr "群組聊天室代理伺服器\n company.com 或 user@company.com\n(留空表示由使用者名稱決定)" #: ../src/purple/purple-plugin-common.c:933 +msgid "Remote desktop client" +msgstr "" + +#: ../src/purple/purple-plugin-common.c:938 msgid "Media encryption" msgstr "" -#: ../src/purple/purple-plugin-common.c:934 +#: ../src/purple/purple-plugin-common.c:939 msgid "Obey server policy" msgstr "" -#: ../src/purple/purple-plugin-common.c:935 +#: ../src/purple/purple-plugin-common.c:940 msgid "Always" msgstr "" -#: ../src/purple/purple-plugin-common.c:936 +#: ../src/purple/purple-plugin-common.c:941 msgid "Optional" msgstr "" -#: ../src/purple/purple-plugin-common.c:937 +#: ../src/purple/purple-plugin-common.c:942 msgid "Disabled" msgstr "" -#: ../src/purple/purple-plugin-common.c:947 +#: ../src/purple/purple-plugin-common.c:952 msgid "" "Login\n" " user or DOMAIN\\user or\n" @@ -1218,27 +1254,27 @@ msgid "_Search" msgstr "搜尋(_S)" -#: ../src/purple/purple-transport.c:132 +#: ../src/purple/purple-transport.c:135 msgid "Read error" msgstr "讀取錯誤" -#: ../src/purple/purple-transport.c:136 -#: ../src/telepathy/telepathy-transport.c:96 +#: ../src/purple/purple-transport.c:139 +#: ../src/telepathy/telepathy-transport.c:95 msgid "Server has disconnected" msgstr "伺服器已斷線" -#: ../src/purple/purple-transport.c:198 +#: ../src/purple/purple-transport.c:201 msgid "Could not connect" msgstr "無法連線" -#: ../src/purple/purple-transport.c:268 +#: ../src/purple/purple-transport.c:271 msgid "Could not create SSL context" msgstr "無法建立 SSL 內容" -#: ../src/purple/purple-transport.c:290 +#: ../src/purple/purple-transport.c:293 msgid "Could not create socket" msgstr "無法建立通訊端" -#: ../src/purple/purple-transport.c:381 +#: ../src/purple/purple-transport.c:417 msgid "Write error" msgstr "寫入錯誤" diff -Nru pidgin-sipe-1.21.1/README pidgin-sipe-1.22.1/README --- pidgin-sipe-1.21.1/README 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/README 2017-06-11 15:41:22.000000000 +0000 @@ -11,7 +11,6 @@ * Microsoft Lync Server * Microsoft Office Communications Server (OCS 2007/2007 R2) * Microsoft Live Communications Server (LCS 2003/2005) - * Reuters Messaging With this plugin you should be able to replace your Microsoft Office Communicator client with Pidgin/Adium/Miranda/Telepathy. diff -Nru pidgin-sipe-1.21.1/siplcs.vcxproj pidgin-sipe-1.22.1/siplcs.vcxproj --- pidgin-sipe-1.21.1/siplcs.vcxproj 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/siplcs.vcxproj 2017-06-11 15:41:22.000000000 +0000 @@ -106,7 +106,7 @@ Full $(SolutionDir)/../include;$(ProjectDir)/src/api;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;PACKAGE_NAME="pidgin-sipe";PACKAGE_VERSION="1.21.1";PACKAGE_URL="http://sipe.sourceforge.net/";PACKAGE_BUGREPORT="https://sourceforge.net/p/sipe/bugs/";SIPE_VERSION="1.21.1";_CRT_SECURE_NO_WARNINGS;HAVE_NSS;HAVE_GMIME;HAVE_VV;ENABLE_NLS;MIRANDA;HAVE_GSSAPI_GSSAPI_H;HAVE_SSPI;SECURITY_WIN32;SIPE_TRANSLATIONS_URL="https://www.transifex.com/stefanb/pidgin-sipe/";%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;PACKAGE_NAME="pidgin-sipe";PACKAGE_VERSION="1.22.1";PACKAGE_URL="http://sipe.sourceforge.net/";PACKAGE_BUGREPORT="https://sourceforge.net/p/sipe/bugs/";SIPE_VERSION="1.22.1";_CRT_SECURE_NO_WARNINGS;HAVE_NSS;HAVE_GMIME;HAVE_VV;ENABLE_NLS;MIRANDA;HAVE_GSSAPI_GSSAPI_H;HAVE_SSPI;SECURITY_WIN32;SIPE_TRANSLATIONS_URL="https://www.transifex.com/stefanb/pidgin-sipe/";%(PreprocessorDefinitions) MultiThreadedDLL Level3 ProgramDatabase @@ -122,7 +122,7 @@ Disabled $(SolutionDir)/../include;$(ProjectDir)/src/core;$(ProjectDir)/src/api;$(ProjectDir)/src/;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;PACKAGE_NAME="pidgin-sipe";PACKAGE_VERSION="1.21.1";PACKAGE_URL="http://sipe.sourceforge.net/";SIPE_TRANSLATIONS_URL="https://www.transifex.com/stefanb/pidgin-sipe/";PACKAGE_BUGREPORT="https://sourceforge.net/p/sipe/bugs/";SIPE_VERSION="1.21.1";_CRT_SECURE_NO_WARNINGS;HAVE_NSS;HAVE_GMIME;HAVE_VV;ENABLE_NLS;MIRANDA;HAVE_GSSAPI_GSSAPI_H;SECURITY_WIN32;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;PACKAGE_NAME="pidgin-sipe";PACKAGE_VERSION="1.22.1";PACKAGE_URL="http://sipe.sourceforge.net/";SIPE_TRANSLATIONS_URL="https://www.transifex.com/stefanb/pidgin-sipe/";PACKAGE_BUGREPORT="https://sourceforge.net/p/sipe/bugs/";SIPE_VERSION="1.22.1";_CRT_SECURE_NO_WARNINGS;HAVE_NSS;HAVE_GMIME;HAVE_VV;ENABLE_NLS;MIRANDA;HAVE_GSSAPI_GSSAPI_H;SECURITY_WIN32;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDLL @@ -173,6 +173,7 @@ + @@ -252,6 +253,7 @@ + diff -Nru pidgin-sipe-1.21.1/src/adium/README.Adium pidgin-sipe-1.22.1/src/adium/README.Adium --- pidgin-sipe-1.21.1/src/adium/README.Adium 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/src/adium/README.Adium 2017-06-11 15:41:22.000000000 +0000 @@ -1,7 +1,7 @@ Compiling SIPE plugin for Adium =============================== -To compile the Adium plugin you will need XCode and the source code from +To compile the Adium plugin you will need Xcode and the source code from the following URLs: * Adium 1.5+ code: http://trac.adium.im/wiki/GettingNewestAdiumSource @@ -32,3 +32,23 @@ Now you can just select Product -> Build and after a short while you should get a SIPEAdiumPlugin binary that you can install into your Adium application. + +NOTE: Xcode 7.x and newer: + +* Xcode 6.4 no longer runs on macOS 10.12 +* SDKs for OS X 10.11 or newer no longer contain support for OpenSSL. See + + https://github.com/devernay/xcodelegacy + + how to extract & install SDKs for + + * OS X 10.9 & 10.10 from the Xcode 6.4 installation package + * OS X 10.11 from the Xcode 7.3.1 installation package + +* Base SDK selection under "Build Settings" is no longer global. You have to + switch from "Combined" to "Levels" mode and change the Base SDK on all + levels. That includes the Adium sub-project too! +* Disable "Implicitly Link Objective-C Runtime Support" under "Language - + Objective C" to avoid linker errors. +* Ignore the errors "OCUnit is deprecated" by clicking on them and then + selecting "Not Now" in the dialog that pops up. diff -Nru pidgin-sipe-1.21.1/src/adium/SIPEAdiumPlugin.xcodeproj/project.pbxproj pidgin-sipe-1.22.1/src/adium/SIPEAdiumPlugin.xcodeproj/project.pbxproj --- pidgin-sipe-1.21.1/src/adium/SIPEAdiumPlugin.xcodeproj/project.pbxproj 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/src/adium/SIPEAdiumPlugin.xcodeproj/project.pbxproj 2017-06-11 15:41:22.000000000 +0000 @@ -7,7 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 1C1DC3D014A8005A001F6A0F /* md4.c in Sources */ = {isa = PBXBuildFile; fileRef = 1C1DC3CF14A8005A001F6A0F /* md4.c */; }; 1C3F91AC12C1F531000AA829 /* libpidgin-sipe.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1C7056D312C1E5820004E43B /* libpidgin-sipe.a */; }; 1C822BED12F8E87500CC4AEA /* sipe-im.c in Sources */ = {isa = PBXBuildFile; fileRef = 1C822BEB12F8E87500CC4AEA /* sipe-im.c */; }; 1CD71E3413C5380B0079DE64 /* sipe-ft-tftp.c in Sources */ = {isa = PBXBuildFile; fileRef = 1CD71E3313C5380B0079DE64 /* sipe-ft-tftp.c */; }; @@ -86,6 +85,7 @@ B13FABFD119D585A001CE037 /* sipe-ews.c in Sources */ = {isa = PBXBuildFile; fileRef = B13FABC1119D585A001CE037 /* sipe-ews.c */; }; B13FABFE119D585A001CE037 /* sipe-ews-autodiscover.c in Sources */ = {isa = PBXBuildFile; fileRef = B13FABC2119D585A001CE037 /* sipe-ews-autodiscover.c */; }; B13FABFF119D585A001CE037 /* sipe-ft.c in Sources */ = {isa = PBXBuildFile; fileRef = B13FABC3119D585A001CE037 /* sipe-ft.c */; }; + B13FAC00119D585A001CE037 /* sipe-lync-autodiscover.c in Sources */ = {isa = PBXBuildFile; fileRef = B13FABC4119D585A001CE037 /* sipe-lync-autodiscover.c */; }; B13FAC04119D585A001CE037 /* sipe-schedule.c in Sources */ = {isa = PBXBuildFile; fileRef = B13FABC8119D585A001CE037 /* sipe-schedule.c */; }; B13FAC06119D585A001CE037 /* sipe-session.c in Sources */ = {isa = PBXBuildFile; fileRef = B13FABCA119D585A001CE037 /* sipe-session.c */; }; B13FAC08119D585A001CE037 /* sipe-sign.c in Sources */ = {isa = PBXBuildFile; fileRef = B13FABCC119D585A001CE037 /* sipe-sign.c */; }; @@ -184,7 +184,6 @@ 089C167EFE841241C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = ""; }; 089C167FFE841241C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; - 1C1DC3CF14A8005A001F6A0F /* md4.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = md4.c; sourceTree = ""; }; 1C7056D312C1E5820004E43B /* libpidgin-sipe.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libpidgin-sipe.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 1C822BEB12F8E87500CC4AEA /* sipe-im.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "sipe-im.c"; sourceTree = ""; }; 1CD71E3313C5380B0079DE64 /* sipe-ft-tftp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "sipe-ft-tftp.c"; sourceTree = ""; }; @@ -266,6 +265,7 @@ B13FABC1119D585A001CE037 /* sipe-ews.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "sipe-ews.c"; sourceTree = ""; }; B13FABC2119D585A001CE037 /* sipe-ews-autodiscover.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "sipe-ews-autodiscover.c"; sourceTree = ""; }; B13FABC3119D585A001CE037 /* sipe-ft.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "sipe-ft.c"; sourceTree = ""; }; + B13FABC4119D585A001CE037 /* sipe-lync-autodiscover.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "sipe-lync-autodiscover.c"; sourceTree = ""; }; B13FABC8119D585A001CE037 /* sipe-schedule.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "sipe-schedule.c"; sourceTree = ""; }; B13FABCA119D585A001CE037 /* sipe-session.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "sipe-session.c"; sourceTree = ""; }; B13FABCC119D585A001CE037 /* sipe-sign.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "sipe-sign.c"; sourceTree = ""; }; @@ -472,7 +472,6 @@ B13FAB9C119D585A001CE037 /* core */ = { isa = PBXGroup; children = ( - 1C1DC3CF14A8005A001F6A0F /* md4.c */, 1CF2610812C2E1AA0045B6CC /* sdpmsg.c */, B13FABA3119D585A001CE037 /* sip-csta.c */, 7B78059D16DFF8D200B844A6 /* sip-sec-basic.c */, @@ -508,6 +507,7 @@ 7B379593176A2DDF001A02FD /* sipe-http.c */, 1C822BEB12F8E87500CC4AEA /* sipe-im.c */, 1CF2610D12C2E1AA0045B6CC /* sipe-incoming.c */, + B13FABC4119D585A001CE037 /* sipe-lync-autodiscover.c */, B89F388C1BDEB0F00017B509 /* sipe-mime-common.c */, 1CE49FF114A17F4D00663393 /* sipe-notify.c */, 1CE49FB314A17CF000663393 /* sipe-ocs2005.c */, @@ -757,6 +757,7 @@ B13FABFD119D585A001CE037 /* sipe-ews.c in Sources */, B13FABFE119D585A001CE037 /* sipe-ews-autodiscover.c in Sources */, B13FABFF119D585A001CE037 /* sipe-ft.c in Sources */, + B13FAC00119D585A001CE037 /* sipe-lync-autodiscover.c in Sources */, B13FAC04119D585A001CE037 /* sipe-schedule.c in Sources */, B13FAC06119D585A001CE037 /* sipe-session.c in Sources */, B13FAC08119D585A001CE037 /* sipe-sign.c in Sources */, @@ -795,7 +796,6 @@ 1CE4A00D14A17FD100663393 /* sipe-tls.c in Sources */, 1CE4A01E14A180E100663393 /* purple-search.c in Sources */, 1CE4A01F14A180E100663393 /* purple-status.c in Sources */, - 1C1DC3D014A8005A001F6A0F /* md4.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff -Nru pidgin-sipe-1.21.1/src/adium/xcconfigs/Base.xcconfig pidgin-sipe-1.22.1/src/adium/xcconfigs/Base.xcconfig --- pidgin-sipe-1.21.1/src/adium/xcconfigs/Base.xcconfig 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/src/adium/xcconfigs/Base.xcconfig 2017-06-11 15:41:22.000000000 +0000 @@ -21,7 +21,7 @@ PACKAGE_URL=\"http:${SLASH}/sipe.sourceforge.net/\" // No need to change version number in the xcodeproj file every release, just here. -PACKAGE_VERSION=1.21.1 +PACKAGE_VERSION=1.22.1 PACKAGE_STRING=\"pidgin-sipe\ ${PACKAGE_VERSION}\" GCC_PREPROCESSOR_DEFINITIONS = SIPE_TRANSLATIONS_URL=${SIPE_TRANSLATIONS_URL} LOCALEDIR=\"translations\" PURPLE_STATIC_PRPL=1 HAVE_BIND_TEXTDOMAIN_CODESET=1 ENABLE_NLS=1 ADIUM=1 PACKAGE_NAME=\"pidgin-sipe\" PACKAGE_TARNAME=\"pidgin-sipe\" PACKAGE_BUGREPORT=${PACKAGE_BUGREPORT} PACKAGE_VERSION=\"${PACKAGE_VERSION}\" PACKAGE_STRING=${PACKAGE_STRING} PACKAGE_URL=${PACKAGE_URL} STDC_HEADERS=1 HAVE_SYS_TYPES_H=1 HAVE_SYS_STAT_H=1 HAVE_STDLIB_H=1 HAVE_STRING_H=1 HAVE_MEMORY_H=1 HAVE_STRINGS_H=1 HAVE_INTTYPES_H=1 HAVE_STDINT_H=1 HAVE_UNISTD_H=1 HAVE_DLFCN_H=1 LT_OBJDIR=\".libs/\" STDC_HEADERS=1 HAVE_LOCALE_H=1 HAVE_LC_MESSAGES=1 HAVE_DLFCN_H=1 HAVE_DCGETTEXT=1 HAVE_GETTEXT=1 HAVE_LOCALE_H=1 HAVE_GSSAPI_GSSAPI_H=1 HAVE_LANGINFO_CODESET=1 diff -Nru pidgin-sipe-1.21.1/src/api/sipe-backend.h pidgin-sipe-1.22.1/src/api/sipe-backend.h --- pidgin-sipe-1.21.1/src/api/sipe-backend.h 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/src/api/sipe-backend.h 2017-06-11 15:41:22.000000000 +0000 @@ -61,10 +61,14 @@ /** DEBUGGING ****************************************************************/ typedef enum { + SIPE_LOG_LEVEL_INFO, + SIPE_LOG_LEVEL_WARNING, + SIPE_LOG_LEVEL_ERROR, SIPE_DEBUG_LEVEL_INFO, SIPE_DEBUG_LEVEL_WARNING, SIPE_DEBUG_LEVEL_ERROR, } sipe_debug_level; +#define SIPE_DEBUG_LEVEL_LOWEST SIPE_DEBUG_LEVEL_INFO /** * Output debug information without formatting @@ -90,6 +94,12 @@ ...) G_GNUC_PRINTF(2, 3); /* Convenience macros */ +#define SIPE_LOG_INFO(fmt, ...) sipe_backend_debug(SIPE_LOG_LEVEL_INFO, fmt, __VA_ARGS__) +#define SIPE_LOG_INFO_NOFORMAT(msg) sipe_backend_debug_literal(SIPE_LOG_LEVEL_INFO, msg) +#define SIPE_LOG_WARNING(fmt, ...) sipe_backend_debug(SIPE_LOG_LEVEL_WARNING, fmt, __VA_ARGS__) +#define SIPE_LOG_WARNING_NOFORMAT(msg) sipe_backend_debug_literal(SIPE_LOG_LEVEL_WARNING, msg) +#define SIPE_LOG_ERROR(fmt, ...) sipe_backend_debug(SIPE_LOG_LEVEL_ERROR, fmt, __VA_ARGS__) +#define SIPE_LOG_ERROR_NOFORMAT(msg) sipe_backend_debug_literal(SIPE_LOG_LEVEL_ERROR, msg) #define SIPE_DEBUG_INFO(fmt, ...) sipe_backend_debug(SIPE_DEBUG_LEVEL_INFO, fmt, __VA_ARGS__) #define SIPE_DEBUG_INFO_NOFORMAT(msg) sipe_backend_debug_literal(SIPE_DEBUG_LEVEL_INFO, msg) #define SIPE_DEBUG_WARNING(fmt, ...) sipe_backend_debug(SIPE_DEBUG_LEVEL_WARNING, fmt, __VA_ARGS__) @@ -374,11 +384,17 @@ struct sipe_backend_media_stream; struct sipe_backend_media_relays; +struct ssrc_range { + guint32 begin; + guint32 end; +}; + struct sipe_media_stream { struct sipe_backend_media_stream *backend_private; struct sipe_media_call *call; gchar *id; + struct ssrc_range *ssrc_range; void (*candidate_pairs_established_cb)(struct sipe_media_stream *); void (*read_cb)(struct sipe_media_stream *); @@ -393,8 +409,6 @@ void (*stream_initialized_cb)(struct sipe_media_call *, struct sipe_media_stream *); - void (*stream_end_cb)(struct sipe_media_call *, - struct sipe_media_stream *); void (*media_end_cb)(struct sipe_media_call *); void (*call_accept_cb)(struct sipe_media_call *, gboolean local); void (*call_reject_cb)(struct sipe_media_call *, gboolean local); @@ -425,9 +439,7 @@ gchar *password); void sipe_backend_media_relays_free(struct sipe_backend_media_relays *media_relays); -struct sipe_backend_media_stream *sipe_backend_media_add_stream(struct sipe_media_call *media, - const gchar *id, - const gchar *participant, +struct sipe_backend_media_stream *sipe_backend_media_add_stream(struct sipe_media_stream *stream, SipeMediaType type, SipeIceVersion ice_version, gboolean initiator, @@ -470,7 +482,9 @@ /* Codec handling */ struct sipe_backend_codec *sipe_backend_codec_new(int id, const char *name, - SipeMediaType type, guint clock_rate); + SipeMediaType type, + guint clock_rate, + guint channels); void sipe_backend_codec_free(struct sipe_backend_codec *codec); int sipe_backend_codec_get_id(struct sipe_backend_codec *codec); /** @@ -532,8 +546,6 @@ /** NETWORK ******************************************************************/ -const gchar *sipe_backend_network_ip_address(struct sipe_core_public *sipe_public); - struct sipe_backend_listendata; typedef void (*sipe_listen_start_cb)(unsigned short port, gpointer data); @@ -609,6 +621,7 @@ SIPE_SETTING_EMAIL_LOGIN, SIPE_SETTING_EMAIL_PASSWORD, SIPE_SETTING_GROUPCHAT_USER, + SIPE_SETTING_RDP_CLIENT, SIPE_SETTING_USER_AGENT, SIPE_SETTING_LAST } sipe_setting; @@ -654,6 +667,7 @@ struct sipe_transport_connection *sipe_backend_transport_connect(struct sipe_core_public *sipe_public, const sipe_connect_setup *setup); void sipe_backend_transport_disconnect(struct sipe_transport_connection *conn); +gchar *sipe_backend_transport_ip_address(struct sipe_transport_connection *conn); void sipe_backend_transport_message(struct sipe_transport_connection *conn, const gchar *buffer); void sipe_backend_transport_flush(struct sipe_transport_connection *conn); diff -Nru pidgin-sipe-1.21.1/src/api/sipe-common.h pidgin-sipe-1.22.1/src/api/sipe-common.h --- pidgin-sipe-1.21.1/src/api/sipe-common.h 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/src/api/sipe-common.h 2017-06-11 15:41:22.000000000 +0000 @@ -3,7 +3,7 @@ * * pidgin-sipe * - * Copyright (C) 2010-11 SIPE Project + * Copyright (C) 2010-2017 SIPE Project * * 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 @@ -33,6 +33,12 @@ #define SIPE_UNUSED_PARAMETER #endif +#if defined(__GNUC__) && (__GNUC__ >= 7) +#define SIPE_FALLTHROUGH __attribute__((fallthrough)); +#else +#define SIPE_FALLTHROUGH +#endif + /* in order to remove internal.h dependency in mingw builds */ #ifndef G_GNUC_NULL_TERMINATED # if defined(__GNUC__) && (__GNUC__ >= 4) diff -Nru pidgin-sipe-1.21.1/src/api/sipe-core.h pidgin-sipe-1.22.1/src/api/sipe-core.h --- pidgin-sipe-1.21.1/src/api/sipe-core.h 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/src/api/sipe-core.h 2017-06-11 15:41:22.000000000 +0000 @@ -3,7 +3,7 @@ * * pidgin-sipe * - * Copyright (C) 2010-2016 SIPE Project + * Copyright (C) 2010-2017 SIPE Project * * 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 @@ -157,6 +157,7 @@ /** Utility functions exported by the core to backends ***********************/ gboolean sipe_strequal(const gchar *left, const gchar *right); +gboolean sipe_strcase_equal(const gchar *left, const gchar *right); GSList * sipe_utils_nameval_add(GSList *list, const gchar *name, const gchar *value); @@ -343,6 +344,15 @@ struct sipe_chat_session *chat_session); /** + * Get type of chat session, e.g. group chat + */ +#define SIPE_CHAT_TYPE_UNKNOWN 0 +#define SIPE_CHAT_TYPE_MULTIPARTY 1 +#define SIPE_CHAT_TYPE_CONFERENCE 2 +#define SIPE_CHAT_TYPE_GROUPCHAT 3 +guint sipe_core_chat_type(struct sipe_chat_session *chat_session); + +/** * Invite to chat */ void sipe_core_chat_invite(struct sipe_core_public *sipe_public, @@ -409,6 +419,18 @@ sipe_core_conf_entry_info(struct sipe_core_public *sipe_public, struct sipe_chat_session *chat_session); +/** + * Checks if given chat session has an open RDP client window. + * + * @param sipe_public (in) SIPE core data. + * @param chat_session (in) chat session structure + * + * @return @c TRUE if RDP session is in progress. + */ +gboolean +sipe_core_conf_is_viewing_appshare(struct sipe_core_public *sipe_public, + struct sipe_chat_session *chat_session); + /* call control (CSTA) */ void sipe_core_buddy_make_call(struct sipe_core_public *sipe_public, const gchar *phone); @@ -446,6 +468,14 @@ gboolean writable); /** + * Called by media backend when @c stream has ended and should be destroyed. + * + * @param stream (in) SIPE media stream data. + */ +void +sipe_core_media_stream_end(struct sipe_media_stream *stream); + +/** * Connects to a conference call specified by given chat session * * @param sipe_public (in) SIPE core data. @@ -489,6 +519,20 @@ const gchar *who, const gchar *file); +/* application sharing */ + +/** + * Connects to a meeting's presentation + * + * @param sipe_public (in) SIPE core data. + * @param chat_session (in) chat session structure + * @param user_must_accept (in) @c TRUE if user should be shown accept/decline + * dialog before the action can proceed. + */ +void sipe_core_appshare_connect_conference(struct sipe_core_public *sipe_public, + struct sipe_chat_session *chat_session, + gboolean user_must_accept); + /* group chat */ gboolean sipe_core_groupchat_query_rooms(struct sipe_core_public *sipe_public); void sipe_core_groupchat_join(struct sipe_core_public *sipe_public, @@ -562,6 +606,38 @@ guint activity, const gchar *note); +#define SIPE_MSRTP_VSR_HEADER_LEN 20 +#define SIPE_MSRTP_VSR_ENTRY_LEN 0x44 +#define SIPE_MSRTP_VSR_FCI_WORDLEN \ + (SIPE_MSRTP_VSR_HEADER_LEN + SIPE_MSRTP_VSR_ENTRY_LEN) / 4 + +#define SIPE_MSRTP_VSR_SOURCE_ANY 0xFFFFFFFE +#define SIPE_MSRTP_VSR_SOURCE_NONE 0xFFFFFFFF + +/** + * Fills @buffer with Video Source Request described in [MS-RTP] 2.2.12.2. + * + * @param buffer (out) destination the VSR will be written to. The byte length + * of @c buffer MUST be at least @c SIPE_MSRTP_VSR_HEADER_LEN + + * @c SIPE_MSRTP_VSR_ENTRY_LEN. + * @param payload_type (in) payload ID of the codec negotiated with the peer. + */ +void sipe_core_msrtp_write_video_source_request(guint8 *buffer, + guint8 payload_type); + +/** + * Fills @buffer with customized Payload Content Scalability Information packet + * described in [MS-H264PF] consisting of a Stream Layout SEI Message (section + * 2.2.5) and a Bitstream Info SEI Message (section 2.2.7). + * + * @param buffer (out) destination the PACSI will be written to. + * @param nal_count (in) number of NAL units this packet describes. + * + * @return Byte length of the PACSI packet. + */ +gsize sipe_core_msrtp_write_video_scalability_info(guint8 *buffer, + guint8 nal_count); + #ifdef __cplusplus } #endif diff -Nru pidgin-sipe-1.21.1/src/core/Makefile.am pidgin-sipe-1.22.1/src/core/Makefile.am --- pidgin-sipe-1.21.1/src/core/Makefile.am 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/src/core/Makefile.am 2017-06-11 15:41:22.000000000 +0000 @@ -67,6 +67,8 @@ sipe-im.c \ sipe-incoming.h \ sipe-incoming.c \ + sipe-lync-autodiscover.h \ + sipe-lync-autodiscover.c \ sipe-mime-common.c \ sipe-notify.h \ sipe-notify.c \ @@ -112,8 +114,6 @@ if !SIP_SEC_GSSAPI_ONLY libsipe_core_la_SOURCES += \ - md4.h \ - md4.c \ sip-sec-ntlm.h \ sip-sec-ntlm.c @@ -122,6 +122,11 @@ libsipe_core_tests_la_SOURCES = \ sip-sec-ntlm-tests.c +libsipe_core_tests_la_LIBADD = \ + libsipe_core_la-sipmsg.lo \ + libsipe_core_la-sipe-sign.lo \ + libsipe_core_la-sipe-utils.lo \ + libsipe_core_la-uuid.lo endif endif @@ -136,6 +141,11 @@ sipe-cert-crypto-nss.c \ sipe-crypt-nss.c \ sipe-digest-nss.c +if !SIP_SEC_GSSAPI_ONLY +libsipe_core_crypto_la_SOURCES += \ + md4.h \ + md4.c +endif endif libsipe_core_libxml2_la_SOURCES = \ @@ -195,12 +205,24 @@ if SIPE_WITH_VV libsipe_core_la_SOURCES += sipe-media.h sipe-media.c \ - sdpmsg.h sdpmsg.c + sdpmsg.h sdpmsg.c \ + sipe-msrtp.c endif if SIPE_HAVE_XDATA libsipe_core_la_SOURCES += \ sipe-ft-lync.h sipe-ft-lync.c + +if SIPE_HAVE_APPSHARE +libsipe_core_la_SOURCES += \ + sipe-appshare.c \ + sipe-appshare.h \ + sipe-appshare-client.h \ + sipe-appshare-remmina.c \ + sipe-appshare-xfreerdp.c + +libsipe_core_la_CFLAGS += $(GIO_CFLAGS) +endif endif check_PROGRAMS = @@ -209,8 +231,8 @@ sipe_xml_tests_SOURCES = sipe-xml-tests.c sipe_xml_tests_CFLAGS = $(libsipe_core_la_CFLAGS) sipe_xml_tests_LDADD = \ - libsipe_core.la \ libsipe_core_libxml2.la \ + libsipe_core_la-sipe-utils.lo \ $(LIBXML2_LIBS) \ $(GLIB_LIBS) diff -Nru pidgin-sipe-1.21.1/src/core/Makefile.mingw pidgin-sipe-1.22.1/src/core/Makefile.mingw --- pidgin-sipe-1.21.1/src/core/Makefile.mingw 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/src/core/Makefile.mingw 2017-06-11 15:41:22.000000000 +0000 @@ -1,6 +1,6 @@ ################################### tell Emacs this is a -*- makefile-gmake -*- # -# Copyright (C) 2011-2015 SIPE Project +# Copyright (C) 2011-2016 SIPE Project # # Makefile.mingw # @@ -92,6 +92,7 @@ sipe-http-transport.c \ sipe-im.c \ sipe-incoming.c \ + sipe-lync-autodiscover.c \ sipe-mime-common.c \ sipe-notify.c \ sipe-ocs2005.c \ diff -Nru pidgin-sipe-1.21.1/src/core/md4.c pidgin-sipe-1.22.1/src/core/md4.c --- pidgin-sipe-1.21.1/src/core/md4.c 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/src/core/md4.c 2017-06-11 15:41:22.000000000 +0000 @@ -1,65 +1,15 @@ /* vim:set ts=2 sw=2 et cindent: */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is Mozilla. - * - * The Initial Developer of the Original Code is IBM Corporation. - * Portions created by IBM Corporation are Copyright (C) 2003 - * IBM Corporation. All Rights Reserved. - * - * Contributor(s): - * Darin Fisher - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -/* - * Non-functional changes to remove dependencies on NSS headers - * - * Changes are flagged with __SIPE__REMOVE_NSS_DEPENDENCIES__ - * - * Added Coverity warning suppression - * - * Copyright (C) 2011-12 SIPE Project - */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ /* * "clean room" MD4 implementation (see RFC 1320) */ -#ifdef __SIPE__REMOVE_NSS_DEPENDENCIES__ -#else -#include -#endif /* __SIPE__REMOVE_NSS_DEPENDENCIES__ */ - #include #include "md4.h" -typedef PRUint32 Uint32; -typedef PRUint8 Uint8; - /* the "conditional" function */ #define F(x,y,z) (((x) & (y)) | (~(x) & (z))) @@ -82,9 +32,9 @@ #define RD3(a,b,c,d,k,s) a += H(b,c,d) + X[k] + 0x6ED9EBA1; a = ROTL(a,s) /* converts from word array to byte array, len is number of bytes */ -static void w2b(Uint8 *out, const Uint32 *in, Uint32 len) +static void w2b(uint8_t *out, const uint32_t *in, uint32_t len) { - Uint8 *bp; const Uint32 *wp, *wpend; + uint8_t *bp; const uint32_t *wp, *wpend; bp = out; wp = in; @@ -92,17 +42,17 @@ for (; wp != wpend; ++wp, bp += 4) { - bp[0] = (Uint8) ((*wp ) & 0xFF); - bp[1] = (Uint8) ((*wp >> 8) & 0xFF); - bp[2] = (Uint8) ((*wp >> 16) & 0xFF); - bp[3] = (Uint8) ((*wp >> 24) & 0xFF); + bp[0] = (uint8_t) ((*wp ) & 0xFF); + bp[1] = (uint8_t) ((*wp >> 8) & 0xFF); + bp[2] = (uint8_t) ((*wp >> 16) & 0xFF); + bp[3] = (uint8_t) ((*wp >> 24) & 0xFF); } } /* converts from byte array to word array, len is number of bytes */ -static void b2w(Uint32 *out, const Uint8 *in, Uint32 len) +static void b2w(uint32_t *out, const uint8_t *in, uint32_t len) { - Uint32 *wp; const Uint8 *bp, *bpend; + uint32_t *wp; const uint8_t *bp, *bpend; wp = out; bp = in; @@ -110,17 +60,17 @@ for (; bp != bpend; bp += 4, ++wp) { - *wp = (Uint32) (bp[0] ) | - (Uint32) (bp[1] << 8) | - (Uint32) (bp[2] << 16) | - (Uint32) (bp[3] << 24); + *wp = (uint32_t) (bp[0] ) | + (uint32_t) (bp[1] << 8) | + (uint32_t) (bp[2] << 16) | + (uint32_t) (bp[3] << 24); } } /* update state: data is 64 bytes in length */ -static void md4step(Uint32 state[4], const Uint8 *data) +static void md4step(uint32_t state[4], const uint8_t *data) { - Uint32 A, B, C, D, X[16]; + uint32_t A, B, C, D, X[16]; b2w(X, data, 64); @@ -150,10 +100,13 @@ state[3] += D; } -void md4sum(const Uint8 *input, Uint32 inputLen, Uint8 *result) +void md4sum(const uint8_t *input, uint32_t inputLen, uint8_t *result) { - Uint8 final[128]; - Uint32 i, n, m, state[4]; + uint8_t final[128]; + uint32_t i, n, m, state[4]; + uint64_t inputLenBits; + uint32_t inputLenBitsLow; + uint32_t inputLenBitsHigh; /* magic initial states */ state[0] = 0x67452301; @@ -174,10 +127,14 @@ final[n] = 0x80; memset(final + n + 1, 0, 120 - (n + 1)); - inputLen = inputLen << 3; - /* This code is correct: w2b() only accesses 4 bytes starting from &inputLen */ - /* coverity[array_vs_singleton : FALSE] */ - w2b(final + (n >= 56 ? 120 : 56), &inputLen, 4); + /* Append the original input length in bits as a 64-bit number. This is done + * in two 32-bit chunks, with the least-significant 32 bits first. + * w2b will handle endianness. */ + inputLenBits = inputLen << 3; + inputLenBitsLow = (uint32_t)(inputLenBits & 0xFFFFFFFF); + w2b(final + (n >= 56 ? 120 : 56), &inputLenBitsLow, 4); + inputLenBitsHigh = (uint32_t)((inputLenBits >> 32) & 0xFFFFFFFF); + w2b(final + (n >= 56 ? 124 : 60), &inputLenBitsHigh, 4); md4step(state, final); if (n >= 56) diff -Nru pidgin-sipe-1.21.1/src/core/md4.h pidgin-sipe-1.22.1/src/core/md4.h --- pidgin-sipe-1.21.1/src/core/md4.h 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/src/core/md4.h 2017-06-11 15:41:22.000000000 +0000 @@ -1,47 +1,7 @@ /* vim:set ts=2 sw=2 et cindent: */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is Mozilla. - * - * The Initial Developer of the Original Code is IBM Corporation. - * Portions created by IBM Corporation are Copyright (C) 2003 - * IBM Corporation. All Rights Reserved. - * - * Contributor(s): - * Darin Fisher - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -/* - * Non-functional changes to remove dependencies on NSS headers - * - * Changes are flagged with __SIPE__REMOVE_NSS_DEPENDENCIES__ - * - * Copyright (C) 2011 SIPE Project - */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #ifndef md4_h__ #define md4_h__ @@ -50,12 +10,7 @@ extern "C" { #endif -#ifdef __SIPE__REMOVE_NSS_DEPENDENCIES__ -#include "prtypes.h" -#else -typedef guint32 PRUint32; -typedef guint8 PRUint8; -#endif /* __SIPE__REMOVE_NSS_DEPENDENCIES__ */ +#include /** * md4sum - computes the MD4 sum over the input buffer per RFC 1320 @@ -74,7 +29,7 @@ * interface would make more sense if that were a requirement. Currently, this * is good enough for the applications we care about. */ -void md4sum(const PRUint8 *input, PRUint32 inputLen, PRUint8 *result); +void md4sum(const uint8_t *input, uint32_t inputLen, uint8_t *result); #ifdef __cplusplus } diff -Nru pidgin-sipe-1.21.1/src/core/sdpmsg.c pidgin-sipe-1.22.1/src/core/sdpmsg.c --- pidgin-sipe-1.21.1/src/core/sdpmsg.c 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/src/core/sdpmsg.c 2017-06-11 15:41:22.000000000 +0000 @@ -3,7 +3,7 @@ * * pidgin-sipe * - * Copyright (C) 2013-2015 SIPE Project + * Copyright (C) 2013-2017 SIPE Project * Copyright (C) 2010 Jakub Adam * * This program is free software; you can redistribute it and/or modify @@ -50,7 +50,7 @@ } static gboolean -parse_attributes(struct sdpmsg *smsg, gchar *msg) { +parse_attributes(struct sdpmsg *smsg, const gchar *msg) { gchar **lines = g_strsplit(msg, "\r\n", 0); gchar **ptr = lines; @@ -235,6 +235,8 @@ g_return_val_if_fail(*candidates == NULL, FALSE); + *ice_version = SIPE_ICE_NO_ICE; + while ((attr = sipe_utils_nameval_find_instance(attrs, "candidate", i++))) { gchar **tokens = g_strsplit_set(attr, " ", 0); gboolean parsed_ok; @@ -263,9 +265,6 @@ } } - if (!(*candidates)) - *ice_version = SIPE_ICE_NO_ICE; - if (*ice_version == SIPE_ICE_RFC_5245) { const gchar *username = sipe_utils_nameval_find(attrs, "ice-ufrag"); const gchar *password = sipe_utils_nameval_find(attrs, "ice-pwd"); @@ -366,8 +365,8 @@ struct sdpcodec *codec; gchar **tokens; - tokens = g_strsplit_set(attr, " /", 3); - if (g_strv_length(tokens) != 3) { + tokens = g_strsplit_set(attr, " /", 4); + if (g_strv_length(tokens) < 3) { g_strfreev(tokens); return FALSE; } @@ -378,6 +377,10 @@ codec->clock_rate = atoi(tokens[2]); codec->type = type; + if (type == SIPE_MEDIA_AUDIO) { + codec->channels = tokens[3] ? atoi(tokens[3]) : 1; + } + g_strfreev(tokens); if (!parse_codec_parameters(attrs, codec)) { @@ -422,7 +425,7 @@ } struct sdpmsg * -sdpmsg_parse_msg(gchar *msg) +sdpmsg_parse_msg(const gchar *msg) { struct sdpmsg *smsg = g_new0(struct sdpmsg, 1); GSList *i; @@ -432,19 +435,25 @@ return NULL; } + smsg->ice_version = SIPE_ICE_NO_ICE; for (i = smsg->media; i; i = i->next) { struct sdpmedia *media = i->data; SipeMediaType type; + SipeIceVersion detected_ice_version; - if (!parse_candidates(media->attributes, &smsg->ice_version, + if (!parse_candidates(media->attributes, &detected_ice_version, &media->candidates)) { sdpmsg_free(smsg); return NULL; } - if (!media->candidates && media->port != 0) { - // No a=candidate in SDP message, this seems to be MSOC 2005 - media->candidates = create_legacy_candidates(smsg->ip, media->port); + if (media->port != 0) { + smsg->ice_version = detected_ice_version; + + if (!media->candidates) { + // No a=candidate in SDP message, this seems to be MSOC 2005 + media->candidates = create_legacy_candidates(smsg->ip, media->port); + } } if (sipe_strequal(media->name, "audio")) @@ -453,6 +462,8 @@ type = SIPE_MEDIA_VIDEO; else if (sipe_strequal(media->name, "data")) type = SIPE_MEDIA_APPLICATION; + else if (sipe_strequal(media->name, "applicationsharing")) + type = SIPE_MEDIA_APPLICATION; else { // Unknown media type sdpmsg_free(smsg); diff -Nru pidgin-sipe-1.21.1/src/core/sdpmsg.h pidgin-sipe-1.22.1/src/core/sdpmsg.h --- pidgin-sipe-1.21.1/src/core/sdpmsg.h 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/src/core/sdpmsg.h 2017-06-11 15:41:22.000000000 +0000 @@ -3,7 +3,7 @@ * * pidgin-sipe * - * Copyright (C) 2014-2015 SIPE Project + * Copyright (C) 2014-2017 SIPE Project * Copyright (C) 2010 Jakub Adam * * This program is free software; you can redistribute it and/or modify @@ -60,6 +60,7 @@ gint id; gchar *name; gint clock_rate; + gint channels; SipeMediaType type; GSList *parameters; }; @@ -71,7 +72,7 @@ * * @return New @c sdpmsg or NULL if message can not be parsed. */ -struct sdpmsg *sdpmsg_parse_msg(gchar *msg); +struct sdpmsg *sdpmsg_parse_msg(const gchar *msg); /** * Creates a SDP message from the @c sdpmsg structure. diff -Nru pidgin-sipe-1.21.1/src/core/sipe-appshare.c pidgin-sipe-1.22.1/src/core/sipe-appshare.c --- pidgin-sipe-1.21.1/src/core/sipe-appshare.c 1970-01-01 00:00:00.000000000 +0000 +++ pidgin-sipe-1.22.1/src/core/sipe-appshare.c 2017-06-11 15:41:22.000000000 +0000 @@ -0,0 +1,649 @@ +/** + * @file sipe-appshare.c + * + * pidgin-sipe + * + * Copyright (C) 2014-2017 SIPE Project + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include +#include + +#include + +#include "sipmsg.h" +#include "sipe-appshare.h" +#include "sipe-appshare-client.h" +#include "sipe-backend.h" +#include "sipe-buddy.h" +#include "sipe-chat.h" +#include "sipe-common.h" +#include "sipe-conf.h" +#include "sipe-core.h" +#include "sipe-core-private.h" +#include "sipe-media.h" +#include "sipe-nls.h" +#include "sipe-schedule.h" +#include "sipe-user.h" +#include "sipe-utils.h" +#include "sdpmsg.h" + +struct sipe_appshare { + struct sipe_media_stream *stream; + GSocket *socket; + GIOChannel *channel; + guint rdp_channel_readable_watch_id; + guint rdp_channel_writable_watch_id; + struct sipe_user_ask_ctx *ask_ctx; + + gchar rdp_channel_buffer[0x800]; + gchar *rdp_channel_buffer_pos; + gsize rdp_channel_buffer_len; + + struct sipe_rdp_client client; +}; + +static void +sipe_appshare_free(struct sipe_appshare *appshare) +{ + if (appshare->rdp_channel_readable_watch_id != 0) { + g_source_destroy(g_main_context_find_source_by_id(NULL, + appshare->rdp_channel_readable_watch_id)); + } + + if (appshare->rdp_channel_writable_watch_id != 0) { + g_source_destroy(g_main_context_find_source_by_id(NULL, + appshare->rdp_channel_writable_watch_id)); + } + + if (appshare->channel) { + GError *error = NULL; + + g_io_channel_shutdown(appshare->channel, TRUE, &error); + if (error) { + SIPE_DEBUG_ERROR("Error shutting down RDP channel: %s", + error->message); + g_error_free(error); + } + g_io_channel_unref(appshare->channel); + } + + if (appshare->socket) { + g_object_unref(appshare->socket); + } + + if (appshare->ask_ctx) { + sipe_user_close_ask(appshare->ask_ctx); + } + + g_free(appshare->client.cmdline); + if (appshare->client.free_cb) { + appshare->client.free_cb(&appshare->client); + } + + g_free(appshare); +} + +static gboolean +rdp_channel_readable_cb(GIOChannel *channel, + GIOCondition condition, + gpointer data) +{ + struct sipe_appshare *appshare = data; + GError *error = NULL; + gchar *buffer; + gsize bytes_read; + + if (condition & G_IO_HUP) { + struct sipe_media_call *call = appshare->stream->call; + + sipe_backend_media_hangup(call->backend_private, TRUE); + return FALSE; + } + + buffer = g_malloc(2048); + while (sipe_media_stream_is_writable(appshare->stream)) { + GIOStatus status; + + status = g_io_channel_read_chars(channel, + buffer, 2048, + &bytes_read, &error); + if (error) { + struct sipe_media_call *call = appshare->stream->call; + + SIPE_DEBUG_ERROR("Error reading from RDP channel: %s", + error->message); + g_error_free(error); + sipe_backend_media_hangup(call->backend_private, TRUE); + g_free(buffer); + return FALSE; + } + + if (status == G_IO_STATUS_EOF) { + struct sipe_media_call *call = appshare->stream->call; + + sipe_backend_media_hangup(call->backend_private, TRUE); + g_free(buffer); + return FALSE; + } + + if (bytes_read == 0) { + break; + } + + sipe_media_stream_write(appshare->stream, (guint8 *)buffer, + bytes_read); + SIPE_DEBUG_INFO("Written: %" G_GSIZE_FORMAT "\n", bytes_read); + } + g_free(buffer); + + return TRUE; +} + +static gboolean +socket_connect_cb(SIPE_UNUSED_PARAMETER GIOChannel *channel, + SIPE_UNUSED_PARAMETER GIOCondition condition, + gpointer data) +{ + struct sipe_appshare *appshare = data; + GError *error = NULL; + GSocket *data_socket; + int fd; + + data_socket = g_socket_accept(appshare->socket, NULL, &error); + if (error) { + struct sipe_media_call *call = appshare->stream->call; + + SIPE_DEBUG_ERROR("Error accepting RDP client connection: %s", + error->message); + g_error_free(error); + sipe_backend_media_hangup(call->backend_private, TRUE); + return FALSE; + } + + g_io_channel_shutdown(appshare->channel, TRUE, &error); + if (error) { + struct sipe_media_call *call = appshare->stream->call; + + SIPE_DEBUG_ERROR("Error shutting down RDP channel: %s", + error->message); + g_error_free(error); + g_object_unref(data_socket); + sipe_backend_media_hangup(call->backend_private, TRUE); + return FALSE; + } + g_io_channel_unref(appshare->channel); + + g_object_unref(appshare->socket); + appshare->socket = data_socket; + + fd = g_socket_get_fd(appshare->socket); + if (fd < 0) { + struct sipe_media_call *call = appshare->stream->call; + + SIPE_DEBUG_ERROR_NOFORMAT("Invalid file descriptor for RDP client connection socket"); + sipe_backend_media_hangup(call->backend_private, TRUE); + return FALSE; + } + appshare->channel = g_io_channel_unix_new(fd); + + // No encoding for binary data + g_io_channel_set_encoding(appshare->channel, NULL, &error); + if (error) { + struct sipe_media_call *call = appshare->stream->call; + + SIPE_DEBUG_ERROR("Error setting RDP channel encoding: %s", + error->message); + g_error_free(error); + sipe_backend_media_hangup(call->backend_private, TRUE); + return FALSE; + } + + appshare->rdp_channel_readable_watch_id = + g_io_add_watch(appshare->channel, G_IO_IN | G_IO_HUP, + rdp_channel_readable_cb, appshare); + + return FALSE; +} + +static void +launch_rdp_client(struct sipe_appshare *appshare) +{ + struct sipe_rdp_client *client = &appshare->client; + struct sipe_media_call *call = appshare->stream->call; + GSocketAddress *address; + GError *error = NULL; + int fd; + + address = client->get_listen_address_cb(client); + if (!address) { + sipe_backend_media_hangup(call->backend_private, TRUE); + return; + } + + appshare->socket = g_socket_new(g_socket_address_get_family(address), + G_SOCKET_TYPE_STREAM, + G_SOCKET_PROTOCOL_DEFAULT, + &error); + if (error) { + SIPE_DEBUG_ERROR("Can't create RDP client listen socket: %s", + error->message); + g_error_free(error); + g_object_unref(address); + sipe_backend_media_hangup(call->backend_private, TRUE); + return; + } + + g_socket_set_blocking(appshare->socket, FALSE); + + g_socket_bind(appshare->socket, address, TRUE, &error); + g_object_unref(address); + if (error) { + SIPE_DEBUG_ERROR("Can't bind to RDP client socket: %s", + error->message); + g_error_free(error); + sipe_backend_media_hangup(call->backend_private, TRUE); + return; + } + + g_socket_listen(appshare->socket, &error); + if (error) { + SIPE_DEBUG_ERROR("Can't listen on RDP client socket: %s", + error->message); + g_error_free(error); + sipe_backend_media_hangup(call->backend_private, TRUE); + return; + } + + fd = g_socket_get_fd(appshare->socket); + if (fd < 0) { + SIPE_DEBUG_ERROR_NOFORMAT("Invalid file descriptor for RDP client listen socket"); + sipe_backend_media_hangup(call->backend_private, TRUE); + return; + } + appshare->channel = g_io_channel_unix_new(fd); + + appshare->rdp_channel_readable_watch_id = + g_io_add_watch(appshare->channel, G_IO_IN, + socket_connect_cb, appshare); + + address = g_socket_get_local_address(appshare->socket, &error); + if (error) { + SIPE_DEBUG_ERROR("Couldn't get appshare socket address: %s", + error->message); + g_error_free(error); + sipe_backend_media_hangup(call->backend_private, TRUE); + return; + } + + if (!client->launch_cb(client, address, appshare->stream)) { + sipe_backend_media_hangup(call->backend_private, TRUE); + } + + g_object_unref(address); +} + +static gssize +rdp_client_channel_write(struct sipe_appshare *appshare) +{ + gsize bytes_written; + GError *error = NULL; + + g_io_channel_write_chars(appshare->channel, + appshare->rdp_channel_buffer_pos, + appshare->rdp_channel_buffer_len, + &bytes_written, &error); + if (error) { + SIPE_DEBUG_ERROR("Couldn't write data to RDP client: %s", + error->message); + g_error_free(error); + return -1; + } + + g_io_channel_flush(appshare->channel, &error); + if (error) { + if (g_error_matches(error, G_IO_CHANNEL_ERROR, + G_IO_CHANNEL_ERROR_PIPE)) { + /* Ignore broken pipe here and wait for the call to be + * hung up upon G_IO_HUP in client_channel_cb(). */ + g_error_free(error); + return 0; + } + + SIPE_DEBUG_ERROR("Couldn't flush RDP channel: %s", + error->message); + g_error_free(error); + return -1; + } + + appshare->rdp_channel_buffer_pos += bytes_written; + appshare->rdp_channel_buffer_len -= bytes_written; + + return bytes_written; +} + +static void +delayed_hangup_cb(SIPE_UNUSED_PARAMETER struct sipe_core_private *sipe_private, + gpointer data) +{ + struct sipe_media_call *call = data; + + sipe_backend_media_hangup(call->backend_private, TRUE); +} + +static gboolean +rdp_channel_writable_cb(SIPE_UNUSED_PARAMETER GIOChannel *channel, + SIPE_UNUSED_PARAMETER GIOCondition condition, + gpointer data) +{ + struct sipe_appshare *appshare = data; + struct sipe_media_call *call = appshare->stream->call; + + if (rdp_client_channel_write(appshare) < 0) { + sipe_backend_media_hangup(call->backend_private, TRUE); + return FALSE; + } + + if (appshare->rdp_channel_buffer_len == 0) { + // Writing done, disconnect writable watch. + appshare->rdp_channel_writable_watch_id = 0; + return FALSE; + } + + return TRUE; +} + +static void +read_cb(struct sipe_media_stream *stream) +{ + struct sipe_appshare *appshare = sipe_media_stream_get_data(stream); + gint bytes_read = 0; + gssize bytes_written = 0; + + if (appshare->rdp_channel_writable_watch_id != 0) { + // Data still in the buffer. Let the client read it first. + return; + } + + while (bytes_read == (gint)bytes_written) { + bytes_read = sipe_backend_media_stream_read(stream, + (guint8 *)appshare->rdp_channel_buffer, + sizeof (appshare->rdp_channel_buffer)); + if (bytes_read == 0) { + return; + } + + appshare->rdp_channel_buffer_pos = appshare->rdp_channel_buffer; + appshare->rdp_channel_buffer_len = bytes_read; + + bytes_written = rdp_client_channel_write(appshare); + + if (bytes_written < 0) { + /* Don't deallocate stream while in its read callback. + * Schedule call hangup to be executed after we're back + * in the message loop. */ + sipe_schedule_seconds(sipe_media_get_sipe_core_private(stream->call), + "appshare delayed hangup", + stream->call->backend_private, + 0, + delayed_hangup_cb, + NULL); + return; + } + } + + if (bytes_read != (gint)bytes_written) { + /* Schedule writing of the buffer's remainder to when + * RDP channel becomes writable again. */ + appshare->rdp_channel_writable_watch_id = + g_io_add_watch(appshare->channel, G_IO_OUT, + rdp_channel_writable_cb, + appshare); + } +} + +static void +writable_cb(struct sipe_media_stream *stream) +{ + struct sipe_appshare *appshare = sipe_media_stream_get_data(stream); + + if (!appshare->socket) { + launch_rdp_client(appshare); + } +} + +static void +accept_cb(SIPE_UNUSED_PARAMETER struct sipe_core_private *sipe_private, + gpointer data) +{ + struct sipe_appshare *appshare = data; + appshare->ask_ctx = NULL; + + sipe_backend_media_accept(appshare->stream->call->backend_private, TRUE); +} + +static void +decline_cb(SIPE_UNUSED_PARAMETER struct sipe_core_private *sipe_private, + gpointer data) +{ + struct sipe_appshare *appshare = data; + appshare->ask_ctx = NULL; + + sipe_backend_media_hangup(appshare->stream->call->backend_private, TRUE); +} + +static struct sipe_user_ask_ctx * +ask_accept_applicationsharing(struct sipe_core_private *sipe_private, + const gchar *from, + SipeUserAskCb accept_cb, + SipeUserAskCb decline_cb, + gpointer user_data) +{ + struct sipe_user_ask_ctx *ctx; + gchar *alias = sipe_buddy_get_alias(sipe_private, from); + gchar *ask_msg = g_strdup_printf(_("%s wants to start presenting"), + alias ? alias : from); + + ctx = sipe_user_ask(sipe_private, ask_msg, + _("Accept"), accept_cb, + _("Decline"), decline_cb, + user_data); + + g_free(ask_msg); + g_free(alias); + + return ctx; +} + +static struct sipe_appshare * +initialize_appshare(struct sipe_media_stream *stream) +{ + struct sipe_appshare *appshare; + struct sipe_media_call *call; + struct sipe_core_private *sipe_private; + const gchar *cmdline; + + call = stream->call; + sipe_private = sipe_media_get_sipe_core_private(call); + + appshare = g_new0(struct sipe_appshare, 1); + appshare->stream = stream; + + sipe_media_stream_set_data(stream, appshare, + (GDestroyNotify)sipe_appshare_free); + + cmdline = sipe_backend_setting(SIPE_CORE_PUBLIC, + SIPE_SETTING_RDP_CLIENT); + if (is_empty(cmdline)) + cmdline = "remmina"; + appshare->client.cmdline = g_strdup(cmdline); + + if (strstr(cmdline, "xfreerdp")) { + sipe_appshare_xfreerdp_init(&appshare->client); + } else if (strstr(cmdline, "remmina")) { + sipe_appshare_remmina_init(&appshare->client); + } else { + sipe_backend_notify_error(SIPE_CORE_PUBLIC, + _("Application sharing error"), + _("Unknown remote desktop client configured.")); + sipe_backend_media_hangup(call->backend_private, TRUE); + return NULL; + } + + sipe_media_stream_add_extra_attribute(stream, + "x-applicationsharing-session-id", "1"); + sipe_media_stream_add_extra_attribute(stream, + "x-applicationsharing-role", "viewer"); + sipe_media_stream_add_extra_attribute(stream, + "x-applicationsharing-media-type", "rdp"); + + stream->read_cb = read_cb; + stream->writable_cb = writable_cb; + + return appshare; +} + +void +process_incoming_invite_appshare(struct sipe_core_private *sipe_private, + struct sipmsg *msg) +{ + struct sipe_media_call *call; + struct sipe_media_stream *stream; + struct sipe_appshare *appshare; + struct sdpmsg *sdpmsg; + GSList *i; + + sdpmsg = sdpmsg_parse_msg(msg->body); + + /* Skype for Business compatibility - ignore desktop video. */ + i = sdpmsg->media; + while (i) { + struct sdpmedia *media = i->data; + const gchar *label; + + i = i->next; + + label = sipe_utils_nameval_find(media->attributes, "label"); + + if (sipe_strequal(media->name, "video") && + sipe_strequal(label, "applicationsharing-video")) { + sdpmsg->media = g_slist_remove(sdpmsg->media, media); + sdpmedia_free(media); + } + } + + call = process_incoming_invite_call_parsed_sdp(sipe_private, + msg, + sdpmsg); + if (!call) { + return; + } + + stream = sipe_core_media_get_stream_by_id(call, "applicationsharing"); + if (!stream) { + sipe_backend_media_hangup(call->backend_private, TRUE); + return; + } + + appshare = initialize_appshare(stream); + + if (appshare) { + gchar *from; + + from = parse_from(sipmsg_find_header(msg, "From")); + appshare->ask_ctx = ask_accept_applicationsharing(sipe_private, from, + accept_cb, + decline_cb, + appshare); + g_free(from); + } +} + +static void +connect_conference(struct sipe_core_private *sipe_private, + struct sipe_chat_session *chat_session) +{ + struct sipe_media_call *call; + struct sipe_media_stream *stream; + gchar * uri; + + chat_session->appshare_ask_ctx = NULL; + + uri = sipe_conf_build_uri(chat_session->id, "applicationsharing"); + + call = sipe_media_call_new(sipe_private, uri, NULL, + SIPE_ICE_RFC_5245, + SIPE_MEDIA_CALL_NO_UI); + + g_free(uri); + + stream = sipe_media_stream_add(call, "applicationsharing", + SIPE_MEDIA_APPLICATION, + SIPE_ICE_RFC_5245, TRUE, 0); + if (!stream) { + sipe_backend_notify_error(SIPE_CORE_PUBLIC, + _("Application sharing error"), + _("Couldn't connect application sharing")); + sipe_backend_media_hangup(call->backend_private, FALSE); + } + + sipe_media_stream_add_extra_attribute(stream, "connection", "new"); + sipe_media_stream_add_extra_attribute(stream, "setup", "active"); + + initialize_appshare(stream); +} + +void +sipe_core_appshare_connect_conference(struct sipe_core_public *sipe_public, + struct sipe_chat_session *chat_session, + gboolean user_must_accept) +{ + if (user_must_accept) { + const gchar *from; + + if (chat_session->appshare_ask_ctx) { + // Accept dialog already opened. + return; + } + + if (chat_session->title) { + from = chat_session->title; + } else if (chat_session->organizer) { + from = chat_session->organizer; + } else { + from = chat_session->id; + } + + chat_session->appshare_ask_ctx = + ask_accept_applicationsharing(SIPE_CORE_PRIVATE, + from, + (SipeUserAskCb)connect_conference, + NULL, + chat_session); + } else { + connect_conference(SIPE_CORE_PRIVATE, chat_session); + } +} + +/* + Local Variables: + mode: c + c-file-style: "bsd" + indent-tabs-mode: t + tab-width: 8 + End: +*/ diff -Nru pidgin-sipe-1.21.1/src/core/sipe-appshare-client.h pidgin-sipe-1.22.1/src/core/sipe-appshare-client.h --- pidgin-sipe-1.21.1/src/core/sipe-appshare-client.h 1970-01-01 00:00:00.000000000 +0000 +++ pidgin-sipe-1.22.1/src/core/sipe-appshare-client.h 2017-06-11 15:41:22.000000000 +0000 @@ -0,0 +1,41 @@ +/** + * @file sipe-appshare-client.h + * + * pidgin-sipe + * + * Copyright (C) 2016 SIPE Project + * + * 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 + */ + +/* Forward declarations */ +struct sipe_core_private; +struct sipe_media_stream; +struct sipmsg; + +struct sipe_rdp_client { + gchar *cmdline; + void *client_data; + + GSocketAddress *(*get_listen_address_cb)(struct sipe_rdp_client *client); + gboolean (*launch_cb)(struct sipe_rdp_client *client, + GSocketAddress *listen_address, + struct sipe_media_stream *stream); + void (*free_cb)(struct sipe_rdp_client *client); +}; + +/* Client implementations */ +void sipe_appshare_remmina_init(struct sipe_rdp_client *client); +void sipe_appshare_xfreerdp_init(struct sipe_rdp_client *client); diff -Nru pidgin-sipe-1.21.1/src/core/sipe-appshare.h pidgin-sipe-1.22.1/src/core/sipe-appshare.h --- pidgin-sipe-1.21.1/src/core/sipe-appshare.h 1970-01-01 00:00:00.000000000 +0000 +++ pidgin-sipe-1.22.1/src/core/sipe-appshare.h 2017-06-11 15:41:22.000000000 +0000 @@ -0,0 +1,28 @@ +/** + * @file sipe-appshare.h + * + * pidgin-sipe + * + * Copyright (C) 2014-2016 SIPE Project + * + * 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 + */ + +/* Forward declarations */ +struct sipe_core_private; +struct sipmsg; + +void process_incoming_invite_appshare(struct sipe_core_private *sipe_private, + struct sipmsg *msg); diff -Nru pidgin-sipe-1.21.1/src/core/sipe-appshare-remmina.c pidgin-sipe-1.22.1/src/core/sipe-appshare-remmina.c --- pidgin-sipe-1.21.1/src/core/sipe-appshare-remmina.c 1970-01-01 00:00:00.000000000 +0000 +++ pidgin-sipe-1.22.1/src/core/sipe-appshare-remmina.c 2017-06-11 15:41:22.000000000 +0000 @@ -0,0 +1,152 @@ +/** + * @file sipe-appshare-remmina.c + * + * pidgin-sipe + * + * Copyright (C) 2014-2016 SIPE Project + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include +#include + +#include + +#include + +#include "sipe-appshare-client.h" +#include "sipe-backend.h" +#include "sipe-buddy.h" +#include "sipe-common.h" +#include "sipe-media.h" + +struct remmina_data { + gchar *config_file; +}; + +static GSocketAddress * +remmina_get_listen_address(SIPE_UNUSED_PARAMETER struct sipe_rdp_client *client) +{ + GInetAddress *loopback; + GSocketAddress *address; + + loopback = g_inet_address_new_loopback(G_SOCKET_FAMILY_IPV4); + address = g_inet_socket_address_new(loopback, 0); + g_object_unref(loopback); + + return address; +} + +static gboolean +remmina_launch(struct sipe_rdp_client *client, GSocketAddress *listen_address, + struct sipe_media_stream *stream) +{ + struct remmina_data *client_data = client->client_data; + struct sipe_core_private *sipe_private; + GInetAddress *address; + gchar *address_string; + gchar *alias; + gchar *config_file; + gchar *cmdline; + guint16 port; + GError *error = NULL; + + sipe_private = sipe_media_get_sipe_core_private(stream->call); + + address = g_inet_socket_address_get_address(G_INET_SOCKET_ADDRESS(listen_address)); + address_string = g_inet_address_to_string(address); + + port = g_inet_socket_address_get_port(G_INET_SOCKET_ADDRESS(listen_address)); + + alias = sipe_buddy_get_alias(sipe_private, stream->call->with); + + config_file = g_strdup_printf("[remmina]\n" + "name=%s (Sipe desktop)\n" + "protocol=RDP\n" + "server=%s:%u\n" + "security=rdp\n" + "scale=1\n" + "aspectscale=1\n" + "viewmode=1\n" + "disableautoreconnect=1\n", + alias ? alias : stream->call->with, + address_string, + port); + + g_free(alias); + g_free(address_string); + + client_data->config_file = + g_strdup_printf("%s/sipe-appshare-%u-%p.remmina", + g_get_user_runtime_dir(), getpid(), + client); + + g_file_set_contents(client_data->config_file, config_file, + strlen(config_file), &error); + g_free(config_file); + if (error) { + SIPE_DEBUG_ERROR("Couldn't write remmina config file: %s", + error->message); + g_error_free(error); + return FALSE; + } + + cmdline = g_strdup_printf("%s -c %s", + client->cmdline, + client_data->config_file); + + g_spawn_command_line_async(cmdline, &error); + g_free(cmdline); + if (error) { + SIPE_DEBUG_ERROR("Couldn't launch remmina: %s", error->message); + g_error_free(error); + return FALSE; + } + + return TRUE; +} + +static void +remmina_free(struct sipe_rdp_client *client) +{ + struct remmina_data *client_data = client->client_data; + + if (client_data->config_file) { + g_unlink(client_data->config_file); + g_free(client_data->config_file); + } + + g_free(client_data); +} + +void +sipe_appshare_remmina_init(struct sipe_rdp_client *client) +{ + client->client_data = g_new0(struct remmina_data, 1); + + client->get_listen_address_cb = remmina_get_listen_address; + client->launch_cb = remmina_launch; + client->free_cb = remmina_free; +} + +/* + Local Variables: + mode: c + c-file-style: "bsd" + indent-tabs-mode: t + tab-width: 8 + End: +*/ diff -Nru pidgin-sipe-1.21.1/src/core/sipe-appshare-xfreerdp.c pidgin-sipe-1.22.1/src/core/sipe-appshare-xfreerdp.c --- pidgin-sipe-1.21.1/src/core/sipe-appshare-xfreerdp.c 1970-01-01 00:00:00.000000000 +0000 +++ pidgin-sipe-1.22.1/src/core/sipe-appshare-xfreerdp.c 2017-06-11 15:41:22.000000000 +0000 @@ -0,0 +1,113 @@ +/** + * @file sipe-appshare-xfreerdp.c + * + * pidgin-sipe + * + * Copyright (C) 2014-2016 SIPE Project + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include +#include + +#include + +#include +#include + +#include "sipe-appshare-client.h" +#include "sipe-backend.h" +#include "sipe-common.h" + +struct xfreerdp_data { + gchar *socket_path; +}; + +static GSocketAddress * +xfreerdp_get_listen_address(struct sipe_rdp_client *client) +{ + struct xfreerdp_data *data = client->client_data; + struct sockaddr_un address; + + data->socket_path = g_strdup_printf("%s/sipe-appshare-%u-%p", + g_get_user_runtime_dir(), getpid(), + client); + + g_unlink(data->socket_path); + + address.sun_family = AF_LOCAL; + strncpy(address.sun_path, data->socket_path, sizeof (address.sun_path) - 1); + address.sun_path[sizeof (address.sun_path) - 1] = '\0'; + + return g_socket_address_new_from_native(&address, sizeof (address)); +} + +static gboolean +xfreerdp_launch(struct sipe_rdp_client *client, + SIPE_UNUSED_PARAMETER GSocketAddress *listen_address, + SIPE_UNUSED_PARAMETER struct sipe_media_stream *stream) +{ + struct xfreerdp_data *client_data = client->client_data; + gchar *cmdline; + GError *error = NULL; + + /* This assumes FreeRDP 2.x.x */ + cmdline = g_strdup_printf("%s /v:%s /sec:rdp", + client->cmdline, + client_data->socket_path); + + g_spawn_command_line_async(cmdline, &error); + g_free(cmdline); + if (error) { + SIPE_DEBUG_ERROR("Can't launch xfreerdp: %s", error->message); + g_error_free(error); + return FALSE; + } + + return TRUE; +} + +static void +xfreerdp_free(struct sipe_rdp_client *client) +{ + struct xfreerdp_data *client_data = client->client_data; + + if (client_data->socket_path) { + g_unlink(client_data->socket_path); + g_free(client_data->socket_path); + } + + g_free(client_data); +} + +void +sipe_appshare_xfreerdp_init(struct sipe_rdp_client *client) +{ + client->client_data = g_new0(struct xfreerdp_data, 1); + + client->get_listen_address_cb = xfreerdp_get_listen_address; + client->launch_cb = xfreerdp_launch; + client->free_cb = xfreerdp_free; +} + +/* + Local Variables: + mode: c + c-file-style: "bsd" + indent-tabs-mode: t + tab-width: 8 + End: +*/ diff -Nru pidgin-sipe-1.21.1/src/core/sipe-buddy.c pidgin-sipe-1.22.1/src/core/sipe-buddy.c --- pidgin-sipe-1.21.1/src/core/sipe-buddy.c 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/src/core/sipe-buddy.c 2017-06-11 15:41:22.000000000 +0000 @@ -3,7 +3,7 @@ * * pidgin-sipe * - * Copyright (C) 2010-2016 SIPE Project + * Copyright (C) 2010-2017 SIPE Project * * 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 @@ -344,6 +344,7 @@ struct sipe_buddy *sipe_buddy_find_by_uri(struct sipe_core_private *sipe_private, const gchar *uri) { + if (!uri) return(NULL); return(g_hash_table_lookup(sipe_private->buddies->uri, uri)); } @@ -1051,12 +1052,12 @@ static void ms_dlx_webticket_request(struct sipe_core_private *sipe_private, struct ms_dlx_data *mdd) { - if (!sipe_webticket_request(sipe_private, - mdd->session, - sipe_private->dlx_uri, - "AddressBookWebTicketBearer", - ms_dlx_webticket, - mdd)) { + if (!sipe_webticket_request_with_port(sipe_private, + mdd->session, + sipe_private->dlx_uri, + "AddressBookWebTicketBearer", + ms_dlx_webticket, + mdd)) { SIPE_DEBUG_ERROR("ms_dlx_webticket_request: couldn't request webticket for %s", sipe_private->dlx_uri); mdd->failed_callback(sipe_private, mdd); @@ -1971,11 +1972,42 @@ gchar *ews_url = sipe_xml_data(sipe_xml_child(xml, "ewsUrl")); gchar *email = sipe_xml_data(sipe_xml_child(xml, "primarySMTP")); - if (!is_empty(ews_url) && !is_empty(email)) + if (!is_empty(ews_url) && !is_empty(email)) { + /* + * Workaround for missing Office 365 buddy icons + * + * (All?) Office 365 contact cards have the following + * XML embedded as the photo URI XML node text: + * + * https://outlook.office365.com/EWS/Exchange.asmx/WSSecurity + * user@company.com + * + * The simple HTTP request by get_user_photo_request() + * is rejected with 401. But the response contains + * + * WWW-Authenticate: Basic Realm="" + * + * to which the HTTP transport answers with a retry + * using Basic authentication. That in turn is rejected + * with 500 and thus the buddy icon retrieval fails. + * + * As a quick workaround strip the trailing "/WSSecurity" + * from the URL. The HTTP request for the buddy icon + * retrieval will work with this stripped URL. + * + * @TODO: this is probably not the correct approach. + * get_user_photo_request() should be updated + * to support also a webticket request. + */ + gchar *tmp = g_strrstr(ews_url, "/WSSecurity"); + if (tmp) + *tmp = '\0'; + data->request = get_user_photo_request(sipe_private, data, ews_url, email); + } g_free(email); g_free(ews_url); diff -Nru pidgin-sipe-1.21.1/src/core/sipe-buddy.h pidgin-sipe-1.22.1/src/core/sipe-buddy.h --- pidgin-sipe-1.21.1/src/core/sipe-buddy.h 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/src/core/sipe-buddy.h 2017-06-11 15:41:22.000000000 +0000 @@ -3,7 +3,7 @@ * * pidgin-sipe * - * Copyright (C) 2010-2014 SIPE Project + * Copyright (C) 2010-2016 SIPE Project * * 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 @@ -162,9 +162,9 @@ * Find buddy by URI * * @param sipe_private SIPE core data - * @param uri SIP URI of a buddy + * @param uri SIP URI of a buddy (may be @c NULL) * - * @return @c sipe_buddy structure + * @return @c sipe_buddy structure or @c NULL */ struct sipe_buddy *sipe_buddy_find_by_uri(struct sipe_core_private *sipe_private, const gchar *uri); diff -Nru pidgin-sipe-1.21.1/src/core/sipe-cal.c pidgin-sipe-1.22.1/src/core/sipe-cal.c --- pidgin-sipe-1.21.1/src/core/sipe-cal.c 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/src/core/sipe-cal.c 2017-06-11 15:41:22.000000000 +0000 @@ -3,7 +3,7 @@ * * pidgin-sipe * - * Copyright (C) 2010-2015 SIPE Project + * Copyright (C) 2010-2016 SIPE Project * Copyright (C) 2009 pier11 * * @@ -615,12 +615,11 @@ if (current_state != temp_status) { return calStart + (i + 1)*granularity*60; } - - if (i == 0) return calStart; } - return 0; + return calStart; } + static char* sipe_cal_get_free_busy(struct sipe_buddy *buddy); @@ -1065,7 +1064,7 @@ { time_t now, offset; - SIPE_DEBUG_INFO_NOFORMAT("sipe_core_update_calendar: started."); + SIPE_LOG_INFO_NOFORMAT("sipe_core_update_calendar: started."); /* Do in parallel. * If failed, the branch will be disabled for subsequent calls. diff -Nru pidgin-sipe-1.21.1/src/core/sipe-cert-crypto-openssl.c pidgin-sipe-1.22.1/src/core/sipe-cert-crypto-openssl.c --- pidgin-sipe-1.21.1/src/core/sipe-cert-crypto-openssl.c 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/src/core/sipe-cert-crypto-openssl.c 2017-06-11 15:41:22.000000000 +0000 @@ -3,7 +3,7 @@ * * pidgin-sipe * - * Copyright (C) 2013 SIPE Project + * Copyright (C) 2013-2017 SIPE Project * * 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 @@ -24,6 +24,7 @@ * Certificate routines implementation based on OpenSSL. */ +#include #include #include #include @@ -68,17 +69,34 @@ { struct sipe_cert_crypto *scc = g_new0(struct sipe_cert_crypto, 1); - /* RSA parameters - should those be configurable? */ - SIPE_DEBUG_INFO_NOFORMAT("sipe_cert_crypto_init: generate key pair, this might take a while..."); - scc->key = RSA_generate_key(2048, 65537, NULL, NULL); - + /* allocate memory for RSA key */ + scc->key = RSA_new(); if (scc->key) { - SIPE_DEBUG_INFO_NOFORMAT("sipe_cert_crypto_init: key pair generated"); - return(scc); - } + BIGNUM *e = BN_new(); + + if (e) { + /* RSA parameters - should those be configurable? */ + if (BN_set_word(e, RSA_F4)) { + SIPE_DEBUG_INFO_NOFORMAT("sipe_cert_crypto_init: generate key pair, this might take a while..."); + if (RSA_generate_key_ex(scc->key, 2048, e, NULL)) { + SIPE_DEBUG_INFO_NOFORMAT("sipe_cert_crypto_init: key pair generated"); + BN_free(e); + return(scc); + + } else + SIPE_DEBUG_ERROR_NOFORMAT("sipe_cert_crypto_init: key generation failed"); + + } else + SIPE_DEBUG_ERROR_NOFORMAT("sipe_cert_crypto_init: big number initialization failed"); + + BN_free(e); + } else + SIPE_DEBUG_ERROR_NOFORMAT("sipe_cert_crypto_init: memory allocation for big number failed"); + + } else + SIPE_DEBUG_ERROR_NOFORMAT("sipe_cert_crypto_init: memory allocation for RSA key failed"); - SIPE_DEBUG_ERROR_NOFORMAT("sipe_cert_crypto_init: key generation failed"); - g_free(scc); + sipe_cert_crypto_free(scc); return(NULL); } diff -Nru pidgin-sipe-1.21.1/src/core/sipe-certificate.c pidgin-sipe-1.22.1/src/core/sipe-certificate.c --- pidgin-sipe-1.21.1/src/core/sipe-certificate.c 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/src/core/sipe-certificate.c 2017-06-11 15:41:22.000000000 +0000 @@ -3,7 +3,7 @@ * * pidgin-sipe * - * Copyright (C) 2011-12 SIPE Project + * Copyright (C) 2011-2016 SIPE Project * * * This program is free software; you can redistribute it and/or modify @@ -299,12 +299,12 @@ ccd->session = sipe_svc_session_start(); - ret = sipe_webticket_request(sipe_private, - ccd->session, - uri, - "CertProvisioningServiceWebTicketProof_SHA1", - certprov_webticket, - ccd); + ret = sipe_webticket_request_with_port(sipe_private, + ccd->session, + uri, + "CertProvisioningServiceWebTicketProof_SHA1", + certprov_webticket, + ccd); if (ret) { ccd->target = g_strdup(target); diff -Nru pidgin-sipe-1.21.1/src/core/sipe-chat.c pidgin-sipe-1.22.1/src/core/sipe-chat.c --- pidgin-sipe-1.21.1/src/core/sipe-chat.c 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/src/core/sipe-chat.c 2017-06-11 15:41:22.000000000 +0000 @@ -3,7 +3,7 @@ * * pidgin-sipe * - * Copyright (C) 2009-2015 SIPE Project + * Copyright (C) 2009-2017 SIPE Project * * 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 @@ -44,6 +44,7 @@ #include "sipe-nls.h" #include "sipe-schedule.h" #include "sipe-session.h" +#include "sipe-user.h" #include "sipe-utils.h" #include "sipe-xml.h" @@ -61,7 +62,7 @@ static GList *chat_sessions = NULL; -struct sipe_chat_session *sipe_chat_create_session(enum sipe_chat_type type, +struct sipe_chat_session *sipe_chat_create_session(guint type, const gchar *id, const gchar *title) { @@ -83,6 +84,11 @@ g_free(session->join_url); g_free(session->dial_in_conf_id); g_free(session->organizer); + + if (session->appshare_ask_ctx) { + sipe_user_close_ask(session->appshare_ask_ctx); + } + g_free(session); } @@ -102,6 +108,11 @@ return(chat_session->id); } +guint sipe_core_chat_type(struct sipe_chat_session *chat_session) +{ + return(chat_session ? chat_session->type : SIPE_CHAT_TYPE_UNKNOWN); +} + void sipe_core_chat_invite(struct sipe_core_public *sipe_public, struct sipe_chat_session *chat_session, const char *name) @@ -250,7 +261,6 @@ { gchar *hdr; gchar *contact; - gchar *epid = get_epid(sipe_private); struct sip_dialog *dialog = sipe_dialog_find(session, session->chat_session->id); const char *ourtag = dialog && dialog->ourtag ? dialog->ourtag : NULL; @@ -266,8 +276,7 @@ sipe_private->username, ourtag ? ";tag=" : "", ourtag ? ourtag : "", - epid); - g_free(epid); + sip_transport_epid(sipe_private)); sip_transport_request(sipe_private, "REFER", diff -Nru pidgin-sipe-1.21.1/src/core/sipe-chat.h pidgin-sipe-1.22.1/src/core/sipe-chat.h --- pidgin-sipe-1.21.1/src/core/sipe-chat.h 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/src/core/sipe-chat.h 2017-06-11 15:41:22.000000000 +0000 @@ -3,7 +3,7 @@ * * pidgin-sipe * - * Copyright (C) 2009-10 SIPE Project + * Copyright (C) 2009-2017 SIPE Project * * 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 @@ -47,11 +47,14 @@ /* Human readable chat identifier (can have duplicates) */ gchar *title; - enum sipe_chat_type type; + /* SIPE_CHAT_TYPE_xxx */ + guint type; gchar *join_url; gchar *dial_in_conf_id; gchar *organizer; + + struct sipe_user_ask_ctx *appshare_ask_ctx; }; /** @@ -60,8 +63,9 @@ * @param session */ struct sipe_chat_session * -sipe_chat_create_session(enum sipe_chat_type type, - const gchar *id, const gchar *title); +sipe_chat_create_session(guint type, + const gchar *id, + const gchar *title); /** * Remove a chat session diff -Nru pidgin-sipe-1.21.1/src/core/sipe-conf.c pidgin-sipe-1.22.1/src/core/sipe-conf.c --- pidgin-sipe-1.21.1/src/core/sipe-conf.c 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/src/core/sipe-conf.c 2017-06-11 15:41:22.000000000 +0000 @@ -3,7 +3,7 @@ * * pidgin-sipe * - * Copyright (C) 2010-2016 SIPE Project + * Copyright (C) 2010-2017 SIPE Project * Copyright (C) 2009 pier11 * * @@ -886,6 +886,9 @@ #ifdef HAVE_VV "audio-video", #endif +#ifdef HAVE_APPSHARE + "applicationsharing", +#endif NULL }; @@ -948,6 +951,11 @@ gchar *focus_uri; struct sipmsg *msg; struct sipe_user_ask_ctx *ask_ctx; + + SipeUserAskCb accept_cb; + SipeUserAskCb decline_cb; + + gpointer user_data; }; static void @@ -963,24 +971,15 @@ static void conf_accept_cb(struct sipe_core_private *sipe_private, struct conf_accept_ctx *ctx) { - sipe_private->sessions_to_accept = - g_slist_remove(sipe_private->sessions_to_accept, ctx); - accept_incoming_invite_conf(sipe_private, ctx->focus_uri, TRUE, ctx->msg); - conf_accept_ctx_free(ctx); } static void conf_decline_cb(struct sipe_core_private *sipe_private, struct conf_accept_ctx *ctx) { - sipe_private->sessions_to_accept = - g_slist_remove(sipe_private->sessions_to_accept, ctx); - sip_transport_response(sipe_private, ctx->msg, 603, "Decline", NULL); - - conf_accept_ctx_free(ctx); } void @@ -1023,32 +1022,53 @@ } static void -ask_accept_voice_conference(struct sipe_core_private *sipe_private, - const gchar *focus_uri, - struct sipmsg *msg, - SipeUserAskCb accept_cb, - SipeUserAskCb decline_cb) +accept_invitation_cb(struct sipe_core_private *sipe_private, gpointer data) +{ + struct conf_accept_ctx *ctx = data; + + sipe_private->sessions_to_accept = + g_slist_remove(sipe_private->sessions_to_accept, ctx); + + if (ctx->accept_cb) { + ctx->accept_cb(sipe_private, ctx); + } + + conf_accept_ctx_free(ctx); +} + +static void +decline_invitation_cb(struct sipe_core_private *sipe_private, gpointer data) +{ + struct conf_accept_ctx *ctx = data; + + sipe_private->sessions_to_accept = + g_slist_remove(sipe_private->sessions_to_accept, ctx); + + if (ctx->decline_cb) { + ctx->decline_cb(sipe_private, ctx); + } + + conf_accept_ctx_free(ctx); +} + +static void +ask_accept_invitation(struct sipe_core_private *sipe_private, + const gchar *focus_uri, + const gchar *question, + struct sipmsg *msg, + SipeUserAskCb accept_cb, + SipeUserAskCb decline_cb, + gpointer user_data) { gchar **parts; gchar *alias; - gchar *ask_msg; - const gchar *novv_note; + gchar *question_str; struct conf_accept_ctx *ctx; -#ifdef HAVE_VV - novv_note = ""; -#else - novv_note = _("\n\nAs this client was not compiled with voice call " - "support, if you accept, you will be able to contact " - "the other participants only via IM session."); -#endif - parts = g_strsplit(focus_uri, ";", 2); alias = sipe_buddy_get_alias(sipe_private, parts[0]); - ask_msg = g_strdup_printf(_("%s wants to invite you " - "to the conference call%s"), - alias ? alias : parts[0], novv_note); + question_str = g_strdup_printf("%s %s", alias ? alias : parts[0], question); g_free(alias); g_strfreev(parts); @@ -1059,12 +1079,42 @@ ctx->focus_uri = g_strdup(focus_uri); ctx->msg = msg ? sipmsg_copy(msg) : NULL; - ctx->ask_ctx = sipe_user_ask(sipe_private, ask_msg, - _("Accept"), accept_cb, - _("Decline"), decline_cb, + ctx->accept_cb = accept_cb; + ctx->decline_cb = decline_cb; + ctx->user_data = user_data; + ctx->ask_ctx = sipe_user_ask(sipe_private, question_str, + _("Accept"), accept_invitation_cb, + _("Decline"), decline_invitation_cb, ctx); - g_free(ask_msg); + g_free(question_str); +} + +static void +ask_accept_voice_conference(struct sipe_core_private *sipe_private, + const gchar *focus_uri, + struct sipmsg *msg, + SipeUserAskCb accept_cb, + SipeUserAskCb decline_cb) +{ + gchar *question; + const gchar *novv_note; + +#ifdef HAVE_VV + novv_note = ""; +#else + novv_note = _("\n\nAs this client was not compiled with voice call " + "support, if you accept, you will be able to contact " + "the other participants only via IM session."); +#endif + + question = g_strdup_printf(_("wants to invite you " + "to a conference call%s"), novv_note); + + ask_accept_invitation(sipe_private, focus_uri, question, msg, + accept_cb, decline_cb, NULL); + + g_free(question); } void @@ -1141,26 +1191,73 @@ struct sip_session *session; session = sipe_session_find_conference(sipe_private, ctx->focus_uri); - sipe_private->sessions_to_accept = - g_slist_remove(sipe_private->sessions_to_accept, ctx); - if (session) { sipe_core_media_connect_conference(SIPE_CORE_PUBLIC, session->chat_session); } - - conf_accept_ctx_free(ctx); } -static void -call_decline_cb(struct sipe_core_private *sipe_private, struct conf_accept_ctx *ctx) +#ifdef HAVE_APPSHARE +gboolean +sipe_core_conf_is_viewing_appshare(struct sipe_core_public *sipe_public, + struct sipe_chat_session *chat_session) { - sipe_private->sessions_to_accept = - g_slist_remove(sipe_private->sessions_to_accept, ctx); + if (chat_session) { + gchar *mcu_uri; + GList *calls; - conf_accept_ctx_free(ctx); + mcu_uri = sipe_conf_build_uri(chat_session->id, "applicationsharing"); + calls = g_hash_table_get_values(SIPE_CORE_PRIVATE->media_calls); + + for (; calls; calls = g_list_delete_link(calls, calls)) { + struct sipe_media_call *call = calls->data; + if (sipe_strequal(call->with, mcu_uri)) { + break; + } + } + + g_free(mcu_uri); + + if (calls != NULL) { + g_list_free(calls); + return TRUE; + } + } + + return FALSE; } +static gboolean +process_conference_appshare_endpoint(const sipe_xml *endpoint) +{ + gboolean presentation_added = FALSE; + const sipe_xml *media; + + for (media = sipe_xml_child(endpoint, "media"); + media && !presentation_added; + media = sipe_xml_twin(media)) { + gchar *type; + gchar *media_state; + gchar *status; + + type = sipe_xml_data(sipe_xml_child(media, "type")); + media_state = sipe_xml_data(sipe_xml_child(media, "media-state")); + status = sipe_xml_data(sipe_xml_child(media, "status")); + + if (sipe_strequal(type, "applicationsharing") && + sipe_strequal(media_state, "connected") && + sipe_strequal(status, "sendonly")) { + presentation_added = TRUE; + } + + g_free(type); + g_free(media_state); + g_free(status); + } + + return(presentation_added); +} +#endif // HAVE_APPSHARE #endif // HAVE_VV void @@ -1175,7 +1272,10 @@ gboolean just_joined = FALSE; #ifdef HAVE_VV gboolean audio_was_added = FALSE; +#ifdef HAVE_APPSHARE + gboolean presentation_was_added = FALSE; #endif +#endif // HAVE_VV if (msg->response != 0 && msg->response != 200) return; @@ -1305,6 +1405,13 @@ self, session); #endif + } else if (sipe_strequal("applicationsharing", session_type)) { +#ifdef HAVE_APPSHARE + if (!sipe_core_conf_is_viewing_appshare(SIPE_CORE_PUBLIC, + session->chat_session)) { + presentation_was_added = process_conference_appshare_endpoint(endpoint); + } +#endif } } if (!is_in_im_mcu) { @@ -1323,9 +1430,16 @@ session->is_call = TRUE; ask_accept_voice_conference(sipe_private, focus_uri, NULL, (SipeUserAskCb) call_accept_cb, - (SipeUserAskCb) call_decline_cb); + NULL); + } +#ifdef HAVE_APPSHARE + if (presentation_was_added) { + sipe_core_appshare_connect_conference(SIPE_CORE_PUBLIC, + session->chat_session, + TRUE); } #endif +#endif // HAVE_VV /* entity-view, locked */ for (node = sipe_xml_child(xn_conference_info, "conference-view/entity-view"); diff -Nru pidgin-sipe-1.21.1/src/core/sipe-core.c pidgin-sipe-1.22.1/src/core/sipe-core.c --- pidgin-sipe-1.21.1/src/core/sipe-core.c 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/src/core/sipe-core.c 2017-06-11 15:41:22.000000000 +0000 @@ -3,7 +3,7 @@ * * pidgin-sipe * - * Copyright (C) 2010-2016 SIPE Project + * Copyright (C) 2010-2017 SIPE Project * * 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 @@ -86,6 +86,7 @@ #include "sipe-group.h" #include "sipe-groupchat.h" #include "sipe-http.h" +#include "sipe-lync-autodiscover.h" #include "sipe-media.h" #include "sipe-mime.h" #include "sipe-nls.h" @@ -133,6 +134,9 @@ #ifdef HAVE_XDATA "Lync FT", #endif +#ifdef HAVE_APPSHARE + "Application Sharing", +#endif #endif /* Development */ @@ -192,7 +196,6 @@ " - Microsoft Office Communications Server 2007
" " - Microsoft Live Communications Server 2005
" " - Microsoft Live Communications Server 2003
" - " - Reuters Messaging
" "
" /* 2 */ "%s: " PACKAGE_URL "
" /* 3,4 */ "%s: %s
" @@ -261,8 +264,11 @@ { struct sipe_core_private *sipe_private; gchar **user_domain; + gchar *options = g_strjoinv(" / ", (gchar **) sipe_core_build_options); - SIPE_DEBUG_INFO("sipe_core_allocate: SIPE version " SIPE_CORE_VERSION " signin_name '%s'", signin_name); + SIPE_LOG_INFO("sipe_core_allocate: SIPE version " SIPE_CORE_VERSION "%s)", options); + g_free(options); + SIPE_DEBUG_INFO("sipe_core_allocate: signin_name '%s'", signin_name); /* ensure that sign-in name doesn't contain invalid characters */ if (strpbrk(signin_name, "\t\v\r\n") != NULL) { @@ -345,6 +351,7 @@ sipe_private->our_publications = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, (GDestroyNotify)g_hash_table_destroy); sipe_subscriptions_init(sipe_private); + sipe_lync_autodiscover_init(sipe_private); sipe_ews_autodiscover_init(sipe_private); sipe_status_set_activity(sipe_private, SIPE_ACTIVITY_UNSET); @@ -374,9 +381,6 @@ void sipe_core_connection_cleanup(struct sipe_core_private *sipe_private) { - g_free(sipe_private->epid); - sipe_private->epid = NULL; - sipe_http_free(sipe_private); sip_transport_disconnect(sipe_private); @@ -401,6 +405,10 @@ sipe_private->focus_factory_uri = NULL; sipe_groupchat_free(sipe_private); + + while (sipe_private->lync_autodiscover_servers) + sipe_private->lync_autodiscover_servers = + sipe_lync_autodiscover_pop(sipe_private->lync_autodiscover_servers); } void sipe_core_deallocate(struct sipe_core_public *sipe_public) @@ -429,6 +437,7 @@ sipe_svc_free(sipe_private); sipe_webticket_free(sipe_private); sipe_ucs_free(sipe_private); + sipe_lync_autodiscover_free(sipe_private); if (sipe_backend_connection_is_valid(SIPE_CORE_PUBLIC)) { sipe_subscriptions_unsubscribe(sipe_private); diff -Nru pidgin-sipe-1.21.1/src/core/sipe-core-private.h pidgin-sipe-1.22.1/src/core/sipe-core-private.h --- pidgin-sipe-1.21.1/src/core/sipe-core-private.h 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/src/core/sipe-core-private.h 2017-06-11 15:41:22.000000000 +0000 @@ -3,7 +3,7 @@ * * pidgin-sipe * - * Copyright (C) 2010-2015 SIPE Project + * Copyright (C) 2010-2017 SIPE Project * * 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 @@ -33,6 +33,7 @@ struct sipe_groups; struct sipe_http; struct sipe_http_request; +struct sipe_lync_autodiscover; struct sipe_media_call_private; struct sipe_svc; struct sipe_ucs; @@ -52,6 +53,7 @@ /* sip-transport.c private data */ struct sip_transport *transport; + GSList *lync_autodiscover_servers; /* Lync autodiscover */ const struct sip_service_data *service_data; /* autodiscovery SRV records */ const struct sip_address_data *address_data; /* autodiscovery A records */ guint transport_type; @@ -68,7 +70,6 @@ /* SIPE protocol information */ gchar *contact; gchar *register_callid; - gchar *epid; gchar *focus_factory_uri; GSList *sessions; GSList *sessions_to_accept; @@ -103,6 +104,9 @@ /* EWS autodiscover */ struct sipe_ews_autodiscover *ews_autodiscover; + /* Lync autodiscover */ + struct sipe_lync_autodiscover *lync_autodiscover; + /* * 2005 Custom XML piece * @@ -213,6 +217,8 @@ #define SIPE_CORE_PRIVATE_FLAG_SSO 0x00800000 /* server is Lync 2013+ */ #define SIPE_CORE_PRIVATE_FLAG_LYNC2013 0x00400000 +/* server is Skype for Business (RTC/6.0 +) */ +#define SIPE_CORE_PRIVATE_FLAG_SFB 0x00200000 #define SIPE_CORE_PUBLIC_FLAG_IS(flag) \ ((sipe_private->public.flags & SIPE_CORE_FLAG_ ## flag) == SIPE_CORE_FLAG_ ## flag) diff -Nru pidgin-sipe-1.21.1/src/core/sipe-crypt-openssl.c pidgin-sipe-1.22.1/src/core/sipe-crypt-openssl.c --- pidgin-sipe-1.21.1/src/core/sipe-crypt-openssl.c 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/src/core/sipe-crypt-openssl.c 2017-06-11 15:41:22.000000000 +0000 @@ -3,7 +3,7 @@ * * pidgin-sipe * - * Copyright (C) 2013-2015 SIPE Project + * Copyright (C) 2013-2017 SIPE Project * * 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 @@ -48,27 +48,26 @@ const guchar *plaintext, gsize plaintext_length, guchar *encrypted_text) { - EVP_CIPHER_CTX ctx; + EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new(); int encrypted_length = 0; /* initialize context */ - EVP_CIPHER_CTX_init(&ctx); - EVP_EncryptInit_ex(&ctx, type, NULL, key, NULL); + EVP_EncryptInit_ex(ctx, type, NULL, key, NULL); /* set encryption parameters */ if (key_length) - EVP_CIPHER_CTX_set_key_length(&ctx, key_length); - EVP_EncryptInit_ex(&ctx, NULL, NULL, key, NULL); + EVP_CIPHER_CTX_set_key_length(ctx, key_length); + EVP_EncryptInit_ex(ctx, NULL, NULL, key, NULL); /* encrypt */ - EVP_EncryptUpdate(&ctx, + EVP_EncryptUpdate(ctx, encrypted_text, &encrypted_length, plaintext, plaintext_length); encrypted_text += encrypted_length; - EVP_EncryptFinal_ex(&ctx, encrypted_text, &encrypted_length); + EVP_EncryptFinal_ex(ctx, encrypted_text, &encrypted_length); /* cleanup */ - EVP_CIPHER_CTX_cleanup(&ctx); + EVP_CIPHER_CTX_free(ctx); } /* DES CBC with 56-bit key */ @@ -154,10 +153,9 @@ gsize key_length, const guchar *iv) { - EVP_CIPHER_CTX *ctx = g_malloc(sizeof(EVP_CIPHER_CTX)); + EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new(); /* initialize context */ - EVP_CIPHER_CTX_init(ctx); EVP_EncryptInit_ex(ctx, type, NULL, key, iv); /* set encryption parameters */ @@ -183,8 +181,7 @@ void sipe_crypt_ft_destroy(gpointer context) { - EVP_CIPHER_CTX_cleanup(context); - g_free(context); + EVP_CIPHER_CTX_free(context); } /* Stream RC4 cipher for TLS with variable key length */ @@ -203,8 +200,7 @@ void sipe_crypt_tls_destroy(gpointer context) { - EVP_CIPHER_CTX_cleanup(context); - g_free(context); + EVP_CIPHER_CTX_free(context); } /* Block AES-CBC cipher for TLS */ @@ -245,8 +241,7 @@ if (context) { int tmp; EVP_EncryptUpdate(context, out, &tmp, in, length); - EVP_CIPHER_CTX_cleanup(context); - g_free(context); + EVP_CIPHER_CTX_free(context); } } } diff -Nru pidgin-sipe-1.21.1/src/core/sipe-digest.h pidgin-sipe-1.22.1/src/core/sipe-digest.h --- pidgin-sipe-1.21.1/src/core/sipe-digest.h 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/src/core/sipe-digest.h 2017-06-11 15:41:22.000000000 +0000 @@ -3,7 +3,7 @@ * * pidgin-sipe * - * Copyright (C) 2010-11 SIPE Project + * Copyright (C) 2010-2016 SIPE Project * * 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 @@ -21,6 +21,10 @@ */ /* Plain digests */ +/* NOTE: can only be used by internal NTLMv2 implementation */ +#define SIPE_DIGEST_MD4_LENGTH 16 +void sipe_digest_md4(const guchar *data, gsize length, guchar *digest); + #define SIPE_DIGEST_MD5_LENGTH 16 void sipe_digest_md5(const guchar *data, gsize length, guchar *digest); diff -Nru pidgin-sipe-1.21.1/src/core/sipe-digest-nss.c pidgin-sipe-1.22.1/src/core/sipe-digest-nss.c --- pidgin-sipe-1.21.1/src/core/sipe-digest-nss.c 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/src/core/sipe-digest-nss.c 2017-06-11 15:41:22.000000000 +0000 @@ -3,7 +3,7 @@ * * pidgin-sipe * - * Copyright (C) 2011 SIPE Project + * Copyright (C) 2011-2016 SIPE Project * Copyright (C) 2010 pier11 * * This program is free software; you can redistribute it and/or modify @@ -25,6 +25,9 @@ * Digest routines implementation based on NSS. * Includes: SHA1, MD5, HMAC_SHA_1, HMAC_MD5 */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "glib.h" @@ -39,6 +42,9 @@ #include "pk11pub.h" #include "sipe-digest.h" +#if !(defined(HAVE_GSSAPI_ONLY) || defined(HAVE_SSPI)) +#include "md4.h" +#endif /* PRIVATE methods */ @@ -128,6 +134,15 @@ /* PUBLIC methods */ +#if !(defined(HAVE_GSSAPI_ONLY) || defined(HAVE_SSPI)) +/* One-shot MD4 digest - only used by internal NTLMv2 implementation */ +void sipe_digest_md4(const guchar *data, gsize length, guchar *digest) +{ + /* NSS does not provide MD4 - use Mozilla Firefox implementation */ + md4sum(data, length, digest); +} +#endif + void sipe_digest_md5(const guchar *data, gsize length, guchar *digest) { sipe_digest(SEC_OID_MD5, data, length, digest, SIPE_DIGEST_MD5_LENGTH); diff -Nru pidgin-sipe-1.21.1/src/core/sipe-digest-openssl.c pidgin-sipe-1.22.1/src/core/sipe-digest-openssl.c --- pidgin-sipe-1.21.1/src/core/sipe-digest-openssl.c 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/src/core/sipe-digest-openssl.c 2017-06-11 15:41:22.000000000 +0000 @@ -3,7 +3,7 @@ * * pidgin-sipe * - * Copyright (C) 2013 SIPE Project + * Copyright (C) 2013-2017 SIPE Project * * 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 @@ -23,15 +23,31 @@ /** * Digest routines implementation based on OpenSSL */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include +#if !(defined(HAVE_GSSAPI_ONLY) || defined(HAVE_SSPI)) +#include +#endif #include +#include #include #include "glib.h" #include "sipe-digest.h" +#if !(defined(HAVE_GSSAPI_ONLY) || defined(HAVE_SSPI)) +/* One-shot MD4 digest - only used by internal NTLMv2 implementation */ +void sipe_digest_md4(const guchar *data, gsize length, guchar *digest) +{ + MD4(data, length, digest); +} +#endif + /* One-shot MD5/SHA-1 digests */ void sipe_digest_md5(const guchar *data, gsize length, guchar *digest) { @@ -61,10 +77,15 @@ /* Stream HMAC(SHA1) digest for file transfer */ gpointer sipe_digest_ft_start(const guchar *sha1_digest) { +#if OPENSSL_VERSION_NUMBER < 0x10100000L HMAC_CTX *ctx = g_malloc(sizeof(HMAC_CTX)); HMAC_CTX_init(ctx); +#else + /* OpenSSL 1.1.0 or newer */ + HMAC_CTX *ctx = HMAC_CTX_new(); +#endif /* used are only the first 16 bytes of the 20 byte SHA1 digest */ - HMAC_Init(ctx, sha1_digest, 16, EVP_sha1()); + HMAC_Init_ex(ctx, sha1_digest, 16, EVP_sha1(), NULL); return(ctx); } @@ -80,8 +101,13 @@ void sipe_digest_ft_destroy(gpointer context) { +#if OPENSSL_VERSION_NUMBER < 0x10100000L HMAC_CTX_cleanup(context); g_free(context); +#else + /* OpenSSL 1.1.0 or newer */ + HMAC_CTX_free(context); +#endif } /* Stream digests, e.g. for TLS */ diff -Nru pidgin-sipe-1.21.1/src/core/sipe-ft.c pidgin-sipe-1.22.1/src/core/sipe-ft.c --- pidgin-sipe-1.21.1/src/core/sipe-ft.c 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/src/core/sipe-ft.c 2017-06-11 15:41:22.000000000 +0000 @@ -224,7 +224,7 @@ "Port: %d\r\n" "PortX: 11178\r\n" "AuthCookie: %u\r\n", - sipe_backend_network_ip_address(SIPE_CORE_PUBLIC), + sip_transport_ip_address(sipe_private), ft_private->port, ft_private->auth_cookie); } @@ -298,7 +298,7 @@ struct sipe_core_private *sipe_private = ft_private->sipe_private; struct sip_dialog *dialog; - const gchar *ip = sipe_backend_network_ip_address(SIPE_CORE_PUBLIC); + const gchar *ip = sip_transport_ip_address(sipe_private); gchar *body = g_strdup_printf("Application-Name: File Transfer\r\n" "Application-GUID: {5D3E02AB-6190-11d3-BBBB-00C04F795683}\r\n" "Invitation-Command: INVITE\r\n" diff -Nru pidgin-sipe-1.21.1/src/core/sipe-ft-lync.c pidgin-sipe-1.22.1/src/core/sipe-ft-lync.c --- pidgin-sipe-1.21.1/src/core/sipe-ft-lync.c 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/src/core/sipe-ft-lync.c 2017-06-11 15:41:22.000000000 +0000 @@ -3,7 +3,7 @@ * * pidgin-sipe * - * Copyright (C) 2014-2015 SIPE Project + * Copyright (C) 2014-2017 SIPE Project * * 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 @@ -220,8 +220,9 @@ return FALSE; } - fcntl(pipefd[0], F_SETFL, fcntl(pipefd[0], F_GETFL) | O_NONBLOCK); - fcntl(pipefd[1], F_SETFL, fcntl(pipefd[1], F_GETFL) | O_NONBLOCK); + /* @TODO: ignoring potential error return - how to handle? */ + (void) fcntl(pipefd[0], F_SETFL, fcntl(pipefd[0], F_GETFL) | O_NONBLOCK); + (void) fcntl(pipefd[1], F_SETFL, fcntl(pipefd[1], F_GETFL) | O_NONBLOCK); return TRUE; #endif @@ -459,7 +460,6 @@ struct sipmsg *msg) { struct sipe_file_transfer_lync *ft_private; - struct sipe_media_call *call; struct sipe_media_stream *stream; ft_private = g_new0(struct sipe_file_transfer_lync, 1); @@ -472,40 +472,45 @@ return; } - /* Replace multipart message body with the selected SDP part and - * initialize media session as if invited to a media call. */ - g_free(msg->body); - msg->body = ft_private->sdp; - msg->bodylen = strlen(msg->body); + /* Use the selected SDP part of multipart SIP message to initialize + * media session. */ + ft_private->call = process_incoming_invite_call(sipe_private, + msg, + ft_private->sdp); + g_free(ft_private->sdp); ft_private->sdp = NULL; - ft_private->call = process_incoming_invite_call(sipe_private, msg); if (!ft_private->call) { sip_transport_response(sipe_private, msg, 500, "Server Internal Error", NULL); sipe_file_transfer_lync_free(ft_private); return; } - call = ft_private->call; - ft_private->public.ft_init = ft_lync_incoming_init; ft_private->public.ft_request_denied = ft_lync_request_denied; ft_private->public.ft_cancelled = ft_lync_incoming_cancelled; ft_private->public.ft_end = ft_lync_end; - ft_private->call_reject_parent_cb = call->call_reject_cb; - call->call_reject_cb = call_reject_cb; + ft_private->call_reject_parent_cb = ft_private->call->call_reject_cb; + ft_private->call->call_reject_cb = call_reject_cb; - stream = sipe_core_media_get_stream_by_id(call, "data"); - stream->candidate_pairs_established_cb = candidate_pairs_established_cb; - stream->read_cb = read_cb; - sipe_media_stream_add_extra_attribute(stream, "recvonly", NULL); - sipe_media_stream_set_data(stream, ft_private, - (GDestroyNotify)sipe_file_transfer_lync_free); - - sipe_backend_ft_incoming(SIPE_CORE_PUBLIC, SIPE_FILE_TRANSFER, - call->with, ft_private->file_name, - ft_private->file_size); + stream = sipe_core_media_get_stream_by_id(ft_private->call, "data"); + if (stream) { + stream->candidate_pairs_established_cb = candidate_pairs_established_cb; + stream->read_cb = read_cb; + sipe_media_stream_add_extra_attribute(stream, "recvonly", NULL); + sipe_media_stream_set_data(stream, ft_private, + (GDestroyNotify)sipe_file_transfer_lync_free); + + sipe_backend_ft_incoming(SIPE_CORE_PUBLIC, SIPE_FILE_TRANSFER, + ft_private->call->with, + ft_private->file_name, + ft_private->file_size); + } else { + sip_transport_response(sipe_private, msg, 500, "Server Internal Error", NULL); + sipe_file_transfer_lync_free(ft_private); + return; + } } static void @@ -751,7 +756,7 @@ call->call_reject_cb = call_reject_cb; stream = sipe_media_stream_add(call, "data", SIPE_MEDIA_APPLICATION, - SIPE_ICE_RFC_5245, TRUE); + SIPE_ICE_RFC_5245, TRUE, 0); if (!stream) { sipe_backend_notify_error(SIPE_CORE_PUBLIC, _("Error occurred"), diff -Nru pidgin-sipe-1.21.1/src/core/sipe-groupchat.c pidgin-sipe-1.22.1/src/core/sipe-groupchat.c --- pidgin-sipe-1.21.1/src/core/sipe-groupchat.c 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/src/core/sipe-groupchat.c 2017-06-11 15:41:22.000000000 +0000 @@ -1011,6 +1011,8 @@ for (r = response_table; r->key; r++) { if (sipe_strcase_equal(id, r->key)) { (*r->handler)(sipe_private, session, result, message, data); + /* session can be invalid now */ + session = NULL; break; } } diff -Nru pidgin-sipe-1.21.1/src/core/sipe-group.h pidgin-sipe-1.22.1/src/core/sipe-group.h --- pidgin-sipe-1.21.1/src/core/sipe-group.h 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/src/core/sipe-group.h 2017-06-11 15:41:22.000000000 +0000 @@ -3,7 +3,7 @@ * * pidgin-sipe * - * Copyright (C) 2011-2013 SIPE Project + * Copyright (C) 2011-2016 SIPE Project * * 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 @@ -39,6 +39,14 @@ struct sipe_group *sipe_group_find_by_name(struct sipe_core_private *sipe_private, const gchar * name); +/** + * Request creation of group @c name on the server and add buddy @c who to it + * + * @param sipe_private SIPE core data + * @param trans UCS transaction (@c NULL when UCS is not in use) + * @param name name of group + * @param who SIP URI of buddy (may be @c NULL, i.e. empty group) + */ void sipe_group_create(struct sipe_core_private *sipe_private, struct sipe_ucs_transaction *trans, const gchar *name, diff -Nru pidgin-sipe-1.21.1/src/core/sipe-http-request.c pidgin-sipe-1.22.1/src/core/sipe-http-request.c --- pidgin-sipe-1.21.1/src/core/sipe-http-request.c 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/src/core/sipe-http-request.c 2017-06-11 15:41:22.000000000 +0000 @@ -3,7 +3,7 @@ * * pidgin-sipe * - * Copyright (C) 2013-2015 SIPE Project + * Copyright (C) 2013-2016 SIPE Project * * * This program is free software; you can redistribute it and/or modify @@ -508,7 +508,7 @@ /* Callback: request failed */ (*req->cb)(sipe_private, SIPE_HTTP_STATUS_FAILED, - NULL, + msg->headers, NULL, req->cb_data); diff -Nru pidgin-sipe-1.21.1/src/core/sipe-http-transport.c pidgin-sipe-1.22.1/src/core/sipe-http-transport.c --- pidgin-sipe-1.21.1/src/core/sipe-http-transport.c 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/src/core/sipe-http-transport.c 2017-06-11 15:41:22.000000000 +0000 @@ -3,7 +3,7 @@ * * pidgin-sipe * - * Copyright (C) 2013-2014 SIPE Project + * Copyright (C) 2013-2016 SIPE Project * * * This program is free software; you can redistribute it and/or modify @@ -107,9 +107,9 @@ struct sipe_http_connection *conn, const gchar *message) { - SIPE_DEBUG_INFO("sipe_http_transport_drop: dropping connection '%s': %s", - conn->host_port, - message ? message : "REASON UNKNOWN"); + SIPE_LOG_INFO("sipe_http_transport_drop: dropping connection '%s': %s", + conn->host_port, + message ? message : "REASON UNKNOWN"); #if GLIB_CHECK_VERSION(2,30,0) /* this triggers sipe_http_transport_free() */ @@ -246,7 +246,7 @@ struct sipe_http *http = sipe_private->http; time_t current_time = time(NULL); - SIPE_DEBUG_INFO("sipe_http_transport_connected: %s", conn->host_port); + SIPE_LOG_INFO("sipe_http_transport_connected: %s", conn->host_port); conn->public.connected = TRUE; /* add active connection to timeout queue */ diff -Nru pidgin-sipe-1.21.1/src/core/sipe-im.c pidgin-sipe-1.22.1/src/core/sipe-im.c --- pidgin-sipe-1.21.1/src/core/sipe-im.c 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/src/core/sipe-im.c 2017-06-11 15:41:22.000000000 +0000 @@ -3,7 +3,7 @@ * * pidgin-sipe * - * Copyright (C) 2011-2013 SIPE Project + * Copyright (C) 2011-2016 SIPE Project * * 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 @@ -409,8 +409,8 @@ "t=0 0\r\n" "m=%s %d sip null\r\n" "a=accept-types:" SDP_ACCEPT_TYPES "\r\n", - sipe_backend_network_ip_address(SIPE_CORE_PUBLIC), - sipe_backend_network_ip_address(SIPE_CORE_PUBLIC), + sip_transport_ip_address(sipe_private), + sip_transport_ip_address(sipe_private), SIPE_CORE_PRIVATE_FLAG_IS(OCS2007) ? "message" : "x-ms-message", sip_transport_port(sipe_private)); diff -Nru pidgin-sipe-1.21.1/src/core/sipe-incoming.c pidgin-sipe-1.22.1/src/core/sipe-incoming.c --- pidgin-sipe-1.21.1/src/core/sipe-incoming.c 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/src/core/sipe-incoming.c 2017-06-11 15:41:22.000000000 +0000 @@ -3,7 +3,7 @@ * * pidgin-sipe * - * Copyright (C) 2010-2015 SIPE Project + * Copyright (C) 2010-2017 SIPE Project * * 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 @@ -29,10 +29,10 @@ #include -#include "sipe-common.h" #include "sipmsg.h" #include "sip-csta.h" #include "sip-transport.h" +#include "sipe-appshare.h" #include "sipe-backend.h" #include "sipe-chat.h" #include "sipe-conf.h" @@ -306,8 +306,8 @@ "t=0 0\r\n" "m=%s %d sip sip:%s\r\n" "a=accept-types:" SDP_ACCEPT_TYPES "\r\n", - sipe_backend_network_ip_address(SIPE_CORE_PUBLIC), - sipe_backend_network_ip_address(SIPE_CORE_PUBLIC), + sip_transport_ip_address(sipe_private), + sip_transport_ip_address(sipe_private), SIPE_CORE_PRIVATE_FLAG_IS(OCS2007) ? "message" : "x-ms-message", sip_transport_port(sipe_private), sipe_private->username); @@ -412,10 +412,23 @@ } #ifdef HAVE_VV + /* Application sharing */ + if (sipe_strcase_equal(content_type, "application/sdp") && msg->body && + strstr(msg->body, "m=applicationsharing") && + sipe_strequal(sipmsg_find_header(msg, "CSeq"), "1 INVITE")) { +#ifdef HAVE_APPSHARE + process_incoming_invite_appshare(sipe_private, msg); +#else + sip_transport_response(sipe_private, msg, + 488, "Not Acceptable Here", NULL); +#endif + return; + } + /* Invitation to audio call or file transfer */ if (msg->body && - (strstr(msg->body, "m=audio") || strstr(msg->body, "m=data"))) { - process_incoming_invite_call(sipe_private, msg); + (strstr(msg->body, "m=audio") || strstr(msg->body, "m=data") || strstr(msg->body, "m=applicationsharing"))) { + process_incoming_invite_call(sipe_private, msg, msg->body); return; } #endif diff -Nru pidgin-sipe-1.21.1/src/core/sipe-lync-autodiscover.c pidgin-sipe-1.22.1/src/core/sipe-lync-autodiscover.c --- pidgin-sipe-1.21.1/src/core/sipe-lync-autodiscover.c 1970-01-01 00:00:00.000000000 +0000 +++ pidgin-sipe-1.22.1/src/core/sipe-lync-autodiscover.c 2017-06-11 15:41:22.000000000 +0000 @@ -0,0 +1,488 @@ +/** + * @file sipe-lync-autodiscover.c + * + * pidgin-sipe + * + * Copyright (C) 2016-2017 SIPE Project + * + * + * 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 + * + * Specification references: + * + * - [MS-OCDISCWS]: https://msdn.microsoft.com/en-us/library/hh623245.aspx + * - Understanding Autodiscover in Lync Server 2013 + * https://technet.microsoft.com/en-us/library/jj945654.aspx + */ + +#include + +#include + +#include "sipe-common.h" +#include "sipe-backend.h" +#include "sipe-core.h" +#include "sipe-core-private.h" +#include "sipe-http.h" +#include "sipe-lync-autodiscover.h" +#include "sipe-utils.h" +#include "sipe-svc.h" +#include "sipe-webticket.h" +#include "sipe-xml.h" + +#define LYNC_AUTODISCOVER_ACCEPT_HEADER \ + "Accept: application/vnd.microsoft.rtc.autodiscover+xml;v=1\r\n" + +struct lync_autodiscover_request { + sipe_lync_autodiscover_callback *cb; + gpointer cb_data; + gpointer id; /* != NULL for active request */ + struct sipe_http_request *request; + struct sipe_svc_session *session; + const gchar *protocol; + const gchar **method; + gchar *uri; + gboolean is_pending; +}; + +struct sipe_lync_autodiscover { + GSList *pending_requests; +}; + +/* Use "lar" inside the code fragment */ +#define FOR_ALL_REQUESTS_WITH_SAME_ID(code) \ + { \ + GSList *entry = sipe_private->lync_autodiscover->pending_requests; \ + while (entry) { \ + struct lync_autodiscover_request *lar = entry->data; \ + entry = entry->next; \ + if (lar->id == id) { \ + code; \ + } \ + } \ + } + +static void sipe_lync_autodiscover_request_free(struct sipe_core_private *sipe_private, + struct lync_autodiscover_request *request) +{ + struct sipe_lync_autodiscover *sla = sipe_private->lync_autodiscover; + + sla->pending_requests = g_slist_remove(sla->pending_requests, request); + + if (request->request) + sipe_http_request_cancel(request->request); + if (request->cb) + /* Callback: aborted */ + (*request->cb)(sipe_private, NULL, request->cb_data); + sipe_svc_session_close(request->session); + g_free(request->uri); + g_free(request); +} + +static void sipe_lync_autodiscover_cb(struct sipe_core_private *sipe_private, + guint status, + GSList *headers, + const gchar *body, + gpointer callback_data); +static void lync_request(struct sipe_core_private *sipe_private, + struct lync_autodiscover_request *request, + const gchar *uri, + const gchar *headers) +{ + request->request = sipe_http_request_get(sipe_private, + uri, + headers ? headers : LYNC_AUTODISCOVER_ACCEPT_HEADER, + sipe_lync_autodiscover_cb, + request); +} + +static GSList *sipe_lync_autodiscover_add(GSList *servers, + const sipe_xml *node, + const gchar *name) +{ + const sipe_xml *child = sipe_xml_child(node, name); + const gchar *fqdn = sipe_xml_attribute(child, "fqdn"); + guint port = sipe_xml_int_attribute(child, "port", 0); + + /* Add new entry to head of list */ + if (fqdn && (port != 0)) { + struct sipe_lync_autodiscover_data *lync_data = g_new0(struct sipe_lync_autodiscover_data, 1); + lync_data->server = g_strdup(fqdn); + lync_data->port = port; + servers = g_slist_prepend(servers, lync_data); + } + + return(servers); +} + +GSList *sipe_lync_autodiscover_pop(GSList *servers) +{ + if (servers) { + struct sipe_lync_autodiscover_data *lync_data = servers->data; + servers = g_slist_remove(servers, lync_data); + + if (lync_data) { + g_free((gchar *) lync_data->server); + g_free(lync_data); + } + } + + return(servers); +} + +static void sipe_lync_autodiscover_queue_request(struct sipe_core_private *sipe_private, + struct lync_autodiscover_request *request); +static void sipe_lync_autodiscover_parse(struct sipe_core_private *sipe_private, + struct lync_autodiscover_request *request, + const gchar *body) +{ + sipe_xml *xml = sipe_xml_parse(body, strlen(body)); + const sipe_xml *node; + gboolean next = TRUE; + const gchar *access_location; + + /* Root: resources exposed by this server */ + for (node = sipe_xml_child(xml, "Root/Link"); + node; + node = sipe_xml_twin(node)) { + const gchar *token = sipe_xml_attribute(node, "token"); + const gchar *uri = sipe_xml_attribute(node, "href"); + + if (token && uri) { + /* Redirect? */ + if (sipe_strcase_equal(token, "Redirect")) { + SIPE_DEBUG_INFO("sipe_lync_autodiscover_parse: redirect to %s", + uri); + lync_request(sipe_private, request, uri, NULL); + next = FALSE; + break; + + /* User? */ + } else if (sipe_strcase_equal(token, "User")) { + SIPE_DEBUG_INFO("sipe_lync_autodiscover_parse: user %s", + uri); + + /* remember URI for authentication failure */ + request->uri = g_strdup(uri); + + lync_request(sipe_private, request, uri, NULL); + next = FALSE; + break; + + } else + SIPE_DEBUG_INFO("sipe_lync_autodiscover_parse: unknown token %s", + token); + } + } + + access_location = sipe_xml_attribute(xml, "AccessLocation"); + + /* User: topology information of the user’s home server */ + if ((node = sipe_xml_child(xml, "User")) != NULL) { + gpointer id = request->id; + + /* Active request? */ + if (id) { + GSList *servers; + + /* List is reversed, i.e. internal will be tried first */ + servers = g_slist_prepend(NULL, NULL); + + if (!access_location || + sipe_strcase_equal(access_location, "external")) { + servers = sipe_lync_autodiscover_add(servers, + node, + "SipClientExternalAccess"); + } + + if (!access_location || + sipe_strcase_equal(access_location, "internal")) { + servers = sipe_lync_autodiscover_add(servers, + node, + "SipClientInternalAccess"); + } + + /* Callback takes ownership of servers list */ + (*request->cb)(sipe_private, servers, request->cb_data); + + /* We're done with requests for this callback */ + FOR_ALL_REQUESTS_WITH_SAME_ID( \ + lar->cb = NULL; \ + lar->id = NULL \ + ); + + } + + /* Request completed */ + next = FALSE; + sipe_lync_autodiscover_request_free(sipe_private, request); + /* request is invalid */ + } + + sipe_xml_free(xml); + + if (next) + sipe_lync_autodiscover_queue_request(sipe_private, request); +} + +static void sipe_lync_autodiscover_webticket(struct sipe_core_private *sipe_private, + SIPE_UNUSED_PARAMETER const gchar *base_uri, + const gchar *auth_uri, + const gchar *wsse_security, + SIPE_UNUSED_PARAMETER const gchar *failure_msg, + gpointer callback_data) +{ + struct lync_autodiscover_request *request = callback_data; + gchar *saml; + + /* Extract SAML Assertion from WSSE Security XML text */ + if (wsse_security && + ((saml = sipe_xml_extract_raw(wsse_security, + "Assertion", + TRUE)) != NULL)) { + gchar *base64 = g_base64_encode((const guchar *) saml, + strlen(saml)); + gchar *headers = g_strdup_printf(LYNC_AUTODISCOVER_ACCEPT_HEADER + "X-MS-WebTicket: opaque=%s\r\n", + base64); + g_free(base64); + + SIPE_DEBUG_INFO("sipe_lync_autodiscover_webticket: got ticket for Auth URI %s", + auth_uri); + g_free(saml); + + lync_request(sipe_private, request, auth_uri, headers); + g_free(headers); + + } else + sipe_lync_autodiscover_queue_request(sipe_private, request); +} + +static void sipe_lync_autodiscover_cb(struct sipe_core_private *sipe_private, + guint status, + GSList *headers, + const gchar *body, + gpointer callback_data) +{ + struct lync_autodiscover_request *request = callback_data; + const gchar *type = sipe_utils_nameval_find(headers, "Content-Type"); + gchar *uri = request->uri; + + request->request = NULL; + request->uri = NULL; + + switch (status) { + case SIPE_HTTP_STATUS_OK: + /* only accept Autodiscover XML responses */ + if (body && g_str_has_prefix(type, "application/vnd.microsoft.rtc.autodiscover+xml")) + sipe_lync_autodiscover_parse(sipe_private, request, body); + else + sipe_lync_autodiscover_queue_request(sipe_private, request); + break; + + case SIPE_HTTP_STATUS_FAILED: + { + if (uri) { + /* check for authentication failure */ + const gchar *webticket_uri = sipe_utils_nameval_find(headers, + "X-MS-WebTicketURL"); + + if (!(webticket_uri && + sipe_webticket_request_with_auth(sipe_private, + request->session, + webticket_uri, + uri, /* Auth URI */ + sipe_lync_autodiscover_webticket, + request))) + sipe_lync_autodiscover_queue_request(sipe_private, request); + } else + sipe_lync_autodiscover_queue_request(sipe_private, request); + } + break; + + case SIPE_HTTP_STATUS_ABORTED: + /* we are not allowed to generate new requests */ + sipe_lync_autodiscover_request_free(sipe_private, request); + break; + + default: + sipe_lync_autodiscover_queue_request(sipe_private, request); + break; + } + + g_free(uri); +} + +/* Proceed to next method for request */ +static void sipe_lync_autodiscover_request(struct sipe_core_private *sipe_private, + struct lync_autodiscover_request *request) +{ + gpointer id = request->id; + + /* Active request? */ + if (id) { + static const gchar *methods[] = { + "%s://LyncDiscoverInternal.%s/?sipuri=%s", + "%s://LyncDiscover.%s/?sipuri=%s", + NULL + }; + + request->is_pending = TRUE; + + if (request->method) + request->method++; + else + request->method = methods; + + if (*request->method) { + gchar *uri = g_strdup_printf(*request->method, + request->protocol, + SIPE_CORE_PUBLIC->sip_domain, + sipe_private->username); + + SIPE_DEBUG_INFO("sipe_lync_autodiscover_request: trying '%s'", uri); + + lync_request(sipe_private, request, uri, NULL); + g_free(uri); + + } else { + guint count = 0; + + /* Count entries with the same request ID */ + FOR_ALL_REQUESTS_WITH_SAME_ID( \ + count++; \ + ); + + if (count == 1) { + /* + * This is the last pending request for this + * ID, i.e. autodiscover has failed. Create + * empty server list and return it. + */ + GSList *servers = g_slist_prepend(NULL, NULL); + + /* All methods tried, indicate failure to caller */ + SIPE_DEBUG_INFO_NOFORMAT("sipe_lync_autodiscover_request: no more methods to try!"); + + /* Callback takes ownership of servers list */ + (*request->cb)(sipe_private, servers, request->cb_data); + } + + /* Request completed */ + request->cb = NULL; + sipe_lync_autodiscover_request_free(sipe_private, request); + /* request is invalid */ + } + } else { + /* Inactive request, callback already NULL */ + sipe_lync_autodiscover_request_free(sipe_private, request); + /* request is invalid */ + } +} + +/* Proceed to next method for all requests */ +static void sipe_lync_autodiscover_queue_request(struct sipe_core_private *sipe_private, + struct lync_autodiscover_request *request) +{ + gpointer id = request->id; + + /* This request is ready to proceed to next method */ + request->is_pending = FALSE; + + /* Is any request for the same ID still pending? */ + FOR_ALL_REQUESTS_WITH_SAME_ID( \ + if (lar->is_pending) \ + return \ + ); + + SIPE_DEBUG_INFO_NOFORMAT("sipe_lync_autodiscover_queue_request: proceed in lockstep"); + + /* No, proceed to next method for all requests */ + FOR_ALL_REQUESTS_WITH_SAME_ID( \ + sipe_lync_autodiscover_request(sipe_private, \ + lar) \ + ); +} + +static gpointer sipe_lync_autodiscover_create(struct sipe_core_private *sipe_private, + gpointer id, + const gchar *protocol, + sipe_lync_autodiscover_callback *callback, + gpointer callback_data) +{ + struct sipe_lync_autodiscover *sla = sipe_private->lync_autodiscover; + struct lync_autodiscover_request *request = g_new0(struct lync_autodiscover_request, 1); + + /* use address of first request structure as unique ID */ + if (id == NULL) + id = request; + + request->protocol = protocol; + request->cb = callback; + request->cb_data = callback_data; + request->id = id; + request->session = sipe_svc_session_start(); + + sla->pending_requests = g_slist_prepend(sla->pending_requests, + request); + + sipe_lync_autodiscover_request(sipe_private, request); + + return(id); +} + +void sipe_lync_autodiscover_start(struct sipe_core_private *sipe_private, + sipe_lync_autodiscover_callback *callback, + gpointer callback_data) +{ + gpointer id = NULL; + +#define CREATE(protocol) \ + id = sipe_lync_autodiscover_create(sipe_private, \ + id, \ + #protocol, \ + callback, \ + callback_data) + CREATE(http); + CREATE(https); +} + +void sipe_lync_autodiscover_init(struct sipe_core_private *sipe_private) +{ + struct sipe_lync_autodiscover *sla = g_new0(struct sipe_lync_autodiscover, 1); + + sipe_private->lync_autodiscover = sla; +} + +void sipe_lync_autodiscover_free(struct sipe_core_private *sipe_private) +{ + struct sipe_lync_autodiscover *sla = sipe_private->lync_autodiscover; + + while (sla->pending_requests) + sipe_lync_autodiscover_request_free(sipe_private, + sla->pending_requests->data); + + g_free(sla); + sipe_private->lync_autodiscover = NULL; +} + +/* + Local Variables: + mode: c + c-file-style: "bsd" + indent-tabs-mode: t + tab-width: 8 + End: +*/ diff -Nru pidgin-sipe-1.21.1/src/core/sipe-lync-autodiscover.h pidgin-sipe-1.22.1/src/core/sipe-lync-autodiscover.h --- pidgin-sipe-1.21.1/src/core/sipe-lync-autodiscover.h 1970-01-01 00:00:00.000000000 +0000 +++ pidgin-sipe-1.22.1/src/core/sipe-lync-autodiscover.h 2017-06-11 15:41:22.000000000 +0000 @@ -0,0 +1,79 @@ +/** + * @file sipe-lync-autodiscover.h + * + * pidgin-sipe + * + * Copyright (C) 2016 SIPE Project + * + * + * 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 + */ + +/* Forward declarations */ +struct sipe_core_private; + +/* Lync data determined by autodiscover */ +struct sipe_lync_autodiscover_data { + const gchar *server; + guint port; +}; + +/** + * Lync autodiscover callback + * + * @param sipe_private SIPE core private data + * @param servers list with Lync autodiscover data + * @param callback_data callback data + * + * servers will be @c NULL when request got aborted. + * last entry in the list will be a @c NULL entry. + */ +typedef void (sipe_lync_autodiscover_callback)(struct sipe_core_private *sipe_private, + GSList *servers, + gpointer callback_data); + +/** + * Free first callback data entry on the server list + * + * @param servers list given to callback (may be @c NULL) + * + * @return new list header + */ +GSList *sipe_lync_autodiscover_pop(GSList *servers); + +/** + * Trigger Lync autodiscover + * + * @param sipe_private SIPE core private data + * @param callback callback function + * @param callback_data callback data + */ +void sipe_lync_autodiscover_start(struct sipe_core_private *sipe_private, + sipe_lync_autodiscover_callback *callback, + gpointer callback_data); + +/** + * Initialize Lync autodiscover data + * + * @param sipe_private SIPE core private data + */ +void sipe_lync_autodiscover_init(struct sipe_core_private *sipe_private); + +/** + * Free Lync autodiscover data + * + * @param sipe_private SIPE core private data + */ +void sipe_lync_autodiscover_free(struct sipe_core_private *sipe_private); diff -Nru pidgin-sipe-1.21.1/src/core/sipe-media.c pidgin-sipe-1.22.1/src/core/sipe-media.c --- pidgin-sipe-1.21.1/src/core/sipe-media.c 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/src/core/sipe-media.c 2017-06-11 15:41:22.000000000 +0000 @@ -3,7 +3,7 @@ * * pidgin-sipe * - * Copyright (C) 2011-2016 SIPE Project + * Copyright (C) 2011-2017 SIPE Project * Copyright (C) 2010 Jakub Adam * * This program is free software; you can redistribute it and/or modify @@ -36,7 +36,6 @@ #include "sip-transport.h" #include "sipe-backend.h" #include "sdpmsg.h" -#include "sipe-chat.h" #include "sipe-conf.h" #include "sipe-core.h" #include "sipe-core-private.h" @@ -46,9 +45,12 @@ #include "sipe-session.h" #include "sipe-utils.h" #include "sipe-nls.h" -#include "sipe-schedule.h" #include "sipe-xml.h" +/* [MS-SDPEXT] 3.1.5.31.2 says a range size of 100 SHOULD be used for video and + * some clients really demand this. */ +#define VIDEO_SSRC_COUNT 100 + struct sipe_media_call_private { struct sipe_media_call public; @@ -66,6 +68,8 @@ gchar *extra_invite_section; gchar *invite_content_type; + GSList *ssrc_ranges; + struct sdpmsg *smsg; GSList *failed_media; }; @@ -79,11 +83,13 @@ int encryption_key_id; gboolean remote_candidates_and_codecs_set; gboolean established; +#ifdef HAVE_XDATA + gboolean sdp_negotiation_concluded; + gboolean writable; +#endif GSList *extra_sdp; - gboolean writable; - GQueue *write_queue; GQueue *async_reads; gssize read_pos; @@ -114,16 +120,28 @@ } static void -remove_stream(struct sipe_media_call* call, - struct sipe_media_stream_private *stream_private) +sipe_media_stream_free(struct sipe_media_stream_private *stream_private) { - struct sipe_media_call_private *call_private = SIPE_MEDIA_CALL_PRIVATE; + struct sipe_media_call_private *call_private; + + call_private = (struct sipe_media_call_private *)SIPE_MEDIA_STREAM->call; sipe_media_stream_set_data(SIPE_MEDIA_STREAM, NULL, NULL); - call_private->streams = - g_slist_remove(call_private->streams, stream_private); - sipe_backend_media_stream_free(SIPE_MEDIA_STREAM->backend_private); + if (call_private) { + call_private->streams = g_slist_remove(call_private->streams, + stream_private); + + if (SIPE_MEDIA_STREAM->ssrc_range) { + call_private->ssrc_ranges = + g_slist_remove(call_private->ssrc_ranges, + SIPE_MEDIA_STREAM->ssrc_range); + } + } + + if (SIPE_MEDIA_STREAM->backend_private) { + sipe_backend_media_stream_free(SIPE_MEDIA_STREAM->backend_private); + } g_free(SIPE_MEDIA_STREAM->id); g_free(stream_private->encryption_key); g_queue_free_full(stream_private->write_queue, @@ -149,8 +167,7 @@ (GHRFunc) call_private_equals, call_private); while (call_private->streams) { - remove_stream(SIPE_MEDIA_CALL, - call_private->streams->data); + sipe_media_stream_free(call_private->streams->data); } sipe_backend_media_free(call_private->public.backend_private); @@ -166,6 +183,8 @@ // Frees any referenced extra invite data. sipe_media_add_extra_invite_section(SIPE_MEDIA_CALL, NULL, NULL); + sipe_utils_slist_free_full(call_private->ssrc_ranges, g_free); + sdpmsg_free(call_private->smsg); sipe_utils_slist_free_full(call_private->failed_media, (GDestroyNotify)sdpmedia_free); @@ -413,6 +432,8 @@ type = SIPE_MEDIA_VIDEO; else if (sipe_strequal(sdpmedia->name, "data")) type = SIPE_MEDIA_APPLICATION; + else if (sipe_strequal(sdpmedia->name, "applicationsharing")) + type = SIPE_MEDIA_APPLICATION; else { // TODO: incompatible media, should not happen here g_free(sdpmedia->name); @@ -512,6 +533,17 @@ attributes = sipe_utils_nameval_add(attributes, "encryption", encryption); } + if (SIPE_MEDIA_STREAM->ssrc_range) { + gchar *tmp; + + tmp = g_strdup_printf("%u-%u", + SIPE_MEDIA_STREAM->ssrc_range->begin, + SIPE_MEDIA_STREAM->ssrc_range->end); + attributes = sipe_utils_nameval_add(attributes, + "x-ssrc-range", tmp); + g_free(tmp); + } + // Process remote candidates candidates = sipe_backend_media_stream_get_active_remote_candidates(SIPE_MEDIA_STREAM); sdpmedia->remote_candidates = backend_candidates_to_sdpcandidate(candidates); @@ -707,7 +739,8 @@ codec = sipe_backend_codec_new(c->id, c->name, c->type, - c->clock_rate); + c->clock_rate, + c->channels); for (j = c->parameters; j; j = j->next) { struct sipnameval *attr = j->data; @@ -871,10 +904,10 @@ } } -static void -stream_end_cb(struct sipe_media_call* call, struct sipe_media_stream* stream) +void +sipe_core_media_stream_end(struct sipe_media_stream *stream) { - remove_stream(call, SIPE_MEDIA_STREAM_PRIVATE); + sipe_media_stream_free(SIPE_MEDIA_STREAM_PRIVATE); } static void @@ -978,8 +1011,6 @@ call_private->invitation, 488, "Not Acceptable Here", NULL); } - - sipe_backend_media_hangup(call->backend_private, initiator || accepted); } struct sipe_media_call * @@ -1045,7 +1076,6 @@ call_private->encryption_compatible = TRUE; call_private->public.stream_initialized_cb = stream_initialized_cb; - call_private->public.stream_end_cb = stream_end_cb; call_private->public.media_end_cb = media_end_cb; call_private->public.call_accept_cb = call_accept_cb; call_private->public.call_reject_cb = call_reject_cb; @@ -1066,14 +1096,94 @@ } } +static gint +ssrc_range_compare(const struct ssrc_range *a, const struct ssrc_range *b) +{ + if (a->begin < b->begin) { + return -1; + } + if (a->begin > b->begin) { + return 1; + } + return 0; +} + +static void +ssrc_range_update(GSList **ranges, GSList *media) +{ + for (; media; media = media->next) { + struct sdpmedia *m; + const char *ssrc_range; + gchar **parts; + + m = media->data; + ssrc_range = sipe_utils_nameval_find(m->attributes, + "x-ssrc-range"); + if (!ssrc_range) { + continue; + } + + parts = g_strsplit(ssrc_range, "-", 2); + + if (parts[0] && parts[1]) { + struct ssrc_range *range; + + range = g_new0(struct ssrc_range, 1); + range->begin = atoi(parts[0]); + range->end = atoi(parts[1]); + + *ranges = sipe_utils_slist_insert_unique_sorted( + *ranges, range, + (GCompareFunc)ssrc_range_compare, + g_free); + } + + g_strfreev(parts); + } +} + +static struct ssrc_range * +ssrc_range_allocate(GSList **ranges, guint32 len) +{ + struct ssrc_range *range; + GSList *i; + + range = g_new0(struct ssrc_range, 1); + range->begin = 1; + range->end = range->begin + (len - 1); + + for (i = *ranges; i; i = i->next) { + struct ssrc_range *r = i->data; + + if (range->begin < r->begin && range->end < r->begin) { + break; + } + + range->begin = r->end + 1; + range->end = range->begin + (len - 1); + } + + /* As per [MS-SDPEXT] 3.1.5.31.1, a SSRC MUST be from 1 to 4294967040 + * inclusive. */ + if (range->begin > range->end || range->end > 0xFFFFFF00) { + g_free(range); + SIPE_DEBUG_ERROR("Couldn't allocate SSRC range of %u", len); + return NULL; + } + + *ranges = g_slist_insert_sorted(*ranges, range, + (GCompareFunc)ssrc_range_compare); + + return range; +} + struct sipe_media_stream * sipe_media_stream_add(struct sipe_media_call *call, const gchar *id, SipeMediaType type, SipeIceVersion ice_version, - gboolean initiator) + gboolean initiator, guint32 ssrc_count) { struct sipe_core_private *sipe_private; struct sipe_media_stream_private *stream_private; - struct sipe_backend_media_stream *backend_stream; struct sipe_backend_media_relays *backend_media_relays; guint min_port; guint max_port; @@ -1107,25 +1217,48 @@ break; } - backend_stream = sipe_backend_media_add_stream(call, id, call->with, - type, ice_version, - initiator, - backend_media_relays, - min_port, max_port); + stream_private = g_new0(struct sipe_media_stream_private, 1); + SIPE_MEDIA_STREAM->call = call; + SIPE_MEDIA_STREAM->id = g_strdup(id); + stream_private->write_queue = g_queue_new(); + stream_private->async_reads = g_queue_new(); + + if (ssrc_count > 0) { + SIPE_MEDIA_STREAM->ssrc_range = + ssrc_range_allocate(&SIPE_MEDIA_CALL_PRIVATE->ssrc_ranges, + ssrc_count); + } + + SIPE_MEDIA_STREAM->backend_private = + sipe_backend_media_add_stream(SIPE_MEDIA_STREAM, + type, ice_version, + initiator, + backend_media_relays, + min_port, max_port); sipe_backend_media_relays_free(backend_media_relays); - if (!backend_stream) { + if (!SIPE_MEDIA_STREAM->backend_private) { + sipe_media_stream_free(stream_private); return NULL; } - stream_private = g_new0(struct sipe_media_stream_private, 1); - SIPE_MEDIA_STREAM->call = call; - SIPE_MEDIA_STREAM->id = g_strdup(id); - SIPE_MEDIA_STREAM->backend_private = backend_stream; + if (type == SIPE_MEDIA_VIDEO) { + /* Declare that we can send and receive Video Source Requests + * as per [MS-SDPEXT] 3.1.5.30.2. */ + sipe_media_stream_add_extra_attribute(SIPE_MEDIA_STREAM, + "rtcp-fb", "* x-message app send:src recv:src"); + + sipe_media_stream_add_extra_attribute(SIPE_MEDIA_STREAM, + "rtcp-rsize", NULL); + sipe_media_stream_add_extra_attribute(SIPE_MEDIA_STREAM, + "label", "main-video"); + sipe_media_stream_add_extra_attribute(SIPE_MEDIA_STREAM, + "x-source", "main-video"); + } #ifdef HAVE_SRTP - { + if (get_encryption_policy(sipe_private) != SIPE_ENCRYPTION_POLICY_REJECTED) { int i; stream_private->encryption_key = g_new0(guchar, SIPE_SRTP_KEY_LEN); for (i = 0; i != SIPE_SRTP_KEY_LEN; ++i) { @@ -1135,9 +1268,6 @@ } #endif - stream_private->write_queue = g_queue_new(); - stream_private->async_reads = g_queue_new(); - SIPE_MEDIA_CALL_PRIVATE->streams = g_slist_append(SIPE_MEDIA_CALL_PRIVATE->streams, stream_private); @@ -1149,10 +1279,11 @@ append_2007_fallback_if_needed(struct sipe_media_call_private *call_private) { struct sipe_core_private *sipe_private = call_private->sipe_private; - const gchar *ip = sipe_backend_network_ip_address(SIPE_CORE_PUBLIC); + const gchar *ip = sip_transport_ip_address(sipe_private); gchar *body; - if (sipe_media_get_sip_dialog(SIPE_MEDIA_CALL)->cseq != 0 || + if (SIPE_CORE_PRIVATE_FLAG_IS(SFB) || + sipe_media_get_sip_dialog(SIPE_MEDIA_CALL)->cseq != 0 || call_private->ice_version != SIPE_ICE_RFC_5245 || sipe_strequal(SIPE_MEDIA_CALL->with, sipe_private->test_call_bot_uri)) { return; @@ -1190,7 +1321,7 @@ if (!sipe_media_stream_add(SIPE_MEDIA_CALL, "audio", SIPE_MEDIA_AUDIO, call_private->ice_version, - TRUE)) { + TRUE, 0)) { sipe_backend_notify_error(SIPE_CORE_PUBLIC, _("Error occurred"), _("Error creating audio stream")); @@ -1201,7 +1332,7 @@ if (with_video && !sipe_media_stream_add(SIPE_MEDIA_CALL, "video", SIPE_MEDIA_VIDEO, call_private->ice_version, - TRUE)) { + TRUE, VIDEO_SSRC_COUNT)) { sipe_backend_notify_error(SIPE_CORE_PUBLIC, _("Error occurred"), _("Error creating video stream")); @@ -1259,7 +1390,8 @@ return; } - av_uri = sipe_conf_build_uri(chat_session->id, "audio-video"); + av_uri = sipe_conf_build_uri(sipe_core_chat_id(sipe_public, chat_session), + "audio-video"); if (!av_uri) { return; } @@ -1278,7 +1410,7 @@ stream = sipe_media_stream_add(SIPE_MEDIA_CALL, "audio", SIPE_MEDIA_AUDIO, call_private->ice_version, - TRUE); + TRUE, 0); if (!stream) { sipe_backend_notify_error(sipe_public, _("Error occurred"), @@ -1299,13 +1431,16 @@ { struct sipe_media_call * result = NULL; GList *calls = g_hash_table_get_values(SIPE_CORE_PRIVATE->media_calls); + GList *entry = calls; - for (; calls; calls = g_list_delete_link(calls, calls)) { - if (sipe_core_media_get_stream_by_id(calls->data, "audio")) { - result = calls->data; + while (entry) { + if (sipe_core_media_get_stream_by_id(entry->data, "audio")) { + result = entry->data; break; } + entry = entry->next; } + g_list_free(calls); return result; } @@ -1401,14 +1536,36 @@ } send_response_with_session_description(call_private, 200, "OK"); + +#ifdef HAVE_XDATA + for (it = call_private->streams; it; it = it->next) { + struct sipe_media_stream_private *stream_private = it->data; + + stream_private->sdp_negotiation_concluded = TRUE; + if (stream_private->writable) { + // We've become writable. + sipe_core_media_stream_writable(SIPE_MEDIA_STREAM, TRUE); + } + } +#endif } struct sipe_media_call * process_incoming_invite_call(struct sipe_core_private *sipe_private, - struct sipmsg *msg) + struct sipmsg *msg, + const gchar *sdp) +{ + return(process_incoming_invite_call_parsed_sdp(sipe_private, + msg, + sdpmsg_parse_msg(sdp))); +} + +struct sipe_media_call * +process_incoming_invite_call_parsed_sdp(struct sipe_core_private *sipe_private, + struct sipmsg *msg, + struct sdpmsg *smsg) { struct sipe_media_call_private *call_private; - struct sdpmsg *smsg; gboolean has_new_media = FALSE; GSList *i; @@ -1420,6 +1577,7 @@ if (call && !is_media_session_msg(SIPE_MEDIA_CALL_PRIVATE, msg)) { sip_transport_response(sipe_private, msg, 486, "Busy Here", NULL); + sdpmsg_free(smsg); return NULL; } } @@ -1431,12 +1589,12 @@ if (sipe_strequal(SIPE_MEDIA_CALL->with, self)) { g_free(self); sip_transport_response(sipe_private, msg, 488, "Not Acceptable Here", NULL); + sdpmsg_free(smsg); return NULL; } g_free(self); } - smsg = sdpmsg_parse_msg(msg->body); if (!smsg) { transport_response_unsupported_sdp(sipe_private, msg); if (call_private) { @@ -1449,7 +1607,8 @@ gchar *with = parse_from(sipmsg_find_header(msg, "From")); SipeMediaCallFlags flags = 0; - if (strstr(msg->body, "m=data")) { + if (strstr(msg->body, "m=data") || + strstr(msg->body, "m=applicationsharing")) { flags |= SIPE_MEDIA_CALL_NO_UI; } @@ -1468,6 +1627,8 @@ sipmsg_free(call_private->invitation); call_private->invitation = sipmsg_copy(msg); + ssrc_range_update(&call_private->ssrc_ranges, smsg->media); + // Create any new media streams for (i = smsg->media; i; i = i->next) { struct sdpmedia *media = i->data; @@ -1476,17 +1637,23 @@ if ( media->port != 0 && !sipe_core_media_get_stream_by_id(SIPE_MEDIA_CALL, id)) { + guint32 ssrc_count = 0; + if (sipe_strequal(id, "audio")) type = SIPE_MEDIA_AUDIO; - else if (sipe_strequal(id, "video")) + else if (sipe_strequal(id, "video")) { type = SIPE_MEDIA_VIDEO; - else if (sipe_strequal(id, "data")) + ssrc_count = VIDEO_SSRC_COUNT; + } else if (sipe_strequal(id, "data")) + type = SIPE_MEDIA_APPLICATION; + else if (sipe_strequal(id, "applicationsharing")) type = SIPE_MEDIA_APPLICATION; else continue; sipe_media_stream_add(SIPE_MEDIA_CALL, id, type, - smsg->ice_version, FALSE); + smsg->ice_version, FALSE, + ssrc_count); has_new_media = TRUE; } } @@ -1557,6 +1724,9 @@ struct transaction *trans) { struct sipe_media_call_private *call_private; +#ifdef HAVE_XDATA + GSList *it; +#endif if (!sipe_media_send_ack(sipe_private, msg, trans)) return FALSE; @@ -1565,6 +1735,18 @@ sipe_backend_media_accept(SIPE_MEDIA_CALL->backend_private, FALSE); +#ifdef HAVE_XDATA + for (it = call_private->streams; it; it = it->next) { + struct sipe_media_stream_private *stream_private = it->data; + + stream_private->sdp_negotiation_concluded = TRUE; + if (stream_private->writable) { + // We've become writable. + sipe_core_media_stream_writable(SIPE_MEDIA_STREAM, TRUE); + } + } +#endif + return TRUE; } @@ -1613,7 +1795,8 @@ } static gboolean -maybe_retry_call_with_ice_version(struct sipe_media_call_private *call_private, +maybe_retry_call_with_ice_version(struct sipe_core_private *sipe_private, + struct sipe_media_call_private *call_private, SipeIceVersion ice_version, struct transaction *trans) { @@ -1640,8 +1823,10 @@ sipe_media_hangup(call_private); SIPE_DEBUG_INFO("Retrying call with ICEv%d.", ice_version == SIPE_ICE_DRAFT_6 ? 6 : 19); - sipe_media_initiate_call(call_private->sipe_private, with, - ice_version, with_video); + sipe_media_initiate_call(sipe_private, + with, + ice_version, + with_video); g_free(with); return TRUE; @@ -1698,7 +1883,10 @@ case 415: // OCS/Lync really sends response string with 'Mutipart' typo. if (sipe_strequal(msg->responsestr, "Mutipart mime in content type not supported by Archiving CDR service") && - maybe_retry_call_with_ice_version(call_private, SIPE_ICE_DRAFT_6, trans)) { + maybe_retry_call_with_ice_version(sipe_private, + call_private, + SIPE_ICE_DRAFT_6, + trans)) { return TRUE; } title = _("Unsupported media type"); @@ -1731,10 +1919,13 @@ retry_ice_version = SIPE_ICE_RFC_5245; } - if (maybe_retry_call_with_ice_version(call_private, retry_ice_version, trans)) { + if (maybe_retry_call_with_ice_version(sipe_private, + call_private, + retry_ice_version, + trans)) { return TRUE; } - // Break intentionally omitted + SIPE_FALLTHROUGH } default: title = _("Error occurred"); @@ -1771,6 +1962,7 @@ return FALSE; } + ssrc_range_update(&call_private->ssrc_ranges, smsg->media); apply_remote_message(call_private, smsg); sdpmsg_free(smsg); @@ -2161,6 +2353,7 @@ sipe_media_stream_is_writable(struct sipe_media_stream *stream) { return SIPE_MEDIA_STREAM_PRIVATE->writable && + SIPE_MEDIA_STREAM_PRIVATE->sdp_negotiation_concluded && g_queue_is_empty(SIPE_MEDIA_STREAM_PRIVATE->write_queue); } #endif diff -Nru pidgin-sipe-1.21.1/src/core/sipe-media.h pidgin-sipe-1.22.1/src/core/sipe-media.h --- pidgin-sipe-1.21.1/src/core/sipe-media.h 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/src/core/sipe-media.h 2017-06-11 15:41:22.000000000 +0000 @@ -4,7 +4,7 @@ * pidgin-sipe * * Copyright (C) 2010 Jakub Adam - * Copyright (C) 2016 SIPE Project + * Copyright (C) 2016-2017 SIPE Project * * 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 @@ -22,6 +22,7 @@ */ /* Forward declarations */ +struct sdpmsg; struct sipmsg; struct sipe_core_private; struct sipe_media_call_private; @@ -57,26 +58,47 @@ * @param ice_version (in) a version of ICE to use when negotiating the * connection. * @param initiator (in) @c TRUE if our client is the initiator of the stream. + * @param ssrc_count (in) number of RTP Synchronization source identifiers to + * allocate for the stream. * * @return a new @c sipe_media_stream structure or @c NULL on error. */ struct sipe_media_stream * sipe_media_stream_add(struct sipe_media_call *call, const gchar *id, SipeMediaType type, SipeIceVersion ice_version, - gboolean initiator); + gboolean initiator, guint32 ssrc_count); /** * Handles incoming SIP INVITE message to start a media session. * * @param sipe_private (in) SIPE core data. * @param msg (in) a SIP INVITE message + * @param sdp (in) media session description string * * @return @c sipe_media_call structure created or updated by @c msg. * The function returns @c NULL on error or if the call was rejected. */ struct sipe_media_call * process_incoming_invite_call(struct sipe_core_private *sipe_private, - struct sipmsg *msg); + struct sipmsg *msg, + const gchar *sdp); + +/** + * Handles incoming SIP INVITE message to start a media session. + * + * @param sipe_private (in) SIPE core data. + * @param msg (in) a SIP INVITE message + * @param smsg (in) parsed media session description; the function takes + * ownership of the sdpmsg structure and will free it when no longer + * needed. + * + * @return @c sipe_media_call structure created or updated by @c msg. + * The function returns @c NULL on error or if the call was rejected. + */ +struct sipe_media_call * +process_incoming_invite_call_parsed_sdp(struct sipe_core_private *sipe_private, + struct sipmsg *msg, + struct sdpmsg *smsg); /** * Handles incoming SIP CANCEL message. diff -Nru pidgin-sipe-1.21.1/src/core/sipe-msrtp.c pidgin-sipe-1.22.1/src/core/sipe-msrtp.c --- pidgin-sipe-1.21.1/src/core/sipe-msrtp.c 1970-01-01 00:00:00.000000000 +0000 +++ pidgin-sipe-1.22.1/src/core/sipe-msrtp.c 2017-06-11 15:41:22.000000000 +0000 @@ -0,0 +1,284 @@ +/** + * @file sipe-msrtp.c + * + * pidgin-sipe + * + * Copyright (C) 2016 SIPE Project + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include + +#include + +#include "sipe-core.h" + +#define _SIPE_WRITE(where, idx, size, shift, value) \ + ((guint8 *) where)[idx] = (((guint##size)value) >> shift) & 0xff + +#define SIPE_WRITE_UINT8(where, value) \ + _SIPE_WRITE(where++, 0, 8, 0, value); + +#define SIPE_WRITE_UINT16_BE(where, value) \ + _SIPE_WRITE(where, 0, 16, 8, value); \ + _SIPE_WRITE(where, 1, 16, 0, value); \ + where += 2; + +#define SIPE_WRITE_UINT32_BE(where, value) \ + _SIPE_WRITE(where, 0, 32, 24, value); \ + _SIPE_WRITE(where, 1, 32, 16, value); \ + _SIPE_WRITE(where, 2, 32, 8, value); \ + _SIPE_WRITE(where, 3, 32, 0, value); \ + where += 4; + +#define SIPE_WRITE_UINT64_BE(where, value) \ + _SIPE_WRITE(where, 0, 64, 56, value); \ + _SIPE_WRITE(where, 1, 64, 48, value); \ + _SIPE_WRITE(where, 2, 64, 40, value); \ + _SIPE_WRITE(where, 3, 64, 32, value); \ + _SIPE_WRITE(where, 4, 64, 24, value); \ + _SIPE_WRITE(where, 5, 64, 16, value); \ + _SIPE_WRITE(where, 6, 64, 8, value); \ + _SIPE_WRITE(where, 7, 64, 0, value); \ + where += 8; + +enum +{ + VSR_FLAG_NONE = 0, + VSR_FLAG_H264_CGS_REWRITE = 1, + VSR_FLAG_H264_CONSTRAINED_PROFILE_ONLY = 2, + VSR_FLAG_RT_NO_SP_FRAMES = 4, + VSR_FLAG_H264_NO_SEAMLESS_RESOLUTION_CHANGE = 8 +}; + +enum +{ + VSR_ASPECT_4_BY_3 = 1, + VSR_ASPECT_16_BY_9 = 2, + VSR_ASPECT_1_BY_1 = 4, + VSR_ASPECT_3_BY_4 = 8, + VSR_ASPECT_9_BY_16 = 16, + VSR_ASPECT_20_BY_3 = 32, +}; + +enum +{ + VSR_FPS_7_5 = 1, + VSR_FPS_12_5 = 2, + VSR_FPS_15 = 4, + VSR_FPS_25 = 8, + VSR_FPS_30 = 16, + VSR_FPS_50 = 32, + VSR_FPS_60 = 64 +}; + +enum +{ + NAL_UNIT_TYPE_SEI = 6, + NAL_UNIT_TYPE_PACSI = 30 +}; + +enum +{ + MS_LD_FPS_IDX_7_5 = 0, + MS_LD_FPS_IDX_12_5 = 1, + MS_LD_FPS_IDX_15 = 2, + MS_LD_FPS_IDX_25 = 3, + MS_LD_FPS_IDX_30 = 4, + MS_LD_FPS_IDX_50 = 5, + MS_LD_FPS_IDX_60 = 6 +}; + +void +sipe_core_msrtp_write_video_source_request(guint8 *buffer, + guint8 payload_type) +{ + static guint8 bit_rate_histogram[] = { + 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + }; + + static guint8 quality_report_histogram[] = { + 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + }; + + /* VSR FCI field - from [MS-RTP] 2.2.12.2 */ + + /* Header */ + + SIPE_WRITE_UINT16_BE(buffer, 0x1); // AFB Type + // Length + SIPE_WRITE_UINT16_BE(buffer, SIPE_MSRTP_VSR_HEADER_LEN + + SIPE_MSRTP_VSR_ENTRY_LEN); + // Requested Media Source ID + SIPE_WRITE_UINT32_BE(buffer, SIPE_MSRTP_VSR_SOURCE_ANY); + SIPE_WRITE_UINT16_BE(buffer, 1); // Request Id + SIPE_WRITE_UINT16_BE(buffer, 0); // Reserve1 + SIPE_WRITE_UINT8(buffer, 0); // Version + SIPE_WRITE_UINT8(buffer, 0 << 7); // Keyframe (1bit) + Reserve2 + SIPE_WRITE_UINT8(buffer, 1); // Number of Entries + SIPE_WRITE_UINT8(buffer, SIPE_MSRTP_VSR_ENTRY_LEN); // Entry Length + SIPE_WRITE_UINT32_BE(buffer, 0x0); // Reserve3 + + /* Entry */ + + SIPE_WRITE_UINT8(buffer, payload_type); // Payload Type + SIPE_WRITE_UINT8(buffer, 1); // UCConfig Mode + SIPE_WRITE_UINT8(buffer, VSR_FLAG_NONE); // Flags + SIPE_WRITE_UINT8(buffer, VSR_ASPECT_4_BY_3); // Aspect Ratio Bit Mask + SIPE_WRITE_UINT16_BE(buffer, 432); // Maximum Width + SIPE_WRITE_UINT16_BE(buffer, 432); // Maximum Height + SIPE_WRITE_UINT32_BE(buffer, 350000); // Minimum bit rate + SIPE_WRITE_UINT32_BE(buffer, 0); // Reserve + SIPE_WRITE_UINT32_BE(buffer, 10000); // Bit rate per level + // Bit rate Histogram + memcpy(buffer, bit_rate_histogram, sizeof (bit_rate_histogram)); + buffer += sizeof (bit_rate_histogram); + SIPE_WRITE_UINT32_BE(buffer, VSR_FPS_15); // Frame rate bit mask + SIPE_WRITE_UINT16_BE(buffer, 0); // Number of MUST instances + SIPE_WRITE_UINT16_BE(buffer, 1); // Number of MAY instances + // Quality Report Histogram + memcpy(buffer, quality_report_histogram, + sizeof (quality_report_histogram)); + buffer += sizeof (quality_report_histogram); + SIPE_WRITE_UINT32_BE(buffer, 103680); // Maximum number of pixels +} + +static void +write_nal_unit_header(guint8 *dest, gboolean f_bit, guint8 nal_ref_idc, + guint8 type) +{ + *dest = f_bit ? 0x80 : 0x00; + *dest |= nal_ref_idc << 5; + *dest |= type; +} + +static void +write_ms_layer_description(guint8 *buffer, guint16 width, guint16 height, + guint32 bitrate, guint8 framerate_idx, + gboolean base_layer, guint16 prid, + gboolean constrained_baseline) +{ + // Coded width and height + SIPE_WRITE_UINT16_BE(buffer, width); + SIPE_WRITE_UINT16_BE(buffer, height); + + // Display width and height + SIPE_WRITE_UINT16_BE(buffer, width); + SIPE_WRITE_UINT16_BE(buffer, height); + + SIPE_WRITE_UINT32_BE(buffer, bitrate); + + *buffer = framerate_idx << 3; + *buffer |= base_layer ? 0 : 1; + ++buffer; + + *buffer = prid << 2; + *buffer |= (constrained_baseline ? 1 : 0) << 1; +} + +gsize +sipe_core_msrtp_write_video_scalability_info(guint8 *buffer, guint8 nal_count) +{ + static const guint8 MS_STREAM_LAYOUT_SEI_UUID[] = { + 0x13, 0x9f, 0xb1, 0xa9, 0x44, 0x6a, 0x4d, 0xec, 0x8c, 0xbf, + 0x65, 0xb1, 0xe1, 0x2d, 0x2c, 0xfd + }; + + static const guint8 MS_BITSTREAM_INFO_SEI_UUID[] = { + 0x05, 0xfb, 0xc6, 0xb9, 0x5a, 0x80, 0x40, 0xe5, 0xa2, 0x2a, + 0xab, 0x40, 0x20, 0x26, 0x7e, 0x26 + }; + + guint8 *ptr = buffer; + + // Write PACSI (RFC6190 section 4.9) + SIPE_WRITE_UINT32_BE(ptr, 77); // Length of the NAL + + write_nal_unit_header(ptr++, FALSE, 3, NAL_UNIT_TYPE_PACSI); + + *ptr = 1 << 7; // Reserved bit = 1 + *ptr |= 1 << 6; // I-bit = 1 if any aggregated unit has it set to 1 + *ptr |= 0; // Priority = 0 + ++ptr; + + *ptr = 1 << 7; // No Inter Layer Prediction = True + *ptr |= 0 << 4; // Dependency ID = 0 + *ptr |= 0; // Quality ID + ++ptr; + + *ptr = 0; // Temporal ID + *ptr |= 0 << 4; // Use Ref Base Picture = False + *ptr |= 0 << 3; // Discardable = False + *ptr |= 1 << 2; // Output = True + *ptr |= 3; // Reserved + ++ptr; + + // X|Y|T|A|P|C|S|E flags: DONC & First NAL = True + SIPE_WRITE_UINT8(ptr, 0x22); + + SIPE_WRITE_UINT16_BE(ptr, 1); // Cross Session Decoder Order Number + + // Stream Layout SEI Message (MS-H264PF section 2.2.5) + SIPE_WRITE_UINT16_BE(ptr, 45); // Size of the NAL + + write_nal_unit_header(ptr++, FALSE, 0, NAL_UNIT_TYPE_SEI); + + SIPE_WRITE_UINT8(ptr, 5); // Payload type (user data unregistered) + SIPE_WRITE_UINT8(ptr, 42); // Payload size + + memcpy(ptr, MS_STREAM_LAYOUT_SEI_UUID, + sizeof (MS_STREAM_LAYOUT_SEI_UUID)); + ptr += sizeof (MS_STREAM_LAYOUT_SEI_UUID); + + // Layer Presence - layer with PRID 0 present + SIPE_WRITE_UINT64_BE(ptr, 0x0100000000000000); + + SIPE_WRITE_UINT8(ptr, 1); // Layer Description Present = True + SIPE_WRITE_UINT8(ptr, 16); // Layer Description Size + + write_ms_layer_description(ptr, 212, 160, 50250, MS_LD_FPS_IDX_7_5, + TRUE, 0, TRUE); + ptr += 16; + + // MS Bitstream Info SEI Message ([MS-H264PF] section 2.2.7) + SIPE_WRITE_UINT16_BE(ptr, 21); // Size of the NAL + + write_nal_unit_header(ptr++, FALSE, 0, NAL_UNIT_TYPE_SEI); + + SIPE_WRITE_UINT8(ptr, 5); // Payload type (user data unregistered) + SIPE_WRITE_UINT8(ptr, 18); // Payload size + + memcpy(ptr, MS_BITSTREAM_INFO_SEI_UUID, + sizeof (MS_BITSTREAM_INFO_SEI_UUID)); + ptr += sizeof (MS_BITSTREAM_INFO_SEI_UUID); + + /* Reference frame count. This should increment with each reference + * frame, but clients apparently don't care about the value. */ + SIPE_WRITE_UINT8(ptr, 1); + // Number of NAL units described by this PACSI NAL unit. + SIPE_WRITE_UINT8(ptr, nal_count); + + return ptr - buffer; +} + +/* + Local Variables: + mode: c + c-file-style: "bsd" + indent-tabs-mode: t + tab-width: 8 + End: +*/ diff -Nru pidgin-sipe-1.21.1/src/core/sipe-notify.c pidgin-sipe-1.22.1/src/core/sipe-notify.c --- pidgin-sipe-1.21.1/src/core/sipe-notify.c 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/src/core/sipe-notify.c 2017-06-11 15:41:22.000000000 +0000 @@ -3,7 +3,7 @@ * * pidgin-sipe * - * Copyright (C) 2011-2015 SIPE Project + * Copyright (C) 2011-2017 SIPE Project * * * This program is free software; you can redistribute it and/or modify @@ -730,7 +730,7 @@ gchar *hash = sipe_xml_data(sipe_xml_child(node, "hash")); gboolean found = FALSE; - if (!is_empty(uri) && !is_empty(hash)) { + if (!is_empty(photo_url) && !is_empty(hash)) { sipe_buddy_update_photo(sipe_private, uri, hash, @@ -1183,6 +1183,13 @@ gchar **item_groups; int i = 0; + /* "name" attribute is a contact alias which user can manually assign by + * renaming the item in the contact list. Empty string means no alias + * and the display name from the contact card should be used instead. */ + if (name && strlen(name) == 0) { + name = NULL; + } + /* assign to group Other Contacts if nothing else received */ tmp = g_strdup(sipe_xml_attribute(node, "groups")); if (is_empty(tmp)) { @@ -1217,7 +1224,7 @@ name); } else { SIPE_DEBUG_INFO("No group found for contact %s! Unable to add to buddy list", - name); + uri); } i++; @@ -1272,10 +1279,10 @@ gboolean migrated = sipe_strcase_equal(ucsmode, "migrated"); SIPE_CORE_PRIVATE_FLAG_SET(LYNC2013); - SIPE_DEBUG_INFO_NOFORMAT("contact list contains 'ucsmode' attribute (indicates Lync 2013+)"); + SIPE_LOG_INFO_NOFORMAT("sipe_process_roaming_contacts: contact list contains 'ucsmode' attribute (indicates Lync 2013+)"); if (migrated) - SIPE_DEBUG_INFO_NOFORMAT("contact list has been migrated to Unified Contact Store (UCS)"); + SIPE_LOG_INFO_NOFORMAT("sipe_process_roaming_contacts: contact list has been migrated to Unified Contact Store (UCS)"); sipe_ucs_init(sipe_private, migrated); } diff -Nru pidgin-sipe-1.21.1/src/core/sipe-ocs2005.c pidgin-sipe-1.22.1/src/core/sipe-ocs2005.c --- pidgin-sipe-1.21.1/src/core/sipe-ocs2005.c 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/src/core/sipe-ocs2005.c 2017-06-11 15:41:22.000000000 +0000 @@ -3,7 +3,7 @@ * * pidgin-sipe * - * Copyright (C) 2011-2015 SIPE Project + * Copyright (C) 2011-2016 SIPE Project * * * This program is free software; you can redistribute it and/or modify @@ -31,6 +31,7 @@ #include "sipe-common.h" #include "sip-soap.h" +#include "sip-transport.h" #include "sipe-backend.h" #include "sipe-buddy.h" #include "sipe-cal.h" @@ -289,7 +290,7 @@ const gchar *note_pub = NULL; gchar *states = NULL; gchar *calendar_data = NULL; - gchar *epid = get_epid(sipe_private); + const gchar *epid = sip_transport_epid(sipe_private); gchar *from = sip_uri_self(sipe_private); time_t now = time(NULL); gchar *since_time_str = sipe_utils_time_to_str(now); @@ -397,7 +398,6 @@ g_free(states); g_free(calendar_data); g_free(since_time_str); - g_free(epid); sip_soap_raw_request_cb(sipe_private, from, body, NULL, NULL); diff -Nru pidgin-sipe-1.21.1/src/core/sipe-ocs2007.c pidgin-sipe-1.22.1/src/core/sipe-ocs2007.c --- pidgin-sipe-1.21.1/src/core/sipe-ocs2007.c 2016-05-30 04:56:54.000000000 +0000 +++ pidgin-sipe-1.22.1/src/core/sipe-ocs2007.c 2017-06-11 15:41:22.000000000 +0000 @@ -3,7 +3,7 @@ * * pidgin-sipe * - * Copyright (C) 2011-2015 SIPE Project + * Copyright (C) 2011-2017 SIPE Project * * * This program is free software; you can redistribute it and/or modify @@ -638,7 +638,6 @@ sipe_send_container_members_prepare(current_container_id, container->version, "remove", type, value, &container_xmls); /* remove member from our cache, to be able to recalculate AL below */ container->members = g_slist_remove(container->members, member); - current_container_id = -1; } } } @@ -1350,6 +1349,21 @@ return res; } +#ifdef HAVE_VV +#define SIPE_PUB_XML_DEVICE_VV \ + ""\ + "