From 790d2ccafe3ff20feccbd2d5be92aac8752b75f9 Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Fri, 15 Mar 2013 08:57:46 -0700 Subject: [PATCH] Imported Upstream version 2.35.9 --- NEWS | 10 +++ configure | 20 ++--- configure.ac | 2 +- po/LINGUAS | 1 + po/an.po | 145 +++++++++++++++++++++++++++++++++++++ po/de.po | 42 ++++++----- po/fr.po | 44 ++++++----- po/pa.po | 44 ++++++----- po/ug.po | 16 ++-- po/vi.po | 41 ++++++----- po/zh_HK.po | 45 +++++++----- po/zh_TW.po | 45 +++++++----- tls/gnutls/gtlsconnection-gnutls.c | 8 +- 13 files changed, 324 insertions(+), 139 deletions(-) create mode 100644 po/an.po diff --git a/NEWS b/NEWS index a772b82..3166e26 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,13 @@ +2.35.9 +====== + * Fixed one kind of handshake failure to return the correct error + code under gnutls 3.x (allowing libsoup to recognize the error and + do fallback to SSL 3.0). (#694812) + + * Updated translations: + Chinese (traditional), French, German, Punjabi, Uyghur, + Vietnamese + 2.35.8 ====== * proxy/gnome: ported to new GSimpleProxyResolver, and added more diff --git a/configure b/configure index 0edc41c..3b9af22 100755 --- a/configure +++ b/configure @@ -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.35.8. +# Generated by GNU Autoconf 2.69 for glib-networking 2.35.9. # # Report bugs to . # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='glib-networking' PACKAGE_TARNAME='glib-networking' -PACKAGE_VERSION='2.35.8' -PACKAGE_STRING='glib-networking 2.35.8' +PACKAGE_VERSION='2.35.9' +PACKAGE_STRING='glib-networking 2.35.9' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=glib&component=network' PACKAGE_URL='' @@ -1412,7 +1412,7 @@ if test "$ac_init_help" = "long"; then # 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.35.8 to adapt to many kinds of systems. +\`configure' configures glib-networking 2.35.9 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1482,7 +1482,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of glib-networking 2.35.8:";; + short | recursive ) echo "Configuration of glib-networking 2.35.9:";; esac cat <<\_ACEOF @@ -1622,7 +1622,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -glib-networking configure 2.35.8 +glib-networking configure 2.35.9 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1991,7 +1991,7 @@ cat >config.log <<_ACEOF 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.35.8, which was +It was created by glib-networking $as_me 2.35.9, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2820,7 +2820,7 @@ fi # Define the identity of the package. PACKAGE='glib-networking' - VERSION='2.35.8' + VERSION='2.35.9' cat >>confdefs.h <<_ACEOF @@ -15309,7 +15309,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # 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.35.8, which was +This file was extended by glib-networking $as_me 2.35.9, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15375,7 +15375,7 @@ _ACEOF 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.35.8 +glib-networking config.status 2.35.9 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index b0438b6..0248973 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ AC_PREREQ(2.65) AC_CONFIG_MACRO_DIR([m4]) -AC_INIT([glib-networking],[2.35.8],[http://bugzilla.gnome.org/enter_bug.cgi?product=glib&component=network]) +AC_INIT([glib-networking],[2.35.9],[http://bugzilla.gnome.org/enter_bug.cgi?product=glib&component=network]) AC_CONFIG_SRCDIR([proxy/libproxy/glibproxyresolver.h]) AC_CONFIG_HEADERS([config.h]) diff --git a/po/LINGUAS b/po/LINGUAS index c14b12e..d9bdf3c 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1,3 +1,4 @@ +an ar as be diff --git a/po/an.po b/po/an.po new file mode 100644 index 0000000..ea2051b --- /dev/null +++ b/po/an.po @@ -0,0 +1,145 @@ +# Aragonese translation for glib-networking. +# Copyright (C) 2013 glib-networking's COPYRIGHT HOLDER +# This file is distributed under the same license as the glib-networking package. +# FIRST AUTHOR , YEAR. +# +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: 2013-02-19 13:01+0000\n" +"PO-Revision-Date: 2013-02-20 01:19+0100\n" +"Last-Translator: Daniel Martinez \n" +"Language-Team: Aragonese \n" +"Language: an\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../proxy/libproxy/glibproxyresolver.c:150 +msgid "Proxy resolver internal error." +msgstr "Error interna d'o proxy." + +#: ../tls/gnutls/gtlscertificate-gnutls.c:173 +#, c-format +msgid "Could not parse DER certificate: %s" +msgstr "No se podió analisar o certificau DER: %s" + +#: ../tls/gnutls/gtlscertificate-gnutls.c:194 +#, c-format +msgid "Could not parse PEM certificate: %s" +msgstr "No se podió analisar o certificau PEM: %s" + +#: ../tls/gnutls/gtlscertificate-gnutls.c:225 +#, c-format +msgid "Could not parse DER private key: %s" +msgstr "No se podió analisar a clau privada DER: %s" + +#: ../tls/gnutls/gtlscertificate-gnutls.c:256 +#, c-format +msgid "Could not parse PEM private key: %s" +msgstr "No se podió analisar a clau privada PEM: %s" + +#: ../tls/gnutls/gtlscertificate-gnutls.c:296 +msgid "No certificate data provided" +msgstr "No s'han proporcionau datos d'o certificau" + +#: ../tls/gnutls/gtlsclientconnection-gnutls.c:309 +msgid "Server required TLS certificate" +msgstr "O servidor requiere un certificau TLS" + +#: ../tls/gnutls/gtlsconnection-gnutls.c:258 +#, c-format +msgid "Could not create TLS connection: %s" +msgstr "No se podió creyar a connexión TLS: %s" + +#: ../tls/gnutls/gtlsconnection-gnutls.c:520 +msgid "Connection is closed" +msgstr "A connexión ye zarrada" + +#: ../tls/gnutls/gtlsconnection-gnutls.c:582 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1419 +msgid "Operation would block" +msgstr "A operación se blocará" + +#: ../tls/gnutls/gtlsconnection-gnutls.c:712 +msgid "Peer failed to perform TLS handshake" +msgstr "O par falló en realizar a negociación TLS" + +#: ../tls/gnutls/gtlsconnection-gnutls.c:729 +msgid "Peer requested illegal TLS rehandshake" +msgstr "O par solicitó una renegociación TLS ilegal" + +#: ../tls/gnutls/gtlsconnection-gnutls.c:755 +msgid "TLS connection closed unexpectedly" +msgstr "A connexión TLS se zarró inasperadament" + +#: ../tls/gnutls/gtlsconnection-gnutls.c:765 +msgid "TLS connection peer did not send a certificate" +msgstr "O par d'a connexión TLS no ninvió un certificau" + +#: ../tls/gnutls/gtlsconnection-gnutls.c:1146 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1165 +#, c-format +msgid "Error performing TLS handshake: %s" +msgstr "Error en realizar a negociación TLS: %s" + +#: ../tls/gnutls/gtlsconnection-gnutls.c:1175 +msgid "Server did not return a valid TLS certificate" +msgstr "O servidor no devolvió un certificau TLS valido" + +#: ../tls/gnutls/gtlsconnection-gnutls.c:1250 +msgid "Unacceptable TLS certificate" +msgstr "Certificau TLS inacceptable" + +#: ../tls/gnutls/gtlsconnection-gnutls.c:1442 +#, c-format +msgid "Error reading data from TLS socket: %s" +msgstr "Error en leyer datos d'o socket TLS: %s" + +#: ../tls/gnutls/gtlsconnection-gnutls.c:1471 +#, c-format +msgid "Error writing data to TLS socket: %s" +msgstr "Error en escribir datos en o socket TLS: %s" + +#: ../tls/gnutls/gtlsconnection-gnutls.c:1515 +msgid "Connection is already closed" +msgstr "A connexión ya ye zarrada" + +#: ../tls/gnutls/gtlsconnection-gnutls.c:1525 +#, c-format +msgid "Error performing TLS close: %s" +msgstr "Error en zarrar o TLS: %s" + +#: ../tls/gnutls/gtlsserverconnection-gnutls.c:103 +msgid "Certificate has no private key" +msgstr "O certificau no tiene clau privada" + +#: ../tls/pkcs11/gpkcs11pin.c:108 +msgid "This is the last chance to enter the PIN correctly before the token is locked." +msgstr "Ista ye a zaguera oportunidat ta introducir o PIN correctament antes que se bloque o \"token\"." + +#: ../tls/pkcs11/gpkcs11pin.c:110 +msgid "Several PIN attempts have been incorrect, and the token will be locked after further failures." +msgstr "Quantos intentos d'introducir o PIN han estau incorrectos y o \"token\" se blocará dimpués de mas fallos." + +#: ../tls/pkcs11/gpkcs11pin.c:112 +msgid "The PIN entered is incorrect." +msgstr "O PIN introduciu ye incorrecto." + +#: ../tls/pkcs11/gpkcs11slot.c:446 +msgid "Module" +msgstr "Modulo" + +#: ../tls/pkcs11/gpkcs11slot.c:447 +msgid "PKCS#11 Module Pointer" +msgstr "Puntero d'o modulo PKCS#11" + +#: ../tls/pkcs11/gpkcs11slot.c:454 +msgid "Slot ID" +msgstr "ID d'a ranura" + +#: ../tls/pkcs11/gpkcs11slot.c:455 +msgid "PKCS#11 Slot Identifier" +msgstr "Identificador d'a ranura de PKCS#11" + diff --git a/po/de.po b/po/de.po index b8ede8a..7a0f693 100644 --- a/po/de.po +++ b/po/de.po @@ -1,7 +1,7 @@ # German translation for glib-networking. # Copyright (C) 2011 glib-networking's COPYRIGHT HOLDER # This file is distributed under the same license as the glib-networking package. -# Mario Blättermann , 2011, 2012. +# Mario Blättermann , 2011-2013. # Christian Kirbach , 2011, 2012. # Wolfgang Stöggl , 2011, 2012. # @@ -10,9 +10,9 @@ 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: 2012-08-22 01:54+0000\n" -"PO-Revision-Date: 2012-08-29 19:22+0200\n" -"Last-Translator: Wolfgang Stoeggl \n" +"POT-Creation-Date: 2012-11-29 22:09+0000\n" +"PO-Revision-Date: 2013-03-04 08:30+0100\n" +"Last-Translator: Mario Blättermann \n" "Language-Team: Deutsch \n" "Language: \n" "MIME-Version: 1.0\n" @@ -64,53 +64,58 @@ msgstr "TLS-Verbindung konnte nicht erstellt werden: %s" msgid "Connection is closed" msgstr "Verbindung ist geschlossen" -#: ../tls/gnutls/gtlsconnection-gnutls.c:574 -#: ../tls/gnutls/gtlsconnection-gnutls.c:1377 +#: ../tls/gnutls/gtlsconnection-gnutls.c:576 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1382 msgid "Operation would block" msgstr "Vorgang würde blockieren" -#: ../tls/gnutls/gtlsconnection-gnutls.c:701 +#: ../tls/gnutls/gtlsconnection-gnutls.c:703 msgid "Peer failed to perform TLS handshake" msgstr "Gegenstelle scheiterte bei Ausführung der TLS-Begrüßung" -#: ../tls/gnutls/gtlsconnection-gnutls.c:718 +#: ../tls/gnutls/gtlsconnection-gnutls.c:720 msgid "Peer requested illegal TLS rehandshake" msgstr "Gegenstelle fragte illegale erneute Begrüßung an" -#: ../tls/gnutls/gtlsconnection-gnutls.c:744 +#: ../tls/gnutls/gtlsconnection-gnutls.c:746 msgid "TLS connection closed unexpectedly" msgstr "TLS-Verbindung wurde unerwartet geschlossen" +#: ../tls/gnutls/gtlsconnection-gnutls.c:756 +#| msgid "Server did not return a valid TLS certificate" +msgid "TLS connection peer did not send a certificate" +msgstr "Gegenstelle der TLS-Verbindung gab kein gültiges Zertifikat zurück" + # Handshake ist ein Fachbegriff für den Vorgang der Verbindungsaushandlung -#: ../tls/gnutls/gtlsconnection-gnutls.c:1055 -#: ../tls/gnutls/gtlsconnection-gnutls.c:1074 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1064 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1083 #, c-format msgid "Error performing TLS handshake: %s" msgstr "Fehler bei der Ausführung des TLS-Handshake: %s" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1210 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1228 msgid "Unacceptable TLS certificate" msgstr "Nicht akzeptables TLS-Zertifikat" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1221 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1239 msgid "Server did not return a valid TLS certificate" msgstr "Server gab kein gültiges TLS-Zertifikat zurück" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1400 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1405 #, c-format msgid "Error reading data from TLS socket: %s" msgstr "Fehler beim Lesen der Daten aus dem TLS-Socket: %s" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1429 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1434 #, c-format msgid "Error writing data to TLS socket: %s" msgstr "Fehler beim Schreiben der Daten in den TLS-Socket: %s" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1473 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1478 msgid "Connection is already closed" msgstr "Verbindung ist bereits geschlossen" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1483 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1488 #, c-format msgid "Error performing TLS close: %s" msgstr "Fehler beim Schließen der TLS-Verbindung: %s" @@ -121,8 +126,7 @@ msgstr "Das Zertifikat hat keinen geheimen Schlüssel" #: ../tls/pkcs11/gpkcs11pin.c:108 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 "" "Dies ist die letzte Möglichkeit, die PIN korrekt einzugeben, bevor das Token " "gesperrt wird." diff --git a/po/fr.po b/po/fr.po index c3e7fc2..5508c7a 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,8 +8,8 @@ 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: 2012-07-18 21:47+0000\n" -"PO-Revision-Date: 2012-09-06 17:35+0200\n" +"POT-Creation-Date: 2013-02-22 13:25+0000\n" +"PO-Revision-Date: 2013-02-25 20:13+0100\n" "Last-Translator: Claude Paroz \n" "Language-Team: GNOME French Team \n" "Language: \n" @@ -50,61 +50,65 @@ msgstr "Aucune donnée de certificat fournie" msgid "Server required TLS certificate" msgstr "Le serveur requiert un certificat TLS" -#: ../tls/gnutls/gtlsconnection-gnutls.c:248 +#: ../tls/gnutls/gtlsconnection-gnutls.c:258 #, c-format msgid "Could not create TLS connection: %s" msgstr "Impossible de créer une connexion TLS : %s" -#: ../tls/gnutls/gtlsconnection-gnutls.c:508 +#: ../tls/gnutls/gtlsconnection-gnutls.c:520 msgid "Connection is closed" msgstr "La connexion est fermée" -#: ../tls/gnutls/gtlsconnection-gnutls.c:568 -#: ../tls/gnutls/gtlsconnection-gnutls.c:1371 +#: ../tls/gnutls/gtlsconnection-gnutls.c:582 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1419 msgid "Operation would block" msgstr "L'opération serait bloquée" -#: ../tls/gnutls/gtlsconnection-gnutls.c:695 +#: ../tls/gnutls/gtlsconnection-gnutls.c:712 msgid "Peer failed to perform TLS handshake" msgstr "La négociation TLS avec le serveur pair a échoué" -#: ../tls/gnutls/gtlsconnection-gnutls.c:712 +#: ../tls/gnutls/gtlsconnection-gnutls.c:729 msgid "Peer requested illegal TLS rehandshake" msgstr "Le serveur pair a demandé une renégociation TLS non autorisée" -#: ../tls/gnutls/gtlsconnection-gnutls.c:738 +#: ../tls/gnutls/gtlsconnection-gnutls.c:755 msgid "TLS connection closed unexpectedly" msgstr "La connexion TLS a été fermée de manière inattendue" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1049 -#: ../tls/gnutls/gtlsconnection-gnutls.c:1068 +#: ../tls/gnutls/gtlsconnection-gnutls.c:765 +msgid "TLS connection peer did not send a certificate" +msgstr "Le pair TLS n'a pas envoyé de certificat" + +#: ../tls/gnutls/gtlsconnection-gnutls.c:1146 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1165 #, c-format msgid "Error performing TLS handshake: %s" msgstr "Erreur lors de la négociation TLS : %s" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1204 -msgid "Unacceptable TLS certificate" -msgstr "Certificat TLS inacceptable" - -#: ../tls/gnutls/gtlsconnection-gnutls.c:1215 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1175 msgid "Server did not return a valid TLS certificate" msgstr "Le serveur n'a pas renvoyé un certificat TLS valide" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1394 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1250 +msgid "Unacceptable TLS certificate" +msgstr "Certificat TLS inacceptable" + +#: ../tls/gnutls/gtlsconnection-gnutls.c:1442 #, c-format msgid "Error reading data from TLS socket: %s" msgstr "Erreur lors de la lecture de données du connecteur TLS : %s" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1423 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1471 #, c-format msgid "Error writing data to TLS socket: %s" msgstr "Erreur lors de l'écriture de données sur le connecteur TLS : %s" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1467 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1515 msgid "Connection is already closed" msgstr "La connexion est déjà fermée" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1477 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1525 #, c-format msgid "Error performing TLS close: %s" msgstr "Erreur lors de la fermeture TLS : %s" diff --git a/po/pa.po b/po/pa.po index 752077b..02cd604 100644 --- a/po/pa.po +++ b/po/pa.po @@ -2,14 +2,14 @@ # Copyright (C) 2011 glib-networking's COPYRIGHT HOLDER # This file is distributed under the same license as the glib-networking package. # -# A S Alam , 2011, 2012. +# A S Alam , 2011, 2012, 2013. 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: 2012-07-18 21:47+0000\n" -"PO-Revision-Date: 2012-09-14 07:31+0530\n" +"POT-Creation-Date: 2012-11-29 22:09+0000\n" +"PO-Revision-Date: 2013-02-26 07:18+0530\n" "Last-Translator: A S Alam \n" "Language-Team: Punjabi/Panjabi \n" "Language: paX-Generator: Lokalize 1.2\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 1.5\n" #: ../proxy/libproxy/glibproxyresolver.c:150 msgid "Proxy resolver internal error." @@ -51,62 +51,66 @@ msgstr "ਕੋਈ ਸਰਟੀਫਿਕੇਟ ਡਾਟਾ ਨਹੀਂ ਦਿ msgid "Server required TLS certificate" msgstr "ਸਰਵਰ ਨੂੰ TLS ਸਰਟੀਫਿਕੇਤ ਚਾਹੀਦਾ ਹੈ" -#: ../tls/gnutls/gtlsconnection-gnutls.c:248 +#: ../tls/gnutls/gtlsconnection-gnutls.c:254 #, c-format msgid "Could not create TLS connection: %s" msgstr "TLS ਕੁਨੈਕਸ਼ਨ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ: %s" -#: ../tls/gnutls/gtlsconnection-gnutls.c:508 +#: ../tls/gnutls/gtlsconnection-gnutls.c:514 msgid "Connection is closed" msgstr "ਕੁਨੈਕਸ਼ਨ ਬੰਦ ਕੀਤਾ ਗਿਆ" -#: ../tls/gnutls/gtlsconnection-gnutls.c:568 -#: ../tls/gnutls/gtlsconnection-gnutls.c:1371 +#: ../tls/gnutls/gtlsconnection-gnutls.c:576 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1382 msgid "Operation would block" msgstr "ਕਾਰਵਾਈ ਰੋਕੀ ਜਾ ਸਕਦੀ ਹੈ" -#: ../tls/gnutls/gtlsconnection-gnutls.c:695 +#: ../tls/gnutls/gtlsconnection-gnutls.c:703 msgid "Peer failed to perform TLS handshake" msgstr "ਪੀਅਰ TLS ਹੈਂਡਸੇਕ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ" -#: ../tls/gnutls/gtlsconnection-gnutls.c:712 +#: ../tls/gnutls/gtlsconnection-gnutls.c:720 msgid "Peer requested illegal TLS rehandshake" msgstr "ਪੀਅਰ ਨੇ ਗਲਤ TLS ਮੁੜ-ਹੈਂਡਸੇਕ ਲਈ ਮੰਗ ਕੀਤੀ" -#: ../tls/gnutls/gtlsconnection-gnutls.c:738 +#: ../tls/gnutls/gtlsconnection-gnutls.c:746 msgid "TLS connection closed unexpectedly" msgstr "TLS ਕੁਨੈਕਸ਼ਨ ਅਚਾਨਕ ਬੰਦ ਹੋ ਗਿਆ" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1049 -#: ../tls/gnutls/gtlsconnection-gnutls.c:1068 +#: ../tls/gnutls/gtlsconnection-gnutls.c:756 +#| msgid "Server did not return a valid TLS certificate" +msgid "TLS connection peer did not send a certificate" +msgstr "TLS ਕੁਨੈਕਸ਼ਨ ਪੀਅਰ ਨੇ ਸਰਟੀਫਿਕੇਟ ਵਾਪਸ ਨਹੀਂ ਭੇਜਿਆ" + +#: ../tls/gnutls/gtlsconnection-gnutls.c:1064 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1083 #, c-format msgid "Error performing TLS handshake: %s" msgstr "TLS ਹੈਂਡਸੇਕ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ: %s" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1204 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1228 msgid "Unacceptable TLS certificate" msgstr "ਨਾ-ਮਨਜ਼ੂਰ TLS ਸਰਟੀਫਿਕੇਟ" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1215 -#| msgid "Server required TLS certificate" +#: ../tls/gnutls/gtlsconnection-gnutls.c:1239 msgid "Server did not return a valid TLS certificate" msgstr "ਸਰਵਰ ਨੇ ਠੀਕ TLS ਸਰਟੀਫਿਕੇਟ ਵਾਪਸ ਨਹੀਂ ਕੀਤਾ ਹੈ" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1394 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1405 #, c-format msgid "Error reading data from TLS socket: %s" msgstr "TLS ਸਾਕਟ ਤੋਂ ਡਾਟਾ ਪੜ੍ਹਨ ਲਈ ਫੇਲ੍ਹ: %s" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1423 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1434 #, c-format msgid "Error writing data to TLS socket: %s" msgstr "TLS ਸਾਕਟ ਲਈ ਡਾਟਾ ਪੜ੍ਹਨ ਦੌਰਾਨ ਗਲਤੀ: %s" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1467 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1478 msgid "Connection is already closed" msgstr "ਕੁਨੈਕਸ਼ਨ ਪਹਿਲਾਂ ਹੀ ਬੰਦ ਹੈ" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1477 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1488 #, c-format msgid "Error performing TLS close: %s" msgstr "TLS ਬੰਦ ਕਰਨ ਗਲਤੀ: %s" diff --git a/po/ug.po b/po/ug.po index 4cbf9a1..9f955b2 100644 --- a/po/ug.po +++ b/po/ug.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: glib-networking\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=glib&keywords=I18N+L10N&component=network\n" -"POT-Creation-Date: 2013-01-08 19:50+0000\n" -"PO-Revision-Date: 2011-01-31 15:04+0000\n" -"Last-Translator: Gheyret Kenji \n" +"POT-Creation-Date: 2013-01-20 10:45+0000\n" +"PO-Revision-Date: 2013-02-22 22:21+0900\n" +"Last-Translator: Gheyret Kenji \n" "Language-Team: Uyghur Computer Science Association \n" "Language: \n" "MIME-Version: 1.0\n" @@ -64,20 +64,19 @@ msgstr "مەشغۇلات توسۇلىدۇ" #: ../tls/gnutls/gtlsconnection-gnutls.c:710 msgid "Peer failed to perform TLS handshake" -msgstr "Peer(باشقىلار) TLS بىلەن سالاملىشىشتا مەغلۇپ بولدى" +msgstr "قارىشى تەرەپ TLS سالىمىدا مەغلۇپ بولدى" #: ../tls/gnutls/gtlsconnection-gnutls.c:727 msgid "Peer requested illegal TLS rehandshake" -msgstr "Peer(باشقىلار) TLS بىلەن قايتا سالاملىشىشتا ناتوغرا سالام قىلدى" +msgstr "Peer(باشقىلار) TLS قايتا سالىمىدا ناتوغرا سالام قىلدى" #: ../tls/gnutls/gtlsconnection-gnutls.c:753 msgid "TLS connection closed unexpectedly" -msgstr "TLS باغلىنىشى ئويلىمىغان يەردىن تاقىلىپ قالدى" +msgstr "قارىشى تەرەپ توغرا بولمىغان TLS سالىمىنى تەلەپ قىلدى" #: ../tls/gnutls/gtlsconnection-gnutls.c:763 -#| msgid "TLS connection closed unexpectedly" msgid "TLS connection peer did not send a certificate" -msgstr "" +msgstr "TLS باغلىنىشىدىكى قارىشى تەرەپ گۇۋاھنامىنى ئەۋەتمىدى" #: ../tls/gnutls/gtlsconnection-gnutls.c:1144 #: ../tls/gnutls/gtlsconnection-gnutls.c:1163 @@ -86,7 +85,6 @@ msgid "Error performing TLS handshake: %s" msgstr "TLS بىلەن سالاملىشىشتا خاتالىق كۆرۈلدى: %s" #: ../tls/gnutls/gtlsconnection-gnutls.c:1173 -#| msgid "Server required TLS certificate" msgid "Server did not return a valid TLS certificate" msgstr "مۇلازىمېتىر ئىناۋەتلىك TLS گۇۋاھنامىسىنى قايتۇرمىدى" diff --git a/po/vi.po b/po/vi.po index 025c2d6..fbaa936 100644 --- a/po/vi.po +++ b/po/vi.po @@ -1,15 +1,15 @@ # Vietnamese translation for glib-networking. # Copyright (C) 2011 glib-networking's Free Software Foundation, Inc. # This file is distributed under the same license as the glib-networking package. -# Nguyễn Thái Ngọc Duy , 2011-2012. +# Nguyễn Thái Ngọc Duy , 2011-2013. # 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: 2012-07-18 21:47+0000\n" -"PO-Revision-Date: 2012-08-22 08:53+0700\n" +"POT-Creation-Date: 2012-11-29 22:09+0000\n" +"PO-Revision-Date: 2013-03-02 20:35+0700\n" "Last-Translator: Nguyễn Thái Ngọc Duy \n" "Language-Team: Vietnamese \n" "Language: vi\n" @@ -50,62 +50,65 @@ msgstr "Chưa cung cấp thông tin chứng nhận" msgid "Server required TLS certificate" msgstr "Máy chủ yêu cầu chứng nhận TLS" -#: ../tls/gnutls/gtlsconnection-gnutls.c:248 +#: ../tls/gnutls/gtlsconnection-gnutls.c:254 #, c-format msgid "Could not create TLS connection: %s" msgstr "Không thể tạo kết nối TLS: %s" -#: ../tls/gnutls/gtlsconnection-gnutls.c:508 +#: ../tls/gnutls/gtlsconnection-gnutls.c:514 msgid "Connection is closed" msgstr "Kết nối đã đóng" -#: ../tls/gnutls/gtlsconnection-gnutls.c:568 -#: ../tls/gnutls/gtlsconnection-gnutls.c:1371 +#: ../tls/gnutls/gtlsconnection-gnutls.c:576 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1382 msgid "Operation would block" msgstr "Thao tác có thể ngăn các thao tác khác" -#: ../tls/gnutls/gtlsconnection-gnutls.c:695 +#: ../tls/gnutls/gtlsconnection-gnutls.c:703 msgid "Peer failed to perform TLS handshake" msgstr "Bên kia không thực hiện bắt tay TLS được" -#: ../tls/gnutls/gtlsconnection-gnutls.c:712 +#: ../tls/gnutls/gtlsconnection-gnutls.c:720 msgid "Peer requested illegal TLS rehandshake" msgstr "Bên kia yêu cầu bắt tay TLS lại không hợp lệ" -#: ../tls/gnutls/gtlsconnection-gnutls.c:738 +#: ../tls/gnutls/gtlsconnection-gnutls.c:746 msgid "TLS connection closed unexpectedly" msgstr "Kết nối TLS kết thúc bất ngờ" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1049 -#: ../tls/gnutls/gtlsconnection-gnutls.c:1068 +#: ../tls/gnutls/gtlsconnection-gnutls.c:756 +msgid "TLS connection peer did not send a certificate" +msgstr "Phía bên kia kết nối TLS không gửi chứng nhận" + +#: ../tls/gnutls/gtlsconnection-gnutls.c:1064 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1083 #, c-format msgid "Error performing TLS handshake: %s" msgstr "Lỗi thực hiện bắt tay TLS: %s" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1204 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1228 msgid "Unacceptable TLS certificate" msgstr "Chứng nhận TLS không thể chấp nhận" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1215 -#| msgid "Server required TLS certificate" +#: ../tls/gnutls/gtlsconnection-gnutls.c:1239 msgid "Server did not return a valid TLS certificate" msgstr "Máy chủ không trả về chứng nhận TLS hợp lệ" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1394 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1405 #, c-format msgid "Error reading data from TLS socket: %s" msgstr "Lỗi đọc dữ liệu từ kết nối TLS: %s" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1423 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1434 #, c-format msgid "Error writing data to TLS socket: %s" msgstr "Lỗi đọc dữ liệu vào kết nối TLS: %s" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1467 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1478 msgid "Connection is already closed" msgstr "Kết nối đã đóng rồi" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1477 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1488 #, c-format msgid "Error performing TLS close: %s" msgstr "Lỗi đóng kết nối TLS: %s" diff --git a/po/zh_HK.po b/po/zh_HK.po index dd94122..24bbc6d 100644 --- a/po/zh_HK.po +++ b/po/zh_HK.po @@ -7,14 +7,15 @@ msgid "" msgstr "" "Project-Id-Version: glib-networking 2.31.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-02 10:11+0800\n" -"PO-Revision-Date: 2012-08-02 10:11+0800\n" +"POT-Creation-Date: 2013-03-01 22:24+0800\n" +"PO-Revision-Date: 2013-03-01 22:24+0800\n" "Last-Translator: Chao-Hsiung Liao \n" "Language-Team: Chinese (Hong Kong) \n" "Language: \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" #: ../proxy/libproxy/glibproxyresolver.c:150 msgid "Proxy resolver internal error." @@ -48,61 +49,65 @@ msgstr "沒有提供證書資料" msgid "Server required TLS certificate" msgstr "伺服器要求的 TLS 證書" -#: ../tls/gnutls/gtlsconnection-gnutls.c:248 +#: ../tls/gnutls/gtlsconnection-gnutls.c:258 #, c-format msgid "Could not create TLS connection: %s" msgstr "無法建立 TLS 連線：%s" -#: ../tls/gnutls/gtlsconnection-gnutls.c:508 +#: ../tls/gnutls/gtlsconnection-gnutls.c:520 msgid "Connection is closed" msgstr "連線已關閉" -#: ../tls/gnutls/gtlsconnection-gnutls.c:568 -#: ../tls/gnutls/gtlsconnection-gnutls.c:1371 +#: ../tls/gnutls/gtlsconnection-gnutls.c:582 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1419 msgid "Operation would block" msgstr "操作會阻擋" -#: ../tls/gnutls/gtlsconnection-gnutls.c:695 +#: ../tls/gnutls/gtlsconnection-gnutls.c:712 msgid "Peer failed to perform TLS handshake" msgstr "執行 TLS 交握對等失敗" -#: ../tls/gnutls/gtlsconnection-gnutls.c:712 +#: ../tls/gnutls/gtlsconnection-gnutls.c:729 msgid "Peer requested illegal TLS rehandshake" msgstr "對等要求了不合法的 TLS 重交握" -#: ../tls/gnutls/gtlsconnection-gnutls.c:738 +#: ../tls/gnutls/gtlsconnection-gnutls.c:755 msgid "TLS connection closed unexpectedly" msgstr "TLS 連線無預警的關閉了" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1049 -#: ../tls/gnutls/gtlsconnection-gnutls.c:1068 +#: ../tls/gnutls/gtlsconnection-gnutls.c:765 +msgid "TLS connection peer did not send a certificate" +msgstr "TLS 連線對等點沒有傳回證書" + +#: ../tls/gnutls/gtlsconnection-gnutls.c:1146 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1165 #, c-format msgid "Error performing TLS handshake: %s" msgstr "執行 TLS 交握時發生錯誤：%s" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1204 -msgid "Unacceptable TLS certificate" -msgstr "不接受的 TLS 證書" - -#: ../tls/gnutls/gtlsconnection-gnutls.c:1215 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1175 msgid "Server did not return a valid TLS certificate" msgstr "伺服器沒有回傳有效的 TLS 證書" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1394 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1250 +msgid "Unacceptable TLS certificate" +msgstr "不接受的 TLS 證書" + +#: ../tls/gnutls/gtlsconnection-gnutls.c:1442 #, c-format msgid "Error reading data from TLS socket: %s" msgstr "從 TLS socket 讀取資料時發生錯誤：%s" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1423 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1471 #, c-format msgid "Error writing data to TLS socket: %s" msgstr "當寫入資料到 TLS socket 時發生錯誤：%s" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1467 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1515 msgid "Connection is already closed" msgstr "連線已經關閉" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1477 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1525 #, c-format msgid "Error performing TLS close: %s" msgstr "執行 TLS 關閉時發生錯誤：%s" diff --git a/po/zh_TW.po b/po/zh_TW.po index 37dee3d..2e37ec0 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -7,14 +7,15 @@ msgid "" msgstr "" "Project-Id-Version: glib-networking 2.31.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-02 10:11+0800\n" -"PO-Revision-Date: 2012-08-01 19:09+0800\n" +"POT-Creation-Date: 2013-03-01 22:24+0800\n" +"PO-Revision-Date: 2013-02-28 09:41+0800\n" "Last-Translator: Chao-Hsiung Liao \n" "Language-Team: Chinese (Taiwan) \n" "Language: \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" #: ../proxy/libproxy/glibproxyresolver.c:150 msgid "Proxy resolver internal error." @@ -48,61 +49,65 @@ msgstr "沒有提供憑證資料" msgid "Server required TLS certificate" msgstr "伺服器要求的 TLS 憑證" -#: ../tls/gnutls/gtlsconnection-gnutls.c:248 +#: ../tls/gnutls/gtlsconnection-gnutls.c:258 #, c-format msgid "Could not create TLS connection: %s" msgstr "無法建立 TLS 連線：%s" -#: ../tls/gnutls/gtlsconnection-gnutls.c:508 +#: ../tls/gnutls/gtlsconnection-gnutls.c:520 msgid "Connection is closed" msgstr "連線已關閉" -#: ../tls/gnutls/gtlsconnection-gnutls.c:568 -#: ../tls/gnutls/gtlsconnection-gnutls.c:1371 +#: ../tls/gnutls/gtlsconnection-gnutls.c:582 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1419 msgid "Operation would block" msgstr "操作會阻擋" -#: ../tls/gnutls/gtlsconnection-gnutls.c:695 +#: ../tls/gnutls/gtlsconnection-gnutls.c:712 msgid "Peer failed to perform TLS handshake" msgstr "執行 TLS 交握對等失敗" -#: ../tls/gnutls/gtlsconnection-gnutls.c:712 +#: ../tls/gnutls/gtlsconnection-gnutls.c:729 msgid "Peer requested illegal TLS rehandshake" msgstr "對等要求了不合法的 TLS 重交握" -#: ../tls/gnutls/gtlsconnection-gnutls.c:738 +#: ../tls/gnutls/gtlsconnection-gnutls.c:755 msgid "TLS connection closed unexpectedly" msgstr "TLS 連線無預警的關閉了" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1049 -#: ../tls/gnutls/gtlsconnection-gnutls.c:1068 +#: ../tls/gnutls/gtlsconnection-gnutls.c:765 +msgid "TLS connection peer did not send a certificate" +msgstr "TLS 連線對等點沒有傳回憑證" + +#: ../tls/gnutls/gtlsconnection-gnutls.c:1146 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1165 #, c-format msgid "Error performing TLS handshake: %s" msgstr "執行 TLS 交握時發生錯誤：%s" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1204 -msgid "Unacceptable TLS certificate" -msgstr "不接受的 TLS 憑證" - -#: ../tls/gnutls/gtlsconnection-gnutls.c:1215 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1175 msgid "Server did not return a valid TLS certificate" msgstr "伺服器沒有回傳有效的 TLS 憑證" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1394 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1250 +msgid "Unacceptable TLS certificate" +msgstr "不接受的 TLS 憑證" + +#: ../tls/gnutls/gtlsconnection-gnutls.c:1442 #, c-format msgid "Error reading data from TLS socket: %s" msgstr "從 TLS socket 讀取資料時發生錯誤：%s" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1423 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1471 #, c-format msgid "Error writing data to TLS socket: %s" msgstr "當寫入資料到 TLS socket 時發生錯誤：%s" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1467 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1515 msgid "Connection is already closed" msgstr "連線已經關閉" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1477 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1525 #, c-format msgid "Error performing TLS close: %s" msgstr "執行 TLS 關閉時發生錯誤：%s" diff --git a/tls/gnutls/gtlsconnection-gnutls.c b/tls/gnutls/gtlsconnection-gnutls.c index 7fc1695..a97031d 100644 --- a/tls/gnutls/gtlsconnection-gnutls.c +++ b/tls/gnutls/gtlsconnection-gnutls.c @@ -749,7 +749,13 @@ end_gnutls_io (GTlsConnectionGnutls *gnutls, #endif ) { - if (gnutls->priv->require_close_notify) + if (gnutls->priv->handshaking && !gnutls->priv->ever_handshaked) + { + g_set_error_literal (error, G_TLS_ERROR, G_TLS_ERROR_NOT_TLS, + _("Peer failed to perform TLS handshake")); + return GNUTLS_E_PULL_ERROR; + } + else if (gnutls->priv->require_close_notify) { g_set_error_literal (error, G_TLS_ERROR, G_TLS_ERROR_EOF, _("TLS connection closed unexpectedly")); -- 2.7.4