diff -Nru glib-networking-2.48.0/configure glib-networking-2.48.2/configure --- glib-networking-2.48.0/configure 2016-03-21 21:51:20.000000000 +0000 +++ glib-networking-2.48.2/configure 2016-05-09 14:03:18.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for glib-networking 2.48.0. +# Generated by GNU Autoconf 2.69 for glib-networking 2.48.2. # # Report bugs to . # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='glib-networking' PACKAGE_TARNAME='glib-networking' -PACKAGE_VERSION='2.48.0' -PACKAGE_STRING='glib-networking 2.48.0' +PACKAGE_VERSION='2.48.2' +PACKAGE_STRING='glib-networking 2.48.2' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=glib&component=network' PACKAGE_URL='' @@ -1423,7 +1423,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures glib-networking 2.48.0 to adapt to many kinds of systems. +\`configure' configures glib-networking 2.48.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1493,7 +1493,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of glib-networking 2.48.0:";; + short | recursive ) echo "Configuration of glib-networking 2.48.2:";; esac cat <<\_ACEOF @@ -1642,7 +1642,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -glib-networking configure 2.48.0 +glib-networking configure 2.48.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2011,7 +2011,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by glib-networking $as_me 2.48.0, which was +It was created by glib-networking $as_me 2.48.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2879,7 +2879,7 @@ # Define the identity of the package. PACKAGE='glib-networking' - VERSION='2.48.0' + VERSION='2.48.2' cat >>confdefs.h <<_ACEOF @@ -14712,7 +14712,7 @@ ENABLE_ALWAYS_BUILD_TESTS_FALSE= fi - if test "$ENABLE_INSTALLED_TESTS" == "1"; then + if test "$ENABLE_INSTALLED_TESTS" = "1"; then installed_test_metadir=${datadir}/installed-tests/glib-networking installed_testdir=${libexecdir}/installed-tests/glib-networking @@ -15903,7 +15903,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by glib-networking $as_me 2.48.0, which was +This file was extended by glib-networking $as_me 2.48.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15969,7 +15969,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -glib-networking config.status 2.48.0 +glib-networking config.status 2.48.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru glib-networking-2.48.0/configure.ac glib-networking-2.48.2/configure.ac --- glib-networking-2.48.0/configure.ac 2016-03-21 21:50:14.000000000 +0000 +++ glib-networking-2.48.2/configure.ac 2016-05-09 13:49:35.000000000 +0000 @@ -1,7 +1,7 @@ AC_PREREQ(2.65) AC_CONFIG_MACRO_DIR([m4]) -AC_INIT([glib-networking],[2.48.0],[http://bugzilla.gnome.org/enter_bug.cgi?product=glib&component=network]) +AC_INIT([glib-networking],[2.48.2],[http://bugzilla.gnome.org/enter_bug.cgi?product=glib&component=network]) AC_CONFIG_SRCDIR([proxy/libproxy/glibproxyresolver.h]) AC_CONFIG_HEADERS([config.h]) diff -Nru glib-networking-2.48.0/debian/changelog glib-networking-2.48.2/debian/changelog --- glib-networking-2.48.0/debian/changelog 2016-03-24 14:37:32.000000000 +0000 +++ glib-networking-2.48.2/debian/changelog 2016-05-18 09:26:57.000000000 +0000 @@ -1,3 +1,30 @@ +glib-networking (2.48.2-1~ubuntu16.04.1) xenial; urgency=medium + + * Backport from yakkety/unstable to 16.04 (LP: #1581480), with one change + - Keep the static -dbg package. + + -- Iain Lane Wed, 18 May 2016 10:26:06 +0100 + +glib-networking (2.48.2-1) unstable; urgency=medium + + * New upstream release. + * Install systemd user service for the glib-pacrunner D-Bus session service. + + -- Michael Biebl Tue, 10 May 2016 23:59:04 +0200 + +glib-networking (2.48.1-1) unstable; urgency=medium + + * New upstream release. + * Drop glib-networking-dbg package now that we have automatic dbgsym + packages. + * Ensure proper upgrade from glib-networking-dbg to new dbgsym packages by + using dh_strip --dbgsym-migration. Bump Build-Depends on debhelper + accordingly. + * Bump debhelper compatibility level to 9. + * Bump Standards-Version to 3.9.8. + + -- Michael Biebl Tue, 03 May 2016 00:49:56 +0200 + glib-networking (2.48.0-1) unstable; urgency=medium * New upstream release. diff -Nru glib-networking-2.48.0/debian/compat glib-networking-2.48.2/debian/compat --- glib-networking-2.48.0/debian/compat 2010-12-18 00:59:32.000000000 +0000 +++ glib-networking-2.48.2/debian/compat 2016-05-02 22:47:50.000000000 +0000 @@ -1 +1 @@ -8 +9 diff -Nru glib-networking-2.48.0/debian/control glib-networking-2.48.2/debian/control --- glib-networking-2.48.0/debian/control 2016-03-24 14:38:08.000000000 +0000 +++ glib-networking-2.48.2/debian/control 2016-05-18 09:27:07.000000000 +0000 @@ -5,9 +5,10 @@ Source: glib-networking Section: libs Priority: optional -Maintainer: Debian GNOME Maintainers -Uploaders: Andreas Henriksson , Emilio Pozuelo Monfort , Iain Lane , Michael Biebl -Build-Depends: debhelper (>= 8.1.3), +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers +Uploaders: Andreas Henriksson , Debian GNOME Maintainers , Iain Lane , Michael Biebl +Build-Depends: debhelper (>= 9.20160114), cdbs (>= 0.4.93), dh-autoreconf, gnome-pkg-tools, @@ -20,7 +21,7 @@ intltool (>= 0.41.1-2) Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/glib-networking Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/glib-networking/ -Standards-Version: 3.9.7 +Standards-Version: 3.9.8 Package: glib-networking Architecture: any diff -Nru glib-networking-2.48.0/debian/control.in glib-networking-2.48.2/debian/control.in --- glib-networking-2.48.0/debian/control.in 2016-03-16 18:56:04.000000000 +0000 +++ glib-networking-2.48.2/debian/control.in 2016-05-18 09:27:06.000000000 +0000 @@ -1,9 +1,10 @@ Source: glib-networking Section: libs Priority: optional -Maintainer: Debian GNOME Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ -Build-Depends: debhelper (>= 8.1.3), +Build-Depends: debhelper (>= 9.20160114), cdbs (>= 0.4.93), dh-autoreconf, gnome-pkg-tools, @@ -16,7 +17,7 @@ intltool (>= 0.41.1-2) Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/glib-networking Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/glib-networking/ -Standards-Version: 3.9.7 +Standards-Version: 3.9.8 Package: glib-networking Architecture: any diff -Nru glib-networking-2.48.0/debian/glib-networking-services.install glib-networking-2.48.2/debian/glib-networking-services.install --- glib-networking-2.48.0/debian/glib-networking-services.install 2013-09-25 11:34:46.000000000 +0000 +++ glib-networking-2.48.2/debian/glib-networking-services.install 2016-05-10 21:58:31.000000000 +0000 @@ -1,2 +1,3 @@ usr/lib/glib-networking/glib-pacrunner +usr/lib/systemd/user/glib-pacrunner.service usr/share/dbus-1 diff -Nru glib-networking-2.48.0/glib-networking.mk glib-networking-2.48.2/glib-networking.mk --- glib-networking-2.48.0/glib-networking.mk 2015-02-05 14:22:59.000000000 +0000 +++ glib-networking-2.48.2/glib-networking.mk 2016-04-25 15:09:07.000000000 +0000 @@ -6,6 +6,7 @@ AM_CPPFLAGS = \ -DG_LOG_DOMAIN=\"GLib-Net\" \ + -DLOCALE_DIR=\""$(localedir)"\" \ -DG_DISABLE_DEPRECATED \ $(GLIB_CFLAGS) \ $(NULL) diff -Nru glib-networking-2.48.0/m4/glibtests.m4 glib-networking-2.48.2/m4/glibtests.m4 --- glib-networking-2.48.0/m4/glibtests.m4 2015-02-05 14:22:59.000000000 +0000 +++ glib-networking-2.48.2/m4/glibtests.m4 2016-04-25 15:11:34.000000000 +0000 @@ -21,7 +21,7 @@ *) AC_MSG_ERROR([bad value ${enableval} for --enable-always-build-tests]) ;; esac]) AM_CONDITIONAL([ENABLE_ALWAYS_BUILD_TESTS], test "$ENABLE_ALWAYS_BUILD_TESTS" = "1") - if test "$ENABLE_INSTALLED_TESTS" == "1"; then + if test "$ENABLE_INSTALLED_TESTS" = "1"; then AC_SUBST(installed_test_metadir, [${datadir}/installed-tests/]AC_PACKAGE_NAME) AC_SUBST(installed_testdir, [${libexecdir}/installed-tests/]AC_PACKAGE_NAME) fi diff -Nru glib-networking-2.48.0/Makefile.in glib-networking-2.48.2/Makefile.in --- glib-networking-2.48.0/Makefile.in 2016-03-21 21:51:19.000000000 +0000 +++ glib-networking-2.48.2/Makefile.in 2016-05-09 14:03:18.000000000 +0000 @@ -635,6 +635,7 @@ giomoduledir = $(GIO_MODULE_DIR) AM_CPPFLAGS = \ -DG_LOG_DOMAIN=\"GLib-Net\" \ + -DLOCALE_DIR=\""$(localedir)"\" \ -DG_DISABLE_DEPRECATED \ $(GLIB_CFLAGS) \ $(NULL) diff -Nru glib-networking-2.48.0/NEWS glib-networking-2.48.2/NEWS --- glib-networking-2.48.0/NEWS 2016-03-21 21:50:33.000000000 +0000 +++ glib-networking-2.48.2/NEWS 2016-05-09 13:54:23.000000000 +0000 @@ -1,8 +1,22 @@ +2.48.2 +====== + * gnutls: Fixed an infinite loop if a server sent two identical + copies of its CA certificate [#765317, Carlos Garcia Campos] + + * New/updated translations: Occitan, Scottish Gaelic + +2.48.1 +====== + * Fixed translations in non-UTF-8 domains [#765466, Ting-Wei Lan] + + * Fixed bash-ism in configure [#765396, Patrick Welche] + + * Updated translations: Friulian + 2.48.0 ====== * New stable release. (No changes since 2.47.90) - 2.47.90 ======= * gnutls: The non-PKCS#11 TLS plugin now uses gnutls's certificate diff -Nru glib-networking-2.48.0/po/fur.po glib-networking-2.48.2/po/fur.po --- glib-networking-2.48.0/po/fur.po 2015-09-21 15:07:41.000000000 +0000 +++ glib-networking-2.48.2/po/fur.po 2016-04-25 15:01:57.000000000 +0000 @@ -8,121 +8,120 @@ "Project-Id-Version: glib-networking master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=glib&keywords=I18N+L10N&component=network\n" -"POT-Creation-Date: 2015-01-20 18:47+0000\n" -"PO-Revision-Date: 2015-01-20 20:44+0100\n" +"POT-Creation-Date: 2016-04-08 06:55+0000\n" +"PO-Revision-Date: 2016-04-08 18:19+0200\n" "Last-Translator: Fabio Tomat \n" "Language-Team: Friulian \n" "Language: fur\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.5.4\n" +"X-Generator: Poedit 1.8.5\n" #: ../proxy/libproxy/glibproxyresolver.c:157 msgid "Proxy resolver internal error." msgstr "Erôr interni dal resolver proxy." -#: ../tls/gnutls/gtlscertificate-gnutls.c:173 +#: ../tls/gnutls/gtlscertificate-gnutls.c:176 #, c-format msgid "Could not parse DER certificate: %s" msgstr "Impussibil analizâ il certificât DER: %s" -#: ../tls/gnutls/gtlscertificate-gnutls.c:194 +#: ../tls/gnutls/gtlscertificate-gnutls.c:197 #, c-format msgid "Could not parse PEM certificate: %s" msgstr "Impussibil analizâ il certificât PEM: %s" -#: ../tls/gnutls/gtlscertificate-gnutls.c:225 +#: ../tls/gnutls/gtlscertificate-gnutls.c:228 #, c-format msgid "Could not parse DER private key: %s" msgstr "Impussibil analizâ la clâf privade DER: %s" -#: ../tls/gnutls/gtlscertificate-gnutls.c:256 +#: ../tls/gnutls/gtlscertificate-gnutls.c:259 #, c-format msgid "Could not parse PEM private key: %s" msgstr "Impussibil analizâ la clâf privade PEM: %s" -#: ../tls/gnutls/gtlscertificate-gnutls.c:296 +#: ../tls/gnutls/gtlscertificate-gnutls.c:299 msgid "No certificate data provided" msgstr "Nissun dât di certificât dât" -#: ../tls/gnutls/gtlsclientconnection-gnutls.c:324 +#: ../tls/gnutls/gtlsclientconnection-gnutls.c:375 msgid "Server required TLS certificate" msgstr "Il server al domande un certificât TLS" -#: ../tls/gnutls/gtlsconnection-gnutls.c:305 +#: ../tls/gnutls/gtlsconnection-gnutls.c:323 #, c-format msgid "Could not create TLS connection: %s" msgstr "Impussibil creâ la conession TLS: %s" -#: ../tls/gnutls/gtlsconnection-gnutls.c:577 +#: ../tls/gnutls/gtlsconnection-gnutls.c:585 msgid "Connection is closed" -msgstr "La conession a je sierade" +msgstr "La conession e je sierade" -#: ../tls/gnutls/gtlsconnection-gnutls.c:640 -#: ../tls/gnutls/gtlsconnection-gnutls.c:1509 +#: ../tls/gnutls/gtlsconnection-gnutls.c:658 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1537 msgid "Operation would block" -msgstr "Le operazion a podares blocasi" +msgstr "Le operazion e podarès blocâsi" -#: ../tls/gnutls/gtlsconnection-gnutls.c:779 -#: ../tls/gnutls/gtlsconnection-gnutls.c:818 +#: ../tls/gnutls/gtlsconnection-gnutls.c:808 +#: ../tls/gnutls/gtlsconnection-gnutls.c:847 msgid "Peer failed to perform TLS handshake" msgstr "Il grop nol è rivât a eseguî il handshake TLS" -#: ../tls/gnutls/gtlsconnection-gnutls.c:797 +#: ../tls/gnutls/gtlsconnection-gnutls.c:826 msgid "Peer requested illegal TLS rehandshake" msgstr "Il grop al à domandât un rehandshake TLS no lecit" -#: ../tls/gnutls/gtlsconnection-gnutls.c:824 +#: ../tls/gnutls/gtlsconnection-gnutls.c:853 msgid "TLS connection closed unexpectedly" msgstr "Sieradure inspietade de conession TLS" -#: ../tls/gnutls/gtlsconnection-gnutls.c:834 +#: ../tls/gnutls/gtlsconnection-gnutls.c:863 msgid "TLS connection peer did not send a certificate" -msgstr "Il grop di conession TLS nol a inviât un certificât" +msgstr "Il grop di conession TLS nol à inviât un certificât" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1217 #: ../tls/gnutls/gtlsconnection-gnutls.c:1250 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1283 #, c-format msgid "Error performing TLS handshake: %s" msgstr "Erôr tal eseguî il handshake TLS: %s" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1260 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1293 msgid "Server did not return a valid TLS certificate" -msgstr "Il server nol a tornât un certificât TLS valit" +msgstr "Il server nol à tornât un certificât TLS valit" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1335 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1363 msgid "Unacceptable TLS certificate" msgstr "certificât TLS no acetabil" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1543 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1571 #, c-format msgid "Error reading data from TLS socket: %s" msgstr "Erôr tal lei dâts tal socket TLS: %s" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1572 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1600 #, c-format msgid "Error writing data to TLS socket: %s" msgstr "Erôr tal scrivi dâts tal socket TLS: %s" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1624 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1664 #, c-format msgid "Error performing TLS close: %s" msgstr "Erôr tal sierâ TLS: %s" -#: ../tls/gnutls/gtlsserverconnection-gnutls.c:103 +#: ../tls/gnutls/gtlsserverconnection-gnutls.c:107 msgid "Certificate has no private key" -msgstr "Il certificât a nol a une clâf privade" +msgstr "Il certificât nol à une clâf privade" -#: ../tls/pkcs11/gpkcs11pin.c:108 +#: ../tls/pkcs11/gpkcs11pin.c:111 msgid "" -"This is the last chance to enter the PIN correctly before the token is " -"locked." +"This is the last chance to enter the PIN correctly before the token is locked." msgstr "" -"Cheste a je l'ultime pussibilitât par inserî il PIN coret prime che al vegni " +"Cheste e je la ultime pussibilitât par inserî il PIN coret prime che al vegni " "blocât il token." -#: ../tls/pkcs11/gpkcs11pin.c:110 +#: ../tls/pkcs11/gpkcs11pin.c:113 msgid "" "Several PIN attempts have been incorrect, and the token will be locked after " "further failures." @@ -130,23 +129,23 @@ "A son stâts fats une vore di tentatîfs par meti il PIN, il token al sarà " "blocât dopo altris faliments." -#: ../tls/pkcs11/gpkcs11pin.c:112 +#: ../tls/pkcs11/gpkcs11pin.c:115 msgid "The PIN entered is incorrect." -msgstr "Il PIN dât a nol è coret." +msgstr "Il PIN dât nol è coret." -#: ../tls/pkcs11/gpkcs11slot.c:446 +#: ../tls/pkcs11/gpkcs11slot.c:449 msgid "Module" msgstr "Modul" -#: ../tls/pkcs11/gpkcs11slot.c:447 +#: ../tls/pkcs11/gpkcs11slot.c:450 msgid "PKCS#11 Module Pointer" msgstr "Pontadôr modul PKCS#11" -#: ../tls/pkcs11/gpkcs11slot.c:454 +#: ../tls/pkcs11/gpkcs11slot.c:457 msgid "Slot ID" msgstr "ID dal slot" -#: ../tls/pkcs11/gpkcs11slot.c:455 +#: ../tls/pkcs11/gpkcs11slot.c:458 msgid "PKCS#11 Slot Identifier" msgstr "Identificadôr Slot PKCS#11" diff -Nru glib-networking-2.48.0/po/gd.po glib-networking-2.48.2/po/gd.po --- glib-networking-2.48.0/po/gd.po 1970-01-01 00:00:00.000000000 +0000 +++ glib-networking-2.48.2/po/gd.po 2016-05-09 13:41:40.000000000 +0000 @@ -0,0 +1,153 @@ +# Scottish Gaelic translation for glib-networking. +# Copyright (C) 2016 glib-networking's COPYRIGHT HOLDER +# This file is distributed under the same license as the glib-networking package. +# GunChleoc , 2016. +msgid "" +msgstr "" +"Project-Id-Version: glib-networking master\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=glib&k" +"eywords=I18N+L10N&component=network\n" +"POT-Creation-Date: 2016-04-28 06:59+0000\n" +"PO-Revision-Date: 2016-04-28 15:01+0100\n" +"Last-Translator: GunChleoc \n" +"Language-Team: Fòram na Gàidhlig\n" +"Language: gd\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : " +"(n > 2 && n < 20) ? 2 : 3;\n" +"X-Generator: Virtaal 0.7.1\n" +"X-Project-Style: gnome\n" + +#: ../proxy/libproxy/glibproxyresolver.c:157 +msgid "Proxy resolver internal error." +msgstr "Mearachd taobh a-stagh an fhuasglaiche progsaidh." + +#: ../tls/gnutls/gtlscertificate-gnutls.c:176 +#, c-format +msgid "Could not parse DER certificate: %s" +msgstr "Cha deach leinn teisteanas DER a pharsadh: %s" + +#: ../tls/gnutls/gtlscertificate-gnutls.c:197 +#, c-format +msgid "Could not parse PEM certificate: %s" +msgstr "Cha deach leinn teisteanas PEM a pharsadh: %s" + +#: ../tls/gnutls/gtlscertificate-gnutls.c:228 +#, c-format +msgid "Could not parse DER private key: %s" +msgstr "Cha deach leinn iuchair phrìobhaideach DER a pharsadh: %s" + +#: ../tls/gnutls/gtlscertificate-gnutls.c:259 +#, c-format +msgid "Could not parse PEM private key: %s" +msgstr "Cha deach leinn iuchair phrìobhaideach PEM a pharsadh: %s" + +#: ../tls/gnutls/gtlscertificate-gnutls.c:299 +msgid "No certificate data provided" +msgstr "Cha deach dàta teisteanais a thoirt seachad" + +#: ../tls/gnutls/gtlsclientconnection-gnutls.c:375 +msgid "Server required TLS certificate" +msgstr "Dh'iarr am frithealaiche teisteanas TLS" + +#: ../tls/gnutls/gtlsconnection-gnutls.c:323 +#, c-format +msgid "Could not create TLS connection: %s" +msgstr "Cha b' urrainn dhuinn ceangal TLS a chruthachadh: %s" + +#: ../tls/gnutls/gtlsconnection-gnutls.c:585 +msgid "Connection is closed" +msgstr "Chaidh an ceangal a dhùnadh" + +#: ../tls/gnutls/gtlsconnection-gnutls.c:658 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1537 +msgid "Operation would block" +msgstr "Dhèanadh an t-obrachadh bacadh" + +#: ../tls/gnutls/gtlsconnection-gnutls.c:808 +#: ../tls/gnutls/gtlsconnection-gnutls.c:847 +msgid "Peer failed to perform TLS handshake" +msgstr "Cha do rinn an seise crathadh-làimhe TLS" + +#: ../tls/gnutls/gtlsconnection-gnutls.c:826 +msgid "Peer requested illegal TLS rehandshake" +msgstr "Dh'iarr an seise ath-chrathadh-làimhe TLS mì-dhligheach" + +#: ../tls/gnutls/gtlsconnection-gnutls.c:853 +msgid "TLS connection closed unexpectedly" +msgstr "Chaidh an ceangal TLS a dhùnadh gun dùil" + +#: ../tls/gnutls/gtlsconnection-gnutls.c:863 +msgid "TLS connection peer did not send a certificate" +msgstr "Cha do chuir seise a' cheangail TLS teisteanas" + +#: ../tls/gnutls/gtlsconnection-gnutls.c:1250 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1283 +#, c-format +msgid "Error performing TLS handshake: %s" +msgstr "Mearachd le crathadh-làimhe TLS: %s" + +#: ../tls/gnutls/gtlsconnection-gnutls.c:1293 +msgid "Server did not return a valid TLS certificate" +msgstr "Cha do thill am frithealaiche teisteanas TLS dligheach" + +#: ../tls/gnutls/gtlsconnection-gnutls.c:1363 +msgid "Unacceptable TLS certificate" +msgstr "Teisteanas TLS ris nach gabhar" + +#: ../tls/gnutls/gtlsconnection-gnutls.c:1571 +#, c-format +msgid "Error reading data from TLS socket: %s" +msgstr "Mearachd a' leughadh dàta on t-socaid TLS: %s" + +#: ../tls/gnutls/gtlsconnection-gnutls.c:1600 +#, c-format +msgid "Error writing data to TLS socket: %s" +msgstr "Mearachd a' sgrìobhadh dàta dhan t-socaid TLS: %s" + +#: ../tls/gnutls/gtlsconnection-gnutls.c:1664 +#, c-format +msgid "Error performing TLS close: %s" +msgstr "Mearachd le dùnadh TLS: %s" + +#: ../tls/gnutls/gtlsserverconnection-gnutls.c:107 +msgid "Certificate has no private key" +msgstr "Chan eil iuchair phrìobhaideach aig an teisteanas" + +#: ../tls/pkcs11/gpkcs11pin.c:111 +msgid "" +"This is the last chance to enter the PIN correctly before the token is " +"locked." +msgstr "" +"Seo an cothrom mu dheireadh gus am PIN a chur a-steach mar bu chòir mus dèid " +"an tòcan a ghlasadh." + +#: ../tls/pkcs11/gpkcs11pin.c:113 +msgid "" +"Several PIN attempts have been incorrect, and the token will be locked after " +"further failures." +msgstr "" +"Chaidh iomadh oidhirp air a' PIN gu cearr agus thèid an tòcan a ghlasadh ma " +"bhios e cearr a-rithist." + +#: ../tls/pkcs11/gpkcs11pin.c:115 +msgid "The PIN entered is incorrect." +msgstr "Chan eil am PIN a chaidh a chur a-steach mar bu chòir." + +#: ../tls/pkcs11/gpkcs11slot.c:449 +msgid "Module" +msgstr "Mòideal" + +#: ../tls/pkcs11/gpkcs11slot.c:450 +msgid "PKCS#11 Module Pointer" +msgstr "Tomhaire mòideil PKCS#11" + +#: ../tls/pkcs11/gpkcs11slot.c:457 +msgid "Slot ID" +msgstr "ID an t-slota" + +#: ../tls/pkcs11/gpkcs11slot.c:458 +msgid "PKCS#11 Slot Identifier" +msgstr "Aithnichear an t-slota PKCS#11" diff -Nru glib-networking-2.48.0/po/LINGUAS glib-networking-2.48.2/po/LINGUAS --- glib-networking-2.48.0/po/LINGUAS 2016-02-08 13:05:34.000000000 +0000 +++ glib-networking-2.48.2/po/LINGUAS 2016-05-09 13:41:40.000000000 +0000 @@ -21,6 +21,7 @@ fi fr fur +gd gl gu he diff -Nru glib-networking-2.48.0/po/oc.po glib-networking-2.48.2/po/oc.po --- glib-networking-2.48.0/po/oc.po 2016-02-29 19:06:25.000000000 +0000 +++ glib-networking-2.48.2/po/oc.po 2016-05-09 13:41:40.000000000 +0000 @@ -3,15 +3,16 @@ # This file is distributed under the same license as the glib-networking package. # Cédric Valmary , 2015. # Cédric Valmary (Tot en òc) , 2015. +# Cédric Valmary (totenoc.eu) , 2016. msgid "" msgstr "" "Project-Id-Version: glib-networking master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=glib&keywords=I18N+L10N&component=network\n" -"POT-Creation-Date: 2016-02-18 07:41+0000\n" -"PO-Revision-Date: 2015-10-31 08:49+0200\n" -"Last-Translator: Cédric Valmary (Tot en òc) \n" -"Language-Team: Tot en òc (totenoc.eu)\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=glib&ke" +"ywords=I18N+L10N&component=network\n" +"POT-Creation-Date: 2016-04-29 06:59+0000\n" +"PO-Revision-Date: 2016-05-05 21:48+0200\n" +"Last-Translator: Cédric Valmary (totenoc.eu) \n" +"Language-Team: Tot En Òc\n" "Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -74,7 +75,7 @@ #: ../tls/gnutls/gtlsconnection-gnutls.c:826 msgid "Peer requested illegal TLS rehandshake" -msgstr "Lo servidor per a demandat una renegociacion TLS pas autorizada" +msgstr "Lo servidor par a demandat una renegociacion TLS pas autorizada" #: ../tls/gnutls/gtlsconnection-gnutls.c:853 msgid "TLS connection closed unexpectedly" @@ -82,7 +83,7 @@ #: ../tls/gnutls/gtlsconnection-gnutls.c:863 msgid "TLS connection peer did not send a certificate" -msgstr "Lo per TLS a pas mandat cap de certificat" +msgstr "Lo par TLS a pas mandat cap de certificat" #: ../tls/gnutls/gtlsconnection-gnutls.c:1250 #: ../tls/gnutls/gtlsconnection-gnutls.c:1283 diff -Nru glib-networking-2.48.0/proxy/gnome/gnome-proxy-module.c glib-networking-2.48.2/proxy/gnome/gnome-proxy-module.c --- glib-networking-2.48.0/proxy/gnome/gnome-proxy-module.c 2011-12-30 14:14:01.000000000 +0000 +++ glib-networking-2.48.2/proxy/gnome/gnome-proxy-module.c 2016-04-25 15:09:07.000000000 +0000 @@ -19,6 +19,8 @@ #include "config.h" +#include + #include "gproxyresolvergnome.h" @@ -26,6 +28,8 @@ g_io_module_load (GIOModule *module) { g_proxy_resolver_gnome_register (module); + bindtextdomain (GETTEXT_PACKAGE, LOCALE_DIR); + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); } void diff -Nru glib-networking-2.48.0/proxy/gnome/Makefile.in glib-networking-2.48.2/proxy/gnome/Makefile.in --- glib-networking-2.48.0/proxy/gnome/Makefile.in 2016-03-21 21:51:20.000000000 +0000 +++ glib-networking-2.48.2/proxy/gnome/Makefile.in 2016-05-09 14:03:18.000000000 +0000 @@ -604,7 +604,8 @@ top_srcdir = @top_srcdir@ module_flags = -export_dynamic -avoid-version -module -no-undefined -export-symbols-regex '^g_io_module_(load|unload|query)' giomoduledir = $(GIO_MODULE_DIR) -AM_CPPFLAGS = -DG_LOG_DOMAIN=\"GLib-Net\" -DG_DISABLE_DEPRECATED \ +AM_CPPFLAGS = -DG_LOG_DOMAIN=\"GLib-Net\" \ + -DLOCALE_DIR=\""$(localedir)"\" -DG_DISABLE_DEPRECATED \ $(GLIB_CFLAGS) $(NULL) $(GSETTINGS_DESKTOP_SCHEMAS_CFLAGS) TESTS_ENVIRONMENT = \ G_TEST_SRCDIR="$(abs_srcdir)" \ diff -Nru glib-networking-2.48.0/proxy/libproxy/libproxy-module.c glib-networking-2.48.2/proxy/libproxy/libproxy-module.c --- glib-networking-2.48.0/proxy/libproxy/libproxy-module.c 2011-12-30 14:14:01.000000000 +0000 +++ glib-networking-2.48.2/proxy/libproxy/libproxy-module.c 2016-04-25 15:09:07.000000000 +0000 @@ -21,6 +21,8 @@ #include "config.h" +#include + #include "glibproxyresolver.h" @@ -28,6 +30,8 @@ g_io_module_load (GIOModule *module) { g_libproxy_resolver_register (module); + bindtextdomain (GETTEXT_PACKAGE, LOCALE_DIR); + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); } void diff -Nru glib-networking-2.48.0/proxy/libproxy/Makefile.in glib-networking-2.48.2/proxy/libproxy/Makefile.in --- glib-networking-2.48.0/proxy/libproxy/Makefile.in 2016-03-21 21:51:20.000000000 +0000 +++ glib-networking-2.48.2/proxy/libproxy/Makefile.in 2016-05-09 14:03:18.000000000 +0000 @@ -617,7 +617,8 @@ top_srcdir = @top_srcdir@ module_flags = -export_dynamic -avoid-version -module -no-undefined -export-symbols-regex '^g_io_module_(load|unload|query)' giomoduledir = $(GIO_MODULE_DIR) -AM_CPPFLAGS = -DG_LOG_DOMAIN=\"GLib-Net\" -DG_DISABLE_DEPRECATED \ +AM_CPPFLAGS = -DG_LOG_DOMAIN=\"GLib-Net\" \ + -DLOCALE_DIR=\""$(localedir)"\" -DG_DISABLE_DEPRECATED \ $(GLIB_CFLAGS) $(NULL) $(LIBPROXY_CFLAGS) TESTS_ENVIRONMENT = \ G_TEST_SRCDIR="$(abs_srcdir)" \ diff -Nru glib-networking-2.48.0/proxy/tests/Makefile.in glib-networking-2.48.2/proxy/tests/Makefile.in --- glib-networking-2.48.0/proxy/tests/Makefile.in 2016-03-21 21:51:20.000000000 +0000 +++ glib-networking-2.48.2/proxy/tests/Makefile.in 2016-05-09 14:03:18.000000000 +0000 @@ -607,7 +607,8 @@ top_srcdir = @top_srcdir@ module_flags = -export_dynamic -avoid-version -module -no-undefined -export-symbols-regex '^g_io_module_(load|unload|query)' giomoduledir = $(GIO_MODULE_DIR) -AM_CPPFLAGS = -DG_LOG_DOMAIN=\"GLib-Net\" -DG_DISABLE_DEPRECATED \ +AM_CPPFLAGS = -DG_LOG_DOMAIN=\"GLib-Net\" \ + -DLOCALE_DIR=\""$(localedir)"\" -DG_DISABLE_DEPRECATED \ $(GLIB_CFLAGS) $(NULL) $(GSETTINGS_DESKTOP_SCHEMAS_CFLAGS) \ -I$(top_srcdir)/proxy -DSRCDIR=\""$(srcdir)"\" \ -DTOP_BUILDDIR=\""$(top_builddir)"\" diff -Nru glib-networking-2.48.0/tls/gnutls/gnutls-module.c glib-networking-2.48.2/tls/gnutls/gnutls-module.c --- glib-networking-2.48.0/tls/gnutls/gnutls-module.c 2016-02-08 13:05:34.000000000 +0000 +++ glib-networking-2.48.2/tls/gnutls/gnutls-module.c 2016-04-25 15:09:07.000000000 +0000 @@ -23,6 +23,7 @@ #include "config.h" #include +#include #include "gtlsbackend-gnutls.h" #include "gtlsbackend-gnutls-pkcs11.h" @@ -35,6 +36,8 @@ #ifdef HAVE_PKCS11 g_tls_backend_gnutls_pkcs11_register (module); #endif + bindtextdomain (GETTEXT_PACKAGE, LOCALE_DIR); + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); } void diff -Nru glib-networking-2.48.0/tls/gnutls/gtlscertificate-gnutls.c glib-networking-2.48.2/tls/gnutls/gtlscertificate-gnutls.c --- glib-networking-2.48.0/tls/gnutls/gtlscertificate-gnutls.c 2016-02-09 08:04:15.000000000 +0000 +++ glib-networking-2.48.2/tls/gnutls/gtlscertificate-gnutls.c 2016-05-09 13:41:40.000000000 +0000 @@ -722,6 +722,10 @@ { issuer = NULL; + /* Check if the cert issued itself */ + if (gnutls_x509_crt_check_issuer (gnutls_certs[i], gnutls_certs[i])) + continue; + if (i < num_certs - 1 && gnutls_x509_crt_check_issuer (gnutls_certs[i], gnutls_certs[i + 1])) { diff -Nru glib-networking-2.48.0/tls/gnutls/Makefile.in glib-networking-2.48.2/tls/gnutls/Makefile.in --- glib-networking-2.48.0/tls/gnutls/Makefile.in 2016-03-21 21:51:20.000000000 +0000 +++ glib-networking-2.48.2/tls/gnutls/Makefile.in 2016-05-09 14:03:18.000000000 +0000 @@ -630,7 +630,8 @@ top_srcdir = @top_srcdir@ module_flags = -export_dynamic -avoid-version -module -no-undefined -export-symbols-regex '^g_io_module_(load|unload|query)' giomoduledir = $(GIO_MODULE_DIR) -AM_CPPFLAGS = -DG_LOG_DOMAIN=\"GLib-Net\" -DG_DISABLE_DEPRECATED \ +AM_CPPFLAGS = -DG_LOG_DOMAIN=\"GLib-Net\" \ + -DLOCALE_DIR=\""$(localedir)"\" -DG_DISABLE_DEPRECATED \ $(GLIB_CFLAGS) $(NULL) $(P11_CFLAGS) $(GNUTLS_CFLAGS) $(NULL) TESTS_ENVIRONMENT = \ G_TEST_SRCDIR="$(abs_srcdir)" \ diff -Nru glib-networking-2.48.0/tls/pkcs11/Makefile.in glib-networking-2.48.2/tls/pkcs11/Makefile.in --- glib-networking-2.48.0/tls/pkcs11/Makefile.in 2016-03-21 21:51:20.000000000 +0000 +++ glib-networking-2.48.2/tls/pkcs11/Makefile.in 2016-05-09 14:03:18.000000000 +0000 @@ -598,7 +598,8 @@ top_srcdir = @top_srcdir@ module_flags = -export_dynamic -avoid-version -module -no-undefined -export-symbols-regex '^g_io_module_(load|unload|query)' giomoduledir = $(GIO_MODULE_DIR) -AM_CPPFLAGS = -DG_LOG_DOMAIN=\"GLib-Net\" -DG_DISABLE_DEPRECATED \ +AM_CPPFLAGS = -DG_LOG_DOMAIN=\"GLib-Net\" \ + -DLOCALE_DIR=\""$(localedir)"\" -DG_DISABLE_DEPRECATED \ $(GLIB_CFLAGS) $(NULL) $(PKCS11_CFLAGS) -DG_DISABLE_DEPRECATED TESTS_ENVIRONMENT = \ G_TEST_SRCDIR="$(abs_srcdir)" \ diff -Nru glib-networking-2.48.0/tls/tests/Makefile.in glib-networking-2.48.2/tls/tests/Makefile.in --- glib-networking-2.48.0/tls/tests/Makefile.in 2016-03-21 21:51:20.000000000 +0000 +++ glib-networking-2.48.2/tls/tests/Makefile.in 2016-05-09 14:03:18.000000000 +0000 @@ -657,7 +657,8 @@ top_srcdir = @top_srcdir@ module_flags = -export_dynamic -avoid-version -module -no-undefined -export-symbols-regex '^g_io_module_(load|unload|query)' giomoduledir = $(GIO_MODULE_DIR) -AM_CPPFLAGS = -DG_LOG_DOMAIN=\"GLib-Net\" -DG_DISABLE_DEPRECATED \ +AM_CPPFLAGS = -DG_LOG_DOMAIN=\"GLib-Net\" \ + -DLOCALE_DIR=\""$(localedir)"\" -DG_DISABLE_DEPRECATED \ $(GLIB_CFLAGS) $(NULL) $(GNUTLS_CFLAGS) -I$(top_srcdir)/tls \ -I$(top_builddir)/tls -DSRCDIR=\""$(abs_srcdir)"\" \ -DTOP_BUILDDIR=\""$(top_builddir)"\" $(am__append_15)